Skip to content

Commit fc533a6

Browse files
perf(server): avoid loading provider drivers for terminal imports (pingdotgg#33898)
Co-authored-by: Julius Marminge <[email protected]>
1 parent 0951791 commit fc533a6

4 files changed

Lines changed: 16 additions & 5 deletions

File tree

‎apps/server/src/server.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,9 @@ const layerCheckpointStore = CheckpointStore.layer.pipe(Layer.provide(layerVcsDr
493493

494494
const layerPortScanner = PortScanner.layer.pipe(Layer.provide(ProcessRunner.layer));
495495

496-
const layerTerminal = TerminalManager.layer.pipe(
496+
const layerTerminal = TerminalManager.layer(
497+
ProviderInstanceRegistryHydration.deriveProviderInstanceConfigMap,
498+
).pipe(
497499
Layer.provide(layerPtyAdapter),
498500
Layer.provide(layerPortScanner),
499501
Layer.provide(layerNativeTelemetry),

‎apps/server/src/serverSettings.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { deriveProviderInstanceConfigMap } from "./provider/ProviderInstanceRegistryHydration.ts";
12
import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
23
import * as NodeServices from "@effect/platform-node/NodeServices";
34
import {
@@ -2074,6 +2075,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("server settings"
20742075
});
20752076

20762077
const environment = yield* resolveProviderInstanceTerminalEnvironment({
2078+
deriveProviderInstanceConfigMap,
20772079
serverSettings,
20782080
path,
20792081
rawProviderInstanceId: instanceId,

‎apps/server/src/terminal/Manager.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { deriveProviderInstanceConfigMap } from "../provider/ProviderInstanceRegistryHydration.ts";
12
import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
23
import * as NodeServices from "@effect/platform-node/NodeServices";
34
import { assert, it } from "@effect/vitest";
@@ -2054,6 +2055,7 @@ it.layer(
20542055
const path = yield* Path.Path;
20552056
const serverSettings = yield* ServerSettings.ServerSettingsService;
20562057
const environment = yield* TerminalManager.resolveProviderInstanceTerminalEnvironment({
2058+
deriveProviderInstanceConfigMap,
20572059
serverSettings,
20582060
path,
20592061
rawProviderInstanceId: "configured_home",

‎apps/server/src/terminal/Manager.ts‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ import * as ServerConfig from "../config.ts";
6767
import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment";
6868
import { resolveCodexHomeLayout } from "../provider/Drivers/CodexHomeLayout.ts";
6969
import { makeClaudeEnvironment } from "../provider/Drivers/ClaudeHome.ts";
70-
import { deriveProviderInstanceConfigMap } from "../provider/ProviderInstanceRegistryHydration.ts";
70+
import type { deriveProviderInstanceConfigMap } from "../provider/ProviderInstanceRegistryHydration.ts";
7171
import * as ServerSettings from "../serverSettings.ts";
7272
import { increment, terminalSessionsTotal } from "../observability/Metrics.ts";
7373
import { expandHomeVariable } from "@t3tools/provider-core/server/pathExpansion";
@@ -1451,6 +1451,7 @@ interface TerminalManagerOptions {
14511451
export const resolveProviderInstanceTerminalEnvironment = Effect.fn(
14521452
"terminal.resolveProviderInstanceTerminalEnvironment",
14531453
)(function* (input: {
1454+
readonly deriveProviderInstanceConfigMap: typeof deriveProviderInstanceConfigMap;
14541455
readonly serverSettings: ServerSettings.ServerSettingsService["Service"];
14551456
readonly path: Path.Path;
14561457
readonly rawProviderInstanceId: string;
@@ -1460,7 +1461,7 @@ export const resolveProviderInstanceTerminalEnvironment = Effect.fn(
14601461
const settings = yield* input.serverSettings.getSettings.pipe(
14611462
Effect.mapError((cause) => new TerminalProviderEnvironmentError({ providerInstanceId, cause })),
14621463
);
1463-
const instance = deriveProviderInstanceConfigMap(settings)[providerInstanceId];
1464+
const instance = input.deriveProviderInstanceConfigMap(settings)[providerInstanceId];
14641465
if (instance === undefined) {
14651466
return yield* new TerminalProviderInstanceNotFoundError({ providerInstanceId });
14661467
}
@@ -1490,7 +1491,9 @@ export const resolveProviderInstanceTerminalEnvironment = Effect.fn(
14901491
});
14911492

14921493
/** @public */
1493-
export const make = Effect.fn("TerminalManager.make")(function* () {
1494+
export const make = Effect.fn("TerminalManager.make")(function* (
1495+
deriveConfigMap: typeof deriveProviderInstanceConfigMap,
1496+
) {
14941497
const { terminalLogsDir, providerStatusCacheDir, baseDir } = yield* ServerConfig.ServerConfig;
14951498
const ptyAdapter = yield* PtyAdapter.PtyAdapter;
14961499
const portDiscovery = yield* PortScanner.PortDiscovery;
@@ -1501,6 +1504,7 @@ export const make = Effect.fn("TerminalManager.make")(function* () {
15011504
"terminal.resolveProviderInstanceEnvironment",
15021505
)((rawProviderInstanceId: string, env: Record<string, string> | undefined) =>
15031506
resolveProviderInstanceTerminalEnvironment({
1507+
deriveProviderInstanceConfigMap: deriveConfigMap,
15041508
serverSettings,
15051509
path,
15061510
rawProviderInstanceId,
@@ -3509,4 +3513,5 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
35093513
});
35103514
});
35113515

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));

0 commit comments

Comments
 (0)