Skip to content

fix(claude): auto-detect CLAUDE_CODE_EXECUTABLE when spawning Claude ACP agent #164

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.

Sign up for GitHub

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
SiyaoZheng wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(claude): auto-detect CLAUDE_CODE_EXECUTABLE when spawning Claude ACP agent #164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 52 additions & 3 deletions src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import { spawn, type ChildProcess, type ChildProcessByStdio } from "node:child_process";
import {
execFileSync,
spawn,
type ChildProcess,
type ChildProcessByStdio,
} from "node:child_process";
import fs from "node:fs";
import path from "node:path";
import { Readable, Writable } from "node:stream";
Expand Down Expand Up @@ -712,10 +717,52 @@ function maybeWrapSessionControlError(
return wrapped;
}

function detectClaudeCliPath(): string | undefined {
try {
const resolved = execFileSync("which", ["claude"], {
encoding: "utf8",
timeout: 2_000,
stdio: ["ignore", "pipe", "ignore"],
}).trim();
if (resolved && fs.existsSync(resolved)) {
return resolved;
}
} catch {
// not found in PATH
}

// Common install locations
const candidates = [
path.join(process.env.HOME ?? "", ".local", "bin", "claude"),
path.join(process.env.HOME ?? "", ".claude", "bin", "claude"),
"/usr/local/bin/claude",
];
for (const candidate of candidates) {
if (fs.existsSync(candidate)) {
return candidate;
}
}

return undefined;
}

function buildAgentEnvironment(
authCredentials: Record<string, string> | undefined,
options?: { claudeAcp?: boolean },
): NodeJS.ProcessEnv {
const env: NodeJS.ProcessEnv = { ...process.env };

// claude-agent-acp requires CLAUDE_CODE_EXECUTABLE to locate the Claude CLI
// when it is not bundled as a static binary. Without this, the SDK's query()
// spawns a child process that cannot find the CLI and exits immediately,
// causing "Query closed before response received".
if (options?.claudeAcp && !env.CLAUDE_CODE_EXECUTABLE) {
const detected = detectClaudeCliPath();
if (detected) {
env.CLAUDE_CODE_EXECUTABLE = detected;
}
}

if (!authCredentials) {
return env;
}
Expand Down Expand Up @@ -747,6 +794,7 @@ function buildAgentEnvironment(
export function buildAgentSpawnOptions(
cwd: string,
authCredentials: Record<string, string> | undefined,
options?: { claudeAcp?: boolean },
): {
cwd: string;
env: NodeJS.ProcessEnv;
Expand All @@ -755,7 +803,7 @@ export function buildAgentSpawnOptions(
} {
return {
cwd,
env: buildAgentEnvironment(authCredentials),
env: buildAgentEnvironment(authCredentials, options),
stdio: ["pipe", "pipe", "pipe"],
windowsHide: true,
};
Expand Down Expand Up @@ -931,6 +979,7 @@ export class AcpClient {
const args = await resolveGeminiCommandArgs(command, initialArgs);
this.log(`spawning agent: ${command} ${args.join(" ")}`);
const geminiAcp = isGeminiAcpCommand(command, args);
const claudeAcp = isClaudeAcpCommand(command, args);
const copilotAcp = isCopilotAcpCommand(command, args);

if (copilotAcp) {
Expand All @@ -942,7 +991,7 @@ export class AcpClient {
args,
buildSpawnCommandOptions(
command,
buildAgentSpawnOptions(this.options.cwd, this.options.authCredentials),
buildAgentSpawnOptions(this.options.cwd, this.options.authCredentials, { claudeAcp }),
),
) as ChildProcessByStdio<Writable, Readable, Readable>;

Expand Down