@@ -67,7 +67,7 @@ import * as ServerConfig from "../config.ts";
6767import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment" ;
6868import { resolveCodexHomeLayout } from "../provider/Drivers/CodexHomeLayout.ts" ;
6969import { makeClaudeEnvironment } from "../provider/Drivers/ClaudeHome.ts" ;
70- import { deriveProviderInstanceConfigMap } from "../provider/ProviderInstanceRegistryHydration.ts" ;
70+ import type { deriveProviderInstanceConfigMap } from "../provider/ProviderInstanceRegistryHydration.ts" ;
7171import * as ServerSettings from "../serverSettings.ts" ;
7272import { increment , terminalSessionsTotal } from "../observability/Metrics.ts" ;
7373import { expandHomeVariable } from "@t3tools/provider-core/server/pathExpansion" ;
@@ -1451,6 +1451,7 @@ interface TerminalManagerOptions {
14511451export 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