@clawos-dev/clawd 0.2.237 → 0.2.239

package/dist/cli.cjs

@@ -50506,7 +50506,10 @@ var EXPOSED_RPC_METHODS = [
   // 查当前 turn caller —— cc 长驻 + owner/guest 交替驱动同一 session 时不能靠启动时 env
   // 写死身份，必须运行时 fetch。header X-Clawd-Session-Id 作 session 定位，handler 内查
   // manager.tryGetState(sid).currentTurnSender 返 SenderInfo | null。
-  "session.currentTurnSender"
+  "session.currentTurnSender",
+  // 建联交换（T-32）：本机 cc 拨号前查对端 osUser 拼 `<osUser>@127.0.0.1`。窄读——handler
+  // 只返 deviceId / displayName / osUser（无 connectToken 等敏感字段），见 handlers/contact.ts dialInfo。
+  "contact.dialInfo"
 ];
 async function handleRpcRequest(input) {
   const { method, body, sessionId, dispatcher } = input;
@@ -53594,17 +53597,46 @@ function ensureJailScript(dataDir) {
 // src/sshd/clawd-shim.ts
 var import_node_fs38 = __toESM(require("fs"), 1);
 var import_node_path38 = __toESM(require("path"), 1);
+var DEFAULT_FALLBACK_APPS = ["/Applications/Clawd.app", "$HOME/Applications/Clawd.app"];
 function shellQuote(s) {
   return `'${s.replace(/'/g, "'\\''")}'`;
 }
-function buildClawdShim(execPath, cliPath) {
+function fallbackWord(app) {
+  if (app.startsWith("$HOME/")) return `"$HOME"/${shellQuote(app.slice("$HOME/".length))}`;
+  return shellQuote(app);
+}
+function buildClawdShim(execPath, cliPath, fallbackApps = DEFAULT_FALLBACK_APPS) {
+  const candidates = fallbackApps.map(fallbackWord).join(" ");
   return `#!/usr/bin/env bash
 # clawd shim (managed by clawd; do not edit)
 #
-# \u786C\u7F16\u7801\u672C daemon \u542F\u52A8\u65F6\u7528\u7684 execPath + cliPath\uFF1Bdaemon \u91CD\u542F\u4F1A\u8986\u5199\u672C\u6587\u4EF6\uFF08\u5E42\u7B49 seed\uFF09\u3002
-# guest CC \u7528 SSH ProxyCommand \u8D70 ~/.clawd/bin/clawd ssh-relay \u65F6\u4F1A\u547D\u4E2D\u672C shim\uFF0C\u4FDD\u8BC1
-# relay \u4E8C\u8FDB\u5236\u8DDF\u5F53\u524D\u8DD1\u7740\u7684 daemon \u540C\u6E90\u540C\u7248\u672C\u3002
-exec ${shellQuote(execPath)} ${shellQuote(cliPath)} "$@"
+# primary = seed \u672C\u6587\u4EF6\u7684 daemon \u7684 execPath + cliPath\uFF1Bdaemon \u91CD\u542F\u4F1A\u8986\u5199\u672C\u6587\u4EF6\uFF08\u5E42\u7B49 seed\uFF09\u3002
+# primary \u5931\u6548\uFF08npx \u7F13\u5B58 GC / OTA bundle GC / app \u79FB\u52A8\uFF09\u65F6\u56DE\u9000 installer \u81EA\u5E26 CLI\uFF1B
+# \u5168\u706D\u7ED9\u53EF\u8BFB\u9519\u8BEF\u3002guest CC \u7528 SSH ProxyCommand \u8D70 ~/.clawd/bin/clawd ssh-relay \u65F6\u547D\u4E2D\u672C shim\u3002
+#
+# ELECTRON_RUN_AS_NODE \u663E\u5F0F\u5BFC\u51FA\uFF1Aprimary/fallback \u90FD\u53EF\u80FD\u662F Electron \u4E8C\u8FDB\u5236\uFF08plain node \u5FFD\u7565
+# \u8BE5\u53D8\u91CF\uFF0C\u65E0\u5BB3\uFF09\u2014\u2014\u4E0D\u518D\u4F9D\u8D56 desktop \u73AF\u5883\u53D8\u91CF\u6070\u597D\u6CC4\u6F0F\u5230 CC \u5B50\u8FDB\u7A0B\u3002
+export ELECTRON_RUN_AS_NODE=1
+EXEC=${shellQuote(execPath)}
+CLI=${shellQuote(cliPath)}
+if [ ! -x "$EXEC" ] || [ ! -f "$CLI" ]; then
+  for APP in ${candidates}; do
+    FCLI="$APP/Contents/Resources/daemon/dist/cli.cjs"
+    [ -f "$FCLI" ] || continue
+    for FEXE in "$APP"/Contents/MacOS/*; do
+      if [ -f "$FEXE" ] && [ -x "$FEXE" ]; then
+        EXEC="$FEXE"
+        CLI="$FCLI"
+        break 2
+      fi
+    done
+  done
+fi
+if [ ! -x "$EXEC" ] || [ ! -f "$CLI" ]; then
+  echo "clawd shim: daemon CLI not found ($CLI); \u91CD\u542F clawd daemon \u53EF\u91CD\u65B0\u751F\u6210\u672C\u6587\u4EF6" >&2
+  exit 127
+fi
+exec "$EXEC" "$CLI" "$@"
 `;
 }
 function ensureClawdShim(dataDir, execPath, cliPath) {
@@ -55845,6 +55877,18 @@ function buildContactHandlers(deps) {
       }
     };
   };
+  const dialInfo = async () => {
+    return {
+      response: {
+        type: "contact:dialInfo:ok",
+        contacts: deps.store.list().map((c) => ({
+          deviceId: c.deviceId,
+          displayName: c.displayName,
+          ...c.osUser ? { osUser: c.osUser } : {}
+        }))
+      }
+    };
+  };
   const pin = async (frame, _client, ctx) => {
     ensureOwner(ctx);
     const { type: _t, requestId: _r, ...rest } = frame;
@@ -55888,6 +55932,7 @@ function buildContactHandlers(deps) {
   };
   return {
     "contact:list": list,
+    "contact:dialInfo": dialInfo,
     "contact:pin": pin,
     "contact:remove": remove
   };

package/package.json

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