@botbuddy/cli 1.1.0 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botbuddy/cli",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "BotBuddy — Swarm coordination CLI for multi-agent workflows",
   "type": "module",
   "bin": {

package/src/codex-bridge.mjs

@@ -9,16 +9,19 @@
  *   - Bridge ↔ Codex app-server: localhost-only WS with nonce handshake
  *
  * Usage:
- *   botbuddy codex bridge [--port 4500] [--repo /path/to/repo] [--model gpt-5.4]
+ *   botbuddy start [--port 4500] [--repo /path/to/repo] [--model gpt-5.4]
  */
 
 import { createHash, randomBytes } from "crypto";
 import { getConfig, SERVER_URL } from "./config.mjs";
 import { green, red, cyan, dim, bold, yellow, die } from "./utils.mjs";
+import { VERSION } from "./version.mjs";
 
 const RELAY_URL = SERVER_URL.replace("/mcp-server", "/codex-relay");
 const POLL_INTERVAL_MS = 2000;
 const PING_INTERVAL_MS = 15000;
+const STARTUP_TIMEOUT_MS = 5000;
+const READY_POLL_INTERVAL_MS = 250;
 
 // ─── HMAC signing ───────────────────────────────────────────────
 let sessionSecret = null;
@@ -37,10 +40,33 @@ async function signRequest(sessionId) {
   };
 }
 
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function waitForCodexReady(readyUrl, timeoutMs = STARTUP_TIMEOUT_MS) {
+  const deadline = Date.now() + timeoutMs;
+
+  while (Date.now() < deadline) {
+    try {
+      const res = await fetch(readyUrl);
+      if (res.ok) return true;
+    } catch {}
+
+    await sleep(READY_POLL_INTERVAL_MS);
+  }
+
+  return false;
+}
+
+function isAddressInUseError(text) {
+  return /address already in use|eaddrinuse|os error 48/i.test(text);
+}
+
 export async function runBridge(args) {
   const cfg = getConfig();
   if (!cfg.api_key && !cfg.access_token) {
-    die(`Not authenticated. Run: ${cyan("botbuddy login")} or ${cyan("botbuddy register <name>")}`);
+    die(`Not authenticated. Run: ${cyan("botbuddy start")} or ${cyan("botbuddy login")}`);
   }
 
   // Parse args
@@ -57,10 +83,11 @@ export async function runBridge(args) {
   }
 
   const wsUrl = `ws://127.0.0.1:${wsPort}`;
+  const readyUrl = `http://127.0.0.1:${wsPort}/readyz`;
   const { hostname: getHostname } = await import("os");
   const host = getHostname();
 
-  console.log(`${bold("BotBuddy Codex Bridge")}\n`);
+  console.log(`${bold("BotBuddy Codex Bridge")} ${dim(`v${VERSION}`)}\n`);
   console.log(`  ${dim("WebSocket:")} ${cyan(wsUrl)}`);
   console.log(`  ${dim("Repo:")}      ${cyan(repoPath)}`);
   console.log(`  ${dim("Model:")}     ${cyan(model)}`);
@@ -70,45 +97,57 @@ export async function runBridge(args) {
   // ── Step 0: Auto-start codex app-server ──
   let serverProc = null;
   if (!noServer) {
-    console.log(dim("→ Starting codex app-server..."));
-    const { spawn } = await import("child_process");
-    serverProc = spawn("codex", ["app-server", "--listen", wsUrl], {
-      stdio: ["ignore", "pipe", "pipe"],
-      env: { ...process.env },
-    });
+    const existingServerReady = await waitForCodexReady(readyUrl, 750);
+
+    if (existingServerReady) {
+      console.log(dim("→ Reusing existing codex app-server..."));
+      console.log(`  ${green("✓")} codex app-server already running on port ${wsPort}`);
+    } else {
+      console.log(dim("→ Starting codex app-server..."));
+      const { spawn } = await import("child_process");
+      serverProc = spawn("codex", ["app-server", "--listen", wsUrl], {
+        stdio: ["ignore", "pipe", "pipe"],
+        env: { ...process.env },
+      });
 
-    serverProc.on("error", (err) => {
-      if (err.code === "ENOENT") {
-        console.log(`  ${red("✗")} 'codex' not found in PATH. Install it or use ${cyan("--no-server")} to skip.`);
-        process.exit(1);
-      }
-      console.error(`  ${red("✗")} Failed to start codex app-server: ${err.message}`);
-    });
+      serverProc.on("error", (err) => {
+        if (err.code === "ENOENT") {
+          console.log(`  ${red("✗")} 'codex' not found in PATH. Install it or use ${cyan("--no-server")} to skip.`);
+          process.exit(1);
+        }
+        console.error(`  ${red("✗")} Failed to start codex app-server: ${err.message}`);
+      });
+
+      serverProc.on("exit", () => {
+        serverProc = null;
+      });
 
-    // Wait for the server to be ready
-    await new Promise((resolve) => {
-      let resolved = false;
       serverProc.stdout.on("data", (chunk) => {
-        const text = chunk.toString();
-        if (!resolved && text.includes("listening on")) {
-          resolved = true;
-          console.log(`  ${green("✓")} codex app-server started on port ${wsPort}`);
-          resolve();
+        const text = chunk.toString().trim();
+        if (!text) return;
+        for (const line of text.split(/\r?\n/)) {
+          console.log(`  ${dim(`[codex] ${line}`)}`);
         }
       });
+
       serverProc.stderr.on("data", (chunk) => {
         const text = chunk.toString().trim();
-        if (text) console.log(`  ${dim(`[codex] ${text}`)}`);
-      });
-      // Timeout fallback — proceed after 5s even if we didn't see the message
-      setTimeout(() => {
-        if (!resolved) {
-          resolved = true;
-          console.log(`  ${yellow("⚠")} Proceeding without readiness confirmation`);
-          resolve();
+        if (!text) return;
+        for (const line of text.split(/\r?\n/)) {
+          console.log(`  ${dim(`[codex] ${line}`)}`);
         }
-      }, 5000);
-    });
+        if (isAddressInUseError(text)) {
+          console.log(`  ${yellow("⚠")} Port ${wsPort} is already in use — attempting to reuse the existing codex app-server.`);
+        }
+      });
+
+      const ready = await waitForCodexReady(readyUrl);
+      if (ready) {
+        console.log(`  ${green("✓")} codex app-server ready on port ${wsPort}`);
+      } else {
+        console.log(`  ${yellow("⚠")} Proceeding without readiness confirmation`);
+      }
+    }
   }
 
   // ── Step 1: Register bridge session with BotBuddy ──
@@ -117,7 +156,7 @@ export async function runBridge(args) {
     bridge_name: cfg.agent_name || `bridge-${host}`,
     machine_host: host,
     repo_path: repoPath,
-    config: { ws_port: wsPort, model, auto_start: autoStart },
+    config: { ws_port: wsPort, model, auto_start: !noServer },
   });
 
   if (!session?.session?.id) die("Failed to register bridge session");
@@ -175,7 +214,7 @@ export async function runBridge(args) {
         clientInfo: {
           name: "botbuddy_bridge",
           title: "BotBuddy Codex Bridge",
-          version: "1.0.0",
+          version: VERSION,
           bridgeNonce,
         },
         capabilities: { experimentalApi: true },

package/src/commands.mjs

@@ -3,17 +3,18 @@ import { doLogin } from "./auth.mjs";
 import { runBridge } from "./codex-bridge.mjs";
 import { loadConfig, getConfig, clearConfig, saveConfig, getConfigPath } from "./config.mjs";
 import { green, red, cyan, dim, bold, die } from "./utils.mjs";
+import { VERSION } from "./version.mjs";
 
-const VERSION = "1.0.0";
-
-export function run(argv) {
+export async function run(argv) {
   loadConfig();
   const [command, ...args] = argv;
 
   switch (command) {
+    case "start": return cmdStart(args);
     case "login": return doLogin();
     case "logout": return cmdLogout();
     case "status": return cmdStatus();
+    // Agent-only commands (used by MCP agents, not humans)
     case "register": return cmdRegister(args);
     case "heartbeat": return cmdHeartbeat(args);
     case "lock": return cmdLock(args);
@@ -39,52 +40,40 @@ function cmdHelp() {
   console.log(`${bold("botbuddy")} ${dim(`v${VERSION}`)} — Swarm coordination CLI
 
 ${bold("USAGE")}
-  botbuddy <command> [options]
+  botbuddy start             Start BotBuddy (login + codex server + bridge)
+
+${bold("OPTIONS")}
+  start [options]
+    -p, --port <port>        WebSocket port (default: 4500)
+    -r, --repo <path>        Repository path (default: cwd)
+    -m, --model <model>      Default model (default: gpt-5.4)
+    --no-server              Don't auto-start codex app-server
 
 ${bold("AUTH")}
-  login                    Authenticate via OAuth (PKCE)
-  logout                   Remove saved credentials
-  status                   Show current auth status
-
-${bold("AGENTS")}
-  register <name> [type]   Register a new agent (type: codex|claude|gpt|custom)
-  agents                   List all agents
-  heartbeat [task]         Send a heartbeat
-
-${bold("RESOURCES")}
-  lock <name> <type>       Acquire a single lock (type: port|mcp_server|file|...)
-  locks [options]          Batch-acquire resources (auto-assigns free ones)
-    -p, --port [type]      Request a port (frontend|backend, default: frontend)
-    -m, --mcp              Request an MCP server slot
-    -t, --ticket <id>      Ticket ID (shared across all locks)
-    --pr <id>              PR ID (shared across all locks)
-  unlock <name>            Release a lock
-  resources                List all resources and locks
-
-${bold("TASKS")}
-  task create <title> [-d description] [-p priority]
-  task claim <id>          Claim a pending task
-  task done <id>           Mark a task as done
-  tasks                    List all tasks
-
-${bold("SWARM")}
-  hours                    Get current working hours
-  hours derive             Derive working hours from activity
-  hours set <json>         Set working hours manually
-
-${bold("BROWSE")}
-  browse agents|tasks|resources|activity|settings
-
-${bold("CODEX")}
-  codex bridge [options]   Start Codex app-server + bridge (single command)
-    -p, --port <port>      WebSocket port (default: 4500)
-    -r, --repo <path>      Repository path (default: cwd)
-    -m, --model <model>    Default model (default: gpt-5.4)
-    --no-server            Don't auto-start app-server (if already running)
+  login                      Re-authenticate via OAuth
+  logout                     Remove saved credentials
+  status                     Show current auth status
 
 ${bold("OTHER")}
-  help                     Show this help
-  version                  Show version`);
+  help                       Show this help
+  version                    Show version`);
+}
+
+async function cmdStart(args) {
+  console.log(`${bold("botbuddy")} ${dim(`v${VERSION}`)}\n`);
+  const cfg = getConfig();
+
+  // Auto-login if not authenticated
+  if (!cfg.access_token && !cfg.api_key) {
+    console.log(dim("→ No credentials found. Starting login...\n"));
+    await doLogin();
+  } else if (cfg.token_expires_at && cfg.token_expires_at <= Date.now()) {
+    console.log(dim("→ Token expired. Re-authenticating...\n"));
+    await doLogin();
+  }
+
+  // Start the bridge (which auto-starts codex app-server)
+  return runBridge(args);
 }
 
 function cmdStatus() {
@@ -96,7 +85,7 @@ function cmdStatus() {
     if (cfg.token_expires_at) {
       const remaining = cfg.token_expires_at - Date.now();
       if (remaining <= 0) {
-        console.log(`  Token: ${red("EXPIRED")} — run ${cyan("botbuddy login")}`);
+        console.log(`  Token: ${red("EXPIRED")} — run ${cyan("botbuddy start")}`);
       } else {
         const mins = Math.round(remaining / 60000);
         const label = mins > 60 ? `${Math.round(mins / 60)}h ${mins % 60}m` : `${mins}m`;
@@ -109,7 +98,7 @@ function cmdStatus() {
     if (cfg.agent_name) console.log(`  Agent: ${cyan(cfg.agent_name)}`);
   } else {
     console.log(`${red("✗")} Not authenticated`);
-    console.log(`  Run: ${cyan("botbuddy login")}`);
+    console.log(`  Run: ${cyan("botbuddy start")}`);
   }
 }
 
@@ -214,12 +203,7 @@ function cmdBrowse(args) {
 }
 
 function cmdCodex(args) {
-  const sub = args[0];
-  if (!sub) die("Usage: botbuddy codex <bridge> [options]");
-  switch (sub) {
-    case "bridge":
-      return runBridge(args.slice(1));
-    default:
-      die(`Unknown codex subcommand: ${sub}. Try: botbuddy codex bridge`);
-  }
+  // Legacy alias — redirect to start
+  console.log(dim("Note: 'botbuddy codex bridge' is now 'botbuddy start'\n"));
+  return runBridge(args.slice(1));
 }

package/src/version.mjs

@@ -0,0 +1,6 @@
+import { readFileSync } from "fs";
+
+const packageJsonUrl = new URL("../package.json", import.meta.url);
+const packageJson = JSON.parse(readFileSync(packageJsonUrl, "utf8"));
+
+export const VERSION = packageJson.version;