Skip to content

Commit 7078ae2

Browse files
committed
perf(server): avoid loading provider drivers for terminal imports
1 parent 4c924ff commit 7078ae2

4 files changed

Lines changed: 38 additions & 5 deletions

File tree

‎apps/server/src/server.ts‎

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

490490
const layerPortScanner = PortScanner.layer.pipe(Layer.provide(ProcessRunner.layer));
491491

492-
const layerTerminal = TerminalManager.layer.pipe(
492+
const layerTerminal = TerminalManager.layer(
493+
ProviderInstanceRegistryHydration.deriveProviderInstanceConfigMap,
494+
).pipe(
493495
Layer.provide(layerPtyAdapter),
494496
Layer.provide(layerPortScanner),
495497
Layer.provide(layerNativeTelemetry),

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

Lines changed: 24 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 {
@@ -2063,6 +2064,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("server settings"
20632064
});
20642065

20652066
const environment = yield* resolveProviderInstanceTerminalEnvironment({
2067+
deriveProviderInstanceConfigMap,
20662068
serverSettings,
20672069
path,
20682070
rawProviderInstanceId: instanceId,
@@ -2074,6 +2076,28 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("server settings"
20742076
assert.match(environment.CODEX_HOME ?? "", /[\\/][.]codex-terminal$/);
20752077
assert.notInclude(persisted, "sk-terminal-secret");
20762078
assert.include(persisted, '"valueRedacted": true');
2079+
2080+
yield* serverSettings.updateSettings({
2081+
providerInstances: {
2082+
[instanceId]: {
2083+
driver: ProviderDriverKind.make("codex"),
2084+
environment: [
2085+
{ name: "OPENROUTER_API_KEY", value: "refreshed-secret", sensitive: true },
2086+
],
2087+
config: { homePath: "~/.codex-refreshed" },
2088+
},
2089+
},
2090+
});
2091+
const refreshed = yield* resolveProviderInstanceTerminalEnvironment({
2092+
deriveProviderInstanceConfigMap,
2093+
serverSettings,
2094+
path,
2095+
rawProviderInstanceId: instanceId,
2096+
env: { TERMINAL_OVERRIDE: "terminal" },
2097+
});
2098+
assert.equal(refreshed.OPENROUTER_API_KEY, "refreshed-secret");
2099+
assert.equal(refreshed.TERMINAL_OVERRIDE, "terminal");
2100+
assert.match(refreshed.CODEX_HOME ?? "", /[\\/][.]codex-refreshed$/);
20772101
}).pipe(Effect.provide(layerServerSettings())),
20782102
);
20792103
it.effect("rolls back provider secret changes when the settings file commit fails", () =>

‎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";
@@ -1993,6 +1994,7 @@ it.layer(
19931994
const path = yield* Path.Path;
19941995
const serverSettings = yield* ServerSettings.ServerSettingsService;
19951996
const environment = yield* TerminalManager.resolveProviderInstanceTerminalEnvironment({
1997+
deriveProviderInstanceConfigMap,
19961998
serverSettings,
19971999
path,
19982000
rawProviderInstanceId: "configured_home",

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ import * as ServerConfig from "../config.ts";
6666
import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment";
6767
import { resolveCodexHomeLayout } from "../provider/Drivers/CodexHomeLayout.ts";
6868
import { makeClaudeEnvironment } from "../provider/Drivers/ClaudeHome.ts";
69-
import { deriveProviderInstanceConfigMap } from "../provider/ProviderInstanceRegistryHydration.ts";
69+
import type { deriveProviderInstanceConfigMap } from "../provider/ProviderInstanceRegistryHydration.ts";
7070
import * as ServerSettings from "../serverSettings.ts";
7171
import { increment, terminalSessionsTotal } from "../observability/Metrics.ts";
7272
import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion";
@@ -1439,6 +1439,7 @@ interface TerminalManagerOptions {
14391439
export const resolveProviderInstanceTerminalEnvironment = Effect.fn(
14401440
"terminal.resolveProviderInstanceTerminalEnvironment",
14411441
)(function* (input: {
1442+
readonly deriveProviderInstanceConfigMap: typeof deriveProviderInstanceConfigMap;
14421443
readonly serverSettings: ServerSettings.ServerSettingsService["Service"];
14431444
readonly path: Path.Path;
14441445
readonly rawProviderInstanceId: string;
@@ -1448,7 +1449,7 @@ export const resolveProviderInstanceTerminalEnvironment = Effect.fn(
14481449
const settings = yield* input.serverSettings.getSettings.pipe(
14491450
Effect.mapError((cause) => new TerminalProviderEnvironmentError({ providerInstanceId, cause })),
14501451
);
1451-
const instance = deriveProviderInstanceConfigMap(settings)[providerInstanceId];
1452+
const instance = input.deriveProviderInstanceConfigMap(settings)[providerInstanceId];
14521453
if (instance === undefined) {
14531454
return yield* new TerminalProviderInstanceNotFoundError({ providerInstanceId });
14541455
}
@@ -1478,7 +1479,9 @@ export const resolveProviderInstanceTerminalEnvironment = Effect.fn(
14781479
});
14791480

14801481
/** @public */
1481-
export const make = Effect.fn("TerminalManager.make")(function* () {
1482+
export const make = Effect.fn("TerminalManager.make")(function* (
1483+
deriveConfigMap: typeof deriveProviderInstanceConfigMap,
1484+
) {
14821485
const { terminalLogsDir, providerStatusCacheDir, baseDir } = yield* ServerConfig.ServerConfig;
14831486
const ptyAdapter = yield* PtyAdapter.PtyAdapter;
14841487
const portDiscovery = yield* PortScanner.PortDiscovery;
@@ -1489,6 +1492,7 @@ export const make = Effect.fn("TerminalManager.make")(function* () {
14891492
"terminal.resolveProviderInstanceEnvironment",
14901493
)((rawProviderInstanceId: string, env: Record<string, string> | undefined) =>
14911494
resolveProviderInstanceTerminalEnvironment({
1495+
deriveProviderInstanceConfigMap: deriveConfigMap,
14921496
serverSettings,
14931497
path,
14941498
rawProviderInstanceId,
@@ -3497,4 +3501,5 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
34973501
});
34983502
});
34993503

3500-
export const layer = Layer.effect(TerminalManager, make()).pipe(Layer.provide(ProcessRunner.layer));
3504+
export const layer = (deriveConfigMap: typeof deriveProviderInstanceConfigMap) =>
3505+
Layer.effect(TerminalManager, make(deriveConfigMap)).pipe(Layer.provide(ProcessRunner.layer));

0 commit comments

Comments
 (0)