Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions apps/server/src/provider/ProviderHostLive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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,
Expand All @@ -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.
Expand Down
52 changes: 52 additions & 0 deletions apps/server/src/provider/ProviderInstanceRegistryHydration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,29 @@ 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";
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");
Expand Down Expand Up @@ -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<string, ProviderHost.ProviderHost["Service"]>();
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");
}),
);
});
Original file line number Diff line number Diff line change
Expand Up @@ -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<ServerSettings>,
// The settings the registry was built from: a change queued during startup differs from these.
Expand Down Expand Up @@ -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),
);
Expand Down
5 changes: 5 additions & 0 deletions packages/provider-core/src/server/ProviderHost.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<string | undefined>;
/**
* 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,
Expand Down
24 changes: 24 additions & 0 deletions packages/provider-pi/src/server/adapter.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<string>();
Expand Down
7 changes: 7 additions & 0 deletions packages/provider-pi/src/server/adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading