opencode-swarm 7.98.0 → 7.98.2

package/dist/cli/{evidence-summary-service-g4x5e3e3.js → evidence-summary-service-559nas1m.js}

@@ -6,10 +6,10 @@ import {
   loadPlanJsonOnly,
   mergeDurableGateEntriesFromEvidence,
   readDurableGateEvidence
-} from "./index-4c5jpmn9.js";
+} from "./index-yrzfbqqh.js";
 import"./index-mh1ej70w.js";
 import"./index-kv4dd5c5.js";
-import"./index-gn8n22th.js";
+import"./index-we94wkty.js";
 import"./index-jtqkh8jf.js";
 import"./index-5e4e2hvv.js";
 import"./index-p0arc26j.js";

package/dist/cli/{guardrail-explain-xdv74tfk.js → guardrail-explain-xktjjh53.js}

@@ -1,21 +1,21 @@
 // @bun
 import {
   handleGuardrailExplain
-} from "./index-wmm21nsk.js";
-import"./index-pc10e4d7.js";
+} from "./index-rvweaxsd.js";
+import"./index-72k57f21.js";
 import"./index-5z2e78tv.js";
 import"./index-2a6ppa65.js";
 import"./index-fjxjb66n.js";
 import"./index-hb10a2g8.js";
 import"./index-zy22fg5h.js";
 import"./index-471qxz9g.js";
-import"./index-4c5jpmn9.js";
+import"./index-yrzfbqqh.js";
 import"./index-adz3nk9b.js";
 import"./index-v4fcn4tr.js";
 import"./index-mh1ej70w.js";
 import"./index-kv4dd5c5.js";
-import"./index-sf08zj91.js";
-import"./index-gn8n22th.js";
+import"./index-a0dv2c7k.js";
+import"./index-we94wkty.js";
 import"./index-jtqkh8jf.js";
 import"./index-5e4e2hvv.js";
 import"./index-p0arc26j.js";

package/dist/cli/{index-pc10e4d7.js → index-72k57f21.js}

@@ -114,7 +114,7 @@ import {
   transientBackoff,
   validateProjectRoot,
   writeProjectedSpecSync
-} from "./index-4c5jpmn9.js";
+} from "./index-yrzfbqqh.js";
 import {
   _internals as _internals2,
   _internals1 as _internals3,
@@ -138,12 +138,12 @@ import {
   listActive,
   subscribe,
   unsubscribe
-} from "./index-sf08zj91.js";
+} from "./index-a0dv2c7k.js";
 import {
   readSwarmFileAsync,
   safeHook,
   validateSwarmPath
-} from "./index-gn8n22th.js";
+} from "./index-we94wkty.js";
 import {
   deepMerge
 } from "./index-p0arc26j.js";
