Skip to content

Fix claude shim conflicting with --resume and --continue #78

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
lawrencecchen merged 1 commit into from
Feb 19, 2026
Merged

Fix claude shim conflicting with --resume and --continue #78

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
25 changes: 22 additions & 3 deletions Resources/bin/claude
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,34 @@ fi
# Find real claude.
REAL_CLAUDE="$(find_real_claude)" || { echo "Error: claude not found in PATH" >&2; exit 127; }

# Pass through subcommands that don't support session/hook flags.
case "${1:-}" in
mcp|config|api-key) exec "$REAL_CLAUDE" "$@" ;;
Comment on lines +31 to +32

@chatgpt-codex-connector chatgpt-codex-connector Bot Feb 19, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Unset CLAUDECODE before subcommand passthrough

The new early passthrough for mcp|config|api-key executes claude before CLAUDECODE is cleared, which bypasses the wrapper’s own nested-session safeguard for these commands. In cmux terminals launched from Claude Code (where CLAUDECODE is set), this can reintroduce nested-session detection specifically for these subcommands, even though other invocations still unset the variable first. Move unset CLAUDECODE above this case so all cmux invocations get consistent environment sanitization.

Useful? React with 👍 / 👎.

esac

# Unset CLAUDECODE to avoid "nested session" detection — cmux terminals are
# independent sessions even when the parent shell was launched from Claude Code.
unset CLAUDECODE

# Generate a fresh session ID for this invocation.
SESSION_ID="$(uuidgen | tr '[:upper:]' '[:lower:]')"
# Check if the user already specified a session/resume flag.
# If so, don't inject our own --session-id (it would conflict).
SKIP_SESSION_ID=false
for arg in "$@"; do
case "$arg" in
--resume|--resume=*|--session-id|--session-id=*|--continue|-c)
SKIP_SESSION_ID=true
break
;;
esac
done

# Build hooks settings JSON.
# Claude Code merges --settings additively with the user's own settings.json.
HOOKS_JSON='{"hooks":{"SessionStart":[{"matcher":"","hooks":[{"type":"command","command":"cmux claude-hook session-start","timeout":10}]}],"Stop":[{"matcher":"","hooks":[{"type":"command","command":"cmux claude-hook stop","timeout":10}]}],"Notification":[{"matcher":"","hooks":[{"type":"command","command":"cmux claude-hook notification","timeout":10}]}]}}'

exec "$REAL_CLAUDE" --session-id "$SESSION_ID" --settings "$HOOKS_JSON" "$@"
if [[ "$SKIP_SESSION_ID" == true ]]; then
exec "$REAL_CLAUDE" --settings "$HOOKS_JSON" "$@"
else
SESSION_ID="$(uuidgen | tr '[:upper:]' '[:lower:]')"
exec "$REAL_CLAUDE" --session-id "$SESSION_ID" --settings "$HOOKS_JSON" "$@"
fi