@desplega.ai/agent-swarm 1.2.1 → 1.9.0

package/src/commands/worker.ts

@@ -1,225 +1,13 @@
-import { mkdir } from "node:fs/promises";
+import { type RunnerConfig, type RunnerOptions, runAgent } from "./runner.ts";
 
-export interface WorkerOptions {
-  prompt?: string;
-  yolo?: boolean;
-  additionalArgs?: string[];
-}
-
-interface RunClaudeIterationOptions {
-  prompt: string;
-  logFile: string;
-  additionalArgs?: string[];
-}
-
-async function runClaudeIteration(opts: RunClaudeIterationOptions): Promise<number> {
-  const CMD = [
-    "claude",
-    "--verbose",
-    "--output-format",
-    "stream-json",
-    "--dangerously-skip-permissions",
-    "--allow-dangerously-skip-permissions",
-    "--permission-mode",
-    "bypassPermissions",
-    "-p",
-    opts.prompt,
-  ];
-
-  if (opts.additionalArgs && opts.additionalArgs.length > 0) {
-    CMD.push(...opts.additionalArgs);
-  }
-
-  console.log(`[worker] Running: claude ... -p "${opts.prompt}"`);
-
-  const logFileHandle = Bun.file(opts.logFile).writer();
-
-  // Collect stderr for better error reporting
-  let stderrOutput = "";
-
-  const proc = Bun.spawn(CMD, {
-    env: process.env,
-    stdout: "pipe",
-    stderr: "pipe",
-  });
-
-  console.log(`[worker] Process spawned, PID: ${proc.pid}`);
-  console.log(`[worker] Waiting for output streams...`);
-
-  let stdoutChunks = 0;
-  let stderrChunks = 0;
-
-  // Read stdout and stderr concurrently
-  const stdoutPromise = (async () => {
-    console.log(`[worker] stdout stream: ${proc.stdout ? "available" : "not available"}`);
-    if (proc.stdout) {
-      for await (const chunk of proc.stdout) {
-        stdoutChunks++;
-        const text = new TextDecoder().decode(chunk);
-        logFileHandle.write(text);
-        console.log(`[worker] stdout chunk #${stdoutChunks} (${chunk.length} bytes)`);
-
-        // Also parse and log to console for visibility
-        const lines = text.split("\n");
-        for (const line of lines) {
-          if (line.trim() === "") continue;
-          try {
-            const json = JSON.parse(line.trim());
-            // Log a summary of what's happening
-            if (json.type === "assistant" && json.message) {
-              const preview = json.message.slice(0, 100);
-              console.log(
-                `[worker] Assistant: ${preview}${json.message.length > 100 ? "..." : ""}`,
-              );
-            } else if (json.type === "tool_use") {
-              console.log(`[worker] Tool: ${json.tool || json.name || "unknown"}`);
-            } else if (json.type === "result") {
-              // Log result details
-              const resultPreview = JSON.stringify(json).slice(0, 200);
-              console.log(
-                `[worker] Result: ${resultPreview}${JSON.stringify(json).length > 200 ? "..." : ""}`,
-              );
-            } else if (json.type === "error") {
-              console.error(
-                `[worker] Error from Claude: ${json.error || json.message || JSON.stringify(json)}`,
-              );
-            } else if (json.type === "system") {
-              // Log system message details
-              const msg = json.message || json.content || "";
-              const preview =
-                typeof msg === "string" ? msg.slice(0, 150) : JSON.stringify(msg).slice(0, 150);
-              console.log(`[worker] System: ${preview}${preview.length >= 150 ? "..." : ""}`);
-            } else {
-              // Log unknown event types with content
-              console.log(
-                `[worker] Event type: ${json.type} - ${JSON.stringify(json).slice(0, 100)}`,
-              );
-            }
-          } catch {
-            // Non-JSON line, just log it
-            if (line.trim()) {
-              console.log(`[worker] Raw output: ${line.trim()}`);
-            }
-          }
-        }
-      }
-      console.log(`[worker] stdout stream ended (total ${stdoutChunks} chunks)`);
-    }
-  })();
-
-  const stderrPromise = (async () => {
-    console.log(`[worker] stderr stream: ${proc.stderr ? "available" : "not available"}`);
-    if (proc.stderr) {
-      for await (const chunk of proc.stderr) {
-        stderrChunks++;
-        const text = new TextDecoder().decode(chunk);
-        stderrOutput += text;
-        // Log stderr to console immediately
-        console.error(`[worker] stderr chunk #${stderrChunks}: ${text.trim()}`);
-        logFileHandle.write(
-          JSON.stringify({ type: "stderr", content: text, timestamp: new Date().toISOString() }) +
-            "\n",
-        );
-      }
-      console.log(`[worker] stderr stream ended (total ${stderrChunks} chunks)`);
-    }
-  })();
-
-  // Wait for both streams to finish
-  console.log(`[worker] Waiting for streams to complete...`);
-  await Promise.all([stdoutPromise, stderrPromise]);
-
-  await logFileHandle.end();
-  console.log(`[worker] Waiting for process to exit...`);
-  const exitCode = await proc.exited;
-
-  // Log final status
-  console.log(`[worker] Claude exited with code ${exitCode}`);
-  console.log(`[worker] Total stdout chunks: ${stdoutChunks}, stderr chunks: ${stderrChunks}`);
+export type WorkerOptions = RunnerOptions;
 
-  if (exitCode !== 0 && stderrOutput) {
-    console.error(`[worker] Full stderr output:\n${stderrOutput}`);
-  }
-
-  if (stdoutChunks === 0 && stderrChunks === 0) {
-    console.warn(`[worker] WARNING: No output received from Claude at all!`);
-    console.warn(`[worker] This might indicate Claude failed to start or auth issues.`);
-  }
-
-  return exitCode ?? 1;
-}
+const workerConfig: RunnerConfig = {
+  role: "worker",
+  defaultPrompt: "/start-worker",
+  metadataType: "worker_metadata",
+};
 
 export async function runWorker(opts: WorkerOptions) {
-  const sessionId = process.env.SESSION_ID || crypto.randomUUID().slice(0, 8);
-  // WORKER_LOG_DIR env var for Docker, otherwise ./logs
-  const baseLogDir = process.env.WORKER_LOG_DIR || "./logs";
-  const logDir = `${baseLogDir}/${sessionId}`;
-
-  // Create log directory
-  await mkdir(logDir, { recursive: true });
-
-  const defaultPrompt = "/start-worker Start or continue the tasks your leader assigned you!";
-  const prompt = opts.prompt || defaultPrompt;
-
-  const isYolo = opts.yolo || process.env.WORKER_YOLO === "true";
-
-  console.log(`[worker] Starting worker`);
-  console.log(`[worker] Session ID: ${sessionId}`);
-  console.log(`[worker] Log directory: ${logDir}`);
-  console.log(`[worker] YOLO mode: ${isYolo ? "enabled" : "disabled"}`);
-  console.log(`[worker] Prompt: ${prompt}`);
-
-  let iteration = 0;
-
-  while (true) {
-    iteration++;
-    const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
-    const logFile = `${logDir}/${timestamp}.jsonl`;
-
-    console.log(`\n[worker] === Iteration ${iteration} ===`);
-    console.log(`[worker] Logging to: ${logFile}`);
-
-    // Write iteration metadata at the start of each log file
-    const metadata = {
-      type: "worker_metadata",
-      sessionId,
-      iteration,
-      timestamp: new Date().toISOString(),
-      prompt,
-      yolo: isYolo,
-    };
-    await Bun.write(logFile, `${JSON.stringify(metadata)}\n`);
-
-    const exitCode = await runClaudeIteration({
-      prompt,
-      logFile,
-      additionalArgs: opts.additionalArgs,
-    });
-
-    if (exitCode !== 0) {
-      const errorLog = {
-        timestamp: new Date().toISOString(),
-        iteration,
-        exitCode,
-        error: true,
-      };
-
-      // Append to errors.jsonl
-      const errorsFile = `${logDir}/errors.jsonl`;
-      const existingErrors = (await Bun.file(errorsFile).exists())
-        ? await Bun.file(errorsFile).text()
-        : "";
-      await Bun.write(errorsFile, `${existingErrors + JSON.stringify(errorLog)}\n`);
-
-      if (!isYolo) {
-        console.error(`[worker] Claude exited with code ${exitCode}. Stopping.`);
-        console.error(`[worker] Error logged to: ${errorsFile}`);
-        process.exit(exitCode);
-      }
-
-      console.warn(`[worker] Claude exited with code ${exitCode}. YOLO mode - continuing...`);
-    }
-
-    console.log(`[worker] Iteration ${iteration} complete. Starting next iteration...`);
-  }
+  return runAgent(workerConfig, opts);
 }

