opencode-swarm-plugin 0.12.7 → 0.12.8

package/dist/index.js

@@ -22931,6 +22931,7 @@ async function mcpCallOnce(toolName, args) {
 }
 async function mcpCall(toolName, args) {
   let lastError = null;
+  let restartAttempted = false;
   for (let attempt = 0;attempt <= RETRY_CONFIG.maxRetries; attempt++) {
     if (attempt > 0) {
       const delay = calculateBackoffDelay(attempt);
@@ -22943,13 +22944,28 @@ async function mcpCall(toolName, args) {
       return result;
     } catch (error45) {
       lastError = error45 instanceof Error ? error45 : new Error(String(error45));
+      const errorMessage = lastError.message.toLowerCase();
       consecutiveFailures++;
       const retryable = isRetryableError(error45);
-      if (consecutiveFailures >= RECOVERY_CONFIG.failureThreshold && RECOVERY_CONFIG.enabled) {
+      const isUnexpectedError = errorMessage.includes("unexpected error");
+      if (isUnexpectedError && !restartAttempted && RECOVERY_CONFIG.enabled) {
+        console.warn(`[agent-mail] "${toolName}" got unexpected error, restarting server immediately...`);
+        restartAttempted = true;
+        const restarted = await restartServer();
+        if (restarted) {
+          agentMailAvailable = null;
+          consecutiveFailures = 0;
+          await new Promise((resolve) => setTimeout(resolve, 1000));
+          attempt--;
+          continue;
+        }
+      }
+      if (!isUnexpectedError && consecutiveFailures >= RECOVERY_CONFIG.failureThreshold && RECOVERY_CONFIG.enabled && !restartAttempted) {
         console.warn(`[agent-mail] ${consecutiveFailures} consecutive failures, checking server health...`);
         const healthy = await isServerFunctional();
         if (!healthy) {
           console.warn("[agent-mail] Server unhealthy, attempting restart...");
+          restartAttempted = true;
           const restarted = await restartServer();
           if (restarted) {
             agentMailAvailable = null;

package/dist/plugin.js

@@ -22905,6 +22905,7 @@ async function mcpCallOnce(toolName, args) {
 }
 async function mcpCall(toolName, args) {
   let lastError = null;
+  let restartAttempted = false;
   for (let attempt = 0;attempt <= RETRY_CONFIG.maxRetries; attempt++) {
     if (attempt > 0) {
       const delay = calculateBackoffDelay(attempt);
@@ -22917,13 +22918,28 @@ async function mcpCall(toolName, args) {
       return result;
     } catch (error45) {
       lastError = error45 instanceof Error ? error45 : new Error(String(error45));
+      const errorMessage = lastError.message.toLowerCase();
       consecutiveFailures++;
       const retryable = isRetryableError(error45);
-      if (consecutiveFailures >= RECOVERY_CONFIG.failureThreshold && RECOVERY_CONFIG.enabled) {
+      const isUnexpectedError = errorMessage.includes("unexpected error");
+      if (isUnexpectedError && !restartAttempted && RECOVERY_CONFIG.enabled) {
+        console.warn(`[agent-mail] "${toolName}" got unexpected error, restarting server immediately...`);
+        restartAttempted = true;
+        const restarted = await restartServer();
+        if (restarted) {
+          agentMailAvailable = null;
+          consecutiveFailures = 0;
+          await new Promise((resolve) => setTimeout(resolve, 1000));
+          attempt--;
+          continue;
+        }
+      }
+      if (!isUnexpectedError && consecutiveFailures >= RECOVERY_CONFIG.failureThreshold && RECOVERY_CONFIG.enabled && !restartAttempted) {
         console.warn(`[agent-mail] ${consecutiveFailures} consecutive failures, checking server health...`);
         const healthy = await isServerFunctional();
         if (!healthy) {
           console.warn("[agent-mail] Server unhealthy, attempting restart...");
+          restartAttempted = true;
           const restarted = await restartServer();
           if (restarted) {
             agentMailAvailable = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-swarm-plugin",
-  "version": "0.12.7",
+  "version": "0.12.8",
   "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

@@ -704,6 +704,7 @@ export async function mcpCall<T>(
   args: Record<string, unknown>,
 ): Promise<T> {
   let lastError: Error | null = null;
+  let restartAttempted = false;
 
   for (let attempt = 0; attempt <= RETRY_CONFIG.maxRetries; attempt++) {
     // Apply backoff delay (except first attempt)
@@ -723,17 +724,39 @@ export async function mcpCall<T>(
       return result;
     } catch (error) {
       lastError = error instanceof Error ? error : new Error(String(error));
+      const errorMessage = lastError.message.toLowerCase();
 
       // Track consecutive failures
       consecutiveFailures++;
 
-      // Check if error is retryable FIRST
+      // Check if error is retryable
       const retryable = isRetryableError(error);
 
-      // Check if we should attempt server restart
+      // AGGRESSIVE: If it's an "unexpected error", restart immediately (once per call)
+      const isUnexpectedError = errorMessage.includes("unexpected error");
+      if (isUnexpectedError && !restartAttempted && RECOVERY_CONFIG.enabled) {
+        console.warn(
+          `[agent-mail] "${toolName}" got unexpected error, restarting server immediately...`,
+        );
+        restartAttempted = true;
+        const restarted = await restartServer();
+        if (restarted) {
+          agentMailAvailable = null;
+          consecutiveFailures = 0;
+          // Small delay to let server stabilize
+          await new Promise((resolve) => setTimeout(resolve, 1000));
+          // Don't count this attempt - retry immediately
+          attempt--;
+          continue;
+        }
+      }
+
+      // Standard retry logic for other retryable errors
       if (
+        !isUnexpectedError &&
         consecutiveFailures >= RECOVERY_CONFIG.failureThreshold &&
-        RECOVERY_CONFIG.enabled
+        RECOVERY_CONFIG.enabled &&
+        !restartAttempted
       ) {
         console.warn(
           `[agent-mail] ${consecutiveFailures} consecutive failures, checking server health...`,
@@ -742,13 +765,11 @@ export async function mcpCall<T>(
         const healthy = await isServerFunctional();
         if (!healthy) {
           console.warn("[agent-mail] Server unhealthy, attempting restart...");
+          restartAttempted = true;
           const restarted = await restartServer();
           if (restarted) {
-            // Reset availability cache since server restarted
             agentMailAvailable = null;
-            // Only retry if the error was retryable in the first place
             if (retryable) {
-              // Don't count this attempt against retries - try again
               attempt--;
               continue;
             }