@andyqiu/codeforge 0.8.17 → 0.8.19

package/dist/index.js

@@ -26679,6 +26679,111 @@ function withTimeout2(p, ms, label, signal, hbOpts) {
   });
 }
 
+// lib/merge-timeline.ts
+var STATE_LABEL = {
+  pre_check: "\uD83D\uDD0D 前置检查",
+  approval_pre_check: "\uD83D\uDD0D approval 预检",
+  dispatch_review: "\uD83D\uDC40 reviewer 审查",
+  collect_decision: "\uD83D\uDCCB 收集决策",
+  dispatch_coder: "\uD83D\uDEE0 coder 修改",
+  wait_coder: "⏳ 等待 coder",
+  block_pause: "⛔ 阻塞",
+  do_merge: "\uD83D\uDD00 squash merge"
+};
+var ROUND_STATES = new Set([
+  "dispatch_review",
+  "collect_decision",
+  "dispatch_coder",
+  "wait_coder"
+]);
+function formatDuration(ms) {
+  let v = ms;
+  if (!Number.isFinite(v) || v < 0)
+    v = 0;
+  const totalSec = Math.round(v / 1000);
+  if (totalSec < 60) {
+    return `${(v / 1000).toFixed(1)}s`;
+  }
+  const m = Math.floor(totalSec / 60);
+  const s = totalSec % 60;
+  return `${m}m${String(s).padStart(2, "0")}s`;
+}
+function createMergeTimeline(opts = {}) {
+  const now = opts.now ?? Date.now;
+  const segs = [];
+  let currentRound = 0;
+  function liveTitle(seg, atMs) {
+    const label = STATE_LABEL[seg.state] ?? seg.state;
+    const elapsed = formatDuration(atMs - seg.startMs);
+    const roundSuffix = seg.round !== undefined ? ` · 第 ${seg.round} 轮` : "";
+    return `${label}…（${elapsed}）${roundSuffix}`;
+  }
+  return {
+    record(state, detail) {
+      try {
+        const t = now();
+        const open = segs.length > 0 ? segs[segs.length - 1] : undefined;
+        if (open && open.endMs === undefined && open.state === state) {
+          open.detail = detail;
+          return liveTitle(open, t);
+        }
+        if (open && open.endMs === undefined) {
+          open.endMs = t;
+        }
+        if (state === "dispatch_review") {
+          currentRound += 1;
+        }
+        const seg = {
+          state,
+          detail,
+          startMs: t,
+          ...ROUND_STATES.has(state) && currentRound > 0 ? { round: currentRound } : {}
+        };
+        segs.push(seg);
+        return liveTitle(seg, t);
+      } catch {
+        return "";
+      }
+    },
+    finish() {
+      const t = now();
+      const open = segs.length > 0 ? segs[segs.length - 1] : undefined;
+      if (open && open.endMs === undefined) {
+        open.endMs = t;
+      }
+    },
+    totalMs() {
+      let sum = 0;
+      for (const s of segs) {
+        if (s.endMs !== undefined)
+          sum += s.endMs - s.startMs;
+      }
+      return sum;
+    },
+    segments() {
+      return segs.map((s) => ({ ...s }));
+    },
+    renderSummary() {
+      if (segs.length === 0) {
+        return "⏱ 耗时明细：（无阶段记录）";
+      }
+      const rows = [];
+      for (const s of segs) {
+        const label = STATE_LABEL[s.state] ?? s.state;
+        const roundSuffix = s.round !== undefined ? ` · 第 ${s.round} 轮` : "";
+        const durMs = s.endMs !== undefined ? s.endMs - s.startMs : 0;
+        rows.push({ label: `${label}${roundSuffix}`, dur: formatDuration(durMs) });
+      }
+      const labelWidth = Math.max(...rows.map((r) => r.label.length), 4);
+      const lines = rows.map((r) => `  ${r.label.padEnd(labelWidth)}  ${r.dur}`);
+      const total = formatDuration(this.totalMs());
+      const sep3 = "  " + "─".repeat(labelWidth + 8);
+      return ["⏱ 耗时明细：", ...lines, sep3, `  ${"总计".padEnd(labelWidth)}  ${total}`].join(`
+`);
+    }
+  };
+}
+
 // tools/session-merge.ts
 var description12 = [
   "合并当前 session 绑定的 worktree 改动到主工作区（squash + review-fix-review 闭环）。",
@@ -26939,6 +27044,8 @@ async function execute12(input) {
     }
     const mergeArgs = args;
     const sendProgress = _ctx.sendProgress;
+    const setTitle = _ctx.setTitle;
+    const timeline = createMergeTimeline();
     const result = await runMergeLoop({
       sessionId: mergeSessionId,
       mainRoot,
@@ -26947,14 +27054,26 @@ async function execute12(input) {
       ...mergeArgs.summary ? { summary: mergeArgs.summary } : {},
       ..._ctx.planStore ? { planStore: _ctx.planStore } : {},
       spawner: _ctx.spawner,
-      ...sendProgress ? {
-        onProgress: (state, detail) => {
+      onProgress: (state, detail) => {
+        const title = timeline.record(state, detail);
+        if (setTitle && title) {
+          try {
+            setTitle(title);
+          } catch {}
+        }
+        if (sendProgress) {
           Promise.resolve(sendProgress(state, detail)).catch(() => {});
         }
-      } : {},
+      },
       ..._ctx.__testHooks ? { __testHooks: _ctx.__testHooks } : {}
     });
-    return { ok: true, action: "merge", data: result };
+    timeline.finish();
+    return {
+      ok: true,
+      action: "merge",
+      data: result,
+      timeline: { text: timeline.renderSummary(), totalMs: timeline.totalMs() }
+    };
   } catch (err) {
     return {
       ok: false,
@@ -27910,6 +28029,10 @@ function classifyError(err) {
   }
   if (/\b(5\d{2}|529|429)\b/.test(msg))
     return "retryable";
+  if (/model.*(not.*(found|supported)|is.*not.*available)/i.test(msg))
+    return "switch_model";
+  if (/api.?key.*(not.*configured|missing)/i.test(msg))
+    return "switch_model";
   if (errName === "ProviderAuthError" || errName === "ContextOverflowError")
     return "fatal";
   if (/\b4[0-9]{2}\b/.test(msg) && !/\b429\b/.test(msg))
@@ -27970,6 +28093,8 @@ async function withLlmRetry(fn, opts = {}) {
   const startedAt = Date.now();
   let lastError;
   let attempt = 0;
+  let pendingModel;
+  let activeModel = opts.currentModel ?? "";
   while (attempt < maxAttempts) {
     if (attempt > 0 && opts.signal?.aborted) {
       const e = new Error("withLlmRetry: aborted by signal");
@@ -27988,11 +28113,24 @@ async function withLlmRetry(fn, opts = {}) {
     }
     attempt++;
     try {
-      const result = await fn();
+      const result = await fn({ model: pendingModel });
       if (opts.isRetryableResult) {
         const failErr = opts.isRetryableResult(result);
         if (failErr) {
           const cls = classifyError(failErr);
+          if (cls === "switch_model") {
+            const nextModel = opts.resolveModelForAttempt?.(activeModel);
+            if (nextModel != null && attempt < maxAttempts) {
+              activeModel = nextModel;
+              pendingModel = nextModel;
+              lastError = failErr;
+              const delayMs = await handleRetryDelay(failErr, attempt, maxAttempts, baseDelayMs, maxDelayMs, jitterRatio, opts);
+              if (delayMs < 0)
+                throw lastError;
+              continue;
+            }
+            throw failErr;
+          }
           if (cls === "retryable" && attempt < maxAttempts) {
             lastError = failErr;
             const delayMs = await handleRetryDelay(failErr, attempt, maxAttempts, baseDelayMs, maxDelayMs, jitterRatio, opts);
@@ -28008,6 +28146,22 @@ async function withLlmRetry(fn, opts = {}) {
       if (err.name === "AbortError")
         throw err;
       const cls = classifyError(err);
+      if (cls === "switch_model") {
+        const nextModel = opts.resolveModelForAttempt?.(activeModel);
+        if (nextModel != null && attempt < maxAttempts) {
+          activeModel = nextModel;
+          pendingModel = nextModel;
+          lastError = err;
+          const delayMs2 = await handleRetryDelay(err, attempt, maxAttempts, baseDelayMs, maxDelayMs, jitterRatio, opts);
+          if (delayMs2 < 0) {
+            const e = new Error("withLlmRetry: aborted during retry sleep");
+            e.name = "AbortError";
+            throw e;
+          }
+          continue;
+        }
+        throw err;
+      }
       if (cls === "fatal" || attempt >= maxAttempts) {
         throw err;
       }
@@ -29096,13 +29250,23 @@ var codeforgeToolsServer = async (ctx) => {
             if (!v.ok)
               return wrap(JSON.parse(v.output));
             const sid = input.sessionID;
+            const tctx = input;
             __setContext({
               mainRoot: ctx.directory ?? process.cwd(),
               spawner,
               resolveCurrentSessionId: () => process.env["CODEFORGE_SESSION_ID"] ?? "",
               ...sid ? { currentSessionId: sid } : {},
+              ...typeof tctx.metadata === "function" ? {
+                setTitle: (title) => {
+                  try {
+                    tctx.metadata({ title });
+                  } catch {}
+                }
+              } : {},
               ...sid ? {
                 sendProgress: async (state, detail) => {
+                  if (state !== "block_pause")
+                    return;
                   const client = ctx.client;
                   if (typeof client?.tui?.showToast === "function") {
                     await client.tui.showToast({
@@ -29117,6 +29281,10 @@ var codeforgeToolsServer = async (ctx) => {
               title: `session_merge: ${args.action}`,
               action: args.action
             };
+            const rWithTimeline = result;
+            if (args.action === "merge" && rWithTimeline.timeline?.text) {
+              meta["description"] = rWithTimeline.timeline.text;
+            }
             return wrap(result, meta);
           });
         }
@@ -30119,1607 +30287,2099 @@ var memoriesContextServer = async (ctx) => {
 };
 var handler9 = memoriesContextServer;
 
-// plugins/model-fallback.ts
-var PLUGIN_NAME10 = "model-fallback";
-var state = {
-  config: null,
-  configPath: null,
-  warnings: [],
-  error: null
-};
-logLifecycle(PLUGIN_NAME10, "import");
-function loadOnce(root) {
-  if (state.config !== null || state.error !== null)
-    return;
-  const r = loadModelConfigSync({ root });
-  if (r.ok && r.config) {
-    state.config = r.config;
-    state.configPath = r.path ?? null;
-    state.warnings = r.warnings;
-    if (r.warnings.length > 0) {
-      safeWriteLog(PLUGIN_NAME10, { phase: "load.warnings", warnings: r.warnings });
-    }
-  } else {
-    state.error = r.error ?? "unknown_load_error";
-    safeWriteLog(PLUGIN_NAME10, { phase: "load.failed", error: state.error, path: r.path });
+// lib/fallback-state.ts
+function createFallbackState(opts) {
+  const now = opts.now ?? Date.now();
+  return {
+    sessionID: opts.sessionID,
+    phase: "pending_output",
+    originalModel: opts.model,
+    currentModel: opts.model,
+    pendingModel: null,
+    fallbackIndex: 0,
+    failedModels: new Map,
+    attemptCount: 0,
+    lastActiveAt: now,
+    lastReplayAt: 0,
+    inflightReplay: false,
+    agent: opts.agent,
+    directory: opts.directory ?? null,
+    awaitingFirstAssistantOutput: true,
+    lastDispatchedAt: now
+  };
+}
+function markDispatched(map2, opts) {
+  const now = opts.now ?? Date.now();
+  const existing = map2.get(opts.sessionID);
+  if (!existing) {
+    const s = createFallbackState({ ...opts, now });
+    map2.set(opts.sessionID, s);
+    return s;
   }
-}
-var MODEL_ERR_PATTERNS = [
-  /rate.?limit/i,
-  /quota/i,
-  /\b(429|503)\b/,
-  /unavailable/i,
-  /context.*length/i,
-  /model.*not.*found/i,
-  /overload/i,
-  /timeout/i
-];
-function looksLikeModelError(message) {
-  if (!message)
-    return false;
-  return MODEL_ERR_PATTERNS.some((re) => re.test(message));
-}
-function buildFallbackMeta(cfg, agent, currentModel) {
-  const r = resolveAgentModel(cfg, agent);
-  if (!r)
+  existing.agent = opts.agent;
+  existing.directory = opts.directory ?? existing.directory ?? null;
+  existing.phase = "pending_output";
+  existing.awaitingFirstAssistantOutput = true;
+  existing.lastDispatchedAt = now;
+  existing.lastActiveAt = now;
+  return existing;
+}
+function markFirstOutput(state, now) {
+  state.awaitingFirstAssistantOutput = false;
+  state.lastActiveAt = now ?? Date.now();
+}
+var CONTEXT_OVERFLOW_RE = /context.*length|context.*window|too.*many.*token|maximum.*context/i;
+function planFallback(state, chain, opts) {
+  if (state.attemptCount >= opts.maxAttempts)
     return null;
-  const idx = r.chain.indexOf(currentModel);
-  const next = idx >= 0 ? r.chain[idx + 1] ?? null : r.chain[0] ?? null;
-  return {
-    agent,
-    current_model: currentModel,
-    resolved: r,
-    next_fallback: next,
-    chain: r.chain,
-    source: r.source
-  };
+  if (!Array.isArray(chain) || chain.length === 0)
+    return null;
+  const idx = chain.indexOf(state.currentModel);
+  const startFrom = idx >= 0 ? idx + 1 : 0;
+  let nextModel = null;
+  for (let i = startFrom;i < chain.length; i++) {
+    const cand = chain[i];
+    if (!cand)
+      continue;
+    if (cand === state.currentModel)
+      continue;
+    if (state.failedModels.has(cand))
+      continue;
+    nextModel = cand;
+    break;
+  }
+  if (!nextModel)
+    return null;
+  const isOverflow = opts.errorMessage ? CONTEXT_OVERFLOW_RE.test(opts.errorMessage) : false;
+  let tier = 1;
+  if (isOverflow) {
+    tier = Math.min(3, state.attemptCount + 1);
+  }
+  const reason = isOverflow ? "context_overflow" : "model_error";
+  return { nextModel, tier, reason };
+}
+function beginPlannedFallback(state, plan, now) {
+  const t = now ?? Date.now();
+  state.phase = "planned_fallback";
+  state.pendingModel = plan.nextModel;
+  state.awaitingFirstAssistantOutput = false;
+  state.attemptCount += 1;
+  state.lastReplayAt = t;
+  state.lastActiveAt = t;
+}
+function beginReplaying(state, now) {
+  state.phase = "replaying";
+  state.inflightReplay = true;
+  state.lastActiveAt = now ?? Date.now();
+}
+function commitFallback(state, plan, now) {
+  const t = now ?? Date.now();
+  if (state.pendingModel === null)
+    return false;
+  const target = state.pendingModel;
+  state.failedModels.set(state.currentModel, t);
+  state.currentModel = target;
+  state.pendingModel = null;
+  state.inflightReplay = false;
+  state.phase = "committed";
+  state.fallbackIndex += 1;
+  state.lastActiveAt = t;
+  return true;
 }
-function buildSuggestion(meta, errorMessage2) {
-  const head = `⚠️ \`${meta.agent}\` agent 调用 \`${meta.current_model}\` 失败`;
-  const reason = errorMessage2 ? `（${errorMessage2.slice(0, 80)}）` : "";
-  if (!meta.next_fallback) {
-    return `${head}${reason}
-fallback 链已用尽：${meta.chain.join(" → ")}`;
+function rollbackFallback(state, plan, opts) {
+  const t = opts.now ?? Date.now();
+  if (!opts.abortFailed) {
+    state.failedModels.set(plan.nextModel, t);
   }
-  return `${head}${reason}
-建议手动切换：\`/model-switch ${meta.agent} ${meta.next_fallback}\`
-完整链：${meta.chain.join(" → ")}`;
+  state.pendingModel = null;
+  state.currentModel = state.originalModel;
+  state.inflightReplay = false;
+  state.phase = "rolled_back";
+  state.lastActiveAt = t;
 }
-var modelFallbackServer = async (ctx) => {
-  const log7 = makePluginLogger(PLUGIN_NAME10);
-  loadOnce(ctx.directory ?? process.cwd());
-  logLifecycle(PLUGIN_NAME10, "activate", {
-    directory: ctx.directory,
-    config_path: state.configPath,
-    config_loaded: state.config !== null,
-    config_error: state.error,
-    agents: state.config ? Object.keys(state.config.agents) : [],
-    runtime_fallback: state.config?.runtime_fallback ?? null
-  });
-  return {
-    "chat.params": async (input, output) => {
-      await safeAsync(PLUGIN_NAME10, "chat.params", async () => {
-        if (!state.config)
-          return;
-        const agent = input.agent;
-        const modelObj = input.model;
-        if (!agent || !modelObj)
-          return;
-        const providerID = modelObj.providerID ?? "";
-        const modelID = modelObj.modelID ?? modelObj.id ?? "";
-        if (!providerID || !modelID)
-          return;
-        const currentModel = `${providerID}/${modelID}`;
-        const meta = buildFallbackMeta(state.config, agent, currentModel);
-        if (!meta)
-          return;
-        output.options = output.options ?? {};
-        output.options.codeforge_fallback = {
-          chain: meta.chain,
-          next: meta.next_fallback,
-          source: meta.source
-        };
-        safeWriteLog(PLUGIN_NAME10, {
-          hook: "chat.params",
-          agent,
-          model: currentModel,
-          chain: meta.chain,
-          next: meta.next_fallback
-        });
-      });
-    },
-    event: async ({ event }) => {
-      await safeAsync(PLUGIN_NAME10, "event", async () => {
-        if (!state.config)
-          return;
-        const e = event;
-        if (!e || typeof e.type !== "string")
-          return;
-        if (!/error|failed|unavailable/i.test(e.type))
-          return;
-        const props = e.properties ?? {};
-        const message = typeof props.error === "string" && props.error || typeof props.message === "string" && props.message || typeof props.error?.message === "string" && props.error.message || "";
-        if (!looksLikeModelError(String(message)))
-          return;
-        const agent = props.agent ?? "unknown";
-        const model = props.model ?? "unknown/unknown";
-        const meta = buildFallbackMeta(state.config, agent, model);
-        const suggestion = meta ? buildSuggestion(meta, String(message)) : `⚠️ ${agent}/${model} 失败：${message}`;
-        log7.warn(`[${PLUGIN_NAME10}] ${suggestion}`);
-        safeWriteLog(PLUGIN_NAME10, {
-          hook: "event.error",
-          eventType: e.type,
-          agent,
-          model,
-          suggestion,
-          chain: meta?.chain
-        });
-      });
+function recoverToOriginal(state, cooldownSec, now) {
+  const t = now ?? Date.now();
+  if (state.currentModel === state.originalModel)
+    return false;
+  const failedAt = state.failedModels.get(state.originalModel);
+  if (failedAt === undefined)
+    return false;
+  if (t - failedAt < cooldownSec * 1000)
+    return false;
+  state.currentModel = state.originalModel;
+  state.failedModels.delete(state.originalModel);
+  state.phase = "committed";
+  state.lastActiveAt = t;
+  return true;
+}
+function sweepStale(map2, ttlMs, now) {
+  const t = now ?? Date.now();
+  let removed = 0;
+  for (const [sid, s] of map2) {
+    if (t - s.lastActiveAt > ttlMs) {
+      map2.delete(sid);
+      removed++;
     }
-  };
-};
-var handler10 = modelFallbackServer;
+  }
+  return removed;
+}
 
-// plugins/parallel-tool-nudge.ts
-import { readFileSync as readFileSync4, readdirSync as readdirSync2, statSync as statSync3 } from "node:fs";
-import { join as join21 } from "node:path";
-import { homedir as homedir8 } from "node:os";
-var PLUGIN_NAME11 = "parallel-tool-nudge";
-logLifecycle(PLUGIN_NAME11, "import", {});
-var PARALLEL_SAFE_TOOLS = [
-  "read",
-  "repo_map",
-  "webfetch"
-];
-var DEFAULT_AGENT_KEY = "__default__";
-var NUDGE_MAX_LEN2 = 800;
-var agentToolsMap = new Map;
-function defaultReader2(p) {
-  return readFileSync4(p, "utf8");
+// lib/fallback-replay.ts
+function degradeParts(parts, tier) {
+  if (!Array.isArray(parts))
+    return { parts: [], dropped: [] };
+  if (tier === 1)
+    return { parts: [...parts], dropped: [] };
+  const keep = [];
+  const dropped = [];
+  for (const p of parts) {
+    const type = p && typeof p === "object" ? p.type : undefined;
+    const isKept = type === "text";
+    if (isKept)
+      keep.push(p);
+    else
+      dropped.push(p);
+  }
+  return { parts: keep, dropped };
 }
-function defaultDirReader2(p) {
-  return readdirSync2(p);
+function roleOf(m) {
+  if (typeof m.role === "string")
+    return m.role;
+  if (m.info && typeof m.info.role === "string")
+    return m.info.role;
+  return;
 }
-function defaultDirExists2(p) {
-  try {
-    return statSync3(p).isDirectory();
-  } catch {
-    return false;
+function partsOf(m) {
+  if (Array.isArray(m.parts))
+    return m.parts;
+  return [];
+}
+function pickLastUserParts(messages) {
+  if (!Array.isArray(messages) || messages.length === 0)
+    return null;
+  let lastAssistantIdx = -1;
+  for (let i = messages.length - 1;i >= 0; i--) {
+    const m = messages[i];
+    if (m && roleOf(m) === "assistant") {
+      lastAssistantIdx = i;
+      break;
+    }
+  }
+  if (lastAssistantIdx >= 0) {
+    for (let i = lastAssistantIdx - 1;i >= 0; i--) {
+      const m = messages[i];
+      if (m && roleOf(m) === "user") {
+        const parts = partsOf(m);
+        return parts.length > 0 ? parts : null;
+      }
+    }
+  }
+  for (let i = messages.length - 1;i >= 0; i--) {
+    const m = messages[i];
+    if (m && roleOf(m) === "user") {
+      const parts = partsOf(m);
+      return parts.length > 0 ? parts : null;
+    }
   }
+  return null;
 }
-function parseAgentFrontmatter(content) {
-  const fmMatch = /^---\r?\n([\s\S]*?)\r?\n---/.exec(content);
-  if (!fmMatch || !fmMatch[1])
+async function fetchLastUserParts(client, sessionID, directory) {
+  const fn = client?.session?.messages;
+  if (typeof fn !== "function")
     return null;
-  let parsed;
   try {
-    parsed = $parse(fmMatch[1]);
+    const res = await fn({
+      path: { id: sessionID },
+      query: directory ? { directory } : undefined
+    });
+    if (res && typeof res === "object" && "error" in res && res.error)
+      return null;
+    const data = res && typeof res === "object" ? res.data : undefined;
+    const arr = Array.isArray(data) ? data : null;
+    if (!arr)
+      return null;
+    return pickLastUserParts(arr);
   } catch {
     return null;
   }
-  if (!parsed || typeof parsed !== "object")
-    return null;
-  const obj = parsed;
-  const name = typeof obj["name"] === "string" ? obj["name"] : null;
-  const tools = obj["allowed_tools"];
-  if (!name || !Array.isArray(tools))
+}
+function splitModel(model) {
+  const i = model.indexOf("/");
+  if (i <= 0 || i >= model.length - 1)
     return null;
-  const allowedTools = [];
-  for (const t of tools) {
-    if (typeof t === "string")
-      allowedTools.push(t);
-  }
-  return { name, allowedTools };
+  return { providerID: model.slice(0, i), modelID: model.slice(i + 1) };
 }
-function loadAgentToolsMap(rootDir, opts = {}) {
-  const reader = opts.reader ?? defaultReader2;
-  const dirReader = opts.dirReader ?? defaultDirReader2;
-  const dirExists = opts.dirExists ?? defaultDirExists2;
-  const homeAgentsDir = opts.homeAgentsDir ?? join21(homedir8(), ".config", "opencode", "agents");
-  const candidateDirs = [
-    join21(rootDir, ".codeforge", "agents"),
-    join21(rootDir, "agents"),
-    homeAgentsDir
-  ];
-  const result = new Map;
-  const safeSet = new Set(PARALLEL_SAFE_TOOLS);
-  const unionTools = new Set;
-  const log7 = makePluginLogger(PLUGIN_NAME11);
-  for (const dir of candidateDirs) {
-    if (!dirExists(dir))
-      continue;
-    let entries;
-    try {
-      entries = dirReader(dir);
-    } catch (err) {
-      log7.warn(`agents 目录读取失败（已跳过）`, {
-        dir,
-        error: err instanceof Error ? err.message : String(err)
-      });
-      continue;
-    }
-    for (const entry of entries) {
-      if (!entry.endsWith(".md"))
-        continue;
-      const path23 = join21(dir, entry);
-      let content;
-      try {
-        content = reader(path23);
-      } catch (err) {
-        log7.warn(`agent.md 读取失败（已跳过）`, {
-          path: path23,
-          error: err instanceof Error ? err.message : String(err)
-        });
-        continue;
-      }
-      const parsed = parseAgentFrontmatter(content);
-      if (!parsed) {
-        log7.warn(`agent frontmatter 解析失败（已跳过）`, { path: path23 });
-        continue;
-      }
-      if (result.has(parsed.name))
-        continue;
-      const intersect = [];
-      const seen = new Set;
-      for (const t of parsed.allowedTools) {
-        if (safeSet.has(t) && !seen.has(t)) {
-          intersect.push(t);
-          seen.add(t);
-          unionTools.add(t);
-        }
-      }
-      result.set(parsed.name, intersect);
+function toTextParts(parts) {
+  const out = [];
+  for (const p of parts) {
+    if (p && typeof p === "object" && p.type === "text" && typeof p.text === "string") {
+      out.push({ type: "text", text: p.text, id: makePartId() });
     }
   }
-  result.set(DEFAULT_AGENT_KEY, Array.from(unionTools));
-  return result;
+  return out;
 }
-var sessionAgentMap2 = new Map;
-var SESSION_CAP3 = 200;
-var SESSION_TTL_MS3 = 24 * 60 * 60 * 1000;
-function pruneIfOversize3() {
-  while (sessionAgentMap2.size > SESSION_CAP3) {
-    const oldestKey = sessionAgentMap2.keys().next().value;
-    if (oldestKey === undefined)
-      break;
-    sessionAgentMap2.delete(oldestKey);
+async function executeReplay(client, opts) {
+  const abortFn = client?.session?.abort;
+  const promptFn = client?.session?.promptAsync;
+  if (typeof abortFn !== "function") {
+    return { aborted: false, prompted: false, error: "abort_unavailable" };
   }
-}
-function isExpired3(entry, now) {
-  return now - entry.ts > SESSION_TTL_MS3;
-}
-function resolveAgent(sessionID, nowFn = Date.now) {
-  if (!sessionID)
-    return "unknown";
-  const entry = sessionAgentMap2.get(sessionID);
-  if (!entry)
-    return "unknown";
-  const now = nowFn();
-  if (isExpired3(entry, now)) {
-    sessionAgentMap2.delete(sessionID);
-    return "unknown";
+  const modelObj = splitModel(opts.model);
+  if (!modelObj) {
+    return { aborted: false, prompted: false, error: "invalid_model" };
   }
-  sessionAgentMap2.delete(sessionID);
-  sessionAgentMap2.set(sessionID, entry);
-  return entry.agent;
-}
-function renderNudge(agent, tools) {
-  const isUnknown = agent === "unknown";
-  const agentLine = isUnknown ? `You are running as a CodeForge agent (specific agent unknown for this turn).` : `You are the \`${agent}\` agent.`;
-  const toolsBulleted = tools.length > 0 ? tools.map((t) => `    - \`${t}\``).join(`
-`) : `    - (no parallel-safe tools registered for this agent)`;
-  const body = `────────────────────────────────────────
-PARALLEL TOOL CALL DIRECTIVE (auto-injected by parallel-tool-nudge plugin)
-────────────────────────────────────────
-${agentLine} The opencode runtime executes tool calls in your single
-response **truly in parallel** (verified: up to 22 tools in 72ms).
-You MUST batch-emit independent read-only tool calls in one response
-whenever possible.
-
-Parallel-safe tools available to you:
-${toolsBulleted}
-
-Heuristics:
-    - Need to read 3 files? → emit 3 \`read\` calls in ONE response, not 3 sequential turns
-    - Need to read + map? → emit \`read\` + \`repo_map\` in ONE response
-    - DO NOT batch write tools (edit / write / ast_edit / bash)
-    - DO NOT chain reads where each read's path depends on previous read's output
-
-This directive is re-injected every turn — it is not optional advice.
-────────────────────────────────────────`;
-  if (body.length <= NUDGE_MAX_LEN2)
-    return body;
-  return body.slice(0, NUDGE_MAX_LEN2 - 4) + `
-…`;
-}
-var log7 = makePluginLogger(PLUGIN_NAME11);
-var parallelToolNudgeServer = async (ctx) => {
   try {
-    const loaded = loadAgentToolsMap(ctx.directory ?? process.cwd());
-    agentToolsMap.clear();
-    for (const [k, v] of loaded.entries())
-      agentToolsMap.set(k, v);
-  } catch (err) {
-    log7.warn(`loadAgentToolsMap 失败（plugin 将 no-op）`, {
-      error: err instanceof Error ? err.message : String(err)
+    const res = await abortFn({
+      path: { id: opts.sessionID },
+      query: opts.directory ? { directory: opts.directory } : undefined
     });
+    if (res && typeof res === "object" && "error" in res && res.error) {
+      return { aborted: false, prompted: false, error: "abort_returned_error" };
+    }
+  } catch (e) {
+    return { aborted: false, prompted: false, error: `abort_threw: ${e.message}` };
   }
-  const realAgentCount = Math.max(0, agentToolsMap.size - (agentToolsMap.has(DEFAULT_AGENT_KEY) ? 1 : 0));
-  if (realAgentCount === 0) {
-    agentToolsMap.clear();
-    log7.warn(`0 real agents loaded; plugin will be no-op for this session`, {
-      directory: ctx.directory
-    });
+  if (typeof promptFn !== "function") {
+    return { aborted: true, prompted: false, error: "promptAsync_unavailable" };
   }
-  const defaultTools = agentToolsMap.get(DEFAULT_AGENT_KEY) ?? [];
-  logLifecycle(PLUGIN_NAME11, "activate", {
-    directory: ctx.directory,
-    real_agents_loaded: realAgentCount,
-    default_tools_union: defaultTools,
-    parallel_safe_whitelist: PARALLEL_SAFE_TOOLS,
-    session_cap: SESSION_CAP3,
-    session_ttl_ms: SESSION_TTL_MS3,
-    no_op: agentToolsMap.size === 0
-  });
-  return {
-    "chat.params": async (input, _output) => {
-      await safeAsync(PLUGIN_NAME11, "chat.params", async () => {
-        if (agentToolsMap.size === 0)
-          return;
-        const sid = input?.sessionID;
-        const agent = input?.agent;
-        if (!sid || !agent)
-          return;
-        sessionAgentMap2.set(sid, { agent, ts: Date.now() });
-        pruneIfOversize3();
-      });
-    },
-    "experimental.chat.system.transform": async (input, output) => {
-      await safeAsync(PLUGIN_NAME11, "experimental.chat.system.transform", async () => {
-        if (agentToolsMap.size === 0)
-          return;
-        if (!output || !Array.isArray(output.system))
-          return;
-        const sid = input?.sessionID;
-        const agent = resolveAgent(sid);
-        const tools = agent !== "unknown" ? agentToolsMap.get(agent) ?? agentToolsMap.get(DEFAULT_AGENT_KEY) ?? [] : agentToolsMap.get(DEFAULT_AGENT_KEY) ?? [];
-        const nudge = renderNudge(agent, tools);
-        output.system.push(nudge);
-        safeWriteLog(PLUGIN_NAME11, {
-          hook: "experimental.chat.system.transform",
-          sessionID: sid,
-          agent,
-          injected_tools: tools,
-          injected_chars: nudge.length,
-          fallback: agent === "unknown"
-        });
-      });
+  const textParts = toTextParts(opts.parts);
+  if (textParts.length === 0) {
+    return { aborted: true, prompted: false, error: "no_text_parts" };
+  }
+  try {
+    const res = await promptFn({
+      path: { id: opts.sessionID },
+      query: opts.directory ? { directory: opts.directory } : undefined,
+      body: {
+        model: { providerID: modelObj.providerID, modelID: modelObj.modelID },
+        agent: opts.agent,
+        parts: textParts
+      }
+    });
+    if (res && typeof res === "object" && "error" in res && res.error) {
+      return { aborted: true, prompted: false, error: "prompt_returned_error" };
     }
-  };
-};
-var handler11 = parallelToolNudgeServer;
-
-// plugins/pwsh-utf8.ts
-var PLUGIN_NAME12 = "pwsh-utf8";
-logLifecycle(PLUGIN_NAME12, "import", {});
-var PRELUDE = "chcp 65001 *> $null; " + "[Console]::OutputEncoding = [System.Text.UTF8Encoding]::new(); " + "$OutputEncoding = [System.Text.UTF8Encoding]::new(); ";
-function prependUtf8Prelude(command) {
-  if (typeof command !== "string")
-    return;
-  if (command.length === 0)
-    return command;
-  if (/chcp\s+65001/i.test(command))
-    return command;
-  if (/\[Console\]::OutputEncoding\s*=/i.test(command))
-    return command;
-  return PRELUDE + command;
+    return { aborted: true, prompted: true };
+  } catch (e) {
+    return { aborted: true, prompted: false, error: `prompt_threw: ${e.message}` };
+  }
 }
-var handler12 = async (_ctx4) => {
-  const enabled = process.platform === "win32" && process.env.CODEFORGE_DISABLE_PWSH_UTF8 !== "1";
-  const reason = enabled ? "win32" : process.platform !== "win32" ? "non-win32" : "disabled-by-env";
-  logLifecycle(PLUGIN_NAME12, "activate", { enabled, platform: process.platform, reason });
-  if (!enabled)
-    return {};
-  return {
-    "tool.execute.before": async (input, output) => {
-      await safeAsync(PLUGIN_NAME12, "tool.execute.before", async () => {
-        if (input.tool !== "bash")
-          return;
-        const args = output.args ?? {};
-        const original = args["command"];
-        const next = prependUtf8Prelude(original);
-        if (next !== undefined && next !== original) {
-          args["command"] = next;
-          output.args = args;
-          safeWriteLog(PLUGIN_NAME12, {
-            hook: "tool.execute.before",
-            tool: input.tool,
-            callID: input.callID,
-            sessionID: input.sessionID,
-            injected: true
-          });
-        }
-      });
-    }
-  };
-};
 
-// lib/event-stream.ts
-import { promises as fs18 } from "node:fs";
+// plugins/subtask-heartbeat.ts
+import { promises as fsPromises } from "node:fs";
 import * as path23 from "node:path";
-async function loadSession(id, opts = {}) {
-  const file2 = resolveSessionFile(id, opts);
-  const raw = await fs18.readFile(file2, "utf8");
-  return parseJsonl(id, raw);
-}
-async function listSessions(opts = {}) {
-  const dir = resolveDir(opts);
-  let entries;
+var recordSessionParent2 = recordSessionParent;
+var lookupParentSessionId2 = lookupParentSessionId;
+var deleteSessionParent2 = deleteSessionParent;
+var sweepExpiredSessionParents2 = sweepExpiredSessionParents;
+var _bulkInjectSessionParentMap2 = _bulkInjectSessionParentMap;
+var _capSessionParentMap2 = _capSessionParentMap;
+var _setPersistRootForTests2 = _setPersistRootForTests;
+var PLUGIN_NAME10 = "subtask-heartbeat";
+logLifecycle(PLUGIN_NAME10, "import", {});
+var HEARTBEAT_INTERVAL_MS2 = 30000;
+var HEARTBEAT_DEBOUNCE_MS = 25000;
+var TOAST_DURATION_MS2 = 5000;
+var START_TOAST_DURATION_MS = 2000;
+var PENDING_TASK_TTL_MS = 60000;
+var PENDING_TASK_MAX_PARENTS = 64;
+var PENDING_TASK_MAX_PER_PARENT = 16;
+var DESCRIPTION_MAX_LEN = 60;
+var PARENT_PARSE_FAIL_MAX_LOG = 10;
+var inflight2 = new Map;
+var pendingTask = new Map;
+var _parentParseFailLogged = 0;
+function detectUnparsedParentID(event) {
+  if (!event || typeof event !== "object")
+    return false;
+  const e = event;
+  if (e.type !== "session.created")
+    return false;
+  if (extractCreatedChild(event))
+    return false;
   try {
-    entries = await fs18.readdir(dir, { withFileTypes: true });
-  } catch (err) {
-    if (err.code === "ENOENT")
-      return [];
-    throw err;
+    const json2 = JSON.stringify(event);
+    return /\bparent[_-]?[iI][dD]\b/.test(json2);
+  } catch {
+    return false;
   }
-  const out = [];
-  for (const e of entries) {
-    if (!e.isFile() || !e.name.endsWith(".jsonl"))
-      continue;
-    const file2 = path23.join(dir, e.name);
-    const id = e.name.replace(/\.jsonl$/, "");
-    try {
-      const stat = await fs18.stat(file2);
-      const headerLine = await readFirstLine(file2);
-      let started_at = stat.birthtimeMs;
-      if (headerLine) {
-        try {
-          const h = JSON.parse(headerLine);
-          if (h.__header && typeof h.started_at === "number") {
-            started_at = h.started_at;
-          }
-        } catch {}
-      }
-      out.push({
-        id,
-        file: file2,
-        started_at,
-        size: stat.size,
-        mtime_ms: stat.mtimeMs
-      });
-    } catch {}
-  }
-  out.sort((a, b) => b.started_at - a.started_at);
-  return out;
-}
-function resolveDir(opts = {}) {
-  const root = path23.resolve(opts.root ?? process.cwd());
-  return opts.sessions_dir ? path23.resolve(root, opts.sessions_dir) : path23.join(runtimeDir(root), "sessions");
 }
-function resolveSessionFile(id, opts = {}) {
-  return path23.join(resolveDir(opts), `${id}.jsonl`);
+function extractCreatedChild(event) {
+  if (!event || typeof event !== "object")
+    return null;
+  const e = event;
+  if (e.type !== "session.created")
+    return null;
+  const info = e.properties?.info;
+  if (!info || typeof info !== "object")
+    return null;
+  const session = info;
+  if (typeof session.id !== "string")
+    return null;
+  if (typeof session.parentID !== "string" || session.parentID === "")
+    return null;
+  return { childID: session.id, parentID: session.parentID, agent: null };
 }
-function parseJsonl(id, raw) {
-  const events = [];
-  let started_at = null;
-  for (const line of raw.split(/\r?\n/)) {
-    if (!line.trim())
-      continue;
-    let obj;
-    try {
-      obj = JSON.parse(line);
-    } catch {
-      continue;
-    }
-    if (!obj || typeof obj !== "object")
-      continue;
-    if (obj.__header) {
-      const h = obj;
-      if (typeof h.started_at === "number")
-        started_at = h.started_at;
-      continue;
+var ERROR_REASON_MAX_LEN = 300;
+function extractErrorReason(props) {
+  function sanitize(s) {
+    const folded = s.replace(/[\r\n\t]+/g, " ").replace(/\s+/g, " ").trim();
+    if (folded.length <= ERROR_REASON_MAX_LEN)
+      return folded;
+    return folded.slice(0, ERROR_REASON_MAX_LEN) + "…";
+  }
+  function extractFromValue(v) {
+    if (typeof v === "string" && v.trim())
+      return sanitize(v);
+    if (v && typeof v === "object") {
+      const obj = v;
+      const dataMsg = obj["data"] && typeof obj["data"] === "object" ? obj["data"]["message"] : undefined;
+      const fromMsg = obj["message"] ?? dataMsg ?? obj["reason"];
+      if (typeof fromMsg === "string" && fromMsg.trim())
+        return sanitize(fromMsg);
     }
-    if (isEvent(obj))
-      events.push(obj);
+    return null;
   }
-  return { id, started_at, events };
-}
-function isEvent(obj) {
-  if (!obj || typeof obj !== "object")
-    return false;
-  const e = obj;
-  return typeof e.id === "string" && typeof e.timestamp === "number" && typeof e.session_id === "string" && typeof e.agent === "string" && typeof e.mode === "string" && typeof e.type === "string" && (e.type === "tool_call" || e.type === "message" || e.type === "agent_switch");
-}
-async function readFirstLine(file2) {
-  const buf = Buffer.alloc(4096);
-  const fh = await fs18.open(file2, "r");
-  try {
-    const { bytesRead } = await fh.read(buf, 0, buf.length, 0);
-    const s = buf.subarray(0, bytesRead).toString("utf8");
-    const nl = s.indexOf(`
-`);
-    return nl === -1 ? s : s.slice(0, nl);
-  } finally {
-    await fh.close();
+  const fromError = extractFromValue(props["error"]);
+  if (fromError !== null)
+    return fromError;
+  if (typeof props["message"] === "string" && props["message"].trim())
+    return sanitize(props["message"]);
+  if (typeof props["reason"] === "string" && props["reason"].trim())
+    return sanitize(props["reason"]);
+  if (props["info"] && typeof props["info"] === "object") {
+    const fromInfoError = extractFromValue(props["info"]["error"]);
+    if (fromInfoError !== null)
+      return fromInfoError;
   }
+  return null;
 }
-
-// lib/session-recovery.ts
-var DEFAULT_OPTS = {
-  idleMs: 5 * 60000,
-  windowSize: 30,
-  excerptLimit: 200
-};
-var PENDING_CHANGES_TOOLS = new Set([
-  "pending-changes",
-  "pending_changes",
-  "save_pending_changes",
-  "ast-edit"
-]);
-var APPLY_TOOLS = new Set([
-  "apply_changes",
-  "apply-changes",
-  "pending-changes-apply"
-]);
-var SUBTASK_OPEN = /^subtask[\.\-_:]?(start|create|spawn|run)$/i;
-var SUBTASK_CLOSE = /^subtask[\.\-_:]?(complete|done|close|finish)$/i;
-function buildRecoveryPlan(events, meta = { id: null }, opts = {}) {
-  const cleanOpts = Object.fromEntries(Object.entries(opts).filter(([, v]) => v !== undefined));
-  const o = { ...DEFAULT_OPTS, ...cleanOpts };
-  const now = opts.now ?? Date.now();
-  if (events.length === 0 || !meta.id) {
-    return {
-      last_session_id: meta.id ?? null,
-      reason: "no_session",
-      idle_ms: null,
-      last_user_intent: null,
-      last_agent: null,
-      inflight_tools: [],
-      pending_changes_likely: false,
-      open_subtasks_likely: false,
-      summary: "无历史会话，无需恢复。"
-    };
+function extractEndedSessionID(event) {
+  if (!event || typeof event !== "object")
+    return null;
+  const e = event;
+  if (typeof e.type !== "string")
+    return null;
+  if (e.type !== "session.idle" && e.type !== "session.deleted" && e.type !== "session.error") {
+    return null;
   }
-  const lastTs = meta.lastEventAt ?? events[events.length - 1].timestamp;
-  const idleMs = now - lastTs;
-  let lastUser = null;
-  for (let i = events.length - 1;i >= 0; i--) {
-    const e = events[i];
-    if (e.type === "message" && e.role === "user") {
-      lastUser = clip3(e.content, o.excerptLimit);
-      break;
+  const props = e.properties ?? {};
+  const direct = props["sessionID"];
+  const sessionID = typeof direct === "string" && direct ? direct : (() => {
+    const info = props["info"];
+    if (info && typeof info === "object") {
+      const sid = info.id;
+      if (typeof sid === "string" && sid)
+        return sid;
     }
-  }
-  let lastAgent = null;
-  for (let i = events.length - 1;i >= 0; i--) {
-    const e = events[i];
-    if (e.type === "agent_switch") {
-      lastAgent = e.to;
-      break;
+    return null;
+  })();
+  if (!sessionID)
+    return null;
+  const errorReason = e.type === "session.error" ? extractErrorReason(props) : null;
+  return { type: e.type, sessionID, errorReason };
+}
+function extractTaskArgs(args) {
+  if (!args || typeof args !== "object")
+    return null;
+  const a = args;
+  const rawDesc = typeof a["description"] === "string" ? a["description"] : null;
+  const rawPrompt = typeof a["prompt"] === "string" ? a["prompt"] : null;
+  const description17 = rawDesc ?? (rawPrompt ? rawPrompt.slice(0, 60) : null);
+  const subagentType = typeof a["subagent_type"] === "string" && a["subagent_type"] || typeof a["agent"] === "string" && a["agent"] || typeof a["agentType"] === "string" && a["agentType"] || typeof a["agent_type"] === "string" && a["agent_type"] || null;
+  if (!description17 && !subagentType)
+    return null;
+  return { description: description17, subagentType };
+}
+function enqueuePendingTask(parentID, entry, now = Date.now()) {
+  const ts = entry.ts ?? now;
+  let bucket = pendingTask.get(parentID);
+  if (!bucket) {
+    if (pendingTask.size >= PENDING_TASK_MAX_PARENTS) {
+      let oldestKey = null;
+      let oldestTs = Number.POSITIVE_INFINITY;
+      for (const [k, v] of pendingTask.entries()) {
+        const headTs = v[0]?.ts ?? Number.POSITIVE_INFINITY;
+        if (headTs < oldestTs) {
+          oldestTs = headTs;
+          oldestKey = k;
+        }
+      }
+      if (oldestKey !== null)
+        pendingTask.delete(oldestKey);
     }
-    if (e.agent && lastAgent === null)
-      lastAgent = e.agent;
+    bucket = [];
+    pendingTask.set(parentID, bucket);
   }
-  const window = events.slice(-o.windowSize).filter((e) => e.type === "tool_call");
-  const toolMap = new Map;
-  for (const t of window) {
-    const cur = toolMap.get(t.tool);
-    const argsExcerpt = clip3(safeJson(t.args), o.excerptLimit);
-    if (cur) {
-      cur.count++;
-      cur.last_ok = t.ok;
-      cur.last_args_excerpt = argsExcerpt;
-      cur.last_ts = t.timestamp;
-    } else {
-      toolMap.set(t.tool, {
-        tool: t.tool,
-        count: 1,
-        last_ok: t.ok,
-        last_args_excerpt: argsExcerpt,
-        last_ts: t.timestamp
-      });
-    }
+  bucket.push({ agent: entry.agent, description: entry.description, ts });
+  while (bucket.length > PENDING_TASK_MAX_PER_PARENT) {
+    bucket.shift();
   }
-  const inflight2 = [...toolMap.values()].sort((a, b) => b.last_ts - a.last_ts);
-  const proposed = window.some((t) => PENDING_CHANGES_TOOLS.has(t.tool));
-  const applied = window.some((t) => APPLY_TOOLS.has(t.tool) && t.ok);
-  const pending_changes_likely = proposed && !applied;
-  let openCount = 0;
-  for (const t of window) {
-    if (SUBTASK_OPEN.test(t.tool))
-      openCount++;
-    else if (SUBTASK_CLOSE.test(t.tool) && openCount > 0)
-      openCount--;
+}
+function dequeuePendingTask(parentID, now = Date.now()) {
+  const bucket = pendingTask.get(parentID);
+  if (!bucket || bucket.length === 0) {
+    if (bucket)
+      pendingTask.delete(parentID);
+    return null;
   }
-  const open_subtasks_likely = openCount > 0;
-  const lastEvent = events[events.length - 1];
-  let reason = "no_completion_marker";
-  if (lastEvent.type === "message" && lastEvent.role === "system" && /\b(suspend(?:ed|ing)?|interrupt(?:ed|ing)?|paused?|pausing)\b/i.test(lastEvent.content) || lastEvent.type === "agent_switch" && /\b(suspend(?:ed|ing)?|paused?)\b/i.test(lastEvent.reason ?? "")) {
-    reason = "explicit_marker";
-  } else if (idleMs >= o.idleMs) {
-    reason = "idle_timeout";
+  while (bucket.length > 0 && now - bucket[0].ts > PENDING_TASK_TTL_MS) {
+    bucket.shift();
   }
-  const summary = renderSummary2({
-    sessionId: meta.id,
-    idleMs,
-    lastUser,
-    lastAgent,
-    inflight: inflight2,
-    pending_changes_likely,
-    open_subtasks_likely,
-    reason
-  });
-  return {
-    last_session_id: meta.id,
-    reason,
-    idle_ms: idleMs,
-    last_user_intent: lastUser,
-    last_agent: lastAgent,
-    inflight_tools: inflight2,
-    pending_changes_likely,
-    open_subtasks_likely,
-    summary
-  };
+  if (bucket.length === 0) {
+    pendingTask.delete(parentID);
+    return null;
+  }
+  const entry = bucket.shift();
+  if (bucket.length === 0)
+    pendingTask.delete(parentID);
+  return entry;
 }
-function renderSummary2(args) {
-  const lines = [];
-  lines.push(`\uD83D\uDCCD 上次会话 ${args.sessionId.slice(0, 8)}… 中断（${formatIdle(args.idleMs)}前 / ${args.reason}）`);
-  if (args.lastUser)
-    lines.push(`▶ 用户上次说："${args.lastUser}"`);
-  if (args.lastAgent)
-    lines.push(`\uD83D\uDC64 当时 agent：${args.lastAgent}`);
-  if (args.inflight.length > 0) {
-    const top = args.inflight.slice(0, 3).map((t) => `${t.tool}×${t.count}${t.last_ok ? "" : "✗"}`);
-    lines.push(`\uD83D\uDD27 最近活跃工具：${top.join(", ")}`);
+function sweepExpiredPendingTasks(now = Date.now()) {
+  let removed = 0;
+  for (const [parentID, bucket] of [...pendingTask.entries()]) {
+    while (bucket.length > 0 && now - bucket[0].ts > PENDING_TASK_TTL_MS) {
+      bucket.shift();
+      removed++;
+    }
+    if (bucket.length === 0)
+      pendingTask.delete(parentID);
   }
-  if (args.pending_changes_likely)
-    lines.push("⚠ 似有暂存区改动尚未 apply（pending-changes propose 后无 apply）");
-  if (args.open_subtasks_likely)
-    lines.push("⚠ 似有子任务未关闭");
-  if (args.inflight.length === 0 && !args.pending_changes_likely && !args.open_subtasks_likely) {
-    lines.push("（未检测到 in-flight 工作；可继续 / 也可不恢复）");
+  return removed;
+}
+function registerInflight(payload, now = Date.now()) {
+  const r = {
+    childID: payload.childID,
+    parentID: payload.parentID,
+    agent: payload.agent,
+    description: payload.description ?? null,
+    startedAt: now,
+    lastBeatAt: now,
+    lastTool: null,
+    pendingCalls: new Map
+  };
+  inflight2.set(payload.childID, r);
+  return r;
+}
+function recordToolBeat(sessionID, tool2, now = Date.now()) {
+  const r = inflight2.get(sessionID);
+  if (!r)
+    return null;
+  r.lastBeatAt = now;
+  r.lastTool = tool2;
+  return r;
+}
+function clearInflight2(sessionID) {
+  const r = inflight2.get(sessionID);
+  if (!r)
+    return null;
+  inflight2.delete(sessionID);
+  return r;
+}
+function pickHeartbeats(now = Date.now()) {
+  const out = [];
+  for (const r of inflight2.values()) {
+    if (now - r.lastBeatAt >= HEARTBEAT_DEBOUNCE_MS)
+      out.push(r);
   }
-  return lines.join(`
-`);
+  return out;
 }
-function formatIdle(ms) {
-  if (ms < 0)
-    return "刚刚";
-  if (ms < 60000)
-    return `${Math.round(ms / 1000)}s`;
-  if (ms < 3600000)
-    return `${Math.round(ms / 60000)}min`;
-  if (ms < 86400000)
-    return `${Math.round(ms / 3600000)}h`;
-  return `${Math.round(ms / 86400000)}d`;
+function fmtElapsed(ms) {
+  const total = Math.max(0, Math.floor(ms / 1000));
+  const m = Math.floor(total / 60);
+  const s = total % 60;
+  return m > 0 ? `${m}m${s.toString().padStart(2, "0")}s` : `${s}s`;
 }
-function clip3(s, max) {
+function titleCase(s) {
   if (!s)
-    return "";
-  if (s.length <= max)
     return s;
-  return s.slice(0, max - 1) + "…";
+  return s.charAt(0).toUpperCase() + s.slice(1);
 }
-function safeJson(v) {
-  try {
-    return JSON.stringify(v);
-  } catch {
-    return String(v);
+function sanitizeDescription(s) {
+  const collapsed = s.replace(/[\r\n\t]+/g, " ").replace(/\s+/g, " ").trim();
+  if (collapsed.length <= DESCRIPTION_MAX_LEN)
+    return collapsed;
+  return collapsed.slice(0, DESCRIPTION_MAX_LEN) + "…";
+}
+function buildStartToast(r) {
+  if (r.agent && r.description) {
+    return {
+      message: `\uD83D\uDE80 ${titleCase(r.agent)} 启动 — ${sanitizeDescription(r.description)}`,
+      variant: "info"
+    };
+  }
+  if (r.agent) {
+    return {
+      message: `\uD83D\uDE80 ${titleCase(r.agent)} 启动`,
+      variant: "info"
+    };
   }
+  return {
+    message: `\uD83D\uDE80 子 session 启动: subagent`,
+    variant: "info"
+  };
 }
-async function scanLastSession(opts = {}) {
-  try {
-    const sessions = await listSessions(opts);
-    if (sessions.length === 0) {
+function buildHeartbeatToast(r, now = Date.now()) {
+  const who = r.agent ?? "subagent";
+  const tool2 = r.lastTool ?? "thinking";
+  return {
+    message: `⏳ ${who} 仍在运行 ${fmtElapsed(now - r.startedAt)} | 当前: ${tool2}`,
+    variant: "info"
+  };
+}
+function buildEndToast(r, type, now = Date.now()) {
+  const elapsed = fmtElapsed(now - r.startedAt);
+  const variant = type === "session.error" || type === "session.deleted" ? "error" : "success";
+  const emoji3 = type === "session.error" ? "❌" : type === "session.deleted" ? "\uD83D\uDDD1️" : "✅";
+  const verb = type === "session.error" ? "失败" : type === "session.deleted" ? "被取消" : "完成";
+  if (r.agent && r.description) {
+    if (type === "session.idle" || type !== "session.error" && type !== "session.deleted") {
       return {
-        ok: true,
-        plan: emptyPlan("no_session")
+        message: `${emoji3} ${titleCase(r.agent)} Task — ${sanitizeDescription(r.description)} (${elapsed})`,
+        variant
       };
     }
-    const exclude = new Set(opts.excludeIds ?? []);
-    const candidates = sessions.filter((s) => !exclude.has(s.id)).sort((a, b) => b.mtime_ms - a.mtime_ms);
-    if (candidates.length === 0) {
-      return { ok: true, plan: emptyPlan("no_session") };
-    }
-    const top = candidates[0];
-    const loaded = await loadSession(top.id, opts);
-    const plan = buildRecoveryPlan(loaded.events, { id: top.id, lastEventAt: top.mtime_ms }, {
-      idleMs: opts.idleMs,
-      windowSize: opts.windowSize,
-      excerptLimit: opts.excerptLimit,
-      now: opts.now
-    });
-    return { ok: true, plan, meta: top };
-  } catch (err) {
     return {
-      ok: false,
-      error: err instanceof Error ? err.message : String(err)
+      message: `${emoji3} ${titleCase(r.agent)} ${verb} — ${sanitizeDescription(r.description)} (${elapsed})`,
+      variant
+    };
+  }
+  if (r.agent) {
+    return {
+      message: `${emoji3} ${titleCase(r.agent)} ${verb} (${elapsed})`,
+      variant
     };
   }
-}
-function emptyPlan(reason) {
   return {
-    last_session_id: null,
-    reason,
-    idle_ms: null,
-    last_user_intent: null,
-    last_agent: null,
-    inflight_tools: [],
-    pending_changes_likely: false,
-    open_subtasks_likely: false,
-    summary: "无历史会话，无需恢复。"
+    message: `${emoji3} subagent ${verb} (${elapsed})`,
+    variant
   };
 }
-function isRecoveryWorthShowing(plan) {
-  if (!plan.last_session_id)
-    return false;
-  if (plan.reason === "no_session")
-    return false;
-  const hasSignal = plan.pending_changes_likely || plan.open_subtasks_likely || plan.inflight_tools.length > 0 || plan.reason === "explicit_marker";
-  return hasSignal;
+function sanitizeInputSummary(toolName, args) {
+  if (!args || typeof args !== "object")
+    return `${toolName} (no args)`;
+  const a = args;
+  const PATH_KEYS = [
+    "path",
+    "file",
+    "filePath",
+    "file_path",
+    "filepath",
+    "target"
+  ];
+  for (const k of PATH_KEYS) {
+    const v = a[k];
+    if (typeof v === "string" && v.length > 0 && v.length <= 200) {
+      return `${toolName} ${v}`;
+    }
+  }
+  const cmd = a["command"];
+  if (typeof cmd === "string" && cmd.length > 0) {
+    const head = cmd.replace(/\s+/g, " ").trim().slice(0, 60);
+    return `${toolName} $ ${head}`;
+  }
+  return `${toolName} (no path)`;
 }
-
-// lib/block-pending.ts
-import { promises as fs19 } from "node:fs";
-import * as path24 from "node:path";
-function blockPendingFilePath(absRoot) {
-  const rd = runtimeDir(absRoot, { ensure: false });
-  return path24.join(rd, "sessions", "autonomous-blocks.ndjson");
+function buildBeforeLogLine(toolName, args, now = Date.now()) {
+  return JSON.stringify({
+    ts: Math.floor(now / 1000),
+    tool: toolName,
+    phase: "before",
+    input_summary: sanitizeInputSummary(toolName, args)
+  });
 }
-function consumeLockPath(absRoot) {
-  return blockPendingFilePath(absRoot) + ".consume.lock";
+function buildAfterLogLine(toolName, ok, durationMs, now = Date.now()) {
+  return JSON.stringify({
+    ts: Math.floor(now / 1000),
+    tool: toolName,
+    phase: "after",
+    ok,
+    duration_ms: durationMs
+  });
 }
-async function scanBlockPending(absRoot, filterSessionId) {
-  const file2 = blockPendingFilePath(absRoot);
-  let raw;
-  try {
-    raw = await fs19.readFile(file2, "utf8");
-  } catch {
-    return [];
-  }
-  if (!raw)
-    return [];
-  const consumed = new Set;
-  const entries = [];
-  for (const line of raw.split(`
-`)) {
-    const trimmed = line.trim();
-    if (!trimmed)
-      continue;
-    let obj;
-    try {
-      obj = JSON.parse(trimmed);
-    } catch {
-      continue;
-    }
-    if (!obj || typeof obj !== "object")
-      continue;
-    if (obj["type"] === "consume") {
-      const sid = obj["sessionId"];
-      const ts = obj["timestamp"];
-      if (typeof sid === "string" && typeof ts === "string") {
-        consumed.add(`${sid}|${ts}`);
-      }
-      continue;
-    }
-    const sessionId = obj["sessionId"];
-    const timestamp = obj["timestamp"];
-    if (typeof sessionId !== "string" || typeof timestamp !== "string")
-      continue;
-    const entry = {
-      sessionId,
-      timestamp,
-      reason: typeof obj["reason"] === "string" ? obj["reason"] : undefined,
-      summary_excerpt: typeof obj["summary_excerpt"] === "string" ? obj["summary_excerpt"] : undefined,
-      consumed_at: typeof obj["consumed_at"] === "string" ? obj["consumed_at"] : undefined
-    };
-    entries.push(entry);
-  }
-  return entries.filter((e) => {
-    if (e.consumed_at)
-      return false;
-    if (consumed.has(`${e.sessionId}|${e.timestamp}`))
-      return false;
-    if (filterSessionId && e.sessionId !== filterSessionId)
-      return false;
-    return true;
-  });
-}
-async function markBlocksConsumed(absRoot, entries) {
-  if (entries.length === 0)
-    return;
-  const file2 = blockPendingFilePath(absRoot);
-  await fs19.mkdir(path24.dirname(file2), { recursive: true });
-  const now = new Date().toISOString();
-  const lines = entries.map((e) => ({
-    type: "consume",
-    sessionId: e.sessionId,
-    timestamp: e.timestamp,
-    consumed_at: now
-  })).map((row) => JSON.stringify(row)).join(`
-`) + `
-`;
-  await withFileLock(consumeLockPath(absRoot), async () => {
-    await fs19.appendFile(file2, lines, "utf8");
+function buildErrorLogLine(errorReason, elapsedMs, now = Date.now()) {
+  return JSON.stringify({
+    ts: Math.floor(now / 1000),
+    phase: "error",
+    ok: false,
+    error_reason: errorReason ?? "(unknown)",
+    elapsed_ms: elapsedMs
   });
 }
-
-// plugins/session-recovery.ts
-var PLUGIN_NAME13 = "session-recovery";
-logLifecycle(PLUGIN_NAME13, "import", {});
-async function processSessionStart(currentSessionId, opts = {}) {
-  if (opts.disabled) {
-    return { ok: true, injected: false, reason: "disabled" };
-  }
-  const excludeIds = new Set(opts.excludeIds ?? []);
-  if (currentSessionId)
-    excludeIds.add(currentSessionId);
-  const r = await scanLastSession({ ...opts, excludeIds: [...excludeIds] });
-  if (!r.ok) {
-    opts.log?.warn?.(`[${PLUGIN_NAME13}] 扫描失败：${r.error}`);
-    return { ok: false, injected: false, reason: "scan_error", error: r.error };
-  }
-  const plan = r.plan;
-  let pendingBlocks = [];
-  if (opts.root) {
-    try {
-      pendingBlocks = await scanBlockPending(opts.root);
-    } catch (err) {
-      opts.log?.warn?.(`[${PLUGIN_NAME13}] scanBlockPending 异常：${err instanceof Error ? err.message : String(err)}`);
-    }
-  }
-  const hasPendingBlocks = pendingBlocks.length > 0;
-  if (!isRecoveryWorthShowing(plan) && !hasPendingBlocks) {
-    return { ok: true, injected: false, plan, reason: "no_signal", pendingBlocks };
-  }
-  const blockPrompt = hasPendingBlocks ? renderBlockPendingPrompt(pendingBlocks) : "";
-  const recoveryPrompt = isRecoveryWorthShowing(plan) ? renderPrompt(plan) : "";
-  const prompt = [blockPrompt, recoveryPrompt].filter((s) => s.length > 0).join(`
-
-`);
-  const injection = { source: "session-recovery", plan, prompt };
-  if (opts.injectRecovery) {
-    try {
-      await opts.injectRecovery(injection);
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      opts.log?.warn?.(`[${PLUGIN_NAME13}] injectRecovery 异常：${msg}`);
-      return { ok: false, injected: false, plan, reason: "inject_error", error: msg, pendingBlocks };
-    }
+async function appendSubagentLog(filePath, line, log7) {
+  try {
+    await fsPromises.mkdir(path23.dirname(filePath), { recursive: true });
+    await fsPromises.appendFile(filePath, line + `
+`, "utf8");
+  } catch (err) {
+    log7?.debug?.("appendSubagentLog 失败（已隔离）", {
+      error: err instanceof Error ? err.message : String(err),
+      file: filePath
+    });
   }
-  if (hasPendingBlocks && opts.root) {
-    try {
-      await markBlocksConsumed(opts.root, pendingBlocks);
-    } catch (err) {
-      opts.log?.warn?.(`[${PLUGIN_NAME13}] markBlocksConsumed 异常：${err instanceof Error ? err.message : String(err)}`);
+}
+function isLogPersistenceEnabled(cwd) {
+  try {
+    const cfg = getCodeforgeConfig({ root: cwd });
+    const runtime = cfg.runtime;
+    if (runtime && typeof runtime === "object") {
+      const v = runtime.subagent_log_persistence;
+      if (v === false)
+        return false;
     }
+    return true;
+  } catch {
+    return true;
   }
-  return { ok: true, injected: true, plan, reason: "ok", pendingBlocks };
 }
-function renderBlockPendingPrompt(entries) {
-  const lines = [];
-  lines.push(`⚠️ **${entries.length} 个未读 BLOCK 通知**（上次 auto 模式 reviewer 阻断、channels 通知失败）：`);
-  lines.push("");
-  entries.forEach((e, i) => {
-    const sidShort = e.sessionId.length > 12 ? e.sessionId.slice(0, 8) + "…" : e.sessionId;
-    const reasonPart = e.reason ? `：${e.reason}` : "";
-    lines.push(`${i + 1}. session \`${sidShort}\` @ ${e.timestamp}${reasonPart}`);
-    if (e.summary_excerpt) {
-      const excerpt = e.summary_excerpt.length > 200 ? e.summary_excerpt.slice(0, 200) + "…" : e.summary_excerpt;
-      lines.push(`   > ${excerpt.replace(/\n/g, `
-   > `)}`);
-    }
-  });
-  lines.push("");
-  lines.push("请按用户偏好处理上述 BLOCK（重派 reviewer / 用户决策），再继续其它工作。");
-  return lines.join(`
-`);
+function normalizeVariant2(raw) {
+  if (raw === "info" || raw === "warning")
+    return "default";
+  return raw;
 }
-function renderPrompt(plan) {
-  const lines = [];
-  lines.push("【会话恢复提示】");
-  lines.push(plan.summary);
-  lines.push("");
-  lines.push("如果用户接下来未明确提及，请优先：");
-  if (plan.pending_changes_likely) {
-    lines.push("  • 询问是否要 review 上次的暂存区改动并 apply / 丢弃");
+async function showToast2(client, payload, log7) {
+  if (typeof client?.tui?.showToast !== "function") {
+    log7?.debug?.("tui.showToast 不可用，noop");
+    return false;
   }
-  if (plan.open_subtasks_likely) {
-    lines.push("  • 询问是否要继续上次未完成的子任务");
+  try {
+    await client.tui.showToast({
+      body: {
+        message: payload.message,
+        variant: normalizeVariant2(payload.variant),
+        duration: payload.duration ?? TOAST_DURATION_MS2,
+        title: payload.title ?? "CodeForge"
+      }
+    });
+    return true;
+  } catch (err) {
+    log7?.warn("tui.showToast 抛错（已隔离）", {
+      error: err instanceof Error ? err.message : String(err)
+    });
+    return false;
   }
-  if (plan.last_user_intent) {
-    lines.push(`  • 确认是否要继续推进上次的目标："${plan.last_user_intent}"`);
+}
+var log7 = makePluginLogger(PLUGIN_NAME10);
+var subtaskHeartbeatServer = async (ctx) => {
+  logLifecycle(PLUGIN_NAME10, "activate", {
+    directory: ctx.directory,
+    intervalMs: HEARTBEAT_INTERVAL_MS2
+  });
+  const client = ctx.client;
+  const cwd = ctx.directory;
+  _setPersistRootForTests2(cwd);
+  try {
+    const restored = await loadParentMap(cwd);
+    if (restored.size > 0) {
+      const entries = [...restored.entries()].map(([childID, v]) => ({
+        childID,
+        parentID: v.parentID,
+        ts: v.ts
+      }));
+      _bulkInjectSessionParentMap2(entries);
+      const cappedOut = _capSessionParentMap2();
+      safeWriteLog(PLUGIN_NAME10, {
+        hook: "activate",
+        type: "parent-map.restore",
+        restored: restored.size,
+        capped: cappedOut
+      });
+    }
+  } catch (err) {
+    log7.warn("loadParentMap 失败（已隔离），降级为空表", {
+      error: err instanceof Error ? err.message : String(err)
+    });
   }
-  if (!plan.pending_changes_likely && !plan.open_subtasks_likely && !plan.last_user_intent) {
-    lines.push("  • 询问是否要恢复上次的工作（信号较弱，可能不需要）");
+  const interval = setInterval(() => {
+    safeAsync(PLUGIN_NAME10, "interval", async () => {
+      const swept = sweepExpiredPendingTasks();
+      if (swept > 0) {
+        safeWriteLog(PLUGIN_NAME10, { hook: "interval", pending_task_swept: swept });
+      }
+      const sweptParents = sweepExpiredSessionParents2();
+      if (sweptParents > 0) {
+        safeWriteLog(PLUGIN_NAME10, { hook: "interval", session_parent_swept: sweptParents });
+      }
+      const beats = pickHeartbeats();
+      if (beats.length === 0)
+        return;
+      for (const r of beats) {
+        const t = buildHeartbeatToast(r);
+        const sent = await showToast2(client, t, log7);
+        safeWriteLog(PLUGIN_NAME10, {
+          hook: "interval",
+          child: r.childID,
+          parent: r.parentID,
+          tool: r.lastTool,
+          elapsed_ms: Date.now() - r.startedAt,
+          toast_sent: sent
+        });
+        r.lastBeatAt = Date.now();
+      }
+    });
+  }, HEARTBEAT_INTERVAL_MS2);
+  if (typeof interval.unref === "function") {
+    interval.unref();
   }
-  lines.push("");
-  lines.push("（如果用户明确开了新话题，本提示可忽略）");
-  return lines.join(`
-`);
-}
-var log8 = makePluginLogger(PLUGIN_NAME13);
-var _lastInjection = null;
-var sessionRecoveryServer = async (ctx) => {
-  logLifecycle(PLUGIN_NAME13, "activate", { directory: ctx.directory });
   return {
     event: async ({ event }) => {
-      await safeAsync(PLUGIN_NAME13, "event", async () => {
-        const e = event;
-        if (!e || typeof e.type !== "string")
-          return;
-        if (e.type !== "session.start")
-          return;
-        const sid = typeof e.properties?.["session_id"] === "string" ? e.properties["session_id"] : undefined;
-        const root = typeof e.properties?.["root"] === "string" ? e.properties["root"] : ctx.directory ?? process.cwd();
-        const r = await processSessionStart(sid, {
-          root,
-          log: log8,
-          injectRecovery: (inj) => {
-            _lastInjection = inj;
+      await safeAsync(PLUGIN_NAME10, "event", async () => {
+        try {
+          if (detectUnparsedParentID(event) && _parentParseFailLogged < PARENT_PARSE_FAIL_MAX_LOG) {
+            _parentParseFailLogged++;
+            log7.warn("session.created 含 parentID 关键字但 extractCreatedChild 解析失败，可能 SDK schema 变更", {
+              sample_count: _parentParseFailLogged,
+              hint: "如频繁出现请检查 plugins/subtask-heartbeat.ts::extractCreatedChild 是否适配新 SDK"
+            });
+            safeWriteLog(PLUGIN_NAME10, {
+              hook: "event",
+              type: "session.created.unparsed-parent-id",
+              sample_count: _parentParseFailLogged
+            });
+          }
+        } catch {}
+        const created = extractCreatedChild(event);
+        if (created) {
+          try {
+            recordSessionParent2(created.childID, created.parentID);
+          } catch (err) {
+            log7.warn("recordSessionParent 抛错（已隔离）", {
+              error: err instanceof Error ? err.message : String(err)
+            });
+          }
+          const pending = dequeuePendingTask(created.parentID);
+          const record2 = registerInflight({
+            childID: created.childID,
+            parentID: created.parentID,
+            agent: pending?.agent ?? created.agent,
+            description: pending?.description ?? null
+          });
+          safeWriteLog(PLUGIN_NAME10, {
+            hook: "event",
+            type: "session.created",
+            child: created.childID,
+            parent: created.parentID,
+            pending_task_matched: pending !== null,
+            agent: record2.agent,
+            description_len: record2.description?.length ?? 0
+          });
+          const startToast = buildStartToast(record2);
+          const sent = await showToast2(client, { ...startToast, duration: START_TOAST_DURATION_MS }, log7);
+          safeWriteLog(PLUGIN_NAME10, {
+            hook: "event",
+            type: "session.created.toast",
+            child: created.childID,
+            toast_sent: sent,
+            start_toast_message: startToast.message
+          });
+          return;
+        }
+        const ended = extractEndedSessionID(event);
+        if (ended) {
+          if (ended.type === "session.deleted") {
+            try {
+              deleteSessionParent2(ended.sessionID);
+            } catch {}
+          }
+          const r = clearInflight2(ended.sessionID);
+          if (r) {
+            const t = buildEndToast(r, ended.type);
+            const sent = await showToast2(client, t, log7);
+            safeWriteLog(PLUGIN_NAME10, {
+              hook: "event",
+              type: ended.type,
+              child: r.childID,
+              elapsed_ms: Date.now() - r.startedAt,
+              toast_sent: sent,
+              end_toast_message: t.message
+            });
+            if (ended.type === "session.error" && isLogPersistenceEnabled(cwd)) {
+              const elapsedMs = Date.now() - r.startedAt;
+              const errLine = buildErrorLogLine(ended.errorReason, elapsedMs);
+              const logFile = subagentLogPath(cwd, r.parentID, r.childID);
+              appendSubagentLog(logFile, errLine, log7);
+              const parentID = r.parentID;
+              const who = r.agent ? titleCase(r.agent) : "subagent";
+              const elapsed = fmtElapsed(elapsedMs);
+              const noticeText = [
+                `❌ ${who} 失败（${elapsed}）`,
+                ended.errorReason ? `错误：${ended.errorReason.slice(0, 150)}` : null,
+                `日志：${logFile}`,
+                `排查：cat "${logFile}" | tail -30`
+              ].filter(Boolean).join(`
+`);
+              const logAdapter = (level, msg, data) => {
+                if (level === "warn" || level === "error") {
+                  log7.warn(`[sendParentNotice] ${msg}`, data);
+                }
+              };
+              (async () => {
+                try {
+                  await sendParentNotice(client, parentID, noticeText, { directory: cwd, log: logAdapter });
+                  safeWriteLog(PLUGIN_NAME10, {
+                    hook: "event",
+                    type: "session.error.notified",
+                    child: r.childID,
+                    parent: r.parentID,
+                    has_error_reason: ended.errorReason !== null,
+                    notice_text_len: noticeText.length
+                  });
+                } catch {}
+              })();
+            }
+            if (ended.type === "session.deleted") {
+              const logFile = subagentLogPath(cwd, r.parentID, r.childID);
+              fsPromises.unlink(logFile).catch(() => {});
+            }
+          }
+        }
+      });
+    },
+    "tool.execute.before": async (input, output) => {
+      const isTaskTool = input?.tool === "task";
+      if (inflight2.size === 0 && !isTaskTool)
+        return;
+      await safeAsync(PLUGIN_NAME10, "tool.execute.before", async () => {
+        if (!input || typeof input.sessionID !== "string" || typeof input.tool !== "string")
+          return;
+        if (isTaskTool) {
+          const args = output?.args ?? null;
+          safeWriteLog(PLUGIN_NAME10, {
+            hook: "tool.execute.before.task",
+            sessionID: input.sessionID,
+            args_keys: args && typeof args === "object" ? Object.keys(args) : null,
+            args_raw: args
+          });
+          const extracted = extractTaskArgs(args);
+          if (extracted) {
+            enqueuePendingTask(input.sessionID, {
+              agent: extracted.subagentType,
+              description: extracted.description
+            });
+            safeWriteLog(PLUGIN_NAME10, {
+              hook: "tool.execute.before.task.enqueued",
+              parent: input.sessionID,
+              agent: extracted.subagentType,
+              description_len: extracted.description?.length ?? 0
+            });
+          }
+        }
+        const rec = inflight2.get(input.sessionID);
+        if (rec) {
+          recordToolBeat(input.sessionID, input.tool);
+          if (!rec.pendingCalls)
+            rec.pendingCalls = new Map;
+          if (typeof input.callID === "string") {
+            rec.pendingCalls.set(input.callID, Date.now());
+          }
+          if (isLogPersistenceEnabled(cwd)) {
+            const args = output?.args ?? null;
+            const line = buildBeforeLogLine(input.tool, args);
+            const file2 = subagentLogPath(cwd, rec.parentID, rec.childID);
+            appendSubagentLog(file2, line, log7);
+          }
+        }
+      });
+    },
+    "tool.execute.after": async (input, _output) => {
+      if (inflight2.size === 0)
+        return;
+      await safeAsync(PLUGIN_NAME10, "tool.execute.after", async () => {
+        if (!input || typeof input.sessionID !== "string" || typeof input.tool !== "string")
+          return;
+        const rec = inflight2.get(input.sessionID);
+        if (!rec)
+          return;
+        let durationMs = 0;
+        if (rec.pendingCalls && typeof input.callID === "string") {
+          const startedAt = rec.pendingCalls.get(input.callID);
+          if (typeof startedAt === "number") {
+            durationMs = Date.now() - startedAt;
+            rec.pendingCalls.delete(input.callID);
+          }
+        }
+        if (isLogPersistenceEnabled(cwd)) {
+          const line = buildAfterLogLine(input.tool, true, durationMs);
+          const file2 = subagentLogPath(cwd, rec.parentID, rec.childID);
+          appendSubagentLog(file2, line, log7);
+        }
+      });
+    }
+  };
+};
+var handler10 = subtaskHeartbeatServer;
+
+// plugins/model-fallback.ts
+var PLUGIN_NAME11 = "model-fallback";
+var SELF_ABORT_WINDOW_MS = 2000;
+var STALE_TTL_MS = 2 * 60 * 60 * 1000;
+var COOLDOWN_SEC = 5 * 60;
+var state = {
+  config: null,
+  configPath: null,
+  warnings: [],
+  error: null
+};
+var sessionFallbacks = new Map;
+var inflightReplay = new Set;
+logLifecycle(PLUGIN_NAME11, "import");
+function loadOnce(root) {
+  if (state.config !== null || state.error !== null)
+    return;
+  const r = loadModelConfigSync({ root });
+  if (r.ok && r.config) {
+    state.config = r.config;
+    state.configPath = r.path ?? null;
+    state.warnings = r.warnings;
+    if (r.warnings.length > 0) {
+      safeWriteLog(PLUGIN_NAME11, { phase: "load.warnings", warnings: r.warnings });
+    }
+  } else {
+    state.error = r.error ?? "unknown_load_error";
+    safeWriteLog(PLUGIN_NAME11, { phase: "load.failed", error: state.error, path: r.path });
+  }
+}
+var MODEL_ERR_PATTERNS = [
+  /rate.?limit/i,
+  /quota/i,
+  /\b(429|503)\b/,
+  /unavailable/i,
+  /context.*length/i,
+  /model.*not.*found/i,
+  /overload/i,
+  /timeout/i
+];
+function looksLikeModelError(message) {
+  if (!message)
+    return false;
+  return MODEL_ERR_PATTERNS.some((re) => re.test(message));
+}
+function buildFallbackMeta(cfg, agent, currentModel) {
+  const r = resolveAgentModel(cfg, agent);
+  if (!r)
+    return null;
+  const idx = r.chain.indexOf(currentModel);
+  const next = idx >= 0 ? r.chain[idx + 1] ?? null : r.chain[0] ?? null;
+  return {
+    agent,
+    current_model: currentModel,
+    resolved: r,
+    next_fallback: next,
+    chain: r.chain,
+    source: r.source
+  };
+}
+function buildSuggestion(meta, errorMessage2) {
+  const head = `⚠️ \`${meta.agent}\` agent 调用 \`${meta.current_model}\` 失败`;
+  const reason = errorMessage2 ? `（${errorMessage2.slice(0, 80)}）` : "";
+  if (!meta.next_fallback) {
+    return `${head}${reason}
+fallback 链已用尽：${meta.chain.join(" → ")}`;
+  }
+  return `${head}${reason}
+建议手动切换：\`/model-switch ${meta.agent} ${meta.next_fallback}\`
+完整链：${meta.chain.join(" → ")}`;
+}
+async function safeToast(client, message, variant) {
+  const c = client;
+  if (typeof c?.tui?.showToast !== "function")
+    return;
+  try {
+    await c.tui.showToast({ body: { message, variant } });
+  } catch {}
+}
+async function runFallback(s, errorMessage2, rc) {
+  const now = Date.now();
+  if (s.inflightReplay || inflightReplay.has(s.sessionID))
+    return false;
+  if (now - s.lastReplayAt < SELF_ABORT_WINDOW_MS && s.lastReplayAt > 0)
+    return false;
+  const resolved = resolveAgentModel(rc.cfg, s.agent);
+  const chain = resolved?.chain ?? [];
+  const plan = planFallback(s, chain, { maxAttempts: rc.maxAttempts, errorMessage: errorMessage2, now });
+  if (!plan) {
+    const meta = buildFallbackMeta(rc.cfg, s.agent, s.currentModel);
+    const suggestion = meta ? buildSuggestion(meta, errorMessage2) : `⚠️ ${s.agent} fallback 链已用尽`;
+    if (rc.notify)
+      await safeToast(rc.client, `fallback 链已用尽（${s.agent}）`, "error");
+    safeWriteLog(PLUGIN_NAME11, { hook: "fallback.exhausted", agent: s.agent, model: s.currentModel, suggestion });
+    return false;
+  }
+  beginPlannedFallback(s, plan, now);
+  const userParts = await fetchLastUserParts(rc.client, s.sessionID, s.directory);
+  if (!userParts || userParts.length === 0) {
+    rollbackFallback(s, plan, { abortFailed: true, now: Date.now() });
+    const meta = buildFallbackMeta(rc.cfg, s.agent, s.currentModel);
+    const suggestion = meta ? buildSuggestion(meta, errorMessage2) : "";
+    if (rc.notify)
+      await safeToast(rc.client, `无法获取上次输入，请手动 /model-switch ${s.agent} ${plan.nextModel}`, "error");
+    safeWriteLog(PLUGIN_NAME11, { hook: "fallback.no_parts", agent: s.agent, suggestion });
+    return false;
+  }
+  const degraded = degradeParts(userParts, plan.tier);
+  beginReplaying(s, Date.now());
+  inflightReplay.add(s.sessionID);
+  let result;
+  try {
+    result = await executeReplay(rc.client, {
+      sessionID: s.sessionID,
+      model: plan.nextModel,
+      agent: s.agent,
+      parts: degraded.parts,
+      directory: s.directory
+    });
+  } finally {
+    inflightReplay.delete(s.sessionID);
+  }
+  if (result.aborted && result.prompted) {
+    commitFallback(s, plan, Date.now());
+    if (rc.notify)
+      await safeToast(rc.client, `已用原始问题切换到 ${plan.nextModel} 重试（${s.agent}）`, "warning");
+    safeWriteLog(PLUGIN_NAME11, {
+      hook: "fallback.committed",
+      agent: s.agent,
+      from: s.originalModel,
+      to: plan.nextModel,
+      tier: plan.tier,
+      dropped: degraded.dropped.length
+    });
+    return true;
+  }
+  rollbackFallback(s, plan, { abortFailed: !result.aborted, now: Date.now() });
+  if (rc.notify)
+    await safeToast(rc.client, `切换 ${plan.nextModel} 失败（${s.agent}），已回滚`, "error");
+  safeWriteLog(PLUGIN_NAME11, {
+    hook: "fallback.rolled_back",
+    agent: s.agent,
+    target: plan.nextModel,
+    aborted: result.aborted,
+    error: result.error
+  });
+  return false;
+}
+function assistantProducedNothing(messages) {
+  if (!Array.isArray(messages) || messages.length === 0)
+    return false;
+  let last = null;
+  for (let i = messages.length - 1;i >= 0; i--) {
+    const m = messages[i];
+    const role = m?.role ?? m?.info?.role;
+    if (role === "assistant") {
+      last = m;
+      break;
+    }
+    if (role === "user") {
+      return true;
+    }
+  }
+  if (!last)
+    return false;
+  const parts = Array.isArray(last.parts) ? last.parts : [];
+  for (const p of parts) {
+    const t = p && typeof p === "object" ? p.type : undefined;
+    if (t === "text" && typeof p.text === "string" && p.text.trim())
+      return false;
+    if (t === "tool" || t === "tool-call" || t === "tool_use")
+      return false;
+  }
+  return true;
+}
+async function fetchMessagesRaw(client, sessionID, directory) {
+  const c = client;
+  const fn = c?.session?.messages;
+  if (typeof fn !== "function")
+    return null;
+  try {
+    const res = await fn({
+      path: { id: sessionID },
+      query: directory ? { directory } : undefined
+    });
+    if (res && typeof res === "object" && "error" in res && res.error)
+      return null;
+    const data = res && typeof res === "object" ? res.data : undefined;
+    return Array.isArray(data) ? data : null;
+  } catch {
+    return null;
+  }
+}
+var modelFallbackServer = async (ctx) => {
+  const log8 = makePluginLogger(PLUGIN_NAME11);
+  const directory = ctx.directory ?? process.cwd();
+  loadOnce(directory);
+  logLifecycle(PLUGIN_NAME11, "activate", {
+    directory: ctx.directory,
+    config_path: state.configPath,
+    config_loaded: state.config !== null,
+    config_error: state.error,
+    agents: state.config ? Object.keys(state.config.agents) : [],
+    runtime_fallback: state.config?.runtime_fallback ?? null
+  });
+  function runtimeEnabled() {
+    const rf = state.config?.runtime_fallback;
+    return rf ? rf.enabled !== false : true;
+  }
+  function eventEnabled(type) {
+    const triggerEvents = state.config?.runtime_fallback?.trigger_events;
+    if (!triggerEvents || triggerEvents.length === 0)
+      return true;
+    return triggerEvents.includes(type);
+  }
+  function notifyEnabled() {
+    const rf = state.config?.runtime_fallback;
+    if (!rf)
+      return true;
+    return rf.notify_on_fallback !== false;
+  }
+  function maxAttempts() {
+    return state.config?.runtime_fallback?.max_fallback_attempts ?? 3;
+  }
+  return {
+    "chat.params": async (input, output) => {
+      await safeAsync(PLUGIN_NAME11, "chat.params", async () => {
+        if (!state.config)
+          return;
+        const agent = input.agent;
+        const modelObj = input.model;
+        if (!agent || !modelObj)
+          return;
+        const providerID = modelObj.providerID ?? "";
+        const modelID = modelObj.modelID ?? modelObj.id ?? "";
+        if (!providerID || !modelID)
+          return;
+        const currentModel = `${providerID}/${modelID}`;
+        const meta = buildFallbackMeta(state.config, agent, currentModel);
+        if (!meta)
+          return;
+        output.options = output.options ?? {};
+        output.options.codeforge_fallback = {
+          chain: meta.chain,
+          next: meta.next_fallback,
+          source: meta.source
+        };
+        const sid = input.sessionID;
+        if (typeof sid === "string" && sid) {
+          markDispatched(sessionFallbacks, {
+            sessionID: sid,
+            agent,
+            model: currentModel,
+            directory
+          });
+        }
+        safeWriteLog(PLUGIN_NAME11, {
+          hook: "chat.params",
+          agent,
+          model: currentModel,
+          chain: meta.chain,
+          next: meta.next_fallback
+        });
+      });
+    },
+    event: async ({ event }) => {
+      await safeAsync(PLUGIN_NAME11, "event", async () => {
+        if (!state.config)
+          return;
+        if (!runtimeEnabled())
+          return;
+        const e = event;
+        if (!e || typeof e.type !== "string")
+          return;
+        sweepStale(sessionFallbacks, STALE_TTL_MS);
+        const rc = {
+          client: ctx.client,
+          directory,
+          cfg: state.config,
+          maxAttempts: maxAttempts(),
+          notify: notifyEnabled()
+        };
+        if (e.type === "message.updated") {
+          const props = e.properties ?? {};
+          const sid = typeof props["sessionID"] === "string" && props["sessionID"] || (() => {
+            const info = props["info"];
+            if (info && typeof info === "object") {
+              const s2 = info.sessionID;
+              if (typeof s2 === "string")
+                return s2;
+            }
+            return "";
+          })();
+          if (sid) {
+            const s = sessionFallbacks.get(sid);
+            if (s && s.awaitingFirstAssistantOutput)
+              markFirstOutput(s);
+          }
+          return;
+        }
+        if (e.type === "session.deleted") {
+          const ended = extractEndedSessionID(event);
+          if (ended)
+            sessionFallbacks.delete(ended.sessionID);
+          return;
+        }
+        if (e.type === "session.error" && eventEnabled("session.error")) {
+          const ended = extractEndedSessionID(event);
+          if (!ended)
+            return;
+          const message = ended.errorReason ?? "";
+          if (!looksLikeModelError(message))
+            return;
+          let s = sessionFallbacks.get(ended.sessionID);
+          if (!s) {
+            const agent = "unknown";
+            const meta = buildFallbackMeta(state.config, agent, "unknown/unknown");
+            const suggestion = meta ? buildSuggestion(meta, message) : `⚠️ ${message}`;
+            log8.warn(`[${PLUGIN_NAME11}] ${suggestion}`);
+            safeWriteLog(PLUGIN_NAME11, { hook: "event.error.no_state", sessionID: ended.sessionID, message });
+            return;
           }
-        });
-        safeWriteLog(PLUGIN_NAME13, {
-          hook: "event",
-          type: "session.start",
-          ok: r.ok,
-          injected: r.injected,
-          reason: r.reason,
-          last_session_id: r.plan?.last_session_id,
-          pending_blocks_count: r.pendingBlocks?.length ?? 0
-        });
-        if (r.injected && r.plan) {
-          log8.info(`[${PLUGIN_NAME13}] 注入恢复提示（last=${r.plan.last_session_id?.slice(0, 8) ?? "?"}, reason=${r.plan.reason}, pending_blocks=${r.pendingBlocks?.length ?? 0}）`);
+          s.lastActiveAt = Date.now();
+          await runFallback(s, message, rc);
+          return;
+        }
+        if (e.type === "session.idle" && eventEnabled("session.idle")) {
+          const ended = extractEndedSessionID(event);
+          if (!ended)
+            return;
+          const s = sessionFallbacks.get(ended.sessionID);
+          if (!s)
+            return;
+          s.lastActiveAt = Date.now();
+          if (s.phase === "pending_output" && s.awaitingFirstAssistantOutput) {
+            const msgs = await fetchMessagesRaw(ctx.client, s.sessionID, s.directory);
+            if (assistantProducedNothing(msgs)) {
+              await runFallback(s, "silent_no_output", rc);
+              return;
+            }
+            markFirstOutput(s);
+          }
+          const recovered = recoverToOriginal(s, COOLDOWN_SEC);
+          if (recovered) {
+            await safeToast(ctx.client, `cooldown 结束，切回主模型 ${s.originalModel}（${s.agent}）`, "info");
+            safeWriteLog(PLUGIN_NAME11, { hook: "fallback.recovered", agent: s.agent, model: s.originalModel });
+          }
+          return;
         }
       });
     }
   };
 };
-var handler13 = sessionRecoveryServer;
+var handler11 = modelFallbackServer;
 
-// plugins/subtask-heartbeat.ts
-import { promises as fsPromises } from "node:fs";
-import * as path25 from "node:path";
-var recordSessionParent2 = recordSessionParent;
-var lookupParentSessionId2 = lookupParentSessionId;
-var deleteSessionParent2 = deleteSessionParent;
-var sweepExpiredSessionParents2 = sweepExpiredSessionParents;
-var _bulkInjectSessionParentMap2 = _bulkInjectSessionParentMap;
-var _capSessionParentMap2 = _capSessionParentMap;
-var _setPersistRootForTests2 = _setPersistRootForTests;
-var PLUGIN_NAME14 = "subtask-heartbeat";
-logLifecycle(PLUGIN_NAME14, "import", {});
-var HEARTBEAT_INTERVAL_MS2 = 30000;
-var HEARTBEAT_DEBOUNCE_MS = 25000;
-var TOAST_DURATION_MS2 = 5000;
-var START_TOAST_DURATION_MS = 2000;
-var PENDING_TASK_TTL_MS = 60000;
-var PENDING_TASK_MAX_PARENTS = 64;
-var PENDING_TASK_MAX_PER_PARENT = 16;
-var DESCRIPTION_MAX_LEN = 60;
-var PARENT_PARSE_FAIL_MAX_LOG = 10;
-var inflight2 = new Map;
-var pendingTask = new Map;
-var _parentParseFailLogged = 0;
-function detectUnparsedParentID(event) {
-  if (!event || typeof event !== "object")
-    return false;
-  const e = event;
-  if (e.type !== "session.created")
-    return false;
-  if (extractCreatedChild(event))
-    return false;
+// plugins/parallel-tool-nudge.ts
+import { readFileSync as readFileSync4, readdirSync as readdirSync2, statSync as statSync3 } from "node:fs";
+import { join as join21 } from "node:path";
+import { homedir as homedir8 } from "node:os";
+var PLUGIN_NAME12 = "parallel-tool-nudge";
+logLifecycle(PLUGIN_NAME12, "import", {});
+var PARALLEL_SAFE_TOOLS = [
+  "read",
+  "repo_map",
+  "webfetch"
+];
+var DEFAULT_AGENT_KEY = "__default__";
+var NUDGE_MAX_LEN2 = 800;
+var agentToolsMap = new Map;
+function defaultReader2(p) {
+  return readFileSync4(p, "utf8");
+}
+function defaultDirReader2(p) {
+  return readdirSync2(p);
+}
+function defaultDirExists2(p) {
   try {
-    const json2 = JSON.stringify(event);
-    return /\bparent[_-]?[iI][dD]\b/.test(json2);
+    return statSync3(p).isDirectory();
   } catch {
     return false;
   }
 }
-function extractCreatedChild(event) {
-  if (!event || typeof event !== "object")
-    return null;
-  const e = event;
-  if (e.type !== "session.created")
+function parseAgentFrontmatter(content) {
+  const fmMatch = /^---\r?\n([\s\S]*?)\r?\n---/.exec(content);
+  if (!fmMatch || !fmMatch[1])
     return null;
-  const info = e.properties?.info;
-  if (!info || typeof info !== "object")
+  let parsed;
+  try {
+    parsed = $parse(fmMatch[1]);
+  } catch {
     return null;
-  const session = info;
-  if (typeof session.id !== "string")
+  }
+  if (!parsed || typeof parsed !== "object")
     return null;
-  if (typeof session.parentID !== "string" || session.parentID === "")
+  const obj = parsed;
+  const name = typeof obj["name"] === "string" ? obj["name"] : null;
+  const tools = obj["allowed_tools"];
+  if (!name || !Array.isArray(tools))
     return null;
-  return { childID: session.id, parentID: session.parentID, agent: null };
-}
-var ERROR_REASON_MAX_LEN = 300;
-function extractErrorReason(props) {
-  function sanitize(s) {
-    const folded = s.replace(/[\r\n\t]+/g, " ").replace(/\s+/g, " ").trim();
-    if (folded.length <= ERROR_REASON_MAX_LEN)
-      return folded;
-    return folded.slice(0, ERROR_REASON_MAX_LEN) + "…";
+  const allowedTools = [];
+  for (const t of tools) {
+    if (typeof t === "string")
+      allowedTools.push(t);
   }
-  function extractFromValue(v) {
-    if (typeof v === "string" && v.trim())
-      return sanitize(v);
-    if (v && typeof v === "object") {
-      const obj = v;
-      const dataMsg = obj["data"] && typeof obj["data"] === "object" ? obj["data"]["message"] : undefined;
-      const fromMsg = obj["message"] ?? dataMsg ?? obj["reason"];
-      if (typeof fromMsg === "string" && fromMsg.trim())
-        return sanitize(fromMsg);
+  return { name, allowedTools };
+}
+function loadAgentToolsMap(rootDir, opts = {}) {
+  const reader = opts.reader ?? defaultReader2;
+  const dirReader = opts.dirReader ?? defaultDirReader2;
+  const dirExists = opts.dirExists ?? defaultDirExists2;
+  const homeAgentsDir = opts.homeAgentsDir ?? join21(homedir8(), ".config", "opencode", "agents");
+  const candidateDirs = [
+    join21(rootDir, ".codeforge", "agents"),
+    join21(rootDir, "agents"),
+    homeAgentsDir
+  ];
+  const result = new Map;
+  const safeSet = new Set(PARALLEL_SAFE_TOOLS);
+  const unionTools = new Set;
+  const log8 = makePluginLogger(PLUGIN_NAME12);
+  for (const dir of candidateDirs) {
+    if (!dirExists(dir))
+      continue;
+    let entries;
+    try {
+      entries = dirReader(dir);
+    } catch (err) {
+      log8.warn(`agents 目录读取失败（已跳过）`, {
+        dir,
+        error: err instanceof Error ? err.message : String(err)
+      });
+      continue;
+    }
+    for (const entry of entries) {
+      if (!entry.endsWith(".md"))
+        continue;
+      const path24 = join21(dir, entry);
+      let content;
+      try {
+        content = reader(path24);
+      } catch (err) {
+        log8.warn(`agent.md 读取失败（已跳过）`, {
+          path: path24,
+          error: err instanceof Error ? err.message : String(err)
+        });
+        continue;
+      }
+      const parsed = parseAgentFrontmatter(content);
+      if (!parsed) {
+        log8.warn(`agent frontmatter 解析失败（已跳过）`, { path: path24 });
+        continue;
+      }
+      if (result.has(parsed.name))
+        continue;
+      const intersect = [];
+      const seen = new Set;
+      for (const t of parsed.allowedTools) {
+        if (safeSet.has(t) && !seen.has(t)) {
+          intersect.push(t);
+          seen.add(t);
+          unionTools.add(t);
+        }
+      }
+      result.set(parsed.name, intersect);
     }
-    return null;
   }
-  const fromError = extractFromValue(props["error"]);
-  if (fromError !== null)
-    return fromError;
-  if (typeof props["message"] === "string" && props["message"].trim())
-    return sanitize(props["message"]);
-  if (typeof props["reason"] === "string" && props["reason"].trim())
-    return sanitize(props["reason"]);
-  if (props["info"] && typeof props["info"] === "object") {
-    const fromInfoError = extractFromValue(props["info"]["error"]);
-    if (fromInfoError !== null)
-      return fromInfoError;
+  result.set(DEFAULT_AGENT_KEY, Array.from(unionTools));
+  return result;
+}
+var sessionAgentMap2 = new Map;
+var SESSION_CAP3 = 200;
+var SESSION_TTL_MS3 = 24 * 60 * 60 * 1000;
+function pruneIfOversize3() {
+  while (sessionAgentMap2.size > SESSION_CAP3) {
+    const oldestKey = sessionAgentMap2.keys().next().value;
+    if (oldestKey === undefined)
+      break;
+    sessionAgentMap2.delete(oldestKey);
   }
-  return null;
 }
-function extractEndedSessionID(event) {
-  if (!event || typeof event !== "object")
-    return null;
-  const e = event;
-  if (typeof e.type !== "string")
-    return null;
-  if (e.type !== "session.idle" && e.type !== "session.deleted" && e.type !== "session.error") {
-    return null;
+function isExpired3(entry, now) {
+  return now - entry.ts > SESSION_TTL_MS3;
+}
+function resolveAgent(sessionID, nowFn = Date.now) {
+  if (!sessionID)
+    return "unknown";
+  const entry = sessionAgentMap2.get(sessionID);
+  if (!entry)
+    return "unknown";
+  const now = nowFn();
+  if (isExpired3(entry, now)) {
+    sessionAgentMap2.delete(sessionID);
+    return "unknown";
+  }
+  sessionAgentMap2.delete(sessionID);
+  sessionAgentMap2.set(sessionID, entry);
+  return entry.agent;
+}
+function renderNudge(agent, tools) {
+  const isUnknown = agent === "unknown";
+  const agentLine = isUnknown ? `You are running as a CodeForge agent (specific agent unknown for this turn).` : `You are the \`${agent}\` agent.`;
+  const toolsBulleted = tools.length > 0 ? tools.map((t) => `    - \`${t}\``).join(`
+`) : `    - (no parallel-safe tools registered for this agent)`;
+  const body = `────────────────────────────────────────
+PARALLEL TOOL CALL DIRECTIVE (auto-injected by parallel-tool-nudge plugin)
+────────────────────────────────────────
+${agentLine} The opencode runtime executes tool calls in your single
+response **truly in parallel** (verified: up to 22 tools in 72ms).
+You MUST batch-emit independent read-only tool calls in one response
+whenever possible.
+
+Parallel-safe tools available to you:
+${toolsBulleted}
+
+Heuristics:
+    - Need to read 3 files? → emit 3 \`read\` calls in ONE response, not 3 sequential turns
+    - Need to read + map? → emit \`read\` + \`repo_map\` in ONE response
+    - DO NOT batch write tools (edit / write / ast_edit / bash)
+    - DO NOT chain reads where each read's path depends on previous read's output
+
+This directive is re-injected every turn — it is not optional advice.
+────────────────────────────────────────`;
+  if (body.length <= NUDGE_MAX_LEN2)
+    return body;
+  return body.slice(0, NUDGE_MAX_LEN2 - 4) + `
+…`;
+}
+var log8 = makePluginLogger(PLUGIN_NAME12);
+var parallelToolNudgeServer = async (ctx) => {
+  try {
+    const loaded = loadAgentToolsMap(ctx.directory ?? process.cwd());
+    agentToolsMap.clear();
+    for (const [k, v] of loaded.entries())
+      agentToolsMap.set(k, v);
+  } catch (err) {
+    log8.warn(`loadAgentToolsMap 失败（plugin 将 no-op）`, {
+      error: err instanceof Error ? err.message : String(err)
+    });
   }
-  const props = e.properties ?? {};
-  const direct = props["sessionID"];
-  const sessionID = typeof direct === "string" && direct ? direct : (() => {
-    const info = props["info"];
-    if (info && typeof info === "object") {
-      const sid = info.id;
-      if (typeof sid === "string" && sid)
-        return sid;
+  const realAgentCount = Math.max(0, agentToolsMap.size - (agentToolsMap.has(DEFAULT_AGENT_KEY) ? 1 : 0));
+  if (realAgentCount === 0) {
+    agentToolsMap.clear();
+    log8.warn(`0 real agents loaded; plugin will be no-op for this session`, {
+      directory: ctx.directory
+    });
+  }
+  const defaultTools = agentToolsMap.get(DEFAULT_AGENT_KEY) ?? [];
+  logLifecycle(PLUGIN_NAME12, "activate", {
+    directory: ctx.directory,
+    real_agents_loaded: realAgentCount,
+    default_tools_union: defaultTools,
+    parallel_safe_whitelist: PARALLEL_SAFE_TOOLS,
+    session_cap: SESSION_CAP3,
+    session_ttl_ms: SESSION_TTL_MS3,
+    no_op: agentToolsMap.size === 0
+  });
+  return {
+    "chat.params": async (input, _output) => {
+      await safeAsync(PLUGIN_NAME12, "chat.params", async () => {
+        if (agentToolsMap.size === 0)
+          return;
+        const sid = input?.sessionID;
+        const agent = input?.agent;
+        if (!sid || !agent)
+          return;
+        sessionAgentMap2.set(sid, { agent, ts: Date.now() });
+        pruneIfOversize3();
+      });
+    },
+    "experimental.chat.system.transform": async (input, output) => {
+      await safeAsync(PLUGIN_NAME12, "experimental.chat.system.transform", async () => {
+        if (agentToolsMap.size === 0)
+          return;
+        if (!output || !Array.isArray(output.system))
+          return;
+        const sid = input?.sessionID;
+        const agent = resolveAgent(sid);
+        const tools = agent !== "unknown" ? agentToolsMap.get(agent) ?? agentToolsMap.get(DEFAULT_AGENT_KEY) ?? [] : agentToolsMap.get(DEFAULT_AGENT_KEY) ?? [];
+        const nudge = renderNudge(agent, tools);
+        output.system.push(nudge);
+        safeWriteLog(PLUGIN_NAME12, {
+          hook: "experimental.chat.system.transform",
+          sessionID: sid,
+          agent,
+          injected_tools: tools,
+          injected_chars: nudge.length,
+          fallback: agent === "unknown"
+        });
+      });
     }
-    return null;
-  })();
-  if (!sessionID)
-    return null;
-  const errorReason = e.type === "session.error" ? extractErrorReason(props) : null;
-  return { type: e.type, sessionID, errorReason };
-}
-function extractTaskArgs(args) {
-  if (!args || typeof args !== "object")
-    return null;
-  const a = args;
-  const rawDesc = typeof a["description"] === "string" ? a["description"] : null;
-  const rawPrompt = typeof a["prompt"] === "string" ? a["prompt"] : null;
-  const description17 = rawDesc ?? (rawPrompt ? rawPrompt.slice(0, 60) : null);
-  const subagentType = typeof a["subagent_type"] === "string" && a["subagent_type"] || typeof a["agent"] === "string" && a["agent"] || typeof a["agentType"] === "string" && a["agentType"] || typeof a["agent_type"] === "string" && a["agent_type"] || null;
-  if (!description17 && !subagentType)
-    return null;
-  return { description: description17, subagentType };
+  };
+};
+var handler12 = parallelToolNudgeServer;
+
+// plugins/pwsh-utf8.ts
+var PLUGIN_NAME13 = "pwsh-utf8";
+logLifecycle(PLUGIN_NAME13, "import", {});
+var PRELUDE = "chcp 65001 *> $null; " + "[Console]::OutputEncoding = [System.Text.UTF8Encoding]::new(); " + "$OutputEncoding = [System.Text.UTF8Encoding]::new(); ";
+function prependUtf8Prelude(command) {
+  if (typeof command !== "string")
+    return;
+  if (command.length === 0)
+    return command;
+  if (/chcp\s+65001/i.test(command))
+    return command;
+  if (/\[Console\]::OutputEncoding\s*=/i.test(command))
+    return command;
+  return PRELUDE + command;
 }
-function enqueuePendingTask(parentID, entry, now = Date.now()) {
-  const ts = entry.ts ?? now;
-  let bucket = pendingTask.get(parentID);
-  if (!bucket) {
-    if (pendingTask.size >= PENDING_TASK_MAX_PARENTS) {
-      let oldestKey = null;
-      let oldestTs = Number.POSITIVE_INFINITY;
-      for (const [k, v] of pendingTask.entries()) {
-        const headTs = v[0]?.ts ?? Number.POSITIVE_INFINITY;
-        if (headTs < oldestTs) {
-          oldestTs = headTs;
-          oldestKey = k;
+var handler13 = async (_ctx4) => {
+  const enabled = process.platform === "win32" && process.env.CODEFORGE_DISABLE_PWSH_UTF8 !== "1";
+  const reason = enabled ? "win32" : process.platform !== "win32" ? "non-win32" : "disabled-by-env";
+  logLifecycle(PLUGIN_NAME13, "activate", { enabled, platform: process.platform, reason });
+  if (!enabled)
+    return {};
+  return {
+    "tool.execute.before": async (input, output) => {
+      await safeAsync(PLUGIN_NAME13, "tool.execute.before", async () => {
+        if (input.tool !== "bash")
+          return;
+        const args = output.args ?? {};
+        const original = args["command"];
+        const next = prependUtf8Prelude(original);
+        if (next !== undefined && next !== original) {
+          args["command"] = next;
+          output.args = args;
+          safeWriteLog(PLUGIN_NAME13, {
+            hook: "tool.execute.before",
+            tool: input.tool,
+            callID: input.callID,
+            sessionID: input.sessionID,
+            injected: true
+          });
         }
-      }
-      if (oldestKey !== null)
-        pendingTask.delete(oldestKey);
+      });
     }
-    bucket = [];
-    pendingTask.set(parentID, bucket);
-  }
-  bucket.push({ agent: entry.agent, description: entry.description, ts });
-  while (bucket.length > PENDING_TASK_MAX_PER_PARENT) {
-    bucket.shift();
-  }
+  };
+};
+
+// lib/event-stream.ts
+import { promises as fs18 } from "node:fs";
+import * as path24 from "node:path";
+async function loadSession(id, opts = {}) {
+  const file2 = resolveSessionFile(id, opts);
+  const raw = await fs18.readFile(file2, "utf8");
+  return parseJsonl(id, raw);
 }
-function dequeuePendingTask(parentID, now = Date.now()) {
-  const bucket = pendingTask.get(parentID);
-  if (!bucket || bucket.length === 0) {
-    if (bucket)
-      pendingTask.delete(parentID);
-    return null;
-  }
-  while (bucket.length > 0 && now - bucket[0].ts > PENDING_TASK_TTL_MS) {
-    bucket.shift();
-  }
-  if (bucket.length === 0) {
-    pendingTask.delete(parentID);
-    return null;
+async function listSessions(opts = {}) {
+  const dir = resolveDir(opts);
+  let entries;
+  try {
+    entries = await fs18.readdir(dir, { withFileTypes: true });
+  } catch (err) {
+    if (err.code === "ENOENT")
+      return [];
+    throw err;
   }
-  const entry = bucket.shift();
-  if (bucket.length === 0)
-    pendingTask.delete(parentID);
-  return entry;
-}
-function sweepExpiredPendingTasks(now = Date.now()) {
-  let removed = 0;
-  for (const [parentID, bucket] of [...pendingTask.entries()]) {
-    while (bucket.length > 0 && now - bucket[0].ts > PENDING_TASK_TTL_MS) {
-      bucket.shift();
-      removed++;
-    }
-    if (bucket.length === 0)
-      pendingTask.delete(parentID);
+  const out = [];
+  for (const e of entries) {
+    if (!e.isFile() || !e.name.endsWith(".jsonl"))
+      continue;
+    const file2 = path24.join(dir, e.name);
+    const id = e.name.replace(/\.jsonl$/, "");
+    try {
+      const stat = await fs18.stat(file2);
+      const headerLine = await readFirstLine(file2);
+      let started_at = stat.birthtimeMs;
+      if (headerLine) {
+        try {
+          const h = JSON.parse(headerLine);
+          if (h.__header && typeof h.started_at === "number") {
+            started_at = h.started_at;
+          }
+        } catch {}
+      }
+      out.push({
+        id,
+        file: file2,
+        started_at,
+        size: stat.size,
+        mtime_ms: stat.mtimeMs
+      });
+    } catch {}
   }
-  return removed;
-}
-function registerInflight(payload, now = Date.now()) {
-  const r = {
-    childID: payload.childID,
-    parentID: payload.parentID,
-    agent: payload.agent,
-    description: payload.description ?? null,
-    startedAt: now,
-    lastBeatAt: now,
-    lastTool: null,
-    pendingCalls: new Map
-  };
-  inflight2.set(payload.childID, r);
-  return r;
+  out.sort((a, b) => b.started_at - a.started_at);
+  return out;
 }
-function recordToolBeat(sessionID, tool2, now = Date.now()) {
-  const r = inflight2.get(sessionID);
-  if (!r)
-    return null;
-  r.lastBeatAt = now;
-  r.lastTool = tool2;
-  return r;
+function resolveDir(opts = {}) {
+  const root = path24.resolve(opts.root ?? process.cwd());
+  return opts.sessions_dir ? path24.resolve(root, opts.sessions_dir) : path24.join(runtimeDir(root), "sessions");
 }
-function clearInflight2(sessionID) {
-  const r = inflight2.get(sessionID);
-  if (!r)
-    return null;
-  inflight2.delete(sessionID);
-  return r;
+function resolveSessionFile(id, opts = {}) {
+  return path24.join(resolveDir(opts), `${id}.jsonl`);
 }
-function pickHeartbeats(now = Date.now()) {
-  const out = [];
-  for (const r of inflight2.values()) {
-    if (now - r.lastBeatAt >= HEARTBEAT_DEBOUNCE_MS)
-      out.push(r);
+function parseJsonl(id, raw) {
+  const events = [];
+  let started_at = null;
+  for (const line of raw.split(/\r?\n/)) {
+    if (!line.trim())
+      continue;
+    let obj;
+    try {
+      obj = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    if (!obj || typeof obj !== "object")
+      continue;
+    if (obj.__header) {
+      const h = obj;
+      if (typeof h.started_at === "number")
+        started_at = h.started_at;
+      continue;
+    }
+    if (isEvent(obj))
+      events.push(obj);
   }
-  return out;
-}
-function fmtElapsed(ms) {
-  const total = Math.max(0, Math.floor(ms / 1000));
-  const m = Math.floor(total / 60);
-  const s = total % 60;
-  return m > 0 ? `${m}m${s.toString().padStart(2, "0")}s` : `${s}s`;
+  return { id, started_at, events };
 }
-function titleCase(s) {
-  if (!s)
-    return s;
-  return s.charAt(0).toUpperCase() + s.slice(1);
+function isEvent(obj) {
+  if (!obj || typeof obj !== "object")
+    return false;
+  const e = obj;
+  return typeof e.id === "string" && typeof e.timestamp === "number" && typeof e.session_id === "string" && typeof e.agent === "string" && typeof e.mode === "string" && typeof e.type === "string" && (e.type === "tool_call" || e.type === "message" || e.type === "agent_switch");
 }
-function sanitizeDescription(s) {
-  const collapsed = s.replace(/[\r\n\t]+/g, " ").replace(/\s+/g, " ").trim();
-  if (collapsed.length <= DESCRIPTION_MAX_LEN)
-    return collapsed;
-  return collapsed.slice(0, DESCRIPTION_MAX_LEN) + "…";
+async function readFirstLine(file2) {
+  const buf = Buffer.alloc(4096);
+  const fh = await fs18.open(file2, "r");
+  try {
+    const { bytesRead } = await fh.read(buf, 0, buf.length, 0);
+    const s = buf.subarray(0, bytesRead).toString("utf8");
+    const nl = s.indexOf(`
+`);
+    return nl === -1 ? s : s.slice(0, nl);
+  } finally {
+    await fh.close();
+  }
 }
-function buildStartToast(r) {
-  if (r.agent && r.description) {
+
+// lib/session-recovery.ts
+var DEFAULT_OPTS = {
+  idleMs: 5 * 60000,
+  windowSize: 30,
+  excerptLimit: 200
+};
+var PENDING_CHANGES_TOOLS = new Set([
+  "pending-changes",
+  "pending_changes",
+  "save_pending_changes",
+  "ast-edit"
+]);
+var APPLY_TOOLS = new Set([
+  "apply_changes",
+  "apply-changes",
+  "pending-changes-apply"
+]);
+var SUBTASK_OPEN = /^subtask[\.\-_:]?(start|create|spawn|run)$/i;
+var SUBTASK_CLOSE = /^subtask[\.\-_:]?(complete|done|close|finish)$/i;
+function buildRecoveryPlan(events, meta = { id: null }, opts = {}) {
+  const cleanOpts = Object.fromEntries(Object.entries(opts).filter(([, v]) => v !== undefined));
+  const o = { ...DEFAULT_OPTS, ...cleanOpts };
+  const now = opts.now ?? Date.now();
+  if (events.length === 0 || !meta.id) {
     return {
-      message: `\uD83D\uDE80 ${titleCase(r.agent)} 启动 — ${sanitizeDescription(r.description)}`,
-      variant: "info"
+      last_session_id: meta.id ?? null,
+      reason: "no_session",
+      idle_ms: null,
+      last_user_intent: null,
+      last_agent: null,
+      inflight_tools: [],
+      pending_changes_likely: false,
+      open_subtasks_likely: false,
+      summary: "无历史会话，无需恢复。"
     };
   }
-  if (r.agent) {
-    return {
-      message: `\uD83D\uDE80 ${titleCase(r.agent)} 启动`,
-      variant: "info"
-    };
+  const lastTs = meta.lastEventAt ?? events[events.length - 1].timestamp;
+  const idleMs = now - lastTs;
+  let lastUser = null;
+  for (let i = events.length - 1;i >= 0; i--) {
+    const e = events[i];
+    if (e.type === "message" && e.role === "user") {
+      lastUser = clip3(e.content, o.excerptLimit);
+      break;
+    }
   }
-  return {
-    message: `\uD83D\uDE80 子 session 启动: subagent`,
-    variant: "info"
-  };
-}
-function buildHeartbeatToast(r, now = Date.now()) {
-  const who = r.agent ?? "subagent";
-  const tool2 = r.lastTool ?? "thinking";
-  return {
-    message: `⏳ ${who} 仍在运行 ${fmtElapsed(now - r.startedAt)} | 当前: ${tool2}`,
-    variant: "info"
-  };
-}
-function buildEndToast(r, type, now = Date.now()) {
-  const elapsed = fmtElapsed(now - r.startedAt);
-  const variant = type === "session.error" || type === "session.deleted" ? "error" : "success";
-  const emoji3 = type === "session.error" ? "❌" : type === "session.deleted" ? "\uD83D\uDDD1️" : "✅";
-  const verb = type === "session.error" ? "失败" : type === "session.deleted" ? "被取消" : "完成";
-  if (r.agent && r.description) {
-    if (type === "session.idle" || type !== "session.error" && type !== "session.deleted") {
-      return {
-        message: `${emoji3} ${titleCase(r.agent)} Task — ${sanitizeDescription(r.description)} (${elapsed})`,
-        variant
-      };
+  let lastAgent = null;
+  for (let i = events.length - 1;i >= 0; i--) {
+    const e = events[i];
+    if (e.type === "agent_switch") {
+      lastAgent = e.to;
+      break;
     }
-    return {
-      message: `${emoji3} ${titleCase(r.agent)} ${verb} — ${sanitizeDescription(r.description)} (${elapsed})`,
-      variant
-    };
+    if (e.agent && lastAgent === null)
+      lastAgent = e.agent;
   }
-  if (r.agent) {
-    return {
-      message: `${emoji3} ${titleCase(r.agent)} ${verb} (${elapsed})`,
-      variant
-    };
+  const window = events.slice(-o.windowSize).filter((e) => e.type === "tool_call");
+  const toolMap = new Map;
+  for (const t of window) {
+    const cur = toolMap.get(t.tool);
+    const argsExcerpt = clip3(safeJson(t.args), o.excerptLimit);
+    if (cur) {
+      cur.count++;
+      cur.last_ok = t.ok;
+      cur.last_args_excerpt = argsExcerpt;
+      cur.last_ts = t.timestamp;
+    } else {
+      toolMap.set(t.tool, {
+        tool: t.tool,
+        count: 1,
+        last_ok: t.ok,
+        last_args_excerpt: argsExcerpt,
+        last_ts: t.timestamp
+      });
+    }
+  }
+  const inflight3 = [...toolMap.values()].sort((a, b) => b.last_ts - a.last_ts);
+  const proposed = window.some((t) => PENDING_CHANGES_TOOLS.has(t.tool));
+  const applied = window.some((t) => APPLY_TOOLS.has(t.tool) && t.ok);
+  const pending_changes_likely = proposed && !applied;
+  let openCount = 0;
+  for (const t of window) {
+    if (SUBTASK_OPEN.test(t.tool))
+      openCount++;
+    else if (SUBTASK_CLOSE.test(t.tool) && openCount > 0)
+      openCount--;
+  }
+  const open_subtasks_likely = openCount > 0;
+  const lastEvent = events[events.length - 1];
+  let reason = "no_completion_marker";
+  if (lastEvent.type === "message" && lastEvent.role === "system" && /\b(suspend(?:ed|ing)?|interrupt(?:ed|ing)?|paused?|pausing)\b/i.test(lastEvent.content) || lastEvent.type === "agent_switch" && /\b(suspend(?:ed|ing)?|paused?)\b/i.test(lastEvent.reason ?? "")) {
+    reason = "explicit_marker";
+  } else if (idleMs >= o.idleMs) {
+    reason = "idle_timeout";
   }
+  const summary = renderSummary2({
+    sessionId: meta.id,
+    idleMs,
+    lastUser,
+    lastAgent,
+    inflight: inflight3,
+    pending_changes_likely,
+    open_subtasks_likely,
+    reason
+  });
   return {
-    message: `${emoji3} subagent ${verb} (${elapsed})`,
-    variant
+    last_session_id: meta.id,
+    reason,
+    idle_ms: idleMs,
+    last_user_intent: lastUser,
+    last_agent: lastAgent,
+    inflight_tools: inflight3,
+    pending_changes_likely,
+    open_subtasks_likely,
+    summary
   };
 }
-function sanitizeInputSummary(toolName, args) {
-  if (!args || typeof args !== "object")
-    return `${toolName} (no args)`;
-  const a = args;
-  const PATH_KEYS = [
-    "path",
-    "file",
-    "filePath",
-    "file_path",
-    "filepath",
-    "target"
-  ];
-  for (const k of PATH_KEYS) {
-    const v = a[k];
-    if (typeof v === "string" && v.length > 0 && v.length <= 200) {
-      return `${toolName} ${v}`;
-    }
+function renderSummary2(args) {
+  const lines = [];
+  lines.push(`\uD83D\uDCCD 上次会话 ${args.sessionId.slice(0, 8)}… 中断（${formatIdle(args.idleMs)}前 / ${args.reason}）`);
+  if (args.lastUser)
+    lines.push(`▶ 用户上次说："${args.lastUser}"`);
+  if (args.lastAgent)
+    lines.push(`\uD83D\uDC64 当时 agent：${args.lastAgent}`);
+  if (args.inflight.length > 0) {
+    const top = args.inflight.slice(0, 3).map((t) => `${t.tool}×${t.count}${t.last_ok ? "" : "✗"}`);
+    lines.push(`\uD83D\uDD27 最近活跃工具：${top.join(", ")}`);
   }
-  const cmd = a["command"];
-  if (typeof cmd === "string" && cmd.length > 0) {
-    const head = cmd.replace(/\s+/g, " ").trim().slice(0, 60);
-    return `${toolName} $ ${head}`;
+  if (args.pending_changes_likely)
+    lines.push("⚠ 似有暂存区改动尚未 apply（pending-changes propose 后无 apply）");
+  if (args.open_subtasks_likely)
+    lines.push("⚠ 似有子任务未关闭");
+  if (args.inflight.length === 0 && !args.pending_changes_likely && !args.open_subtasks_likely) {
+    lines.push("（未检测到 in-flight 工作；可继续 / 也可不恢复）");
   }
-  return `${toolName} (no path)`;
-}
-function buildBeforeLogLine(toolName, args, now = Date.now()) {
-  return JSON.stringify({
-    ts: Math.floor(now / 1000),
-    tool: toolName,
-    phase: "before",
-    input_summary: sanitizeInputSummary(toolName, args)
-  });
+  return lines.join(`
+`);
 }
-function buildAfterLogLine(toolName, ok, durationMs, now = Date.now()) {
-  return JSON.stringify({
-    ts: Math.floor(now / 1000),
-    tool: toolName,
-    phase: "after",
-    ok,
-    duration_ms: durationMs
-  });
+function formatIdle(ms) {
+  if (ms < 0)
+    return "刚刚";
+  if (ms < 60000)
+    return `${Math.round(ms / 1000)}s`;
+  if (ms < 3600000)
+    return `${Math.round(ms / 60000)}min`;
+  if (ms < 86400000)
+    return `${Math.round(ms / 3600000)}h`;
+  return `${Math.round(ms / 86400000)}d`;
 }
-function buildErrorLogLine(errorReason, elapsedMs, now = Date.now()) {
-  return JSON.stringify({
-    ts: Math.floor(now / 1000),
-    phase: "error",
-    ok: false,
-    error_reason: errorReason ?? "(unknown)",
-    elapsed_ms: elapsedMs
-  });
+function clip3(s, max) {
+  if (!s)
+    return "";
+  if (s.length <= max)
+    return s;
+  return s.slice(0, max - 1) + "…";
 }
-async function appendSubagentLog(filePath, line, log9) {
+function safeJson(v) {
   try {
-    await fsPromises.mkdir(path25.dirname(filePath), { recursive: true });
-    await fsPromises.appendFile(filePath, line + `
-`, "utf8");
-  } catch (err) {
-    log9?.debug?.("appendSubagentLog 失败（已隔离）", {
-      error: err instanceof Error ? err.message : String(err),
-      file: filePath
-    });
+    return JSON.stringify(v);
+  } catch {
+    return String(v);
   }
 }
-function isLogPersistenceEnabled(cwd) {
+async function scanLastSession(opts = {}) {
   try {
-    const cfg = getCodeforgeConfig({ root: cwd });
-    const runtime = cfg.runtime;
-    if (runtime && typeof runtime === "object") {
-      const v = runtime.subagent_log_persistence;
-      if (v === false)
-        return false;
+    const sessions = await listSessions(opts);
+    if (sessions.length === 0) {
+      return {
+        ok: true,
+        plan: emptyPlan("no_session")
+      };
     }
-    return true;
-  } catch {
-    return true;
+    const exclude = new Set(opts.excludeIds ?? []);
+    const candidates = sessions.filter((s) => !exclude.has(s.id)).sort((a, b) => b.mtime_ms - a.mtime_ms);
+    if (candidates.length === 0) {
+      return { ok: true, plan: emptyPlan("no_session") };
+    }
+    const top = candidates[0];
+    const loaded = await loadSession(top.id, opts);
+    const plan = buildRecoveryPlan(loaded.events, { id: top.id, lastEventAt: top.mtime_ms }, {
+      idleMs: opts.idleMs,
+      windowSize: opts.windowSize,
+      excerptLimit: opts.excerptLimit,
+      now: opts.now
+    });
+    return { ok: true, plan, meta: top };
+  } catch (err) {
+    return {
+      ok: false,
+      error: err instanceof Error ? err.message : String(err)
+    };
   }
 }
-function normalizeVariant2(raw) {
-  if (raw === "info" || raw === "warning")
-    return "default";
-  return raw;
+function emptyPlan(reason) {
+  return {
+    last_session_id: null,
+    reason,
+    idle_ms: null,
+    last_user_intent: null,
+    last_agent: null,
+    inflight_tools: [],
+    pending_changes_likely: false,
+    open_subtasks_likely: false,
+    summary: "无历史会话，无需恢复。"
+  };
 }
-async function showToast2(client, payload, log9) {
-  if (typeof client?.tui?.showToast !== "function") {
-    log9?.debug?.("tui.showToast 不可用，noop");
+function isRecoveryWorthShowing(plan) {
+  if (!plan.last_session_id)
     return false;
-  }
+  if (plan.reason === "no_session")
+    return false;
+  const hasSignal = plan.pending_changes_likely || plan.open_subtasks_likely || plan.inflight_tools.length > 0 || plan.reason === "explicit_marker";
+  return hasSignal;
+}
+
+// lib/block-pending.ts
+import { promises as fs19 } from "node:fs";
+import * as path25 from "node:path";
+function blockPendingFilePath(absRoot) {
+  const rd = runtimeDir(absRoot, { ensure: false });
+  return path25.join(rd, "sessions", "autonomous-blocks.ndjson");
+}
+function consumeLockPath(absRoot) {
+  return blockPendingFilePath(absRoot) + ".consume.lock";
+}
+async function scanBlockPending(absRoot, filterSessionId) {
+  const file2 = blockPendingFilePath(absRoot);
+  let raw;
   try {
-    await client.tui.showToast({
-      body: {
-        message: payload.message,
-        variant: normalizeVariant2(payload.variant),
-        duration: payload.duration ?? TOAST_DURATION_MS2,
-        title: payload.title ?? "CodeForge"
+    raw = await fs19.readFile(file2, "utf8");
+  } catch {
+    return [];
+  }
+  if (!raw)
+    return [];
+  const consumed = new Set;
+  const entries = [];
+  for (const line of raw.split(`
+`)) {
+    const trimmed = line.trim();
+    if (!trimmed)
+      continue;
+    let obj;
+    try {
+      obj = JSON.parse(trimmed);
+    } catch {
+      continue;
+    }
+    if (!obj || typeof obj !== "object")
+      continue;
+    if (obj["type"] === "consume") {
+      const sid = obj["sessionId"];
+      const ts = obj["timestamp"];
+      if (typeof sid === "string" && typeof ts === "string") {
+        consumed.add(`${sid}|${ts}`);
       }
-    });
-    return true;
-  } catch (err) {
-    log9?.warn("tui.showToast 抛错（已隔离）", {
-      error: err instanceof Error ? err.message : String(err)
-    });
-    return false;
+      continue;
+    }
+    const sessionId = obj["sessionId"];
+    const timestamp = obj["timestamp"];
+    if (typeof sessionId !== "string" || typeof timestamp !== "string")
+      continue;
+    const entry = {
+      sessionId,
+      timestamp,
+      reason: typeof obj["reason"] === "string" ? obj["reason"] : undefined,
+      summary_excerpt: typeof obj["summary_excerpt"] === "string" ? obj["summary_excerpt"] : undefined,
+      consumed_at: typeof obj["consumed_at"] === "string" ? obj["consumed_at"] : undefined
+    };
+    entries.push(entry);
   }
+  return entries.filter((e) => {
+    if (e.consumed_at)
+      return false;
+    if (consumed.has(`${e.sessionId}|${e.timestamp}`))
+      return false;
+    if (filterSessionId && e.sessionId !== filterSessionId)
+      return false;
+    return true;
+  });
 }
-var log9 = makePluginLogger(PLUGIN_NAME14);
-var subtaskHeartbeatServer = async (ctx) => {
-  logLifecycle(PLUGIN_NAME14, "activate", {
-    directory: ctx.directory,
-    intervalMs: HEARTBEAT_INTERVAL_MS2
+async function markBlocksConsumed(absRoot, entries) {
+  if (entries.length === 0)
+    return;
+  const file2 = blockPendingFilePath(absRoot);
+  await fs19.mkdir(path25.dirname(file2), { recursive: true });
+  const now = new Date().toISOString();
+  const lines = entries.map((e) => ({
+    type: "consume",
+    sessionId: e.sessionId,
+    timestamp: e.timestamp,
+    consumed_at: now
+  })).map((row) => JSON.stringify(row)).join(`
+`) + `
+`;
+  await withFileLock(consumeLockPath(absRoot), async () => {
+    await fs19.appendFile(file2, lines, "utf8");
   });
-  const client = ctx.client;
-  const cwd = ctx.directory;
-  _setPersistRootForTests2(cwd);
-  try {
-    const restored = await loadParentMap(cwd);
-    if (restored.size > 0) {
-      const entries = [...restored.entries()].map(([childID, v]) => ({
-        childID,
-        parentID: v.parentID,
-        ts: v.ts
-      }));
-      _bulkInjectSessionParentMap2(entries);
-      const cappedOut = _capSessionParentMap2();
-      safeWriteLog(PLUGIN_NAME14, {
-        hook: "activate",
-        type: "parent-map.restore",
-        restored: restored.size,
-        capped: cappedOut
-      });
+}
+
+// plugins/session-recovery.ts
+var PLUGIN_NAME14 = "session-recovery";
+logLifecycle(PLUGIN_NAME14, "import", {});
+async function processSessionStart(currentSessionId, opts = {}) {
+  if (opts.disabled) {
+    return { ok: true, injected: false, reason: "disabled" };
+  }
+  const excludeIds = new Set(opts.excludeIds ?? []);
+  if (currentSessionId)
+    excludeIds.add(currentSessionId);
+  const r = await scanLastSession({ ...opts, excludeIds: [...excludeIds] });
+  if (!r.ok) {
+    opts.log?.warn?.(`[${PLUGIN_NAME14}] 扫描失败：${r.error}`);
+    return { ok: false, injected: false, reason: "scan_error", error: r.error };
+  }
+  const plan = r.plan;
+  let pendingBlocks = [];
+  if (opts.root) {
+    try {
+      pendingBlocks = await scanBlockPending(opts.root);
+    } catch (err) {
+      opts.log?.warn?.(`[${PLUGIN_NAME14}] scanBlockPending 异常：${err instanceof Error ? err.message : String(err)}`);
+    }
+  }
+  const hasPendingBlocks = pendingBlocks.length > 0;
+  if (!isRecoveryWorthShowing(plan) && !hasPendingBlocks) {
+    return { ok: true, injected: false, plan, reason: "no_signal", pendingBlocks };
+  }
+  const blockPrompt = hasPendingBlocks ? renderBlockPendingPrompt(pendingBlocks) : "";
+  const recoveryPrompt = isRecoveryWorthShowing(plan) ? renderPrompt(plan) : "";
+  const prompt = [blockPrompt, recoveryPrompt].filter((s) => s.length > 0).join(`
+
+`);
+  const injection = { source: "session-recovery", plan, prompt };
+  if (opts.injectRecovery) {
+    try {
+      await opts.injectRecovery(injection);
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      opts.log?.warn?.(`[${PLUGIN_NAME14}] injectRecovery 异常：${msg}`);
+      return { ok: false, injected: false, plan, reason: "inject_error", error: msg, pendingBlocks };
+    }
+  }
+  if (hasPendingBlocks && opts.root) {
+    try {
+      await markBlocksConsumed(opts.root, pendingBlocks);
+    } catch (err) {
+      opts.log?.warn?.(`[${PLUGIN_NAME14}] markBlocksConsumed 异常：${err instanceof Error ? err.message : String(err)}`);
+    }
+  }
+  return { ok: true, injected: true, plan, reason: "ok", pendingBlocks };
+}
+function renderBlockPendingPrompt(entries) {
+  const lines = [];
+  lines.push(`⚠️ **${entries.length} 个未读 BLOCK 通知**（上次 auto 模式 reviewer 阻断、channels 通知失败）：`);
+  lines.push("");
+  entries.forEach((e, i) => {
+    const sidShort = e.sessionId.length > 12 ? e.sessionId.slice(0, 8) + "…" : e.sessionId;
+    const reasonPart = e.reason ? `：${e.reason}` : "";
+    lines.push(`${i + 1}. session \`${sidShort}\` @ ${e.timestamp}${reasonPart}`);
+    if (e.summary_excerpt) {
+      const excerpt = e.summary_excerpt.length > 200 ? e.summary_excerpt.slice(0, 200) + "…" : e.summary_excerpt;
+      lines.push(`   > ${excerpt.replace(/\n/g, `
+   > `)}`);
     }
-  } catch (err) {
-    log9.warn("loadParentMap 失败（已隔离），降级为空表", {
-      error: err instanceof Error ? err.message : String(err)
-    });
+  });
+  lines.push("");
+  lines.push("请按用户偏好处理上述 BLOCK（重派 reviewer / 用户决策），再继续其它工作。");
+  return lines.join(`
+`);
+}
+function renderPrompt(plan) {
+  const lines = [];
+  lines.push("【会话恢复提示】");
+  lines.push(plan.summary);
+  lines.push("");
+  lines.push("如果用户接下来未明确提及，请优先：");
+  if (plan.pending_changes_likely) {
+    lines.push("  • 询问是否要 review 上次的暂存区改动并 apply / 丢弃");
   }
-  const interval = setInterval(() => {
-    safeAsync(PLUGIN_NAME14, "interval", async () => {
-      const swept = sweepExpiredPendingTasks();
-      if (swept > 0) {
-        safeWriteLog(PLUGIN_NAME14, { hook: "interval", pending_task_swept: swept });
-      }
-      const sweptParents = sweepExpiredSessionParents2();
-      if (sweptParents > 0) {
-        safeWriteLog(PLUGIN_NAME14, { hook: "interval", session_parent_swept: sweptParents });
-      }
-      const beats = pickHeartbeats();
-      if (beats.length === 0)
-        return;
-      for (const r of beats) {
-        const t = buildHeartbeatToast(r);
-        const sent = await showToast2(client, t, log9);
-        safeWriteLog(PLUGIN_NAME14, {
-          hook: "interval",
-          child: r.childID,
-          parent: r.parentID,
-          tool: r.lastTool,
-          elapsed_ms: Date.now() - r.startedAt,
-          toast_sent: sent
-        });
-        r.lastBeatAt = Date.now();
-      }
-    });
-  }, HEARTBEAT_INTERVAL_MS2);
-  if (typeof interval.unref === "function") {
-    interval.unref();
+  if (plan.open_subtasks_likely) {
+    lines.push("  • 询问是否要继续上次未完成的子任务");
+  }
+  if (plan.last_user_intent) {
+    lines.push(`  • 确认是否要继续推进上次的目标："${plan.last_user_intent}"`);
+  }
+  if (!plan.pending_changes_likely && !plan.open_subtasks_likely && !plan.last_user_intent) {
+    lines.push("  • 询问是否要恢复上次的工作（信号较弱，可能不需要）");
   }
+  lines.push("");
+  lines.push("（如果用户明确开了新话题，本提示可忽略）");
+  return lines.join(`
+`);
+}
+var log9 = makePluginLogger(PLUGIN_NAME14);
+var _lastInjection = null;
+var sessionRecoveryServer = async (ctx) => {
+  logLifecycle(PLUGIN_NAME14, "activate", { directory: ctx.directory });
   return {
     event: async ({ event }) => {
       await safeAsync(PLUGIN_NAME14, "event", async () => {
-        try {
-          if (detectUnparsedParentID(event) && _parentParseFailLogged < PARENT_PARSE_FAIL_MAX_LOG) {
-            _parentParseFailLogged++;
-            log9.warn("session.created 含 parentID 关键字但 extractCreatedChild 解析失败，可能 SDK schema 变更", {
-              sample_count: _parentParseFailLogged,
-              hint: "如频繁出现请检查 plugins/subtask-heartbeat.ts::extractCreatedChild 是否适配新 SDK"
-            });
-            safeWriteLog(PLUGIN_NAME14, {
-              hook: "event",
-              type: "session.created.unparsed-parent-id",
-              sample_count: _parentParseFailLogged
-            });
-          }
-        } catch {}
-        const created = extractCreatedChild(event);
-        if (created) {
-          try {
-            recordSessionParent2(created.childID, created.parentID);
-          } catch (err) {
-            log9.warn("recordSessionParent 抛错（已隔离）", {
-              error: err instanceof Error ? err.message : String(err)
-            });
-          }
-          const pending = dequeuePendingTask(created.parentID);
-          const record2 = registerInflight({
-            childID: created.childID,
-            parentID: created.parentID,
-            agent: pending?.agent ?? created.agent,
-            description: pending?.description ?? null
-          });
-          safeWriteLog(PLUGIN_NAME14, {
-            hook: "event",
-            type: "session.created",
-            child: created.childID,
-            parent: created.parentID,
-            pending_task_matched: pending !== null,
-            agent: record2.agent,
-            description_len: record2.description?.length ?? 0
-          });
-          const startToast = buildStartToast(record2);
-          const sent = await showToast2(client, { ...startToast, duration: START_TOAST_DURATION_MS }, log9);
-          safeWriteLog(PLUGIN_NAME14, {
-            hook: "event",
-            type: "session.created.toast",
-            child: created.childID,
-            toast_sent: sent,
-            start_toast_message: startToast.message
-          });
-          return;
-        }
-        const ended = extractEndedSessionID(event);
-        if (ended) {
-          if (ended.type === "session.deleted") {
-            try {
-              deleteSessionParent2(ended.sessionID);
-            } catch {}
-          }
-          const r = clearInflight2(ended.sessionID);
-          if (r) {
-            const t = buildEndToast(r, ended.type);
-            const sent = await showToast2(client, t, log9);
-            safeWriteLog(PLUGIN_NAME14, {
-              hook: "event",
-              type: ended.type,
-              child: r.childID,
-              elapsed_ms: Date.now() - r.startedAt,
-              toast_sent: sent,
-              end_toast_message: t.message
-            });
-            if (ended.type === "session.error" && isLogPersistenceEnabled(cwd)) {
-              const elapsedMs = Date.now() - r.startedAt;
-              const errLine = buildErrorLogLine(ended.errorReason, elapsedMs);
-              const logFile = subagentLogPath(cwd, r.parentID, r.childID);
-              appendSubagentLog(logFile, errLine, log9);
-              const parentID = r.parentID;
-              const who = r.agent ? titleCase(r.agent) : "subagent";
-              const elapsed = fmtElapsed(elapsedMs);
-              const noticeText = [
-                `❌ ${who} 失败（${elapsed}）`,
-                ended.errorReason ? `错误：${ended.errorReason.slice(0, 150)}` : null,
-                `日志：${logFile}`,
-                `排查：cat "${logFile}" | tail -30`
-              ].filter(Boolean).join(`
-`);
-              const logAdapter = (level, msg, data) => {
-                if (level === "warn" || level === "error") {
-                  log9.warn(`[sendParentNotice] ${msg}`, data);
-                }
-              };
-              (async () => {
-                try {
-                  await sendParentNotice(client, parentID, noticeText, { directory: cwd, log: logAdapter });
-                  safeWriteLog(PLUGIN_NAME14, {
-                    hook: "event",
-                    type: "session.error.notified",
-                    child: r.childID,
-                    parent: r.parentID,
-                    has_error_reason: ended.errorReason !== null,
-                    notice_text_len: noticeText.length
-                  });
-                } catch {}
-              })();
-            }
-            if (ended.type === "session.deleted") {
-              const logFile = subagentLogPath(cwd, r.parentID, r.childID);
-              fsPromises.unlink(logFile).catch(() => {});
-            }
-          }
-        }
-      });
-    },
-    "tool.execute.before": async (input, output) => {
-      const isTaskTool = input?.tool === "task";
-      if (inflight2.size === 0 && !isTaskTool)
-        return;
-      await safeAsync(PLUGIN_NAME14, "tool.execute.before", async () => {
-        if (!input || typeof input.sessionID !== "string" || typeof input.tool !== "string")
-          return;
-        if (isTaskTool) {
-          const args = output?.args ?? null;
-          safeWriteLog(PLUGIN_NAME14, {
-            hook: "tool.execute.before.task",
-            sessionID: input.sessionID,
-            args_keys: args && typeof args === "object" ? Object.keys(args) : null,
-            args_raw: args
-          });
-          const extracted = extractTaskArgs(args);
-          if (extracted) {
-            enqueuePendingTask(input.sessionID, {
-              agent: extracted.subagentType,
-              description: extracted.description
-            });
-            safeWriteLog(PLUGIN_NAME14, {
-              hook: "tool.execute.before.task.enqueued",
-              parent: input.sessionID,
-              agent: extracted.subagentType,
-              description_len: extracted.description?.length ?? 0
-            });
-          }
-        }
-        const rec = inflight2.get(input.sessionID);
-        if (rec) {
-          recordToolBeat(input.sessionID, input.tool);
-          if (!rec.pendingCalls)
-            rec.pendingCalls = new Map;
-          if (typeof input.callID === "string") {
-            rec.pendingCalls.set(input.callID, Date.now());
-          }
-          if (isLogPersistenceEnabled(cwd)) {
-            const args = output?.args ?? null;
-            const line = buildBeforeLogLine(input.tool, args);
-            const file2 = subagentLogPath(cwd, rec.parentID, rec.childID);
-            appendSubagentLog(file2, line, log9);
-          }
-        }
-      });
-    },
-    "tool.execute.after": async (input, _output) => {
-      if (inflight2.size === 0)
-        return;
-      await safeAsync(PLUGIN_NAME14, "tool.execute.after", async () => {
-        if (!input || typeof input.sessionID !== "string" || typeof input.tool !== "string")
+        const e = event;
+        if (!e || typeof e.type !== "string")
           return;
-        const rec = inflight2.get(input.sessionID);
-        if (!rec)
+        if (e.type !== "session.start")
           return;
-        let durationMs = 0;
-        if (rec.pendingCalls && typeof input.callID === "string") {
-          const startedAt = rec.pendingCalls.get(input.callID);
-          if (typeof startedAt === "number") {
-            durationMs = Date.now() - startedAt;
-            rec.pendingCalls.delete(input.callID);
+        const sid = typeof e.properties?.["session_id"] === "string" ? e.properties["session_id"] : undefined;
+        const root = typeof e.properties?.["root"] === "string" ? e.properties["root"] : ctx.directory ?? process.cwd();
+        const r = await processSessionStart(sid, {
+          root,
+          log: log9,
+          injectRecovery: (inj) => {
+            _lastInjection = inj;
           }
-        }
-        if (isLogPersistenceEnabled(cwd)) {
-          const line = buildAfterLogLine(input.tool, true, durationMs);
-          const file2 = subagentLogPath(cwd, rec.parentID, rec.childID);
-          appendSubagentLog(file2, line, log9);
+        });
+        safeWriteLog(PLUGIN_NAME14, {
+          hook: "event",
+          type: "session.start",
+          ok: r.ok,
+          injected: r.injected,
+          reason: r.reason,
+          last_session_id: r.plan?.last_session_id,
+          pending_blocks_count: r.pendingBlocks?.length ?? 0
+        });
+        if (r.injected && r.plan) {
+          log9.info(`[${PLUGIN_NAME14}] 注入恢复提示（last=${r.plan.last_session_id?.slice(0, 8) ?? "?"}, reason=${r.plan.reason}, pending_blocks=${r.pendingBlocks?.length ?? 0}）`);
         }
       });
     }
   };
 };
-var handler14 = subtaskHeartbeatServer;
+var handler14 = sessionRecoveryServer;
 
 // plugins/subtasks.ts
 import { promises as fs20 } from "node:fs";
@@ -32757,7 +33417,7 @@ import * as https from "node:https";
 // lib/version-injected.ts
 function getInjectedVersion() {
   try {
-    const v = "0.8.17";
+    const v = "0.8.19";
     if (typeof v === "string" && /^\d+\.\d+\.\d+/.test(v)) {
       return v;
     }
@@ -32882,7 +33542,7 @@ function defaultHttpFetcher(url3, timeoutMs) {
 
 // plugins/update-checker.ts
 var PLUGIN_NAME19 = "update-checker";
-var PLUGIN_VERSION = "3.0.0";
+var PLUGIN_VERSION = "4.0.0";
 var _updateCheckStarted = false;
 function getCacheFile() {
   return join27(process.env["CODEFORGE_CACHE_DIR"] ?? join27(homedir9(), ".cache", "codeforge"), "update-check.json");
@@ -32970,12 +33630,32 @@ function spawnAsync(cmd, args, opts = {}) {
 }
 async function resolveNodeBin() {
   const w = process.platform === "win32";
+  if (w) {
+    try {
+      const r = await spawnAsync("where", ["node.exe"], { timeout: 3000, shell: true });
+      if (r.status === 0 && r.stdout.trim())
+        return r.stdout.trim().split(/\r?\n/)[0].trim();
+    } catch {}
+    try {
+      const r = await spawnAsync("where", ["node"], { timeout: 3000, shell: true });
+      if (r.status === 0 && r.stdout.trim())
+        return r.stdout.trim().split(/\r?\n/)[0].trim();
+    } catch {}
+    for (const c of ["C:\\Program Files\\nodejs\\node.exe", "C:\\Program Files (x86)\\nodejs\\node.exe"]) {
+      try {
+        const r = await spawnAsync(c, ["--version"], { timeout: 2000, shell: false });
+        if (r.status === 0)
+          return c;
+      } catch {}
+    }
+    return process.execPath;
+  }
   try {
-    const r = await spawnAsync(w ? "where" : "which", ["node"], { timeout: 3000 });
+    const r = await spawnAsync("which", ["node"], { timeout: 3000 });
     if (r.status === 0 && r.stdout.trim())
       return r.stdout.trim().split(/\r?\n/)[0].trim();
   } catch {}
-  for (const c of w ? ["C:\\Program Files\\nodejs\\node.exe"] : ["/usr/local/bin/node", "/usr/bin/node", "/opt/homebrew/bin/node", "/opt/homebrew/opt/node/bin/node"]) {
+  for (const c of ["/usr/local/bin/node", "/usr/bin/node", "/opt/homebrew/bin/node", "/opt/homebrew/opt/node/bin/node"]) {
     try {
       const r = await spawnAsync(c, ["--version"], { timeout: 2000 });
       if (r.status === 0)
@@ -32986,12 +33666,34 @@ async function resolveNodeBin() {
 }
 async function resolveNpmBin() {
   const w = process.platform === "win32";
+  if (w) {
+    try {
+      const r = await spawnAsync("where", ["npm.cmd"], { timeout: 3000, shell: true });
+      if (r.status === 0 && r.stdout.trim())
+        return r.stdout.trim().split(/\r?\n/)[0].trim();
+    } catch {}
+    try {
+      const r = await spawnAsync("where", ["npm"], { timeout: 3000, shell: true });
+      if (r.status === 0 && r.stdout.trim()) {
+        const p = r.stdout.trim().split(/\r?\n/)[0].trim();
+        return p.replace(/\.cmd$/i, "") + ".cmd";
+      }
+    } catch {}
+    for (const c of ["C:\\Program Files\\nodejs\\npm.cmd", "C:\\Program Files (x86)\\nodejs\\npm.cmd"]) {
+      try {
+        const r = await spawnAsync(c, ["--version"], { timeout: 2000, shell: true });
+        if (r.status === 0)
+          return c;
+      } catch {}
+    }
+    return "npm.cmd";
+  }
   try {
-    const r = await spawnAsync(w ? "where" : "which", ["npm"], { timeout: 3000 });
+    const r = await spawnAsync("which", ["npm"], { timeout: 3000 });
     if (r.status === 0 && r.stdout.trim())
       return r.stdout.trim().split(/\r?\n/)[0].trim();
   } catch {}
-  for (const c of w ? ["C:\\Program Files\\nodejs\\npm.cmd"] : ["/usr/local/bin/npm", "/usr/bin/npm", "/opt/homebrew/bin/npm"]) {
+  for (const c of ["/usr/local/bin/npm", "/usr/bin/npm", "/opt/homebrew/bin/npm"]) {
     try {
       const r = await spawnAsync(c, ["--version"], { timeout: 2000 });
       if (r.status === 0)
@@ -35095,11 +35797,11 @@ var HANDLERS = [
   { name: "codeforge-tools", init: handler7 },
   { name: "discover-spec-suggest", init: handler8 },
   { name: "memories-context", init: handler9 },
-  { name: "model-fallback", init: handler10 },
-  { name: "parallel-tool-nudge", init: handler11 },
-  { name: "pwsh-utf8", init: handler12 },
-  { name: "session-recovery", init: handler13 },
-  { name: "subtask-heartbeat", init: handler14 },
+  { name: "model-fallback", init: handler11 },
+  { name: "parallel-tool-nudge", init: handler12 },
+  { name: "pwsh-utf8", init: handler13 },
+  { name: "session-recovery", init: handler14 },
+  { name: "subtask-heartbeat", init: handler10 },
   { name: "subtasks", init: handler15 },
   { name: "terminal-monitor", init: handler16 },
   { name: "token-manager", init: handler17 },