@botbuddy/cli 1.0.0 → 1.2.0

package/package.json

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

package/src/codex-bridge.mjs

@@ -47,18 +47,18 @@ export async function runBridge(args) {
   let wsPort = 4500;
   let repoPath = process.cwd();
   let model = "gpt-5.4";
-  let autoStart = false;
+  let noServer = false;
 
   for (let i = 0; i < args.length; i++) {
     if ((args[i] === "--port" || args[i] === "-p") && args[i + 1]) wsPort = parseInt(args[++i], 10);
     else if ((args[i] === "--repo" || args[i] === "-r") && args[i + 1]) repoPath = args[++i];
     else if ((args[i] === "--model" || args[i] === "-m") && args[i + 1]) model = args[++i];
-    else if (args[i] === "--auto-start") autoStart = true;
+    else if (args[i] === "--no-server") noServer = true;
   }
 
   const wsUrl = `ws://127.0.0.1:${wsPort}`;
-  const hostname = (await import("os")).then(m => m.hostname());
-  const host = await hostname;
+  const { hostname: getHostname } = await import("os");
+  const host = getHostname();
 
   console.log(`${bold("BotBuddy Codex Bridge")}\n`);
   console.log(`  ${dim("WebSocket:")} ${cyan(wsUrl)}`);
@@ -67,6 +67,50 @@ export async function runBridge(args) {
   console.log(`  ${dim("Host:")}      ${dim(host)}`);
   console.log(`  ${dim("Security:")}  ${green("HMAC-SHA256")} session signing + ${green("loopback-only")} WS\n`);
 
+  // ── 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 },
+    });
+
+    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}`);
+    });
+
+    // 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();
+        }
+      });
+      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();
+        }
+      }, 5000);
+    });
+  }
+
   // ── Step 1: Register bridge session with BotBuddy ──
   console.log(dim("→ Connecting to BotBuddy..."));
   const session = await relayPost("/bridge/connect", {
@@ -417,6 +461,10 @@ export async function runBridge(args) {
       await relayPost("/bridge/disconnect", { session_id: sessionId });
     } catch {}
     if (ws) ws.close();
+    if (serverProc) {
+      console.log(dim("→ Stopping codex app-server..."));
+      serverProc.kill("SIGTERM");
+    }
     console.log(`${green("✓")} Bridge disconnected.`);
     process.exit(0);
   };

package/src/commands.mjs

@@ -4,16 +4,18 @@ 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";
 
-const VERSION = "1.0.0";
+const VERSION = "1.1.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 +41,39 @@ 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
-    -p, --port <port>      WebSocket port (default: 4500)
-    -r, --repo <path>      Repository path (default: cwd)
-    -m, --model <model>    Default model (default: gpt-5.4)
-    --auto-start           Auto-start app-server
+  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) {
+  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));
 }