@@ -909,7 +909,7 @@ var init_executor = __esm(() => {
 // package.json
 var package_default = {
   name: "opencode-swarm",
-  version: "7.98.0",
+  version: "7.98.2",
   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",
@@ -5474,6 +5474,9 @@ function startAgentSession(sessionId, agentName, staleDurationMs = 7200000, dire
     swarmState.pendingRehydrations.add(rehydrationPromise);
   }
 }
+function endAgentSession(sessionId) {
+  swarmState.agentSessions.delete(sessionId);
+}
 function getAgentSession(sessionId) {
   return swarmState.agentSessions.get(sessionId);
 }
@@ -5978,7 +5981,7 @@ function hasActiveEpicMode(sessionID) {
 async function rehydratePrSubscriptions(sessionID, directory) {
   const map = new Map;
   try {
-    const { listActive: listActive2 } = await import("./pr-subscriptions-2565fpsc.js");
+    const { listActive: listActive2 } = await import("./pr-subscriptions-ttvr1ta9.js");
     const records = await listActive2(directory);
     for (const record of records) {
       if (record.sessionID !== sessionID)
@@ -10193,48 +10196,49 @@ function recordSeenRetroSection(key, value, timestamp) {
 function hashContent(content) {
   return createHash3("sha1").update(content).digest("hex");
 }
-function isWriteToSwarmPlan(input) {
-  if (typeof input !== "object" || input === null)
-    return false;
-  const record = input;
-  const toolName = record.toolName;
-  if (typeof toolName !== "string")
-    return false;
-  if (!["write", "edit", "apply_patch", "swarm_apply_patch"].includes(toolName))
-    return false;
-  const rawPath = record.path;
-  const rawFile = record.file;
-  const pathField = typeof rawPath === "string" ? rawPath.replace(/\\/g, "/") : undefined;
-  const fileField = typeof rawFile === "string" ? rawFile.replace(/\\/g, "/") : undefined;
-  if (typeof pathField === "string" && pathField.includes(".swarm/plan.md")) {
-    return true;
-  }
-  if (typeof fileField === "string" && fileField.includes(".swarm/plan.md")) {
-    return true;
-  }
-  return false;
-}
 function isWriteToEvidenceFile(input) {
-  if (typeof input !== "object" || input === null)
-    return false;
-  const record = input;
-  const toolName = record.toolName;
-  if (typeof toolName !== "string")
-    return false;
-  if (!["write", "edit", "apply_patch", "swarm_apply_patch"].includes(toolName))
+  const trigger = normalizeWriteTrigger(input);
+  return isEvidencePath(trigger?.filePath);
+}
+var WRITE_TOOLS = new Set([
+  "write",
+  "edit",
+  "apply_patch",
+  "swarm_apply_patch"
+]);
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
+function normalizePathField(value) {
+  return typeof value === "string" ? value.replace(/\\/g, "/") : null;
+}
+function firstPathFromRecord(record) {
+  return normalizePathField(record.path) ?? normalizePathField(record.filePath) ?? normalizePathField(record.file);
+}
+function normalizeWriteTrigger(input, output) {
+  if (!isRecord(input))
+    return null;
+  const toolName = typeof input.toolName === "string" ? input.toolName : typeof input.tool === "string" ? input.tool : null;
+  if (!toolName || !WRITE_TOOLS.has(toolName))
+    return null;
+  const inputArgs = isRecord(input.args) ? input.args : null;
+  const outputArgs = isRecord(output) && isRecord(output.args) ? output.args : null;
+  const filePath = firstPathFromRecord(input) ?? (inputArgs ? firstPathFromRecord(inputArgs) : null) ?? (outputArgs ? firstPathFromRecord(outputArgs) : null);
+  if (!filePath)
+    return null;
+  return {
+    toolName,
+    filePath,
+    sessionID: typeof input.sessionID === "string" ? input.sessionID : "default"
+  };
+}
+function isEvidencePath(filePath) {
+  if (!filePath)
     return false;
-  const rawPath = record.path;
-  const rawFile = record.file;
-  const pathField = typeof rawPath === "string" ? rawPath.replace(/\\/g, "/") : undefined;
-  const fileField = typeof rawFile === "string" ? rawFile.replace(/\\/g, "/") : undefined;
-  const evidenceRegex = /\.swarm\/+evidence\/+/i;
-  if (typeof pathField === "string" && evidenceRegex.test(pathField)) {
-    return true;
-  }
-  if (typeof fileField === "string" && evidenceRegex.test(fileField)) {
-    return true;
-  }
-  return false;
+  return /(?:^|\/)\.swarm\/+evidence\//i.test(filePath);
+}
+function isPlanPath(filePath) {
+  return filePath?.includes(".swarm/plan.md") ?? false;
 }
 function extractRetrospectiveSection(planContent) {
   const headingRegex = /^###\s+Lessons\s+Learned$/m;
@@ -10941,24 +10945,22 @@ async function runAutoPromotion(directory, config) {
   }
 }
 function createKnowledgeCuratorHook(directory, config, options = {}) {
-  const handler = async (input, _output) => {
+  const handler = async (input, output) => {
     pruneSeenRetroSections();
     if (!config.enabled)
       return;
-    if (!isWriteToSwarmPlan(input) && !isWriteToEvidenceFile(input))
+    const trigger = normalizeWriteTrigger(input, output);
+    if (!trigger)
+      return;
+    const isPlanTrigger = isPlanPath(trigger.filePath);
+    const isEvidenceTrigger = isEvidencePath(trigger.filePath) && !isPlanTrigger;
+    if (!isPlanTrigger && !isEvidenceTrigger)
       return;
-    const sessionID = input?.sessionID ?? "default";
-    const isEvidenceTrigger = isWriteToEvidenceFile(input) && !isWriteToSwarmPlan(input);
     if (isEvidenceTrigger) {
-      const record = input;
-      const rawPath = record.path;
-      const rawFile = record.file;
-      const filePath = typeof rawPath === "string" ? rawPath.replace(/\\/g, "/") : typeof rawFile === "string" ? rawFile.replace(/\\/g, "/") : null;
-      if (!filePath)
-        return;
-      const evidenceKey = `evidence:${sessionID}:${filePath}`;
+      const relativeEvidencePath = trigger.filePath.replace(/^.*\.swarm\//, "");
+      const evidenceKey = `evidence:${trigger.sessionID}:${relativeEvidencePath}`;
       const lastSeenEvidence = seenRetroSections.get(evidenceKey);
-      const evidenceContent = await readSwarmFileAsync(directory, filePath.replace(/^.*\.swarm\//, ""));
+      const evidenceContent = await readSwarmFileAsync(directory, relativeEvidencePath);
       if (!evidenceContent)
         return;
       let evidenceData;
@@ -10986,7 +10988,7 @@ function createKnowledgeCuratorHook(directory, config, options = {}) {
       const projectName2 = evidenceData.project_name ?? "unknown";
       const phaseNumber2 = typeof evidenceData.phase_number === "number" ? evidenceData.phase_number : 1;
       await _internals17.curateAndStoreSwarm(lessons, projectName2, { phase_number: phaseNumber2 }, directory, config, {
-        llmDelegate: options.llmDelegateFactory?.(sessionID),
+        llmDelegate: options.llmDelegateFactory?.(trigger.sessionID),
         enrichmentQuota: options.enrichmentQuota
       });
       return;
@@ -10997,7 +10999,7 @@ function createKnowledgeCuratorHook(directory, config, options = {}) {
     const section = extractRetrospectiveSection(planContent);
     if (!section)
       return;
-    if (!checkRetroChanged(sessionID, section))
+    if (!checkRetroChanged(trigger.sessionID, section))
       return;
     const allLessons = extractLessonsFromRetro(section);
     if (allLessons.length === 0)
@@ -11011,7 +11013,7 @@ function createKnowledgeCuratorHook(directory, config, options = {}) {
     const phaseMatch = /^Phase:\s*(\d+)/m.exec(planContent);
     const phaseNumber = phaseMatch ? parseInt(phaseMatch[1], 10) : 1;
     await _internals17.curateAndStoreSwarm(normalLessons, projectName, { phase_number: phaseNumber }, directory, config, {
-      llmDelegate: options.llmDelegateFactory?.(sessionID),
+      llmDelegate: options.llmDelegateFactory?.(trigger.sessionID),
       enrichmentQuota: options.enrichmentQuota
     });
   };
@@ -13653,6 +13655,10 @@ This project was already finalized in a previous /swarm close run. The plan has
       ctx.warnings.push(`Failed to write close-summary.md: ${msg}`);
       console.warn("[close-command] Failed to write close-summary.md:", error2);
     }
+    const sessionIdsToEnd = [...swarmState.agentSessions.keys()];
+    for (const sessionId of sessionIdsToEnd) {
+      _internals20.endAgentSession(sessionId);
+    }
     _internals20.resetSwarmStatePreservingSingletons();
     const retroWarnings = ctx.warnings.filter((w) => w.includes("Retrospective write") || w.includes("retrospective write") || w.includes("Session retrospective"));
     const otherWarnings = ctx.warnings.filter((w) => !w.includes("Retrospective write") && !w.includes("retrospective write") && !w.includes("Session retrospective"));
@@ -13745,7 +13751,8 @@ var _internals20 = {
   runCleanStage,
   runAlignStage,
   archiveEvidence,
-  closePlanTerminalState
+  closePlanTerminalState,
+  endAgentSession
 };
 
 // src/commands/codebase-review.ts
@@ -17606,7 +17613,7 @@ async function handleEvidenceCommand(directory, args) {
   return formatTaskEvidenceMarkdown(evidenceData);
 }
 async function handleEvidenceSummaryCommand(directory) {
-  const { buildEvidenceSummary } = await import("./evidence-summary-service-g4x5e3e3.js");
+  const { buildEvidenceSummary } = await import("./evidence-summary-service-559nas1m.js");
   const artifact = await buildEvidenceSummary(directory);
   if (!artifact) {
     return "No plan found. Run `/swarm plan` to check plan status.";
@@ -31857,7 +31864,7 @@ function buildDetailedHelp(commandName, entry) {
 async function handleHelpCommand(ctx) {
   const targetCommand = ctx.args.join(" ");
   if (!targetCommand) {
-    const { buildHelpText } = await import("./index-h6h8qfsh.js");
+    const { buildHelpText } = await import("./index-chan9mkv.js");
     return buildHelpText();
   }
   const tokens = targetCommand.split(/\s+/);
@@ -31866,7 +31873,7 @@ async function handleHelpCommand(ctx) {
     return _internals45.buildDetailedHelp(resolved.key, resolved.entry);
   }
   const similar = _internals45.findSimilarCommands(targetCommand);
-  const { buildHelpText: fullHelp } = await import("./index-h6h8qfsh.js");
+  const { buildHelpText: fullHelp } = await import("./index-chan9mkv.js");
   if (similar.length > 0) {
     return `Command '/swarm ${targetCommand}' not found.
 
@@ -31999,7 +32006,7 @@ var COMMAND_REGISTRY = {
   },
   "guardrail explain": {
     handler: async (ctx) => {
-      const { handleGuardrailExplain } = await import("./guardrail-explain-xdv74tfk.js");
+      const { handleGuardrailExplain } = await import("./guardrail-explain-xktjjh53.js");
       return handleGuardrailExplain(ctx.directory, ctx.args);
     },
     description: "Dry-run: show what the guardrails would do to a command or write target (executes nothing)",

package/dist/cli/{index-sf08zj91.js → index-a0dv2c7k.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   validateSwarmPath
-} from "./index-gn8n22th.js";
+} from "./index-we94wkty.js";
 import {
   log
 } from "./index-zgwm4ryv.js";

package/dist/cli/{index-h6h8qfsh.js → index-chan9mkv.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   handleGuardrailExplain
-} from "./index-wmm21nsk.js";
+} from "./index-rvweaxsd.js";
 import {
   handleGuardrailLog
 } from "./index-gnd1280x.js";
@@ -78,7 +78,7 @@ import {
   handleWriteRetroCommand,
   normalizeSwarmCommandInput,
   resolveCommand
-} from "./index-pc10e4d7.js";
+} from "./index-72k57f21.js";
 import"./index-5z2e78tv.js";
 import"./index-2a6ppa65.js";
 import"./index-fjxjb66n.js";
@@ -89,13 +89,13 @@ import {
   ORCHESTRATOR_NAME,
   stripKnownSwarmPrefix
 } from "./index-471qxz9g.js";
-import"./index-4c5jpmn9.js";
+import"./index-yrzfbqqh.js";
 import"./index-adz3nk9b.js";
 import"./index-v4fcn4tr.js";
 import"./index-mh1ej70w.js";
 import"./index-kv4dd5c5.js";
-import"./index-sf08zj91.js";
-import"./index-gn8n22th.js";
+import"./index-a0dv2c7k.js";
+import"./index-we94wkty.js";
 import"./index-jtqkh8jf.js";
 import"./index-5e4e2hvv.js";
 import"./index-p0arc26j.js";

package/dist/cli/{index-wmm21nsk.js → index-rvweaxsd.js}

@@ -12,7 +12,7 @@ import {
   detectPosixWrites,
   detectWindowsWrites,
   resolveWriteTargets
-} from "./index-pc10e4d7.js";
+} from "./index-72k57f21.js";
 import {
   checkFileAuthority,
   classifyFile,

package/dist/cli/{index-gn8n22th.js → index-we94wkty.js}

@@ -14,7 +14,13 @@ import {
 
 // src/hooks/utils.ts
 import * as path from "path";
-var _internals = { safeHook, composeHandlers, validateSwarmPath, readSwarmFileAsync };
+var _internals = {
+  safeHook,
+  composeHandlers,
+  validateSwarmPath,
+  readSwarmFileAsync,
+  readCachedTextFile
+};
 function safeHook(fn) {
   return async (input, output) => {
     try {
@@ -67,13 +73,23 @@ function validateSwarmPath(directory, filename) {
   }
   return resolved;
 }
-async function readSwarmFileAsync(directory, filename) {
+async function readSwarmFileAsync(directory, filename, cache) {
+  if (cache !== undefined) {
+    const key = `${directory}::${filename}`;
+    const cached = cache.get(key);
+    if (cached !== undefined) {
+      return cached;
+    }
+    const promise = readSwarmFileAsync(directory, filename);
+    cache.set(key, promise);
+    return promise;
+  }
   const maxAttempts = 5;
   const retryDelayMs = 10;
   for (let attempt = 0;attempt < maxAttempts; attempt++) {
     try {
       const resolvedPath = _internals.validateSwarmPath(directory, filename);
-      return await readCachedTextFile(resolvedPath, async () => {
+      return await _internals.readCachedTextFile(resolvedPath, async () => {
         const file = bunFile(resolvedPath);
         return await file.text();
       });

package/dist/cli/{index-4c5jpmn9.js → index-yrzfbqqh.js}

@@ -8,7 +8,7 @@ import {
 import {
   readSwarmFileAsync,
   validateSwarmPath
-} from "./index-gn8n22th.js";
+} from "./index-we94wkty.js";
 import {
   readCachedParsedFile
 } from "./index-jtqkh8jf.js";
@@ -2162,8 +2162,8 @@ function extractPlanHashFromMarkdown(markdown) {
   const match = markdown.match(/<!--\s*PLAN_HASH:\s*(\S+)\s*-->/);
   return match ? match[1] : null;
 }
-async function isPlanMdInSync(directory, plan) {
-  const planMdContent = await readSwarmFileAsync(directory, "plan.md");
+async function isPlanMdInSync(directory, plan, cache) {
+  const planMdContent = await readSwarmFileAsync(directory, "plan.md", cache);
   if (planMdContent === null) {
     return false;
   }
@@ -2197,8 +2197,8 @@ ${markdown}`;
     } catch {}
   }
 }
-async function loadPlan(directory) {
-  const planJsonContent = await readSwarmFileAsync(directory, "plan.json");
+async function loadPlan(directory, cache) {
+  const planJsonContent = await readSwarmFileAsync(directory, "plan.json", cache);
   if (planJsonContent !== null) {
     if (planJsonContent.includes("\x00") || planJsonContent.includes("\uFFFD")) {
       warn("Plan rejected: .swarm/plan.json contains null bytes or invalid encoding");
@@ -2208,7 +2208,7 @@ async function loadPlan(directory) {
         if (validated === null) {
           warn("[loadPlan] plan.json disappeared during cached parse. Falling back to plan.md migration or ledger recovery.");
         } else {
-          const inSync = await isPlanMdInSync(directory, validated);
+          const inSync = await isPlanMdInSync(directory, validated, cache);
           if (!inSync) {
             try {
               await _internals4.regeneratePlanMarkdown(directory, validated);
@@ -2331,7 +2331,7 @@ async function loadPlan(directory) {
             }
           }
         }
-        const planMdContent2 = await readSwarmFileAsync(directory, "plan.md");
+        const planMdContent2 = await readSwarmFileAsync(directory, "plan.md", cache);
         if (planMdContent2 !== null) {
           const migrated = migrateLegacyPlan(planMdContent2);
           const { removedCount } = await savePlanWithAutoAcknowledgedRemovals(directory, migrated, "load_plan_migration_from_md", "migrate legacy plan.md to plan.json");
@@ -2346,7 +2346,7 @@ async function loadPlan(directory) {
       }
     }
   }
-  const planMdContent = await readSwarmFileAsync(directory, "plan.md");
+  const planMdContent = await readSwarmFileAsync(directory, "plan.md", cache);
   if (planMdContent !== null) {
     const migrated = migrateLegacyPlan(planMdContent);
     await savePlan(directory, migrated);

package/dist/cli/index.js

@@ -7,7 +7,7 @@ import {
   getPluginLockFilePaths,
   package_default,
   resolveCommand
-} from "./index-pc10e4d7.js";
+} from "./index-72k57f21.js";
 import"./index-5z2e78tv.js";
 import"./index-2a6ppa65.js";
 import"./index-fjxjb66n.js";
@@ -16,13 +16,13 @@ import"./index-zy22fg5h.js";
 import {
   DEFAULT_AGENT_CONFIGS
 } from "./index-471qxz9g.js";
-import"./index-4c5jpmn9.js";
+import"./index-yrzfbqqh.js";
 import"./index-adz3nk9b.js";
 import"./index-v4fcn4tr.js";
 import"./index-mh1ej70w.js";
 import"./index-kv4dd5c5.js";
-import"./index-sf08zj91.js";
-import"./index-gn8n22th.js";
+import"./index-a0dv2c7k.js";
+import"./index-we94wkty.js";
 import"./index-jtqkh8jf.js";
 import"./index-5e4e2hvv.js";
 import"./index-p0arc26j.js";

package/dist/cli/{pending-delegations-shqbvfjc.js → pending-delegations-8b2js1vq.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   validateSwarmPath
-} from "./index-gn8n22th.js";
+} from "./index-we94wkty.js";
 import"./index-jtqkh8jf.js";
 import"./index-5e4e2hvv.js";
 import"./index-p0arc26j.js";

package/dist/cli/{pr-subscriptions-2565fpsc.js → pr-subscriptions-ttvr1ta9.js}

@@ -9,8 +9,8 @@ import {
   sweepStale,
   unsubscribe,
   updateSnapshot
-} from "./index-sf08zj91.js";
-import"./index-gn8n22th.js";
+} from "./index-a0dv2c7k.js";
+import"./index-we94wkty.js";
 import"./index-jtqkh8jf.js";
 import"./index-5e4e2hvv.js";
 import"./index-p0arc26j.js";

package/dist/commands/close.d.ts

@@ -8,7 +8,7 @@ import { checkHivePromotions } from '../hooks/hive-promoter';
 import { curateAndStoreSwarm } from '../hooks/knowledge-curator';
 import { closePlanTerminalState } from '../plan/manager';
 import { type SessionReflectionResult } from '../services/session-reflection';
-import { resetSwarmStatePreservingSingletons } from '../state';
+import { endAgentSession, resetSwarmStatePreservingSingletons } from '../state';
 interface PlanPhase {
     id: number;
     name: string;
@@ -197,5 +197,6 @@ export declare const _internals: {
     runAlignStage: typeof runAlignStage;
     archiveEvidence: typeof archiveEvidence;
     closePlanTerminalState: typeof closePlanTerminalState;
+    endAgentSession: typeof endAgentSession;
 };
 export {};

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

@@ -21,6 +21,7 @@ declare function hashContent(content: string): string;
  * Exported for testing purposes only.
  */
 export declare function isWriteToEvidenceFile(input: unknown): boolean;
+export declare function isEvidencePath(filePath: string | undefined | null): boolean;
 /** Build the v3-schema enrichment prompt for a single prose lesson. */
 export declare function buildV3EnrichmentPrompt(lesson: string, category: string, tags: string[]): string;
 /**

package/dist/hooks/system-enhancer.d.ts

@@ -46,4 +46,4 @@ export type ArchitectMode = 'DISCOVER' | 'PLAN' | 'EXECUTE' | 'PHASE-WRAP' | 'UN
  * @param directory - The project directory to check
  * @returns The current architect mode based on plan state
  */
-export declare function detectArchitectMode(directory: string): Promise<ArchitectMode>;
+export declare function detectArchitectMode(directory: string, cache?: Map<string, Promise<string | null>>): Promise<ArchitectMode>;

package/dist/hooks/utils.d.ts

@@ -5,6 +5,7 @@
  * including error handling, handler composition, file I/O, and
  * token estimation for swarm-related operations.
  */
+import { readCachedTextFile } from '../utils/swarm-artifact-cache';
 /**
  * Test-only dependency-injection seam. Production code calls
  * `_internals.<fn>(...)` so tests can replace the function on this object
@@ -18,6 +19,7 @@ export declare const _internals: {
     composeHandlers: typeof composeHandlers;
     validateSwarmPath: typeof validateSwarmPath;
     readSwarmFileAsync: typeof readSwarmFileAsync;
+    readCachedTextFile: typeof readCachedTextFile;
 };
 export declare function safeHook<I, O>(fn: (input: I, output: O) => Promise<void>): (input: I, output: O) => Promise<void>;
 /**
@@ -70,5 +72,5 @@ export declare function composeBlockingHandlers<I, O>(...fns: Array<(input: I, o
  * @throws Error if the filename is invalid or attempts path traversal
  */
 export declare function validateSwarmPath(directory: string, filename: string): string;
-export declare function readSwarmFileAsync(directory: string, filename: string): Promise<string | null>;
+export declare function readSwarmFileAsync(directory: string, filename: string, cache?: Map<string, Promise<string | null>>): Promise<string | null>;
 export declare function estimateTokens(text: string): number;

package/dist/index.js

@@ -69,7 +69,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "opencode-swarm",
-    version: "7.98.0",
+    version: "7.98.2",
     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",
@@ -18167,13 +18167,23 @@ function validateSwarmPath(directory, filename) {
   }
   return resolved;
 }
-async function readSwarmFileAsync(directory, filename) {
+async function readSwarmFileAsync(directory, filename, cache) {
+  if (cache !== undefined) {
+    const key = `${directory}::${filename}`;
+    const cached2 = cache.get(key);
+    if (cached2 !== undefined) {
+      return cached2;
+    }
+    const promise2 = readSwarmFileAsync(directory, filename);
+    cache.set(key, promise2);
+    return promise2;
+  }
   const maxAttempts = 5;
   const retryDelayMs = 10;
   for (let attempt = 0;attempt < maxAttempts; attempt++) {
     try {
       const resolvedPath = _internals3.validateSwarmPath(directory, filename);
-      return await readCachedTextFile(resolvedPath, async () => {
+      return await _internals3.readCachedTextFile(resolvedPath, async () => {
         const file2 = bunFile(resolvedPath);
         return await file2.text();
       });
@@ -18198,7 +18208,13 @@ var init_utils2 = __esm(() => {
   init_utils();
   init_bun_compat();
   init_swarm_artifact_cache();
-  _internals3 = { safeHook, composeHandlers, validateSwarmPath, readSwarmFileAsync };
+  _internals3 = {
+    safeHook,
+    composeHandlers,
+    validateSwarmPath,
+    readSwarmFileAsync,
+    readCachedTextFile
+  };
 });
 
 // src/utils/git-binary-missing-error.ts
@@ -20452,8 +20468,8 @@ function extractPlanHashFromMarkdown(markdown) {
   const match = markdown.match(/<!--\s*PLAN_HASH:\s*(\S+)\s*-->/);
   return match ? match[1] : null;
 }
-async function isPlanMdInSync(directory, plan) {
-  const planMdContent = await readSwarmFileAsync(directory, "plan.md");
+async function isPlanMdInSync(directory, plan, cache) {
+  const planMdContent = await readSwarmFileAsync(directory, "plan.md", cache);
   if (planMdContent === null) {
     return false;
   }
@@ -20487,8 +20503,8 @@ ${markdown}`;
     } catch {}
   }
 }
-async function loadPlan(directory) {
-  const planJsonContent = await readSwarmFileAsync(directory, "plan.json");
+async function loadPlan(directory, cache) {
+  const planJsonContent = await readSwarmFileAsync(directory, "plan.json", cache);
   if (planJsonContent !== null) {
     if (planJsonContent.includes("\x00") || planJsonContent.includes("�")) {
       warn("Plan rejected: .swarm/plan.json contains null bytes or invalid encoding");
@@ -20498,7 +20514,7 @@ async function loadPlan(directory) {
         if (validated === null) {
           warn("[loadPlan] plan.json disappeared during cached parse. Falling back to plan.md migration or ledger recovery.");
         } else {
-          const inSync = await isPlanMdInSync(directory, validated);
+          const inSync = await isPlanMdInSync(directory, validated, cache);
           if (!inSync) {
             try {
               await _internals8.regeneratePlanMarkdown(directory, validated);
@@ -20621,7 +20637,7 @@ async function loadPlan(directory) {
             }
           }
         }
-        const planMdContent2 = await readSwarmFileAsync(directory, "plan.md");
+        const planMdContent2 = await readSwarmFileAsync(directory, "plan.md", cache);
         if (planMdContent2 !== null) {
           const migrated = migrateLegacyPlan(planMdContent2);
           const { removedCount } = await savePlanWithAutoAcknowledgedRemovals(directory, migrated, "load_plan_migration_from_md", "migrate legacy plan.md to plan.json");
@@ -20636,7 +20652,7 @@ async function loadPlan(directory) {
       }
     }
   }
-  const planMdContent = await readSwarmFileAsync(directory, "plan.md");
+  const planMdContent = await readSwarmFileAsync(directory, "plan.md", cache);
   if (planMdContent !== null) {
     const migrated = migrateLegacyPlan(planMdContent);
     await savePlan(directory, migrated);
@@ -70430,48 +70446,43 @@ function recordSeenRetroSection(key, value, timestamp) {
 function hashContent2(content) {
   return createHash9("sha1").update(content).digest("hex");
 }
-function isWriteToSwarmPlan(input) {
-  if (typeof input !== "object" || input === null)
-    return false;
-  const record3 = input;
-  const toolName = record3.toolName;
-  if (typeof toolName !== "string")
-    return false;
-  if (!["write", "edit", "apply_patch", "swarm_apply_patch"].includes(toolName))
-    return false;
-  const rawPath = record3.path;
-  const rawFile = record3.file;
-  const pathField = typeof rawPath === "string" ? rawPath.replace(/\\/g, "/") : undefined;
-  const fileField = typeof rawFile === "string" ? rawFile.replace(/\\/g, "/") : undefined;
-  if (typeof pathField === "string" && pathField.includes(".swarm/plan.md")) {
-    return true;
-  }
-  if (typeof fileField === "string" && fileField.includes(".swarm/plan.md")) {
-    return true;
-  }
-  return false;
-}
 function isWriteToEvidenceFile(input) {
-  if (typeof input !== "object" || input === null)
-    return false;
-  const record3 = input;
-  const toolName = record3.toolName;
-  if (typeof toolName !== "string")
-    return false;
-  if (!["write", "edit", "apply_patch", "swarm_apply_patch"].includes(toolName))
+  const trigger = normalizeWriteTrigger(input);
+  return isEvidencePath(trigger?.filePath);
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
+function normalizePathField(value) {
+  return typeof value === "string" ? value.replace(/\\/g, "/") : null;
+}
+function firstPathFromRecord(record3) {
+  return normalizePathField(record3.path) ?? normalizePathField(record3.filePath) ?? normalizePathField(record3.file);
+}
+function normalizeWriteTrigger(input, output) {
+  if (!isRecord(input))
+    return null;
+  const toolName = typeof input.toolName === "string" ? input.toolName : typeof input.tool === "string" ? input.tool : null;
+  if (!toolName || !WRITE_TOOLS.has(toolName))
+    return null;
+  const inputArgs = isRecord(input.args) ? input.args : null;
+  const outputArgs = isRecord(output) && isRecord(output.args) ? output.args : null;
+  const filePath = firstPathFromRecord(input) ?? (inputArgs ? firstPathFromRecord(inputArgs) : null) ?? (outputArgs ? firstPathFromRecord(outputArgs) : null);
+  if (!filePath)
+    return null;
+  return {
+    toolName,
+    filePath,
+    sessionID: typeof input.sessionID === "string" ? input.sessionID : "default"
+  };
+}
+function isEvidencePath(filePath) {
+  if (!filePath)
     return false;
-  const rawPath = record3.path;
-  const rawFile = record3.file;
-  const pathField = typeof rawPath === "string" ? rawPath.replace(/\\/g, "/") : undefined;
-  const fileField = typeof rawFile === "string" ? rawFile.replace(/\\/g, "/") : undefined;
-  const evidenceRegex = /\.swarm\/+evidence\/+/i;
-  if (typeof pathField === "string" && evidenceRegex.test(pathField)) {
-    return true;
-  }
-  if (typeof fileField === "string" && evidenceRegex.test(fileField)) {
-    return true;
-  }
-  return false;
+  return /(?:^|\/)\.swarm\/+evidence\//i.test(filePath);
+}
+function isPlanPath(filePath) {
+  return filePath?.includes(".swarm/plan.md") ?? false;
 }
 function extractRetrospectiveSection(planContent) {
   const headingRegex = /^###\s+Lessons\s+Learned$/m;
@@ -71153,24 +71164,22 @@ async function runAutoPromotion(directory, config3) {
   }
 }
 function createKnowledgeCuratorHook(directory, config3, options = {}) {
-  const handler = async (input, _output) => {
+  const handler = async (input, output) => {
     pruneSeenRetroSections();
     if (!config3.enabled)
       return;
-    if (!isWriteToSwarmPlan(input) && !isWriteToEvidenceFile(input))
+    const trigger = normalizeWriteTrigger(input, output);
+    if (!trigger)
+      return;
+    const isPlanTrigger = isPlanPath(trigger.filePath);
+    const isEvidenceTrigger = isEvidencePath(trigger.filePath) && !isPlanTrigger;
+    if (!isPlanTrigger && !isEvidenceTrigger)
       return;
-    const sessionID = input?.sessionID ?? "default";
-    const isEvidenceTrigger = isWriteToEvidenceFile(input) && !isWriteToSwarmPlan(input);
     if (isEvidenceTrigger) {
-      const record3 = input;
-      const rawPath = record3.path;
-      const rawFile = record3.file;
-      const filePath = typeof rawPath === "string" ? rawPath.replace(/\\/g, "/") : typeof rawFile === "string" ? rawFile.replace(/\\/g, "/") : null;
-      if (!filePath)
-        return;
-      const evidenceKey = `evidence:${sessionID}:${filePath}`;
+      const relativeEvidencePath = trigger.filePath.replace(/^.*\.swarm\//, "");
+      const evidenceKey = `evidence:${trigger.sessionID}:${relativeEvidencePath}`;
       const lastSeenEvidence = seenRetroSections.get(evidenceKey);
-      const evidenceContent = await readSwarmFileAsync(directory, filePath.replace(/^.*\.swarm\//, ""));
+      const evidenceContent = await readSwarmFileAsync(directory, relativeEvidencePath);
       if (!evidenceContent)
         return;
       let evidenceData;
@@ -71198,7 +71207,7 @@ function createKnowledgeCuratorHook(directory, config3, options = {}) {
       const projectName2 = evidenceData.project_name ?? "unknown";
       const phaseNumber2 = typeof evidenceData.phase_number === "number" ? evidenceData.phase_number : 1;
       await _internals35.curateAndStoreSwarm(lessons, projectName2, { phase_number: phaseNumber2 }, directory, config3, {
-        llmDelegate: options.llmDelegateFactory?.(sessionID),
+        llmDelegate: options.llmDelegateFactory?.(trigger.sessionID),
         enrichmentQuota: options.enrichmentQuota
       });
       return;
@@ -71209,7 +71218,7 @@ function createKnowledgeCuratorHook(directory, config3, options = {}) {
     const section = extractRetrospectiveSection(planContent);
     if (!section)
       return;
-    if (!checkRetroChanged(sessionID, section))
+    if (!checkRetroChanged(trigger.sessionID, section))
       return;
     const allLessons = extractLessonsFromRetro(section);
     if (allLessons.length === 0)
@@ -71223,13 +71232,13 @@ function createKnowledgeCuratorHook(directory, config3, options = {}) {
     const phaseMatch = /^Phase:\s*(\d+)/m.exec(planContent);
     const phaseNumber = phaseMatch ? parseInt(phaseMatch[1], 10) : 1;
     await _internals35.curateAndStoreSwarm(normalLessons, projectName, { phase_number: phaseNumber }, directory, config3, {
-      llmDelegate: options.llmDelegateFactory?.(sessionID),
+      llmDelegate: options.llmDelegateFactory?.(trigger.sessionID),
       enrichmentQuota: options.enrichmentQuota
     });
   };
   return safeHook(handler);
 }
-var seenRetroSections, MAX_TRACKED_RETRO_SECTIONS = 500, ENRICHMENT_ALLOWED_FIELDS, ENRICHMENT_LLM_TIMEOUT_MS = 60000, ENRICHMENT_BATCH_SIZE = 6, MESO_INSIGHT_BATCH_LIMIT = 20, KNOWLEDGE_CATEGORIES, OUTCOME_PROMOTION_BLOCK = -0.3, _internals35;
+var seenRetroSections, MAX_TRACKED_RETRO_SECTIONS = 500, WRITE_TOOLS, ENRICHMENT_ALLOWED_FIELDS, ENRICHMENT_LLM_TIMEOUT_MS = 60000, ENRICHMENT_BATCH_SIZE = 6, MESO_INSIGHT_BATCH_LIMIT = 20, KNOWLEDGE_CATEGORIES, OUTCOME_PROMOTION_BLOCK = -0.3, _internals35;
 var init_knowledge_curator = __esm(() => {
   init_skill_improver_quota();
   init_synonym_map();
@@ -71241,6 +71250,12 @@ var init_knowledge_curator = __esm(() => {
   init_micro_reflector();
   init_utils2();
   seenRetroSections = new Map;
+  WRITE_TOOLS = new Set([
+    "write",
+    "edit",
+    "apply_patch",
+    "swarm_apply_patch"
+  ]);
   ENRICHMENT_ALLOWED_FIELDS = [
     "triggers",
     "required_actions",
@@ -73876,6 +73891,10 @@ This project was already finalized in a previous /swarm close run. The plan has
       ctx.warnings.push(`Failed to write close-summary.md: ${msg}`);
       console.warn("[close-command] Failed to write close-summary.md:", error93);
     }
+    const sessionIdsToEnd = [...swarmState.agentSessions.keys()];
+    for (const sessionId of sessionIdsToEnd) {
+      _internals38.endAgentSession(sessionId);
+    }
     _internals38.resetSwarmStatePreservingSingletons();
     const retroWarnings = ctx.warnings.filter((w) => w.includes("Retrospective write") || w.includes("retrospective write") || w.includes("Session retrospective"));
     const otherWarnings = ctx.warnings.filter((w) => !w.includes("Retrospective write") && !w.includes("retrospective write") && !w.includes("Session retrospective"));
@@ -74042,7 +74061,8 @@ var init_close = __esm(() => {
     runCleanStage,
     runAlignStage,
     archiveEvidence,
-    closePlanTerminalState
+    closePlanTerminalState,
+    endAgentSession
   };
 });
 
@@ -119726,6 +119746,7 @@ function createSystemEnhancerHook(config3, directory) {
             return;
           }
         }
+        const planReadCache = new Map;
         const maxInjectionTokens = config3.context_budget?.max_injection_tokens ?? 4000;
         let injectedTokens = 0;
         let actualDemand = 0;
@@ -119740,7 +119761,7 @@ function createSystemEnhancerHook(config3, directory) {
         } else {
           seAllocation = maxInjectionTokens;
         }
-        const contextContent = await readSwarmFileAsync(directory, "context.md");
+        const contextContent = await readSwarmFileAsync(directory, "context.md", planReadCache);
         try {
           const { scanDocIndex: scanDocIndex2 } = await Promise.resolve().then(() => (init_doc_scan(), exports_doc_scan));
           const { manifest, cached: cached3 } = await scanDocIndex2(directory);
@@ -119800,19 +119821,19 @@ function createSystemEnhancerHook(config3, directory) {
         if (!scoringEnabled) {
           let plan2 = null;
           try {
-            plan2 = await loadPlan(directory);
+            plan2 = await loadPlan(directory, planReadCache);
           } catch (error93) {
             warn(`Failed to load plan: ${error93 instanceof Error ? error93.message : String(error93)}`);
           }
           maybeAppendSpecDriftAdvisory(output, directory, plan2);
-          const mode = await detectArchitectMode(directory);
+          const mode = await detectArchitectMode(directory, planReadCache);
           let planContent = null;
           let phaseHeader = "";
           if (plan2 && plan2.migration_status !== "migration_failed") {
             phaseHeader = extractCurrentPhaseFromPlan(plan2) || "";
-            planContent = await readSwarmFileAsync(directory, "plan.md");
+            planContent = await readSwarmFileAsync(directory, "plan.md", planReadCache);
           } else {
-            planContent = await readSwarmFileAsync(directory, "plan.md");
+            planContent = await readSwarmFileAsync(directory, "plan.md", planReadCache);
             phaseHeader = planContent ? extractCurrentPhase(planContent) || "" : "";
           }
           if (phaseHeader) {
@@ -119824,7 +119845,7 @@ function createSystemEnhancerHook(config3, directory) {
           }
           if (mode !== "DISCOVER") {
             try {
-              const handoffContent = await readSwarmFileAsync(directory, "handoff.md");
+              const handoffContent = await readSwarmFileAsync(directory, "handoff.md", planReadCache);
               if (handoffContent) {
                 const handoffPath = validateSwarmPath(directory, "handoff.md");
                 const consumedPath = validateSwarmPath(directory, "handoff-consumed.md");
@@ -120188,7 +120209,7 @@ ${budgetWarning}`);
           } else {}
           return;
         }
-        const mode_b = await detectArchitectMode(directory);
+        const mode_b = await detectArchitectMode(directory, planReadCache);
         const userScoringConfig = config3.context_budget?.scoring;
         const candidates = [];
         let idCounter = 0;
@@ -120200,7 +120221,7 @@ ${budgetWarning}`);
         } : DEFAULT_SCORING_CONFIG;
         let plan = null;
         try {
-          plan = await loadPlan(directory);
+          plan = await loadPlan(directory, planReadCache);
         } catch (error93) {
           warn(`Failed to load plan: ${error93 instanceof Error ? error93.message : String(error93)}`);
         }
@@ -120211,7 +120232,7 @@ ${budgetWarning}`);
           currentPhase = extractCurrentPhaseFromPlan(plan);
           currentTask = extractCurrentTaskFromPlan(plan);
         } else {
-          planContentForCursor = await readSwarmFileAsync(directory, "plan.md");
+          planContentForCursor = await readSwarmFileAsync(directory, "plan.md", planReadCache);
           if (planContentForCursor) {
             currentPhase = extractCurrentPhase(planContentForCursor);
             currentTask = extractCurrentTask(planContentForCursor);
@@ -120255,7 +120276,7 @@ ${budgetWarning}`);
         }
         if (mode_b !== "DISCOVER") {
           try {
-            const handoffContent = await readSwarmFileAsync(directory, "handoff.md");
+            const handoffContent = await readSwarmFileAsync(directory, "handoff.md", planReadCache);
             if (handoffContent) {
               const handoffPath = validateSwarmPath(directory, "handoff.md");
               const consumedPath = validateSwarmPath(directory, "handoff-consumed.md");
@@ -120754,9 +120775,9 @@ ${activitySection}`;
   }
   return contextSummary;
 }
-async function detectArchitectMode(directory) {
+async function detectArchitectMode(directory, cache4) {
   try {
-    const plan = await loadPlan(directory);
+    const plan = await loadPlan(directory, cache4);
     if (!plan) {
       return "DISCOVER";
     }
@@ -125232,7 +125253,7 @@ init_state2();
 init_delegation_gate();
 init_normalize_tool_name();
 import * as path154 from "node:path";
-var WRITE_TOOLS = new Set(WRITE_TOOL_NAMES);
+var WRITE_TOOLS2 = new Set(WRITE_TOOL_NAMES);
 function createScopeGuardHook(config3, directory, injectAdvisory) {
   const enabled = config3.enabled ?? true;
   const _skipInTurbo = config3.skip_in_turbo ?? false;
@@ -125241,7 +125262,7 @@ function createScopeGuardHook(config3, directory, injectAdvisory) {
       if (!enabled)
         return;
       const toolName = normalizeToolName(input.tool);
-      if (!WRITE_TOOLS.has(toolName))
+      if (!WRITE_TOOLS2.has(toolName))
         return;
       const sessionId = input.sessionID;
       const activeAgent = swarmState.activeAgent.get(sessionId);
@@ -135730,8 +135751,99 @@ function scanInvisibleFormatChars(text, fieldName) {
   }
   return findings;
 }
-function stripMarkdownCodeForUnsafeScan(text) {
-  return text.replace(/```[\s\S]*?```/g, " ").replace(/~~~[\s\S]*?~~~/g, " ").replace(/`[^`\n]*`/g, " ");
+var CODE_SPAN_OR_FENCE_REGEX = /```[\s\S]*?```|~~~[\s\S]*?~~~|`[^`\n]*`/g;
+var CODE_WARNING_ONLY_PATTERNS = new Set([
+  "backtick_execution",
+  "shell_substitution",
+  "disk_format",
+  "force_kill",
+  "process_group_kill",
+  "kill_all_processes"
+]);
+function splitMarkdownCodeSegments(text) {
+  const segments = [];
+  let cursor = 0;
+  for (const match of text.matchAll(CODE_SPAN_OR_FENCE_REGEX)) {
+    const index = match.index ?? 0;
+    if (index > cursor) {
+      segments.push({ value: text.slice(cursor, index), isCode: false });
+    }
+    segments.push({ value: match[0], isCode: true });
+    cursor = index + match[0].length;
+  }
+  if (cursor < text.length) {
+    segments.push({ value: text.slice(cursor), isCode: false });
+  }
+  return segments.length === 0 ? [{ value: text, isCode: false }] : segments;
+}
+function getUnsafeInstructionMetadata(name) {
+  const entry = UNSAFE_INSTRUCTION_PATTERNS.find((item) => item.name === name);
+  return {
+    description: entry?.description ?? "Destructive file removal command",
+    severity: entry?.severity ?? "error"
+  };
+}
+function tokenizeShellArgs(input) {
+  const tokens = [];
+  const tokenRegex = /"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|[^\s]+/g;
+  for (const match of input.matchAll(tokenRegex)) {
+    const token = match[1] ?? match[2] ?? match[0];
+    if (token.length > 0)
+      tokens.push(token);
+  }
+  return tokens;
+}
+function rmFlagHasShortOption(token, option) {
+  return /^-[A-Za-z]+$/.test(token) && token.slice(1).includes(option);
+}
+function isRmOption(token) {
+  return token.startsWith("-") && token !== "-";
+}
+function isDangerousRemovalTarget(rawTarget) {
+  const target = rawTarget.replace(/\\/g, "/");
+  if (/^[A-Za-z]:[/\\]?$/.test(target))
+    return true;
+  return target === "/" || target === "/*" || target === "." || target === ".." || target.startsWith(".swarm") || target.startsWith("/.swarm") || target.startsWith("~") || target.startsWith("$") || target.startsWith("${") || target.startsWith("%") || target.startsWith("/home") || target.startsWith("/Users") || target.startsWith("/etc") || target.startsWith("/bin") || target.startsWith("/sbin") || target.startsWith("/usr") || target.startsWith("/var") || /^[A-Za-z]:\/(?:Users|Windows)(?:\/|$)/.test(target);
+}
+function findDangerousRemovalCommands(text) {
+  const commands = [];
+  const rmCommandRegex = /\b(?<sudo>sudo\s+)?rm\b(?<args>[^\r\n`;&|]*)/gi;
+  for (const match of text.matchAll(rmCommandRegex)) {
+    const args2 = tokenizeShellArgs(match.groups?.args ?? "");
+    const hasRecursive = args2.some((token) => token === "--recursive" || token === "-R" || rmFlagHasShortOption(token, "r") || rmFlagHasShortOption(token, "R"));
+    const hasForce = args2.some((token) => token === "--force" || token === "-f" || rmFlagHasShortOption(token, "f"));
+    if (!hasRecursive || !hasForce)
+      continue;
+    if (!args2.some((token) => !isRmOption(token) && isDangerousRemovalTarget(token))) {
+      continue;
+    }
+    const pattern = match.groups?.sudo === undefined ? "destructive_file_removal" : "privileged_file_removal";
+    commands.push({
+      pattern,
+      description: getUnsafeInstructionMetadata(pattern).description,
+      match: match[0].trim().slice(0, 100)
+    });
+  }
+  return commands;
+}
+function hasDangerousRemovalTarget(text) {
+  return findDangerousRemovalCommands(text).length > 0;
+}
+function shouldScanUnsafePatternInSegment(entry, segment) {
+  if (!segment.isCode)
+    return true;
+  if (CODE_WARNING_ONLY_PATTERNS.has(entry.name))
+    return false;
+  if (entry.name === "destructive_file_removal" || entry.name === "privileged_file_removal") {
+    return false;
+  }
+  return true;
+}
+function getUnsafeScanSegments(field, value) {
+  if (field !== "skill_body") {
+    return [{ value, isCode: false }];
+  }
+  return splitMarkdownCodeSegments(value);
 }
 function scanPromptInjection(candidate, trustLevel = "low") {
   const fields = extractCandidateFields(candidate);
@@ -135799,17 +135911,37 @@ function scanUnsafeInstructions(candidate, trustLevel = "low") {
   const fieldsScanned = [];
   for (const { field, value } of fields) {
     fieldsScanned.push(field);
-    const scanValue = field === "skill_body" ? stripMarkdownCodeForUnsafeScan(value) : value;
+    const scanSegments = getUnsafeScanSegments(field, value);
+    if (field === "skill_body") {
+      for (const segment of scanSegments) {
+        if (!segment.isCode)
+          continue;
+        for (const command of findDangerousRemovalCommands(segment.value)) {
+          findings.push({
+            pattern: command.pattern,
+            field,
+            description: command.description,
+            severity: "error",
+            match: command.match
+          });
+        }
+      }
+    }
     for (const entry of UNSAFE_INSTRUCTION_PATTERNS) {
-      const match = entry.pattern.exec(scanValue);
-      if (match !== null) {
-        findings.push({
-          pattern: entry.name,
-          field,
-          description: entry.description,
-          severity: entry.severity,
-          match: match[0].slice(0, 100)
-        });
+      for (const segment of scanSegments) {
+        if (!shouldScanUnsafePatternInSegment(entry, segment))
+          continue;
+        const match = entry.pattern.exec(segment.value);
+        if (match !== null) {
+          findings.push({
+            pattern: entry.name,
+            field,
+            description: entry.description,
+            severity: entry.severity,
+            match: match[0].slice(0, 100)
+          });
+          break;
+        }
       }
     }
   }
@@ -135973,7 +136105,9 @@ function evaluateCandidate(candidate, options) {
 var _internals103 = {
   getTimestamp: () => new Date().toISOString(),
   computeSha256: (content) => createHash21("sha256").update(content).digest("hex"),
-  stripMarkdownCodeForUnsafeScan
+  splitMarkdownCodeSegments,
+  hasDangerousRemovalTarget,
+  isDangerousRemovalTarget
 };
 
 // src/tools/external-skill-discover.ts

package/dist/plan/manager.d.ts

@@ -108,7 +108,7 @@ export declare function regeneratePlanMarkdown(directory: string, plan: Plan): P
  * 3. .swarm/plan.md exists only -> migrate from plan.md, save both files, return Plan
  * 4. Neither exists -> return null
  */
-export declare function loadPlan(directory: string): Promise<RuntimePlan | null>;
+export declare function loadPlan(directory: string, cache?: Map<string, Promise<string | null>>): Promise<RuntimePlan | null>;
 /**
  * Recovery-path helper for callers that legitimately need to replace the
  * plan task set without explicit per-id acknowledgement (e.g. rebuilding

package/dist/services/external-skill-validator.d.ts

@@ -105,7 +105,13 @@ export declare const VALIDATION_RATE_LIMITS: {
     /** Timeout for individual fetch operations in milliseconds. */
     readonly fetch_timeout_ms: 30000;
 };
-declare function stripMarkdownCodeForUnsafeScan(text: string): string;
+interface MarkdownSegment {
+    value: string;
+    isCode: boolean;
+}
+declare function splitMarkdownCodeSegments(text: string): MarkdownSegment[];
+declare function isDangerousRemovalTarget(rawTarget: string): boolean;
+declare function hasDangerousRemovalTarget(text: string): boolean;
 /**
  * Scan an external skill candidate for prompt-injection patterns.
  *
@@ -158,6 +164,8 @@ export declare function evaluateCandidate(candidate: ExternalSkillCandidate, opt
 export declare const _internals: {
     getTimestamp: () => string;
     computeSha256: (content: string) => string;
-    stripMarkdownCodeForUnsafeScan: typeof stripMarkdownCodeForUnsafeScan;
+    splitMarkdownCodeSegments: typeof splitMarkdownCodeSegments;
+    hasDangerousRemovalTarget: typeof hasDangerousRemovalTarget;
+    isDangerousRemovalTarget: typeof isDangerousRemovalTarget;
 };
 export {};

package/dist/state.d.ts

@@ -391,9 +391,9 @@ export declare function resetSwarmStatePreservingSingletons(): void;
 export declare function startAgentSession(sessionId: string, agentName: string, staleDurationMs?: number, directory?: string): void;
 /**
  * End an agent session by removing it from the state.
- * NOTE: Currently unused in production — no session lifecycle teardown is wired up.
- * Sessions accumulate for the process lifetime. Callers should integrate this into
- * a session TTL or idle-timeout mechanism to prevent unbounded Map growth.
+ * Called at session terminal state transitions (task completion, error, or session
+ * teardown) to prevent unbounded Map growth. Double-calls are safe: Map.delete is
+ * a no-op for missing keys (FR-010).
  * @param sessionId - The session identifier to remove
  */
 export declare function endAgentSession(sessionId: string): void;

package/package.json

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