opencode-swarm 6.35.4 → 6.37.0

package/dist/cli/index.js

@@ -14422,7 +14422,7 @@ async function loadEvidence(directory, taskId) {
       return { status: "found", bundle: validated };
     } catch (error49) {
       warn(`Wrapped flat retrospective failed validation for task ${sanitizedTaskId}: ${error49 instanceof Error ? error49.message : String(error49)}`);
-      const errors3 = error49 instanceof ZodError ? error49.issues.map((e) => `${e.path.join(".")}: ${e.message}`) : [String(error49)];
+      const errors3 = error49 instanceof ZodError ? error49.issues.map((e) => `${e.path.join(".")}: ${e.message}`) : [error49 instanceof Error ? error49.message : String(error49)];
       return { status: "invalid_schema", errors: errors3 };
     }
   }
@@ -14431,7 +14431,7 @@ async function loadEvidence(directory, taskId) {
     return { status: "found", bundle: validated };
   } catch (error49) {
     warn(`Evidence bundle validation failed for task ${sanitizedTaskId}: ${error49 instanceof Error ? error49.message : String(error49)}`);
-    const errors3 = error49 instanceof ZodError ? error49.issues.map((e) => `${e.path.join(".")}: ${e.message}`) : [String(error49)];
+    const errors3 = error49 instanceof ZodError ? error49.issues.map((e) => `${e.path.join(".")}: ${e.message}`) : [error49 instanceof Error ? error49.message : String(error49)];
     return { status: "invalid_schema", errors: errors3 };
   }
 }
@@ -17633,6 +17633,7 @@ var ALL_SUBAGENT_NAMES = [
   "docs",
   "designer",
   "critic_sounding_board",
+  "critic_drift_verifier",
   ...QA_AGENTS,
   ...PIPELINE_AGENTS
 ];
@@ -17731,6 +17732,13 @@ var AGENT_TOOL_MAP = {
     "retrieve_summary",
     "symbols"
   ],
