opencode-swarm 6.22.10 → 6.22.12

package/dist/hooks/phase-monitor.d.ts

@@ -6,11 +6,15 @@
  * Wrapped in safeHook — errors must never propagate.
  */
 import type { PreflightTriggerManager } from '../background/trigger';
+import type { CuratorConfig, CuratorInitResult } from './curator-types';
+/** Injectable curator runner type — allows test injection without module mocking. */
+export type CuratorInitRunner = (directory: string, config: CuratorConfig) => Promise<CuratorInitResult>;
 /**
  * Creates a hook that monitors plan phase transitions and triggers preflight.
  *
  * @param directory - Project directory (where .swarm/ lives)
  * @param preflightManager - The PreflightTriggerManager to call on phase change
+ * @param curatorRunner - Optional curator init runner (defaults to runCuratorInit; injectable for tests)
  * @returns A safeHook-wrapped system.transform handler
  */
-export declare function createPhaseMonitorHook(directory: string, preflightManager: PreflightTriggerManager): (input: unknown, output: unknown) => Promise<void>;
+export declare function createPhaseMonitorHook(directory: string, preflightManager: PreflightTriggerManager, curatorRunner?: CuratorInitRunner): (input: unknown, output: unknown) => Promise<void>;

package/dist/index.js

@@ -42216,8 +42216,8 @@ function recordPhaseAgentDispatch(sessionId, agentName) {
   session.phaseAgentsDispatched.add(normalizedName);
 }
 function advanceTaskState(session, taskId, newState) {
-  if (!session.taskWorkflowStates) {
-    session.taskWorkflowStates = new Map;
+  if (!session || !(session.taskWorkflowStates instanceof Map)) {
+    throw new Error("INVALID_SESSION: session.taskWorkflowStates must be a Map instance");
   }
   const STATE_ORDER = [
     "idle",
@@ -48616,7 +48616,9 @@ function createDelegationGateHook(config3) {
             if (state === "coder_delegated" || state === "pre_check_passed") {
               try {
                 advanceTaskState(session, taskId, "reviewer_run");
-              } catch {}
+              } catch (err2) {
+                console.warn(`[delegation-gate] toolAfter: could not advance ${taskId} (${state}) \u2192 reviewer_run: ${err2 instanceof Error ? err2.message : String(err2)}`);
+              }
             }
           }
         }
@@ -48625,7 +48627,9 @@ function createDelegationGateHook(config3) {
             if (state === "reviewer_run") {
               try {
                 advanceTaskState(session, taskId, "tests_run");
-              } catch {}
+              } catch (err2) {
+                console.warn(`[delegation-gate] toolAfter: could not advance ${taskId} (${state}) \u2192 tests_run: ${err2 instanceof Error ? err2.message : String(err2)}`);
+              }
             }
           }
         }
@@ -48640,7 +48644,9 @@ function createDelegationGateHook(config3) {
                 if (state === "coder_delegated" || state === "pre_check_passed") {
                   try {
                     advanceTaskState(otherSession, taskId, "reviewer_run");
-                  } catch {}
+                  } catch (err2) {
+                    console.warn(`[delegation-gate] toolAfter cross-session: could not advance ${taskId} (${state}) \u2192 reviewer_run: ${err2 instanceof Error ? err2.message : String(err2)}`);
+                  }
                 }
               }
             }
@@ -48649,7 +48655,9 @@ function createDelegationGateHook(config3) {
                 if (state === "reviewer_run") {
                   try {
                     advanceTaskState(otherSession, taskId, "tests_run");
-                  } catch {}
+                  } catch (err2) {
+                    console.warn(`[delegation-gate] toolAfter cross-session: could not advance ${taskId} (${state}) \u2192 tests_run: ${err2 instanceof Error ? err2.message : String(err2)}`);
+                  }
                 }
               }
             }
@@ -48690,7 +48698,9 @@ function createDelegationGateHook(config3) {
               if (state === "coder_delegated" || state === "pre_check_passed") {
                 try {
                   advanceTaskState(session, taskId, "reviewer_run");
-                } catch {}
+                } catch (err2) {
+                  console.warn(`[delegation-gate] fallback: could not advance ${taskId} (${state}) \u2192 reviewer_run: ${err2 instanceof Error ? err2.message : String(err2)}`);
+                }
               }
             }
           }
@@ -48699,7 +48709,9 @@ function createDelegationGateHook(config3) {
               if (state === "reviewer_run") {
                 try {
                   advanceTaskState(session, taskId, "tests_run");
-                } catch {}
+                } catch (err2) {
+                  console.warn(`[delegation-gate] fallback: could not advance ${taskId} (${state}) \u2192 tests_run: ${err2 instanceof Error ? err2.message : String(err2)}`);
+                }
               }
             }
           }
