@clawos-dev/clawd 0.2.425 → 0.2.427

package/dist/cli.cjs

@@ -59787,11 +59787,6 @@ var LoginFlow = class {
       ttcTokenExpiresAt: Number.isFinite(expiresAtNum) ? expiresAtNum : null,
       loginAt: new Date(now).toISOString()
     });
-    void this.deps.syncOrgMesh?.().catch((err) => {
-      this.deps.logWarn?.("org-mesh: \u767B\u5F55\u540E\u540C\u6B65\u5931\u8D25\uFF08\u4E0D\u5F71\u54CD\u767B\u5F55\uFF09", {
-        error: err instanceof Error ? err.message : String(err)
-      });
-    });
     return { ok: true, identity };
   }
   gcExpired(now) {
@@ -60063,6 +60058,7 @@ async function syncOrgMesh(deps) {
   const peers = await deps.fetchPeers();
   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 };
   }
   const targets = [];
@@ -60075,6 +60071,13 @@ async function syncOrgMesh(deps) {
   deps.log("org-mesh: \u5F00\u59CB\u540C\u6B65", { peers: peers.length, targets: targets.length });
   let connected = 0;
   let failed = 0;
+  deps.onProgress?.({
+    total: targets.length,
+    done: 0,
+    connected: 0,
+    failed: 0,
+    active: targets.length > 0
+  });
   for (const t of targets) {
     try {
       await deps.connectToDevice({ deviceId: t.deviceId, name: t.displayName });
@@ -60088,6 +60091,13 @@ async function syncOrgMesh(deps) {
         reason: e.message
       });
     }
+    deps.onProgress?.({
+      total: targets.length,
+      done: connected + failed,
+      connected,
+      failed,
+      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 };
@@ -62485,7 +62495,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.425".length > 0 ? "0.2.425" : "dev";
+var version = "0.2.427".length > 0 ? "0.2.427" : "dev";
 
 // src/cli-probe/probe.ts
 var fs65 = __toESM(require("fs"), 1);
@@ -66968,6 +66978,32 @@ async function startDaemon(config) {
       logger.warn("device register failed (best-effort)", { err: err.message });
     }
   };
+  let orgMeshInFlight = false;
+  const runOrgMesh = async () => {
+    if (!feishuActive || orgMeshInFlight) return;
+    const record3 = ownerIdentityStore.read();
+    if (!record3) return;
+    orgMeshInFlight = true;
+    try {
+      await syncOrgMesh({
+        store: contactStore,
+        fetchPeers: () => fetchOrgPeers({
+          apiUrl: config.clawosApi ?? DEFAULT_CLAWOS_API,
+          apiKey: resolveClawdTicketsApiKey(),
+          deviceId: authFile.deviceId,
+          displayName: record3.identity.displayName || authFile.deviceId
+        }),
+        connectToDevice: createConnectToDevice(feishuDeviceDeps),
+        log: (msg, meta) => logger.info(msg, meta),
+        // 进度上报：串行建联 20+ 台要几十秒，UI 靠这个帧渲染进度条
+        onProgress: (progress) => wsServer?.broadcastToOwners({ type: "org-mesh:progress", ...progress })
+      });
+    } catch (err) {
+      logger.warn("org-mesh sync failed (best-effort)", { err: err.message });
+    } finally {
+      orgMeshInFlight = false;
+    }
+  };
   const fetchServerKey = async () => {
     if (!feishuActive) return;
     try {
@@ -67049,23 +67085,7 @@ async function startDaemon(config) {
         });
         throw err;
       }
-    },
-    // org auto-mesh（spec 2026-08-31）：登录成功后自动跟同组织的人建联。
-    // 不进 fail-hard 链——login-flow 内部 void + catch，组网失败不拖垮登录。
-    syncOrgMesh: () => syncOrgMesh({
-      store: contactStore,
-      fetchPeers: () => fetchOrgPeers({
-        apiUrl: config.clawosApi ?? DEFAULT_CLAWOS_API,
-        apiKey: resolveClawdTicketsApiKey(),
-        deviceId: authFile.deviceId,
-        displayName: ownerIdentityStore.read()?.identity.displayName ?? authFile.deviceId
-      }),
-      connectToDevice: createConnectToDevice(feishuDeviceDeps),
-      log: (msg, meta) => logger.info(msg, meta)
-    }),
-    // 组网整体失败（拉清单挂了）的出口：走 logger 才进 SLS——
-    // "自动组网悄悄没发生"正是要靠日志排查的场景，console.warn 只有 stdout。
-    logWarn: (msg, meta) => logger.warn(msg, meta)
+    }
   });
   const visitorStore = createVisitorStore({ dir: config.dataDir });
   const exchangeVisitorToken = buildVisitorLogin({
@@ -67572,6 +67592,7 @@ async function startDaemon(config) {
           setImmediate(() => wsServer?.closeAllClients());
           void reportDevice();
           void fetchServerKey();
+          void runOrgMesh();
         } else {
           logger.warn("feishu-login failed", {
             reason: result.reason,
@@ -67778,6 +67799,7 @@ ${bar}
   }
   void reportDevice();
   void fetchServerKey();
+  void runOrgMesh();
   const tickAttachmentGc = () => {
     try {
       runAttachmentGc({