npm - @clawos-dev/clawd - Versions diffs - 0.2.235 → 0.2.237 - Mend

@clawos-dev/clawd 0.2.235 → 0.2.237

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/cli.cjs +384 -527
package/dist/dispatch/mcp-server.cjs +14 -10
package/dist/share-ui/assets/{guest-DkkDu-6U.js → guest-x12quoXh.js} +1 -1
package/dist/share-ui/guest.html +1 -1
package/package.json +1 -1

package/dist/cli.cjs CHANGED Viewed

@@ -161,11 +161,10 @@ var init_methods = __esm({
       "contact:list",
       "contact:pin",
       "contact:remove",
-      // ---- contact:setSshAccess / contact:sshKey:issue (SSH 反向访问，PR: contact-ssh-sandbox) ----
-      // owner UI 授权 contact 通过 daemon 专用 sshd 反向 SSH 进本机；guest daemon 用 sshKey:issue 拉 privkey.
-      // 详见 protocol/src/contact-ssh.ts.
+      // ---- contact:setSshAccess (SSH 反向访问，PR: contact-ssh-sandbox) ----
+      // owner UI 授权 contact 通过 daemon 专用 sshd 反向 SSH 进本机；key 分发走建联握手
+      // pubkey 互换（spec 2026-07-15，无签发 RPC）。详见 protocol/src/contact-ssh.ts.
       "contact:setSshAccess",
-      "contact:sshKey:issue",
       // ---- visitor:* (web 访客 · persona web 分享，spec 2026-06-24-persona-web-share-design) ----
       // owner-only：列出登录访问过本机 public persona 的 web 访客（零安装、飞书登录、daemon 自签
       // visitor token）。存储 ~/.clawd/visitors.json（VisitorStore），登录(exchange)即 upsert；
@@ -745,8 +744,8 @@ var init_parseUtil = __esm({
     init_errors2();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path77, errorMaps, issueData } = params;
-      const fullPath = [...path77, ...issueData.path || []];
+      const { data, path: path76, errorMaps, issueData } = params;
+      const fullPath = [...path76, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -1057,11 +1056,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path77, key) {
+      constructor(parent, value, path76, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path77;
+        this._path = path76;
         this._key = key;
       }
       get path() {
@@ -5326,7 +5325,11 @@ var init_schemas = __esm({
        * selfUrl 保留：它只是"可达地址"（auto-reverse 反向连接用），不是身份——填错只影响
        * 反向连通性，不构成伪造风险，且 url 不在 token 里（token 只签身份不签地址）。
        */
-      selfUrl: external_exports.string().min(1).optional()
+      selfUrl: external_exports.string().min(1).optional(),
+      /** 连接方自报本机 SSH identity pubkey；见 doc/glossary/peer-mesh.md#建联交换清单 */
+      selfSshPublicKey: external_exports.string().min(1).optional(),
+      /** 连接方自报本机 OS 登录账号名；见 doc/glossary/peer-mesh.md#建联交换清单 */
+      selfOsUser: external_exports.string().min(1).optional()
     });
     AuthOkFrameSchema = external_exports.object({
       type: external_exports.literal("auth:ok"),
@@ -5649,7 +5652,11 @@ var init_capability = __esm({
           id: external_exports.string().min(1),
           displayName: external_exports.string()
         }).strict()
-      )
+      ),
+      /** 被连方 SSH identity pubkey；见 doc/glossary/peer-mesh.md#建联交换清单 */
+      sshPublicKey: external_exports.string().min(1).optional(),
+      /** 被连方 OS 登录账号名；见 doc/glossary/peer-mesh.md#建联交换清单 */
+      osUser: external_exports.string().min(1).optional()
     }).strict();
     PERSONAL_CAP_GRANTS = Object.freeze([
       Object.freeze({
@@ -5744,6 +5751,10 @@ var init_contact = __esm({
        * 极端场景（区别对方多个 persona）留 per-persona override 演进空间。
        */
       sshAllowed: external_exports.boolean().default(false),
+      /** 对端设备 SSH identity pubkey（一行 `ssh-ed25519 AAAA... comment`）；见 doc/glossary/peer-mesh.md#建联交换清单 */
+      sshPublicKey: external_exports.string().optional(),
+      /** 对端 OS 登录账号名，SSH 拨号登录名（`<osUser>@127.0.0.1`）；见 doc/glossary/peer-mesh.md#建联交换清单 */
+      osUser: external_exports.string().optional(),
       /**
        * @deprecated T-29 去沙箱后废弃。原为授权访问的目录白名单（clawd-ssh-jail 生成 sbpl/bwrap
        * policy 用）；去掉 OS 沙箱后不再有目录级限制，SSH 授权即 on/off（见 sshAllowed）。
@@ -5790,7 +5801,7 @@ var init_contact = __esm({
 });
 // ../protocol/src/contact-ssh.ts
-var ContactSetSshAccessArgsSchema, ContactSetSshAccessOkSchema, ContactSshKeyIssueArgsSchema, ContactSshKeyIssueOkSchema, ContactSshAccessUpdatedFrameSchema;
+var ContactSetSshAccessArgsSchema, ContactSetSshAccessOkSchema, ContactSshAccessUpdatedFrameSchema;
 var init_contact_ssh = __esm({
   "../protocol/src/contact-ssh.ts"() {
     "use strict";
@@ -5804,14 +5815,6 @@ var init_contact_ssh = __esm({
       deviceId: external_exports.string().min(1),
       sshAllowed: external_exports.boolean()
     }).strict();
-    ContactSshKeyIssueArgsSchema = external_exports.object({
-      deviceId: external_exports.string().min(1)
-    }).strict();
-    ContactSshKeyIssueOkSchema = external_exports.object({
-      type: external_exports.literal("contact:sshKey:issue:ok"),
-      privateKeyPem: external_exports.string().min(1),
-      publicKeyLine: external_exports.string().min(1)
-    }).strict();
     ContactSshAccessUpdatedFrameSchema = external_exports.object({
       type: external_exports.literal("contact:ssh-access-updated"),
       deviceId: external_exports.string().min(1),
@@ -6506,8 +6509,8 @@ var require_req = __commonJS({
       if (req.originalUrl) {
         _req.url = req.originalUrl;
       } else {
-        const path77 = req.path;
-        _req.url = typeof path77 === "string" ? path77 : req.url ? req.url.path || req.url : void 0;
+        const path76 = req.path;
+        _req.url = typeof path76 === "string" ? path76 : req.url ? req.url.path || req.url : void 0;
       }
       if (req.query) {
         _req.query = req.query;
@@ -6672,14 +6675,14 @@ var require_redact = __commonJS({
       }
       return obj;
     }
-    function parsePath(path77) {
+    function parsePath(path76) {
       const parts = [];
       let current = "";
       let inBrackets = false;
       let inQuotes = false;
       let quoteChar = "";
-      for (let i = 0; i < path77.length; i++) {
-        const char = path77[i];
+      for (let i = 0; i < path76.length; i++) {
+        const char = path76[i];
         if (!inBrackets && char === ".") {
           if (current) {
             parts.push(current);
@@ -6810,10 +6813,10 @@ var require_redact = __commonJS({
       return current;
     }
     function redactPaths(obj, paths, censor, remove = false) {
-      for (const path77 of paths) {
-        const parts = parsePath(path77);
+      for (const path76 of paths) {
+        const parts = parsePath(path76);
         if (parts.includes("*")) {
-          redactWildcardPath(obj, parts, censor, path77, remove);
+          redactWildcardPath(obj, parts, censor, path76, remove);
         } else {
           if (remove) {
             removeKey(obj, parts);
@@ -6898,8 +6901,8 @@ var require_redact = __commonJS({
           }
         } else {
           if (afterWildcard.includes("*")) {
-            const wrappedCensor = typeof censor === "function" ? (value, path77) => {
-              const fullPath = [...pathArray.slice(0, pathLength), ...path77];
+            const wrappedCensor = typeof censor === "function" ? (value, path76) => {
+              const fullPath = [...pathArray.slice(0, pathLength), ...path76];
               return censor(value, fullPath);
             } : censor;
             redactWildcardPath(current, afterWildcard, wrappedCensor, originalPath, remove);
@@ -6934,8 +6937,8 @@ var require_redact = __commonJS({
         return null;
       }
       const pathStructure = /* @__PURE__ */ new Map();
-      for (const path77 of pathsToClone) {
-        const parts = parsePath(path77);
+      for (const path76 of pathsToClone) {
+        const parts = parsePath(path76);
         let current = pathStructure;
         for (let i = 0; i < parts.length; i++) {
           const part = parts[i];
@@ -6987,24 +6990,24 @@ var require_redact = __commonJS({
       }
       return cloneSelectively(obj, pathStructure);
     }
-    function validatePath(path77) {
-      if (typeof path77 !== "string") {
+    function validatePath(path76) {
+      if (typeof path76 !== "string") {
         throw new Error("Paths must be (non-empty) strings");
       }
-      if (path77 === "") {
+      if (path76 === "") {
         throw new Error("Invalid redaction path ()");
       }
-      if (path77.includes("..")) {
-        throw new Error(`Invalid redaction path (${path77})`);
+      if (path76.includes("..")) {
+        throw new Error(`Invalid redaction path (${path76})`);
       }
-      if (path77.includes(",")) {
-        throw new Error(`Invalid redaction path (${path77})`);
+      if (path76.includes(",")) {
+        throw new Error(`Invalid redaction path (${path76})`);
       }
       let bracketCount = 0;
       let inQuotes = false;
       let quoteChar = "";
-      for (let i = 0; i < path77.length; i++) {
-        const char = path77[i];
+      for (let i = 0; i < path76.length; i++) {
+        const char = path76[i];
         if ((char === '"' || char === "'") && bracketCount > 0) {
           if (!inQuotes) {
             inQuotes = true;
@@ -7018,20 +7021,20 @@ var require_redact = __commonJS({
         } else if (char === "]" && !inQuotes) {
           bracketCount--;
           if (bracketCount < 0) {
-            throw new Error(`Invalid redaction path (${path77})`);
+            throw new Error(`Invalid redaction path (${path76})`);
           }
         }
       }
       if (bracketCount !== 0) {
-        throw new Error(`Invalid redaction path (${path77})`);
+        throw new Error(`Invalid redaction path (${path76})`);
       }
     }
     function validatePaths(paths) {
       if (!Array.isArray(paths)) {
         throw new TypeError("paths must be an array");
       }
-      for (const path77 of paths) {
-        validatePath(path77);
+      for (const path76 of paths) {
+        validatePath(path76);
       }
     }
     function slowRedact(options = {}) {
@@ -7199,8 +7202,8 @@ var require_redaction = __commonJS({
         if (shape[k2] === null) {
           o[k2] = (value) => topCensor(value, [k2]);
         } else {
-          const wrappedCensor = typeof censor === "function" ? (value, path77) => {
-            return censor(value, [k2, ...path77]);
+          const wrappedCensor = typeof censor === "function" ? (value, path76) => {
+            return censor(value, [k2, ...path76]);
           } : censor;
           o[k2] = Redact({
             paths: shape[k2],
@@ -7418,10 +7421,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 path77 = require("path");
+    var path76 = require("path");
     var sleep2 = require_atomic_sleep();
     var assert = require("assert");
     var BUSY_WRITE_TIMEOUT = 100;
@@ -7475,20 +7478,20 @@ var require_sonic_boom = __commonJS({
       const mode = sonic.mode;
       if (sonic.sync) {
         try {
-          if (sonic.mkdir) fs71.mkdirSync(path77.dirname(file), { recursive: true });
-          const fd = fs71.openSync(file, flags, mode);
+          if (sonic.mkdir) fs70.mkdirSync(path76.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(path77.dirname(file), { recursive: true }, (err) => {
+        fs70.mkdir(path76.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) {
@@ -7529,8 +7532,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;
@@ -7539,15 +7542,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}`);
@@ -7604,7 +7607,7 @@ var require_sonic_boom = __commonJS({
           }
         }
         if (this._fsync) {
-          fs71.fsyncSync(this.fd);
+          fs70.fsyncSync(this.fd);
         }
         const len = this._len;
         if (this._reopening) {
@@ -7718,7 +7721,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);
             });
@@ -7820,7 +7823,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);
             }
@@ -7869,7 +7872,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;
@@ -7885,7 +7888,7 @@ var require_sonic_boom = __commonJS({
         }
       }
       try {
-        fs71.fsyncSync(this.fd);
+        fs70.fsyncSync(this.fd);
       } catch {
       }
     }
@@ -7906,7 +7909,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) {
@@ -7934,13 +7937,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() {
@@ -7949,7 +7952,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);
@@ -7958,7 +7961,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) {
@@ -7974,12 +7977,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();
         }
@@ -11114,11 +11117,11 @@ var init_lib = __esm({
           }
         }
       },
-      addToPath: function addToPath(path77, added, removed, oldPosInc, options) {
-        var last = path77.lastComponent;
+      addToPath: function addToPath(path76, added, removed, oldPosInc, options) {
+        var last = path76.lastComponent;
         if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
           return {
-            oldPos: path77.oldPos + oldPosInc,
+            oldPos: path76.oldPos + oldPosInc,
             lastComponent: {
               count: last.count + 1,
               added,
@@ -11128,7 +11131,7 @@ var init_lib = __esm({
           };
         } else {
           return {
-            oldPos: path77.oldPos + oldPosInc,
+            oldPos: path76.oldPos + oldPosInc,
             lastComponent: {
               count: 1,
               added,
@@ -11633,10 +11636,10 @@ function attachmentToHistoryMessage(o, ts) {
     const memories = raw.map((m2) => {
       if (!m2 || typeof m2 !== "object") return null;
       const rec3 = m2;
-      const path77 = typeof rec3.path === "string" ? rec3.path : null;
+      const path76 = typeof rec3.path === "string" ? rec3.path : null;
       const content = typeof rec3.content === "string" ? rec3.content : null;
-      if (!path77 || content == null) return null;
-      const entry = { path: path77, content };
+      if (!path76 || content == null) return null;
+      const entry = { path: path76, content };
       if (typeof rec3.mtimeMs === "number") entry.mtimeMs = rec3.mtimeMs;
       return entry;
     }).filter((m2) => m2 !== null);
@@ -12439,10 +12442,10 @@ function parseAttachment(obj) {
     const memories = raw.map((m2) => {
       if (!m2 || typeof m2 !== "object") return null;
       const rec3 = m2;
-      const path77 = typeof rec3.path === "string" ? rec3.path : null;
+      const path76 = typeof rec3.path === "string" ? rec3.path : null;
       const content = typeof rec3.content === "string" ? rec3.content : null;
-      if (!path77 || content == null) return null;
-      const out = { path: path77, content };
+      if (!path76 || content == null) return null;
+      const out = { path: path76, content };
       if (typeof rec3.mtimeMs === "number") out.mtimeMs = rec3.mtimeMs;
       return out;
     }).filter((m2) => m2 !== null);
@@ -33428,8 +33431,8 @@ var require_utils = __commonJS({
       var result = transform[inputType][outputType](input);
       return result;
     };
-    exports2.resolve = function(path77) {
-      var parts = path77.split("/");
+    exports2.resolve = function(path76) {
+      var parts = path76.split("/");
       var result = [];
       for (var index = 0; index < parts.length; index++) {
         var part = parts[index];
@@ -39282,18 +39285,18 @@ var require_object = __commonJS({
       var object = new ZipObject(name, zipObjectContent, o);
       this.files[name] = object;
     };
-    var parentFolder = function(path77) {
-      if (path77.slice(-1) === "/") {
-        path77 = path77.substring(0, path77.length - 1);
+    var parentFolder = function(path76) {
+      if (path76.slice(-1) === "/") {
+        path76 = path76.substring(0, path76.length - 1);
       }
-      var lastSlash = path77.lastIndexOf("/");
-      return lastSlash > 0 ? path77.substring(0, lastSlash) : "";
+      var lastSlash = path76.lastIndexOf("/");
+      return lastSlash > 0 ? path76.substring(0, lastSlash) : "";
     };
-    var forceTrailingSlash = function(path77) {
-      if (path77.slice(-1) !== "/") {
-        path77 += "/";
+    var forceTrailingSlash = function(path76) {
+      if (path76.slice(-1) !== "/") {
+        path76 += "/";
       }
-      return path77;
+      return path76;
     };
     var folderAdd = function(name, createFolders) {
       createFolders = typeof createFolders !== "undefined" ? createFolders : defaults.createFolders;
@@ -40295,7 +40298,7 @@ var require_lib3 = __commonJS({
 // src/run-case/recorder.ts
 function startRunCaseRecorder(opts) {
   const now = opts.now ?? Date.now;
-  const dir = import_node_path65.default.dirname(opts.recordPath);
+  const dir = import_node_path64.default.dirname(opts.recordPath);
   let stream = null;
   let closing = false;
   let closedSettled = false;
@@ -40309,8 +40312,8 @@ function startRunCaseRecorder(opts) {
   });
   const ensureStream = () => {
     if (stream) return stream;
-    import_node_fs53.default.mkdirSync(dir, { recursive: true });
-    stream = import_node_fs53.default.createWriteStream(opts.recordPath, { flags: "a" });
+    import_node_fs52.default.mkdirSync(dir, { recursive: true });
+    stream = import_node_fs52.default.createWriteStream(opts.recordPath, { flags: "a" });
     stream.on("close", () => closedResolve());
     return stream;
   };
@@ -40335,12 +40338,12 @@ function startRunCaseRecorder(opts) {
   };
   return { tap, close, closed };
 }
-var import_node_fs53, import_node_path65;
+var import_node_fs52, import_node_path64;
 var init_recorder = __esm({
   "src/run-case/recorder.ts"() {
     "use strict";
-    import_node_fs53 = __toESM(require("fs"), 1);
-    import_node_path65 = __toESM(require("path"), 1);
+    import_node_fs52 = __toESM(require("fs"), 1);
+    import_node_path64 = __toESM(require("path"), 1);
   }
 });
@@ -40383,7 +40386,7 @@ var init_wire = __esm({
 // src/run-case/controller.ts
 async function runController(opts) {
   const now = opts.now ?? Date.now;
-  const cwd = opts.cwd ?? (0, import_node_fs54.mkdtempSync)(import_node_path66.default.join(import_node_os22.default.tmpdir(), "clawd-runcase-"));
+  const cwd = opts.cwd ?? (0, import_node_fs53.mkdtempSync)(import_node_path65.default.join(import_node_os22.default.tmpdir(), "clawd-runcase-"));
   const ownsCwd = opts.cwd === void 0;
   const recorder = startRunCaseRecorder({ recordPath: opts.record, now });
   const spawnCtx = { cwd };
@@ -40544,19 +40547,19 @@ async function runController(opts) {
   if (sigintHandler) process.off("SIGINT", sigintHandler);
   if (ownsCwd) {
     try {
-      (0, import_node_fs54.rmSync)(cwd, { recursive: true, force: true });
+      (0, import_node_fs53.rmSync)(cwd, { recursive: true, force: true });
     } catch {
     }
   }
   return exitCode ?? 0;
 }
-var import_node_fs54, import_node_os22, import_node_path66;
+var import_node_fs53, import_node_os22, import_node_path65;
 var init_controller = __esm({
   "src/run-case/controller.ts"() {
     "use strict";
-    import_node_fs54 = require("fs");
+    import_node_fs53 = require("fs");
     import_node_os22 = __toESM(require("os"), 1);
-    import_node_path66 = __toESM(require("path"), 1);
+    import_node_path65 = __toESM(require("path"), 1);
     init_claude();
     init_stdout_splitter();
     init_permission_stdio();
@@ -40760,8 +40763,12 @@ Options:
 Example:
   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
+      -i ~/.clawd/ssh-identity/id_ed25519 \\
+      <peer-os-user>@127.0.0.1
+  \u767B\u5F55\u540D\u7528\u5BF9\u7AEF\u8D26\u53F7\uFF08Contact.osUser\uFF0C\u5EFA\u8054\u63E1\u624B\u4EA4\u6362\uFF09\u2014\u2014\u4E0D\u662F\u672C\u673A $USER\u3002
+  \u4E24\u673A\u8D26\u53F7\u540D\u4E0D\u540C\u65F6\u7528 $USER \u4F1A Permission denied (publickey)\u3002
+  \u89C1 doc/glossary/peer-mesh.md#\u5EFA\u8054\u4EA4\u6362\u6E05\u5355
 `;
   }
 });
@@ -40950,8 +40957,8 @@ Env (advanced):
 `;
 // src/index.ts
-var import_node_path64 = __toESM(require("path"), 1);
-var import_node_fs52 = __toESM(require("fs"), 1);
+var import_node_path63 = __toESM(require("path"), 1);
+var import_node_fs51 = __toESM(require("fs"), 1);
 var import_node_os21 = __toESM(require("os"), 1);
 // ../node_modules/.pnpm/uuid@10.0.0/node_modules/uuid/dist/esm-node/stringify.js
@@ -41702,7 +41709,7 @@ function composeGuestSandbox(base, userWorkDir, spawnCwd) {
   fsv.allowRead = unionArr(fsv.allowRead, [userWorkDir]);
   fsv.allowWrite = unionArr(fsv.allowWrite, [userWorkDir]);
   fsv.allowRead = unionArr(fsv.allowRead, [
-    "~/.clawd/contact-ssh-keys",
+    "~/.clawd/ssh-identity",
     "~/.clawd/bin",
     "~/Library/Application Support/@clawos/clawd-desktop/ota-bundles",
     "~/.clawd/config.json",
@@ -41978,28 +41985,27 @@ deviceId \u76F4\u63A5\u53D6\u81EA token\uFF0C\u4E0D\u8981\u6539\u5199\u6216\u731
 // src/sshd/contact-ssh-prompt.ts
 var CONTACT_SSH_SYSTEM_PROMPT_HINT = `## \u8DE8\u8BBE\u5907\u6587\u4EF6\u8BBF\u95EE\uFF08Contact SSH\uFF09
-\u7528\u6237\u53EF\u80FD\u6709\u591A\u53F0 clawd \u8BBE\u5907\u4E92\u76F8\u6388\u6743\u3002\u4F60\u5728\u8FD9\u53F0\u673A\u5668\u4E0A\u8BBF\u95EE\u5DF2\u6388\u6743\u5BF9\u7AEF\uFF08\u4E0B\u79F0 A\uFF09\u7684\u65B9\u6CD5\uFF1A
-1. \u5217\u51FA\u53EF\u62E8\u7684\u5BF9\u7AEF deviceId\uFF1A\`ls ~/.clawd/contact-ssh-keys/\`
-   \uFF08\u6BCF\u4E2A \`<deviceId>.ed25519\` \u5C31\u662F\u4E00\u628A privkey\uFF0C\u53BB\u6389\u540E\u7F00\u5C31\u662F deviceId\uFF09
-2. \u7528 SSH \u62E8\u53F7\uFF08\u628A \`<A>\` \u6362\u6210\u5B9E\u9645 deviceId\uFF09\uFF1A
-   \`\`\`bash
-   ssh -o ProxyCommand='~/.clawd/bin/clawd ssh-relay <A>' \\
-       -i ~/.clawd/contact-ssh-keys/<A>.ed25519 \\
-       -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \\
-       $USER@127.0.0.1 <command>
-   # \u4F8B\u5982\uFF1A... $USER@127.0.0.1 cat /Users/xxx/some/file.md
-   #      ... $USER@127.0.0.1 ls -la /Users/xxx/proj
-   # \u8BF4\u660E\uFF1A\`~/.clawd/bin/clawd\` \u662F daemon \u542F\u52A8\u65F6 seed \u7684 shim\uFF0C\u786C\u7F16\u7801\u5F53\u524D daemon \u7684
-   # execPath+cliPath\uFF0C\u4FDD\u8BC1 relay \u8DDF daemon \u7248\u672C\u540C\u6B65\u3002\u4E0D\u8981\u7528\u88F8 \`clawd\`\uFF08\u8D70 $PATH \u4F1A\u6F02\uFF09\u3002
-   \`\`\`
+\u7528\u6237\u53EF\u80FD\u6709\u591A\u53F0 clawd \u8BBE\u5907\u4E92\u76F8\u6388\u6743\u3002\u4F60\u5728\u8FD9\u53F0\u673A\u5668\u4E0A\u8BBF\u95EE\u5DF2\u6388\u6743\u5BF9\u7AEF\uFF08\u4E0B\u79F0 A\uFF0CdeviceId \u7531\u7528\u6237/\u4EFB\u52A1\u4E0A\u4E0B\u6587\u7ED9\u51FA\uFF09\u7684\u65B9\u6CD5\uFF1A
+\u7528 SSH \u62E8\u53F7\uFF08\u628A \`<A>\` \u6362\u6210\u5BF9\u7AEF deviceId\uFF09\uFF1A
+\`\`\`bash
+ssh -o ProxyCommand='~/.clawd/bin/clawd ssh-relay <A>' \\
+    -i ~/.clawd/ssh-identity/id_ed25519 \\
+    -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \\
+    $USER@127.0.0.1 <command>
+# \u4F8B\u5982\uFF1A... $USER@127.0.0.1 cat /Users/xxx/some/file.md
+#      ... $USER@127.0.0.1 ls -la /Users/xxx/proj
+# \u8BF4\u660E\uFF1A\`-i\` \u7528\u672C\u8BBE\u5907\u552F\u4E00\u7684 SSH identity key\uFF08\u6240\u6709\u5BF9\u7AEF\u590D\u7528\u4E00\u628A\uFF09\u3002
+# \`~/.clawd/bin/clawd\` \u662F daemon \u542F\u52A8\u65F6 seed \u7684 shim\uFF0C\u786C\u7F16\u7801\u5F53\u524D daemon \u7684
+# execPath+cliPath\uFF0C\u4FDD\u8BC1 relay \u8DDF daemon \u7248\u672C\u540C\u6B65\u3002\u4E0D\u8981\u7528\u88F8 \`clawd\`\uFF08\u8D70 $PATH \u4F1A\u6F02\uFF09\u3002
+\`\`\`
 **\u4F60\u80FD\u8BBF\u95EE\u4EC0\u4E48**\uFF1A**\u6CA1\u6709\u76EE\u5F55\u7EA7\u9650\u5236**\u2014\u2014\u4F60\u4EE5 A \u673A\u5668\u4E0A\u8BE5 SSH \u7528\u6237\u7684\u6743\u9650\u8BBF\u95EE\u6587\u4EF6\uFF08\u7B49\u540C\u4E8E A \u7ED9\u4F60\u5F00\u4E86\u4E00\u4E2A shell\uFF09\u3002\u8BF7\u53EA\u5728 A \u6388\u6743/\u9700\u8981\u7684\u8303\u56F4\u5185\u64CD\u4F5C\uFF0C\u4E0D\u8981\u8D8A\u754C\u7FFB\u770B\u65E0\u5173\u76EE\u5F55\u3002
 **\u6CE8\u610F**\uFF1A
 - \u6388\u6743\u662F\u5B9E\u65F6\u7684\uFF1AA \u64A4\u9500 sshAllowed \u540E\u4F60\u4E0B\u4E00\u6B21\u62E8\u53F7\u7ACB\u5373\u5931\u6548\uFF08authorized_keys \u7ACB\u5373\u5237\uFF09
+- \u62E8\u53F7\u88AB\u62D2\uFF08Permission denied\uFF09\u901A\u5E38\u662F A \u5C1A\u672A\u6388\u6743\u672C\u8BBE\u5907\uFF0C\u6216\u53CC\u65B9\u8001\u7248\u672C\u5EFA\u8054\u3001A \u7684 contact \u91CC\u6CA1\u6709\u672C\u673A pubkey\uFF08\u4EFB\u4E00\u65B9\u91CD\u65B0 device:connect \u4E00\u6B21\u5373\u8865\uFF09\uFF0C\u5982\u5B9E\u544A\u8BC9\u7528\u6237
 - \u6392\u969C\uFF1A\u672C\u673A debug \u65E5\u5FD7\u5728 \`~/.clawd/log/contact-ssh.log\`\uFF08\u7528\u6237\u53EF \`tail -f\` \u770B\u6BCF\u4E00\u6B65\uFF09\uFF0C\u4F60\u51FA\u9519\u65F6\u544A\u8BC9\u7528\u6237\u67E5\u8FD9\u4E2A\u6587\u4EF6
-- \u5982\u679C \`ls ~/.clawd/contact-ssh-keys/\` \u4E3A\u7A7A\uFF0C\u8BF4\u660E\u8FD8\u6CA1\u6709\u5BF9\u7AEF\u6388\u6743\u4F60\u6216 key \u8FD8\u6CA1\u62C9\u5230\uFF08B \u4FA7 daemon \u6BCF 60s \u4E00\u6B21\u81EA\u52A8\u62C9\uFF09\uFF0C\u5982\u5B9E\u544A\u8BC9\u7528\u6237
 `;
 // src/session/reducer.ts
@@ -46754,8 +46760,8 @@ function turnStartInput(text) {
   const items = [];
   let leftover = text;
   for (const m2 of text.matchAll(SKILL_RE)) {
-    const [marker, name, path77] = m2;
-    items.push({ type: "skill", name, path: path77 });
+    const [marker, name, path76] = m2;
+    items.push({ type: "skill", name, path: path76 });
     leftover = leftover.replace(marker, "");
   }
   for (const m2 of text.matchAll(ATTACHMENT_RE2)) {
@@ -49108,43 +49114,6 @@ async function forwardInboxPostToPeer(args) {
   }
   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");
@@ -49332,13 +49301,13 @@ function mapSkillsListResponse(res) {
       const r = s ?? {};
       const name = str3(r.name);
       if (!name) continue;
-      const path77 = str3(r.path);
+      const path76 = str3(r.path);
       const description = str3(r.description);
       const isPlugin = name.includes(":");
       out.push({
         name,
         source: isPlugin ? "plugin" : "project",
-        ...path77 ? { path: path77 } : {},
+        ...path76 ? { path: path76 } : {},
         ...description ? { description } : {},
         ...isPlugin ? { plugin: name.split(":")[0] } : {}
       });
@@ -50624,7 +50593,12 @@ var AuthGate = class {
       st.pending = true;
       let r;
       try {
-        r = await this.opts.authenticate(parsed.data.token, parsed.data.selfUrl);
+        r = await this.opts.authenticate(
+          parsed.data.token,
+          parsed.data.selfUrl,
+          parsed.data.selfSshPublicKey,
+          parsed.data.selfOsUser
+        );
       } finally {
         st.pending = false;
       }
@@ -51269,7 +51243,11 @@ async function connectRemote(args) {
       // 缺省时省略字段（不发空串），对方 schema selfUrl 是 .min(1).optional()。
       // 决策 #16：身份字段（selfPrincipalId/selfDisplayName/selfDeviceId）已删——
       // 对方从 connect token 签名背书取 deviceId/ownerId/provider，不信自报。
-      ...args.selfUrl ? { selfUrl: args.selfUrl } : {}
+      ...args.selfUrl ? { selfUrl: args.selfUrl } : {},
+      // 建联交换：自报本机 SSH pubkey + OS 账号名；缺省省略字段（不发空串）。
+      // 见 doc/glossary/peer-mesh.md#建联交换清单
+      ...args.selfSshPublicKey ? { selfSshPublicKey: args.selfSshPublicKey } : {},
+      ...args.selfOsUser ? { selfOsUser: args.selfOsUser } : {}
     })
   );
   await new Promise((resolve6, reject) => {
@@ -51344,7 +51322,10 @@ async function connectRemote(args) {
         ownerId: f.owner.ownerId,
         provider: f.owner.provider,
         displayName: f.owner.displayName,
-        grants: f.capability.grants
+        grants: f.capability.grants,
+        // 建联交换：对方老版本不带 → 省略（不落 undefined 占位）。见 …#建联交换清单
+        ...f.sshPublicKey ? { sshPublicKey: f.sshPublicKey } : {},
+        ...f.osUser ? { osUser: f.osUser } : {}
       };
     },
     close: () => {
@@ -51365,6 +51346,9 @@ async function autoReverseContact(args) {
     resource: { ...g2.resource },
     actions: [...g2.actions]
   }));
+  const existing = args.store.get(args.deviceId) ?? void 0;
+  const sshPublicKey = args.sshPublicKey ?? existing?.sshPublicKey;
+  const osUser = args.osUser ?? existing?.osUser;
   const base = {
     deviceId: args.deviceId,
     ownerId: args.ownerId,
@@ -51374,12 +51358,18 @@ async function autoReverseContact(args) {
     connectToken: "",
     grants,
     addedAt: now(),
-    pinnedAt: null,
-    sshAllowed: false,
+    pinnedAt: existing?.pinnedAt ?? null,
+    sshAllowed: existing?.sshAllowed ?? false,
+    // 建联交换：缺省不落 undefined 占位（JSON 持久化干净）。见 …#建联交换清单
+    ...sshPublicKey ? { sshPublicKey } : {},
+    ...osUser ? { osUser } : {},
     exposedDirs: []
   };
   args.store.upsert(base);
   args.broadcast({ type: "contact:added", contact: base });
+  if (base.sshAllowed && sshPublicKey && sshPublicKey !== existing?.sshPublicKey) {
+    args.rebuildAuthorizedKeys?.();
+  }
   if (!args.exchangeToken) return;
   let token;
   try {
@@ -53862,10 +53852,10 @@ function rebuildAuthorizedKeys(store, sshdDir) {
     if (!c.sshAllowed) continue;
     const safe = /^[A-Za-z0-9_.-]+$/.test(c.deviceId);
     if (!safe) continue;
-    const pubkey = readIssuedPubkey(sshdDir, c.deviceId);
-    if (!pubkey) continue;
+    const pubkey = c.sshPublicKey?.trim();
+    if (!pubkey || /[\r\n"]/.test(pubkey)) continue;
     const bin = jailBinPath();
-    lines.push(`command="${bin} ${c.deviceId}",restrict ${pubkey.trim()}`);
+    lines.push(`command="${bin} ${c.deviceId}",restrict ${pubkey}`);
     lines.push(`# contact:${c.deviceId}`);
   }
   const body = lines.join("\n") + "\n";
@@ -53873,25 +53863,59 @@ function rebuildAuthorizedKeys(store, sshdDir) {
   import_node_fs40.default.writeFileSync(tmp, body, { mode: 384 });
   import_node_fs40.default.renameSync(tmp, target);
 }
-function readIssuedPubkey(sshdDir, deviceId) {
-  const safeId = deviceId.replace(/[\/\\]/g, "_");
-  const p2 = import_node_path40.default.join(sshdDir, "keys", `${safeId}.ed25519.pub`);
+// src/sshd/ssh-identity.ts
+var import_node_fs41 = __toESM(require("fs"), 1);
+var import_node_path41 = __toESM(require("path"), 1);
+var import_node_child_process12 = require("child_process");
+var IDENTITY_DIR = "ssh-identity";
+var KEY_FILE = "id_ed25519";
+function identityPaths(dataDir) {
+  const privPath = import_node_path41.default.join(dataDir, IDENTITY_DIR, KEY_FILE);
+  return { privPath, pubPath: `${privPath}.pub` };
+}
+async function ensureSshIdentity(dataDir, opts = {}) {
+  const { privPath, pubPath } = identityPaths(dataDir);
+  import_node_fs41.default.mkdirSync(import_node_path41.default.dirname(privPath), { recursive: true, mode: 448 });
+  if (import_node_fs41.default.existsSync(privPath) && import_node_fs41.default.existsSync(pubPath)) {
+    return { privateKeyPath: privPath, publicKeyLine: import_node_fs41.default.readFileSync(pubPath, "utf8").trim() };
+  }
+  const bin = opts.keygenBin ?? "/usr/bin/ssh-keygen";
+  await new Promise((resolve6, reject) => {
+    const p2 = (opts.spawnImpl ?? import_node_child_process12.spawn)(
+      bin,
+      ["-t", "ed25519", "-f", privPath, "-N", "", "-q", "-C", "clawd-ssh-identity"],
+      { stdio: "ignore" }
+    );
+    p2.on("exit", (code) => code === 0 ? resolve6() : reject(new Error(`ssh-keygen exit ${code}`)));
+    p2.on("error", reject);
+  });
   try {
-    return import_node_fs40.default.readFileSync(p2, "utf8");
+    import_node_fs41.default.chmodSync(privPath, 384);
+  } catch {
+  }
+  try {
+    import_node_fs41.default.chmodSync(pubPath, 420);
+  } catch {
+  }
+  return { privateKeyPath: privPath, publicKeyLine: import_node_fs41.default.readFileSync(pubPath, "utf8").trim() };
+}
+function readSshIdentityPublicKey(dataDir) {
+  try {
+    return import_node_fs41.default.readFileSync(identityPaths(dataDir).pubPath, "utf8").trim();
   } catch {
     return null;
   }
 }
-// src/sshd/contact-key-puller.ts
-var import_node_fs42 = __toESM(require("fs"), 1);
-var import_node_path42 = __toESM(require("path"), 1);
+// src/sshd/ssh-tunnel-relay.ts
+var import_node_net2 = __toESM(require("net"), 1);
 // src/sshd/contact-ssh-log.ts
-var import_node_fs41 = __toESM(require("fs"), 1);
-var import_node_path41 = __toESM(require("path"), 1);
+var import_node_fs42 = __toESM(require("fs"), 1);
+var import_node_path42 = __toESM(require("path"), 1);
 function createContactSshLog(dataDir) {
-  const file = import_node_path41.default.join(dataDir, "log", "contact-ssh.log");
+  const file = import_node_path42.default.join(dataDir, "log", "contact-ssh.log");
   function append(level, tag, message, meta) {
     const time = (/* @__PURE__ */ new Date()).toISOString();
     let line = `[${time}] [${level}] [${tag}] ${message}`;
@@ -53904,8 +53928,8 @@ function createContactSshLog(dataDir) {
     }
     line += "\n";
     try {
-      import_node_fs41.default.mkdirSync(import_node_path41.default.dirname(file), { recursive: true });
-      import_node_fs41.default.appendFileSync(file, line, { mode: 384 });
+      import_node_fs42.default.mkdirSync(import_node_path42.default.dirname(file), { recursive: true });
+      import_node_fs42.default.appendFileSync(file, line, { mode: 384 });
     } catch {
     }
   }
@@ -53924,118 +53948,7 @@ var nullContactSshLog = {
   }
 };
-// src/sshd/contact-key-puller.ts
-var CONTACT_KEYS_DIR = "contact-ssh-keys";
-function safeContactKeyPath(dataDir, deviceId) {
-  const safeId = deviceId.replace(/[\/\\]/g, "_");
-  return import_node_path42.default.join(dataDir, CONTACT_KEYS_DIR, `${safeId}.ed25519`);
-}
-async function pullContactSshKeyOnce(deps) {
-  const forward = deps.forwardImpl ?? ((c) => forwardContactSshKeyIssueToPeer({
-    contact: { remoteUrl: c.remoteUrl, connectToken: c.connectToken },
-    selfDeviceIdForRequest: c.deviceId
-  }));
-  const contacts = deps.store.list().filter((c) => c.connectToken.length > 0);
-  const results = await Promise.all(
-    contacts.map(async (c) => {
-      try {
-        const r = await forward(c);
-        return { contact: c, result: r };
-      } catch (err) {
-        return {
-          contact: c,
-          result: {
-            ok: false,
-            code: "NETWORK",
-            message: err instanceof Error ? err.message : String(err)
-          }
-        };
-      }
-    })
-  );
-  const errors = [];
-  let pulled = 0;
-  const sshLog = deps.sshLog ?? nullContactSshLog;
-  for (const { contact, result } of results) {
-    if (result.ok) {
-      writeKeyFile(deps.dataDir, contact.deviceId, result.privateKeyPem);
-      pulled++;
-      deps.logger?.info("contact-key-puller: pulled", { deviceId: contact.deviceId });
-      sshLog.info("key.pull.success", "B \u4FA7\u4ECE A \u62C9\u5230 privkey \u5E76\u843D\u76D8", {
-        peerDeviceId: contact.deviceId,
-        peerDisplayName: contact.displayName
-      });
-    } else if (result.code === "UNAUTHORIZED" || result.code === "FORBIDDEN") {
-      const hadStale = removeKeyFile(deps.dataDir, contact.deviceId);
-      sshLog.info("key.pull.rejected", "A \u4FA7\u672A\u6388\u6743\u6211 SSH\uFF08\u6B63\u5E38\u72B6\u6001\uFF1B\u8F6E\u8BE2\u7EE7\u7EED\uFF09", {
-        peerDeviceId: contact.deviceId,
-        peerDisplayName: contact.displayName,
-        clearedStalePrivkey: hadStale
-      });
-    } else {
-      errors.push({
-        deviceId: contact.deviceId,
-        code: result.code,
-        message: result.message
-      });
-      deps.logger?.warn("contact-key-puller: pull failed", {
-        deviceId: contact.deviceId,
-        code: result.code,
-        message: result.message
-      });
-      sshLog.warn("key.pull.error", "\u62C9 privkey \u65F6\u7F51\u7EDC/\u534F\u8BAE\u9519\u8BEF", {
-        peerDeviceId: contact.deviceId,
-        code: result.code,
-        message: result.message
-      });
-    }
-  }
-  return { pulled, errors };
-}
-function writeKeyFile(dataDir, deviceId, pem) {
-  const p2 = safeContactKeyPath(dataDir, deviceId);
-  import_node_fs42.default.mkdirSync(import_node_path42.default.dirname(p2), { recursive: true, mode: 448 });
-  import_node_fs42.default.writeFileSync(p2, pem, { mode: 384 });
-}
-function removeKeyFile(dataDir, deviceId) {
-  try {
-    import_node_fs42.default.unlinkSync(safeContactKeyPath(dataDir, deviceId));
-    return true;
-  } catch {
-    return false;
-  }
-}
-var ContactKeyPuller = class {
-  constructor(deps) {
-    this.deps = deps;
-  }
-  deps;
-  timer = null;
-  async start() {
-    const interval = this.deps.intervalMs ?? 6e4;
-    void this.tick();
-    this.timer = setInterval(() => void this.tick(), interval);
-    this.timer.unref();
-  }
-  stop() {
-    if (this.timer) {
-      clearInterval(this.timer);
-      this.timer = null;
-    }
-  }
-  async tick() {
-    try {
-      await pullContactSshKeyOnce(this.deps);
-    } catch (err) {
-      this.deps.logger?.warn("contact-key-puller: tick failed", {
-        err: err instanceof Error ? err.message : String(err)
-      });
-    }
-  }
-};
 // src/sshd/ssh-tunnel-relay.ts
-var import_node_net2 = __toESM(require("net"), 1);
 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";
@@ -54626,9 +54539,9 @@ var CentralClientError = class extends Error {
   code;
   cause;
 };
-async function centralRequest(opts, path77, init) {
+async function centralRequest(opts, path76, init) {
   const f = opts.fetchImpl ?? globalThis.fetch;
-  const url = `${opts.api.replace(/\/+$/, "")}${path77}`;
+  const url = `${opts.api.replace(/\/+$/, "")}${path76}`;
   const ctrl = new AbortController();
   const timer = setTimeout(() => ctrl.abort(), opts.timeoutMs ?? 15e3);
   let res;
@@ -55565,11 +55478,11 @@ init_protocol();
 init_protocol();
 // src/workspace/git.ts
-var import_node_child_process12 = require("child_process");
+var import_node_child_process13 = require("child_process");
 var import_node_fs47 = __toESM(require("fs"), 1);
 var import_node_path48 = __toESM(require("path"), 1);
 var import_node_util = require("util");
-var pexec = (0, import_node_util.promisify)(import_node_child_process12.execFile);
+var pexec = (0, import_node_util.promisify)(import_node_child_process13.execFile);
 function normalizePath(p2) {
   const resolved = import_node_path48.default.resolve(p2);
   try {
@@ -55982,51 +55895,6 @@ function buildContactHandlers(deps) {
 // src/handlers/contact-ssh.ts
 init_protocol();
-// src/sshd/key-issue.ts
-var import_node_fs48 = __toESM(require("fs"), 1);
-var import_node_path49 = __toESM(require("path"), 1);
-var import_node_child_process13 = require("child_process");
-function safeDeviceId(deviceId) {
-  return deviceId.replace(/[\/\\]/g, "_");
-}
-async function issueContactSshKey(deviceId, sshdDir, opts = {}) {
-  const safeId = safeDeviceId(deviceId);
-  const keysDir = import_node_path49.default.join(sshdDir, "keys");
-  import_node_fs48.default.mkdirSync(keysDir, { recursive: true, mode: 448 });
-  const privPath = import_node_path49.default.join(keysDir, `${safeId}.ed25519`);
-  const pubPath = `${privPath}.pub`;
-  if (import_node_fs48.default.existsSync(privPath) && import_node_fs48.default.existsSync(pubPath)) {
-    return {
-      privateKeyPem: import_node_fs48.default.readFileSync(privPath, "utf8"),
-      publicKeyLine: import_node_fs48.default.readFileSync(pubPath, "utf8").trim()
-    };
-  }
-  const bin = opts.keygenBin ?? "/usr/bin/ssh-keygen";
-  await new Promise((resolve6, reject) => {
-    const p2 = (opts.spawnImpl ?? import_node_child_process13.spawn)(
-      bin,
-      ["-t", "ed25519", "-f", privPath, "-N", "", "-q", "-C", `clawd-contact-${safeId}`],
-      { stdio: "ignore" }
-    );
-    p2.on("exit", (code) => code === 0 ? resolve6() : reject(new Error(`ssh-keygen exit ${code}`)));
-    p2.on("error", reject);
-  });
-  try {
-    import_node_fs48.default.chmodSync(privPath, 384);
-  } catch {
-  }
-  try {
-    import_node_fs48.default.chmodSync(pubPath, 420);
-  } catch {
-  }
-  return {
-    privateKeyPem: import_node_fs48.default.readFileSync(privPath, "utf8"),
-    publicKeyLine: import_node_fs48.default.readFileSync(pubPath, "utf8").trim()
-  };
-}
-// src/handlers/contact-ssh.ts
 function ensureOwner2(ctx) {
   if (!ctx || ctx.principal.kind !== "owner") {
     throw new ClawdError(
@@ -56035,15 +55903,6 @@ function ensureOwner2(ctx) {
     );
   }
 }
-function ensureGuest(ctx) {
-  if (!ctx || ctx.principal.kind !== "guest") {
-    throw new ClawdError(
-      ERROR_CODES.UNAUTHORIZED,
-      "UNAUTHORIZED: contact:sshKey:issue requires guest ctx"
-    );
-  }
-  return ctx.principal.id;
-}
 function buildContactSshHandlers(deps) {
   const sshLog = deps.sshLog ?? nullContactSshLog;
   const setSshAccess = async (frame, _client, ctx) => {
@@ -56080,47 +55939,8 @@ function buildContactSshHandlers(deps) {
       }
     };
   };
-  const sshKeyIssue = async (frame, _client, ctx) => {
-    const callerDeviceId = ensureGuest(ctx);
-    const { type: _t, requestId: _r, ...rest } = frame;
-    ContactSshKeyIssueArgsSchema.parse(rest);
-    const contact = deps.store.get(callerDeviceId);
-    if (!contact || !contact.sshAllowed) {
-      sshLog.info(
-        "key.issue.rejected",
-        contact ? "guest \u8BF7\u6C42 SSH key \u4F46 owner \u672A\u6388\u6743" : "guest \u8BF7\u6C42 SSH key \u4F46\u4E0D\u5728\u6211\u7684 contactStore",
-        {
-          peerDeviceId: callerDeviceId,
-          peerDisplayName: contact?.displayName
-        }
-      );
-      throw new ClawdError(
-        ERROR_CODES.UNAUTHORIZED,
-        `UNAUTHORIZED: contact ${callerDeviceId} not authorized for SSH`
-      );
-    }
-    const { privateKeyPem, publicKeyLine } = await issueContactSshKey(callerDeviceId, deps.sshdDir);
-    rebuildAuthorizedKeys(deps.store, deps.sshdDir);
-    sshLog.info(
-      "key.issue.success",
-      "A \u4FA7\u53D1 privkey \u7ED9 guest\uFF08\u5E42\u7B49\uFF09\uFF0Cauthorized_keys \u5DF2\u91CD\u5EFA",
-      {
-        peerDeviceId: callerDeviceId,
-        peerDisplayName: contact.displayName,
-        publicKeyFingerprint: publicKeyLine.slice(0, 32) + "..."
-      }
-    );
-    return {
-      response: {
-        type: "contact:sshKey:issue:ok",
-        privateKeyPem,
-        publicKeyLine
-      }
-    };
-  };
   return {
-    "contact:setSshAccess": setSshAccess,
-    "contact:sshKey:issue": sshKeyIssue
+    "contact:setSshAccess": setSshAccess
   };
 }
@@ -56172,12 +55992,16 @@ function buildWhoamiHandler(deps) {
         grantedPersonas.push({ id: file.personaId, displayName: file.label });
       }
     }
+    const sshPublicKey = deps.sshIdentityPublicKey();
+    const osUser = deps.selfOsUser();
     return {
       response: {
         type: "whoami:ok",
         owner,
         capability,
-        grantedPersonas
+        grantedPersonas,
+        ...sshPublicKey ? { sshPublicKey } : {},
+        ...osUser ? { osUser } : {}
       }
     };
   };
@@ -56253,7 +56077,10 @@ function buildDeviceHandlers(deps) {
         // 自动反向（spec 决策 #11）：自报本机可达地址，让对方反向加我为联系人；
         // 本机无 tunnel → null → connectRemote 省略 selfUrl 字段（不造假数据）。
         // 身份不自报：对方从 token 签名背书取我的 deviceId/ownerId/provider（决策 #16）。
-        selfUrl: deps.selfUrl() ?? void 0
+        selfUrl: deps.selfUrl() ?? void 0,
+        // 建联交换：自报本机 SSH pubkey + OS 账号名；未生成 → 省略。见 …#建联交换清单
+        selfSshPublicKey: deps.selfSshPublicKey() ?? void 0,
+        selfOsUser: deps.selfOsUser() ?? void 0
       });
     } catch (e) {
       throw new ClawdError(
@@ -56263,6 +56090,9 @@ function buildDeviceHandlers(deps) {
     }
     try {
       const wh = await conn.whoami();
+      const existing = deps.store.get(args.deviceId) ?? void 0;
+      const sshPublicKey = wh.sshPublicKey ?? existing?.sshPublicKey;
+      const osUser = wh.osUser ?? existing?.osUser;
       const contact = {
         deviceId: args.deviceId,
         ownerId: wh.ownerId,
@@ -56277,12 +56107,19 @@ function buildDeviceHandlers(deps) {
         connectToken: exchanged.token,
         grants: wh.grants,
         addedAt: now(),
-        pinnedAt: null,
-        sshAllowed: false,
+        pinnedAt: existing?.pinnedAt ?? null,
+        sshAllowed: existing?.sshAllowed ?? false,
+        // 建联交换：对方 whoami:ok 下发的 pubkey / osUser 落库；对方老版本不带 →
+        // 保留既有值 / 不落 undefined 占位。见 doc/glossary/peer-mesh.md#建联交换清单
+        ...sshPublicKey ? { sshPublicKey } : {},
+        ...osUser ? { osUser } : {},
         exposedDirs: []
       };
       deps.store.upsert(contact);
       deps.broadcast({ type: "contact:added", contact });
+      if (contact.sshAllowed && sshPublicKey && sshPublicKey !== existing?.sshPublicKey) {
+        deps.rebuildAuthorizedKeys?.();
+      }
       return {
         response: {
           type: "device:connect:ok",
@@ -56435,7 +56272,7 @@ function buildPersonaHandlers(deps) {
 }
 // src/handlers/attachment.ts
-var import_node_path50 = __toESM(require("path"), 1);
+var import_node_path49 = __toESM(require("path"), 1);
 init_protocol();
 init_protocol();
 var DEFAULT_TTL_SECONDS = 24 * 3600;
@@ -56515,12 +56352,12 @@ function buildAttachmentHandlers(deps) {
         `session ${args.sessionId} scope unresolved`
       );
     }
-    const cwdAbs = import_node_path50.default.resolve(sessionFile.cwd);
-    const candidateAbs = import_node_path50.default.isAbsolute(args.relPath) ? import_node_path50.default.resolve(args.relPath) : import_node_path50.default.resolve(cwdAbs, args.relPath);
+    const cwdAbs = import_node_path49.default.resolve(sessionFile.cwd);
+    const candidateAbs = import_node_path49.default.isAbsolute(args.relPath) ? import_node_path49.default.resolve(args.relPath) : import_node_path49.default.resolve(cwdAbs, args.relPath);
     guardAttachmentPath(ctx, args.sessionId, candidateAbs, "attachment.signUrl", "group-acl");
     const entries = deps.groupFileStore.list(scope, args.sessionId);
     const entry = entries.find((e) => {
-      const storedAbs = import_node_path50.default.isAbsolute(e.relPath) ? import_node_path50.default.resolve(e.relPath) : import_node_path50.default.resolve(cwdAbs, e.relPath);
+      const storedAbs = import_node_path49.default.isAbsolute(e.relPath) ? import_node_path49.default.resolve(e.relPath) : import_node_path49.default.resolve(cwdAbs, e.relPath);
       return storedAbs === candidateAbs && !e.stale;
     });
     if (!entry) {
@@ -56545,7 +56382,7 @@ function buildAttachmentHandlers(deps) {
     if (!ctx || ctx.principal.kind !== "guest" || !deps.personaRoot || !deps.sessionStore) return;
     const f = deps.sessionStore.read(sessionId);
     if (!f) return;
-    assertGuestAttachmentPath(ctx, import_node_path50.default.resolve(f.cwd), deps.personaRoot, method, deps.usersRoot);
+    assertGuestAttachmentPath(ctx, import_node_path49.default.resolve(f.cwd), deps.personaRoot, method, deps.usersRoot);
   }
   const groupAdd = async (frame, _client, ctx) => {
     if (!deps.groupFileStore || !deps.getSessionScope) {
@@ -56560,8 +56397,8 @@ function buildAttachmentHandlers(deps) {
     if (!scope) {
       throw new ClawdError(ERROR_CODES.VALIDATION_ERROR, `session ${args.sessionId} not found`);
     }
-    const cwdAbs = import_node_path50.default.resolve(deps.sessionStore?.read(args.sessionId)?.cwd ?? ".");
-    const candidateAbs = import_node_path50.default.isAbsolute(args.relPath) ? import_node_path50.default.resolve(args.relPath) : import_node_path50.default.resolve(cwdAbs, args.relPath);
+    const cwdAbs = import_node_path49.default.resolve(deps.sessionStore?.read(args.sessionId)?.cwd ?? ".");
+    const candidateAbs = import_node_path49.default.isAbsolute(args.relPath) ? import_node_path49.default.resolve(args.relPath) : import_node_path49.default.resolve(cwdAbs, args.relPath);
     guardAttachmentPath(ctx, args.sessionId, candidateAbs, "attachment.groupAdd", "cwd-subtree");
     const from = ctx?.principal.kind === "owner" ? "owner" : "agent";
     const size = 0;
@@ -56620,19 +56457,19 @@ function buildAttachmentHandlers(deps) {
 // src/handlers/extension.ts
 var import_promises8 = __toESM(require("fs/promises"), 1);
-var import_node_path55 = __toESM(require("path"), 1);
+var import_node_path54 = __toESM(require("path"), 1);
 init_protocol();
 // src/extension/bundle-zip.ts
 var import_promises5 = __toESM(require("fs/promises"), 1);
-var import_node_path51 = __toESM(require("path"), 1);
+var import_node_path50 = __toESM(require("path"), 1);
 var import_node_crypto14 = __toESM(require("crypto"), 1);
 var import_jszip2 = __toESM(require_lib3(), 1);
 async function bundleExtensionDir(dir) {
   const entries = await listFilesSorted(dir);
   const zip = new import_jszip2.default();
   for (const rel of entries) {
-    const abs = import_node_path51.default.join(dir, rel);
+    const abs = import_node_path50.default.join(dir, rel);
     const content = await import_promises5.default.readFile(abs);
     zip.file(rel, content, { date: FIXED_DATE });
   }
@@ -56653,7 +56490,7 @@ async function listFilesSorted(rootDir) {
   return out;
 }
 async function walk(absRoot, relPrefix, out) {
-  const dirAbs = import_node_path51.default.join(absRoot, relPrefix);
+  const dirAbs = import_node_path50.default.join(absRoot, relPrefix);
   const entries = await import_promises5.default.readdir(dirAbs, { withFileTypes: true });
   for (const e of entries) {
     if (IGNORE_BASENAMES.has(e.name)) continue;
@@ -56707,25 +56544,25 @@ function computePublishCheck(args) {
 // src/extension/install-flow.ts
 var import_promises6 = __toESM(require("fs/promises"), 1);
-var import_node_path53 = __toESM(require("path"), 1);
+var import_node_path52 = __toESM(require("path"), 1);
 var import_node_os19 = __toESM(require("os"), 1);
 var import_node_crypto15 = __toESM(require("crypto"), 1);
 var import_jszip3 = __toESM(require_lib3(), 1);
 // src/extension/paths.ts
 var import_node_os18 = __toESM(require("os"), 1);
-var import_node_path52 = __toESM(require("path"), 1);
+var import_node_path51 = __toESM(require("path"), 1);
 function clawdHomeRoot(override) {
-  return override ?? process.env.CLAWD_HOME ?? import_node_path52.default.join(import_node_os18.default.homedir(), ".clawd");
+  return override ?? process.env.CLAWD_HOME ?? import_node_path51.default.join(import_node_os18.default.homedir(), ".clawd");
 }
 function extensionsRoot(override) {
-  return import_node_path52.default.join(clawdHomeRoot(override), "extensions");
+  return import_node_path51.default.join(clawdHomeRoot(override), "extensions");
 }
 function publishedChannelsFile(override) {
-  return import_node_path52.default.join(clawdHomeRoot(override), "extensions-published.json");
+  return import_node_path51.default.join(clawdHomeRoot(override), "extensions-published.json");
 }
 function bundleCacheRoot(override) {
-  return import_node_path52.default.join(clawdHomeRoot(override), "extension-bundles");
+  return import_node_path51.default.join(clawdHomeRoot(override), "extension-bundles");
 }
 // src/extension/install-flow.ts
@@ -56752,7 +56589,7 @@ async function installFromChannel(args, deps) {
     throw new InstallError("ZIP_INVALID", `failed to load zip: ${e.message}`);
   }
   for (const name of Object.keys(zip.files)) {
-    if (name.includes("..") || name.startsWith("/") || import_node_path53.default.isAbsolute(name)) {
+    if (name.includes("..") || name.startsWith("/") || import_node_path52.default.isAbsolute(name)) {
       throw new InstallError("ZIP_INVALID", `unsafe zip entry: ${name}`);
     }
   }
@@ -56784,7 +56621,7 @@ async function installFromChannel(args, deps) {
     );
   }
   const localExtId = namespacedExtId(ownerSlug, channelRef.ownerPrincipalId);
-  const destDir = import_node_path53.default.join(deps.extensionsRoot, localExtId);
+  const destDir = import_node_path52.default.join(deps.extensionsRoot, localExtId);
   let destExists = false;
   try {
     await import_promises6.default.access(destDir);
@@ -56798,16 +56635,16 @@ async function installFromChannel(args, deps) {
     );
   }
   const stage = await import_promises6.default.mkdtemp(
-    import_node_path53.default.join(import_node_os19.default.tmpdir(), `clawd-ext-install-${localExtId}-`)
+    import_node_path52.default.join(import_node_os19.default.tmpdir(), `clawd-ext-install-${localExtId}-`)
   );
   try {
     for (const [name, entry] of Object.entries(zip.files)) {
-      const dest = import_node_path53.default.join(stage, name);
+      const dest = import_node_path52.default.join(stage, name);
       if (entry.dir) {
         await import_promises6.default.mkdir(dest, { recursive: true });
         continue;
       }
-      await import_promises6.default.mkdir(import_node_path53.default.dirname(dest), { recursive: true });
+      await import_promises6.default.mkdir(import_node_path52.default.dirname(dest), { recursive: true });
       if (name === "manifest.json") {
         const rewritten = { ...parsed.data, id: localExtId };
         await import_promises6.default.writeFile(dest, JSON.stringify(rewritten, null, 2));
@@ -56828,7 +56665,7 @@ async function installFromChannel(args, deps) {
 // src/extension/update-flow.ts
 var import_promises7 = __toESM(require("fs/promises"), 1);
-var import_node_path54 = __toESM(require("path"), 1);
+var import_node_path53 = __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);
@@ -56845,11 +56682,11 @@ async function updateFromChannel(args, deps) {
     channelRef.extId,
     channelRef.ownerPrincipalId
   );
-  const liveDir = import_node_path54.default.join(deps.extensionsRoot, localExtId);
+  const liveDir = import_node_path53.default.join(deps.extensionsRoot, localExtId);
   const prevDir = `${liveDir}.prev`;
   let existingVersion;
   try {
-    const raw = await import_promises7.default.readFile(import_node_path54.default.join(liveDir, "manifest.json"), "utf8");
+    const raw = await import_promises7.default.readFile(import_node_path53.default.join(liveDir, "manifest.json"), "utf8");
     const parsed2 = ExtensionManifestSchema.safeParse(JSON.parse(raw));
     if (!parsed2.success) {
       throw new UpdateError(
@@ -56882,7 +56719,7 @@ async function updateFromChannel(args, deps) {
     throw new UpdateError("ZIP_INVALID", `failed to load zip: ${e.message}`);
   }
   for (const name of Object.keys(zip.files)) {
-    if (name.includes("..") || name.startsWith("/") || import_node_path54.default.isAbsolute(name)) {
+    if (name.includes("..") || name.startsWith("/") || import_node_path53.default.isAbsolute(name)) {
       throw new UpdateError("ZIP_INVALID", `unsafe zip entry: ${name}`);
     }
   }
@@ -56917,16 +56754,16 @@ async function updateFromChannel(args, deps) {
   await import_promises7.default.rm(prevDir, { recursive: true, force: true });
   await import_promises7.default.rename(liveDir, prevDir);
   const stage = await import_promises7.default.mkdtemp(
-    import_node_path54.default.join(import_node_os20.default.tmpdir(), `clawd-ext-update-${localExtId}-`)
+    import_node_path53.default.join(import_node_os20.default.tmpdir(), `clawd-ext-update-${localExtId}-`)
   );
   try {
     for (const [name, entry] of Object.entries(zip.files)) {
-      const dest = import_node_path54.default.join(stage, name);
+      const dest = import_node_path53.default.join(stage, name);
       if (entry.dir) {
         await import_promises7.default.mkdir(dest, { recursive: true });
         continue;
       }
-      await import_promises7.default.mkdir(import_node_path54.default.dirname(dest), { recursive: true });
+      await import_promises7.default.mkdir(import_node_path53.default.dirname(dest), { recursive: true });
       if (name === "manifest.json") {
         const rewritten = { ...parsed.data, id: localExtId };
         await import_promises7.default.writeFile(dest, JSON.stringify(rewritten, null, 2));
@@ -57019,7 +56856,7 @@ async function rewriteManifestVersion(root, extId, newVersion, previousPublished
       );
     }
   }
-  const manifestPath = import_node_path55.default.join(root, extId, "manifest.json");
+  const manifestPath = import_node_path54.default.join(root, extId, "manifest.json");
   const manifest = await readManifest(root, extId);
   const next = { ...manifest, version: newVersion };
   const tmp = `${manifestPath}.tmp`;
@@ -57027,7 +56864,7 @@ async function rewriteManifestVersion(root, extId, newVersion, previousPublished
   await import_promises8.default.rename(tmp, manifestPath);
 }
 async function readManifest(root, extId) {
-  const file = import_node_path55.default.join(root, extId, "manifest.json");
+  const file = import_node_path54.default.join(root, extId, "manifest.json");
   let raw;
   try {
     raw = await import_promises8.default.readFile(file, "utf8");
@@ -57118,7 +56955,7 @@ function buildExtensionHandlers(deps) {
   };
   async function buildSnapshotMeta(extId) {
     const manifest = await readManifest(deps.root, extId);
-    const { sha256, buffer } = await bundleExtensionDir(import_node_path55.default.join(deps.root, extId));
+    const { sha256, buffer } = await bundleExtensionDir(import_node_path54.default.join(deps.root, extId));
     return { manifest, contentHash: sha256, buffer };
   }
   const publish = async (frame, _client, ctx) => {
@@ -57299,9 +57136,9 @@ function buildExtensionHandlers(deps) {
 }
 // src/app-builder/project-store.ts
-var import_node_fs49 = require("fs");
+var import_node_fs48 = require("fs");
 var import_node_child_process14 = require("child_process");
-var import_node_path56 = require("path");
+var import_node_path55 = require("path");
 init_protocol();
 var PROJECTS_DIR = "projects";
 var META_FILE = ".clawd-project.json";
@@ -57315,19 +57152,19 @@ var ProjectStore = class {
   root;
   /** projects/<name>/.clawd-project.json 路径 */
   metaPath(name) {
-    return (0, import_node_path56.join)(this.projectsRoot(), name, META_FILE);
+    return (0, import_node_path55.join)(this.projectsRoot(), name, META_FILE);
   }
   /** projects/<name>/ 目录路径（cwd 用） */
   projectDir(name) {
-    return (0, import_node_path56.join)(this.projectsRoot(), name);
+    return (0, import_node_path55.join)(this.projectsRoot(), name);
   }
   projectsRoot() {
-    return (0, import_node_path56.join)(this.root, PROJECTS_DIR);
+    return (0, import_node_path55.join)(this.root, PROJECTS_DIR);
   }
   async list() {
     let entries;
     try {
-      entries = await import_node_fs49.promises.readdir(this.projectsRoot());
+      entries = await import_node_fs48.promises.readdir(this.projectsRoot());
     } catch (err) {
       if (err.code === "ENOENT") return [];
       throw err;
@@ -57335,7 +57172,7 @@ var ProjectStore = class {
     const out = [];
     for (const name of entries) {
       try {
-        const raw = await import_node_fs49.promises.readFile(this.metaPath(name), "utf8");
+        const raw = await import_node_fs48.promises.readFile(this.metaPath(name), "utf8");
         const json = JSON.parse(raw);
         let migrated = false;
         if (typeof json.devCommand !== "string" || json.devCommand.length === 0) {
@@ -57346,7 +57183,7 @@ var ProjectStore = class {
         if (parsed.success) {
           out.push(parsed.data);
           if (migrated) {
-            void import_node_fs49.promises.writeFile(this.metaPath(name), JSON.stringify(parsed.data, null, 2) + "\n", "utf8").catch(() => {
+            void import_node_fs48.promises.writeFile(this.metaPath(name), JSON.stringify(parsed.data, null, 2) + "\n", "utf8").catch(() => {
             });
           }
         }
@@ -57390,8 +57227,8 @@ var ProjectStore = class {
       throw new Error(`invalid name "${name}": ${validated.error.message}`);
     }
     const dir = this.projectDir(name);
-    await import_node_fs49.promises.mkdir(dir, { recursive: true });
-    await import_node_fs49.promises.writeFile(this.metaPath(name), JSON.stringify(meta, null, 2) + "\n", "utf8");
+    await import_node_fs48.promises.mkdir(dir, { recursive: true });
+    await import_node_fs48.promises.writeFile(this.metaPath(name), JSON.stringify(meta, null, 2) + "\n", "utf8");
     return meta;
   }
   /**
@@ -57434,7 +57271,7 @@ var ProjectStore = class {
   }
   async delete(name) {
     const dir = this.projectDir(name);
-    await import_node_fs49.promises.rm(dir, { recursive: true, force: true });
+    await import_node_fs48.promises.rm(dir, { recursive: true, force: true });
   }
   async updatePort(name, newPort) {
     if (newPort < PROJECT_PORT_MIN || newPort > PROJECT_PORT_MAX) {
@@ -57450,7 +57287,7 @@ var ProjectStore = class {
       throw new Error(`port ${newPort} already used / \u5DF2\u88AB project "${conflict.name}" \u5360\u7528`);
     }
     const updated = { ...target, port: newPort };
-    await import_node_fs49.promises.writeFile(this.metaPath(name), JSON.stringify(updated, null, 2) + "\n", "utf8");
+    await import_node_fs48.promises.writeFile(this.metaPath(name), JSON.stringify(updated, null, 2) + "\n", "utf8");
     return updated;
   }
   /**
@@ -57467,7 +57304,7 @@ var ProjectStore = class {
     if (!validated.success) {
       throw new Error(`invalid prodUrl "${url}": ${validated.error.message}`);
     }
-    await import_node_fs49.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
+    await import_node_fs48.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
     return validated.data;
   }
   /**
@@ -57488,7 +57325,7 @@ var ProjectStore = class {
     if (!validated.success) {
       throw new Error(`invalid publishJob: ${validated.error.message}`);
     }
-    await import_node_fs49.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
+    await import_node_fs48.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
     return validated.data;
   }
   /** 清掉 .clawd-project.json.publishJob 字段。其他字段保持原样。 */
@@ -57503,7 +57340,7 @@ var ProjectStore = class {
     if (!validated.success) {
       throw new Error(`failed to clear publishJob: ${validated.error.message}`);
     }
-    await import_node_fs49.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
+    await import_node_fs48.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
     return validated.data;
   }
 };
@@ -57624,8 +57461,8 @@ var PublishJobRegistry = class {
 // src/app-builder/publish-job-runner.ts
 var import_node_child_process16 = require("child_process");
-var import_node_fs50 = require("fs");
-var import_node_path57 = require("path");
+var import_node_fs49 = require("fs");
+var import_node_path56 = require("path");
 // src/app-builder/publish-stage-parser.ts
 var STAGE_RE = /^\s*::stage::(build|deploy|verify)\s*$/;
@@ -57657,10 +57494,10 @@ async function startPublishJob(deps, args) {
     return { jobId: registry2.get(args.name).jobId, status: "already-publishing" };
   }
   const projDir = projectDir(args.name);
-  const logPath = (0, import_node_path57.join)(projDir, ".publish.log");
+  const logPath = (0, import_node_path56.join)(projDir, ".publish.log");
   let logStream = null;
   try {
-    logStream = (0, import_node_fs50.createWriteStream)(logPath, { flags: "w" });
+    logStream = (0, import_node_fs49.createWriteStream)(logPath, { flags: "w" });
   } catch {
     logStream = null;
   }
@@ -57917,8 +57754,8 @@ async function recoverInterruptedJobs(deps) {
 // src/handlers/app-builder.ts
 init_protocol();
-var import_node_path58 = require("path");
-var import_node_fs51 = require("fs");
+var import_node_path57 = require("path");
+var import_node_fs50 = require("fs");
 var APP_BUILDER_PERSONAS = ["persona-app-builder", "persona-dataclaw-builder"];
 var DEV_SERVER_READY_TIMEOUT_MS = 3e4;
 async function recoverInterruptedPublishJobs(store, logger) {
@@ -57999,7 +57836,7 @@ function buildAppBuilderHandlers(deps) {
   async function listAllUsersProjects() {
     if (!deps.usersRoot || !deps.getStore) return [];
     const getStore = deps.getStore;
-    const userIds = await import_node_fs51.promises.readdir(deps.usersRoot).catch(() => []);
+    const userIds = await import_node_fs50.promises.readdir(deps.usersRoot).catch(() => []);
     const perUser = await Promise.all(
       userIds.map((uid) => getStore(uid).list().catch(() => []))
     );
@@ -58075,8 +57912,8 @@ function buildAppBuilderHandlers(deps) {
     const project = await userStore.create(f.name, reservedPorts);
     try {
       const personaRoot = deps.resolvePersonaRoot ? deps.resolvePersonaRoot(session.ownerPersonaId ?? "") : deps.personaRoot;
-      const templateSrcDir = (0, import_node_path58.join)(personaRoot, "extension-kit", "examples", DEFAULT_TEMPLATE);
-      const scaffoldScript = (0, import_node_path58.join)(deps.deployKitRoot, "scripts", "new-extension.sh");
+      const templateSrcDir = (0, import_node_path57.join)(personaRoot, "extension-kit", "examples", DEFAULT_TEMPLATE);
+      const scaffoldScript = (0, import_node_path57.join)(deps.deployKitRoot, "scripts", "new-extension.sh");
       const scaffoldResult = await userStore.scaffold(project.name, templateSrcDir, scaffoldScript);
       deps.logger?.info("app-builder.scaffold.done", {
         name: project.name,
@@ -58297,7 +58134,7 @@ function buildAppBuilderHandlers(deps) {
       await userStore.clearPublishJob(args.name);
     }
     const personaRoot = deps.resolvePersonaRoot ? deps.resolvePersonaRoot(boundSession.ownerPersonaId ?? "") : deps.personaRoot;
-    const scriptPath = (0, import_node_path58.join)(deps.deployKitRoot, "scripts", "publish.sh");
+    const scriptPath = (0, import_node_path57.join)(deps.deployKitRoot, "scripts", "publish.sh");
     deps.logger?.info("app-builder.publish.start", {
       name: args.name,
       sessionId: boundSession.sessionId,
@@ -58473,7 +58310,7 @@ function buildVisitorHandlers(deps) {
 // src/extension/registry.ts
 var import_promises9 = __toESM(require("fs/promises"), 1);
-var import_node_path59 = __toESM(require("path"), 1);
+var import_node_path58 = __toESM(require("path"), 1);
 async function loadAll(root) {
   let entries;
   try {
@@ -58486,13 +58323,13 @@ async function loadAll(root) {
   for (const ent of entries) {
     if (!ent.isDirectory()) continue;
     if (ent.name.startsWith(".")) continue;
-    records.push(await loadOne(import_node_path59.default.join(root, ent.name), ent.name));
+    records.push(await loadOne(import_node_path58.default.join(root, ent.name), ent.name));
   }
   records.sort((a, b2) => a.extId < b2.extId ? -1 : a.extId > b2.extId ? 1 : 0);
   return records;
 }
 async function loadOne(dir, dirName) {
-  const manifestPath = import_node_path59.default.join(dir, "manifest.json");
+  const manifestPath = import_node_path58.default.join(dir, "manifest.json");
   let raw;
   try {
     raw = await import_promises9.default.readFile(manifestPath, "utf8");
@@ -58537,7 +58374,7 @@ async function loadOne(dir, dirName) {
 // src/extension/uninstall.ts
 var import_promises10 = __toESM(require("fs/promises"), 1);
-var import_node_path60 = __toESM(require("path"), 1);
+var import_node_path59 = __toESM(require("path"), 1);
 var UninstallError = class extends Error {
   constructor(code, message) {
     super(message);
@@ -58546,7 +58383,7 @@ var UninstallError = class extends Error {
   code;
 };
 async function uninstall(deps) {
-  const dir = import_node_path60.default.join(deps.root, deps.extId);
+  const dir = import_node_path59.default.join(deps.root, deps.extId);
   try {
     await import_promises10.default.access(dir);
   } catch {
@@ -58613,7 +58450,9 @@ function buildMethodHandlers(deps) {
       ownerId: deps.ownerId,
       ownerProvider: deps.ownerProvider,
       personaStore: deps.personaStore,
-      capabilityManager: deps.capabilityManager
+      capabilityManager: deps.capabilityManager,
+      sshIdentityPublicKey: deps.sshIdentityPublicKey,
+      selfOsUser: deps.selfOsUser
     }),
     ...buildFeishuAuthHandlers(deps.feishuAuth),
     ...buildDeviceHandlers(deps.feishuDevice),
@@ -58946,11 +58785,8 @@ var METHOD_GRANT_MAP = {
   "contact:pin": ADMIN_ANY,
   "contact:remove": ADMIN_ANY,
   // contact:setSshAccess (owner UI 配 SSH 授权)：ADMIN_ANY
-  // contact:sshKey:issue (guest daemon 拉自己的 privkey)：public — handler 内校
-  // ctx.principal.kind==='guest' + store.get(callerId).sshAllowed
   //   (对齐 inbox:postMessage 的"能连上=有 auth，业务在 handler 校"模式)
   "contact:setSshAccess": ADMIN_ANY,
-  "contact:sshKey:issue": { kind: "public" },
   // ---- visitor:* (访客名单，owner-only) ----
   // owner 看完整访客名单（含没开会话的）；guest 不可调（handler 内再 assertOwner 兜底）。
   "visitor:list": ADMIN_ANY,
@@ -59136,7 +58972,7 @@ async function dispatchRpc(method, frame, client, ctx, deps) {
 // src/extension/runtime.ts
 var import_node_child_process18 = require("child_process");
-var import_node_path61 = __toESM(require("path"), 1);
+var import_node_path60 = __toESM(require("path"), 1);
 var import_promises11 = require("timers/promises");
 // src/extension/port-allocator.ts
@@ -59237,7 +59073,7 @@ var Runtime = class {
       /\$CLAWOS_EXT_PORT/g,
       String(port)
     );
-    const dir = import_node_path61.default.join(this.root, extId);
+    const dir = import_node_path60.default.join(this.root, extId);
     const env = {
       ...process.env,
       CLAWOS_EXT_PORT: String(port),
@@ -59349,7 +59185,7 @@ ${handle.stderrTail}`
 // src/extension/published-channels.ts
 var import_promises12 = __toESM(require("fs/promises"), 1);
-var import_node_path62 = __toESM(require("path"), 1);
+var import_node_path61 = __toESM(require("path"), 1);
 init_zod();
 var PublishedChannelsError = class extends Error {
   constructor(code, message) {
@@ -59448,7 +59284,7 @@ var PublishedChannelStore = class {
       )
     };
     const tmp = `${this.filePath}.tmp`;
-    await import_promises12.default.mkdir(import_node_path62.default.dirname(this.filePath), { recursive: true });
+    await import_promises12.default.mkdir(import_node_path61.default.dirname(this.filePath), { recursive: true });
     await import_promises12.default.writeFile(tmp, JSON.stringify(data, null, 2), { mode: 384 });
     await import_promises12.default.rename(tmp, this.filePath);
   }
@@ -59456,7 +59292,7 @@ var PublishedChannelStore = class {
 // src/extension/bundle-cache.ts
 var import_promises13 = __toESM(require("fs/promises"), 1);
-var import_node_path63 = __toESM(require("path"), 1);
+var import_node_path62 = __toESM(require("path"), 1);
 var BundleCache = class {
   constructor(rootDir) {
     this.rootDir = rootDir;
@@ -59465,14 +59301,14 @@ var BundleCache = class {
   /** Atomic write: stage tmp → rename. Caller passes the hex sha256. */
   async write(snapshotHash, buffer) {
     await import_promises13.default.mkdir(this.rootDir, { recursive: true });
-    const file = import_node_path63.default.join(this.rootDir, `${snapshotHash}.zip`);
+    const file = import_node_path62.default.join(this.rootDir, `${snapshotHash}.zip`);
     const tmp = `${file}.tmp`;
     await import_promises13.default.writeFile(tmp, buffer, { mode: 384 });
     await import_promises13.default.rename(tmp, file);
   }
   /** Returns the bundle bytes, or null when the file doesn't exist. */
   async read(snapshotHash) {
-    const file = import_node_path63.default.join(this.rootDir, `${snapshotHash}.zip`);
+    const file = import_node_path62.default.join(this.rootDir, `${snapshotHash}.zip`);
     try {
       return await import_promises13.default.readFile(file);
     } catch (e) {
@@ -59482,13 +59318,20 @@ var BundleCache = class {
   }
   /** Idempotent — missing file is not an error. */
   async delete(snapshotHash) {
-    const file = import_node_path63.default.join(this.rootDir, `${snapshotHash}.zip`);
+    const file = import_node_path62.default.join(this.rootDir, `${snapshotHash}.zip`);
     await import_promises13.default.rm(file, { force: true });
   }
 };
 // src/index.ts
 var import_meta6 = {};
+function currentOsUser() {
+  try {
+    return import_node_os21.default.userInfo().username;
+  } catch {
+    return "";
+  }
+}
 async function startDaemon(config) {
   const authFile = loadOrCreateAuthFile({ dataDir: config.dataDir });
   const logShippingCfg = config.logShipping ?? { endpoint: null, sampling: {}, mode: "off" };
@@ -59505,24 +59348,24 @@ async function startDaemon(config) {
     sampling: logShippingCfg.sampling,
     homeDir: import_node_os21.default.homedir()
   });
-  const logDir = import_node_path64.default.join(config.dataDir, "log");
-  import_node_fs52.default.mkdirSync(logDir, { recursive: true });
+  const logDir = import_node_path63.default.join(config.dataDir, "log");
+  import_node_fs51.default.mkdirSync(logDir, { recursive: true });
   const logger = createLogger({
     level: config.logLevel,
-    file: import_node_path64.default.join(logDir, "clawd.log"),
+    file: import_node_path63.default.join(logDir, "clawd.log"),
     logClient
   });
   logger.info("starting clawd", { version, config: { port: config.port, host: config.host, dataDir: config.dataDir } });
   const screenIdleProbeLogger = createFileOnlyLogger({
-    file: import_node_path64.default.join(logDir, "screen-idle-probe.log"),
+    file: import_node_path63.default.join(logDir, "screen-idle-probe.log"),
     level: "debug"
   });
   logger.info("screen-idle probe logger enabled", {
-    file: import_node_path64.default.join(logDir, "screen-idle-probe.log")
+    file: import_node_path63.default.join(logDir, "screen-idle-probe.log")
   });
   const CAP_TARGETS = [
-    import_node_path64.default.join(logDir, "clawd.log"),
-    import_node_path64.default.join(logDir, "screen-idle-probe.log")
+    import_node_path63.default.join(logDir, "clawd.log"),
+    import_node_path63.default.join(logDir, "screen-idle-probe.log")
   ];
   const LOG_CAP_MAX_BYTES = 10 * 1024 * 1024;
   const LOG_CAP_KEEP_BYTES = 5 * 1024 * 1024;
@@ -59618,7 +59461,7 @@ async function startDaemon(config) {
     // Task 1.7：authenticate 注入路径替代 expectedToken 单 token 比对。
     // owner 路径 constantTimeEqual 防侧信道；guest 路径走 capabilityRegistry.
     expectedToken: resolvedAuthToken,
-    authenticate: async (t, selfUrl) => {
+    authenticate: async (t, selfUrl, selfSshPublicKey, selfOsUser) => {
       const result = await authenticate(t, buildConnectAuthDeps());
       if (result.ok && result.context.principal.kind === "guest") {
         void autoReverseContact({
@@ -59629,6 +59472,11 @@ async function startDaemon(config) {
           provider: result.context.provider ?? "",
           displayName: result.context.principal.displayName ?? result.context.principal.id,
           selfUrl,
+          // 建联交换：guest auth 帧自报的 pubkey / osUser 落 contact；pubkey 变化且已授权时
+          // 立即重建 authorized_keys（重新握手 = 迁移路径）。见 …#建联交换清单
+          sshPublicKey: selfSshPublicKey,
+          osUser: selfOsUser,
+          rebuildAuthorizedKeys: () => rebuildAuthorizedKeys(contactStore, import_node_path63.default.join(config.dataDir, "sshd")),
           // 决策 #16 换票补全：用 owner 当前 jwt 换 aud=对方设备 的票（本机主动连对方用）。
           // 现读 ownerIdentityStore（热切换后用新身份）；失败 → null → 保持空票。
           exchangeToken: async (targetDeviceId) => {
@@ -59676,8 +59524,8 @@ async function startDaemon(config) {
   const agents = new AgentsScanner();
   const history = new ClaudeHistoryReader();
   let transport = null;
-  const personaStore = new PersonaStore(import_node_path64.default.join(config.dataDir, "personas"));
-  const usersRoot = import_node_path64.default.join(config.dataDir, "users");
+  const personaStore = new PersonaStore(import_node_path63.default.join(config.dataDir, "personas"));
+  const usersRoot = import_node_path63.default.join(config.dataDir, "users");
   const defaultsRoot = findDefaultsRoot(logger);
   if (defaultsRoot) {
     seedDefaultPersonas({ store: personaStore, defaultsRoot, logger });
@@ -59697,17 +59545,17 @@ async function startDaemon(config) {
   migrateCodexSandbox({ store: personaStore, logger });
   const groupFileStore = new GroupFileStore({ dataDir: config.dataDir, logger });
   const personaDispatchManager = new PersonaDispatchManager({ genId: () => v4_default() });
-  const here = typeof __dirname === "string" ? __dirname : import_node_path64.default.dirname((0, import_node_url4.fileURLToPath)(import_meta6.url));
+  const here = typeof __dirname === "string" ? __dirname : import_node_path63.default.dirname((0, import_node_url4.fileURLToPath)(import_meta6.url));
   const mcpConfigs = [];
   const dispatchServerCandidates = [
-    import_node_path64.default.join(here, "dispatch", "mcp-server.cjs"),
+    import_node_path63.default.join(here, "dispatch", "mcp-server.cjs"),
     // 生产 dist/index → dist/dispatch/mcp-server.cjs
-    import_node_path64.default.join(here, "..", "dist", "dispatch", "mcp-server.cjs")
+    import_node_path63.default.join(here, "..", "dist", "dispatch", "mcp-server.cjs")
     // dev tsx src/index → ../dist/dispatch/mcp-server.cjs
   ];
-  const dispatchServerScriptPath = dispatchServerCandidates.find((p2) => import_node_fs52.default.existsSync(p2));
+  const dispatchServerScriptPath = dispatchServerCandidates.find((p2) => import_node_fs51.default.existsSync(p2));
   if (dispatchServerScriptPath) {
-    const dispatchLogPath = import_node_path64.default.join(logDir, "dispatch-mcp-server.log");
+    const dispatchLogPath = import_node_path63.default.join(logDir, "dispatch-mcp-server.log");
     const dispatchCfgPath = writeDispatchMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: dispatchServerScriptPath,
@@ -59725,12 +59573,12 @@ async function startDaemon(config) {
     });
   }
   const ticketServerCandidates = [
-    import_node_path64.default.join(here, "ticket", "mcp-server.cjs"),
-    import_node_path64.default.join(here, "..", "dist", "ticket", "mcp-server.cjs")
+    import_node_path63.default.join(here, "ticket", "mcp-server.cjs"),
+    import_node_path63.default.join(here, "..", "dist", "ticket", "mcp-server.cjs")
   ];
-  const ticketServerScriptPath = ticketServerCandidates.find((p2) => import_node_fs52.default.existsSync(p2));
+  const ticketServerScriptPath = ticketServerCandidates.find((p2) => import_node_fs51.default.existsSync(p2));
   if (ticketServerScriptPath) {
-    const ticketLogPath = import_node_path64.default.join(logDir, "ticket-mcp-server.log");
+    const ticketLogPath = import_node_path63.default.join(logDir, "ticket-mcp-server.log");
     const ticketCfgPath = writeTicketMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: ticketServerScriptPath,
@@ -59750,12 +59598,12 @@ async function startDaemon(config) {
     });
   }
   const shiftServerCandidates = [
-    import_node_path64.default.join(here, "shift", "mcp-server.cjs"),
-    import_node_path64.default.join(here, "..", "dist", "shift", "mcp-server.cjs")
+    import_node_path63.default.join(here, "shift", "mcp-server.cjs"),
+    import_node_path63.default.join(here, "..", "dist", "shift", "mcp-server.cjs")
   ];
-  const shiftServerScriptPath = shiftServerCandidates.find((p2) => import_node_fs52.default.existsSync(p2));
+  const shiftServerScriptPath = shiftServerCandidates.find((p2) => import_node_fs51.default.existsSync(p2));
   if (shiftServerScriptPath) {
-    const shiftLogPath = import_node_path64.default.join(logDir, "shift-mcp-server.log");
+    const shiftLogPath = import_node_path63.default.join(logDir, "shift-mcp-server.log");
     const shiftCfgPath = await writeShiftMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: shiftServerScriptPath,
@@ -59774,12 +59622,12 @@ async function startDaemon(config) {
     );
   }
   const inboxServerCandidates = [
-    import_node_path64.default.join(here, "inbox", "mcp-server.cjs"),
-    import_node_path64.default.join(here, "..", "dist", "inbox", "mcp-server.cjs")
+    import_node_path63.default.join(here, "inbox", "mcp-server.cjs"),
+    import_node_path63.default.join(here, "..", "dist", "inbox", "mcp-server.cjs")
   ];
-  const inboxServerScriptPath = inboxServerCandidates.find((p2) => import_node_fs52.default.existsSync(p2));
+  const inboxServerScriptPath = inboxServerCandidates.find((p2) => import_node_fs51.default.existsSync(p2));
   if (inboxServerScriptPath) {
-    const inboxLogPath = import_node_path64.default.join(logDir, "inbox-mcp-server.log");
+    const inboxLogPath = import_node_path63.default.join(logDir, "inbox-mcp-server.log");
     const inboxCfgPath = await writeInboxMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: inboxServerScriptPath,
@@ -59798,7 +59646,7 @@ async function startDaemon(config) {
     );
   }
   const shiftStore = createShiftStore({
-    filePath: import_node_path64.default.join(config.dataDir, "shift.json"),
+    filePath: import_node_path63.default.join(config.dataDir, "shift.json"),
     ownerIdProvider: () => ownerPrincipalId,
     now: () => Date.now()
   });
@@ -59820,7 +59668,7 @@ async function startDaemon(config) {
     getAdapter,
     historyReader: history,
     dataDir: config.dataDir,
-    personaRoot: import_node_path64.default.join(config.dataDir, "personas"),
+    personaRoot: import_node_path63.default.join(config.dataDir, "personas"),
     usersRoot,
     personaStore,
     ownerDisplayName,
@@ -59858,10 +59706,10 @@ async function startDaemon(config) {
     // 文件可能 agent 写完又被自己删（罕见），用 size=0 / fallback mime 兜底。
     attachmentGroup: {
       onFileEdit: (input) => {
-        const absPath = import_node_path64.default.isAbsolute(input.relPath) ? input.relPath : import_node_path64.default.join(input.cwd, input.relPath);
+        const absPath = import_node_path63.default.isAbsolute(input.relPath) ? input.relPath : import_node_path63.default.join(input.cwd, input.relPath);
         let size = 0;
         try {
-          size = import_node_fs52.default.statSync(absPath).size;
+          size = import_node_fs51.default.statSync(absPath).size;
         } catch (err) {
           logger.warn("attachment.onFileEdit stat failed", {
             sessionId: input.sessionId,
@@ -60048,6 +59896,13 @@ async function startDaemon(config) {
     /* @__PURE__ */ new Set([...config.previewPorts ?? [], ...appBuilderPortRange])
   );
   const sshLog = createContactSshLog(config.dataDir);
+  try {
+    await ensureSshIdentity(config.dataDir);
+  } catch (e) {
+    logger.warn("ssh-identity generate failed; contact SSH pubkey exchange disabled", {
+      err: e.message
+    });
+  }
   const makeHandlers = () => buildMethodHandlers({
     manager,
     workspace,
@@ -60091,11 +59946,11 @@ async function startDaemon(config) {
       // 'persona/<pid>/owner'，default 走 'default'。
       getSessionScope: (sid) => manager.findOwnedSessionScope(sid),
       // guest path guard：candidate 必须在 personaRoot 子树或调用者自己的 user-dir 下
-      personaRoot: import_node_path64.default.join(config.dataDir, "personas"),
+      personaRoot: import_node_path63.default.join(config.dataDir, "personas"),
       usersRoot
     },
     // workspace/git/history/skills/agents handler 共用的 guest path guard 锚点
-    personaRoot: import_node_path64.default.join(config.dataDir, "personas"),
+    personaRoot: import_node_path63.default.join(config.dataDir, "personas"),
     // v2 多人 persona 隔离：handler 派生 guest user-dir 放行
     usersRoot,
     // capability:list / delete handler 依赖
@@ -60108,6 +59963,11 @@ async function startDaemon(config) {
     ownerFeishuUnionId,
     ownerId,
     ownerProvider,
+    // ssh identity 互换（spec 2026-07-15）：whoami:ok 下发本机 identity pubkey。
+    // 惰性读盘，不依赖 ensureSshIdentity 完成时序（未生成 → null → 帧省略字段）。
+    sshIdentityPublicKey: () => readSshIdentityPublicKey(config.dataDir),
+    // 建联交换：whoami:ok 下发本机 OS 账号名（拨号登录名）。见 doc/glossary/peer-mesh.md#建联交换清单
+    selfOsUser: currentOsUser,
     personaStore,
     // capability handler 也用 (capability:issue 走 registry / capability:list)
     capabilityRegistry,
@@ -60119,7 +59979,7 @@ async function startDaemon(config) {
     contactStore,
     // <dataDir>/sshd 绝对路径 —— contact-ssh handlers 用它拼 authorized_keys / keys/ 子路径
     // Task 10 会加 SshdManager 起 sshd；handlers wire 提前挂 sshdDir 让 typecheck 过
-    sshdDir: import_node_path64.default.join(config.dataDir, "sshd"),
+    sshdDir: import_node_path63.default.join(config.dataDir, "sshd"),
     contactSshLog: sshLog,
     // inbox:sendDm 用：sessionId → session 出身（复用 attachment 同款 findOwnedSessionScope）
     getSessionScope: (sid) => manager.findOwnedSessionScope(sid),
@@ -60187,7 +60047,13 @@ async function startDaemon(config) {
       // 自动反向（spec 决策 #11）：本机可达地址 = tunnel URL（公网），出站连接时
       // 透传让对方反向加我为联系人。无 tunnel（仅本机 ws）→ null，对方不自动反向（不造假数据）。
       // 决策 #16：身份不自报——本机 deviceId/ownerId/provider 由 exchange 签进 token 背书。
-      selfUrl: () => currentTunnelUrl
+      selfUrl: () => currentTunnelUrl,
+      // ssh identity 互换（spec 2026-07-15）：出站 auth 帧自报本机 identity pubkey；
+      // 对方 pubkey 变化且已授权时立即重建 authorized_keys（重新 connect = 迁移路径）
+      selfSshPublicKey: () => readSshIdentityPublicKey(config.dataDir),
+      // 建联交换：出站自报本机 OS 账号名。见 doc/glossary/peer-mesh.md#建联交换清单
+      selfOsUser: currentOsUser,
+      rebuildAuthorizedKeys: () => rebuildAuthorizedKeys(contactStore, import_node_path63.default.join(config.dataDir, "sshd"))
     },
     // app-builder
     appBuilderStore,
@@ -60210,11 +60076,11 @@ async function startDaemon(config) {
     // 发布上线脚手架化 (spec 2026-06-03 §5.2):
     // appBuilderPersonaRoot 用于拼 publish.sh 绝对路径（persona-app-builder 安装在
     // dataDir/personas/persona-app-builder 之下，extension-kit/scripts/publish.sh 是相对路径）。
-    appBuilderPersonaRoot: import_node_path64.default.join(config.dataDir, "personas", "persona-app-builder"),
+    appBuilderPersonaRoot: import_node_path63.default.join(config.dataDir, "personas", "persona-app-builder"),
     // 共享 deploy-kit 根：scaffold/publish 脚本骨架 + 阿里云凭证单一真源。
-    deployKitRoot: import_node_path64.default.join(config.dataDir, "deploy-kit"),
+    deployKitRoot: import_node_path63.default.join(config.dataDir, "deploy-kit"),
     // scaffold/publish 按当前 session 的 persona 解析其安装根，让每个 persona 用自己的模板/注入配置。
-    resolvePersonaRoot: (personaId) => import_node_path64.default.join(config.dataDir, "personas", personaId),
+    resolvePersonaRoot: (personaId) => import_node_path63.default.join(config.dataDir, "personas", personaId),
     // 发布上线脚手架化 (spec 2026-06-03 §5.2.2):
     // 复用 SessionManagerDeps.broadcastFrame 同款 dispatch 逻辑 —— runner 调 manager.send
     // 取回 broadcast 帧后逐帧 push 到 transport，跟 manager 自身的 deps 一致。
@@ -60257,7 +60123,7 @@ async function startDaemon(config) {
       }
       let sourceJsonlPath = "(no transcript yet \u2014 operate from the task description alone)";
       if (sourceFile && sourceFile.toolSessionId) {
-        sourceJsonlPath = import_node_path64.default.join(
+        sourceJsonlPath = import_node_path63.default.join(
           import_node_os21.default.homedir(),
           ".claude",
           "projects",
@@ -60617,8 +60483,8 @@ async function startDaemon(config) {
       const lines = [
         `Tunnel:      ${r.url}`,
         ...resolvedAuthToken ? [`Connect:     ${connectUrl}`] : [],
-        `Frpc config: ${import_node_path64.default.join(config.dataDir, "frpc.toml")}`,
-        `Frpc log:    ${import_node_path64.default.join(logDir, "frpc.log")}`
+        `Frpc config: ${import_node_path63.default.join(config.dataDir, "frpc.toml")}`,
+        `Frpc log:    ${import_node_path63.default.join(logDir, "frpc.log")}`
       ];
       const width = Math.max(...lines.map((l) => l.length));
       const bar = "\u2550".repeat(width + 4);
@@ -60631,8 +60497,8 @@ ${bar}
 `);
       try {
-        const connectPath = import_node_path64.default.join(config.dataDir, "connect.txt");
-        import_node_fs52.default.writeFileSync(connectPath, lines.join("\n") + "\n", { mode: 384 });
+        const connectPath = import_node_path63.default.join(config.dataDir, "connect.txt");
+        import_node_fs51.default.writeFileSync(connectPath, lines.join("\n") + "\n", { mode: 384 });
       } catch {
       }
     } catch (err) {
@@ -60668,21 +60534,13 @@ ${bar}
   });
   try {
     await sshdMgr.start();
-    rebuildAuthorizedKeys(contactStore, import_node_path64.default.join(config.dataDir, "sshd"));
+    rebuildAuthorizedKeys(contactStore, import_node_path63.default.join(config.dataDir, "sshd"));
     logger.info("sshd: contact-ssh sandbox ready", { port: config.sshdPort });
   } catch (err) {
     logger.warn("sshd start failed; contact SSH grant will not work until fixed", {
       err: err.message
     });
   }
-  const contactKeyPuller = new ContactKeyPuller({
-    store: contactStore,
-    dataDir: config.dataDir,
-    logger,
-    intervalMs: 6e4,
-    sshLog
-  });
-  void contactKeyPuller.start();
   void reportDevice();
   void fetchServerKey();
   const tickAttachmentGc = () => {
@@ -60717,7 +60575,6 @@ ${bar}
     if (tunnelMgr) {
       await tunnelMgr.stop();
     }
-    contactKeyPuller.stop();
     await sshdMgr.stop().catch((err) => {
       logger.warn("shutdown.sshd-stop-failed", {
         error: err instanceof Error ? err.message : String(err)
@@ -60736,9 +60593,9 @@ ${bar}
   };
 }
 function migrateDropPersonsDir(dataDir) {
-  const dir = import_node_path64.default.join(dataDir, "persons");
+  const dir = import_node_path63.default.join(dataDir, "persons");
   try {
-    import_node_fs52.default.rmSync(dir, { recursive: true, force: true });
+    import_node_fs51.default.rmSync(dir, { recursive: true, force: true });
   } catch {
   }
 }