Skip to content

Escalated an aborted turn to SIGKILL. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
moedash wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Escalated an aborted turn to SIGKILL. #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions sdk/typescript/src/exec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ export type CodexExecArgs = {
approvalPolicy?: ApprovalMode;
};

// A turn that was aborted has to leave nothing behind: codex holds a writer lock on the thread
// for as long as it lives, so a child that ignores the polite signal would block every later
// resume of that thread. Escalate rather than trust it to exit.
const KILL_GRACE_MS = 5000;

const INTERNAL_ORIGINATOR_ENV = "CODEX_INTERNAL_ORIGINATOR_OVERRIDE";
const TYPESCRIPT_SDK_ORIGINATOR = "codex_sdk_ts";
const CODEX_NPM_NAME = "@openai/codex";
Expand Down Expand Up @@ -195,6 +200,27 @@ export class CodexExec {
let spawnError: unknown | null = null;
child.once("error", (err) => (spawnError = err));

let killTimer: NodeJS.Timeout | undefined;
let exited = false;
child.once("exit", () => {
exited = true;
if (killTimer) clearTimeout(killTimer);
});
const escalateKill = () => {
if (exited || killTimer) return;
killTimer = setTimeout(() => {
if (!exited) child.kill("SIGKILL");
}, KILL_GRACE_MS);
killTimer.unref?.();
};
if (args.signal) {
if (args.signal.aborted) {
escalateKill();
} else {
args.signal.addEventListener("abort", escalateKill, { once: true });
}
}

if (!child.stdin) {
child.kill();
throw new Error("Child process has no stdin");
Expand Down Expand Up @@ -242,6 +268,7 @@ export class CodexExec {
}
} finally {
rl.close();
if (killTimer) clearTimeout(killTimer);
child.removeAllListeners();
try {
if (!child.killed) child.kill();
Expand Down
Loading