From 7f94ecdc7a0446877947223b342c2cd66128aa5e Mon Sep 17 00:00:00 2001 From: Jason Woltje Date: Mon, 2 Mar 2026 16:43:51 +0000 Subject: [PATCH 1/2] fix: add missing orchestrator endpoints + fix AgentStatusWidget (#657) Co-authored-by: Jason Woltje Co-committed-by: Jason Woltje --- .../orchestrator/orchestrator.controller.ts | 98 ++++++++++++++++++- .../components/widgets/AgentStatusWidget.tsx | 56 ++++++----- 2 files changed, 130 insertions(+), 24 deletions(-) diff --git a/apps/api/src/orchestrator/orchestrator.controller.ts b/apps/api/src/orchestrator/orchestrator.controller.ts index e17d403..3cd25ac 100644 --- a/apps/api/src/orchestrator/orchestrator.controller.ts +++ b/apps/api/src/orchestrator/orchestrator.controller.ts @@ -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 type { Response } from "express"; 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 SSE_HEARTBEAT_MS = 15_000; +const DEFAULT_EVENTS_LIMIT = 25; interface OrchestratorAgentDto { id: string; @@ -15,6 +16,26 @@ interface OrchestratorAgentDto { createdAt: Date; } +interface OrchestratorEventDto { + type: string; + timestamp: string; + agentId?: string; + taskId?: string; + data?: Record; +} + +interface OrchestratorHealthDto { + status: "healthy" | "degraded" | "unhealthy"; + database: "connected" | "disconnected"; + agents: { + total: number; + working: number; + idle: number; + errored: number; + }; + timestamp: string; +} + @Controller("orchestrator") @UseGuards(AuthGuard) export class OrchestratorController { @@ -25,6 +46,81 @@ export class OrchestratorController { 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 { + 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") async streamEvents(@Res() res: Response): Promise { res.setHeader("Content-Type", "text/event-stream"); diff --git a/apps/web/src/components/widgets/AgentStatusWidget.tsx b/apps/web/src/components/widgets/AgentStatusWidget.tsx index adb6a03..6dcdb8a 100644 --- a/apps/web/src/components/widgets/AgentStatusWidget.tsx +++ b/apps/web/src/components/widgets/AgentStatusWidget.tsx @@ -16,6 +16,21 @@ interface Agent { 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 { const [agents, setAgents] = useState([]); const [isLoading, setIsLoading] = useState(true); @@ -74,25 +89,20 @@ export function AgentStatusWidget({ id: _id, config: _config }: WidgetProps): Re }, [fetchAgents]); const getStatusIcon = (status: string): React.JSX.Element => { - const statusLower = status.toLowerCase(); - switch (statusLower) { - case "running": - case "working": - return ; - case "spawning": - case "queued": - return ; - case "completed": - return ; - case "failed": - case "error": - return ; - case "terminated": - case "killed": - return ; - default: - return ; + if (isWorking(status)) { + return ; } + if (isIdle(status)) { + return ; + } + if (isErrored(status)) { + return ; + } + const s = status.toLowerCase(); + if (s === "completed" || s === "terminated" || s === "killed") { + return ; + } + return ; }; const getStatusText = (status: string): string => { @@ -121,9 +131,9 @@ export function AgentStatusWidget({ id: _id, config: _config }: WidgetProps): Re const stats = { total: agents.length, - working: agents.filter((a) => a.status.toLowerCase() === "running").length, - idle: agents.filter((a) => a.status.toLowerCase() === "spawning").length, - error: agents.filter((a) => a.status.toLowerCase() === "failed").length, + working: agents.filter((a) => isWorking(a.status)).length, + idle: agents.filter((a) => isIdle(a.status)).length, + error: agents.filter((a) => isErrored(a.status)).length, }; if (isLoading) { @@ -176,9 +186,9 @@ export function AgentStatusWidget({ id: _id, config: _config }: WidgetProps): Re
Date: Mon, 2 Mar 2026 11:41:10 -0600 Subject: [PATCH 2/2] ci: add auto-deploy to Docker Swarm after CI passes --- .woodpecker/ci.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/.woodpecker/ci.yml b/.woodpecker/ci.yml index ed65fd4..14d3c13 100644 --- a/.woodpecker/ci.yml +++ b/.woodpecker/ci.yml @@ -337,3 +337,35 @@ steps: - security-trivy-api - security-trivy-orchestrator - 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 mosaic@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