@clawos-dev/clawd 0.2.531 → 0.2.532

package/dist/cli.cjs

@@ -67443,7 +67443,8 @@ function loadOrCreateAuthFile(opts) {
       token: existing.token,
       ownerPrincipalId: existing.ownerPrincipalId,
       deviceId: existing.deviceId,
-      createdAt: existing.createdAt ?? (/* @__PURE__ */ new Date(0)).toISOString()
+      createdAt: existing.createdAt ?? (/* @__PURE__ */ new Date(0)).toISOString(),
+      ...existing.tunnelDeviceKey ? { tunnelDeviceKey: existing.tunnelDeviceKey } : {}
     };
   }
   const token = existing?.token || generate();
@@ -67451,9 +67452,17 @@ function loadOrCreateAuthFile(opts) {
   const deviceId = ownerPrincipalId;
   const createdAt = existing?.createdAt || now().toISOString();
   const next = { token, ownerPrincipalId, deviceId, createdAt };
+  if (existing?.tunnelDeviceKey) next.tunnelDeviceKey = existing.tunnelDeviceKey;
   writeAuthFile(file, next);
   return next;
 }
+function loadOrCreateTunnelDeviceKey(opts) {
+  const current = loadOrCreateAuthFile(opts);
+  if (current.tunnelDeviceKey) return current.tunnelDeviceKey;
+  const tunnelDeviceKey = opts.derive();
+  writeAuthFile(authFilePath(opts.dataDir), { ...current, tunnelDeviceKey });
+  return tunnelDeviceKey;
+}
 function defaultGenerateToken() {
   return import_node_crypto15.default.randomBytes(32).toString("base64url");
 }
@@ -67472,6 +67481,7 @@ function readAuthFile(file) {
       ownerPrincipalId: typeof parsed.ownerPrincipalId === "string" && parsed.ownerPrincipalId.length > 0 ? parsed.ownerPrincipalId : void 0,
       deviceId: typeof parsed.deviceId === "string" && parsed.deviceId.length > 0 ? parsed.deviceId : void 0,
       createdAt: typeof parsed.createdAt === "string" ? parsed.createdAt : void 0,
+      tunnelDeviceKey: typeof parsed.tunnelDeviceKey === "string" && parsed.tunnelDeviceKey.length > 0 ? parsed.tunnelDeviceKey : void 0,
       // 单 secret 合并前的旧字段：出现即触发清理写回（值无所谓，硬切不再使用）
       hasLegacySecrets: "signSecret" in parsed || "visitorTokenSecret" in parsed
     };
@@ -67806,22 +67816,51 @@ var lastPeers = [];
 function getCachedOrgPeers() {
   return lastPeers;
 }
