@clawos-dev/clawd 0.2.209 → 0.2.210-beta.418.4af4e12

package/dist/cli.cjs

@@ -742,8 +742,8 @@ var init_parseUtil = __esm({
     init_errors2();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path78, errorMaps, issueData } = params;
-      const fullPath = [...path78, ...issueData.path || []];
+      const { data, path: path77, errorMaps, issueData } = params;
+      const fullPath = [...path77, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -1054,11 +1054,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path78, key) {
+      constructor(parent, value, path77, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path78;
+        this._path = path77;
         this._key = key;
       }
       get path() {
@@ -6449,8 +6449,8 @@ var require_req = __commonJS({
       if (req.originalUrl) {
         _req.url = req.originalUrl;
       } else {
-        const path78 = req.path;
-        _req.url = typeof path78 === "string" ? path78 : req.url ? req.url.path || req.url : void 0;
+        const path77 = req.path;
+        _req.url = typeof path77 === "string" ? path77 : req.url ? req.url.path || req.url : void 0;
       }
       if (req.query) {
         _req.query = req.query;
@@ -6615,14 +6615,14 @@ var require_redact = __commonJS({
       }
       return obj;
     }
-    function parsePath(path78) {
+    function parsePath(path77) {
       const parts = [];
       let current = "";
       let inBrackets = false;
       let inQuotes = false;
       let quoteChar = "";
-      for (let i = 0; i < path78.length; i++) {
-        const char = path78[i];
+      for (let i = 0; i < path77.length; i++) {
+        const char = path77[i];
         if (!inBrackets && char === ".") {
           if (current) {
             parts.push(current);
@@ -6753,10 +6753,10 @@ var require_redact = __commonJS({
       return current;
     }
     function redactPaths(obj, paths, censor, remove = false) {
-      for (const path78 of paths) {
-        const parts = parsePath(path78);
+      for (const path77 of paths) {
+        const parts = parsePath(path77);
         if (parts.includes("*")) {
-          redactWildcardPath(obj, parts, censor, path78, remove);
+          redactWildcardPath(obj, parts, censor, path77, remove);
         } else {
           if (remove) {
             removeKey(obj, parts);
@@ -6841,8 +6841,8 @@ var require_redact = __commonJS({
           }
         } else {
           if (afterWildcard.includes("*")) {
-            const wrappedCensor = typeof censor === "function" ? (value, path78) => {
-              const fullPath = [...pathArray.slice(0, pathLength), ...path78];
+            const wrappedCensor = typeof censor === "function" ? (value, path77) => {
+              const fullPath = [...pathArray.slice(0, pathLength), ...path77];
               return censor(value, fullPath);
             } : censor;
             redactWildcardPath(current, afterWildcard, wrappedCensor, originalPath, remove);
@@ -6877,8 +6877,8 @@ var require_redact = __commonJS({
         return null;
       }
       const pathStructure = /* @__PURE__ */ new Map();
-      for (const path78 of pathsToClone) {
-        const parts = parsePath(path78);
+      for (const path77 of pathsToClone) {
+        const parts = parsePath(path77);
         let current = pathStructure;
         for (let i = 0; i < parts.length; i++) {
           const part = parts[i];
@@ -6930,24 +6930,24 @@ var require_redact = __commonJS({
       }
       return cloneSelectively(obj, pathStructure);
     }
-    function validatePath(path78) {
-      if (typeof path78 !== "string") {
+    function validatePath(path77) {
+      if (typeof path77 !== "string") {
         throw new Error("Paths must be (non-empty) strings");
       }
-      if (path78 === "") {
+      if (path77 === "") {
         throw new Error("Invalid redaction path ()");
       }
-      if (path78.includes("..")) {
-        throw new Error(`Invalid redaction path (${path78})`);
+      if (path77.includes("..")) {
+        throw new Error(`Invalid redaction path (${path77})`);
       }
-      if (path78.includes(",")) {
-        throw new Error(`Invalid redaction path (${path78})`);
+      if (path77.includes(",")) {
+        throw new Error(`Invalid redaction path (${path77})`);
       }
       let bracketCount = 0;
       let inQuotes = false;
       let quoteChar = "";
-      for (let i = 0; i < path78.length; i++) {
-        const char = path78[i];
+      for (let i = 0; i < path77.length; i++) {
+        const char = path77[i];
         if ((char === '"' || char === "'") && bracketCount > 0) {
           if (!inQuotes) {
             inQuotes = true;
@@ -6961,20 +6961,20 @@ var require_redact = __commonJS({
         } else if (char === "]" && !inQuotes) {
           bracketCount--;
           if (bracketCount < 0) {
-            throw new Error(`Invalid redaction path (${path78})`);
+            throw new Error(`Invalid redaction path (${path77})`);
           }
         }
       }
       if (bracketCount !== 0) {
-        throw new Error(`Invalid redaction path (${path78})`);
+        throw new Error(`Invalid redaction path (${path77})`);
       }
     }
     function validatePaths(paths) {
       if (!Array.isArray(paths)) {
         throw new TypeError("paths must be an array");
       }
-      for (const path78 of paths) {
-        validatePath(path78);
+      for (const path77 of paths) {
+        validatePath(path77);
       }
     }
     function slowRedact(options = {}) {
@@ -7142,8 +7142,8 @@ var require_redaction = __commonJS({
         if (shape[k2] === null) {
           o[k2] = (value) => topCensor(value, [k2]);
         } else {
-          const wrappedCensor = typeof censor === "function" ? (value, path78) => {
-            return censor(value, [k2, ...path78]);
+          const wrappedCensor = typeof censor === "function" ? (value, path77) => {
+            return censor(value, [k2, ...path77]);
           } : censor;
           o[k2] = Redact({
             paths: shape[k2],
@@ -7361,10 +7361,10 @@ var require_atomic_sleep = __commonJS({
 var require_sonic_boom = __commonJS({
   "../node_modules/.pnpm/sonic-boom@4.2.1/node_modules/sonic-boom/index.js"(exports2, module2) {
     "use strict";
-    var fs71 = require("fs");
+    var fs70 = require("fs");
     var EventEmitter3 = require("events");
     var inherits = require("util").inherits;
-    var path78 = require("path");
+    var path77 = require("path");
     var sleep2 = require_atomic_sleep();
     var assert = require("assert");
     var BUSY_WRITE_TIMEOUT = 100;
@@ -7418,20 +7418,20 @@ var require_sonic_boom = __commonJS({
       const mode = sonic.mode;
       if (sonic.sync) {
         try {
-          if (sonic.mkdir) fs71.mkdirSync(path78.dirname(file), { recursive: true });
-          const fd = fs71.openSync(file, flags, mode);
+          if (sonic.mkdir) fs70.mkdirSync(path77.dirname(file), { recursive: true });
+          const fd = fs70.openSync(file, flags, mode);
           fileOpened(null, fd);
         } catch (err) {
           fileOpened(err);
           throw err;
         }
       } else if (sonic.mkdir) {
-        fs71.mkdir(path78.dirname(file), { recursive: true }, (err) => {
+        fs70.mkdir(path77.dirname(file), { recursive: true }, (err) => {
           if (err) return fileOpened(err);
-          fs71.open(file, flags, mode, fileOpened);
+          fs70.open(file, flags, mode, fileOpened);
         });
       } else {
-        fs71.open(file, flags, mode, fileOpened);
+        fs70.open(file, flags, mode, fileOpened);
       }
     }
     function SonicBoom(opts) {
@@ -7472,8 +7472,8 @@ var require_sonic_boom = __commonJS({
         this.flush = flushBuffer;
         this.flushSync = flushBufferSync;
         this._actualWrite = actualWriteBuffer;
-        fsWriteSync = () => fs71.writeSync(this.fd, this._writingBuf);
-        fsWrite = () => fs71.write(this.fd, this._writingBuf, this.release);
+        fsWriteSync = () => fs70.writeSync(this.fd, this._writingBuf);
+        fsWrite = () => fs70.write(this.fd, this._writingBuf, this.release);
       } else if (contentMode === void 0 || contentMode === kContentModeUtf8) {
         this._writingBuf = "";
         this.write = write;
@@ -7482,15 +7482,15 @@ var require_sonic_boom = __commonJS({
         this._actualWrite = actualWrite;
         fsWriteSync = () => {
           if (Buffer.isBuffer(this._writingBuf)) {
-            return fs71.writeSync(this.fd, this._writingBuf);
+            return fs70.writeSync(this.fd, this._writingBuf);
           }
-          return fs71.writeSync(this.fd, this._writingBuf, "utf8");
+          return fs70.writeSync(this.fd, this._writingBuf, "utf8");
         };
         fsWrite = () => {
           if (Buffer.isBuffer(this._writingBuf)) {
-            return fs71.write(this.fd, this._writingBuf, this.release);
+            return fs70.write(this.fd, this._writingBuf, this.release);
           }
-          return fs71.write(this.fd, this._writingBuf, "utf8", this.release);
+          return fs70.write(this.fd, this._writingBuf, "utf8", this.release);
         };
       } else {
         throw new Error(`SonicBoom supports "${kContentModeUtf8}" and "${kContentModeBuffer}", but passed ${contentMode}`);
@@ -7547,7 +7547,7 @@ var require_sonic_boom = __commonJS({
           }
         }
         if (this._fsync) {
-          fs71.fsyncSync(this.fd);
+          fs70.fsyncSync(this.fd);
         }
         const len = this._len;
         if (this._reopening) {
@@ -7661,7 +7661,7 @@ var require_sonic_boom = __commonJS({
       const onDrain = () => {
         if (!this._fsync) {
           try {
-            fs71.fsync(this.fd, (err) => {
+            fs70.fsync(this.fd, (err) => {
               this._flushPending = false;
               cb(err);
             });
@@ -7763,7 +7763,7 @@ var require_sonic_boom = __commonJS({
       const fd = this.fd;
       this.once("ready", () => {
         if (fd !== this.fd) {
-          fs71.close(fd, (err) => {
+          fs70.close(fd, (err) => {
             if (err) {
               return this.emit("error", err);
             }
@@ -7812,7 +7812,7 @@ var require_sonic_boom = __commonJS({
           buf = this._bufs[0];
         }
         try {
-          const n = Buffer.isBuffer(buf) ? fs71.writeSync(this.fd, buf) : fs71.writeSync(this.fd, buf, "utf8");
+          const n = Buffer.isBuffer(buf) ? fs70.writeSync(this.fd, buf) : fs70.writeSync(this.fd, buf, "utf8");
           const releasedBufObj = releaseWritingBuf(buf, this._len, n);
           buf = releasedBufObj.writingBuf;
           this._len = releasedBufObj.len;
@@ -7828,7 +7828,7 @@ var require_sonic_boom = __commonJS({
         }
       }
       try {
-        fs71.fsyncSync(this.fd);
+        fs70.fsyncSync(this.fd);
       } catch {
       }
     }
@@ -7849,7 +7849,7 @@ var require_sonic_boom = __commonJS({
           buf = mergeBuf(this._bufs[0], this._lens[0]);
         }
         try {
-          const n = fs71.writeSync(this.fd, buf);
+          const n = fs70.writeSync(this.fd, buf);
           buf = buf.subarray(n);
           this._len = Math.max(this._len - n, 0);
           if (buf.length <= 0) {
@@ -7877,13 +7877,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) ? fs71.writeSync(this.fd, this._writingBuf) : fs71.writeSync(this.fd, this._writingBuf, "utf8");
+          const written = Buffer.isBuffer(this._writingBuf) ? fs70.writeSync(this.fd, this._writingBuf) : fs70.writeSync(this.fd, this._writingBuf, "utf8");
           release(null, written);
         } catch (err) {
           release(err);
         }
       } else {
-        fs71.write(this.fd, this._writingBuf, release);
+        fs70.write(this.fd, this._writingBuf, release);
       }
     }
     function actualWriteBuffer() {
@@ -7892,7 +7892,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 = fs71.writeSync(this.fd, this._writingBuf);
+          const written = fs70.writeSync(this.fd, this._writingBuf);
           release(null, written);
         } catch (err) {
           release(err);
@@ -7901,7 +7901,7 @@ var require_sonic_boom = __commonJS({
         if (kCopyBuffer) {
           this._writingBuf = Buffer.from(this._writingBuf);
         }
-        fs71.write(this.fd, this._writingBuf, release);
+        fs70.write(this.fd, this._writingBuf, release);
       }
     }
     function actualClose(sonic) {
@@ -7917,12 +7917,12 @@ var require_sonic_boom = __commonJS({
       sonic._lens = [];
       assert(typeof sonic.fd === "number", `sonic.fd must be a number, got ${typeof sonic.fd}`);
       try {
-        fs71.fsync(sonic.fd, closeWrapped);
+        fs70.fsync(sonic.fd, closeWrapped);
       } catch {
       }
       function closeWrapped() {
         if (sonic.fd !== 1 && sonic.fd !== 2) {
-          fs71.close(sonic.fd, done);
+          fs70.close(sonic.fd, done);
         } else {
           done();
         }
@@ -10286,7 +10286,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 os24 = require("os");
+    var os23 = require("os");
     var stdSerializers = require_pino_std_serializers();
     var caller = require_caller();
     var redaction = require_redaction();
@@ -10333,7 +10333,7 @@ var require_pino = __commonJS({
     } = symbols;
     var { epochTime, nullTime } = time;
     var { pid } = process;
-    var hostname = os24.hostname();
+    var hostname = os23.hostname();
     var defaultErrorSerializer = stdSerializers.err;
     var defaultOptions = {
       level: "info",
@@ -11057,11 +11057,11 @@ var init_lib = __esm({
           }
         }
       },
-      addToPath: function addToPath(path78, added, removed, oldPosInc, options) {
-        var last = path78.lastComponent;
+      addToPath: function addToPath(path77, added, removed, oldPosInc, options) {
+        var last = path77.lastComponent;
         if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
           return {
-            oldPos: path78.oldPos + oldPosInc,
+            oldPos: path77.oldPos + oldPosInc,
             lastComponent: {
               count: last.count + 1,
               added,
@@ -11071,7 +11071,7 @@ var init_lib = __esm({
           };
         } else {
           return {
-            oldPos: path78.oldPos + oldPosInc,
+            oldPos: path77.oldPos + oldPosInc,
             lastComponent: {
               count: 1,
               added,
@@ -11537,10 +11537,10 @@ function attachmentToHistoryMessage(o, ts) {
     const memories = raw.map((m2) => {
       if (!m2 || typeof m2 !== "object") return null;
       const rec3 = m2;
-      const path78 = typeof rec3.path === "string" ? rec3.path : null;
+      const path77 = typeof rec3.path === "string" ? rec3.path : null;
       const content = typeof rec3.content === "string" ? rec3.content : null;
-      if (!path78 || content == null) return null;
-      const entry = { path: path78, content };
+      if (!path77 || content == null) return null;
+      const entry = { path: path77, content };
       if (typeof rec3.mtimeMs === "number") entry.mtimeMs = rec3.mtimeMs;
       return entry;
     }).filter((m2) => m2 !== null);
@@ -12004,14 +12004,6 @@ var init_claude_history = __esm({
   }
 });
 
-// ../protocol/src/index.ts
-var init_src = __esm({
-  "../protocol/src/index.ts"() {
-    "use strict";
-    init_runtime();
-  }
-});
-
 // src/tools/claude.ts
 function probeViaWhich() {
   try {
@@ -12360,10 +12352,10 @@ function parseAttachment(obj) {
     const memories = raw.map((m2) => {
       if (!m2 || typeof m2 !== "object") return null;
       const rec3 = m2;
-      const path78 = typeof rec3.path === "string" ? rec3.path : null;
+      const path77 = typeof rec3.path === "string" ? rec3.path : null;
       const content = typeof rec3.content === "string" ? rec3.content : null;
-      if (!path78 || content == null) return null;
-      const out = { path: path78, content };
+      if (!path77 || content == null) return null;
+      const out = { path: path77, content };
       if (typeof rec3.mtimeMs === "number") out.mtimeMs = rec3.mtimeMs;
       return out;
     }).filter((m2) => m2 !== null);
@@ -26835,121 +26827,6 @@ var require_dist = __commonJS({
   }
 });
 
-// src/dispatch/peer-forward.ts
-function wsUrlToHttp(url) {
-  if (url.startsWith("wss://")) return "https://" + url.slice("wss://".length);
-  if (url.startsWith("ws://")) return "http://" + url.slice("ws://".length);
-  return url;
-}
-async function forwardDispatchToPeer(args) {
-  const f = args.fetchImpl ?? fetch;
-  const base = wsUrlToHttp(args.contact.remoteUrl).replace(/\/+$/, "");
-  const url = `${base}/rpc/personaDispatch:run`;
-  let res;
-  try {
-    res = await f(url, {
-      method: "POST",
-      headers: {
-        "content-type": "application/json",
-        authorization: `Bearer ${args.contact.connectToken}`
-      },
-      // 注意：不带 targetDeviceId —— B 端据此判定为本地执行（B 角色）。
-      body: JSON.stringify({ targetPersona: args.targetPersona, prompt: args.prompt })
-    });
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    return { kind: "failure", reason: `forward to peer failed: ${msg}` };
-  }
-  let json;
-  try {
-    json = await res.json();
-  } catch {
-    return {
-      kind: "failure",
-      reason: `peer returned non-JSON response (HTTP ${res.status})`
-    };
-  }
-  if (json.ok === false) {
-    return { kind: "failure", reason: `peer rejected: ${json.error}: ${json.message}` };
-  }
-  return json.result.outcome;
-}
-async function forwardInboxPostToPeer(args) {
-  const f = args.fetchImpl ?? fetch;
-  const base = wsUrlToHttp(args.contact.remoteUrl).replace(/\/+$/, "");
-  const url = `${base}/rpc/inbox:postMessage`;
-  let res;
-  try {
-    res = await f(url, {
-      method: "POST",
-      headers: {
-        "content-type": "application/json",
-        authorization: `Bearer ${args.contact.connectToken}`
-      },
-      body: JSON.stringify({
-        id: args.id,
-        text: args.text,
-        createdAt: args.createdAt,
-        ...args.origin ? { origin: args.origin } : {}
-      })
-    });
-  } catch (err) {
-    return { ok: false, error: err instanceof Error ? err.message : String(err) };
-  }
-  let json = null;
-  try {
-    json = await res.json();
-  } catch {
-    return { ok: false, error: `peer non-JSON (HTTP ${res.status})` };
-  }
-  if (res.status < 200 || res.status >= 300 || json?.ok === false) {
-    return { ok: false, error: json?.error ?? `HTTP ${res.status}` };
-  }
-  return { ok: true };
-}
-async function forwardContactSshKeyIssueToPeer(args) {
-  const f = args.fetchImpl ?? fetch;
-  const base = wsUrlToHttp(args.contact.remoteUrl).replace(/\/+$/, "");
-  const url = `${base}/rpc/contact:sshKey:issue`;
-  let res;
-  try {
-    res = await f(url, {
-      method: "POST",
-      headers: {
-        "content-type": "application/json",
-        authorization: `Bearer ${args.contact.connectToken}`
-      },
-      body: JSON.stringify({ deviceId: args.selfDeviceIdForRequest })
-    });
-  } catch (err) {
-    return {
-      ok: false,
-      code: "NETWORK",
-      message: err instanceof Error ? err.message : String(err)
-    };
-  }
-  let json = null;
-  try {
-    json = await res.json();
-  } catch {
-    return { ok: false, code: "PROTOCOL", message: `peer non-JSON (HTTP ${res.status})` };
-  }
-  if (!json) {
-    return { ok: false, code: "PROTOCOL", message: `peer returned null (HTTP ${res.status})` };
-  }
-  if (json.ok === false) {
-    const j = json;
-    return { ok: false, code: j.error ?? "UNKNOWN", message: j.message ?? "" };
-  }
-  const r = json.result;
-  return { ok: true, privateKeyPem: r.privateKeyPem, publicKeyLine: r.publicKeyLine };
-}
-var init_peer_forward = __esm({
-  "src/dispatch/peer-forward.ts"() {
-    "use strict";
-  }
-});
-
 // ../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/constants.js
 var require_constants2 = __commonJS({
   "../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/constants.js"(exports2, module2) {
@@ -27010,8 +26887,8 @@ var require_buffer_util = __commonJS({
       }
       return buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.length);
     }
-    function toBuffer(data) {
-      toBuffer.readOnly = true;
+    function toBuffer2(data) {
+      toBuffer2.readOnly = true;
       if (Buffer.isBuffer(data)) return data;
       let buf;
       if (data instanceof ArrayBuffer) {
@@ -27020,7 +26897,7 @@ var require_buffer_util = __commonJS({
         buf = new FastBuffer(data.buffer, data.byteOffset, data.byteLength);
       } else {
         buf = Buffer.from(data);
-        toBuffer.readOnly = false;
+        toBuffer2.readOnly = false;
       }
       return buf;
     }
@@ -27028,7 +26905,7 @@ var require_buffer_util = __commonJS({
       concat,
       mask: _mask,
       toArrayBuffer,
-      toBuffer,
+      toBuffer: toBuffer2,
       unmask: _unmask
     };
     if (!process.env.WS_NO_BUFFER_UTIL) {
@@ -28283,7 +28160,7 @@ var require_sender = __commonJS({
     var PerMessageDeflate2 = require_permessage_deflate();
     var { EMPTY_BUFFER, kWebSocket, NOOP } = require_constants2();
     var { isBlob, isValidStatusCode } = require_validation();
-    var { mask: applyMask, toBuffer } = require_buffer_util();
+    var { mask: applyMask, toBuffer: toBuffer2 } = require_buffer_util();
     var kByteLength = /* @__PURE__ */ Symbol("kByteLength");
     var maskBuffer = Buffer.alloc(4);
     var RANDOM_POOL_SIZE = 8 * 1024;
@@ -28471,9 +28348,9 @@ var require_sender = __commonJS({
           byteLength = data.size;
           readOnly = false;
         } else {
-          data = toBuffer(data);
+          data = toBuffer2(data);
           byteLength = data.length;
-          readOnly = toBuffer.readOnly;
+          readOnly = toBuffer2.readOnly;
         }
         if (byteLength > 125) {
           throw new RangeError("The data size must not be greater than 125 bytes");
@@ -28518,9 +28395,9 @@ var require_sender = __commonJS({
           byteLength = data.size;
           readOnly = false;
         } else {
-          data = toBuffer(data);
+          data = toBuffer2(data);
           byteLength = data.length;
-          readOnly = toBuffer.readOnly;
+          readOnly = toBuffer2.readOnly;
         }
         if (byteLength > 125) {
           throw new RangeError("The data size must not be greater than 125 bytes");
@@ -28576,9 +28453,9 @@ var require_sender = __commonJS({
           byteLength = data.size;
           readOnly = false;
         } else {
-          data = toBuffer(data);
+          data = toBuffer2(data);
           byteLength = data.length;
-          readOnly = toBuffer.readOnly;
+          readOnly = toBuffer2.readOnly;
         }
         if (this._firstFragment) {
           this._firstFragment = false;
@@ -28648,7 +28525,7 @@ var require_sender = __commonJS({
             return;
           }
           this._bufferedBytes -= options[kByteLength];
-          const data = toBuffer(arrayBuffer);
+          const data = toBuffer2(arrayBuffer);
           if (!compress) {
             this._state = DEFAULT;
             this.sendFrame(_Sender.frame(data, options), cb);
@@ -29175,7 +29052,7 @@ var require_websocket = __commonJS({
       EventTarget: { addEventListener, removeEventListener }
     } = require_event_target();
     var { format, parse } = require_extension();
-    var { toBuffer } = require_buffer_util();
+    var { toBuffer: toBuffer2 } = require_buffer_util();
     var kAborted = /* @__PURE__ */ Symbol("kAborted");
     var protocolVersions = [8, 13];
     var readyStates = ["CONNECTING", "OPEN", "CLOSING", "CLOSED"];
@@ -29913,7 +29790,7 @@ var require_websocket = __commonJS({
     }
     function sendAfterClose(websocket, data, cb) {
       if (data) {
-        const length = isBlob(data) ? data.size : toBuffer(data).length;
+        const length = isBlob(data) ? data.size : toBuffer2(data).length;
         if (websocket._socket) websocket._sender._bufferedBytes += length;
         else websocket._bufferedAmount += length;
       }
@@ -33460,8 +33337,8 @@ var require_utils = __commonJS({
       var result = transform[inputType][outputType](input);
       return result;
     };
-    exports2.resolve = function(path78) {
-      var parts = path78.split("/");
+    exports2.resolve = function(path77) {
+      var parts = path77.split("/");
       var result = [];
       for (var index = 0; index < parts.length; index++) {
         var part = parts[index];
@@ -39314,18 +39191,18 @@ var require_object = __commonJS({
       var object = new ZipObject(name, zipObjectContent, o);
       this.files[name] = object;
     };
-    var parentFolder = function(path78) {
-      if (path78.slice(-1) === "/") {
-        path78 = path78.substring(0, path78.length - 1);
+    var parentFolder = function(path77) {
+      if (path77.slice(-1) === "/") {
+        path77 = path77.substring(0, path77.length - 1);
       }
-      var lastSlash = path78.lastIndexOf("/");
-      return lastSlash > 0 ? path78.substring(0, lastSlash) : "";
+      var lastSlash = path77.lastIndexOf("/");
+      return lastSlash > 0 ? path77.substring(0, lastSlash) : "";
     };
-    var forceTrailingSlash = function(path78) {
-      if (path78.slice(-1) !== "/") {
-        path78 += "/";
+    var forceTrailingSlash = function(path77) {
+      if (path77.slice(-1) !== "/") {
+        path77 += "/";
       }
-      return path78;
+      return path77;
     };
     var folderAdd = function(name, createFolders) {
       createFolders = typeof createFolders !== "undefined" ? createFolders : defaults.createFolders;
@@ -40324,49 +40201,6 @@ var require_lib3 = __commonJS({
   }
 });
 
-// src/sshd/contact-ssh-log.ts
-function createContactSshLog(dataDir) {
-  const file = import_node_path41.default.join(dataDir, "contact-ssh.log");
-  function append(level, tag, message, meta) {
-    const time = (/* @__PURE__ */ new Date()).toISOString();
-    let line = `[${time}] [${level}] [${tag}] ${message}`;
-    if (meta && Object.keys(meta).length > 0) {
-      try {
-        line += " " + JSON.stringify(meta);
-      } catch {
-        line += " [meta-serialize-failed]";
-      }
-    }
-    line += "\n";
-    try {
-      import_node_fs40.default.mkdirSync(import_node_path41.default.dirname(file), { recursive: true });
-      import_node_fs40.default.appendFileSync(file, line, { mode: 384 });
-    } catch {
-    }
-  }
-  return {
-    info: (tag, message, meta) => append("INFO", tag, message, meta),
-    warn: (tag, message, meta) => append("WARN", tag, message, meta),
-    error: (tag, message, meta) => append("ERROR", tag, message, meta)
-  };
-}
-var import_node_fs40, import_node_path41, nullContactSshLog;
-var init_contact_ssh_log = __esm({
-  "src/sshd/contact-ssh-log.ts"() {
-    "use strict";
-    import_node_fs40 = __toESM(require("fs"), 1);
-    import_node_path41 = __toESM(require("path"), 1);
-    nullContactSshLog = {
-      info: () => {
-      },
-      warn: () => {
-      },
-      error: () => {
-      }
-    };
-  }
-});
-
 // src/run-case/recorder.ts
 function startRunCaseRecorder(opts) {
   const now = opts.now ?? Date.now;
@@ -40742,63 +40576,39 @@ async function sshRelay(argv) {
     process.stderr.write("clawd ssh-relay: missing <peer-device-id>\n" + SSH_RELAY_HELP);
     return 2;
   }
-  const dataDir = args.dataDir ?? import_node_path67.default.join(import_node_os23.default.homedir(), ".clawd");
-  const sshLog = createContactSshLog(dataDir);
-  const contact = findContact(dataDir, args.peerDeviceId);
-  if (!contact) {
-    sshLog.error("relay.contact-not-found", "ssh-relay \u627E\u4E0D\u5230 peer contact", {
-      peerDeviceId: args.peerDeviceId,
-      contactsPath: import_node_path67.default.join(dataDir, "contacts.json")
-    });
-    process.stderr.write(`clawd ssh-relay: contact ${args.peerDeviceId} not found in ${dataDir}/contacts.json
-`);
+  const daemonUrl = process.env.CLAWD_DAEMON_URL;
+  const sessionId = process.env.CLAWD_SESSION_ID;
+  if (!daemonUrl) {
+    process.stderr.write(
+      "clawd ssh-relay: CLAWD_DAEMON_URL env not set (relay must run inside a clawd CC session)\n"
+    );
     return 2;
   }
-  if (!contact.connectToken) {
-    sshLog.error("relay.token-missing", "contact \u6709\u8BB0\u5F55\u4F46\u7F3A connectToken\uFF08auto-reverse \u672A\u6362\u7968\uFF09", {
-      peerDeviceId: args.peerDeviceId,
-      peerDisplayName: contact.displayName
-    });
+  if (!sessionId) {
     process.stderr.write(
-      `clawd ssh-relay: contact ${args.peerDeviceId} has no connectToken (auto-reverse \u672A\u6362\u7968)
-`
+      "clawd ssh-relay: CLAWD_SESSION_ID env not set (relay must run inside a clawd CC session)\n"
     );
     return 2;
   }
-  const baseHttp = wsUrlToHttp(contact.remoteUrl).replace(/\/+$/, "");
-  const wsBase = baseHttp.replace(/^http:/, "ws:").replace(/^https:/, "wss:");
-  const url = `${wsBase}/rpc/ssh-tunnel`;
-  sshLog.info("relay.dial", "\u5F00\u59CB\u62E8 A \u4FA7 /rpc/ssh-tunnel", {
-    peerDeviceId: args.peerDeviceId,
-    peerDisplayName: contact.displayName,
-    url
-  });
+  const wsBase = daemonUrl.replace(/^http/, "ws").replace(/\/+$/, "");
+  const url = `${wsBase}/rpc/ssh-tunnel-local?peerDeviceId=${encodeURIComponent(args.peerDeviceId)}`;
   return new Promise((resolve6) => {
     const ws = new import_websocket.default(url, {
-      headers: {
-        Authorization: `Bearer ${contact.connectToken}`
-      }
+      headers: { "X-Clawd-Session-Id": sessionId }
     });
-    let exitCode = 0;
     let settled = false;
     const settle = (code) => {
       if (settled) return;
       settled = true;
-      exitCode = code;
       try {
         ws.close();
       } catch {
       }
-      resolve6(exitCode);
+      resolve6(code);
     };
     ws.on("open", () => {
-      sshLog.info("relay.dial-open", "ws open\uFF0C\u8FDB\u5165 stdio \u2194 ws \u4E2D\u7EE7", {
-        peerDeviceId: args.peerDeviceId
-      });
       process.stdin.on("data", (chunk) => {
-        if (ws.readyState === ws.OPEN) {
-          ws.send(chunk, { binary: true });
-        }
+        if (ws.readyState === ws.OPEN) ws.send(chunk, { binary: true });
       });
       process.stdin.on("end", () => {
         try {
@@ -40808,36 +40618,15 @@ async function sshRelay(argv) {
       });
       process.stdin.on("error", () => settle(1));
     });
-    ws.on("message", (data, isBinary) => {
-      void isBinary;
-      if (Buffer.isBuffer(data)) {
-        process.stdout.write(data);
-      } else if (Array.isArray(data)) {
-        process.stdout.write(Buffer.concat(data));
-      } else if (data instanceof ArrayBuffer) {
-        process.stdout.write(Buffer.from(data));
-      }
+    ws.on("message", (data) => {
+      if (Buffer.isBuffer(data)) process.stdout.write(data);
+      else if (Array.isArray(data)) process.stdout.write(Buffer.concat(data));
+      else if (data instanceof ArrayBuffer) process.stdout.write(Buffer.from(data));
     });
     ws.on("close", (code) => {
-      if (code === 1e3) {
-        sshLog.info("relay.dial-close", "ws \u6B63\u5E38\u5173\u95ED", {
-          peerDeviceId: args.peerDeviceId,
-          code
-        });
-      } else {
-        sshLog.warn("relay.dial-close-abnormal", "ws \u975E\u6B63\u5E38\u5173\u95ED\uFF08A \u4FA7\u62D2 auth / \u7F51\u7EDC\u65AD / peer \u5D29\uFF09", {
-          peerDeviceId: args.peerDeviceId,
-          code
-        });
-      }
       settle(code === 1e3 ? 0 : 1);
     });
     ws.on("error", (err) => {
-      sshLog.error("relay.dial-error", "ws \u8FDE\u63A5\u9519\u8BEF\uFF08peer \u4E0D\u53EF\u8FBE / \u7AEF\u53E3\u4E0D\u901A / TLS \u5931\u8D25\uFF09", {
-        peerDeviceId: args.peerDeviceId,
-        url,
-        message: err.message
-      });
       process.stderr.write(`clawd ssh-relay: ws error ${err.message}
 `);
       settle(1);
@@ -40855,10 +40644,6 @@ function parseSshRelayArgs(argv) {
       out.help = true;
       continue;
     }
-    if (a === "--data-dir") {
-      out.dataDir = argv[++i];
-      continue;
-    }
     if (a.startsWith("--")) {
       throw new Error(`unknown flag: ${a}`);
     }
@@ -40868,50 +40653,22 @@ function parseSshRelayArgs(argv) {
   }
   return out;
 }
-function findContact(dataDir, deviceId) {
-  const file = import_node_path67.default.join(dataDir, "contacts.json");
-  let raw;
-  try {
-    raw = import_node_fs54.default.readFileSync(file, "utf8");
-  } catch {
-    return null;
-  }
-  let json;
-  try {
-    json = JSON.parse(raw);
-  } catch {
-    return null;
-  }
-  const arr = json?.contacts;
-  if (!Array.isArray(arr)) return null;
-  for (const entry of arr) {
-    const r = ContactSchema.safeParse(entry);
-    if (r.success && r.data.deviceId === deviceId) return r.data;
-  }
-  return null;
-}
-var import_node_fs54, import_node_os23, import_node_path67, SSH_RELAY_HELP;
+var SSH_RELAY_HELP;
 var init_sshd_cli_relay = __esm({
   "src/sshd/sshd-cli-relay.ts"() {
     "use strict";
-    import_node_fs54 = __toESM(require("fs"), 1);
-    import_node_os23 = __toESM(require("os"), 1);
-    import_node_path67 = __toESM(require("path"), 1);
     init_wrapper();
-    init_src();
-    init_peer_forward();
-    init_contact_ssh_log();
-    SSH_RELAY_HELP = `clawd ssh-relay <peer-device-id> [options]
+    SSH_RELAY_HELP = `clawd ssh-relay <peer-device-id>
 
-WebSocket relay to a peer daemon's /rpc/ssh-tunnel, exposing raw SSH bytes on
-stdio. Meant to be used as SSH ProxyCommand.
+WebSocket relay to a peer daemon's /rpc/ssh-tunnel via the local daemon
+(reads CLAWD_DAEMON_URL + CLAWD_SESSION_ID from env). Meant to be used as
+SSH ProxyCommand from inside a clawd CC session.
 
 Options:
-  --data-dir <path>   \u6570\u636E\u76EE\u5F55\uFF08\u9ED8\u8BA4 ~/.clawd\uFF09
   --help / -h         \u663E\u793A\u5E2E\u52A9
 
 Example:
-  ssh -o ProxyCommand='clawd ssh-relay <peer-device-id>' \\
+  ssh -o ProxyCommand='~/.clawd/bin/clawd ssh-relay <peer-device-id>' \\
       -i ~/.clawd/contact-ssh-keys/<peer-device-id>.ed25519 \\
       $USER@127.0.0.1
 `;
@@ -41814,7 +41571,6 @@ function composeGuestSandbox(base, userWorkDir, spawnCwd) {
   fsv.allowWrite = unionArr(fsv.allowWrite, [userWorkDir]);
   fsv.allowRead = unionArr(fsv.allowRead, [
     "~/.clawd/contact-ssh-keys",
-    "~/.clawd/contacts.json",
     "~/.clawd/bin",
     "~/Library/Application Support/@clawos/clawd-desktop/ota-bundles",
     "~/.clawd/config.json",
@@ -46354,7 +46110,11 @@ function tryLoadShareUi(logger) {
 
 // src/visitor/visitor-token.ts
 var import_node_crypto4 = __toESM(require("crypto"), 1);
-init_src();
+
+// ../protocol/src/index.ts
+init_runtime();
+
+// src/visitor/visitor-token.ts
 function hmac(secret, body) {
   return import_node_crypto4.default.createHmac("sha256", secret).update(body).digest("base64url");
 }
@@ -46711,8 +46471,8 @@ function turnStartInput(text) {
   const items = [];
   let leftover = text;
   for (const m2 of text.matchAll(SKILL_RE)) {
-    const [marker, name, path78] = m2;
-    items.push({ type: "skill", name, path: path78 });
+    const [marker, name, path77] = m2;
+    items.push({ type: "skill", name, path: path77 });
     leftover = leftover.replace(marker, "");
   }
   for (const m2 of text.matchAll(ATTACHMENT_RE2)) {
@@ -48977,8 +48737,115 @@ function buildPersonaDispatchHandlers(deps) {
   };
 }
 
-// src/index.ts
-init_peer_forward();
+// src/dispatch/peer-forward.ts
+function wsUrlToHttp(url) {
+  if (url.startsWith("wss://")) return "https://" + url.slice("wss://".length);
+  if (url.startsWith("ws://")) return "http://" + url.slice("ws://".length);
+  return url;
+}
+async function forwardDispatchToPeer(args) {
+  const f = args.fetchImpl ?? fetch;
+  const base = wsUrlToHttp(args.contact.remoteUrl).replace(/\/+$/, "");
+  const url = `${base}/rpc/personaDispatch:run`;
+  let res;
+  try {
+    res = await f(url, {
+      method: "POST",
+      headers: {
+        "content-type": "application/json",
+        authorization: `Bearer ${args.contact.connectToken}`
+      },
+      // 注意：不带 targetDeviceId —— B 端据此判定为本地执行（B 角色）。
+      body: JSON.stringify({ targetPersona: args.targetPersona, prompt: args.prompt })
+    });
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    return { kind: "failure", reason: `forward to peer failed: ${msg}` };
+  }
+  let json;
+  try {
+    json = await res.json();
+  } catch {
+    return {
+      kind: "failure",
+      reason: `peer returned non-JSON response (HTTP ${res.status})`
+    };
+  }
+  if (json.ok === false) {
+    return { kind: "failure", reason: `peer rejected: ${json.error}: ${json.message}` };
+  }
+  return json.result.outcome;
+}
+async function forwardInboxPostToPeer(args) {
+  const f = args.fetchImpl ?? fetch;
+  const base = wsUrlToHttp(args.contact.remoteUrl).replace(/\/+$/, "");
+  const url = `${base}/rpc/inbox:postMessage`;
+  let res;
+  try {
+    res = await f(url, {
+      method: "POST",
+      headers: {
+        "content-type": "application/json",
+        authorization: `Bearer ${args.contact.connectToken}`
+      },
+      body: JSON.stringify({
+        id: args.id,
+        text: args.text,
+        createdAt: args.createdAt,
+        ...args.origin ? { origin: args.origin } : {}
+      })
+    });
+  } catch (err) {
+    return { ok: false, error: err instanceof Error ? err.message : String(err) };
+  }
+  let json = null;
+  try {
+    json = await res.json();
+  } catch {
+    return { ok: false, error: `peer non-JSON (HTTP ${res.status})` };
+  }
+  if (res.status < 200 || res.status >= 300 || json?.ok === false) {
+    return { ok: false, error: json?.error ?? `HTTP ${res.status}` };
+  }
+  return { ok: true };
+}
+async function forwardContactSshKeyIssueToPeer(args) {
+  const f = args.fetchImpl ?? fetch;
+  const base = wsUrlToHttp(args.contact.remoteUrl).replace(/\/+$/, "");
+  const url = `${base}/rpc/contact:sshKey:issue`;
+  let res;
+  try {
+    res = await f(url, {
+      method: "POST",
+      headers: {
+        "content-type": "application/json",
+        authorization: `Bearer ${args.contact.connectToken}`
+      },
+      body: JSON.stringify({ deviceId: args.selfDeviceIdForRequest })
+    });
+  } catch (err) {
+    return {
+      ok: false,
+      code: "NETWORK",
+      message: err instanceof Error ? err.message : String(err)
+    };
+  }
+  let json = null;
+  try {
+    json = await res.json();
+  } catch {
+    return { ok: false, code: "PROTOCOL", message: `peer non-JSON (HTTP ${res.status})` };
+  }
+  if (!json) {
+    return { ok: false, code: "PROTOCOL", message: `peer returned null (HTTP ${res.status})` };
+  }
+  if (json.ok === false) {
+    const j = json;
+    return { ok: false, code: j.error ?? "UNKNOWN", message: j.message ?? "" };
+  }
+  const r = json.result;
+  return { ok: true, privateKeyPem: r.privateKeyPem, publicKeyLine: r.publicKeyLine };
+}
 
 // src/tools/codex-history.ts
 var import_node_child_process5 = require("child_process");
@@ -49166,13 +49033,13 @@ function mapSkillsListResponse(res) {
       const r = s ?? {};
       const name = str3(r.name);
       if (!name) continue;
-      const path78 = str3(r.path);
+      const path77 = str3(r.path);
       const description = str3(r.description);
       const isPlugin = name.includes(":");
       out.push({
         name,
         source: isPlugin ? "plugin" : "project",
-        ...path78 ? { path: path78 } : {},
+        ...path77 ? { path: path77 } : {},
         ...description ? { description } : {},
         ...isPlugin ? { plugin: name.split(":")[0] } : {}
       });
@@ -49910,6 +49777,18 @@ var LocalWsServer = class {
             return;
           }
         }
+        if (this.opts.sshTunnelLocalUpgradeHandler) {
+          const [urlPath] = (req.url ?? "").split("?");
+          if (urlPath === "/rpc/ssh-tunnel-local") {
+            void this.opts.sshTunnelLocalUpgradeHandler(
+              req,
+              socket,
+              head,
+              wss
+            );
+            return;
+          }
+        }
         if (req.url?.startsWith("/preview/")) {
           const pathname = (() => {
             try {
@@ -50482,7 +50361,6 @@ function constantTimeEqual2(a, b2) {
 }
 
 // src/transport/connection-context.ts
-init_src();
 function ownerContext(ownerPrincipalId, displayName) {
   return {
     principal: makeOwnerPrincipal(ownerPrincipalId, displayName),
@@ -50536,7 +50414,6 @@ async function authenticate(token, deps) {
 // src/permission/capability-store.ts
 var fs29 = __toESM(require("fs"), 1);
 var path29 = __toESM(require("path"), 1);
-init_src();
 var CAPABILITIES_FILE_NAME = "capabilities.json";
 var FILE_VERSION = 1;
 var CapabilityStore = class {
@@ -50714,7 +50591,6 @@ function cleanupGuestSessionsForCapability(cap, factory) {
 // src/inbox/inbox-store.ts
 var fs31 = __toESM(require("fs"), 1);
 var path30 = __toESM(require("path"), 1);
-init_src();
 var INBOX_SUBDIR = "inbox";
 var InboxStore = class {
   constructor(dataDir) {
@@ -50905,7 +50781,6 @@ var InboxManager = class {
 // src/state/contact-store.ts
 var fs32 = __toESM(require("fs"), 1);
 var path31 = __toESM(require("path"), 1);
-init_src();
 var FILE_NAME = "contacts.json";
 var ContactStore = class {
   constructor(dataDir) {
@@ -51156,9 +51031,6 @@ async function autoReverseContact(args) {
   args.broadcast({ type: "contact:added", contact: upgraded });
 }
 
-// src/index.ts
-init_src();
-
 // src/migrations/2026-05-20-flatten-sessions.ts
 var fs33 = __toESM(require("fs"), 1);
 var path32 = __toESM(require("path"), 1);
@@ -51541,7 +51413,6 @@ var import_promises3 = __toESM(require("fs/promises"), 1);
 var import_node_path27 = __toESM(require("path"), 1);
 var import_node_os12 = __toESM(require("os"), 1);
 var import_jszip = __toESM(require_lib3(), 1);
-init_src();
 var ImportError = class extends Error {
   constructor(code, message) {
     super(message);
@@ -53676,8 +53547,45 @@ function readIssuedPubkey(sshdDir, deviceId) {
 // src/sshd/contact-key-puller.ts
 var import_node_fs41 = __toESM(require("fs"), 1);
 var import_node_path42 = __toESM(require("path"), 1);
-init_peer_forward();
-init_contact_ssh_log();
+
+// src/sshd/contact-ssh-log.ts
+var import_node_fs40 = __toESM(require("fs"), 1);
+var import_node_path41 = __toESM(require("path"), 1);
+function createContactSshLog(dataDir) {
+  const file = import_node_path41.default.join(dataDir, "contact-ssh.log");
+  function append(level, tag, message, meta) {
+    const time = (/* @__PURE__ */ new Date()).toISOString();
+    let line = `[${time}] [${level}] [${tag}] ${message}`;
+    if (meta && Object.keys(meta).length > 0) {
+      try {
+        line += " " + JSON.stringify(meta);
+      } catch {
+        line += " [meta-serialize-failed]";
+      }
+    }
+    line += "\n";
+    try {
+      import_node_fs40.default.mkdirSync(import_node_path41.default.dirname(file), { recursive: true });
+      import_node_fs40.default.appendFileSync(file, line, { mode: 384 });
+    } catch {
+    }
+  }
+  return {
+    info: (tag, message, meta) => append("INFO", tag, message, meta),
+    warn: (tag, message, meta) => append("WARN", tag, message, meta),
+    error: (tag, message, meta) => append("ERROR", tag, message, meta)
+  };
+}
+var nullContactSshLog = {
+  info: () => {
+  },
+  warn: () => {
+  },
+  error: () => {
+  }
+};
+
+// src/sshd/contact-key-puller.ts
 var CONTACT_KEYS_DIR = "contact-ssh-keys";
 function safeContactKeyPath(dataDir, deviceId) {
   const safeId = deviceId.replace(/[\/\\]/g, "_");
@@ -53789,7 +53697,6 @@ var ContactKeyPuller = class {
 
 // src/sshd/ssh-tunnel-relay.ts
 var import_node_net2 = __toESM(require("net"), 1);
-init_contact_ssh_log();
 async function handleSshTunnelUpgrade(req, socket, head, deps) {
   const sshLog = deps.sshLog ?? nullContactSshLog;
   const clientAddr = (req.socket && "remoteAddress" in req.socket ? req.socket.remoteAddress : null) ?? "unknown";
@@ -53897,8 +53804,161 @@ function pumpWsToSshd(ws, deps, clientAddr) {
   });
 }
 
-// src/index.ts
-init_contact_ssh_log();
+// src/sshd/ssh-tunnel-local-relay.ts
+init_wrapper();
+function parsePeerDeviceId(rawUrl) {
+  if (!rawUrl) return null;
+  try {
+    const u = new URL(rawUrl, "http://127.0.0.1");
+    const v2 = u.searchParams.get("peerDeviceId");
+    return v2 && v2.length > 0 ? v2 : null;
+  } catch {
+    return null;
+  }
+}
+async function handleSshTunnelLocalUpgrade(req, socket, head, deps) {
+  const sshLog = deps.sshLog ?? nullContactSshLog;
+  const clientAddr = (req.socket && "remoteAddress" in req.socket ? req.socket.remoteAddress : null) ?? "unknown";
+  const sessionId = req.headers["x-clawd-session-id"] ?? "";
+  if (!sessionId) {
+    sshLog.warn("relay.auth-failed", "/rpc/ssh-tunnel-local \u7F3A X-Clawd-Session-Id header", {
+      clientAddr
+    });
+    respond401(socket);
+    return;
+  }
+  const peerDeviceId = parsePeerDeviceId(req.url);
+  if (!peerDeviceId) {
+    sshLog.warn("relay.auth-failed", "/rpc/ssh-tunnel-local \u7F3A peerDeviceId query", { clientAddr });
+    respond400(socket);
+    return;
+  }
+  const contact = deps.store.get(peerDeviceId);
+  if (!contact) {
+    sshLog.error("relay.contact-not-found", "ssh-tunnel-local \u627E\u4E0D\u5230 peer contact", {
+      peerDeviceId
+    });
+    respond404(socket);
+    return;
+  }
+  if (!contact.connectToken) {
+    sshLog.error(
+      "relay.token-missing",
+      "contact \u6709\u8BB0\u5F55\u4F46\u7F3A connectToken\uFF08auto-reverse \u672A\u6362\u7968\uFF09",
+      { peerDeviceId, peerDisplayName: contact.displayName }
+    );
+    respond403(socket);
+    return;
+  }
+  const baseHttp = wsUrlToHttp(contact.remoteUrl).replace(/\/+$/, "");
+  const wsBase = baseHttp.replace(/^http:/, "ws:").replace(/^https:/, "wss:");
+  const outboundUrl = `${wsBase}/rpc/ssh-tunnel`;
+  sshLog.info("relay.dial", "\u5F00\u59CB\u62E8 A \u4FA7 /rpc/ssh-tunnel", {
+    peerDeviceId,
+    peerDisplayName: contact.displayName,
+    url: outboundUrl
+  });
+  deps.wss.handleUpgrade(req, socket, head, (clientWs) => {
+    const makeOut = deps.makeOutboundWs ?? ((u, o) => new import_websocket.default(u, o));
+    const outbound = makeOut(outboundUrl, {
+      headers: { Authorization: `Bearer ${contact.connectToken}` }
+    });
+    pumpClientToOutbound(clientWs, outbound, peerDeviceId, contact.displayName, deps);
+  });
+}
+function pumpClientToOutbound(client, outbound, peerDeviceId, peerDisplayName, deps) {
+  const sshLog = deps.sshLog ?? nullContactSshLog;
+  const startedAt = Date.now();
+  let outboundOpened = false;
+  let bytesClientToOutbound = 0;
+  let bytesOutboundToClient = 0;
+  let settled = false;
+  const cleanup = (reason, code = 1e3) => {
+    if (settled) return;
+    settled = true;
+    try {
+      client.close(code, reason);
+    } catch {
+    }
+    try {
+      outbound.close();
+    } catch {
+    }
+    const level = code === 1e3 ? "info" : "warn";
+    sshLog[level](
+      code === 1e3 ? "relay.dial-close" : "relay.dial-close-abnormal",
+      code === 1e3 ? "tunnel \u4F1A\u8BDD\u6B63\u5E38\u7ED3\u675F" : "tunnel \u4F1A\u8BDD\u975E\u6B63\u5E38\u5173\u95ED",
+      {
+        peerDeviceId,
+        peerDisplayName,
+        reason,
+        code,
+        outboundOpened,
+        bytesClientToOutbound,
+        bytesOutboundToClient,
+        durationMs: Date.now() - startedAt
+      }
+    );
+  };
+  outbound.on("open", () => {
+    outboundOpened = true;
+    sshLog.info("relay.dial-open", "outbound ws open\uFF0C\u8FDB\u5165\u53CC\u5411 pipe", {
+      peerDeviceId,
+      peerDisplayName
+    });
+  });
+  outbound.on("message", (data) => {
+    const buf = toBuffer(data);
+    if (!buf) return;
+    bytesOutboundToClient += buf.length;
+    if (client.readyState === client.OPEN) client.send(buf, { binary: true });
+  });
+  outbound.on("error", (err) => {
+    deps.logger?.warn("ssh-tunnel-local: outbound ws error", { err: err.message });
+    sshLog.error("relay.dial-error", "outbound ws \u8FDE\u63A5\u9519\u8BEF\uFF08peer \u4E0D\u53EF\u8FBE / TLS \u5931\u8D25\uFF09", {
+      peerDeviceId,
+      peerDisplayName,
+      message: err.message
+    });
+    cleanup("outbound error", 1011);
+  });
+  outbound.on("close", (code) => {
+    if (!settled) cleanup(`outbound close ${code}`, code === 1e3 ? 1e3 : 1011);
+  });
+  client.on("message", (data) => {
+    const buf = toBuffer(data);
+    if (!buf) return;
+    bytesClientToOutbound += buf.length;
+    if (outbound.readyState === outbound.OPEN) outbound.send(buf, { binary: true });
+  });
+  client.on("close", () => cleanup("client close", 1e3));
+  client.on("error", (err) => {
+    deps.logger?.warn("ssh-tunnel-local: client ws error", { err: err.message });
+    cleanup("client error", 1011);
+  });
+}
+function toBuffer(data) {
+  if (Buffer.isBuffer(data)) return data;
+  if (Array.isArray(data)) return Buffer.concat(data);
+  if (data instanceof ArrayBuffer) return Buffer.from(data);
+  return null;
+}
+function respond401(socket) {
+  socket.write("HTTP/1.1 401 Unauthorized\r\nContent-Length: 0\r\n\r\n");
+  socket.destroy();
+}
+function respond400(socket) {
+  socket.write("HTTP/1.1 400 Bad Request\r\nContent-Length: 0\r\n\r\n");
+  socket.destroy();
+}
+function respond403(socket) {
+  socket.write("HTTP/1.1 403 Forbidden\r\nContent-Length: 0\r\n\r\n");
+  socket.destroy();
+}
+function respond404(socket) {
+  socket.write("HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\n\r\n");
+  socket.destroy();
+}
 
 // src/tunnel/device-key.ts
 var import_node_os14 = __toESM(require("os"), 1);
@@ -54188,9 +54248,9 @@ var CentralClientError = class extends Error {
   code;
   cause;
 };
-async function centralRequest(opts, path78, init) {
+async function centralRequest(opts, path77, init) {
   const f = opts.fetchImpl ?? globalThis.fetch;
-  const url = `${opts.api.replace(/\/+$/, "")}${path78}`;
+  const url = `${opts.api.replace(/\/+$/, "")}${path77}`;
   const ctrl = new AbortController();
   const timer = setTimeout(() => ctrl.abort(), opts.timeoutMs ?? 15e3);
   let res;
@@ -55180,7 +55240,6 @@ function buildCapabilitiesHandlers(deps) {
 
 // src/handlers/capability.ts
 init_zod();
-init_src();
 init_protocol();
 var DeleteArgsSchema = external_exports.object({
   capabilityId: external_exports.string().min(1)
@@ -55219,7 +55278,6 @@ function buildCapabilityHandlers(deps) {
 }
 
 // src/handlers/inbox.ts
-init_src();
 init_protocol();
 function resolvePeerDeviceId(ctx, argsPeerDeviceId) {
   if (ctx.principal.kind === "owner") {
@@ -55398,7 +55456,6 @@ function buildInboxHandlers(deps) {
 }
 
 // src/handlers/contact.ts
-init_src();
 init_protocol();
 function ensureOwner(ctx) {
   if (!ctx || ctx.principal.kind !== "owner") {
@@ -55467,7 +55524,6 @@ function buildContactHandlers(deps) {
 }
 
 // src/handlers/contact-ssh.ts
-init_src();
 init_protocol();
 
 // src/sshd/key-issue.ts
@@ -55514,7 +55570,6 @@ async function issueContactSshKey(deviceId, sshdDir, opts = {}) {
 }
 
 // src/handlers/contact-ssh.ts
-init_contact_ssh_log();
 function ensureOwner2(ctx) {
   if (!ctx || ctx.principal.kind !== "owner") {
     throw new ClawdError(
@@ -55617,7 +55672,6 @@ function buildContactSshHandlers(deps) {
 }
 
 // src/handlers/whoami.ts
-init_src();
 init_protocol();
 function buildWhoamiHandler(deps) {
   return async (_frame, _client, ctx) => {
@@ -55711,7 +55765,6 @@ function buildFeishuAuthHandlers(deps) {
 }
 
 // src/handlers/device.ts
-init_src();
 init_protocol();
 function ensureOwner3(ctx) {
   if (!ctx || ctx.principal.kind !== "owner") {
@@ -56116,7 +56169,6 @@ function buildAttachmentHandlers(deps) {
 var import_promises8 = __toESM(require("fs/promises"), 1);
 var import_node_path55 = __toESM(require("path"), 1);
 init_protocol();
-init_src();
 
 // src/extension/bundle-zip.ts
 var import_promises5 = __toESM(require("fs/promises"), 1);
@@ -56162,8 +56214,6 @@ async function walk(absRoot, relPrefix, out) {
 }
 
 // src/extension/publish-check.ts
-init_src();
-init_src();
 function computePublishCheck(args) {
   const { localHash, localVersion, head } = args;
   if (head === null) {
@@ -56208,12 +56258,10 @@ var import_node_path53 = __toESM(require("path"), 1);
 var import_node_os19 = __toESM(require("os"), 1);
 var import_node_crypto15 = __toESM(require("crypto"), 1);
 var import_jszip3 = __toESM(require_lib3(), 1);
-init_src();
 
 // src/extension/paths.ts
 var import_node_os18 = __toESM(require("os"), 1);
 var import_node_path52 = __toESM(require("path"), 1);
-init_src();
 function clawdHomeRoot(override) {
   return override ?? process.env.CLAWD_HOME ?? import_node_path52.default.join(import_node_os18.default.homedir(), ".clawd");
 }
@@ -56331,7 +56379,6 @@ var import_node_path54 = __toESM(require("path"), 1);
 var import_node_os20 = __toESM(require("os"), 1);
 var import_node_crypto16 = __toESM(require("crypto"), 1);
 var import_jszip4 = __toESM(require_lib3(), 1);
-init_src();
 var UpdateError = class extends Error {
   constructor(code, message) {
     super(message);
@@ -56477,7 +56524,6 @@ async function rollback(deps, localExtId, liveDir, prevDir) {
 }
 
 // src/handlers/extension.ts
-init_src();
 function pickChannelRef(frame) {
   const ref = frame.channelRef;
   const parsed = ChannelRefSchema.safeParse(ref);
@@ -57968,7 +58014,6 @@ function buildVisitorHandlers(deps) {
 // src/extension/registry.ts
 var import_promises9 = __toESM(require("fs/promises"), 1);
 var import_node_path59 = __toESM(require("path"), 1);
-init_src();
 async function loadAll(root) {
   let entries;
   try {
@@ -58053,7 +58098,6 @@ async function uninstall(deps) {
 
 // src/handlers/index.ts
 var import_node_crypto18 = require("crypto");
-init_peer_forward();
 function buildMethodHandlers(deps) {
   return {
     ...buildSessionHandlers({
@@ -58627,7 +58671,6 @@ async function dispatchRpc(method, frame, client, ctx, deps) {
 var import_node_child_process18 = require("child_process");
 var import_node_path61 = __toESM(require("path"), 1);
 var import_promises11 = require("timers/promises");
-init_src();
 
 // src/extension/port-allocator.ts
 var import_node_net3 = __toESM(require("net"), 1);
@@ -58840,7 +58883,6 @@ ${handle.stderrTail}`
 // src/extension/published-channels.ts
 var import_promises12 = __toESM(require("fs/promises"), 1);
 var import_node_path62 = __toESM(require("path"), 1);
-init_src();
 init_zod();
 var PublishedChannelsError = class extends Error {
   constructor(code, message) {
@@ -59920,6 +59962,18 @@ async function startDaemon(config) {
       });
       return true;
     },
+    // Contact SSH relay v2 (spec 2026-07-06-contact-ssh-relay-via-local-daemon-tunnel):
+    // /rpc/ssh-tunnel-local WS 前置拦截。guest CC 沙箱从 localhost 连本地 daemon，daemon
+    // 代理起 outbound wss 到 peer /rpc/ssh-tunnel。findContact / connectToken 处理下沉到
+    // 本 handler；relay CLI 变纯粹的 stdio ↔ local WS pump（不再读 contacts.json / 持 token）。
+    sshTunnelLocalUpgradeHandler: async (req, socket, head, wss2) => {
+      await handleSshTunnelLocalUpgrade(req, socket, head, {
+        wss: wss2,
+        store: contactStore,
+        logger,
+        sshLog
+      });
+    },
     // 订阅成功后给该 client 重放 in-flight pendingQuestions（plan: clawd-question-server-truth）。
     // daemon 是 pendingQuestions 的唯一 source of truth；新 client 接入 / 刷新页面时
     // 把当前所有未决 question 以 session:question 帧定向回放，让 UI 不再误显示 Ended。