fix(cli): resolve --continue/--session-id flag conflict in Claude 2.0.64 #93
+382
−58
Conversation
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
Claude Code 2.0.64+ rejects --session-id when used with --continue, causing: "Error: --session-id cannot be used with --continue or --resume" Solution: Convert --continue to --resume by finding the last session ID. Changes: - Add claudeFindLastSession() utility to find most recent valid session - claudeLocal.ts: Intercept --continue flag and convert to --resume with last session - Handle all session-related flags (--continue, --resume, --session-id) transparently - Only UUID-format sessions are returned for --resume compatibility - Add comprehensive unit tests for the --continue conversion logic Fixes critical bug where "happy --continue" failed with flag conflict error.
Reverts: - README.md: restore claude-code-router link (line 39) - package.json: restore version 0.12.0 (was 0.12.0-0) - src/index.ts: restore --claude-env parsing (lines 271-284) Removes: - src/api/apiSession.test.ts: belongs in server-unreachable PR, not here Fixes: - src/claude/claudeLocal.test.ts:5-8: apply vi.hoisted pattern for vitest compatibility The vi.hoisted() wrapper ensures mock variables are available during vitest's module hoisting phase, fixing "Cannot access 'mockFn' before initialization" errors. Note: One test (should remove --continue from claudeArgs after conversion) has a pre-existing logic issue in the implementation - the test expects the claudeArgs array to be mutated, but the implementation uses array filtering which creates a new array.
Previous behavior: Test checked if original claudeArgs array was mutated to remove --continue, but filter() creates a new array. What changed: Check mockSpawn.mock.calls[0][1] (actual spawn arguments) instead of the original claudeArgs array. Why: The implementation uses filter() which returns a new array rather than mutating the original. The test should verify what actually gets passed to spawn, not internal implementation details.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Problem
Users can't use
happy --continuesince Claude Code 2.0.64 - it crashes with:This blocks anyone trying to continue their last session, which is a core workflow.
Related: Issue #87 (--resume --continue not working since 0.12.0)
Root Cause
Claude Code 2.0.64 introduced mutual exclusivity between
--session-idand--continue/--resumeflags. Happy was adding--session-idfor session tracking while users passed--continue, triggering the conflict.Solution
Intercept
--continueand convert it to--resume <last-session-id>:claudeFindLastSession()- Scans~/.claude/projects/for the most recent valid sessionclaudeLocal.ts- Detects--continue, finds last session, replaces with--resume <id>--resume, no conflict)Changes
src/claude/utils/claudeFindLastSession.tssrc/claude/claudeLocal.ts--continue, convert to--resume; handle--resumewithout IDsrc/claude/claudeLocal.test.tsBug Fix: Preserve Claude's Native --resume Picker
Commit:
e56fb57Happy was breaking Claude's native
--resumepicker by always adding--session-id. Now properly delegates to Claude's existing interactive session picker when--resumeis used without an ID.Changes:
extractFlag()- Returns{found: false}when value required but missing--resumein claudeArgs before adding--session-idTesting
Why Merge This
--continueto work