@boxcrew/cli 0.1.12 → 0.1.14

package/dist/index.js

@@ -359,12 +359,17 @@ function registerApiCommand(program2) {
 // src/commands/connect.ts
 import { spawn } from "child_process";
 import { createInterface as createInterface3 } from "readline";
-import { openSync, mkdirSync, existsSync, writeFileSync, readFileSync, unlinkSync } from "fs";
+import { openSync, mkdirSync, existsSync, writeFileSync, readFileSync, unlinkSync, readdirSync } from "fs";
 import { join } from "path";
 import { homedir } from "os";
 import WebSocket from "ws";
 var RECONNECT_BASE_MS = 1e3;
 var RECONNECT_MAX_MS = 3e4;
+var RUNTIME_NAMES = {
+  "claude-code": "Claude Code",
+  "opencode": "OpenCode",
+  "openclaw": "OpenClaw"
+};
 function getStateDir() {
   const dir = join(homedir(), ".boxcrew");
   if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
@@ -373,6 +378,18 @@ function getStateDir() {
 function getPidFile(agentName) {
   return join(getStateDir(), `${agentName}.pid`);
 }
+function getMetaFile(agentName) {
+  return join(getStateDir(), `${agentName}.meta.json`);
+}
+function readMeta(agentName) {
+  const metaFile = getMetaFile(agentName);
+  if (!existsSync(metaFile)) return null;
+  try {
+    return JSON.parse(readFileSync(metaFile, "utf-8"));
+  } catch {
+    return null;
+  }
+}
 function getLogFile(agentName) {
   return join(getStateDir(), `${agentName}.log`);
 }
@@ -509,18 +526,25 @@ function runDaemon(agentName) {
   let sendToServer = null;
   let reconnectAttempt = 0;
   let shouldReconnect = true;
-  const handleChat = (msg) => {
-    if (activeProcess) {
-      activeProcess.kill("SIGTERM");
-      activeProcess = null;
+  const eventBuffer = [];
+  const enqueueMessage = (msg) => {
+    if (sendToServer) {
+      sendToServer(msg);
+    } else {
+      eventBuffer.push(msg);
     }
-    const { messageId, message, sessionId } = msg;
+  };
+  const buildChildEnv = () => {
     const childEnv = { ...process.env };
     delete childEnv.CLAUDECODE;
     delete childEnv.CLAUDE_CODE_ENTRYPOINT;
     for (const key of Object.keys(childEnv)) {
       if (key.startsWith("_BX_")) delete childEnv[key];
     }
+    return childEnv;
+  };
+  const spawnRuntime = (messageId, message, sessionId, retriedWithoutSession) => {
+    const childEnv = buildChildEnv();
     let cmd;
     let args;
     if (runtime === "opencode") {
@@ -543,6 +567,7 @@ function runDaemon(agentName) {
       child.stdin.write(message);
       child.stdin.end();
     }
+    let producedOutput = false;
     if (runtime === "openclaw") {
       let stdout = "";
       let stderrChunks = "";
@@ -554,19 +579,17 @@ function runDaemon(agentName) {
       });
       child.on("exit", (code) => {
         if (activeProcess === child) activeProcess = null;
-        if (sendToServer) {
-          if (code && code !== 0) {
-            const errorMsg = stderrChunks.trim() || `OpenClaw exited with code ${code}`;
-            console.error(`OpenClaw exited with code ${code}: ${stderrChunks.trim()}`);
-            sendToServer({ type: "event", messageId, event: { kind: "text", text: `Error: ${errorMsg}` } });
-          } else {
-            const events = parseOpenClawOutput(stdout);
-            for (const event of events) {
-              sendToServer({ type: "event", messageId, event });
-            }
+        if (code && code !== 0) {
+          const errorMsg = stderrChunks.trim() || `OpenClaw exited with code ${code}`;
+          console.error(`OpenClaw exited with code ${code}: ${stderrChunks.trim()}`);
+          enqueueMessage({ type: "event", messageId, event: { kind: "text", text: `Error: ${errorMsg}` } });
+        } else {
+          const events = parseOpenClawOutput(stdout);
+          for (const event of events) {
+            enqueueMessage({ type: "event", messageId, event });
           }
-          sendToServer({ type: "event", messageId, event: { kind: "done" } });
         }
+        enqueueMessage({ type: "event", messageId, event: { kind: "done" } });
       });
     } else {
       const parseLine = runtime === "opencode" ? parseOpenCodeLine : parseStreamJsonLine;
@@ -577,27 +600,38 @@ function runDaemon(agentName) {
       });
       rl.on("line", (line) => {
         const event = parseLine(line);
-        if (event && sendToServer) {
-          sendToServer({ type: "event", messageId, event });
+        if (event) {
+          producedOutput = true;
+          enqueueMessage({ type: "event", messageId, event });
         }
       });
       child.on("exit", (code) => {
         if (activeProcess === child) activeProcess = null;
-        if (code && code !== 0 && sendToServer) {
+        if (code && code !== 0 && sessionId && !retriedWithoutSession && !producedOutput) {
+          console.log(`[${(/* @__PURE__ */ new Date()).toISOString()}] Session resume failed, retrying without --resume`);
+          spawnRuntime(messageId, message, void 0, true);
+          return;
+        }
+        if (code && code !== 0) {
           const errorMsg = stderrChunks.trim() || `${runtime} exited with code ${code}`;
           console.error(`${runtime} exited with code ${code}: ${stderrChunks.trim()}`);
-          sendToServer({ type: "event", messageId, event: { kind: "text", text: `Error: ${errorMsg}` } });
-        }
-        if (sendToServer) {
-          sendToServer({ type: "event", messageId, event: { kind: "done" } });
+          enqueueMessage({ type: "event", messageId, event: { kind: "text", text: `Error: ${errorMsg}` } });
         }
+        enqueueMessage({ type: "event", messageId, event: { kind: "done" } });
       });
     }
     child.on("error", (err) => {
       console.error(`Failed to spawn ${runtime}: ${err.message}`);
-      sendToServer?.({ type: "error", messageId, error: `Failed to spawn: ${err.message}` });
+      enqueueMessage({ type: "error", messageId, error: `Failed to spawn: ${err.message}` });
     });
   };
+  const handleChat = (msg) => {
+    if (activeProcess) {
+      activeProcess.kill("SIGTERM");
+      activeProcess = null;
+    }
+    spawnRuntime(msg.messageId, msg.message, msg.sessionId, false);
+  };
   const cleanup = () => {
     try {
       unlinkSync(getPidFile(agentName));
@@ -615,6 +649,10 @@ function runDaemon(agentName) {
       reconnectAttempt = 0;
       sendToServer = send;
       console.log(`[${(/* @__PURE__ */ new Date()).toISOString()}] Connected`);
+      while (eventBuffer.length > 0) {
+        const msg = eventBuffer.shift();
+        send(msg);
+      }
     });
     ws.on("message", (data) => {
       let msg;
@@ -637,12 +675,13 @@ function runDaemon(agentName) {
     });
     ws.on("close", (code, reason) => {
       sendToServer = null;
-      if (activeProcess) {
-        activeProcess.kill("SIGTERM");
-        activeProcess = null;
-      }
-      if (code === 4006) {
-        console.log(`[${(/* @__PURE__ */ new Date()).toISOString()}] Agent was deleted. Shutting down.`);
+      if (code === 4004 || code === 4006) {
+        if (activeProcess) {
+          activeProcess.kill("SIGTERM");
+          activeProcess = null;
+        }
+        const msg = code === 4004 ? "Replaced by new connection. Shutting down." : "Agent was deleted. Shutting down.";
+        console.log(`[${(/* @__PURE__ */ new Date()).toISOString()}] ${msg}`);
         cleanup();
         process.exit(0);
         return;
@@ -653,7 +692,7 @@ function runDaemon(agentName) {
           RECONNECT_MAX_MS
         );
         reconnectAttempt++;
-        console.log(`[${(/* @__PURE__ */ new Date()).toISOString()}] Disconnected. Reconnecting in ${delay / 1e3}s...`);
+        console.log(`[${(/* @__PURE__ */ new Date()).toISOString()}] Disconnected (code ${code}). Active process kept alive. Reconnecting in ${delay / 1e3}s...`);
         setTimeout(connect, delay);
       }
     });
@@ -702,12 +741,16 @@ function registerConnectCommand(program2) {
       env: daemonEnv
     });
     child.unref();
-    const runtimeNames = {
-      "claude-code": "Claude Code",
-      "opencode": "OpenCode",
-      "openclaw": "OpenClaw"
+    const meta = {
+      pid: child.pid,
+      cwd: process.cwd(),
+      runtime: config2.runtime,
+      agentName: config2.agent_name,
+      connectedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      claudePath: options.claudePath
     };
-    const runtimeDisplay = runtimeNames[config2.runtime] || config2.runtime;
+    writeFileSync(getMetaFile(agentName), JSON.stringify(meta, null, 2));
+    const runtimeDisplay = RUNTIME_NAMES[config2.runtime] || config2.runtime;
     const cwd = process.cwd();
     const home = homedir();
     const shortLog = logFile.startsWith(home) ? "~" + logFile.slice(home.length) : logFile;
@@ -738,6 +781,126 @@ function registerConnectCommand(program2) {
       console.error(`Failed to stop process ${pid}.`);
     }
   });
+  program2.command("status").description("Show status of all locally connected agents.").action(() => {
+    const stateDir = getStateDir();
+    const metaFiles = readdirSync(stateDir).filter((f) => f.endsWith(".meta.json"));
+    if (metaFiles.length === 0) {
+      console.log("No agents found. Use `bx connect <agent-name>` to connect one.");
+      return;
+    }
+    const home = homedir();
+    const shortenPath = (p) => p.startsWith(home) ? "~" + p.slice(home.length) : p;
+    const rows = [];
+    for (const file of metaFiles) {
+      const agentName = file.replace(".meta.json", "");
+      const meta = readMeta(agentName);
+      if (!meta) continue;
+      const pid = readPid(agentName);
+      const isOnline = pid !== null;
+      rows.push({
+        agent: meta.agentName || agentName,
+        status: isOnline ? "online" : "offline",
+        runtime: RUNTIME_NAMES[meta.runtime] || meta.runtime,
+        directory: shortenPath(meta.cwd),
+        pid: isOnline ? String(pid) : "-"
+      });
+    }
+    const headers = { agent: "Agent", status: "Status", runtime: "Runtime", directory: "Directory", pid: "PID" };
+    const cols = Object.keys(headers);
+    const widths = {};
+    for (const col of cols) {
+      widths[col] = Math.max(headers[col].length, ...rows.map((r) => r[col].length));
+    }
+    const pad = (s, w) => s + " ".repeat(w - s.length);
+    const headerLine = cols.map((c) => pad(headers[c], widths[c])).join("   ");
+    console.log("");
+    console.log(`  ${headerLine}`);
+    for (const row of rows) {
+      const line = cols.map((c) => pad(row[c], widths[c])).join("   ");
+      console.log(`  ${line}`);
+    }
+    console.log("");
+  });
+  program2.command("reconnect [agent-name]").description("Reconnect a previously connected agent.").option("--all", "Reconnect all agents").option("--claude-path <path>", "Path to claude CLI binary").action(async (agentName, options) => {
+    if (options.all) {
+      const stateDir = getStateDir();
+      const metaFiles = readdirSync(stateDir).filter((f) => f.endsWith(".meta.json"));
+      if (metaFiles.length === 0) {
+        console.log("No agents found. Use `bx connect <agent-name>` to connect one.");
+        return;
+      }
+      for (const file of metaFiles) {
+        const name = file.replace(".meta.json", "");
+        await reconnectAgent(name, options.claudePath);
+      }
+      return;
+    }
+    if (!agentName) {
+      console.error("Please specify an agent name or use --all.");
+      process.exit(1);
+    }
+    await reconnectAgent(agentName, options.claudePath);
+  });
+  async function reconnectAgent(agentName, claudePathOverride) {
+    const meta = readMeta(agentName);
+    if (!meta) {
+      console.error(`No previous connection found for "${agentName}". Use \`bx connect ${agentName}\` instead.`);
+      return;
+    }
+    const existingPid = readPid(agentName);
+    if (existingPid) {
+      try {
+        process.kill(existingPid, "SIGTERM");
+      } catch {
+      }
+      try {
+        unlinkSync(getPidFile(agentName));
+      } catch {
+      }
+    }
+    const config2 = await apiFetchJson(
+      `/agents/${encodeURIComponent(agentName)}/connection-config`
+    );
+    const claudePath = claudePathOverride || meta.claudePath || "claude";
+    const logFile = getLogFile(agentName);
+    const logFd = openSync(logFile, "a");
+    const daemonEnv = {
+      ...process.env,
+      _BX_WS_URL: config2.websocket_url,
+      _BX_CLAUDE_PATH: claudePath,
+      _BX_AGENT_NAME: config2.agent_name,
+      _BX_RUNTIME: config2.runtime
+    };
+    delete daemonEnv.CLAUDECODE;
+    delete daemonEnv.CLAUDE_CODE_ENTRYPOINT;
+    const child = spawn(process.argv[0], [process.argv[1], "_daemon", agentName], {
+      detached: true,
+      stdio: ["ignore", logFd, logFd],
+      cwd: meta.cwd,
+      env: daemonEnv
+    });
+    child.unref();
+    const newMeta = {
+      pid: child.pid,
+      cwd: meta.cwd,
+      runtime: config2.runtime,
+      agentName: config2.agent_name,
+      connectedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      claudePath
+    };
+    writeFileSync(getMetaFile(agentName), JSON.stringify(newMeta, null, 2));
+    const runtimeDisplay = RUNTIME_NAMES[config2.runtime] || config2.runtime;
+    const home = homedir();
+    const shortCwd = meta.cwd.startsWith(home) ? "~" + meta.cwd.slice(home.length) : meta.cwd;
+    const shortLog = logFile.startsWith(home) ? "~" + logFile.slice(home.length) : logFile;
+    console.log("");
+    console.log(`  Agent "${config2.agent_name}" reconnected.`);
+    console.log("");
+    console.log(`  Runtime:   ${runtimeDisplay}`);
+    console.log(`  Directory: ${shortCwd}`);
+    console.log(`  Logs:      ${shortLog}`);
+    console.log("");
+  }
 }
 
 // src/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boxcrew/cli",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "BoxCrew CLI — manage your agents from the terminal",
   "type": "module",
   "bin": {