The best way to control Claude Code, Codex and more from any computer or phone
perf(server): avoid loading provider drivers for terminal imports (#33898)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Adamulek123 committed
Nov 12, 2026 at 22:08 UTC
fc533a6c6cc2a0555cfe7dd1312f2e4796dd30d7
4 files changed
+16
-5
apps/server/src/server.ts
+3
-1
@@ -493,7 +493,9 @@ const layerCheckpointStore = CheckpointStore.layer.pipe(Layer.provide(layerVcsDr
493
494
const layerPortScanner = PortScanner.layer.pipe(Layer.provide(ProcessRunner.layer));
495
496
-const layerTerminal = TerminalManager.layer.pipe(
496
+const layerTerminal = TerminalManager.layer(
497
+ ProviderInstanceRegistryHydration.deriveProviderInstanceConfigMap,
498
+).pipe(
499
Layer.provide(layerPtyAdapter),
500
Layer.provide(layerPortScanner),
501
Layer.provide(layerNativeTelemetry),
apps/server/src/serverSettings.test.ts
+2
@@ -1,3 +1,4 @@
1
+import { deriveProviderInstanceConfigMap } from "./provider/ProviderInstanceRegistryHydration.ts";
2
import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import {
@@ -2074,6 +2075,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("server settings"
2075
});
2076
2077
const environment = yield* resolveProviderInstanceTerminalEnvironment({
2078
+ deriveProviderInstanceConfigMap,
2079
serverSettings,
2080
path,
2081
rawProviderInstanceId: instanceId,
apps/server/src/terminal/Manager.test.ts
+2
@@ -1,3 +1,4 @@
1
+import { deriveProviderInstanceConfigMap } from "../provider/ProviderInstanceRegistryHydration.ts";
2
import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import { assert, it } from "@effect/vitest";
@@ -2054,6 +2055,7 @@ it.layer(
2055
const path = yield* Path.Path;
2056
const serverSettings = yield* ServerSettings.ServerSettingsService;
2057
const environment = yield* TerminalManager.resolveProviderInstanceTerminalEnvironment({
2058
+ deriveProviderInstanceConfigMap,
2059
serverSettings,
2060
path,
2061
rawProviderInstanceId: "configured_home",
apps/server/src/terminal/Manager.ts
+9
-4
@@ -67,7 +67,7 @@ import * as ServerConfig from "../config.ts";
67
import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment";
68
import { resolveCodexHomeLayout } from "../provider/Drivers/CodexHomeLayout.ts";
69
import { makeClaudeEnvironment } from "../provider/Drivers/ClaudeHome.ts";
70
-import { deriveProviderInstanceConfigMap } from "../provider/ProviderInstanceRegistryHydration.ts";
70
+import type { deriveProviderInstanceConfigMap } from "../provider/ProviderInstanceRegistryHydration.ts";
71
import * as ServerSettings from "../serverSettings.ts";
72
import { increment, terminalSessionsTotal } from "../observability/Metrics.ts";
73
import { expandHomeVariable } from "@t3tools/provider-core/server/pathExpansion";
@@ -1451,6 +1451,7 @@ interface TerminalManagerOptions {
1451
export const resolveProviderInstanceTerminalEnvironment = Effect.fn(
1452
"terminal.resolveProviderInstanceTerminalEnvironment",
1453
)(function* (input: {
1454
+ readonly deriveProviderInstanceConfigMap: typeof deriveProviderInstanceConfigMap;
1455
readonly serverSettings: ServerSettings.ServerSettingsService["Service"];
1456
readonly path: Path.Path;
1457
readonly rawProviderInstanceId: string;
@@ -1460,7 +1461,7 @@ export const resolveProviderInstanceTerminalEnvironment = Effect.fn(
1461
const settings = yield* input.serverSettings.getSettings.pipe(
1462
Effect.mapError((cause) => new TerminalProviderEnvironmentError({ providerInstanceId, cause })),
1463
);
1463
- const instance = deriveProviderInstanceConfigMap(settings)[providerInstanceId];
1464
+ const instance = input.deriveProviderInstanceConfigMap(settings)[providerInstanceId];
1465
if (instance === undefined) {
1466
return yield* new TerminalProviderInstanceNotFoundError({ providerInstanceId });
1467
}
@@ -1490,7 +1491,9 @@ export const resolveProviderInstanceTerminalEnvironment = Effect.fn(
1491
});
1492
1493
/** @public */
1493
-export const make = Effect.fn("TerminalManager.make")(function* () {
1494
+export const make = Effect.fn("TerminalManager.make")(function* (
1495
+ deriveConfigMap: typeof deriveProviderInstanceConfigMap,
1496
+) {
1497
const { terminalLogsDir, providerStatusCacheDir, baseDir } = yield* ServerConfig.ServerConfig;
1498
const ptyAdapter = yield* PtyAdapter.PtyAdapter;
1499
const portDiscovery = yield* PortScanner.PortDiscovery;
@@ -1501,6 +1504,7 @@ export const make = Effect.fn("TerminalManager.make")(function* () {
1504
"terminal.resolveProviderInstanceEnvironment",
1505
)((rawProviderInstanceId: string, env: Record<string, string> | undefined) =>
1506
resolveProviderInstanceTerminalEnvironment({
1507
+ deriveProviderInstanceConfigMap: deriveConfigMap,
1508
serverSettings,
1509
path,
1510
rawProviderInstanceId,
@@ -3509,4 +3513,5 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
3513
});
3514
});
3515
3512
-export const layer = Layer.effect(TerminalManager, make()).pipe(Layer.provide(ProcessRunner.layer));
3516
+export const layer = (deriveConfigMap: typeof deriveProviderInstanceConfigMap) =>
3517
+ Layer.effect(TerminalManager, make(deriveConfigMap)).pipe(Layer.provide(ProcessRunner.layer));