diff --git a/apps/server/src/provider/ProviderHostLive.ts b/apps/server/src/provider/ProviderHostLive.ts index fed07efc035ee..405e2f7100029 100644 --- a/apps/server/src/provider/ProviderHostLive.ts +++ b/apps/server/src/provider/ProviderHostLive.ts @@ -10,6 +10,7 @@ import { resolveAttachmentPath } from "../attachmentStore.ts"; import * as ServerSecretStore from "../auth/ServerSecretStore.ts"; import * as BackgroundPolicy from "../background/BackgroundPolicy.ts"; import * as ServerConfig from "../config.ts"; +import * as PortScanner from "../preview/PortScanner.ts"; import * as ServerLifecycleEvents from "../serverLifecycleEvents.ts"; import * as ServerSettings from "../serverSettings.ts"; import * as DocumentText from "./DocumentText.ts"; @@ -28,6 +29,8 @@ export const layer = Layer.effect( const lifecycleEvents = yield* Effect.serviceOption( ServerLifecycleEvents.ServerLifecycleEvents, ); + // Optional so hosts built without the preview layer still construct. + const portDiscovery = yield* Effect.serviceOption(PortScanner.PortDiscovery); return ProviderHost.ProviderHost.of({ paths: { cwd: config.cwd, @@ -47,6 +50,10 @@ export const layer = Layer.effect( onNone: () => ({}), onSome: (events) => ({ awaitServerReady: events.awaitReady }), }), + ...Option.match(portDiscovery, { + onNone: () => ({}), + onSome: (discovery) => ({ trackAgent: discovery.trackAgent }), + }), resolveAttachmentPath: (attachment) => resolveAttachmentPath({ attachmentsDir: config.attachmentsDir, attachment }), // DocumentText owns the path-resolution span. diff --git a/apps/server/src/provider/ProviderInstanceRegistryHydration.test.ts b/apps/server/src/provider/ProviderInstanceRegistryHydration.test.ts index a9de2878a39c2..05df914323da3 100644 --- a/apps/server/src/provider/ProviderInstanceRegistryHydration.test.ts +++ b/apps/server/src/provider/ProviderInstanceRegistryHydration.test.ts @@ -7,7 +7,9 @@ import { SecretProviderKind, type ServerSettings, } from "@t3tools/contracts"; +import * as NodeCrypto from "@effect/platform-node/NodeCrypto"; import * as NodeServices from "@effect/platform-node/NodeServices"; +import * as ProviderHost from "@t3tools/provider-core/server/ProviderHost"; import { it as effectIt } from "@effect/vitest"; import * as Effect from "effect/Effect"; import * as Layer from "effect/Layer"; @@ -15,14 +17,19 @@ import * as Queue from "effect/Queue"; import * as Stream from "effect/Stream"; import { describe, expect, it } from "vite-plus/test"; +import * as ServerSecretStore from "../auth/ServerSecretStore.ts"; +import * as BackgroundPolicy from "../background/BackgroundPolicy.ts"; import * as ServerConfig from "../config.ts"; +import * as PortScanner from "../preview/PortScanner.ts"; import { ServerSettingsService } from "../serverSettings.ts"; import { DEV_REPLAY_INSTANCE_ID, deriveProviderInstanceConfigMap, layerSettingsWatcher, + providerHostLayer, seedDevReplayInstance, } from "./ProviderInstanceRegistryHydration.ts"; +import * as ProviderHostLive from "./ProviderHostLive.ts"; import { ProviderInstanceRegistryMutator } from "./ProviderInstanceRegistryMutator.ts"; const projectId = ProjectId.make("project-a"); @@ -213,3 +220,48 @@ describe("layerSettingsWatcher", () => { }).pipe(Effect.scoped, Effect.provide(ServerSettingsService.layerTest())), ); }); + +describe("providerHostLayer", () => { + const layerHostDeps = ServerConfig.layerTest(process.cwd(), { + prefix: "provider-host-hydration-test", + }).pipe( + Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)), + Layer.provideMerge(Layer.mock(ServerSecretStore.ServerSecretStore)({})), + Layer.provideMerge(Layer.mock(BackgroundPolicy.BackgroundPolicy)({})), + Layer.provideMerge(ServerSettingsService.layerTest()), + ); + + effectIt.effect( + "gives drivers trackAgent when a host without PortDiscovery was built first", + () => + Effect.gen(function* () { + const seen = new Map(); + const capture = (label: string) => + Layer.effectDiscard( + Effect.map(ProviderHost.ProviderHost, (host) => { + seen.set(label, host); + }), + ); + // Like server.ts: the ACP registry builds ProviderHostLive.layer before PortDiscovery exists. + const early = capture("early").pipe( + Layer.provide(ProviderHostLive.layer), + Layer.provide(layerHostDeps), + ); + const hydrated = capture("hydrated").pipe( + Layer.provide(providerHostLayer), + Layer.provide( + Layer.mock(PortScanner.PortDiscovery)({ trackAgent: () => () => undefined }), + ), + Layer.provide(layerHostDeps), + ); + // Build in order on one memo map, so a reused early host would fail the hydrated check. + const memoMap = yield* Layer.makeMemoMap; + const scope = yield* Effect.scope; + yield* Layer.buildWithMemoMap(early, memoMap, scope); + yield* Layer.buildWithMemoMap(hydrated, memoMap, scope); + expect(seen.size).toBe(2); + expect(seen.get("early")?.trackAgent).toBeUndefined(); + expect(seen.get("hydrated")?.trackAgent).toBeTypeOf("function"); + }), + ); +}); diff --git a/apps/server/src/provider/ProviderInstanceRegistryHydration.ts b/apps/server/src/provider/ProviderInstanceRegistryHydration.ts index f1f0ba8b59874..1e882e3796c35 100644 --- a/apps/server/src/provider/ProviderInstanceRegistryHydration.ts +++ b/apps/server/src/provider/ProviderInstanceRegistryHydration.ts @@ -131,6 +131,9 @@ export const seedDevReplayInstance = Effect.fn( const vaultConfigs = (settings: ServerSettings) => Object.entries(settings.secretProviders).map(([id, { kind, config }]) => [id, kind, config]); +// A host built earlier (for the ACP registry) lacks PortDiscovery; build this one fresh. +export const providerHostLayer = Layer.fresh(ProviderHostLive.layer); + export const layerSettingsWatcher = ( settingsChanges: Stream.Stream, // The settings the registry was built from: a change queued during startup differs from these. @@ -204,7 +207,7 @@ export const layer: Layer.Layer< }).pipe( Layer.provide(ProviderOrchestrationAdapterInfrastructure.layer), Layer.provide(AcpRegistrySupport.layerFromHost), - Layer.provide(ProviderHostLive.layer), + Layer.provide(providerHostLayer), Layer.provide(Layer.succeed(HostProcess.Environment, hostEnvironment)), Layer.provide(SecretResolver.layer), ); diff --git a/packages/provider-core/src/server/ProviderHost.ts b/packages/provider-core/src/server/ProviderHost.ts index 804e8ff4cdda7..6f93df188ea53 100644 --- a/packages/provider-core/src/server/ProviderHost.ts +++ b/packages/provider-core/src/server/ProviderHost.ts @@ -49,6 +49,11 @@ export class ProviderHost extends Context.Service< /** Absolute attachment path, or null if the ID does not resolve inside attachmentsDir. */ readonly resolveAttachmentPath: (attachment: ChatAttachment) => string | null; readonly resolveExtractedTextPath?: (path: string) => Effect.Effect; + /** + * Counts a running agent for local server discovery, so listeners carrying its + * T3CODE_THREAD_ID show under its thread. Call the returned function when it stops. + */ + readonly trackAgent?: () => () => void; readonly credentials: ( namespace: string, bindingId: string, diff --git a/packages/provider-pi/src/server/adapter.test.ts b/packages/provider-pi/src/server/adapter.test.ts index 50501dcc9cce1..14daa9eca7beb 100644 --- a/packages/provider-pi/src/server/adapter.test.ts +++ b/packages/provider-pi/src/server/adapter.test.ts @@ -2078,6 +2078,30 @@ describe("PiAdapterV2", () => { }).pipe(Effect.provide(layerTest)), ); + it.effect("counts a running Pi for port discovery until its session closes", () => + Effect.gen(function* () { + const host = yield* ProviderHost.ProviderHost; + let running = 0; + yield* Effect.gen(function* () { + const fake = yield* makeFakePi; + yield* openRuntime(fake); + assert.equal(running, 1); + }).pipe( + Effect.scoped, + Effect.provideService(ProviderHost.ProviderHost, { + ...host, + trackAgent: () => { + running += 1; + return () => { + running -= 1; + }; + }, + }), + ); + assert.equal(running, 0); + }).pipe(Effect.provide(layerTest)), + ); + it.effect("gives notify and extension-error items distinct ids in each thread", () => Effect.gen(function* () { const itemIds = new Set(); diff --git a/packages/provider-pi/src/server/adapter.ts b/packages/provider-pi/src/server/adapter.ts index 313b7f030cd45..a6c2ec103ca91 100644 --- a/packages/provider-pi/src/server/adapter.ts +++ b/packages/provider-pi/src/server/adapter.ts @@ -564,6 +564,13 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* ( cwd, env: launch.env, }); + // Its tools carry T3CODE_THREAD_ID, so port discovery must scan while Pi runs. + const trackAgent = host.trackAgent; + if (trackAgent !== undefined) { + yield* Effect.acquireRelease(Effect.sync(trackAgent), (release) => + Effect.sync(release), + ); + } // Detached children can keep stdout open after Pi exits. if (scopeUnit !== undefined) { yield* connection.exited.pipe(