@wrongstack/core 0.3.1 → 0.3.2

package/dist/index.js

@@ -1166,6 +1166,98 @@ function estimateTextTokens(text) {
   return RoughTokenEstimate(text);
 }
 
+// src/utils/message-invariants.ts
+function repairToolUseAdjacency(messages) {
+  const removedToolUses = [];
+  const removedToolResults = [];
+  let removedMessages = 0;
+  let changed = false;
+  const out = [];
+  for (let i = 0; i < messages.length; i++) {
+    const original = messages[i];
+    let msg = original;
+    if (hasToolUse(msg)) {
+      const nextIds = toolResultIds(messages[i + 1]);
+      const filtered = mapContent(msg, (blocks) => {
+        const next = [];
+        for (const block of blocks) {
+          if (block.type === "tool_use" && !nextIds.has(block.id)) {
+            removedToolUses.push(block.id);
+            changed = true;
+            continue;
+          }
+          next.push(block);
+        }
+        return next;
+      });
+      msg = filtered ?? msg;
+    }
+    if (hasToolResult(msg)) {
+      const allowed = toolUseIds(out[out.length - 1]);
+      const filtered = mapContent(msg, (blocks) => {
+        const next = [];
+        for (const block of blocks) {
+          if (block.type === "tool_result" && !allowed.has(block.tool_use_id)) {
+            removedToolResults.push(block.tool_use_id);
+            changed = true;
+            continue;
+          }
+          next.push(block);
+        }
+        return next;
+      });
+      msg = filtered ?? msg;
+    }
+    if (isEmptyMessage(msg)) {
+      removedMessages++;
+      changed = true;
+      continue;
+    }
+    out.push(msg);
+  }
+  return {
+    messages: changed ? out : messages,
+    report: { changed, removedToolUses, removedToolResults, removedMessages }
+  };
+}
+function hasToolUse(msg) {
+  return contentBlocks(msg).some((b) => b.type === "tool_use");
+}
+function hasToolResult(msg) {
+  return contentBlocks(msg).some((b) => b.type === "tool_result");
+}
+function toolUseIds(msg) {
+  const ids = /* @__PURE__ */ new Set();
+  if (!msg || msg.role !== "assistant") return ids;
+  for (const block of contentBlocks(msg)) {
+    if (block.type === "tool_use") ids.add(block.id);
+  }
+  return ids;
+}
+function toolResultIds(msg) {
+  const ids = /* @__PURE__ */ new Set();
+  if (!msg || msg.role !== "user") return ids;
+  for (const block of contentBlocks(msg)) {
+    if (block.type === "tool_result") ids.add(block.tool_use_id);
+  }
+  return ids;
+}
+function contentBlocks(msg) {
+  return msg && Array.isArray(msg.content) ? msg.content : [];
+}
+function mapContent(msg, fn) {
+  if (!Array.isArray(msg.content)) return msg;
+  const next = fn(msg.content);
+  if (next.length === msg.content.length && next.every((b, idx) => b === msg.content[idx])) {
+    return msg;
+  }
+  return { ...msg, content: next };
+}
+function isEmptyMessage(msg) {
+  if (typeof msg.content === "string") return msg.content.trim().length === 0;
+  return msg.content.length === 0;
+}
+
 // src/execution/compactor.ts
 var HybridCompactor = class {
   preserveK;
@@ -1179,20 +1271,36 @@ var HybridCompactor = class {
   async compact(ctx, opts = {}) {
     const beforeTokens = this.estimateMessages(ctx.messages);
     const reductions = [];
-    const phase1Saved = this.eliseOldToolResults(ctx);
+    const policy = readContextWindowPolicy(ctx);
+    const preserveK = policy?.preserveK ?? this.preserveK;
+    const eliseThreshold = policy?.eliseThreshold ?? this.eliseThreshold;
+    const phase1Saved = this.eliseOldToolResults(ctx, preserveK, eliseThreshold);
     if (phase1Saved > 0) reductions.push({ phase: "elision", saved: phase1Saved });
     if (opts.aggressive) {
-      const phase2Saved = this.collapseAncientTurns(ctx);
+      const phase2Saved = this.collapseAncientTurns(ctx, preserveK);
       if (phase2Saved > 0) reductions.push({ phase: "summary", saved: phase2Saved });
     }
+    const repaired = repairToolUseAdjacency(ctx.messages);
+    if (repaired.report.changed) {
+      ctx.state.replaceMessages(repaired.messages);
+    }
     const afterTokens = this.estimateMessages(ctx.messages);
-    return { before: beforeTokens, after: afterTokens, reductions };
+    return {
+      before: beforeTokens,
+      after: afterTokens,
+      reductions,
+      repaired: repaired.report.changed ? {
+        removedToolUses: repaired.report.removedToolUses,
+        removedToolResults: repaired.report.removedToolResults,
+        removedMessages: repaired.report.removedMessages
+      } : void 0
+    };
   }
-  eliseOldToolResults(ctx) {
+  eliseOldToolResults(ctx, preserveK = this.preserveK, eliseThreshold = this.eliseThreshold) {
     const messages = ctx.messages;
     let pairCount = 0;
     let preserveStart = messages.length;
-    for (let i = messages.length - 1; i >= 0 && pairCount < this.preserveK; i--) {
+    for (let i = messages.length - 1; i >= 0 && pairCount < preserveK; i--) {
       const m = messages[i];
       if (!m) continue;
       if (m.role === "user" || m.role === "assistant") {
@@ -1216,7 +1324,7 @@ var HybridCompactor = class {
       const newContent = msg.content.map((b) => {
         if (b.type !== "tool_result") return b;
         const tokens = estimateToolResultTokens(b.content);
-        if (tokens < this.eliseThreshold) return b;
+        if (tokens < eliseThreshold) return b;
         saved += tokens;
         const elided = {
           type: "tool_result",
@@ -1236,9 +1344,9 @@ var HybridCompactor = class {
     if (changed) ctx.state.replaceMessages(nextMessages);
     return saved;
   }
-  collapseAncientTurns(ctx) {
+  collapseAncientTurns(ctx, preserveK = this.preserveK) {
     const messages = ctx.messages;
-    const cutTarget = Math.max(0, messages.length - this.preserveK * 2);
+    const cutTarget = Math.max(0, messages.length - preserveK * 2);
     if (cutTarget <= 0) return 0;
     let boundary = -1;
     for (let i = cutTarget; i < messages.length; i++) {
@@ -1279,6 +1387,15 @@ var HybridCompactor = class {
     return total;
   }
 };
+function readContextWindowPolicy(ctx) {
+  const policy = ctx.meta?.["contextWindowPolicy"];
+  if (!policy || typeof policy !== "object") return null;
+  const candidate = policy;
+  if (typeof candidate.preserveK !== "number" || typeof candidate.eliseThreshold !== "number") {
+    return null;
+  }
+  return candidate;
+}
 function hasTextContent(m) {
   if (typeof m.content === "string") return m.content.trim().length > 0;
   return m.content.some((b) => b.type === "text" && b.text.trim().length > 0);
@@ -1944,6 +2061,85 @@ When refactoring code:
   }
 ];
 
+// src/types/context-window.ts
+var DEFAULT_CONTEXT_WINDOW_MODE_ID = "balanced";
+var CONTEXT_WINDOW_MODES = Object.freeze([
+  {
+    id: "balanced",
+    name: "Balanced",
+    description: "Default rolling compaction: recent work stays verbatim, old tool output is trimmed.",
+    thresholds: { warn: 0.6, soft: 0.75, hard: 0.9 },
+    aggressiveOn: "soft",
+    preserveK: 10,
+    eliseThreshold: 2e3,
+    targetLoad: 0.65
+  },
+  {
+    id: "frugal",
+    name: "Frugal",
+    description: "Token-saver mode: compacts early and keeps a tighter verbatim tail.",
+    thresholds: { warn: 0.45, soft: 0.6, hard: 0.75 },
+    aggressiveOn: "warn",
+    preserveK: 6,
+    eliseThreshold: 700,
+    targetLoad: 0.5
+  },
+  {
+    id: "deep",
+    name: "Deep",
+    description: "Long-reasoning mode: delays compaction and keeps more recent turns intact.",
+    thresholds: { warn: 0.72, soft: 0.86, hard: 0.96 },
+    aggressiveOn: "hard",
+    preserveK: 18,
+    eliseThreshold: 5e3,
+    targetLoad: 0.78
+  },
+  {
+    id: "archival",
+    name: "Archival",
+    description: "Decision-preserving mode: compacts steadily while keeping summaries prominent.",
+    thresholds: { warn: 0.55, soft: 0.7, hard: 0.84 },
+    aggressiveOn: "soft",
+    preserveK: 8,
+    eliseThreshold: 1200,
+    targetLoad: 0.58
+  }
+]);
+function listContextWindowModes() {
+  return CONTEXT_WINDOW_MODES.map((m) => ({ ...m, thresholds: { ...m.thresholds } }));
+}
+function getContextWindowMode(id) {
+  if (!id) return null;
+  const mode = CONTEXT_WINDOW_MODES.find((m) => m.id === id);
+  return mode ? { ...mode, thresholds: { ...mode.thresholds } } : null;
+}
+function isContextWindowModeId(id) {
+  return CONTEXT_WINDOW_MODES.some((m) => m.id === id);
+}
+function resolveContextWindowPolicy(config = {}, overrideMode) {
+  const requested = overrideMode ?? config.mode ?? DEFAULT_CONTEXT_WINDOW_MODE_ID;
+  const mode = getContextWindowMode(requested) ?? getContextWindowMode(DEFAULT_CONTEXT_WINDOW_MODE_ID);
+  if (mode.id !== DEFAULT_CONTEXT_WINDOW_MODE_ID) {
+    return mode;
+  }
+  return {
+    ...mode,
+    thresholds: {
+      warn: config.warnThreshold ?? mode.thresholds.warn,
+      soft: config.softThreshold ?? mode.thresholds.soft,
+      hard: config.hardThreshold ?? mode.thresholds.hard
+    },
+    preserveK: config.preserveK ?? mode.preserveK,
+    eliseThreshold: config.eliseThreshold ?? mode.eliseThreshold
+  };
+}
+function formatContextWindowModeList(activeId) {
+  return CONTEXT_WINDOW_MODES.map((m) => {
+    const marker = m.id === activeId ? "*" : " ";
+    return `${marker} ${m.id.padEnd(9)} ${m.name} - ${m.description}`;
+  }).join("\n");
+}
+
 // src/coordination/in-memory-transport.ts
 var InMemoryBridgeTransport = class {
   subs = /* @__PURE__ */ new Map();
@@ -2063,6 +2259,7 @@ var InMemoryAgentBridge = class {
     this.stopped = true;
     for (const [, p] of this.pendingRequests) {
       clearTimeout(p.timer);
+      p.reject(new Error("Bridge stopped"));
     }
     this.pendingRequests.clear();
     this.inflightGuards.clear();
@@ -3493,11 +3690,17 @@ var DefaultSessionStore = class {
     if (openToolUses.size > 0) {
       this.events?.emit("session.damaged", {
         sessionId,
-        detail: `${openToolUses.size} tool_use blocks without matching results \u2014 replay truncated`
+        detail: `${openToolUses.size} tool_use blocks without matching results - replay repaired`
+      });
+    }
+    const repaired = repairToolUseAdjacency(messages);
+    if (repaired.report.changed) {
+      this.events?.emit("session.damaged", {
+        sessionId,
+        detail: `Repaired replay adjacency: removed ${repaired.report.removedToolUses.length} tool_use, ${repaired.report.removedToolResults.length} tool_result, ${repaired.report.removedMessages} empty messages`
       });
-      return { messages, usage };
     }
-    return { messages, usage };
+    return { messages: repaired.messages, usage };
   }
 };
 var FileSessionWriter = class {
@@ -3523,6 +3726,7 @@ var FileSessionWriter = class {
   startedAt;
   meta;
   closed = false;
+  closing = false;
   manifestFile;
   summary;
   tokenIn = 0;
@@ -3538,9 +3742,7 @@ var FileSessionWriter = class {
   resumed;
   appendFailCount = 0;
   lastAppendWarnAt = 0;
-  async writeSessionStart() {
-    if (this.initDone || this.closed) return;
-    this.initDone = true;
+  async writeSessionStartLazy() {
     const record = `${JSON.stringify({
       type: this.resumed ? "session_resumed" : "session_start",
       ts: this.startedAt,
@@ -3559,7 +3761,8 @@ var FileSessionWriter = class {
   async append(event) {
     if (this.closed) return;
     if (!this.initDone) {
-      await this.writeSessionStart();
+      this.initDone = true;
+      await this.writeSessionStartLazy();
     }
     this.observeForSummary(event);
     try {
@@ -3600,7 +3803,8 @@ var FileSessionWriter = class {
     }
   }
   async close() {
-    if (this.closed) return;
+    if (this.closing) return;
+    this.closing = true;
     this.closed = true;
     if (this.manifestFile) {
       try {
@@ -4002,9 +4206,52 @@ function deepFreeze(obj) {
   }
   return Object.freeze(obj);
 }
+
+// src/security/config-secrets.ts
+function decryptConfigSecrets2(cfg, vault) {
+  return walk3(cfg, vault, (v, key) => {
+    try {
+      return vault.decrypt(v);
+    } catch (err) {
+      console.warn(
+        `[secret-vault] Failed to decrypt "${key}":`,
+        err instanceof Error ? err.message : err
+      );
+      return "";
+    }
+  });
+}
+function walk3(node, vault, transform) {
+  if (node === null || node === void 0) return node;
+  if (typeof node !== "object") return node;
+  if (Array.isArray(node)) {
+    return node.map((item) => walk3(item, vault, transform));
+  }
+  const out = {};
+  for (const [k, v] of Object.entries(node)) {
+    if (typeof v === "string" && isSecretField2(k)) {
+      out[k] = transform(v, k);
+    } else if (typeof v === "object" && v !== null) {
+      out[k] = walk3(v, vault, transform);
+    } else {
+      out[k] = v;
+    }
+  }
+  return out;
+}
+var SECRET_KEY_PATTERN2 = /(?:apikey|api_key|authtoken|auth_token|bearer|secret|password|passwd|pwd|refreshtoken|refresh_token|sessionkey|session_key|access[_-]?token|private[_-]?key)/i;
+var NON_SECRET_OVERRIDES2 = /* @__PURE__ */ new Set(["publickey", "public_key"]);
+function isSecretField2(name) {
+  const lc = name.toLowerCase();
+  if (NON_SECRET_OVERRIDES2.has(lc)) return false;
+  return SECRET_KEY_PATTERN2.test(lc);
+}
+
+// src/storage/config-loader.ts
 var BEHAVIOR_DEFAULTS = {
   version: 1,
   context: {
+    mode: DEFAULT_CONTEXT_WINDOW_MODE_ID,
     warnThreshold: 0.6,
     softThreshold: 0.75,
     hardThreshold: 0.9,
@@ -4119,7 +4366,7 @@ var DefaultConfigLoader = class {
       cfg = deepMerge2(cfg, opts.cliFlags);
     }
     if (this.vault) {
-      cfg = decryptConfigSecrets(cfg, this.vault);
+      cfg = decryptConfigSecrets2(cfg, this.vault);
     }
     if (cfg.providers) {
       for (const pcfg of Object.values(cfg.providers)) {
@@ -4179,6 +4426,10 @@ var DefaultConfigLoader = class {
     if (c.warnThreshold >= c.softThreshold || c.softThreshold >= c.hardThreshold) {
       throw new Error("Config: context thresholds must satisfy warn < soft < hard");
     }
+    if (c.mode !== void 0 && !isContextWindowModeId(c.mode)) {
+      const known = listContextWindowModes().map((m) => m.id).join(", ");
+      throw new Error(`Config: context.mode must be one of: ${known}`);
+    }
   }
   validateIdentity(cfg) {
     if (!cfg.provider) {
@@ -4499,24 +4750,35 @@ async function saveTodosCheckpoint(filePath, sessionId, todos) {
 function attachTodosCheckpoint(state, filePath, sessionId) {
   let timer = null;
   let pending = null;
+  let writeChain = Promise.resolve();
+  const enqueueWrite = (todos) => {
+    writeChain = writeChain.then(() => saveTodosCheckpoint(filePath, sessionId, todos));
+    return writeChain;
+  };
   const flush = () => {
     timer = null;
     if (pending) {
-      void saveTodosCheckpoint(filePath, sessionId, pending);
+      const todos = pending;
       pending = null;
+      return enqueueWrite(todos);
     }
+    return writeChain;
   };
   const unsubscribe = state.onChange((change) => {
     if (change.kind !== "todos_replaced") return;
     pending = change.todos;
     if (timer) clearTimeout(timer);
-    timer = setTimeout(flush, 150);
+    timer = setTimeout(() => {
+      void flush();
+    }, 150);
   });
-  return () => {
+  return async () => {
     unsubscribe();
     if (timer) {
       clearTimeout(timer);
-      flush();
+      await flush();
+    } else {
+      await writeChain;
     }
   };
 }
@@ -5310,8 +5572,19 @@ var IntelligentCompactor = class {
       const saved2 = this.lightweightCompact(ctx);
       if (saved2 > 0) reductions.push({ phase: "elision", saved: saved2 });
     }
+    const repaired = repairToolUseAdjacency(ctx.messages);
+    if (repaired.report.changed) ctx.state.replaceMessages(repaired.messages);
     const afterTokens = this.estimateTokens(ctx.messages);
-    return { before: beforeTokens, after: afterTokens, reductions };
+    return {
+      before: beforeTokens,
+      after: afterTokens,
+      reductions,
+      repaired: repaired.report.changed ? {
+        removedToolUses: repaired.report.removedToolUses,
+        removedToolResults: repaired.report.removedToolResults,
+        removedMessages: repaired.report.removedMessages
+      } : void 0
+    };
   }
   async summarizeAncientTurns(ctx) {
     const messages = ctx.messages;
@@ -5351,8 +5624,8 @@ var IntelligentCompactor = class {
       const m = messages[i];
       if (!m) continue;
       if (m.role === "assistant") {
-        const hasToolUse = Array.isArray(m.content) ? m.content.some((b) => b.type === "tool_use") : false;
-        if (!hasToolUse) {
+        const hasToolUse2 = Array.isArray(m.content) ? m.content.some((b) => b.type === "tool_use") : false;
+        if (!hasToolUse2) {
           return i + 1;
         }
       } else if (m.role !== "user") ; else {
@@ -5658,8 +5931,9 @@ var SelectiveCompactor = class {
     if (!shouldCompact) {
       const saved = this.eliseOldToolResults(ctx);
       if (saved > 0) reductions.push({ phase: "elision", saved });
+      const repair2 = this.repairProtocolAdjacency(ctx);
       const afterTokens2 = this.estimateTokens(ctx.messages);
-      return { before: beforeTokens, after: afterTokens2, reductions };
+      return { before: beforeTokens, after: afterTokens2, reductions, repaired: repair2 };
     }
     const savedElision = this.eliseOldToolResults(ctx);
     if (savedElision > 0) reductions.push({ phase: "elision", saved: savedElision });
@@ -5669,8 +5943,18 @@ var SelectiveCompactor = class {
       const savedSelective = await this.runSelector(ctx, targetBudget);
       if (savedSelective > 0) reductions.push({ phase: "selective", saved: savedSelective });
     }
+    const repair = this.repairProtocolAdjacency(ctx);
     const afterTokens = this.estimateTokens(ctx.messages);
-    return { before: beforeTokens, after: afterTokens, reductions };
+    return { before: beforeTokens, after: afterTokens, reductions, repaired: repair };
+  }
+  repairProtocolAdjacency(ctx) {
+    const repaired = repairToolUseAdjacency(ctx.messages);
+    if (repaired.report.changed) ctx.state.replaceMessages(repaired.messages);
+    return repaired.report.changed ? {
+      removedToolUses: repaired.report.removedToolUses,
+      removedToolResults: repaired.report.removedToolResults,
+      removedMessages: repaired.report.removedMessages
+    } : void 0;
   }
   /**
    * Run the LLM selector to decide what to keep vs collapse.
@@ -5858,6 +6142,7 @@ var AutoCompactionMiddleware = class {
   aggressiveOn;
   events;
   failureMode;
+  policyProvider;
   /**
    * @param compactor        Compactor to use for compaction.
    * @param maxContext       Provider's max context window in tokens.
@@ -5880,17 +6165,25 @@ var AutoCompactionMiddleware = class {
     this.aggressiveOn = opts.aggressiveOn ?? "soft";
     this.events = opts.events;
     this.failureMode = opts.failureMode ?? "throw_on_hard";
+    this.policyProvider = opts.policyProvider;
   }
   handler() {
     return async (ctx, next) => {
       const tokens = this.estimator(ctx);
       const load = tokens / this.maxContext;
-      if (load >= this.hardThreshold) {
+      const policy = this.policyProvider?.(ctx);
+      const thresholds = policy?.thresholds ?? {
+        warn: this.warnThreshold,
+        soft: this.softThreshold,
+        hard: this.hardThreshold
+      };
+      const aggressiveOn = policy?.aggressiveOn ?? this.aggressiveOn;
+      if (load >= thresholds.hard) {
         await this.compact(ctx, true, { level: "hard", tokens, load });
-      } else if (load >= this.softThreshold) {
-        await this.compact(ctx, this.aggressiveOn !== "hard", { level: "soft", tokens, load });
-      } else if (load >= this.warnThreshold) {
-        await this.compact(ctx, false, { level: "warn", tokens, load });
+      } else if (load >= thresholds.soft) {
+        await this.compact(ctx, aggressiveOn !== "hard", { level: "soft", tokens, load });
+      } else if (load >= thresholds.warn) {
+        await this.compact(ctx, aggressiveOn === "warn", { level: "warn", tokens, load });
       }
       return next(ctx);
     };
@@ -6858,6 +7151,179 @@ function providerErrorToSubagentError(err, message, cause) {
   }
   return { kind: "unknown", message, retryable: err.retryable, cause };
 }
+function makeSpawnTool(director, roster) {
+  const inputSchema = {
+    type: "object",
+    properties: {
+      role: { type: "string", description: "Roster role id (preferred). When set, the spawn uses the matching config from the roster and ignores other fields." },
+      name: { type: "string", description: "Display name for the subagent. Required when not using roster." },
+      provider: { type: "string", description: 'Provider id (e.g. "anthropic", "openai"). Defaults to the leader provider when omitted.' },
+      model: { type: "string", description: "Model id within the provider. Defaults to the leader model when omitted." },
+      systemPromptOverride: { type: "string", description: "Extra prompt text appended after the role-base prompt." },
+      maxIterations: { type: "number" },
+      maxToolCalls: { type: "number" },
+      maxCostUsd: { type: "number" }
+    },
+    required: []
+  };
+  return {
+    name: "spawn_subagent",
+    description: "Create a new subagent under this director. Returns the subagent id.",
+    usageHint: "Either pass `role` (matches the roster) OR pass `name` + optional `provider`/`model`. Returns `{ subagentId }`.",
+    permission: "auto",
+    mutating: false,
+    inputSchema,
+    async execute(input) {
+      const i = input ?? {};
+      const role = typeof i.role === "string" ? i.role : void 0;
+      const base = role && roster ? roster[role] : void 0;
+      if (role && !base) {
+        return { error: `unknown role "${role}". roster has: ${roster ? Object.keys(roster).join(", ") : "(empty)"}` };
+      }
+      const cfg = { ...base ?? { name: i.name ?? "subagent" } };
+      if (typeof i.name === "string") cfg.name = i.name;
+      if (typeof i.provider === "string") cfg.provider = i.provider;
+      if (typeof i.model === "string") cfg.model = i.model;
+      if (typeof i.systemPromptOverride === "string") cfg.systemPromptOverride = i.systemPromptOverride;
+      if (typeof i.maxIterations === "number") cfg.maxIterations = i.maxIterations;
+      if (typeof i.maxToolCalls === "number") cfg.maxToolCalls = i.maxToolCalls;
+      if (typeof i.maxCostUsd === "number") cfg.maxCostUsd = i.maxCostUsd;
+      try {
+        const subagentId = await director.spawn(cfg);
+        return { subagentId, provider: cfg.provider, model: cfg.model, name: cfg.name };
+      } catch (err) {
+        if (err instanceof DirectorBudgetError) {
+          return { error: err.message, kind: err.kind, limit: err.limit, observed: err.observed };
+        }
+        return { error: err instanceof Error ? err.message : String(err) };
+      }
+    }
+  };
+}
+function makeAssignTool(director) {
+  const inputSchema = {
+    type: "object",
+    properties: {
+      subagentId: { type: "string", description: "Target subagent id. Required." },
+      description: { type: "string", description: "The task in natural language \u2014 what you want this subagent to do." },
+      maxToolCalls: { type: "number", description: "Optional per-task tool-call budget override." },
+      timeoutMs: { type: "number", description: "Optional per-task timeout in ms." }
+    },
+    required: ["subagentId", "description"]
+  };
+  return {
+    name: "assign_task",
+    description: "Hand a task to a previously spawned subagent. Returns the task id.",
+    permission: "auto",
+    mutating: false,
+    inputSchema,
+    async execute(input) {
+      const i = input;
+      const task = { id: randomUUID(), description: i.description, subagentId: i.subagentId, maxToolCalls: i.maxToolCalls, timeoutMs: i.timeoutMs };
+      const taskId = await director.assign(task);
+      return { taskId, subagentId: i.subagentId };
+    }
+  };
+}
+function makeAwaitTasksTool(director) {
+  return {
+    name: "await_tasks",
+    description: "Block until every named task completes. Returns the array of TaskResult.",
+    permission: "auto",
+    mutating: false,
+    inputSchema: { type: "object", properties: { taskIds: { type: "array", items: { type: "string" }, description: "One or more task ids returned by `assign_task`." } }, required: ["taskIds"] },
+    async execute(input) {
+      const i = input;
+      const results = await director.awaitTasks(i.taskIds);
+      return { results };
+    }
+  };
+}
+function makeAskTool(director) {
+  return {
+    name: "ask_subagent",
+    description: "Synchronously ask a subagent a question. Blocks until the subagent replies via the bridge.",
+    permission: "auto",
+    mutating: false,
+    inputSchema: {
+      type: "object",
+      properties: {
+        subagentId: { type: "string", description: "Subagent to ask. Must be a previously spawned id." },
+        question: { type: "string", description: "The question or instruction." },
+        timeoutMs: { type: "number", description: "Optional timeout in ms (default 30s)." }
+      },
+      required: ["subagentId", "question"]
+    },
+    async execute(input) {
+      const i = input;
+      try {
+        const answer = await director.ask(i.subagentId, { question: i.question }, i.timeoutMs);
+        return { ok: true, answer };
+      } catch (err) {
+        return { ok: false, error: err instanceof Error ? err.message : String(err) };
+      }
+    }
+  };
+}
+function makeRollUpTool(director) {
+  return {
+    name: "roll_up",
+    description: "Aggregate completed task results into a single formatted summary.",
+    permission: "auto",
+    mutating: false,
+    inputSchema: {
+      type: "object",
+      properties: {
+        taskIds: { type: "array", items: { type: "string" }, description: "Completed task ids to aggregate." },
+        style: { type: "string", enum: ["markdown", "json"], description: "Output flavor \u2014 markdown (default) or json." }
+      },
+      required: ["taskIds"]
+    },
+    async execute(input) {
+      const i = input;
+      const summary = director.rollUp(i.taskIds, i.style ?? "markdown");
+      return { summary, count: i.taskIds.length };
+    }
+  };
+}
+function makeTerminateTool(director) {
+  return {
+    name: "terminate_subagent",
+    description: "Forcibly abort a subagent.",
+    permission: "auto",
+    mutating: true,
+    inputSchema: { type: "object", properties: { subagentId: { type: "string", description: "Subagent to abort." } }, required: ["subagentId"] },
+    async execute(input) {
+      const i = input;
+      await director.terminate(i.subagentId);
+      return { ok: true };
+    }
+  };
+}
+function makeFleetStatusTool(director) {
+  return {
+    name: "fleet_status",
+    description: "Snapshot of the fleet \u2014 every subagent's current status, pending vs. completed task counts.",
+    permission: "auto",
+    mutating: false,
+    inputSchema: { type: "object", properties: {}, required: [] },
+    async execute() {
+      return director.status();
+    }
+  };
+}
+function makeFleetUsageTool(director) {
+  return {
+    name: "fleet_usage",
+    description: "Token + cost breakdown across the fleet, per-subagent and totals.",
+    permission: "auto",
+    mutating: false,
+    inputSchema: { type: "object", properties: {}, required: [] },
+    async execute() {
+      return director.snapshot();
+    }
+  };
+}
 
 // src/coordination/director.ts
 var DirectorBudgetError = class extends Error {
@@ -7416,242 +7882,6 @@ var Director = class {
     return t2;
   }
 };
-function makeSpawnTool(director, roster) {
-  const inputSchema = {
-    type: "object",
-    properties: {
-      role: {
-        type: "string",
-        description: "Roster role id (preferred). When set, the spawn uses the matching config from the roster and ignores other fields."
-      },
-      name: {
-        type: "string",
-        description: "Display name for the subagent. Required when not using roster."
-      },
-      provider: {
-        type: "string",
-        description: 'Provider id (e.g. "anthropic", "openai"). Defaults to the leader provider when omitted.'
-      },
-      model: {
-        type: "string",
-        description: "Model id within the provider. Defaults to the leader model when omitted."
-      },
-      systemPromptOverride: {
-        type: "string",
-        description: "Extra prompt text appended after the role-base prompt."
-      },
-      maxIterations: { type: "number" },
-      maxToolCalls: { type: "number" },
-      maxCostUsd: { type: "number" }
-    },
-    required: []
-  };
-  return {
-    name: "spawn_subagent",
-    description: "Create a new subagent under this director. Returns the subagent id. Use this when you need a worker with a specific provider, model, or role to handle a piece of the plan.",
-    usageHint: "Either pass `role` (matches the roster) OR pass `name` + optional `provider`/`model`. Returns `{ subagentId }`.",
-    permission: "auto",
-    mutating: false,
-    inputSchema,
-    async execute(input) {
-      const i = input ?? {};
-      const role = typeof i.role === "string" ? i.role : void 0;
-      const base = role && roster ? roster[role] : void 0;
-      if (role && !base) {
-        return {
-          error: `unknown role "${role}". roster has: ${roster ? Object.keys(roster).join(", ") : "(empty)"}`
-        };
-      }
-      const cfg = {
-        ...base ?? { name: i.name ?? "subagent" }
-      };
-      if (typeof i.name === "string") cfg.name = i.name;
-      if (typeof i.provider === "string") cfg.provider = i.provider;
-      if (typeof i.model === "string") cfg.model = i.model;
-      if (typeof i.systemPromptOverride === "string")
-        cfg.systemPromptOverride = i.systemPromptOverride;
-      if (typeof i.maxIterations === "number") cfg.maxIterations = i.maxIterations;
-      if (typeof i.maxToolCalls === "number") cfg.maxToolCalls = i.maxToolCalls;
-      if (typeof i.maxCostUsd === "number") cfg.maxCostUsd = i.maxCostUsd;
-      try {
-        const subagentId = await director.spawn(cfg);
-        return { subagentId, provider: cfg.provider, model: cfg.model, name: cfg.name };
-      } catch (err) {
-        if (err instanceof DirectorBudgetError) {
-          return { error: err.message, kind: err.kind, limit: err.limit, observed: err.observed };
-        }
-        return { error: err instanceof Error ? err.message : String(err) };
-      }
-    }
-  };
-}
-function makeAssignTool(director) {
-  const inputSchema = {
-    type: "object",
-    properties: {
-      subagentId: { type: "string", description: "Target subagent id. Required." },
-      description: {
-        type: "string",
-        description: "The task in natural language \u2014 what you want this subagent to do."
-      },
-      maxToolCalls: { type: "number", description: "Optional per-task tool-call budget override." },
-      timeoutMs: { type: "number", description: "Optional per-task timeout in ms." }
-    },
-    required: ["subagentId", "description"]
-  };
-  return {
-    name: "assign_task",
-    description: "Hand a task to a previously spawned subagent. Returns the task id \u2014 pass it to `await_tasks` to block on completion.",
-    permission: "auto",
-    mutating: false,
-    inputSchema,
-    async execute(input) {
-      const i = input;
-      const task = {
-        id: randomUUID(),
-        description: i.description,
-        subagentId: i.subagentId,
-        maxToolCalls: i.maxToolCalls,
-        timeoutMs: i.timeoutMs
-      };
-      const taskId = await director.assign(task);
-      return { taskId, subagentId: i.subagentId };
-    }
-  };
-}
-function makeAwaitTasksTool(director) {
-  const inputSchema = {
-    type: "object",
-    properties: {
-      taskIds: {
-        type: "array",
-        items: { type: "string" },
-        description: "One or more task ids returned by `assign_task`. The call blocks until every id resolves."
-      }
-    },
-    required: ["taskIds"]
-  };
-  return {
-    name: "await_tasks",
-    description: "Block until every named task completes. Returns the array of TaskResult \u2014 use this to gather subagent output before deciding the next step.",
-    permission: "auto",
-    mutating: false,
-    inputSchema,
-    async execute(input) {
-      const i = input;
-      const results = await director.awaitTasks(i.taskIds);
-      return { results };
-    }
-  };
-}
-function makeAskTool(director) {
-  const inputSchema = {
-    type: "object",
-    properties: {
-      subagentId: {
-        type: "string",
-        description: "Subagent to ask. Must be a previously spawned id."
-      },
-      question: {
-        type: "string",
-        description: "The question or instruction. Sent as the bridge message payload."
-      },
-      timeoutMs: { type: "number", description: "Optional timeout in ms (default 30s)." }
-    },
-    required: ["subagentId", "question"]
-  };
-  return {
-    name: "ask_subagent",
-    description: "Synchronously ask a subagent a question. Blocks until the subagent replies via the bridge (or the timeout fires). Use this when you need a one-shot answer without spawning a fresh task.",
-    permission: "auto",
-    mutating: false,
-    inputSchema,
-    async execute(input) {
-      const i = input;
-      try {
-        const answer = await director.ask(i.subagentId, { question: i.question }, i.timeoutMs);
-        return { ok: true, answer };
-      } catch (err) {
-        return { ok: false, error: err instanceof Error ? err.message : String(err) };
-      }
-    }
-  };
-}
-function makeRollUpTool(director) {
-  const inputSchema = {
-    type: "object",
-    properties: {
-      taskIds: {
-        type: "array",
-        items: { type: "string" },
-        description: "Completed task ids to aggregate. Pass the ids returned by previous `assign_task` calls."
-      },
-      style: {
-        type: "string",
-        enum: ["markdown", "json"],
-        description: "Output flavor \u2014 markdown (default) for in-prompt summarization, json for structured downstream processing."
-      }
-    },
-    required: ["taskIds"]
-  };
-  return {
-    name: "roll_up",
-    description: "Aggregate completed task results into a single formatted summary. Use this after `await_tasks` to fold subagent outputs back into the director's context before deciding the next step.",
-    permission: "auto",
-    mutating: false,
-    inputSchema,
-    async execute(input) {
-      const i = input;
-      const summary = director.rollUp(i.taskIds, i.style ?? "markdown");
-      return { summary, count: i.taskIds.length };
-    }
-  };
-}
-function makeTerminateTool(director) {
-  const inputSchema = {
-    type: "object",
-    properties: {
-      subagentId: { type: "string", description: "Subagent to abort." }
-    },
-    required: ["subagentId"]
-  };
-  return {
-    name: "terminate_subagent",
-    description: 'Forcibly abort a subagent. Use sparingly \u2014 prefer waiting on the natural budget to expire. The current task (if any) ends with status "stopped".',
-    permission: "auto",
-    mutating: true,
-    inputSchema,
-    async execute(input) {
-      const i = input;
-      await director.terminate(i.subagentId);
-      return { ok: true };
-    }
-  };
-}
-function makeFleetStatusTool(director) {
-  return {
-    name: "fleet_status",
-    description: "Snapshot of the fleet \u2014 every subagent's current status, pending vs. completed task counts, and the running total iteration count. Cheap; call freely.",
-    permission: "auto",
-    mutating: false,
-    inputSchema: { type: "object", properties: {}, required: [] },
-    async execute() {
-      return director.status();
-    }
-  };
-}
-function makeFleetUsageTool(director) {
-  return {
-    name: "fleet_usage",
-    description: "Token + cost breakdown across the fleet, per-subagent and totals. Use this to reason about which workers to assign costly tasks to or when to wrap up to stay within budget.",
-    permission: "auto",
-    mutating: false,
-    inputSchema: { type: "object", properties: {}, required: [] },
-    async execute() {
-      return director.snapshot();
-    }
-  };
-}
 function createDelegateTool(opts) {
   const defaultTimeoutMs = opts.defaultTimeoutMs ?? 4 * 60 * 60 * 1e3;
   const rosterIds = opts.roster ? Object.keys(opts.roster) : [];
@@ -9837,13 +10067,13 @@ function roughEstimate(messages) {
 function createContextManagerTool(opts = {}) {
   return {
     name: CONTEXT_MANAGER_TOOL_NAME,
-    description: 'Inspect or reorganize the conversation context window. Use "check" to see token budget. Use "summary" to collapse a message range into a concise note (provide "text" for custom summary). Use "prune" to remove specific messages by index. Use "add_note" to inject a summary note. Use "compact" to run aggressive compaction.',
+    description: 'Inspect or reorganize the conversation context window. Use "check" to see token budget. Use "summary" to collapse a message range into a concise note (provide "text" for custom summary). Use "prune" to remove specific messages by index. Use "add_note" to inject a summary note. Use "compact" to run aggressive compaction. Use "repair" to remove orphan tool_use/tool_result blocks after manual context surgery.',
     inputSchema: {
       type: "object",
       properties: {
         action: {
           type: "string",
-          enum: ["check", "summary", "prune", "add_note", "compact"],
+          enum: ["check", "summary", "prune", "add_note", "compact", "repair"],
           description: "The context operation to perform."
         },
         from: {
@@ -9871,12 +10101,15 @@ function createContextManagerTool(opts = {}) {
       const messages = ctx.messages;
       const beforeTokens = roughEstimate(messages);
       const applyMessages = (next) => {
+        const repaired = repairToolUseAdjacency(next);
+        const finalMessages = repaired.messages;
         if (ctx.state) {
-          ctx.state.replaceMessages(next);
+          ctx.state.replaceMessages(finalMessages);
         } else {
           messages.length = 0;
-          messages.splice(0, 0, ...next);
+          messages.splice(0, 0, ...finalMessages);
         }
+        return repaired.report;
       };
       switch (input.action) {
         case "check": {
@@ -9893,6 +10126,22 @@ function createContextManagerTool(opts = {}) {
             })
           };
         }
+        case "repair": {
+          const repair = applyMessages([...messages]);
+          const afterTokens = roughEstimate(ctx.messages);
+          return {
+            action: "repair",
+            beforeTokens,
+            afterTokens,
+            messageCount: ctx.messages.length,
+            repaired: repair.changed ? {
+              removedToolUses: repair.removedToolUses,
+              removedToolResults: repair.removedToolResults,
+              removedMessages: repair.removedMessages
+            } : void 0,
+            notes: repair.changed ? "Context tool-call adjacency repaired." : "Context tool-call adjacency already valid."
+          };
+        }
         case "compact": {
           if (!opts.compactor) {
             return {
@@ -9903,11 +10152,19 @@ function createContextManagerTool(opts = {}) {
             };
           }
           const report = await opts.compactor.compact(ctx);
+          const repair = applyMessages([...ctx.messages]);
+          const afterTokens = repair.changed ? roughEstimate(ctx.messages) : report.after;
+          const repaired = report.repaired ?? (repair.changed ? repair : void 0);
           return {
             action: "compact",
             beforeTokens,
-            afterTokens: report.after,
-            messageCount: messages.length
+            afterTokens,
+            messageCount: ctx.messages.length,
+            repaired: repaired ? {
+              removedToolUses: repaired.removedToolUses,
+              removedToolResults: repaired.removedToolResults,
+              removedMessages: repaired.removedMessages
+            } : void 0
           };
         }
         case "prune": {
@@ -9923,14 +10180,19 @@ function createContextManagerTool(opts = {}) {
           }
           const copy = [...messages];
           const removed = copy.splice(from, to - from + 1);
-          applyMessages(copy);
-          const afterTokens = roughEstimate(copy);
+          const repair = applyMessages(copy);
+          const afterTokens = roughEstimate(ctx.messages);
           return {
             action: "prune",
             beforeTokens,
             afterTokens,
-            messageCount: copy.length,
-            removedCount: removed.length
+            messageCount: ctx.messages.length,
+            removedCount: removed.length,
+            repaired: repair.changed ? {
+              removedToolUses: repair.removedToolUses,
+              removedToolResults: repair.removedToolResults,
+              removedMessages: repair.removedMessages
+            } : void 0
           };
         }
         case "add_note": {
@@ -9942,14 +10204,19 @@ function createContextManagerTool(opts = {}) {
           };
           const copy = [...messages];
           copy.splice(afterIdx, 0, noteMsg);
-          applyMessages(copy);
-          const afterTokens = roughEstimate(copy);
+          const repair = applyMessages(copy);
+          const afterTokens = roughEstimate(ctx.messages);
           return {
             action: "add_note",
             beforeTokens,
             afterTokens,
-            messageCount: copy.length,
-            summary: noteText
+            messageCount: ctx.messages.length,
+            summary: noteText,
+            repaired: repair.changed ? {
+              removedToolUses: repair.removedToolUses,
+              removedToolResults: repair.removedToolResults,
+              removedMessages: repair.removedMessages
+            } : void 0
           };
         }
         case "summary": {
@@ -9970,14 +10237,19 @@ function createContextManagerTool(opts = {}) {
           };
           const copy = [...messages];
           copy.splice(from, to - from + 1, summaryMsg);
-          applyMessages(copy);
-          const afterTokens = roughEstimate(copy);
+          const repair = applyMessages(copy);
+          const afterTokens = roughEstimate(ctx.messages);
           return {
             action: "summary",
             beforeTokens,
             afterTokens,
-            messageCount: copy.length,
-            summary: summaryText
+            messageCount: ctx.messages.length,
+            summary: summaryText,
+            repaired: repair.changed ? {
+              removedToolUses: repair.removedToolUses,
+              removedToolResults: repair.removedToolResults,
+              removedMessages: repair.removedMessages
+            } : void 0
           };
         }
         default:
@@ -10081,6 +10353,41 @@ var sentinelServer = () => ({
   permission: "deny"
   // security tool — require explicit confirmation
 });
+var zaiVisionServer = () => ({
+  name: "zai-vision",
+  description: "Z.AI Vision MCP \u2014 image analysis and screenshot understanding",
+  transport: "stdio",
+  command: "npx",
+  args: ["-y", "@z_ai/mcp-server@latest"],
+  env: {
+    Z_AI_API_KEY: process.env.Z_AI_API_KEY ?? "",
+    Z_AI_MODE: process.env.Z_AI_MODE ?? "ZAI"
+  },
+  allowedTools: [
+    "image_analysis",
+    "extract_text_from_screenshot",
+    "diagnose_error_screenshot",
+    "understand_technical_diagram",
+    "analyze_data_visualization",
+    "ui_diff_check"
+  ],
+  permission: "auto"
+});
+var miniMaxVisionServer = () => ({
+  name: "minimax-vision",
+  description: "MiniMax MCP \u2014 image understanding via understand_image",
+  transport: "stdio",
+  command: "uvx",
+  args: ["minimax-coding-plan-mcp", "-y"],
+  env: {
+    MINIMAX_API_KEY: process.env.MINIMAX_API_KEY ?? "",
+    MINIMAX_MCP_BASE_PATH: process.env.MINIMAX_MCP_BASE_PATH ?? "./.wrongstack/minimax-output",
+    MINIMAX_API_HOST: process.env.MINIMAX_API_HOST ?? "https://api.minimax.io",
+    MINIMAX_API_RESOURCE_MODE: process.env.MINIMAX_API_RESOURCE_MODE ?? "url"
+  },
+  allowedTools: ["understand_image"],
+  permission: "auto"
+});
 var allServers = () => ({
   filesystem: { ...filesystemServer(), enabled: false },
   github: { ...githubServer(), enabled: false },
@@ -10091,7 +10398,9 @@ var allServers = () => ({
   slack: { ...slackServer(), enabled: false },
   aws: { ...awsServer(), enabled: false },
   "google-maps": { ...googleMapsServer(), enabled: false },
-  sentinel: { ...sentinelServer(), enabled: false }
+  sentinel: { ...sentinelServer(), enabled: false },
+  "zai-vision": { ...zaiVisionServer(), enabled: false },
+  "minimax-vision": { ...miniMaxVisionServer(), enabled: false }
 });
 
 // src/extension/registry.ts
@@ -10194,7 +10503,8 @@ var ExtensionRegistry = class {
   }
   // ── Hook runners ─────────────────────────────────────────────────
   async runBeforeRun(...args) {
-    for (const ext of this.extensions) {
+    const snapshot = [...this.extensions];
+    for (const ext of snapshot) {
       if (!ext.beforeRun) continue;
       try {
         await ext.beforeRun(...args);
@@ -10204,7 +10514,8 @@ var ExtensionRegistry = class {
     }
   }
   async runAfterRun(...args) {
-    for (const ext of this.extensions) {
+    const snapshot = [...this.extensions];
+    for (const ext of snapshot) {
       if (!ext.afterRun) continue;
       try {
         await ext.afterRun(...args);
@@ -10214,7 +10525,8 @@ var ExtensionRegistry = class {
     }
   }
   async runBeforeIteration(...args) {
-    for (const ext of this.extensions) {
+    const snapshot = [...this.extensions];
+    for (const ext of snapshot) {
       if (!ext.beforeIteration) continue;
       try {
         await ext.beforeIteration(...args);
@@ -10224,7 +10536,8 @@ var ExtensionRegistry = class {
     }
   }
   async runAfterIteration(...args) {
-    for (const ext of this.extensions) {
+    const snapshot = [...this.extensions];
+    for (const ext of snapshot) {
       if (!ext.afterIteration) continue;
       try {
         await ext.afterIteration(...args);
@@ -10238,7 +10551,8 @@ var ExtensionRegistry = class {
    * result wins; subsequent hooks are skipped.
    */
   async runOnError(...args) {
-    for (const ext of this.extensions) {
+    const snapshot = [...this.extensions];
+    for (const ext of snapshot) {
       if (!ext.onError) continue;
       try {
         const result = await ext.onError(...args);
@@ -10273,7 +10587,8 @@ var ExtensionRegistry = class {
   }
   async runBeforeToolExecution(...args) {
     let toolUses = args[1];
-    for (const ext of this.extensions) {
+    const snapshot = [...this.extensions];
+    for (const ext of snapshot) {
       if (!ext.beforeToolExecution) continue;
       try {
         toolUses = await ext.beforeToolExecution(args[0], toolUses);
@@ -10284,7 +10599,8 @@ var ExtensionRegistry = class {
     return toolUses;
   }
   async runAfterToolExecution(...args) {
-    for (const ext of this.extensions) {
+    const snapshot = [...this.extensions];
+    for (const ext of snapshot) {
       if (!ext.afterToolExecution) continue;
       try {
         await ext.afterToolExecution(...args);
@@ -10609,6 +10925,17 @@ var Agent = class {
    * Build request and run through request pipeline.
    */
   async buildAndRunRequestPipeline(opts) {
+    const repaired = repairToolUseAdjacency(this.ctx.messages);
+    if (repaired.report.changed) {
+      this.ctx.state.replaceMessages(repaired.messages);
+      this.events.emit("context.repaired", {
+        ctx: this.ctx,
+        ...repaired.report
+      });
+      this.logger.warn(
+        `Repaired context tool adjacency: removed ${repaired.report.removedToolUses.length} tool_use block(s), ${repaired.report.removedToolResults.length} tool_result block(s), ${repaired.report.removedMessages} empty message(s)`
+      );
+    }
     const baseReq = {
       model: opts.model ?? this.ctx.model,
       system: this.ctx.systemPrompt,
@@ -10665,13 +10992,13 @@ var Agent = class {
    * single tool.
    */
   async executeTools(toolUses) {
-    toolUses = await this.extensions.runBeforeToolExecution(this.ctx, toolUses);
+    const selectedToolUses = await this.extensions.runBeforeToolExecution(this.ctx, toolUses);
     const { outputs } = await this.toolExecutor.executeBatch(
-      toolUses,
+      selectedToolUses,
       this.ctx,
       this.executionStrategy
     );
-    const useById = new Map(toolUses.map((u) => [u.id, u]));
+    const useById = new Map(selectedToolUses.map((u) => [u.id, u]));
     for (const { result, tool, durationMs } of outputs) {
       if (result.type === "tool_confirm_pending") {
         const decision = await this.waitForConfirm({
@@ -11870,7 +12197,7 @@ var DefaultPluginAPI = class {
     } : noopSlashCommands;
   }
   onEvent(event, handler) {
-    const off = this.events.once(event, handler);
+    const off = this.events.on(event, handler);
     this.pluginCleanupFns.push(off);
     return off;
   }
@@ -11947,6 +12274,7 @@ function scopedMetrics(sink, pluginName) {
 }
 
 // src/plugin/loader.ts
+var pluginApiMap = /* @__PURE__ */ new WeakMap();
 var KERNEL_API_VERSION = "0.1.10";
 function parseSemver(v) {
   const parts = v.replace(/^[^0-9]*/, "").split(".").map((s) => Number.parseInt(s, 10) || 0);
@@ -12103,6 +12431,7 @@ async function loadPlugins(plugins, opts) {
       const rawApi = opts.apiFactory(plugin);
       const api = plugin.capabilities ? wrapApiForCapabilityCheck(plugin, rawApi, opts.log, opts.enforceCapabilities) : rawApi;
       await plugin.setup(api);
+      pluginApiMap.set(plugin, api);
       loaded.push(plugin);
       opts.log.info(`Plugin "${plugin.name}" loaded`);
     } catch (err) {
@@ -12117,8 +12446,9 @@ async function unloadPlugins(loadedPlugins, opts) {
   for (const plugin of ordered) {
     if (typeof plugin.teardown !== "function") continue;
     try {
-      const api = opts.apiFactory(plugin);
+      const api = pluginApiMap.get(plugin) ?? opts.apiFactory(plugin);
       await plugin.teardown(api);
+      pluginApiMap.delete(plugin);
       opts.log.info(`Plugin "${plugin.name}" torn down`);
     } catch (err) {
       opts.log.error(`Plugin "${plugin.name}" teardown failed`, err);
@@ -12205,6 +12535,6 @@ function wrapApiForCapabilityCheck(plugin, api, log, enforce = false) {
   });
 }
 
-export { ALL_FLEET_AGENTS, AUDIT_LOG_AGENT, Agent, AgentError, AutoApprovePermissionPolicy, AutoCompactionMiddleware, AutonomousRunner, BUG_HUNTER_AGENT, BudgetExceededError, ConfigError, ConfigMigrationError, Container, Context, ConversationState, DEFAULT_CONFIG_MIGRATIONS, DEFAULT_DIRECTOR_PREAMBLE, DEFAULT_MAX_ITERATIONS, DEFAULT_MODES, DEFAULT_RECOVERY_STRATEGIES, DEFAULT_SPEC_TEMPLATE, DEFAULT_SUBAGENT_BASELINE, DefaultAttachmentStore, DefaultConfigLoader, DefaultConfigStore, DefaultErrorHandler, DefaultHealthRegistry, DefaultLogger, DefaultMemoryStore, DefaultModeStore, DefaultModelsRegistry, DefaultMultiAgentCoordinator, DefaultPathResolver, DefaultPermissionPolicy, DefaultPluginAPI, DefaultProviderRunner, DefaultRetryPolicy, DefaultSecretScrubber, DefaultSecretVault, DefaultSessionReader, DefaultSessionStore, DefaultSkillLoader, DefaultSystemPromptBuilder, DefaultTaskStore, DefaultTokenCounter, Director, DirectorBudgetError, DirectorStateCheckpoint, DoneConditionChecker, EventBus, ExtensionRegistry, FLEET_ROSTER, FleetBus, FleetUsageAggregator, HybridCompactor, InMemoryAgentBridge, InMemoryBridgeTransport, InMemoryMetricsSink, InputBuilder, IntelligentCompactor, KERNEL_API_VERSION, LAYER_1_IDENTITY, LLMSelector, NoopMetricsSink, NoopTracer, OTelTracer, PROMETHEUS_CONTENT_TYPE, Pipeline, PluginError, ProviderError, ProviderRegistry, QueueStore, REFACTOR_PLANNER_AGENT, RecoveryLock, RunController, SECURITY_SCANNER_AGENT, SelectiveCompactor, SessionAnalyzer, SessionError, SlashCommandRegistry, SpecDrivenDev, SpecParser, SubagentBudget, TOKENS, TaskFlow, TaskGenerator, TaskTracker, ToolError, ToolExecutor, ToolRegistry, WrongStackError, addPlanItem, allServers, asBlocks, asText, atomicWrite, attachPlanCheckpoint, attachTodosCheckpoint, awsServer, blockServer, braveSearchServer, buildChildEnv, buildOtlpMetricsRequest, buildOtlpTracesRequest, buildRecoveryStrategies, classifyFamily, clearPlan, color, compileGlob, composeDirectorPrompt, composeSubagentPrompt, computeTaskProgress, context7Server, contextManagerTool, createContextManagerTool, createDefaultPipelines, createDelegateTool, createMessage, createToolOutputSerializer, decryptConfigSecrets, detectNewlineStyle, emptyPlan, encryptConfigSecrets, ensureDir, estimateTextTokens, estimateToolInputTokens, estimateToolResultTokens, everArtServer, extractRunEnv, filesystemServer, findCriticalPath, formatPlan, formatTodosList, githubServer, googleMapsServer, isAgentError, isConfigError, isImageBlock, isPluginError, isSessionError, isTextBlock, isThinkingBlock, isToolError, isToolResultBlock, isToolUseBlock, isWrongStackError, loadDirectorState, loadPlan, loadPlugins, loadProjectModes, loadTodosCheckpoint, loadUserModes, makeAgentSubagentRunner, makeDirectorSessionFactory, matchAny, matchGlob, migratePlaintextSecrets, normalizeToLf, projectHash, removePlanItem, renderPrometheus, resolveWstackPaths, rewriteConfigEncrypted, rosterSummaryFromConfigs, runConfigMigrations, safeParse, safeStringify, sanitizeJsonString, savePlan, saveTodosCheckpoint, sentinelServer, setPlanItemStatus, slackServer, startMetricsServer, startOtlpMetricsExporter, startOtlpTraceExporter, stripAnsi, toStyle, toWrongStackError, topologicalSort, unifiedDiff, unloadPlugins, validateAgainstSchema, wireMetricsToEvents, wrapAsState };
+export { ALL_FLEET_AGENTS, AUDIT_LOG_AGENT, Agent, AgentError, AutoApprovePermissionPolicy, AutoCompactionMiddleware, AutonomousRunner, BUG_HUNTER_AGENT, BudgetExceededError, CONTEXT_WINDOW_MODES, ConfigError, ConfigMigrationError, Container, Context, ConversationState, DEFAULT_CONFIG_MIGRATIONS, DEFAULT_CONTEXT_WINDOW_MODE_ID, DEFAULT_DIRECTOR_PREAMBLE, DEFAULT_MAX_ITERATIONS, DEFAULT_MODES, DEFAULT_RECOVERY_STRATEGIES, DEFAULT_SPEC_TEMPLATE, DEFAULT_SUBAGENT_BASELINE, DefaultAttachmentStore, DefaultConfigLoader, DefaultConfigStore, DefaultErrorHandler, DefaultHealthRegistry, DefaultLogger, DefaultMemoryStore, DefaultModeStore, DefaultModelsRegistry, DefaultMultiAgentCoordinator, DefaultPathResolver, DefaultPermissionPolicy, DefaultPluginAPI, DefaultProviderRunner, DefaultRetryPolicy, DefaultSecretScrubber, DefaultSecretVault, DefaultSessionReader, DefaultSessionStore, DefaultSkillLoader, DefaultSystemPromptBuilder, DefaultTaskStore, DefaultTokenCounter, Director, DirectorBudgetError, DirectorStateCheckpoint, DoneConditionChecker, EventBus, ExtensionRegistry, FLEET_ROSTER, FleetBus, FleetUsageAggregator, HybridCompactor, InMemoryAgentBridge, InMemoryBridgeTransport, InMemoryMetricsSink, InputBuilder, IntelligentCompactor, KERNEL_API_VERSION, LAYER_1_IDENTITY, LLMSelector, NoopMetricsSink, NoopTracer, OTelTracer, PROMETHEUS_CONTENT_TYPE, Pipeline, PluginError, ProviderError, ProviderRegistry, QueueStore, REFACTOR_PLANNER_AGENT, RecoveryLock, RunController, SECURITY_SCANNER_AGENT, SelectiveCompactor, SessionAnalyzer, SessionError, SlashCommandRegistry, SpecDrivenDev, SpecParser, SubagentBudget, TOKENS, TaskFlow, TaskGenerator, TaskTracker, ToolError, ToolExecutor, ToolRegistry, WrongStackError, addPlanItem, allServers, asBlocks, asText, atomicWrite, attachPlanCheckpoint, attachTodosCheckpoint, awsServer, blockServer, braveSearchServer, buildChildEnv, buildOtlpMetricsRequest, buildOtlpTracesRequest, buildRecoveryStrategies, classifyFamily, clearPlan, color, compileGlob, composeDirectorPrompt, composeSubagentPrompt, computeTaskProgress, context7Server, contextManagerTool, createContextManagerTool, createDefaultPipelines, createDelegateTool, createMessage, createToolOutputSerializer, decryptConfigSecrets, detectNewlineStyle, emptyPlan, encryptConfigSecrets, ensureDir, estimateTextTokens, estimateToolInputTokens, estimateToolResultTokens, everArtServer, extractRunEnv, filesystemServer, findCriticalPath, formatContextWindowModeList, formatPlan, formatTodosList, getContextWindowMode, githubServer, googleMapsServer, isAgentError, isConfigError, isContextWindowModeId, isImageBlock, isPluginError, isSessionError, isTextBlock, isThinkingBlock, isToolError, isToolResultBlock, isToolUseBlock, isWrongStackError, listContextWindowModes, loadDirectorState, loadPlan, loadPlugins, loadProjectModes, loadTodosCheckpoint, loadUserModes, makeAgentSubagentRunner, makeDirectorSessionFactory, matchAny, matchGlob, migratePlaintextSecrets, miniMaxVisionServer, normalizeToLf, projectHash, removePlanItem, renderPrometheus, repairToolUseAdjacency, resolveContextWindowPolicy, resolveWstackPaths, rewriteConfigEncrypted, rosterSummaryFromConfigs, runConfigMigrations, safeParse, safeStringify, sanitizeJsonString, savePlan, saveTodosCheckpoint, sentinelServer, setPlanItemStatus, slackServer, startMetricsServer, startOtlpMetricsExporter, startOtlpTraceExporter, stripAnsi, toStyle, toWrongStackError, topologicalSort, unifiedDiff, unloadPlugins, validateAgainstSchema, wireMetricsToEvents, wrapAsState, zaiVisionServer };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map