Skip to content

fix: clear CLAUDECODE env to prevent nested-session detection #413

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
cyyij wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −2
Open

fix: clear CLAUDECODE env to prevent nested-session detection #413

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
13 changes: 11 additions & 2 deletions src/acp-agent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,6 +1227,7 @@ export class ClaudeAcpAgent implements Agent {
...userProvidedOptions,
env: {
...process.env,
CLAUDECODE: "", // Prevent nested-session detection when spawned from within Claude Code
...userProvidedOptions?.env,
...createEnvForGateway(this.gatewayAuthMeta),
},
Expand Down Expand Up @@ -1303,11 +1304,19 @@ export class ClaudeAcpAgent implements Agent {
initializationResult = await q.initializationResult();
} catch (error) {
if (
creationOpts.resume &&
error instanceof Error &&
error.message === "Query closed before response received"
) {
throw RequestError.resourceNotFound(sessionId);
if (creationOpts.resume) {
throw RequestError.resourceNotFound(sessionId);
}
// For new sessions, provide a meaningful error instead of generic "Internal error"
throw RequestError.internalError(
undefined,
"Claude Code process exited before initialization completed. " +
"Ensure Claude Code is installed and accessible. " +
"You can set CLAUDE_CODE_EXECUTABLE to the path of the Claude CLI.",
);
}
throw error;
}
Expand Down