+  critic_drift_verifier: [
+    "complexity_hotspots",
+    "detect_domains",
+    "imports",
+    "retrieve_summary",
+    "symbols"
+  ],
   docs: [
     "detect_domains",
     "extract_code_blocks",
@@ -18444,7 +18452,11 @@ var swarmState = {
 function getAgentSession(sessionId) {
   return swarmState.agentSessions.get(sessionId);
 }
-function hasActiveTurboMode() {
+function hasActiveTurboMode(sessionID) {
+  if (sessionID) {
+    const session = swarmState.agentSessions.get(sessionID);
+    return session?.turboMode === true;
+  }
   for (const [_sessionId, session] of swarmState.agentSessions) {
     if (session.turboMode === true) {
       return true;
@@ -31104,7 +31116,16 @@ function createSwarmTool(opts) {
     args: opts.args,
     execute: async (args, ctx) => {
       const directory = ctx?.directory ?? process.cwd();
-      return opts.execute(args, directory, ctx);
+      try {
+        return await opts.execute(args, directory, ctx);
+      } catch (error93) {
+        const message = error93 instanceof Error ? error93.message : String(error93);
+        return JSON.stringify({
+          success: false,
+          message: "Tool execution failed",
+          errors: [message]
+        }, null, 2);
+      }
     }
   });
 }
@@ -32314,7 +32335,7 @@ async function handleCurateCommand(directory, _args) {
     if (error93 instanceof Error) {
       return `\u274C Curation failed: ${error93.message}`;
     }
-    return `\u274C Curation failed: ${String(error93)}`;
+    return `\u274C Curation failed: ${error93 instanceof Error ? error93.message : String(error93)}`;
   }
 }
 function formatCurationSummary(summary) {
@@ -32702,7 +32723,7 @@ async function handleDarkMatterCommand(directory, args) {
 [${entries.length} dark matter finding(s) saved to .swarm/knowledge.jsonl]`;
       }
     } catch (err) {
-      console.warn("dark-matter: failed to save knowledge entries:", err);
+      console.warn("dark-matter: failed to save knowledge entries:", err instanceof Error ? err.message : String(err));
       return output;
     }
   }
@@ -34461,7 +34482,7 @@ async function handleKnowledgeQuarantineCommand(directory, args) {
     await quarantineEntry(directory, entryId, reason, "user");
     return `\u2705 Entry ${entryId} quarantined successfully.`;
   } catch (error93) {
-    console.warn("[knowledge-command] quarantineEntry error:", error93);
+    console.warn("[knowledge-command] quarantineEntry error:", error93 instanceof Error ? error93.message : String(error93));
     return `\u274C Failed to quarantine entry. Check the entry ID and try again.`;
   }
 }
@@ -34477,7 +34498,7 @@ async function handleKnowledgeRestoreCommand(directory, args) {
     await restoreEntry(directory, entryId);
     return `\u2705 Entry ${entryId} restored successfully.`;
   } catch (error93) {
-    console.warn("[knowledge-command] restoreEntry error:", error93);
+    console.warn("[knowledge-command] restoreEntry error:", error93 instanceof Error ? error93.message : String(error93));
     return `\u274C Failed to restore entry. Check the entry ID and try again.`;
   }
 }
@@ -34499,7 +34520,7 @@ async function handleKnowledgeMigrateCommand(directory, args) {
     }
     return `\u2705 Migration complete: ${result.entriesMigrated} entries added, ${result.entriesDropped} dropped (validation/dedup), ${result.entriesTotal} total processed.`;
   } catch (error93) {
-    console.warn("[knowledge-command] migrateContextToKnowledge error:", error93);
+    console.warn("[knowledge-command] migrateContextToKnowledge error:", error93 instanceof Error ? error93.message : String(error93));
     return "\u274C Migration failed. Check .swarm/context.md is readable.";
   }
 }
@@ -34526,7 +34547,7 @@ async function handleKnowledgeListCommand(directory, _args) {
     return lines.join(`
 `);
   } catch (error93) {
-    console.warn("[knowledge-command] list error:", error93);
+    console.warn("[knowledge-command] list error:", error93 instanceof Error ? error93.message : String(error93));
     return "\u274C Failed to list knowledge entries. Ensure .swarm/knowledge.jsonl exists.";
   }
 }
@@ -36561,7 +36582,7 @@ function isExcluded(entry, relPath, exactNames, globPatterns) {
   return false;
 }
 function containsControlChars(str) {
-  return /[\0\r]/.test(str);
+  return /[\0\t\r\n]/.test(str);
 }
 function validateDirectoryInput(dir) {
   if (!dir || dir.length === 0) {
@@ -38632,7 +38653,7 @@ async function handlePromoteCommand(directory, args) {
       if (error93 instanceof Error) {
         return error93.message;
       }
-      return `Failed to promote lesson: ${String(error93)}`;
+      return `Failed to promote lesson: ${error93 instanceof Error ? error93.message : String(error93)}`;
     }
   }
   try {
@@ -38641,7 +38662,7 @@ async function handlePromoteCommand(directory, args) {
     if (error93 instanceof Error) {
       return error93.message;
     }
-    return `Failed to promote lesson: ${String(error93)}`;
+    return `Failed to promote lesson: ${error93 instanceof Error ? error93.message : String(error93)}`;
   }
 }
 
@@ -39575,7 +39596,7 @@ async function handleRollbackCommand(directory, args) {
     fs12.appendFileSync(eventsPath, `${JSON.stringify(rollbackEvent)}
 `);
   } catch (error93) {
-    console.error("Failed to write rollback event:", error93);
+    console.error("Failed to write rollback event:", error93 instanceof Error ? error93.message : String(error93));
   }
   return `Rolled back to phase ${targetPhase}: ${checkpoint2.label || "no label"}`;
 }

package/dist/config/constants.d.ts

@@ -2,8 +2,8 @@ import type { ToolName } from '../tools/tool-names';
 export declare const QA_AGENTS: readonly ["reviewer", "critic"];
 export declare const PIPELINE_AGENTS: readonly ["explorer", "coder", "test_engineer"];
 export declare const ORCHESTRATOR_NAME: "architect";
-export declare const ALL_SUBAGENT_NAMES: readonly ["sme", "docs", "designer", "critic_sounding_board", "reviewer", "critic", "explorer", "coder", "test_engineer"];
-export declare const ALL_AGENT_NAMES: readonly ["architect", "sme", "docs", "designer", "critic_sounding_board", "reviewer", "critic", "explorer", "coder", "test_engineer"];
+export declare const ALL_SUBAGENT_NAMES: readonly ["sme", "docs", "designer", "critic_sounding_board", "critic_drift_verifier", "reviewer", "critic", "explorer", "coder", "test_engineer"];
+export declare const ALL_AGENT_NAMES: readonly ["architect", "sme", "docs", "designer", "critic_sounding_board", "critic_drift_verifier", "reviewer", "critic", "explorer", "coder", "test_engineer"];
 export type QAAgentName = (typeof QA_AGENTS)[number];
 export type PipelineAgentName = (typeof PIPELINE_AGENTS)[number];
 export type AgentName = (typeof ALL_AGENT_NAMES)[number];

package/dist/hooks/curator-drift.d.ts

@@ -12,14 +12,14 @@ export declare function readPriorDriftReports(directory: string): Promise<DriftR
  */
 export declare function writeDriftReport(directory: string, report: DriftReport): Promise<string>;
 /**
- * Run the critic drift check for the given phase.
+ * Deterministic drift check for the given phase.
  * Builds a structured DriftReport from curator data, plan, spec, and prior reports.
  * Writes the report to .swarm/drift-report-phase-N.json.
  * Emits 'curator.drift.completed' event on success.
  * On any error: emits 'curator.error' event and returns a safe default result.
  * NEVER throws — drift failures must not block phase_complete.
  */
-export declare function runCriticDriftCheck(directory: string, phase: number, curatorResult: CuratorPhaseResult, config: CuratorConfig, injectAdvisory?: (message: string) => void): Promise<CriticDriftResult>;
+export declare function runDeterministicDriftCheck(directory: string, phase: number, curatorResult: CuratorPhaseResult, config: CuratorConfig, injectAdvisory?: (message: string) => void): Promise<CriticDriftResult>;
 /**
  * Build a truncated summary suitable for architect context injection.
  * Format: "<drift_report>Phase N: {alignment} ({drift_score}) — {key finding}. {correction if any}.</drift_report>"

package/dist/hooks/delegation-gate.d.ts

@@ -50,6 +50,13 @@ export declare function createDelegationGateHook(config: PluginConfig, directory
     messagesTransform: (input: Record<string, never>, output: {
         messages?: MessageWithParts[];
     }) => Promise<void>;
+    toolBefore: (input: {
+        tool: string;
+        sessionID: string;
+        callID: string;
+    }, output: {
+        args: unknown;
+    }) => Promise<void>;
     toolAfter: (input: {
         tool: string;
         sessionID: string;

package/dist/hooks/knowledge-curator.d.ts

@@ -7,10 +7,15 @@ import type { KnowledgeConfig } from './knowledge-types.js';
 export declare function isWriteToEvidenceFile(input: unknown): boolean;
 /**
  * Curate and store swarm knowledge entries from lessons.
+ * @returns Promise resolving to an object with counts of stored, skipped, and rejected lessons.
  */
 export declare function curateAndStoreSwarm(lessons: string[], projectName: string, phaseInfo: {
     phase_number: number;
-}, directory: string, config: KnowledgeConfig): Promise<void>;
+}, directory: string, config: KnowledgeConfig): Promise<{
+    stored: number;
+    skipped: number;
+    rejected: number;
+}>;
 /**
  * Auto-promote swarm entries based on phase confirmations and age.
  */

package/dist/hooks/knowledge-types.d.ts

@@ -24,7 +24,7 @@ export interface KnowledgeEntryBase {
     tags: string[];
     scope: string;
     confidence: number;
-    status: 'candidate' | 'established' | 'promoted';
+    status: 'candidate' | 'established' | 'promoted' | 'archived';
     confirmed_by: PhaseConfirmationRecord[] | ProjectConfirmationRecord[];
     retrieval_outcomes: RetrievalOutcome;
     schema_version: number;

package/dist/index.js

@@ -134,6 +134,7 @@ var init_constants = __esm(() => {
     "docs",
     "designer",
     "critic_sounding_board",
+    "critic_drift_verifier",
     ...QA_AGENTS,
     ...PIPELINE_AGENTS
   ];
@@ -232,6 +233,13 @@ var init_constants = __esm(() => {
       "retrieve_summary",
       "symbols"
     ],
+    critic_drift_verifier: [
+      "complexity_hotspots",
+      "detect_domains",
+      "imports",
+      "retrieve_summary",
+      "symbols"
+    ],
     docs: [
       "detect_domains",
       "extract_code_blocks",
@@ -258,6 +266,7 @@ var init_constants = __esm(() => {
     sme: "opencode/trinity-large-preview-free",
     critic: "opencode/trinity-large-preview-free",
     critic_sounding_board: "opencode/trinity-large-preview-free",
+    critic_drift_verifier: "opencode/trinity-large-preview-free",
     docs: "opencode/trinity-large-preview-free",
     designer: "opencode/trinity-large-preview-free",
     default: "opencode/trinity-large-preview-free"
@@ -15689,7 +15698,7 @@ async function loadEvidence(directory, taskId) {
       return { status: "found", bundle: validated };
     } catch (error49) {
       warn(`Wrapped flat retrospective failed validation for task ${sanitizedTaskId}: ${error49 instanceof Error ? error49.message : String(error49)}`);
-      const errors3 = error49 instanceof ZodError ? error49.issues.map((e) => `${e.path.join(".")}: ${e.message}`) : [String(error49)];
+      const errors3 = error49 instanceof ZodError ? error49.issues.map((e) => `${e.path.join(".")}: ${e.message}`) : [error49 instanceof Error ? error49.message : String(error49)];
       return { status: "invalid_schema", errors: errors3 };
     }
   }
@@ -15698,7 +15707,7 @@ async function loadEvidence(directory, taskId) {
     return { status: "found", bundle: validated };
   } catch (error49) {
     warn(`Evidence bundle validation failed for task ${sanitizedTaskId}: ${error49 instanceof Error ? error49.message : String(error49)}`);
-    const errors3 = error49 instanceof ZodError ? error49.issues.map((e) => `${e.path.join(".")}: ${e.message}`) : [String(error49)];
+    const errors3 = error49 instanceof ZodError ? error49.issues.map((e) => `${e.path.join(".")}: ${e.message}`) : [error49 instanceof Error ? error49.message : String(error49)];
     return { status: "invalid_schema", errors: errors3 };
   }
 }
@@ -30024,7 +30033,16 @@ function createSwarmTool(opts) {
     args: opts.args,
     execute: async (args2, ctx) => {
       const directory = ctx?.directory ?? process.cwd();
-      return opts.execute(args2, directory, ctx);
+      try {
+        return await opts.execute(args2, directory, ctx);
+      } catch (error93) {
+        const message = error93 instanceof Error ? error93.message : String(error93);
+        return JSON.stringify({
+          success: false,
+          message: "Tool execution failed",
+          errors: [message]
+        }, null, 2);
+      }
     }
   });
 }
@@ -34177,7 +34195,7 @@ function isExcluded(entry, relPath, exactNames, globPatterns) {
   return false;
 }
 function containsControlChars(str) {
-  return /[\0\r]/.test(str);
+  return /[\0\t\r\n]/.test(str);
 }
 function validateDirectoryInput(dir) {
   if (!dir || dir.length === 0) {
@@ -36621,6 +36639,175 @@ var init_preflight_integration = __esm(() => {
   init_preflight_service();
 });
 
+// src/hooks/curator-drift.ts
+var exports_curator_drift = {};
+__export(exports_curator_drift, {
+  writeDriftReport: () => writeDriftReport,
+  runDeterministicDriftCheck: () => runDeterministicDriftCheck,
+  readPriorDriftReports: () => readPriorDriftReports,
+  buildDriftInjectionText: () => buildDriftInjectionText
+});
+import * as fs26 from "fs";
+import * as path37 from "path";
+async function readPriorDriftReports(directory) {
+  const swarmDir = path37.join(directory, ".swarm");
+  const entries = await fs26.promises.readdir(swarmDir).catch(() => null);
+  if (entries === null)
+    return [];
+  const reportFiles = entries.filter((name2) => name2.startsWith(DRIFT_REPORT_PREFIX) && name2.endsWith(".json")).sort();
+  const reports = [];
+  for (const filename of reportFiles) {
+    const content = await readSwarmFileAsync(directory, filename);
+    if (content === null)
+      continue;
+    try {
+      const report = JSON.parse(content);
+      if (typeof report.phase !== "number" || typeof report.alignment !== "string") {
+        console.warn(`[curator-drift] Skipping corrupt drift report: ${filename}`);
+        continue;
+      }
+      reports.push(report);
+    } catch {
+      console.warn(`[curator-drift] Skipping unreadable drift report: ${filename}`);
+    }
+  }
+  reports.sort((a, b) => a.phase - b.phase);
+  return reports;
+}
+async function writeDriftReport(directory, report) {
+  const filename = `${DRIFT_REPORT_PREFIX}${report.phase}.json`;
+  const filePath = validateSwarmPath(directory, filename);
+  const swarmDir = path37.dirname(filePath);
+  await fs26.promises.mkdir(swarmDir, { recursive: true });
+  try {
+    await fs26.promises.writeFile(filePath, JSON.stringify(report, null, 2), "utf-8");
+  } catch (err2) {
+    throw new Error(`[curator-drift] Failed to write drift report to ${filePath}: ${String(err2)}`);
+  }
+  return filePath;
+}
+async function runDeterministicDriftCheck(directory, phase, curatorResult, config3, injectAdvisory) {
+  try {
+    const planMd = await readSwarmFileAsync(directory, "plan.md");
+    const specMd = await readSwarmFileAsync(directory, "spec.md");
+    const priorReports = await readPriorDriftReports(directory);
+    const complianceCount = curatorResult.compliance.length;
+    const warningCompliance = curatorResult.compliance.filter((obs) => obs.severity === "warning");
+    let alignment = "ALIGNED";
+    let driftScore = 0;
+    if (!planMd) {
+      alignment = "MINOR_DRIFT";
+      driftScore = 0.3;
+    } else if (warningCompliance.length >= 3) {
+      alignment = "MAJOR_DRIFT";
+      driftScore = Math.min(0.9, 0.5 + warningCompliance.length * 0.1);
+    } else if (warningCompliance.length >= 1 || complianceCount >= 3) {
+      alignment = "MINOR_DRIFT";
+      driftScore = Math.min(0.49, 0.2 + complianceCount * 0.05);
+    }
+    const priorSummaries = priorReports.map((r) => r.injection_summary).filter(Boolean);
+    const keyCorrections = warningCompliance.map((obs) => obs.description);
+    const firstDeviation = warningCompliance.length > 0 ? {
+      phase,
+      task: "unknown",
+      description: warningCompliance[0]?.description ?? ""
+    } : null;
+    const payloadLines = [
+      `CURATOR_DIGEST: ${JSON.stringify(curatorResult.digest)}`,
+      `CURATOR_COMPLIANCE: ${JSON.stringify(curatorResult.compliance)}`,
+      `PLAN: ${planMd ?? "none"}`,
+      `SPEC: ${specMd ?? "none"}`,
+      `PRIOR_DRIFT_REPORTS: ${JSON.stringify(priorSummaries)}`
+    ];
+    const payload = payloadLines.join(`
+`);
+    const requirementsChecked = curatorResult.digest.tasks_total;
+    const requirementsSatisfied = curatorResult.digest.tasks_completed;
+    const injectionSummaryRaw = `Phase ${phase}: ${alignment} (${driftScore.toFixed(2)}) \u2014 ${firstDeviation ? firstDeviation.description : "all requirements on track"}.${keyCorrections.length > 0 ? `Correction: ${keyCorrections[0] ?? ""}.` : ""}`;
+    const injectionSummary = injectionSummaryRaw.slice(0, config3.drift_inject_max_chars);
+    const report = {
+      schema_version: 1,
+      phase,
+      timestamp: new Date().toISOString(),
+      alignment,
+      drift_score: driftScore,
+      first_deviation: firstDeviation,
+      compounding_effects: priorReports.filter((r) => r.alignment !== "ALIGNED").map((r) => `Phase ${r.phase}: ${r.alignment}`).slice(0, 5),
+      corrections: keyCorrections.slice(0, 5),
+      requirements_checked: requirementsChecked,
+      requirements_satisfied: requirementsSatisfied,
+      scope_additions: [],
+      injection_summary: injectionSummary
+    };
+    const reportPath = await writeDriftReport(directory, report);
+    getGlobalEventBus().publish("curator.drift.completed", {
+      phase,
+      alignment,
+      drift_score: driftScore,
+      report_path: reportPath
+    });
+    if (injectAdvisory && alignment !== "ALIGNED" && driftScore > 0) {
+      try {
+        const advisoryText = `CURATOR DRIFT DETECTED (phase ${phase}, score ${driftScore.toFixed(2)}): ${injectionSummary.slice(0, 300)}. Review .swarm/${DRIFT_REPORT_PREFIX}${phase}.json and address spec alignment before proceeding.`;
+        injectAdvisory(advisoryText);
+      } catch {}
+    }
+    const injectionText = injectionSummary;
+    return {
+      phase,
+      report,
+      report_path: reportPath,
+      injection_text: injectionText
+    };
+  } catch (err2) {
+    getGlobalEventBus().publish("curator.error", {
+      operation: "drift",
+      phase,
+      error: String(err2)
+    });
+    const defaultReport = {
+      schema_version: 1,
+      phase,
+      timestamp: new Date().toISOString(),
+      alignment: "ALIGNED",
+      drift_score: 0,
+      first_deviation: null,
+      compounding_effects: [],
+      corrections: [],
+      requirements_checked: 0,
+      requirements_satisfied: 0,
+      scope_additions: [],
+      injection_summary: `Phase ${phase}: drift analysis unavailable (${String(err2)})`
+    };
+    return {
+      phase,
+      report: defaultReport,
+      report_path: "",
+      injection_text: ""
+    };
+  }
+}
+function buildDriftInjectionText(report, maxChars) {
+  if (maxChars <= 0) {
+    return "";
+  }
+  let text;
+  if (report.alignment === "ALIGNED" && report.drift_score < 0.1) {
+    text = `<drift_report>Phase ${report.phase}: ALIGNED, all requirements on track.</drift_report>`;
+  } else {
+    const keyFinding = report.first_deviation?.description ?? "no deviation recorded";
+    const score = report.drift_score ?? 0;
+    const correctionClause = report.corrections?.[0] ? `Correction: ${report.corrections[0]}.` : "";
+    text = `<drift_report>Phase ${report.phase}: ${report.alignment} (${score.toFixed(2)}) \u2014 ${keyFinding}. ${correctionClause}</drift_report>`;
+  }
+  return text.slice(0, maxChars);
+}
+var DRIFT_REPORT_PREFIX = "drift-report-phase-";
+var init_curator_drift = __esm(() => {
+  init_event_bus();
+  init_utils2();
+});
+
 // node_modules/web-tree-sitter/tree-sitter.js
 function assertInternal(x) {
   if (x !== INTERNAL)
@@ -40199,7 +40386,7 @@ async function readPlanFromDisk(directory) {
     return null;
   }
 }
-async function readEvidenceFromDisk(directory) {
+async function readGateEvidenceFromDisk(directory) {
   const evidenceMap = new Map;
   try {
     const evidenceDir = path3.join(directory, ".swarm", "evidence");
@@ -40234,7 +40421,7 @@ async function buildRehydrationCache(directory) {
       }
     }
   }
-  const evidenceMap = await readEvidenceFromDisk(directory);
+  const evidenceMap = await readGateEvidenceFromDisk(directory);
   _rehydrationCache = { planTaskStates, evidenceMap };
 }
 function applyRehydrationCache(session) {
@@ -40272,7 +40459,11 @@ async function rehydrateSessionFromDisk(directory, session) {
   await buildRehydrationCache(directory);
   applyRehydrationCache(session);
 }
-function hasActiveTurboMode() {
+function hasActiveTurboMode(sessionID) {
+  if (sessionID) {
+    const session = swarmState.agentSessions.get(sessionID);
+    return session?.turboMode === true;
+  }
   for (const [_sessionId, session] of swarmState.agentSessions) {
     if (session.turboMode === true) {
       return true;
@@ -40339,7 +40530,9 @@ Do not re-trigger DISCOVER or CONSULT because you noticed a project phase bounda
 Output to .swarm/plan.md MUST use "## Phase N" headers. Do not write MODE labels into plan.md.
 
 1. DELEGATE all coding to {{AGENT_PREFIX}}coder. You do NOT write code.
-YOUR TOOLS: Task (delegation), diff, syntax_check, placeholder_scan, imports, lint, secretscan, sast_scan, build_check, pre_check_batch, quality_budget, symbols, complexity_hotspots, schema_drift, todo_extract, evidence_check, sbom_generate, checkpoint, pkg_audit, test_runner.
+// IMPORTANT: This list MUST match AGENT_TOOL_MAP['architect'] in src/config/constants.ts
+// If you add a tool to the map, add it here. If you remove it from the map, remove it here.
+YOUR TOOLS: Task (delegation), checkpoint, check_gate_status, complexity_hotspots, declare_scope, detect_domains, diff, evidence_check, extract_code_blocks, gitingest, imports, knowledge_query, lint, pkg_audit, pre_check_batch, retrieve_summary, save_plan, schema_drift, secretscan, symbols, test_runner, todo_extract, update_task_status, write_retro.
 CODER'S TOOLS: write, edit, patch, apply_patch, create_file, insert, replace \u2014 any tool that modifies file contents.
 If a tool modifies a file, it is a CODER tool. Delegate.
 2. ONE agent per message. Send, STOP, wait for response.
@@ -41187,10 +41380,10 @@ The tool will automatically write the retrospective to \`.swarm/evidence/retro-{
 4. Write retrospective evidence: record phase, total_tool_calls, coder_revisions, reviewer_rejections, test_failures, security_findings, integration_issues, task_count, task_complexity, top_rejection_reasons, lessons_learned to .swarm/evidence/ via write_retro. Reset Phase Metrics in context.md to 0.
 4.5. Run \`evidence_check\` to verify all completed tasks have required evidence (review + test). If gaps found, note in retrospective lessons_learned. Optionally run \`pkg_audit\` if dependencies were modified during this phase. Optionally run \`schema_drift\` if API routes were modified during this phase.
 5. Run \`sbom_generate\` with scope='changed' to capture post-implementation dependency snapshot (saved to \`.swarm/evidence/sbom/\`). This is a non-blocking step - always proceeds to summary.
-5.5. **Defense-in-depth drift check**: The \`phase_complete\` tool now enforces two mandatory gates automatically \u2014 (1) completion-verify (deterministic identifier check) and (2) drift verification gate evidence check. If either gate fails, \`phase_complete\` returns status 'blocked'. As defense-in-depth, delegate to {{AGENT_PREFIX}}critic with drift-check context BEFORE calling phase_complete to get early feedback on drift issues and write the required evidence. If spec.md does not exist: skip the critic delegation.
+5.5. **Drift verification**: Delegate to {{AGENT_PREFIX}}critic_drift_verifier for phase drift review BEFORE calling phase_complete. The critic_drift_verifier will read every target file, verify described changes exist, and produce drift evidence. Persist critic drift evidence at \`.swarm/evidence/{phase}/drift-verifier.json\`. Only then call phase_complete. If the critic returns needs_revision, address the missing items before retrying phase_complete. If spec.md does not exist: skip the critic delegation. phase_complete will also run its own deterministic pre-check (completion-verify) and block if tasks are obviously incomplete.
 5.6. **Mandatory gate evidence**: Before calling phase_complete, ensure:
    - \`.swarm/evidence/{phase}/completion-verify.json\` exists (written automatically by the completion-verify gate)
-   - \`.swarm/evidence/{phase}/drift-verifier.json\` exists with verdict 'approved' (written by the curator drift check or critic drift verification delegation in step 5.5)
+   - \`.swarm/evidence/{phase}/drift-verifier.json\` exists with verdict 'approved' (written by the critic_drift_verifier delegation in step 5.5)
    If either is missing, run the missing gate first. Turbo mode skips both gates automatically.
 6. Summarize to user
 7. Ask: "Ready for Phase [N+1]?"
@@ -41270,7 +41463,7 @@ While Turbo Mode is active:
 - **Stage A gates** (lint, imports, pre_check_batch) are still REQUIRED for ALL tasks
 - **Tier 3 tasks** (security-sensitive files matching: architect*.ts, delegation*.ts, guardrails*.ts, adversarial*.ts, sanitiz*.ts, auth*, permission*, crypto*, secret*, security) still require FULL review (Stage B)
 - **Tier 0-2 tasks** can skip Stage B (reviewer, test_engineer) to speed up execution
-- **Phase completion gates** (completion-verify and drift verification gate) are automatically bypassed \u2014 phase_complete will succeed without drift verification evidence when turbo is active
+- **Phase completion gates** (completion-verify and drift verification gate) are automatically bypassed \u2014 phase_complete will succeed without drift verification evidence when turbo is active. Note: turbo bypass is session-scoped; one session's turbo does not affect other sessions.
 
 Classification still determines the pipeline:
 - TIER 0 (metadata): lint + diff only \u2014 no change
@@ -42816,6 +43009,11 @@ If you call @coder instead of @${swarmId}_coder, the call will FAIL or go to the
     critic.name = prefixName("critic_sounding_board");
     agents.push(applyOverrides(critic, swarmAgents, swarmPrefix));
   }
+  if (!isAgentDisabled("critic_drift_verifier", swarmAgents, swarmPrefix)) {
+    const critic = createCriticAgent(swarmAgents?.critic_drift_verifier?.model ?? getModel("critic"), undefined, undefined, "phase_drift_verifier");
+    critic.name = prefixName("critic_drift_verifier");
+    agents.push(applyOverrides(critic, swarmAgents, swarmPrefix));
+  }
   if (!isAgentDisabled("test_engineer", swarmAgents, swarmPrefix)) {
     const testPrompts = getPrompts("test_engineer");
     const testEngineer = createTestEngineerAgent(getModel("test_engineer"), testPrompts.prompt, testPrompts.appendPrompt);
@@ -45533,7 +45731,7 @@ async function handleCurateCommand(directory, _args) {
     if (error93 instanceof Error) {
       return `\u274C Curation failed: ${error93.message}`;
     }
-    return `\u274C Curation failed: ${String(error93)}`;
+    return `\u274C Curation failed: ${error93 instanceof Error ? error93.message : String(error93)}`;
   }
 }
 function formatCurationSummary(summary) {
@@ -45923,7 +46121,7 @@ async function handleDarkMatterCommand(directory, args2) {
 [${entries.length} dark matter finding(s) saved to .swarm/knowledge.jsonl]`;
       }
     } catch (err2) {
-      console.warn("dark-matter: failed to save knowledge entries:", err2);
+      console.warn("dark-matter: failed to save knowledge entries:", err2 instanceof Error ? err2.message : String(err2));
       return output;
     }
   }
@@ -47697,7 +47895,7 @@ async function handleKnowledgeQuarantineCommand(directory, args2) {
     await quarantineEntry(directory, entryId, reason, "user");
     return `\u2705 Entry ${entryId} quarantined successfully.`;
   } catch (error93) {
-    console.warn("[knowledge-command] quarantineEntry error:", error93);
+    console.warn("[knowledge-command] quarantineEntry error:", error93 instanceof Error ? error93.message : String(error93));
     return `\u274C Failed to quarantine entry. Check the entry ID and try again.`;
   }
 }
@@ -47713,7 +47911,7 @@ async function handleKnowledgeRestoreCommand(directory, args2) {
     await restoreEntry(directory, entryId);
     return `\u2705 Entry ${entryId} restored successfully.`;
   } catch (error93) {
-    console.warn("[knowledge-command] restoreEntry error:", error93);
+    console.warn("[knowledge-command] restoreEntry error:", error93 instanceof Error ? error93.message : String(error93));
     return `\u274C Failed to restore entry. Check the entry ID and try again.`;
   }
 }
