@@ -66,7 +66,7 @@ import * as ServerConfig from "../config.ts";
6666import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment" ;
6767import { resolveCodexHomeLayout } from "../provider/Drivers/CodexHomeLayout.ts" ;
6868import { makeClaudeEnvironment } from "../provider/Drivers/ClaudeHome.ts" ;
69- import { deriveProviderInstanceConfigMap } from "../provider/ProviderInstanceRegistryHydration.ts" ;
69+ import type { deriveProviderInstanceConfigMap } from "../provider/ProviderInstanceRegistryHydration.ts" ;
7070import * as ServerSettings from "../serverSettings.ts" ;
7171import { increment , terminalSessionsTotal } from "../observability/Metrics.ts" ;
7272import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion" ;
@@ -1439,6 +1439,7 @@ interface TerminalManagerOptions {
14391439export 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