fix: restore bundled agent CLI resolution

- Upgrade EJClaw bundled Codex CLI to 0.124.0 for gpt-5.5 access
- Resolve Claude Agent SDK native binary packages via package.json
- Prefer glibc Claude binary before musl on Linux and align platform binary names
- Add regression coverage for optional package resolution
This commit is contained in:
ejclaw
2026-04-24 13:13:11 +09:00
parent f84dccfa10
commit 3eee842164
4 changed files with 74 additions and 20 deletions

View File

@@ -45,7 +45,7 @@ function platformCandidates(
return [
{
pkg: `@anthropic-ai/claude-agent-sdk-darwin-${arch}`,
file: arch === 'arm64' ? 'cli' : 'cli',
file: 'claude',
},
];
}
@@ -53,7 +53,7 @@ function platformCandidates(
return [
{
pkg: `@anthropic-ai/claude-agent-sdk-win32-${arch}`,
file: 'cli.exe',
file: 'claude.exe',
},
];
}
@@ -127,12 +127,22 @@ export function resolveBundledClaudeCodeExecutable(options?: {
* Default package directory resolver. Uses `require.resolve` against this
* module's location so it works regardless of whether agent-runner is invoked
* from its own node_modules layout or via a parent workspace.
*
* Important: the SDK's optional native-binary packages may not expose a bare
* package entrypoint, so `require.resolve(pkg)` can fail even when the package
* and binary are installed. Resolve `package.json` first, then fall back to the
* bare package only for package layouts that do expose an entrypoint.
*/
function defaultResolvePackageDir(pkg: string): string | null {
const req = createRequire(import.meta.url);
try {
const pkgJson = req.resolve(`${pkg}/package.json`);
return path.dirname(pkgJson);
} catch {
// Fall through to legacy/bare-entrypoint resolution below.
}
try {
// Resolve the package entrypoint instead of package.json because the SDK's
// exports map does not expose `./package.json`.
const req = createRequire(import.meta.url);
const entrypoint = req.resolve(pkg);
return path.dirname(entrypoint);
} catch {
@@ -142,5 +152,6 @@ function defaultResolvePackageDir(pkg: string): string | null {
export const __test__ = {
platformCandidates,
defaultResolvePackageDir,
ENV_OVERRIDE,
};