package/src/hooks/hook.ts

@@ -30,6 +30,26 @@ interface HookMessage {
   stop_hook_active?: boolean;
 }
 
+interface MentionPreview {
+  channelName: string;
+  agentName: string;
+  content: string;
+  createdAt: string;
+}
+
+interface InboxSummary {
+  unreadCount: number;
+  mentionsCount: number;
+  offeredTasksCount: number;
+  poolTasksCount: number;
+  inProgressCount: number;
+  recentMentions: MentionPreview[];
+}
+
+interface AgentWithInbox extends Agent {
+  inbox?: InboxSummary;
+}
+
 /**
  * Main hook handler - processes Claude Code hook events
  */
@@ -97,11 +117,11 @@ export async function handleHook(): Promise<void> {
     }
   };
 
-  const getAgentInfo = async (): Promise<Agent | undefined> => {
+  const getAgentInfo = async (): Promise<AgentWithInbox | undefined> => {
     if (!mcpConfig) return;
 
     try {
-      const resp = await fetch(`${getBaseUrl()}/me`, {
+      const resp = await fetch(`${getBaseUrl()}/me?include=inbox`, {
         method: "GET",
         headers: mcpConfig.headers,
       });
@@ -110,7 +130,7 @@ export async function handleHook(): Promise<void> {
         return;
       }
 
-      return (await resp.json()) as Agent;
+      return (await resp.json()) as AgentWithInbox;
     } catch {
       // Silently fail
     }
@@ -118,18 +138,88 @@ export async function handleHook(): Promise<void> {
     return;
   };
 
+  const formatSystemTray = (inbox: InboxSummary): string | null => {
+    const {
+      unreadCount,
+      mentionsCount,
+      offeredTasksCount,
+      poolTasksCount,
+      inProgressCount,
+      recentMentions,
+    } = inbox;
+
+    // If all counts are zero, return null (no tray)
+    if (
+      unreadCount === 0 &&
+      offeredTasksCount === 0 &&
+      poolTasksCount === 0 &&
+      inProgressCount === 0
+    ) {
+      return null;
+    }
+
+    const lines: string[] = [];
+
+    // Main tray line
+    const parts: string[] = [];
+
+    // Messages section
+    if (unreadCount > 0) {
+      const mentionsSuffix = mentionsCount > 0 ? ` (${mentionsCount} @mention)` : "";
+      parts.push(`📬 ${unreadCount} unread${mentionsSuffix}`);
+    }
+
+    // Tasks section
+    const taskParts = [
+      `${offeredTasksCount} offered`,
+      `${poolTasksCount} pool`,
+      `${inProgressCount} active`,
+    ];
+    parts.push(`📋 ${taskParts.join(", ")}`);
+
+    lines.push(parts.join(" | "));
+
+    // Inline @mentions (up to 3)
+    if (recentMentions && recentMentions.length > 0) {
+      for (const mention of recentMentions) {
+        lines.push(
+          `  └─ @mention from ${mention.agentName} in #${mention.channelName}: "${mention.content}"`,
+        );
+      }
+    }
+
+    // Nudge - remind to check inbox
+    if (unreadCount > 0 || offeredTasksCount > 0) {
+      const actions: string[] = [];
+      if (unreadCount > 0) actions.push("read-messages");
+      if (offeredTasksCount > 0) actions.push("poll-task");
+      lines.push(`→ Use ${actions.join(" or ")} to check`);
+    }
+
+    return lines.join("\n");
+  };
+
   // Ping the server to indicate activity
   await ping();
 
   // Get current agent info
   const agentInfo = await getAgentInfo();
 
-  // Always output agent status
+  // Always output agent status with system tray
   if (agentInfo) {
+    // Base status line
     console.log(
-      `You are registered as ${agentInfo.isLead ? "lead" : "worker"} agent "${agentInfo.name}" with ID: ${agentInfo.id} (status: ${agentInfo.status}) as of ${new Date().toISOString()}.`,
+      `You are registered as ${agentInfo.isLead ? "lead" : "worker"} agent "${agentInfo.name}" (ID: ${agentInfo.id}, status: ${agentInfo.status}).`,
     );
 
+    // System tray (if there's activity)
+    if (agentInfo.inbox) {
+      const tray = formatSystemTray(agentInfo.inbox);
+      if (tray) {
+        console.log(tray);
+      }
+    }
+
     if (!agentInfo.isLead && agentInfo.status === "busy") {
       console.log(
         `Remember to call store-progress periodically to update the lead agent on your progress as you are currently marked as busy. The comments you leave will be helpful for the lead agent to monitor your work.`,
@@ -150,15 +240,7 @@ ${hasAgentIdHeader() ? `You have a pre-defined agent ID via header: ${mcpConfig?
     case "SessionStart":
       if (!agentInfo) break;
 
-      if (agentInfo.isLead) {
-        console.log(
-          `As the lead agent, you are responsible for coordinating the swarm to fulfill the user's request efficiently. Use the ${SERVER_NAME} tools to assign tasks to worker agents and monitor their progress.`,
-        );
-      } else {
-        console.log(
-          `As a worker agent, you should call the poll-task tool to wait for tasks assigned by the lead agent, unless specified otherwise.`,
-        );
-      }
+      // Covered by base system prompt
       break;
 
     case "PreCompact":
@@ -192,6 +274,12 @@ ${hasAgentIdHeader() ? `You have a pre-defined agent ID via header: ${mcpConfig?
       break;
 
     case "Stop":
+      // Save PM2 processes before shutdown (for container restart persistence)
+      try {
+        await Bun.$`pm2 save`.quiet();
+      } catch {
+        // PM2 not available or no processes - silently ignore
+      }
       // Mark the agent as offline
       await close();
       break;