opencode-swarm-plugin 0.2.0 → 0.4.0

package/src/swarm.integration.test.ts

@@ -16,6 +16,8 @@ import {
   swarm_complete,
   swarm_subtask_prompt,
   swarm_evaluation_prompt,
+  formatSubtaskPromptV2,
+  SUBTASK_PROMPT_V2,
 } from "./swarm";
 import { mcpCall, setState, clearState, AGENT_MAIL_URL } from "./agent-mail";
 
@@ -952,3 +954,127 @@ describe("Graceful Degradation", () => {
     expect(result).toContain("Report progress");
   });
 });
+
+// ============================================================================
+// Coordinator-Centric Swarm Tools (V2)
+// ============================================================================
+
+describe("Coordinator-Centric Swarm Tools", () => {
+  describe("formatSubtaskPromptV2", () => {
+    it("generates correct prompt with all fields", () => {
+      const result = formatSubtaskPromptV2({
+        subtask_title: "Add OAuth provider",
+        subtask_description: "Configure Google OAuth in the auth config",
+        files: ["src/auth/google.ts", "src/auth/config.ts"],
+        shared_context: "We are using NextAuth.js v5",
+      });
+
+      // Check title is included
+      expect(result).toContain("Add OAuth provider");
+
+      // Check description is included
+      expect(result).toContain("Configure Google OAuth in the auth config");
+
+      // Check files are formatted as list
+      expect(result).toContain("- `src/auth/google.ts`");
+      expect(result).toContain("- `src/auth/config.ts`");
+
+      // Check shared context is included
+      expect(result).toContain("We are using NextAuth.js v5");
+
+      // Check expected sections exist
+      expect(result).toContain("## Your Task");
+      expect(result).toContain("## Files to Modify");
+      expect(result).toContain("## Context");
+      expect(result).toContain("## Instructions");
+      expect(result).toContain("## When Complete");
+    });
+
+    it("handles missing optional fields", () => {
+      const result = formatSubtaskPromptV2({
+        subtask_title: "Simple task",
+        subtask_description: "",
+        files: [],
+      });
+
+      // Check title is included
+      expect(result).toContain("Simple task");
+
+      // Check fallback for empty description
+      expect(result).toContain("(see title)");
+
+      // Check fallback for empty files
+      expect(result).toContain(
+        "(no specific files assigned - use your judgment)",
+      );
+
+      // Check fallback for missing context
+      expect(result).toContain("(none provided)");
+    });
+
+    it("handles files with special characters", () => {
+      const result = formatSubtaskPromptV2({
+        subtask_title: "Handle paths",
+        subtask_description: "Test file paths",
+        files: [
+          "src/components/[slug]/page.tsx",
+          "src/api/users/[id]/route.ts",
+        ],
+      });
+
+      expect(result).toContain("- `src/components/[slug]/page.tsx`");
+      expect(result).toContain("- `src/api/users/[id]/route.ts`");
+    });
+  });
+
+  describe("SUBTASK_PROMPT_V2", () => {
+    it("contains expected sections", () => {
+      // Check all main sections are present in the template
+      expect(SUBTASK_PROMPT_V2).toContain("## Your Task");
+      expect(SUBTASK_PROMPT_V2).toContain("{subtask_title}");
+      expect(SUBTASK_PROMPT_V2).toContain("{subtask_description}");
+
+      expect(SUBTASK_PROMPT_V2).toContain("## Files to Modify");
+      expect(SUBTASK_PROMPT_V2).toContain("{file_list}");
+
+      expect(SUBTASK_PROMPT_V2).toContain("## Context");
+      expect(SUBTASK_PROMPT_V2).toContain("{shared_context}");
+
+      expect(SUBTASK_PROMPT_V2).toContain("## Instructions");
+      expect(SUBTASK_PROMPT_V2).toContain("Read first");
+      expect(SUBTASK_PROMPT_V2).toContain("Plan your approach");
+      expect(SUBTASK_PROMPT_V2).toContain("Make the changes");
+      expect(SUBTASK_PROMPT_V2).toContain("Verify");
+
+      expect(SUBTASK_PROMPT_V2).toContain("## When Complete");
+      expect(SUBTASK_PROMPT_V2).toContain('"success"');
+      expect(SUBTASK_PROMPT_V2).toContain('"summary"');
+      expect(SUBTASK_PROMPT_V2).toContain('"files_modified"');
+    });
+
+    it("does NOT contain Agent Mail instructions", () => {
+      // V2 prompt is for coordinator-centric model where subagents don't use Agent Mail
+      expect(SUBTASK_PROMPT_V2).not.toContain("Agent Mail");
+      expect(SUBTASK_PROMPT_V2).not.toContain("agentmail_");
+      expect(SUBTASK_PROMPT_V2).not.toContain("agent_name");
+      expect(SUBTASK_PROMPT_V2).not.toContain("send_message");
+    });
+
+    it("does NOT contain beads instructions", () => {
+      // V2 prompt is for coordinator-centric model where subagents don't manage beads
+      expect(SUBTASK_PROMPT_V2).not.toContain("bead_id");
+      expect(SUBTASK_PROMPT_V2).not.toContain("epic_id");
+      expect(SUBTASK_PROMPT_V2).not.toContain("bd update");
+      expect(SUBTASK_PROMPT_V2).not.toContain("bd close");
+      expect(SUBTASK_PROMPT_V2).not.toContain("swarm_progress");
+      expect(SUBTASK_PROMPT_V2).not.toContain("swarm_complete");
+    });
+
+    it("expects structured JSON response from subagent", () => {
+      // The prompt should instruct agents to return structured JSON
+      expect(SUBTASK_PROMPT_V2).toContain("```json");
+      expect(SUBTASK_PROMPT_V2).toContain('"success"');
+      expect(SUBTASK_PROMPT_V2).toContain('"blocker"');
+    });
+  });
+});

