@clawos-dev/clawd 0.2.142-beta.297.e4b56a8 → 0.2.142

package/dist/cli.cjs

@@ -5952,17 +5952,41 @@ var init_dispatch = __esm({
     ]);
     DispatchRunArgsSchema = external_exports.object({
       targetPersona: external_exports.string().min(1),
-      prompt: external_exports.string(),
-      // mode='continue' 时 daemon 反查 (sourceSessionId, targetPersona) 最近 B session 复用；
-      // 'new' 或 undefined（默认）= 当前行为，新建 B。
-      mode: external_exports.enum(["new", "continue"]).optional()
+      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"() {
@@ -5982,6 +6006,7 @@ var init_runtime = __esm({
     init_extension();
     init_feishu_auth();
     init_dispatch();
+    init_log();
   }
 });
 
@@ -7134,7 +7159,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 sleep = function(ms) {
+      let sleep2 = function(ms) {
         const valid = ms > 0 && ms < Infinity;
         if (valid === false) {
           if (typeof ms !== "number" && typeof ms !== "bigint") {
@@ -7145,9 +7170,9 @@ var require_atomic_sleep = __commonJS({
         Atomics.wait(nil, 0, 0, Number(ms));
       };
       const nil = new Int32Array(new SharedArrayBuffer(4));
-      module2.exports = sleep;
+      module2.exports = sleep2;
     } else {
-      let sleep = function(ms) {
+      let sleep2 = function(ms) {
         const valid = ms > 0 && ms < Infinity;
         if (valid === false) {
           if (typeof ms !== "number" && typeof ms !== "bigint") {
@@ -7159,7 +7184,7 @@ var require_atomic_sleep = __commonJS({
         while (target > Date.now()) {
         }
       };
-      module2.exports = sleep;
+      module2.exports = sleep2;
     }
   }
 });
@@ -7172,7 +7197,7 @@ var require_sonic_boom = __commonJS({
     var EventEmitter3 = require("events");
     var inherits = require("util").inherits;
     var path59 = require("path");
-    var sleep = require_atomic_sleep();
+    var sleep2 = require_atomic_sleep();
     var assert = require("assert");
     var BUSY_WRITE_TIMEOUT = 100;
     var kEmptyBuffer = Buffer.allocUnsafe(0);
@@ -7318,7 +7343,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 {
-                sleep(BUSY_WRITE_TIMEOUT);
+                sleep2(BUSY_WRITE_TIMEOUT);
                 this.release(void 0, 0);
               } catch (err2) {
                 this.release(err2);
@@ -7631,7 +7656,7 @@ var require_sonic_boom = __commonJS({
           if (shouldRetry && !this.retryEAGAIN(err, buf.length, this._len - buf.length)) {
             throw err;
           }
-          sleep(BUSY_WRITE_TIMEOUT);
+          sleep2(BUSY_WRITE_TIMEOUT);
         }
       }
       try {
@@ -7668,7 +7693,7 @@ var require_sonic_boom = __commonJS({
           if (shouldRetry && !this.retryEAGAIN(err, buf.length, this._len - buf.length)) {
             throw err;
           }
-          sleep(BUSY_WRITE_TIMEOUT);
+          sleep2(BUSY_WRITE_TIMEOUT);
         }
       }
     }
@@ -8409,7 +8434,7 @@ var require_transport = __commonJS({
     var { createRequire } = require("module");
     var getCallers = require_caller();
     var { join: join15, isAbsolute: isAbsolute2, sep: sep2 } = require("path");
-    var sleep = require_atomic_sleep();
+    var sleep2 = require_atomic_sleep();
     var onExit = require_on_exit_leak_free();
     var ThreadStream = require_thread_stream();
     function setupOnExit(stream) {
@@ -8443,7 +8468,7 @@ var require_transport = __commonJS({
           return;
         }
         stream.flushSync();
-        sleep(100);
+        sleep2(100);
         stream.end();
       }
       return stream;
@@ -18162,7 +18187,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: Writable2 } = require("stream");
+    var { Writable: Writable3 } = require("stream");
     var PerMessageDeflate2 = require_permessage_deflate();
     var {
       BINARY_TYPES,
@@ -18180,7 +18205,7 @@ var require_receiver = __commonJS({
     var GET_DATA = 4;
     var INFLATING = 5;
     var DEFER_EVENT = 6;
-    var Receiver2 = class extends Writable2 {
+    var Receiver2 = class extends Writable3 {
       /**
        * Creates a Receiver instance.
        *
@@ -21443,7 +21468,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 = Writable2;
+    module2.exports = Writable3;
     function CorkedRequest(state) {
       var _this = this;
       this.next = null;
@@ -21454,7 +21479,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;
-    Writable2.WritableState = WritableState;
+    Writable3.WritableState = WritableState;
     var util2 = Object.create(require_util());
     util2.inherits = require_inherits();
     var internalUtil = {
@@ -21471,7 +21496,7 @@ var require_stream_writable = __commonJS({
       return Buffer2.isBuffer(obj) || obj instanceof OurUint8Array;
     }
     var destroyImpl = require_destroy();
-    util2.inherits(Writable2, Stream);
+    util2.inherits(Writable3, Stream);
     function nop() {
     }
     function WritableState(options, stream) {
@@ -21536,10 +21561,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(Writable2, Symbol.hasInstance, {
+      Object.defineProperty(Writable3, Symbol.hasInstance, {
         value: function(object) {
           if (realHasInstance.call(this, object)) return true;
-          if (this !== Writable2) return false;
+          if (this !== Writable3) return false;
           return object && object._writableState instanceof WritableState;
         }
       });
@@ -21548,10 +21573,10 @@ var require_stream_writable = __commonJS({
         return object instanceof this;
       };
     }
-    function Writable2(options) {
+    function Writable3(options) {
       Duplex = Duplex || require_stream_duplex();
-      if (!realHasInstance.call(Writable2, this) && !(this instanceof Duplex)) {
-        return new Writable2(options);
+      if (!realHasInstance.call(Writable3, this) && !(this instanceof Duplex)) {
+        return new Writable3(options);
       }
       this._writableState = new WritableState(options, this);
       this.writable = true;
@@ -21563,7 +21588,7 @@ var require_stream_writable = __commonJS({
       }
       Stream.call(this);
     }
-    Writable2.prototype.pipe = function() {
+    Writable3.prototype.pipe = function() {
       this.emit("error", new Error("Cannot pipe, not readable"));
     };
     function writeAfterEnd(stream, cb) {
@@ -21586,7 +21611,7 @@ var require_stream_writable = __commonJS({
       }
       return valid;
     }
-    Writable2.prototype.write = function(chunk, encoding, cb) {
+    Writable3.prototype.write = function(chunk, encoding, cb) {
       var state = this._writableState;
       var ret = false;
       var isBuf = !state.objectMode && _isUint8Array(chunk);
@@ -21607,18 +21632,18 @@ var require_stream_writable = __commonJS({
       }
       return ret;
     };
-    Writable2.prototype.cork = function() {
+    Writable3.prototype.cork = function() {
       var state = this._writableState;
       state.corked++;
     };
-    Writable2.prototype.uncork = function() {
+    Writable3.prototype.uncork = function() {
       var state = this._writableState;
       if (state.corked) {
         state.corked--;
         if (!state.writing && !state.corked && !state.bufferProcessing && state.bufferedRequest) clearBuffer(this, state);
       }
     };
-    Writable2.prototype.setDefaultEncoding = function setDefaultEncoding(encoding) {
+    Writable3.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;
@@ -21630,7 +21655,7 @@ var require_stream_writable = __commonJS({
       }
       return chunk;
     }
-    Object.defineProperty(Writable2.prototype, "writableHighWaterMark", {
+    Object.defineProperty(Writable3.prototype, "writableHighWaterMark", {
       // making it explicit this property is not enumerable
       // because otherwise some prototype manipulation in
       // userland will fail
@@ -21776,11 +21801,11 @@ var require_stream_writable = __commonJS({
       state.bufferedRequest = entry;
       state.bufferProcessing = false;
     }
-    Writable2.prototype._write = function(chunk, encoding, cb) {
+    Writable3.prototype._write = function(chunk, encoding, cb) {
       cb(new Error("_write() is not implemented"));
     };
-    Writable2.prototype._writev = null;
-    Writable2.prototype.end = function(chunk, encoding, cb) {
+    Writable3.prototype._writev = null;
+    Writable3.prototype.end = function(chunk, encoding, cb) {
       var state = this._writableState;
       if (typeof chunk === "function") {
         cb = chunk;
@@ -21855,7 +21880,7 @@ var require_stream_writable = __commonJS({
       }
       state.corkedRequestsFree.next = corkReq;
     }
-    Object.defineProperty(Writable2.prototype, "destroyed", {
+    Object.defineProperty(Writable3.prototype, "destroyed", {
       get: function() {
         if (this._writableState === void 0) {
           return false;
@@ -21869,9 +21894,9 @@ var require_stream_writable = __commonJS({
         this._writableState.destroyed = value;
       }
     });
-    Writable2.prototype.destroy = destroyImpl.destroy;
-    Writable2.prototype._undestroy = destroyImpl.undestroy;
-    Writable2.prototype._destroy = function(err, cb) {
+    Writable3.prototype.destroy = destroyImpl.destroy;
+    Writable3.prototype._undestroy = destroyImpl.undestroy;
+    Writable3.prototype._destroy = function(err, cb) {
       this.end();
       cb(err);
     };
@@ -21894,13 +21919,13 @@ var require_stream_duplex = __commonJS({
     var util2 = Object.create(require_util());
     util2.inherits = require_inherits();
     var Readable3 = require_stream_readable();
-    var Writable2 = require_stream_writable();
+    var Writable3 = require_stream_writable();
     util2.inherits(Duplex, Readable3);
     {
-      keys = objectKeys(Writable2.prototype);
+      keys = objectKeys(Writable3.prototype);
       for (v2 = 0; v2 < keys.length; v2++) {
         method = keys[v2];
-        if (!Duplex.prototype[method]) Duplex.prototype[method] = Writable2.prototype[method];
+        if (!Duplex.prototype[method]) Duplex.prototype[method] = Writable3.prototype[method];
       }
     }
     var keys;
@@ -21909,7 +21934,7 @@ var require_stream_duplex = __commonJS({
     function Duplex(options) {
       if (!(this instanceof Duplex)) return new Duplex(options);
       Readable3.call(this, options);
-      Writable2.call(this, options);
+      Writable3.call(this, options);
       if (options && options.readable === false) this.readable = false;
       if (options && options.writable === false) this.writable = false;
       this.allowHalfOpen = true;
@@ -31151,6 +31176,24 @@ 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++) {
@@ -31196,6 +31239,9 @@ 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;
@@ -31241,6 +31287,10 @@ 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,
@@ -31253,7 +31303,8 @@ function resolveConfig(opts) {
     noTunnelPersist,
     frpcBinary,
     mode,
-    previewPorts
+    previewPorts,
+    logShipping
   };
 }
 var HELP_TEXT = `clawd [options]
@@ -31264,6 +31315,7 @@ 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
 
@@ -31339,6 +31391,7 @@ var import_node_url2 = require("url");
 // 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 {
@@ -31364,12 +31417,329 @@ 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);
@@ -31804,6 +32174,8 @@ 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,
@@ -32566,9 +32938,10 @@ 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 路径闭包；cc spawn 加 --mcp-config 让两侧
-      // cc 都能看到 personaDispatch / personaDispatchComplete tool（按 session 身份区分用哪个）。
+      // 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 一起删
@@ -33040,22 +33413,9 @@ You may read this file with your Read tool to understand context. You do not hav
 
 When done, call the MCP tool \`mcp__clawd-dispatch__personaDispatchComplete\` with your result:
   - Success: { text: "...", filePaths?: ["abs/path", ...] }
-  - Failure: { isFailure: true, reason: "..." }`;
-}
-function buildDispatchContinuationPack(args) {
-  return `[Dispatched from owner \u2014 follow-up query]
-
-Although you reported back on the previous task, the owner has a follow-up question. Continue from where you left off.
+  - Failure: { isFailure: true, reason: "..." }
 
-Owner's new message:
-${args.prompt}
-
-Source conversation (jsonl, same path as before, may contain new messages):
-  ${args.sourceJsonlPath}
-
-When done, call \`mcp__clawd-dispatch__personaDispatchComplete\` again with your result:
-  - Success: { text: "...", filePaths?: ["abs/path", ...] }
-  - Failure: { isFailure: true, reason: "..." }`;
+dispatchId for this task: ${args.dispatchId}`;
 }
 function derivePersonaSpawnCwd(file, personaRoot) {
   const personaId = file.ownerPersonaId;
@@ -33257,23 +33617,6 @@ var SessionManager = class {
     const file = this.findOwnedSession(sessionId);
     return file ? this.scopeForFile(file) : null;
   }
-  /**
-   * 反查 (sourceSessionId, targetPersona) 最近一次被 dispatched 出的 B session。
-   * mode='continue' 路径用：命中 → 复用该 B；不命中 → fallback 走新建路径。
-   *
-   * 反查源是 SessionStore 持久化字段（dispatchedFromSessionId + ownerPersonaId），不引入新表，
-   * daemon 重启不丢。同对历史多条按 updatedAt 取最近（reducer 写入时持续更新）。
-   */
-  findLatestDispatchedSession(args) {
-    const candidates = this.listAllOwned().filter(
-      (f) => f.dispatchedFromSessionId === args.sourceSessionId && f.ownerPersonaId === args.targetPersona
-    );
-    if (candidates.length === 0) return null;
-    candidates.sort(
-      (a, b2) => a.updatedAt > b2.updatedAt ? -1 : a.updatedAt < b2.updatedAt ? 1 : 0
-    );
-    return candidates[0];
-  }
   // 合并 default + 每个 persona 的 owner/ + guests/<capId>/ —— 桌面 App 主 session 列表入口.
   // guest sessions 由 handlers/session.ts list 处按 ctx.principal.kind === 'guest' 做权限过滤
   // (creatorPrincipalId === capId), 这里仅负责数据源汇总.
@@ -33380,9 +33723,10 @@ 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: dispatch.mcp.json 路径闭包透传给 reducer，让 cc spawn 加 --mcp-config flag。
-      // dispatchId 不再走 cc env——complete handler 用 sessionId 反查 in-flight dispatchId 配对。
+      // 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,
@@ -34200,11 +34544,10 @@ var SessionManager = class {
    * Persona dispatch: 启动 B session 并投递任务包当第一条 user message。
    *
    *   - 复用 persona-owner 创建路径（cwd=personaDir、scope=persona-owner、不沙箱）
-   *   - SessionFile 上写 dispatchedFromSessionId 关联回 A（UI 折叠用；mirror 一侧 strip；
-   *     mode='continue' 路径 findLatestDispatchedSession 也按此字段反查复用）
-   *   - 跟 PersonaDispatchManager 登记 dispatchId → B sessionId（complete handler 用
-   *     findInflightDispatchByBSessionId 反查回 dispatchId 配对 A 的 waiter）
-   *   - 投任务包；包尾教 B 用 personaDispatchComplete tool 回传
+   *   - 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）。
    */
@@ -34247,7 +34590,8 @@ var SessionManager = class {
     });
     const taskPack = buildDispatchTaskPack({
       prompt: args.prompt,
-      sourceJsonlPath: args.sourceJsonlPath
+      sourceJsonlPath: args.sourceJsonlPath,
+      dispatchId: args.dispatchId
     });
     runner.input({ kind: "command", command: { kind: "send", text: taskPack } });
     this.deps.logger?.info("dispatch.createDispatchedSession.task-pack-sent", {
@@ -34256,41 +34600,6 @@ var SessionManager = class {
     });
     return { sessionId };
   }
-  /**
-   * mode='continue' 复用已有 B session，投 continuation pack 给 runner。
-   *
-   * 关键差异 vs createDispatchedSession：
-   *   - 不 newSessionId() / 不 storeFor(scope).write()——SessionFile 复用
-   *   - 跟 PersonaDispatchManager 重新登记 dispatchId → bSessionId（新 dispatchId、同 bSessionId）
-   *   - ensureRunnerForScope 在 runner 不存在时建；存在则复用
-   *   - runner.input send 投 continuationPack：runner / reducer 内部决定 cc 死活；
-   *     cc 活 → 自然续；cc 死 → spawn 时 jsonl 已存在自动 --resume <toolSessionId>
-   */
-  resumeDispatchedSession(args) {
-    if (!this.deps.personaDispatchManager) {
-      throw new Error("resumeDispatchedSession: personaDispatchManager missing in ManagerDeps");
-    }
-    const file = this.findOwnedSession(args.bSessionId);
-    if (!file) {
-      throw new Error(`resumeDispatchedSession: B session ${args.bSessionId} not found`);
-    }
-    const scope = this.scopeForFile(file);
-    this.deps.personaDispatchManager.registerBSession(args.dispatchId, args.bSessionId);
-    this.deps.logger?.info("dispatch.resumeDispatchedSession.registered", {
-      dispatchId: args.dispatchId,
-      bSessionId: args.bSessionId
-    });
-    const runner = this.ensureRunnerForScope(file, scope);
-    const pack = buildDispatchContinuationPack({
-      prompt: args.prompt,
-      sourceJsonlPath: args.sourceJsonlPath
-    });
-    runner.input({ kind: "command", command: { kind: "send", text: pack } });
-    this.deps.logger?.info("dispatch.resumeDispatchedSession.continuation-sent", {
-      dispatchId: args.dispatchId,
-      bSessionId: args.bSessionId
-    });
-  }
   /**
    * 老板插话：把 'inject-owner-text' input 喂给对应 runner，
    * runner 不存在时按 scope 懒创建。
@@ -36376,7 +36685,7 @@ init_claude_history();
 
 // src/pty/pty-child-process.ts
 var import_node_events = require("events");
-var import_node_stream = require("stream");
+var import_node_stream2 = require("stream");
 var PtyChildProcess = class extends import_node_events.EventEmitter {
   constructor(pty, opts = {}) {
     super();
@@ -36405,7 +36714,7 @@ var PtyChildProcess = class extends import_node_events.EventEmitter {
         pty.write(data);
       }
     };
-    this.stdin = new import_node_stream.Writable({
+    this.stdin = new import_node_stream2.Writable({
       decodeStrings: false,
       write: (chunk, _enc, cb) => {
         const s = typeof chunk === "string" ? chunk : chunk.toString("utf8");
@@ -36424,7 +36733,7 @@ var PtyChildProcess = class extends import_node_events.EventEmitter {
         }
       }
     });
-    this.stdout = new import_node_stream.Readable({ read() {
+    this.stdout = new import_node_stream2.Readable({ read() {
     } });
     pty.onData((data) => {
       if (!this.firstDataLogged) {
@@ -36437,7 +36746,7 @@ var PtyChildProcess = class extends import_node_events.EventEmitter {
       }
       this.stdout.push(Buffer.from(data, "utf8"));
     });
-    this.stderr = new import_node_stream.Readable({ read() {
+    this.stderr = new import_node_stream2.Readable({ read() {
     } });
     pty.onExit(({ exitCode, signal }) => {
       this.exitCode = exitCode;
@@ -36992,7 +37301,6 @@ var PersonaDispatchManager = class {
       dispatchId,
       sourceSessionId: args.sourceSessionId,
       targetPersona: args.targetPersona,
-      bSessionId: args.bSessionId,
       waiters: [],
       outcome: null
     });
@@ -37023,22 +37331,10 @@ var PersonaDispatchManager = class {
     if (!state) throw new Error(`unknown dispatchId: ${dispatchId}`);
     state.bSessionId = bSessionId;
   }
-  /**
-   * 按 B sessionId 找当前 in-flight（未 resolved）的 dispatchId。
-   * complete handler 用这个把 B 的 outcome 配对回 A 的 waiter——dispatchId 不再走 cc env，
-   * 全靠 (bSessionId → in-flight dispatchId) 反查。
-   *
-   * 同一 bSessionId 不会同时有多个 in-flight（A 拿不到 outcome 不会发起新 dispatch；
-   * mode='continue' 入口已防御重入）。
-   *
-   * 历史 entry（已 resolved）暂不清——单 daemon lifetime 累积可接受；未来用量大了加 TTL GC
-   * （complete 后 5min 删 entry）。
-   */
-  findInflightDispatchByBSessionId(bSessionId) {
+  /** reducer buildSpawnContext 调，按 B 的 sessionId 反查 dispatchId（用于注 CLAWD_DISPATCH_ID env） */
+  lookupDispatchByBSessionId(bSessionId) {
     for (const state of this.map.values()) {
-      if (state.bSessionId === bSessionId && state.outcome === null) {
-        return state.dispatchId;
-      }
+      if (state.bSessionId === bSessionId) return state.dispatchId;
     }
     return void 0;
   }
@@ -37070,15 +37366,6 @@ function writeDispatchMcpConfig(args) {
 
 // src/handlers/persona-dispatch.ts
 init_protocol();
-var NO_PREVIOUS_PREFIX = "(no previous session found, started fresh)";
-function prefixNoPreviousOutcome(outcome) {
-  if (outcome.kind === "success") {
-    return { ...outcome, text: `${NO_PREVIOUS_PREFIX}
-
-${outcome.text}` };
-  }
-  return { ...outcome, reason: `${NO_PREVIOUS_PREFIX} ${outcome.reason}` };
-}
 function buildPersonaDispatchHandlers(deps) {
   const { personaDispatchManager: mgr, spawnB, logger } = deps;
   const run = async (frame) => {
@@ -37090,66 +37377,26 @@ function buildPersonaDispatchHandlers(deps) {
         "personaDispatch:run requires sessionId (caller must pass x-clawd-session-id header)"
       );
     }
-    const requestedMode = args.mode ?? "new";
-    let route = "new";
-    let bSessionId;
-    let noPrevious = false;
-    if (requestedMode === "continue") {
-      const bFile = deps.findLatestDispatchedSession?.({
-        sourceSessionId,
-        targetPersona: args.targetPersona
-      });
-      if (bFile) {
-        const inflight = deps.findInflightDispatchByBSessionId?.(bFile.sessionId);
-        if (inflight) {
-          logger?.warn("dispatch.run.continue.busy", {
-            sourceSessionId,
-            targetPersona: args.targetPersona,
-            bSessionId: bFile.sessionId,
-            inflightDispatchId: inflight
-          });
-          return {
-            response: {
-              type: "personaDispatch:run:ok",
-              outcome: {
-                kind: "failure",
-                reason: "previous dispatch to this persona session not yet complete"
-              }
-            }
-          };
-        }
-        route = "continue";
-        bSessionId = bFile.sessionId;
-      } else {
-        noPrevious = true;
-      }
-    }
     const { dispatchId } = mgr.start({
       sourceSessionId,
-      targetPersona: args.targetPersona,
-      bSessionId
+      targetPersona: args.targetPersona
     });
     logger?.info("dispatch.run.received", {
       dispatchId,
       sourceSessionId,
       targetPersona: args.targetPersona,
-      promptLen: args.prompt.length,
-      requestedMode,
-      route,
-      noPrevious
+      promptLen: args.prompt.length
     });
     void spawnB({
       dispatchId,
       sourceSessionId,
       targetPersona: args.targetPersona,
-      prompt: args.prompt,
-      route,
-      bSessionId
+      prompt: args.prompt
     }).then(() => {
-      logger?.info("dispatch.spawnB.ok", { dispatchId, route });
+      logger?.info("dispatch.spawnB.ok", { dispatchId });
     }).catch((err) => {
       const reason = err instanceof Error ? err.message : String(err);
-      logger?.warn("dispatch.spawnB.failed", { dispatchId, route, reason });
+      logger?.warn("dispatch.spawnB.failed", { dispatchId, reason });
       mgr.complete(dispatchId, {
         kind: "failure",
         reason: `failed to spawn B: ${reason}`
@@ -37161,32 +37408,18 @@ function buildPersonaDispatchHandlers(deps) {
       dispatchId,
       outcomeKind: outcome.kind
     });
-    const finalOutcome = noPrevious ? prefixNoPreviousOutcome(outcome) : outcome;
     return {
-      response: { type: "personaDispatch:run:ok", outcome: finalOutcome }
+      response: { type: "personaDispatch:run:ok", outcome }
     };
   };
   const complete = async (frame) => {
     const { type: _t, requestId: _r, ...rest } = frame;
-    const sessionId = typeof rest.sessionId === "string" ? rest.sessionId : void 0;
     const args = DispatchCompleteArgsSchema.parse(rest);
-    if (!sessionId) {
-      throw new Error(
-        "personaDispatch:complete requires sessionId (caller must pass x-clawd-session-id header)"
-      );
-    }
-    const dispatchId = mgr.findInflightDispatchByBSessionId(sessionId);
-    if (!dispatchId) {
-      throw new Error(
-        `no in-flight dispatch for session ${sessionId} (already completed or B was never dispatched)`
-      );
-    }
     logger?.info("dispatch.complete.received", {
-      dispatchId,
-      sessionId,
+      dispatchId: args.dispatchId,
       outcomeKind: args.outcome.kind
     });
-    mgr.complete(dispatchId, args.outcome);
+    mgr.complete(args.dispatchId, args.outcome);
     return {
       response: { type: "personaDispatch:complete:ok" }
     };
@@ -38043,7 +38276,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_sender = __toESM(require_sender(), 1);
+var import_sender2 = __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);
@@ -40593,7 +40826,7 @@ var import_node_fs23 = __toESM(require("fs"), 1);
 var import_node_os11 = __toESM(require("os"), 1);
 var import_node_path23 = __toESM(require("path"), 1);
 var import_node_child_process7 = require("child_process");
-var import_node_stream2 = require("stream");
+var import_node_stream3 = require("stream");
 var import_promises3 = require("stream/promises");
 var FRPC_VERSION = "0.68.0";
 var UnsupportedPlatformError = class extends Error {
@@ -40684,7 +40917,7 @@ async function downloadToFile(url, dest, fetchImpl) {
     throw new Error(`download failed: ${res.status} ${res.statusText}`);
   }
   const out = import_node_fs23.default.createWriteStream(dest);
-  const nodeStream = import_node_stream2.Readable.fromWeb(res.body);
+  const nodeStream = import_node_stream3.Readable.fromWeb(res.body);
   await (0, import_promises3.pipeline)(nodeStream, out);
 }
 async function extractFrpcFromTarball(tarball, binDir, version2, platform, destBin) {
@@ -40759,7 +40992,7 @@ async function killStaleFrpc(deps) {
   const isAlive = deps.isPidAliveImpl ?? defaultIsPidAlive;
   const killPid = deps.killPidImpl ?? defaultKillPid;
   const scanPids = deps.scanFrpcPidsImpl ?? ((tp) => defaultScanFrpcPidsByCmdline(tp, deps.logger));
-  const sleep = deps.sleepImpl ?? defaultSleep;
+  const sleep2 = deps.sleepImpl ?? defaultSleep;
   const victims = /* @__PURE__ */ new Set();
   const raw = readPidFile(pidFile);
   if (raw) {
@@ -40787,7 +41020,7 @@ async function killStaleFrpc(deps) {
     deps.logger?.warn("tunnel: killing stale frpc before respawn", { pid });
     killPid(pid, "SIGKILL");
   }
-  await sleep(deps.reapWaitMs ?? 300);
+  await sleep2(deps.reapWaitMs ?? 300);
   try {
     import_node_fs24.default.unlinkSync(pidFile);
   } catch {
@@ -42704,6 +42937,7 @@ 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,
@@ -42714,7 +42948,8 @@ function buildReadyFrame(deps, client) {
     tunnelUrl,
     mode: deps.mode,
     daemonSource,
-    ...fileSharing
+    ...fileSharing,
+    ...logShipping ? { logShipping } : {}
   };
 }
 function buildMetaHandlers(deps) {
@@ -45665,9 +45900,25 @@ var BundleCache = class {
 // 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")
+    file: import_node_path46.default.join(config.dataDir, "clawd.log"),
+    logClient
   });
   logger.info("starting clawd", { version, config: { port: config.port, host: config.host, dataDir: config.dataDir } });
   const stateMgr = new StateFileManager({ dataDir: config.dataDir });
@@ -45678,7 +45929,6 @@ 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();
@@ -45862,9 +46112,9 @@ async function startDaemon(config) {
     // 127.0.0.1（不是 config.host）—— cc 跑在本机，loopback 最稳；外部访问限制 + http-router
     // 的 isLoopback 兜底已确保安全。
     getDaemonUrl: () => `http://127.0.0.1:${config.port}`,
-    // Persona dispatch: manager 通过这两个 deps 跟 PersonaDispatchManager 协作。
-    // - personaDispatchManager: createDispatchedSession / resumeDispatchedSession 用它
-    //   registerBSession；complete handler 用 findInflightDispatchByBSessionId 反查回 dispatchId。
+    // 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,
@@ -46193,16 +46443,11 @@ async function startDaemon(config) {
   const dispatchHandlers = buildPersonaDispatchHandlers({
     personaDispatchManager,
     logger,
-    // continue 路径反查（命中 → 走 resumeDispatchedSession；不命中 → fallback 新建 + outcome 前缀）
-    findLatestDispatchedSession: (q) => manager.findLatestDispatchedSession(q),
-    // continue 路径防御：B 仍有 in-flight 时直接 fail（老板规则不会触发，但兜底）
-    findInflightDispatchByBSessionId: (sid) => personaDispatchManager.findInflightDispatchByBSessionId(sid),
     spawnB: async (args) => {
       logger.info("dispatch.spawnB.start", {
         dispatchId: args.dispatchId,
         targetPersona: args.targetPersona,
-        sourceSessionId: args.sourceSessionId,
-        route: args.route
+        sourceSessionId: args.sourceSessionId
       });
       const sourceFile = manager.findOwnedSession(args.sourceSessionId);
       if (!sourceFile) {
@@ -46218,28 +46463,15 @@ async function startDaemon(config) {
       logger.info("dispatch.spawnB.source-resolved", {
         dispatchId: args.dispatchId,
         sourceJsonlPath,
-        hasToolSessionId: Boolean(sourceFile.toolSessionId),
-        route: args.route
+        hasToolSessionId: Boolean(sourceFile.toolSessionId)
+      });
+      manager.createDispatchedSession({
+        dispatchId: args.dispatchId,
+        sourceSessionId: args.sourceSessionId,
+        targetPersona: args.targetPersona,
+        prompt: args.prompt,
+        sourceJsonlPath
       });
-      if (args.route === "continue") {
-        if (!args.bSessionId) {
-          throw new Error("continue route requires bSessionId");
-        }
-        manager.resumeDispatchedSession({
-          dispatchId: args.dispatchId,
-          bSessionId: args.bSessionId,
-          prompt: args.prompt,
-          sourceJsonlPath
-        });
-      } else {
-        manager.createDispatchedSession({
-          dispatchId: args.dispatchId,
-          sourceSessionId: args.sourceSessionId,
-          targetPersona: args.targetPersona,
-          prompt: args.prompt,
-          sourceJsonlPath
-        });
-      }
     }
   });
   handlers = { ...handlers, ...dispatchHandlers };
@@ -46317,6 +46549,10 @@ 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
@@ -46547,6 +46783,7 @@ ${bar}
     }
     await wss.stop();
     stateMgr.delete();
+    if (logClient) await logClient.dispose();
   };
   return {
     stop: shutdown,

package/dist/dispatch/mcp-server.cjs

@@ -39574,11 +39574,9 @@ async function handlePersonaDispatchToolCall(input, ctx) {
         "content-type": "application/json",
         "x-clawd-session-id": ctx.sessionId
       },
-      // input.mode === undefined → JSON.stringify omit；daemon parse 用 .optional() 接住缺省。
       body: JSON.stringify({
         targetPersona: input.targetPersona,
-        prompt: input.prompt,
-        mode: input.mode
+        prompt: input.prompt
       })
     });
   } catch (err) {
@@ -39628,16 +39626,16 @@ async function handlePersonaDispatchCompleteToolCall(input, ctx) {
     isFailure: Boolean(input.isFailure),
     textLen: input.text?.length ?? 0,
     filePathCount: input.filePaths?.length ?? 0,
-    sessionId: ctx.sessionId,
+    dispatchId: ctx.dispatchId,
     daemonUrl: ctx.daemonUrl
   });
-  if (!ctx.sessionId) {
-    log("personaDispatchComplete CLAWD_SESSION_ID missing");
+  if (!ctx.dispatchId) {
+    log("personaDispatchComplete CLAWD_DISPATCH_ID missing");
     return {
       content: [
         {
           type: "text",
-          text: "Error: CLAWD_SESSION_ID env not set; daemon cannot resolve in-flight dispatch without sessionId."
+          text: "Error: CLAWD_DISPATCH_ID env not set; this session was not dispatched."
         }
       ],
       isError: true
@@ -39652,15 +39650,14 @@ async function handlePersonaDispatchCompleteToolCall(input, ctx) {
     filePaths: input.filePaths
   };
   const url = `${ctx.daemonUrl}/api/rpc/personaDispatch.complete`;
-  log("personaDispatchComplete pre-fetch", { url, sessionId: ctx.sessionId });
+  log("personaDispatchComplete pre-fetch", { url, hasSessionId: Boolean(ctx.sessionId) });
+  const headers = { "content-type": "application/json" };
+  if (ctx.sessionId) headers["x-clawd-session-id"] = ctx.sessionId;
   try {
     const res = await f(url, {
       method: "POST",
-      headers: {
-        "content-type": "application/json",
-        "x-clawd-session-id": ctx.sessionId
-      },
-      body: JSON.stringify({ outcome })
+      headers,
+      body: JSON.stringify({ dispatchId: ctx.dispatchId, outcome })
     });
     log("personaDispatchComplete post-fetch", { url, status: res.status });
   } catch (err) {
@@ -39684,10 +39681,12 @@ async function handlePersonaDispatchCompleteToolCall(input, ctx) {
 async function main() {
   const daemonUrl = process.env.CLAWD_DAEMON_URL;
   const sessionId = process.env.CLAWD_SESSION_ID;
+  const dispatchId = process.env.CLAWD_DISPATCH_ID;
   log("boot", {
     pid: process.pid,
     hasDaemonUrl: Boolean(daemonUrl),
     hasSessionId: Boolean(sessionId),
+    hasDispatchId: Boolean(dispatchId),
     logPath: DISPATCH_LOG ?? "(stderr)"
   });
   if (!daemonUrl) {
@@ -39704,14 +39703,11 @@ async function main() {
     "personaDispatch",
     {
       title: "Dispatch task to another persona",
-      description: "Delegate a task to another clawd persona. Use this when the user message contains `@persona/<id>` to hand the task off to that persona. The tool blocks until the other persona finishes and returns its result. Pass mode='continue' when the user's follow-up message is clearly a continuation of the task you already dispatched to this persona (the previous B session is resumed with its full context). Omit (or pass 'new') for an independent new task. Default is 'new'.",
+      description: "Delegate a task to another clawd persona. Use this when the user message contains `@persona/<id>` to hand the task off to that persona. The tool blocks until the other persona finishes and returns its result.",
       inputSchema: {
         targetPersona: external_exports.string().describe("persona id (e.g. persona-bug-fixer)"),
         prompt: external_exports.string().describe(
           "the task to perform, with the @persona/<id> token stripped out"
-        ),
-        mode: external_exports.enum(["new", "continue"]).optional().describe(
-          "continue = resume the previous B session for this (sourceSession, targetPersona) pair; new (default) = fresh B session"
         )
       }
     },
@@ -39730,8 +39726,8 @@ async function main() {
       }
     },
     // sessionId 透传：complete RPC 必须带 x-clawd-session-id header（rpc-adapter 强制）。
-    // daemon 用该 sessionId 反查 PersonaDispatchManager 里该 B 的 in-flight dispatchId 配对回 A 的 waiter。
-    async (input) => handlePersonaDispatchCompleteToolCall(input, { daemonUrl, sessionId })
+    // B session 的 cc env 有 CLAWD_SESSION_ID = B 的 sessionId。
+    async (input) => handlePersonaDispatchCompleteToolCall(input, { daemonUrl, sessionId, dispatchId })
   );
   await server.connect(new StdioServerTransport());
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.142-beta.297.e4b56a8",
+  "version": "0.2.142",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",
@@ -27,6 +27,7 @@
   },
   "devDependencies": {
     "@clawos/clawd-protocol": "workspace:*",
+    "@clawos/log-client": "workspace:*",
     "@types/diff": "^7.0.2",
     "@types/node": "^22.0.0",
     "@types/uuid": "^10.0.0",