@@ -48713,7 +48725,9 @@ function createDelegationGateHook(config3) {
                 if (state === "coder_delegated" || state === "pre_check_passed") {
                   try {
                     advanceTaskState(otherSession, taskId, "reviewer_run");
-                  } catch {}
+                  } catch (err2) {
+                    console.warn(`[delegation-gate] fallback cross-session: could not advance ${taskId} (${state}) \u2192 reviewer_run: ${err2 instanceof Error ? err2.message : String(err2)}`);
+                  }
                 }
               }
             }
@@ -48728,7 +48742,9 @@ function createDelegationGateHook(config3) {
                 if (state === "reviewer_run") {
                   try {
                     advanceTaskState(otherSession, taskId, "tests_run");
-                  } catch {}
+                  } catch (err2) {
+                    console.warn(`[delegation-gate] fallback cross-session: could not advance ${taskId} (${state}) \u2192 tests_run: ${err2 instanceof Error ? err2.message : String(err2)}`);
+                  }
                 }
               }
             }
@@ -48855,7 +48871,7 @@ ${trimComment}${after}`;
             let guidance;
             if (lastGate?.taskId) {
               const gateResult = lastGate.passed ? "PASSED" : "FAILED";
-              const sanitizedGate = lastGate.gate.replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\[/g, "(").replace(/\]/g, ")").replace(/[\r\n]/g, " ").slice(0, 64);
+              const sanitizedGate = lastGate.gate.replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\[ \]/g, "()").replace(/\[/g, "(").replace(/\]/g, ")").replace(/[\r\n]/g, " ").slice(0, 64);
               const sanitizedTaskId = lastGate.taskId.replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\[/g, "(").replace(/\]/g, ")").replace(/[\r\n]/g, " ").slice(0, 32);
               guidance = `[Last gate: ${sanitizedGate} ${gateResult} for task ${sanitizedTaskId}]
 [NEXT] Execute the next gate for the current task.`;
@@ -48876,27 +48892,35 @@ ${trimComment}${after}`;
       if (text.length > delegationMaxChars) {
         warnings.push(`Delegation exceeds recommended size (${text.length} chars, limit ${delegationMaxChars}). Consider splitting into smaller tasks.`);
       }