@@ -47735,7 +47933,7 @@ async function handleKnowledgeMigrateCommand(directory, args2) {
     }
     return `\u2705 Migration complete: ${result.entriesMigrated} entries added, ${result.entriesDropped} dropped (validation/dedup), ${result.entriesTotal} total processed.`;
   } catch (error93) {
-    console.warn("[knowledge-command] migrateContextToKnowledge error:", error93);
+    console.warn("[knowledge-command] migrateContextToKnowledge error:", error93 instanceof Error ? error93.message : String(error93));
     return "\u274C Migration failed. Check .swarm/context.md is readable.";
   }
 }
@@ -47762,7 +47960,7 @@ async function handleKnowledgeListCommand(directory, _args) {
     return lines.join(`
 `);
   } catch (error93) {
-    console.warn("[knowledge-command] list error:", error93);
+    console.warn("[knowledge-command] list error:", error93 instanceof Error ? error93.message : String(error93));
     return "\u274C Failed to list knowledge entries. Ensure .swarm/knowledge.jsonl exists.";
   }
 }
@@ -47953,7 +48151,7 @@ async function handlePromoteCommand(directory, args2) {
       if (error93 instanceof Error) {
         return error93.message;
       }
-      return `Failed to promote lesson: ${String(error93)}`;
+      return `Failed to promote lesson: ${error93 instanceof Error ? error93.message : String(error93)}`;
     }
   }
   try {
@@ -47962,7 +48160,7 @@ async function handlePromoteCommand(directory, args2) {
     if (error93 instanceof Error) {
       return error93.message;
     }
-    return `Failed to promote lesson: ${String(error93)}`;
+    return `Failed to promote lesson: ${error93 instanceof Error ? error93.message : String(error93)}`;
   }
 }
 
