opencode-swarm-plugin 0.12.4 → 0.12.6

package/README.md

@@ -108,12 +108,11 @@ The `/swarm` command is defined in `~/.config/opencode/command/swarm.md`:
 description: Decompose task into parallel subtasks and coordinate agents
 ---
 
-You are a swarm coordinator. Take a complex task, break it into beads,
-and unleash parallel agents.
+You are a swarm coordinator. Decompose the task into beads and spawn parallel agents.
 
-## Usage
+## Task
 
-/swarm <task description or bead-id>
+$ARGUMENTS
 
 ## Workflow
 
@@ -136,83 +135,72 @@ and unleash parallel agents.
 Begin decomposition now.
 ```
 
-### @swarm-planner Agent
+> **Note**: The `$ARGUMENTS` placeholder captures everything you type after `/swarm`. This is how your task description gets passed to the agent.
+
+### Agents
 
-The `@swarm-planner` agent is defined in `~/.config/opencode/agent/swarm-planner.md`:
+The setup wizard creates two agents with your chosen models:
 
-````markdown
+**@swarm-planner** (`~/.config/opencode/agent/swarm-planner.md`) - Coordinator that decomposes tasks:
+
+```yaml
 ---
 name: swarm-planner
 description: Strategic task decomposition for swarm coordination
-model: claude-sonnet-4-5
+model: anthropic/claude-sonnet-4-5 # Your chosen coordinator model
 ---
+```
 
-You are a swarm planner. Decompose tasks into optimal parallel subtasks.
-
-## Workflow
+**@swarm-worker** (`~/.config/opencode/agent/swarm-worker.md`) - Fast executor for subtasks:
 
-1. Call `swarm_select_strategy` to analyze the task
-2. Call `swarm_plan_prompt` to get strategy-specific guidance
-3. Create a BeadTree following the guidelines
-4. Return ONLY valid JSON - no markdown, no explanation
-
-## Output Format
-
-```json
-{
-  "epic": { "title": "...", "description": "..." },
-  "subtasks": [
-    {
-      "title": "...",
-      "description": "...",
-      "files": ["src/..."],
-      "dependencies": [],
-      "estimated_complexity": 2
-    }
-  ]
-}
+```yaml
+---
+name: swarm-worker
+description: Executes subtasks in a swarm - fast, focused, cost-effective
+model: anthropic/claude-haiku-4-5 # Your chosen worker model
+---
 ```
-````
-
-## Rules
 
-- 2-7 subtasks (too few = not parallel, too many = overhead)
-- No file overlap between subtasks
-- Include tests with the code they test
-- Order by dependency (if B needs A, A comes first)
+### Decomposition Rules
 
-````
+- **2-7 subtasks** - Too few = not parallel, too many = coordination overhead
+- **No file overlap** - Each file appears in exactly one subtask
+- **Include tests** - Put test files with the code they test
+- **Order by dependency** - If B needs A's output, A comes first (lower index)
 
 Edit these files to customize behavior. Run `swarm setup` to regenerate defaults.
 
 ## Dependencies
 
