@wolpertingerlabs/drawlatch 1.0.0-alpha.2 → 1.0.0-alpha.29

package/bin/drawlatch.js

@@ -28,15 +28,32 @@ const SERVER_ENTRY = join(PKG_ROOT, "dist/remote/server.js");
 const GENERATE_KEYS_ENTRY = join(PKG_ROOT, "dist/cli/generate-keys.js");
 
 // Import config helpers from compiled drawlatch code
-const { getConfigDir, getEnvFilePath, loadRemoteConfig } = await import(
+const { getConfigDir, getEnvFilePath, getKeysDir, getCallerKeysDir, getServerKeysDir, getProxyConfigPath, getRemoteConfigPath, loadRemoteConfig } = await import(
   join(PKG_ROOT, "dist/shared/config.js")
 );
 
+// Import crypto helpers for init command
+const { generateKeyBundle, saveKeyBundle, extractPublicKeys, fingerprint, loadKeyBundle, loadPublicKeys } = await import(
+  join(PKG_ROOT, "dist/shared/crypto/index.js")
+);
+
+// Import connection template helpers
+const { listConnectionTemplates } = await import(
+  join(PKG_ROOT, "dist/shared/connections.js")
+);
+
+// Import env utils
+const { isSecretSetForCaller, loadEnvFile: loadEnvFileVars } = await import(
+  join(PKG_ROOT, "dist/shared/env-utils.js")
+);
+
 const CONFIG_DIR = getConfigDir();
 const ENV_FILE = getEnvFilePath();
 const PID_FILE = join(CONFIG_DIR, "drawlatch.pid");
 const LOG_DIR = join(CONFIG_DIR, "logs");
 const LOG_FILE = join(LOG_DIR, "drawlatch.log");
+const VERSION_CACHE_FILE = join(CONFIG_DIR, "latest-version.json");
+const VERSION_CHECK_TTL_MS = 4 * 60 * 60 * 1000; // 4 hours
 
 // Read version from package.json
 const pkgJson = JSON.parse(
@@ -57,11 +74,15 @@ try {
       help: { type: "boolean", short: "h", default: false },
       version: { type: "boolean", short: "v", default: false },
       foreground: { type: "boolean", short: "f", default: false },
+      tunnel: { type: "boolean", short: "t", default: false },
       port: { type: "string" },
       host: { type: "string" },
       lines: { type: "string", short: "n", default: "50" },
-      follow: { type: "boolean", default: true },
+      follow: { type: "boolean", default: false },
       path: { type: "boolean", default: false },
+      full: { type: "boolean", default: false },
+      requests: { type: "boolean", default: false },
+      ttl: { type: "string", default: "300" },
     },
     strict: false,
     allowPositionals: true,
@@ -71,6 +92,11 @@ try {
   process.exit(1);
 }
 
+// ── Kick off version check early (non-blocking) ──────────────────
+const updateCheckPromise = (subcommand === null || subcommand === "help" || (values.help && !subcommand))
+  ? checkForUpdate()
+  : Promise.resolve(null);
+
 // ── Dispatch ──────────────────────────────────────────────────────
 if (values.version) {
   console.log(VERSION);
@@ -78,6 +104,11 @@ if (values.version) {
 }
 if (values.help && !subcommand) {
   printHelp();
+  const latestVersion = await Promise.race([
+    updateCheckPromise,
+    new Promise((r) => setTimeout(() => r(null), 100)),
+  ]);
+  if (latestVersion) console.log(formatUpdateNotice(latestVersion));
   process.exit(0);
 }
 
@@ -85,6 +116,13 @@ switch (subcommand) {
   case null:
     await cmdDefault();
     break;
+  case "init":
+    if (values.help) {
+      printInitHelp();
+    } else {
+      await cmdInit();
+    }
+    break;
   case "start":
     if (values.help) {
       printStartHelp();
@@ -134,8 +172,44 @@ switch (subcommand) {
       await cmdGenerateKeys();
     }
     break;
+  case "doctor":
+    if (values.help) {
+      printDoctorHelp();
+    } else {
+      await cmdDoctor();
+    }
+    break;
+  case "sync":
+    if (values.help) {
+      printSyncHelp();
+    } else {
+      await cmdSync();
+    }
+    break;
+  case "set-password":
+  case "change-password":
+    if (values.help) {
+      printSetPasswordHelp(subcommand);
+    } else {
+      await cmdSetPassword();
+    }
+    break;
+  case "watch":
+    if (values.help) {
+      printWatchHelp();
+    } else {
+      await cmdWatch();
+    }
+    break;
   case "help":
     printHelp();
+    {
+      const latestVersion = await Promise.race([
+        updateCheckPromise,
+        new Promise((r) => setTimeout(() => r(null), 100)),
+      ]);
+      if (latestVersion) console.log(formatUpdateNotice(latestVersion));
+    }
     break;
   default:
     console.error(`Unknown command: ${subcommand}\n`);
@@ -153,8 +227,96 @@ async function cmdDefault() {
     console.log("Drawlatch remote server is not running.\n");
     printHelp();
   }
+  // Show update notice only if the check already resolved (don't block on network)
+  const latestVersion = await Promise.race([
+    updateCheckPromise,
+    new Promise((r) => setTimeout(() => r(null), 100)),
+  ]);
+  if (latestVersion) console.log(formatUpdateNotice(latestVersion));
+}
+
+async function cmdInit() {
+  console.log(`\nDrawlatch Setup`);
+  console.log(`===============\n`);
+
+  const steps = [];
+
+  // Step 1: Ensure config directory
+  ensureConfigDir();
+  steps.push(`Config directory: ${CONFIG_DIR}`);
+
+  // Step 2: Generate server keypair
+  const serverKeysDir = getServerKeysDir();
+  if (existsSync(join(serverKeysDir, "signing.key.pem"))) {
+    const existing = loadKeyBundle(serverKeysDir);
+    const fp = fingerprint(extractPublicKeys(existing));
+    steps.push(`Server keys: already exist (${fp})`);
+  } else {
+    const bundle = generateKeyBundle();
+    saveKeyBundle(bundle, serverKeysDir);
+    const fp = fingerprint(extractPublicKeys(bundle));
+    steps.push(`Server keys: CREATED (${fp})`);
+  }
+
+  // Step 3: Scaffold proxy.config.json
+  const proxyConfigPath = getProxyConfigPath();
+  if (existsSync(proxyConfigPath)) {
+    steps.push(`Proxy config: already exists`);
+  } else {
+    const proxyConfig = {
+      remoteUrl: "http://127.0.0.1:9999",
+      connectTimeout: 10000,
+      requestTimeout: 300000,
+    };
+    writeFileSync(proxyConfigPath, JSON.stringify(proxyConfig, null, 2) + "\n", { mode: 0o600 });
+    steps.push(`Proxy config: CREATED`);
+  }
+
+  // Step 4: Scaffold remote.config.json
+  const remoteConfigPath = getRemoteConfigPath();
+  if (existsSync(remoteConfigPath)) {
+    steps.push(`Remote config: already exists`);
+  } else {
+    const remoteConfig = {
+      host: "0.0.0.0",
+      port: 9999,
+      rateLimitPerMinute: 60,
+      callers: {},
+    };
+    writeFileSync(remoteConfigPath, JSON.stringify(remoteConfig, null, 2) + "\n", { mode: 0o600 });
+    steps.push(`Remote config: CREATED`);
+  }
+
+  // Step 5: Scaffold .env file
+  if (existsSync(ENV_FILE)) {
+    steps.push(`.env file: already exists`);
+  } else {
+    const envLines = [
+      "# Drawlatch environment secrets",
+      "# Set tokens for your enabled connections",
+      "# Secrets are prefixed per caller (e.g., DEFAULT_GITHUB_TOKEN)",
+      "",
+    ];
+    writeFileSync(ENV_FILE, envLines.join("\n") + "\n", { mode: 0o600 });
+    steps.push(`.env file: CREATED`);
+  }
+
+  // Print summary
+  for (const step of steps) {
+    console.log(`  ${step}`);
+  }
+
+  console.log(`\nSetup complete! Next steps:\n`);
+  console.log(`  1. Start the remote server:`);
+  console.log(`       drawlatch start\n`);
+  console.log(`  2. Add callers via key sync:`);
+  console.log(`       drawlatch sync\n`);
+  console.log(`  3. Verify your setup:`);
+  console.log(`       drawlatch doctor\n`);
 }
 
+
+
 async function cmdStart() {
   if (values.foreground) return cmdStartForeground();
 
@@ -182,6 +344,7 @@ async function cmdStart() {
       NODE_ENV: "production",
       ...(values.port ? { DRAWLATCH_PORT: String(port) } : {}),
       ...(values.host ? { DRAWLATCH_HOST: host } : {}),
+      ...(values.tunnel ? { DRAWLATCH_TUNNEL: "1" } : {}),
     },
     cwd: PKG_ROOT,
   });
@@ -195,12 +358,30 @@ async function cmdStart() {
   if (healthy) {
     console.log(`\nRemote server is running (PID ${child.pid}).`);
     console.log(`  Listening: ${host}:${port}`);
+    if (values.tunnel) {
+      // The tunnel starts asynchronously after the server is healthy —
+      // poll the health endpoint until the tunnel URL appears (up to 20s).
+      console.log(`  Tunnel:    waiting for cloudflared...`);
+      const tunnelUrl = await waitForTunnelUrl(host, port, 20000);
+      if (tunnelUrl) {
+        console.log(`  Tunnel:    ${tunnelUrl}`);
+        console.log(`  Webhooks:  ${tunnelUrl}/webhooks/<path>`);
+      } else {
+        console.log(`  Tunnel:    not available (check logs: drawlatch logs)`);
+      }
+    }
     console.log(`  Logs:      drawlatch logs`);
   } else {
-    console.log(
-      `\nServer started (PID ${child.pid}) but health check did not pass.`,
-    );
-    console.log(`  Check logs: drawlatch logs`);
+    const stillAlive = isProcessAlive(child.pid);
+    if (stillAlive) {
+      console.log(
+        `\nServer started (PID ${child.pid}) but health check did not pass within 5s.`,
+      );
+      console.log(`  The server process is still running — it may need more time.`);
+    } else {
+      console.log(`\nServer process (PID ${child.pid}) exited before becoming healthy.`);
+      cleanPidFile();
+    }
     await diagnoseStartFailure();
   }
 }
@@ -209,6 +390,7 @@ async function cmdStartForeground() {
   process.env.NODE_ENV = process.env.NODE_ENV || "production";
   if (values.port) process.env.DRAWLATCH_PORT = values.port;
   if (values.host) process.env.DRAWLATCH_HOST = values.host;
+  if (values.tunnel) process.env.DRAWLATCH_TUNNEL = "1";
 
   ensureConfigDir();
 
@@ -250,6 +432,17 @@ async function cmdStop() {
 async function cmdRestart() {
   const pid = readPid();
   if (pid) {
+    // If the previous server had an active tunnel, carry the flag forward
+    // so the restarted server also starts a tunnel (unless --tunnel is
+    // already set or the user explicitly omitted it).
+    if (!values.tunnel) {
+      const config = loadRemoteConfig();
+      const prevHealth = await healthCheckFull(config.host, config.port);
+      if (prevHealth?.tunnelUrl) {
+        console.log("Previous server had an active tunnel — re-enabling --tunnel.");
+        values.tunnel = true;
+      }
+    }
     await cmdStop();
   }
   await cmdStart();
@@ -279,12 +472,19 @@ async function cmdStatus() {
   console.log("Drawlatch remote server is running.");
   console.log(`  PID:             ${pid}`);
   console.log(`  Listening:       ${host}:${port}`);
+  console.log(`  Dashboard:       http://${connectHost(host)}:${port}/`);
+  console.log(
+    `  Password:        ${isPasswordConfigured() ? "configured" : "not set (run: drawlatch set-password)"}`,
+  );
   console.log(`  Uptime:          ${uptime}`);
   console.log(
     `  Health:          ${healthData ? "healthy" : "unhealthy (not responding)"}`,
   );
   if (healthData) {
     console.log(`  Active sessions: ${healthData.activeSessions}`);
+    if (healthData.tunnelUrl) {
+      console.log(`  Tunnel:          ${healthData.tunnelUrl}`);
+    }
   }
 }
 
@@ -297,39 +497,154 @@ async function cmdLogs() {
 
   const lines = parseInt(values.lines, 10) || 50;
   const follow = values.follow;
+  const showRequests = values.requests;
 
   const tailArgs = follow
     ? ["-n", String(lines), "-f", LOG_FILE]
     : ["-n", String(lines), LOG_FILE];
 
-  const tail = spawn("tail", tailArgs, { stdio: "inherit" });
+  if (showRequests) {
+    // Show everything — pipe directly to stdout
+    const tail = spawn("tail", tailArgs, { stdio: "inherit" });
 
-  tail.on("error", () => {
-    // Fallback: read last N lines with Node.js if tail is not available
-    try {
-      const content = readFileSync(LOG_FILE, "utf-8");
-      const allLines = content.split("\n");
-      const lastLines = allLines.slice(-lines).join("\n");
-      console.log(lastLines);
-      if (follow) {
-        console.log(
-          "\n(Live following not available \u2014 'tail' command not found)",
-        );
-      }
-    } catch (err) {
-      console.error(`Error reading log file: ${err.message}`);
-      process.exit(1);
+    tail.on("error", () => logsFallback(lines, follow, null));
+
+    process.on("SIGINT", () => {
+      tail.kill();
+      process.exit(0);
+    });
+
+    await new Promise((res) => tail.on("close", res));
+  } else {
+    // Filter out [audit] lines (request/response noise from poll_events etc.)
+    const tail = spawn("tail", tailArgs, { stdio: ["ignore", "pipe", "inherit"] });
+    const grepProc = spawn("grep", ["-v", "^\\[audit\\]"], {
+      stdio: [tail.stdout, "inherit", "inherit"],
+    });
+
+    tail.on("error", () => logsFallback(lines, follow, "[audit]"));
+
+    process.on("SIGINT", () => {
+      tail.kill();
+      grepProc.kill();
+      process.exit(0);
+    });
+
+    await new Promise((res) => grepProc.on("close", res));
+  }
+}
+
+function logsFallback(lines, follow, filterPrefix) {
+  try {
+    const content = readFileSync(LOG_FILE, "utf-8");
+    let allLines = content.split("\n");
+    if (filterPrefix) {
+      allLines = allLines.filter((l) => !l.startsWith(filterPrefix));
     }
-  });
+    const lastLines = allLines.slice(-lines).join("\n");
+    console.log(lastLines);
+    if (follow) {
+      console.log(
+        "\n(Live following not available \u2014 'tail' command not found)",
+      );
+    }
+  } catch (err) {
+    console.error(`Error reading log file: ${err.message}`);
+    process.exit(1);
+  }
+}
+
+async function cmdWatch() {
+  const config = loadRemoteConfig();
+  const port = config.port;
+  const host = config.host;
+
+  // Verify the server is running
+  const healthy = await healthCheck(host, port);
+  if (!healthy) {
+    console.error("Remote server is not running. Start it first:");
+    console.error("  drawlatch start");
+    process.exit(1);
+  }
+
+  const showFull = values.full;
+  const sourceFilter = positionals[0] || null;
 
-  // Forward SIGINT to cleanly exit
+  console.log("Watching for events" + (sourceFilter ? ` from "${sourceFilter}"` : "") + "...");
+  console.log("Press Ctrl+C to stop.\n");
+
+  const controller = new AbortController();
   process.on("SIGINT", () => {
-    tail.kill();
+    controller.abort();
     process.exit(0);
   });
 
-  // Wait for tail to exit (when using --no-follow)
-  await new Promise((res) => tail.on("close", res));
+  try {
+    const res = await fetch(
+      `http://${connectHost(host)}:${port}/events/stream`,
+      { signal: controller.signal },
+    );
+
+    if (!res.ok) {
+      console.error(`Failed to connect to event stream: HTTP ${res.status}`);
+      process.exit(1);
+    }
+
+    const decoder = new TextDecoder();
+    let buffer = "";
+
+    for await (const chunk of res.body) {
+      buffer += decoder.decode(chunk, { stream: true });
+
+      // Parse SSE lines
+      let newlineIdx;
+      while ((newlineIdx = buffer.indexOf("\n\n")) !== -1) {
+        const message = buffer.slice(0, newlineIdx);
+        buffer = buffer.slice(newlineIdx + 2);
+
+        for (const line of message.split("\n")) {
+          if (!line.startsWith("data: ")) continue;
+
+          try {
+            const event = JSON.parse(line.slice(6));
+
+            // Apply source filter if set
+            if (sourceFilter && event.source !== sourceFilter) continue;
+
+            const time = new Date(event.receivedAt).toLocaleTimeString();
+            const source = event.source;
+            const instance = event.instanceId ? `:${event.instanceId}` : "";
+            const caller = event.callerAlias || "?";
+            const eventType = event.eventType;
+
+            const dataStr = JSON.stringify(event.data);
+
+            if (showFull) {
+              console.log(
+                `\x1b[2m${time}\x1b[0m \x1b[36m${source}${instance}\x1b[0m \x1b[33m${eventType}\x1b[0m \x1b[2m(${caller})\x1b[0m`
+              );
+              console.log(dataStr);
+              console.log("");
+            } else {
+              const preview =
+                dataStr.length > 100
+                  ? dataStr.slice(0, 100) + "…"
+                  : dataStr;
+              console.log(
+                `\x1b[2m${time}\x1b[0m \x1b[36m${source}${instance}\x1b[0m \x1b[33m${eventType}\x1b[0m \x1b[2m(${caller})\x1b[0m ${preview}`
+              );
+            }
+          } catch {
+            // Skip malformed SSE data
+          }
+        }
+      }
+    }
+  } catch (err) {
+    if (err.name === "AbortError") return;
+    console.error(`Event stream error: ${err.message}`);
+    process.exit(1);
+  }
 }
 
 function cmdConfig() {
@@ -349,14 +664,51 @@ function cmdConfig() {
   console.log(`  Host:               ${config.host}`);
   console.log(`  Port:               ${config.port}`);
   console.log(`  Rate limit:         ${config.rateLimitPerMinute} req/min`);
-  console.log(`  Local keys dir:     ${config.localKeysDir}`);
+  console.log(`  Server keys dir:    ${getServerKeysDir()}`);
+
+  // Show key fingerprints if keys exist
+  const serverKeysPath = getServerKeysDir();
+  if (existsSync(join(serverKeysPath, "signing.key.pem"))) {
+    try {
+      const serverKeys = loadKeyBundle(serverKeysPath);
+      console.log(`  Server key fp:      ${fingerprint(extractPublicKeys(serverKeys))}`);
+    } catch { /* skip */ }
+  }
 
   const callerEntries = Object.entries(config.callers || {});
   console.log(`  Callers:            ${callerEntries.length}`);
+
+  // Build template map for secret status checking
+  const templates = listConnectionTemplates();
+  const templateMap = new Map(templates.map((t) => [t.alias, t]));
+
+  // Load .env vars into process.env so isSecretSetForCaller works.
+  // Force-set to override empty shell env vars.
+  const envVars = loadEnvFileVars();
+  for (const [k, v] of Object.entries(envVars)) {
+    process.env[k] = v;
+  }
+
   for (const [alias, caller] of callerEntries) {
     console.log(
       `    ${alias}: ${caller.connections ? caller.connections.length : 0} connection(s)`,
     );
+    for (const connName of caller.connections || []) {
+      const tpl = templateMap.get(connName);
+      if (!tpl) {
+        console.log(`      ${connName} (custom connector)`);
+        continue;
+      }
+      const secretStatuses = tpl.requiredSecrets.map((s) => {
+        const set = isSecretSetForCaller(s, alias, caller.env);
+        return `${s}: ${set ? "SET" : "NOT SET"}`;
+      });
+      if (secretStatuses.length > 0) {
+        console.log(`      ${connName}: ${secretStatuses.join(", ")}`);
+      } else {
+        console.log(`      ${connName}: (no secrets required)`);
+      }
+    }
   }
 
   console.log(
@@ -384,6 +736,385 @@ async function cmdGenerateKeys() {
   process.exit(child.exitCode ?? 0);
 }
 
+
+async function cmdDoctor() {
+  console.log(`\nDrawlatch Setup Check`);
+  console.log(`=====================\n`);
+
+  let passed = 0;
+  let failed = 0;
+
+  function check(label, ok, fix) {
+    const padded = label.padEnd(50);
+    if (ok) {
+      console.log(`  ${padded} PASS`);
+      passed++;
+    } else {
+      console.log(`  ${padded} FAIL`);
+      if (fix) console.log(`    -> ${fix}`);
+      failed++;
+    }
+    return ok;
+  }
+
+  // Load .env for secret checks
+  const envVars = loadEnvFileVars();
+  for (const [k, v] of Object.entries(envVars)) {
+    process.env[k] = v;
+  }
+
+  // 1. Config directory
+  check("Config directory", existsSync(CONFIG_DIR), "Run: drawlatch init");
+
+  // 2. Remote config
+  const remoteConfigPath = getRemoteConfigPath();
+  const hasRemoteConfig = existsSync(remoteConfigPath);
+  check("Remote config (remote.config.json)", hasRemoteConfig, "Run: drawlatch init");
+
+  // 3. Proxy config
+  const proxyConfigPath = getProxyConfigPath();
+  const hasProxyConfig = existsSync(proxyConfigPath);
+  check("Proxy config (proxy.config.json)", hasProxyConfig, "Run: drawlatch init");
+
+  // 4. Server keys
+  const serverKeysPath = getServerKeysDir();
+  const hasServerKeys = existsSync(join(serverKeysPath, "signing.key.pem")) &&
+                        existsSync(join(serverKeysPath, "exchange.key.pem")) &&
+                        existsSync(join(serverKeysPath, "signing.pub.pem")) &&
+                        existsSync(join(serverKeysPath, "exchange.pub.pem"));
+  check("Server keys (keys/server/)", hasServerKeys, "Run: drawlatch generate-keys server");
+
+  if (hasServerKeys) {
+    try {
+      const sk = loadKeyBundle(serverKeysPath);
+      console.log(`    Fingerprint: ${fingerprint(extractPublicKeys(sk))}`);
+    } catch { /* skip */ }
+  }
+
+  // 5. Caller keys — check each caller from config
+  if (hasRemoteConfig) {
+    try {
+      const config = loadRemoteConfig();
+      const callersDir = getCallerKeysDir();
+      for (const [alias] of Object.entries(config.callers)) {
+        const callerDir = join(callersDir, alias);
+        const hasCallerKeys = existsSync(join(callerDir, "signing.pub.pem")) &&
+                              existsSync(join(callerDir, "exchange.pub.pem"));
+        check(`Caller keys for "${alias}" (keys/callers/${alias}/)`, hasCallerKeys, `Run: drawlatch generate-keys caller ${alias} (or sync)`);
+
+        if (hasCallerKeys) {
+          try {
+            const pk = loadPublicKeys(callerDir);
+            console.log(`    Fingerprint: ${fingerprint(pk)}`);
+          } catch { /* skip */ }
+        }
+      }
+    } catch { /* skip */ }
+  }
+
+  // 8. .env file
+  check("Environment file (.env)", existsSync(ENV_FILE), "Run: drawlatch init");
+
+  // 9. Required secrets for each caller's connections
+  if (hasRemoteConfig) {
+    try {
+      const config = loadRemoteConfig();
+      const templates = listConnectionTemplates();
+      const templateMap = new Map(templates.map((t) => [t.alias, t]));
+
+      for (const [callerAlias, caller] of Object.entries(config.callers)) {
+        for (const connName of caller.connections) {
+          const tpl = templateMap.get(connName);
+          if (!tpl) continue;
+          for (const secret of tpl.requiredSecrets) {
+            const isSet = isSecretSetForCaller(secret, callerAlias, caller.env);
+            check(`  ${callerAlias}/${connName}: ${secret}`, isSet, `Set ${secret} in ${ENV_FILE}`);
+          }
+        }
+      }
+    } catch { /* skip */ }
+  }
+
+  // 10. Remote server health check
+  if (hasRemoteConfig) {
+    try {
+      const config = loadRemoteConfig();
+      const healthy = await healthCheck(config.host, config.port);
+      check(`Remote server health (${config.host}:${config.port})`, healthy, "Run: drawlatch start");
+    } catch {
+      check("Remote server health", false, "Run: drawlatch start");
+    }
+  }
+
+  // Summary
+  const total = passed + failed;
+  console.log(`\nResult: ${passed}/${total} checks passed`);
+  if (failed > 0) {
+    console.log(`Fix the ${failed} failing check(s) above and re-run: drawlatch doctor`);
+  } else {
+    console.log(`All checks passed! Your setup is ready.`);
+  }
+  console.log();
+
+  process.exit(failed > 0 ? 1 : 0);
+}
+
+async function cmdSync() {
+  const config = loadRemoteConfig();
+  const port = config.port;
+  const host = config.host;
+  const ttlSeconds = parseInt(values.ttl, 10) || 300;
+  const ttlMs = ttlSeconds * 1000;
+
+  // Check that the server is running
+  const healthy = await healthCheck(host, port);
+  if (!healthy) {
+    console.error(
+      "Error: Drawlatch remote server is not running.\n" +
+        "  Start it first: drawlatch start\n",
+    );
+    process.exit(1);
+  }
+
+  // Import sync helpers from compiled drawlatch code
+  const { generateSyncCode, generateSyncEncryptionKey } = await import(
+    join(PKG_ROOT, "dist/shared/protocol/sync.js")
+  );
+
+  const inviteCode = generateSyncCode();
+  const encryptionKey = generateSyncEncryptionKey();
+
+  console.log("\nStarting key exchange...\n");
+  console.log(`  Invite code:    ${inviteCode}`);
+  console.log(`  Encryption key: ${encryptionKey}`);
+  console.log(
+    "\nGive both values to the callboard operator.",
+  );
+  console.log("They will provide a confirm code.\n");
+
+  // Prompt for confirm code
+  const confirmCode = await promptInput("Enter confirm code: ");
+  if (!confirmCode.trim()) {
+    console.error("No confirm code entered. Aborting.");
+    process.exit(1);
+  }
+
+  // Open the sync session on the running server
+  try {
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), 5000);
+    const res = await fetch(`http://${host}:${port}/sync/listen`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        inviteCode,
+        confirmCode: confirmCode.trim(),
+        encryptionKey,
+        ttlMs,
+      }),
+      signal: controller.signal,
+    });
+    clearTimeout(timeout);
+
+    if (!res.ok) {
+      const body = await res.json().catch(() => ({}));
+      console.error(`Failed to open sync session: ${body.error || res.statusText}`);
+      process.exit(1);
+    }
+  } catch (err) {
+    console.error(`Failed to reach server: ${err.message}`);
+    process.exit(1);
+  }
+
+  console.log(`\nWaiting for sync from callboard (timeout: ${ttlSeconds}s)...`);
+
+  // Poll for completion
+  const start = Date.now();
+  while (Date.now() - start < ttlMs) {
+    await sleep(1000);
+
+    try {
+      const controller = new AbortController();
+      const timeout = setTimeout(() => controller.abort(), 3000);
+      const res = await fetch(`http://${host}:${port}/sync/status`, {
+        signal: controller.signal,
+      });
+      clearTimeout(timeout);
+
+      if (!res.ok) continue;
+      const status = await res.json();
+
+      if (status.completed) {
+        console.log(`\nSync complete!`);
+        console.log(`  Caller alias:  ${status.callerAlias}`);
+        console.log(`  Fingerprint:   ${status.fingerprint}`);
+        console.log(
+          `  Keys saved to: ${join(CONFIG_DIR, "keys", "callers", status.callerAlias)}/`,
+        );
+        console.log(`\nThe caller can now connect (no server restart needed).`);
+        console.log(`\nTo grant API access, add connections in ${join(CONFIG_DIR, "remote.config.json")}:`);
+        console.log(`  "callers": {`);
+        console.log(`    "${status.callerAlias}": {`);
+        console.log(`      "connections": ["github", "slack", ...]`);
+        console.log(`    }`);
+        console.log(`  }`);
+        console.log(`\nThen set the required secrets in ${ENV_FILE}`);
+        console.log();
+        process.exit(0);
+      }
+
+      if (!status.active) {
+        console.error("\nSync session expired or was cancelled.");
+        process.exit(1);
+      }
+    } catch {
+      // Transient fetch error, keep polling
+    }
+  }
+
+  console.error("\nSync session timed out.");
+  process.exit(1);
+}
+
+async function promptInput(prompt) {
+  const { createInterface } = await import("node:readline");
+  return new Promise((resolve) => {
+    const rl = createInterface({
+      input: process.stdin,
+      output: process.stdout,
+    });
+    rl.question(prompt, (answer) => {
+      rl.close();
+      resolve(answer);
+    });
+  });
+}
+
+// ── set-password / change-password ────────────────────────────────
+//
+// Sets the dashboard/admin password. The scrypt hash + salt are written to
+// ~/.drawlatch/.env (AUTH_PASSWORD_HASH / AUTH_PASSWORD_SALT) using the same
+// env-writer the daemon's change-password handler uses, so both stay in sync.
+async function cmdSetPassword() {
+  ensureConfigDir();
+
+  const { hashPassword, generateSalt } = await import(
+    join(PKG_ROOT, "dist/auth/password.js")
+  );
+  const { updateEnvFile } = await import(
+    join(PKG_ROOT, "dist/auth/env-writer.js")
+  );
+
+  let password, confirm;
+  if (process.stdin.isTTY) {
+    password = await promptPasswordTTY("Enter new password: ");
+    if (!password) {
+      console.error("Error: password cannot be empty.");
+      process.exit(1);
+    }
+    if (password.length < 8) {
+      console.error("Error: password must be at least 8 characters.");
+      process.exit(1);
+    }
+    confirm = await promptPasswordTTY("Confirm new password: ");
+  } else {
+    // Piped input — read both lines from a single readline interface so
+    // closing it doesn't break the second prompt.
+    const { createInterface } = await import("node:readline");
+    const rl = createInterface({ input: process.stdin });
+    [password, confirm] = await readTwoLines(rl);
+    rl.close();
+    if (!password) {
+      console.error("Error: password cannot be empty.");
+      process.exit(1);
+    }
+    if (password.length < 8) {
+      console.error("Error: password must be at least 8 characters.");
+      process.exit(1);
+    }
+  }
+
+  if (password !== confirm) {
+    console.error("Error: passwords do not match.");
+    process.exit(1);
+  }
+
+  const salt = generateSalt();
+  const hash = await hashPassword(password, salt);
+
+  updateEnvFile(
+    { AUTH_PASSWORD_HASH: hash, AUTH_PASSWORD_SALT: salt },
+    ["AUTH_PASSWORD"], // strip any plaintext leftover, just in case
+  );
+
+  console.log("\nPassword set successfully.");
+  console.log(`  Stored in: ${ENV_FILE}`);
+
+  const pid = readPid();
+  if (pid) {
+    console.log("  Restart the server to apply: drawlatch restart");
+  }
+}
+
+function readTwoLines(rl) {
+  return new Promise((resolveP) => {
+    const lines = [];
+    const onLine = (line) => {
+      lines.push(line);
+      if (lines.length >= 2) {
+        rl.removeListener("line", onLine);
+        resolveP(lines);
+      }
+    };
+    rl.on("line", onLine);
+    rl.once("close", () => {
+      while (lines.length < 2) lines.push("");
+      resolveP(lines);
+    });
+  });
+}
+
+function promptPasswordTTY(prompt) {
+  return new Promise((resolveP) => {
+    process.stdout.write(prompt);
+    const stdin = process.stdin;
+    stdin.setRawMode(true);
+    stdin.resume();
+    stdin.setEncoding("utf8");
+    let password = "";
+    const onData = (ch) => {
+      ch = ch.toString();
+      if (ch === "\n" || ch === "\r" || ch === "\u0004") {
+        stdin.setRawMode(false);
+        stdin.pause();
+        stdin.removeListener("data", onData);
+        process.stdout.write("\n");
+        resolveP(password);
+      } else if (ch === "\u0003") {
+        // Ctrl+C
+        stdin.setRawMode(false);
+        process.stdout.write("\n");
+        process.exit(0);
+      } else if (ch === "\u007F" || ch === "\b") {
+        if (password.length > 0) password = password.slice(0, -1);
+      } else {
+        password += ch;
+      }
+    };
+    stdin.on("data", onData);
+  });
+}
+
+/** Read ~/.drawlatch/.env and report whether a dashboard password hash is set. */
+function isPasswordConfigured() {
+  try {
+    const envVars = loadEnvFileVars();
+    return !!envVars.AUTH_PASSWORD_HASH;
+  } catch {
+    return false;
+  }
+}
+
 // ── PID utilities ─────────────────────────────────────────────────
 
 function isProcessAlive(pid) {
@@ -420,11 +1151,16 @@ function cleanPidFile() {
 
 // ── Health check utilities ────────────────────────────────────────
 
+/** Resolve the host for client connections — 0.0.0.0 is a bind address, not connectable. */
+function connectHost(host) {
+  return host === "0.0.0.0" ? "127.0.0.1" : host;
+}
+
 async function healthCheck(host, port) {
   try {
     const controller = new AbortController();
     const timeout = setTimeout(() => controller.abort(), 3000);
-    const res = await fetch(`http://${host}:${port}/health`, {
+    const res = await fetch(`http://${connectHost(host)}:${port}/health`, {
       signal: controller.signal,
     });
     clearTimeout(timeout);
@@ -438,7 +1174,7 @@ async function healthCheckFull(host, port) {
   try {
     const controller = new AbortController();
     const timeout = setTimeout(() => controller.abort(), 3000);
-    const res = await fetch(`http://${host}:${port}/health`, {
+    const res = await fetch(`http://${connectHost(host)}:${port}/health`, {
       signal: controller.signal,
     });
     clearTimeout(timeout);
@@ -449,6 +1185,16 @@ async function healthCheckFull(host, port) {
   }
 }
 
+async function waitForTunnelUrl(host, port, timeoutMs) {
+  const start = Date.now();
+  while (Date.now() - start < timeoutMs) {
+    const data = await healthCheckFull(host, port);
+    if (data?.tunnelUrl) return data.tunnelUrl;
+    await sleep(500);
+  }
+  return null;
+}
+
 async function waitForHealth(host, port, timeoutMs) {
   const start = Date.now();
   while (Date.now() - start < timeoutMs) {
@@ -476,18 +1222,18 @@ function ensureConfigDir() {
 // ── Diagnostic utilities ──────────────────────────────────────────
 
 async function diagnoseStartFailure() {
-  if (!existsSync(LOG_FILE)) return;
+  if (!existsSync(LOG_FILE)) {
+    console.log("\n  No log file found. The server may not have started at all.");
+    return;
+  }
   try {
     const content = readFileSync(LOG_FILE, "utf-8");
-    const lines = content.split("\n").slice(-20);
-    const eaddrinuse = lines.find((l) => l.includes("EADDRINUSE"));
-    const eacces = lines.find((l) => l.includes("EACCES"));
-    if (eaddrinuse) {
-      console.log("\n  Error: Port is already in use.");
-      console.log("  Another process may be using the same port.");
-    } else if (eacces) {
-      console.log("\n  Error: Permission denied.");
-      console.log("  Try using a port >= 1024.");
+    const lines = content.split("\n").filter(Boolean).slice(-15);
+    if (lines.length > 0) {
+      console.log("\n  Recent logs:");
+      for (const line of lines) {
+        console.log(`    ${line}`);
+      }
     }
   } catch {
     // Best effort
@@ -510,6 +1256,120 @@ function sleep(ms) {
   return new Promise((r) => setTimeout(r, ms));
 }
 
+// ── Version check utilities ───────────────────────────────────────
+
+const NPM_PACKAGE_NAME = pkgJson.name;
+
+function readVersionCache() {
+  try {
+    if (!existsSync(VERSION_CACHE_FILE)) return null;
+    const data = JSON.parse(readFileSync(VERSION_CACHE_FILE, "utf-8"));
+    if (data.checkedAt && Date.now() - data.checkedAt < VERSION_CHECK_TTL_MS) {
+      return data.latestVersion;
+    }
+    return null; // stale
+  } catch {
+    return null;
+  }
+}
+
+function writeVersionCache(latestVersion) {
+  try {
+    ensureConfigDir();
+    writeFileSync(
+      VERSION_CACHE_FILE,
+      JSON.stringify({ latestVersion, checkedAt: Date.now() }) + "\n",
+      { mode: 0o600 },
+    );
+  } catch {
+    // Best effort
+  }
+}
+
+async function fetchLatestVersion() {
+  try {
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), 5000);
+    const res = await fetch(
+      `https://registry.npmjs.org/${NPM_PACKAGE_NAME}/latest`,
+      { signal: controller.signal },
+    );
+    clearTimeout(timeout);
+    if (!res.ok) return null;
+    const data = await res.json();
+    return data.version || null;
+  } catch {
+    return null;
+  }
+}
+
+function compareVersions(a, b) {
+  // Returns > 0 if a > b, < 0 if a < b, 0 if equal
+  // Handles pre-release: 1.0.0 > 1.0.0-alpha.1
+  const parseVer = (v) => {
+    const [core, pre] = v.split("-", 2);
+    const parts = core.split(".").map(Number);
+    return { parts, pre: pre || null };
+  };
+  const va = parseVer(a);
+  const vb = parseVer(b);
+
+  // Compare core version parts
+  const maxLen = Math.max(va.parts.length, vb.parts.length);
+  for (let i = 0; i < maxLen; i++) {
+    const pa = va.parts[i] || 0;
+    const pb = vb.parts[i] || 0;
+    if (pa !== pb) return pa - pb;
+  }
+
+  // Same core: no pre-release > pre-release
+  if (!va.pre && vb.pre) return 1;
+  if (va.pre && !vb.pre) return -1;
+  if (!va.pre && !vb.pre) return 0;
+
+  // Both have pre-release: compare segments
+  const aParts = va.pre.split(".");
+  const bParts = vb.pre.split(".");
+  const preLen = Math.max(aParts.length, bParts.length);
+  for (let i = 0; i < preLen; i++) {
+    const sa = aParts[i];
+    const sb = bParts[i];
+    if (sa === undefined) return -1;
+    if (sb === undefined) return 1;
+    const na = Number(sa);
+    const nb = Number(sb);
+    const aIsNum = !isNaN(na);
+    const bIsNum = !isNaN(nb);
+    if (aIsNum && bIsNum) {
+      if (na !== nb) return na - nb;
+    } else if (aIsNum) {
+      return -1; // numbers sort before strings
+    } else if (bIsNum) {
+      return 1;
+    } else {
+      if (sa < sb) return -1;
+      if (sa > sb) return 1;
+    }
+  }
+  return 0;
+}
+
+async function checkForUpdate() {
+  // Try cache first
+  const cached = readVersionCache();
+  if (cached) return cached !== VERSION && compareVersions(cached, VERSION) > 0 ? cached : null;
+
+  // Fetch in background-ish (awaited but with short timeout)
+  const latest = await fetchLatestVersion();
+  if (latest) writeVersionCache(latest);
+  if (latest && latest !== VERSION && compareVersions(latest, VERSION) > 0) return latest;
+  return null;
+}
+
+function formatUpdateNotice(latestVersion) {
+  return `\n  Update available: ${VERSION} → ${latestVersion}\n  Run: npm install -g ${NPM_PACKAGE_NAME}\n`;
+}
+
 // ── Help text ─────────────────────────────────────────────────────
 
 function printHelp() {
@@ -519,13 +1379,18 @@ drawlatch v${VERSION}
 Usage: drawlatch [command] [options]
 
 Commands:
+  init               Set up drawlatch server (keys, config, .env)
   start              Start the remote server (background by default)
   stop               Stop the background remote server
   restart            Restart the background remote server
   status             Show server status (PID, port, uptime, health, sessions)
   logs               View and follow remote server logs
   config             Show effective configuration
+  watch              Watch ingestor events in real time
+  doctor             Validate setup and diagnose issues
   generate-keys      Generate Ed25519 + X25519 keypairs
+  sync               Exchange keys with a callboard instance
+  set-password       Set/change the dashboard password (alias: change-password)
 
 Options:
   -h, --help         Show this help message
@@ -534,14 +1399,13 @@ Options:
 Running 'drawlatch' with no arguments shows status (if running) or this help.
 
 Examples:
-  drawlatch                            Show status or help
+  drawlatch init                       Set up the remote server
   drawlatch start                      Start remote server in background
   drawlatch start -f                   Start remote server in foreground
-  drawlatch start --port 8080          Start on a custom port
+  drawlatch start -f --tunnel          Start with a public tunnel for webhooks
+  drawlatch doctor                     Validate full setup
   drawlatch status                     Check if server is running
   drawlatch logs -n 100                View last 100 log lines
-  drawlatch generate-keys remote       Generate remote server keypair
-  drawlatch generate-keys local mybot  Generate local keypair for alias "mybot"
 `);
 }
 
@@ -555,6 +1419,7 @@ Usage: drawlatch start [options]
 
 Options:
   -f, --foreground   Run in foreground (default when no command given)
+  -t, --tunnel       Start a Cloudflare tunnel for webhook ingestion (requires cloudflared)
   --port <number>    Override the configured port
   --host <address>   Override the configured host
   -h, --help         Show this help message
@@ -617,19 +1482,42 @@ function printLogsHelp() {
   console.log(`
 drawlatch logs
 
-View server logs.
+View server logs (request/response audit lines are hidden by default).
 
 Usage: drawlatch logs [options]
 
 Options:
   -n, --lines <number>  Number of lines to show (default: 50)
-  --no-follow            Print lines and exit (default: follow/tail)
+  --follow               Follow/tail the log output (default: print and exit)
+  --requests             Include request/response audit lines (noisy with polling)
   -h, --help             Show this help message
 
 Log file: ~/.drawlatch/logs/drawlatch.log
 `);
 }
 
+function printWatchHelp() {
+  console.log(`
+drawlatch watch
+
+Watch ingestor events in real time.
+
+Usage: drawlatch watch [source] [options]
+
+Arguments:
+  source                 Filter to a specific connection (e.g., "discord-bot", "github")
+
+Options:
+  --full                 Show full event payload (default: truncate to 100 chars)
+  -h, --help             Show this help message
+
+Examples:
+  drawlatch watch                     Watch all events
+  drawlatch watch github              Watch only GitHub events
+  drawlatch watch discord-bot --full  Watch Discord events with full payloads
+`);
+}
+
 function printConfigHelp() {
   console.log(`
 drawlatch config
@@ -647,6 +1535,86 @@ server configuration including callers and connections.
 `);
 }
 
+function printInitHelp() {
+  console.log(`
+drawlatch init
+
+Set up the drawlatch remote server. Generates server keys, creates
+config files, and scaffolds a .env template.
+
+Callers are added separately via 'drawlatch sync' after the server
+is running.
+
+Usage: drawlatch init [options]
+
+Options:
+  -h, --help     Show this help message
+
+All steps are idempotent — safe to re-run without overwriting existing files.
+`);
+}
+
+function printDoctorHelp() {
+  console.log(`
+drawlatch doctor
+
+Validate your drawlatch setup and diagnose common issues.
+
+Usage: drawlatch doctor [options]
+
+Options:
+  --full         Include a live handshake test (requires server running)
+  -h, --help     Show this help message
+
+Checks config files, keys, peer directories, secrets, and server health.
+Each failure includes the exact command to fix it.
+`);
+}
+
+function printSyncHelp() {
+  console.log(`
+drawlatch sync
+
+Exchange keys with a callboard instance using a double-code approval flow.
+
+Usage: drawlatch sync [options]
+
+Options:
+  --ttl <seconds>    Sync session timeout (default: 300)
+  -h, --help         Show this help message
+
+Flow:
+  1. Run 'drawlatch sync' — displays an invite code and encryption key
+  2. Give both values to the callboard operator
+  3. They enter them into callboard, which generates a confirm code
+  4. Enter the confirm code when prompted
+  5. Callboard sends the encrypted sync request
+  6. Keys are exchanged automatically
+
+The server must be running (drawlatch start) before using this command.
+`);
+}
+
+function printSetPasswordHelp(cmd = "set-password") {
+  console.log(`
+drawlatch ${cmd}
+
+Set or change the password that gates the admin dashboard and /api/admin/*.
+
+Usage: drawlatch ${cmd} [options]
+
+Options:
+  -h, --help   Show this help message
+
+Prompts for a new password (hidden in a TTY; reads two lines when piped),
+hashes it with scrypt, and stores AUTH_PASSWORD_HASH / AUTH_PASSWORD_SALT in
+${ENV_FILE}.
+
+The password must be at least 8 characters. 'change-password' is an alias.
+Restart the server afterwards (drawlatch restart) to apply the new password.
+`);
+}
+
 function printGenerateKeysHelp() {
   console.log(`
 drawlatch generate-keys
@@ -656,10 +1624,11 @@ Generate Ed25519 + X25519 keypairs for authentication and encryption.
 Usage: drawlatch generate-keys <subcommand> [options]
 
 Subcommands:
-  local [alias]      Generate MCP proxy (local) keypair
+  caller [alias]     Generate caller keypair
                      Alias defaults to "default" if omitted.
-                     Keys are stored in keys/local/<alias>/
-  remote             Generate remote server keypair
+                     Keys are stored in keys/callers/<alias>/
+  server             Generate server keypair
+                     Keys are stored in keys/server/
   --dir <path>       Generate keypair in a custom directory
   show <path>        Show fingerprint of an existing keypair