@clawos-dev/clawd 0.2.203-beta.406.d63010a → 0.2.203-beta.407.bb42013

package/dist/cli.cjs

@@ -40324,6 +40324,49 @@ var require_lib3 = __commonJS({
   }
 });
 
+// src/sshd/contact-ssh-log.ts
+function createContactSshLog(dataDir) {
+  const file = import_node_path40.default.join(dataDir, "contact-ssh.log");
+  function append(level, tag, message, meta) {
+    const time = (/* @__PURE__ */ new Date()).toISOString();
+    let line = `[${time}] [${level}] [${tag}] ${message}`;
+    if (meta && Object.keys(meta).length > 0) {
+      try {
+        line += " " + JSON.stringify(meta);
+      } catch {
+        line += " [meta-serialize-failed]";
+      }
+    }
+    line += "\n";
+    try {
+      import_node_fs39.default.mkdirSync(import_node_path40.default.dirname(file), { recursive: true });
+      import_node_fs39.default.appendFileSync(file, line, { mode: 384 });
+    } catch {
+    }
+  }
+  return {
+    info: (tag, message, meta) => append("INFO", tag, message, meta),
+    warn: (tag, message, meta) => append("WARN", tag, message, meta),
+    error: (tag, message, meta) => append("ERROR", tag, message, meta)
+  };
+}
+var import_node_fs39, import_node_path40, nullContactSshLog;
+var init_contact_ssh_log = __esm({
+  "src/sshd/contact-ssh-log.ts"() {
+    "use strict";
+    import_node_fs39 = __toESM(require("fs"), 1);
+    import_node_path40 = __toESM(require("path"), 1);
+    nullContactSshLog = {
+      info: () => {
+      },
+      warn: () => {
+      },
+      error: () => {
+      }
+    };
+  }
+});
+
 // src/run-case/recorder.ts
 function startRunCaseRecorder(opts) {
   const now = opts.now ?? Date.now;
@@ -40700,13 +40743,22 @@ async function sshRelay(argv) {
     return 2;
   }
   const dataDir = args.dataDir ?? import_node_path66.default.join(import_node_os23.default.homedir(), ".clawd");
+  const sshLog = createContactSshLog(dataDir);
   const contact = findContact(dataDir, args.peerDeviceId);
   if (!contact) {
+    sshLog.error("relay.contact-not-found", "ssh-relay \u627E\u4E0D\u5230 peer contact", {
+      peerDeviceId: args.peerDeviceId,
+      contactsPath: import_node_path66.default.join(dataDir, "contacts.json")
+    });
     process.stderr.write(`clawd ssh-relay: contact ${args.peerDeviceId} not found in ${dataDir}/contacts.json
 `);
     return 2;
   }
   if (!contact.connectToken) {
+    sshLog.error("relay.token-missing", "contact \u6709\u8BB0\u5F55\u4F46\u7F3A connectToken\uFF08auto-reverse \u672A\u6362\u7968\uFF09", {
+      peerDeviceId: args.peerDeviceId,
+      peerDisplayName: contact.displayName
+    });
     process.stderr.write(
       `clawd ssh-relay: contact ${args.peerDeviceId} has no connectToken (auto-reverse \u672A\u6362\u7968)
 `
@@ -40716,6 +40768,11 @@ async function sshRelay(argv) {
   const baseHttp = wsUrlToHttp(contact.remoteUrl).replace(/\/+$/, "");
   const wsBase = baseHttp.replace(/^http:/, "ws:").replace(/^https:/, "wss:");
   const url = `${wsBase}/rpc/ssh-tunnel`;
+  sshLog.info("relay.dial", "\u5F00\u59CB\u62E8 A \u4FA7 /rpc/ssh-tunnel", {
+    peerDeviceId: args.peerDeviceId,
+    peerDisplayName: contact.displayName,
+    url
+  });
   return new Promise((resolve6) => {
     const ws = new import_websocket.default(url, {
       headers: {
@@ -40735,6 +40792,9 @@ async function sshRelay(argv) {
       resolve6(exitCode);
     };
     ws.on("open", () => {
+      sshLog.info("relay.dial-open", "ws open\uFF0C\u8FDB\u5165 stdio \u2194 ws \u4E2D\u7EE7", {
+        peerDeviceId: args.peerDeviceId
+      });
       process.stdin.on("data", (chunk) => {
         if (ws.readyState === ws.OPEN) {
           ws.send(chunk, { binary: true });
@@ -40759,9 +40819,25 @@ async function sshRelay(argv) {
       }
     });
     ws.on("close", (code) => {
+      if (code === 1e3) {
+        sshLog.info("relay.dial-close", "ws \u6B63\u5E38\u5173\u95ED", {
+          peerDeviceId: args.peerDeviceId,
+          code
+        });
+      } else {
+        sshLog.warn("relay.dial-close-abnormal", "ws \u975E\u6B63\u5E38\u5173\u95ED\uFF08A \u4FA7\u62D2 auth / \u7F51\u7EDC\u65AD / peer \u5D29\uFF09", {
+          peerDeviceId: args.peerDeviceId,
+          code
+        });
+      }
       settle(code === 1e3 ? 0 : 1);
     });
     ws.on("error", (err) => {
+      sshLog.error("relay.dial-error", "ws \u8FDE\u63A5\u9519\u8BEF\uFF08peer \u4E0D\u53EF\u8FBE / \u7AEF\u53E3\u4E0D\u901A / TLS \u5931\u8D25\uFF09", {
+        peerDeviceId: args.peerDeviceId,
+        url,
+        message: err.message
+      });
       process.stderr.write(`clawd ssh-relay: ws error ${err.message}
 `);
       settle(1);
@@ -40824,6 +40900,7 @@ var init_sshd_cli_relay = __esm({
     init_wrapper();
     init_src();
     init_peer_forward();
+    init_contact_ssh_log();
     SSH_RELAY_HELP = `clawd ssh-relay <peer-device-id> [options]
 
 WebSocket relay to a peer daemon's /rpc/ssh-tunnel, exposing raw SSH bytes on
@@ -53528,45 +53605,7 @@ function readIssuedPubkey(sshdDir, deviceId) {
 var import_node_fs40 = __toESM(require("fs"), 1);
 var import_node_path41 = __toESM(require("path"), 1);
 init_peer_forward();
-
-// src/sshd/contact-ssh-log.ts
-var import_node_fs39 = __toESM(require("fs"), 1);
-var import_node_path40 = __toESM(require("path"), 1);
-function createContactSshLog(dataDir) {
-  const file = import_node_path40.default.join(dataDir, "contact-ssh.log");
-  function append(level, tag, message, meta) {
-    const time = (/* @__PURE__ */ new Date()).toISOString();
-    let line = `[${time}] [${level}] [${tag}] ${message}`;
-    if (meta && Object.keys(meta).length > 0) {
-      try {
-        line += " " + JSON.stringify(meta);
-      } catch {
-        line += " [meta-serialize-failed]";
-      }
-    }
-    line += "\n";
-    try {
-      import_node_fs39.default.mkdirSync(import_node_path40.default.dirname(file), { recursive: true });
-      import_node_fs39.default.appendFileSync(file, line, { mode: 384 });
-    } catch {
-    }
-  }
-  return {
-    info: (tag, message, meta) => append("INFO", tag, message, meta),
-    warn: (tag, message, meta) => append("WARN", tag, message, meta),
-    error: (tag, message, meta) => append("ERROR", tag, message, meta)
-  };
-}
-var nullContactSshLog = {
-  info: () => {
-  },
-  warn: () => {
-  },
-  error: () => {
-  }
-};
-
-// src/sshd/contact-key-puller.ts
+init_contact_ssh_log();
 var CONTACT_KEYS_DIR = "contact-ssh-keys";
 function safeContactKeyPath(dataDir, deviceId) {
   const safeId = deviceId.replace(/[\/\\]/g, "_");
@@ -53678,6 +53717,7 @@ var ContactKeyPuller = class {
 
 // src/sshd/ssh-tunnel-relay.ts
 var import_node_net2 = __toESM(require("net"), 1);
+init_contact_ssh_log();
 async function handleSshTunnelUpgrade(req, socket, head, deps) {
   const sshLog = deps.sshLog ?? nullContactSshLog;
   const clientAddr = (req.socket && "remoteAddress" in req.socket ? req.socket.remoteAddress : null) ?? "unknown";
@@ -53785,6 +53825,9 @@ function pumpWsToSshd(ws, deps, clientAddr) {
   });
 }
 
+// src/index.ts
+init_contact_ssh_log();
+
 // src/tunnel/device-key.ts
 var import_node_os14 = __toESM(require("os"), 1);
 var import_node_path42 = __toESM(require("path"), 1);
@@ -55399,6 +55442,7 @@ async function issueContactSshKey(deviceId, sshdDir, opts = {}) {
 }
 
 // src/handlers/contact-ssh.ts
+init_contact_ssh_log();
 function ensureOwner2(ctx) {
   if (!ctx || ctx.principal.kind !== "owner") {
     throw new ClawdError(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.203-beta.406.d63010a",
+  "version": "0.2.203-beta.407.bb42013",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",