opencode-swarm 7.121.4 → 7.122.1

package/dist/cli/{index-q0fv0xec.js → index-kanrv3sv.js}

@@ -4,7 +4,7 @@ import {
   readDoctorArtifact,
   removeStraySwarmDir,
   runConfigDoctor
-} from "./index-vqcgmy4y.js";
+} from "./index-det5jwfk.js";
 import {
   EvaluationTaskV1Schema,
   GateAuditManifestV1Schema,
@@ -13,18 +13,15 @@ import {
   IdentifierSchema,
   MAX_TRANSIENT_RETRIES,
   admitEvaluationTask,
-  appendLedgerEvent,
   archiveEvidence,
   canonicalHash,
   canonicalJson,
   checkRequirementCoverage,
   closePlanTerminalState,
   computeManifestContentHash,
-  computePlanHash,
   computeSpecHash,
   computeTaskInputContentHash,
   computeTaskSetContentHash,
-  derivePlanId,
   derivePlanMarkdown,
   disableEpicMode,
   enableEpicMode,
@@ -34,7 +31,6 @@ import {
   getExecutor,
   getGitRepositoryStatus,
   initDurableStatusPath,
-  initLedger,
   init_executor,
   isEpicModeActive,
   isGitRepo,
@@ -65,7 +61,7 @@ import {
   saveTaskSetSnapshot,
   transientBackoff,
   validateProjectRoot
-} from "./index-emkb0bbe.js";
+} from "./index-7cspygmb.js";
 import {
   withTimeout
 } from "./index-4905hd2m.js";
@@ -95,15 +91,15 @@ import {
   retireSkill,
   selectCandidateEntries,
   syncBundledProjectSkillsIfMissingAsync
-} from "./index-x4fwtd59.js";
+} from "./index-5he0kwnx.js";
 import {
   readRecentEscalations
-} from "./index-ft6jw816.js";
+} from "./index-j9kxwshw.js";
 import {
   alreadyCuratedThisGeneration,
   claimNextScanBatch,
   resolveCohortId
-} from "./index-j8349ac0.js";
+} from "./index-hns7xjm7.js";
 import {
   CURATOR_INIT_PROMPT,
   CURATOR_PHASE_PROMPT,
@@ -136,11 +132,11 @@ import {
   validateActionability,
   validateActionableFields,
   validateLesson
-} from "./index-db82jxt7.js";
+} from "./index-m0bmh3w0.js";
 import {
   authorizeCuration,
   buildConfigFingerprintInput
-} from "./index-5a3xsnzg.js";
+} from "./index-cqsak7bf.js";
 import {
   cohortConfigFingerprint
 } from "./index-rtry5xyf.js";
