@clawos-dev/clawd 0.2.191-beta.383.956b6ae → 0.2.192-beta.386.33a5833

package/dist/cli.cjs

@@ -733,8 +733,8 @@ var init_parseUtil = __esm({
     init_errors2();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path67, errorMaps, issueData } = params;
-      const fullPath = [...path67, ...issueData.path || []];
+      const { data, path: path68, errorMaps, issueData } = params;
+      const fullPath = [...path68, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -1045,11 +1045,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path67, key) {
+      constructor(parent, value, path68, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path67;
+        this._path = path68;
         this._key = key;
       }
       get path() {
@@ -5996,7 +5996,7 @@ var init_feishu_auth = __esm({
 });
 
 // ../protocol/src/dispatch.ts
-var DispatchOutcomeSchema, DispatchRunArgsSchema, DispatchCompleteArgsSchema;
+var DispatchOutcomeSchema, DispatchRunArgsSchema, DispatchRunResponseSchema, DispatchCompleteArgsSchema;
 var init_dispatch = __esm({
   "../protocol/src/dispatch.ts"() {
     "use strict";
@@ -6017,10 +6017,21 @@ var init_dispatch = __esm({
       prompt: external_exports.string(),
       // 跨设备 dispatch：非空 = A 角色，转发到该 contact deviceId 的 peer daemon；
       // 省略 = 本地 dispatch / B 角色本地执行。A 转发给 B 时 body 不带此字段。
-      targetDeviceId: external_exports.string().min(1).optional()
+      targetDeviceId: external_exports.string().min(1).optional(),
+      // 精确寻址已知 B session（复用其上下文）：
+      //   - 本地（targetDeviceId 缺省）：daemon 校验目标为本机 session 且
+      //     dispatchedFromSessionId 匹配 A 的 sessionId（防越权）
+      //   - 跨设备（targetDeviceId 非空）：peer daemon 在其本地按同规则校验
+      //     creatorPrincipalId === A.deviceId
+      //   - 省略 = 新建 B session
+      targetSessionId: external_exports.string().min(1).optional()
+    });
+    DispatchRunResponseSchema = external_exports.object({
+      type: external_exports.literal("personaDispatch:run:ok"),
+      outcome: DispatchOutcomeSchema,
+      dispatchedSessionId: external_exports.string().min(1).optional()
     });
     DispatchCompleteArgsSchema = external_exports.object({
-      dispatchId: external_exports.string().min(1),
       outcome: DispatchOutcomeSchema
     });
   }
@@ -6373,8 +6384,8 @@ var require_req = __commonJS({
       if (req.originalUrl) {
         _req.url = req.originalUrl;
       } else {
-        const path67 = req.path;
-        _req.url = typeof path67 === "string" ? path67 : req.url ? req.url.path || req.url : void 0;
+        const path68 = req.path;
+        _req.url = typeof path68 === "string" ? path68 : req.url ? req.url.path || req.url : void 0;
       }
       if (req.query) {
         _req.query = req.query;
@@ -6539,14 +6550,14 @@ var require_redact = __commonJS({
       }
       return obj;
     }
-    function parsePath(path67) {
+    function parsePath(path68) {
       const parts = [];
       let current = "";
       let inBrackets = false;
       let inQuotes = false;
       let quoteChar = "";
-      for (let i = 0; i < path67.length; i++) {
-        const char = path67[i];
+      for (let i = 0; i < path68.length; i++) {
+        const char = path68[i];
         if (!inBrackets && char === ".") {
           if (current) {
             parts.push(current);
@@ -6677,10 +6688,10 @@ var require_redact = __commonJS({
       return current;
     }
     function redactPaths(obj, paths, censor, remove = false) {
-      for (const path67 of paths) {
-        const parts = parsePath(path67);
+      for (const path68 of paths) {
+        const parts = parsePath(path68);
         if (parts.includes("*")) {
-          redactWildcardPath(obj, parts, censor, path67, remove);
+          redactWildcardPath(obj, parts, censor, path68, remove);
         } else {
           if (remove) {
             removeKey(obj, parts);
@@ -6765,8 +6776,8 @@ var require_redact = __commonJS({
           }
         } else {
           if (afterWildcard.includes("*")) {
-            const wrappedCensor = typeof censor === "function" ? (value, path67) => {
-              const fullPath = [...pathArray.slice(0, pathLength), ...path67];
+            const wrappedCensor = typeof censor === "function" ? (value, path68) => {
+              const fullPath = [...pathArray.slice(0, pathLength), ...path68];
               return censor(value, fullPath);
             } : censor;
             redactWildcardPath(current, afterWildcard, wrappedCensor, originalPath, remove);
@@ -6801,8 +6812,8 @@ var require_redact = __commonJS({
         return null;
       }
       const pathStructure = /* @__PURE__ */ new Map();
-      for (const path67 of pathsToClone) {
-        const parts = parsePath(path67);
+      for (const path68 of pathsToClone) {
+        const parts = parsePath(path68);
         let current = pathStructure;
         for (let i = 0; i < parts.length; i++) {
           const part = parts[i];
@@ -6854,24 +6865,24 @@ var require_redact = __commonJS({
       }
       return cloneSelectively(obj, pathStructure);
     }
-    function validatePath(path67) {
-      if (typeof path67 !== "string") {
+    function validatePath(path68) {
+      if (typeof path68 !== "string") {
         throw new Error("Paths must be (non-empty) strings");
       }
-      if (path67 === "") {
+      if (path68 === "") {
         throw new Error("Invalid redaction path ()");
       }
-      if (path67.includes("..")) {
-        throw new Error(`Invalid redaction path (${path67})`);
+      if (path68.includes("..")) {
+        throw new Error(`Invalid redaction path (${path68})`);
       }
-      if (path67.includes(",")) {
-        throw new Error(`Invalid redaction path (${path67})`);
+      if (path68.includes(",")) {
+        throw new Error(`Invalid redaction path (${path68})`);
       }
       let bracketCount = 0;
       let inQuotes = false;
       let quoteChar = "";
-      for (let i = 0; i < path67.length; i++) {
-        const char = path67[i];
+      for (let i = 0; i < path68.length; i++) {
+        const char = path68[i];
         if ((char === '"' || char === "'") && bracketCount > 0) {
           if (!inQuotes) {
             inQuotes = true;
@@ -6885,20 +6896,20 @@ var require_redact = __commonJS({
         } else if (char === "]" && !inQuotes) {
           bracketCount--;
           if (bracketCount < 0) {
-            throw new Error(`Invalid redaction path (${path67})`);
+            throw new Error(`Invalid redaction path (${path68})`);
           }
         }
       }
       if (bracketCount !== 0) {
-        throw new Error(`Invalid redaction path (${path67})`);
+        throw new Error(`Invalid redaction path (${path68})`);
       }
     }
     function validatePaths(paths) {
       if (!Array.isArray(paths)) {
         throw new TypeError("paths must be an array");
       }
-      for (const path67 of paths) {
-        validatePath(path67);
+      for (const path68 of paths) {
+        validatePath(path68);
       }
     }
     function slowRedact(options = {}) {
@@ -7066,8 +7077,8 @@ var require_redaction = __commonJS({
         if (shape[k2] === null) {
           o[k2] = (value) => topCensor(value, [k2]);
         } else {
-          const wrappedCensor = typeof censor === "function" ? (value, path67) => {
-            return censor(value, [k2, ...path67]);
+          const wrappedCensor = typeof censor === "function" ? (value, path68) => {
+            return censor(value, [k2, ...path68]);
           } : censor;
           o[k2] = Redact({
             paths: shape[k2],
@@ -7288,7 +7299,7 @@ var require_sonic_boom = __commonJS({
     var fs61 = require("fs");
     var EventEmitter3 = require("events");
     var inherits = require("util").inherits;
-    var path67 = require("path");
+    var path68 = require("path");
     var sleep2 = require_atomic_sleep();
     var assert = require("assert");
     var BUSY_WRITE_TIMEOUT = 100;
@@ -7342,7 +7353,7 @@ var require_sonic_boom = __commonJS({
       const mode = sonic.mode;
       if (sonic.sync) {
         try {
-          if (sonic.mkdir) fs61.mkdirSync(path67.dirname(file), { recursive: true });
+          if (sonic.mkdir) fs61.mkdirSync(path68.dirname(file), { recursive: true });
           const fd = fs61.openSync(file, flags, mode);
           fileOpened(null, fd);
         } catch (err) {
@@ -7350,7 +7361,7 @@ var require_sonic_boom = __commonJS({
           throw err;
         }
       } else if (sonic.mkdir) {
-        fs61.mkdir(path67.dirname(file), { recursive: true }, (err) => {
+        fs61.mkdir(path68.dirname(file), { recursive: true }, (err) => {
           if (err) return fileOpened(err);
           fs61.open(file, flags, mode, fileOpened);
         });
@@ -10210,7 +10221,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 os22 = require("os");
+    var os23 = require("os");
     var stdSerializers = require_pino_std_serializers();
     var caller = require_caller();
     var redaction = require_redaction();
@@ -10257,7 +10268,7 @@ var require_pino = __commonJS({
     } = symbols;
     var { epochTime, nullTime } = time;
     var { pid } = process;
-    var hostname = os22.hostname();
+    var hostname = os23.hostname();
     var defaultErrorSerializer = stdSerializers.err;
     var defaultOptions = {
       level: "info",
@@ -10981,11 +10992,11 @@ var init_lib = __esm({
           }
         }
       },
-      addToPath: function addToPath(path67, added, removed, oldPosInc, options) {
-        var last = path67.lastComponent;
+      addToPath: function addToPath(path68, added, removed, oldPosInc, options) {
+        var last = path68.lastComponent;
         if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
           return {
-            oldPos: path67.oldPos + oldPosInc,
+            oldPos: path68.oldPos + oldPosInc,
             lastComponent: {
               count: last.count + 1,
               added,
@@ -10995,7 +11006,7 @@ var init_lib = __esm({
           };
         } else {
           return {
-            oldPos: path67.oldPos + oldPosInc,
+            oldPos: path68.oldPos + oldPosInc,
             lastComponent: {
               count: 1,
               added,
@@ -11053,7 +11064,7 @@ var init_lib = __esm({
       tokenize: function tokenize(value) {
         return Array.from(value);
       },
-      join: function join5(chars) {
+      join: function join3(chars) {
         return chars.join("");
       },
       postProcess: function postProcess(changeObjects) {
@@ -11235,13 +11246,33 @@ var init_tool_result_extra = __esm({
 function cwdToHashDir(cwd) {
   return cwd.replace(/[^a-zA-Z0-9]/g, "-");
 }
+function newestSubagentMtimeMs(projectsRoot, cwd, toolSessionId) {
+  const dir = import_node_path4.default.join(projectsRoot, cwdToHashDir(cwd), toolSessionId, "subagents");
+  let entries;
+  try {
+    entries = import_node_fs4.default.readdirSync(dir, { withFileTypes: true });
+  } catch {
+    return null;
+  }
+  let newest = null;
+  for (const e of entries) {
+    if (!e.isFile()) continue;
+    if (!e.name.startsWith("agent-") || !e.name.endsWith(".jsonl")) continue;
+    try {
+      const m2 = import_node_fs4.default.statSync(import_node_path4.default.join(dir, e.name)).mtimeMs;
+      if (newest === null || m2 > newest) newest = m2;
+    } catch {
+    }
+  }
+  return newest;
+}
 function hashDirToCwd(hash) {
   const body = hash.startsWith("-") ? hash.slice(1) : hash;
   return "/" + body.replace(/-/g, "/");
 }
 function safeStatMtime(p2) {
   try {
-    return import_node_fs13.default.statSync(p2).mtimeMs;
+    return import_node_fs4.default.statSync(p2).mtimeMs;
   } catch {
     return 0;
   }
@@ -11249,7 +11280,7 @@ function safeStatMtime(p2) {
 function readJsonlLines(file) {
   let raw;
   try {
-    raw = import_node_fs13.default.readFileSync(file, "utf8");
+    raw = import_node_fs4.default.readFileSync(file, "utf8");
   } catch (err) {
     if (err.code === "ENOENT") return [];
     throw err;
@@ -11441,10 +11472,10 @@ function attachmentToHistoryMessage(o, ts) {
     const memories = raw.map((m2) => {
       if (!m2 || typeof m2 !== "object") return null;
       const rec3 = m2;
-      const path67 = typeof rec3.path === "string" ? rec3.path : null;
+      const path68 = typeof rec3.path === "string" ? rec3.path : null;
       const content = typeof rec3.content === "string" ? rec3.content : null;
-      if (!path67 || content == null) return null;
-      const entry = { path: path67, content };
+      if (!path68 || content == null) return null;
+      const entry = { path: path68, content };
       if (typeof rec3.mtimeMs === "number") entry.mtimeMs = rec3.mtimeMs;
       return entry;
     }).filter((m2) => m2 !== null);
@@ -11480,8 +11511,8 @@ function attachmentDeferredToolsText(a) {
 function readBackupContent(fileHistoryRoot, toolSessionId, backupFileName) {
   if (backupFileName === null) return null;
   try {
-    return import_node_fs13.default.readFileSync(
-      import_node_path12.default.join(fileHistoryRoot, toolSessionId, backupFileName),
+    return import_node_fs4.default.readFileSync(
+      import_node_path4.default.join(fileHistoryRoot, toolSessionId, backupFileName),
       "utf8"
     );
   } catch {
@@ -11490,19 +11521,19 @@ function readBackupContent(fileHistoryRoot, toolSessionId, backupFileName) {
 }
 function readCurrentContent(filePath) {
   try {
-    return import_node_fs13.default.readFileSync(filePath, "utf8");
+    return import_node_fs4.default.readFileSync(filePath, "utf8");
   } catch (err) {
     if (err.code === "ENOENT") return null;
     return null;
   }
 }
-var import_node_fs13, import_node_os5, import_node_path12, TASK_NOTIFICATION_RE, TASK_ID_RE, TOOL_USE_ID_RE, SLASH_COMMAND_RE, LOCAL_COMMAND_RE, SYSTEM_REMINDER_RE, OPENSPEC_BLOCK_RE, SKILL_HINT_RE, ATTACHMENT_SILENT_SUBTYPES, ClaudeHistoryReader;
+var import_node_fs4, import_node_os3, import_node_path4, TASK_NOTIFICATION_RE, TASK_ID_RE, TOOL_USE_ID_RE, SLASH_COMMAND_RE, LOCAL_COMMAND_RE, SYSTEM_REMINDER_RE, OPENSPEC_BLOCK_RE, SKILL_HINT_RE, ATTACHMENT_SILENT_SUBTYPES, ClaudeHistoryReader;
 var init_claude_history = __esm({
   "src/tools/claude-history.ts"() {
     "use strict";
-    import_node_fs13 = __toESM(require("fs"), 1);
-    import_node_os5 = __toESM(require("os"), 1);
-    import_node_path12 = __toESM(require("path"), 1);
+    import_node_fs4 = __toESM(require("fs"), 1);
+    import_node_os3 = __toESM(require("os"), 1);
+    import_node_path4 = __toESM(require("path"), 1);
     init_lib();
     init_tool_result_extra();
     TASK_NOTIFICATION_RE = /<task-notification\b[\s\S]*?<\/task-notification>/i;
@@ -11526,14 +11557,14 @@ var init_claude_history = __esm({
       // 每次 user 提交前 trackEdit 拷一份，作为 rewind 回退目标
       fileHistoryRoot;
       constructor(opts = {}) {
-        const base = opts.baseDir ?? import_node_path12.default.join(import_node_os5.default.homedir(), ".claude");
-        this.projectsRoot = import_node_path12.default.join(base, "projects");
-        this.fileHistoryRoot = import_node_path12.default.join(base, "file-history");
+        const base = opts.baseDir ?? import_node_path4.default.join(import_node_os3.default.homedir(), ".claude");
+        this.projectsRoot = import_node_path4.default.join(base, "projects");
+        this.fileHistoryRoot = import_node_path4.default.join(base, "file-history");
       }
       async listProjects() {
         let entries;
         try {
-          entries = import_node_fs13.default.readdirSync(this.projectsRoot, { withFileTypes: true });
+          entries = import_node_fs4.default.readdirSync(this.projectsRoot, { withFileTypes: true });
         } catch (err) {
           if (err.code === "ENOENT") return [];
           throw err;
@@ -11541,9 +11572,9 @@ var init_claude_history = __esm({
         const out = [];
         for (const ent of entries) {
           if (!ent.isDirectory()) continue;
-          const dir = import_node_path12.default.join(this.projectsRoot, ent.name);
-          const files = import_node_fs13.default.readdirSync(dir).filter((f) => f.endsWith(".jsonl"));
-          const updatedAtMs = files.reduce((m2, f) => Math.max(m2, safeStatMtime(import_node_path12.default.join(dir, f))), 0);
+          const dir = import_node_path4.default.join(this.projectsRoot, ent.name);
+          const files = import_node_fs4.default.readdirSync(dir).filter((f) => f.endsWith(".jsonl"));
+          const updatedAtMs = files.reduce((m2, f) => Math.max(m2, safeStatMtime(import_node_path4.default.join(dir, f))), 0);
           out.push({
             projectPath: hashDirToCwd(ent.name),
             hashDir: ent.name,
@@ -11555,17 +11586,17 @@ var init_claude_history = __esm({
         return out;
       }
       async listSessions(args) {
-        const dir = import_node_path12.default.join(this.projectsRoot, cwdToHashDir(args.projectPath));
+        const dir = import_node_path4.default.join(this.projectsRoot, cwdToHashDir(args.projectPath));
         let files;
         try {
-          files = import_node_fs13.default.readdirSync(dir).filter((f) => f.endsWith(".jsonl"));
+          files = import_node_fs4.default.readdirSync(dir).filter((f) => f.endsWith(".jsonl"));
         } catch (err) {
           if (err.code === "ENOENT") return [];
           throw err;
         }
         const out = [];
         for (const f of files) {
-          const full = import_node_path12.default.join(dir, f);
+          const full = import_node_path4.default.join(dir, f);
           const toolSessionId = f.slice(0, -".jsonl".length);
           const lines = readJsonlLines(full);
           let summary = "";
@@ -11620,7 +11651,7 @@ var init_claude_history = __esm({
         return out;
       }
       async read(args) {
-        const file = import_node_path12.default.join(
+        const file = import_node_path4.default.join(
           this.projectsRoot,
           cwdToHashDir(args.cwd),
           `${args.toolSessionId}.jsonl`
@@ -11657,7 +11688,7 @@ var init_claude_history = __esm({
       // 独立目录路径：<projectsRoot>/<cwdHash>/<toolSessionId>/subagents/*.jsonl
       // 返回 null 表示目录不存在（调用方回退旧实现）；返回空数组表示目录存在但无 jsonl
       listSubagentsFromDirectory(cwd, toolSessionId) {
-        const dir = import_node_path12.default.join(
+        const dir = import_node_path4.default.join(
           this.projectsRoot,
           cwdToHashDir(cwd),
           toolSessionId,
@@ -11665,7 +11696,7 @@ var init_claude_history = __esm({
         );
         let entries;
         try {
-          entries = import_node_fs13.default.readdirSync(dir, { withFileTypes: true });
+          entries = import_node_fs4.default.readdirSync(dir, { withFileTypes: true });
         } catch (err) {
           if (err.code === "ENOENT") return null;
           return null;
@@ -11675,7 +11706,7 @@ var init_claude_history = __esm({
           if (!e.isFile()) continue;
           if (!e.name.startsWith("agent-") || !e.name.endsWith(".jsonl")) continue;
           const subagentId = e.name.slice("agent-".length, -".jsonl".length);
-          const filePath = import_node_path12.default.join(dir, e.name);
+          const filePath = import_node_path4.default.join(dir, e.name);
           const lines = readJsonlLines(filePath);
           let firstText = "";
           let messageCount = 0;
@@ -11692,7 +11723,7 @@ var init_claude_history = __esm({
         return out;
       }
       listSubagentsFromMainJsonl(cwd, toolSessionId) {
-        const file = import_node_path12.default.join(
+        const file = import_node_path4.default.join(
           this.projectsRoot,
           cwdToHashDir(cwd),
           `${toolSessionId}.jsonl`
@@ -11727,7 +11758,7 @@ var init_claude_history = __esm({
       }
       // 独立文件路径：agent-<subagentId>.jsonl；文件不存在返回 null 让调用方回退旧实现
       readSubagentFromFile(cwd, toolSessionId, subagentId) {
-        const file = import_node_path12.default.join(
+        const file = import_node_path4.default.join(
           this.projectsRoot,
           cwdToHashDir(cwd),
           toolSessionId,
@@ -11736,7 +11767,7 @@ var init_claude_history = __esm({
         );
         let exists = false;
         try {
-          exists = import_node_fs13.default.statSync(file).isFile();
+          exists = import_node_fs4.default.statSync(file).isFile();
         } catch {
           return null;
         }
@@ -11755,7 +11786,7 @@ var init_claude_history = __esm({
        * "那一刻每个 tracked 文件对应的 backup 文件名"
        */
       readFileHistorySnapshots(args) {
-        const file = import_node_path12.default.join(
+        const file = import_node_path4.default.join(
           this.projectsRoot,
           cwdToHashDir(args.cwd),
           `${args.toolSessionId}.jsonl`
@@ -11800,7 +11831,7 @@ var init_claude_history = __esm({
         for (const [anchorId, target] of snapshots) {
           let hasAny = false;
           for (const [rawPath, backup] of Object.entries(target)) {
-            const absPath = import_node_path12.default.isAbsolute(rawPath) ? rawPath : import_node_path12.default.join(args.cwd, rawPath);
+            const absPath = import_node_path4.default.isAbsolute(rawPath) ? rawPath : import_node_path4.default.join(args.cwd, rawPath);
             const backupContent = readBackupContent(
               this.fileHistoryRoot,
               args.toolSessionId,
@@ -11840,7 +11871,7 @@ var init_claude_history = __esm({
         let totalInsertions = 0;
         let totalDeletions = 0;
         for (const [rawPath, backup] of Object.entries(target)) {
-          const absPath = import_node_path12.default.isAbsolute(rawPath) ? rawPath : import_node_path12.default.join(args.cwd, rawPath);
+          const absPath = import_node_path4.default.isAbsolute(rawPath) ? rawPath : import_node_path4.default.join(args.cwd, rawPath);
           const backupContent = readBackupContent(
             this.fileHistoryRoot,
             args.toolSessionId,
@@ -11887,7 +11918,7 @@ var init_claude_history = __esm({
         };
       }
       readSubagentFromMainJsonl(cwd, toolSessionId, subagentId) {
-        const file = import_node_path12.default.join(
+        const file = import_node_path4.default.join(
           this.projectsRoot,
           cwdToHashDir(cwd),
           `${toolSessionId}.jsonl`
@@ -12256,10 +12287,10 @@ function parseAttachment(obj) {
     const memories = raw.map((m2) => {
       if (!m2 || typeof m2 !== "object") return null;
       const rec3 = m2;
-      const path67 = typeof rec3.path === "string" ? rec3.path : null;
+      const path68 = typeof rec3.path === "string" ? rec3.path : null;
       const content = typeof rec3.content === "string" ? rec3.content : null;
-      if (!path67 || content == null) return null;
-      const out = { path: path67, content };
+      if (!path68 || content == null) return null;
+      const out = { path: path68, content };
       if (typeof rec3.mtimeMs === "number") out.mtimeMs = rec3.mtimeMs;
       return out;
     }).filter((m2) => m2 !== null);
@@ -12391,8 +12422,9 @@ var init_claude = __esm({
     };
     CLAUDE_MODELS = [
       { id: "", label: "Default", description: "CLI default model", contextWindowSize: 2e5, default: true },
-      { id: "sonnet", label: "Sonnet", description: "Fast, balanced", contextWindowSize: 2e5 },
       { id: "opus", label: "Opus", description: "Most capable", contextWindowSize: 1e6 },
+      { id: "fable", label: "Fable", contextWindowSize: 2e5 },
+      { id: "sonnet", label: "Sonnet", description: "Fast, balanced", contextWindowSize: 2e5 },
       { id: "haiku", label: "Haiku", description: "Fastest, lightest", contextWindowSize: 2e5 }
     ];
     CLAUDE_PERMISSION_MODES = [
@@ -33223,8 +33255,8 @@ var require_utils = __commonJS({
       var result = transform[inputType][outputType](input);
       return result;
     };
-    exports2.resolve = function(path67) {
-      var parts = path67.split("/");
+    exports2.resolve = function(path68) {
+      var parts = path68.split("/");
       var result = [];
       for (var index = 0; index < parts.length; index++) {
         var part = parts[index];
@@ -39077,18 +39109,18 @@ var require_object = __commonJS({
       var object = new ZipObject(name, zipObjectContent, o);
       this.files[name] = object;
     };
-    var parentFolder = function(path67) {
-      if (path67.slice(-1) === "/") {
-        path67 = path67.substring(0, path67.length - 1);
+    var parentFolder = function(path68) {
+      if (path68.slice(-1) === "/") {
+        path68 = path68.substring(0, path68.length - 1);
       }
-      var lastSlash = path67.lastIndexOf("/");
-      return lastSlash > 0 ? path67.substring(0, lastSlash) : "";
+      var lastSlash = path68.lastIndexOf("/");
+      return lastSlash > 0 ? path68.substring(0, lastSlash) : "";
     };
-    var forceTrailingSlash = function(path67) {
-      if (path67.slice(-1) !== "/") {
-        path67 += "/";
+    var forceTrailingSlash = function(path68) {
+      if (path68.slice(-1) !== "/") {
+        path68 += "/";
       }
-      return path67;
+      return path68;
     };
     var folderAdd = function(name, createFolders) {
       createFolders = typeof createFolders !== "undefined" ? createFolders : defaults.createFolders;
@@ -40090,7 +40122,7 @@ var require_lib3 = __commonJS({
 // src/run-case/recorder.ts
 function startRunCaseRecorder(opts) {
   const now = opts.now ?? Date.now;
-  const dir = import_node_path55.default.dirname(opts.recordPath);
+  const dir = import_node_path56.default.dirname(opts.recordPath);
   let stream = null;
   let closing = false;
   let closedSettled = false;
@@ -40130,12 +40162,12 @@ function startRunCaseRecorder(opts) {
   };
   return { tap, close, closed };
 }
-var import_node_fs43, import_node_path55;
+var import_node_fs43, import_node_path56;
 var init_recorder = __esm({
   "src/run-case/recorder.ts"() {
     "use strict";
     import_node_fs43 = __toESM(require("fs"), 1);
-    import_node_path55 = __toESM(require("path"), 1);
+    import_node_path56 = __toESM(require("path"), 1);
   }
 });
 
@@ -40178,7 +40210,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_fs44.mkdtempSync)(import_node_path56.default.join(import_node_os21.default.tmpdir(), "clawd-runcase-"));
+  const cwd = opts.cwd ?? (0, import_node_fs44.mkdtempSync)(import_node_path57.default.join(import_node_os22.default.tmpdir(), "clawd-runcase-"));
   const ownsCwd = opts.cwd === void 0;
   const recorder = startRunCaseRecorder({ recordPath: opts.record, now });
   const spawnCtx = { cwd };
@@ -40345,13 +40377,13 @@ async function runController(opts) {
   }
   return exitCode ?? 0;
 }
-var import_node_fs44, import_node_os21, import_node_path56;
+var import_node_fs44, import_node_os22, import_node_path57;
 var init_controller = __esm({
   "src/run-case/controller.ts"() {
     "use strict";
     import_node_fs44 = require("fs");
-    import_node_os21 = __toESM(require("os"), 1);
-    import_node_path56 = __toESM(require("path"), 1);
+    import_node_os22 = __toESM(require("os"), 1);
+    import_node_path57 = __toESM(require("path"), 1);
     init_claude();
     init_stdout_splitter();
     init_permission_stdio();
@@ -40613,9 +40645,9 @@ Env (advanced):
 `;
 
 // src/index.ts
-var import_node_path54 = __toESM(require("path"), 1);
+var import_node_path55 = __toESM(require("path"), 1);
 var import_node_fs42 = __toESM(require("fs"), 1);
-var import_node_os20 = __toESM(require("os"), 1);
+var import_node_os21 = __toESM(require("os"), 1);
 
 // ../node_modules/.pnpm/uuid@10.0.0/node_modules/uuid/dist/esm-node/stringify.js
 var byteToHex = [];
@@ -41232,9 +41264,9 @@ var SessionStoreFactory = class {
 };
 
 // src/session/manager.ts
-var import_node_fs6 = __toESM(require("fs"), 1);
-var import_node_path6 = __toESM(require("path"), 1);
-var import_node_os3 = __toESM(require("os"), 1);
+var import_node_fs7 = __toESM(require("fs"), 1);
+var import_node_path8 = __toESM(require("path"), 1);
+var import_node_os5 = __toESM(require("os"), 1);
 init_protocol();
 
 // src/tools/guest-settings.ts
@@ -41332,6 +41364,10 @@ function escapeAttr(v2) {
   return v2.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
 
+// src/session/runner.ts
+var import_node_os4 = __toESM(require("os"), 1);
+var import_node_path6 = __toESM(require("path"), 1);
+
 // src/session/reducer.ts
 init_runtime();
 
@@ -41418,7 +41454,7 @@ var ATTACHMENT_SHARING_HINT = `## \u628A\u4EA7\u51FA\u6587\u4EF6\u5206\u4EAB\u7E
 // src/dispatch/system-prompt.ts
 var DISPATCH_SYSTEM_PROMPT_HINT = `## \u59D4\u6D3E\u7ED9\u53E6\u4E00\u4E2A persona\uFF08dispatch\uFF09
 
-\u5F53\u7528\u6237\u6D88\u606F\u91CC\u542B \`@persona/<id>\`\uFF08\u5982 \`@persona/persona-bug-fixer\`\uFF09\u65F6\uFF0C**\u4F60\u5FC5\u987B**\u7ACB\u5373\u8C03 MCP tool \`mcp__clawd-dispatch__personaDispatch\` \u59D4\u6D3E\uFF0C\u4E0D\u8981\u5C1D\u8BD5\u81EA\u5DF1\u6267\u884C\uFF1A
+\u5F53\u7528\u6237\u6D88\u606F\u91CC\u542B \`@persona/<id>\`\uFF08\u5982 \`@persona/persona-app-builder\`\uFF09\u65F6\uFF0C**\u4F60\u5FC5\u987B**\u7ACB\u5373\u8C03 MCP tool \`mcp__clawd-dispatch__personaDispatch\` \u59D4\u6D3E\uFF0C\u4E0D\u8981\u5C1D\u8BD5\u81EA\u5DF1\u6267\u884C\uFF1A
 
 - \`targetPersona = <id>\`\uFF08@ token \u91CC\u7684 persona id\uFF09
 - \`prompt = \u53BB\u6389 @persona/<id> token \u7684\u7528\u6237\u539F\u6587\`
@@ -41470,7 +41506,7 @@ function cloneState(s) {
     pendingSend: s.pendingSend.slice()
   };
 }
-var IDLE_KILL_DELAY_MS = 6e4;
+var IDLE_KILL_DELAY_MS = 6e5;
 function tryFlushPending(state, deps) {
   if (!state.readyForSend || state.pendingSend.length === 0) return [];
   const text = state.pendingSend.shift();
@@ -41527,8 +41563,6 @@ function buildSpawnContext(state, deps) {
   env.CLAWD_SESSION_ID = file.sessionId;
   const daemonUrl = deps.getDaemonUrl?.() ?? null;
   if (daemonUrl) env.CLAWD_DAEMON_URL = daemonUrl;
-  const dispatchId = deps.lookupDispatchByBSessionId?.(file.sessionId);
-  if (dispatchId) env.CLAWD_DISPATCH_ID = dispatchId;
   const personaId = file.ownerPersonaId;
   if (personaId) env.CLAWD_PERSONA_ID = personaId;
   const dispatchMcpConfigPath2 = deps.getDispatchMcpConfigPath?.() ?? null;
@@ -42141,6 +42175,18 @@ function reduceSession(state, input, deps) {
       if (state.status !== "running-idle") {
         return { state, effects: [] };
       }
+      if (input.subagentActive) {
+        return {
+          state,
+          effects: [
+            {
+              kind: "schedule-idle-kill",
+              sessionId: state.file.sessionId,
+              ms: IDLE_KILL_DELAY_MS
+            }
+          ]
+        };
+      }
       const next = cloneState(state);
       next.status = "stopping";
       return {
@@ -42197,10 +42243,11 @@ function reduceSession(state, input, deps) {
 // src/session/runner.ts
 init_stdout_splitter();
 init_permission_stdio();
+init_claude_history();
 
 // src/ipc-recorder.ts
-var import_node_fs4 = __toESM(require("fs"), 1);
-var import_node_path4 = __toESM(require("path"), 1);
+var import_node_fs5 = __toESM(require("fs"), 1);
+var import_node_path5 = __toESM(require("path"), 1);
 function tsForFilename(ms) {
   return new Date(ms).toISOString().replace(/[:.]/g, "-");
 }
@@ -42211,8 +42258,8 @@ function startRecorder(opts) {
     return null;
   }
   const now = opts.now ?? Date.now;
-  const dir = import_node_path4.default.join(opts.dataDir, "ipc-recordings", opts.sessionId);
-  const filePath = import_node_path4.default.join(dir, `${tsForFilename(now())}.jsonl`);
+  const dir = import_node_path5.default.join(opts.dataDir, "ipc-recordings", opts.sessionId);
+  const filePath = import_node_path5.default.join(dir, `${tsForFilename(now())}.jsonl`);
   let stream = null;
   let closedResolve;
   const closed = new Promise((resolve6) => {
@@ -42221,8 +42268,8 @@ function startRecorder(opts) {
   let exited = false;
   const ensureStream = () => {
     if (stream) return stream;
-    import_node_fs4.default.mkdirSync(dir, { recursive: true });
-    stream = import_node_fs4.default.createWriteStream(filePath, { flags: "a" });
+    import_node_fs5.default.mkdirSync(dir, { recursive: true });
+    stream = import_node_fs5.default.createWriteStream(filePath, { flags: "a" });
     stream.on("close", () => closedResolve());
     return stream;
   };
@@ -42267,6 +42314,7 @@ function encodeAllowWithInputControlResponse(requestId, updatedInput) {
   return JSON.stringify(payload) + "\n";
 }
 var DEFAULT_WAIT_STOP_TIMEOUT_MS = 3e3;
+var SUBAGENT_ACTIVE_WINDOW_MS = 3e5;
 var SessionRunner = class {
   constructor(initial, hooks) {
     this.hooks = hooks;
@@ -42320,14 +42368,14 @@ var SessionRunner = class {
       // 单栏 refactor (spec 2026-06-02 §5.1): cc 子进程 env 注入 CLAWD_DAEMON_URL，让 assistant
       // curl daemon HTTP RPC adapter (/api/rpc/<method>) 触发管理操作。null = HTTP adapter 未启。
       getDaemonUrl: this.hooks.getDaemonUrl,
-      // Persona dispatch：透传 dispatch.mcp.json 路径闭包 + B→dispatchId 反查闭包。
-      // 见 reducer.buildSpawnContext 注 CLAWD_DISPATCH_ID env / 派生 SpawnContext.dispatchMcpConfigPath
+      // Persona dispatch：透传 dispatch.mcp.json 路径闭包，让 cc spawn 加 --mcp-config flag
+      // 使两侧 cc 都能看到 personaDispatch / personaDispatchComplete tool（按 session 身份分工用哪个）。
+      // dispatchId 不注 cc env——complete handler 用 sessionId 反查 in-flight dispatchId 配对。
       getDispatchMcpConfigPath: this.hooks.getDispatchMcpConfigPath,
       getShiftMcpConfigPath: this.hooks.getShiftMcpConfigPath,
       getInboxMcpConfigPath: this.hooks.getInboxMcpConfigPath,
       // Ticket MCP：透传 ticket.mcp.json 路径闭包（reducer 内做 persona-ticket-manager gating）
       getTicketMcpConfigPath: this.hooks.getTicketMcpConfigPath,
-      lookupDispatchByBSessionId: this.hooks.lookupDispatchByBSessionId,
       // ReadyGate v2：透传 mode 让 reducer send / ready-detected 分支决定走暂存队列还是直写
       mode: this.hooks.mode,
       // [RG-DBG] 注入 logger 让 reducer rgDbg 走 pino 进 clawd.log；定位完跟 rgDbg 一起删
@@ -42579,7 +42627,7 @@ var SessionRunner = class {
         if (existing) clearTimeout(existing);
         const timer = setTimeout(() => {
           this.idleKillTimers.delete(effect.sessionId);
-          this.input({ kind: "idle-kill-fired" });
+          this.input({ kind: "idle-kill-fired", subagentActive: this.isSubagentActive() });
         }, effect.ms);
         timer.unref?.();
         this.idleKillTimers.set(effect.sessionId, timer);
@@ -42595,6 +42643,18 @@ var SessionRunner = class {
       }
     }
   }
+  // idle-kill 到点判定：本 session 的 subagents/ 里是否还有 agent-*.jsonl 在近期写盘。
+  // 新鲜（近 SUBAGENT_ACTIVE_WINDOW_MS 内有写）= 后台 subagent 还在干活 → 不该杀。
+  // 没有 toolSessionId（SDK 模式 CC 内生 id）/ 无目录 / 无 agent 文件 → false（照常回收）。
+  isSubagentActive() {
+    const toolSessionId = this.state.file.toolSessionId;
+    if (!toolSessionId) return false;
+    const projectsRoot = import_node_path6.default.join(this.hooks.home ?? import_node_os4.default.homedir(), ".claude", "projects");
+    const mtime = newestSubagentMtimeMs(projectsRoot, this.state.file.cwd, toolSessionId);
+    if (mtime === null) return false;
+    const now = (this.hooks.now ?? Date.now)();
+    return now - mtime < SUBAGENT_ACTIVE_WINDOW_MS;
+  }
   // 清空所有 idle-kill timer（runner dispose / proc 永久退出时调用）。
   // 不喂 idle-kill-fired —— dispose 路径不再翻 reducer 状态
   clearIdleKillTimers() {
@@ -42677,15 +42737,15 @@ function extractEditPath(input) {
 }
 
 // src/debug/pty-probe.ts
-var import_node_fs5 = __toESM(require("fs"), 1);
-var import_node_path5 = __toESM(require("path"), 1);
+var import_node_fs6 = __toESM(require("fs"), 1);
+var import_node_path7 = __toESM(require("path"), 1);
 var PROBE_DIR = "/tmp/clawd-probe";
-var EVENTS_FILE = import_node_path5.default.join(PROBE_DIR, "events.jsonl");
+var EVENTS_FILE = import_node_path7.default.join(PROBE_DIR, "events.jsonl");
 var inited = false;
 function ensureDir() {
   if (inited) return true;
   try {
-    import_node_fs5.default.mkdirSync(PROBE_DIR, { recursive: true });
+    import_node_fs6.default.mkdirSync(PROBE_DIR, { recursive: true });
     inited = true;
     return true;
   } catch {
@@ -42696,15 +42756,15 @@ function probeEvent(event, data = {}) {
   try {
     if (!ensureDir()) return;
     const line = JSON.stringify({ ts: Date.now(), event, ...data }) + "\n";
-    import_node_fs5.default.appendFileSync(EVENTS_FILE, line);
+    import_node_fs6.default.appendFileSync(EVENTS_FILE, line);
   } catch {
   }
 }
 function probeDumpReplay(sessionId, payload) {
   try {
     if (!ensureDir()) return "";
-    const file = import_node_path5.default.join(PROBE_DIR, `replay-${sessionId}-${Date.now()}.ans`);
-    import_node_fs5.default.writeFileSync(file, payload, "utf8");
+    const file = import_node_path7.default.join(PROBE_DIR, `replay-${sessionId}-${Date.now()}.ans`);
+    import_node_fs6.default.writeFileSync(file, payload, "utf8");
     return file;
   } catch {
     return "";
@@ -42799,9 +42859,22 @@ You may read this file with your Read tool to understand context. You do not hav
 
 When done, call the MCP tool \`mcp__clawd-dispatch__personaDispatchComplete\` with your result:
   - Success: { text: "...", filePaths?: ["abs/path", ...] }
-  - Failure: { isFailure: true, reason: "..." }
+  - Failure: { isFailure: true, reason: "..." }`;
+}
+function buildDispatchContinuationPack(args) {
+  return `[Dispatched from owner \u2014 follow-up query]
 
-dispatchId for this task: ${args.dispatchId}`;
+Although you reported back on the previous task, the owner has a follow-up question. Continue from where you left off.
+
+Owner's new message:
+${args.prompt}
+
+Source conversation (jsonl, same path as before, may contain new messages):
+  ${args.sourceJsonlPath}
+
+When done, call \`mcp__clawd-dispatch__personaDispatchComplete\` again with your result:
+  - Success: { text: "...", filePaths?: ["abs/path", ...] }
+  - Failure: { isFailure: true, reason: "..." }`;
 }
 function derivePersonaSpawnCwd(file, personaRoot) {
   const personaId = file.ownerPersonaId;
@@ -42811,7 +42884,7 @@ function derivePersonaSpawnCwd(file, personaRoot) {
       `derivePersonaSpawnCwd: personaRoot missing for owner session ${file.sessionId} (ownerPersonaId=${personaId})`
     );
   }
-  return import_node_path6.default.join(personaRoot, safeFileName(personaId));
+  return import_node_path8.default.join(personaRoot, safeFileName(personaId));
 }
 function makeInitialState(file, subSessionMeta) {
   return {
@@ -42936,10 +43009,10 @@ var SessionManager = class {
   // <dataDir>/sessions/ 列子目录 (排除 'default').
   listPersonaIdsOnDisk() {
     if (!this.deps.dataDir) return [];
-    const root = this.deps.storeFactory ? import_node_path6.default.join(this.deps.dataDir, "personas") : import_node_path6.default.join(this.deps.dataDir, "sessions");
+    const root = this.deps.storeFactory ? import_node_path8.default.join(this.deps.dataDir, "personas") : import_node_path8.default.join(this.deps.dataDir, "sessions");
     let entries;
     try {
-      entries = import_node_fs6.default.readdirSync(root, { withFileTypes: true });
+      entries = import_node_fs7.default.readdirSync(root, { withFileTypes: true });
     } catch (err) {
       const code = err?.code;
       if (code === "ENOENT") return [];
@@ -42952,7 +43025,7 @@ var SessionManager = class {
   // 只在 storeFactory 注入 (新布局) 下生效, 老布局无 guest 目录.
   listGuestCapIdsForPersona(personaId) {
     if (!this.deps.dataDir || !this.deps.storeFactory) return [];
-    const root = import_node_path6.default.join(
+    const root = import_node_path8.default.join(
       this.deps.dataDir,
       "personas",
       personaId,
@@ -42962,7 +43035,7 @@ var SessionManager = class {
     );
     let entries;
     try {
-      entries = import_node_fs6.default.readdirSync(root, { withFileTypes: true });
+      entries = import_node_fs7.default.readdirSync(root, { withFileTypes: true });
     } catch (err) {
       const code = err?.code;
       if (code === "ENOENT") return [];
@@ -43081,7 +43154,7 @@ var SessionManager = class {
       callerDisplayName
     );
     if (subSessionMeta?.userWorkDir) {
-      import_node_fs6.default.mkdirSync(subSessionMeta.userWorkDir, { recursive: true });
+      import_node_fs7.default.mkdirSync(subSessionMeta.userWorkDir, { recursive: true });
     }
     if (scope.kind === "persona" && scope.mode === "guest") {
       if (!this.deps.personaRoot || !subSessionMeta?.userWorkDir) {
@@ -43092,8 +43165,8 @@ var SessionManager = class {
       const base = this.deps.personaStore?.readSandboxSettings(scope.personaId) ?? null;
       const settings = composeGuestSandbox(base, subSessionMeta.userWorkDir, file.cwd);
       subSessionMeta.extraSettings = JSON.stringify(settings);
-      const home = import_node_os3.default.homedir();
-      const expand = (p2) => p2 === "~" ? home : p2.startsWith("~/") ? import_node_path6.default.join(home, p2.slice(2)) : p2;
+      const home = import_node_os5.default.homedir();
+      const expand = (p2) => p2 === "~" ? home : p2.startsWith("~/") ? import_node_path8.default.join(home, p2.slice(2)) : p2;
       const codexCfg = this.deps.personaStore?.readCodexSandboxSettings(scope.personaId) ?? null;
       subSessionMeta.codexSandbox = {
         writableRoots: [subSessionMeta.userWorkDir, ...(codexCfg?.writableRoots ?? []).map(expand)],
@@ -43122,13 +43195,13 @@ var SessionManager = class {
       // 单栏 refactor (spec 2026-06-02 §5.1): 透传 daemon HTTP RPC base URL 闭包,
       // reducer 把它注入 cc 子进程 env CLAWD_DAEMON_URL.
       getDaemonUrl: this.deps.getDaemonUrl,
-      // Persona dispatch (Task 7): dispatch.mcp.json 路径 + B sessionId → dispatchId 反查
-      // 闭包透传给 reducer，让 cc spawn 加 --mcp-config flag + B session 注 CLAWD_DISPATCH_ID env.
+      // Persona dispatch: dispatch.mcp.json 路径闭包透传给 reducer，让 cc spawn 加
+      // --mcp-config flag 挂 dispatch MCP server（两侧 cc 都挂，按 session 身份分工调 tool）。
+      // dispatchId 不再走 cc env——complete handler 用 sessionId 反查 in-flight dispatchId 配对。
       getDispatchMcpConfigPath: this.deps.dispatchMcpConfigPath ? () => this.deps.dispatchMcpConfigPath ?? null : void 0,
       getTicketMcpConfigPath: this.deps.ticketMcpConfigPath ? () => this.deps.ticketMcpConfigPath ?? null : void 0,
       getShiftMcpConfigPath: this.deps.shiftMcpConfigPath ? () => this.deps.shiftMcpConfigPath ?? null : void 0,
       getInboxMcpConfigPath: this.deps.inboxMcpConfigPath ? () => this.deps.inboxMcpConfigPath ?? null : void 0,
-      lookupDispatchByBSessionId: this.deps.personaDispatchManager ? (bSid) => this.deps.personaDispatchManager?.lookupDispatchByBSessionId(bSid) : void 0,
       // file-sharing (spec §6 PR 3)：闭包 scope + sessionId，runner 只暴露 tool/relPath/cwd
       onFileEdit: attachmentGroup ? (input) => attachmentGroup.onFileEdit({
         scope,
@@ -43246,7 +43319,7 @@ var SessionManager = class {
       throw new ClawdError(ERROR_CODES.INVALID_CWD, "cwd required when ownerPersonaId is absent");
     }
     try {
-      const stat = import_node_fs6.default.statSync(cwd);
+      const stat = import_node_fs7.default.statSync(cwd);
       if (!stat.isDirectory()) throw new Error("not dir");
     } catch {
       throw new ClawdError(ERROR_CODES.INVALID_CWD, `cwd not a directory: ${cwd}`);
@@ -43777,7 +43850,7 @@ var SessionManager = class {
    */
   createForScope(args) {
     try {
-      const stat = import_node_fs6.default.statSync(args.cwd);
+      const stat = import_node_fs7.default.statSync(args.cwd);
       if (!stat.isDirectory()) throw new Error("not dir");
     } catch {
       throw new ClawdError(ERROR_CODES.INVALID_CWD, `cwd not a directory: ${args.cwd}`);
@@ -43968,10 +44041,11 @@ var SessionManager = class {
    * Persona dispatch: 启动 B session 并投递任务包当第一条 user message。
    *
    *   - 复用 persona-owner 创建路径（cwd=personaDir、scope=persona-owner、不沙箱）
-   *   - SessionFile 上写 dispatchedFromSessionId 关联回 A（UI 折叠用；mirror 一侧 strip）
-   *   - 跟 PersonaDispatchManager 双向登记 dispatchId ↔ B sessionId，让后续 reducer
-   *     buildSpawnContext 能反查到 dispatchId 注 CLAWD_DISPATCH_ID env
-   *   - 投 inject-owner-text 任务包；包尾教 B 用 personaDispatchComplete tool 回传
+   *   - SessionFile 上写 dispatchedFromSessionId 关联回 A（UI 折叠用；mirror 一侧 strip；
+   *     targetSessionId 复用路径也按此字段校验寻址来源）
+   *   - 跟 PersonaDispatchManager 登记 dispatchId → B sessionId（complete handler 用
+   *     findInflightDispatchByBSessionId 反查回 dispatchId 配对回 A 的 waiter）
+   *   - 投任务包；包尾教 B 用 personaDispatchComplete tool 回传
    *
    * cwd 派生与 SessionManager.create 的 owner persona 路径一致（derivePersonaSpawnCwd）。
    */
@@ -43993,7 +44067,7 @@ var SessionManager = class {
       personaId: args.targetPersona,
       mode: "owner"
     };
-    const cwd = import_node_path6.default.join(this.deps.personaRoot, safeFileName(args.targetPersona));
+    const cwd = import_node_path8.default.join(this.deps.personaRoot, safeFileName(args.targetPersona));
     const now = (/* @__PURE__ */ new Date()).toISOString();
     const file = {
       sessionId,
@@ -44026,8 +44100,7 @@ var SessionManager = class {
     });
     const taskPack = buildDispatchTaskPack({
       prompt: args.prompt,
-      sourceJsonlPath: args.sourceJsonlPath,
-      dispatchId: args.dispatchId
+      sourceJsonlPath: args.sourceJsonlPath
     });
     runner.input({ kind: "command", command: { kind: "send", text: taskPack } });
     this.deps.logger?.info("dispatch.createDispatchedSession.task-pack-sent", {
@@ -44036,6 +44109,59 @@ var SessionManager = class {
     });
     return { sessionId };
   }
+  /**
+   * targetSessionId 精确寻址已知 B session 复用其上下文。投 continuation pack 给 runner。
+   *
+   * 关键差异 vs createDispatchedSession：
+   *   - 不 newSessionId() / 不写 SessionFile —— B session 复用（走 findOwnedSession）
+   *   - 权限校验：本地 dispatch → SessionFile.dispatchedFromSessionId === A 的 sessionId；
+   *     跨设备 B 角色 → SessionFile.creatorPrincipalId === A 的 deviceId
+   *   - 跟 PersonaDispatchManager 重新登记（新 dispatchId 复用同 bSessionId）
+   *   - ensureRunnerForScope: cc 活复用；cc 死时首次 send 触发 spawn，jsonl 已存在自动 --resume
+   *
+   * @param callerIdentity 权限校验依据：
+   *   - kind='local': A 的 sessionId（本机 dispatch），校验 dispatchedFromSessionId 匹配
+   *   - kind='guest': A 的 deviceId（跨设备转发进来的 A），校验 creatorPrincipalId 匹配
+   */
+  resumeDispatchedSession(args) {
+    if (!this.deps.personaDispatchManager) {
+      throw new Error("resumeDispatchedSession: personaDispatchManager missing in ManagerDeps");
+    }
+    const file = this.findOwnedSession(args.bSessionId);
+    if (!file) {
+      throw new Error(`resumeDispatchedSession: B session ${args.bSessionId} not found`);
+    }
+    if (args.callerIdentity.kind === "local") {
+      if (file.dispatchedFromSessionId !== args.callerIdentity.sourceSessionId) {
+        throw new Error(
+          `resumeDispatchedSession: session ${args.bSessionId} not dispatched by caller (dispatchedFromSessionId mismatch)`
+        );
+      }
+    } else {
+      if (file.creatorPrincipalId !== args.callerIdentity.sourcePrincipalId) {
+        throw new Error(
+          `resumeDispatchedSession: session ${args.bSessionId} not dispatched by caller device (creatorPrincipalId mismatch)`
+        );
+      }
+    }
+    const scope = this.scopeForFile(file);
+    this.deps.personaDispatchManager.registerBSession(args.dispatchId, args.bSessionId);
+    this.deps.logger?.info("dispatch.resumeDispatchedSession.registered", {
+      dispatchId: args.dispatchId,
+      bSessionId: args.bSessionId
+    });
+    const runner = this.ensureRunnerForScope(file, scope);
+    const pack = buildDispatchContinuationPack({
+      prompt: args.prompt,
+      sourceJsonlPath: args.sourceJsonlPath
+    });
+    runner.input({ kind: "command", command: { kind: "send", text: pack } });
+    this.deps.logger?.info("dispatch.resumeDispatchedSession.continuation-sent", {
+      dispatchId: args.dispatchId,
+      bSessionId: args.bSessionId
+    });
+    return { sessionId: args.bSessionId };
+  }
   /**
    * shift v1 (spec 2026-06-24-clawd-shift)：到点 fire 时由 ShiftScheduler 调，
    * 起一个新 cc session 跑 prompt（fire-and-forget，不绑 dispatchId / 不挂 caller）。
@@ -44058,7 +44184,7 @@ var SessionManager = class {
       personaId: args.targetPersona,
       mode: "owner"
     };
-    const cwd = import_node_path6.default.join(this.deps.personaRoot, safeFileName(args.targetPersona));
+    const cwd = import_node_path8.default.join(this.deps.personaRoot, safeFileName(args.targetPersona));
     const now = (/* @__PURE__ */ new Date()).toISOString();
     const file = {
       sessionId,
@@ -44540,28 +44666,28 @@ var SessionManager = class {
 };
 
 // src/persona/store.ts
-var fs7 = __toESM(require("fs"), 1);
-var path9 = __toESM(require("path"), 1);
+var fs8 = __toESM(require("fs"), 1);
+var path11 = __toESM(require("path"), 1);
 init_protocol();
 var PersonaStore = class {
   constructor(root) {
     this.root = root;
-    fs7.mkdirSync(root, { recursive: true });
+    fs8.mkdirSync(root, { recursive: true });
   }
   root;
   personaDir(personaId) {
-    return path9.join(this.root, safeFileName(personaId));
+    return path11.join(this.root, safeFileName(personaId));
   }
   metaPath(personaId) {
-    return path9.join(this.personaDir(personaId), ".clawd", "persona.json");
+    return path11.join(this.personaDir(personaId), ".clawd", "persona.json");
   }
   claudeMdPath(personaId) {
-    return path9.join(this.personaDir(personaId), "CLAUDE.md");
+    return path11.join(this.personaDir(personaId), "CLAUDE.md");
   }
   // codex 原生读 cwd 的 AGENTS.md。人格双写镜像：claude 读 CLAUDE.md、codex 读 AGENTS.md，
   // 两份内容恒一致，persona 切 tool 零迁移。
   agentsMdPath(personaId) {
-    return path9.join(this.personaDir(personaId), "AGENTS.md");
+    return path11.join(this.personaDir(personaId), "AGENTS.md");
   }
   /**
    * persona 级 sandbox base 落盘路径 —— 故意放 `.clawd/` 而非 `.claude/`，让 CC 的 project
@@ -44570,11 +44696,11 @@ var PersonaStore = class {
    * spawn 前 per-guest 动态拼到各自 session 目录的那份（base + 强制底座 + 本 guest userWorkDir carve）。
    */
   sandboxSettingsPath(personaId) {
-    return path9.join(this.personaDir(personaId), ".clawd", "sandbox-settings.json");
+    return path11.join(this.personaDir(personaId), ".clawd", "sandbox-settings.json");
   }
   write(persona, personality) {
     const dir = this.personaDir(persona.personaId);
-    fs7.mkdirSync(path9.join(dir, ".clawd"), { recursive: true });
+    fs8.mkdirSync(path11.join(dir, ".clawd"), { recursive: true });
     this.atomicWrite(this.claudeMdPath(persona.personaId), personality);
     this.atomicWrite(this.agentsMdPath(persona.personaId), personality);
     this.writeSandboxSettings(persona.personaId, buildGuestSettingsV1());
@@ -44593,9 +44719,9 @@ var PersonaStore = class {
   ensureAgentsMirror(personaId) {
     const claudeMd = this.claudeMdPath(personaId);
     const agentsMd = this.agentsMdPath(personaId);
-    if (!fs7.existsSync(claudeMd)) return false;
-    if (fs7.existsSync(agentsMd)) return false;
-    this.atomicWrite(agentsMd, fs7.readFileSync(claudeMd, "utf8"));
+    if (!fs8.existsSync(claudeMd)) return false;
+    if (fs8.existsSync(agentsMd)) return false;
+    this.atomicWrite(agentsMd, fs8.readFileSync(claudeMd, "utf8"));
     return true;
   }
   /**
@@ -44619,22 +44745,22 @@ var PersonaStore = class {
     return { ...s, permissions: { ...s.permissions ?? {}, deny: [...prev, rule] } };
   }
   codexSandboxSettingsPath(personaId) {
-    return path9.join(this.personaDir(personaId), ".clawd", "codex-sandbox.json");
+    return path11.join(this.personaDir(personaId), ".clawd", "codex-sandbox.json");
   }
   /** 读 codex-sandbox.json；不存在/损坏 → null。 */
   readCodexSandboxSettings(personaId) {
     const p2 = this.codexSandboxSettingsPath(personaId);
-    if (!fs7.existsSync(p2)) return null;
+    if (!fs8.existsSync(p2)) return null;
     try {
-      return CodexSandboxSettingsSchema.parse(JSON.parse(fs7.readFileSync(p2, "utf8")));
+      return CodexSandboxSettingsSchema.parse(JSON.parse(fs8.readFileSync(p2, "utf8")));
     } catch {
       return null;
     }
   }
   /** 覆盖写 codex-sandbox.json（seed/migrate 用）。 */
   writeCodexSandboxSettings(personaId, settings) {
-    const dir = path9.join(this.personaDir(personaId), ".clawd");
-    fs7.mkdirSync(dir, { recursive: true });
+    const dir = path11.join(this.personaDir(personaId), ".clawd");
+    fs8.mkdirSync(dir, { recursive: true });
     this.atomicWrite(this.codexSandboxSettingsPath(personaId), JSON.stringify(settings, null, 2));
   }
   writeMeta(persona) {
@@ -44642,8 +44768,8 @@ var PersonaStore = class {
   }
   read(personaId) {
     const p2 = this.metaPath(personaId);
-    if (!fs7.existsSync(p2)) return null;
-    const raw = JSON.parse(fs7.readFileSync(p2, "utf8"));
+    if (!fs8.existsSync(p2)) return null;
+    const raw = JSON.parse(fs8.readFileSync(p2, "utf8"));
     if (raw && typeof raw === "object" && "tokenMap" in raw) {
       delete raw.tokenMap;
       this.atomicWrite(p2, JSON.stringify(raw, null, 2));
@@ -44651,13 +44777,13 @@ var PersonaStore = class {
     return PersonaFileSchema.parse(raw);
   }
   has(personaId) {
-    return fs7.existsSync(this.metaPath(personaId));
+    return fs8.existsSync(this.metaPath(personaId));
   }
   readPersonality(personaId) {
     const claudeMd = this.claudeMdPath(personaId);
-    if (fs7.existsSync(claudeMd)) return fs7.readFileSync(claudeMd, "utf8");
+    if (fs8.existsSync(claudeMd)) return fs8.readFileSync(claudeMd, "utf8");
     const agentsMd = this.agentsMdPath(personaId);
-    if (fs7.existsSync(agentsMd)) return fs7.readFileSync(agentsMd, "utf8");
+    if (fs8.existsSync(agentsMd)) return fs8.readFileSync(agentsMd, "utf8");
     return null;
   }
   /**
@@ -44666,23 +44792,23 @@ var PersonaStore = class {
    */
   readSandboxSettings(personaId) {
     const p2 = this.sandboxSettingsPath(personaId);
-    if (!fs7.existsSync(p2)) return null;
+    if (!fs8.existsSync(p2)) return null;
     try {
-      return JSON.parse(fs7.readFileSync(p2, "utf8"));
+      return JSON.parse(fs8.readFileSync(p2, "utf8"));
     } catch {
       return null;
     }
   }
   /** Persona 私有 skills 目录路径：<personaDir>/.claude/skills */
   skillsDir(personaId) {
-    return path9.join(this.personaDir(personaId), ".claude", "skills");
+    return path11.join(this.personaDir(personaId), ".claude", "skills");
   }
   /**
    * Claude Code 项目级 settings 路径：`<personaDir>/.claude/settings.json`。
    * 这里只读 `enabledPlugins` 字段，由 owner 通过 CC `/plugin` 之类命令维护，daemon 不写。
    */
   claudeSettingsPath(personaId) {
-    return path9.join(this.personaDir(personaId), ".claude", "settings.json");
+    return path11.join(this.personaDir(personaId), ".claude", "settings.json");
   }
   /**
    * 读取 persona 的 `.claude/settings.json` 中 `enabledPlugins` map，把 value === true
@@ -44697,10 +44823,10 @@ var PersonaStore = class {
    */
   readEnabledPlugins(personaId) {
     const p2 = this.claudeSettingsPath(personaId);
-    if (!fs7.existsSync(p2)) return [];
+    if (!fs8.existsSync(p2)) return [];
     let raw;
     try {
-      raw = JSON.parse(fs7.readFileSync(p2, "utf8"));
+      raw = JSON.parse(fs8.readFileSync(p2, "utf8"));
     } catch {
       return [];
     }
@@ -44714,22 +44840,22 @@ var PersonaStore = class {
     return out;
   }
   list() {
-    if (!fs7.existsSync(this.root)) return [];
-    return fs7.readdirSync(this.root).filter((name) => {
-      return fs7.existsSync(path9.join(this.root, name, ".clawd", "persona.json"));
+    if (!fs8.existsSync(this.root)) return [];
+    return fs8.readdirSync(this.root).filter((name) => {
+      return fs8.existsSync(path11.join(this.root, name, ".clawd", "persona.json"));
     });
   }
   remove(personaId) {
     const dir = this.personaDir(personaId);
-    if (fs7.existsSync(dir)) fs7.rmSync(dir, { recursive: true, force: true });
+    if (fs8.existsSync(dir)) fs8.rmSync(dir, { recursive: true, force: true });
   }
   personaDirPath(personaId) {
     return this.personaDir(personaId);
   }
   atomicWrite(file, content) {
     const tmp = `${file}.tmp-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
-    fs7.writeFileSync(tmp, content, { mode: 384 });
-    fs7.renameSync(tmp, file);
+    fs8.writeFileSync(tmp, content, { mode: 384 });
+    fs8.renameSync(tmp, file);
   }
 };
 
@@ -44775,9 +44901,9 @@ var PersonaRegistry = class {
 var import_node_crypto3 = __toESM(require("crypto"), 1);
 
 // src/skills/scanner.ts
-var import_node_fs7 = __toESM(require("fs"), 1);
-var import_node_os4 = __toESM(require("os"), 1);
-var import_node_path7 = __toESM(require("path"), 1);
+var import_node_fs8 = __toESM(require("fs"), 1);
+var import_node_os6 = __toESM(require("os"), 1);
+var import_node_path9 = __toESM(require("path"), 1);
 
 // src/skills/frontmatter.ts
 var STRIP_QUOTES = /^["']|["']$/g;
@@ -44886,7 +45012,7 @@ function parseDescription(content) {
 }
 function isDirLikeSync(p2) {
   try {
-    return import_node_fs7.default.statSync(p2).isDirectory();
+    return import_node_fs8.default.statSync(p2).isDirectory();
   } catch {
     return false;
   }
@@ -44894,19 +45020,19 @@ function isDirLikeSync(p2) {
 function scanSkillDir(dir, source, seen, out, pluginName) {
   let entries;
   try {
-    entries = import_node_fs7.default.readdirSync(dir, { withFileTypes: true });
+    entries = import_node_fs8.default.readdirSync(dir, { withFileTypes: true });
   } catch {
     return;
   }
   for (const ent of entries) {
-    const entryPath = import_node_path7.default.join(dir, ent.name);
+    const entryPath = import_node_path9.default.join(dir, ent.name);
     if (!ent.isDirectory() && !(ent.isSymbolicLink() && isDirLikeSync(entryPath))) continue;
     let content;
     try {
-      content = import_node_fs7.default.readFileSync(import_node_path7.default.join(entryPath, "SKILL.md"), "utf8");
+      content = import_node_fs8.default.readFileSync(import_node_path9.default.join(entryPath, "SKILL.md"), "utf8");
     } catch {
       try {
-        content = import_node_fs7.default.readFileSync(import_node_path7.default.join(entryPath, "skill.md"), "utf8");
+        content = import_node_fs8.default.readFileSync(import_node_path9.default.join(entryPath, "skill.md"), "utf8");
       } catch {
         continue;
       }
@@ -44930,26 +45056,26 @@ function listSkillsForDir(dir, source) {
 function scanCommandDir(dir, source, seen, out, pluginName) {
   let entries;
   try {
-    entries = import_node_fs7.default.readdirSync(dir, { withFileTypes: true });
+    entries = import_node_fs8.default.readdirSync(dir, { withFileTypes: true });
   } catch {
     return;
   }
   for (const ent of entries) {
-    const entryPath = import_node_path7.default.join(dir, ent.name);
+    const entryPath = import_node_path9.default.join(dir, ent.name);
     if (ent.isDirectory() || ent.isSymbolicLink() && isDirLikeSync(entryPath)) {
       const ns = ent.name;
       let subEntries;
       try {
-        subEntries = import_node_fs7.default.readdirSync(entryPath, { withFileTypes: true });
+        subEntries = import_node_fs8.default.readdirSync(entryPath, { withFileTypes: true });
       } catch {
         continue;
       }
       for (const se of subEntries) {
         if (!se.name.endsWith(".md")) continue;
-        const sePath = import_node_path7.default.join(entryPath, se.name);
+        const sePath = import_node_path9.default.join(entryPath, se.name);
         let content;
         try {
-          content = import_node_fs7.default.readFileSync(sePath, "utf8");
+          content = import_node_fs8.default.readFileSync(sePath, "utf8");
         } catch {
           continue;
         }
@@ -44966,7 +45092,7 @@ function scanCommandDir(dir, source, seen, out, pluginName) {
     } else if (ent.name.endsWith(".md")) {
       let content;
       try {
-        content = import_node_fs7.default.readFileSync(entryPath, "utf8");
+        content = import_node_fs8.default.readFileSync(entryPath, "utf8");
       } catch {
         continue;
       }
@@ -44982,10 +45108,10 @@ function scanCommandDir(dir, source, seen, out, pluginName) {
   }
 }
 function readInstalledPlugins(home) {
-  const file = import_node_path7.default.join(home, ".claude", "plugins", "installed_plugins.json");
+  const file = import_node_path9.default.join(home, ".claude", "plugins", "installed_plugins.json");
   let raw;
   try {
-    raw = import_node_fs7.default.readFileSync(file, "utf8");
+    raw = import_node_fs8.default.readFileSync(file, "utf8");
   } catch {
     return [];
   }
@@ -45010,7 +45136,7 @@ var SkillsScanner = class {
   home;
   extraPluginRoots;
   constructor(opts = {}) {
-    this.home = opts.home ?? import_node_os4.default.homedir();
+    this.home = opts.home ?? import_node_os6.default.homedir();
     this.extraPluginRoots = opts.extraPluginRoots ?? [];
   }
   /**
@@ -45033,14 +45159,14 @@ var SkillsScanner = class {
       });
     }
     const fsBlock = [];
-    scanSkillDir(import_node_path7.default.join(this.home, ".claude", "skills"), "global", seen, fsBlock);
-    scanCommandDir(import_node_path7.default.join(this.home, ".claude", "commands"), "global", seen, fsBlock);
-    scanSkillDir(import_node_path7.default.join(args.cwd, ".claude", "skills"), "project", seen, fsBlock);
-    scanCommandDir(import_node_path7.default.join(args.cwd, ".claude", "commands"), "project", seen, fsBlock);
+    scanSkillDir(import_node_path9.default.join(this.home, ".claude", "skills"), "global", seen, fsBlock);
+    scanCommandDir(import_node_path9.default.join(this.home, ".claude", "commands"), "global", seen, fsBlock);
+    scanSkillDir(import_node_path9.default.join(args.cwd, ".claude", "skills"), "project", seen, fsBlock);
+    scanCommandDir(import_node_path9.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_path7.default.join(root, "skills"), "plugin", seen, fsBlock, name);
-      scanCommandDir(import_node_path7.default.join(root, "commands"), "plugin", seen, fsBlock, name);
+      scanSkillDir(import_node_path9.default.join(root, "skills"), "plugin", seen, fsBlock, name);
+      scanCommandDir(import_node_path9.default.join(root, "commands"), "plugin", seen, fsBlock, name);
     }
     fsBlock.sort((a, b2) => a.name < b2.name ? -1 : a.name > b2.name ? 1 : 0);
     return [...builtinBlock, ...fsBlock];
@@ -45146,8 +45272,8 @@ var PersonaManager = class {
 };
 
 // src/persona/seed.ts
-var fs9 = __toESM(require("fs"), 1);
-var path11 = __toESM(require("path"), 1);
+var fs10 = __toESM(require("fs"), 1);
+var path13 = __toESM(require("path"), 1);
 var import_node_url = require("url");
 var import_meta = {};
 var DEFAULT_BYPASS_PROFILE = {
@@ -45178,16 +45304,6 @@ var DEFAULT_PERSONAS = [
     public: false,
     sandboxProfile: DEFAULT_BYPASS_PROFILE
   },
-  {
-    // 工单管理员：纯操作员，按指令调 clawd-ticket MCP 增删改查 ticket。MCP 由 daemon 全局
-    // 注入（index.ts ticket-mcp wiring），persona 端不需要单独 .mcp.json。
-    personaId: "persona-ticket-manager",
-    label: "\u5DE5\u5355\u7BA1\u7406\u5458",
-    model: "opus",
-    iconKey: "assist",
-    public: false,
-    sandboxProfile: DEFAULT_BYPASS_PROFILE
-  },
   {
     personaId: "persona-feishu-assistant",
     label: "\u98DE\u4E66\u52A9\u7406",
@@ -45281,14 +45397,6 @@ var DEFAULT_PERSONAS = [
     public: false,
     sandboxProfile: DEFAULT_BYPASS_PROFILE
   },
-  {
-    personaId: "persona-bug-fixer",
-    label: "Bug \u4FEE\u590D\u5E08",
-    model: "opus",
-    iconKey: "debug",
-    public: false,
-    sandboxProfile: DEFAULT_BYPASS_PROFILE
-  },
   {
     // HTML PPT 制作师：把想法/文字/旧 PPT 转成单文件 HTML 演示稿
     // bundle 含 frontend-slides skill（MIT，Zara Zhang），daemon ship 进 .claude/skills/
@@ -45335,24 +45443,24 @@ function bundleSiblingFromArgv(argv1, sibling) {
   if (!argv1) return null;
   let real = argv1;
   try {
-    real = fs9.realpathSync(argv1);
+    real = fs10.realpathSync(argv1);
   } catch {
   }
-  return path11.resolve(path11.dirname(real), sibling);
+  return path13.resolve(path13.dirname(real), sibling);
 }
 function findDefaultsRoot(logger) {
   const candidates = [];
   try {
-    const here = path11.dirname((0, import_node_url.fileURLToPath)(import_meta.url));
-    candidates.push(path11.resolve(here, "defaults"));
-    candidates.push(path11.resolve(here, "persona-defaults"));
+    const here = path13.dirname((0, import_node_url.fileURLToPath)(import_meta.url));
+    candidates.push(path13.resolve(here, "defaults"));
+    candidates.push(path13.resolve(here, "persona-defaults"));
   } catch {
   }
   const fromArgv = bundleSiblingFromArgv(process.argv[1], "persona-defaults");
   if (fromArgv) candidates.push(fromArgv);
   for (const c of candidates) {
     try {
-      if (fs9.statSync(c).isDirectory()) {
+      if (fs10.statSync(c).isDirectory()) {
         logger?.info("persona.defaults-root.resolved", { root: c });
         return c;
       }
@@ -45369,8 +45477,8 @@ function seedDefaultPersonas(args) {
       args.logger.info("persona.seed.skip", { personaId: entry.personaId, reason: "exists" });
       continue;
     }
-    const bundleDir = path11.join(args.defaultsRoot, entry.personaId);
-    if (!fs9.existsSync(bundleDir)) {
+    const bundleDir = path13.join(args.defaultsRoot, entry.personaId);
+    if (!fs10.existsSync(bundleDir)) {
       args.logger.warn("persona.seed.skip", {
         personaId: entry.personaId,
         reason: "bundle-missing",
@@ -45378,8 +45486,8 @@ function seedDefaultPersonas(args) {
       });
       continue;
     }
-    const claudeMdPath = path11.join(bundleDir, "CLAUDE.md");
-    if (!fs9.existsSync(claudeMdPath)) {
+    const claudeMdPath = path13.join(bundleDir, "CLAUDE.md");
+    if (!fs10.existsSync(claudeMdPath)) {
       args.logger.warn("persona.seed.skip", {
         personaId: entry.personaId,
         reason: "no-CLAUDE.md",
@@ -45387,7 +45495,7 @@ function seedDefaultPersonas(args) {
       });
       continue;
     }
-    const personality = fs9.readFileSync(claudeMdPath, "utf8");
+    const personality = fs10.readFileSync(claudeMdPath, "utf8");
     const now = Date.now();
     const persona = {
       personaId: entry.personaId,
@@ -45413,17 +45521,17 @@ function seedDefaultPersonas(args) {
   }
 }
 function skipNodeModulesUnder(srcRoot) {
-  return (src) => !path11.relative(srcRoot, src).split(path11.sep).includes("node_modules");
+  return (src) => !path13.relative(srcRoot, src).split(path13.sep).includes("node_modules");
 }
 function copyBundleExtras(srcDir, dstDir) {
-  for (const entry of fs9.readdirSync(srcDir, { withFileTypes: true })) {
+  for (const entry of fs10.readdirSync(srcDir, { withFileTypes: true })) {
     if (entry.name === "CLAUDE.md" || entry.name === ".clawd") continue;
-    const srcPath = path11.join(srcDir, entry.name);
-    const dstPath = path11.join(dstDir, entry.name);
+    const srcPath = path13.join(srcDir, entry.name);
+    const dstPath = path13.join(dstDir, entry.name);
     if (entry.isDirectory()) {
-      fs9.cpSync(srcPath, dstPath, { recursive: true, dereference: true, filter: skipNodeModulesUnder(srcPath) });
+      fs10.cpSync(srcPath, dstPath, { recursive: true, dereference: true, filter: skipNodeModulesUnder(srcPath) });
     } else if (entry.isFile()) {
-      fs9.copyFileSync(srcPath, dstPath);
+      fs10.copyFileSync(srcPath, dstPath);
     }
   }
 }
@@ -45431,16 +45539,16 @@ var DAEMON_MANAGED_PATHS = ["extension-kit", "CLAUDE.md", ".mcp.json"];
 function refreshDaemonManagedDirs(args) {
   const entries = args.entries ?? DEFAULT_PERSONAS;
   for (const entry of entries) {
-    const bundleDir = path11.join(args.defaultsRoot, entry.personaId);
-    if (!fs9.existsSync(bundleDir)) continue;
+    const bundleDir = path13.join(args.defaultsRoot, entry.personaId);
+    if (!fs10.existsSync(bundleDir)) continue;
     const personaDir = args.store.personaDirPath(entry.personaId);
-    if (!fs9.existsSync(personaDir)) continue;
+    if (!fs10.existsSync(personaDir)) continue;
     for (const relPath of DAEMON_MANAGED_PATHS) {
-      const srcPath = path11.join(bundleDir, relPath);
-      if (!fs9.existsSync(srcPath)) continue;
-      const dstPath = path11.join(personaDir, relPath);
+      const srcPath = path13.join(bundleDir, relPath);
+      if (!fs10.existsSync(srcPath)) continue;
+      const dstPath = path13.join(personaDir, relPath);
       try {
-        fs9.cpSync(srcPath, dstPath, { recursive: true, force: true, dereference: true, filter: skipNodeModulesUnder(srcPath) });
+        fs10.cpSync(srcPath, dstPath, { recursive: true, force: true, dereference: true, filter: skipNodeModulesUnder(srcPath) });
         args.logger.info("persona.refresh.synced", {
           personaId: entry.personaId,
           path: relPath
@@ -45500,15 +45608,15 @@ function migrateCodexSandbox(args) {
 function findDeployKitRoot(logger) {
   const candidates = [];
   try {
-    const here = path11.dirname((0, import_node_url.fileURLToPath)(import_meta.url));
-    candidates.push(path11.resolve(here, "..", "deploy-kit"));
+    const here = path13.dirname((0, import_node_url.fileURLToPath)(import_meta.url));
+    candidates.push(path13.resolve(here, "..", "deploy-kit"));
   } catch {
   }
   const fromArgv = bundleSiblingFromArgv(process.argv[1], "deploy-kit");
   if (fromArgv) candidates.push(fromArgv);
   for (const c of candidates) {
     try {
-      if (fs9.statSync(c).isDirectory()) {
+      if (fs10.statSync(c).isDirectory()) {
         logger?.info("persona.deploy-kit-root.resolved", { root: c });
         return c;
       }
@@ -45519,8 +45627,8 @@ function findDeployKitRoot(logger) {
   return null;
 }
 function seedDeployKit(args) {
-  const dst = path11.join(args.dataDir, "deploy-kit");
-  fs9.cpSync(args.deployKitBundleRoot, dst, {
+  const dst = path13.join(args.dataDir, "deploy-kit");
+  fs10.cpSync(args.deployKitBundleRoot, dst, {
     recursive: true,
     dereference: true,
     force: false,
@@ -45529,35 +45637,35 @@ function seedDeployKit(args) {
   args.logger.info("deploy-kit.seed.done", { dst });
 }
 function refreshDeployKit(args) {
-  const dst = path11.join(args.dataDir, "deploy-kit");
-  if (!fs9.existsSync(dst)) {
+  const dst = path13.join(args.dataDir, "deploy-kit");
+  if (!fs10.existsSync(dst)) {
     seedDeployKit(args);
     return;
   }
   for (const sub of ["scripts", "contract"]) {
-    const s = path11.join(args.deployKitBundleRoot, sub);
-    if (fs9.existsSync(s)) {
-      fs9.cpSync(s, path11.join(dst, sub), { recursive: true, force: true, dereference: true });
+    const s = path13.join(args.deployKitBundleRoot, sub);
+    if (fs10.existsSync(s)) {
+      fs10.cpSync(s, path13.join(dst, sub), { recursive: true, force: true, dereference: true });
     }
   }
-  const secretsSrc = path11.join(args.deployKitBundleRoot, ".secrets");
-  if (fs9.existsSync(secretsSrc)) {
-    fs9.mkdirSync(path11.join(dst, ".secrets"), { recursive: true });
-    for (const f of fs9.readdirSync(secretsSrc)) {
+  const secretsSrc = path13.join(args.deployKitBundleRoot, ".secrets");
+  if (fs10.existsSync(secretsSrc)) {
+    fs10.mkdirSync(path13.join(dst, ".secrets"), { recursive: true });
+    for (const f of fs10.readdirSync(secretsSrc)) {
       if (!f.endsWith(".example")) continue;
-      fs9.copyFileSync(path11.join(secretsSrc, f), path11.join(dst, ".secrets", f));
+      fs10.copyFileSync(path13.join(secretsSrc, f), path13.join(dst, ".secrets", f));
     }
   }
   args.logger.info("deploy-kit.refresh.done", { dst });
 }
 
 // src/share-md-viewer/load.ts
-var import_node_fs9 = __toESM(require("fs"), 1);
-var import_node_path8 = __toESM(require("path"), 1);
+var import_node_fs10 = __toESM(require("fs"), 1);
+var import_node_path10 = __toESM(require("path"), 1);
 var import_node_url2 = require("url");
 
 // src/share-md-viewer/asset-loader.ts
-var import_node_fs8 = __toESM(require("fs"), 1);
+var import_node_fs9 = __toESM(require("fs"), 1);
 function htmlEscape(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
 }
@@ -45565,12 +45673,12 @@ function createViewerAssetLoader(opts) {
   let viewerTemplate;
   let errorTemplate;
   try {
-    viewerTemplate = import_node_fs8.default.readFileSync(opts.viewerHtmlPath, "utf8");
+    viewerTemplate = import_node_fs9.default.readFileSync(opts.viewerHtmlPath, "utf8");
   } catch (err) {
     throw new Error(`viewer asset not found at ${opts.viewerHtmlPath}: ${err.message}`);
   }
   try {
-    errorTemplate = import_node_fs8.default.readFileSync(opts.errorHtmlPath, "utf8");
+    errorTemplate = import_node_fs9.default.readFileSync(opts.errorHtmlPath, "utf8");
   } catch (err) {
     throw new Error(`viewer error asset not found at ${opts.errorHtmlPath}: ${err.message}`);
   }
@@ -45589,25 +45697,25 @@ var import_meta2 = {};
 function tryLoadViewerAssets(logger) {
   const candidates = [];
   try {
-    const here = import_node_path8.default.dirname((0, import_node_url2.fileURLToPath)(import_meta2.url));
+    const here = import_node_path10.default.dirname((0, import_node_url2.fileURLToPath)(import_meta2.url));
     candidates.push(here);
-    candidates.push(import_node_path8.default.resolve(here, ".."));
-    candidates.push(import_node_path8.default.resolve(here, "..", "..", "dist"));
+    candidates.push(import_node_path10.default.resolve(here, ".."));
+    candidates.push(import_node_path10.default.resolve(here, "..", "..", "dist"));
   } catch {
   }
   if (process.argv[1]) {
     let real = process.argv[1];
     try {
-      real = import_node_fs9.default.realpathSync(process.argv[1]);
+      real = import_node_fs10.default.realpathSync(process.argv[1]);
     } catch {
     }
-    candidates.push(import_node_path8.default.dirname(real));
+    candidates.push(import_node_path10.default.dirname(real));
   }
   for (const root of candidates) {
-    const viewerHtmlPath = import_node_path8.default.join(root, "share-md-viewer.html");
-    const errorHtmlPath = import_node_path8.default.join(root, "share-md-viewer-error.html");
+    const viewerHtmlPath = import_node_path10.default.join(root, "share-md-viewer.html");
+    const errorHtmlPath = import_node_path10.default.join(root, "share-md-viewer-error.html");
     try {
-      if (import_node_fs9.default.statSync(viewerHtmlPath).isFile() && import_node_fs9.default.statSync(errorHtmlPath).isFile()) {
+      if (import_node_fs10.default.statSync(viewerHtmlPath).isFile() && import_node_fs10.default.statSync(errorHtmlPath).isFile()) {
         logger?.info("share-md-viewer.assets-root.resolved", { root });
         return createViewerAssetLoader({ viewerHtmlPath, errorHtmlPath });
       }
@@ -45622,30 +45730,30 @@ function tryLoadViewerAssets(logger) {
 }
 
 // src/share-ui/load.ts
-var import_node_fs11 = __toESM(require("fs"), 1);
-var import_node_path10 = __toESM(require("path"), 1);
+var import_node_fs12 = __toESM(require("fs"), 1);
+var import_node_path12 = __toESM(require("path"), 1);
 var import_node_url3 = require("url");
 
 // src/share-ui/asset-loader.ts
-var import_node_fs10 = __toESM(require("fs"), 1);
-var import_node_path9 = __toESM(require("path"), 1);
+var import_node_fs11 = __toESM(require("fs"), 1);
+var import_node_path11 = __toESM(require("path"), 1);
 function createShareUiAssetLoader(opts) {
   let indexHtml;
   try {
-    indexHtml = import_node_fs10.default.readFileSync(opts.indexHtmlPath, "utf8");
+    indexHtml = import_node_fs11.default.readFileSync(opts.indexHtmlPath, "utf8");
   } catch (err) {
     throw new Error(`share-ui index.html not found at ${opts.indexHtmlPath}: ${err.message}`);
   }
-  const assetsDir = import_node_path9.default.resolve(opts.assetsDir);
+  const assetsDir = import_node_path11.default.resolve(opts.assetsDir);
   return {
     renderIndexHtml() {
       return indexHtml;
     },
     resolveAssetPath(rel) {
-      const resolved = import_node_path9.default.resolve(assetsDir, rel);
-      if (resolved !== assetsDir && !resolved.startsWith(assetsDir + import_node_path9.default.sep)) return null;
+      const resolved = import_node_path11.default.resolve(assetsDir, rel);
+      if (resolved !== assetsDir && !resolved.startsWith(assetsDir + import_node_path11.default.sep)) return null;
       try {
-        if (import_node_fs10.default.statSync(resolved).isFile()) return resolved;
+        if (import_node_fs11.default.statSync(resolved).isFile()) return resolved;
       } catch {
       }
       return null;
@@ -45659,28 +45767,28 @@ function bundleDirFromArgv(argv1) {
   if (!argv1) return null;
   let real = argv1;
   try {
-    real = import_node_fs11.default.realpathSync(argv1);
+    real = import_node_fs12.default.realpathSync(argv1);
   } catch {
   }
-  return import_node_path10.default.dirname(real);
+  return import_node_path12.default.dirname(real);
 }
 function tryLoadShareUi(logger) {
   const candidates = [];
   try {
-    const here = import_node_path10.default.dirname((0, import_node_url3.fileURLToPath)(import_meta3.url));
+    const here = import_node_path12.default.dirname((0, import_node_url3.fileURLToPath)(import_meta3.url));
     candidates.push(here);
-    candidates.push(import_node_path10.default.resolve(here, ".."));
-    candidates.push(import_node_path10.default.resolve(here, "..", "..", "dist"));
+    candidates.push(import_node_path12.default.resolve(here, ".."));
+    candidates.push(import_node_path12.default.resolve(here, "..", "..", "dist"));
   } catch {
   }
   const argvDir = bundleDirFromArgv(process.argv[1]);
   if (argvDir) candidates.push(argvDir);
   for (const root of candidates) {
-    const shareUiDir = import_node_path10.default.join(root, "share-ui");
-    const indexHtmlPath = import_node_path10.default.join(shareUiDir, "guest.html");
-    const assetsDir = import_node_path10.default.join(shareUiDir, "assets");
+    const shareUiDir = import_node_path12.default.join(root, "share-ui");
+    const indexHtmlPath = import_node_path12.default.join(shareUiDir, "guest.html");
+    const assetsDir = import_node_path12.default.join(shareUiDir, "assets");
     try {
-      if (import_node_fs11.default.statSync(indexHtmlPath).isFile() && import_node_fs11.default.statSync(assetsDir).isDirectory()) {
+      if (import_node_fs12.default.statSync(indexHtmlPath).isFile() && import_node_fs12.default.statSync(assetsDir).isDirectory()) {
         logger?.info("share-ui.assets-root.resolved", { root: shareUiDir });
         return createShareUiAssetLoader({ indexHtmlPath, assetsDir });
       }
@@ -45762,20 +45870,20 @@ function buildVisitorLogin(deps) {
 }
 
 // src/visitor/visitor-store.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_path13 = __toESM(require("path"), 1);
 function createVisitorStore(opts) {
-  const file = import_node_path11.default.join(opts.dir, "visitors.json");
+  const file = import_node_path13.default.join(opts.dir, "visitors.json");
   const read = () => {
     try {
-      return JSON.parse(import_node_fs12.default.readFileSync(file, "utf8"));
+      return JSON.parse(import_node_fs13.default.readFileSync(file, "utf8"));
     } catch {
       return [];
     }
   };
   const write = (rows) => {
-    import_node_fs12.default.mkdirSync(opts.dir, { recursive: true });
-    import_node_fs12.default.writeFileSync(file, JSON.stringify(rows, null, 2));
+    import_node_fs13.default.mkdirSync(opts.dir, { recursive: true });
+    import_node_fs13.default.writeFileSync(file, JSON.stringify(rows, null, 2));
   };
   return {
     upsert(r) {
@@ -46057,8 +46165,8 @@ function turnStartInput(text) {
   const items = [];
   let leftover = text;
   for (const m2 of text.matchAll(SKILL_RE)) {
-    const [marker, name, path67] = m2;
-    items.push({ type: "skill", name, path: path67 });
+    const [marker, name, path68] = m2;
+    items.push({ type: "skill", name, path: path68 });
     leftover = leftover.replace(marker, "");
   }
   for (const m2 of text.matchAll(ATTACHMENT_RE2)) {
@@ -46291,8 +46399,8 @@ var CodexAdapter = class {
 
 // src/tools/claude-tui.ts
 var import_node_fs16 = __toESM(require("fs"), 1);
-var import_node_os6 = __toESM(require("os"), 1);
-var import_node_path13 = __toESM(require("path"), 1);
+var import_node_os7 = __toESM(require("os"), 1);
+var import_node_path14 = __toESM(require("path"), 1);
 var import_headless = __toESM(require_xterm_headless(), 1);
 
 // ../node_modules/.pnpm/@xterm+addon-serialize@0.14.0/node_modules/@xterm/addon-serialize/lib/addon-serialize.mjs
@@ -47428,8 +47536,8 @@ function buildTuiSpawnArgs(ctx, isResume = false) {
 }
 function jsonlExistsForCtx(ctx) {
   if (!ctx.toolSessionId) return false;
-  const home = import_node_os6.default.homedir();
-  const file = import_node_path13.default.join(home, ".claude", "projects", cwdToHashDir(ctx.cwd), `${ctx.toolSessionId}.jsonl`);
+  const home = import_node_os7.default.homedir();
+  const file = import_node_path14.default.join(home, ".claude", "projects", cwdToHashDir(ctx.cwd), `${ctx.toolSessionId}.jsonl`);
   try {
     return import_node_fs16.default.statSync(file).isFile();
   } catch {
@@ -47460,6 +47568,7 @@ var PersonaDispatchManager = class {
       dispatchId,
       sourceSessionId: args.sourceSessionId,
       targetPersona: args.targetPersona,
+      bSessionId: args.bSessionId,
       waiters: [],
       outcome: null
     });
@@ -47490,10 +47599,22 @@ var PersonaDispatchManager = class {
     if (!state) throw new Error(`unknown dispatchId: ${dispatchId}`);
     state.bSessionId = bSessionId;
   }
-  /** reducer buildSpawnContext 调，按 B 的 sessionId 反查 dispatchId（用于注 CLAWD_DISPATCH_ID env） */
-  lookupDispatchByBSessionId(bSessionId) {
+  /**
+   * 按 B sessionId 找当前 in-flight（未 resolved）的 dispatchId。complete handler 用这个把
+   * B 的 outcome 配对回 A 的 waiter —— dispatchId 不再走 cc env，全靠
+   * (bSessionId → in-flight dispatchId) 反查。
+   *
+   * 同一 bSessionId 不会同时有多个 in-flight：A 拿不到 outcome 不会发起新 dispatch；
+   * 老板规则下 A 一次只能挂一个 waiter。
+   *
+   * 历史 entry（已 resolved）暂不清 —— 单 daemon lifetime 累积可接受；未来用量大了加
+   * TTL GC（complete 后 N min 删 entry）。
+   */
+  findInflightDispatchByBSessionId(bSessionId) {
     for (const state of this.map.values()) {
-      if (state.bSessionId === bSessionId) return state.dispatchId;
+      if (state.bSessionId === bSessionId && state.outcome === null) {
+        return state.dispatchId;
+      }
     }
     return void 0;
   }
@@ -47501,9 +47622,9 @@ var PersonaDispatchManager = class {
 
 // src/dispatch/mcp-config.ts
 var import_node_fs17 = __toESM(require("fs"), 1);
-var import_node_path14 = __toESM(require("path"), 1);
+var import_node_path15 = __toESM(require("path"), 1);
 function dispatchMcpConfigPath(dataDir) {
-  return import_node_path14.default.join(dataDir, "dispatch.mcp.json");
+  return import_node_path15.default.join(dataDir, "dispatch.mcp.json");
 }
 function writeDispatchMcpConfig(args) {
   const cfgPath = dispatchMcpConfigPath(args.dataDir);
@@ -47525,9 +47646,9 @@ function writeDispatchMcpConfig(args) {
 
 // src/ticket/mcp-config.ts
 var import_node_fs18 = __toESM(require("fs"), 1);
-var import_node_path15 = __toESM(require("path"), 1);
+var import_node_path16 = __toESM(require("path"), 1);
 function ticketMcpConfigPath(dataDir) {
-  return import_node_path15.default.join(dataDir, "ticket.mcp.json");
+  return import_node_path16.default.join(dataDir, "ticket.mcp.json");
 }
 function writeTicketMcpConfig(args) {
   const cfgPath = ticketMcpConfigPath(args.dataDir);
@@ -47555,9 +47676,9 @@ function writeTicketMcpConfig(args) {
 
 // src/shift/mcp-config.ts
 var import_node_fs19 = __toESM(require("fs"), 1);
-var import_node_path16 = __toESM(require("path"), 1);
+var import_node_path17 = __toESM(require("path"), 1);
 function shiftMcpConfigPath(dataDir) {
-  return import_node_path16.default.join(dataDir, "shift.mcp.json");
+  return import_node_path17.default.join(dataDir, "shift.mcp.json");
 }
 async function writeShiftMcpConfig(args) {
   const cfgPath = shiftMcpConfigPath(args.dataDir);
@@ -47579,9 +47700,9 @@ async function writeShiftMcpConfig(args) {
 
 // src/inbox/mcp-config.ts
 var import_node_fs20 = __toESM(require("fs"), 1);
-var import_node_path17 = __toESM(require("path"), 1);
+var import_node_path18 = __toESM(require("path"), 1);
 function inboxMcpConfigPath(dataDir) {
-  return import_node_path17.default.join(dataDir, "inbox.mcp.json");
+  return import_node_path18.default.join(dataDir, "inbox.mcp.json");
 }
 async function writeInboxMcpConfig(args) {
   const cfgPath = inboxMcpConfigPath(args.dataDir);
@@ -47603,7 +47724,7 @@ async function writeInboxMcpConfig(args) {
 
 // src/shift/store.ts
 var import_promises = __toESM(require("fs/promises"), 1);
-var import_node_path18 = __toESM(require("path"), 1);
+var import_node_path19 = __toESM(require("path"), 1);
 var import_node_crypto5 = require("crypto");
 
 // src/shift/constants.ts
@@ -47672,7 +47793,7 @@ function createShiftStore(deps) {
       flushTimer = null;
     }
     const content = { version: 1, shifts };
-    await import_promises.default.mkdir(import_node_path18.default.dirname(deps.filePath), { recursive: true });
+    await import_promises.default.mkdir(import_node_path19.default.dirname(deps.filePath), { recursive: true });
     const tmp = `${deps.filePath}.tmp-${deps.now()}-${Math.floor(Math.random() * 1e6)}`;
     await import_promises.default.writeFile(tmp, JSON.stringify(content, null, 2), "utf8");
     await import_promises.default.rename(tmp, deps.filePath);
@@ -48092,6 +48213,28 @@ function canAccessPersona(grants, personaId, action) {
 }
 
 // src/handlers/persona-dispatch.ts
+function assertLocalReuseAllowed(bFile, sourceSessionId) {
+  if (bFile.dispatchedFromSessionId !== sourceSessionId) {
+    throw new ClawdError(
+      ERROR_CODES.UNAUTHORIZED,
+      `targetSessionId not dispatched by caller (dispatchedFromSessionId mismatch)`
+    );
+  }
+}
+function assertGuestReuseAllowed(bFile, sourcePrincipalId, targetPersona) {
+  if (bFile.ownerPersonaId !== targetPersona) {
+    throw new ClawdError(
+      ERROR_CODES.UNAUTHORIZED,
+      `targetSessionId does not belong to targetPersona`
+    );
+  }
+  if (bFile.creatorPrincipalId !== sourcePrincipalId) {
+    throw new ClawdError(
+      ERROR_CODES.UNAUTHORIZED,
+      `targetSessionId not dispatched by caller device (creatorPrincipalId mismatch)`
+    );
+  }
+}
 function buildPersonaDispatchHandlers(deps) {
   const { personaDispatchManager: mgr, spawnB, logger } = deps;
   const run = async (frame, _client, ctx) => {
@@ -48110,15 +48253,21 @@ function buildPersonaDispatchHandlers(deps) {
       }
       logger?.info("dispatch.run.forward", {
         targetDeviceId: args.targetDeviceId,
-        targetPersona: args.targetPersona
+        targetPersona: args.targetPersona,
+        hasTargetSessionId: Boolean(args.targetSessionId)
       });
-      const outcome2 = await deps.forwardToPeer({
+      const { outcome: outcome2, dispatchedSessionId } = await deps.forwardToPeer({
         targetDeviceId: args.targetDeviceId,
         targetPersona: args.targetPersona,
-        prompt: args.prompt
+        prompt: args.prompt,
+        targetSessionId: args.targetSessionId
       });
       return {
-        response: { type: "personaDispatch:run:ok", outcome: outcome2 }
+        response: {
+          type: "personaDispatch:run:ok",
+          outcome: outcome2,
+          ...dispatchedSessionId ? { dispatchedSessionId } : {}
+        }
       };
     }
     if (ctx?.principal.kind === "guest") {
@@ -48129,34 +48278,65 @@ function buildPersonaDispatchHandlers(deps) {
           `persona not dispatchable: ${args.targetPersona}`
         );
       }
+      const guestSourceId = ctx.principal.id;
+      let bSessionId2;
+      let route2 = "new";
+      if (args.targetSessionId) {
+        if (!deps.findOwnedSession) {
+          throw new Error("targetSessionId reuse not wired (findOwnedSession missing)");
+        }
+        const bFile = deps.findOwnedSession(args.targetSessionId);
+        if (!bFile) {
+          throw new ClawdError(
+            ERROR_CODES.SESSION_NOT_FOUND,
+            `targetSessionId not found: ${args.targetSessionId}`
+          );
+        }
+        assertGuestReuseAllowed(bFile, guestSourceId, args.targetPersona);
+        route2 = "resume";
+        bSessionId2 = args.targetSessionId;
+      }
       const { dispatchId: dispatchId2 } = mgr.start({
-        sourceSessionId: ctx.principal.id,
-        targetPersona: args.targetPersona
+        sourceSessionId: guestSourceId,
+        targetPersona: args.targetPersona,
+        bSessionId: bSessionId2
       });
       logger?.info("dispatch.run.received.guest", {
         dispatchId: dispatchId2,
-        sourcePrincipal: ctx.principal.id,
+        sourcePrincipal: guestSourceId,
         targetPersona: args.targetPersona,
-        promptLen: args.prompt.length
+        promptLen: args.prompt.length,
+        route: route2
       });
-      void spawnB({
-        dispatchId: dispatchId2,
-        sourceSessionId: ctx.principal.id,
-        targetPersona: args.targetPersona,
-        prompt: args.prompt,
-        guestPrincipalId: ctx.principal.id,
-        guestDisplayName: ctx.principal.displayName
-      }).then(() => logger?.info("dispatch.spawnB.ok", { dispatchId: dispatchId2 })).catch((err) => {
+      let resolvedBSessionId2 = bSessionId2;
+      try {
+        const { bSessionId: minted } = await spawnB({
+          dispatchId: dispatchId2,
+          sourceSessionId: guestSourceId,
+          targetPersona: args.targetPersona,
+          prompt: args.prompt,
+          route: route2,
+          bSessionId: bSessionId2,
+          guestPrincipalId: guestSourceId,
+          guestDisplayName: ctx.principal.displayName
+        });
+        resolvedBSessionId2 = minted;
+        logger?.info("dispatch.spawnB.ok", { dispatchId: dispatchId2, route: route2 });
+      } catch (err) {
         const reason = err instanceof Error ? err.message : String(err);
-        logger?.warn("dispatch.spawnB.failed", { dispatchId: dispatchId2, reason });
+        logger?.warn("dispatch.spawnB.failed", { dispatchId: dispatchId2, route: route2, reason });
         mgr.complete(dispatchId2, {
           kind: "failure",
           reason: `failed to spawn B: ${reason}`
         });
-      });
+      }
       const outcome2 = await mgr.wait(dispatchId2);
       return {
-        response: { type: "personaDispatch:run:ok", outcome: outcome2 }
+        response: {
+          type: "personaDispatch:run:ok",
+          outcome: outcome2,
+          ...resolvedBSessionId2 ? { dispatchedSessionId: resolvedBSessionId2 } : {}
+        }
       };
     }
     if (!sourceSessionId) {
@@ -48164,31 +48344,61 @@ function buildPersonaDispatchHandlers(deps) {
         "personaDispatch:run requires sessionId (caller must pass x-clawd-session-id header)"
       );
     }
+    let bSessionId;
+    let route = "new";
+    if (args.targetSessionId) {
+      if (!deps.findOwnedSession) {
+        throw new Error("targetSessionId reuse not wired (findOwnedSession missing)");
+      }
+      const bFile = deps.findOwnedSession(args.targetSessionId);
+      if (!bFile) {
+        throw new ClawdError(
+          ERROR_CODES.SESSION_NOT_FOUND,
+          `targetSessionId not found: ${args.targetSessionId}`
+        );
+      }
+      if (bFile.ownerPersonaId !== args.targetPersona) {
+        throw new ClawdError(
+          ERROR_CODES.UNAUTHORIZED,
+          `targetSessionId does not belong to targetPersona`
+        );
+      }
+      assertLocalReuseAllowed(bFile, sourceSessionId);
+      route = "resume";
+      bSessionId = args.targetSessionId;
+    }
     const { dispatchId } = mgr.start({
       sourceSessionId,
-      targetPersona: args.targetPersona
+      targetPersona: args.targetPersona,
+      bSessionId
     });
     logger?.info("dispatch.run.received", {
       dispatchId,
       sourceSessionId,
       targetPersona: args.targetPersona,
-      promptLen: args.prompt.length
+      promptLen: args.prompt.length,
+      route
     });
-    void spawnB({
-      dispatchId,
-      sourceSessionId,
-      targetPersona: args.targetPersona,
-      prompt: args.prompt
-    }).then(() => {
-      logger?.info("dispatch.spawnB.ok", { dispatchId });
-    }).catch((err) => {
+    let resolvedBSessionId = bSessionId;
+    try {
+      const { bSessionId: minted } = await spawnB({
+        dispatchId,
+        sourceSessionId,
+        targetPersona: args.targetPersona,
+        prompt: args.prompt,
+        route,
+        bSessionId
+      });
+      resolvedBSessionId = minted;
+      logger?.info("dispatch.spawnB.ok", { dispatchId, route });
+    } catch (err) {
       const reason = err instanceof Error ? err.message : String(err);
-      logger?.warn("dispatch.spawnB.failed", { dispatchId, reason });
+      logger?.warn("dispatch.spawnB.failed", { dispatchId, route, reason });
       mgr.complete(dispatchId, {
         kind: "failure",
         reason: `failed to spawn B: ${reason}`
       });
-    });
+    }
     logger?.info("dispatch.run.waiting", { dispatchId });
     const outcome = await mgr.wait(dispatchId);
     logger?.info("dispatch.run.resolved", {
@@ -48196,17 +48406,34 @@ function buildPersonaDispatchHandlers(deps) {
       outcomeKind: outcome.kind
     });
     return {
-      response: { type: "personaDispatch:run:ok", outcome }
+      response: {
+        type: "personaDispatch:run:ok",
+        outcome,
+        ...resolvedBSessionId ? { dispatchedSessionId: resolvedBSessionId } : {}
+      }
     };
   };
   const complete = async (frame) => {
     const { type: _t, requestId: _r, ...rest } = frame;
+    const sessionId = typeof rest.sessionId === "string" ? rest.sessionId : void 0;
     const args = DispatchCompleteArgsSchema.parse(rest);
+    if (!sessionId) {
+      throw new Error(
+        "personaDispatch:complete requires sessionId (caller must pass x-clawd-session-id header)"
+      );
+    }
+    const dispatchId = mgr.findInflightDispatchByBSessionId(sessionId);
+    if (!dispatchId) {
+      throw new Error(
+        `no in-flight dispatch for session ${sessionId} (already completed or B was never dispatched)`
+      );
+    }
     logger?.info("dispatch.complete.received", {
-      dispatchId: args.dispatchId,
+      dispatchId,
+      sessionId,
       outcomeKind: args.outcome.kind
     });
-    mgr.complete(args.dispatchId, args.outcome);
+    mgr.complete(dispatchId, args.outcome);
     return {
       response: { type: "personaDispatch:complete:ok" }
     };
@@ -48236,25 +48463,37 @@ async function forwardDispatchToPeer(args) {
         authorization: `Bearer ${args.contact.connectToken}`
       },
       // 注意：不带 targetDeviceId —— B 端据此判定为本地执行（B 角色）。
-      body: JSON.stringify({ targetPersona: args.targetPersona, prompt: args.prompt })
+      // targetSessionId 透传：peer 那台机会按 creatorPrincipalId === A.deviceId 校验。
+      body: JSON.stringify({
+        targetPersona: args.targetPersona,
+        prompt: args.prompt,
+        ...args.targetSessionId ? { targetSessionId: args.targetSessionId } : {}
+      })
     });
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
-    return { kind: "failure", reason: `forward to peer failed: ${msg}` };
+    return { outcome: { kind: "failure", reason: `forward to peer failed: ${msg}` } };
   }
   let json;
   try {
     json = await res.json();
   } catch {
     return {
-      kind: "failure",
-      reason: `peer returned non-JSON response (HTTP ${res.status})`
+      outcome: {
+        kind: "failure",
+        reason: `peer returned non-JSON response (HTTP ${res.status})`
+      }
     };
   }
   if (json.ok === false) {
-    return { kind: "failure", reason: `peer rejected: ${json.error}: ${json.message}` };
+    return {
+      outcome: { kind: "failure", reason: `peer rejected: ${json.error}: ${json.message}` }
+    };
   }
-  return json.result.outcome;
+  return {
+    outcome: json.result.outcome,
+    dispatchedSessionId: json.result.dispatchedSessionId
+  };
 }
 async function forwardInboxPostToPeer(args) {
   const f = args.fetchImpl ?? fetch;
@@ -48476,13 +48715,13 @@ function mapSkillsListResponse(res) {
       const r = s ?? {};
       const name = str3(r.name);
       if (!name) continue;
-      const path67 = str3(r.path);
+      const path68 = str3(r.path);
       const description = str3(r.description);
       const isPlugin = name.includes(":");
       out.push({
         name,
         source: isPlugin ? "plugin" : "project",
-        ...path67 ? { path: path67 } : {},
+        ...path68 ? { path: path68 } : {},
         ...description ? { description } : {},
         ...isPlugin ? { plugin: name.split(":")[0] } : {}
       });
@@ -48522,15 +48761,15 @@ async function listCodexSkills(cwd, deps = {}) {
 
 // src/workspace/browser.ts
 var import_node_fs21 = __toESM(require("fs"), 1);
-var import_node_os7 = __toESM(require("os"), 1);
-var import_node_path19 = __toESM(require("path"), 1);
+var import_node_os8 = __toESM(require("os"), 1);
+var import_node_path20 = __toESM(require("path"), 1);
 init_protocol();
 var MAX_FILE_BYTES = 2 * 1024 * 1024;
 function resolveInsideCwd(cwd, subpath) {
-  const absCwd = import_node_path19.default.resolve(cwd);
-  const joined = import_node_path19.default.resolve(absCwd, subpath ?? ".");
-  const rel = import_node_path19.default.relative(absCwd, joined);
-  if (rel.startsWith("..") || import_node_path19.default.isAbsolute(rel)) {
+  const absCwd = import_node_path20.default.resolve(cwd);
+  const joined = import_node_path20.default.resolve(absCwd, subpath ?? ".");
+  const rel = import_node_path20.default.relative(absCwd, joined);
+  if (rel.startsWith("..") || import_node_path20.default.isAbsolute(rel)) {
     throw new ClawdError(ERROR_CODES.INVALID_PATH, `path escapes cwd: ${subpath}`);
   }
   return joined;
@@ -48548,7 +48787,7 @@ function ensureCwd(cwd) {
 }
 var WorkspaceBrowser = class {
   list(args) {
-    const cwd = args.cwd && args.cwd.length > 0 ? args.cwd : import_node_os7.default.homedir();
+    const cwd = args.cwd && args.cwd.length > 0 ? args.cwd : import_node_os8.default.homedir();
     ensureCwd(cwd);
     const full = resolveInsideCwd(cwd, args.path);
     const dirents = import_node_fs21.default.readdirSync(full, { withFileTypes: true });
@@ -48561,7 +48800,7 @@ var WorkspaceBrowser = class {
         mtime: ""
       };
       try {
-        const st = import_node_fs21.default.statSync(import_node_path19.default.join(full, d.name));
+        const st = import_node_fs21.default.statSync(import_node_path20.default.join(full, d.name));
         entry.mtime = new Date(st.mtimeMs).toISOString();
         if (d.isFile()) entry.size = st.size;
       } catch {
@@ -48607,8 +48846,8 @@ var WorkspaceBrowser = class {
 
 // src/skills/agents-scanner.ts
 var import_node_fs22 = __toESM(require("fs"), 1);
-var import_node_os8 = __toESM(require("os"), 1);
-var import_node_path20 = __toESM(require("path"), 1);
+var import_node_os9 = __toESM(require("os"), 1);
+var import_node_path21 = __toESM(require("path"), 1);
 var DEFAULT_POLICY_DIR_DARWIN = "/Library/Application Support/ClaudeCode/.claude/agents";
 function isDirLikeSync2(p2) {
   try {
@@ -48646,10 +48885,10 @@ function scanAgentsDir(dir, source, seen, out) {
   }
   for (const ent of entries) {
     if (!ent.name.endsWith(".md")) continue;
-    if (!ent.isFile() && !(ent.isSymbolicLink() && fileExistsSync(import_node_path20.default.join(dir, ent.name)))) {
+    if (!ent.isFile() && !(ent.isSymbolicLink() && fileExistsSync(import_node_path21.default.join(dir, ent.name)))) {
       continue;
     }
-    const filePath = import_node_path20.default.join(dir, ent.name);
+    const filePath = import_node_path21.default.join(dir, ent.name);
     const baseName = ent.name.replace(/\.md$/, "");
     if (seen.has(baseName)) continue;
     seen.add(baseName);
@@ -48672,7 +48911,7 @@ function scanPluginAgentsTree(root, pluginName, seen, out) {
       return;
     }
     for (const ent of entries) {
-      const childPath = import_node_path20.default.join(dir, ent.name);
+      const childPath = import_node_path21.default.join(dir, ent.name);
       if (ent.isDirectory() || ent.isSymbolicLink() && isDirLikeSync2(childPath)) {
         walk2(childPath, [...namespaces, ent.name]);
         continue;
@@ -48697,9 +48936,9 @@ function scanPluginAgentsTree(root, pluginName, seen, out) {
   walk2(root, []);
 }
 function readInstalledPlugins2(home) {
-  const pluginsDir = import_node_path20.default.join(home, ".claude", "plugins");
-  const v2 = import_node_path20.default.join(pluginsDir, "installed_plugins_v2.json");
-  const v1 = import_node_path20.default.join(pluginsDir, "installed_plugins.json");
+  const pluginsDir = import_node_path21.default.join(home, ".claude", "plugins");
+  const v2 = import_node_path21.default.join(pluginsDir, "installed_plugins_v2.json");
+  const v1 = import_node_path21.default.join(pluginsDir, "installed_plugins.json");
   let raw = null;
   for (const candidate of [v2, v1]) {
     try {
@@ -48728,19 +48967,19 @@ function readInstalledPlugins2(home) {
   return out;
 }
 function walkUpProjectAgentsDirs(startCwd, home, seen, out) {
-  let cur = import_node_path20.default.resolve(startCwd);
-  const fsRoot = import_node_path20.default.parse(cur).root;
+  let cur = import_node_path21.default.resolve(startCwd);
+  const fsRoot = import_node_path21.default.parse(cur).root;
   while (true) {
-    scanAgentsDir(import_node_path20.default.join(cur, ".claude", "agents"), "project", seen, out);
+    scanAgentsDir(import_node_path21.default.join(cur, ".claude", "agents"), "project", seen, out);
     let hasGit = false;
     try {
-      hasGit = import_node_fs22.default.existsSync(import_node_path20.default.join(cur, ".git"));
+      hasGit = import_node_fs22.default.existsSync(import_node_path21.default.join(cur, ".git"));
     } catch {
     }
     if (hasGit) return;
     if (cur === home) return;
     if (cur === fsRoot) return;
-    const parent = import_node_path20.default.dirname(cur);
+    const parent = import_node_path21.default.dirname(cur);
     if (parent === cur) return;
     cur = parent;
   }
@@ -48750,7 +48989,7 @@ var AgentsScanner = class {
   extraPluginRoots;
   policyDir;
   constructor(opts = {}) {
-    this.home = opts.home ?? process.env.CLAUDE_CONFIG_DIR ?? import_node_os8.default.homedir();
+    this.home = opts.home ?? process.env.CLAUDE_CONFIG_DIR ?? import_node_os9.default.homedir();
     this.extraPluginRoots = opts.extraPluginRoots ?? [];
     if (opts.policyDir !== void 0) {
       this.policyDir = opts.policyDir;
@@ -48775,7 +49014,7 @@ var AgentsScanner = class {
     }
     const fsBlock = [];
     scanAgentsDir(
-      import_node_path20.default.join(this.home, ".claude", "agents"),
+      import_node_path21.default.join(this.home, ".claude", "agents"),
       "global",
       seen,
       fsBlock
@@ -48789,7 +49028,7 @@ var AgentsScanner = class {
       ...this.extraPluginRoots
     ];
     for (const { name, root } of plugins) {
-      const agentsRoot = import_node_path20.default.join(root, "agents");
+      const agentsRoot = import_node_path21.default.join(root, "agents");
       scanPluginAgentsTree(agentsRoot, name, seen, fsBlock);
     }
     return [...builtinBlock, ...fsBlock];
@@ -48798,27 +49037,27 @@ var AgentsScanner = class {
 
 // src/observer/session-observer.ts
 var import_node_fs24 = __toESM(require("fs"), 1);
-var import_node_os10 = __toESM(require("os"), 1);
-var import_node_path22 = __toESM(require("path"), 1);
+var import_node_os11 = __toESM(require("os"), 1);
+var import_node_path23 = __toESM(require("path"), 1);
 init_claude_history();
 
 // src/observer/subagent-meta-observer.ts
 var import_node_fs23 = __toESM(require("fs"), 1);
-var import_node_os9 = __toESM(require("os"), 1);
-var import_node_path21 = __toESM(require("path"), 1);
+var import_node_os10 = __toESM(require("os"), 1);
+var import_node_path22 = __toESM(require("path"), 1);
 init_claude_history();
 var META_RE = /^agent-([A-Za-z0-9_-]+)\.meta\.json$/;
 var SubagentMetaObserver = class {
   constructor(opts) {
     this.opts = opts;
-    this.home = opts.home ?? import_node_os9.default.homedir();
+    this.home = opts.home ?? import_node_os10.default.homedir();
   }
   opts;
   home;
   watches = /* @__PURE__ */ new Map();
   // public for spec only：测试直接拼路径写假 meta.json；生产 start() 内部自己解析
   resolveSubagentDir(cwd, toolSessionId) {
-    return import_node_path21.default.join(
+    return import_node_path22.default.join(
       this.home,
       ".claude",
       "projects",
@@ -48874,7 +49113,7 @@ var SubagentMetaObserver = class {
     if (!m2) return;
     const agentId = m2[1];
     if (w2.emitted.has(agentId)) return;
-    const file = import_node_path21.default.join(w2.dirPath, name);
+    const file = import_node_path22.default.join(w2.dirPath, name);
     let raw;
     try {
       raw = import_node_fs23.default.readFileSync(file, "utf8");
@@ -48922,7 +49161,7 @@ var SubagentMetaObserver = class {
 var SessionObserver = class {
   constructor(opts) {
     this.opts = opts;
-    this.home = opts.home ?? import_node_os10.default.homedir();
+    this.home = opts.home ?? import_node_os11.default.homedir();
     this.metaObserver = opts.enableSubagentMetaObserver ? new SubagentMetaObserver({ home: this.home, onEvent: opts.onEvent }) : null;
   }
   opts;
@@ -48934,7 +49173,7 @@ var SessionObserver = class {
   metaObserver;
   resolveJsonlPath(cwd, toolSessionId, override) {
     if (override) return override;
-    return import_node_path22.default.join(this.home, ".claude", "projects", cwdToHashDir(cwd), `${toolSessionId}.jsonl`);
+    return import_node_path23.default.join(this.home, ".claude", "projects", cwdToHashDir(cwd), `${toolSessionId}.jsonl`);
   }
   start(args) {
     this.stop(args.sessionId);
@@ -48955,10 +49194,10 @@ var SessionObserver = class {
       prevIsRejectSentinel: false
     };
     try {
-      import_node_fs24.default.mkdirSync(import_node_path22.default.dirname(filePath), { recursive: true });
+      import_node_fs24.default.mkdirSync(import_node_path23.default.dirname(filePath), { recursive: true });
     } catch {
     }
-    w2.watcher = import_node_fs24.default.watch(import_node_path22.default.dirname(filePath), { persistent: false }, (_event, changedName) => {
+    w2.watcher = import_node_fs24.default.watch(import_node_path23.default.dirname(filePath), { persistent: false }, (_event, changedName) => {
       if (!changedName || !filePath.endsWith(changedName)) return;
       this.poll(w2);
     });
@@ -49840,7 +50079,7 @@ async function authenticate(token, deps) {
 
 // src/permission/capability-store.ts
 var fs28 = __toESM(require("fs"), 1);
-var path27 = __toESM(require("path"), 1);
+var path28 = __toESM(require("path"), 1);
 var CAPABILITIES_FILE_NAME = "capabilities.json";
 var FILE_VERSION = 1;
 var CapabilityStore = class {
@@ -49870,7 +50109,7 @@ var CapabilityStore = class {
     this.flush();
   }
   filePath() {
-    return path27.join(this.dataDir, CAPABILITIES_FILE_NAME);
+    return path28.join(this.dataDir, CAPABILITIES_FILE_NAME);
   }
   readFromDisk() {
     const file = this.filePath();
@@ -50017,7 +50256,7 @@ function cleanupGuestSessionsForCapability(cap, factory) {
 
 // src/inbox/inbox-store.ts
 var fs30 = __toESM(require("fs"), 1);
-var path28 = __toESM(require("path"), 1);
+var path29 = __toESM(require("path"), 1);
 var INBOX_SUBDIR = "inbox";
 var InboxStore = class {
   constructor(dataDir) {
@@ -50115,10 +50354,10 @@ var InboxStore = class {
     }
   }
   dirPath() {
-    return path28.join(this.dataDir, INBOX_SUBDIR);
+    return path29.join(this.dataDir, INBOX_SUBDIR);
   }
   filePath(peerDeviceId) {
-    return path28.join(this.dirPath(), `${peerDeviceId}.jsonl`);
+    return path29.join(this.dirPath(), `${peerDeviceId}.jsonl`);
   }
 };
 function parseAllLines(raw) {
@@ -50207,7 +50446,7 @@ var InboxManager = class {
 
 // src/state/contact-store.ts
 var fs31 = __toESM(require("fs"), 1);
-var path29 = __toESM(require("path"), 1);
+var path30 = __toESM(require("path"), 1);
 var FILE_NAME = "contacts.json";
 var ContactStore = class {
   constructor(dataDir) {
@@ -50217,7 +50456,7 @@ var ContactStore = class {
   contacts = /* @__PURE__ */ new Map();
   load() {
     this.contacts.clear();
-    const file = path29.join(this.dataDir, FILE_NAME);
+    const file = path30.join(this.dataDir, FILE_NAME);
     let raw;
     try {
       raw = fs31.readFileSync(file, "utf8");
@@ -50263,7 +50502,7 @@ var ContactStore = class {
     return existed;
   }
   flush() {
-    const file = path29.join(this.dataDir, FILE_NAME);
+    const file = path30.join(this.dataDir, FILE_NAME);
     const tmp = `${file}.tmp-${process.pid}-${Date.now()}`;
     const content = JSON.stringify(
       { contacts: Array.from(this.contacts.values()) },
@@ -50427,52 +50666,52 @@ async function autoReverseContact(args) {
 
 // src/migrations/2026-05-20-flatten-sessions.ts
 var fs32 = __toESM(require("fs"), 1);
-var path30 = __toESM(require("path"), 1);
+var path31 = __toESM(require("path"), 1);
 var MIGRATION_FLAG_NAME = ".migration.v1.done";
 function migrateFlattenSessions(opts) {
   const dataDir = opts.dataDir;
   const now = opts.now ?? Date.now;
-  const sessionsDir = path30.join(dataDir, "sessions");
-  const flagPath = path30.join(sessionsDir, MIGRATION_FLAG_NAME);
+  const sessionsDir = path31.join(dataDir, "sessions");
+  const flagPath = path31.join(sessionsDir, MIGRATION_FLAG_NAME);
   if (existsSync3(flagPath)) {
     return { skipped: true, flagWritten: false, movedBare: 0, movedVmOwner: 0, archivedListener: 0 };
   }
   let movedBare = 0;
   let movedVmOwner = 0;
   let archivedListener = 0;
-  const defaultDir = path30.join(sessionsDir, "default");
+  const defaultDir = path31.join(sessionsDir, "default");
   if (existsSync3(defaultDir)) {
     for (const entry of readdirSafe(defaultDir)) {
       if (!entry.endsWith(".json")) continue;
-      const src = path30.join(defaultDir, entry);
-      const dst = path30.join(sessionsDir, entry);
+      const src = path31.join(defaultDir, entry);
+      const dst = path31.join(sessionsDir, entry);
       fs32.renameSync(src, dst);
       movedBare += 1;
     }
     rmdirIfEmpty(defaultDir);
   }
   for (const pid of readdirSafe(sessionsDir)) {
-    const personaDir = path30.join(sessionsDir, pid);
+    const personaDir = path31.join(sessionsDir, pid);
     if (!isDir(personaDir)) continue;
     if (pid === "default") continue;
-    const ownerSrc = path30.join(personaDir, "owner");
+    const ownerSrc = path31.join(personaDir, "owner");
     if (existsSync3(ownerSrc) && isDir(ownerSrc)) {
-      const ownerDst = path30.join(dataDir, "personas", pid, ".clawd", "sessions", "owner");
+      const ownerDst = path31.join(dataDir, "personas", pid, ".clawd", "sessions", "owner");
       fs32.mkdirSync(ownerDst, { recursive: true });
       for (const file of readdirSafe(ownerSrc)) {
         if (!file.endsWith(".json")) continue;
-        fs32.renameSync(path30.join(ownerSrc, file), path30.join(ownerDst, file));
+        fs32.renameSync(path31.join(ownerSrc, file), path31.join(ownerDst, file));
         movedVmOwner += 1;
       }
       rmdirIfEmpty(ownerSrc);
     }
-    const listenerSrc = path30.join(personaDir, "listener");
+    const listenerSrc = path31.join(personaDir, "listener");
     if (existsSync3(listenerSrc) && isDir(listenerSrc)) {
-      const archiveDst = path30.join(dataDir, ".legacy", `listener-${pid}`);
+      const archiveDst = path31.join(dataDir, ".legacy", `listener-${pid}`);
       fs32.mkdirSync(archiveDst, { recursive: true });
       for (const file of readdirSafe(listenerSrc)) {
         if (!file.endsWith(".json")) continue;
-        fs32.renameSync(path30.join(listenerSrc, file), path30.join(archiveDst, file));
+        fs32.renameSync(path31.join(listenerSrc, file), path31.join(archiveDst, file));
         archivedListener += 1;
       }
       rmdirIfEmpty(listenerSrc);
@@ -50520,10 +50759,10 @@ function rmdirIfEmpty(p2) {
 
 // src/transport/http-router.ts
 var import_node_fs26 = __toESM(require("fs"), 1);
-var import_node_path26 = __toESM(require("path"), 1);
+var import_node_path27 = __toESM(require("path"), 1);
 
 // src/attachment/mime.ts
-var import_node_path23 = __toESM(require("path"), 1);
+var import_node_path24 = __toESM(require("path"), 1);
 var TEXT_PLAIN = "text/plain; charset=utf-8";
 var EXT_TO_NATIVE_MIME = {
   // 图片
@@ -50630,7 +50869,7 @@ var TEXT_EXTENSIONS = /* @__PURE__ */ new Set([
   ".mk"
 ]);
 function lookupMime(filePathOrName) {
-  const ext = import_node_path23.default.extname(filePathOrName).toLowerCase();
+  const ext = import_node_path24.default.extname(filePathOrName).toLowerCase();
   if (EXT_TO_NATIVE_MIME[ext]) return EXT_TO_NATIVE_MIME[ext];
   if (TEXT_EXTENSIONS.has(ext)) return TEXT_PLAIN;
   return "application/octet-stream";
@@ -50700,7 +50939,7 @@ function verifySignedUrl(secret, absPath, eRaw, s, now = Date.now) {
 
 // src/attachment/upload.ts
 var import_node_fs25 = __toESM(require("fs"), 1);
-var import_node_path24 = __toESM(require("path"), 1);
+var import_node_path25 = __toESM(require("path"), 1);
 var import_node_crypto7 = __toESM(require("crypto"), 1);
 var import_promises2 = require("stream/promises");
 var UploadError = class extends Error {
@@ -50712,14 +50951,14 @@ var UploadError = class extends Error {
   code;
 };
 function assertValidFileName(fileName) {
-  if (fileName.length === 0 || fileName === "." || fileName === ".." || fileName.startsWith(".") || fileName.includes("/") || fileName.includes("\\") || fileName !== import_node_path24.default.basename(fileName)) {
+  if (fileName.length === 0 || fileName === "." || fileName === ".." || fileName.startsWith(".") || fileName.includes("/") || fileName.includes("\\") || fileName !== import_node_path25.default.basename(fileName)) {
     throw new UploadError("INVALID_FILENAME", `fileName must be a plain basename, got: ${fileName}`);
   }
 }
 var HASH_PREFIX_LEN = 16;
 async function writeUploadedAttachment(args) {
   assertValidFileName(args.fileName);
-  const attachmentsRoot = import_node_path24.default.join(args.sessionDir, ".attachments");
+  const attachmentsRoot = import_node_path25.default.join(args.sessionDir, ".attachments");
   try {
     import_node_fs25.default.mkdirSync(attachmentsRoot, { recursive: true });
   } catch (err) {
@@ -50727,7 +50966,7 @@ async function writeUploadedAttachment(args) {
   }
   const hasher = import_node_crypto7.default.createHash("sha256");
   let actualSize = 0;
-  const tmpPath = import_node_path24.default.join(
+  const tmpPath = import_node_path25.default.join(
     attachmentsRoot,
     `.upload-${process.pid}-${Date.now()}-${import_node_crypto7.default.randomBytes(4).toString("hex")}`
   );
@@ -50762,7 +51001,7 @@ async function writeUploadedAttachment(args) {
     );
   }
   const attachmentId = hasher.digest("hex").slice(0, HASH_PREFIX_LEN);
-  const hashDir = import_node_path24.default.join(attachmentsRoot, attachmentId);
+  const hashDir = import_node_path25.default.join(attachmentsRoot, attachmentId);
   let finalFileName;
   let hashDirExists = false;
   try {
@@ -50780,7 +51019,7 @@ async function writeUploadedAttachment(args) {
     try {
       import_node_fs25.default.mkdirSync(hashDir, { recursive: true });
       finalFileName = args.fileName;
-      import_node_fs25.default.renameSync(tmpPath, import_node_path24.default.join(hashDir, finalFileName));
+      import_node_fs25.default.renameSync(tmpPath, import_node_path25.default.join(hashDir, finalFileName));
     } catch (err) {
       try {
         import_node_fs25.default.unlinkSync(tmpPath);
@@ -50789,8 +51028,8 @@ async function writeUploadedAttachment(args) {
       throw new UploadError("STORAGE_ERROR", `rename failed: ${err.message}`);
     }
   }
-  const absPath = import_node_path24.default.join(hashDir, finalFileName);
-  const relPath = import_node_path24.default.relative(args.sessionDir, absPath);
+  const absPath = import_node_path25.default.join(hashDir, finalFileName);
+  const relPath = import_node_path25.default.relative(args.sessionDir, absPath);
   args.groupFileStore.upsert(args.scope, args.sessionId, {
     relPath: absPath,
     // 存绝对路径，与现有 agent 入清单的形态一致（attachment.ts:144 双形态兼容）
@@ -50804,8 +51043,8 @@ async function writeUploadedAttachment(args) {
 
 // src/extension/import.ts
 var import_promises3 = __toESM(require("fs/promises"), 1);
-var import_node_path25 = __toESM(require("path"), 1);
-var import_node_os11 = __toESM(require("os"), 1);
+var import_node_path26 = __toESM(require("path"), 1);
+var import_node_os12 = __toESM(require("os"), 1);
 var import_jszip = __toESM(require_lib3(), 1);
 var ImportError = class extends Error {
   constructor(code, message) {
@@ -50822,7 +51061,7 @@ async function importZip(buf, root) {
     throw new ImportError("ZIP_INVALID", `failed to load zip: ${e.message}`);
   }
   for (const name of Object.keys(zip.files)) {
-    if (name.includes("..") || name.startsWith("/") || import_node_path25.default.isAbsolute(name)) {
+    if (name.includes("..") || name.startsWith("/") || import_node_path26.default.isAbsolute(name)) {
       throw new ImportError("ZIP_INVALID", `unsafe zip entry path: ${name}`);
     }
   }
@@ -50855,7 +51094,7 @@ async function importZip(buf, root) {
       );
     }
   }
-  const destDir = import_node_path25.default.join(root, manifest.id);
+  const destDir = import_node_path26.default.join(root, manifest.id);
   let destExists = false;
   try {
     await import_promises3.default.access(destDir);
@@ -50865,15 +51104,15 @@ async function importZip(buf, root) {
   if (destExists) {
     throw new ImportError("ALREADY_EXISTS", `extension ${manifest.id} already installed`);
   }
-  const stage = await import_promises3.default.mkdtemp(import_node_path25.default.join(import_node_os11.default.tmpdir(), `clawd-ext-stage-${manifest.id}-`));
+  const stage = await import_promises3.default.mkdtemp(import_node_path26.default.join(import_node_os12.default.tmpdir(), `clawd-ext-stage-${manifest.id}-`));
   try {
     for (const [name, entry] of Object.entries(zip.files)) {
-      const dest = import_node_path25.default.join(stage, name);
+      const dest = import_node_path26.default.join(stage, name);
       if (entry.dir) {
         await import_promises3.default.mkdir(dest, { recursive: true });
         continue;
       }
-      await import_promises3.default.mkdir(import_node_path25.default.dirname(dest), { recursive: true });
+      await import_promises3.default.mkdir(import_node_path26.default.dirname(dest), { recursive: true });
       const content = await entry.async("nodebuffer");
       await import_promises3.default.writeFile(dest, content);
     }
@@ -50904,7 +51143,7 @@ var SHARE_UI_ASSET_MIME = {
   ".wasm": "application/wasm"
 };
 function shareUiAssetMime(filePath) {
-  const ext = import_node_path26.default.extname(filePath).toLowerCase();
+  const ext = import_node_path27.default.extname(filePath).toLowerCase();
   return SHARE_UI_ASSET_MIME[ext] ?? lookupMime(filePath);
 }
 var DISPATCH_HEARTBEAT_MS = 25e3;
@@ -50991,7 +51230,7 @@ function isValidUploadFileName(fileName) {
   if (fileName === "." || fileName === "..") return false;
   if (fileName.startsWith(".")) return false;
   if (fileName.includes("/") || fileName.includes("\\")) return false;
-  return fileName === import_node_path26.default.basename(fileName);
+  return fileName === import_node_path27.default.basename(fileName);
 }
 function createHttpRouter(deps) {
   return async (req, res) => {
@@ -51287,7 +51526,7 @@ function createHttpRouter(deps) {
         sendHtml(res, statusByCode[r.code], loader.renderErrorHtml(r.code, msgByCode[r.code]));
         return true;
       }
-      sendHtml(res, 200, loader.renderViewerHtml(import_node_path26.default.basename(r.absPath)));
+      sendHtml(res, 200, loader.renderViewerHtml(import_node_path27.default.basename(r.absPath)));
       return true;
     }
     const ctx = deps.authResolver.resolveFromHeader(
@@ -51408,7 +51647,7 @@ function createHttpRouter(deps) {
         return true;
       }
       let absPath;
-      if (import_node_path26.default.isAbsolute(pathParam)) {
+      if (import_node_path27.default.isAbsolute(pathParam)) {
         absPath = pathParam;
       } else if (deps.sessionStore) {
         const file = deps.sessionStore.read(sid);
@@ -51416,7 +51655,7 @@ function createHttpRouter(deps) {
           sendJson(res, 404, { code: "NOT_FOUND", message: `session ${sid} not found` });
           return true;
         }
-        absPath = import_node_path26.default.join(file.cwd, pathParam);
+        absPath = import_node_path27.default.join(file.cwd, pathParam);
       } else {
         sendJson(res, 501, withCtx(ctx, { code: "NOT_IMPLEMENTED", message: "sessionStore not wired" }));
         return true;
@@ -51518,7 +51757,7 @@ function streamFile(res, absPath, logger) {
     return;
   }
   const mime = lookupMime(absPath);
-  const basename = import_node_path26.default.basename(absPath);
+  const basename = import_node_path27.default.basename(absPath);
   res.writeHead(200, {
     "Content-Type": mime,
     "Content-Length": String(stat.size),
@@ -51536,7 +51775,7 @@ function streamFile(res, absPath, logger) {
 
 // src/attachment/gc.ts
 var import_node_fs27 = __toESM(require("fs"), 1);
-var import_node_path27 = __toESM(require("path"), 1);
+var import_node_path28 = __toESM(require("path"), 1);
 var DEFAULT_TTL_MS = 30 * 24 * 3600 * 1e3;
 function runAttachmentGc(args) {
   const now = (args.now ?? Date.now)();
@@ -51545,17 +51784,17 @@ function runAttachmentGc(args) {
   for (const { scope, sessionId } of args.sessionScopes) {
     for (const entry of args.groupFileStore.list(scope, sessionId)) {
       if (entry.stale) continue;
-      if (import_node_path27.default.isAbsolute(entry.relPath)) liveAbs.add(entry.relPath);
+      if (import_node_path28.default.isAbsolute(entry.relPath)) liveAbs.add(entry.relPath);
     }
   }
   for (const { scope, sessionId } of args.sessionScopes) {
-    const sessionDir = args.getSessionCwd?.(sessionId) ?? import_node_path27.default.join(
+    const sessionDir = args.getSessionCwd?.(sessionId) ?? import_node_path28.default.join(
       args.dataDir,
       "sessions",
       ...scopeSubPath(scope).map(safeFileName),
       safeFileName(sessionId)
     );
-    const attRoot = import_node_path27.default.join(sessionDir, ".attachments");
+    const attRoot = import_node_path28.default.join(sessionDir, ".attachments");
     let hashDirs;
     try {
       hashDirs = import_node_fs27.default.readdirSync(attRoot);
@@ -51565,7 +51804,7 @@ function runAttachmentGc(args) {
       continue;
     }
     for (const hashDir of hashDirs) {
-      const hashDirAbs = import_node_path27.default.join(attRoot, hashDir);
+      const hashDirAbs = import_node_path28.default.join(attRoot, hashDir);
       let files;
       try {
         files = import_node_fs27.default.readdirSync(hashDirAbs);
@@ -51573,7 +51812,7 @@ function runAttachmentGc(args) {
         continue;
       }
       for (const name of files) {
-        const file = import_node_path27.default.join(hashDirAbs, name);
+        const file = import_node_path28.default.join(hashDirAbs, name);
         let stat;
         try {
           stat = import_node_fs27.default.statSync(file);
@@ -51604,7 +51843,7 @@ function runAttachmentGc(args) {
 
 // src/attachment/group.ts
 var import_node_fs28 = __toESM(require("fs"), 1);
-var import_node_path28 = __toESM(require("path"), 1);
+var import_node_path29 = __toESM(require("path"), 1);
 var import_node_crypto8 = __toESM(require("crypto"), 1);
 init_protocol();
 var GroupFileStore = class {
@@ -51616,11 +51855,11 @@ var GroupFileStore = class {
     this.logger = opts.logger;
   }
   rootForScope(scope) {
-    return import_node_path28.default.join(this.dataDir, "sessions", ...scopeSubPath(scope).map(safeFileName));
+    return import_node_path29.default.join(this.dataDir, "sessions", ...scopeSubPath(scope).map(safeFileName));
   }
   /** 与 SessionStore.filePath 平级，扩展名 .group-files.json */
   filePath(scope, sessionId) {
-    return import_node_path28.default.join(this.rootForScope(scope), `${safeFileName(sessionId)}.group-files.json`);
+    return import_node_path29.default.join(this.rootForScope(scope), `${safeFileName(sessionId)}.group-files.json`);
   }
   cacheKey(scope, sessionId) {
     return scope.kind === "default" ? `default::${sessionId}` : `persona:${scope.personaId}:${scope.mode}::${sessionId}`;
@@ -51655,7 +51894,7 @@ var GroupFileStore = class {
   }
   writeFile(scope, sessionId, entries) {
     const file = this.filePath(scope, sessionId);
-    import_node_fs28.default.mkdirSync(import_node_path28.default.dirname(file), { recursive: true });
+    import_node_fs28.default.mkdirSync(import_node_path29.default.dirname(file), { recursive: true });
     const tmp = `${file}.tmp-${process.pid}-${Date.now()}`;
     import_node_fs28.default.writeFileSync(tmp, JSON.stringify(entries, null, 2), { mode: 384 });
     import_node_fs28.default.renameSync(tmp, file);
@@ -51745,9 +51984,9 @@ var GroupFileStore = class {
 
 // src/discovery/state-file.ts
 var import_node_fs29 = __toESM(require("fs"), 1);
-var import_node_path29 = __toESM(require("path"), 1);
+var import_node_path30 = __toESM(require("path"), 1);
 function defaultStateFilePath(dataDir) {
-  return import_node_path29.default.join(dataDir, "state.json");
+  return import_node_path30.default.join(dataDir, "state.json");
 }
 function isPidAlive(pid) {
   if (!Number.isFinite(pid) || pid <= 0) return false;
@@ -51783,7 +52022,7 @@ var StateFileManager = class {
     return { status: "stale", existing };
   }
   write(state) {
-    import_node_fs29.default.mkdirSync(import_node_path29.default.dirname(this.file), { recursive: true });
+    import_node_fs29.default.mkdirSync(import_node_path30.default.dirname(this.file), { recursive: true });
     const tmp = `${this.file}.tmp.${process.pid}.${Date.now()}`;
     import_node_fs29.default.writeFileSync(tmp, JSON.stringify(state, null, 2), { mode: 384 });
     import_node_fs29.default.renameSync(tmp, this.file);
@@ -51812,13 +52051,13 @@ function readDaemonSourceFromEnv(env = process.env) {
 
 // src/tunnel/tunnel-manager.ts
 var import_node_fs33 = __toESM(require("fs"), 1);
-var import_node_path33 = __toESM(require("path"), 1);
+var import_node_path34 = __toESM(require("path"), 1);
 var import_node_crypto9 = __toESM(require("crypto"), 1);
 var import_node_child_process9 = require("child_process");
 
 // src/tunnel/tunnel-store.ts
 var import_node_fs30 = __toESM(require("fs"), 1);
-var import_node_path30 = __toESM(require("path"), 1);
+var import_node_path31 = __toESM(require("path"), 1);
 var TunnelStore = class {
   constructor(filePath) {
     this.filePath = filePath;
@@ -51837,7 +52076,7 @@ var TunnelStore = class {
     }
   }
   async set(v2) {
-    const dir = import_node_path30.default.dirname(this.filePath);
+    const dir = import_node_path31.default.dirname(this.filePath);
     await import_node_fs30.default.promises.mkdir(dir, { recursive: true });
     const data = JSON.stringify(v2, null, 2);
     const tmp = `${this.filePath}.tmp.${process.pid}.${Date.now()}`;
@@ -51948,8 +52187,8 @@ function escape(v2) {
 
 // src/tunnel/frpc-binary.ts
 var import_node_fs31 = __toESM(require("fs"), 1);
-var import_node_os12 = __toESM(require("os"), 1);
-var import_node_path31 = __toESM(require("path"), 1);
+var import_node_os13 = __toESM(require("os"), 1);
+var import_node_path32 = __toESM(require("path"), 1);
 var import_node_child_process7 = require("child_process");
 var import_node_stream3 = require("stream");
 var import_promises4 = require("stream/promises");
@@ -51988,13 +52227,13 @@ async function ensureFrpcBinary(opts) {
   }
   const version2 = opts.version ?? FRPC_VERSION;
   const platform = opts.platform ?? detectPlatform();
-  const binDir = import_node_path31.default.join(opts.dataDir, "bin");
+  const binDir = import_node_path32.default.join(opts.dataDir, "bin");
   import_node_fs31.default.mkdirSync(binDir, { recursive: true });
   cleanupStaleArtifacts(binDir);
-  const stableBin = import_node_path31.default.join(binDir, "frpc");
+  const stableBin = import_node_path32.default.join(binDir, "frpc");
   if (import_node_fs31.default.existsSync(stableBin)) return stableBin;
   const partialBin = `${stableBin}.partial`;
-  const tarballPath = import_node_path31.default.join(binDir, `frp_${version2}_${platform.os}_${platform.arch}.tar.gz.partial`);
+  const tarballPath = import_node_path32.default.join(binDir, `frp_${version2}_${platform.os}_${platform.arch}.tar.gz.partial`);
   try {
     const url = frpcDownloadUrl(version2, platform);
     await downloadToFile(url, tarballPath, opts.fetchImpl);
@@ -52020,7 +52259,7 @@ function cleanupStaleArtifacts(binDir) {
   }
   for (const name of entries) {
     if (name.endsWith(".partial") || name.startsWith("extract-")) {
-      const full = import_node_path31.default.join(binDir, name);
+      const full = import_node_path32.default.join(binDir, name);
       try {
         import_node_fs31.default.rmSync(full, { recursive: true, force: true });
       } catch {
@@ -52046,7 +52285,7 @@ async function downloadToFile(url, dest, fetchImpl) {
   await (0, import_promises4.pipeline)(nodeStream, out);
 }
 async function extractFrpcFromTarball(tarball, binDir, version2, platform, destBin) {
-  const work = import_node_path31.default.join(binDir, `extract-${process.pid}-${Date.now()}`);
+  const work = import_node_path32.default.join(binDir, `extract-${process.pid}-${Date.now()}`);
   import_node_fs31.default.mkdirSync(work, { recursive: true });
   try {
     await new Promise((resolve6, reject) => {
@@ -52055,7 +52294,7 @@ async function extractFrpcFromTarball(tarball, binDir, version2, platform, destB
       proc.on("exit", (code) => code === 0 ? resolve6() : reject(new Error(`tar exited ${code}`)));
     });
     const dirName = `frp_${version2}_${platform.os}_${platform.arch}`;
-    const src = import_node_path31.default.join(work, dirName, "frpc");
+    const src = import_node_path32.default.join(work, dirName, "frpc");
     if (!import_node_fs31.default.existsSync(src)) {
       throw new Error(`frpc not found inside tarball at ${src}`);
     }
@@ -52067,10 +52306,10 @@ async function extractFrpcFromTarball(tarball, binDir, version2, platform, destB
 
 // src/tunnel/frpc-process.ts
 var import_node_fs32 = __toESM(require("fs"), 1);
-var import_node_path32 = __toESM(require("path"), 1);
+var import_node_path33 = __toESM(require("path"), 1);
 var import_node_child_process8 = require("child_process");
 function frpcPidFilePath(dataDir) {
-  return import_node_path32.default.join(dataDir, "frpc.pid");
+  return import_node_path33.default.join(dataDir, "frpc.pid");
 }
 function writeFrpcPid(dataDir, pid) {
   try {
@@ -52112,7 +52351,7 @@ function defaultSleep(ms) {
 }
 async function killStaleFrpc(deps) {
   const pidFile = frpcPidFilePath(deps.dataDir);
-  const tomlPath = import_node_path32.default.join(deps.dataDir, "frpc.toml");
+  const tomlPath = import_node_path33.default.join(deps.dataDir, "frpc.toml");
   const readPidFile = deps.readPidFileImpl ?? defaultReadPidFile;
   const isAlive = deps.isPidAliveImpl ?? defaultIsPidAlive;
   const killPid = deps.killPidImpl ?? defaultKillPid;
@@ -52184,7 +52423,7 @@ var DEFAULT_TUNNEL_TTL_MS = 7 * 24 * 60 * 60 * 1e3;
 var TunnelManager = class {
   constructor(deps) {
     this.deps = deps;
-    this.store = deps.store ?? new TunnelStore(import_node_path33.default.join(deps.dataDir, "tunnel.json"));
+    this.store = deps.store ?? new TunnelStore(import_node_path34.default.join(deps.dataDir, "tunnel.json"));
     this.ttlMs = deps.ttlMs ?? DEFAULT_TUNNEL_TTL_MS;
     this.startupTimeoutMs = deps.startupTimeoutMs ?? 15e3;
   }
@@ -52311,7 +52550,7 @@ var TunnelManager = class {
         dataDir: this.deps.dataDir,
         override: this.deps.frpcBinaryOverride ?? void 0
       });
-      const tomlPath = import_node_path33.default.join(this.deps.dataDir, "frpc.toml");
+      const tomlPath = import_node_path34.default.join(this.deps.dataDir, "frpc.toml");
       const proxyName = `clawd-${t.subdomain}-${localPort}-${import_node_crypto9.default.randomBytes(3).toString("hex")}`;
       const toml = buildFrpcToml({
         serverAddr: t.frpsHost,
@@ -52326,7 +52565,7 @@ var TunnelManager = class {
       const proc = (this.deps.spawnImpl ?? import_node_child_process9.spawn)(frpcBin, ["-c", tomlPath], {
         stdio: ["ignore", "pipe", "pipe"]
       });
-      const logFilePath = import_node_path33.default.join(this.deps.dataDir, "frpc.log");
+      const logFilePath = import_node_path34.default.join(this.deps.dataDir, "frpc.log");
       const logStream = import_node_fs33.default.createWriteStream(logFilePath, { flags: "a", mode: 384 });
       logStream.on("error", () => {
       });
@@ -52409,16 +52648,16 @@ async function waitForFrpcReady(proc, timeoutMs) {
 }
 
 // src/tunnel/device-key.ts
-var import_node_os13 = __toESM(require("os"), 1);
-var import_node_path34 = __toESM(require("path"), 1);
+var import_node_os14 = __toESM(require("os"), 1);
+var import_node_path35 = __toESM(require("path"), 1);
 var import_node_crypto10 = __toESM(require("crypto"), 1);
 var DERIVE_SALT = "clawd-tunnel-device-v1";
 function deriveStableDeviceKey(opts = {}) {
-  const hostname = opts.hostname ?? import_node_os13.default.hostname();
-  const uid = opts.uid ?? (typeof import_node_os13.default.userInfo === "function" ? import_node_os13.default.userInfo().uid : 0);
-  const home = opts.home ?? import_node_os13.default.homedir();
-  const defaultDataDir = import_node_path34.default.resolve(import_node_path34.default.join(home, ".clawd"));
-  const normalizedDataDir = opts.dataDir ? import_node_path34.default.resolve(opts.dataDir) : null;
+  const hostname = opts.hostname ?? import_node_os14.default.hostname();
+  const uid = opts.uid ?? (typeof import_node_os14.default.userInfo === "function" ? import_node_os14.default.userInfo().uid : 0);
+  const home = opts.home ?? import_node_os14.default.homedir();
+  const defaultDataDir = import_node_path35.default.resolve(import_node_path35.default.join(home, ".clawd"));
+  const normalizedDataDir = opts.dataDir ? import_node_path35.default.resolve(opts.dataDir) : null;
   const isDefaultDir = normalizedDataDir == null || normalizedDataDir === defaultDataDir;
   const input = isDefaultDir ? `${hostname}::${uid}` : `${hostname}::${uid}::${normalizedDataDir}`;
   return import_node_crypto10.default.createHmac("sha256", DERIVE_SALT).update(input).digest("hex").slice(0, 32);
@@ -52426,11 +52665,11 @@ function deriveStableDeviceKey(opts = {}) {
 
 // src/auth-store.ts
 var import_node_fs34 = __toESM(require("fs"), 1);
-var import_node_path35 = __toESM(require("path"), 1);
+var import_node_path36 = __toESM(require("path"), 1);
 var import_node_crypto11 = __toESM(require("crypto"), 1);
 var AUTH_FILE_NAME = "auth.json";
 function authFilePath(dataDir) {
-  return import_node_path35.default.join(dataDir, AUTH_FILE_NAME);
+  return import_node_path36.default.join(dataDir, AUTH_FILE_NAME);
 }
 function loadOrCreateAuthFile(opts) {
   const file = authFilePath(opts.dataDir);
@@ -52486,7 +52725,7 @@ function readAuthFile(file) {
   }
 }
 function writeAuthFile(file, content) {
-  import_node_fs34.default.mkdirSync(import_node_path35.default.dirname(file), { recursive: true });
+  import_node_fs34.default.mkdirSync(import_node_path36.default.dirname(file), { recursive: true });
   import_node_fs34.default.writeFileSync(file, JSON.stringify(content, null, 2), { mode: 384 });
   try {
     import_node_fs34.default.chmodSync(file, 384);
@@ -52496,12 +52735,12 @@ function writeAuthFile(file, content) {
 
 // src/owner-profile.ts
 var import_node_fs35 = __toESM(require("fs"), 1);
-var import_node_os14 = __toESM(require("os"), 1);
-var import_node_path36 = __toESM(require("path"), 1);
+var import_node_os15 = __toESM(require("os"), 1);
+var import_node_path37 = __toESM(require("path"), 1);
 var PROFILE_FILENAME = "profile.json";
 function loadOwnerDisplayName(dataDir) {
-  const fallback = import_node_os14.default.userInfo().username;
-  const profilePath = import_node_path36.default.join(dataDir, PROFILE_FILENAME);
+  const fallback = import_node_os15.default.userInfo().username;
+  const profilePath = import_node_path37.default.join(dataDir, PROFILE_FILENAME);
   let raw;
   try {
     raw = import_node_fs35.default.readFileSync(profilePath, "utf8");
@@ -52528,12 +52767,12 @@ function loadOwnerDisplayName(dataDir) {
 
 // src/feishu-auth/owner-identity-store.ts
 var import_node_fs36 = __toESM(require("fs"), 1);
-var import_node_path37 = __toESM(require("path"), 1);
+var import_node_path38 = __toESM(require("path"), 1);
 var OWNER_IDENTITY_FILE_NAME = "owner-identity.json";
 var OwnerIdentityStore = class {
   file;
   constructor(dataDir) {
-    this.file = import_node_path37.default.join(dataDir, OWNER_IDENTITY_FILE_NAME);
+    this.file = import_node_path38.default.join(dataDir, OWNER_IDENTITY_FILE_NAME);
   }
   read() {
     let raw;
@@ -52566,7 +52805,7 @@ var OwnerIdentityStore = class {
     };
   }
   write(record) {
-    import_node_fs36.default.mkdirSync(import_node_path37.default.dirname(this.file), { recursive: true });
+    import_node_fs36.default.mkdirSync(import_node_path38.default.dirname(this.file), { recursive: true });
     import_node_fs36.default.writeFileSync(this.file, JSON.stringify(record, null, 2), { mode: 384 });
     try {
       import_node_fs36.default.chmodSync(this.file, 384);
@@ -52696,9 +52935,9 @@ var CentralClientError = class extends Error {
   code;
   cause;
 };
-async function centralRequest(opts, path67, init) {
+async function centralRequest(opts, path68, init) {
   const f = opts.fetchImpl ?? globalThis.fetch;
-  const url = `${opts.api.replace(/\/+$/, "")}${path67}`;
+  const url = `${opts.api.replace(/\/+$/, "")}${path68}`;
   const ctrl = new AbortController();
   const timer = setTimeout(() => ctrl.abort(), opts.timeoutMs ?? 15e3);
   let res;
@@ -52841,7 +53080,7 @@ function verifyConnectToken(args) {
 
 // src/feishu-auth/server-key.ts
 var fs46 = __toESM(require("fs"), 1);
-var path46 = __toESM(require("path"), 1);
+var path47 = __toESM(require("path"), 1);
 var FILE_NAME2 = "server-signing-key.json";
 var ServerKeyStore = class {
   constructor(dataDir) {
@@ -52849,7 +53088,7 @@ var ServerKeyStore = class {
   }
   dataDir;
   filePath() {
-    return path46.join(this.dataDir, FILE_NAME2);
+    return path47.join(this.dataDir, FILE_NAME2);
   }
   /** 读缓存的公钥；无缓存 / 损坏 → null（调用方决定是否触发拉取） */
   read() {
@@ -52888,8 +53127,8 @@ init_protocol();
 
 // src/session/fork.ts
 var import_node_fs37 = __toESM(require("fs"), 1);
-var import_node_os15 = __toESM(require("os"), 1);
-var import_node_path38 = __toESM(require("path"), 1);
+var import_node_os16 = __toESM(require("os"), 1);
+var import_node_path39 = __toESM(require("path"), 1);
 init_claude_history();
 function readJsonlEntries(file) {
   const raw = import_node_fs37.default.readFileSync(file, "utf8");
@@ -52905,9 +53144,9 @@ function readJsonlEntries(file) {
   return out;
 }
 function forkSession(input) {
-  const baseDir = input.baseDir ?? import_node_path38.default.join(import_node_os15.default.homedir(), ".claude");
-  const projectDir = import_node_path38.default.join(baseDir, "projects", cwdToHashDir(input.cwd));
-  const sourceFile = import_node_path38.default.join(projectDir, `${input.toolSessionId}.jsonl`);
+  const baseDir = input.baseDir ?? import_node_path39.default.join(import_node_os16.default.homedir(), ".claude");
+  const projectDir = import_node_path39.default.join(baseDir, "projects", cwdToHashDir(input.cwd));
+  const sourceFile = import_node_path39.default.join(projectDir, `${input.toolSessionId}.jsonl`);
   if (!import_node_fs37.default.existsSync(sourceFile)) {
     throw new Error(`fork: source transcript not found: ${sourceFile}`);
   }
@@ -52938,7 +53177,7 @@ function forkSession(input) {
     }
     forkedLines.push(JSON.stringify(forked));
   }
-  const forkedFilePath = import_node_path38.default.join(projectDir, `${forkedToolSessionId}.jsonl`);
+  const forkedFilePath = import_node_path39.default.join(projectDir, `${forkedToolSessionId}.jsonl`);
   import_node_fs37.default.mkdirSync(projectDir, { recursive: true });
   import_node_fs37.default.writeFileSync(forkedFilePath, forkedLines.join("\n") + "\n", { mode: 384 });
   return { forkedToolSessionId, forkedFilePath };
@@ -53292,7 +53531,7 @@ function buildPermissionHandlers(deps) {
 }
 
 // src/handlers/history.ts
-var path49 = __toESM(require("path"), 1);
+var path50 = __toESM(require("path"), 1);
 init_protocol();
 
 // src/session/recent-dirs.ts
@@ -53310,7 +53549,7 @@ function listRecentDirs(store, limit = 50) {
 }
 
 // src/permission/persona-paths.ts
-var path48 = __toESM(require("path"), 1);
+var path49 = __toESM(require("path"), 1);
 function getAllowedPersonaIds(grants, action) {
   const ids = /* @__PURE__ */ new Set();
   for (const g2 of grants) {
@@ -53323,42 +53562,42 @@ function getAllowedPersonaIds(grants, action) {
   return ids;
 }
 function isGuestPathAllowed(grants, absPath, personaRoot, action = "read", userWorkDir) {
-  const target = path48.resolve(absPath);
+  const target = path49.resolve(absPath);
   if (userWorkDir) {
-    const u = path48.resolve(userWorkDir);
-    const usep = u.endsWith(path48.sep) ? "" : path48.sep;
+    const u = path49.resolve(userWorkDir);
+    const usep = u.endsWith(path49.sep) ? "" : path49.sep;
     if (target === u || target.startsWith(u + usep)) return true;
   }
-  const root = path48.resolve(personaRoot);
-  const sep3 = root.endsWith(path48.sep) ? "" : path48.sep;
+  const root = path49.resolve(personaRoot);
+  const sep3 = root.endsWith(path49.sep) ? "" : path49.sep;
   if (!target.startsWith(root + sep3)) return false;
-  const rel = path48.relative(root, target);
+  const rel = path49.relative(root, target);
   if (!rel || rel.startsWith("..")) return false;
-  const personaId = rel.split(path48.sep)[0];
+  const personaId = rel.split(path49.sep)[0];
   if (!personaId) return false;
   const allowed = getAllowedPersonaIds(grants, action);
   if (allowed === "*") return true;
   return allowed.has(personaId);
 }
 function personaIdFromPath(absPath, personaRoot) {
-  const root = path48.resolve(personaRoot);
-  const target = path48.resolve(absPath);
-  const sep3 = root.endsWith(path48.sep) ? "" : path48.sep;
+  const root = path49.resolve(personaRoot);
+  const target = path49.resolve(absPath);
+  const sep3 = root.endsWith(path49.sep) ? "" : path49.sep;
   if (!target.startsWith(root + sep3)) return null;
-  const rel = path48.relative(root, target);
+  const rel = path49.relative(root, target);
   if (!rel || rel.startsWith("..")) return null;
-  const id = rel.split(path48.sep)[0];
+  const id = rel.split(path49.sep)[0];
   return id || null;
 }
 function isPathWithin(dir, absPath) {
-  const d = path48.resolve(dir);
-  const t = path48.resolve(absPath);
-  const sep3 = d.endsWith(path48.sep) ? "" : path48.sep;
+  const d = path49.resolve(dir);
+  const t = path49.resolve(absPath);
+  const sep3 = d.endsWith(path49.sep) ? "" : path49.sep;
   return t === d || t.startsWith(d + sep3);
 }
 function isPathInGuestBoundary(personaRoot, personaId, userWorkDir, absPath) {
   if (userWorkDir && isPathWithin(userWorkDir, absPath)) return true;
-  return personaIdFromPath(path48.resolve(absPath), personaRoot) === personaId;
+  return personaIdFromPath(path49.resolve(absPath), personaRoot) === personaId;
 }
 
 // src/handlers/history.ts
@@ -53384,7 +53623,7 @@ function buildHistoryHandlers(deps) {
         if (!pid) return false;
         return isGuestPathAllowed(
           ctx.grants,
-          path49.join(personaRoot, pid),
+          path50.join(personaRoot, pid),
           personaRoot,
           "read",
           userWorkDir
@@ -53396,7 +53635,7 @@ function buildHistoryHandlers(deps) {
   };
   const list = async (frame, _client, ctx) => {
     const args = HistoryListArgs.parse(frame);
-    assertGuestPath(ctx, path49.resolve(args.projectPath), personaRoot, "history:list");
+    assertGuestPath(ctx, path50.resolve(args.projectPath), personaRoot, "history:list");
     const sessions = await history.listSessions(args);
     return { response: { type: "history:list", sessions } };
   };
@@ -53428,13 +53667,13 @@ function buildHistoryHandlers(deps) {
   };
   const subagents = async (frame, _client, ctx) => {
     const args = HistorySubagentsArgs.parse(frame);
-    assertGuestPath(ctx, path49.resolve(args.cwd), personaRoot, "history:subagents", usersRoot);
+    assertGuestPath(ctx, path50.resolve(args.cwd), personaRoot, "history:subagents", usersRoot);
     const subs = await history.listSubagents(args);
     return { response: { type: "history:subagents", subagents: subs } };
   };
   const subagentRead = async (frame, _client, ctx) => {
     const args = HistorySubagentReadArgs.parse(frame);
-    assertGuestPath(ctx, path49.resolve(args.cwd), personaRoot, "history:subagent-read", usersRoot);
+    assertGuestPath(ctx, path50.resolve(args.cwd), personaRoot, "history:subagent-read", usersRoot);
     const res = await history.readSubagent(args);
     return { response: { type: "history:subagent-read", ...res } };
   };
@@ -53443,7 +53682,7 @@ function buildHistoryHandlers(deps) {
     if (ctx?.principal.kind === "guest" && personaRoot) {
       const userWorkDir = usersRoot ? deriveUserWorkDir(ctx.principal.id, usersRoot) : void 0;
       const filtered = dirs.filter(
-        (d) => isGuestPathAllowed(ctx.grants, path49.resolve(d.cwd), personaRoot, "read", userWorkDir)
+        (d) => isGuestPathAllowed(ctx.grants, path50.resolve(d.cwd), personaRoot, "read", userWorkDir)
       );
       return { response: { type: "history:recentDirs", dirs: filtered } };
     }
@@ -53460,8 +53699,8 @@ function buildHistoryHandlers(deps) {
 }
 
 // src/handlers/workspace.ts
-var path50 = __toESM(require("path"), 1);
-var os15 = __toESM(require("os"), 1);
+var path51 = __toESM(require("path"), 1);
+var os16 = __toESM(require("os"), 1);
 init_protocol();
 init_protocol();
 function buildEnabledPluginNames(personaManager, personaId) {
@@ -53501,23 +53740,23 @@ function buildWorkspaceHandlers(deps) {
   const list = async (frame, _client, ctx) => {
     const args = WorkspaceListArgs.parse(frame);
     const isGuest = ctx?.principal.kind === "guest";
-    const fallbackCwd = isGuest && personaRoot ? personaRoot : os15.homedir();
-    const resolvedCwd = path50.resolve(args.cwd ?? fallbackCwd);
-    const target = args.path ? path50.resolve(resolvedCwd, args.path) : resolvedCwd;
+    const fallbackCwd = isGuest && personaRoot ? personaRoot : os16.homedir();
+    const resolvedCwd = path51.resolve(args.cwd ?? fallbackCwd);
+    const target = args.path ? path51.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 = path50.isAbsolute(args.path) ? path50.resolve(args.path) : path50.resolve(args.cwd, args.path);
+    const target = path51.isAbsolute(args.path) ? path51.resolve(args.path) : path51.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 = path50.resolve(args.cwd);
+    const cwdAbs = path51.resolve(args.cwd);
     assertGuestPath2(ctx, cwdAbs, personaRoot, "skills:list", usersRoot);
     const list2 = await getSkillsForTool(args.tool ?? "claude", cwdAbs);
     if (ctx?.principal.kind === "guest" && personaRoot) {
@@ -53529,7 +53768,7 @@ function buildWorkspaceHandlers(deps) {
   };
   const agentsList = async (frame, _client, ctx) => {
     const args = AgentsListArgs.parse(frame);
-    const cwdAbs = path50.resolve(args.cwd);
+    const cwdAbs = path51.resolve(args.cwd);
     assertGuestPath2(ctx, cwdAbs, personaRoot, "agents:list", usersRoot);
     if (args.tool === "codex") {
       return { response: { type: "agents:list", agents: [] } };
@@ -53551,18 +53790,18 @@ function buildWorkspaceHandlers(deps) {
 }
 
 // src/handlers/git.ts
-var path52 = __toESM(require("path"), 1);
+var path53 = __toESM(require("path"), 1);
 init_protocol();
 init_protocol();
 
 // src/workspace/git.ts
 var import_node_child_process10 = require("child_process");
 var import_node_fs38 = __toESM(require("fs"), 1);
-var import_node_path39 = __toESM(require("path"), 1);
+var import_node_path40 = __toESM(require("path"), 1);
 var import_node_util = require("util");
 var pexec = (0, import_node_util.promisify)(import_node_child_process10.execFile);
 function normalizePath(p2) {
-  const resolved = import_node_path39.default.resolve(p2);
+  const resolved = import_node_path40.default.resolve(p2);
   try {
     return import_node_fs38.default.realpathSync(resolved);
   } catch {
@@ -53638,7 +53877,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, path52.resolve(cwd), personaRoot, "read", userWorkDir)) {
+  if (!isGuestPathAllowed(ctx.grants, path53.resolve(cwd), personaRoot, "read", userWorkDir)) {
     throw new ClawdError(
       ERROR_CODES.UNAUTHORIZED,
       `guest ${ctx.principal.id} cannot ${method} cwd ${cwd}`
@@ -54124,7 +54363,7 @@ function buildDeviceHandlers(deps) {
 }
 
 // src/handlers/meta.ts
-var import_node_os16 = __toESM(require("os"), 1);
+var import_node_os17 = __toESM(require("os"), 1);
 init_protocol();
 
 // src/version.ts
@@ -54156,7 +54395,7 @@ function buildReadyFrame(deps, client) {
   return {
     version,
     protocolVersion: PROTOCOL_VERSION,
-    hostname: import_node_os16.default.hostname(),
+    hostname: import_node_os17.default.hostname(),
     os: process.platform,
     tools,
     runningSessions: info.runningSessions,
@@ -54253,7 +54492,7 @@ function buildPersonaHandlers(deps) {
 }
 
 // src/handlers/attachment.ts
-var import_node_path40 = __toESM(require("path"), 1);
+var import_node_path41 = __toESM(require("path"), 1);
 init_protocol();
 init_protocol();
 var DEFAULT_TTL_SECONDS = 24 * 3600;
@@ -54333,12 +54572,12 @@ function buildAttachmentHandlers(deps) {
         `session ${args.sessionId} scope unresolved`
       );
     }
-    const cwdAbs = import_node_path40.default.resolve(sessionFile.cwd);
-    const candidateAbs = import_node_path40.default.isAbsolute(args.relPath) ? import_node_path40.default.resolve(args.relPath) : import_node_path40.default.resolve(cwdAbs, args.relPath);
+    const cwdAbs = import_node_path41.default.resolve(sessionFile.cwd);
+    const candidateAbs = import_node_path41.default.isAbsolute(args.relPath) ? import_node_path41.default.resolve(args.relPath) : import_node_path41.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_path40.default.isAbsolute(e.relPath) ? import_node_path40.default.resolve(e.relPath) : import_node_path40.default.resolve(cwdAbs, e.relPath);
+      const storedAbs = import_node_path41.default.isAbsolute(e.relPath) ? import_node_path41.default.resolve(e.relPath) : import_node_path41.default.resolve(cwdAbs, e.relPath);
       return storedAbs === candidateAbs && !e.stale;
     });
     if (!entry) {
@@ -54363,7 +54602,7 @@ function buildAttachmentHandlers(deps) {
     if (!ctx || ctx.principal.kind !== "guest" || !deps.personaRoot || !deps.sessionStore) return;
     const f = deps.sessionStore.read(sessionId);
     if (!f) return;
-    assertGuestAttachmentPath(ctx, import_node_path40.default.resolve(f.cwd), deps.personaRoot, method, deps.usersRoot);
+    assertGuestAttachmentPath(ctx, import_node_path41.default.resolve(f.cwd), deps.personaRoot, method, deps.usersRoot);
   }
   const groupAdd = async (frame, _client, ctx) => {
     if (!deps.groupFileStore || !deps.getSessionScope) {
@@ -54378,8 +54617,8 @@ function buildAttachmentHandlers(deps) {
     if (!scope) {
       throw new ClawdError(ERROR_CODES.VALIDATION_ERROR, `session ${args.sessionId} not found`);
     }
-    const cwdAbs = import_node_path40.default.resolve(deps.sessionStore?.read(args.sessionId)?.cwd ?? ".");
-    const candidateAbs = import_node_path40.default.isAbsolute(args.relPath) ? import_node_path40.default.resolve(args.relPath) : import_node_path40.default.resolve(cwdAbs, args.relPath);
+    const cwdAbs = import_node_path41.default.resolve(deps.sessionStore?.read(args.sessionId)?.cwd ?? ".");
+    const candidateAbs = import_node_path41.default.isAbsolute(args.relPath) ? import_node_path41.default.resolve(args.relPath) : import_node_path41.default.resolve(cwdAbs, args.relPath);
     guardAttachmentPath(ctx, args.sessionId, candidateAbs, "attachment.groupAdd", "cwd-subtree");
     const from = ctx?.principal.kind === "owner" ? "owner" : "agent";
     const size = 0;
@@ -54438,19 +54677,19 @@ function buildAttachmentHandlers(deps) {
 
 // src/handlers/extension.ts
 var import_promises8 = __toESM(require("fs/promises"), 1);
-var import_node_path45 = __toESM(require("path"), 1);
+var import_node_path46 = __toESM(require("path"), 1);
 init_protocol();
 
 // src/extension/bundle-zip.ts
 var import_promises5 = __toESM(require("fs/promises"), 1);
-var import_node_path41 = __toESM(require("path"), 1);
+var import_node_path42 = __toESM(require("path"), 1);
 var import_node_crypto13 = __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_path41.default.join(dir, rel);
+    const abs = import_node_path42.default.join(dir, rel);
     const content = await import_promises5.default.readFile(abs);
     zip.file(rel, content, { date: FIXED_DATE });
   }
@@ -54471,7 +54710,7 @@ async function listFilesSorted(rootDir) {
   return out;
 }
 async function walk(absRoot, relPrefix, out) {
-  const dirAbs = import_node_path41.default.join(absRoot, relPrefix);
+  const dirAbs = import_node_path42.default.join(absRoot, relPrefix);
   const entries = await import_promises5.default.readdir(dirAbs, { withFileTypes: true });
   for (const e of entries) {
     if (IGNORE_BASENAMES.has(e.name)) continue;
@@ -54525,25 +54764,25 @@ function computePublishCheck(args) {
 
 // src/extension/install-flow.ts
 var import_promises6 = __toESM(require("fs/promises"), 1);
-var import_node_path43 = __toESM(require("path"), 1);
-var import_node_os18 = __toESM(require("os"), 1);
+var import_node_path44 = __toESM(require("path"), 1);
+var import_node_os19 = __toESM(require("os"), 1);
 var import_node_crypto14 = __toESM(require("crypto"), 1);
 var import_jszip3 = __toESM(require_lib3(), 1);
 
 // src/extension/paths.ts
-var import_node_os17 = __toESM(require("os"), 1);
-var import_node_path42 = __toESM(require("path"), 1);
+var import_node_os18 = __toESM(require("os"), 1);
+var import_node_path43 = __toESM(require("path"), 1);
 function clawdHomeRoot(override) {
-  return override ?? process.env.CLAWD_HOME ?? import_node_path42.default.join(import_node_os17.default.homedir(), ".clawd");
+  return override ?? process.env.CLAWD_HOME ?? import_node_path43.default.join(import_node_os18.default.homedir(), ".clawd");
 }
 function extensionsRoot(override) {
-  return import_node_path42.default.join(clawdHomeRoot(override), "extensions");
+  return import_node_path43.default.join(clawdHomeRoot(override), "extensions");
 }
 function publishedChannelsFile(override) {
-  return import_node_path42.default.join(clawdHomeRoot(override), "extensions-published.json");
+  return import_node_path43.default.join(clawdHomeRoot(override), "extensions-published.json");
 }
 function bundleCacheRoot(override) {
-  return import_node_path42.default.join(clawdHomeRoot(override), "extension-bundles");
+  return import_node_path43.default.join(clawdHomeRoot(override), "extension-bundles");
 }
 
 // src/extension/install-flow.ts
@@ -54570,7 +54809,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_path43.default.isAbsolute(name)) {
+    if (name.includes("..") || name.startsWith("/") || import_node_path44.default.isAbsolute(name)) {
       throw new InstallError("ZIP_INVALID", `unsafe zip entry: ${name}`);
     }
   }
@@ -54602,7 +54841,7 @@ async function installFromChannel(args, deps) {
     );
   }
   const localExtId = namespacedExtId(ownerSlug, channelRef.ownerPrincipalId);
-  const destDir = import_node_path43.default.join(deps.extensionsRoot, localExtId);
+  const destDir = import_node_path44.default.join(deps.extensionsRoot, localExtId);
   let destExists = false;
   try {
     await import_promises6.default.access(destDir);
@@ -54616,16 +54855,16 @@ async function installFromChannel(args, deps) {
     );
   }
   const stage = await import_promises6.default.mkdtemp(
-    import_node_path43.default.join(import_node_os18.default.tmpdir(), `clawd-ext-install-${localExtId}-`)
+    import_node_path44.default.join(import_node_os19.default.tmpdir(), `clawd-ext-install-${localExtId}-`)
   );
   try {
     for (const [name, entry] of Object.entries(zip.files)) {
-      const dest = import_node_path43.default.join(stage, name);
+      const dest = import_node_path44.default.join(stage, name);
       if (entry.dir) {
         await import_promises6.default.mkdir(dest, { recursive: true });
         continue;
       }
-      await import_promises6.default.mkdir(import_node_path43.default.dirname(dest), { recursive: true });
+      await import_promises6.default.mkdir(import_node_path44.default.dirname(dest), { recursive: true });
       if (name === "manifest.json") {
         const rewritten = { ...parsed.data, id: localExtId };
         await import_promises6.default.writeFile(dest, JSON.stringify(rewritten, null, 2));
@@ -54646,8 +54885,8 @@ async function installFromChannel(args, deps) {
 
 // src/extension/update-flow.ts
 var import_promises7 = __toESM(require("fs/promises"), 1);
-var import_node_path44 = __toESM(require("path"), 1);
-var import_node_os19 = __toESM(require("os"), 1);
+var import_node_path45 = __toESM(require("path"), 1);
+var import_node_os20 = __toESM(require("os"), 1);
 var import_node_crypto15 = __toESM(require("crypto"), 1);
 var import_jszip4 = __toESM(require_lib3(), 1);
 var UpdateError = class extends Error {
@@ -54663,11 +54902,11 @@ async function updateFromChannel(args, deps) {
     channelRef.extId,
     channelRef.ownerPrincipalId
   );
-  const liveDir = import_node_path44.default.join(deps.extensionsRoot, localExtId);
+  const liveDir = import_node_path45.default.join(deps.extensionsRoot, localExtId);
   const prevDir = `${liveDir}.prev`;
   let existingVersion;
   try {
-    const raw = await import_promises7.default.readFile(import_node_path44.default.join(liveDir, "manifest.json"), "utf8");
+    const raw = await import_promises7.default.readFile(import_node_path45.default.join(liveDir, "manifest.json"), "utf8");
     const parsed2 = ExtensionManifestSchema.safeParse(JSON.parse(raw));
     if (!parsed2.success) {
       throw new UpdateError(
@@ -54700,7 +54939,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_path44.default.isAbsolute(name)) {
+    if (name.includes("..") || name.startsWith("/") || import_node_path45.default.isAbsolute(name)) {
       throw new UpdateError("ZIP_INVALID", `unsafe zip entry: ${name}`);
     }
   }
@@ -54735,16 +54974,16 @@ async function updateFromChannel(args, deps) {
   await import_promises7.default.rm(prevDir, { recursive: true, force: true });
   await import_promises7.default.rename(liveDir, prevDir);
   const stage = await import_promises7.default.mkdtemp(
-    import_node_path44.default.join(import_node_os19.default.tmpdir(), `clawd-ext-update-${localExtId}-`)
+    import_node_path45.default.join(import_node_os20.default.tmpdir(), `clawd-ext-update-${localExtId}-`)
   );
   try {
     for (const [name, entry] of Object.entries(zip.files)) {
-      const dest = import_node_path44.default.join(stage, name);
+      const dest = import_node_path45.default.join(stage, name);
       if (entry.dir) {
         await import_promises7.default.mkdir(dest, { recursive: true });
         continue;
       }
-      await import_promises7.default.mkdir(import_node_path44.default.dirname(dest), { recursive: true });
+      await import_promises7.default.mkdir(import_node_path45.default.dirname(dest), { recursive: true });
       if (name === "manifest.json") {
         const rewritten = { ...parsed.data, id: localExtId };
         await import_promises7.default.writeFile(dest, JSON.stringify(rewritten, null, 2));
@@ -54837,7 +55076,7 @@ async function rewriteManifestVersion(root, extId, newVersion, previousPublished
       );
     }
   }
-  const manifestPath = import_node_path45.default.join(root, extId, "manifest.json");
+  const manifestPath = import_node_path46.default.join(root, extId, "manifest.json");
   const manifest = await readManifest(root, extId);
   const next = { ...manifest, version: newVersion };
   const tmp = `${manifestPath}.tmp`;
@@ -54845,7 +55084,7 @@ async function rewriteManifestVersion(root, extId, newVersion, previousPublished
   await import_promises8.default.rename(tmp, manifestPath);
 }
 async function readManifest(root, extId) {
-  const file = import_node_path45.default.join(root, extId, "manifest.json");
+  const file = import_node_path46.default.join(root, extId, "manifest.json");
   let raw;
   try {
     raw = await import_promises8.default.readFile(file, "utf8");
@@ -54936,7 +55175,7 @@ function buildExtensionHandlers(deps) {
   };
   async function buildSnapshotMeta(extId) {
     const manifest = await readManifest(deps.root, extId);
-    const { sha256, buffer } = await bundleExtensionDir(import_node_path45.default.join(deps.root, extId));
+    const { sha256, buffer } = await bundleExtensionDir(import_node_path46.default.join(deps.root, extId));
     return { manifest, contentHash: sha256, buffer };
   }
   const publish = async (frame, _client, ctx) => {
@@ -55119,7 +55358,7 @@ function buildExtensionHandlers(deps) {
 // src/app-builder/project-store.ts
 var import_node_fs39 = require("fs");
 var import_node_child_process11 = require("child_process");
-var import_node_path46 = require("path");
+var import_node_path47 = require("path");
 init_protocol();
 var PROJECTS_DIR = "projects";
 var META_FILE = ".clawd-project.json";
@@ -55133,14 +55372,14 @@ var ProjectStore = class {
   root;
   /** projects/<name>/.clawd-project.json 路径 */
   metaPath(name) {
-    return (0, import_node_path46.join)(this.projectsRoot(), name, META_FILE);
+    return (0, import_node_path47.join)(this.projectsRoot(), name, META_FILE);
   }
   /** projects/<name>/ 目录路径（cwd 用） */
   projectDir(name) {
-    return (0, import_node_path46.join)(this.projectsRoot(), name);
+    return (0, import_node_path47.join)(this.projectsRoot(), name);
   }
   projectsRoot() {
-    return (0, import_node_path46.join)(this.root, PROJECTS_DIR);
+    return (0, import_node_path47.join)(this.root, PROJECTS_DIR);
   }
   async list() {
     let entries;
@@ -55443,7 +55682,7 @@ var PublishJobRegistry = class {
 // src/app-builder/publish-job-runner.ts
 var import_node_child_process13 = require("child_process");
 var import_node_fs40 = require("fs");
-var import_node_path47 = require("path");
+var import_node_path48 = require("path");
 
 // src/app-builder/publish-stage-parser.ts
 var STAGE_RE = /^\s*::stage::(build|deploy|verify)\s*$/;
@@ -55475,7 +55714,7 @@ async function startPublishJob(deps, args) {
     return { jobId: registry2.get(args.name).jobId, status: "already-publishing" };
   }
   const projDir = projectDir(args.name);
-  const logPath = (0, import_node_path47.join)(projDir, ".publish.log");
+  const logPath = (0, import_node_path48.join)(projDir, ".publish.log");
   let logStream = null;
   try {
     logStream = (0, import_node_fs40.createWriteStream)(logPath, { flags: "w" });
@@ -55735,7 +55974,7 @@ async function recoverInterruptedJobs(deps) {
 
 // src/handlers/app-builder.ts
 init_protocol();
-var import_node_path48 = require("path");
+var import_node_path49 = require("path");
 var import_node_fs41 = require("fs");
 var APP_BUILDER_PERSONAS = ["persona-app-builder", "persona-dataclaw-builder"];
 var DEV_SERVER_READY_TIMEOUT_MS = 3e4;
@@ -55893,8 +56132,8 @@ function buildAppBuilderHandlers(deps) {
     const project = await userStore.create(f.name, reservedPorts);
     try {
       const personaRoot = deps.resolvePersonaRoot ? deps.resolvePersonaRoot(session.ownerPersonaId ?? "") : deps.personaRoot;
-      const templateSrcDir = (0, import_node_path48.join)(personaRoot, "extension-kit", "examples", DEFAULT_TEMPLATE);
-      const scaffoldScript = (0, import_node_path48.join)(deps.deployKitRoot, "scripts", "new-extension.sh");
+      const templateSrcDir = (0, import_node_path49.join)(personaRoot, "extension-kit", "examples", DEFAULT_TEMPLATE);
+      const scaffoldScript = (0, import_node_path49.join)(deps.deployKitRoot, "scripts", "new-extension.sh");
       const scaffoldResult = await userStore.scaffold(project.name, templateSrcDir, scaffoldScript);
       deps.logger?.info("app-builder.scaffold.done", {
         name: project.name,
@@ -56115,7 +56354,7 @@ function buildAppBuilderHandlers(deps) {
       await userStore.clearPublishJob(args.name);
     }
     const personaRoot = deps.resolvePersonaRoot ? deps.resolvePersonaRoot(boundSession.ownerPersonaId ?? "") : deps.personaRoot;
-    const scriptPath = (0, import_node_path48.join)(deps.deployKitRoot, "scripts", "publish.sh");
+    const scriptPath = (0, import_node_path49.join)(deps.deployKitRoot, "scripts", "publish.sh");
     deps.logger?.info("app-builder.publish.start", {
       name: args.name,
       sessionId: boundSession.sessionId,
@@ -56284,7 +56523,7 @@ function buildVisitorHandlers(deps) {
 
 // src/extension/registry.ts
 var import_promises9 = __toESM(require("fs/promises"), 1);
-var import_node_path49 = __toESM(require("path"), 1);
+var import_node_path50 = __toESM(require("path"), 1);
 async function loadAll(root) {
   let entries;
   try {
@@ -56297,13 +56536,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_path49.default.join(root, ent.name), ent.name));
+    records.push(await loadOne(import_node_path50.default.join(root, ent.name), ent.name));
   }
   records.sort((a, b2) => a.extId < b2.extId ? -1 : a.extId > b2.extId ? 1 : 0);
   return records;
 }
 async function loadOne(dir, dirName) {
-  const manifestPath = import_node_path49.default.join(dir, "manifest.json");
+  const manifestPath = import_node_path50.default.join(dir, "manifest.json");
   let raw;
   try {
     raw = await import_promises9.default.readFile(manifestPath, "utf8");
@@ -56348,7 +56587,7 @@ async function loadOne(dir, dirName) {
 
 // src/extension/uninstall.ts
 var import_promises10 = __toESM(require("fs/promises"), 1);
-var import_node_path50 = __toESM(require("path"), 1);
+var import_node_path51 = __toESM(require("path"), 1);
 var UninstallError = class extends Error {
   constructor(code, message) {
     super(message);
@@ -56357,7 +56596,7 @@ var UninstallError = class extends Error {
   code;
 };
 async function uninstall(deps) {
-  const dir = import_node_path50.default.join(deps.root, deps.extId);
+  const dir = import_node_path51.default.join(deps.root, deps.extId);
   try {
     await import_promises10.default.access(dir);
   } catch {
@@ -56926,7 +57165,7 @@ async function dispatchRpc(method, frame, client, ctx, deps) {
 
 // src/extension/runtime.ts
 var import_node_child_process15 = require("child_process");
-var import_node_path51 = __toESM(require("path"), 1);
+var import_node_path52 = __toESM(require("path"), 1);
 var import_promises11 = require("timers/promises");
 
 // src/extension/port-allocator.ts
@@ -57027,7 +57266,7 @@ var Runtime = class {
       /\$CLAWOS_EXT_PORT/g,
       String(port)
     );
-    const dir = import_node_path51.default.join(this.root, extId);
+    const dir = import_node_path52.default.join(this.root, extId);
     const env = {
       ...process.env,
       CLAWOS_EXT_PORT: String(port),
@@ -57139,7 +57378,7 @@ ${handle.stderrTail}`
 
 // src/extension/published-channels.ts
 var import_promises12 = __toESM(require("fs/promises"), 1);
-var import_node_path52 = __toESM(require("path"), 1);
+var import_node_path53 = __toESM(require("path"), 1);
 init_zod();
 var PublishedChannelsError = class extends Error {
   constructor(code, message) {
@@ -57238,7 +57477,7 @@ var PublishedChannelStore = class {
       )
     };
     const tmp = `${this.filePath}.tmp`;
-    await import_promises12.default.mkdir(import_node_path52.default.dirname(this.filePath), { recursive: true });
+    await import_promises12.default.mkdir(import_node_path53.default.dirname(this.filePath), { recursive: true });
     await import_promises12.default.writeFile(tmp, JSON.stringify(data, null, 2), { mode: 384 });
     await import_promises12.default.rename(tmp, this.filePath);
   }
@@ -57246,7 +57485,7 @@ var PublishedChannelStore = class {
 
 // src/extension/bundle-cache.ts
 var import_promises13 = __toESM(require("fs/promises"), 1);
-var import_node_path53 = __toESM(require("path"), 1);
+var import_node_path54 = __toESM(require("path"), 1);
 var BundleCache = class {
   constructor(rootDir) {
     this.rootDir = rootDir;
@@ -57255,14 +57494,14 @@ var BundleCache = class {
   /** Atomic write: stage tmp → rename. Caller passes the hex sha256. */
   async write(snapshotHash, buffer) {
     await import_promises13.default.mkdir(this.rootDir, { recursive: true });
-    const file = import_node_path53.default.join(this.rootDir, `${snapshotHash}.zip`);
+    const file = import_node_path54.default.join(this.rootDir, `${snapshotHash}.zip`);
     const tmp = `${file}.tmp`;
     await import_promises13.default.writeFile(tmp, buffer, { mode: 384 });
     await import_promises13.default.rename(tmp, file);
   }
   /** Returns the bundle bytes, or null when the file doesn't exist. */
   async read(snapshotHash) {
-    const file = import_node_path53.default.join(this.rootDir, `${snapshotHash}.zip`);
+    const file = import_node_path54.default.join(this.rootDir, `${snapshotHash}.zip`);
     try {
       return await import_promises13.default.readFile(file);
     } catch (e) {
@@ -57272,7 +57511,7 @@ var BundleCache = class {
   }
   /** Idempotent — missing file is not an error. */
   async delete(snapshotHash) {
-    const file = import_node_path53.default.join(this.rootDir, `${snapshotHash}.zip`);
+    const file = import_node_path54.default.join(this.rootDir, `${snapshotHash}.zip`);
     await import_promises13.default.rm(file, { force: true });
   }
 };
@@ -57293,11 +57532,11 @@ async function startDaemon(config) {
     },
     source: "daemon",
     sampling: logShippingCfg.sampling,
-    homeDir: import_node_os20.default.homedir()
+    homeDir: import_node_os21.default.homedir()
   });
   const logger = createLogger({
     level: config.logLevel,
-    file: import_node_path54.default.join(config.dataDir, "clawd.log"),
+    file: import_node_path55.default.join(config.dataDir, "clawd.log"),
     logClient
   });
   logger.info("starting clawd", { version, config: { port: config.port, host: config.host, dataDir: config.dataDir } });
@@ -57437,8 +57676,8 @@ async function startDaemon(config) {
   const agents = new AgentsScanner();
   const history = new ClaudeHistoryReader();
   let transport = null;
-  const personaStore = new PersonaStore(import_node_path54.default.join(config.dataDir, "personas"));
-  const usersRoot = import_node_path54.default.join(config.dataDir, "users");
+  const personaStore = new PersonaStore(import_node_path55.default.join(config.dataDir, "personas"));
+  const usersRoot = import_node_path55.default.join(config.dataDir, "users");
   const defaultsRoot = findDefaultsRoot(logger);
   if (defaultsRoot) {
     seedDefaultPersonas({ store: personaStore, defaultsRoot, logger });
@@ -57458,17 +57697,17 @@ async function startDaemon(config) {
   migrateCodexSandbox({ store: personaStore, logger });
   const groupFileStore = new GroupFileStore({ dataDir: config.dataDir, logger });
   const personaDispatchManager = new PersonaDispatchManager({ genId: () => v4_default() });
-  const here = typeof __dirname === "string" ? __dirname : import_node_path54.default.dirname((0, import_node_url4.fileURLToPath)(import_meta6.url));
+  const here = typeof __dirname === "string" ? __dirname : import_node_path55.default.dirname((0, import_node_url4.fileURLToPath)(import_meta6.url));
   const dispatchServerCandidates = [
-    import_node_path54.default.join(here, "dispatch", "mcp-server.cjs"),
+    import_node_path55.default.join(here, "dispatch", "mcp-server.cjs"),
     // 生产 dist/index → dist/dispatch/mcp-server.cjs
-    import_node_path54.default.join(here, "..", "dist", "dispatch", "mcp-server.cjs")
+    import_node_path55.default.join(here, "..", "dist", "dispatch", "mcp-server.cjs")
     // dev tsx src/index → ../dist/dispatch/mcp-server.cjs
   ];
   const dispatchServerScriptPath = dispatchServerCandidates.find((p2) => import_node_fs42.default.existsSync(p2));
   let dispatchMcpConfigPath2;
   if (dispatchServerScriptPath) {
-    const dispatchLogPath = import_node_path54.default.join(config.dataDir, "dispatch-mcp-server.log");
+    const dispatchLogPath = import_node_path55.default.join(config.dataDir, "dispatch-mcp-server.log");
     dispatchMcpConfigPath2 = writeDispatchMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: dispatchServerScriptPath,
@@ -57485,15 +57724,15 @@ async function startDaemon(config) {
     });
   }
   const ticketServerCandidates = [
-    import_node_path54.default.join(here, "ticket", "mcp-server.cjs"),
-    import_node_path54.default.join(here, "..", "dist", "ticket", "mcp-server.cjs")
+    import_node_path55.default.join(here, "ticket", "mcp-server.cjs"),
+    import_node_path55.default.join(here, "..", "dist", "ticket", "mcp-server.cjs")
   ];
   const ticketServerScriptPath = ticketServerCandidates.find((p2) => import_node_fs42.default.existsSync(p2));
   const ticketOwnerUnionId = feishuIdentity?.identity.unionId ?? "";
   const ticketOwnerName = feishuIdentity?.identity.displayName ?? "";
   let ticketMcpConfigPath2;
   if (ticketServerScriptPath && ticketOwnerUnionId) {
-    const ticketLogPath = import_node_path54.default.join(config.dataDir, "ticket-mcp-server.log");
+    const ticketLogPath = import_node_path55.default.join(config.dataDir, "ticket-mcp-server.log");
     ticketMcpConfigPath2 = writeTicketMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: ticketServerScriptPath,
@@ -57514,13 +57753,13 @@ async function startDaemon(config) {
     });
   }
   const shiftServerCandidates = [
-    import_node_path54.default.join(here, "shift", "mcp-server.cjs"),
-    import_node_path54.default.join(here, "..", "dist", "shift", "mcp-server.cjs")
+    import_node_path55.default.join(here, "shift", "mcp-server.cjs"),
+    import_node_path55.default.join(here, "..", "dist", "shift", "mcp-server.cjs")
   ];
   const shiftServerScriptPath = shiftServerCandidates.find((p2) => import_node_fs42.default.existsSync(p2));
   let shiftMcpConfigPath2;
   if (shiftServerScriptPath) {
-    const shiftLogPath = import_node_path54.default.join(config.dataDir, "shift-mcp-server.log");
+    const shiftLogPath = import_node_path55.default.join(config.dataDir, "shift-mcp-server.log");
     shiftMcpConfigPath2 = await writeShiftMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: shiftServerScriptPath,
@@ -57538,13 +57777,13 @@ async function startDaemon(config) {
     );
   }
   const inboxServerCandidates = [
-    import_node_path54.default.join(here, "inbox", "mcp-server.cjs"),
-    import_node_path54.default.join(here, "..", "dist", "inbox", "mcp-server.cjs")
+    import_node_path55.default.join(here, "inbox", "mcp-server.cjs"),
+    import_node_path55.default.join(here, "..", "dist", "inbox", "mcp-server.cjs")
   ];
   const inboxServerScriptPath = inboxServerCandidates.find((p2) => import_node_fs42.default.existsSync(p2));
   let inboxMcpConfigPath2;
   if (inboxServerScriptPath) {
-    const inboxLogPath = import_node_path54.default.join(config.dataDir, "inbox-mcp-server.log");
+    const inboxLogPath = import_node_path55.default.join(config.dataDir, "inbox-mcp-server.log");
     inboxMcpConfigPath2 = await writeInboxMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: inboxServerScriptPath,
@@ -57562,7 +57801,7 @@ async function startDaemon(config) {
     );
   }
   const shiftStore = createShiftStore({
-    filePath: import_node_path54.default.join(config.dataDir, "shift.json"),
+    filePath: import_node_path55.default.join(config.dataDir, "shift.json"),
     ownerIdProvider: () => ownerPrincipalId,
     now: () => Date.now()
   });
@@ -57580,7 +57819,7 @@ async function startDaemon(config) {
     getAdapter,
     historyReader: history,
     dataDir: config.dataDir,
-    personaRoot: import_node_path54.default.join(config.dataDir, "personas"),
+    personaRoot: import_node_path55.default.join(config.dataDir, "personas"),
     usersRoot,
     personaStore,
     ownerDisplayName,
@@ -57592,9 +57831,9 @@ async function startDaemon(config) {
     // 127.0.0.1（不是 config.host）—— cc 跑在本机，loopback 最稳；外部访问限制 + http-router
     // 的 isLoopback 兜底已确保安全。
     getDaemonUrl: () => `http://127.0.0.1:${config.port}`,
-    // Persona dispatch (Task 8): manager 通过这两个 deps 跟 PersonaDispatchManager 协作。
-    // - personaDispatchManager: manager.createDispatchedSession 用它 registerBSession；
-    //   reducer 通过闭包反查 dispatchId 注 CLAWD_DISPATCH_ID env。
+    // Persona dispatch: manager 通过这两个 deps 跟 PersonaDispatchManager 协作。
+    // - personaDispatchManager: createDispatchedSession / resumeDispatchedSession 用它
+    //   registerBSession；complete handler 用 findInflightDispatchByBSessionId 反查回 dispatchId。
     // - dispatchMcpConfigPath: reducer 透传到 SpawnContext，cc spawn 加 --mcp-config flag。
     personaDispatchManager,
     dispatchMcpConfigPath: dispatchMcpConfigPath2,
@@ -57623,7 +57862,7 @@ async function startDaemon(config) {
     // 文件可能 agent 写完又被自己删（罕见），用 size=0 / fallback mime 兜底。
     attachmentGroup: {
       onFileEdit: (input) => {
-        const absPath = import_node_path54.default.isAbsolute(input.relPath) ? input.relPath : import_node_path54.default.join(input.cwd, input.relPath);
+        const absPath = import_node_path55.default.isAbsolute(input.relPath) ? input.relPath : import_node_path55.default.join(input.cwd, input.relPath);
         let size = 0;
         try {
           size = import_node_fs42.default.statSync(absPath).size;
@@ -57824,11 +58063,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_path54.default.join(config.dataDir, "personas"),
+      personaRoot: import_node_path55.default.join(config.dataDir, "personas"),
       usersRoot
     },
     // workspace/git/history/skills/agents handler 共用的 guest path guard 锚点
-    personaRoot: import_node_path54.default.join(config.dataDir, "personas"),
+    personaRoot: import_node_path55.default.join(config.dataDir, "personas"),
     // v2 多人 persona 隔离：handler 派生 guest user-dir 放行
     usersRoot,
     // capability:list / delete handler 依赖
@@ -57937,11 +58176,11 @@ async function startDaemon(config) {
     // 发布上线脚手架化 (spec 2026-06-03 §5.2):
     // appBuilderPersonaRoot 用于拼 publish.sh 绝对路径（persona-app-builder 安装在
     // dataDir/personas/persona-app-builder 之下，extension-kit/scripts/publish.sh 是相对路径）。
-    appBuilderPersonaRoot: import_node_path54.default.join(config.dataDir, "personas", "persona-app-builder"),
+    appBuilderPersonaRoot: import_node_path55.default.join(config.dataDir, "personas", "persona-app-builder"),
     // 共享 deploy-kit 根：scaffold/publish 脚本骨架 + 阿里云凭证单一真源。
-    deployKitRoot: import_node_path54.default.join(config.dataDir, "deploy-kit"),
+    deployKitRoot: import_node_path55.default.join(config.dataDir, "deploy-kit"),
     // scaffold/publish 按当前 session 的 persona 解析其安装根，让每个 persona 用自己的模板/注入配置。
-    resolvePersonaRoot: (personaId) => import_node_path54.default.join(config.dataDir, "personas", personaId),
+    resolvePersonaRoot: (personaId) => import_node_path55.default.join(config.dataDir, "personas", personaId),
     // 发布上线脚手架化 (spec 2026-06-03 §5.2.2):
     // 复用 SessionManagerDeps.broadcastFrame 同款 dispatch 逻辑 —— runner 调 manager.send
     // 取回 broadcast 帧后逐帧 push 到 transport，跟 manager 自身的 deps 一致。
@@ -57976,7 +58215,8 @@ async function startDaemon(config) {
       logger.info("dispatch.spawnB.start", {
         dispatchId: args.dispatchId,
         targetPersona: args.targetPersona,
-        sourceSessionId: args.sourceSessionId
+        sourceSessionId: args.sourceSessionId,
+        route: args.route
       });
       const sourceFile = manager.findOwnedSession(args.sourceSessionId);
       if (!sourceFile && !args.guestPrincipalId) {
@@ -57984,8 +58224,8 @@ async function startDaemon(config) {
       }
       let sourceJsonlPath = "(no transcript yet \u2014 operate from the task description alone)";
       if (sourceFile && sourceFile.toolSessionId) {
-        sourceJsonlPath = import_node_path54.default.join(
-          import_node_os20.default.homedir(),
+        sourceJsonlPath = import_node_path55.default.join(
+          import_node_os21.default.homedir(),
           ".claude",
           "projects",
           cwdToHashDir(sourceFile.cwd),
@@ -57995,9 +58235,23 @@ async function startDaemon(config) {
       logger.info("dispatch.spawnB.source-resolved", {
         dispatchId: args.dispatchId,
         sourceJsonlPath,
-        hasToolSessionId: Boolean(sourceFile?.toolSessionId)
+        hasToolSessionId: Boolean(sourceFile?.toolSessionId),
+        route: args.route
       });
-      manager.createDispatchedSession({
+      if (args.route === "resume") {
+        if (!args.bSessionId) {
+          throw new Error("resume route requires bSessionId");
+        }
+        const { sessionId: sessionId2 } = manager.resumeDispatchedSession({
+          dispatchId: args.dispatchId,
+          bSessionId: args.bSessionId,
+          prompt: args.prompt,
+          sourceJsonlPath,
+          callerIdentity: args.guestPrincipalId ? { kind: "guest", sourcePrincipalId: args.guestPrincipalId } : { kind: "local", sourceSessionId: args.sourceSessionId }
+        });
+        return { bSessionId: sessionId2 };
+      }
+      const { sessionId } = manager.createDispatchedSession({
         dispatchId: args.dispatchId,
         sourceSessionId: args.sourceSessionId,
         targetPersona: args.targetPersona,
@@ -58007,24 +58261,30 @@ async function startDaemon(config) {
         guestPrincipalId: args.guestPrincipalId,
         guestDisplayName: args.guestDisplayName
       });
+      return { bSessionId: sessionId };
     },
     // A 角色：从 ContactStore 取 peer 可达 URL + connect token，转发到对端 daemon /rpc。
-    forwardToPeer: async ({ targetDeviceId, targetPersona, prompt }) => {
+    forwardToPeer: async ({ targetDeviceId, targetPersona, prompt, targetSessionId }) => {
       const contact = contactStore.get(targetDeviceId);
       if (!contact || !contact.remoteUrl || !contact.connectToken) {
         return {
-          kind: "failure",
-          reason: `unknown or unreachable contact: ${targetDeviceId}`
+          outcome: {
+            kind: "failure",
+            reason: `unknown or unreachable contact: ${targetDeviceId}`
+          }
         };
       }
       return forwardDispatchToPeer({
         contact: { remoteUrl: contact.remoteUrl, connectToken: contact.connectToken },
         targetPersona,
-        prompt
+        prompt,
+        targetSessionId
       });
     },
     // B 角色：判断 targetPersona 是否 public（跨设备授权边界，private 拒）。
-    getPersonaPublic: (personaId) => personaRegistry.get(personaId)?.public ?? false
+    getPersonaPublic: (personaId) => personaRegistry.get(personaId)?.public ?? false,
+    // targetSessionId 复用路径的权限校验数据源：读 B session 的 SessionFile。
+    findOwnedSession: (sessionId) => manager.findOwnedSession(sessionId)
   });
   handlers = { ...handlers, ...dispatchHandlers };
   const shiftHandlers = buildShiftInternalHandlers({
@@ -58284,8 +58544,8 @@ async function startDaemon(config) {
       const lines = [
         `Tunnel:      ${r.url}`,
         ...resolvedAuthToken ? [`Connect:     ${connectUrl}`] : [],
-        `Frpc config: ${import_node_path54.default.join(config.dataDir, "frpc.toml")}`,
-        `Frpc log:    ${import_node_path54.default.join(config.dataDir, "frpc.log")}`
+        `Frpc config: ${import_node_path55.default.join(config.dataDir, "frpc.toml")}`,
+        `Frpc log:    ${import_node_path55.default.join(config.dataDir, "frpc.log")}`
       ];
       const width = Math.max(...lines.map((l) => l.length));
       const bar = "\u2550".repeat(width + 4);
@@ -58298,7 +58558,7 @@ ${bar}
 
 `);
       try {
-        const connectPath = import_node_path54.default.join(config.dataDir, "connect.txt");
+        const connectPath = import_node_path55.default.join(config.dataDir, "connect.txt");
         import_node_fs42.default.writeFileSync(connectPath, lines.join("\n") + "\n", { mode: 384 });
       } catch {
       }
@@ -58371,7 +58631,7 @@ ${bar}
   };
 }
 function migrateDropPersonsDir(dataDir) {
-  const dir = import_node_path54.default.join(dataDir, "persons");
+  const dir = import_node_path55.default.join(dataDir, "persons");
   try {
     import_node_fs42.default.rmSync(dir, { recursive: true, force: true });
   } catch {