@botbuddy/cli 1.2.0 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botbuddy/cli",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "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 },
@@ -365,7 +404,7 @@ export async function runBridge(args) {
             model: cmd.params.model || model,
             cwd: cmd.params.cwd || repoPath,
             approvalPolicy: cmd.params.approval_policy || "never",
-            sandbox: cmd.params.sandbox || "workspaceWrite",
+            sandbox: cmd.params.sandbox || "workspace-write",
           });
           // Track thread
           if (result?.thread?.id) {

package/src/commands.mjs

@@ -3,8 +3,7 @@ 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";
-
-const VERSION = "1.1.0";
+import { VERSION } from "./version.mjs";
 
 export async function run(argv) {
   loadConfig();
@@ -61,6 +60,7 @@ ${bold("OTHER")}
 }
 
 async function cmdStart(args) {
+  console.log(`${bold("botbuddy")} ${dim(`v${VERSION}`)}\n`);
   const cfg = getConfig();
 
   // Auto-login if not authenticated

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;