Compare commits

...

3 Commits

Author SHA1 Message Date
8e3177fbbd ci: use localadmin user for deploy
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
2026-03-02 12:05:31 -06:00
0c88010123 ci: add auto-deploy to Docker Swarm (#658)
Some checks failed
ci/woodpecker/manual/base-image Pipeline was successful
ci/woodpecker/manual/infra Pipeline was successful
ci/woodpecker/manual/coordinator Pipeline was successful
ci/woodpecker/manual/ci Pipeline failed
Co-authored-by: Jason Woltje <jason@diversecanvas.com>
Co-committed-by: Jason Woltje <jason@diversecanvas.com>
2026-03-02 17:42:06 +00:00
7f94ecdc7a fix: add missing orchestrator endpoints + fix AgentStatusWidget (#657)
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
ci/woodpecker/manual/base-image Pipeline was successful
ci/woodpecker/manual/infra Pipeline was successful
ci/woodpecker/manual/coordinator Pipeline was successful
ci/woodpecker/manual/ci Pipeline was successful
Co-authored-by: Jason Woltje <jason@diversecanvas.com>
Co-committed-by: Jason Woltje <jason@diversecanvas.com>
2026-03-02 16:43:51 +00:00
3 changed files with 162 additions and 24 deletions

View File

@@ -337,3 +337,35 @@ steps:
- security-trivy-api - security-trivy-api
- security-trivy-orchestrator - security-trivy-orchestrator
- security-trivy-web - security-trivy-web
# ─── Deploy to Docker Swarm (main only) ─────────────────────
deploy-swarm:
image: alpine:3
environment:
SSH_PRIVATE_KEY:
from_secret: ssh_private_key
SSH_KNOWN_HOSTS:
from_secret: ssh_known_hosts
commands:
- apk add --no-cache openssh-client
- |
set -e
# Setup SSH
mkdir -p ~/.ssh
echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
chmod 600 ~/.ssh/known_hosts
echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_ed25519
chmod 600 ~/.ssh/id_ed25519
# Deploy to swarm
echo "🚀 Deploying to Docker Swarm..."
ssh -o StrictHostKeyChecking=no localadmin@10.1.1.45 \
"cd /opt/mosaic-stack && \
docker login git.mosaicstack.dev -u \$(echo \$GITEA_USER) -p \$GITEA_TOKEN || true && \
docker stack deploy -c docker-compose.yml mosaic"
when:
- branch: [main]
event: [push, manual, tag]
depends_on:
- link-packages

View File

@@ -1,4 +1,4 @@
import { Controller, Get, Res, UseGuards } from "@nestjs/common"; import { Controller, Get, Query, Res, UseGuards } from "@nestjs/common";
import { AgentStatus } from "@prisma/client"; import { AgentStatus } from "@prisma/client";
import type { Response } from "express"; import type { Response } from "express";
import { AuthGuard } from "../auth/guards/auth.guard"; import { AuthGuard } from "../auth/guards/auth.guard";
@@ -6,6 +6,7 @@ import { PrismaService } from "../prisma/prisma.service";
const AGENT_POLL_INTERVAL_MS = 5_000; const AGENT_POLL_INTERVAL_MS = 5_000;
const SSE_HEARTBEAT_MS = 15_000; const SSE_HEARTBEAT_MS = 15_000;
const DEFAULT_EVENTS_LIMIT = 25;
interface OrchestratorAgentDto { interface OrchestratorAgentDto {
id: string; id: string;
@@ -15,6 +16,26 @@ interface OrchestratorAgentDto {
createdAt: Date; createdAt: Date;
} }
interface OrchestratorEventDto {
type: string;
timestamp: string;
agentId?: string;
taskId?: string;
data?: Record<string, unknown>;
}
interface OrchestratorHealthDto {
status: "healthy" | "degraded" | "unhealthy";
database: "connected" | "disconnected";
agents: {
total: number;
working: number;
idle: number;
errored: number;
};
timestamp: string;
}
@Controller("orchestrator") @Controller("orchestrator")
@UseGuards(AuthGuard) @UseGuards(AuthGuard)
export class OrchestratorController { export class OrchestratorController {
@@ -25,6 +46,81 @@ export class OrchestratorController {
return this.fetchActiveAgents(); return this.fetchActiveAgents();
} }
@Get("events/recent")
async getRecentEvents(
@Query("limit") limit?: string
): Promise<{ events: OrchestratorEventDto[] }> {
const eventsLimit = limit ? parseInt(limit, 10) : DEFAULT_EVENTS_LIMIT;
const safeLimit = Math.min(Math.max(eventsLimit, 1), 100);
// Fetch recent agent activity to derive events
const agents = await this.prisma.agent.findMany({
where: {
status: {
not: AgentStatus.TERMINATED,
},
},
orderBy: {
createdAt: "desc",
},
take: safeLimit,
});
// Derive events from agent status changes
const events: OrchestratorEventDto[] = agents.map((agent) => ({
type: `agent:${agent.status.toLowerCase()}`,
timestamp: agent.createdAt.toISOString(),
agentId: agent.id,
data: {
name: agent.name,
role: agent.role,
model: agent.model,
},
}));
return { events };
}
@Get("health")
async getHealth(): Promise<OrchestratorHealthDto> {
let databaseConnected = false;
let agents: OrchestratorAgentDto[] = [];
try {
// Check database connectivity
await this.prisma.$queryRaw`SELECT 1`;
databaseConnected = true;
// Get agent counts
agents = await this.fetchActiveAgents();
} catch {
databaseConnected = false;
}
const working = agents.filter((a) => a.status === AgentStatus.WORKING).length;
const idle = agents.filter((a) => a.status === AgentStatus.IDLE).length;
const errored = agents.filter((a) => a.status === AgentStatus.ERROR).length;
let status: OrchestratorHealthDto["status"] = "healthy";
if (!databaseConnected) {
status = "unhealthy";
} else if (errored > 0) {
status = "degraded";
}
return {
status,
database: databaseConnected ? "connected" : "disconnected",
agents: {
total: agents.length,
working,
idle,
errored,
},
timestamp: new Date().toISOString(),
};
}
@Get("events") @Get("events")
async streamEvents(@Res() res: Response): Promise<void> { async streamEvents(@Res() res: Response): Promise<void> {
res.setHeader("Content-Type", "text/event-stream"); res.setHeader("Content-Type", "text/event-stream");

View File

@@ -16,6 +16,21 @@ interface Agent {
error?: string; error?: string;
} }
function isWorking(status: string): boolean {
const s = status.toLowerCase();
return s === "running" || s === "working";
}
function isIdle(status: string): boolean {
const s = status.toLowerCase();
return s === "idle" || s === "spawning" || s === "waiting" || s === "queued";
}
function isErrored(status: string): boolean {
const s = status.toLowerCase();
return s === "failed" || s === "error";
}
export function AgentStatusWidget({ id: _id, config: _config }: WidgetProps): React.JSX.Element { export function AgentStatusWidget({ id: _id, config: _config }: WidgetProps): React.JSX.Element {
const [agents, setAgents] = useState<Agent[]>([]); const [agents, setAgents] = useState<Agent[]>([]);
const [isLoading, setIsLoading] = useState(true); const [isLoading, setIsLoading] = useState(true);
@@ -74,25 +89,20 @@ export function AgentStatusWidget({ id: _id, config: _config }: WidgetProps): Re
}, [fetchAgents]); }, [fetchAgents]);
const getStatusIcon = (status: string): React.JSX.Element => { const getStatusIcon = (status: string): React.JSX.Element => {
const statusLower = status.toLowerCase(); if (isWorking(status)) {
switch (statusLower) { return <Activity className="w-4 h-4 text-blue-500 animate-pulse" />;
case "running":
case "working":
return <Activity className="w-4 h-4 text-blue-500 animate-pulse" />;
case "spawning":
case "queued":
return <Clock className="w-4 h-4 text-yellow-500" />;
case "completed":
return <CheckCircle className="w-4 h-4 text-green-500" />;
case "failed":
case "error":
return <AlertCircle className="w-4 h-4 text-red-500" />;
case "terminated":
case "killed":
return <CheckCircle className="w-4 h-4 text-gray-500" />;
default:
return <Clock className="w-4 h-4 text-gray-400" />;
} }
if (isIdle(status)) {
return <Clock className="w-4 h-4 text-yellow-500" />;
}
if (isErrored(status)) {
return <AlertCircle className="w-4 h-4 text-red-500" />;
}
const s = status.toLowerCase();
if (s === "completed" || s === "terminated" || s === "killed") {
return <CheckCircle className="w-4 h-4 text-gray-500" />;
}
return <Clock className="w-4 h-4 text-gray-400" />;
}; };
const getStatusText = (status: string): string => { const getStatusText = (status: string): string => {
@@ -121,9 +131,9 @@ export function AgentStatusWidget({ id: _id, config: _config }: WidgetProps): Re
const stats = { const stats = {
total: agents.length, total: agents.length,
working: agents.filter((a) => a.status.toLowerCase() === "running").length, working: agents.filter((a) => isWorking(a.status)).length,
idle: agents.filter((a) => a.status.toLowerCase() === "spawning").length, idle: agents.filter((a) => isIdle(a.status)).length,
error: agents.filter((a) => a.status.toLowerCase() === "failed").length, error: agents.filter((a) => isErrored(a.status)).length,
}; };
if (isLoading) { if (isLoading) {
@@ -176,9 +186,9 @@ export function AgentStatusWidget({ id: _id, config: _config }: WidgetProps): Re
<div <div
key={agent.agentId} key={agent.agentId}
className={`p-3 rounded-lg border ${ className={`p-3 rounded-lg border ${
agent.status.toLowerCase() === "failed" isErrored(agent.status)
? "bg-red-50 border-red-200" ? "bg-red-50 border-red-200"
: agent.status.toLowerCase() === "running" : isWorking(agent.status)
? "bg-blue-50 border-blue-200" ? "bg-blue-50 border-blue-200"
: "bg-gray-50 border-gray-200" : "bg-gray-50 border-gray-200"
}`} }`}