Skip to content

Commit f072531

Browse files
fix(server): spawned claude no longer joins the Claude Code session that launched T3
Every Claude spawn path (turns, capability and version probes, text generation) strips the host Claude Code session markers before the instance environment is merged, so a value set on the instance still wins. Turns default MCP_CONNECTION_NONBLOCKING to false so new threads send a stable tool list on their first request and share one prompt cache. Fixes #25959 Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 2f590ef commit f072531

3 files changed

Lines changed: 41 additions & 6 deletions

File tree

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ import { signalProcessGroup } from "@t3tools/provider-core/server/processGroup";
145145
import {
146146
claudeSignedOutMessage,
147147
makeClaudeEnvironment,
148+
mergeClaudeProcessEnvironment,
148149
resolveClaudeHomePath,
149150
} from "../../provider/Drivers/ClaudeHome.ts";
150151
import {
@@ -165,7 +166,6 @@ import {
165166
type ClaudeScopedLimitNames,
166167
} from "../../provider/claudeUsageLimits.ts";
167168
import type { ManagedServerProvider } from "@t3tools/provider-core/server/snapshot";
168-
import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment";
169169
import { T3_CODE_ORCHESTRATION_INSTRUCTIONS } from "@t3tools/provider-core/server/orchestrationInstructions";
170170
import { buildRuntimeInstructions } from "@t3tools/provider-core/server/runtimeInstructions";
171171
import {
@@ -11016,8 +11016,13 @@ export const createClaudeAdapterV2 = Effect.fn("ClaudeAdapterV2Driver.create")(
1101611016
const queryRunner = yield* ClaudeAgentSdkQueryRunner;
1101711017
const serverConfig = yield* ServerConfig.ServerConfig;
1101811018
const continuationRequests = yield* ProviderContinuationRequests.ProviderContinuationRequests;
11019-
const baseEnvironment = yield* mergeProviderInstanceEnvironment(environment, hostEnvironment);
11020-
const claudeEnvironment = yield* makeClaudeEnvironment(config, baseEnvironment);
11019+
const baseEnvironment = yield* mergeClaudeProcessEnvironment(environment, hostEnvironment);
11020+
const claudeEnvironment = yield* makeClaudeEnvironment(config, {
11021+
// Non-blocking connect sends whichever MCP tools are ready, so the first request's tool
11022+
// list varies per thread and a late server rewrites the whole prompt cache mid-turn.
11023+
MCP_CONNECTION_NONBLOCKING: "false",
11024+
...baseEnvironment,
11025+
});
1102111026
const path = yield* Path.Path;
1102211027
const crypto = yield* Crypto.Crypto;
1102311028
const binaryPath = yield* resolveClaudeSdkExecutablePath(

‎apps/server/src/provider/Drivers/ClaudeDriver.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import {
4242
type ProviderInstance,
4343
} from "@t3tools/provider-core/server/driver";
4444
import { withInstanceIdentity } from "@t3tools/provider-core/server/instanceIdentity";
45-
import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment";
4645
import {
4746
enrichProviderSnapshotWithVersionAdvisory,
4847
makeCachedProviderMaintenanceResolution,
@@ -58,6 +57,7 @@ import {
5857
import {
5958
makeClaudeCapabilitiesCacheKey,
6059
makeClaudeContinuationGroupKey,
60+
mergeClaudeProcessEnvironment,
6161
resolveClaudeHomePath,
6262
} from "./ClaudeHome.ts";
6363
import * as HostProcess from "@t3tools/shared/HostProcess";
@@ -134,7 +134,10 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv, Path.
134134
const modelCatalog = catalogService
135135
.current(DRIVER_KIND)
136136
.pipe(Effect.map(resolveClaudeModelCatalog));
137-
const processEnv = yield* mergeProviderInstanceEnvironment(environment);
137+
const processEnv = yield* mergeClaudeProcessEnvironment(
138+
environment,
139+
yield* HostProcess.Environment,
140+
);
138141
const fallbackContinuationIdentity = defaultProviderContinuationIdentity({
139142
driverKind: DRIVER_KIND,
140143
instanceId,

‎apps/server/src/provider/Drivers/ClaudeHome.ts‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import type { ClaudeSettings } from "@t3tools/contracts";
1+
import type { ClaudeSettings, ProviderInstanceEnvironment } from "@t3tools/contracts";
22
import * as Effect from "effect/Effect";
33
import * as FileSystem from "effect/FileSystem";
44
import * as Path from "effect/Path";
55
import * as Schema from "effect/Schema";
66

7+
import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment";
78
import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion";
89
import * as HostProcess from "@t3tools/shared/HostProcess";
910

@@ -27,6 +28,32 @@ export const resolveClaudeHomePath = Effect.fn("resolveClaudeHomePath")(function
2728
return path.resolve(path.join(home, ".claude"));
2829
});
2930

31+
// A Claude Code session that launched T3 exports these; a claude spawned with them joins that session.
32+
const CLAUDE_HOST_SESSION_VARIABLES = [
33+
"CLAUDECODE",
34+
"CLAUDE_CODE_ENTRYPOINT",
35+
"CLAUDE_CODE_SESSION_ID",
36+
"CLAUDE_CODE_HOST_SESSION_ID",
37+
"CLAUDE_CODE_CHILD_SESSION",
38+
"CLAUDE_CODE_SESSION_ATTENDED",
39+
"CLAUDE_CODE_MESSAGING_SOCKET",
40+
"CLAUDE_CODE_MESSAGING_TOKEN",
41+
"CLAUDE_CODE_EXECPATH",
42+
"CLAUDE_CODE_DESKTOP_APP_VERSION",
43+
"CLAUDE_EFFORT",
44+
"CLAUDE_PID",
45+
"CLAUDE_AGENT_SDK_VERSION",
46+
];
47+
48+
export const mergeClaudeProcessEnvironment = Effect.fn("mergeClaudeProcessEnvironment")(function* (
49+
environment: ProviderInstanceEnvironment | undefined,
50+
hostEnvironment: NodeJS.ProcessEnv,
51+
) {
52+
const baseEnv = { ...hostEnvironment };
53+
for (const name of CLAUDE_HOST_SESSION_VARIABLES) delete baseEnv[name];
54+
return yield* mergeProviderInstanceEnvironment(environment, baseEnv);
55+
});
56+
3057
export const makeClaudeEnvironment = Effect.fn("makeClaudeEnvironment")(function* (
3158
config: Pick<ClaudeSettings, "homePath">,
3259
baseEnv?: NodeJS.ProcessEnv,

0 commit comments

Comments
 (0)