botapp-cli 0.1.2 → 0.2.1

package/dist/index.js

@@ -719,34 +719,8 @@ Configured for ${serverUrl}`));
     return;
   }
   const profileName = pickProfileName(serverUrl);
-  if (health.mode === "local" && health.token) {
-    const config2 = loadProfile();
-    config2.profiles[profileName] = {
-      server: serverUrl,
-      app_url: appUrl ?? serverUrl,
-      token: health.token,
-      user_id: "local",
-      agent_id: "local-agent"
-    };
-    config2.active_profile = profileName;
-    saveProfile(config2);
-    console.log(pc4.green("Logged in (local mode)"));
-    console.log(`  Profile: ${pc4.bold(profileName)}`);
-    console.log(`  Server:  ${pc4.cyan(serverUrl)}`);
-    const paired = await tryLocalDaemonPair(serverUrl, hostname());
-    if (paired) {
-      console.log(
-        `  Daemon:  ${pc4.bold(paired.name)} ${pc4.dim(`(${paired.id})`)}`
-      );
-      await autoRegisterAgents(opts);
-      await autoStartDaemon(opts, serverUrl, paired.id);
-    } else {
-      console.log(pc4.yellow(`  Daemon:  pairing failed \u2014 run \`bot pair\` later`));
-    }
-    return;
-  }
   if (opts.browser === false) {
-    console.error(pc4.red("Hosted server needs browser auth but --no-browser was passed."));
+    console.error(pc4.red("Login needs browser auth but --no-browser was passed."));
     process.exitCode = 1;
     return;
   }
@@ -910,35 +884,6 @@ async function autoRegisterAgents(opts) {
     console.log(pc4.yellow(`  Agents:  registration failed (${e.message})`));
   }
 }