@@ -48248,7 +48446,7 @@ async function handleRollbackCommand(directory, args2) {
     fs18.appendFileSync(eventsPath, `${JSON.stringify(rollbackEvent)}
 `);
   } catch (error93) {
-    console.error("Failed to write rollback event:", error93);
+    console.error("Failed to write rollback event:", error93 instanceof Error ? error93.message : String(error93));
   }
   return `Rolled back to phase ${targetPhase}: ${checkpoint2.label || "no label"}`;
 }
@@ -50948,15 +51146,19 @@ function createGuardrailsHooks(directory, directoryOrConfig, config3) {
           const errorContent = output.error ?? outputStr;
           if (typeof errorContent === "string" && TRANSIENT_MODEL_ERROR_PATTERN.test(errorContent) && !session.modelFallbackExhausted) {
             session.model_fallback_index++;
-            session.modelFallbackExhausted = true;
             const baseAgentName = session.agentName ? session.agentName.replace(/^[^_]+[_]/, "") : "";
-            const fallbackModel = resolveFallbackModel(baseAgentName, session.model_fallback_index, getSwarmAgents());
+            const swarmAgents = getSwarmAgents();
+            const fallbackModels = swarmAgents?.[baseAgentName]?.fallback_models;
+            session.modelFallbackExhausted = !fallbackModels || session.model_fallback_index > fallbackModels.length;
+            const fallbackModel = resolveFallbackModel(baseAgentName, session.model_fallback_index, swarmAgents);
             if (fallbackModel) {
-              const swarmAgents = getSwarmAgents();
               const primaryModel = swarmAgents?.[baseAgentName]?.model ?? "default";
+              if (swarmAgents?.[baseAgentName]) {
+                swarmAgents[baseAgentName].model = fallbackModel;
+              }
               telemetry.modelFallback(input.sessionID, session.agentName, primaryModel, fallbackModel, "transient_model_error");
               session.pendingAdvisoryMessages ??= [];
-              session.pendingAdvisoryMessages.push(`MODEL FALLBACK: Transient model error detected (attempt ${session.model_fallback_index}). ` + `Configured fallback model: "${fallbackModel}". ` + `Consider retrying with this model or using /swarm handoff to reset.`);
+              session.pendingAdvisoryMessages.push(`MODEL FALLBACK: Applied fallback model "${fallbackModel}" (attempt ${session.model_fallback_index}). ` + `Using /swarm handoff to reset to primary model.`);
             } else {
               session.pendingAdvisoryMessages ??= [];
               session.pendingAdvisoryMessages.push(`MODEL FALLBACK: Transient model error detected (attempt ${session.model_fallback_index}). ` + `No fallback models configured for this agent. Add "fallback_models": ["model-a", "model-b"] ` + `to the agent's config in opencode-swarm.json.`);
@@ -51362,9 +51564,40 @@ function createDelegationGateHook(config3, directory) {
   if (!enabled) {
     return {
       messagesTransform: async (_input, _output) => {},
+      toolBefore: async () => {},
       toolAfter: async () => {}
     };
   }
+  const toolBefore = async (input, output) => {
+    if (!input.sessionID)
+      return;
+    const normalized = input.tool.replace(/^[^:]+[:.]/, "");
+    if (normalized !== "Task" && normalized !== "task")
+      return;
+    const args2 = output.args;
+    if (!args2)
+      return;
+    const subagentType = args2.subagent_type;
+    if (typeof subagentType !== "string")
+      return;
+    const targetAgent = stripKnownSwarmPrefix(subagentType);
+    if (targetAgent !== "coder")
+      return;
+    const session = swarmState.agentSessions.get(input.sessionID);
+    if (!session || !session.taskWorkflowStates)
+      return;
+    for (const [taskId, state2] of session.taskWorkflowStates) {
+      if (state2 !== "coder_delegated")
+        continue;
+      const turbo = hasActiveTurboMode(input.sessionID);
+      if (turbo) {
+        const isTier3 = taskId.startsWith("3.");
+        if (!isTier3)
+          continue;
+      }
+      throw new Error(`REVIEWER_GATE_VIOLATION: Cannot re-delegate to coder without reviewer delegation. ` + `Task ${taskId} state: coder_delegated. Delegate to reviewer first.`);
+    }
+  };
   const toolAfter = async (input, _output) => {
     if (!input.sessionID)
       return;
@@ -51450,7 +51683,7 @@ function createDelegationGateHook(config3, directory) {
           const rawTaskId = directArgs?.task_id;
           const evidenceTaskId = typeof rawTaskId === "string" && rawTaskId.length <= 20 && /^\d+\.\d+$/.test(rawTaskId.trim()) ? rawTaskId.trim() : await getEvidenceTaskId(session, directory);
           if (evidenceTaskId) {
-            const turbo = hasActiveTurboMode();
+            const turbo = hasActiveTurboMode(input.sessionID);
             const gateAgents = [
               "reviewer",
               "test_engineer",
@@ -51569,7 +51802,7 @@ function createDelegationGateHook(config3, directory) {
           const rawTaskId = directArgs?.task_id;
           const evidenceTaskId = typeof rawTaskId === "string" && rawTaskId.length <= 20 && /^\d+\.\d+$/.test(rawTaskId.trim()) ? rawTaskId.trim() : await getEvidenceTaskId(session, directory);
           if (evidenceTaskId) {
-            const turbo = hasActiveTurboMode();
+            const turbo = hasActiveTurboMode(input.sessionID);
             if (hasReviewer) {
               const { recordGateEvidence: recordGateEvidence2 } = await Promise.resolve().then(() => (init_gate_evidence(), exports_gate_evidence));
               await recordGateEvidence2(directory, evidenceTaskId, "reviewer", input.sessionID, turbo);
@@ -51586,6 +51819,7 @@ function createDelegationGateHook(config3, directory) {
     }
   };
   return {
+    toolBefore,
     messagesTransform: async (_input, output) => {
       const messages = output.messages;
       if (!messages || messages.length === 0)
@@ -54395,13 +54629,28 @@ async function processRetractions(retractions, directory) {
 async function curateAndStoreSwarm(lessons, projectName, phaseInfo, directory, config3) {
   const knowledgePath = resolveSwarmKnowledgePath(directory);
   const existingEntries = await readKnowledge(knowledgePath) ?? [];
+  let stored = 0;
+  let skipped = 0;
+  let rejected = 0;
+  const categoryByTag = new Map([
+    ["process", "process"],
+    ["architecture", "architecture"],
+    ["tooling", "tooling"],
+    ["security", "security"],
+    ["testing", "testing"],
+    ["debugging", "debugging"],
+    ["performance", "performance"],
+    ["integration", "integration"],
+    ["other", "other"]
+  ]);
   for (const lesson of lessons) {
     const tags = inferTags(lesson);
     let category = "process";
-    if (tags.includes("security")) {
-      category = "security";
-    } else if (tags.includes("testing")) {
-      category = "testing";
+    for (const tag of tags) {
+      if (categoryByTag.has(tag)) {
+        category = categoryByTag.get(tag);
+        break;
+      }
     }
     const meta3 = {
       category,
@@ -54410,18 +54659,20 @@ async function curateAndStoreSwarm(lessons, projectName, phaseInfo, directory, c
     };
     const result = validateLesson(lesson, existingEntries.map((e) => e.lesson), meta3);
     if (result.valid === false || result.severity === "error") {
-      const rejected = {
+      const rejectedLesson = {
         id: crypto.randomUUID(),
         lesson,
         rejection_reason: result.reason ?? "unknown",
         rejected_at: new Date().toISOString(),
         rejection_layer: result.layer ?? 1
       };
-      await appendRejectedLesson(directory, rejected);
+      await appendRejectedLesson(directory, rejectedLesson);
+      rejected++;
       continue;
     }
     const duplicate = findNearDuplicate(lesson, existingEntries, config3.dedup_threshold);
     if (duplicate) {
+      skipped++;
       continue;
     }
     const entry = {
@@ -54452,9 +54703,11 @@ async function curateAndStoreSwarm(lessons, projectName, phaseInfo, directory, c
       auto_generated: true
     };
     await appendKnowledge(knowledgePath, entry);
+    stored++;
     existingEntries.push(entry);
   }
   await runAutoPromotion(directory, config3);
+  return { stored, skipped, rejected };
 }
 async function runAutoPromotion(directory, config3) {
   const knowledgePath = resolveSwarmKnowledgePath(directory);
@@ -54670,200 +54923,8 @@ Use this data to avoid repeating known failure patterns.`;
   return prefix + summaryText + suffix;
 }
 
-// src/hooks/curator-drift.ts
-init_event_bus();
-init_utils2();
-import * as fs26 from "fs";
-import * as fsSync from "fs";
-import * as path37 from "path";
-var DRIFT_REPORT_PREFIX = "drift-report-phase-";
-async function readPriorDriftReports(directory) {
-  const swarmDir = path37.join(directory, ".swarm");
-  const entries = await fs26.promises.readdir(swarmDir).catch(() => null);
-  if (entries === null)
-    return [];
-  const reportFiles = entries.filter((name2) => name2.startsWith(DRIFT_REPORT_PREFIX) && name2.endsWith(".json")).sort();
-  const reports = [];
-  for (const filename of reportFiles) {
-    const content = await readSwarmFileAsync(directory, filename);
-    if (content === null)
-      continue;
-    try {
-      const report = JSON.parse(content);
-      if (typeof report.phase !== "number" || typeof report.alignment !== "string") {
-        console.warn(`[curator-drift] Skipping corrupt drift report: ${filename}`);
-        continue;
-      }
-      reports.push(report);
-    } catch {
-      console.warn(`[curator-drift] Skipping unreadable drift report: ${filename}`);
-    }
-  }
-  reports.sort((a, b) => a.phase - b.phase);
-  return reports;
-}
-async function writeDriftReport(directory, report) {
-  const filename = `${DRIFT_REPORT_PREFIX}${report.phase}.json`;
-  const filePath = validateSwarmPath(directory, filename);
-  const swarmDir = path37.dirname(filePath);
-  await fs26.promises.mkdir(swarmDir, { recursive: true });
-  try {
-    await fs26.promises.writeFile(filePath, JSON.stringify(report, null, 2), "utf-8");
-  } catch (err2) {
-    throw new Error(`[curator-drift] Failed to write drift report to ${filePath}: ${String(err2)}`);
-  }
-  return filePath;
-}
-async function runCriticDriftCheck(directory, phase, curatorResult, config3, injectAdvisory) {
-  try {
-    const planMd = await readSwarmFileAsync(directory, "plan.md");
-    const specMd = await readSwarmFileAsync(directory, "spec.md");
-    const priorReports = await readPriorDriftReports(directory);
-    const complianceCount = curatorResult.compliance.length;
-    const warningCompliance = curatorResult.compliance.filter((obs) => obs.severity === "warning");
-    let alignment = "ALIGNED";
-    let driftScore = 0;
-    if (!planMd) {
-      alignment = "MINOR_DRIFT";
-      driftScore = 0.3;
-    } else if (warningCompliance.length >= 3) {
-      alignment = "MAJOR_DRIFT";
-      driftScore = Math.min(0.9, 0.5 + warningCompliance.length * 0.1);
-    } else if (warningCompliance.length >= 1 || complianceCount >= 3) {
-      alignment = "MINOR_DRIFT";
-      driftScore = Math.min(0.49, 0.2 + complianceCount * 0.05);
-    }
-    const priorSummaries = priorReports.map((r) => r.injection_summary).filter(Boolean);
-    const keyCorrections = warningCompliance.map((obs) => obs.description);
-    const firstDeviation = warningCompliance.length > 0 ? {
-      phase,
-      task: "unknown",
-      description: warningCompliance[0]?.description ?? ""
-    } : null;
-    const payloadLines = [
-      `CURATOR_DIGEST: ${JSON.stringify(curatorResult.digest)}`,
-      `CURATOR_COMPLIANCE: ${JSON.stringify(curatorResult.compliance)}`,
-      `PLAN: ${planMd ?? "none"}`,
-      `SPEC: ${specMd ?? "none"}`,
-      `PRIOR_DRIFT_REPORTS: ${JSON.stringify(priorSummaries)}`
-    ];
-    const payload = payloadLines.join(`
-`);
-    const requirementsChecked = curatorResult.digest.tasks_total;
-    const requirementsSatisfied = curatorResult.digest.tasks_completed;
-    const injectionSummaryRaw = `Phase ${phase}: ${alignment} (${driftScore.toFixed(2)}) \u2014 ${firstDeviation ? firstDeviation.description : "all requirements on track"}.${keyCorrections.length > 0 ? `Correction: ${keyCorrections[0] ?? ""}.` : ""}`;
-    const injectionSummary = injectionSummaryRaw.slice(0, config3.drift_inject_max_chars);
-    const report = {
-      schema_version: 1,
-      phase,
-      timestamp: new Date().toISOString(),
-      alignment,
-      drift_score: driftScore,
-      first_deviation: firstDeviation,
-      compounding_effects: priorReports.filter((r) => r.alignment !== "ALIGNED").map((r) => `Phase ${r.phase}: ${r.alignment}`).slice(0, 5),
-      corrections: keyCorrections.slice(0, 5),
-      requirements_checked: requirementsChecked,
-      requirements_satisfied: requirementsSatisfied,
-      scope_additions: [],
-      injection_summary: injectionSummary
-    };
-    const reportPath = await writeDriftReport(directory, report);
-    try {
-      const evidenceDir = path37.join(directory, ".swarm", "evidence", String(phase));
-      fsSync.mkdirSync(evidenceDir, { recursive: true });
-      const evidencePath = path37.join(evidenceDir, "drift-verifier.json");
-      let verdict;
-      let summary;
-      if (alignment === "MAJOR_DRIFT") {
-        verdict = "rejected";
-        summary = `Major drift detected (score: ${driftScore.toFixed(2)}): ${firstDeviation ? firstDeviation.description : "alignment issues detected"}`;
-      } else if (alignment === "MINOR_DRIFT") {
-        verdict = "approved";
-        summary = `Minor drift detected (score: ${driftScore.toFixed(2)}): ${firstDeviation ? firstDeviation.description : "minor alignment issues"}`;
-      } else {
-        verdict = "approved";
-        summary = "Drift check passed: all requirements aligned";
-      }
-      const evidence = {
-        entries: [
-          {
-            type: "drift-verification",
-            verdict,
-            summary,
-            timestamp: new Date().toISOString(),
-            agent: "curator-drift",
-            session_id: "curator"
-          }
-        ]
-      };
-      fsSync.writeFileSync(evidencePath, JSON.stringify(evidence, null, 2), "utf-8");
-    } catch (driftWriteErr) {
-      console.warn(`[curator-drift] drift-verifier evidence write failed: ${driftWriteErr instanceof Error ? driftWriteErr.message : String(driftWriteErr)}`);
-    }
-    getGlobalEventBus().publish("curator.drift.completed", {
-      phase,
-      alignment,
-      drift_score: driftScore,
-      report_path: reportPath
-    });
-    if (injectAdvisory && alignment !== "ALIGNED" && driftScore > 0) {
-      try {
-        const advisoryText = `CURATOR DRIFT DETECTED (phase ${phase}, score ${driftScore.toFixed(2)}): ${injectionSummary.slice(0, 300)}. Review .swarm/${DRIFT_REPORT_PREFIX}${phase}.json and address spec alignment before proceeding.`;
-        injectAdvisory(advisoryText);
-      } catch {}
-    }
-    const injectionText = injectionSummary;
-    return {
-      phase,
-      report,
-      report_path: reportPath,
-      injection_text: injectionText
-    };
-  } catch (err2) {
-    getGlobalEventBus().publish("curator.error", {
-      operation: "drift",
-      phase,
-      error: String(err2)
-    });
-    const defaultReport = {
-      schema_version: 1,
-      phase,
-      timestamp: new Date().toISOString(),
-      alignment: "ALIGNED",
-      drift_score: 0,
-      first_deviation: null,
-      compounding_effects: [],
-      corrections: [],
-      requirements_checked: 0,
-      requirements_satisfied: 0,
-      scope_additions: [],
-      injection_summary: `Phase ${phase}: drift analysis unavailable (${String(err2)})`
-    };
-    return {
-      phase,
-      report: defaultReport,
-      report_path: "",
-      injection_text: ""
-    };
-  }
-}
-function buildDriftInjectionText(report, maxChars) {
-  if (maxChars <= 0) {
-    return "";
-  }
-  let text;
-  if (report.alignment === "ALIGNED" && report.drift_score < 0.1) {
-    text = `<drift_report>Phase ${report.phase}: ALIGNED, all requirements on track.</drift_report>`;
-  } else {
-    const keyFinding = report.first_deviation?.description ?? "no deviation recorded";
-    const score = report.drift_score ?? 0;
-    const correctionClause = report.corrections?.[0] ? `Correction: ${report.corrections[0]}.` : "";
-    text = `<drift_report>Phase ${report.phase}: ${report.alignment} (${score.toFixed(2)}) \u2014 ${keyFinding}. ${correctionClause}</drift_report>`;
-  }
-  return text.slice(0, maxChars);
-}
-
 // src/hooks/knowledge-injector.ts
+init_curator_drift();
 init_utils2();
 function formatStars(confidence) {
   if (confidence >= 0.9)
@@ -55745,7 +55806,7 @@ var build_check = createSwarmTool({
     try {
       await saveEvidence(workingDir, "build", evidence);
     } catch (error93) {
-      console.error("Failed to save build evidence:", error93);
+      console.error("Failed to save build evidence:", error93 instanceof Error ? error93.message : String(error93));
     }
     return JSON.stringify(result, null, 2);
   }
@@ -55932,14 +55993,6 @@ init_utils2();
 import * as fs30 from "fs";
 import * as path41 from "path";
 init_create_tool();
-function hasActiveTurboMode2() {
-  for (const [_sessionId, session] of swarmState.agentSessions) {
-    if (session.turboMode === true) {
-      return true;
-    }
-  }
-  return false;
-}
 function extractMatches(regex, text) {
   return Array.from(text.matchAll(regex));
 }
@@ -56004,7 +56057,7 @@ async function executeCompletionVerify(args2, directory) {
     };
     return JSON.stringify(result2, null, 2);
   }
-  if (hasActiveTurboMode2()) {
+  if (hasActiveTurboMode(args2.sessionID)) {
     const result2 = {
       success: true,
       phase,
@@ -56535,7 +56588,7 @@ var curator_analyze = createSwarmTool({
       }, null, 2);
     } catch (error93) {
       return JSON.stringify({
-        error: String(error93),
+        error: error93 instanceof Error ? error93.message : String(error93),
         phase: typedArgs.phase
       }, null, 2);
     }
@@ -58759,7 +58812,7 @@ init_telemetry();
 init_create_tool();
 function safeWarn(message, error93) {
   try {
-    console.warn(message, error93);
+    console.warn(message, error93 instanceof Error ? error93.message : String(error93));
   } catch {}
 }
 function collectCrossSessionDispatchedAgents(phaseReferenceTimestamp, callerSessionId) {
@@ -58949,7 +59002,7 @@ async function executePhaseComplete(args2, workingDirectory, directory) {
       ]
     }, null, 2);
   }
-  if (hasActiveTurboMode()) {
+  if (hasActiveTurboMode(sessionID)) {
     console.warn(`[phase_complete] Turbo mode active \u2014 skipping completion-verify and drift-verifier gates for phase ${phase}`);
   } else {
     try {
@@ -59010,7 +59063,23 @@ async function executePhaseComplete(args2, workingDirectory, directory) {
         const specPath = path48.join(dir, ".swarm", "spec.md");
         const specExists = fs37.existsSync(specPath);
         if (!specExists) {
-          warnings.push(`Drift verifier evidence missing \u2014 no spec.md found, drift check is advisory-only.`);
+          let incompleteTaskCount = 0;
+          let planPhaseFound = false;
+          try {
+            const planPath = validateSwarmPath(dir, "plan.json");
+            const planRaw = fs37.readFileSync(planPath, "utf-8");
+            const plan = JSON.parse(planRaw);
+            const targetPhase = plan.phases.find((p) => p.id === phase);
+            if (targetPhase) {
+              planPhaseFound = true;
+              incompleteTaskCount = targetPhase.tasks.filter((t) => t.status !== "completed").length;
+            }
+          } catch {}
+          if (incompleteTaskCount > 0 || !planPhaseFound) {
+            warnings.push(`No spec.md found and drift verification evidence missing. Phase ${phase} has ${incompleteTaskCount} incomplete task(s) in plan.json \u2014 consider running critic_drift_verifier before phase completion.`);
+          } else {
+            warnings.push(`No spec.md found. Phase ${phase} tasks are all completed in plan.json. Drift verification was skipped.`);
+          }
         } else {
           return JSON.stringify({
             success: false,
@@ -59076,17 +59145,21 @@ async function executePhaseComplete(args2, workingDirectory, directory) {
     const curatorConfig = CuratorConfigSchema.parse(config3.curator ?? {});
     if (curatorConfig.enabled && curatorConfig.phase_enabled) {
       const curatorResult = await runCuratorPhase(dir, phase, agentsDispatched, curatorConfig, {});
-      await applyCuratorKnowledgeUpdates(dir, curatorResult.knowledge_recommendations, knowledgeConfig);
-      const driftResult = await runCriticDriftCheck(dir, phase, curatorResult, curatorConfig);
+      const knowledgeResult = await applyCuratorKnowledgeUpdates(dir, curatorResult.knowledge_recommendations, knowledgeConfig);
       const callerSessionState = swarmState.agentSessions.get(sessionID);
       if (callerSessionState) {
         callerSessionState.pendingAdvisoryMessages ??= [];
         const digestSummary = curatorResult.digest?.summary ? curatorResult.digest.summary.slice(0, 200) : "Phase analysis complete";
         const complianceNote = curatorResult.compliance.length > 0 ? ` (${curatorResult.compliance.length} compliance observation(s))` : "";
-        callerSessionState.pendingAdvisoryMessages.push(`[CURATOR] Phase ${phase} digest: ${digestSummary}${complianceNote}. Call curator_analyze with recommendations to apply knowledge updates from this phase.`);
-        if (driftResult?.report?.drift_score && driftResult.report.drift_score > 0) {
-          callerSessionState.pendingAdvisoryMessages.push(`[CURATOR DRIFT DETECTED (phase ${phase}, score ${driftResult.report.drift_score})]: ${(driftResult.injection_text || "").slice(0, 300)}. Review ${driftResult.report_path || "unknown"} and address spec alignment before proceeding.`);
-        }
+        callerSessionState.pendingAdvisoryMessages.push(`[CURATOR] Phase ${phase} digest: ${digestSummary}${complianceNote}. Knowledge: ${knowledgeResult.applied} applied, ${knowledgeResult.skipped} skipped. Call curator_analyze with recommendations to apply knowledge updates from this phase.`);
+        try {
+          const { readPriorDriftReports: readPriorDriftReports2 } = await Promise.resolve().then(() => (init_curator_drift(), exports_curator_drift));
+          const priorReports = await readPriorDriftReports2(dir);
+          const phaseReport = priorReports.filter((r) => r.phase === phase).pop();
+          if (phaseReport && phaseReport.drift_score > 0) {
+            callerSessionState.pendingAdvisoryMessages.push(`[CURATOR DRIFT DETECTED (phase ${phase}, score ${phaseReport.drift_score})]: Consider running critic_drift_verifier before phase completion to get a proper drift review. Review drift report for phase ${phase} and address spec alignment if applicable.`);
+          }
+        } catch {}
       }
       if (curatorResult.compliance.length > 0 && !curatorConfig.suppress_warnings) {
         const complianceLines = curatorResult.compliance.map((obs) => `[${obs.severity.toUpperCase()}] ${obs.description}`).slice(0, 5);
@@ -59222,7 +59295,7 @@ async function executePhaseComplete(args2, workingDirectory, directory) {
   return JSON.stringify({ ...result, timestamp: event.timestamp, duration_ms: durationMs }, null, 2);
 }
 var phase_complete = createSwarmTool({
-  description: "Mark a phase as complete and track which agents were dispatched. " + "Used for phase completion gating and tracking. " + "Accepts phase number and optional summary. Returns list of agents that were dispatched.",
+  description: "Mark a phase as complete and track which agents were dispatched. Used for phase completion gating and tracking. Accepts phase number and optional summary. Returns list of agents that were dispatched.",
   args: {
     phase: tool.schema.number().describe("The phase number being completed (e.g., 1, 2, 3)"),
     summary: tool.schema.string().optional().describe("Optional summary of what was accomplished in this phase"),
@@ -63220,7 +63293,7 @@ async function executeSavePlan(args2, fallbackDir) {
     return {
       success: false,
       message: "Failed to save plan: retry with save_plan after resolving the error above",
-      errors: [String(error93)],
+      errors: [error93 instanceof Error ? error93.message : String(error93)],
       recovery_guidance: "Use save_plan with corrected inputs to create or restructure plans. Never write .swarm/plan.json or .swarm/plan.md directly."
     };
   }
@@ -65381,17 +65454,9 @@ function matchesTier3Pattern(files) {
   }
   return false;
 }
-function hasActiveTurboMode3() {
-  for (const [_sessionId, session] of swarmState.agentSessions) {
-    if (session.turboMode === true) {
-      return true;
-    }
-  }
-  return false;
-}
 function checkReviewerGate(taskId, workingDirectory) {
   try {
-    if (hasActiveTurboMode3()) {
+    if (hasActiveTurboMode()) {
       const resolvedDir2 = workingDirectory;
       try {
         const planPath = path59.join(resolvedDir2, ".swarm", "plan.json");
@@ -65428,7 +65493,7 @@ function checkReviewerGate(taskId, workingDirectory) {
         };
       }
     } catch (error93) {
-      console.warn(`[gate-evidence] Evidence file for task ${taskId} is corrupt or unreadable:`, error93);
+      console.warn(`[gate-evidence] Evidence file for task ${taskId} is corrupt or unreadable:`, error93 instanceof Error ? error93.message : String(error93));
       telemetry.gateFailed("", "qa_gate", taskId, `Evidence file corrupt or unreadable`);
       return {
         blocked: true,
@@ -65721,7 +65786,7 @@ async function executeUpdateTaskStatus(args2, fallbackDir) {
     return {
       success: false,
       message: "Failed to update task status",
-      errors: [String(error93)]
+      errors: [error93 instanceof Error ? error93.message : String(error93)]
     };
   }
 }
@@ -66194,6 +66259,7 @@ var OpenCodeSwarm = async (ctx) => {
       }
       await guardrailsHooks.toolBefore(input, output);
       await scopeGuardHook.toolBefore(input, output);
+      await delegationGateHooks.toolBefore(input, output);
       if (swarmState.lastBudgetPct >= 50) {
         const pressureSession = ensureAgentSession(input.sessionID, swarmState.activeAgent.get(input.sessionID) ?? ORCHESTRATOR_NAME);
         if (!pressureSession.contextPressureWarningSent) {

package/dist/state.d.ts

@@ -331,7 +331,9 @@ export declare function applyRehydrationCache(session: AgentSessionState): void;
  */
 export declare function rehydrateSessionFromDisk(directory: string, session: AgentSessionState): Promise<void>;
 /**
- * Check if ANY active session has Turbo Mode enabled.
- * @returns true if any session has turboMode: true
+ * Check if Turbo Mode is enabled for a specific session or ANY session.
+ * @param sessionID - Optional session ID to check. If provided, checks only that session.
+ *                    If omitted, checks all sessions (backward-compatible global behavior).
+ * @returns true if the specified session has turboMode: true, or if any session has turboMode: true when no sessionID provided
  */
-export declare function hasActiveTurboMode(): boolean;
+export declare function hasActiveTurboMode(sessionID?: string): boolean;

package/dist/state.session-restart.test.d.ts

@@ -2,6 +2,6 @@
  * Adversarial security tests for Task 2.15: Session restart rehydration
  *
  * ONLY attack vectors - malformed inputs, oversized payloads, injection attempts, boundary violations
- * Tests the security hardening of rehydrateSessionFromDisk, readPlanFromDisk, and readEvidenceFromDisk
+ * Tests the security hardening of rehydrateSessionFromDisk, readPlanFromDisk, and readGateEvidenceFromDisk
  */
 export {};

package/package.json

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