+function sameOrigin(a2, b3) {
+  const oa2 = toOrigin(a2);
+  const ob = toOrigin(b3);
+  return oa2 != null && ob != null ? oa2 === ob : a2 === b3;
+}
+function toOrigin(raw) {
+  const http2 = raw.replace(/^wss:\/\//i, "https://").replace(/^ws:\/\//i, "http://");
+  try {
+    const origin = new URL(http2).origin;
+    return origin === "null" ? null : origin;
+  } catch {
+    return null;
+  }
+}
 async function syncOrgMesh(deps) {
   const peers = await deps.fetchPeers();
   lastPeers = peers;
   if (peers.length === 0) {
     deps.log("org-mesh: \u4E0D\u5728\u4EFB\u4F55\u7EC4\u7EC7\uFF08\u6216\u7EC4\u91CC\u53EA\u6709\u81EA\u5DF1\uFF09\uFF0C\u8DF3\u8FC7");
     deps.onProgress?.({ total: 0, done: 0, connected: 0, failed: 0, active: false });
-    return { peers: 0, attempted: 0, connected: 0, failed: 0 };
+    return { peers: 0, attempted: 0, connected: 0, failed: 0, refreshed: 0 };
   }
   const targets = [];
+  let refreshed = 0;
   for (const p3 of peers) {
     for (const d2 of p3.devices) {
-      if (deps.store.get(d2.deviceId)) continue;
-      targets.push({ deviceId: d2.deviceId, displayName: p3.displayName });
+      const existing = deps.store.get(d2.deviceId);
+      if (!existing) {
+        targets.push({ deviceId: d2.deviceId, displayName: p3.displayName });
+        continue;
+      }
+      if (d2.url == null || sameOrigin(existing.remoteUrl, d2.url)) continue;
+      const updated = { ...existing, remoteUrl: d2.url };
+      deps.store.upsert(updated);
+      refreshed += 1;
+      deps.log("org-mesh: \u8054\u7CFB\u4EBA\u5730\u5740\u5DF2\u5237\u65B0", {
+        deviceId: d2.deviceId,
+        name: p3.displayName,
+        from: existing.remoteUrl,
+        to: d2.url
+      });
+      deps.onContactUpdated?.(updated);
     }
   }
-  deps.log("org-mesh: \u5F00\u59CB\u540C\u6B65", { peers: peers.length, targets: targets.length });
+  deps.log("org-mesh: \u5F00\u59CB\u540C\u6B65", { peers: peers.length, targets: targets.length, refreshed });
   let connected = 0;
   let failed = 0;
   deps.onProgress?.({
@@ -67852,8 +67891,14 @@ async function syncOrgMesh(deps) {
       active: connected + failed < targets.length
     });
   }
-  deps.log("org-mesh: \u540C\u6B65\u5B8C\u6210", { peers: peers.length, attempted: targets.length, connected, failed });
-  return { peers: peers.length, attempted: targets.length, connected, failed };
+  deps.log("org-mesh: \u540C\u6B65\u5B8C\u6210", {
+    peers: peers.length,
+    attempted: targets.length,
+    connected,
+    failed,
+    refreshed
+  });
+  return { peers: peers.length, attempted: targets.length, connected, failed, refreshed };
 }
 
 // src/handlers/device.ts
@@ -70370,7 +70415,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.531".length > 0 ? "0.2.531" : "dev";
+var version = "0.2.532".length > 0 ? "0.2.532" : "dev";
 
 // src/cli-probe/probe.ts
 var fs77 = __toESM(require("fs"), 1);
@@ -73728,7 +73773,10 @@ async function startDaemon(config) {
         connectToDevice: createConnectToDevice(feishuDeviceDeps),
         log: (msg, meta) => logger.info(msg, meta),
         // 进度上报：串行建联 20+ 台要几十秒，UI 靠这个帧渲染进度条
-        onProgress: (progress) => wsServer?.broadcastToOwners({ type: "org-mesh:progress", ...progress })
+        onProgress: (progress) => wsServer?.broadcastToOwners({ type: "org-mesh:progress", ...progress }),
+        // 已有联系人的地址被中心最新 url 刷新 → 复用 contact:added（UI reducer 按 deviceId upsert，
+        // auto-reverse 重握手也发这一帧），不新增帧
+        onContactUpdated: (contact) => wsServer?.broadcastToOwners({ type: "contact:added", contact })
       });
     } catch (err) {
       logger.warn("org-mesh sync failed (best-effort)", { err: err.message });
@@ -74479,7 +74527,12 @@ async function startDaemon(config) {
     tunnelMgr = new TunnelManager({
       dataDir: config.dataDir,
       clawosApi: config.clawosApi,
-      deviceKey: deriveStableDeviceKey({ dataDir: config.dataDir }),
+      // 子域指纹落盘于 auth.json，首次缺失才由 hostname+uid 算初值——改电脑名不再换对外地址
+      // （design 2026-09-16-tunnel-address-stability §3.1）
+      deviceKey: loadOrCreateTunnelDeviceKey({
+        dataDir: config.dataDir,
+        derive: () => deriveStableDeviceKey({ dataDir: config.dataDir })
+      }),
       frpcBinaryOverride: config.frpcBinary,
       noPersist: config.noTunnelPersist,
       logger,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.531",
+  "version": "0.2.532",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",