-async function tryLocalDaemonPair(serverUrl, name) {
-  try {
-    const tokRes = await fetch(`${serverUrl}/api/daemon/pairing-tokens`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ name })
-    });
-    if (!tokRes.ok) return null;
-    const tokData = await tokRes.json();
-    if (!tokData.token) return null;
-    const pairRes = await fetch(`${serverUrl}/api/daemon/pair`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ token: tokData.token, name, machine: name })
-    });
-    if (!pairRes.ok) return null;
-    const data = await pairRes.json();
-    if (!data.daemon?.id || !data.token) return null;
-    saveDaemonProfile({
-      server: serverUrl,
-      daemonId: data.daemon.id,
-      daemonName: data.daemon.name,
-      token: data.token
-    });
-    return { id: data.daemon.id, name: data.daemon.name };
-  } catch {
-    return null;
-  }
-}
 function pickProfileName(serverUrl) {
   try {
     const host = new URL(serverUrl).hostname;
@@ -953,7 +898,7 @@ async function fetchHealth(serverUrl) {
   try {
     const res = await fetch(`${serverUrl}/health`, { signal: AbortSignal.timeout(5e3) });
     if (!res.ok) return null;
-    return await res.json();
+    return { ok: true };
   } catch {
     return null;
   }
@@ -1849,106 +1794,8 @@ var skillCommand = skillSingle;
 
 // src/commands/pairing.ts
 import { hostname as hostname2 } from "os";
-import { Command as Command17 } from "commander";
-import pc18 from "picocolors";
-var pairingCommand = new Command17("pairing").alias("pair").description("Pair this machine as a botapp daemon").option("--token <token>", "Pairing token (skip browser flow)").option("--name <name>", "Daemon name", hostname2()).option("--app-url <url>", "Dashboard URL (defaults to server URL)").option("--no-browser", "Error instead of opening a browser").action(async (opts, cmd) => {
-  const globalOpts = cmd.parent?.opts() ?? {};
-  const serverUrl = resolveServerUrl(globalOpts.server);
-  const name = opts.name;
-  try {
-    const grant = await obtainPairingToken({
-      serverUrl,
-      appUrl: opts.appUrl,
-      name,
-      explicitToken: opts.token,
-      allowBrowser: opts.browser !== false
-    });
-    if (!grant) {
-      console.error(
-        pc18.red(
-          "No pairing token and browser flow disabled. Pass --token, or drop --no-browser."
-        )
-      );
-      process.exitCode = 1;
-      return;
-    }
-    if (grant.userEmail) {
-      console.log(pc18.green(`Authenticated as ${pc18.bold(grant.userEmail)}`));
-    }
-    const res = await fetch(`${serverUrl}/api/daemon/pair`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        token: grant.pairingToken,
-        name,
-        machine: hostname2()
-      })
-    });
-    const data = await res.json().catch(() => ({}));
-    if (!res.ok) {
-      console.error(pc18.red(`Error: ${data.error ?? res.statusText}`));
-      process.exitCode = 1;
-      return;
-    }
-    saveDaemonProfile({
-      server: serverUrl,
-      daemonId: data.daemon.id,
-      daemonName: data.daemon.name,
-      token: data.token
-    });
-    console.log(pc18.green(`Paired daemon: ${pc18.bold(data.daemon.name)}`));
-    console.log(`  ID:     ${data.daemon.id}`);
-    console.log(`  Server: ${serverUrl}`);
-    console.log(pc18.dim("\nNext: botapp daemon agent add codex --command codex"));
-    console.log(pc18.dim("Then: botapp daemon run"));
-  } catch (e) {
-    console.error(pc18.red(`Error: ${e.message}`));
-    process.exitCode = 1;
-  }
-});
-async function obtainPairingToken(opts) {
-  if (opts.explicitToken) return { pairingToken: opts.explicitToken };
-  const localToken = await tryLocalFastPath(opts.serverUrl, opts.name);
-  if (localToken) return { pairingToken: localToken };
-  if (!opts.allowBrowser) return null;
-  const appUrl = opts.appUrl ?? opts.serverUrl;
-  const result = await runBrowserAuth({
-    serverUrl: opts.serverUrl,
-    appUrl,
-    scope: "pair",
-    name: opts.name
-  });
-  if (!result.pairingToken) {
-    throw new Error("server returned no pairing token");
-  }
-  return { pairingToken: result.pairingToken, userEmail: result.userEmail };
-}
-async function tryLocalFastPath(serverUrl, name) {
-  let mode = null;
-  try {
-    const res = await fetch(`${serverUrl}/health`, {
-      signal: AbortSignal.timeout(3e3)
-    });
-    if (!res.ok) return null;
-    const data = await res.json().catch(() => ({}));
-    mode = data.mode ?? null;
-  } catch {
-    return null;
-  }
-  if (mode !== "local") return null;
-  try {
-    const res = await fetch(`${serverUrl}/api/daemon/pairing-tokens`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ name })
-    });
-    if (!res.ok) return null;
-    const data = await res.json().catch(() => ({}));
-    return data.token ?? null;
-  } catch {
-    return null;
-  }
-}
+import { Command as Command18 } from "commander";
+import pc19 from "picocolors";
 
 // src/commands/daemon.ts
 import { spawn as spawn5 } from "child_process";
