@andyqiu/codeforge 0.6.5 → 0.6.6

package/dist/index.js

@@ -28,6 +28,7 @@ __export(exports_worktree_ops, {
   listWorktrees: () => listWorktrees,
   getMergeConflicts: () => getMergeConflicts,
   ensureWorktree: () => ensureWorktree,
+  deleteBranchIfExists: () => deleteBranchIfExists,
   commitWorktreeIfDirty: () => commitWorktreeIfDirty
 });
 import { execFile as execFile2 } from "node:child_process";
@@ -60,7 +61,35 @@ async function removeWorktree(opts) {
   const args = ["worktree", "remove", opts.worktree_path];
   if (opts.force)
     args.push("--force");
-  await runGit(opts.root, args, opts.git_timeout_ms ?? 5000);
+  try {
+    await runGit(opts.root, args, opts.git_timeout_ms ?? 5000);
+  } catch (err) {
+    if (isWorktreeAbsentError(err))
+      return;
+    throw err;
+  }
+}
+function isWorktreeAbsentError(err) {
+  const msg = err instanceof Error ? err.message : String(err);
+  return /is not a working tree/i.test(msg) || /No such file or directory/i.test(msg) || /not a valid path/i.test(msg);
+}
+async function deleteBranchIfExists(opts) {
+  const root = path11.resolve(opts.root);
+  const timeout = opts.git_timeout_ms ?? 5000;
+  try {
+    await runGit(root, ["rev-parse", "--verify", `refs/heads/${opts.branch}`], 3000);
+  } catch {
+    return { deleted: false };
+  }
+  try {
+    await runGit(root, ["branch", "-D", opts.branch], timeout);
+    return { deleted: true };
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    if (/not found/i.test(msg))
+      return { deleted: false };
+    throw err;
+  }
 }
 async function listWorktrees(opts) {
   const out = await runGit(opts.root, ["worktree", "list", "--porcelain"], opts.git_timeout_ms ?? 3000);
@@ -248,9 +277,10 @@ function parseDecision(markdown) {
     return { token: null, reason: "Decision section is empty" };
   }
   const cleaned = firstLine.replace(/`/g, "").trim().toUpperCase();
-  if (VALID_TOKENS.has(cleaned)) {
+  const normalized = cleaned === "APPROVE_WITH_NOTES" ? "APPROVE" : cleaned;
+  if (VALID_TOKENS.has(normalized)) {
     return {
-      token: cleaned,
+      token: normalized,
       reason: firstLine.length > 200 ? firstLine.slice(0, 200) + "…" : firstLine
     };
   }
@@ -336,17 +366,17 @@ var require_visit = __commonJS((exports) => {
   visit.BREAK = BREAK;
   visit.SKIP = SKIP;
   visit.REMOVE = REMOVE;
-  function visit_(key, node, visitor, path19) {
-    const ctrl = callVisitor(key, node, visitor, path19);
+  function visit_(key, node, visitor, path20) {
+    const ctrl = callVisitor(key, node, visitor, path20);
     if (identity.isNode(ctrl) || identity.isPair(ctrl)) {
-      replaceNode(key, path19, ctrl);
-      return visit_(key, ctrl, visitor, path19);
+      replaceNode(key, path20, ctrl);
+      return visit_(key, ctrl, visitor, path20);
     }
     if (typeof ctrl !== "symbol") {
       if (identity.isCollection(node)) {
-        path19 = Object.freeze(path19.concat(node));
+        path20 = Object.freeze(path20.concat(node));
         for (let i = 0;i < node.items.length; ++i) {
-          const ci = visit_(i, node.items[i], visitor, path19);
+          const ci = visit_(i, node.items[i], visitor, path20);
           if (typeof ci === "number")
             i = ci - 1;
           else if (ci === BREAK)
@@ -357,13 +387,13 @@ var require_visit = __commonJS((exports) => {
           }
         }
       } else if (identity.isPair(node)) {
-        path19 = Object.freeze(path19.concat(node));
-        const ck = visit_("key", node.key, visitor, path19);
+        path20 = Object.freeze(path20.concat(node));
+        const ck = visit_("key", node.key, visitor, path20);
         if (ck === BREAK)
           return BREAK;
         else if (ck === REMOVE)
           node.key = null;
-        const cv = visit_("value", node.value, visitor, path19);
+        const cv = visit_("value", node.value, visitor, path20);
         if (cv === BREAK)
           return BREAK;
         else if (cv === REMOVE)
@@ -384,17 +414,17 @@ var require_visit = __commonJS((exports) => {
   visitAsync.BREAK = BREAK;
   visitAsync.SKIP = SKIP;
   visitAsync.REMOVE = REMOVE;
-  async function visitAsync_(key, node, visitor, path19) {
-    const ctrl = await callVisitor(key, node, visitor, path19);
+  async function visitAsync_(key, node, visitor, path20) {
+    const ctrl = await callVisitor(key, node, visitor, path20);
     if (identity.isNode(ctrl) || identity.isPair(ctrl)) {
-      replaceNode(key, path19, ctrl);
-      return visitAsync_(key, ctrl, visitor, path19);
+      replaceNode(key, path20, ctrl);
+      return visitAsync_(key, ctrl, visitor, path20);
     }
     if (typeof ctrl !== "symbol") {
       if (identity.isCollection(node)) {
-        path19 = Object.freeze(path19.concat(node));
+        path20 = Object.freeze(path20.concat(node));
         for (let i = 0;i < node.items.length; ++i) {
-          const ci = await visitAsync_(i, node.items[i], visitor, path19);
+          const ci = await visitAsync_(i, node.items[i], visitor, path20);
           if (typeof ci === "number")
             i = ci - 1;
           else if (ci === BREAK)
@@ -405,13 +435,13 @@ var require_visit = __commonJS((exports) => {
           }
         }
       } else if (identity.isPair(node)) {
-        path19 = Object.freeze(path19.concat(node));
-        const ck = await visitAsync_("key", node.key, visitor, path19);
+        path20 = Object.freeze(path20.concat(node));
+        const ck = await visitAsync_("key", node.key, visitor, path20);
         if (ck === BREAK)
           return BREAK;
         else if (ck === REMOVE)
           node.key = null;
-        const cv = await visitAsync_("value", node.value, visitor, path19);
+        const cv = await visitAsync_("value", node.value, visitor, path20);
         if (cv === BREAK)
           return BREAK;
         else if (cv === REMOVE)
@@ -438,23 +468,23 @@ var require_visit = __commonJS((exports) => {
     }
     return visitor;
   }
-  function callVisitor(key, node, visitor, path19) {
+  function callVisitor(key, node, visitor, path20) {
     if (typeof visitor === "function")
-      return visitor(key, node, path19);
+      return visitor(key, node, path20);
     if (identity.isMap(node))
-      return visitor.Map?.(key, node, path19);
+      return visitor.Map?.(key, node, path20);
     if (identity.isSeq(node))
-      return visitor.Seq?.(key, node, path19);
+      return visitor.Seq?.(key, node, path20);
     if (identity.isPair(node))
-      return visitor.Pair?.(key, node, path19);
+      return visitor.Pair?.(key, node, path20);
     if (identity.isScalar(node))
-      return visitor.Scalar?.(key, node, path19);
+      return visitor.Scalar?.(key, node, path20);
     if (identity.isAlias(node))
-      return visitor.Alias?.(key, node, path19);
+      return visitor.Alias?.(key, node, path20);
     return;
   }
-  function replaceNode(key, path19, node) {
-    const parent = path19[path19.length - 1];
+  function replaceNode(key, path20, node) {
+    const parent = path20[path20.length - 1];
     if (identity.isCollection(parent)) {
       parent.items[key] = node;
     } else if (identity.isPair(parent)) {
@@ -1013,10 +1043,10 @@ var require_Collection = __commonJS((exports) => {
   var createNode = require_createNode();
   var identity = require_identity();
   var Node = require_Node();
-  function collectionFromPath(schema, path19, value) {
+  function collectionFromPath(schema, path20, value) {
     let v = value;
-    for (let i = path19.length - 1;i >= 0; --i) {
-      const k = path19[i];
+    for (let i = path20.length - 1;i >= 0; --i) {
+      const k = path20[i];
       if (typeof k === "number" && Number.isInteger(k) && k >= 0) {
         const a = [];
         a[k] = v;
@@ -1035,7 +1065,7 @@ var require_Collection = __commonJS((exports) => {
       sourceObjects: new Map
     });
   }
-  var isEmptyPath = (path19) => path19 == null || typeof path19 === "object" && !!path19[Symbol.iterator]().next().done;
+  var isEmptyPath = (path20) => path20 == null || typeof path20 === "object" && !!path20[Symbol.iterator]().next().done;
 
   class Collection extends Node.NodeBase {
     constructor(type, schema) {
@@ -1056,11 +1086,11 @@ var require_Collection = __commonJS((exports) => {
         copy.range = this.range.slice();
       return copy;
     }
-    addIn(path19, value) {
-      if (isEmptyPath(path19))
+    addIn(path20, value) {
+      if (isEmptyPath(path20))
         this.add(value);
       else {
-        const [key, ...rest] = path19;
+        const [key, ...rest] = path20;
         const node = this.get(key, true);
         if (identity.isCollection(node))
           node.addIn(rest, value);
@@ -1070,8 +1100,8 @@ var require_Collection = __commonJS((exports) => {
           throw new Error(`Expected YAML collection at ${key}. Remaining path: ${rest}`);
       }
     }
-    deleteIn(path19) {
-      const [key, ...rest] = path19;
+    deleteIn(path20) {
+      const [key, ...rest] = path20;
       if (rest.length === 0)
         return this.delete(key);
       const node = this.get(key, true);
@@ -1080,8 +1110,8 @@ var require_Collection = __commonJS((exports) => {
       else
         throw new Error(`Expected YAML collection at ${key}. Remaining path: ${rest}`);
     }
-    getIn(path19, keepScalar) {
-      const [key, ...rest] = path19;
+    getIn(path20, keepScalar) {
+      const [key, ...rest] = path20;
       const node = this.get(key, true);
       if (rest.length === 0)
         return !keepScalar && identity.isScalar(node) ? node.value : node;
@@ -1096,15 +1126,15 @@ var require_Collection = __commonJS((exports) => {
         return n == null || allowScalar && identity.isScalar(n) && n.value == null && !n.commentBefore && !n.comment && !n.tag;
       });
     }
-    hasIn(path19) {
-      const [key, ...rest] = path19;
+    hasIn(path20) {
+      const [key, ...rest] = path20;
       if (rest.length === 0)
         return this.has(key);
       const node = this.get(key, true);
       return identity.isCollection(node) ? node.hasIn(rest) : false;
     }
-    setIn(path19, value) {
-      const [key, ...rest] = path19;
+    setIn(path20, value) {
+      const [key, ...rest] = path20;
       if (rest.length === 0) {
         this.set(key, value);
       } else {
@@ -3497,9 +3527,9 @@ var require_Document = __commonJS((exports) => {
       if (assertCollection(this.contents))
         this.contents.add(value);
     }
-    addIn(path19, value) {
+    addIn(path20, value) {
       if (assertCollection(this.contents))
-        this.contents.addIn(path19, value);
+        this.contents.addIn(path20, value);
     }
     createAlias(node, name) {
       if (!node.anchor) {
@@ -3548,30 +3578,30 @@ var require_Document = __commonJS((exports) => {
     delete(key) {
       return assertCollection(this.contents) ? this.contents.delete(key) : false;
     }
-    deleteIn(path19) {
-      if (Collection.isEmptyPath(path19)) {
+    deleteIn(path20) {
+      if (Collection.isEmptyPath(path20)) {
         if (this.contents == null)
           return false;
         this.contents = null;
         return true;
       }
-      return assertCollection(this.contents) ? this.contents.deleteIn(path19) : false;
+      return assertCollection(this.contents) ? this.contents.deleteIn(path20) : false;
     }
     get(key, keepScalar) {
       return identity.isCollection(this.contents) ? this.contents.get(key, keepScalar) : undefined;
     }
-    getIn(path19, keepScalar) {
-      if (Collection.isEmptyPath(path19))
+    getIn(path20, keepScalar) {
+      if (Collection.isEmptyPath(path20))
         return !keepScalar && identity.isScalar(this.contents) ? this.contents.value : this.contents;
-      return identity.isCollection(this.contents) ? this.contents.getIn(path19, keepScalar) : undefined;
+      return identity.isCollection(this.contents) ? this.contents.getIn(path20, keepScalar) : undefined;
     }
     has(key) {
       return identity.isCollection(this.contents) ? this.contents.has(key) : false;
     }
-    hasIn(path19) {
-      if (Collection.isEmptyPath(path19))
+    hasIn(path20) {
+      if (Collection.isEmptyPath(path20))
         return this.contents !== undefined;
-      return identity.isCollection(this.contents) ? this.contents.hasIn(path19) : false;
+      return identity.isCollection(this.contents) ? this.contents.hasIn(path20) : false;
     }
     set(key, value) {
       if (this.contents == null) {
@@ -3580,13 +3610,13 @@ var require_Document = __commonJS((exports) => {
         this.contents.set(key, value);
       }
     }
-    setIn(path19, value) {
-      if (Collection.isEmptyPath(path19)) {
+    setIn(path20, value) {
+      if (Collection.isEmptyPath(path20)) {
         this.contents = value;
       } else if (this.contents == null) {
-        this.contents = Collection.collectionFromPath(this.schema, Array.from(path19), value);
+        this.contents = Collection.collectionFromPath(this.schema, Array.from(path20), value);
       } else if (assertCollection(this.contents)) {
-        this.contents.setIn(path19, value);
+        this.contents.setIn(path20, value);
       }
     }
     setSchema(version, options = {}) {
@@ -5481,9 +5511,9 @@ var require_cst_visit = __commonJS((exports) => {
   visit.BREAK = BREAK;
   visit.SKIP = SKIP;
   visit.REMOVE = REMOVE;
-  visit.itemAtPath = (cst, path19) => {
+  visit.itemAtPath = (cst, path20) => {
     let item = cst;
-    for (const [field, index] of path19) {
+    for (const [field, index] of path20) {
       const tok = item?.[field];
       if (tok && "items" in tok) {
         item = tok.items[index];
@@ -5492,23 +5522,23 @@ var require_cst_visit = __commonJS((exports) => {
     }
     return item;
   };
-  visit.parentCollection = (cst, path19) => {
-    const parent = visit.itemAtPath(cst, path19.slice(0, -1));
-    const field = path19[path19.length - 1][0];
+  visit.parentCollection = (cst, path20) => {
+    const parent = visit.itemAtPath(cst, path20.slice(0, -1));
+    const field = path20[path20.length - 1][0];
     const coll = parent?.[field];
     if (coll && "items" in coll)
       return coll;
     throw new Error("Parent collection not found");
   };
-  function _visit(path19, item, visitor) {
-    let ctrl = visitor(item, path19);
+  function _visit(path20, item, visitor) {
+    let ctrl = visitor(item, path20);
     if (typeof ctrl === "symbol")
       return ctrl;
     for (const field of ["key", "value"]) {
       const token = item[field];
       if (token && "items" in token) {
         for (let i = 0;i < token.items.length; ++i) {
-          const ci = _visit(Object.freeze(path19.concat([[field, i]])), token.items[i], visitor);
+          const ci = _visit(Object.freeze(path20.concat([[field, i]])), token.items[i], visitor);
           if (typeof ci === "number")
             i = ci - 1;
           else if (ci === BREAK)
@@ -5519,10 +5549,10 @@ var require_cst_visit = __commonJS((exports) => {
           }
         }
         if (typeof ctrl === "function" && field === "key")
-          ctrl = ctrl(item, path19);
+          ctrl = ctrl(item, path20);
       }
     }
-    return typeof ctrl === "function" ? ctrl(item, path19) : ctrl;
+    return typeof ctrl === "function" ? ctrl(item, path20) : ctrl;
   }
   exports.visit = visit;
 });
@@ -6791,14 +6821,14 @@ var require_parser = __commonJS((exports) => {
           case "scalar":
           case "single-quoted-scalar":
           case "double-quoted-scalar": {
-            const fs15 = this.flowScalar(this.type);
+            const fs16 = this.flowScalar(this.type);
             if (atNextItem || it.value) {
-              map.items.push({ start, key: fs15, sep: [] });
+              map.items.push({ start, key: fs16, sep: [] });
               this.onKeyLine = true;
             } else if (it.sep) {
-              this.stack.push(fs15);
+              this.stack.push(fs16);
             } else {
-              Object.assign(it, { key: fs15, sep: [] });
+              Object.assign(it, { key: fs16, sep: [] });
               this.onKeyLine = true;
             }
             return;
@@ -6926,13 +6956,13 @@ var require_parser = __commonJS((exports) => {
           case "scalar":
           case "single-quoted-scalar":
           case "double-quoted-scalar": {
-            const fs15 = this.flowScalar(this.type);
+            const fs16 = this.flowScalar(this.type);
             if (!it || it.value)
-              fc.items.push({ start: [], key: fs15, sep: [] });
+              fc.items.push({ start: [], key: fs16, sep: [] });
             else if (it.sep)
-              this.stack.push(fs15);
+              this.stack.push(fs16);
             else
-              Object.assign(it, { key: fs15, sep: [] });
+              Object.assign(it, { key: fs16, sep: [] });
             return;
           }
           case "flow-map-end":
@@ -9298,7 +9328,7 @@ async function resolveAgentForGuard(input, client, log4, opts = {}) {
   if (!opts.skipCache && chatAgentCacheReader) {
     try {
       const cached = chatAgentCacheReader(input.sessionID);
-      if (typeof cached === "string" && cached.length > 0) {
+      if (typeof cached === "string") {
         return cached;
       }
     } catch (err) {
@@ -9310,7 +9340,7 @@ async function resolveAgentForGuard(input, client, log4, opts = {}) {
   }
   if (!opts.skipIpcLookup) {
     const viaSession = await resolveCurrentAgent(client, input.sessionID, log4);
-    if (typeof viaSession === "string" && viaSession.length > 0) {
+    if (typeof viaSession === "string") {
       return viaSession;
     }
   }
@@ -10628,15 +10658,19 @@ class ApprovalStore {
 // tools/review-approval.ts
 var description4 = [
   "reviewer 专用：写入 APPROVE 审批记录。",
-  "**何时调用**：reviewer 给出 `## Decision\\nAPPROVE` 之前必须调本工具，",
-  "供 `/merge` 闭环或 codeforge orchestrator 后续放行依据。",
+  "**何时调用**：reviewer 给出 `## Decision\\nAPPROVE` 之前必须调本工具。",
+  "**两层语义独立**（ADR:decision-token-vs-approval-verdict-layering）：",
+  "  - 本工具 `verdict` 字段属审批层，合法值：APPROVE / APPROVE_WITH_NOTES",
+  "  - reviewer 输出的 `## Decision` 节首行属协议层，合法值：APPROVE / REQUEST_CHANGES / BLOCK",
+  "  - ⚠️ 严禁把 `APPROVE_WITH_NOTES` 字面量写进 `## Decision` 节首行（容错层会归一，但其他变体如 APPROVE_MINOR 会失败 → merge-loop 误判死循环）",
+  '  - ✅ 正确：verdict="APPROVE_WITH_NOTES" + `## Decision\\nAPPROVE`（首行写 APPROVE，详情在审批 notes）',
   "**pendingIds 格式**：推荐 `session:<sid>` / `plan:<plan_id>` / `decision:<hash>`；旧 `pc-<ts>-NNN` 仍兼容。",
   "**何时不调**：REQUEST_CHANGES / BLOCK 不调（无 APPROVE = 无审批记录）。",
   "**fallback**：codeforge 解析 reviewer boomerang 见 APPROVE 但无记录 → 自动以 source='codeforge-fallback' 补写。"
 ].join(`
 `);
 var ArgsSchema4 = z4.object({
-  verdict: z4.enum(["APPROVE", "APPROVE_WITH_NOTES"]).describe("审批裁决；REQUEST_CHANGES / BLOCK 不应调本工具"),
+  verdict: z4.enum(["APPROVE", "APPROVE_WITH_NOTES"]).describe("审批层裁决（审计字段，与协议层独立）；REQUEST_CHANGES / BLOCK 不应调本工具。⚠️ 不要把本字段值复制到 reviewer 输出的 `## Decision` 节首行 — 那是协议层 3 档。"),
   pendingIds: z4.array(z4.string().min(1)).min(1, "pendingIds 至少 1 条").describe("本次 APPROVE 覆盖的 id 列表。推荐 session:<sid> / plan:<plan_id> / decision:<hash>；旧 pc-xxx 兼容"),
   notes: z4.string().min(1, "notes 不能为空").max(2000, "notes 过长（> 2000 字），建议拆条").describe("审阅意见摘要（建议 ≤ 500 字）"),
   decisionLine: z4.string().optional().describe("`## Decision` 节首行原文（默认 verdict 字面量，机审证据）"),
@@ -11774,6 +11808,11 @@ function sleep(ms) {
 // lib/session-worktree.ts
 var REGISTRY_VERSION = 1;
 var DEFAULT_WORKTREE_SUBDIR = path13.join(".git", "codeforge-worktrees");
+function debugLog(msg) {
+  if (process.env["CODEFORGE_DEBUG"]) {
+    console.debug(`[session-worktree] ${msg}`);
+  }
+}
 function registryDir(mainRoot) {
   return path13.join(runtimeDir(path13.resolve(mainRoot), { ensure: false }), "session-worktrees");
 }
@@ -11941,13 +11980,12 @@ async function mergeSessionBack(opts) {
   try {
     await removeWorktree({ root: mainRoot, worktree_path: wt, force: true });
   } catch (err) {
-    console.warn(`[session-worktree] removeWorktree 失败 (session=${opts.sessionId}): ${err.message}`);
-  }
-  try {
-    await runGit2(mainRoot, ["branch", "-D", branch]);
-  } catch (err) {
-    console.warn(`[session-worktree] branch -D ${branch} 失败 (可能已被 worktree remove 一并删): ${err.message}`);
+    debugLog(`removeWorktree (merge) 非预期失败 (session=${opts.sessionId}): ${err.message}`);
   }
+  await deleteBranchIfExists({ root: mainRoot, branch }).catch((err) => {
+    debugLog(`deleteBranchIfExists (merge) 非预期失败: ${err.message}`);
+    return { deleted: false };
+  });
   await mutateRegistry(mainRoot, (reg) => {
     const e = reg.entries.find((x) => x.sessionId === opts.sessionId);
     if (e) {
@@ -11978,13 +12016,12 @@ async function discardSession(opts) {
       force: true
     });
   } catch (err) {
-    console.warn(`[session-worktree] removeWorktree (discard) 失败: ${err.message}`);
-  }
-  try {
-    await runGit2(mainRoot, ["branch", "-D", entry.branch]);
-  } catch (err) {
-    console.warn(`[session-worktree] branch -D ${entry.branch} (discard) 失败: ${err.message}`);
+    debugLog(`removeWorktree (discard) 非预期失败: ${err.message}`);
   }
+  await deleteBranchIfExists({ root: mainRoot, branch: entry.branch }).catch((err) => {
+    debugLog(`deleteBranchIfExists (discard) 非预期失败: ${err.message}`);
+    return { deleted: false };
+  });
   await mutateRegistry(mainRoot, (reg) => {
     const e = reg.entries.find((x) => x.sessionId === opts.sessionId);
     if (e) {
@@ -12125,7 +12162,8 @@ Codeforge-Base: ${baseSha.slice(0, 12)}`;
   return subject + body + footer;
 }
 var ORPHAN_GRACE_MS = 60000;
-var SEMANTIC_ORPHAN_MIN_AGE_MS = 24 * 60 * 60000;
+var SEMANTIC_ORPHAN_MIN_AGE_MS = 6 * 60 * 60000;
+var SEMANTIC_ORPHAN_UNKNOWN_TIMEOUT_MS = 72 * 60 * 60000;
 async function pruneDiscardedRegistryEntries(mainRoot, opts = {}) {
   const keepRecent = opts.keepRecent ?? 50;
   if (keepRecent < 0) {
@@ -12209,6 +12247,7 @@ async function pruneOrphanWorktrees(mainRoot, opts = {}) {
   });
   if (opts.isSessionAlive) {
     const minAge = opts.semanticOrphanMinAgeMs ?? SEMANTIC_ORPHAN_MIN_AGE_MS;
+    const unknownTimeout = opts.semanticOrphanUnknownTimeoutMs ?? SEMANTIC_ORPHAN_UNKNOWN_TIMEOUT_MS;
     const probe = opts.isSessionAlive;
     await mutateRegistry(resolved, async (reg2) => {
       const now = Date.now();
@@ -12228,10 +12267,11 @@ async function pruneOrphanWorktrees(mainRoot, opts = {}) {
           continue;
         }
         if (aliveResult.source === "unknown") {
-          skipped++;
-          continue;
-        }
-        if (aliveResult.alive) {
+          if (now - updatedMs < unknownTimeout) {
+            skipped++;
+            continue;
+          }
+        } else if (aliveResult.alive) {
           skipped++;
           continue;
         }
@@ -12248,15 +12288,14 @@ async function pruneOrphanWorktrees(mainRoot, opts = {}) {
           });
           continue;
         }
-        try {
-          await runGit2(resolved, ["branch", "-D", entry.branch]);
-        } catch {}
+        await deleteBranchIfExists({ root: resolved, branch: entry.branch }).catch(() => {});
         entry.status = "discarded";
         entry.updatedAt = new Date().toISOString();
+        const reasonSource = aliveResult.source === "unknown" ? `unknown-timeout (registry.updatedAt 已老于 ${unknownTimeout / 3600000}h)` : `opencode session ${aliveResult.source}: dead`;
         cleaned.push({
           sessionId: entry.sessionId,
           worktreePath: entry.worktreePath,
-          reason: `D 类语义孤儿 (opencode session ${aliveResult.source}: dead)`
+          reason: `D 类语义孤儿 (${reasonSource})`
         });
       }
     });
@@ -12303,6 +12342,13 @@ async function pruneOrphanWorktrees(mainRoot, opts = {}) {
     } catch (err) {
       lastError = err instanceof Error ? err.message : String(err);
     }
+    if (removed) {
+      try {
+        await fs10.stat(candidate);
+        removed = false;
+        lastError = lastError ?? "git worktree remove 返回成功但目录仍存在（C 类 fs-only orphan）";
+      } catch {}
+    }
     if (!removed && dirExists) {
       try {
         await fs10.rm(candidate, { recursive: true, force: true });
@@ -12326,6 +12372,39 @@ async function pruneOrphanWorktrees(mainRoot, opts = {}) {
   return { cleaned, failed, skipped, discardedPruned };
 }
 
+// lib/merge-gate.ts
+import { promises as fs11 } from "node:fs";
+import * as path14 from "node:path";
+var DEFAULT_MERGE_GATE_CONFIG = { enabled: true };
+var CONFIG_REL = ".codeforge/merge-gate.json";
+async function loadMergeGate(mainRoot) {
+  const file = path14.join(mainRoot, CONFIG_REL);
+  let raw;
+  try {
+    raw = await fs11.readFile(file, "utf8");
+  } catch (err) {
+    const e = err;
+    if (e.code === "ENOENT")
+      return { ...DEFAULT_MERGE_GATE_CONFIG };
+    console.warn(`[merge-gate] 读取 ${CONFIG_REL} 失败，fail-safe 退化为 enabled=false: ${e.message}`);
+    return { enabled: false };
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch (err) {
+    console.warn(`[merge-gate] ${CONFIG_REL} JSON 解析失败，fail-safe 退化为 enabled=false: ${err instanceof Error ? err.message : String(err)}`);
+    return { enabled: false };
+  }
+  if (!parsed || typeof parsed !== "object") {
+    console.warn(`[merge-gate] ${CONFIG_REL} 顶层非 object，fail-safe 退化为 enabled=false`);
+    return { enabled: false };
+  }
+  const obj = parsed;
+  const enabled = typeof obj["enabled"] === "boolean" ? obj["enabled"] : DEFAULT_MERGE_GATE_CONFIG.enabled;
+  return { enabled };
+}
+
 // lib/merge-loop.ts
 var DEFAULT_MERGE_LOOP_CONFIG = {
   maxReviewLoops: 3,
@@ -12337,6 +12416,8 @@ var DEFAULT_MERGE_LOOP_CONFIG = {
 async function runMergeLoop(opts) {
   const config = { ...DEFAULT_MERGE_LOOP_CONFIG, ...opts.config ?? {} };
   const progress = opts.onProgress ?? (() => {});
+  const mergeGateLoader = opts.__testHooks?.loadMergeGate ?? loadMergeGate;
+  const mergeGate = config.mergeGate ?? await mergeGateLoader(opts.mainRoot);
   let loops = 0;
   let lastReviewSummary;
   progress("pre_check", `准备 merge session ${opts.sessionId}`);
@@ -12405,6 +12486,38 @@ async function runMergeLoop(opts) {
     if (reviewResult.decision === "APPROVE") {
       progress("do_merge", "APPROVE，执行 squash merge");
       await maybeAbort(opts, config, entry);
+      if (mergeGate.enabled) {
+        const store = opts.__testHooks?.approvalStore ?? ApprovalStore.forProject(opts.mainRoot);
+        let approval;
+        let approvalKey = `session:${opts.sessionId}`;
+        try {
+          approval = await store.getLatest(approvalKey);
+          if (!approval && opts.planId) {
+            approvalKey = `plan:${opts.planId}`;
+            approval = await store.getLatest(approvalKey);
+          }
+        } catch (err) {
+          console.warn(`[merge-loop] approval-store 查询失败 (session=${opts.sessionId}): ${err instanceof Error ? err.message : String(err)}`);
+          approval = undefined;
+        }
+        const valid = !!approval && (approval.verdict === "APPROVE" || approval.verdict === "APPROVE_WITH_NOTES");
+        if (!valid) {
+          const blockReason = buildApprovalGateBlockReason({
+            sessionId: opts.sessionId,
+            ...opts.planId ? { planId: opts.planId } : {},
+            approvalKey,
+            storeVerdict: approval?.verdict ?? "NONE"
+          });
+          progress("block_pause", "approval-store 校验未通过");
+          return {
+            status: "blocked",
+            loops,
+            finalDecision: "APPROVE",
+            blockReason,
+            ...lastReviewSummary ? { lastReviewSummary } : {}
+          };
+        }
+      }
       const { sha } = await mergeSessionBack({
         sessionId: opts.sessionId,
         mainRoot: opts.mainRoot
@@ -12494,6 +12607,22 @@ function buildForceMergeMessage(sessionId, entry) {
 ` + `Codeforge-Base: ${entry.baseSha.slice(0, 12)}
 ` + `Codeforge-Force-Merge: true`;
 }
+function buildApprovalGateBlockReason(args) {
+  return `reviewer 摘要 APPROVE 但 approval-store 无对应记录
+` + `（已查 session:${args.sessionId} 与 plan:${args.planId ?? "<无>"} 均无有效 APPROVE；` + `store verdict=${args.storeVerdict}）
+
+` + `可能原因：
+` + `  - reviewer agent 输出 APPROVE 但漏调 review_approval 工具写记录
+` + `  - codeforge-fallback 也未补写
+` + `  - 解析失真：摘要含 APPROVE 字面但实际未通过
+
+` + `解除路径三选一：
+` + `  1. 让 reviewer 重新跑一遍（重派 reviewer，确认调用 review_approval）
+` + `  2. codeforge 手动补写：调 review_approval(verdict=APPROVE, pendingIds=["${args.approvalKey}"], source="codeforge-fallback")
+` + `  3. 用户拍板：/merge --force 跳过 review（写 escape 审计）
+
+` + `ADR: session-merge-approval-hard-gate`;
+}
 async function maybeAbort(opts, config, entry) {
   if (!opts.signal?.aborted)
     return;
@@ -12783,8 +12912,8 @@ async function execute12(input) {
 import { z as z13 } from "zod";
 
 // lib/plan-store.ts
-import { promises as fs11 } from "node:fs";
-import * as path14 from "node:path";
+import { promises as fs12 } from "node:fs";
+import * as path15 from "node:path";
 var INDEX_VERSION = 1;
 
 class PlanStore {
@@ -12793,8 +12922,8 @@ class PlanStore {
   now;
   secondCounters = new Map;
   constructor(opts = {}) {
-    this.root = path14.resolve(opts.root ?? process.cwd());
-    this.base = opts.base ? path14.resolve(opts.base) : plansDir(this.root);
+    this.root = path15.resolve(opts.root ?? process.cwd());
+    this.base = opts.base ? path15.resolve(opts.base) : plansDir(this.root);
     this.now = opts.now ?? (() => new Date);
   }
   async write(input) {
@@ -12804,14 +12933,14 @@ class PlanStore {
     if (typeof input.content !== "string" || input.content.length === 0) {
       throw new Error("PlanStore.write: content 不能为空");
     }
-    await fs11.mkdir(this.base, { recursive: true });
+    await fs12.mkdir(this.base, { recursive: true });
     const lockPath = this.lockPath();
     return await withFileLock(lockPath, async () => {
       const index = await this.readIndexLocked();
       const now = this.now();
       const planId = this.allocPlanId(now, index);
       const filename = this.composeFilename(planId, input.title);
-      const absFile = path14.join(this.base, filename);
+      const absFile = path15.join(this.base, filename);
       await this.atomicWriteFile(absFile, input.content);
       const entry = {
         plan_id: planId,
@@ -12835,9 +12964,9 @@ class PlanStore {
     const entry = index.entries.find((e) => e.plan_id === planId);
     if (!entry)
       return null;
-    const abs = path14.join(this.base, entry.path);
+    const abs = path15.join(this.base, entry.path);
     try {
-      const content = await fs11.readFile(abs, "utf8");
+      const content = await fs12.readFile(abs, "utf8");
       return { entry, content };
     } catch (err) {
       const e = err;
@@ -12896,7 +13025,7 @@ class PlanStore {
         else if (e.status === "orphan")
           shouldDelete = true;
         if (shouldDelete) {
-          await fs11.rm(path14.join(this.base, e.path), { force: true }).catch(() => {});
+          await fs12.rm(path15.join(this.base, e.path), { force: true }).catch(() => {});
           removed++;
         } else {
           keep.push(e);
@@ -12918,9 +13047,9 @@ class PlanStore {
         knownPaths.add(e.path);
         if (e.status !== "active")
           continue;
-        const abs = path14.join(this.base, e.path);
+        const abs = path15.join(this.base, e.path);
         try {
-          await fs11.stat(abs);
+          await fs12.stat(abs);
         } catch {
           e.status = "orphan";
           markedOrphan++;
@@ -12930,23 +13059,23 @@ class PlanStore {
         await this.writeIndexLocked(index);
       let unindexedFiles = [];
       try {
-        const all = await fs11.readdir(this.base);
+        const all = await fs12.readdir(this.base);
         unindexedFiles = all.filter((f) => f.endsWith(".md")).filter((f) => !knownPaths.has(f));
       } catch {}
       return { markedOrphan, unindexedFiles };
     });
   }
   indexPath() {
-    return path14.join(this.base, "index.json");
+    return path15.join(this.base, "index.json");
   }
   lockPath() {
-    return path14.join(this.base, "index.lock");
+    return path15.join(this.base, "index.lock");
   }
   async readIndexLocked() {
     const file = this.indexPath();
     let raw;
     try {
-      raw = await fs11.readFile(file, "utf8");
+      raw = await fs12.readFile(file, "utf8");
     } catch (err) {
       const e = err;
       if (e.code === "ENOENT")
@@ -12968,7 +13097,7 @@ class PlanStore {
   async archiveCorruptIndex(file) {
     const ts = this.now().toISOString().replace(/[-:.TZ]/g, "").slice(0, 14);
     const dst = `${file}.corrupt-${ts}`;
-    await fs11.rename(file, dst).catch(() => {});
+    await fs12.rename(file, dst).catch(() => {});
   }
   async readIndex() {
     return this.readIndexLocked();
@@ -13013,15 +13142,15 @@ class PlanStore {
     const tsPart = m ? `${m[1]}-${m[2]}` : planId;
     const nnn = m ? m[3] : "000";
     const sample = planFilePath(this.root, title);
-    const base = path14.basename(sample, ".md");
+    const base = path15.basename(sample, ".md");
     const slug = base.replace(/^\d{8}-\d{6}-?/, "") || "untitled";
     return `${tsPart}-${nnn}-${slug}.md`;
   }
   async atomicWriteFile(file, data) {
-    await fs11.mkdir(path14.dirname(file), { recursive: true });
+    await fs12.mkdir(path15.dirname(file), { recursive: true });
     const tmp = `${file}.tmp-${process.pid}-${Date.now()}`;
-    await fs11.writeFile(tmp, data, "utf8");
-    await fs11.rename(tmp, file);
+    await fs12.writeFile(tmp, data, "utf8");
+    await fs12.rename(tmp, file);
   }
 }
 function formatTimestamp(d) {
@@ -13084,8 +13213,8 @@ async function execute13(input) {
   }
 }
 // tools/plan-read.ts
-import { promises as fs12 } from "node:fs";
-import * as path15 from "node:path";
+import { promises as fs13 } from "node:fs";
+import * as path16 from "node:path";
 import { z as z14 } from "zod";
 var description14 = [
   "读取方案文档内容，支持按 plan_id 或绝对路径查询。",
@@ -13191,9 +13320,9 @@ async function execute14(input) {
       };
     }
   }
-  const abs = path15.resolve(args.path);
+  const abs = path16.resolve(args.path);
   try {
-    const content = await fs12.readFile(abs, "utf8");
+    const content = await fs13.readFile(abs, "utf8");
     return {
       ok: true,
       content,
@@ -13218,16 +13347,16 @@ import { z as z15 } from "zod";
 // lib/adr-init.ts
 import { spawnSync } from "node:child_process";
 import { existsSync as existsSync4, promises as fsp } from "node:fs";
-import * as path16 from "node:path";
+import * as path17 from "node:path";
 import * as url from "node:url";
 function resolveAssetsRoot() {
-  const here = path16.dirname(url.fileURLToPath(import.meta.url));
+  const here = path17.dirname(url.fileURLToPath(import.meta.url));
   let dir = here;
   for (let i = 0;i < 6; i++) {
-    if (existsSync4(path16.join(dir, "package.json")) && existsSync4(path16.join(dir, "assets", "adr-init"))) {
-      return path16.join(dir, "assets", "adr-init");
+    if (existsSync4(path17.join(dir, "package.json")) && existsSync4(path17.join(dir, "assets", "adr-init"))) {
+      return path17.join(dir, "assets", "adr-init");
     }
-    const parent = path16.dirname(dir);
+    const parent = path17.dirname(dir);
     if (parent === dir)
       break;
     dir = parent;
@@ -13235,13 +13364,13 @@ function resolveAssetsRoot() {
   const xdgConfig = process.env["XDG_CONFIG_HOME"];
   const homeDir = process.env["HOME"] ?? process.env["USERPROFILE"] ?? "";
   const fallbackRoots = [
-    xdgConfig ? path16.join(xdgConfig, "opencode") : null,
-    path16.join(homeDir, ".config", "opencode"),
-    process.env["APPDATA"] ? path16.join(process.env["APPDATA"], "opencode") : null,
-    process.env["LOCALAPPDATA"] ? path16.join(process.env["LOCALAPPDATA"], "opencode") : null
+    xdgConfig ? path17.join(xdgConfig, "opencode") : null,
+    path17.join(homeDir, ".config", "opencode"),
+    process.env["APPDATA"] ? path17.join(process.env["APPDATA"], "opencode") : null,
+    process.env["LOCALAPPDATA"] ? path17.join(process.env["LOCALAPPDATA"], "opencode") : null
   ].filter(Boolean);
   for (const root of fallbackRoots) {
-    const candidate = path16.join(root, "assets", "adr-init");
+    const candidate = path17.join(root, "assets", "adr-init");
     if (existsSync4(candidate)) {
       return candidate;
     }
@@ -13278,7 +13407,7 @@ function runGitConfigHooksPath(cwd) {
   }
 }
 async function runAdrInit(opts = {}) {
-  const cwd = path16.resolve(opts.cwd ?? process.cwd());
+  const cwd = path17.resolve(opts.cwd ?? process.cwd());
   const force = !!opts.force;
   const dryRun = !!opts.dryRun;
   const writePrepare = !!opts.writePrepare;
@@ -13327,8 +13456,8 @@ async function runAdrInit(opts = {}) {
     });
   }
   for (const item of plan) {
-    const srcAbs = path16.join(assetsRoot, item.src);
-    const dstAbs = path16.join(cwd, item.dst);
+    const srcAbs = path17.join(assetsRoot, item.src);
+    const dstAbs = path17.join(cwd, item.dst);
     if (!existsSync4(srcAbs)) {
       result.warnings.push(`资产缺失：${item.src}（跳过 ${item.dst}）`);
       continue;
@@ -13341,7 +13470,7 @@ async function runAdrInit(opts = {}) {
       const bakRel = `${item.dst}.bak.${ts}`;
       if (!dryRun) {
         try {
-          await fsp.copyFile(dstAbs, path16.join(cwd, bakRel));
+          await fsp.copyFile(dstAbs, path17.join(cwd, bakRel));
         } catch (e) {
           result.ok = false;
           result.reason = "io_error";
@@ -13353,7 +13482,7 @@ async function runAdrInit(opts = {}) {
     }
     if (!dryRun) {
       try {
-        await fsp.mkdir(path16.dirname(dstAbs), { recursive: true });
+        await fsp.mkdir(path17.dirname(dstAbs), { recursive: true });
         await fsp.copyFile(srcAbs, dstAbs);
         if (item.chmod !== undefined) {
           try {
@@ -13383,7 +13512,7 @@ async function runAdrInit(opts = {}) {
   } else {
     result.suggestions.push("[dry-run] 将运行：git config core.hooksPath .githooks");
   }
-  const pkgPath = path16.join(cwd, "package.json");
+  const pkgPath = path17.join(cwd, "package.json");
   const isNpm = existsSync4(pkgPath);
   if (isNpm) {
     if (writePrepare) {
@@ -13398,7 +13527,7 @@ async function runAdrInit(opts = {}) {
           const bakRel = `package.json.bak.${ts}`;
           if (!dryRun) {
             try {
-              await fsp.copyFile(pkgPath, path16.join(cwd, bakRel));
+              await fsp.copyFile(pkgPath, path17.join(cwd, bakRel));
             } catch (e) {
               result.warnings.push(`备份 package.json 失败：${e instanceof Error ? e.message : String(e)}`);
             }
@@ -13777,24 +13906,24 @@ async function sendParentNotice(client, sessionID, text, opts = {}) {
 init_decision_parser();
 
 // lib/parent-map-store.ts
-import { promises as fs13 } from "node:fs";
-import * as path17 from "node:path";
+import { promises as fs14 } from "node:fs";
+import * as path18 from "node:path";
 var PARENT_MAP_VERSION = 1;
 var PARENT_MAP_LOCK_TIMEOUT_MS = 2000;
 var PARENT_MAP_MAX_ENTRIES = 256;
 function parentMapDir(mainRoot) {
-  return path17.join(runtimeDir(path17.resolve(mainRoot), { ensure: false }), "session-worktrees");
+  return path18.join(runtimeDir(path18.resolve(mainRoot), { ensure: false }), "session-worktrees");
 }
 function parentMapPath(mainRoot) {
-  return path17.join(parentMapDir(mainRoot), "parent-map.json");
+  return path18.join(parentMapDir(mainRoot), "parent-map.json");
 }
 function parentMapLockPath(mainRoot) {
-  return path17.join(parentMapDir(mainRoot), "parent-map.lock");
+  return path18.join(parentMapDir(mainRoot), "parent-map.lock");
 }
 async function readParentMapFile(mainRoot) {
   const file = parentMapPath(mainRoot);
   try {
-    const raw = await fs13.readFile(file, "utf8");
+    const raw = await fs14.readFile(file, "utf8");
     const parsed = JSON.parse(raw);
     if (parsed.version !== PARENT_MAP_VERSION || !Array.isArray(parsed.entries)) {
       return { version: PARENT_MAP_VERSION, entries: [] };
@@ -13809,10 +13938,10 @@ async function readParentMapFile(mainRoot) {
 }
 async function writeParentMapFile(mainRoot, payload) {
   const file = parentMapPath(mainRoot);
-  await fs13.mkdir(path17.dirname(file), { recursive: true });
+  await fs14.mkdir(path18.dirname(file), { recursive: true });
   const tmp = `${file}.tmp-${process.pid}-${Date.now()}`;
-  await fs13.writeFile(tmp, JSON.stringify(payload, null, 2), "utf8");
-  await fs13.rename(tmp, file);
+  await fs14.writeFile(tmp, JSON.stringify(payload, null, 2), "utf8");
+  await fs14.rename(tmp, file);
 }
 function capEntriesByTsDesc(entries) {
   if (entries.length <= PARENT_MAP_MAX_ENTRIES)
@@ -13844,7 +13973,7 @@ async function loadParentMap(mainRoot) {
 }
 async function mutateParentMap(mainRoot, mutator, opts = {}) {
   const lockPath = parentMapLockPath(mainRoot);
-  await fs13.mkdir(path17.dirname(lockPath), { recursive: true });
+  await fs14.mkdir(path18.dirname(lockPath), { recursive: true });
   const lockOpts = {
     timeoutMs: opts.timeoutMs ?? PARENT_MAP_LOCK_TIMEOUT_MS,
     ...opts
@@ -13863,7 +13992,7 @@ async function appendParentEntry(mainRoot, childID, parentID, ts, opts = {}) {
   if (!childID || !parentID)
     return;
   const lockPath = parentMapLockPath(mainRoot);
-  await fs13.mkdir(path17.dirname(lockPath), { recursive: true });
+  await fs14.mkdir(path18.dirname(lockPath), { recursive: true });
   const lockOpts = {
     timeoutMs: opts.timeoutMs ?? PARENT_MAP_LOCK_TIMEOUT_MS,
     ...opts
@@ -14196,8 +14325,8 @@ function clip3(s, max) {
 }
 
 // lib/codeforge-runtime.ts
-import { promises as fs14 } from "node:fs";
-import * as path18 from "node:path";
+import { promises as fs15 } from "node:fs";
+import * as path19 from "node:path";
 var DEFAULT_RUNTIME = {
   autonomy: {
     downgrade_on_risky: true
@@ -14240,10 +14369,10 @@ function loadRuntimeSync(opts = {}) {
 }
 async function loadRuntime(opts = {}) {
   const root = opts.root ?? process.cwd();
-  const abs = path18.resolve(root, opts.file ?? CONFIG_FILE);
+  const abs = path19.resolve(root, opts.file ?? CONFIG_FILE);
   let raw;
   try {
-    raw = await fs14.readFile(abs, "utf8");
+    raw = await fs15.readFile(abs, "utf8");
   } catch (e) {
     const code = e.code;
     if (code === "ENOENT") {
@@ -14803,7 +14932,7 @@ var codeforgeToolsServer = async (ctx) => {
       review_approval: tool({
         description: description4,
         args: {
-          verdict: z16.enum(["APPROVE", "APPROVE_WITH_NOTES"]).describe("审批裁决；REQUEST_CHANGES / BLOCK 不应调本工具"),
+          verdict: z16.enum(["APPROVE", "APPROVE_WITH_NOTES"]).describe("审批层裁决（审计字段，与协议层独立）；REQUEST_CHANGES / BLOCK 不应调本工具。⚠️ 不要把本字段值复制到 reviewer 输出的 `## Decision` 节首行 — 那是协议层 3 档。"),
           pendingIds: z16.array(z16.string().min(1)).min(1).describe("本次 APPROVE 覆盖的 pending change id 列表"),
           notes: z16.string().min(1).max(2000).describe("审阅意见摘要（建议 ≤ 500 字）"),
           decisionLine: z16.string().optional().describe("`## Decision` 节首行原文（默认 verdict 字面量，机审证据）"),
@@ -14964,7 +15093,7 @@ var handler7 = codeforgeToolsServer;
 
 // plugins/discover-spec-suggest.ts
 import { readFileSync as readFileSync3, readdirSync, statSync as statSync2 } from "node:fs";
-import { join as join15 } from "node:path";
+import { join as join16 } from "node:path";
 
 // lib/handoff-schema.ts
 import { z as z17 } from "zod";
@@ -15131,9 +15260,9 @@ function validateHandoff(rawYaml, fileSize) {
   const result = HandoffSchema.safeParse(parsed);
   if (!result.success) {
     const first = result.error.issues[0];
-    const path19 = first?.path?.join(".") ?? "(root)";
+    const path20 = first?.path?.join(".") ?? "(root)";
     const msg = first?.message ?? "unknown";
-    return { ok: false, reason: `schema 校验失败：${path19}: ${msg}` };
+    return { ok: false, reason: `schema 校验失败：${path20}: ${msg}` };
   }
   return { ok: true, data: result.data, schemaVersion: result.data.schema_version };
 }
@@ -15150,7 +15279,7 @@ var SESSION_TTL_MS2 = 24 * 60 * 60 * 1000;
 var MATCH_THRESHOLD = 0.15;
 var MAX_CANDIDATES = 3;
 var NUDGE_MAX_LEN = 1500;
-var SPECS_REL_DIR = join15("docs", "specs");
+var SPECS_REL_DIR = join16("docs", "specs");
 var sessionMap = new Map;
 function pruneIfOversize2() {
   while (sessionMap.size > SESSION_CAP2) {
@@ -15257,7 +15386,7 @@ function loadSpecs(rootDir, opts = {}) {
   const dirExists = opts.dirExists ?? defaultDirExists;
   const statReader = opts.statReader ?? defaultStatReader;
   const log6 = makePluginLogger(PLUGIN_NAME8);
-  const specsRoot = join15(rootDir, SPECS_REL_DIR);
+  const specsRoot = join16(rootDir, SPECS_REL_DIR);
   const records = [];
   if (!dirExists(specsRoot)) {
     log6.info(`specs 目录不存在，plugin 将 no-op`, { specsRoot });
@@ -15278,7 +15407,7 @@ function loadSpecs(rootDir, opts = {}) {
       log6.info(`跳过非合法 slug 命名的条目`, { entry });
       continue;
     }
-    const specDir = join15(specsRoot, entry);
+    const specDir = join16(specsRoot, entry);
     let dirStat;
     try {
       dirStat = statReader(specDir);
@@ -15291,7 +15420,7 @@ function loadSpecs(rootDir, opts = {}) {
     }
     if (!dirStat.isDirectory)
       continue;
-    const handoffPath = join15(specDir, "handoff.yaml");
+    const handoffPath = join16(specDir, "handoff.yaml");
     let fileStat;
     try {
       fileStat = statReader(handoffPath);
@@ -15463,14 +15592,14 @@ var discoverSpecSuggestServer = async (ctx) => {
 var handler8 = discoverSpecSuggestServer;
 
 // lib/memories.ts
-import { promises as fs15 } from "node:fs";
-import * as path19 from "node:path";
+import { promises as fs16 } from "node:fs";
+import * as path20 from "node:path";
 import * as os5 from "node:os";
 function resolveConfig(c) {
   return {
     projectRoot: c.projectRoot,
     homeDir: c.homeDir ?? os5.homedir(),
-    projectName: c.projectName ?? path19.basename(c.projectRoot),
+    projectName: c.projectName ?? path20.basename(c.projectRoot),
     now: c.now ?? Date.now,
     log: c.log ?? (() => {}),
     maxPerScope: c.maxPerScope ?? 1000
@@ -15478,13 +15607,13 @@ function resolveConfig(c) {
 }
 function fileFor(scope, cfg) {
   if (scope === "project") {
-    return path19.join(cfg.projectRoot, ".codeforge", "memories.json");
+    return path20.join(cfg.projectRoot, ".codeforge", "memories.json");
   }
-  return path19.join(cfg.homeDir, ".codeforge", "memories.json");
+  return path20.join(cfg.homeDir, ".codeforge", "memories.json");
 }
 async function readBank(p) {
   try {
-    const raw = await fs15.readFile(p, "utf8");
+    const raw = await fs16.readFile(p, "utf8");
     const arr = JSON.parse(raw);
     if (!Array.isArray(arr))
       return [];
@@ -15494,10 +15623,10 @@ async function readBank(p) {
   }
 }
 async function writeBank(p, items) {
-  await fs15.mkdir(path19.dirname(p), { recursive: true });
+  await fs16.mkdir(path20.dirname(p), { recursive: true });
   const tmp = `${p}.tmp`;
-  await fs15.writeFile(tmp, JSON.stringify(items, null, 2), "utf8");
-  await fs15.rename(tmp, p);
+  await fs16.writeFile(tmp, JSON.stringify(items, null, 2), "utf8");
+  await fs16.rename(tmp, p);
 }
 function isMemory(x) {
   if (!x || typeof x !== "object")
@@ -16015,7 +16144,7 @@ var handler10 = modelFallbackServer;
 
 // plugins/subtask-heartbeat.ts
 import { promises as fsPromises } from "node:fs";
-import * as path20 from "node:path";
+import * as path21 from "node:path";
 var recordSessionParent2 = recordSessionParent;
 var lookupParentSessionId2 = lookupParentSessionId;
 var deleteSessionParent2 = deleteSessionParent;
@@ -16362,7 +16491,7 @@ function buildErrorLogLine(errorReason, elapsedMs, now = Date.now()) {
 }
 async function appendSubagentLog(filePath, line, log7) {
   try {
-    await fsPromises.mkdir(path20.dirname(filePath), { recursive: true });
+    await fsPromises.mkdir(path21.dirname(filePath), { recursive: true });
     await fsPromises.appendFile(filePath, line + `
 `, "utf8");
   } catch (err) {
@@ -16730,7 +16859,7 @@ var handler12 = parallelStatusServer;
 
 // plugins/parallel-tool-nudge.ts
 import { readFileSync as readFileSync4, readdirSync as readdirSync2, statSync as statSync3 } from "node:fs";
-import { join as join17 } from "node:path";
+import { join as join18 } from "node:path";
 import { homedir as homedir6 } from "node:os";
 var PLUGIN_NAME13 = "parallel-tool-nudge";
 logLifecycle(PLUGIN_NAME13, "import", {});
@@ -16783,10 +16912,10 @@ function loadAgentToolsMap(rootDir, opts = {}) {
   const reader = opts.reader ?? defaultReader2;
   const dirReader = opts.dirReader ?? defaultDirReader2;
   const dirExists = opts.dirExists ?? defaultDirExists2;
-  const homeAgentsDir = opts.homeAgentsDir ?? join17(homedir6(), ".config", "opencode", "agents");
+  const homeAgentsDir = opts.homeAgentsDir ?? join18(homedir6(), ".config", "opencode", "agents");
   const candidateDirs = [
-    join17(rootDir, ".codeforge", "agents"),
-    join17(rootDir, "agents"),
+    join18(rootDir, ".codeforge", "agents"),
+    join18(rootDir, "agents"),
     homeAgentsDir
   ];
   const result = new Map;
@@ -16809,20 +16938,20 @@ function loadAgentToolsMap(rootDir, opts = {}) {
     for (const entry of entries) {
       if (!entry.endsWith(".md"))
         continue;
-      const path21 = join17(dir, entry);
+      const path22 = join18(dir, entry);
       let content;
       try {
-        content = reader(path21);
+        content = reader(path22);
       } catch (err) {
         log8.warn(`agent.md 读取失败（已跳过）`, {
-          path: path21,
+          path: path22,
           error: err instanceof Error ? err.message : String(err)
         });
         continue;
       }
       const parsed = parseAgentFrontmatter(content);
       if (!parsed) {
-        log8.warn(`agent frontmatter 解析失败（已跳过）`, { path: path21 });
+        log8.warn(`agent frontmatter 解析失败（已跳过）`, { path: path22 });
         continue;
       }
       if (result.has(parsed.name))
@@ -17013,18 +17142,18 @@ var handler14 = async (_ctx3) => {
 };
 
 // lib/event-stream.ts
-import { promises as fs16 } from "node:fs";
-import * as path21 from "node:path";
+import { promises as fs17 } from "node:fs";
+import * as path22 from "node:path";
 async function loadSession(id, opts = {}) {
   const file = resolveSessionFile(id, opts);
-  const raw = await fs16.readFile(file, "utf8");
+  const raw = await fs17.readFile(file, "utf8");
   return parseJsonl(id, raw);
 }
 async function listSessions(opts = {}) {
   const dir = resolveDir(opts);
   let entries;
   try {
-    entries = await fs16.readdir(dir, { withFileTypes: true });
+    entries = await fs17.readdir(dir, { withFileTypes: true });
   } catch (err) {
     if (err.code === "ENOENT")
       return [];
@@ -17034,10 +17163,10 @@ async function listSessions(opts = {}) {
   for (const e of entries) {
     if (!e.isFile() || !e.name.endsWith(".jsonl"))
       continue;
-    const file = path21.join(dir, e.name);
+    const file = path22.join(dir, e.name);
     const id = e.name.replace(/\.jsonl$/, "");
     try {
-      const stat = await fs16.stat(file);
+      const stat = await fs17.stat(file);
       const headerLine = await readFirstLine(file);
       let started_at = stat.birthtimeMs;
       if (headerLine) {
@@ -17061,11 +17190,11 @@ async function listSessions(opts = {}) {
   return out;
 }
 function resolveDir(opts = {}) {
-  const root = path21.resolve(opts.root ?? process.cwd());
-  return opts.sessions_dir ? path21.resolve(root, opts.sessions_dir) : path21.join(runtimeDir(root), "sessions");
+  const root = path22.resolve(opts.root ?? process.cwd());
+  return opts.sessions_dir ? path22.resolve(root, opts.sessions_dir) : path22.join(runtimeDir(root), "sessions");
 }
 function resolveSessionFile(id, opts = {}) {
-  return path21.join(resolveDir(opts), `${id}.jsonl`);
+  return path22.join(resolveDir(opts), `${id}.jsonl`);
 }
 function parseJsonl(id, raw) {
   const events = [];
@@ -17100,7 +17229,7 @@ function isEvent(obj) {
 }
 async function readFirstLine(file) {
   const buf = Buffer.alloc(4096);
-  const fh = await fs16.open(file, "r");
+  const fh = await fs17.open(file, "r");
   try {
     const { bytesRead } = await fh.read(buf, 0, buf.length, 0);
     const s = buf.subarray(0, bytesRead).toString("utf8");
@@ -17328,11 +17457,11 @@ function isRecoveryWorthShowing(plan) {
 }
 
 // lib/block-pending.ts
-import { promises as fs17 } from "node:fs";
-import * as path22 from "node:path";
+import { promises as fs18 } from "node:fs";
+import * as path23 from "node:path";
 function blockPendingFilePath(absRoot) {
   const rd = runtimeDir(absRoot, { ensure: false });
-  return path22.join(rd, "sessions", "autonomous-blocks.ndjson");
+  return path23.join(rd, "sessions", "autonomous-blocks.ndjson");
 }
 function consumeLockPath(absRoot) {
   return blockPendingFilePath(absRoot) + ".consume.lock";
@@ -17341,7 +17470,7 @@ async function scanBlockPending(absRoot, filterSessionId) {
   const file = blockPendingFilePath(absRoot);
   let raw;
   try {
-    raw = await fs17.readFile(file, "utf8");
+    raw = await fs18.readFile(file, "utf8");
   } catch {
     return [];
   }
@@ -17397,7 +17526,7 @@ async function markBlocksConsumed(absRoot, entries) {
   if (entries.length === 0)
     return;
   const file = blockPendingFilePath(absRoot);
-  await fs17.mkdir(path22.dirname(file), { recursive: true });
+  await fs18.mkdir(path23.dirname(file), { recursive: true });
   const now = new Date().toISOString();
   const lines = entries.map((e) => ({
     type: "consume",
@@ -17408,7 +17537,7 @@ async function markBlocksConsumed(absRoot, entries) {
 `) + `
 `;
   await withFileLock(consumeLockPath(absRoot), async () => {
-    await fs17.appendFile(file, lines, "utf8");
+    await fs18.appendFile(file, lines, "utf8");
   });
 }
 
@@ -17546,8 +17675,8 @@ var sessionRecoveryServer = async (ctx) => {
 var handler15 = sessionRecoveryServer;
 
 // plugins/subtasks.ts
-import { promises as fs18 } from "node:fs";
-import * as path23 from "node:path";
+import { promises as fs19 } from "node:fs";
+import * as path24 from "node:path";
 
 // lib/parallel-merge.ts
 init_worktree_ops();
@@ -18371,7 +18500,7 @@ function sleep2(ms) {
 // plugins/subtasks.ts
 var PLUGIN_NAME16 = "subtasks";
 function getLogFile(root = process.cwd()) {
-  return path23.join(runtimeDir(root), "logs", "subtasks.log");
+  return path24.join(runtimeDir(root), "logs", "subtasks.log");
 }
 var VERB_RE = /^([a-zA-Z]{3,12})/;
 var CN_VERBS = [
@@ -18676,8 +18805,8 @@ async function writeLog(level, msg, data) {
 `;
   try {
     const logFile = getLogFile();
-    await fs18.mkdir(path23.dirname(logFile), { recursive: true });
-    await fs18.appendFile(logFile, line, "utf8");
+    await fs19.mkdir(path24.dirname(logFile), { recursive: true });
+    await fs19.appendFile(logFile, line, "utf8");
   } catch {}
 }
 logLifecycle(PLUGIN_NAME16, "import");
@@ -19308,8 +19437,8 @@ var tokenManagerServer = async (ctx) => {
 var handler18 = tokenManagerServer;
 
 // plugins/tool-policy.ts
-import { promises as fs19 } from "node:fs";
-import * as path25 from "node:path";
+import { promises as fs20 } from "node:fs";
+import * as path26 from "node:path";
 
 // lib/tool-risk.ts
 var RISK_PATTERNS = [
@@ -19463,7 +19592,7 @@ function buildHaystackFor(args, matchOn) {
 }
 
 // lib/file-regex-acl.ts
-import * as path24 from "node:path";
+import * as path25 from "node:path";
 function compileRule(r) {
   if (r instanceof RegExp)
     return r;
@@ -19529,7 +19658,7 @@ function normalizePath2(p) {
   let s = p.replace(/\\/g, "/");
   if (s.startsWith("./"))
     s = s.slice(2);
-  s = path24.posix.normalize(s);
+  s = path25.posix.normalize(s);
   return s;
 }
 function checkFileAccess(acl, file, op) {
@@ -19632,11 +19761,11 @@ function decideToolCall(ctx, cfg = {}, currentAgent) {
   const action = risks.length > 0 || worstAcl === "deny" ? "deny" : "allow";
   return { action, reasons, risks, acl: aclResults };
 }
-var POLICY_PATH = path25.join(".codeforge", "policy.json");
+var POLICY_PATH = path26.join(".codeforge", "policy.json");
 async function loadPolicy(root = process.cwd()) {
-  const file = path25.join(root, POLICY_PATH);
+  const file = path26.join(root, POLICY_PATH);
   try {
-    const raw = await fs19.readFile(file, "utf8");
+    const raw = await fs20.readFile(file, "utf8");
     const data = JSON.parse(raw);
     return data;
   } catch {
@@ -19734,7 +19863,7 @@ var handler19 = toolPolicyServer;
 // plugins/update-checker.ts
 import { existsSync as existsSync6, rmSync } from "node:fs";
 import { homedir as homedir8 } from "node:os";
-import { join as join23 } from "node:path";
+import { join as join24 } from "node:path";
 import { spawnSync as spawnSync2 } from "node:child_process";
 
 // lib/update-checker-impl.ts
@@ -19752,7 +19881,7 @@ import {
   writeFileSync as writeFileSync2
 } from "node:fs";
 import { homedir as homedir7, tmpdir } from "node:os";
-import { dirname as dirname14, join as join22 } from "node:path";
+import { dirname as dirname14, join as join23 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 import * as https from "node:https";
 import * as zlib from "node:zlib";
@@ -19760,7 +19889,7 @@ import * as zlib from "node:zlib";
 // lib/version-injected.ts
 function getInjectedVersion() {
   try {
-    const v = "0.6.5";
+    const v = "0.6.6";
     if (typeof v === "string" && /^\d+\.\d+\.\d+/.test(v)) {
       return v;
     }
@@ -19850,17 +19979,17 @@ function readLocalVersion() {
   try {
     const here = fileURLToPath2(import.meta.url);
     const root = dirname14(dirname14(here));
-    const pkg = JSON.parse(readFileSync5(join22(root, "package.json"), "utf8"));
+    const pkg = JSON.parse(readFileSync5(join23(root, "package.json"), "utf8"));
     return typeof pkg.version === "string" ? pkg.version : "0.0.0";
   } catch {
     return "0.0.0";
   }
 }
 function defaultCacheDir() {
-  return process.env["CODEFORGE_CACHE_DIR"] ?? join22(homedir7(), ".cache", "codeforge");
+  return process.env["CODEFORGE_CACHE_DIR"] ?? join23(homedir7(), ".cache", "codeforge");
 }
 function defaultCacheFile() {
-  return join22(defaultCacheDir(), "update-check.json");
+  return join23(defaultCacheDir(), "update-check.json");
 }
 function readCache(file) {
   try {
@@ -20016,14 +20145,14 @@ function defaultHttpFetcher(url2, timeoutMs) {
   });
 }
 async function downloadAndExtractBundle(opts) {
-  const tmpRoot = opts.tmpDir ?? mkdtempSync(join22(tmpdir(), "codeforge-update-"));
+  const tmpRoot = opts.tmpDir ?? mkdtempSync(join23(tmpdir(), "codeforge-update-"));
   mkdirSync3(tmpRoot, { recursive: true });
   const fetcher = opts.tarballFetcher ?? defaultBinaryFetcher;
   const tarballBuf = await fetcher(opts.tarballUrl);
   verifyIntegrity(tarballBuf, opts.expectedIntegrity);
   const tarBuf = zlib.gunzipSync(tarballBuf);
   extractTarToDir(tarBuf, tmpRoot);
-  const bundlePath = join22(tmpRoot, "package", "dist", "index.js");
+  const bundlePath = join23(tmpRoot, "package", "dist", "index.js");
   if (!existsSync5(bundlePath)) {
     throw new Error(`bundle_not_found: ${bundlePath}`);
   }
@@ -20063,11 +20192,11 @@ function extractTarToDir(tarBuf, destRoot) {
     offset += 512;
     if (typeFlag === "0" || typeFlag === "" || typeFlag === "\x00") {
       const fileBuf = tarBuf.subarray(offset, offset + size);
-      const dest = join22(destRoot, fullName);
+      const dest = join23(destRoot, fullName);
       mkdirSync3(dirname14(dest), { recursive: true });
       writeFileSync2(dest, fileBuf);
     } else if (typeFlag === "5") {
-      mkdirSync3(join22(destRoot, fullName), { recursive: true });
+      mkdirSync3(join23(destRoot, fullName), { recursive: true });
     }
     offset += Math.ceil(size / 512) * 512;
   }
@@ -20176,7 +20305,7 @@ function cleanupOldBackups(target, keep) {
     const base = target.substring(dir.length + 1);
     const prefix = `${base}.bak.`;
     const all = readdirSync3(dir).filter((f) => f.startsWith(prefix)).map((f) => {
-      const full = join22(dir, f);
+      const full = join23(dir, f);
       let mtimeMs = 0;
       try {
         mtimeMs = statSync4(full).mtimeMs;
@@ -20198,7 +20327,7 @@ function loadCompatibility(opts) {
       const root = opts?.cwd ?? inferPluginRoot();
       if (!root)
         return null;
-      file = join22(root, "compatibility.json");
+      file = join23(root, "compatibility.json");
     }
     if (!existsSync5(file))
       return null;
@@ -20389,10 +20518,11 @@ var updateCheckerServer = async (ctx) => {
           expectedIntegrity: npmResult.integrity
         });
         try {
-          const installMjs = join23(extractDir, "package", "install.mjs");
+          const installMjs = join24(extractDir, "package", "install.mjs");
           if (existsSync6(installMjs)) {
-            const r = spawnSync2(process.execPath, [installMjs, "--global", "--skip-build"], {
-              cwd: join23(extractDir, "package"),
+            const nodeBin = resolveNodeBin();
+            const r = spawnSync2(nodeBin, [installMjs, "--global", "--skip-build"], {
+              cwd: join24(extractDir, "package"),
               stdio: "pipe",
               encoding: "utf8"
             });
@@ -20411,6 +20541,7 @@ var updateCheckerServer = async (ctx) => {
             safeWriteLog(PLUGIN_NAME20, {
               level: "warn",
               msg: "install_mjs_failed",
+              nodeBin,
               status: r.status,
               stderr: r.stderr?.slice(0, 500),
               stdout: r.stdout?.slice(0, 500)
@@ -20449,6 +20580,41 @@ var updateCheckerServer = async (ctx) => {
   });
   return {};
 };
+function resolveNodeBin() {
+  const IS_WIN = process.platform === "win32";
+  try {
+    const r = spawnSync2(IS_WIN ? "where" : "which", ["node"], {
+      encoding: "utf8",
+      stdio: "pipe"
+    });
+    if (r.status === 0 && r.stdout.trim()) {
+      const first = r.stdout.trim().split(/\r?\n/)[0].trim();
+      if (first)
+        return first;
+    }
+  } catch {}
+  const candidates = IS_WIN ? [
+    "C:\\Program Files\\nodejs\\node.exe",
+    "C:\\Program Files (x86)\\nodejs\\node.exe"
+  ] : [
+    "/usr/local/bin/node",
+    "/usr/bin/node",
+    "/opt/homebrew/bin/node",
+    "/opt/homebrew/opt/node/bin/node"
+  ];
+  for (const c of candidates) {
+    try {
+      const t = spawnSync2(c, ["--version"], {
+        encoding: "utf8",
+        stdio: "pipe",
+        timeout: 2000
+      });
+      if (t.status === 0)
+        return c;
+    } catch {}
+  }
+  return process.execPath;
+}
 function detectOpencodeVersion() {
   const env = process.env["OPENCODE_VERSION"];
   if (env && env.trim().length > 0)
@@ -20457,14 +20623,14 @@ function detectOpencodeVersion() {
 }
 function getOpencodeBundlePath() {
   const candidates = [];
-  candidates.push(join23(homedir8(), ".config", "opencode", "codeforge", "index.js"));
+  candidates.push(join24(homedir8(), ".config", "opencode", "codeforge", "index.js"));
   if (process.platform === "win32") {
     const appData = process.env["APPDATA"];
     if (appData)
-      candidates.push(join23(appData, "opencode", "codeforge", "index.js"));
+      candidates.push(join24(appData, "opencode", "codeforge", "index.js"));
     const localAppData = process.env["LOCALAPPDATA"];
     if (localAppData)
-      candidates.push(join23(localAppData, "opencode", "codeforge", "index.js"));
+      candidates.push(join24(localAppData, "opencode", "codeforge", "index.js"));
   }
   for (const c of candidates) {
     if (existsSync6(c))
@@ -20525,11 +20691,11 @@ async function postToast(ctx, message) {
 var handler20 = updateCheckerServer;
 
 // plugins/workflow-engine.ts
-import * as path27 from "node:path";
+import * as path28 from "node:path";
 
 // lib/workflow-loader.ts
-import { promises as fs20 } from "node:fs";
-import * as path26 from "node:path";
+import { promises as fs21 } from "node:fs";
+import * as path27 from "node:path";
 import { z as z18 } from "zod";
 var ActionSchema = z18.object({
   tool: z18.string().min(1, "action.tool 不能为空"),
@@ -20615,7 +20781,7 @@ function parseWorkflowYaml(yaml, sourcePath = "<inline>") {
 async function loadWorkflowFromFile(filePath) {
   let txt;
   try {
-    txt = await fs20.readFile(filePath, "utf8");
+    txt = await fs21.readFile(filePath, "utf8");
   } catch (err) {
     return {
       ok: false,
@@ -20630,7 +20796,7 @@ async function loadWorkflowsFromDir(dir) {
   const failed = [];
   let entries;
   try {
-    entries = await fs20.readdir(dir);
+    entries = await fs21.readdir(dir);
   } catch (err) {
     const e = err;
     if (e.code === "ENOENT")
@@ -20642,7 +20808,7 @@ async function loadWorkflowsFromDir(dir) {
       continue;
     if (!/\.ya?ml$/i.test(name))
       continue;
-    const full = path26.join(dir, name);
+    const full = path27.join(dir, name);
     const r = await loadWorkflowFromFile(full);
     if (r.ok)
       loaded.push(r);
@@ -21032,7 +21198,7 @@ async function handleCommandInvoked(raw, workflowsDir = "workflows") {
 }
 var workflowEngineServer = async (ctx) => {
   const directory = ctx.directory ?? process.cwd();
-  const workflowsDir = path27.join(directory, "workflows");
+  const workflowsDir = path28.join(directory, "workflows");
   ensureRegistry(workflowsDir).catch((err) => fallbackLog2.warn(`[${PLUGIN_NAME21}] preload workflows failed`, {
     error: err instanceof Error ? err.message : String(err)
   }));
@@ -21076,7 +21242,8 @@ var workflowEngineServer = async (ctx) => {
 var handler21 = workflowEngineServer;
 
 // plugins/session-worktree-guard.ts
-import path28 from "node:path";
+import path29 from "node:path";
+import { stat } from "node:fs/promises";
 var PLUGIN_NAME22 = "session-worktree-guard";
 logLifecycle(PLUGIN_NAME22, "import", {});
 var WRITE_INTENT_RE = />(?![=&])(?!\s*\/dev\/(?:null|stdout|stderr|fd\/\d+)\b)|\btee\b|\brm\b|\bmv\b|\bcp\b|\bmkdir\b|\btouch\b|\bchmod\b|\bchown\b|\bln\b/;
@@ -21188,23 +21355,23 @@ var MERGE_CALLER_WHITELIST = new Set([
 var FORCE_MERGE_CALLER_WHITELIST = new Set([
   "codeforge"
 ]);
-var CODEFORGE_WORKTREE_DIR_NAME = path28.join(".git", "codeforge-worktrees");
+var CODEFORGE_WORKTREE_DIR_NAME = path29.join(".git", "codeforge-worktrees");
 function worktreesRoot(mainRoot) {
-  return path28.join(mainRoot, CODEFORGE_WORKTREE_DIR_NAME);
+  return path29.join(mainRoot, CODEFORGE_WORKTREE_DIR_NAME);
 }
 function isInsideAnyWorktreeDir(absPath, mainRoot) {
-  if (!path28.isAbsolute(absPath))
+  if (!path29.isAbsolute(absPath))
     return false;
   const root = worktreesRoot(mainRoot);
   if (absPath === root)
     return false;
-  const prefix = root.endsWith(path28.sep) ? root : root + path28.sep;
+  const prefix = root.endsWith(path29.sep) ? root : root + path29.sep;
   return absPath.startsWith(prefix);
 }
 function rewritePath(value, mainRoot, worktreeRoot) {
   if (!value)
     return null;
-  const resolved = path28.isAbsolute(value) ? value : path28.resolve(mainRoot, value);
+  const resolved = path29.isAbsolute(value) ? value : path29.resolve(mainRoot, value);
   const wtPrefix2 = worktreeRoot.endsWith("/") ? worktreeRoot : worktreeRoot + "/";
   if (resolved === worktreeRoot || resolved.startsWith(wtPrefix2)) {
     return null;
@@ -21242,7 +21409,7 @@ function commandContainsMainRootExcludingWorktree(command, mainRoot, worktreePat
     }
   }
   const wtRoot = worktreesRoot(mainRoot);
-  const wtRootPrefix = wtRoot + path28.sep;
+  const wtRootPrefix = wtRoot + path29.sep;
   const escapedWtRootPrefix = escapeRegex(wtRootPrefix);
   const wtPathPattern = escapedWtRootPrefix + `[^\\s'"\\x60)]*`;
   const allWorktreePathsReForEscape = new RegExp(wtPathPattern, "g");
@@ -21297,12 +21464,24 @@ function collectWritePaths(toolName, argsObj, worktreeRoot) {
   const candidate = toolName === "write" || toolName === "edit" ? argsObj["filePath"] : toolName === "ast_edit" ? argsObj["target"] : undefined;
   if (typeof candidate !== "string" || candidate.length === 0)
     return out;
-  const abs = path28.isAbsolute(candidate) ? candidate : path28.resolve(worktreeRoot, candidate);
-  const rel = path28.relative(worktreeRoot, abs).split(path28.sep).join("/");
+  const abs = path29.isAbsolute(candidate) ? candidate : path29.resolve(worktreeRoot, candidate);
+  const rel = path29.relative(worktreeRoot, abs).split(path29.sep).join("/");
   out.push(rel);
   return out;
 }
 var log13 = makePluginLogger(PLUGIN_NAME22);
+async function isCodeforgeManagedProject(mainRoot, opts = {}) {
+  const env = opts.env ?? process.env;
+  const force = env["CODEFORGE_FORCE_WORKTREE_GUARD"];
+  if (force === "1" || force === "true" || force === "yes")
+    return true;
+  try {
+    const st = await stat(path29.join(mainRoot, ".codeforge"));
+    return st.isDirectory();
+  } catch {
+    return false;
+  }
+}
 function resolveMainRoot2(rawDir) {
   const worktreeMarker = "/.git/codeforge-worktrees/";
   const idx = rawDir.indexOf(worktreeMarker);
@@ -21325,6 +21504,17 @@ var sessionWorktreeGuardPlugin = async (ctx) => {
     return {};
   }
   const mainRoot = resolveMainRoot2(ctx.directory ?? process.cwd());
+  if (!await isCodeforgeManagedProject(mainRoot)) {
+    log13.info("[guard] 当前项目无 .codeforge/ 目录，session-worktree-guard 不启用；" + "如需在此项目启用 worktree 隔离：mkdir .codeforge", { mainRoot });
+    safeWriteLog(PLUGIN_NAME22, {
+      hook: "activate",
+      action: "skip",
+      source: "non-codeforge-project",
+      mainRoot
+    });
+    logLifecycle(PLUGIN_NAME22, "activate", { skipped: "non-codeforge-project", mainRoot });
+    return {};
+  }
   let policyCfg = {};
   try {
     policyCfg = await loadPolicy(mainRoot);
@@ -21463,8 +21653,31 @@ var sessionWorktreeGuardPlugin = async (ctx) => {
         if (toolName === "session_merge") {
           const action = argsObj["action"];
           if (action === "merge") {
-            const caller = input.agent;
-            if (caller !== undefined && !MERGE_CALLER_WHITELIST.has(caller)) {
+            const caller = await resolveAgentForGuard({ sessionID: input.sessionID, agent: input.agent }, ctx.client, log13);
+            const wantsForce = argsObj["force"] === true;
+            if (caller === null && wantsForce) {
+              const reason = `[session-worktree-guard] DENIED: session_merge action=merge force=true 且 agent 解析失败 (null)；` + `force 旁路无 approval backstop，fail-closed 拒绝 (ADR:subagent-force-merge-hard-deny)`;
+              log13.warn(reason, {
+                sessionId,
+                tool: toolName,
+                action,
+                caller: null,
+                force: true
+              });
+              safeWriteLog(PLUGIN_NAME22, {
+                hook: "tool.execute.before",
+                tool: toolName,
+                sessionID: input.sessionID,
+                action: "deny",
+                source: "merge-caller-null-force-fail-closed",
+                caller: null,
+                merge_action: "merge",
+                force: true
+              });
+              denied = new DeniedError(reason);
+              return;
+            }
+            if (caller !== null && !MERGE_CALLER_WHITELIST.has(caller)) {
               const reason = `[session-worktree-guard] DENIED: session_merge action=merge 仅 codeforge orchestrator / discover / 用户可调；当前 caller=${caller}`;
               log13.warn(reason, {
                 sessionId,
@@ -21484,8 +21697,7 @@ var sessionWorktreeGuardPlugin = async (ctx) => {
               denied = new DeniedError(reason);
               return;
             }
-            const wantsForce = argsObj["force"] === true;
-            if (wantsForce && caller !== undefined && !FORCE_MERGE_CALLER_WHITELIST.has(caller)) {
+            if (wantsForce && caller !== null && !FORCE_MERGE_CALLER_WHITELIST.has(caller)) {
               const reason = `[session-worktree-guard] DENIED: caller=${caller} 禁止 force=true；` + `跳过 review 闭环是破坏性操作，仅用户经 codeforge orchestrator 显式 /merge --force 才允许 ` + `(ADR:discover-self-merge-permission)`;
               log13.warn(reason, {
                 sessionId,
@@ -21712,12 +21924,12 @@ var sessionWorktreeGuardPlugin = async (ctx) => {
 var handler22 = sessionWorktreeGuardPlugin;
 
 // lib/opencode-session-probe.ts
-import * as path29 from "node:path";
+import * as path30 from "node:path";
 import * as os6 from "node:os";
 import { createRequire as createRequire2 } from "node:module";
 var requireFromHere = createRequire2(import.meta.url);
 var DEFAULT_LIVENESS_MS = 6 * 60 * 60000;
-var DEFAULT_DB_PATH = path29.join(os6.homedir(), ".local/share/opencode/opencode.db");
+var DEFAULT_DB_PATH = path30.join(os6.homedir(), ".local/share/opencode/opencode.db");
 function createSessionProbe(opts = {}) {
   const dbPath = opts.dbPath ?? DEFAULT_DB_PATH;
   const httpBaseUrl = opts.httpBaseUrl ?? process.env["OPENCODE_SERVER_URL"];
@@ -21821,7 +22033,8 @@ var _pruneTimer;
 var _probe = null;
 var log14 = makePluginLogger(PLUGIN_NAME23);
 var worktreeLifecyclePlugin = async (ctx) => {
-  const mainRoot = ctx.directory;
+  const rawDir = ctx.directory ?? process.cwd();
+  const mainRoot = resolveMainRoot2(rawDir);
   logLifecycle(PLUGIN_NAME23, "activate", {
     mainRoot: mainRoot ?? "(not set)",
     idle_threshold_ms: IDLE_TOAST_THROTTLE_MS
@@ -21829,6 +22042,17 @@ var worktreeLifecyclePlugin = async (ctx) => {
   if (!mainRoot) {
     return {};
   }
+  if (!await isCodeforgeManagedProject(mainRoot)) {
+    log14.info("[lifecycle] 当前项目无 .codeforge/ 目录，worktree-lifecycle 不启用", { mainRoot });
+    safeWriteLog(PLUGIN_NAME23, {
+      hook: "activate",
+      action: "skip",
+      source: "non-codeforge-project",
+      mainRoot
+    });
+    logLifecycle(PLUGIN_NAME23, "activate", { skipped: "non-codeforge-project", mainRoot });
+    return {};
+  }
   const client = ctx.client;
   if (_probe) {
     try {