package/src/swarm.ts

@@ -359,6 +359,92 @@ Before writing code:
 
 Begin work on your subtask now.`;
 
+/**
+ * Simplified subtask prompt for Task subagents (V2 - coordinator-centric)
+ *
+ * This prompt is designed for agents that DON'T have access to Agent Mail or beads tools.
+ * The coordinator handles all coordination - subagents just do the work and return results.
+ *
+ * Key differences from V1:
+ * - No Agent Mail instructions (subagents can't use it)
+ * - No beads instructions (subagents can't use it)
+ * - Expects structured JSON response for coordinator to process
+ */
+export const SUBTASK_PROMPT_V2 = `You are working on a subtask as part of a larger project.
+
+## Your Task
+**Title**: {subtask_title}
+
+{subtask_description}
+
+## Files to Modify
+{file_list}
+
+**IMPORTANT**: Only modify the files listed above. Do not create new files unless absolutely necessary for the task.
+
+## Context
+{shared_context}
+
+## Instructions
+
+1. **Read first** - Understand the current state of the files before making changes
+2. **Plan your approach** - Think through what changes are needed
+3. **Make the changes** - Implement the required functionality
+4. **Verify** - Check that your changes work (run tests/typecheck if applicable)
+
+## When Complete
+
+After finishing your work, provide a summary in this format:
+
+\`\`\`json
+{
+  "success": true,
+  "summary": "Brief description of what you accomplished",
+  "files_modified": ["list", "of", "files", "you", "changed"],
+  "files_created": ["any", "new", "files"],
+  "issues_found": ["any problems or concerns discovered"],
+  "tests_passed": true,
+  "notes": "Any additional context for the coordinator"
+}
+\`\`\`
+
+If you encounter a blocker you cannot resolve, return:
+
+\`\`\`json
+{
+  "success": false,
+  "summary": "What you attempted",
+  "blocker": "Description of what's blocking you",
+  "files_modified": [],
+  "suggestions": ["possible", "solutions"]
+}
+\`\`\`
+
+Begin work now.`;
+
+/**
+ * Format the V2 subtask prompt for a specific agent
+ */
+export function formatSubtaskPromptV2(params: {
+  subtask_title: string;
+  subtask_description: string;
+  files: string[];
+  shared_context?: string;
+}): string {
+  const fileList =
+    params.files.length > 0
+      ? params.files.map((f) => `- \`${f}\``).join("\n")
+      : "(no specific files assigned - use your judgment)";
+
+  return SUBTASK_PROMPT_V2.replace("{subtask_title}", params.subtask_title)
+    .replace(
+      "{subtask_description}",
+      params.subtask_description || "(see title)",
+    )
+    .replace("{file_list}", fileList)
+    .replace("{shared_context}", params.shared_context || "(none provided)");
+}
+
 /**
  * Prompt for self-evaluation before completing a subtask.
  *
@@ -1418,6 +1504,196 @@ export const swarm_subtask_prompt = tool({
   },
 });
 
+/**
+ * Prepare a subtask for spawning with Task tool (V2 prompt)
+ *
+ * This is a simplified tool for coordinators that generates a prompt using
+ * the V2 template (no Agent Mail/beads instructions - coordinator handles coordination).
+ * Returns JSON that can be directly used with Task tool.
+ */
+export const swarm_spawn_subtask = tool({
+  description:
+    "Prepare a subtask for spawning with Task tool. Returns prompt and metadata for coordinator to use.",
+  args: {
+    bead_id: tool.schema.string().describe("Subtask bead ID"),
+    subtask_title: tool.schema.string().describe("Subtask title"),
+    subtask_description: tool.schema
+      .string()
+      .optional()
+      .describe("Detailed subtask instructions"),
+    files: tool.schema
+      .array(tool.schema.string())
+      .describe("Files assigned to this subtask"),
+    shared_context: tool.schema
+      .string()
+      .optional()
+      .describe("Context shared across all agents"),
+  },
+  async execute(args) {
+    const prompt = formatSubtaskPromptV2({
+      subtask_title: args.subtask_title,
+      subtask_description: args.subtask_description || "",
+      files: args.files,
+      shared_context: args.shared_context,
+    });
+
+    return JSON.stringify(
+      {
+        prompt,
+        bead_id: args.bead_id,
+        files: args.files,
+      },
+      null,
+      2,
+    );
+  },
+});
+
+/**
+ * Schema for task agent result
+ */
+const TaskResultSchema = z.object({
+  success: z.boolean(),
+  summary: z.string(),
+  files_modified: z.array(z.string()).optional().default([]),
+  files_created: z.array(z.string()).optional().default([]),
+  issues_found: z.array(z.string()).optional().default([]),
+  tests_passed: z.boolean().optional(),
+  notes: z.string().optional(),
+  blocker: z.string().optional(),
+  suggestions: z.array(z.string()).optional(),
+});
+
+type TaskResult = z.infer<typeof TaskResultSchema>;
+
+/**
+ * Handle subtask completion from a Task agent
+ *
+ * This tool is for coordinators to process the result after a Task subagent
+ * returns. It parses the JSON result, closes the bead on success, and
+ * creates new beads for any issues discovered.
+ *
+ * @example
+ * // Task agent returns JSON:
+ * // { "success": true, "summary": "Added auth", "files_modified": ["src/auth.ts"], "issues_found": ["Missing tests"] }
+ * //
+ * // Coordinator calls:
+ * swarm_complete_subtask(bead_id="bd-123.1", task_result=<agent_response>)
+ */
+export const swarm_complete_subtask = tool({
+  description:
+    "Handle subtask completion after Task agent returns. Parses result JSON, closes bead on success, creates new beads for issues found.",
+  args: {
+    bead_id: z.string().describe("Subtask bead ID to close"),
+    task_result: z
+      .string()
+      .describe("JSON result from the Task agent (TaskResult schema)"),
+    files_touched: z
+      .array(z.string())
+      .optional()
+      .describe(
+        "Override files touched (uses task_result.files_modified if not provided)",
+      ),
+  },
+  async execute(args) {
+    // Parse the task result JSON
+    let result: TaskResult;
+    try {
+      const parsed = JSON.parse(args.task_result);
+      result = TaskResultSchema.parse(parsed);
+    } catch (error) {
+      // Handle parse errors gracefully
+      const errorMessage =
+        error instanceof SyntaxError
+          ? `Invalid JSON: ${error.message}`
+          : error instanceof z.ZodError
+            ? `Schema validation failed: ${error.issues.map((i) => i.message).join(", ")}`
+            : String(error);
+
+      return JSON.stringify(
+        {
+          success: false,
+          error: "Failed to parse task result",
+          details: errorMessage,
+          hint: "Task agent should return JSON matching TaskResult schema: { success, summary, files_modified?, issues_found?, ... }",
+        },
+        null,
+        2,
+      );
+    }
+
+    const filesTouched = args.files_touched ?? [
+      ...result.files_modified,
+      ...result.files_created,
+    ];
+    const issuesCreated: Array<{ title: string; id?: string }> = [];
+
+    // If task failed, don't close the bead - return info for coordinator to handle
+    if (!result.success) {
+      return JSON.stringify(
+        {
+          success: false,
+          bead_id: args.bead_id,
+          task_failed: true,
+          summary: result.summary,
+          blocker: result.blocker,
+          suggestions: result.suggestions,
+          files_touched: filesTouched,
+          action_needed:
+            "Task failed - review blocker and decide whether to retry or close as failed",
+        },
+        null,
+        2,
+      );
+    }
+
+    // Task succeeded - close the bead
+    const closeReason = result.summary.slice(0, 200); // Truncate for safety
+    await Bun.$`bd close ${args.bead_id} -r "${closeReason}"`.quiet().nothrow();
+
+    // Create new beads for each issue found
+    if (result.issues_found.length > 0) {
+      for (const issue of result.issues_found) {
+        const issueTitle = issue.slice(0, 100); // Truncate long titles
+        const createResult = await Bun.$`bd create "${issueTitle}" -t bug`
+          .quiet()
+          .nothrow();
+
+        if (createResult.exitCode === 0) {
+          // Try to parse the bead ID from output
+          const output = createResult.stdout.toString();
+          const idMatch = output.match(/bd-[a-z0-9]+/);
+          issuesCreated.push({
+            title: issueTitle,
+            id: idMatch?.[0],
+          });
+        } else {
+          issuesCreated.push({
+            title: issueTitle,
+            id: undefined, // Failed to create
+          });
+        }
+      }
+    }
+
+    return JSON.stringify(
+      {
+        success: true,
+        bead_id: args.bead_id,
+        bead_closed: true,
+        summary: result.summary,
+        files_touched: filesTouched,
+        tests_passed: result.tests_passed,
+        notes: result.notes,
+        issues_created: issuesCreated.length > 0 ? issuesCreated : undefined,
+        issues_count: issuesCreated.length,
+      },
+      null,
+      2,
+    );
+  },
+});
+
 /**
  * Generate self-evaluation prompt
  */
