Skip to content

feat(codex): add protected Windows CLI update job storage #7626

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

Merged
lidge-jun merged 1 commit into from
Oct 28, 2026
Merged

feat(codex): add protected Windows CLI update job storage #7626

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion scripts/test-layout/layout.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@
"cli-api-protocols.test.ts": "cli",
"cli-catalog-prewarm.test.ts": "cli",
"cli-ensure-readiness.test.ts": "cli",
"cli-codex-cli-update-boundary.test.ts": "cli",
"cli-codex-cli-update-boundary.test.ts": "cli", "windows-codex-cli-job-store.test.ts": "windows",
"cli-codex-cli-update.test.ts": "cli",
"cli-codex-log-guard-compact.test.ts": "cli",
"cli-codex-log-guard-protection.test.ts": "cli",
Expand Down
6 changes: 3 additions & 3 deletions src/cli/codex-cli-update.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,8 @@ export async function handleCodexCliUpdateCommand(
return;
}
if (parsed.action === "status") {
let job: ReturnType<typeof readCodexCliUpdateJob>;
try { job = (deps.readJob ?? readCodexCliUpdateJob)(parsed.jobId); }
let job: Awaited<ReturnType<typeof readCodexCliUpdateJob>>;
try { job = await (deps.readJob ?? readCodexCliUpdateJob)(parsed.jobId); }
catch { unavailableJob(); return; }
if (!job) { unavailableJob(); return; }
printData(job, parsed.json, [`job: ${job.jobId}`, `status: ${job.status}`, `outcome: ${job.outcome ?? "pending"}`,
Expand All @@ -329,7 +329,7 @@ export async function handleCodexCliUpdateCommand(
return;
}
if (parsed.action === "apply") {
const admitted = admitCodexCliUpdateJob({ requestId: parsed.requestId, planId: parsed.planId, confirmed: true });
const admitted = await admitCodexCliUpdateJob({ requestId: parsed.requestId, planId: parsed.planId, confirmed: true });
const apply = deps.applyUpdate
?? ((planId: string) => runCodexCliUpdateApplyInWorker(planId, { jobId: admitted.job.jobId }));
let job: Awaited<ReturnType<typeof runCodexCliUpdateJob>>;
Expand Down
25 changes: 15 additions & 10 deletions src/codex/cli-update-job-execution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ export const CODEX_CLI_JOB_CLEANUP_ERRORS: ReadonlySet<string> = new Set(["lease
export class CodexCliJobStoreBusyError extends Error {
constructor() { super("job_store_busy"); }
}
/** Durable ledger bounds and names shared by the POSIX and Windows store backends. */
export const CODEX_CLI_JOB_STORE_DIR = "codex-cli-update-jobs";
export const CODEX_CLI_JOB_STORE_FILE = "jobs.json";
export const CODEX_CLI_JOB_STORE_LOCK = "admission.lock";
export const CODEX_CLI_JOB_STORE_MAX_BYTES = 256 * 1024;
export class CodexCliJobResultPersistenceError extends Error {
constructor(readonly result: CodexCliApplyResult) { super("job_result_persistence_failed"); }
}
Expand All @@ -29,7 +34,7 @@ export async function retryCodexCliJobStoreOperation<T>(operation: () => T,
delay: (milliseconds: number) => Promise<void> = ms => new Promise(resolve => setTimeout(resolve, ms)),
persistence = false): Promise<T> {
for (let attempt = 0; ; attempt++) {
try { return operation(); }
try { return await operation(); }
catch (error) {
const transientIo = persistence && ["EIO", "ENOSPC", "EBUSY", "EAGAIN", "EINTR", "EMFILE", "ENFILE"]
.includes((error as NodeJS.ErrnoException)?.code ?? "");
Expand All @@ -39,20 +44,20 @@ export async function retryCodexCliJobStoreOperation<T>(operation: () => T,
}
}
interface JobWork {
begin(): number;
finish(revision: number, result: CodexCliApplyResult): CodexCliUpdateJobDto | null;
read(): CodexCliUpdateJobDto | null;
release(): void;
begin(): number | Promise<number>;
finish(revision: number, result: CodexCliApplyResult): CodexCliUpdateJobDto | null | Promise<CodexCliUpdateJobDto | null>;
read(): CodexCliUpdateJobDto | null | Promise<CodexCliUpdateJobDto | null>;
release(): void | Promise<void>;
}
/** Execution and persistence are separate ownership phases. */
export async function runCodexCliUpdateJobWork(run: () => Promise<CodexCliApplyResult>, work: JobWork): Promise<CodexCliUpdateJobDto | null> {
let released = false;
try {
let revision: number;
try { revision = await retryCodexCliJobStoreOperation(() => work.begin()); }
try { revision = await retryCodexCliJobStoreOperation(async () => work.begin()); }
catch {
work.release(); released = true;
try { return work.read(); }
await work.release(); released = true;
try { return await work.read(); }
catch (error) {
const code = error instanceof Error ? error.message : "";
throw new Error(["unsafe_store", "invalid_store", "unsupported_store"].includes(code) ? code : "job_state_unavailable");
Expand All @@ -66,7 +71,7 @@ export async function runCodexCliUpdateJobWork(run: () => Promise<CodexCliApplyR
verificationPid: null, cleanupErrors: [] };
}
try {
return await retryCodexCliJobStoreOperation(() => work.finish(revision, result) ?? work.read(), undefined, true);
return await retryCodexCliJobStoreOperation(async () => (await work.finish(revision, result)) ?? (await work.read()), undefined, true);
} catch { throw new CodexCliJobResultPersistenceError(result); }
} finally { if (!released) work.release(); }
} finally { if (!released) await work.release(); }
}
Loading
Loading