Skip to content

Commit ddfc4a9

Browse files
authored
update the claude entrypoint identifier for accuracy (pingdotgg#28410)
1 parent b92c8f4 commit ddfc4a9

6 files changed

Lines changed: 75 additions & 21 deletions

File tree

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ import { signalProcessGroup } from "@t3tools/provider-core/server/processGroup";
162162
import {
163163
claudeSignedOutMessage,
164164
makeClaudeEnvironment,
165+
mergeClaudeProcessEnvironment,
165166
resolveClaudeHomePath,
166167
} from "../../provider/Drivers/ClaudeHome.ts";
167168
import {
@@ -182,7 +183,6 @@ import {
182183
type ClaudeScopedLimitNames,
183184
} from "../../provider/claudeUsageLimits.ts";
184185
import type { ManagedServerProvider } from "@t3tools/provider-core/server/snapshot";
185-
import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment";
186186
import {
187187
T3_CODE_DEVICE_TOOL_INSTRUCTIONS_WITH_TOOL_SEARCH,
188188
T3_CODE_ORCHESTRATION_INSTRUCTIONS,
@@ -11661,7 +11661,11 @@ export const createClaudeAdapterV2 = Effect.fn("ClaudeAdapterV2Driver.create")(
1166111661
const queryRunner = yield* ClaudeAgentSdkQueryRunner;
1166211662
const serverConfig = yield* ServerConfig.ServerConfig;
1166311663
const continuationRequests = yield* ProviderContinuationRequests.ProviderContinuationRequests;
11664-
const baseEnvironment = yield* mergeProviderInstanceEnvironment(environment, hostEnvironment);
11664+
const baseEnvironment = yield* mergeClaudeProcessEnvironment(
11665+
config,
11666+
environment,
11667+
hostEnvironment,
11668+
);
1166511669
const claudeEnvironment = yield* makeClaudeEnvironment(config, baseEnvironment);
1166611670
const path = yield* Path.Path;
1166711671
const crypto = yield* Crypto.Crypto;

‎apps/server/src/provider/ClaudeProvider.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import {
3737
} from "@t3tools/provider-core/server/snapshotProbe";
3838
import { resolveClaudeSdkExecutablePath } from "./Drivers/ClaudeExecutable.ts";
3939
import { hasClaudeManagedMcpConfig, makeClaudeEnvironment } from "./Drivers/ClaudeHome.ts";
40-
import { discoverClaudeSkills, readClaudeSettingsBaseUrl } from "./Drivers/ClaudeSkills.ts";
40+
import { discoverClaudeSkills, readClaudeSettingsEnv } from "./Drivers/ClaudeSkills.ts";
4141
import type { ProviderWorkspaceSnapshot } from "@t3tools/provider-core/server/driver";
4242
import { makeUnavailableUsageLimits } from "@t3tools/provider-core/server/usageLimits";
4343
import {
@@ -601,7 +601,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
601601

602602
// First-party account fields cannot verify custom endpoint credentials.
603603
const baseUrl =
604-
(yield* readClaudeSettingsBaseUrl(claudeSettings, cwd, resolvedEnvironment)) ??
604+
(yield* readClaudeSettingsEnv(claudeSettings, cwd, resolvedEnvironment)).ANTHROPIC_BASE_URL ??
605605
resolvedEnvironment.ANTHROPIC_BASE_URL;
606606
const endpoint = URL.parse(baseUrl?.trim() ?? "");
607607
const customApiEndpoint =

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

Lines changed: 2 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,7 @@ 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(config, environment, process.env);
138138
const fallbackContinuationIdentity = defaultProviderContinuationIdentity({
139139
driverKind: DRIVER_KIND,
140140
instanceId,

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ import * as NodeOS from "node:os";
33
import * as NodeServices from "@effect/platform-node/NodeServices";
44
import { describe, expect, it } from "@effect/vitest";
55
import * as Effect from "effect/Effect";
6+
import * as FileSystem from "effect/FileSystem";
67
import * as Path from "effect/Path";
78

89
import {
910
makeClaudeCapabilitiesCacheKey,
1011
makeClaudeContinuationGroupKey,
1112
makeClaudeEnvironment,
13+
mergeClaudeProcessEnvironment,
1214
resolveClaudeHomePath,
1315
} from "./ClaudeHome.ts";
1416

@@ -56,4 +58,30 @@ it.layer(NodeServices.layer)("ClaudeHome", (it) => {
5658
}),
5759
);
5860
});
61+
62+
it.effect("labels Claude processes t3-code unless instance env or Claude settings set one", () =>
63+
Effect.gen(function* () {
64+
const fileSystem = yield* FileSystem.FileSystem;
65+
const path = yield* Path.Path;
66+
const homePath = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-home-" });
67+
const host = { CLAUDE_CODE_ENTRYPOINT: "claude-desktop", KEEP: "1" };
68+
const instance = [{ name: "CLAUDE_CODE_ENTRYPOINT", value: "instance", sensitive: false }];
69+
70+
expect(yield* mergeClaudeProcessEnvironment({ homePath }, undefined, host)).toMatchObject({
71+
CLAUDE_CODE_ENTRYPOINT: "t3-code",
72+
KEEP: "1",
73+
});
74+
expect(
75+
(yield* mergeClaudeProcessEnvironment({ homePath }, instance, host)).CLAUDE_CODE_ENTRYPOINT,
76+
).toBe("instance");
77+
78+
yield* fileSystem.writeFileString(
79+
path.join(homePath, "settings.json"),
80+
JSON.stringify({ env: { CLAUDE_CODE_ENTRYPOINT: "custom" } }),
81+
);
82+
expect(
83+
(yield* mergeClaudeProcessEnvironment({ homePath }, instance, host)).CLAUDE_CODE_ENTRYPOINT,
84+
).toBe("custom");
85+
}),
86+
);
5987
});

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

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
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

11+
import { readClaudeSettingsEnv } from "./ClaudeSkills.ts";
12+
1013
const quotePath = Schema.encodeSync(Schema.fromJsonString(Schema.String));
1114

1215
export const resolveClaudeHomePath = Effect.fn("resolveClaudeHomePath")(function* (
@@ -42,6 +45,26 @@ export const makeClaudeEnvironment = Effect.fn("makeClaudeEnvironment")(function
4245
};
4346
});
4447

48+
/**
49+
* Base env for the Claude processes T3 Code runs, before `makeClaudeEnvironment`.
50+
* Claude Code reads its entrypoint from the process env, not its settings `env`, so T3 Code applies that override itself.
51+
*/
52+
export const mergeClaudeProcessEnvironment = Effect.fn("mergeClaudeProcessEnvironment")(function* (
53+
config: Pick<ClaudeSettings, "homePath">,
54+
instanceEnvironment: ProviderInstanceEnvironment | undefined,
55+
hostEnvironment: NodeJS.ProcessEnv,
56+
) {
57+
const environment = yield* mergeProviderInstanceEnvironment(instanceEnvironment, {
58+
...hostEnvironment,
59+
CLAUDE_CODE_ENTRYPOINT: "t3-code",
60+
});
61+
const settingsEntrypoint = (yield* readClaudeSettingsEnv(config, undefined, environment))
62+
.CLAUDE_CODE_ENTRYPOINT;
63+
return settingsEntrypoint
64+
? { ...environment, CLAUDE_CODE_ENTRYPOINT: settingsEntrypoint }
65+
: environment;
66+
});
67+
4568
/** managed-mcp.json excludes other MCP config and forbids --strict-mcp-config; omit the flag when present. */
4669
export const hasClaudeManagedMcpConfig = Effect.fn("hasClaudeManagedMcpConfig")(function* () {
4770
const fileSystem = yield* FileSystem.FileSystem;

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

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -428,24 +428,25 @@ const resolveClaudeConfigDirPath = Effect.fn("resolveClaudeConfigDirPath")(funct
428428
return path.join(home, ".claude");
429429
});
430430

431-
const SettingsBaseUrl = fromLenientJson(
432-
Schema.Struct({
433-
env: Schema.optional(Schema.Struct({ ANTHROPIC_BASE_URL: Schema.optional(Schema.String) })),
434-
}),
431+
const SettingsEnv = Schema.Struct({
432+
ANTHROPIC_BASE_URL: Schema.optional(Schema.String),
433+
CLAUDE_CODE_ENTRYPOINT: Schema.optional(Schema.String),
434+
});
435+
const decodeSettingsEnv = Schema.decodeUnknownEffect(
436+
fromLenientJson(Schema.Struct({ env: Schema.optional(SettingsEnv) })),
435437
);
436-
const decodeSettingsBaseUrl = Schema.decodeUnknownEffect(SettingsBaseUrl);
437438

438-
/** ANTHROPIC_BASE_URL from Claude's settings `env`, which Claude Code applies over the process env. */
439-
export const readClaudeSettingsBaseUrl = Effect.fn("readClaudeSettingsBaseUrl")(function* (
439+
/** The `env` values T3 Code reads from Claude's user and managed settings; later files win. */
440+
export const readClaudeSettingsEnv = Effect.fn("readClaudeSettingsEnv")(function* (
440441
config: Pick<ClaudeSettings, "homePath">,
441442
cwd: string | undefined,
442443
environment: NodeJS.ProcessEnv,
443-
): Effect.fn.Return<string | undefined, never, FileSystem.FileSystem | Path.Path> {
444+
): Effect.fn.Return<typeof SettingsEnv.Type, never, FileSystem.FileSystem | Path.Path> {
444445
const fileSystem = yield* FileSystem.FileSystem;
445446
const path = yield* Path.Path;
446447
const platform = yield* HostProcess.Platform;
447448
const configDirPath = yield* resolveClaudeConfigDirPath(config, environment, cwd);
448-
let baseUrl: string | undefined;
449+
const settingsEnv: typeof SettingsEnv.Type = {};
449450
for (const settingsPath of claudeSettingsPaths(
450451
path,
451452
configDirPath,
@@ -457,12 +458,10 @@ export const readClaudeSettingsBaseUrl = Effect.fn("readClaudeSettingsBaseUrl")(
457458
.readFileString(settingsPath)
458459
.pipe(Effect.orElseSucceed(() => undefined));
459460
if (contents === undefined) continue;
460-
const parsed = yield* decodeSettingsBaseUrl(contents).pipe(
461-
Effect.orElseSucceed(() => undefined),
462-
);
463-
baseUrl = parsed?.env?.ANTHROPIC_BASE_URL ?? baseUrl;
461+
const parsed = yield* decodeSettingsEnv(contents).pipe(Effect.orElseSucceed(() => undefined));
462+
Object.assign(settingsEnv, parsed?.env);
464463
}
465-
return baseUrl;
464+
return settingsEnv;
466465
});
467466

468467
// Claude's --add-dir is repeatable and variadic; parseCliArgs keeps only one value.

0 commit comments

Comments
 (0)