@@ -1560,5 +1836,7 @@ export const swarmTools = {
   swarm_complete: swarm_complete,
   swarm_record_outcome: swarm_record_outcome,
   swarm_subtask_prompt: swarm_subtask_prompt,
+  swarm_spawn_subtask: swarm_spawn_subtask,
+  swarm_complete_subtask: swarm_complete_subtask,
   swarm_evaluation_prompt: swarm_evaluation_prompt,
 };

package/src/tool-availability.ts

@@ -55,14 +55,15 @@ async function commandExists(cmd: string): Promise<boolean> {
  */
 async function urlReachable(
   url: string,
-  timeoutMs: number = 1000,
+  timeoutMs: number = 2000,
 ): Promise<boolean> {
   try {
     const controller = new AbortController();
     const timeout = setTimeout(() => controller.abort(), timeoutMs);
 
+    // Use GET instead of HEAD - some servers don't support HEAD
     const response = await fetch(url, {
-      method: "HEAD",
+      method: "GET",
       signal: controller.signal,
     });
 

package/Dockerfile

@@ -1,30 +0,0 @@
-# Test runner container for opencode-swarm-plugin integration tests
-FROM oven/bun:latest
-
-# Install git (required for beads) and curl (for healthchecks)
-RUN apt-get update && apt-get install -y \
-    git \
-    curl \
-    && rm -rf /var/lib/apt/lists/*
-
-# Download bd CLI (beads issue tracker) for linux/amd64
-ARG BD_VERSION=0.2.8
-RUN curl -fsSL "https://github.com/beads-ai/beads/releases/download/v${BD_VERSION}/bd-linux-amd64" \
-    -o /usr/local/bin/bd \
-    && chmod +x /usr/local/bin/bd
-
-WORKDIR /app
-
-# Copy package files and install dependencies
-COPY package.json bun.lock* ./
-RUN bun install --frozen-lockfile
-
-# Copy source code
-COPY . .
-
-# Copy entrypoint script
-COPY scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
-RUN chmod +x /usr/local/bin/docker-entrypoint.sh
-
-ENTRYPOINT ["docker-entrypoint.sh"]
-CMD ["bun", "run", "test:integration"]

package/docker/agent-mail/Dockerfile

@@ -1,23 +0,0 @@
-FROM python:3.11-slim
-
-WORKDIR /app
-
-# Install dependencies
-COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
-
-# Copy server code
-COPY server.py .
-
-# Create data directory for SQLite
-RUN mkdir -p /data
-
-# Expose port
-EXPOSE 8765
-
-# Health check
-HEALTHCHECK --interval=10s --timeout=3s --start-period=5s --retries=3 \
-    CMD python -c "import urllib.request; urllib.request.urlopen('http://localhost:8765/health/liveness')" || exit 1
-
-# Run server
-CMD ["uvicorn", "server:app", "--host", "0.0.0.0", "--port", "8765"]

package/docker/agent-mail/requirements.txt

@@ -1,3 +0,0 @@
-fastapi>=0.109.0
-uvicorn[standard]>=0.27.0
-pydantic>=2.5.0