Skip to content

fix(codex-shim): pass non-remote subcommands through #590

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
hyamakawa7 wants to merge 1 commit into
base: main
Choose a base branch
from
+51 −3
Open

fix(codex-shim): pass non-remote subcommands through #590

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
1 change: 1 addition & 0 deletions docs/codex-monitor-beta.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ codex exec ...
codex app-server ...
codex login
codex logout
codex plugin ...
```

The shim also passes through when the current project is not in Codex monitor
Expand Down
7 changes: 6 additions & 1 deletion scripts/drivers/types/codex/codex-shim.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,12 @@ case "$command_name" in
AGMSG_REAL_CODEX="$real_codex" exec "$monitor_cmd" --project "$project" --codex-command resume --
fi
;;
app-server|exec|login|logout|mcp|completion|debug|apply|review|sandbox|help|--help|-h|version|--version|-V)
# Keep known non-remote subcommands out of the monitor bridge. The catch-all
# below is intentional: prompt strings and remote-aware session commands
# (fork/archive/delete/unarchive) must still reach the shared app-server.
# Add newly introduced non-remote Codex subcommands to this list.
app-server|exec|e|login|logout|mcp|mcp-server|plugin|remote-control|completion|update|doctor|\
cloud|exec-server|features|debug|apply|a|review|sandbox|help|--help|-h|version|--version|-V)
exec "$real_codex" "$@"
;;
*)
Expand Down
46 changes: 44 additions & 2 deletions tests/test_codex_shim.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,56 @@ teardown() {
@test "codex shim: noninteractive codex subcommands pass through even in monitor mode" {
bash "$SCRIPTS/delivery.sh" set monitor codex "$TEST_PROJECT" >/dev/null

AGMSG_REAL_CODEX="$FAKE_CODEX" AGMSG_CODEX_MONITOR_CMD="$FAKE_MONITOR" \
run bash "$TYPES/codex/codex-shim.sh" exec echo hi
run bash -c 'cd "$TEST_PROJECT" && AGMSG_REAL_CODEX="$FAKE_CODEX" AGMSG_CODEX_MONITOR_CMD="$FAKE_MONITOR" bash "$TYPES/codex/codex-shim.sh" exec echo hi'

[ "$status" -eq 0 ]
grep -q "real-codex <exec> <echo> <hi>" "$CALL_LOG"
! grep -q "^monitor" "$CALL_LOG"
}

@test "codex shim: plugin marketplace commands pass through even in monitor mode" {
bash "$SCRIPTS/delivery.sh" set monitor codex "$TEST_PROJECT" >/dev/null

run bash -c 'cd "$TEST_PROJECT" && AGMSG_REAL_CODEX="$FAKE_CODEX" AGMSG_CODEX_MONITOR_CMD="$FAKE_MONITOR" bash "$TYPES/codex/codex-shim.sh" plugin marketplace add owner/repository'

[ "$status" -eq 0 ]
grep -Fq "real-codex <plugin> <marketplace> <add> <owner/repository>" "$CALL_LOG"
! grep -q "^monitor" "$CALL_LOG"
}

@test "codex shim: known non-remote subcommands and aliases bypass the monitor bridge" {
bash "$SCRIPTS/delivery.sh" set monitor codex "$TEST_PROJECT" >/dev/null

local subcommand
for subcommand in mcp-server remote-control update doctor cloud exec-server features e a; do
: > "$CALL_LOG"

run bash -c 'cd "$TEST_PROJECT" && AGMSG_REAL_CODEX="$FAKE_CODEX" AGMSG_CODEX_MONITOR_CMD="$FAKE_MONITOR" bash "$TYPES/codex/codex-shim.sh" "$1" test-arg' _ "$subcommand"

[ "$status" -eq 0 ]
grep -Fq "real-codex <$subcommand> <test-arg>" "$CALL_LOG"
! grep -q "^monitor" "$CALL_LOG"
done
}

@test "codex shim: remote-aware session commands continue through the monitor bridge" {
bash "$SCRIPTS/delivery.sh" set monitor codex "$TEST_PROJECT" >/dev/null

local subcommand
for subcommand in fork archive delete unarchive; do
: > "$CALL_LOG"

run bash -c 'cd "$TEST_PROJECT" && AGMSG_REAL_CODEX="$FAKE_CODEX" AGMSG_CODEX_MONITOR_CMD="$FAKE_MONITOR" bash "$TYPES/codex/codex-shim.sh" "$1" test-session' _ "$subcommand"

[ "$status" -eq 0 ]
grep -Fq "monitor real=$FAKE_CODEX <--project> <$TEST_PROJECT> <--codex-command> <codex> <--> <$subcommand> <test-session>" "$CALL_LOG" || {
echo "unexpected routing for $subcommand: $(cat "$CALL_LOG")" >&3
false
}
! grep -q "^real-codex" "$CALL_LOG"
done
}

@test "codex shim: --cd project is used for monitor detection" {
bash "$SCRIPTS/delivery.sh" set monitor codex "$TEST_PROJECT" >/dev/null

Expand Down
Loading