From ce31ac6c6b27034dd564cb66c3349f861d392860 Mon Sep 17 00:00:00 2001 From: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com> Date: Thu, 8 Oct 2026 12:00:29 -0700 Subject: [PATCH] refactor(provider-core): add ProviderHost as the server port for providers Drivers and adapters reached into the server for its config, settings service, background policy, and attachment store, so no provider could live outside apps/server. Add a ProviderHost service to provider-core with the paths, settings reads, background-work gate, and attachment resolution a provider needs, implemented once in the server. The managed status provider and every driver now take ProviderHost instead of BackgroundPolicy. Pi's adapter and driver use it for their cwd, probe cache, and attachments, which leaves Pi with no direct server imports beyond the code that will move with it. provider-testing gains a scoped test host for driver and adapter tests. Co-Authored-By: Claude Opus 5.5 --- .../Adapters/PiAdapterV2.test.ts | 17 +++--- .../Adapters/PiAdapterV2.testkit.ts | 19 ++++--- .../orchestration-v2/Adapters/PiAdapterV2.ts | 24 ++++----- .../src/provider/AntigravityProvider.test.ts | 20 +++++-- .../src/provider/Drivers/AcpRegistryDriver.ts | 12 ++--- .../Drivers/AntigravityDriver.test.ts | 4 +- .../src/provider/Drivers/AntigravityDriver.ts | 8 ++- .../src/provider/Drivers/ClaudeDriver.ts | 12 ++--- .../src/provider/Drivers/CodexDriver.test.ts | 4 +- .../src/provider/Drivers/CodexDriver.ts | 10 ++-- .../provider/Drivers/CodexManagedProvider.ts | 8 +-- .../src/provider/Drivers/CursorDriver.test.ts | 4 +- .../src/provider/Drivers/CursorDriver.ts | 7 +-- .../src/provider/Drivers/GrokDriver.test.ts | 4 +- .../server/src/provider/Drivers/GrokDriver.ts | 12 ++--- .../server/src/provider/Drivers/MuseDriver.ts | 12 ++--- .../provider/Drivers/OpenCodeDriver.test.ts | 7 ++- .../src/provider/Drivers/OpenCodeDriver.ts | 12 ++--- .../src/provider/Drivers/PiDriver.test.ts | 7 ++- apps/server/src/provider/Drivers/PiDriver.ts | 16 +++--- apps/server/src/provider/ProviderHostLive.ts | 39 ++++++++++++++ .../provider/ProviderInstanceRegistry.test.ts | 7 ++- .../ProviderInstanceRegistryHydration.ts | 11 +++- .../makeManagedServerProvider.test.ts | 29 ++++++++-- .../src/provider/makeManagedServerProvider.ts | 20 +++---- .../src/provider/providerUpdateSettings.ts | 8 +-- packages/provider-core/package.json | 4 ++ packages/provider-core/src/server/host.ts | 54 +++++++++++++++++++ packages/provider-testing/package.json | 5 ++ packages/provider-testing/src/host.ts | 54 +++++++++++++++++++ pnpm-lock.yaml | 3 ++ 31 files changed, 321 insertions(+), 132 deletions(-) create mode 100644 apps/server/src/provider/ProviderHostLive.ts create mode 100644 packages/provider-core/src/server/host.ts create mode 100644 packages/provider-testing/src/host.ts diff --git a/apps/server/src/orchestration-v2/Adapters/PiAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/PiAdapterV2.test.ts index d59223eb15c6..30fb2a2066da 100644 --- a/apps/server/src/orchestration-v2/Adapters/PiAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/PiAdapterV2.test.ts @@ -33,7 +33,8 @@ import * as TestClock from "effect/testing/TestClock"; import { ChildProcess, ChildProcessSpawner } from "effect/process"; import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; -import * as ServerConfig from "../../config.ts"; +import { ProviderHost } from "@t3tools/provider-core/server/host"; +import { layerTestProviderHost } from "@t3tools/provider-testing/host"; import * as ProviderContinuationRequests from "../ProviderContinuationRequests.ts"; import * as McpProviderSession from "@t3tools/provider-core/server/mcpSession"; import * as IdAllocator from "@t3tools/provider-core/server/ids"; @@ -51,11 +52,11 @@ import { } from "./PiAdapterV2.ts"; import { makePiRpcConnection, type PiRpcRecord } from "./PiRpc.ts"; -const layerServerConfig = ServerConfig.layerTest(process.cwd(), { - prefix: "t3-pi-v2-adapter-", -}).pipe(Layer.provide(NodeServices.layer)); - -const layerTest = Layer.mergeAll(NodeServices.layer, IdAllocator.layer, layerServerConfig); +const layerTest = Layer.mergeAll( + NodeServices.layer, + IdAllocator.layer, + layerTestProviderHost().pipe(Layer.provide(NodeServices.layer)), +); const decodeJsonLine = Schema.decodeSync(Schema.fromJsonString(Schema.Unknown)); const encodeJsonLine = Schema.encodeSync(Schema.fromJsonString(Schema.Unknown)); @@ -330,7 +331,7 @@ const makeAdapter = Effect.fnUntraced(function* ( continuationRequests?: PiAdapterV2Options["continuationRequests"], ) { const idAllocator = yield* IdAllocator.IdAllocatorV2; - const serverConfig = yield* ServerConfig.ServerConfig; + const host = yield* ProviderHost; const fileSystem = yield* FileSystem.FileSystem; const spawner = forkFake === undefined @@ -363,7 +364,7 @@ const makeAdapter = Effect.fnUntraced(function* ( spawner, fileSystem, idAllocator, - serverConfig, + host, }); }); diff --git a/apps/server/src/orchestration-v2/Adapters/PiAdapterV2.testkit.ts b/apps/server/src/orchestration-v2/Adapters/PiAdapterV2.testkit.ts index 06300be84d96..26cfbd3449ca 100644 --- a/apps/server/src/orchestration-v2/Adapters/PiAdapterV2.testkit.ts +++ b/apps/server/src/orchestration-v2/Adapters/PiAdapterV2.testkit.ts @@ -30,14 +30,11 @@ import * as Sink from "effect/Sink"; import * as Stream from "effect/Stream"; import { ChildProcess, ChildProcessSpawner } from "effect/process"; -import * as ServerConfig from "../../config.ts"; +import { layerTestProviderHost } from "@t3tools/provider-testing/host"; import * as IdAllocator from "@t3tools/provider-core/server/ids"; import { ProviderAdapterDriverCreateError } from "@t3tools/provider-core/server/adapterDriver"; import * as ProviderAdapterRegistry from "../ProviderAdapterRegistry.ts"; -import { - makeReplayServerConfig, - type OrchestratorV2ProviderReplayHarness, -} from "../testkit/ProviderReplayHarness.ts"; +import type { OrchestratorV2ProviderReplayHarness } from "../testkit/ProviderReplayHarness.ts"; import { PI_PROVIDER, PiAdapterV2Driver } from "./PiAdapterV2.ts"; export const PI_RPC_REPLAY_PROTOCOL = "pi.rpc-jsonl"; @@ -414,10 +411,6 @@ export function layer(input: { readonly launchArgs: string; readonly environment?: ProviderInstanceEnvironment; }) { - const layerServerConfig = Layer.effect( - ServerConfig.ServerConfig, - makeReplayServerConfig(`pi-${input.scenario}`).pipe(Effect.orDie), - ).pipe(Layer.provide(NodeServices.layer)); return ProviderAdapterRegistry.layerFromDrivers({ drivers: [PiAdapterV2Driver], configMap: { @@ -430,7 +423,13 @@ export function layer(input: { }, }).pipe( Layer.provide(input.spawner), - Layer.provide(Layer.mergeAll(layerServerConfig, NodeServices.layer, IdAllocator.layer)), + Layer.provide( + Layer.mergeAll( + layerTestProviderHost().pipe(Layer.provide(NodeServices.layer)), + NodeServices.layer, + IdAllocator.layer, + ), + ), ); } diff --git a/apps/server/src/orchestration-v2/Adapters/PiAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/PiAdapterV2.ts index f53ef410cad2..ec4c2adbfe85 100644 --- a/apps/server/src/orchestration-v2/Adapters/PiAdapterV2.ts +++ b/apps/server/src/orchestration-v2/Adapters/PiAdapterV2.ts @@ -60,8 +60,7 @@ import * as Semaphore from "effect/Semaphore"; import * as Stream from "effect/Stream"; import { ChildProcessSpawner } from "effect/process"; -import { resolveAttachmentPath } from "../../attachmentStore.ts"; -import * as ServerConfig from "../../config.ts"; +import { ProviderHost, type ProviderHostShape } from "@t3tools/provider-core/server/host"; import { mcpToolPresentation } from "@t3tools/provider-core/server/mcpToolPresentation"; import * as McpProviderSession from "@t3tools/provider-core/server/mcpSession"; import { @@ -232,7 +231,7 @@ export interface PiAdapterV2Options { readonly spawner: ChildProcessSpawner.ChildProcessSpawner["Service"]; readonly fileSystem: FileSystem.FileSystem; readonly idAllocator: IdAllocator.IdAllocatorV2["Service"]; - readonly serverConfig: ServerConfig.ServerConfig["Service"]; + readonly host: ProviderHostShape; readonly continuationRequests?: { readonly offer: ( request: ProviderContinuationRequests.ProviderContinuationRequest, @@ -408,7 +407,7 @@ export function makePiAdapterV2( input: ProviderAdapter.ProviderAdapterV2OpenSessionInput, ) { const scope = yield* Effect.scope; - const cwd = input.runtimePolicy.cwd ?? options.serverConfig.cwd; + const cwd = input.runtimePolicy.cwd ?? options.host.paths.cwd; const mcpSession = McpProviderSession.readMcpProviderSession(input.threadId); const provideCacheFs = (effect: Effect.Effect) => effect.pipe( @@ -426,7 +425,7 @@ export function makePiAdapterV2( // hook. Materialize it even when this session has no MCP credential so // Supervised never silently degrades to unrestricted tool execution. const extensionPath = yield* provideCacheFs( - materializePiT3McpExtension(options.serverConfig.providerStatusCacheDir), + materializePiT3McpExtension(options.host.paths.providerStatusCacheDir), ); const resolvedLaunchArgs = resolvePiLaunchArgs(options.settings.launchArgs); if (!resolvedLaunchArgs.ok) { @@ -2338,10 +2337,7 @@ export function makePiAdapterV2( const images: Array<{ type: "image"; data: string; mimeType: string }> = []; const extraLines: Array = []; for (const attachment of attachments) { - const path = resolveAttachmentPath({ - attachmentsDir: options.serverConfig.attachmentsDir, - attachment, - }); + const path = options.host.resolveAttachmentPath(attachment); if (path === null) continue; if (attachment.mimeType.startsWith("image/")) { const bytes = yield* options.fileSystem.readFile(path); @@ -3205,7 +3201,7 @@ export type PiAdapterV2DriverEnv = | ChildProcessSpawner.ChildProcessSpawner | FileSystem.FileSystem | IdAllocator.IdAllocatorV2 - | ServerConfig.ServerConfig; + | ProviderHost; export const PiAdapterV2Driver: ProviderAdapterDriver = { driverKind: PI_DRIVER_KIND, @@ -3217,7 +3213,7 @@ export const PiAdapterV2Driver: ProviderAdapterDriver Effect.succeed(false), - }), - ServerSettings.layerTest(), +const layerTest = ProviderHostLive.layer.pipe( + Layer.provideMerge( + Layer.mock(BackgroundPolicy.BackgroundPolicy)({ + shouldRunScopeWork: () => Effect.succeed(false), + }), + ), + Layer.provideMerge(ServerSettings.layerTest()), + Layer.provide( + ServerConfig.layerTest(process.cwd(), { prefix: "t3-antigravity-provider-test-" }).pipe( + Layer.provide(NodeServices.layer), + ), + ), ); type ProbeError = EffectAcpErrors.AcpError | ProviderSetupError; diff --git a/apps/server/src/provider/Drivers/AcpRegistryDriver.ts b/apps/server/src/provider/Drivers/AcpRegistryDriver.ts index 604eb1a958f2..1098dd805d9f 100644 --- a/apps/server/src/provider/Drivers/AcpRegistryDriver.ts +++ b/apps/server/src/provider/Drivers/AcpRegistryDriver.ts @@ -21,13 +21,12 @@ import * as Schema from "effect/Schema"; import * as Semaphore from "effect/Semaphore"; import { ChildProcessSpawner } from "effect/process"; -import * as BackgroundPolicy from "../../background/BackgroundPolicy.ts"; +import { ProviderHost } from "@t3tools/provider-core/server/host"; import * as ServerConfig from "../../config.ts"; import { AcpRegistryAdapterV2Driver, type AcpRegistryAdapterV2DriverEnv, } from "../../orchestration-v2/Adapters/AcpRegistryAdapterV2.ts"; -import * as ServerSettings from "../../serverSettings.ts"; import type { TextGeneration } from "../../textGeneration/TextGeneration.ts"; import { ProviderDriverError } from "../Errors.ts"; import { makeManagedServerProvider } from "../makeManagedServerProvider.ts"; @@ -460,10 +459,7 @@ export const checkAcpRegistryProviderReadiness = Effect.fn( : snapshot; }); -export type AcpRegistryDriverEnv = - | AcpRegistryAdapterV2DriverEnv - | BackgroundPolicy.BackgroundPolicy - | ServerSettings.ServerSettingsService; +export type AcpRegistryDriverEnv = AcpRegistryAdapterV2DriverEnv | ProviderHost; /** Canonical provider-instance wrapper for ACP Registry orchestration adapters. */ export const AcpRegistryDriver: ProviderDriver = { @@ -494,7 +490,7 @@ export const AcpRegistryDriver: ProviderDriver >({ diff --git a/apps/server/src/provider/Drivers/AntigravityDriver.test.ts b/apps/server/src/provider/Drivers/AntigravityDriver.test.ts index 0f76ff8b5105..63cd4182c249 100644 --- a/apps/server/src/provider/Drivers/AntigravityDriver.test.ts +++ b/apps/server/src/provider/Drivers/AntigravityDriver.test.ts @@ -33,6 +33,7 @@ import * as ProviderEventLoggers from "../ProviderEventLoggers.ts"; import * as ModelManifest from "../ModelManifest.ts"; import * as IdAllocator from "@t3tools/provider-core/server/ids"; import { AntigravityDriver } from "./AntigravityDriver.ts"; +import * as ProviderHostLive from "../ProviderHostLive.ts"; const hostPlatform = HostProcessPlatform.defaultValue(); const windowsHost = hostPlatform === "win32"; @@ -244,7 +245,7 @@ const makeHarness = Effect.fn("makeAntigravityDriverHarness")(function* ( }; }); -const layerTest = ServerConfig.layerTest(process.cwd(), { +const layerDeps = ServerConfig.layerTest(process.cwd(), { prefix: "t3-antigravity-driver-config-", }).pipe( Layer.provideMerge(NodeServices.layer), @@ -263,6 +264,7 @@ const layerTest = ServerConfig.layerTest(process.cwd(), { Layer.provideMerge(ModelManifest.layerTest), Layer.provideMerge(IdAllocator.layer), ); +const layerTest = ProviderHostLive.layer.pipe(Layer.provideMerge(layerDeps)); it.layer(layerTest)("AntigravityDriver", (it) => { it.effect.skipIf(windowsHost)( diff --git a/apps/server/src/provider/Drivers/AntigravityDriver.ts b/apps/server/src/provider/Drivers/AntigravityDriver.ts index 811d0c90b880..8969870f2888 100644 --- a/apps/server/src/provider/Drivers/AntigravityDriver.ts +++ b/apps/server/src/provider/Drivers/AntigravityDriver.ts @@ -18,9 +18,8 @@ import * as Stream from "effect/Stream"; import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner"; import type { AcpError } from "effect-acp/errors"; -import * as BackgroundPolicy from "../../background/BackgroundPolicy.ts"; +import { ProviderHost } from "@t3tools/provider-core/server/host"; import * as ServerConfig from "../../config.ts"; -import * as ServerSettings from "../../serverSettings.ts"; import { isAntigravityTextGenerationAvailable, makeAntigravityTextGeneration, @@ -70,7 +69,7 @@ const isNodeRuntimeUnavailableError = Schema.is(NodeRuntimeUnavailableError); export type AntigravityDriverEnv = | AntigravityInstallation.AntigravityInstallation - | BackgroundPolicy.BackgroundPolicy + | ProviderHost | ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | FileSystem.FileSystem @@ -78,8 +77,7 @@ export type AntigravityDriverEnv = | ModelManifest.ModelManifest | Path.Path | ProviderEventLoggers.ProviderEventLoggers - | ServerConfig.ServerConfig - | ServerSettings.ServerSettingsService; + | ServerConfig.ServerConfig; /** Each instance owns its Google profile. Executable releases are shared by the environment. */ export const AntigravityDriver: ProviderDriver = { diff --git a/apps/server/src/provider/Drivers/ClaudeDriver.ts b/apps/server/src/provider/Drivers/ClaudeDriver.ts index 54298e0e41d5..ed77b988d335 100644 --- a/apps/server/src/provider/Drivers/ClaudeDriver.ts +++ b/apps/server/src/provider/Drivers/ClaudeDriver.ts @@ -24,7 +24,7 @@ import { HttpClient } from "effect/http"; import { ChildProcessSpawner } from "effect/process"; import { makeClaudeTextGeneration } from "../../textGeneration/ClaudeTextGeneration.ts"; -import * as BackgroundPolicy from "../../background/BackgroundPolicy.ts"; +import { ProviderHost } from "@t3tools/provider-core/server/host"; import * as ServerConfig from "../../config.ts"; import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion"; import * as ProviderEventLoggers from "../ProviderEventLoggers.ts"; @@ -32,7 +32,6 @@ import { createClaudeAdapterV2, type ClaudeAdapterV2DriverEnv, } from "../../orchestration-v2/Adapters/ClaudeAdapterV2.ts"; -import * as ServerSettings from "../../serverSettings.ts"; import { ProviderDriverError } from "../Errors.ts"; import { makeClaudeScopedLimitNames } from "../claudeUsageLimits.ts"; import * as ClaudeResetCredits from "../claudeResetCredits.ts"; @@ -95,7 +94,7 @@ const UPDATE = makePackageManagedProviderMaintenanceResolver({ export type ClaudeDriverEnv = | ClaudeAdapterV2DriverEnv - | BackgroundPolicy.BackgroundPolicy + | ProviderHost | ChildProcessSpawner.ChildProcessSpawner | ResetCreditCoordinator.ResetCreditCoordinator | Crypto.Crypto @@ -104,8 +103,7 @@ export type ClaudeDriverEnv = | ModelManifest.ModelManifest | Path.Path | ProviderEventLoggers.ProviderEventLoggers - | ServerConfig.ServerConfig - | ServerSettings.ServerSettingsService; + | ServerConfig.ServerConfig; export const ClaudeDriver: ProviderDriver = { driverKind: DRIVER_KIND, @@ -123,7 +121,7 @@ export const ClaudeDriver: ProviderDriver = { const { cwd } = yield* ServerConfig.ServerConfig; const httpClient = yield* HttpClient.HttpClient; const resetCreditCoordinator = yield* ResetCreditCoordinator.ResetCreditCoordinator; - const serverSettings = yield* ServerSettings.ServerSettingsService; + const host = yield* ProviderHost; const modelManifest = yield* ModelManifest.ModelManifest; const modelCatalog = modelManifest.current.pipe(Effect.map(resolveClaudeModelCatalog)); const processEnv = mergeProviderInstanceEnvironment(environment); @@ -237,7 +235,7 @@ export const ClaudeDriver: ProviderDriver = { Effect.provideService(Path.Path, path), ); - const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, serverSettings); + const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, host.settings); const snapshot = yield* makeManagedServerProvider>({ resolveMaintenance, getSettings: snapshotSettings.getSettings, diff --git a/apps/server/src/provider/Drivers/CodexDriver.test.ts b/apps/server/src/provider/Drivers/CodexDriver.test.ts index 2d9665be8379..5cc02cea967c 100644 --- a/apps/server/src/provider/Drivers/CodexDriver.test.ts +++ b/apps/server/src/provider/Drivers/CodexDriver.test.ts @@ -38,8 +38,9 @@ import * as CodexAdapterV2 from "../../orchestration-v2/Adapters/CodexAdapterV2. import * as IdAllocator from "@t3tools/provider-core/server/ids"; import { ProviderAdapterV2RuntimePolicy } from "@t3tools/provider-core/server/adapter"; import * as ProviderCredentialStore from "../ProviderCredentialStore.ts"; +import * as ProviderHostLive from "../ProviderHostLive.ts"; -const layerTest = ServerConfig.layerTest(process.cwd(), { +const layerDeps = ServerConfig.layerTest(process.cwd(), { prefix: "t3-codex-driver-maintenance-", }).pipe( Layer.provideMerge(NodeServices.layer), @@ -81,6 +82,7 @@ const layerTest = ServerConfig.layerTest(process.cwd(), { ), ), ); +const layerTest = ProviderHostLive.layer.pipe(Layer.provideMerge(layerDeps)); // The `#!/bin/sh` stub below cannot be resolved as an executable on Windows. const windowsHost = HostProcessPlatform.defaultValue() === "win32"; diff --git a/apps/server/src/provider/Drivers/CodexDriver.ts b/apps/server/src/provider/Drivers/CodexDriver.ts index 1fd7caef1112..0917fd3606c6 100644 --- a/apps/server/src/provider/Drivers/CodexDriver.ts +++ b/apps/server/src/provider/Drivers/CodexDriver.ts @@ -31,7 +31,7 @@ import { HttpClient } from "effect/http"; import { ChildProcessSpawner } from "effect/process"; import { makeCodexTextGeneration } from "../../textGeneration/CodexTextGeneration.ts"; -import * as BackgroundPolicy from "../../background/BackgroundPolicy.ts"; +import { ProviderHost } from "@t3tools/provider-core/server/host"; import * as ServerConfig from "../../config.ts"; import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion"; import * as ProviderEventLoggers from "../ProviderEventLoggers.ts"; @@ -39,7 +39,6 @@ import { createCodexAdapterV2, type CodexAdapterV2DriverEnv, } from "../../orchestration-v2/Adapters/CodexAdapterV2.ts"; -import * as ServerSettings from "../../serverSettings.ts"; import { ProviderDriverError } from "../Errors.ts"; import * as ResetCreditCoordinator from "../resetCreditCoordinator.ts"; import { @@ -109,7 +108,7 @@ function makeCodexMaintenanceResolver(sharedHomePath: string) { */ export type CodexDriverEnv = | CodexAdapterV2DriverEnv - | BackgroundPolicy.BackgroundPolicy + | ProviderHost | ChildProcessSpawner.ChildProcessSpawner | ResetCreditCoordinator.ResetCreditCoordinator | Crypto.Crypto @@ -119,7 +118,6 @@ export type CodexDriverEnv = | Path.Path | ProviderEventLoggers.ProviderEventLoggers | ServerConfig.ServerConfig - | ServerSettings.ServerSettingsService | ServerSecretStore.ServerSecretStore | ServerEnvironment.ServerEnvironmentIdentity | CodexInstallation.CodexInstallation; @@ -148,7 +146,7 @@ export const CodexDriver: ProviderDriver = { const fileSystem = yield* FileSystem.FileSystem; const pathService = yield* Path.Path; const httpClient = yield* HttpClient.HttpClient; - const serverSettings = yield* ServerSettings.ServerSettingsService; + const host = yield* ProviderHost; const modelManifest = yield* ModelManifest.ModelManifest; const processEnv = mergeProviderInstanceEnvironment(environment); const homeLayout = yield* resolveCodexHomeLayout(config); @@ -232,7 +230,7 @@ export const CodexDriver: ProviderDriver = { ), Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner), ); - const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, serverSettings); + const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, host.settings); const snapshot = yield* makeManagedServerProvider>({ resolveMaintenance, getSettings: snapshotSettings.getSettings, diff --git a/apps/server/src/provider/Drivers/CodexManagedProvider.ts b/apps/server/src/provider/Drivers/CodexManagedProvider.ts index ab789c6a4c84..aeab4755fdff 100644 --- a/apps/server/src/provider/Drivers/CodexManagedProvider.ts +++ b/apps/server/src/provider/Drivers/CodexManagedProvider.ts @@ -4,7 +4,7 @@ import * as Stream from "effect/Stream"; import * as Option from "effect/Option"; import { ChildProcessSpawner } from "effect/process"; import { makeCodexTextGeneration } from "../../textGeneration/CodexTextGeneration.ts"; -import { ServerSettingsService } from "../../serverSettings.ts"; +import { ProviderHost } from "@t3tools/provider-core/server/host"; import { chatGptModels } from "../CodexChatGptModels.ts"; import { makeCodexManagedRuntime } from "../CodexManagedRuntime.ts"; import { ProviderDriverError } from "../Errors.ts"; @@ -31,7 +31,7 @@ export const makeManagedCodexProvider = Effect.fn("makeManagedCodexProvider")(fu const { instanceId, enabled, displayName, accentColor, config } = input; const http = yield* HttpClient.HttpClient; const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; - const settings = yield* ServerSettingsService; + const host = yield* ProviderHost; const runtime = yield* makeCodexManagedRuntime({ instanceId, enabled, @@ -193,8 +193,8 @@ export const makeManagedCodexProvider = Effect.fn("makeManagedCodexProvider")(fu }).pipe(Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner)); const snapshot = yield* makeManagedServerProvider({ resolveMaintenance: () => Effect.succeed({ provider: DRIVER, packageName: null, update: null }), - getSettings: settings.getSettings, - streamSettings: settings.streamChanges, + getSettings: host.settings.get, + streamSettings: host.settings.changes, haveSettingsChanged: () => false, initialSnapshot: () => pending, checkProvider: check, diff --git a/apps/server/src/provider/Drivers/CursorDriver.test.ts b/apps/server/src/provider/Drivers/CursorDriver.test.ts index 60241ea2234c..4b180903117f 100644 --- a/apps/server/src/provider/Drivers/CursorDriver.test.ts +++ b/apps/server/src/provider/Drivers/CursorDriver.test.ts @@ -20,8 +20,9 @@ import * as CursorAgentSdk from "../../orchestration-v2/Adapters/CursorAgentSdk. import * as IdAllocator from "@t3tools/provider-core/server/ids"; import { ProviderAdapterV2RuntimePolicy } from "@t3tools/provider-core/server/adapter"; import { Cursor } from "../cursorSdk.ts"; +import * as ProviderHostLive from "../ProviderHostLive.ts"; -const layerTest = ServerSecretStore.layer.pipe( +const layerDeps = ServerSecretStore.layer.pipe( Layer.provideMerge( ServerConfig.layerTest(process.cwd(), { prefix: "t3-cursor-driver-copy-command-", @@ -53,6 +54,7 @@ const layerTest = ServerSecretStore.layer.pipe( ), ), ); +const layerTest = ProviderHostLive.layer.pipe(Layer.provideMerge(layerDeps)); it.layer(layerTest)("CursorDriver", (it) => { it.effect( diff --git a/apps/server/src/provider/Drivers/CursorDriver.ts b/apps/server/src/provider/Drivers/CursorDriver.ts index 95db4b5924ac..fe3f73764476 100644 --- a/apps/server/src/provider/Drivers/CursorDriver.ts +++ b/apps/server/src/provider/Drivers/CursorDriver.ts @@ -15,7 +15,7 @@ import * as Schema from "effect/Schema"; import { HttpClient } from "effect/http"; import { readCursorUsageLimits } from "../cursorUsageLimits.ts"; -import * as BackgroundPolicy from "../../background/BackgroundPolicy.ts"; +import { ProviderHost } from "@t3tools/provider-core/server/host"; import * as ServerConfig from "../../config.ts"; import * as ServerSettings from "../../serverSettings.ts"; import { makeCursorTextGeneration } from "../../textGeneration/CursorTextGeneration.ts"; @@ -63,7 +63,7 @@ export type CursorDriverEnv = | FileSystem.FileSystem | Path.Path | HttpClient.HttpClient - | BackgroundPolicy.BackgroundPolicy + | ProviderHost | ServerConfig.ServerConfig | ServerSecretStore.ServerSecretStore | ServerSettings.ServerSettingsService; @@ -79,6 +79,7 @@ export const CursorDriver: ProviderDriver = { create: ({ instanceId, displayName, accentColor, environment, enabled, config }) => Effect.gen(function* () { const serverSettings = yield* ServerSettings.ServerSettingsService; + const host = yield* ProviderHost; const fileSystem = yield* FileSystem.FileSystem; const path = yield* Path.Path; const httpClient = yield* HttpClient.HttpClient; @@ -234,7 +235,7 @@ export const CursorDriver: ProviderDriver = { Effect.provide(CursorSdkCatalog.layer), ); - const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, serverSettings); + const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, host.settings); const snapshot = yield* makeManagedServerProvider>({ resolveMaintenance: () => Effect.succeed(MAINTENANCE_CAPABILITIES), getSettings: snapshotSettings.getSettings, diff --git a/apps/server/src/provider/Drivers/GrokDriver.test.ts b/apps/server/src/provider/Drivers/GrokDriver.test.ts index ed1c90181d2e..61036ab79941 100644 --- a/apps/server/src/provider/Drivers/GrokDriver.test.ts +++ b/apps/server/src/provider/Drivers/GrokDriver.test.ts @@ -16,8 +16,9 @@ import * as ProviderEventLoggers from "../ProviderEventLoggers.ts"; import { GrokDriver } from "./GrokDriver.ts"; import * as IdAllocator from "@t3tools/provider-core/server/ids"; +import * as ProviderHostLive from "../ProviderHostLive.ts"; -const layerTest = ServerConfig.layerTest(process.cwd(), { +const layerDeps = ServerConfig.layerTest(process.cwd(), { prefix: "t3-grok-driver-update-", }).pipe( Layer.provideMerge(NodeServices.layer), @@ -41,6 +42,7 @@ const layerTest = ServerConfig.layerTest(process.cwd(), { ), ), ); +const layerTest = ProviderHostLive.layer.pipe(Layer.provideMerge(layerDeps)); const noSpawner = ChildProcessSpawner.make(() => Effect.die("Disabled Grok must not spawn a process"), diff --git a/apps/server/src/provider/Drivers/GrokDriver.ts b/apps/server/src/provider/Drivers/GrokDriver.ts index 81e23e8bc44c..de019e34f8e5 100644 --- a/apps/server/src/provider/Drivers/GrokDriver.ts +++ b/apps/server/src/provider/Drivers/GrokDriver.ts @@ -7,10 +7,9 @@ import * as Schema from "effect/Schema"; import { HttpClient } from "effect/http"; import { ChildProcessSpawner } from "effect/process"; -import * as BackgroundPolicy from "../../background/BackgroundPolicy.ts"; +import { ProviderHost } from "@t3tools/provider-core/server/host"; import * as ServerConfig from "../../config.ts"; import * as ProviderEventLoggers from "../ProviderEventLoggers.ts"; -import * as ServerSettings from "../../serverSettings.ts"; import { makeGrokTextGeneration } from "../../textGeneration/GrokTextGeneration.ts"; import { GrokAdapterV2Driver, @@ -76,15 +75,14 @@ const UPDATE: ProviderMaintenanceCapabilitiesResolver = { export type GrokDriverEnv = | GrokAdapterV2DriverEnv - | BackgroundPolicy.BackgroundPolicy + | ProviderHost | ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | FileSystem.FileSystem | HttpClient.HttpClient | Path.Path | ProviderEventLoggers.ProviderEventLoggers - | ServerConfig.ServerConfig - | ServerSettings.ServerSettingsService; + | ServerConfig.ServerConfig; export const GrokDriver: ProviderDriver = { driverKind: DRIVER_KIND, @@ -101,7 +99,7 @@ export const GrokDriver: ProviderDriver = { const httpClient = yield* HttpClient.HttpClient; const fileSystem = yield* FileSystem.FileSystem; const path = yield* Path.Path; - const serverSettings = yield* ServerSettings.ServerSettingsService; + const host = yield* ProviderHost; const { cwd } = yield* ServerConfig.ServerConfig; const processEnv = mergeProviderInstanceEnvironment(environment); const continuationIdentity = defaultProviderContinuationIdentity({ @@ -166,7 +164,7 @@ export const GrokDriver: ProviderDriver = { Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner), ); - const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, serverSettings); + const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, host.settings); const snapshot = yield* makeManagedServerProvider>({ resolveMaintenance, getSettings: snapshotSettings.getSettings, diff --git a/apps/server/src/provider/Drivers/MuseDriver.ts b/apps/server/src/provider/Drivers/MuseDriver.ts index be473113a377..f3f0b4bb483a 100644 --- a/apps/server/src/provider/Drivers/MuseDriver.ts +++ b/apps/server/src/provider/Drivers/MuseDriver.ts @@ -7,10 +7,9 @@ import * as Schema from "effect/Schema"; import { HttpClient } from "effect/http"; import { ChildProcessSpawner } from "effect/process"; -import * as BackgroundPolicy from "../../background/BackgroundPolicy.ts"; +import { ProviderHost } from "@t3tools/provider-core/server/host"; import * as ServerConfig from "../../config.ts"; import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion"; -import * as ServerSettings from "../../serverSettings.ts"; import { makeMuseTextGeneration } from "../../textGeneration/MuseTextGeneration.ts"; import { ProviderDriverError } from "../Errors.ts"; import { makeMuseAdapterV2 } from "../../orchestration-v2/Adapters/MuseAdapterV2.ts"; @@ -43,14 +42,13 @@ const decodeMuseSettings = Schema.decodeSync(MuseSettings); export type MuseDriverEnv = | IdAllocator.IdAllocatorV2 - | BackgroundPolicy.BackgroundPolicy + | ProviderHost | ChildProcessSpawner.ChildProcessSpawner | FileSystem.FileSystem | HttpClient.HttpClient | Path.Path | ProviderEventLoggers.ProviderEventLoggers - | ServerConfig.ServerConfig - | ServerSettings.ServerSettingsService; + | ServerConfig.ServerConfig; export const MuseDriver: ProviderDriver = { driverKind: DRIVER_KIND, @@ -63,7 +61,7 @@ export const MuseDriver: ProviderDriver = { const fileSystem = yield* FileSystem.FileSystem; const path = yield* Path.Path; const httpClient = yield* HttpClient.HttpClient; - const serverSettings = yield* ServerSettings.ServerSettingsService; + const host = yield* ProviderHost; const eventLoggers = yield* ProviderEventLoggers.ProviderEventLoggers; const serverConfig = yield* ServerConfig.ServerConfig; const { cwd } = serverConfig; @@ -91,7 +89,7 @@ export const MuseDriver: ProviderDriver = { accentColor, continuationGroupKey: continuationIdentity.continuationKey, }); - const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, serverSettings); + const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, host.settings); const resolveInstallation = yield* makeCachedProviderMaintenanceResolution( resolveProviderMaintenanceCapabilitiesEffect(museMaintenance, { binaryPath: effectiveConfig.binaryPath, diff --git a/apps/server/src/provider/Drivers/OpenCodeDriver.test.ts b/apps/server/src/provider/Drivers/OpenCodeDriver.test.ts index a8c998c9fa50..861885e59aa5 100644 --- a/apps/server/src/provider/Drivers/OpenCodeDriver.test.ts +++ b/apps/server/src/provider/Drivers/OpenCodeDriver.test.ts @@ -27,6 +27,7 @@ import { replayOpenCodeServer, } from "../testFixtures/opencodeProbeResponses.ts"; import { OpenCodeDriver, openCodeUpdateFor } from "./OpenCodeDriver.ts"; +import * as ProviderHostLive from "../ProviderHostLive.ts"; const serverStarts: Array = []; const reachedServer = (operation: string) => @@ -47,7 +48,7 @@ const openCode2Runtime = { connectToOpenCodeServer: () => reachedServer("connect"), } as unknown as OpenCodeRuntime.OpenCodeRuntimeShape; -const layer = Layer.mergeAll( +const layerDeps = Layer.mergeAll( ServerConfig.layerTest(process.cwd(), { prefix: "t3-opencode-driver-" }), IdAllocator.layer, ServerSettings.layerTest(), @@ -58,6 +59,7 @@ const layer = Layer.mergeAll( ), Layer.succeed(OpenCodeRuntime.OpenCodeRuntime, openCode2Runtime), ).pipe(Layer.provideMerge(NodeServices.layer)); +const layer = ProviderHostLive.layer.pipe(Layer.provideMerge(layerDeps)); const create = (config: Partial, http: HttpClient.HttpClient) => OpenCodeDriver.create({ @@ -211,7 +213,7 @@ const changingRuntime = { startOpenCodeServerProcess: () => reachedServer("start"), connectToOpenCodeServer: () => reachedServer("connect"), } as unknown as OpenCodeRuntime.OpenCodeRuntimeShape; -const layerUpdate = Layer.mergeAll( +const layerUpdateDeps = Layer.mergeAll( ServerConfig.layerTest(process.cwd(), { prefix: "t3-opencode-driver-update-" }), IdAllocator.layer, ServerSettings.layerTest(), @@ -222,6 +224,7 @@ const layerUpdate = Layer.mergeAll( ), Layer.succeed(OpenCodeRuntime.OpenCodeRuntime, changingRuntime), ).pipe(Layer.provideMerge(NodeServices.layer)); +const layerUpdate = ProviderHostLive.layer.pipe(Layer.provideMerge(layerUpdateDeps)); it.layer(layerUpdate)("OpenCodeDriver updates", (it) => { it.effect("never runs the binary for a disabled instance's update check", () => diff --git a/apps/server/src/provider/Drivers/OpenCodeDriver.ts b/apps/server/src/provider/Drivers/OpenCodeDriver.ts index 8115aafa3950..c1f16b8ca56c 100644 --- a/apps/server/src/provider/Drivers/OpenCodeDriver.ts +++ b/apps/server/src/provider/Drivers/OpenCodeDriver.ts @@ -26,12 +26,11 @@ import { ChildProcessSpawner } from "effect/process"; import * as OpenCode2TextGeneration from "../../textGeneration/OpenCode2TextGeneration.ts"; import { makeOpenCodeTextGeneration } from "../../textGeneration/OpenCodeTextGeneration.ts"; -import * as BackgroundPolicy from "../../background/BackgroundPolicy.ts"; +import { ProviderHost } from "@t3tools/provider-core/server/host"; import * as ServerConfig from "../../config.ts"; import * as OpenCodeAdapterV2 from "../../orchestration-v2/Adapters/OpenCodeAdapterV2.ts"; import * as OpenCode2AdapterV2 from "../../orchestration-v2/Adapters/OpenCode2AdapterV2.ts"; import type { ProviderAdapterV2Shape } from "@t3tools/provider-core/server/adapter"; -import * as ServerSettings from "../../serverSettings.ts"; import type { TextGeneration } from "../../textGeneration/TextGeneration.ts"; import { ProviderDriverError } from "../Errors.ts"; import { readOpenCodeGoUsageLimits } from "../openCodeUsageLimits.ts"; @@ -173,15 +172,14 @@ function selectOpenCodeRuntimeTextGeneration( export type OpenCodeDriverEnv = | OpenCodeAdapterV2.OpenCodeAdapterV2DriverEnv - | BackgroundPolicy.BackgroundPolicy + | ProviderHost | ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | FileSystem.FileSystem | HttpClient.HttpClient | OpenCodeRuntime.OpenCodeRuntime | Path.Path - | ServerConfig.ServerConfig - | ServerSettings.ServerSettingsService; + | ServerConfig.ServerConfig; export const OpenCodeDriver: ProviderDriver = { driverKind: DRIVER_KIND, @@ -200,7 +198,7 @@ export const OpenCodeDriver: ProviderDriver const serverConfig = yield* ServerConfig.ServerConfig; const httpClient = yield* HttpClient.HttpClient; const crypto = yield* Crypto.Crypto; - const serverSettings = yield* ServerSettings.ServerSettingsService; + const host = yield* ProviderHost; const processEnv = mergeProviderInstanceEnvironment(environment); const continuationIdentity = defaultProviderContinuationIdentity({ driverKind: DRIVER_KIND, @@ -449,7 +447,7 @@ export const OpenCodeDriver: ProviderDriver ), ); - const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, serverSettings); + const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, host.settings); const snapshot = yield* makeManagedServerProvider>( { resolveMaintenance, diff --git a/apps/server/src/provider/Drivers/PiDriver.test.ts b/apps/server/src/provider/Drivers/PiDriver.test.ts index 7202f1784a8e..4608fd054809 100644 --- a/apps/server/src/provider/Drivers/PiDriver.test.ts +++ b/apps/server/src/provider/Drivers/PiDriver.test.ts @@ -15,11 +15,12 @@ import { ChildProcess, ChildProcessSpawner } from "effect/process"; import * as BackgroundPolicy from "../../background/BackgroundPolicy.ts"; import * as ServerConfig from "../../config.ts"; -import * as IdAllocator from "../../orchestration-v2/IdAllocator.ts"; +import * as IdAllocator from "@t3tools/provider-core/server/ids"; import * as ServerSettings from "../../serverSettings.ts"; +import * as ProviderHostLive from "../ProviderHostLive.ts"; import { PiDriver } from "./PiDriver.ts"; -const layerTest = Layer.mergeAll( +const layerDeps = Layer.mergeAll( ServerConfig.layerTest("/machine", { prefix: "t3-pi-driver-" }), IdAllocator.layer, ServerSettings.layerTest({ enableProviderUpdateChecks: false }), @@ -32,6 +33,8 @@ const layerTest = Layer.mergeAll( ), ).pipe(Layer.provideMerge(NodeServices.layer)); +const layerTest = ProviderHostLive.layer.pipe(Layer.provideMerge(layerDeps)); + const decodeRequest = Schema.decodeSync( Schema.fromJsonString(Schema.Record(Schema.String, Schema.Unknown)), ); diff --git a/apps/server/src/provider/Drivers/PiDriver.ts b/apps/server/src/provider/Drivers/PiDriver.ts index 9dbf3a33b926..351fe5a3ab93 100644 --- a/apps/server/src/provider/Drivers/PiDriver.ts +++ b/apps/server/src/provider/Drivers/PiDriver.ts @@ -14,9 +14,7 @@ import * as Schema from "effect/Schema"; import { HttpClient } from "effect/http"; import { ChildProcessSpawner } from "effect/process"; -import * as BackgroundPolicy from "../../background/BackgroundPolicy.ts"; -import * as ServerConfig from "../../config.ts"; -import * as ServerSettings from "../../serverSettings.ts"; +import { ProviderHost } from "@t3tools/provider-core/server/host"; import { makePiTextGeneration } from "../../textGeneration/PiTextGeneration.ts"; import { PiAdapterV2Driver, @@ -60,13 +58,11 @@ const UPDATE = makePackageManagedProviderMaintenanceResolver({ export type PiDriverEnv = | PiAdapterV2DriverEnv - | BackgroundPolicy.BackgroundPolicy + | ProviderHost | ChildProcessSpawner.ChildProcessSpawner | FileSystem.FileSystem | HttpClient.HttpClient - | Path.Path - | ServerConfig.ServerConfig - | ServerSettings.ServerSettingsService; + | Path.Path; const withInstanceIdentity = (input: { @@ -98,8 +94,8 @@ export const PiDriver: ProviderDriver = { const fileSystem = yield* FileSystem.FileSystem; const pathService = yield* Path.Path; const httpClient = yield* HttpClient.HttpClient; - const { cwd } = yield* ServerConfig.ServerConfig; - const serverSettings = yield* ServerSettings.ServerSettingsService; + const host = yield* ProviderHost; + const { cwd } = host.paths; const processEnv = mergeProviderInstanceEnvironment(environment); const continuationIdentity = defaultProviderContinuationIdentity({ driverKind: DRIVER_KIND, @@ -148,7 +144,7 @@ export const PiDriver: ProviderDriver = { Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner), ); - const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, serverSettings); + const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, host.settings); const snapshot = yield* makeManagedServerProvider>({ resolveMaintenance, getSettings: snapshotSettings.getSettings, diff --git a/apps/server/src/provider/ProviderHostLive.ts b/apps/server/src/provider/ProviderHostLive.ts new file mode 100644 index 000000000000..55c9e9386e89 --- /dev/null +++ b/apps/server/src/provider/ProviderHostLive.ts @@ -0,0 +1,39 @@ +/** + * The server's implementation of `ProviderHost`, the only server surface + * provider drivers and adapters may use. + * + * @module provider/ProviderHostLive + */ +import { ProviderHost } from "@t3tools/provider-core/server/host"; +import * as Effect from "effect/Effect"; +import * as Layer from "effect/Layer"; + +import { resolveAttachmentPath } from "../attachmentStore.ts"; +import * as BackgroundPolicy from "../background/BackgroundPolicy.ts"; +import * as ServerConfig from "../config.ts"; +import * as ServerSettings from "../serverSettings.ts"; + +export const layer = Layer.effect( + ProviderHost, + Effect.gen(function* () { + const config = yield* ServerConfig.ServerConfig; + const serverSettings = yield* ServerSettings.ServerSettingsService; + const backgroundPolicy = yield* BackgroundPolicy.BackgroundPolicy; + return ProviderHost.of({ + paths: { + cwd: config.cwd, + baseDir: config.baseDir, + stateDir: config.stateDir, + providerStatusCacheDir: config.providerStatusCacheDir, + }, + settings: { + get: serverSettings.getSettings, + changes: serverSettings.streamChanges, + subscribe: serverSettings.subscribeChanges, + }, + shouldRunBackgroundWork: backgroundPolicy.shouldRunScopeWork, + resolveAttachmentPath: (attachment) => + resolveAttachmentPath({ attachmentsDir: config.attachmentsDir, attachment }), + }); + }), +); diff --git a/apps/server/src/provider/ProviderInstanceRegistry.test.ts b/apps/server/src/provider/ProviderInstanceRegistry.test.ts index 75bccf9a9305..8050e426dd6c 100644 --- a/apps/server/src/provider/ProviderInstanceRegistry.test.ts +++ b/apps/server/src/provider/ProviderInstanceRegistry.test.ts @@ -64,6 +64,7 @@ import * as ResetCreditCoordinator from "./resetCreditCoordinator.ts"; import * as ProviderEventLoggers from "./ProviderEventLoggers.ts"; import { makeProviderInstanceRegistry } from "./ProviderInstanceRegistry.ts"; import * as ProviderOrchestrationAdapterInfrastructure from "./ProviderOrchestrationAdapterInfrastructure.ts"; +import * as ProviderHostLive from "./ProviderHostLive.ts"; const layerTestHttpClient = Layer.succeed( HttpClient.HttpClient, @@ -200,7 +201,7 @@ describe("ProviderInstanceRegistry — multi-instance codex slice", () => { // `NodeServices.layer` through `Layer.provideMerge` to satisfy that // dependency while still surfacing NodeServices to the test body (the // codex driver's `create` yields `ChildProcessSpawner` directly). - const layerBase = ServerConfig.layerTest(process.cwd(), { + const layerBaseDeps = ServerConfig.layerTest(process.cwd(), { prefix: "provider-instance-registry-test", }).pipe( Layer.provideMerge(NodeServices.layer), @@ -230,6 +231,7 @@ describe("ProviderInstanceRegistry — multi-instance codex slice", () => { Layer.provideMerge(ModelManifest.layerTest), Layer.provideMerge(ResetCreditCoordinator.layerTest), ); + const layerBase = ProviderHostLive.layer.pipe(Layer.provideMerge(layerBaseDeps)); const layerTest = ProviderOrchestrationAdapterInfrastructure.layer.pipe( Layer.provideMerge(layerBase), ); @@ -589,7 +591,7 @@ describe("ProviderInstanceRegistry — all drivers slice", () => { }), ), ); - const layerBase = AntigravityInstallation.AntigravityInstallation.layer.pipe( + const layerBaseDeps = AntigravityInstallation.AntigravityInstallation.layer.pipe( Layer.provideMerge(ServerSecretStore.layer), Layer.provideMerge( ServerConfig.layerTest(process.cwd(), { @@ -610,6 +612,7 @@ describe("ProviderInstanceRegistry — all drivers slice", () => { Layer.provideMerge(ModelManifest.layerTest), Layer.provideMerge(ResetCreditCoordinator.layerTest), ); + const layerBase = ProviderHostLive.layer.pipe(Layer.provideMerge(layerBaseDeps)); const layerTest = ProviderOrchestrationAdapterInfrastructure.layer.pipe( Layer.provideMerge(layerBase), ); diff --git a/apps/server/src/provider/ProviderInstanceRegistryHydration.ts b/apps/server/src/provider/ProviderInstanceRegistryHydration.ts index ace5b4696c0a..505cd8298feb 100644 --- a/apps/server/src/provider/ProviderInstanceRegistryHydration.ts +++ b/apps/server/src/provider/ProviderInstanceRegistryHydration.ts @@ -40,14 +40,22 @@ import * as ProviderInstanceRegistryMutator from "./ProviderInstanceRegistryMuta import * as ProviderOrchestrationAdapterInfrastructure from "./ProviderOrchestrationAdapterInfrastructure.ts"; import * as AcpRegistrySupport from "./acp/AcpRegistrySupport.ts"; import * as AcpRegistryCatalog from "./AcpRegistryCatalog.ts"; +import * as ProviderHostLive from "./ProviderHostLive.ts"; +import type { ProviderHost } from "@t3tools/provider-core/server/host"; +import type * as BackgroundPolicy from "../background/BackgroundPolicy.ts"; +import type * as ServerConfig from "../config.ts"; type ProviderInstanceRegistryHydrationEnv = | Exclude< BuiltInDriversEnv, | ProviderOrchestrationAdapterInfrastructure.ProviderOrchestrationAdapterInfrastructure | AcpRegistrySupport.AcpRegistryCatalog + | ProviderHost > - | Settings.ServerSettingsService; + | Settings.ServerSettingsService + // Requirements of the `ProviderHost` the drivers receive. + | BackgroundPolicy.BackgroundPolicy + | ServerConfig.ServerConfig; /** * Explicit `providerInstances` entries plus an implicit default instance for @@ -137,6 +145,7 @@ export const layer: Layer.Layer< }).pipe( Layer.provide(ProviderOrchestrationAdapterInfrastructure.layer), Layer.provide(AcpRegistryCatalog.layer), + Layer.provide(ProviderHostLive.layer), ); return layerSettingsWatcher.pipe(Layer.provideMerge(layerMutable)); diff --git a/apps/server/src/provider/makeManagedServerProvider.test.ts b/apps/server/src/provider/makeManagedServerProvider.test.ts index 17c1e442adb7..767ed192b25d 100644 --- a/apps/server/src/provider/makeManagedServerProvider.test.ts +++ b/apps/server/src/provider/makeManagedServerProvider.test.ts @@ -1,3 +1,4 @@ +import * as NodeServices from "@effect/platform-node/NodeServices"; import { describe, it, assert } from "@effect/vitest"; import { DEFAULT_SERVER_SETTINGS, @@ -18,8 +19,10 @@ import * as Stream from "effect/Stream"; import { TestClock } from "effect/testing"; import * as BackgroundPolicy from "../background/BackgroundPolicy.ts"; +import * as ServerConfig from "../config.ts"; import * as ServerSettings from "../serverSettings.ts"; import { makeManagedServerProvider } from "./makeManagedServerProvider.ts"; +import * as ProviderHostLive from "./ProviderHostLive.ts"; const emptyCapabilities = createModelCapabilities({ optionDescriptors: [] }); const TEST_EPOCH = DateTime.makeUnsafe("1970-01-01T00:00:00.000Z"); @@ -133,8 +136,26 @@ function layerBackgroundPolicy(shouldRunScopeWork: boolean) { const layerBackgroundPolicyAlwaysRun = layerBackgroundPolicy(true); const layerBackgroundPolicyNeverRun = layerBackgroundPolicy(false); const layerServerSettingsTest = ServerSettings.layerTest(); -const layerAlwaysRunTest = Layer.merge(layerBackgroundPolicyAlwaysRun, layerServerSettingsTest); -const layerNeverRunTest = Layer.merge(layerBackgroundPolicyNeverRun, layerServerSettingsTest); +const layerServerConfigTest = ServerConfig.layerTest(process.cwd(), { + prefix: "t3-managed-provider-test-", +}).pipe(Layer.provide(NodeServices.layer)); + +function layerProviderHost( + layerBackground: Layer.Layer, + layerSettings: Layer.Layer, +) { + return ProviderHostLive.layer.pipe( + Layer.provideMerge(layerBackground), + Layer.provideMerge(layerSettings), + Layer.provide(layerServerConfigTest), + ); +} + +const layerAlwaysRunTest = layerProviderHost( + layerBackgroundPolicyAlwaysRun, + layerServerSettingsTest, +); +const layerNeverRunTest = layerProviderHost(layerBackgroundPolicyNeverRun, layerServerSettingsTest); const enrichedSnapshotSecond: ServerProvider = { ...refreshedSnapshotSecond, @@ -326,7 +347,9 @@ describe("makeManagedServerProvider", () => { ), Effect.as(refreshedSnapshot), ), - }).pipe(Effect.provide(Layer.merge(layerBackgroundPolicyAlwaysRun, layerServerSettings))); + }).pipe( + Effect.provide(layerProviderHost(layerBackgroundPolicyAlwaysRun, layerServerSettings)), + ); yield* Deferred.await(initialCheckDone); const nextServerSettings = { diff --git a/apps/server/src/provider/makeManagedServerProvider.ts b/apps/server/src/provider/makeManagedServerProvider.ts index 0e16e24bc02a..ecf82c642252 100644 --- a/apps/server/src/provider/makeManagedServerProvider.ts +++ b/apps/server/src/provider/makeManagedServerProvider.ts @@ -15,8 +15,7 @@ import * as Scope from "effect/Scope"; import * as Stream from "effect/Stream"; import * as Semaphore from "effect/Semaphore"; -import * as BackgroundPolicy from "../background/BackgroundPolicy.ts"; -import * as ServerSettings from "../serverSettings.ts"; +import { ProviderHost } from "@t3tools/provider-core/server/host"; import { applyUsageLimitsUpdate, resolveUsageLimitsAfterProbe, @@ -57,13 +56,8 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")( readonly refreshInterval?: Duration.Input; readonly refreshOnInterval?: boolean; readonly checkProviderOnSettingsChange?: (previous: Settings, next: Settings) => boolean; -}): Effect.fn.Return< - ServerProviderShape, - ServerSettingsError, - Scope.Scope | BackgroundPolicy.BackgroundPolicy | ServerSettings.ServerSettingsService -> { - const backgroundPolicy = yield* BackgroundPolicy.BackgroundPolicy; - const serverSettings = yield* ServerSettings.ServerSettingsService; +}): Effect.fn.Return { + const host = yield* ProviderHost; const refreshSemaphore = yield* Semaphore.make(1); const changesPubSub = yield* Effect.acquireRelease( PubSub.unbounded(), @@ -216,8 +210,8 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")( const state = yield* Ref.get(snapshotStateRef); const instanceId = state.snapshot.instanceId; const [genericDemand, instanceDemand] = yield* Effect.all([ - backgroundPolicy.shouldRunScopeWork({ type: "provider-status" }), - backgroundPolicy.shouldRunScopeWork({ type: "provider-status", instanceId }), + host.shouldRunBackgroundWork({ type: "provider-status" }), + host.shouldRunBackgroundWork({ type: "provider-status", instanceId }), ]); return genericDemand || instanceDemand; }); @@ -225,7 +219,7 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")( const getRefreshInterval = input.refreshInterval !== undefined ? Effect.succeed(input.refreshInterval) - : serverSettings.getSettings.pipe( + : host.settings.get.pipe( Effect.map( (settings) => resolveServerBackgroundActivitySettings(settings).providerHealthRefreshInterval, @@ -235,7 +229,7 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")( const refreshIntervalChanges = yield* Queue.sliding(1); if (input.refreshInterval === undefined) { - const serverSettingsChanges = yield* serverSettings.subscribeChanges; + const serverSettingsChanges = yield* host.settings.subscribe; yield* serverSettingsChanges.pipe( Stream.map((settings) => Duration.toMillis( diff --git a/apps/server/src/provider/providerUpdateSettings.ts b/apps/server/src/provider/providerUpdateSettings.ts index 30ad2bf8a286..4c5f72cf076c 100644 --- a/apps/server/src/provider/providerUpdateSettings.ts +++ b/apps/server/src/provider/providerUpdateSettings.ts @@ -3,7 +3,7 @@ import * as Effect from "effect/Effect"; import * as Equal from "effect/Equal"; import * as Stream from "effect/Stream"; -import type * as ServerSettingsModule from "../serverSettings.ts"; +import type { ProviderHostShape } from "@t3tools/provider-core/server/host"; export interface ProviderSnapshotSettings { readonly provider: Settings; @@ -29,7 +29,7 @@ export function haveProviderSnapshotSettingsChanged( export function makeProviderSnapshotSettingsSource( provider: Settings, - serverSettings: ServerSettingsModule.ServerSettingsService["Service"], + settings: ProviderHostShape["settings"], ): { readonly getSettings: Effect.Effect, ServerSettingsError>; readonly streamSettings: Stream.Stream>; @@ -37,7 +37,7 @@ export function makeProviderSnapshotSettingsSource( const mapSettings = (settings: ServerSettings) => makeProviderSnapshotSettings(provider, settings); return { - getSettings: serverSettings.getSettings.pipe(Effect.map(mapSettings)), - streamSettings: serverSettings.streamChanges.pipe(Stream.map(mapSettings)), + getSettings: settings.get.pipe(Effect.map(mapSettings)), + streamSettings: settings.changes.pipe(Stream.map(mapSettings)), }; } diff --git a/packages/provider-core/package.json b/packages/provider-core/package.json index ffa21cdd1914..daf303fa4e9e 100644 --- a/packages/provider-core/package.json +++ b/packages/provider-core/package.json @@ -35,6 +35,10 @@ "types": "./src/server/failure.ts", "import": "./src/server/failure.ts" }, + "./server/host": { + "types": "./src/server/host.ts", + "import": "./src/server/host.ts" + }, "./server/ids": { "types": "./src/server/ids.ts", "import": "./src/server/ids.ts" diff --git a/packages/provider-core/src/server/host.ts b/packages/provider-core/src/server/host.ts new file mode 100644 index 000000000000..c2c378c4920b --- /dev/null +++ b/packages/provider-core/src/server/host.ts @@ -0,0 +1,54 @@ +/** + * ProviderHost — what a provider package may ask of the server it runs in. + * + * Drivers and adapters run inside a T3 server but must not import it. The + * server provides this one service; everything a provider needs from its + * environment (directories, server settings, background demand, attachment + * files) goes through it, so a provider package depends only on + * `@t3tools/provider-core` and its own protocol code. + * + * @module provider-core/server/host + */ +import type { + BackgroundScope, + ChatAttachment, + ServerSettings, + ServerSettingsError, +} from "@t3tools/contracts"; +import * as Context from "effect/Context"; +import type * as Effect from "effect/Effect"; +import type * as Scope from "effect/Scope"; +import type * as Stream from "effect/Stream"; + +export interface ProviderHostPaths { + /** Directory the server was started in; the fallback cwd for sessions without a project. */ + readonly cwd: string; + /** T3 home. */ + readonly baseDir: string; + /** Server-owned state directory under the T3 home. */ + readonly stateDir: string; + /** Scratch space for provider probes and generated helper files. */ + readonly providerStatusCacheDir: string; +} + +export interface ProviderHostShape { + readonly paths: ProviderHostPaths; + readonly settings: { + readonly get: Effect.Effect; + /** Every settings change after subscription, starting with the next one. */ + readonly changes: Stream.Stream; + /** Changes buffered from the moment the scoped subscription is acquired. */ + readonly subscribe: Effect.Effect, never, Scope.Scope>; + }; + /** Whether background work for `scope` should run now (client demand and host power). */ + readonly shouldRunBackgroundWork: (scope: BackgroundScope) => Effect.Effect; + /** + * Absolute path of a stored chat attachment, or `null` when its id does not + * resolve inside the attachments directory. + */ + readonly resolveAttachmentPath: (attachment: ChatAttachment) => string | null; +} + +export class ProviderHost extends Context.Service()( + "@t3tools/provider-core/server/host/ProviderHost", +) {} diff --git a/packages/provider-testing/package.json b/packages/provider-testing/package.json index 429092733bcf..35e3941ba87d 100644 --- a/packages/provider-testing/package.json +++ b/packages/provider-testing/package.json @@ -14,6 +14,10 @@ "./replayWorkspace": { "types": "./src/replayWorkspace.ts", "import": "./src/replayWorkspace.ts" + }, + "./host": { + "types": "./src/host.ts", + "import": "./src/host.ts" } }, "scripts": { @@ -23,6 +27,7 @@ "dependencies": { "@effect/platform-node": "catalog:", "@t3tools/contracts": "workspace:*", + "@t3tools/provider-core": "workspace:*", "effect": "catalog:" }, "devDependencies": { diff --git a/packages/provider-testing/src/host.ts b/packages/provider-testing/src/host.ts new file mode 100644 index 000000000000..856005f949e3 --- /dev/null +++ b/packages/provider-testing/src/host.ts @@ -0,0 +1,54 @@ +/** + * A `ProviderHost` for driver and adapter tests. Its directories live in a + * scoped temp directory, settings are fixed, and background work always runs + * unless the test says otherwise. + * + * @module provider-testing/host + */ +import { DEFAULT_SERVER_SETTINGS, type ServerSettings } from "@t3tools/contracts"; +import { ProviderHost } from "@t3tools/provider-core/server/host"; +import * as Effect from "effect/Effect"; +import * as FileSystem from "effect/FileSystem"; +import * as Layer from "effect/Layer"; +import * as Path from "effect/Path"; +import * as Stream from "effect/Stream"; + +export interface TestProviderHostOptions { + /** Session fallback cwd. Defaults to the test process cwd. */ + readonly cwd?: string; + readonly settings?: ServerSettings; + /** Whether background work such as status probes may run. Defaults to `true`. */ + readonly runBackgroundWork?: boolean; +} + +export const layerTestProviderHost = ( + options: TestProviderHostOptions = {}, +): Layer.Layer => + Layer.effect( + ProviderHost, + Effect.gen(function* () { + const fileSystem = yield* FileSystem.FileSystem; + const path = yield* Path.Path; + const baseDir = yield* fileSystem + .makeTempDirectoryScoped({ prefix: "t3-provider-host-" }) + .pipe(Effect.orDie); + const stateDir = path.join(baseDir, "userdata"); + const providerStatusCacheDir = path.join(baseDir, "caches"); + const attachmentsDir = path.join(stateDir, "attachments"); + for (const directory of [stateDir, providerStatusCacheDir, attachmentsDir]) { + yield* fileSystem.makeDirectory(directory, { recursive: true }).pipe(Effect.orDie); + } + const settings = options.settings ?? DEFAULT_SERVER_SETTINGS; + return ProviderHost.of({ + paths: { cwd: options.cwd ?? process.cwd(), baseDir, stateDir, providerStatusCacheDir }, + settings: { + get: Effect.succeed(settings), + changes: Stream.empty, + subscribe: Effect.succeed(Stream.empty), + }, + shouldRunBackgroundWork: () => Effect.succeed(options.runBackgroundWork ?? true), + // Tests store attachments flat under the attachments directory by id. + resolveAttachmentPath: (attachment) => path.join(attachmentsDir, attachment.id), + }); + }), + ); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f3b927823a62..a3da3784edd8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1095,6 +1095,9 @@ importers: '@t3tools/contracts': specifier: workspace:* version: link:../contracts + '@t3tools/provider-core': + specifier: workspace:* + version: link:../provider-core effect: specifier: 4.0.1 version: 4.0.1(patch_hash=a33cba07c41f32374c2aaa86ea4a84d3ab9a872a78c94b65e929b19f8361856f)