The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 21, 06:00 UTC
fix(pi): dev servers a Pi agent starts show under its thread (#39007)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
minsoo.lee committed
Nov 19, 2026 at 17:30 UTC
047c4d7599d3349f3053673c9bba23f68ca52866
6 files changed
+99
-1
apps/server/src/provider/ProviderHostLive.ts
+7
@@ -10,6 +10,7 @@ import { resolveAttachmentPath } from "../attachmentStore.ts";
10
import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
11
import * as BackgroundPolicy from "../background/BackgroundPolicy.ts";
12
import * as ServerConfig from "../config.ts";
13
+import * as PortScanner from "../preview/PortScanner.ts";
14
import * as ServerLifecycleEvents from "../serverLifecycleEvents.ts";
15
import * as ServerSettings from "../serverSettings.ts";
16
import * as DocumentText from "./DocumentText.ts";
@@ -28,6 +29,8 @@ export const layer = Layer.effect(
29
const lifecycleEvents = yield* Effect.serviceOption(
30
ServerLifecycleEvents.ServerLifecycleEvents,
31
);
32
+ // Optional so hosts built without the preview layer still construct.
33
+ const portDiscovery = yield* Effect.serviceOption(PortScanner.PortDiscovery);
34
return ProviderHost.ProviderHost.of({
35
paths: {
36
cwd: config.cwd,
@@ -47,6 +50,10 @@ export const layer = Layer.effect(
50
onNone: () => ({}),
51
onSome: (events) => ({ awaitServerReady: events.awaitReady }),
52
}),
53
+ ...Option.match(portDiscovery, {
54
+ onNone: () => ({}),
55
+ onSome: (discovery) => ({ trackAgent: discovery.trackAgent }),
56
+ }),
57
resolveAttachmentPath: (attachment) =>
58
resolveAttachmentPath({ attachmentsDir: config.attachmentsDir, attachment }),
59
// DocumentText owns the path-resolution span.
apps/server/src/provider/ProviderInstanceRegistryHydration.test.ts
+52
@@ -7,7 +7,9 @@ import {
7
SecretProviderKind,
8
type ServerSettings,
9
} from "@t3tools/contracts";
10
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
11
import * as NodeServices from "@effect/platform-node/NodeServices";
12
+import * as ProviderHost from "@t3tools/provider-core/server/ProviderHost";
13
import { it as effectIt } from "@effect/vitest";
14
import * as Effect from "effect/Effect";
15
import * as Layer from "effect/Layer";
@@ -15,14 +17,19 @@ import * as Queue from "effect/Queue";
17
import * as Stream from "effect/Stream";
18
import { describe, expect, it } from "vite-plus/test";
19
20
+import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
21
+import * as BackgroundPolicy from "../background/BackgroundPolicy.ts";
22
import * as ServerConfig from "../config.ts";
23
+import * as PortScanner from "../preview/PortScanner.ts";
24
import { ServerSettingsService } from "../serverSettings.ts";
25
import {
26
DEV_REPLAY_INSTANCE_ID,
27
deriveProviderInstanceConfigMap,
28
layerSettingsWatcher,
29
+ providerHostLayer,
30
seedDevReplayInstance,
31
} from "./ProviderInstanceRegistryHydration.ts";
32
+import * as ProviderHostLive from "./ProviderHostLive.ts";
33
import { ProviderInstanceRegistryMutator } from "./ProviderInstanceRegistryMutator.ts";
34
35
const projectId = ProjectId.make("project-a");
@@ -213,3 +220,48 @@ describe("layerSettingsWatcher", () => {
220
}).pipe(Effect.scoped, Effect.provide(ServerSettingsService.layerTest())),
221
);
222
});
223
+
224
+describe("providerHostLayer", () => {
225
+ const layerHostDeps = ServerConfig.layerTest(process.cwd(), {
226
+ prefix: "provider-host-hydration-test",
227
+ }).pipe(
228
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
229
+ Layer.provideMerge(Layer.mock(ServerSecretStore.ServerSecretStore)({})),
230
+ Layer.provideMerge(Layer.mock(BackgroundPolicy.BackgroundPolicy)({})),
231
+ Layer.provideMerge(ServerSettingsService.layerTest()),
232
+ );
233
+
234
+ effectIt.effect(
235
+ "gives drivers trackAgent when a host without PortDiscovery was built first",
236
+ () =>
237
+ Effect.gen(function* () {
238
+ const seen = new Map<string, ProviderHost.ProviderHost["Service"]>();
239
+ const capture = (label: string) =>
240
+ Layer.effectDiscard(
241
+ Effect.map(ProviderHost.ProviderHost, (host) => {
242
+ seen.set(label, host);
243
+ }),
244
+ );
245
+ // Like server.ts: the ACP registry builds ProviderHostLive.layer before PortDiscovery exists.
246
+ const early = capture("early").pipe(
247
+ Layer.provide(ProviderHostLive.layer),
248
+ Layer.provide(layerHostDeps),
249
+ );
250
+ const hydrated = capture("hydrated").pipe(
251
+ Layer.provide(providerHostLayer),
252
+ Layer.provide(
253
+ Layer.mock(PortScanner.PortDiscovery)({ trackAgent: () => () => undefined }),
254
+ ),
255
+ Layer.provide(layerHostDeps),
256
+ );
257
+ // Build in order on one memo map, so a reused early host would fail the hydrated check.
258
+ const memoMap = yield* Layer.makeMemoMap;
259
+ const scope = yield* Effect.scope;
260
+ yield* Layer.buildWithMemoMap(early, memoMap, scope);
261
+ yield* Layer.buildWithMemoMap(hydrated, memoMap, scope);
262
+ expect(seen.size).toBe(2);
263
+ expect(seen.get("early")?.trackAgent).toBeUndefined();
264
+ expect(seen.get("hydrated")?.trackAgent).toBeTypeOf("function");
265
+ }),
266
+ );
267
+});
apps/server/src/provider/ProviderInstanceRegistryHydration.ts
+4
-1
@@ -131,6 +131,9 @@ export const seedDevReplayInstance = Effect.fn(
131
const vaultConfigs = (settings: ServerSettings) =>
132
Object.entries(settings.secretProviders).map(([id, { kind, config }]) => [id, kind, config]);
133
134
+// A host built earlier (for the ACP registry) lacks PortDiscovery; build this one fresh.
135
+export const providerHostLayer = Layer.fresh(ProviderHostLive.layer);
136
+
137
export const layerSettingsWatcher = (
138
settingsChanges: Stream.Stream<ServerSettings>,
139
// The settings the registry was built from: a change queued during startup differs from these.
@@ -204,7 +207,7 @@ export const layer: Layer.Layer<
207
}).pipe(
208
Layer.provide(ProviderOrchestrationAdapterInfrastructure.layer),
209
Layer.provide(AcpRegistrySupport.layerFromHost),
207
- Layer.provide(ProviderHostLive.layer),
210
+ Layer.provide(providerHostLayer),
211
Layer.provide(Layer.succeed(HostProcess.Environment, hostEnvironment)),
212
Layer.provide(SecretResolver.layer),
213
);
packages/provider-core/src/server/ProviderHost.ts
+5
@@ -49,6 +49,11 @@ export class ProviderHost extends Context.Service<
49
/** Absolute attachment path, or null if the ID does not resolve inside attachmentsDir. */
50
readonly resolveAttachmentPath: (attachment: ChatAttachment) => string | null;
51
readonly resolveExtractedTextPath?: (path: string) => Effect.Effect<string | undefined>;
52
+ /**
53
+ * Counts a running agent for local server discovery, so listeners carrying its
54
+ * T3CODE_THREAD_ID show under its thread. Call the returned function when it stops.
55
+ */
56
+ readonly trackAgent?: () => () => void;
57
readonly credentials: (
58
namespace: string,
59
bindingId: string,
packages/provider-pi/src/server/adapter.test.ts
+24
@@ -2078,6 +2078,30 @@ describe("PiAdapterV2", () => {
2078
}).pipe(Effect.provide(layerTest)),
2079
);
2080
2081
+ it.effect("counts a running Pi for port discovery until its session closes", () =>
2082
+ Effect.gen(function* () {
2083
+ const host = yield* ProviderHost.ProviderHost;
2084
+ let running = 0;
2085
+ yield* Effect.gen(function* () {
2086
+ const fake = yield* makeFakePi;
2087
+ yield* openRuntime(fake);
2088
+ assert.equal(running, 1);
2089
+ }).pipe(
2090
+ Effect.scoped,
2091
+ Effect.provideService(ProviderHost.ProviderHost, {
2092
+ ...host,
2093
+ trackAgent: () => {
2094
+ running += 1;
2095
+ return () => {
2096
+ running -= 1;
2097
+ };
2098
+ },
2099
+ }),
2100
+ );
2101
+ assert.equal(running, 0);
2102
+ }).pipe(Effect.provide(layerTest)),
2103
+ );
2104
+
2105
it.effect("gives notify and extension-error items distinct ids in each thread", () =>
2106
Effect.gen(function* () {
2107
const itemIds = new Set<string>();
packages/provider-pi/src/server/adapter.ts
+7
@@ -564,6 +564,13 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
564
cwd,
565
env: launch.env,
566
});
567
+ // Its tools carry T3CODE_THREAD_ID, so port discovery must scan while Pi runs.
568
+ const trackAgent = host.trackAgent;
569
+ if (trackAgent !== undefined) {
570
+ yield* Effect.acquireRelease(Effect.sync(trackAgent), (release) =>
571
+ Effect.sync(release),
572
+ );
573
+ }
574
// Detached children can keep stdout open after Pi exits.
575
if (scopeUnit !== undefined) {
576
yield* connection.exited.pipe(