echoclaw-relay-agent 0.1.2 → 0.2.0

package/dist/main.js

@@ -203,6 +203,80 @@ async function forwardToBridge(bridgeUrl, request) {
   }
 }
 
+// src/service/session.ts
+var import_fs = __toESM(require("fs"));
+var import_path = __toESM(require("path"));
+var import_crypto = require("crypto");
+var CONFIG_DIR = import_path.default.join(
+  process.env.HOME || process.env.USERPROFILE || ".",
+  ".echoclaw-relay"
+);
+var SESSION_FILE = import_path.default.join(CONFIG_DIR, "session.json");
+function ensureDir() {
+  if (!import_fs.default.existsSync(CONFIG_DIR)) {
+    import_fs.default.mkdirSync(CONFIG_DIR, { recursive: true, mode: 448 });
+  }
+}
+async function saveSession(sessionId2, sessionKey2, relayUrl, bridgeUrl, pairingCode2) {
+  ensureDir();
+  const rawKey = await import_crypto.webcrypto.subtle.exportKey("raw", sessionKey2);
+  const keyBase64 = Buffer.from(rawKey).toString("base64");
+  const data = {
+    sessionId: sessionId2,
+    sessionKeyBase64: keyBase64,
+    relayUrl,
+    bridgeUrl,
+    pairingCode: pairingCode2,
+    savedAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  import_fs.default.writeFileSync(SESSION_FILE, JSON.stringify(data, null, 2), {
+    mode: 384
+    // Only owner can read/write
+  });
+  console.log(`[session] Saved to ${SESSION_FILE}`);
+}
+async function loadSession() {
+  if (!import_fs.default.existsSync(SESSION_FILE)) return null;
+  try {
+    const raw = import_fs.default.readFileSync(SESSION_FILE, "utf-8");
+    const data = JSON.parse(raw);
+    if (!data.sessionId || !data.sessionKeyBase64) return null;
+    const keyBytes = Buffer.from(data.sessionKeyBase64, "base64");
+    const sessionKey2 = await import_crypto.webcrypto.subtle.importKey(
+      "raw",
+      keyBytes,
+      "AES-GCM",
+      true,
+      ["encrypt", "decrypt"]
+    );
+    console.log(`[session] Loaded saved session (ID: ${data.sessionId})`);
+    return {
+      sessionId: data.sessionId,
+      sessionKey: sessionKey2,
+      relayUrl: data.relayUrl,
+      bridgeUrl: data.bridgeUrl,
+      pairingCode: data.pairingCode
+    };
+  } catch (err) {
+    console.warn(`[session] Failed to load session: ${err.message}`);
+    return null;
+  }
+}
+function clearSession() {
+  if (import_fs.default.existsSync(SESSION_FILE)) {
+    import_fs.default.unlinkSync(SESSION_FILE);
+    console.log("[session] Cleared saved session");
+    return true;
+  }
+  return false;
+}
+function hasSession() {
+  return import_fs.default.existsSync(SESSION_FILE);
+}
+function getConfigDir() {
+  return CONFIG_DIR;
+}
+
 // src/relay/client.ts
 var ws = null;
 var keyPair = null;
@@ -212,16 +286,31 @@ var pairingCode = null;
 var reconnect;
 var config;
 var _stopped = false;
+var _heartbeatTimer = null;
+var HEARTBEAT_INTERVAL_MS = 25e3;
+var _onPaired = null;
+function onPaired(cb) {
+  _onPaired = cb;
+}
 async function startRelayClient(cfg) {
   config = cfg;
   _stopped = false;
   reconnect = createReconnectController();
+  if (cfg.resumeSessionKey && cfg.sessionId) {
+    sessionKey = cfg.resumeSessionKey;
+    sessionId = cfg.sessionId;
+    console.log(`[relay-agent] Resuming session ${sessionId}`);
+  }
   keyPair = await generateKeyPair();
   console.log("[relay-agent] X25519 key pair generated");
   connect();
 }
 function stopRelayClient() {
   _stopped = true;
+  if (_heartbeatTimer) {
+    clearInterval(_heartbeatTimer);
+    _heartbeatTimer = null;
+  }
   if (ws) {
     ws.close(1e3, "agent shutdown");
     ws = null;
@@ -230,14 +319,30 @@ function stopRelayClient() {
   keyPair = null;
   reconnect?.reset();
 }
+function startHeartbeat() {
+  if (_heartbeatTimer) clearInterval(_heartbeatTimer);
+  _heartbeatTimer = setInterval(() => {
+    if (ws?.readyState === import_ws.default.OPEN) {
+      sendRaw({ version: 1, session_id: sessionId ?? "", msg_id: makeId(), type: "PING", sender_role: "agent" });
+    }
+  }, HEARTBEAT_INTERVAL_MS);
+}
+function stopHeartbeat() {
+  if (_heartbeatTimer) {
+    clearInterval(_heartbeatTimer);
+    _heartbeatTimer = null;
+  }
+}
 function connect() {
   if (_stopped) return;
   reconnect.setState("connecting");
-  const url = config.sessionId ? `${config.relayUrl}?resume=${config.sessionId}` : config.relayUrl;
+  const resumeId = sessionId || config.sessionId;
+  const url = resumeId ? `${config.relayUrl}${config.relayUrl.includes("?") ? "&" : "?"}resume=${resumeId}` : config.relayUrl;
   console.log(`[relay-agent] Connecting to ${url}...`);
   ws = new import_ws.default(url);
   ws.on("open", () => {
     reconnect.setState("connected");
+    startHeartbeat();
     console.log("[relay-agent] Connected to relay server");
     const registerMsg = {
       version: 1,
@@ -255,7 +360,7 @@ function connect() {
   });
   ws.on("close", (code, reason) => {
     console.log(`[relay-agent] Disconnected (code=${code}, reason=${reason.toString()})`);
-    sessionKey = null;
+    stopHeartbeat();
     scheduleReconnect();
   });
   ws.on("error", (err) => {
@@ -327,6 +432,24 @@ async function handleHello(msg) {
     });
     reconnect.setState("paired");
     console.log("[relay-agent] \u2705 E2E encryption established \u2014 session paired");
+    try {
+      await saveSession(
+        sessionId,
+        sessionKey,
+        config.relayUrl,
+        config.bridgeUrl,
+        pairingCode ?? void 0
+      );
+    } catch (err) {
+      console.warn("[relay-agent] Failed to persist session:", err.message);
+    }
+    if (_onPaired) {
+      try {
+        _onPaired();
+      } catch {
+      }
+      _onPaired = null;
+    }
   }
 }
 async function handleData(msg) {
@@ -375,7 +498,357 @@ function sendRaw(msg) {
   }
 }
 
+// src/service/installer.ts
+var import_fs2 = __toESM(require("fs"));
+var import_path2 = __toESM(require("path"));
+var import_child_process = require("child_process");
+var SERVICE_NAME = "me.echoclaw.relay-agent";
+var LABEL = "EchoClaw Relay Agent";
+function resolveNodeBin() {
+  const scriptPath = process.argv[1];
+  try {
+    const globalBin = (0, import_child_process.execSync)("npm root -g", { encoding: "utf-8" }).trim();
+    const globalAgent = import_path2.default.join(import_path2.default.dirname(globalBin), "bin", "echoclaw-relay-agent");
+    if (import_fs2.default.existsSync(globalAgent)) {
+      return globalAgent;
+    }
+  } catch {
+  }
+  if (scriptPath && import_fs2.default.existsSync(scriptPath)) {
+    return scriptPath;
+  }
+  throw new Error(
+    "Cannot determine the installed path of echoclaw-relay-agent.\nPlease install globally first:\n\n  npm install -g echoclaw-relay-agent\n\nThen run: echoclaw-relay-agent --install"
+  );
+}
+function resolveNodePath() {
+  return process.execPath;
+}
+function macosInstall() {
+  const agentBin = resolveNodeBin();
+  const nodePath = resolveNodePath();
+  const logDir = getConfigDir();
+  const plistDir = import_path2.default.join(process.env.HOME, "Library", "LaunchAgents");
+  const plistPath = import_path2.default.join(plistDir, `${SERVICE_NAME}.plist`);
+  if (!import_fs2.default.existsSync(plistDir)) {
+    import_fs2.default.mkdirSync(plistDir, { recursive: true });
+  }
+  const plist = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>${SERVICE_NAME}</string>
+
+  <key>ProgramArguments</key>
+  <array>
+    <string>${nodePath}</string>
+    <string>${agentBin}</string>
+  </array>
+
+  <key>RunAtLoad</key>
+  <true/>
+
+  <key>KeepAlive</key>
+  <true/>
+
+  <key>ThrottleInterval</key>
+  <integer>10</integer>
+
+  <key>StandardOutPath</key>
+  <string>${logDir}/stdout.log</string>
+
+  <key>StandardErrorPath</key>
+  <string>${logDir}/stderr.log</string>
+
+  <key>EnvironmentVariables</key>
+  <dict>
+    <key>PATH</key>
+    <string>/usr/local/bin:/usr/bin:/bin:/opt/homebrew/bin</string>
+  </dict>
+</dict>
+</plist>`;
+  import_fs2.default.writeFileSync(plistPath, plist, { mode: 420 });
+  try {
+    (0, import_child_process.execSync)(`launchctl unload "${plistPath}" 2>/dev/null || true`);
+    (0, import_child_process.execSync)(`launchctl load "${plistPath}"`);
+  } catch (err) {
+    console.error(`[install] Failed to load LaunchAgent: ${err.message}`);
+    console.log(`[install] Plist written to ${plistPath} \u2014 you can load it manually:`);
+    console.log(`  launchctl load "${plistPath}"`);
+    return;
+  }
+  console.log("");
+  console.log("  \u2705 Installed as macOS LaunchAgent");
+  console.log(`     Plist: ${plistPath}`);
+  console.log(`     Logs:  ${logDir}/stdout.log`);
+  console.log("");
+  console.log("  The relay agent will now start automatically on login.");
+  console.log("  To uninstall: echoclaw-relay-agent --uninstall");
+  console.log("");
+}
+function macosUninstall() {
+  const plistPath = import_path2.default.join(
+    process.env.HOME,
+    "Library",
+    "LaunchAgents",
+    `${SERVICE_NAME}.plist`
+  );
+  if (!import_fs2.default.existsSync(plistPath)) {
+    console.log("[uninstall] No LaunchAgent found \u2014 nothing to remove.");
+    return;
+  }
+  try {
+    (0, import_child_process.execSync)(`launchctl unload "${plistPath}" 2>/dev/null || true`);
+  } catch {
+  }
+  import_fs2.default.unlinkSync(plistPath);
+  console.log("");
+  console.log("  \u2705 Uninstalled macOS LaunchAgent");
+  console.log(`     Removed: ${plistPath}`);
+  console.log("");
+}
+function macosStatus() {
+  const plistPath = import_path2.default.join(
+    process.env.HOME,
+    "Library",
+    "LaunchAgents",
+    `${SERVICE_NAME}.plist`
+  );
+  if (!import_fs2.default.existsSync(plistPath)) {
+    console.log("  Service: not installed");
+    return;
+  }
+  try {
+    const output = (0, import_child_process.execSync)(`launchctl list "${SERVICE_NAME}" 2>&1`, { encoding: "utf-8" });
+    const pidMatch = output.match(/"PID"\s*=\s*(\d+)/);
+    const pid = pidMatch ? pidMatch[1] : null;
+    console.log(`  Service: installed (${pid ? `running, PID ${pid}` : "not running"})`);
+    console.log(`  Plist:   ${plistPath}`);
+  } catch {
+    console.log("  Service: installed (not currently loaded)");
+    console.log(`  Plist:   ${plistPath}`);
+  }
+}
+function linuxInstall() {
+  const agentBin = resolveNodeBin();
+  const nodePath = resolveNodePath();
+  const logDir = getConfigDir();
+  const serviceDir = import_path2.default.join(
+    process.env.HOME,
+    ".config",
+    "systemd",
+    "user"
+  );
+  const servicePath = import_path2.default.join(serviceDir, `${SERVICE_NAME}.service`);
+  if (!import_fs2.default.existsSync(serviceDir)) {
+    import_fs2.default.mkdirSync(serviceDir, { recursive: true });
+  }
+  const unit = `[Unit]
+Description=${LABEL}
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=simple
+ExecStart=${nodePath} ${agentBin}
+Restart=always
+RestartSec=10
+StandardOutput=append:${logDir}/stdout.log
+StandardError=append:${logDir}/stderr.log
+Environment=PATH=/usr/local/bin:/usr/bin:/bin
+
+[Install]
+WantedBy=default.target
+`;
+  import_fs2.default.writeFileSync(servicePath, unit, { mode: 420 });
+  try {
+    (0, import_child_process.execSync)("systemctl --user daemon-reload");
+    (0, import_child_process.execSync)(`systemctl --user enable ${SERVICE_NAME}.service`);
+    (0, import_child_process.execSync)(`systemctl --user start ${SERVICE_NAME}.service`);
+  } catch (err) {
+    console.error(`[install] Failed to start service: ${err.message}`);
+    console.log(`[install] Service file written to ${servicePath}`);
+    console.log("  Enable manually:");
+    console.log(`  systemctl --user enable --now ${SERVICE_NAME}.service`);
+    return;
+  }
+  try {
+    (0, import_child_process.execSync)(`loginctl enable-linger ${process.env.USER}`);
+    console.log("  Linger enabled \u2014 service will run even without login.");
+  } catch {
+    console.log("  \u26A0\uFE0F  Could not enable linger \u2014 service may stop on logout.");
+    console.log(`  Run: sudo loginctl enable-linger ${process.env.USER}`);
+  }
+  console.log("");
+  console.log("  \u2705 Installed as systemd user service");
+  console.log(`     Unit: ${servicePath}`);
+  console.log(`     Logs: ${logDir}/stdout.log`);
+  console.log("");
+  console.log("  The relay agent will now start automatically on boot.");
+  console.log("  To uninstall: echoclaw-relay-agent --uninstall");
+  console.log("");
+}
+function linuxUninstall() {
+  const servicePath = import_path2.default.join(
+    process.env.HOME,
+    ".config",
+    "systemd",
+    "user",
+    `${SERVICE_NAME}.service`
+  );
+  if (!import_fs2.default.existsSync(servicePath)) {
+    console.log("[uninstall] No systemd service found \u2014 nothing to remove.");
+    return;
+  }
+  try {
+    (0, import_child_process.execSync)(`systemctl --user stop ${SERVICE_NAME}.service 2>/dev/null || true`);
+    (0, import_child_process.execSync)(`systemctl --user disable ${SERVICE_NAME}.service 2>/dev/null || true`);
+  } catch {
+  }
+  import_fs2.default.unlinkSync(servicePath);
+  try {
+    (0, import_child_process.execSync)("systemctl --user daemon-reload");
+  } catch {
+  }
+  console.log("");
+  console.log("  \u2705 Uninstalled systemd user service");
+  console.log(`     Removed: ${servicePath}`);
+  console.log("");
+}
+function linuxStatus() {
+  const servicePath = import_path2.default.join(
+    process.env.HOME,
+    ".config",
+    "systemd",
+    "user",
+    `${SERVICE_NAME}.service`
+  );
+  if (!import_fs2.default.existsSync(servicePath)) {
+    console.log("  Service: not installed");
+    return;
+  }
+  try {
+    const output = (0, import_child_process.execSync)(
+      `systemctl --user is-active ${SERVICE_NAME}.service 2>&1`,
+      { encoding: "utf-8" }
+    ).trim();
+    console.log(`  Service: installed (${output})`);
+    console.log(`  Unit:    ${servicePath}`);
+  } catch {
+    console.log("  Service: installed (inactive)");
+    console.log(`  Unit:    ${servicePath}`);
+  }
+}
+function windowsInstall() {
+  const agentBin = resolveNodeBin();
+  const nodePath = resolveNodePath();
+  try {
+    (0, import_child_process.execSync)(
+      `schtasks /Delete /TN "${SERVICE_NAME}" /F 2>nul`,
+      { encoding: "utf-8", stdio: "pipe" }
+    );
+  } catch {
+  }
+  try {
+    (0, import_child_process.execSync)(
+      `schtasks /Create /TN "${SERVICE_NAME}" /TR "\\"${nodePath}\\" \\"${agentBin}\\"" /SC ONLOGON /RL HIGHEST /F`,
+      { encoding: "utf-8" }
+    );
+    (0, import_child_process.execSync)(`schtasks /Run /TN "${SERVICE_NAME}"`, { encoding: "utf-8" });
+  } catch (err) {
+    console.error(`[install] Failed to create scheduled task: ${err.message}`);
+    console.log("  You may need to run this command as Administrator.");
+    return;
+  }
+  console.log("");
+  console.log("  \u2705 Installed as Windows Scheduled Task");
+  console.log(`     Task: ${SERVICE_NAME}`);
+  console.log("");
+  console.log("  The relay agent will now start automatically on login.");
+  console.log("  To uninstall: echoclaw-relay-agent --uninstall");
+  console.log("");
+}
+function windowsUninstall() {
+  try {
+    (0, import_child_process.execSync)(`schtasks /Delete /TN "${SERVICE_NAME}" /F`, { encoding: "utf-8" });
+    console.log("");
+    console.log("  \u2705 Uninstalled Windows Scheduled Task");
+    console.log("");
+  } catch {
+    console.log("[uninstall] No scheduled task found \u2014 nothing to remove.");
+  }
+}
+function windowsStatus() {
+  try {
+    const output = (0, import_child_process.execSync)(
+      `schtasks /Query /TN "${SERVICE_NAME}" /FO LIST 2>nul`,
+      { encoding: "utf-8" }
+    );
+    const statusMatch = output.match(/Status:\s*(.+)/);
+    console.log(`  Service: installed (${statusMatch ? statusMatch[1].trim() : "unknown"})`);
+  } catch {
+    console.log("  Service: not installed");
+  }
+}
+function getPlatform() {
+  switch (process.platform) {
+    case "darwin":
+      return "macos";
+    case "linux":
+      return "linux";
+    case "win32":
+      return "windows";
+    default:
+      throw new Error(`Unsupported platform: ${process.platform}`);
+  }
+}
+function installService() {
+  const platform = getPlatform();
+  console.log(`[install] Platform: ${platform}`);
+  switch (platform) {
+    case "macos":
+      macosInstall();
+      break;
+    case "linux":
+      linuxInstall();
+      break;
+    case "windows":
+      windowsInstall();
+      break;
+  }
+}
+function uninstallService() {
+  const platform = getPlatform();
+  switch (platform) {
+    case "macos":
+      macosUninstall();
+      break;
+    case "linux":
+      linuxUninstall();
+      break;
+    case "windows":
+      windowsUninstall();
+      break;
+  }
+}
+function serviceStatus() {
+  const platform = getPlatform();
+  switch (platform) {
+    case "macos":
+      macosStatus();
+      break;
+    case "linux":
+      linuxStatus();
+      break;
+    case "windows":
+      windowsStatus();
+      break;
+  }
+}
+
 // src/main.ts
+var VERSION = "0.2.0";
 function parseArgs() {
   const args = process.argv.slice(2);
   const opts = {
@@ -401,13 +874,22 @@ function parseArgs() {
       case "-b":
         opts.bridgeUrl = args[++i] || opts.bridgeUrl;
         break;
+      case "--install":
+        opts.command = "install";
+        break;
+      case "--uninstall":
+        opts.command = "uninstall";
+        break;
+      case "--status":
+        opts.command = "status";
+        break;
       case "--help":
       case "-h":
         printHelp();
         process.exit(0);
       case "--version":
       case "-v":
-        console.log("echoclaw-relay-agent 0.1.2");
+        console.log(`echoclaw-relay-agent ${VERSION}`);
         process.exit(0);
       default:
         if (arg.startsWith("-")) {
@@ -428,7 +910,7 @@ function printHelp() {
 
   OPTIONS
     --code, -c <code>    Join an existing session by pairing code (e.g. ABC-1234).
-                         If omitted, a new session is created and a code is displayed.
+                         If omitted, resumes a saved session or creates a new one.
 
     --relay, -r <url>    Relay server WebSocket URL
                          (default: wss://relay.echoclaw.me/agent/connect)
@@ -436,24 +918,74 @@ function printHelp() {
     --bridge, -b <url>   Local OpenClaw bridge HTTP URL
                          (default: http://localhost:8013)
 
+    --install            Install as system service (auto-start on boot)
+    --uninstall          Remove system service and saved session
+    --status             Show service and connection status
+
     --help, -h           Show this help message
     --version, -v        Show version
 
   EXAMPLES
-    echoclaw-relay-agent
-    echoclaw-relay-agent --code ABC-1234
-    echoclaw-relay-agent --bridge http://localhost:9000
+    echoclaw-relay-agent --code ABC-1234              # Pair and connect
+    echoclaw-relay-agent --code ABC-1234 --install    # Pair, connect, and install as service
+    echoclaw-relay-agent --status                     # Check status
+    echoclaw-relay-agent --uninstall                  # Remove service
 
   SECURITY
     All communication is end-to-end encrypted (X25519 + AES-256-GCM).
     The relay server cannot read your messages \u2014 it only forwards ciphertext.
   `);
 }
+function handleInstall() {
+  console.log("");
+  console.log("  \u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510");
+  console.log(`  \u2502   EchoClaw Relay Agent  v${VERSION}          \u2502`);
+  console.log("  \u2502   Installing system service...             \u2502");
+  console.log("  \u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518");
+  console.log("");
+  if (!hasSession()) {
+    console.error("  \u274C No saved session found.");
+    console.error("  You must pair first before installing as a service:");
+    console.error("");
+    console.error("    echoclaw-relay-agent --code ABC-1234 --install");
+    console.error("");
+    process.exit(1);
+  }
+  installService();
+}
+function handleUninstall() {
+  uninstallService();
+  clearSession();
+  console.log("  Session data cleared.");
+}
+function handleStatus() {
+  console.log("");
+  console.log(`  EchoClaw Relay Agent v${VERSION}`);
+  console.log("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
+  serviceStatus();
+  console.log(`  Session: ${hasSession() ? "saved (will resume on start)" : "none"}`);
+  console.log("");
+}
 async function main() {
   const opts = parseArgs();
+  if (opts.command === "install" && !opts.code) {
+    handleInstall();
+    return;
+  }
+  if (opts.command === "uninstall") {
+    handleUninstall();
+    return;
+  }
+  if (opts.command === "status") {
+    handleStatus();
+    return;
+  }
+  if (opts.command === "install" && opts.code) {
+    opts.installAfterPairing = true;
+  }
   console.log("");
   console.log("  \u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510");
-  console.log("  \u2502        EchoClaw Relay Agent  v0.1.2       \u2502");
+  console.log(`  \u2502        EchoClaw Relay Agent  v${VERSION}     \u2502`);
   console.log("  \u2502   Open Source \xB7 Apache License 2.0        \u2502");
   console.log("  \u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518");
   console.log("");
@@ -481,9 +1013,35 @@ async function main() {
     const separator = relayUrl.includes("?") ? "&" : "?";
     relayUrl = `${relayUrl}${separator}code=${opts.code}`;
   }
+  let resumeSessionKey;
+  let resumeSessionId;
+  if (!opts.code) {
+    const saved = await loadSession();
+    if (saved) {
+      console.log(`  \u{1F4C2} Found saved session: ${saved.sessionId}`);
+      console.log("  Attempting to resume...");
+      console.log("");
+      resumeSessionKey = saved.sessionKey;
+      resumeSessionId = saved.sessionId;
+      relayUrl = opts.relayUrl;
+    }
+  }
+  if (opts.installAfterPairing) {
+    onPaired(() => {
+      console.log("");
+      console.log("[relay-agent] Pairing successful \u2014 installing system service...");
+      try {
+        installService();
+      } catch (err) {
+        console.error("[relay-agent] Service install failed:", err.message);
+      }
+    });
+  }
   await startRelayClient({
     relayUrl,
-    bridgeUrl: opts.bridgeUrl
+    bridgeUrl: opts.bridgeUrl,
+    sessionId: resumeSessionId,
+    resumeSessionKey
   });
 }
 process.on("SIGINT", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "echoclaw-relay-agent",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "EchoClaw Relay Agent — connects OpenClaw bridge to the EchoClaw Relay Server with E2E encryption",
   "main": "./dist/main.js",
   "bin": {