fix: keep codex resume runs non-interactive (#67666) (thanks @plgonzalezrx8)

This commit is contained in:
Peter Steinberger
2026-04-16 16:36:05 +01:00
parent 4c66978591
commit 461d0050d9
6 changed files with 23 additions and 17 deletions

View File

@@ -244,7 +244,7 @@ beforeEach(() => {
"workspace-write",
"--skip-git-repo-check",
],
resumeArgs: ["exec", "resume", "{sessionId}"],
resumeArgs: ["exec", "resume", "{sessionId}", "--skip-git-repo-check"],
systemPromptFileConfigArg: "-c",
systemPromptFileConfigKey: "model_instructions_file",
systemPromptWhen: "first",
@@ -309,7 +309,7 @@ beforeEach(() => {
});
describe("resolveCliBackendConfig reliability merge", () => {
it("defaults codex-cli to workspace-write for fresh and resume runs", () => {
it("defaults codex-cli fresh sandboxing and resume trust bypass for non-git runs", () => {
const resolved = resolveCliBackendConfig("codex-cli");
expect(resolved).not.toBeNull();
@@ -322,7 +322,12 @@ describe("resolveCliBackendConfig reliability merge", () => {
"workspace-write",
"--skip-git-repo-check",
]);
expect(resolved?.config.resumeArgs).toEqual(["exec", "resume", "{sessionId}"]);
expect(resolved?.config.resumeArgs).toEqual([
"exec",
"resume",
"{sessionId}",
"--skip-git-repo-check",
]);
});
it("deep-merges reliability watchdog overrides for codex", () => {

View File

@@ -53,7 +53,7 @@ function buildPreparedCliRunContext(params: {
: {
command: "codex",
args: ["exec", "--json"],
resumeArgs: ["exec", "resume", "{sessionId}", "--json"],
resumeArgs: ["exec", "resume", "{sessionId}", "--skip-git-repo-check"],
output: "text" as const,
input: "arg" as const,
modelArg: "--model",
@@ -435,7 +435,16 @@ describe("runCliAgent spawn path", () => {
scopeKey?: string;
};
expect(input.mode).toBe("child");
expect(input.argv?.[0]).toBe("codex");
expect(input.argv).toEqual([
"codex",
"exec",
"resume",
"thread-123",
"--skip-git-repo-check",
"--model",
"gpt-5.4",
"hi",
]);
expect(input.timeoutMs).toBe(1_000);
expect(input.noOutputTimeoutMs).toBeGreaterThanOrEqual(1_000);
expect(input.replaceExistingScope).toBe(true);

View File

@@ -120,16 +120,7 @@ function buildOpenAICodexCliBackendFixture(): CliBackendPlugin {
"workspace-write",
"--skip-git-repo-check",
],
resumeArgs: [
"exec",
"resume",
"{sessionId}",
"--color",
"never",
"--sandbox",
"workspace-write",
"--skip-git-repo-check",
],
resumeArgs: ["exec", "resume", "{sessionId}", "--skip-git-repo-check"],
output: "jsonl",
resumeOutput: "text",
input: "arg",