botapp-cli 0.2.8 → 0.2.10

package/dist/bin/bot.js

@@ -953,32 +953,38 @@ async function ptyKill(params) {
 async function openPty(opts) {
   const nodePty = await loadNodePty();
   if (nodePty) {
-    const proc2 = nodePty.spawn(opts.command, opts.args, {
-      name: "xterm-256color",
-      cols: opts.cols,
-      rows: opts.rows,
-      cwd: opts.cwd,
-      env: opts.env
-    });
-    const ptyId2 = randomUUID();
-    proc2.onData((data) => {
-      opts.ctx.pushChunk({ kind: "data", data });
-    });
-    const exited2 = new Promise((resolve11) => {
-      proc2.onExit(({ exitCode }) => {
-        resolve11(exitCode);
+    try {
+      const proc2 = nodePty.spawn(opts.command, opts.args, {
+        name: "xterm-256color",
+        cols: opts.cols,
+        rows: opts.rows,
+        cwd: opts.cwd,
+        env: opts.env
       });
-    });
-    return {
-      mode: "pty",
-      exited: exited2,
-      handle: {
-        ptyId: ptyId2,
-        resize: (cols, rows) => proc2.resize(cols, rows),
-        write: (data) => proc2.write(data),
-        kill: (signal) => proc2.kill(signal)
-      }
-    };
+      const ptyId2 = randomUUID();
+      proc2.onData((data) => {
+        opts.ctx.pushChunk({ kind: "data", data });
+      });
+      const exited2 = new Promise((resolve11) => {
+        proc2.onExit(({ exitCode }) => {
+          resolve11(exitCode);
+        });
+      });
+      return {
+        mode: "pty",
+        exited: exited2,
+        handle: {
+          ptyId: ptyId2,
+          resize: (cols, rows) => proc2.resize(cols, rows),
+          write: (data) => proc2.write(data),
+          kill: (signal) => proc2.kill(signal)
+        }
+      };
+    } catch (e) {
+      console.warn(
+        `[pty] node-pty spawn failed (${e?.message ?? e}); falling back to line-oriented pipe mode`
+      );
+    }
   }
   const proc = spawn2(
     opts.command,
@@ -997,7 +1003,23 @@ async function openPty(opts) {
     opts.ctx.pushChunk({ kind: "data", data: chunk.toString("utf8") });
   });
   const exited = new Promise((resolve11) => {
-    proc.on("close", (code) => resolve11(code));
+    let settled = false;
+    proc.on("close", (code) => {
+      if (settled) return;
+      settled = true;
+      resolve11(code);
+    });
+    proc.on("error", (err) => {
+      opts.ctx.pushChunk({
+        kind: "data",
+        data: `\r
+[shell failed to start: ${err.message}]\r
+`
+      });
+      if (settled) return;
+      settled = true;
+      resolve11(1);
+    });
   });
   return {
     mode: "pipe",
@@ -1361,7 +1383,7 @@ async function runShellAgent(job) {
   child.stderr.on("data", (chunk) => {
     stderr += chunk.toString();
   });
-  const code = await new Promise((resolve11) => child.on("close", resolve11));
+  const code = await awaitChildClose(child, job.agent.command);
   if (code !== 0) {
     throw new Error(stderr.trim() || `Agent exited with code ${code}`);
   }
@@ -1449,7 +1471,7 @@ async function runCodexAgent(job, update) {
   }
   const rl = createInterface2({ input: child.stdout });
   rl.on("line", processLine);
-  const code = await new Promise((resolve11) => child.on("close", resolve11));
+  const code = await awaitChildClose(child, job.agent.command);
   if (code !== 0) {
     throw new Error(errors.at(-1) ?? (stderr.trim() || `Codex exited with code ${code}`));
   }
@@ -1584,7 +1606,7 @@ async function runClaudeCodeAgent(job, update) {
   }
   const rl = createInterface2({ input: child.stdout });
   rl.on("line", processLine);
-  const code = await new Promise((resolve11) => child.on("close", resolve11));
+  const code = await awaitChildClose(child, job.agent.command);
   if (code !== 0) {
     const parts = [];
     if (stderr.trim()) parts.push(stderr.trim());
@@ -1721,7 +1743,7 @@ ${job.query}`;
   }
   const rl = createInterface2({ input: child.stdout });
   rl.on("line", processLine);
-  const code = await new Promise((resolve11) => child.on("close", resolve11));
+  const code = await awaitChildClose(child, job.agent.command);
   const resumeMatch = stderr.match(/To resume this session:\s*kimi\s+-r\s+([A-Za-z0-9_-]+)/);
   if (resumeMatch) result.sessionId = resumeMatch[1];
   if (code !== 0) {
@@ -2385,7 +2407,7 @@ Invalid ACP stdout: ${line}`;
       clientInfo: {
         name: "botapp-daemon",
         title: "botapp daemon",
-        version: "0.2.8"
+        version: "0.2.10"
       }
     });
     const session = await request2("session/new", {
@@ -2512,6 +2534,20 @@ function parseMaybeJson(value) {
 function sleep(ms) {
   return new Promise((resolveSleep) => setTimeout(resolveSleep, ms));
 }
+function awaitChildClose(child, commandLabel) {
+  return new Promise((resolveClose, reject) => {
+    child.once("error", (err) => {
+      if (err.code === "ENOENT") {
+        reject(new Error(
+          `Agent CLI "${commandLabel}" not found on PATH for the daemon process. Install it, or re-register the agent with an absolute path (\`bot daemon agent remove ${commandLabel}\` then \`bot daemon config\`).`
+        ));
+      } else {
+        reject(err);
+      }
+    });
+    child.once("close", resolveClose);
+  });
+}
 async function waitForChild(child, timeoutMs, label) {
   return new Promise((resolveWait, reject) => {
     const timeout = setTimeout(() => {
@@ -5039,7 +5075,7 @@ function die(msg) {
 }
 
 // src/index.ts
-var version = "0.2.8";
+var version = "0.2.10";
 var program = new Command25().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);