The best way to control Claude Code, Codex and more from any computer or phone
update the claude entrypoint identifier for accuracy (#28410)
Theo Browne committed
Nov 1, 2026 at 19:01 UTC
ddfc4a92edbdc934fede54c32f19be9ff5af1bb4
6 files changed
+75
-21
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
+6
-2
@@ -162,6 +162,7 @@ import { signalProcessGroup } from "@t3tools/provider-core/server/processGroup";
162
import {
163
claudeSignedOutMessage,
164
makeClaudeEnvironment,
165
+ mergeClaudeProcessEnvironment,
166
resolveClaudeHomePath,
167
} from "../../provider/Drivers/ClaudeHome.ts";
168
import {
@@ -182,7 +183,6 @@ import {
183
type ClaudeScopedLimitNames,
184
} from "../../provider/claudeUsageLimits.ts";
185
import type { ManagedServerProvider } from "@t3tools/provider-core/server/snapshot";
185
-import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment";
186
import {
187
T3_CODE_DEVICE_TOOL_INSTRUCTIONS_WITH_TOOL_SEARCH,
188
T3_CODE_ORCHESTRATION_INSTRUCTIONS,
@@ -11661,7 +11661,11 @@ export const createClaudeAdapterV2 = Effect.fn("ClaudeAdapterV2Driver.create")(
11661
const queryRunner = yield* ClaudeAgentSdkQueryRunner;
11662
const serverConfig = yield* ServerConfig.ServerConfig;
11663
const continuationRequests = yield* ProviderContinuationRequests.ProviderContinuationRequests;
11664
- const baseEnvironment = yield* mergeProviderInstanceEnvironment(environment, hostEnvironment);
11664
+ const baseEnvironment = yield* mergeClaudeProcessEnvironment(
11665
+ config,
11666
+ environment,
11667
+ hostEnvironment,
11668
+ );
11669
const claudeEnvironment = yield* makeClaudeEnvironment(config, baseEnvironment);
11670
const path = yield* Path.Path;
11671
const crypto = yield* Crypto.Crypto;
apps/server/src/provider/ClaudeProvider.ts
+2
-2
@@ -37,7 +37,7 @@ import {
37
} from "@t3tools/provider-core/server/snapshotProbe";
38
import { resolveClaudeSdkExecutablePath } from "./Drivers/ClaudeExecutable.ts";
39
import { hasClaudeManagedMcpConfig, makeClaudeEnvironment } from "./Drivers/ClaudeHome.ts";
40
-import { discoverClaudeSkills, readClaudeSettingsBaseUrl } from "./Drivers/ClaudeSkills.ts";
40
+import { discoverClaudeSkills, readClaudeSettingsEnv } from "./Drivers/ClaudeSkills.ts";
41
import type { ProviderWorkspaceSnapshot } from "@t3tools/provider-core/server/driver";
42
import { makeUnavailableUsageLimits } from "@t3tools/provider-core/server/usageLimits";
43
import {
@@ -601,7 +601,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
601
602
// First-party account fields cannot verify custom endpoint credentials.
603
const baseUrl =
604
- (yield* readClaudeSettingsBaseUrl(claudeSettings, cwd, resolvedEnvironment)) ??
604
+ (yield* readClaudeSettingsEnv(claudeSettings, cwd, resolvedEnvironment)).ANTHROPIC_BASE_URL ??
605
resolvedEnvironment.ANTHROPIC_BASE_URL;
606
const endpoint = URL.parse(baseUrl?.trim() ?? "");
607
const customApiEndpoint =
apps/server/src/provider/Drivers/ClaudeDriver.ts
+2
-2
@@ -42,7 +42,6 @@ import {
42
type ProviderInstance,
43
} from "@t3tools/provider-core/server/driver";
44
import { withInstanceIdentity } from "@t3tools/provider-core/server/instanceIdentity";
45
-import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment";
45
import {
46
enrichProviderSnapshotWithVersionAdvisory,
47
makeCachedProviderMaintenanceResolution,
@@ -58,6 +57,7 @@ import {
57
import {
58
makeClaudeCapabilitiesCacheKey,
59
makeClaudeContinuationGroupKey,
60
+ mergeClaudeProcessEnvironment,
61
resolveClaudeHomePath,
62
} from "./ClaudeHome.ts";
63
import * as HostProcess from "@t3tools/shared/HostProcess";
@@ -134,7 +134,7 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv, Path.
134
const modelCatalog = catalogService
135
.current(DRIVER_KIND)
136
.pipe(Effect.map(resolveClaudeModelCatalog));
137
- const processEnv = yield* mergeProviderInstanceEnvironment(environment);
137
+ const processEnv = yield* mergeClaudeProcessEnvironment(config, environment, process.env);
138
const fallbackContinuationIdentity = defaultProviderContinuationIdentity({
139
driverKind: DRIVER_KIND,
140
instanceId,
apps/server/src/provider/Drivers/ClaudeHome.test.ts
+28
@@ -3,12 +3,14 @@ import * as NodeOS from "node:os";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import { describe, expect, it } from "@effect/vitest";
5
import * as Effect from "effect/Effect";
6
+import * as FileSystem from "effect/FileSystem";
7
import * as Path from "effect/Path";
8
9
import {
10
makeClaudeCapabilitiesCacheKey,
11
makeClaudeContinuationGroupKey,
12
makeClaudeEnvironment,
13
+ mergeClaudeProcessEnvironment,
14
resolveClaudeHomePath,
15
} from "./ClaudeHome.ts";
16
@@ -56,4 +58,30 @@ it.layer(NodeServices.layer)("ClaudeHome", (it) => {
58
}),
59
);
60
});
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
+ );
87
});
apps/server/src/provider/Drivers/ClaudeHome.ts
+24
-1
@@ -1,12 +1,15 @@
1
-import type { ClaudeSettings } from "@t3tools/contracts";
1
+import type { ClaudeSettings, ProviderInstanceEnvironment } from "@t3tools/contracts";
2
import * as Effect from "effect/Effect";
3
import * as FileSystem from "effect/FileSystem";
4
import * as Path from "effect/Path";
5
import * as Schema from "effect/Schema";
6
7
+import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment";
8
import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion";
9
import * as HostProcess from "@t3tools/shared/HostProcess";
10
11
+import { readClaudeSettingsEnv } from "./ClaudeSkills.ts";
12
+
13
const quotePath = Schema.encodeSync(Schema.fromJsonString(Schema.String));
14
15
export const resolveClaudeHomePath = Effect.fn("resolveClaudeHomePath")(function* (
@@ -42,6 +45,26 @@ export const makeClaudeEnvironment = Effect.fn("makeClaudeEnvironment")(function
45
};
46
});
47
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
+
68
/** managed-mcp.json excludes other MCP config and forbids --strict-mcp-config; omit the flag when present. */
69
export const hasClaudeManagedMcpConfig = Effect.fn("hasClaudeManagedMcpConfig")(function* () {
70
const fileSystem = yield* FileSystem.FileSystem;
apps/server/src/provider/Drivers/ClaudeSkills.ts
+13
-14
@@ -428,24 +428,25 @@ const resolveClaudeConfigDirPath = Effect.fn("resolveClaudeConfigDirPath")(funct
428
return path.join(home, ".claude");
429
});
430
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) })),
437
);
436
-const decodeSettingsBaseUrl = Schema.decodeUnknownEffect(SettingsBaseUrl);
438
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* (
441
config: Pick<ClaudeSettings, "homePath">,
442
cwd: string | undefined,
443
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> {
445
const fileSystem = yield* FileSystem.FileSystem;
446
const path = yield* Path.Path;
447
const platform = yield* HostProcess.Platform;
448
const configDirPath = yield* resolveClaudeConfigDirPath(config, environment, cwd);
448
- let baseUrl: string | undefined;
449
+ const settingsEnv: typeof SettingsEnv.Type = {};
450
for (const settingsPath of claudeSettingsPaths(
451
path,
452
configDirPath,
@@ -457,12 +458,10 @@ export const readClaudeSettingsBaseUrl = Effect.fn("readClaudeSettingsBaseUrl")(
458
.readFileString(settingsPath)
459
.pipe(Effect.orElseSucceed(() => undefined));
460
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);
463
}
465
- return baseUrl;
464
+ return settingsEnv;
465
});
466
467
// Claude's --add-dir is repeatable and variadic; parseCliArgs keeps only one value.