-      const fileMatches = text.match(/^FILE:/gm);
-      if (fileMatches && fileMatches.length > 1) {
-        warnings.push(`Multiple FILE: directives detected (${fileMatches.length}). Each coder task should target ONE file.`);
+      if (isCoderDelegation) {
+        const fileMatches = text.match(/^FILE:/gm);
+        if (fileMatches && fileMatches.length > 1) {
+          warnings.push(`Multiple FILE: directives detected (${fileMatches.length}). Each coder task should target ONE file.`);
+        }
       }
-      const taskMatches = text.match(/^TASK:/gm);
-      if (taskMatches && taskMatches.length > 1) {
-        warnings.push(`Multiple TASK: sections detected (${taskMatches.length}). Send ONE task per coder call.`);
+      if (isCoderDelegation) {
+        const taskMatches = text.match(/^TASK:/gm);
+        if (taskMatches && taskMatches.length > 1) {
+          warnings.push(`Multiple TASK: sections detected (${taskMatches.length}). Send ONE task per coder call.`);
+        }
       }
-      const batchingPattern = /\b(?:and also|then also|additionally|as well as|along with|while you'?re at it)[.,]?\b/gi;
-      const batchingMatches = text.match(batchingPattern);
-      if (batchingMatches && batchingMatches.length > 0) {
-        warnings.push(`Batching language detected (${batchingMatches.join(", ")}). Break compound objectives into separate coder calls.`);
+      if (isCoderDelegation) {
+        const batchingPattern = /\b(?:and also|then also|additionally|as well as|along with|while you'?re at it)[.,]?\b/gi;
+        const batchingMatches = text.match(batchingPattern);
+        if (batchingMatches && batchingMatches.length > 0) {
+          warnings.push(`Batching language detected (${batchingMatches.join(", ")}). Break compound objectives into separate coder calls.`);
+        }
       }
-      const taskLine = extractTaskLine(text);
-      if (taskLine) {
-        const andPattern = /\s+and\s+(update|add|remove|modify|refactor|implement|create|delete|fix|change|build|deploy|write|test|move|rename|extend|extract|convert|migrate|upgrade|replace)\b/i;
-        if (andPattern.test(taskLine)) {
-          warnings.push('TASK line contains "and" connecting separate actions');
+      if (isCoderDelegation) {
+        const taskLine = extractTaskLine(text);
+        if (taskLine) {
+          const andPattern = /\s+and\s+(update|add|remove|modify|refactor|implement|create|delete|fix|change|build|deploy|write|test|move|rename|extend|extract|convert|migrate|upgrade|replace)\b/i;
+          if (andPattern.test(taskLine)) {
+            warnings.push('TASK line contains "and" connecting separate actions');
+          }
         }
       }
-      if (sessionID) {
+      if (isCoderDelegation && sessionID) {
         const delegationChain = swarmState.delegationChains.get(sessionID);
         if (delegationChain && delegationChain.length >= 2) {
           const coderIndices = [];
@@ -48933,10 +48957,13 @@ ${trimComment}${after}`;
 Rule 3: ONE task per coder call. Split this into separate delegations.
 ${warningLines.join(`
 `)}`;
-      const originalText = textPart.text ?? "";
-      textPart.text = `${warningText}
-
-${originalText}`;
+      const batchWarnSystemIdx = messages.findIndex((m) => m && m.info?.role === "system");
+      const batchWarnInsertIdx = batchWarnSystemIdx >= 0 ? batchWarnSystemIdx + 1 : 0;
+      const batchWarnMessage = {
+        info: { role: "system" },
+        parts: [{ type: "text", text: warningText }]
+      };
+      messages.splice(batchWarnInsertIdx, 0, batchWarnMessage);
     },
     toolAfter
   };
@@ -49029,10 +49056,6 @@ init_schema();
 function createDelegationTrackerHook(config3, guardrailsEnabled = true) {
   return async (input, _output) => {
     const now = Date.now();
-    const debugSession = swarmState.agentSessions.get(input.sessionID);
-    const taskStates = debugSession?.taskWorkflowStates ? Object.entries(debugSession.taskWorkflowStates) : [];
-    const statesSummary = taskStates.length > 0 ? taskStates.map(([k, v]) => `${k}=${v}`).join(",") : "(none)";
-    console.log(`[swarm-debug-task] chat.message | session=${input.sessionID} agent=${input.agent ?? "(none)"} prevAgent=${swarmState.activeAgent.get(input.sessionID) ?? "(none)"} taskStates=[${statesSummary}]`);
     if (!input.agent || input.agent === "") {
       const session2 = swarmState.agentSessions.get(input.sessionID);
       if (session2?.delegationActive) {
@@ -49144,7 +49167,7 @@ function consolidateSystemMessages(messages) {
 init_schema();
 init_manager2();
 init_utils2();
-function createPhaseMonitorHook(directory, preflightManager) {
+function createPhaseMonitorHook(directory, preflightManager, curatorRunner = runCuratorInit) {
   let lastKnownPhase = null;
   const handler = async (_input, _output) => {
     const plan = await loadPlan(directory);
@@ -49158,7 +49181,7 @@ function createPhaseMonitorHook(directory, preflightManager) {
         const { config: config3 } = loadPluginConfigWithMeta2(directory);
         const curatorConfig = CuratorConfigSchema.parse(config3.curator ?? {});
         if (curatorConfig.enabled && curatorConfig.init_enabled) {
-          await runCuratorInit(directory, curatorConfig);
+          await curatorRunner(directory, curatorConfig);
         }
       } catch {}
       return;
@@ -60822,14 +60845,24 @@ function checkReviewerGate(taskId, workingDirectory) {
     if (swarmState.agentSessions.size === 0) {
       return { blocked: false, reason: "" };
     }
+    let validSessionCount = 0;
     for (const [_sessionId, session] of swarmState.agentSessions) {
+      if (!(session.taskWorkflowStates instanceof Map)) {
+        continue;
+      }
+      validSessionCount++;
       const state = getTaskState(session, taskId);
       if (state === "tests_run" || state === "complete") {
         return { blocked: false, reason: "" };
       }
     }
+    if (validSessionCount === 0) {
+      return { blocked: false, reason: "" };
+    }
     const stateEntries = [];
     for (const [sessionId, session] of swarmState.agentSessions) {
+      if (!(session.taskWorkflowStates instanceof Map))
+        continue;
       const state = getTaskState(session, taskId);
       stateEntries.push(`${sessionId}: ${state}`);
     }

package/dist/state.d.ts

@@ -250,6 +250,7 @@ export declare function advanceTaskState(session: AgentSessionState, taskId: str
 /**
  * Get the current workflow state for a task.
  * Returns 'idle' if no entry exists.
+ * If taskWorkflowStates is missing/invalid, initializes it as a new Map.
  *
  * @param session - The agent session state
  * @param taskId - The task identifier

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "opencode-swarm",
-	"version": "6.22.10",
+	"version": "6.22.12",
 	"description": "Architect-centric agentic swarm plugin for OpenCode - hub-and-spoke orchestration with SME consultation, code generation, and QA review",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",