@andyqiu/codeforge 0.5.0 → 0.5.2

package/dist/index.js

@@ -1112,6 +1112,60 @@ var init_autonomy = __esm(() => {
   };
 });
 
+// lib/decision-parser.ts
+var exports_decision_parser = {};
+__export(exports_decision_parser, {
+  parseDecision: () => parseDecision
+});
+function parseDecision(markdown) {
+  if (!markdown || typeof markdown !== "string") {
+    return { token: null, reason: "empty input" };
+  }
+  const lines = markdown.split(/\r?\n/);
+  let inDecision = false;
+  let firstLine = "";
+  for (const rawLine of lines) {
+    const line = rawLine.trim();
+    if (/^##\s+Decision\s*$/.test(line)) {
+      inDecision = true;
+      continue;
+    }
+    if (!inDecision)
+      continue;
+    if (/^##\s/.test(line))
+      break;
+    if (line === "")
+      continue;
+    if (line.startsWith(">"))
+      continue;
+    if (line.startsWith("<!--"))
+      continue;
+    firstLine = line;
+    break;
+  }
+  if (!inDecision) {
+    return { token: null, reason: "Decision section not found" };
+  }
+  if (!firstLine) {
+    return { token: null, reason: "Decision section is empty" };
+  }
+  const cleaned = firstLine.replace(/`/g, "").trim().toUpperCase();
+  if (VALID_TOKENS.has(cleaned)) {
+    return {
+      token: cleaned,
+      reason: firstLine.length > 200 ? firstLine.slice(0, 200) + "…" : firstLine
+    };
+  }
+  return {
+    token: null,
+    reason: `invalid token: "${firstLine.slice(0, 80)}"`
+  };
+}
+var VALID_TOKENS;
+var init_decision_parser = __esm(() => {
+  VALID_TOKENS = new Set(["APPROVE", "REQUEST_CHANGES", "BLOCK"]);
+});
+
 // node_modules/yaml/dist/nodes/identity.js
 var require_identity = __commonJS((exports) => {
   var ALIAS = Symbol.for("yaml.alias");
@@ -8033,60 +8087,6 @@ var require_public_api = __commonJS((exports) => {
   exports.stringify = stringify;
 });
 
-// lib/decision-parser.ts
-var exports_decision_parser = {};
-__export(exports_decision_parser, {
-  parseDecision: () => parseDecision
-});
-function parseDecision(markdown) {
-  if (!markdown || typeof markdown !== "string") {
-    return { token: null, reason: "empty input" };
-  }
-  const lines = markdown.split(/\r?\n/);
-  let inDecision = false;
-  let firstLine = "";
-  for (const rawLine of lines) {
-    const line = rawLine.trim();
-    if (/^##\s+Decision\s*$/.test(line)) {
-      inDecision = true;
-      continue;
-    }
-    if (!inDecision)
-      continue;
-    if (/^##\s/.test(line))
-      break;
-    if (line === "")
-      continue;
-    if (line.startsWith(">"))
-      continue;
-    if (line.startsWith("<!--"))
-      continue;
-    firstLine = line;
-    break;
-  }
-  if (!inDecision) {
-    return { token: null, reason: "Decision section not found" };
-  }
-  if (!firstLine) {
-    return { token: null, reason: "Decision section is empty" };
-  }
-  const cleaned = firstLine.replace(/`/g, "").trim().toUpperCase();
-  if (VALID_TOKENS.has(cleaned)) {
-    return {
-      token: cleaned,
-      reason: firstLine.length > 200 ? firstLine.slice(0, 200) + "…" : firstLine
-    };
-  }
-  return {
-    token: null,
-    reason: `invalid token: "${firstLine.slice(0, 80)}"`
-  };
-}
-var VALID_TOKENS;
-var init_decision_parser = __esm(() => {
-  VALID_TOKENS = new Set(["APPROVE", "REQUEST_CHANGES", "BLOCK"]);
-});
-
 // lib/auto-debug.ts
 async function runWithAutoDebug(opts) {
   const cfg = { ...DEFAULT_AUTO_DEBUG, ...opts.config ?? {} };
@@ -13571,7 +13571,8 @@ async function runMergeLoop(opts) {
         worktreePath: entry.worktreePath,
         round: loops,
         maxRounds: config.maxReviewLoops,
-        ...lastReviewSummary ? { prevSummary: lastReviewSummary } : {}
+        ...lastReviewSummary ? { prevSummary: lastReviewSummary } : {},
+        ...opts.signal ? { signal: opts.signal } : {}
       }), config.reviewTimeoutMs, `reviewer 第 ${loops} 轮`, opts.signal);
     } catch (err) {
       const e = err;
@@ -13639,7 +13640,8 @@ async function runMergeLoop(opts) {
       const coderResult = await withTimeout2(opts.spawner.spawnCoder({
         sessionId: opts.sessionId,
         ...opts.planId ? { planId: opts.planId } : {},
-        reviewerSummary: reviewResult.summary
+        reviewerSummary: reviewResult.summary,
+        ...opts.signal ? { signal: opts.signal } : {}
       }), config.coderTimeoutMs, `coder round ${loops}`, opts.signal);
       progress("wait_coder", `coder 完成: ${coderResult.ok ? "ok" : "fail"} - ${coderResult.summary}`);
       if (!coderResult.ok) {
@@ -13763,6 +13765,7 @@ var description26 = [
   "- action=status：查询当前 session worktree 状态（任意 agent 可调）",
   "- action=merge：codeforge orchestrator 在用户触发 /merge 后调（**subagent 禁止**）",
   "- action=discard：用户决定放弃当前 session 改动时调",
+  "- action=diff：查看当前 session worktree 相对主仓（baseSha）的改动；stat=true 只看文件列表",
   "**注意**：",
   "- merge 走 review-fix-review 闭环（默认 3 轮）；force=true 跳过 review 直接 squash",
   "- subagent (coder/reviewer/planner) 调 action=merge 会被 Phase 2 guard plugin 拒绝",
@@ -13784,21 +13787,44 @@ var ArgsSchema26 = z27.discriminatedUnion("action", [
   z27.object({
     action: z27.literal("discard"),
     session_id: z27.string().optional().describe("默认当前 session")
+  }),
+  z27.object({
+    action: z27.literal("diff"),
+    session_id: z27.string().optional().describe("默认当前 session"),
+    stat: z27.boolean().optional().describe("true=只显示文件列表+统计，false=完整 diff（默认 false）")
   })
 ]);
 var _ctx = {};
+function __setContext(ctx) {
+  _ctx = ctx;
+}
 function getMainRoot() {
   return _ctx.mainRoot ?? process.cwd();
 }
-async function resolveSessionId(explicit) {
+async function resolveSessionId(explicit, strictWorktreeCheck = false) {
   if (explicit)
     return explicit;
+  const mainRoot = getMainRoot();
+  if (_ctx.currentSessionId) {
+    if (!strictWorktreeCheck || await isSessionIdValid(_ctx.currentSessionId, mainRoot)) {
+      return _ctx.currentSessionId;
+    }
+  }
   if (_ctx.resolveCurrentSessionId) {
     const sid = await _ctx.resolveCurrentSessionId();
-    if (sid)
+    if (sid && (!strictWorktreeCheck || await isSessionIdValid(sid, mainRoot))) {
       return sid;
+    }
+  }
+  throw new Error(strictWorktreeCheck ? "session_merge: 未指定 session_id 且无法反推一个有 active worktree 的 session" + "（plugin 注入的 currentSessionId 和 fallback resolver 都未命中或对应 worktree 非 active）" : "session_merge: 未指定 session_id 且无法反推当前 session（context resolver 缺失）");
+}
+async function isSessionIdValid(sid, mainRoot) {
+  try {
+    const entry = await getSessionWorktree(sid, mainRoot);
+    return entry !== null && entry.status === "active";
+  } catch {
+    return false;
   }
-  throw new Error("session_merge: 未指定 session_id 且无法反推当前 session（context resolver 缺失）");
 }
 async function execute26(input) {
   const parsed = ArgsSchema26.safeParse(input);
@@ -13833,19 +13859,84 @@ async function execute26(input) {
         data: { discarded: true, sessionId }
       };
     }
+    if (args.action === "diff") {
+      const entry = await getSessionWorktree(sessionId, mainRoot);
+      if (!entry) {
+        return { ok: false, action: "diff", error: `session ${sessionId} 没有绑定 worktree` };
+      }
+      const { execFile: execFile4 } = await import("node:child_process");
+      const { promisify: promisify2 } = await import("node:util");
+      const execFileAsync = promisify2(execFile4);
+      const diffArgs = args.stat ? ["diff", "--stat", entry.baseSha] : ["diff", entry.baseSha];
+      let diffOutput = "";
+      let changedFiles = [];
+      try {
+        const { stdout } = await execFileAsync("git", diffArgs, {
+          cwd: entry.worktreePath,
+          maxBuffer: 5242880
+        });
+        diffOutput = stdout;
+        const { stdout: nameOnly } = await execFileAsync("git", ["diff", "--name-only", entry.baseSha], { cwd: entry.worktreePath, maxBuffer: 1048576 });
+        changedFiles = nameOnly.trim().split(`
+`).filter(Boolean);
+      } catch (e) {
+        const msg = e instanceof Error ? e.message : String(e);
+        if (!msg.includes("unknown revision") && !msg.includes("bad object")) {
+          return { ok: false, action: "diff", error: `git diff 失败: ${msg}` };
+        }
+        try {
+          const fallbackArgs = args.stat ? ["diff", "--stat", "HEAD"] : ["diff", "HEAD"];
+          const { stdout } = await execFileAsync("git", fallbackArgs, {
+            cwd: entry.worktreePath,
+            maxBuffer: 5242880
+          });
+          diffOutput = stdout;
+          const { stdout: nameOnly } = await execFileAsync("git", ["diff", "--name-only", "HEAD"], { cwd: entry.worktreePath, maxBuffer: 1048576 });
+          changedFiles = nameOnly.trim().split(`
+`).filter(Boolean);
+        } catch (e2) {
+          return {
+            ok: false,
+            action: "diff",
+            error: `git diff 失败: ${e2 instanceof Error ? e2.message : String(e2)}`
+          };
+        }
+      }
+      return {
+        ok: true,
+        action: "diff",
+        data: {
+          sessionId,
+          worktreePath: entry.worktreePath,
+          branch: entry.branch,
+          baseSha: entry.baseSha,
+          changedFiles,
+          fileCount: changedFiles.length,
+          diff: diffOutput
+        }
+      };
+    }
+    const mergeSessionId = await resolveSessionId(args.session_id, true);
     if (!_ctx.spawner) {
       return {
         ok: false,
         action: "merge",
-        error: "session_merge: SubagentSpawner 未注入（Phase 1 runtime 暂未接 wire-up；" + "Phase 3 commands/merge.md 落地后会通过 __setContext 注入）"
+        error: "session_merge: SubagentSpawner 未注入（plugin activate 失败？" + "应由 plugins/codeforge-tools.ts 的 ProductionSpawner 注入 — ADR:spawner-production-wire-up）"
       };
     }
+    const mergeArgs = args;
+    const sendProgress = _ctx.sendProgress;
     const result = await runMergeLoop({
-      sessionId,
+      sessionId: mergeSessionId,
       mainRoot,
-      ...args.plan_id ? { planId: args.plan_id } : {},
-      ...args.force ? { force: true } : {},
-      spawner: _ctx.spawner
+      ...mergeArgs.plan_id ? { planId: mergeArgs.plan_id } : {},
+      ...mergeArgs.force ? { force: true } : {},
+      spawner: _ctx.spawner,
+      ...sendProgress ? {
+        onProgress: (state, detail) => {
+          Promise.resolve(sendProgress(state, detail)).catch(() => {});
+        }
+      } : {}
     });
     return { ok: true, action: "merge", data: result };
   } catch (err) {
@@ -14184,7 +14275,7 @@ var ArgsSchema28 = z29.object({
   message: "plan_id 与 path 至少传一个"
 });
 var _ctx2 = {};
-function __setContext(ctx) {
+function __setContext2(ctx) {
   _ctx2 = ctx;
 }
 function getStore2() {
@@ -14290,104 +14381,557 @@ async function execute28(input) {
     };
   }
 }
-// lib/codeforge-runtime.ts
-import { promises as fs13 } from "node:fs";
-import * as path16 from "node:path";
-var DEFAULT_RUNTIME = {
-  autonomy: {
-    default_mode: "semi",
-    downgrade_on_risky: true
-  },
-  runtime: {
-    worktree_isolation: true,
-    workspace_snapshot: true,
-    auto_commit: false
-  },
-  tools: {
-    browser: { enabled: false }
-  },
-  context: {
-    condenser_threshold_ratio: 0.7
-  },
-  update: {
-    auto_check_enabled: true,
-    interval_hours: 24,
-    repo: "andy-personal/code-forge",
-    channel: "latest",
-    package: "@andyqiu/codeforge",
-    registry: "https://registry.npmjs.org",
-    auto_install: true,
-    backup_keep: 3
-  }
-};
-function loadRuntimeSync(opts = {}) {
-  const hit = findConfigFileSync(opts);
-  if (!hit) {
-    return emptyResult({ reason: `${CONFIG_FILE} not found (using built-in defaults)` });
-  }
-  const fsSync = __require("node:fs");
-  let raw;
-  try {
-    raw = fsSync.readFileSync(hit, "utf8");
-  } catch (e) {
-    return emptyResult({ path: hit, reason: `read_failed: ${e.message}` });
-  }
-  return parseRuntime(raw, hit);
-}
-async function loadRuntime(opts = {}) {
-  const root = opts.root ?? process.cwd();
-  const abs = path16.resolve(root, opts.file ?? CONFIG_FILE);
-  let raw;
-  try {
-    raw = await fs13.readFile(abs, "utf8");
-  } catch (e) {
-    const code = e.code;
-    if (code === "ENOENT") {
-      return emptyResult({ reason: `${CONFIG_FILE} not found at ${abs} (using built-in defaults)` });
-    }
-    return emptyResult({ path: abs, reason: `read_failed: ${e.message}` });
-  }
-  return parseRuntime(raw, abs);
-}
-function emptyResult(opts) {
-  return {
-    ok: false,
-    path: opts.path ?? null,
-    runtime: cloneDefaults(),
-    warnings: [],
-    error: opts.reason
-  };
-}
-function cloneDefaults() {
-  return JSON.parse(JSON.stringify(DEFAULT_RUNTIME));
-}
-var VALID_CHANNELS = ["stable", "prerelease", "latest", "next", "rc"];
-function parseRuntime(raw, abs) {
-  let root = null;
-  try {
-    const parsed = JSON.parse(raw);
-    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-      root = parsed;
-    }
-  } catch (e) {
-    return emptyResult({ path: abs, reason: `invalid_json: ${e.message}` });
-  }
-  if (!root) {
-    return emptyResult({ path: abs, reason: "config_root_must_be_object" });
-  }
-  const warnings = [];
-  const cfg = cloneDefaults();
-  if (root.autonomy && typeof root.autonomy === "object" && !Array.isArray(root.autonomy)) {
-    const a = root.autonomy;
-    if (a.default_mode !== undefined) {
-      if (a.default_mode === "step" || a.default_mode === "semi" || a.default_mode === "full") {
-        cfg.autonomy.default_mode = a.default_mode;
-      } else {
-        warnings.push(`autonomy.default_mode invalid: ${String(a.default_mode)} (keep ${cfg.autonomy.default_mode})`);
+// lib/opencode-runner.ts
+function makeOpencodeRunner(opts) {
+  const log4 = opts.log ?? (() => {});
+  return async (spec, runCtx) => {
+    const startedAt = Date.now();
+    let childSessionId;
+    try {
+      const created = await opts.client.session.create({
+        body: {
+          parentID: opts.parentSessionID,
+          title: clip3(`subtask:${spec.id}`, 80)
+        },
+        query: opts.directory ? { directory: opts.directory } : undefined
+      });
+      if (created.error || !created.data?.id) {
+        return {
+          ok: false,
+          summary: `session.create 失败：${describe4(created.error) || "no id"}`,
+          status: "failed",
+          error: describe4(created.error) || "session.create 无 id"
+        };
       }
-    }
-    if (a.downgrade_on_risky !== undefined) {
-      if (typeof a.downgrade_on_risky === "boolean") {
+      childSessionId = created.data.id;
+      log4("info", `[opencode-runner] subtask=${spec.id} session=${childSessionId} created`);
+      const promptText = composePromptText(spec);
+      const promptPromise = opts.client.session.prompt({
+        path: { id: childSessionId },
+        body: {
+          agent: spec.agent ?? opts.defaultAgent,
+          parts: [{ type: "text", text: promptText }]
+        },
+        query: opts.directory ? { directory: opts.directory } : undefined
+      });
+      const promptRes = await withTimeout3(Promise.resolve(promptPromise), opts.perTaskTimeoutMs, runCtx.signal);
+      if (promptRes.kind === "timeout") {
+        return {
+          ok: false,
+          summary: `subtask 超时（${opts.perTaskTimeoutMs ?? 0}ms）`,
+          status: "timeout",
+          error: "perTaskTimeoutMs 触发"
+        };
+      }
+      if (promptRes.kind === "aborted") {
+        return {
+          ok: false,
+          summary: "subtask 已被父任务取消",
+          status: "cancelled"
+        };
+      }
+      const r = promptRes.value;
+      if (r.error || !r.data) {
+        return {
+          ok: false,
+          summary: `session.prompt 失败：${describe4(r.error)}`,
+          status: "failed",
+          error: describe4(r.error) || "no data"
+        };
+      }
+      const lastText = pickLastText(r.data.parts ?? []);
+      const finishReason = (r.data.info?.finish ?? "").toLowerCase();
+      const llmError = r.data.info?.error;
+      let status;
+      if (llmError)
+        status = "failed";
+      else if (finishReason === "length")
+        status = "need_review";
+      else
+        status = "success";
+      let changedFiles;
+      try {
+        const diff = await opts.client.session.diff({
+          path: { id: childSessionId },
+          query: opts.directory ? { directory: opts.directory } : undefined
+        });
+        changedFiles = pickDiffFiles(diff.data);
+      } catch (err) {
+        log4("warn", `[opencode-runner] diff 取失败 ${spec.id}`, { error: describe4(err) });
+      }
+      const elapsed = Date.now() - startedAt;
+      const summary = lastText || `subtask ${spec.id} 完成（${elapsed}ms，无文本输出，finish=${finishReason || "unknown"}）`;
+      return {
+        ok: status !== "failed",
+        summary,
+        status,
+        changedFiles,
+        error: llmError ? describe4(llmError) : undefined
+      };
+    } catch (err) {
+      return {
+        ok: false,
+        summary: `runner 抛错：${describe4(err)}`,
+        status: "failed",
+        error: describe4(err)
+      };
+    } finally {
+      if (childSessionId) {
+        try {
+          await opts.client.session.delete({
+            path: { id: childSessionId },
+            query: opts.directory ? { directory: opts.directory } : undefined
+          });
+        } catch (err) {
+          log4("warn", `[opencode-runner] session.delete 失败 ${childSessionId}`, {
+            error: describe4(err)
+          });
+        }
+      }
+    }
+  };
+}
+function composePromptText(spec) {
+  const lines = [spec.description.trim()];
+  if (spec.args && Object.keys(spec.args).length > 0) {
+    lines.push("", "<!-- subtask args -->");
+    for (const [k, v] of Object.entries(spec.args)) {
+      lines.push(`- ${k}: ${safeStringify(v)}`);
+    }
+  }
+  return lines.join(`
+`);
+}
+function pickLastText(parts) {
+  for (let i = parts.length - 1;i >= 0; i--) {
+    const p = parts[i];
+    if (p && p.type === "text" && typeof p.text === "string" && !p.synthetic && !p.ignored) {
+      return p.text.trim();
+    }
+  }
+  return "";
+}
+function pickDiffFiles(diffData) {
+  if (!diffData || typeof diffData !== "object")
+    return;
+  const obj = diffData;
+  if (!Array.isArray(obj.files))
+    return;
+  const out = [];
+  for (const f of obj.files) {
+    if (typeof f === "string")
+      out.push(f);
+    else if (f && typeof f.path === "string") {
+      out.push(f.path);
+    }
+  }
+  return out.length > 0 ? out : undefined;
+}
+async function withTimeout3(p, ms, signal) {
+  if (signal?.aborted)
+    return { kind: "aborted" };
+  if (!ms || ms <= 0) {
+    try {
+      const value = await p;
+      return { kind: "ok", value };
+    } catch (err) {
+      throw err;
+    }
+  }
+  return await new Promise((resolve13, reject) => {
+    let settled = false;
+    const timer = setTimeout(() => {
+      if (settled)
+        return;
+      settled = true;
+      resolve13({ kind: "timeout" });
+    }, ms);
+    const onAbort = () => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer);
+      resolve13({ kind: "aborted" });
+    };
+    signal?.addEventListener("abort", onAbort, { once: true });
+    p.then((value) => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer);
+      signal?.removeEventListener("abort", onAbort);
+      resolve13({ kind: "ok", value });
+    }, (err) => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer);
+      signal?.removeEventListener("abort", onAbort);
+      reject(err);
+    });
+  });
+}
+function describe4(err) {
+  if (!err)
+    return "";
+  if (err instanceof Error)
+    return err.message;
+  if (typeof err === "string")
+    return err;
+  try {
+    return JSON.stringify(err);
+  } catch {
+    return String(err);
+  }
+}
+function safeStringify(v) {
+  try {
+    return JSON.stringify(v);
+  } catch {
+    return String(v);
+  }
+}
+function clip3(s, max) {
+  if (!s)
+    return "";
+  return s.length <= max ? s : s.slice(0, max - 1) + "…";
+}
+async function sendParentNotice(client, sessionID, text, opts = {}) {
+  const log4 = opts.log ?? (() => {});
+  if (!client?.session) {
+    log4("warn", "[sendParentNotice] client.session 不可用，noop");
+    return false;
+  }
+  const sessionAny = client.session;
+  if (typeof sessionAny.promptAsync !== "function") {
+    log4("warn", "[sendParentNotice] promptAsync 不可用（SDK 太老？），noop");
+    return false;
+  }
+  try {
+    const res = await sessionAny.promptAsync({
+      path: { id: sessionID },
+      query: opts.directory ? { directory: opts.directory } : undefined,
+      body: {
+        noReply: true,
+        parts: [
+          {
+            id: makePartId(),
+            type: "text",
+            text,
+            synthetic: false,
+            ignored: false
+          }
+        ]
+      }
+    });
+    if (res && typeof res === "object" && "error" in res && res.error) {
+      log4("warn", "[sendParentNotice] promptAsync 返回 error", { error: res.error });
+      return false;
+    }
+    return true;
+  } catch (err) {
+    log4("warn", "[sendParentNotice] 抛错（已隔离）", {
+      error: err instanceof Error ? err.message : String(err)
+    });
+    return false;
+  }
+}
+
+// lib/spawner-production.ts
+init_decision_parser();
+
+class ProductionSpawner {
+  opts;
+  constructor(opts) {
+    this.opts = opts;
+  }
+  async spawnReviewer(args) {
+    const prompt = buildReviewerPrompt(args);
+    let r;
+    try {
+      r = await this.runSubagent({
+        agentName: this.opts.reviewerAgent ?? "reviewer",
+        prompt,
+        title: `[merge-review] sess=${args.sessionId.slice(0, 8)} r=${args.round}/${args.maxRounds}`,
+        ...args.signal ? { signal: args.signal } : {},
+        timeoutMs: this.opts.reviewerTimeoutMs ?? 600000
+      });
+    } catch (err) {
+      throw err;
+    }
+    if (r.llmError) {
+      return {
+        decision: "REQUEST_CHANGES",
+        summary: `reviewer LLM error: ${describe5(r.llmError)}`
+      };
+    }
+    const parsed = parseDecision(r.text);
+    if (parsed.token === null) {
+      return {
+        decision: "REQUEST_CHANGES",
+        summary: `decision parse failed: ${parsed.reason}
+
+---
+${r.text.slice(0, 800)}`
+      };
+    }
+    return { decision: parsed.token, summary: r.text };
+  }
+  async spawnCoder(args) {
+    const prompt = buildCoderPrompt(args);
+    let r;
+    try {
+      r = await this.runSubagent({
+        agentName: this.opts.coderAgent ?? "coder",
+        prompt,
+        title: `[merge-fix] sess=${args.sessionId.slice(0, 8)}`,
+        ...args.signal ? { signal: args.signal } : {},
+        timeoutMs: this.opts.coderTimeoutMs ?? 1800000
+      });
+    } catch (err) {
+      throw err;
+    }
+    if (r.llmError)
+      return { ok: false, summary: `coder error: ${describe5(r.llmError)}` };
+    if (r.finishReason === "length") {
+      return {
+        ok: false,
+        summary: `coder truncated (finish=length): ${r.text.slice(0, 500)}`
+      };
+    }
+    return { ok: true, summary: r.text || "(coder 无文本输出)" };
+  }
+  async runSubagent(opts) {
+    let childId;
+    try {
+      const created = await this.opts.client.session.create({
+        body: { title: clip4(opts.title, 80) },
+        query: this.opts.directory ? { directory: this.opts.directory } : undefined
+      });
+      if (created.error || !created.data?.id) {
+        throw new Error(`session.create 失败: ${describe5(created.error) || "no id"}`);
+      }
+      childId = created.data.id;
+      const promptPromise = Promise.resolve(this.opts.client.session.prompt({
+        path: { id: childId },
+        body: {
+          agent: opts.agentName,
+          parts: [{ type: "text", text: opts.prompt }]
+        },
+        query: this.opts.directory ? { directory: this.opts.directory } : undefined
+      }));
+      const res = await raceAbortTimeout(promptPromise, opts.signal, opts.timeoutMs, opts.title);
+      if (res.error || !res.data) {
+        throw new Error(`session.prompt 失败: ${describe5(res.error) || "no data"}`);
+      }
+      const text = pickLastText(res.data.parts ?? []);
+      const finishReason = (res.data.info?.finish ?? "").toLowerCase();
+      const llmError = res.data.info?.error;
+      return llmError !== undefined ? { text, finishReason, llmError } : { text, finishReason };
+    } finally {
+      if (childId) {
+        try {
+          await this.opts.client.session.delete({
+            path: { id: childId },
+            query: this.opts.directory ? { directory: this.opts.directory } : undefined
+          });
+        } catch (err) {
+          this.opts.log?.("warn", `[spawner] session.delete 失败 ${childId}`, {
+            err: describe5(err)
+          });
+        }
+      }
+    }
+  }
+}
+async function raceAbortTimeout(p, signal, timeoutMs, label) {
+  if (signal?.aborted) {
+    const e = new Error(`${label} aborted before start`);
+    e.name = "AbortError";
+    throw e;
+  }
+  return await new Promise((resolve13, reject) => {
+    let settled = false;
+    const timer = setTimeout(() => {
+      if (settled)
+        return;
+      settled = true;
+      signal?.removeEventListener("abort", onAbort);
+      reject(new Error(`${label} 超时 (${timeoutMs}ms)`));
+    }, timeoutMs);
+    const onAbort = () => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer);
+      const e = new Error(`${label} aborted by signal`);
+      e.name = "AbortError";
+      reject(e);
+    };
+    signal?.addEventListener("abort", onAbort, { once: true });
+    p.then((v) => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer);
+      signal?.removeEventListener("abort", onAbort);
+      resolve13(v);
+    }, (e) => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer);
+      signal?.removeEventListener("abort", onAbort);
+      reject(e);
+    });
+  });
+}
+function buildReviewerPrompt(args) {
+  const lines = [
+    "[Session Merge Review]",
+    "",
+    `session_id: ${args.sessionId}`,
+    `worktree_path: ${args.worktreePath}`,
+    `base_sha: ${args.baseSha}`
+  ];
+  if (args.planId)
+    lines.push(`plan_id: ${args.planId}`);
+  lines.push(`round: ${args.round}/${args.maxRounds}`, "", "请按 reviewer.md 「worktree-session 审阅」模式执行：", "1. 若有 plan_id → 先 plan_read(plan_id=...) 拿方案", "2. 跑 `git -C <worktree_path> diff <base_sha>..HEAD` 看改动", '3. APPROVE 前必须先调 review_approval(verdict=APPROVE, pendingIds=["session:<session_id>"]) 写审批', "4. 输出 ## Decision 节，首行 APPROVE / REQUEST_CHANGES / BLOCK 之一");
+  if (args.prevSummary) {
+    lines.push("", "## 上一轮 reviewer 意见", "", args.prevSummary, "", "请确认 coder 是否已按意见修复");
+  }
+  return lines.join(`
+`);
+}
+function buildCoderPrompt(args) {
+  const lines = [
+    "[Session Merge Fix]",
+    "",
+    `session_id: ${args.sessionId}`
+  ];
+  if (args.planId)
+    lines.push(`plan_id: ${args.planId}`);
+  lines.push("", "reviewer 在上一轮给出了 REQUEST_CHANGES，意见如下：", "", args.reviewerSummary, "", "请：", "1. 若有 plan_id → 先 plan_read(plan_id=...) 闭合 worktree-guard hard gate", "2. 按 reviewer 意见在当前 session worktree 内修改代码（直接 edit/write）", "3. 修完输出简短摘要（哪些文件改了什么），由下一轮 reviewer 再审");
+  return lines.join(`
+`);
+}
+function describe5(err) {
+  if (err === undefined || err === null)
+    return "";
+  if (err instanceof Error)
+    return err.message;
+  if (typeof err === "string")
+    return err;
+  try {
+    return JSON.stringify(err);
+  } catch {
+    return String(err);
+  }
+}
+function clip4(s, max) {
+  if (!s)
+    return "";
+  return s.length <= max ? s : s.slice(0, max - 1) + "…";
+}
+
+// lib/codeforge-runtime.ts
+import { promises as fs13 } from "node:fs";
+import * as path16 from "node:path";
+var DEFAULT_RUNTIME = {
+  autonomy: {
+    default_mode: "semi",
+    downgrade_on_risky: true
+  },
+  runtime: {
+    worktree_isolation: true,
+    workspace_snapshot: true,
+    auto_commit: false
+  },
+  tools: {
+    browser: { enabled: false }
+  },
+  context: {
+    condenser_threshold_ratio: 0.7
+  },
+  update: {
+    auto_check_enabled: true,
+    interval_hours: 24,
+    repo: "andy-personal/code-forge",
+    channel: "latest",
+    package: "@andyqiu/codeforge",
+    registry: "https://registry.npmjs.org",
+    auto_install: true,
+    backup_keep: 3
+  }
+};
+function loadRuntimeSync(opts = {}) {
+  const hit = findConfigFileSync(opts);
+  if (!hit) {
+    return emptyResult({ reason: `${CONFIG_FILE} not found (using built-in defaults)` });
+  }
+  const fsSync = __require("node:fs");
+  let raw;
+  try {
+    raw = fsSync.readFileSync(hit, "utf8");
+  } catch (e) {
+    return emptyResult({ path: hit, reason: `read_failed: ${e.message}` });
+  }
+  return parseRuntime(raw, hit);
+}
+async function loadRuntime(opts = {}) {
+  const root = opts.root ?? process.cwd();
+  const abs = path16.resolve(root, opts.file ?? CONFIG_FILE);
+  let raw;
+  try {
+    raw = await fs13.readFile(abs, "utf8");
+  } catch (e) {
+    const code = e.code;
+    if (code === "ENOENT") {
+      return emptyResult({ reason: `${CONFIG_FILE} not found at ${abs} (using built-in defaults)` });
+    }
+    return emptyResult({ path: abs, reason: `read_failed: ${e.message}` });
+  }
+  return parseRuntime(raw, abs);
+}
+function emptyResult(opts) {
+  return {
+    ok: false,
+    path: opts.path ?? null,
+    runtime: cloneDefaults(),
+    warnings: [],
+    error: opts.reason
+  };
+}
+function cloneDefaults() {
+  return JSON.parse(JSON.stringify(DEFAULT_RUNTIME));
+}
+var VALID_CHANNELS = ["stable", "prerelease", "latest", "next", "rc"];
+function parseRuntime(raw, abs) {
+  let root = null;
+  try {
+    const parsed = JSON.parse(raw);
+    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+      root = parsed;
+    }
+  } catch (e) {
+    return emptyResult({ path: abs, reason: `invalid_json: ${e.message}` });
+  }
+  if (!root) {
+    return emptyResult({ path: abs, reason: "config_root_must_be_object" });
+  }
+  const warnings = [];
+  const cfg = cloneDefaults();
+  if (root.autonomy && typeof root.autonomy === "object" && !Array.isArray(root.autonomy)) {
+    const a = root.autonomy;
+    if (a.default_mode !== undefined) {
+      if (a.default_mode === "step" || a.default_mode === "semi" || a.default_mode === "full") {
+        cfg.autonomy.default_mode = a.default_mode;
+      } else {
+        warnings.push(`autonomy.default_mode invalid: ${String(a.default_mode)} (keep ${cfg.autonomy.default_mode})`);
+      }
+    }
+    if (a.downgrade_on_risky !== undefined) {
+      if (typeof a.downgrade_on_risky === "boolean") {
         cfg.autonomy.downgrade_on_risky = a.downgrade_on_risky;
       } else {
         warnings.push(`autonomy.downgrade_on_risky must be boolean (kept default)`);
@@ -15043,10 +15587,20 @@ var codeforgeToolsServer = async (ctx) => {
     browser_enabled: browserEnabled,
     config_source: rt.ok ? "codeforge.json" : "built-in"
   });
+  __setContext2({
+    resolveCurrentSessionId: () => process.env["CODEFORGE_SESSION_ID"],
+    resolveMainRoot: () => ctx.directory ?? process.cwd(),
+    store: new PlanStore({ root: ctx.directory ?? process.cwd() })
+  });
+  const spawner = new ProductionSpawner({
+    client: ctx.client,
+    directory: ctx.directory ?? process.cwd(),
+    log: (level, msg, data) => safeWriteLog(PLUGIN_NAME7, { level, msg, data })
+  });
   __setContext({
-    resolveCurrentSessionId: () => process.env["CODEFORGE_SESSION_ID"],
-    resolveMainRoot: () => ctx.directory ?? process.cwd(),
-    store: new PlanStore({ root: ctx.directory ?? process.cwd() })
+    mainRoot: ctx.directory ?? process.cwd(),
+    spawner,
+    resolveCurrentSessionId: () => process.env["CODEFORGE_SESSION_ID"] ?? ""
   });
   const browserTools = browserEnabled ? buildBrowserTools() : {};
   const khWriteTools = buildKhWriteTools();
@@ -15119,8 +15673,8 @@ var codeforgeToolsServer = async (ctx) => {
           ]).describe("编辑类型；不同 action 需要的字段不同"),
           target: z30.string().min(1).describe("目标文件路径（相对 cwd 或绝对）"),
           before_hash: z30.string().optional().describe("操作前的 sha256 hex（强烈建议传，新文件传 null/省略）"),
-          auto_stage: z30.boolean().optional().describe("默认 true：直接调 pending-changes 暂存"),
-          description: z30.string().optional().describe("auto_stage=true 时附带的变更说明"),
+          auto_stage: z30.boolean().optional().describe("已废弃（保留兼容字段）：Phase 5 后 ast_edit 直接写入 session worktree，无需独立 stage"),
+          description: z30.string().optional().describe("可选变更说明（写入 audit log）"),
           anchor: z30.string().optional().describe("anchor 类用：anchor 文本或 regex 源"),
           regex: z30.boolean().optional().describe("anchor 是否按 RegExp 解释，默认 false"),
           occurrence: z30.number().int().min(1).optional().describe("第几次匹配（1-based），默认 1"),
@@ -15254,11 +15808,23 @@ var codeforgeToolsServer = async (ctx) => {
           plan_id: z30.string().optional().describe("关联的 plan_id（reviewer 校验时用），格式 plan-YYYYMMDD-HHmmss-NNN"),
           force: z30.boolean().optional().describe("action=merge 时跳过 review 直接 squash merge（写审计）")
         },
-        async execute(args) {
+        async execute(args, input) {
           return await runSafe("session_merge", async () => {
             const v = projectValidate("session_merge", ArgsSchema26, args);
             if (!v.ok)
               return wrap(JSON.parse(v.output));
+            const sid = input.sessionID;
+            __setContext({
+              mainRoot: ctx.directory ?? process.cwd(),
+              spawner,
+              resolveCurrentSessionId: () => process.env["CODEFORGE_SESSION_ID"] ?? "",
+              ...sid ? { currentSessionId: sid } : {},
+              ...sid ? {
+                sendProgress: async (state, detail) => {
+                  await sendParentNotice(ctx.client, sid, `[merge-loop] ${state}: ${detail}`, ctx.directory ? { directory: ctx.directory } : {});
+                }
+              } : {}
+            });
             const result = await execute26(v.data);
             const meta = {
               title: `session_merge: ${args.action}`,
@@ -16041,7 +16607,7 @@ function formatInjection(query, insights, mode = INJECTION_MODE) {
 }
 var CODEFORGE_CONSTRAINTS = [
   {
-    content: "本会话使用 CodeForge：触发词命中（部署/怎么/为什么/之前/历史等）必须先 smart_search；写代码必须 ast_edit + pending_changes，禁止直接 edit 工作区",
+    content: "本会话使用 CodeForge：触发词命中（部署/怎么/为什么/之前/历史等）必须先 smart_search；写代码直接在 session worktree 内 edit/write/ast_edit（worktree 由 session-worktree-guard 隔离主仓），完成后由用户 /merge 拍板",
     priority: 9
   },
   {
@@ -17840,7 +18406,7 @@ ${toolsBulleted}
 Heuristics:
     - Need to read 3 files? → emit 3 \`read\` calls in ONE response, not 3 sequential turns
     - Need search + map? → emit \`smart_search\` + \`repo_map\` in ONE response
-    - DO NOT batch write tools (ast_edit / pending_changes.apply / bash)
+    - 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.
@@ -18105,7 +18671,7 @@ function buildRecoveryPlan(events, meta = { id: null }, opts = {}) {
   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);
+      lastUser = clip5(e.content, o.excerptLimit);
       break;
     }
   }
@@ -18123,7 +18689,7 @@ function buildRecoveryPlan(events, meta = { id: null }, opts = {}) {
   const toolMap = new Map;
   for (const t of window) {
     const cur = toolMap.get(t.tool);
-    const argsExcerpt = clip3(safeJson(t.args), o.excerptLimit);
+    const argsExcerpt = clip5(safeJson(t.args), o.excerptLimit);
     if (cur) {
       cur.count++;
       cur.last_ok = t.ok;
@@ -18212,7 +18778,7 @@ function formatIdle(ms) {
     return `${Math.round(ms / 3600000)}h`;
   return `${Math.round(ms / 86400000)}d`;
 }
-function clip3(s, max) {
+function clip5(s, max) {
   if (!s)
     return "";
   if (s.length <= max)
@@ -18442,7 +19008,7 @@ async function mergeOneAttempt(r, opts, mergeFns, log10) {
       });
     } catch (commitErr) {
       attempt.ok = false;
-      attempt.message = `commitWorktreeIfDirty 失败：${describe4(commitErr)}`;
+      attempt.message = `commitWorktreeIfDirty 失败：${describe6(commitErr)}`;
       attempt.durationMs = Date.now() - t0;
       return {
         attempt,
@@ -18471,11 +19037,11 @@ async function mergeOneAttempt(r, opts, mergeFns, log10) {
           abortFailed = true;
           log10("error", `[parallel-merge] mergeAbort 失败（仓库可能锁死）`, {
             id: r.id,
-            error: describe4(abortErr)
+            error: describe6(abortErr)
           });
         }
         attempt.ok = false;
-        attempt.message = `mergeCommit 失败：${describe4(commitErr)}`;
+        attempt.message = `mergeCommit 失败：${describe6(commitErr)}`;
         attempt.durationMs = Date.now() - t0;
         return {
           attempt,
@@ -18496,7 +19062,7 @@ async function mergeOneAttempt(r, opts, mergeFns, log10) {
     }
   } catch (err) {
     attempt.ok = false;
-    attempt.message = `mergeWorktrees 异常：${describe4(err)}`;
+    attempt.message = `mergeWorktrees 异常：${describe6(err)}`;
     attempt.durationMs = Date.now() - t0;
     return {
       attempt,
@@ -18639,7 +19205,7 @@ async function safeRemoveWorktree(fn, root, wt, log10, subtaskId) {
     await fn({ root, worktree_path: wt, force: true });
   } catch (err) {
     log10("warn", `[parallel] removeWorktree 失败 ${subtaskId}`, {
-      error: describe4(err),
+      error: describe6(err),
       worktree: wt
     });
   }
@@ -18652,11 +19218,11 @@ async function fireMergeAttempt(cb, attempt, idx, log10) {
   } catch (err) {
     log10("warn", `[parallel] onMergeAttempt 抛错（已隔离）`, {
       id: attempt.subtaskId,
-      error: describe4(err)
+      error: describe6(err)
     });
   }
 }
-function describe4(err) {
+function describe6(err) {
   if (err instanceof Error)
     return err.message;
   if (typeof err === "string")
@@ -18719,7 +19285,7 @@ async function schedule(opts) {
       } catch (err) {
         log10("warn", `[parallel] queue.enqueue 抛错（已隔离）`, {
           id: res.id,
-          error: describe5(err)
+          error: describe7(err)
         });
       }
     }
@@ -18730,7 +19296,7 @@ async function schedule(opts) {
     } catch (err) {
       log10("warn", `[parallel] onSubtaskFinish 抛错（已隔离）`, {
         id: res.id,
-        error: describe5(err)
+        error: describe7(err)
       });
     }
   };
@@ -18744,10 +19310,10 @@ async function schedule(opts) {
         const res2 = {
           id: spec.id,
           ok: false,
-          summary: clamp(`worktree 分配失败：${describe5(err)}`, limit),
+          summary: clamp(`worktree 分配失败：${describe7(err)}`, limit),
           status: "failed",
           duration_ms: now() - subStart,
-          error: describe5(err)
+          error: describe7(err)
         };
         results[i] = res2;
         await fireFinish(i, res2);
@@ -18760,7 +19326,7 @@ async function schedule(opts) {
       } catch (err) {
         log10("warn", `[parallel] onSubtaskStart 抛错（已隔离）`, {
           id: spec.id,
-          error: describe5(err)
+          error: describe7(err)
         });
       }
     }
@@ -18796,11 +19362,11 @@ async function schedule(opts) {
       res = {
         id: spec.id,
         ok: false,
-        summary: clamp(`runSubtask 抛错：${describe5(err)}`, limit),
+        summary: clamp(`runSubtask 抛错：${describe7(err)}`, limit),
         status: isAborted ? globalCtl.signal.aborted ? "cancelled" : "timeout" : "failed",
         duration_ms: now() - subStart,
         worktree: alloc?.path,
-        error: describe5(err)
+        error: describe7(err)
       };
     } finally {
       clearTimeout(perTimer);
@@ -18810,7 +19376,7 @@ async function schedule(opts) {
           await alloc.cleanup();
         } catch (err) {
           log10("warn", `[parallel] worktree 清理失败 ${spec.id}`, {
-            error: describe5(err)
+            error: describe7(err)
           });
         }
       }
@@ -18934,7 +19500,7 @@ function buildDigest(results, conflicts) {
     conflicts
   };
 }
-function describe5(err) {
+function describe7(err) {
   if (err instanceof Error)
     return err.message;
   if (typeof err === "string")
@@ -18966,262 +19532,6 @@ function pickStatus(r, taskAborted, globalAborted) {
   return "failed";
 }
 
-// lib/opencode-runner.ts
-function makeOpencodeRunner(opts) {
-  const log10 = opts.log ?? (() => {});
-  return async (spec, runCtx) => {
-    const startedAt = Date.now();
-    let childSessionId;
-    try {
-      const created = await opts.client.session.create({
-        body: {
-          parentID: opts.parentSessionID,
-          title: clip4(`subtask:${spec.id}`, 80)
-        },
-        query: opts.directory ? { directory: opts.directory } : undefined
-      });
-      if (created.error || !created.data?.id) {
-        return {
-          ok: false,
-          summary: `session.create 失败：${describe6(created.error) || "no id"}`,
-          status: "failed",
-          error: describe6(created.error) || "session.create 无 id"
-        };
-      }
-      childSessionId = created.data.id;
-      log10("info", `[opencode-runner] subtask=${spec.id} session=${childSessionId} created`);
-      const promptText = composePromptText(spec);
-      const promptPromise = opts.client.session.prompt({
-        path: { id: childSessionId },
-        body: {
-          agent: spec.agent ?? opts.defaultAgent,
-          parts: [{ type: "text", text: promptText }]
-        },
-        query: opts.directory ? { directory: opts.directory } : undefined
-      });
-      const promptRes = await withTimeout3(Promise.resolve(promptPromise), opts.perTaskTimeoutMs, runCtx.signal);
-      if (promptRes.kind === "timeout") {
-        return {
-          ok: false,
-          summary: `subtask 超时（${opts.perTaskTimeoutMs ?? 0}ms）`,
-          status: "timeout",
-          error: "perTaskTimeoutMs 触发"
-        };
-      }
-      if (promptRes.kind === "aborted") {
-        return {
-          ok: false,
-          summary: "subtask 已被父任务取消",
-          status: "cancelled"
-        };
-      }
-      const r = promptRes.value;
-      if (r.error || !r.data) {
-        return {
-          ok: false,
-          summary: `session.prompt 失败：${describe6(r.error)}`,
-          status: "failed",
-          error: describe6(r.error) || "no data"
-        };
-      }
-      const lastText = pickLastText(r.data.parts ?? []);
-      const finishReason = (r.data.info?.finish ?? "").toLowerCase();
-      const llmError = r.data.info?.error;
-      let status;
-      if (llmError)
-        status = "failed";
-      else if (finishReason === "length")
-        status = "need_review";
-      else
-        status = "success";
-      let changedFiles;
-      try {
-        const diff = await opts.client.session.diff({
-          path: { id: childSessionId },
-          query: opts.directory ? { directory: opts.directory } : undefined
-        });
-        changedFiles = pickDiffFiles(diff.data);
-      } catch (err) {
-        log10("warn", `[opencode-runner] diff 取失败 ${spec.id}`, { error: describe6(err) });
-      }
-      const elapsed = Date.now() - startedAt;
-      const summary = lastText || `subtask ${spec.id} 完成（${elapsed}ms，无文本输出，finish=${finishReason || "unknown"}）`;
-      return {
-        ok: status !== "failed",
-        summary,
-        status,
-        changedFiles,
-        error: llmError ? describe6(llmError) : undefined
-      };
-    } catch (err) {
-      return {
-        ok: false,
-        summary: `runner 抛错：${describe6(err)}`,
-        status: "failed",
-        error: describe6(err)
-      };
-    } finally {
-      if (childSessionId) {
-        try {
-          await opts.client.session.delete({
-            path: { id: childSessionId },
-            query: opts.directory ? { directory: opts.directory } : undefined
-          });
-        } catch (err) {
-          log10("warn", `[opencode-runner] session.delete 失败 ${childSessionId}`, {
-            error: describe6(err)
-          });
-        }
-      }
-    }
-  };
-}
-function composePromptText(spec) {
-  const lines = [spec.description.trim()];
-  if (spec.args && Object.keys(spec.args).length > 0) {
-    lines.push("", "<!-- subtask args -->");
-    for (const [k, v] of Object.entries(spec.args)) {
-      lines.push(`- ${k}: ${safeStringify(v)}`);
-    }
-  }
-  return lines.join(`
-`);
-}
-function pickLastText(parts) {
-  for (let i = parts.length - 1;i >= 0; i--) {
-    const p = parts[i];
-    if (p && p.type === "text" && typeof p.text === "string" && !p.synthetic && !p.ignored) {
-      return p.text.trim();
-    }
-  }
-  return "";
-}
-function pickDiffFiles(diffData) {
-  if (!diffData || typeof diffData !== "object")
-    return;
-  const obj = diffData;
-  if (!Array.isArray(obj.files))
-    return;
-  const out = [];
-  for (const f of obj.files) {
-    if (typeof f === "string")
-      out.push(f);
-    else if (f && typeof f.path === "string") {
-      out.push(f.path);
-    }
-  }
-  return out.length > 0 ? out : undefined;
-}
-async function withTimeout3(p, ms, signal) {
-  if (signal?.aborted)
-    return { kind: "aborted" };
-  if (!ms || ms <= 0) {
-    try {
-      const value = await p;
-      return { kind: "ok", value };
-    } catch (err) {
-      throw err;
-    }
-  }
-  return await new Promise((resolve15, reject) => {
-    let settled = false;
-    const timer = setTimeout(() => {
-      if (settled)
-        return;
-      settled = true;
-      resolve15({ kind: "timeout" });
-    }, ms);
-    const onAbort = () => {
-      if (settled)
-        return;
-      settled = true;
-      clearTimeout(timer);
-      resolve15({ kind: "aborted" });
-    };
-    signal?.addEventListener("abort", onAbort, { once: true });
-    p.then((value) => {
-      if (settled)
-        return;
-      settled = true;
-      clearTimeout(timer);
-      signal?.removeEventListener("abort", onAbort);
-      resolve15({ kind: "ok", value });
-    }, (err) => {
-      if (settled)
-        return;
-      settled = true;
-      clearTimeout(timer);
-      signal?.removeEventListener("abort", onAbort);
-      reject(err);
-    });
-  });
-}
-function describe6(err) {
-  if (!err)
-    return "";
-  if (err instanceof Error)
-    return err.message;
-  if (typeof err === "string")
-    return err;
-  try {
-    return JSON.stringify(err);
-  } catch {
-    return String(err);
-  }
-}
-function safeStringify(v) {
-  try {
-    return JSON.stringify(v);
-  } catch {
-    return String(v);
-  }
-}
-function clip4(s, max) {
-  if (!s)
-    return "";
-  return s.length <= max ? s : s.slice(0, max - 1) + "…";
-}
-async function sendParentNotice(client, sessionID, text, opts = {}) {
-  const log10 = opts.log ?? (() => {});
-  if (!client?.session) {
-    log10("warn", "[sendParentNotice] client.session 不可用，noop");
-    return false;
-  }
-  const sessionAny = client.session;
-  if (typeof sessionAny.promptAsync !== "function") {
-    log10("warn", "[sendParentNotice] promptAsync 不可用（SDK 太老？），noop");
-    return false;
-  }
-  try {
-    const res = await sessionAny.promptAsync({
-      path: { id: sessionID },
-      query: opts.directory ? { directory: opts.directory } : undefined,
-      body: {
-        noReply: true,
-        parts: [
-          {
-            id: makePartId(),
-            type: "text",
-            text,
-            synthetic: false,
-            ignored: false
-          }
-        ]
-      }
-    });
-    if (res && typeof res === "object" && "error" in res && res.error) {
-      log10("warn", "[sendParentNotice] promptAsync 返回 error", { error: res.error });
-      return false;
-    }
-    return true;
-  } catch (err) {
-    log10("warn", "[sendParentNotice] 抛错（已隔离）", {
-      error: err instanceof Error ? err.message : String(err)
-    });
-    return false;
-  }
-}
-
 // plugins/subtasks.ts
 init_autonomy();
 
@@ -19254,11 +19564,11 @@ async function decomposeTask(description29, opts) {
   let childSessionId;
   try {
     const created = await opts.client.session.create({
-      body: { title: `decompose:${clip5(description29, 60)}` },
+      body: { title: `decompose:${clip6(description29, 60)}` },
       query: opts.directory ? { directory: opts.directory } : undefined
     });
     if (created.error || !created.data?.id) {
-      log10("warn", "[decompose] session.create 失败", { error: describe7(created.error) });
+      log10("warn", "[decompose] session.create 失败", { error: describe8(created.error) });
       return {
         ok: false,
         subtasks: [],
@@ -19285,7 +19595,7 @@ async function decomposeTask(description29, opts) {
     }
     const r = raced.value;
     if (r.error || !r.data) {
-      log10("warn", "[decompose] session.prompt 返回错误", { error: describe7(r.error) });
+      log10("warn", "[decompose] session.prompt 返回错误", { error: describe8(r.error) });
       return { ok: false, subtasks: [], reason: "llm_unavailable" };
     }
     const rawText = pickLastText2(r.data.parts ?? []);
@@ -19295,7 +19605,7 @@ async function decomposeTask(description29, opts) {
     }
     const parsed = extractJson(rawText);
     if (!parsed) {
-      log10("warn", "[decompose] JSON 解析失败", { raw: clip5(rawText, 200) });
+      log10("warn", "[decompose] JSON 解析失败", { raw: clip6(rawText, 200) });
       return { ok: false, subtasks: [], reason: "parse_failed", raw: rawText };
     }
     if (parsed && typeof parsed === "object" && parsed.single_task === true) {
@@ -19324,7 +19634,7 @@ async function decomposeTask(description29, opts) {
     }
     return validateAndFinalize(normalized, rawText, log10, maxSubtasks);
   } catch (err) {
-    log10("warn", "[decompose] 抛错", { error: describe7(err) });
+    log10("warn", "[decompose] 抛错", { error: describe8(err) });
     return { ok: false, subtasks: [], reason: "llm_unavailable" };
   } finally {
     if (childSessionId) {
@@ -19334,7 +19644,7 @@ async function decomposeTask(description29, opts) {
           query: opts.directory ? { directory: opts.directory } : undefined
         });
       } catch (err) {
-        log10("warn", "[decompose] session.delete 失败", { error: describe7(err) });
+        log10("warn", "[decompose] session.delete 失败", { error: describe8(err) });
       }
     }
   }
@@ -19428,12 +19738,12 @@ function tryParse(s) {
     return null;
   }
 }
-function clip5(s, n) {
+function clip6(s, n) {
   if (!s)
     return "";
   return s.length <= n ? s : s.slice(0, n - 1) + "…";
 }
-function describe7(err) {
+function describe8(err) {
   if (!err)
     return "";
   if (err instanceof Error)
@@ -20019,7 +20329,7 @@ function parseTerminalOutput(ev, cfg = {}, rules = DEFAULT_RULES) {
 `).length;
     const lineFromStart = text.split(`
 `)[lineIdx - 1] ?? m[0];
-    const excerpt = clip6(lineFromStart.trim(), c.maxExcerpt);
+    const excerpt = clip7(lineFromStart.trim(), c.maxExcerpt);
     if (!out.has(rule.kind)) {
       out.set(rule.kind, {
         severity: rule.severity,
@@ -20041,7 +20351,7 @@ function parseTerminalOutput(ev, cfg = {}, rules = DEFAULT_RULES) {
   }
   return [...out.values()].sort((a, b) => b.score - a.score);
 }
-function clip6(s, max) {
+function clip7(s, max) {
   if (s.length <= max)
     return s;
   return s.slice(0, max - 1) + "…";
@@ -20100,7 +20410,7 @@ function shouldNotify(findings, ev, lru, cfg = {}, now = Date.now()) {
 function buildSummary(ev, findings) {
   const parts = [];
   if (ev.cmd)
-    parts.push(`\`${clip6(ev.cmd, 60)}\``);
+    parts.push(`\`${clip7(ev.cmd, 60)}\``);
   if (ev.type === "terminal.exit" && typeof ev.exit_code === "number") {
     parts.push(`exit=${ev.exit_code}`);
   }
@@ -20112,7 +20422,7 @@ function buildSummary(ev, findings) {
     return parts.join(" · ");
   }
   const top = findings[0];
-  parts.push(`${top.severity}/${top.kind}: ${clip6(top.excerpt, 80)}`);
+  parts.push(`${top.severity}/${top.kind}: ${clip7(top.excerpt, 80)}`);
   if (findings.length > 1)
     parts.push(`(+${findings.length - 1} 条)`);
   return parts.join(" · ");
@@ -20596,7 +20906,7 @@ import * as zlib from "node:zlib";
 // lib/version-injected.ts
 function getInjectedVersion() {
   try {
-    const v = "0.5.0";
+    const v = "0.5.2";
     if (typeof v === "string" && /^\d+\.\d+\.\d+/.test(v)) {
       return v;
     }
@@ -21873,9 +22183,19 @@ var workflowEngineServer = async (ctx) => {
 var handler23 = workflowEngineServer;
 
 // plugins/session-worktree-guard.ts
+import path24 from "node:path";
 var PLUGIN_NAME24 = "session-worktree-guard";
 logLifecycle(PLUGIN_NAME24, "import", {});
 var WRITE_INTENT_RE = />(?!=)|\btee\b|\brm\b|\bmv\b|\bcp\b|\bmkdir\b|\btouch\b|\bchmod\b|\bchown\b|\bln\b/;
+var READ_ONLY_COMMANDS = /^\s*(?:ls|cat|head|tail|grep|rg|find|fd|wc|stat|file|which|whereis|echo|pwd|cd|pushd|popd|env|printenv|type|less|more|sort|uniq|awk|tr|cut|jq|date|whoami|id|uname|git(?:\s+-C\s+\S+)?\s+(?:log|show|diff|status|branch|tag|remote|config\s+--get|rev-parse|rev-list|ls-files|ls-tree|cat-file|describe|reflog|blame|shortlog|name-rev|symbolic-ref|merge-base|worktree\s+list|stash\s+list|stash\s+show))\b/;
+var SIDE_EFFECT_TOKEN_RE = />(?!=)|\|\s*tee\b|\btee\b/;
+function isReadOnlyBashCommand(command) {
+  if (!READ_ONLY_COMMANDS.test(command))
+    return false;
+  if (SIDE_EFFECT_TOKEN_RE.test(command))
+    return false;
+  return true;
+}
 var INTERPRETER_WRITE_RES = [
   /python.*open\s*\([^)]*['"]w['"]/,
   /node.*writeFile/,
@@ -21890,12 +22210,15 @@ function buildGitVcsWriteRegex(mainRoot) {
 }
 var WRITE_TOOLS = new Set(["write", "edit", "ast_edit"]);
 function rewritePath(value, mainRoot, worktreeRoot) {
-  if (value === mainRoot)
+  if (!value)
+    return null;
+  const resolved = path24.isAbsolute(value) ? value : path24.resolve(mainRoot, value);
+  if (resolved === mainRoot)
     return worktreeRoot;
   const prefix = mainRoot.endsWith("/") ? mainRoot : mainRoot + "/";
-  if (value.startsWith(prefix)) {
+  if (resolved.startsWith(prefix)) {
     const wtPrefix = worktreeRoot.endsWith("/") ? worktreeRoot : worktreeRoot + "/";
-    return wtPrefix + value.slice(prefix.length);
+    return wtPrefix + resolved.slice(prefix.length);
   }
   return null;
 }
@@ -21909,6 +22232,8 @@ function commandContainsMainRoot(command, mainRoot) {
   return re.test(command);
 }
 function detectBashWriteIntent(command, mainRoot) {
+  if (isReadOnlyBashCommand(command))
+    return false;
   if (WRITE_INTENT_RE.test(command))
     return true;
   for (const re of INTERPRETER_WRITE_RES) {
@@ -21927,6 +22252,8 @@ function isWriteOperation(toolName, argsObj, mainRoot) {
   const command = argsObj["command"];
   if (typeof command !== "string")
     return false;
+  if (isReadOnlyBashCommand(command))
+    return false;
   if (WRITE_INTENT_RE.test(command))
     return true;
   for (const re of INTERPRETER_WRITE_RES) {
@@ -21938,16 +22265,16 @@ function isWriteOperation(toolName, argsObj, mainRoot) {
   return false;
 }
 var log13 = makePluginLogger(PLUGIN_NAME24);
-var sessionWorktreeGuardPlugin = async (_ctx3) => {
+var sessionWorktreeGuardPlugin = async (ctx) => {
+  const mainRoot = ctx.directory ?? process.cwd();
   logLifecycle(PLUGIN_NAME24, "activate", {
-    CODEFORGE_SESSION_ID: process.env["CODEFORGE_SESSION_ID"] ?? "(not set)",
-    CODEFORGE_MAIN_ROOT: process.env["CODEFORGE_MAIN_ROOT"] ?? "(not set)"
+    mainRoot,
+    CODEFORGE_SESSION_ID: process.env["CODEFORGE_SESSION_ID"] ?? "(not set)"
   });
   return {
     "tool.execute.before": async (input, output) => {
       const sessionId = input.sessionID ?? process.env["CODEFORGE_SESSION_ID"];
-      const mainRoot = process.env["CODEFORGE_MAIN_ROOT"];
-      if (!sessionId || !mainRoot)
+      if (!sessionId)
         return;
       let denied;
       await safeAsync(PLUGIN_NAME24, "tool.execute.before", async () => {
@@ -22129,7 +22456,7 @@ var IDLE_TOAST_REMINDER_INTERVAL_MS = 30 * 60000;
 var lastIdleToastAt = new Map;
 var log14 = makePluginLogger(PLUGIN_NAME25);
 var worktreeLifecyclePlugin = async (ctx) => {
-  const mainRoot = process.env["CODEFORGE_MAIN_ROOT"] ?? ctx.directory;
+  const mainRoot = ctx.directory;
   logLifecycle(PLUGIN_NAME25, "activate", {
     mainRoot: mainRoot ?? "(not set)",
     idle_threshold_ms: IDLE_TOAST_THROTTLE_MS