@clawos-dev/clawd 0.2.593 → 0.2.595

package/dist/cli.cjs

@@ -450,8 +450,8 @@ var init_parseUtil = __esm({
     init_errors();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path105, errorMaps, issueData } = params;
-      const fullPath = [...path105, ...issueData.path || []];
+      const { data, path: path106, errorMaps, issueData } = params;
+      const fullPath = [...path106, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -762,11 +762,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path105, key) {
+      constructor(parent, value, path106, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path105;
+        this._path = path106;
         this._key = key;
       }
       get path() {
@@ -8144,8 +8144,8 @@ var init_schemas = __esm({
       tui: external_exports.boolean(),
       observe: external_exports.boolean(),
       fileSharing: external_exports.boolean(),
-      // fork：session:fork 走 forkSession（claude jsonl 专用，派生新 jsonl）。codex 无 claude jsonl
-      // → fork 不可用。UI 据此 gate assistant 消息上的 fork 按钮（codex 一轮多条消息会刷出一堆按钮且点了报错）。
+      // fork：Claude 派生 transcript JSONL；本机 Codex 按已完成 turn 调原生 thread/fork。
+      // UI 只在有有效 fork 锚点的回复气泡上显示入口。
       fork: external_exports.boolean()
     });
     CapabilitiesResponseSchema = external_exports.object({
@@ -8489,7 +8489,9 @@ var init_schemas = __esm({
         kind: external_exports.literal("turn_end"),
         // 本轮耗时（ms）。SDK=result.duration_ms；TUI=turn_duration.durationMs；缺失时 reducer 按 turnStartedAt 兜底
         durationMs: external_exports.number().int().nonnegative().optional(),
-        reason: external_exports.enum(TURN_END_REASONS).optional()
+        reason: external_exports.enum(TURN_END_REASONS).optional(),
+        /** Codex 完成轮次的原生 id；用于在该轮末条回复上显示 Fork / Quick Ask。 */
+        turnId: external_exports.string().min(1).optional()
       }),
       // SDK system 帧 task_started / task_progress / task_notification 的归一化产物：
       // 子 agent 执行过程中实时上报 agentId / lastToolName / stats，UI pending 期就能开抽屉、看进度。
@@ -8707,7 +8709,12 @@ var init_schemas = __esm({
     SessionForkArgs = external_exports.object({
       cwd: external_exports.string().min(1),
       toolSessionId: external_exports.string().min(1),
-      messageUuid: external_exports.string().min(1),
+      /** Claude 消息 UUID；Codex 改用 turnId。 */
+      messageUuid: external_exports.string().min(1).optional(),
+      /** Codex 原生已完成 turn ID。 */
+      turnId: external_exports.string().min(1).optional(),
+      /** 源 clawd session ID；Codex 必填，handler 用它校验 thread 归属。 */
+      sourceSessionId: external_exports.string().min(1).optional(),
       /**
        * 派生 jsonl 的落点 cwd（缺省 = 源文件所在目录，保持老行为）。
        *
@@ -8718,7 +8725,7 @@ var init_schemas = __esm({
        * 正确编排：先 sessionCreate 拿到 daemon 定的真实 cwd，再以它作 targetCwd fork。
        */
       targetCwd: external_exports.string().min(1).optional()
-    });
+    }).refine((args) => Boolean(args.messageUuid || args.turnId), "messageUuid or turnId required");
     SessionForkResponseSchema = external_exports.object({
       forkedToolSessionId: external_exports.string().min(1),
       forkedFilePath: external_exports.string().min(1)
@@ -9103,8 +9110,11 @@ var init_methods = __esm({
         args: SessionIdArgs
       },
       "session:fork": {
-        summary: "\u4ECE\u6307\u5B9A message \u5904 fork \u51FA\u65B0 transcript\uFF08\u622A\u65AD + \u91CD\u5199 sessionId/parentUuid\uFF09\uFF0C\u8FD4\u56DE\u65B0 toolSessionId\uFF1B\u4E0D\u81EA\u52A8\u62C9\u8D77\u8FDB\u7A0B",
-        args: SessionForkArgs
+        summary: "\u4ECE Claude \u6D88\u606F\u6216 Codex \u5DF2\u5B8C\u6210 turn \u6D3E\u751F\u65B0\u4F1A\u8BDD\uFF0C\u8FD4\u56DE\u65B0 toolSessionId\uFF1B\u4E0D\u81EA\u52A8\u62C9\u8D77\u4F1A\u8BDD\u8FDB\u7A0B",
+        args: SessionForkArgs,
+        argsConstraints: {
+          anyOf: [{ required: ["messageUuid"] }, { required: ["turnId"] }]
+        }
       },
       "session:new": {
         summary: "\u5728**\u5DF2\u6709**\u4F1A\u8BDD\u4E0A\u6E05\u7A7A\u4E0A\u4E0B\u6587\u5F00\u65B0\u4E00\u8F6E\uFF0C\u76F8\u5F53\u4E8E CC \u7684 /clear\uFF08\u4E0D\u662F\u5EFA\u65B0\u4F1A\u8BDD\u2014\u2014\u5EFA\u65B0\u4F1A\u8BDD\u7528 session:create\uFF09",
@@ -10325,8 +10335,8 @@ var require_req = __commonJS({
       if (req.originalUrl) {
         _req.url = req.originalUrl;
       } else {
-        const path105 = req.path;
-        _req.url = typeof path105 === "string" ? path105 : req.url ? req.url.path || req.url : void 0;
+        const path106 = req.path;
+        _req.url = typeof path106 === "string" ? path106 : req.url ? req.url.path || req.url : void 0;
       }
       if (req.query) {
         _req.query = req.query;
@@ -10491,14 +10501,14 @@ var require_redact = __commonJS({
       }
       return obj;
     }
-    function parsePath(path105) {
+    function parsePath(path106) {
       const parts = [];
       let current = "";
       let inBrackets = false;
       let inQuotes = false;
       let quoteChar = "";
-      for (let i2 = 0; i2 < path105.length; i2++) {
-        const char = path105[i2];
+      for (let i2 = 0; i2 < path106.length; i2++) {
+        const char = path106[i2];
         if (!inBrackets && char === ".") {
           if (current) {
             parts.push(current);
@@ -10629,10 +10639,10 @@ var require_redact = __commonJS({
       return current;
     }
     function redactPaths(obj, paths, censor, remove = false) {
-      for (const path105 of paths) {
-        const parts = parsePath(path105);
+      for (const path106 of paths) {
+        const parts = parsePath(path106);
         if (parts.includes("*")) {
-          redactWildcardPath(obj, parts, censor, path105, remove);
+          redactWildcardPath(obj, parts, censor, path106, remove);
         } else {
           if (remove) {
             removeKey(obj, parts);
@@ -10717,8 +10727,8 @@ var require_redact = __commonJS({
           }
         } else {
           if (afterWildcard.includes("*")) {
-            const wrappedCensor = typeof censor === "function" ? (value, path105) => {
-              const fullPath = [...pathArray.slice(0, pathLength), ...path105];
+            const wrappedCensor = typeof censor === "function" ? (value, path106) => {
+              const fullPath = [...pathArray.slice(0, pathLength), ...path106];
               return censor(value, fullPath);
             } : censor;
             redactWildcardPath(current, afterWildcard, wrappedCensor, originalPath, remove);
@@ -10753,8 +10763,8 @@ var require_redact = __commonJS({
         return null;
       }
       const pathStructure = /* @__PURE__ */ new Map();
-      for (const path105 of pathsToClone) {
-        const parts = parsePath(path105);
+      for (const path106 of pathsToClone) {
+        const parts = parsePath(path106);
         let current = pathStructure;
         for (let i2 = 0; i2 < parts.length; i2++) {
           const part = parts[i2];
@@ -10806,24 +10816,24 @@ var require_redact = __commonJS({
       }
       return cloneSelectively(obj, pathStructure);
     }
-    function validatePath(path105) {
-      if (typeof path105 !== "string") {
+    function validatePath(path106) {
+      if (typeof path106 !== "string") {
         throw new Error("Paths must be (non-empty) strings");
       }
-      if (path105 === "") {
+      if (path106 === "") {
         throw new Error("Invalid redaction path ()");
       }
-      if (path105.includes("..")) {
-        throw new Error(`Invalid redaction path (${path105})`);
+      if (path106.includes("..")) {
+        throw new Error(`Invalid redaction path (${path106})`);
       }
-      if (path105.includes(",")) {
-        throw new Error(`Invalid redaction path (${path105})`);
+      if (path106.includes(",")) {
+        throw new Error(`Invalid redaction path (${path106})`);
       }
       let bracketCount = 0;
       let inQuotes = false;
       let quoteChar = "";
-      for (let i2 = 0; i2 < path105.length; i2++) {
-        const char = path105[i2];
+      for (let i2 = 0; i2 < path106.length; i2++) {
+        const char = path106[i2];
         if ((char === '"' || char === "'") && bracketCount > 0) {
           if (!inQuotes) {
             inQuotes = true;
@@ -10837,20 +10847,20 @@ var require_redact = __commonJS({
         } else if (char === "]" && !inQuotes) {
           bracketCount--;
           if (bracketCount < 0) {
-            throw new Error(`Invalid redaction path (${path105})`);
+            throw new Error(`Invalid redaction path (${path106})`);
           }
         }
       }
       if (bracketCount !== 0) {
-        throw new Error(`Invalid redaction path (${path105})`);
+        throw new Error(`Invalid redaction path (${path106})`);
       }
     }
     function validatePaths(paths) {
       if (!Array.isArray(paths)) {
         throw new TypeError("paths must be an array");
       }
-      for (const path105 of paths) {
-        validatePath(path105);
+      for (const path106 of paths) {
+        validatePath(path106);
       }
     }
     function slowRedact(options = {}) {
@@ -11018,8 +11028,8 @@ var require_redaction = __commonJS({
         if (shape[k3] === null) {
           o2[k3] = (value) => topCensor(value, [k3]);
         } else {
-          const wrappedCensor = typeof censor === "function" ? (value, path105) => {
-            return censor(value, [k3, ...path105]);
+          const wrappedCensor = typeof censor === "function" ? (value, path106) => {
+            return censor(value, [k3, ...path106]);
           } : censor;
           o2[k3] = Redact({
             paths: shape[k3],
@@ -11240,7 +11250,7 @@ var require_sonic_boom = __commonJS({
     var fs95 = require("fs");
     var EventEmitter2 = require("events");
     var inherits = require("util").inherits;
-    var path105 = require("path");
+    var path106 = require("path");
     var sleep2 = require_atomic_sleep();
     var assert = require("assert");
     var BUSY_WRITE_TIMEOUT = 100;
@@ -11294,7 +11304,7 @@ var require_sonic_boom = __commonJS({
       const mode = sonic.mode;
       if (sonic.sync) {
         try {
-          if (sonic.mkdir) fs95.mkdirSync(path105.dirname(file), { recursive: true });
+          if (sonic.mkdir) fs95.mkdirSync(path106.dirname(file), { recursive: true });
           const fd = fs95.openSync(file, flags, mode);
           fileOpened(null, fd);
         } catch (err) {
@@ -11302,7 +11312,7 @@ var require_sonic_boom = __commonJS({
           throw err;
         }
       } else if (sonic.mkdir) {
-        fs95.mkdir(path105.dirname(file), { recursive: true }, (err) => {
+        fs95.mkdir(path106.dirname(file), { recursive: true }, (err) => {
           if (err) return fileOpened(err);
           fs95.open(file, flags, mode, fileOpened);
         });
@@ -14162,7 +14172,7 @@ var require_multistream = __commonJS({
 var require_pino = __commonJS({
   "../node_modules/.pnpm/pino@9.14.0/node_modules/pino/pino.js"(exports2, module2) {
     "use strict";
-    var os37 = require("os");
+    var os36 = require("os");
     var stdSerializers = require_pino_std_serializers();
     var caller = require_caller();
     var redaction = require_redaction();
@@ -14209,7 +14219,7 @@ var require_pino = __commonJS({
     } = symbols;
     var { epochTime, nullTime } = time;
     var { pid } = process;
-    var hostname = os37.hostname();
+    var hostname = os36.hostname();
     var defaultErrorSerializer = stdSerializers.err;
     var defaultOptions2 = {
       level: "info",
@@ -14933,11 +14943,11 @@ var init_lib = __esm({
           }
         }
       },
-      addToPath: function addToPath(path105, added, removed, oldPosInc, options) {
-        var last = path105.lastComponent;
+      addToPath: function addToPath(path106, added, removed, oldPosInc, options) {
+        var last = path106.lastComponent;
         if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
           return {
-            oldPos: path105.oldPos + oldPosInc,
+            oldPos: path106.oldPos + oldPosInc,
             lastComponent: {
               count: last.count + 1,
               added,
@@ -14947,7 +14957,7 @@ var init_lib = __esm({
           };
         } else {
           return {
-            oldPos: path105.oldPos + oldPosInc,
+            oldPos: path106.oldPos + oldPosInc,
             lastComponent: {
               count: 1,
               added,
@@ -15529,10 +15539,10 @@ function attachmentToHistoryMessage(o2, ts) {
     const memories = raw.map((m3) => {
       if (!m3 || typeof m3 !== "object") return null;
       const rec6 = m3;
-      const path105 = typeof rec6.path === "string" ? rec6.path : null;
+      const path106 = typeof rec6.path === "string" ? rec6.path : null;
       const content = typeof rec6.content === "string" ? rec6.content : null;
-      if (!path105 || content == null) return null;
-      const entry = { path: path105, content };
+      if (!path106 || content == null) return null;
+      const entry = { path: path106, content };
       if (typeof rec6.mtimeMs === "number") entry.mtimeMs = rec6.mtimeMs;
       return entry;
     }).filter((m3) => m3 !== null);
@@ -16398,10 +16408,10 @@ function parseAttachment(obj) {
     const memories = raw.map((m3) => {
       if (!m3 || typeof m3 !== "object") return null;
       const rec6 = m3;
-      const path105 = typeof rec6.path === "string" ? rec6.path : null;
+      const path106 = typeof rec6.path === "string" ? rec6.path : null;
       const content = typeof rec6.content === "string" ? rec6.content : null;
-      if (!path105 || content == null) return null;
-      const out = { path: path105, content };
+      if (!path106 || content == null) return null;
+      const out = { path: path106, content };
       if (typeof rec6.mtimeMs === "number") out.mtimeMs = rec6.mtimeMs;
       return out;
     }).filter((m3) => m3 !== null);
@@ -37375,8 +37385,8 @@ var require_utils = __commonJS({
       var result = transform[inputType][outputType](input);
       return result;
     };
-    exports2.resolve = function(path105) {
-      var parts = path105.split("/");
+    exports2.resolve = function(path106) {
+      var parts = path106.split("/");
       var result = [];
       for (var index = 0; index < parts.length; index++) {
         var part = parts[index];
@@ -43229,18 +43239,18 @@ var require_object = __commonJS({
       var object = new ZipObject(name, zipObjectContent, o2);
       this.files[name] = object;
     };
-    var parentFolder = function(path105) {
-      if (path105.slice(-1) === "/") {
-        path105 = path105.substring(0, path105.length - 1);
+    var parentFolder = function(path106) {
+      if (path106.slice(-1) === "/") {
+        path106 = path106.substring(0, path106.length - 1);
       }
-      var lastSlash = path105.lastIndexOf("/");
-      return lastSlash > 0 ? path105.substring(0, lastSlash) : "";
+      var lastSlash = path106.lastIndexOf("/");
+      return lastSlash > 0 ? path106.substring(0, lastSlash) : "";
     };
-    var forceTrailingSlash = function(path105) {
-      if (path105.slice(-1) !== "/") {
-        path105 += "/";
+    var forceTrailingSlash = function(path106) {
+      if (path106.slice(-1) !== "/") {
+        path106 += "/";
       }
-      return path105;
+      return path106;
     };
     var folderAdd = function(name, createFolders) {
       createFolders = typeof createFolders !== "undefined" ? createFolders : defaults.createFolders;
@@ -44242,7 +44252,7 @@ var require_lib3 = __commonJS({
 // src/run-case/recorder.ts
 function startRunCaseRecorder(opts) {
   const now = opts.now ?? Date.now;
-  const dir = import_node_path84.default.dirname(opts.recordPath);
+  const dir = import_node_path85.default.dirname(opts.recordPath);
   let stream = null;
   let closing = false;
   let closedSettled = false;
@@ -44282,12 +44292,12 @@ function startRunCaseRecorder(opts) {
   };
   return { tap, close, closed };
 }
-var import_node_fs66, import_node_path84;
+var import_node_fs66, import_node_path85;
 var init_recorder = __esm({
   "src/run-case/recorder.ts"() {
     "use strict";
     import_node_fs66 = __toESM(require("fs"), 1);
-    import_node_path84 = __toESM(require("path"), 1);
+    import_node_path85 = __toESM(require("path"), 1);
   }
 });
 
@@ -44330,7 +44340,7 @@ var init_wire = __esm({
 // src/run-case/controller.ts
 async function runController(opts) {
   const now = opts.now ?? Date.now;
-  const cwd = opts.cwd ?? (0, import_node_fs67.mkdtempSync)(import_node_path85.default.join(import_node_os33.default.tmpdir(), "clawd-runcase-"));
+  const cwd = opts.cwd ?? (0, import_node_fs67.mkdtempSync)(import_node_path86.default.join(import_node_os32.default.tmpdir(), "clawd-runcase-"));
   const ownsCwd = opts.cwd === void 0;
   const recorder = startRunCaseRecorder({ recordPath: opts.record, now });
   const spawnCtx = { cwd };
@@ -44497,13 +44507,13 @@ async function runController(opts) {
   }
   return exitCode ?? 0;
 }
-var import_node_fs67, import_node_os33, import_node_path85;
+var import_node_fs67, import_node_os32, import_node_path86;
 var init_controller = __esm({
   "src/run-case/controller.ts"() {
     "use strict";
     import_node_fs67 = require("fs");
-    import_node_os33 = __toESM(require("os"), 1);
-    import_node_path85 = __toESM(require("path"), 1);
+    import_node_os32 = __toESM(require("os"), 1);
+    import_node_path86 = __toESM(require("path"), 1);
     init_claude();
     init_stdout_splitter();
     init_permission_stdio();
@@ -44775,9 +44785,9 @@ Env (advanced):
 `;
 
 // src/index.ts
-var import_node_path83 = __toESM(require("path"), 1);
+var import_node_path84 = __toESM(require("path"), 1);
 var import_node_fs65 = __toESM(require("fs"), 1);
-var import_node_os32 = __toESM(require("os"), 1);
+var import_node_os31 = __toESM(require("os"), 1);
 var import_node_crypto26 = require("crypto");
 var import_node_url6 = require("url");
 
@@ -50064,45 +50074,169 @@ var ProjectsStore = class {
 
 // src/tools/codex-home.ts
 var import_node_os6 = __toESM(require("os"), 1);
-var path14 = __toESM(require("path"), 1);
-var norm = (p3) => path14.resolve(p3);
+var path15 = __toESM(require("path"), 1);
+
+// src/tools/transcript-search.ts
+var import_node_fs10 = __toESM(require("fs"), 1);
+var import_node_path10 = __toESM(require("path"), 1);
+var SNIPPET_PAD = 60;
+var INJECTED_ENVELOPE_RE = /^<(system-reminder|command-name|command-message|command-args|local-command-stdout|local-command-stderr|task-notification|user-prompt-submit-hook|environment_context|user_instructions)\b/;
+var CODEX_WRAPPER_RE = /<(related-dir|environment_context|user_instructions)>[\s\S]*?<\/\1>/g;
+function asRecord(v3) {
+  return typeof v3 === "object" && v3 !== null ? v3 : null;
+}
+function textOfBlocks(content, types) {
+  if (!Array.isArray(content)) return null;
+  const parts = [];
+  for (const block of content) {
+    const b3 = asRecord(block);
+    if (!b3 || typeof b3.type !== "string" || !types.includes(b3.type)) continue;
+    const text = b3.text;
+    if (typeof text === "string" && text !== "") parts.push(text);
+  }
+  return parts.length > 0 ? parts.join("\n") : null;
+}
+function lineToSearchableText(raw) {
+  const line = asRecord(raw);
+  if (!line) return null;
+  if (line.type === "response_item") {
+    const payload = asRecord(line.payload);
+    if (!payload || payload.type !== "message") return null;
+    const role = payload.role;
+    if (role !== "user" && role !== "assistant") return null;
+    const text2 = textOfBlocks(payload.content, ["input_text", "output_text"]);
+    if (text2 === null) return null;
+    if (role !== "user") return text2;
+    const stripped = text2.replace(CODEX_WRAPPER_RE, "").trim();
+    if (stripped === "") return null;
+    return INJECTED_ENVELOPE_RE.test(stripped) ? null : stripped;
+  }
+  if (line.type !== "user" && line.type !== "assistant") return null;
+  const message = asRecord(line.message);
+  if (!message) return null;
+  const content = message.content;
+  const text = typeof content === "string" && content !== "" ? content : textOfBlocks(content, ["text"]);
+  if (text === null) return null;
+  if (line.type === "user" && (line.isMeta === true || line.isSynthetic === true)) return null;
+  if (line.type === "user" && INJECTED_ENVELOPE_RE.test(text.trimStart())) return null;
+  return text;
+}
+function escapeRegExp(s2) {
+  return s2.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function makeSnippet(text, at3, needleLength) {
+  const from = Math.max(0, at3 - SNIPPET_PAD);
+  const to = Math.min(text.length, at3 + needleLength + SNIPPET_PAD);
+  const body = text.slice(from, to).replace(/\s+/g, " ").trim();
+  return `${from > 0 ? "\u2026 " : ""}${body}${to < text.length ? " \u2026" : ""}`;
+}
+function searchTranscriptFile(file, query) {
+  let buf;
+  try {
+    buf = import_node_fs10.default.readFileSync(file);
+  } catch {
+    return null;
+  }
+  const haystack = buf.toString("latin1");
+  const needle = Buffer.from(query, "utf8").toString("latin1");
+  const re2 = new RegExp(escapeRegExp(needle), "gi");
+  let m3;
+  while ((m3 = re2.exec(haystack)) !== null) {
+    const lineStart = haystack.lastIndexOf("\n", m3.index) + 1;
+    let lineEnd = haystack.indexOf("\n", m3.index);
+    if (lineEnd < 0) lineEnd = haystack.length;
+    re2.lastIndex = lineEnd + 1;
+    let parsed;
+    try {
+      parsed = JSON.parse(Buffer.from(haystack.slice(lineStart, lineEnd), "latin1").toString("utf8"));
+    } catch {
+      continue;
+    }
+    const text = lineToSearchableText(parsed);
+    if (text === null) continue;
+    const at3 = text.toLowerCase().indexOf(query.toLowerCase());
+    if (at3 < 0) continue;
+    return makeSnippet(text, at3, query.length);
+  }
+  return null;
+}
+var ROLLOUT_NAME_RE = /-([0-9a-fA-F-]{36})\.jsonl$/;
+function createCodexRolloutLocator(roots) {
+  let index = null;
+  const walk2 = (dir, into) => {
+    let entries;
+    try {
+      entries = import_node_fs10.default.readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      const full = import_node_path10.default.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        walk2(full, into);
+        continue;
+      }
+      const matched = ROLLOUT_NAME_RE.exec(entry.name);
+      if (matched) into.set(matched[1].toLowerCase(), full);
+    }
+  };
+  return (toolSessionId) => {
+    if (index === null) {
+      index = /* @__PURE__ */ new Map();
+      for (const root of roots) walk2(root, index);
+    }
+    return index.get(toolSessionId.toLowerCase()) ?? null;
+  };
+}
+
+// src/tools/codex-home.ts
+var norm = (p3) => path15.resolve(p3);
 function resolveCodexHome(input) {
   const cwd = norm(input.cwd);
-  const rel = path14.relative(norm(input.personaRoot), cwd);
-  const isPersonaRoot = rel !== "" && !rel.startsWith("..") && !path14.isAbsolute(rel) && !rel.includes(path14.sep);
+  const rel = path15.relative(norm(input.personaRoot), cwd);
+  const isPersonaRoot = rel !== "" && !rel.startsWith("..") && !path15.isAbsolute(rel) && !rel.includes(path15.sep);
   if (isPersonaRoot) return input.sharedHome;
   if (input.projectPaths.some((p3) => norm(p3) === cwd)) return input.sharedHome;
   return input.isolatedHome;
 }
-function codexRolloutRoots(dataDir, sharedHome = path14.join(import_node_os6.default.homedir(), ".codex")) {
-  const roots = [path14.join(sharedHome, "sessions")];
-  if (dataDir) roots.push(path14.join(dataDir, "codex-home", "sessions"));
+function codexRolloutRoots(dataDir, sharedHome = path15.join(import_node_os6.default.homedir(), ".codex")) {
+  const roots = [path15.join(sharedHome, "sessions")];
+  if (dataDir) roots.push(path15.join(dataDir, "codex-home", "sessions"));
   return roots;
 }
+function locateCodexThread(roots, threadId) {
+  const file = createCodexRolloutLocator(roots)(threadId);
+  if (!file) return null;
+  const root = roots.find((candidate) => {
+    const relative5 = path15.relative(candidate, file);
+    return relative5 !== "" && !relative5.startsWith("..") && !path15.isAbsolute(relative5);
+  });
+  return root ? { file, home: path15.dirname(root) } : null;
+}
 
 // src/persona/store.ts
-var fs12 = __toESM(require("fs"), 1);
-var path15 = __toESM(require("path"), 1);
+var fs13 = __toESM(require("fs"), 1);
+var path16 = __toESM(require("path"), 1);
 init_protocol();
 var PersonaStore = class {
   constructor(root) {
     this.root = root;
-    fs12.mkdirSync(root, { recursive: true });
+    fs13.mkdirSync(root, { recursive: true });
   }
   root;
   personaDir(personaId2) {
-    return path15.join(this.root, safeFileName(personaId2));
+    return path16.join(this.root, safeFileName(personaId2));
   }
   metaPath(personaId2) {
-    return path15.join(this.personaDir(personaId2), ".clawd", "persona.json");
+    return path16.join(this.personaDir(personaId2), ".clawd", "persona.json");
   }
   claudeMdPath(personaId2) {
-    return path15.join(this.personaDir(personaId2), "CLAUDE.md");
+    return path16.join(this.personaDir(personaId2), "CLAUDE.md");
   }
   // codex 原生读 cwd 的 AGENTS.md。人格双写镜像：claude 读 CLAUDE.md、codex 读 AGENTS.md，
   // 两份内容恒一致，persona 切 tool 零迁移。
   agentsMdPath(personaId2) {
-    return path15.join(this.personaDir(personaId2), "AGENTS.md");
+    return path16.join(this.personaDir(personaId2), "AGENTS.md");
   }
   /**
    * persona 级 sandbox base 落盘路径 —— 故意放 `.clawd/` 而非 `.claude/`，让 CC 的 project
@@ -50111,7 +50245,7 @@ var PersonaStore = class {
    * spawn 前 per-guest 动态拼到各自 session 目录的那份（base + 强制底座 + 本 guest userWorkDir carve）。
    */
   sandboxSettingsPath(personaId2) {
-    return path15.join(this.personaDir(personaId2), ".clawd", "sandbox-settings.json");
+    return path16.join(this.personaDir(personaId2), ".clawd", "sandbox-settings.json");
   }
   /**
    * 人格补充层落盘路径 —— `<personaDir>/.clawd/personality.local.md`。
@@ -50126,11 +50260,11 @@ var PersonaStore = class {
    * （见 local-personality-prompt.ts），通道唯一，不会被当第二份 CLAUDE.md 重复加载。
    */
   personalityLocalPath(personaId2) {
-    return path15.join(this.personaDir(personaId2), ".clawd", "personality.local.md");
+    return path16.join(this.personaDir(personaId2), ".clawd", "personality.local.md");
   }
   write(persona, personality) {
     const dir = this.personaDir(persona.personaId);
-    fs12.mkdirSync(path15.join(dir, ".clawd"), { recursive: true });
+    fs13.mkdirSync(path16.join(dir, ".clawd"), { recursive: true });
     this.atomicWrite(this.claudeMdPath(persona.personaId), personality);
     this.atomicWrite(this.agentsMdPath(persona.personaId), personality);
     this.writeSandboxSettings(persona.personaId, buildGuestSettingsV1());
@@ -50143,8 +50277,8 @@ var PersonaStore = class {
   /** 读人格补充层正文；文件不存在返回 null（= 该 persona 没有补充，走内置人格）。 */
   readPersonalityLocal(personaId2) {
     const p3 = this.personalityLocalPath(personaId2);
-    if (!fs12.existsSync(p3)) return null;
-    return fs12.readFileSync(p3, "utf8");
+    if (!fs13.existsSync(p3)) return null;
+    return fs13.readFileSync(p3, "utf8");
   }
   /**
    * 写人格补充层。**纯空白 = 清空**：删文件而不是留个空文件——「有没有补充」的唯一判据
@@ -50153,10 +50287,10 @@ var PersonaStore = class {
   writePersonalityLocal(personaId2, body) {
     const p3 = this.personalityLocalPath(personaId2);
     if (!body.trim()) {
-      fs12.rmSync(p3, { force: true });
+      fs13.rmSync(p3, { force: true });
       return;
     }
-    fs12.mkdirSync(path15.dirname(p3), { recursive: true });
+    fs13.mkdirSync(path16.dirname(p3), { recursive: true });
     this.atomicWrite(p3, body);
   }
   /**
@@ -50168,9 +50302,9 @@ var PersonaStore = class {
   ensureAgentsMirror(personaId2) {
     const claudeMd = this.claudeMdPath(personaId2);
     const agentsMd = this.agentsMdPath(personaId2);
-    if (!fs12.existsSync(claudeMd)) return false;
-    if (fs12.existsSync(agentsMd)) return false;
-    this.atomicWrite(agentsMd, fs12.readFileSync(claudeMd, "utf8"));
+    if (!fs13.existsSync(claudeMd)) return false;
+    if (fs13.existsSync(agentsMd)) return false;
+    this.atomicWrite(agentsMd, fs13.readFileSync(claudeMd, "utf8"));
     return true;
   }
   /**
@@ -50220,22 +50354,22 @@ var PersonaStore = class {
     };
   }
   codexSandboxSettingsPath(personaId2) {
-    return path15.join(this.personaDir(personaId2), ".clawd", "codex-sandbox.json");
+    return path16.join(this.personaDir(personaId2), ".clawd", "codex-sandbox.json");
   }
   /** 读 codex-sandbox.json；不存在/损坏 → null。 */
   readCodexSandboxSettings(personaId2) {
     const p3 = this.codexSandboxSettingsPath(personaId2);
-    if (!fs12.existsSync(p3)) return null;
+    if (!fs13.existsSync(p3)) return null;
     try {
-      return CodexSandboxSettingsSchema.parse(JSON.parse(fs12.readFileSync(p3, "utf8")));
+      return CodexSandboxSettingsSchema.parse(JSON.parse(fs13.readFileSync(p3, "utf8")));
     } catch {
       return null;
     }
   }
   /** 覆盖写 codex-sandbox.json（seed/migrate 用）。 */
   writeCodexSandboxSettings(personaId2, settings) {
-    const dir = path15.join(this.personaDir(personaId2), ".clawd");
-    fs12.mkdirSync(dir, { recursive: true });
+    const dir = path16.join(this.personaDir(personaId2), ".clawd");
+    fs13.mkdirSync(dir, { recursive: true });
     this.atomicWrite(this.codexSandboxSettingsPath(personaId2), JSON.stringify(settings, null, 2));
   }
   writeMeta(persona) {
@@ -50243,8 +50377,8 @@ var PersonaStore = class {
   }
   read(personaId2) {
     const p3 = this.metaPath(personaId2);
-    if (!fs12.existsSync(p3)) return null;
-    const raw = JSON.parse(fs12.readFileSync(p3, "utf8"));
+    if (!fs13.existsSync(p3)) return null;
+    const raw = JSON.parse(fs13.readFileSync(p3, "utf8"));
     if (raw && typeof raw === "object" && "tokenMap" in raw) {
       delete raw.tokenMap;
       this.atomicWrite(p3, JSON.stringify(raw, null, 2));
@@ -50252,13 +50386,13 @@ var PersonaStore = class {
     return PersonaFileSchema.parse(raw);
   }
   has(personaId2) {
-    return fs12.existsSync(this.metaPath(personaId2));
+    return fs13.existsSync(this.metaPath(personaId2));
   }
   readPersonality(personaId2) {
     const claudeMd = this.claudeMdPath(personaId2);
-    if (fs12.existsSync(claudeMd)) return fs12.readFileSync(claudeMd, "utf8");
+    if (fs13.existsSync(claudeMd)) return fs13.readFileSync(claudeMd, "utf8");
     const agentsMd = this.agentsMdPath(personaId2);
-    if (fs12.existsSync(agentsMd)) return fs12.readFileSync(agentsMd, "utf8");
+    if (fs13.existsSync(agentsMd)) return fs13.readFileSync(agentsMd, "utf8");
     return null;
   }
   /**
@@ -50267,23 +50401,23 @@ var PersonaStore = class {
    */
   readSandboxSettings(personaId2) {
     const p3 = this.sandboxSettingsPath(personaId2);
-    if (!fs12.existsSync(p3)) return null;
+    if (!fs13.existsSync(p3)) return null;
     try {
-      return JSON.parse(fs12.readFileSync(p3, "utf8"));
+      return JSON.parse(fs13.readFileSync(p3, "utf8"));
     } catch {
       return null;
     }
   }
   /** Persona 私有 skills 目录路径：<personaDir>/.claude/skills */
   skillsDir(personaId2) {
-    return path15.join(this.personaDir(personaId2), ".claude", "skills");
+    return path16.join(this.personaDir(personaId2), ".claude", "skills");
   }
   /**
    * Claude Code 项目级 settings 路径：`<personaDir>/.claude/settings.json`。
    * 这里只读 `enabledPlugins` 字段，由 owner 通过 CC `/plugin` 之类命令维护，daemon 不写。
    */
   claudeSettingsPath(personaId2) {
-    return path15.join(this.personaDir(personaId2), ".claude", "settings.json");
+    return path16.join(this.personaDir(personaId2), ".claude", "settings.json");
   }
   /**
    * 读取 persona 的 `.claude/settings.json` 中 `enabledPlugins` map，把 value === true
@@ -50298,10 +50432,10 @@ var PersonaStore = class {
    */
   readEnabledPlugins(personaId2) {
     const p3 = this.claudeSettingsPath(personaId2);
-    if (!fs12.existsSync(p3)) return [];
+    if (!fs13.existsSync(p3)) return [];
     let raw;
     try {
-      raw = JSON.parse(fs12.readFileSync(p3, "utf8"));
+      raw = JSON.parse(fs13.readFileSync(p3, "utf8"));
     } catch {
       return [];
     }
@@ -50315,22 +50449,22 @@ var PersonaStore = class {
     return out;
   }
   list() {
-    if (!fs12.existsSync(this.root)) return [];
-    return fs12.readdirSync(this.root).filter((name) => {
-      return fs12.existsSync(path15.join(this.root, name, ".clawd", "persona.json"));
+    if (!fs13.existsSync(this.root)) return [];
+    return fs13.readdirSync(this.root).filter((name) => {
+      return fs13.existsSync(path16.join(this.root, name, ".clawd", "persona.json"));
     });
   }
   remove(personaId2) {
     const dir = this.personaDir(personaId2);
-    if (fs12.existsSync(dir)) fs12.rmSync(dir, { recursive: true, force: true });
+    if (fs13.existsSync(dir)) fs13.rmSync(dir, { recursive: true, force: true });
   }
   personaDirPath(personaId2) {
     return this.personaDir(personaId2);
   }
   atomicWrite(file, content) {
     const tmp = `${file}.tmp-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
-    fs12.writeFileSync(tmp, content, { mode: 384 });
-    fs12.renameSync(tmp, file);
+    fs13.writeFileSync(tmp, content, { mode: 384 });
+    fs13.renameSync(tmp, file);
   }
 };
 
@@ -50384,8 +50518,8 @@ var PersonaRegistry = class {
 };
 
 // src/persona/seed.ts
-var fs13 = __toESM(require("fs"), 1);
-var path16 = __toESM(require("path"), 1);
+var fs14 = __toESM(require("fs"), 1);
+var path17 = __toESM(require("path"), 1);
 var import_node_url = require("url");
 init_protocol();
 var import_meta = {};
@@ -50584,24 +50718,24 @@ function bundleSiblingFromArgv(argv1, sibling) {
   if (!argv1) return null;
   let real = argv1;
   try {
-    real = fs13.realpathSync(argv1);
+    real = fs14.realpathSync(argv1);
   } catch {
   }
-  return path16.resolve(path16.dirname(real), sibling);
+  return path17.resolve(path17.dirname(real), sibling);
 }
 function findDefaultsRoot(logger) {
   const candidates = [];
   try {
-    const here = path16.dirname((0, import_node_url.fileURLToPath)(import_meta.url));
-    candidates.push(path16.resolve(here, "defaults"));
-    candidates.push(path16.resolve(here, "persona-defaults"));
+    const here = path17.dirname((0, import_node_url.fileURLToPath)(import_meta.url));
+    candidates.push(path17.resolve(here, "defaults"));
+    candidates.push(path17.resolve(here, "persona-defaults"));
   } catch {
   }
   const fromArgv = bundleSiblingFromArgv(process.argv[1], "persona-defaults");
   if (fromArgv) candidates.push(fromArgv);
   for (const c2 of candidates) {
     try {
-      if (fs13.statSync(c2).isDirectory()) {
+      if (fs14.statSync(c2).isDirectory()) {
         logger?.info("persona.defaults-root.resolved", { root: c2 });
         return c2;
       }
@@ -50618,8 +50752,8 @@ function seedDefaultPersonas(args) {
       args.logger.info("persona.seed.skip", { personaId: entry.personaId, reason: "exists" });
       continue;
     }
-    const bundleDir = path16.join(args.defaultsRoot, entry.personaId);
-    if (!fs13.existsSync(bundleDir)) {
+    const bundleDir = path17.join(args.defaultsRoot, entry.personaId);
+    if (!fs14.existsSync(bundleDir)) {
       args.logger.warn("persona.seed.skip", {
         personaId: entry.personaId,
         reason: "bundle-missing",
@@ -50627,8 +50761,8 @@ function seedDefaultPersonas(args) {
       });
       continue;
     }
-    const claudeMdPath = path16.join(bundleDir, "CLAUDE.md");
-    if (!fs13.existsSync(claudeMdPath)) {
+    const claudeMdPath = path17.join(bundleDir, "CLAUDE.md");
+    if (!fs14.existsSync(claudeMdPath)) {
       args.logger.warn("persona.seed.skip", {
         personaId: entry.personaId,
         reason: "no-CLAUDE.md",
@@ -50636,7 +50770,7 @@ function seedDefaultPersonas(args) {
       });
       continue;
     }
-    const personality = fs13.readFileSync(claudeMdPath, "utf8");
+    const personality = fs14.readFileSync(claudeMdPath, "utf8");
     const now = Date.now();
     const persona = {
       personaId: entry.personaId,
@@ -50663,51 +50797,51 @@ function seedDefaultPersonas(args) {
   }
 }
 function skipNodeModulesUnder(srcRoot) {
-  return (src) => !path16.relative(srcRoot, src).split(path16.sep).includes("node_modules");
+  return (src) => !path17.relative(srcRoot, src).split(path17.sep).includes("node_modules");
 }
 function copyBundleExtras(srcDir, dstDir) {
-  for (const entry of fs13.readdirSync(srcDir, { withFileTypes: true })) {
+  for (const entry of fs14.readdirSync(srcDir, { withFileTypes: true })) {
     if (entry.name === "CLAUDE.md" || entry.name === ".clawd") continue;
-    const srcPath = path16.join(srcDir, entry.name);
-    const dstPath = path16.join(dstDir, entry.name);
+    const srcPath = path17.join(srcDir, entry.name);
+    const dstPath = path17.join(dstDir, entry.name);
     if (entry.isDirectory()) {
-      fs13.cpSync(srcPath, dstPath, { recursive: true, dereference: true, filter: skipNodeModulesUnder(srcPath) });
+      fs14.cpSync(srcPath, dstPath, { recursive: true, dereference: true, filter: skipNodeModulesUnder(srcPath) });
     } else if (entry.isFile()) {
-      fs13.copyFileSync(srcPath, dstPath);
+      fs14.copyFileSync(srcPath, dstPath);
     }
   }
 }
 var DAEMON_MANAGED_PATHS = ["extension-kit", "CLAUDE.md", ".mcp.json", ".claude/skills", ".claude/agents", "mcp"];
 function replaceManagedPath(src, dst) {
-  if (!fs13.statSync(src).isDirectory()) {
-    fs13.mkdirSync(path16.dirname(dst), { recursive: true });
-    fs13.rmSync(dst, { recursive: true, force: true });
-    fs13.cpSync(src, dst, { dereference: true });
+  if (!fs14.statSync(src).isDirectory()) {
+    fs14.mkdirSync(path17.dirname(dst), { recursive: true });
+    fs14.rmSync(dst, { recursive: true, force: true });
+    fs14.cpSync(src, dst, { dereference: true });
     return;
   }
-  fs13.mkdirSync(dst, { recursive: true });
-  for (const e of fs13.readdirSync(src, { withFileTypes: true })) {
+  fs14.mkdirSync(dst, { recursive: true });
+  for (const e of fs14.readdirSync(src, { withFileTypes: true })) {
     if (e.name === "node_modules") continue;
-    const child = path16.join(dst, e.name);
-    fs13.rmSync(child, { recursive: true, force: true });
-    fs13.cpSync(path16.join(src, e.name), child, { recursive: true, dereference: true });
+    const child = path17.join(dst, e.name);
+    fs14.rmSync(child, { recursive: true, force: true });
+    fs14.cpSync(path17.join(src, e.name), child, { recursive: true, dereference: true });
   }
 }
 function refreshDaemonManagedDirs(args) {
   const entries = args.entries ?? DEFAULT_PERSONAS;
   for (const entry of entries) {
-    const bundleDir = path16.join(args.defaultsRoot, entry.personaId);
-    if (!fs13.existsSync(bundleDir)) continue;
+    const bundleDir = path17.join(args.defaultsRoot, entry.personaId);
+    if (!fs14.existsSync(bundleDir)) continue;
     const personaDir = args.store.personaDirPath(entry.personaId);
-    if (!fs13.existsSync(personaDir)) continue;
+    if (!fs14.existsSync(personaDir)) continue;
     for (const relPath of DAEMON_MANAGED_PATHS) {
-      const srcPath = path16.join(bundleDir, relPath);
-      if (!fs13.existsSync(srcPath)) continue;
-      const dstPath = path16.join(personaDir, relPath);
+      const srcPath = path17.join(bundleDir, relPath);
+      if (!fs14.existsSync(srcPath)) continue;
+      const dstPath = path17.join(personaDir, relPath);
       try {
         replaceManagedPath(srcPath, dstPath);
         if (relPath === "CLAUDE.md") {
-          replaceManagedPath(srcPath, path16.join(personaDir, "AGENTS.md"));
+          replaceManagedPath(srcPath, path17.join(personaDir, "AGENTS.md"));
         }
         args.logger.info("persona.refresh.synced", {
           personaId: entry.personaId,
@@ -50731,12 +50865,12 @@ function migratePersonalityOverlay(args) {
   for (const entry of entries) {
     const personaId2 = entry.personaId;
     try {
-      if (fs13.existsSync(args.store.personalityLocalPath(personaId2))) continue;
-      const bundleClaudeMd = path16.join(args.defaultsRoot, personaId2, "CLAUDE.md");
-      if (!fs13.existsSync(bundleClaudeMd)) continue;
+      if (fs14.existsSync(args.store.personalityLocalPath(personaId2))) continue;
+      const bundleClaudeMd = path17.join(args.defaultsRoot, personaId2, "CLAUDE.md");
+      if (!fs14.existsSync(bundleClaudeMd)) continue;
       const current = args.store.readPersonality(personaId2);
       if (current === null) continue;
-      const bundle = fs13.readFileSync(bundleClaudeMd, "utf8");
+      const bundle = fs14.readFileSync(bundleClaudeMd, "utf8");
       if (current === bundle) continue;
       if (!current.startsWith(bundle)) continue;
       const tail2 = current.slice(bundle.length).trim();
@@ -50835,7 +50969,7 @@ function migrateSandboxAllowRead(args) {
   for (const personaId2 of args.store.list()) {
     try {
       const readPath = tildePath(args.store.personaDirPath(personaId2));
-      if (!fs13.existsSync(args.store.sandboxSettingsPath(personaId2))) {
+      if (!fs14.existsSync(args.store.sandboxSettingsPath(personaId2))) {
         args.store.writeSandboxSettings(personaId2, buildGuestSettingsV1());
         n2++;
         continue;
@@ -50878,13 +51012,13 @@ var PERSONA_BUILDER_TOMBSTONE = `${PERSONA_BUILDER_TOMBSTONE_MARKER}
 function containsAnyFile(dir) {
   let entries;
   try {
-    entries = fs13.readdirSync(dir, { withFileTypes: true });
+    entries = fs14.readdirSync(dir, { withFileTypes: true });
   } catch {
     return false;
   }
   for (const e of entries) {
     if (e.isDirectory()) {
-      if (containsAnyFile(path16.join(dir, e.name))) return true;
+      if (containsAnyFile(path17.join(dir, e.name))) return true;
     } else {
       return true;
     }
@@ -50893,9 +51027,9 @@ function containsAnyFile(dir) {
 }
 function retirePersonaBuilder(args) {
   const dir = args.store.personaDirPath(PERSONA_BUILDER_ID);
-  if (!fs13.existsSync(dir)) return;
+  if (!fs14.existsSync(dir)) return;
   try {
-    const used = containsAnyFile(path16.join(dir, ".clawd", "sessions")) || containsAnyFile(path16.join(dir, ".claude", "skills")) || containsAnyFile(path16.join(dir, "projects"));
+    const used = containsAnyFile(path17.join(dir, ".clawd", "sessions")) || containsAnyFile(path17.join(dir, ".claude", "skills")) || containsAnyFile(path17.join(dir, "projects"));
     if (!used) {
       args.store.remove(PERSONA_BUILDER_ID);
       args.logger.info("persona.retire-builder.removed", { personaId: PERSONA_BUILDER_ID });
@@ -50903,10 +51037,10 @@ function retirePersonaBuilder(args) {
     }
     let wrote = false;
     for (const name of ["CLAUDE.md", "AGENTS.md"]) {
-      const p3 = path16.join(dir, name);
-      const cur = fs13.existsSync(p3) ? fs13.readFileSync(p3, "utf8") : null;
+      const p3 = path17.join(dir, name);
+      const cur = fs14.existsSync(p3) ? fs14.readFileSync(p3, "utf8") : null;
       if (cur?.startsWith(PERSONA_BUILDER_TOMBSTONE_MARKER)) continue;
-      fs13.writeFileSync(p3, PERSONA_BUILDER_TOMBSTONE);
+      fs14.writeFileSync(p3, PERSONA_BUILDER_TOMBSTONE);
       wrote = true;
     }
     if (wrote) args.logger.info("persona.retire-builder.tombstoned", { personaId: PERSONA_BUILDER_ID });
@@ -50919,9 +51053,9 @@ function retirePersonaBuilder(args) {
 }
 
 // src/skills/scanner.ts
-var import_node_fs10 = __toESM(require("fs"), 1);
+var import_node_fs11 = __toESM(require("fs"), 1);
 var import_node_os7 = __toESM(require("os"), 1);
-var import_node_path10 = __toESM(require("path"), 1);
+var import_node_path11 = __toESM(require("path"), 1);
 
 // src/skills/frontmatter.ts
 var STRIP_QUOTES = /^["']|["']$/g;
@@ -51030,7 +51164,7 @@ function parseDescription(content) {
 }
 function isDirLikeSync(p3) {
   try {
-    return import_node_fs10.default.statSync(p3).isDirectory();
+    return import_node_fs11.default.statSync(p3).isDirectory();
   } catch {
     return false;
   }
@@ -51038,19 +51172,19 @@ function isDirLikeSync(p3) {
 function scanSkillDir(dir, source, seen, out, pluginName) {
   let entries;
   try {
-    entries = import_node_fs10.default.readdirSync(dir, { withFileTypes: true });
+    entries = import_node_fs11.default.readdirSync(dir, { withFileTypes: true });
   } catch {
     return;
   }
   for (const ent of entries) {
-    const entryPath = import_node_path10.default.join(dir, ent.name);
+    const entryPath = import_node_path11.default.join(dir, ent.name);
     if (!ent.isDirectory() && !(ent.isSymbolicLink() && isDirLikeSync(entryPath))) continue;
     let content;
     try {
-      content = import_node_fs10.default.readFileSync(import_node_path10.default.join(entryPath, "SKILL.md"), "utf8");
+      content = import_node_fs11.default.readFileSync(import_node_path11.default.join(entryPath, "SKILL.md"), "utf8");
     } catch {
       try {
-        content = import_node_fs10.default.readFileSync(import_node_path10.default.join(entryPath, "skill.md"), "utf8");
+        content = import_node_fs11.default.readFileSync(import_node_path11.default.join(entryPath, "skill.md"), "utf8");
       } catch {
         continue;
       }
@@ -51074,26 +51208,26 @@ function listSkillsForDir(dir, source) {
 function scanCommandDir(dir, source, seen, out, pluginName) {
   let entries;
   try {
-    entries = import_node_fs10.default.readdirSync(dir, { withFileTypes: true });
+    entries = import_node_fs11.default.readdirSync(dir, { withFileTypes: true });
   } catch {
     return;
   }
   for (const ent of entries) {
-    const entryPath = import_node_path10.default.join(dir, ent.name);
+    const entryPath = import_node_path11.default.join(dir, ent.name);
     if (ent.isDirectory() || ent.isSymbolicLink() && isDirLikeSync(entryPath)) {
       const ns = ent.name;
       let subEntries;
       try {
-        subEntries = import_node_fs10.default.readdirSync(entryPath, { withFileTypes: true });
+        subEntries = import_node_fs11.default.readdirSync(entryPath, { withFileTypes: true });
       } catch {
         continue;
       }
       for (const se2 of subEntries) {
         if (!se2.name.endsWith(".md")) continue;
-        const sePath = import_node_path10.default.join(entryPath, se2.name);
+        const sePath = import_node_path11.default.join(entryPath, se2.name);
         let content;
         try {
-          content = import_node_fs10.default.readFileSync(sePath, "utf8");
+          content = import_node_fs11.default.readFileSync(sePath, "utf8");
         } catch {
           continue;
         }
@@ -51110,7 +51244,7 @@ function scanCommandDir(dir, source, seen, out, pluginName) {
     } else if (ent.name.endsWith(".md")) {
       let content;
       try {
-        content = import_node_fs10.default.readFileSync(entryPath, "utf8");
+        content = import_node_fs11.default.readFileSync(entryPath, "utf8");
       } catch {
         continue;
       }
@@ -51126,10 +51260,10 @@ function scanCommandDir(dir, source, seen, out, pluginName) {
   }
 }
 function readInstalledPlugins(home) {
-  const file = import_node_path10.default.join(home, ".claude", "plugins", "installed_plugins.json");
+  const file = import_node_path11.default.join(home, ".claude", "plugins", "installed_plugins.json");
   let raw;
   try {
-    raw = import_node_fs10.default.readFileSync(file, "utf8");
+    raw = import_node_fs11.default.readFileSync(file, "utf8");
   } catch {
     return [];
   }
@@ -51177,14 +51311,14 @@ var SkillsScanner = class {
       });
     }
     const fsBlock = [];
-    scanSkillDir(import_node_path10.default.join(this.home, ".claude", "skills"), "global", seen, fsBlock);
-    scanCommandDir(import_node_path10.default.join(this.home, ".claude", "commands"), "global", seen, fsBlock);
-    scanSkillDir(import_node_path10.default.join(args.cwd, ".claude", "skills"), "project", seen, fsBlock);
-    scanCommandDir(import_node_path10.default.join(args.cwd, ".claude", "commands"), "project", seen, fsBlock);
+    scanSkillDir(import_node_path11.default.join(this.home, ".claude", "skills"), "global", seen, fsBlock);
+    scanCommandDir(import_node_path11.default.join(this.home, ".claude", "commands"), "global", seen, fsBlock);
+    scanSkillDir(import_node_path11.default.join(args.cwd, ".claude", "skills"), "project", seen, fsBlock);
+    scanCommandDir(import_node_path11.default.join(args.cwd, ".claude", "commands"), "project", seen, fsBlock);
     const plugins = [...readInstalledPlugins(this.home), ...this.extraPluginRoots];
     for (const { name, root } of plugins) {
-      scanSkillDir(import_node_path10.default.join(root, "skills"), "plugin", seen, fsBlock, name);
-      scanCommandDir(import_node_path10.default.join(root, "commands"), "plugin", seen, fsBlock, name);
+      scanSkillDir(import_node_path11.default.join(root, "skills"), "plugin", seen, fsBlock, name);
+      scanCommandDir(import_node_path11.default.join(root, "commands"), "plugin", seen, fsBlock, name);
     }
     fsBlock.sort((a2, b3) => a2.name < b3.name ? -1 : a2.name > b3.name ? 1 : 0);
     return [...builtinBlock, ...fsBlock];
@@ -51326,12 +51460,12 @@ var PersonaManager = class {
 };
 
 // src/share-md-viewer/load.ts
-var import_node_fs12 = __toESM(require("fs"), 1);
-var import_node_path11 = __toESM(require("path"), 1);
+var import_node_fs13 = __toESM(require("fs"), 1);
+var import_node_path12 = __toESM(require("path"), 1);
 var import_node_url2 = require("url");
 
 // src/share-md-viewer/asset-loader.ts
-var import_node_fs11 = __toESM(require("fs"), 1);
+var import_node_fs12 = __toESM(require("fs"), 1);
 function htmlEscape(s2) {
   return s2.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
 }
@@ -51339,12 +51473,12 @@ function createViewerAssetLoader(opts) {
   let viewerTemplate;
   let errorTemplate;
   try {
-    viewerTemplate = import_node_fs11.default.readFileSync(opts.viewerHtmlPath, "utf8");
+    viewerTemplate = import_node_fs12.default.readFileSync(opts.viewerHtmlPath, "utf8");
   } catch (err) {
     throw new Error(`viewer asset not found at ${opts.viewerHtmlPath}: ${err.message}`);
   }
   try {
-    errorTemplate = import_node_fs11.default.readFileSync(opts.errorHtmlPath, "utf8");
+    errorTemplate = import_node_fs12.default.readFileSync(opts.errorHtmlPath, "utf8");
   } catch (err) {
     throw new Error(`viewer error asset not found at ${opts.errorHtmlPath}: ${err.message}`);
   }
@@ -51363,25 +51497,25 @@ var import_meta2 = {};
 function tryLoadViewerAssets(logger) {
   const candidates = [];
   try {
-    const here = import_node_path11.default.dirname((0, import_node_url2.fileURLToPath)(import_meta2.url));
+    const here = import_node_path12.default.dirname((0, import_node_url2.fileURLToPath)(import_meta2.url));
     candidates.push(here);
-    candidates.push(import_node_path11.default.resolve(here, ".."));
-    candidates.push(import_node_path11.default.resolve(here, "..", "..", "dist"));
+    candidates.push(import_node_path12.default.resolve(here, ".."));
+    candidates.push(import_node_path12.default.resolve(here, "..", "..", "dist"));
   } catch {
   }
   if (process.argv[1]) {
     let real = process.argv[1];
     try {
-      real = import_node_fs12.default.realpathSync(process.argv[1]);
+      real = import_node_fs13.default.realpathSync(process.argv[1]);
     } catch {
     }
-    candidates.push(import_node_path11.default.dirname(real));
+    candidates.push(import_node_path12.default.dirname(real));
   }
   for (const root of candidates) {
-    const viewerHtmlPath = import_node_path11.default.join(root, "share-md-viewer.html");
-    const errorHtmlPath = import_node_path11.default.join(root, "share-md-viewer-error.html");
+    const viewerHtmlPath = import_node_path12.default.join(root, "share-md-viewer.html");
+    const errorHtmlPath = import_node_path12.default.join(root, "share-md-viewer-error.html");
     try {
-      if (import_node_fs12.default.statSync(viewerHtmlPath).isFile() && import_node_fs12.default.statSync(errorHtmlPath).isFile()) {
+      if (import_node_fs13.default.statSync(viewerHtmlPath).isFile() && import_node_fs13.default.statSync(errorHtmlPath).isFile()) {
         logger?.info("share-md-viewer.assets-root.resolved", { root });
         return createViewerAssetLoader({ viewerHtmlPath, errorHtmlPath });
       }
@@ -51396,25 +51530,25 @@ function tryLoadViewerAssets(logger) {
 }
 
 // src/dashboard/load.ts
-var import_node_fs13 = __toESM(require("fs"), 1);
-var import_node_path12 = __toESM(require("path"), 1);
+var import_node_fs14 = __toESM(require("fs"), 1);
+var import_node_path13 = __toESM(require("path"), 1);
 var import_node_url3 = require("url");
 init_protocol();
 var import_meta3 = {};
 function candidateRoots() {
   const roots = [];
   try {
-    const here = import_node_path12.default.dirname((0, import_node_url3.fileURLToPath)(import_meta3.url));
-    roots.push(here, import_node_path12.default.resolve(here, ".."), import_node_path12.default.resolve(here, "..", "..", "dist"));
+    const here = import_node_path13.default.dirname((0, import_node_url3.fileURLToPath)(import_meta3.url));
+    roots.push(here, import_node_path13.default.resolve(here, ".."), import_node_path13.default.resolve(here, "..", "..", "dist"));
   } catch {
   }
   if (process.argv[1]) {
     let real = process.argv[1];
     try {
-      real = import_node_fs13.default.realpathSync(process.argv[1]);
+      real = import_node_fs14.default.realpathSync(process.argv[1]);
     } catch {
     }
-    roots.push(import_node_path12.default.dirname(real));
+    roots.push(import_node_path13.default.dirname(real));
   }
   return roots;
 }
@@ -51422,10 +51556,10 @@ function loadDashboardPages(logger, roots = candidateRoots()) {
   const pages = /* @__PURE__ */ new Map();
   for (const page of DASHBOARD_PAGES) {
     for (const root of roots) {
-      const file = import_node_path12.default.join(root, `${page}.html`);
+      const file = import_node_path13.default.join(root, `${page}.html`);
       try {
-        if (import_node_fs13.default.statSync(file).isFile()) {
-          pages.set(page, import_node_fs13.default.readFileSync(file, "utf8"));
+        if (import_node_fs14.default.statSync(file).isFile()) {
+          pages.set(page, import_node_fs14.default.readFileSync(file, "utf8"));
           logger?.info("dashboard.page-asset.resolved", { page, root });
           break;
         }
@@ -51775,7 +51909,8 @@ function parseCodexRollout(text) {
             kind: "turn-end",
             raw: obj,
             ...ts ? { ts } : {},
-            ...durationMs !== void 0 ? { durationMs } : {}
+            ...durationMs !== void 0 ? { durationMs } : {},
+            ...p3.type === "task_complete" && turnId ? { turnId } : {}
           });
           break;
         }
@@ -51843,121 +51978,6 @@ function subagentTerminalResult(started, child) {
 // src/tools/codex-history.ts
 var import_node_fs15 = __toESM(require("fs"), 1);
 var import_node_path14 = __toESM(require("path"), 1);
-
-// src/tools/transcript-search.ts
-var import_node_fs14 = __toESM(require("fs"), 1);
-var import_node_path13 = __toESM(require("path"), 1);
-var SNIPPET_PAD = 60;
-var INJECTED_ENVELOPE_RE = /^<(system-reminder|command-name|command-message|command-args|local-command-stdout|local-command-stderr|task-notification|user-prompt-submit-hook|environment_context|user_instructions)\b/;
-var CODEX_WRAPPER_RE = /<(related-dir|environment_context|user_instructions)>[\s\S]*?<\/\1>/g;
-function asRecord(v3) {
-  return typeof v3 === "object" && v3 !== null ? v3 : null;
-}
-function textOfBlocks(content, types) {
-  if (!Array.isArray(content)) return null;
-  const parts = [];
-  for (const block of content) {
-    const b3 = asRecord(block);
-    if (!b3 || typeof b3.type !== "string" || !types.includes(b3.type)) continue;
-    const text = b3.text;
-    if (typeof text === "string" && text !== "") parts.push(text);
-  }
-  return parts.length > 0 ? parts.join("\n") : null;
-}
-function lineToSearchableText(raw) {
-  const line = asRecord(raw);
-  if (!line) return null;
-  if (line.type === "response_item") {
-    const payload = asRecord(line.payload);
-    if (!payload || payload.type !== "message") return null;
-    const role = payload.role;
-    if (role !== "user" && role !== "assistant") return null;
-    const text2 = textOfBlocks(payload.content, ["input_text", "output_text"]);
-    if (text2 === null) return null;
-    if (role !== "user") return text2;
-    const stripped = text2.replace(CODEX_WRAPPER_RE, "").trim();
-    if (stripped === "") return null;
-    return INJECTED_ENVELOPE_RE.test(stripped) ? null : stripped;
-  }
-  if (line.type !== "user" && line.type !== "assistant") return null;
-  const message = asRecord(line.message);
-  if (!message) return null;
-  const content = message.content;
-  const text = typeof content === "string" && content !== "" ? content : textOfBlocks(content, ["text"]);
-  if (text === null) return null;
-  if (line.type === "user" && (line.isMeta === true || line.isSynthetic === true)) return null;
-  if (line.type === "user" && INJECTED_ENVELOPE_RE.test(text.trimStart())) return null;
-  return text;
-}
-function escapeRegExp(s2) {
-  return s2.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function makeSnippet(text, at3, needleLength) {
-  const from = Math.max(0, at3 - SNIPPET_PAD);
-  const to = Math.min(text.length, at3 + needleLength + SNIPPET_PAD);
-  const body = text.slice(from, to).replace(/\s+/g, " ").trim();
-  return `${from > 0 ? "\u2026 " : ""}${body}${to < text.length ? " \u2026" : ""}`;
-}
-function searchTranscriptFile(file, query) {
-  let buf;
-  try {
-    buf = import_node_fs14.default.readFileSync(file);
-  } catch {
-    return null;
-  }
-  const haystack = buf.toString("latin1");
-  const needle = Buffer.from(query, "utf8").toString("latin1");
-  const re2 = new RegExp(escapeRegExp(needle), "gi");
-  let m3;
-  while ((m3 = re2.exec(haystack)) !== null) {
-    const lineStart = haystack.lastIndexOf("\n", m3.index) + 1;
-    let lineEnd = haystack.indexOf("\n", m3.index);
-    if (lineEnd < 0) lineEnd = haystack.length;
-    re2.lastIndex = lineEnd + 1;
-    let parsed;
-    try {
-      parsed = JSON.parse(Buffer.from(haystack.slice(lineStart, lineEnd), "latin1").toString("utf8"));
-    } catch {
-      continue;
-    }
-    const text = lineToSearchableText(parsed);
-    if (text === null) continue;
-    const at3 = text.toLowerCase().indexOf(query.toLowerCase());
-    if (at3 < 0) continue;
-    return makeSnippet(text, at3, query.length);
-  }
-  return null;
-}
-var ROLLOUT_NAME_RE = /-([0-9a-fA-F-]{36})\.jsonl$/;
-function createCodexRolloutLocator(roots) {
-  let index = null;
-  const walk2 = (dir, into) => {
-    let entries;
-    try {
-      entries = import_node_fs14.default.readdirSync(dir, { withFileTypes: true });
-    } catch {
-      return;
-    }
-    for (const entry of entries) {
-      const full = import_node_path13.default.join(dir, entry.name);
-      if (entry.isDirectory()) {
-        walk2(full, into);
-        continue;
-      }
-      const matched = ROLLOUT_NAME_RE.exec(entry.name);
-      if (matched) into.set(matched[1].toLowerCase(), full);
-    }
-  };
-  return (toolSessionId) => {
-    if (index === null) {
-      index = /* @__PURE__ */ new Map();
-      for (const root of roots) walk2(root, index);
-    }
-    return index.get(toolSessionId.toLowerCase()) ?? null;
-  };
-}
-
-// src/tools/codex-history.ts
 var CODEX_LIST_SESSIONS_LIMIT = 100;
 var CODEX_LIST_SESSIONS_SCAN_CAP = 4e3;
 var PEEK_BYTES = 8 * 1024;
@@ -52523,9 +52543,9 @@ var CentralClientError = class extends Error {
   cause;
   status;
 };
-async function centralRequest(opts, path105, init) {
+async function centralRequest(opts, path106, init) {
   const f2 = opts.fetchImpl ?? globalThis.fetch;
-  const url = `${opts.api.replace(/\/+$/, "")}${path105}`;
+  const url = `${opts.api.replace(/\/+$/, "")}${path106}`;
   const ctrl = new AbortController();
   const timer = setTimeout(() => ctrl.abort(), opts.timeoutMs ?? 15e3);
   let res;
@@ -53234,7 +53254,8 @@ function tokenUsage(usage) {
 }
 function turnCompleted(turn) {
   if (turn?.status === "failed") return [{ kind: "error", message: str3(rec3(turn.error)?.message) ?? "codex turn failed" }, { kind: "turn_end" }];
-  return [{ kind: "turn_end" }];
+  const turnId = turn?.status === "completed" ? str3(turn.id) : void 0;
+  return [{ kind: "turn_end", ...turnId ? { turnId } : {} }];
 }
 function rec3(v3) {
   return typeof v3 === "object" && v3 !== null ? v3 : void 0;
@@ -53559,8 +53580,8 @@ function turnStartInput(text, resolveImage) {
   const items = [];
   let leftover = text;
   for (const m3 of text.matchAll(SKILL_RE)) {
-    const [marker, name, path105] = m3;
-    items.push({ type: "skill", name, path: path105 });
+    const [marker, name, path106] = m3;
+    items.push({ type: "skill", name, path: path106 });
     leftover = leftover.replace(marker, "");
   }
   for (const m3 of text.matchAll(ATTACHMENT_RE2)) {
@@ -54007,7 +54028,7 @@ function createCodexSession(ctx, sink, deps = {}) {
   );
   args.push(...codexAgentsCliArgs(loadCodexAgentsConfig({ cwd: ctx.cwd, logger: deps.logger })));
   args.push(...codexMemoriesCliArgs(ctx));
-  const resolvedCodexHome = deps.codexHomeFor?.(ctx.cwd);
+  const resolvedCodexHome = (ctx.toolSessionId ? deps.codexHomeForThread?.(ctx.toolSessionId) : void 0) ?? deps.codexHomeFor?.(ctx.cwd);
   const env = {
     ...process.env,
     ...resolvedCodexHome ? { CODEX_HOME: resolvedCodexHome } : {},
@@ -54294,9 +54315,8 @@ var CODEX_CAPABILITIES_BASE = {
   tool: "codex",
   toolSessionIdLabel: "Codex Thread ID",
   permissionModes: CODEX_APPROVAL_PRESETS,
-  // Codex 原生 child thread 已经映射到现有 Agent 卡 + history drawer；其余功能仍不支持
-  //（rewind 无 file-snapshot / 无 TUI pty / 无 observe 推送 / 无文件分享 / fork 是 claude jsonl 专用）。
-  features: { rewind: false, subagents: true, tui: false, observe: false, fileSharing: false, fork: false },
+  // 本机 Codex 支持原生 child thread、已完成 turn 的 fork；rewind / TUI / observe / 文件分享仍关闭。
+  features: { rewind: false, subagents: true, tui: false, observe: false, fileSharing: false, fork: true },
   configSchema: [
     {
       name: "model",
@@ -54361,6 +54381,7 @@ var CodexAdapter = class {
   fetchImpl;
   /** CODEX_HOME 归属解析（spec 2026-08-18-codex-project-alignment §3.1），由 index.ts 注入 */
   codexHomeFor;
+  codexHomeForThread;
   getSignSecret;
   // capabilities 的进程级 memo。**回落结果同样被缓存**——否则 codex 没装时每次开弹窗都
   // spawn 一次必然失败的子进程。装好 codex / provider 加了模型后不用重启：设置 → 账号「引擎」的
@@ -54374,6 +54395,7 @@ var CodexAdapter = class {
     this.configQueryOverride = opts.configQueryOverride;
     this.fetchImpl = opts.fetchImpl;
     this.codexHomeFor = opts.codexHomeFor;
+    this.codexHomeForThread = opts.codexHomeForThread;
     this.getSignSecret = opts.getSignSecret;
   }
   async probe() {
@@ -54446,6 +54468,7 @@ var CodexAdapter = class {
     return createCodexSession({ ...ctx, model: sanitizeCodexModel(ctx.model) }, sink, {
       logger: this.logger,
       codexHomeFor: this.codexHomeFor,
+      codexHomeForThread: this.codexHomeForThread,
       getSignSecret: this.getSignSecret
     });
   }
@@ -56654,12 +56677,12 @@ var DEFAULT_TIMEOUT_MS2 = 15e3;
 var MAX_BUFFER = 4 * 1024 * 1024;
 function createGhRunner(defaults) {
   const baseTimeoutMs = defaults?.timeoutMs ?? DEFAULT_TIMEOUT_MS2;
-  const spawn15 = defaults?.execFile ?? import_node_child_process8.execFile;
+  const spawn16 = defaults?.execFile ?? import_node_child_process8.execFile;
   return {
     run(args, opts) {
       const token = defaults?.token?.();
       return new Promise((resolve9, reject) => {
-        spawn15(
+        spawn16(
           "gh",
           args,
           {
@@ -60933,10 +60956,10 @@ function createGithubApi(args) {
   const doFetch = args.fetch ?? fetch;
   const seal = args.seal ?? sealWithSodium;
   const timeoutMs = args.timeoutMs ?? TIMEOUT_MS;
-  async function request(method, path105, body) {
+  async function request(method, path106, body) {
     let res;
     try {
-      res = await doFetch(`${API}${path105}`, {
+      res = await doFetch(`${API}${path106}`, {
         method,
         headers: {
           Authorization: `Bearer ${args.token}`,
@@ -60961,8 +60984,8 @@ function createGithubApi(args) {
     }
     return { status: res.status, json };
   }
-  async function must(method, path105, what, body) {
-    const r2 = await request(method, path105, body);
+  async function must(method, path106, what, body) {
+    const r2 = await request(method, path106, body);
     if (r2.status < 200 || r2.status >= 300) throw new GithubApiError(r2.status, explain(r2.status, what, r2.json));
     return r2.json;
   }
@@ -61007,9 +61030,9 @@ function createGithubApi(args) {
         return { env: x2.name, ...Number.isFinite(at3) ? { setAt: at3 } : {} };
       });
     },
-    async getJson(path105) {
+    async getJson(path106) {
       try {
-        const r2 = await request("GET", path105);
+        const r2 = await request("GET", path106);
         return r2.status >= 200 && r2.status < 300 ? r2.json : void 0;
       } catch {
         return void 0;
@@ -62271,21 +62294,6 @@ var import_node_fs35 = __toESM(require("fs"), 1);
 var import_node_os12 = __toESM(require("os"), 1);
 var import_node_path40 = __toESM(require("path"), 1);
 var CHANNELS_FILE_NAME = "subscription-channels.json";
-function providerSection(content) {
-  const header = /^\[model_providers\.cliproxyapi\][^\n]*(?:\n|$)/m.exec(content);
-  if (!header) return null;
-  const body = content.slice(header.index + header[0].length);
-  const nextHeader = body.search(/^\[/m);
-  return nextHeader < 0 ? body : body.slice(0, nextHeader);
-}
-function readAuthKey2(codexHome) {
-  try {
-    const key = JSON.parse(import_node_fs35.default.readFileSync(import_node_path40.default.join(codexHome, "auth.json"), "utf8")).OPENAI_API_KEY;
-    return typeof key === "string" && key ? key : null;
-  } catch {
-    return null;
-  }
-}
 var SubscriptionChannelStore = class {
   filePath;
   codexHome;
@@ -62412,20 +62420,15 @@ var SubscriptionChannelStore = class {
       if (!import_node_fs35.default.existsSync(configPath)) return null;
       const content = import_node_fs35.default.readFileSync(configPath, "utf8");
       if (!content.includes('model_provider = "cliproxyapi"')) return null;
-      const section = providerSection(content);
-      if (!section) return null;
-      const urlMatch = /^\s*base_url\s*=\s*["']([^"']+)["']/m.exec(section);
-      const echoKey = /^\s*auth\s*=\s*\{\s*command\s*=\s*["']echo["']\s*,\s*args\s*=\s*\[\s*["']([^"']+)["']\s*\]/m.exec(section)?.[1];
-      const inlineKey = /^\s*experimental_bearer_token\s*=\s*["']([^"']+)["']/m.exec(section)?.[1];
-      const envKey = /^\s*env_key\s*=\s*["']([^"']+)["']/m.exec(section)?.[1];
-      const key = echoKey ?? inlineKey ?? (envKey ? process.env[envKey] : !/^\s*auth\s*=/m.test(section) ? readAuthKey2(this.codexHome) : null);
-      if (urlMatch && key) {
+      const urlMatch = /base_url\s*=\s*["']([^"']+)["']/.exec(content);
+      const keyMatch = /args\s*=\s*\[\s*["']([^"']+)["']\s*\]/.exec(content) || /experimental_bearer_token\s*=\s*["']([^"']+)["']/.exec(content);
+      if (urlMatch && keyMatch) {
         const id = "default-pool";
         const channel = {
           id,
           name: "\u9ED8\u8BA4\u56E2\u961F\u53F7\u6C60",
           baseUrl: normalizeEngineBaseUrl(urlMatch[1]),
-          apiKey: key,
+          apiKey: keyMatch[1],
           remark: "\u4ECE\u672C\u673A\u5DF2\u63A5\u5165\u7684\u53F7\u6C60\u914D\u7F6E\u81EA\u52A8\u8FC1\u79FB",
           createdAt: Date.now(),
           updatedAt: Date.now()
@@ -62506,8 +62509,8 @@ function refreshPathFromLoginShell() {
       timeout: 3e3,
       stdio: ["ignore", "pipe", "ignore"]
     });
-    const path105 = out.trim();
-    if (path105) process.env.PATH = path105;
+    const path106 = out.trim();
+    if (path106) process.env.PATH = path106;
   } catch {
   }
 }
@@ -65456,13 +65459,13 @@ function mapSkillsListResponse(res) {
       const r2 = s2 ?? {};
       const name = str4(r2.name);
       if (!name) continue;
-      const path105 = str4(r2.path);
+      const path106 = str4(r2.path);
       const description = str4(r2.description);
       const isPlugin = name.includes(":");
       out.push({
         name,
         source: isPlugin ? "plugin" : "project",
-        ...path105 ? { path: path105 } : {},
+        ...path106 ? { path: path106 } : {},
         ...description ? { description } : {},
         ...isPlugin ? { plugin: name.split(":")[0] } : {}
       });
@@ -69996,7 +69999,7 @@ var ServerKeyStore = class {
 init_protocol();
 
 // src/handlers/index.ts
-var import_node_path79 = __toESM(require("path"), 1);
+var import_node_path80 = __toESM(require("path"), 1);
 
 // src/handlers/session.ts
 init_protocol();
@@ -70069,20 +70072,83 @@ function forkSession(input) {
   return { forkedToolSessionId, forkedFilePath };
 }
 
-// src/session/external-scan.ts
+// src/tools/codex-fork.ts
+var import_node_child_process17 = require("child_process");
 var import_node_fs59 = __toESM(require("fs"), 1);
+var import_node_path65 = __toESM(require("path"), 1);
+function openCodexAppServer(home, cwd) {
+  const proc = (0, import_node_child_process17.spawn)(process.env.CODEX_BIN ?? "codex", ["app-server", "--listen", "stdio://"], {
+    cwd,
+    env: { ...process.env, CODEX_HOME: home },
+    stdio: ["pipe", "pipe", "pipe"]
+  });
+  proc.on("error", () => proc.stdout?.destroy());
+  const stream = stdioLineStream(proc);
+  return {
+    stream,
+    close: () => {
+      stream.close();
+      if (proc.exitCode === null && proc.signalCode === null) proc.kill("SIGTERM");
+    }
+  };
+}
+async function forkCodexThread(input, deps = {}) {
+  const source = locateCodexThread(input.roots, input.sourceThreadId);
+  if (!source) throw new Error(`codex fork: source thread not found: ${input.sourceThreadId}`);
+  const rollout = parseCodexRollout(import_node_fs59.default.readFileSync(source.file, "utf8"));
+  if (rollout.meta?.threadId.toLowerCase() !== input.sourceThreadId.toLowerCase()) {
+    throw new Error(`codex fork: source thread metadata does not match ${input.sourceThreadId}`);
+  }
+  if (!rollout.turns.some((turn) => turn.turnId === input.turnId && turn.status === "completed")) {
+    throw new Error(`codex fork: completed turn not found: ${input.turnId}`);
+  }
+  const connection = (deps.open ?? openCodexAppServer)(source.home, input.targetCwd);
+  const timeoutMs = deps.timeoutMs ?? DEFAULT_CODEX_QUERY_TIMEOUT_MS;
+  let timer;
+  const timeout = new Promise((_3, reject) => {
+    timer = setTimeout(() => reject(new Error(`codex app-server thread/fork timed out after ${timeoutMs}ms`)), timeoutMs);
+  });
+  try {
+    const client = new CodexAppServerClient(connection.stream);
+    return await Promise.race([timeout, (async () => {
+      await client.request("initialize", {
+        clientInfo: { name: "clawd", title: "clawd", version: "0" },
+        capabilities: null
+      });
+      client.notify("initialized", {});
+      const result = await client.request("thread/fork", {
+        threadId: input.sourceThreadId,
+        lastTurnId: input.turnId,
+        cwd: input.targetCwd
+      });
+      const forkedToolSessionId = result?.thread?.id;
+      if (typeof forkedToolSessionId !== "string" || !forkedToolSessionId) {
+        throw new Error("codex fork: app-server returned no thread id");
+      }
+      const forked = locateCodexThread([import_node_path65.default.join(source.home, "sessions")], forkedToolSessionId);
+      if (!forked) throw new Error(`codex fork: rollout not found for forked thread ${forkedToolSessionId}`);
+      return { forkedToolSessionId, forkedFilePath: forked.file };
+    })()]);
+  } finally {
+    if (timer) clearTimeout(timer);
+    connection.close();
+  }
+}
+
+// src/session/external-scan.ts
+var import_node_fs60 = __toESM(require("fs"), 1);
 var import_promises11 = __toESM(require("fs/promises"), 1);
 var import_node_os24 = __toESM(require("os"), 1);
-var import_node_path65 = __toESM(require("path"), 1);
+var import_node_path66 = __toESM(require("path"), 1);
 var import_node_module = require("module");
-var import_node_child_process17 = require("child_process");
+var import_node_child_process18 = require("child_process");
 var import_meta7 = {};
 function defaultRoots() {
   const home = import_node_os24.default.homedir();
   return {
-    claudeProjectsDir: import_node_path65.default.join(home, ".claude", "projects"),
-    codexDir: import_node_path65.default.join(home, ".codex"),
-    clawdDir: import_node_path65.default.join(home, ".clawd")
+    claudeProjectsDir: import_node_path66.default.join(home, ".claude", "projects"),
+    codexDir: import_node_path66.default.join(home, ".codex"),
+    clawdDir: import_node_path66.default.join(home, ".clawd")
   };
 }
 function width(s2) {
@@ -70133,7 +70199,7 @@ function userText(msg) {
 }
 function isDir2(p3) {
   try {
-    return import_node_fs59.default.statSync(p3).isDirectory();
+    return import_node_fs60.default.statSync(p3).isDirectory();
   } catch {
     return false;
   }
@@ -70142,7 +70208,7 @@ async function scanClaude(roots) {
   const out = [];
   let dirs;
   try {
-    dirs = import_node_fs59.default.readdirSync(roots.claudeProjectsDir, { withFileTypes: true });
+    dirs = import_node_fs60.default.readdirSync(roots.claudeProjectsDir, { withFileTypes: true });
   } catch {
     return out;
   }
@@ -70150,16 +70216,16 @@ async function scanClaude(roots) {
     if (!d2.isDirectory()) continue;
     let files;
     try {
-      files = import_node_fs59.default.readdirSync(import_node_path65.default.join(roots.claudeProjectsDir, d2.name));
+      files = import_node_fs60.default.readdirSync(import_node_path66.default.join(roots.claudeProjectsDir, d2.name));
     } catch {
       continue;
     }
     for (const name of files) {
       if (!name.endsWith(".jsonl")) continue;
-      const file = import_node_path65.default.join(roots.claudeProjectsDir, d2.name, name);
+      const file = import_node_path66.default.join(roots.claudeProjectsDir, d2.name, name);
       let st2;
       try {
-        st2 = import_node_fs59.default.statSync(file);
+        st2 = import_node_fs60.default.statSync(file);
       } catch {
         continue;
       }
@@ -70212,7 +70278,7 @@ async function scanClaude(roots) {
   return out;
 }
 async function countCodexTurns(rolloutPath) {
-  if (!rolloutPath || !import_node_fs59.default.existsSync(rolloutPath)) return { turns: 0, first: "" };
+  if (!rolloutPath || !import_node_fs60.default.existsSync(rolloutPath)) return { turns: 0, first: "" };
   let turns = 0;
   let first = "";
   for await (const rec6 of jsonLines(rolloutPath)) {
@@ -70243,14 +70309,14 @@ function readCodexThreads(db) {
   } catch {
   }
   try {
-    const info = (0, import_node_child_process17.spawnSync)("sqlite3", [db, "PRAGMA table_info(threads);"], { encoding: "utf8" });
+    const info = (0, import_node_child_process18.spawnSync)("sqlite3", [db, "PRAGMA table_info(threads);"], { encoding: "utf8" });
     if (info.status !== 0) return null;
     const have = new Set(
       info.stdout.split("\n").map((l2) => l2.split("|")[1]).filter(Boolean)
     );
     if (!["id", "cwd", "updated_at", "thread_source"].every((c2) => have.has(c2))) return null;
     const sel = COLS.map((c2) => have.has(c2) ? c2 : `NULL AS ${c2}`).join(", ");
-    const res = (0, import_node_child_process17.spawnSync)("sqlite3", ["-json", db, `SELECT ${sel} FROM threads;`], {
+    const res = (0, import_node_child_process18.spawnSync)("sqlite3", ["-json", db, `SELECT ${sel} FROM threads;`], {
       encoding: "utf8",
       maxBuffer: 64 * 1024 * 1024
     });
@@ -70286,7 +70352,7 @@ async function codexFromRows(rows) {
 async function scanCodex(roots) {
   let dbs = [];
   try {
-    dbs = import_node_fs59.default.readdirSync(roots.codexDir).filter((n2) => /^state_.*\.sqlite$/.test(n2)).sort().map((n2) => import_node_path65.default.join(roots.codexDir, n2));
+    dbs = import_node_fs60.default.readdirSync(roots.codexDir).filter((n2) => /^state_.*\.sqlite$/.test(n2)).sort().map((n2) => import_node_path66.default.join(roots.codexDir, n2));
   } catch {
   }
   if (!dbs.length) return [];
@@ -70295,14 +70361,14 @@ async function scanCodex(roots) {
 }
 async function scanExternalSessions(rootsIn) {
   const roots = { ...defaultRoots(), ...rootsIn };
-  const personaRoot = import_node_path65.default.join(roots.clawdDir, "personas");
+  const personaRoot = import_node_path66.default.join(roots.clawdDir, "personas");
   const all = [...await scanClaude(roots), ...await scanCodex(roots)];
   const out = [];
   for (const c2 of all) {
     if (c2.skip) continue;
     if (c2.turns < 1) continue;
     if (!c2.cwd || !isDir2(c2.cwd)) continue;
-    if (c2.cwd === roots.clawdDir || c2.cwd === personaRoot || c2.cwd.startsWith(personaRoot + import_node_path65.default.sep) || c2.cwd.startsWith(roots.clawdDir + import_node_path65.default.sep)) {
+    if (c2.cwd === roots.clawdDir || c2.cwd === personaRoot || c2.cwd.startsWith(personaRoot + import_node_path66.default.sep) || c2.cwd.startsWith(roots.clawdDir + import_node_path66.default.sep)) {
       continue;
     }
     out.push({
@@ -70319,13 +70385,13 @@ async function scanExternalSessions(rootsIn) {
 }
 
 // src/session/import-ledger.ts
-var import_node_fs60 = __toESM(require("fs"), 1);
-var import_node_path66 = __toESM(require("path"), 1);
+var import_node_fs61 = __toESM(require("fs"), 1);
+var import_node_path67 = __toESM(require("path"), 1);
 var LEDGER_FILENAME = "session-import-ledger.json";
 function readImportLedger(dataDir) {
   try {
     const parsed = JSON.parse(
-      import_node_fs60.default.readFileSync(import_node_path66.default.join(dataDir, LEDGER_FILENAME), "utf8")
+      import_node_fs61.default.readFileSync(import_node_path67.default.join(dataDir, LEDGER_FILENAME), "utf8")
     );
     return Array.isArray(parsed) ? parsed : [];
   } catch {
@@ -70333,14 +70399,15 @@ function readImportLedger(dataDir) {
   }
 }
 function appendImportLedger(dataDir, entry) {
-  const file = import_node_path66.default.join(dataDir, LEDGER_FILENAME);
+  const file = import_node_path67.default.join(dataDir, LEDGER_FILENAME);
   const entries = readImportLedger(dataDir);
   entries.push(entry);
-  import_node_fs60.default.writeFileSync(file, JSON.stringify(entries, null, 2), { encoding: "utf8", mode: 384 });
+  import_node_fs61.default.writeFileSync(file, JSON.stringify(entries, null, 2), { encoding: "utf8", mode: 384 });
 }
 
 // src/handlers/session.ts
 init_protocol();
+var import_node_path68 = __toESM(require("path"), 1);
 function canReadSearchHit(ctx, file) {
   if (!ctx || ctx.principal.kind === "owner") return true;
   return canAccessPersona(ctx.grants, file.ownerPersonaId, "read") && file.creatorPrincipalId === ctx.principal.id;
@@ -70608,8 +70675,12 @@ ${attribution}` } : args;
   };
   const fork = async (frame, _client, ctx) => {
     const args = SessionForkArgs.parse(frame);
+    const source = args.sourceSessionId ? manager.get({ sessionId: args.sourceSessionId }).response : null;
+    if (source && (source.sessionId !== args.sourceSessionId || source.toolSessionId !== args.toolSessionId)) {
+      throw new ClawdError(ERROR_CODES.VALIDATION_ERROR, "fork: source thread does not match source session");
+    }
     if (ctx && ctx.principal.kind === "guest") {
-      const src = store.list().find((s2) => s2.toolSessionId === args.toolSessionId);
+      const src = source ?? store.list().find((s2) => s2.toolSessionId === args.toolSessionId);
       const ok = src != null && canAccessPersona(ctx.grants, src.ownerPersonaId, "read") && src.creatorPrincipalId === ctx.principal.id;
       if (!ok) {
         throw new ClawdError(
@@ -70617,8 +70688,33 @@ ${attribution}` } : args;
           `principal guest:${ctx.principal.id} cannot fork tool session ${args.toolSessionId}`
         );
       }
+      if (source?.tool === "codex" && args.targetCwd && import_node_path68.default.resolve(args.targetCwd) !== import_node_path68.default.resolve(source.cwd)) {
+        throw new ClawdError(ERROR_CODES.FORBIDDEN, "fork: guest targetCwd must match source cwd");
+      }
     }
-    const result = forkSession(args);
+    if (source && source.tool !== void 0 && source.tool !== "claude" && source.tool !== "codex") {
+      throw new ClawdError(ERROR_CODES.TOOL_NOT_SUPPORTED, `tool ${source.tool} does not support fork`);
+    }
+    if (args.turnId && source?.tool !== "codex") {
+      throw new ClawdError(ERROR_CODES.TOOL_NOT_SUPPORTED, "fork: turnId requires a local Codex source session");
+    }
+    if (source?.tool === "codex" && (!args.turnId || args.messageUuid || !args.targetCwd)) {
+      throw new ClawdError(ERROR_CODES.VALIDATION_ERROR, "fork: Codex requires turnId and targetCwd");
+    }
+    if (source?.tool !== "codex" && !args.messageUuid) {
+      throw new ClawdError(ERROR_CODES.VALIDATION_ERROR, "fork: Claude requires messageUuid");
+    }
+    const result = source?.tool === "codex" ? await (deps.forkCodexThread ?? forkCodexThread)({
+      roots: codexRolloutRoots(deps.dataDir),
+      sourceThreadId: args.toolSessionId,
+      turnId: args.turnId,
+      targetCwd: args.targetCwd
+    }) : forkSession({
+      cwd: args.cwd,
+      toolSessionId: args.toolSessionId,
+      messageUuid: args.messageUuid,
+      ...args.targetCwd ? { targetCwd: args.targetCwd } : {}
+    });
     deps.logger?.info("session-fork.done", {
       argCwd: args.cwd,
       sourceToolSessionId: args.toolSessionId,
@@ -70869,7 +70965,7 @@ function buildPermissionHandlers(deps) {
 }
 
 // src/handlers/history.ts
-var path81 = __toESM(require("path"), 1);
+var path83 = __toESM(require("path"), 1);
 init_protocol();
 
 // src/session/recent-dirs.ts
@@ -70887,7 +70983,7 @@ function listRecentDirs(store, limit = 50) {
 }
 
 // src/permission/persona-paths.ts
-var path80 = __toESM(require("path"), 1);
+var path82 = __toESM(require("path"), 1);
 function getAllowedPersonaIds(grants, action) {
   const ids = /* @__PURE__ */ new Set();
   for (const g3 of grants) {
@@ -70900,42 +70996,42 @@ function getAllowedPersonaIds(grants, action) {
   return ids;
 }
 function isGuestPathAllowed(grants, absPath, personaRoot, action = "read", userWorkDir) {
-  const target = path80.resolve(absPath);
+  const target = path82.resolve(absPath);
   if (userWorkDir) {
-    const u2 = path80.resolve(userWorkDir);
-    const usep = u2.endsWith(path80.sep) ? "" : path80.sep;
+    const u2 = path82.resolve(userWorkDir);
+    const usep = u2.endsWith(path82.sep) ? "" : path82.sep;
     if (target === u2 || target.startsWith(u2 + usep)) return true;
   }
-  const root = path80.resolve(personaRoot);
-  const sep4 = root.endsWith(path80.sep) ? "" : path80.sep;
+  const root = path82.resolve(personaRoot);
+  const sep4 = root.endsWith(path82.sep) ? "" : path82.sep;
   if (!target.startsWith(root + sep4)) return false;
-  const rel = path80.relative(root, target);
+  const rel = path82.relative(root, target);
   if (!rel || rel.startsWith("..")) return false;
-  const personaId2 = rel.split(path80.sep)[0];
+  const personaId2 = rel.split(path82.sep)[0];
   if (!personaId2) return false;
   const allowed = getAllowedPersonaIds(grants, action);
   if (allowed === "*") return true;
   return allowed.has(personaId2);
 }
 function personaIdFromPath(absPath, personaRoot) {
-  const root = path80.resolve(personaRoot);
-  const target = path80.resolve(absPath);
-  const sep4 = root.endsWith(path80.sep) ? "" : path80.sep;
+  const root = path82.resolve(personaRoot);
+  const target = path82.resolve(absPath);
+  const sep4 = root.endsWith(path82.sep) ? "" : path82.sep;
   if (!target.startsWith(root + sep4)) return null;
-  const rel = path80.relative(root, target);
+  const rel = path82.relative(root, target);
   if (!rel || rel.startsWith("..")) return null;
-  const id = rel.split(path80.sep)[0];
+  const id = rel.split(path82.sep)[0];
   return id || null;
 }
 function isPathWithin(dir, absPath) {
-  const d2 = path80.resolve(dir);
-  const t2 = path80.resolve(absPath);
-  const sep4 = d2.endsWith(path80.sep) ? "" : path80.sep;
+  const d2 = path82.resolve(dir);
+  const t2 = path82.resolve(absPath);
+  const sep4 = d2.endsWith(path82.sep) ? "" : path82.sep;
   return t2 === d2 || t2.startsWith(d2 + sep4);
 }
 function isPathInGuestBoundary(personaRoot, personaId2, userWorkDir, absPath) {
   if (userWorkDir && isPathWithin(userWorkDir, absPath)) return true;
-  return personaIdFromPath(path80.resolve(absPath), personaRoot) === personaId2;
+  return personaIdFromPath(path82.resolve(absPath), personaRoot) === personaId2;
 }
 
 // src/handlers/history.ts
@@ -70961,6 +71057,7 @@ function slimHistoryMessages(messages) {
     if (m3.isSidechain !== void 0) out.isSidechain = m3.isSidechain;
     if (m3.askQuestionAnswers !== void 0) out.askQuestionAnswers = m3.askQuestionAnswers;
     if (m3.durationMs !== void 0) out.durationMs = m3.durationMs;
+    if (m3.turnId !== void 0) out.turnId = m3.turnId;
     const isErrorPair = m3.toolUseId !== void 0 && errorToolUseIds.has(m3.toolUseId);
     if (m3.kind === "tool_call" && isErrorPair && m3.input !== void 0) out.input = m3.input;
     if (m3.kind === "tool_result" && m3.error !== void 0 && m3.output !== void 0) out.output = m3.output;
@@ -70988,7 +71085,7 @@ function buildHistoryHandlers(deps) {
         if (!pid) return false;
         return isGuestPathAllowed(
           ctx.grants,
-          path81.join(personaRoot, pid),
+          path83.join(personaRoot, pid),
           personaRoot,
           "read",
           userWorkDir
@@ -71000,7 +71097,7 @@ function buildHistoryHandlers(deps) {
   };
   const list = async (frame, _client, ctx) => {
     const args = HistoryListArgs.parse(frame);
-    assertGuestPath(ctx, path81.resolve(args.projectPath), personaRoot, "history:list", usersRoot);
+    assertGuestPath(ctx, path83.resolve(args.projectPath), personaRoot, "history:list", usersRoot);
     const sessions = await history.listSessions(args);
     return { response: { type: "history:list", sessions } };
   };
@@ -71048,14 +71145,14 @@ function buildHistoryHandlers(deps) {
   };
   const subagents = async (frame, _client, ctx) => {
     const args = HistorySubagentsArgs.parse(frame);
-    assertGuestPath(ctx, path81.resolve(args.cwd), personaRoot, "history:subagents", usersRoot);
+    assertGuestPath(ctx, path83.resolve(args.cwd), personaRoot, "history:subagents", usersRoot);
     assertGuestOwnsToolSession(ctx, args.toolSessionId, "history:subagents");
     const subs = await historyReaderForToolSession(args.toolSessionId).listSubagents(args);
     return { response: { type: "history:subagents", subagents: subs } };
   };
   const subagentRead = async (frame, _client, ctx) => {
     const args = HistorySubagentReadArgs.parse(frame);
-    assertGuestPath(ctx, path81.resolve(args.cwd), personaRoot, "history:subagent-read", usersRoot);
+    assertGuestPath(ctx, path83.resolve(args.cwd), personaRoot, "history:subagent-read", usersRoot);
     assertGuestOwnsToolSession(ctx, args.toolSessionId, "history:subagent-read");
     const res = await historyReaderForToolSession(args.toolSessionId).readSubagent(args);
     return { response: { type: "history:subagent-read", ...res } };
@@ -71065,7 +71162,7 @@ function buildHistoryHandlers(deps) {
     if (ctx?.principal.kind === "guest" && personaRoot) {
       const userWorkDir = usersRoot ? deriveUserWorkDir(ctx.principal.id, usersRoot) : void 0;
       const filtered = dirs.filter(
-        (d2) => isGuestPathAllowed(ctx.grants, path81.resolve(d2.cwd), personaRoot, "read", userWorkDir)
+        (d2) => isGuestPathAllowed(ctx.grants, path83.resolve(d2.cwd), personaRoot, "read", userWorkDir)
       );
       return { response: { type: "history:recentDirs", dirs: filtered } };
     }
@@ -71082,17 +71179,17 @@ function buildHistoryHandlers(deps) {
 }
 
 // src/handlers/projects.ts
-var fs78 = __toESM(require("fs"), 1);
+var fs79 = __toESM(require("fs"), 1);
 var os26 = __toESM(require("os"), 1);
-var path82 = __toESM(require("path"), 1);
-var import_node_child_process18 = require("child_process");
+var path84 = __toESM(require("path"), 1);
+var import_node_child_process19 = require("child_process");
 init_protocol();
-var DEFAULT_PROJECTS_ROOT = path82.join(os26.homedir(), "Documents", "ChatGPT");
+var DEFAULT_PROJECTS_ROOT = path84.join(os26.homedir(), "Documents", "ChatGPT");
 function allocateDir(root, name) {
-  let candidate = path82.join(root, name);
+  let candidate = path84.join(root, name);
   let n2 = 2;
-  while (fs78.existsSync(candidate)) {
-    candidate = path82.join(root, `${name} ${n2}`);
+  while (fs79.existsSync(candidate)) {
+    candidate = path84.join(root, `${name} ${n2}`);
     n2 += 1;
   }
   return candidate;
@@ -71120,11 +71217,11 @@ function buildProjectHandlers(deps) {
       throw new ClawdError(ERROR_CODES.INVALID_CWD, "project:reveal \u4EC5\u652F\u6301 macOS");
     }
     try {
-      if (!fs78.statSync(args.path).isDirectory()) throw new Error("not dir");
+      if (!fs79.statSync(args.path).isDirectory()) throw new Error("not dir");
     } catch {
       throw new ClawdError(ERROR_CODES.INVALID_CWD, `not a directory: ${args.path}`);
     }
-    const r2 = (0, import_node_child_process18.spawnSync)("open", ["-R", args.path], { stdio: "ignore" });
+    const r2 = (0, import_node_child_process19.spawnSync)("open", ["-R", args.path], { stdio: "ignore" });
     if (r2.status !== 0) {
       throw new ClawdError(ERROR_CODES.INVALID_CWD, `open -R \u5931\u8D25: exit ${r2.status}`);
     }
@@ -71136,7 +71233,7 @@ function buildProjectHandlers(deps) {
     let target;
     if (args.path) {
       try {
-        if (!fs78.statSync(args.path).isDirectory()) throw new Error("not dir");
+        if (!fs79.statSync(args.path).isDirectory()) throw new Error("not dir");
       } catch {
         throw new ClawdError(ERROR_CODES.INVALID_CWD, `not a directory: ${args.path}`);
       }
@@ -71144,15 +71241,15 @@ function buildProjectHandlers(deps) {
     } else {
       const name = args.name;
       try {
-        fs78.mkdirSync(root, { recursive: true });
+        fs79.mkdirSync(root, { recursive: true });
         target = allocateDir(root, name);
-        fs78.mkdirSync(target);
+        fs79.mkdirSync(target);
       } catch (err) {
         throw new ClawdError(ERROR_CODES.INVALID_CWD, `\u521B\u5EFA\u9879\u76EE\u76EE\u5F55\u5931\u8D25: ${String(err)}`);
       }
-      const git2 = (0, import_node_child_process18.spawnSync)("git", ["init"], { cwd: target, stdio: "ignore" });
+      const git2 = (0, import_node_child_process19.spawnSync)("git", ["init"], { cwd: target, stdio: "ignore" });
       if (git2.status !== 0) {
-        fs78.rmSync(target, { recursive: true, force: true });
+        fs79.rmSync(target, { recursive: true, force: true });
         throw new ClawdError(
           ERROR_CODES.INVALID_CWD,
           `git init \u5931\u8D25\uFF08${git2.error ? String(git2.error) : `exit ${git2.status}`}\uFF09: ${target}`
@@ -71177,7 +71274,7 @@ function buildProjectHandlers(deps) {
 }
 
 // src/handlers/workspace.ts
-var path83 = __toESM(require("path"), 1);
+var path85 = __toESM(require("path"), 1);
 init_protocol();
 var os27 = __toESM(require("os"), 1);
 init_protocol();
@@ -71220,22 +71317,22 @@ function buildWorkspaceHandlers(deps) {
     const args = WorkspaceListArgs.parse(frame);
     const isGuest = ctx?.principal.kind === "guest";
     const fallbackCwd = isGuest && personaRoot ? personaRoot : os27.homedir();
-    const resolvedCwd = path83.resolve(args.cwd ?? fallbackCwd);
-    const target = args.path ? path83.resolve(resolvedCwd, args.path) : resolvedCwd;
+    const resolvedCwd = path85.resolve(args.cwd ?? fallbackCwd);
+    const target = args.path ? path85.resolve(resolvedCwd, args.path) : resolvedCwd;
     assertGuestPath2(ctx, target, personaRoot, "workspace:list", usersRoot);
     const res = workspace.list({ ...args, cwd: resolvedCwd });
     return { response: { type: "workspace:list", ...res } };
   };
   const read = async (frame, _client, ctx) => {
     const args = WorkspaceReadArgs.parse(frame);
-    const target = path83.isAbsolute(args.path) ? path83.resolve(args.path) : path83.resolve(args.cwd, args.path);
+    const target = path85.isAbsolute(args.path) ? path85.resolve(args.path) : path85.resolve(args.cwd, args.path);
     assertGuestPath2(ctx, target, personaRoot, "workspace:read", usersRoot);
     const res = workspace.read(args);
     return { response: { type: "workspace:read", ...res } };
   };
   const skillsList = async (frame, _client, ctx) => {
     const args = SkillsListArgs.parse(frame);
-    const cwdAbs = path83.resolve(args.cwd);
+    const cwdAbs = path85.resolve(args.cwd);
     assertGuestPath2(ctx, cwdAbs, personaRoot, "skills:list", usersRoot);
     const list2 = await getSkillsForTool(args.tool ?? "claude", cwdAbs);
     if (ctx?.principal.kind === "guest" && personaRoot) {
@@ -71247,7 +71344,7 @@ function buildWorkspaceHandlers(deps) {
   };
   const agentsList = async (frame, _client, ctx) => {
     const args = AgentsListArgs.parse(frame);
-    const cwdAbs = path83.resolve(args.cwd);
+    const cwdAbs = path85.resolve(args.cwd);
     assertGuestPath2(ctx, cwdAbs, personaRoot, "agents:list", usersRoot);
     if (isCodexFamily(args.tool) || isPiFamily(args.tool)) {
       return { response: { type: "agents:list", agents: [] } };
@@ -71269,20 +71366,20 @@ function buildWorkspaceHandlers(deps) {
 }
 
 // src/handlers/git.ts
-var path85 = __toESM(require("path"), 1);
+var path87 = __toESM(require("path"), 1);
 init_protocol();
 init_protocol();
 
 // src/workspace/git.ts
-var import_node_child_process19 = require("child_process");
-var import_node_fs61 = __toESM(require("fs"), 1);
-var import_node_path67 = __toESM(require("path"), 1);
+var import_node_child_process20 = require("child_process");
+var import_node_fs62 = __toESM(require("fs"), 1);
+var import_node_path69 = __toESM(require("path"), 1);
 var import_node_util2 = require("util");
-var pexec = (0, import_node_util2.promisify)(import_node_child_process19.execFile);
+var pexec = (0, import_node_util2.promisify)(import_node_child_process20.execFile);
 function normalizePath(p3) {
-  const resolved = import_node_path67.default.resolve(p3);
+  const resolved = import_node_path69.default.resolve(p3);
   try {
-    return import_node_fs61.default.realpathSync(resolved);
+    return import_node_fs62.default.realpathSync(resolved);
   } catch {
     return resolved;
   }
@@ -71356,7 +71453,7 @@ async function listGitBranches(cwd) {
 function assertGuestCwd(ctx, cwd, personaRoot, method, usersRoot) {
   if (!ctx || ctx.principal.kind !== "guest" || !personaRoot) return;
   const userWorkDir = usersRoot ? deriveUserWorkDir(ctx.principal.id, usersRoot) : void 0;
-  if (!isGuestPathAllowed(ctx.grants, path85.resolve(cwd), personaRoot, "read", userWorkDir)) {
+  if (!isGuestPathAllowed(ctx.grants, path87.resolve(cwd), personaRoot, "read", userWorkDir)) {
     throw new ClawdError(
       ERROR_CODES.UNAUTHORIZED,
       `guest ${ctx.principal.id} cannot ${method} cwd ${cwd}`
@@ -71408,7 +71505,7 @@ function buildCapabilitiesHandlers(deps) {
 init_protocol();
 
 // src/tools/version-probe.ts
-var import_node_child_process20 = require("child_process");
+var import_node_child_process21 = require("child_process");
 init_claude();
 init_protocol();
 function parseVersionOutput(out) {
@@ -71416,7 +71513,7 @@ function parseVersionOutput(out) {
 }
 function execVersion(bin) {
   return new Promise((resolve9, reject) => {
-    (0, import_node_child_process20.execFile)(bin, ["--version"], { timeout: 5e3 }, (err, stdout) => {
+    (0, import_node_child_process21.execFile)(bin, ["--version"], { timeout: 5e3 }, (err, stdout) => {
       if (err) reject(err);
       else resolve9(String(stdout));
     });
@@ -71449,7 +71546,7 @@ async function probeToolVersions(opts = {}) {
 }
 
 // src/tools/pool-connect.ts
-var import_node_child_process21 = require("child_process");
+var import_node_child_process22 = require("child_process");
 init_protocol();
 var POOL_SETUP_SCRIPT_PATH = "/api/setup.sh";
 var POOL_SCRIPT_FETCH_TIMEOUT_MS = 5e3;
@@ -71475,7 +71572,7 @@ async function fetchScript(deps) {
 }
 function runScript(script, apiKey, deps) {
   return new Promise((resolve9, reject) => {
-    const proc = (0, import_node_child_process21.spawn)("bash", ["-s"], {
+    const proc = (0, import_node_child_process22.spawn)("bash", ["-s"], {
       env: { ...deps.env ?? process.env, CPA_KEY: apiKey, CPA_MODE: "api" },
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -71520,7 +71617,7 @@ function runScript(script, apiKey, deps) {
 }
 
 // src/tools/claude-auth-status.ts
-var import_node_child_process22 = require("child_process");
+var import_node_child_process23 = require("child_process");
 var str5 = (v3) => typeof v3 === "string" && v3 ? v3 : void 0;
 function mapClaudeAuthStatus(raw) {
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
@@ -71543,7 +71640,7 @@ function mapClaudeAuthStatus(raw) {
   };
 }
 async function queryClaudeAuthStatus(deps = {}) {
-  const run = deps.execFileImpl ?? import_node_child_process22.execFile;
+  const run = deps.execFileImpl ?? import_node_child_process23.execFile;
   const env = deps.env ?? process.env;
   const bin = env.CLAUDE_BIN ?? "claude";
   const stdout = await new Promise((resolve9, reject) => {
@@ -71613,12 +71710,12 @@ async function queryCodexAccount(deps = {}) {
 }
 
 // src/tools/pi-account.ts
-var import_node_fs62 = __toESM(require("fs"), 1);
-var import_node_path68 = __toESM(require("path"), 1);
+var import_node_fs63 = __toESM(require("fs"), 1);
+var import_node_path70 = __toESM(require("path"), 1);
 function readPiCredentials(agentDir) {
   let raw;
   try {
-    raw = JSON.parse(import_node_fs62.default.readFileSync(import_node_path68.default.join(agentDir, "auth.json"), "utf8"));
+    raw = JSON.parse(import_node_fs63.default.readFileSync(import_node_path70.default.join(agentDir, "auth.json"), "utf8"));
   } catch {
     return {};
   }
@@ -71701,15 +71798,10 @@ function buildEngineHandlers(deps, overrides = {}) {
   return { "engine:status": status, "engine:connectPool": connectPool };
 }
 
-// src/handlers/channels.ts
-var import_node_fs64 = __toESM(require("fs"), 1);
-var import_node_os26 = __toESM(require("os"), 1);
-var import_node_path70 = __toESM(require("path"), 1);
-
 // src/tools/subscription-channels-apply.ts
-var import_node_fs63 = __toESM(require("fs"), 1);
+var import_node_fs64 = __toESM(require("fs"), 1);
 var import_node_os25 = __toESM(require("os"), 1);
-var import_node_path69 = __toESM(require("path"), 1);
+var import_node_path71 = __toESM(require("path"), 1);
 var TABLE_HEADER = /^\s*\[\[?\s*([A-Za-z0-9_.-]+)\s*\]\]?\s*(?:#.*)?$/;
 var KEY_LINE = /^\s*([A-Za-z0-9_.-]+)\s*=/;
 function stripCodexProvider(text) {
@@ -71737,10 +71829,10 @@ function stripCodexProvider(text) {
   return out.join("\n").trim();
 }
 function applyCodexSubscriptionChannel(opts) {
-  const codexHome = opts.codexHome || process.env.CODEX_HOME || import_node_path69.default.join(import_node_os25.default.homedir(), ".codex");
-  import_node_fs63.default.mkdirSync(codexHome, { recursive: true });
-  const configFile = import_node_path69.default.join(codexHome, "config.toml");
-  const original = import_node_fs63.default.existsSync(configFile) ? import_node_fs63.default.readFileSync(configFile, "utf8") : "";
+  const codexHome = opts.codexHome || process.env.CODEX_HOME || import_node_path71.default.join(import_node_os25.default.homedir(), ".codex");
+  import_node_fs64.default.mkdirSync(codexHome, { recursive: true });
+  const configFile = import_node_path71.default.join(codexHome, "config.toml");
+  const original = import_node_fs64.default.existsSync(configFile) ? import_node_fs64.default.readFileSync(configFile, "utf8") : "";
   const rest = stripCodexProvider(original);
   let content;
   if (opts.channel) {
@@ -71764,38 +71856,25 @@ function applyCodexSubscriptionChannel(opts) {
     ].join("\n");
   }
   const tmpFile = `${configFile}.tmp.${Date.now()}`;
-  import_node_fs63.default.writeFileSync(tmpFile, content, { mode: 384 });
-  import_node_fs63.default.renameSync(tmpFile, configFile);
+  import_node_fs64.default.writeFileSync(tmpFile, content, { mode: 384 });
+  import_node_fs64.default.renameSync(tmpFile, configFile);
 }
 function applyPiSubscriptionChannel(opts) {
-  const agentDir = opts.agentDir || process.env.PI_CODING_AGENT_DIR || import_node_path69.default.join(import_node_os25.default.homedir(), ".pi", "agent");
-  if (!import_node_fs63.default.existsSync(agentDir)) return false;
-  const configFile = import_node_path69.default.join(agentDir, "cliproxyapi.json");
+  const agentDir = opts.agentDir || process.env.PI_CODING_AGENT_DIR || import_node_path71.default.join(import_node_os25.default.homedir(), ".pi", "agent");
+  if (!import_node_fs64.default.existsSync(agentDir)) return false;
+  const configFile = import_node_path71.default.join(agentDir, "cliproxyapi.json");
   if (opts.channel) {
     const data = { baseUrl: opts.channel.baseUrl, apiKey: opts.channel.apiKey };
     const tmp = `${configFile}.tmp.${Date.now()}`;
-    import_node_fs63.default.writeFileSync(tmp, JSON.stringify(data, null, 2) + "\n", { mode: 384 });
-    import_node_fs63.default.renameSync(tmp, configFile);
+    import_node_fs64.default.writeFileSync(tmp, JSON.stringify(data, null, 2) + "\n", { mode: 384 });
+    import_node_fs64.default.renameSync(tmp, configFile);
     return true;
   }
   return false;
 }
 
 // src/handlers/channels.ts
-function snapshotFile(file) {
-  const original = import_node_fs64.default.existsSync(file) ? import_node_fs64.default.readFileSync(file) : null;
-  return () => {
-    if (original === null) {
-      import_node_fs64.default.rmSync(file, { force: true });
-    } else {
-      const tmp = `${file}.tmp.${Date.now()}`;
-      import_node_fs64.default.writeFileSync(tmp, original, { mode: 384 });
-      import_node_fs64.default.renameSync(tmp, file);
-    }
-  };
-}
 function buildChannelsHandlers(deps) {
-  let activationQueue = Promise.resolve();
   const get = async () => {
     return { response: deps.store.list() };
   };
@@ -71824,37 +71903,13 @@ function buildChannelsHandlers(deps) {
     }
     return { response: { ok: true } };
   };
-  const activate = async (frame, context) => {
-    const run = activationQueue.then(() => activateChannel(frame, context));
-    activationQueue = run.then(() => {
-    }, () => {
-    });
-    return run;
-  };
-  const activateChannel = async (frame) => {
+  const activate = async (frame) => {
     const args = parseArgs2(SubscriptionChannelActivateArgsSchema, frame, "subscriptionChannel:activate");
-    const channel = args.id === null ? null : deps.store.get(args.id);
-    if (args.id !== null && !channel) throw new Error(`\u901A\u9053 ${args.id} \u4E0D\u5B58\u5728`);
-    const codexHome = deps.codexHome || process.env.CODEX_HOME || import_node_path70.default.join(import_node_os26.default.homedir(), ".codex");
-    const agentDir = deps.agentDir || process.env.PI_CODING_AGENT_DIR || import_node_path70.default.join(import_node_os26.default.homedir(), ".pi", "agent");
-    const restoreCodex = snapshotFile(import_node_path70.default.join(codexHome, "config.toml"));
-    const restorePi = import_node_fs64.default.existsSync(agentDir) ? snapshotFile(import_node_path70.default.join(agentDir, "cliproxyapi.json")) : null;
-    let refreshed = false;
-    try {
-      applyCodexSubscriptionChannel({ codexHome, channel });
-      if (channel) await deps.manager.getCapabilities("codex", { refresh: true });
-      refreshed = Boolean(channel);
-      applyPiSubscriptionChannel({ agentDir, channel });
-      deps.store.setActive(args.id);
-    } catch (err) {
-      restoreCodex();
-      restorePi?.();
-      if (refreshed) await deps.manager.getCapabilities("codex", { refresh: true }).catch(() => {
-      });
-      if (channel?.id === "default-pool" && err instanceof Error && /HTTP 401/.test(err.message)) {
-        throw new Error("\u9ED8\u8BA4\u53F7\u6C60\u8BA4\u8BC1\u5931\u8D25\uFF08HTTP 401\uFF09\uFF1A\u8BF7\u7F16\u8F91\u300C\u9ED8\u8BA4\u56E2\u961F\u53F7\u6C60\u300D\u5E76\u91CD\u65B0\u586B\u5199\u53F7\u6C60 API Key\uFF0C\u518D\u8BBE\u4E3A\u5F53\u524D\u3002");
-      }
-      throw err;
+    const channel = deps.store.setActive(args.id);
+    applyCodexSubscriptionChannel({ codexHome: deps.codexHome, channel });
+    applyPiSubscriptionChannel({ agentDir: deps.agentDir, channel });
+    if (channel) {
+      await deps.manager.getCapabilities("codex", { refresh: true });
     }
     return { response: { ok: true } };
   };
@@ -72500,7 +72555,7 @@ function buildDashboardHandlers(deps) {
 }
 
 // src/handlers/meta.ts
-var import_node_os27 = __toESM(require("os"), 1);
+var import_node_os26 = __toESM(require("os"), 1);
 init_protocol();
 
 // src/handlers/method-grants.ts
@@ -72820,21 +72875,21 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.593".length > 0 ? "0.2.593" : "dev";
+var version = "0.2.595".length > 0 ? "0.2.595" : "dev";
 
 // src/cli-probe/probe.ts
 var fs83 = __toESM(require("fs"), 1);
-var path89 = __toESM(require("path"), 1);
+var path90 = __toESM(require("path"), 1);
 var PKG_NAME = "@clawos-dev/clawd";
 var BIN_NAME = "clawd";
 var MAX_PARENT_HOPS = 5;
 function probeGlobalCli(pathEnv) {
   if (!pathEnv) return null;
-  for (const dir of pathEnv.split(path89.delimiter)) {
+  for (const dir of pathEnv.split(path90.delimiter)) {
     if (!dir) continue;
     let real;
     try {
-      real = fs83.realpathSync(path89.join(dir, BIN_NAME));
+      real = fs83.realpathSync(path90.join(dir, BIN_NAME));
     } catch {
       continue;
     }
@@ -72844,15 +72899,15 @@ function probeGlobalCli(pathEnv) {
   return null;
 }
 function readOwnPackageVersion(entryPath) {
-  let dir = path89.dirname(entryPath);
+  let dir = path90.dirname(entryPath);
   for (let i2 = 0; i2 < MAX_PARENT_HOPS; i2++) {
     try {
-      const raw = fs83.readFileSync(path89.join(dir, "package.json"), "utf8");
+      const raw = fs83.readFileSync(path90.join(dir, "package.json"), "utf8");
       const pkg = JSON.parse(raw);
       if (pkg.name !== PKG_NAME) return null;
       return typeof pkg.version === "string" && pkg.version ? pkg.version : null;
     } catch {
-      const parent = path89.dirname(dir);
+      const parent = path90.dirname(dir);
       if (parent === dir) return null;
       dir = parent;
     }
@@ -72888,7 +72943,7 @@ function buildReadyFrame(deps, client) {
   return {
     version,
     protocolVersion: PROTOCOL_VERSION,
-    hostname: import_node_os27.default.hostname(),
+    hostname: import_node_os26.default.hostname(),
     os: process.platform,
     tools,
     runningSessions: info.runningSessions,
@@ -73028,7 +73083,7 @@ function buildPersonaHandlers(deps) {
 }
 
 // src/handlers/attachment.ts
-var import_node_path71 = __toESM(require("path"), 1);
+var import_node_path72 = __toESM(require("path"), 1);
 init_protocol();
 init_protocol();
 function assertGuestAttachmentPath(ctx, absPath, personaRoot, method, usersRoot) {
@@ -73107,12 +73162,12 @@ function buildAttachmentHandlers(deps) {
         `session ${args.sessionId} scope unresolved`
       );
     }
-    const cwdAbs = import_node_path71.default.resolve(sessionFile.cwd);
-    const candidateAbs = import_node_path71.default.isAbsolute(args.relPath) ? import_node_path71.default.resolve(args.relPath) : import_node_path71.default.resolve(cwdAbs, args.relPath);
+    const cwdAbs = import_node_path72.default.resolve(sessionFile.cwd);
+    const candidateAbs = import_node_path72.default.isAbsolute(args.relPath) ? import_node_path72.default.resolve(args.relPath) : import_node_path72.default.resolve(cwdAbs, args.relPath);
     guardAttachmentPath(ctx, args.sessionId, candidateAbs, "attachment.signUrl", "group-acl");
     const entries = deps.groupFileStore.list(scope, args.sessionId);
     const entry = entries.find((e) => {
-      const storedAbs = import_node_path71.default.isAbsolute(e.relPath) ? import_node_path71.default.resolve(e.relPath) : import_node_path71.default.resolve(cwdAbs, e.relPath);
+      const storedAbs = import_node_path72.default.isAbsolute(e.relPath) ? import_node_path72.default.resolve(e.relPath) : import_node_path72.default.resolve(cwdAbs, e.relPath);
       return storedAbs === candidateAbs && !e.stale;
     });
     if (!entry) {
@@ -73136,7 +73191,7 @@ function buildAttachmentHandlers(deps) {
     if (!ctx || ctx.principal.kind !== "guest" || !deps.personaRoot || !deps.sessionStore) return;
     const f2 = deps.sessionStore.read(sessionId);
     if (!f2) return;
-    assertGuestAttachmentPath(ctx, import_node_path71.default.resolve(f2.cwd), deps.personaRoot, method, deps.usersRoot);
+    assertGuestAttachmentPath(ctx, import_node_path72.default.resolve(f2.cwd), deps.personaRoot, method, deps.usersRoot);
   }
   const groupAdd = async (frame, _client, ctx) => {
     if (!deps.groupFileStore || !deps.getSessionScope) {
@@ -73151,8 +73206,8 @@ function buildAttachmentHandlers(deps) {
     if (!scope) {
       throw new ClawdError(ERROR_CODES.VALIDATION_ERROR, `session ${args.sessionId} not found`);
     }
-    const cwdAbs = import_node_path71.default.resolve(deps.sessionStore?.read(args.sessionId)?.cwd ?? ".");
-    const candidateAbs = import_node_path71.default.isAbsolute(args.relPath) ? import_node_path71.default.resolve(args.relPath) : import_node_path71.default.resolve(cwdAbs, args.relPath);
+    const cwdAbs = import_node_path72.default.resolve(deps.sessionStore?.read(args.sessionId)?.cwd ?? ".");
+    const candidateAbs = import_node_path72.default.isAbsolute(args.relPath) ? import_node_path72.default.resolve(args.relPath) : import_node_path72.default.resolve(cwdAbs, args.relPath);
     guardAttachmentPath(ctx, args.sessionId, candidateAbs, "attachment.groupAdd", "cwd-subtree");
     const from = args.origin === "agent" ? "agent" : ctx?.principal.kind === "owner" ? "owner" : "agent";
     const size = 0;
@@ -73211,19 +73266,19 @@ function buildAttachmentHandlers(deps) {
 
 // src/handlers/extension.ts
 var import_promises15 = __toESM(require("fs/promises"), 1);
-var import_node_path76 = __toESM(require("path"), 1);
+var import_node_path77 = __toESM(require("path"), 1);
 init_protocol();
 
 // src/extension/bundle-zip.ts
 var import_promises12 = __toESM(require("fs/promises"), 1);
-var import_node_path72 = __toESM(require("path"), 1);
+var import_node_path73 = __toESM(require("path"), 1);
 var import_node_crypto22 = __toESM(require("crypto"), 1);
 var import_jszip2 = __toESM(require_lib3(), 1);
 async function bundleExtensionDir(dir) {
   const entries = await listFilesSorted(dir);
   const zip = new import_jszip2.default();
   for (const rel of entries) {
-    const abs = import_node_path72.default.join(dir, rel);
+    const abs = import_node_path73.default.join(dir, rel);
     const content = await import_promises12.default.readFile(abs);
     zip.file(rel, content, { date: FIXED_DATE });
   }
@@ -73244,7 +73299,7 @@ async function listFilesSorted(rootDir) {
   return out;
 }
 async function walk(absRoot, relPrefix, out) {
-  const dirAbs = import_node_path72.default.join(absRoot, relPrefix);
+  const dirAbs = import_node_path73.default.join(absRoot, relPrefix);
   const entries = await import_promises12.default.readdir(dirAbs, { withFileTypes: true });
   for (const e of entries) {
     if (IGNORE_BASENAMES.has(e.name)) continue;
@@ -73298,25 +73353,25 @@ function computePublishCheck(args) {
 
 // src/extension/install-flow.ts
 var import_promises13 = __toESM(require("fs/promises"), 1);
-var import_node_path74 = __toESM(require("path"), 1);
-var import_node_os29 = __toESM(require("os"), 1);
+var import_node_path75 = __toESM(require("path"), 1);
+var import_node_os28 = __toESM(require("os"), 1);
 var import_node_crypto23 = __toESM(require("crypto"), 1);
 var import_jszip3 = __toESM(require_lib3(), 1);
 
 // src/extension/paths.ts
-var import_node_os28 = __toESM(require("os"), 1);
-var import_node_path73 = __toESM(require("path"), 1);
+var import_node_os27 = __toESM(require("os"), 1);
+var import_node_path74 = __toESM(require("path"), 1);
 function clawdHomeRoot(override) {
-  return override ?? process.env.CLAWD_HOME ?? import_node_path73.default.join(import_node_os28.default.homedir(), ".clawd");
+  return override ?? process.env.CLAWD_HOME ?? import_node_path74.default.join(import_node_os27.default.homedir(), ".clawd");
 }
 function extensionsRoot(override) {
-  return import_node_path73.default.join(clawdHomeRoot(override), "extensions");
+  return import_node_path74.default.join(clawdHomeRoot(override), "extensions");
 }
 function publishedChannelsFile(override) {
-  return import_node_path73.default.join(clawdHomeRoot(override), "extensions-published.json");
+  return import_node_path74.default.join(clawdHomeRoot(override), "extensions-published.json");
 }
 function bundleCacheRoot(override) {
-  return import_node_path73.default.join(clawdHomeRoot(override), "extension-bundles");
+  return import_node_path74.default.join(clawdHomeRoot(override), "extension-bundles");
 }
 
 // src/extension/install-flow.ts
@@ -73343,7 +73398,7 @@ async function installFromChannel(args, deps) {
     throw new InstallError("ZIP_INVALID", `failed to load zip: ${e.message}`);
   }
   for (const name of Object.keys(zip.files)) {
-    if (name.includes("..") || name.startsWith("/") || import_node_path74.default.isAbsolute(name)) {
+    if (name.includes("..") || name.startsWith("/") || import_node_path75.default.isAbsolute(name)) {
       throw new InstallError("ZIP_INVALID", `unsafe zip entry: ${name}`);
     }
   }
@@ -73375,7 +73430,7 @@ async function installFromChannel(args, deps) {
     );
   }
   const localExtId = namespacedExtId(ownerSlug, channelRef.ownerPrincipalId);
-  const destDir = import_node_path74.default.join(deps.extensionsRoot, localExtId);
+  const destDir = import_node_path75.default.join(deps.extensionsRoot, localExtId);
   let destExists = false;
   try {
     await import_promises13.default.access(destDir);
@@ -73389,16 +73444,16 @@ async function installFromChannel(args, deps) {
     );
   }
   const stage = await import_promises13.default.mkdtemp(
-    import_node_path74.default.join(import_node_os29.default.tmpdir(), `clawd-ext-install-${localExtId}-`)
+    import_node_path75.default.join(import_node_os28.default.tmpdir(), `clawd-ext-install-${localExtId}-`)
   );
   try {
     for (const [name, entry] of Object.entries(zip.files)) {
-      const dest = import_node_path74.default.join(stage, name);
+      const dest = import_node_path75.default.join(stage, name);
       if (entry.dir) {
         await import_promises13.default.mkdir(dest, { recursive: true });
         continue;
       }
-      await import_promises13.default.mkdir(import_node_path74.default.dirname(dest), { recursive: true });
+      await import_promises13.default.mkdir(import_node_path75.default.dirname(dest), { recursive: true });
       if (name === "manifest.json") {
         const rewritten = { ...parsed.data, id: localExtId };
         await import_promises13.default.writeFile(dest, JSON.stringify(rewritten, null, 2));
@@ -73419,8 +73474,8 @@ async function installFromChannel(args, deps) {
 
 // src/extension/update-flow.ts
 var import_promises14 = __toESM(require("fs/promises"), 1);
-var import_node_path75 = __toESM(require("path"), 1);
-var import_node_os30 = __toESM(require("os"), 1);
+var import_node_path76 = __toESM(require("path"), 1);
+var import_node_os29 = __toESM(require("os"), 1);
 var import_node_crypto24 = __toESM(require("crypto"), 1);
 var import_jszip4 = __toESM(require_lib3(), 1);
 var UpdateError = class extends Error {
@@ -73436,11 +73491,11 @@ async function updateFromChannel(args, deps) {
     channelRef.extId,
     channelRef.ownerPrincipalId
   );
-  const liveDir = import_node_path75.default.join(deps.extensionsRoot, localExtId);
+  const liveDir = import_node_path76.default.join(deps.extensionsRoot, localExtId);
   const prevDir = `${liveDir}.prev`;
   let existingVersion;
   try {
-    const raw = await import_promises14.default.readFile(import_node_path75.default.join(liveDir, "manifest.json"), "utf8");
+    const raw = await import_promises14.default.readFile(import_node_path76.default.join(liveDir, "manifest.json"), "utf8");
     const parsed2 = ExtensionManifestSchema.safeParse(JSON.parse(raw));
     if (!parsed2.success) {
       throw new UpdateError(
@@ -73473,7 +73528,7 @@ async function updateFromChannel(args, deps) {
     throw new UpdateError("ZIP_INVALID", `failed to load zip: ${e.message}`);
   }
   for (const name of Object.keys(zip.files)) {
-    if (name.includes("..") || name.startsWith("/") || import_node_path75.default.isAbsolute(name)) {
+    if (name.includes("..") || name.startsWith("/") || import_node_path76.default.isAbsolute(name)) {
       throw new UpdateError("ZIP_INVALID", `unsafe zip entry: ${name}`);
     }
   }
@@ -73508,16 +73563,16 @@ async function updateFromChannel(args, deps) {
   await import_promises14.default.rm(prevDir, { recursive: true, force: true });
   await import_promises14.default.rename(liveDir, prevDir);
   const stage = await import_promises14.default.mkdtemp(
-    import_node_path75.default.join(import_node_os30.default.tmpdir(), `clawd-ext-update-${localExtId}-`)
+    import_node_path76.default.join(import_node_os29.default.tmpdir(), `clawd-ext-update-${localExtId}-`)
   );
   try {
     for (const [name, entry] of Object.entries(zip.files)) {
-      const dest = import_node_path75.default.join(stage, name);
+      const dest = import_node_path76.default.join(stage, name);
       if (entry.dir) {
         await import_promises14.default.mkdir(dest, { recursive: true });
         continue;
       }
-      await import_promises14.default.mkdir(import_node_path75.default.dirname(dest), { recursive: true });
+      await import_promises14.default.mkdir(import_node_path76.default.dirname(dest), { recursive: true });
       if (name === "manifest.json") {
         const rewritten = { ...parsed.data, id: localExtId };
         await import_promises14.default.writeFile(dest, JSON.stringify(rewritten, null, 2));
@@ -73584,7 +73639,7 @@ async function rewriteManifestVersion(root, extId, newVersion, previousPublished
       );
     }
   }
-  const manifestPath = import_node_path76.default.join(root, extId, "manifest.json");
+  const manifestPath = import_node_path77.default.join(root, extId, "manifest.json");
   const manifest = await readManifest(root, extId);
   const next = { ...manifest, version: newVersion };
   const tmp = `${manifestPath}.tmp`;
@@ -73592,7 +73647,7 @@ async function rewriteManifestVersion(root, extId, newVersion, previousPublished
   await import_promises15.default.rename(tmp, manifestPath);
 }
 async function readManifest(root, extId) {
-  const file = import_node_path76.default.join(root, extId, "manifest.json");
+  const file = import_node_path77.default.join(root, extId, "manifest.json");
   let raw;
   try {
     raw = await import_promises15.default.readFile(file, "utf8");
@@ -73676,7 +73731,7 @@ function buildExtensionHandlers(deps) {
   };
   async function buildSnapshotMeta(extId) {
     const manifest = await readManifest(deps.root, extId);
-    const { sha256, buffer } = await bundleExtensionDir(import_node_path76.default.join(deps.root, extId));
+    const { sha256, buffer } = await bundleExtensionDir(import_node_path77.default.join(deps.root, extId));
     return { manifest, contentHash: sha256, buffer };
   }
   const publish = async (frame, _client, ctx) => {
@@ -74504,7 +74559,7 @@ function buildVisitorHandlers(deps) {
 
 // src/extension/registry.ts
 var import_promises17 = __toESM(require("fs/promises"), 1);
-var import_node_path77 = __toESM(require("path"), 1);
+var import_node_path78 = __toESM(require("path"), 1);
 async function loadAll(root) {
   let entries;
   try {
@@ -74517,13 +74572,13 @@ async function loadAll(root) {
   for (const ent of entries) {
     if (!ent.isDirectory()) continue;
     if (ent.name.startsWith(".")) continue;
-    records.push(await loadOne(import_node_path77.default.join(root, ent.name), ent.name));
+    records.push(await loadOne(import_node_path78.default.join(root, ent.name), ent.name));
   }
   records.sort((a2, b3) => a2.extId < b3.extId ? -1 : a2.extId > b3.extId ? 1 : 0);
   return records;
 }
 async function loadOne(dir, dirName) {
-  const manifestPath = import_node_path77.default.join(dir, "manifest.json");
+  const manifestPath = import_node_path78.default.join(dir, "manifest.json");
   let raw;
   try {
     raw = await import_promises17.default.readFile(manifestPath, "utf8");
@@ -74568,7 +74623,7 @@ async function loadOne(dir, dirName) {
 
 // src/extension/uninstall.ts
 var import_promises18 = __toESM(require("fs/promises"), 1);
-var import_node_path78 = __toESM(require("path"), 1);
+var import_node_path79 = __toESM(require("path"), 1);
 var UninstallError = class extends Error {
   constructor(code, message) {
     super(message);
@@ -74577,7 +74632,7 @@ var UninstallError = class extends Error {
   code;
 };
 async function uninstall(deps) {
-  const dir = import_node_path78.default.join(deps.root, deps.extId);
+  const dir = import_node_path79.default.join(deps.root, deps.extId);
   try {
     await import_promises18.default.access(dir);
   } catch {
@@ -74594,15 +74649,15 @@ var import_node_crypto25 = require("crypto");
 init_protocol();
 
 // src/peer-ops/run-command.ts
-var import_node_child_process23 = require("child_process");
-var import_node_os31 = __toESM(require("os"), 1);
+var import_node_child_process24 = require("child_process");
+var import_node_os30 = __toESM(require("os"), 1);
 var DEFAULT_TIMEOUT_MS6 = 3e4;
 var MAX_TIMEOUT_MS = 3e5;
 var MAX_OUTPUT_BYTES = 1048576;
 function runCommand2(command, opts = {}) {
   const timeoutMs = Math.min(opts.timeoutMs ?? DEFAULT_TIMEOUT_MS6, MAX_TIMEOUT_MS);
   return new Promise((resolve9) => {
-    const child = (0, import_node_child_process23.spawn)("bash", ["-c", command], { cwd: import_node_os31.default.homedir() });
+    const child = (0, import_node_child_process24.spawn)("bash", ["-c", command], { cwd: import_node_os30.default.homedir() });
     const out = [];
     const err = [];
     let outBytes = 0;
@@ -74795,7 +74850,7 @@ function buildMethodHandlers(deps) {
       broadcast: deps.broadcastToOwners
     }),
     ...buildMasterHandlers({
-      authorityTablePath: import_node_path79.default.join(deps.masterDataDir, "master-authority.json")
+      authorityTablePath: import_node_path80.default.join(deps.masterDataDir, "master-authority.json")
     }),
     ...buildTopicHandlers({
       topicStore: deps.topicStore,
@@ -74937,8 +74992,8 @@ async function dispatchRpc(method, frame, client, ctx, deps) {
 }
 
 // src/extension/runtime.ts
-var import_node_child_process24 = require("child_process");
-var import_node_path80 = __toESM(require("path"), 1);
+var import_node_child_process25 = require("child_process");
+var import_node_path81 = __toESM(require("path"), 1);
 var import_promises19 = require("timers/promises");
 
 // src/extension/port-allocator.ts
@@ -75039,13 +75094,13 @@ var Runtime = class {
       /\$CLAWOS_EXT_PORT/g,
       String(port)
     );
-    const dir = import_node_path80.default.join(this.root, extId);
+    const dir = import_node_path81.default.join(this.root, extId);
     const env = {
       ...process.env,
       CLAWOS_EXT_PORT: String(port),
       CLAWOS_EXT_ID: extId
     };
-    const child = (0, import_node_child_process24.spawn)("sh", ["-c", cmd], {
+    const child = (0, import_node_child_process25.spawn)("sh", ["-c", cmd], {
       cwd: dir,
       env,
       stdio: ["ignore", "pipe", "pipe"],
@@ -75151,7 +75206,7 @@ ${handle.stderrTail}`
 
 // src/extension/published-channels.ts
 var import_promises20 = __toESM(require("fs/promises"), 1);
-var import_node_path81 = __toESM(require("path"), 1);
+var import_node_path82 = __toESM(require("path"), 1);
 init_zod();
 var PublishedChannelsError = class extends Error {
   constructor(code, message) {
@@ -75250,7 +75305,7 @@ var PublishedChannelStore = class {
       )
     };
     const tmp = `${this.filePath}.tmp`;
-    await import_promises20.default.mkdir(import_node_path81.default.dirname(this.filePath), { recursive: true });
+    await import_promises20.default.mkdir(import_node_path82.default.dirname(this.filePath), { recursive: true });
     await import_promises20.default.writeFile(tmp, JSON.stringify(data, null, 2), { mode: 384 });
     await import_promises20.default.rename(tmp, this.filePath);
   }
@@ -75258,7 +75313,7 @@ var PublishedChannelStore = class {
 
 // src/extension/bundle-cache.ts
 var import_promises21 = __toESM(require("fs/promises"), 1);
-var import_node_path82 = __toESM(require("path"), 1);
+var import_node_path83 = __toESM(require("path"), 1);
 var BundleCache = class {
   constructor(rootDir) {
     this.rootDir = rootDir;
@@ -75267,14 +75322,14 @@ var BundleCache = class {
   /** Atomic write: stage tmp → rename. Caller passes the hex sha256. */
   async write(snapshotHash, buffer) {
     await import_promises21.default.mkdir(this.rootDir, { recursive: true });
-    const file = import_node_path82.default.join(this.rootDir, `${snapshotHash}.zip`);
+    const file = import_node_path83.default.join(this.rootDir, `${snapshotHash}.zip`);
     const tmp = `${file}.tmp`;
     await import_promises21.default.writeFile(tmp, buffer, { mode: 384 });
     await import_promises21.default.rename(tmp, file);
   }
   /** Returns the bundle bytes, or null when the file doesn't exist. */
   async read(snapshotHash) {
-    const file = import_node_path82.default.join(this.rootDir, `${snapshotHash}.zip`);
+    const file = import_node_path83.default.join(this.rootDir, `${snapshotHash}.zip`);
     try {
       return await import_promises21.default.readFile(file);
     } catch (e) {
@@ -75284,7 +75339,7 @@ var BundleCache = class {
   }
   /** Idempotent — missing file is not an error. */
   async delete(snapshotHash) {
-    const file = import_node_path82.default.join(this.rootDir, `${snapshotHash}.zip`);
+    const file = import_node_path83.default.join(this.rootDir, `${snapshotHash}.zip`);
     await import_promises21.default.rm(file, { force: true });
   }
 };
@@ -75305,26 +75360,26 @@ async function startDaemon(config) {
     },
     source: "daemon",
     sampling: logShippingCfg.sampling,
-    homeDir: import_node_os32.default.homedir()
+    homeDir: import_node_os31.default.homedir()
   });
-  const logDir = import_node_path83.default.join(config.dataDir, "log");
+  const logDir = import_node_path84.default.join(config.dataDir, "log");
   import_node_fs65.default.mkdirSync(logDir, { recursive: true });
   const logger = createLogger({
     level: config.logLevel,
-    file: import_node_path83.default.join(logDir, "clawd.log"),
+    file: import_node_path84.default.join(logDir, "clawd.log"),
     logClient
   });
   logger.info("starting clawd", { version, config: { port: config.port, host: config.host, dataDir: config.dataDir } });
   const screenIdleProbeLogger = createFileOnlyLogger({
-    file: import_node_path83.default.join(logDir, "screen-idle-probe.log"),
+    file: import_node_path84.default.join(logDir, "screen-idle-probe.log"),
     level: "debug"
   });
   logger.info("screen-idle probe logger enabled", {
-    file: import_node_path83.default.join(logDir, "screen-idle-probe.log")
+    file: import_node_path84.default.join(logDir, "screen-idle-probe.log")
   });
   const CAP_TARGETS = [
-    import_node_path83.default.join(logDir, "clawd.log"),
-    import_node_path83.default.join(logDir, "screen-idle-probe.log")
+    import_node_path84.default.join(logDir, "clawd.log"),
+    import_node_path84.default.join(logDir, "screen-idle-probe.log")
   ];
   const LOG_CAP_MAX_BYTES = 10 * 1024 * 1024;
   const LOG_CAP_KEEP_BYTES = 5 * 1024 * 1024;
@@ -75446,9 +75501,9 @@ async function startDaemon(config) {
   const agents = new AgentsScanner();
   const history = new ClaudeHistoryReader();
   let transport = null;
-  const personaStore = new PersonaStore(import_node_path83.default.join(config.dataDir, "personas"));
+  const personaStore = new PersonaStore(import_node_path84.default.join(config.dataDir, "personas"));
   const subscriptionChannelStore = new SubscriptionChannelStore({ dataDir: config.dataDir });
-  const usersRoot = import_node_path83.default.join(config.dataDir, "users");
+  const usersRoot = import_node_path84.default.join(config.dataDir, "users");
   const defaultsRoot = findDefaultsRoot(logger);
   if (defaultsRoot) {
     seedDefaultPersonas({ store: personaStore, defaultsRoot, logger });
@@ -75465,7 +75520,7 @@ async function startDaemon(config) {
   retirePersonaBuilder({ store: personaStore, logger });
   const groupFileStore = new GroupFileStore({ dataDir: config.dataDir, logger });
   const dispatchStore = createDispatchStore({
-    filePath: import_node_path83.default.join(config.dataDir, "dispatch.json"),
+    filePath: import_node_path84.default.join(config.dataDir, "dispatch.json"),
     now: () => Date.now(),
     onFlushError: (err) => logger.error("dispatch store flush failed", {
       reason: err instanceof Error ? err.message : String(err)
@@ -75474,7 +75529,7 @@ async function startDaemon(config) {
   await dispatchStore.load();
   dispatchStore.markInterruptedAsFailed((/* @__PURE__ */ new Date()).toISOString());
   const channelStore = createChannelStore({
-    filePath: import_node_path83.default.join(config.dataDir, "channels.json"),
+    filePath: import_node_path84.default.join(config.dataDir, "channels.json"),
     now: () => Date.now(),
     genId: () => `ch-${(0, import_node_crypto26.randomUUID)().slice(0, 8)}`,
     onFlushError: (err) => logger.error("channel store flush failed", {
@@ -75483,7 +75538,7 @@ async function startDaemon(config) {
   });
   await channelStore.load();
   const topicStore = createTopicStore({
-    filePath: import_node_path83.default.join(config.dataDir, "topics.json"),
+    filePath: import_node_path84.default.join(config.dataDir, "topics.json"),
     now: () => Date.now(),
     genId: () => `tp-${(0, import_node_crypto26.randomUUID)().slice(0, 8)}`,
     onFlushError: (err) => logger.error("topic store flush failed", {
@@ -75510,12 +75565,12 @@ async function startDaemon(config) {
       });
     }
   });
-  const here = typeof __dirname === "string" ? __dirname : import_node_path83.default.dirname((0, import_node_url6.fileURLToPath)(import_meta10.url));
+  const here = typeof __dirname === "string" ? __dirname : import_node_path84.default.dirname((0, import_node_url6.fileURLToPath)(import_meta10.url));
   const mcpConfigs = [];
   const secretsBundleRoot = findSecretsBundleRoot(logger);
-  const localSecretsDir = import_node_path83.default.join(config.dataDir, LOCAL_SECRETS_DIRNAME);
+  const localSecretsDir = import_node_path84.default.join(config.dataDir, LOCAL_SECRETS_DIRNAME);
   const readSecrets = () => readSecretTable({ bundleRoot: secretsBundleRoot, overrideDir: localSecretsDir, logger });
-  const githubTokenFile = import_node_path83.default.join(localSecretsDir, GITHUB_TOKEN_FILE);
+  const githubTokenFile = import_node_path84.default.join(localSecretsDir, GITHUB_TOKEN_FILE);
   const githubIdentity = createGithubIdentity({
     resolve: () => resolveGithubAuth({ exec: runCommand, fileToken: () => readEnvFileVar(githubTokenFile, GITHUB_TOKEN_VAR) }),
     store: (token) => storeGithubAuth({
@@ -75553,22 +75608,22 @@ async function startDaemon(config) {
     void githubIdentity.refresh();
     return renderPersonaMcpSecrets({
       personaId: personaId2,
-      personaDir: import_node_path83.default.join(config.dataDir, "personas", personaId2),
+      personaDir: import_node_path84.default.join(config.dataDir, "personas", personaId2),
       secrets,
-      outDir: import_node_path83.default.join(config.dataDir, "persona-mcp"),
+      outDir: import_node_path84.default.join(config.dataDir, "persona-mcp"),
       logger
     });
   };
   const mcpDaemonUrl = `http://127.0.0.1:${config.port}`;
   const dispatchServerCandidates = [
-    import_node_path83.default.join(here, "dispatch", "mcp-server.cjs"),
+    import_node_path84.default.join(here, "dispatch", "mcp-server.cjs"),
     // 生产 dist/index → dist/dispatch/mcp-server.cjs
-    import_node_path83.default.join(here, "..", "dist", "dispatch", "mcp-server.cjs")
+    import_node_path84.default.join(here, "..", "dist", "dispatch", "mcp-server.cjs")
     // dev tsx src/index → ../dist/dispatch/mcp-server.cjs
   ];
   const dispatchServerScriptPath = dispatchServerCandidates.find((p3) => import_node_fs65.default.existsSync(p3));
   if (dispatchServerScriptPath) {
-    const dispatchLogPath = import_node_path83.default.join(logDir, "dispatch-mcp-server.log");
+    const dispatchLogPath = import_node_path84.default.join(logDir, "dispatch-mcp-server.log");
     const dispatchCfgPath = writeDispatchMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: dispatchServerScriptPath,
@@ -75588,12 +75643,12 @@ async function startDaemon(config) {
     });
   }
   const ticketServerCandidates = [
-    import_node_path83.default.join(here, "ticket", "mcp-server.cjs"),
-    import_node_path83.default.join(here, "..", "dist", "ticket", "mcp-server.cjs")
+    import_node_path84.default.join(here, "ticket", "mcp-server.cjs"),
+    import_node_path84.default.join(here, "..", "dist", "ticket", "mcp-server.cjs")
   ];
   const ticketServerScriptPath = ticketServerCandidates.find((p3) => import_node_fs65.default.existsSync(p3));
   if (ticketServerScriptPath) {
-    const ticketLogPath = import_node_path83.default.join(logDir, "ticket-mcp-server.log");
+    const ticketLogPath = import_node_path84.default.join(logDir, "ticket-mcp-server.log");
     const ticketCfgPath = writeTicketMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: ticketServerScriptPath,
@@ -75615,12 +75670,12 @@ async function startDaemon(config) {
     });
   }
   const shiftServerCandidates = [
-    import_node_path83.default.join(here, "shift", "mcp-server.cjs"),
-    import_node_path83.default.join(here, "..", "dist", "shift", "mcp-server.cjs")
+    import_node_path84.default.join(here, "shift", "mcp-server.cjs"),
+    import_node_path84.default.join(here, "..", "dist", "shift", "mcp-server.cjs")
   ];
   const shiftServerScriptPath = shiftServerCandidates.find((p3) => import_node_fs65.default.existsSync(p3));
   if (shiftServerScriptPath) {
-    const shiftLogPath = import_node_path83.default.join(logDir, "shift-mcp-server.log");
+    const shiftLogPath = import_node_path84.default.join(logDir, "shift-mcp-server.log");
     const shiftCfgPath = await writeShiftMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: shiftServerScriptPath,
@@ -75641,12 +75696,12 @@ async function startDaemon(config) {
     );
   }
   const inboxServerCandidates = [
-    import_node_path83.default.join(here, "inbox", "mcp-server.cjs"),
-    import_node_path83.default.join(here, "..", "dist", "inbox", "mcp-server.cjs")
+    import_node_path84.default.join(here, "inbox", "mcp-server.cjs"),
+    import_node_path84.default.join(here, "..", "dist", "inbox", "mcp-server.cjs")
   ];
   const inboxServerScriptPath = inboxServerCandidates.find((p3) => import_node_fs65.default.existsSync(p3));
   if (inboxServerScriptPath) {
-    const inboxLogPath = import_node_path83.default.join(logDir, "inbox-mcp-server.log");
+    const inboxLogPath = import_node_path84.default.join(logDir, "inbox-mcp-server.log");
     const inboxCfgPath = await writeInboxMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: inboxServerScriptPath,
@@ -75667,8 +75722,8 @@ async function startDaemon(config) {
     );
   }
   const peerOpsServerCandidates = [
-    import_node_path83.default.join(here, "peer-ops", "mcp-server.cjs"),
-    import_node_path83.default.join(here, "..", "dist", "peer-ops", "mcp-server.cjs")
+    import_node_path84.default.join(here, "peer-ops", "mcp-server.cjs"),
+    import_node_path84.default.join(here, "..", "dist", "peer-ops", "mcp-server.cjs")
   ];
   const peerOpsServerScriptPath = peerOpsServerCandidates.find((p3) => import_node_fs65.default.existsSync(p3));
   if (peerOpsServerScriptPath) {
@@ -75690,12 +75745,12 @@ async function startDaemon(config) {
     );
   }
   const rpcToolServerCandidates = [
-    import_node_path83.default.join(here, "rpc-tool", "mcp-server.cjs"),
-    import_node_path83.default.join(here, "..", "dist", "rpc-tool", "mcp-server.cjs")
+    import_node_path84.default.join(here, "rpc-tool", "mcp-server.cjs"),
+    import_node_path84.default.join(here, "..", "dist", "rpc-tool", "mcp-server.cjs")
   ];
   const rpcToolServerScriptPath = rpcToolServerCandidates.find((p3) => import_node_fs65.default.existsSync(p3));
   if (rpcToolServerScriptPath) {
-    const rpcToolLogPath = import_node_path83.default.join(logDir, "rpc-tool-mcp-server.log");
+    const rpcToolLogPath = import_node_path84.default.join(logDir, "rpc-tool-mcp-server.log");
     const rpcToolCfgPath = writeRpcToolMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: rpcToolServerScriptPath,
@@ -75716,7 +75771,7 @@ async function startDaemon(config) {
     );
   }
   const shiftStore = createShiftStore({
-    filePath: import_node_path83.default.join(config.dataDir, "shift.json"),
+    filePath: import_node_path84.default.join(config.dataDir, "shift.json"),
     ownerIdProvider: () => ownerPrincipalId,
     now: () => Date.now()
   });
@@ -75738,7 +75793,7 @@ async function startDaemon(config) {
     getAdapter,
     historyReader: history,
     dataDir: config.dataDir,
-    personaRoot: import_node_path83.default.join(config.dataDir, "personas"),
+    personaRoot: import_node_path84.default.join(config.dataDir, "personas"),
     // dispatch / shift 自动化 spawn 按 persona 绑定 tool 起 B session（codex persona 用 codex）。
     // personaRegistry 声明在 manager 之后（同作用域 const，调用时机在启动完成后，无 TDZ 风险）。
     getPersonaDefaults: (personaId2) => personaRegistry.get(personaId2),
@@ -75795,7 +75850,7 @@ async function startDaemon(config) {
     // 文件可能 agent 写完又被自己删（罕见），用 size=0 / fallback mime 兜底。
     attachmentGroup: {
       onFileEdit: (input) => {
-        const absPath = import_node_path83.default.isAbsolute(input.relPath) ? input.relPath : import_node_path83.default.join(input.cwd, input.relPath);
+        const absPath = import_node_path84.default.isAbsolute(input.relPath) ? input.relPath : import_node_path84.default.join(input.cwd, input.relPath);
         let size = 0;
         try {
           size = import_node_fs65.default.statSync(absPath).size;
@@ -75839,9 +75894,9 @@ async function startDaemon(config) {
     logger.info("projects.seed-dropped", { dropped: droppedSeed.dropped, backup: droppedSeed.backup });
   }
   const projectsStore = new ProjectsStore({
-    file: import_node_path83.default.join(config.dataDir, "projects.json"),
+    file: import_node_path84.default.join(config.dataDir, "projects.json"),
     clawdDir: config.dataDir,
-    codexStateFile: import_node_path83.default.join(import_node_os32.default.homedir(), ".codex", ".codex-global-state.json"),
+    codexStateFile: import_node_path84.default.join(import_node_os31.default.homedir(), ".codex", ".codex-global-state.json"),
     logger
   });
   const observer = new SessionObserver({
@@ -75906,12 +75961,12 @@ async function startDaemon(config) {
     logger
   });
   registerAdapter("claude", claudeAdapter);
-  const codexIsolatedHome = import_node_path83.default.join(config.dataDir, "codex-home");
+  const codexIsolatedHome = import_node_path84.default.join(config.dataDir, "codex-home");
   try {
     import_node_fs65.default.mkdirSync(codexIsolatedHome, { recursive: true });
     for (const f2 of ["auth.json", "config.toml"]) {
-      const link = import_node_path83.default.join(codexIsolatedHome, f2);
-      const target = import_node_path83.default.join(import_node_os32.default.homedir(), ".codex", f2);
+      const link = import_node_path84.default.join(codexIsolatedHome, f2);
+      const target = import_node_path84.default.join(import_node_os31.default.homedir(), ".codex", f2);
       if (!import_node_fs65.default.existsSync(link) && import_node_fs65.default.existsSync(target)) import_node_fs65.default.symlinkSync(target, link);
     }
   } catch (err) {
@@ -75923,19 +75978,20 @@ async function startDaemon(config) {
       logger,
       historyReader: new CodexHistoryReader({
         roots: codexRolloutRoots(config.dataDir),
-        sharedHome: import_node_path83.default.join(import_node_os32.default.homedir(), ".codex"),
+        sharedHome: import_node_path84.default.join(import_node_os31.default.homedir(), ".codex"),
         logger
       }),
       // projectPaths 每次调用现取 —— 用户新建 project 后立即生效，不用重启 daemon
       codexHomeFor: (cwd) => resolveCodexHome({
         cwd,
-        personaRoot: import_node_path83.default.join(config.dataDir, "personas"),
+        personaRoot: import_node_path84.default.join(config.dataDir, "personas"),
         // 必须用 listMerged（Codex registry ∪ 叠加层）：只用本地 list() 的话，用户在
         // Codex 里建的 project 不在表里，在它下面开的会话会被误判成隔离 → Codex 侧看不到
         projectPaths: projectsStore.listMerged().map((x2) => x2.path),
-        sharedHome: import_node_path83.default.join(import_node_os32.default.homedir(), ".codex"),
+        sharedHome: import_node_path84.default.join(import_node_os31.default.homedir(), ".codex"),
         isolatedHome: codexIsolatedHome
       }),
+      codexHomeForThread: (threadId) => locateCodexThread(codexRolloutRoots(config.dataDir), threadId)?.home,
       // 附件图片验签：与 http-router /files 路由同一把 secret
       getSignSecret: () => authFile.token
     })
@@ -75958,8 +76014,8 @@ async function startDaemon(config) {
   );
   registerAdapter(PI_CLOUD_TOOL_ID, new CloudPiAdapter({ client: cloudGateway, history: cloudHistorySource, logger }));
   const piMcpBridgeCandidates = [
-    import_node_path83.default.join(here, "pi-mcp-bridge", "extension.cjs"),
-    import_node_path83.default.join(here, "..", "dist", "pi-mcp-bridge", "extension.cjs")
+    import_node_path84.default.join(here, "pi-mcp-bridge", "extension.cjs"),
+    import_node_path84.default.join(here, "..", "dist", "pi-mcp-bridge", "extension.cjs")
   ];
   const piMcpBridgePath = piMcpBridgeCandidates.find((p3) => import_node_fs65.default.existsSync(p3));
   if (piMcpBridgePath) {
@@ -76257,11 +76313,11 @@ async function startDaemon(config) {
         // 'persona/<pid>/owner'，default 走 'default'。
         getSessionScope: (sid) => manager.findOwnedSessionScope(sid),
         // guest path guard：candidate 必须在 personaRoot 子树或调用者自己的 user-dir 下
-        personaRoot: import_node_path83.default.join(config.dataDir, "personas"),
+        personaRoot: import_node_path84.default.join(config.dataDir, "personas"),
         usersRoot
       },
       // workspace/git/history/skills/agents handler 共用的 guest path guard 锚点
-      personaRoot: import_node_path83.default.join(config.dataDir, "personas"),
+      personaRoot: import_node_path84.default.join(config.dataDir, "personas"),
       // v2 多人 persona 隔离：handler 派生 guest user-dir 放行
       usersRoot,
       // v2 Phase 6: whoami handler 装在 owner principal.displayName + persona 解析
@@ -76407,7 +76463,7 @@ async function startDaemon(config) {
         sourceSessionId: args.sourceSessionId
       });
       const sourceFile = manager.findOwnedSession(args.sourceSessionId);
-      const sourceJsonlPath = resolveSourceJsonlPath(sourceFile, import_node_os32.default.homedir());
+      const sourceJsonlPath = resolveSourceJsonlPath(sourceFile, import_node_os31.default.homedir());
       logger.info("dispatch.spawnB.source-resolved", {
         dispatchId: args.dispatchId,
         sourceJsonlPath,
@@ -76567,7 +76623,7 @@ async function startDaemon(config) {
   });
   shiftScheduler.start();
   logger.info("shift scheduler started", { shiftCount: shiftStore.list().length });
-  const larkBotStore = createLarkBotBindingStore(import_node_path83.default.join(config.dataDir, "personas"));
+  const larkBotStore = createLarkBotBindingStore(import_node_path84.default.join(config.dataDir, "personas"));
   const larkBotCloud = createLarkBotCloudClient({
     api: config.clawosApi ?? DEFAULT_CLAWOS_API,
     getLoginPass: () => ownerIdentityStore.read()?.loginPass ?? null
@@ -76579,7 +76635,7 @@ async function startDaemon(config) {
     store: larkBotStore,
     fetchResource: (appId, messageId, fileKey, maxBytes, type) => larkBotCloud.fetchResource(appId, messageId, fileKey, maxBytes, type),
     // 图片落 guest userWorkDir 下（capId = lark-<chat_id>）：CC 经 --add-dir + allowRead carve 可 Read
-    mediaRootFor: (chatId) => import_node_path83.default.join(deriveUserWorkDir(`lark-${chatId}`, usersRoot), "lark-media"),
+    mediaRootFor: (chatId) => import_node_path84.default.join(deriveUserWorkDir(`lark-${chatId}`, usersRoot), "lark-media"),
     isShuttingDown: () => larkDraining,
     logger: {
       warn: (msg) => logger.warn(msg),
@@ -76879,8 +76935,8 @@ async function startDaemon(config) {
       const lines = [
         `Tunnel:      ${r2.url}`,
         ...resolvedAuthToken ? [`Connect:     ${connectUrl}`] : [],
-        `Frpc config: ${import_node_path83.default.join(config.dataDir, "frpc.toml")}`,
-        `Frpc log:    ${import_node_path83.default.join(logDir, "frpc.log")}`
+        `Frpc config: ${import_node_path84.default.join(config.dataDir, "frpc.toml")}`,
+        `Frpc log:    ${import_node_path84.default.join(logDir, "frpc.log")}`
       ];
       const width2 = Math.max(...lines.map((l2) => l2.length));
       const bar = "\u2550".repeat(width2 + 4);
@@ -76893,7 +76949,7 @@ ${bar}
 
 `);
       try {
-        const connectPath = import_node_path83.default.join(config.dataDir, "connect.txt");
+        const connectPath = import_node_path84.default.join(config.dataDir, "connect.txt");
         import_node_fs65.default.writeFileSync(connectPath, lines.join("\n") + "\n", { mode: 384 });
       } catch {
       }
@@ -76992,7 +77048,7 @@ ${bar}
   };
 }
 function migrateDropPersonsDir(dataDir) {
-  const dir = import_node_path83.default.join(dataDir, "persons");
+  const dir = import_node_path84.default.join(dataDir, "persons");
   try {
     import_node_fs65.default.rmSync(dir, { recursive: true, force: true });
   } catch {