@getpochi/cli 0.6.4 → 0.6.5

package/dist/cli.js

@@ -493638,7 +493638,7 @@ class BrowserSessionStore {
 // package.json
 var package_default = {
   name: "@getpochi/cli",
-  version: "0.6.4",
+  version: "0.6.5",
   devDependencies: {
     "@commander-js/extra-typings": "^14.0.0",
     "@getpochi/common": "workspace:*",
@@ -545458,6 +545458,26 @@ import {
   exec as exec9
 } from "node:child_process";
 import * as path36 from "node:path";
+class ExecuteCommandError extends Error {
+  code;
+  stdout;
+  stderr;
+  constructor({
+    message,
+    code: code4,
+    stdout: stdout5,
+    stderr: stderr7
+  }) {
+    super(message);
+    this.name = "ExecuteCommandError";
+    this.code = code4;
+    this.stdout = stdout5;
+    this.stderr = stderr7;
+  }
+  asOutput() {
+    return processCommandOutput(this.stdout, this.stderr, this.message);
+  }
+}
 var executeCommand2 = () => async ({ command, cwd: cwd3 = ".", timeout: timeout5 = 120 }, { abortSignal, cwd: workspaceDir, envs }) => {
   if (!command) {
     throw new Error("Command is required to execute.");
@@ -545469,27 +545489,20 @@ var executeCommand2 = () => async ({ command, cwd: cwd3 = ".", timeout: timeout5
     resolvedCwd = path36.normalize(path36.join(workspaceDir, cwd3));
   }
   try {
-    const {
-      code: code4,
-      stdout: stdout5 = "",
-      stderr: stderr7 = ""
-    } = await execWithExitCode(timeout5, command, {
+    const { stdout: stdout5 = "", stderr: stderr7 = "" } = await execWithExitCode(command, {
       shell: getShellPath(),
       timeout: timeout5 * 1000,
       cwd: resolvedCwd,
       signal: abortSignal,
       env: { ...process.env, ...envs, ...getTerminalEnv() }
     });
-    const { output, isTruncated } = processCommandOutput(stdout5, stderr7, code4);
-    return {
-      output,
-      isTruncated
-    };
+    return processCommandOutput(stdout5, stderr7);
   } catch (error48) {
-    if (error48 instanceof Error) {
-      if (error48.name === "AbortError") {
-        throw new Error("Command execution was aborted");
-      }
+    if (error48 instanceof ExecuteCommandError) {
+      throw error48;
+    }
+    if (error48 instanceof Error && error48.name === "AbortError") {
+      throw new Error("Command execution was aborted");
     }
     const errorMessage = error48 instanceof Error ? error48.message : String(error48);
     throw new Error(errorMessage);
@@ -545498,7 +545511,7 @@ var executeCommand2 = () => async ({ command, cwd: cwd3 = ".", timeout: timeout5
 function isExecException(error48) {
   return error48 instanceof Error && "cmd" in error48 && "killed" in error48 && "code" in error48 && "signal" in error48;
 }
-async function execWithExitCode(timeout5, command, options14) {
+async function execWithExitCode(command, options14) {
   return await new Promise((resolve25, reject3) => {
     const child = exec9(command, options14, (err3, stdout5 = "", stderr7 = "") => {
       if (!err3) {
@@ -545510,15 +545523,21 @@ async function execWithExitCode(timeout5, command, options14) {
         return;
       }
       if (isExecException(err3)) {
-        if (err3.signal === "SIGTERM" && err3.killed) {
-          reject3(new Error(`Command execution timed out after ${timeout5} seconds.`));
+        if (err3.signal === "SIGTERM" && err3.killed && options14.timeout && options14.timeout > 0) {
+          reject3(new ExecuteCommandError({
+            message: `Command execution timed out after ${options14.timeout / 1000} seconds.`,
+            stdout: err3.stdout ?? stdout5 ?? "",
+            stderr: err3.stderr ?? stderr7 ?? "",
+            code: err3.code ?? 1
+          }));
           return;
         }
-        resolve25({
-          stdout: err3.stdout || "",
-          stderr: err3.stderr || "",
-          code: err3.code || 1
-        });
+        reject3(new ExecuteCommandError({
+          message: `Command exited with code ${err3.code ?? 1}`,
+          stdout: err3.stdout ?? stdout5 ?? "",
+          stderr: err3.stderr ?? stderr7 ?? "",
+          code: err3.code ?? 1
+        }));
         return;
       }
       reject3(err3);
@@ -545526,14 +545545,17 @@ async function execWithExitCode(timeout5, command, options14) {
     child.stdin?.end();
   });
 }
-function processCommandOutput(stdout5, stderr7, code4) {
-  let fullOutput = fixExecuteCommandOutput(stdout5 + stderr7);
-  if (code4 !== 0) {
-    fullOutput += `
-Command exited with code ${code4}`;
-  }
+function processCommandOutput(stdout5, stderr7, errorMessage) {
+  const fullOutput = fixExecuteCommandOutput(stdout5 + stderr7);
   const isTruncated = fullOutput.length > MaxTerminalOutputSize;
   const output = isTruncated ? fullOutput.slice(-MaxTerminalOutputSize) : fullOutput;
+  if (errorMessage) {
+    return {
+      output,
+      isTruncated,
+      error: errorMessage
+    };
+  }
   return { output, isTruncated };
 }
 
@@ -545846,6 +545868,9 @@ async function executeToolCall(tool2, options14, cwd3, abortSignal, contentType,
         envs
       });
     } catch (e9) {
+      if (e9 instanceof ExecuteCommandError) {
+        return e9.asOutput();
+      }
       return {
         error: toErrorMessage(e9)
       };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpochi/cli",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "devDependencies": {
     "@commander-js/extra-typings": "^14.0.0",
     "@getpochi/common": "0.1.0-dev",