Improve logging for failed bash

This commit is contained in:
Colin McDonnell
2026-01-22 01:00:58 +00:00
committed by pullfrog[bot]
parent 5740eba150
commit c15049446f
2 changed files with 14 additions and 2 deletions
+6 -1
View File
@@ -119302,9 +119302,14 @@ ${stderr}` : stderr : stdout;
if (timedOut) if (timedOut)
output = output ? `${output} output = output ? `${output}
[timed out after ${timeout}ms]` : `[timed out after ${timeout}ms]`; [timed out after ${timeout}ms]` : `[timed out after ${timeout}ms]`;
const finalExitCode = exitCode ?? (timedOut ? 124 : -1);
if (finalExitCode !== 0) {
log.error(`bash command failed with exit code ${finalExitCode}: ${params.command}`);
if (output) log.error(`output: ${output.trim()}`);
}
return { return {
output: output.trim(), output: output.trim(),
exit_code: exitCode ?? (timedOut ? 124 : -1), exit_code: finalExitCode,
timed_out: timedOut timed_out: timedOut
}; };
}) })
+8 -1
View File
@@ -3,6 +3,7 @@ import { randomUUID } from "node:crypto";
import { closeSync, openSync, writeFileSync } from "node:fs"; import { closeSync, openSync, writeFileSync } from "node:fs";
import { join } from "node:path"; import { join } from "node:path";
import { type } from "arktype"; import { type } from "arktype";
import { log } from "../utils/log.ts";
import type { ToolContext } from "./server.ts"; import type { ToolContext } from "./server.ts";
import { execute, tool } from "./shared.ts"; import { execute, tool } from "./shared.ts";
@@ -174,9 +175,15 @@ Use this tool to:
? `${output}\n[timed out after ${timeout}ms]` ? `${output}\n[timed out after ${timeout}ms]`
: `[timed out after ${timeout}ms]`; : `[timed out after ${timeout}ms]`;
const finalExitCode = exitCode ?? (timedOut ? 124 : -1);
if (finalExitCode !== 0) {
log.error(`bash command failed with exit code ${finalExitCode}: ${params.command}`);
if (output) log.error(`output: ${output.trim()}`);
}
return { return {
output: output.trim(), output: output.trim(),
exit_code: exitCode ?? (timedOut ? 124 : -1), exit_code: finalExitCode,
timed_out: timedOut, timed_out: timedOut,
}; };
}), }),