76a921f284
The non-interactive environment variables (pager, editor, and prompt suppression) were only applied in the PTY (interactive) bash path. The non-PTY executeBash path had no such defaults, so commands could block on pagers or credential prompts. - Extract NO_PAGER_ENV from bash-interactive.ts into shared non-interactive-env.ts module (renamed to NON_INTERACTIVE_ENV) - Apply it in executeBash (non-PTY) with user overrides taking precedence - Fix ordering in interactive PTY path so user env overrides the defaults (was reversed) - Add test verifying defaults are applied alongside user env
186 lines
5.2 KiB
TypeScript
186 lines
5.2 KiB
TypeScript
/**
|
|
* Bash command execution with streaming support and cancellation.
|
|
*
|
|
* Uses brush-core via native bindings for shell execution.
|
|
*/
|
|
import { Shell } from "@oh-my-pi/pi-natives";
|
|
import { Settings } from "../config/settings";
|
|
import { OutputSink } from "../session/streaming-output";
|
|
import { getOrCreateSnapshot } from "../utils/shell-snapshot";
|
|
import { NON_INTERACTIVE_ENV } from "./non-interactive-env";
|
|
|
|
export interface BashExecutorOptions {
|
|
cwd?: string;
|
|
timeout?: number;
|
|
onChunk?: (chunk: string) => void;
|
|
signal?: AbortSignal;
|
|
/** Session key suffix to isolate shell sessions per agent */
|
|
sessionKey?: string;
|
|
/** Additional environment variables to inject */
|
|
env?: Record<string, string>;
|
|
/** Artifact path/id for full output storage */
|
|
artifactPath?: string;
|
|
artifactId?: string;
|
|
}
|
|
|
|
export interface BashResult {
|
|
output: string;
|
|
exitCode: number | undefined;
|
|
cancelled: boolean;
|
|
truncated: boolean;
|
|
totalLines: number;
|
|
totalBytes: number;
|
|
outputLines: number;
|
|
outputBytes: number;
|
|
artifactId?: string;
|
|
}
|
|
|
|
const HARD_TIMEOUT_GRACE_MS = 5_000;
|
|
|
|
const shellSessions = new Map<string, Shell>();
|
|
|
|
export async function executeBash(command: string, options?: BashExecutorOptions): Promise<BashResult> {
|
|
const settings = await Settings.init();
|
|
const { shell, env: shellEnv, prefix } = settings.getShellConfig();
|
|
const snapshotPath = shell.includes("bash") ? await getOrCreateSnapshot(shell, shellEnv) : null;
|
|
|
|
// Apply command prefix if configured
|
|
const prefixedCommand = prefix ? `${prefix} ${command}` : command;
|
|
const finalCommand = prefixedCommand;
|
|
|
|
// Create output sink for truncation and artifact handling
|
|
const sink = new OutputSink({
|
|
onChunk: options?.onChunk,
|
|
artifactPath: options?.artifactPath,
|
|
artifactId: options?.artifactId,
|
|
});
|
|
|
|
let pendingChunks = Promise.resolve();
|
|
const enqueueChunk = (chunk: string) => {
|
|
pendingChunks = pendingChunks.then(() => sink.push(chunk)).catch(() => {});
|
|
};
|
|
|
|
if (options?.signal?.aborted) {
|
|
return {
|
|
exitCode: undefined,
|
|
cancelled: true,
|
|
...(await sink.dump("Command cancelled")),
|
|
};
|
|
}
|
|
|
|
const sessionKey = buildSessionKey(shell, prefix, snapshotPath, shellEnv, options?.sessionKey);
|
|
let shellSession = shellSessions.get(sessionKey);
|
|
if (!shellSession) {
|
|
shellSession = new Shell({ sessionEnv: shellEnv, snapshotPath: snapshotPath ?? undefined });
|
|
shellSessions.set(sessionKey, shellSession);
|
|
}
|
|
const signal = options?.signal;
|
|
const abortHandler = () => {
|
|
shellSession.abort(signal?.reason instanceof Error ? signal.reason.message : undefined);
|
|
};
|
|
if (signal) {
|
|
signal.addEventListener("abort", abortHandler, { once: true });
|
|
}
|
|
|
|
let hardTimeoutTimer: NodeJS.Timeout | undefined;
|
|
const hardTimeoutDeferred = Promise.withResolvers<"hard-timeout">();
|
|
const baseTimeoutMs = Math.max(1_000, options?.timeout ?? 300_000);
|
|
const hardTimeoutMs = baseTimeoutMs + HARD_TIMEOUT_GRACE_MS;
|
|
hardTimeoutTimer = setTimeout(() => {
|
|
shellSession.abort(`Hard timeout after ${Math.round(hardTimeoutMs / 1000)}s`);
|
|
hardTimeoutDeferred.resolve("hard-timeout");
|
|
}, hardTimeoutMs);
|
|
|
|
let resetSession = false;
|
|
|
|
try {
|
|
const runPromise = shellSession.run(
|
|
{
|
|
command: finalCommand,
|
|
cwd: options?.cwd,
|
|
env: options?.env ? { ...NON_INTERACTIVE_ENV, ...options.env } : NON_INTERACTIVE_ENV,
|
|
timeoutMs: options?.timeout,
|
|
signal,
|
|
},
|
|
(err, chunk) => {
|
|
if (!err) {
|
|
enqueueChunk(chunk);
|
|
}
|
|
},
|
|
);
|
|
|
|
const winner = await Promise.race([
|
|
runPromise.then(result => ({ kind: "result" as const, result })),
|
|
hardTimeoutDeferred.promise.then(() => ({ kind: "hard-timeout" as const })),
|
|
]);
|
|
|
|
await pendingChunks;
|
|
|
|
if (winner.kind === "hard-timeout") {
|
|
resetSession = true;
|
|
return {
|
|
exitCode: undefined,
|
|
cancelled: true,
|
|
...(await sink.dump(`Command exceeded hard timeout after ${Math.round(hardTimeoutMs / 1000)} seconds`)),
|
|
};
|
|
}
|
|
|
|
// Handle timeout
|
|
if (winner.result.timedOut) {
|
|
const annotation = options?.timeout
|
|
? `Command timed out after ${Math.round(options.timeout / 1000)} seconds`
|
|
: "Command timed out";
|
|
resetSession = true;
|
|
return {
|
|
exitCode: undefined,
|
|
cancelled: true,
|
|
...(await sink.dump(annotation)),
|
|
};
|
|
}
|
|
|
|
// Handle cancellation
|
|
if (winner.result.cancelled) {
|
|
resetSession = true;
|
|
return {
|
|
exitCode: undefined,
|
|
cancelled: true,
|
|
...(await sink.dump("Command cancelled")),
|
|
};
|
|
}
|
|
|
|
// Normal completion
|
|
return {
|
|
exitCode: winner.result.exitCode,
|
|
cancelled: false,
|
|
...(await sink.dump()),
|
|
};
|
|
} catch (err) {
|
|
resetSession = true;
|
|
throw err;
|
|
} finally {
|
|
if (hardTimeoutTimer) {
|
|
clearTimeout(hardTimeoutTimer);
|
|
}
|
|
if (signal) {
|
|
signal.removeEventListener("abort", abortHandler);
|
|
}
|
|
await pendingChunks;
|
|
if (resetSession) {
|
|
shellSessions.delete(sessionKey);
|
|
}
|
|
}
|
|
}
|
|
|
|
function buildSessionKey(
|
|
shell: string,
|
|
prefix: string | undefined,
|
|
snapshotPath: string | null,
|
|
env: Record<string, string>,
|
|
agentSessionKey?: string,
|
|
): string {
|
|
const entries = Object.entries(env);
|
|
entries.sort(([a], [b]) => a.localeCompare(b));
|
|
const envSerialized = entries.map(([key, value]) => `${key}=${value}`).join("\n");
|
|
return [agentSessionKey ?? "", shell, prefix ?? "", snapshotPath ?? "", envSerialized].join("\n");
|
|
}
|