@@ -1957,14 +1804,14 @@ import { existsSync as existsSync10, readdirSync, readFileSync as readFileSync8,
 import { homedir as homedir7 } from "os";
 import { join as join7, resolve as resolve6 } from "path";
 import { createInterface as createInterface3 } from "readline";
-import { Command as Command18 } from "commander";
+import { Command as Command17 } from "commander";
 import { WebSocket as WebSocket2 } from "ws";
-import pc19 from "picocolors";
-var daemonCommand = new Command18("daemon").description("Manage and run the local botapp daemon");
+import pc18 from "picocolors";
+var daemonCommand = new Command17("daemon").description("Manage and run the local botapp daemon");
 daemonCommand.command("run").description("Run the local daemon and wait for server jobs").action(async () => {
   const profile = loadDaemonProfile();
   if (!profile) {
-    console.error(pc19.red("No paired daemon found. Run `bot pair` first."));
+    console.error(pc18.red("No paired daemon found. Run `bot pair` first."));
     process.exitCode = 1;
     return;
   }
@@ -1973,37 +1820,37 @@ daemonCommand.command("run").description("Run the local daemon and wait for serv
 daemonCommand.command("stop").description("Stop the background daemon started by `bot launch`").action(async () => {
   const pidFile = join7(homedir7(), ".botapp", "daemon.pid");
   if (!existsSync10(pidFile)) {
-    console.log(pc19.yellow("No background daemon PID file found."));
+    console.log(pc18.yellow("No background daemon PID file found."));
     return;
   }
   try {
     const pid = parseInt(readFileSync8(pidFile, "utf-8").trim(), 10);
     if (!Number.isInteger(pid) || pid <= 0) {
-      console.error(pc19.red(`Invalid PID in ${pidFile}`));
+      console.error(pc18.red(`Invalid PID in ${pidFile}`));
       process.exitCode = 1;
       return;
     }
     process.kill(pid, "SIGTERM");
-    console.log(pc19.green(`Stopped daemon (pid ${pid})`));
+    console.log(pc18.green(`Stopped daemon (pid ${pid})`));
   } catch (e) {
-    console.error(pc19.red(`Failed to stop daemon: ${e.message}`));
+    console.error(pc18.red(`Failed to stop daemon: ${e.message}`));
     process.exitCode = 1;
   }
 });
 daemonCommand.command("agent").description("Manage agents hosted by this daemon").addCommand(
-  new Command18("list").description("List registered daemon agents").action(async () => {
+  new Command17("list").description("List registered daemon agents").action(async () => {
     const profile = requireProfile();
     if (!profile) return;
     const data = await daemonRequest(profile.server, profile.token, "/api/daemon/self/agents");
     for (const agent of data.agents ?? []) {
-      console.log(`${pc19.bold(agent.name)} ${pc19.dim(`(${agent.id})`)}`);
+      console.log(`${pc18.bold(agent.name)} ${pc18.dim(`(${agent.id})`)}`);
       console.log(`  Kind:    ${agent.kind}`);
       console.log(`  Command: ${agent.command} ${(agent.args ?? []).join(" ")}`);
       if (agent.cwd) console.log(`  CWD:     ${agent.cwd}`);
     }
   })
 ).addCommand(createDaemonAgentConfigCommand()).addCommand(
-  new Command18("add").description("Register a local agent command").argument("<name>", "Name, e.g. codex, claude-code, openclaw, hermes, or hermes-agent").requiredOption("--command <command>", "Executable command").option(
+  new Command17("add").description("Register a local agent command").argument("<name>", "Name, e.g. codex, claude-code, openclaw, hermes, or hermes-agent").requiredOption("--command <command>", "Executable command").option(
     "--kind <kind>",
     "Agent adapter kind: acp, codex, claude-code, openclaw, hermes, hermes-agent, or shell",
     "acp"
@@ -2027,12 +1874,12 @@ daemonCommand.command("agent").description("Manage agents hosted by this daemon"
         }
       }
     );
-    console.log(pc19.green(`Registered daemon agent: ${pc19.bold(data.agent.name)}`));
+    console.log(pc18.green(`Registered daemon agent: ${pc18.bold(data.agent.name)}`));
     console.log(`  ID:      ${data.agent.id}`);
     console.log(`  Command: ${data.agent.command} ${(data.agent.args ?? []).join(" ")}`);
   })
 ).addCommand(
-  new Command18("remove").alias("rm").description("Remove a daemon agent by id or name").argument("<agent>", "Daemon agent id or name").action(async (agent) => {
+  new Command17("remove").alias("rm").description("Remove a daemon agent by id or name").argument("<agent>", "Daemon agent id or name").action(async (agent) => {
     const profile = requireProfile();
     if (!profile) return;
     const data = await daemonRequest(
@@ -2041,7 +1888,7 @@ daemonCommand.command("agent").description("Manage agents hosted by this daemon"
       `/api/daemon/self/agents/${encodeURIComponent(agent)}`,
       { method: "DELETE" }
     );
-    console.log(pc19.green(`Removed daemon agent: ${pc19.bold(data.agent.name)}`));
+    console.log(pc18.green(`Removed daemon agent: ${pc18.bold(data.agent.name)}`));
     console.log(`  ID: ${data.agent.id}`);
   })
 );
@@ -2068,7 +1915,7 @@ async function runDaemonConnectionLoop(profile) {
   process.once("SIGINT", stop);
   process.once("SIGTERM", stop);
   while (!stopped) {
-    console.log(pc19.blue(`Connecting daemon ${profile.daemonName} to ${profile.server}...`));
+    console.log(pc18.blue(`Connecting daemon ${profile.daemonName} to ${profile.server}...`));
     const outcome = await runDaemonSocket(wsUrl, (ws) => {
       activeWs = ws;
     });
@@ -2076,7 +1923,7 @@ async function runDaemonConnectionLoop(profile) {
     if (stopped) break;
     const waitMs = outcome.opened ? baseRetryMs : retryMs;
     retryMs = outcome.opened ? baseRetryMs : Math.min(retryMs * 2, maxRetryMs);
-    console.log(pc19.yellow(`Retrying daemon connection in ${Math.round(waitMs / 1e3)}s...`));
+    console.log(pc18.yellow(`Retrying daemon connection in ${Math.round(waitMs / 1e3)}s...`));
     await new Promise((resolveWait) => {
       resolveRetry = resolveWait;
       retryTimer = setTimeout(() => {
@@ -2102,7 +1949,7 @@ function runDaemonSocket(wsUrl, setActiveWs) {
     }
     ws.on("open", () => {
       opened = true;
-      console.log(pc19.green("Daemon connected"));
+      console.log(pc18.green("Daemon connected"));
       ws.send(JSON.stringify({ type: "daemon_ready" }));
       ping = setInterval(() => {
         if (ws.readyState === WebSocket2.OPEN) ws.send(JSON.stringify({ type: "ping" }));
@@ -2112,11 +1959,11 @@ function runDaemonSocket(wsUrl, setActiveWs) {
       void handleFrame(ws, raw.toString());
     });
     ws.on("close", (code, reason) => {
-      console.log(pc19.yellow(`Daemon disconnected (${code}: ${reason.toString() || "no reason"})`));
+      console.log(pc18.yellow(`Daemon disconnected (${code}: ${reason.toString() || "no reason"})`));
       finish();
     });
     ws.on("error", (err) => {
-      console.error(pc19.red(`Daemon WebSocket error: ${err.message}`));
+      console.error(pc18.red(`Daemon WebSocket error: ${err.message}`));
       if (!opened) {
         if (ws.readyState !== WebSocket2.CLOSED) ws.terminate();
         finish();
@@ -2128,7 +1975,7 @@ async function handleFrame(ws, raw) {
   const frame = JSON.parse(raw);
   if (frame.type === "daemon_job") {
     const job = frame.job;
-    console.log(pc19.blue(`Running ${job.agent.name} job ${job.id}`));
+    console.log(pc18.blue(`Running ${job.agent.name} job ${job.id}`));
     ws.send(JSON.stringify({ type: "daemon_job_started", jobId: job.id }));
     try {
       const result = await runAgentJob(job, (update) => {
@@ -2146,7 +1993,7 @@ async function handleFrame(ws, raw) {
         status: "succeeded",
         result
       }));
-      console.log(pc19.green(`Completed job ${job.id}`));
+      console.log(pc18.green(`Completed job ${job.id}`));
     } catch (e) {
       ws.send(JSON.stringify({
         type: "daemon_job_result",
@@ -2154,12 +2001,12 @@ async function handleFrame(ws, raw) {
         status: "failed",
         error: e.message
       }));
-      console.error(pc19.red(`Job ${job.id} failed: ${e.message}`));
+      console.error(pc18.red(`Job ${job.id} failed: ${e.message}`));
     }
     return;
   }
   if (frame.type === "error") {
-    console.error(pc19.red(`Server error: ${frame.message}`));
+    console.error(pc18.red(`Server error: ${frame.message}`));
   }
 }
 async function runAgentJob(job, update) {
@@ -3034,7 +2881,7 @@ Invalid ACP stdout: ${line}`;
       clientInfo: {
         name: "botapp-daemon",
         title: "botapp daemon",
-        version: "0.1.2"
+        version: "0.2.1"
       }
     });
     const session = await request2("session/new", {
@@ -3055,7 +2902,7 @@ Invalid ACP stdout: ${line}`;
 function requireProfile() {
   const profile = loadDaemonProfile();
   if (!profile) {
-    console.error(pc19.red("No paired daemon found. Run `bot pair` first."));
+    console.error(pc18.red("No paired daemon found. Run `bot pair` first."));
     process.exitCode = 1;
     return null;
   }
@@ -3158,8 +3005,90 @@ async function waitForChild(child, timeoutMs, label) {
   });
 }
 
+// src/commands/pairing.ts
+var pairingCommand = new Command18("pairing").alias("pair").description("Pair this machine as a botapp daemon").option("--token <token>", "Pairing token (skip browser flow)").option("--name <name>", "Daemon name", hostname2()).option("--app-url <url>", "Dashboard URL (defaults to server URL)").option("--no-browser", "Error instead of opening a browser").option("--run", "After pairing, register local agents and run the daemon (single-process onboarding)").action(async (opts, cmd) => {
+  const globalOpts = cmd.parent?.opts() ?? {};
+  const serverUrl = resolveServerUrl(globalOpts.server);
+  const name = opts.name;
+  try {
+    const grant = await obtainPairingToken({
+      serverUrl,
+      appUrl: opts.appUrl,
+      name,
+      explicitToken: opts.token,
+      allowBrowser: opts.browser !== false
+    });
+    if (!grant) {
+      console.error(
+        pc19.red(
+          "No pairing token and browser flow disabled. Pass --token, or drop --no-browser."
+        )
+      );
+      process.exitCode = 1;
+      return;
+    }
+    if (grant.userEmail) {
+      console.log(pc19.green(`Authenticated as ${pc19.bold(grant.userEmail)}`));
+    }
+    const res = await fetch(`${serverUrl}/api/daemon/pair`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        token: grant.pairingToken,
+        name,
+        machine: hostname2()
+      })
+    });
+    const data = await res.json().catch(() => ({}));
+    if (!res.ok) {
+      console.error(pc19.red(`Error: ${data.error ?? res.statusText}`));
+      process.exitCode = 1;
+      return;
+    }
+    saveDaemonProfile({
+      server: serverUrl,
+      daemonId: data.daemon.id,
+      daemonName: data.daemon.name,
+      token: data.token
+    });
+    console.log(pc19.green(`Paired daemon: ${pc19.bold(data.daemon.name)}`));
+    console.log(`  ID:     ${data.daemon.id}`);
+    console.log(`  Server: ${serverUrl}`);
+    if (opts.run) {
+      const profile = loadDaemonProfile();
+      if (!profile) {
+        console.error(pc19.red("Pairing succeeded but daemon profile is missing \u2014 cannot run."));
+        process.exitCode = 1;
+        return;
+      }
+      await runDaemonConnectionLoop(profile);
+      return;
+    }
+    console.log(pc19.dim("\nNext: botapp daemon agent add codex --command codex"));
+    console.log(pc19.dim("Then: botapp daemon run"));
+  } catch (e) {
+    console.error(pc19.red(`Error: ${e.message}`));
+    process.exitCode = 1;
+  }
+});
+async function obtainPairingToken(opts) {
+  if (opts.explicitToken) return { pairingToken: opts.explicitToken };
+  if (!opts.allowBrowser) return null;
+  const appUrl = opts.appUrl ?? opts.serverUrl;
+  const result = await runBrowserAuth({
+    serverUrl: opts.serverUrl,
+    appUrl,
+    scope: "pair",
+    name: opts.name
+  });
+  if (!result.pairingToken) {
+    throw new Error("server returned no pairing token");
+  }
+  return { pairingToken: result.pairingToken, userEmail: result.userEmail };
+}
+
 // src/index.ts
-var version = "0.1.2";
+var version = "0.2.1";
 var program = new Command19().name("bot").description("botapp CLI \u2014 operate apps from the command line").version(version).enablePositionalOptions(true).option("--json", "Output as JSON").option("-s, --server <url>", "Server URL override").option("-t, --token <token>", "Auth token override").option("-v, --verbose", "Verbose output");
 program.addCommand(launchCommand);
 program.addCommand(runCommand);