-| Dependency | Purpose | Required |
-|------------|---------|----------|
-| [OpenCode](https://opencode.ai) | Plugin host | Yes |
-| [Beads](https://github.com/steveyegge/beads) | Git-backed issue tracking | Yes |
-| [Go](https://go.dev) | Required for Agent Mail | No |
-| [MCP Agent Mail](https://github.com/Dicklesworthstone/mcp_agent_mail) | Multi-agent coordination, file reservations | No |
-| [CASS (Coding Agent Session Search)](https://github.com/Dicklesworthstone/coding_agent_session_search) | Historical context from past sessions | No |
-| [UBS (Ultimate Bug Scanner)](https://github.com/Dicklesworthstone/ultimate_bug_scanner) | Pre-completion bug scanning using AI-powered static analysis | No |
-| [semantic-memory](https://github.com/joelhooks/semantic-memory) | Learning persistence | No |
-| [Redis](https://redis.io) | Rate limiting (SQLite fallback available) | No |
+| Dependency                                                                                             | Purpose                                                      | Required |
+| ------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------ | -------- |
+| [OpenCode](https://opencode.ai)                                                                        | Plugin host                                                  | Yes      |
+| [Beads](https://github.com/steveyegge/beads)                                                           | Git-backed issue tracking                                    | Yes      |
+| [Go](https://go.dev)                                                                                   | Required for Agent Mail                                      | No       |
+| [MCP Agent Mail](https://github.com/Dicklesworthstone/mcp_agent_mail)                                  | Multi-agent coordination, file reservations                  | No       |
+| [CASS (Coding Agent Session Search)](https://github.com/Dicklesworthstone/coding_agent_session_search) | Historical context from past sessions                        | No       |
+| [UBS (Ultimate Bug Scanner)](https://github.com/Dicklesworthstone/ultimate_bug_scanner)                | Pre-completion bug scanning using AI-powered static analysis | No       |
+| [semantic-memory](https://github.com/joelhooks/semantic-memory)                                        | Learning persistence                                         | No       |
+| [Redis](https://redis.io)                                                                              | Rate limiting (SQLite fallback available)                    | No       |
 
 All dependencies are checked and can be installed via `swarm setup`.
 
 ### Installing Optional Dependencies
 
 **UBS (Ultimate Bug Scanner)** - Scans code for bugs before task completion:
+
 ```bash
 curl -fsSL "https://raw.githubusercontent.com/Dicklesworthstone/ultimate_bug_scanner/master/install.sh" | bash
 ```
 
 **CASS (Coding Agent Session Search)** - Indexes and searches AI coding agent history:
+
 ```bash
 curl -fsSL https://raw.githubusercontent.com/Dicklesworthstone/coding_agent_session_search/main/install.sh | bash -s -- --easy-mode
 ```
 
 **MCP Agent Mail** - Multi-agent coordination and file reservations:
+
 ```bash
 curl -fsSL "https://raw.githubusercontent.com/Dicklesworthstone/mcp_agent_mail/main/scripts/install.sh" | bash -s -- --yes
 ```
@@ -221,57 +209,57 @@ curl -fsSL "https://raw.githubusercontent.com/Dicklesworthstone/mcp_agent_mail/m
 
 ### Swarm
 
-| Tool | Description |
-|------|-------------|
-| `swarm_init` | Initialize swarm session |
-| `swarm_select_strategy` | Analyze task, recommend decomposition strategy (file/feature/risk-based) |
-| `swarm_plan_prompt` | Generate strategy-specific planning prompt with CASS history |
-| `swarm_decompose` | Generate decomposition prompt |
-| `swarm_validate_decomposition` | Validate response, detect file conflicts |
-| `swarm_spawn_subtask` | Generate worker agent prompt with Agent Mail/beads instructions |
-| `swarm_status` | Get swarm progress by epic ID |
-| `swarm_progress` | Report subtask progress to coordinator |
-| `swarm_complete` | Complete subtask - runs UBS (Ultimate Bug Scanner), releases reservations |
-| `swarm_record_outcome` | Record outcome for learning (duration, errors, retries) |
+| Tool                           | Description                                                               |
+| ------------------------------ | ------------------------------------------------------------------------- |
+| `swarm_init`                   | Initialize swarm session                                                  |
+| `swarm_select_strategy`        | Analyze task, recommend decomposition strategy (file/feature/risk-based)  |
+| `swarm_plan_prompt`            | Generate strategy-specific planning prompt with CASS history              |
+| `swarm_decompose`              | Generate decomposition prompt                                             |
+| `swarm_validate_decomposition` | Validate response, detect file conflicts                                  |
+| `swarm_spawn_subtask`          | Generate worker agent prompt with Agent Mail/beads instructions           |
+| `swarm_status`                 | Get swarm progress by epic ID                                             |
+| `swarm_progress`               | Report subtask progress to coordinator                                    |
+| `swarm_complete`               | Complete subtask - runs UBS (Ultimate Bug Scanner), releases reservations |
+| `swarm_record_outcome`         | Record outcome for learning (duration, errors, retries)                   |
 
 ### Beads
 
-| Tool | Description |
-|------|-------------|
-| `beads_create` | Create bead with type-safe validation |
-| `beads_create_epic` | Create epic + subtasks atomically |
-| `beads_query` | Query beads with filters (status, type, ready) |
-| `beads_update` | Update status/description/priority |
-| `beads_close` | Close bead with reason |
-| `beads_start` | Mark bead as in-progress |
-| `beads_ready` | Get next unblocked bead |
-| `beads_sync` | Sync to git and push |
-| `beads_link_thread` | Link bead to Agent Mail thread |
+| Tool                | Description                                    |
+| ------------------- | ---------------------------------------------- |
+| `beads_create`      | Create bead with type-safe validation          |
+| `beads_create_epic` | Create epic + subtasks atomically              |
+| `beads_query`       | Query beads with filters (status, type, ready) |
+| `beads_update`      | Update status/description/priority             |
+| `beads_close`       | Close bead with reason                         |
+| `beads_start`       | Mark bead as in-progress                       |
+| `beads_ready`       | Get next unblocked bead                        |
+| `beads_sync`        | Sync to git and push                           |
+| `beads_link_thread` | Link bead to Agent Mail thread                 |
 
 ### Agent Mail
 
-| Tool | Description |
-|------|-------------|
-| `agentmail_init` | Initialize session, register agent |
-| `agentmail_send` | Send message to agents |
-| `agentmail_inbox` | Fetch inbox (max 5, no bodies - context safe) |
-| `agentmail_read_message` | Fetch single message body by ID |
+| Tool                         | Description                                    |
+| ---------------------------- | ---------------------------------------------- |
+| `agentmail_init`             | Initialize session, register agent             |
+| `agentmail_send`             | Send message to agents                         |
+| `agentmail_inbox`            | Fetch inbox (max 5, no bodies - context safe)  |
+| `agentmail_read_message`     | Fetch single message body by ID                |
 | `agentmail_summarize_thread` | Summarize thread (preferred over fetching all) |
-| `agentmail_reserve` | Reserve file paths for exclusive editing |
-| `agentmail_release` | Release file reservations |
-| `agentmail_ack` | Acknowledge message |
-| `agentmail_search` | Search messages by keyword |
-| `agentmail_health` | Check if Agent Mail server is running |
+| `agentmail_reserve`          | Reserve file paths for exclusive editing       |
+| `agentmail_release`          | Release file reservations                      |
+| `agentmail_ack`              | Acknowledge message                            |
+| `agentmail_search`           | Search messages by keyword                     |
+| `agentmail_health`           | Check if Agent Mail server is running          |
 
 ### Structured Output
 
-| Tool | Description |
-|------|-------------|
-| `structured_extract_json` | Extract JSON from markdown/text (multiple strategies) |
-| `structured_validate` | Validate response against schema |
-| `structured_parse_evaluation` | Parse self-evaluation response |
-| `structured_parse_decomposition` | Parse task decomposition response |
-| `structured_parse_bead_tree` | Parse bead tree for epic creation |
+| Tool                             | Description                                           |
+| -------------------------------- | ----------------------------------------------------- |
+| `structured_extract_json`        | Extract JSON from markdown/text (multiple strategies) |
+| `structured_validate`            | Validate response against schema                      |
+| `structured_parse_evaluation`    | Parse self-evaluation response                        |
+| `structured_parse_decomposition` | Parse task decomposition response                     |
+| `structured_parse_bead_tree`     | Parse bead tree for epic creation                     |
 
 ## Decomposition Strategies
 
@@ -309,32 +297,32 @@ Best for: bug fixes, security issues
 
 The plugin learns from outcomes:
 
-| Mechanism | How It Works |
-|-----------|--------------|
-| Confidence decay | Criteria weights fade unless revalidated (90-day half-life) |
-| Implicit feedback | Fast + success = helpful signal, slow + errors = harmful |
-| Pattern maturity | candidate → established → proven (or deprecated) |
-| Anti-patterns | Patterns with >60% failure rate auto-invert |
+| Mechanism         | How It Works                                                |
+| ----------------- | ----------------------------------------------------------- |
+| Confidence decay  | Criteria weights fade unless revalidated (90-day half-life) |
+| Implicit feedback | Fast + success = helpful signal, slow + errors = harmful    |
+| Pattern maturity  | candidate → established → proven (or deprecated)            |
+| Anti-patterns     | Patterns with >60% failure rate auto-invert                 |
 
 ## Context Preservation
 
 Hard limits to prevent context exhaustion:
 
-| Constraint | Default | Reason |
-|------------|---------|--------|
-| Inbox limit | 5 messages | Prevents token burn |
-| Bodies excluded | Always | Fetch individually when needed |
-| Summarize preferred | Yes | Key points, not raw dump |
+| Constraint          | Default    | Reason                         |
+| ------------------- | ---------- | ------------------------------ |
+| Inbox limit         | 5 messages | Prevents token burn            |
+| Bodies excluded     | Always     | Fetch individually when needed |
+| Summarize preferred | Yes        | Key points, not raw dump       |
 
 ## Rate Limiting
 
 Client-side limits (Redis primary, SQLite fallback):
 
 | Endpoint | Per Minute | Per Hour |
-|----------|------------|----------|
-| send | 20 | 200 |
-| reserve | 10 | 100 |
-| inbox | 60 | 600 |
+| -------- | ---------- | -------- |
+| send     | 20         | 200      |
+| reserve  | 10         | 100      |
+| inbox    | 60         | 600      |
 
 Configure via `OPENCODE_RATE_LIMIT_{ENDPOINT}_PER_MIN` env vars.
 
@@ -345,7 +333,7 @@ bun install
 bun run typecheck
 bun test
 bun run build
-````
+```
 
 ## License
 

package/bin/swarm.ts

@@ -363,7 +363,8 @@ const DEPENDENCIES: Dependency[] = [
     required: false,
     install: "https://github.com/Dicklesworthstone/mcp_agent_mail",
     installType: "manual",
-    description: "Multi-agent coordination & file reservations (like Gmail for coding agents)",
+    description:
+      "Multi-agent coordination & file reservations (like Gmail for coding agents)",
   },
   {
     name: "CASS (Coding Agent Session Search)",
@@ -488,11 +489,11 @@ const SWARM_COMMAND = `---
 description: Decompose task into parallel subtasks and coordinate agents
 ---
 
-You are a swarm coordinator. Take a complex task, break it into beads, and unleash parallel agents.
+You are a swarm coordinator. Decompose the task into beads and spawn parallel agents.
 
-## Usage
+## Task
 
-/swarm <task description or bead-id>
+$ARGUMENTS
 
 ## Workflow
 
@@ -500,14 +501,12 @@ You are a swarm coordinator. Take a complex task, break it into beads, and unlea
 2. **Decompose**: Use \`swarm_select_strategy\` then \`swarm_plan_prompt\` to break down the task
 3. **Create beads**: \`beads_create_epic\` with subtasks and file assignments
 4. **Reserve files**: \`agentmail_reserve\` for each subtask's files
-5. **Spawn agents**: Use Task tool with \`swarm_spawn_subtask\` prompts (or use @swarm-worker for sequential/single-file tasks)
+5. **Spawn agents**: Use Task tool with \`swarm_spawn_subtask\` prompts
 6. **Monitor**: Check \`agentmail_inbox\` for progress, use \`agentmail_summarize_thread\` for overview
 7. **Complete**: \`swarm_complete\` when done, then \`beads_sync\` to push
 
 ## Strategy Selection
 
-The plugin auto-selects decomposition strategy based on task keywords:
-
 | Strategy      | Best For                | Keywords                               |
 | ------------- | ----------------------- | -------------------------------------- |
 | file-based    | Refactoring, migrations | refactor, migrate, rename, update all  |

package/dist/index.js

@@ -21560,15 +21560,15 @@ var BeadDependencySchema = exports_external.object({
   type: exports_external.enum(["blocks", "blocked-by", "related", "discovered-from"])
 });
 var BeadSchema = exports_external.object({
-  id: exports_external.string().regex(/^[a-z0-9-]+-[a-z0-9]+(\.\d+)?$/, "Invalid bead ID format"),
+  id: exports_external.string().regex(/^[a-z0-9]+(-[a-z0-9]+)+(\.\d+)?$/, "Invalid bead ID format"),
   title: exports_external.string().min(1, "Title required"),
   description: exports_external.string().optional().default(""),
   status: BeadStatusSchema.default("open"),
   priority: exports_external.number().int().min(0).max(3).default(2),
   issue_type: BeadTypeSchema.default("task"),
-  created_at: exports_external.string(),
-  updated_at: exports_external.string().optional(),
-  closed_at: exports_external.string().optional(),
+  created_at: exports_external.string().datetime({ offset: true }),
+  updated_at: exports_external.string().datetime({ offset: true }).optional(),
+  closed_at: exports_external.string().datetime({ offset: true }).optional(),
   parent_id: exports_external.string().optional(),
   dependencies: exports_external.array(BeadDependencySchema).optional().default([]),
   metadata: exports_external.record(exports_external.string(), exports_external.unknown()).optional()
@@ -21641,7 +21641,7 @@ var EvaluationSchema = exports_external.object({
   criteria: exports_external.record(exports_external.string(), CriterionEvaluationSchema),
   overall_feedback: exports_external.string(),
   retry_suggestion: exports_external.string().nullable(),
-  timestamp: exports_external.string().optional()
+  timestamp: exports_external.string().datetime({ offset: true }).optional()
 });
 var DEFAULT_CRITERIA = [
   "type_safe",
@@ -21659,7 +21659,7 @@ var WeightedEvaluationSchema = exports_external.object({
   criteria: exports_external.record(exports_external.string(), WeightedCriterionEvaluationSchema),
   overall_feedback: exports_external.string(),
   retry_suggestion: exports_external.string().nullable(),
-  timestamp: exports_external.string().optional(),
+  timestamp: exports_external.string().datetime({ offset: true }).optional(),
   average_weight: exports_external.number().min(0).max(1).optional(),
   raw_score: exports_external.number().min(0).max(1).optional(),
   weighted_score: exports_external.number().min(0).max(1).optional()
@@ -21732,7 +21732,7 @@ var SwarmSpawnResultSchema = exports_external.object({
   coordinator_name: exports_external.string(),
   thread_id: exports_external.string(),
   agents: exports_external.array(SpawnedAgentSchema),
-  started_at: exports_external.string()
+  started_at: exports_external.string().datetime({ offset: true })
 });
 var AgentProgressSchema = exports_external.object({
   bead_id: exports_external.string(),
@@ -21742,7 +21742,7 @@ var AgentProgressSchema = exports_external.object({
   message: exports_external.string().optional(),
   files_touched: exports_external.array(exports_external.string()).optional(),
   blockers: exports_external.array(exports_external.string()).optional(),
-  timestamp: exports_external.string()
+  timestamp: exports_external.string().datetime({ offset: true })
 });
 var SwarmStatusSchema = exports_external.object({
   epic_id: exports_external.string(),
@@ -21752,7 +21752,7 @@ var SwarmStatusSchema = exports_external.object({
   failed: exports_external.number().int().min(0),
   blocked: exports_external.number().int().min(0),
   agents: exports_external.array(SpawnedAgentSchema),
-  last_update: exports_external.string()
+  last_update: exports_external.string().datetime({ offset: true })
 });
 // src/beads.ts
 class BeadError extends Error {
@@ -21890,18 +21890,32 @@ var beads_create_epic = tool({
       };
       return JSON.stringify(result, null, 2);
     } catch (error45) {
-      const rollbackHint = created.map((b) => `bd close ${b.id} --reason "Rollback partial epic"`).join(`
-`);
-      const result = {
-        success: false,
-        epic: created[0] || {},
-        subtasks: created.slice(1),
-        rollback_hint: rollbackHint
-      };
-      return JSON.stringify({
-        ...result,
-        error: error45 instanceof Error ? error45.message : String(error45)
-      }, null, 2);
+      const rollbackCommands = [];
+      for (const bead of created) {
+        try {
+          const closeCmd = [
+            "bd",
+            "close",
+            bead.id,
+            "--reason",
+            "Rollback partial epic",
+            "--json"
+          ];
+          await Bun.$`${closeCmd}`.quiet().nothrow();
+          rollbackCommands.push(`bd close ${bead.id} --reason "Rollback partial epic"`);
+        } catch (rollbackError) {
+          console.error(`Failed to rollback bead ${bead.id}:`, rollbackError);
+        }
+      }
+      const errorMsg = error45 instanceof Error ? error45.message : String(error45);
+      const rollbackInfo = rollbackCommands.length > 0 ? `
+
+Rolled back ${rollbackCommands.length} bead(s):
+${rollbackCommands.join(`
+`)}` : `
+
+No beads to rollback.`;
+      throw new BeadError(`Epic creation failed: ${errorMsg}${rollbackInfo}`, "beads_create_epic", 1);
     }
   }
 });
@@ -22028,17 +22042,22 @@ var beads_sync = tool({
   },
   async execute(args, ctx) {
     const autoPull = args.auto_pull ?? true;
+    const TIMEOUT_MS = 30000;
+    const withTimeout = async (promise2, timeoutMs, operation) => {
+      const timeoutPromise = new Promise((_, reject) => setTimeout(() => reject(new BeadError(`Operation timed out after ${timeoutMs}ms`, operation)), timeoutMs));
+      return Promise.race([promise2, timeoutPromise]);
+    };
     if (autoPull) {
-      const pullResult = await Bun.$`git pull --rebase`.quiet().nothrow();
+      const pullResult = await withTimeout(Bun.$`git pull --rebase`.quiet().nothrow(), TIMEOUT_MS, "git pull --rebase");
       if (pullResult.exitCode !== 0) {
         throw new BeadError(`Failed to pull: ${pullResult.stderr.toString()}`, "git pull --rebase", pullResult.exitCode);
       }
     }
-    const syncResult = await Bun.$`bd sync`.quiet().nothrow();
+    const syncResult = await withTimeout(Bun.$`bd sync`.quiet().nothrow(), TIMEOUT_MS, "bd sync");
     if (syncResult.exitCode !== 0) {
       throw new BeadError(`Failed to sync beads: ${syncResult.stderr.toString()}`, "bd sync", syncResult.exitCode);
     }
-    const pushResult = await Bun.$`git push`.quiet().nothrow();
+    const pushResult = await withTimeout(Bun.$`git push`.quiet().nothrow(), TIMEOUT_MS, "git push");
     if (pushResult.exitCode !== 0) {
       throw new BeadError(`Failed to push: ${pushResult.stderr.toString()}`, "git push", pushResult.exitCode);
     }
@@ -22347,9 +22366,11 @@ function getLimitsForEndpoint(endpoint) {
   const upperEndpoint = endpoint.toUpperCase();
   const perMinuteEnv = process.env[`OPENCODE_RATE_LIMIT_${upperEndpoint}_PER_MIN`];
   const perHourEnv = process.env[`OPENCODE_RATE_LIMIT_${upperEndpoint}_PER_HOUR`];
+  const parsedPerMinute = perMinuteEnv ? parseInt(perMinuteEnv, 10) : NaN;
+  const parsedPerHour = perHourEnv ? parseInt(perHourEnv, 10) : NaN;
   return {
-    perMinute: perMinuteEnv ? parseInt(perMinuteEnv, 10) : defaults.perMinute,
-    perHour: perHourEnv ? parseInt(perHourEnv, 10) : defaults.perHour
+    perMinute: Number.isNaN(parsedPerMinute) ? defaults.perMinute : parsedPerMinute,
+    perHour: Number.isNaN(parsedPerHour) ? defaults.perHour : parsedPerHour
   };
 }
 
@@ -22388,6 +22409,7 @@ class RedisRateLimiter {
     const pipeline = this.redis.pipeline();
     pipeline.zremrangebyscore(key, 0, windowStart);
     pipeline.zcard(key);
+    pipeline.zrange(key, 0, 0, "WITHSCORES");
     const results = await pipeline.exec();
     if (!results) {
       return { allowed: true, remaining: limit, resetAt: now + windowDuration };
@@ -22397,7 +22419,7 @@ class RedisRateLimiter {
     const allowed = count < limit;
     let resetAt = now + windowDuration;
     if (!allowed) {
-      const oldest = await this.redis.zrange(key, 0, 0, "WITHSCORES");
+      const oldest = results[2]?.[1] || [];
       if (oldest.length >= 2) {
         const oldestTimestamp = parseInt(oldest[1], 10);
         resetAt = oldestTimestamp + windowDuration;
@@ -22638,8 +22660,11 @@ function saveSessionState(sessionID, state) {
     }
     const path = getSessionStatePath(sessionID);
     writeFileSync(path, JSON.stringify(state, null, 2));
+    return true;
   } catch (error45) {
-    console.warn(`[agent-mail] Could not save session state: ${error45}`);
+    console.error(`[agent-mail] CRITICAL: Could not save session state: ${error45}`);
+    console.error(`[agent-mail] Session state will not persist across CLI invocations!`);
+    return false;
   }
 }
 var sessionStates = new Map;
@@ -22919,6 +22944,7 @@ async function mcpCall(toolName, args) {
     } catch (error45) {
       lastError = error45 instanceof Error ? error45 : new Error(String(error45));
       consecutiveFailures++;
+      const retryable = isRetryableError(error45);
       if (consecutiveFailures >= RECOVERY_CONFIG.failureThreshold && RECOVERY_CONFIG.enabled) {
         console.warn(`[agent-mail] ${consecutiveFailures} consecutive failures, checking server health...`);
         const healthy = await isServerFunctional();
@@ -22927,12 +22953,14 @@ async function mcpCall(toolName, args) {
           const restarted = await restartServer();
           if (restarted) {
             agentMailAvailable = null;
-            attempt--;
-            continue;
+            if (retryable) {
+              attempt--;
+              continue;
+            }
           }
         }
       }
-      if (!isRetryableError(error45)) {
+      if (!retryable) {
         console.warn(`[agent-mail] Non-retryable error for ${toolName}: ${lastError.message}`);
         throw lastError;
       }
@@ -23065,12 +23093,12 @@ var agentmail_read_message = tool({
     const messages = await mcpCall("fetch_inbox", {
       project_key: state.projectKey,
       agent_name: state.agentName,
-      limit: 1,
+      limit: 50,
       include_bodies: true
     });
     const message = messages.find((m) => m.id === args.message_id);
     if (!message) {
-      return `Message ${args.message_id} not found`;
+      return `Message ${args.message_id} not found in recent 50 messages. Try using agentmail_search to locate it.`;
     }
     await recordRateLimitedRequest(state.agentName, "read_message");
     return JSON.stringify(message, null, 2);
@@ -24567,6 +24595,13 @@ var swarm_validate_decomposition = tool({
       for (let i = 0;i < validated.subtasks.length; i++) {
         const deps = validated.subtasks[i].dependencies;
         for (const dep of deps) {
+          if (dep < 0 || dep >= validated.subtasks.length) {
+            return JSON.stringify({
+              valid: false,
+              error: `Invalid dependency: subtask ${i} depends on ${dep}, but only ${validated.subtasks.length} subtasks exist (indices 0-${validated.subtasks.length - 1})`,
+              hint: "Dependency index is out of bounds"
+            }, null, 2);
+          }
           if (dep >= i) {
             return JSON.stringify({
               valid: false,
@@ -25232,16 +25267,29 @@ async function resolveSemanticMemoryCommand() {
   return cachedCommand;
 }
 async function execSemanticMemory(args) {
-  const cmd = await resolveSemanticMemoryCommand();
-  const fullCmd = [...cmd, ...args];
-  const proc = Bun.spawn(fullCmd, {
-    stdout: "pipe",
-    stderr: "pipe"
-  });
-  const stdout = Buffer.from(await new Response(proc.stdout).arrayBuffer());
-  const stderr = Buffer.from(await new Response(proc.stderr).arrayBuffer());
-  const exitCode = await proc.exited;
-  return { exitCode, stdout, stderr };
+  try {
+    const cmd = await resolveSemanticMemoryCommand();
+    const fullCmd = [...cmd, ...args];
+    const proc = Bun.spawn(fullCmd, {
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    try {
+      const stdout = Buffer.from(await new Response(proc.stdout).arrayBuffer());
+      const stderr = Buffer.from(await new Response(proc.stderr).arrayBuffer());
+      const exitCode = await proc.exited;
+      return { exitCode, stdout, stderr };
+    } finally {
+      proc.kill();
+    }
+  } catch (error45) {
+    const errorMessage = error45 instanceof Error ? error45.message : String(error45);
+    return {
+      exitCode: 1,
+      stdout: Buffer.from(""),
+      stderr: Buffer.from(`Error executing semantic-memory: ${errorMessage}`)
+    };
+  }
 }
 var DEFAULT_STORAGE_CONFIG = {
   backend: "semantic-memory",
@@ -25503,20 +25551,26 @@ async function createStorageWithFallback(config2 = {}) {
   return new InMemoryStorage;
 }
 var globalStorage = null;
+var globalStoragePromise = null;
 async function getStorage() {
-  if (!globalStorage) {
-    globalStorage = await createStorageWithFallback();
+  if (!globalStoragePromise) {
+    globalStoragePromise = createStorageWithFallback().then((storage) => {
+      globalStorage = storage;
+      return storage;
+    });
   }
-  return globalStorage;
+  return globalStoragePromise;
 }
 function setStorage(storage) {
   globalStorage = storage;
+  globalStoragePromise = Promise.resolve(storage);
 }
 async function resetStorage() {
   if (globalStorage) {
     await globalStorage.close();
     globalStorage = null;
   }
+  globalStoragePromise = null;
 }
 
 // src/index.ts