-
Notifications
You must be signed in to change notification settings - Fork 1.5k
feat: forward CODEX_PLUGIN_CC_ARGS to codex launches #419
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.
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
klmklmnb
wants to merge
2
commits into
openai:main
Choose a base branch
from
klmklmnb:feat/codex-plugin-cc-args
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+187
−11
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| import test from "node:test"; | ||
| import assert from "node:assert/strict"; | ||
|
|
||
| import { | ||
| CODEX_PLUGIN_ARGS_ENV, | ||
| getCodexPassthroughArgs, | ||
| splitRawArgumentString | ||
| } from "../plugins/codex/scripts/lib/args.mjs"; | ||
|
|
||
| test("getCodexPassthroughArgs returns [] when the env var is unset", () => { | ||
| assert.deepEqual(getCodexPassthroughArgs({}), []); | ||
| }); | ||
|
|
||
| test("getCodexPassthroughArgs returns [] for blank values", () => { | ||
| assert.deepEqual(getCodexPassthroughArgs({ [CODEX_PLUGIN_ARGS_ENV]: " " }), []); | ||
| }); | ||
|
|
||
| test("getCodexPassthroughArgs tokenizes a simple config override", () => { | ||
| assert.deepEqual(getCodexPassthroughArgs({ [CODEX_PLUGIN_ARGS_ENV]: "-c model_provider=my-provider" }), [ | ||
| "-c", | ||
| "model_provider=my-provider" | ||
| ]); | ||
| }); | ||
|
|
||
| test("getCodexPassthroughArgs honors quotes and multiple flags", () => { | ||
| assert.deepEqual( | ||
| getCodexPassthroughArgs({ [CODEX_PLUGIN_ARGS_ENV]: `-c model_provider=my-provider -c 'base_url=https://x/v1'` }), | ||
| ["-c", "model_provider=my-provider", "-c", "base_url=https://x/v1"] | ||
| ); | ||
| }); | ||
|
|
||
| test("getCodexPassthroughArgs keeps backslashes literal inside single quotes", () => { | ||
| assert.deepEqual(getCodexPassthroughArgs({ [CODEX_PLUGIN_ARGS_ENV]: `--add-dir 'C:\\work\\repo'` }), [ | ||
| "--add-dir", | ||
| "C:\\work\\repo" | ||
| ]); | ||
| }); | ||
|
|
||
| test("splitRawArgumentString: single quotes preserve backslashes, double quotes still escape", () => { | ||
| assert.deepEqual(splitRawArgumentString(`'C:\\work\\repo'`), ["C:\\work\\repo"]); | ||
| assert.deepEqual(splitRawArgumentString(`"a\\"b"`), [`a"b`]); | ||
| assert.deepEqual(splitRawArgumentString(`foo\\ bar`), ["foo bar"]); | ||
| }); | ||
|
|
||
| test("splitRawArgumentString: double quotes keep backslashes before ordinary chars (POSIX)", () => { | ||
| // `\w` and `\r` are not escapable inside double quotes, so the backslash stays. | ||
| assert.deepEqual(splitRawArgumentString(`"C:\\work\\repo"`), ["C:\\work\\repo"]); | ||
| // `\\` collapses to a single backslash; `\$` and `` \` `` drop the backslash. | ||
| assert.deepEqual(splitRawArgumentString(`"a\\\\b"`), ["a\\b"]); | ||
| assert.deepEqual(splitRawArgumentString(`"price \\$5"`), ["price $5"]); | ||
| }); | ||
|
|
||
| test("getCodexPassthroughArgs keeps backslashes literal inside double quotes", () => { | ||
| assert.deepEqual(getCodexPassthroughArgs({ [CODEX_PLUGIN_ARGS_ENV]: `--add-dir "C:\\work\\repo"` }), [ | ||
| "--add-dir", | ||
| "C:\\work\\repo" | ||
| ]); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When users put a global argument whose value contains literal backslashes in
CODEX_PLUGIN_CC_ARGS—for example the documented--add-dir pathflag with a Windows path like--add-dir 'C:\work\repo'—this new env path callssplitRawArgumentString(), which treats\as an escape even inside single quotes; the argv becomes["--add-dir","C:workrepo"]before spawning Codex. That launches Codex with the wrong directory/config value, so the passthrough should use a parser that preserves quoted backslashes or otherwise handle Windows paths explicitly.Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch — fixed in f6f1ab7.
splitRawArgumentStringnow handles single-quote context before the escape check, so single-quoted content is literal (POSIX semantics) and--add-dir 'C:\work\repo'survives intact. Double-quote escaping is unchanged. Added unit tests covering single-quote backslashes, double-quote escaping, and unquoted escapes.