mirror of
https://github.com/dtzp555-max/ocp.git
synced 2026-07-21 21:15:09 +00:00
fix(server): resolve claude binary from nvm/fnm/asdf and PATH fallback (#75)
Real-world macOS dev machines using nvm-managed Node hit a startup FATAL because the hardcoded candidate list in resolveClaude() only covered homebrew, /usr/local, /usr/bin, and ~/.local/bin. With Claude CLI installed at $HOME/.nvm/versions/node/<v>/bin/claude, the launchd job failed without manual CLAUDE_BIN injection. Fix: extend the candidate list with user-local Node version manager paths — nvm (with default-alias), fnm, asdf, and npm-prefix-relocated $HOME/.npm-global/bin. The existing CLAUDE_BIN env override and `which` fallback are preserved; resolution order is now explicit CLAUDE_BIN > hardcoded list > nvm/fnm/asdf > which > FATAL (with the message upgraded to mention CLAUDE_BIN as a hint). This is OCP-internal binary discovery — there is no `cli.js` operation to cite. ALIGNMENT.md Rule 2 (the rule that limits OCP to operations that exist in `cli.js`) does not constrain runtime path discovery for the OCP server itself. Smoke tests: - default (no CLAUDE_BIN): picks /opt/homebrew/bin/claude (unchanged) - CLAUDE_BIN=/nonexistent/claude: fail-fast preserved - HOME=/tmp/fakenvm with synthetic .nvm tree: candidate list contains the fake nvm path; alias-default unshift logic verified - npm test: 43/43 unit tests pass - node --check server.mjs: OK - alignment.yml blacklist grep: no hits Identified during fresh-state Round 2 testing on MacBook. Co-authored-by: dtzp555 <dtzp555@gmail.com> Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
+48
-4
@@ -30,7 +30,7 @@
|
|||||||
import { createServer } from "node:http";
|
import { createServer } from "node:http";
|
||||||
import { spawn, execFileSync } from "node:child_process";
|
import { spawn, execFileSync } from "node:child_process";
|
||||||
import { randomUUID, timingSafeEqual } from "node:crypto";
|
import { randomUUID, timingSafeEqual } from "node:crypto";
|
||||||
import { readFileSync, accessSync, existsSync, constants } from "node:fs";
|
import { readFileSync, readdirSync, accessSync, existsSync, constants } from "node:fs";
|
||||||
import { fileURLToPath } from "node:url";
|
import { fileURLToPath } from "node:url";
|
||||||
import { dirname, join } from "node:path";
|
import { dirname, join } from "node:path";
|
||||||
import { homedir } from "node:os";
|
import { homedir } from "node:os";
|
||||||
@@ -41,8 +41,48 @@ const _pkg = JSON.parse(readFileSync(join(__dirname, "package.json"), "utf8"));
|
|||||||
const modelsConfig = JSON.parse(readFileSync(join(__dirname, "models.json"), "utf8"));
|
const modelsConfig = JSON.parse(readFileSync(join(__dirname, "models.json"), "utf8"));
|
||||||
|
|
||||||
// ── Resolve claude binary ───────────────────────────────────────────────
|
// ── Resolve claude binary ───────────────────────────────────────────────
|
||||||
// Priority: CLAUDE_BIN env > well-known paths > which lookup
|
// Priority: CLAUDE_BIN env > well-known paths > nvm/fnm/asdf user-local
|
||||||
// Fail-fast if not found — never start with an unresolvable binary.
|
// installs > which lookup. Fail-fast if not found — never start with an
|
||||||
|
// unresolvable binary.
|
||||||
|
function _listVersionDirs(parent) {
|
||||||
|
try { return readdirSync(parent); } catch { return []; }
|
||||||
|
}
|
||||||
|
function _collectNodeManagerCandidates(home) {
|
||||||
|
if (!home) return [];
|
||||||
|
const out = [];
|
||||||
|
|
||||||
|
// nvm: $HOME/.nvm/versions/node/<version>/bin/claude
|
||||||
|
const nvmRoot = join(home, ".nvm/versions/node");
|
||||||
|
for (const v of _listVersionDirs(nvmRoot)) {
|
||||||
|
out.push(join(nvmRoot, v, "bin/claude"));
|
||||||
|
}
|
||||||
|
// nvm default alias: resolve $HOME/.nvm/aliases/default if it points to a version
|
||||||
|
try {
|
||||||
|
const aliasFile = join(home, ".nvm/aliases/default");
|
||||||
|
const aliasVer = readFileSync(aliasFile, "utf8").trim();
|
||||||
|
if (aliasVer) {
|
||||||
|
const direct = join(nvmRoot, aliasVer, "bin/claude");
|
||||||
|
if (!out.includes(direct)) out.unshift(direct);
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
|
|
||||||
|
// fnm: $HOME/.fnm/node-versions/<version>/installation/bin/claude
|
||||||
|
const fnmRoot = join(home, ".fnm/node-versions");
|
||||||
|
for (const v of _listVersionDirs(fnmRoot)) {
|
||||||
|
out.push(join(fnmRoot, v, "installation/bin/claude"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// asdf: $HOME/.asdf/installs/nodejs/<version>/bin/claude
|
||||||
|
const asdfRoot = join(home, ".asdf/installs/nodejs");
|
||||||
|
for (const v of _listVersionDirs(asdfRoot)) {
|
||||||
|
out.push(join(asdfRoot, v, "bin/claude"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// npm prefix-relocated: $HOME/.npm-global/bin/claude
|
||||||
|
out.push(join(home, ".npm-global/bin/claude"));
|
||||||
|
|
||||||
|
return out;
|
||||||
|
}
|
||||||
function resolveClaude() {
|
function resolveClaude() {
|
||||||
if (process.env.CLAUDE_BIN) {
|
if (process.env.CLAUDE_BIN) {
|
||||||
try {
|
try {
|
||||||
@@ -54,11 +94,13 @@ function resolveClaude() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const home = process.env.HOME || "";
|
||||||
const candidates = [
|
const candidates = [
|
||||||
"/opt/homebrew/bin/claude",
|
"/opt/homebrew/bin/claude",
|
||||||
"/usr/local/bin/claude",
|
"/usr/local/bin/claude",
|
||||||
"/usr/bin/claude",
|
"/usr/bin/claude",
|
||||||
join(process.env.HOME || "", ".local/bin/claude"),
|
join(home, ".local/bin/claude"),
|
||||||
|
..._collectNodeManagerCandidates(home),
|
||||||
];
|
];
|
||||||
for (const p of candidates) {
|
for (const p of candidates) {
|
||||||
try { accessSync(p, constants.X_OK); console.warn(`[init] CLAUDE_BIN not set, resolved to ${p}`); return p; } catch {}
|
try { accessSync(p, constants.X_OK); console.warn(`[init] CLAUDE_BIN not set, resolved to ${p}`); return p; } catch {}
|
||||||
@@ -72,6 +114,8 @@ function resolveClaude() {
|
|||||||
console.error(
|
console.error(
|
||||||
"FATAL: claude binary not found.\n" +
|
"FATAL: claude binary not found.\n" +
|
||||||
" Set CLAUDE_BIN=/path/to/claude or ensure claude is in PATH.\n" +
|
" Set CLAUDE_BIN=/path/to/claude or ensure claude is in PATH.\n" +
|
||||||
|
" Hint: if you use nvm/fnm/asdf, set CLAUDE_BIN to the absolute path\n" +
|
||||||
|
" shown by `which claude` in your interactive shell.\n" +
|
||||||
" Checked: " + candidates.join(", ")
|
" Checked: " + candidates.join(", ")
|
||||||
);
|
);
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
|
|||||||
Reference in New Issue
Block a user