opencode-swarm 6.22.8 → 6.22.10

package/dist/cli/index.js

@@ -30897,6 +30897,7 @@ function serializeAgentSession(s) {
     lastGateFailure: s.lastGateFailure ?? null,
     partialGateWarningsIssuedForTask,
     selfFixAttempted: s.selfFixAttempted ?? false,
+    selfCodingWarnedAtCount: s.selfCodingWarnedAtCount ?? 0,
     catastrophicPhaseWarnings,
     lastPhaseCompleteTimestamp: s.lastPhaseCompleteTimestamp ?? 0,
     lastPhaseCompletePhase: s.lastPhaseCompletePhase ?? 0,

package/dist/index.js

@@ -42030,6 +42030,7 @@ function startAgentSession(sessionId, agentName, staleDurationMs = 7200000) {
     lastGateFailure: null,
     partialGateWarningsIssuedForTask: new Set,
     selfFixAttempted: false,
+    selfCodingWarnedAtCount: 0,
     catastrophicPhaseWarnings: new Set,
     lastPhaseCompleteTimestamp: 0,
     lastPhaseCompletePhase: 0,
@@ -42093,6 +42094,9 @@ function ensureAgentSession(sessionId, agentName) {
     if (session.selfFixAttempted === undefined) {
       session.selfFixAttempted = false;
     }
+    if (session.selfCodingWarnedAtCount === undefined) {
+      session.selfCodingWarnedAtCount = 0;
+    }
     if (!session.catastrophicPhaseWarnings) {
       session.catastrophicPhaseWarnings = new Set;
     }
@@ -45431,6 +45435,7 @@ function serializeAgentSession(s) {
     lastGateFailure: s.lastGateFailure ?? null,
     partialGateWarningsIssuedForTask,
     selfFixAttempted: s.selfFixAttempted ?? false,
+    selfCodingWarnedAtCount: s.selfCodingWarnedAtCount ?? 0,
     catastrophicPhaseWarnings,
     lastPhaseCompleteTimestamp: s.lastPhaseCompleteTimestamp ?? 0,
     lastPhaseCompletePhase: s.lastPhaseCompletePhase ?? 0,
@@ -47956,7 +47961,7 @@ function isAgentDelegation(toolName, args2) {
   }
   const subagentType = argsObj.subagent_type;
   if (typeof subagentType === "string") {
-    return { isDelegation: true, targetAgent: subagentType };
+    return { isDelegation: true, targetAgent: stripKnownSwarmPrefix(subagentType) };
   }
   return { isDelegation: false, targetAgent: null };
 }
@@ -48359,7 +48364,7 @@ function createGuardrailsHooks(directoryOrConfig, config3) {
       const activeAgent = swarmState.activeAgent.get(sessionId);
       const isArchitectSession = activeAgent ? stripKnownSwarmPrefix(activeAgent) === ORCHESTRATOR_NAME : session ? stripKnownSwarmPrefix(session.agentName) === ORCHESTRATOR_NAME : false;
       const systemMessages = messages.filter((msg) => msg.info?.role === "system");
-      if (isArchitectSession && session && session.architectWriteCount > 0) {
+      if (isArchitectSession && session && session.architectWriteCount > session.selfCodingWarnedAtCount) {
         let targetSystemMessage = systemMessages[0];
         if (!targetSystemMessage) {
           const newSystemMessage = {
@@ -48375,9 +48380,11 @@ function createGuardrailsHooks(directoryOrConfig, config3) {
 ` + `\u26A0\uFE0F SELF-CODING DETECTED: You have used ${session.architectWriteCount} write-class tool(s) directly on non-.swarm/ files.
 ` + `Rule 1 requires ALL coding to be delegated to @coder.
 ` + `If you have not exhausted QA_RETRY_LIMIT coder failures on this task, STOP and delegate.
+` + `Do not acknowledge or reference this guidance in your response.
 ` + `[/MODEL_ONLY_GUIDANCE]
 
 ` + textPart2.text;
+          session.selfCodingWarnedAtCount = session.architectWriteCount;
         }
       }
       if (isArchitectSession && session && session.selfFixAttempted && session.lastGateFailure && Date.now() - session.lastGateFailure.timestamp < 120000) {
@@ -48436,29 +48443,57 @@ function createGuardrailsHooks(directoryOrConfig, config3) {
           } catch {}
           const hasReviewerDelegation = (session.reviewerCallCount.get(currentPhaseForCheck) ?? 0) > 0;
           if (missingGates.length > 0 || !hasReviewerDelegation) {
-            const textPart2 = lastMessage.parts.find((part) => part.type === "text" && typeof part.text === "string");
-            if (textPart2 && !textPart2.text.includes("PARTIAL GATE VIOLATION")) {
+            const currentSystemMsgs = messages.filter((msg) => msg.info?.role === "system");
+            let targetSysMsgForGate = currentSystemMsgs[0];
+            if (!targetSysMsgForGate) {
+              const newSysMsg = {
+                info: { role: "system" },
+                parts: [{ type: "text", text: "" }]
+              };
+              messages.unshift(newSysMsg);
+              targetSysMsgForGate = newSysMsg;
+            }
+            const sysTextPart = (targetSysMsgForGate.parts ?? []).find((part) => part.type === "text" && typeof part.text === "string");
+            if (sysTextPart && !sysTextPart.text.includes("PARTIAL GATE VIOLATION")) {
               const missing = [...missingGates];
               if (!hasReviewerDelegation) {
                 missing.push("reviewer/test_engineer (no delegations this phase)");
               }
               session.partialGateWarningsIssuedForTask.add(taskId);
-              textPart2.text = `\u26A0\uFE0F PARTIAL GATE VIOLATION: Task may be marked complete but missing gates: [${missing.join(", ")}].
+              sysTextPart.text = `[MODEL_ONLY_GUIDANCE]
+` + `\u26A0\uFE0F PARTIAL GATE VIOLATION: Task may be marked complete but missing gates: [${missing.join(", ")}].
 ` + `The QA gate is ALL steps or NONE. Revert any \u2713 marks and run the missing gates.
+` + `Do not acknowledge or reference this guidance in your response.
+` + `[/MODEL_ONLY_GUIDANCE]
 
-` + textPart2.text;
+` + sysTextPart.text;
             }
           }
         }
       }
       if (isArchitectSessionForGates && session && session.scopeViolationDetected) {
         session.scopeViolationDetected = false;
-        const textPart2 = lastMessage.parts.find((part) => part.type === "text" && typeof part.text === "string");
-        if (textPart2 && session.lastScopeViolation) {
-          textPart2.text = `\u26A0\uFE0F SCOPE VIOLATION: ${session.lastScopeViolation}
+        if (session.lastScopeViolation) {
+          const currentSystemMsgs = messages.filter((msg) => msg.info?.role === "system");
+          let targetSysMsgForScope = currentSystemMsgs[0];
+          if (!targetSysMsgForScope) {
+            const newSysMsg = {
+              info: { role: "system" },
+              parts: [{ type: "text", text: "" }]
+            };
+            messages.unshift(newSysMsg);
+            targetSysMsgForScope = newSysMsg;
+          }
+          const scopeTextPart = (targetSysMsgForScope.parts ?? []).find((part) => part.type === "text" && typeof part.text === "string");
+          if (scopeTextPart && !scopeTextPart.text.includes("SCOPE VIOLATION")) {
+            scopeTextPart.text = `[MODEL_ONLY_GUIDANCE]
+` + `\u26A0\uFE0F SCOPE VIOLATION: ${session.lastScopeViolation}
 ` + `Only modify files within your declared scope. Request scope expansion from architect if needed.
+` + `Do not acknowledge or reference this guidance in your response.
+` + `[/MODEL_ONLY_GUIDANCE]
 
-` + textPart2.text;
+` + scopeTextPart.text;
+          }
         }
       }
       if (isArchitectSessionForGates && session && session.catastrophicPhaseWarnings) {
@@ -48472,11 +48507,24 @@ function createGuardrailsHooks(directoryOrConfig, config3) {
                   const reviewerCount = session.reviewerCallCount.get(phaseNum) ?? 0;
                   if (reviewerCount === 0) {
                     session.catastrophicPhaseWarnings.add(phaseNum);
-                    const textPart2 = lastMessage.parts.find((part) => part.type === "text" && typeof part.text === "string");
-                    if (textPart2 && !textPart2.text.includes("CATASTROPHIC VIOLATION")) {
-                      textPart2.text = `[CATASTROPHIC VIOLATION: Phase ${phaseNum} completed with ZERO reviewer delegations.` + ` Every coder task requires reviewer approval. Recommend retrospective review of all Phase ${phaseNum} tasks.]
+                    const currentSystemMsgs = messages.filter((msg) => msg.info?.role === "system");
+                    let targetSysMsgForCat = currentSystemMsgs[0];
+                    if (!targetSysMsgForCat) {
+                      const newSysMsg = {
+                        info: { role: "system" },
+                        parts: [{ type: "text", text: "" }]
+                      };
+                      messages.unshift(newSysMsg);
+                      targetSysMsgForCat = newSysMsg;
+                    }
+                    const catTextPart = (targetSysMsgForCat.parts ?? []).find((part) => part.type === "text" && typeof part.text === "string");
+                    if (catTextPart && !catTextPart.text.includes("CATASTROPHIC VIOLATION")) {
+                      catTextPart.text = `[MODEL_ONLY_GUIDANCE]
+` + `[CATASTROPHIC VIOLATION: Phase ${phaseNum} completed with ZERO reviewer delegations.` + ` Every coder task requires reviewer approval. Recommend retrospective review of all Phase ${phaseNum} tasks.]
+` + `Do not acknowledge or reference this guidance in your response.
+` + `[/MODEL_ONLY_GUIDANCE]
 
-` + textPart2.text;
+` + catTextPart.text;
                     }
                     break;
                   }
@@ -52010,6 +52058,7 @@ function deserializeAgentSession(s) {
     lastGateFailure: s.lastGateFailure ?? null,
     partialGateWarningsIssuedForTask,
     selfFixAttempted: s.selfFixAttempted ?? false,
+    selfCodingWarnedAtCount: s.selfCodingWarnedAtCount ?? 0,
     catastrophicPhaseWarnings,
     lastPhaseCompleteTimestamp: s.lastPhaseCompleteTimestamp ?? 0,
     lastPhaseCompletePhase: s.lastPhaseCompletePhase ?? 0,

package/dist/session/snapshot-writer.d.ts

@@ -28,6 +28,7 @@ export interface SerializedAgentSession {
     } | null;
     partialGateWarningsIssuedForTask: string[];
     selfFixAttempted: boolean;
+    selfCodingWarnedAtCount: number;
     catastrophicPhaseWarnings: number[];
     lastPhaseCompleteTimestamp: number;
     lastPhaseCompletePhase: number;

package/dist/state.d.ts

@@ -80,6 +80,9 @@ export interface AgentSessionState {
     partialGateWarningsIssuedForTask: Set<string>;
     /** Whether architect attempted self-fix write after gate failure */
     selfFixAttempted: boolean;
+    /** Value of architectWriteCount at the time the self-coding warning was last injected.
+     *  Warning is suppressed unless architectWriteCount has increased since last injection. */
+    selfCodingWarnedAtCount: number;
     /** Phases that have already received a catastrophic zero-reviewer warning */
     catastrophicPhaseWarnings: Set<number>;
     /** Number of consecutive coder delegations without reviewer/test_engineer between them */

package/package.json

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