Skip to content

Commit ee9d907

Browse files
authored
fix(codex): do not inject a duplicate --skip-git-repo-check for sandbox runs (#10595)
## Thinking Path > - Paperclip is the open source app people use to manage AI agents for work > - A Codex agent runs `codex exec`, and the adapter assembles its argument vector from the agent's config plus execution-context options > - For sandbox execution the adapter injects `--skip-git-repo-check`, because a headless remote workspace has no git trust prompt to answer > - The adapter also appends the operator's `extraArgs` verbatim, so an agent that already lists `--skip-git-repo-check` in its config gets the flag twice on a sandbox run > - `codex exec` rejects a repeated `--skip-git-repo-check` and exits with code 2, which the adapter surfaces as `adapter_failed` before any work runs > - This pull request skips the sandbox injection when the operator's args already carry the flag > - The benefit is that a common, harmless-looking config no longer crashes every sandbox run ## Linked Issues or Issue Description **What happened?** A `codex_local` agent configured with `extraArgs: ["--skip-git-repo-check"]` fails on every sandbox run: ``` error: the argument '--skip-git-repo-check' cannot be used multiple times Usage: codex exec [OPTIONS] [PROMPT] ``` The adapter reports `stopReason: "adapter_failed"` (Codex exited with code 2). The flag appears twice in the argv: once injected by the adapter for sandbox execution, once from the operator's `extraArgs`. **Steps to reproduce** 1. Configure a `codex_local` agent with `extraArgs: ["--skip-git-repo-check"]` (or the legacy `args` field). 2. Point it at a sandbox environment. 3. Start a run — `codex exec` aborts immediately on the duplicate flag. **Expected behavior** The run launches with a single `--skip-git-repo-check`. An operator listing the flag the adapter already injects should be a no-op, not a hard failure. **Paperclip version** Current `master`. **Deployment mode** Any deployment running Codex agents in sandbox environments. ## What Changed - `buildCodexExecArgs` no longer pushes the sandbox `--skip-git-repo-check` when the resolved args (`extraArgs`, or the legacy `args` fallback) already contain it. The operator's copy stands; the argv carries the flag exactly once. Non-sandbox runs and configs without the flag are unchanged. ## Verification - `cd packages/adapters/codex-local && pnpm vitest run src/server/codex-args.test.ts` — new cases: `extraArgs` already carrying the flag (single occurrence), the legacy `args` field carrying it (single occurrence), and the operator's flag preserved when the sandbox injection is not requested. Existing "adds --skip-git-repo-check when requested" case unchanged. - `cd packages/adapters/codex-local && pnpm vitest run` — full package suite (218 tests). - `pnpm run typecheck` in the package. ## Risks - Low. The change only suppresses a duplicate of a single, idempotent flag; it never removes an operator-supplied argument and never adds one that was not already going to be present. ## Model Used Claude Fable 5 (`claude-fable-5`, Anthropic) via Claude Code — extended thinking, agentic tool use (file edits, vitest/tsc runs). No other models involved. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have searched GitHub for duplicate or related PRs and linked them above - [x] I have either (a) linked existing issues with `Fixes: #` / `Closes #` / `Refs #` OR (b) described the issue in-PR following the relevant issue template - [x] I have not referenced internal/instance-local Paperclip issues or links (only public GitHub `#NNN` / `github.com/paperclipai/paperclip` URLs) - [x] My branch name describes the change (e.g. `docs/...`, `fix/...`) and contains no internal Paperclip ticket id or instance-derived details - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [ ] All Paperclip CI gates are green - [ ] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge
1 parent 9c1f8e7 commit ee9d907

2 files changed

Lines changed: 51 additions & 1 deletion

File tree

packages/adapters/codex-local/src/server/codex-args.test.ts

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,4 +156,45 @@ describe("buildCodexExecArgs", () => {
156156
"-",
157157
]);
158158
});
159+
160+
it("does not add a second --skip-git-repo-check when extraArgs already carry it", () => {
161+
const result = buildCodexExecArgs(
162+
{
163+
model: "gpt-5.5",
164+
extraArgs: ["--skip-git-repo-check"],
165+
},
166+
{ skipGitRepoCheck: true },
167+
);
168+
169+
expect(result.args.filter((arg) => arg === "--skip-git-repo-check")).toHaveLength(1);
170+
expect(result.args).toEqual([
171+
"exec",
172+
"--json",
173+
"--model",
174+
"gpt-5.5",
175+
"--skip-git-repo-check",
176+
"-",
177+
]);
178+
});
179+
180+
it("does not add a second --skip-git-repo-check when the legacy args field carries it", () => {
181+
const result = buildCodexExecArgs(
182+
{
183+
model: "gpt-5.5",
184+
args: ["--skip-git-repo-check"],
185+
},
186+
{ skipGitRepoCheck: true },
187+
);
188+
189+
expect(result.args.filter((arg) => arg === "--skip-git-repo-check")).toHaveLength(1);
190+
});
191+
192+
it("keeps the operator's --skip-git-repo-check when the sandbox injection is not requested", () => {
193+
const result = buildCodexExecArgs({
194+
model: "gpt-5.5",
195+
extraArgs: ["--skip-git-repo-check"],
196+
});
197+
198+
expect(result.args.filter((arg) => arg === "--skip-git-repo-check")).toHaveLength(1);
199+
});
159200
});

packages/adapters/codex-local/src/server/codex-args.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import {
55
normalizeCodexModel,
66
} from "../index.js";
77

8+
const SKIP_GIT_REPO_CHECK_FLAG = "--skip-git-repo-check";
9+
810
export type BuildCodexExecArgsResult = {
911
args: string[];
1012
model: string;
@@ -52,7 +54,14 @@ export function buildCodexExecArgs(
5254
const extraArgs = readExtraArgs(record);
5355

5456
const args = ["exec", "--json"];
55-
if (options.skipGitRepoCheck) args.push("--skip-git-repo-check");
57+
// Codex rejects a repeated `--skip-git-repo-check` ("cannot be used multiple
58+
// times"). The adapter injects this flag for sandbox execution, so when an
59+
// operator's extraArgs already carry it the injection would abort the run
60+
// with exit code 2. Skip the injection in that case and let the operator's
61+
// copy stand.
62+
if (options.skipGitRepoCheck && !extraArgs.includes(SKIP_GIT_REPO_CHECK_FLAG)) {
63+
args.push(SKIP_GIT_REPO_CHECK_FLAG);
64+
}
5665
if (search) args.unshift("--search");
5766
if (bypass) args.push("--dangerously-bypass-approvals-and-sandbox");
5867
if (model) args.push("--model", model);

0 commit comments

Comments
 (0)