-
Notifications
You must be signed in to change notification settings - Fork 531
fix: broaden Claude CLI discovery paths #433
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
WhiskyChoy
wants to merge
2
commits into
op7418:main
Choose a base branch
from
WhiskyChoy:codex/fix-claude-cli-discovery
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.
+272
−92
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
Some comments aren't visible on the classic Files Changed page.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| import { describe, it } from 'node:test'; | ||
| import assert from 'node:assert/strict'; | ||
|
|
||
| import { getClaudeCandidatePathsFor, getExtraPathDirsFor } from '../../lib/platform'; | ||
|
|
||
| describe('Claude path discovery helpers', () => { | ||
| it('darwin search dirs include pnpm, yarn, and claude local compatibility paths', () => { | ||
| const home = '/Users/tester'; | ||
| const dirs = getExtraPathDirsFor('darwin', home, { | ||
| PNPM_HOME: '/Users/tester/Library/pnpm', | ||
| } as unknown as NodeJS.ProcessEnv); | ||
|
|
||
| assert.ok(dirs.includes('/Users/tester/Library/pnpm')); | ||
| assert.ok(dirs.includes('/Users/tester/.claude/local')); | ||
| assert.ok(dirs.includes('/Users/tester/.yarn/bin')); | ||
| }); | ||
|
|
||
| it('darwin candidates include executable paths for pnpm and claude local wrappers', () => { | ||
| const home = '/Users/tester'; | ||
| const candidates = getClaudeCandidatePathsFor('darwin', home, { | ||
| PNPM_HOME: '/Users/tester/Library/pnpm', | ||
| } as unknown as NodeJS.ProcessEnv); | ||
|
|
||
| assert.ok(candidates.includes('/Users/tester/Library/pnpm/claude')); | ||
| assert.ok(candidates.includes('/Users/tester/.claude/local/claude')); | ||
| assert.ok( | ||
| candidates.indexOf('/opt/homebrew/bin/claude') < candidates.indexOf('/Users/tester/Library/pnpm/claude'), | ||
| 'homebrew candidates should stay ahead of npm-family shims', | ||
| ); | ||
| assert.ok( | ||
| candidates.indexOf('/Users/tester/.claude/local/claude') < candidates.indexOf('/Users/tester/Library/pnpm/claude'), | ||
| 'native compatibility wrappers should stay ahead of pnpm shims', | ||
| ); | ||
| }); | ||
|
|
||
| it('win32 search dirs include pnpm and claude local compatibility paths', () => { | ||
| const home = 'C:\\Users\\tester'; | ||
| const dirs = getExtraPathDirsFor('win32', home, { | ||
| APPDATA: 'C:\\Users\\tester\\AppData\\Roaming', | ||
| LOCALAPPDATA: 'C:\\Users\\tester\\AppData\\Local', | ||
| PNPM_HOME: 'C:\\Users\\tester\\AppData\\Local\\pnpm', | ||
| } as unknown as NodeJS.ProcessEnv); | ||
|
|
||
| assert.ok(dirs.includes('C:\\Users\\tester\\AppData\\Local\\pnpm')); | ||
| assert.ok(dirs.includes('C:\\Users\\tester\\.claude\\local')); | ||
| }); | ||
|
|
||
| it('win32 candidates include pnpm cmd wrappers', () => { | ||
| const home = 'C:\\Users\\tester'; | ||
| const candidates = getClaudeCandidatePathsFor('win32', home, { | ||
| APPDATA: 'C:\\Users\\tester\\AppData\\Roaming', | ||
| LOCALAPPDATA: 'C:\\Users\\tester\\AppData\\Local', | ||
| PNPM_HOME: 'C:\\Users\\tester\\AppData\\Local\\pnpm', | ||
| } as unknown as NodeJS.ProcessEnv); | ||
|
|
||
| assert.ok(candidates.includes('C:\\Users\\tester\\AppData\\Local\\pnpm\\claude.cmd')); | ||
| assert.ok(candidates.includes('C:\\Users\\tester\\.claude\\local\\claude.cmd')); | ||
| assert.ok( | ||
| candidates.indexOf('C:\\Users\\tester\\.claude\\local\\claude.cmd') < | ||
| candidates.indexOf('C:\\Users\\tester\\AppData\\Local\\pnpm\\claude.cmd'), | ||
| 'native compatibility wrappers should stay ahead of pnpm shims on Windows', | ||
| ); | ||
| }); | ||
| }); | ||
Oops, something went wrong.
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.
The new tests verify presence of pnpm/yarn/compatibility paths, but they don't cover the priority/ordering semantics that
findClaudeBinary()depends on (first successful candidate wins). Adding an assertion about the relative ordering (e.g. native dirs/candidates appearing before npm-family ones) would help prevent regressions where discovery starts preferring the wrong installation channel.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.
Agreed. I added explicit ordering assertions in the path helper tests so they now cover the first-match priority that
findClaudeBinary()depends on. Included in 1dfc6e7.