Fix Claude hooks-disabled env passthrough - #4418

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated (UTC)
cmux	Ready	Preview, Comment	May 26, 2026 7:54am
cmux-staging	Building	Preview, Comment	May 26, 2026 7:54am

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

Greptile Summary

This PR fixes CMUX_CLAUDE_HOOKS_DISABLED=1 passthrough by splitting it into its own early-exit path that preserves the full cmux terminal environment instead of routing through exec_real_claude_passthrough (which strips all CMUX_* vars and TERMINFO). CLAUDECODE is still unset to prevent nested-session detection and stale auth-selection env is still cleared via clear_inherited_claude_auth_selection_env.

• Separates the CMUX_CLAUDE_HOOKS_DISABLED=1 branch from the IN_CMUX==0 || !cmux_socket_available passthrough, making hooks-disabled a dedicated user-managed-hooks path that no longer strips CMUX_* or TERMINFO.
• Splits test_agents_subcommand_removes_cmux_terminal_fingerprint into two focused tests: one asserting agents still strips CMUX env when hooks are managed by cmux, and a new test_hooks_disabled_preserves_cmux_terminal_env_for_custom_hooks explicitly verifying CMUX env is intact for both interactive and command-like invocations when hooks are disabled.
• Adds test_hooks_disabled_clears_stale_auth_selection_before_passthrough to regression-cover auth cleanup on the hooks-disabled path.

Confidence Score: 5/5

Safe to merge — the change is a clean behavioural split with explicit regression coverage for the new path.

The hooks-disabled branch is narrow and self-contained: it unsets CLAUDECODE, runs auth cleanup, and execs real claude without touching CMUX_* or TERMINFO — exactly the stated intent. The remaining passthrough and hook-injection paths are untouched. New tests exercise both interactive and command-like invocations under hooks-disabled and verify auth-selection cleanup, covering the core regression surface.

No files require special attention.

Important Files Changed

Flowchart

%%{init: {'theme': 'neutral'}}%%
flowchart TD
    A[claude wrapper invoked] --> B{CMUX_CLAUDE_HOOKS_DISABLED == 1?}
    B -- Yes --> C[unset CLAUDECODE if IN_CMUX=1]
    C --> D[clear_inherited_claude_auth_selection_env]
    D --> E[exec real claude\nCMUX_* and TERMINFO preserved]
    B -- No --> F{IN_CMUX == 0 OR socket unavailable?}
    F -- Yes --> G[unset CLAUDECODE if IN_CMUX=1]
    G --> H[clear_inherited_claude_auth_selection_env]
    H --> I[exec_real_claude_passthrough\nCMUX_* and TERMINFO stripped]
    F -- No --> J[find real claude]
    J --> K{should_inject_claude_hooks?}
    K -- No command-like --> L[clear auth env]
    L --> I
    K -- Yes interactive --> M[unset CLAUDECODE]
    M --> N[clear auth env]
    N --> O[inject --session-id and --settings hooks JSON]
    O --> P[exec real claude with hooks]

_{Reviews (6): Last reviewed commit: "Merge remote-tracking branch 'origin/mai..." | Re-trigger Greptile}