@@ -170,7 +166,7 @@ import {
   transactFile,
   transactKnowledge,
   wordBigrams
-} from "./index-0f800qg7.js";
+} from "./index-n2712byd.js";
 import {
   MAX_EVENT_LOG_ENTRIES,
   _internals,
@@ -180,7 +176,7 @@ import {
   recordHiveKnowledgeEvent,
   recordKnowledgeEvent,
   resolveKnowledgeEventsPath
-} from "./index-35xyj7gn.js";
+} from "./index-dywekeen.js";
 import {
   resolveHiveDataDir,
   resolveHiveEventsPath,
@@ -196,15 +192,14 @@ import {
   resolveLinkDir,
   sanitizeLinkId,
   writeLinkPointer
-} from "./index-3jvqw5hy.js";
+} from "./index-q27bajqb.js";
 import {
   loadPluginConfig,
   loadPluginConfigWithMeta
-} from "./index-9xpgytj9.js";
+} from "./index-3rr0ese8.js";
 import {
-  PlanSchema,
   RetrospectiveEvidenceSchema
-} from "./index-qt2yaghg.js";
+} from "./index-vcgfqd8f.js";
 import {
   AGENT_TOOL_MAP,
   ALL_SUBAGENT_NAMES,
@@ -215,7 +210,7 @@ import {
   TOOL_NAME_SET,
   getCanonicalAgentRole,
   stripKnownSwarmPrefix
-} from "./index-tftv9xh9.js";
+} from "./index-wr8qgpz5.js";
 import {
   KNOWLEDGE_SCHEMA_VERSION,
   OUTCOME_BLOCK_THRESHOLD,
@@ -226,8 +221,20 @@ import {
   init_capability_probe
 } from "./index-8fwhhayc.js";
 import {
-  clearAllScopes
-} from "./index-51gg9947.js";
+  MAX_PENDING_SCOPE_BINDINGS,
+  clearAllScopes,
+  clearScopeBindingFromDisk,
+  clearScopeBindings
+} from "./index-d6h5hq91.js";
+import {
+  appendLedgerEvent,
+  computePlanHash,
+  derivePlanId,
+  initLedger
+} from "./index-ctpgsj84.js";
+import {
+  PlanSchema
+} from "./index-m1abzg93.js";
 import {
   advisoryWarn,
   getDeferredWarnings
@@ -246,7 +253,7 @@ import {
 } from "./index-zgwm4ryv.js";
 import {
   atomicWriteFile
-} from "./index-h07wn84h.js";
+} from "./index-7mkpsw6g.js";
 import {
   tryAcquireLock,
   withEvidenceLock
@@ -9858,7 +9865,7 @@ async function runCuratorPhase(directory, phase, agentsDispatched, config, knowl
     }
     if (config.skill_generation_enabled === true && skillCandidates.length > 0) {
       try {
-        const skillModule = await import("./skill-generator-hkyxdc3j.js");
+        const skillModule = await import("./skill-generator-g6r52x94.js");
         for (const cand of skillCandidates) {
           if (cand.confidence < (config.min_skill_confidence ?? DEFAULT_SKILL_MIN_CONFIDENCE)) {
             continue;
@@ -10195,7 +10202,7 @@ async function applyCuratorKnowledgeUpdates(directory, recommendations, knowledg
     } catch {}
   }
   if (contradictedEntries.length > 0 && knowledgeConfig.contradiction_threshold_action === "quarantine") {
-    const { maybeQuarantineOnContradiction } = await import("./knowledge-escalator-8ajq1fhb.js");
+    const { maybeQuarantineOnContradiction } = await import("./knowledge-escalator-dyxsm78k.js");
     for (const { id } of contradictedEntries) {
       try {
         await maybeQuarantineOnContradiction(directory, id, knowledgeConfig.contradiction_quarantine_threshold, knowledgeConfig.contradiction_quarantine_window_days);
@@ -10993,7 +11000,7 @@ async function runCuratorPostMortem(directory, options = {}) {
       warnings.push("Failed to collect knowledge summary.");
     }
     try {
-      const { getScanStatus } = await import("./scan-cursor-qmsmmg1b.js");
+      const { getScanStatus } = await import("./scan-cursor-hm0aqqae.js");
       const scanStatus = await getScanStatus(directory);
       if (scanStatus.remaining_estimate > 0) {
         warnings.push(`Fair scan: reviewed ${knowledgeSummary.length} entries this sweep (generation ${scanStatus.generation}); ${scanStatus.remaining_estimate} more eligible entries will be visited in future curation sweeps.`);
@@ -11165,9 +11172,9 @@ var _internals16 = {
   verifyPostMortemKnowledgeActions,
   repairPostMortemActions,
   loadDefaultKnowledgeConfig: async (directory) => {
-    const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-vwxpsk6j.js");
+    const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-13bnng2n.js");
     try {
-      const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-rbfq77sz.js");
+      const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-2j25br0p.js");
       const loaded = loadPluginConfigWithMeta2(directory);
       return KnowledgeConfigSchema2.parse(loaded.config.knowledge ?? {});
     } catch {
@@ -11175,11 +11182,11 @@ var _internals16 = {
     }
   },
   applyCuratorKnowledgeUpdates: async (directory, recommendations, knowledgeConfig, generation) => {
-    const { applyCuratorKnowledgeUpdates: applyCuratorKnowledgeUpdates2 } = await import("./curator-3azybqrw.js");
+    const { applyCuratorKnowledgeUpdates: applyCuratorKnowledgeUpdates2 } = await import("./curator-qfh07497.js");
     return applyCuratorKnowledgeUpdates2(directory, recommendations, knowledgeConfig, generation);
   },
   checkHivePromotions: async (entries, knowledgeConfig, directory) => {
-    const { checkHivePromotions } = await import("./hive-promoter-4xnj3fdk.js");
+    const { checkHivePromotions } = await import("./hive-promoter-00mktxkk.js");
     return checkHivePromotions(entries, knowledgeConfig, directory);
   },
   applyProposalTriage: async (directory, triage) => {
@@ -11188,7 +11195,7 @@ var _internals16 = {
       activateProposal,
       listSkills: listSkills2,
       sanitizeSlug
-    } = await import("./skill-generator-hkyxdc3j.js");
+    } = await import("./skill-generator-g6r52x94.js");
     const result = {
       approved: [],
       rejected: [],
@@ -11429,6 +11436,54 @@ var _internals17 = {
   path: path19
 };
 
+// src/hooks/promotion-evidence-store.ts
+import {
+  appendFile as appendFile3,
+  mkdir as mkdir7,
+  readFile as readFile6,
+  rename as rename4,
+  writeFile as writeFile5
+} from "fs/promises";
+init_logger();
+function resolvePromotionEvidencePath(directory) {
+  return validateSwarmPath(directory, "knowledge-promotion-evidence.jsonl");
+}
+function parseRecord(line) {
+  try {
+    const o = JSON.parse(line);
+    if (typeof o.cohort_id === "string" && typeof o.entry_id === "string" && typeof o.retrieval_trace_id === "string" && (o.receipt_outcome === "applied" || o.receipt_outcome === "violated" || o.receipt_outcome === "contradicted") && typeof o.receipt_event_id === "string" && typeof o.timestamp === "string") {
+      return o;
+    }
+  } catch {}
+  return null;
+}
+async function loadPromotionEvidenceByEntry(directory) {
+  const filePath = resolvePromotionEvidencePath(directory);
+  let content;
+  try {
+    content = await readFile6(filePath, "utf-8");
+  } catch {
+    return {};
+  }
+  const out = {};
+  for (const line of content.split(`
+`)) {
+    const trimmed = line.trim();
+    if (!trimmed)
+      continue;
+    const rec = parseRecord(trimmed);
+    if (!rec)
+      continue;
+    const bucket = out[rec.entry_id];
+    if (bucket) {
+      bucket.push(rec);
+    } else {
+      out[rec.entry_id] = [rec];
+    }
+  }
+  return out;
+}
+
 // src/hooks/hive-promoter.ts
 function carryActionableFields(source) {
   const out = {};
@@ -11537,7 +11592,7 @@ async function checkHivePromotions(swarmEntries, config, directory) {
     return empty;
   }
   const sourceCohort = await _internals18.resolveCohortId(directory);
-  const evidence = await _internals18.loadPromotionEvidence(swarmEntries);
+  const evidence = await _internals18.loadPromotionEvidence(directory);
   const diagnostics = [];
   const activeSwarm = swarmEntries.filter((e) => isActiveStatus(e.status));
   const activeSwarmBigrams = activeSwarm.map((e) => typeof e.lesson === "string" ? wordBigrams(e.lesson) : new Set);
@@ -11844,7 +11899,7 @@ var _internals18 = {
   transactHiveStore,
   validateLesson,
   authorizeCuration,
-  loadPromotionEvidence: async (_swarmEntries) => ({}),
+  loadPromotionEvidence: async (directory) => loadPromotionEvidenceByEntry(directory),
   loadDefaultKnowledgeConfig: () => KnowledgeConfigSchema.parse({})
 };
 function createHivePromoterHook(directory, config) {
@@ -12091,23 +12146,23 @@ async function promoteFromSwarm(directory, lessonId, options, config) {
 import { createHash as createHash5 } from "crypto";
 import { existsSync as existsSync13 } from "fs";
 import {
-  appendFile as appendFile3,
-  mkdir as mkdir8,
-  readFile as readFile8,
+  appendFile as appendFile4,
+  mkdir as mkdir9,
+  readFile as readFile9,
   realpath,
-  writeFile as writeFile7
+  writeFile as writeFile8
 } from "fs/promises";
 import * as path25 from "path";
 
 // src/services/synonym-map.ts
 var import_proper_lockfile3 = __toESM(require_proper_lockfile(), 1);
 import {
-  mkdir as mkdir7,
-  readFile as readFile6,
-  rename as rename4,
+  mkdir as mkdir8,
+  readFile as readFile7,
+  rename as rename5,
   stat as stat2,
   unlink,
-  writeFile as writeFile5
+  writeFile as writeFile6
 } from "fs/promises";
 import * as path21 from "path";
 var SYNONYM_MAP_FILENAME = "synonym-map.json";
@@ -12257,18 +12312,18 @@ async function readSynonymMap(directory, maxPairs = DEFAULT_MAX_PAIRS) {
     const st = await stat2(filePath);
     if (st.size > ceiling)
       return emptySynonymMap();
-    const raw = await readFile6(filePath, "utf-8");
+    const raw = await readFile7(filePath, "utf-8");
     return coerceSynonymMap(JSON.parse(raw), maxPairs);
   } catch {
     return emptySynonymMap();
   }
 }
 async function writeSynonymMapAtomic(filePath, map) {
-  await mkdir7(path21.dirname(filePath), { recursive: true });
+  await mkdir8(path21.dirname(filePath), { recursive: true });
   const tmp = `${filePath}.tmp.${Date.now()}.${Math.floor(Math.random() * 1e9)}`;
   try {
-    await writeFile5(tmp, JSON.stringify(map, null, 2), "utf-8");
-    await rename4(tmp, filePath);
+    await writeFile6(tmp, JSON.stringify(map, null, 2), "utf-8");
+    await rename5(tmp, filePath);
   } finally {
     try {
       await unlink(tmp);
@@ -12278,7 +12333,7 @@ async function writeSynonymMapAtomic(filePath, map) {
 async function rebuildSynonymMap(directory, entries, maxPairs = DEFAULT_MAX_PAIRS) {
   const filePath = resolveSynonymMapPath(directory);
   const dir = path21.dirname(filePath);
-  await mkdir7(dir, { recursive: true });
+  await mkdir8(dir, { recursive: true });
   let release = null;
   try {
     release = await import_proper_lockfile3.default.lock(dir, {
@@ -12302,10 +12357,13 @@ init_logger();
 
 // src/hooks/micro-reflector.ts
 import { existsSync as existsSync12 } from "fs";
-import { readFile as readFile7, writeFile as writeFile6 } from "fs/promises";
+import { readFile as readFile8, writeFile as writeFile7 } from "fs/promises";
 import * as path24 from "path";
 init_logger();
 
+// src/hooks/guardrails/stored-input-args.ts
+var storedInputArgs = new Map;
+
 // src/hooks/skill-propagation-gate.ts
 import * as fs9 from "fs";
 import * as path23 from "path";
@@ -13607,7 +13665,7 @@ async function readTaskTrajectory(directory, taskId) {
     const filePath = validateSwarmPath(directory, rel);
     if (!existsSync12(filePath))
       return [];
-    const content = await readFile7(filePath, "utf-8");
+    const content = await readFile8(filePath, "utf-8");
     const out = [];
     for (const line of content.split(`
 `)) {
@@ -13654,9 +13712,9 @@ function hashContent(content) {
   return createHash5("sha1").update(content).digest("hex");
 }
 async function loadConfigForPolicyCurator(directory) {
-  const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-vwxpsk6j.js");
+  const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-13bnng2n.js");
   try {
-    const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-rbfq77sz.js");
+    const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-2j25br0p.js");
     const { config: loadedConfig } = loadPluginConfigWithMeta2(directory);
     return KnowledgeConfigSchema2.parse(loadedConfig.knowledge ?? {});
   } catch {
@@ -14135,8 +14193,8 @@ RETRY: your last output was missing ${result.missing.join("; ")}; produce valid
 async function appendCuratorSkippedEvent(directory, record) {
   try {
     const filePath = path25.join(directory, ".swarm", "events.jsonl");
-    await mkdir8(path25.dirname(filePath), { recursive: true });
-    await appendFile3(filePath, `${JSON.stringify({
+    await mkdir9(path25.dirname(filePath), { recursive: true });
+    await appendFile4(filePath, `${JSON.stringify({
       timestamp: new Date().toISOString(),
       event: "curator_skipped",
       entry_id: record.entry_id,
@@ -14178,11 +14236,11 @@ async function consumeInsightCandidates(directory, batchLimit = MESO_INSIGHT_BAT
     if (!existsSync13(filePath))
       return [];
     const consumed = [];
-    await transactFile(filePath, async (p) => readInsightJsonl(await readFile8(p, "utf-8").catch(() => "")), async (p, data) => {
+    await transactFile(filePath, async (p) => readInsightJsonl(await readFile9(p, "utf-8").catch(() => "")), async (p, data) => {
       const body = data.length === 0 ? "" : `${data.map((c) => JSON.stringify(c)).join(`
 `)}
 `;
-      await writeFile7(p, body, "utf-8");
+      await writeFile8(p, body, "utf-8");
     }, (all) => {
       if (all.length === 0)
         return null;
@@ -15108,12 +15166,12 @@ async function writeSessionReflection(directory, result) {
 
 // src/services/skill-improver.ts
 import { existsSync as existsSync15 } from "fs";
-import { mkdir as mkdir10, readFile as readFile9, rename as rename5, writeFile as writeFile9 } from "fs/promises";
+import { mkdir as mkdir11, readFile as readFile10, rename as rename6, writeFile as writeFile10 } from "fs/promises";
 import * as path28 from "path";
 init_logger();
 
 // src/services/trajectory-cluster.ts
-import { mkdir as mkdir9, writeFile as writeFile8 } from "fs/promises";
+import { mkdir as mkdir10, writeFile as writeFile9 } from "fs/promises";
 import * as path27 from "path";
 init_logger();
 var MACRO_TRAJECTORY_WINDOW = 200;
@@ -15247,11 +15305,11 @@ async function writeMotifProposals(directory, opts = {}) {
       return result;
     const max = opts.maxProposals ?? 10;
     const proposalsDir = validateSwarmPath(directory, path27.join("skills", "proposals"));
-    await mkdir9(proposalsDir, { recursive: true });
+    await mkdir10(proposalsDir, { recursive: true });
     for (const motif of motifs.slice(0, max)) {
       const slug = `motif-${slugify(motif.signature)}`;
       const filePath = path27.join(proposalsDir, `${slug}.md`);
-      await writeFile8(filePath, buildMotifProposal(motif), "utf-8");
+      await writeFile9(filePath, buildMotifProposal(motif), "utf-8");
       result.proposalsWritten.push(filePath);
     }
     return result;
@@ -15392,11 +15450,11 @@ async function writeSuccessMotifProposals(directory, opts = {}) {
       return result;
     const max = opts.maxProposals ?? 10;
     const proposalsDir = validateSwarmPath(directory, path27.join("skills", "proposals"));
-    await mkdir9(proposalsDir, { recursive: true });
+    await mkdir10(proposalsDir, { recursive: true });
     for (const motif of motifs.slice(0, max)) {
       const slug = workflowSlug(motif.signature);
       const filePath = path27.join(proposalsDir, `${slug}.md`);
-      await writeFile8(filePath, buildWorkflowProposal(motif), "utf-8");
+      await writeFile9(filePath, buildWorkflowProposal(motif), "utf-8");
       result.proposalsWritten.push(filePath);
     }
     return result;
@@ -15518,10 +15576,10 @@ function timestampSlug(d) {
   return d.toISOString().replace(/[:.]/g, "-");
 }
 async function atomicWrite(p, content) {
-  await mkdir10(path28.dirname(p), { recursive: true });
+  await mkdir11(path28.dirname(p), { recursive: true });
   const tmp = `${p}.tmp-${process.pid}-${Date.now()}`;
-  await writeFile9(tmp, content, "utf-8");
-  await rename5(tmp, p);
+  await writeFile10(tmp, content, "utf-8");
+  await rename6(tmp, p);
 }
 async function gatherInventory(directory) {
   const swarm = await readKnowledge(resolveSwarmKnowledgePath(directory));
@@ -15535,7 +15593,7 @@ async function gatherInventory(directory) {
   for (const skill of skills.active) {
     let content;
     try {
-      content = await readFile9(skill.path, "utf-8");
+      content = await readFile10(skill.path, "utf-8");
     } catch {
       continue;
     }
@@ -15711,7 +15769,7 @@ async function reconcileStaleActiveSkills(directory, options = {}) {
   for (const skill of skills.active) {
     let content;
     try {
-      content = await readFile9(skill.path, "utf-8");
+      content = await readFile10(skill.path, "utf-8");
     } catch {
       continue;
     }
@@ -16814,7 +16872,7 @@ async function runFinalizeStage(ctx) {
     }
   }
   try {
-    const { CuratorConfigSchema: CCS } = await import("./schema-vwxpsk6j.js");
+    const { CuratorConfigSchema: CCS } = await import("./schema-13bnng2n.js");
     const { config: pmLoadedConfig } = _internals25.loadPluginConfigWithMeta(ctx.directory);
     const curatorCfg = CCS.parse(pmLoadedConfig.curator ?? {});
     if (curatorCfg.enabled && curatorCfg.postmortem_enabled) {
@@ -17878,7 +17936,7 @@ async function handleConfigCommand(directory, _args) {
 
 // src/services/skill-consolidation.ts
 import { existsSync as existsSync19 } from "fs";
-import { mkdir as mkdir11, readFile as readFile10, rename as rename6, writeFile as writeFile10 } from "fs/promises";
+import { mkdir as mkdir12, readFile as readFile11, rename as rename7, writeFile as writeFile11 } from "fs/promises";
 import * as path33 from "path";
 var DEFAULT_CONSOLIDATION_INTERVAL_HOURS = 24;
 var DEFAULT_CONSOLIDATION_MAX_CALLS_PER_RUN = 1;
@@ -17892,7 +17950,7 @@ async function readState2(directory) {
   if (!existsSync19(filePath))
     return {};
   try {
-    const parsed = JSON.parse(await readFile10(filePath, "utf-8"));
+    const parsed = JSON.parse(await readFile11(filePath, "utf-8"));
     if (!parsed || typeof parsed !== "object")
       return {};
     return parsed;
@@ -17901,10 +17959,10 @@ async function readState2(directory) {
   }
 }
 async function atomicWrite2(filePath, content) {
-  await mkdir11(path33.dirname(filePath), { recursive: true });
+  await mkdir12(path33.dirname(filePath), { recursive: true });
   const tmp = `${filePath}.tmp-${process.pid}-${Date.now()}`;
-  await writeFile10(tmp, content, "utf-8");
-  await rename6(tmp, filePath);
+  await writeFile11(tmp, content, "utf-8");
+  await rename7(tmp, filePath);
 }
 async function writeState2(directory, state) {
   await atomicWrite2(consolidationStatePath(directory), `${JSON.stringify(state, null, 2)}
@@ -18191,7 +18249,7 @@ import { promisify as promisify2 } from "util";
 // src/tools/co-change-analyzer.ts
 import * as child_process4 from "child_process";
 import { randomUUID as randomUUID5 } from "crypto";
-import { readdir, readFile as readFile11, stat as stat3 } from "fs/promises";
+import { readdir, readFile as readFile12, stat as stat3 } from "fs/promises";
 import * as path34 from "path";
 import { promisify } from "util";
 function getExecFileAsync() {
@@ -18318,7 +18376,7 @@ async function getStaticEdges(directory) {
   const sourceFiles = await scanSourceFiles(directory);
   for (const sourceFile of sourceFiles) {
     try {
-      const content = await readFile11(sourceFile, "utf-8");
+      const content = await readFile12(sourceFile, "utf-8");
       const importRegex = /(?:import|require)\s*(?:\(?\s*['"`]|.*?from\s+['"`])([^'"`]+)['"`]/g;
       for (let match = importRegex.exec(content);match !== null; match = importRegex.exec(content)) {
         const importPath = match[1].trim();
@@ -18965,9 +19023,9 @@ var _internals29 = {
   readSwarmFileAsync,
   loadCuratorDeps: async () => {
     const [{ CuratorConfigSchema }, curator, { createCuratorLLMDelegate: createCuratorLLMDelegate2 }] = await Promise.all([
-      import("./schema-vwxpsk6j.js"),
-      import("./curator-3azybqrw.js"),
-      import("./curator-llm-factory-6rafny5e.js")
+      import("./schema-13bnng2n.js"),
+      import("./curator-qfh07497.js"),
+      import("./curator-llm-factory-x769hn66.js")
     ]);
     return { CuratorConfigSchema, curator, createCuratorLLMDelegate: createCuratorLLMDelegate2 };
   }
@@ -19465,7 +19523,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "opencode-swarm",
-  version: "7.121.4",
+  version: "7.122.1",
   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",
@@ -19639,7 +19697,7 @@ init_executor();
 
 // src/services/knowledge-diagnostics.ts
 import { existsSync as existsSync21 } from "fs";
-import { readFile as readFile12 } from "fs/promises";
+import { readFile as readFile13 } from "fs/promises";
 import { join as join32 } from "path";
 
 // src/services/version-check.ts
@@ -19716,7 +19774,7 @@ var INSIGHT_BACKLOG_WARN = 50;
 async function readRawLines(filePath) {
   if (!existsSync21(filePath))
     return { entries: [], corrupt: 0 };
-  const content = await readFile12(filePath, "utf-8");
+  const content = await readFile13(filePath, "utf-8");
   const entries = [];
   let corrupt = 0;
   for (const line of content.split(`
@@ -19880,7 +19938,15 @@ async function computeKnowledgeDebug(directory) {
       synonym_pairs: synonymPairs,
       enforced_directives: enforcedDirectives,
       escalated_directives: escalatedDirectives,
-      events_by_type: eventsByType
+      events_by_type: eventsByType,
+      shown_vs_applied: {
+        shown: eventsByType.retrieved ?? 0,
+        applied_explicit: eventsByType.applied ?? 0,
+        ignored: eventsByType.ignored ?? 0,
+        contradicted: eventsByType.contradicted ?? 0,
+        violated: eventsByType.violated ?? 0,
+        no_relevant: eventsByType.no_relevant ?? 0
+      }
     },
     cohort: {
       linked: cohortLinked,
@@ -19906,7 +19972,7 @@ async function computeCurationDiagnostics(directory, entries) {
   let scanCompleted = false;
   let scanRemaining = 0;
   try {
-    const { getScanStatus } = await import("./scan-cursor-qmsmmg1b.js");
+    const { getScanStatus } = await import("./scan-cursor-hm0aqqae.js");
     const status = await getScanStatus(directory);
     scanGeneration = status.generation;
     scanCompleted = status.completed;
@@ -19914,19 +19980,19 @@ async function computeCurationDiagnostics(directory, entries) {
   } catch {}
   let configMatch = null;
   try {
-    const { isLinked: isLinked2 } = await import("./knowledge-link-sy85fw3w.js");
+    const { isLinked: isLinked2 } = await import("./knowledge-link-4yd2z8ev.js");
     if (isLinked2(directory)) {
-      const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-vwxpsk6j.js");
+      const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-13bnng2n.js");
       let config;
       try {
-        const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-rbfq77sz.js");
+        const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-2j25br0p.js");
         const loaded = loadPluginConfigWithMeta2(directory);
         config = KnowledgeConfigSchema2.parse(loaded.config.knowledge ?? {});
       } catch {
         config = KnowledgeConfigSchema2.parse({});
       }
       const { cohortConfigFingerprint: cohortConfigFingerprint2 } = await import("./config-fingerprint-v22xh5a2.js");
-      const { buildConfigFingerprintInput: buildConfigFingerprintInput2, readCohortConfigFingerprint } = await import("./curation-policy-10wnhpwn.js");
+      const { buildConfigFingerprintInput: buildConfigFingerprintInput2, readCohortConfigFingerprint } = await import("./curation-policy-4j4qce5a.js");
       const currentFp = cohortConfigFingerprint2(buildConfigFingerprintInput2(config));
       const cohortFp = await readCohortConfigFingerprint(directory);
       configMatch = cohortFp === null ? null : currentFp === cohortFp;
@@ -19961,7 +20027,7 @@ async function countPendingProposals(directory) {
   if (!existsSync21(proposalsPath))
     return 0;
   try {
-    const content = await readFile12(proposalsPath, "utf-8");
+    const content = await readFile13(proposalsPath, "utf-8");
     let n = 0;
     for (const line of content.split(`
 `)) {
@@ -19983,7 +20049,7 @@ async function safeJsonlCount(filePath) {
   if (!filePath || !existsSync21(filePath))
     return 0;
   try {
-    const content = await readFile12(filePath, "utf-8");
+    const content = await readFile13(filePath, "utf-8");
     let n = 0;
     for (const line of content.split(`
 `)) {
@@ -21104,7 +21170,7 @@ async function handleDoctorCommand(directory, args) {
   const result = runConfigDoctor(config, directory);
   let output;
   if (enableAutoFix && result.hasAutoFixableIssues) {
-    const { runConfigDoctorWithFixes } = await import("./config-doctor-404c8mf8.js");
+    const { runConfigDoctorWithFixes } = await import("./config-doctor-3ksh1534.js");
     const fixResult = await runConfigDoctorWithFixes(directory, config, true);
     output = formatDoctorMarkdown(fixResult.result);
   } else {
@@ -21917,7 +21983,7 @@ async function handleEvidenceCommand(directory, args) {
   return formatTaskEvidenceMarkdown(evidenceData);
 }
 async function handleEvidenceSummaryCommand(directory) {
-  const { buildEvidenceSummary } = await import("./evidence-summary-service-k14ykm03.js");
+  const { buildEvidenceSummary } = await import("./evidence-summary-service-96ndczbk.js");
   const artifact = await buildEvidenceSummary(directory);
   if (!artifact) {
     return "No plan found. Run `/swarm plan` to check plan status.";
@@ -27433,6 +27499,9 @@ function serializeAgentSession(s) {
     },
     ...s.autoProceedNudgeDone !== undefined && {
       autoProceedNudgeDone: s.autoProceedNudgeDone
+    },
+    ...s.cachedCohortId !== undefined && {
+      cachedCohortId: s.cachedCohortId
     }
   };
 }
@@ -27882,7 +27951,7 @@ import { join as join45 } from "path";
 init_logger();
 import { randomUUID as randomUUID7 } from "crypto";
 import { existsSync as existsSync32, readFileSync as readFileSync21 } from "fs";
-import { mkdir as mkdir12, readFile as readFile13, writeFile as writeFile11 } from "fs/promises";
+import { mkdir as mkdir13, readFile as readFile14, writeFile as writeFile12 } from "fs/promises";
 import * as os9 from "os";
 import * as path54 from "path";
 async function migrateKnowledgeToExternal(_directory, _config) {
@@ -27947,9 +28016,9 @@ var _internals44 = {
   resolveLegacyHiveKnowledgePath,
   existsSync: existsSync32,
   readFileSync: readFileSync21,
-  readFile: readFile13,
-  mkdir: mkdir12,
-  writeFile: writeFile11
+  readFile: readFile14,
+  mkdir: mkdir13,
+  writeFile: writeFile12
 };
 async function migrateContextToKnowledge(directory, config) {
   const sentinelPath = path54.join(directory, ".swarm", ".knowledge-migrated");
@@ -27973,7 +28042,7 @@ async function migrateContextToKnowledge(directory, config) {
       skippedReason: "no-context-file"
     };
   }
-  const contextContent = await readFile13(contextPath, "utf-8");
+  const contextContent = await readFile14(contextPath, "utf-8");
   if (contextContent.trim().length === 0) {
     return {
       migrated: false,
@@ -28762,13 +28831,13 @@ var _internals45 = {
 };
 
 // src/commands/link.ts
-import { mkdir as mkdir14, writeFile as writeFile12 } from "fs/promises";
+import { mkdir as mkdir15, writeFile as writeFile13 } from "fs/promises";
 import * as path56 from "path";
 
 // src/knowledge/family-migration.ts
 var import_proper_lockfile5 = __toESM(require_proper_lockfile(), 1);
 import { existsSync as existsSync33, readFileSync as readFileSync22 } from "fs";
-import { mkdir as mkdir13 } from "fs/promises";
+import { mkdir as mkdir14 } from "fs/promises";
 import * as path55 from "path";
 
 // src/knowledge/family-manifest.ts
@@ -29153,7 +29222,7 @@ async function snapshotSourceFamily(storeDir) {
   const snapshot = {};
   let release = null;
   try {
-    await mkdir13(storeDir, { recursive: true });
+    await mkdir14(storeDir, { recursive: true });
   } catch {}
   try {
     release = await import_proper_lockfile5.default.lock(storeDir, {
@@ -29172,7 +29241,7 @@ async function snapshotSourceFamily(storeDir) {
   return snapshot;
 }
 async function migrateKnowledgeFamily(destinationDir, sourceDir) {
-  await mkdir13(destinationDir, { recursive: true });
+  await mkdir14(destinationDir, { recursive: true });
   let destRelease = null;
   try {
     destRelease = await import_proper_lockfile5.default.lock(destinationDir, {
@@ -29322,8 +29391,8 @@ ${formatStatus(directory)}`;
     const { config: loadedConfig } = loadPluginConfigWithMeta(directory);
     const config = KnowledgeConfigSchema.parse(loadedConfig.knowledge ?? {});
     const fingerprint = cohortConfigFingerprint(buildConfigFingerprintInput(config));
-    await mkdir14(linkDir, { recursive: true });
-    await writeFile12(path56.join(linkDir, "cohort-config.json"), JSON.stringify({ fingerprint, updated_at: new Date().toISOString() }, null, 2), "utf-8");
+    await mkdir15(linkDir, { recursive: true });
+    await writeFile13(path56.join(linkDir, "cohort-config.json"), JSON.stringify({ fingerprint, updated_at: new Date().toISOString() }, null, 2), "utf-8");
   } catch {}
   const relinkNote = existing ? `
 (Re-linked from previous link "${existing.linkId}".)` : "";
@@ -29865,14 +29934,14 @@ var CuratorOutputMemoryDecisionSchema = exports_external.object({
   curatorMemoryDecisions: exports_external.array(CuratorMemoryDecisionSchema).max(20).optional()
 }).passthrough();
 // src/memory/consolidation-log.ts
-import { appendFile as appendFile4, mkdir as mkdir15, readFile as readFile15 } from "fs/promises";
+import { appendFile as appendFile5, mkdir as mkdir16, readFile as readFile16 } from "fs/promises";
 import * as path58 from "path";
 var LOG_RELATIVE_PATH = path58.join("memory", "consolidation-log.jsonl");
 async function readConsolidationLog(directory) {
   const filePath = validateSwarmPath(directory, LOG_RELATIVE_PATH);
   let raw;
   try {
-    raw = await readFile15(filePath, "utf-8");
+    raw = await readFile16(filePath, "utf-8");
   } catch {
     return [];
   }
@@ -38263,7 +38332,7 @@ async function handleSpecifyCommand(_directory, args) {
 
 // src/services/status-service.ts
 import * as fsSync2 from "fs";
-import { readFile as readFile17 } from "fs/promises";
+import { readFile as readFile18 } from "fs/promises";
 import * as path76 from "path";
 
 // src/hooks/extractors.ts
@@ -38824,7 +38893,7 @@ async function safeLineCount(filePath) {
   try {
     if (!fsSync2.existsSync(filePath))
       return 0;
-    const content = await readFile17(filePath, "utf-8");
+    const content = await readFile18(filePath, "utf-8");
     let n = 0;
     for (const line of content.split(`
 `)) {
@@ -39294,7 +39363,7 @@ function buildDetailedHelp(commandName, entry) {
 async function handleHelpCommand(ctx) {
   const targetCommand = ctx.args.join(" ");
   if (!targetCommand) {
-    const { buildHelpText } = await import("./index-2k6z335c.js");
+    const { buildHelpText } = await import("./index-jm81nhks.js");
     return buildHelpText();
   }
   const tokens = targetCommand.split(/\s+/);
@@ -39303,7 +39372,7 @@ async function handleHelpCommand(ctx) {
     return _internals63.buildDetailedHelp(resolved.key, resolved.entry);
   }
   const similar = _internals63.findSimilarCommands(targetCommand);
-  const { buildHelpText: fullHelp } = await import("./index-2k6z335c.js");
+  const { buildHelpText: fullHelp } = await import("./index-jm81nhks.js");
   if (similar.length > 0) {
     return `Command '/swarm ${targetCommand}' not found.
 
@@ -39436,7 +39505,7 @@ var COMMAND_REGISTRY = {
   },
   "guardrail explain": {
     handler: async (ctx) => {
-      const { handleGuardrailExplain } = await import("./guardrail-explain-d1m747g5.js");
+      const { handleGuardrailExplain } = await import("./guardrail-explain-kj0e9r25.js");
       return handleGuardrailExplain(ctx.directory, ctx.args);
     },
     description: "Dry-run: show what the guardrails would do to a command or write target (executes nothing)",
@@ -39446,7 +39515,7 @@ var COMMAND_REGISTRY = {
   },
   "guardrail-explain": {
     handler: async (ctx) => {
-      const { handleGuardrailExplain } = await import("./guardrail-explain-d1m747g5.js");
+      const { handleGuardrailExplain } = await import("./guardrail-explain-kj0e9r25.js");
       return handleGuardrailExplain(ctx.directory, ctx.args);
     },
     description: "Dry-run: show what the guardrails would do to a command or write target (executes nothing)",
@@ -39456,7 +39525,7 @@ var COMMAND_REGISTRY = {
   },
   "guardrail-log": {
     handler: async (ctx) => {
-      const { handleGuardrailLog } = await import("./guardrail-log-dhpp0kmn.js");
+      const { handleGuardrailLog } = await import("./guardrail-log-z291m4gw.js");
       return handleGuardrailLog(ctx.directory, ctx.args);
     },
     description: "Read the guardrail decision log (use --blocks-only for blocks)",
@@ -40461,11 +40530,11 @@ If a tool modifies a file, it is a CODER tool. Delegate.
 1a. SCOPE DISCIPLINE \u2014 call declare_scope BEFORE every coder delegation AND before any test_engineer delegation that will write new test files.
   - Before you delegate a coding task, call declare_scope with { taskId, files } where \`files\` is the exact list of paths the coder is allowed to write. Bundle any generated/lockfile paths that the change will produce (e.g. package-lock.json, Cargo.lock, dist/*).
   - Before you delegate to test_engineer with an instruction to CREATE or MODIFY test files, call declare_scope with { taskId, files } listing the exact test file path(s) (e.g. src/auth/login.test.ts, tests/unit/foo.spec.ts) the test_engineer is expected to write.
-  - If coder or test_engineer returns "WRITE BLOCKED" for a path outside the declared list: call declare_scope again with the missing path added. Do NOT instruct the coder to use bash, sed, echo, cat, tee, dd, or any interpreter eval (python -c, node -e, bun -e, ruby -e) to bypass the block. Those routes bypass the authority check and violate scope discipline.
-  - Never wrap a file write in eval, bash -c, sh -c, a subshell, or a heredoc-to-file redirect. Those are bash workarounds and are banned even when scope appears to permit them \u2014 the write-authority guard is tool-scoped; bash is unguarded and must not be used as a write path.
+  - If coder or test_engineer returns "WRITE BLOCKED" for a path outside the declared list: call declare_scope again with the missing path added. Do NOT instruct the coder to use bash, sed, echo, cat, tee, dd, or any interpreter eval (python -c, node -e, bun -e, ruby -e) to bypass the block. Alternate mechanisms cannot create write authority and violate scope discipline.
+  - Never wrap a file write in eval, bash -c, sh -c, a subshell, or a heredoc-to-file redirect as a workaround. Shell and interpreter targets are scope-checked when they can be proven, and unverifiable write payloads fail closed.
   - Do NOT use mv, Move-Item, move, ren, Rename-Item, or cp-then-rm chains to relocate, rename, or delete files under \`.swarm/\` as a workaround for blocked destructive commands. Those are file-move shell bypasses and are banned. Use the tool's dedicated tools (\`.swarm/\` file management or evidence manager tools) instead.
   - If you cannot enumerate files up front (e.g. a broad refactor), declare the containing directories \u2014 declare_scope accepts directory entries and grants containment.
-  - Rationale: declare_scope persists the allowed set to disk (.swarm/scopes/scope-\${taskId}.json) so it survives cross-process delegation. Without a call, the coder or test_engineer process reads an empty scope and every Edit/Write is denied.
+  - Rationale: coder Task preflight binds scope to the exact workspace, plan generation, task, parent session, and Task call. Missing or malformed scope blocks delegation with SCOPE_NOT_DECLARED; conflicting lower-precedence FILE:/plan paths block with SCOPE_CONFLICT before the coder starts.
 <!-- BEHAVIORAL_GUIDANCE_END -->
 2. ONE agent per message. Send, STOP, wait for response.
    Exception: Stage B reviewer/test_engineer gate agents for the SAME completed coder task may be dispatched together before waiting when both gates are required. This exception NEVER applies to coder delegations. Preserve ONE task per coder call.
@@ -40479,7 +40548,7 @@ If a tool modifies a file, it is a CODER tool. Delegate.
 <!-- BEHAVIORAL_GUIDANCE_START -->
 BATCHING DETECTION \u2014 you are batching if your coder delegation contains ANY of:
     - The word "and" connecting two actions ("update X AND add Y")
-    - Multiple FILE paths ("FILE: src/a.ts, src/b.ts, src/c.ts")
+    - Multiple objectives hidden behind a comma-separated FILE value (use one complete relative path per FILE: line)
     - Multiple TASK objectives ("TASK: Refactor the processor and update the config")
     - Phrases like "also", "while you're at it", "additionally", "as well"
 
@@ -41246,7 +41315,7 @@ Purpose: Ingest issue evidence, trace impact, and transition to the full fix wor
 ACTION: Load skill ${bundledProjectSkillFileReference("issue-ingest")} immediately. Follow the protocol defined there.
 
 HARD CONSTRAINTS:
-- Preserve issue evidence, flag missing repro details, and route non-mega swarms through the active swarm's agents.
+- Preserve issue evidence, flag missing repro details, and route every delegation through the current session's active-swarm role mapping; no swarm ID receives special behavior.
 
 RECOVERY: At mode entry, read .swarm/issue-reference.json to recover the source issue URL, number, and flags (plan/trace/noRepro) if the mode signal has been lost or context was compacted.
 
@@ -42319,7 +42388,7 @@ DO NOT:
 - Use the semantic diff as a substitute for your own reasoning about correctness
 
 ## EXPLORER FINDINGS \u2014 VALIDATE BEFORE REPORTING
-Explorer agent outputs (from @mega_explorer) may contain observations labeled as REVIEW NEEDED, RISKS, VERDICT, BREAKING, COMPATIBLE, or similar judgment language. Treat these as CANDIDATE OBSERVATIONS, not established facts.
+Explorer agent outputs may contain observations labeled as REVIEW NEEDED, RISKS, VERDICT, BREAKING, COMPATIBLE, or similar judgment language. Treat these as CANDIDATE OBSERVATIONS, not established facts, regardless of the active swarm's user-defined ID.
 - BEFORE including any issue-like finding from explorer input in your final report: READ the relevant code yourself and verify the issue independently
 - Do NOT adopt the explorer's VERDICT, BREAKING, or COMPATIBLE labels as your own \u2014 you must reach your own conclusion
 - Explorer's RISKS section names potential concerns \u2014 you determine if they are actual issues through your own review
@@ -42665,6 +42734,17 @@ SME is read-only. Cache persistence is Architect's responsibility \u2014 save th
 
 // src/agents/index.ts
 var warnedAgents = new Set;
+var NONTRANSIENT_STOP_PROTOCOL = [
+  "",
+  "## NON-TRANSIENT TOOL FAILURE PROTOCOL \u2014 MANDATORY",
+  "Apply this protocol when a tool reports ParserError, ParseError, MissingEndCurlyBrace, CommandNotFoundException, a command-not-found/not-recognized error, or [sandbox] BLOCKED.",
+  "It also applies when guardrails report NON-TRANSIENT STOP or NON-TRANSIENT CIRCUIT BREAKER \u2014 including the third same-category permanent failure:",
+  "1. STOP. Do not retry the same operation with a different command, shell, tool, quoting style, or wrapper.",
+  "2. Treat the failure as structural, not transient. Do not spend retry budget on it.",
+  "3. Report BLOCKED with the exact error category and the command/tool that failed.",
+  "4. Wait for corrected input, environment, scope, or a verified new invocation before continuing."
+].join(`
+`);
 var _swarmAgentsMap = new Map;
 var KNOWN_VARIANT_VALUES = new Set([
   "low",
@@ -43018,8 +43098,12 @@ var loggedFirstCalls = new Set;
 // src/hooks/guardrails/messages-transform.ts
 var TRANSIENT_STATUS_CODES = new Set([408, 429, 500, 502, 503, 504, 529]);
 
-// src/hooks/guardrails/stored-input-args.ts
-var storedInputArgs = new Map;
+// src/hooks/guardrails/nontransient-circuit.ts
+var IMMEDIATE_HARD_STOP_CATEGORIES = new Set([
+  "shell_parse_error",
+  "command_not_found",
+  "sandbox_wrapper_failure"
+]);
 
 // src/commands/command-dispatch.ts
 function normalizeSwarmCommandInput(command, argumentText) {
@@ -44703,6 +44787,9 @@ function resolveWriteTargets(command, writes, cwd) {
     };
   });
 }
+
+// src/tools/file-extractor-planner.ts
+var cachedPlans = new WeakMap;
 // src/hooks/guardrails/index.ts
 var SPEC_DRIFT_BLOCKED_TOOLS = new Set([
   "save_plan",
@@ -44723,7 +44810,46 @@ var EvidenceTaskIdPlanSchema = exports_external.object({
     }).passthrough()).optional()
   }).passthrough()).optional()
 }).passthrough();
-var pendingCoderScopeByTaskId = new Map;
+
+class BoundedPendingScopeMap extends Map {
+  expiresAtByKey = new Map;
+  sweepExpired(now = Date.now()) {
+    for (const [key, expiresAt] of this.expiresAtByKey) {
+      if (expiresAt <= now)
+        this.delete(key);
+    }
+  }
+  set(key, value) {
+    this.sweepExpired();
+    this.delete(key);
+    super.set(key, value);
+    this.expiresAtByKey.set(key, Date.now() + 5 * 60000);
+    while (this.size > MAX_PENDING_SCOPE_BINDINGS) {
+      const oldest = this.keys().next().value;
+      if (!oldest)
+        break;
+      this.delete(oldest);
+    }
+    return this;
+  }
+  get(key) {
+    this.sweepExpired();
+    return super.get(key);
+  }
+  has(key) {
+    this.sweepExpired();
+    return super.has(key);
+  }
+  delete(key) {
+    this.expiresAtByKey.delete(key);
+    return super.delete(key);
+  }
+  clear() {
+    this.expiresAtByKey.clear();
+    super.clear();
+  }
+}
+var pendingCoderScopeByTaskId = new BoundedPendingScopeMap;
 function clearPendingCoderScope() {
   pendingCoderScopeByTaskId.clear();
 }
@@ -44834,6 +44960,16 @@ var STATE_ORDER2 = [
   "tests_run",
   "complete"
 ];
+function createNonTransientCircuitState(agentName, invocationId) {
+  return {
+    ownerAgent: stripKnownSwarmPrefix(agentName),
+    ownerInvocationId: invocationId,
+    category: null,
+    sameCategoryCount: 0,
+    hardStop: false,
+    lastSignal: null
+  };
+}
 var _toolAggregates = new Map;
 var defaultRunContext = new AgentRunContext("default", _toolAggregates);
 var _runContexts = new Map;
@@ -44885,6 +45021,13 @@ function resetSwarmState() {
   swarmState.fullAutoEnabledInConfig = false;
   swarmState.environmentProfiles.clear();
   clearPendingCoderScope();
+  for (const binding of clearScopeBindings()) {
+    clearScopeBindingFromDisk({
+      directory: binding.workspaceIdentity,
+      taskId: binding.taskId,
+      ownerSessionId: binding.ownerSessionId
+    });
+  }
   resetStandardWorktreeIsolationState();
   resetRealtimeLearningNudgeState();
   _councilDisagreementWarned.clear();
@@ -44944,6 +45087,8 @@ function startAgentSession(sessionId, agentName, staleDurationMs = STALE_SESSION
     activeInvocationId: 0,
     lastInvocationIdByAgent: {},
     windows: {},
+    nonTransientCircuit: createNonTransientCircuitState(agentName, 0),
+    pendingToolExecutions: new Map,
     lastCompactionHint: 0,
     architectWriteCount: 0,
     lastCoderDelegationTaskId: null,
@@ -45024,6 +45169,14 @@ function startAgentSession(sessionId, agentName, staleDurationMs = STALE_SESSION
   }
 }
 function endAgentSession(sessionId) {
+  const removedBindings = clearScopeBindings((binding) => binding.ownerSessionId === sessionId || binding.parentOwnerSessionId === sessionId);
+  for (const binding of removedBindings) {
+    clearScopeBindingFromDisk({
+      directory: binding.workspaceIdentity,
+      taskId: binding.taskId,
+      ownerSessionId: binding.ownerSessionId
+    });
+  }
   swarmState.agentSessions.delete(sessionId);
   clearRealtimeLearningNudgeSession(sessionId);
 }
@@ -45040,6 +45193,7 @@ function ensureAgentSession(sessionId, agentName, directory) {
       telemetry.agentActivated(sessionId, agentName, oldName);
       session.delegationActive = false;
       session.lastAgentEventTime = now;
+      session.nonTransientCircuit = createNonTransientCircuitState(agentName, 0);
       if (!session.windows) {
         session.activeInvocationId = 0;
         session.lastInvocationIdByAgent = {};
@@ -45051,6 +45205,12 @@ function ensureAgentSession(sessionId, agentName, directory) {
       session.lastInvocationIdByAgent = {};
       session.windows = {};
     }
+    if (session.nonTransientCircuit === undefined) {
+      session.nonTransientCircuit = createNonTransientCircuitState(session.agentName, session.activeInvocationId ?? 0);
+    }
+    if (session.pendingToolExecutions === undefined) {
+      session.pendingToolExecutions = new Map;
+    }
     if (session.lastCompactionHint === undefined) {
       session.lastCompactionHint = 0;
     }
@@ -45203,13 +45363,14 @@ function beginInvocation(sessionId, agentName) {
     throw new Error(`Cannot begin invocation: session ${sessionId} does not exist`);
   }
   const stripped = stripKnownSwarmPrefix(agentName);
-  if (stripped === ORCHESTRATOR_NAME) {
-    return null;
-  }
   const lastId = session.lastInvocationIdByAgent[stripped] || 0;
   const newId = lastId + 1;
   session.lastInvocationIdByAgent[stripped] = newId;
   session.activeInvocationId = newId;
+  session.nonTransientCircuit = createNonTransientCircuitState(stripped, newId);
+  if (stripped === ORCHESTRATOR_NAME) {
+    return null;
+  }
   const now = Date.now();
   const window = {
     id: newId,