@clawos-dev/clawd 0.2.257 → 0.2.259

package/dist/cli.cjs

@@ -46,7 +46,7 @@ var init_methods = __esm({
       "session:delete",
       "session:send",
       // per-turn sender 2026-07-08 spec §4.6：MCP servers (ticket / inbox ...) 走 HTTP RPC
-      // /api/rpc/session.currentTurnSender 拉当前 turn caller；WS handler 同名（loopback path 复用）
+      // /rpc/session:currentTurnSender（Bearer）拉当前 turn caller；WS handler 同名
       "session:currentTurnSender",
       "session:stop",
       // 温柔中断当前轮次，不杀进程（走 CC IPC control_request.subtype=interrupt）
@@ -94,6 +94,14 @@ var init_methods = __esm({
       "workspace:list",
       "workspace:read",
       "shift:list",
+      // ---- shift-internal:* (cc 内 shift MCP server 管理 owner 排班，spec 2026-06-24-clawd-shift) ----
+      // 统一 RPC 鉴权（spec 2026-07-28）后经 /rpc + Bearer owner token 调；personaId 归因
+      // 从 body 来（env CLAWD_PERSONA_ID），handler 内 createdByPersona 自检防跨 persona 误操作。
+      "shift-internal:add",
+      "shift-internal:list",
+      "shift-internal:cancel",
+      "shift-internal:update",
+      "shift-internal:history",
       "skills:list",
       "agents:list",
       "git:root",
@@ -111,14 +119,17 @@ var init_methods = __esm({
       "persona:get",
       "persona:update",
       "persona:delete",
-      // ---- personaDispatch:* (跨设备 dispatch) ----
-      // personaDispatch:run 有两个入口：本地 cc 经 /api/rpc（EXPOSED_RPC_METHODS，127.0.0.1 无 token）；
-      // 跨设备时 A 的 peer daemon 经 /rpc（Bearer connect token）。后者要求它是 WS METHOD_NAME +
-      // METHOD_GRANT_MAP capability-scoped（handler 自检 persona.public + assertGrant(send)）。
-      // personaDispatch:complete 仅 B 本地 cc 调（/api/rpc），不跨设备，故不列入 WS method。
+      // ---- personaDispatch:* (dispatch 全家，spec 2026-07-28-unify-rpc-auth 统一登记) ----
+      // run：本地 MCP server 经 /rpc（Bearer owner token）；跨设备 A 的 peer daemon 经 /rpc
+      //（Bearer connect token）。capability-scoped（handler 自检 persona.public + assertGrant(send)）。
+      // complete / list：B / A 本机 MCP server 调（owner token → ADMIN_ANY）。
+      // get：跨设备轮询——A 端 daemon 凭 connect token 查 B 台账终态；handler 校验行归属。
       "personaDispatch:run",
+      "personaDispatch:complete",
+      "personaDispatch:list",
+      "personaDispatch:get",
       // ---- peerExec:run (跨设备 exec，spec 2026-07-16-cross-device-exec-mcp) ----
-      // A 侧本地 cc 经 /api/rpc（EXPOSED_RPC_METHODS）带 peerDeviceId → daemon forward；
+      // A 侧本机 MCP server 经 /rpc（Bearer owner token）带 peerDeviceId → daemon forward；
       // B 侧对端经 /rpc（Bearer connect token）无 peerDeviceId → 本地 spawn。METHOD_GRANT_MAP
       // 设 public，handler 内判 remoteAccessAllowed（跟 inbox:postMessage 同款）。
       "peerExec:run",
@@ -155,6 +166,9 @@ var init_methods = __esm({
       "inbox:list",
       "inbox:markRead",
       "inbox:postMessage",
+      // inbox:sendDm——persona 代发 DM 编排（inbox MCP server 经 /rpc + Bearer owner token 调）。
+      // sender/mode 由 handler 按 body.sessionId 反查 session scope 归因（业务逻辑非鉴权）。
+      "inbox:sendDm",
       // ---- contact:* (联系人列表) ----
       // 飞书统一身份 Phase 3 (决策 #14): received-capability:* 正名为 contact:*——Phase 2 后
       // 联系人身份由中心 server introspect 背书，不再是"对方颁发的 capability"。
@@ -319,7 +333,10 @@ var init_errors = __esm({
       WRONG_PERSONA: "WRONG_PERSONA",
       SESSION_ALREADY_BOUND: "SESSION_ALREADY_BOUND",
       // 2026-07-02 unified people sidebar: contact:pin 时 deviceId 不在 store（可能被别处删了）
-      CONTACT_NOT_FOUND: "CONTACT_NOT_FOUND"
+      CONTACT_NOT_FOUND: "CONTACT_NOT_FOUND",
+      // 统一 RPC 鉴权（spec 2026-07-28）：personaDispatch:get 查不到台账行，或 guest ctx
+      // 查非自己发起的行（越权与未知 id 同码，不泄露存在性）。A 端轮询遇此码立即判失败。
+      DISPATCH_NOT_FOUND: "DISPATCH_NOT_FOUND"
     };
     ClawdError = class extends Error {
       constructor(code, message) {
@@ -749,8 +766,8 @@ var init_parseUtil = __esm({
     init_errors2();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path74, errorMaps, issueData } = params;
-      const fullPath = [...path74, ...issueData.path || []];
+      const { data, path: path75, errorMaps, issueData } = params;
+      const fullPath = [...path75, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -1061,11 +1078,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path74, key) {
+      constructor(parent, value, path75, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path74;
+        this._path = path75;
         this._key = key;
       }
       get path() {
@@ -4496,7 +4513,12 @@ var init_attachment_schemas = __esm({
       sessionId: external_exports.string().min(1),
       relPath: external_exports.string().min(1),
       /** owner 手动加入时可选备注；agent 自动入清单不走此 RPC */
-      label: external_exports.string().optional()
+      label: external_exports.string().optional(),
+      /**
+       * 统一 RPC 鉴权（spec 2026-07-28 §8 决策 B）：agent 经 clawd-rpc 调用持 owner token，
+       * ctx 已推不出"这是 agent"；body 显式标 origin:'agent' 保留群清单 from 的展示语义。
+       */
+      origin: external_exports.literal("agent").optional()
     });
     AttachmentGroupAddResponseSchema = external_exports.object({
       entry: GroupFileEntrySchema
@@ -6207,7 +6229,7 @@ var init_feishu_auth = __esm({
 });
 
 // ../protocol/src/dispatch.ts
-var DispatchOutcomeSchema, DispatchRunArgsSchema, DispatchCompleteArgsSchema, DISPATCH_STATUSES, DispatchStatusSchema, DispatchRecordSchema, DispatchListArgsSchema, DispatchListResultSchema;
+var DispatchOutcomeSchema, DispatchRunArgsSchema, DispatchCompleteArgsSchema, DISPATCH_STATUSES, DispatchStatusSchema, DispatchRecordSchema, DispatchListArgsSchema, DispatchListResultSchema, DispatchGetArgsSchema, DispatchGetOkSchema;
 var init_dispatch = __esm({
   "../protocol/src/dispatch.ts"() {
     "use strict";
@@ -6280,6 +6302,14 @@ var init_dispatch = __esm({
     DispatchListResultSchema = external_exports.object({
       records: external_exports.array(DispatchRecordSchema)
     });
+    DispatchGetArgsSchema = external_exports.object({
+      dispatchId: external_exports.string().min(1)
+    });
+    DispatchGetOkSchema = external_exports.object({
+      type: external_exports.literal("personaDispatch:get:ok"),
+      status: DispatchStatusSchema,
+      outcome: DispatchOutcomeSchema.optional()
+    });
   }
 });
 
@@ -6633,8 +6663,8 @@ var require_req = __commonJS({
       if (req.originalUrl) {
         _req.url = req.originalUrl;
       } else {
-        const path74 = req.path;
-        _req.url = typeof path74 === "string" ? path74 : req.url ? req.url.path || req.url : void 0;
+        const path75 = req.path;
+        _req.url = typeof path75 === "string" ? path75 : req.url ? req.url.path || req.url : void 0;
       }
       if (req.query) {
         _req.query = req.query;
@@ -6799,14 +6829,14 @@ var require_redact = __commonJS({
       }
       return obj;
     }
-    function parsePath(path74) {
+    function parsePath(path75) {
       const parts = [];
       let current = "";
       let inBrackets = false;
       let inQuotes = false;
       let quoteChar = "";
-      for (let i = 0; i < path74.length; i++) {
-        const char = path74[i];
+      for (let i = 0; i < path75.length; i++) {
+        const char = path75[i];
         if (!inBrackets && char === ".") {
           if (current) {
             parts.push(current);
@@ -6937,10 +6967,10 @@ var require_redact = __commonJS({
       return current;
     }
     function redactPaths(obj, paths, censor, remove = false) {
-      for (const path74 of paths) {
-        const parts = parsePath(path74);
+      for (const path75 of paths) {
+        const parts = parsePath(path75);
         if (parts.includes("*")) {
-          redactWildcardPath(obj, parts, censor, path74, remove);
+          redactWildcardPath(obj, parts, censor, path75, remove);
         } else {
           if (remove) {
             removeKey(obj, parts);
@@ -7025,8 +7055,8 @@ var require_redact = __commonJS({
           }
         } else {
           if (afterWildcard.includes("*")) {
-            const wrappedCensor = typeof censor === "function" ? (value, path74) => {
-              const fullPath = [...pathArray.slice(0, pathLength), ...path74];
+            const wrappedCensor = typeof censor === "function" ? (value, path75) => {
+              const fullPath = [...pathArray.slice(0, pathLength), ...path75];
               return censor(value, fullPath);
             } : censor;
             redactWildcardPath(current, afterWildcard, wrappedCensor, originalPath, remove);
@@ -7061,8 +7091,8 @@ var require_redact = __commonJS({
         return null;
       }
       const pathStructure = /* @__PURE__ */ new Map();
-      for (const path74 of pathsToClone) {
-        const parts = parsePath(path74);
+      for (const path75 of pathsToClone) {
+        const parts = parsePath(path75);
         let current = pathStructure;
         for (let i = 0; i < parts.length; i++) {
           const part = parts[i];
@@ -7114,24 +7144,24 @@ var require_redact = __commonJS({
       }
       return cloneSelectively(obj, pathStructure);
     }
-    function validatePath(path74) {
-      if (typeof path74 !== "string") {
+    function validatePath(path75) {
+      if (typeof path75 !== "string") {
         throw new Error("Paths must be (non-empty) strings");
       }
-      if (path74 === "") {
+      if (path75 === "") {
         throw new Error("Invalid redaction path ()");
       }
-      if (path74.includes("..")) {
-        throw new Error(`Invalid redaction path (${path74})`);
+      if (path75.includes("..")) {
+        throw new Error(`Invalid redaction path (${path75})`);
       }
-      if (path74.includes(",")) {
-        throw new Error(`Invalid redaction path (${path74})`);
+      if (path75.includes(",")) {
+        throw new Error(`Invalid redaction path (${path75})`);
       }
       let bracketCount = 0;
       let inQuotes = false;
       let quoteChar = "";
-      for (let i = 0; i < path74.length; i++) {
-        const char = path74[i];
+      for (let i = 0; i < path75.length; i++) {
+        const char = path75[i];
         if ((char === '"' || char === "'") && bracketCount > 0) {
           if (!inQuotes) {
             inQuotes = true;
@@ -7145,20 +7175,20 @@ var require_redact = __commonJS({
         } else if (char === "]" && !inQuotes) {
           bracketCount--;
           if (bracketCount < 0) {
-            throw new Error(`Invalid redaction path (${path74})`);
+            throw new Error(`Invalid redaction path (${path75})`);
           }
         }
       }
       if (bracketCount !== 0) {
-        throw new Error(`Invalid redaction path (${path74})`);
+        throw new Error(`Invalid redaction path (${path75})`);
       }
     }
     function validatePaths(paths) {
       if (!Array.isArray(paths)) {
         throw new TypeError("paths must be an array");
       }
-      for (const path74 of paths) {
-        validatePath(path74);
+      for (const path75 of paths) {
+        validatePath(path75);
       }
     }
     function slowRedact(options = {}) {
@@ -7326,8 +7356,8 @@ var require_redaction = __commonJS({
         if (shape[k2] === null) {
           o[k2] = (value) => topCensor(value, [k2]);
         } else {
-          const wrappedCensor = typeof censor === "function" ? (value, path74) => {
-            return censor(value, [k2, ...path74]);
+          const wrappedCensor = typeof censor === "function" ? (value, path75) => {
+            return censor(value, [k2, ...path75]);
           } : censor;
           o[k2] = Redact({
             paths: shape[k2],
@@ -7545,10 +7575,10 @@ var require_atomic_sleep = __commonJS({
 var require_sonic_boom = __commonJS({
   "../node_modules/.pnpm/sonic-boom@4.2.1/node_modules/sonic-boom/index.js"(exports2, module2) {
     "use strict";
-    var fs65 = require("fs");
+    var fs66 = require("fs");
     var EventEmitter3 = require("events");
     var inherits = require("util").inherits;
-    var path74 = require("path");
+    var path75 = require("path");
     var sleep2 = require_atomic_sleep();
     var assert = require("assert");
     var BUSY_WRITE_TIMEOUT = 100;
@@ -7602,20 +7632,20 @@ var require_sonic_boom = __commonJS({
       const mode = sonic.mode;
       if (sonic.sync) {
         try {
-          if (sonic.mkdir) fs65.mkdirSync(path74.dirname(file), { recursive: true });
-          const fd = fs65.openSync(file, flags, mode);
+          if (sonic.mkdir) fs66.mkdirSync(path75.dirname(file), { recursive: true });
+          const fd = fs66.openSync(file, flags, mode);
           fileOpened(null, fd);
         } catch (err) {
           fileOpened(err);
           throw err;
         }
       } else if (sonic.mkdir) {
-        fs65.mkdir(path74.dirname(file), { recursive: true }, (err) => {
+        fs66.mkdir(path75.dirname(file), { recursive: true }, (err) => {
           if (err) return fileOpened(err);
-          fs65.open(file, flags, mode, fileOpened);
+          fs66.open(file, flags, mode, fileOpened);
         });
       } else {
-        fs65.open(file, flags, mode, fileOpened);
+        fs66.open(file, flags, mode, fileOpened);
       }
     }
     function SonicBoom(opts) {
@@ -7656,8 +7686,8 @@ var require_sonic_boom = __commonJS({
         this.flush = flushBuffer;
         this.flushSync = flushBufferSync;
         this._actualWrite = actualWriteBuffer;
-        fsWriteSync = () => fs65.writeSync(this.fd, this._writingBuf);
-        fsWrite = () => fs65.write(this.fd, this._writingBuf, this.release);
+        fsWriteSync = () => fs66.writeSync(this.fd, this._writingBuf);
+        fsWrite = () => fs66.write(this.fd, this._writingBuf, this.release);
       } else if (contentMode === void 0 || contentMode === kContentModeUtf8) {
         this._writingBuf = "";
         this.write = write;
@@ -7666,15 +7696,15 @@ var require_sonic_boom = __commonJS({
         this._actualWrite = actualWrite;
         fsWriteSync = () => {
           if (Buffer.isBuffer(this._writingBuf)) {
-            return fs65.writeSync(this.fd, this._writingBuf);
+            return fs66.writeSync(this.fd, this._writingBuf);
           }
-          return fs65.writeSync(this.fd, this._writingBuf, "utf8");
+          return fs66.writeSync(this.fd, this._writingBuf, "utf8");
         };
         fsWrite = () => {
           if (Buffer.isBuffer(this._writingBuf)) {
-            return fs65.write(this.fd, this._writingBuf, this.release);
+            return fs66.write(this.fd, this._writingBuf, this.release);
           }
-          return fs65.write(this.fd, this._writingBuf, "utf8", this.release);
+          return fs66.write(this.fd, this._writingBuf, "utf8", this.release);
         };
       } else {
         throw new Error(`SonicBoom supports "${kContentModeUtf8}" and "${kContentModeBuffer}", but passed ${contentMode}`);
@@ -7731,7 +7761,7 @@ var require_sonic_boom = __commonJS({
           }
         }
         if (this._fsync) {
-          fs65.fsyncSync(this.fd);
+          fs66.fsyncSync(this.fd);
         }
         const len = this._len;
         if (this._reopening) {
@@ -7845,7 +7875,7 @@ var require_sonic_boom = __commonJS({
       const onDrain = () => {
         if (!this._fsync) {
           try {
-            fs65.fsync(this.fd, (err) => {
+            fs66.fsync(this.fd, (err) => {
               this._flushPending = false;
               cb(err);
             });
@@ -7947,7 +7977,7 @@ var require_sonic_boom = __commonJS({
       const fd = this.fd;
       this.once("ready", () => {
         if (fd !== this.fd) {
-          fs65.close(fd, (err) => {
+          fs66.close(fd, (err) => {
             if (err) {
               return this.emit("error", err);
             }
@@ -7996,7 +8026,7 @@ var require_sonic_boom = __commonJS({
           buf = this._bufs[0];
         }
         try {
-          const n = Buffer.isBuffer(buf) ? fs65.writeSync(this.fd, buf) : fs65.writeSync(this.fd, buf, "utf8");
+          const n = Buffer.isBuffer(buf) ? fs66.writeSync(this.fd, buf) : fs66.writeSync(this.fd, buf, "utf8");
           const releasedBufObj = releaseWritingBuf(buf, this._len, n);
           buf = releasedBufObj.writingBuf;
           this._len = releasedBufObj.len;
@@ -8012,7 +8042,7 @@ var require_sonic_boom = __commonJS({
         }
       }
       try {
-        fs65.fsyncSync(this.fd);
+        fs66.fsyncSync(this.fd);
       } catch {
       }
     }
@@ -8033,7 +8063,7 @@ var require_sonic_boom = __commonJS({
           buf = mergeBuf(this._bufs[0], this._lens[0]);
         }
         try {
-          const n = fs65.writeSync(this.fd, buf);
+          const n = fs66.writeSync(this.fd, buf);
           buf = buf.subarray(n);
           this._len = Math.max(this._len - n, 0);
           if (buf.length <= 0) {
@@ -8061,13 +8091,13 @@ var require_sonic_boom = __commonJS({
       this._writingBuf = this._writingBuf.length ? this._writingBuf : this._bufs.shift() || "";
       if (this.sync) {
         try {
-          const written = Buffer.isBuffer(this._writingBuf) ? fs65.writeSync(this.fd, this._writingBuf) : fs65.writeSync(this.fd, this._writingBuf, "utf8");
+          const written = Buffer.isBuffer(this._writingBuf) ? fs66.writeSync(this.fd, this._writingBuf) : fs66.writeSync(this.fd, this._writingBuf, "utf8");
           release(null, written);
         } catch (err) {
           release(err);
         }
       } else {
-        fs65.write(this.fd, this._writingBuf, release);
+        fs66.write(this.fd, this._writingBuf, release);
       }
     }
     function actualWriteBuffer() {
@@ -8076,7 +8106,7 @@ var require_sonic_boom = __commonJS({
       this._writingBuf = this._writingBuf.length ? this._writingBuf : mergeBuf(this._bufs.shift(), this._lens.shift());
       if (this.sync) {
         try {
-          const written = fs65.writeSync(this.fd, this._writingBuf);
+          const written = fs66.writeSync(this.fd, this._writingBuf);
           release(null, written);
         } catch (err) {
           release(err);
@@ -8085,7 +8115,7 @@ var require_sonic_boom = __commonJS({
         if (kCopyBuffer) {
           this._writingBuf = Buffer.from(this._writingBuf);
         }
-        fs65.write(this.fd, this._writingBuf, release);
+        fs66.write(this.fd, this._writingBuf, release);
       }
     }
     function actualClose(sonic) {
@@ -8101,12 +8131,12 @@ var require_sonic_boom = __commonJS({
       sonic._lens = [];
       assert(typeof sonic.fd === "number", `sonic.fd must be a number, got ${typeof sonic.fd}`);
       try {
-        fs65.fsync(sonic.fd, closeWrapped);
+        fs66.fsync(sonic.fd, closeWrapped);
       } catch {
       }
       function closeWrapped() {
         if (sonic.fd !== 1 && sonic.fd !== 2) {
-          fs65.close(sonic.fd, done);
+          fs66.close(sonic.fd, done);
         } else {
           done();
         }
@@ -11241,11 +11271,11 @@ var init_lib = __esm({
           }
         }
       },
-      addToPath: function addToPath(path74, added, removed, oldPosInc, options) {
-        var last = path74.lastComponent;
+      addToPath: function addToPath(path75, added, removed, oldPosInc, options) {
+        var last = path75.lastComponent;
         if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
           return {
-            oldPos: path74.oldPos + oldPosInc,
+            oldPos: path75.oldPos + oldPosInc,
             lastComponent: {
               count: last.count + 1,
               added,
@@ -11255,7 +11285,7 @@ var init_lib = __esm({
           };
         } else {
           return {
-            oldPos: path74.oldPos + oldPosInc,
+            oldPos: path75.oldPos + oldPosInc,
             lastComponent: {
               count: 1,
               added,
@@ -11764,10 +11794,10 @@ function attachmentToHistoryMessage(o, ts) {
     const memories = raw.map((m2) => {
       if (!m2 || typeof m2 !== "object") return null;
       const rec3 = m2;
-      const path74 = typeof rec3.path === "string" ? rec3.path : null;
+      const path75 = typeof rec3.path === "string" ? rec3.path : null;
       const content = typeof rec3.content === "string" ? rec3.content : null;
-      if (!path74 || content == null) return null;
-      const entry = { path: path74, content };
+      if (!path75 || content == null) return null;
+      const entry = { path: path75, content };
       if (typeof rec3.mtimeMs === "number") entry.mtimeMs = rec3.mtimeMs;
       return entry;
     }).filter((m2) => m2 !== null);
@@ -12570,10 +12600,10 @@ function parseAttachment(obj) {
     const memories = raw.map((m2) => {
       if (!m2 || typeof m2 !== "object") return null;
       const rec3 = m2;
-      const path74 = typeof rec3.path === "string" ? rec3.path : null;
+      const path75 = typeof rec3.path === "string" ? rec3.path : null;
       const content = typeof rec3.content === "string" ? rec3.content : null;
-      if (!path74 || content == null) return null;
-      const out = { path: path74, content };
+      if (!path75 || content == null) return null;
+      const out = { path: path75, content };
       if (typeof rec3.mtimeMs === "number") out.mtimeMs = rec3.mtimeMs;
       return out;
     }).filter((m2) => m2 !== null);
@@ -33542,8 +33572,8 @@ var require_utils = __commonJS({
       var result = transform[inputType][outputType](input);
       return result;
     };
-    exports2.resolve = function(path74) {
-      var parts = path74.split("/");
+    exports2.resolve = function(path75) {
+      var parts = path75.split("/");
       var result = [];
       for (var index = 0; index < parts.length; index++) {
         var part = parts[index];
@@ -39396,18 +39426,18 @@ var require_object = __commonJS({
       var object = new ZipObject(name, zipObjectContent, o);
       this.files[name] = object;
     };
-    var parentFolder = function(path74) {
-      if (path74.slice(-1) === "/") {
-        path74 = path74.substring(0, path74.length - 1);
+    var parentFolder = function(path75) {
+      if (path75.slice(-1) === "/") {
+        path75 = path75.substring(0, path75.length - 1);
       }
-      var lastSlash = path74.lastIndexOf("/");
-      return lastSlash > 0 ? path74.substring(0, lastSlash) : "";
+      var lastSlash = path75.lastIndexOf("/");
+      return lastSlash > 0 ? path75.substring(0, lastSlash) : "";
     };
-    var forceTrailingSlash = function(path74) {
-      if (path74.slice(-1) !== "/") {
-        path74 += "/";
+    var forceTrailingSlash = function(path75) {
+      if (path75.slice(-1) !== "/") {
+        path75 += "/";
       }
-      return path74;
+      return path75;
     };
     var folderAdd = function(name, createFolders) {
       createFolders = typeof createFolders !== "undefined" ? createFolders : defaults.createFolders;
@@ -40409,7 +40439,7 @@ var require_lib3 = __commonJS({
 // src/run-case/recorder.ts
 function startRunCaseRecorder(opts) {
   const now = opts.now ?? Date.now;
-  const dir = import_node_path62.default.dirname(opts.recordPath);
+  const dir = import_node_path63.default.dirname(opts.recordPath);
   let stream = null;
   let closing = false;
   let closedSettled = false;
@@ -40423,8 +40453,8 @@ function startRunCaseRecorder(opts) {
   });
   const ensureStream = () => {
     if (stream) return stream;
-    import_node_fs47.default.mkdirSync(dir, { recursive: true });
-    stream = import_node_fs47.default.createWriteStream(opts.recordPath, { flags: "a" });
+    import_node_fs48.default.mkdirSync(dir, { recursive: true });
+    stream = import_node_fs48.default.createWriteStream(opts.recordPath, { flags: "a" });
     stream.on("close", () => closedResolve());
     return stream;
   };
@@ -40449,12 +40479,12 @@ function startRunCaseRecorder(opts) {
   };
   return { tap, close, closed };
 }
-var import_node_fs47, import_node_path62;
+var import_node_fs48, import_node_path63;
 var init_recorder = __esm({
   "src/run-case/recorder.ts"() {
     "use strict";
-    import_node_fs47 = __toESM(require("fs"), 1);
-    import_node_path62 = __toESM(require("path"), 1);
+    import_node_fs48 = __toESM(require("fs"), 1);
+    import_node_path63 = __toESM(require("path"), 1);
   }
 });
 
@@ -40497,7 +40527,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_fs48.mkdtempSync)(import_node_path63.default.join(import_node_os23.default.tmpdir(), "clawd-runcase-"));
+  const cwd = opts.cwd ?? (0, import_node_fs49.mkdtempSync)(import_node_path64.default.join(import_node_os23.default.tmpdir(), "clawd-runcase-"));
   const ownsCwd = opts.cwd === void 0;
   const recorder = startRunCaseRecorder({ recordPath: opts.record, now });
   const spawnCtx = { cwd };
@@ -40658,19 +40688,19 @@ async function runController(opts) {
   if (sigintHandler) process.off("SIGINT", sigintHandler);
   if (ownsCwd) {
     try {
-      (0, import_node_fs48.rmSync)(cwd, { recursive: true, force: true });
+      (0, import_node_fs49.rmSync)(cwd, { recursive: true, force: true });
     } catch {
     }
   }
   return exitCode ?? 0;
 }
-var import_node_fs48, import_node_os23, import_node_path63;
+var import_node_fs49, import_node_os23, import_node_path64;
 var init_controller = __esm({
   "src/run-case/controller.ts"() {
     "use strict";
-    import_node_fs48 = require("fs");
+    import_node_fs49 = require("fs");
     import_node_os23 = __toESM(require("os"), 1);
-    import_node_path63 = __toESM(require("path"), 1);
+    import_node_path64 = __toESM(require("path"), 1);
     init_claude();
     init_stdout_splitter();
     init_permission_stdio();
@@ -40945,8 +40975,8 @@ Env (advanced):
 `;
 
 // src/index.ts
-var import_node_path61 = __toESM(require("path"), 1);
-var import_node_fs46 = __toESM(require("fs"), 1);
+var import_node_path62 = __toESM(require("path"), 1);
+var import_node_fs47 = __toESM(require("fs"), 1);
 var import_node_os22 = __toESM(require("os"), 1);
 
 // ../node_modules/.pnpm/uuid@10.0.0/node_modules/uuid/dist/esm-node/stringify.js
@@ -41933,24 +41963,16 @@ function buildConnectionPrompt(args) {
 // src/persona/sharing-prompt.ts
 var ATTACHMENT_SHARING_HINT = `## \u628A\u4EA7\u51FA\u6587\u4EF6\u5206\u4EAB\u7ED9\u5BF9\u65B9\uFF08attachment\uFF09
 
-\u5F53\u4F60\u4EA7\u51FA\u4E86\u6587\u4EF6\u3001\u9700\u8981\u8BA9\u5BF9\u65B9\u62FF\u5230\u65F6\uFF08\u5C24\u5176 Bash \u89E3\u538B/\u751F\u6210\u7684\u6587\u4EF6\uFF0C\u6216\u8DE8\u8BBE\u5907\u88AB\u59D4\u6D3E\u65F6\u5BF9\u65B9\u5728\u53E6\u4E00\u53F0\u673A\u5668\u3001\u770B\u4E0D\u5230\u4F60\u7684\u672C\u5730\u8DEF\u5F84\uFF09\uFF0C\u7528 daemon \u7684 HTTP RPC \u628A\u6587\u4EF6\u8F6C\u6210\u4E00\u4E2A\u5E26\u7B7E\u540D\u7684\u4E0B\u8F7D URL\uFF1A
+\u5F53\u4F60\u4EA7\u51FA\u4E86\u6587\u4EF6\u3001\u9700\u8981\u8BA9\u5BF9\u65B9\u62FF\u5230\u65F6\uFF08\u5C24\u5176 Bash \u89E3\u538B/\u751F\u6210\u7684\u6587\u4EF6\uFF0C\u6216\u8DE8\u8BBE\u5907\u88AB\u59D4\u6D3E\u65F6\u5BF9\u65B9\u5728\u53E6\u4E00\u53F0\u673A\u5668\u3001\u770B\u4E0D\u5230\u4F60\u7684\u672C\u5730\u8DEF\u5F84\uFF09\uFF0C\u7528 \`clawd-rpc\` MCP \u7684 \`call\` tool \u628A\u6587\u4EF6\u8F6C\u6210\u4E00\u4E2A\u5E26\u7B7E\u540D\u7684\u4E0B\u8F7D URL\uFF1A
 
 1. \u5165\u7FA4\uFF08\u767B\u8BB0\u5230\u672C session \u7684\u5171\u4EAB\u6E05\u5355\uFF09\uFF1A
-   \`\`\`bash
-   curl -sS -X POST "$CLAWD_DAEMON_URL/api/rpc/attachment.groupAdd" \\
-     -H "X-Clawd-Session-Id: $CLAWD_SESSION_ID" -H 'Content-Type: application/json' \\
-     -d '{"relPath":"<\u6587\u4EF6\u7684\u7EDD\u5BF9\u8DEF\u5F84>"}'
-   \`\`\`
+   call({ method: "attachment.groupAdd", args: { relPath: "<\u6587\u4EF6\u7684\u7EDD\u5BF9\u8DEF\u5F84>", origin: "agent" } })
 2. \u7B7E\u540D\u62FF URL\uFF1A
-   \`\`\`bash
-   curl -sS -X POST "$CLAWD_DAEMON_URL/api/rpc/attachment.signUrl" \\
-     -H "X-Clawd-Session-Id: $CLAWD_SESSION_ID" -H 'Content-Type: application/json' \\
-     -d '{"relPath":"<\u540C\u4E00\u4E2A\u7EDD\u5BF9\u8DEF\u5F84>"}'
-   \`\`\`
+   call({ method: "attachment.signUrl", args: { relPath: "<\u540C\u4E00\u4E2A\u7EDD\u5BF9\u8DEF\u5F84>" } })
    \u8FD4\u56DE\u7684 \`url\` \u5C31\u662F\u5BF9\u65B9\u53EF\u76F4\u63A5\u6253\u5F00/\u4E0B\u8F7D\u7684\u94FE\u63A5\u3002
 
 - \`relPath\` \u5FC5\u987B\u4F20**\u7EDD\u5BF9\u8DEF\u5F84**\uFF08\u4F60\u4EA7\u51FA\u6587\u4EF6\u7684\u771F\u5B9E\u8DEF\u5F84\uFF09\uFF0C\u4E0D\u8981\u4F20\u76F8\u5BF9\u8DEF\u5F84\u3002
-- \u53EA\u80FD\u5206\u4EAB\u4F60\u81EA\u5DF1\u5DE5\u4F5C\u76EE\u5F55\u5185\u7684\u6587\u4EF6\uFF0C\u8D8A\u754C\u4F1A\u88AB\u62D2\u3002
+- \u8DE8\u8BBE\u5907\u88AB\u59D4\u6D3E\uFF08guest\uFF09\u7684\u4F1A\u8BDD\u53EA\u80FD\u5206\u4EAB\u81EA\u5DF1\u5DE5\u4F5C\u76EE\u5F55\u5185\u7684\u6587\u4EF6\uFF0C\u8D8A\u754C\u4F1A\u88AB\u62D2\u3002
 - \u88AB dispatch \u63A5\u5230\u4EFB\u52A1\u3001\u8981\u56DE\u4F20\u4EA7\u7269\u65F6\uFF1A\u628A\u7B7E\u540D URL \u5199\u8FDB \`personaDispatchComplete\` tool\uFF08\`clawd-dispatch\` MCP\uFF09\u7684 \`text\` \u91CC\uFF08\`filePaths\` \u53EA\u662F\u4F60\u672C\u673A\u7684\u7EDD\u5BF9\u8DEF\u5F84\uFF0C\u8DE8\u8BBE\u5907\u5BF9\u65B9\u6253\u4E0D\u5F00\uFF0CURL \u624D\u80FD\u6253\u5F00\uFF09\u3002`;
 
 // src/persona/no-ask-user-question-prompt.ts
@@ -42950,7 +42972,7 @@ var SessionRunner = class {
       ownerFeishuUnionId: this.hooks.ownerFeishuUnionId,
       personaRoot: this.hooks.personaRoot,
       // 单栏 refactor (spec 2026-06-02 §5.1): cc 子进程 env 注入 CLAWD_DAEMON_URL，让 assistant
-      // curl daemon HTTP RPC adapter (/api/rpc/<method>) 触发管理操作。null = HTTP adapter 未启。
+      // MCP server 拼 /rpc/<method>（Bearer）调 daemon。null = HTTP RPC 未启。
       getDaemonUrl: this.hooks.getDaemonUrl,
       // clawd 管家 (spec 2026-07-22-clawd-butler-persona §3.1): cc 子进程 env 注入 CLAWOS_API，
       // 让 clawd 管家 skill fetch `${CLAWOS_API}/docs/**` 线上文档。
@@ -46506,8 +46528,9 @@ var import_node_crypto4 = __toESM(require("crypto"), 1);
 init_runtime();
 
 // src/visitor/visitor-token.ts
+var DOMAIN_PREFIX = "clawd-visitor-v1|";
 function hmac(secret, body) {
-  return import_node_crypto4.default.createHmac("sha256", secret).update(body).digest("base64url");
+  return import_node_crypto4.default.createHmac("sha256", secret).update(`${DOMAIN_PREFIX}${body}`).digest("base64url");
 }
 function signVisitorToken(secret, payload) {
   const body = Buffer.from(JSON.stringify(payload)).toString("base64url");
@@ -46880,8 +46903,8 @@ function turnStartInput(text) {
   const items = [];
   let leftover = text;
   for (const m2 of text.matchAll(SKILL_RE)) {
-    const [marker, name, path74] = m2;
-    items.push({ type: "skill", name, path: path74 });
+    const [marker, name, path75] = m2;
+    items.push({ type: "skill", name, path: path75 });
     leftover = leftover.replace(marker, "");
   }
   for (const m2 of text.matchAll(ATTACHMENT_RE2)) {
@@ -48470,13 +48493,6 @@ function jsonlExistsForCtx(ctx) {
 init_claude_history();
 
 // src/dispatch/manager.ts
-function defer() {
-  let resolve6;
-  const promise = new Promise((r) => {
-    resolve6 = r;
-  });
-  return { promise, resolve: resolve6 };
-}
 var PersonaDispatchManager = class {
   constructor(deps) {
     this.deps = deps;
@@ -48488,8 +48504,7 @@ var PersonaDispatchManager = class {
     this.map.set(dispatchId, {
       dispatchId,
       sourceSessionId: args.sourceSessionId,
-      targetPersona: args.targetPersona,
-      waiters: []
+      targetPersona: args.targetPersona
     });
     this.deps.store.add({
       dispatchId,
@@ -48511,45 +48526,21 @@ var PersonaDispatchManager = class {
       outcome,
       completedAt: new Date(this.deps.now()).toISOString()
     });
-    if (state) {
-      const waiters = state.waiters;
-      state.waiters = [];
-      for (const w2 of waiters) w2.resolve(outcome);
-      this.map.delete(dispatchId);
-    }
+    if (state) this.map.delete(dispatchId);
     const sourceSessionId = updated?.sourceSessionId ?? state?.sourceSessionId;
     if (sourceSessionId) this.deps.onCompleted?.(sourceSessionId);
   }
-  /**
-   * mesh B 角色 hold 专用（跨设备 dispatch 的 peer 侧）：guest B-role handler 用它
-   * 挂住 /rpc HTTP 响应直到 complete，把 outcome 回传给 A 侧 daemon 的 forwardToPeer
-   * （A 侧后台 await，A 的 tool call 不受影响照样秒回）。
-   * 本地 dispatch 链路**不用**这个——本地 outcome 只走台账 + deliverPending。
-   */
-  async waitForOutcome(dispatchId) {
-    const state = this.map.get(dispatchId);
-    if (!state) {
-      const rec3 = this.deps.store.get(dispatchId);
-      if (rec3?.outcome) return rec3.outcome;
-      throw new Error(`unknown dispatchId: ${dispatchId}`);
-    }
-    const d = defer();
-    state.waiters.push(d);
-    return d.promise;
-  }
   /**
    * 续派（spec 2026-07-21）：complete 已清掉 map 条目，续派前重建——bSessionId 映射
    * 保证 worker 进程死后 respawn 时 reducer lookupDispatchByBSessionId 仍注回同一
    * CLAWD_DISPATCH_ID env。台账行的复位由 handler 直接走 store（本方法只管内存态）。
    */
   reopen(dispatchId, args) {
-    const existing = this.map.get(dispatchId);
     this.map.set(dispatchId, {
       dispatchId,
       sourceSessionId: args.sourceSessionId,
       targetPersona: args.targetPersona,
-      bSessionId: args.workerSessionId,
-      waiters: existing?.waiters ?? []
+      bSessionId: args.workerSessionId
     });
   }
   /** SessionManager 在 createDispatchedSession 时调，建立 dispatchId → B sessionId 映射 */
@@ -48678,13 +48669,17 @@ function dispatchMcpConfigPath(dataDir) {
 function writeDispatchMcpConfig(args) {
   const cfgPath = dispatchMcpConfigPath(args.dataDir);
   const content = {
-    _comment: "daemon \u542F\u52A8\u65F6\u81EA\u52A8\u751F\u6210\uFF1Bcc spawn \u901A\u8FC7 --mcp-config \u6CE8\u5165\u3002dispatch-mcp-server.cjs \u662F daemon \u81EA\u5E26\u7684 stdio MCP server\u3002env.CLAWD_DISPATCH_LOG \u6307 server \u5199\u65E5\u5FD7\u7684 append \u6587\u4EF6\u8DEF\u5F84\uFF08dispatch \u6D41\u7A0B\u8282\u70B9 + fetch \u9519\u8BEF\u7EC6\u8282\uFF09\u3002",
+    _comment: "daemon \u542F\u52A8\u65F6\u81EA\u52A8\u751F\u6210\uFF1Bcc spawn \u901A\u8FC7 --mcp-config \u6CE8\u5165\u3002dispatch-mcp-server.cjs \u662F daemon \u81EA\u5E26\u7684 stdio MCP server\uFF0C\u7ECF /rpc + Bearer\uFF08env CLAWD_DAEMON_TOKEN\uFF0C\u4EC5\u672C server \u8FDB\u7A0B\u53EF\u89C1\uFF09\u8C03 daemon\u3002env.CLAWD_DISPATCH_LOG \u6307 server \u5199\u65E5\u5FD7\u7684 append \u6587\u4EF6\u8DEF\u5F84\uFF08dispatch \u6D41\u7A0B\u8282\u70B9 + fetch \u9519\u8BEF\u7EC6\u8282\uFF09\u3002",
     mcpServers: {
       "clawd-dispatch": {
         type: "stdio",
         command: "node",
         args: [args.serverScriptPath],
-        ...args.logPath ? { env: { CLAWD_DISPATCH_LOG: args.logPath } } : {}
+        env: {
+          CLAWD_DAEMON_TOKEN: args.daemonToken,
+          CLAWD_DAEMON_URL: args.daemonUrl,
+          ...args.logPath ? { CLAWD_DISPATCH_LOG: args.logPath } : {}
+        }
       }
     }
   };
@@ -48702,7 +48697,7 @@ function ticketMcpConfigPath(dataDir) {
 function writeTicketMcpConfig(args) {
   const cfgPath = ticketMcpConfigPath(args.dataDir);
   const content = {
-    _comment: "daemon \u542F\u52A8\u65F6\u81EA\u52A8\u751F\u6210\uFF1Bcc spawn \u901A\u8FC7 --mcp-config \u6CE8\u5165\u3002ticket-mcp-server.cjs \u662F daemon \u81EA\u5E26\u7684 stdio MCP server\uFF0CHTTP client \u8C03 clawos api /api/tickets/*\u3002env \u542B api url\u3001\u5199\u6B7B API key\u3001scene\uFF1Bdid/name \u6BCF\u6B21 tool call \u8D70 CLAWD_DAEMON_URL + CLAWD_SESSION_ID (cc \u5DF2\u6CE8) fetch /api/rpc/session.currentTurnSender \u62FF\u5F53\u524D turn caller (2026-07-08 spec \xA74.7)\u3002CLAWD_TICKET_LOG \u6307 server \u5199\u65E5\u5FD7\u7684 append \u6587\u4EF6\u8DEF\u5F84\u3002cc \u573A\u666F scene \u56FA\u5B9A persona\u3002",
+    _comment: "daemon \u542F\u52A8\u65F6\u81EA\u52A8\u751F\u6210\uFF1Bcc spawn \u901A\u8FC7 --mcp-config \u6CE8\u5165\u3002ticket-mcp-server.cjs \u662F daemon \u81EA\u5E26\u7684 stdio MCP server\uFF0CHTTP client \u8C03 clawos api /api/tickets/*\u3002env \u542B api url\u3001\u5199\u6B7B API key\u3001scene\uFF1Bdid/name \u6BCF\u6B21 tool call \u8D70 /rpc/session:currentTurnSender (Bearer CLAWD_DAEMON_TOKEN) \u62FF\u5F53\u524D turn caller (2026-07-08 spec \xA74.7)\u3002CLAWD_TICKET_LOG \u6307 server \u5199\u65E5\u5FD7\u7684 append \u6587\u4EF6\u8DEF\u5F84\u3002cc \u573A\u666F scene \u56FA\u5B9A persona\u3002",
     mcpServers: {
       "clawd-ticket": {
         type: "stdio",
@@ -48712,6 +48707,8 @@ function writeTicketMcpConfig(args) {
           CLAWD_TICKET_API_URL: args.apiBaseUrl,
           CLAWD_TICKET_API_KEY: args.apiKey,
           CLAWD_TICKET_SCENE: "persona",
+          CLAWD_DAEMON_TOKEN: args.daemonToken,
+          CLAWD_DAEMON_URL: args.daemonUrl,
           ...args.logPath ? { CLAWD_TICKET_LOG: args.logPath } : {}
         }
       }
@@ -48737,7 +48734,11 @@ async function writeShiftMcpConfig(args) {
         type: "stdio",
         command: "node",
         args: [args.serverScriptPath],
-        ...args.logPath ? { env: { CLAWD_SHIFT_LOG: args.logPath } } : {}
+        env: {
+          CLAWD_DAEMON_TOKEN: args.daemonToken,
+          CLAWD_DAEMON_URL: args.daemonUrl,
+          ...args.logPath ? { CLAWD_SHIFT_LOG: args.logPath } : {}
+        }
       }
     }
   };
@@ -48761,7 +48762,11 @@ async function writeInboxMcpConfig(args) {
         type: "stdio",
         command: "node",
         args: [args.serverScriptPath],
-        ...args.logPath ? { env: { CLAWD_INBOX_LOG: args.logPath } } : {}
+        env: {
+          CLAWD_DAEMON_TOKEN: args.daemonToken,
+          CLAWD_DAEMON_URL: args.daemonUrl,
+          ...args.logPath ? { CLAWD_INBOX_LOG: args.logPath } : {}
+        }
       }
     }
   };
@@ -48779,11 +48784,15 @@ function peerOpsMcpConfigPath(dataDir) {
 function writePeerOpsMcpConfig(args) {
   const cfgPath = peerOpsMcpConfigPath(args.dataDir);
   const cfg = {
-    _comment: "daemon \u542F\u52A8\u81EA\u52A8\u751F\u6210\uFF1Bcc spawn \u901A\u8FC7 --mcp-config \u6CE8\u5165\u3002peer-ops-mcp-server.cjs \u662F daemon \u81EA\u5E26 stdio MCP server\uFF08\u8DE8\u8BBE\u5907 exec\uFF09\u3002",
+    _comment: "daemon \u542F\u52A8\u81EA\u52A8\u751F\u6210\uFF1Bcc spawn \u901A\u8FC7 --mcp-config \u6CE8\u5165\u3002peer-ops-mcp-server.cjs \u662F daemon \u81EA\u5E26 stdio MCP server\uFF08\u8DE8\u8BBE\u5907 exec\uFF09\uFF0C\u7ECF /rpc + Bearer\uFF08env CLAWD_DAEMON_TOKEN\uFF09\u8C03 daemon\u3002",
     mcpServers: {
       "peer-ops": {
         command: "node",
-        args: [args.serverScriptPath]
+        args: [args.serverScriptPath],
+        env: {
+          CLAWD_DAEMON_TOKEN: args.daemonToken,
+          CLAWD_DAEMON_URL: args.daemonUrl
+        }
       }
     }
   };
@@ -48792,9 +48801,37 @@ function writePeerOpsMcpConfig(args) {
   return cfgPath;
 }
 
+// src/rpc-tool/mcp-config.ts
+var import_node_fs25 = __toESM(require("fs"), 1);
+var import_node_path24 = __toESM(require("path"), 1);
+function rpcToolMcpConfigPath(dataDir) {
+  return import_node_path24.default.join(dataDir, "rpc-tool.mcp.json");
+}
+function writeRpcToolMcpConfig(args) {
+  const cfgPath = rpcToolMcpConfigPath(args.dataDir);
+  const content = {
+    _comment: "daemon \u542F\u52A8\u65F6\u81EA\u52A8\u751F\u6210\uFF1Bcc spawn \u901A\u8FC7 --mcp-config \u6CE8\u5165\u3002rpc-tool/mcp-server.cjs \u662F daemon \u81EA\u5E26\u7684 stdio MCP server\uFF0C\u66B4\u9732\u6CDB\u5316 call(method, args) tool\u2014\u2014agent \u8C03 daemon RPC \u7684\u552F\u4E00\u6536\u53E3\uFF08/rpc + Bearer\uFF0Ctoken \u4EC5\u672C server \u8FDB\u7A0B\u53EF\u89C1\uFF09\u3002",
+    mcpServers: {
+      "clawd-rpc": {
+        type: "stdio",
+        command: "node",
+        args: [args.serverScriptPath],
+        env: {
+          CLAWD_DAEMON_TOKEN: args.daemonToken,
+          CLAWD_DAEMON_URL: args.daemonUrl,
+          ...args.logPath ? { CLAWD_RPC_LOG: args.logPath } : {}
+        }
+      }
+    }
+  };
+  import_node_fs25.default.mkdirSync(args.dataDir, { recursive: true });
+  import_node_fs25.default.writeFileSync(cfgPath, JSON.stringify(content, null, 2), "utf8");
+  return cfgPath;
+}
+
 // src/shift/store.ts
 var import_promises2 = __toESM(require("fs/promises"), 1);
-var import_node_path24 = __toESM(require("path"), 1);
+var import_node_path25 = __toESM(require("path"), 1);
 var import_node_crypto6 = require("crypto");
 
 // src/shift/schedule.ts
@@ -48869,7 +48906,7 @@ function createShiftStore(deps) {
       flushTimer = null;
     }
     const content = { version: 1, shifts };
-    await import_promises2.default.mkdir(import_node_path24.default.dirname(deps.filePath), { recursive: true });
+    await import_promises2.default.mkdir(import_node_path25.default.dirname(deps.filePath), { recursive: true });
     const tmp = `${deps.filePath}.tmp-${deps.now()}-${Math.floor(Math.random() * 1e6)}`;
     await import_promises2.default.writeFile(tmp, JSON.stringify(content, null, 2), "utf8");
     await import_promises2.default.rename(tmp, deps.filePath);
@@ -49322,7 +49359,7 @@ function buildPersonaDispatchHandlers(deps) {
       }
       if (!sourceSessionId) {
         throw new Error(
-          "personaDispatch:run requires sessionId (caller must pass x-clawd-session-id header)"
+          "personaDispatch:run requires sessionId in the request body"
         );
       }
       const rec3 = deps.store.get(args.dispatchId);
@@ -49395,7 +49432,7 @@ function buildPersonaDispatchHandlers(deps) {
       }
       if (!sourceSessionId) {
         throw new Error(
-          "personaDispatch:run requires sessionId (caller must pass x-clawd-session-id header)"
+          "personaDispatch:run requires sessionId in the request body"
         );
       }
       const { dispatchId: dispatchId2 } = mgr.start({
@@ -49462,14 +49499,13 @@ function buildPersonaDispatchHandlers(deps) {
           reason: `failed to spawn B: ${reason}`
         });
       });
-      const outcome = await mgr.waitForOutcome(dispatchId2);
       return {
-        response: { type: "personaDispatch:run:ok", outcome }
+        response: { type: "personaDispatch:run:ok", dispatchId: dispatchId2 }
       };
     }
     if (!sourceSessionId) {
       throw new Error(
-        "personaDispatch:run requires sessionId (caller must pass x-clawd-session-id header)"
+        "personaDispatch:run requires sessionId in the request body"
       );
     }
     const { dispatchId } = mgr.start({
@@ -49517,6 +49553,22 @@ function buildPersonaDispatchHandlers(deps) {
       response: { type: "personaDispatch:complete:ok" }
     };
   };
+  const get = async (frame, _client, ctx) => {
+    const { type: _t, requestId: _r, ...rest } = frame;
+    const args = DispatchGetArgsSchema.parse(rest);
+    const rec3 = deps.store.get(args.dispatchId);
+    const denied = ctx?.principal.kind === "guest" && rec3?.sourceSessionId !== ctx.principal.id;
+    if (!rec3 || denied) {
+      throw new ClawdError(ERROR_CODES.DISPATCH_NOT_FOUND, `unknown dispatchId: ${args.dispatchId}`);
+    }
+    return {
+      response: {
+        type: "personaDispatch:get:ok",
+        status: rec3.status,
+        ...rec3.outcome ? { outcome: rec3.outcome } : {}
+      }
+    };
+  };
   const list = async (frame) => {
     const { type: _t, requestId: _r, ...rest } = frame;
     const args = DispatchListArgsSchema.parse(rest);
@@ -49530,7 +49582,8 @@ function buildPersonaDispatchHandlers(deps) {
   return {
     "personaDispatch:run": run,
     "personaDispatch:complete": complete,
-    "personaDispatch:list": list
+    "personaDispatch:list": list,
+    "personaDispatch:get": get
   };
 }
 
@@ -49541,8 +49594,13 @@ function wsUrlToHttp(url) {
   if (url.startsWith("ws://")) return "http://" + url.slice("ws://".length);
   return url;
 }
+var DISPATCH_POLL_INTERVAL_MS = 5e3;
+var DISPATCH_POLL_UNREACHABLE_MS = 6e5;
+var DISPATCH_POLL_TOTAL_MS = 864e5;
+var defaultSleep = (ms) => new Promise((r) => setTimeout(r, ms));
 async function forwardDispatchToPeer(args) {
   const f = args.fetchImpl ?? fetch;
+  const sleep2 = args.sleepImpl ?? defaultSleep;
   const base = wsUrlToHttp(args.contact.remoteUrl).replace(/\/+$/, "");
   const url = `${base}/rpc/personaDispatch:run`;
   let res;
@@ -49577,7 +49635,58 @@ async function forwardDispatchToPeer(args) {
   if (json.ok === false) {
     return { kind: "failure", reason: `peer rejected: ${json.error}: ${json.message}` };
   }
-  return json.result.outcome;
+  if ("outcome" in json.result) return json.result.outcome;
+  const dispatchId = json.result.dispatchId;
+  let elapsed = 0;
+  let unreachableFor = 0;
+  while (elapsed < DISPATCH_POLL_TOTAL_MS) {
+    await sleep2(DISPATCH_POLL_INTERVAL_MS);
+    elapsed += DISPATCH_POLL_INTERVAL_MS;
+    const markUnreachable = () => {
+      unreachableFor += DISPATCH_POLL_INTERVAL_MS;
+      return unreachableFor >= DISPATCH_POLL_UNREACHABLE_MS ? {
+        kind: "failure",
+        reason: "peer unreachable while polling dispatch outcome (TARGET_UNREACHABLE)"
+      } : null;
+    };
+    let getRes;
+    try {
+      getRes = await f(`${base}/rpc/personaDispatch:get`, {
+        method: "POST",
+        headers: {
+          "content-type": "application/json",
+          authorization: `Bearer ${args.contact.connectToken}`
+        },
+        body: JSON.stringify({ dispatchId })
+      });
+    } catch {
+      const dead = markUnreachable();
+      if (dead) return dead;
+      continue;
+    }
+    let getJson;
+    try {
+      getJson = await getRes.json();
+    } catch {
+      const dead = markUnreachable();
+      if (dead) return dead;
+      continue;
+    }
+    if (getJson.ok === false) {
+      if (getJson.error === ERROR_CODES.DISPATCH_NOT_FOUND) {
+        return { kind: "failure", reason: `peer lost dispatch ${dispatchId} (daemon restarted?)` };
+      }
+      const dead = markUnreachable();
+      if (dead) return dead;
+      continue;
+    }
+    unreachableFor = 0;
+    const { status, outcome } = getJson.result;
+    if (status === "completed" || status === "failed") {
+      return outcome ?? { kind: "failure", reason: "peer returned terminal status without outcome" };
+    }
+  }
+  return { kind: "failure", reason: "dispatch polling exceeded 24h (TIMEOUT)" };
 }
 async function forwardInboxPostToPeer(args) {
   const f = args.fetchImpl ?? fetch;
@@ -49821,7 +49930,7 @@ var CodexHistoryReader = class {
 
 // src/tools/codex-skills.ts
 var import_node_child_process7 = require("child_process");
-var import_node_path25 = __toESM(require("path"), 1);
+var import_node_path26 = __toESM(require("path"), 1);
 var DEFAULT_TIMEOUT_MS3 = 8e3;
 function str3(v2) {
   return typeof v2 === "string" ? v2 : void 0;
@@ -49837,13 +49946,13 @@ function mapSkillsListResponse(res) {
       const r = s ?? {};
       const name = str3(r.name);
       if (!name) continue;
-      const path74 = str3(r.path);
+      const path75 = str3(r.path);
       const description = str3(r.description);
       const isPlugin = name.includes(":");
       out.push({
         name,
         source: isPlugin ? "plugin" : "project",
-        ...path74 ? { path: path74 } : {},
+        ...path75 ? { path: path75 } : {},
         ...description ? { description } : {},
         ...isPlugin ? { plugin: name.split(":")[0] } : {}
       });
@@ -49873,7 +49982,7 @@ async function listCodexSkills(cwd, deps = {}) {
       })(),
       timeout
     ]);
-    void client.request("skills/extraRoots/set", { extraRoots: [import_node_path25.default.join(cwd, ".claude", "skills")] }).catch(() => void 0);
+    void client.request("skills/extraRoots/set", { extraRoots: [import_node_path26.default.join(cwd, ".claude", "skills")] }).catch(() => void 0);
     const res = await Promise.race([client.request("skills/list", { cwds: [cwd] }), timeout]);
     return mapSkillsListResponse(res);
   } finally {
@@ -49883,23 +49992,23 @@ async function listCodexSkills(cwd, deps = {}) {
 }
 
 // src/workspace/browser.ts
-var import_node_fs25 = __toESM(require("fs"), 1);
+var import_node_fs26 = __toESM(require("fs"), 1);
 var import_node_os8 = __toESM(require("os"), 1);
-var import_node_path26 = __toESM(require("path"), 1);
+var import_node_path27 = __toESM(require("path"), 1);
 init_protocol();
 var MAX_FILE_BYTES = 2 * 1024 * 1024;
 function resolveInsideCwd(cwd, subpath) {
-  const absCwd = import_node_path26.default.resolve(cwd);
-  const joined = import_node_path26.default.resolve(absCwd, subpath ?? ".");
-  const rel = import_node_path26.default.relative(absCwd, joined);
-  if (rel.startsWith("..") || import_node_path26.default.isAbsolute(rel)) {
+  const absCwd = import_node_path27.default.resolve(cwd);
+  const joined = import_node_path27.default.resolve(absCwd, subpath ?? ".");
+  const rel = import_node_path27.default.relative(absCwd, joined);
+  if (rel.startsWith("..") || import_node_path27.default.isAbsolute(rel)) {
     throw new ClawdError(ERROR_CODES.INVALID_PATH, `path escapes cwd: ${subpath}`);
   }
   return joined;
 }
 function ensureCwd(cwd) {
   try {
-    const stat = import_node_fs25.default.statSync(cwd);
+    const stat = import_node_fs26.default.statSync(cwd);
     if (!stat.isDirectory()) {
       throw new ClawdError(ERROR_CODES.INVALID_CWD, `not a directory: ${cwd}`);
     }
@@ -49913,7 +50022,7 @@ var WorkspaceBrowser = class {
     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_fs25.default.readdirSync(full, { withFileTypes: true });
+    const dirents = import_node_fs26.default.readdirSync(full, { withFileTypes: true });
     const entries = [];
     for (const d of dirents) {
       if (!args.showHidden && d.name.startsWith(".")) continue;
@@ -49923,7 +50032,7 @@ var WorkspaceBrowser = class {
         mtime: ""
       };
       try {
-        const st = import_node_fs25.default.statSync(import_node_path26.default.join(full, d.name));
+        const st = import_node_fs26.default.statSync(import_node_path27.default.join(full, d.name));
         entry.mtime = new Date(st.mtimeMs).toISOString();
         if (d.isFile()) entry.size = st.size;
       } catch {
@@ -49939,14 +50048,14 @@ var WorkspaceBrowser = class {
   read(args) {
     ensureCwd(args.cwd);
     const full = resolveInsideCwd(args.cwd, args.path);
-    const st = import_node_fs25.default.statSync(full);
+    const st = import_node_fs26.default.statSync(full);
     if (!st.isFile()) {
       throw new ClawdError(ERROR_CODES.INVALID_PATH, `not a file: ${args.path}`);
     }
     if (st.size > MAX_FILE_BYTES) {
       throw new ClawdError(ERROR_CODES.FILE_TOO_LARGE, `file > ${MAX_FILE_BYTES} bytes`);
     }
-    const buf = import_node_fs25.default.readFileSync(full);
+    const buf = import_node_fs26.default.readFileSync(full);
     const isBinary = buf.includes(0);
     if (isBinary) {
       return {
@@ -49968,20 +50077,20 @@ var WorkspaceBrowser = class {
 };
 
 // src/skills/agents-scanner.ts
-var import_node_fs26 = __toESM(require("fs"), 1);
+var import_node_fs27 = __toESM(require("fs"), 1);
 var import_node_os9 = __toESM(require("os"), 1);
-var import_node_path27 = __toESM(require("path"), 1);
+var import_node_path28 = __toESM(require("path"), 1);
 var DEFAULT_POLICY_DIR_DARWIN = "/Library/Application Support/ClaudeCode/.claude/agents";
 function isDirLikeSync2(p2) {
   try {
-    return import_node_fs26.default.statSync(p2).isDirectory();
+    return import_node_fs27.default.statSync(p2).isDirectory();
   } catch {
     return false;
   }
 }
 function fileExistsSync(p2) {
   try {
-    return import_node_fs26.default.statSync(p2).isFile();
+    return import_node_fs27.default.statSync(p2).isFile();
   } catch {
     return false;
   }
@@ -49989,7 +50098,7 @@ function fileExistsSync(p2) {
 function parseAgentFile(filePath) {
   let content;
   try {
-    content = import_node_fs26.default.readFileSync(filePath, "utf8");
+    content = import_node_fs27.default.readFileSync(filePath, "utf8");
   } catch {
     return {};
   }
@@ -50002,16 +50111,16 @@ function parseAgentFile(filePath) {
 function scanAgentsDir(dir, source, seen, out) {
   let entries;
   try {
-    entries = import_node_fs26.default.readdirSync(dir, { withFileTypes: true });
+    entries = import_node_fs27.default.readdirSync(dir, { withFileTypes: true });
   } catch {
     return;
   }
   for (const ent of entries) {
     if (!ent.name.endsWith(".md")) continue;
-    if (!ent.isFile() && !(ent.isSymbolicLink() && fileExistsSync(import_node_path27.default.join(dir, ent.name)))) {
+    if (!ent.isFile() && !(ent.isSymbolicLink() && fileExistsSync(import_node_path28.default.join(dir, ent.name)))) {
       continue;
     }
-    const filePath = import_node_path27.default.join(dir, ent.name);
+    const filePath = import_node_path28.default.join(dir, ent.name);
     const baseName = ent.name.replace(/\.md$/, "");
     if (seen.has(baseName)) continue;
     seen.add(baseName);
@@ -50029,12 +50138,12 @@ function scanPluginAgentsTree(root, pluginName, seen, out) {
   function walk2(dir, namespaces) {
     let entries;
     try {
-      entries = import_node_fs26.default.readdirSync(dir, { withFileTypes: true });
+      entries = import_node_fs27.default.readdirSync(dir, { withFileTypes: true });
     } catch {
       return;
     }
     for (const ent of entries) {
-      const childPath = import_node_path27.default.join(dir, ent.name);
+      const childPath = import_node_path28.default.join(dir, ent.name);
       if (ent.isDirectory() || ent.isSymbolicLink() && isDirLikeSync2(childPath)) {
         walk2(childPath, [...namespaces, ent.name]);
         continue;
@@ -50059,13 +50168,13 @@ function scanPluginAgentsTree(root, pluginName, seen, out) {
   walk2(root, []);
 }
 function readInstalledPlugins2(home) {
-  const pluginsDir = import_node_path27.default.join(home, ".claude", "plugins");
-  const v2 = import_node_path27.default.join(pluginsDir, "installed_plugins_v2.json");
-  const v1 = import_node_path27.default.join(pluginsDir, "installed_plugins.json");
+  const pluginsDir = import_node_path28.default.join(home, ".claude", "plugins");
+  const v2 = import_node_path28.default.join(pluginsDir, "installed_plugins_v2.json");
+  const v1 = import_node_path28.default.join(pluginsDir, "installed_plugins.json");
   let raw = null;
   for (const candidate of [v2, v1]) {
     try {
-      raw = import_node_fs26.default.readFileSync(candidate, "utf8");
+      raw = import_node_fs27.default.readFileSync(candidate, "utf8");
       break;
     } catch {
     }
@@ -50090,19 +50199,19 @@ function readInstalledPlugins2(home) {
   return out;
 }
 function walkUpProjectAgentsDirs(startCwd, home, seen, out) {
-  let cur = import_node_path27.default.resolve(startCwd);
-  const fsRoot = import_node_path27.default.parse(cur).root;
+  let cur = import_node_path28.default.resolve(startCwd);
+  const fsRoot = import_node_path28.default.parse(cur).root;
   while (true) {
-    scanAgentsDir(import_node_path27.default.join(cur, ".claude", "agents"), "project", seen, out);
+    scanAgentsDir(import_node_path28.default.join(cur, ".claude", "agents"), "project", seen, out);
     let hasGit = false;
     try {
-      hasGit = import_node_fs26.default.existsSync(import_node_path27.default.join(cur, ".git"));
+      hasGit = import_node_fs27.default.existsSync(import_node_path28.default.join(cur, ".git"));
     } catch {
     }
     if (hasGit) return;
     if (cur === home) return;
     if (cur === fsRoot) return;
-    const parent = import_node_path27.default.dirname(cur);
+    const parent = import_node_path28.default.dirname(cur);
     if (parent === cur) return;
     cur = parent;
   }
@@ -50137,7 +50246,7 @@ var AgentsScanner = class {
     }
     const fsBlock = [];
     scanAgentsDir(
-      import_node_path27.default.join(this.home, ".claude", "agents"),
+      import_node_path28.default.join(this.home, ".claude", "agents"),
       "global",
       seen,
       fsBlock
@@ -50151,7 +50260,7 @@ var AgentsScanner = class {
       ...this.extraPluginRoots
     ];
     for (const { name, root } of plugins) {
-      const agentsRoot = import_node_path27.default.join(root, "agents");
+      const agentsRoot = import_node_path28.default.join(root, "agents");
       scanPluginAgentsTree(agentsRoot, name, seen, fsBlock);
     }
     return [...builtinBlock, ...fsBlock];
@@ -50159,15 +50268,15 @@ var AgentsScanner = class {
 };
 
 // src/observer/session-observer.ts
-var import_node_fs28 = __toESM(require("fs"), 1);
+var import_node_fs29 = __toESM(require("fs"), 1);
 var import_node_os11 = __toESM(require("os"), 1);
-var import_node_path29 = __toESM(require("path"), 1);
+var import_node_path30 = __toESM(require("path"), 1);
 init_claude_history();
 
 // src/observer/subagent-meta-observer.ts
-var import_node_fs27 = __toESM(require("fs"), 1);
+var import_node_fs28 = __toESM(require("fs"), 1);
 var import_node_os10 = __toESM(require("os"), 1);
-var import_node_path28 = __toESM(require("path"), 1);
+var import_node_path29 = __toESM(require("path"), 1);
 init_claude_history();
 var META_RE = /^agent-([A-Za-z0-9_-]+)\.meta\.json$/;
 var SubagentMetaObserver = class {
@@ -50180,7 +50289,7 @@ var SubagentMetaObserver = class {
   watches = /* @__PURE__ */ new Map();
   // public for spec only：测试直接拼路径写假 meta.json；生产 start() 内部自己解析
   resolveSubagentDir(cwd, toolSessionId) {
-    return import_node_path28.default.join(
+    return import_node_path29.default.join(
       this.home,
       ".claude",
       "projects",
@@ -50210,7 +50319,7 @@ var SubagentMetaObserver = class {
   attachWatcher(w2) {
     if (w2.watcher) return;
     try {
-      w2.watcher = import_node_fs27.default.watch(w2.dirPath, { persistent: false }, (_evt, name) => {
+      w2.watcher = import_node_fs28.default.watch(w2.dirPath, { persistent: false }, (_evt, name) => {
         if (!name) return;
         const m2 = META_RE.exec(String(name));
         if (!m2) return;
@@ -50222,7 +50331,7 @@ var SubagentMetaObserver = class {
   scan(w2) {
     let entries;
     try {
-      entries = import_node_fs27.default.readdirSync(w2.dirPath);
+      entries = import_node_fs28.default.readdirSync(w2.dirPath);
     } catch {
       return;
     }
@@ -50236,10 +50345,10 @@ var SubagentMetaObserver = class {
     if (!m2) return;
     const agentId = m2[1];
     if (w2.emitted.has(agentId)) return;
-    const file = import_node_path28.default.join(w2.dirPath, name);
+    const file = import_node_path29.default.join(w2.dirPath, name);
     let raw;
     try {
-      raw = import_node_fs27.default.readFileSync(file, "utf8");
+      raw = import_node_fs28.default.readFileSync(file, "utf8");
     } catch {
       return;
     }
@@ -50296,14 +50405,14 @@ var SessionObserver = class {
   metaObserver;
   resolveJsonlPath(cwd, toolSessionId, override) {
     if (override) return override;
-    return import_node_path29.default.join(this.home, ".claude", "projects", cwdToHashDir(cwd), `${toolSessionId}.jsonl`);
+    return import_node_path30.default.join(this.home, ".claude", "projects", cwdToHashDir(cwd), `${toolSessionId}.jsonl`);
   }
   start(args) {
     this.stop(args.sessionId);
     const filePath = this.resolveJsonlPath(args.cwd, args.toolSessionId, args.jsonlPath);
     let size = 0;
     try {
-      size = import_node_fs28.default.statSync(filePath).size;
+      size = import_node_fs29.default.statSync(filePath).size;
     } catch {
     }
     const w2 = {
@@ -50316,16 +50425,16 @@ var SessionObserver = class {
       adapter: args.adapter,
       prevIsRejectSentinel: false,
       toolSessionId: args.toolSessionId,
-      sawFile: import_node_fs28.default.existsSync(filePath),
+      sawFile: import_node_fs29.default.existsSync(filePath),
       lastRelocateScanMs: 0,
       pendingCwdDerive: false,
       lastDeriveMs: 0
     };
     try {
-      import_node_fs28.default.mkdirSync(import_node_path29.default.dirname(filePath), { recursive: true });
+      import_node_fs29.default.mkdirSync(import_node_path30.default.dirname(filePath), { recursive: true });
     } catch {
     }
-    w2.watcher = import_node_fs28.default.watch(import_node_path29.default.dirname(filePath), { persistent: false }, (_event, changedName) => {
+    w2.watcher = import_node_fs29.default.watch(import_node_path30.default.dirname(filePath), { persistent: false }, (_event, changedName) => {
       if (!changedName || !w2.filePath.endsWith(changedName)) return;
       this.poll(w2);
     });
@@ -50348,7 +50457,7 @@ var SessionObserver = class {
   // 异常静默吞，不阻塞 watcher 启动
   hydrateMetaTail(w2, maxLines = 200) {
     try {
-      const raw = import_node_fs28.default.readFileSync(w2.filePath, "utf8");
+      const raw = import_node_fs29.default.readFileSync(w2.filePath, "utf8");
       if (!raw) return;
       const allLines = raw.split("\n").filter((l) => l.trim().length > 0);
       if (allLines.length === 0) return;
@@ -50372,7 +50481,7 @@ var SessionObserver = class {
   poll(w2) {
     let size = 0;
     try {
-      size = import_node_fs28.default.statSync(w2.filePath).size;
+      size = import_node_fs29.default.statSync(w2.filePath).size;
     } catch {
       if (w2.sawFile) this.maybeRelocate(w2);
       return;
@@ -50383,11 +50492,11 @@ var SessionObserver = class {
       w2.buf = "";
     }
     if (size === w2.lastSize) return;
-    const fd = import_node_fs28.default.openSync(w2.filePath, "r");
+    const fd = import_node_fs29.default.openSync(w2.filePath, "r");
     try {
       const len = size - w2.lastSize;
       const buf = Buffer.alloc(len);
-      import_node_fs28.default.readSync(fd, buf, 0, len, w2.lastSize);
+      import_node_fs29.default.readSync(fd, buf, 0, len, w2.lastSize);
       w2.lastSize = size;
       w2.buf += buf.toString("utf8");
       let newlineIndex;
@@ -50410,7 +50519,7 @@ var SessionObserver = class {
         }
       }
     } finally {
-      import_node_fs28.default.closeSync(fd);
+      import_node_fs29.default.closeSync(fd);
     }
     if (w2.pendingCwdDerive) this.maybeDeriveCwd(w2);
   }
@@ -50422,7 +50531,7 @@ var SessionObserver = class {
     const now = Date.now();
     if (now - w2.lastRelocateScanMs < 1e3) return;
     w2.lastRelocateScanMs = now;
-    const projectsRoot = import_node_path29.default.join(this.home, ".claude", "projects");
+    const projectsRoot = import_node_path30.default.join(this.home, ".claude", "projects");
     const found = findTranscriptByToolSessionId(projectsRoot, w2.toolSessionId);
     if (!found || found === w2.filePath) return;
     try {
@@ -50431,7 +50540,7 @@ var SessionObserver = class {
     }
     w2.filePath = found;
     try {
-      w2.watcher = import_node_fs28.default.watch(import_node_path29.default.dirname(found), { persistent: false }, (_event, changedName) => {
+      w2.watcher = import_node_fs29.default.watch(import_node_path30.default.dirname(found), { persistent: false }, (_event, changedName) => {
         if (!changedName || !w2.filePath.endsWith(changedName)) return;
         this.poll(w2);
       });
@@ -50998,79 +51107,6 @@ function removeSubscription(client, sessionId) {
   else client.subscribedSessions.set(sessionId, next);
 }
 
-// src/transport/rpc-adapter.ts
-var EXPOSED_RPC_METHODS = [
-  "appBuilder.createProject",
-  "appBuilder.listProjects",
-  "appBuilder.updateProjectPort",
-  "appBuilder.setProdUrl",
-  // 单栏 refactor §5.6.2 stage fix：scaffold + install 完成调 startDevServer 起 dev server；
-  // 中间用 reportStage 上报阶段（scaffolding / installing / failed），UI 据 stage 推帧切 PreviewPane。
-  "appBuilder.startDevServer",
-  "appBuilder.reportStage",
-  // 单栏 §5.6.5 fix: UI 切 session 时调（assistant 不需要主动调，但暴露白名单避免误猜成 forbidden）
-  "appBuilder.setActiveSession",
-  // dataclaw-builder：persona 建页时取建页人身份（含 union_id）写进生成 app 的配置。
-  // 路由到 handlers['auth:getIdentity']，只返 identity、绝不带 ttcToken（见 handlers/feishu-auth.ts）。
-  "auth.getIdentity",
-  // Persona dispatch（异步，spec 2026-07-20）：A 端 dispatch MCP server 调 run（秒回 dispatchId）；
-  // B 端调 complete（带 outcome → 台账 + 投递）；发起方调 list 查台账。详见 protocol/src/dispatch.ts。
-  "personaDispatch.run",
-  // 跨设备 exec（spec 2026-07-16）：A 侧本地 cc 经 /api/rpc 调，带 peerDeviceId → daemon forward。
-  "peerExec.run",
-  "personaDispatch.complete",
-  "personaDispatch.list",
-  // persona 清单（spec 2026-07-21）：两级路由第一级——发起方 cc（loopback owner 语义）
-  // 用 curl 拿全量 personaId+label 紧凑清单，再按需读候选 CLAUDE.md 首段做终选。
-  "persona.list",
-  // clawd-shift v1 (spec 2026-06-24-clawd-shift)：cc 子进程内的 shift MCP server 调
-  // 这 5 个 method 管理 owner 的 shift（fire-and-forget 排班）。鉴权靠 body.personaId
-  // （mcp-server 从 process.env.CLAWD_PERSONA_ID 读，源 = SessionFile.ownerPersonaId）。
-  // handler 内 cancel/update/history 校验 createdByPersona === personaId 防越权。
-  "shift-internal.add",
-  "shift-internal.list",
-  "shift-internal.cancel",
-  "shift-internal.update",
-  "shift-internal.history",
-  // file-sharing：persona guest agent 把自己工作目录内的产物入群+签名分享。
-  // 路径越界由 handlers/attachment.ts guardAttachmentPath（scope-based）拦截。
-  "attachment.groupAdd",
-  "attachment.signUrl",
-  // persona 受控发 P2P IM DM（sender 由 session scope 推，driver 分级授权见 handlers/inbox.ts）
-  "inbox.sendDm",
-  // per-turn sender 2026-07-08 spec §4.1：MCP servers (ticket / inbox / ...) 每 tool call
-  // 查当前 turn caller —— cc 长驻 + owner/guest 交替驱动同一 session 时不能靠启动时 env
-  // 写死身份，必须运行时 fetch。header X-Clawd-Session-Id 作 session 定位，handler 内查
-  // manager.tryGetState(sid).currentTurnSender 返 SenderInfo | null。
-  "session.currentTurnSender"
-];
-async function handleRpcRequest(input) {
-  const { method, body, sessionId, dispatcher } = input;
-  if (!sessionId) {
-    return { status: 400, body: { ok: false, error: "MISSING_SESSION_ID", message: "X-Clawd-Session-Id header required" } };
-  }
-  if (!EXPOSED_RPC_METHODS.includes(method)) {
-    return { status: 403, body: { ok: false, error: "METHOD_NOT_EXPOSED", message: `method "${method}" not exposed via HTTP RPC` } };
-  }
-  const internalMethod = method.replace(".", ":");
-  const augmentedBody = {
-    ...typeof body === "object" && body != null ? body : {},
-    sessionId
-  };
-  try {
-    const result = await dispatcher.dispatch(internalMethod, augmentedBody, { sessionId });
-    return { status: 200, body: { ok: true, result } };
-  } catch (err) {
-    const e = err;
-    const code = e?.code ?? "INTERNAL";
-    const message = e?.message ?? String(err);
-    return { status: 400, body: { ok: false, error: code, message } };
-  }
-}
-function resolveExposedHandler(handlers, internalMethod) {
-  return handlers[internalMethod] ?? handlers[internalMethod.replace(":", ".")];
-}
-
 // src/transport/auth.ts
 init_protocol();
 var AuthGate = class {
@@ -51287,8 +51323,8 @@ async function authenticate(token, deps) {
 }
 
 // src/legacy-cleanup.ts
-var fs33 = __toESM(require("fs/promises"), 1);
-var path34 = __toESM(require("path"), 1);
+var fs34 = __toESM(require("fs/promises"), 1);
+var path35 = __toESM(require("path"), 1);
 var LEGACY_FILES = [
   "personal-capability.json",
   "received-capabilities.json",
@@ -51297,9 +51333,9 @@ var LEGACY_FILES = [
 async function cleanupLegacyCapabilityFiles(dataDir, logger) {
   const removed = [];
   for (const name of LEGACY_FILES) {
-    const p2 = path34.join(dataDir, name);
+    const p2 = path35.join(dataDir, name);
     try {
-      await fs33.unlink(p2);
+      await fs34.unlink(p2);
       removed.push(name);
       logger.debug("legacy capability file removed", { file: name });
     } catch (err) {
@@ -51311,13 +51347,13 @@ async function cleanupLegacyCapabilityFiles(dataDir, logger) {
 }
 
 // src/inbox/inbox-store.ts
-var fs34 = __toESM(require("fs"), 1);
-var path35 = __toESM(require("path"), 1);
+var fs35 = __toESM(require("fs"), 1);
+var path36 = __toESM(require("path"), 1);
 var INBOX_SUBDIR = "inbox";
 var InboxStore = class {
   constructor(dataDir) {
     this.dataDir = dataDir;
-    fs34.mkdirSync(this.dirPath(), { recursive: true });
+    fs35.mkdirSync(this.dirPath(), { recursive: true });
   }
   dataDir;
   /**
@@ -51329,7 +51365,7 @@ var InboxStore = class {
     const file = this.filePath(peerDeviceId);
     let raw;
     try {
-      raw = fs34.readFileSync(file, "utf8");
+      raw = fs35.readFileSync(file, "utf8");
     } catch (err) {
       if (err?.code === "ENOENT") return [];
       return [];
@@ -51345,7 +51381,7 @@ var InboxStore = class {
     const dir = this.dirPath();
     let entries;
     try {
-      entries = fs34.readdirSync(dir);
+      entries = fs35.readdirSync(dir);
     } catch (err) {
       if (err?.code === "ENOENT") return [];
       return [];
@@ -51361,9 +51397,9 @@ var InboxStore = class {
     if (existing.some((m2) => m2.id === message.id)) return;
     const file = this.filePath(message.peerDeviceId);
     const line = JSON.stringify(message) + "\n";
-    fs34.appendFileSync(file, line, { mode: 384 });
+    fs35.appendFileSync(file, line, { mode: 384 });
     try {
-      fs34.chmodSync(file, 384);
+      fs35.chmodSync(file, 384);
     } catch {
     }
   }
@@ -51393,7 +51429,7 @@ var InboxStore = class {
   removeByPeerDeviceId(peerDeviceId) {
     const file = this.filePath(peerDeviceId);
     try {
-      fs34.unlinkSync(file);
+      fs35.unlinkSync(file);
     } catch (err) {
       if (err?.code === "ENOENT") return;
     }
@@ -51402,18 +51438,18 @@ var InboxStore = class {
     const file = this.filePath(peerDeviceId);
     const tmp = `${file}.tmp-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
     const content = messages.map((m2) => JSON.stringify(m2)).join("\n") + (messages.length > 0 ? "\n" : "");
-    fs34.writeFileSync(tmp, content, { mode: 384 });
-    fs34.renameSync(tmp, file);
+    fs35.writeFileSync(tmp, content, { mode: 384 });
+    fs35.renameSync(tmp, file);
     try {
-      fs34.chmodSync(file, 384);
+      fs35.chmodSync(file, 384);
     } catch {
     }
   }
   dirPath() {
-    return path35.join(this.dataDir, INBOX_SUBDIR);
+    return path36.join(this.dataDir, INBOX_SUBDIR);
   }
   filePath(peerDeviceId) {
-    return path35.join(this.dirPath(), `${peerDeviceId}.jsonl`);
+    return path36.join(this.dirPath(), `${peerDeviceId}.jsonl`);
   }
 };
 function parseAllLines(raw) {
@@ -51501,8 +51537,8 @@ var InboxManager = class {
 };
 
 // src/state/contact-store.ts
-var fs35 = __toESM(require("fs"), 1);
-var path36 = __toESM(require("path"), 1);
+var fs36 = __toESM(require("fs"), 1);
+var path37 = __toESM(require("path"), 1);
 var FILE_NAME = "contacts.json";
 var ContactStore = class {
   constructor(dataDir) {
@@ -51512,10 +51548,10 @@ var ContactStore = class {
   contacts = /* @__PURE__ */ new Map();
   load() {
     this.contacts.clear();
-    const file = path36.join(this.dataDir, FILE_NAME);
+    const file = path37.join(this.dataDir, FILE_NAME);
     let raw;
     try {
-      raw = fs35.readFileSync(file, "utf8");
+      raw = fs36.readFileSync(file, "utf8");
     } catch (err) {
       if (err?.code !== "ENOENT") this.renameBak(file);
       return;
@@ -51584,20 +51620,20 @@ var ContactStore = class {
     return true;
   }
   flush() {
-    const file = path36.join(this.dataDir, FILE_NAME);
+    const file = path37.join(this.dataDir, FILE_NAME);
     const tmp = `${file}.tmp-${process.pid}-${Date.now()}`;
     const content = JSON.stringify(
       { contacts: Array.from(this.contacts.values()) },
       null,
       2
     );
-    fs35.mkdirSync(this.dataDir, { recursive: true });
-    fs35.writeFileSync(tmp, content, { mode: 384 });
-    fs35.renameSync(tmp, file);
+    fs36.mkdirSync(this.dataDir, { recursive: true });
+    fs36.writeFileSync(tmp, content, { mode: 384 });
+    fs36.renameSync(tmp, file);
   }
   renameBak(file) {
     try {
-      fs35.renameSync(file, `${file}.bak`);
+      fs36.renameSync(file, `${file}.bak`);
     } catch {
     }
   }
@@ -51705,61 +51741,61 @@ async function connectRemote(args) {
 }
 
 // src/migrations/2026-05-20-flatten-sessions.ts
-var fs36 = __toESM(require("fs"), 1);
-var path37 = __toESM(require("path"), 1);
+var fs37 = __toESM(require("fs"), 1);
+var path38 = __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 = path37.join(dataDir, "sessions");
-  const flagPath = path37.join(sessionsDir, MIGRATION_FLAG_NAME);
+  const sessionsDir = path38.join(dataDir, "sessions");
+  const flagPath = path38.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 = path37.join(sessionsDir, "default");
+  const defaultDir = path38.join(sessionsDir, "default");
   if (existsSync3(defaultDir)) {
     for (const entry of readdirSafe(defaultDir)) {
       if (!entry.endsWith(".json")) continue;
-      const src = path37.join(defaultDir, entry);
-      const dst = path37.join(sessionsDir, entry);
-      fs36.renameSync(src, dst);
+      const src = path38.join(defaultDir, entry);
+      const dst = path38.join(sessionsDir, entry);
+      fs37.renameSync(src, dst);
       movedBare += 1;
     }
     rmdirIfEmpty(defaultDir);
   }
   for (const pid of readdirSafe(sessionsDir)) {
-    const personaDir = path37.join(sessionsDir, pid);
+    const personaDir = path38.join(sessionsDir, pid);
     if (!isDir(personaDir)) continue;
     if (pid === "default") continue;
-    const ownerSrc = path37.join(personaDir, "owner");
+    const ownerSrc = path38.join(personaDir, "owner");
     if (existsSync3(ownerSrc) && isDir(ownerSrc)) {
-      const ownerDst = path37.join(dataDir, "personas", pid, ".clawd", "sessions", "owner");
-      fs36.mkdirSync(ownerDst, { recursive: true });
+      const ownerDst = path38.join(dataDir, "personas", pid, ".clawd", "sessions", "owner");
+      fs37.mkdirSync(ownerDst, { recursive: true });
       for (const file of readdirSafe(ownerSrc)) {
         if (!file.endsWith(".json")) continue;
-        fs36.renameSync(path37.join(ownerSrc, file), path37.join(ownerDst, file));
+        fs37.renameSync(path38.join(ownerSrc, file), path38.join(ownerDst, file));
         movedVmOwner += 1;
       }
       rmdirIfEmpty(ownerSrc);
     }
-    const listenerSrc = path37.join(personaDir, "listener");
+    const listenerSrc = path38.join(personaDir, "listener");
     if (existsSync3(listenerSrc) && isDir(listenerSrc)) {
-      const archiveDst = path37.join(dataDir, ".legacy", `listener-${pid}`);
-      fs36.mkdirSync(archiveDst, { recursive: true });
+      const archiveDst = path38.join(dataDir, ".legacy", `listener-${pid}`);
+      fs37.mkdirSync(archiveDst, { recursive: true });
       for (const file of readdirSafe(listenerSrc)) {
         if (!file.endsWith(".json")) continue;
-        fs36.renameSync(path37.join(listenerSrc, file), path37.join(archiveDst, file));
+        fs37.renameSync(path38.join(listenerSrc, file), path38.join(archiveDst, file));
         archivedListener += 1;
       }
       rmdirIfEmpty(listenerSrc);
     }
     rmdirIfEmpty(personaDir);
   }
-  fs36.mkdirSync(sessionsDir, { recursive: true });
-  fs36.writeFileSync(flagPath, JSON.stringify({ migratedAt: now() }, null, 2));
+  fs37.mkdirSync(sessionsDir, { recursive: true });
+  fs37.writeFileSync(flagPath, JSON.stringify({ migratedAt: now() }, null, 2));
   return {
     skipped: false,
     flagWritten: true,
@@ -51770,7 +51806,7 @@ function migrateFlattenSessions(opts) {
 }
 function existsSync3(p2) {
   try {
-    fs36.statSync(p2);
+    fs37.statSync(p2);
     return true;
   } catch {
     return false;
@@ -51778,31 +51814,31 @@ function existsSync3(p2) {
 }
 function isDir(p2) {
   try {
-    return fs36.statSync(p2).isDirectory();
+    return fs37.statSync(p2).isDirectory();
   } catch {
     return false;
   }
 }
 function readdirSafe(p2) {
   try {
-    return fs36.readdirSync(p2);
+    return fs37.readdirSync(p2);
   } catch {
     return [];
   }
 }
 function rmdirIfEmpty(p2) {
   try {
-    fs36.rmdirSync(p2);
+    fs37.rmdirSync(p2);
   } catch {
   }
 }
 
 // src/transport/http-router.ts
-var import_node_fs30 = __toESM(require("fs"), 1);
-var import_node_path33 = __toESM(require("path"), 1);
+var import_node_fs31 = __toESM(require("fs"), 1);
+var import_node_path34 = __toESM(require("path"), 1);
 
 // src/attachment/mime.ts
-var import_node_path30 = __toESM(require("path"), 1);
+var import_node_path31 = __toESM(require("path"), 1);
 var TEXT_PLAIN = "text/plain; charset=utf-8";
 var EXT_TO_NATIVE_MIME = {
   // 图片
@@ -51909,7 +51945,7 @@ var TEXT_EXTENSIONS = /* @__PURE__ */ new Set([
   ".mk"
 ]);
 function lookupMime(filePathOrName) {
-  const ext = import_node_path30.default.extname(filePathOrName).toLowerCase();
+  const ext = import_node_path31.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";
@@ -51931,8 +51967,9 @@ function encodeAbsPathForUrl(absPath) {
 function decodeAbsPathFromUrl(encoded) {
   return encoded.split("/").map(decodeURIComponent).join("/");
 }
+var DOMAIN_PREFIX2 = "clawd-attach-v1|";
 function computeSig(secret, absPath, e) {
-  const msg = e === null ? absPath : `${absPath}|${e}`;
+  const msg = e === null ? `${DOMAIN_PREFIX2}${absPath}` : `${DOMAIN_PREFIX2}${absPath}|${e}`;
   return import_node_crypto7.default.createHmac(HMAC_ALGO, secret).update(msg).digest();
 }
 function signUrlParts(secret, absPath, ttlSeconds, now = Date.now) {
@@ -51978,8 +52015,8 @@ function verifySignedUrl(secret, absPath, eRaw, s, now = Date.now) {
 }
 
 // src/attachment/upload.ts
-var import_node_fs29 = __toESM(require("fs"), 1);
-var import_node_path31 = __toESM(require("path"), 1);
+var import_node_fs30 = __toESM(require("fs"), 1);
+var import_node_path32 = __toESM(require("path"), 1);
 var import_node_crypto8 = __toESM(require("crypto"), 1);
 var import_promises3 = require("stream/promises");
 var UploadError = class extends Error {
@@ -51991,22 +52028,22 @@ var UploadError = class extends Error {
   code;
 };
 function assertValidFileName(fileName) {
-  if (fileName.length === 0 || fileName === "." || fileName === ".." || fileName.startsWith(".") || fileName.includes("/") || fileName.includes("\\") || fileName !== import_node_path31.default.basename(fileName)) {
+  if (fileName.length === 0 || fileName === "." || fileName === ".." || fileName.startsWith(".") || fileName.includes("/") || fileName.includes("\\") || fileName !== import_node_path32.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_path31.default.join(args.sessionDir, ".attachments");
+  const attachmentsRoot = import_node_path32.default.join(args.sessionDir, ".attachments");
   try {
-    import_node_fs29.default.mkdirSync(attachmentsRoot, { recursive: true });
+    import_node_fs30.default.mkdirSync(attachmentsRoot, { recursive: true });
   } catch (err) {
     throw new UploadError("STORAGE_ERROR", `mkdir failed: ${err.message}`);
   }
   const hasher = import_node_crypto8.default.createHash("sha256");
   let actualSize = 0;
-  const tmpPath = import_node_path31.default.join(
+  const tmpPath = import_node_path32.default.join(
     attachmentsRoot,
     `.upload-${process.pid}-${Date.now()}-${import_node_crypto8.default.randomBytes(4).toString("hex")}`
   );
@@ -52021,18 +52058,18 @@ async function writeUploadedAttachment(args) {
           yield buf;
         }
       },
-      import_node_fs29.default.createWriteStream(tmpPath, { mode: 384 })
+      import_node_fs30.default.createWriteStream(tmpPath, { mode: 384 })
     );
   } catch (err) {
     try {
-      import_node_fs29.default.unlinkSync(tmpPath);
+      import_node_fs30.default.unlinkSync(tmpPath);
     } catch {
     }
     throw new UploadError("STORAGE_ERROR", `write failed: ${err.message}`);
   }
   if (actualSize !== args.contentLength) {
     try {
-      import_node_fs29.default.unlinkSync(tmpPath);
+      import_node_fs30.default.unlinkSync(tmpPath);
     } catch {
     }
     throw new UploadError(
@@ -52041,35 +52078,35 @@ async function writeUploadedAttachment(args) {
     );
   }
   const attachmentId = hasher.digest("hex").slice(0, HASH_PREFIX_LEN);
-  const hashDir = import_node_path31.default.join(attachmentsRoot, attachmentId);
+  const hashDir = import_node_path32.default.join(attachmentsRoot, attachmentId);
   let finalFileName;
   let hashDirExists = false;
   try {
-    hashDirExists = import_node_fs29.default.statSync(hashDir).isDirectory();
+    hashDirExists = import_node_fs30.default.statSync(hashDir).isDirectory();
   } catch {
   }
   if (hashDirExists) {
-    const existing = import_node_fs29.default.readdirSync(hashDir).filter((n) => !n.startsWith("."));
+    const existing = import_node_fs30.default.readdirSync(hashDir).filter((n) => !n.startsWith("."));
     finalFileName = existing[0] ?? args.fileName;
     try {
-      import_node_fs29.default.unlinkSync(tmpPath);
+      import_node_fs30.default.unlinkSync(tmpPath);
     } catch {
     }
   } else {
     try {
-      import_node_fs29.default.mkdirSync(hashDir, { recursive: true });
+      import_node_fs30.default.mkdirSync(hashDir, { recursive: true });
       finalFileName = args.fileName;
-      import_node_fs29.default.renameSync(tmpPath, import_node_path31.default.join(hashDir, finalFileName));
+      import_node_fs30.default.renameSync(tmpPath, import_node_path32.default.join(hashDir, finalFileName));
     } catch (err) {
       try {
-        import_node_fs29.default.unlinkSync(tmpPath);
+        import_node_fs30.default.unlinkSync(tmpPath);
       } catch {
       }
       throw new UploadError("STORAGE_ERROR", `rename failed: ${err.message}`);
     }
   }
-  const absPath = import_node_path31.default.join(hashDir, finalFileName);
-  const relPath = import_node_path31.default.relative(args.sessionDir, absPath);
+  const absPath = import_node_path32.default.join(hashDir, finalFileName);
+  const relPath = import_node_path32.default.relative(args.sessionDir, absPath);
   args.groupFileStore.upsert(args.scope, args.sessionId, {
     relPath: absPath,
     // 存绝对路径，与现有 agent 入清单的形态一致（attachment.ts:144 双形态兼容）
@@ -52083,7 +52120,7 @@ async function writeUploadedAttachment(args) {
 
 // src/extension/import.ts
 var import_promises4 = __toESM(require("fs/promises"), 1);
-var import_node_path32 = __toESM(require("path"), 1);
+var import_node_path33 = __toESM(require("path"), 1);
 var import_node_os12 = __toESM(require("os"), 1);
 var import_jszip = __toESM(require_lib3(), 1);
 var ImportError = class extends Error {
@@ -52101,7 +52138,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_path32.default.isAbsolute(name)) {
+    if (name.includes("..") || name.startsWith("/") || import_node_path33.default.isAbsolute(name)) {
       throw new ImportError("ZIP_INVALID", `unsafe zip entry path: ${name}`);
     }
   }
@@ -52134,7 +52171,7 @@ async function importZip(buf, root) {
       );
     }
   }
-  const destDir = import_node_path32.default.join(root, manifest.id);
+  const destDir = import_node_path33.default.join(root, manifest.id);
   let destExists = false;
   try {
     await import_promises4.default.access(destDir);
@@ -52144,15 +52181,15 @@ async function importZip(buf, root) {
   if (destExists) {
     throw new ImportError("ALREADY_EXISTS", `extension ${manifest.id} already installed`);
   }
-  const stage = await import_promises4.default.mkdtemp(import_node_path32.default.join(import_node_os12.default.tmpdir(), `clawd-ext-stage-${manifest.id}-`));
+  const stage = await import_promises4.default.mkdtemp(import_node_path33.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_path32.default.join(stage, name);
+      const dest = import_node_path33.default.join(stage, name);
       if (entry.dir) {
         await import_promises4.default.mkdir(dest, { recursive: true });
         continue;
       }
-      await import_promises4.default.mkdir(import_node_path32.default.dirname(dest), { recursive: true });
+      await import_promises4.default.mkdir(import_node_path33.default.dirname(dest), { recursive: true });
       const content = await entry.async("nodebuffer");
       await import_promises4.default.writeFile(dest, content);
     }
@@ -52167,7 +52204,6 @@ async function importZip(buf, root) {
 }
 
 // src/transport/http-router.ts
-var RPC_ROUTE_PREFIX = "/api/rpc/";
 var RPC_BODY_MAX_BYTES = 1 * 1024 * 1024;
 var SHARE_UI_ASSETS_PREFIX = "/share-ui/assets/";
 var SHARE_UI_ASSET_MIME = {
@@ -52183,11 +52219,9 @@ var SHARE_UI_ASSET_MIME = {
   ".wasm": "application/wasm"
 };
 function shareUiAssetMime(filePath) {
-  const ext = import_node_path33.default.extname(filePath).toLowerCase();
+  const ext = import_node_path34.default.extname(filePath).toLowerCase();
   return SHARE_UI_ASSET_MIME[ext] ?? lookupMime(filePath);
 }
-var DISPATCH_HEARTBEAT_MS = 25e3;
-var DISPATCH_HOLD_METHOD = "personaDispatch:run";
 var AUTHED_RPC_ROUTE_PREFIX = "/rpc/";
 var AUTHED_RPC_CORS_HEADERS = {
   "Access-Control-Allow-Origin": "*",
@@ -52210,10 +52244,6 @@ function authedRpcErrorStatus(code) {
       return 400;
   }
 }
-function isLoopbackAddress(addr) {
-  if (!addr) return false;
-  return addr === "127.0.0.1" || addr === "::1" || addr === "::ffff:127.0.0.1" || addr.startsWith("127.");
-}
 async function readJsonBody(req, max) {
   return await new Promise((resolve6, reject) => {
     let size = 0;
@@ -52270,7 +52300,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_path33.default.basename(fileName);
+  return fileName === import_node_path34.default.basename(fileName);
 }
 function createHttpRouter(deps) {
   return async (req, res) => {
@@ -52342,7 +52372,7 @@ function createHttpRouter(deps) {
       }
       let buf;
       try {
-        buf = await import_node_fs30.default.promises.readFile(abs);
+        buf = await import_node_fs31.default.promises.readFile(abs);
       } catch {
         sendJson(res, 404, { code: "NOT_FOUND", message: "asset not found" });
         return true;
@@ -52390,57 +52420,6 @@ function createHttpRouter(deps) {
         return true;
       }
       const dispatchArgs = typeof body === "object" && body != null ? body : {};
-      if (method === DISPATCH_HOLD_METHOD) {
-        const heartbeatMs = deps.dispatchHeartbeatMs ?? DISPATCH_HEARTBEAT_MS;
-        let headSent = false;
-        let hbInterval;
-        const startStreaming = () => {
-          headSent = true;
-          req.socket?.setTimeout?.(0);
-          res.socket?.setTimeout?.(0);
-          res.writeHead(200, {
-            "Content-Type": "application/json; charset=utf-8",
-            "Transfer-Encoding": "chunked",
-            // nginx 专用：禁用该响应缓冲，让心跳字节即时 flush 到上游 read（否则被攒着不重置计时）
-            "X-Accel-Buffering": "no",
-            ...AUTHED_RPC_CORS_HEADERS
-          });
-          res.write(" ");
-          hbInterval = setInterval(() => {
-            try {
-              res.write(" ");
-            } catch {
-            }
-          }, heartbeatMs);
-        };
-        const graceTimer = setTimeout(startStreaming, heartbeatMs);
-        const cleanup = () => {
-          clearTimeout(graceTimer);
-          if (hbInterval) clearInterval(hbInterval);
-        };
-        const safeEnd = (payload) => {
-          if (res.writableEnded || res.destroyed) return;
-          try {
-            res.end(payload);
-          } catch {
-          }
-        };
-        res.on("close", cleanup);
-        try {
-          const result = await deps.authedRpc.dispatch(method, dispatchArgs, auth.context);
-          cleanup();
-          if (headSent) safeEnd(JSON.stringify({ ok: true, result: result.response }));
-          else sendJson(res, 200, { ok: true, result: result.response }, AUTHED_RPC_CORS_HEADERS);
-        } catch (err) {
-          cleanup();
-          const e = err;
-          const code = e?.code ?? "INTERNAL";
-          const payload = { ok: false, error: code, message: e?.message ?? String(err) };
-          if (headSent) safeEnd(JSON.stringify(payload));
-          else sendJson(res, authedRpcErrorStatus(code), payload, AUTHED_RPC_CORS_HEADERS);
-        }
-        return true;
-      }
       try {
         const result = await deps.authedRpc.dispatch(method, dispatchArgs, auth.context);
         sendJson(res, 200, { ok: true, result: result.response }, AUTHED_RPC_CORS_HEADERS);
@@ -52451,34 +52430,6 @@ function createHttpRouter(deps) {
       }
       return true;
     }
-    if (url.pathname.startsWith(RPC_ROUTE_PREFIX)) {
-      if (!deps.rpcDispatcher) {
-        sendJson(res, 501, { code: "NOT_IMPLEMENTED", message: "HTTP RPC adapter not wired" });
-        return true;
-      }
-      if (req.method !== "POST") {
-        sendJson(res, 405, { code: "METHOD_NOT_ALLOWED", message: "POST only" });
-        return true;
-      }
-      if (!isLoopbackAddress(req.socket.remoteAddress)) {
-        sendJson(res, 403, { code: "NOT_LOOPBACK", message: "RPC adapter only accepts loopback connections" });
-        return true;
-      }
-      req.socket.setTimeout(0);
-      res.socket?.setTimeout(0);
-      const method = url.pathname.slice(RPC_ROUTE_PREFIX.length).split("?")[0] ?? "";
-      const sessionId = req.headers["x-clawd-session-id"] ?? void 0;
-      let body;
-      try {
-        body = await readJsonBody(req, RPC_BODY_MAX_BYTES);
-      } catch (err) {
-        sendJson(res, 400, { code: "INVALID_BODY", message: err instanceof Error ? err.message : String(err) });
-        return true;
-      }
-      const result = await handleRpcRequest({ method, body, sessionId, dispatcher: deps.rpcDispatcher });
-      sendJson(res, result.status, result.body);
-      return true;
-    }
     if (url.pathname.startsWith("/preview/")) {
       const port = matchPreviewPort(url.pathname);
       if (port != null && isPreviewPortAllowed(port, { allowedPorts: deps.previewPorts ?? [] })) {
@@ -52566,7 +52517,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_path33.default.basename(r.absPath)));
+      sendHtml(res, 200, loader.renderViewerHtml(import_node_path34.default.basename(r.absPath)));
       return true;
     }
     const ctx = deps.authResolver.resolveFromHeader(
@@ -52687,7 +52638,7 @@ function createHttpRouter(deps) {
         return true;
       }
       let absPath;
-      if (import_node_path33.default.isAbsolute(pathParam)) {
+      if (import_node_path34.default.isAbsolute(pathParam)) {
         absPath = pathParam;
       } else if (deps.sessionStore) {
         const file = deps.sessionStore.read(sid);
@@ -52695,7 +52646,7 @@ function createHttpRouter(deps) {
           sendJson(res, 404, { code: "NOT_FOUND", message: `session ${sid} not found` });
           return true;
         }
-        absPath = import_node_path33.default.join(file.cwd, pathParam);
+        absPath = import_node_path34.default.join(file.cwd, pathParam);
       } else {
         sendJson(res, 501, withCtx(ctx, { code: "NOT_IMPLEMENTED", message: "sessionStore not wired" }));
         return true;
@@ -52782,7 +52733,7 @@ function withCtx(ctx, body) {
 function streamFile(res, absPath, logger) {
   let stat;
   try {
-    stat = import_node_fs30.default.statSync(absPath);
+    stat = import_node_fs31.default.statSync(absPath);
   } catch (err) {
     const code = err?.code;
     if (code === "ENOENT") {
@@ -52797,7 +52748,7 @@ function streamFile(res, absPath, logger) {
     return;
   }
   const mime = lookupMime(absPath);
-  const basename = import_node_path33.default.basename(absPath);
+  const basename = import_node_path34.default.basename(absPath);
   res.writeHead(200, {
     "Content-Type": mime,
     "Content-Length": String(stat.size),
@@ -52805,7 +52756,7 @@ function streamFile(res, absPath, logger) {
     // 防止浏览器把任意 mime 当 html 渲染
     "X-Content-Type-Options": "nosniff"
   });
-  const stream = import_node_fs30.default.createReadStream(absPath);
+  const stream = import_node_fs31.default.createReadStream(absPath);
   stream.on("error", (err) => {
     logger?.warn("streamFile read error", { absPath, err: err.message });
     res.destroy();
@@ -52814,8 +52765,8 @@ function streamFile(res, absPath, logger) {
 }
 
 // src/attachment/gc.ts
-var import_node_fs31 = __toESM(require("fs"), 1);
-var import_node_path34 = __toESM(require("path"), 1);
+var import_node_fs32 = __toESM(require("fs"), 1);
+var import_node_path35 = __toESM(require("path"), 1);
 var DEFAULT_TTL_MS = 30 * 24 * 3600 * 1e3;
 function runAttachmentGc(args) {
   const now = (args.now ?? Date.now)();
@@ -52824,38 +52775,38 @@ 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_path34.default.isAbsolute(entry.relPath)) liveAbs.add(entry.relPath);
+      if (import_node_path35.default.isAbsolute(entry.relPath)) liveAbs.add(entry.relPath);
     }
   }
   for (const { scope, sessionId } of args.sessionScopes) {
-    const sessionDir = args.getSessionCwd?.(sessionId) ?? import_node_path34.default.join(
+    const sessionDir = args.getSessionCwd?.(sessionId) ?? import_node_path35.default.join(
       args.dataDir,
       "sessions",
       ...scopeSubPath(scope).map(safeFileName),
       safeFileName(sessionId)
     );
-    const attRoot = import_node_path34.default.join(sessionDir, ".attachments");
+    const attRoot = import_node_path35.default.join(sessionDir, ".attachments");
     let hashDirs;
     try {
-      hashDirs = import_node_fs31.default.readdirSync(attRoot);
+      hashDirs = import_node_fs32.default.readdirSync(attRoot);
     } catch (err) {
       if (err.code === "ENOENT") continue;
       args.logger?.warn("attachment gc: readdir failed", { attRoot, err: err.message });
       continue;
     }
     for (const hashDir of hashDirs) {
-      const hashDirAbs = import_node_path34.default.join(attRoot, hashDir);
+      const hashDirAbs = import_node_path35.default.join(attRoot, hashDir);
       let files;
       try {
-        files = import_node_fs31.default.readdirSync(hashDirAbs);
+        files = import_node_fs32.default.readdirSync(hashDirAbs);
       } catch {
         continue;
       }
       for (const name of files) {
-        const file = import_node_path34.default.join(hashDirAbs, name);
+        const file = import_node_path35.default.join(hashDirAbs, name);
         let stat;
         try {
-          stat = import_node_fs31.default.statSync(file);
+          stat = import_node_fs32.default.statSync(file);
         } catch {
           continue;
         }
@@ -52864,26 +52815,26 @@ function runAttachmentGc(args) {
         if (age < ttlMs) continue;
         if (liveAbs.has(file)) continue;
         try {
-          import_node_fs31.default.unlinkSync(file);
+          import_node_fs32.default.unlinkSync(file);
         } catch (err) {
           args.logger?.warn("attachment gc: unlink failed", { file, err: err.message });
         }
       }
       try {
-        if (import_node_fs31.default.readdirSync(hashDirAbs).length === 0) import_node_fs31.default.rmdirSync(hashDirAbs);
+        if (import_node_fs32.default.readdirSync(hashDirAbs).length === 0) import_node_fs32.default.rmdirSync(hashDirAbs);
       } catch {
       }
     }
     try {
-      if (import_node_fs31.default.readdirSync(attRoot).length === 0) import_node_fs31.default.rmdirSync(attRoot);
+      if (import_node_fs32.default.readdirSync(attRoot).length === 0) import_node_fs32.default.rmdirSync(attRoot);
     } catch {
     }
   }
 }
 
 // src/attachment/group.ts
-var import_node_fs32 = __toESM(require("fs"), 1);
-var import_node_path35 = __toESM(require("path"), 1);
+var import_node_fs33 = __toESM(require("fs"), 1);
+var import_node_path36 = __toESM(require("path"), 1);
 var import_node_crypto9 = __toESM(require("crypto"), 1);
 init_protocol();
 var GroupFileStore = class {
@@ -52895,11 +52846,11 @@ var GroupFileStore = class {
     this.logger = opts.logger;
   }
   rootForScope(scope) {
-    return import_node_path35.default.join(this.dataDir, "sessions", ...scopeSubPath(scope).map(safeFileName));
+    return import_node_path36.default.join(this.dataDir, "sessions", ...scopeSubPath(scope).map(safeFileName));
   }
   /** 与 SessionStore.filePath 平级，扩展名 .group-files.json */
   filePath(scope, sessionId) {
-    return import_node_path35.default.join(this.rootForScope(scope), `${safeFileName(sessionId)}.group-files.json`);
+    return import_node_path36.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}`;
@@ -52908,7 +52859,7 @@ var GroupFileStore = class {
   readFile(scope, sessionId) {
     const file = this.filePath(scope, sessionId);
     try {
-      const raw = import_node_fs32.default.readFileSync(file, "utf8");
+      const raw = import_node_fs33.default.readFileSync(file, "utf8");
       const parsed = JSON.parse(raw);
       if (!Array.isArray(parsed)) {
         this.logger?.warn("GroupFileStore.readFile: not an array; resetting session entries", {
@@ -52934,10 +52885,10 @@ var GroupFileStore = class {
   }
   writeFile(scope, sessionId, entries) {
     const file = this.filePath(scope, sessionId);
-    import_node_fs32.default.mkdirSync(import_node_path35.default.dirname(file), { recursive: true });
+    import_node_fs33.default.mkdirSync(import_node_path36.default.dirname(file), { recursive: true });
     const tmp = `${file}.tmp-${process.pid}-${Date.now()}`;
-    import_node_fs32.default.writeFileSync(tmp, JSON.stringify(entries, null, 2), { mode: 384 });
-    import_node_fs32.default.renameSync(tmp, file);
+    import_node_fs33.default.writeFileSync(tmp, JSON.stringify(entries, null, 2), { mode: 384 });
+    import_node_fs33.default.renameSync(tmp, file);
   }
   /** 拉一份当前 session 的清单。读盘 → cache；之后调用复用 cache */
   list(scope, sessionId) {
@@ -53023,10 +52974,10 @@ var GroupFileStore = class {
 };
 
 // src/discovery/state-file.ts
-var import_node_fs33 = __toESM(require("fs"), 1);
-var import_node_path36 = __toESM(require("path"), 1);
+var import_node_fs34 = __toESM(require("fs"), 1);
+var import_node_path37 = __toESM(require("path"), 1);
 function defaultStateFilePath(dataDir) {
-  return import_node_path36.default.join(dataDir, "state.json");
+  return import_node_path37.default.join(dataDir, "state.json");
 }
 function isPidAlive(pid) {
   if (!Number.isFinite(pid) || pid <= 0) return false;
@@ -53048,7 +52999,7 @@ var StateFileManager = class {
   }
   read() {
     try {
-      const raw = import_node_fs33.default.readFileSync(this.file, "utf8");
+      const raw = import_node_fs34.default.readFileSync(this.file, "utf8");
       const parsed = JSON.parse(raw);
       return parsed;
     } catch {
@@ -53062,20 +53013,20 @@ var StateFileManager = class {
     return { status: "stale", existing };
   }
   write(state) {
-    import_node_fs33.default.mkdirSync(import_node_path36.default.dirname(this.file), { recursive: true });
+    import_node_fs34.default.mkdirSync(import_node_path37.default.dirname(this.file), { recursive: true });
     const tmp = `${this.file}.tmp.${process.pid}.${Date.now()}`;
-    import_node_fs33.default.writeFileSync(tmp, JSON.stringify(state, null, 2), { mode: 384 });
-    import_node_fs33.default.renameSync(tmp, this.file);
+    import_node_fs34.default.writeFileSync(tmp, JSON.stringify(state, null, 2), { mode: 384 });
+    import_node_fs34.default.renameSync(tmp, this.file);
     if (process.platform !== "win32") {
       try {
-        import_node_fs33.default.chmodSync(this.file, 384);
+        import_node_fs34.default.chmodSync(this.file, 384);
       } catch {
       }
     }
   }
   delete() {
     try {
-      import_node_fs33.default.unlinkSync(this.file);
+      import_node_fs34.default.unlinkSync(this.file);
     } catch {
     }
   }
@@ -53089,14 +53040,14 @@ function readSpawnedByDesktopFromEnv(env = process.env) {
 }
 
 // src/tunnel/tunnel-manager.ts
-var import_node_fs37 = __toESM(require("fs"), 1);
-var import_node_path40 = __toESM(require("path"), 1);
+var import_node_fs38 = __toESM(require("fs"), 1);
+var import_node_path41 = __toESM(require("path"), 1);
 var import_node_crypto10 = __toESM(require("crypto"), 1);
 var import_node_child_process10 = require("child_process");
 
 // src/tunnel/tunnel-store.ts
-var import_node_fs34 = __toESM(require("fs"), 1);
-var import_node_path37 = __toESM(require("path"), 1);
+var import_node_fs35 = __toESM(require("fs"), 1);
+var import_node_path38 = __toESM(require("path"), 1);
 var TunnelStore = class {
   constructor(filePath) {
     this.filePath = filePath;
@@ -53104,7 +53055,7 @@ var TunnelStore = class {
   filePath;
   async get() {
     try {
-      const raw = await import_node_fs34.default.promises.readFile(this.filePath, "utf8");
+      const raw = await import_node_fs35.default.promises.readFile(this.filePath, "utf8");
       const obj = JSON.parse(raw);
       if (!isPersistedTunnel(obj)) return null;
       return obj;
@@ -53115,22 +53066,22 @@ var TunnelStore = class {
     }
   }
   async set(v2) {
-    const dir = import_node_path37.default.dirname(this.filePath);
-    await import_node_fs34.default.promises.mkdir(dir, { recursive: true });
+    const dir = import_node_path38.default.dirname(this.filePath);
+    await import_node_fs35.default.promises.mkdir(dir, { recursive: true });
     const data = JSON.stringify(v2, null, 2);
     const tmp = `${this.filePath}.tmp.${process.pid}.${Date.now()}`;
-    await import_node_fs34.default.promises.writeFile(tmp, data, { mode: 384 });
+    await import_node_fs35.default.promises.writeFile(tmp, data, { mode: 384 });
     if (process.platform !== "win32") {
       try {
-        await import_node_fs34.default.promises.chmod(tmp, 384);
+        await import_node_fs35.default.promises.chmod(tmp, 384);
       } catch {
       }
     }
-    await import_node_fs34.default.promises.rename(tmp, this.filePath);
+    await import_node_fs35.default.promises.rename(tmp, this.filePath);
   }
   async clear() {
     try {
-      await import_node_fs34.default.promises.unlink(this.filePath);
+      await import_node_fs35.default.promises.unlink(this.filePath);
     } catch (err) {
       const code = err?.code;
       if (code !== "ENOENT") throw err;
@@ -53225,9 +53176,9 @@ function escape(v2) {
 }
 
 // src/tunnel/frpc-binary.ts
-var import_node_fs35 = __toESM(require("fs"), 1);
+var import_node_fs36 = __toESM(require("fs"), 1);
 var import_node_os13 = __toESM(require("os"), 1);
-var import_node_path38 = __toESM(require("path"), 1);
+var import_node_path39 = __toESM(require("path"), 1);
 var import_node_child_process8 = require("child_process");
 var import_node_stream3 = require("stream");
 var import_promises5 = require("stream/promises");
@@ -53259,20 +53210,20 @@ function frpcDownloadUrl(version2, p2) {
 }
 async function ensureFrpcBinary(opts) {
   if (opts.override) {
-    if (!import_node_fs35.default.existsSync(opts.override)) {
+    if (!import_node_fs36.default.existsSync(opts.override)) {
       throw new Error(`frpc binary not found at override path: ${opts.override}`);
     }
     return opts.override;
   }
   const version2 = opts.version ?? FRPC_VERSION;
   const platform = opts.platform ?? detectPlatform();
-  const binDir = import_node_path38.default.join(opts.dataDir, "bin");
-  import_node_fs35.default.mkdirSync(binDir, { recursive: true });
+  const binDir = import_node_path39.default.join(opts.dataDir, "bin");
+  import_node_fs36.default.mkdirSync(binDir, { recursive: true });
   cleanupStaleArtifacts(binDir);
-  const stableBin = import_node_path38.default.join(binDir, "frpc");
-  if (import_node_fs35.default.existsSync(stableBin)) return stableBin;
+  const stableBin = import_node_path39.default.join(binDir, "frpc");
+  if (import_node_fs36.default.existsSync(stableBin)) return stableBin;
   const partialBin = `${stableBin}.partial`;
-  const tarballPath = import_node_path38.default.join(binDir, `frp_${version2}_${platform.os}_${platform.arch}.tar.gz.partial`);
+  const tarballPath = import_node_path39.default.join(binDir, `frp_${version2}_${platform.os}_${platform.arch}.tar.gz.partial`);
   try {
     const url = frpcDownloadUrl(version2, platform);
     await downloadToFile(url, tarballPath, opts.fetchImpl);
@@ -53281,8 +53232,8 @@ async function ensureFrpcBinary(opts) {
     } else {
       await extractFrpcFromTarball(tarballPath, binDir, version2, platform, partialBin);
     }
-    import_node_fs35.default.chmodSync(partialBin, 493);
-    import_node_fs35.default.renameSync(partialBin, stableBin);
+    import_node_fs36.default.chmodSync(partialBin, 493);
+    import_node_fs36.default.renameSync(partialBin, stableBin);
   } finally {
     safeUnlink(tarballPath);
     safeUnlink(partialBin);
@@ -53292,15 +53243,15 @@ async function ensureFrpcBinary(opts) {
 function cleanupStaleArtifacts(binDir) {
   let entries;
   try {
-    entries = import_node_fs35.default.readdirSync(binDir);
+    entries = import_node_fs36.default.readdirSync(binDir);
   } catch {
     return;
   }
   for (const name of entries) {
     if (name.endsWith(".partial") || name.startsWith("extract-")) {
-      const full = import_node_path38.default.join(binDir, name);
+      const full = import_node_path39.default.join(binDir, name);
       try {
-        import_node_fs35.default.rmSync(full, { recursive: true, force: true });
+        import_node_fs36.default.rmSync(full, { recursive: true, force: true });
       } catch {
       }
     }
@@ -53308,7 +53259,7 @@ function cleanupStaleArtifacts(binDir) {
 }
 function safeUnlink(p2) {
   try {
-    import_node_fs35.default.unlinkSync(p2);
+    import_node_fs36.default.unlinkSync(p2);
   } catch {
   }
 }
@@ -53319,13 +53270,13 @@ async function downloadToFile(url, dest, fetchImpl) {
   if (!res.ok || !res.body) {
     throw new Error(`download failed: ${res.status} ${res.statusText}`);
   }
-  const out = import_node_fs35.default.createWriteStream(dest);
+  const out = import_node_fs36.default.createWriteStream(dest);
   const nodeStream = import_node_stream3.Readable.fromWeb(res.body);
   await (0, import_promises5.pipeline)(nodeStream, out);
 }
 async function extractFrpcFromTarball(tarball, binDir, version2, platform, destBin) {
-  const work = import_node_path38.default.join(binDir, `extract-${process.pid}-${Date.now()}`);
-  import_node_fs35.default.mkdirSync(work, { recursive: true });
+  const work = import_node_path39.default.join(binDir, `extract-${process.pid}-${Date.now()}`);
+  import_node_fs36.default.mkdirSync(work, { recursive: true });
   try {
     await new Promise((resolve6, reject) => {
       const proc = (0, import_node_child_process8.spawn)("tar", ["xzf", tarball, "-C", work], { stdio: "pipe" });
@@ -53333,32 +53284,32 @@ 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_path38.default.join(work, dirName, "frpc");
-    if (!import_node_fs35.default.existsSync(src)) {
+    const src = import_node_path39.default.join(work, dirName, "frpc");
+    if (!import_node_fs36.default.existsSync(src)) {
       throw new Error(`frpc not found inside tarball at ${src}`);
     }
-    import_node_fs35.default.copyFileSync(src, destBin);
+    import_node_fs36.default.copyFileSync(src, destBin);
   } finally {
-    import_node_fs35.default.rmSync(work, { recursive: true, force: true });
+    import_node_fs36.default.rmSync(work, { recursive: true, force: true });
   }
 }
 
 // src/tunnel/frpc-process.ts
-var import_node_fs36 = __toESM(require("fs"), 1);
-var import_node_path39 = __toESM(require("path"), 1);
+var import_node_fs37 = __toESM(require("fs"), 1);
+var import_node_path40 = __toESM(require("path"), 1);
 var import_node_child_process9 = require("child_process");
 function frpcPidFilePath(dataDir) {
-  return import_node_path39.default.join(dataDir, "frpc.pid");
+  return import_node_path40.default.join(dataDir, "frpc.pid");
 }
 function writeFrpcPid(dataDir, pid) {
   try {
-    import_node_fs36.default.writeFileSync(frpcPidFilePath(dataDir), String(pid), { mode: 384 });
+    import_node_fs37.default.writeFileSync(frpcPidFilePath(dataDir), String(pid), { mode: 384 });
   } catch {
   }
 }
 function clearFrpcPid(dataDir) {
   try {
-    import_node_fs36.default.unlinkSync(frpcPidFilePath(dataDir));
+    import_node_fs37.default.unlinkSync(frpcPidFilePath(dataDir));
   } catch {
   }
 }
@@ -53374,7 +53325,7 @@ function defaultIsPidAlive(pid) {
 }
 function defaultReadPidFile(file) {
   try {
-    return import_node_fs36.default.readFileSync(file, "utf8");
+    return import_node_fs37.default.readFileSync(file, "utf8");
   } catch {
     return null;
   }
@@ -53385,17 +53336,17 @@ function defaultKillPid(pid, signal) {
   } catch {
   }
 }
-function defaultSleep(ms) {
+function defaultSleep2(ms) {
   return new Promise((r) => setTimeout(r, ms));
 }
 async function killStaleFrpc(deps) {
   const pidFile = frpcPidFilePath(deps.dataDir);
-  const tomlPath = import_node_path39.default.join(deps.dataDir, "frpc.toml");
+  const tomlPath = import_node_path40.default.join(deps.dataDir, "frpc.toml");
   const readPidFile = deps.readPidFileImpl ?? defaultReadPidFile;
   const isAlive = deps.isPidAliveImpl ?? defaultIsPidAlive;
   const killPid = deps.killPidImpl ?? defaultKillPid;
   const scanPids = deps.scanFrpcPidsImpl ?? ((tp) => defaultScanFrpcPidsByCmdline(tp, deps.logger));
-  const sleep2 = deps.sleepImpl ?? defaultSleep;
+  const sleep2 = deps.sleepImpl ?? defaultSleep2;
   const victims = /* @__PURE__ */ new Set();
   const raw = readPidFile(pidFile);
   if (raw) {
@@ -53414,7 +53365,7 @@ async function killStaleFrpc(deps) {
   }
   if (victims.size === 0) {
     try {
-      import_node_fs36.default.unlinkSync(pidFile);
+      import_node_fs37.default.unlinkSync(pidFile);
     } catch {
     }
     return;
@@ -53425,7 +53376,7 @@ async function killStaleFrpc(deps) {
   }
   await sleep2(deps.reapWaitMs ?? 300);
   try {
-    import_node_fs36.default.unlinkSync(pidFile);
+    import_node_fs37.default.unlinkSync(pidFile);
   } catch {
   }
 }
@@ -53462,7 +53413,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_path40.default.join(deps.dataDir, "tunnel.json"));
+    this.store = deps.store ?? new TunnelStore(import_node_path41.default.join(deps.dataDir, "tunnel.json"));
     this.ttlMs = deps.ttlMs ?? DEFAULT_TUNNEL_TTL_MS;
     this.startupTimeoutMs = deps.startupTimeoutMs ?? 15e3;
   }
@@ -53589,7 +53540,7 @@ var TunnelManager = class {
         dataDir: this.deps.dataDir,
         override: this.deps.frpcBinaryOverride ?? void 0
       });
-      const tomlPath = import_node_path40.default.join(this.deps.dataDir, "frpc.toml");
+      const tomlPath = import_node_path41.default.join(this.deps.dataDir, "frpc.toml");
       const proxyName = `clawd-${t.subdomain}-${localPort}-${import_node_crypto10.default.randomBytes(3).toString("hex")}`;
       const toml = buildFrpcToml({
         serverAddr: t.frpsHost,
@@ -53600,14 +53551,14 @@ var TunnelManager = class {
         localPort,
         logLevel: "info"
       });
-      await import_node_fs37.default.promises.writeFile(tomlPath, toml, { mode: 384 });
+      await import_node_fs38.default.promises.writeFile(tomlPath, toml, { mode: 384 });
       const proc = (this.deps.spawnImpl ?? import_node_child_process10.spawn)(frpcBin, ["-c", tomlPath], {
         stdio: ["ignore", "pipe", "pipe"]
       });
-      const logDir = import_node_path40.default.join(this.deps.dataDir, "log");
-      import_node_fs37.default.mkdirSync(logDir, { recursive: true });
-      const logFilePath = import_node_path40.default.join(logDir, "frpc.log");
-      const logStream = import_node_fs37.default.createWriteStream(logFilePath, { flags: "a", mode: 384 });
+      const logDir = import_node_path41.default.join(this.deps.dataDir, "log");
+      import_node_fs38.default.mkdirSync(logDir, { recursive: true });
+      const logFilePath = import_node_path41.default.join(logDir, "frpc.log");
+      const logStream = import_node_fs38.default.createWriteStream(logFilePath, { flags: "a", mode: 384 });
       logStream.on("error", () => {
       });
       const tee = (chunk) => {
@@ -53690,27 +53641,27 @@ async function waitForFrpcReady(proc, timeoutMs) {
 
 // src/tunnel/device-key.ts
 var import_node_os14 = __toESM(require("os"), 1);
-var import_node_path41 = __toESM(require("path"), 1);
+var import_node_path42 = __toESM(require("path"), 1);
 var import_node_crypto11 = __toESM(require("crypto"), 1);
 var DERIVE_SALT = "clawd-tunnel-device-v1";
 function deriveStableDeviceKey(opts = {}) {
   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_path41.default.resolve(import_node_path41.default.join(home, ".clawd"));
-  const normalizedDataDir = opts.dataDir ? import_node_path41.default.resolve(opts.dataDir) : null;
+  const defaultDataDir = import_node_path42.default.resolve(import_node_path42.default.join(home, ".clawd"));
+  const normalizedDataDir = opts.dataDir ? import_node_path42.default.resolve(opts.dataDir) : null;
   const isDefaultDir = normalizedDataDir == null || normalizedDataDir === defaultDataDir;
   const input = isDefaultDir ? `${hostname}::${uid}` : `${hostname}::${uid}::${normalizedDataDir}`;
   return import_node_crypto11.default.createHmac("sha256", DERIVE_SALT).update(input).digest("hex").slice(0, 32);
 }
 
 // src/auth-store.ts
-var import_node_fs38 = __toESM(require("fs"), 1);
-var import_node_path42 = __toESM(require("path"), 1);
+var import_node_fs39 = __toESM(require("fs"), 1);
+var import_node_path43 = __toESM(require("path"), 1);
 var import_node_crypto12 = __toESM(require("crypto"), 1);
 var AUTH_FILE_NAME = "auth.json";
 function authFilePath(dataDir) {
-  return import_node_path42.default.join(dataDir, AUTH_FILE_NAME);
+  return import_node_path43.default.join(dataDir, AUTH_FILE_NAME);
 }
 function loadOrCreateAuthFile(opts) {
   const file = authFilePath(opts.dataDir);
@@ -53718,23 +53669,19 @@ function loadOrCreateAuthFile(opts) {
   const genId = opts.genOwnerPrincipalId ?? defaultGenerateOwnerPrincipalId;
   const now = opts.now ?? (() => /* @__PURE__ */ new Date());
   const existing = readAuthFile(file);
-  if (existing && existing.token && existing.signSecret && existing.visitorTokenSecret && existing.ownerPrincipalId && existing.deviceId && existing.deviceId === existing.ownerPrincipalId) {
+  if (existing && existing.token && existing.ownerPrincipalId && existing.deviceId && existing.deviceId === existing.ownerPrincipalId && !existing.hasLegacySecrets) {
     return {
       token: existing.token,
-      signSecret: existing.signSecret,
-      visitorTokenSecret: existing.visitorTokenSecret,
       ownerPrincipalId: existing.ownerPrincipalId,
       deviceId: existing.deviceId,
       createdAt: existing.createdAt ?? (/* @__PURE__ */ new Date(0)).toISOString()
     };
   }
   const token = existing?.token || generate();
-  const signSecret = existing?.signSecret || generate();
-  const visitorTokenSecret = existing?.visitorTokenSecret || generate();
   const ownerPrincipalId = existing?.ownerPrincipalId || genId();
   const deviceId = ownerPrincipalId;
   const createdAt = existing?.createdAt || now().toISOString();
-  const next = { token, signSecret, visitorTokenSecret, ownerPrincipalId, deviceId, createdAt };
+  const next = { token, ownerPrincipalId, deviceId, createdAt };
   writeAuthFile(file, next);
   return next;
 }
@@ -53746,18 +53693,18 @@ function defaultGenerateOwnerPrincipalId() {
 }
 function readAuthFile(file) {
   try {
-    const raw = import_node_fs38.default.readFileSync(file, "utf8");
+    const raw = import_node_fs39.default.readFileSync(file, "utf8");
     const parsed = JSON.parse(raw);
     if (typeof parsed?.token !== "string" || parsed.token.length === 0) {
       return null;
     }
     return {
       token: parsed.token,
-      signSecret: typeof parsed.signSecret === "string" && parsed.signSecret.length > 0 ? parsed.signSecret : void 0,
-      visitorTokenSecret: typeof parsed.visitorTokenSecret === "string" && parsed.visitorTokenSecret.length > 0 ? parsed.visitorTokenSecret : void 0,
       ownerPrincipalId: typeof parsed.ownerPrincipalId === "string" && parsed.ownerPrincipalId.length > 0 ? parsed.ownerPrincipalId : void 0,
       deviceId: typeof parsed.deviceId === "string" && parsed.deviceId.length > 0 ? parsed.deviceId : void 0,
-      createdAt: typeof parsed.createdAt === "string" ? parsed.createdAt : void 0
+      createdAt: typeof parsed.createdAt === "string" ? parsed.createdAt : void 0,
+      // 单 secret 合并前的旧字段：出现即触发清理写回（值无所谓，硬切不再使用）
+      hasLegacySecrets: "signSecret" in parsed || "visitorTokenSecret" in parsed
     };
   } catch (err) {
     const code = err?.code;
@@ -53766,25 +53713,25 @@ function readAuthFile(file) {
   }
 }
 function writeAuthFile(file, content) {
-  import_node_fs38.default.mkdirSync(import_node_path42.default.dirname(file), { recursive: true });
-  import_node_fs38.default.writeFileSync(file, JSON.stringify(content, null, 2), { mode: 384 });
+  import_node_fs39.default.mkdirSync(import_node_path43.default.dirname(file), { recursive: true });
+  import_node_fs39.default.writeFileSync(file, JSON.stringify(content, null, 2), { mode: 384 });
   try {
-    import_node_fs38.default.chmodSync(file, 384);
+    import_node_fs39.default.chmodSync(file, 384);
   } catch {
   }
 }
 
 // src/owner-profile.ts
-var import_node_fs39 = __toESM(require("fs"), 1);
+var import_node_fs40 = __toESM(require("fs"), 1);
 var import_node_os15 = __toESM(require("os"), 1);
-var import_node_path43 = __toESM(require("path"), 1);
+var import_node_path44 = __toESM(require("path"), 1);
 var PROFILE_FILENAME = "profile.json";
 function loadOwnerDisplayName(dataDir) {
   const fallback = import_node_os15.default.userInfo().username;
-  const profilePath = import_node_path43.default.join(dataDir, PROFILE_FILENAME);
+  const profilePath = import_node_path44.default.join(dataDir, PROFILE_FILENAME);
   let raw;
   try {
-    raw = import_node_fs39.default.readFileSync(profilePath, "utf8");
+    raw = import_node_fs40.default.readFileSync(profilePath, "utf8");
   } catch {
     return fallback;
   }
@@ -53807,18 +53754,18 @@ function loadOwnerDisplayName(dataDir) {
 }
 
 // src/feishu-auth/owner-identity-store.ts
-var import_node_fs40 = __toESM(require("fs"), 1);
-var import_node_path44 = __toESM(require("path"), 1);
+var import_node_fs41 = __toESM(require("fs"), 1);
+var import_node_path45 = __toESM(require("path"), 1);
 var OWNER_IDENTITY_FILE_NAME = "owner-identity.json";
 var OwnerIdentityStore = class {
   file;
   constructor(dataDir) {
-    this.file = import_node_path44.default.join(dataDir, OWNER_IDENTITY_FILE_NAME);
+    this.file = import_node_path45.default.join(dataDir, OWNER_IDENTITY_FILE_NAME);
   }
   read() {
     let raw;
     try {
-      raw = import_node_fs40.default.readFileSync(this.file, "utf8");
+      raw = import_node_fs41.default.readFileSync(this.file, "utf8");
     } catch {
       return null;
     }
@@ -53846,16 +53793,16 @@ var OwnerIdentityStore = class {
     };
   }
   write(record) {
-    import_node_fs40.default.mkdirSync(import_node_path44.default.dirname(this.file), { recursive: true });
-    import_node_fs40.default.writeFileSync(this.file, JSON.stringify(record, null, 2), { mode: 384 });
+    import_node_fs41.default.mkdirSync(import_node_path45.default.dirname(this.file), { recursive: true });
+    import_node_fs41.default.writeFileSync(this.file, JSON.stringify(record, null, 2), { mode: 384 });
     try {
-      import_node_fs40.default.chmodSync(this.file, 384);
+      import_node_fs41.default.chmodSync(this.file, 384);
     } catch {
     }
   }
   clear() {
     try {
-      import_node_fs40.default.unlinkSync(this.file);
+      import_node_fs41.default.unlinkSync(this.file);
     } catch (err) {
       const code = err?.code;
       if (code !== "ENOENT") throw err;
@@ -53992,9 +53939,9 @@ var CentralClientError = class extends Error {
   code;
   cause;
 };
-async function centralRequest(opts, path74, init) {
+async function centralRequest(opts, path75, init) {
   const f = opts.fetchImpl ?? globalThis.fetch;
-  const url = `${opts.api.replace(/\/+$/, "")}${path74}`;
+  const url = `${opts.api.replace(/\/+$/, "")}${path75}`;
   const ctrl = new AbortController();
   const timer = setTimeout(() => ctrl.abort(), opts.timeoutMs ?? 15e3);
   let res;
@@ -54188,8 +54135,8 @@ function verifyConnectToken(args) {
 }
 
 // src/feishu-auth/server-key.ts
-var fs50 = __toESM(require("fs"), 1);
-var path53 = __toESM(require("path"), 1);
+var fs51 = __toESM(require("fs"), 1);
+var path54 = __toESM(require("path"), 1);
 var FILE_NAME2 = "server-signing-key.json";
 var ServerKeyStore = class {
   constructor(dataDir) {
@@ -54197,12 +54144,12 @@ var ServerKeyStore = class {
   }
   dataDir;
   filePath() {
-    return path53.join(this.dataDir, FILE_NAME2);
+    return path54.join(this.dataDir, FILE_NAME2);
   }
   /** 读缓存的公钥；无缓存 / 损坏 → null（调用方决定是否触发拉取） */
   read() {
     try {
-      const raw = fs50.readFileSync(this.filePath(), "utf8");
+      const raw = fs51.readFileSync(this.filePath(), "utf8");
       const parsed = JSON.parse(raw);
       if (typeof parsed.publicKeyPem === "string" && parsed.publicKeyPem.includes("PUBLIC KEY")) {
         return parsed.publicKeyPem;
@@ -54217,12 +54164,12 @@ var ServerKeyStore = class {
       publicKeyPem,
       fetchedAt: (/* @__PURE__ */ new Date()).toISOString()
     };
-    fs50.mkdirSync(this.dataDir, { recursive: true });
-    fs50.writeFileSync(this.filePath(), JSON.stringify(content, null, 2), { mode: 384 });
+    fs51.mkdirSync(this.dataDir, { recursive: true });
+    fs51.writeFileSync(this.filePath(), JSON.stringify(content, null, 2), { mode: 384 });
   }
   clear() {
     try {
-      fs50.unlinkSync(this.filePath());
+      fs51.unlinkSync(this.filePath());
     } catch {
     }
   }
@@ -54235,12 +54182,12 @@ init_protocol();
 init_protocol();
 
 // src/session/fork.ts
-var import_node_fs41 = __toESM(require("fs"), 1);
+var import_node_fs42 = __toESM(require("fs"), 1);
 var import_node_os16 = __toESM(require("os"), 1);
-var import_node_path45 = __toESM(require("path"), 1);
+var import_node_path46 = __toESM(require("path"), 1);
 init_claude_history();
 function readJsonlEntries(file) {
-  const raw = import_node_fs41.default.readFileSync(file, "utf8");
+  const raw = import_node_fs42.default.readFileSync(file, "utf8");
   const out = [];
   for (const line of raw.split("\n")) {
     const t = line.trim();
@@ -54253,19 +54200,19 @@ function readJsonlEntries(file) {
   return out;
 }
 function forkSession(input) {
-  const baseDir = input.baseDir ?? import_node_path45.default.join(import_node_os16.default.homedir(), ".claude");
-  let projectDir = import_node_path45.default.join(baseDir, "projects", cwdToHashDir(input.cwd));
-  let sourceFile = import_node_path45.default.join(projectDir, `${input.toolSessionId}.jsonl`);
-  if (!import_node_fs41.default.existsSync(sourceFile)) {
+  const baseDir = input.baseDir ?? import_node_path46.default.join(import_node_os16.default.homedir(), ".claude");
+  let projectDir = import_node_path46.default.join(baseDir, "projects", cwdToHashDir(input.cwd));
+  let sourceFile = import_node_path46.default.join(projectDir, `${input.toolSessionId}.jsonl`);
+  if (!import_node_fs42.default.existsSync(sourceFile)) {
     const found = findTranscriptByToolSessionId(
-      import_node_path45.default.join(baseDir, "projects"),
+      import_node_path46.default.join(baseDir, "projects"),
       input.toolSessionId
     );
     if (!found) {
       throw new Error(`fork: source transcript not found: ${sourceFile}`);
     }
     sourceFile = found;
-    projectDir = import_node_path45.default.dirname(found);
+    projectDir = import_node_path46.default.dirname(found);
   }
   const entries = readJsonlEntries(sourceFile);
   const mainEntries = entries.filter((e) => e.isSidechain !== true);
@@ -54294,9 +54241,9 @@ function forkSession(input) {
     }
     forkedLines.push(JSON.stringify(forked));
   }
-  const forkedFilePath = import_node_path45.default.join(projectDir, `${forkedToolSessionId}.jsonl`);
-  import_node_fs41.default.mkdirSync(projectDir, { recursive: true });
-  import_node_fs41.default.writeFileSync(forkedFilePath, forkedLines.join("\n") + "\n", { mode: 384 });
+  const forkedFilePath = import_node_path46.default.join(projectDir, `${forkedToolSessionId}.jsonl`);
+  import_node_fs42.default.mkdirSync(projectDir, { recursive: true });
+  import_node_fs42.default.writeFileSync(forkedFilePath, forkedLines.join("\n") + "\n", { mode: 384 });
   return { forkedToolSessionId, forkedFilePath };
 }
 
@@ -54708,7 +54655,7 @@ function buildPermissionHandlers(deps) {
 }
 
 // src/handlers/history.ts
-var path56 = __toESM(require("path"), 1);
+var path57 = __toESM(require("path"), 1);
 init_protocol();
 
 // src/session/recent-dirs.ts
@@ -54726,7 +54673,7 @@ function listRecentDirs(store, limit = 50) {
 }
 
 // src/permission/persona-paths.ts
-var path55 = __toESM(require("path"), 1);
+var path56 = __toESM(require("path"), 1);
 function getAllowedPersonaIds(grants, action) {
   const ids = /* @__PURE__ */ new Set();
   for (const g2 of grants) {
@@ -54739,42 +54686,42 @@ function getAllowedPersonaIds(grants, action) {
   return ids;
 }
 function isGuestPathAllowed(grants, absPath, personaRoot, action = "read", userWorkDir) {
-  const target = path55.resolve(absPath);
+  const target = path56.resolve(absPath);
   if (userWorkDir) {
-    const u = path55.resolve(userWorkDir);
-    const usep = u.endsWith(path55.sep) ? "" : path55.sep;
+    const u = path56.resolve(userWorkDir);
+    const usep = u.endsWith(path56.sep) ? "" : path56.sep;
     if (target === u || target.startsWith(u + usep)) return true;
   }
-  const root = path55.resolve(personaRoot);
-  const sep3 = root.endsWith(path55.sep) ? "" : path55.sep;
+  const root = path56.resolve(personaRoot);
+  const sep3 = root.endsWith(path56.sep) ? "" : path56.sep;
   if (!target.startsWith(root + sep3)) return false;
-  const rel = path55.relative(root, target);
+  const rel = path56.relative(root, target);
   if (!rel || rel.startsWith("..")) return false;
-  const personaId = rel.split(path55.sep)[0];
+  const personaId = rel.split(path56.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 = path55.resolve(personaRoot);
-  const target = path55.resolve(absPath);
-  const sep3 = root.endsWith(path55.sep) ? "" : path55.sep;
+  const root = path56.resolve(personaRoot);
+  const target = path56.resolve(absPath);
+  const sep3 = root.endsWith(path56.sep) ? "" : path56.sep;
   if (!target.startsWith(root + sep3)) return null;
-  const rel = path55.relative(root, target);
+  const rel = path56.relative(root, target);
   if (!rel || rel.startsWith("..")) return null;
-  const id = rel.split(path55.sep)[0];
+  const id = rel.split(path56.sep)[0];
   return id || null;
 }
 function isPathWithin(dir, absPath) {
-  const d = path55.resolve(dir);
-  const t = path55.resolve(absPath);
-  const sep3 = d.endsWith(path55.sep) ? "" : path55.sep;
+  const d = path56.resolve(dir);
+  const t = path56.resolve(absPath);
+  const sep3 = d.endsWith(path56.sep) ? "" : path56.sep;
   return t === d || t.startsWith(d + sep3);
 }
 function isPathInGuestBoundary(personaRoot, personaId, userWorkDir, absPath) {
   if (userWorkDir && isPathWithin(userWorkDir, absPath)) return true;
-  return personaIdFromPath(path55.resolve(absPath), personaRoot) === personaId;
+  return personaIdFromPath(path56.resolve(absPath), personaRoot) === personaId;
 }
 
 // src/handlers/history.ts
@@ -54826,7 +54773,7 @@ function buildHistoryHandlers(deps) {
         if (!pid) return false;
         return isGuestPathAllowed(
           ctx.grants,
-          path56.join(personaRoot, pid),
+          path57.join(personaRoot, pid),
           personaRoot,
           "read",
           userWorkDir
@@ -54838,7 +54785,7 @@ function buildHistoryHandlers(deps) {
   };
   const list = async (frame, _client, ctx) => {
     const args = HistoryListArgs.parse(frame);
-    assertGuestPath(ctx, path56.resolve(args.projectPath), personaRoot, "history:list");
+    assertGuestPath(ctx, path57.resolve(args.projectPath), personaRoot, "history:list");
     const sessions = await history.listSessions(args);
     return { response: { type: "history:list", sessions } };
   };
@@ -54871,13 +54818,13 @@ function buildHistoryHandlers(deps) {
   };
   const subagents = async (frame, _client, ctx) => {
     const args = HistorySubagentsArgs.parse(frame);
-    assertGuestPath(ctx, path56.resolve(args.cwd), personaRoot, "history:subagents", usersRoot);
+    assertGuestPath(ctx, path57.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, path56.resolve(args.cwd), personaRoot, "history:subagent-read", usersRoot);
+    assertGuestPath(ctx, path57.resolve(args.cwd), personaRoot, "history:subagent-read", usersRoot);
     const res = await history.readSubagent(args);
     return { response: { type: "history:subagent-read", ...res } };
   };
@@ -54886,7 +54833,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, path56.resolve(d.cwd), personaRoot, "read", userWorkDir)
+        (d) => isGuestPathAllowed(ctx.grants, path57.resolve(d.cwd), personaRoot, "read", userWorkDir)
       );
       return { response: { type: "history:recentDirs", dirs: filtered } };
     }
@@ -54903,7 +54850,7 @@ function buildHistoryHandlers(deps) {
 }
 
 // src/handlers/workspace.ts
-var path57 = __toESM(require("path"), 1);
+var path58 = __toESM(require("path"), 1);
 var os16 = __toESM(require("os"), 1);
 init_protocol();
 init_protocol();
@@ -54945,22 +54892,22 @@ function buildWorkspaceHandlers(deps) {
     const args = WorkspaceListArgs.parse(frame);
     const isGuest = ctx?.principal.kind === "guest";
     const fallbackCwd = isGuest && personaRoot ? personaRoot : os16.homedir();
-    const resolvedCwd = path57.resolve(args.cwd ?? fallbackCwd);
-    const target = args.path ? path57.resolve(resolvedCwd, args.path) : resolvedCwd;
+    const resolvedCwd = path58.resolve(args.cwd ?? fallbackCwd);
+    const target = args.path ? path58.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 = path57.isAbsolute(args.path) ? path57.resolve(args.path) : path57.resolve(args.cwd, args.path);
+    const target = path58.isAbsolute(args.path) ? path58.resolve(args.path) : path58.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 = path57.resolve(args.cwd);
+    const cwdAbs = path58.resolve(args.cwd);
     assertGuestPath2(ctx, cwdAbs, personaRoot, "skills:list", usersRoot);
     const list2 = await getSkillsForTool(args.tool ?? "claude", cwdAbs);
     if (ctx?.principal.kind === "guest" && personaRoot) {
@@ -54972,7 +54919,7 @@ function buildWorkspaceHandlers(deps) {
   };
   const agentsList = async (frame, _client, ctx) => {
     const args = AgentsListArgs.parse(frame);
-    const cwdAbs = path57.resolve(args.cwd);
+    const cwdAbs = path58.resolve(args.cwd);
     assertGuestPath2(ctx, cwdAbs, personaRoot, "agents:list", usersRoot);
     if (args.tool === "codex") {
       return { response: { type: "agents:list", agents: [] } };
@@ -54994,20 +54941,20 @@ function buildWorkspaceHandlers(deps) {
 }
 
 // src/handlers/git.ts
-var path59 = __toESM(require("path"), 1);
+var path60 = __toESM(require("path"), 1);
 init_protocol();
 init_protocol();
 
 // src/workspace/git.ts
 var import_node_child_process11 = require("child_process");
-var import_node_fs42 = __toESM(require("fs"), 1);
-var import_node_path46 = __toESM(require("path"), 1);
+var import_node_fs43 = __toESM(require("fs"), 1);
+var import_node_path47 = __toESM(require("path"), 1);
 var import_node_util = require("util");
 var pexec = (0, import_node_util.promisify)(import_node_child_process11.execFile);
 function normalizePath(p2) {
-  const resolved = import_node_path46.default.resolve(p2);
+  const resolved = import_node_path47.default.resolve(p2);
   try {
-    return import_node_fs42.default.realpathSync(resolved);
+    return import_node_fs43.default.realpathSync(resolved);
   } catch {
     return resolved;
   }
@@ -55081,7 +55028,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, path59.resolve(cwd), personaRoot, "read", userWorkDir)) {
+  if (!isGuestPathAllowed(ctx.grants, path60.resolve(cwd), personaRoot, "read", userWorkDir)) {
     throw new ClawdError(
       ERROR_CODES.UNAUTHORIZED,
       `guest ${ctx.principal.id} cannot ${method} cwd ${cwd}`
@@ -55826,7 +55773,7 @@ function buildPersonaHandlers(deps) {
 }
 
 // src/handlers/attachment.ts
-var import_node_path47 = __toESM(require("path"), 1);
+var import_node_path48 = __toESM(require("path"), 1);
 init_protocol();
 init_protocol();
 var DEFAULT_TTL_SECONDS = 24 * 3600;
@@ -55842,10 +55789,8 @@ function assertGuestAttachmentPath(ctx, absPath, personaRoot, method, usersRoot)
 }
 function buildAttachmentHandlers(deps) {
   function guardAttachmentPath(ctx, sessionId, candidateAbs, method, nonGuestPolicy) {
-    if (ctx?.principal.kind === "owner") return;
     const scope = deps.getSessionScope?.(sessionId);
-    if (!scope) return;
-    if (scope.kind === "persona" && scope.mode === "guest") {
+    if (scope?.kind === "persona" && scope.mode === "guest") {
       if (!deps.personaRoot) return;
       const userWorkDir = deps.usersRoot ? deriveUserWorkDir(scope.capId, deps.usersRoot) : void 0;
       if (!isPathInGuestBoundary(deps.personaRoot, scope.personaId, userWorkDir, candidateAbs)) {
@@ -55856,6 +55801,8 @@ function buildAttachmentHandlers(deps) {
       }
       return;
     }
+    if (ctx?.principal.kind === "owner") return;
+    if (!scope) return;
     if (nonGuestPolicy === "group-acl") return;
     const cwd = deps.sessionStore?.read(sessionId)?.cwd;
     if (!cwd) return;
@@ -55906,12 +55853,12 @@ function buildAttachmentHandlers(deps) {
         `session ${args.sessionId} scope unresolved`
       );
     }
-    const cwdAbs = import_node_path47.default.resolve(sessionFile.cwd);
-    const candidateAbs = import_node_path47.default.isAbsolute(args.relPath) ? import_node_path47.default.resolve(args.relPath) : import_node_path47.default.resolve(cwdAbs, args.relPath);
+    const cwdAbs = import_node_path48.default.resolve(sessionFile.cwd);
+    const candidateAbs = import_node_path48.default.isAbsolute(args.relPath) ? import_node_path48.default.resolve(args.relPath) : import_node_path48.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_path47.default.isAbsolute(e.relPath) ? import_node_path47.default.resolve(e.relPath) : import_node_path47.default.resolve(cwdAbs, e.relPath);
+      const storedAbs = import_node_path48.default.isAbsolute(e.relPath) ? import_node_path48.default.resolve(e.relPath) : import_node_path48.default.resolve(cwdAbs, e.relPath);
       return storedAbs === candidateAbs && !e.stale;
     });
     if (!entry) {
@@ -55936,7 +55883,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_path47.default.resolve(f.cwd), deps.personaRoot, method, deps.usersRoot);
+    assertGuestAttachmentPath(ctx, import_node_path48.default.resolve(f.cwd), deps.personaRoot, method, deps.usersRoot);
   }
   const groupAdd = async (frame, _client, ctx) => {
     if (!deps.groupFileStore || !deps.getSessionScope) {
@@ -55951,10 +55898,10 @@ function buildAttachmentHandlers(deps) {
     if (!scope) {
       throw new ClawdError(ERROR_CODES.VALIDATION_ERROR, `session ${args.sessionId} not found`);
     }
-    const cwdAbs = import_node_path47.default.resolve(deps.sessionStore?.read(args.sessionId)?.cwd ?? ".");
-    const candidateAbs = import_node_path47.default.isAbsolute(args.relPath) ? import_node_path47.default.resolve(args.relPath) : import_node_path47.default.resolve(cwdAbs, args.relPath);
+    const cwdAbs = import_node_path48.default.resolve(deps.sessionStore?.read(args.sessionId)?.cwd ?? ".");
+    const candidateAbs = import_node_path48.default.isAbsolute(args.relPath) ? import_node_path48.default.resolve(args.relPath) : import_node_path48.default.resolve(cwdAbs, args.relPath);
     guardAttachmentPath(ctx, args.sessionId, candidateAbs, "attachment.groupAdd", "cwd-subtree");
-    const from = ctx?.principal.kind === "owner" ? "owner" : "agent";
+    const from = args.origin === "agent" ? "agent" : ctx?.principal.kind === "owner" ? "owner" : "agent";
     const size = 0;
     const entry = deps.groupFileStore.upsert(scope, args.sessionId, {
       relPath: args.relPath,
@@ -56011,19 +55958,19 @@ function buildAttachmentHandlers(deps) {
 
 // src/handlers/extension.ts
 var import_promises9 = __toESM(require("fs/promises"), 1);
-var import_node_path52 = __toESM(require("path"), 1);
+var import_node_path53 = __toESM(require("path"), 1);
 init_protocol();
 
 // src/extension/bundle-zip.ts
 var import_promises6 = __toESM(require("fs/promises"), 1);
-var import_node_path48 = __toESM(require("path"), 1);
+var import_node_path49 = __toESM(require("path"), 1);
 var import_node_crypto14 = __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_path48.default.join(dir, rel);
+    const abs = import_node_path49.default.join(dir, rel);
     const content = await import_promises6.default.readFile(abs);
     zip.file(rel, content, { date: FIXED_DATE });
   }
@@ -56044,7 +55991,7 @@ async function listFilesSorted(rootDir) {
   return out;
 }
 async function walk(absRoot, relPrefix, out) {
-  const dirAbs = import_node_path48.default.join(absRoot, relPrefix);
+  const dirAbs = import_node_path49.default.join(absRoot, relPrefix);
   const entries = await import_promises6.default.readdir(dirAbs, { withFileTypes: true });
   for (const e of entries) {
     if (IGNORE_BASENAMES.has(e.name)) continue;
@@ -56098,25 +56045,25 @@ function computePublishCheck(args) {
 
 // src/extension/install-flow.ts
 var import_promises7 = __toESM(require("fs/promises"), 1);
-var import_node_path50 = __toESM(require("path"), 1);
+var import_node_path51 = __toESM(require("path"), 1);
 var import_node_os19 = __toESM(require("os"), 1);
 var import_node_crypto15 = __toESM(require("crypto"), 1);
 var import_jszip3 = __toESM(require_lib3(), 1);
 
 // src/extension/paths.ts
 var import_node_os18 = __toESM(require("os"), 1);
-var import_node_path49 = __toESM(require("path"), 1);
+var import_node_path50 = __toESM(require("path"), 1);
 function clawdHomeRoot(override) {
-  return override ?? process.env.CLAWD_HOME ?? import_node_path49.default.join(import_node_os18.default.homedir(), ".clawd");
+  return override ?? process.env.CLAWD_HOME ?? import_node_path50.default.join(import_node_os18.default.homedir(), ".clawd");
 }
 function extensionsRoot(override) {
-  return import_node_path49.default.join(clawdHomeRoot(override), "extensions");
+  return import_node_path50.default.join(clawdHomeRoot(override), "extensions");
 }
 function publishedChannelsFile(override) {
-  return import_node_path49.default.join(clawdHomeRoot(override), "extensions-published.json");
+  return import_node_path50.default.join(clawdHomeRoot(override), "extensions-published.json");
 }
 function bundleCacheRoot(override) {
-  return import_node_path49.default.join(clawdHomeRoot(override), "extension-bundles");
+  return import_node_path50.default.join(clawdHomeRoot(override), "extension-bundles");
 }
 
 // src/extension/install-flow.ts
@@ -56143,7 +56090,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_path50.default.isAbsolute(name)) {
+    if (name.includes("..") || name.startsWith("/") || import_node_path51.default.isAbsolute(name)) {
       throw new InstallError("ZIP_INVALID", `unsafe zip entry: ${name}`);
     }
   }
@@ -56175,7 +56122,7 @@ async function installFromChannel(args, deps) {
     );
   }
   const localExtId = namespacedExtId(ownerSlug, channelRef.ownerPrincipalId);
-  const destDir = import_node_path50.default.join(deps.extensionsRoot, localExtId);
+  const destDir = import_node_path51.default.join(deps.extensionsRoot, localExtId);
   let destExists = false;
   try {
     await import_promises7.default.access(destDir);
@@ -56189,16 +56136,16 @@ async function installFromChannel(args, deps) {
     );
   }
   const stage = await import_promises7.default.mkdtemp(
-    import_node_path50.default.join(import_node_os19.default.tmpdir(), `clawd-ext-install-${localExtId}-`)
+    import_node_path51.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_path50.default.join(stage, name);
+      const dest = import_node_path51.default.join(stage, name);
       if (entry.dir) {
         await import_promises7.default.mkdir(dest, { recursive: true });
         continue;
       }
-      await import_promises7.default.mkdir(import_node_path50.default.dirname(dest), { recursive: true });
+      await import_promises7.default.mkdir(import_node_path51.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));
@@ -56219,7 +56166,7 @@ async function installFromChannel(args, deps) {
 
 // src/extension/update-flow.ts
 var import_promises8 = __toESM(require("fs/promises"), 1);
-var import_node_path51 = __toESM(require("path"), 1);
+var import_node_path52 = __toESM(require("path"), 1);
 var import_node_os20 = __toESM(require("os"), 1);
 var import_node_crypto16 = __toESM(require("crypto"), 1);
 var import_jszip4 = __toESM(require_lib3(), 1);
@@ -56236,11 +56183,11 @@ async function updateFromChannel(args, deps) {
     channelRef.extId,
     channelRef.ownerPrincipalId
   );
-  const liveDir = import_node_path51.default.join(deps.extensionsRoot, localExtId);
+  const liveDir = import_node_path52.default.join(deps.extensionsRoot, localExtId);
   const prevDir = `${liveDir}.prev`;
   let existingVersion;
   try {
-    const raw = await import_promises8.default.readFile(import_node_path51.default.join(liveDir, "manifest.json"), "utf8");
+    const raw = await import_promises8.default.readFile(import_node_path52.default.join(liveDir, "manifest.json"), "utf8");
     const parsed2 = ExtensionManifestSchema.safeParse(JSON.parse(raw));
     if (!parsed2.success) {
       throw new UpdateError(
@@ -56273,7 +56220,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_path51.default.isAbsolute(name)) {
+    if (name.includes("..") || name.startsWith("/") || import_node_path52.default.isAbsolute(name)) {
       throw new UpdateError("ZIP_INVALID", `unsafe zip entry: ${name}`);
     }
   }
@@ -56308,16 +56255,16 @@ async function updateFromChannel(args, deps) {
   await import_promises8.default.rm(prevDir, { recursive: true, force: true });
   await import_promises8.default.rename(liveDir, prevDir);
   const stage = await import_promises8.default.mkdtemp(
-    import_node_path51.default.join(import_node_os20.default.tmpdir(), `clawd-ext-update-${localExtId}-`)
+    import_node_path52.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_path51.default.join(stage, name);
+      const dest = import_node_path52.default.join(stage, name);
       if (entry.dir) {
         await import_promises8.default.mkdir(dest, { recursive: true });
         continue;
       }
-      await import_promises8.default.mkdir(import_node_path51.default.dirname(dest), { recursive: true });
+      await import_promises8.default.mkdir(import_node_path52.default.dirname(dest), { recursive: true });
       if (name === "manifest.json") {
         const rewritten = { ...parsed.data, id: localExtId };
         await import_promises8.default.writeFile(dest, JSON.stringify(rewritten, null, 2));
@@ -56410,7 +56357,7 @@ async function rewriteManifestVersion(root, extId, newVersion, previousPublished
       );
     }
   }
-  const manifestPath = import_node_path52.default.join(root, extId, "manifest.json");
+  const manifestPath = import_node_path53.default.join(root, extId, "manifest.json");
   const manifest = await readManifest(root, extId);
   const next = { ...manifest, version: newVersion };
   const tmp = `${manifestPath}.tmp`;
@@ -56418,7 +56365,7 @@ async function rewriteManifestVersion(root, extId, newVersion, previousPublished
   await import_promises9.default.rename(tmp, manifestPath);
 }
 async function readManifest(root, extId) {
-  const file = import_node_path52.default.join(root, extId, "manifest.json");
+  const file = import_node_path53.default.join(root, extId, "manifest.json");
   let raw;
   try {
     raw = await import_promises9.default.readFile(file, "utf8");
@@ -56509,7 +56456,7 @@ function buildExtensionHandlers(deps) {
   };
   async function buildSnapshotMeta(extId) {
     const manifest = await readManifest(deps.root, extId);
-    const { sha256, buffer } = await bundleExtensionDir(import_node_path52.default.join(deps.root, extId));
+    const { sha256, buffer } = await bundleExtensionDir(import_node_path53.default.join(deps.root, extId));
     return { manifest, contentHash: sha256, buffer };
   }
   const publish = async (frame, _client, ctx) => {
@@ -56690,9 +56637,9 @@ function buildExtensionHandlers(deps) {
 }
 
 // src/app-builder/project-store.ts
-var import_node_fs43 = require("fs");
+var import_node_fs44 = require("fs");
 var import_node_child_process12 = require("child_process");
-var import_node_path53 = require("path");
+var import_node_path54 = require("path");
 init_protocol();
 var PROJECTS_DIR = "projects";
 var META_FILE = ".clawd-project.json";
@@ -56706,19 +56653,19 @@ var ProjectStore = class {
   root;
   /** projects/<name>/.clawd-project.json 路径 */
   metaPath(name) {
-    return (0, import_node_path53.join)(this.projectsRoot(), name, META_FILE);
+    return (0, import_node_path54.join)(this.projectsRoot(), name, META_FILE);
   }
   /** projects/<name>/ 目录路径（cwd 用） */
   projectDir(name) {
-    return (0, import_node_path53.join)(this.projectsRoot(), name);
+    return (0, import_node_path54.join)(this.projectsRoot(), name);
   }
   projectsRoot() {
-    return (0, import_node_path53.join)(this.root, PROJECTS_DIR);
+    return (0, import_node_path54.join)(this.root, PROJECTS_DIR);
   }
   async list() {
     let entries;
     try {
-      entries = await import_node_fs43.promises.readdir(this.projectsRoot());
+      entries = await import_node_fs44.promises.readdir(this.projectsRoot());
     } catch (err) {
       if (err.code === "ENOENT") return [];
       throw err;
@@ -56726,7 +56673,7 @@ var ProjectStore = class {
     const out = [];
     for (const name of entries) {
       try {
-        const raw = await import_node_fs43.promises.readFile(this.metaPath(name), "utf8");
+        const raw = await import_node_fs44.promises.readFile(this.metaPath(name), "utf8");
         const json = JSON.parse(raw);
         let migrated = false;
         if (typeof json.devCommand !== "string" || json.devCommand.length === 0) {
@@ -56737,7 +56684,7 @@ var ProjectStore = class {
         if (parsed.success) {
           out.push(parsed.data);
           if (migrated) {
-            void import_node_fs43.promises.writeFile(this.metaPath(name), JSON.stringify(parsed.data, null, 2) + "\n", "utf8").catch(() => {
+            void import_node_fs44.promises.writeFile(this.metaPath(name), JSON.stringify(parsed.data, null, 2) + "\n", "utf8").catch(() => {
             });
           }
         }
@@ -56781,8 +56728,8 @@ var ProjectStore = class {
       throw new Error(`invalid name "${name}": ${validated.error.message}`);
     }
     const dir = this.projectDir(name);
-    await import_node_fs43.promises.mkdir(dir, { recursive: true });
-    await import_node_fs43.promises.writeFile(this.metaPath(name), JSON.stringify(meta, null, 2) + "\n", "utf8");
+    await import_node_fs44.promises.mkdir(dir, { recursive: true });
+    await import_node_fs44.promises.writeFile(this.metaPath(name), JSON.stringify(meta, null, 2) + "\n", "utf8");
     return meta;
   }
   /**
@@ -56825,7 +56772,7 @@ var ProjectStore = class {
   }
   async delete(name) {
     const dir = this.projectDir(name);
-    await import_node_fs43.promises.rm(dir, { recursive: true, force: true });
+    await import_node_fs44.promises.rm(dir, { recursive: true, force: true });
   }
   async updatePort(name, newPort) {
     if (newPort < PROJECT_PORT_MIN || newPort > PROJECT_PORT_MAX) {
@@ -56841,7 +56788,7 @@ var ProjectStore = class {
       throw new Error(`port ${newPort} already used / \u5DF2\u88AB project "${conflict.name}" \u5360\u7528`);
     }
     const updated = { ...target, port: newPort };
-    await import_node_fs43.promises.writeFile(this.metaPath(name), JSON.stringify(updated, null, 2) + "\n", "utf8");
+    await import_node_fs44.promises.writeFile(this.metaPath(name), JSON.stringify(updated, null, 2) + "\n", "utf8");
     return updated;
   }
   /**
@@ -56858,7 +56805,7 @@ var ProjectStore = class {
     if (!validated.success) {
       throw new Error(`invalid prodUrl "${url}": ${validated.error.message}`);
     }
-    await import_node_fs43.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
+    await import_node_fs44.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
     return validated.data;
   }
   /**
@@ -56879,7 +56826,7 @@ var ProjectStore = class {
     if (!validated.success) {
       throw new Error(`invalid publishJob: ${validated.error.message}`);
     }
-    await import_node_fs43.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
+    await import_node_fs44.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
     return validated.data;
   }
   /** 清掉 .clawd-project.json.publishJob 字段。其他字段保持原样。 */
@@ -56894,7 +56841,7 @@ var ProjectStore = class {
     if (!validated.success) {
       throw new Error(`failed to clear publishJob: ${validated.error.message}`);
     }
-    await import_node_fs43.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
+    await import_node_fs44.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
     return validated.data;
   }
 };
@@ -57015,8 +56962,8 @@ var PublishJobRegistry = class {
 
 // src/app-builder/publish-job-runner.ts
 var import_node_child_process14 = require("child_process");
-var import_node_fs44 = require("fs");
-var import_node_path54 = require("path");
+var import_node_fs45 = require("fs");
+var import_node_path55 = require("path");
 
 // src/app-builder/publish-stage-parser.ts
 var STAGE_RE = /^\s*::stage::(build|deploy|verify)\s*$/;
@@ -57048,10 +56995,10 @@ 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_path54.join)(projDir, ".publish.log");
+  const logPath = (0, import_node_path55.join)(projDir, ".publish.log");
   let logStream = null;
   try {
-    logStream = (0, import_node_fs44.createWriteStream)(logPath, { flags: "w" });
+    logStream = (0, import_node_fs45.createWriteStream)(logPath, { flags: "w" });
   } catch {
     logStream = null;
   }
@@ -57308,8 +57255,8 @@ async function recoverInterruptedJobs(deps) {
 
 // src/handlers/app-builder.ts
 init_protocol();
-var import_node_path55 = require("path");
-var import_node_fs45 = require("fs");
+var import_node_path56 = require("path");
+var import_node_fs46 = require("fs");
 var APP_BUILDER_PERSONAS = ["persona-app-builder", "persona-dataclaw-builder"];
 var DEV_SERVER_READY_TIMEOUT_MS = 3e4;
 async function recoverInterruptedPublishJobs(store, logger) {
@@ -57390,7 +57337,7 @@ function buildAppBuilderHandlers(deps) {
   async function listAllUsersProjects() {
     if (!deps.usersRoot || !deps.getStore) return [];
     const getStore = deps.getStore;
-    const userIds = await import_node_fs45.promises.readdir(deps.usersRoot).catch(() => []);
+    const userIds = await import_node_fs46.promises.readdir(deps.usersRoot).catch(() => []);
     const perUser = await Promise.all(
       userIds.map((uid) => getStore(uid).list().catch(() => []))
     );
@@ -57409,12 +57356,14 @@ function buildAppBuilderHandlers(deps) {
   }
   const listProjects = async (frame, _client, ctx) => {
     const f = frame;
+    const sessionId = typeof f.sessionId === "string" ? f.sessionId : void 0;
     let metas;
-    if (ctx?.principal.kind === "owner" && deps.usersRoot && deps.getStore) {
+    if (sessionId) {
+      metas = await resolveStore({ ctx, sessionId }).list();
+    } else if (ctx?.principal.kind === "owner" && deps.usersRoot && deps.getStore) {
       metas = await listAllUsersProjects();
     } else {
-      const sessionId = typeof f.sessionId === "string" ? f.sessionId : void 0;
-      metas = await resolveStore({ ctx, sessionId }).list();
+      metas = await resolveStore({ ctx }).list();
     }
     return { response: { projects: metas.map(toProjectWithStatus) } };
   };
@@ -57466,8 +57415,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_path55.join)(personaRoot, "extension-kit", "examples", DEFAULT_TEMPLATE);
-      const scaffoldScript = (0, import_node_path55.join)(deps.deployKitRoot, "scripts", "new-extension.sh");
+      const templateSrcDir = (0, import_node_path56.join)(personaRoot, "extension-kit", "examples", DEFAULT_TEMPLATE);
+      const scaffoldScript = (0, import_node_path56.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,
@@ -57688,7 +57637,7 @@ function buildAppBuilderHandlers(deps) {
       await userStore.clearPublishJob(args.name);
     }
     const personaRoot = deps.resolvePersonaRoot ? deps.resolvePersonaRoot(boundSession.ownerPersonaId ?? "") : deps.personaRoot;
-    const scriptPath = (0, import_node_path55.join)(deps.deployKitRoot, "scripts", "publish.sh");
+    const scriptPath = (0, import_node_path56.join)(deps.deployKitRoot, "scripts", "publish.sh");
     deps.logger?.info("app-builder.publish.start", {
       name: args.name,
       sessionId: boundSession.sessionId,
@@ -57864,7 +57813,7 @@ function buildVisitorHandlers(deps) {
 
 // src/extension/registry.ts
 var import_promises10 = __toESM(require("fs/promises"), 1);
-var import_node_path56 = __toESM(require("path"), 1);
+var import_node_path57 = __toESM(require("path"), 1);
 async function loadAll(root) {
   let entries;
   try {
@@ -57877,13 +57826,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_path56.default.join(root, ent.name), ent.name));
+    records.push(await loadOne(import_node_path57.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_path56.default.join(dir, "manifest.json");
+  const manifestPath = import_node_path57.default.join(dir, "manifest.json");
   let raw;
   try {
     raw = await import_promises10.default.readFile(manifestPath, "utf8");
@@ -57928,7 +57877,7 @@ async function loadOne(dir, dirName) {
 
 // src/extension/uninstall.ts
 var import_promises11 = __toESM(require("fs/promises"), 1);
-var import_node_path57 = __toESM(require("path"), 1);
+var import_node_path58 = __toESM(require("path"), 1);
 var UninstallError = class extends Error {
   constructor(code, message) {
     super(message);
@@ -57937,7 +57886,7 @@ var UninstallError = class extends Error {
   code;
 };
 async function uninstall(deps) {
-  const dir = import_node_path57.default.join(deps.root, deps.extId);
+  const dir = import_node_path58.default.join(deps.root, deps.extId);
   try {
     await import_promises11.default.access(dir);
   } catch {
@@ -58524,6 +58473,21 @@ var METHOD_GRANT_MAP = {
   // ---- shift:* (排班 mock，owner-only 读) ----
   // mock 阶段只 owner 用；接 guest 后再考虑分级
   "shift:list": ADMIN_ANY,
+  // ---- shift-internal:* + inbox:sendDm + personaDispatch complete/list ----
+  // 统一 RPC 鉴权（spec 2026-07-28）：原 /api/rpc 白名单 method 收编。调用方 = 本机
+  // MCP server 持 owner token → ADMIN_ANY 即「owner token 即可」；业务归因（sendDm 的
+  // sender、shift 的 personaId）在 handler 内按 body 字段处理，与鉴权无关。
+  "shift-internal:add": ADMIN_ANY,
+  "shift-internal:list": ADMIN_ANY,
+  "shift-internal:cancel": ADMIN_ANY,
+  "shift-internal:update": ADMIN_ANY,
+  "shift-internal:history": ADMIN_ANY,
+  "inbox:sendDm": ADMIN_ANY,
+  "personaDispatch:complete": ADMIN_ANY,
+  "personaDispatch:list": ADMIN_ANY,
+  // 跨设备轮询（spec §5）：A 端 daemon 凭 connect token 查 outcome；handler 内校验
+  // 台账行 sourceSessionId === ctx.principal.id，防 guest 查别人的 dispatch。
+  "personaDispatch:get": CAPABILITY_SCOPED,
   "skills:list": CAPABILITY_SCOPED,
   "agents:list": CAPABILITY_SCOPED,
   "git:root": CAPABILITY_SCOPED,
@@ -58543,7 +58507,7 @@ var METHOD_GRANT_MAP = {
   "persona:delete": ADMIN_ANY,
   // 跨设备 dispatch：A 的 peer daemon 凭 connect token 经 /rpc 调进来；dispatcher 放行，
   // run handler 内做 persona.public + assertGrant(send) 双重校验（guest grants 是 wildcard，
-  // 单 assertGrant 不够）。本地 cc 仍走 /api/rpc（EXPOSED_RPC_METHODS），不经此表。
+  // 单 assertGrant 不够）。本地 MCP server 经 /rpc + Bearer 进来，同过此表（owner 恒过）。
   "personaDispatch:run": CAPABILITY_SCOPED,
   // 跨设备 exec（spec 2026-07-16）：public——"能连上=有 auth"，业务在 handler 校
   // （ensureGuest + remoteAccessAllowed），跟 inbox:postMessage 同模式。
@@ -58655,7 +58619,7 @@ async function dispatchRpc(method, frame, client, ctx, deps) {
 
 // src/extension/runtime.ts
 var import_node_child_process17 = require("child_process");
-var import_node_path58 = __toESM(require("path"), 1);
+var import_node_path59 = __toESM(require("path"), 1);
 var import_promises12 = require("timers/promises");
 
 // src/extension/port-allocator.ts
@@ -58756,7 +58720,7 @@ var Runtime = class {
       /\$CLAWOS_EXT_PORT/g,
       String(port)
     );
-    const dir = import_node_path58.default.join(this.root, extId);
+    const dir = import_node_path59.default.join(this.root, extId);
     const env = {
       ...process.env,
       CLAWOS_EXT_PORT: String(port),
@@ -58868,7 +58832,7 @@ ${handle.stderrTail}`
 
 // src/extension/published-channels.ts
 var import_promises13 = __toESM(require("fs/promises"), 1);
-var import_node_path59 = __toESM(require("path"), 1);
+var import_node_path60 = __toESM(require("path"), 1);
 init_zod();
 var PublishedChannelsError = class extends Error {
   constructor(code, message) {
@@ -58967,7 +58931,7 @@ var PublishedChannelStore = class {
       )
     };
     const tmp = `${this.filePath}.tmp`;
-    await import_promises13.default.mkdir(import_node_path59.default.dirname(this.filePath), { recursive: true });
+    await import_promises13.default.mkdir(import_node_path60.default.dirname(this.filePath), { recursive: true });
     await import_promises13.default.writeFile(tmp, JSON.stringify(data, null, 2), { mode: 384 });
     await import_promises13.default.rename(tmp, this.filePath);
   }
@@ -58975,7 +58939,7 @@ var PublishedChannelStore = class {
 
 // src/extension/bundle-cache.ts
 var import_promises14 = __toESM(require("fs/promises"), 1);
-var import_node_path60 = __toESM(require("path"), 1);
+var import_node_path61 = __toESM(require("path"), 1);
 var BundleCache = class {
   constructor(rootDir) {
     this.rootDir = rootDir;
@@ -58984,14 +58948,14 @@ var BundleCache = class {
   /** Atomic write: stage tmp → rename. Caller passes the hex sha256. */
   async write(snapshotHash, buffer) {
     await import_promises14.default.mkdir(this.rootDir, { recursive: true });
-    const file = import_node_path60.default.join(this.rootDir, `${snapshotHash}.zip`);
+    const file = import_node_path61.default.join(this.rootDir, `${snapshotHash}.zip`);
     const tmp = `${file}.tmp`;
     await import_promises14.default.writeFile(tmp, buffer, { mode: 384 });
     await import_promises14.default.rename(tmp, file);
   }
   /** Returns the bundle bytes, or null when the file doesn't exist. */
   async read(snapshotHash) {
-    const file = import_node_path60.default.join(this.rootDir, `${snapshotHash}.zip`);
+    const file = import_node_path61.default.join(this.rootDir, `${snapshotHash}.zip`);
     try {
       return await import_promises14.default.readFile(file);
     } catch (e) {
@@ -59001,7 +58965,7 @@ var BundleCache = class {
   }
   /** Idempotent — missing file is not an error. */
   async delete(snapshotHash) {
-    const file = import_node_path60.default.join(this.rootDir, `${snapshotHash}.zip`);
+    const file = import_node_path61.default.join(this.rootDir, `${snapshotHash}.zip`);
     await import_promises14.default.rm(file, { force: true });
   }
 };
@@ -59024,24 +58988,24 @@ async function startDaemon(config) {
     sampling: logShippingCfg.sampling,
     homeDir: import_node_os22.default.homedir()
   });
-  const logDir = import_node_path61.default.join(config.dataDir, "log");
-  import_node_fs46.default.mkdirSync(logDir, { recursive: true });
+  const logDir = import_node_path62.default.join(config.dataDir, "log");
+  import_node_fs47.default.mkdirSync(logDir, { recursive: true });
   const logger = createLogger({
     level: config.logLevel,
-    file: import_node_path61.default.join(logDir, "clawd.log"),
+    file: import_node_path62.default.join(logDir, "clawd.log"),
     logClient
   });
   logger.info("starting clawd", { version, config: { port: config.port, host: config.host, dataDir: config.dataDir } });
   const screenIdleProbeLogger = createFileOnlyLogger({
-    file: import_node_path61.default.join(logDir, "screen-idle-probe.log"),
+    file: import_node_path62.default.join(logDir, "screen-idle-probe.log"),
     level: "debug"
   });
   logger.info("screen-idle probe logger enabled", {
-    file: import_node_path61.default.join(logDir, "screen-idle-probe.log")
+    file: import_node_path62.default.join(logDir, "screen-idle-probe.log")
   });
   const CAP_TARGETS = [
-    import_node_path61.default.join(logDir, "clawd.log"),
-    import_node_path61.default.join(logDir, "screen-idle-probe.log")
+    import_node_path62.default.join(logDir, "clawd.log"),
+    import_node_path62.default.join(logDir, "screen-idle-probe.log")
   ];
   const LOG_CAP_MAX_BYTES = 10 * 1024 * 1024;
   const LOG_CAP_KEEP_BYTES = 5 * 1024 * 1024;
@@ -59065,12 +59029,7 @@ async function startDaemon(config) {
   if (pre.status === "stale") {
     logger.warn("stale state file detected, overwriting", { pid: pre.existing.pid });
   }
-  let resolvedAuthToken = null;
-  if (config.authToken && config.authToken.trim()) {
-    resolvedAuthToken = config.authToken.trim();
-  } else if (config.tunnel) {
-    resolvedAuthToken = authFile.token;
-  }
+  const resolvedAuthToken = config.authToken && config.authToken.trim() ? config.authToken.trim() : authFile.token;
   const ownerIdentityStore = new OwnerIdentityStore(config.dataDir);
   const feishuIdentity = ownerIdentityStore.read();
   let feishuActive = feishuIdentity !== null;
@@ -59079,7 +59038,7 @@ async function startDaemon(config) {
   let ownerProvider = feishuIdentity?.identity.provider ?? "";
   let ownerDisplayName = feishuIdentity?.identity.displayName ?? loadOwnerDisplayName(config.dataDir);
   let ownerFeishuUnionId = feishuIdentity?.identity.unionId;
-  const authMode = resolvedAuthToken == null ? "none" : "first-message";
+  const authMode = "first-message";
   const inboxStore = new InboxStore(config.dataDir);
   const inboxManager = new InboxManager(inboxStore, (_peerDeviceId, frame) => {
     wsServer?.broadcastToOwners(frame);
@@ -59095,7 +59054,7 @@ async function startDaemon(config) {
     // persona web 分享：访客 visitor token = daemon 自签 HMAC（无 aud），独立于飞书 connect token
     // 基建——secret 恒存在（auth-store backfill），故无条件注入。验签 ok → guest ctx（persona wildcard）。
     verifyVisitorToken: (t) => {
-      const r = verifyVisitorToken(authFile.visitorTokenSecret, t, Math.floor(Date.now() / 1e3));
+      const r = verifyVisitorToken(authFile.token, t, Math.floor(Date.now() / 1e3));
       return r.ok ? { ok: true, payload: r.payload } : { ok: false };
     },
     ...feishuActive ? {
@@ -59143,8 +59102,8 @@ async function startDaemon(config) {
   const agents = new AgentsScanner();
   const history = new ClaudeHistoryReader();
   let transport = null;
-  const personaStore = new PersonaStore(import_node_path61.default.join(config.dataDir, "personas"));
-  const usersRoot = import_node_path61.default.join(config.dataDir, "users");
+  const personaStore = new PersonaStore(import_node_path62.default.join(config.dataDir, "personas"));
+  const usersRoot = import_node_path62.default.join(config.dataDir, "users");
   const defaultsRoot = findDefaultsRoot(logger);
   if (defaultsRoot) {
     seedDefaultPersonas({ store: personaStore, defaultsRoot, logger });
@@ -59164,7 +59123,7 @@ async function startDaemon(config) {
   migrateCodexSandbox({ store: personaStore, logger });
   const groupFileStore = new GroupFileStore({ dataDir: config.dataDir, logger });
   const dispatchStore = createDispatchStore({
-    filePath: import_node_path61.default.join(config.dataDir, "dispatch.json"),
+    filePath: import_node_path62.default.join(config.dataDir, "dispatch.json"),
     now: () => Date.now(),
     onFlushError: (err) => logger.error("dispatch store flush failed", {
       reason: err instanceof Error ? err.message : String(err)
@@ -59179,20 +59138,23 @@ async function startDaemon(config) {
     now: () => Date.now(),
     onCompleted: (sid) => deliverPendingRef?.(sid)
   });
-  const here = typeof __dirname === "string" ? __dirname : import_node_path61.default.dirname((0, import_node_url4.fileURLToPath)(import_meta6.url));
+  const here = typeof __dirname === "string" ? __dirname : import_node_path62.default.dirname((0, import_node_url4.fileURLToPath)(import_meta6.url));
   const mcpConfigs = [];
+  const mcpDaemonUrl = `http://127.0.0.1:${config.port}`;
   const dispatchServerCandidates = [
-    import_node_path61.default.join(here, "dispatch", "mcp-server.cjs"),
+    import_node_path62.default.join(here, "dispatch", "mcp-server.cjs"),
     // 生产 dist/index → dist/dispatch/mcp-server.cjs
-    import_node_path61.default.join(here, "..", "dist", "dispatch", "mcp-server.cjs")
+    import_node_path62.default.join(here, "..", "dist", "dispatch", "mcp-server.cjs")
     // dev tsx src/index → ../dist/dispatch/mcp-server.cjs
   ];
-  const dispatchServerScriptPath = dispatchServerCandidates.find((p2) => import_node_fs46.default.existsSync(p2));
+  const dispatchServerScriptPath = dispatchServerCandidates.find((p2) => import_node_fs47.default.existsSync(p2));
   if (dispatchServerScriptPath) {
-    const dispatchLogPath = import_node_path61.default.join(logDir, "dispatch-mcp-server.log");
+    const dispatchLogPath = import_node_path62.default.join(logDir, "dispatch-mcp-server.log");
     const dispatchCfgPath = writeDispatchMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: dispatchServerScriptPath,
+      daemonToken: resolvedAuthToken,
+      daemonUrl: mcpDaemonUrl,
       logPath: dispatchLogPath
     });
     mcpConfigs.push({ id: DISPATCH_MCP_ID, path: dispatchCfgPath });
@@ -59207,17 +59169,19 @@ async function startDaemon(config) {
     });
   }
   const ticketServerCandidates = [
-    import_node_path61.default.join(here, "ticket", "mcp-server.cjs"),
-    import_node_path61.default.join(here, "..", "dist", "ticket", "mcp-server.cjs")
+    import_node_path62.default.join(here, "ticket", "mcp-server.cjs"),
+    import_node_path62.default.join(here, "..", "dist", "ticket", "mcp-server.cjs")
   ];
-  const ticketServerScriptPath = ticketServerCandidates.find((p2) => import_node_fs46.default.existsSync(p2));
+  const ticketServerScriptPath = ticketServerCandidates.find((p2) => import_node_fs47.default.existsSync(p2));
   if (ticketServerScriptPath) {
-    const ticketLogPath = import_node_path61.default.join(logDir, "ticket-mcp-server.log");
+    const ticketLogPath = import_node_path62.default.join(logDir, "ticket-mcp-server.log");
     const ticketCfgPath = writeTicketMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: ticketServerScriptPath,
       apiBaseUrl: config.clawosApi ?? DEFAULT_CLAWOS_API,
       apiKey: resolveClawdTicketsApiKey(),
+      daemonToken: resolvedAuthToken,
+      daemonUrl: mcpDaemonUrl,
       logPath: ticketLogPath
     });
     mcpConfigs.push({ id: "ticket", path: ticketCfgPath });
@@ -59232,15 +59196,17 @@ async function startDaemon(config) {
     });
   }
   const shiftServerCandidates = [
-    import_node_path61.default.join(here, "shift", "mcp-server.cjs"),
-    import_node_path61.default.join(here, "..", "dist", "shift", "mcp-server.cjs")
+    import_node_path62.default.join(here, "shift", "mcp-server.cjs"),
+    import_node_path62.default.join(here, "..", "dist", "shift", "mcp-server.cjs")
   ];
-  const shiftServerScriptPath = shiftServerCandidates.find((p2) => import_node_fs46.default.existsSync(p2));
+  const shiftServerScriptPath = shiftServerCandidates.find((p2) => import_node_fs47.default.existsSync(p2));
   if (shiftServerScriptPath) {
-    const shiftLogPath = import_node_path61.default.join(logDir, "shift-mcp-server.log");
+    const shiftLogPath = import_node_path62.default.join(logDir, "shift-mcp-server.log");
     const shiftCfgPath = await writeShiftMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: shiftServerScriptPath,
+      daemonToken: resolvedAuthToken,
+      daemonUrl: mcpDaemonUrl,
       logPath: shiftLogPath
     });
     mcpConfigs.push({ id: "shift", path: shiftCfgPath });
@@ -59256,15 +59222,17 @@ async function startDaemon(config) {
     );
   }
   const inboxServerCandidates = [
-    import_node_path61.default.join(here, "inbox", "mcp-server.cjs"),
-    import_node_path61.default.join(here, "..", "dist", "inbox", "mcp-server.cjs")
+    import_node_path62.default.join(here, "inbox", "mcp-server.cjs"),
+    import_node_path62.default.join(here, "..", "dist", "inbox", "mcp-server.cjs")
   ];
-  const inboxServerScriptPath = inboxServerCandidates.find((p2) => import_node_fs46.default.existsSync(p2));
+  const inboxServerScriptPath = inboxServerCandidates.find((p2) => import_node_fs47.default.existsSync(p2));
   if (inboxServerScriptPath) {
-    const inboxLogPath = import_node_path61.default.join(logDir, "inbox-mcp-server.log");
+    const inboxLogPath = import_node_path62.default.join(logDir, "inbox-mcp-server.log");
     const inboxCfgPath = await writeInboxMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: inboxServerScriptPath,
+      daemonToken: resolvedAuthToken,
+      daemonUrl: mcpDaemonUrl,
       logPath: inboxLogPath
     });
     mcpConfigs.push({ id: "inbox", path: inboxCfgPath });
@@ -59280,14 +59248,16 @@ async function startDaemon(config) {
     );
   }
   const peerOpsServerCandidates = [
-    import_node_path61.default.join(here, "peer-ops", "mcp-server.cjs"),
-    import_node_path61.default.join(here, "..", "dist", "peer-ops", "mcp-server.cjs")
+    import_node_path62.default.join(here, "peer-ops", "mcp-server.cjs"),
+    import_node_path62.default.join(here, "..", "dist", "peer-ops", "mcp-server.cjs")
   ];
-  const peerOpsServerScriptPath = peerOpsServerCandidates.find((p2) => import_node_fs46.default.existsSync(p2));
+  const peerOpsServerScriptPath = peerOpsServerCandidates.find((p2) => import_node_fs47.default.existsSync(p2));
   if (peerOpsServerScriptPath) {
     const peerOpsCfgPath = writePeerOpsMcpConfig({
       dataDir: config.dataDir,
-      serverScriptPath: peerOpsServerScriptPath
+      serverScriptPath: peerOpsServerScriptPath,
+      daemonToken: resolvedAuthToken,
+      daemonUrl: mcpDaemonUrl
     });
     mcpConfigs.push({ id: "peer-ops", path: peerOpsCfgPath });
     logger.info("peer-ops.mcp.json written", {
@@ -59300,8 +59270,34 @@ async function startDaemon(config) {
       { tried: peerOpsServerCandidates }
     );
   }
+  const rpcToolServerCandidates = [
+    import_node_path62.default.join(here, "rpc-tool", "mcp-server.cjs"),
+    import_node_path62.default.join(here, "..", "dist", "rpc-tool", "mcp-server.cjs")
+  ];
+  const rpcToolServerScriptPath = rpcToolServerCandidates.find((p2) => import_node_fs47.default.existsSync(p2));
+  if (rpcToolServerScriptPath) {
+    const rpcToolLogPath = import_node_path62.default.join(logDir, "rpc-tool-mcp-server.log");
+    const rpcToolCfgPath = writeRpcToolMcpConfig({
+      dataDir: config.dataDir,
+      serverScriptPath: rpcToolServerScriptPath,
+      daemonToken: resolvedAuthToken,
+      daemonUrl: mcpDaemonUrl,
+      logPath: rpcToolLogPath
+    });
+    mcpConfigs.push({ id: "rpc-tool", path: rpcToolCfgPath });
+    logger.info("rpc-tool.mcp.json written", {
+      path: rpcToolCfgPath,
+      server: rpcToolServerScriptPath,
+      serverLog: rpcToolLogPath
+    });
+  } else {
+    logger.warn(
+      "rpc-tool-mcp-server.cjs not found; clawd-rpc call tool disabled (dev tsx \u6A21\u5F0F\u4E0B\u9700\u5148\u8DD1\u8FC7 build)",
+      { tried: rpcToolServerCandidates }
+    );
+  }
   const shiftStore = createShiftStore({
-    filePath: import_node_path61.default.join(config.dataDir, "shift.json"),
+    filePath: import_node_path62.default.join(config.dataDir, "shift.json"),
     ownerIdProvider: () => ownerPrincipalId,
     now: () => Date.now()
   });
@@ -59323,7 +59319,7 @@ async function startDaemon(config) {
     getAdapter,
     historyReader: history,
     dataDir: config.dataDir,
-    personaRoot: import_node_path61.default.join(config.dataDir, "personas"),
+    personaRoot: import_node_path62.default.join(config.dataDir, "personas"),
     // dispatch / shift 自动化 spawn 按 persona 绑定 tool 起 B session（codex persona 用 codex）。
     // personaRegistry 声明在 manager 之后（同作用域 const，调用时机在启动完成后，无 TDZ 风险）。
     getPersonaTool: (personaId) => personaRegistry.get(personaId)?.tool,
@@ -59338,7 +59334,7 @@ async function startDaemon(config) {
     contactStore,
     mode: config.mode,
     // 单栏 refactor (spec 2026-06-02 §5.1)：cc 子进程 env CLAWD_DAEMON_URL 闭包来源。
-    // assistant 用 curl 调本机 daemon HTTP RPC adapter（/api/rpc/<method>）触发 appBuilder.* 管理操作。
+    // MCP server 用它拼 /rpc/<method>（Bearer CLAWD_DAEMON_TOKEN）调本机 daemon。
     // 127.0.0.1（不是 config.host）—— cc 跑在本机，loopback 最稳；外部访问限制 + http-router
     // 的 isLoopback 兜底已确保安全。
     getDaemonUrl: () => `http://127.0.0.1:${config.port}`,
@@ -59374,10 +59370,10 @@ async function startDaemon(config) {
     // 文件可能 agent 写完又被自己删（罕见），用 size=0 / fallback mime 兜底。
     attachmentGroup: {
       onFileEdit: (input) => {
-        const absPath = import_node_path61.default.isAbsolute(input.relPath) ? input.relPath : import_node_path61.default.join(input.cwd, input.relPath);
+        const absPath = import_node_path62.default.isAbsolute(input.relPath) ? input.relPath : import_node_path62.default.join(input.cwd, input.relPath);
         let size = 0;
         try {
-          size = import_node_fs46.default.statSync(absPath).size;
+          size = import_node_fs47.default.statSync(absPath).size;
         } catch (err) {
           logger.warn("attachment.onFileEdit stat failed", {
             sessionId: input.sessionId,
@@ -59545,7 +59541,7 @@ async function startDaemon(config) {
   });
   const visitorStore = createVisitorStore({ dir: config.dataDir });
   const exchangeVisitorToken = buildVisitorLogin({
-    getSecret: () => authFile.visitorTokenSecret,
+    getSecret: () => authFile.token,
     fetchUserInfo: (ttcToken) => fetchTtcUserInfo({ apiBase: TTC_HOSTS.api, token: ttcToken }),
     visitorStore,
     now: () => Date.now(),
@@ -59601,18 +59597,17 @@ async function startDaemon(config) {
       groupFileStore,
       sessionStore: { read: (sid) => manager.findOwnedSession(sid) },
       getHttpBaseUrl,
-      // HMAC sign secret：~/.clawd/auth.json signSecret 字段（与 WS Bearer token 独立）。
-      // --auth-token CLI 模式 / noAuth 模式 authFile 为 null → handler 自己返 NOT_IMPLEMENTED。
-      getSignSecret: () => authFile?.signSecret ?? "",
+      // HMAC sign secret = auth.json 唯一 token（authFile 恒非空，startDaemon 开头加载）。
+      getSignSecret: () => authFile.token,
       // group RPC + sign 都用：根据 sessionId 反查 scope。owner-mode persona session 走
       // 'persona/<pid>/owner'，default 走 'default'。
       getSessionScope: (sid) => manager.findOwnedSessionScope(sid),
       // guest path guard：candidate 必须在 personaRoot 子树或调用者自己的 user-dir 下
-      personaRoot: import_node_path61.default.join(config.dataDir, "personas"),
+      personaRoot: import_node_path62.default.join(config.dataDir, "personas"),
       usersRoot
     },
     // workspace/git/history/skills/agents handler 共用的 guest path guard 锚点
-    personaRoot: import_node_path61.default.join(config.dataDir, "personas"),
+    personaRoot: import_node_path62.default.join(config.dataDir, "personas"),
     // v2 多人 persona 隔离：handler 派生 guest user-dir 放行
     usersRoot,
     // v2 Phase 6: whoami handler 装在 owner principal.displayName + persona 解析
@@ -59741,11 +59736,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_path61.default.join(config.dataDir, "personas", "persona-app-builder"),
+    appBuilderPersonaRoot: import_node_path62.default.join(config.dataDir, "personas", "persona-app-builder"),
     // 共享 deploy-kit 根：scaffold/publish 脚本骨架 + 阿里云凭证单一真源。
-    deployKitRoot: import_node_path61.default.join(config.dataDir, "deploy-kit"),
+    deployKitRoot: import_node_path62.default.join(config.dataDir, "deploy-kit"),
     // scaffold/publish 按当前 session 的 persona 解析其安装根，让每个 persona 用自己的模板/注入配置。
-    resolvePersonaRoot: (personaId) => import_node_path61.default.join(config.dataDir, "personas", personaId),
+    resolvePersonaRoot: (personaId) => import_node_path62.default.join(config.dataDir, "personas", personaId),
     // 发布上线脚手架化 (spec 2026-06-03 §5.2.2):
     // 复用 SessionManagerDeps.broadcastFrame 同款 dispatch 逻辑 —— runner 调 manager.send
     // 取回 broadcast 帧后逐帧 push 到 transport，跟 manager 自身的 deps 一致。
@@ -59791,7 +59786,7 @@ async function startDaemon(config) {
       }
       let sourceJsonlPath = "(no transcript yet \u2014 operate from the task description alone)";
       if (sourceFile && sourceFile.toolSessionId) {
-        sourceJsonlPath = import_node_path61.default.join(
+        sourceJsonlPath = import_node_path62.default.join(
           import_node_os22.default.homedir(),
           ".claude",
           "projects",
@@ -59861,17 +59856,6 @@ async function startDaemon(config) {
   const authResolver = new AuthContextResolver({
     ownerToken: resolvedAuthToken
   });
-  const rpcDispatcher = {
-    async dispatch(method, args, _ctx) {
-      const handler = resolveExposedHandler(handlers, method);
-      if (!handler) {
-        throw Object.assign(new Error(`unknown RPC method "${method}"`), { code: "METHOD_NOT_IMPLEMENTED" });
-      }
-      const emptyClient = {};
-      const result = await handler(args, emptyClient);
-      return result.response;
-    }
-  };
   const authedRpc = {
     authenticate: (token) => authenticate(token, buildConnectAuthDeps()),
     dispatch: (method, body, ctx) => {
@@ -59896,17 +59880,15 @@ async function startDaemon(config) {
     daemonVersion: version,
     logger,
     sessionStore: store,
-    rpcDispatcher,
     authedRpc,
     ...viewerAssetLoader ? { viewerAssetLoader } : {},
     // persona web 分享：访客换 token（POST /share/exchange）+ guest SPA serve（GET /s）
     visitorExchange: exchangeVisitorToken,
     ...shareUiAssetLoader ? { shareUiAssetLoader } : {},
-    // /files HMAC verify 用 auth.json 的 signSecret 字段（与 attachment.signUrl 同源）。
-    // --auth-token CLI 模式没 signSecret → 路由返 501，sign URL 功能整体禁用。
-    getSignSecret: () => authFile?.signSecret ?? null,
+    // /files HMAC verify 用 auth.json token（与 attachment.signUrl 同源）。
+    getSignSecret: () => authFile.token,
     // chatinput 附件上传（POST /attachments/upload，spec §6.1）。upload pipeline
-    // 在 session.cwd 下的 .attachments/ 落盘；signSecret 与 /files HMAC 同源；
+    // 在 session.cwd 下的 .attachments/ 落盘；签名 secret 与 /files HMAC 同源；
     // tunnel 未启时返 503 TUNNEL_NOT_READY 让前端显式提示。
     attachmentUpload: {
       groupFileStore,
@@ -59987,7 +59969,7 @@ async function startDaemon(config) {
     // （非 persona-web 场景静默 return null；tunnel 模式走 AuthGate 不经此路）。参数名
     // tryVerifyCapabilityToken 不再准确，跨 local-ws-server 改名属 followup 清理。
     tryVerifyCapabilityToken: (token) => {
-      const vis = verifyVisitorToken(authFile.visitorTokenSecret, token, Math.floor(Date.now() / 1e3));
+      const vis = verifyVisitorToken(authFile.token, token, Math.floor(Date.now() / 1e3));
       if (vis.ok) return visitorGuestContext(vis.payload);
       return null;
     },
@@ -60106,8 +60088,8 @@ async function startDaemon(config) {
       const lines = [
         `Tunnel:      ${r.url}`,
         ...resolvedAuthToken ? [`Connect:     ${connectUrl}`] : [],
-        `Frpc config: ${import_node_path61.default.join(config.dataDir, "frpc.toml")}`,
-        `Frpc log:    ${import_node_path61.default.join(logDir, "frpc.log")}`
+        `Frpc config: ${import_node_path62.default.join(config.dataDir, "frpc.toml")}`,
+        `Frpc log:    ${import_node_path62.default.join(logDir, "frpc.log")}`
       ];
       const width = Math.max(...lines.map((l) => l.length));
       const bar = "\u2550".repeat(width + 4);
@@ -60120,8 +60102,8 @@ ${bar}
 
 `);
       try {
-        const connectPath = import_node_path61.default.join(config.dataDir, "connect.txt");
-        import_node_fs46.default.writeFileSync(connectPath, lines.join("\n") + "\n", { mode: 384 });
+        const connectPath = import_node_path62.default.join(config.dataDir, "connect.txt");
+        import_node_fs47.default.writeFileSync(connectPath, lines.join("\n") + "\n", { mode: 384 });
       } catch {
       }
     } catch (err) {
@@ -60193,9 +60175,9 @@ ${bar}
   };
 }
 function migrateDropPersonsDir(dataDir) {
-  const dir = import_node_path61.default.join(dataDir, "persons");
+  const dir = import_node_path62.default.join(dataDir, "persons");
   try {
-    import_node_fs46.default.rmSync(dir, { recursive: true, force: true });
+    import_node_fs47.default.rmSync(dir, { recursive: true, force: true });
   } catch {
   }
 }