@clawos-dev/clawd 0.2.142 → 0.2.143-beta.301.814d293

package/dist/cli.cjs

@@ -720,8 +720,8 @@ var init_parseUtil = __esm({
     init_errors2();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path59, errorMaps, issueData } = params;
-      const fullPath = [...path59, ...issueData.path || []];
+      const { data, path: path58, errorMaps, issueData } = params;
+      const fullPath = [...path58, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -1032,11 +1032,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path59, key) {
+      constructor(parent, value, path58, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path59;
+        this._path = path58;
         this._key = key;
       }
       get path() {
@@ -4752,13 +4752,6 @@ var init_schemas = __esm({
        *   - native `session:*` handler 完全不感知 mirror（UI 操作 mirror 不走 native 路径）
        */
       originOwnerPrincipalId: external_exports.string().min(1).optional(),
-      /**
-       * Dispatch 派生的 session 在 create 时记录源 session 的 sessionId（稳定 key）；
-       * sidebar 据此把 dispatch 出来的 sub-session 折叠在源 session 下。非 dispatch session 缺省。
-       * mirror SessionFile 上必须 strip（朋友 daemon 上的 sessionId 在本机无意义，会让本机
-       * 反查路径走错；按 #750 一族防线处理，跟 ownerPersonaId 同地点 strip）。
-       */
-      dispatchedFromSessionId: external_exports.string().min(1).optional(),
       createdAt: external_exports.string().min(1),
       updatedAt: external_exports.string().min(1)
     });
@@ -5899,7 +5892,9 @@ var init_feishu_auth = __esm({
       /** 显示名。TTC user_info 接口 data.name */
       displayName: external_exports.string().min(1),
       /** TTC user_info 接口 data.avatar_url，可缺省 */
-      avatarUrl: external_exports.string().optional()
+      avatarUrl: external_exports.string().optional(),
+      /** TTC user_info 接口 data.union_id（飞书 union_id；dataclaw 可信入口 X-User-UnionId 用），可缺省 */
+      unionId: external_exports.string().optional()
     });
     AuthLoginStartResponseSchema = external_exports.object({
       type: external_exports.literal("auth:login:start:ok"),
@@ -5933,60 +5928,6 @@ var init_feishu_auth = __esm({
   }
 });
 
-// ../protocol/src/dispatch.ts
-var DispatchOutcomeSchema, DispatchRunArgsSchema, DispatchCompleteArgsSchema;
-var init_dispatch = __esm({
-  "../protocol/src/dispatch.ts"() {
-    "use strict";
-    init_zod();
-    DispatchOutcomeSchema = external_exports.discriminatedUnion("kind", [
-      external_exports.object({
-        kind: external_exports.literal("success"),
-        text: external_exports.string(),
-        filePaths: external_exports.array(external_exports.string()).optional()
-      }),
-      external_exports.object({
-        kind: external_exports.literal("failure"),
-        reason: external_exports.string()
-      })
-    ]);
-    DispatchRunArgsSchema = external_exports.object({
-      targetPersona: external_exports.string().min(1),
-      prompt: external_exports.string()
-    });
-    DispatchCompleteArgsSchema = external_exports.object({
-      dispatchId: external_exports.string().min(1),
-      outcome: DispatchOutcomeSchema
-    });
-  }
-});
-
-// ../protocol/src/log.ts
-var LOG_SOURCES, LogSourceSchema, LOG_LEVELS, LogLevelSchema, LogRecordSchema;
-var init_log = __esm({
-  "../protocol/src/log.ts"() {
-    "use strict";
-    init_zod();
-    LOG_SOURCES = ["daemon", "main", "renderer"];
-    LogSourceSchema = external_exports.enum(LOG_SOURCES);
-    LOG_LEVELS = ["debug", "info", "warn", "error"];
-    LogLevelSchema = external_exports.enum(LOG_LEVELS);
-    LogRecordSchema = external_exports.object({
-      ts: external_exports.number().int(),
-      source: LogSourceSchema,
-      level: LogLevelSchema,
-      msg: external_exports.string(),
-      ownerPrincipalId: external_exports.string(),
-      deviceId: external_exports.string(),
-      appVersion: external_exports.string(),
-      daemonVersion: external_exports.string().optional(),
-      os: external_exports.string(),
-      meta_json: external_exports.string().optional(),
-      sessionId: external_exports.string().optional()
-    });
-  }
-});
-
 // ../protocol/src/runtime.ts
 var init_runtime = __esm({
   "../protocol/src/runtime.ts"() {
@@ -6005,8 +5946,6 @@ var init_runtime = __esm({
     init_contact();
     init_extension();
     init_feishu_auth();
-    init_dispatch();
-    init_log();
   }
 });
 
@@ -6281,8 +6220,8 @@ var require_req = __commonJS({
       if (req.originalUrl) {
         _req.url = req.originalUrl;
       } else {
-        const path59 = req.path;
-        _req.url = typeof path59 === "string" ? path59 : req.url ? req.url.path || req.url : void 0;
+        const path58 = req.path;
+        _req.url = typeof path58 === "string" ? path58 : req.url ? req.url.path || req.url : void 0;
       }
       if (req.query) {
         _req.query = req.query;
@@ -6447,14 +6386,14 @@ var require_redact = __commonJS({
       }
       return obj;
     }
-    function parsePath(path59) {
+    function parsePath(path58) {
       const parts = [];
       let current = "";
       let inBrackets = false;
       let inQuotes = false;
       let quoteChar = "";
-      for (let i = 0; i < path59.length; i++) {
-        const char = path59[i];
+      for (let i = 0; i < path58.length; i++) {
+        const char = path58[i];
         if (!inBrackets && char === ".") {
           if (current) {
             parts.push(current);
@@ -6585,10 +6524,10 @@ var require_redact = __commonJS({
       return current;
     }
     function redactPaths(obj, paths, censor, remove = false) {
-      for (const path59 of paths) {
-        const parts = parsePath(path59);
+      for (const path58 of paths) {
+        const parts = parsePath(path58);
         if (parts.includes("*")) {
-          redactWildcardPath(obj, parts, censor, path59, remove);
+          redactWildcardPath(obj, parts, censor, path58, remove);
         } else {
           if (remove) {
             removeKey(obj, parts);
@@ -6673,8 +6612,8 @@ var require_redact = __commonJS({
           }
         } else {
           if (afterWildcard.includes("*")) {
-            const wrappedCensor = typeof censor === "function" ? (value, path59) => {
-              const fullPath = [...pathArray.slice(0, pathLength), ...path59];
+            const wrappedCensor = typeof censor === "function" ? (value, path58) => {
+              const fullPath = [...pathArray.slice(0, pathLength), ...path58];
               return censor(value, fullPath);
             } : censor;
             redactWildcardPath(current, afterWildcard, wrappedCensor, originalPath, remove);
@@ -6709,8 +6648,8 @@ var require_redact = __commonJS({
         return null;
       }
       const pathStructure = /* @__PURE__ */ new Map();
-      for (const path59 of pathsToClone) {
-        const parts = parsePath(path59);
+      for (const path58 of pathsToClone) {
+        const parts = parsePath(path58);
         let current = pathStructure;
         for (let i = 0; i < parts.length; i++) {
           const part = parts[i];
@@ -6762,24 +6701,24 @@ var require_redact = __commonJS({
       }
       return cloneSelectively(obj, pathStructure);
     }
-    function validatePath(path59) {
-      if (typeof path59 !== "string") {
+    function validatePath(path58) {
+      if (typeof path58 !== "string") {
         throw new Error("Paths must be (non-empty) strings");
       }
-      if (path59 === "") {
+      if (path58 === "") {
         throw new Error("Invalid redaction path ()");
       }
-      if (path59.includes("..")) {
-        throw new Error(`Invalid redaction path (${path59})`);
+      if (path58.includes("..")) {
+        throw new Error(`Invalid redaction path (${path58})`);
       }
-      if (path59.includes(",")) {
-        throw new Error(`Invalid redaction path (${path59})`);
+      if (path58.includes(",")) {
+        throw new Error(`Invalid redaction path (${path58})`);
       }
       let bracketCount = 0;
       let inQuotes = false;
       let quoteChar = "";
-      for (let i = 0; i < path59.length; i++) {
-        const char = path59[i];
+      for (let i = 0; i < path58.length; i++) {
+        const char = path58[i];
         if ((char === '"' || char === "'") && bracketCount > 0) {
           if (!inQuotes) {
             inQuotes = true;
@@ -6793,20 +6732,20 @@ var require_redact = __commonJS({
         } else if (char === "]" && !inQuotes) {
           bracketCount--;
           if (bracketCount < 0) {
-            throw new Error(`Invalid redaction path (${path59})`);
+            throw new Error(`Invalid redaction path (${path58})`);
           }
         }
       }
       if (bracketCount !== 0) {
-        throw new Error(`Invalid redaction path (${path59})`);
+        throw new Error(`Invalid redaction path (${path58})`);
       }
     }
     function validatePaths(paths) {
       if (!Array.isArray(paths)) {
         throw new TypeError("paths must be an array");
       }
-      for (const path59 of paths) {
-        validatePath(path59);
+      for (const path58 of paths) {
+        validatePath(path58);
       }
     }
     function slowRedact(options = {}) {
@@ -6974,8 +6913,8 @@ var require_redaction = __commonJS({
         if (shape[k2] === null) {
           o[k2] = (value) => topCensor(value, [k2]);
         } else {
-          const wrappedCensor = typeof censor === "function" ? (value, path59) => {
-            return censor(value, [k2, ...path59]);
+          const wrappedCensor = typeof censor === "function" ? (value, path58) => {
+            return censor(value, [k2, ...path58]);
           } : censor;
           o[k2] = Redact({
             paths: shape[k2],
@@ -7159,7 +7098,7 @@ var require_atomic_sleep = __commonJS({
   "../node_modules/.pnpm/atomic-sleep@1.0.0/node_modules/atomic-sleep/index.js"(exports2, module2) {
     "use strict";
     if (typeof SharedArrayBuffer !== "undefined" && typeof Atomics !== "undefined") {
-      let sleep2 = function(ms) {
+      let sleep = function(ms) {
         const valid = ms > 0 && ms < Infinity;
         if (valid === false) {
           if (typeof ms !== "number" && typeof ms !== "bigint") {
@@ -7170,9 +7109,9 @@ var require_atomic_sleep = __commonJS({
         Atomics.wait(nil, 0, 0, Number(ms));
       };
       const nil = new Int32Array(new SharedArrayBuffer(4));
-      module2.exports = sleep2;
+      module2.exports = sleep;
     } else {
-      let sleep2 = function(ms) {
+      let sleep = function(ms) {
         const valid = ms > 0 && ms < Infinity;
         if (valid === false) {
           if (typeof ms !== "number" && typeof ms !== "bigint") {
@@ -7184,7 +7123,7 @@ var require_atomic_sleep = __commonJS({
         while (target > Date.now()) {
         }
       };
-      module2.exports = sleep2;
+      module2.exports = sleep;
     }
   }
 });
@@ -7193,11 +7132,11 @@ 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 fs52 = require("fs");
+    var fs51 = require("fs");
     var EventEmitter3 = require("events");
     var inherits = require("util").inherits;
-    var path59 = require("path");
-    var sleep2 = require_atomic_sleep();
+    var path58 = require("path");
+    var sleep = require_atomic_sleep();
     var assert = require("assert");
     var BUSY_WRITE_TIMEOUT = 100;
     var kEmptyBuffer = Buffer.allocUnsafe(0);
@@ -7250,20 +7189,20 @@ var require_sonic_boom = __commonJS({
       const mode = sonic.mode;
       if (sonic.sync) {
         try {
-          if (sonic.mkdir) fs52.mkdirSync(path59.dirname(file), { recursive: true });
-          const fd = fs52.openSync(file, flags, mode);
+          if (sonic.mkdir) fs51.mkdirSync(path58.dirname(file), { recursive: true });
+          const fd = fs51.openSync(file, flags, mode);
           fileOpened(null, fd);
         } catch (err) {
           fileOpened(err);
           throw err;
         }
       } else if (sonic.mkdir) {
-        fs52.mkdir(path59.dirname(file), { recursive: true }, (err) => {
+        fs51.mkdir(path58.dirname(file), { recursive: true }, (err) => {
           if (err) return fileOpened(err);
-          fs52.open(file, flags, mode, fileOpened);
+          fs51.open(file, flags, mode, fileOpened);
         });
       } else {
-        fs52.open(file, flags, mode, fileOpened);
+        fs51.open(file, flags, mode, fileOpened);
       }
     }
     function SonicBoom(opts) {
@@ -7304,8 +7243,8 @@ var require_sonic_boom = __commonJS({
         this.flush = flushBuffer;
         this.flushSync = flushBufferSync;
         this._actualWrite = actualWriteBuffer;
-        fsWriteSync = () => fs52.writeSync(this.fd, this._writingBuf);
-        fsWrite = () => fs52.write(this.fd, this._writingBuf, this.release);
+        fsWriteSync = () => fs51.writeSync(this.fd, this._writingBuf);
+        fsWrite = () => fs51.write(this.fd, this._writingBuf, this.release);
       } else if (contentMode === void 0 || contentMode === kContentModeUtf8) {
         this._writingBuf = "";
         this.write = write;
@@ -7314,15 +7253,15 @@ var require_sonic_boom = __commonJS({
         this._actualWrite = actualWrite;
         fsWriteSync = () => {
           if (Buffer.isBuffer(this._writingBuf)) {
-            return fs52.writeSync(this.fd, this._writingBuf);
+            return fs51.writeSync(this.fd, this._writingBuf);
           }
-          return fs52.writeSync(this.fd, this._writingBuf, "utf8");
+          return fs51.writeSync(this.fd, this._writingBuf, "utf8");
         };
         fsWrite = () => {
           if (Buffer.isBuffer(this._writingBuf)) {
-            return fs52.write(this.fd, this._writingBuf, this.release);
+            return fs51.write(this.fd, this._writingBuf, this.release);
           }
-          return fs52.write(this.fd, this._writingBuf, "utf8", this.release);
+          return fs51.write(this.fd, this._writingBuf, "utf8", this.release);
         };
       } else {
         throw new Error(`SonicBoom supports "${kContentModeUtf8}" and "${kContentModeBuffer}", but passed ${contentMode}`);
@@ -7343,7 +7282,7 @@ var require_sonic_boom = __commonJS({
           if ((err.code === "EAGAIN" || err.code === "EBUSY") && this.retryEAGAIN(err, this._writingBuf.length, this._len - this._writingBuf.length)) {
             if (this.sync) {
               try {
-                sleep2(BUSY_WRITE_TIMEOUT);
+                sleep(BUSY_WRITE_TIMEOUT);
                 this.release(void 0, 0);
               } catch (err2) {
                 this.release(err2);
@@ -7379,7 +7318,7 @@ var require_sonic_boom = __commonJS({
           }
         }
         if (this._fsync) {
-          fs52.fsyncSync(this.fd);
+          fs51.fsyncSync(this.fd);
         }
         const len = this._len;
         if (this._reopening) {
@@ -7493,7 +7432,7 @@ var require_sonic_boom = __commonJS({
       const onDrain = () => {
         if (!this._fsync) {
           try {
-            fs52.fsync(this.fd, (err) => {
+            fs51.fsync(this.fd, (err) => {
               this._flushPending = false;
               cb(err);
             });
@@ -7595,7 +7534,7 @@ var require_sonic_boom = __commonJS({
       const fd = this.fd;
       this.once("ready", () => {
         if (fd !== this.fd) {
-          fs52.close(fd, (err) => {
+          fs51.close(fd, (err) => {
             if (err) {
               return this.emit("error", err);
             }
@@ -7644,7 +7583,7 @@ var require_sonic_boom = __commonJS({
           buf = this._bufs[0];
         }
         try {
-          const n = Buffer.isBuffer(buf) ? fs52.writeSync(this.fd, buf) : fs52.writeSync(this.fd, buf, "utf8");
+          const n = Buffer.isBuffer(buf) ? fs51.writeSync(this.fd, buf) : fs51.writeSync(this.fd, buf, "utf8");
           const releasedBufObj = releaseWritingBuf(buf, this._len, n);
           buf = releasedBufObj.writingBuf;
           this._len = releasedBufObj.len;
@@ -7656,11 +7595,11 @@ var require_sonic_boom = __commonJS({
           if (shouldRetry && !this.retryEAGAIN(err, buf.length, this._len - buf.length)) {
             throw err;
           }
-          sleep2(BUSY_WRITE_TIMEOUT);
+          sleep(BUSY_WRITE_TIMEOUT);
         }
       }
       try {
-        fs52.fsyncSync(this.fd);
+        fs51.fsyncSync(this.fd);
       } catch {
       }
     }
@@ -7681,7 +7620,7 @@ var require_sonic_boom = __commonJS({
           buf = mergeBuf(this._bufs[0], this._lens[0]);
         }
         try {
-          const n = fs52.writeSync(this.fd, buf);
+          const n = fs51.writeSync(this.fd, buf);
           buf = buf.subarray(n);
           this._len = Math.max(this._len - n, 0);
           if (buf.length <= 0) {
@@ -7693,7 +7632,7 @@ var require_sonic_boom = __commonJS({
           if (shouldRetry && !this.retryEAGAIN(err, buf.length, this._len - buf.length)) {
             throw err;
           }
-          sleep2(BUSY_WRITE_TIMEOUT);
+          sleep(BUSY_WRITE_TIMEOUT);
         }
       }
     }
@@ -7709,13 +7648,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) ? fs52.writeSync(this.fd, this._writingBuf) : fs52.writeSync(this.fd, this._writingBuf, "utf8");
+          const written = Buffer.isBuffer(this._writingBuf) ? fs51.writeSync(this.fd, this._writingBuf) : fs51.writeSync(this.fd, this._writingBuf, "utf8");
           release(null, written);
         } catch (err) {
           release(err);
         }
       } else {
-        fs52.write(this.fd, this._writingBuf, release);
+        fs51.write(this.fd, this._writingBuf, release);
       }
     }
     function actualWriteBuffer() {
@@ -7724,7 +7663,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 = fs52.writeSync(this.fd, this._writingBuf);
+          const written = fs51.writeSync(this.fd, this._writingBuf);
           release(null, written);
         } catch (err) {
           release(err);
@@ -7733,7 +7672,7 @@ var require_sonic_boom = __commonJS({
         if (kCopyBuffer) {
           this._writingBuf = Buffer.from(this._writingBuf);
         }
-        fs52.write(this.fd, this._writingBuf, release);
+        fs51.write(this.fd, this._writingBuf, release);
       }
     }
     function actualClose(sonic) {
@@ -7749,12 +7688,12 @@ var require_sonic_boom = __commonJS({
       sonic._lens = [];
       assert(typeof sonic.fd === "number", `sonic.fd must be a number, got ${typeof sonic.fd}`);
       try {
-        fs52.fsync(sonic.fd, closeWrapped);
+        fs51.fsync(sonic.fd, closeWrapped);
       } catch {
       }
       function closeWrapped() {
         if (sonic.fd !== 1 && sonic.fd !== 2) {
-          fs52.close(sonic.fd, done);
+          fs51.close(sonic.fd, done);
         } else {
           done();
         }
@@ -8434,7 +8373,7 @@ var require_transport = __commonJS({
     var { createRequire } = require("module");
     var getCallers = require_caller();
     var { join: join15, isAbsolute: isAbsolute2, sep: sep2 } = require("path");
-    var sleep2 = require_atomic_sleep();
+    var sleep = require_atomic_sleep();
     var onExit = require_on_exit_leak_free();
     var ThreadStream = require_thread_stream();
     function setupOnExit(stream) {
@@ -8468,7 +8407,7 @@ var require_transport = __commonJS({
           return;
         }
         stream.flushSync();
-        sleep2(100);
+        sleep(100);
         stream.end();
       }
       return stream;
@@ -10118,7 +10057,7 @@ var require_multistream = __commonJS({
 var require_pino = __commonJS({
   "../node_modules/.pnpm/pino@9.14.0/node_modules/pino/pino.js"(exports2, module2) {
     "use strict";
-    var os22 = require("os");
+    var os21 = require("os");
     var stdSerializers = require_pino_std_serializers();
     var caller = require_caller();
     var redaction = require_redaction();
@@ -10165,7 +10104,7 @@ var require_pino = __commonJS({
     } = symbols;
     var { epochTime, nullTime } = time;
     var { pid } = process;
-    var hostname = os22.hostname();
+    var hostname = os21.hostname();
     var defaultErrorSerializer = stdSerializers.err;
     var defaultOptions = {
       level: "info",
@@ -10889,11 +10828,11 @@ var init_lib = __esm({
           }
         }
       },
-      addToPath: function addToPath(path59, added, removed, oldPosInc, options) {
-        var last = path59.lastComponent;
+      addToPath: function addToPath(path58, added, removed, oldPosInc, options) {
+        var last = path58.lastComponent;
         if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
           return {
-            oldPos: path59.oldPos + oldPosInc,
+            oldPos: path58.oldPos + oldPosInc,
             lastComponent: {
               count: last.count + 1,
               added,
@@ -10903,7 +10842,7 @@ var init_lib = __esm({
           };
         } else {
           return {
-            oldPos: path59.oldPos + oldPosInc,
+            oldPos: path58.oldPos + oldPosInc,
             lastComponent: {
               count: 1,
               added,
@@ -11349,10 +11288,10 @@ function attachmentToHistoryMessage(o, ts) {
     const memories = raw.map((m2) => {
       if (!m2 || typeof m2 !== "object") return null;
       const rec3 = m2;
-      const path59 = typeof rec3.path === "string" ? rec3.path : null;
+      const path58 = typeof rec3.path === "string" ? rec3.path : null;
       const content = typeof rec3.content === "string" ? rec3.content : null;
-      if (!path59 || content == null) return null;
-      const entry = { path: path59, content };
+      if (!path58 || content == null) return null;
+      const entry = { path: path58, content };
       if (typeof rec3.mtimeMs === "number") entry.mtimeMs = rec3.mtimeMs;
       return entry;
     }).filter((m2) => m2 !== null);
@@ -11872,9 +11811,6 @@ function buildSpawnArgs(ctx) {
   if (ctx.addDirs) {
     for (const dir of ctx.addDirs) args.push("--add-dir", dir);
   }
-  if (ctx.dispatchMcpConfigPath) {
-    args.push("--mcp-config", ctx.dispatchMcpConfigPath);
-  }
   if (ctx.effort) args.push("--effort", ctx.effort);
   if (ctx.toolSessionId) args.push("--resume", ctx.toolSessionId);
   return args;
@@ -12154,10 +12090,10 @@ function parseAttachment(obj) {
     const memories = raw.map((m2) => {
       if (!m2 || typeof m2 !== "object") return null;
       const rec3 = m2;
-      const path59 = typeof rec3.path === "string" ? rec3.path : null;
+      const path58 = typeof rec3.path === "string" ? rec3.path : null;
       const content = typeof rec3.content === "string" ? rec3.content : null;
-      if (!path59 || content == null) return null;
-      const out = { path: path59, content };
+      if (!path58 || content == null) return null;
+      const out = { path: path58, content };
       if (typeof rec3.mtimeMs === "number") out.mtimeMs = rec3.mtimeMs;
       return out;
     }).filter((m2) => m2 !== null);
@@ -18187,7 +18123,7 @@ var require_validation = __commonJS({
 var require_receiver = __commonJS({
   "../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/receiver.js"(exports2, module2) {
     "use strict";
-    var { Writable: Writable3 } = require("stream");
+    var { Writable: Writable2 } = require("stream");
     var PerMessageDeflate2 = require_permessage_deflate();
     var {
       BINARY_TYPES,
@@ -18205,7 +18141,7 @@ var require_receiver = __commonJS({
     var GET_DATA = 4;
     var INFLATING = 5;
     var DEFER_EVENT = 6;
-    var Receiver2 = class extends Writable3 {
+    var Receiver2 = class extends Writable2 {
       /**
        * Creates a Receiver instance.
        *
@@ -21468,7 +21404,7 @@ var require_stream_writable = __commonJS({
   "../node_modules/.pnpm/readable-stream@2.3.8/node_modules/readable-stream/lib/_stream_writable.js"(exports2, module2) {
     "use strict";
     var pna = require_process_nextick_args();
-    module2.exports = Writable3;
+    module2.exports = Writable2;
     function CorkedRequest(state) {
       var _this = this;
       this.next = null;
@@ -21479,7 +21415,7 @@ var require_stream_writable = __commonJS({
     }
     var asyncWrite = !process.browser && ["v0.10", "v0.9."].indexOf(process.version.slice(0, 5)) > -1 ? setImmediate : pna.nextTick;
     var Duplex;
-    Writable3.WritableState = WritableState;
+    Writable2.WritableState = WritableState;
     var util2 = Object.create(require_util());
     util2.inherits = require_inherits();
     var internalUtil = {
@@ -21496,7 +21432,7 @@ var require_stream_writable = __commonJS({
       return Buffer2.isBuffer(obj) || obj instanceof OurUint8Array;
     }
     var destroyImpl = require_destroy();
-    util2.inherits(Writable3, Stream);
+    util2.inherits(Writable2, Stream);
     function nop() {
     }
     function WritableState(options, stream) {
@@ -21561,10 +21497,10 @@ var require_stream_writable = __commonJS({
     var realHasInstance;
     if (typeof Symbol === "function" && Symbol.hasInstance && typeof Function.prototype[Symbol.hasInstance] === "function") {
       realHasInstance = Function.prototype[Symbol.hasInstance];
-      Object.defineProperty(Writable3, Symbol.hasInstance, {
+      Object.defineProperty(Writable2, Symbol.hasInstance, {
         value: function(object) {
           if (realHasInstance.call(this, object)) return true;
-          if (this !== Writable3) return false;
+          if (this !== Writable2) return false;
           return object && object._writableState instanceof WritableState;
         }
       });
@@ -21573,10 +21509,10 @@ var require_stream_writable = __commonJS({
         return object instanceof this;
       };
     }
-    function Writable3(options) {
+    function Writable2(options) {
       Duplex = Duplex || require_stream_duplex();
-      if (!realHasInstance.call(Writable3, this) && !(this instanceof Duplex)) {
-        return new Writable3(options);
+      if (!realHasInstance.call(Writable2, this) && !(this instanceof Duplex)) {
+        return new Writable2(options);
       }
       this._writableState = new WritableState(options, this);
       this.writable = true;
@@ -21588,7 +21524,7 @@ var require_stream_writable = __commonJS({
       }
       Stream.call(this);
     }
-    Writable3.prototype.pipe = function() {
+    Writable2.prototype.pipe = function() {
       this.emit("error", new Error("Cannot pipe, not readable"));
     };
     function writeAfterEnd(stream, cb) {
@@ -21611,7 +21547,7 @@ var require_stream_writable = __commonJS({
       }
       return valid;
     }
-    Writable3.prototype.write = function(chunk, encoding, cb) {
+    Writable2.prototype.write = function(chunk, encoding, cb) {
       var state = this._writableState;
       var ret = false;
       var isBuf = !state.objectMode && _isUint8Array(chunk);
@@ -21632,18 +21568,18 @@ var require_stream_writable = __commonJS({
       }
       return ret;
     };
-    Writable3.prototype.cork = function() {
+    Writable2.prototype.cork = function() {
       var state = this._writableState;
       state.corked++;
     };
-    Writable3.prototype.uncork = function() {
+    Writable2.prototype.uncork = function() {
       var state = this._writableState;
       if (state.corked) {
         state.corked--;
         if (!state.writing && !state.corked && !state.bufferProcessing && state.bufferedRequest) clearBuffer(this, state);
       }
     };
-    Writable3.prototype.setDefaultEncoding = function setDefaultEncoding(encoding) {
+    Writable2.prototype.setDefaultEncoding = function setDefaultEncoding(encoding) {
       if (typeof encoding === "string") encoding = encoding.toLowerCase();
       if (!(["hex", "utf8", "utf-8", "ascii", "binary", "base64", "ucs2", "ucs-2", "utf16le", "utf-16le", "raw"].indexOf((encoding + "").toLowerCase()) > -1)) throw new TypeError("Unknown encoding: " + encoding);
       this._writableState.defaultEncoding = encoding;
@@ -21655,7 +21591,7 @@ var require_stream_writable = __commonJS({
       }
       return chunk;
     }
-    Object.defineProperty(Writable3.prototype, "writableHighWaterMark", {
+    Object.defineProperty(Writable2.prototype, "writableHighWaterMark", {
       // making it explicit this property is not enumerable
       // because otherwise some prototype manipulation in
       // userland will fail
@@ -21801,11 +21737,11 @@ var require_stream_writable = __commonJS({
       state.bufferedRequest = entry;
       state.bufferProcessing = false;
     }
-    Writable3.prototype._write = function(chunk, encoding, cb) {
+    Writable2.prototype._write = function(chunk, encoding, cb) {
       cb(new Error("_write() is not implemented"));
     };
-    Writable3.prototype._writev = null;
-    Writable3.prototype.end = function(chunk, encoding, cb) {
+    Writable2.prototype._writev = null;
+    Writable2.prototype.end = function(chunk, encoding, cb) {
       var state = this._writableState;
       if (typeof chunk === "function") {
         cb = chunk;
@@ -21880,7 +21816,7 @@ var require_stream_writable = __commonJS({
       }
       state.corkedRequestsFree.next = corkReq;
     }
-    Object.defineProperty(Writable3.prototype, "destroyed", {
+    Object.defineProperty(Writable2.prototype, "destroyed", {
       get: function() {
         if (this._writableState === void 0) {
           return false;
@@ -21894,9 +21830,9 @@ var require_stream_writable = __commonJS({
         this._writableState.destroyed = value;
       }
     });
-    Writable3.prototype.destroy = destroyImpl.destroy;
-    Writable3.prototype._undestroy = destroyImpl.undestroy;
-    Writable3.prototype._destroy = function(err, cb) {
+    Writable2.prototype.destroy = destroyImpl.destroy;
+    Writable2.prototype._undestroy = destroyImpl.undestroy;
+    Writable2.prototype._destroy = function(err, cb) {
       this.end();
       cb(err);
     };
@@ -21919,13 +21855,13 @@ var require_stream_duplex = __commonJS({
     var util2 = Object.create(require_util());
     util2.inherits = require_inherits();
     var Readable3 = require_stream_readable();
-    var Writable3 = require_stream_writable();
+    var Writable2 = require_stream_writable();
     util2.inherits(Duplex, Readable3);
     {
-      keys = objectKeys(Writable3.prototype);
+      keys = objectKeys(Writable2.prototype);
       for (v2 = 0; v2 < keys.length; v2++) {
         method = keys[v2];
-        if (!Duplex.prototype[method]) Duplex.prototype[method] = Writable3.prototype[method];
+        if (!Duplex.prototype[method]) Duplex.prototype[method] = Writable2.prototype[method];
       }
     }
     var keys;
@@ -21934,7 +21870,7 @@ var require_stream_duplex = __commonJS({
     function Duplex(options) {
       if (!(this instanceof Duplex)) return new Duplex(options);
       Readable3.call(this, options);
-      Writable3.call(this, options);
+      Writable2.call(this, options);
       if (options && options.readable === false) this.readable = false;
       if (options && options.writable === false) this.writable = false;
       this.allowHalfOpen = true;
@@ -23944,8 +23880,8 @@ var require_utils = __commonJS({
       var result = transform[inputType][outputType](input);
       return result;
     };
-    exports2.resolve = function(path59) {
-      var parts = path59.split("/");
+    exports2.resolve = function(path58) {
+      var parts = path58.split("/");
       var result = [];
       for (var index = 0; index < parts.length; index++) {
         var part = parts[index];
@@ -29798,18 +29734,18 @@ var require_object = __commonJS({
       var object = new ZipObject(name, zipObjectContent, o);
       this.files[name] = object;
     };
-    var parentFolder = function(path59) {
-      if (path59.slice(-1) === "/") {
-        path59 = path59.substring(0, path59.length - 1);
+    var parentFolder = function(path58) {
+      if (path58.slice(-1) === "/") {
+        path58 = path58.substring(0, path58.length - 1);
       }
-      var lastSlash = path59.lastIndexOf("/");
-      return lastSlash > 0 ? path59.substring(0, lastSlash) : "";
+      var lastSlash = path58.lastIndexOf("/");
+      return lastSlash > 0 ? path58.substring(0, lastSlash) : "";
     };
-    var forceTrailingSlash = function(path59) {
-      if (path59.slice(-1) !== "/") {
-        path59 += "/";
+    var forceTrailingSlash = function(path58) {
+      if (path58.slice(-1) !== "/") {
+        path58 += "/";
       }
-      return path59;
+      return path58;
     };
     var folderAdd = function(name, createFolders) {
       createFolders = typeof createFolders !== "undefined" ? createFolders : defaults.createFolders;
@@ -30811,7 +30747,7 @@ var require_lib3 = __commonJS({
 // src/run-case/recorder.ts
 function startRunCaseRecorder(opts) {
   const now = opts.now ?? Date.now;
-  const dir = import_node_path47.default.dirname(opts.recordPath);
+  const dir = import_node_path46.default.dirname(opts.recordPath);
   let stream = null;
   let closing = false;
   let closedSettled = false;
@@ -30825,8 +30761,8 @@ function startRunCaseRecorder(opts) {
   });
   const ensureStream = () => {
     if (stream) return stream;
-    import_node_fs35.default.mkdirSync(dir, { recursive: true });
-    stream = import_node_fs35.default.createWriteStream(opts.recordPath, { flags: "a" });
+    import_node_fs34.default.mkdirSync(dir, { recursive: true });
+    stream = import_node_fs34.default.createWriteStream(opts.recordPath, { flags: "a" });
     stream.on("close", () => closedResolve());
     return stream;
   };
@@ -30851,12 +30787,12 @@ function startRunCaseRecorder(opts) {
   };
   return { tap, close, closed };
 }
-var import_node_fs35, import_node_path47;
+var import_node_fs34, import_node_path46;
 var init_recorder = __esm({
   "src/run-case/recorder.ts"() {
     "use strict";
-    import_node_fs35 = __toESM(require("fs"), 1);
-    import_node_path47 = __toESM(require("path"), 1);
+    import_node_fs34 = __toESM(require("fs"), 1);
+    import_node_path46 = __toESM(require("path"), 1);
   }
 });
 
@@ -30899,7 +30835,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_fs36.mkdtempSync)(import_node_path48.default.join(import_node_os20.default.tmpdir(), "clawd-runcase-"));
+  const cwd = opts.cwd ?? (0, import_node_fs35.mkdtempSync)(import_node_path47.default.join(import_node_os19.default.tmpdir(), "clawd-runcase-"));
   const ownsCwd = opts.cwd === void 0;
   const recorder = startRunCaseRecorder({ recordPath: opts.record, now });
   const spawnCtx = { cwd };
@@ -31060,19 +30996,19 @@ async function runController(opts) {
   if (sigintHandler) process.off("SIGINT", sigintHandler);
   if (ownsCwd) {
     try {
-      (0, import_node_fs36.rmSync)(cwd, { recursive: true, force: true });
+      (0, import_node_fs35.rmSync)(cwd, { recursive: true, force: true });
     } catch {
     }
   }
   return exitCode ?? 0;
 }
-var import_node_fs36, import_node_os20, import_node_path48;
+var import_node_fs35, import_node_os19, import_node_path47;
 var init_controller = __esm({
   "src/run-case/controller.ts"() {
     "use strict";
-    import_node_fs36 = require("fs");
-    import_node_os20 = __toESM(require("os"), 1);
-    import_node_path48 = __toESM(require("path"), 1);
+    import_node_fs35 = require("fs");
+    import_node_os19 = __toESM(require("os"), 1);
+    import_node_path47 = __toESM(require("path"), 1);
     init_claude();
     init_stdout_splitter();
     init_permission_stdio();
@@ -31176,24 +31112,6 @@ init_protocol();
 var DEFAULT_PORT = 18790;
 var DEFAULT_HOST = "127.0.0.1";
 var DEFAULT_CLAWOS_API = "https://api.clawos.chat";
-var DEFAULT_LOG_ENDPOINT = "https://clawd-prod.cn-hangzhou.log.aliyuncs.com/logstores/app-logs/track";
-function resolveLogShipping(raw, cliNoShipping) {
-  if (cliNoShipping) {
-    return { mode: "off", endpoint: null, sampling: {} };
-  }
-  const rawMode = raw?.mode;
-  const mode = rawMode === "off" || rawMode === "errors-only" ? rawMode : "on";
-  if (mode === "off") {
-    return { mode, endpoint: null, sampling: {} };
-  }
-  const endpoint = typeof raw?.endpoint === "string" && raw.endpoint ? raw.endpoint : raw?.endpoint === null ? null : DEFAULT_LOG_ENDPOINT;
-  const sampling = mode === "errors-only" ? { debug: 0, info: 0, warn: 1, error: 1 } : isPlainSamplingMap(raw?.sampling) ? raw.sampling : {};
-  return { mode, endpoint, sampling };
-}
-function isPlainSamplingMap(v2) {
-  if (!v2 || typeof v2 !== "object") return false;
-  return Object.values(v2).every((n) => typeof n === "number");
-}
 function parseArgs(argv) {
   const out = {};
   for (let i = 0; i < argv.length; i++) {
@@ -31239,9 +31157,6 @@ function parseArgs(argv) {
       case "-v":
         out.version = true;
         break;
-      case "--no-log-shipping":
-        out.noLogShipping = true;
-        break;
       default:
         if (a.startsWith("--")) throw new Error(`unknown flag: ${a}`);
         break;
@@ -31287,10 +31202,6 @@ function resolveConfig(opts) {
   const mode = DAEMON_MODE_VALUES.includes(rawMode ?? "") ? rawMode : "sdk";
   const filePreviewPorts = Array.isArray(fileCfg.previewPorts) ? fileCfg.previewPorts.map((n) => Number(n)).filter((n) => Number.isInteger(n) && n > 0) : null;
   const previewPorts = env.CLAWD_PREVIEW_PORTS ? env.CLAWD_PREVIEW_PORTS.split(",").map((s) => Number(s.trim())).filter((n) => Number.isInteger(n) && n > 0) : filePreviewPorts && filePreviewPorts.length > 0 ? filePreviewPorts : null;
-  const logShipping = resolveLogShipping(
-    fileCfg.logShipping,
-    args.noLogShipping ?? false
-  );
   return {
     port,
     host,
@@ -31303,8 +31214,7 @@ function resolveConfig(opts) {
     noTunnelPersist,
     frpcBinary,
     mode,
-    previewPorts,
-    logShipping
+    previewPorts
   };
 }
 var HELP_TEXT = `clawd [options]
@@ -31315,7 +31225,6 @@ var HELP_TEXT = `clawd [options]
   --tunnel                \u542F\u7528 frp tunnel \u628A\u672C\u5730\u7AEF\u53E3\u66B4\u9732\u5230\u516C\u7F51
   --clawos-api <url>      tunnel register \u63A5\u53E3\u7684 base url\uFF08\u9ED8\u8BA4 https://api.clawos.chat\uFF09
   --auth-token <s>        \u6307\u5B9A daemon auth token\uFF1B\u7F3A\u7701\u65F6 tunnel \u6A21\u5F0F\u4ECE ~/.clawd/auth.json \u590D\u7528\uFF0C\u6CA1\u6709\u5C31\u751F\u6210
-  --no-log-shipping       \u7981\u7528 SLS \u65E5\u5FD7\u4E0A\u884C\uFF08\u8986\u76D6 config.json logShipping.mode=off\uFF09
   --help / -h             \u663E\u793A\u5E2E\u52A9
   --version / -v          \u663E\u793A\u7248\u672C
 
@@ -31334,64 +31243,12 @@ Env (advanced):
 `;
 
 // src/index.ts
-var import_node_path46 = __toESM(require("path"), 1);
-var import_node_fs34 = __toESM(require("fs"), 1);
-var import_node_os19 = __toESM(require("os"), 1);
-
-// ../node_modules/.pnpm/uuid@10.0.0/node_modules/uuid/dist/esm-node/stringify.js
-var byteToHex = [];
-for (let i = 0; i < 256; ++i) {
-  byteToHex.push((i + 256).toString(16).slice(1));
-}
-function unsafeStringify(arr, offset = 0) {
-  return (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + "-" + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + "-" + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + "-" + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + "-" + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase();
-}
-
-// ../node_modules/.pnpm/uuid@10.0.0/node_modules/uuid/dist/esm-node/rng.js
-var import_node_crypto = __toESM(require("crypto"));
-var rnds8Pool = new Uint8Array(256);
-var poolPtr = rnds8Pool.length;
-function rng() {
-  if (poolPtr > rnds8Pool.length - 16) {
-    import_node_crypto.default.randomFillSync(rnds8Pool);
-    poolPtr = 0;
-  }
-  return rnds8Pool.slice(poolPtr, poolPtr += 16);
-}
-
-// ../node_modules/.pnpm/uuid@10.0.0/node_modules/uuid/dist/esm-node/native.js
-var import_node_crypto2 = __toESM(require("crypto"));
-var native_default = {
-  randomUUID: import_node_crypto2.default.randomUUID
-};
-
-// ../node_modules/.pnpm/uuid@10.0.0/node_modules/uuid/dist/esm-node/v4.js
-function v4(options, buf, offset) {
-  if (native_default.randomUUID && !buf && !options) {
-    return native_default.randomUUID();
-  }
-  options = options || {};
-  const rnds = options.random || (options.rng || rng)();
-  rnds[6] = rnds[6] & 15 | 64;
-  rnds[8] = rnds[8] & 63 | 128;
-  if (buf) {
-    offset = offset || 0;
-    for (let i = 0; i < 16; ++i) {
-      buf[offset + i] = rnds[i];
-    }
-    return buf;
-  }
-  return unsafeStringify(rnds);
-}
-var v4_default = v4;
-
-// src/index.ts
-var import_node_url2 = require("url");
+var import_node_path45 = __toESM(require("path"), 1);
+var import_node_fs33 = __toESM(require("fs"), 1);
 
 // src/logger.ts
 var import_node_fs2 = __toESM(require("fs"), 1);
 var import_node_path2 = __toESM(require("path"), 1);
-var import_node_stream = require("stream");
 var import_pino = __toESM(require_pino(), 1);
 function wrap(inner) {
   return {
@@ -31417,329 +31274,12 @@ function createLogger(opts = {}) {
     } catch {
     }
   }
-  if (opts.logClient) {
-    const client = opts.logClient;
-    const sink = new import_node_stream.Writable({
-      write(chunk, _enc, cb) {
-        try {
-          const line = String(chunk).trim();
-          if (line) {
-            const obj = JSON.parse(line);
-            const lvl = pinoLevelToString(obj.level);
-            if (lvl) {
-              const meta = {};
-              for (const [k2, v2] of Object.entries(obj)) {
-                if (k2 === "level" || k2 === "msg" || k2 === "time" || k2 === "pid" || k2 === "hostname") continue;
-                if (k2 === "sessionId") continue;
-                meta[k2] = v2;
-              }
-              client.push({
-                ts: typeof obj.time === "number" ? obj.time : void 0,
-                level: lvl,
-                msg: typeof obj.msg === "string" ? obj.msg : "",
-                meta: Object.keys(meta).length > 0 ? meta : void 0,
-                sessionId: typeof obj.sessionId === "string" ? obj.sessionId : void 0
-              });
-            }
-          }
-        } catch {
-        }
-        cb();
-      }
-    });
-    streams.push({ stream: sink, level });
-  }
   const base = (0, import_pino.default)(
     { level, base: { pid: process.pid } },
     import_pino.default.multistream(streams)
   );
   return wrap(base);
 }
-function pinoLevelToString(n) {
-  if (typeof n !== "number") return null;
-  if (n >= 50) return "error";
-  if (n >= 40) return "warn";
-  if (n >= 30) return "info";
-  if (n >= 20) return "debug";
-  return null;
-}
-
-// ../log-client/src/types.ts
-var DEFAULT_BATCH = {
-  maxRecords: 100,
-  maxBytes: 512 * 1024,
-  maxWaitMs: 5e3
-};
-var DEFAULT_BUFFER_CAP = 5e3;
-var DEFAULT_SAMPLING = {
-  debug: 0,
-  info: 1,
-  warn: 1,
-  error: 1
-};
-var MAX_MSG_BYTES = 1024;
-var MAX_META_JSON_BYTES = 2048;
-var REDACT_KEY_REGEX = /token|secret|password|auth(?!or)|apikey|signsecret/i;
-var REDACTED_PLACEHOLDER = "[REDACTED]";
-
-// ../log-client/src/redactor.ts
-var TRUNCATE_SUFFIX = "\u2026[truncated]";
-function redactMeta(meta, homeDir) {
-  const cleaned = cleanValue(meta, homeDir, 0);
-  const json = safeStringify(cleaned);
-  if (json.length <= MAX_META_JSON_BYTES) return cleaned;
-  const truncated = json.slice(0, MAX_META_JSON_BYTES) + TRUNCATE_SUFFIX;
-  return { __truncated__: truncated };
-}
-function cleanValue(v2, homeDir, depth) {
-  if (depth > 10) return "[depth-limit]";
-  if (v2 == null) return v2;
-  if (typeof v2 === "string") {
-    return homeDir ? v2.split(homeDir).join("~") : v2;
-  }
-  if (typeof v2 !== "object") return v2;
-  if (Array.isArray(v2)) return v2.map((x) => cleanValue(x, homeDir, depth + 1));
-  const out = {};
-  for (const [k2, val] of Object.entries(v2)) {
-    if (REDACT_KEY_REGEX.test(k2)) {
-      out[k2] = REDACTED_PLACEHOLDER;
-    } else {
-      out[k2] = cleanValue(val, homeDir, depth + 1);
-    }
-  }
-  return out;
-}
-function safeStringify(v2) {
-  try {
-    return JSON.stringify(v2) ?? "";
-  } catch {
-    return '"[serialize-failed]"';
-  }
-}
-function truncateMsg(msg) {
-  if (msg.length <= MAX_MSG_BYTES) return msg;
-  return msg.slice(0, MAX_MSG_BYTES) + TRUNCATE_SUFFIX;
-}
-
-// ../log-client/src/sampling.ts
-function shouldSample(level, config, rng2) {
-  const rate = config[level] ?? DEFAULT_SAMPLING[level];
-  if (rate <= 0) return false;
-  if (rate >= 1) return true;
-  return rng2() < rate;
-}
-
-// ../log-client/src/batcher.ts
-var Batcher = class {
-  constructor(deps) {
-    this.deps = deps;
-  }
-  deps;
-  queue = [];
-  bytes = 0;
-  droppedSinceFlush = 0;
-  identityReady = false;
-  timer = null;
-  disposed = false;
-  pendingSends = [];
-  enqueue(record) {
-    if (this.disposed) return;
-    const sz = approxSize(record);
-    while (this.queue.length >= this.deps.bufferCap) {
-      this.queue.shift();
-      this.droppedSinceFlush++;
-    }
-    this.queue.push(record);
-    this.bytes += sz;
-    if (!this.identityReady) return;
-    this.maybeTrigger();
-  }
-  setIdentityReady(ready) {
-    this.identityReady = ready;
-    if (ready && this.queue.length > 0) this.maybeTrigger();
-  }
-  async flush() {
-    if (this.queue.length > 0) {
-      this.fire("flush");
-    }
-    await Promise.allSettled(this.pendingSends);
-  }
-  stats() {
-    return { queued: this.queue.length, dropped: this.droppedSinceFlush };
-  }
-  async dispose() {
-    if (this.disposed) return;
-    this.disposed = true;
-    if (this.timer) {
-      clearTimeout(this.timer);
-      this.timer = null;
-    }
-    await this.flush();
-  }
-  maybeTrigger() {
-    const { maxRecords, maxBytes, maxWaitMs } = this.deps.batch;
-    if (this.queue.length >= maxRecords) {
-      this.fire("records");
-      return;
-    }
-    if (this.bytes >= maxBytes) {
-      this.fire("bytes");
-      return;
-    }
-    if (this.timer == null) {
-      this.timer = setTimeout(() => {
-        this.timer = null;
-        if (this.queue.length > 0 && this.identityReady) this.fire("time");
-      }, maxWaitMs);
-    }
-  }
-  fire(reason) {
-    if (this.timer) {
-      clearTimeout(this.timer);
-      this.timer = null;
-    }
-    const records = this.queue;
-    const droppedCarryover = this.droppedSinceFlush;
-    this.queue = [];
-    this.bytes = 0;
-    this.droppedSinceFlush = 0;
-    const p2 = this.deps.onBatch({ reason, records, droppedCarryover }).catch(() => {
-    });
-    this.pendingSends.push(p2);
-    p2.finally(() => {
-      this.pendingSends = this.pendingSends.filter((x) => x !== p2);
-    });
-  }
-};
-function approxSize(record) {
-  return (record.msg?.length ?? 0) + (record.meta_json?.length ?? 0) + 200;
-}
-
-// ../log-client/src/sender.ts
-var BACKOFF_MS = [1e3, 2e3, 4e3];
-async function sendBatch(deps, batch) {
-  const body = JSON.stringify({
-    __topic__: deps.topic ?? "clawd",
-    __source__: deps.source,
-    __logs__: batch.records,
-    __dropped__: batch.droppedCarryover
-  });
-  for (let attempt = 0; attempt < BACKOFF_MS.length; attempt++) {
-    if (attempt > 0) await sleep(BACKOFF_MS[attempt - 1]);
-    try {
-      const res = await deps.fetchImpl(deps.endpoint, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body
-      });
-      if (res.status >= 200 && res.status < 300) {
-        return { sent: batch.records.length, failed: 0 };
-      }
-      if (res.status >= 400 && res.status < 500) {
-        return { sent: 0, failed: batch.records.length };
-      }
-    } catch {
-    }
-  }
-  return { sent: 0, failed: batch.records.length };
-}
-function sleep(ms) {
-  return new Promise((r) => setTimeout(r, ms));
-}
-
-// ../log-client/src/client.ts
-function createLogClient(opts) {
-  const stats = { sent: 0, dropped: 0, queued: 0, failed: 0 };
-  const fetchImpl = opts.fetchImpl ?? globalThis.fetch;
-  const now = opts.now ?? Date.now;
-  const sampling = { ...DEFAULT_SAMPLING, ...opts.sampling ?? {} };
-  const homeDir = opts.homeDir === void 0 ? null : opts.homeDir;
-  const batchConfig = { ...DEFAULT_BATCH, ...opts.batch ?? {} };
-  const bufferCap = opts.bufferCap ?? DEFAULT_BUFFER_CAP;
-  let identity = opts.identity;
-  let disposed = false;
-  if (opts.endpoint == null) {
-    return {
-      push: () => {
-        if (disposed) return;
-        stats.dropped++;
-      },
-      flush: async () => {
-      },
-      setIdentity: (next) => {
-        identity = next;
-      },
-      stats: () => ({ ...stats }),
-      dispose: async () => {
-        disposed = true;
-      }
-    };
-  }
-  const endpoint = opts.endpoint;
-  const batcher = new Batcher({
-    batch: batchConfig,
-    bufferCap,
-    now,
-    onBatch: async (b2) => {
-      const res = await sendBatch({ endpoint, source: opts.source, fetchImpl }, b2);
-      stats.sent += res.sent;
-      stats.failed += res.failed;
-    }
-  });
-  batcher.setIdentityReady(identity != null);
-  return {
-    push(input) {
-      if (disposed) return;
-      try {
-        if (!shouldSample(input.level, sampling, Math.random)) {
-          stats.dropped++;
-          return;
-        }
-        const record = buildRecord(input, identity, opts.source, homeDir, now);
-        batcher.enqueue(record);
-      } catch {
-      }
-    },
-    async flush() {
-      try {
-        await batcher.flush();
-      } catch {
-      }
-    },
-    setIdentity(next) {
-      identity = next;
-      batcher.setIdentityReady(next != null);
-    },
-    stats() {
-      const bs = batcher.stats();
-      return { ...stats, queued: bs.queued, dropped: stats.dropped + bs.dropped };
-    },
-    async dispose() {
-      disposed = true;
-      try {
-        await batcher.dispose();
-      } catch {
-      }
-    }
-  };
-}
-function buildRecord(input, identity, source, homeDir, now) {
-  const cleanedMeta = input.meta ? redactMeta(input.meta, homeDir) : void 0;
-  const meta_json = cleanedMeta ? JSON.stringify(cleanedMeta) : void 0;
-  return {
-    ts: input.ts ?? now(),
-    source,
-    level: input.level,
-    msg: truncateMsg(input.msg),
-    ownerPrincipalId: identity?.ownerPrincipalId ?? "__pending__",
-    deviceId: identity?.deviceId ?? "__pending__",
-    appVersion: identity?.appVersion ?? "__pending__",
-    daemonVersion: identity?.daemonVersion,
-    os: identity?.os ?? "unknown",
-    meta_json,
-    sessionId: input.sessionId
-  };
-}
 
 // src/session/store-factory.ts
 var path5 = __toESM(require("path"), 1);
@@ -31946,6 +31486,55 @@ var SessionStoreFactory = class {
 var import_node_fs6 = __toESM(require("fs"), 1);
 var import_node_path6 = __toESM(require("path"), 1);
 var import_node_os2 = __toESM(require("os"), 1);
+
+// ../node_modules/.pnpm/uuid@10.0.0/node_modules/uuid/dist/esm-node/stringify.js
+var byteToHex = [];
+for (let i = 0; i < 256; ++i) {
+  byteToHex.push((i + 256).toString(16).slice(1));
+}
+function unsafeStringify(arr, offset = 0) {
+  return (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + "-" + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + "-" + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + "-" + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + "-" + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase();
+}
+
+// ../node_modules/.pnpm/uuid@10.0.0/node_modules/uuid/dist/esm-node/rng.js
+var import_node_crypto = __toESM(require("crypto"));
+var rnds8Pool = new Uint8Array(256);
+var poolPtr = rnds8Pool.length;
+function rng() {
+  if (poolPtr > rnds8Pool.length - 16) {
+    import_node_crypto.default.randomFillSync(rnds8Pool);
+    poolPtr = 0;
+  }
+  return rnds8Pool.slice(poolPtr, poolPtr += 16);
+}
+
+// ../node_modules/.pnpm/uuid@10.0.0/node_modules/uuid/dist/esm-node/native.js
+var import_node_crypto2 = __toESM(require("crypto"));
+var native_default = {
+  randomUUID: import_node_crypto2.default.randomUUID
+};
+
+// ../node_modules/.pnpm/uuid@10.0.0/node_modules/uuid/dist/esm-node/v4.js
+function v4(options, buf, offset) {
+  if (native_default.randomUUID && !buf && !options) {
+    return native_default.randomUUID();
+  }
+  options = options || {};
+  const rnds = options.random || (options.rng || rng)();
+  rnds[6] = rnds[6] & 15 | 64;
+  rnds[8] = rnds[8] & 63 | 128;
+  if (buf) {
+    offset = offset || 0;
+    for (let i = 0; i < 16; ++i) {
+      buf[offset + i] = rnds[i];
+    }
+    return buf;
+  }
+  return unsafeStringify(rnds);
+}
+var v4_default = v4;
+
+// src/session/manager.ts
 init_protocol();
 
 // src/tools/guest-settings.ts
@@ -32070,32 +31659,6 @@ function buildConnectionPrompt(args) {
   return result;
 }
 
-// src/dispatch/system-prompt.ts
-var DISPATCH_SYSTEM_PROMPT_HINT = `## \u59D4\u6D3E\u7ED9\u53E6\u4E00\u4E2A persona\uFF08dispatch\uFF09
-
-\u5F53\u7528\u6237\u6D88\u606F\u91CC\u542B \`@persona/<id>\`\uFF08\u5982 \`@persona/persona-bug-fixer\`\uFF09\u65F6\uFF0C**\u4F60\u5FC5\u987B**\u7ACB\u5373\u8C03 MCP tool \`mcp__clawd-dispatch__personaDispatch\` \u59D4\u6D3E\uFF0C\u4E0D\u8981\u5C1D\u8BD5\u81EA\u5DF1\u6267\u884C\uFF1A
-
-- \`targetPersona = <id>\`\uFF08@ token \u91CC\u7684 persona id\uFF09
-- \`prompt = \u53BB\u6389 @persona/<id> token \u7684\u7528\u6237\u539F\u6587\`
-
-tool \u4F1A\u963B\u585E\u6302\u8D77\u7B49\u5BF9\u65B9\u4EBA\u683C\u5E72\u5B8C\uFF0C\u628A outcome\uFF08\u542B text + \u53EF\u9009 filePaths\uFF09\u4F5C\u4E3A tool_result \u56DE\u7ED9\u4F60\uFF0C\u4F60\u518D\u7EFC\u5408\u56DE\u5E94\u7528\u6237\u3002
-
-- **\u4E0D\u8981**\u5C1D\u8BD5\u81EA\u5DF1\u6267\u884C\uFF08\u4F60\u4E0D\u662F\u90A3\u4E2A persona\uFF09
-- **\u4E0D\u8981** in-place \u6A21\u4EFF\u5BF9\u65B9\u4EBA\u683C \u2014\u2014 dispatch \u662F\u771F\u5207\u5230\u53E6\u4E00\u4E2A\u72EC\u7ACB session
-- \u4E00\u53E5\u8BDD\u91CC\u591A\u4E2A \`@persona/<id>\` \u65F6\u9009\u7B2C\u4E00\u4E2A\uFF08tool \u4E00\u6B21\u53EA\u5904\u7406\u4E00\u4E2A target\uFF09
-- \u59D4\u6D3E\u5931\u8D25\uFF08tool_result.is_error=true\uFF09\u65F6\u5982\u5B9E\u544A\u8BC9\u7528\u6237\u539F\u56E0\uFF0C**\u4E0D\u8981\u91CD\u8BD5**
-
-## \u88AB dispatch \u63A5\u5230\u4EFB\u52A1
-
-\u5982\u679C\u4F60\u7684 session \u7B2C\u4E00\u6761 user message \u662F\u4EE5 \`[Dispatched from owner \u2014 another persona session\u59D4\u6D3E\u7ED9\u4F60\u6267\u884C\u4EFB\u52A1]\` \u8D77\u5934\u7684 plain text \u4EFB\u52A1\u5305\uFF0C\u4F60\u662F\u88AB\u53E6\u4E00\u4E2A persona \u59D4\u6D3E\u6765\u5E72\u6D3B\u7684\uFF08\u4EFB\u52A1\u5305\u4E0D\u7528 \`<system-reminder>\` \u5305\u662F\u4E3A\u4E86 reducer dedup \u5DE5\u4F5C\u6B63\u5E38\uFF0C\u89C1 manager.ts buildDispatchTaskPack \u6CE8\u91CA\uFF09\uFF1A
-
-- \u4EFB\u52A1\u5728 \`Task:\` \u6BB5
-- \u539F\u4F1A\u8BDD\u7684\u5BF9\u8BDD\u5386\u53F2\u5728 \`Source conversation\` \u6BB5\u7ED9\u7684 jsonl \u8DEF\u5F84\u4E0B\uFF1B\u6309\u9700 Read \u5B83\u4E86\u89E3\u4E0A\u4E0B\u6587\uFF08\u4E0D\u5FC5\u8BFB\u5B8C\uFF09
-- \u5E72\u5B8C\u540E**\u5FC5\u987B**\u8C03 \`mcp__clawd-dispatch__personaDispatchComplete\` \u62A5\u544A\u7ED3\u679C\uFF1A
-  - \u6210\u529F\uFF1A\`{ text: "\u603B\u7ED3/\u7ED3\u8BBA", filePaths?: ["\u4F60\u4EA7\u51FA/\u6539\u7684\u6587\u4EF6\u7EDD\u5BF9\u8DEF\u5F84"] }\`
-  - \u5931\u8D25\uFF1A\`{ isFailure: true, reason: "..." }\`
-- \u62A5\u544A\u5B8C\u540E\u4F60\u7684 session \u5C31\u7ED3\u675F\u4E86\uFF0C\u4E0D\u8981\u7EE7\u7EED\u8F93\u51FA`;
-
 // src/session/reducer.ts
 function cloneState(s) {
   return {
@@ -32174,9 +31737,6 @@ function buildSpawnContext(state, deps) {
   env.CLAWD_SESSION_ID = file.sessionId;
   const daemonUrl = deps.getDaemonUrl?.() ?? null;
   if (daemonUrl) env.CLAWD_DAEMON_URL = daemonUrl;
-  const dispatchId = deps.lookupDispatchByBSessionId?.(file.sessionId);
-  if (dispatchId) env.CLAWD_DISPATCH_ID = dispatchId;
-  const dispatchMcpConfigPath2 = deps.getDispatchMcpConfigPath?.() ?? null;
   const ctx = {
     cwd: file.cwd,
     toolSessionId: file.toolSessionId,
@@ -32186,10 +31746,7 @@ function buildSpawnContext(state, deps) {
     env,
     // Phase 2 capability platform (plan §3): personaRoot 透传给 buildSpawnArgs;
     // 内部 shouldSandbox(cwd, personaRoot) 决定是否注入 --settings sandbox-settings.
-    personaRoot: deps.personaRoot,
-    // Persona dispatch：所有 session（A 和 B）都挂同一份 dispatch.mcp.json，让两边的 cc
-    // 都能看到 personaDispatch / personaDispatchComplete tool；按 env 区分实际行为。
-    dispatchMcpConfigPath: dispatchMcpConfigPath2 ?? void 0
+    personaRoot: deps.personaRoot
   };
   const meta = state.subSessionMeta;
   if (meta?.personaMode) {
@@ -32200,9 +31757,6 @@ function buildSpawnContext(state, deps) {
       workDir: meta.userWorkDir
     });
   }
-  if (dispatchMcpConfigPath2) {
-    ctx.extraSystemPrompt = (ctx.extraSystemPrompt ? ctx.extraSystemPrompt + "\n\n" : "") + DISPATCH_SYSTEM_PROMPT_HINT;
-  }
   if (meta?.extraSettings) {
     ctx.extraSettings = meta.extraSettings;
   }
@@ -32868,6 +32422,35 @@ function startRecorder(opts) {
   };
 }
 
+// src/persona/mention-injection.ts
+var MENTION_RE = /@persona\/([A-Za-z0-9_-]+)(?=\s|$|[^A-Za-z0-9_-])/g;
+function injectPersonaMentions(rawText, store) {
+  const resolved = [];
+  const body = rawText.replace(MENTION_RE, (match, id) => {
+    const meta = store.read(id);
+    const personality = store.readPersonality(id);
+    if (meta && personality !== null) {
+      resolved.push({ label: meta.label, personality });
+      return "";
+    }
+    return match;
+  });
+  if (resolved.length === 0) {
+    return { systemReminder: null, userText: rawText };
+  }
+  const blocks = resolved.map((r) => {
+    const safe = r.personality.replace(/<\/system-reminder>/gi, "</ system-reminder>");
+    return `[Acting as persona "${r.label}" for this message]
+${safe}`;
+  });
+  return {
+    systemReminder: `<system-reminder>
+${blocks.join("\n\n")}
+</system-reminder>`,
+    userText: body.trim()
+  };
+}
+
 // src/session/runner.ts
 var DEFAULT_CONTROL_REQUEST_TIMEOUT_MS = 1e4;
 function encodeAllowWithInputControlResponse(requestId, updatedInput) {
@@ -32916,6 +32499,7 @@ var SessionRunner = class {
   }
   // 外部推送 input 到 reducer，然后执行产出的 effects
   input(inputMsg) {
+    const personaStore = this.hooks.personaStore;
     const adapter = this.hooks.adapter;
     const deps = {
       // file-sharing (spec §6 PR 3)：在 stdout-line 解析时同步观察 file-edit 工具事件，
@@ -32925,10 +32509,20 @@ var SessionRunner = class {
         if (this.hooks.onFileEdit) this.observeForFileEdit(events);
         return events;
       },
-      // Persona dispatch (Task 9)：原 in-place `@persona/<id>` 注入路径已删，cc 自己看到字面
-      // token 会调 personaDispatch MCP tool 委派（dispatch.mcp.json 通过 cc --mcp-config 加载，
-      // CLAUDE.md 教 cc 触发条件）。encodeStdin 现在是 adapter 的简单 passthrough。
-      encodeStdin: (t, ctx) => adapter.encodeStdin(t, ctx) ?? "",
+      // persona mention injection 在 deps 装配处包一层，对 reducer 完全透明。
+      // 命中 mention 时拆成两条 stdin 帧（先 system-reminder 块、后 user 原文）：
+      //   - CC stream-json 按行处理，落盘是两条独立 user message；
+      //   - 第一条文本起头 `<system-reminder>` → classifyUserMessage 命中 → UI 折叠；
+      //   - 第二条正常用户气泡，刷新页面不再暴露 personality 文本。
+      encodeStdin: (t, ctx) => {
+        if (!personaStore) return adapter.encodeStdin(t, ctx) ?? "";
+        const { systemReminder, userText } = injectPersonaMentions(t, personaStore);
+        if (systemReminder === null) return adapter.encodeStdin(userText, ctx) ?? "";
+        const metaFrame = adapter.encodeStdin(systemReminder, ctx) ?? "";
+        if (userText === "") return metaFrame;
+        const userFrame = adapter.encodeStdin(userText, ctx) ?? "";
+        return metaFrame + userFrame;
+      },
       bufferCap: this.hooks.bufferCap ?? 500,
       now: this.hooks.now ?? Date.now,
       resolveContextWindow: this.hooks.resolveContextWindow,
@@ -32938,10 +32532,6 @@ var SessionRunner = class {
       // 单栏 refactor (spec 2026-06-02 §5.1): cc 子进程 env 注入 CLAWD_DAEMON_URL，让 assistant
       // curl daemon HTTP RPC adapter (/api/rpc/<method>) 触发管理操作。null = HTTP adapter 未启。
       getDaemonUrl: this.hooks.getDaemonUrl,
-      // Persona dispatch：透传 dispatch.mcp.json 路径闭包 + B→dispatchId 反查闭包。
-      // 见 reducer.buildSpawnContext 注 CLAWD_DISPATCH_ID env / 派生 SpawnContext.dispatchMcpConfigPath
-      getDispatchMcpConfigPath: this.hooks.getDispatchMcpConfigPath,
-      lookupDispatchByBSessionId: this.hooks.lookupDispatchByBSessionId,
       // ReadyGate v2：透传 mode 让 reducer send / ready-detected 分支决定走暂存队列还是直写
       mode: this.hooks.mode,
       // [RG-DBG] 注入 logger 让 reducer rgDbg 走 pino 进 clawd.log；定位完跟 rgDbg 一起删
@@ -33401,22 +32991,6 @@ function nowIso2(deps) {
 function newSessionId() {
   return v4_default().replace(/-/g, "").slice(0, 16);
 }
-function buildDispatchTaskPack(args) {
-  return `[Dispatched from owner \u2014 another persona session\u59D4\u6D3E\u7ED9\u4F60\u6267\u884C\u4EFB\u52A1]
-
-Task:
-${args.prompt}
-
-Source conversation (jsonl, CC stream-json format, one message per line):
-  ${args.sourceJsonlPath}
-You may read this file with your Read tool to understand context. You do not have to read it all.
-
-When done, call the MCP tool \`mcp__clawd-dispatch__personaDispatchComplete\` with your result:
-  - Success: { text: "...", filePaths?: ["abs/path", ...] }
-  - Failure: { isFailure: true, reason: "..." }
-
-dispatchId for this task: ${args.dispatchId}`;
-}
 function derivePersonaSpawnCwd(file, personaRoot) {
   const personaId = file.ownerPersonaId;
   if (!personaId) return file.cwd;
@@ -33714,8 +33288,7 @@ var SessionManager = class {
       // adapter 自己持有模型表 + 兜底逻辑（contains / opus-1M / [1m] 等），manager 不再 cache 转发
       resolveContextWindow: (tool, modelId) => this.deps.getAdapter(tool).resolveContextWindow(modelId),
       dataDir: this.deps.dataDir,
-      // personaStore 不再透给 runner hooks（in-place mention 注入路径已删，runner 不用）；
-      // manager 自身的 sandbox 派生仍直接读 this.deps.personaStore。
+      personaStore: this.deps.personaStore,
       ownerDisplayName: this.deps.ownerDisplayName,
       // Phase 2 capability platform (plan §3): 透传 personaRoot, buildSpawnArgs 据
       // cwd 是否在 personaRoot 下自动决定是否注入 --settings sandbox-settings.json.
@@ -33723,10 +33296,6 @@ var SessionManager = class {
       // 单栏 refactor (spec 2026-06-02 §5.1): 透传 daemon HTTP RPC base URL 闭包,
       // reducer 把它注入 cc 子进程 env CLAWD_DAEMON_URL.
       getDaemonUrl: this.deps.getDaemonUrl,
-      // Persona dispatch (Task 7): dispatch.mcp.json 路径 + B sessionId → dispatchId 反查
-      // 闭包透传给 reducer，让 cc spawn 加 --mcp-config flag + B session 注 CLAWD_DISPATCH_ID env.
-      getDispatchMcpConfigPath: this.deps.dispatchMcpConfigPath ? () => this.deps.dispatchMcpConfigPath ?? null : void 0,
-      lookupDispatchByBSessionId: this.deps.personaDispatchManager ? (bSid) => this.deps.personaDispatchManager?.lookupDispatchByBSessionId(bSid) : void 0,
       // file-sharing (spec §6 PR 3)：闭包 scope + sessionId，runner 只暴露 tool/relPath/cwd
       onFileEdit: attachmentGroup ? (input) => attachmentGroup.onFileEdit({
         scope,
@@ -33942,20 +33511,15 @@ var SessionManager = class {
   // 强制走 deps.store（即 default scope），不走 scopeForFile：mirror 物理落 default 即可。
   // 远端 creator / origin 字段原值保留（不被本机 ctx 派生覆写）。
   //
-  // strip 远端 personaId / dispatchedFromSessionId：mirror SessionFile 上这两个字段都指向
-  // 朋友 daemon 上的本地 id，本机不持有对应 persona / 源 session。留着会让按这些字段反查的
-  // 本机消费者（MyPersonasSection 按 ownerPersonaId 反查 persona、sidebar 按
-  // dispatchedFromSessionId 折叠 sub-session）走错分支。写入前清掉。#750 一族防线。
+  // strip 远端 personaId：mirror SessionFile 上的 ownerPersonaId 是朋友 daemon 的 persona
+  // 目录 id，本机不持有对应 persona。留着会让按 ownerPersonaId 反查的本机消费者
+  // （MyPersonasSection 等）把 mirror 误聚到同 id persona 下。写入前清掉。
   //
   // 与 manager.create / manager.update 区别：
   //   - 不走 newRunner / attachObserver / cwd 校验（mirror 是纯 metadata 层）
   //   - 不发 session:info 帧（manager.create / .update 通过 reducer/wireCollector 发 push）
   mirrorUpsert(file) {
-    const {
-      ownerPersonaId: _strippedPid,
-      dispatchedFromSessionId: _strippedDsp,
-      ...rest
-    } = file;
+    const { ownerPersonaId: _stripped, ...rest } = file;
     return this.deps.store.write(rest);
   }
   // mirror peer sessions：删本机 mirror SessionFile。mirror 一律落 default（mirrorUpsert
@@ -34540,66 +34104,6 @@ var SessionManager = class {
     this.runners.set(file.sessionId, runner);
     return runner;
   }
-  /**
-   * Persona dispatch: 启动 B session 并投递任务包当第一条 user message。
-   *
-   *   - 复用 persona-owner 创建路径（cwd=personaDir、scope=persona-owner、不沙箱）
-   *   - SessionFile 上写 dispatchedFromSessionId 关联回 A（UI 折叠用；mirror 一侧 strip）
-   *   - 跟 PersonaDispatchManager 双向登记 dispatchId ↔ B sessionId，让后续 reducer
-   *     buildSpawnContext 能反查到 dispatchId 注 CLAWD_DISPATCH_ID env
-   *   - 投 inject-owner-text 任务包；包尾教 B 用 personaDispatchComplete tool 回传
-   *
-   * cwd 派生与 SessionManager.create 的 owner persona 路径一致（derivePersonaSpawnCwd）。
-   */
-  createDispatchedSession(args) {
-    if (!this.deps.personaRoot) {
-      throw new Error("createDispatchedSession: personaRoot missing in ManagerDeps");
-    }
-    if (!this.deps.personaDispatchManager) {
-      throw new Error("createDispatchedSession: personaDispatchManager missing in ManagerDeps");
-    }
-    const sessionId = newSessionId();
-    const scope = {
-      kind: "persona",
-      personaId: args.targetPersona,
-      mode: "owner"
-    };
-    const cwd = import_node_path6.default.join(this.deps.personaRoot, safeFileName(args.targetPersona));
-    const now = (/* @__PURE__ */ new Date()).toISOString();
-    const file = {
-      sessionId,
-      cwd,
-      tool: "claude",
-      ownerPersonaId: args.targetPersona,
-      dispatchedFromSessionId: args.sourceSessionId,
-      createdAt: now,
-      updatedAt: now
-    };
-    this.storeFor(scope).write(file);
-    this.deps.personaDispatchManager.registerBSession(args.dispatchId, sessionId);
-    this.deps.logger?.info("dispatch.createDispatchedSession.file-written", {
-      dispatchId: args.dispatchId,
-      bSessionId: sessionId,
-      targetPersona: args.targetPersona,
-      cwd
-    });
-    const runner = this.ensureRunnerForScope(file, scope);
-    this.deps.logger?.info("dispatch.createDispatchedSession.runner-ready", {
-      dispatchId: args.dispatchId,
-      bSessionId: sessionId
-    });
-    const taskPack = buildDispatchTaskPack({
-      prompt: args.prompt,
-      sourceJsonlPath: args.sourceJsonlPath,
-      dispatchId: args.dispatchId
-    });
-    runner.input({ kind: "command", command: { kind: "send", text: taskPack } });
-    this.deps.logger?.info("dispatch.createDispatchedSession.task-pack-sent", {
-      dispatchId: args.dispatchId,
-      bSessionId: sessionId
-    });
-    return { sessionId };
-  }
   /**
    * 老板插话：把 'inject-owner-text' input 喂给对应 runner，
    * runner 不存在时按 scope 懒创建。
@@ -35621,6 +35125,39 @@ var DEFAULT_PERSONAS = [
       network: true
     }
   },
+  {
+    // 数据查询搭建师：复用 app-builder 流水线生成 dataclaw 只读查询页
+    // spec: clawd/superpowers/specs/2026-06-14-dataclaw-builder-design.md
+    personaId: "persona-dataclaw-builder",
+    label: "\u6570\u636E\u67E5\u8BE2\u642D\u5EFA\u5E08",
+    model: "opus",
+    iconKey: "assist",
+    public: false,
+    // 同 app-builder 的开发型 profile（逐字段照抄）：web 工具 + node/pnpm 工具链精确路径
+    // + 出站 TLD 通配白名单 + .secrets deny。复用同一条流水线 → 同一套沙箱授权。
+    sandboxProfile: {
+      permissions: {
+        defaultMode: "bypassPermissions",
+        allow: ["Read", "Edit", "Write", "Glob", "Grep", "WebFetch", "WebSearch"],
+        deny: ["Read(./.secrets/**)"]
+      },
+      sandbox: {
+        filesystem: {
+          allowRead: ["~/.npmrc", "~/Library/Preferences/pnpm", "~/.nvm", "~/Library/pnpm", "~/.local/share/pnpm", "~/.local/state/pnpm", "~/.npm", "~/.pnpm-store"],
+          allowWrite: ["~/Library/pnpm", "~/.local/share/pnpm", "~/.local/state/pnpm", "~/.npm", "~/.pnpm-store"]
+        },
+        network: {
+          allowedDomains: ["*.com", "*.org", "*.io", "*.net", "*.dev", "*.app", "*.cn", "*.co", "*.chat", "*.ai"],
+          allowLocalBinding: true
+        }
+      }
+    },
+    codexSandbox: {
+      writableRoots: ["~/Library/pnpm", "~/.local/share/pnpm", "~/.local/state/pnpm", "~/.npm", "~/.pnpm-store"],
+      denyRead: [".secrets/**"],
+      network: true
+    }
+  },
   {
     personaId: "persona-developer",
     label: "\u5F00\u53D1\u8005",
@@ -35779,6 +35316,56 @@ function migrateCodexSandbox(args) {
   }
   if (n > 0) args.logger.info("persona.codex-sandbox.done", { migrated: n });
 }
+function findDeployKitRoot() {
+  const candidates = [];
+  try {
+    const here = path11.dirname((0, import_node_url.fileURLToPath)(import_meta.url));
+    candidates.push(path11.resolve(here, "..", "deploy-kit"));
+  } catch {
+  }
+  if (process.argv[1]) {
+    candidates.push(path11.resolve(path11.dirname(process.argv[1]), "deploy-kit"));
+  }
+  for (const c of candidates) {
+    try {
+      if (fs9.statSync(c).isDirectory()) return c;
+    } catch {
+    }
+  }
+  return null;
+}
+function seedDeployKit(args) {
+  const dst = path11.join(args.dataDir, "deploy-kit");
+  fs9.cpSync(args.deployKitBundleRoot, dst, {
+    recursive: true,
+    dereference: true,
+    force: false,
+    errorOnExist: false
+  });
+  args.logger.info("deploy-kit.seed.done", { dst });
+}
+function refreshDeployKit(args) {
+  const dst = path11.join(args.dataDir, "deploy-kit");
+  if (!fs9.existsSync(dst)) {
+    seedDeployKit(args);
+    return;
+  }
+  for (const sub of ["scripts", "contract"]) {
+    const s = path11.join(args.deployKitBundleRoot, sub);
+    if (fs9.existsSync(s)) {
+      fs9.cpSync(s, path11.join(dst, sub), { recursive: true, force: true, dereference: true });
+    }
+  }
+  const secretsSrc = path11.join(args.deployKitBundleRoot, ".secrets");
+  if (fs9.existsSync(secretsSrc)) {
+    fs9.mkdirSync(path11.join(dst, ".secrets"), { recursive: true });
+    for (const f of fs9.readdirSync(secretsSrc)) {
+      if (!f.endsWith(".example")) continue;
+      fs9.copyFileSync(path11.join(secretsSrc, f), path11.join(dst, ".secrets", f));
+    }
+  }
+  args.logger.info("deploy-kit.refresh.done", { dst });
+}
 
 // src/index.ts
 init_claude();
@@ -36033,8 +35620,8 @@ function turnStartInput(text) {
   const items = [];
   let leftover = text;
   for (const m2 of text.matchAll(SKILL_RE)) {
-    const [marker, name, path59] = m2;
-    items.push({ type: "skill", name, path: path59 });
+    const [marker, name, path58] = m2;
+    items.push({ type: "skill", name, path: path58 });
     leftover = leftover.replace(marker, "");
   }
   for (const m2 of text.matchAll(ATTACHMENT_RE2)) {
@@ -36685,7 +36272,7 @@ init_claude_history();
 
 // src/pty/pty-child-process.ts
 var import_node_events = require("events");
-var import_node_stream2 = require("stream");
+var import_node_stream = require("stream");
 var PtyChildProcess = class extends import_node_events.EventEmitter {
   constructor(pty, opts = {}) {
     super();
@@ -36714,7 +36301,7 @@ var PtyChildProcess = class extends import_node_events.EventEmitter {
         pty.write(data);
       }
     };
-    this.stdin = new import_node_stream2.Writable({
+    this.stdin = new import_node_stream.Writable({
       decodeStrings: false,
       write: (chunk, _enc, cb) => {
         const s = typeof chunk === "string" ? chunk : chunk.toString("utf8");
@@ -36733,7 +36320,7 @@ var PtyChildProcess = class extends import_node_events.EventEmitter {
         }
       }
     });
-    this.stdout = new import_node_stream2.Readable({ read() {
+    this.stdout = new import_node_stream.Readable({ read() {
     } });
     pty.onData((data) => {
       if (!this.firstDataLogged) {
@@ -36746,7 +36333,7 @@ var PtyChildProcess = class extends import_node_events.EventEmitter {
       }
       this.stdout.push(Buffer.from(data, "utf8"));
     });
-    this.stderr = new import_node_stream2.Readable({ read() {
+    this.stderr = new import_node_stream.Readable({ read() {
     } });
     pty.onExit(({ exitCode, signal }) => {
       this.exitCode = exitCode;
@@ -37261,9 +36848,6 @@ function buildTuiSpawnArgs(ctx, isResume = false) {
   if (ctx.addDirs) {
     for (const dir of ctx.addDirs) args.push("--add-dir", dir);
   }
-  if (ctx.dispatchMcpConfigPath) {
-    args.push("--mcp-config", ctx.dispatchMcpConfigPath);
-  }
   if (ctx.effort) args.push("--effort", ctx.effort);
   return args;
 }
@@ -37281,155 +36865,6 @@ function jsonlExistsForCtx(ctx) {
 // src/index.ts
 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;
-  }
-  deps;
-  map = /* @__PURE__ */ new Map();
-  start(args) {
-    const dispatchId = this.deps.genId();
-    this.map.set(dispatchId, {
-      dispatchId,
-      sourceSessionId: args.sourceSessionId,
-      targetPersona: args.targetPersona,
-      waiters: [],
-      outcome: null
-    });
-    return { dispatchId };
-  }
-  get(dispatchId) {
-    return this.map.get(dispatchId);
-  }
-  async wait(dispatchId) {
-    const state = this.map.get(dispatchId);
-    if (!state) throw new Error(`unknown dispatchId: ${dispatchId}`);
-    if (state.outcome) return state.outcome;
-    const d = defer();
-    state.waiters.push(d);
-    return d.promise;
-  }
-  complete(dispatchId, outcome) {
-    const state = this.map.get(dispatchId);
-    if (!state) throw new Error(`unknown dispatchId: ${dispatchId}`);
-    state.outcome = outcome;
-    const waiters = state.waiters;
-    state.waiters = [];
-    for (const w2 of waiters) w2.resolve(outcome);
-  }
-  /** SessionManager 在 createDispatchedSession 时调，建立 dispatchId → B sessionId 映射 */
-  registerBSession(dispatchId, bSessionId) {
-    const state = this.map.get(dispatchId);
-    if (!state) throw new Error(`unknown dispatchId: ${dispatchId}`);
-    state.bSessionId = bSessionId;
-  }
-  /** reducer buildSpawnContext 调，按 B 的 sessionId 反查 dispatchId（用于注 CLAWD_DISPATCH_ID env） */
-  lookupDispatchByBSessionId(bSessionId) {
-    for (const state of this.map.values()) {
-      if (state.bSessionId === bSessionId) return state.dispatchId;
-    }
-    return void 0;
-  }
-};
-
-// src/dispatch/mcp-config.ts
-var import_node_fs12 = __toESM(require("fs"), 1);
-var import_node_path10 = __toESM(require("path"), 1);
-function dispatchMcpConfigPath(dataDir) {
-  return import_node_path10.default.join(dataDir, "dispatch.mcp.json");
-}
-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",
-    mcpServers: {
-      "clawd-dispatch": {
-        type: "stdio",
-        command: "node",
-        args: [args.serverScriptPath],
-        ...args.logPath ? { env: { CLAWD_DISPATCH_LOG: args.logPath } } : {}
-      }
-    }
-  };
-  import_node_fs12.default.mkdirSync(args.dataDir, { recursive: true });
-  import_node_fs12.default.writeFileSync(cfgPath, JSON.stringify(content, null, 2), "utf8");
-  return cfgPath;
-}
-
-// src/handlers/persona-dispatch.ts
-init_protocol();
-function buildPersonaDispatchHandlers(deps) {
-  const { personaDispatchManager: mgr, spawnB, logger } = deps;
-  const run = async (frame) => {
-    const { type: _t, requestId: _r, ...rest } = frame;
-    const sourceSessionId = typeof rest.sessionId === "string" ? rest.sessionId : void 0;
-    const args = DispatchRunArgsSchema.parse(rest);
-    if (!sourceSessionId) {
-      throw new Error(
-        "personaDispatch:run requires sessionId (caller must pass x-clawd-session-id header)"
-      );
-    }
-    const { dispatchId } = mgr.start({
-      sourceSessionId,
-      targetPersona: args.targetPersona
-    });
-    logger?.info("dispatch.run.received", {
-      dispatchId,
-      sourceSessionId,
-      targetPersona: args.targetPersona,
-      promptLen: args.prompt.length
-    });
-    void spawnB({
-      dispatchId,
-      sourceSessionId,
-      targetPersona: args.targetPersona,
-      prompt: args.prompt
-    }).then(() => {
-      logger?.info("dispatch.spawnB.ok", { dispatchId });
-    }).catch((err) => {
-      const reason = err instanceof Error ? err.message : String(err);
-      logger?.warn("dispatch.spawnB.failed", { dispatchId, reason });
-      mgr.complete(dispatchId, {
-        kind: "failure",
-        reason: `failed to spawn B: ${reason}`
-      });
-    });
-    logger?.info("dispatch.run.waiting", { dispatchId });
-    const outcome = await mgr.wait(dispatchId);
-    logger?.info("dispatch.run.resolved", {
-      dispatchId,
-      outcomeKind: outcome.kind
-    });
-    return {
-      response: { type: "personaDispatch:run:ok", outcome }
-    };
-  };
-  const complete = async (frame) => {
-    const { type: _t, requestId: _r, ...rest } = frame;
-    const args = DispatchCompleteArgsSchema.parse(rest);
-    logger?.info("dispatch.complete.received", {
-      dispatchId: args.dispatchId,
-      outcomeKind: args.outcome.kind
-    });
-    mgr.complete(args.dispatchId, args.outcome);
-    return {
-      response: { type: "personaDispatch:complete:ok" }
-    };
-  };
-  return {
-    "personaDispatch:run": run,
-    "personaDispatch:complete": complete
-  };
-}
-
 // src/tools/codex-history.ts
 var import_node_child_process5 = require("child_process");
 var DEFAULT_TIMEOUT_MS = 8e3;
@@ -37616,13 +37051,13 @@ function mapSkillsListResponse(res) {
       const r = s ?? {};
       const name = str3(r.name);
       if (!name) continue;
-      const path59 = str3(r.path);
+      const path58 = str3(r.path);
       const description = str3(r.description);
       const isPlugin = name.includes(":");
       out.push({
         name,
         source: isPlugin ? "plugin" : "project",
-        ...path59 ? { path: path59 } : {},
+        ...path58 ? { path: path58 } : {},
         ...description ? { description } : {},
         ...isPlugin ? { plugin: name.split(":")[0] } : {}
       });
@@ -37661,23 +37096,23 @@ async function listCodexSkills(cwd, deps = {}) {
 }
 
 // src/workspace/browser.ts
-var import_node_fs13 = __toESM(require("fs"), 1);
+var import_node_fs12 = __toESM(require("fs"), 1);
 var import_node_os6 = __toESM(require("os"), 1);
-var import_node_path11 = __toESM(require("path"), 1);
+var import_node_path10 = __toESM(require("path"), 1);
 init_protocol();
 var MAX_FILE_BYTES = 2 * 1024 * 1024;
 function resolveInsideCwd(cwd, subpath) {
-  const absCwd = import_node_path11.default.resolve(cwd);
-  const joined = import_node_path11.default.resolve(absCwd, subpath ?? ".");
-  const rel = import_node_path11.default.relative(absCwd, joined);
-  if (rel.startsWith("..") || import_node_path11.default.isAbsolute(rel)) {
+  const absCwd = import_node_path10.default.resolve(cwd);
+  const joined = import_node_path10.default.resolve(absCwd, subpath ?? ".");
+  const rel = import_node_path10.default.relative(absCwd, joined);
+  if (rel.startsWith("..") || import_node_path10.default.isAbsolute(rel)) {
     throw new ClawdError(ERROR_CODES.INVALID_PATH, `path escapes cwd: ${subpath}`);
   }
   return joined;
 }
 function ensureCwd(cwd) {
   try {
-    const stat = import_node_fs13.default.statSync(cwd);
+    const stat = import_node_fs12.default.statSync(cwd);
     if (!stat.isDirectory()) {
       throw new ClawdError(ERROR_CODES.INVALID_CWD, `not a directory: ${cwd}`);
     }
@@ -37691,7 +37126,7 @@ var WorkspaceBrowser = class {
     const cwd = args.cwd && args.cwd.length > 0 ? args.cwd : import_node_os6.default.homedir();
     ensureCwd(cwd);
     const full = resolveInsideCwd(cwd, args.path);
-    const dirents = import_node_fs13.default.readdirSync(full, { withFileTypes: true });
+    const dirents = import_node_fs12.default.readdirSync(full, { withFileTypes: true });
     const entries = [];
     for (const d of dirents) {
       if (!args.showHidden && d.name.startsWith(".")) continue;
@@ -37701,7 +37136,7 @@ var WorkspaceBrowser = class {
         mtime: ""
       };
       try {
-        const st = import_node_fs13.default.statSync(import_node_path11.default.join(full, d.name));
+        const st = import_node_fs12.default.statSync(import_node_path10.default.join(full, d.name));
         entry.mtime = new Date(st.mtimeMs).toISOString();
         if (d.isFile()) entry.size = st.size;
       } catch {
@@ -37717,14 +37152,14 @@ var WorkspaceBrowser = class {
   read(args) {
     ensureCwd(args.cwd);
     const full = resolveInsideCwd(args.cwd, args.path);
-    const st = import_node_fs13.default.statSync(full);
+    const st = import_node_fs12.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_fs13.default.readFileSync(full);
+    const buf = import_node_fs12.default.readFileSync(full);
     const isBinary = buf.includes(0);
     if (isBinary) {
       return {
@@ -37746,20 +37181,20 @@ var WorkspaceBrowser = class {
 };
 
 // src/skills/agents-scanner.ts
-var import_node_fs14 = __toESM(require("fs"), 1);
+var import_node_fs13 = __toESM(require("fs"), 1);
 var import_node_os7 = __toESM(require("os"), 1);
-var import_node_path12 = __toESM(require("path"), 1);
+var import_node_path11 = __toESM(require("path"), 1);
 var DEFAULT_POLICY_DIR_DARWIN = "/Library/Application Support/ClaudeCode/.claude/agents";
 function isDirLikeSync2(p2) {
   try {
-    return import_node_fs14.default.statSync(p2).isDirectory();
+    return import_node_fs13.default.statSync(p2).isDirectory();
   } catch {
     return false;
   }
 }
 function fileExistsSync(p2) {
   try {
-    return import_node_fs14.default.statSync(p2).isFile();
+    return import_node_fs13.default.statSync(p2).isFile();
   } catch {
     return false;
   }
@@ -37767,7 +37202,7 @@ function fileExistsSync(p2) {
 function parseAgentFile(filePath) {
   let content;
   try {
-    content = import_node_fs14.default.readFileSync(filePath, "utf8");
+    content = import_node_fs13.default.readFileSync(filePath, "utf8");
   } catch {
     return {};
   }
@@ -37780,16 +37215,16 @@ function parseAgentFile(filePath) {
 function scanAgentsDir(dir, source, seen, out) {
   let entries;
   try {
-    entries = import_node_fs14.default.readdirSync(dir, { withFileTypes: true });
+    entries = import_node_fs13.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_path12.default.join(dir, ent.name)))) {
+    if (!ent.isFile() && !(ent.isSymbolicLink() && fileExistsSync(import_node_path11.default.join(dir, ent.name)))) {
       continue;
     }
-    const filePath = import_node_path12.default.join(dir, ent.name);
+    const filePath = import_node_path11.default.join(dir, ent.name);
     const baseName = ent.name.replace(/\.md$/, "");
     if (seen.has(baseName)) continue;
     seen.add(baseName);
@@ -37807,12 +37242,12 @@ function scanPluginAgentsTree(root, pluginName, seen, out) {
   function walk2(dir, namespaces) {
     let entries;
     try {
-      entries = import_node_fs14.default.readdirSync(dir, { withFileTypes: true });
+      entries = import_node_fs13.default.readdirSync(dir, { withFileTypes: true });
     } catch {
       return;
     }
     for (const ent of entries) {
-      const childPath = import_node_path12.default.join(dir, ent.name);
+      const childPath = import_node_path11.default.join(dir, ent.name);
       if (ent.isDirectory() || ent.isSymbolicLink() && isDirLikeSync2(childPath)) {
         walk2(childPath, [...namespaces, ent.name]);
         continue;
@@ -37837,13 +37272,13 @@ function scanPluginAgentsTree(root, pluginName, seen, out) {
   walk2(root, []);
 }
 function readInstalledPlugins2(home) {
-  const pluginsDir = import_node_path12.default.join(home, ".claude", "plugins");
-  const v2 = import_node_path12.default.join(pluginsDir, "installed_plugins_v2.json");
-  const v1 = import_node_path12.default.join(pluginsDir, "installed_plugins.json");
+  const pluginsDir = import_node_path11.default.join(home, ".claude", "plugins");
+  const v2 = import_node_path11.default.join(pluginsDir, "installed_plugins_v2.json");
+  const v1 = import_node_path11.default.join(pluginsDir, "installed_plugins.json");
   let raw = null;
   for (const candidate of [v2, v1]) {
     try {
-      raw = import_node_fs14.default.readFileSync(candidate, "utf8");
+      raw = import_node_fs13.default.readFileSync(candidate, "utf8");
       break;
     } catch {
     }
@@ -37868,19 +37303,19 @@ function readInstalledPlugins2(home) {
   return out;
 }
 function walkUpProjectAgentsDirs(startCwd, home, seen, out) {
-  let cur = import_node_path12.default.resolve(startCwd);
-  const fsRoot = import_node_path12.default.parse(cur).root;
+  let cur = import_node_path11.default.resolve(startCwd);
+  const fsRoot = import_node_path11.default.parse(cur).root;
   while (true) {
-    scanAgentsDir(import_node_path12.default.join(cur, ".claude", "agents"), "project", seen, out);
+    scanAgentsDir(import_node_path11.default.join(cur, ".claude", "agents"), "project", seen, out);
     let hasGit = false;
     try {
-      hasGit = import_node_fs14.default.existsSync(import_node_path12.default.join(cur, ".git"));
+      hasGit = import_node_fs13.default.existsSync(import_node_path11.default.join(cur, ".git"));
     } catch {
     }
     if (hasGit) return;
     if (cur === home) return;
     if (cur === fsRoot) return;
-    const parent = import_node_path12.default.dirname(cur);
+    const parent = import_node_path11.default.dirname(cur);
     if (parent === cur) return;
     cur = parent;
   }
@@ -37915,7 +37350,7 @@ var AgentsScanner = class {
     }
     const fsBlock = [];
     scanAgentsDir(
-      import_node_path12.default.join(this.home, ".claude", "agents"),
+      import_node_path11.default.join(this.home, ".claude", "agents"),
       "global",
       seen,
       fsBlock
@@ -37929,7 +37364,7 @@ var AgentsScanner = class {
       ...this.extraPluginRoots
     ];
     for (const { name, root } of plugins) {
-      const agentsRoot = import_node_path12.default.join(root, "agents");
+      const agentsRoot = import_node_path11.default.join(root, "agents");
       scanPluginAgentsTree(agentsRoot, name, seen, fsBlock);
     }
     return [...builtinBlock, ...fsBlock];
@@ -37937,15 +37372,15 @@ var AgentsScanner = class {
 };
 
 // src/observer/session-observer.ts
-var import_node_fs16 = __toESM(require("fs"), 1);
+var import_node_fs15 = __toESM(require("fs"), 1);
 var import_node_os9 = __toESM(require("os"), 1);
-var import_node_path14 = __toESM(require("path"), 1);
+var import_node_path13 = __toESM(require("path"), 1);
 init_claude_history();
 
 // src/observer/subagent-meta-observer.ts
-var import_node_fs15 = __toESM(require("fs"), 1);
+var import_node_fs14 = __toESM(require("fs"), 1);
 var import_node_os8 = __toESM(require("os"), 1);
-var import_node_path13 = __toESM(require("path"), 1);
+var import_node_path12 = __toESM(require("path"), 1);
 init_claude_history();
 var META_RE = /^agent-([A-Za-z0-9_-]+)\.meta\.json$/;
 var SubagentMetaObserver = class {
@@ -37958,7 +37393,7 @@ var SubagentMetaObserver = class {
   watches = /* @__PURE__ */ new Map();
   // public for spec only：测试直接拼路径写假 meta.json；生产 start() 内部自己解析
   resolveSubagentDir(cwd, toolSessionId) {
-    return import_node_path13.default.join(
+    return import_node_path12.default.join(
       this.home,
       ".claude",
       "projects",
@@ -37988,7 +37423,7 @@ var SubagentMetaObserver = class {
   attachWatcher(w2) {
     if (w2.watcher) return;
     try {
-      w2.watcher = import_node_fs15.default.watch(w2.dirPath, { persistent: false }, (_evt, name) => {
+      w2.watcher = import_node_fs14.default.watch(w2.dirPath, { persistent: false }, (_evt, name) => {
         if (!name) return;
         const m2 = META_RE.exec(String(name));
         if (!m2) return;
@@ -38000,7 +37435,7 @@ var SubagentMetaObserver = class {
   scan(w2) {
     let entries;
     try {
-      entries = import_node_fs15.default.readdirSync(w2.dirPath);
+      entries = import_node_fs14.default.readdirSync(w2.dirPath);
     } catch {
       return;
     }
@@ -38014,10 +37449,10 @@ var SubagentMetaObserver = class {
     if (!m2) return;
     const agentId = m2[1];
     if (w2.emitted.has(agentId)) return;
-    const file = import_node_path13.default.join(w2.dirPath, name);
+    const file = import_node_path12.default.join(w2.dirPath, name);
     let raw;
     try {
-      raw = import_node_fs15.default.readFileSync(file, "utf8");
+      raw = import_node_fs14.default.readFileSync(file, "utf8");
     } catch {
       return;
     }
@@ -38074,14 +37509,14 @@ var SessionObserver = class {
   metaObserver;
   resolveJsonlPath(cwd, toolSessionId, override) {
     if (override) return override;
-    return import_node_path14.default.join(this.home, ".claude", "projects", cwdToHashDir(cwd), `${toolSessionId}.jsonl`);
+    return import_node_path13.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_fs16.default.statSync(filePath).size;
+      size = import_node_fs15.default.statSync(filePath).size;
     } catch {
     }
     const w2 = {
@@ -38095,10 +37530,10 @@ var SessionObserver = class {
       prevIsRejectSentinel: false
     };
     try {
-      import_node_fs16.default.mkdirSync(import_node_path14.default.dirname(filePath), { recursive: true });
+      import_node_fs15.default.mkdirSync(import_node_path13.default.dirname(filePath), { recursive: true });
     } catch {
     }
-    w2.watcher = import_node_fs16.default.watch(import_node_path14.default.dirname(filePath), { persistent: false }, (_event, changedName) => {
+    w2.watcher = import_node_fs15.default.watch(import_node_path13.default.dirname(filePath), { persistent: false }, (_event, changedName) => {
       if (!changedName || !filePath.endsWith(changedName)) return;
       this.poll(w2);
     });
@@ -38121,7 +37556,7 @@ var SessionObserver = class {
   // 异常静默吞，不阻塞 watcher 启动
   hydrateMetaTail(w2, maxLines = 200) {
     try {
-      const raw = import_node_fs16.default.readFileSync(w2.filePath, "utf8");
+      const raw = import_node_fs15.default.readFileSync(w2.filePath, "utf8");
       if (!raw) return;
       const allLines = raw.split("\n").filter((l) => l.trim().length > 0);
       if (allLines.length === 0) return;
@@ -38145,7 +37580,7 @@ var SessionObserver = class {
   poll(w2) {
     let size = 0;
     try {
-      size = import_node_fs16.default.statSync(w2.filePath).size;
+      size = import_node_fs15.default.statSync(w2.filePath).size;
     } catch {
       return;
     }
@@ -38154,11 +37589,11 @@ var SessionObserver = class {
       w2.buf = "";
     }
     if (size === w2.lastSize) return;
-    const fd = import_node_fs16.default.openSync(w2.filePath, "r");
+    const fd = import_node_fs15.default.openSync(w2.filePath, "r");
     try {
       const len = size - w2.lastSize;
       const buf = Buffer.alloc(len);
-      import_node_fs16.default.readSync(fd, buf, 0, len, w2.lastSize);
+      import_node_fs15.default.readSync(fd, buf, 0, len, w2.lastSize);
       w2.lastSize = size;
       w2.buf += buf.toString("utf8");
       let newlineIndex;
@@ -38181,7 +37616,7 @@ var SessionObserver = class {
         }
       }
     } finally {
-      import_node_fs16.default.closeSync(fd);
+      import_node_fs15.default.closeSync(fd);
     }
   }
   // 解析 JSONL 单行：仅当是主链 user 文本行（非 sidechain / 非 sub-agent / message.role='user'
@@ -38276,7 +37711,7 @@ var import_stream = __toESM(require_stream(), 1);
 var import_extension = __toESM(require_extension(), 1);
 var import_permessage_deflate = __toESM(require_permessage_deflate(), 1);
 var import_receiver = __toESM(require_receiver(), 1);
-var import_sender2 = __toESM(require_sender(), 1);
+var import_sender = __toESM(require_sender(), 1);
 var import_subprotocol = __toESM(require_subprotocol(), 1);
 var import_websocket = __toESM(require_websocket(), 1);
 var import_websocket_server = __toESM(require_websocket_server(), 1);
@@ -38904,14 +38339,14 @@ async function authenticate(token, deps) {
 }
 
 // src/permission/capability-store.ts
-var fs19 = __toESM(require("fs"), 1);
-var path19 = __toESM(require("path"), 1);
+var fs18 = __toESM(require("fs"), 1);
+var path18 = __toESM(require("path"), 1);
 var CAPABILITIES_FILE_NAME = "capabilities.json";
 var FILE_VERSION = 1;
 var CapabilityStore = class {
   constructor(dataDir) {
     this.dataDir = dataDir;
-    fs19.mkdirSync(dataDir, { recursive: true });
+    fs18.mkdirSync(dataDir, { recursive: true });
     this.cache = this.readFromDisk();
   }
   dataDir;
@@ -38935,13 +38370,13 @@ var CapabilityStore = class {
     this.flush();
   }
   filePath() {
-    return path19.join(this.dataDir, CAPABILITIES_FILE_NAME);
+    return path18.join(this.dataDir, CAPABILITIES_FILE_NAME);
   }
   readFromDisk() {
     const file = this.filePath();
     let raw;
     try {
-      raw = fs19.readFileSync(file, "utf8");
+      raw = fs18.readFileSync(file, "utf8");
     } catch (err) {
       if (err?.code === "ENOENT") return [];
       return [];
@@ -38969,10 +38404,10 @@ var CapabilityStore = class {
   }
   atomicWrite(file, content) {
     const tmp = `${file}.tmp-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
-    fs19.writeFileSync(tmp, content, { mode: 384 });
-    fs19.renameSync(tmp, file);
+    fs18.writeFileSync(tmp, content, { mode: 384 });
+    fs18.renameSync(tmp, file);
     try {
-      fs19.chmodSync(file, 384);
+      fs18.chmodSync(file, 384);
     } catch {
     }
   }
@@ -39065,14 +38500,14 @@ var CapabilityManager = class {
 };
 
 // src/permission/cleanup.ts
-var fs20 = __toESM(require("fs"), 1);
+var fs19 = __toESM(require("fs"), 1);
 function cleanupGuestSessionsForCapability(cap, factory) {
   const removed = [];
   for (const g2 of cap.grants) {
     if (g2.resource.type !== "persona") continue;
     const dir = factory.vmGuestRoot(g2.resource.id, cap.id);
     try {
-      fs20.rmSync(dir, { recursive: true, force: true });
+      fs19.rmSync(dir, { recursive: true, force: true });
       removed.push(dir);
     } catch {
     }
@@ -39081,13 +38516,13 @@ function cleanupGuestSessionsForCapability(cap, factory) {
 }
 
 // src/inbox/inbox-store.ts
-var fs21 = __toESM(require("fs"), 1);
-var path20 = __toESM(require("path"), 1);
+var fs20 = __toESM(require("fs"), 1);
+var path19 = __toESM(require("path"), 1);
 var INBOX_SUBDIR = "inbox";
 var InboxStore = class {
   constructor(dataDir) {
     this.dataDir = dataDir;
-    fs21.mkdirSync(this.dirPath(), { recursive: true });
+    fs20.mkdirSync(this.dirPath(), { recursive: true });
   }
   dataDir;
   /**
@@ -39099,7 +38534,7 @@ var InboxStore = class {
     const file = this.filePath(peerDeviceId);
     let raw;
     try {
-      raw = fs21.readFileSync(file, "utf8");
+      raw = fs20.readFileSync(file, "utf8");
     } catch (err) {
       if (err?.code === "ENOENT") return [];
       return [];
@@ -39115,7 +38550,7 @@ var InboxStore = class {
     const dir = this.dirPath();
     let entries;
     try {
-      entries = fs21.readdirSync(dir);
+      entries = fs20.readdirSync(dir);
     } catch (err) {
       if (err?.code === "ENOENT") return [];
       return [];
@@ -39131,9 +38566,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";
-    fs21.appendFileSync(file, line, { mode: 384 });
+    fs20.appendFileSync(file, line, { mode: 384 });
     try {
-      fs21.chmodSync(file, 384);
+      fs20.chmodSync(file, 384);
     } catch {
     }
   }
@@ -39163,7 +38598,7 @@ var InboxStore = class {
   removeByPeerDeviceId(peerDeviceId) {
     const file = this.filePath(peerDeviceId);
     try {
-      fs21.unlinkSync(file);
+      fs20.unlinkSync(file);
     } catch (err) {
       if (err?.code === "ENOENT") return;
     }
@@ -39172,18 +38607,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" : "");
-    fs21.writeFileSync(tmp, content, { mode: 384 });
-    fs21.renameSync(tmp, file);
+    fs20.writeFileSync(tmp, content, { mode: 384 });
+    fs20.renameSync(tmp, file);
     try {
-      fs21.chmodSync(file, 384);
+      fs20.chmodSync(file, 384);
     } catch {
     }
   }
   dirPath() {
-    return path20.join(this.dataDir, INBOX_SUBDIR);
+    return path19.join(this.dataDir, INBOX_SUBDIR);
   }
   filePath(peerDeviceId) {
-    return path20.join(this.dirPath(), `${peerDeviceId}.jsonl`);
+    return path19.join(this.dirPath(), `${peerDeviceId}.jsonl`);
   }
 };
 function parseAllLines(raw) {
@@ -39270,8 +38705,8 @@ var InboxManager = class {
 };
 
 // src/state/contact-store.ts
-var fs22 = __toESM(require("fs"), 1);
-var path21 = __toESM(require("path"), 1);
+var fs21 = __toESM(require("fs"), 1);
+var path20 = __toESM(require("path"), 1);
 var FILE_NAME = "contacts.json";
 var ContactStore = class {
   constructor(dataDir) {
@@ -39281,10 +38716,10 @@ var ContactStore = class {
   contacts = /* @__PURE__ */ new Map();
   load() {
     this.contacts.clear();
-    const file = path21.join(this.dataDir, FILE_NAME);
+    const file = path20.join(this.dataDir, FILE_NAME);
     let raw;
     try {
-      raw = fs22.readFileSync(file, "utf8");
+      raw = fs21.readFileSync(file, "utf8");
     } catch (err) {
       if (err?.code !== "ENOENT") this.renameBak(file);
       return;
@@ -39327,20 +38762,20 @@ var ContactStore = class {
     return existed;
   }
   flush() {
-    const file = path21.join(this.dataDir, FILE_NAME);
+    const file = path20.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
     );
-    fs22.mkdirSync(this.dataDir, { recursive: true });
-    fs22.writeFileSync(tmp, content, { mode: 384 });
-    fs22.renameSync(tmp, file);
+    fs21.mkdirSync(this.dataDir, { recursive: true });
+    fs21.writeFileSync(tmp, content, { mode: 384 });
+    fs21.renameSync(tmp, file);
   }
   renameBak(file) {
     try {
-      fs22.renameSync(file, `${file}.bak`);
+      fs21.renameSync(file, `${file}.bak`);
     } catch {
     }
   }
@@ -39490,61 +38925,61 @@ async function autoReverseContact(args) {
 }
 
 // src/migrations/2026-05-20-flatten-sessions.ts
-var fs23 = __toESM(require("fs"), 1);
-var path22 = __toESM(require("path"), 1);
+var fs22 = __toESM(require("fs"), 1);
+var path21 = __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 = path22.join(dataDir, "sessions");
-  const flagPath = path22.join(sessionsDir, MIGRATION_FLAG_NAME);
+  const sessionsDir = path21.join(dataDir, "sessions");
+  const flagPath = path21.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 = path22.join(sessionsDir, "default");
+  const defaultDir = path21.join(sessionsDir, "default");
   if (existsSync3(defaultDir)) {
     for (const entry of readdirSafe(defaultDir)) {
       if (!entry.endsWith(".json")) continue;
-      const src = path22.join(defaultDir, entry);
-      const dst = path22.join(sessionsDir, entry);
-      fs23.renameSync(src, dst);
+      const src = path21.join(defaultDir, entry);
+      const dst = path21.join(sessionsDir, entry);
+      fs22.renameSync(src, dst);
       movedBare += 1;
     }
     rmdirIfEmpty(defaultDir);
   }
   for (const pid of readdirSafe(sessionsDir)) {
-    const personaDir = path22.join(sessionsDir, pid);
+    const personaDir = path21.join(sessionsDir, pid);
     if (!isDir(personaDir)) continue;
     if (pid === "default") continue;
-    const ownerSrc = path22.join(personaDir, "owner");
+    const ownerSrc = path21.join(personaDir, "owner");
     if (existsSync3(ownerSrc) && isDir(ownerSrc)) {
-      const ownerDst = path22.join(dataDir, "personas", pid, ".clawd", "sessions", "owner");
-      fs23.mkdirSync(ownerDst, { recursive: true });
+      const ownerDst = path21.join(dataDir, "personas", pid, ".clawd", "sessions", "owner");
+      fs22.mkdirSync(ownerDst, { recursive: true });
       for (const file of readdirSafe(ownerSrc)) {
         if (!file.endsWith(".json")) continue;
-        fs23.renameSync(path22.join(ownerSrc, file), path22.join(ownerDst, file));
+        fs22.renameSync(path21.join(ownerSrc, file), path21.join(ownerDst, file));
         movedVmOwner += 1;
       }
       rmdirIfEmpty(ownerSrc);
     }
-    const listenerSrc = path22.join(personaDir, "listener");
+    const listenerSrc = path21.join(personaDir, "listener");
     if (existsSync3(listenerSrc) && isDir(listenerSrc)) {
-      const archiveDst = path22.join(dataDir, ".legacy", `listener-${pid}`);
-      fs23.mkdirSync(archiveDst, { recursive: true });
+      const archiveDst = path21.join(dataDir, ".legacy", `listener-${pid}`);
+      fs22.mkdirSync(archiveDst, { recursive: true });
       for (const file of readdirSafe(listenerSrc)) {
         if (!file.endsWith(".json")) continue;
-        fs23.renameSync(path22.join(listenerSrc, file), path22.join(archiveDst, file));
+        fs22.renameSync(path21.join(listenerSrc, file), path21.join(archiveDst, file));
         archivedListener += 1;
       }
       rmdirIfEmpty(listenerSrc);
     }
     rmdirIfEmpty(personaDir);
   }
-  fs23.mkdirSync(sessionsDir, { recursive: true });
-  fs23.writeFileSync(flagPath, JSON.stringify({ migratedAt: now() }, null, 2));
+  fs22.mkdirSync(sessionsDir, { recursive: true });
+  fs22.writeFileSync(flagPath, JSON.stringify({ migratedAt: now() }, null, 2));
   return {
     skipped: false,
     flagWritten: true,
@@ -39555,7 +38990,7 @@ function migrateFlattenSessions(opts) {
 }
 function existsSync3(p2) {
   try {
-    fs23.statSync(p2);
+    fs22.statSync(p2);
     return true;
   } catch {
     return false;
@@ -39563,31 +38998,31 @@ function existsSync3(p2) {
 }
 function isDir(p2) {
   try {
-    return fs23.statSync(p2).isDirectory();
+    return fs22.statSync(p2).isDirectory();
   } catch {
     return false;
   }
 }
 function readdirSafe(p2) {
   try {
-    return fs23.readdirSync(p2);
+    return fs22.readdirSync(p2);
   } catch {
     return [];
   }
 }
 function rmdirIfEmpty(p2) {
   try {
-    fs23.rmdirSync(p2);
+    fs22.rmdirSync(p2);
   } catch {
   }
 }
 
 // src/transport/http-router.ts
-var import_node_fs18 = __toESM(require("fs"), 1);
-var import_node_path18 = __toESM(require("path"), 1);
+var import_node_fs17 = __toESM(require("fs"), 1);
+var import_node_path17 = __toESM(require("path"), 1);
 
 // src/attachment/mime.ts
-var import_node_path15 = __toESM(require("path"), 1);
+var import_node_path14 = __toESM(require("path"), 1);
 var TEXT_PLAIN = "text/plain; charset=utf-8";
 var EXT_TO_NATIVE_MIME = {
   // 图片
@@ -39694,7 +39129,7 @@ var TEXT_EXTENSIONS = /* @__PURE__ */ new Set([
   ".mk"
 ]);
 function lookupMime(filePathOrName) {
-  const ext = import_node_path15.default.extname(filePathOrName).toLowerCase();
+  const ext = import_node_path14.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";
@@ -39763,8 +39198,8 @@ function verifySignedUrl(secret, absPath, eRaw, s, now = Date.now) {
 }
 
 // src/attachment/upload.ts
-var import_node_fs17 = __toESM(require("fs"), 1);
-var import_node_path16 = __toESM(require("path"), 1);
+var import_node_fs16 = __toESM(require("fs"), 1);
+var import_node_path15 = __toESM(require("path"), 1);
 var import_node_crypto5 = __toESM(require("crypto"), 1);
 var import_promises = require("stream/promises");
 var UploadError = class extends Error {
@@ -39776,22 +39211,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_path16.default.basename(fileName)) {
+  if (fileName.length === 0 || fileName === "." || fileName === ".." || fileName.startsWith(".") || fileName.includes("/") || fileName.includes("\\") || fileName !== import_node_path15.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_path16.default.join(args.sessionDir, ".attachments");
+  const attachmentsRoot = import_node_path15.default.join(args.sessionDir, ".attachments");
   try {
-    import_node_fs17.default.mkdirSync(attachmentsRoot, { recursive: true });
+    import_node_fs16.default.mkdirSync(attachmentsRoot, { recursive: true });
   } catch (err) {
     throw new UploadError("STORAGE_ERROR", `mkdir failed: ${err.message}`);
   }
   const hasher = import_node_crypto5.default.createHash("sha256");
   let actualSize = 0;
-  const tmpPath = import_node_path16.default.join(
+  const tmpPath = import_node_path15.default.join(
     attachmentsRoot,
     `.upload-${process.pid}-${Date.now()}-${import_node_crypto5.default.randomBytes(4).toString("hex")}`
   );
@@ -39806,18 +39241,18 @@ async function writeUploadedAttachment(args) {
           yield buf;
         }
       },
-      import_node_fs17.default.createWriteStream(tmpPath, { mode: 384 })
+      import_node_fs16.default.createWriteStream(tmpPath, { mode: 384 })
     );
   } catch (err) {
     try {
-      import_node_fs17.default.unlinkSync(tmpPath);
+      import_node_fs16.default.unlinkSync(tmpPath);
     } catch {
     }
     throw new UploadError("STORAGE_ERROR", `write failed: ${err.message}`);
   }
   if (actualSize !== args.contentLength) {
     try {
-      import_node_fs17.default.unlinkSync(tmpPath);
+      import_node_fs16.default.unlinkSync(tmpPath);
     } catch {
     }
     throw new UploadError(
@@ -39826,35 +39261,35 @@ async function writeUploadedAttachment(args) {
     );
   }
   const attachmentId = hasher.digest("hex").slice(0, HASH_PREFIX_LEN);
-  const hashDir = import_node_path16.default.join(attachmentsRoot, attachmentId);
+  const hashDir = import_node_path15.default.join(attachmentsRoot, attachmentId);
   let finalFileName;
   let hashDirExists = false;
   try {
-    hashDirExists = import_node_fs17.default.statSync(hashDir).isDirectory();
+    hashDirExists = import_node_fs16.default.statSync(hashDir).isDirectory();
   } catch {
   }
   if (hashDirExists) {
-    const existing = import_node_fs17.default.readdirSync(hashDir).filter((n) => !n.startsWith("."));
+    const existing = import_node_fs16.default.readdirSync(hashDir).filter((n) => !n.startsWith("."));
     finalFileName = existing[0] ?? args.fileName;
     try {
-      import_node_fs17.default.unlinkSync(tmpPath);
+      import_node_fs16.default.unlinkSync(tmpPath);
     } catch {
     }
   } else {
     try {
-      import_node_fs17.default.mkdirSync(hashDir, { recursive: true });
+      import_node_fs16.default.mkdirSync(hashDir, { recursive: true });
       finalFileName = args.fileName;
-      import_node_fs17.default.renameSync(tmpPath, import_node_path16.default.join(hashDir, finalFileName));
+      import_node_fs16.default.renameSync(tmpPath, import_node_path15.default.join(hashDir, finalFileName));
     } catch (err) {
       try {
-        import_node_fs17.default.unlinkSync(tmpPath);
+        import_node_fs16.default.unlinkSync(tmpPath);
       } catch {
       }
       throw new UploadError("STORAGE_ERROR", `rename failed: ${err.message}`);
     }
   }
-  const absPath = import_node_path16.default.join(hashDir, finalFileName);
-  const relPath = import_node_path16.default.relative(args.sessionDir, absPath);
+  const absPath = import_node_path15.default.join(hashDir, finalFileName);
+  const relPath = import_node_path15.default.relative(args.sessionDir, absPath);
   args.groupFileStore.upsert(args.scope, args.sessionId, {
     relPath: absPath,
     // 存绝对路径，与现有 agent 入清单的形态一致（attachment.ts:144 双形态兼容）
@@ -39868,7 +39303,7 @@ async function writeUploadedAttachment(args) {
 
 // src/extension/import.ts
 var import_promises2 = __toESM(require("fs/promises"), 1);
-var import_node_path17 = __toESM(require("path"), 1);
+var import_node_path16 = __toESM(require("path"), 1);
 var import_node_os10 = __toESM(require("os"), 1);
 var import_jszip = __toESM(require_lib3(), 1);
 var ImportError = class extends Error {
@@ -39886,7 +39321,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_path17.default.isAbsolute(name)) {
+    if (name.includes("..") || name.startsWith("/") || import_node_path16.default.isAbsolute(name)) {
       throw new ImportError("ZIP_INVALID", `unsafe zip entry path: ${name}`);
     }
   }
@@ -39919,7 +39354,7 @@ async function importZip(buf, root) {
       );
     }
   }
-  const destDir = import_node_path17.default.join(root, manifest.id);
+  const destDir = import_node_path16.default.join(root, manifest.id);
   let destExists = false;
   try {
     await import_promises2.default.access(destDir);
@@ -39929,15 +39364,15 @@ async function importZip(buf, root) {
   if (destExists) {
     throw new ImportError("ALREADY_EXISTS", `extension ${manifest.id} already installed`);
   }
-  const stage = await import_promises2.default.mkdtemp(import_node_path17.default.join(import_node_os10.default.tmpdir(), `clawd-ext-stage-${manifest.id}-`));
+  const stage = await import_promises2.default.mkdtemp(import_node_path16.default.join(import_node_os10.default.tmpdir(), `clawd-ext-stage-${manifest.id}-`));
   try {
     for (const [name, entry] of Object.entries(zip.files)) {
-      const dest = import_node_path17.default.join(stage, name);
+      const dest = import_node_path16.default.join(stage, name);
       if (entry.dir) {
         await import_promises2.default.mkdir(dest, { recursive: true });
         continue;
       }
-      await import_promises2.default.mkdir(import_node_path17.default.dirname(dest), { recursive: true });
+      await import_promises2.default.mkdir(import_node_path16.default.dirname(dest), { recursive: true });
       const content = await entry.async("nodebuffer");
       await import_promises2.default.writeFile(dest, content);
     }
@@ -39963,11 +39398,9 @@ var EXPOSED_RPC_METHODS = [
   "appBuilder.reportStage",
   // 单栏 §5.6.5 fix: UI 切 session 时调（assistant 不需要主动调，但暴露白名单避免误猜成 forbidden）
   "appBuilder.setActiveSession",
-  // Persona dispatch (Task 4): A 端 dispatch MCP server 调 run（hold-and-wait 一次）；
-  // B 端 dispatch MCP server 调 complete（带 outcome 触发 run 端 resolve）。详见
-  // protocol/src/dispatch.ts。
-  "personaDispatch.run",
-  "personaDispatch.complete"
+  // dataclaw-builder：persona 建页时取建页人身份（含 union_id）写进生成 app 的配置。
+  // 路由到 handlers['auth:getIdentity']，只返 identity、绝不带 ttcToken（见 handlers/feishu-auth.ts）。
+  "auth.getIdentity"
 ];
 async function handleRpcRequest(input) {
   const { method, body, sessionId, dispatcher } = input;
@@ -40056,7 +39489,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_path18.default.basename(fileName);
+  return fileName === import_node_path17.default.basename(fileName);
 }
 function createHttpRouter(deps) {
   return async (req, res) => {
@@ -40103,8 +39536,6 @@ function createHttpRouter(deps) {
         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;
@@ -40287,7 +39718,7 @@ function createHttpRouter(deps) {
         return true;
       }
       let absPath;
-      if (import_node_path18.default.isAbsolute(pathParam)) {
+      if (import_node_path17.default.isAbsolute(pathParam)) {
         absPath = pathParam;
       } else if (deps.sessionStore) {
         const file = deps.sessionStore.read(sid);
@@ -40295,7 +39726,7 @@ function createHttpRouter(deps) {
           sendJson(res, 404, { code: "NOT_FOUND", message: `session ${sid} not found` });
           return true;
         }
-        absPath = import_node_path18.default.join(file.cwd, pathParam);
+        absPath = import_node_path17.default.join(file.cwd, pathParam);
       } else {
         sendJson(res, 501, withCtx(ctx, { code: "NOT_IMPLEMENTED", message: "sessionStore not wired" }));
         return true;
@@ -40378,7 +39809,7 @@ function withCtx(ctx, body) {
 function streamFile(res, absPath, logger) {
   let stat;
   try {
-    stat = import_node_fs18.default.statSync(absPath);
+    stat = import_node_fs17.default.statSync(absPath);
   } catch (err) {
     const code = err?.code;
     if (code === "ENOENT") {
@@ -40393,7 +39824,7 @@ function streamFile(res, absPath, logger) {
     return;
   }
   const mime = lookupMime(absPath);
-  const basename = import_node_path18.default.basename(absPath);
+  const basename = import_node_path17.default.basename(absPath);
   res.writeHead(200, {
     "Content-Type": mime,
     "Content-Length": String(stat.size),
@@ -40401,7 +39832,7 @@ function streamFile(res, absPath, logger) {
     // 防止浏览器把任意 mime 当 html 渲染
     "X-Content-Type-Options": "nosniff"
   });
-  const stream = import_node_fs18.default.createReadStream(absPath);
+  const stream = import_node_fs17.default.createReadStream(absPath);
   stream.on("error", (err) => {
     logger?.warn("streamFile read error", { absPath, err: err.message });
     res.destroy();
@@ -40410,8 +39841,8 @@ function streamFile(res, absPath, logger) {
 }
 
 // src/attachment/gc.ts
-var import_node_fs19 = __toESM(require("fs"), 1);
-var import_node_path19 = __toESM(require("path"), 1);
+var import_node_fs18 = __toESM(require("fs"), 1);
+var import_node_path18 = __toESM(require("path"), 1);
 var DEFAULT_TTL_MS = 30 * 24 * 3600 * 1e3;
 function runAttachmentGc(args) {
   const now = (args.now ?? Date.now)();
@@ -40420,38 +39851,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_path19.default.isAbsolute(entry.relPath)) liveAbs.add(entry.relPath);
+      if (import_node_path18.default.isAbsolute(entry.relPath)) liveAbs.add(entry.relPath);
     }
   }
   for (const { scope, sessionId } of args.sessionScopes) {
-    const sessionDir = args.getSessionCwd?.(sessionId) ?? import_node_path19.default.join(
+    const sessionDir = args.getSessionCwd?.(sessionId) ?? import_node_path18.default.join(
       args.dataDir,
       "sessions",
       ...scopeSubPath(scope).map(safeFileName),
       safeFileName(sessionId)
     );
-    const attRoot = import_node_path19.default.join(sessionDir, ".attachments");
+    const attRoot = import_node_path18.default.join(sessionDir, ".attachments");
     let hashDirs;
     try {
-      hashDirs = import_node_fs19.default.readdirSync(attRoot);
+      hashDirs = import_node_fs18.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_path19.default.join(attRoot, hashDir);
+      const hashDirAbs = import_node_path18.default.join(attRoot, hashDir);
       let files;
       try {
-        files = import_node_fs19.default.readdirSync(hashDirAbs);
+        files = import_node_fs18.default.readdirSync(hashDirAbs);
       } catch {
         continue;
       }
       for (const name of files) {
-        const file = import_node_path19.default.join(hashDirAbs, name);
+        const file = import_node_path18.default.join(hashDirAbs, name);
         let stat;
         try {
-          stat = import_node_fs19.default.statSync(file);
+          stat = import_node_fs18.default.statSync(file);
         } catch {
           continue;
         }
@@ -40460,26 +39891,26 @@ function runAttachmentGc(args) {
         if (age < ttlMs) continue;
         if (liveAbs.has(file)) continue;
         try {
-          import_node_fs19.default.unlinkSync(file);
+          import_node_fs18.default.unlinkSync(file);
         } catch (err) {
           args.logger?.warn("attachment gc: unlink failed", { file, err: err.message });
         }
       }
       try {
-        if (import_node_fs19.default.readdirSync(hashDirAbs).length === 0) import_node_fs19.default.rmdirSync(hashDirAbs);
+        if (import_node_fs18.default.readdirSync(hashDirAbs).length === 0) import_node_fs18.default.rmdirSync(hashDirAbs);
       } catch {
       }
     }
     try {
-      if (import_node_fs19.default.readdirSync(attRoot).length === 0) import_node_fs19.default.rmdirSync(attRoot);
+      if (import_node_fs18.default.readdirSync(attRoot).length === 0) import_node_fs18.default.rmdirSync(attRoot);
     } catch {
     }
   }
 }
 
 // src/attachment/group.ts
-var import_node_fs20 = __toESM(require("fs"), 1);
-var import_node_path20 = __toESM(require("path"), 1);
+var import_node_fs19 = __toESM(require("fs"), 1);
+var import_node_path19 = __toESM(require("path"), 1);
 var import_node_crypto6 = __toESM(require("crypto"), 1);
 init_protocol();
 var GroupFileStore = class {
@@ -40491,11 +39922,11 @@ var GroupFileStore = class {
     this.logger = opts.logger;
   }
   rootForScope(scope) {
-    return import_node_path20.default.join(this.dataDir, "sessions", ...scopeSubPath(scope).map(safeFileName));
+    return import_node_path19.default.join(this.dataDir, "sessions", ...scopeSubPath(scope).map(safeFileName));
   }
   /** 与 SessionStore.filePath 平级，扩展名 .group-files.json */
   filePath(scope, sessionId) {
-    return import_node_path20.default.join(this.rootForScope(scope), `${safeFileName(sessionId)}.group-files.json`);
+    return import_node_path19.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}`;
@@ -40504,7 +39935,7 @@ var GroupFileStore = class {
   readFile(scope, sessionId) {
     const file = this.filePath(scope, sessionId);
     try {
-      const raw = import_node_fs20.default.readFileSync(file, "utf8");
+      const raw = import_node_fs19.default.readFileSync(file, "utf8");
       const parsed = JSON.parse(raw);
       if (!Array.isArray(parsed)) {
         this.logger?.warn("GroupFileStore.readFile: not an array; resetting session entries", {
@@ -40530,10 +39961,10 @@ var GroupFileStore = class {
   }
   writeFile(scope, sessionId, entries) {
     const file = this.filePath(scope, sessionId);
-    import_node_fs20.default.mkdirSync(import_node_path20.default.dirname(file), { recursive: true });
+    import_node_fs19.default.mkdirSync(import_node_path19.default.dirname(file), { recursive: true });
     const tmp = `${file}.tmp-${process.pid}-${Date.now()}`;
-    import_node_fs20.default.writeFileSync(tmp, JSON.stringify(entries, null, 2), { mode: 384 });
-    import_node_fs20.default.renameSync(tmp, file);
+    import_node_fs19.default.writeFileSync(tmp, JSON.stringify(entries, null, 2), { mode: 384 });
+    import_node_fs19.default.renameSync(tmp, file);
   }
   /** 拉一份当前 session 的清单。读盘 → cache；之后调用复用 cache */
   list(scope, sessionId) {
@@ -40619,10 +40050,10 @@ var GroupFileStore = class {
 };
 
 // src/discovery/state-file.ts
-var import_node_fs21 = __toESM(require("fs"), 1);
-var import_node_path21 = __toESM(require("path"), 1);
+var import_node_fs20 = __toESM(require("fs"), 1);
+var import_node_path20 = __toESM(require("path"), 1);
 function defaultStateFilePath(dataDir) {
-  return import_node_path21.default.join(dataDir, "state.json");
+  return import_node_path20.default.join(dataDir, "state.json");
 }
 function isPidAlive(pid) {
   if (!Number.isFinite(pid) || pid <= 0) return false;
@@ -40644,7 +40075,7 @@ var StateFileManager = class {
   }
   read() {
     try {
-      const raw = import_node_fs21.default.readFileSync(this.file, "utf8");
+      const raw = import_node_fs20.default.readFileSync(this.file, "utf8");
       const parsed = JSON.parse(raw);
       return parsed;
     } catch {
@@ -40658,20 +40089,20 @@ var StateFileManager = class {
     return { status: "stale", existing };
   }
   write(state) {
-    import_node_fs21.default.mkdirSync(import_node_path21.default.dirname(this.file), { recursive: true });
+    import_node_fs20.default.mkdirSync(import_node_path20.default.dirname(this.file), { recursive: true });
     const tmp = `${this.file}.tmp.${process.pid}.${Date.now()}`;
-    import_node_fs21.default.writeFileSync(tmp, JSON.stringify(state, null, 2), { mode: 384 });
-    import_node_fs21.default.renameSync(tmp, this.file);
+    import_node_fs20.default.writeFileSync(tmp, JSON.stringify(state, null, 2), { mode: 384 });
+    import_node_fs20.default.renameSync(tmp, this.file);
     if (process.platform !== "win32") {
       try {
-        import_node_fs21.default.chmodSync(this.file, 384);
+        import_node_fs20.default.chmodSync(this.file, 384);
       } catch {
       }
     }
   }
   delete() {
     try {
-      import_node_fs21.default.unlinkSync(this.file);
+      import_node_fs20.default.unlinkSync(this.file);
     } catch {
     }
   }
@@ -40686,14 +40117,14 @@ function readDaemonSourceFromEnv(env = process.env) {
 }
 
 // src/tunnel/tunnel-manager.ts
-var import_node_fs25 = __toESM(require("fs"), 1);
-var import_node_path25 = __toESM(require("path"), 1);
+var import_node_fs24 = __toESM(require("fs"), 1);
+var import_node_path24 = __toESM(require("path"), 1);
 var import_node_crypto7 = __toESM(require("crypto"), 1);
 var import_node_child_process9 = require("child_process");
 
 // src/tunnel/tunnel-store.ts
-var import_node_fs22 = __toESM(require("fs"), 1);
-var import_node_path22 = __toESM(require("path"), 1);
+var import_node_fs21 = __toESM(require("fs"), 1);
+var import_node_path21 = __toESM(require("path"), 1);
 var TunnelStore = class {
   constructor(filePath) {
     this.filePath = filePath;
@@ -40701,7 +40132,7 @@ var TunnelStore = class {
   filePath;
   async get() {
     try {
-      const raw = await import_node_fs22.default.promises.readFile(this.filePath, "utf8");
+      const raw = await import_node_fs21.default.promises.readFile(this.filePath, "utf8");
       const obj = JSON.parse(raw);
       if (!isPersistedTunnel(obj)) return null;
       return obj;
@@ -40712,22 +40143,22 @@ var TunnelStore = class {
     }
   }
   async set(v2) {
-    const dir = import_node_path22.default.dirname(this.filePath);
-    await import_node_fs22.default.promises.mkdir(dir, { recursive: true });
+    const dir = import_node_path21.default.dirname(this.filePath);
+    await import_node_fs21.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_fs22.default.promises.writeFile(tmp, data, { mode: 384 });
+    await import_node_fs21.default.promises.writeFile(tmp, data, { mode: 384 });
     if (process.platform !== "win32") {
       try {
-        await import_node_fs22.default.promises.chmod(tmp, 384);
+        await import_node_fs21.default.promises.chmod(tmp, 384);
       } catch {
       }
     }
-    await import_node_fs22.default.promises.rename(tmp, this.filePath);
+    await import_node_fs21.default.promises.rename(tmp, this.filePath);
   }
   async clear() {
     try {
-      await import_node_fs22.default.promises.unlink(this.filePath);
+      await import_node_fs21.default.promises.unlink(this.filePath);
     } catch (err) {
       const code = err?.code;
       if (code !== "ENOENT") throw err;
@@ -40822,11 +40253,11 @@ function escape(v2) {
 }
 
 // src/tunnel/frpc-binary.ts
-var import_node_fs23 = __toESM(require("fs"), 1);
+var import_node_fs22 = __toESM(require("fs"), 1);
 var import_node_os11 = __toESM(require("os"), 1);
-var import_node_path23 = __toESM(require("path"), 1);
+var import_node_path22 = __toESM(require("path"), 1);
 var import_node_child_process7 = require("child_process");
-var import_node_stream3 = require("stream");
+var import_node_stream2 = require("stream");
 var import_promises3 = require("stream/promises");
 var FRPC_VERSION = "0.68.0";
 var UnsupportedPlatformError = class extends Error {
@@ -40856,20 +40287,20 @@ function frpcDownloadUrl(version2, p2) {
 }
 async function ensureFrpcBinary(opts) {
   if (opts.override) {
-    if (!import_node_fs23.default.existsSync(opts.override)) {
+    if (!import_node_fs22.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_path23.default.join(opts.dataDir, "bin");
-  import_node_fs23.default.mkdirSync(binDir, { recursive: true });
+  const binDir = import_node_path22.default.join(opts.dataDir, "bin");
+  import_node_fs22.default.mkdirSync(binDir, { recursive: true });
   cleanupStaleArtifacts(binDir);
-  const stableBin = import_node_path23.default.join(binDir, "frpc");
-  if (import_node_fs23.default.existsSync(stableBin)) return stableBin;
+  const stableBin = import_node_path22.default.join(binDir, "frpc");
+  if (import_node_fs22.default.existsSync(stableBin)) return stableBin;
   const partialBin = `${stableBin}.partial`;
-  const tarballPath = import_node_path23.default.join(binDir, `frp_${version2}_${platform.os}_${platform.arch}.tar.gz.partial`);
+  const tarballPath = import_node_path22.default.join(binDir, `frp_${version2}_${platform.os}_${platform.arch}.tar.gz.partial`);
   try {
     const url = frpcDownloadUrl(version2, platform);
     await downloadToFile(url, tarballPath, opts.fetchImpl);
@@ -40878,8 +40309,8 @@ async function ensureFrpcBinary(opts) {
     } else {
       await extractFrpcFromTarball(tarballPath, binDir, version2, platform, partialBin);
     }
-    import_node_fs23.default.chmodSync(partialBin, 493);
-    import_node_fs23.default.renameSync(partialBin, stableBin);
+    import_node_fs22.default.chmodSync(partialBin, 493);
+    import_node_fs22.default.renameSync(partialBin, stableBin);
   } finally {
     safeUnlink(tarballPath);
     safeUnlink(partialBin);
@@ -40889,15 +40320,15 @@ async function ensureFrpcBinary(opts) {
 function cleanupStaleArtifacts(binDir) {
   let entries;
   try {
-    entries = import_node_fs23.default.readdirSync(binDir);
+    entries = import_node_fs22.default.readdirSync(binDir);
   } catch {
     return;
   }
   for (const name of entries) {
     if (name.endsWith(".partial") || name.startsWith("extract-")) {
-      const full = import_node_path23.default.join(binDir, name);
+      const full = import_node_path22.default.join(binDir, name);
       try {
-        import_node_fs23.default.rmSync(full, { recursive: true, force: true });
+        import_node_fs22.default.rmSync(full, { recursive: true, force: true });
       } catch {
       }
     }
@@ -40905,7 +40336,7 @@ function cleanupStaleArtifacts(binDir) {
 }
 function safeUnlink(p2) {
   try {
-    import_node_fs23.default.unlinkSync(p2);
+    import_node_fs22.default.unlinkSync(p2);
   } catch {
   }
 }
@@ -40916,13 +40347,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_fs23.default.createWriteStream(dest);
-  const nodeStream = import_node_stream3.Readable.fromWeb(res.body);
+  const out = import_node_fs22.default.createWriteStream(dest);
+  const nodeStream = import_node_stream2.Readable.fromWeb(res.body);
   await (0, import_promises3.pipeline)(nodeStream, out);
 }
 async function extractFrpcFromTarball(tarball, binDir, version2, platform, destBin) {
-  const work = import_node_path23.default.join(binDir, `extract-${process.pid}-${Date.now()}`);
-  import_node_fs23.default.mkdirSync(work, { recursive: true });
+  const work = import_node_path22.default.join(binDir, `extract-${process.pid}-${Date.now()}`);
+  import_node_fs22.default.mkdirSync(work, { recursive: true });
   try {
     await new Promise((resolve6, reject) => {
       const proc = (0, import_node_child_process7.spawn)("tar", ["xzf", tarball, "-C", work], { stdio: "pipe" });
@@ -40930,32 +40361,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_path23.default.join(work, dirName, "frpc");
-    if (!import_node_fs23.default.existsSync(src)) {
+    const src = import_node_path22.default.join(work, dirName, "frpc");
+    if (!import_node_fs22.default.existsSync(src)) {
       throw new Error(`frpc not found inside tarball at ${src}`);
     }
-    import_node_fs23.default.copyFileSync(src, destBin);
+    import_node_fs22.default.copyFileSync(src, destBin);
   } finally {
-    import_node_fs23.default.rmSync(work, { recursive: true, force: true });
+    import_node_fs22.default.rmSync(work, { recursive: true, force: true });
   }
 }
 
 // src/tunnel/frpc-process.ts
-var import_node_fs24 = __toESM(require("fs"), 1);
-var import_node_path24 = __toESM(require("path"), 1);
+var import_node_fs23 = __toESM(require("fs"), 1);
+var import_node_path23 = __toESM(require("path"), 1);
 var import_node_child_process8 = require("child_process");
 function frpcPidFilePath(dataDir) {
-  return import_node_path24.default.join(dataDir, "frpc.pid");
+  return import_node_path23.default.join(dataDir, "frpc.pid");
 }
 function writeFrpcPid(dataDir, pid) {
   try {
-    import_node_fs24.default.writeFileSync(frpcPidFilePath(dataDir), String(pid), { mode: 384 });
+    import_node_fs23.default.writeFileSync(frpcPidFilePath(dataDir), String(pid), { mode: 384 });
   } catch {
   }
 }
 function clearFrpcPid(dataDir) {
   try {
-    import_node_fs24.default.unlinkSync(frpcPidFilePath(dataDir));
+    import_node_fs23.default.unlinkSync(frpcPidFilePath(dataDir));
   } catch {
   }
 }
@@ -40971,7 +40402,7 @@ function defaultIsPidAlive(pid) {
 }
 function defaultReadPidFile(file) {
   try {
-    return import_node_fs24.default.readFileSync(file, "utf8");
+    return import_node_fs23.default.readFileSync(file, "utf8");
   } catch {
     return null;
   }
@@ -40987,12 +40418,12 @@ function defaultSleep(ms) {
 }
 async function killStaleFrpc(deps) {
   const pidFile = frpcPidFilePath(deps.dataDir);
-  const tomlPath = import_node_path24.default.join(deps.dataDir, "frpc.toml");
+  const tomlPath = import_node_path23.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 sleep = deps.sleepImpl ?? defaultSleep;
   const victims = /* @__PURE__ */ new Set();
   const raw = readPidFile(pidFile);
   if (raw) {
@@ -41011,7 +40442,7 @@ async function killStaleFrpc(deps) {
   }
   if (victims.size === 0) {
     try {
-      import_node_fs24.default.unlinkSync(pidFile);
+      import_node_fs23.default.unlinkSync(pidFile);
     } catch {
     }
     return;
@@ -41020,9 +40451,9 @@ async function killStaleFrpc(deps) {
     deps.logger?.warn("tunnel: killing stale frpc before respawn", { pid });
     killPid(pid, "SIGKILL");
   }
-  await sleep2(deps.reapWaitMs ?? 300);
+  await sleep(deps.reapWaitMs ?? 300);
   try {
-    import_node_fs24.default.unlinkSync(pidFile);
+    import_node_fs23.default.unlinkSync(pidFile);
   } catch {
   }
 }
@@ -41059,7 +40490,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_path25.default.join(deps.dataDir, "tunnel.json"));
+    this.store = deps.store ?? new TunnelStore(import_node_path24.default.join(deps.dataDir, "tunnel.json"));
     this.ttlMs = deps.ttlMs ?? DEFAULT_TUNNEL_TTL_MS;
     this.startupTimeoutMs = deps.startupTimeoutMs ?? 15e3;
   }
@@ -41186,7 +40617,7 @@ var TunnelManager = class {
         dataDir: this.deps.dataDir,
         override: this.deps.frpcBinaryOverride ?? void 0
       });
-      const tomlPath = import_node_path25.default.join(this.deps.dataDir, "frpc.toml");
+      const tomlPath = import_node_path24.default.join(this.deps.dataDir, "frpc.toml");
       const proxyName = `clawd-${t.subdomain}-${localPort}-${import_node_crypto7.default.randomBytes(3).toString("hex")}`;
       const toml = buildFrpcToml({
         serverAddr: t.frpsHost,
@@ -41197,12 +40628,12 @@ var TunnelManager = class {
         localPort,
         logLevel: "info"
       });
-      await import_node_fs25.default.promises.writeFile(tomlPath, toml, { mode: 384 });
+      await import_node_fs24.default.promises.writeFile(tomlPath, toml, { mode: 384 });
       const proc = (this.deps.spawnImpl ?? import_node_child_process9.spawn)(frpcBin, ["-c", tomlPath], {
         stdio: ["ignore", "pipe", "pipe"]
       });
-      const logFilePath = import_node_path25.default.join(this.deps.dataDir, "frpc.log");
-      const logStream = import_node_fs25.default.createWriteStream(logFilePath, { flags: "a", mode: 384 });
+      const logFilePath = import_node_path24.default.join(this.deps.dataDir, "frpc.log");
+      const logStream = import_node_fs24.default.createWriteStream(logFilePath, { flags: "a", mode: 384 });
       logStream.on("error", () => {
       });
       const tee = (chunk) => {
@@ -41285,27 +40716,27 @@ async function waitForFrpcReady(proc, timeoutMs) {
 
 // src/tunnel/device-key.ts
 var import_node_os12 = __toESM(require("os"), 1);
-var import_node_path26 = __toESM(require("path"), 1);
+var import_node_path25 = __toESM(require("path"), 1);
 var import_node_crypto8 = __toESM(require("crypto"), 1);
 var DERIVE_SALT = "clawd-tunnel-device-v1";
 function deriveStableDeviceKey(opts = {}) {
   const hostname = opts.hostname ?? import_node_os12.default.hostname();
   const uid = opts.uid ?? (typeof import_node_os12.default.userInfo === "function" ? import_node_os12.default.userInfo().uid : 0);
   const home = opts.home ?? import_node_os12.default.homedir();
-  const defaultDataDir = import_node_path26.default.resolve(import_node_path26.default.join(home, ".clawd"));
-  const normalizedDataDir = opts.dataDir ? import_node_path26.default.resolve(opts.dataDir) : null;
+  const defaultDataDir = import_node_path25.default.resolve(import_node_path25.default.join(home, ".clawd"));
+  const normalizedDataDir = opts.dataDir ? import_node_path25.default.resolve(opts.dataDir) : null;
   const isDefaultDir = normalizedDataDir == null || normalizedDataDir === defaultDataDir;
   const input = isDefaultDir ? `${hostname}::${uid}` : `${hostname}::${uid}::${normalizedDataDir}`;
   return import_node_crypto8.default.createHmac("sha256", DERIVE_SALT).update(input).digest("hex").slice(0, 32);
 }
 
 // src/auth-store.ts
-var import_node_fs26 = __toESM(require("fs"), 1);
-var import_node_path27 = __toESM(require("path"), 1);
+var import_node_fs25 = __toESM(require("fs"), 1);
+var import_node_path26 = __toESM(require("path"), 1);
 var import_node_crypto9 = __toESM(require("crypto"), 1);
 var AUTH_FILE_NAME = "auth.json";
 function authFilePath(dataDir) {
-  return import_node_path27.default.join(dataDir, AUTH_FILE_NAME);
+  return import_node_path26.default.join(dataDir, AUTH_FILE_NAME);
 }
 function loadOrCreateAuthFile(opts) {
   const file = authFilePath(opts.dataDir);
@@ -41339,7 +40770,7 @@ function defaultGenerateOwnerPrincipalId() {
 }
 function readAuthFile(file) {
   try {
-    const raw = import_node_fs26.default.readFileSync(file, "utf8");
+    const raw = import_node_fs25.default.readFileSync(file, "utf8");
     const parsed = JSON.parse(raw);
     if (typeof parsed?.token !== "string" || parsed.token.length === 0) {
       return null;
@@ -41358,25 +40789,25 @@ function readAuthFile(file) {
   }
 }
 function writeAuthFile(file, content) {
-  import_node_fs26.default.mkdirSync(import_node_path27.default.dirname(file), { recursive: true });
-  import_node_fs26.default.writeFileSync(file, JSON.stringify(content, null, 2), { mode: 384 });
+  import_node_fs25.default.mkdirSync(import_node_path26.default.dirname(file), { recursive: true });
+  import_node_fs25.default.writeFileSync(file, JSON.stringify(content, null, 2), { mode: 384 });
   try {
-    import_node_fs26.default.chmodSync(file, 384);
+    import_node_fs25.default.chmodSync(file, 384);
   } catch {
   }
 }
 
 // src/owner-profile.ts
-var import_node_fs27 = __toESM(require("fs"), 1);
+var import_node_fs26 = __toESM(require("fs"), 1);
 var import_node_os13 = __toESM(require("os"), 1);
-var import_node_path28 = __toESM(require("path"), 1);
+var import_node_path27 = __toESM(require("path"), 1);
 var PROFILE_FILENAME = "profile.json";
 function loadOwnerDisplayName(dataDir) {
   const fallback = import_node_os13.default.userInfo().username;
-  const profilePath = import_node_path28.default.join(dataDir, PROFILE_FILENAME);
+  const profilePath = import_node_path27.default.join(dataDir, PROFILE_FILENAME);
   let raw;
   try {
-    raw = import_node_fs27.default.readFileSync(profilePath, "utf8");
+    raw = import_node_fs26.default.readFileSync(profilePath, "utf8");
   } catch {
     return fallback;
   }
@@ -41399,18 +40830,18 @@ function loadOwnerDisplayName(dataDir) {
 }
 
 // src/feishu-auth/owner-identity-store.ts
-var import_node_fs28 = __toESM(require("fs"), 1);
-var import_node_path29 = __toESM(require("path"), 1);
+var import_node_fs27 = __toESM(require("fs"), 1);
+var import_node_path28 = __toESM(require("path"), 1);
 var OWNER_IDENTITY_FILE_NAME = "owner-identity.json";
 var OwnerIdentityStore = class {
   file;
   constructor(dataDir) {
-    this.file = import_node_path29.default.join(dataDir, OWNER_IDENTITY_FILE_NAME);
+    this.file = import_node_path28.default.join(dataDir, OWNER_IDENTITY_FILE_NAME);
   }
   read() {
     let raw;
     try {
-      raw = import_node_fs28.default.readFileSync(this.file, "utf8");
+      raw = import_node_fs27.default.readFileSync(this.file, "utf8");
     } catch {
       return null;
     }
@@ -41429,7 +40860,8 @@ var OwnerIdentityStore = class {
         ownerId: r.identity.ownerId,
         provider: r.identity.provider,
         displayName: r.identity.displayName,
-        ...typeof r.identity.avatarUrl === "string" ? { avatarUrl: r.identity.avatarUrl } : {}
+        ...typeof r.identity.avatarUrl === "string" ? { avatarUrl: r.identity.avatarUrl } : {},
+        ...typeof r.identity.unionId === "string" ? { unionId: r.identity.unionId } : {}
       },
       ttcToken: r.ttcToken,
       ttcTokenExpiresAt: typeof r.ttcTokenExpiresAt === "number" ? r.ttcTokenExpiresAt : null,
@@ -41437,16 +40869,16 @@ var OwnerIdentityStore = class {
     };
   }
   write(record) {
-    import_node_fs28.default.mkdirSync(import_node_path29.default.dirname(this.file), { recursive: true });
-    import_node_fs28.default.writeFileSync(this.file, JSON.stringify(record, null, 2), { mode: 384 });
+    import_node_fs27.default.mkdirSync(import_node_path28.default.dirname(this.file), { recursive: true });
+    import_node_fs27.default.writeFileSync(this.file, JSON.stringify(record, null, 2), { mode: 384 });
     try {
-      import_node_fs28.default.chmodSync(this.file, 384);
+      import_node_fs27.default.chmodSync(this.file, 384);
     } catch {
     }
   }
   clear() {
     try {
-      import_node_fs28.default.unlinkSync(this.file);
+      import_node_fs27.default.unlinkSync(this.file);
     } catch (err) {
       const code = err?.code;
       if (code !== "ENOENT") throw err;
@@ -41550,7 +40982,9 @@ async function fetchTtcUserInfo(opts) {
     ownerId: d.unique_id,
     provider: "ttc",
     displayName: d.name,
-    ...typeof d.avatar_url === "string" && d.avatar_url.length > 0 ? { avatarUrl: d.avatar_url } : {}
+    ...typeof d.avatar_url === "string" && d.avatar_url.length > 0 ? { avatarUrl: d.avatar_url } : {},
+    // union_id 捕获：dataclaw 可信入口用 X-User-UnionId（ownerId 仍是 unique_id，跨登录方式稳定）
+    ...typeof d.union_id === "string" && d.union_id.length > 0 ? { unionId: d.union_id } : {}
   };
 }
 
@@ -41565,9 +40999,9 @@ var CentralClientError = class extends Error {
   code;
   cause;
 };
-async function centralRequest(opts, path59, init) {
+async function centralRequest(opts, path58, init) {
   const f = opts.fetchImpl ?? globalThis.fetch;
-  const url = `${opts.api.replace(/\/+$/, "")}${path59}`;
+  const url = `${opts.api.replace(/\/+$/, "")}${path58}`;
   const ctrl = new AbortController();
   const timer = setTimeout(() => ctrl.abort(), opts.timeoutMs ?? 15e3);
   let res;
@@ -41709,8 +41143,8 @@ function verifyConnectToken(args) {
 }
 
 // src/feishu-auth/server-key.ts
-var fs37 = __toESM(require("fs"), 1);
-var path38 = __toESM(require("path"), 1);
+var fs36 = __toESM(require("fs"), 1);
+var path37 = __toESM(require("path"), 1);
 var FILE_NAME2 = "server-signing-key.json";
 var ServerKeyStore = class {
   constructor(dataDir) {
@@ -41718,12 +41152,12 @@ var ServerKeyStore = class {
   }
   dataDir;
   filePath() {
-    return path38.join(this.dataDir, FILE_NAME2);
+    return path37.join(this.dataDir, FILE_NAME2);
   }
   /** 读缓存的公钥；无缓存 / 损坏 → null（调用方决定是否触发拉取） */
   read() {
     try {
-      const raw = fs37.readFileSync(this.filePath(), "utf8");
+      const raw = fs36.readFileSync(this.filePath(), "utf8");
       const parsed = JSON.parse(raw);
       if (typeof parsed.publicKeyPem === "string" && parsed.publicKeyPem.includes("PUBLIC KEY")) {
         return parsed.publicKeyPem;
@@ -41738,12 +41172,12 @@ var ServerKeyStore = class {
       publicKeyPem,
       fetchedAt: (/* @__PURE__ */ new Date()).toISOString()
     };
-    fs37.mkdirSync(this.dataDir, { recursive: true });
-    fs37.writeFileSync(this.filePath(), JSON.stringify(content, null, 2), { mode: 384 });
+    fs36.mkdirSync(this.dataDir, { recursive: true });
+    fs36.writeFileSync(this.filePath(), JSON.stringify(content, null, 2), { mode: 384 });
   }
   clear() {
     try {
-      fs37.unlinkSync(this.filePath());
+      fs36.unlinkSync(this.filePath());
     } catch {
     }
   }
@@ -41756,12 +41190,12 @@ init_protocol();
 init_protocol();
 
 // src/session/fork.ts
-var import_node_fs29 = __toESM(require("fs"), 1);
+var import_node_fs28 = __toESM(require("fs"), 1);
 var import_node_os14 = __toESM(require("os"), 1);
-var import_node_path30 = __toESM(require("path"), 1);
+var import_node_path29 = __toESM(require("path"), 1);
 init_claude_history();
 function readJsonlEntries(file) {
-  const raw = import_node_fs29.default.readFileSync(file, "utf8");
+  const raw = import_node_fs28.default.readFileSync(file, "utf8");
   const out = [];
   for (const line of raw.split("\n")) {
     const t = line.trim();
@@ -41774,10 +41208,10 @@ function readJsonlEntries(file) {
   return out;
 }
 function forkSession(input) {
-  const baseDir = input.baseDir ?? import_node_path30.default.join(import_node_os14.default.homedir(), ".claude");
-  const projectDir = import_node_path30.default.join(baseDir, "projects", cwdToHashDir(input.cwd));
-  const sourceFile = import_node_path30.default.join(projectDir, `${input.toolSessionId}.jsonl`);
-  if (!import_node_fs29.default.existsSync(sourceFile)) {
+  const baseDir = input.baseDir ?? import_node_path29.default.join(import_node_os14.default.homedir(), ".claude");
+  const projectDir = import_node_path29.default.join(baseDir, "projects", cwdToHashDir(input.cwd));
+  const sourceFile = import_node_path29.default.join(projectDir, `${input.toolSessionId}.jsonl`);
+  if (!import_node_fs28.default.existsSync(sourceFile)) {
     throw new Error(`fork: source transcript not found: ${sourceFile}`);
   }
   const entries = readJsonlEntries(sourceFile);
@@ -41807,9 +41241,9 @@ function forkSession(input) {
     }
     forkedLines.push(JSON.stringify(forked));
   }
-  const forkedFilePath = import_node_path30.default.join(projectDir, `${forkedToolSessionId}.jsonl`);
-  import_node_fs29.default.mkdirSync(projectDir, { recursive: true });
-  import_node_fs29.default.writeFileSync(forkedFilePath, forkedLines.join("\n") + "\n", { mode: 384 });
+  const forkedFilePath = import_node_path29.default.join(projectDir, `${forkedToolSessionId}.jsonl`);
+  import_node_fs28.default.mkdirSync(projectDir, { recursive: true });
+  import_node_fs28.default.writeFileSync(forkedFilePath, forkedLines.join("\n") + "\n", { mode: 384 });
   return { forkedToolSessionId, forkedFilePath };
 }
 
@@ -42185,7 +41619,7 @@ function buildPermissionHandlers(deps) {
 }
 
 // src/handlers/history.ts
-var path41 = __toESM(require("path"), 1);
+var path40 = __toESM(require("path"), 1);
 init_protocol();
 
 // src/session/recent-dirs.ts
@@ -42203,7 +41637,7 @@ function listRecentDirs(store, limit = 50) {
 }
 
 // src/permission/persona-paths.ts
-var path40 = __toESM(require("path"), 1);
+var path39 = __toESM(require("path"), 1);
 function getAllowedPersonaIds(grants, action) {
   const ids = /* @__PURE__ */ new Set();
   for (const g2 of grants) {
@@ -42216,31 +41650,31 @@ function getAllowedPersonaIds(grants, action) {
   return ids;
 }
 function isGuestPathAllowed(grants, absPath, personaRoot, action = "read", userWorkDir) {
-  const target = path40.resolve(absPath);
+  const target = path39.resolve(absPath);
   if (userWorkDir) {
-    const u = path40.resolve(userWorkDir);
-    const usep = u.endsWith(path40.sep) ? "" : path40.sep;
+    const u = path39.resolve(userWorkDir);
+    const usep = u.endsWith(path39.sep) ? "" : path39.sep;
     if (target === u || target.startsWith(u + usep)) return true;
   }
-  const root = path40.resolve(personaRoot);
-  const sep2 = root.endsWith(path40.sep) ? "" : path40.sep;
+  const root = path39.resolve(personaRoot);
+  const sep2 = root.endsWith(path39.sep) ? "" : path39.sep;
   if (!target.startsWith(root + sep2)) return false;
-  const rel = path40.relative(root, target);
+  const rel = path39.relative(root, target);
   if (!rel || rel.startsWith("..")) return false;
-  const personaId = rel.split(path40.sep)[0];
+  const personaId = rel.split(path39.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 = path40.resolve(personaRoot);
-  const target = path40.resolve(absPath);
-  const sep2 = root.endsWith(path40.sep) ? "" : path40.sep;
+  const root = path39.resolve(personaRoot);
+  const target = path39.resolve(absPath);
+  const sep2 = root.endsWith(path39.sep) ? "" : path39.sep;
   if (!target.startsWith(root + sep2)) return null;
-  const rel = path40.relative(root, target);
+  const rel = path39.relative(root, target);
   if (!rel || rel.startsWith("..")) return null;
-  const id = rel.split(path40.sep)[0];
+  const id = rel.split(path39.sep)[0];
   return id || null;
 }
 
@@ -42267,7 +41701,7 @@ function buildHistoryHandlers(deps) {
         if (!pid) return false;
         return isGuestPathAllowed(
           ctx.grants,
-          path41.join(personaRoot, pid),
+          path40.join(personaRoot, pid),
           personaRoot,
           "read",
           userWorkDir
@@ -42279,7 +41713,7 @@ function buildHistoryHandlers(deps) {
   };
   const list = async (frame, _client, ctx) => {
     const args = HistoryListArgs.parse(frame);
-    assertGuestPath(ctx, path41.resolve(args.projectPath), personaRoot, "history:list");
+    assertGuestPath(ctx, path40.resolve(args.projectPath), personaRoot, "history:list");
     const sessions = await history.listSessions(args);
     return { response: { type: "history:list", sessions } };
   };
@@ -42311,13 +41745,13 @@ function buildHistoryHandlers(deps) {
   };
   const subagents = async (frame, _client, ctx) => {
     const args = HistorySubagentsArgs.parse(frame);
-    assertGuestPath(ctx, path41.resolve(args.cwd), personaRoot, "history:subagents", usersRoot);
+    assertGuestPath(ctx, path40.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, path41.resolve(args.cwd), personaRoot, "history:subagent-read", usersRoot);
+    assertGuestPath(ctx, path40.resolve(args.cwd), personaRoot, "history:subagent-read", usersRoot);
     const res = await history.readSubagent(args);
     return { response: { type: "history:subagent-read", ...res } };
   };
@@ -42326,7 +41760,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, path41.resolve(d.cwd), personaRoot, "read", userWorkDir)
+        (d) => isGuestPathAllowed(ctx.grants, path40.resolve(d.cwd), personaRoot, "read", userWorkDir)
       );
       return { response: { type: "history:recentDirs", dirs: filtered } };
     }
@@ -42343,7 +41777,7 @@ function buildHistoryHandlers(deps) {
 }
 
 // src/handlers/workspace.ts
-var path42 = __toESM(require("path"), 1);
+var path41 = __toESM(require("path"), 1);
 var os15 = __toESM(require("os"), 1);
 init_protocol();
 init_protocol();
@@ -42385,22 +41819,22 @@ function buildWorkspaceHandlers(deps) {
     const args = WorkspaceListArgs.parse(frame);
     const isGuest = ctx?.principal.kind === "guest";
     const fallbackCwd = isGuest && personaRoot ? personaRoot : os15.homedir();
-    const resolvedCwd = path42.resolve(args.cwd ?? fallbackCwd);
-    const target = args.path ? path42.resolve(resolvedCwd, args.path) : resolvedCwd;
+    const resolvedCwd = path41.resolve(args.cwd ?? fallbackCwd);
+    const target = args.path ? path41.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 = path42.isAbsolute(args.path) ? path42.resolve(args.path) : path42.resolve(args.cwd, args.path);
+    const target = path41.isAbsolute(args.path) ? path41.resolve(args.path) : path41.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 = path42.resolve(args.cwd);
+    const cwdAbs = path41.resolve(args.cwd);
     assertGuestPath2(ctx, cwdAbs, personaRoot, "skills:list", usersRoot);
     const list2 = await getSkillsForTool(args.tool ?? "claude", cwdAbs);
     if (ctx?.principal.kind === "guest" && personaRoot) {
@@ -42412,7 +41846,7 @@ function buildWorkspaceHandlers(deps) {
   };
   const agentsList = async (frame, _client, ctx) => {
     const args = AgentsListArgs.parse(frame);
-    const cwdAbs = path42.resolve(args.cwd);
+    const cwdAbs = path41.resolve(args.cwd);
     assertGuestPath2(ctx, cwdAbs, personaRoot, "agents:list", usersRoot);
     if (args.tool === "codex") {
       return { response: { type: "agents:list", agents: [] } };
@@ -42434,20 +41868,20 @@ function buildWorkspaceHandlers(deps) {
 }
 
 // src/handlers/git.ts
-var path44 = __toESM(require("path"), 1);
+var path43 = __toESM(require("path"), 1);
 init_protocol();
 init_protocol();
 
 // src/workspace/git.ts
 var import_node_child_process10 = require("child_process");
-var import_node_fs30 = __toESM(require("fs"), 1);
-var import_node_path31 = __toESM(require("path"), 1);
+var import_node_fs29 = __toESM(require("fs"), 1);
+var import_node_path30 = __toESM(require("path"), 1);
 var import_node_util = require("util");
 var pexec = (0, import_node_util.promisify)(import_node_child_process10.execFile);
 function normalizePath(p2) {
-  const resolved = import_node_path31.default.resolve(p2);
+  const resolved = import_node_path30.default.resolve(p2);
   try {
-    return import_node_fs30.default.realpathSync(resolved);
+    return import_node_fs29.default.realpathSync(resolved);
   } catch {
     return resolved;
   }
@@ -42521,7 +41955,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, path44.resolve(cwd), personaRoot, "read", userWorkDir)) {
+  if (!isGuestPathAllowed(ctx.grants, path43.resolve(cwd), personaRoot, "read", userWorkDir)) {
     throw new ClawdError(
       ERROR_CODES.UNAUTHORIZED,
       `guest ${ctx.principal.id} cannot ${method} cwd ${cwd}`
@@ -42937,7 +42371,6 @@ function buildReadyFrame(deps, client) {
     if (deps.httpToken) fileSharing.httpToken = deps.httpToken;
   }
   const daemonSource = process.env.CLAWD_DAEMON_SOURCE === "ota" ? "ota" : "packaged";
-  const logShipping = deps.getLogShipping ? deps.getLogShipping() : null;
   return {
     version,
     protocolVersion: PROTOCOL_VERSION,
@@ -42948,8 +42381,7 @@ function buildReadyFrame(deps, client) {
     tunnelUrl,
     mode: deps.mode,
     daemonSource,
-    ...fileSharing,
-    ...logShipping ? { logShipping } : {}
+    ...fileSharing
   };
 }
 function buildMetaHandlers(deps) {
@@ -43037,7 +42469,7 @@ function buildPersonaHandlers(deps) {
 }
 
 // src/handlers/attachment.ts
-var import_node_path32 = __toESM(require("path"), 1);
+var import_node_path31 = __toESM(require("path"), 1);
 init_protocol();
 init_protocol();
 var DEFAULT_TTL_SECONDS = 24 * 3600;
@@ -43092,12 +42524,12 @@ function buildAttachmentHandlers(deps) {
         `session ${args.sessionId} scope unresolved`
       );
     }
-    const cwdAbs = import_node_path32.default.resolve(sessionFile.cwd);
-    const candidateAbs = import_node_path32.default.isAbsolute(args.relPath) ? import_node_path32.default.resolve(args.relPath) : import_node_path32.default.resolve(cwdAbs, args.relPath);
+    const cwdAbs = import_node_path31.default.resolve(sessionFile.cwd);
+    const candidateAbs = import_node_path31.default.isAbsolute(args.relPath) ? import_node_path31.default.resolve(args.relPath) : import_node_path31.default.resolve(cwdAbs, args.relPath);
     assertGuestAttachmentPath(ctx, candidateAbs, deps.personaRoot, "attachment.signUrl", deps.usersRoot);
     const entries = deps.groupFileStore.list(scope, args.sessionId);
     const entry = entries.find((e) => {
-      const storedAbs = import_node_path32.default.isAbsolute(e.relPath) ? import_node_path32.default.resolve(e.relPath) : import_node_path32.default.resolve(cwdAbs, e.relPath);
+      const storedAbs = import_node_path31.default.isAbsolute(e.relPath) ? import_node_path31.default.resolve(e.relPath) : import_node_path31.default.resolve(cwdAbs, e.relPath);
       return storedAbs === candidateAbs && !e.stale;
     });
     if (!entry) {
@@ -43121,7 +42553,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_path32.default.resolve(f.cwd), deps.personaRoot, method, deps.usersRoot);
+    assertGuestAttachmentPath(ctx, import_node_path31.default.resolve(f.cwd), deps.personaRoot, method, deps.usersRoot);
   }
   const groupAdd = async (frame, _client, ctx) => {
     if (!deps.groupFileStore || !deps.getSessionScope) {
@@ -43193,19 +42625,19 @@ function buildAttachmentHandlers(deps) {
 
 // src/handlers/extension.ts
 var import_promises7 = __toESM(require("fs/promises"), 1);
-var import_node_path37 = __toESM(require("path"), 1);
+var import_node_path36 = __toESM(require("path"), 1);
 init_protocol();
 
 // src/extension/bundle-zip.ts
 var import_promises4 = __toESM(require("fs/promises"), 1);
-var import_node_path33 = __toESM(require("path"), 1);
+var import_node_path32 = __toESM(require("path"), 1);
 var import_node_crypto11 = __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_path33.default.join(dir, rel);
+    const abs = import_node_path32.default.join(dir, rel);
     const content = await import_promises4.default.readFile(abs);
     zip.file(rel, content, { date: FIXED_DATE });
   }
@@ -43226,7 +42658,7 @@ async function listFilesSorted(rootDir) {
   return out;
 }
 async function walk(absRoot, relPrefix, out) {
-  const dirAbs = import_node_path33.default.join(absRoot, relPrefix);
+  const dirAbs = import_node_path32.default.join(absRoot, relPrefix);
   const entries = await import_promises4.default.readdir(dirAbs, { withFileTypes: true });
   for (const e of entries) {
     if (IGNORE_BASENAMES.has(e.name)) continue;
@@ -43280,25 +42712,25 @@ function computePublishCheck(args) {
 
 // src/extension/install-flow.ts
 var import_promises5 = __toESM(require("fs/promises"), 1);
-var import_node_path35 = __toESM(require("path"), 1);
+var import_node_path34 = __toESM(require("path"), 1);
 var import_node_os17 = __toESM(require("os"), 1);
 var import_node_crypto12 = __toESM(require("crypto"), 1);
 var import_jszip3 = __toESM(require_lib3(), 1);
 
 // src/extension/paths.ts
 var import_node_os16 = __toESM(require("os"), 1);
-var import_node_path34 = __toESM(require("path"), 1);
+var import_node_path33 = __toESM(require("path"), 1);
 function clawdHomeRoot(override) {
-  return override ?? process.env.CLAWD_HOME ?? import_node_path34.default.join(import_node_os16.default.homedir(), ".clawd");
+  return override ?? process.env.CLAWD_HOME ?? import_node_path33.default.join(import_node_os16.default.homedir(), ".clawd");
 }
 function extensionsRoot(override) {
-  return import_node_path34.default.join(clawdHomeRoot(override), "extensions");
+  return import_node_path33.default.join(clawdHomeRoot(override), "extensions");
 }
 function publishedChannelsFile(override) {
-  return import_node_path34.default.join(clawdHomeRoot(override), "extensions-published.json");
+  return import_node_path33.default.join(clawdHomeRoot(override), "extensions-published.json");
 }
 function bundleCacheRoot(override) {
-  return import_node_path34.default.join(clawdHomeRoot(override), "extension-bundles");
+  return import_node_path33.default.join(clawdHomeRoot(override), "extension-bundles");
 }
 
 // src/extension/install-flow.ts
@@ -43325,7 +42757,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_path35.default.isAbsolute(name)) {
+    if (name.includes("..") || name.startsWith("/") || import_node_path34.default.isAbsolute(name)) {
       throw new InstallError("ZIP_INVALID", `unsafe zip entry: ${name}`);
     }
   }
@@ -43357,7 +42789,7 @@ async function installFromChannel(args, deps) {
     );
   }
   const localExtId = namespacedExtId(ownerSlug, channelRef.ownerPrincipalId);
-  const destDir = import_node_path35.default.join(deps.extensionsRoot, localExtId);
+  const destDir = import_node_path34.default.join(deps.extensionsRoot, localExtId);
   let destExists = false;
   try {
     await import_promises5.default.access(destDir);
@@ -43371,16 +42803,16 @@ async function installFromChannel(args, deps) {
     );
   }
   const stage = await import_promises5.default.mkdtemp(
-    import_node_path35.default.join(import_node_os17.default.tmpdir(), `clawd-ext-install-${localExtId}-`)
+    import_node_path34.default.join(import_node_os17.default.tmpdir(), `clawd-ext-install-${localExtId}-`)
   );
   try {
     for (const [name, entry] of Object.entries(zip.files)) {
-      const dest = import_node_path35.default.join(stage, name);
+      const dest = import_node_path34.default.join(stage, name);
       if (entry.dir) {
         await import_promises5.default.mkdir(dest, { recursive: true });
         continue;
       }
-      await import_promises5.default.mkdir(import_node_path35.default.dirname(dest), { recursive: true });
+      await import_promises5.default.mkdir(import_node_path34.default.dirname(dest), { recursive: true });
       if (name === "manifest.json") {
         const rewritten = { ...parsed.data, id: localExtId };
         await import_promises5.default.writeFile(dest, JSON.stringify(rewritten, null, 2));
@@ -43401,7 +42833,7 @@ async function installFromChannel(args, deps) {
 
 // src/extension/update-flow.ts
 var import_promises6 = __toESM(require("fs/promises"), 1);
-var import_node_path36 = __toESM(require("path"), 1);
+var import_node_path35 = __toESM(require("path"), 1);
 var import_node_os18 = __toESM(require("os"), 1);
 var import_node_crypto13 = __toESM(require("crypto"), 1);
 var import_jszip4 = __toESM(require_lib3(), 1);
@@ -43418,11 +42850,11 @@ async function updateFromChannel(args, deps) {
     channelRef.extId,
     channelRef.ownerPrincipalId
   );
-  const liveDir = import_node_path36.default.join(deps.extensionsRoot, localExtId);
+  const liveDir = import_node_path35.default.join(deps.extensionsRoot, localExtId);
   const prevDir = `${liveDir}.prev`;
   let existingVersion;
   try {
-    const raw = await import_promises6.default.readFile(import_node_path36.default.join(liveDir, "manifest.json"), "utf8");
+    const raw = await import_promises6.default.readFile(import_node_path35.default.join(liveDir, "manifest.json"), "utf8");
     const parsed2 = ExtensionManifestSchema.safeParse(JSON.parse(raw));
     if (!parsed2.success) {
       throw new UpdateError(
@@ -43455,7 +42887,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_path36.default.isAbsolute(name)) {
+    if (name.includes("..") || name.startsWith("/") || import_node_path35.default.isAbsolute(name)) {
       throw new UpdateError("ZIP_INVALID", `unsafe zip entry: ${name}`);
     }
   }
@@ -43490,16 +42922,16 @@ async function updateFromChannel(args, deps) {
   await import_promises6.default.rm(prevDir, { recursive: true, force: true });
   await import_promises6.default.rename(liveDir, prevDir);
   const stage = await import_promises6.default.mkdtemp(
-    import_node_path36.default.join(import_node_os18.default.tmpdir(), `clawd-ext-update-${localExtId}-`)
+    import_node_path35.default.join(import_node_os18.default.tmpdir(), `clawd-ext-update-${localExtId}-`)
   );
   try {
     for (const [name, entry] of Object.entries(zip.files)) {
-      const dest = import_node_path36.default.join(stage, name);
+      const dest = import_node_path35.default.join(stage, name);
       if (entry.dir) {
         await import_promises6.default.mkdir(dest, { recursive: true });
         continue;
       }
-      await import_promises6.default.mkdir(import_node_path36.default.dirname(dest), { recursive: true });
+      await import_promises6.default.mkdir(import_node_path35.default.dirname(dest), { recursive: true });
       if (name === "manifest.json") {
         const rewritten = { ...parsed.data, id: localExtId };
         await import_promises6.default.writeFile(dest, JSON.stringify(rewritten, null, 2));
@@ -43592,7 +43024,7 @@ async function rewriteManifestVersion(root, extId, newVersion, previousPublished
       );
     }
   }
-  const manifestPath = import_node_path37.default.join(root, extId, "manifest.json");
+  const manifestPath = import_node_path36.default.join(root, extId, "manifest.json");
   const manifest = await readManifest(root, extId);
   const next = { ...manifest, version: newVersion };
   const tmp = `${manifestPath}.tmp`;
@@ -43600,7 +43032,7 @@ async function rewriteManifestVersion(root, extId, newVersion, previousPublished
   await import_promises7.default.rename(tmp, manifestPath);
 }
 async function readManifest(root, extId) {
-  const file = import_node_path37.default.join(root, extId, "manifest.json");
+  const file = import_node_path36.default.join(root, extId, "manifest.json");
   let raw;
   try {
     raw = await import_promises7.default.readFile(file, "utf8");
@@ -43691,7 +43123,7 @@ function buildExtensionHandlers(deps) {
   };
   async function buildSnapshotMeta(extId) {
     const manifest = await readManifest(deps.root, extId);
-    const { sha256, buffer } = await bundleExtensionDir(import_node_path37.default.join(deps.root, extId));
+    const { sha256, buffer } = await bundleExtensionDir(import_node_path36.default.join(deps.root, extId));
     return { manifest, contentHash: sha256, buffer };
   }
   const publish = async (frame, _client, ctx) => {
@@ -43871,8 +43303,218 @@ function buildExtensionHandlers(deps) {
   };
 }
 
-// src/app-builder/kill-port.ts
+// src/app-builder/project-store.ts
+var import_node_fs30 = require("fs");
 var import_node_child_process11 = require("child_process");
+var import_node_path37 = require("path");
+init_protocol();
+var PROJECTS_DIR = "projects";
+var META_FILE = ".clawd-project.json";
+var DEFAULT_TEMPLATE = "nestjs-react";
+var SCAFFOLD_TIMEOUT_MS = 3e4;
+var ProjectStore = class {
+  /** @param root projects 父目录，例如 `~/.clawd/users/<userId>/`（v2 per-user） */
+  constructor(root) {
+    this.root = root;
+  }
+  root;
+  /** projects/<name>/.clawd-project.json 路径 */
+  metaPath(name) {
+    return (0, import_node_path37.join)(this.projectsRoot(), name, META_FILE);
+  }
+  /** projects/<name>/ 目录路径（cwd 用） */
+  projectDir(name) {
+    return (0, import_node_path37.join)(this.projectsRoot(), name);
+  }
+  projectsRoot() {
+    return (0, import_node_path37.join)(this.root, PROJECTS_DIR);
+  }
+  async list() {
+    let entries;
+    try {
+      entries = await import_node_fs30.promises.readdir(this.projectsRoot());
+    } catch (err) {
+      if (err.code === "ENOENT") return [];
+      throw err;
+    }
+    const out = [];
+    for (const name of entries) {
+      try {
+        const raw = await import_node_fs30.promises.readFile(this.metaPath(name), "utf8");
+        const json = JSON.parse(raw);
+        let migrated = false;
+        if (typeof json.devCommand !== "string" || json.devCommand.length === 0) {
+          json.devCommand = DEFAULT_DEV_COMMAND;
+          migrated = true;
+        }
+        const parsed = ProjectMetadataSchema.safeParse(json);
+        if (parsed.success) {
+          out.push(parsed.data);
+          if (migrated) {
+            void import_node_fs30.promises.writeFile(this.metaPath(name), JSON.stringify(parsed.data, null, 2) + "\n", "utf8").catch(() => {
+            });
+          }
+        }
+      } catch {
+      }
+    }
+    return out.sort((a, b2) => a.name.localeCompare(b2.name));
+  }
+  /**
+   * @param reservedPorts 其它 user 已占端口（v2 per-user：端口必须全局唯一，所有 user 的
+   *   dev server 同机跑；per-user store 各自只 list 自己，靠 handler 收集全局端口传进来，
+   *   否则不同 user 的首个项目都从 PROJECT_PORT_MIN 起 → 全撞 6173）。
+   */
+  async create(name, reservedPorts) {
+    const existing = await this.list();
+    if (existing.some((p2) => p2.name === name)) {
+      throw new Error(`project "${name}" already exists / \u5DF2\u5B58\u5728`);
+    }
+    const usedPorts = new Set(existing.map((p2) => p2.port));
+    if (reservedPorts) for (const p2 of reservedPorts) usedPorts.add(p2);
+    let port = -1;
+    for (let p2 = PROJECT_PORT_MIN; p2 <= PROJECT_PORT_MAX; p2++) {
+      if (!usedPorts.has(p2)) {
+        port = p2;
+        break;
+      }
+    }
+    if (port < 0) {
+      throw new Error(
+        `port pool exhausted / \u7AEF\u53E3\u6C60\u5DF2\u6EE1\uFF08${PROJECT_PORT_MIN}-${PROJECT_PORT_MAX}\uFF09\uFF0C\u5148\u5220\u4E00\u4E2A project \u91CA\u653E\u7AEF\u53E3`
+      );
+    }
+    const meta = {
+      name,
+      port,
+      createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+      devCommand: DEFAULT_DEV_COMMAND
+    };
+    const validated = ProjectMetadataSchema.safeParse(meta);
+    if (!validated.success) {
+      throw new Error(`invalid name "${name}": ${validated.error.message}`);
+    }
+    const dir = this.projectDir(name);
+    await import_node_fs30.promises.mkdir(dir, { recursive: true });
+    await import_node_fs30.promises.writeFile(this.metaPath(name), JSON.stringify(meta, null, 2) + "\n", "utf8");
+    return meta;
+  }
+  /**
+   * 同步内联 scaffold：spawn `extension-kit/scripts/new-extension.sh <name>` 等 exit。
+   * 必须在 `create()` 之后调（脚本期望 projects/<name>/.clawd-project.json 已就位 = picker 模式）。
+   * 失败抛错；上层（handler）应当 catch 后回滚（删 dir + 不 mutate session）。
+   *
+   * spec 2026-06-02 §5.6.3：scaffold 对 assistant 不可见，避免 assistant 被诱导去"读 example
+   * 代码再参考"。assistant 进 project 时目录已是完整模板，直接 pnpm install 即可。
+   */
+  async scaffold(name, templateSrcDir, scaffoldScriptPath) {
+    const destDir = this.projectDir(name);
+    return await new Promise((resolve6, reject) => {
+      const child = (0, import_node_child_process11.spawn)("bash", [scaffoldScriptPath, name, templateSrcDir, destDir], {
+        env: { ...process.env, PATH: process.env.PATH ?? "" },
+        stdio: ["ignore", "pipe", "pipe"]
+      });
+      let stdout = "";
+      let stderr = "";
+      child.stdout.on("data", (d) => {
+        stdout += d.toString("utf8");
+      });
+      child.stderr.on("data", (d) => {
+        stderr += d.toString("utf8");
+      });
+      const timer = setTimeout(() => {
+        child.kill("SIGKILL");
+        reject(new Error(`scaffold timeout (>${SCAFFOLD_TIMEOUT_MS}ms): ${scaffoldScriptPath} ${name}`));
+      }, SCAFFOLD_TIMEOUT_MS);
+      child.on("error", (err) => {
+        clearTimeout(timer);
+        reject(new Error(`scaffold spawn failed: ${err.message}`));
+      });
+      child.on("exit", (code, signal) => {
+        clearTimeout(timer);
+        if (code === 0) resolve6({ stdout, stderr });
+        else reject(new Error(`scaffold exit ${code ?? signal}: ${stderr.slice(0, 500)}`));
+      });
+    });
+  }
+  async delete(name) {
+    const dir = this.projectDir(name);
+    await import_node_fs30.promises.rm(dir, { recursive: true, force: true });
+  }
+  async updatePort(name, newPort) {
+    if (newPort < PROJECT_PORT_MIN || newPort > PROJECT_PORT_MAX) {
+      throw new Error(
+        `port range invalid: must be ${PROJECT_PORT_MIN}-${PROJECT_PORT_MAX}, got ${newPort}`
+      );
+    }
+    const list = await this.list();
+    const target = list.find((p2) => p2.name === name);
+    if (!target) throw new Error(`project "${name}" not found / \u4E0D\u5B58\u5728`);
+    const conflict = list.find((p2) => p2.name !== name && p2.port === newPort);
+    if (conflict) {
+      throw new Error(`port ${newPort} already used / \u5DF2\u88AB project "${conflict.name}" \u5360\u7528`);
+    }
+    const updated = { ...target, port: newPort };
+    await import_node_fs30.promises.writeFile(this.metaPath(name), JSON.stringify(updated, null, 2) + "\n", "utf8");
+    return updated;
+  }
+  /**
+   * 单栏 refactor (spec 2026-06-02 §5.6.1)：发布上线后写公网 URL 到 .clawd-project.json.prodUrl。
+   * UI 通过 listProjects 读到 prodUrl 后切预览栏到线上 URL，取代旧 prod marker 机制。
+   * 重复调用幂等（覆盖旧 URL）。url 由 ProjectMetadataSchema 校验 url() 格式。
+   */
+  async setProdUrl(name, url) {
+    const list = await this.list();
+    const target = list.find((p2) => p2.name === name);
+    if (!target) throw new Error(`project "${name}" not found / \u4E0D\u5B58\u5728`);
+    const updated = { ...target, prodUrl: url };
+    const validated = ProjectMetadataSchema.safeParse(updated);
+    if (!validated.success) {
+      throw new Error(`invalid prodUrl "${url}": ${validated.error.message}`);
+    }
+    await import_node_fs30.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
+    return validated.data;
+  }
+  /**
+   * 发布上线脚手架化 (spec 2026-06-03-app-builder-publish-scaffold-design §5.1.4)：
+   * 写 publishJob 字段到 .clawd-project.json。仅承载 in-flight 状态 ——
+   *   - daemon 收到第一个 ::stage::build marker 时写入
+   *   - 每次 stage 切换更新 stage 字段（jobId / startedAt 不变）
+   *   - 成功 / 失败 / dismiss 时调 clearPublishJob 清掉
+   *   - 只有 daemon 崩才会留残骸
+   * 写入时保留所有其他字段（prodUrl 等不受影响）。
+   */
+  async setPublishJob(name, job) {
+    const list = await this.list();
+    const target = list.find((p2) => p2.name === name);
+    if (!target) throw new Error(`project "${name}" not found / \u4E0D\u5B58\u5728`);
+    const updated = { ...target, publishJob: job };
+    const validated = ProjectMetadataSchema.safeParse(updated);
+    if (!validated.success) {
+      throw new Error(`invalid publishJob: ${validated.error.message}`);
+    }
+    await import_node_fs30.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
+    return validated.data;
+  }
+  /** 清掉 .clawd-project.json.publishJob 字段。其他字段保持原样。 */
+  async clearPublishJob(name) {
+    const list = await this.list();
+    const target = list.find((p2) => p2.name === name);
+    if (!target) throw new Error(`project "${name}" not found / \u4E0D\u5B58\u5728`);
+    if (!target.publishJob) return target;
+    const { publishJob: _drop, ...rest } = target;
+    void _drop;
+    const validated = ProjectMetadataSchema.safeParse(rest);
+    if (!validated.success) {
+      throw new Error(`failed to clear publishJob: ${validated.error.message}`);
+    }
+    await import_node_fs30.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
+    return validated.data;
+  }
+};
+
+// src/app-builder/kill-port.ts
+var import_node_child_process12 = require("child_process");
 async function killPortOccupants(port, ownedPids, logger) {
   let pids;
   try {
@@ -43914,7 +43556,7 @@ async function killPortOccupants(port, ownedPids, logger) {
 }
 function listPidsOnPort(port) {
   return new Promise((resolve6, reject) => {
-    (0, import_node_child_process11.execFile)(
+    (0, import_node_child_process12.execFile)(
       "lsof",
       ["-ti", `:${port}`],
       { timeout: 3e3 },
@@ -43986,7 +43628,7 @@ var PublishJobRegistry = class {
 };
 
 // src/app-builder/publish-job-runner.ts
-var import_node_child_process12 = require("child_process");
+var import_node_child_process13 = require("child_process");
 var import_node_fs31 = require("fs");
 var import_node_path38 = require("path");
 
@@ -44015,7 +43657,7 @@ function tailStderrLines(buf, n) {
 // src/app-builder/publish-job-runner.ts
 async function startPublishJob(deps, args) {
   const { registry: registry2, projectDir } = deps;
-  const spawn12 = deps.spawnImpl ?? import_node_child_process12.spawn;
+  const spawn12 = deps.spawnImpl ?? import_node_child_process13.spawn;
   if (registry2.has(args.name)) {
     return { jobId: registry2.get(args.name).jobId, status: "already-publishing" };
   }
@@ -44027,7 +43669,7 @@ async function startPublishJob(deps, args) {
   } catch {
     logStream = null;
   }
-  const child = spawn12("bash", [args.scriptPath, projDir], {
+  const child = spawn12("bash", [args.scriptPath, projDir, args.personaRoot ?? ""], {
     cwd: projDir,
     env: process.env,
     stdio: ["ignore", "pipe", "pipe"]
@@ -44282,8 +43924,7 @@ async function recoverInterruptedJobs(deps) {
 init_protocol();
 var import_node_path39 = require("path");
 var import_node_fs32 = require("fs");
-var APP_BUILDER_PERSONAS = ["persona-app-builder"];
-var PUBLISH_SCRIPT_REL = "extension-kit/scripts/publish.sh";
+var APP_BUILDER_PERSONAS = ["persona-app-builder", "persona-dataclaw-builder"];
 var DEV_SERVER_READY_TIMEOUT_MS = 3e4;
 async function recoverInterruptedPublishJobs(store, logger) {
   await recoverInterruptedJobs({
@@ -44438,7 +44079,10 @@ function buildAppBuilderHandlers(deps) {
     const reservedPorts = new Set((await listAllUsersProjects()).map((p2) => p2.port));
     const project = await userStore.create(f.name, reservedPorts);
     try {
-      const scaffoldResult = await userStore.scaffold(project.name, void 0, deps.personaRoot);
+      const personaRoot = deps.resolvePersonaRoot ? deps.resolvePersonaRoot(session.ownerPersonaId ?? "") : deps.personaRoot;
+      const templateSrcDir = (0, import_node_path39.join)(personaRoot, "extension-kit", "examples", DEFAULT_TEMPLATE);
+      const scaffoldScript = (0, import_node_path39.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,
         stdout: scaffoldResult.stdout.slice(0, 200)
@@ -44657,11 +44301,13 @@ function buildAppBuilderHandlers(deps) {
       });
       await userStore.clearPublishJob(args.name);
     }
-    const scriptPath = (0, import_node_path39.join)(deps.personaRoot, PUBLISH_SCRIPT_REL);
+    const personaRoot = deps.resolvePersonaRoot ? deps.resolvePersonaRoot(boundSession.ownerPersonaId ?? "") : deps.personaRoot;
+    const scriptPath = (0, import_node_path39.join)(deps.deployKitRoot, "scripts", "publish.sh");
     deps.logger?.info("app-builder.publish.start", {
       name: args.name,
       sessionId: boundSession.sessionId,
-      scriptPath
+      scriptPath,
+      personaRoot
     });
     const result = await startPublishJob(
       {
@@ -44696,7 +44342,8 @@ function buildAppBuilderHandlers(deps) {
       {
         name: args.name,
         sessionId: boundSession.sessionId,
-        scriptPath
+        scriptPath,
+        personaRoot
       }
     );
     return { response: { ...result } };
@@ -44894,227 +44541,16 @@ function buildMethodHandlers(deps) {
       broadcastProjectUpdated: deps.broadcastProjectUpdated,
       logger: deps.logger,
       // 发布上线脚手架化 (spec 2026-06-03 §5.2):
-      // personaRoot 用于拼 publish.sh 绝对路径；broadcastSessionFrame 用于失败回灌路径
-      // （runner 调 manager.send 后逐帧 dispatch 到 transport）。
+      // personaRoot 仅作 resolvePersonaRoot 未注入时的兜底；deployKitRoot 为共享脚本根。
+      // broadcastSessionFrame 用于失败回灌路径（runner 调 manager.send 后逐帧 dispatch 到 transport）。
       personaRoot: deps.appBuilderPersonaRoot,
+      deployKitRoot: deps.deployKitRoot,
+      resolvePersonaRoot: deps.resolvePersonaRoot,
       broadcastSessionFrame: deps.broadcastSessionFrame
     })
   };
 }
 
-// src/app-builder/project-store.ts
-var import_node_fs33 = require("fs");
-var import_node_child_process13 = require("child_process");
-var import_node_path42 = require("path");
-init_protocol();
-var PROJECTS_DIR = "projects";
-var META_FILE = ".clawd-project.json";
-var SCAFFOLD_SCRIPT_REL = "extension-kit/scripts/new-extension.sh";
-var DEFAULT_TEMPLATE = "nestjs-react";
-var SCAFFOLD_TIMEOUT_MS = 3e4;
-var ProjectStore = class {
-  /** @param root projects 父目录，例如 `~/.clawd/users/<userId>/`（v2 per-user） */
-  constructor(root) {
-    this.root = root;
-  }
-  root;
-  /** projects/<name>/.clawd-project.json 路径 */
-  metaPath(name) {
-    return (0, import_node_path42.join)(this.projectsRoot(), name, META_FILE);
-  }
-  /** projects/<name>/ 目录路径（cwd 用） */
-  projectDir(name) {
-    return (0, import_node_path42.join)(this.projectsRoot(), name);
-  }
-  projectsRoot() {
-    return (0, import_node_path42.join)(this.root, PROJECTS_DIR);
-  }
-  async list() {
-    let entries;
-    try {
-      entries = await import_node_fs33.promises.readdir(this.projectsRoot());
-    } catch (err) {
-      if (err.code === "ENOENT") return [];
-      throw err;
-    }
-    const out = [];
-    for (const name of entries) {
-      try {
-        const raw = await import_node_fs33.promises.readFile(this.metaPath(name), "utf8");
-        const json = JSON.parse(raw);
-        let migrated = false;
-        if (typeof json.devCommand !== "string" || json.devCommand.length === 0) {
-          json.devCommand = DEFAULT_DEV_COMMAND;
-          migrated = true;
-        }
-        const parsed = ProjectMetadataSchema.safeParse(json);
-        if (parsed.success) {
-          out.push(parsed.data);
-          if (migrated) {
-            void import_node_fs33.promises.writeFile(this.metaPath(name), JSON.stringify(parsed.data, null, 2) + "\n", "utf8").catch(() => {
-            });
-          }
-        }
-      } catch {
-      }
-    }
-    return out.sort((a, b2) => a.name.localeCompare(b2.name));
-  }
-  /**
-   * @param reservedPorts 其它 user 已占端口（v2 per-user：端口必须全局唯一，所有 user 的
-   *   dev server 同机跑；per-user store 各自只 list 自己，靠 handler 收集全局端口传进来，
-   *   否则不同 user 的首个项目都从 PROJECT_PORT_MIN 起 → 全撞 6173）。
-   */
-  async create(name, reservedPorts) {
-    const existing = await this.list();
-    if (existing.some((p2) => p2.name === name)) {
-      throw new Error(`project "${name}" already exists / \u5DF2\u5B58\u5728`);
-    }
-    const usedPorts = new Set(existing.map((p2) => p2.port));
-    if (reservedPorts) for (const p2 of reservedPorts) usedPorts.add(p2);
-    let port = -1;
-    for (let p2 = PROJECT_PORT_MIN; p2 <= PROJECT_PORT_MAX; p2++) {
-      if (!usedPorts.has(p2)) {
-        port = p2;
-        break;
-      }
-    }
-    if (port < 0) {
-      throw new Error(
-        `port pool exhausted / \u7AEF\u53E3\u6C60\u5DF2\u6EE1\uFF08${PROJECT_PORT_MIN}-${PROJECT_PORT_MAX}\uFF09\uFF0C\u5148\u5220\u4E00\u4E2A project \u91CA\u653E\u7AEF\u53E3`
-      );
-    }
-    const meta = {
-      name,
-      port,
-      createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-      devCommand: DEFAULT_DEV_COMMAND
-    };
-    const validated = ProjectMetadataSchema.safeParse(meta);
-    if (!validated.success) {
-      throw new Error(`invalid name "${name}": ${validated.error.message}`);
-    }
-    const dir = this.projectDir(name);
-    await import_node_fs33.promises.mkdir(dir, { recursive: true });
-    await import_node_fs33.promises.writeFile(this.metaPath(name), JSON.stringify(meta, null, 2) + "\n", "utf8");
-    return meta;
-  }
-  /**
-   * 同步内联 scaffold：spawn `extension-kit/scripts/new-extension.sh <name>` 等 exit。
-   * 必须在 `create()` 之后调（脚本期望 projects/<name>/.clawd-project.json 已就位 = picker 模式）。
-   * 失败抛错；上层（handler）应当 catch 后回滚（删 dir + 不 mutate session）。
-   *
-   * spec 2026-06-02 §5.6.3：scaffold 对 assistant 不可见，避免 assistant 被诱导去"读 example
-   * 代码再参考"。assistant 进 project 时目录已是完整模板，直接 pnpm install 即可。
-   */
-  async scaffold(name, template = DEFAULT_TEMPLATE, personaRoot = this.root) {
-    const scriptPath = (0, import_node_path42.join)(personaRoot, SCAFFOLD_SCRIPT_REL);
-    const destDir = this.projectDir(name);
-    return await new Promise((resolve6, reject) => {
-      const child = (0, import_node_child_process13.spawn)("bash", [scriptPath, name, template, destDir], {
-        cwd: personaRoot,
-        env: { ...process.env, PATH: process.env.PATH ?? "" },
-        stdio: ["ignore", "pipe", "pipe"]
-      });
-      let stdout = "";
-      let stderr = "";
-      child.stdout.on("data", (d) => {
-        stdout += d.toString("utf8");
-      });
-      child.stderr.on("data", (d) => {
-        stderr += d.toString("utf8");
-      });
-      const timer = setTimeout(() => {
-        child.kill("SIGKILL");
-        reject(new Error(`scaffold timeout (>${SCAFFOLD_TIMEOUT_MS}ms): ${scriptPath} ${name} ${template}`));
-      }, SCAFFOLD_TIMEOUT_MS);
-      child.on("error", (err) => {
-        clearTimeout(timer);
-        reject(new Error(`scaffold spawn failed: ${err.message}`));
-      });
-      child.on("exit", (code, signal) => {
-        clearTimeout(timer);
-        if (code === 0) resolve6({ stdout, stderr });
-        else reject(new Error(`scaffold exit ${code ?? signal}: ${stderr.slice(0, 500)}`));
-      });
-    });
-  }
-  async delete(name) {
-    const dir = this.projectDir(name);
-    await import_node_fs33.promises.rm(dir, { recursive: true, force: true });
-  }
-  async updatePort(name, newPort) {
-    if (newPort < PROJECT_PORT_MIN || newPort > PROJECT_PORT_MAX) {
-      throw new Error(
-        `port range invalid: must be ${PROJECT_PORT_MIN}-${PROJECT_PORT_MAX}, got ${newPort}`
-      );
-    }
-    const list = await this.list();
-    const target = list.find((p2) => p2.name === name);
-    if (!target) throw new Error(`project "${name}" not found / \u4E0D\u5B58\u5728`);
-    const conflict = list.find((p2) => p2.name !== name && p2.port === newPort);
-    if (conflict) {
-      throw new Error(`port ${newPort} already used / \u5DF2\u88AB project "${conflict.name}" \u5360\u7528`);
-    }
-    const updated = { ...target, port: newPort };
-    await import_node_fs33.promises.writeFile(this.metaPath(name), JSON.stringify(updated, null, 2) + "\n", "utf8");
-    return updated;
-  }
-  /**
-   * 单栏 refactor (spec 2026-06-02 §5.6.1)：发布上线后写公网 URL 到 .clawd-project.json.prodUrl。
-   * UI 通过 listProjects 读到 prodUrl 后切预览栏到线上 URL，取代旧 prod marker 机制。
-   * 重复调用幂等（覆盖旧 URL）。url 由 ProjectMetadataSchema 校验 url() 格式。
-   */
-  async setProdUrl(name, url) {
-    const list = await this.list();
-    const target = list.find((p2) => p2.name === name);
-    if (!target) throw new Error(`project "${name}" not found / \u4E0D\u5B58\u5728`);
-    const updated = { ...target, prodUrl: url };
-    const validated = ProjectMetadataSchema.safeParse(updated);
-    if (!validated.success) {
-      throw new Error(`invalid prodUrl "${url}": ${validated.error.message}`);
-    }
-    await import_node_fs33.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
-    return validated.data;
-  }
-  /**
-   * 发布上线脚手架化 (spec 2026-06-03-app-builder-publish-scaffold-design §5.1.4)：
-   * 写 publishJob 字段到 .clawd-project.json。仅承载 in-flight 状态 ——
-   *   - daemon 收到第一个 ::stage::build marker 时写入
-   *   - 每次 stage 切换更新 stage 字段（jobId / startedAt 不变）
-   *   - 成功 / 失败 / dismiss 时调 clearPublishJob 清掉
-   *   - 只有 daemon 崩才会留残骸
-   * 写入时保留所有其他字段（prodUrl 等不受影响）。
-   */
-  async setPublishJob(name, job) {
-    const list = await this.list();
-    const target = list.find((p2) => p2.name === name);
-    if (!target) throw new Error(`project "${name}" not found / \u4E0D\u5B58\u5728`);
-    const updated = { ...target, publishJob: job };
-    const validated = ProjectMetadataSchema.safeParse(updated);
-    if (!validated.success) {
-      throw new Error(`invalid publishJob: ${validated.error.message}`);
-    }
-    await import_node_fs33.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
-    return validated.data;
-  }
-  /** 清掉 .clawd-project.json.publishJob 字段。其他字段保持原样。 */
-  async clearPublishJob(name) {
-    const list = await this.list();
-    const target = list.find((p2) => p2.name === name);
-    if (!target) throw new Error(`project "${name}" not found / \u4E0D\u5B58\u5728`);
-    if (!target.publishJob) return target;
-    const { publishJob: _drop, ...rest } = target;
-    void _drop;
-    const validated = ProjectMetadataSchema.safeParse(rest);
-    if (!validated.success) {
-      throw new Error(`failed to clear publishJob: ${validated.error.message}`);
-    }
-    await import_node_fs33.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
-    return validated.data;
-  }
-};
-
 // src/app-builder/dev-server-supervisor.ts
 var import_node_child_process14 = require("child_process");
 var import_node_events2 = require("events");
@@ -45546,7 +44982,7 @@ function computeGrantForFrame(method, frame) {
 
 // src/extension/runtime.ts
 var import_node_child_process15 = require("child_process");
-var import_node_path43 = __toESM(require("path"), 1);
+var import_node_path42 = __toESM(require("path"), 1);
 var import_promises10 = require("timers/promises");
 
 // src/extension/port-allocator.ts
@@ -45647,7 +45083,7 @@ var Runtime = class {
       /\$CLAWOS_EXT_PORT/g,
       String(port)
     );
-    const dir = import_node_path43.default.join(this.root, extId);
+    const dir = import_node_path42.default.join(this.root, extId);
     const env = {
       ...process.env,
       CLAWOS_EXT_PORT: String(port),
@@ -45759,7 +45195,7 @@ ${handle.stderrTail}`
 
 // src/extension/published-channels.ts
 var import_promises11 = __toESM(require("fs/promises"), 1);
-var import_node_path44 = __toESM(require("path"), 1);
+var import_node_path43 = __toESM(require("path"), 1);
 init_zod();
 var PublishedChannelsError = class extends Error {
   constructor(code, message) {
@@ -45858,7 +45294,7 @@ var PublishedChannelStore = class {
       )
     };
     const tmp = `${this.filePath}.tmp`;
-    await import_promises11.default.mkdir(import_node_path44.default.dirname(this.filePath), { recursive: true });
+    await import_promises11.default.mkdir(import_node_path43.default.dirname(this.filePath), { recursive: true });
     await import_promises11.default.writeFile(tmp, JSON.stringify(data, null, 2), { mode: 384 });
     await import_promises11.default.rename(tmp, this.filePath);
   }
@@ -45866,7 +45302,7 @@ var PublishedChannelStore = class {
 
 // src/extension/bundle-cache.ts
 var import_promises12 = __toESM(require("fs/promises"), 1);
-var import_node_path45 = __toESM(require("path"), 1);
+var import_node_path44 = __toESM(require("path"), 1);
 var BundleCache = class {
   constructor(rootDir) {
     this.rootDir = rootDir;
@@ -45875,14 +45311,14 @@ var BundleCache = class {
   /** Atomic write: stage tmp → rename. Caller passes the hex sha256. */
   async write(snapshotHash, buffer) {
     await import_promises12.default.mkdir(this.rootDir, { recursive: true });
-    const file = import_node_path45.default.join(this.rootDir, `${snapshotHash}.zip`);
+    const file = import_node_path44.default.join(this.rootDir, `${snapshotHash}.zip`);
     const tmp = `${file}.tmp`;
     await import_promises12.default.writeFile(tmp, buffer, { mode: 384 });
     await import_promises12.default.rename(tmp, file);
   }
   /** Returns the bundle bytes, or null when the file doesn't exist. */
   async read(snapshotHash) {
-    const file = import_node_path45.default.join(this.rootDir, `${snapshotHash}.zip`);
+    const file = import_node_path44.default.join(this.rootDir, `${snapshotHash}.zip`);
     try {
       return await import_promises12.default.readFile(file);
     } catch (e) {
@@ -45892,33 +45328,16 @@ var BundleCache = class {
   }
   /** Idempotent — missing file is not an error. */
   async delete(snapshotHash) {
-    const file = import_node_path45.default.join(this.rootDir, `${snapshotHash}.zip`);
+    const file = import_node_path44.default.join(this.rootDir, `${snapshotHash}.zip`);
     await import_promises12.default.rm(file, { force: true });
   }
 };
 
 // src/index.ts
-var import_meta4 = {};
 async function startDaemon(config) {
-  const authFile = loadOrCreateAuthFile({ dataDir: config.dataDir });
-  const logShippingCfg = config.logShipping ?? { endpoint: null, sampling: {}, mode: "off" };
-  const logClient = createLogClient({
-    endpoint: logShippingCfg.endpoint,
-    identity: {
-      ownerPrincipalId: authFile.ownerPrincipalId,
-      deviceId: authFile.deviceId,
-      appVersion: version,
-      daemonVersion: version,
-      os: `${process.platform}-${process.arch}`
-    },
-    source: "daemon",
-    sampling: logShippingCfg.sampling,
-    homeDir: import_node_os19.default.homedir()
-  });
   const logger = createLogger({
     level: config.logLevel,
-    file: import_node_path46.default.join(config.dataDir, "clawd.log"),
-    logClient
+    file: import_node_path45.default.join(config.dataDir, "clawd.log")
   });
   logger.info("starting clawd", { version, config: { port: config.port, host: config.host, dataDir: config.dataDir } });
   const stateMgr = new StateFileManager({ dataDir: config.dataDir });
@@ -45929,6 +45348,7 @@ async function startDaemon(config) {
   if (pre.status === "stale") {
     logger.warn("stale state file detected, overwriting", { pid: pre.existing.pid });
   }
+  const authFile = loadOrCreateAuthFile({ dataDir: config.dataDir });
   let resolvedAuthToken = null;
   if (config.authToken && config.authToken.trim()) {
     resolvedAuthToken = config.authToken.trim();
@@ -46053,8 +45473,8 @@ async function startDaemon(config) {
   const agents = new AgentsScanner();
   const history = new ClaudeHistoryReader();
   let transport = null;
-  const personaStore = new PersonaStore(import_node_path46.default.join(config.dataDir, "personas"));
-  const usersRoot = import_node_path46.default.join(config.dataDir, "users");
+  const personaStore = new PersonaStore(import_node_path45.default.join(config.dataDir, "personas"));
+  const usersRoot = import_node_path45.default.join(config.dataDir, "users");
   const defaultsRoot = findDefaultsRoot();
   if (defaultsRoot) {
     seedDefaultPersonas({ store: personaStore, defaultsRoot, logger });
@@ -46062,36 +45482,16 @@ async function startDaemon(config) {
   } else {
     logger.warn("persona.seed.skip", { reason: "defaults-root-not-found" });
   }
+  const deployKitBundleRoot = findDeployKitRoot();
+  if (deployKitBundleRoot) {
+    seedDeployKit({ deployKitBundleRoot, dataDir: config.dataDir, logger });
+    refreshDeployKit({ deployKitBundleRoot, dataDir: config.dataDir, logger });
+  } else {
+    logger.warn("deploy-kit.bundle-missing", {});
+  }
   migrateAgentsMirror({ store: personaStore, logger });
   migrateCodexSandbox({ store: personaStore, logger });
   const groupFileStore = new GroupFileStore({ dataDir: config.dataDir, logger });
-  const personaDispatchManager = new PersonaDispatchManager({ genId: () => v4_default() });
-  const here = typeof __dirname === "string" ? __dirname : import_node_path46.default.dirname((0, import_node_url2.fileURLToPath)(import_meta4.url));
-  const dispatchServerCandidates = [
-    import_node_path46.default.join(here, "dispatch", "mcp-server.cjs"),
-    // 生产 dist/index → dist/dispatch/mcp-server.cjs
-    import_node_path46.default.join(here, "..", "dist", "dispatch", "mcp-server.cjs")
-    // dev tsx src/index → ../dist/dispatch/mcp-server.cjs
-  ];
-  const dispatchServerScriptPath = dispatchServerCandidates.find((p2) => import_node_fs34.default.existsSync(p2));
-  let dispatchMcpConfigPath2;
-  if (dispatchServerScriptPath) {
-    const dispatchLogPath = import_node_path46.default.join(config.dataDir, "dispatch-mcp-server.log");
-    dispatchMcpConfigPath2 = writeDispatchMcpConfig({
-      dataDir: config.dataDir,
-      serverScriptPath: dispatchServerScriptPath,
-      logPath: dispatchLogPath
-    });
-    logger.info("dispatch.mcp.json written", {
-      path: dispatchMcpConfigPath2,
-      server: dispatchServerScriptPath,
-      serverLog: dispatchLogPath
-    });
-  } else {
-    logger.warn("dispatch-mcp-server.cjs not found; persona dispatch disabled (dev tsx \u6A21\u5F0F\u4E0B\u9700\u5148\u8DD1\u8FC7 build)", {
-      tried: dispatchServerCandidates
-    });
-  }
   const manager = new SessionManager({
     store,
     // Phase 2 (capability platform plan §1): factory 注入后 manager.storeFor 走
@@ -46101,7 +45501,7 @@ async function startDaemon(config) {
     getAdapter,
     historyReader: history,
     dataDir: config.dataDir,
-    personaRoot: import_node_path46.default.join(config.dataDir, "personas"),
+    personaRoot: import_node_path45.default.join(config.dataDir, "personas"),
     usersRoot,
     personaStore,
     ownerDisplayName,
@@ -46112,12 +45512,6 @@ async function startDaemon(config) {
     // 127.0.0.1（不是 config.host）—— cc 跑在本机，loopback 最稳；外部访问限制 + http-router
     // 的 isLoopback 兜底已确保安全。
     getDaemonUrl: () => `http://127.0.0.1:${config.port}`,
-    // Persona dispatch (Task 8): manager 通过这两个 deps 跟 PersonaDispatchManager 协作。
-    // - personaDispatchManager: manager.createDispatchedSession 用它 registerBSession；
-    //   reducer 通过闭包反查 dispatchId 注 CLAWD_DISPATCH_ID env。
-    // - dispatchMcpConfigPath: reducer 透传到 SpawnContext，cc spawn 加 --mcp-config flag。
-    personaDispatchManager,
-    dispatchMcpConfigPath: dispatchMcpConfigPath2,
     broadcastFrame: (frame, target) => {
       if (target === "all") {
         transport?.broadcastAll(frame);
@@ -46137,10 +45531,10 @@ async function startDaemon(config) {
     // 文件可能 agent 写完又被自己删（罕见），用 size=0 / fallback mime 兜底。
     attachmentGroup: {
       onFileEdit: (input) => {
-        const absPath = import_node_path46.default.isAbsolute(input.relPath) ? input.relPath : import_node_path46.default.join(input.cwd, input.relPath);
+        const absPath = import_node_path45.default.isAbsolute(input.relPath) ? input.relPath : import_node_path45.default.join(input.cwd, input.relPath);
         let size = 0;
         try {
-          size = import_node_fs34.default.statSync(absPath).size;
+          size = import_node_fs33.default.statSync(absPath).size;
         } catch (err) {
           logger.warn("attachment.onFileEdit stat failed", {
             sessionId: input.sessionId,
@@ -46326,11 +45720,11 @@ async function startDaemon(config) {
       // 'persona/<pid>/owner'，default 走 'default'。
       getSessionScope: (sid) => manager.findOwnedSessionScope(sid),
       // guest path guard：candidate 必须在 personaRoot 子树或调用者自己的 user-dir 下
-      personaRoot: import_node_path46.default.join(config.dataDir, "personas"),
+      personaRoot: import_node_path45.default.join(config.dataDir, "personas"),
       usersRoot
     },
     // workspace/git/history/skills/agents handler 共用的 guest path guard 锚点
-    personaRoot: import_node_path46.default.join(config.dataDir, "personas"),
+    personaRoot: import_node_path45.default.join(config.dataDir, "personas"),
     // v2 多人 persona 隔离：handler 派生 guest user-dir 放行
     usersRoot,
     // capability:list / delete handler 依赖
@@ -46419,7 +45813,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_path46.default.join(config.dataDir, "personas", "persona-app-builder"),
+    appBuilderPersonaRoot: import_node_path45.default.join(config.dataDir, "personas", "persona-app-builder"),
+    // 共享 deploy-kit 根：scaffold/publish 脚本骨架 + 阿里云凭证单一真源。
+    deployKitRoot: import_node_path45.default.join(config.dataDir, "deploy-kit"),
+    // scaffold/publish 按当前 session 的 persona 解析其安装根，让每个 persona 用自己的模板/注入配置。
+    resolvePersonaRoot: (personaId) => import_node_path45.default.join(config.dataDir, "personas", personaId),
     // 发布上线脚手架化 (spec 2026-06-03 §5.2.2):
     // 复用 SessionManagerDeps.broadcastFrame 同款 dispatch 逻辑 —— runner 调 manager.send
     // 取回 broadcast 帧后逐帧 push 到 transport，跟 manager 自身的 deps 一致。
@@ -46440,41 +45838,6 @@ async function startDaemon(config) {
     logger
   });
   let handlers = makeHandlers();
-  const dispatchHandlers = buildPersonaDispatchHandlers({
-    personaDispatchManager,
-    logger,
-    spawnB: async (args) => {
-      logger.info("dispatch.spawnB.start", {
-        dispatchId: args.dispatchId,
-        targetPersona: args.targetPersona,
-        sourceSessionId: args.sourceSessionId
-      });
-      const sourceFile = manager.findOwnedSession(args.sourceSessionId);
-      if (!sourceFile) {
-        throw new Error(`personaDispatch:run source session not found: ${args.sourceSessionId}`);
-      }
-      const sourceJsonlPath = sourceFile.toolSessionId ? import_node_path46.default.join(
-        import_node_os19.default.homedir(),
-        ".claude",
-        "projects",
-        cwdToHashDir(sourceFile.cwd),
-        `${sourceFile.toolSessionId}.jsonl`
-      ) : "(no transcript yet \u2014 operate from the task description alone)";
-      logger.info("dispatch.spawnB.source-resolved", {
-        dispatchId: args.dispatchId,
-        sourceJsonlPath,
-        hasToolSessionId: Boolean(sourceFile.toolSessionId)
-      });
-      manager.createDispatchedSession({
-        dispatchId: args.dispatchId,
-        sourceSessionId: args.sourceSessionId,
-        targetPersona: args.targetPersona,
-        prompt: args.prompt,
-        sourceJsonlPath
-      });
-    }
-  });
-  handlers = { ...handlers, ...dispatchHandlers };
   const authResolver = new AuthContextResolver({
     ownerToken: resolvedAuthToken
   });
@@ -46549,10 +45912,6 @@ async function startDaemon(config) {
         manager,
         getAdapter,
         getTunnelUrl: () => currentTunnelUrl,
-        getLogShipping: () => config.logShipping ? {
-          endpoint: config.logShipping.endpoint,
-          sampling: config.logShipping.sampling
-        } : null,
         // ready 帧 mode = daemon CC spawn 模式（'sdk' | 'tui'）；UI 用它挂 XtermPanel
         mode: config.mode,
         // file-sharing 字段：httpBaseUrl 跟 tunnel 状态走；httpToken 复用 owner WS token
@@ -46707,8 +46066,8 @@ async function startDaemon(config) {
       const lines = [
         `Tunnel:      ${r.url}`,
         ...resolvedAuthToken ? [`Connect:     ${connectUrl}`] : [],
-        `Frpc config: ${import_node_path46.default.join(config.dataDir, "frpc.toml")}`,
-        `Frpc log:    ${import_node_path46.default.join(config.dataDir, "frpc.log")}`
+        `Frpc config: ${import_node_path45.default.join(config.dataDir, "frpc.toml")}`,
+        `Frpc log:    ${import_node_path45.default.join(config.dataDir, "frpc.log")}`
       ];
       const width = Math.max(...lines.map((l) => l.length));
       const bar = "\u2550".repeat(width + 4);
@@ -46721,8 +46080,8 @@ ${bar}
 
 `);
       try {
-        const connectPath = import_node_path46.default.join(config.dataDir, "connect.txt");
-        import_node_fs34.default.writeFileSync(connectPath, lines.join("\n") + "\n", { mode: 384 });
+        const connectPath = import_node_path45.default.join(config.dataDir, "connect.txt");
+        import_node_fs33.default.writeFileSync(connectPath, lines.join("\n") + "\n", { mode: 384 });
       } catch {
       }
     } catch (err) {
@@ -46783,7 +46142,6 @@ ${bar}
     }
     await wss.stop();
     stateMgr.delete();
-    if (logClient) await logClient.dispose();
   };
   return {
     stop: shutdown,
@@ -46794,9 +46152,9 @@ ${bar}
   };
 }
 function migrateDropPersonsDir(dataDir) {
-  const dir = import_node_path46.default.join(dataDir, "persons");
+  const dir = import_node_path45.default.join(dataDir, "persons");
   try {
-    import_node_fs34.default.rmSync(dir, { recursive: true, force: true });
+    import_node_fs33.default.rmSync(dir, { recursive: true, force: true });
   } catch {
   }
 }