@andyqiu/codeforge 0.5.6 → 0.5.8

package/dist/index.js

@@ -750,81 +750,22 @@ var init_kh_client = __esm(() => {
   _warnedKeys = new Set;
 });
 
-// lib/autonomy.ts
-var exports_autonomy = {};
-__export(exports_autonomy, {
+// lib/worktree-ops.ts
+var exports_worktree_ops = {};
+__export(exports_worktree_ops, {
   worktreeHasChanges: () => worktreeHasChanges,
   tryMerge: () => tryMerge,
-  renderDecision: () => renderDecision,
   removeWorktree: () => removeWorktree,
   mergeCommit: () => mergeCommit,
   mergeAbort: () => mergeAbort,
   listWorktrees: () => listWorktrees,
   getMergeConflicts: () => getMergeConflicts,
-  evaluate: () => evaluate,
   ensureWorktree: () => ensureWorktree,
-  commitWorktreeIfDirty: () => commitWorktreeIfDirty,
-  classifyTool: () => classifyTool,
-  DEFAULT_POLICIES: () => DEFAULT_POLICIES
+  commitWorktreeIfDirty: () => commitWorktreeIfDirty
 });
 import { execFile as execFile2 } from "node:child_process";
 import { promises as fs8 } from "node:fs";
 import * as path11 from "node:path";
-function evaluate(mode, intent, opts = {}) {
-  const ignore = new Set(opts.ignore_risks ?? []);
-  const allRisks = [...RISK_PATTERNS, ...opts.extra_risks ?? []];
-  const haystack = buildHaystack(intent.args);
-  const hits = allRisks.filter((p) => !ignore.has(p.tag)).filter((p) => !p.kinds || p.kinds.includes(intent.kind)).filter((p) => p.re.test(haystack)).map((p) => p.tag);
-  let effective = mode;
-  let downgraded = false;
-  let reason;
-  if (hits.length > 0 && mode === "full") {
-    effective = "semi";
-    downgraded = true;
-    reason = `检测到风险操作 [${hits.join(", ")}]，自动从 full 降级到 semi`;
-  } else if (hits.length > 0 && mode !== "step") {}
-  const policy = mergePolicy(effective, opts.policies);
-  const baseAction = policy[intent.kind] ?? "confirm";
-  const action = hits.length > 0 && effective !== "step" ? "confirm" : baseAction;
-  return {
-    effective_mode: effective,
-    action,
-    downgraded,
-    reason,
-    detected_risks: hits
-  };
-}
-function mergePolicy(mode, override) {
-  const base = DEFAULT_POLICIES[mode];
-  if (!override?.[mode])
-    return base;
-  return { ...base, ...override[mode] };
-}
-function buildHaystack(args) {
-  if (typeof args === "string")
-    return args;
-  try {
-    return JSON.stringify(args);
-  } catch {
-    return String(args);
-  }
-}
-function classifyTool(tool) {
-  const lower = tool.toLowerCase();
-  if (lower in TOOL_KIND_MAP)
-    return TOOL_KIND_MAP[lower];
-  if (/(^|[-_])edit($|[-_])|write|patch|apply/i.test(lower))
-    return "edit";
-  if (/bash|shell|exec|run/i.test(lower))
-    return "bash";
-  if (/fetch|http|curl/i.test(lower))
-    return "webfetch";
-  if (/read|view/i.test(lower))
-    return "read";
-  if (/search|grep|glob|find|list/i.test(lower))
-    return "search";
-  return "other";
-}
 async function ensureWorktree(opts) {
   const root = path11.resolve(opts.root);
   const dir = opts.worktrees_dir ?? path11.join(root, ".git", "codeforge-worktrees");
@@ -1000,142 +941,7 @@ async function commitWorktreeIfDirty(opts) {
   await runGit(wt, ["commit", "-m", opts.message], timeout);
   return { committed: true };
 }
-function renderDecision(d) {
-  const lines = [];
-  lines.push(`mode: ${d.effective_mode}${d.downgraded ? " (downgraded)" : ""}`);
-  lines.push(`action: ${d.action}`);
-  if (d.detected_risks.length > 0) {
-    lines.push(`risks: ${d.detected_risks.join(", ")}`);
-  }
-  if (d.reason)
-    lines.push(`reason: ${d.reason}`);
-  return lines.join(`
-`);
-}
-var DEFAULT_POLICIES, RISK_PATTERNS, TOOL_KIND_MAP;
-var init_autonomy = __esm(() => {
-  DEFAULT_POLICIES = {
-    step: {
-      bash: "confirm",
-      edit: "confirm",
-      webfetch: "confirm",
-      read: "confirm",
-      search: "confirm",
-      other: "confirm"
-    },
-    semi: {
-      bash: "confirm",
-      edit: "confirm",
-      webfetch: "confirm",
-      read: "auto",
-      search: "auto",
-      other: "auto"
-    },
-    full: {
-      bash: "auto",
-      edit: "auto",
-      webfetch: "auto",
-      read: "auto",
-      search: "auto",
-      other: "auto"
-    },
-    auto: {
-      bash: "auto",
-      edit: "auto",
-      webfetch: "auto",
-      read: "auto",
-      search: "auto",
-      other: "auto"
-    }
-  };
-  RISK_PATTERNS = [
-    {
-      tag: "rm_rf_root",
-      kinds: ["bash"],
-      re: /rm\s+-[rRf]+[^|;`\n]*\s+(\/(?:\s|$|[^/\w*.-])|~|\$HOME(?:\b|\/)|\/(?:bin|etc|usr|var|opt|home|root|boot|lib|sbin)\b)/
-    },
-    {
-      tag: "rm_rf_wildcard",
-      kinds: ["bash"],
-      re: /rm\s+-[rRf]+\s+(?:\.\*|\*)/
-    },
-    {
-      tag: "force_push_protected",
-      kinds: ["bash"],
-      re: /git\s+push\s+(?:--force\b|-f\b)[\s\S]*\b(main|master|release(?:\/[\w.-]+)?)\b/
-    },
-    {
-      tag: "git_reset_hard_main",
-      kinds: ["bash"],
-      re: /git\s+reset\s+--hard\s+(origin\/)?(main|master)/
-    },
-    { tag: "sudo", kinds: ["bash"], re: /(?<![\w-])sudo(?![\w-])/ },
-    { tag: "su_root", kinds: ["bash"], re: /(?<![\w-])su\s+(?:-\s+)?root\b/ },
-    { tag: "mkfs", kinds: ["bash"], re: /\bmkfs(\.[\w]+)?\b/ },
-    { tag: "dd_disk", kinds: ["bash"], re: /\bdd\s+if=[^|;\s]+\s+of=\/dev\// },
-    { tag: "chmod_777", kinds: ["bash"], re: /chmod\s+[-+]?[0-7]?777/ },
-    {
-      tag: "curl_pipe_sh",
-      kinds: ["bash"],
-      re: /\b(?:curl|wget)\b[^|]*\|\s*(?:sh|bash|zsh)\b/
-    },
-    {
-      tag: "drop_database",
-      kinds: ["bash", "other"],
-      re: /\b(DROP\s+(DATABASE|TABLE)|TRUNCATE\s+TABLE|DROP\s+SCHEMA)\b/i
-    },
-    { tag: "write_secrets", re: /(\.env(?:\.\w+)?|id_[edr]sa|\.ssh\/id_|\.pem|\.p12|secret\.json)/i },
-    { tag: "write_etc", re: /(?:^|\s|"|')\/etc\// },
-    { tag: "write_usr", re: /(?:^|\s|"|')\/usr\// },
-    { tag: "write_root_home", re: /(?:^|\s|"|')(\/root|\/home\/root)\// },
-    {
-      tag: "internal_url",
-      kinds: ["webfetch"],
-      re: /https?:\/\/(localhost|127\.0\.0\.1|0\.0\.0\.0|169\.254\.|10\.|192\.168\.|172\.(?:1[6-9]|2\d|3[01])\.)/i
-    },
-    {
-      tag: "kubectl_delete",
-      kinds: ["bash"],
-      re: /kubectl\s+(?:delete|destroy)\s+/
-    },
-    {
-      tag: "terraform_destroy",
-      kinds: ["bash"],
-      re: /terraform\s+destroy/
-    }
-  ];
-  TOOL_KIND_MAP = {
-    bash: "bash",
-    shell: "bash",
-    exec: "bash",
-    edit: "edit",
-    write: "edit",
-    "ast-edit": "edit",
-    "pending-changes-apply": "edit",
-    webfetch: "webfetch",
-    fetch: "webfetch",
-    read: "read",
-    cat: "read",
-    glob: "search",
-    grep: "search",
-    search: "search",
-    "repo-map": "search",
-    smart_search: "search",
-    list_recent: "search",
-    get_working_memory: "search",
-    web_search: "search",
-    save_chat_insight: "other",
-    add_knowledge: "other",
-    upload_document: "other",
-    upload_document_from_url: "other",
-    update_knowledge: "other",
-    flag_outdated: "other",
-    delete_knowledge: "other",
-    update_working_memory: "other",
-    update_user_preference: "other",
-    generate_image: "other"
-  };
-});
+var init_worktree_ops = () => {};
 
 // lib/decision-parser.ts
 var exports_decision_parser = {};
@@ -1263,17 +1069,17 @@ var require_visit = __commonJS((exports) => {
   visit.BREAK = BREAK;
   visit.SKIP = SKIP;
   visit.REMOVE = REMOVE;
-  function visit_(key, node, visitor, path17) {
-    const ctrl = callVisitor(key, node, visitor, path17);
+  function visit_(key, node, visitor, path18) {
+    const ctrl = callVisitor(key, node, visitor, path18);
     if (identity.isNode(ctrl) || identity.isPair(ctrl)) {
-      replaceNode(key, path17, ctrl);
-      return visit_(key, ctrl, visitor, path17);
+      replaceNode(key, path18, ctrl);
+      return visit_(key, ctrl, visitor, path18);
     }
     if (typeof ctrl !== "symbol") {
       if (identity.isCollection(node)) {
-        path17 = Object.freeze(path17.concat(node));
+        path18 = Object.freeze(path18.concat(node));
         for (let i = 0;i < node.items.length; ++i) {
-          const ci = visit_(i, node.items[i], visitor, path17);
+          const ci = visit_(i, node.items[i], visitor, path18);
           if (typeof ci === "number")
             i = ci - 1;
           else if (ci === BREAK)
@@ -1284,13 +1090,13 @@ var require_visit = __commonJS((exports) => {
           }
         }
       } else if (identity.isPair(node)) {
-        path17 = Object.freeze(path17.concat(node));
-        const ck = visit_("key", node.key, visitor, path17);
+        path18 = Object.freeze(path18.concat(node));
+        const ck = visit_("key", node.key, visitor, path18);
         if (ck === BREAK)
           return BREAK;
         else if (ck === REMOVE)
           node.key = null;
-        const cv = visit_("value", node.value, visitor, path17);
+        const cv = visit_("value", node.value, visitor, path18);
         if (cv === BREAK)
           return BREAK;
         else if (cv === REMOVE)
@@ -1311,17 +1117,17 @@ var require_visit = __commonJS((exports) => {
   visitAsync.BREAK = BREAK;
   visitAsync.SKIP = SKIP;
   visitAsync.REMOVE = REMOVE;
-  async function visitAsync_(key, node, visitor, path17) {
-    const ctrl = await callVisitor(key, node, visitor, path17);
+  async function visitAsync_(key, node, visitor, path18) {
+    const ctrl = await callVisitor(key, node, visitor, path18);
     if (identity.isNode(ctrl) || identity.isPair(ctrl)) {
-      replaceNode(key, path17, ctrl);
-      return visitAsync_(key, ctrl, visitor, path17);
+      replaceNode(key, path18, ctrl);
+      return visitAsync_(key, ctrl, visitor, path18);
     }
     if (typeof ctrl !== "symbol") {
       if (identity.isCollection(node)) {
-        path17 = Object.freeze(path17.concat(node));
+        path18 = Object.freeze(path18.concat(node));
         for (let i = 0;i < node.items.length; ++i) {
-          const ci = await visitAsync_(i, node.items[i], visitor, path17);
+          const ci = await visitAsync_(i, node.items[i], visitor, path18);
           if (typeof ci === "number")
             i = ci - 1;
           else if (ci === BREAK)
@@ -1332,13 +1138,13 @@ var require_visit = __commonJS((exports) => {
           }
         }
       } else if (identity.isPair(node)) {
-        path17 = Object.freeze(path17.concat(node));
-        const ck = await visitAsync_("key", node.key, visitor, path17);
+        path18 = Object.freeze(path18.concat(node));
+        const ck = await visitAsync_("key", node.key, visitor, path18);
         if (ck === BREAK)
           return BREAK;
         else if (ck === REMOVE)
           node.key = null;
-        const cv = await visitAsync_("value", node.value, visitor, path17);
+        const cv = await visitAsync_("value", node.value, visitor, path18);
         if (cv === BREAK)
           return BREAK;
         else if (cv === REMOVE)
@@ -1365,23 +1171,23 @@ var require_visit = __commonJS((exports) => {
     }
     return visitor;
   }
-  function callVisitor(key, node, visitor, path17) {
+  function callVisitor(key, node, visitor, path18) {
     if (typeof visitor === "function")
-      return visitor(key, node, path17);
+      return visitor(key, node, path18);
     if (identity.isMap(node))
-      return visitor.Map?.(key, node, path17);
+      return visitor.Map?.(key, node, path18);
     if (identity.isSeq(node))
-      return visitor.Seq?.(key, node, path17);
+      return visitor.Seq?.(key, node, path18);
     if (identity.isPair(node))
-      return visitor.Pair?.(key, node, path17);
+      return visitor.Pair?.(key, node, path18);
     if (identity.isScalar(node))
-      return visitor.Scalar?.(key, node, path17);
+      return visitor.Scalar?.(key, node, path18);
     if (identity.isAlias(node))
-      return visitor.Alias?.(key, node, path17);
+      return visitor.Alias?.(key, node, path18);
     return;
   }
-  function replaceNode(key, path17, node) {
-    const parent = path17[path17.length - 1];
+  function replaceNode(key, path18, node) {
+    const parent = path18[path18.length - 1];
     if (identity.isCollection(parent)) {
       parent.items[key] = node;
     } else if (identity.isPair(parent)) {
@@ -1940,10 +1746,10 @@ var require_Collection = __commonJS((exports) => {
   var createNode = require_createNode();
   var identity = require_identity();
   var Node = require_Node();
-  function collectionFromPath(schema, path17, value) {
+  function collectionFromPath(schema, path18, value) {
     let v = value;
-    for (let i = path17.length - 1;i >= 0; --i) {
-      const k = path17[i];
+    for (let i = path18.length - 1;i >= 0; --i) {
+      const k = path18[i];
       if (typeof k === "number" && Number.isInteger(k) && k >= 0) {
         const a = [];
         a[k] = v;
@@ -1962,7 +1768,7 @@ var require_Collection = __commonJS((exports) => {
       sourceObjects: new Map
     });
   }
-  var isEmptyPath = (path17) => path17 == null || typeof path17 === "object" && !!path17[Symbol.iterator]().next().done;
+  var isEmptyPath = (path18) => path18 == null || typeof path18 === "object" && !!path18[Symbol.iterator]().next().done;
 
   class Collection extends Node.NodeBase {
     constructor(type, schema) {
@@ -1983,11 +1789,11 @@ var require_Collection = __commonJS((exports) => {
         copy.range = this.range.slice();
       return copy;
     }
-    addIn(path17, value) {
-      if (isEmptyPath(path17))
+    addIn(path18, value) {
+      if (isEmptyPath(path18))
         this.add(value);
       else {
-        const [key, ...rest] = path17;
+        const [key, ...rest] = path18;
         const node = this.get(key, true);
         if (identity.isCollection(node))
           node.addIn(rest, value);
@@ -1997,8 +1803,8 @@ var require_Collection = __commonJS((exports) => {
           throw new Error(`Expected YAML collection at ${key}. Remaining path: ${rest}`);
       }
     }
-    deleteIn(path17) {
-      const [key, ...rest] = path17;
+    deleteIn(path18) {
+      const [key, ...rest] = path18;
       if (rest.length === 0)
         return this.delete(key);
       const node = this.get(key, true);
@@ -2007,8 +1813,8 @@ var require_Collection = __commonJS((exports) => {
       else
         throw new Error(`Expected YAML collection at ${key}. Remaining path: ${rest}`);
     }
-    getIn(path17, keepScalar) {
-      const [key, ...rest] = path17;
+    getIn(path18, keepScalar) {
+      const [key, ...rest] = path18;
       const node = this.get(key, true);
       if (rest.length === 0)
         return !keepScalar && identity.isScalar(node) ? node.value : node;
@@ -2023,15 +1829,15 @@ var require_Collection = __commonJS((exports) => {
         return n == null || allowScalar && identity.isScalar(n) && n.value == null && !n.commentBefore && !n.comment && !n.tag;
       });
     }
-    hasIn(path17) {
-      const [key, ...rest] = path17;
+    hasIn(path18) {
+      const [key, ...rest] = path18;
       if (rest.length === 0)
         return this.has(key);
       const node = this.get(key, true);
       return identity.isCollection(node) ? node.hasIn(rest) : false;
     }
-    setIn(path17, value) {
-      const [key, ...rest] = path17;
+    setIn(path18, value) {
+      const [key, ...rest] = path18;
       if (rest.length === 0) {
         this.set(key, value);
       } else {
@@ -2837,7 +2643,7 @@ var require_merge = __commonJS((exports) => {
 
 // node_modules/yaml/dist/nodes/addPairToJSMap.js
 var require_addPairToJSMap = __commonJS((exports) => {
-  var log5 = require_log();
+  var log6 = require_log();
   var merge = require_merge();
   var stringify = require_stringify();
   var identity = require_identity();
@@ -2886,7 +2692,7 @@ var require_addPairToJSMap = __commonJS((exports) => {
         let jsonStr = JSON.stringify(strKey);
         if (jsonStr.length > 40)
           jsonStr = jsonStr.substring(0, 36) + '..."';
-        log5.warn(ctx.doc.options.logLevel, `Keys with collection values will be stringified due to JS Object restrictions: ${jsonStr}. Set mapAsMap: true to use object keys.`);
+        log6.warn(ctx.doc.options.logLevel, `Keys with collection values will be stringified due to JS Object restrictions: ${jsonStr}. Set mapAsMap: true to use object keys.`);
         ctx.mapKeyWarned = true;
       }
       return strKey;
@@ -4424,9 +4230,9 @@ var require_Document = __commonJS((exports) => {
       if (assertCollection(this.contents))
         this.contents.add(value);
     }
-    addIn(path17, value) {
+    addIn(path18, value) {
       if (assertCollection(this.contents))
-        this.contents.addIn(path17, value);
+        this.contents.addIn(path18, value);
     }
     createAlias(node, name) {
       if (!node.anchor) {
@@ -4475,30 +4281,30 @@ var require_Document = __commonJS((exports) => {
     delete(key) {
       return assertCollection(this.contents) ? this.contents.delete(key) : false;
     }
-    deleteIn(path17) {
-      if (Collection.isEmptyPath(path17)) {
+    deleteIn(path18) {
+      if (Collection.isEmptyPath(path18)) {
         if (this.contents == null)
           return false;
         this.contents = null;
         return true;
       }
-      return assertCollection(this.contents) ? this.contents.deleteIn(path17) : false;
+      return assertCollection(this.contents) ? this.contents.deleteIn(path18) : false;
     }
     get(key, keepScalar) {
       return identity.isCollection(this.contents) ? this.contents.get(key, keepScalar) : undefined;
     }
-    getIn(path17, keepScalar) {
-      if (Collection.isEmptyPath(path17))
+    getIn(path18, keepScalar) {
+      if (Collection.isEmptyPath(path18))
         return !keepScalar && identity.isScalar(this.contents) ? this.contents.value : this.contents;
-      return identity.isCollection(this.contents) ? this.contents.getIn(path17, keepScalar) : undefined;
+      return identity.isCollection(this.contents) ? this.contents.getIn(path18, keepScalar) : undefined;
     }
     has(key) {
       return identity.isCollection(this.contents) ? this.contents.has(key) : false;
     }
-    hasIn(path17) {
-      if (Collection.isEmptyPath(path17))
+    hasIn(path18) {
+      if (Collection.isEmptyPath(path18))
         return this.contents !== undefined;
-      return identity.isCollection(this.contents) ? this.contents.hasIn(path17) : false;
+      return identity.isCollection(this.contents) ? this.contents.hasIn(path18) : false;
     }
     set(key, value) {
       if (this.contents == null) {
@@ -4507,13 +4313,13 @@ var require_Document = __commonJS((exports) => {
         this.contents.set(key, value);
       }
     }
-    setIn(path17, value) {
-      if (Collection.isEmptyPath(path17)) {
+    setIn(path18, value) {
+      if (Collection.isEmptyPath(path18)) {
         this.contents = value;
       } else if (this.contents == null) {
-        this.contents = Collection.collectionFromPath(this.schema, Array.from(path17), value);
+        this.contents = Collection.collectionFromPath(this.schema, Array.from(path18), value);
       } else if (assertCollection(this.contents)) {
-        this.contents.setIn(path17, value);
+        this.contents.setIn(path18, value);
       }
     }
     setSchema(version, options = {}) {
@@ -6408,9 +6214,9 @@ var require_cst_visit = __commonJS((exports) => {
   visit.BREAK = BREAK;
   visit.SKIP = SKIP;
   visit.REMOVE = REMOVE;
-  visit.itemAtPath = (cst, path17) => {
+  visit.itemAtPath = (cst, path18) => {
     let item = cst;
-    for (const [field, index] of path17) {
+    for (const [field, index] of path18) {
       const tok = item?.[field];
       if (tok && "items" in tok) {
         item = tok.items[index];
@@ -6419,23 +6225,23 @@ var require_cst_visit = __commonJS((exports) => {
     }
     return item;
   };
-  visit.parentCollection = (cst, path17) => {
-    const parent = visit.itemAtPath(cst, path17.slice(0, -1));
-    const field = path17[path17.length - 1][0];
+  visit.parentCollection = (cst, path18) => {
+    const parent = visit.itemAtPath(cst, path18.slice(0, -1));
+    const field = path18[path18.length - 1][0];
     const coll = parent?.[field];
     if (coll && "items" in coll)
       return coll;
     throw new Error("Parent collection not found");
   };
-  function _visit(path17, item, visitor) {
-    let ctrl = visitor(item, path17);
+  function _visit(path18, item, visitor) {
+    let ctrl = visitor(item, path18);
     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(path17.concat([[field, i]])), token.items[i], visitor);
+          const ci = _visit(Object.freeze(path18.concat([[field, i]])), token.items[i], visitor);
           if (typeof ci === "number")
             i = ci - 1;
           else if (ci === BREAK)
@@ -6446,10 +6252,10 @@ var require_cst_visit = __commonJS((exports) => {
           }
         }
         if (typeof ctrl === "function" && field === "key")
-          ctrl = ctrl(item, path17);
+          ctrl = ctrl(item, path18);
       }
     }
-    return typeof ctrl === "function" ? ctrl(item, path17) : ctrl;
+    return typeof ctrl === "function" ? ctrl(item, path18) : ctrl;
   }
   exports.visit = visit;
 });
@@ -7718,14 +7524,14 @@ var require_parser = __commonJS((exports) => {
           case "scalar":
           case "single-quoted-scalar":
           case "double-quoted-scalar": {
-            const fs14 = this.flowScalar(this.type);
+            const fs15 = this.flowScalar(this.type);
             if (atNextItem || it.value) {
-              map.items.push({ start, key: fs14, sep: [] });
+              map.items.push({ start, key: fs15, sep: [] });
               this.onKeyLine = true;
             } else if (it.sep) {
-              this.stack.push(fs14);
+              this.stack.push(fs15);
             } else {
-              Object.assign(it, { key: fs14, sep: [] });
+              Object.assign(it, { key: fs15, sep: [] });
               this.onKeyLine = true;
             }
             return;
@@ -7853,13 +7659,13 @@ var require_parser = __commonJS((exports) => {
           case "scalar":
           case "single-quoted-scalar":
           case "double-quoted-scalar": {
-            const fs14 = this.flowScalar(this.type);
+            const fs15 = this.flowScalar(this.type);
             if (!it || it.value)
-              fc.items.push({ start: [], key: fs14, sep: [] });
+              fc.items.push({ start: [], key: fs15, sep: [] });
             else if (it.sep)
-              this.stack.push(fs14);
+              this.stack.push(fs15);
             else
-              Object.assign(it, { key: fs14, sep: [] });
+              Object.assign(it, { key: fs15, sep: [] });
             return;
           }
           case "flow-map-end":
@@ -8023,7 +7829,7 @@ var require_public_api = __commonJS((exports) => {
   var composer = require_composer();
   var Document = require_Document();
   var errors = require_errors();
-  var log5 = require_log();
+  var log6 = require_log();
   var identity = require_identity();
   var lineCounter = require_line_counter();
   var parser = require_parser();
@@ -8075,7 +7881,7 @@ var require_public_api = __commonJS((exports) => {
     const doc = parseDocument(src, options);
     if (!doc)
       return null;
-    doc.warnings.forEach((warning) => log5.warn(doc.options.logLevel, warning));
+    doc.warnings.forEach((warning) => log6.warn(doc.options.logLevel, warning));
     if (doc.errors.length > 0) {
       if (doc.options.logLevel !== "silent")
         throw doc.errors[0];
@@ -8241,7 +8047,7 @@ async function runAutoFeedback(cfg, ctx) {
   if (cmds.length === 0) {
     throw new Error("auto-feedback: 至少需要 test_cmd 或 lint_cmd 之一");
   }
-  const log13 = ctx.log ?? (() => {});
+  const log14 = ctx.log ?? (() => {});
   const attempt = async () => {
     let last = {
       cmd: "",
@@ -8278,7 +8084,7 @@ ${excerpt}
 
 请基于错误信息修复 pending-changes（用 ast-edit / pending-changes.stage），完成后我会重新跑测试验证。`;
     const result2 = await ctx.dispatchToAgent("coder", prompt);
-    log13("info", `auto-feedback round ${round} dispatch summary: ${result2.summary.slice(0, 200)}`);
+    log14("info", `auto-feedback round ${round} dispatch summary: ${result2.summary.slice(0, 200)}`);
   };
   const debugResult = await runWithAutoDebug({
     attempt,
@@ -8299,7 +8105,7 @@ ${excerpt}
     history: debugResult.history
   };
   if (!debugResult.ok && debugResult.stopReason === "max-rounds") {
-    log13("warn", `auto-feedback 达 max_retries=${cfg.max_retries}，escalate to ${cfg.escalate_to}`);
+    log14("warn", `auto-feedback 达 max_retries=${cfg.max_retries}，escalate to ${cfg.escalate_to}`);
     const lastFail = debugResult.history[debugResult.history.length - 1];
     const excerpt = lastFail?.result ? extractErrorExcerpt(lastFail.result, cfg.error_excerpt_lines) : "(无失败结果)";
     const escalatePrompt = `coder 连续 ${cfg.max_retries} 轮自纠失败，错误片段：
@@ -13061,7 +12867,7 @@ function toEntry(r) {
 import { z as z27 } from "zod";
 
 // lib/session-worktree.ts
-init_autonomy();
+init_worktree_ops();
 init_runtime_paths();
 import { execFile as execFile3 } from "node:child_process";
 import { promises as fs10 } from "node:fs";
@@ -13312,6 +13118,18 @@ async function mergeSessionBack(opts) {
     });
     throw new Error(`mergeSessionBack: squash merge 失败（已 reset 主仓兜底）: ${err.message}`);
   }
+  const hasDevOnce = await packageHasScript(mainRoot, "dev:once");
+  if (hasDevOnce) {
+    try {
+      await runCmd("npm", ["run", "dev:once"], mainRoot);
+    } catch (err) {
+      await runGit2(mainRoot, ["reset", "--hard", "HEAD"]).catch(() => {});
+      const msg = err instanceof Error ? err.message : String(err);
+      throw new Error(`dev:once 失败已 reset 主仓: ${msg}`);
+    }
+  } else {
+    console.log(`[session-worktree] skip dev:once: not configured in ${mainRoot}/package.json`);
+  }
   const squashedRaw = await runGit2(wt, ["log", "--format=%s", `${baseSha}..HEAD`]);
   const squashedCommits = squashedRaw.split(/\r?\n/).map((s) => s.trim()).filter(Boolean);
   const message = opts.commitMessage ?? buildMergeMessage(opts.sessionId, branch, baseSha, squashedCommits);
@@ -13416,6 +13234,29 @@ function runGit2(cwd, args, timeoutMs = 1e4) {
     });
   });
 }
+async function packageHasScript(mainRoot, scriptName) {
+  try {
+    const pkgPath = path13.join(mainRoot, "package.json");
+    const raw = await fs10.readFile(pkgPath, "utf8");
+    const pkg = JSON.parse(raw);
+    if (!pkg.scripts || typeof pkg.scripts !== "object")
+      return false;
+    return typeof pkg.scripts[scriptName] === "string";
+  } catch {
+    return false;
+  }
+}
+function runCmd(cmd, args, cwd, timeoutMs = 120000) {
+  return new Promise((resolve11, reject) => {
+    execFile3(cmd, args, { cwd, timeout: timeoutMs, windowsHide: true, encoding: "utf8" }, (err, stdout, stderr) => {
+      if (err) {
+        reject(new Error(`${cmd} ${args.join(" ")} (cwd=${cwd}) 失败: ${stderr?.trim() || err.message}`));
+        return;
+      }
+      resolve11(stdout);
+    });
+  });
+}
 function buildMergeMessage(sessionId, branch, baseSha, squashed) {
   const subject = `session(${sessionId}): merge ${branch}`;
   const body = squashed.length > 0 ? `
@@ -13458,7 +13299,7 @@ async function pruneOrphanWorktrees(mainRoot) {
   let skipped = 0;
   let gitWorktrees = [];
   try {
-    const mod = await Promise.resolve().then(() => (init_autonomy(), exports_autonomy));
+    const mod = await Promise.resolve().then(() => (init_worktree_ops(), exports_worktree_ops));
     gitWorktrees = await mod.listWorktrees({ root: resolved });
   } catch {
     gitWorktrees = [];
@@ -14698,6 +14539,212 @@ async function sendParentNotice(client, sessionID, text, opts = {}) {
 // lib/spawner-production.ts
 init_decision_parser();
 
+// lib/parent-map-store.ts
+init_runtime_paths();
+import { promises as fs13 } from "node:fs";
+import * as path16 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 path16.join(runtimeDir(path16.resolve(mainRoot), { ensure: false }), "session-worktrees");
+}
+function parentMapPath(mainRoot) {
+  return path16.join(parentMapDir(mainRoot), "parent-map.json");
+}
+function parentMapLockPath(mainRoot) {
+  return path16.join(parentMapDir(mainRoot), "parent-map.lock");
+}
+async function readParentMapFile(mainRoot) {
+  const file = parentMapPath(mainRoot);
+  try {
+    const raw = await fs13.readFile(file, "utf8");
+    const parsed = JSON.parse(raw);
+    if (parsed.version !== PARENT_MAP_VERSION || !Array.isArray(parsed.entries)) {
+      return { version: PARENT_MAP_VERSION, entries: [] };
+    }
+    return parsed;
+  } catch (err) {
+    const e = err;
+    if (e.code === "ENOENT")
+      return { version: PARENT_MAP_VERSION, entries: [] };
+    return { version: PARENT_MAP_VERSION, entries: [] };
+  }
+}
+async function writeParentMapFile(mainRoot, payload) {
+  const file = parentMapPath(mainRoot);
+  await fs13.mkdir(path16.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);
+}
+function capEntriesByTsDesc(entries) {
+  if (entries.length <= PARENT_MAP_MAX_ENTRIES)
+    return entries;
+  return [...entries].sort((a, b) => b.ts - a.ts).slice(0, PARENT_MAP_MAX_ENTRIES);
+}
+async function loadParentMap(mainRoot) {
+  const out = new Map;
+  let file;
+  try {
+    file = await readParentMapFile(mainRoot);
+  } catch {
+    return out;
+  }
+  const valid = [];
+  for (const e of file.entries) {
+    if (!e || typeof e.childID !== "string" || typeof e.parentID !== "string")
+      continue;
+    if (!e.childID || !e.parentID)
+      continue;
+    const ts = typeof e.ts === "number" ? e.ts : Date.now();
+    valid.push({ childID: e.childID, parentID: e.parentID, ts });
+  }
+  const capped = capEntriesByTsDesc(valid);
+  for (const e of capped) {
+    out.set(e.childID, { parentID: e.parentID, ts: e.ts });
+  }
+  return out;
+}
+async function mutateParentMap(mainRoot, mutator, opts = {}) {
+  const lockPath = parentMapLockPath(mainRoot);
+  await fs13.mkdir(path16.dirname(lockPath), { recursive: true });
+  const lockOpts = {
+    timeoutMs: opts.timeoutMs ?? PARENT_MAP_LOCK_TIMEOUT_MS,
+    ...opts
+  };
+  await withFileLock(lockPath, async () => {
+    const current = await readParentMapFile(mainRoot);
+    const input = current.entries.slice();
+    const next = await mutator(input);
+    if (!Array.isArray(next))
+      return;
+    const capped = capEntriesByTsDesc(next);
+    await writeParentMapFile(mainRoot, { version: PARENT_MAP_VERSION, entries: capped });
+  }, lockOpts);
+}
+async function appendParentEntry(mainRoot, childID, parentID, ts, opts = {}) {
+  if (!childID || !parentID)
+    return;
+  const lockPath = parentMapLockPath(mainRoot);
+  await fs13.mkdir(path16.dirname(lockPath), { recursive: true });
+  const lockOpts = {
+    timeoutMs: opts.timeoutMs ?? PARENT_MAP_LOCK_TIMEOUT_MS,
+    ...opts
+  };
+  await withFileLock(lockPath, async () => {
+    const current = await readParentMapFile(mainRoot);
+    const idx = current.entries.findIndex((e) => e.childID === childID);
+    if (idx >= 0) {
+      current.entries[idx] = { childID, parentID, ts };
+    } else {
+      current.entries.push({ childID, parentID, ts });
+    }
+    const capped = capEntriesByTsDesc(current.entries);
+    await writeParentMapFile(mainRoot, { version: PARENT_MAP_VERSION, entries: capped });
+  }, lockOpts);
+}
+
+// lib/parent-map-runtime.ts
+var log4 = makePluginLogger("parent-map-runtime");
+var SESSION_PARENT_MAP_TTL_MS = 30 * 60000;
+var SESSION_PARENT_MAP_MAX_SIZE = PARENT_MAP_MAX_ENTRIES;
+var sessionParentMap = new Map;
+var _persistRoot = null;
+function _setPersistRootForTests(root) {
+  _persistRoot = root;
+}
+function _bulkInjectSessionParentMap(entries) {
+  for (const e of entries) {
+    if (!e.childID || !e.parentID)
+      continue;
+    sessionParentMap.set(e.childID, { parentID: e.parentID, ts: e.ts });
+  }
+}
+function _capSessionParentMap() {
+  if (sessionParentMap.size <= SESSION_PARENT_MAP_MAX_SIZE)
+    return 0;
+  const sorted = [...sessionParentMap.entries()].sort((a, b) => b[1].ts - a[1].ts);
+  const keep = new Set(sorted.slice(0, SESSION_PARENT_MAP_MAX_SIZE).map(([k]) => k));
+  let removed = 0;
+  for (const k of [...sessionParentMap.keys()]) {
+    if (!keep.has(k)) {
+      sessionParentMap.delete(k);
+      removed++;
+    }
+  }
+  return removed;
+}
+function recordSessionParent(childID, parentID, now = Date.now()) {
+  if (!childID || !parentID)
+    return;
+  if (sessionParentMap.has(childID)) {
+    sessionParentMap.set(childID, { parentID, ts: now });
+  } else {
+    if (sessionParentMap.size >= SESSION_PARENT_MAP_MAX_SIZE) {
+      let oldestKey = null;
+      let oldestTs = Number.POSITIVE_INFINITY;
+      for (const [k, v] of sessionParentMap.entries()) {
+        if (v.ts < oldestTs) {
+          oldestTs = v.ts;
+          oldestKey = k;
+        }
+      }
+      if (oldestKey !== null)
+        sessionParentMap.delete(oldestKey);
+    }
+    sessionParentMap.set(childID, { parentID, ts: now });
+  }
+  if (_persistRoot) {
+    appendParentEntry(_persistRoot, childID, parentID, now).catch((err) => {
+      log4.warn("appendParentEntry 失败（已隔离）", {
+        error: err instanceof Error ? err.message : String(err),
+        childID
+      });
+    });
+  }
+}
+function lookupParentSessionId(childID, now = Date.now()) {
+  const entry = sessionParentMap.get(childID);
+  if (!entry)
+    return;
+  if (now - entry.ts > SESSION_PARENT_MAP_TTL_MS) {
+    sessionParentMap.delete(childID);
+    return;
+  }
+  return entry.parentID;
+}
+function deleteSessionParent(childID) {
+  sessionParentMap.delete(childID);
+  if (_persistRoot) {
+    mutateParentMap(_persistRoot, (entries) => entries.filter((e) => e.childID !== childID)).catch((err) => {
+      log4.warn("mutateParentMap (delete) 失败（已隔离）", {
+        error: err instanceof Error ? err.message : String(err),
+        childID
+      });
+    });
+  }
+}
+function sweepExpiredSessionParents(now = Date.now()) {
+  let removed = 0;
+  for (const [k, v] of [...sessionParentMap.entries()]) {
+    if (now - v.ts > SESSION_PARENT_MAP_TTL_MS) {
+      sessionParentMap.delete(k);
+      removed++;
+    }
+  }
+  if (_persistRoot) {
+    mutateParentMap(_persistRoot, (entries) => entries.filter((e) => now - e.ts <= SESSION_PARENT_MAP_TTL_MS)).catch((err) => {
+      log4.warn("mutateParentMap (sweep) 失败（已隔离）", {
+        error: err instanceof Error ? err.message : String(err),
+        removed
+      });
+    });
+  }
+  return removed;
+}
+
+// lib/spawner-production.ts
 class ProductionSpawner {
   opts;
   constructor(opts) {
@@ -14713,7 +14760,7 @@ class ProductionSpawner {
         title: `[merge-review] sess=${args.sessionId.slice(0, 8)} r=${args.round}/${args.maxRounds}`,
         ...args.signal ? { signal: args.signal } : {},
         timeoutMs: this.opts.reviewerTimeoutMs ?? 600000
-      });
+      }, args.sessionId);
     } catch (err) {
       throw err;
     }
@@ -14745,7 +14792,7 @@ ${r.text.slice(0, 800)}`
         title: `[merge-fix] sess=${args.sessionId.slice(0, 8)}`,
         ...args.signal ? { signal: args.signal } : {},
         timeoutMs: this.opts.coderTimeoutMs ?? 1800000
-      });
+      }, args.sessionId);
     } catch (err) {
       throw err;
     }
@@ -14759,7 +14806,7 @@ ${r.text.slice(0, 800)}`
     }
     return { ok: true, summary: r.text || "(coder 无文本输出)" };
   }
-  async runSubagent(opts) {
+  async runSubagent(opts, parentSessionIdOverride) {
     let childId;
     try {
       const created = await this.opts.client.session.create({
@@ -14770,6 +14817,17 @@ ${r.text.slice(0, 800)}`
         throw new Error(`session.create 失败: ${describe5(created.error) || "no id"}`);
       }
       childId = created.data.id;
+      const parentSessionId = parentSessionIdOverride ?? this.opts.parentSessionId ?? "";
+      if (parentSessionId) {
+        try {
+          recordSessionParent(childId, parentSessionId);
+        } catch (err) {
+          this.opts.log?.("warn", `[spawner] recordSessionParent 失败 child=${childId}`, {
+            err: describe5(err),
+            parentSessionId
+          });
+        }
+      }
       const promptPromise = Promise.resolve(this.opts.client.session.prompt({
         path: { id: childId },
         body: {
@@ -14808,7 +14866,7 @@ async function raceAbortTimeout(p, signal, timeoutMs, label) {
     e.name = "AbortError";
     throw e;
   }
-  return await new Promise((resolve13, reject) => {
+  return await new Promise((resolve14, reject) => {
     let settled = false;
     const timer = setTimeout(() => {
       if (settled)
@@ -14833,7 +14891,7 @@ async function raceAbortTimeout(p, signal, timeoutMs, label) {
       settled = true;
       clearTimeout(timer);
       signal?.removeEventListener("abort", onAbort);
-      resolve13(v);
+      resolve14(v);
     }, (e) => {
       if (settled)
         return;
@@ -14893,8 +14951,8 @@ function clip4(s, max) {
 }
 
 // lib/codeforge-runtime.ts
-import { promises as fs13 } from "node:fs";
-import * as path16 from "node:path";
+import { promises as fs14 } from "node:fs";
+import * as path17 from "node:path";
 var DEFAULT_RUNTIME = {
   autonomy: {
     default_mode: "semi",
@@ -14938,10 +14996,10 @@ function loadRuntimeSync(opts = {}) {
 }
 async function loadRuntime(opts = {}) {
   const root = opts.root ?? process.cwd();
-  const abs = path16.resolve(root, opts.file ?? CONFIG_FILE);
+  const abs = path17.resolve(root, opts.file ?? CONFIG_FILE);
   let raw;
   try {
-    raw = await fs13.readFile(abs, "utf8");
+    raw = await fs14.readFile(abs, "utf8");
   } catch (e) {
     const code = e.code;
     if (code === "ENOENT") {
@@ -15168,9 +15226,9 @@ function normalizeVariant(raw) {
     return "default";
   return raw;
 }
-async function showToast(client, payload, log4) {
+async function showToast(client, payload, log5) {
   if (typeof client?.tui?.showToast !== "function") {
-    log4?.debug?.("tui.showToast 不可用，noop");
+    log5?.debug?.("tui.showToast 不可用，noop");
     return false;
   }
   try {
@@ -15184,13 +15242,13 @@ async function showToast(client, payload, log4) {
     });
     return true;
   } catch (err) {
-    log4?.warn("tui.showToast 抛错（已隔离）", {
+    log5?.warn("tui.showToast 抛错（已隔离）", {
       error: err instanceof Error ? err.message : String(err)
     });
     return false;
   }
 }
-var log4 = makePluginLogger(PLUGIN_NAME6);
+var log5 = makePluginLogger(PLUGIN_NAME6);
 var toolHeartbeatServer = async (ctx) => {
   logLifecycle(PLUGIN_NAME6, "activate", {
     directory: ctx.directory,
@@ -15206,7 +15264,7 @@ var toolHeartbeatServer = async (ctx) => {
         const alert = buildAlert(r);
         if (!alert)
           continue;
-        const sent = await showToast(client, { message: alert.message, variant: alert.variant }, log4);
+        const sent = await showToast(client, { message: alert.message, variant: alert.variant }, log5);
         r.alertsSent.add(alert.threshold);
         safeWriteLog(PLUGIN_NAME6, {
           hook: "interval",
@@ -15949,7 +16007,7 @@ var handler7 = codeforgeToolsServer;
 
 // plugins/discover-spec-suggest.ts
 import { readFileSync as readFileSync3, readdirSync, statSync as statSync3 } from "node:fs";
-import { join as join13 } from "node:path";
+import { join as join14 } from "node:path";
 
 // lib/handoff-schema.ts
 import { z as z31 } from "zod";
@@ -16116,9 +16174,9 @@ function validateHandoff(rawYaml, fileSize) {
   const result = HandoffSchema.safeParse(parsed);
   if (!result.success) {
     const first = result.error.issues[0];
-    const path17 = first?.path?.join(".") ?? "(root)";
+    const path18 = first?.path?.join(".") ?? "(root)";
     const msg = first?.message ?? "unknown";
-    return { ok: false, reason: `schema 校验失败：${path17}: ${msg}` };
+    return { ok: false, reason: `schema 校验失败：${path18}: ${msg}` };
   }
   return { ok: true, data: result.data, schemaVersion: result.data.schema_version };
 }
@@ -16135,7 +16193,7 @@ var SESSION_TTL_MS = 24 * 60 * 60 * 1000;
 var MATCH_THRESHOLD = 0.15;
 var MAX_CANDIDATES = 3;
 var NUDGE_MAX_LEN = 1500;
-var SPECS_REL_DIR = join13(".codeforge", "specs");
+var SPECS_REL_DIR = join14(".codeforge", "specs");
 var sessionMap = new Map;
 function pruneIfOversize() {
   while (sessionMap.size > SESSION_CAP) {
@@ -16241,18 +16299,18 @@ function loadSpecs(rootDir, opts = {}) {
   const dirReader = opts.dirReader ?? defaultDirReader;
   const dirExists = opts.dirExists ?? defaultDirExists;
   const statReader = opts.statReader ?? defaultStatReader;
-  const log5 = makePluginLogger(PLUGIN_NAME8);
-  const specsRoot = join13(rootDir, SPECS_REL_DIR);
+  const log6 = makePluginLogger(PLUGIN_NAME8);
+  const specsRoot = join14(rootDir, SPECS_REL_DIR);
   const records = [];
   if (!dirExists(specsRoot)) {
-    log5.info(`specs 目录不存在，plugin 将 no-op`, { specsRoot });
+    log6.info(`specs 目录不存在，plugin 将 no-op`, { specsRoot });
     return records;
   }
   let entries;
   try {
     entries = dirReader(specsRoot);
   } catch (err) {
-    log5.warn(`specs 目录读取失败`, {
+    log6.warn(`specs 目录读取失败`, {
       specsRoot,
       error: err instanceof Error ? err.message : String(err)
     });
@@ -16260,15 +16318,15 @@ function loadSpecs(rootDir, opts = {}) {
   }
   for (const entry of entries) {
     if (!isValidSlug(entry)) {
-      log5.info(`跳过非合法 slug 命名的条目`, { entry });
+      log6.info(`跳过非合法 slug 命名的条目`, { entry });
       continue;
     }
-    const specDir = join13(specsRoot, entry);
+    const specDir = join14(specsRoot, entry);
     let dirStat;
     try {
       dirStat = statReader(specDir);
     } catch (err) {
-      log5.warn(`spec 目录 stat 失败`, {
+      log6.warn(`spec 目录 stat 失败`, {
         specDir,
         error: err instanceof Error ? err.message : String(err)
       });
@@ -16276,7 +16334,7 @@ function loadSpecs(rootDir, opts = {}) {
     }
     if (!dirStat.isDirectory)
       continue;
-    const handoffPath = join13(specDir, "handoff.yaml");
+    const handoffPath = join14(specDir, "handoff.yaml");
     let fileStat;
     try {
       fileStat = statReader(handoffPath);
@@ -16286,7 +16344,7 @@ function loadSpecs(rootDir, opts = {}) {
     if (fileStat.isDirectory)
       continue;
     if (fileStat.size > MAX_HANDOFF_SIZE) {
-      log5.warn(`handoff.yaml 超过 ${MAX_HANDOFF_SIZE} 字节上限，已跳过`, {
+      log6.warn(`handoff.yaml 超过 ${MAX_HANDOFF_SIZE} 字节上限，已跳过`, {
         handoffPath,
         size: fileStat.size
       });
@@ -16296,7 +16354,7 @@ function loadSpecs(rootDir, opts = {}) {
     try {
       rawYaml = reader(handoffPath);
     } catch (err) {
-      log5.warn(`handoff.yaml 读取失败`, {
+      log6.warn(`handoff.yaml 读取失败`, {
         handoffPath,
         error: err instanceof Error ? err.message : String(err)
       });
@@ -16304,7 +16362,7 @@ function loadSpecs(rootDir, opts = {}) {
     }
     const result = validateHandoff(rawYaml, fileStat.size);
     if (!result.ok) {
-      log5.warn(`handoff.yaml 校验失败，已跳过`, {
+      log6.warn(`handoff.yaml 校验失败，已跳过`, {
         handoffPath,
         reason: result.reason
       });
@@ -16312,7 +16370,7 @@ function loadSpecs(rootDir, opts = {}) {
     }
     const handoff = result.data;
     if (handoff.slug !== entry) {
-      log5.warn(`handoff.slug 与目录名不一致，以目录名为准`, {
+      log6.warn(`handoff.slug 与目录名不一致，以目录名为准`, {
         dir: entry,
         handoffSlug: handoff.slug
       });
@@ -16335,7 +16393,7 @@ function loadSpecs(rootDir, opts = {}) {
       handoff
     });
   }
-  log5.info(`specs 加载完成`, {
+  log6.info(`specs 加载完成`, {
     specsRoot,
     loaded: records.length,
     total_entries: entries.length
@@ -16369,14 +16427,14 @@ function renderCandidatesNudge(matched) {
   return body.slice(0, NUDGE_MAX_LEN - 4) + `
 …`;
 }
-var log5 = makePluginLogger(PLUGIN_NAME8);
+var log6 = makePluginLogger(PLUGIN_NAME8);
 var discoverSpecSuggestServer = async (ctx) => {
   try {
     const loaded = loadSpecs(ctx.directory ?? process.cwd());
     specIndex.length = 0;
     specIndex.push(...loaded);
   } catch (err) {
-    log5.warn(`loadSpecs 失败（plugin 将 no-op）`, {
+    log6.warn(`loadSpecs 失败（plugin 将 no-op）`, {
       error: err instanceof Error ? err.message : String(err)
     });
   }
@@ -16682,9 +16740,9 @@ var CODEFORGE_CONSTRAINTS = [
     priority: 8
   }
 ];
-async function seedConstraints(client, log6) {
+async function seedConstraints(client, log7) {
   if (!client.hasTransport()) {
-    log6?.debug?.(`[${PLUGIN_NAME9}] seedConstraints: transport 不可用，跳过`, {});
+    log7?.debug?.(`[${PLUGIN_NAME9}] seedConstraints: transport 不可用，跳过`, {});
     return { ok: false, reason: "transport_unavailable" };
   }
   try {
@@ -16698,7 +16756,7 @@ async function seedConstraints(client, log6) {
     });
     if (result && typeof result === "object" && "ok" in result && result.ok === false) {
       const r = result;
-      log6?.warn(`[${PLUGIN_NAME9}] seedConstraints 降级`, {
+      log7?.warn(`[${PLUGIN_NAME9}] seedConstraints 降级`, {
         reason: r.reason,
         message: r.message
       });
@@ -16708,15 +16766,15 @@ async function seedConstraints(client, log6) {
         message: r.message
       };
     }
-    log6?.info(`[${PLUGIN_NAME9}] seedConstraints: 已写入 ${CODEFORGE_CONSTRAINTS.length} 条 constraints`, { count: CODEFORGE_CONSTRAINTS.length });
+    log7?.info(`[${PLUGIN_NAME9}] seedConstraints: 已写入 ${CODEFORGE_CONSTRAINTS.length} 条 constraints`, { count: CODEFORGE_CONSTRAINTS.length });
     return { ok: true, itemsWritten: CODEFORGE_CONSTRAINTS.length };
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
-    log6?.warn(`[${PLUGIN_NAME9}] seedConstraints 失败（已静默）`, { error: message });
+    log7?.warn(`[${PLUGIN_NAME9}] seedConstraints 失败（已静默）`, { error: message });
     return { ok: false, reason: "exception", message };
   }
 }
-function createSystemInjectedHook(client, sessionId, log6) {
+function createSystemInjectedHook(client, sessionId, log7) {
   const section = `topic:auto-context-${sessionId ?? "global"}`;
   return async (markdown) => {
     try {
@@ -16727,7 +16785,7 @@ function createSystemInjectedHook(client, sessionId, log6) {
       });
       if (result && typeof result === "object" && "ok" in result && result.ok === false) {
         const r = result;
-        log6?.warn(`[${PLUGIN_NAME9}] system-injected 降级到 observe-only：${r.reason ?? "unknown"}`, {
+        log7?.warn(`[${PLUGIN_NAME9}] system-injected 降级到 observe-only：${r.reason ?? "unknown"}`, {
           sessionId,
           section,
           preview: markdown.slice(0, 200),
@@ -16736,12 +16794,12 @@ function createSystemInjectedHook(client, sessionId, log6) {
         });
         return;
       }
-      log6?.info(`[${PLUGIN_NAME9}] system-injected: 写入 KH working_memory 成功 (${markdown.length} chars)`, {
+      log7?.info(`[${PLUGIN_NAME9}] system-injected: 写入 KH working_memory 成功 (${markdown.length} chars)`, {
         sessionId,
         section
       });
     } catch (err) {
-      log6?.warn(`[${PLUGIN_NAME9}] system-injected 抛异常，降级到 observe-only`, {
+      log7?.warn(`[${PLUGIN_NAME9}] system-injected 抛异常，降级到 observe-only`, {
         sessionId,
         section,
         preview: markdown.slice(0, 200),
@@ -16758,7 +16816,7 @@ function inflightKey(sessionId, query) {
 async function runKhSearchAndInject(args) {
   const { query, ctx, opts, mode } = args;
   const cfg = opts.config ?? DEFAULT_CONFIG4;
-  const log6 = ctx.log;
+  const log7 = ctx.log;
   const startedAt = Date.now();
   const racer = opts.scheduler?.raceTimeout ?? (async (p, ms) => {
     let timer = null;
@@ -16784,7 +16842,7 @@ async function runKhSearchAndInject(args) {
     });
     result = await racer(searchPromise, cfg.timeoutMs);
   } catch (err) {
-    log6?.warn(`[${PLUGIN_NAME9}] client.search threw (sync or async), return null`, {
+    log7?.warn(`[${PLUGIN_NAME9}] client.search threw (sync or async), return null`, {
       query,
       elapsedMs: Date.now() - startedAt,
       sessionId: ctx.sessionId,
@@ -16794,7 +16852,7 @@ async function runKhSearchAndInject(args) {
     return null;
   }
   if (result === "__timeout__") {
-    log6?.warn(`[${PLUGIN_NAME9}] timeout`, {
+    log7?.warn(`[${PLUGIN_NAME9}] timeout`, {
       query,
       ms: cfg.timeoutMs,
       elapsedMs: Date.now() - startedAt,
@@ -16804,7 +16862,7 @@ async function runKhSearchAndInject(args) {
     return null;
   }
   if (!result.ok) {
-    log6?.warn(`[${PLUGIN_NAME9}] kh degraded`, {
+    log7?.warn(`[${PLUGIN_NAME9}] kh degraded`, {
       reason: result.reason,
       query,
       elapsedMs: Date.now() - startedAt,
@@ -16816,7 +16874,7 @@ async function runKhSearchAndInject(args) {
   const filtered = result.insights.filter((i) => (i.confidence ?? 0) >= cfg.minConfidence);
   if (filtered.length === 0) {
     opts.cache.record(query, []);
-    log6?.debug?.(`[${PLUGIN_NAME9}] no candidate above threshold`, {
+    log7?.debug?.(`[${PLUGIN_NAME9}] no candidate above threshold`, {
       query,
       rawCount: result.insights.length,
       elapsedMs: Date.now() - startedAt,
@@ -16829,7 +16887,7 @@ async function runKhSearchAndInject(args) {
     try {
       await ctx.injectContext(payload.markdown);
     } catch (err) {
-      log6?.warn(`[${PLUGIN_NAME9}] injectContext threw`, {
+      log7?.warn(`[${PLUGIN_NAME9}] injectContext threw`, {
         error: err instanceof Error ? err.message : String(err),
         query,
         sessionId: ctx.sessionId
@@ -16837,7 +16895,7 @@ async function runKhSearchAndInject(args) {
     }
   }
   opts.cache.record(query, filtered);
-  log6?.info(`[${PLUGIN_NAME9}] inject complete (${mode})`, {
+  log7?.info(`[${PLUGIN_NAME9}] inject complete (${mode})`, {
     query,
     mode,
     candidateCount: filtered.length,
@@ -16850,21 +16908,21 @@ async function handleMessage2(raw, opts) {
   const cfg = opts.config ?? DEFAULT_CONFIG4;
   const mode = opts.mode ?? INJECTION_MODE;
   const ctx = raw ?? {};
-  const log6 = ctx.log;
+  const log7 = ctx.log;
   const text = (ctx.content ?? "").trim();
   if (!shouldInject(text, cfg)) {
-    log6?.debug?.(`[${PLUGIN_NAME9}] skip (filter)`, { textLen: text.length });
+    log7?.debug?.(`[${PLUGIN_NAME9}] skip (filter)`, { textLen: text.length });
     return;
   }
   const query = extractQuery(text);
   if (!query)
     return;
   if (opts.cache.shouldSkip(query)) {
-    log6?.debug?.(`[${PLUGIN_NAME9}] cache hit, skip`, { query });
+    log7?.debug?.(`[${PLUGIN_NAME9}] cache hit, skip`, { query });
     return;
   }
   if (inflight2.size >= INFLIGHT_CAP) {
-    log6?.warn(`[${PLUGIN_NAME9}] inflight cap reached, skip`, {
+    log7?.warn(`[${PLUGIN_NAME9}] inflight cap reached, skip`, {
       query,
       inflightSize: inflight2.size,
       cap: INFLIGHT_CAP,
@@ -16875,7 +16933,7 @@ async function handleMessage2(raw, opts) {
   const key = inflightKey(ctx.sessionId, query);
   inflight2.add(key);
   runKhSearchAndInject({ query, ctx, opts, mode }).catch((err) => {
-    log6?.warn(`[${PLUGIN_NAME9}] runKhSearchAndInject 顶层兜底捕获`, {
+    log7?.warn(`[${PLUGIN_NAME9}] runKhSearchAndInject 顶层兜底捕获`, {
       error: err instanceof Error ? err.message : String(err),
       query,
       sessionId: ctx.sessionId
@@ -16888,7 +16946,7 @@ logLifecycle(PLUGIN_NAME9, "import");
 var sharedClient2 = new KhClient;
 var sharedCache = new QueryCache(DEFAULT_CONFIG4.cacheTtlMs);
 var khAutoContextServer = async (ctx) => {
-  const log6 = makePluginLogger(PLUGIN_NAME9);
+  const log7 = makePluginLogger(PLUGIN_NAME9);
   const runtimeMode = resolveInjectionMode(sharedClient2);
   logLifecycle(PLUGIN_NAME9, "activate", {
     directory: ctx.directory,
@@ -16897,8 +16955,8 @@ var khAutoContextServer = async (ctx) => {
     mode: runtimeMode,
     transport_available: sharedClient2.hasTransport()
   });
-  seedConstraints(sharedClient2, log6).catch((err) => {
-    log6.warn("seedConstraints 顶层兜底捕获", {
+  seedConstraints(sharedClient2, log7).catch((err) => {
+    log7.warn("seedConstraints 顶层兜底捕获", {
       error: err instanceof Error ? err.message : String(err)
     });
   });
@@ -16908,8 +16966,8 @@ var khAutoContextServer = async (ctx) => {
         const text = extractUserText(output);
         if (!text)
           return;
-        const injectContext = runtimeMode === "system-injected" ? createSystemInjectedHook(sharedClient2, input.sessionID, log6) : async (markdown) => {
-          log6.info(`KH context candidate (${markdown.length} chars)`, {
+        const injectContext = runtimeMode === "system-injected" ? createSystemInjectedHook(sharedClient2, input.sessionID, log7) : async (markdown) => {
+          log7.info(`KH context candidate (${markdown.length} chars)`, {
             sessionID: input.sessionID,
             mode: runtimeMode,
             preview: markdown.slice(0, 200)
@@ -16919,7 +16977,7 @@ var khAutoContextServer = async (ctx) => {
           content: text,
           sessionId: input.sessionID,
           injectContext,
-          log: log6
+          log: log7
         }, { client: sharedClient2, cache: sharedCache, mode: runtimeMode });
       });
     },
@@ -16933,7 +16991,7 @@ var khAutoContextServer = async (ctx) => {
         if (typeof sid !== "string" || !sid)
           return;
         sharedKhCache.onSessionEnd(sid);
-        log6.debug?.(`[${PLUGIN_NAME9}] session.idle: cleared shared cache`, {
+        log7.debug?.(`[${PLUGIN_NAME9}] session.idle: cleared shared cache`, {
           sessionID: sid
         });
       });
@@ -17165,7 +17223,7 @@ function hasRecentSmartSearch(messages, recentRounds) {
   }
   return false;
 }
-function evaluate2(input) {
+function evaluate(input) {
   const messages = Array.isArray(input.messages) ? input.messages : [];
   const sessionId = input.sessionId ?? "unknown";
   const threshold = input.threshold ?? DEFAULT_THRESHOLD;
@@ -17205,15 +17263,15 @@ function evaluate2(input) {
   lastTriggerAt.set(sessionId, now);
   return { triggered: true, reason, sessionId };
 }
-function handleObserve(raw, log6) {
+function handleObserve(raw, log7) {
   const ctx = raw ?? {};
   if (!Array.isArray(ctx.messages))
     return null;
   try {
-    const result = evaluate2(ctx);
+    const result = evaluate(ctx);
     if (result.triggered && result.reason) {
       const reasonStr = formatReason(result.reason);
-      log6?.info(`[${PLUGIN_NAME10}] ⚡ KH 提醒（observe-only） · session=${result.sessionId} · ${reasonStr}`, {
+      log7?.info(`[${PLUGIN_NAME10}] ⚡ KH 提醒（observe-only） · session=${result.sessionId} · ${reasonStr}`, {
         sessionId: result.sessionId,
         reason: result.reason,
         suggestion: "调用 smart_search 查项目历史；完成后用 save_chat_insight 沉淀"
@@ -17221,7 +17279,7 @@ function handleObserve(raw, log6) {
     }
     return result;
   } catch (err) {
-    log6?.warn(`[${PLUGIN_NAME10}] evaluate 异常（已隔离）`, {
+    log7?.warn(`[${PLUGIN_NAME10}] evaluate 异常（已隔离）`, {
       error: err instanceof Error ? err.message : String(err)
     });
     return null;
@@ -17237,7 +17295,7 @@ function formatReason(r) {
       return `no-search-in-recent-rounds (last ${r.rounds})`;
   }
 }
-var log6 = makePluginLogger(PLUGIN_NAME10);
+var log7 = makePluginLogger(PLUGIN_NAME10);
 var khReminderServer = async (ctx) => {
   logLifecycle(PLUGIN_NAME10, "activate", {
     directory: ctx.directory,
@@ -17263,7 +17321,7 @@ var khReminderServer = async (ctx) => {
 `);
           return { role, content };
         });
-        const result = handleObserve({ messages: flat, sessionId }, log6);
+        const result = handleObserve({ messages: flat, sessionId }, log7);
         if (!result)
           return;
         safeWriteLog(PLUGIN_NAME10, {
@@ -17282,14 +17340,14 @@ var khReminderServer = async (ctx) => {
 var handler10 = khReminderServer;
 
 // lib/memories.ts
-import { promises as fs14 } from "node:fs";
-import * as path17 from "node:path";
+import { promises as fs15 } from "node:fs";
+import * as path18 from "node:path";
 import * as os5 from "node:os";
 function resolveConfig(c) {
   return {
     projectRoot: c.projectRoot,
     homeDir: c.homeDir ?? os5.homedir(),
-    projectName: c.projectName ?? path17.basename(c.projectRoot),
+    projectName: c.projectName ?? path18.basename(c.projectRoot),
     kh: c.kh,
     now: c.now ?? Date.now,
     log: c.log ?? (() => {}),
@@ -17298,13 +17356,13 @@ function resolveConfig(c) {
 }
 function fileFor(scope, cfg) {
   if (scope === "project") {
-    return path17.join(cfg.projectRoot, ".codeforge", "memories.json");
+    return path18.join(cfg.projectRoot, ".codeforge", "memories.json");
   }
-  return path17.join(cfg.homeDir, ".codeforge", "memories.json");
+  return path18.join(cfg.homeDir, ".codeforge", "memories.json");
 }
 async function readBank(p) {
   try {
-    const raw = await fs14.readFile(p, "utf8");
+    const raw = await fs15.readFile(p, "utf8");
     const arr = JSON.parse(raw);
     if (!Array.isArray(arr))
       return [];
@@ -17314,10 +17372,10 @@ async function readBank(p) {
   }
 }
 async function writeBank(p, items) {
-  await fs14.mkdir(path17.dirname(p), { recursive: true });
+  await fs15.mkdir(path18.dirname(p), { recursive: true });
   const tmp = `${p}.tmp`;
-  await fs14.writeFile(tmp, JSON.stringify(items, null, 2), "utf8");
-  await fs14.rename(tmp, p);
+  await fs15.writeFile(tmp, JSON.stringify(items, null, 2), "utf8");
+  await fs15.rename(tmp, p);
 }
 function isMemory(x) {
   if (!x || typeof x !== "object")
@@ -17569,23 +17627,23 @@ async function handleMessage3(raw, opts) {
   const cfg = opts.cfg ?? DEFAULT_CONFIG5;
   const cache2 = opts.cache ?? new QueryCache2(cfg.cacheTtlMs);
   const ctx = raw ?? {};
-  const log7 = ctx.log;
+  const log8 = ctx.log;
   const text = (ctx.content ?? "").trim();
   if (!text)
     return { kind: "noop", reason: "empty", mode: INJECTION_MODE2 };
   const dir = parseDirective(text);
   if (dir.kind !== "none") {
-    return await handleDirective(dir, ctx, opts.memCfg, log7);
+    return await handleDirective(dir, ctx, opts.memCfg, log8);
   }
   if (!shouldRecall(text, cfg)) {
-    log7?.debug?.(`[${PLUGIN_NAME11}] skip (filter)`, { textLen: text.length });
+    log8?.debug?.(`[${PLUGIN_NAME11}] skip (filter)`, { textLen: text.length });
     return { kind: "noop", reason: "filtered", mode: INJECTION_MODE2 };
   }
   const query = extractQuery2(text);
   if (!query)
     return { kind: "noop", reason: "empty_query", mode: INJECTION_MODE2 };
   if (cache2.shouldSkip(query)) {
-    log7?.debug?.(`[${PLUGIN_NAME11}] cache hit`, { query });
+    log8?.debug?.(`[${PLUGIN_NAME11}] cache hit`, { query });
     return { kind: "noop", reason: "cache", mode: INJECTION_MODE2 };
   }
   const racer = opts.scheduler?.raceTimeout ?? (async (p, ms) => {
@@ -17610,7 +17668,7 @@ async function handleMessage3(raw, opts) {
   }, opts.memCfg);
   const result = await racer(injectPromise, cfg.timeoutMs);
   if (result === "__timeout__") {
-    log7?.warn(`[${PLUGIN_NAME11}] timeout`, { query, ms: cfg.timeoutMs });
+    log8?.warn(`[${PLUGIN_NAME11}] timeout`, { query, ms: cfg.timeoutMs });
     cache2.record(query, 0);
     return { kind: "noop", reason: "timeout", mode: INJECTION_MODE2 };
   }
@@ -17622,29 +17680,29 @@ async function handleMessage3(raw, opts) {
     try {
       await ctx.injectContext(result.text);
     } catch (err) {
-      log7?.warn(`[${PLUGIN_NAME11}] injectContext threw`, {
+      log8?.warn(`[${PLUGIN_NAME11}] injectContext threw`, {
         error: err instanceof Error ? err.message : String(err)
       });
     }
   }
   cache2.record(query, result.recalled);
-  log7?.info(`[${PLUGIN_NAME11}] observe-only: ${result.used}/${result.recalled} memories ready`, { query, mode: INJECTION_MODE2 });
+  log8?.info(`[${PLUGIN_NAME11}] observe-only: ${result.used}/${result.recalled} memories ready`, { query, mode: INJECTION_MODE2 });
   return { kind: "injected", payload: result, mode: INJECTION_MODE2 };
 }
-async function handleDirective(dir, ctx, memCfg, log7) {
+async function handleDirective(dir, ctx, memCfg, log8) {
   if (dir.kind === "remember") {
     const r = await addMemory({ scope: dir.scope, content: dir.content, source: "directive" }, memCfg);
     if (r.ok) {
       const target = r.written_to === "kh" ? "KH" : "本地";
       await safeReply(ctx, `\uD83E\uDDE0 已记住（${dir.scope} / ${target}，id=${r.id}）`);
-      log7?.info(`[${PLUGIN_NAME11}] /remember ok`, {
+      log8?.info(`[${PLUGIN_NAME11}] /remember ok`, {
         scope: dir.scope,
         id: r.id,
         mode: INJECTION_MODE2
       });
     } else {
       await safeReply(ctx, `❌ 记忆失败：${r.error ?? "unknown"}`);
-      log7?.warn(`[${PLUGIN_NAME11}] /remember failed`, { error: r.error });
+      log8?.warn(`[${PLUGIN_NAME11}] /remember failed`, { error: r.error });
     }
     return { kind: "remembered", result: r, mode: INJECTION_MODE2 };
   }
@@ -17681,7 +17739,7 @@ function buildMemCfg(directory) {
   return { projectRoot: directory };
 }
 var memoriesContextServer = async (ctx) => {
-  const log7 = makePluginLogger(PLUGIN_NAME11);
+  const log8 = makePluginLogger(PLUGIN_NAME11);
   const memCfg = buildMemCfg(ctx.directory);
   logLifecycle(PLUGIN_NAME11, "activate", {
     directory: ctx.directory,
@@ -17698,19 +17756,19 @@ var memoriesContextServer = async (ctx) => {
           content: text,
           sessionId: input.sessionID,
           injectContext: async (markdown) => {
-            log7.info(`memories context candidate (${markdown.length} chars)`, {
+            log8.info(`memories context candidate (${markdown.length} chars)`, {
               sessionID: input.sessionID,
               mode: INJECTION_MODE2,
               preview: markdown.slice(0, 200)
             });
           },
           reply: async (msg) => {
-            log7.info(`directive reply (observe-only): ${msg}`, {
+            log8.info(`directive reply (observe-only): ${msg}`, {
               sessionID: input.sessionID,
               mode: INJECTION_MODE2
             });
           },
-          log: log7
+          log: log8
         }, { cache: sharedCache2, memCfg });
       });
     }
@@ -17785,7 +17843,7 @@ fallback 链已用尽：${meta.chain.join(" → ")}`;
 完整链：${meta.chain.join(" → ")}`;
 }
 var modelFallbackServer = async (ctx) => {
-  const log7 = makePluginLogger(PLUGIN_NAME12);
+  const log8 = makePluginLogger(PLUGIN_NAME12);
   loadOnce(ctx.directory ?? process.cwd());
   logLifecycle(PLUGIN_NAME12, "activate", {
     directory: ctx.directory,
@@ -17844,7 +17902,7 @@ var modelFallbackServer = async (ctx) => {
         const model = props.model ?? "unknown/unknown";
         const meta = buildFallbackMeta(state.config, agent, model);
         const suggestion = meta ? buildSuggestion(meta, String(message)) : `⚠️ ${agent}/${model} 失败：${message}`;
-        log7.warn(`[${PLUGIN_NAME12}] ${suggestion}`);
+        log8.warn(`[${PLUGIN_NAME12}] ${suggestion}`);
         safeWriteLog(PLUGIN_NAME12, {
           hook: "event.error",
           eventType: e.type,
@@ -17864,100 +17922,13 @@ import { promises as fsPromises } from "node:fs";
 import * as path19 from "node:path";
 init_runtime_paths();
 init_global_config();
-
-// lib/parent-map-store.ts
-init_runtime_paths();
-import { promises as fs15 } from "node:fs";
-import * as path18 from "node:path";
-var PARENT_MAP_VERSION = 1;
-var PARENT_MAP_LOCK_TIMEOUT_MS = 2000;
-function parentMapDir(mainRoot) {
-  return path18.join(runtimeDir(path18.resolve(mainRoot), { ensure: false }), "session-worktrees");
-}
-function parentMapPath(mainRoot) {
-  return path18.join(parentMapDir(mainRoot), "parent-map.json");
-}
-function parentMapLockPath(mainRoot) {
-  return path18.join(parentMapDir(mainRoot), "parent-map.lock");
-}
-async function readParentMapFile(mainRoot) {
-  const file = parentMapPath(mainRoot);
-  try {
-    const raw = await fs15.readFile(file, "utf8");
-    const parsed = JSON.parse(raw);
-    if (parsed.version !== PARENT_MAP_VERSION || !Array.isArray(parsed.entries)) {
-      return { version: PARENT_MAP_VERSION, entries: [] };
-    }
-    return parsed;
-  } catch (err) {
-    const e = err;
-    if (e.code === "ENOENT")
-      return { version: PARENT_MAP_VERSION, entries: [] };
-    return { version: PARENT_MAP_VERSION, entries: [] };
-  }
-}
-async function writeParentMapFile(mainRoot, payload) {
-  const file = parentMapPath(mainRoot);
-  await fs15.mkdir(path18.dirname(file), { recursive: true });
-  const tmp = `${file}.tmp-${process.pid}-${Date.now()}`;
-  await fs15.writeFile(tmp, JSON.stringify(payload, null, 2), "utf8");
-  await fs15.rename(tmp, file);
-}
-async function loadParentMap(mainRoot) {
-  const out = new Map;
-  let file;
-  try {
-    file = await readParentMapFile(mainRoot);
-  } catch {
-    return out;
-  }
-  for (const e of file.entries) {
-    if (!e || typeof e.childID !== "string" || typeof e.parentID !== "string")
-      continue;
-    if (!e.childID || !e.parentID)
-      continue;
-    const ts = typeof e.ts === "number" ? e.ts : Date.now();
-    out.set(e.childID, { parentID: e.parentID, ts });
-  }
-  return out;
-}
-async function writeParentMap(mainRoot, snapshot, opts = {}) {
-  const lockPath = parentMapLockPath(mainRoot);
-  await fs15.mkdir(path18.dirname(lockPath), { recursive: true });
-  const lockOpts = {
-    timeoutMs: opts.timeoutMs ?? PARENT_MAP_LOCK_TIMEOUT_MS,
-    ...opts
-  };
-  await withFileLock(lockPath, async () => {
-    const entries = [];
-    for (const [childID, v] of snapshot.entries()) {
-      entries.push({ childID, parentID: v.parentID, ts: v.ts });
-    }
-    await writeParentMapFile(mainRoot, { version: PARENT_MAP_VERSION, entries });
-  }, lockOpts);
-}
-async function appendParentEntry(mainRoot, childID, parentID, ts, opts = {}) {
-  if (!childID || !parentID)
-    return;
-  const lockPath = parentMapLockPath(mainRoot);
-  await fs15.mkdir(path18.dirname(lockPath), { recursive: true });
-  const lockOpts = {
-    timeoutMs: opts.timeoutMs ?? PARENT_MAP_LOCK_TIMEOUT_MS,
-    ...opts
-  };
-  await withFileLock(lockPath, async () => {
-    const current = await readParentMapFile(mainRoot);
-    const idx = current.entries.findIndex((e) => e.childID === childID);
-    if (idx >= 0) {
-      current.entries[idx] = { childID, parentID, ts };
-    } else {
-      current.entries.push({ childID, parentID, ts });
-    }
-    await writeParentMapFile(mainRoot, current);
-  }, lockOpts);
-}
-
-// plugins/subtask-heartbeat.ts
+var recordSessionParent2 = recordSessionParent;
+var lookupParentSessionId2 = lookupParentSessionId;
+var deleteSessionParent2 = deleteSessionParent;
+var sweepExpiredSessionParents2 = sweepExpiredSessionParents;
+var _bulkInjectSessionParentMap2 = _bulkInjectSessionParentMap;
+var _capSessionParentMap2 = _capSessionParentMap;
+var _setPersistRootForTests2 = _setPersistRootForTests;
 var PLUGIN_NAME13 = "subtask-heartbeat";
 logLifecycle(PLUGIN_NAME13, "import", {});
 var HEARTBEAT_INTERVAL_MS2 = 30000;
@@ -17968,94 +17939,13 @@ var PENDING_TASK_TTL_MS = 60000;
 var PENDING_TASK_MAX_PARENTS = 64;
 var PENDING_TASK_MAX_PER_PARENT = 16;
 var DESCRIPTION_MAX_LEN = 60;
-var SESSION_PARENT_MAP_TTL_MS = 30 * 60000;
-var SESSION_PARENT_MAP_MAX_SIZE = 256;
 var PARENT_PARSE_FAIL_MAX_LOG = 10;
 var inflight3 = new Map;
 var pendingTask = new Map;
-var sessionParentMap = new Map;
 var _parentParseFailLogged = 0;
-var _persistRoot = null;
-function _bulkInjectSessionParentMap(entries) {
-  for (const e of entries) {
-    if (!e.childID || !e.parentID)
-      continue;
-    sessionParentMap.set(e.childID, { parentID: e.parentID, ts: e.ts });
-  }
-}
 function _snapshotInflight() {
   return [...inflight3.values()].map((r) => ({ ...r }));
 }
-function recordSessionParent(childID, parentID, now = Date.now()) {
-  if (!childID || !parentID)
-    return;
-  if (sessionParentMap.has(childID)) {
-    sessionParentMap.set(childID, { parentID, ts: now });
-  } else {
-    if (sessionParentMap.size >= SESSION_PARENT_MAP_MAX_SIZE) {
-      let oldestKey = null;
-      let oldestTs = Number.POSITIVE_INFINITY;
-      for (const [k, v] of sessionParentMap.entries()) {
-        if (v.ts < oldestTs) {
-          oldestTs = v.ts;
-          oldestKey = k;
-        }
-      }
-      if (oldestKey !== null)
-        sessionParentMap.delete(oldestKey);
-    }
-    sessionParentMap.set(childID, { parentID, ts: now });
-  }
-  if (_persistRoot) {
-    appendParentEntry(_persistRoot, childID, parentID, now).catch((err) => {
-      log7.warn("appendParentEntry 失败（已隔离）", {
-        error: err instanceof Error ? err.message : String(err),
-        childID
-      });
-    });
-  }
-}
-function lookupParentSessionId(childID, now = Date.now()) {
-  const entry = sessionParentMap.get(childID);
-  if (!entry)
-    return;
-  if (now - entry.ts > SESSION_PARENT_MAP_TTL_MS) {
-    sessionParentMap.delete(childID);
-    return;
-  }
-  return entry.parentID;
-}
-function deleteSessionParent(childID) {
-  sessionParentMap.delete(childID);
-  if (_persistRoot) {
-    const snapshot = new Map(sessionParentMap);
-    writeParentMap(_persistRoot, snapshot).catch((err) => {
-      log7.warn("writeParentMap (delete) 失败（已隔离）", {
-        error: err instanceof Error ? err.message : String(err),
-        childID
-      });
-    });
-  }
-}
-function sweepExpiredSessionParents(now = Date.now()) {
-  let removed = 0;
-  for (const [k, v] of [...sessionParentMap.entries()]) {
-    if (now - v.ts > SESSION_PARENT_MAP_TTL_MS) {
-      sessionParentMap.delete(k);
-      removed++;
-    }
-  }
-  if (removed > 0 && _persistRoot) {
-    const snapshot = new Map(sessionParentMap);
-    writeParentMap(_persistRoot, snapshot).catch((err) => {
-      log7.warn("writeParentMap (sweep) 失败（已隔离）", {
-        error: err instanceof Error ? err.message : String(err),
-        removed
-      });
-    });
-  }
-  return removed;
-}
 function detectUnparsedParentID(event) {
   if (!event || typeof event !== "object")
     return false;
@@ -18329,33 +18219,13 @@ function buildAfterLogLine(toolName, ok, durationMs, now = Date.now()) {
     duration_ms: durationMs
   });
 }
-function buildSuccessNotice(r, logPath, now = Date.now()) {
-  const agent = r.agent ? titleCase(r.agent) : "subagent";
-  const elapsed = fmtElapsed(now - r.startedAt);
-  return [`✅ ${agent} 完成（${elapsed}）`, `\uD83D\uDCC4 完整日志: ${logPath}`].join(`
-`);
-}
-function buildFailureNotice(r, endedType, logPath, worktreePath, now = Date.now()) {
-  const agent = r.agent ? titleCase(r.agent) : "subagent";
-  const elapsed = fmtElapsed(now - r.startedAt);
-  const verb = endedType === "session.deleted" ? "被取消" : "失败";
-  const lines = [
-    `❌ ${agent} ${verb}（${endedType}, ${elapsed}）`,
-    `\uD83D\uDCC4 完整日志: ${logPath}`
-  ];
-  if (worktreePath)
-    lines.push(`\uD83D\uDD0D worktree 保留: ${worktreePath}`);
-  lines.push(`\uD83D\uDCA1 排查: cat ${logPath} | tail -50`);
-  return lines.join(`
-`);
-}
-async function appendSubagentLog(filePath, line, log7) {
+async function appendSubagentLog(filePath, line, log8) {
   try {
     await fsPromises.mkdir(path19.dirname(filePath), { recursive: true });
     await fsPromises.appendFile(filePath, line + `
 `, "utf8");
   } catch (err) {
-    log7?.debug?.("appendSubagentLog 失败（已隔离）", {
+    log8?.debug?.("appendSubagentLog 失败（已隔离）", {
       error: err instanceof Error ? err.message : String(err),
       file: filePath
     });
@@ -18380,9 +18250,9 @@ function normalizeVariant2(raw) {
     return "default";
   return raw;
 }
-async function showToast2(client, payload, log7) {
+async function showToast2(client, payload, log8) {
   if (typeof client?.tui?.showToast !== "function") {
-    log7?.debug?.("tui.showToast 不可用，noop");
+    log8?.debug?.("tui.showToast 不可用，noop");
     return false;
   }
   try {
@@ -18396,13 +18266,13 @@ async function showToast2(client, payload, log7) {
     });
     return true;
   } catch (err) {
-    log7?.warn("tui.showToast 抛错（已隔离）", {
+    log8?.warn("tui.showToast 抛错（已隔离）", {
       error: err instanceof Error ? err.message : String(err)
     });
     return false;
   }
 }
-var log7 = makePluginLogger(PLUGIN_NAME13);
+var log8 = makePluginLogger(PLUGIN_NAME13);
 var subtaskHeartbeatServer = async (ctx) => {
   logLifecycle(PLUGIN_NAME13, "activate", {
     directory: ctx.directory,
@@ -18410,7 +18280,7 @@ var subtaskHeartbeatServer = async (ctx) => {
   });
   const client = ctx.client;
   const cwd = ctx.directory;
-  _persistRoot = cwd;
+  _setPersistRootForTests2(cwd);
   try {
     const restored = await loadParentMap(cwd);
     if (restored.size > 0) {
@@ -18419,15 +18289,17 @@ var subtaskHeartbeatServer = async (ctx) => {
         parentID: v.parentID,
         ts: v.ts
       }));
-      _bulkInjectSessionParentMap(entries);
+      _bulkInjectSessionParentMap2(entries);
+      const cappedOut = _capSessionParentMap2();
       safeWriteLog(PLUGIN_NAME13, {
         hook: "activate",
         type: "parent-map.restore",
-        restored: restored.size
+        restored: restored.size,
+        capped: cappedOut
       });
     }
   } catch (err) {
-    log7.warn("loadParentMap 失败（已隔离），降级为空表", {
+    log8.warn("loadParentMap 失败（已隔离），降级为空表", {
       error: err instanceof Error ? err.message : String(err)
     });
   }
@@ -18437,7 +18309,7 @@ var subtaskHeartbeatServer = async (ctx) => {
       if (swept > 0) {
         safeWriteLog(PLUGIN_NAME13, { hook: "interval", pending_task_swept: swept });
       }
-      const sweptParents = sweepExpiredSessionParents();
+      const sweptParents = sweepExpiredSessionParents2();
       if (sweptParents > 0) {
         safeWriteLog(PLUGIN_NAME13, { hook: "interval", session_parent_swept: sweptParents });
       }
@@ -18446,7 +18318,7 @@ var subtaskHeartbeatServer = async (ctx) => {
         return;
       for (const r of beats) {
         const t = buildHeartbeatToast(r);
-        const sent = await showToast2(client, t, log7);
+        const sent = await showToast2(client, t, log8);
         safeWriteLog(PLUGIN_NAME13, {
           hook: "interval",
           child: r.childID,
@@ -18468,7 +18340,7 @@ var subtaskHeartbeatServer = async (ctx) => {
         try {
           if (detectUnparsedParentID(event) && _parentParseFailLogged < PARENT_PARSE_FAIL_MAX_LOG) {
             _parentParseFailLogged++;
-            log7.warn("session.created 含 parentID 关键字但 extractCreatedChild 解析失败，可能 SDK schema 变更", {
+            log8.warn("session.created 含 parentID 关键字但 extractCreatedChild 解析失败，可能 SDK schema 变更", {
               sample_count: _parentParseFailLogged,
               hint: "如频繁出现请检查 plugins/subtask-heartbeat.ts::extractCreatedChild 是否适配新 SDK"
             });
@@ -18482,9 +18354,9 @@ var subtaskHeartbeatServer = async (ctx) => {
         const created = extractCreatedChild(event);
         if (created) {
           try {
-            recordSessionParent(created.childID, created.parentID);
+            recordSessionParent2(created.childID, created.parentID);
           } catch (err) {
-            log7.warn("recordSessionParent 抛错（已隔离）", {
+            log8.warn("recordSessionParent 抛错（已隔离）", {
               error: err instanceof Error ? err.message : String(err)
             });
           }
@@ -18505,7 +18377,7 @@ var subtaskHeartbeatServer = async (ctx) => {
             description_len: record.description?.length ?? 0
           });
           const startToast = buildStartToast(record);
-          const sent = await showToast2(client, { ...startToast, duration: START_TOAST_DURATION_MS }, log7);
+          const sent = await showToast2(client, { ...startToast, duration: START_TOAST_DURATION_MS }, log8);
           safeWriteLog(PLUGIN_NAME13, {
             hook: "event",
             type: "session.created.toast",
@@ -18519,13 +18391,13 @@ var subtaskHeartbeatServer = async (ctx) => {
         if (ended) {
           if (ended.type === "session.deleted") {
             try {
-              deleteSessionParent(ended.sessionID);
+              deleteSessionParent2(ended.sessionID);
             } catch {}
           }
           const r = clearInflight2(ended.sessionID);
           if (r) {
             const t = buildEndToast(r, ended.type);
-            const sent = await showToast2(client, t, log7);
+            const sent = await showToast2(client, t, log8);
             safeWriteLog(PLUGIN_NAME13, {
               hook: "event",
               type: ended.type,
@@ -18534,32 +18406,10 @@ var subtaskHeartbeatServer = async (ctx) => {
               toast_sent: sent,
               end_toast_message: t.message
             });
-            const logPath = subagentLogPath(cwd, r.parentID, r.childID);
-            const isSuccess = ended.type === "session.idle";
-            let text;
-            if (isSuccess) {
-              text = buildSuccessNotice(r, logPath);
-            } else {
-              let worktreePath = null;
-              try {
-                const entry = await getSessionWorktree(r.childID, cwd);
-                worktreePath = entry?.worktreePath ?? null;
-              } catch {}
-              text = buildFailureNotice(r, ended.type, logPath, worktreePath);
+            if (ended.type === "session.deleted") {
+              const logFile = subagentLogPath(cwd, r.parentID, r.childID);
+              fsPromises.unlink(logFile).catch(() => {});
             }
-            const ocClient = ctx.client;
-            const noticeSent = await sendParentNotice(ocClient, r.parentID, text, {
-              directory: cwd,
-              log: (lvl, msg, data) => log7[lvl === "info" ? "info" : "warn"](msg, data)
-            });
-            safeWriteLog(PLUGIN_NAME13, {
-              hook: "event",
-              type: `${ended.type}.notice`,
-              child: r.childID,
-              parent: r.parentID,
-              notice_sent: noticeSent,
-              success: isSuccess
-            });
           }
         }
       });
@@ -18605,7 +18455,7 @@ var subtaskHeartbeatServer = async (ctx) => {
             const args = output?.args ?? null;
             const line = buildBeforeLogLine(input.tool, args);
             const file = subagentLogPath(cwd, rec.parentID, rec.childID);
-            appendSubagentLog(file, line, log7);
+            appendSubagentLog(file, line, log8);
           }
         }
       });
@@ -18630,7 +18480,7 @@ var subtaskHeartbeatServer = async (ctx) => {
         if (isLogPersistenceEnabled(cwd)) {
           const line = buildAfterLogLine(input.tool, true, durationMs);
           const file = subagentLogPath(cwd, rec.parentID, rec.childID);
-          appendSubagentLog(file, line, log7);
+          appendSubagentLog(file, line, log8);
         }
       });
     }
@@ -18672,7 +18522,7 @@ function formatInflightMarkdown(snapshot, now = Date.now()) {
 `);
 }
 var parallelStatusServer = async (ctx) => {
-  const log8 = makePluginLogger(PLUGIN_NAME14);
+  const log9 = makePluginLogger(PLUGIN_NAME14);
   logLifecycle(PLUGIN_NAME14, "activate", { directory: ctx.directory });
   return {
     "command.execute.before": async (input, output) => {
@@ -18692,9 +18542,9 @@ var parallelStatusServer = async (ctx) => {
             synthetic: false
           });
         }
-        log8.info(`[${PLUGIN_NAME14}] 已回写 ${snapshot.length} 条 inflight`);
+        log9.info(`[${PLUGIN_NAME14}] 已回写 ${snapshot.length} 条 inflight`);
       } catch (err) {
-        log8.error(`[${PLUGIN_NAME14}] command.execute.before 异常（已隔离）`, {
+        log9.error(`[${PLUGIN_NAME14}] command.execute.before 异常（已隔离）`, {
           error: err instanceof Error ? err.message : String(err)
         });
       }
@@ -18770,7 +18620,7 @@ function loadAgentToolsMap(rootDir, opts = {}) {
   const result = new Map;
   const safeSet = new Set(PARALLEL_SAFE_TOOLS);
   const unionTools = new Set;
-  const log8 = makePluginLogger(PLUGIN_NAME15);
+  const log9 = makePluginLogger(PLUGIN_NAME15);
   for (const dir of candidateDirs) {
     if (!dirExists(dir))
       continue;
@@ -18778,7 +18628,7 @@ function loadAgentToolsMap(rootDir, opts = {}) {
     try {
       entries = dirReader(dir);
     } catch (err) {
-      log8.warn(`agents 目录读取失败（已跳过）`, {
+      log9.warn(`agents 目录读取失败（已跳过）`, {
         dir,
         error: err instanceof Error ? err.message : String(err)
       });
@@ -18792,7 +18642,7 @@ function loadAgentToolsMap(rootDir, opts = {}) {
       try {
         content = reader(path20);
       } catch (err) {
-        log8.warn(`agent.md 读取失败（已跳过）`, {
+        log9.warn(`agent.md 读取失败（已跳过）`, {
           path: path20,
           error: err instanceof Error ? err.message : String(err)
         });
@@ -18800,7 +18650,7 @@ function loadAgentToolsMap(rootDir, opts = {}) {
       }
       const parsed = parseAgentFrontmatter(content);
       if (!parsed) {
-        log8.warn(`agent frontmatter 解析失败（已跳过）`, { path: path20 });
+        log9.warn(`agent frontmatter 解析失败（已跳过）`, { path: path20 });
         continue;
       }
       if (result.has(parsed.name))
@@ -18878,7 +18728,7 @@ This directive is re-injected every turn — it is not optional advice.
   return body.slice(0, NUDGE_MAX_LEN2 - 4) + `
 …`;
 }
-var log8 = makePluginLogger(PLUGIN_NAME15);
+var log9 = makePluginLogger(PLUGIN_NAME15);
 var parallelToolNudgeServer = async (ctx) => {
   try {
     const loaded = loadAgentToolsMap(ctx.directory ?? process.cwd());
@@ -18886,14 +18736,14 @@ var parallelToolNudgeServer = async (ctx) => {
     for (const [k, v] of loaded.entries())
       agentToolsMap.set(k, v);
   } catch (err) {
-    log8.warn(`loadAgentToolsMap 失败（plugin 将 no-op）`, {
+    log9.warn(`loadAgentToolsMap 失败（plugin 将 no-op）`, {
       error: err instanceof Error ? err.message : String(err)
     });
   }
   const realAgentCount = Math.max(0, agentToolsMap.size - (agentToolsMap.has(DEFAULT_AGENT_KEY) ? 1 : 0));
   if (realAgentCount === 0) {
     agentToolsMap.clear();
-    log8.warn(`0 real agents loaded; plugin will be no-op for this session`, {
+    log9.warn(`0 real agents loaded; plugin will be no-op for this session`, {
       directory: ctx.directory
     });
   }
@@ -19486,7 +19336,7 @@ function renderPrompt(plan) {
   return lines.join(`
 `);
 }
-var log9 = makePluginLogger(PLUGIN_NAME17);
+var log10 = makePluginLogger(PLUGIN_NAME17);
 var _lastInjection = null;
 var sessionRecoveryServer = async (ctx) => {
   logLifecycle(PLUGIN_NAME17, "activate", { directory: ctx.directory });
@@ -19502,7 +19352,7 @@ var sessionRecoveryServer = async (ctx) => {
         const root = typeof e.properties?.["root"] === "string" ? e.properties["root"] : ctx.directory ?? process.cwd();
         const r = await processSessionStart(sid, {
           root,
-          log: log9,
+          log: log10,
           injectRecovery: (inj) => {
             _lastInjection = inj;
           }
@@ -19517,7 +19367,7 @@ var sessionRecoveryServer = async (ctx) => {
           pending_blocks_count: r.pendingBlocks?.length ?? 0
         });
         if (r.injected && r.plan) {
-          log9.info(`[${PLUGIN_NAME17}] 注入恢复提示（last=${r.plan.last_session_id?.slice(0, 8) ?? "?"}, reason=${r.plan.reason}, pending_blocks=${r.pendingBlocks?.length ?? 0}）`);
+          log10.info(`[${PLUGIN_NAME17}] 注入恢复提示（last=${r.plan.last_session_id?.slice(0, 8) ?? "?"}, reason=${r.plan.reason}, pending_blocks=${r.pendingBlocks?.length ?? 0}）`);
         }
       });
     }
@@ -19530,7 +19380,7 @@ import { promises as fs18 } from "node:fs";
 import * as path22 from "node:path";
 
 // lib/parallel-merge.ts
-init_autonomy();
+init_worktree_ops();
 function resolveMergeFns(deps) {
   return {
     commitWorktreeIfDirtyFn: deps.commitWorktreeIfDirty ?? commitWorktreeIfDirty,
@@ -19541,7 +19391,7 @@ function resolveMergeFns(deps) {
     worktreeHasChangesFn: deps.worktreeHasChanges ?? worktreeHasChanges
   };
 }
-async function mergeOneAttempt(r, opts, mergeFns, log10) {
+async function mergeOneAttempt(r, opts, mergeFns, log11) {
   const t0 = Date.now();
   const root = opts.mergeRoot;
   const {
@@ -19623,7 +19473,7 @@ async function mergeOneAttempt(r, opts, mergeFns, log10) {
           await mergeAbortFn({ root });
         } catch (abortErr) {
           abortFailed = true;
-          log10("error", `[parallel-merge] mergeAbort 失败（仓库可能锁死）`, {
+          log11("error", `[parallel-merge] mergeAbort 失败（仓库可能锁死）`, {
             id: r.id,
             error: describe6(abortErr)
           });
@@ -19639,13 +19489,13 @@ async function mergeOneAttempt(r, opts, mergeFns, log10) {
       }
       attempt.ok = true;
       attempt.durationMs = Date.now() - t0;
-      await safeRemoveWorktree(removeWorktreeFn, root, wt, log10, r.id);
+      await safeRemoveWorktree(removeWorktreeFn, root, wt, log11, r.id);
       return { attempt };
     } else {
       attempt.ok = true;
       attempt.skippedReason = "no_changes";
       attempt.durationMs = Date.now() - t0;
-      await safeRemoveWorktree(removeWorktreeFn, root, wt, log10, r.id);
+      await safeRemoveWorktree(removeWorktreeFn, root, wt, log11, r.id);
       return { attempt };
     }
   } catch (err) {
@@ -19659,7 +19509,7 @@ async function mergeOneAttempt(r, opts, mergeFns, log10) {
   }
 }
 async function mergeWorktrees(results, opts, deps) {
-  const log10 = deps.log ?? (() => {});
+  const log11 = deps.log ?? (() => {});
   const root = opts.mergeRoot;
   const mergeFns = resolveMergeFns(deps);
   const report = {
@@ -19701,10 +19551,10 @@ async function mergeWorktrees(results, opts, deps) {
     };
     report.attempts.push(attempt);
     report.skipped++;
-    await fireMergeAttempt(opts.onMergeAttempt, attempt, idx++, log10);
+    await fireMergeAttempt(opts.onMergeAttempt, attempt, idx++, log11);
   }
   for (const r of mergeable) {
-    const { attempt, pendingItem } = await mergeOneAttempt(r, { mergeRoot: root }, mergeFns, log10);
+    const { attempt, pendingItem } = await mergeOneAttempt(r, { mergeRoot: root }, mergeFns, log11);
     report.attempts.push(attempt);
     if (attempt.ok && !attempt.skippedReason)
       report.merged++;
@@ -19714,12 +19564,12 @@ async function mergeWorktrees(results, opts, deps) {
       report.conflicted++;
     if (pendingItem)
       report.pendingWorktrees.push(pendingItem);
-    await fireMergeAttempt(opts.onMergeAttempt, attempt, idx++, log10);
+    await fireMergeAttempt(opts.onMergeAttempt, attempt, idx++, log11);
   }
   return report;
 }
 function createMergeQueue(opts, deps = {}) {
-  const log10 = deps.log ?? (() => {});
+  const log11 = deps.log ?? (() => {});
   const mergeFns = {
     commitWorktreeIfDirtyFn: deps.commitWorktreeIfDirtyFn ?? commitWorktreeIfDirty,
     tryMergeFn: deps.tryMergeFn ?? tryMerge,
@@ -19760,10 +19610,10 @@ function createMergeQueue(opts, deps = {}) {
               conflicts: []
             });
           }
-          await fireMergeAttempt(opts.onMergeAttempt, attempt2, idx++, log10);
+          await fireMergeAttempt(opts.onMergeAttempt, attempt2, idx++, log11);
           return;
         }
-        const { attempt, abortFailed, pendingItem } = await mergeOneAttempt(result, { mergeRoot: opts.mergeRoot, summaryCharLimit: opts.summaryCharLimit }, mergeFns, log10);
+        const { attempt, abortFailed, pendingItem } = await mergeOneAttempt(result, { mergeRoot: opts.mergeRoot, summaryCharLimit: opts.summaryCharLimit }, mergeFns, log11);
         report.attempts.push(attempt);
         if (attempt.ok && !attempt.skippedReason)
           report.merged++;
@@ -19775,11 +19625,11 @@ function createMergeQueue(opts, deps = {}) {
           report.pendingWorktrees.push(pendingItem);
         if (abortFailed) {
           queueAborted = true;
-          log10("error", `[parallel-merge] queue aborted (mergeAbort failed)`, {
+          log11("error", `[parallel-merge] queue aborted (mergeAbort failed)`, {
             id: result.id
           });
         }
-        await fireMergeAttempt(opts.onMergeAttempt, attempt, idx++, log10);
+        await fireMergeAttempt(opts.onMergeAttempt, attempt, idx++, log11);
       });
     },
     async flushAndReport() {
@@ -19788,23 +19638,23 @@ function createMergeQueue(opts, deps = {}) {
     }
   };
 }
-async function safeRemoveWorktree(fn, root, wt, log10, subtaskId) {
+async function safeRemoveWorktree(fn, root, wt, log11, subtaskId) {
   try {
     await fn({ root, worktree_path: wt, force: true });
   } catch (err) {
-    log10("warn", `[parallel] removeWorktree 失败 ${subtaskId}`, {
+    log11("warn", `[parallel] removeWorktree 失败 ${subtaskId}`, {
       error: describe6(err),
       worktree: wt
     });
   }
 }
-async function fireMergeAttempt(cb, attempt, idx, log10) {
+async function fireMergeAttempt(cb, attempt, idx, log11) {
   if (!cb)
     return;
   try {
     await cb(attempt, idx);
   } catch (err) {
-    log10("warn", `[parallel] onMergeAttempt 抛错（已隔离）`, {
+    log11("warn", `[parallel] onMergeAttempt 抛错（已隔离）`, {
       id: attempt.subtaskId,
       error: describe6(err)
     });
@@ -19830,7 +19680,7 @@ async function schedule(opts) {
   }
   const now = opts.deps.now ?? Date.now;
   const start = now();
-  const log10 = opts.deps.log ?? (() => {});
+  const log11 = opts.deps.log ?? (() => {});
   const concurrency = Math.max(1, opts.maxConcurrency ?? 4);
   const totalTimeout = opts.totalTimeout_ms ?? 30 * 60000;
   const limit = Math.max(1, opts.summaryCharLimit ?? 500);
@@ -19863,7 +19713,7 @@ async function schedule(opts) {
       mergeAbortFn: opts.deps.mergeAbort,
       removeWorktreeFn: opts.deps.removeWorktree,
       worktreeHasChangesFn: opts.deps.worktreeHasChanges,
-      log: log10
+      log: log11
     });
   }
   const fireFinish = async (i, res) => {
@@ -19871,7 +19721,7 @@ async function schedule(opts) {
       try {
         queue.enqueue(res);
       } catch (err) {
-        log10("warn", `[parallel] queue.enqueue 抛错（已隔离）`, {
+        log11("warn", `[parallel] queue.enqueue 抛错（已隔离）`, {
           id: res.id,
           error: describe7(err)
         });
@@ -19882,7 +19732,7 @@ async function schedule(opts) {
     try {
       await opts.onSubtaskFinish(res, i);
     } catch (err) {
-      log10("warn", `[parallel] onSubtaskFinish 抛错（已隔离）`, {
+      log11("warn", `[parallel] onSubtaskFinish 抛错（已隔离）`, {
         id: res.id,
         error: describe7(err)
       });
@@ -19912,7 +19762,7 @@ async function schedule(opts) {
       try {
         await opts.onSubtaskStart(spec, i);
       } catch (err) {
-        log10("warn", `[parallel] onSubtaskStart 抛错（已隔离）`, {
+        log11("warn", `[parallel] onSubtaskStart 抛错（已隔离）`, {
           id: spec.id,
           error: describe7(err)
         });
@@ -19963,7 +19813,7 @@ async function schedule(opts) {
         try {
           await alloc.cleanup();
         } catch (err) {
-          log10("warn", `[parallel] worktree 清理失败 ${spec.id}`, {
+          log11("warn", `[parallel] worktree 清理失败 ${spec.id}`, {
             error: describe7(err)
           });
         }
@@ -20121,7 +19971,7 @@ function pickStatus(r, taskAborted, globalAborted) {
 }
 
 // plugins/subtasks.ts
-init_autonomy();
+init_worktree_ops();
 
 // lib/decompose.ts
 var DEFAULT_MAX_SUBTASKS = 8;
@@ -20143,9 +19993,9 @@ function buildSystemPrompt(maxSubtasks) {
 `);
 }
 async function decomposeTask(description29, opts) {
-  const log10 = opts.log ?? (() => {});
+  const log11 = opts.log ?? (() => {});
   if (opts.mockResponse) {
-    return validateAndFinalize(opts.mockResponse, undefined, log10, opts.maxSubtasks ?? DEFAULT_MAX_SUBTASKS);
+    return validateAndFinalize(opts.mockResponse, undefined, log11, opts.maxSubtasks ?? DEFAULT_MAX_SUBTASKS);
   }
   const maxSubtasks = opts.maxSubtasks ?? DEFAULT_MAX_SUBTASKS;
   const timeoutMs = opts.timeoutMs ?? DEFAULT_TIMEOUT_MS2;
@@ -20156,7 +20006,7 @@ async function decomposeTask(description29, opts) {
       query: opts.directory ? { directory: opts.directory } : undefined
     });
     if (created.error || !created.data?.id) {
-      log10("warn", "[decompose] session.create 失败", { error: describe8(created.error) });
+      log11("warn", "[decompose] session.create 失败", { error: describe8(created.error) });
       return {
         ok: false,
         subtasks: [],
@@ -20178,22 +20028,22 @@ async function decomposeTask(description29, opts) {
       sleep2(timeoutMs).then(() => ({ kind: "timeout" }))
     ]);
     if (raced.kind === "timeout") {
-      log10("warn", "[decompose] LLM 调用超时", { timeoutMs });
+      log11("warn", "[decompose] LLM 调用超时", { timeoutMs });
       return { ok: false, subtasks: [], reason: "llm_unavailable" };
     }
     const r = raced.value;
     if (r.error || !r.data) {
-      log10("warn", "[decompose] session.prompt 返回错误", { error: describe8(r.error) });
+      log11("warn", "[decompose] session.prompt 返回错误", { error: describe8(r.error) });
       return { ok: false, subtasks: [], reason: "llm_unavailable" };
     }
     const rawText = pickLastText2(r.data.parts ?? []);
     if (!rawText) {
-      log10("warn", "[decompose] LLM 输出为空");
+      log11("warn", "[decompose] LLM 输出为空");
       return { ok: false, subtasks: [], reason: "parse_failed", raw: "" };
     }
     const parsed = extractJson(rawText);
     if (!parsed) {
-      log10("warn", "[decompose] JSON 解析失败", { raw: clip6(rawText, 200) });
+      log11("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) {
@@ -20201,7 +20051,7 @@ async function decomposeTask(description29, opts) {
     }
     const subtasksRaw = parsed.subtasks;
     if (!Array.isArray(subtasksRaw)) {
-      log10("warn", "[decompose] JSON 缺 subtasks 数组");
+      log11("warn", "[decompose] JSON 缺 subtasks 数组");
       return { ok: false, subtasks: [], reason: "parse_failed", raw: rawText };
     }
     const normalized = [];
@@ -20217,12 +20067,12 @@ async function decomposeTask(description29, opts) {
       normalized.push({ description: desc, hintFiles });
     }
     if (normalized.length > maxSubtasks) {
-      log10("warn", "[decompose] LLM 返回子任务超过上限", { count: normalized.length, maxSubtasks });
+      log11("warn", "[decompose] LLM 返回子任务超过上限", { count: normalized.length, maxSubtasks });
       return { ok: false, subtasks: [], reason: "parse_failed", raw: rawText };
     }
-    return validateAndFinalize(normalized, rawText, log10, maxSubtasks);
+    return validateAndFinalize(normalized, rawText, log11, maxSubtasks);
   } catch (err) {
-    log10("warn", "[decompose] 抛错", { error: describe8(err) });
+    log11("warn", "[decompose] 抛错", { error: describe8(err) });
     return { ok: false, subtasks: [], reason: "llm_unavailable" };
   } finally {
     if (childSessionId) {
@@ -20232,12 +20082,12 @@ async function decomposeTask(description29, opts) {
           query: opts.directory ? { directory: opts.directory } : undefined
         });
       } catch (err) {
-        log10("warn", "[decompose] session.delete 失败", { error: describe8(err) });
+        log11("warn", "[decompose] session.delete 失败", { error: describe8(err) });
       }
     }
   }
 }
-function validateAndFinalize(subtasks, raw, log10, maxSubtasks) {
+function validateAndFinalize(subtasks, raw, log11, maxSubtasks) {
   if (subtasks.length < 2) {
     return { ok: false, subtasks: [], reason: "single_task", raw };
   }
@@ -20247,7 +20097,7 @@ function validateAndFinalize(subtasks, raw, log10, maxSubtasks) {
     }
   }
   if (subtasks.length > maxSubtasks) {
-    log10("warn", "[decompose] LLM 返回子任务超过上限", { count: subtasks.length, maxSubtasks });
+    log11("warn", "[decompose] LLM 返回子任务超过上限", { count: subtasks.length, maxSubtasks });
     return { ok: false, subtasks: [], reason: "parse_failed", raw };
   }
   for (let i = 0;i < subtasks.length; i++) {
@@ -20261,7 +20111,7 @@ function validateAndFinalize(subtasks, raw, log10, maxSubtasks) {
         continue;
       for (const f of b) {
         if (setA.has(f.trim())) {
-          log10("info", "[decompose] hintFiles 有交集，降级 single_task", {
+          log11("info", "[decompose] hintFiles 有交集，降级 single_task", {
             a: subtasks[i].description,
             b: subtasks[j].description,
             file: f
@@ -20416,7 +20266,7 @@ var mockRunner = async (spec) => {
 };
 async function handleParallelCommand(raw) {
   const ctx = raw ?? {};
-  const log10 = ctx.log;
+  const log11 = ctx.log;
   const args = ctx.args ?? {};
   const parentId = (args.parentId ?? `task-${Date.now().toString(36)}`).replace(/[^a-zA-Z0-9._-]/g, "-");
   const rawDescription = typeof args.description === "string" ? args.description.trim() : "";
@@ -20430,7 +20280,7 @@ async function handleParallelCommand(raw) {
     specs = splitDescriptions(args.description, { parentId });
   }
   if (specs.length === 0) {
-    log10?.warn(`[${PLUGIN_NAME18}] /parallel 缺有效子任务`);
+    log11?.warn(`[${PLUGIN_NAME18}] /parallel 缺有效子任务`);
     await safeReply2(ctx, "⚠ /parallel 需要至少 1 个子任务（用 ; 或换行分隔）");
     return { ok: false, reason: "no_subtasks" };
   }
@@ -20456,7 +20306,7 @@ async function handleParallelCommand(raw) {
     if (!gitOk) {
       autoMerge = false;
       downgradedAutoMerge = true;
-      log10?.warn("[subtasks] mergeRoot 非 git 仓库，降级 autoMerge=false");
+      log11?.warn("[subtasks] mergeRoot 非 git 仓库，降级 autoMerge=false");
       const canNoticeEarly = Boolean(ctx.client && ctx.parentSessionID);
       if (canNoticeEarly) {
         await sendParentNotice(ctx.client, ctx.parentSessionID, "ℹ 当前目录不是 git 仓库，worktree 隔离已自动关闭，以单目录模式运行", { directory: ctx.directory });
@@ -20465,17 +20315,17 @@ async function handleParallelCommand(raw) {
   }
   const canNotice = Boolean(ctx.client && ctx.parentSessionID);
   if (specs.length === 1 && rawDescription.length >= 30 && ctx.client) {
-    log10?.info(`[${PLUGIN_NAME18}] 触发 AI 拆分（描述长度=${rawDescription.length}）`);
+    log11?.info(`[${PLUGIN_NAME18}] 触发 AI 拆分（描述长度=${rawDescription.length}）`);
     const dec = await decomposeTask(rawDescription, {
       client: ctx.client,
       directory: ctx.directory,
       log: (lvl, msg, data) => {
         if (lvl === "error")
-          log10?.error(msg, data);
+          log11?.error(msg, data);
         else if (lvl === "warn")
-          log10?.warn(msg, data);
+          log11?.warn(msg, data);
         else
-          log10?.info(msg, data);
+          log11?.info(msg, data);
       },
       mockResponse: ctx.decomposeMockResponse
     });
@@ -20486,7 +20336,7 @@ async function handleParallelCommand(raw) {
         timeout_ms: undefined,
         args: d.hintFiles && d.hintFiles.length > 0 ? { hintFiles: d.hintFiles } : undefined
       }));
-      log10?.info(`[${PLUGIN_NAME18}] AI 拆分成功 → ${specs.length} 个子任务`);
+      log11?.info(`[${PLUGIN_NAME18}] AI 拆分成功 → ${specs.length} 个子任务`);
       if (canNotice) {
         const lines = [
           `\uD83E\uDD16 AI 已自动拆为 ${specs.length} 个并行子任务：`,
@@ -20498,7 +20348,7 @@ async function handleParallelCommand(raw) {
         });
       }
     } else if (dec.reason === "llm_unavailable" || dec.reason === "parse_failed") {
-      log10?.warn(`[${PLUGIN_NAME18}] AI 拆分失败（${dec.reason}），按单任务执行`);
+      log11?.warn(`[${PLUGIN_NAME18}] AI 拆分失败（${dec.reason}），按单任务执行`);
     }
   }
   if (canNotice) {
@@ -20513,11 +20363,11 @@ async function handleParallelCommand(raw) {
       directory: ctx.directory,
       log: (lvl, msg, data) => {
         if (lvl === "error")
-          log10?.error(msg, data);
+          log11?.error(msg, data);
         else if (lvl === "warn")
-          log10?.warn(msg, data);
+          log11?.warn(msg, data);
         else
-          log10?.info(msg, data);
+          log11?.info(msg, data);
       }
     });
   }
@@ -20561,11 +20411,11 @@ async function handleParallelCommand(raw) {
         allocateWorktree: downgradedAutoMerge ? undefined : ctx.allocateWorktree,
         log: (lvl, msg, data) => {
           if (lvl === "error")
-            log10?.error(msg, data);
+            log11?.error(msg, data);
           else if (lvl === "warn")
-            log10?.warn(msg, data);
+            log11?.warn(msg, data);
           else
-            log10?.info(msg, data);
+            log11?.info(msg, data);
         },
         tryMerge: ctx.tryMerge,
         mergeCommit: ctx.mergeCommit,
@@ -20577,7 +20427,7 @@ async function handleParallelCommand(raw) {
     });
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
-    log10?.error(`[${PLUGIN_NAME18}] schedule 抛错`, { error: msg });
+    log11?.error(`[${PLUGIN_NAME18}] schedule 抛错`, { error: msg });
     await safeReply2(ctx, `❌ 并发调度失败：${msg}`);
     return { ok: false, reason: msg };
   }
@@ -20595,7 +20445,7 @@ async function handleParallelCommand(raw) {
   }
   await safeReply2(ctx, summaryLines.join(`
 `));
-  log10?.info(`[${PLUGIN_NAME18}] schedule 完成`, {
+  log11?.info(`[${PLUGIN_NAME18}] schedule 完成`, {
     parentId,
     success: result.digest.success,
     failed: result.digest.failed,
@@ -20608,7 +20458,7 @@ async function handleParallelCommand(raw) {
     try {
       await ctx.onCompleted(result);
     } catch (err) {
-      log10?.warn(`[${PLUGIN_NAME18}] onCompleted hook 抛错（已隔离）`, {
+      log11?.warn(`[${PLUGIN_NAME18}] onCompleted hook 抛错（已隔离）`, {
         error: err instanceof Error ? err.message : String(err)
       });
     }
@@ -20663,7 +20513,7 @@ async function writeLog(level, msg, data) {
 }
 logLifecycle(PLUGIN_NAME18, "import");
 var subtasksServer = async (ctx) => {
-  const log10 = makePluginLogger(PLUGIN_NAME18);
+  const log11 = makePluginLogger(PLUGIN_NAME18);
   const client = ctx?.client ?? undefined;
   logLifecycle(PLUGIN_NAME18, "activate", {
     directory: ctx.directory,
@@ -20690,7 +20540,7 @@ var subtasksServer = async (ctx) => {
           const gitOk = await isGitRepo({ root: repoRoot }).catch(() => false);
           if (!gitOk) {
             autoMerge = false;
-            log10?.warn("[subtasks] worktree_isolation=true 但非 git 仓库，自动降级 autoMerge=false");
+            log11?.warn("[subtasks] worktree_isolation=true 但非 git 仓库，自动降级 autoMerge=false");
             const canNotice = Boolean(client);
             if (canNotice) {
               await sendParentNotice(client, input.sessionID, "ℹ 当前目录不是 git 仓库，worktree 隔离已自动关闭，以单目录模式运行", { directory: ctx.directory });
@@ -20719,7 +20569,7 @@ var subtasksServer = async (ctx) => {
             replyLines.push(s);
             return Promise.resolve();
           },
-          log: log10,
+          log: log11,
           client,
           parentSessionID: input.sessionID,
           directory: ctx.directory,
@@ -20732,11 +20582,11 @@ var subtasksServer = async (ctx) => {
             perTaskTimeoutMs: 5 * 60000,
             log: (lvl, msg, data) => {
               if (lvl === "error")
-                log10.error(msg, data);
+                log11.error(msg, data);
               else if (lvl === "warn")
-                log10.warn(msg, data);
+                log11.warn(msg, data);
               else
-                log10.info(msg, data);
+                log11.info(msg, data);
             }
           }) : undefined
         };
@@ -20762,7 +20612,7 @@ var subtasksServer = async (ctx) => {
           });
         }
       } catch (err) {
-        log10.error(`[${PLUGIN_NAME18}] command.execute.before 异常（已隔离）`, {
+        log11.error(`[${PLUGIN_NAME18}] command.execute.before 异常（已隔离）`, {
           error: err instanceof Error ? err.message : String(err)
         });
       }
@@ -21056,7 +20906,7 @@ function describeError(err) {
     return String(err);
   }
 }
-var log10 = makePluginLogger(PLUGIN_NAME19);
+var log11 = makePluginLogger(PLUGIN_NAME19);
 var lru = new FingerprintLRU2;
 var _lastNotification = null;
 var terminalMonitorServer = async (ctx) => {
@@ -21075,7 +20925,7 @@ var terminalMonitorServer = async (ctx) => {
         const ev = { type: e.type, ...e.properties ?? {} };
         const r = await processTerminalEvent(ev, {
           lru,
-          log: log10,
+          log: log11,
           notifyAgent: (msg) => {
             _lastNotification = msg;
           }
@@ -21088,7 +20938,7 @@ var terminalMonitorServer = async (ctx) => {
           findings: r.notification?.findings.length ?? 0
         });
         if (r.notified && r.notification) {
-          log10.info(`[${PLUGIN_NAME19}] 反馈 ${r.notification.findings.length} 条 → ${r.notification.summary}`);
+          log11.info(`[${PLUGIN_NAME19}] 反馈 ${r.notification.findings.length} 条 → ${r.notification.summary}`);
         }
       });
     }
@@ -21099,7 +20949,7 @@ var handler19 = terminalMonitorServer;
 // plugins/token-manager.ts
 var PLUGIN_NAME20 = "token-manager";
 logLifecycle(PLUGIN_NAME20, "import", {});
-async function handleMessageBefore(raw, log11, defaults) {
+async function handleMessageBefore(raw, log12, defaults) {
   const ctx = raw ?? {};
   if (!Array.isArray(ctx.messages) || ctx.messages.length === 0)
     return null;
@@ -21118,17 +20968,17 @@ async function handleMessageBefore(raw, log11, defaults) {
     };
     if (r.compressed) {
       ctx.messages = r.messages;
-      log11?.info(`[${PLUGIN_NAME20}] 压缩 ${r.before.count}→${r.after.count} 条 / ${r.before.tokens}→${r.after.tokens} tokens`);
+      log12?.info(`[${PLUGIN_NAME20}] 压缩 ${r.before.count}→${r.after.count} 条 / ${r.before.tokens}→${r.after.tokens} tokens`);
     }
     return r;
   } catch (err) {
-    log11?.warn(`[${PLUGIN_NAME20}] 压缩异常（已隔离）`, {
+    log12?.warn(`[${PLUGIN_NAME20}] 压缩异常（已隔离）`, {
       error: err instanceof Error ? err.message : String(err)
     });
     return null;
   }
 }
-var log11 = makePluginLogger(PLUGIN_NAME20);
+var log12 = makePluginLogger(PLUGIN_NAME20);
 var tokenManagerServer = async (ctx) => {
   const rt = loadRuntimeSync();
   const threshold = rt.runtime.context.condenser_threshold_ratio;
@@ -21151,7 +21001,7 @@ var tokenManagerServer = async (ctx) => {
 `);
           return { role, content };
         });
-        const r = await handleMessageBefore({ messages: flat }, log11, { threshold });
+        const r = await handleMessageBefore({ messages: flat }, log12, { threshold });
         if (!r)
           return;
         safeWriteLog(PLUGIN_NAME20, {
@@ -21165,7 +21015,7 @@ var tokenManagerServer = async (ctx) => {
           reason: r.reason
         });
         if (r.compressed) {
-          log11.warn(`[${PLUGIN_NAME20}] advise condense: ${r.before.count}→${r.after.count} msgs / ${r.before.tokens}→${r.after.tokens} tokens (observe-only, no write-back to avoid opencode message schema mismatch)`);
+          log12.warn(`[${PLUGIN_NAME20}] advise condense: ${r.before.count}→${r.after.count} msgs / ${r.before.tokens}→${r.after.tokens} tokens (observe-only, no write-back to avoid opencode message schema mismatch)`);
         }
       });
     }
@@ -21176,7 +21026,150 @@ var handler20 = tokenManagerServer;
 // plugins/tool-policy.ts
 import { promises as fs19 } from "node:fs";
 import * as path24 from "node:path";
-init_autonomy();
+
+// lib/tool-risk.ts
+var RISK_PATTERNS = [
+  {
+    tag: "rm_rf_root",
+    kinds: ["bash"],
+    re: /rm\s+-[rRf]+[^|;`\n]*\s+(\/(?:\s|$|[^/\w*.-])|~|\$HOME(?:\b|\/)|\/(?:bin|etc|usr|var|opt|home|root|boot|lib|sbin)\b)/
+  },
+  {
+    tag: "rm_rf_wildcard",
+    kinds: ["bash"],
+    re: /rm\s+-[rRf]+\s+(?:\.\*|\*)/
+  },
+  {
+    tag: "force_push_protected",
+    kinds: ["bash"],
+    re: /git\s+push\s+(?:--force\b|-f\b)[\s\S]*\b(main|master|release(?:\/[\w.-]+)?)\b/
+  },
+  {
+    tag: "git_reset_hard_main",
+    kinds: ["bash"],
+    re: /git\s+reset\s+--hard\s+(origin\/)?(main|master)/
+  },
+  { tag: "sudo", kinds: ["bash"], re: /(?<![\w-])sudo(?![\w-])/ },
+  { tag: "su_root", kinds: ["bash"], re: /(?<![\w-])su\s+(?:-\s+)?root\b/ },
+  { tag: "mkfs", kinds: ["bash"], re: /\bmkfs(\.[\w]+)?\b/ },
+  { tag: "dd_disk", kinds: ["bash"], re: /\bdd\s+if=[^|;\s]+\s+of=\/dev\// },
+  { tag: "chmod_777", kinds: ["bash"], re: /chmod\s+[-+]?[0-7]?777/ },
+  {
+    tag: "curl_pipe_sh",
+    kinds: ["bash"],
+    re: /\b(?:curl|wget)\b[^|]*\|\s*(?:sh|bash|zsh)\b/
+  },
+  {
+    tag: "drop_database",
+    kinds: ["bash", "other"],
+    re: /\b(DROP\s+(DATABASE|TABLE)|TRUNCATE\s+TABLE|DROP\s+SCHEMA)\b/i
+  },
+  { tag: "write_secrets", re: /(\.env(?:\.\w+)?|id_[edr]sa|\.ssh\/id_|\.pem|\.p12|secret\.json)/i },
+  {
+    tag: "write_etc",
+    kinds: ["bash", "edit"],
+    re: /(?:^|\s|"|')\/etc\//
+  },
+  {
+    tag: "write_usr",
+    kinds: ["bash", "edit"],
+    re: /(?:^|\s|"|')\/usr\//
+  },
+  {
+    tag: "write_root_home",
+    kinds: ["bash", "edit"],
+    re: /(?:^|\s|"|')(\/root|\/home\/root)\//
+  },
+  {
+    tag: "internal_url",
+    kinds: ["webfetch"],
+    re: /https?:\/\/(?:10\.\d{1,3}\.\d{1,3}\.\d{1,3}|172\.(?:1[6-9]|2\d|3[01])\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|169\.254\.\d{1,3}\.\d{1,3})(?::\d+)?(?:[/?#]|$)/i
+  },
+  {
+    tag: "kubectl_delete",
+    kinds: ["bash"],
+    re: /kubectl\s+(?:delete|destroy)\s+/
+  },
+  {
+    tag: "terraform_destroy",
+    kinds: ["bash"],
+    re: /terraform\s+destroy/
+  }
+];
+var TOOL_KIND_MAP = {
+  bash: "bash",
+  shell: "bash",
+  exec: "bash",
+  edit: "edit",
+  write: "edit",
+  "ast-edit": "edit",
+  "pending-changes-apply": "edit",
+  webfetch: "webfetch",
+  fetch: "webfetch",
+  read: "read",
+  cat: "read",
+  glob: "search",
+  grep: "search",
+  search: "search",
+  "repo-map": "search",
+  smart_search: "search",
+  list_recent: "search",
+  get_working_memory: "search",
+  web_search: "search",
+  save_chat_insight: "other",
+  add_knowledge: "other",
+  upload_document: "other",
+  upload_document_from_url: "other",
+  update_knowledge: "other",
+  flag_outdated: "other",
+  delete_knowledge: "other",
+  update_working_memory: "other",
+  update_user_preference: "other",
+  generate_image: "other"
+};
+function classifyTool(tool2) {
+  const lower = tool2.toLowerCase();
+  if (lower in TOOL_KIND_MAP)
+    return TOOL_KIND_MAP[lower];
+  if (/(^|[-_])edit($|[-_])|write|patch|apply/i.test(lower))
+    return "edit";
+  if (/bash|shell|exec|run/i.test(lower))
+    return "bash";
+  if (/fetch|http|curl/i.test(lower))
+    return "webfetch";
+  if (/read|view/i.test(lower))
+    return "read";
+  if (/search|grep|glob|find|list/i.test(lower))
+    return "search";
+  return "other";
+}
+function evaluateRisk(tool2, args) {
+  const kind = classifyTool(tool2);
+  const haystack = buildHaystack(args);
+  const hits = [];
+  for (const pattern of RISK_PATTERNS) {
+    if (pattern.kinds && !pattern.kinds.includes(kind))
+      continue;
+    const m = haystack.match(pattern.re);
+    if (m) {
+      hits.push({
+        label: pattern.tag,
+        pattern: pattern.re.source,
+        matched_on: m[0]
+      });
+    }
+  }
+  return hits;
+}
+function buildHaystack(args) {
+  if (typeof args === "string")
+    return args;
+  try {
+    return JSON.stringify(args);
+  } catch {
+    return String(args);
+  }
+}
 
 // lib/file-regex-acl.ts
 import * as path23 from "node:path";
@@ -21315,28 +21308,18 @@ function decideToolCall(ctx, cfg = {}, currentAgent) {
     return {
       action: "deny",
       reasons: [
-        `[ADR:prevent-subagent-self-apply] subagent '${currentAgent}' 禁止调 pending_changes.${action2}` + ` — apply 必须由 codeforge orchestrator 或用户拍板`,
+        `[ADR:worktree-session-isolation] subagent '${currentAgent}' 禁止调 pending_changes.${action2}` + ` — apply 必须由 codeforge orchestrator 或用户拍板`,
         `替代路径：stage 完成后回报 codeforge，由其决定 apply 后通过 task_id 复用启动你跑测试`
       ],
-      autonomy: {
-        effective_mode: ctx.mode ?? cfg.defaultMode ?? DEFAULT_RUNTIME.autonomy.default_mode,
-        action: "confirm",
-        downgraded: false,
-        detected_risks: ["subagent_apply_blocked"],
-        reason: `subagent '${currentAgent}' 自 apply 越权 (ADR:prevent-subagent-self-apply)`
-      }
+      risks: []
     };
   }
-  const fallbackMode = cfg.defaultMode ?? DEFAULT_RUNTIME.autonomy.default_mode;
-  const mode = ctx.mode ?? fallbackMode;
-  const a = evaluate(mode, {
-    tool: ctx.tool,
-    kind: ctx.kind ?? "other",
-    args: ctx.args ?? {}
-  });
+  const risks = evaluateRisk(ctx.tool, ctx.args ?? {});
   const reasons = [];
-  if (a.action === "confirm")
-    reasons.push(`autonomy: ${a.reason}`);
+  if (risks.length > 0) {
+    const labels = risks.map((r) => r.label).join(", ");
+    reasons.push(`risk: 命中高危规则 [${labels}]`);
+  }
   let aclResults;
   let worstAcl = "allow";
   if (ctx.files?.length) {
@@ -21350,10 +21333,8 @@ function decideToolCall(ctx, cfg = {}, currentAgent) {
       return d;
     });
   }
-  let action = a.action === "confirm" ? "confirm" : "allow";
-  if (worstAcl === "deny")
-    action = "deny";
-  return { action, reasons, autonomy: a, acl: aclResults };
+  const action = risks.length > 0 || worstAcl === "deny" ? "deny" : "allow";
+  return { action, reasons, risks, acl: aclResults };
 }
 var POLICY_PATH = path24.join(".codeforge", "policy.json");
 async function loadPolicy(root = process.cwd()) {
@@ -21367,27 +21348,20 @@ async function loadPolicy(root = process.cwd()) {
   }
 }
 function classifyToolKind(toolName) {
-  const t = toolName.toLowerCase();
-  if (t === "bash" || t === "shell" || t === "execute")
-    return "bash";
-  if (t === "edit" || t === "write" || t === "patch" || t === "ast_edit")
-    return "edit";
-  if (t === "webfetch" || t === "fetch" || t === "browser")
-    return "webfetch";
-  return "other";
+  return classifyTool(toolName);
 }
-async function resolveCurrentAgent(client, sessionID, log12) {
+async function resolveCurrentAgent(client, sessionID, log13) {
   try {
     const sessionApi = client?.session;
     if (!sessionApi || typeof sessionApi.get !== "function") {
-      log12.warn(`client.session.get unavailable`, { sessionID });
+      log13.warn(`client.session.get unavailable`, { sessionID });
       return;
     }
     const res = await sessionApi.get({ path: { id: sessionID } });
     const data = res?.data ?? res;
     const rawAgent = data?.agent;
     if (typeof rawAgent !== "string" || rawAgent === "") {
-      log12.warn(`client.session.get returned no string agent (保守放行)`, {
+      log13.warn(`client.session.get returned no string agent (保守放行)`, {
         sessionID,
         dataKeys: data && typeof data === "object" ? Object.keys(data) : null
       });
@@ -21395,24 +21369,20 @@ async function resolveCurrentAgent(client, sessionID, log12) {
     }
     return rawAgent;
   } catch (err) {
-    log12.warn(`client.session.get failed (保守放行)`, {
+    log13.warn(`client.session.get failed (保守放行)`, {
       sessionID,
       error: err instanceof Error ? err.message : String(err)
     });
     return;
   }
 }
-var log12 = makePluginLogger(PLUGIN_NAME21);
+var log13 = makePluginLogger(PLUGIN_NAME21);
 var toolPolicyServer = async (ctx) => {
   const directory = ctx.directory ?? process.cwd();
   const cfg = await loadPolicy(directory);
-  const rt = loadRuntimeSync();
-  cfg.defaultMode = rt.runtime.autonomy.default_mode;
   logLifecycle(PLUGIN_NAME21, "activate", {
     directory,
-    acl_loaded: !!cfg.acl,
-    default_mode: cfg.defaultMode,
-    config_source: rt.ok ? "codeforge.json" : "built-in"
+    acl_loaded: !!cfg.acl
   });
   return {
     "tool.execute.before": async (input, output) => {
@@ -21423,7 +21393,7 @@ var toolPolicyServer = async (ctx) => {
         const needsAgentDetection = toolName === "pending_changes" && (argsObj.action === "apply" || argsObj.action === "apply_all");
         let currentAgent = undefined;
         if (needsAgentDetection) {
-          currentAgent = await resolveCurrentAgent(ctx.client, input.sessionID, log12);
+          currentAgent = await resolveCurrentAgent(ctx.client, input.sessionID, log13);
         }
         const files = [];
         const filePath = argsObj["path"] ?? argsObj["filePath"] ?? argsObj["file"];
@@ -21435,7 +21405,6 @@ var toolPolicyServer = async (ctx) => {
           tool: toolName,
           kind: classifyToolKind(toolName),
           args: argsObj,
-          mode: cfg.defaultMode,
           files: files.length ? files : undefined
         }, cfg, currentAgent);
         safeWriteLog(PLUGIN_NAME21, {
@@ -21445,18 +21414,18 @@ var toolPolicyServer = async (ctx) => {
           sessionID: input.sessionID,
           action: decision.action,
           reasons: decision.reasons,
+          risks: decision.risks.map((r) => r.label),
           currentAgent
         });
         if (decision.action === "deny") {
-          log12.warn(`[${PLUGIN_NAME21}] DENY ${toolName}`, {
+          log13.warn(`[${PLUGIN_NAME21}] DENY ${toolName}`, {
             action: argsObj.action,
             currentAgent,
-            reasons: decision.reasons
+            reasons: decision.reasons,
+            risks: decision.risks.map((r) => r.label)
           });
           denied = new DeniedError(`[tool-policy] DENIED: ${decision.reasons.join(" / ")}`);
           return;
-        } else if (decision.action === "confirm") {
-          log12.info(`[${PLUGIN_NAME21}] CONFIRM ${toolName}: ${decision.reasons.join("; ")}`);
         }
       });
       if (denied)
@@ -21494,7 +21463,7 @@ import * as zlib from "node:zlib";
 // lib/version-injected.ts
 function getInjectedVersion() {
   try {
-    const v = "0.5.6";
+    const v = "0.5.8";
     if (typeof v === "string" && /^\d+\.\d+\.\d+/.test(v)) {
       return v;
     }
@@ -22691,35 +22660,35 @@ async function ensureRegistry(workflowsDir = "workflows") {
 }
 async function handleCommandInvoked(raw, workflowsDir = "workflows") {
   const ctx = raw ?? {};
-  const log13 = ctx.log ?? fallbackLog2;
+  const log14 = ctx.log ?? fallbackLog2;
   const command = typeof ctx.command === "string" ? ctx.command : null;
   if (!command) {
-    log13.warn(`[${PLUGIN_NAME23}] command.invoked 缺 command 字段`, ctx);
+    log14.warn(`[${PLUGIN_NAME23}] command.invoked 缺 command 字段`, ctx);
     return null;
   }
   const reg = await ensureRegistry(workflowsDir);
   if (reg.errors.length) {
-    log13.warn(`[${PLUGIN_NAME23}] 有 ${reg.errors.length} 个 workflow 加载失败`, reg.errors);
+    log14.warn(`[${PLUGIN_NAME23}] 有 ${reg.errors.length} 个 workflow 加载失败`, reg.errors);
   }
   const wf = reg.workflows.find((w) => matchesTrigger(w, command));
   if (!wf) {
-    log13.info(`[${PLUGIN_NAME23}] no workflow matches "${command}"`);
+    log14.info(`[${PLUGIN_NAME23}] no workflow matches "${command}"`);
     return null;
   }
-  log13.info(`[${PLUGIN_NAME23}] dispatch "${command}" → workflow "${wf.name}"`);
+  log14.info(`[${PLUGIN_NAME23}] dispatch "${command}" → workflow "${wf.name}"`);
   try {
     const result = await run(wf, {
       mode: ctx.adapter ? "real" : "dry_run",
       autonomy: ctx.autonomy ?? "semi",
       adapter: ctx.adapter
     });
-    log13.info(`[${PLUGIN_NAME23}] workflow "${wf.name}" 完成 (${result.plan.mode})`, {
+    log14.info(`[${PLUGIN_NAME23}] workflow "${wf.name}" 完成 (${result.plan.mode})`, {
       steps: result.plan.steps.length,
       results: result.results.length
     });
     return result;
   } catch (err) {
-    log13.error(`[${PLUGIN_NAME23}] workflow "${wf.name}" 执行失败`, {
+    log14.error(`[${PLUGIN_NAME23}] workflow "${wf.name}" 执行失败`, {
       error: err instanceof Error ? err.message : String(err)
     });
     throw err;
@@ -22852,9 +22821,17 @@ function isWriteOperation(toolName, argsObj, mainRoot) {
     return true;
   return false;
 }
-var log13 = makePluginLogger(PLUGIN_NAME24);
+var log14 = makePluginLogger(PLUGIN_NAME24);
+function resolveMainRoot2(rawDir) {
+  const worktreeMarker = "/.git/codeforge-worktrees/";
+  const idx = rawDir.indexOf(worktreeMarker);
+  if (idx !== -1) {
+    return rawDir.slice(0, idx);
+  }
+  return rawDir;
+}
 var sessionWorktreeGuardPlugin = async (ctx) => {
-  const mainRoot = ctx.directory ?? process.cwd();
+  const mainRoot = resolveMainRoot2(ctx.directory ?? process.cwd());
   logLifecycle(PLUGIN_NAME24, "activate", {
     mainRoot,
     CODEFORGE_SESSION_ID: process.env["CODEFORGE_SESSION_ID"] ?? "(not set)"
@@ -22872,7 +22849,7 @@ var sessionWorktreeGuardPlugin = async (ctx) => {
         try {
           entry = await getSessionWorktree(sessionId, mainRoot);
         } catch (err) {
-          log13.warn(`getSessionWorktree failed (跳过本次检查)`, {
+          log14.warn(`getSessionWorktree failed (跳过本次检查)`, {
             sessionId,
             mainRoot,
             error: err instanceof Error ? err.message : String(err)
@@ -22884,12 +22861,12 @@ var sessionWorktreeGuardPlugin = async (ctx) => {
             return;
           }
           try {
-            const parentId = lookupParentSessionId(sessionId);
+            const parentId = lookupParentSessionId2(sessionId);
             if (parentId) {
               const parentEntry = await getSessionWorktree(parentId, mainRoot);
               if (parentEntry && parentEntry.status === "active") {
                 entry = parentEntry;
-                log13.debug?.(`[child-inherit] session ${sessionId} 继承父 ${parentId} 的 worktree`, { parentSessionId: parentId, worktreePath: parentEntry.worktreePath });
+                log14.debug?.(`[child-inherit] session ${sessionId} 继承父 ${parentId} 的 worktree`, { parentSessionId: parentId, worktreePath: parentEntry.worktreePath });
                 safeWriteLog(PLUGIN_NAME24, {
                   hook: "tool.execute.before",
                   tool: toolName,
@@ -22902,13 +22879,13 @@ var sessionWorktreeGuardPlugin = async (ctx) => {
               }
             }
           } catch (lookupErr) {
-            log13.debug?.("[child-inherit] lookupParentSessionId 抛错（已隔离，退回 lazy-bind）", { error: lookupErr instanceof Error ? lookupErr.message : String(lookupErr) });
+            log14.debug?.("[child-inherit] lookupParentSessionId 抛错（已隔离，退回 lazy-bind）", { error: lookupErr instanceof Error ? lookupErr.message : String(lookupErr) });
           }
         }
         if (!entry) {
           try {
             entry = await bindSessionWorktree({ sessionId, mainRoot });
-            log13.info(`[lazy-bind] auto-created worktree for session ${sessionId}`, { branch: entry.branch, path: entry.worktreePath });
+            log14.info(`[lazy-bind] auto-created worktree for session ${sessionId}`, { branch: entry.branch, path: entry.worktreePath });
             safeWriteLog(PLUGIN_NAME24, {
               hook: "tool.execute.before",
               tool: toolName,
@@ -22918,7 +22895,7 @@ var sessionWorktreeGuardPlugin = async (ctx) => {
               worktreePath: entry.worktreePath
             });
           } catch (err) {
-            log13.warn(`[lazy-bind] failed (落到主仓写)`, { sessionId, error: err instanceof Error ? err.message : String(err) });
+            log14.warn(`[lazy-bind] failed (落到主仓写)`, { sessionId, error: err instanceof Error ? err.message : String(err) });
             safeWriteLog(PLUGIN_NAME24, {
               hook: "tool.execute.before",
               tool: toolName,
@@ -22936,7 +22913,7 @@ var sessionWorktreeGuardPlugin = async (ctx) => {
             const caller = input.agent;
             if (caller !== undefined && caller !== "codeforge") {
               const reason = `[session-worktree-guard] DENIED: session_merge action=merge 仅 codeforge orchestrator 或用户可调；当前 caller=${caller}`;
-              log13.warn(reason, {
+              log14.warn(reason, {
                 sessionId,
                 tool: toolName,
                 action,
@@ -22978,7 +22955,7 @@ var sessionWorktreeGuardPlugin = async (ctx) => {
             const reasonBase = `[session-worktree-guard] DENIED: 当前 session 要求先调用 plan_read(plan_id="${entry.requiredPlanId}") 再执行写操作`;
             const reason = inherited ? `${reasonBase}
 [gate-deny] child session=${sessionId} 继承父 entry 但父 session planReadOk=false，父 session=${entry.sessionId} 需先调 plan_read(plan_id="${entry.requiredPlanId}")` : reasonBase;
-            log13.warn(reason, {
+            log14.warn(reason, {
               tool: toolName,
               sessionId,
               requiredPlanId: entry.requiredPlanId,
@@ -23001,7 +22978,7 @@ var sessionWorktreeGuardPlugin = async (ctx) => {
           if (typeof command === "string" && commandContainsMainRoot(command, mainRoot) && detectBashWriteIntent(command, mainRoot)) {
             const snippet = command.length > 60 ? command.slice(0, 60) + "…" : command;
             const reason = `[session-worktree-guard] DENIED: bash.command 含主仓绝对路径写操作 (${snippet})，请在当前 session worktree (${worktreePath}) 内操作`;
-            log13.warn(reason, { sessionId, command: command.slice(0, 200) });
+            log14.warn(reason, { sessionId, command: command.slice(0, 200) });
             safeWriteLog(PLUGIN_NAME24, {
               hook: "tool.execute.before",
               tool: toolName,
@@ -23019,7 +22996,7 @@ var sessionWorktreeGuardPlugin = async (ctx) => {
           if (typeof filePath === "string") {
             const newPath = rewritePath(filePath, mainRoot, worktreePath);
             if (newPath !== null) {
-              log13.info(`rewrote ${toolName}.filePath: ${filePath} → ${newPath}`);
+              log14.info(`rewrote ${toolName}.filePath: ${filePath} → ${newPath}`);
               safeWriteLog(PLUGIN_NAME24, {
                 hook: "tool.execute.before",
                 tool: toolName,
@@ -23037,7 +23014,7 @@ var sessionWorktreeGuardPlugin = async (ctx) => {
           if (typeof target === "string") {
             const newTarget = rewritePath(target, mainRoot, worktreePath);
             if (newTarget !== null) {
-              log13.info(`rewrote ast_edit.target: ${target} → ${newTarget}`);
+              log14.info(`rewrote ast_edit.target: ${target} → ${newTarget}`);
               safeWriteLog(PLUGIN_NAME24, {
                 hook: "tool.execute.before",
                 tool: toolName,
@@ -23053,7 +23030,7 @@ var sessionWorktreeGuardPlugin = async (ctx) => {
           if (typeof root === "string") {
             const newRoot = rewritePath(root, mainRoot, worktreePath);
             if (newRoot !== null) {
-              log13.info(`rewrote ast_edit.root: ${root} → ${newRoot}`);
+              log14.info(`rewrote ast_edit.root: ${root} → ${newRoot}`);
               safeWriteLog(PLUGIN_NAME24, {
                 hook: "tool.execute.before",
                 tool: toolName,
@@ -23071,7 +23048,7 @@ var sessionWorktreeGuardPlugin = async (ctx) => {
           if (typeof workdir === "string") {
             const newWorkdir = rewritePath(workdir, mainRoot, worktreePath);
             if (newWorkdir !== null) {
-              log13.info(`rewrote bash.workdir: ${workdir} → ${newWorkdir}`);
+              log14.info(`rewrote bash.workdir: ${workdir} → ${newWorkdir}`);
               safeWriteLog(PLUGIN_NAME24, {
                 hook: "tool.execute.before",
                 tool: toolName,
@@ -23099,7 +23076,7 @@ var IDLE_TOAST_THROTTLE_MS = 60 * 60000;
 var IDLE_TOAST_DURATION_MS = 8000;
 var IDLE_TOAST_REMINDER_INTERVAL_MS = 30 * 60000;
 var lastIdleToastAt = new Map;
-var log14 = makePluginLogger(PLUGIN_NAME25);
+var log15 = makePluginLogger(PLUGIN_NAME25);
 var worktreeLifecyclePlugin = async (ctx) => {
   const mainRoot = ctx.directory;
   logLifecycle(PLUGIN_NAME25, "activate", {
@@ -23114,7 +23091,7 @@ var worktreeLifecyclePlugin = async (ctx) => {
     safeAsync(PLUGIN_NAME25, "activate.pruneOrphan", async () => {
       const result = await pruneOrphanWorktrees(mainRoot);
       if (result.cleaned.length > 0 || result.failed.length > 0) {
-        log14.info(`[pruneOrphan] cleaned=${result.cleaned.length} failed=${result.failed.length} skipped=${result.skipped}`);
+        log15.info(`[pruneOrphan] cleaned=${result.cleaned.length} failed=${result.failed.length} skipped=${result.skipped}`);
         safeWriteLog(PLUGIN_NAME25, {
           hook: "activate.pruneOrphan",
           cleaned: result.cleaned,
@@ -23161,7 +23138,7 @@ var worktreeLifecyclePlugin = async (ctx) => {
               }
             }
           } catch (err) {
-            log14.warn(`[lifecycle] empty-worktree fast-path 检测失败 (回退到常规路径)`, {
+            log15.warn(`[lifecycle] empty-worktree fast-path 检测失败 (回退到常规路径)`, {
               sessionId: ended.sessionID,
               error: err instanceof Error ? err.message : String(err)
             });
@@ -23176,7 +23153,7 @@ var worktreeLifecyclePlugin = async (ctx) => {
               });
             }
           } catch (err) {
-            log14.warn(`[lifecycle] checkpointCommit failed (继续 discard)`, {
+            log15.warn(`[lifecycle] checkpointCommit failed (继续 discard)`, {
               sessionId: ended.sessionID,
               error: err instanceof Error ? err.message : String(err)
             });
@@ -23193,7 +23170,7 @@ var worktreeLifecyclePlugin = async (ctx) => {
               worktreePath: entry.worktreePath
             });
           } catch (err) {
-            log14.warn(`[lifecycle] discardSession failed`, {
+            log15.warn(`[lifecycle] discardSession failed`, {
               sessionId: ended.sessionID,
               error: err instanceof Error ? err.message : String(err)
             });
@@ -23216,7 +23193,7 @@ var worktreeLifecyclePlugin = async (ctx) => {
           lastIdleToastAt.set(ended.sessionID, now);
           const idleMin = Math.round(idleMs / 60000);
           const msg = `\uD83D\uDCA4 Session ${ended.sessionID.slice(0, 8)} worktree 已空闲 ${idleMin}min，` + `用 /merge 收尾或 /discard-session 放弃`;
-          const sent = await showToast2(client, { message: msg, variant: "default", duration: IDLE_TOAST_DURATION_MS, title: "CodeForge" }, log14);
+          const sent = await showToast2(client, { message: msg, variant: "default", duration: IDLE_TOAST_DURATION_MS, title: "CodeForge" }, log15);
           safeWriteLog(PLUGIN_NAME25, {
             hook: "event",
             type: ended.type,
@@ -23234,7 +23211,7 @@ var handler25 = worktreeLifecyclePlugin;
 
 // src/index.ts
 var PLUGIN_ID = "codeforge";
-var log15 = makePluginLogger(PLUGIN_ID);
+var log16 = makePluginLogger(PLUGIN_ID);
 logLifecycle(PLUGIN_ID, "import", { entry: "src/index.ts" });
 var HANDLERS = [
   { name: "agent-router", init: handler },
@@ -23271,7 +23248,7 @@ function makeSerialHook(hookName, fns) {
       } catch (err) {
         if (isDeniedError(err))
           throw err;
-        log15.warn(`[${PLUGIN_ID}] ${hookName} handler 异常（已隔离）`, {
+        log16.warn(`[${PLUGIN_ID}] ${hookName} handler 异常（已隔离）`, {
           error: err instanceof Error ? err.message : String(err)
         });
       }
@@ -23284,7 +23261,7 @@ function createCodeforgeServer(opts) {
       const yieldResult = shouldYieldToLocalPlugin({ directory: input.directory });
       if (yieldResult.yield) {
         const msg = formatYieldLog(yieldResult);
-        log15.info(msg, { reason: yieldResult.reason, markerPath: yieldResult.markerPath });
+        log16.info(msg, { reason: yieldResult.reason, markerPath: yieldResult.markerPath });
         logLifecycle(PLUGIN_ID, "activate", {
           yield_to_local: true,
           yield_reason: yieldResult.reason,
@@ -23302,7 +23279,7 @@ function createCodeforgeServer(opts) {
       if (r.status === "fulfilled" && r.value && typeof r.value === "object") {
         hooksList.push(r.value);
       } else if (r.status === "rejected") {
-        log15.warn(`[${PLUGIN_ID}] handler ${HANDLERS[i].name} init failed (隔离，其他 handler 继续)`, { error: r.reason instanceof Error ? r.reason.message : String(r.reason) });
+        log16.warn(`[${PLUGIN_ID}] handler ${HANDLERS[i].name} init failed (隔离，其他 handler 继续)`, { error: r.reason instanceof Error ? r.reason.message : String(r.reason) });
       }
     });
     logLifecycle(PLUGIN_ID, "activate", {
@@ -23357,7 +23334,7 @@ function createCodeforgeServer(opts) {
           } catch (err) {
             if (isDeniedError(err))
               throw err;
-            log15.warn(`[${PLUGIN_ID}] event handler 异常（已隔离）`, {
+            log16.warn(`[${PLUGIN_ID}] event handler 异常（已隔离）`, {
               error: err instanceof Error ? err.message : String(err)
             });
           }