opencode-swarm-plugin 0.12.6 → 0.12.7

package/dist/plugin.js

@@ -22606,8 +22606,8 @@ var RETRY_CONFIG = {
   jitterPercent: 20
 };
 var RECOVERY_CONFIG = {
-  failureThreshold: 2,
-  restartCooldownMs: 30000,
+  failureThreshold: 1,
+  restartCooldownMs: 1e4,
   enabled: process.env.OPENCODE_AGENT_MAIL_AUTO_RESTART !== "false"
 };
 var SESSION_STATE_DIR = process.env.SWARM_STATE_DIR || join2(tmpdir(), "swarm-sessions");
@@ -22981,24 +22981,57 @@ var agentmail_init = tool({
         fallback: "Swarm will continue without multi-agent coordination. File conflicts possible if multiple agents active."
       }, null, 2);
     }
-    const project = await mcpCall("ensure_project", {
-      human_key: args.project_path
-    });
-    const agent = await mcpCall("register_agent", {
-      project_key: args.project_path,
-      program: "opencode",
-      model: "claude-opus-4",
-      name: args.agent_name,
-      task_description: args.task_description || ""
-    });
-    const state = {
-      projectKey: args.project_path,
-      agentName: agent.name,
-      reservations: [],
-      startedAt: new Date().toISOString()
-    };
-    setState(ctx.sessionID, state);
-    return JSON.stringify({ project, agent, available: true }, null, 2);
+    const MAX_INIT_RETRIES = 3;
+    let lastError = null;
+    for (let attempt = 1;attempt <= MAX_INIT_RETRIES; attempt++) {
+      try {
+        const project = await mcpCall("ensure_project", {
+          human_key: args.project_path
+        });
+        const agent = await mcpCall("register_agent", {
+          project_key: args.project_path,
+          program: "opencode",
+          model: "claude-opus-4",
+          name: args.agent_name,
+          task_description: args.task_description || ""
+        });
+        const state = {
+          projectKey: args.project_path,
+          agentName: agent.name,
+          reservations: [],
+          startedAt: new Date().toISOString()
+        };
+        setState(ctx.sessionID, state);
+        if (attempt > 1) {
+          console.warn(`[agent-mail] Init succeeded on attempt ${attempt} after restart`);
+        }
+        return JSON.stringify({ project, agent, available: true }, null, 2);
+      } catch (error45) {
+        lastError = error45 instanceof Error ? error45 : new Error(String(error45));
+        const isUnexpectedError = lastError.message.toLowerCase().includes("unexpected error");
+        console.warn(`[agent-mail] Init attempt ${attempt}/${MAX_INIT_RETRIES} failed: ${lastError.message}`);
+        if (isUnexpectedError && attempt < MAX_INIT_RETRIES) {
+          console.warn("[agent-mail] Detected 'unexpected error', restarting server...");
+          const restarted = await restartServer();
+          if (restarted) {
+            agentMailAvailable = null;
+            consecutiveFailures = 0;
+            await new Promise((resolve) => setTimeout(resolve, 1000));
+            continue;
+          }
+        }
+        if (!isUnexpectedError) {
+          break;
+        }
+      }
+    }
+    return JSON.stringify({
+      error: `Agent Mail init failed after ${MAX_INIT_RETRIES} attempts`,
+      available: false,
+      lastError: lastError?.message,
+      hint: "Manually restart Agent Mail: pkill -f agent-mail && agent-mail serve",
+      fallback: "Swarm will continue without multi-agent coordination."
+    }, null, 2);
   }
 });
 var agentmail_send = tool({
@@ -23204,7 +23237,11 @@ var agentmail_health = tool({
     try {
       const response = await fetch(`${AGENT_MAIL_URL}/health/liveness`);
       if (response.ok) {
-        return "Agent Mail is running";
+        const functional = await isServerFunctional();
+        if (functional) {
+          return "Agent Mail is running and functional";
+        }
+        return "Agent Mail health OK but MCP not responding - consider restart";
       }
       return `Agent Mail returned status ${response.status}`;
     } catch (error45) {
@@ -23212,6 +23249,41 @@ var agentmail_health = tool({
     }
   }
 });
+var agentmail_restart = tool({
+  description: "Manually restart Agent Mail server (use when getting 'unexpected error')",
+  args: {
+    force: tool.schema.boolean().optional().describe("Force restart even if server appears healthy (default: false)")
+  },
+  async execute(args) {
+    if (!args.force) {
+      const functional = await isServerFunctional();
+      if (functional) {
+        return JSON.stringify({
+          restarted: false,
+          reason: "Server is functional, no restart needed",
+          hint: "Use force=true to restart anyway"
+        }, null, 2);
+      }
+    }
+    console.warn("[agent-mail] Manual restart requested...");
+    const success2 = await restartServer();
+    agentMailAvailable = null;
+    consecutiveFailures = 0;
+    if (success2) {
+      return JSON.stringify({
+        restarted: true,
+        success: true,
+        message: "Agent Mail server restarted successfully"
+      }, null, 2);
+    }
+    return JSON.stringify({
+      restarted: true,
+      success: false,
+      error: "Restart attempted but server did not come back up",
+      hint: "Check server logs or manually start: agent-mail serve"
+    }, null, 2);
+  }
+});
 var agentMailTools = {
   agentmail_init,
   agentmail_send,
@@ -23222,7 +23294,8 @@ var agentMailTools = {
   agentmail_release,
   agentmail_ack,
   agentmail_search,
-  agentmail_health
+  agentmail_health,
+  agentmail_restart
 };
 
 // src/structured.ts
@@ -23638,6 +23711,24 @@ var CriterionWeightSchema = exports_external.object({
   last_validated: exports_external.string().optional(),
   half_life_days: exports_external.number().positive().default(90)
 });
+var ErrorTypeSchema = exports_external.enum([
+  "validation",
+  "timeout",
+  "conflict",
+  "tool_failure",
+  "unknown"
+]);
+var ErrorEntrySchema = exports_external.object({
+  id: exports_external.string(),
+  bead_id: exports_external.string(),
+  error_type: ErrorTypeSchema,
+  message: exports_external.string(),
+  stack_trace: exports_external.string().optional(),
+  tool_name: exports_external.string().optional(),
+  timestamp: exports_external.string(),
+  resolved: exports_external.boolean().default(false),
+  context: exports_external.string().optional()
+});
 var DecompositionStrategySchema = exports_external.enum([
   "file-based",
   "feature-based",
@@ -23711,6 +23802,117 @@ function outcomeToFeedback(outcome, criterion) {
     raw_value: outcome.decayed_value
   };
 }
+class InMemoryErrorStorage {
+  errors = [];
+  async store(entry) {
+    this.errors.push(entry);
+  }
+  async getByBead(beadId) {
+    return this.errors.filter((e) => e.bead_id === beadId);
+  }
+  async getUnresolvedByBead(beadId) {
+    return this.errors.filter((e) => e.bead_id === beadId && !e.resolved);
+  }
+  async markResolved(id) {
+    const error45 = this.errors.find((e) => e.id === id);
+    if (error45) {
+      error45.resolved = true;
+    }
+  }
+  async getAll() {
+    return [...this.errors];
+  }
+}
+
+class ErrorAccumulator {
+  storage;
+  constructor(storage) {
+    this.storage = storage ?? new InMemoryErrorStorage;
+  }
+  async recordError(beadId, errorType, message, options) {
+    const entry = {
+      id: `${beadId}-${errorType}-${Date.now()}`,
+      bead_id: beadId,
+      error_type: errorType,
+      message,
+      stack_trace: options?.stack_trace,
+      tool_name: options?.tool_name,
+      timestamp: new Date().toISOString(),
+      resolved: false,
+      context: options?.context
+    };
+    const validated = ErrorEntrySchema.parse(entry);
+    await this.storage.store(validated);
+    return validated;
+  }
+  async getErrors(beadId) {
+    return this.storage.getByBead(beadId);
+  }
+  async getUnresolvedErrors(beadId) {
+    return this.storage.getUnresolvedByBead(beadId);
+  }
+  async resolveError(errorId) {
+    await this.storage.markResolved(errorId);
+  }
+  async getErrorContext(beadId, includeResolved = false) {
+    const errors3 = includeResolved ? await this.getErrors(beadId) : await this.getUnresolvedErrors(beadId);
+    if (errors3.length === 0) {
+      return "";
+    }
+    const byType = errors3.reduce((acc, err) => {
+      const type = err.error_type;
+      if (!acc[type]) {
+        acc[type] = [];
+      }
+      acc[type].push(err);
+      return acc;
+    }, {});
+    const lines = [
+      "## Previous Errors",
+      "",
+      "The following errors were encountered during execution:",
+      ""
+    ];
+    for (const [type, typeErrors] of Object.entries(byType)) {
+      lines.push(`### ${type} (${typeErrors.length} error${typeErrors.length > 1 ? "s" : ""})`);
+      lines.push("");
+      for (const err of typeErrors) {
+        lines.push(`- **${err.message}**`);
+        if (err.context) {
+          lines.push(`  - Context: ${err.context}`);
+        }
+        if (err.tool_name) {
+          lines.push(`  - Tool: ${err.tool_name}`);
+        }
+        if (err.stack_trace) {
+          lines.push(`  - Stack: \`${err.stack_trace.slice(0, 100)}...\``);
+        }
+        lines.push(`  - Time: ${new Date(err.timestamp).toLocaleString()}${err.resolved ? " (resolved)" : ""}`);
+        lines.push("");
+      }
+    }
+    lines.push("**Action Required**: Address these errors before proceeding. Consider:");
+    lines.push("- What caused each error?");
+    lines.push("- How can you prevent similar errors?");
+    lines.push("- Are there patterns across error types?");
+    lines.push("");
+    return lines.join(`
+`);
+  }
+  async getErrorStats(beadId) {
+    const allErrors = await this.getErrors(beadId);
+    const unresolved = await this.getUnresolvedErrors(beadId);
+    const byType = allErrors.reduce((acc, err) => {
+      acc[err.error_type] = (acc[err.error_type] || 0) + 1;
+      return acc;
+    }, {});
+    return {
+      total: allErrors.length,
+      unresolved: unresolved.length,
+      by_type: byType
+    };
+  }
+}
 
 // src/swarm.ts
 var POSITIVE_MARKERS = [
@@ -24122,6 +24324,10 @@ Only modify these files. Need others? Message the coordinator.
 ## Context
 {shared_context}
 
+{compressed_context}
+
+{error_context}
+
 ## MANDATORY: Use These Tools
 
 ### Agent Mail - communicate with the swarm
@@ -24155,7 +24361,9 @@ Begin now.`;
 function formatSubtaskPromptV2(params) {
   const fileList = params.files.length > 0 ? params.files.map((f) => `- \`${f}\``).join(`
 `) : "(no specific files - use judgment)";
-  return SUBTASK_PROMPT_V2.replace(/{bead_id}/g, params.bead_id).replace(/{epic_id}/g, params.epic_id).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)");
+  const compressedSection = params.compressed_context ? params.compressed_context : "";
+  const errorSection = params.error_context ? params.error_context : "";
+  return SUBTASK_PROMPT_V2.replace(/{bead_id}/g, params.bead_id).replace(/{epic_id}/g, params.epic_id).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)").replace("{compressed_context}", compressedSection).replace("{error_context}", errorSection);
 }
 var EVALUATION_PROMPT = `Evaluate the work completed for this subtask.
 
@@ -24853,6 +25061,7 @@ var swarm_record_outcome = tool({
     };
     const validated = OutcomeSignalsSchema.parse(signals);
     const scored = scoreImplicitFeedback(validated, DEFAULT_LEARNING_CONFIG);
+    const errorStats = await globalErrorAccumulator.getErrorStats(args.bead_id);
     const criteriaToScore = args.criteria ?? [
       "type_safe",
       "no_bugs",
@@ -24864,6 +25073,10 @@ var swarm_record_outcome = tool({
       if (args.strategy) {
         event.context = `${event.context || ""} [strategy: ${args.strategy}]`.trim();
       }
+      if (errorStats.total > 0) {
+        const errorSummary = Object.entries(errorStats.by_type).map(([type, count]) => `${type}:${count}`).join(", ");
+        event.context = `${event.context || ""} [errors: ${errorSummary}]`.trim();
+      }
       return event;
     });
     return JSON.stringify({
@@ -24877,13 +25090,16 @@ var swarm_record_outcome = tool({
         }
       },
       feedback_events: feedbackEvents,
+      error_patterns: errorStats,
       summary: {
         feedback_type: scored.type,
         duration_seconds: Math.round(args.duration_ms / 1000),
         error_count: args.error_count ?? 0,
         retry_count: args.retry_count ?? 0,
         success: args.success,
-        strategy: args.strategy
+        strategy: args.strategy,
+        accumulated_errors: errorStats.total,
+        unresolved_errors: errorStats.unresolved
       },
       note: "Feedback events should be stored for criterion weight calculation. Use learning.ts functions to apply weights."
     }, null, 2);
@@ -25053,6 +25269,70 @@ var swarm_evaluation_prompt = tool({
     }, null, 2);
   }
 });
+var globalErrorAccumulator = new ErrorAccumulator;
+var swarm_accumulate_error = tool({
+  description: "Record an error during subtask execution. Errors feed into retry prompts.",
+  args: {
+    bead_id: tool.schema.string().describe("Bead ID where error occurred"),
+    error_type: tool.schema.enum(["validation", "timeout", "conflict", "tool_failure", "unknown"]).describe("Category of error"),
+    message: tool.schema.string().describe("Human-readable error message"),
+    stack_trace: tool.schema.string().optional().describe("Stack trace for debugging"),
+    tool_name: tool.schema.string().optional().describe("Tool that failed"),
+    context: tool.schema.string().optional().describe("What was happening when error occurred")
+  },
+  async execute(args) {
+    const entry = await globalErrorAccumulator.recordError(args.bead_id, args.error_type, args.message, {
+      stack_trace: args.stack_trace,
+      tool_name: args.tool_name,
+      context: args.context
+    });
+    return JSON.stringify({
+      success: true,
+      error_id: entry.id,
+      bead_id: entry.bead_id,
+      error_type: entry.error_type,
+      message: entry.message,
+      timestamp: entry.timestamp,
+      note: "Error recorded for retry context. Use swarm_get_error_context to retrieve accumulated errors."
+    }, null, 2);
+  }
+});
+var swarm_get_error_context = tool({
+  description: "Get accumulated errors for a bead. Returns formatted context for retry prompts.",
+  args: {
+    bead_id: tool.schema.string().describe("Bead ID to get errors for"),
+    include_resolved: tool.schema.boolean().optional().describe("Include resolved errors (default: false)")
+  },
+  async execute(args) {
+    const errorContext = await globalErrorAccumulator.getErrorContext(args.bead_id, args.include_resolved ?? false);
+    const stats = await globalErrorAccumulator.getErrorStats(args.bead_id);
+    return JSON.stringify({
+      bead_id: args.bead_id,
+      error_context: errorContext,
+      stats: {
+        total_errors: stats.total,
+        unresolved: stats.unresolved,
+        by_type: stats.by_type
+      },
+      has_errors: errorContext.length > 0,
+      usage: "Inject error_context into retry prompt using {error_context} placeholder"
+    }, null, 2);
+  }
+});
+var swarm_resolve_error = tool({
+  description: "Mark an error as resolved after fixing it. Updates error accumulator state.",
+  args: {
+    error_id: tool.schema.string().describe("Error ID to mark as resolved")
+  },
+  async execute(args) {
+    await globalErrorAccumulator.resolveError(args.error_id);
+    return JSON.stringify({
+      success: true,
+      error_id: args.error_id,
+      resolved: true
+    }, null, 2);
+  }
+});
 var swarm_init = tool({
   description: "Initialize swarm session and check tool availability. Call at swarm start to see what features are available.",
   args: {
@@ -25114,7 +25394,10 @@ var swarmTools = {
   swarm_subtask_prompt,
   swarm_spawn_subtask,
   swarm_complete_subtask,
-  swarm_evaluation_prompt
+  swarm_evaluation_prompt,
+  swarm_accumulate_error,
+  swarm_get_error_context,
+  swarm_resolve_error
 };
 // src/anti-patterns.ts
 var PatternKindSchema = exports_external.enum(["pattern", "anti_pattern"]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-swarm-plugin",
-  "version": "0.12.6",
+  "version": "0.12.7",
   "description": "Multi-agent swarm coordination for OpenCode with learning capabilities, beads integration, and Agent Mail",
   "type": "module",
   "main": "dist/index.js",

package/src/agent-mail.ts

@@ -38,10 +38,10 @@ const RETRY_CONFIG = {
 
 // Server recovery configuration
 const RECOVERY_CONFIG = {
-  /** Max consecutive failures before attempting restart */
-  failureThreshold: 2,
-  /** Cooldown between restart attempts (ms) */
-  restartCooldownMs: 30000,
+  /** Max consecutive failures before attempting restart (1 = restart on first "unexpected error") */
+  failureThreshold: 1,
+  /** Cooldown between restart attempts (ms) - 10 seconds */
+  restartCooldownMs: 10000,
   /** Whether auto-restart is enabled */
   enabled: process.env.OPENCODE_AGENT_MAIL_AUTO_RESTART !== "false",
 };
@@ -880,30 +880,88 @@ export const agentmail_init = tool({
       );
     }
 
-    // 1. Ensure project exists
-    const project = await mcpCall<ProjectInfo>("ensure_project", {
-      human_key: args.project_path,
-    });
+    // Retry loop with restart on failure
+    const MAX_INIT_RETRIES = 3;
+    let lastError: Error | null = null;
 
-    // 2. Register agent
-    const agent = await mcpCall<AgentInfo>("register_agent", {
-      project_key: args.project_path,
-      program: "opencode",
-      model: "claude-opus-4",
-      name: args.agent_name, // undefined = auto-generate
-      task_description: args.task_description || "",
-    });
+    for (let attempt = 1; attempt <= MAX_INIT_RETRIES; attempt++) {
+      try {
+        // 1. Ensure project exists
+        const project = await mcpCall<ProjectInfo>("ensure_project", {
+          human_key: args.project_path,
+        });
+
+        // 2. Register agent
+        const agent = await mcpCall<AgentInfo>("register_agent", {
+          project_key: args.project_path,
+          program: "opencode",
+          model: "claude-opus-4",
+          name: args.agent_name, // undefined = auto-generate
+          task_description: args.task_description || "",
+        });
+
+        // 3. Store state using sessionID
+        const state: AgentMailState = {
+          projectKey: args.project_path,
+          agentName: agent.name,
+          reservations: [],
+          startedAt: new Date().toISOString(),
+        };
+        setState(ctx.sessionID, state);
+
+        // Success - if we retried, log it
+        if (attempt > 1) {
+          console.warn(
+            `[agent-mail] Init succeeded on attempt ${attempt} after restart`,
+          );
+        }
 
-    // 3. Store state using sessionID
-    const state: AgentMailState = {
-      projectKey: args.project_path,
-      agentName: agent.name,
-      reservations: [],
-      startedAt: new Date().toISOString(),
-    };
-    setState(ctx.sessionID, state);
+        return JSON.stringify({ project, agent, available: true }, null, 2);
+      } catch (error) {
+        lastError = error instanceof Error ? error : new Error(String(error));
+        const isUnexpectedError = lastError.message
+          .toLowerCase()
+          .includes("unexpected error");
+
+        console.warn(
+          `[agent-mail] Init attempt ${attempt}/${MAX_INIT_RETRIES} failed: ${lastError.message}`,
+        );
+
+        // If it's an "unexpected error" and we have retries left, restart and retry
+        if (isUnexpectedError && attempt < MAX_INIT_RETRIES) {
+          console.warn(
+            "[agent-mail] Detected 'unexpected error', restarting server...",
+          );
+          const restarted = await restartServer();
+          if (restarted) {
+            // Clear cache and retry
+            agentMailAvailable = null;
+            consecutiveFailures = 0;
+            // Small delay to let server stabilize
+            await new Promise((resolve) => setTimeout(resolve, 1000));
+            continue;
+          }
+        }
 
-    return JSON.stringify({ project, agent, available: true }, null, 2);
+        // For non-unexpected errors or if restart failed, don't retry
+        if (!isUnexpectedError) {
+          break;
+        }
+      }
+    }
+
+    // All retries exhausted
+    return JSON.stringify(
+      {
+        error: `Agent Mail init failed after ${MAX_INIT_RETRIES} attempts`,
+        available: false,
+        lastError: lastError?.message,
+        hint: "Manually restart Agent Mail: pkill -f agent-mail && agent-mail serve",
+        fallback: "Swarm will continue without multi-agent coordination.",
+      },
+      null,
+      2,
+    );
   },
 });
 
@@ -1270,7 +1328,12 @@ export const agentmail_health = tool({
     try {
       const response = await fetch(`${AGENT_MAIL_URL}/health/liveness`);
       if (response.ok) {
-        return "Agent Mail is running";
+        // Also check if MCP is functional
+        const functional = await isServerFunctional();
+        if (functional) {
+          return "Agent Mail is running and functional";
+        }
+        return "Agent Mail health OK but MCP not responding - consider restart";
       }
       return `Agent Mail returned status ${response.status}`;
     } catch (error) {
@@ -1279,6 +1342,73 @@ export const agentmail_health = tool({
   },
 });
 
+/**
+ * Manually restart Agent Mail server
+ *
+ * Use when server is in bad state (health OK but MCP failing).
+ * This kills the existing process and starts a fresh one.
+ */
+export const agentmail_restart = tool({
+  description:
+    "Manually restart Agent Mail server (use when getting 'unexpected error')",
+  args: {
+    force: tool.schema
+      .boolean()
+      .optional()
+      .describe(
+        "Force restart even if server appears healthy (default: false)",
+      ),
+  },
+  async execute(args) {
+    // Check if restart is needed
+    if (!args.force) {
+      const functional = await isServerFunctional();
+      if (functional) {
+        return JSON.stringify(
+          {
+            restarted: false,
+            reason: "Server is functional, no restart needed",
+            hint: "Use force=true to restart anyway",
+          },
+          null,
+          2,
+        );
+      }
+    }
+
+    // Attempt restart
+    console.warn("[agent-mail] Manual restart requested...");
+    const success = await restartServer();
+
+    // Clear caches
+    agentMailAvailable = null;
+    consecutiveFailures = 0;
+
+    if (success) {
+      return JSON.stringify(
+        {
+          restarted: true,
+          success: true,
+          message: "Agent Mail server restarted successfully",
+        },
+        null,
+        2,
+      );
+    }
+
+    return JSON.stringify(
+      {
+        restarted: true,
+        success: false,
+        error: "Restart attempted but server did not come back up",
+        hint: "Check server logs or manually start: agent-mail serve",
+      },
+      null,
+      2,
+    );
+  },
+});
+
 // ============================================================================
 // Export all tools
 // ============================================================================
@@ -1294,6 +1424,7 @@ export const agentMailTools = {
   agentmail_ack: agentmail_ack,
   agentmail_search: agentmail_search,
   agentmail_health: agentmail_health,
+  agentmail_restart: agentmail_restart,
 };
 
 // ============================================================================