Commit 25b02f4ba28d9c6a1adff3475625e5b3fdacce4b | the-knife

apps/desktop/src/backend/DesktopBackendManager.test.ts+1-1

...	@@ -15,7 +15,7 @@ import * as Schema from "effect/Schema";	...	@@ -15,7 +15,7 @@ import * as Schema from "effect/Schema";
15	import * as Sink from "effect/Sink";	15	import * as Sink from "effect/Sink";
16	import * as Scope from "effect/Scope";	16	import * as Scope from "effect/Scope";
17	import * as Stream from "effect/Stream";	17	import * as Stream from "effect/Stream";
18	import { TestClock } from "effect/testing";	18	import * as TestClock from "effect/testing/TestClock";
19	import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http";	19	import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http";
20	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";	20	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
21		21

apps/desktop/src/ssh/DesktopSshEnvironment.ts+3-3

...	@@ -3,7 +3,7 @@ import type {	...	@@ -3,7 +3,7 @@ import type {
3	DesktopSshEnvironmentBootstrap,	3	DesktopSshEnvironmentBootstrap,
4	DesktopSshEnvironmentTarget,	4	DesktopSshEnvironmentTarget,
5	} from "@t3tools/contracts";	5	} from "@t3tools/contracts";
6	import { type NetError, NetService } from "@t3tools/shared/Net";	6	import * as NetService from "@t3tools/shared/Net";
7	import {	7	import {
8	SshPasswordPrompt,	8	SshPasswordPrompt,
9	type SshPasswordPromptShape,	9	type SshPasswordPromptShape,
...	@@ -35,7 +35,7 @@ export type DesktopSshEnvironmentRuntimeServices =	...	@@ -35,7 +35,7 @@ export type DesktopSshEnvironmentRuntimeServices =
35	\| FileSystem.FileSystem	35	\| FileSystem.FileSystem
36	\| Path.Path	36	\| Path.Path
37	\| HttpClient.HttpClient	37	\| HttpClient.HttpClient
38	\| NetService;	38	\| NetService.NetService;
39		39
40	export type DesktopSshEnvironmentOperationError =	40	export type DesktopSshEnvironmentOperationError =
41	\| SshCommandError	41	\| SshCommandError
...	@@ -44,7 +44,7 @@ export type DesktopSshEnvironmentOperationError =	...	@@ -44,7 +44,7 @@ export type DesktopSshEnvironmentOperationError =
44	\| SshPairingError	44	\| SshPairingError
45	\| SshReadinessError	45	\| SshReadinessError
46	\| SshPasswordPromptError	46	\| SshPasswordPromptError
47	\| NetError;	47	\| NetService.NetError;
48		48
49	export type DesktopSshEnvironmentDiscoverError = SshHostDiscoveryError;	49	export type DesktopSshEnvironmentDiscoverError = SshHostDiscoveryError;
50		50

apps/desktop/src/ssh/DesktopSshPasswordPrompts.test.ts+1-1

...	@@ -4,7 +4,7 @@ import * as Effect from "effect/Effect";	...	@@ -4,7 +4,7 @@ import * as Effect from "effect/Effect";
4	import * as Fiber from "effect/Fiber";	4	import * as Fiber from "effect/Fiber";
5	import * as Layer from "effect/Layer";	5	import * as Layer from "effect/Layer";
6	import * as Option from "effect/Option";	6	import * as Option from "effect/Option";
7	import { TestClock } from "effect/testing";	7	import * as TestClock from "effect/testing/TestClock";
8	import type * as Electron from "electron";	8	import type * as Electron from "electron";
9		9
10	import * as ElectronWindow from "../electron/ElectronWindow.ts";	10	import * as ElectronWindow from "../electron/ElectronWindow.ts";

apps/desktop/src/updates/DesktopUpdates.test.ts+1-1

...	@@ -8,7 +8,7 @@ import * as Effect from "effect/Effect";	...	@@ -8,7 +8,7 @@ import * as Effect from "effect/Effect";
8	import * as Fiber from "effect/Fiber";	8	import * as Fiber from "effect/Fiber";
9	import * as Layer from "effect/Layer";	9	import * as Layer from "effect/Layer";
10	import * as Option from "effect/Option";	10	import * as Option from "effect/Option";
11	import { TestClock } from "effect/testing";	11	import * as TestClock from "effect/testing/TestClock";
12		12
13	import * as DesktopBackendManager from "../backend/DesktopBackendManager.ts";	13	import * as DesktopBackendManager from "../backend/DesktopBackendManager.ts";
14	import * as DesktopConfig from "../app/DesktopConfig.ts";	14	import * as DesktopConfig from "../app/DesktopConfig.ts";

apps/desktop/tsconfig.json+1-13

...	@@ -3,19 +3,7 @@	...	@@ -3,19 +3,7 @@
3	"compilerOptions": {	3	"compilerOptions": {
4	"composite": true,	4	"composite": true,
5	"types": ["node", "electron"],	5	"types": ["node", "electron"],
6	"lib": ["ESNext", "DOM", "esnext.disposable"],	6	"lib": ["ESNext", "DOM", "esnext.disposable"]
7	"plugins": [
8	{
9	"name": "@effect/language-service",
10	"namespaceImportPackages": ["@effect/platform-node", "effect"],
11	"diagnosticSeverity": {
12	"importFromBarrel": "error",
13	"anyUnknownInErrorContext": "error",
14	"instanceOfSchema": "warning",
15	"deterministicKeys": "warning"
16	}
17	}
18	]
19	},	7	},
20	"include": ["src", "tsdown.config.ts"]	8	"include": ["src", "tsdown.config.ts"]
21	}	9	}

apps/server/integration/OrchestrationEngineHarness.integration.ts+13-14

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import { execFileSync } from "node:child_process";	2	import { execFileSync } from "node:child_process";
2		3
3	import * as NodeServices from "@effect/platform-node/NodeServices";	4	import * as NodeServices from "@effect/platform-node/NodeServices";
...	@@ -8,20 +9,18 @@ import {	...	@@ -8,20 +9,18 @@ import {
8	type OrchestrationEvent,	9	type OrchestrationEvent,
9	type OrchestrationThread,	10	type OrchestrationThread,
10	} from "@t3tools/contracts";	11	} from "@t3tools/contracts";
11	import {	12	import * as Effect from "effect/Effect";
12	Effect,	13	import * as Exit from "effect/Exit";
13	Exit,	14	import * as FileSystem from "effect/FileSystem";
14	FileSystem,	15	import * as Layer from "effect/Layer";
15	Layer,	16	import * as ManagedRuntime from "effect/ManagedRuntime";
16	ManagedRuntime,	17	import * as Option from "effect/Option";
17	Option,	18	import * as Path from "effect/Path";
18	Path,	19	import * as Ref from "effect/Ref";
19	Ref,	20	import * as Schedule from "effect/Schedule";
20	Schedule,	21	import * as Schema from "effect/Schema";
21	Schema,	22	import * as Scope from "effect/Scope";
22	Scope,	23	import * as Stream from "effect/Stream";
23	Stream,
24	} from "effect";
25		24
26	import { CheckpointStoreLive } from "../src/checkpointing/Layers/CheckpointStore.ts";	25	import { CheckpointStoreLive } from "../src/checkpointing/Layers/CheckpointStore.ts";
27	import { CheckpointStore } from "../src/checkpointing/Services/CheckpointStore.ts";	26	import { CheckpointStore } from "../src/checkpointing/Services/CheckpointStore.ts";

apps/server/integration/TestProviderAdapter.integration.ts+7-7

...	@@ -1,5 +1,3 @@	...	@@ -1,5 +1,3 @@
1	import { randomUUID } from "node:crypto";
2
3	import {	1	import {
4	ApprovalRequestId,	2	ApprovalRequestId,
5	EventId,	3	EventId,
...	@@ -12,7 +10,10 @@ import {	...	@@ -12,7 +10,10 @@ import {
12	TurnId,	10	TurnId,
13	ProviderDriverKind,	11	ProviderDriverKind,
14	} from "@t3tools/contracts";	12	} from "@t3tools/contracts";
15	import { Effect, Queue, Stream } from "effect";	13	import * as Effect from "effect/Effect";
		14	import * as Queue from "effect/Queue";
		15	import * as Random from "effect/Random";
		16	import * as Stream from "effect/Stream";
16		17
17	import {	18	import {
18	ProviderAdapterSessionNotFoundError,	19	ProviderAdapterSessionNotFoundError,
...	@@ -202,7 +203,7 @@ interface MakeTestProviderAdapterHarnessOptions {	...	@@ -202,7 +203,7 @@ interface MakeTestProviderAdapterHarnessOptions {
202	}	203	}
203		204
204	function nowIso(): string {	205	function nowIso(): string {
205	return new Date().toISOString();	206	return "2026-01-01T00:00:00.000Z";
206	}	207	}
207		208
208	function sessionNotFound(	209	function sessionNotFound(
...	@@ -308,10 +309,9 @@ export const makeTestProviderAdapterHarness = (options?: MakeTestProviderAdapter	...	@@ -308,10 +309,9 @@ export const makeTestProviderAdapterHarness = (options?: MakeTestProviderAdapter
308	for (const fixtureEvent of response.events) {	309	for (const fixtureEvent of response.events) {
309	const rawEvent: Record<string, unknown> = {	310	const rawEvent: Record<string, unknown> = {
310	...(fixtureEvent as Record<string, unknown>),	311	...(fixtureEvent as Record<string, unknown>),
311	eventId: randomUUID(),	312	eventId: yield* Random.nextUUIDv4,
312	provider,	313	provider,
313	sessionId: RuntimeSessionId.make(String(input.threadId)),	314	sessionId: RuntimeSessionId.make(String(input.threadId)),
314	createdAt: nowIso(),
315	};	315	};
316	rawEvent.threadId = state.snapshot.threadId;	316	rawEvent.threadId = state.snapshot.threadId;
317	if (Object.hasOwn(rawEvent, "turnId")) {	317	if (Object.hasOwn(rawEvent, "turnId")) {
...	@@ -366,7 +366,7 @@ export const makeTestProviderAdapterHarness = (options?: MakeTestProviderAdapter	...	@@ -366,7 +366,7 @@ export const makeTestProviderAdapterHarness = (options?: MakeTestProviderAdapter
366	if (deferredTurnCompletedEvents.length === 0) {	366	if (deferredTurnCompletedEvents.length === 0) {
367	yield* emit({	367	yield* emit({
368	type: "turn.completed",	368	type: "turn.completed",
369	eventId: EventId.make(randomUUID()),	369	eventId: EventId.make(yield* Random.nextUUIDv4),
370	provider,	370	provider,
371	createdAt: nowIso(),	371	createdAt: nowIso(),
372	threadId: state.snapshot.threadId,	372	threadId: state.snapshot.threadId,

apps/server/integration/orchestrationEngine.integration.test.ts+12-5

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import fs from "node:fs";	2	import fs from "node:fs";
2	import path from "node:path";	3	import path from "node:path";
3		4
...	@@ -17,7 +18,10 @@ import {	...	@@ -17,7 +18,10 @@ import {
17	ProviderInstanceId,	18	ProviderInstanceId,
18	} from "@t3tools/contracts";	19	} from "@t3tools/contracts";
19	import { assert, it } from "@effect/vitest";	20	import { assert, it } from "@effect/vitest";
20	import { Effect, Option, Schema } from "effect";	21	import * as Clock from "effect/Clock";
		22	import * as Effect from "effect/Effect";
		23	import * as Option from "effect/Option";
		24	import * as Schema from "effect/Schema";
21		25
22	import type { TestTurnResponse } from "./TestProviderAdapter.integration.ts";	26	import type { TestTurnResponse } from "./TestProviderAdapter.integration.ts";
23	import {	27	import {
...	@@ -47,7 +51,7 @@ const CODEX_PROVIDER = ProviderDriverKind.make("codex");	...	@@ -47,7 +51,7 @@ const CODEX_PROVIDER = ProviderDriverKind.make("codex");
47	const CLAUDE_AGENT_PROVIDER = ProviderDriverKind.make("claudeAgent");	51	const CLAUDE_AGENT_PROVIDER = ProviderDriverKind.make("claudeAgent");
48		52
49	function nowIso() {	53	function nowIso() {
50	return new Date().toISOString();	54	return "2026-05-01T00:00:00.000Z";
51	}	55	}
52		56
53	class IntegrationWaitTimeoutError extends Schema.TaggedErrorClass<IntegrationWaitTimeoutError>()(	57	class IntegrationWaitTimeoutError extends Schema.TaggedErrorClass<IntegrationWaitTimeoutError>()(
...	@@ -64,14 +68,14 @@ function waitForSync<A>(	...	@@ -64,14 +68,14 @@ function waitForSync<A>(
64	timeoutMs = 10_000,	68	timeoutMs = 10_000,
65	): Effect.Effect<A, never> {	69	): Effect.Effect<A, never> {
66	return Effect.gen(function* () {	70	return Effect.gen(function* () {
67	const deadline = Date.now() + timeoutMs;	71	const deadline = (yield* Clock.currentTimeMillis) + timeoutMs;
68		72
69	while (true) {	73	while (true) {
70	const value = read();	74	const value = read();
71	if (predicate(value)) {	75	if (predicate(value)) {
72	return value;	76	return value;
73	}	77	}
74	if (Date.now() >= deadline) {	78	if ((yield* Clock.currentTimeMillis) >= deadline) {
75	return yield* Effect.die(new IntegrationWaitTimeoutError({ description }));	79	return yield* Effect.die(new IntegrationWaitTimeoutError({ description }));
76	}	80	}
77	yield* Effect.sleep(10);	81	yield* Effect.sleep(10);
...	@@ -156,6 +160,7 @@ const startTurn = (input: {	...	@@ -156,6 +160,7 @@ const startTurn = (input: {
156	readonly messageId: string;	160	readonly messageId: string;
157	readonly text: string;	161	readonly text: string;
158	readonly modelSelection?: ModelSelection;	162	readonly modelSelection?: ModelSelection;
		163	readonly createdAt?: string;
159	}) =>	164	}) =>
160	input.harness.engine.dispatch({	165	input.harness.engine.dispatch({
161	type: "thread.turn.start",	166	type: "thread.turn.start",
...	@@ -174,7 +179,7 @@ const startTurn = (input: {	...	@@ -174,7 +179,7 @@ const startTurn = (input: {
174	: {}),	179	: {}),
175	interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,	180	interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
176	runtimeMode: "approval-required",	181	runtimeMode: "approval-required",
177	createdAt: nowIso(),	182	createdAt: input.createdAt ?? nowIso(),
178	});	183	});
179		184
180	it.live("runs a single turn end-to-end and persists checkpoint state in sqlite + git", () =>	185	it.live("runs a single turn end-to-end and persists checkpoint state in sqlite + git", () =>
...	@@ -755,6 +760,7 @@ it.live("reverts to an earlier checkpoint and trims checkpoint projections + git	...	@@ -755,6 +760,7 @@ it.live("reverts to an earlier checkpoint and trims checkpoint projections + git
755	commandId: "cmd-turn-start-revert-1",	760	commandId: "cmd-turn-start-revert-1",
756	messageId: "msg-user-revert-1",	761	messageId: "msg-user-revert-1",
757	text: "First edit",	762	text: "First edit",
		763	createdAt: "2026-02-24T10:04:59.900Z",
758	});	764	});
759		765
760	yield* harness.waitForThread(	766	yield* harness.waitForThread(
...	@@ -813,6 +819,7 @@ it.live("reverts to an earlier checkpoint and trims checkpoint projections + git	...	@@ -813,6 +819,7 @@ it.live("reverts to an earlier checkpoint and trims checkpoint projections + git
813	commandId: "cmd-turn-start-revert-2",	819	commandId: "cmd-turn-start-revert-2",
814	messageId: "msg-user-revert-2",	820	messageId: "msg-user-revert-2",
815	text: "Second edit",	821	text: "Second edit",
		822	createdAt: "2026-02-24T10:05:00.900Z",
816	});	823	});
817		824
818	yield* harness.waitForThread(	825	yield* harness.waitForThread(

apps/server/integration/providerService.integration.test.ts+6-1

 @@ -3,7 +3,12 @@ import { ProviderDriverKind, ProviderInstanceId, ThreadId } from "@t3tools/contr
 import { DEFAULT_SERVER_SETTINGS } from "@t3tools/contracts/settings";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { it, assert } from "@effect/vitest";
-import { Effect, FileSystem, Layer, Path, Queue, Stream } from "effect";
+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 Queue from "effect/Queue";
+import * as Stream from "effect/Stream";
 import { ProviderAdapterRegistry } from "../src/provider/Services/ProviderAdapterRegistry.ts";
 import { makeAdapterRegistryMock } from "../src/provider/testUtils/providerAdapterRegistryMock.ts";

apps/server/scripts/acp-mock-agent.ts+1

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	#!/usr/bin/env bun	1	#!/usr/bin/env bun
		2	// @effect-diagnostics nodeBuiltinImport:off
2	import { appendFileSync } from "node:fs";	3	import { appendFileSync } from "node:fs";
3		4
4	import * as Effect from "effect/Effect";	5	import * as Effect from "effect/Effect";

apps/server/scripts/cli.ts+13-3

 @@ -1,8 +1,13 @@
 #!/usr/bin/env node
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import { Data, Effect, FileSystem, Logger, Option, Path } from "effect";
+import * as Data from "effect/Data";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Logger from "effect/Logger";
+import * as Option from "effect/Option";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
 import { Command, Flag } from "effect/unstable/cli";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 @@ -11,6 +16,7 @@ import {
   PUBLISH_ICON_OVERRIDES,
 } from "../../../scripts/lib/brand-assets.ts";
 import { resolveCatalogDependencies } from "../../../scripts/lib/resolve-catalog.ts";
+import { fromJsonStringPretty } from "@t3tools/shared/schemaJson";
 import rootPackageJson from "../../../package.json" with { type: "json" };
 import serverPackageJson from "../package.json" with { type: "json" };
 @@ -30,6 +36,9 @@ interface PackageJson {
   overrides: Record<string, string>;
 }
+const PackageJsonPrettyJson = fromJsonStringPretty(Schema.Unknown);
+const encodePackageJson = Schema.encodeEffect(PackageJsonPrettyJson);
 class CliError extends Data.TaggedError("CliError")<{
   readonly message: string;
   readonly cause?: unknown;
 @@ -227,8 +236,9 @@ const publishCmd = Command.make(
           };
           const original = yield* fs.readFileString(packageJsonPath);
+          const packageJsonString = yield* encodePackageJson(pkg);
           yield* fs.writeFileString(backupPath, original);
-          yield* fs.writeFileString(packageJsonPath, `${JSON.stringify(pkg, null, 2)}\n`);
+          yield* fs.writeFileString(packageJsonPath, `${packageJsonString}\n`);
           yield* Effect.log("[cli] Prepared package.json for publish");
           const iconBackups = yield* applyPublishIconOverrides(repoRoot, serverDir);

apps/server/scripts/cursor-acp-model-mismatch-probe.ts+8-4

...	@@ -1,6 +1,8 @@	...	@@ -1,6 +1,8 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process";	2	import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process";
2	import process from "node:process";	3	import process from "node:process";
3	import readline from "node:readline";	4	import readline from "node:readline";
		5	import * as NodeTimers from "node:timers";
4		6
5	type JsonPrimitive = null \| boolean \| number \| string;	7	type JsonPrimitive = null \| boolean \| number \| string;
6	type JsonValue = JsonPrimitive \| JsonValue[] \| { [key: string]: JsonValue };	8	type JsonValue = JsonPrimitive \| JsonValue[] \| { [key: string]: JsonValue };
...	@@ -114,7 +116,8 @@ function matchesKeyword(option: SessionConfigOption, keyword: string): boolean {	...	@@ -114,7 +116,8 @@ function matchesKeyword(option: SessionConfigOption, keyword: string): boolean {
114		116
115	function sleep(ms: number) {	117	function sleep(ms: number) {
116	return new Promise<void>((resolve) => {	118	return new Promise<void>((resolve) => {
117	setTimeout(resolve, ms);	119	// @effect-diagnostics-next-line globalTimers:off - Standalone Node probe script, not an Effect runtime test.
		120	NodeTimers.setTimeout(resolve, ms);
118	});	121	});
119	}	122	}
120		123
...	@@ -177,7 +180,8 @@ class JsonRpcChild {	...	@@ -177,7 +180,8 @@ class JsonRpcChild {
177	const id = this.nextId++;	180	const id = this.nextId++;
178		181
179	const responsePromise = new Promise<JsonValue \| undefined>((resolve, reject) => {	182	const responsePromise = new Promise<JsonValue \| undefined>((resolve, reject) => {
180	const timeout = setTimeout(() => {	183	// @effect-diagnostics-next-line globalTimers:off - Standalone Node probe script request timeout.
		184	const timeout = NodeTimers.setTimeout(() => {
181	this.pending.delete(id);	185	this.pending.delete(id);
182	reject(new Error(`Timed out waiting for ${method} response after ${timeoutMs}ms.`));	186	reject(new Error(`Timed out waiting for ${method} response after ${timeoutMs}ms.`));
183	}, timeoutMs);	187	}, timeoutMs);
...	@@ -185,11 +189,11 @@ class JsonRpcChild {	...	@@ -185,11 +189,11 @@ class JsonRpcChild {
185	this.pending.set(id, {	189	this.pending.set(id, {
186	method,	190	method,
187	resolve: (value) => {	191	resolve: (value) => {
188	clearTimeout(timeout);	192	NodeTimers.clearTimeout(timeout);
189	resolve(value);	193	resolve(value);
190	},	194	},
191	reject: (error) => {	195	reject: (error) => {
192	clearTimeout(timeout);	196	NodeTimers.clearTimeout(timeout);
193	reject(error);	197	reject(error);
194	},	198	},
195	});	199	});

apps/server/src/atomicWrite.ts+3-1

...	@@ -1,4 +1,6 @@	...	@@ -1,4 +1,6 @@
1	import { Effect, FileSystem, Path } from "effect";	1	import * as Effect from "effect/Effect";
		2	import * as FileSystem from "effect/FileSystem";
		3	import * as Path from "effect/Path";
2	import * as Random from "effect/Random";	4	import * as Random from "effect/Random";
3		5
4	export const writeFileStringAtomically = (input: {	6	export const writeFileStringAtomically = (input: {

apps/server/src/attachmentPaths.ts+6-5

 @@ -1,9 +1,10 @@
-import path from "node:path";
+// @effect-diagnostics nodeBuiltinImport:off
+import NodePath from "node:path";
 export const ATTACHMENTS_ROUTE_PREFIX = "/attachments";
 export function normalizeAttachmentRelativePath(rawRelativePath: string): string | null {
-  const normalized = path.normalize(rawRelativePath).replace(/^[/\\]+/, "");
+  const normalized = NodePath.normalize(rawRelativePath).replace(/^[/\\]+/, "");
   if (normalized.length === 0 || normalized.startsWith("..") || normalized.includes("\0")) {
     return null;
   }
 @@ -19,9 +20,9 @@ export function resolveAttachmentRelativePath(input: {
     return null;
   }
-  const attachmentsRoot = path.resolve(input.attachmentsDir);
+  const attachmentsRoot = NodePath.resolve(input.attachmentsDir);
-  const filePath = path.resolve(path.join(attachmentsRoot, normalizedRelativePath));
+  const filePath = NodePath.resolve(NodePath.join(attachmentsRoot, normalizedRelativePath));
-  if (!filePath.startsWith(`${attachmentsRoot}${path.sep}`)) {
+  if (!filePath.startsWith(`${attachmentsRoot}${NodePath.sep}`)) {
     return null;
   }
   return filePath;

apps/server/src/attachmentStore.test.ts+1

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import fs from "node:fs";	2	import fs from "node:fs";
2	import os from "node:os";	3	import os from "node:os";
3	import path from "node:path";	4	import path from "node:path";

apps/server/src/attachmentStore.ts+1

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import { randomUUID } from "node:crypto";	2	import { randomUUID } from "node:crypto";
2	import { existsSync } from "node:fs";	3	import { existsSync } from "node:fs";
3		4

apps/server/src/auth/Layers/AuthControlPlane.test.ts+2-1

...	@@ -1,6 +1,7 @@	...	@@ -1,6 +1,7 @@
1	import * as NodeServices from "@effect/platform-node/NodeServices";	1	import * as NodeServices from "@effect/platform-node/NodeServices";
2	import { expect, it } from "@effect/vitest";	2	import { expect, it } from "@effect/vitest";
3	import { Effect, Layer } from "effect";	3	import * as Effect from "effect/Effect";
		4	import * as Layer from "effect/Layer";
4		5
5	import type { ServerConfigShape } from "../../config.ts";	6	import type { ServerConfigShape } from "../../config.ts";
6	import { ServerConfig } from "../../config.ts";	7	import { ServerConfig } from "../../config.ts";

apps/server/src/auth/Layers/AuthControlPlane.ts+3-1

...	@@ -1,5 +1,7 @@	...	@@ -1,5 +1,7 @@
1	import type { AuthClientSession, AuthPairingLink } from "@t3tools/contracts";	1	import type { AuthClientSession, AuthPairingLink } from "@t3tools/contracts";
2	import { DateTime, Effect, Layer } from "effect";	2	import * as DateTime from "effect/DateTime";
		3	import * as Effect from "effect/Effect";
		4	import * as Layer from "effect/Layer";
3		5
4	import { BootstrapCredentialServiceLive } from "./BootstrapCredentialService.ts";	6	import { BootstrapCredentialServiceLive } from "./BootstrapCredentialService.ts";
5	import { ServerSecretStoreLive } from "./ServerSecretStore.ts";	7	import { ServerSecretStoreLive } from "./ServerSecretStore.ts";

apps/server/src/auth/Layers/BootstrapCredentialService.test.ts+4-2

 @@ -1,7 +1,9 @@
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { expect, it } from "@effect/vitest";
-import { Duration, Effect, Layer } from "effect";
+import * as Duration from "effect/Duration";
-import { TestClock } from "effect/testing";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as TestClock from "effect/testing/TestClock";
 import type { ServerConfigShape } from "../../config.ts";
 import { ServerConfig } from "../../config.ts";

apps/server/src/auth/Layers/BootstrapCredentialService.ts+8-2

...	@@ -1,6 +1,12 @@	...	@@ -1,6 +1,12 @@
1	import type { AuthPairingLink } from "@t3tools/contracts";	1	import type { AuthPairingLink } from "@t3tools/contracts";
2	import { DateTime, Duration, Effect, Layer, PubSub, Ref, Stream } from "effect";	2	import * as DateTime from "effect/DateTime";
3	import { Option } from "effect";	3	import * as Duration from "effect/Duration";
		4	import * as Effect from "effect/Effect";
		5	import * as Layer from "effect/Layer";
		6	import * as PubSub from "effect/PubSub";
		7	import * as Ref from "effect/Ref";
		8	import * as Stream from "effect/Stream";
		9	import * as Option from "effect/Option";
4		10
5	import { ServerConfig } from "../../config.ts";	11	import { ServerConfig } from "../../config.ts";
6	import { AuthPairingLinkRepositoryLive } from "../../persistence/Layers/AuthPairingLinks.ts";	12	import { AuthPairingLinkRepositoryLive } from "../../persistence/Layers/AuthPairingLinks.ts";

apps/server/src/auth/Layers/ServerAuth.test.ts+2-1

...	@@ -1,6 +1,7 @@	...	@@ -1,6 +1,7 @@
1	import * as NodeServices from "@effect/platform-node/NodeServices";	1	import * as NodeServices from "@effect/platform-node/NodeServices";
2	import { expect, it } from "@effect/vitest";	2	import { expect, it } from "@effect/vitest";
3	import { Effect, Layer } from "effect";	3	import * as Effect from "effect/Effect";
		4	import * as Layer from "effect/Layer";
4		5
5	import type { ServerConfigShape } from "../../config.ts";	6	import type { ServerConfigShape } from "../../config.ts";
6	import { ServerConfig } from "../../config.ts";	7	import { ServerConfig } from "../../config.ts";

apps/server/src/auth/Layers/ServerAuth.ts+4-1

 @@ -6,7 +6,10 @@ import {
   type AuthSessionState,
   type AuthWebSocketTokenResult,
 } from "@t3tools/contracts";
-import { DateTime, Effect, Layer, Option } from "effect";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
 import * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";
 import { AuthControlPlane } from "../Services/AuthControlPlane.ts";

apps/server/src/auth/Layers/ServerAuthPolicy.test.ts+2-1

...	@@ -1,6 +1,7 @@	...	@@ -1,6 +1,7 @@
1	import * as NodeServices from "@effect/platform-node/NodeServices";	1	import * as NodeServices from "@effect/platform-node/NodeServices";
2	import { expect, it } from "@effect/vitest";	2	import { expect, it } from "@effect/vitest";
3	import { Effect, Layer } from "effect";	3	import * as Effect from "effect/Effect";
		4	import * as Layer from "effect/Layer";
4		5
5	import type { ServerConfigShape } from "../../config.ts";	6	import type { ServerConfigShape } from "../../config.ts";
6	import { ServerConfig } from "../../config.ts";	7	import { ServerConfig } from "../../config.ts";

apps/server/src/auth/Layers/ServerAuthPolicy.ts+2-1

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	import type { ServerAuthDescriptor } from "@t3tools/contracts";	1	import type { ServerAuthDescriptor } from "@t3tools/contracts";
2	import { Effect, Layer } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
3		4
4	import { ServerConfig } from "../../config.ts";	5	import { ServerConfig } from "../../config.ts";
5	import { ServerAuthPolicy, type ServerAuthPolicyShape } from "../Services/ServerAuthPolicy.ts";	6	import { ServerAuthPolicy, type ServerAuthPolicyShape } from "../Services/ServerAuthPolicy.ts";

apps/server/src/auth/Layers/ServerSecretStore.test.ts+6-1

 @@ -1,6 +1,11 @@
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { expect, it } from "@effect/vitest";
-import { Cause, Deferred, Effect, FileSystem, Layer, Ref } from "effect";
+import * as Cause from "effect/Cause";
+import * as Deferred from "effect/Deferred";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
+import * as Ref from "effect/Ref";
 import * as PlatformError from "effect/PlatformError";
 import { ServerConfig } from "../../config.ts";

apps/server/src/auth/Layers/ServerSecretStore.ts+5-1

 @@ -1,6 +1,10 @@
 import * as Crypto from "node:crypto";
-import { Effect, FileSystem, Layer, Path, Predicate } from "effect";
+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 Predicate from "effect/Predicate";
 import * as PlatformError from "effect/PlatformError";
 import { ServerConfig } from "../../config.ts";

apps/server/src/auth/Layers/SessionCredentialService.test.ts+4-2

 @@ -1,7 +1,9 @@
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { expect, it } from "@effect/vitest";
-import { Duration, Effect, Layer } from "effect";
+import * as Duration from "effect/Duration";
-import { TestClock } from "effect/testing";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as TestClock from "effect/testing/TestClock";
 import type { ServerConfigShape } from "../../config.ts";
 import { ServerConfig } from "../../config.ts";

apps/server/src/auth/Layers/SessionCredentialService.ts+33-5

...	@@ -1,6 +1,14 @@	...	@@ -1,6 +1,14 @@
1	import { AuthSessionId, type AuthClientMetadata, type AuthClientSession } from "@t3tools/contracts";	1	import { AuthSessionId, type AuthClientMetadata, type AuthClientSession } from "@t3tools/contracts";
2	import { Clock, DateTime, Duration, Effect, Layer, PubSub, Ref, Schema, Stream } from "effect";	2	import * as Clock from "effect/Clock";
3	import { Option } from "effect";	3	import * as DateTime from "effect/DateTime";
		4	import * as Duration from "effect/Duration";
		5	import * as Effect from "effect/Effect";
		6	import * as Layer from "effect/Layer";
		7	import * as PubSub from "effect/PubSub";
		8	import * as Ref from "effect/Ref";
		9	import * as Schema from "effect/Schema";
		10	import * as Stream from "effect/Stream";
		11	import * as Option from "effect/Option";
4		12
5	import { ServerConfig } from "../../config.ts";	13	import { ServerConfig } from "../../config.ts";
6	import { AuthSessionRepositoryLive } from "../../persistence/Layers/AuthSessions.ts";	14	import { AuthSessionRepositoryLive } from "../../persistence/Layers/AuthSessions.ts";
...	@@ -192,6 +200,7 @@ export const makeSessionCredentialService = Effect.gen(function* () {	...	@@ -192,6 +200,7 @@ export const makeSessionCredentialService = Effect.gen(function* () {
192	),	200	),
193	);	201	);
194		202
		203	const encodeClaims = Schema.encodeEffect(Schema.fromJsonString(SessionClaims));
195	const issue: SessionCredentialServiceShape["issue"] = (input) =>	204	const issue: SessionCredentialServiceShape["issue"] = (input) =>
196	Effect.gen(function* () {	205	Effect.gen(function* () {
197	const sessionId = AuthSessionId.make(crypto.randomUUID());	206	const sessionId = AuthSessionId.make(crypto.randomUUID());
...	@@ -209,7 +218,13 @@ export const makeSessionCredentialService = Effect.gen(function* () {	...	@@ -209,7 +218,13 @@ export const makeSessionCredentialService = Effect.gen(function* () {
209	iat: issuedAt.epochMilliseconds,	218	iat: issuedAt.epochMilliseconds,
210	exp: expiresAt.epochMilliseconds,	219	exp: expiresAt.epochMilliseconds,
211	};	220	};
212	const encodedPayload = base64UrlEncode(JSON.stringify(claims));	221
		222	const encodedPayload = yield* encodeClaims(claims).pipe(
		223	Effect.map(base64UrlEncode),
		224	Effect.mapError(
		225	(cause) => new SessionCredentialError({ message: "Failed to encode claims", cause }),
		226	),
		227	);
213	const signature = signPayload(encodedPayload, signingSecret);	228	const signature = signPayload(encodedPayload, signingSecret);
214	const client = input?.client ?? createDefaultClientMetadata();	229	const client = input?.client ?? createDefaultClientMetadata();
215	yield* authSessions.create({	230	yield* authSessions.create({
...	@@ -297,12 +312,19 @@ export const makeSessionCredentialService = Effect.gen(function* () {	...	@@ -297,12 +312,19 @@ export const makeSessionCredentialService = Effect.gen(function* () {
297	});	312	});
298	}	313	}
299		314
		315	const expiresAt = DateTime.make(claims.exp);
		316	if (Option.isNone(expiresAt)) {
		317	return yield* new SessionCredentialError({
		318	message: "Invalid `exp` claim",
		319	});
		320	}
		321
300	return {	322	return {
301	sessionId: claims.sid,	323	sessionId: claims.sid,
302	token,	324	token,
303	method: claims.method,	325	method: claims.method,
304	client: toClientMetadata(row.value.client),	326	client: toClientMetadata(row.value.client),
305	expiresAt: DateTime.makeUnsafe(claims.exp),	327	expiresAt: expiresAt.value,
306	subject: claims.sub,	328	subject: claims.sub,
307	role: claims.role,	329	role: claims.role,
308	} satisfies VerifiedSession;	330	} satisfies VerifiedSession;
...	@@ -317,6 +339,7 @@ export const makeSessionCredentialService = Effect.gen(function* () {	...	@@ -317,6 +339,7 @@ export const makeSessionCredentialService = Effect.gen(function* () {
317	),	339	),
318	);	340	);
319		341
		342	const encodeWsClaims = Schema.encodeEffect(Schema.fromJsonString(WebSocketClaims));
320	const issueWebSocketToken: SessionCredentialServiceShape["issueWebSocketToken"] = (	343	const issueWebSocketToken: SessionCredentialServiceShape["issueWebSocketToken"] = (
321	sessionId,	344	sessionId,
322	input,	345	input,
...	@@ -333,7 +356,12 @@ export const makeSessionCredentialService = Effect.gen(function* () {	...	@@ -333,7 +356,12 @@ export const makeSessionCredentialService = Effect.gen(function* () {
333	iat: issuedAt.epochMilliseconds,	356	iat: issuedAt.epochMilliseconds,
334	exp: expiresAt.epochMilliseconds,	357	exp: expiresAt.epochMilliseconds,
335	};	358	};
336	const encodedPayload = base64UrlEncode(JSON.stringify(claims));	359	const encodedPayload = yield* encodeWsClaims(claims).pipe(
		360	Effect.map(base64UrlEncode),
		361	Effect.mapError(
		362	(cause) => new SessionCredentialError({ message: "Failed to encode claims", cause }),
		363	),
		364	);
337	const signature = signPayload(encodedPayload, signingSecret);	365	const signature = signPayload(encodedPayload, signingSecret);
338	return {	366	return {
339	token: `${encodedPayload}.${signature}`,	367	token: `${encodedPayload}.${signature}`,

apps/server/src/auth/Services/AuthControlPlane.ts+5-1

 @@ -4,7 +4,11 @@ import type {
   AuthPairingLink,
   AuthSessionId,
 } from "@t3tools/contracts";
-import { Data, DateTime, Duration, Effect, Context } from "effect";
+import * as Data from "effect/Data";
+import * as DateTime from "effect/DateTime";
+import * as Duration from "effect/Duration";
+import * as Effect from "effect/Effect";
+import * as Context from "effect/Context";
 import type { SessionRole } from "./SessionCredentialService.ts";
 export const DEFAULT_SESSION_SUBJECT = "cli-issued-session";

apps/server/src/auth/Services/BootstrapCredentialService.ts+6-2

 @@ -1,6 +1,10 @@
 import type { AuthPairingLink, ServerAuthBootstrapMethod } from "@t3tools/contracts";
-import { Data, DateTime, Duration, Context } from "effect";
+import * as Data from "effect/Data";
-import type { Effect, Stream } from "effect";
+import * as DateTime from "effect/DateTime";
+import * as Duration from "effect/Duration";
+import * as Context from "effect/Context";
+import type * as Effect from "effect/Effect";
+import type * as Stream from "effect/Stream";
 export type BootstrapCredentialRole = "owner" | "client";

apps/server/src/auth/Services/ServerAuth.ts+4-2

 @@ -12,8 +12,10 @@ import type {
   ServerAuthSessionMethod,
   AuthWebSocketTokenResult,
 } from "@t3tools/contracts";
-import { Data, DateTime, Context } from "effect";
+import * as Data from "effect/Data";
-import type { Effect } from "effect";
+import * as DateTime from "effect/DateTime";
+import * as Context from "effect/Context";
+import type * as Effect from "effect/Effect";
 import type * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";
 import type { SessionRole } from "./SessionCredentialService.ts";

apps/server/src/auth/Services/ServerAuthPolicy.ts+2-2

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	import type { ServerAuthDescriptor } from "@t3tools/contracts";	1	import type { ServerAuthDescriptor } from "@t3tools/contracts";
2	import { Context } from "effect";	2	import * as Context from "effect/Context";
3	import type { Effect } from "effect";	3	import type * as Effect from "effect/Effect";
4		4
5	export interface ServerAuthPolicyShape {	5	export interface ServerAuthPolicyShape {
6	readonly getDescriptor: () => Effect.Effect<ServerAuthDescriptor>;	6	readonly getDescriptor: () => Effect.Effect<ServerAuthDescriptor>;

apps/server/src/auth/Services/ServerSecretStore.ts+3-2

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	import { Data, Context } from "effect";	1	import * as Data from "effect/Data";
2	import type { Effect } from "effect";	2	import * as Context from "effect/Context";
		3	import type * as Effect from "effect/Effect";
3		4
4	export class SecretStoreError extends Data.TaggedError("SecretStoreError")<{	5	export class SecretStoreError extends Data.TaggedError("SecretStoreError")<{
5	readonly message: string;	6	readonly message: string;

apps/server/src/auth/Services/SessionCredentialService.ts+6-2

 @@ -4,8 +4,12 @@ import type {
   AuthSessionId,
   ServerAuthSessionMethod,
 } from "@t3tools/contracts";
-import { Data, DateTime, Duration, Context } from "effect";
+import * as Data from "effect/Data";
-import type { Effect, Stream } from "effect";
+import * as DateTime from "effect/DateTime";
+import * as Duration from "effect/Duration";
+import * as Context from "effect/Context";
+import type * as Effect from "effect/Effect";
+import type * as Stream from "effect/Stream";
 export type SessionRole = "owner" | "client";

apps/server/src/auth/http.ts+3-1

 @@ -6,7 +6,9 @@ import {
   AuthRevokePairingLinkInput,
   type AuthWebSocketTokenResult,
 } from "@t3tools/contracts";
-import { DateTime, Effect, Schema } from "effect";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
+import * as Schema from "effect/Schema";
 import { HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/unstable/http";
 import { AuthError, ServerAuth } from "./Services/ServerAuth.ts";

apps/server/src/bin.test.ts+7-2

apps/server/src/bin.ts+1-1

...	@@ -4,7 +4,7 @@ import * as Effect from "effect/Effect";	...	@@ -4,7 +4,7 @@ import * as Effect from "effect/Effect";
4	import * as Layer from "effect/Layer";	4	import * as Layer from "effect/Layer";
5	import { Command } from "effect/unstable/cli";	5	import { Command } from "effect/unstable/cli";
6		6
7	import { NetService } from "@t3tools/shared/Net";	7	import * as NetService from "@t3tools/shared/Net";
8	import packageJson from "../package.json" with { type: "json" };	8	import packageJson from "../package.json" with { type: "json" };
9	import { authCommand } from "./cli/auth.ts";	9	import { authCommand } from "./cli/auth.ts";
10	import { sharedServerCommandFlags } from "./cli/config.ts";	10	import { sharedServerCommandFlags } from "./cli/config.ts";

apps/server/src/bootstrap.test.ts+4-2

 @@ -1,13 +1,15 @@
+// @effect-diagnostics nodeBuiltinImport:off
 import * as NFS from "node:fs";
 import * as path from "node:path";
 import { execFileSync, spawn } from "node:child_process";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, it } from "@effect/vitest";
-import { FileSystem, Schema } from "effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Schema from "effect/Schema";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Fiber from "effect/Fiber";
-import { TestClock } from "effect/testing";
+import * as TestClock from "effect/testing/TestClock";
 import { vi } from "vitest";
 import { readBootstrapEnvelope, resolveFdPath } from "./bootstrap.ts";

apps/server/src/bootstrap.ts+7-1

 @@ -1,9 +1,15 @@
+// @effect-diagnostics nodeBuiltinImport:off
 import * as NFS from "node:fs";
 import * as Net from "node:net";
 import * as readline from "node:readline";
 import type { Readable } from "node:stream";
-import { Data, Effect, Option, Predicate, Result, Schema } from "effect";
+import * as Data from "effect/Data";
+import * as Effect from "effect/Effect";
+import * as Option from "effect/Option";
+import * as Predicate from "effect/Predicate";
+import * as Result from "effect/Result";
+import * as Schema from "effect/Schema";
 import { decodeJsonResult } from "@t3tools/shared/schemaJson";
 class BootstrapError extends Data.TaggedError("BootstrapError")<{

apps/server/src/checkpointing/Errors.ts+1-1

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	import { Schema } from "effect";	1	import * as Schema from "effect/Schema";
2	import type { ProjectionRepositoryError } from "../persistence/Errors.ts";	2	import type { ProjectionRepositoryError } from "../persistence/Errors.ts";
3	import type { VcsError } from "@t3tools/contracts";	3	import type { VcsError } from "@t3tools/contracts";
4		4

apps/server/src/checkpointing/Layers/CheckpointDiffQuery.test.ts+3-1

...	@@ -1,5 +1,7 @@	...	@@ -1,5 +1,7 @@
1	import { CheckpointRef, ProjectId, ThreadId, TurnId } from "@t3tools/contracts";	1	import { CheckpointRef, ProjectId, ThreadId, TurnId } from "@t3tools/contracts";
2	import { Effect, Layer, Option } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
		4	import * as Option from "effect/Option";
3	import { describe, expect, it } from "vitest";	5	import { describe, expect, it } from "vitest";
4		6
5	import {	7	import {

apps/server/src/checkpointing/Layers/CheckpointDiffQuery.ts+4-1

 @@ -4,7 +4,10 @@ import {
   type OrchestrationGetFullThreadDiffResult,
   type OrchestrationGetTurnDiffResult as OrchestrationGetTurnDiffResultType,
 } from "@t3tools/contracts";
-import { Effect, Layer, Option, Schema } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
 import { ProjectionSnapshotQuery } from "../../orchestration/Services/ProjectionSnapshotQuery.ts";
 import { CheckpointInvariantError, CheckpointUnavailableError } from "../Errors.ts";

apps/server/src/checkpointing/Layers/CheckpointStore.test.ts+6-1

 @@ -1,8 +1,13 @@
+// @effect-diagnostics nodeBuiltinImport:off
 import path from "node:path";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { it } from "@effect/vitest";
-import { Effect, FileSystem, Layer, PlatformError, Scope } from "effect";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
+import * as PlatformError from "effect/PlatformError";
+import * as Scope from "effect/Scope";
 import { describe, expect } from "vitest";
 import { checkpointRefForThreadTurn } from "../Utils.ts";

apps/server/src/checkpointing/Layers/CheckpointStore.ts+4-1

 @@ -11,7 +11,10 @@
  */
 import { randomUUID } from "node:crypto";
-import { Effect, Layer, FileSystem, Path } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as FileSystem from "effect/FileSystem";
+import * as Path from "effect/Path";
 import { CheckpointInvariantError } from "../Errors.ts";
 import { VcsProcessExitError } from "@t3tools/contracts";

apps/server/src/checkpointing/Services/CheckpointDiffQuery.ts+2-2

...	@@ -12,8 +12,8 @@ import type {	...	@@ -12,8 +12,8 @@ import type {
12	OrchestrationGetTurnDiffInput,	12	OrchestrationGetTurnDiffInput,
13	OrchestrationGetTurnDiffResult,	13	OrchestrationGetTurnDiffResult,
14	} from "@t3tools/contracts";	14	} from "@t3tools/contracts";
15	import { Context } from "effect";	15	import * as Context from "effect/Context";
16	import type { Effect } from "effect";	16	import type * as Effect from "effect/Effect";
17		17
18	import type { CheckpointServiceError } from "../Errors.ts";	18	import type { CheckpointServiceError } from "../Errors.ts";
19		19

apps/server/src/checkpointing/Services/CheckpointStore.ts+2-2

...	@@ -10,8 +10,8 @@	...	@@ -10,8 +10,8 @@
10	*	10	*
11	* @module CheckpointStore	11	* @module CheckpointStore
12	*/	12	*/
13	import { Context } from "effect";	13	import * as Context from "effect/Context";
14	import type { Effect } from "effect";	14	import type * as Effect from "effect/Effect";
15		15
16	import type { CheckpointStoreError } from "../Errors.ts";	16	import type { CheckpointStoreError } from "../Errors.ts";
17	import { CheckpointRef } from "@t3tools/contracts";	17	import { CheckpointRef } from "@t3tools/contracts";

apps/server/src/checkpointing/Utils.ts+1-1

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	import { Encoding } from "effect";	1	import * as Encoding from "effect/Encoding";
2	import { CheckpointRef, ProjectId, type ThreadId } from "@t3tools/contracts";	2	import { CheckpointRef, ProjectId, type ThreadId } from "@t3tools/contracts";
3		3
4	export const CHECKPOINT_REFS_PREFIX = "refs/t3/checkpoints";	4	export const CHECKPOINT_REFS_PREFIX = "refs/t3/checkpoints";

apps/server/src/cli/auth.ts+5-1

 @@ -1,5 +1,9 @@
 import { AuthSessionId } from "@t3tools/contracts";
-import { Console, Effect, Layer, Option, References } from "effect";
+import * as Console from "effect/Console";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as References from "effect/References";
 import { Argument, Command, Flag, GlobalFlag } from "effect/unstable/cli";
 import { AuthControlPlaneRuntimeLive } from "../auth/Layers/AuthControlPlane.ts";

apps/server/src/cli/config.test.ts+16-9

...	@@ -1,13 +1,19 @@	...	@@ -1,13 +1,19 @@
1	import os from "node:os";	1	import NodeOS from "node:os";
2		2
3	import { assert, expect, it } from "@effect/vitest";	3	import { assert, expect, it } from "@effect/vitest";
4	import { ConfigProvider, Effect, FileSystem, Layer, Option, Path, Schema } from "effect";	4	import * as ConfigProvider from "effect/ConfigProvider";
		5	import * as Effect from "effect/Effect";
		6	import * as FileSystem from "effect/FileSystem";
		7	import * as Layer from "effect/Layer";
		8	import * as Option from "effect/Option";
		9	import * as Path from "effect/Path";
		10	import * as Schema from "effect/Schema";
5		11
6	import {	12	import {
7	DesktopBackendBootstrap,	13	DesktopBackendBootstrap,
8	type DesktopBackendBootstrap as DesktopBackendBootstrapValue,	14	type DesktopBackendBootstrap as DesktopBackendBootstrapValue,
9	} from "@t3tools/contracts";	15	} from "@t3tools/contracts";
10	import { NetService } from "@t3tools/shared/Net";	16	import * as NetService from "@t3tools/shared/Net";
11	import * as NodeServices from "@effect/platform-node/NodeServices";	17	import * as NodeServices from "@effect/platform-node/NodeServices";
12	import { deriveServerPaths } from "../config.ts";	18	import { deriveServerPaths } from "../config.ts";
13	import { resolveServerConfig } from "./config.ts";	19	import { resolveServerConfig } from "./config.ts";
...	@@ -53,7 +59,7 @@ it.layer(NodeServices.layer)("cli config resolution", (it) => {	...	@@ -53,7 +59,7 @@ it.layer(NodeServices.layer)("cli config resolution", (it) => {
53	it.effect("falls back to effect/config values when flags are omitted", () =>	59	it.effect("falls back to effect/config values when flags are omitted", () =>
54	Effect.gen(function* () {	60	Effect.gen(function* () {
55	const { join } = yield* Path.Path;	61	const { join } = yield* Path.Path;
56	const baseDir = join(os.tmpdir(), "t3-cli-config-env-base");	62	const baseDir = join(NodeOS.tmpdir(), "t3-cli-config-env-base");
57	const derivedPaths = yield* deriveServerPaths(baseDir, new URL("http://127.0.0.1:5173"));	63	const derivedPaths = yield* deriveServerPaths(baseDir, new URL("http://127.0.0.1:5173"));
58	const resolved = yield* resolveServerConfig(	64	const resolved = yield* resolveServerConfig(
59	{	65	{
...	@@ -119,7 +125,7 @@ it.layer(NodeServices.layer)("cli config resolution", (it) => {	...	@@ -119,7 +125,7 @@ it.layer(NodeServices.layer)("cli config resolution", (it) => {
119	it.effect("uses CLI flags when provided", () =>	125	it.effect("uses CLI flags when provided", () =>
120	Effect.gen(function* () {	126	Effect.gen(function* () {
121	const { join } = yield* Path.Path;	127	const { join } = yield* Path.Path;
122	const baseDir = join(os.tmpdir(), "t3-cli-config-flags-base");	128	const baseDir = join(NodeOS.tmpdir(), "t3-cli-config-flags-base");
123	const derivedPaths = yield* deriveServerPaths(baseDir, new URL("http://127.0.0.1:4173"));	129	const derivedPaths = yield* deriveServerPaths(baseDir, new URL("http://127.0.0.1:4173"));
124	const resolved = yield* resolveServerConfig(	130	const resolved = yield* resolveServerConfig(
125	{	131	{
...	@@ -147,7 +153,7 @@ it.layer(NodeServices.layer)("cli config resolution", (it) => {	...	@@ -147,7 +153,7 @@ it.layer(NodeServices.layer)("cli config resolution", (it) => {
147	T3CODE_MODE: "desktop",	153	T3CODE_MODE: "desktop",
148	T3CODE_PORT: "4001",	154	T3CODE_PORT: "4001",
149	T3CODE_HOST: "0.0.0.0",	155	T3CODE_HOST: "0.0.0.0",
150	T3CODE_HOME: join(os.tmpdir(), "ignored-base"),	156	T3CODE_HOME: join(NodeOS.tmpdir(), "ignored-base"),
151	VITE_DEV_SERVER_URL: "http://127.0.0.1:5173",	157	VITE_DEV_SERVER_URL: "http://127.0.0.1:5173",
152	T3CODE_NO_BROWSER: "false",	158	T3CODE_NO_BROWSER: "false",
153	T3CODE_AUTO_BOOTSTRAP_PROJECT_FROM_CWD: "false",	159	T3CODE_AUTO_BOOTSTRAP_PROJECT_FROM_CWD: "false",
...	@@ -185,7 +191,7 @@ it.layer(NodeServices.layer)("cli config resolution", (it) => {	...	@@ -185,7 +191,7 @@ it.layer(NodeServices.layer)("cli config resolution", (it) => {
185	it.effect("preserves explicit false CLI boolean flags over env and bootstrap values", () =>	191	it.effect("preserves explicit false CLI boolean flags over env and bootstrap values", () =>
186	Effect.gen(function* () {	192	Effect.gen(function* () {
187	const { join } = yield* Path.Path;	193	const { join } = yield* Path.Path;
188	const baseDir = join(os.tmpdir(), "t3-cli-config-false-flags");	194	const baseDir = join(NodeOS.tmpdir(), "t3-cli-config-false-flags");
189	const fd = yield* openBootstrapFd(	195	const fd = yield* openBootstrapFd(
190	makeDesktopBootstrap({	196	makeDesktopBootstrap({
191	noBrowser: true,	197	noBrowser: true,
...	@@ -378,7 +384,7 @@ it.layer(NodeServices.layer)("cli config resolution", (it) => {	...	@@ -378,7 +384,7 @@ it.layer(NodeServices.layer)("cli config resolution", (it) => {
378	it.effect("applies flag then env precedence over bootstrap envelope values", () =>	384	it.effect("applies flag then env precedence over bootstrap envelope values", () =>
379	Effect.gen(function* () {	385	Effect.gen(function* () {
380	const { join } = yield* Path.Path;	386	const { join } = yield* Path.Path;
381	const baseDir = join(os.tmpdir(), "t3-cli-config-env-wins");	387	const baseDir = join(NodeOS.tmpdir(), "t3-cli-config-env-wins");
382	const fd = yield* openBootstrapFd(	388	const fd = yield* openBootstrapFd(
383	makeDesktopBootstrap({	389	makeDesktopBootstrap({
384	port: 4888,	390	port: 4888,
...	@@ -459,6 +465,7 @@ it.layer(NodeServices.layer)("cli config resolution", (it) => {	...	@@ -459,6 +465,7 @@ it.layer(NodeServices.layer)("cli config resolution", (it) => {
459	yield* fs.makeDirectory(path.dirname(derivedPaths.settingsPath), { recursive: true });	465	yield* fs.makeDirectory(path.dirname(derivedPaths.settingsPath), { recursive: true });
460	yield* fs.writeFileString(	466	yield* fs.writeFileString(
461	derivedPaths.settingsPath,	467	derivedPaths.settingsPath,
		468	// @effect-diagnostics-next-line preferSchemaOverJson:off
462	`${JSON.stringify({	469	`${JSON.stringify({
463	observability: {	470	observability: {
464	otlpTracesUrl: "http://localhost:4318/v1/traces",	471	otlpTracesUrl: "http://localhost:4318/v1/traces",
...	@@ -521,7 +528,7 @@ it.layer(NodeServices.layer)("cli config resolution", (it) => {	...	@@ -521,7 +528,7 @@ it.layer(NodeServices.layer)("cli config resolution", (it) => {
521	it.effect("forces noBrowser and disables auto-bootstrap for headless startup presentation", () =>	528	it.effect("forces noBrowser and disables auto-bootstrap for headless startup presentation", () =>
522	Effect.gen(function* () {	529	Effect.gen(function* () {
523	const { join } = yield* Path.Path;	530	const { join } = yield* Path.Path;
524	const baseDir = join(os.tmpdir(), "t3-cli-config-headless-base");	531	const baseDir = join(NodeOS.tmpdir(), "t3-cli-config-headless-base");
525	const derivedPaths = yield* deriveServerPaths(baseDir, undefined);	532	const derivedPaths = yield* deriveServerPaths(baseDir, undefined);
526		533
527	const resolved = yield* resolveServerConfig(	534	const resolved = yield* resolveServerConfig(

apps/server/src/cli/config.ts+12-14

...	@@ -1,18 +1,16 @@	...	@@ -1,18 +1,16 @@
1	import { NetService } from "@t3tools/shared/Net";	1	import * as NetService from "@t3tools/shared/Net";
2	import { parsePersistedServerObservabilitySettings } from "@t3tools/shared/serverSettings";	2	import { parsePersistedServerObservabilitySettings } from "@t3tools/shared/serverSettings";
3	import { DesktopBackendBootstrap, PortSchema } from "@t3tools/contracts";	3	import { DesktopBackendBootstrap, PortSchema } from "@t3tools/contracts";
4	import {	4	import * as Config from "effect/Config";
5	Config,	5	import * as Duration from "effect/Duration";
6	Duration,	6	import * as Effect from "effect/Effect";
7	Effect,	7	import * as FileSystem from "effect/FileSystem";
8	FileSystem,	8	import * as LogLevel from "effect/LogLevel";
9	LogLevel,	9	import * as Option from "effect/Option";
10	Option,	10	import * as Path from "effect/Path";
11	Path,	11	import * as Schema from "effect/Schema";
12	Schema,	12	import * as SchemaIssue from "effect/SchemaIssue";
13	SchemaIssue,	13	import * as SchemaTransformation from "effect/SchemaTransformation";
14	SchemaTransformation,
15	} from "effect";
16	import { Argument, Flag } from "effect/unstable/cli";	14	import { Argument, Flag } from "effect/unstable/cli";
17		15
18	import { readBootstrapEnvelope } from "../bootstrap.ts";	16	import { readBootstrapEnvelope } from "../bootstrap.ts";
...	@@ -215,7 +213,7 @@ export const resolveServerConfig = (	...	@@ -215,7 +213,7 @@ export const resolveServerConfig = (
215	},	213	},
216	) =>	214	) =>
217	Effect.gen(function* () {	215	Effect.gen(function* () {
218	const { findAvailablePort } = yield* NetService;	216	const { findAvailablePort } = yield* NetService.NetService;
219	const path = yield* Path.Path;	217	const path = yield* Path.Path;
220	const fs = yield* FileSystem.FileSystem;	218	const fs = yield* FileSystem.FileSystem;
221	const env = yield* EnvServerConfig;	219	const env = yield* EnvServerConfig;

apps/server/src/cli/project.ts+27-21

 @@ -4,18 +4,18 @@ import {
   ProjectId,
   type ClientOrchestrationCommand,
 } from "@t3tools/contracts";
-import {
+import * as Console from "effect/Console";
-  Console,
+import * as Data from "effect/Data";
-  Duration,
+import * as DateTime from "effect/DateTime";
-  Effect,
+import * as Duration from "effect/Duration";
-  Exit,
+import * as Effect from "effect/Effect";
-  FileSystem,
+import * as Exit from "effect/Exit";
-  Layer,
+import * as FileSystem from "effect/FileSystem";
-  Option,
+import * as Layer from "effect/Layer";
-  Path,
+import * as Option from "effect/Option";
-  References,
+import * as Path from "effect/Path";
-  Schema,
+import * as References from "effect/References";
-} from "effect";
+import * as Schema from "effect/Schema";
 import { Argument, Command, Flag, GlobalFlag } from "effect/unstable/cli";
 import {
   FetchHttpClient,
 @@ -54,6 +54,10 @@ type ProjectCliDispatchCommand = Extract<
   { type: "project.create" | "project.meta.update" | "project.delete" }
 >;
+class ProjectCommandError extends Data.TaggedError("ProjectCommandError")<{
+  readonly message: string;
+}> {}
 const ProjectCliRuntimeLive = Layer.mergeAll(
   WorkspacePathsLive,
   OrchestrationLayerLive.pipe(
 @@ -124,7 +128,7 @@ const resolveProjectTitle = Effect.fn("resolveProjectTitle")(function* (
     if (trimmed.length > 0) {
       return trimmed;
     }
-    return yield* Effect.fail(new Error("Project title cannot be empty."));
+    return yield* new ProjectCommandError({ message: "Project title cannot be empty." });
   }
   const path = yield* Path.Path;
 @@ -138,7 +142,7 @@ const findActiveProjectTarget = Effect.fn("findActiveProjectTarget")(function* (
 }) {
   const trimmedIdentifier = input.identifier.trim();
   if (trimmedIdentifier.length === 0) {
-    return yield* Effect.fail(new Error("Project identifier cannot be empty."));
+    return yield* new ProjectCommandError({ message: "Project identifier cannot be empty." });
   }
   const activeProjects = input.snapshot.projects.filter((project) => project.deletedAt === null);
 @@ -165,7 +169,9 @@ const findActiveProjectTarget = Effect.fn("findActiveProjectTarget")(function* (
   const resolved = exactWorkspaceMatch;
   if (!resolved) {
-    return yield* Effect.fail(new Error(`No active project found for '${trimmedIdentifier}'.`));
+    return yield* new ProjectCommandError({
+      message: `No active project found for '${trimmedIdentifier}'.`,
+    });
   }
   return {
 @@ -185,7 +191,7 @@ const fetchLiveOrchestrationSnapshot = (origin: string, bearerToken: string) =>
       "2xx": decodeOrchestrationReadModelResponse,
       orElse: (response) =>
         readErrorMessageFromResponse(response).pipe(
-          Effect.flatMap((message) => Effect.fail(new Error(message))),
+          Effect.flatMap((message) => Effect.fail(new ProjectCommandError({ message }))),
         ),
     }),
   );
 @@ -206,7 +212,7 @@ const dispatchLiveOrchestrationCommand = (
           "2xx": () => Effect.void,
           orElse: (response) =>
             readErrorMessageFromResponse(response).pipe(
-              Effect.flatMap((message) => Effect.fail(new Error(message))),
+              Effect.flatMap((message) => Effect.fail(new ProjectCommandError({ message }))),
             ),
         }),
       ),
 @@ -331,9 +337,9 @@ const projectAddCommand = Command.make("add", {
           (project) => project.deletedAt === null && project.workspaceRoot === workspaceRoot,
         );
         if (existingProject) {
-          return yield* Effect.fail(
+          return yield* new ProjectCommandError({
-            new Error(`An active project already exists for '${workspaceRoot}'.`),
+            message: `An active project already exists for '${workspaceRoot}'.`,
-          );
+          });
         }
         const title = yield* resolveProjectTitle(workspaceRoot, Option.getOrUndefined(flags.title));
 @@ -345,7 +351,7 @@ const projectAddCommand = Command.make("add", {
           title,
           workspaceRoot,
           defaultModelSelection: getAutoBootstrapDefaultModelSelection(),
-          createdAt: new Date().toISOString(),
+          createdAt: DateTime.formatIso(yield* DateTime.now),
         });
         return `Added project ${projectId} (${title}) at ${workspaceRoot}.`;
       }),

apps/server/src/cli/server.ts+1-1

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	import { Effect } from "effect";	1	import * as Effect from "effect/Effect";
2	import { Command, GlobalFlag } from "effect/unstable/cli";	2	import { Command, GlobalFlag } from "effect/unstable/cli";
3		3
4	import { ServerConfig, type StartupPresentation } from "../config.ts";	4	import { ServerConfig, type StartupPresentation } from "../config.ts";

apps/server/src/cliAuthFormat.test.ts+8-8

...	@@ -1,5 +1,5 @@	...	@@ -1,5 +1,5 @@
1	import { expect, it } from "@effect/vitest";	1	import { expect, it } from "@effect/vitest";
2	import { DateTime } from "effect";	2	import * as DateTime from "effect/DateTime";
3		3
4	import {	4	import {
5	formatIssuedPairingCredential,	5	formatIssuedPairingCredential,
...	@@ -15,8 +15,8 @@ it("formats issued pairing credentials with the secret and optional pair URL", (	...	@@ -15,8 +15,8 @@ it("formats issued pairing credentials with the secret and optional pair URL", (
15	credential: "secret-pairing-token",	15	credential: "secret-pairing-token",
16	role: "client",	16	role: "client",
17	subject: "one-time-token",	17	subject: "one-time-token",
18	createdAt: DateTime.fromDateUnsafe(new Date("2026-04-08T09:00:00.000Z")),	18	createdAt: DateTime.makeUnsafe("2026-04-08T09:00:00.000Z"),
19	expiresAt: DateTime.fromDateUnsafe(new Date("2026-04-08T10:00:00.000Z")),	19	expiresAt: DateTime.makeUnsafe("2026-04-08T10:00:00.000Z"),
20	},	20	},
21	{ baseUrl: "https://example.com", json: false },	21	{ baseUrl: "https://example.com", json: false },
22	);	22	);
...	@@ -34,8 +34,8 @@ it("formats pairing listings without exposing the secret token", () => {	...	@@ -34,8 +34,8 @@ it("formats pairing listings without exposing the secret token", () => {
34	subject: "one-time-token",	34	subject: "one-time-token",
35	label: "Phone",	35	label: "Phone",
36	role: "client",	36	role: "client",
37	createdAt: DateTime.fromDateUnsafe(new Date("2026-04-08T09:00:00.000Z")),	37	createdAt: DateTime.makeUnsafe("2026-04-08T09:00:00.000Z"),
38	expiresAt: DateTime.fromDateUnsafe(new Date("2026-04-08T10:00:00.000Z")),	38	expiresAt: DateTime.makeUnsafe("2026-04-08T10:00:00.000Z"),
39	},	39	},
40	],	40	],
41	{ json: false },	41	{ json: false },
...	@@ -57,7 +57,7 @@ it("formats issued sessions with the bearer token but omits tokens from listings	...	@@ -57,7 +57,7 @@ it("formats issued sessions with the bearer token but omits tokens from listings
57	label: "deploy-bot",	57	label: "deploy-bot",
58	deviceType: "bot",	58	deviceType: "bot",
59	},	59	},
60	expiresAt: DateTime.fromDateUnsafe(new Date("2026-04-08T10:00:00.000Z")),	60	expiresAt: DateTime.makeUnsafe("2026-04-08T10:00:00.000Z"),
61	},	61	},
62	{ json: false },	62	{ json: false },
63	);	63	);
...	@@ -75,8 +75,8 @@ it("formats issued sessions with the bearer token but omits tokens from listings	...	@@ -75,8 +75,8 @@ it("formats issued sessions with the bearer token but omits tokens from listings
75	},	75	},
76	connected: false,	76	connected: false,
77	current: false,	77	current: false,
78	issuedAt: DateTime.fromDateUnsafe(new Date("2026-04-08T09:00:00.000Z")),	78	issuedAt: DateTime.makeUnsafe("2026-04-08T09:00:00.000Z"),
79	expiresAt: DateTime.fromDateUnsafe(new Date("2026-04-08T10:00:00.000Z")),	79	expiresAt: DateTime.makeUnsafe("2026-04-08T10:00:00.000Z"),
80	lastConnectedAt: null,	80	lastConnectedAt: null,
81	},	81	},
82	],	82	],

apps/server/src/cliAuthFormat.ts+1-1

...	@@ -1,5 +1,5 @@	...	@@ -1,5 +1,5 @@
1	import type { AuthClientMetadata, AuthClientSession, AuthPairingLink } from "@t3tools/contracts";	1	import type { AuthClientMetadata, AuthClientSession, AuthPairingLink } from "@t3tools/contracts";
2	import { DateTime } from "effect";	2	import * as DateTime from "effect/DateTime";
3		3
4	import type { IssuedBearerSession, IssuedPairingLink } from "./auth/Services/AuthControlPlane.ts";	4	import type { IssuedBearerSession, IssuedPairingLink } from "./auth/Services/AuthControlPlane.ts";
5		5

apps/server/src/config.ts+7-1

 @@ -6,7 +6,13 @@
  *
  * @module ServerConfig
  */
-import { Effect, FileSystem, Layer, LogLevel, Path, Schema, Context } from "effect";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
+import * as LogLevel from "effect/LogLevel";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
+import * as Context from "effect/Context";
 export const DEFAULT_PORT = 3773;

apps/server/src/diagnostics/TraceDiagnostics.ts+5-14

 @@ -89,24 +89,14 @@ function toNumberValue(value: unknown): number | null {
 function unixNanoToDateTime(value: unknown): DateTime.Utc | null {
   const text = toStringValue(value);
   if (!text) return null;
   try {
     const millis = Number(BigInt(text) / 1_000_000n);
-    if (!Number.isFinite(millis)) return null;
+    return Option.getOrNull(DateTime.make(millis));
-    return DateTime.makeUnsafe(millis);
   } catch {
     return null;
   }
 }
-function isAfter(left: DateTime.Utc, right: DateTime.Utc): boolean {
-  return DateTime.toEpochMillis(left) > DateTime.toEpochMillis(right);
-}
-function isBefore(left: DateTime.Utc, right: DateTime.Utc): boolean {
-  return DateTime.toEpochMillis(left) < DateTime.toEpochMillis(right);
-}
 function readExitTag(exit: unknown): string | null {
   if (!isRecordObject(exit) || !("_tag" in exit)) return null;
   return toStringValue(exit._tag);
 @@ -254,10 +244,11 @@ export function aggregateTraceDiagnostics(
       recordCount += 1;
       firstSpanAt =
-        startedAt && (firstSpanAt === null || isBefore(startedAt, firstSpanAt))
+        startedAt && (firstSpanAt === null || DateTime.isLessThan(startedAt, firstSpanAt))
           ? startedAt
           : firstSpanAt;
-      lastSpanAt = lastSpanAt === null || isAfter(endedAt, lastSpanAt) ? endedAt : lastSpanAt;
+      lastSpanAt =
+        lastSpanAt === null || DateTime.isGreaterThan(endedAt, lastSpanAt) ? endedAt : lastSpanAt;
       const exitTag = readExitTag(parsed.exit);
       const isFailure = exitTag === "Failure";
 @@ -289,7 +280,7 @@ export function aggregateTraceDiagnostics(
         const failureKey = `${name}\0${cause}`;
         const existing = failuresByKey.get(failureKey);
-        const isLatestFailure = !existing || isAfter(endedAt, existing.lastSeenAt);
+        const isLatestFailure = !existing || DateTime.isGreaterThan(endedAt, existing.lastSeenAt);
         failuresByKey.set(failureKey, {
           name,
           cause,

apps/server/src/environment/Layers/ServerEnvironment.test.ts+6-1

 @@ -1,7 +1,12 @@
+// @effect-diagnostics nodeBuiltinImport:off
 import * as nodePath from "node:path";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { expect, it } from "@effect/vitest";
-import { Effect, Exit, FileSystem, Layer, PlatformError } from "effect";
+import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
+import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
+import * as PlatformError from "effect/PlatformError";
 import { deriveServerPaths, ServerConfig, type ServerConfigShape } from "../../config.ts";
 import { ServerEnvironment } from "../Services/ServerEnvironment.ts";

apps/server/src/environment/Layers/ServerEnvironment.ts+5-1

 @@ -1,5 +1,9 @@
 import { EnvironmentId, type ExecutionEnvironmentDescriptor } from "@t3tools/contracts";
-import { Effect, FileSystem, Layer, Path, Random } from "effect";
+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 Random from "effect/Random";
 import { ServerConfig } from "../../config.ts";
 import { ServerEnvironment, type ServerEnvironmentShape } from "../Services/ServerEnvironment.ts";

apps/server/src/environment/Layers/ServerEnvironmentLabel.test.ts+2-1

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	import { afterEach, describe, expect, it } from "@effect/vitest";	1	import { afterEach, describe, expect, it } from "@effect/vitest";
2	import { Effect, FileSystem } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as FileSystem from "effect/FileSystem";
3	import { vi } from "vitest";	4	import { vi } from "vitest";
4		5
5	vi.mock("../../processRunner.ts", () => ({	6	vi.mock("../../processRunner.ts", () => ({

apps/server/src/environment/Layers/ServerEnvironmentLabel.ts+2-1

...	@@ -1,6 +1,7 @@	...	@@ -1,6 +1,7 @@
1	import * as OS from "node:os";	1	import * as OS from "node:os";
2		2
3	import { Effect, FileSystem } from "effect";	3	import * as Effect from "effect/Effect";
		4	import * as FileSystem from "effect/FileSystem";
4		5
5	import { runProcess } from "../../processRunner.ts";	6	import { runProcess } from "../../processRunner.ts";
6		7

apps/server/src/environment/Services/ServerEnvironment.ts+2-2

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	import type { EnvironmentId, ExecutionEnvironmentDescriptor } from "@t3tools/contracts";	1	import type { EnvironmentId, ExecutionEnvironmentDescriptor } from "@t3tools/contracts";
2	import { Context } from "effect";	2	import * as Context from "effect/Context";
3	import type { Effect } from "effect";	3	import type * as Effect from "effect/Effect";
4		4
5	export interface ServerEnvironmentShape {	5	export interface ServerEnvironmentShape {
6	readonly getEnvironmentId: Effect.Effect<EnvironmentId>;	6	readonly getEnvironmentId: Effect.Effect<EnvironmentId>;

apps/server/src/git/GitManager.test.ts+58-4

...	@@ -1,10 +1,15 @@	...	@@ -1,10 +1,15 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import fs from "node:fs";	2	import fs from "node:fs";
2	import path from "node:path";	3	import path from "node:path";
3	import { spawnSync } from "node:child_process";	4	import { spawnSync } from "node:child_process";
4		5
5	import * as NodeServices from "@effect/platform-node/NodeServices";	6	import * as NodeServices from "@effect/platform-node/NodeServices";
6	import { it } from "@effect/vitest";	7	import { it } from "@effect/vitest";
7	import { Effect, FileSystem, Layer, PlatformError, Scope } from "effect";	8	import * as Effect from "effect/Effect";
		9	import * as FileSystem from "effect/FileSystem";
		10	import * as Layer from "effect/Layer";
		11	import * as PlatformError from "effect/PlatformError";
		12	import * as Scope from "effect/Scope";
8	import { ChildProcessSpawner } from "effect/unstable/process";	13	import { ChildProcessSpawner } from "effect/unstable/process";
9	import { expect } from "vitest";	14	import { expect } from "vitest";
10	import type {	15	import type {
...	@@ -32,6 +37,7 @@ import { ServerConfig } from "../config.ts";	...	@@ -32,6 +37,7 @@ import { ServerConfig } from "../config.ts";
32	import { ServerSettingsService } from "../serverSettings.ts";	37	import { ServerSettingsService } from "../serverSettings.ts";
33	import {	38	import {
34	ProjectSetupScriptRunner,	39	ProjectSetupScriptRunner,
		40	ProjectSetupScriptRunnerError,
35	type ProjectSetupScriptRunnerInput,	41	type ProjectSetupScriptRunnerInput,
36	type ProjectSetupScriptRunnerShape,	42	type ProjectSetupScriptRunnerShape,
37	} from "../project/Services/ProjectSetupScriptRunner.ts";	43	} from "../project/Services/ProjectSetupScriptRunner.ts";
...	@@ -713,6 +719,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -713,6 +719,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
713	const { manager } = yield* makeManager({	719	const { manager } = yield* makeManager({
714	ghScenario: {	720	ghScenario: {
715	prListSequence: [	721	prListSequence: [
		722	// @effect-diagnostics-next-line preferSchemaOverJson:off
716	JSON.stringify([	723	JSON.stringify([
717	{	724	{
718	number: 13,	725	number: 13,
...	@@ -754,6 +761,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -754,6 +761,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
754	const { manager } = yield* makeManager({	761	const { manager } = yield* makeManager({
755	ghScenario: {	762	ghScenario: {
756	prListSequence: [	763	prListSequence: [
		764	// @effect-diagnostics-next-line preferSchemaOverJson:off
757	JSON.stringify([	765	JSON.stringify([
758	{	766	{
759	number: 14,	767	number: 14,
...	@@ -792,6 +800,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -792,6 +800,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
792	const { manager } = yield* makeManager({	800	const { manager } = yield* makeManager({
793	ghScenario: {	801	ghScenario: {
794	prListSequence: [	802	prListSequence: [
		803	// @effect-diagnostics-next-line preferSchemaOverJson:off
795	JSON.stringify([	804	JSON.stringify([
796	{	805	{
797	number: 0,	806	number: 0,
...	@@ -843,6 +852,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -843,6 +852,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
843	const { manager } = yield* makeManager({	852	const { manager } = yield* makeManager({
844	ghScenario: {	853	ghScenario: {
845	prListSequence: [	854	prListSequence: [
		855	// @effect-diagnostics-next-line preferSchemaOverJson:off
846	JSON.stringify([	856	JSON.stringify([
847	{	857	{
848	number: 16,	858	number: 16,
...	@@ -955,6 +965,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -955,6 +965,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
955	};	965	};
956	const { manager, ghCalls } = yield* makeManager({	966	const { manager, ghCalls } = yield* makeManager({
957	ghScenario: {	967	ghScenario: {
		968	// @effect-diagnostics-next-line preferSchemaOverJson:off
958	prListSequence: [JSON.stringify([existingPr]), JSON.stringify([existingPr])],	969	prListSequence: [JSON.stringify([existingPr]), JSON.stringify([existingPr])],
959	},	970	},
960	});	971	});
...	@@ -981,6 +992,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -981,6 +992,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
981	const { manager } = yield* makeManager({	992	const { manager } = yield* makeManager({
982	ghScenario: {	993	ghScenario: {
983	prListSequence: [	994	prListSequence: [
		995	// @effect-diagnostics-next-line preferSchemaOverJson:off
984	JSON.stringify([	996	JSON.stringify([
985	{	997	{
986	number: 1661,	998	number: 1661,
...	@@ -1034,8 +1046,11 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -1034,8 +1046,11 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
1034	const { manager, ghCalls } = yield* makeManager({	1046	const { manager, ghCalls } = yield* makeManager({
1035	ghScenario: {	1047	ghScenario: {
1036	prListSequence: [	1048	prListSequence: [
		1049	// @effect-diagnostics-next-line preferSchemaOverJson:off
1037	JSON.stringify([]),	1050	JSON.stringify([]),
		1051	// @effect-diagnostics-next-line preferSchemaOverJson:off
1038	JSON.stringify([]),	1052	JSON.stringify([]),
		1053	// @effect-diagnostics-next-line preferSchemaOverJson:off
1039	JSON.stringify([	1054	JSON.stringify([
1040	{	1055	{
1041	number: 488,	1056	number: 488,
...	@@ -1110,6 +1125,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -1110,6 +1125,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
1110	const { manager, ghCalls } = yield* makeManager({	1125	const { manager, ghCalls } = yield* makeManager({
1111	ghScenario: {	1126	ghScenario: {
1112	prListByHeadSelector: {	1127	prListByHeadSelector: {
		1128	// @effect-diagnostics-next-line preferSchemaOverJson:off
1113	"effect-atom": JSON.stringify([	1129	"effect-atom": JSON.stringify([
1114	{	1130	{
1115	number: 1618,	1131	number: 1618,
...	@@ -1121,6 +1137,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -1121,6 +1137,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
1121	updatedAt: "2026-03-01T10:00:00Z",	1137	updatedAt: "2026-03-01T10:00:00Z",
1122	},	1138	},
1123	]),	1139	]),
		1140	// @effect-diagnostics-next-line preferSchemaOverJson:off
1124	"upstream/effect-atom": JSON.stringify([	1141	"upstream/effect-atom": JSON.stringify([
1125	{	1142	{
1126	number: 1518,	1143	number: 1518,
...	@@ -1132,8 +1149,11 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -1132,8 +1149,11 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
1132	updatedAt: "2026-04-01T10:00:00Z",	1149	updatedAt: "2026-04-01T10:00:00Z",
1133	},	1150	},
1134	]),	1151	]),
		1152	// @effect-diagnostics-next-line preferSchemaOverJson:off
1135	"pingdotgg:effect-atom": JSON.stringify([]),	1153	"pingdotgg:effect-atom": JSON.stringify([]),
		1154	// @effect-diagnostics-next-line preferSchemaOverJson:off
1136	"my-org/upstream:effect-atom": JSON.stringify([]),	1155	"my-org/upstream:effect-atom": JSON.stringify([]),
		1156	// @effect-diagnostics-next-line preferSchemaOverJson:off
1137	"pingdotgg:upstream/effect-atom": JSON.stringify([	1157	"pingdotgg:upstream/effect-atom": JSON.stringify([
1138	{	1158	{
1139	number: 1518,	1159	number: 1518,
...	@@ -1145,6 +1165,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -1145,6 +1165,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
1145	updatedAt: "2026-04-01T10:00:00Z",	1165	updatedAt: "2026-04-01T10:00:00Z",
1146	},	1166	},
1147	]),	1167	]),
		1168	// @effect-diagnostics-next-line preferSchemaOverJson:off
1148	"my-org/upstream:upstream/effect-atom": JSON.stringify([	1169	"my-org/upstream:upstream/effect-atom": JSON.stringify([
1149	{	1170	{
1150	number: 1518,	1171	number: 1518,
...	@@ -1194,6 +1215,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -1194,6 +1215,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
1194	const { manager } = yield* makeManager({	1215	const { manager } = yield* makeManager({
1195	ghScenario: {	1216	ghScenario: {
1196	prListSequence: [	1217	prListSequence: [
		1218	// @effect-diagnostics-next-line preferSchemaOverJson:off
1197	JSON.stringify([	1219	JSON.stringify([
1198	{	1220	{
1199	number: 22,	1221	number: 22,
...	@@ -1231,6 +1253,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -1231,6 +1253,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
1231	const { manager } = yield* makeManager({	1253	const { manager } = yield* makeManager({
1232	ghScenario: {	1254	ghScenario: {
1233	prListSequence: [	1255	prListSequence: [
		1256	// @effect-diagnostics-next-line preferSchemaOverJson:off
1234	JSON.stringify([	1257	JSON.stringify([
1235	{	1258	{
1236	number: 23,	1259	number: 23,
...	@@ -1262,6 +1285,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -1262,6 +1285,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
1262	const { manager } = yield* makeManager({	1285	const { manager } = yield* makeManager({
1263	ghScenario: {	1286	ghScenario: {
1264	prListSequence: [	1287	prListSequence: [
		1288	// @effect-diagnostics-next-line preferSchemaOverJson:off
1265	JSON.stringify([	1289	JSON.stringify([
1266	{	1290	{
1267	number: 45,	1291	number: 45,
...	@@ -1612,6 +1636,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -1612,6 +1636,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
1612	ghScenario: {	1636	ghScenario: {
1613	prListSequence: [	1637	prListSequence: [
1614	"[]",	1638	"[]",
		1639	// @effect-diagnostics-next-line preferSchemaOverJson:off
1615	JSON.stringify([	1640	JSON.stringify([
1616	{	1641	{
1617	number: 77,	1642	number: 77,
...	@@ -1747,6 +1772,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -1747,6 +1772,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
1747	ghScenario: {	1772	ghScenario: {
1748	prListSequence: [	1773	prListSequence: [
1749	"[]",	1774	"[]",
		1775	// @effect-diagnostics-next-line preferSchemaOverJson:off
1750	JSON.stringify([	1776	JSON.stringify([
1751	{	1777	{
1752	number: 303,	1778	number: 303,
...	@@ -1793,6 +1819,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -1793,6 +1819,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
1793	ghScenario: {	1819	ghScenario: {
1794	prListSequence: [	1820	prListSequence: [
1795	"[]",	1821	"[]",
		1822	// @effect-diagnostics-next-line preferSchemaOverJson:off
1796	JSON.stringify([	1823	JSON.stringify([
1797	{	1824	{
1798	number: 404,	1825	number: 404,
...	@@ -1833,6 +1860,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -1833,6 +1860,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
1833	const { manager, ghCalls } = yield* makeManager({	1860	const { manager, ghCalls } = yield* makeManager({
1834	ghScenario: {	1861	ghScenario: {
1835	prListSequence: [	1862	prListSequence: [
		1863	// @effect-diagnostics-next-line preferSchemaOverJson:off
1836	JSON.stringify([	1864	JSON.stringify([
1837	{	1865	{
1838	number: 42,	1866	number: 42,
...	@@ -1886,7 +1914,9 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -1886,7 +1914,9 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
1886	const { manager, ghCalls } = yield* makeManager({	1914	const { manager, ghCalls } = yield* makeManager({
1887	ghScenario: {	1915	ghScenario: {
1888	prListSequence: [	1916	prListSequence: [
		1917	// @effect-diagnostics-next-line preferSchemaOverJson:off
1889	JSON.stringify([]),	1918	JSON.stringify([]),
		1919	// @effect-diagnostics-next-line preferSchemaOverJson:off
1890	JSON.stringify([	1920	JSON.stringify([
1891	{	1921	{
1892	number: 142,	1922	number: 142,
...	@@ -1963,6 +1993,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -1963,6 +1993,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
1963	const { manager, ghCalls } = yield* makeManager({	1993	const { manager, ghCalls } = yield* makeManager({
1964	ghScenario: {	1994	ghScenario: {
1965	prListByHeadSelector: {	1995	prListByHeadSelector: {
		1996	// @effect-diagnostics-next-line preferSchemaOverJson:off
1966	"effect-atom": JSON.stringify([	1997	"effect-atom": JSON.stringify([
1967	{	1998	{
1968	number: 1618,	1999	number: 1618,
...	@@ -1972,6 +2003,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -1972,6 +2003,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
1972	headRefName: "effect-atom",	2003	headRefName: "effect-atom",
1973	},	2004	},
1974	]),	2005	]),
		2006	// @effect-diagnostics-next-line preferSchemaOverJson:off
1975	"upstream/effect-atom": JSON.stringify([	2007	"upstream/effect-atom": JSON.stringify([
1976	{	2008	{
1977	number: 1518,	2009	number: 1518,
...	@@ -1981,8 +2013,11 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -1981,8 +2013,11 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
1981	headRefName: "upstream/effect-atom",	2013	headRefName: "upstream/effect-atom",
1982	},	2014	},
1983	]),	2015	]),
		2016	// @effect-diagnostics-next-line preferSchemaOverJson:off
1984	"pingdotgg:effect-atom": JSON.stringify([]),	2017	"pingdotgg:effect-atom": JSON.stringify([]),
		2018	// @effect-diagnostics-next-line preferSchemaOverJson:off
1985	"my-org/upstream:effect-atom": JSON.stringify([]),	2019	"my-org/upstream:effect-atom": JSON.stringify([]),
		2020	// @effect-diagnostics-next-line preferSchemaOverJson:off
1986	"pingdotgg:upstream/effect-atom": JSON.stringify([	2021	"pingdotgg:upstream/effect-atom": JSON.stringify([
1987	{	2022	{
1988	number: 1518,	2023	number: 1518,
...	@@ -1992,6 +2027,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -1992,6 +2027,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
1992	headRefName: "upstream/effect-atom",	2027	headRefName: "upstream/effect-atom",
1993	},	2028	},
1994	]),	2029	]),
		2030	// @effect-diagnostics-next-line preferSchemaOverJson:off
1995	"my-org/upstream:upstream/effect-atom": JSON.stringify([	2031	"my-org/upstream:upstream/effect-atom": JSON.stringify([
1996	{	2032	{
1997	number: 1518,	2033	number: 1518,
...	@@ -2041,7 +2077,9 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -2041,7 +2077,9 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
2041	const { manager, ghCalls } = yield* makeManager({	2077	const { manager, ghCalls } = yield* makeManager({
2042	ghScenario: {	2078	ghScenario: {
2043	prListByHeadSelector: {	2079	prListByHeadSelector: {
		2080	// @effect-diagnostics-next-line preferSchemaOverJson:off
2044	"t3code/pr-142/statemachine": JSON.stringify([]),	2081	"t3code/pr-142/statemachine": JSON.stringify([]),
		2082	// @effect-diagnostics-next-line preferSchemaOverJson:off
2045	statemachine: JSON.stringify([	2083	statemachine: JSON.stringify([
2046	{	2084	{
2047	number: 41,	2085	number: 41,
...	@@ -2051,6 +2089,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -2051,6 +2089,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
2051	headRefName: "statemachine",	2089	headRefName: "statemachine",
2052	},	2090	},
2053	]),	2091	]),
		2092	// @effect-diagnostics-next-line preferSchemaOverJson:off
2054	"octocat:statemachine": JSON.stringify([	2093	"octocat:statemachine": JSON.stringify([
2055	{	2094	{
2056	number: 142,	2095	number: 142,
...	@@ -2068,6 +2107,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -2068,6 +2107,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
2068	},	2107	},
2069	},	2108	},
2070	]),	2109	]),
		2110	// @effect-diagnostics-next-line preferSchemaOverJson:off
2071	"fork-seed:statemachine": JSON.stringify([]),	2111	"fork-seed:statemachine": JSON.stringify([]),
2072	},	2112	},
2073	},	2113	},
...	@@ -2112,6 +2152,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -2112,6 +2152,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
2112	const { manager, ghCalls } = yield* makeManager({	2152	const { manager, ghCalls } = yield* makeManager({
2113	ghScenario: {	2153	ghScenario: {
2114	prListByHeadSelector: {	2154	prListByHeadSelector: {
		2155	// @effect-diagnostics-next-line preferSchemaOverJson:off
2115	"octocat:statemachine": JSON.stringify([	2156	"octocat:statemachine": JSON.stringify([
2116	{	2157	{
2117	number: 142,	2158	number: 142,
...	@@ -2129,8 +2170,11 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -2129,8 +2170,11 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
2129	},	2170	},
2130	},	2171	},
2131	]),	2172	]),
		2173	// @effect-diagnostics-next-line preferSchemaOverJson:off
2132	"fork-seed:statemachine": JSON.stringify([]),	2174	"fork-seed:statemachine": JSON.stringify([]),
		2175	// @effect-diagnostics-next-line preferSchemaOverJson:off
2133	"t3code/pr-142/statemachine": JSON.stringify([]),	2176	"t3code/pr-142/statemachine": JSON.stringify([]),
		2177	// @effect-diagnostics-next-line preferSchemaOverJson:off
2134	statemachine: JSON.stringify([]),	2178	statemachine: JSON.stringify([]),
2135	},	2179	},
2136	},	2180	},
...	@@ -2170,6 +2214,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -2170,6 +2214,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
2170	ghScenario: {	2214	ghScenario: {
2171	prListSequence: [	2215	prListSequence: [
2172	"[]",	2216	"[]",
		2217	// @effect-diagnostics-next-line preferSchemaOverJson:off
2173	JSON.stringify([	2218	JSON.stringify([
2174	{	2219	{
2175	number: 88,	2220	number: 88,
...	@@ -2215,6 +2260,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -2215,6 +2260,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
2215	const { manager, ghCalls } = yield* makeManager({	2260	const { manager, ghCalls } = yield* makeManager({
2216	ghScenario: {	2261	ghScenario: {
2217	prListSequence: [	2262	prListSequence: [
		2263	// @effect-diagnostics-next-line preferSchemaOverJson:off
2218	JSON.stringify([	2264	JSON.stringify([
2219	{	2265	{
2220	number: 1661,	2266	number: 1661,
...	@@ -2232,6 +2278,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -2232,6 +2278,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
2232	},	2278	},
2233	},	2279	},
2234	]),	2280	]),
		2281	// @effect-diagnostics-next-line preferSchemaOverJson:off
2235	JSON.stringify([	2282	JSON.stringify([
2236	{	2283	{
2237	number: 188,	2284	number: 188,
...	@@ -2294,7 +2341,9 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -2294,7 +2341,9 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
2294	ghScenario: {	2341	ghScenario: {
2295	prListSequenceByHeadSelector: {	2342	prListSequenceByHeadSelector: {
2296	"octocat:statemachine": [	2343	"octocat:statemachine": [
		2344	// @effect-diagnostics-next-line preferSchemaOverJson:off
2297	JSON.stringify([]),	2345	JSON.stringify([]),
		2346	// @effect-diagnostics-next-line preferSchemaOverJson:off
2298	JSON.stringify([	2347	JSON.stringify([
2299	{	2348	{
2300	number: 188,	2349	number: 188,
...	@@ -2313,7 +2362,9 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -2313,7 +2362,9 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
2313	},	2362	},
2314	]),	2363	]),
2315	],	2364	],
		2365	// @effect-diagnostics-next-line preferSchemaOverJson:off
2316	"fork-seed:statemachine": [JSON.stringify([])],	2366	"fork-seed:statemachine": [JSON.stringify([])],
		2367	// @effect-diagnostics-next-line preferSchemaOverJson:off
2317	statemachine: [JSON.stringify([])],	2368	statemachine: [JSON.stringify([])],
2318	},	2369	},
2319	},	2370	},
...	@@ -2870,7 +2921,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -2870,7 +2921,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
2870	yield* runGit(repoDir, ["add", "existing.txt"]);	2921	yield* runGit(repoDir, ["add", "existing.txt"]);
2871	yield* runGit(repoDir, ["commit", "-m", "Existing worktree branch"]);	2922	yield* runGit(repoDir, ["commit", "-m", "Existing worktree branch"]);
2872	yield* runGit(repoDir, ["checkout", "main"]);	2923	yield* runGit(repoDir, ["checkout", "main"]);
2873	const worktreePath = path.join(repoDir, "..", `pr-existing-${Date.now()}`);	2924	const worktreePath = path.join(repoDir, "..", `pr-existing-${path.basename(repoDir)}`);
2874	yield* runGit(repoDir, ["worktree", "add", worktreePath, "feature/pr-existing-worktree"]);	2925	yield* runGit(repoDir, ["worktree", "add", worktreePath, "feature/pr-existing-worktree"]);
2875		2926
2876	const setupCalls: ProjectSetupScriptRunnerInput[] = [];	2927	const setupCalls: ProjectSetupScriptRunnerInput[] = [];
...	@@ -3044,7 +3095,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -3044,7 +3095,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
3044	yield* runGit(repoDir, ["commit", "-m", "Reused fork PR branch"]);	3095	yield* runGit(repoDir, ["commit", "-m", "Reused fork PR branch"]);
3045	yield* runGit(repoDir, ["push", "-u", "fork-seed", "feature/pr-reused-fork"]);	3096	yield* runGit(repoDir, ["push", "-u", "fork-seed", "feature/pr-reused-fork"]);
3046	yield* runGit(repoDir, ["checkout", "main"]);	3097	yield* runGit(repoDir, ["checkout", "main"]);
3047	const worktreePath = path.join(repoDir, "..", `pr-reused-fork-${Date.now()}`);	3098	const worktreePath = path.join(repoDir, "..", `pr-reused-fork-${path.basename(repoDir)}`);
3048	yield* runGit(repoDir, ["worktree", "add", worktreePath, "feature/pr-reused-fork"]);	3099	yield* runGit(repoDir, ["worktree", "add", worktreePath, "feature/pr-reused-fork"]);
3049	yield* runGit(worktreePath, ["branch", "--unset-upstream"], true);	3100	yield* runGit(worktreePath, ["branch", "--unset-upstream"], true);
3050		3101
...	@@ -3112,7 +3163,8 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -3112,7 +3163,8 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
3112	},	3163	},
3113	},	3164	},
3114	setupScriptRunner: {	3165	setupScriptRunner: {
3115	runForThread: () => Effect.fail(new Error("terminal start failed")),	3166	runForThread: () =>
		3167	Effect.fail(new ProjectSetupScriptRunnerError({ message: "terminal start failed" })),
3116	},	3168	},
3117	});	3169	});
3118		3170
...	@@ -3289,7 +3341,9 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -3289,7 +3341,9 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
3289	const { manager } = yield* makeManager({	3341	const { manager } = yield* makeManager({
3290	ghScenario: {	3342	ghScenario: {
3291	prListSequence: [	3343	prListSequence: [
		3344	// @effect-diagnostics-next-line preferSchemaOverJson:off
3292	JSON.stringify([]),	3345	JSON.stringify([]),
		3346	// @effect-diagnostics-next-line preferSchemaOverJson:off
3293	JSON.stringify([	3347	JSON.stringify([
3294	{	3348	{
3295	number: 201,	3349	number: 201,

apps/server/src/git/GitManager.ts+13-15

...	@@ -1,20 +1,18 @@	...	@@ -1,20 +1,18 @@
1	import { randomUUID } from "node:crypto";	1	import { randomUUID } from "node:crypto";
2		2
3	import {	3	import * as Arr from "effect/Array";
4	Array as Arr,	4	import * as Cache from "effect/Cache";
5	Cache,	5	import * as Context from "effect/Context";
6	Context,	6	import * as DateTime from "effect/DateTime";
7	DateTime,	7	import * as Duration from "effect/Duration";
8	Duration,	8	import * as Effect from "effect/Effect";
9	Effect,	9	import * as Exit from "effect/Exit";
10	Exit,	10	import * as FileSystem from "effect/FileSystem";
11	FileSystem,	11	import * as Layer from "effect/Layer";
12	Layer,	12	import * as Option from "effect/Option";
13	Option,	13	import * as Order from "effect/Order";
14	Order,	14	import * as Path from "effect/Path";
15	Path,	15	import * as Ref from "effect/Ref";
16	Ref,
17	} from "effect";
18	import {	16	import {
19	GitActionProgressEvent,	17	GitActionProgressEvent,
20	GitActionProgressPhase,	18	GitActionProgressPhase,

apps/server/src/git/GitWorkflowService.test.ts+2-1

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	import { assert, describe, it, vi } from "@effect/vitest";	1	import { assert, describe, it, vi } from "@effect/vitest";
2	import { Effect, Layer } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
3		4
4	import * as GitManager from "./GitManager.ts";	5	import * as GitManager from "./GitManager.ts";
5	import * as GitWorkflowService from "./GitWorkflowService.ts";	6	import * as GitWorkflowService from "./GitWorkflowService.ts";

apps/server/src/git/GitWorkflowService.ts+3-1

...	@@ -1,4 +1,6 @@	...	@@ -1,4 +1,6 @@
1	import { Context, Effect, Layer } from "effect";	1	import * as Context from "effect/Context";
		2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
2		4
3	import {	5	import {
4	GitManagerError,	6	GitManagerError,

apps/server/src/git/Utils.ts+1

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import { existsSync } from "node:fs";	2	import { existsSync } from "node:fs";
2	import { join } from "node:path";	3	import { join } from "node:path";
3		4

apps/server/src/http.ts+5-1

 @@ -1,6 +1,10 @@
 import Mime from "@effect/platform-node/Mime";
 import { decodeOtlpTraceRecords } from "@t3tools/shared/observability";
-import { Data, Effect, FileSystem, Option, Path } from "effect";
+import * as Data from "effect/Data";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Option from "effect/Option";
+import * as Path from "effect/Path";
 import { cast } from "effect/Function";
 import {
   HttpBody,

apps/server/src/keybindings.test.ts+8-1

 @@ -2,7 +2,13 @@ import { KeybindingCommand, KeybindingRule, KeybindingsConfig } from "@t3tools/c
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, it } from "@effect/vitest";
 import { assertFailure } from "@effect/vitest/utils";
-import { Cause, Effect, FileSystem, Layer, Logger, Path, Schema } from "effect";
+import * as Cause from "effect/Cause";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
+import * as Logger from "effect/Logger";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
 import { ServerConfig } from "./config.ts";
 import {
 @@ -229,6 +235,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
       const { keybindingsConfigPath } = yield* ServerConfig;
       yield* fs.writeFileString(
         keybindingsConfigPath,
+        // @effect-diagnostics-next-line preferSchemaOverJson:off
         JSON.stringify([
           { key: "mod+j", command: "terminal.toggle" },
           { key: "mod+shift+d+o", command: "terminal.new" },

apps/server/src/keybindings.ts+22-34

...	@@ -19,33 +19,30 @@ import {	...	@@ -19,33 +19,30 @@ import {
19	type ServerUpsertKeybindingInput,	19	type ServerUpsertKeybindingInput,
20	type ServerConfigIssue,	20	type ServerConfigIssue,
21	} from "@t3tools/contracts";	21	} from "@t3tools/contracts";
22	import {	22	import * as Array from "effect/Array";
23	Array,	23	import * as Cache from "effect/Cache";
24	Cache,	24	import * as Cause from "effect/Cause";
25	Cause,	25	import * as Deferred from "effect/Deferred";
26	Deferred,	26	import * as Duration from "effect/Duration";
27	Duration,	27	import * as Effect from "effect/Effect";
28	Effect,	28	import * as Exit from "effect/Exit";
29	Exit,	29	import * as FileSystem from "effect/FileSystem";
30	FileSystem,	30	import * as Path from "effect/Path";
31	Path,	31	import * as Layer from "effect/Layer";
32	Layer,	32	import * as Option from "effect/Option";
33	Option,	33	import * as Predicate from "effect/Predicate";
34	Predicate,	34	import * as PubSub from "effect/PubSub";
35	PubSub,	35	import * as Schema from "effect/Schema";
36	Schema,	36	import * as SchemaIssue from "effect/SchemaIssue";
37	SchemaGetter,	37	import * as SchemaTransformation from "effect/SchemaTransformation";
38	SchemaIssue,	38	import * as Ref from "effect/Ref";
39	SchemaTransformation,	39	import * as Context from "effect/Context";
40	Ref,	40	import * as Scope from "effect/Scope";
41	Context,	41	import * as Stream from "effect/Stream";
42	Scope,
43	Stream,
44	} from "effect";
45	import * as Semaphore from "effect/Semaphore";	42	import * as Semaphore from "effect/Semaphore";
46	import { ServerConfig } from "./config.ts";	43	import { ServerConfig } from "./config.ts";
47	import { writeFileStringAtomically } from "./atomicWrite.ts";	44	import { writeFileStringAtomically } from "./atomicWrite.ts";
48	import { fromLenientJson } from "@t3tools/shared/schemaJson";	45	import { fromJsonStringPretty, fromLenientJson } from "@t3tools/shared/schemaJson";
49	import {	46	import {
50	DEFAULT_KEYBINDINGS,	47	DEFAULT_KEYBINDINGS,
51	DEFAULT_RESOLVED_KEYBINDINGS,	48	DEFAULT_RESOLVED_KEYBINDINGS,
...	@@ -172,16 +169,7 @@ function encodeWhenAst(node: KeybindingWhenNode): string {	...	@@ -172,16 +169,7 @@ function encodeWhenAst(node: KeybindingWhenNode): string {
172	}	169	}
173		170
174	const RawKeybindingsEntries = fromLenientJson(Schema.Array(Schema.Unknown));	171	const RawKeybindingsEntries = fromLenientJson(Schema.Array(Schema.Unknown));
175	const KeybindingsConfigJson = Schema.fromJsonString(KeybindingsConfig);	172	const KeybindingsConfigPrettyJson = fromJsonStringPretty(KeybindingsConfig);
176	const PrettyJsonString = SchemaGetter.parseJson<string>().compose(
177	SchemaGetter.stringifyJson({ space: 2 }),
178	);
179	const KeybindingsConfigPrettyJson = KeybindingsConfigJson.pipe(
180	Schema.encode({
181	decode: PrettyJsonString,
182	encode: PrettyJsonString,
183	}),
184	);
185		173
186	export interface KeybindingsConfigState {	174	export interface KeybindingsConfigState {
187	readonly keybindings: ResolvedKeybindingsConfig;	175	readonly keybindings: ResolvedKeybindingsConfig;

apps/server/src/observability/Attributes.ts+2-1

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	import { Cause, Exit } from "effect";	1	import * as Cause from "effect/Cause";
		2	import * as Exit from "effect/Exit";
2		3
3	export type MetricAttributeValue = string;	4	export type MetricAttributeValue = string;
4	export type MetricAttributes = Readonly<Record<string, MetricAttributeValue>>;	5	export type MetricAttributes = Readonly<Record<string, MetricAttributeValue>>;

apps/server/src/observability/Layers/Observability.ts+4-1

...	@@ -1,5 +1,8 @@	...	@@ -1,5 +1,8 @@
1	import { makeLocalFileTracer, makeTraceSink } from "@t3tools/shared/observability";	1	import { makeLocalFileTracer, makeTraceSink } from "@t3tools/shared/observability";
2	import { Effect, Layer, References, Tracer } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
		4	import * as References from "effect/References";
		5	import * as Tracer from "effect/Tracer";
3	import { OtlpMetrics, OtlpSerialization, OtlpTracer } from "effect/unstable/observability";	6	import { OtlpMetrics, OtlpSerialization, OtlpTracer } from "effect/unstable/observability";
4		7
5	import { ServerConfig } from "../../config.ts";	8	import { ServerConfig } from "../../config.ts";

apps/server/src/observability/Metrics.test.ts+5-2

 @@ -1,7 +1,10 @@
 import { assert, describe, it } from "@effect/vitest";
 import { ProviderDriverKind } from "@t3tools/contracts";
-import { Duration, Effect, Fiber, Metric } from "effect";
+import * as Duration from "effect/Duration";
-import { TestClock } from "effect/testing";
+import * as Effect from "effect/Effect";
+import * as Fiber from "effect/Fiber";
+import * as Metric from "effect/Metric";
+import * as TestClock from "effect/testing/TestClock";
 import { withMetrics } from "./Metrics.ts";

apps/server/src/observability/Metrics.ts+5-1

...	@@ -1,4 +1,8 @@	...	@@ -1,4 +1,8 @@
1	import { Clock, Duration, Effect, Exit, Metric } from "effect";	1	import * as Clock from "effect/Clock";
		2	import * as Duration from "effect/Duration";
		3	import * as Effect from "effect/Effect";
		4	import * as Exit from "effect/Exit";
		5	import * as Metric from "effect/Metric";
2	import { dual } from "effect/Function";	6	import { dual } from "effect/Function";
3		7
4	import {	8	import {

apps/server/src/observability/RpcInstrumentation.test.ts+8-2

 @@ -1,7 +1,13 @@
 import { assert, describe, it } from "@effect/vitest";
 import { WS_METHODS } from "@t3tools/contracts";
-import { Duration, Effect, Exit, Fiber, Metric, Stream, Tracer } from "effect";
+import * as Duration from "effect/Duration";
-import { TestClock } from "effect/testing";
+import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
+import * as Fiber from "effect/Fiber";
+import * as Metric from "effect/Metric";
+import * as Stream from "effect/Stream";
+import * as Tracer from "effect/Tracer";
+import * as TestClock from "effect/testing/TestClock";
 import {
   observeRpcEffect,

apps/server/src/observability/RpcInstrumentation.ts+7-1

...	@@ -1,5 +1,11 @@	...	@@ -1,5 +1,11 @@
1	import { WS_METHODS } from "@t3tools/contracts";	1	import { WS_METHODS } from "@t3tools/contracts";
2	import { Clock, Duration, Effect, Exit, Metric, References, Stream } from "effect";	2	import * as Clock from "effect/Clock";
		3	import * as Duration from "effect/Duration";
		4	import * as Effect from "effect/Effect";
		5	import * as Exit from "effect/Exit";
		6	import * as Metric from "effect/Metric";
		7	import * as References from "effect/References";
		8	import * as Stream from "effect/Stream";
3		9
4	import { outcomeFromExit } from "./Attributes.ts";	10	import { outcomeFromExit } from "./Attributes.ts";
5	import { metricAttributes, rpcRequestDuration, rpcRequestsTotal, withMetrics } from "./Metrics.ts";	11	import { metricAttributes, rpcRequestDuration, rpcRequestsTotal, withMetrics } from "./Metrics.ts";

apps/server/src/observability/Services/BrowserTraceCollector.ts+2-2

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	import type { TraceRecord } from "@t3tools/shared/observability";	1	import type { TraceRecord } from "@t3tools/shared/observability";
2	import { Context } from "effect";	2	import * as Context from "effect/Context";
3	import type { Effect } from "effect";	3	import type * as Effect from "effect/Effect";
4		4
5	export interface BrowserTraceCollectorShape {	5	export interface BrowserTraceCollectorShape {
6	readonly record: (records: ReadonlyArray<TraceRecord>) => Effect.Effect<void>;	6	readonly record: (records: ReadonlyArray<TraceRecord>) => Effect.Effect<void>;

apps/server/src/open.test.ts+5-2

...	@@ -1,7 +1,10 @@	...	@@ -1,7 +1,10 @@
1	import * as NodeServices from "@effect/platform-node/NodeServices";	1	import * as NodeServices from "@effect/platform-node/NodeServices";
2	import { assert, it } from "@effect/vitest";	2	import { assert, it } from "@effect/vitest";
3	import { assertSuccess } from "@effect/vitest/utils";	3	import { assertSuccess } from "@effect/vitest/utils";
4	import { FileSystem, Path, Effect } from "effect";	4	import * as Effect from "effect/Effect";
		5	import * as FileSystem from "effect/FileSystem";
		6	import * as Path from "effect/Path";
		7	import * as Random from "effect/Random";
5		8
6	import {	9	import {
7	isCommandAvailable,	10	isCommandAvailable,
...	@@ -488,7 +491,7 @@ it.layer(NodeServices.layer)("launchDetached", (it) => {	...	@@ -488,7 +491,7 @@ it.layer(NodeServices.layer)("launchDetached", (it) => {
488	it.effect("rejects when command does not exist", () =>	491	it.effect("rejects when command does not exist", () =>
489	Effect.gen(function* () {	492	Effect.gen(function* () {
490	const result = yield* launchDetached({	493	const result = yield* launchDetached({
491	command: `t3code-no-such-command-${Date.now()}`,	494	command: `t3code-no-such-command-${yield* Random.nextUUIDv4}`,
492	args: [],	495	args: [],
493	}).pipe(Effect.result);	496	}).pipe(Effect.result);
494	assert.equal(result._tag, "Failure");	497	assert.equal(result._tag, "Failure");

apps/server/src/open.ts+4-1

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	/**	2	/**
2	* Open - Browser/editor launch service interface.	3	* Open - Browser/editor launch service interface.
3	*	4	*
...	@@ -10,7 +11,9 @@ import { spawn } from "node:child_process";	...	@@ -10,7 +11,9 @@ import { spawn } from "node:child_process";
10		11
11	import { EDITORS, OpenError, type EditorId } from "@t3tools/contracts";	12	import { EDITORS, OpenError, type EditorId } from "@t3tools/contracts";
12	import { isCommandAvailable, type CommandAvailabilityOptions } from "@t3tools/shared/shell";	13	import { isCommandAvailable, type CommandAvailabilityOptions } from "@t3tools/shared/shell";
13	import { Context, Effect, Layer } from "effect";	14	import * as Context from "effect/Context";
		15	import * as Effect from "effect/Effect";
		16	import * as Layer from "effect/Layer";
14		17
15	// ==============================	18	// ==============================
16	// Definitions	19	// Definitions

apps/server/src/orchestration/Errors.ts+2-1

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	import { SchemaIssue, Schema } from "effect";	1	import * as SchemaIssue from "effect/SchemaIssue";
		2	import * as Schema from "effect/Schema";
2		3
3	import type { ProjectionRepositoryError } from "../persistence/Errors.ts";	4	import type { ProjectionRepositoryError } from "../persistence/Errors.ts";
4		5

apps/server/src/orchestration/Layers/CheckpointReactor.test.ts+45-37

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import fs from "node:fs";	2	import fs from "node:fs";
2	import os from "node:os";	3	import os from "node:os";
3	import path from "node:path";	4	import path from "node:path";
...	@@ -19,7 +20,14 @@ import {	...	@@ -19,7 +20,14 @@ import {
19	TurnId,	20	TurnId,
20	} from "@t3tools/contracts";	21	} from "@t3tools/contracts";
21	import * as NodeServices from "@effect/platform-node/NodeServices";	22	import * as NodeServices from "@effect/platform-node/NodeServices";
22	import { Effect, Exit, Layer, ManagedRuntime, PubSub, Scope, Stream } from "effect";	23	import * as Clock from "effect/Clock";
		24	import * as Effect from "effect/Effect";
		25	import * as Exit from "effect/Exit";
		26	import * as Layer from "effect/Layer";
		27	import * as ManagedRuntime from "effect/ManagedRuntime";
		28	import * as PubSub from "effect/PubSub";
		29	import * as Scope from "effect/Scope";
		30	import * as Stream from "effect/Stream";
23	import { afterEach, describe, expect, it, vi } from "vitest";	31	import { afterEach, describe, expect, it, vi } from "vitest";
24		32
25	import { CheckpointStoreLive } from "../../checkpointing/Layers/CheckpointStore.ts";	33	import { CheckpointStoreLive } from "../../checkpointing/Layers/CheckpointStore.ts";
...	@@ -73,7 +81,7 @@ function createProviderServiceHarness(	...	@@ -73,7 +81,7 @@ function createProviderServiceHarness(
73	sessionCwd = cwd,	81	sessionCwd = cwd,
74	providerName: ProviderSession["provider"] = ProviderDriverKind.make("codex"),	82	providerName: ProviderSession["provider"] = ProviderDriverKind.make("codex"),
75	) {	83	) {
76	const now = new Date().toISOString();	84	const now = "2026-01-01T00:00:00.000Z";
77	const runtimeEventPubSub = Effect.runSync(PubSub.unbounded<ProviderRuntimeEvent>());	85	const runtimeEventPubSub = Effect.runSync(PubSub.unbounded<ProviderRuntimeEvent>());
78	const rollbackConversation = vi.fn(	86	const rollbackConversation = vi.fn(
79	(_input: { readonly threadId: ThreadId; readonly numTurns: number }) => Effect.void,	87	(_input: { readonly threadId: ThreadId; readonly numTurns: number }) => Effect.void,
...	@@ -148,7 +156,7 @@ async function waitForThread(	...	@@ -148,7 +156,7 @@ async function waitForThread(
148	}) => boolean,	156	}) => boolean,
149	timeoutMs = 15_000,	157	timeoutMs = 15_000,
150	) {	158	) {
151	const deadline = Date.now() + timeoutMs;	159	const deadline = (await Effect.runPromise(Clock.currentTimeMillis)) + timeoutMs;
152	const poll = async (): Promise<{	160	const poll = async (): Promise<{
153	latestTurn: { turnId: string } \| null;	161	latestTurn: { turnId: string } \| null;
154	checkpoints: ReadonlyArray<{ checkpointTurnCount: number }>;	162	checkpoints: ReadonlyArray<{ checkpointTurnCount: number }>;
...	@@ -159,10 +167,10 @@ async function waitForThread(	...	@@ -159,10 +167,10 @@ async function waitForThread(
159	if (thread && predicate(thread)) {	167	if (thread && predicate(thread)) {
160	return thread;	168	return thread;
161	}	169	}
162	if (Date.now() >= deadline) {	170	if ((await Effect.runPromise(Clock.currentTimeMillis)) >= deadline) {
163	throw new Error("Timed out waiting for thread state.");	171	throw new Error("Timed out waiting for thread state.");
164	}	172	}
165	await new Promise((resolve) => setTimeout(resolve, 10));	173	await Effect.runPromise(Effect.sleep("10 millis"));
166	return poll();	174	return poll();
167	};	175	};
168	return poll();	176	return poll();
...	@@ -173,7 +181,7 @@ async function waitForEvent(	...	@@ -173,7 +181,7 @@ async function waitForEvent(
173	predicate: (event: { type: string }) => boolean,	181	predicate: (event: { type: string }) => boolean,
174	timeoutMs = 15_000,	182	timeoutMs = 15_000,
175	) {	183	) {
176	const deadline = Date.now() + timeoutMs;	184	const deadline = (await Effect.runPromise(Clock.currentTimeMillis)) + timeoutMs;
177	const poll = async () => {	185	const poll = async () => {
178	const events = await Effect.runPromise(	186	const events = await Effect.runPromise(
179	Stream.runCollect(engine.readEvents(0)).pipe(Effect.map((chunk) => Array.from(chunk))),	187	Stream.runCollect(engine.readEvents(0)).pipe(Effect.map((chunk) => Array.from(chunk))),
...	@@ -181,10 +189,10 @@ async function waitForEvent(	...	@@ -181,10 +189,10 @@ async function waitForEvent(
181	if (events.some(predicate)) {	189	if (events.some(predicate)) {
182	return events;	190	return events;
183	}	191	}
184	if (Date.now() >= deadline) {	192	if ((await Effect.runPromise(Clock.currentTimeMillis)) >= deadline) {
185	throw new Error("Timed out waiting for orchestration event.");	193	throw new Error("Timed out waiting for orchestration event.");
186	}	194	}
187	await new Promise((resolve) => setTimeout(resolve, 10));	195	await Effect.runPromise(Effect.sleep("10 millis"));
188	return poll();	196	return poll();
189	};	197	};
190	return poll();	198	return poll();
...	@@ -223,15 +231,15 @@ function gitShowFileAtRef(cwd: string, ref: string, filePath: string): string {	...	@@ -223,15 +231,15 @@ function gitShowFileAtRef(cwd: string, ref: string, filePath: string): string {
223	}	231	}
224		232
225	async function waitForGitRefExists(cwd: string, ref: string, timeoutMs = 15_000) {	233	async function waitForGitRefExists(cwd: string, ref: string, timeoutMs = 15_000) {
226	const deadline = Date.now() + timeoutMs;	234	const deadline = (await Effect.runPromise(Clock.currentTimeMillis)) + timeoutMs;
227	const poll = async (): Promise<void> => {	235	const poll = async (): Promise<void> => {
228	if (gitRefExists(cwd, ref)) {	236	if (gitRefExists(cwd, ref)) {
229	return;	237	return;
230	}	238	}
231	if (Date.now() >= deadline) {	239	if ((await Effect.runPromise(Clock.currentTimeMillis)) >= deadline) {
232	throw new Error(`Timed out waiting for git ref '${ref}'.`);	240	throw new Error(`Timed out waiting for git ref '${ref}'.`);
233	}	241	}
234	await new Promise((resolve) => setTimeout(resolve, 10));	242	await Effect.runPromise(Effect.sleep("10 millis"));
235	return poll();	243	return poll();
236	};	244	};
237	return poll();	245	return poll();
...	@@ -342,7 +350,7 @@ describe("CheckpointReactor", () => {	...	@@ -342,7 +350,7 @@ describe("CheckpointReactor", () => {
342	await Effect.runPromise(reactor.start().pipe(Scope.provide(scope)));	350	await Effect.runPromise(reactor.start().pipe(Scope.provide(scope)));
343	const drain = () => Effect.runPromise(reactor.drain);	351	const drain = () => Effect.runPromise(reactor.drain);
344		352
345	const createdAt = new Date().toISOString();	353	const createdAt = "2026-01-01T00:00:00.000Z";
346	await Effect.runPromise(	354	await Effect.runPromise(
347	engine.dispatch({	355	engine.dispatch({
348	type: "project.create",	356	type: "project.create",
...	@@ -410,7 +418,7 @@ describe("CheckpointReactor", () => {	...	@@ -410,7 +418,7 @@ describe("CheckpointReactor", () => {
410		418
411	it("captures pre-turn baseline on turn.started and post-turn checkpoint on turn.completed", async () => {	419	it("captures pre-turn baseline on turn.started and post-turn checkpoint on turn.completed", async () => {
412	const harness = await createHarness({ seedFilesystemCheckpoints: false });	420	const harness = await createHarness({ seedFilesystemCheckpoints: false });
413	const createdAt = new Date().toISOString();	421	const createdAt = "2026-01-01T00:00:00.000Z";
414		422
415	await Effect.runPromise(	423	await Effect.runPromise(
416	harness.engine.dispatch({	424	harness.engine.dispatch({
...	@@ -435,7 +443,7 @@ describe("CheckpointReactor", () => {	...	@@ -435,7 +443,7 @@ describe("CheckpointReactor", () => {
435	eventId: EventId.make("evt-turn-started-1"),	443	eventId: EventId.make("evt-turn-started-1"),
436	provider: ProviderDriverKind.make("codex"),	444	provider: ProviderDriverKind.make("codex"),
437		445
438	createdAt: new Date().toISOString(),	446	createdAt: "2026-01-01T00:00:00.000Z",
439	threadId: ThreadId.make("thread-1"),	447	threadId: ThreadId.make("thread-1"),
440	turnId: asTurnId("turn-1"),	448	turnId: asTurnId("turn-1"),
441	});	449	});
...	@@ -450,7 +458,7 @@ describe("CheckpointReactor", () => {	...	@@ -450,7 +458,7 @@ describe("CheckpointReactor", () => {
450	eventId: EventId.make("evt-turn-completed-1"),	458	eventId: EventId.make("evt-turn-completed-1"),
451	provider: ProviderDriverKind.make("codex"),	459	provider: ProviderDriverKind.make("codex"),
452		460
453	createdAt: new Date().toISOString(),	461	createdAt: "2026-01-01T00:00:00.000Z",
454	threadId: ThreadId.make("thread-1"),	462	threadId: ThreadId.make("thread-1"),
455	turnId: asTurnId("turn-1"),	463	turnId: asTurnId("turn-1"),
456	payload: { state: "completed" },	464	payload: { state: "completed" },
...	@@ -495,7 +503,7 @@ describe("CheckpointReactor", () => {	...	@@ -495,7 +503,7 @@ describe("CheckpointReactor", () => {
495	type: "turn.completed",	503	type: "turn.completed",
496	eventId: EventId.make("evt-turn-completed-refresh-local-status"),	504	eventId: EventId.make("evt-turn-completed-refresh-local-status"),
497	provider: ProviderDriverKind.make("codex"),	505	provider: ProviderDriverKind.make("codex"),
498	createdAt: new Date().toISOString(),	506	createdAt: "2026-01-01T00:00:00.000Z",
499	threadId: ThreadId.make("thread-1"),	507	threadId: ThreadId.make("thread-1"),
500	turnId: asTurnId("turn-refresh-local-status"),	508	turnId: asTurnId("turn-refresh-local-status"),
501	payload: { state: "completed" },	509	payload: { state: "completed" },
...	@@ -508,7 +516,7 @@ describe("CheckpointReactor", () => {	...	@@ -508,7 +516,7 @@ describe("CheckpointReactor", () => {
508		516
509	it("ignores auxiliary thread turn completion while primary turn is active", async () => {	517	it("ignores auxiliary thread turn completion while primary turn is active", async () => {
510	const harness = await createHarness({ seedFilesystemCheckpoints: false });	518	const harness = await createHarness({ seedFilesystemCheckpoints: false });
511	const createdAt = new Date().toISOString();	519	const createdAt = "2026-01-01T00:00:00.000Z";
512		520
513	await Effect.runPromise(	521	await Effect.runPromise(
514	harness.engine.dispatch({	522	harness.engine.dispatch({
...	@@ -533,7 +541,7 @@ describe("CheckpointReactor", () => {	...	@@ -533,7 +541,7 @@ describe("CheckpointReactor", () => {
533	eventId: EventId.make("evt-turn-started-main"),	541	eventId: EventId.make("evt-turn-started-main"),
534	provider: ProviderDriverKind.make("codex"),	542	provider: ProviderDriverKind.make("codex"),
535		543
536	createdAt: new Date().toISOString(),	544	createdAt: "2026-01-01T00:00:00.000Z",
537	threadId: ThreadId.make("thread-1"),	545	threadId: ThreadId.make("thread-1"),
538	turnId: asTurnId("turn-main"),	546	turnId: asTurnId("turn-main"),
539	});	547	});
...	@@ -549,7 +557,7 @@ describe("CheckpointReactor", () => {	...	@@ -549,7 +557,7 @@ describe("CheckpointReactor", () => {
549	eventId: EventId.make("evt-turn-completed-aux"),	557	eventId: EventId.make("evt-turn-completed-aux"),
550	provider: ProviderDriverKind.make("codex"),	558	provider: ProviderDriverKind.make("codex"),
551		559
552	createdAt: new Date().toISOString(),	560	createdAt: "2026-01-01T00:00:00.000Z",
553	threadId: ThreadId.make("thread-1"),	561	threadId: ThreadId.make("thread-1"),
554	turnId: asTurnId("turn-aux"),	562	turnId: asTurnId("turn-aux"),
555	payload: { state: "completed" },	563	payload: { state: "completed" },
...	@@ -565,7 +573,7 @@ describe("CheckpointReactor", () => {	...	@@ -565,7 +573,7 @@ describe("CheckpointReactor", () => {
565	eventId: EventId.make("evt-turn-completed-main"),	573	eventId: EventId.make("evt-turn-completed-main"),
566	provider: ProviderDriverKind.make("codex"),	574	provider: ProviderDriverKind.make("codex"),
567		575
568	createdAt: new Date().toISOString(),	576	createdAt: "2026-01-01T00:00:00.000Z",
569	threadId: ThreadId.make("thread-1"),	577	threadId: ThreadId.make("thread-1"),
570	turnId: asTurnId("turn-main"),	578	turnId: asTurnId("turn-main"),
571	payload: { state: "completed" },	579	payload: { state: "completed" },
...	@@ -583,7 +591,7 @@ describe("CheckpointReactor", () => {	...	@@ -583,7 +591,7 @@ describe("CheckpointReactor", () => {
583	seedFilesystemCheckpoints: false,	591	seedFilesystemCheckpoints: false,
584	providerName: ProviderDriverKind.make("claudeAgent"),	592	providerName: ProviderDriverKind.make("claudeAgent"),
585	});	593	});
586	const createdAt = new Date().toISOString();	594	const createdAt = "2026-01-01T00:00:00.000Z";
587		595
588	await Effect.runPromise(	596	await Effect.runPromise(
589	harness.engine.dispatch({	597	harness.engine.dispatch({
...	@@ -607,7 +615,7 @@ describe("CheckpointReactor", () => {	...	@@ -607,7 +615,7 @@ describe("CheckpointReactor", () => {
607	type: "turn.started",	615	type: "turn.started",
608	eventId: EventId.make("evt-turn-started-claude-1"),	616	eventId: EventId.make("evt-turn-started-claude-1"),
609	provider: ProviderDriverKind.make("claudeAgent"),	617	provider: ProviderDriverKind.make("claudeAgent"),
610	createdAt: new Date().toISOString(),	618	createdAt: "2026-01-01T00:00:00.000Z",
611	threadId: ThreadId.make("thread-1"),	619	threadId: ThreadId.make("thread-1"),
612	turnId: asTurnId("turn-claude-1"),	620	turnId: asTurnId("turn-claude-1"),
613	});	621	});
...	@@ -621,7 +629,7 @@ describe("CheckpointReactor", () => {	...	@@ -621,7 +629,7 @@ describe("CheckpointReactor", () => {
621	type: "turn.completed",	629	type: "turn.completed",
622	eventId: EventId.make("evt-turn-completed-claude-1"),	630	eventId: EventId.make("evt-turn-completed-claude-1"),
623	provider: ProviderDriverKind.make("claudeAgent"),	631	provider: ProviderDriverKind.make("claudeAgent"),
624	createdAt: new Date().toISOString(),	632	createdAt: "2026-01-01T00:00:00.000Z",
625	threadId: ThreadId.make("thread-1"),	633	threadId: ThreadId.make("thread-1"),
626	turnId: asTurnId("turn-claude-1"),	634	turnId: asTurnId("turn-claude-1"),
627	payload: { state: "completed" },	635	payload: { state: "completed" },
...	@@ -641,7 +649,7 @@ describe("CheckpointReactor", () => {	...	@@ -641,7 +649,7 @@ describe("CheckpointReactor", () => {
641		649
642	it("appends capture failure activity when turn diff summary cannot be derived", async () => {	650	it("appends capture failure activity when turn diff summary cannot be derived", async () => {
643	const harness = await createHarness({ seedFilesystemCheckpoints: false });	651	const harness = await createHarness({ seedFilesystemCheckpoints: false });
644	const createdAt = new Date().toISOString();	652	const createdAt = "2026-01-01T00:00:00.000Z";
645		653
646	await Effect.runPromise(	654	await Effect.runPromise(
647	harness.engine.dispatch({	655	harness.engine.dispatch({
...	@@ -666,7 +674,7 @@ describe("CheckpointReactor", () => {	...	@@ -666,7 +674,7 @@ describe("CheckpointReactor", () => {
666	eventId: EventId.make("evt-turn-completed-missing-baseline"),	674	eventId: EventId.make("evt-turn-completed-missing-baseline"),
667	provider: ProviderDriverKind.make("codex"),	675	provider: ProviderDriverKind.make("codex"),
668		676
669	createdAt: new Date().toISOString(),	677	createdAt: "2026-01-01T00:00:00.000Z",
670	threadId: ThreadId.make("thread-1"),	678	threadId: ThreadId.make("thread-1"),
671	turnId: asTurnId("turn-missing-baseline"),	679	turnId: asTurnId("turn-missing-baseline"),
672	payload: { state: "completed" },	680	payload: { state: "completed" },
...	@@ -706,7 +714,7 @@ describe("CheckpointReactor", () => {	...	@@ -706,7 +714,7 @@ describe("CheckpointReactor", () => {
706	},	714	},
707	interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,	715	interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
708	runtimeMode: "approval-required",	716	runtimeMode: "approval-required",
709	createdAt: new Date().toISOString(),	717	createdAt: "2026-01-01T00:00:00.000Z",
710	}),	718	}),
711	);	719	);
712		720
...	@@ -729,7 +737,7 @@ describe("CheckpointReactor", () => {	...	@@ -729,7 +737,7 @@ describe("CheckpointReactor", () => {
729	seedFilesystemCheckpoints: false,	737	seedFilesystemCheckpoints: false,
730	threadWorktreePath: null,	738	threadWorktreePath: null,
731	});	739	});
732	const createdAt = new Date().toISOString();	740	const createdAt = "2026-01-01T00:00:00.000Z";
733		741
734	await Effect.runPromise(	742	await Effect.runPromise(
735	harness.engine.dispatch({	743	harness.engine.dispatch({
...	@@ -755,7 +763,7 @@ describe("CheckpointReactor", () => {	...	@@ -755,7 +763,7 @@ describe("CheckpointReactor", () => {
755	eventId: EventId.make("evt-turn-completed-missing-provider-cwd"),	763	eventId: EventId.make("evt-turn-completed-missing-provider-cwd"),
756	provider: ProviderDriverKind.make("codex"),	764	provider: ProviderDriverKind.make("codex"),
757		765
758	createdAt: new Date().toISOString(),	766	createdAt: "2026-01-01T00:00:00.000Z",
759	threadId: ThreadId.make("thread-1"),	767	threadId: ThreadId.make("thread-1"),
760	turnId: asTurnId("turn-missing-cwd"),	768	turnId: asTurnId("turn-missing-cwd"),
761	payload: { state: "completed" },	769	payload: { state: "completed" },
...	@@ -776,7 +784,7 @@ describe("CheckpointReactor", () => {	...	@@ -776,7 +784,7 @@ describe("CheckpointReactor", () => {
776		784
777	it("ignores non-v2 checkpoint.captured runtime events", async () => {	785	it("ignores non-v2 checkpoint.captured runtime events", async () => {
778	const harness = await createHarness();	786	const harness = await createHarness();
779	const createdAt = new Date().toISOString();	787	const createdAt = "2026-01-01T00:00:00.000Z";
780		788
781	await Effect.runPromise(	789	await Effect.runPromise(
782	harness.engine.dispatch({	790	harness.engine.dispatch({
...	@@ -801,7 +809,7 @@ describe("CheckpointReactor", () => {	...	@@ -801,7 +809,7 @@ describe("CheckpointReactor", () => {
801	eventId: EventId.make("evt-checkpoint-captured-3"),	809	eventId: EventId.make("evt-checkpoint-captured-3"),
802	provider: ProviderDriverKind.make("codex"),	810	provider: ProviderDriverKind.make("codex"),
803		811
804	createdAt: new Date().toISOString(),	812	createdAt: "2026-01-01T00:00:00.000Z",
805	threadId: ThreadId.make("thread-1"),	813	threadId: ThreadId.make("thread-1"),
806	turnId: asTurnId("turn-3"),	814	turnId: asTurnId("turn-3"),
807	turnCount: 3,	815	turnCount: 3,
...	@@ -826,7 +834,7 @@ describe("CheckpointReactor", () => {	...	@@ -826,7 +834,7 @@ describe("CheckpointReactor", () => {
826	seedFilesystemCheckpoints: false,	834	seedFilesystemCheckpoints: false,
827	providerSessionCwd: nonRepositorySessionCwd,	835	providerSessionCwd: nonRepositorySessionCwd,
828	});	836	});
829	const createdAt = new Date().toISOString();	837	const createdAt = "2026-01-01T00:00:00.000Z";
830		838
831	await Effect.runPromise(	839	await Effect.runPromise(
832	harness.engine.dispatch({	840	harness.engine.dispatch({
...	@@ -851,7 +859,7 @@ describe("CheckpointReactor", () => {	...	@@ -851,7 +859,7 @@ describe("CheckpointReactor", () => {
851	eventId: EventId.make("evt-runtime-capture-failure"),	859	eventId: EventId.make("evt-runtime-capture-failure"),
852	provider: ProviderDriverKind.make("codex"),	860	provider: ProviderDriverKind.make("codex"),
853		861
854	createdAt: new Date().toISOString(),	862	createdAt: "2026-01-01T00:00:00.000Z",
855	threadId: ThreadId.make("thread-1"),	863	threadId: ThreadId.make("thread-1"),
856	turnId: asTurnId("turn-runtime-failure"),	864	turnId: asTurnId("turn-runtime-failure"),
857	payload: { state: "completed" },	865	payload: { state: "completed" },
...	@@ -862,7 +870,7 @@ describe("CheckpointReactor", () => {	...	@@ -862,7 +870,7 @@ describe("CheckpointReactor", () => {
862	eventId: EventId.make("evt-turn-started-after-runtime-failure"),	870	eventId: EventId.make("evt-turn-started-after-runtime-failure"),
863	provider: ProviderDriverKind.make("codex"),	871	provider: ProviderDriverKind.make("codex"),
864		872
865	createdAt: new Date().toISOString(),	873	createdAt: "2026-01-01T00:00:00.000Z",
866	threadId: ThreadId.make("thread-1"),	874	threadId: ThreadId.make("thread-1"),
867	turnId: asTurnId("turn-after-runtime-failure"),	875	turnId: asTurnId("turn-after-runtime-failure"),
868	});	876	});
...	@@ -878,7 +886,7 @@ describe("CheckpointReactor", () => {	...	@@ -878,7 +886,7 @@ describe("CheckpointReactor", () => {
878		886
879	it("executes provider revert and emits thread.reverted for checkpoint revert requests", async () => {	887	it("executes provider revert and emits thread.reverted for checkpoint revert requests", async () => {
880	const harness = await createHarness();	888	const harness = await createHarness();
881	const createdAt = new Date().toISOString();	889	const createdAt = "2026-01-01T00:00:00.000Z";
882		890
883	await Effect.runPromise(	891	await Effect.runPromise(
884	harness.engine.dispatch({	892	harness.engine.dispatch({
...	@@ -959,7 +967,7 @@ describe("CheckpointReactor", () => {	...	@@ -959,7 +967,7 @@ describe("CheckpointReactor", () => {
959		967
960	it("executes provider revert and emits thread.reverted for claude sessions", async () => {	968	it("executes provider revert and emits thread.reverted for claude sessions", async () => {
961	const harness = await createHarness({ providerName: ProviderDriverKind.make("claudeAgent") });	969	const harness = await createHarness({ providerName: ProviderDriverKind.make("claudeAgent") });
962	const createdAt = new Date().toISOString();	970	const createdAt = "2026-01-01T00:00:00.000Z";
963		971
964	await Effect.runPromise(	972	await Effect.runPromise(
965	harness.engine.dispatch({	973	harness.engine.dispatch({
...	@@ -1028,7 +1036,7 @@ describe("CheckpointReactor", () => {	...	@@ -1028,7 +1036,7 @@ describe("CheckpointReactor", () => {
1028		1036
1029	it("processes consecutive revert requests with deterministic rollback sequencing", async () => {	1037	it("processes consecutive revert requests with deterministic rollback sequencing", async () => {
1030	const harness = await createHarness();	1038	const harness = await createHarness();
1031	const createdAt = new Date().toISOString();	1039	const createdAt = "2026-01-01T00:00:00.000Z";
1032		1040
1033	await Effect.runPromise(	1041	await Effect.runPromise(
1034	harness.engine.dispatch({	1042	harness.engine.dispatch({
...	@@ -1111,7 +1119,7 @@ describe("CheckpointReactor", () => {	...	@@ -1111,7 +1119,7 @@ describe("CheckpointReactor", () => {
1111		1119
1112	it("appends an error activity when revert is requested without an active session", async () => {	1120	it("appends an error activity when revert is requested without an active session", async () => {
1113	const harness = await createHarness({ hasSession: false });	1121	const harness = await createHarness({ hasSession: false });
1114	const createdAt = new Date().toISOString();	1122	const createdAt = "2026-01-01T00:00:00.000Z";
1115		1123
1116	await Effect.runPromise(	1124	await Effect.runPromise(
1117	harness.engine.dispatch({	1125	harness.engine.dispatch({

apps/server/src/orchestration/Layers/CheckpointReactor.ts+33-20

 @@ -8,7 +8,12 @@ import {
   type OrchestrationEvent,
   type ProviderRuntimeEvent,
 } from "@t3tools/contracts";
-import { Cause, Effect, Layer, Option, Stream } from "effect";
+import * as Cause from "effect/Cause";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Stream from "effect/Stream";
 import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
 import { parseTurnDiffFilesFromUnifiedDiff } from "../../checkpointing/Diffs.ts";
 @@ -28,6 +33,8 @@ import { isGitRepository } from "../../git/Utils.ts";
 import { VcsStatusBroadcaster } from "../../vcs/VcsStatusBroadcaster.ts";
 import { WorkspaceEntries } from "../../workspace/Services/WorkspaceEntries.ts";
+const nowIso = Effect.map(DateTime.now, DateTime.formatIso);
 type ReactorInput =
   | {
       readonly source: "runtime";
 @@ -584,7 +591,7 @@ const make = Effect.gen(function* () {
   const handleRevertRequested = Effect.fn("handleRevertRequested")(function* (
     event: Extract<OrchestrationEvent, { type: "thread.checkpoint-revert-requested" }>,
   ) {
-    const now = new Date().toISOString();
+    const now = DateTime.formatIso(yield* DateTime.now);
     const thread = yield* resolveThreadDetail(event.payload.threadId);
     if (!thread) {
 @@ -717,12 +724,14 @@ const make = Effect.gen(function* () {
     if (event.type === "thread.checkpoint-revert-requested") {
       yield* handleRevertRequested(event).pipe(
         Effect.catch((error) =>
-          appendRevertFailureActivity({
+          Effect.flatMap(nowIso, (createdAt) =>
-            threadId: event.payload.threadId,
+            appendRevertFailureActivity({
-            turnCount: event.payload.turnCount,
+              threadId: event.payload.threadId,
-            detail: error.message,
+              turnCount: event.payload.turnCount,
-            createdAt: new Date().toISOString(),
+              detail: error.message,
-          }),
+              createdAt,
+            }),
+          ),
         ),
       );
       return;
 @@ -736,12 +745,14 @@ const make = Effect.gen(function* () {
     if (event.type === "thread.turn-diff-completed") {
       yield* captureCheckpointFromPlaceholder(event).pipe(
         Effect.catch((error) =>
-          appendCaptureFailureActivity({
+          Effect.flatMap(nowIso, (createdAt) =>
-            threadId: event.payload.threadId,
+            appendCaptureFailureActivity({
-            turnId: event.payload.turnId,
+              threadId: event.payload.threadId,
-            detail: error.message,
+              turnId: event.payload.turnId,
-            createdAt: new Date().toISOString(),
+              detail: error.message,
-          }).pipe(Effect.catch(() => Effect.void)),
+              createdAt,
+            }).pipe(Effect.catch(() => Effect.void)),
+          ),
         ),
       );
     }
 @@ -760,12 +771,14 @@ const make = Effect.gen(function* () {
       yield* refreshLocalGitStatusFromTurnCompletion(event);
       yield* captureCheckpointFromTurnCompletion(event).pipe(
         Effect.catch((error) =>
-          appendCaptureFailureActivity({
+          Effect.flatMap(nowIso, (createdAt) =>
-            threadId: event.threadId,
+            appendCaptureFailureActivity({
-            turnId,
+              threadId: event.threadId,
-            detail: error.message,
+              turnId,
-            createdAt: new Date().toISOString(),
+              detail: error.message,
-          }).pipe(Effect.catch(() => Effect.void)),
+              createdAt,
+            }).pipe(Effect.catch(() => Effect.void)),
+          ),
         ),
       );
       return;

apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts+8-3

 @@ -8,9 +8,14 @@ import {
   TurnId,
   type OrchestrationEvent,
   ProviderInstanceId,
-  type OrchestrationReadModel,
 } from "@t3tools/contracts";
-import { Effect, Layer, ManagedRuntime, Metric, Option, Queue, Stream } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as ManagedRuntime from "effect/ManagedRuntime";
+import * as Metric from "effect/Metric";
+import * as Option from "effect/Option";
+import * as Queue from "effect/Queue";
+import * as Stream from "effect/Stream";
 import { describe, expect, it } from "vitest";
 import { PersistenceSqlError } from "../../persistence/Errors.ts";
 @@ -69,7 +74,7 @@ async function createOrchestrationSystem() {
 }
 function now() {
-  return new Date().toISOString();
+  return "2026-01-01T00:00:00.000Z";
 }
 const hasMetricSnapshot = (

apps/server/src/orchestration/Layers/OrchestrationEngine.ts+26-20

 @@ -5,20 +5,20 @@ import type {
   ThreadId,
 } from "@t3tools/contracts";
 import { OrchestrationCommand } from "@t3tools/contracts";
-import {
+import * as Cause from "effect/Cause";
-  Cause,
+import * as Clock from "effect/Clock";
-  Deferred,
+import * as DateTime from "effect/DateTime";
-  Duration,
+import * as Deferred from "effect/Deferred";
-  Effect,
+import * as Duration from "effect/Duration";
-  Exit,
+import * as Effect from "effect/Effect";
-  Layer,
+import * as Exit from "effect/Exit";
-  Metric,
+import * as Layer from "effect/Layer";
-  Option,
+import * as Metric from "effect/Metric";
-  PubSub,
+import * as Option from "effect/Option";
-  Queue,
+import * as PubSub from "effect/PubSub";
-  Schema,
+import * as Queue from "effect/Queue";
-  Stream,
+import * as Schema from "effect/Schema";
-} from "effect";
+import * as Stream from "effect/Stream";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import {
 @@ -78,7 +78,8 @@ const makeOrchestrationEngine = Effect.gen(function* () {
   const projectionPipeline = yield* OrchestrationProjectionPipeline;
   const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
-  let commandReadModel = createEmptyReadModel(new Date().toISOString());
+  const nowIso = Effect.map(DateTime.now, DateTime.formatIso);
+  let commandReadModel = createEmptyReadModel(yield* nowIso);
   const commandQueue = yield* Queue.unbounded<CommandEnvelope>();
   const eventPubSub = yield* PubSub.unbounded<OrchestrationEvent>();
 @@ -97,7 +98,7 @@ const makeOrchestrationEngine = Effect.gen(function* () {
   const processEnvelope = (envelope: CommandEnvelope): Effect.Effect<void> => {
     const dispatchStartSequence = commandReadModel.snapshotSequence;
-    const processingStartedAtMs = Date.now();
+    let processingStartedAtMs = 0;
     const aggregateRef = commandToAggregateRef(envelope.command);
     const baseMetricAttributes = {
       commandType: envelope.command.type,
 @@ -120,6 +121,7 @@ const makeOrchestrationEngine = Effect.gen(function* () {
     return Effect.exit(
       Effect.gen(function* () {
+        processingStartedAtMs = yield* Clock.currentTimeMillis;
         yield* Effect.annotateCurrentSpan({
           "orchestration.command_id": envelope.command.commandId,
           "orchestration.command_type": envelope.command.type,
 @@ -205,7 +207,7 @@ const makeOrchestrationEngine = Effect.gen(function* () {
                   ackEventType: event.type,
                 }),
               ),
-              Duration.millis(Math.max(0, Date.now() - envelope.startedAtMs)),
+              Duration.millis(Math.max(0, (yield* Clock.currentTimeMillis) - envelope.startedAtMs)),
             );
           }
         }
 @@ -224,7 +226,7 @@ const makeOrchestrationEngine = Effect.gen(function* () {
               orchestrationCommandDuration,
               metricAttributes(baseMetricAttributes),
             ),
-            Duration.millis(Math.max(0, Date.now() - processingStartedAtMs)),
+            Duration.millis(Math.max(0, (yield* Clock.currentTimeMillis) - processingStartedAtMs)),
           );
           yield* Metric.update(
             Metric.withAttributes(
 @@ -263,7 +265,7 @@ const makeOrchestrationEngine = Effect.gen(function* () {
                   commandId: envelope.command.commandId,
                   aggregateKind: aggregateRef.aggregateKind,
                   aggregateId: aggregateRef.aggregateId,
-                  acceptedAt: new Date().toISOString(),
+                  acceptedAt: yield* nowIso,
                   resultSequence: commandReadModel.snapshotSequence,
                   status: "rejected",
                   error: error.message,
 @@ -293,7 +295,11 @@ const makeOrchestrationEngine = Effect.gen(function* () {
   const dispatch: OrchestrationEngineShape["dispatch"] = (command) =>
     Effect.gen(function* () {
       const result = yield* Deferred.make<{ sequence: number }, OrchestrationDispatchError>();
-      yield* Queue.offer(commandQueue, { command, result, startedAtMs: Date.now() });
+      yield* Queue.offer(commandQueue, {
+        command,
+        result,
+        startedAtMs: yield* Clock.currentTimeMillis,
+      });
       return yield* Deferred.await(result);
     });

apps/server/src/orchestration/Layers/OrchestrationReactor.test.ts+5-1

...	@@ -1,4 +1,8 @@	...	@@ -1,4 +1,8 @@
1	import { Effect, Exit, Layer, ManagedRuntime, Scope } from "effect";	1	import * as Effect from "effect/Effect";
		2	import * as Exit from "effect/Exit";
		3	import * as Layer from "effect/Layer";
		4	import * as ManagedRuntime from "effect/ManagedRuntime";
		5	import * as Scope from "effect/Scope";
2	import { afterEach, describe, expect, it } from "vitest";	6	import { afterEach, describe, expect, it } from "vitest";
3		7
4	import { CheckpointReactor } from "../Services/CheckpointReactor.ts";	8	import { CheckpointReactor } from "../Services/CheckpointReactor.ts";

apps/server/src/orchestration/Layers/OrchestrationReactor.ts+2-1

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	import { Effect, Layer } from "effect";	1	import * as Effect from "effect/Effect";
		2	import * as Layer from "effect/Layer";
2		3
3	import {	4	import {
4	OrchestrationReactor,	5	OrchestrationReactor,

apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts+23-16

...	@@ -11,7 +11,10 @@ import {	...	@@ -11,7 +11,10 @@ import {
11	} from "@t3tools/contracts";	11	} from "@t3tools/contracts";
12	import * as NodeServices from "@effect/platform-node/NodeServices";	12	import * as NodeServices from "@effect/platform-node/NodeServices";
13	import { assert, it } from "@effect/vitest";	13	import { assert, it } from "@effect/vitest";
14	import { Effect, FileSystem, Layer, Path } from "effect";	14	import * as Effect from "effect/Effect";
		15	import * as FileSystem from "effect/FileSystem";
		16	import * as Layer from "effect/Layer";
		17	import * as Path from "effect/Path";
15	import * as SqlClient from "effect/unstable/sql/SqlClient";	18	import * as SqlClient from "effect/unstable/sql/SqlClient";
16		19
17	import { OrchestrationCommandReceiptRepositoryLive } from "../../persistence/Layers/OrchestrationCommandReceipts.ts";	20	import { OrchestrationCommandReceiptRepositoryLive } from "../../persistence/Layers/OrchestrationCommandReceipts.ts";
...	@@ -55,7 +58,7 @@ it.layer(BaseTestLayer)("OrchestrationProjectionPipeline", (it) => {	...	@@ -55,7 +58,7 @@ it.layer(BaseTestLayer)("OrchestrationProjectionPipeline", (it) => {
55	const projectionPipeline = yield* OrchestrationProjectionPipeline;	58	const projectionPipeline = yield* OrchestrationProjectionPipeline;
56	const eventStore = yield* OrchestrationEventStore;	59	const eventStore = yield* OrchestrationEventStore;
57	const sql = yield* SqlClient.SqlClient;	60	const sql = yield* SqlClient.SqlClient;
58	const now = new Date().toISOString();	61	const now = "2026-01-01T00:00:00.000Z";
59		62
60	yield* eventStore.append({	63	yield* eventStore.append({
61	type: "project.created",	64	type: "project.created",
...	@@ -180,7 +183,7 @@ it.layer(Layer.fresh(makeProjectionPipelinePrefixedTestLayer("t3-base-")))(	...	@@ -180,7 +183,7 @@ it.layer(Layer.fresh(makeProjectionPipelinePrefixedTestLayer("t3-base-")))(
180	const projectionPipeline = yield* OrchestrationProjectionPipeline;	183	const projectionPipeline = yield* OrchestrationProjectionPipeline;
181	const eventStore = yield* OrchestrationEventStore;	184	const eventStore = yield* OrchestrationEventStore;
182	const sql = yield* SqlClient.SqlClient;	185	const sql = yield* SqlClient.SqlClient;
183	const now = new Date().toISOString();	186	const now = "2026-01-01T00:00:00.000Z";
184		187
185	yield* eventStore.append({	188	yield* eventStore.append({
186	type: "thread.message-sent",	189	type: "thread.message-sent",
...	@@ -224,6 +227,7 @@ it.layer(Layer.fresh(makeProjectionPipelinePrefixedTestLayer("t3-base-")))(	...	@@ -224,6 +227,7 @@ it.layer(Layer.fresh(makeProjectionPipelinePrefixedTestLayer("t3-base-")))(
224	WHERE message_id = 'message-attachments'	227	WHERE message_id = 'message-attachments'
225	`;	228	`;
226	assert.equal(rows.length, 1);	229	assert.equal(rows.length, 1);
		230	// @effect-diagnostics-next-line preferSchemaOverJson:off
227	assert.deepEqual(JSON.parse(rows[0]?.attachmentsJson ?? "null"), [	231	assert.deepEqual(JSON.parse(rows[0]?.attachmentsJson ?? "null"), [
228	{	232	{
229	type: "image",	233	type: "image",
...	@@ -246,7 +250,7 @@ it.layer(Layer.fresh(makeProjectionPipelinePrefixedTestLayer("t3-projection-atta	...	@@ -246,7 +250,7 @@ it.layer(Layer.fresh(makeProjectionPipelinePrefixedTestLayer("t3-projection-atta
246	const projectionPipeline = yield* OrchestrationProjectionPipeline;	250	const projectionPipeline = yield* OrchestrationProjectionPipeline;
247	const eventStore = yield* OrchestrationEventStore;	251	const eventStore = yield* OrchestrationEventStore;
248	const sql = yield* SqlClient.SqlClient;	252	const sql = yield* SqlClient.SqlClient;
249	const now = new Date().toISOString();	253	const now = "2026-01-01T00:00:00.000Z";
250		254
251	yield* eventStore.append({	255	yield* eventStore.append({
252	type: "thread.message-sent",	256	type: "thread.message-sent",
...	@@ -297,6 +301,7 @@ it.layer(Layer.fresh(makeProjectionPipelinePrefixedTestLayer("t3-projection-atta	...	@@ -297,6 +301,7 @@ it.layer(Layer.fresh(makeProjectionPipelinePrefixedTestLayer("t3-projection-atta
297	WHERE message_id = 'message-attachments-safe'	301	WHERE message_id = 'message-attachments-safe'
298	`;	302	`;
299	assert.equal(rows.length, 1);	303	assert.equal(rows.length, 1);
		304	// @effect-diagnostics-next-line preferSchemaOverJson:off
300	assert.deepEqual(JSON.parse(rows[0]?.attachmentsJson ?? "null"), [	305	assert.deepEqual(JSON.parse(rows[0]?.attachmentsJson ?? "null"), [
301	{	306	{
302	type: "image",	307	type: "image",
...	@@ -326,8 +331,8 @@ it.layer(BaseTestLayer)("OrchestrationProjectionPipeline", (it) => {	...	@@ -326,8 +331,8 @@ it.layer(BaseTestLayer)("OrchestrationProjectionPipeline", (it) => {
326	const projectionPipeline = yield* OrchestrationProjectionPipeline;	331	const projectionPipeline = yield* OrchestrationProjectionPipeline;
327	const eventStore = yield* OrchestrationEventStore;	332	const eventStore = yield* OrchestrationEventStore;
328	const sql = yield* SqlClient.SqlClient;	333	const sql = yield* SqlClient.SqlClient;
329	const now = new Date().toISOString();	334	const now = "2026-01-01T00:00:00.000Z";
330	const later = new Date(Date.now() + 1_000).toISOString();	335	const later = "2026-01-01T00:00:01.000Z";
331		336
332	yield* eventStore.append({	337	yield* eventStore.append({
333	type: "project.created",	338	type: "project.created",
...	@@ -441,6 +446,7 @@ it.layer(BaseTestLayer)("OrchestrationProjectionPipeline", (it) => {	...	@@ -441,6 +446,7 @@ it.layer(BaseTestLayer)("OrchestrationProjectionPipeline", (it) => {
441	WHERE message_id = 'message-clear-attachments'	446	WHERE message_id = 'message-clear-attachments'
442	`;	447	`;
443	assert.equal(rows.length, 1);	448	assert.equal(rows.length, 1);
		449	// @effect-diagnostics-next-line preferSchemaOverJson:off
444	assert.deepEqual(JSON.parse(rows[0]?.attachmentsJson ?? "null"), []);	450	assert.deepEqual(JSON.parse(rows[0]?.attachmentsJson ?? "null"), []);
445	}),	451	}),
446	);	452	);
...	@@ -454,8 +460,8 @@ it.layer(	...	@@ -454,8 +460,8 @@ it.layer(
454	const projectionPipeline = yield* OrchestrationProjectionPipeline;	460	const projectionPipeline = yield* OrchestrationProjectionPipeline;
455	const eventStore = yield* OrchestrationEventStore;	461	const eventStore = yield* OrchestrationEventStore;
456	const sql = yield* SqlClient.SqlClient;	462	const sql = yield* SqlClient.SqlClient;
457	const now = new Date().toISOString();	463	const now = "2026-01-01T00:00:00.000Z";
458	const later = new Date(Date.now() + 1_000).toISOString();	464	const later = "2026-01-01T00:00:01.000Z";
459		465
460	yield* eventStore.append({	466	yield* eventStore.append({
461	type: "project.created",	467	type: "project.created",
...	@@ -576,6 +582,7 @@ it.layer(	...	@@ -576,6 +582,7 @@ it.layer(
576	WHERE message_id = 'message-overwrite'	582	WHERE message_id = 'message-overwrite'
577	`;	583	`;
578	assert.equal(rows.length, 1);	584	assert.equal(rows.length, 1);
		585	// @effect-diagnostics-next-line preferSchemaOverJson:off
579	assert.deepEqual(JSON.parse(rows[0]?.attachmentsJson ?? "null"), [	586	assert.deepEqual(JSON.parse(rows[0]?.attachmentsJson ?? "null"), [
580	{	587	{
581	type: "image",	588	type: "image",
...	@@ -598,7 +605,7 @@ it.layer(	...	@@ -598,7 +605,7 @@ it.layer(
598	const eventStore = yield* OrchestrationEventStore;	605	const eventStore = yield* OrchestrationEventStore;
599	const path = yield* Path.Path;	606	const path = yield* Path.Path;
600	const sql = yield* SqlClient.SqlClient;	607	const sql = yield* SqlClient.SqlClient;
601	const now = new Date().toISOString();	608	const now = "2026-01-01T00:00:00.000Z";
602		609
603	const appendAndProject = (event: Parameters<typeof eventStore.append>[0]) =>	610	const appendAndProject = (event: Parameters<typeof eventStore.append>[0]) =>
604	eventStore	611	eventStore
...	@@ -722,7 +729,7 @@ it.layer(	...	@@ -722,7 +729,7 @@ it.layer(
722	const projectionPipeline = yield* OrchestrationProjectionPipeline;	729	const projectionPipeline = yield* OrchestrationProjectionPipeline;
723	const eventStore = yield* OrchestrationEventStore;	730	const eventStore = yield* OrchestrationEventStore;
724	const { attachmentsDir } = yield* ServerConfig;	731	const { attachmentsDir } = yield* ServerConfig;
725	const now = new Date().toISOString();	732	const now = "2026-01-01T00:00:00.000Z";
726	const threadId = ThreadId.make("Thread Revert.Files");	733	const threadId = ThreadId.make("Thread Revert.Files");
727	const keepAttachmentId = "thread-revert-files-00000000-0000-4000-8000-000000000001";	734	const keepAttachmentId = "thread-revert-files-00000000-0000-4000-8000-000000000001";
728	const removeAttachmentId = "thread-revert-files-00000000-0000-4000-8000-000000000002";	735	const removeAttachmentId = "thread-revert-files-00000000-0000-4000-8000-000000000002";
...	@@ -931,7 +938,7 @@ it.layer(Layer.fresh(makeProjectionPipelinePrefixedTestLayer("t3-projection-atta	...	@@ -931,7 +938,7 @@ it.layer(Layer.fresh(makeProjectionPipelinePrefixedTestLayer("t3-projection-atta
931	const projectionPipeline = yield* OrchestrationProjectionPipeline;	938	const projectionPipeline = yield* OrchestrationProjectionPipeline;
932	const eventStore = yield* OrchestrationEventStore;	939	const eventStore = yield* OrchestrationEventStore;
933	const { attachmentsDir } = yield* ServerConfig;	940	const { attachmentsDir } = yield* ServerConfig;
934	const now = new Date().toISOString();	941	const now = "2026-01-01T00:00:00.000Z";
935	const threadId = ThreadId.make("Thread Delete.Files");	942	const threadId = ThreadId.make("Thread Delete.Files");
936	const attachmentId = "thread-delete-files-00000000-0000-4000-8000-000000000001";	943	const attachmentId = "thread-delete-files-00000000-0000-4000-8000-000000000001";
937	const otherThreadAttachmentId =	944	const otherThreadAttachmentId =
...	@@ -1063,7 +1070,7 @@ it.layer(Layer.fresh(makeProjectionPipelinePrefixedTestLayer("t3-projection-atta	...	@@ -1063,7 +1070,7 @@ it.layer(Layer.fresh(makeProjectionPipelinePrefixedTestLayer("t3-projection-atta
1063	const path = yield* Path.Path;	1070	const path = yield* Path.Path;
1064	const projectionPipeline = yield* OrchestrationProjectionPipeline;	1071	const projectionPipeline = yield* OrchestrationProjectionPipeline;
1065	const eventStore = yield* OrchestrationEventStore;	1072	const eventStore = yield* OrchestrationEventStore;
1066	const now = new Date().toISOString();	1073	const now = "2026-01-01T00:00:00.000Z";
1067	const { attachmentsDir: attachmentsRootDir, stateDir } = yield* ServerConfig;	1074	const { attachmentsDir: attachmentsRootDir, stateDir } = yield* ServerConfig;
1068	const attachmentsSentinelPath = path.join(attachmentsRootDir, "sentinel.txt");	1075	const attachmentsSentinelPath = path.join(attachmentsRootDir, "sentinel.txt");
1069	const stateDirSentinelPath = path.join(stateDir, "state-sentinel.txt");	1076	const stateDirSentinelPath = path.join(stateDir, "state-sentinel.txt");
...	@@ -1103,7 +1110,7 @@ it.layer(BaseTestLayer)("OrchestrationProjectionPipeline", (it) => {	...	@@ -1103,7 +1110,7 @@ it.layer(BaseTestLayer)("OrchestrationProjectionPipeline", (it) => {
1103	const projectionPipeline = yield* OrchestrationProjectionPipeline;	1110	const projectionPipeline = yield* OrchestrationProjectionPipeline;
1104	const eventStore = yield* OrchestrationEventStore;	1111	const eventStore = yield* OrchestrationEventStore;
1105	const sql = yield* SqlClient.SqlClient;	1112	const sql = yield* SqlClient.SqlClient;
1106	const now = new Date().toISOString();	1113	const now = "2026-01-01T00:00:00.000Z";
1107		1114
1108	yield* eventStore.append({	1115	yield* eventStore.append({
1109	type: "project.created",	1116	type: "project.created",
...	@@ -1230,7 +1237,7 @@ it.layer(BaseTestLayer)("OrchestrationProjectionPipeline", (it) => {	...	@@ -1230,7 +1237,7 @@ it.layer(BaseTestLayer)("OrchestrationProjectionPipeline", (it) => {
1230	const projectionPipeline = yield* OrchestrationProjectionPipeline;	1237	const projectionPipeline = yield* OrchestrationProjectionPipeline;
1231	const eventStore = yield* OrchestrationEventStore;	1238	const eventStore = yield* OrchestrationEventStore;
1232	const sql = yield* SqlClient.SqlClient;	1239	const sql = yield* SqlClient.SqlClient;
1233	const now = new Date().toISOString();	1240	const now = "2026-01-01T00:00:00.000Z";
1234		1241
1235	yield* eventStore.append({	1242	yield* eventStore.append({
1236	type: "project.created",	1243	type: "project.created",
...	@@ -2187,7 +2194,7 @@ engineLayer("OrchestrationProjectionPipeline via engine dispatch", (it) => {	...	@@ -2187,7 +2194,7 @@ engineLayer("OrchestrationProjectionPipeline via engine dispatch", (it) => {
2187	Effect.gen(function* () {	2194	Effect.gen(function* () {
2188	const engine = yield* OrchestrationEngineService;	2195	const engine = yield* OrchestrationEngineService;
2189	const sql = yield* SqlClient.SqlClient;	2196	const sql = yield* SqlClient.SqlClient;
2190	const createdAt = new Date().toISOString();	2197	const createdAt = "2026-01-01T00:00:00.000Z";
2191		2198
2192	yield* engine.dispatch({	2199	yield* engine.dispatch({
2193	type: "project.create",	2200	type: "project.create",
...	@@ -2225,7 +2232,7 @@ engineLayer("OrchestrationProjectionPipeline via engine dispatch", (it) => {	...	@@ -2225,7 +2232,7 @@ engineLayer("OrchestrationProjectionPipeline via engine dispatch", (it) => {
2225	Effect.gen(function* () {	2232	Effect.gen(function* () {
2226	const engine = yield* OrchestrationEngineService;	2233	const engine = yield* OrchestrationEngineService;
2227	const sql = yield* SqlClient.SqlClient;	2234	const sql = yield* SqlClient.SqlClient;
2228	const createdAt = new Date().toISOString();	2235	const createdAt = "2026-01-01T00:00:00.000Z";
2229		2236
2230	yield* engine.dispatch({	2237	yield* engine.dispatch({
2231	type: "project.create",	2238	type: "project.create",

apps/server/src/orchestration/Layers/ProjectionPipeline.ts+6-1

 @@ -4,7 +4,12 @@ import {
   type OrchestrationEvent,
   ThreadId,
 } from "@t3tools/contracts";
-import { Effect, FileSystem, Layer, Option, Path, Stream } from "effect";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Path from "effect/Path";
+import * as Stream from "effect/Stream";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import { toPersistenceSqlError, type ProjectionRepositoryError } from "../../persistence/Errors.ts";

apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts+2-1

...	@@ -8,7 +8,8 @@ import {	...	@@ -8,7 +8,8 @@ import {
8	ProviderInstanceId,	8	ProviderInstanceId,
9	} from "@t3tools/contracts";	9	} from "@t3tools/contracts";
10	import { assert, it } from "@effect/vitest";	10	import { assert, it } from "@effect/vitest";
11	import { Effect, Layer } from "effect";	11	import * as Effect from "effect/Effect";
		12	import * as Layer from "effect/Layer";
12	import * as SqlClient from "effect/unstable/sql/SqlClient";	13	import * as SqlClient from "effect/unstable/sql/SqlClient";
13		14
14	import { SqlitePersistenceMemory } from "../../persistence/Layers/Sqlite.ts";	15	import { SqlitePersistenceMemory } from "../../persistence/Layers/Sqlite.ts";

apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts+8-4

...	@@ -23,7 +23,11 @@ import {	...	@@ -23,7 +23,11 @@ import {
23	ProjectId,	23	ProjectId,
24	ThreadId,	24	ThreadId,
25	} from "@t3tools/contracts";	25	} from "@t3tools/contracts";
26	import { Effect, Layer, Option, Schema, Struct } from "effect";	26	import * as Effect from "effect/Effect";
		27	import * as Layer from "effect/Layer";
		28	import * as Option from "effect/Option";
		29	import * as Schema from "effect/Schema";
		30	import * as Struct from "effect/Struct";
27	import * as SqlClient from "effect/unstable/sql/SqlClient";	31	import * as SqlClient from "effect/unstable/sql/SqlClient";
28	import * as SqlSchema from "effect/unstable/sql/SqlSchema";	32	import * as SqlSchema from "effect/unstable/sql/SqlSchema";
29		33
...	@@ -1005,7 +1009,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {	...	@@ -1005,7 +1009,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
1005	snapshotSequence: computeSnapshotSequence(stateRows),	1009	snapshotSequence: computeSnapshotSequence(stateRows),
1006	projects,	1010	projects,
1007	threads,	1011	threads,
1008	updatedAt: updatedAt ?? new Date(0).toISOString(),	1012	updatedAt: updatedAt ?? "1970-01-01T00:00:00.000Z",
1009	};	1013	};
1010		1014
1011	return yield* decodeReadModel(snapshot).pipe(	1015	return yield* decodeReadModel(snapshot).pipe(
...	@@ -1204,7 +1208,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {	...	@@ -1204,7 +1208,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
1204	snapshotSequence: computeSnapshotSequence(stateRows),	1208	snapshotSequence: computeSnapshotSequence(stateRows),
1205	projects,	1209	projects,
1206	threads,	1210	threads,
1207	updatedAt: updatedAt ?? new Date(0).toISOString(),	1211	updatedAt: updatedAt ?? "1970-01-01T00:00:00.000Z",
1208	} satisfies OrchestrationReadModel;	1212	} satisfies OrchestrationReadModel;
1209	}),	1213	}),
1210	),	1214	),
...	@@ -1326,7 +1330,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {	...	@@ -1326,7 +1330,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
1326	hasActionableProposedPlan: row.hasActionableProposedPlan > 0,	1330	hasActionableProposedPlan: row.hasActionableProposedPlan > 0,
1327	}),	1331	}),
1328	),	1332	),
1329	updatedAt: updatedAt ?? new Date(0).toISOString(),	1333	updatedAt: updatedAt ?? "1970-01-01T00:00:00.000Z",
1330	};	1334	};
1331		1335
1332	return yield* decodeShellSnapshot(snapshot).pipe(	1336	return yield* decodeShellSnapshot(snapshot).pipe(

apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts+43-35

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import fs from "node:fs";	2	import fs from "node:fs";
2	import os from "node:os";	3	import os from "node:os";
3	import path from "node:path";	4	import path from "node:path";
...	@@ -20,7 +21,13 @@ import {	...	@@ -20,7 +21,13 @@ import {
20	ThreadId,	21	ThreadId,
21	TurnId,	22	TurnId,
22	} from "@t3tools/contracts";	23	} from "@t3tools/contracts";
23	import { Effect, Exit, Layer, ManagedRuntime, PubSub, Scope, Stream } from "effect";	24	import * as Effect from "effect/Effect";
		25	import * as Exit from "effect/Exit";
		26	import * as Layer from "effect/Layer";
		27	import * as ManagedRuntime from "effect/ManagedRuntime";
		28	import * as PubSub from "effect/PubSub";
		29	import * as Scope from "effect/Scope";
		30	import * as Stream from "effect/Stream";
24	import { afterEach, describe, expect, it, vi } from "vitest";	31	import { afterEach, describe, expect, it, vi } from "vitest";
25		32
26	import { deriveServerPaths, ServerConfig } from "../../config.ts";	33	import { deriveServerPaths, ServerConfig } from "../../config.ts";
...	@@ -47,6 +54,7 @@ import { OrchestrationEngineService } from "../Services/OrchestrationEngine.ts";	...	@@ -47,6 +54,7 @@ import { OrchestrationEngineService } from "../Services/OrchestrationEngine.ts";
47	import { ProviderCommandReactor } from "../Services/ProviderCommandReactor.ts";	54	import { ProviderCommandReactor } from "../Services/ProviderCommandReactor.ts";
48	import { ProjectionSnapshotQuery } from "../Services/ProjectionSnapshotQuery.ts";	55	import { ProjectionSnapshotQuery } from "../Services/ProjectionSnapshotQuery.ts";
49	import * as NodeServices from "@effect/platform-node/NodeServices";	56	import * as NodeServices from "@effect/platform-node/NodeServices";
		57	import * as Clock from "effect/Clock";
50	import { ServerSettingsService } from "../../serverSettings.ts";	58	import { ServerSettingsService } from "../../serverSettings.ts";
51	import { VcsStatusBroadcaster } from "../../vcs/VcsStatusBroadcaster.ts";	59	import { VcsStatusBroadcaster } from "../../vcs/VcsStatusBroadcaster.ts";
52	import { GitWorkflowService, type GitWorkflowServiceShape } from "../../git/GitWorkflowService.ts";	60	import { GitWorkflowService, type GitWorkflowServiceShape } from "../../git/GitWorkflowService.ts";
...	@@ -63,15 +71,15 @@ async function waitFor(	...	@@ -63,15 +71,15 @@ async function waitFor(
63	predicate: () => boolean \| Promise<boolean>,	71	predicate: () => boolean \| Promise<boolean>,
64	timeoutMs = 2000,	72	timeoutMs = 2000,
65	): Promise<void> {	73	): Promise<void> {
66	const deadline = Date.now() + timeoutMs;	74	const deadline = (await Effect.runPromise(Clock.currentTimeMillis)) + timeoutMs;
67	const poll = async (): Promise<void> => {	75	const poll = async (): Promise<void> => {
68	if (await predicate()) {	76	if (await predicate()) {
69	return;	77	return;
70	}	78	}
71	if (Date.now() >= deadline) {	79	if ((await Effect.runPromise(Clock.currentTimeMillis)) >= deadline) {
72	throw new Error("Timed out waiting for expectation.");	80	throw new Error("Timed out waiting for expectation.");
73	}	81	}
74	await new Promise((resolve) => setTimeout(resolve, 10));	82	await Effect.runPromise(Effect.yieldNow);
75	return poll();	83	return poll();
76	};	84	};
77		85
...	@@ -135,7 +143,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -135,7 +143,7 @@ describe("ProviderCommandReactor", () => {
135	readonly threadModelSelection?: ModelSelection;	143	readonly threadModelSelection?: ModelSelection;
136	readonly sessionModelSwitch?: "unsupported" \| "in-session";	144	readonly sessionModelSwitch?: "unsupported" \| "in-session";
137	}) {	145	}) {
138	const now = new Date().toISOString();	146	const now = "2026-01-01T00:00:00.000Z";
139	const baseDir = input?.baseDir ?? fs.mkdtempSync(path.join(os.tmpdir(), "t3code-reactor-"));	147	const baseDir = input?.baseDir ?? fs.mkdtempSync(path.join(os.tmpdir(), "t3code-reactor-"));
140	createdBaseDirs.add(baseDir);	148	createdBaseDirs.add(baseDir);
141	const { stateDir } = deriveServerPathsSync(baseDir, undefined);	149	const { stateDir } = deriveServerPathsSync(baseDir, undefined);
...	@@ -408,7 +416,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -408,7 +416,7 @@ describe("ProviderCommandReactor", () => {
408		416
409	it("reacts to thread.turn.start by ensuring session and sending provider turn", async () => {	417	it("reacts to thread.turn.start by ensuring session and sending provider turn", async () => {
410	const harness = await createHarness();	418	const harness = await createHarness();
411	const now = new Date().toISOString();	419	const now = "2026-01-01T00:00:00.000Z";
412		420
413	await Effect.runPromise(	421	await Effect.runPromise(
414	harness.engine.dispatch({	422	harness.engine.dispatch({
...	@@ -447,7 +455,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -447,7 +455,7 @@ describe("ProviderCommandReactor", () => {
447		455
448	it("generates a thread title on the first turn", async () => {	456	it("generates a thread title on the first turn", async () => {
449	const harness = await createHarness();	457	const harness = await createHarness();
450	const now = new Date().toISOString();	458	const now = "2026-01-01T00:00:00.000Z";
451	const seededTitle = "Please investigate reconnect failures after restar...";	459	const seededTitle = "Please investigate reconnect failures after restar...";
452	harness.generateThreadTitle.mockReturnValue(Effect.succeed({ title: "Generated title" }));	460	harness.generateThreadTitle.mockReturnValue(Effect.succeed({ title: "Generated title" }));
453		461
...	@@ -497,7 +505,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -497,7 +505,7 @@ describe("ProviderCommandReactor", () => {
497		505
498	it("does not overwrite an existing custom thread title on the first turn", async () => {	506	it("does not overwrite an existing custom thread title on the first turn", async () => {
499	const harness = await createHarness();	507	const harness = await createHarness();
500	const now = new Date().toISOString();	508	const now = "2026-01-01T00:00:00.000Z";
501	const seededTitle = "Please investigate reconnect failures after restar...";	509	const seededTitle = "Please investigate reconnect failures after restar...";
502		510
503	await Effect.runPromise(	511	await Effect.runPromise(
...	@@ -537,7 +545,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -537,7 +545,7 @@ describe("ProviderCommandReactor", () => {
537		545
538	it("matches the client-seeded title even when the outgoing prompt is reformatted", async () => {	546	it("matches the client-seeded title even when the outgoing prompt is reformatted", async () => {
539	const harness = await createHarness();	547	const harness = await createHarness();
540	const now = new Date().toISOString();	548	const now = "2026-01-01T00:00:00.000Z";
541	const seededTitle = "Fix reconnect spinner on resume";	549	const seededTitle = "Fix reconnect spinner on resume";
542	harness.generateThreadTitle.mockReturnValue(	550	harness.generateThreadTitle.mockReturnValue(
543	Effect.succeed({	551	Effect.succeed({
...	@@ -588,7 +596,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -588,7 +596,7 @@ describe("ProviderCommandReactor", () => {
588		596
589	it("generates a worktree branch name for the first turn", async () => {	597	it("generates a worktree branch name for the first turn", async () => {
590	const harness = await createHarness();	598	const harness = await createHarness();
591	const now = new Date().toISOString();	599	const now = "2026-01-01T00:00:00.000Z";
592		600
593	await Effect.runPromise(	601	await Effect.runPromise(
594	harness.engine.dispatch({	602	harness.engine.dispatch({
...	@@ -642,7 +650,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -642,7 +650,7 @@ describe("ProviderCommandReactor", () => {
642		650
643	it("forwards codex model options through session start and turn send", async () => {	651	it("forwards codex model options through session start and turn send", async () => {
644	const harness = await createHarness();	652	const harness = await createHarness();
645	const now = new Date().toISOString();	653	const now = "2026-01-01T00:00:00.000Z";
646		654
647	await Effect.runPromise(	655	await Effect.runPromise(
648	harness.engine.dispatch({	656	harness.engine.dispatch({
...	@@ -689,7 +697,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -689,7 +697,7 @@ describe("ProviderCommandReactor", () => {
689	model: "claude-sonnet-4-6",	697	model: "claude-sonnet-4-6",
690	},	698	},
691	});	699	});
692	const now = new Date().toISOString();	700	const now = "2026-01-01T00:00:00.000Z";
693		701
694	await Effect.runPromise(	702	await Effect.runPromise(
695	harness.engine.dispatch({	703	harness.engine.dispatch({
...	@@ -739,7 +747,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -739,7 +747,7 @@ describe("ProviderCommandReactor", () => {
739	model: "claude-opus-4-6",	747	model: "claude-opus-4-6",
740	},	748	},
741	});	749	});
742	const now = new Date().toISOString();	750	const now = "2026-01-01T00:00:00.000Z";
743		751
744	await Effect.runPromise(	752	await Effect.runPromise(
745	harness.engine.dispatch({	753	harness.engine.dispatch({
...	@@ -784,7 +792,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -784,7 +792,7 @@ describe("ProviderCommandReactor", () => {
784		792
785	it("forwards plan interaction mode to the provider turn request", async () => {	793	it("forwards plan interaction mode to the provider turn request", async () => {
786	const harness = await createHarness();	794	const harness = await createHarness();
787	const now = new Date().toISOString();	795	const now = "2026-01-01T00:00:00.000Z";
788		796
789	await Effect.runPromise(	797	await Effect.runPromise(
790	harness.engine.dispatch({	798	harness.engine.dispatch({
...	@@ -822,7 +830,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -822,7 +830,7 @@ describe("ProviderCommandReactor", () => {
822		830
823	it("preserves the active session model when in-session model switching is unsupported", async () => {	831	it("preserves the active session model when in-session model switching is unsupported", async () => {
824	const harness = await createHarness({ sessionModelSwitch: "unsupported" });	832	const harness = await createHarness({ sessionModelSwitch: "unsupported" });
825	const now = new Date().toISOString();	833	const now = "2026-01-01T00:00:00.000Z";
826		834
827	await Effect.runPromise(	835	await Effect.runPromise(
828	harness.engine.dispatch({	836	harness.engine.dispatch({
...	@@ -875,7 +883,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -875,7 +883,7 @@ describe("ProviderCommandReactor", () => {
875	const harness = await createHarness({	883	const harness = await createHarness({
876	threadModelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5-codex" },	884	threadModelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5-codex" },
877	});	885	});
878	const now = new Date().toISOString();	886	const now = "2026-01-01T00:00:00.000Z";
879		887
880	await Effect.runPromise(	888	await Effect.runPromise(
881	harness.engine.dispatch({	889	harness.engine.dispatch({
...	@@ -921,7 +929,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -921,7 +929,7 @@ describe("ProviderCommandReactor", () => {
921		929
922	it("reuses the same provider session when runtime mode is unchanged", async () => {	930	it("reuses the same provider session when runtime mode is unchanged", async () => {
923	const harness = await createHarness();	931	const harness = await createHarness();
924	const now = new Date().toISOString();	932	const now = "2026-01-01T00:00:00.000Z";
925		933
926	await Effect.runPromise(	934	await Effect.runPromise(
927	harness.engine.dispatch({	935	harness.engine.dispatch({
...	@@ -967,7 +975,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -967,7 +975,7 @@ describe("ProviderCommandReactor", () => {
967		975
968	it("restarts an existing Codex thread on a compatible requested instance", async () => {	976	it("restarts an existing Codex thread on a compatible requested instance", async () => {
969	const harness = await createHarness();	977	const harness = await createHarness();
970	const now = new Date().toISOString();	978	const now = "2026-01-01T00:00:00.000Z";
971		979
972	await Effect.runPromise(	980	await Effect.runPromise(
973	harness.engine.dispatch({	981	harness.engine.dispatch({
...	@@ -1009,7 +1017,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -1009,7 +1017,7 @@ describe("ProviderCommandReactor", () => {
1009	},	1017	},
1010	interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,	1018	interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
1011	runtimeMode: "approval-required",	1019	runtimeMode: "approval-required",
1012	createdAt: new Date().toISOString(),	1020	createdAt: "2026-01-01T00:00:00.000Z",
1013	}),	1021	}),
1014	);	1022	);
1015		1023
...	@@ -1034,7 +1042,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -1034,7 +1042,7 @@ describe("ProviderCommandReactor", () => {
1034	model: "claude-sonnet-4-6",	1042	model: "claude-sonnet-4-6",
1035	},	1043	},
1036	});	1044	});
1037	const now = new Date().toISOString();	1045	const now = "2026-01-01T00:00:00.000Z";
1038		1046
1039	await Effect.runPromise(	1047	await Effect.runPromise(
1040	harness.engine.dispatch({	1048	harness.engine.dispatch({
...	@@ -1107,7 +1115,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -1107,7 +1115,7 @@ describe("ProviderCommandReactor", () => {
1107	model: "claude-sonnet-4-6",	1115	model: "claude-sonnet-4-6",
1108	},	1116	},
1109	});	1117	});
1110	const now = new Date().toISOString();	1118	const now = "2026-01-01T00:00:00.000Z";
1111		1119
1112	await Effect.runPromise(	1120	await Effect.runPromise(
1113	harness.engine.dispatch({	1121	harness.engine.dispatch({
...	@@ -1170,7 +1178,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -1170,7 +1178,7 @@ describe("ProviderCommandReactor", () => {
1170		1178
1171	it("restarts the provider session when runtime mode is updated on the thread", async () => {	1179	it("restarts the provider session when runtime mode is updated on the thread", async () => {
1172	const harness = await createHarness();	1180	const harness = await createHarness();
1173	const now = new Date().toISOString();	1181	const now = "2026-01-01T00:00:00.000Z";
1174		1182
1175	await Effect.runPromise(	1183	await Effect.runPromise(
1176	harness.engine.dispatch({	1184	harness.engine.dispatch({
...	@@ -1260,7 +1268,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -1260,7 +1268,7 @@ describe("ProviderCommandReactor", () => {
1260	model: "claude-opus-4-6",	1268	model: "claude-opus-4-6",
1261	},	1269	},
1262	});	1270	});
1263	const now = new Date().toISOString();	1271	const now = "2026-01-01T00:00:00.000Z";
1264		1272
1265	await Effect.runPromise(	1273	await Effect.runPromise(
1266	harness.engine.dispatch({	1274	harness.engine.dispatch({
...	@@ -1303,7 +1311,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -1303,7 +1311,7 @@ describe("ProviderCommandReactor", () => {
1303		1311
1304	it("does not stop the active session when restart fails before rebind", async () => {	1312	it("does not stop the active session when restart fails before rebind", async () => {
1305	const harness = await createHarness();	1313	const harness = await createHarness();
1306	const now = new Date().toISOString();	1314	const now = "2026-01-01T00:00:00.000Z";
1307		1315
1308	await Effect.runPromise(	1316	await Effect.runPromise(
1309	harness.engine.dispatch({	1317	harness.engine.dispatch({
...	@@ -1336,7 +1344,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -1336,7 +1344,7 @@ describe("ProviderCommandReactor", () => {
1336	await waitFor(() => harness.sendTurn.mock.calls.length === 1);	1344	await waitFor(() => harness.sendTurn.mock.calls.length === 1);
1337		1345
1338	harness.startSession.mockImplementationOnce(	1346	harness.startSession.mockImplementationOnce(
1339	(_: unknown, __: unknown) => Effect.fail(new Error("simulated restart failure")) as never,	1347	(_: unknown, __: unknown) => Effect.fail("simulated restart failure") as never,
1340	);	1348	);
1341		1349
1342	await Effect.runPromise(	1350	await Effect.runPromise(
...	@@ -1368,7 +1376,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -1368,7 +1376,7 @@ describe("ProviderCommandReactor", () => {
1368		1376
1369	it("rejects provider changes after a thread is already bound to a session provider", async () => {	1377	it("rejects provider changes after a thread is already bound to a session provider", async () => {
1370	const harness = await createHarness();	1378	const harness = await createHarness();
1371	const now = new Date().toISOString();	1379	const now = "2026-01-01T00:00:00.000Z";
1372		1380
1373	await Effect.runPromise(	1381	await Effect.runPromise(
1374	harness.engine.dispatch({	1382	harness.engine.dispatch({
...	@@ -1440,7 +1448,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -1440,7 +1448,7 @@ describe("ProviderCommandReactor", () => {
1440		1448
1441	it("rejects cross-driver provider changes after the existing thread session has stopped", async () => {	1449	it("rejects cross-driver provider changes after the existing thread session has stopped", async () => {
1442	const harness = await createHarness();	1450	const harness = await createHarness();
1443	const now = new Date().toISOString();	1451	const now = "2026-01-01T00:00:00.000Z";
1444		1452
1445	await Effect.runPromise(	1453	await Effect.runPromise(
1446	harness.engine.dispatch({	1454	harness.engine.dispatch({
...	@@ -1506,7 +1514,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -1506,7 +1514,7 @@ describe("ProviderCommandReactor", () => {
1506		1514
1507	it("reacts to thread.turn.interrupt-requested by calling provider interrupt", async () => {	1515	it("reacts to thread.turn.interrupt-requested by calling provider interrupt", async () => {
1508	const harness = await createHarness();	1516	const harness = await createHarness();
1509	const now = new Date().toISOString();	1517	const now = "2026-01-01T00:00:00.000Z";
1510		1518
1511	await Effect.runPromise(	1519	await Effect.runPromise(
1512	harness.engine.dispatch({	1520	harness.engine.dispatch({
...	@@ -1544,7 +1552,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -1544,7 +1552,7 @@ describe("ProviderCommandReactor", () => {
1544		1552
1545	it("starts a fresh session when only projected session state exists", async () => {	1553	it("starts a fresh session when only projected session state exists", async () => {
1546	const harness = await createHarness();	1554	const harness = await createHarness();
1547	const now = new Date().toISOString();	1555	const now = "2026-01-01T00:00:00.000Z";
1548		1556
1549	await Effect.runPromise(	1557	await Effect.runPromise(
1550	harness.engine.dispatch({	1558	harness.engine.dispatch({
...	@@ -1599,7 +1607,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -1599,7 +1607,7 @@ describe("ProviderCommandReactor", () => {
1599		1607
1600	it("rejects active runtime sessions that are missing provider instance ids", async () => {	1608	it("rejects active runtime sessions that are missing provider instance ids", async () => {
1601	const harness = await createHarness();	1609	const harness = await createHarness();
1602	const now = new Date().toISOString();	1610	const now = "2026-01-01T00:00:00.000Z";
1603		1611
1604	await Effect.runPromise(	1612	await Effect.runPromise(
1605	harness.engine.dispatch({	1613	harness.engine.dispatch({
...	@@ -1670,7 +1678,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -1670,7 +1678,7 @@ describe("ProviderCommandReactor", () => {
1670		1678
1671	it("reacts to thread.approval.respond by forwarding provider approval response", async () => {	1679	it("reacts to thread.approval.respond by forwarding provider approval response", async () => {
1672	const harness = await createHarness();	1680	const harness = await createHarness();
1673	const now = new Date().toISOString();	1681	const now = "2026-01-01T00:00:00.000Z";
1674		1682
1675	await Effect.runPromise(	1683	await Effect.runPromise(
1676	harness.engine.dispatch({	1684	harness.engine.dispatch({
...	@@ -1711,7 +1719,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -1711,7 +1719,7 @@ describe("ProviderCommandReactor", () => {
1711		1719
1712	it("reacts to thread.user-input.respond by forwarding structured user input answers", async () => {	1720	it("reacts to thread.user-input.respond by forwarding structured user input answers", async () => {
1713	const harness = await createHarness();	1721	const harness = await createHarness();
1714	const now = new Date().toISOString();	1722	const now = "2026-01-01T00:00:00.000Z";
1715		1723
1716	await Effect.runPromise(	1724	await Effect.runPromise(
1717	harness.engine.dispatch({	1725	harness.engine.dispatch({
...	@@ -1756,7 +1764,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -1756,7 +1764,7 @@ describe("ProviderCommandReactor", () => {
1756		1764
1757	it("surfaces stale provider approval request failures without faking approval resolution", async () => {	1765	it("surfaces stale provider approval request failures without faking approval resolution", async () => {
1758	const harness = await createHarness();	1766	const harness = await createHarness();
1759	const now = new Date().toISOString();	1767	const now = "2026-01-01T00:00:00.000Z";
1760	harness.respondToRequest.mockImplementation(() =>	1768	harness.respondToRequest.mockImplementation(() =>
1761	Effect.fail(	1769	Effect.fail(
1762	new ProviderAdapterRequestError({	1770	new ProviderAdapterRequestError({
...	@@ -1851,7 +1859,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -1851,7 +1859,7 @@ describe("ProviderCommandReactor", () => {
1851		1859
1852	it("surfaces stale provider user-input failures without faking user-input resolution", async () => {	1860	it("surfaces stale provider user-input failures without faking user-input resolution", async () => {
1853	const harness = await createHarness();	1861	const harness = await createHarness();
1854	const now = new Date().toISOString();	1862	const now = "2026-01-01T00:00:00.000Z";
1855	harness.respondToUserInput.mockImplementation(() =>	1863	harness.respondToUserInput.mockImplementation(() =>
1856	Effect.fail(	1864	Effect.fail(
1857	new ProviderAdapterRequestError({	1865	new ProviderAdapterRequestError({
...	@@ -1960,7 +1968,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -1960,7 +1968,7 @@ describe("ProviderCommandReactor", () => {
1960		1968
1961	it("reacts to thread.session.stop by stopping provider session and clearing thread session state", async () => {	1969	it("reacts to thread.session.stop by stopping provider session and clearing thread session state", async () => {
1962	const harness = await createHarness();	1970	const harness = await createHarness();
1963	const now = new Date().toISOString();	1971	const now = "2026-01-01T00:00:00.000Z";
1964		1972
1965	await Effect.runPromise(	1973	await Effect.runPromise(
1966	harness.engine.dispatch({	1974	harness.engine.dispatch({

apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+9-1

...	@@ -13,7 +13,15 @@ import {	...	@@ -13,7 +13,15 @@ import {
13	type TurnId,	13	type TurnId,
14	} from "@t3tools/contracts";	14	} from "@t3tools/contracts";
15	import { isTemporaryWorktreeBranch, WORKTREE_BRANCH_PREFIX } from "@t3tools/shared/git";	15	import { isTemporaryWorktreeBranch, WORKTREE_BRANCH_PREFIX } from "@t3tools/shared/git";
16	import { Cache, Cause, Duration, Effect, Equal, Layer, Option, Schema, Stream } from "effect";	16	import * as Cache from "effect/Cache";
		17	import * as Cause from "effect/Cause";
		18	import * as Duration from "effect/Duration";
		19	import * as Effect from "effect/Effect";
		20	import * as Equal from "effect/Equal";
		21	import * as Layer from "effect/Layer";
		22	import * as Option from "effect/Option";
		23	import * as Schema from "effect/Schema";
		24	import * as Stream from "effect/Stream";
17	import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";	25	import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
18		26
19	import { resolveThreadWorkspaceCwd } from "../../checkpointing/Utils.ts";	27	import { resolveThreadWorkspaceCwd } from "../../checkpointing/Utils.ts";

apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts+69-61

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import fs from "node:fs";	2	import fs from "node:fs";
2	import os from "node:os";	3	import os from "node:os";
3	import path from "node:path";	4	import path from "node:path";
...	@@ -21,7 +22,14 @@ import {	...	@@ -21,7 +22,14 @@ import {
21	ThreadId,	22	ThreadId,
22	TurnId,	23	TurnId,
23	} from "@t3tools/contracts";	24	} from "@t3tools/contracts";
24	import { Effect, Exit, Layer, ManagedRuntime, PubSub, Scope, Stream } from "effect";	25	import * as Clock from "effect/Clock";
		26	import * as Effect from "effect/Effect";
		27	import * as Exit from "effect/Exit";
		28	import * as Layer from "effect/Layer";
		29	import * as ManagedRuntime from "effect/ManagedRuntime";
		30	import * as PubSub from "effect/PubSub";
		31	import * as Scope from "effect/Scope";
		32	import * as Stream from "effect/Stream";
25	import { afterEach, describe, expect, it } from "vitest";	33	import { afterEach, describe, expect, it } from "vitest";
26		34
27	import { OrchestrationEventStoreLive } from "../../persistence/Layers/OrchestrationEventStore.ts";	35	import { OrchestrationEventStoreLive } from "../../persistence/Layers/OrchestrationEventStore.ts";
...	@@ -165,17 +173,17 @@ async function waitForThread(	...	@@ -165,17 +173,17 @@ async function waitForThread(
165	timeoutMs = 2000,	173	timeoutMs = 2000,
166	threadId: ThreadId = asThreadId("thread-1"),	174	threadId: ThreadId = asThreadId("thread-1"),
167	) {	175	) {
168	const deadline = Date.now() + timeoutMs;	176	const deadline = (await Effect.runPromise(Clock.currentTimeMillis)) + timeoutMs;
169	const poll = async (): Promise<ProviderRuntimeTestThread> => {	177	const poll = async (): Promise<ProviderRuntimeTestThread> => {
170	const snapshot = await readModel();	178	const snapshot = await readModel();
171	const thread = snapshot.threads.find((entry) => entry.id === threadId);	179	const thread = snapshot.threads.find((entry) => entry.id === threadId);
172	if (thread && predicate(thread)) {	180	if (thread && predicate(thread)) {
173	return thread;	181	return thread;
174	}	182	}
175	if (Date.now() >= deadline) {	183	if ((await Effect.runPromise(Clock.currentTimeMillis)) >= deadline) {
176	throw new Error("Timed out waiting for thread state");	184	throw new Error("Timed out waiting for thread state");
177	}	185	}
178	await new Promise((resolve) => setTimeout(resolve, 10));	186	await Effect.runPromise(Effect.yieldNow);
179	return poll();	187	return poll();
180	};	188	};
181	return poll();	189	return poll();
...	@@ -242,7 +250,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -242,7 +250,7 @@ describe("ProviderRuntimeIngestion", () => {
242	await Effect.runPromise(ingestion.start().pipe(Scope.provide(scope)));	250	await Effect.runPromise(ingestion.start().pipe(Scope.provide(scope)));
243	const drain = () => Effect.runPromise(ingestion.drain);	251	const drain = () => Effect.runPromise(ingestion.drain);
244		252
245	const createdAt = new Date().toISOString();	253	const createdAt = "2026-01-01T00:00:00.000Z";
246	await Effect.runPromise(	254	await Effect.runPromise(
247	engine.dispatch({	255	engine.dispatch({
248	type: "project.create",	256	type: "project.create",
...	@@ -312,7 +320,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -312,7 +320,7 @@ describe("ProviderRuntimeIngestion", () => {
312		320
313	it("maps turn started/completed events into thread session updates", async () => {	321	it("maps turn started/completed events into thread session updates", async () => {
314	const harness = await createHarness();	322	const harness = await createHarness();
315	const now = new Date().toISOString();	323	const now = "2026-01-01T00:00:00.000Z";
316		324
317	harness.emit({	325	harness.emit({
318	type: "turn.started",	326	type: "turn.started",
...	@@ -333,7 +341,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -333,7 +341,7 @@ describe("ProviderRuntimeIngestion", () => {
333	eventId: asEventId("evt-turn-completed"),	341	eventId: asEventId("evt-turn-completed"),
334	provider: ProviderDriverKind.make("codex"),	342	provider: ProviderDriverKind.make("codex"),
335	threadId: asThreadId("thread-1"),	343	threadId: asThreadId("thread-1"),
336	createdAt: new Date().toISOString(),	344	createdAt: "2026-01-01T00:00:00.000Z",
337	turnId: asTurnId("turn-1"),	345	turnId: asTurnId("turn-1"),
338	payload: {	346	payload: {
339	state: "failed",	347	state: "failed",
...	@@ -354,7 +362,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -354,7 +362,7 @@ describe("ProviderRuntimeIngestion", () => {
354		362
355	it("applies provider session.state.changed transitions directly", async () => {	363	it("applies provider session.state.changed transitions directly", async () => {
356	const harness = await createHarness();	364	const harness = await createHarness();
357	const waitingAt = new Date().toISOString();	365	const waitingAt = "2026-01-01T00:00:00.000Z";
358		366
359	harness.emit({	367	harness.emit({
360	type: "session.state.changed",	368	type: "session.state.changed",
...	@@ -380,7 +388,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -380,7 +388,7 @@ describe("ProviderRuntimeIngestion", () => {
380	eventId: asEventId("evt-session-state-error"),	388	eventId: asEventId("evt-session-state-error"),
381	provider: ProviderDriverKind.make("codex"),	389	provider: ProviderDriverKind.make("codex"),
382	threadId: asThreadId("thread-1"),	390	threadId: asThreadId("thread-1"),
383	createdAt: new Date().toISOString(),	391	createdAt: "2026-01-01T00:00:00.000Z",
384	payload: {	392	payload: {
385	state: "error",	393	state: "error",
386	reason: "provider crashed",	394	reason: "provider crashed",
...	@@ -402,7 +410,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -402,7 +410,7 @@ describe("ProviderRuntimeIngestion", () => {
402	eventId: asEventId("evt-session-state-stopped"),	410	eventId: asEventId("evt-session-state-stopped"),
403	provider: ProviderDriverKind.make("codex"),	411	provider: ProviderDriverKind.make("codex"),
404	threadId: asThreadId("thread-1"),	412	threadId: asThreadId("thread-1"),
405	createdAt: new Date().toISOString(),	413	createdAt: "2026-01-01T00:00:00.000Z",
406	payload: {	414	payload: {
407	state: "stopped",	415	state: "stopped",
408	},	416	},
...	@@ -423,7 +431,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -423,7 +431,7 @@ describe("ProviderRuntimeIngestion", () => {
423	eventId: asEventId("evt-session-state-ready"),	431	eventId: asEventId("evt-session-state-ready"),
424	provider: ProviderDriverKind.make("codex"),	432	provider: ProviderDriverKind.make("codex"),
425	threadId: asThreadId("thread-1"),	433	threadId: asThreadId("thread-1"),
426	createdAt: new Date().toISOString(),	434	createdAt: "2026-01-01T00:00:00.000Z",
427	payload: {	435	payload: {
428	state: "ready",	436	state: "ready",
429	},	437	},
...	@@ -442,7 +450,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -442,7 +450,7 @@ describe("ProviderRuntimeIngestion", () => {
442		450
443	it("does not clear active turn when session/thread started arrives mid-turn", async () => {	451	it("does not clear active turn when session/thread started arrives mid-turn", async () => {
444	const harness = await createHarness();	452	const harness = await createHarness();
445	const now = new Date().toISOString();	453	const now = "2026-01-01T00:00:00.000Z";
446		454
447	harness.emit({	455	harness.emit({
448	type: "turn.started",	456	type: "turn.started",
...	@@ -464,14 +472,14 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -464,14 +472,14 @@ describe("ProviderRuntimeIngestion", () => {
464	type: "thread.started",	472	type: "thread.started",
465	eventId: asEventId("evt-thread-started-midturn-lifecycle"),	473	eventId: asEventId("evt-thread-started-midturn-lifecycle"),
466	provider: ProviderDriverKind.make("codex"),	474	provider: ProviderDriverKind.make("codex"),
467	createdAt: new Date().toISOString(),	475	createdAt: "2026-01-01T00:00:00.000Z",
468	threadId: asThreadId("thread-1"),	476	threadId: asThreadId("thread-1"),
469	});	477	});
470	harness.emit({	478	harness.emit({
471	type: "session.started",	479	type: "session.started",
472	eventId: asEventId("evt-session-started-midturn-lifecycle"),	480	eventId: asEventId("evt-session-started-midturn-lifecycle"),
473	provider: ProviderDriverKind.make("codex"),	481	provider: ProviderDriverKind.make("codex"),
474	createdAt: new Date().toISOString(),	482	createdAt: "2026-01-01T00:00:00.000Z",
475	threadId: asThreadId("thread-1"),	483	threadId: asThreadId("thread-1"),
476	});	484	});
477		485
...	@@ -485,7 +493,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -485,7 +493,7 @@ describe("ProviderRuntimeIngestion", () => {
485	type: "turn.completed",	493	type: "turn.completed",
486	eventId: asEventId("evt-turn-completed-midturn-lifecycle"),	494	eventId: asEventId("evt-turn-completed-midturn-lifecycle"),
487	provider: ProviderDriverKind.make("codex"),	495	provider: ProviderDriverKind.make("codex"),
488	createdAt: new Date().toISOString(),	496	createdAt: "2026-01-01T00:00:00.000Z",
489	threadId: asThreadId("thread-1"),	497	threadId: asThreadId("thread-1"),
490	turnId: asTurnId("turn-midturn-lifecycle"),	498	turnId: asTurnId("turn-midturn-lifecycle"),
491	status: "completed",	499	status: "completed",
...	@@ -499,7 +507,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -499,7 +507,7 @@ describe("ProviderRuntimeIngestion", () => {
499		507
500	it("accepts claude turn lifecycle when seeded thread id is a synthetic placeholder", async () => {	508	it("accepts claude turn lifecycle when seeded thread id is a synthetic placeholder", async () => {
501	const harness = await createHarness();	509	const harness = await createHarness();
502	const seededAt = new Date().toISOString();	510	const seededAt = "2026-01-01T00:00:00.000Z";
503		511
504	await Effect.runPromise(	512	await Effect.runPromise(
505	harness.engine.dispatch({	513	harness.engine.dispatch({
...	@@ -523,7 +531,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -523,7 +531,7 @@ describe("ProviderRuntimeIngestion", () => {
523	type: "turn.started",	531	type: "turn.started",
524	eventId: asEventId("evt-turn-started-claude-placeholder"),	532	eventId: asEventId("evt-turn-started-claude-placeholder"),
525	provider: ProviderDriverKind.make("claudeAgent"),	533	provider: ProviderDriverKind.make("claudeAgent"),
526	createdAt: new Date().toISOString(),	534	createdAt: "2026-01-01T00:00:00.000Z",
527	threadId: asThreadId("thread-1"),	535	threadId: asThreadId("thread-1"),
528	turnId: asTurnId("turn-claude-placeholder"),	536	turnId: asTurnId("turn-claude-placeholder"),
529	});	537	});
...	@@ -539,7 +547,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -539,7 +547,7 @@ describe("ProviderRuntimeIngestion", () => {
539	type: "turn.completed",	547	type: "turn.completed",
540	eventId: asEventId("evt-turn-completed-claude-placeholder"),	548	eventId: asEventId("evt-turn-completed-claude-placeholder"),
541	provider: ProviderDriverKind.make("claudeAgent"),	549	provider: ProviderDriverKind.make("claudeAgent"),
542	createdAt: new Date().toISOString(),	550	createdAt: "2026-01-01T00:00:00.000Z",
543	threadId: asThreadId("thread-1"),	551	threadId: asThreadId("thread-1"),
544	turnId: asTurnId("turn-claude-placeholder"),	552	turnId: asTurnId("turn-claude-placeholder"),
545	status: "completed",	553	status: "completed",
...	@@ -553,7 +561,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -553,7 +561,7 @@ describe("ProviderRuntimeIngestion", () => {
553		561
554	it("ignores auxiliary turn completions from a different provider thread", async () => {	562	it("ignores auxiliary turn completions from a different provider thread", async () => {
555	const harness = await createHarness();	563	const harness = await createHarness();
556	const now = new Date().toISOString();	564	const now = "2026-01-01T00:00:00.000Z";
557		565
558	harness.emit({	566	harness.emit({
559	type: "turn.started",	567	type: "turn.started",
...	@@ -574,7 +582,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -574,7 +582,7 @@ describe("ProviderRuntimeIngestion", () => {
574	type: "turn.completed",	582	type: "turn.completed",
575	eventId: asEventId("evt-turn-completed-aux"),	583	eventId: asEventId("evt-turn-completed-aux"),
576	provider: ProviderDriverKind.make("codex"),	584	provider: ProviderDriverKind.make("codex"),
577	createdAt: new Date().toISOString(),	585	createdAt: "2026-01-01T00:00:00.000Z",
578	threadId: asThreadId("thread-1"),	586	threadId: asThreadId("thread-1"),
579	turnId: asTurnId("turn-aux"),	587	turnId: asTurnId("turn-aux"),
580	status: "completed",	588	status: "completed",
...	@@ -590,7 +598,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -590,7 +598,7 @@ describe("ProviderRuntimeIngestion", () => {
590	type: "turn.completed",	598	type: "turn.completed",
591	eventId: asEventId("evt-turn-completed-primary"),	599	eventId: asEventId("evt-turn-completed-primary"),
592	provider: ProviderDriverKind.make("codex"),	600	provider: ProviderDriverKind.make("codex"),
593	createdAt: new Date().toISOString(),	601	createdAt: "2026-01-01T00:00:00.000Z",
594	threadId: asThreadId("thread-1"),	602	threadId: asThreadId("thread-1"),
595	turnId: asTurnId("turn-primary"),	603	turnId: asTurnId("turn-primary"),
596	status: "completed",	604	status: "completed",
...	@@ -604,7 +612,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -604,7 +612,7 @@ describe("ProviderRuntimeIngestion", () => {
604		612
605	it("ignores non-active turn completion when runtime omits thread id", async () => {	613	it("ignores non-active turn completion when runtime omits thread id", async () => {
606	const harness = await createHarness();	614	const harness = await createHarness();
607	const now = new Date().toISOString();	615	const now = "2026-01-01T00:00:00.000Z";
608		616
609	harness.emit({	617	harness.emit({
610	type: "turn.started",	618	type: "turn.started",
...	@@ -626,7 +634,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -626,7 +634,7 @@ describe("ProviderRuntimeIngestion", () => {
626	type: "turn.completed",	634	type: "turn.completed",
627	eventId: asEventId("evt-turn-completed-guarded-other"),	635	eventId: asEventId("evt-turn-completed-guarded-other"),
628	provider: ProviderDriverKind.make("codex"),	636	provider: ProviderDriverKind.make("codex"),
629	createdAt: new Date().toISOString(),	637	createdAt: "2026-01-01T00:00:00.000Z",
630	threadId: asThreadId("thread-1"),	638	threadId: asThreadId("thread-1"),
631	turnId: asTurnId("turn-guarded-other"),	639	turnId: asTurnId("turn-guarded-other"),
632	status: "completed",	640	status: "completed",
...	@@ -642,7 +650,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -642,7 +650,7 @@ describe("ProviderRuntimeIngestion", () => {
642	type: "turn.completed",	650	type: "turn.completed",
643	eventId: asEventId("evt-turn-completed-guarded-main"),	651	eventId: asEventId("evt-turn-completed-guarded-main"),
644	provider: ProviderDriverKind.make("codex"),	652	provider: ProviderDriverKind.make("codex"),
645	createdAt: new Date().toISOString(),	653	createdAt: "2026-01-01T00:00:00.000Z",
646	threadId: asThreadId("thread-1"),	654	threadId: asThreadId("thread-1"),
647	turnId: asTurnId("turn-guarded-main"),	655	turnId: asTurnId("turn-guarded-main"),
648	status: "completed",	656	status: "completed",
...	@@ -656,7 +664,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -656,7 +664,7 @@ describe("ProviderRuntimeIngestion", () => {
656		664
657	it("maps canonical content delta/item completed into finalized assistant messages", async () => {	665	it("maps canonical content delta/item completed into finalized assistant messages", async () => {
658	const harness = await createHarness();	666	const harness = await createHarness();
659	const now = new Date().toISOString();	667	const now = "2026-01-01T00:00:00.000Z";
660		668
661	harness.emit({	669	harness.emit({
662	type: "content.delta",	670	type: "content.delta",
...	@@ -713,7 +721,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -713,7 +721,7 @@ describe("ProviderRuntimeIngestion", () => {
713		721
714	it("uses assistant item completion detail when no assistant deltas were streamed", async () => {	722	it("uses assistant item completion detail when no assistant deltas were streamed", async () => {
715	const harness = await createHarness();	723	const harness = await createHarness();
716	const now = new Date().toISOString();	724	const now = "2026-01-01T00:00:00.000Z";
717		725
718	harness.emit({	726	harness.emit({
719	type: "item.completed",	727	type: "item.completed",
...	@@ -745,7 +753,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -745,7 +753,7 @@ describe("ProviderRuntimeIngestion", () => {
745		753
746	it("preserves completed tool metadata on projected tool activities", async () => {	754	it("preserves completed tool metadata on projected tool activities", async () => {
747	const harness = await createHarness();	755	const harness = await createHarness();
748	const now = new Date().toISOString();	756	const now = "2026-01-01T00:00:00.000Z";
749		757
750	harness.emit({	758	harness.emit({
751	type: "item.completed",	759	type: "item.completed",
...	@@ -801,7 +809,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -801,7 +809,7 @@ describe("ProviderRuntimeIngestion", () => {
801		809
802	it("normalizes command execution activities to ran-command summaries", async () => {	810	it("normalizes command execution activities to ran-command summaries", async () => {
803	const harness = await createHarness();	811	const harness = await createHarness();
804	const now = new Date().toISOString();	812	const now = "2026-01-01T00:00:00.000Z";
805		813
806	harness.emit({	814	harness.emit({
807	type: "item.completed",	815	type: "item.completed",
...	@@ -843,7 +851,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -843,7 +851,7 @@ describe("ProviderRuntimeIngestion", () => {
843		851
844	it("uses structured read-file paths when available", async () => {	852	it("uses structured read-file paths when available", async () => {
845	const harness = await createHarness();	853	const harness = await createHarness();
846	const now = new Date().toISOString();	854	const now = "2026-01-01T00:00:00.000Z";
847		855
848	harness.emit({	856	harness.emit({
849	type: "item.completed",	857	type: "item.completed",
...	@@ -885,7 +893,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -885,7 +893,7 @@ describe("ProviderRuntimeIngestion", () => {
885		893
886	it("projects completed plan items into first-class proposed plans", async () => {	894	it("projects completed plan items into first-class proposed plans", async () => {
887	const harness = await createHarness();	895	const harness = await createHarness();
888	const now = new Date().toISOString();	896	const now = "2026-01-01T00:00:00.000Z";
889		897
890	harness.emit({	898	harness.emit({
891	type: "turn.proposed.completed",	899	type: "turn.proposed.completed",
...	@@ -919,7 +927,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -919,7 +927,7 @@ describe("ProviderRuntimeIngestion", () => {
919	const targetThreadId = asThreadId("thread-implement");	927	const targetThreadId = asThreadId("thread-implement");
920	const sourceTurnId = asTurnId("turn-plan-source");	928	const sourceTurnId = asTurnId("turn-plan-source");
921	const targetTurnId = asTurnId("turn-plan-implement");	929	const targetTurnId = asTurnId("turn-plan-implement");
922	const createdAt = new Date().toISOString();	930	const createdAt = "2026-01-01T00:00:00.000Z";
923		931
924	await Effect.runPromise(	932	await Effect.runPromise(
925	harness.engine.dispatch({	933	harness.engine.dispatch({
...	@@ -1050,7 +1058,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -1050,7 +1058,7 @@ describe("ProviderRuntimeIngestion", () => {
1050	},	1058	},
1051	interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,	1059	interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
1052	runtimeMode: "approval-required",	1060	runtimeMode: "approval-required",
1053	createdAt: new Date().toISOString(),	1061	createdAt: "2026-01-01T00:00:00.000Z",
1054	}),	1062	}),
1055	);	1063	);
1056		1064
...	@@ -1075,7 +1083,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -1075,7 +1083,7 @@ describe("ProviderRuntimeIngestion", () => {
1075	type: "turn.started",	1083	type: "turn.started",
1076	eventId: asEventId("evt-plan-target-started"),	1084	eventId: asEventId("evt-plan-target-started"),
1077	provider: ProviderDriverKind.make("codex"),	1085	provider: ProviderDriverKind.make("codex"),
1078	createdAt: new Date().toISOString(),	1086	createdAt: "2026-01-01T00:00:00.000Z",
1079	threadId: targetThreadId,	1087	threadId: targetThreadId,
1080	turnId: targetTurnId,	1088	turnId: targetTurnId,
1081	});	1089	});
...	@@ -1106,7 +1114,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -1106,7 +1114,7 @@ describe("ProviderRuntimeIngestion", () => {
1106	const sourceTurnId = asTurnId("turn-plan-source");	1114	const sourceTurnId = asTurnId("turn-plan-source");
1107	const activeTurnId = asTurnId("turn-already-running");	1115	const activeTurnId = asTurnId("turn-already-running");
1108	const staleTurnId = asTurnId("turn-stale-start");	1116	const staleTurnId = asTurnId("turn-stale-start");
1109	const createdAt = new Date().toISOString();	1117	const createdAt = "2026-01-01T00:00:00.000Z";
1110		1118
1111	await Effect.runPromise(	1119	await Effect.runPromise(
1112	harness.engine.dispatch({	1120	harness.engine.dispatch({
...	@@ -1219,7 +1227,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -1219,7 +1227,7 @@ describe("ProviderRuntimeIngestion", () => {
1219	},	1227	},
1220	interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,	1228	interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
1221	runtimeMode: "approval-required",	1229	runtimeMode: "approval-required",
1222	createdAt: new Date().toISOString(),	1230	createdAt: "2026-01-01T00:00:00.000Z",
1223	}),	1231	}),
1224	);	1232	);
1225		1233
...	@@ -1227,7 +1235,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -1227,7 +1235,7 @@ describe("ProviderRuntimeIngestion", () => {
1227	type: "turn.started",	1235	type: "turn.started",
1228	eventId: asEventId("evt-turn-started-stale-plan-implementation"),	1236	eventId: asEventId("evt-turn-started-stale-plan-implementation"),
1229	provider: ProviderDriverKind.make("codex"),	1237	provider: ProviderDriverKind.make("codex"),
1230	createdAt: new Date().toISOString(),	1238	createdAt: "2026-01-01T00:00:00.000Z",
1231	threadId: targetThreadId,	1239	threadId: targetThreadId,
1232	turnId: staleTurnId,	1240	turnId: staleTurnId,
1233	});	1241	});
...	@@ -1259,7 +1267,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -1259,7 +1267,7 @@ describe("ProviderRuntimeIngestion", () => {
1259	const sourceTurnId = asTurnId("turn-plan-source");	1267	const sourceTurnId = asTurnId("turn-plan-source");
1260	const expectedTurnId = asTurnId("turn-plan-implement");	1268	const expectedTurnId = asTurnId("turn-plan-implement");
1261	const replayedTurnId = asTurnId("turn-replayed");	1269	const replayedTurnId = asTurnId("turn-replayed");
1262	const createdAt = new Date().toISOString();	1270	const createdAt = "2026-01-01T00:00:00.000Z";
1263		1271
1264	await Effect.runPromise(	1272	await Effect.runPromise(
1265	harness.engine.dispatch({	1273	harness.engine.dispatch({
...	@@ -1381,7 +1389,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -1381,7 +1389,7 @@ describe("ProviderRuntimeIngestion", () => {
1381	},	1389	},
1382	interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,	1390	interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
1383	runtimeMode: "approval-required",	1391	runtimeMode: "approval-required",
1384	createdAt: new Date().toISOString(),	1392	createdAt: "2026-01-01T00:00:00.000Z",
1385	}),	1393	}),
1386	);	1394	);
1387		1395
...	@@ -1399,7 +1407,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -1399,7 +1407,7 @@ describe("ProviderRuntimeIngestion", () => {
1399	type: "turn.started",	1407	type: "turn.started",
1400	eventId: asEventId("evt-turn-started-unrelated-plan-implementation"),	1408	eventId: asEventId("evt-turn-started-unrelated-plan-implementation"),
1401	provider: ProviderDriverKind.make("codex"),	1409	provider: ProviderDriverKind.make("codex"),
1402	createdAt: new Date().toISOString(),	1410	createdAt: "2026-01-01T00:00:00.000Z",
1403	threadId: targetThreadId,	1411	threadId: targetThreadId,
1404	turnId: replayedTurnId,	1412	turnId: replayedTurnId,
1405	});	1413	});
...	@@ -1420,7 +1428,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -1420,7 +1428,7 @@ describe("ProviderRuntimeIngestion", () => {
1420		1428
1421	it("finalizes buffered proposed-plan deltas into a first-class proposed plan on turn completion", async () => {	1429	it("finalizes buffered proposed-plan deltas into a first-class proposed plan on turn completion", async () => {
1422	const harness = await createHarness();	1430	const harness = await createHarness();
1423	const now = new Date().toISOString();	1431	const now = "2026-01-01T00:00:00.000Z";
1424		1432
1425	harness.emit({	1433	harness.emit({
1426	type: "turn.started",	1434	type: "turn.started",
...	@@ -1486,7 +1494,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -1486,7 +1494,7 @@ describe("ProviderRuntimeIngestion", () => {
1486		1494
1487	it("buffers assistant deltas by default until completion", async () => {	1495	it("buffers assistant deltas by default until completion", async () => {
1488	const harness = await createHarness();	1496	const harness = await createHarness();
1489	const now = new Date().toISOString();	1497	const now = "2026-01-01T00:00:00.000Z";
1490		1498
1491	harness.emit({	1499	harness.emit({
1492	type: "turn.started",	1500	type: "turn.started",
...	@@ -1554,7 +1562,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -1554,7 +1562,7 @@ describe("ProviderRuntimeIngestion", () => {
1554		1562
1555	it("flushes and completes buffered assistant text when an approval request opens", async () => {	1563	it("flushes and completes buffered assistant text when an approval request opens", async () => {
1556	const harness = await createHarness();	1564	const harness = await createHarness();
1557	const now = new Date().toISOString();	1565	const now = "2026-01-01T00:00:00.000Z";
1558		1566
1559	harness.emit({	1567	harness.emit({
1560	type: "turn.started",	1568	type: "turn.started",
...	@@ -1614,7 +1622,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -1614,7 +1622,7 @@ describe("ProviderRuntimeIngestion", () => {
1614		1622
1615	it("flushes and completes buffered assistant text when user input is requested", async () => {	1623	it("flushes and completes buffered assistant text when user input is requested", async () => {
1616	const harness = await createHarness();	1624	const harness = await createHarness();
1617	const now = new Date().toISOString();	1625	const now = "2026-01-01T00:00:00.000Z";
1618		1626
1619	harness.emit({	1627	harness.emit({
1620	type: "turn.started",	1628	type: "turn.started",
...	@@ -1980,7 +1988,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -1980,7 +1988,7 @@ describe("ProviderRuntimeIngestion", () => {
1980		1988
1981	it("streams assistant deltas when thread.turn.start requests streaming mode", async () => {	1989	it("streams assistant deltas when thread.turn.start requests streaming mode", async () => {
1982	const harness = await createHarness({ serverSettings: { enableAssistantStreaming: true } });	1990	const harness = await createHarness({ serverSettings: { enableAssistantStreaming: true } });
1983	const now = new Date().toISOString();	1991	const now = "2026-01-01T00:00:00.000Z";
1984		1992
1985	await Effect.runPromise(	1993	await Effect.runPromise(
1986	harness.engine.dispatch({	1994	harness.engine.dispatch({
...	@@ -2072,7 +2080,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -2072,7 +2080,7 @@ describe("ProviderRuntimeIngestion", () => {
2072		2080
2073	it("spills oversized buffered deltas and still finalizes full assistant text", async () => {	2081	it("spills oversized buffered deltas and still finalizes full assistant text", async () => {
2074	const harness = await createHarness();	2082	const harness = await createHarness();
2075	const now = new Date().toISOString();	2083	const now = "2026-01-01T00:00:00.000Z";
2076	const oversizedText = "x".repeat(40_000);	2084	const oversizedText = "x".repeat(40_000);
2077		2085
2078	harness.emit({	2086	harness.emit({
...	@@ -2133,7 +2141,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -2133,7 +2141,7 @@ describe("ProviderRuntimeIngestion", () => {
2133		2141
2134	it("does not duplicate assistant completion when item.completed is followed by turn.completed", async () => {	2142	it("does not duplicate assistant completion when item.completed is followed by turn.completed", async () => {
2135	const harness = await createHarness();	2143	const harness = await createHarness();
2136	const now = new Date().toISOString();	2144	const now = "2026-01-01T00:00:00.000Z";
2137		2145
2138	harness.emit({	2146	harness.emit({
2139	type: "turn.started",	2147	type: "turn.started",
...	@@ -2219,7 +2227,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -2219,7 +2227,7 @@ describe("ProviderRuntimeIngestion", () => {
2219		2227
2220	it("maps canonical request events into approval activities with requestKind", async () => {	2228	it("maps canonical request events into approval activities with requestKind", async () => {
2221	const harness = await createHarness();	2229	const harness = await createHarness();
2222	const now = new Date().toISOString();	2230	const now = "2026-01-01T00:00:00.000Z";
2223		2231
2224	harness.emit({	2232	harness.emit({
2225	type: "request.opened",	2233	type: "request.opened",
...	@@ -2285,7 +2293,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -2285,7 +2293,7 @@ describe("ProviderRuntimeIngestion", () => {
2285		2293
2286	it("maps runtime.error into errored session state", async () => {	2294	it("maps runtime.error into errored session state", async () => {
2287	const harness = await createHarness();	2295	const harness = await createHarness();
2288	const now = new Date().toISOString();	2296	const now = "2026-01-01T00:00:00.000Z";
2289		2297
2290	harness.emit({	2298	harness.emit({
2291	type: "runtime.error",	2299	type: "runtime.error",
...	@@ -2312,7 +2320,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -2312,7 +2320,7 @@ describe("ProviderRuntimeIngestion", () => {
2312		2320
2313	it("records runtime.error activities from the typed payload message", async () => {	2321	it("records runtime.error activities from the typed payload message", async () => {
2314	const harness = await createHarness();	2322	const harness = await createHarness();
2315	const now = new Date().toISOString();	2323	const now = "2026-01-01T00:00:00.000Z";
2316		2324
2317	harness.emit({	2325	harness.emit({
2318	type: "runtime.error",	2326	type: "runtime.error",
...	@@ -2343,7 +2351,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -2343,7 +2351,7 @@ describe("ProviderRuntimeIngestion", () => {
2343		2351
2344	it("keeps the session running when a runtime.warning arrives during an active turn", async () => {	2352	it("keeps the session running when a runtime.warning arrives during an active turn", async () => {
2345	const harness = await createHarness();	2353	const harness = await createHarness();
2346	const now = new Date().toISOString();	2354	const now = "2026-01-01T00:00:00.000Z";
2347		2355
2348	harness.emit({	2356	harness.emit({
2349	type: "turn.started",	2357	type: "turn.started",
...	@@ -2387,7 +2395,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -2387,7 +2395,7 @@ describe("ProviderRuntimeIngestion", () => {
2387		2395
2388	it("maps session/thread lifecycle and item.started into session/activity projections", async () => {	2396	it("maps session/thread lifecycle and item.started into session/activity projections", async () => {
2389	const harness = await createHarness();	2397	const harness = await createHarness();
2390	const now = new Date().toISOString();	2398	const now = "2026-01-01T00:00:00.000Z";
2391		2399
2392	harness.emit({	2400	harness.emit({
2393	type: "session.started",	2401	type: "session.started",
...	@@ -2439,7 +2447,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -2439,7 +2447,7 @@ describe("ProviderRuntimeIngestion", () => {
2439		2447
2440	it("consumes P1 runtime events into thread metadata, diff checkpoints, and activities", async () => {	2448	it("consumes P1 runtime events into thread metadata, diff checkpoints, and activities", async () => {
2441	const harness = await createHarness();	2449	const harness = await createHarness();
2442	const now = new Date().toISOString();	2450	const now = "2026-01-01T00:00:00.000Z";
2443		2451
2444	harness.emit({	2452	harness.emit({
2445	type: "thread.metadata.updated",	2453	type: "thread.metadata.updated",
...	@@ -2573,7 +2581,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -2573,7 +2581,7 @@ describe("ProviderRuntimeIngestion", () => {
2573		2581
2574	it("projects context window updates into normalized thread activities", async () => {	2582	it("projects context window updates into normalized thread activities", async () => {
2575	const harness = await createHarness();	2583	const harness = await createHarness();
2576	const now = new Date().toISOString();	2584	const now = "2026-01-01T00:00:00.000Z";
2577		2585
2578	harness.emit({	2586	harness.emit({
2579	type: "thread.token-usage.updated",	2587	type: "thread.token-usage.updated",
...	@@ -2625,7 +2633,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -2625,7 +2633,7 @@ describe("ProviderRuntimeIngestion", () => {
2625		2633
2626	it("projects Codex camelCase token usage payloads into normalized thread activities", async () => {	2634	it("projects Codex camelCase token usage payloads into normalized thread activities", async () => {
2627	const harness = await createHarness();	2635	const harness = await createHarness();
2628	const now = new Date().toISOString();	2636	const now = "2026-01-01T00:00:00.000Z";
2629		2637
2630	harness.emit({	2638	harness.emit({
2631	type: "thread.token-usage.updated",	2639	type: "thread.token-usage.updated",
...	@@ -2678,7 +2686,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -2678,7 +2686,7 @@ describe("ProviderRuntimeIngestion", () => {
2678		2686
2679	it("projects Claude usage snapshots with context window into normalized thread activities", async () => {	2687	it("projects Claude usage snapshots with context window into normalized thread activities", async () => {
2680	const harness = await createHarness();	2688	const harness = await createHarness();
2681	const now = new Date().toISOString();	2689	const now = "2026-01-01T00:00:00.000Z";
2682		2690
2683	harness.emit({	2691	harness.emit({
2684	type: "thread.token-usage.updated",	2692	type: "thread.token-usage.updated",
...	@@ -2722,7 +2730,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -2722,7 +2730,7 @@ describe("ProviderRuntimeIngestion", () => {
2722		2730
2723	it("projects compacted thread state into context compaction activities", async () => {	2731	it("projects compacted thread state into context compaction activities", async () => {
2724	const harness = await createHarness();	2732	const harness = await createHarness();
2725	const now = new Date().toISOString();	2733	const now = "2026-01-01T00:00:00.000Z";
2726		2734
2727	harness.emit({	2735	harness.emit({
2728	type: "thread.state.changed",	2736	type: "thread.state.changed",
...	@@ -2752,7 +2760,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -2752,7 +2760,7 @@ describe("ProviderRuntimeIngestion", () => {
2752		2760
2753	it("projects Codex task lifecycle chunks into thread activities", async () => {	2761	it("projects Codex task lifecycle chunks into thread activities", async () => {
2754	const harness = await createHarness();	2762	const harness = await createHarness();
2755	const now = new Date().toISOString();	2763	const now = "2026-01-01T00:00:00.000Z";
2756		2764
2757	harness.emit({	2765	harness.emit({
2758	type: "task.started",	2766	type: "task.started",
...	@@ -2855,7 +2863,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -2855,7 +2863,7 @@ describe("ProviderRuntimeIngestion", () => {
2855		2863
2856	it("projects structured user input request and resolution as thread activities", async () => {	2864	it("projects structured user input request and resolution as thread activities", async () => {
2857	const harness = await createHarness();	2865	const harness = await createHarness();
2858	const now = new Date().toISOString();	2866	const now = "2026-01-01T00:00:00.000Z";
2859		2867
2860	harness.emit({	2868	harness.emit({
2861	type: "user-input.requested",	2869	type: "user-input.requested",
...	@@ -2886,7 +2894,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -2886,7 +2894,7 @@ describe("ProviderRuntimeIngestion", () => {
2886	type: "user-input.resolved",	2894	type: "user-input.resolved",
2887	eventId: asEventId("evt-user-input-resolved"),	2895	eventId: asEventId("evt-user-input-resolved"),
2888	provider: ProviderDriverKind.make("codex"),	2896	provider: ProviderDriverKind.make("codex"),
2889	createdAt: new Date().toISOString(),	2897	createdAt: "2026-01-01T00:00:00.000Z",
2890	threadId: asThreadId("thread-1"),	2898	threadId: asThreadId("thread-1"),
2891	turnId: asTurnId("turn-user-input"),	2899	turnId: asTurnId("turn-user-input"),
2892	requestId: ApprovalRequestId.make("req-user-input-1"),	2900	requestId: ApprovalRequestId.make("req-user-input-1"),
...	@@ -2928,7 +2936,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -2928,7 +2936,7 @@ describe("ProviderRuntimeIngestion", () => {
2928		2936
2929	it("continues processing runtime events after a single event handler failure", async () => {	2937	it("continues processing runtime events after a single event handler failure", async () => {
2930	const harness = await createHarness();	2938	const harness = await createHarness();
2931	const now = new Date().toISOString();	2939	const now = "2026-01-01T00:00:00.000Z";
2932		2940
2933	harness.emit({	2941	harness.emit({
2934	type: "content.delta",	2942	type: "content.delta",
...	@@ -2948,7 +2956,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -2948,7 +2956,7 @@ describe("ProviderRuntimeIngestion", () => {
2948	type: "runtime.error",	2956	type: "runtime.error",
2949	eventId: asEventId("evt-runtime-error-after-failure"),	2957	eventId: asEventId("evt-runtime-error-after-failure"),
2950	provider: ProviderDriverKind.make("codex"),	2958	provider: ProviderDriverKind.make("codex"),
2951	createdAt: new Date().toISOString(),	2959	createdAt: "2026-01-01T00:00:00.000Z",
2952	threadId: asThreadId("thread-1"),	2960	threadId: asThreadId("thread-1"),
2953	turnId: asTurnId("turn-after-failure"),	2961	turnId: asTurnId("turn-after-failure"),
2954	payload: {	2962	payload: {

apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts+7-1

 @@ -17,7 +17,13 @@ import {
   type OrchestrationThreadActivity,
   type ProviderRuntimeEvent,
 } from "@t3tools/contracts";
-import { Cache, Cause, Duration, Effect, Layer, Option, Stream } from "effect";
+import * as Cache from "effect/Cache";
+import * as Cause from "effect/Cause";
+import * as Duration from "effect/Duration";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Stream from "effect/Stream";
 import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
 import { ProviderService } from "../../provider/Services/ProviderService.ts";

apps/server/src/orchestration/Layers/RuntimeReceiptBus.ts+4-1

 @@ -8,7 +8,10 @@
  *
  * @module RuntimeReceiptBus
  */
-import { Effect, Layer, PubSub, Stream } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as PubSub from "effect/PubSub";
+import * as Stream from "effect/Stream";
 import {
   RuntimeReceiptBus,

apps/server/src/orchestration/Layers/ThreadDeletionReactor.test.ts+3-1

...	@@ -1,5 +1,7 @@	...	@@ -1,5 +1,7 @@
1	import { ThreadId } from "@t3tools/contracts";	1	import { ThreadId } from "@t3tools/contracts";
2	import { Cause, Effect, Exit } from "effect";	2	import * as Cause from "effect/Cause";
		3	import * as Effect from "effect/Effect";
		4	import * as Exit from "effect/Exit";
3	import { describe, expect, it } from "vitest";	5	import { describe, expect, it } from "vitest";
4		6
5	import { logCleanupCauseUnlessInterrupted } from "./ThreadDeletionReactor.ts";	7	import { logCleanupCauseUnlessInterrupted } from "./ThreadDeletionReactor.ts";

apps/server/src/orchestration/Layers/ThreadDeletionReactor.ts+4-1

 @@ -1,6 +1,9 @@
 import type { OrchestrationEvent } from "@t3tools/contracts";
 import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
-import { Cause, Effect, Layer, Stream } from "effect";
+import * as Cause from "effect/Cause";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Stream from "effect/Stream";
 import { ProviderService } from "../../provider/Services/ProviderService.ts";
 import { TerminalManager } from "../../terminal/Services/Manager.ts";

apps/server/src/orchestration/Normalizer.ts+3-1

...	@@ -1,4 +1,6 @@	...	@@ -1,4 +1,6 @@
1	import { Effect, FileSystem, Path } from "effect";	1	import * as Effect from "effect/Effect";
		2	import * as FileSystem from "effect/FileSystem";
		3	import * as Path from "effect/Path";
2	import {	4	import {
3	type ClientOrchestrationCommand,	5	type ClientOrchestrationCommand,
4	type OrchestrationCommand,	6	type OrchestrationCommand,

apps/server/src/orchestration/Services/CheckpointReactor.ts+3-2

 @@ -6,8 +6,9 @@
  *
  * @module CheckpointReactor
  */
-import { Context } from "effect";
+import * as Context from "effect/Context";
-import type { Effect, Scope } from "effect";
+import type * as Effect from "effect/Effect";
+import type * as Scope from "effect/Scope";
 /**
  * CheckpointReactorShape - Service API for checkpoint reactor lifecycle.

apps/server/src/orchestration/Services/OrchestrationEngine.ts+3-2

 @@ -11,8 +11,9 @@
  * @module OrchestrationEngineService
  */
 import type { OrchestrationCommand, OrchestrationEvent } from "@t3tools/contracts";
-import { Context } from "effect";
+import * as Context from "effect/Context";
-import type { Effect, Stream } from "effect";
+import type * as Effect from "effect/Effect";
+import type * as Stream from "effect/Stream";
 import type { OrchestrationDispatchError } from "../Errors.ts";
 import type { OrchestrationEventStoreError } from "../../persistence/Errors.ts";

apps/server/src/orchestration/Services/OrchestrationReactor.ts+3-2

 @@ -6,8 +6,9 @@
  *
  * @module OrchestrationReactor
  */
-import { Context } from "effect";
+import * as Context from "effect/Context";
-import type { Effect, Scope } from "effect";
+import type * as Effect from "effect/Effect";
+import type * as Scope from "effect/Scope";
 /**
  * OrchestrationReactorShape - Service API for orchestration reactor lifecycle.

apps/server/src/orchestration/Services/ProjectionPipeline.ts+2-2

...	@@ -7,8 +7,8 @@	...	@@ -7,8 +7,8 @@
7	* @module OrchestrationProjectionPipeline	7	* @module OrchestrationProjectionPipeline
8	*/	8	*/
9	import type { OrchestrationEvent } from "@t3tools/contracts";	9	import type { OrchestrationEvent } from "@t3tools/contracts";
10	import { Context } from "effect";	10	import * as Context from "effect/Context";
11	import type { Effect } from "effect";	11	import type * as Effect from "effect/Effect";
12		12
13	import type { ProjectionRepositoryError } from "../../persistence/Errors.ts";	13	import type { ProjectionRepositoryError } from "../../persistence/Errors.ts";
14		14

apps/server/src/orchestration/Services/ProjectionSnapshotQuery.ts+3-3

...	@@ -17,9 +17,9 @@ import type {	...	@@ -17,9 +17,9 @@ import type {
17	ProjectId,	17	ProjectId,
18	ThreadId,	18	ThreadId,
19	} from "@t3tools/contracts";	19	} from "@t3tools/contracts";
20	import { Context } from "effect";	20	import * as Context from "effect/Context";
21	import type { Option } from "effect";	21	import type * as Option from "effect/Option";
22	import type { Effect } from "effect";	22	import type * as Effect from "effect/Effect";
23		23
24	import type { ProjectionRepositoryError } from "../../persistence/Errors.ts";	24	import type { ProjectionRepositoryError } from "../../persistence/Errors.ts";
25		25

apps/server/src/orchestration/Services/ProviderCommandReactor.ts+3-2

 @@ -6,8 +6,9 @@
  *
  * @module ProviderCommandReactor
  */
-import { Context } from "effect";
+import * as Context from "effect/Context";
-import type { Effect, Scope } from "effect";
+import type * as Effect from "effect/Effect";
+import type * as Scope from "effect/Scope";
 /**
  * ProviderCommandReactorShape - Service API for provider command reactors.

apps/server/src/orchestration/Services/ProviderRuntimeIngestion.ts+3-2

 @@ -6,8 +6,9 @@
  *
  * @module ProviderRuntimeIngestionService
  */
-import { Context } from "effect";
+import * as Context from "effect/Context";
-import type { Effect, Scope } from "effect";
+import type * as Effect from "effect/Effect";
+import type * as Scope from "effect/Scope";
 /**
  * ProviderRuntimeIngestionShape - Service API for runtime ingestion lifecycle.

apps/server/src/orchestration/Services/RuntimeReceiptBus.ts+4-2

 @@ -15,8 +15,10 @@
  * @module RuntimeReceiptBus
  */
 import { CheckpointRef, IsoDateTime, NonNegativeInt, ThreadId, TurnId } from "@t3tools/contracts";
-import { Schema, Context } from "effect";
+import * as Schema from "effect/Schema";
-import type { Effect, Stream } from "effect";
+import * as Context from "effect/Context";
+import type * as Effect from "effect/Effect";
+import type * as Stream from "effect/Stream";
 export const CheckpointBaselineCapturedReceipt = Schema.Struct({
   type: Schema.Literal("checkpoint.baseline.captured"),

apps/server/src/orchestration/Services/ThreadDeletionReactor.ts+3-2

 @@ -6,8 +6,9 @@
  *
  * @module ThreadDeletionReactor
  */
-import { Context } from "effect";
+import * as Context from "effect/Context";
-import type { Effect, Scope } from "effect";
+import type * as Effect from "effect/Effect";
+import type * as Scope from "effect/Scope";
 /**
  * ThreadDeletionReactorShape - Service API for thread deletion cleanup.

apps/server/src/orchestration/commandInvariants.test.ts+2-2

...	@@ -9,7 +9,7 @@ import {	...	@@ -9,7 +9,7 @@ import {
9	type OrchestrationReadModel,	9	type OrchestrationReadModel,
10	ProviderInstanceId,	10	ProviderInstanceId,
11	} from "@t3tools/contracts";	11	} from "@t3tools/contracts";
12	import { Effect } from "effect";	12	import * as Effect from "effect/Effect";
13		13
14	import {	14	import {
15	findThreadById,	15	findThreadById,
...	@@ -19,7 +19,7 @@ import {	...	@@ -19,7 +19,7 @@ import {
19	requireThreadAbsent,	19	requireThreadAbsent,
20	} from "./commandInvariants.ts";	20	} from "./commandInvariants.ts";
21		21
22	const now = new Date().toISOString();	22	const now = "2026-01-01T00:00:00.000Z";
23		23
24	const readModel: OrchestrationReadModel = {	24	const readModel: OrchestrationReadModel = {
25	snapshotSequence: 2,	25	snapshotSequence: 2,

apps/server/src/orchestration/commandInvariants.ts+1-1

...	@@ -6,7 +6,7 @@ import type {	...	@@ -6,7 +6,7 @@ import type {
6	ProjectId,	6	ProjectId,
7	ThreadId,	7	ThreadId,
8	} from "@t3tools/contracts";	8	} from "@t3tools/contracts";
9	import { Effect } from "effect";	9	import * as Effect from "effect/Effect";
10		10
11	import { OrchestrationCommandInvariantError } from "./Errors.ts";	11	import { OrchestrationCommandInvariantError } from "./Errors.ts";
12		12

apps/server/src/orchestration/decider.delete.test.ts+2-2

...	@@ -9,7 +9,7 @@ import {	...	@@ -9,7 +9,7 @@ import {
9	type OrchestrationReadModel,	9	type OrchestrationReadModel,
10	ProviderInstanceId,	10	ProviderInstanceId,
11	} from "@t3tools/contracts";	11	} from "@t3tools/contracts";
12	import { Effect } from "effect";	12	import * as Effect from "effect/Effect";
13	import { describe, expect, it } from "vitest";	13	import { describe, expect, it } from "vitest";
14		14
15	import { decideOrchestrationCommand } from "./decider.ts";	15	import { decideOrchestrationCommand } from "./decider.ts";
...	@@ -21,7 +21,7 @@ const asProjectId = (value: string): ProjectId => ProjectId.make(value);	...	@@ -21,7 +21,7 @@ const asProjectId = (value: string): ProjectId => ProjectId.make(value);
21	const asThreadId = (value: string): ThreadId => ThreadId.make(value);	21	const asThreadId = (value: string): ThreadId => ThreadId.make(value);
22		22
23	async function seedReadModel(): Promise<OrchestrationReadModel> {	23	async function seedReadModel(): Promise<OrchestrationReadModel> {
24	const now = new Date().toISOString();	24	const now = "2026-01-01T00:00:00.000Z";
25	const initial = createEmptyReadModel(now);	25	const initial = createEmptyReadModel(now);
26	const withProject = await Effect.runPromise(	26	const withProject = await Effect.runPromise(
27	projectEvent(initial, {	27	projectEvent(initial, {

apps/server/src/orchestration/decider.projectScripts.test.ts+6-6

apps/server/src/orchestration/decider.ts+11-10

...	@@ -3,7 +3,8 @@ import type {	...	@@ -3,7 +3,8 @@ import type {
3	OrchestrationEvent,	3	OrchestrationEvent,
4	OrchestrationReadModel,	4	OrchestrationReadModel,
5	} from "@t3tools/contracts";	5	} from "@t3tools/contracts";
6	import { DateTime, Effect } from "effect";	6	import * as DateTime from "effect/DateTime";
		7	import * as Effect from "effect/Effect";
7		8
8	import { OrchestrationCommandInvariantError } from "./Errors.ts";	9	import { OrchestrationCommandInvariantError } from "./Errors.ts";
9	import {	10	import {
...	@@ -17,7 +18,7 @@ import {	...	@@ -17,7 +18,7 @@ import {
17	} from "./commandInvariants.ts";	18	} from "./commandInvariants.ts";
18	import { projectEvent } from "./projector.ts";	19	import { projectEvent } from "./projector.ts";
19		20
20	const currentIso = DateTime.now.pipe(Effect.map(DateTime.formatIso));	21	const nowIso = Effect.map(DateTime.now, DateTime.formatIso);
21		22
22	function withEventBase(	23	function withEventBase(
23	input: Pick<OrchestrationCommand, "commandId"> & {	24	input: Pick<OrchestrationCommand, "commandId"> & {
...	@@ -116,7 +117,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"	...	@@ -116,7 +117,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
116	command,	117	command,
117	projectId: command.projectId,	118	projectId: command.projectId,
118	});	119	});
119	const occurredAt = yield* currentIso;	120	const occurredAt = yield* nowIso;
120	return {	121	return {
121	...withEventBase({	122	...withEventBase({
122	aggregateKind: "project",	123	aggregateKind: "project",
...	@@ -173,7 +174,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"	...	@@ -173,7 +174,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
173	});	174	});
174	}	175	}
175		176
176	const occurredAt = yield* currentIso;	177	const occurredAt = yield* nowIso;
177	return {	178	return {
178	...withEventBase({	179	...withEventBase({
179	aggregateKind: "project",	180	aggregateKind: "project",
...	@@ -229,7 +230,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"	...	@@ -229,7 +230,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
229	command,	230	command,
230	threadId: command.threadId,	231	threadId: command.threadId,
231	});	232	});
232	const occurredAt = yield* currentIso;	233	const occurredAt = yield* nowIso;
233	return {	234	return {
234	...withEventBase({	235	...withEventBase({
235	aggregateKind: "thread",	236	aggregateKind: "thread",
...	@@ -251,7 +252,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"	...	@@ -251,7 +252,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
251	command,	252	command,
252	threadId: command.threadId,	253	threadId: command.threadId,
253	});	254	});
254	const occurredAt = yield* currentIso;	255	const occurredAt = yield* nowIso;
255	return {	256	return {
256	...withEventBase({	257	...withEventBase({
257	aggregateKind: "thread",	258	aggregateKind: "thread",
...	@@ -274,7 +275,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"	...	@@ -274,7 +275,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
274	command,	275	command,
275	threadId: command.threadId,	276	threadId: command.threadId,
276	});	277	});
277	const occurredAt = yield* currentIso;	278	const occurredAt = yield* nowIso;
278	return {	279	return {
279	...withEventBase({	280	...withEventBase({
280	aggregateKind: "thread",	281	aggregateKind: "thread",
...	@@ -296,7 +297,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"	...	@@ -296,7 +297,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
296	command,	297	command,
297	threadId: command.threadId,	298	threadId: command.threadId,
298	});	299	});
299	const occurredAt = yield* currentIso;	300	const occurredAt = yield* nowIso;
300	return {	301	return {
301	...withEventBase({	302	...withEventBase({
302	aggregateKind: "thread",	303	aggregateKind: "thread",
...	@@ -324,7 +325,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"	...	@@ -324,7 +325,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
324	command,	325	command,
325	threadId: command.threadId,	326	threadId: command.threadId,
326	});	327	});
327	const occurredAt = yield* currentIso;	328	const occurredAt = yield* nowIso;
328	return {	329	return {
329	...withEventBase({	330	...withEventBase({
330	aggregateKind: "thread",	331	aggregateKind: "thread",
...	@@ -347,7 +348,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"	...	@@ -347,7 +348,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
347	command,	348	command,
348	threadId: command.threadId,	349	threadId: command.threadId,
349	});	350	});
350	const occurredAt = yield* currentIso;	351	const occurredAt = yield* nowIso;
351	return {	352	return {
352	...withEventBase({	353	...withEventBase({
353	aggregateKind: "thread",	354	aggregateKind: "thread",

apps/server/src/orchestration/http.ts+1-1

...	@@ -4,7 +4,7 @@ import {	...	@@ -4,7 +4,7 @@ import {
4	OrchestrationGetSnapshotError,	4	OrchestrationGetSnapshotError,
5	type OrchestrationReadModel,	5	type OrchestrationReadModel,
6	} from "@t3tools/contracts";	6	} from "@t3tools/contracts";
7	import { Effect } from "effect";	7	import * as Effect from "effect/Effect";
8	import { HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/unstable/http";	8	import { HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/unstable/http";
9		9
10	import { ServerAuth } from "../auth/Services/ServerAuth.ts";	10	import { ServerAuth } from "../auth/Services/ServerAuth.ts";

apps/server/src/orchestration/projector.test.ts+6-6

...	@@ -6,7 +6,7 @@ import {	...	@@ -6,7 +6,7 @@ import {
6	ThreadId,	6	ThreadId,
7	type OrchestrationEvent,	7	type OrchestrationEvent,
8	} from "@t3tools/contracts";	8	} from "@t3tools/contracts";
9	import { Effect } from "effect";	9	import * as Effect from "effect/Effect";
10	import { describe, expect, it } from "vitest";	10	import { describe, expect, it } from "vitest";
11		11
12	import { createEmptyReadModel, projectEvent } from "./projector.ts";	12	import { createEmptyReadModel, projectEvent } from "./projector.ts";
...	@@ -40,7 +40,7 @@ function makeEvent(input: {	...	@@ -40,7 +40,7 @@ function makeEvent(input: {
40		40
41	describe("orchestration projector", () => {	41	describe("orchestration projector", () => {
42	it("applies thread.created events", async () => {	42	it("applies thread.created events", async () => {
43	const now = new Date().toISOString();	43	const now = "2026-01-01T00:00:00.000Z";
44	const model = createEmptyReadModel(now);	44	const model = createEmptyReadModel(now);
45		45
46	const next = await Effect.runPromise(	46	const next = await Effect.runPromise(
...	@@ -100,7 +100,7 @@ describe("orchestration projector", () => {	...	@@ -100,7 +100,7 @@ describe("orchestration projector", () => {
100	});	100	});
101		101
102	it("fails when event payload cannot be decoded by runtime schema", async () => {	102	it("fails when event payload cannot be decoded by runtime schema", async () => {
103	const now = new Date().toISOString();	103	const now = "2026-01-01T00:00:00.000Z";
104	const model = createEmptyReadModel(now);	104	const model = createEmptyReadModel(now);
105		105
106	await expect(	106	await expect(
...	@@ -134,8 +134,8 @@ describe("orchestration projector", () => {	...	@@ -134,8 +134,8 @@ describe("orchestration projector", () => {
134	});	134	});
135		135
136	it("applies thread.archived and thread.unarchived events", async () => {	136	it("applies thread.archived and thread.unarchived events", async () => {
137	const now = new Date().toISOString();	137	const now = "2026-01-01T00:00:00.000Z";
138	const later = new Date(Date.parse(now) + 1_000).toISOString();	138	const later = "2026-01-01T00:00:01.000Z";
139	const created = await Effect.runPromise(	139	const created = await Effect.runPromise(
140	projectEvent(	140	projectEvent(
141	createEmptyReadModel(now),	141	createEmptyReadModel(now),
...	@@ -206,7 +206,7 @@ describe("orchestration projector", () => {	...	@@ -206,7 +206,7 @@ describe("orchestration projector", () => {
206	});	206	});
207		207
208	it("keeps projector forward-compatible for unhandled event types", async () => {	208	it("keeps projector forward-compatible for unhandled event types", async () => {
209	const now = new Date().toISOString();	209	const now = "2026-01-01T00:00:00.000Z";
210	const model = createEmptyReadModel(now);	210	const model = createEmptyReadModel(now);
211		211
212	const next = await Effect.runPromise(	212	const next = await Effect.runPromise(

apps/server/src/orchestration/projector.ts+2-1

...	@@ -5,7 +5,8 @@ import {	...	@@ -5,7 +5,8 @@ import {
5	OrchestrationSession,	5	OrchestrationSession,
6	OrchestrationThread,	6	OrchestrationThread,
7	} from "@t3tools/contracts";	7	} from "@t3tools/contracts";
8	import { Effect, Schema } from "effect";	8	import * as Effect from "effect/Effect";
		9	import * as Schema from "effect/Schema";
9		10
10	import { toProjectorDecodeError, type OrchestrationProjectorDecodeError } from "./Errors.ts";	11	import { toProjectorDecodeError, type OrchestrationProjectorDecodeError } from "./Errors.ts";
11	import {	12	import {

apps/server/src/orchestration/runtimeLayer.ts+1-1

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	import { Layer } from "effect";	1	import * as Layer from "effect/Layer";
2		2
3	import { OrchestrationCommandReceiptRepositoryLive } from "../persistence/Layers/OrchestrationCommandReceipts.ts";	3	import { OrchestrationCommandReceiptRepositoryLive } from "../persistence/Layers/OrchestrationCommandReceipts.ts";
4	import { OrchestrationEventStoreLive } from "../persistence/Layers/OrchestrationEventStore.ts";	4	import { OrchestrationEventStoreLive } from "../persistence/Layers/OrchestrationEventStore.ts";

apps/server/src/os-jank.test.ts deleted-185

...	@@ -1,185 +0,0 @@
1	import { describe, expect, it, vi } from "vitest";
2
3	import { fixPath } from "./os-jank.ts";
4
5	describe("fixPath", () => {
6	it("hydrates PATH on linux using the resolved login shell", () => {
7	const env: NodeJS.ProcessEnv = {
8	SHELL: "/bin/zsh",
9	PATH: "/Users/test/.local/bin:/usr/bin",
10	};
11	const readPath = vi.fn(() => "/opt/homebrew/bin:/usr/bin");
12
13	fixPath({
14	env,
15	platform: "linux",
16	readPath,
17	});
18
19	expect(readPath).toHaveBeenCalledWith("/bin/zsh");
20	expect(env.PATH).toBe("/opt/homebrew/bin:/usr/bin:/Users/test/.local/bin");
21	});
22
23	it("falls back to launchctl PATH on macOS when shell probing fails", () => {
24	const env: NodeJS.ProcessEnv = {
25	SHELL: "/opt/homebrew/bin/nu",
26	PATH: "/usr/bin",
27	};
28	const readPath = vi
29	.fn()
30	.mockImplementationOnce(() => {
31	throw new Error("unknown flag");
32	})
33	.mockImplementationOnce(() => undefined);
34	const readLaunchctlPath = vi.fn(() => "/opt/homebrew/bin:/usr/bin");
35	const logWarning = vi.fn();
36
37	fixPath({
38	env,
39	platform: "darwin",
40	readPath,
41	readLaunchctlPath,
42	userShell: "/bin/zsh",
43	logWarning,
44	});
45
46	expect(readPath).toHaveBeenNthCalledWith(1, "/opt/homebrew/bin/nu");
47	expect(readPath).toHaveBeenNthCalledWith(2, "/bin/zsh");
48	expect(readLaunchctlPath).toHaveBeenCalledTimes(1);
49	expect(logWarning).toHaveBeenCalledWith(
50	"Failed to read PATH from login shell /opt/homebrew/bin/nu.",
51	expect.any(Error),
52	);
53	expect(env.PATH).toBe("/opt/homebrew/bin:/usr/bin");
54	});
55
56	it("repairs PATH on Windows by merging PowerShell PATH with inherited PATH", () => {
57	const env: NodeJS.ProcessEnv = {
58	PATH: "C:\\Windows\\System32",
59	APPDATA: "C:\\Users\\testuser\\AppData\\Roaming",
60	LOCALAPPDATA: "C:\\Users\\testuser\\AppData\\Local",
61	USERPROFILE: "C:\\Users\\testuser",
62	};
63	const readWindowsEnvironment = vi.fn(() => ({
64	PATH: "C:\\Custom\\Bin;C:\\Windows\\System32",
65	}));
66	const isWindowsCommandAvailable = vi.fn(() => true);
67
68	fixPath({
69	env,
70	platform: "win32",
71	readWindowsEnvironment,
72	isWindowsCommandAvailable,
73	});
74
75	expect(readWindowsEnvironment).toHaveBeenCalledWith(["PATH"], { loadProfile: false });
76	expect(env.PATH).toBe(
77	[
78	"C:\\Users\\testuser\\AppData\\Roaming\\npm",
79	"C:\\Users\\testuser\\AppData\\Local\\Programs\\nodejs",
80	"C:\\Users\\testuser\\AppData\\Local\\Volta\\bin",
81	"C:\\Users\\testuser\\AppData\\Local\\pnpm",
82	"C:\\Users\\testuser\\.bun\\bin",
83	"C:\\Users\\testuser\\scoop\\shims",
84	"C:\\Custom\\Bin",
85	"C:\\Windows\\System32",
86	].join(";"),
87	);
88	});
89
90	it("applies profile-derived fnm variables on Windows when node is missing", () => {
91	const env: NodeJS.ProcessEnv = {
92	PATH: "C:\\Windows\\System32",
93	APPDATA: "C:\\Users\\testuser\\AppData\\Roaming",
94	LOCALAPPDATA: "C:\\Users\\testuser\\AppData\\Local",
95	USERPROFILE: "C:\\Users\\testuser",
96	};
97	const readWindowsEnvironment = vi.fn(
98	(_names: ReadonlyArray<string>, options?: { loadProfile?: boolean }) =>
99	options?.loadProfile
100	? {
101	PATH: "C:\\Profile\\Node;C:\\Windows\\System32",
102	FNM_DIR: "C:\\Users\\testuser\\AppData\\Roaming\\fnm",
103	FNM_MULTISHELL_PATH: "C:\\Users\\testuser\\AppData\\Local\\fnm_multishells\\123",
104	}
105	: { PATH: "C:\\Custom\\Bin;C:\\Windows\\System32" },
106	);
107	const isWindowsCommandAvailable = vi.fn().mockReturnValueOnce(false).mockReturnValueOnce(true);
108
109	fixPath({
110	env,
111	platform: "win32",
112	readWindowsEnvironment,
113	isWindowsCommandAvailable,
114	});
115
116	expect(env.PATH).toBe(
117	[
118	"C:\\Profile\\Node",
119	"C:\\Windows\\System32",
120	"C:\\Users\\testuser\\AppData\\Roaming\\npm",
121	"C:\\Users\\testuser\\AppData\\Local\\Programs\\nodejs",
122	"C:\\Users\\testuser\\AppData\\Local\\Volta\\bin",
123	"C:\\Users\\testuser\\AppData\\Local\\pnpm",
124	"C:\\Users\\testuser\\.bun\\bin",
125	"C:\\Users\\testuser\\scoop\\shims",
126	"C:\\Custom\\Bin",
127	].join(";"),
128	);
129	expect(env.FNM_DIR).toBe("C:\\Users\\testuser\\AppData\\Roaming\\fnm");
130	expect(env.FNM_MULTISHELL_PATH).toBe(
131	"C:\\Users\\testuser\\AppData\\Local\\fnm_multishells\\123",
132	);
133	});
134
135	it("preserves baseline PATH on Windows when the profile probe fails", () => {
136	const env: NodeJS.ProcessEnv = {
137	PATH: "C:\\Windows\\System32",
138	APPDATA: "C:\\Users\\testuser\\AppData\\Roaming",
139	USERPROFILE: "C:\\Users\\testuser",
140	};
141	const readWindowsEnvironment = vi.fn(
142	(_names: ReadonlyArray<string>, options?: { loadProfile?: boolean }) => {
143	if (options?.loadProfile) {
144	throw new Error("profile load failed");
145	}
146	return { PATH: "C:\\Custom\\Bin;C:\\Windows\\System32" };
147	},
148	);
149	const isWindowsCommandAvailable = vi.fn(() => false);
150
151	fixPath({
152	env,
153	platform: "win32",
154	readWindowsEnvironment,
155	isWindowsCommandAvailable,
156	});
157
158	expect(env.PATH).toBe(
159	[
160	"C:\\Users\\testuser\\AppData\\Roaming\\npm",
161	"C:\\Users\\testuser\\.bun\\bin",
162	"C:\\Users\\testuser\\scoop\\shims",
163	"C:\\Custom\\Bin",
164	"C:\\Windows\\System32",
165	].join(";"),
166	);
167	});
168
169	it("does nothing on unsupported platforms", () => {
170	const env: NodeJS.ProcessEnv = {
171	SHELL: "C:/Program Files/Git/bin/bash.exe",
172	PATH: "C:\\Windows\\System32",
173	};
174	const readPath = vi.fn(() => "/usr/local/bin:/usr/bin");
175
176	fixPath({
177	env,
178	platform: "freebsd",
179	readPath,
180	});
181
182	expect(readPath).not.toHaveBeenCalled();
183	expect(env.PATH).toBe("C:\\Windows\\System32");
184	});
185	});

apps/server/src/os-jank.ts+9-6

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	import * as OS from "node:os";	1	import * as NodeOS from "node:os";
2	import { Effect, Path } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Path from "effect/Path";
3	import {	4	import {
4	readPathFromLoginShell,	5	readPathFromLoginShell,
5	readEnvironmentFromWindowsShell,	6	readEnvironmentFromWindowsShell,
...	@@ -17,7 +18,9 @@ type WindowsCommandAvailabilityChecker = (	...	@@ -17,7 +18,9 @@ type WindowsCommandAvailabilityChecker = (
17	) => boolean;	18	) => boolean;
18		19
19	function logPathHydrationWarning(message: string, error?: unknown): void {	20	function logPathHydrationWarning(message: string, error?: unknown): void {
20	console.warn(`[server] ${message}`, error instanceof Error ? error.message : (error ?? ""));	21	process.stderr.write(
		22	`[server] ${message} ${error instanceof Error ? error.message : (error ?? "")}\n`,
		23	);
21	}	24	}
22		25
23	export function fixPath(	26	export function fixPath(
...	@@ -84,10 +87,10 @@ export function fixPath(	...	@@ -84,10 +87,10 @@ export function fixPath(
84	export const expandHomePath = Effect.fn(function* (input: string) {	87	export const expandHomePath = Effect.fn(function* (input: string) {
85	const { join } = yield* Path.Path;	88	const { join } = yield* Path.Path;
86	if (input === "~") {	89	if (input === "~") {
87	return OS.homedir();	90	return NodeOS.homedir();
88	}	91	}
89	if (input.startsWith("~/") \|\| input.startsWith("~\\")) {	92	if (input.startsWith("~/") \|\| input.startsWith("~\\")) {
90	return join(OS.homedir(), input.slice(2));	93	return join(NodeOS.homedir(), input.slice(2));
91	}	94	}
92	return input;	95	return input;
93	});	96	});
...	@@ -95,7 +98,7 @@ export const expandHomePath = Effect.fn(function* (input: string) {	...	@@ -95,7 +98,7 @@ export const expandHomePath = Effect.fn(function* (input: string) {
95	export const resolveBaseDir = Effect.fn(function* (raw: string \| undefined) {	98	export const resolveBaseDir = Effect.fn(function* (raw: string \| undefined) {
96	const { join, resolve } = yield* Path.Path;	99	const { join, resolve } = yield* Path.Path;
97	if (!raw \|\| raw.trim().length === 0) {	100	if (!raw \|\| raw.trim().length === 0) {
98	return join(OS.homedir(), ".t3");	101	return join(NodeOS.homedir(), ".t3");
99	}	102	}
100	return resolve(yield* expandHomePath(raw.trim()));	103	return resolve(yield* expandHomePath(raw.trim()));
101	});	104	});

apps/server/src/pathExpansion.test.ts+1

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import { homedir } from "node:os";	2	import { homedir } from "node:os";
2	import { join } from "node:path";	3	import { join } from "node:path";
3	import { describe, expect, it } from "vitest";	4	import { describe, expect, it } from "vitest";

apps/server/src/pathExpansion.ts+1

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import { homedir } from "node:os";	2	import { homedir } from "node:os";
2	import { join } from "node:path";	3	import { join } from "node:path";
3		4

apps/server/src/persistence/Errors.ts+2-1

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	import { Schema, SchemaIssue } from "effect";	1	import * as Schema from "effect/Schema";
		2	import * as SchemaIssue from "effect/SchemaIssue";
2		3
3	// ===============================	4	// ===============================
4	// Core Persistence Errors	5	// Core Persistence Errors

apps/server/src/persistence/Layers/AuthPairingLinks.ts+3-1

...	@@ -1,6 +1,8 @@	...	@@ -1,6 +1,8 @@
1	import * as SqlClient from "effect/unstable/sql/SqlClient";	1	import * as SqlClient from "effect/unstable/sql/SqlClient";
2	import * as SqlSchema from "effect/unstable/sql/SqlSchema";	2	import * as SqlSchema from "effect/unstable/sql/SqlSchema";
3	import { Effect, Layer, Schema } from "effect";	3	import * as Effect from "effect/Effect";
		4	import * as Layer from "effect/Layer";
		5	import * as Schema from "effect/Schema";
4		6
5	import {	7	import {
6	toPersistenceDecodeError,	8	toPersistenceDecodeError,

apps/server/src/persistence/Layers/AuthSessions.ts+4-1

 @@ -1,7 +1,10 @@
 import { AuthSessionId } from "@t3tools/contracts";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import * as SqlSchema from "effect/unstable/sql/SqlSchema";
-import { Effect, Layer, Option, Schema } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
 import {
   toPersistenceDecodeError,

apps/server/src/persistence/Layers/OrchestrationCommandReceipts.ts+2-1

...	@@ -1,6 +1,7 @@	...	@@ -1,6 +1,7 @@
1	import * as SqlClient from "effect/unstable/sql/SqlClient";	1	import * as SqlClient from "effect/unstable/sql/SqlClient";
2	import * as SqlSchema from "effect/unstable/sql/SqlSchema";	2	import * as SqlSchema from "effect/unstable/sql/SqlSchema";
3	import { Effect, Layer } from "effect";	3	import * as Effect from "effect/Effect";
		4	import * as Layer from "effect/Layer";
4		5
5	import { toPersistenceSqlError } from "../Errors.ts";	6	import { toPersistenceSqlError } from "../Errors.ts";
6		7

apps/server/src/persistence/Layers/OrchestrationEventStore.test.ts+6-3

...	@@ -1,6 +1,9 @@	...	@@ -1,6 +1,9 @@
1	import { CommandId, EventId, ProjectId } from "@t3tools/contracts";	1	import { CommandId, EventId, ProjectId } from "@t3tools/contracts";
2	import { assert, it } from "@effect/vitest";	2	import { assert, it } from "@effect/vitest";
3	import { Effect, Layer, Schema, Stream } from "effect";	3	import * as Effect from "effect/Effect";
		4	import * as Layer from "effect/Layer";
		5	import * as Schema from "effect/Schema";
		6	import * as Stream from "effect/Stream";
4	import * as SqlClient from "effect/unstable/sql/SqlClient";	7	import * as SqlClient from "effect/unstable/sql/SqlClient";
5		8
6	import { PersistenceDecodeError } from "../Errors.ts";	9	import { PersistenceDecodeError } from "../Errors.ts";
...	@@ -17,7 +20,7 @@ layer("OrchestrationEventStore", (it) => {	...	@@ -17,7 +20,7 @@ layer("OrchestrationEventStore", (it) => {
17	Effect.gen(function* () {	20	Effect.gen(function* () {
18	const eventStore = yield* OrchestrationEventStore;	21	const eventStore = yield* OrchestrationEventStore;
19	const sql = yield* SqlClient.SqlClient;	22	const sql = yield* SqlClient.SqlClient;
20	const now = new Date().toISOString();	23	const now = "2026-01-01T00:00:00.000Z";
21		24
22	const appended = yield* eventStore.append({	25	const appended = yield* eventStore.append({
23	type: "project.created",	26	type: "project.created",
...	@@ -69,7 +72,7 @@ layer("OrchestrationEventStore", (it) => {	...	@@ -69,7 +72,7 @@ layer("OrchestrationEventStore", (it) => {
69	Effect.gen(function* () {	72	Effect.gen(function* () {
70	const eventStore = yield* OrchestrationEventStore;	73	const eventStore = yield* OrchestrationEventStore;
71	const sql = yield* SqlClient.SqlClient;	74	const sql = yield* SqlClient.SqlClient;
72	const now = new Date().toISOString();	75	const now = "2026-01-01T00:00:00.000Z";
73		76
74	yield* sql`	77	yield* sql`
75	INSERT INTO orchestration_events (	78	INSERT INTO orchestration_events (

apps/server/src/persistence/Layers/OrchestrationEventStore.ts+4-1

 @@ -13,7 +13,10 @@ import {
 } from "@t3tools/contracts";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import * as SqlSchema from "effect/unstable/sql/SqlSchema";
-import { Effect, Layer, Schema, Stream } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Schema from "effect/Schema";
+import * as Stream from "effect/Stream";
 import {
   toPersistenceDecodeError,

apps/server/src/persistence/Layers/ProjectionCheckpoints.ts+5-1

 @@ -1,7 +1,11 @@
 import { OrchestrationCheckpointFile } from "@t3tools/contracts";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import * as SqlSchema from "effect/unstable/sql/SqlSchema";
-import { Effect, Layer, Option, Schema, Struct } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
+import * as Struct from "effect/Struct";
 import { toPersistenceDecodeError, toPersistenceSqlError } from "../Errors.ts";
 import {

apps/server/src/persistence/Layers/ProjectionPendingApprovals.ts+2-1

...	@@ -1,6 +1,7 @@	...	@@ -1,6 +1,7 @@
1	import * as SqlClient from "effect/unstable/sql/SqlClient";	1	import * as SqlClient from "effect/unstable/sql/SqlClient";
2	import * as SqlSchema from "effect/unstable/sql/SqlSchema";	2	import * as SqlSchema from "effect/unstable/sql/SqlSchema";
3	import { Effect, Layer } from "effect";	3	import * as Effect from "effect/Effect";
		4	import * as Layer from "effect/Layer";
4		5
5	import { toPersistenceSqlError } from "../Errors.ts";	6	import { toPersistenceSqlError } from "../Errors.ts";
6	import {	7	import {

apps/server/src/persistence/Layers/ProjectionProjects.ts+4-1

 @@ -1,6 +1,9 @@
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import * as SqlSchema from "effect/unstable/sql/SqlSchema";
-import { Effect, Layer, Schema, Struct } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Schema from "effect/Schema";
+import * as Struct from "effect/Struct";
 import { ModelSelection, ProjectScript } from "@t3tools/contracts";
 import { toPersistenceSqlError } from "../Errors.ts";

apps/server/src/persistence/Layers/ProjectionRepositories.test.ts+7-3

 @@ -1,6 +1,8 @@
 import { ProjectId, ThreadId, ProviderInstanceId } from "@t3tools/contracts";
 import { assert, it } from "@effect/vitest";
-import { Effect, Layer, Option } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import { SqlitePersistenceMemory } from "./Sqlite.ts";
 @@ -46,11 +48,12 @@ projectionRepositoriesLayer("Projection repositories", (it) => {
       `;
       const row = rows[0];
       if (!row) {
-        return yield* Effect.fail(new Error("Expected projection_projects row to exist."));
+        return yield* Effect.die("Expected projection_projects row to exist.");
       }
       assert.strictEqual(
         row.defaultModelSelection,
+        // @effect-diagnostics-next-line preferSchemaOverJson:off
         JSON.stringify({
           instanceId: ProviderInstanceId.make("codex"),
           model: "gpt-5.4",
 @@ -104,11 +107,12 @@ projectionRepositoriesLayer("Projection repositories", (it) => {
       `;
       const row = rows[0];
       if (!row) {
-        return yield* Effect.fail(new Error("Expected projection_threads row to exist."));
+        return yield* Effect.die("Expected projection_threads row to exist.");
       }
       assert.strictEqual(
         row.modelSelection,
+        // @effect-diagnostics-next-line preferSchemaOverJson:off
         JSON.stringify({
           instanceId: ProviderInstanceId.make("claudeAgent"),
           model: "claude-opus-4-6",

apps/server/src/persistence/Layers/ProjectionState.ts+3-1

 @@ -1,7 +1,9 @@
 import { NonNegativeInt } from "@t3tools/contracts";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import * as SqlSchema from "effect/unstable/sql/SqlSchema";
-import { Effect, Layer, Schema } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Schema from "effect/Schema";
 import { toPersistenceSqlError } from "../Errors.ts";

apps/server/src/persistence/Layers/ProjectionThreadActivities.ts+4-1

 @@ -1,7 +1,10 @@
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import * as SqlSchema from "effect/unstable/sql/SqlSchema";
 import { NonNegativeInt } from "@t3tools/contracts";
-import { Effect, Layer, Schema, Struct } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Schema from "effect/Schema";
+import * as Struct from "effect/Struct";
 import { toPersistenceDecodeError, toPersistenceSqlError } from "../Errors.ts";

apps/server/src/persistence/Layers/ProjectionThreadMessages.test.ts+2-1

...	@@ -1,6 +1,7 @@	...	@@ -1,6 +1,7 @@
1	import { MessageId, ThreadId } from "@t3tools/contracts";	1	import { MessageId, ThreadId } from "@t3tools/contracts";
2	import { assert, it } from "@effect/vitest";	2	import { assert, it } from "@effect/vitest";
3	import { Effect, Layer } from "effect";	3	import * as Effect from "effect/Effect";
		4	import * as Layer from "effect/Layer";
4		5
5	import { ProjectionThreadMessageRepository } from "../Services/ProjectionThreadMessages.ts";	6	import { ProjectionThreadMessageRepository } from "../Services/ProjectionThreadMessages.ts";
6	import { ProjectionThreadMessageRepositoryLive } from "./ProjectionThreadMessages.ts";	7	import { ProjectionThreadMessageRepositoryLive } from "./ProjectionThreadMessages.ts";

apps/server/src/persistence/Layers/ProjectionThreadMessages.ts+5-1

 @@ -1,6 +1,10 @@
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import * as SqlSchema from "effect/unstable/sql/SqlSchema";
-import { Effect, Layer, Option, Schema, Struct } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
+import * as Struct from "effect/Struct";
 import { ChatAttachment } from "@t3tools/contracts";
 import { toPersistenceSqlError } from "../Errors.ts";

apps/server/src/persistence/Layers/ProjectionThreadProposedPlans.ts+2-1

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	import { Effect, Layer } from "effect";	1	import * as Effect from "effect/Effect";
		2	import * as Layer from "effect/Layer";
2	import * as SqlClient from "effect/unstable/sql/SqlClient";	3	import * as SqlClient from "effect/unstable/sql/SqlClient";
3	import * as SqlSchema from "effect/unstable/sql/SqlSchema";	4	import * as SqlSchema from "effect/unstable/sql/SqlSchema";
4		5

apps/server/src/persistence/Layers/ProjectionThreadSessions.ts+2-1

...	@@ -1,6 +1,7 @@	...	@@ -1,6 +1,7 @@
1	import * as SqlClient from "effect/unstable/sql/SqlClient";	1	import * as SqlClient from "effect/unstable/sql/SqlClient";
2	import * as SqlSchema from "effect/unstable/sql/SqlSchema";	2	import * as SqlSchema from "effect/unstable/sql/SqlSchema";
3	import { Effect, Layer } from "effect";	3	import * as Effect from "effect/Effect";
		4	import * as Layer from "effect/Layer";
4		5
5	import { toPersistenceSqlError } from "../Errors.ts";	6	import { toPersistenceSqlError } from "../Errors.ts";
6		7

apps/server/src/persistence/Layers/ProjectionThreads.ts+4-1

 @@ -1,6 +1,9 @@
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import * as SqlSchema from "effect/unstable/sql/SqlSchema";
-import { Effect, Layer, Schema, Struct } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Schema from "effect/Schema";
+import * as Struct from "effect/Struct";
 import { toPersistenceSqlError } from "../Errors.ts";
 import {

apps/server/src/persistence/Layers/ProjectionTurns.ts+5-1

 @@ -1,7 +1,11 @@
 import { OrchestrationCheckpointFile } from "@t3tools/contracts";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import * as SqlSchema from "effect/unstable/sql/SqlSchema";
-import { Effect, Layer, Option, Schema, Struct } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
+import * as Struct from "effect/Struct";
 import { toPersistenceDecodeError, toPersistenceSqlError } from "../Errors.ts";
 import {

apps/server/src/persistence/Layers/ProviderSessionRuntime.ts+5-1

 @@ -1,7 +1,11 @@
 import { ThreadId } from "@t3tools/contracts";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import * as SqlSchema from "effect/unstable/sql/SqlSchema";
-import { Effect, Layer, Option, Schema, Struct } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
+import * as Struct from "effect/Struct";
 import {
   toPersistenceDecodeError,

apps/server/src/persistence/Layers/Sqlite.ts+4-1

...	@@ -1,4 +1,7 @@	...	@@ -1,4 +1,7 @@
1	import { Effect, Layer, FileSystem, Path } from "effect";	1	import * as Effect from "effect/Effect";
		2	import * as Layer from "effect/Layer";
		3	import * as FileSystem from "effect/FileSystem";
		4	import * as Path from "effect/Path";
2	import * as SqlClient from "effect/unstable/sql/SqlClient";	5	import * as SqlClient from "effect/unstable/sql/SqlClient";
3		6
4	import { runMigrations } from "../Migrations.ts";	7	import { runMigrations } from "../Migrations.ts";

apps/server/src/persistence/Migrations/016_CanonicalizeModelSelections.test.ts+9-8

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	import { assert, it } from "@effect/vitest";	1	import { assert, it } from "@effect/vitest";
2	import { Effect, Layer } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
3	import * as SqlClient from "effect/unstable/sql/SqlClient";	4	import * as SqlClient from "effect/unstable/sql/SqlClient";
4		5
5	import { runMigrations } from "../Migrations.ts";	6	import { runMigrations } from "../Migrations.ts";
...	@@ -264,7 +265,7 @@ layer("016_CanonicalizeModelSelections", (it) => {	...	@@ -264,7 +265,7 @@ layer("016_CanonicalizeModelSelections", (it) => {
264	FROM orchestration_events	265	FROM orchestration_events
265	ORDER BY rowid ASC	266	ORDER BY rowid ASC
266	`;	267	`;
267		268	// @effect-diagnostics-next-line preferSchemaOverJson:off
268	assert.deepStrictEqual(JSON.parse(eventRows[0]!.payloadJson), {	269	assert.deepStrictEqual(JSON.parse(eventRows[0]!.payloadJson), {
269	projectId: "project-1",	270	projectId: "project-1",
270	title: "Project",	271	title: "Project",
...	@@ -280,7 +281,7 @@ layer("016_CanonicalizeModelSelections", (it) => {	...	@@ -280,7 +281,7 @@ layer("016_CanonicalizeModelSelections", (it) => {
280	createdAt: "2026-01-01T00:00:00.000Z",	281	createdAt: "2026-01-01T00:00:00.000Z",
281	updatedAt: "2026-01-01T00:00:00.000Z",	282	updatedAt: "2026-01-01T00:00:00.000Z",
282	});	283	});
283		284	// @effect-diagnostics-next-line preferSchemaOverJson:off
284	assert.deepStrictEqual(JSON.parse(eventRows[1]!.payloadJson), {	285	assert.deepStrictEqual(JSON.parse(eventRows[1]!.payloadJson), {
285	projectId: "project-2",	286	projectId: "project-2",
286	title: "Fallback Project",	287	title: "Fallback Project",
...	@@ -296,7 +297,7 @@ layer("016_CanonicalizeModelSelections", (it) => {	...	@@ -296,7 +297,7 @@ layer("016_CanonicalizeModelSelections", (it) => {
296	createdAt: "2026-01-01T00:00:00.000Z",	297	createdAt: "2026-01-01T00:00:00.000Z",
297	updatedAt: "2026-01-01T00:00:00.000Z",	298	updatedAt: "2026-01-01T00:00:00.000Z",
298	});	299	});
299		300	// @effect-diagnostics-next-line preferSchemaOverJson:off
300	assert.deepStrictEqual(JSON.parse(eventRows[2]!.payloadJson), {	301	assert.deepStrictEqual(JSON.parse(eventRows[2]!.payloadJson), {
301	projectId: "project-3",	302	projectId: "project-3",
302	title: "Null Model Project",	303	title: "Null Model Project",
...	@@ -306,7 +307,7 @@ layer("016_CanonicalizeModelSelections", (it) => {	...	@@ -306,7 +307,7 @@ layer("016_CanonicalizeModelSelections", (it) => {
306	createdAt: "2026-01-01T00:00:00.000Z",	307	createdAt: "2026-01-01T00:00:00.000Z",
307	updatedAt: "2026-01-01T00:00:00.000Z",	308	updatedAt: "2026-01-01T00:00:00.000Z",
308	});	309	});
309		310	// @effect-diagnostics-next-line preferSchemaOverJson:off
310	assert.deepStrictEqual(JSON.parse(eventRows[3]!.payloadJson), {	311	assert.deepStrictEqual(JSON.parse(eventRows[3]!.payloadJson), {
311	threadId: "thread-1",	312	threadId: "thread-1",
312	projectId: "project-1",	313	projectId: "project-1",
...	@@ -326,7 +327,7 @@ layer("016_CanonicalizeModelSelections", (it) => {	...	@@ -326,7 +327,7 @@ layer("016_CanonicalizeModelSelections", (it) => {
326	createdAt: "2026-01-01T00:00:00.000Z",	327	createdAt: "2026-01-01T00:00:00.000Z",
327	updatedAt: "2026-01-01T00:00:00.000Z",	328	updatedAt: "2026-01-01T00:00:00.000Z",
328	});	329	});
329		330	// @effect-diagnostics-next-line preferSchemaOverJson:off
330	assert.deepStrictEqual(JSON.parse(eventRows[4]!.payloadJson), {	331	assert.deepStrictEqual(JSON.parse(eventRows[4]!.payloadJson), {
331	threadId: "thread-2",	332	threadId: "thread-2",
332	projectId: "project-1",	333	projectId: "project-1",
...	@@ -345,7 +346,7 @@ layer("016_CanonicalizeModelSelections", (it) => {	...	@@ -345,7 +346,7 @@ layer("016_CanonicalizeModelSelections", (it) => {
345	createdAt: "2026-01-01T00:00:00.000Z",	346	createdAt: "2026-01-01T00:00:00.000Z",
346	updatedAt: "2026-01-01T00:00:00.000Z",	347	updatedAt: "2026-01-01T00:00:00.000Z",
347	});	348	});
348		349	// @effect-diagnostics-next-line preferSchemaOverJson:off
349	assert.deepStrictEqual(JSON.parse(eventRows[5]!.payloadJson), {	350	assert.deepStrictEqual(JSON.parse(eventRows[5]!.payloadJson), {
350	threadId: "thread-1",	351	threadId: "thread-1",
351	turnId: "turn-1",	352	turnId: "turn-1",
...	@@ -359,7 +360,7 @@ layer("016_CanonicalizeModelSelections", (it) => {	...	@@ -359,7 +360,7 @@ layer("016_CanonicalizeModelSelections", (it) => {
359	},	360	},
360	deliveryMode: "buffered",	361	deliveryMode: "buffered",
361	});	362	});
362		363	// @effect-diagnostics-next-line preferSchemaOverJson:off
363	assert.deepStrictEqual(JSON.parse(eventRows[6]!.payloadJson), {	364	assert.deepStrictEqual(JSON.parse(eventRows[6]!.payloadJson), {
364	threadId: "thread-3",	365	threadId: "thread-3",
365	projectId: "project-1",	366	projectId: "project-1",

apps/server/src/persistence/Migrations/019_ProjectionSnapshotLookupIndexes.test.ts+2-1

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	import { assert, it } from "@effect/vitest";	1	import { assert, it } from "@effect/vitest";
2	import { Effect, Layer } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
3	import * as SqlClient from "effect/unstable/sql/SqlClient";	4	import * as SqlClient from "effect/unstable/sql/SqlClient";
4		5
5	import { runMigrations } from "../Migrations.ts";	6	import { runMigrations } from "../Migrations.ts";

apps/server/src/persistence/Migrations/024_BackfillProjectionThreadShellSummary.test.ts+2-1

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	import { assert, it } from "@effect/vitest";	1	import { assert, it } from "@effect/vitest";
2	import { Effect, Layer } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
3	import * as SqlClient from "effect/unstable/sql/SqlClient";	4	import * as SqlClient from "effect/unstable/sql/SqlClient";
4		5
5	import { runMigrations } from "../Migrations.ts";	6	import { runMigrations } from "../Migrations.ts";

apps/server/src/persistence/Migrations/025_CleanupInvalidProjectionPendingApprovals.test.ts+2-1

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	import { assert, it } from "@effect/vitest";	1	import { assert, it } from "@effect/vitest";
2	import { Effect, Layer } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
3	import * as SqlClient from "effect/unstable/sql/SqlClient";	4	import * as SqlClient from "effect/unstable/sql/SqlClient";
4		5
5	import { runMigrations } from "../Migrations.ts";	6	import { runMigrations } from "../Migrations.ts";

apps/server/src/persistence/Migrations/026_CanonicalizeModelSelectionOptions.test.ts+2-1

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	import { assert, it } from "@effect/vitest";	1	import { assert, it } from "@effect/vitest";
2	import { Effect, Layer } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
3	import * as SqlClient from "effect/unstable/sql/SqlClient";	4	import * as SqlClient from "effect/unstable/sql/SqlClient";
4		5
5	import { runMigrations } from "../Migrations.ts";	6	import { runMigrations } from "../Migrations.ts";

apps/server/src/persistence/Migrations/027_028_ProviderInstanceIdColumns.test.ts+2-1

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	import { assert, it } from "@effect/vitest";	1	import { assert, it } from "@effect/vitest";
2	import { Effect, Layer } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
3	import * as SqlClient from "effect/unstable/sql/SqlClient";	4	import * as SqlClient from "effect/unstable/sql/SqlClient";
4		5
5	import { runMigrations } from "../Migrations.ts";	6	import { runMigrations } from "../Migrations.ts";

apps/server/src/persistence/Migrations/029_ProjectionThreadDetailOrderingIndexes.test.ts+2-1

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	import { assert, it } from "@effect/vitest";	1	import { assert, it } from "@effect/vitest";
2	import { Effect, Layer } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
3	import * as SqlClient from "effect/unstable/sql/SqlClient";	4	import * as SqlClient from "effect/unstable/sql/SqlClient";
4		5
5	import { runMigrations } from "../Migrations.ts";	6	import { runMigrations } from "../Migrations.ts";

apps/server/src/persistence/NodeSqliteClient.test.ts+1-1

...	@@ -1,5 +1,5 @@	...	@@ -1,5 +1,5 @@
1	import { assert, it } from "@effect/vitest";	1	import { assert, it } from "@effect/vitest";
2	import { Effect } from "effect";	2	import * as Effect from "effect/Effect";
3	import * as SqlClient from "effect/unstable/sql/SqlClient";	3	import * as SqlClient from "effect/unstable/sql/SqlClient";
4		4
5	import * as SqliteClient from "./NodeSqliteClient.ts";	5	import * as SqliteClient from "./NodeSqliteClient.ts";

apps/server/src/persistence/Services/AuthPairingLinks.ts+4-2

...	@@ -1,5 +1,7 @@	...	@@ -1,5 +1,7 @@
1	import { Option, Schema, Context } from "effect";	1	import * as Option from "effect/Option";
2	import type { Effect } from "effect";	2	import * as Schema from "effect/Schema";
		3	import * as Context from "effect/Context";
		4	import type * as Effect from "effect/Effect";
3		5
4	import type { AuthPairingLinkRepositoryError } from "../Errors.ts";	6	import type { AuthPairingLinkRepositoryError } from "../Errors.ts";
5		7

apps/server/src/persistence/Services/AuthSessions.ts+4-2

...	@@ -1,6 +1,8 @@	...	@@ -1,6 +1,8 @@
1	import { AuthClientMetadataDeviceType, AuthSessionId } from "@t3tools/contracts";	1	import { AuthClientMetadataDeviceType, AuthSessionId } from "@t3tools/contracts";
2	import { Option, Schema, Context } from "effect";	2	import * as Option from "effect/Option";
3	import type { Effect } from "effect";	3	import * as Schema from "effect/Schema";
		4	import * as Context from "effect/Context";
		5	import type * as Effect from "effect/Effect";
4		6
5	import type { AuthSessionRepositoryError } from "../Errors.ts";	7	import type { AuthSessionRepositoryError } from "../Errors.ts";
6		8

apps/server/src/persistence/Services/OrchestrationCommandReceipts.ts+4-2

 @@ -15,8 +15,10 @@ import {
   ProjectId,
   ThreadId,
 } from "@t3tools/contracts";
-import { Option, Schema, Context } from "effect";
+import * as Option from "effect/Option";
-import type { Effect } from "effect";
+import * as Schema from "effect/Schema";
+import * as Context from "effect/Context";
+import type * as Effect from "effect/Effect";
 import type { OrchestrationCommandReceiptRepositoryError } from "../Errors.ts";

apps/server/src/persistence/Services/OrchestrationEventStore.ts+3-2

 @@ -10,8 +10,9 @@
  * @module OrchestrationEventStore
  */
 import { OrchestrationEvent } from "@t3tools/contracts";
-import { Context } from "effect";
+import * as Context from "effect/Context";
-import type { Effect, Stream } from "effect";
+import type * as Effect from "effect/Effect";
+import type * as Stream from "effect/Stream";
 import type { OrchestrationEventStoreError } from "../Errors.ts";

apps/server/src/persistence/Services/ProjectionCheckpoints.ts+4-2

 @@ -16,8 +16,10 @@ import {
   ThreadId,
   TurnId,
 } from "@t3tools/contracts";
-import { Option, Context, Schema } from "effect";
+import * as Option from "effect/Option";
-import type { Effect } from "effect";
+import * as Context from "effect/Context";
+import * as Schema from "effect/Schema";
+import type * as Effect from "effect/Effect";
 import type { ProjectionRepositoryError } from "../Errors.ts";

apps/server/src/persistence/Services/ProjectionPendingApprovals.ts+4-2

 @@ -14,8 +14,10 @@ import {
   ThreadId,
   TurnId,
 } from "@t3tools/contracts";
-import { Option, Schema, Context } from "effect";
+import * as Option from "effect/Option";
-import type { Effect } from "effect";
+import * as Schema from "effect/Schema";
+import * as Context from "effect/Context";
+import type * as Effect from "effect/Effect";
 import type { ProjectionRepositoryError } from "../Errors.ts";

apps/server/src/persistence/Services/ProjectionProjects.ts+4-2

 @@ -7,8 +7,10 @@
  * @module ProjectionProjectRepository
  */
 import { IsoDateTime, ModelSelection, ProjectId, ProjectScript } from "@t3tools/contracts";
-import { Option, Schema, Context } from "effect";
+import * as Option from "effect/Option";
-import type { Effect } from "effect";
+import * as Schema from "effect/Schema";
+import * as Context from "effect/Context";
+import type * as Effect from "effect/Effect";
 import type { ProjectionRepositoryError } from "../Errors.ts";

apps/server/src/persistence/Services/ProjectionState.ts+4-2

 @@ -7,8 +7,10 @@
  * @module ProjectionStateRepository
  */
 import { IsoDateTime, NonNegativeInt } from "@t3tools/contracts";
-import { Option, Schema, Context } from "effect";
+import * as Option from "effect/Option";
-import type { Effect } from "effect";
+import * as Schema from "effect/Schema";
+import * as Context from "effect/Context";
+import type * as Effect from "effect/Effect";
 import type { ProjectionRepositoryError } from "../Errors.ts";

apps/server/src/persistence/Services/ProjectionThreadActivities.ts+3-2

 @@ -14,8 +14,9 @@ import {
   ThreadId,
   TurnId,
 } from "@t3tools/contracts";
-import { Schema, Context } from "effect";
+import * as Schema from "effect/Schema";
-import type { Effect } from "effect";
+import * as Context from "effect/Context";
+import type * as Effect from "effect/Effect";
 import type { ProjectionRepositoryError } from "../Errors.ts";

apps/server/src/persistence/Services/ProjectionThreadMessages.ts+4-3

 @@ -14,9 +14,10 @@ import {
   TurnId,
   IsoDateTime,
 } from "@t3tools/contracts";
-import { Schema, Context } from "effect";
+import * as Schema from "effect/Schema";
-import type { Option } from "effect";
+import * as Context from "effect/Context";
-import type { Effect } from "effect";
+import type * as Option from "effect/Option";
+import type * as Effect from "effect/Effect";
 import type { ProjectionRepositoryError } from "../Errors.ts";

apps/server/src/persistence/Services/ProjectionThreadProposedPlans.ts+3-2

 @@ -5,8 +5,9 @@ import {
   TrimmedNonEmptyString,
   TurnId,
 } from "@t3tools/contracts";
-import { Schema, Context } from "effect";
+import * as Schema from "effect/Schema";
-import type { Effect } from "effect";
+import * as Context from "effect/Context";
+import type * as Effect from "effect/Effect";
 import type { ProjectionRepositoryError } from "../Errors.ts";

apps/server/src/persistence/Services/ProjectionThreadSessions.ts+4-2

 @@ -14,8 +14,10 @@ import {
   ThreadId,
   TurnId,
 } from "@t3tools/contracts";
-import { Option, Schema, Context } from "effect";
+import * as Option from "effect/Option";
-import type { Effect } from "effect";
+import * as Schema from "effect/Schema";
+import * as Context from "effect/Context";
+import type * as Effect from "effect/Effect";
 import type { ProjectionRepositoryError } from "../Errors.ts";

apps/server/src/persistence/Services/ProjectionThreads.ts+4-2

 @@ -16,8 +16,10 @@ import {
   ThreadId,
   TurnId,
 } from "@t3tools/contracts";
-import { Option, Schema, Context } from "effect";
+import * as Option from "effect/Option";
-import type { Effect } from "effect";
+import * as Schema from "effect/Schema";
+import * as Context from "effect/Context";
+import type * as Effect from "effect/Effect";
 import type { ProjectionRepositoryError } from "../Errors.ts";

apps/server/src/persistence/Services/ProjectionTurns.ts+4-2

 @@ -17,8 +17,10 @@ import {
   ThreadId,
   TurnId,
 } from "@t3tools/contracts";
-import { Option, Schema, Context } from "effect";
+import * as Option from "effect/Option";
-import type { Effect } from "effect";
+import * as Schema from "effect/Schema";
+import * as Context from "effect/Context";
+import type * as Effect from "effect/Effect";
 import type { ProjectionRepositoryError } from "../Errors.ts";

apps/server/src/persistence/Services/ProviderSessionRuntime.ts+4-2

 @@ -12,8 +12,10 @@ import {
   RuntimeMode,
   ThreadId,
 } from "@t3tools/contracts";
-import { Option, Schema, Context } from "effect";
+import * as Option from "effect/Option";
-import type { Effect } from "effect";
+import * as Schema from "effect/Schema";
+import * as Context from "effect/Context";
+import type * as Effect from "effect/Effect";
 import type { ProviderSessionRuntimeRepositoryError } from "../Errors.ts";

apps/server/src/processRunner.ts+9-6

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import { type ChildProcess as ChildProcessHandle, spawn, spawnSync } from "node:child_process";	2	import { type ChildProcess as ChildProcessHandle, spawn, spawnSync } from "node:child_process";
2		3	import * as NodeTimers from "node:timers";
3	export interface ProcessRunOptions {	4	export interface ProcessRunOptions {
4	cwd?: string \| undefined;	5	cwd?: string \| undefined;
5	timeoutMs?: number \| undefined;	6	timeoutMs?: number \| undefined;
...	@@ -163,12 +164,14 @@ export async function runProcess(	...	@@ -163,12 +164,14 @@ export async function runProcess(
163	let stderrTruncated = false;	164	let stderrTruncated = false;
164	let timedOut = false;	165	let timedOut = false;
165	let settled = false;	166	let settled = false;
166	let forceKillTimer: ReturnType<typeof setTimeout> \| null = null;	167	let forceKillTimer: ReturnType<typeof NodeTimers.setTimeout> \| null = null;
167		168
168	const timeoutTimer = setTimeout(() => {	169	// @effect-diagnostics-next-line globalTimers:off - Promise/child_process boundary; moving this runner to Effect timers is a separate refactor.
		170	const timeoutTimer = NodeTimers.setTimeout(() => {
169	timedOut = true;	171	timedOut = true;
170	killChild(child, "SIGTERM");	172	killChild(child, "SIGTERM");
171	forceKillTimer = setTimeout(() => {	173	// @effect-diagnostics-next-line globalTimers:off - Promise/child_process boundary; see timeout timer above.
		174	forceKillTimer = NodeTimers.setTimeout(() => {
172	killChild(child, "SIGKILL");	175	killChild(child, "SIGKILL");
173	}, 1_000);	176	}, 1_000);
174	}, timeoutMs);	177	}, timeoutMs);
...	@@ -176,9 +179,9 @@ export async function runProcess(	...	@@ -176,9 +179,9 @@ export async function runProcess(
176	const finalize = (callback: () => void): void => {	179	const finalize = (callback: () => void): void => {
177	if (settled) return;	180	if (settled) return;
178	settled = true;	181	settled = true;
179	clearTimeout(timeoutTimer);	182	NodeTimers.clearTimeout(timeoutTimer);
180	if (forceKillTimer) {	183	if (forceKillTimer) {
181	clearTimeout(forceKillTimer);	184	NodeTimers.clearTimeout(forceKillTimer);
182	}	185	}
183	callback();	186	callback();
184	};	187	};

apps/server/src/project/Layers/ProjectFaviconResolver.test.ts+4-1

 @@ -1,6 +1,9 @@
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { it, describe, expect } from "@effect/vitest";
-import { Effect, FileSystem, Layer, Path } from "effect";
+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 { ProjectFaviconResolver } from "../Services/ProjectFaviconResolver.ts";
 import { ProjectFaviconResolverLive } from "./ProjectFaviconResolver.ts";

apps/server/src/project/Layers/ProjectFaviconResolver.ts+4-1

...	@@ -1,4 +1,7 @@	...	@@ -1,4 +1,7 @@
1	import { Effect, FileSystem, Layer, Path } from "effect";	1	import * as Effect from "effect/Effect";
		2	import * as FileSystem from "effect/FileSystem";
		3	import * as Layer from "effect/Layer";
		4	import * as Path from "effect/Path";
2		5
3	import {	6	import {
4	ProjectFaviconResolver,	7	ProjectFaviconResolver,

apps/server/src/project/Layers/ProjectSetupScriptRunner.test.ts+3-1

...	@@ -1,5 +1,7 @@	...	@@ -1,5 +1,7 @@
1	import { ProjectId, type OrchestrationProject } from "@t3tools/contracts";	1	import { ProjectId, type OrchestrationProject } from "@t3tools/contracts";
2	import { Effect, Layer, Option } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
		4	import * as Option from "effect/Option";
3	import { describe, expect, it, vi } from "vitest";	5	import { describe, expect, it, vi } from "vitest";
4		6
5	import { ProjectionSnapshotQuery } from "../../orchestration/Services/ProjectionSnapshotQuery.ts";	7	import { ProjectionSnapshotQuery } from "../../orchestration/Services/ProjectionSnapshotQuery.ts";

apps/server/src/project/Layers/ProjectSetupScriptRunner.ts+27-3

...	@@ -1,12 +1,15 @@	...	@@ -1,12 +1,15 @@
1	import { ProjectId } from "@t3tools/contracts";	1	import { ProjectId } from "@t3tools/contracts";
2	import { projectScriptRuntimeEnv, setupProjectScript } from "@t3tools/shared/projectScripts";	2	import { projectScriptRuntimeEnv, setupProjectScript } from "@t3tools/shared/projectScripts";
3	import { Effect, Layer, Option } from "effect";	3	import * as Effect from "effect/Effect";
		4	import * as Layer from "effect/Layer";
		5	import * as Option from "effect/Option";
4		6
5	import { ProjectionSnapshotQuery } from "../../orchestration/Services/ProjectionSnapshotQuery.ts";	7	import { ProjectionSnapshotQuery } from "../../orchestration/Services/ProjectionSnapshotQuery.ts";
6	import { TerminalManager } from "../../terminal/Services/Manager.ts";	8	import { TerminalManager } from "../../terminal/Services/Manager.ts";
7	import {	9	import {
8	type ProjectSetupScriptRunnerShape,	10	type ProjectSetupScriptRunnerShape,
9	ProjectSetupScriptRunner,	11	ProjectSetupScriptRunner,
		12	ProjectSetupScriptRunnerError,
10	} from "../Services/ProjectSetupScriptRunner.ts";	13	} from "../Services/ProjectSetupScriptRunner.ts";
11		14
12	const makeProjectSetupScriptRunner = Effect.gen(function* () {	15	const makeProjectSetupScriptRunner = Effect.gen(function* () {
...	@@ -29,7 +32,9 @@ const makeProjectSetupScriptRunner = Effect.gen(function* () {	...	@@ -29,7 +32,9 @@ const makeProjectSetupScriptRunner = Effect.gen(function* () {
29	null;	32	null;
30		33
31	if (!project) {	34	if (!project) {
32	return yield* Effect.fail(new Error("Project was not found for setup script execution."));	35	return yield* new ProjectSetupScriptRunnerError({
		36	message: "Project was not found for setup script execution.",
		37	});
33	}	38	}
34		39
35	const script = setupProjectScript(project.scripts);	40	const script = setupProjectScript(project.scripts);
...	@@ -66,7 +71,26 @@ const makeProjectSetupScriptRunner = Effect.gen(function* () {	...	@@ -66,7 +71,26 @@ const makeProjectSetupScriptRunner = Effect.gen(function* () {
66	terminalId,	71	terminalId,
67	cwd,	72	cwd,
68	} as const;	73	} as const;
69	});	74	}).pipe(
		75	Effect.mapError((cause) => {
		76	if (
		77	typeof cause === "object" &&
		78	cause !== null &&
		79	"_tag" in cause &&
		80	cause._tag === "ProjectSetupScriptRunnerError"
		81	) {
		82	return cause as ProjectSetupScriptRunnerError;
		83	}
		84	const message =
		85	typeof cause === "object" &&
		86	cause !== null &&
		87	"message" in cause &&
		88	typeof cause.message === "string"
		89	? cause.message
		90	: String(cause);
		91	return new ProjectSetupScriptRunnerError({ message });
		92	}),
		93	);
70		94
71	return {	95	return {
72	runForThread,	96	runForThread,

apps/server/src/project/Layers/RepositoryIdentityResolver.test.ts+6-2

 @@ -1,9 +1,13 @@
+// @effect-diagnostics nodeBuiltinImport:off
 import { realpathSync } from "node:fs";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { expect, it } from "@effect/vitest";
-import { Duration, Effect, FileSystem, Layer } from "effect";
+import * as Duration from "effect/Duration";
-import { TestClock } from "effect/testing";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
+import * as TestClock from "effect/testing/TestClock";
 import { runProcess } from "../../processRunner.ts";
 import { RepositoryIdentityResolver } from "../Services/RepositoryIdentityResolver.ts";

apps/server/src/project/Layers/RepositoryIdentityResolver.ts+5-1

 @@ -1,5 +1,9 @@
 import type { RepositoryIdentity } from "@t3tools/contracts";
-import { Cache, Duration, Effect, Exit, Layer } from "effect";
+import * as Cache from "effect/Cache";
+import * as Duration from "effect/Duration";
+import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
+import * as Layer from "effect/Layer";
 import {
   detectSourceControlProviderFromGitRemoteUrl,
   normalizeGitRemoteUrl,

apps/server/src/project/Services/ProjectFaviconResolver.ts+2-2

...	@@ -6,8 +6,8 @@	...	@@ -6,8 +6,8 @@
6	*	6	*
7	* @module ProjectFaviconResolver	7	* @module ProjectFaviconResolver
8	*/	8	*/
9	import { Context } from "effect";	9	import * as Context from "effect/Context";
10	import type { Effect } from "effect";	10	import type * as Effect from "effect/Effect";
11		11
12	/**	12	/**
13	* ProjectFaviconResolverShape - Service API for project favicon lookup.	13	* ProjectFaviconResolverShape - Service API for project favicon lookup.

apps/server/src/project/Services/ProjectSetupScriptRunner.ts+10-3

 @@ -1,5 +1,6 @@
-import { Context } from "effect";
+import * as Context from "effect/Context";
-import type { Effect } from "effect";
+import * as Data from "effect/Data";
+import type * as Effect from "effect/Effect";
 export interface ProjectSetupScriptRunnerResultNoScript {
   readonly status: "no-script";
 @@ -25,10 +26,16 @@ export interface ProjectSetupScriptRunnerInput {
   readonly preferredTerminalId?: string;
 }
+export class ProjectSetupScriptRunnerError extends Data.TaggedError(
+  "ProjectSetupScriptRunnerError",
+)<{
+  readonly message: string;
+}> {}
 export interface ProjectSetupScriptRunnerShape {
   readonly runForThread: (
     input: ProjectSetupScriptRunnerInput,
-  ) => Effect.Effect<ProjectSetupScriptRunnerResult, Error>;
+  ) => Effect.Effect<ProjectSetupScriptRunnerResult, ProjectSetupScriptRunnerError>;
 }
 export class ProjectSetupScriptRunner extends Context.Service<

apps/server/src/project/Services/RepositoryIdentityResolver.ts+2-2

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	import type { RepositoryIdentity } from "@t3tools/contracts";	1	import type { RepositoryIdentity } from "@t3tools/contracts";
2	import { Context } from "effect";	2	import * as Context from "effect/Context";
3	import type { Effect } from "effect";	3	import type * as Effect from "effect/Effect";
4		4
5	export interface RepositoryIdentityResolverShape {	5	export interface RepositoryIdentityResolverShape {
6	readonly resolve: (cwd: string) => Effect.Effect<RepositoryIdentity \| null>;	6	readonly resolve: (cwd: string) => Effect.Effect<RepositoryIdentity \| null>;

apps/server/src/provider/Drivers/ClaudeDriver.ts+9-2

 @@ -13,7 +13,13 @@
  * @module provider/Drivers/ClaudeDriver
  */
 import { ClaudeSettings, ProviderDriverKind, type ServerProvider } from "@t3tools/contracts";
-import { Cache, Duration, Effect, FileSystem, Path, Schema, Stream } from "effect";
+import * as Cache from "effect/Cache";
+import * as Duration from "effect/Duration";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
+import * as Stream from "effect/Stream";
 import { HttpClient } from "effect/unstable/http";
 import { ChildProcessSpawner } from "effect/unstable/process";
 @@ -159,7 +165,8 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv> = {
         getSettings: Effect.succeed(effectiveConfig),
         streamSettings: Stream.never,
         haveSettingsChanged: () => false,
-        initialSnapshot: (settings) => stampIdentity(makePendingClaudeProvider(settings)),
+        initialSnapshot: (settings) =>
+          makePendingClaudeProvider(settings).pipe(Effect.map(stampIdentity)),
         checkProvider,
         enrichSnapshot: ({ snapshot, publishSnapshot }) =>
           enrichProviderSnapshotWithVersionAdvisory(snapshot, maintenanceCapabilities).pipe(

apps/server/src/provider/Drivers/ClaudeHome.test.ts+2-1

...	@@ -2,7 +2,8 @@ import * as NodeOS from "node:os";	...	@@ -2,7 +2,8 @@ import * as NodeOS from "node:os";
2		2
3	import * as NodeServices from "@effect/platform-node/NodeServices";	3	import * as NodeServices from "@effect/platform-node/NodeServices";
4	import { describe, expect, it } from "@effect/vitest";	4	import { describe, expect, it } from "@effect/vitest";
5	import { Effect, Path } from "effect";	5	import * as Effect from "effect/Effect";
		6	import * as Path from "effect/Path";
6		7
7	import {	8	import {
8	makeClaudeCapabilitiesCacheKey,	9	makeClaudeCapabilitiesCacheKey,

apps/server/src/provider/Drivers/ClaudeHome.ts+2-1

...	@@ -1,7 +1,8 @@	...	@@ -1,7 +1,8 @@
1	import * as NodeOS from "node:os";	1	import * as NodeOS from "node:os";
2		2
3	import type { ClaudeSettings } from "@t3tools/contracts";	3	import type { ClaudeSettings } from "@t3tools/contracts";
4	import { Effect, Path } from "effect";	4	import * as Effect from "effect/Effect";
		5	import * as Path from "effect/Path";
5		6
6	import { expandHomePath } from "../../pathExpansion.ts";	7	import { expandHomePath } from "../../pathExpansion.ts";
7		8

apps/server/src/provider/Drivers/CodexDriver.ts+8-2

 @@ -22,7 +22,12 @@
  * @module provider/Drivers/CodexDriver
  */
 import { CodexSettings, ProviderDriverKind, type ServerProvider } from "@t3tools/contracts";
-import { Duration, Effect, FileSystem, Path, Schema, Stream } from "effect";
+import * as Duration from "effect/Duration";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
+import * as Stream from "effect/Stream";
 import { HttpClient } from "effect/unstable/http";
 import { ChildProcessSpawner } from "effect/unstable/process";
 @@ -160,7 +165,8 @@ export const CodexDriver: ProviderDriver<CodexSettings, CodexDriverEnv> = {
         getSettings: Effect.succeed(effectiveConfig),
         streamSettings: Stream.never,
         haveSettingsChanged: () => false,
-        initialSnapshot: (settings) => stampIdentity(makePendingCodexProvider(settings)),
+        initialSnapshot: (settings) =>
+          makePendingCodexProvider(settings).pipe(Effect.map(stampIdentity)),
         checkProvider,
         enrichSnapshot: ({ snapshot, publishSnapshot }) =>
           enrichProviderSnapshotWithVersionAdvisory(snapshot, maintenanceCapabilities).pipe(

apps/server/src/provider/Drivers/CodexHomeLayout.test.ts+4-1

 @@ -1,6 +1,9 @@
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { describe, expect, it } from "@effect/vitest";
-import { Effect, FileSystem, Path, Schema } from "effect";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
 import { CodexSettings } from "@t3tools/contracts";
 import {

apps/server/src/provider/Drivers/CodexHomeLayout.ts+4-1

 @@ -1,7 +1,10 @@
 import * as NodeOS from "node:os";
 import { ProviderDriverKind, type CodexSettings } from "@t3tools/contracts";
-import { Effect, FileSystem, Path, Schema } from "effect";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
 import * as PlatformError from "effect/PlatformError";
 import { expandHomePath } from "../../pathExpansion.ts";

apps/server/src/provider/Drivers/CursorDriver.ts+8-2

 @@ -13,7 +13,12 @@
  * @module provider/Drivers/CursorDriver
  */
 import { CursorSettings, ProviderDriverKind, type ServerProvider } from "@t3tools/contracts";
-import { Duration, Effect, FileSystem, Path, Schema, Stream } from "effect";
+import * as Duration from "effect/Duration";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
+import * as Stream from "effect/Stream";
 import { HttpClient } from "effect/unstable/http";
 import { ChildProcessSpawner } from "effect/unstable/process";
 @@ -128,7 +133,8 @@ export const CursorDriver: ProviderDriver<CursorSettings, CursorDriverEnv> = {
         getSettings: Effect.succeed(effectiveConfig),
         streamSettings: Stream.never,
         haveSettingsChanged: () => false,
-        initialSnapshot: (settings) => stampIdentity(buildInitialCursorProviderSnapshot(settings)),
+        initialSnapshot: (settings) =>
+          buildInitialCursorProviderSnapshot(settings).pipe(Effect.map(stampIdentity)),
         checkProvider,
         // Preserve the background ACP model-capability probe that used to
         // live on `CursorProviderLive`. Only fires when the snapshot reports

apps/server/src/provider/Drivers/OpenCodeDriver.ts+8-2

 @@ -13,7 +13,12 @@
  * @module provider/Drivers/OpenCodeDriver
  */
 import { OpenCodeSettings, ProviderDriverKind, type ServerProvider } from "@t3tools/contracts";
-import { Duration, Effect, FileSystem, Path, Schema, Stream } from "effect";
+import * as Duration from "effect/Duration";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
+import * as Stream from "effect/Stream";
 import { HttpClient } from "effect/unstable/http";
 import { ChildProcessSpawner } from "effect/unstable/process";
 @@ -139,7 +144,8 @@ export const OpenCodeDriver: ProviderDriver<OpenCodeSettings, OpenCodeDriverEnv>
         getSettings: Effect.succeed(effectiveConfig),
         streamSettings: Stream.never,
         haveSettingsChanged: () => false,
-        initialSnapshot: (settings) => stampIdentity(makePendingOpenCodeProvider(settings)),
+        initialSnapshot: (settings) =>
+          makePendingOpenCodeProvider(settings).pipe(Effect.map(stampIdentity)),
         checkProvider,
         enrichSnapshot: ({ snapshot, publishSnapshot }) =>
           enrichProviderSnapshotWithVersionAdvisory(snapshot, maintenanceCapabilities).pipe(

apps/server/src/provider/Errors.ts+1-1

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	import { Schema } from "effect";	1	import * as Schema from "effect/Schema";
2		2
3	import type { CheckpointServiceError } from "../checkpointing/Errors.ts";	3	import type { CheckpointServiceError } from "../checkpointing/Errors.ts";
4		4

apps/server/src/provider/Layers/ClaudeAdapter.test.ts+11-2

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";	2	import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
2	import os from "node:os";	3	import os from "node:os";
3	import path from "node:path";	4	import path from "node:path";
...	@@ -22,7 +23,14 @@ import {	...	@@ -22,7 +23,14 @@ import {
22	} from "@t3tools/contracts";	23	} from "@t3tools/contracts";
23	import { createModelSelection } from "@t3tools/shared/model";	24	import { createModelSelection } from "@t3tools/shared/model";
24	import { assert, describe, it } from "@effect/vitest";	25	import { assert, describe, it } from "@effect/vitest";
25	import { Context, Effect, Fiber, Layer, Random, Schema, Stream } from "effect";	26	import * as Context from "effect/Context";
		27	import * as Effect from "effect/Effect";
		28	import * as Fiber from "effect/Fiber";
		29	import * as Layer from "effect/Layer";
		30	import * as Random from "effect/Random";
		31	import * as Schema from "effect/Schema";
		32	import * as Stream from "effect/Stream";
		33	import * as TestClock from "effect/testing/TestClock";
26		34
27	import { attachmentRelativePath } from "../../attachmentStore.ts";	35	import { attachmentRelativePath } from "../../attachmentStore.ts";
28	import { ServerConfig } from "../../config.ts";	36	import { ServerConfig } from "../../config.ts";
...	@@ -1463,7 +1471,8 @@ describe("ClaudeAdapterLive", () => {	...	@@ -1463,7 +1471,8 @@ describe("ClaudeAdapterLive", () => {
1463	yield* Effect.yieldNow;	1471	yield* Effect.yieldNow;
1464	yield* Effect.yieldNow;	1472	yield* Effect.yieldNow;
1465	yield* Effect.yieldNow;	1473	yield* Effect.yieldNow;
1466	yield* Effect.promise(() => new Promise((resolve) => setTimeout(resolve, 50)));	1474	yield* TestClock.adjust("50 millis");
		1475	yield* Effect.yieldNow;
1467		1476
1468	runtimeEventsFiber.interruptUnsafe();	1477	runtimeEventsFiber.interruptUnsafe();
1469		1478

apps/server/src/provider/Layers/ClaudeAdapter.ts+65-36

 @@ -51,20 +51,19 @@ import {
   getProviderOptionDescriptors,
   resolvePromptInjectedEffort,
 } from "@t3tools/shared/model";
-import {
+import * as Cause from "effect/Cause";
-  Cause,
+import * as DateTime from "effect/DateTime";
-  DateTime,
+import * as Deferred from "effect/Deferred";
-  Deferred,
+import * as Effect from "effect/Effect";
-  Effect,
+import * as Exit from "effect/Exit";
-  Exit,
+import * as FileSystem from "effect/FileSystem";
-  FileSystem,
+import * as Fiber from "effect/Fiber";
-  Fiber,
+import * as Path from "effect/Path";
-  Path,
+import * as Queue from "effect/Queue";
-  Queue,
+import * as Random from "effect/Random";
-  Random,
+import * as Ref from "effect/Ref";
-  Ref,
+import * as Schema from "effect/Schema";
-  Stream,
+import * as Stream from "effect/Stream";
-} from "effect";
 import { resolveAttachmentPath } from "../../attachmentStore.ts";
 import { ServerConfig } from "../../config.ts";
 @@ -222,11 +221,22 @@ function toMessage(cause: unknown, fallback: string): string {
   return fallback;
 }
-function toError(cause: unknown, fallback: string): Error {
+function toProcessError(
-  return cause instanceof Error ? cause : new Error(toMessage(cause, fallback));
+  cause: unknown,
+  fallback: string,
+  threadId: ThreadId,
+): ProviderAdapterProcessError {
+  return new ProviderAdapterProcessError({
+    provider: PROVIDER,
+    threadId,
+    detail: toMessage(cause, fallback),
+    cause,
+  });
 }
-function normalizeClaudeStreamMessages(cause: Cause.Cause<Error>): ReadonlyArray<string> {
+function normalizeClaudeStreamMessages(
+  cause: Cause.Cause<{ readonly message: string }>,
+): ReadonlyArray<string> {
   const errors = Cause.prettyErrors(cause)
     .map((error) => error.message.trim())
     .filter((message) => message.length > 0);
 @@ -252,18 +262,23 @@ function isClaudeInterruptedMessage(message: string): boolean {
   );
 }
-function isClaudeInterruptedCause(cause: Cause.Cause<Error>): boolean {
+function isClaudeInterruptedCause(cause: Cause.Cause<{ readonly message: string }>): boolean {
   return (
     Cause.hasInterruptsOnly(cause) ||
     normalizeClaudeStreamMessages(cause).some(isClaudeInterruptedMessage)
   );
 }
-function messageFromClaudeStreamCause(cause: Cause.Cause<Error>, fallback: string): string {
+function messageFromClaudeStreamCause(
+  cause: Cause.Cause<{ readonly message: string }>,
+  fallback: string,
+): string {
   return normalizeClaudeStreamMessages(cause)[0] ?? fallback;
 }
-function interruptionMessageFromClaudeCause(cause: Cause.Cause<Error>): string {
+function interruptionMessageFromClaudeCause(
+  cause: Cause.Cause<{ readonly message: string }>,
+): string {
   const message = messageFromClaudeStreamCause(cause, "Claude runtime interrupted.");
   return isClaudeInterruptedMessage(message) ? "Claude runtime interrupted." : message;
 }
 @@ -530,7 +545,7 @@ function summarizeToolRequest(toolName: string, input: Record<string, unknown>):
     }
   }
-  const serialized = JSON.stringify(input);
+  const serialized = Schema.encodeUnknownSync(Schema.UnknownFromJsonString)(input);
   if (serialized.length <= 400) {
     return `${toolName}: ${serialized}`;
   }
 @@ -796,7 +811,7 @@ function exitPlanCaptureKey(input: {
 function tryParseJsonRecord(value: string): Record<string, unknown> | undefined {
   try {
-    const parsed = JSON.parse(value);
+    const parsed = Schema.decodeUnknownSync(Schema.UnknownFromJsonString)(value);
     return parsed && typeof parsed === "object" && !Array.isArray(parsed)
       ? (parsed as Record<string, unknown>)
       : undefined;
 @@ -807,7 +822,7 @@ function tryParseJsonRecord(value: string): Record<string, unknown> | undefined
 function toolInputFingerprint(input: Record<string, unknown>): string | undefined {
   try {
-    return JSON.stringify(input);
+    return Schema.encodeUnknownSync(Schema.UnknownFromJsonString)(input);
   } catch {
     return undefined;
   }
 @@ -1020,7 +1035,7 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
       return;
     }
-    const observedAt = new Date().toISOString();
+    const observedAt = yield* nowIso;
     const itemId = sdkNativeItemId(message);
     yield* nativeEventLogger.write(
 @@ -1030,7 +1045,7 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
           id:
             "uuid" in message && typeof message.uuid === "string"
               ? message.uuid
-              : crypto.randomUUID(),
+              : yield* Random.nextUUIDv4,
           kind: "notification",
           provider: PROVIDER,
           createdAt: observedAt,
 @@ -2353,9 +2368,11 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
     }
   });
-  const runSdkStream = (context: ClaudeSessionContext): Effect.Effect<void, Error> =>
+  const runSdkStream = (
+    context: ClaudeSessionContext,
+  ): Effect.Effect<void, ProviderAdapterProcessError> =>
     Stream.fromAsyncIterable(context.query, (cause) =>
-      toError(cause, "Claude runtime stream failed."),
+      toProcessError(cause, "Claude runtime stream failed.", context.session.threadId),
     ).pipe(
       Stream.takeWhile(() => !context.stopped),
       Stream.runForEach((message) => handleSdkMessage(context, message)),
 @@ -2363,7 +2380,7 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
   const handleStreamExit = Effect.fn("handleStreamExit")(function* (
     context: ClaudeSessionContext,
-    exit: Exit.Exit<void, Error>,
+    exit: Exit.Exit<void, ProviderAdapterProcessError>,
   ) {
     if (context.stopped) {
       return;
 @@ -2432,12 +2449,20 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
       yield* Fiber.interrupt(streamFiber);
     }
-    // @effect-diagnostics-next-line tryCatchInEffectGen:off
+    yield* Effect.try({
-    try {
+      try: () => context.query.close(),
-      context.query.close();
+      catch: (cause) =>
-    } catch (cause) {
+        new ProviderAdapterProcessError({
-      yield* emitRuntimeError(context, "Failed to close Claude runtime query.", cause);
+          provider: PROVIDER,
-    }
+          threadId: context.session.threadId,
+          detail: toMessage(cause, "Failed to close Claude runtime query."),
+          cause,
+        }),
+    }).pipe(
+      Effect.catch((cause) =>
+        emitRuntimeError(context, "Failed to close Claude runtime query.", cause),
+      ),
+    );
     const updatedAt = yield* nowIso;
     context.session = {
 @@ -2916,8 +2941,12 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
         "claude.query.include_partial_messages": true,
         "claude.query.additional_directories": input.cwd ? [input.cwd] : [],
         "claude.query.setting_sources": [...CLAUDE_SETTING_SOURCES],
-        "claude.query.settings_json": JSON.stringify(settings),
+        "claude.query.settings_json": Schema.encodeUnknownSync(Schema.UnknownFromJsonString)(
-        "claude.query.extra_args_json": JSON.stringify(extraArgs),
+          settings,
+        ),
+        "claude.query.extra_args_json": Schema.encodeUnknownSync(Schema.UnknownFromJsonString)(
+          extraArgs,
+        ),
         "claude.query.path_to_executable": claudeBinaryPath,
       });

apps/server/src/provider/Layers/ClaudeProvider.ts+37-28

...	@@ -6,7 +6,11 @@ import {	...	@@ -6,7 +6,11 @@ import {
6	type ServerProviderModel,	6	type ServerProviderModel,
7	type ServerProviderSlashCommand,	7	type ServerProviderSlashCommand,
8	} from "@t3tools/contracts";	8	} from "@t3tools/contracts";
9	import { Effect, Option, Path, Result } from "effect";	9	import * as DateTime from "effect/DateTime";
		10	import * as Effect from "effect/Effect";
		11	import * as Option from "effect/Option";
		12	import * as Path from "effect/Path";
		13	import * as Result from "effect/Result";
10	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";	14	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
11	import {	15	import {
12	createModelCapabilities,	16	createModelCapabilities,
...	@@ -521,7 +525,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(	...	@@ -521,7 +525,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
521	never,	525	never,
522	ChildProcessSpawner.ChildProcessSpawner \| Path.Path	526	ChildProcessSpawner.ChildProcessSpawner \| Path.Path
523	> {	527	> {
524	const checkedAt = new Date().toISOString();	528	const checkedAt = DateTime.formatIso(yield* DateTime.now);
525	const allModels = providerModelsFromSettings(	529	const allModels = providerModelsFromSettings(
526	BUILT_IN_MODELS,	530	BUILT_IN_MODELS,
527	PROVIDER,	531	PROVIDER,
...	@@ -664,19 +668,39 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(	...	@@ -664,19 +668,39 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
664	});	668	});
665	});	669	});
666		670
667	export const makePendingClaudeProvider = (claudeSettings: ClaudeSettings): ServerProviderDraft => {	671	const nowIso = Effect.map(DateTime.now, DateTime.formatIso);
668	const checkedAt = new Date().toISOString();	672
669	const models = providerModelsFromSettings(	673	export const makePendingClaudeProvider = (
670	BUILT_IN_MODELS,	674	claudeSettings: ClaudeSettings,
671	PROVIDER,	675	): Effect.Effect<ServerProviderDraft> =>
672	claudeSettings.customModels,	676	Effect.gen(function* () {
673	DEFAULT_CLAUDE_MODEL_CAPABILITIES,	677	const checkedAt = yield* nowIso;
674	);	678	const models = providerModelsFromSettings(
		679	BUILT_IN_MODELS,
		680	PROVIDER,
		681	claudeSettings.customModels,
		682	DEFAULT_CLAUDE_MODEL_CAPABILITIES,
		683	);
		684
		685	if (!claudeSettings.enabled) {
		686	return buildServerProvider({
		687	presentation: CLAUDE_PRESENTATION,
		688	enabled: false,
		689	checkedAt,
		690	models,
		691	probe: {
		692	installed: false,
		693	version: null,
		694	status: "warning",
		695	auth: { status: "unknown" },
		696	message: "Claude is disabled in T3 Code settings.",
		697	},
		698	});
		699	}
675		700
676	if (!claudeSettings.enabled) {
677	return buildServerProvider({	701	return buildServerProvider({
678	presentation: CLAUDE_PRESENTATION,	702	presentation: CLAUDE_PRESENTATION,
679	enabled: false,	703	enabled: true,
680	checkedAt,	704	checkedAt,
681	models,	705	models,
682	probe: {	706	probe: {
...	@@ -684,24 +708,9 @@ export const makePendingClaudeProvider = (claudeSettings: ClaudeSettings): Serve	...	@@ -684,24 +708,9 @@ export const makePendingClaudeProvider = (claudeSettings: ClaudeSettings): Serve
684	version: null,	708	version: null,
685	status: "warning",	709	status: "warning",
686	auth: { status: "unknown" },	710	auth: { status: "unknown" },
687	message: "Claude is disabled in T3 Code settings.",	711	message: "Claude provider status has not been checked in this session yet.",
688	},	712	},
689	});	713	});
690	}
691
692	return buildServerProvider({
693	presentation: CLAUDE_PRESENTATION,
694	enabled: true,
695	checkedAt,
696	models,
697	probe: {
698	installed: false,
699	version: null,
700	status: "warning",
701	auth: { status: "unknown" },
702	message: "Claude provider status has not been checked in this session yet.",
703	},
704	});	714	});
705	};
706		715
707	export { probeClaudeCapabilities };	716	export { probeClaudeCapabilities };

apps/server/src/provider/Layers/CodexAdapter.test.ts+28-18

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import assert from "node:assert/strict";	2	import assert from "node:assert/strict";
2	import fs from "node:fs";	3	import fs from "node:fs";
3	import os from "node:os";	4	import os from "node:os";
...	@@ -21,7 +22,16 @@ import { createModelSelection } from "@t3tools/shared/model";	...	@@ -21,7 +22,16 @@ import { createModelSelection } from "@t3tools/shared/model";
21	import * as NodeServices from "@effect/platform-node/NodeServices";	22	import * as NodeServices from "@effect/platform-node/NodeServices";
22	import { it, vi } from "@effect/vitest";	23	import { it, vi } from "@effect/vitest";
23		24
24	import { Context, Effect, Exit, Fiber, Layer, Option, Queue, Schema, Scope, Stream } from "effect";	25	import * as Context from "effect/Context";
		26	import * as Effect from "effect/Effect";
		27	import * as Exit from "effect/Exit";
		28	import * as Fiber from "effect/Fiber";
		29	import * as Layer from "effect/Layer";
		30	import * as Option from "effect/Option";
		31	import * as Queue from "effect/Queue";
		32	import * as Schema from "effect/Schema";
		33	import * as Scope from "effect/Scope";
		34	import * as Stream from "effect/Stream";
25	import * as CodexErrors from "effect-codex-app-server/errors";	35	import * as CodexErrors from "effect-codex-app-server/errors";
26		36
27	import { ServerConfig } from "../../config.ts";	37	import { ServerConfig } from "../../config.ts";
...	@@ -49,7 +59,7 @@ const asItemId = (value: string): ProviderItemId => ProviderItemId.make(value);	...	@@ -49,7 +59,7 @@ const asItemId = (value: string): ProviderItemId => ProviderItemId.make(value);
49		59
50	class FakeCodexRuntime implements CodexSessionRuntimeShape {	60	class FakeCodexRuntime implements CodexSessionRuntimeShape {
51	private readonly eventQueue = Effect.runSync(Queue.unbounded<ProviderEvent>());	61	private readonly eventQueue = Effect.runSync(Queue.unbounded<ProviderEvent>());
52	private readonly now = new Date().toISOString();	62	private readonly now = "2026-01-01T00:00:00.000Z";
53		63
54	public readonly startImpl = vi.fn(() =>	64	public readonly startImpl = vi.fn(() =>
55	Promise.resolve({	65	Promise.resolve({
...	@@ -446,7 +456,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {	...	@@ -446,7 +456,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
446	id: asEventId("evt-msg-complete"),	456	id: asEventId("evt-msg-complete"),
447	kind: "notification",	457	kind: "notification",
448	provider: ProviderDriverKind.make("codex"),	458	provider: ProviderDriverKind.make("codex"),
449	createdAt: new Date().toISOString(),	459	createdAt: "2026-01-01T00:00:00.000Z",
450	method: "item/completed",	460	method: "item/completed",
451	threadId: asThreadId("thread-1"),	461	threadId: asThreadId("thread-1"),
452	turnId: asTurnId("turn-1"),	462	turnId: asTurnId("turn-1"),
...	@@ -489,7 +499,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {	...	@@ -489,7 +499,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
489	id: asEventId("evt-plan-complete"),	499	id: asEventId("evt-plan-complete"),
490	kind: "notification",	500	kind: "notification",
491	provider: ProviderDriverKind.make("codex"),	501	provider: ProviderDriverKind.make("codex"),
492	createdAt: new Date().toISOString(),	502	createdAt: "2026-01-01T00:00:00.000Z",
493	method: "item/completed",	503	method: "item/completed",
494	threadId: asThreadId("thread-1"),	504	threadId: asThreadId("thread-1"),
495	turnId: asTurnId("turn-1"),	505	turnId: asTurnId("turn-1"),
...	@@ -531,7 +541,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {	...	@@ -531,7 +541,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
531	id: asEventId("evt-plan-delta"),	541	id: asEventId("evt-plan-delta"),
532	kind: "notification",	542	kind: "notification",
533	provider: ProviderDriverKind.make("codex"),	543	provider: ProviderDriverKind.make("codex"),
534	createdAt: new Date().toISOString(),	544	createdAt: "2026-01-01T00:00:00.000Z",
535	method: "item/plan/delta",	545	method: "item/plan/delta",
536	threadId: asThreadId("thread-1"),	546	threadId: asThreadId("thread-1"),
537	turnId: asTurnId("turn-1"),	547	turnId: asTurnId("turn-1"),
...	@@ -569,7 +579,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {	...	@@ -569,7 +579,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
569	kind: "session",	579	kind: "session",
570	provider: ProviderDriverKind.make("codex"),	580	provider: ProviderDriverKind.make("codex"),
571	threadId: asThreadId("thread-1"),	581	threadId: asThreadId("thread-1"),
572	createdAt: new Date().toISOString(),	582	createdAt: "2026-01-01T00:00:00.000Z",
573	method: "session/closed",	583	method: "session/closed",
574	message: "Session stopped",	584	message: "Session stopped",
575	};	585	};
...	@@ -600,7 +610,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {	...	@@ -600,7 +610,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
600	kind: "notification",	610	kind: "notification",
601	provider: ProviderDriverKind.make("codex"),	611	provider: ProviderDriverKind.make("codex"),
602	threadId: asThreadId("thread-1"),	612	threadId: asThreadId("thread-1"),
603	createdAt: new Date().toISOString(),	613	createdAt: "2026-01-01T00:00:00.000Z",
604	method: "error",	614	method: "error",
605	turnId: asTurnId("turn-1"),	615	turnId: asTurnId("turn-1"),
606	payload: {	616	payload: {
...	@@ -638,7 +648,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {	...	@@ -638,7 +648,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
638	kind: "notification",	648	kind: "notification",
639	provider: ProviderDriverKind.make("codex"),	649	provider: ProviderDriverKind.make("codex"),
640	threadId: asThreadId("thread-1"),	650	threadId: asThreadId("thread-1"),
641	createdAt: new Date().toISOString(),	651	createdAt: "2026-01-01T00:00:00.000Z",
642	method: "process/stderr",	652	method: "process/stderr",
643	turnId: asTurnId("turn-1"),	653	turnId: asTurnId("turn-1"),
644	message: "The filename or extension is too long. (os error 206)",	654	message: "The filename or extension is too long. (os error 206)",
...	@@ -672,7 +682,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {	...	@@ -672,7 +682,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
672	kind: "notification",	682	kind: "notification",
673	provider: ProviderDriverKind.make("codex"),	683	provider: ProviderDriverKind.make("codex"),
674	threadId: asThreadId("thread-1"),	684	threadId: asThreadId("thread-1"),
675	createdAt: new Date().toISOString(),	685	createdAt: "2026-01-01T00:00:00.000Z",
676	method: "thread/realtime/started",	686	method: "thread/realtime/started",
677	payload: {	687	payload: {
678	threadId: "thread-1",	688	threadId: "thread-1",
...	@@ -706,7 +716,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {	...	@@ -706,7 +716,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
706	kind: "notification",	716	kind: "notification",
707	provider: ProviderDriverKind.make("codex"),	717	provider: ProviderDriverKind.make("codex"),
708	threadId: asThreadId("thread-1"),	718	threadId: asThreadId("thread-1"),
709	createdAt: new Date().toISOString(),	719	createdAt: "2026-01-01T00:00:00.000Z",
710	method: "process/stderr",	720	method: "process/stderr",
711	turnId: asTurnId("turn-1"),	721	turnId: asTurnId("turn-1"),
712	message:	722	message:
...	@@ -742,7 +752,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {	...	@@ -742,7 +752,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
742	kind: "notification",	752	kind: "notification",
743	provider: ProviderDriverKind.make("codex"),	753	provider: ProviderDriverKind.make("codex"),
744	threadId: asThreadId("thread-1"),	754	threadId: asThreadId("thread-1"),
745	createdAt: new Date().toISOString(),	755	createdAt: "2026-01-01T00:00:00.000Z",
746	method: "serverRequest/resolved",	756	method: "serverRequest/resolved",
747	requestKind: "command",	757	requestKind: "command",
748	requestId: ApprovalRequestId.make("req-1"),	758	requestId: ApprovalRequestId.make("req-1"),
...	@@ -777,7 +787,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {	...	@@ -777,7 +787,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
777	kind: "notification",	787	kind: "notification",
778	provider: ProviderDriverKind.make("codex"),	788	provider: ProviderDriverKind.make("codex"),
779	threadId: asThreadId("thread-1"),	789	threadId: asThreadId("thread-1"),
780	createdAt: new Date().toISOString(),	790	createdAt: "2026-01-01T00:00:00.000Z",
781	method: "serverRequest/resolved",	791	method: "serverRequest/resolved",
782	requestKind: "file-read",	792	requestKind: "file-read",
783	requestId: ApprovalRequestId.make("req-file-read-1"),	793	requestId: ApprovalRequestId.make("req-file-read-1"),
...	@@ -812,7 +822,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {	...	@@ -812,7 +822,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
812	kind: "notification",	822	kind: "notification",
813	provider: ProviderDriverKind.make("codex"),	823	provider: ProviderDriverKind.make("codex"),
814	threadId: asThreadId("thread-1"),	824	threadId: asThreadId("thread-1"),
815	createdAt: new Date().toISOString(),	825	createdAt: "2026-01-01T00:00:00.000Z",
816	method: "item/tool/requestUserInput/answered",	826	method: "item/tool/requestUserInput/answered",
817	payload: {	827	payload: {
818	answers: {	828	answers: {
...	@@ -852,7 +862,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {	...	@@ -852,7 +862,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
852	kind: "notification",	862	kind: "notification",
853	provider: ProviderDriverKind.make("codex"),	863	provider: ProviderDriverKind.make("codex"),
854	threadId: asThreadId("thread-1"),	864	threadId: asThreadId("thread-1"),
855	createdAt: new Date().toISOString(),	865	createdAt: "2026-01-01T00:00:00.000Z",
856	method: "windowsSandbox/setupCompleted",	866	method: "windowsSandbox/setupCompleted",
857	message: "Sandbox setup failed",	867	message: "Sandbox setup failed",
858	payload: {	868	payload: {
...	@@ -897,7 +907,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {	...	@@ -897,7 +907,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
897	kind: "request",	907	kind: "request",
898	provider: ProviderDriverKind.make("codex"),	908	provider: ProviderDriverKind.make("codex"),
899	threadId: asThreadId("thread-1"),	909	threadId: asThreadId("thread-1"),
900	createdAt: new Date().toISOString(),	910	createdAt: "2026-01-01T00:00:00.000Z",
901	method: "item/tool/requestUserInput",	911	method: "item/tool/requestUserInput",
902	requestId: ApprovalRequestId.make("req-user-input-1"),	912	requestId: ApprovalRequestId.make("req-user-input-1"),
903	payload: {	913	payload: {
...	@@ -924,7 +934,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {	...	@@ -924,7 +934,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
924	kind: "notification",	934	kind: "notification",
925	provider: ProviderDriverKind.make("codex"),	935	provider: ProviderDriverKind.make("codex"),
926	threadId: asThreadId("thread-1"),	936	threadId: asThreadId("thread-1"),
927	createdAt: new Date().toISOString(),	937	createdAt: "2026-01-01T00:00:00.000Z",
928	method: "item/tool/requestUserInput/answered",	938	method: "item/tool/requestUserInput/answered",
929	requestId: ApprovalRequestId.make("req-user-input-1"),	939	requestId: ApprovalRequestId.make("req-user-input-1"),
930	payload: {	940	payload: {
...	@@ -965,7 +975,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {	...	@@ -965,7 +975,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
965	provider: ProviderDriverKind.make("codex"),	975	provider: ProviderDriverKind.make("codex"),
966	threadId: asThreadId("thread-1"),	976	threadId: asThreadId("thread-1"),
967	turnId: asTurnId("turn-1"),	977	turnId: asTurnId("turn-1"),
968	createdAt: new Date().toISOString(),	978	createdAt: "2026-01-01T00:00:00.000Z",
969	method: "thread/tokenUsage/updated",	979	method: "thread/tokenUsage/updated",
970	payload: {	980	payload: {
971	threadId: "thread-1",	981	threadId: "thread-1",
...	@@ -1147,7 +1157,7 @@ it.effect("flushes managed native logs when the adapter layer shuts down", () =>	...	@@ -1147,7 +1157,7 @@ it.effect("flushes managed native logs when the adapter layer shuts down", () =>
1147	kind: "notification",	1157	kind: "notification",
1148	provider: ProviderDriverKind.make("codex"),	1158	provider: ProviderDriverKind.make("codex"),
1149	threadId: asThreadId("thread-logger"),	1159	threadId: asThreadId("thread-logger"),
1150	createdAt: new Date().toISOString(),	1160	createdAt: "2026-01-01T00:00:00.000Z",
1151	method: "process/stderr",	1161	method: "process/stderr",
1152	message: "native flush test",	1162	message: "native flush test",
1153	} satisfies ProviderEvent);	1163	} satisfies ProviderEvent);

apps/server/src/provider/Layers/CodexAdapter.ts+8-1

...	@@ -24,7 +24,14 @@ import {	...	@@ -24,7 +24,14 @@ import {
24	ThreadId,	24	ThreadId,
25	ProviderSendTurnInput,	25	ProviderSendTurnInput,
26	} from "@t3tools/contracts";	26	} from "@t3tools/contracts";
27	import { Effect, Exit, Fiber, FileSystem, Queue, Schema, Scope, Stream } from "effect";	27	import * as Effect from "effect/Effect";
		28	import * as Exit from "effect/Exit";
		29	import * as Fiber from "effect/Fiber";
		30	import * as FileSystem from "effect/FileSystem";
		31	import * as Queue from "effect/Queue";
		32	import * as Schema from "effect/Schema";
		33	import * as Scope from "effect/Scope";
		34	import * as Stream from "effect/Stream";
28	import { ChildProcessSpawner } from "effect/unstable/process";	35	import { ChildProcessSpawner } from "effect/unstable/process";
29	import * as CodexErrors from "effect-codex-app-server/errors";	36	import * as CodexErrors from "effect-codex-app-server/errors";
30	import * as EffectCodexSchema from "effect-codex-app-server/schema";	37	import * as EffectCodexSchema from "effect-codex-app-server/schema";

apps/server/src/provider/Layers/CodexProvider.ts+33-23

 @@ -1,4 +1,11 @@
-import { DateTime, Duration, Effect, Layer, Option, Result, Schema, Types } from "effect";
+import * as DateTime from "effect/DateTime";
+import * as Duration from "effect/Duration";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Result from "effect/Result";
+import * as Schema from "effect/Schema";
+import * as Types from "effect/Types";
 import { ChildProcessSpawner } from "effect/unstable/process";
 import * as CodexClient from "effect-codex-app-server/client";
 import * as CodexSchema from "effect-codex-app-server/schema";
 @@ -325,14 +332,33 @@ const emptyCodexModelsFromSettings = (codexSettings: CodexSettings): ServerProvi
       capabilities: null,
     }));
-const makePendingCodexProvider = (codexSettings: CodexSettings): ServerProviderDraft => {
+const makePendingCodexProvider = (
-  const checkedAt = new Date().toISOString();
+  codexSettings: CodexSettings,
-  const models = emptyCodexModelsFromSettings(codexSettings);
+): Effect.Effect<ServerProviderDraft> =>
+  Effect.gen(function* () {
+    const checkedAt = yield* Effect.map(DateTime.now, DateTime.formatIso);
+    const models = emptyCodexModelsFromSettings(codexSettings);
+    if (!codexSettings.enabled) {
+      return buildServerProvider({
+        presentation: CODEX_PRESENTATION,
+        enabled: false,
+        checkedAt,
+        models,
+        skills: [],
+        probe: {
+          installed: false,
+          version: null,
+          status: "warning",
+          auth: { status: "unknown" },
+          message: "Codex is disabled in T3 Code settings.",
+        },
+      });
+    }
-  if (!codexSettings.enabled) {
     return buildServerProvider({
       presentation: CODEX_PRESENTATION,
-      enabled: false,
+      enabled: true,
       checkedAt,
       models,
       skills: [],
 @@ -341,26 +367,10 @@ const makePendingCodexProvider = (codexSettings: CodexSettings): ServerProviderD
         version: null,
         status: "warning",
         auth: { status: "unknown" },
-        message: "Codex is disabled in T3 Code settings.",
+        message: "Codex provider status has not been checked in this session yet.",
       },
     });
-  }
-  return buildServerProvider({
-    presentation: CODEX_PRESENTATION,
-    enabled: true,
-    checkedAt,
-    models,
-    skills: [],
-    probe: {
-      installed: false,
-      version: null,
-      status: "warning",
-      auth: { status: "unknown" },
-      message: "Codex provider status has not been checked in this session yet.",
-    },
   });
-};
 function accountProbeStatus(account: CodexAppServerProviderSnapshot["account"]): {
   readonly status: Exclude<ServerProviderState, "disabled">;

apps/server/src/provider/Layers/CodexSessionRuntime.test.ts+2-1

...	@@ -1,6 +1,7 @@	...	@@ -1,6 +1,7 @@
1	import assert from "node:assert/strict";	1	import assert from "node:assert/strict";
2		2
3	import { Effect, Schema } from "effect";	3	import * as Effect from "effect/Effect";
		4	import * as Schema from "effect/Schema";
4	import { describe, it } from "vitest";	5	import { describe, it } from "vitest";
5	import { ThreadId } from "@t3tools/contracts";	6	import { ThreadId } from "@t3tools/contracts";
6	import * as CodexErrors from "effect-codex-app-server/errors";	7	import * as CodexErrors from "effect-codex-app-server/errors";

apps/server/src/provider/Layers/CodexSessionRuntime.ts+30-14

 @@ -17,7 +17,17 @@ import {
   TurnId,
 } from "@t3tools/contracts";
 import { normalizeModelSlug } from "@t3tools/shared/model";
-import { Deferred, Effect, Exit, Layer, Queue, Ref, Scope, Random, Schema, Stream } from "effect";
+import * as DateTime from "effect/DateTime";
+import * as Deferred from "effect/Deferred";
+import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
+import * as Layer from "effect/Layer";
+import * as Queue from "effect/Queue";
+import * as Ref from "effect/Ref";
+import * as Scope from "effect/Scope";
+import * as Random from "effect/Random";
+import * as Schema from "effect/Schema";
+import * as Stream from "effect/Stream";
 import * as SchemaIssue from "effect/SchemaIssue";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 import * as CodexClient from "effect-codex-app-server/client";
 @@ -653,11 +663,14 @@ function updateSession(
   sessionRef: Ref.Ref<ProviderSession>,
   updates: Partial<ProviderSession>,
 ): Effect.Effect<void> {
-  return Ref.update(sessionRef, (session) => ({
+  return Effect.gen(function* () {
-    ...session,
+    const updatedAt = DateTime.formatIso(yield* DateTime.now);
-    ...updates,
+    yield* Ref.update(sessionRef, (session) => ({
-    updatedAt: new Date().toISOString(),
+      ...session,
-  }));
+      ...updates,
+      updatedAt,
+    }));
+  });
 }
 function parseThreadSnapshot(
 @@ -724,7 +737,9 @@ export const makeCodexSessionRuntime = (
       Effect.provide(clientContext),
     );
     const serverNotifications = yield* Queue.unbounded<CodexServerNotification>();
+    const nowIso = Effect.map(DateTime.now, DateTime.formatIso);
+    const sessionCreatedAt = yield* nowIso;
     const initialSession = {
       provider: PROVIDER,
       ...(options.providerInstanceId ? { providerInstanceId: options.providerInstanceId } : {}),
 @@ -734,22 +749,23 @@ export const makeCodexSessionRuntime = (
       ...(options.model ? { model: options.model } : {}),
       threadId: options.threadId,
       ...(options.resumeCursor !== undefined ? { resumeCursor: options.resumeCursor } : {}),
-      createdAt: new Date().toISOString(),
+      createdAt: sessionCreatedAt,
-      updatedAt: new Date().toISOString(),
+      updatedAt: sessionCreatedAt,
     } satisfies ProviderSession;
     const sessionRef = yield* Ref.make<ProviderSession>(initialSession);
     const offerEvent = (event: ProviderEvent) => Queue.offer(events, event).pipe(Effect.asVoid);
     const emitEvent = (event: Omit<ProviderEvent, "id" | "provider" | "createdAt">) =>
-      Effect.flatMap(Random.nextUUIDv4, (id) =>
+      Effect.gen(function* () {
-        offerEvent({
+        const id = yield* Random.nextUUIDv4;
+        return yield* offerEvent({
           id: EventId.make(id),
           provider: PROVIDER,
           ...(options.providerInstanceId ? { providerInstanceId: options.providerInstanceId } : {}),
-          createdAt: new Date().toISOString(),
+          createdAt: yield* nowIso,
           ...event,
-        }),
+        });
-      );
+      });
     const emitSessionEvent = (method: string, message: string) =>
       emitEvent({
         kind: "session",
 @@ -1177,7 +1193,7 @@ export const makeCodexSessionRuntime = (
         cwd: opened.cwd,
         model: opened.model,
         resumeCursor: { threadId: providerThreadId },
-        updatedAt: new Date().toISOString(),
+        updatedAt: yield* nowIso,
       } satisfies ProviderSession;
       yield* Ref.set(sessionRef, session);
       yield* emitSessionEvent("session/ready", "Codex App Server session ready.");

apps/server/src/provider/Layers/CursorAdapter.test.ts+14-6

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import * as path from "node:path";	2	import * as path from "node:path";
2	import * as os from "node:os";	3	import * as os from "node:os";
3	import { chmod, mkdtemp, readFile, writeFile } from "node:fs/promises";	4	import { chmod, mkdtemp, readFile, writeFile } from "node:fs/promises";
...	@@ -5,7 +6,13 @@ import { fileURLToPath } from "node:url";	...	@@ -5,7 +6,13 @@ import { fileURLToPath } from "node:url";
5		6
6	import * as NodeServices from "@effect/platform-node/NodeServices";	7	import * as NodeServices from "@effect/platform-node/NodeServices";
7	import { assert, it } from "@effect/vitest";	8	import { assert, it } from "@effect/vitest";
8	import { Context, Deferred, Effect, Fiber, Layer, Schema, Stream } from "effect";	9	import * as Context from "effect/Context";
		10	import * as Deferred from "effect/Deferred";
		11	import * as Effect from "effect/Effect";
		12	import * as Fiber from "effect/Fiber";
		13	import * as Layer from "effect/Layer";
		14	import * as Schema from "effect/Schema";
		15	import * as Stream from "effect/Stream";
9	import { createModelSelection } from "@t3tools/shared/model";	16	import { createModelSelection } from "@t3tools/shared/model";
10		17
11	import {	18	import {
...	@@ -98,7 +105,7 @@ async function waitForFileContent(filePath: string, attempts = 40) {	...	@@ -98,7 +105,7 @@ async function waitForFileContent(filePath: string, attempts = 40) {
98	return raw;	105	return raw;
99	}	106	}
100	} catch {}	107	} catch {}
101	await new Promise((resolve) => setTimeout(resolve, 50));	108	await Effect.runPromise(Effect.yieldNow);
102	}	109	}
103	throw new Error(`Timed out waiting for file content at ${filePath}`);	110	throw new Error(`Timed out waiting for file content at ${filePath}`);
104	}	111	}
...	@@ -113,10 +120,11 @@ async function waitForFileContent(filePath: string, attempts = 40) {	...	@@ -113,10 +120,11 @@ async function waitForFileContent(filePath: string, attempts = 40) {
113	// tests assumed.	120	// tests assumed.
114	const makeResolveCursorSettings = Effect.gen(function* () {	121	const makeResolveCursorSettings = Effect.gen(function* () {
115	const serverSettings = yield* ServerSettingsService;	122	const serverSettings = yield* ServerSettingsService;
116	// @effect-diagnostics effect/returnEffectInGen:off	123	return yield* Effect.succeed(
117	return serverSettings.getSettings.pipe(	124	serverSettings.getSettings.pipe(
118	Effect.map((snapshot) => snapshot.providers.cursor),	125	Effect.map((snapshot) => snapshot.providers.cursor),
119	Effect.orDie,	126	Effect.orDie,
		127	),
120	);	128	);
121	});	129	});
122		130

apps/server/src/provider/Layers/CursorAdapter.ts+23-21

 @@ -3,7 +3,6 @@
  *
  * @module CursorAdapterLive
  */
-import * as nodePath from "node:path";
 import {
   ApprovalRequestId,
 @@ -22,21 +21,21 @@ import {
   type ThreadId,
   TurnId,
 } from "@t3tools/contracts";
-import {
+import * as DateTime from "effect/DateTime";
-  DateTime,
+import * as Deferred from "effect/Deferred";
-  Deferred,
+import * as Effect from "effect/Effect";
-  Effect,
+import * as Exit from "effect/Exit";
-  Exit,
+import * as Fiber from "effect/Fiber";
-  Fiber,
+import * as FileSystem from "effect/FileSystem";
-  FileSystem,
+import * as Option from "effect/Option";
-  Option,
+import * as Path from "effect/Path";
-  PubSub,
+import * as PubSub from "effect/PubSub";
-  Random,
+import * as Random from "effect/Random";
-  Scope,
+import * as Schema from "effect/Schema";
-  Semaphore,
+import * as Scope from "effect/Scope";
-  Stream,
+import * as Semaphore from "effect/Semaphore";
-  SynchronizedRef,
+import * as Stream from "effect/Stream";
-} from "effect";
+import * as SynchronizedRef from "effect/SynchronizedRef";
 import { ChildProcessSpawner } from "effect/unstable/process";
 import type * as EffectAcpSchema from "effect-acp/schema";
 @@ -306,6 +305,7 @@ export function makeCursorAdapter(
   return Effect.gen(function* () {
     const boundInstanceId = options?.instanceId ?? ProviderInstanceId.make("cursor");
     const fileSystem = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
     const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
     const serverConfig = yield* Effect.service(ServerConfig);
     const nativeEventLogger =
 @@ -358,12 +358,12 @@ export function makeCursorAdapter(
     ) =>
       Effect.gen(function* () {
         if (!nativeEventLogger) return;
-        const observedAt = new Date().toISOString();
+        const observedAt = yield* nowIso;
         yield* nativeEventLogger.write(
           {
             observedAt,
             event: {
-              id: crypto.randomUUID(),
+              id: yield* Random.nextUUIDv4,
               kind: "notification",
               provider: PROVIDER,
               createdAt: observedAt,
 @@ -390,7 +390,7 @@ export function makeCursorAdapter(
       method: string,
     ) =>
       Effect.gen(function* () {
-        const fingerprint = `${ctx.activeTurnId ?? "no-turn"}:${JSON.stringify(payload)}`;
+        const fingerprint = `${ctx.activeTurnId ?? "no-turn"}:${Schema.encodeUnknownSync(Schema.UnknownFromJsonString)(payload)}`;
         if (ctx.lastPlanFingerprint === fingerprint) {
           return;
         }
 @@ -460,7 +460,7 @@ export function makeCursorAdapter(
             });
           }
-          const cwd = nodePath.resolve(input.cwd.trim());
+          const cwd = path.resolve(input.cwd.trim());
           const cursorModelSelection =
             input.modelSelection?.instanceId === boundInstanceId ? input.modelSelection : undefined;
           const existing = sessions.get(input.threadId);
 @@ -638,7 +638,9 @@ export function makeCursorAdapter(
                     turnId: ctx?.activeTurnId,
                     requestId: runtimeRequestId,
                     permissionRequest,
-                    detail: permissionRequest.detail ?? JSON.stringify(params).slice(0, 2000),
+                    detail:
+                      permissionRequest.detail ??
+                      Schema.encodeUnknownSync(Schema.UnknownFromJsonString)(params).slice(0, 2000),
                     args: params,
                     source: "acp.jsonrpc",
                     method: "session/request_permission",

apps/server/src/provider/Layers/CursorProvider.test.ts+14-4

 @@ -1,7 +1,9 @@
 import * as NodeOS from "node:os";
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import { Effect, FileSystem, Path } from "effect";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Path from "effect/Path";
 import { describe, expect, it } from "vitest";
 import type * as EffectAcpSchema from "effect-acp/schema";
 import type { CursorSettings, ServerProviderModel } from "@t3tools/contracts";
 @@ -68,12 +70,16 @@ const makeMockAgentWrapper = Effect.fn("makeMockAgentWrapper")(function* (
     prefix: "cursor-provider-mock-",
   });
   const wrapperPath = path.join(dir, "fake-agent.sh");
+  // @effect-diagnostics-next-line preferSchemaOverJson:off
+  const bunCommand = JSON.stringify("bun");
+  // @effect-diagnostics-next-line preferSchemaOverJson:off
+  const mockAgentPathJson = JSON.stringify(mockAgentPath);
   const envExports = Object.entries(extraEnv ?? {})
     .map(([key, value]) => `export ${key}=${JSON.stringify(value)}`)
     .join("\n");
   const script = `#!/bin/sh
 ${envExports}
-exec ${JSON.stringify("bun")} ${JSON.stringify(mockAgentPath)} "$@"
+exec ${bunCommand} ${mockAgentPathJson} "$@"
 `;
   yield* fileSystem.writeFileString(wrapperPath, script);
   yield* fileSystem.chmod(wrapperPath, 0o755);
 @@ -89,13 +95,17 @@ const makeMockAgentWithAboutWrapper = Effect.fn("makeMockAgentWithAboutWrapper")
     prefix: "cursor-provider-about-mock-",
   });
   const wrapperPath = path.join(dir, "fake-agent.sh");
+  // @effect-diagnostics-next-line preferSchemaOverJson:off
+  const bunCommand = JSON.stringify("bun");
+  // @effect-diagnostics-next-line preferSchemaOverJson:off
+  const mockAgentPathJson = JSON.stringify(mockAgentPath);
   const script = `#!/bin/sh
 if [ "$1" = "about" ]; then
   printf 'CLI Version         2026.04.09-f2b0fcd\\n'
   printf 'User Email          cursor@example.com\\n'
   exit 0
 fi
-exec ${JSON.stringify("bun")} ${JSON.stringify(mockAgentPath)} "$@"
+exec ${bunCommand} ${mockAgentPathJson} "$@"
 `;
   yield* fileSystem.writeFileString(wrapperPath, script);
   yield* fileSystem.chmod(wrapperPath, 0o755);
 @@ -118,7 +128,7 @@ const waitForFileContent = Effect.fn("waitForFileContent")(function* (
     }
     yield* Effect.sleep("50 millis");
   }
-  return yield* Effect.fail(new Error(`Timed out waiting for file content at ${filePath}`));
+  return yield* Effect.die(`Timed out waiting for file content at ${filePath}`);
 });
 const makeProviderStatusEnvFixture = Effect.fn("makeProviderStatusEnvFixture")(function* () {

apps/server/src/provider/Layers/CursorProvider.ts+35-26

 @@ -1,5 +1,4 @@
-import * as nodeOs from "node:os";
+import * as NodeOs from "node:os";
 import type {
   CursorSettings,
   ModelCapabilities,
 @@ -11,7 +10,15 @@ import type {
 } from "@t3tools/contracts";
 import { ProviderDriverKind } from "@t3tools/contracts";
 import type * as EffectAcpSchema from "effect-acp/schema";
-import { Cause, Effect, Exit, FileSystem, Layer, Option, Path, Result } from "effect";
+import * as Cause from "effect/Cause";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
+import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Path from "effect/Path";
+import * as Result from "effect/Result";
 import { HttpClient } from "effect/unstable/http";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 import {
 @@ -58,38 +65,40 @@ export const CURSOR_PARAMETERIZED_MODEL_PICKER_CAPABILITIES = {
 export function buildInitialCursorProviderSnapshot(
   cursorSettings: CursorSettings,
-): ServerProviderDraft {
+): Effect.Effect<ServerProviderDraft> {
-  const checkedAt = new Date().toISOString();
+  return Effect.gen(function* () {
-  const models = getCursorFallbackModels(cursorSettings);
+    const checkedAt = yield* Effect.map(DateTime.now, DateTime.formatIso);
+    const models = getCursorFallbackModels(cursorSettings);
+    if (!cursorSettings.enabled) {
+      return buildServerProvider({
+        presentation: CURSOR_PRESENTATION,
+        enabled: false,
+        checkedAt,
+        models,
+        probe: {
+          installed: false,
+          version: null,
+          status: "warning",
+          auth: { status: "unknown" },
+          message: "Cursor is disabled in T3 Code settings.",
+        },
+      });
+    }
-  if (!cursorSettings.enabled) {
     return buildServerProvider({
       presentation: CURSOR_PRESENTATION,
-      enabled: false,
+      enabled: true,
       checkedAt,
       models,
       probe: {
-        installed: false,
+        installed: true,
         version: null,
         status: "warning",
         auth: { status: "unknown" },
-        message: "Cursor is disabled in T3 Code settings.",
+        message: "Checking Cursor Agent availability...",
       },
     });
-  }
-  return buildServerProvider({
-    presentation: CURSOR_PRESENTATION,
-    enabled: true,
-    checkedAt,
-    models,
-    probe: {
-      installed: true,
-      version: null,
-      status: "warning",
-      auth: { status: "unknown" },
-      message: "Checking Cursor Agent availability...",
-    },
   });
 }
 @@ -854,7 +863,7 @@ function isCursorAboutJsonFormatUnsupported(result: CommandResult): boolean {
 const readCursorCliConfigChannel = Effect.fn("readCursorCliConfigChannel")(function* () {
   const fileSystem = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
-  const configPath = path.join(nodeOs.homedir(), ".cursor", "cli-config.json");
+  const configPath = path.join(NodeOs.homedir(), ".cursor", "cli-config.json");
   const raw = yield* fileSystem.readFileString(configPath).pipe(Effect.orElseSucceed(() => ""));
   return parseCursorCliConfigChannel(raw);
 });
 @@ -1085,7 +1094,7 @@ export const checkCursorProviderStatus = Effect.fn("checkCursorProviderStatus")(
   never,
   ChildProcessSpawner.ChildProcessSpawner | FileSystem.FileSystem | Path.Path
 > {
-  const checkedAt = new Date().toISOString();
+  const checkedAt = DateTime.formatIso(yield* DateTime.now);
   const fallbackModels = getCursorFallbackModels(cursorSettings);
   if (!cursorSettings.enabled) {

apps/server/src/provider/Layers/EventNdjsonLogger.test.ts+2-1

 @@ -1,10 +1,11 @@
+// @effect-diagnostics nodeBuiltinImport:off
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { ThreadId } from "@t3tools/contracts";
 import { assert, describe, it } from "@effect/vitest";
-import { Effect } from "effect";
+import * as Effect from "effect/Effect";
 import { makeEventNdjsonLogger } from "./EventNdjsonLogger.ts";

apps/server/src/provider/Layers/EventNdjsonLogger.ts+6-1

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	/**	2	/**
2	* Provider event logger helper.	3	* Provider event logger helper.
3	*	4	*
...	@@ -10,7 +11,11 @@ import path from "node:path";	...	@@ -10,7 +11,11 @@ import path from "node:path";
10		11
11	import type { ThreadId } from "@t3tools/contracts";	12	import type { ThreadId } from "@t3tools/contracts";
12	import { RotatingFileSink } from "@t3tools/shared/logging";	13	import { RotatingFileSink } from "@t3tools/shared/logging";
13	import { Effect, Exit, Logger, Scope, SynchronizedRef } from "effect";	14	import * as Effect from "effect/Effect";
		15	import * as Exit from "effect/Exit";
		16	import * as Logger from "effect/Logger";
		17	import * as Scope from "effect/Scope";
		18	import * as SynchronizedRef from "effect/SynchronizedRef";
14		19
15	import { toSafeThreadAttachmentSegment } from "../../attachmentStore.ts";	20	import { toSafeThreadAttachmentSegment } from "../../attachmentStore.ts";
16		21

apps/server/src/provider/Layers/OpenCodeAdapter.test.ts+14-6

 @@ -1,8 +1,16 @@
 import assert from "node:assert/strict";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { it } from "@effect/vitest";
-import { Context, Effect, Exit, Fiber, Layer, Option, Schema, Scope, Stream } from "effect";
+import * as Context from "effect/Context";
+import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
+import * as Fiber from "effect/Fiber";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
+import * as Scope from "effect/Scope";
+import * as Stream from "effect/Stream";
+import * as TestClock from "effect/testing/TestClock";
 import { beforeEach } from "vitest";
 import {
 @@ -216,8 +224,8 @@ beforeEach(() => {
   runtimeMock.reset();
 });
-const sleep = (ms: number) =>
+const advanceTestClock = (ms: number) =>
-  Effect.promise(() => new Promise<void>((resolve) => setTimeout(resolve, ms)));
+  TestClock.adjust(`${ms} millis`).pipe(Effect.andThen(Effect.yieldNow));
 it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
   it.effect("reuses a configured OpenCode server URL instead of spawning a local server", () =>
 @@ -648,7 +656,7 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
           threadId: asThreadId("thread-native-log"),
           runtimeMode: "full-access",
         });
-        yield* sleep(10);
+        yield* advanceTestClock(10);
         return started;
       }).pipe(Effect.provide(adapterLayer));
 @@ -736,7 +744,7 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
           threadId: asThreadId("thread-native-log-failure"),
           runtimeMode: "full-access",
         });
-        yield* sleep(10);
+        yield* advanceTestClock(10);
         return {
           sessions: yield* adapter.listSessions(),
           closeCallsDuringRun: [...runtimeMock.state.closeCalls],

apps/server/src/provider/Layers/OpenCodeAdapter.ts+52-39

 @@ -12,7 +12,15 @@ import {
   TurnId,
   type UserInputQuestion,
 } from "@t3tools/contracts";
-import { Cause, Effect, Exit, Queue, Random, Ref, Scope, Stream } from "effect";
+import * as Cause from "effect/Cause";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
+import * as Queue from "effect/Queue";
+import * as Random from "effect/Random";
+import * as Ref from "effect/Ref";
+import * as Scope from "effect/Scope";
+import * as Stream from "effect/Stream";
 import type { OpencodeClient, Part, PermissionRequest, QuestionRequest } from "@opencode-ai/sdk/v2";
 import { getModelSelectionStringOptionValue } from "@t3tools/shared/model";
 @@ -40,6 +48,7 @@ import {
   toOpenCodeQuestionAnswers,
   type OpenCodeServerConnection,
 } from "../opencodeRuntime.ts";
+import * as Option from "effect/Option";
 const PROVIDER = ProviderDriverKind.make("opencode");
 @@ -95,9 +104,7 @@ export interface OpenCodeAdapterLiveOptions {
   readonly nativeEventLogger?: EventNdjsonLogger;
 }
-function nowIso(): string {
+const nowIso = Effect.map(DateTime.now, DateTime.formatIso);
-  return new Date().toISOString();
-}
 /**
  * Map a tagged OpenCodeRuntimeError produced by {@link runOpenCodeSdk} into
 @@ -140,12 +147,14 @@ const buildEventBase = (input: {
     "eventId" | "provider" | "threadId" | "createdAt" | "turnId" | "itemId" | "requestId" | "raw"
   >
 > =>
-  Random.nextUUIDv4.pipe(
+  Effect.gen(function* () {
-    Effect.map((uuid) => ({
+    const uuid = yield* Random.nextUUIDv4;
+    const createdAt = input.createdAt ?? (yield* nowIso);
+    return {
       eventId: EventId.make(uuid),
       provider: PROVIDER,
       threadId: input.threadId,
-      createdAt: input.createdAt ?? nowIso(),
+      createdAt,
       ...(input.turnId ? { turnId: input.turnId } : {}),
       ...(input.itemId ? { itemId: RuntimeItemId.make(input.itemId) } : {}),
       ...(input.requestId ? { requestId: RuntimeRequestId.make(input.requestId) } : {}),
 @@ -157,8 +166,8 @@ const buildEventBase = (input: {
             },
           }
         : {}),
-    })),
+    };
-  );
+  });
 function toToolLifecycleItemType(toolName: string): ToolLifecycleItemType {
   const normalized = toolName.toLowerCase();
 @@ -347,12 +356,13 @@ export function appendOpenCodeAssistantTextDelta(
   };
 }
-function isoFromEpochMs(value: number | undefined): string | undefined {
+const isoFromEpochMs = (value: number) =>
-  if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) {
+  DateTime.make(value).pipe(
-    return undefined;
+    Option.match({
-  }
+      onNone: () => undefined,
-  return new Date(value).toISOString();
+      onSome: DateTime.formatIso,
-}
+    }),
+  );
 function messageRoleForPart(
   context: OpenCodeSessionContext,
 @@ -408,21 +418,24 @@ function updateProviderSession(
     readonly clearActiveTurnId?: boolean;
     readonly clearLastError?: boolean;
   },
-): ProviderSession {
+): Effect.Effect<ProviderSession> {
-  const nextSession = {
+  return Effect.gen(function* () {
-    ...context.session,
+    const updatedAt = yield* nowIso;
-    ...patch,
+    const nextSession = {
-    updatedAt: nowIso(),
+      ...context.session,
-  } as ProviderSession & Record<string, unknown>;
+      ...patch,
-  const mutableSession = nextSession as Record<string, unknown>;
+      updatedAt,
-  if (options?.clearActiveTurnId) {
+    } as ProviderSession & Record<string, unknown>;
-    delete mutableSession.activeTurnId;
+    const mutableSession = nextSession as Record<string, unknown>;
-  }
+    if (options?.clearActiveTurnId) {
-  if (options?.clearLastError) {
+      delete mutableSession.activeTurnId;
-    delete mutableSession.lastError;
+    }
-  }
+    if (options?.clearLastError) {
-  context.session = nextSession;
+      delete mutableSession.lastError;
-  return nextSession;
+    }
+    context.session = nextSession;
+    return nextSession;
+  });
 }
 const stopOpenCodeContext = Effect.fn("stopOpenCodeContext")(function* (
 @@ -592,8 +605,8 @@ export function makeOpenCodeAdapter(
             turnId,
             itemId: part.id,
             createdAt:
-              part.type === "text" || part.type === "reasoning"
+              (part.type === "text" || part.type === "reasoning") && part.time !== undefined
-                ? isoFromEpochMs(part.time?.start)
+                ? isoFromEpochMs(part.time.start)
                 : undefined,
             raw,
           })),
 @@ -642,7 +655,7 @@ export function makeOpenCodeAdapter(
       const turnId = context.activeTurnId;
       yield* writeNativeEventBestEffort(context.session.threadId, {
-        observedAt: nowIso(),
+        observedAt: yield* nowIso,
         event: {
           provider: PROVIDER,
           threadId: context.session.threadId,
 @@ -863,7 +876,7 @@ export function makeOpenCodeAdapter(
         case "session.status": {
           if (event.properties.status.type === "busy") {
-            updateProviderSession(context, {
+            yield* updateProviderSession(context, {
               status: "running",
               activeTurnId: turnId,
             });
 @@ -887,7 +900,7 @@ export function makeOpenCodeAdapter(
           if (event.properties.status.type === "idle" && turnId) {
             context.activeTurnId = undefined;
-            updateProviderSession(context, { status: "ready" }, { clearActiveTurnId: true });
+            yield* updateProviderSession(context, { status: "ready" }, { clearActiveTurnId: true });
             yield* emit({
               ...(yield* buildEventBase({
                 threadId: context.session.threadId,
 @@ -907,7 +920,7 @@ export function makeOpenCodeAdapter(
           const message = sessionErrorMessage(event.properties.error);
           const activeTurnId = context.activeTurnId;
           context.activeTurnId = undefined;
-          updateProviderSession(
+          yield* updateProviderSession(
             context,
             {
               status: "error",
 @@ -1084,7 +1097,7 @@ export function makeOpenCodeAdapter(
           return raceWinner.session;
         }
-        const createdAt = nowIso();
+        const createdAt = yield* nowIso;
         const session: ProviderSession = {
           provider: PROVIDER,
           providerInstanceId: boundInstanceId,
 @@ -1185,7 +1198,7 @@ export function makeOpenCodeAdapter(
       context.activeTurnId = turnId;
       context.activeAgent = agent ?? (input.interactionMode === "plan" ? "plan" : undefined);
       context.activeVariant = variant;
-      updateProviderSession(
+      yield* updateProviderSession(
         context,
         {
           status: "running",
 @@ -1223,7 +1236,7 @@ export function makeOpenCodeAdapter(
             context.activeTurnId = undefined;
             context.activeAgent = undefined;
             context.activeVariant = undefined;
-            updateProviderSession(
+            yield* updateProviderSession(
               context,
               {
                 status: "ready",

apps/server/src/provider/Layers/OpenCodeProvider.test.ts+3-1

 @@ -2,7 +2,9 @@ import assert from "node:assert/strict";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { it } from "@effect/vitest";
-import { Effect, Layer, Schema } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Schema from "effect/Schema";
 import { beforeEach } from "vitest";
 import { OpenCodeSettings } from "@t3tools/contracts";

apps/server/src/provider/Layers/OpenCodeProvider.ts+35-31

 @@ -4,7 +4,10 @@ import {
   type OpenCodeSettings,
   type ServerProviderModel,
 } from "@t3tools/contracts";
-import { Cause, Data, Effect } from "effect";
+import * as Cause from "effect/Cause";
+import * as Data from "effect/Data";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
 import { createModelCapabilities } from "@t3tools/shared/model";
 import {
 @@ -249,19 +252,38 @@ function flattenOpenCodeModels(input: OpenCodeInventory): ReadonlyArray<ServerPr
 export const makePendingOpenCodeProvider = (
   openCodeSettings: OpenCodeSettings,
-): ServerProviderDraft => {
+): Effect.Effect<ServerProviderDraft> =>
-  const checkedAt = new Date().toISOString();
+  Effect.gen(function* () {
-  const models = providerModelsFromSettings(
+    const checkedAt = yield* Effect.map(DateTime.now, DateTime.formatIso);
-    [],
+    const models = providerModelsFromSettings(
-    PROVIDER,
+      [],
-    openCodeSettings.customModels,
+      PROVIDER,
-    DEFAULT_OPENCODE_MODEL_CAPABILITIES,
+      openCodeSettings.customModels,
-  );
+      DEFAULT_OPENCODE_MODEL_CAPABILITIES,
+    );
+    if (!openCodeSettings.enabled) {
+      return buildServerProvider({
+        presentation: OPENCODE_PRESENTATION,
+        enabled: false,
+        checkedAt,
+        models,
+        probe: {
+          installed: false,
+          version: null,
+          status: "warning",
+          auth: { status: "unknown" },
+          message:
+            openCodeSettings.serverUrl.trim().length > 0
+              ? "OpenCode is disabled in T3 Code settings. A server URL is configured."
+              : "OpenCode is disabled in T3 Code settings.",
+        },
+      });
+    }
-  if (!openCodeSettings.enabled) {
     return buildServerProvider({
       presentation: OPENCODE_PRESENTATION,
-      enabled: false,
+      enabled: true,
       checkedAt,
       models,
       probe: {
 @@ -269,28 +291,10 @@ export const makePendingOpenCodeProvider = (
         version: null,
         status: "warning",
         auth: { status: "unknown" },
-        message:
+        message: "OpenCode provider status has not been checked in this session yet.",
-          openCodeSettings.serverUrl.trim().length > 0
-            ? "OpenCode is disabled in T3 Code settings. A server URL is configured."
-            : "OpenCode is disabled in T3 Code settings.",
       },
     });
-  }
-  return buildServerProvider({
-    presentation: OPENCODE_PRESENTATION,
-    enabled: true,
-    checkedAt,
-    models,
-    probe: {
-      installed: false,
-      version: null,
-      status: "warning",
-      auth: { status: "unknown" },
-      message: "OpenCode provider status has not been checked in this session yet.",
-    },
   });
-};
 export const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatus")(function* (
   openCodeSettings: OpenCodeSettings,
 @@ -298,7 +302,7 @@ export const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatu
   environment: NodeJS.ProcessEnv = process.env,
 ): Effect.fn.Return<ServerProviderDraft, never, OpenCodeRuntime> {
   const openCodeRuntime = yield* OpenCodeRuntime;
-  const checkedAt = new Date().toISOString();
+  const checkedAt = DateTime.formatIso(yield* DateTime.now);
   const customModels = openCodeSettings.customModels;
   const isExternalServer = openCodeSettings.serverUrl.trim().length > 0;

apps/server/src/provider/Layers/ProviderAdapterRegistry.test.ts+4-1

 @@ -5,7 +5,10 @@ import {
 } from "@t3tools/contracts";
 import { it, assert, vi } from "@effect/vitest";
-import { Effect, Layer, PubSub, Stream } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as PubSub from "effect/PubSub";
+import * as Stream from "effect/Stream";
 import type { ClaudeAdapterShape } from "../Services/ClaudeAdapter.ts";
 import type { CodexAdapterShape } from "../Services/CodexAdapter.ts";

apps/server/src/provider/Layers/ProviderAdapterRegistry.ts+2-1

...	@@ -20,7 +20,8 @@ import {	...	@@ -20,7 +20,8 @@ import {
20	ProviderInstanceId,	20	ProviderInstanceId,
21	type ProviderDriverKind,	21	type ProviderDriverKind,
22	} from "@t3tools/contracts";	22	} from "@t3tools/contracts";
23	import { Effect, Layer } from "effect";	23	import * as Effect from "effect/Effect";
		24	import * as Layer from "effect/Layer";
24		25
25	import { ProviderUnsupportedError } from "../Errors.ts";	26	import { ProviderUnsupportedError } from "../Errors.ts";
26	import { ProviderInstanceRegistry } from "../Services/ProviderInstanceRegistry.ts";	27	import { ProviderInstanceRegistry } from "../Services/ProviderInstanceRegistry.ts";

apps/server/src/provider/Layers/ProviderEventLoggers.ts+3-1

 @@ -27,7 +27,9 @@
  *
  * @module provider/Layers/ProviderEventLoggers
  */
-import { Context, Effect, Layer } from "effect";
+import * as Context from "effect/Context";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
 import { ServerConfig } from "../../config.ts";
 import { type EventNdjsonLogger, makeEventNdjsonLogger } from "./EventNdjsonLogger.ts";

apps/server/src/provider/Layers/ProviderInstanceRegistryHydration.ts+3-1

 @@ -47,7 +47,9 @@ import {
   type ProviderInstanceConfigMap,
   ServerSettings,
 } from "@t3tools/contracts";
-import { Effect, Layer, Stream } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Stream from "effect/Stream";
 import { ServerSettingsService } from "../../serverSettings.ts";
 import { BUILT_IN_DRIVERS, type BuiltInDriversEnv } from "../builtInDrivers.ts";

apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts+2-1

...	@@ -33,7 +33,8 @@ import {	...	@@ -33,7 +33,8 @@ import {
33	type ProviderInstanceConfigMap,	33	type ProviderInstanceConfigMap,
34	ProviderInstanceId,	34	ProviderInstanceId,
35	} from "@t3tools/contracts";	35	} from "@t3tools/contracts";
36	import { Effect, Layer } from "effect";	36	import * as Effect from "effect/Effect";
		37	import * as Layer from "effect/Layer";
37	import { HttpClient, HttpClientResponse } from "effect/unstable/http";	38	import { HttpClient, HttpClientResponse } from "effect/unstable/http";
38		39
39	import { ServerConfig } from "../../config.ts";	40	import { ServerConfig } from "../../config.ts";

apps/server/src/provider/Layers/ProviderInstanceRegistryLive.ts+13-4

 @@ -40,7 +40,16 @@ import {
   type ProviderDriverKind,
   type ServerProvider,
 } from "@t3tools/contracts";
-import { Context, Effect, Equal, Exit, Layer, PubSub, Ref, Schema, Scope, Stream } from "effect";
+import * as Context from "effect/Context";
+import * as Effect from "effect/Effect";
+import * as Equal from "effect/Equal";
+import * as Exit from "effect/Exit";
+import * as Layer from "effect/Layer";
+import * as PubSub from "effect/PubSub";
+import * as Ref from "effect/Ref";
+import * as Schema from "effect/Schema";
+import * as Scope from "effect/Scope";
+import * as Stream from "effect/Stream";
 import { buildUnavailableProviderSnapshot } from "../unavailableProviderSnapshot.ts";
 import {
 @@ -115,7 +124,7 @@ const buildEntry = <R>(input: {
     if (!driver) {
       return {
         kind: "unavailable" as const,
-        snapshot: buildUnavailableProviderSnapshot({
+        snapshot: yield* buildUnavailableProviderSnapshot({
           driverKind: entry.driver,
           instanceId,
           displayName: entry.displayName,
 @@ -137,7 +146,7 @@ const buildEntry = <R>(input: {
       });
       return {
         kind: "unavailable" as const,
-        snapshot: buildUnavailableProviderSnapshot({
+        snapshot: yield* buildUnavailableProviderSnapshot({
           driverKind: entry.driver,
           instanceId,
           displayName: entry.displayName,
 @@ -175,7 +184,7 @@ const buildEntry = <R>(input: {
       yield* Scope.close(childScope, Exit.void).pipe(Effect.ignore);
       return {
         kind: "unavailable" as const,
-        snapshot: buildUnavailableProviderSnapshot({
+        snapshot: yield* buildUnavailableProviderSnapshot({
           driverKind: entry.driver,
           instanceId,
           displayName: entry.displayName,

apps/server/src/provider/Layers/ProviderRegistry.test.ts+23-26

 @@ -1,6 +1,15 @@
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import { describe, it, assert, live } from "@effect/vitest";
+import { describe, it, assert } from "@effect/vitest";
-import { Effect, Exit, Layer, PubSub, Ref, Schema, Scope, Sink, Stream } from "effect";
+import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
+import * as Layer from "effect/Layer";
+import * as PubSub from "effect/PubSub";
+import * as Ref from "effect/Ref";
+import * as Schema from "effect/Schema";
+import * as Scope from "effect/Scope";
+import * as Sink from "effect/Sink";
+import * as Stream from "effect/Stream";
+import * as TestClock from "effect/testing/TestClock";
 import * as CodexErrors from "effect-codex-app-server/errors";
 import {
   ClaudeSettings,
 @@ -696,7 +705,8 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest(), T
               attempt < 50 && cachedProvider?.checkedAt !== refreshedProvider.checkedAt;
               attempt += 1
             ) {
-              yield* Effect.sleep("10 millis");
+              yield* TestClock.adjust("10 millis");
+              yield* Effect.yieldNow;
               cachedProvider = yield* readProviderStatusCache(filePath);
             }
 @@ -840,8 +850,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest(), T
           const changes = yield* PubSub.unbounded<void>();
           const instancesRef = yield* Ref.make<ReadonlyArray<ProviderInstance>>([codexInstance]);
           const failNextList = yield* Ref.make(false);
-          const wait = (millis: number) =>
+          const wait = () => Effect.yieldNow;
-            Effect.promise<void>(() => new Promise((resolve) => setTimeout(resolve, millis)));
           const instanceRegistryLayer = Layer.succeed(ProviderInstanceRegistry, {
             getInstance: (instanceId) =>
               Ref.get(instancesRef).pipe(
 @@ -892,7 +901,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest(), T
               !providers.some((provider) => provider.instanceId === claudeInstanceId);
               attempt += 1
             ) {
-              yield* wait(10);
+              yield* wait();
               providers = yield* registry.getProviders;
             }
 @@ -917,7 +926,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest(), T
       // assertions below fail.
       it.effect("propagates real Codex probe failures to the aggregator at boot", () =>
         Effect.gen(function* () {
-          const missingBinary = `t3code_codex_missing_${process.pid}_${Date.now()}`;
+          const missingBinary = `t3code_codex_missing_`;
           const serverSettings = yield* makeMutableServerSettingsService(
             Schema.decodeSync(ServerSettings)(
               deepMerge(DEFAULT_SERVER_SETTINGS, {
 @@ -1013,20 +1022,10 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest(), T
       // rebuilt instance's refresh (previous bug mode), the aggregator
       // keeps the old snapshot and this test fails.
       //
-      // `live` (imported from `@effect/vitest`) is used instead of
+      it.effect("re-probes when settings change the codex binaryPath", () =>
-      // `it.effect` so real timers coordinate the fibres that drive the
-      // settings → reconcile → sync pipeline. Under `it.effect`'s
-      // TestClock, `Effect.sleep` blocks until `TestClock.adjust`, which
-      // would require this test to reach into the internals of the
-      // reconcile pipeline to advance it step by step.
-      //
-      // The nested `it` handed to `it.layer(…, (it) => …)` is the
-      // `MethodsNonLive` variant and therefore lacks `.live`; the
-      // top-level `live` export from `@effect/vitest` is the equivalent.
-      live("re-probes when settings change the codex binaryPath", () =>
         Effect.gen(function* () {
-          const firstMissing = `t3code_codex_first_${process.pid}_${Date.now()}`;
+          const firstMissing = `t3code_codex_first_`;
-          const secondMissing = `t3code_codex_second_${process.pid}_${Date.now()}`;
+          const secondMissing = `t3code_codex_second_`;
           const serverSettings = yield* makeMutableServerSettingsService(
             Schema.decodeSync(ServerSettings)(
               deepMerge(DEFAULT_SERVER_SETTINGS, {
 @@ -1093,11 +1092,8 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest(), T
               },
             });
-            // Poll with real timers (via `it.live`) until `checkedAt`
+            // Poll with TestClock until `checkedAt` advances or we hit a
-            // advances or we hit a generous 3-second ceiling. Anything
+            // generous virtual 3-second ceiling.
-            // slower than that is a regression — the real probe fails
-            // fast on ENOENT, and the reconcile + sync pipeline is
-            // purely in-process.
             const refreshed = yield* Effect.gen(function* () {
               for (let attempts = 0; attempts < 60; attempts += 1) {
                 const providers = yield* registry.getProviders;
 @@ -1105,7 +1101,8 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest(), T
                 if (codex !== undefined && codex.checkedAt !== initialCheckedAt) {
                   return providers;
                 }
-                yield* Effect.sleep("50 millis");
+                yield* TestClock.adjust("50 millis");
+                yield* Effect.yieldNow;
               }
               return yield* registry.getProviders;
             });

apps/server/src/provider/Layers/ProviderRegistry.ts+9-1

...	@@ -29,7 +29,15 @@ import {	...	@@ -29,7 +29,15 @@ import {
29	type ServerProvider,	29	type ServerProvider,
30	type ServerProviderUpdateState,	30	type ServerProviderUpdateState,
31	} from "@t3tools/contracts";	31	} from "@t3tools/contracts";
32	import { Cause, Effect, Equal, FileSystem, Layer, Path, PubSub, Ref, Stream } from "effect";	32	import * as Cause from "effect/Cause";
		33	import * as Effect from "effect/Effect";
		34	import * as Equal from "effect/Equal";
		35	import * as FileSystem from "effect/FileSystem";
		36	import * as Layer from "effect/Layer";
		37	import * as Path from "effect/Path";
		38	import * as PubSub from "effect/PubSub";
		39	import * as Ref from "effect/Ref";
		40	import * as Stream from "effect/Stream";
33	import * as Semaphore from "effect/Semaphore";	41	import * as Semaphore from "effect/Semaphore";
34		42
35	import { ServerConfig } from "../../config.ts";	43	import { ServerConfig } from "../../config.ts";

apps/server/src/provider/Layers/ProviderService.test.ts+31-20

 @@ -1,3 +1,4 @@
+// @effect-diagnostics nodeBuiltinImport:off
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 @@ -21,7 +22,17 @@ import {
 import { createModelSelection } from "@t3tools/shared/model";
 import { it, assert, vi } from "@effect/vitest";
-import { Effect, Exit, Fiber, Layer, Metric, Option, PubSub, Ref, Scope, Stream } from "effect";
+import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
+import * as Fiber from "effect/Fiber";
+import * as Layer from "effect/Layer";
+import * as Metric from "effect/Metric";
+import * as Option from "effect/Option";
+import * as PubSub from "effect/PubSub";
+import * as Ref from "effect/Ref";
+import * as Scope from "effect/Scope";
+import * as Stream from "effect/Stream";
+import * as TestClock from "effect/testing/TestClock";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import {
 @@ -83,7 +94,7 @@ function makeFakeCodexAdapter(provider: ProviderDriverKind = CODEX_DRIVER) {
   const startSession = vi.fn((input: ProviderSessionStartInput) =>
     Effect.sync(() => {
-      const now = new Date().toISOString();
+      const now = "2026-01-01T00:00:00.000Z";
       const session: ProviderSession = {
         provider,
         ...(input.providerInstanceId !== undefined
 @@ -246,8 +257,8 @@ function makeFakeCodexAdapter(provider: ProviderDriverKind = CODEX_DRIVER) {
   };
 }
-const sleep = (ms: number) =>
+const advanceTestClock = (ms: number) =>
-  Effect.promise(() => new Promise<void>((resolve) => setTimeout(resolve, ms)));
+  TestClock.adjust(`${ms} millis`).pipe(Effect.andThen(Effect.yieldNow));
 const hasMetricSnapshot = (
   snapshots: ReadonlyArray<Metric.Metric.Snapshot>,
 @@ -572,18 +583,18 @@ it.effect("ProviderServiceLive writes canonical events to the emitting thread se
     yield* Effect.gen(function* () {
       yield* ProviderService;
-      yield* sleep(10);
+      yield* advanceTestClock(10);
       codex.emit({
         eventId: asEventId("evt-canonical-thread-segment"),
         provider: ProviderDriverKind.make("codex"),
         threadId: asThreadId("thread-canonical-thread-segment"),
-        createdAt: new Date().toISOString(),
+        createdAt: "2026-01-01T00:00:00.000Z",
         type: "turn.completed",
         payload: {
           state: "completed",
         },
       });
-      yield* sleep(20);
+      yield* advanceTestClock(20);
     }).pipe(Effect.provide(providerLayer));
     assert.equal(canonicalEvents.length, 1);
 @@ -704,7 +715,7 @@ it.effect(
           ...existing,
           status: "ready",
           resumeCursor: updatedResumeCursor,
-          updatedAt: new Date(Date.now() + 1_000).toISOString(),
+          updatedAt: "2026-01-01T00:00:01.000Z",
         }));
         return session;
       }).pipe(Effect.provide(firstProviderLayer));
 @@ -1403,20 +1414,20 @@ fanout.layer("ProviderServiceLive fanout", (it) => {
       const consumer = yield* Stream.runForEach(provider.streamEvents, (event) =>
         Ref.update(eventsRef, (current) => [...current, event]),
       ).pipe(Effect.forkChild);
-      yield* sleep(50);
+      yield* advanceTestClock(50);
       const completedEvent: LegacyProviderRuntimeEvent = {
         type: "turn.completed",
         eventId: asEventId("evt-1"),
         provider: ProviderDriverKind.make("codex"),
-        createdAt: new Date().toISOString(),
+        createdAt: "2026-01-01T00:00:00.000Z",
         threadId: session.threadId,
         turnId: asTurnId("turn-1"),
         status: "completed",
       };
       fanout.codex.emit(completedEvent);
-      yield* sleep(50);
+      yield* advanceTestClock(50);
       const events = yield* Ref.get(eventsRef);
       yield* Fiber.interrupt(consumer);
 @@ -1450,13 +1461,13 @@ fanout.layer("ProviderServiceLive fanout", (it) => {
         Stream.runForEach((event) => Ref.update(receivedRef, (current) => [...current, event])),
         Effect.forkChild,
       );
-      yield* sleep(50);
+      yield* advanceTestClock(50);
       fanout.codex.emit({
         type: "tool.started",
         eventId: asEventId("evt-seq-1"),
         provider: ProviderDriverKind.make("codex"),
-        createdAt: new Date().toISOString(),
+        createdAt: "2026-01-01T00:00:00.000Z",
         threadId: session.threadId,
         turnId: asTurnId("turn-1"),
         toolKind: "command",
 @@ -1466,7 +1477,7 @@ fanout.layer("ProviderServiceLive fanout", (it) => {
         type: "tool.completed",
         eventId: asEventId("evt-seq-2"),
         provider: ProviderDriverKind.make("codex"),
-        createdAt: new Date().toISOString(),
+        createdAt: "2026-01-01T00:00:00.000Z",
         threadId: session.threadId,
         turnId: asTurnId("turn-1"),
         toolKind: "command",
 @@ -1476,7 +1487,7 @@ fanout.layer("ProviderServiceLive fanout", (it) => {
         type: "turn.completed",
         eventId: asEventId("evt-seq-3"),
         provider: ProviderDriverKind.make("codex"),
-        createdAt: new Date().toISOString(),
+        createdAt: "2026-01-01T00:00:00.000Z",
         threadId: session.threadId,
         turnId: asTurnId("turn-1"),
         status: "completed",
 @@ -1515,14 +1526,14 @@ fanout.layer("ProviderServiceLive fanout", (it) => {
         Stream.runForEach(() => Effect.fail("listener crash")),
         Effect.forkChild,
       );
-      yield* sleep(50);
+      yield* advanceTestClock(50);
       const events: ReadonlyArray<LegacyProviderRuntimeEvent> = [
         {
           type: "tool.completed",
           eventId: asEventId("evt-ordered-1"),
           provider: ProviderDriverKind.make("codex"),
-          createdAt: new Date().toISOString(),
+          createdAt: "2026-01-01T00:00:00.000Z",
           threadId: session.threadId,
           turnId: asTurnId("turn-1"),
           toolKind: "command",
 @@ -1533,7 +1544,7 @@ fanout.layer("ProviderServiceLive fanout", (it) => {
           type: "message.delta",
           eventId: asEventId("evt-ordered-2"),
           provider: ProviderDriverKind.make("codex"),
-          createdAt: new Date().toISOString(),
+          createdAt: "2026-01-01T00:00:00.000Z",
           threadId: session.threadId,
           turnId: asTurnId("turn-1"),
           delta: "hello",
 @@ -1542,7 +1553,7 @@ fanout.layer("ProviderServiceLive fanout", (it) => {
           type: "turn.completed",
           eventId: asEventId("evt-ordered-3"),
           provider: ProviderDriverKind.make("codex"),
-          createdAt: new Date().toISOString(),
+          createdAt: "2026-01-01T00:00:00.000Z",
           threadId: session.threadId,
           turnId: asTurnId("turn-1"),
           status: "completed",
 @@ -1758,7 +1769,7 @@ validation.layer("ProviderServiceLive validation", (it) => {
       validation.codex.startSession.mockImplementationOnce((input: ProviderSessionStartInput) =>
         Effect.sync(() => {
-          const now = new Date().toISOString();
+          const now = "2026-01-01T00:00:00.000Z";
           return {
             provider: ProviderDriverKind.make("codex"),
             status: "ready",

apps/server/src/provider/Layers/ProviderService.ts+37-20

 @@ -24,7 +24,16 @@ import {
   type ProviderRuntimeEvent,
   type ProviderSession,
 } from "@t3tools/contracts";
-import { Cause, Effect, Layer, Option, PubSub, Ref, Schema, SchemaIssue, Stream } from "effect";
+import * as Cause from "effect/Cause";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as PubSub from "effect/PubSub";
+import * as Ref from "effect/Ref";
+import * as Schema from "effect/Schema";
+import * as SchemaIssue from "effect/SchemaIssue";
+import * as Stream from "effect/Stream";
 import {
   increment,
 @@ -199,6 +208,7 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
   const registry = yield* ProviderAdapterRegistry;
   const directory = yield* ProviderSessionDirectory;
   const runtimeEventPubSub = yield* PubSub.unbounded<ProviderRuntimeEvent>();
+  const nowIso = Effect.map(DateTime.now, DateTime.formatIso);
   const publishRuntimeEvent = (event: ProviderRuntimeEvent): Effect.Effect<void> =>
     Effect.succeed(event).pipe(
 @@ -655,7 +665,7 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
           ...(input.modelSelection !== undefined ? { modelSelection: input.modelSelection } : {}),
           activeTurnId: turn.turnId,
           lastRuntimeEvent: "provider.sendTurn",
-          lastRuntimeEventAt: new Date().toISOString(),
+          lastRuntimeEventAt: yield* nowIso,
         },
       });
       yield* analytics.record("provider.turn.sent", {
 @@ -977,27 +987,34 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
       ),
     ).pipe(Effect.map((sessionsByAdapter) => sessionsByAdapter.flatMap((sessions) => sessions)));
     yield* Effect.forEach(activeSessions, (session) =>
-      upsertSessionBinding(session, session.threadId, {
+      Effect.flatMap(nowIso, (lastRuntimeEventAt) =>
-        lastRuntimeEvent: "provider.stopAll",
+        upsertSessionBinding(session, session.threadId, {
-        lastRuntimeEventAt: new Date().toISOString(),
+          lastRuntimeEvent: "provider.stopAll",
-      }),
+          lastRuntimeEventAt,
+        }),
+      ),
     ).pipe(Effect.asVoid);
     yield* Effect.forEach(currentAdapters, ([, adapter]) => adapter.stopAll()).pipe(Effect.asVoid);
     const bindings = yield* directory.listBindings().pipe(Effect.orElseSucceed(() => []));
-    yield* Effect.forEach(bindings, (binding) => {
+    yield* Effect.forEach(bindings, (binding) =>
-      const providerInstanceId = dieOnMissingBindingInstanceId("ProviderService.stopAll", binding);
+      Effect.gen(function* () {
-      return directory.upsert({
+        const providerInstanceId = dieOnMissingBindingInstanceId(
-        threadId: binding.threadId,
+          "ProviderService.stopAll",
-        provider: binding.provider,
+          binding,
-        providerInstanceId,
+        );
-        status: "stopped",
+        return yield* directory.upsert({
-        runtimePayload: {
+          threadId: binding.threadId,
-          activeTurnId: null,
+          provider: binding.provider,
-          lastRuntimeEvent: "provider.stopAll",
+          providerInstanceId,
-          lastRuntimeEventAt: new Date().toISOString(),
+          status: "stopped",
-        },
+          runtimePayload: {
-      });
+            activeTurnId: null,
-    }).pipe(Effect.asVoid);
+            lastRuntimeEvent: "provider.stopAll",
+            lastRuntimeEventAt: yield* nowIso,
+          },
+        });
+      }),
+    ).pipe(Effect.asVoid);
     yield* analytics.record("provider.sessions.stopped_all", {
       sessionCount: threadIds.length,
     });

apps/server/src/provider/Layers/ProviderSessionDirectory.test.ts+5-2

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import fs from "node:fs";	2	import fs from "node:fs";
2	import os from "node:os";	3	import os from "node:os";
3	import path from "node:path";	4	import path from "node:path";
...	@@ -6,7 +7,9 @@ import * as NodeServices from "@effect/platform-node/NodeServices";	...	@@ -6,7 +7,9 @@ import * as NodeServices from "@effect/platform-node/NodeServices";
6	import { ProviderDriverKind, ThreadId } from "@t3tools/contracts";	7	import { ProviderDriverKind, ThreadId } from "@t3tools/contracts";
7	import { it, assert } from "@effect/vitest";	8	import { it, assert } from "@effect/vitest";
8	import { assertSome } from "@effect/vitest/utils";	9	import { assertSome } from "@effect/vitest/utils";
9	import { Effect, Layer, Option } from "effect";	10	import * as Effect from "effect/Effect";
		11	import * as Layer from "effect/Layer";
		12	import * as Option from "effect/Option";
10	import * as SqlClient from "effect/unstable/sql/SqlClient";	13	import * as SqlClient from "effect/unstable/sql/SqlClient";
11		14
12	import {	15	import {
...	@@ -209,7 +212,7 @@ it.layer(makeDirectoryLayer(SqlitePersistenceMemory))("ProviderSessionDirectoryL	...	@@ -209,7 +212,7 @@ it.layer(makeDirectoryLayer(SqlitePersistenceMemory))("ProviderSessionDirectoryL
209	adapterKey: "claudeAgent",	212	adapterKey: "claudeAgent",
210	runtimeMode: "full-access",	213	runtimeMode: "full-access",
211	status: "running",	214	status: "running",
212	lastSeenAt: new Date().toISOString(),	215	lastSeenAt: "2026-01-01T00:00:00.000Z",
213	resumeCursor: null,	216	resumeCursor: null,
214	runtimePayload: null,	217	runtimePayload: null,
215	});	218	});

apps/server/src/provider/Layers/ProviderSessionDirectory.ts+6-2

...	@@ -1,5 +1,9 @@	...	@@ -1,5 +1,9 @@
1	import { defaultInstanceIdForDriver, ProviderDriverKind, type ThreadId } from "@t3tools/contracts";	1	import { defaultInstanceIdForDriver, ProviderDriverKind, type ThreadId } from "@t3tools/contracts";
2	import { Effect, Layer, Option, Schema } from "effect";	2	import * as DateTime from "effect/DateTime";
		3	import * as Effect from "effect/Effect";
		4	import * as Layer from "effect/Layer";
		5	import * as Option from "effect/Option";
		6	import * as Schema from "effect/Schema";
3		7
4	import type { ProviderSessionRuntime } from "../../persistence/Services/ProviderSessionRuntime.ts";	8	import type { ProviderSessionRuntime } from "../../persistence/Services/ProviderSessionRuntime.ts";
5	import { ProviderSessionRuntimeRepository } from "../../persistence/Services/ProviderSessionRuntime.ts";	9	import { ProviderSessionRuntimeRepository } from "../../persistence/Services/ProviderSessionRuntime.ts";
...	@@ -110,7 +114,7 @@ const makeProviderSessionDirectory = Effect.gen(function* () {	...	@@ -110,7 +114,7 @@ const makeProviderSessionDirectory = Effect.gen(function* () {
110	});	114	});
111	}	115	}
112		116
113	const now = new Date().toISOString();	117	const now = DateTime.formatIso(yield* DateTime.now);
114	const providerChanged =	118	const providerChanged =
115	existingRuntime !== undefined && existingRuntime.providerName !== binding.provider;	119	existingRuntime !== undefined && existingRuntime.providerName !== binding.provider;
116	const providerInstanceId =	120	const providerInstanceId =

apps/server/src/provider/Layers/ProviderSessionReaper.test.ts+26-14

 @@ -6,7 +6,15 @@ import {
   ProviderDriverKind,
   ProviderInstanceId,
 } from "@t3tools/contracts";
-import { Effect, Exit, Layer, ManagedRuntime, Option, Scope, Stream } from "effect";
+import * as Clock from "effect/Clock";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
+import * as Layer from "effect/Layer";
+import * as ManagedRuntime from "effect/ManagedRuntime";
+import * as Option from "effect/Option";
+import * as Scope from "effect/Scope";
+import * as Stream from "effect/Stream";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { ProjectionSnapshotQuery } from "../../orchestration/Services/ProjectionSnapshotQuery.ts";
 @@ -28,21 +36,25 @@ async function waitFor(
   predicate: () => boolean | Promise<boolean>,
   timeoutMs = 2_000,
 ): Promise<void> {
-  const deadline = Date.now() + timeoutMs;
+  const deadline = (await Effect.runPromise(Clock.currentTimeMillis)) + timeoutMs;
   const poll = async (): Promise<void> => {
     if (await predicate()) {
       return;
     }
-    if (Date.now() >= deadline) {
+    if ((await Effect.runPromise(Clock.currentTimeMillis)) >= deadline) {
       throw new Error("Timed out waiting for expectation.");
     }
-    await new Promise((resolve) => setTimeout(resolve, 10));
+    await Effect.runPromise(Effect.yieldNow);
     return poll();
   };
   return poll();
 }
+const drainFibers = Effect.forEach(Array.from({ length: 10 }), () => Effect.yieldNow, {
+  discard: true,
+});
 const unsupported = () => Effect.die(new Error("Unsupported provider call in test")) as never;
 function makeReadModel(
 @@ -59,7 +71,7 @@ function makeReadModel(
     } | null;
   }>,
 ) {
-  const now = new Date().toISOString();
+  const now = "2026-01-01T00:00:00.000Z";
   const projectId = ProjectId.make("project-provider-session-reaper");
   return {
 @@ -207,7 +219,7 @@ describe("ProviderSessionReaper", () => {
   it("reaps stale persisted sessions without active turns", async () => {
     const threadId = ThreadId.make("thread-reaper-stale");
-    const now = new Date().toISOString();
+    const now = "2026-01-01T00:00:00.000Z";
     const harness = await createHarness({
       readModel: makeReadModel([
         {
 @@ -255,7 +267,7 @@ describe("ProviderSessionReaper", () => {
   it("skips stale sessions when the thread still has an active turn", async () => {
     const threadId = ThreadId.make("thread-reaper-active-turn");
     const turnId = TurnId.make("turn-reaper-active");
-    const now = new Date().toISOString();
+    const now = "2026-01-01T00:00:00.000Z";
     const harness = await createHarness({
       readModel: makeReadModel([
         {
 @@ -293,7 +305,7 @@ describe("ProviderSessionReaper", () => {
     const reaper = await runtime!.runPromise(Effect.service(ProviderSessionReaper));
     scope = await Effect.runPromise(Scope.make("sequential"));
     await Effect.runPromise(reaper.start().pipe(Scope.provide(scope)));
-    await new Promise((resolve) => setTimeout(resolve, 50));
+    await Effect.runPromise(drainFibers);
     expect(harness.stopSession).not.toHaveBeenCalled();
     const remaining = await runtime!.runPromise(repository.getByThreadId({ threadId }));
 @@ -302,7 +314,7 @@ describe("ProviderSessionReaper", () => {
   it("does not reap sessions that are still within the inactivity threshold", async () => {
     const threadId = ThreadId.make("thread-reaper-fresh");
-    const now = new Date().toISOString();
+    const now = DateTime.formatIso(await Effect.runPromise(DateTime.now));
     const harness = await createHarness({
       readModel: makeReadModel([
         {
 @@ -340,7 +352,7 @@ describe("ProviderSessionReaper", () => {
     const reaper = await runtime!.runPromise(Effect.service(ProviderSessionReaper));
     scope = await Effect.runPromise(Scope.make("sequential"));
     await Effect.runPromise(reaper.start().pipe(Scope.provide(scope)));
-    await new Promise((resolve) => setTimeout(resolve, 50));
+    await Effect.runPromise(drainFibers);
     expect(harness.stopSession).not.toHaveBeenCalled();
     const remaining = await runtime!.runPromise(repository.getByThreadId({ threadId }));
 @@ -349,7 +361,7 @@ describe("ProviderSessionReaper", () => {
   it("skips persisted sessions that are already marked stopped", async () => {
     const threadId = ThreadId.make("thread-reaper-stopped");
-    const now = new Date().toISOString();
+    const now = "2026-01-01T00:00:00.000Z";
     const harness = await createHarness({
       readModel: makeReadModel([
         {
 @@ -387,7 +399,7 @@ describe("ProviderSessionReaper", () => {
     const reaper = await runtime!.runPromise(Effect.service(ProviderSessionReaper));
     scope = await Effect.runPromise(Scope.make("sequential"));
     await Effect.runPromise(reaper.start().pipe(Scope.provide(scope)));
-    await new Promise((resolve) => setTimeout(resolve, 50));
+    await Effect.runPromise(drainFibers);
     expect(harness.stopSession).not.toHaveBeenCalled();
     const remaining = await runtime!.runPromise(repository.getByThreadId({ threadId }));
 @@ -397,7 +409,7 @@ describe("ProviderSessionReaper", () => {
   it("continues reaping other sessions when one stop attempt fails", async () => {
     const failedThreadId = ThreadId.make("thread-reaper-stop-failure");
     const reapedThreadId = ThreadId.make("thread-reaper-stop-success");
-    const now = new Date().toISOString();
+    const now = "2026-01-01T00:00:00.000Z";
     const harness = await createHarness({
       readModel: makeReadModel([
         {
 @@ -483,7 +495,7 @@ describe("ProviderSessionReaper", () => {
   it("continues reaping other sessions when one stop attempt defects", async () => {
     const defectThreadId = ThreadId.make("thread-reaper-stop-defect");
     const reapedThreadId = ThreadId.make("thread-reaper-stop-after-defect");
-    const now = new Date().toISOString();
+    const now = "2026-01-01T00:00:00.000Z";
     const harness = await createHarness({
       readModel: makeReadModel([
         {

apps/server/src/provider/Layers/ProviderSessionReaper.ts+7-2

...	@@ -1,4 +1,9 @@	...	@@ -1,4 +1,9 @@
1	import { Duration, Effect, Layer, Option, Schedule } from "effect";	1	import * as Clock from "effect/Clock";
		2	import * as Duration from "effect/Duration";
		3	import * as Effect from "effect/Effect";
		4	import * as Layer from "effect/Layer";
		5	import * as Option from "effect/Option";
		6	import * as Schedule from "effect/Schedule";
2		7
3	import { ProjectionSnapshotQuery } from "../../orchestration/Services/ProjectionSnapshotQuery.ts";	8	import { ProjectionSnapshotQuery } from "../../orchestration/Services/ProjectionSnapshotQuery.ts";
4	import { ProviderSessionDirectory } from "../Services/ProviderSessionDirectory.ts";	9	import { ProviderSessionDirectory } from "../Services/ProviderSessionDirectory.ts";
...	@@ -30,7 +35,7 @@ const makeProviderSessionReaper = (options?: ProviderSessionReaperLiveOptions) =	...	@@ -30,7 +35,7 @@ const makeProviderSessionReaper = (options?: ProviderSessionReaperLiveOptions) =
30		35
31	const sweep = Effect.gen(function* () {	36	const sweep = Effect.gen(function* () {
32	const bindings = yield* directory.listBindings();	37	const bindings = yield* directory.listBindings();
33	const now = Date.now();	38	const now = yield* Clock.currentTimeMillis;
34	let reapedCount = 0;	39	let reapedCount = 0;
35		40
36	for (const binding of bindings) {	41	for (const binding of bindings) {

apps/server/src/provider/Layers/scopedSafeTeardown.test.ts+3-1

...	@@ -1,5 +1,7 @@	...	@@ -1,5 +1,7 @@
1	import { it } from "@effect/vitest";	1	import { it } from "@effect/vitest";
2	import { Cause, Effect, Exit } from "effect";	2	import * as Cause from "effect/Cause";
		3	import * as Effect from "effect/Effect";
		4	import * as Exit from "effect/Exit";
3	import { describe, expect } from "vitest";	5	import { describe, expect } from "vitest";
4		6
5	import { scopedSafeTeardown } from "./scopedSafeTeardown.ts";	7	import { scopedSafeTeardown } from "./scopedSafeTeardown.ts";

apps/server/src/provider/Layers/scopedSafeTeardown.ts+3-1

 @@ -34,7 +34,9 @@
  *
  * @module provider/Layers/scopedSafeTeardown
  */
-import { Effect, Exit, Scope } from "effect";
+import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
+import * as Scope from "effect/Scope";
 /**
  * Run `effect` with a freshly made `Scope.Scope`, guaranteeing that

apps/server/src/provider/ProviderDriver.ts+3-1

 @@ -26,7 +26,9 @@ import type {
   ProviderInstanceEnvironment,
   ProviderInstanceId,
 } from "@t3tools/contracts";
-import type { Effect, Schema, Scope } from "effect";
+import type * as Effect from "effect/Effect";
+import type * as Schema from "effect/Schema";
+import type * as Scope from "effect/Scope";
 import type { TextGenerationShape } from "../textGeneration/TextGeneration.ts";
 import type { ProviderAdapterError, ProviderDriverError } from "./Errors.ts";

apps/server/src/provider/Services/ProviderAdapter.ts+2-2

...	@@ -20,8 +20,8 @@ import type {	...	@@ -20,8 +20,8 @@ import type {
20	ProviderTurnStartResult,	20	ProviderTurnStartResult,
21	TurnId,	21	TurnId,
22	} from "@t3tools/contracts";	22	} from "@t3tools/contracts";
23	import type { Effect } from "effect";	23	import type * as Effect from "effect/Effect";
24	import type { Stream } from "effect";	24	import type * as Stream from "effect/Stream";
25		25
26	export type ProviderSessionModelSwitchMode = "in-session" \| "unsupported";	26	export type ProviderSessionModelSwitchMode = "in-session" \| "unsupported";
27		27

apps/server/src/provider/Services/ProviderAdapterRegistry.ts+5-2

 @@ -20,8 +20,11 @@
  * @module ProviderAdapterRegistry
  */
 import type { ProviderDriverKind, ProviderInstanceId } from "@t3tools/contracts";
-import { Context } from "effect";
+import * as Context from "effect/Context";
-import type { Effect, PubSub, Scope, Stream } from "effect";
+import type * as Effect from "effect/Effect";
+import type * as PubSub from "effect/PubSub";
+import type * as Scope from "effect/Scope";
+import type * as Stream from "effect/Stream";
 import type { ProviderAdapterError, ProviderUnsupportedError } from "../Errors.ts";
 import type { ProviderAdapterShape } from "./ProviderAdapter.ts";

apps/server/src/provider/Services/ProviderInstanceRegistry.ts+5-2

 @@ -18,8 +18,11 @@
  * @module provider/Services/ProviderInstanceRegistry
  */
 import type { ProviderInstanceId, ServerProvider } from "@t3tools/contracts";
-import { Context } from "effect";
+import * as Context from "effect/Context";
-import type { Effect, PubSub, Scope, Stream } from "effect";
+import type * as Effect from "effect/Effect";
+import type * as PubSub from "effect/PubSub";
+import type * as Scope from "effect/Scope";
+import type * as Stream from "effect/Stream";
 import type { ProviderInstance } from "../ProviderDriver.ts";

apps/server/src/provider/Services/ProviderInstanceRegistryMutator.ts+2-2

...	@@ -29,8 +29,8 @@	...	@@ -29,8 +29,8 @@
29	* @module provider/Services/ProviderInstanceRegistryMutator	29	* @module provider/Services/ProviderInstanceRegistryMutator
30	*/	30	*/
31	import type { ProviderInstanceConfigMap } from "@t3tools/contracts";	31	import type { ProviderInstanceConfigMap } from "@t3tools/contracts";
32	import { Context } from "effect";	32	import * as Context from "effect/Context";
33	import type { Effect } from "effect";	33	import type * as Effect from "effect/Effect";
34		34
35	export interface ProviderInstanceRegistryMutatorShape {	35	export interface ProviderInstanceRegistryMutatorShape {
36	/**	36	/**

apps/server/src/provider/Services/ProviderRegistry.ts+3-2

 @@ -12,8 +12,9 @@ import type {
   ServerProvider,
   ServerProviderUpdateState,
 } from "@t3tools/contracts";
-import { Context } from "effect";
+import * as Context from "effect/Context";
-import type { Effect, Stream } from "effect";
+import type * as Effect from "effect/Effect";
+import type * as Stream from "effect/Stream";
 import type { ProviderMaintenanceCapabilities } from "../providerMaintenance.ts";
 export type ProviderMaintenanceActionKind = "update";

apps/server/src/provider/Services/ProviderService.ts+3-2

 @@ -24,8 +24,9 @@ import type {
   ThreadId,
   ProviderTurnStartResult,
 } from "@t3tools/contracts";
-import { Context } from "effect";
+import * as Context from "effect/Context";
-import type { Effect, Stream } from "effect";
+import type * as Effect from "effect/Effect";
+import type * as Stream from "effect/Stream";
 import type { ProviderServiceError } from "../Errors.ts";
 import type { ProviderAdapterCapabilities } from "./ProviderAdapter.ts";

apps/server/src/provider/Services/ProviderSessionDirectory.ts+3-2

 @@ -5,8 +5,9 @@ import type {
   RuntimeMode,
   ThreadId,
 } from "@t3tools/contracts";
-import { Option, Context } from "effect";
+import * as Option from "effect/Option";
-import type { Effect } from "effect";
+import * as Context from "effect/Context";
+import type * as Effect from "effect/Effect";
 import type {
   ProviderSessionDirectoryPersistenceError,

apps/server/src/provider/Services/ProviderSessionReaper.ts+3-2

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	import { Context } from "effect";	1	import * as Context from "effect/Context";
2	import type { Effect, Scope } from "effect";	2	import type * as Effect from "effect/Effect";
		3	import type * as Scope from "effect/Scope";
3		4
4	export interface ProviderSessionReaperShape {	5	export interface ProviderSessionReaperShape {
5	/**	6	/**

apps/server/src/provider/Services/ServerProvider.ts+2-1

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	import type { ServerProvider } from "@t3tools/contracts";	1	import type { ServerProvider } from "@t3tools/contracts";
2	import type { Effect, Stream } from "effect";	2	import type * as Effect from "effect/Effect";
		3	import type * as Stream from "effect/Stream";
3	import type { ProviderMaintenanceCapabilities } from "../providerMaintenance.ts";	4	import type { ProviderMaintenanceCapabilities } from "../providerMaintenance.ts";
4		5
5	export interface ServerProviderShape {	6	export interface ServerProviderShape {

apps/server/src/provider/acp/AcpAdapterSupport.ts+1-1

...	@@ -3,7 +3,7 @@ import {	...	@@ -3,7 +3,7 @@ import {
3	type ProviderDriverKind,	3	type ProviderDriverKind,
4	type ThreadId,	4	type ThreadId,
5	} from "@t3tools/contracts";	5	} from "@t3tools/contracts";
6	import { Schema } from "effect";	6	import * as Schema from "effect/Schema";
7	import * as EffectAcpErrors from "effect-acp/errors";	7	import * as EffectAcpErrors from "effect-acp/errors";
8		8
9	import {	9	import {

apps/server/src/provider/acp/AcpJsonRpcConnection.test.ts+3-1

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import * as path from "node:path";	2	import * as path from "node:path";
2	import * as os from "node:os";	3	import * as os from "node:os";
3	import { fileURLToPath } from "node:url";	4	import { fileURLToPath } from "node:url";
...	@@ -5,7 +6,8 @@ import { mkdtempSync, readFileSync, rmSync } from "node:fs";	...	@@ -5,7 +6,8 @@ import { mkdtempSync, readFileSync, rmSync } from "node:fs";
5		6
6	import * as NodeServices from "@effect/platform-node/NodeServices";	7	import * as NodeServices from "@effect/platform-node/NodeServices";
7	import { it } from "@effect/vitest";	8	import { it } from "@effect/vitest";
8	import { Effect, Stream } from "effect";	9	import * as Effect from "effect/Effect";
		10	import * as Stream from "effect/Stream";
9	import { describe, expect } from "vitest";	11	import { describe, expect } from "vitest";
10		12
11	import { AcpSessionRuntime, type AcpSessionRequestLogEvent } from "./AcpSessionRuntime.ts";	13	import { AcpSessionRuntime, type AcpSessionRequestLogEvent } from "./AcpSessionRuntime.ts";

apps/server/src/provider/acp/AcpNativeLogging.ts+6-3

 @@ -1,5 +1,8 @@
 import type { ProviderDriverKind, ThreadId } from "@t3tools/contracts";
-import { Cause, Effect } from "effect";
+import * as Cause from "effect/Cause";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
+import * as Random from "effect/Random";
 import type * as EffectAcpProtocol from "effect-acp/protocol";
 import type { EventNdjsonLogger } from "../Layers/EventNdjsonLogger.ts";
 @@ -14,12 +17,12 @@ function writeNativeAcpLog(input: {
 }): Effect.Effect<void, never> {
   return Effect.gen(function* () {
     if (!input.nativeEventLogger) return;
-    const observedAt = new Date().toISOString();
+    const observedAt = DateTime.formatIso(yield* DateTime.now);
     yield* input.nativeEventLogger.write(
       {
         observedAt,
         event: {
-          id: crypto.randomUUID(),
+          id: yield* Random.nextUUIDv4,
           kind: input.kind,
           provider: input.provider,
           createdAt: observedAt,

apps/server/src/provider/acp/AcpSessionRuntime.ts+15-5

...	@@ -1,4 +1,14 @@	...	@@ -1,4 +1,14 @@
1	import { Cause, Deferred, Effect, Exit, Layer, Queue, Ref, Scope, Context, Stream } from "effect";	1	import * as Cause from "effect/Cause";
		2	import * as Deferred from "effect/Deferred";
		3	import * as Effect from "effect/Effect";
		4	import * as Exit from "effect/Exit";
		5	import * as Layer from "effect/Layer";
		6	import * as Queue from "effect/Queue";
		7	import * as Ref from "effect/Ref";
		8	import * as Scope from "effect/Scope";
		9	import * as Context from "effect/Context";
		10	import * as Schema from "effect/Schema";
		11	import * as Stream from "effect/Stream";
2	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";	12	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
3	import * as EffectAcpClient from "effect-acp/client";	13	import * as EffectAcpClient from "effect-acp/client";
4	import * as EffectAcpErrors from "effect-acp/errors";	14	import * as EffectAcpErrors from "effect-acp/errors";
...	@@ -248,7 +258,7 @@ const makeAcpSessionRuntime = (	...	@@ -248,7 +258,7 @@ const makeAcpSessionRuntime = (
248	}	258	}
249	return yield* new EffectAcpErrors.AcpTransportError({	259	return yield* new EffectAcpErrors.AcpTransportError({
250	detail: "ACP session runtime has not been started",	260	detail: "ACP session runtime has not been started",
251	cause: new Error("ACP session runtime has not been started"),	261	cause: "ACP session runtime has not been started",
252	});	262	});
253	});	263	});
254		264
...	@@ -267,7 +277,7 @@ const makeAcpSessionRuntime = (	...	@@ -267,7 +277,7 @@ const makeAcpSessionRuntime = (
267	}	277	}
268	return yield* new EffectAcpErrors.AcpRequestError({	278	return yield* new EffectAcpErrors.AcpRequestError({
269	code: -32602,	279	code: -32602,
270	errorMessage: `Invalid value ${JSON.stringify(value)} for session config option "${configOption.id}": expected boolean`,	280	errorMessage: `Invalid value ${Schema.encodeUnknownSync(Schema.UnknownFromJsonString)(value)} for session config option "${configOption.id}": expected boolean`,
271	data: {	281	data: {
272	configId: configOption.id,	282	configId: configOption.id,
273	expectedType: "boolean",	283	expectedType: "boolean",
...	@@ -278,7 +288,7 @@ const makeAcpSessionRuntime = (	...	@@ -278,7 +288,7 @@ const makeAcpSessionRuntime = (
278	if (typeof value !== "string") {	288	if (typeof value !== "string") {
279	return yield* new EffectAcpErrors.AcpRequestError({	289	return yield* new EffectAcpErrors.AcpRequestError({
280	code: -32602,	290	code: -32602,
281	errorMessage: `Invalid value ${JSON.stringify(value)} for session config option "${configOption.id}": expected string`,	291	errorMessage: `Invalid value ${Schema.encodeUnknownSync(Schema.UnknownFromJsonString)(value)} for session config option "${configOption.id}": expected string`,
282	data: {	292	data: {
283	configId: configOption.id,	293	configId: configOption.id,
284	expectedType: "string",	294	expectedType: "string",
...	@@ -292,7 +302,7 @@ const makeAcpSessionRuntime = (	...	@@ -292,7 +302,7 @@ const makeAcpSessionRuntime = (
292	}	302	}
293	return yield* new EffectAcpErrors.AcpRequestError({	303	return yield* new EffectAcpErrors.AcpRequestError({
294	code: -32602,	304	code: -32602,
295	errorMessage: `Invalid value ${JSON.stringify(value)} for session config option "${configOption.id}": expected one of ${allowedValues.join(", ")}`,	305	errorMessage: `Invalid value ${Schema.encodeUnknownSync(Schema.UnknownFromJsonString)(value)} for session config option "${configOption.id}": expected one of ${allowedValues.join(", ")}`,
296	data: {	306	data: {
297	configId: configOption.id,	307	configId: configOption.id,
298	allowedValues,	308	allowedValues,

apps/server/src/provider/acp/CursorAcpCliProbe.test.ts+12-7

apps/server/src/provider/acp/CursorAcpExtension.ts+1-1

...	@@ -3,7 +3,7 @@	...	@@ -3,7 +3,7 @@
3	* Additional reference provided by the Cursor team: https://anysphere.enterprise.slack.com/files/U068SSJE141/F0APT1HSZRP/cursor-acp-extension-method-schemas.md	3	* Additional reference provided by the Cursor team: https://anysphere.enterprise.slack.com/files/U068SSJE141/F0APT1HSZRP/cursor-acp-extension-method-schemas.md
4	*/	4	*/
5	import type { UserInputQuestion } from "@t3tools/contracts";	5	import type { UserInputQuestion } from "@t3tools/contracts";
6	import { Schema } from "effect";	6	import * as Schema from "effect/Schema";
7		7
8	const CursorAskQuestionOption = Schema.Struct({	8	const CursorAskQuestionOption = Schema.Struct({
9	id: Schema.String,	9	id: Schema.String,

apps/server/src/provider/acp/CursorAcpSupport.test.ts+4-6

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	import { Effect } from "effect";	1	import * as Effect from "effect/Effect";
2	import type * as EffectAcpSchema from "effect-acp/schema";	2	import type * as EffectAcpSchema from "effect-acp/schema";
3	import { describe, expect, it } from "vitest";	3	import { describe, expect, it } from "vitest";
4		4
...	@@ -105,11 +105,9 @@ describe("applyCursorAcpModelSelection", () => {	...	@@ -105,11 +105,9 @@ describe("applyCursorAcpModelSelection", () => {
105	{ id: "fastMode", value: true },	105	{ id: "fastMode", value: true },
106	],	106	],
107	mapError: ({ step, configId, cause }) =>	107	mapError: ({ step, configId, cause }) =>
108	new Error(	108	step === "set-config-option"
109	step === "set-config-option"	109	? `failed to set config option ${configId}: ${cause.message}`
110	? `failed to set config option ${configId}: ${cause.message}`	110	: `failed to set model: ${cause.message}`,
111	: `failed to set model: ${cause.message}`,
112	),
113	}),	111	}),
114	);	112	);
115		113

apps/server/src/provider/acp/CursorAcpSupport.ts+3-1

...	@@ -1,5 +1,7 @@	...	@@ -1,5 +1,7 @@
1	import { type CursorSettings, type ProviderOptionSelection } from "@t3tools/contracts";	1	import { type CursorSettings, type ProviderOptionSelection } from "@t3tools/contracts";
2	import { Effect, Layer, Scope } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
		4	import * as Scope from "effect/Scope";
3	import { ChildProcessSpawner } from "effect/unstable/process";	5	import { ChildProcessSpawner } from "effect/unstable/process";
4	import type * as EffectAcpErrors from "effect-acp/errors";	6	import type * as EffectAcpErrors from "effect-acp/errors";
5		7

apps/server/src/provider/builtInProviderCatalog.ts+1-1

...	@@ -1,5 +1,5 @@	...	@@ -1,5 +1,5 @@
1	import type { ProviderDriverKind, ProviderInstanceId, ServerProvider } from "@t3tools/contracts";	1	import type { ProviderDriverKind, ProviderInstanceId, ServerProvider } from "@t3tools/contracts";
2	import type { Stream } from "effect";	2	import type * as Stream from "effect/Stream";
3	import type { ServerProviderShape } from "./Services/ServerProvider.ts";	3	import type { ServerProviderShape } from "./Services/ServerProvider.ts";
4		4
5	export type ProviderSnapshotSource = {	5	export type ProviderSnapshotSource = {

apps/server/src/provider/makeManagedServerProvider.test.ts+10-5

...	@@ -1,7 +1,12 @@	...	@@ -1,7 +1,12 @@
1	import { describe, it, assert } from "@effect/vitest";	1	import { describe, it, assert } from "@effect/vitest";
2	import { ProviderDriverKind, ProviderInstanceId, type ServerProvider } from "@t3tools/contracts";	2	import { ProviderDriverKind, ProviderInstanceId, type ServerProvider } from "@t3tools/contracts";
3	import { createModelCapabilities } from "@t3tools/shared/model";	3	import { createModelCapabilities } from "@t3tools/shared/model";
4	import { Deferred, Effect, Fiber, PubSub, Ref, Stream } from "effect";	4	import * as Deferred from "effect/Deferred";
		5	import * as Effect from "effect/Effect";
		6	import * as Fiber from "effect/Fiber";
		7	import * as PubSub from "effect/PubSub";
		8	import * as Ref from "effect/Ref";
		9	import * as Stream from "effect/Stream";
5		10
6	import { makeManagedServerProvider } from "./makeManagedServerProvider.ts";	11	import { makeManagedServerProvider } from "./makeManagedServerProvider.ts";
7		12
...	@@ -108,7 +113,7 @@ describe("makeManagedServerProvider", () => {	...	@@ -108,7 +113,7 @@ describe("makeManagedServerProvider", () => {
108	getSettings: Effect.succeed({ enabled: true }),	113	getSettings: Effect.succeed({ enabled: true }),
109	streamSettings: Stream.empty,	114	streamSettings: Stream.empty,
110	haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,	115	haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
111	initialSnapshot: () => initialSnapshot,	116	initialSnapshot: () => Effect.succeed(initialSnapshot),
112	checkProvider: Ref.update(checkCalls, (count) => count + 1).pipe(	117	checkProvider: Ref.update(checkCalls, (count) => count + 1).pipe(
113	Effect.flatMap(() => Deferred.await(releaseCheck)),	118	Effect.flatMap(() => Deferred.await(releaseCheck)),
114	Effect.as(refreshedSnapshot),	119	Effect.as(refreshedSnapshot),
...	@@ -150,7 +155,7 @@ describe("makeManagedServerProvider", () => {	...	@@ -150,7 +155,7 @@ describe("makeManagedServerProvider", () => {
150	getSettings: Ref.get(settingsRef),	155	getSettings: Ref.get(settingsRef),
151	streamSettings: Stream.fromPubSub(settingsChanges),	156	streamSettings: Stream.fromPubSub(settingsChanges),
152	haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,	157	haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
153	initialSnapshot: () => initialSnapshot,	158	initialSnapshot: () => Effect.succeed(initialSnapshot),
154	checkProvider: Ref.updateAndGet(checkCalls, (count) => count + 1).pipe(	159	checkProvider: Ref.updateAndGet(checkCalls, (count) => count + 1).pipe(
155	Effect.flatMap((count) =>	160	Effect.flatMap((count) =>
156	count === 1	161	count === 1
...	@@ -192,7 +197,7 @@ describe("makeManagedServerProvider", () => {	...	@@ -192,7 +197,7 @@ describe("makeManagedServerProvider", () => {
192	getSettings: Effect.succeed({ enabled: true }),	197	getSettings: Effect.succeed({ enabled: true }),
193	streamSettings: Stream.empty,	198	streamSettings: Stream.empty,
194	haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,	199	haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
195	initialSnapshot: () => initialSnapshot,	200	initialSnapshot: () => Effect.succeed(initialSnapshot),
196	checkProvider: Deferred.await(releaseCheck).pipe(Effect.as(refreshedSnapshot)),	201	checkProvider: Deferred.await(releaseCheck).pipe(Effect.as(refreshedSnapshot)),
197	enrichSnapshot: ({ publishSnapshot }) =>	202	enrichSnapshot: ({ publishSnapshot }) =>
198	Deferred.await(releaseEnrichment).pipe(	203	Deferred.await(releaseEnrichment).pipe(
...	@@ -233,7 +238,7 @@ describe("makeManagedServerProvider", () => {	...	@@ -233,7 +238,7 @@ describe("makeManagedServerProvider", () => {
233	getSettings: Effect.succeed({ enabled: true }),	238	getSettings: Effect.succeed({ enabled: true }),
234	streamSettings: Stream.empty,	239	streamSettings: Stream.empty,
235	haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,	240	haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
236	initialSnapshot: () => initialSnapshot,	241	initialSnapshot: () => Effect.succeed(initialSnapshot),
237	checkProvider: Ref.updateAndGet(refreshCount, (count) => count + 1).pipe(	242	checkProvider: Ref.updateAndGet(refreshCount, (count) => count + 1).pipe(
238	Effect.flatMap((count) =>	243	Effect.flatMap((count) =>
239	count === 1	244	count === 1

apps/server/src/provider/makeManagedServerProvider.ts+10-3

...	@@ -1,5 +1,12 @@	...	@@ -1,5 +1,12 @@
1	import type { ServerProvider } from "@t3tools/contracts";	1	import type { ServerProvider } from "@t3tools/contracts";
2	import { Duration, Effect, Equal, Fiber, PubSub, Ref, Scope, Stream } from "effect";	2	import * as Duration from "effect/Duration";
		3	import * as Effect from "effect/Effect";
		4	import * as Equal from "effect/Equal";
		5	import * as Fiber from "effect/Fiber";
		6	import * as PubSub from "effect/PubSub";
		7	import * as Ref from "effect/Ref";
		8	import * as Scope from "effect/Scope";
		9	import * as Stream from "effect/Stream";
3	import * as Semaphore from "effect/Semaphore";	10	import * as Semaphore from "effect/Semaphore";
4		11
5	import type { ServerProviderShape } from "./Services/ServerProvider.ts";	12	import type { ServerProviderShape } from "./Services/ServerProvider.ts";
...	@@ -17,7 +24,7 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(	...	@@ -17,7 +24,7 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(
17	readonly getSettings: Effect.Effect<Settings>;	24	readonly getSettings: Effect.Effect<Settings>;
18	readonly streamSettings: Stream.Stream<Settings>;	25	readonly streamSettings: Stream.Stream<Settings>;
19	readonly haveSettingsChanged: (previous: Settings, next: Settings) => boolean;	26	readonly haveSettingsChanged: (previous: Settings, next: Settings) => boolean;
20	readonly initialSnapshot: (settings: Settings) => ServerProvider;	27	readonly initialSnapshot: (settings: Settings) => Effect.Effect<ServerProvider>;
21	readonly checkProvider: Effect.Effect<ServerProvider, ServerSettingsError>;	28	readonly checkProvider: Effect.Effect<ServerProvider, ServerSettingsError>;
22	readonly enrichSnapshot?: (input: {	29	readonly enrichSnapshot?: (input: {
23	readonly settings: Settings;	30	readonly settings: Settings;
...	@@ -33,7 +40,7 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(	...	@@ -33,7 +40,7 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(
33	PubSub.shutdown,	40	PubSub.shutdown,
34	);	41	);
35	const initialSettings = yield* input.getSettings;	42	const initialSettings = yield* input.getSettings;
36	const initialSnapshot = input.initialSnapshot(initialSettings);	43	const initialSnapshot = yield* input.initialSnapshot(initialSettings);
37	const snapshotStateRef = yield* Ref.make<ProviderSnapshotState>({	44	const snapshotStateRef = yield* Ref.make<ProviderSnapshotState>({
38	snapshot: initialSnapshot,	45	snapshot: initialSnapshot,
39	enrichmentGeneration: 0,	46	enrichmentGeneration: 0,

apps/server/src/provider/opencodeRuntime.ts+19-20

 @@ -11,27 +11,26 @@ import {
   type QuestionAnswer,
   type QuestionRequest,
 } from "@opencode-ai/sdk/v2";
-import {
+import * as Cause from "effect/Cause";
-  Cause,
+import * as Context from "effect/Context";
-  Context,
+import * as Data from "effect/Data";
-  Data,
+import * as Deferred from "effect/Deferred";
-  Deferred,
+import * as Effect from "effect/Effect";
-  Effect,
+import * as Exit from "effect/Exit";
-  Exit,
+import * as Fiber from "effect/Fiber";
-  Fiber,
+import * as Layer from "effect/Layer";
-  Layer,
+import * as Option from "effect/Option";
-  Option,
+import * as P from "effect/Predicate";
-  Predicate as P,
+import * as Ref from "effect/Ref";
-  Ref,
+import * as Result from "effect/Result";
-  Result,
+import * as Scope from "effect/Scope";
-  Scope,
+import * as Schema from "effect/Schema";
-  Stream,
+import * as Stream from "effect/Stream";
-} from "effect";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 import { isWindowsCommandNotFound } from "../processRunner.ts";
 import { collectStreamAsString } from "./providerSnapshot.ts";
-import { NetService } from "@t3tools/shared/Net";
+import * as NetService from "@t3tools/shared/Net";
 const OPENCODE_SERVER_READY_PREFIX = "opencode server listening";
 const DEFAULT_OPENCODE_SERVER_TIMEOUT_MS = 5_000;
 @@ -66,7 +65,7 @@ export function openCodeRuntimeErrorDetail(cause: unknown): string {
     const status = (anyCause.response as { status?: number } | undefined)?.status;
     const body = anyCause.error ?? anyCause.data ?? anyCause.body;
     try {
-      return `status=${status ?? "?"} body=${JSON.stringify(body ?? cause)}`;
+      return `status=${status ?? "?"} body=${Schema.encodeUnknownSync(Schema.UnknownFromJsonString)(body ?? cause)}`;
     } catch {
       /* fall through */
     }
 @@ -270,7 +269,7 @@ function ensureRuntimeError(
 const makeOpenCodeRuntime = Effect.gen(function* () {
   const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-  const netService = yield* NetService;
+  const netService = yield* NetService.NetService;
   const runOpenCodeCommand: OpenCodeRuntimeShape["runOpenCodeCommand"] = (input) =>
     Effect.gen(function* () {
 @@ -337,7 +336,7 @@ const makeOpenCodeRuntime = Effect.gen(function* () {
             shell: process.platform === "win32",
             env: {
               ...(input.environment ?? process.env),
-              OPENCODE_CONFIG_CONTENT: JSON.stringify({}),
+              OPENCODE_CONFIG_CONTENT: Schema.encodeUnknownSync(Schema.UnknownFromJsonString)({}),
             },
           }),
         )

apps/server/src/provider/providerMaintenance.test.ts+3-1

 @@ -1,10 +1,12 @@
+// @effect-diagnostics nodeBuiltinImport:off
 import { afterEach, describe, expect, it } from "@effect/vitest";
 import { chmodSync, mkdirSync, symlinkSync, writeFileSync } from "node:fs";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import os from "node:os";
 import path from "node:path";
 import { ProviderDriverKind } from "@t3tools/contracts";
-import { Effect, Random } from "effect";
+import * as Effect from "effect/Effect";
+import * as Random from "effect/Random";
 import {
   clearLatestProviderVersionCacheForTests,
   createProviderVersionAdvisory,

apps/server/src/provider/providerMaintenance.ts+5-1

 @@ -4,7 +4,11 @@ import {
   type ServerProviderVersionAdvisory,
 } from "@t3tools/contracts";
 import { resolveCommandPath } from "@t3tools/shared/shell";
-import { DateTime, Effect, FileSystem, Option, Schema } from "effect";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
 import { HttpClient, HttpClientRequest } from "effect/unstable/http";
 import { compareCliVersions } from "./cliVersion.ts";

apps/server/src/provider/providerMaintenanceCommandCoordinator.ts+2-1

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	import { Effect, Ref } from "effect";	1	import * as Effect from "effect/Effect";
		2	import * as Ref from "effect/Ref";
2	import * as Semaphore from "effect/Semaphore";	3	import * as Semaphore from "effect/Semaphore";
3		4
4	export interface ProviderMaintenanceCommandCoordinatorShape<E> {	5	export interface ProviderMaintenanceCommandCoordinatorShape<E> {

apps/server/src/provider/providerMaintenanceRunner.test.ts+9-1

...	@@ -6,7 +6,15 @@ import {	...	@@ -6,7 +6,15 @@ import {
6	type ServerProviderUpdateState,	6	type ServerProviderUpdateState,
7	} from "@t3tools/contracts";	7	} from "@t3tools/contracts";
8	import { ServerProviderUpdateError } from "@t3tools/contracts";	8	import { ServerProviderUpdateError } from "@t3tools/contracts";
9	import { Cause, Effect, Exit, Fiber, Layer, Ref, Schema, Sink, Stream } from "effect";	9	import * as Cause from "effect/Cause";
		10	import * as Effect from "effect/Effect";
		11	import * as Exit from "effect/Exit";
		12	import * as Fiber from "effect/Fiber";
		13	import * as Layer from "effect/Layer";
		14	import * as Ref from "effect/Ref";
		15	import * as Schema from "effect/Schema";
		16	import * as Sink from "effect/Sink";
		17	import * as Stream from "effect/Stream";
10	import { HttpClient, HttpClientResponse } from "effect/unstable/http";	18	import { HttpClient, HttpClientResponse } from "effect/unstable/http";
11	import { ChildProcessSpawner } from "effect/unstable/process";	19	import { ChildProcessSpawner } from "effect/unstable/process";
12		20

apps/server/src/provider/providerMaintenanceRunner.ts+23-3

 @@ -7,7 +7,16 @@ import {
   type ServerProviderUpdatedPayload,
   type ServerProviderUpdateState,
 } from "@t3tools/contracts";
-import { Cause, Context, DateTime, Duration, Effect, Layer, Option, Ref, Schema } from "effect";
+import * as Cause from "effect/Cause";
+import * as Context from "effect/Context";
+import * as Data from "effect/Data";
+import * as DateTime from "effect/DateTime";
+import * as Duration from "effect/Duration";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Ref from "effect/Ref";
+import * as Schema from "effect/Schema";
 import { HttpClient } from "effect/unstable/http";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 @@ -45,6 +54,11 @@ export class ProviderMaintenanceRunner extends Context.Service<
   ProviderMaintenanceRunnerShape
 >()("t3/provider/ProviderMaintenanceRunner") {}
+class ProviderMaintenanceCommandError extends Data.TaggedError("ProviderMaintenanceCommandError")<{
+  readonly message: string;
+  readonly cause?: unknown;
+}> {}
 interface VerifiedProviderRefresh {
   readonly providers: ReadonlyArray<ServerProvider>;
   readonly verifiedProviders: ReadonlyArray<ServerProvider>;
 @@ -65,7 +79,10 @@ const runProviderMaintenanceCommandWithSpawner = Effect.fn("ProviderMaintenanceR
           .pipe(
             Effect.mapError(
               (cause) =>
-                new Error(`Failed to run update command ${input.command}: ${cause.message}`),
+                new ProviderMaintenanceCommandError({
+                  message: `Failed to run update command ${input.command}: ${cause.message}`,
+                  cause,
+                }),
             ),
           );
         yield* Effect.addFinalizer(() => child.kill().pipe(Effect.ignore));
 @@ -86,7 +103,10 @@ const runProviderMaintenanceCommandWithSpawner = Effect.fn("ProviderMaintenanceR
         ).pipe(
           Effect.mapError(
             (cause) =>
-              new Error(cause instanceof Error ? cause.message : "Update command failed to run."),
+              new ProviderMaintenanceCommandError({
+                message: cause instanceof Error ? cause.message : "Update command failed to run.",
+                cause,
+              }),
           ),
         );

apps/server/src/provider/providerSnapshot.ts+11-3

...	@@ -8,7 +8,9 @@ import type {	...	@@ -8,7 +8,9 @@ import type {
8	ServerProviderModel,	8	ServerProviderModel,
9	ServerProviderState,	9	ServerProviderState,
10	} from "@t3tools/contracts";	10	} from "@t3tools/contracts";
11	import { Effect, Stream } from "effect";	11	import * as Effect from "effect/Effect";
		12	import * as Data from "effect/Data";
		13	import * as Stream from "effect/Stream";
12	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";	14	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
13	import { normalizeModelSlug } from "@t3tools/shared/model";	15	import { normalizeModelSlug } from "@t3tools/shared/model";
14	import { isWindowsCommandNotFound } from "../processRunner.ts";	16	import { isWindowsCommandNotFound } from "../processRunner.ts";
...	@@ -25,6 +27,12 @@ export interface CommandResult {	...	@@ -25,6 +27,12 @@ export interface CommandResult {
25	readonly code: number;	27	readonly code: number;
26	}	28	}
27		29
		30	export class ProviderCommandExecutionError extends Data.TaggedError(
		31	"ProviderCommandExecutionError",
		32	)<{
		33	readonly message: string;
		34	}> {}
		35
28	export interface ProviderProbeResult {	36	export interface ProviderProbeResult {
29	readonly installed: boolean;	37	readonly installed: boolean;
30	readonly version: string \| null;	38	readonly version: string \| null;
...	@@ -47,7 +55,7 @@ export function nonEmptyTrimmed(value: string \| undefined): string \| undefined {	...	@@ -47,7 +55,7 @@ export function nonEmptyTrimmed(value: string \| undefined): string \| undefined {
47	return trimmed.length > 0 ? trimmed : undefined;	55	return trimmed.length > 0 ? trimmed : undefined;
48	}	56	}
49		57
50	export function isCommandMissingCause(error: Error): boolean {	58	export function isCommandMissingCause(error: { readonly message: string }): boolean {
51	const lower = error.message.toLowerCase();	59	const lower = error.message.toLowerCase();
52	return lower.includes("enoent") \|\| lower.includes("notfound");	60	return lower.includes("enoent") \|\| lower.includes("notfound");
53	}	61	}
...	@@ -67,7 +75,7 @@ export const spawnAndCollect = (binaryPath: string, command: ChildProcess.Comman	...	@@ -67,7 +75,7 @@ export const spawnAndCollect = (binaryPath: string, command: ChildProcess.Comman
67		75
68	const result: CommandResult = { stdout, stderr, code: exitCode };	76	const result: CommandResult = { stdout, stderr, code: exitCode };
69	if (isWindowsCommandNotFound(exitCode, stderr)) {	77	if (isWindowsCommandNotFound(exitCode, stderr)) {
70	return yield* Effect.fail(new Error(`spawn ${binaryPath} ENOENT`));	78	return yield* new ProviderCommandExecutionError({ message: `spawn ${binaryPath} ENOENT` });
71	}	79	}
72	return result;	80	return result;
73	}).pipe(Effect.scoped);	81	}).pipe(Effect.scoped);

apps/server/src/provider/providerStatusCache.test.ts+2-1

...	@@ -7,7 +7,8 @@ import {	...	@@ -7,7 +7,8 @@ import {
7	} from "@t3tools/contracts";	7	} from "@t3tools/contracts";
8	import { createModelCapabilities } from "@t3tools/shared/model";	8	import { createModelCapabilities } from "@t3tools/shared/model";
9	import { assert, it } from "@effect/vitest";	9	import { assert, it } from "@effect/vitest";
10	import { Effect, FileSystem } from "effect";	10	import * as Effect from "effect/Effect";
		11	import * as FileSystem from "effect/FileSystem";
11		12
12	import {	13	import {
13	hydrateCachedProvider,	14	hydrateCachedProvider,

apps/server/src/provider/providerStatusCache.ts+5-1

 @@ -4,7 +4,11 @@ import {
   type ServerProvider,
   ServerProvider as ServerProviderSchema,
 } from "@t3tools/contracts";
-import { Cause, Effect, FileSystem, Path, Schema } from "effect";
+import * as Cause from "effect/Cause";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
 import { writeFileStringAtomically } from "../atomicWrite.ts";

apps/server/src/provider/testUtils/providerAdapterRegistryMock.ts+5-1

 @@ -18,7 +18,11 @@ import {
   ProviderDriverKind,
   type ProviderInstanceId,
 } from "@t3tools/contracts";
-import { Effect, PubSub, Record, Result, Stream } from "effect";
+import * as Effect from "effect/Effect";
+import * as PubSub from "effect/PubSub";
+import * as Record from "effect/Record";
+import * as Result from "effect/Result";
+import * as Stream from "effect/Stream";
 import { ProviderUnsupportedError, type ProviderAdapterError } from "../Errors.ts";
 import type { ProviderAdapterShape } from "../Services/ProviderAdapter.ts";

apps/server/src/provider/unavailableProviderSnapshot.ts+36-29

...	@@ -15,6 +15,8 @@ import {	...	@@ -15,6 +15,8 @@ import {
15	type ProviderInstanceId,	15	type ProviderInstanceId,
16	type ServerProvider,	16	type ServerProvider,
17	} from "@t3tools/contracts";	17	} from "@t3tools/contracts";
		18	import * as DateTime from "effect/DateTime";
		19	import * as Effect from "effect/Effect";
18		20
19	import { buildServerProvider } from "./providerSnapshot.ts";	21	import { buildServerProvider } from "./providerSnapshot.ts";
20		22
...	@@ -25,12 +27,15 @@ export interface UnavailableProviderSnapshotInput {	...	@@ -25,12 +27,15 @@ export interface UnavailableProviderSnapshotInput {
25	readonly accentColor?: string \| undefined;	27	readonly accentColor?: string \| undefined;
26	readonly reason: string;	28	readonly reason: string;
27	/**	29	/**
28	* Optional override for `checkedAt`. Defaulted to `new Date()` so callers	30	* Optional override for `checkedAt`. Defaulted to the current Effect
		31	* `DateTime` so callers
29	* (notably tests) don't have to pass it.	32	* (notably tests) don't have to pass it.
30	*/	33	*/
31	readonly checkedAt?: string;	34	readonly checkedAt?: string;
32	}	35	}
33		36
		37	const nowIso = Effect.map(DateTime.now, DateTime.formatIso);
		38
34	/**	39	/**
35	* Produce a `ServerProvider` snapshot representing a configured instance	40	* Produce a `ServerProvider` snapshot representing a configured instance
36	* whose driver the running build does not implement. The result is safe	41	* whose driver the running build does not implement. The result is safe
...	@@ -39,34 +44,36 @@ export interface UnavailableProviderSnapshotInput {	...	@@ -39,34 +44,36 @@ export interface UnavailableProviderSnapshotInput {
39	*/	44	*/
40	export function buildUnavailableProviderSnapshot(	45	export function buildUnavailableProviderSnapshot(
41	input: UnavailableProviderSnapshotInput,	46	input: UnavailableProviderSnapshotInput,
42	): ServerProvider {	47	): Effect.Effect<ServerProvider> {
43	const checkedAt = input.checkedAt ?? new Date().toISOString();	48	return Effect.gen(function* () {
44	const displayName = input.displayName?.trim() \|\| (input.driverKind as string);	49	const checkedAt = input.checkedAt ?? (yield* nowIso);
		50	const displayName = input.displayName?.trim() \|\| (input.driverKind as string);
45		51
46	const base = buildServerProvider({	52	const base = buildServerProvider({
47	presentation: { displayName },	53	presentation: { displayName },
48	enabled: false,	54	enabled: false,
49	checkedAt,	55	checkedAt,
50	models: [],	56	models: [],
51	skills: [],	57	skills: [],
52	probe: {	58	probe: {
53	installed: false,	59	installed: false,
54	version: null,	60	version: null,
55	status: "error",	61	status: "error",
56	auth: { status: "unknown" },	62	auth: { status: "unknown" },
57	message: input.reason,	63	message: input.reason,
58	},	64	},
59	});	65	});
60		66
61	return {	67	return {
62	...base,	68	...base,
63	instanceId: input.instanceId,	69	instanceId: input.instanceId,
64	...(input.accentColor ? { accentColor: input.accentColor } : {}),	70	...(input.accentColor ? { accentColor: input.accentColor } : {}),
65	driver:	71	driver:
66	typeof input.driverKind === "string"	72	typeof input.driverKind === "string"
67	? ProviderDriverKind.make(input.driverKind)	73	? ProviderDriverKind.make(input.driverKind)
68	: input.driverKind,	74	: input.driverKind,
69	availability: "unavailable",	75	availability: "unavailable",
70	unavailableReason: input.reason,	76	unavailableReason: input.reason,
71	};	77	};
		78	});
72	}	79	}

apps/server/src/server.test.ts+59-51

...	@@ -27,18 +27,17 @@ import {	...	@@ -27,18 +27,17 @@ import {
27	} from "@t3tools/contracts";	27	} from "@t3tools/contracts";
28	import { assert, it } from "@effect/vitest";	28	import { assert, it } from "@effect/vitest";
29	import { assertFailure, assertInclude, assertTrue } from "@effect/vitest/utils";	29	import { assertFailure, assertInclude, assertTrue } from "@effect/vitest/utils";
30	import {	30	import * as Clock from "effect/Clock";
31	Deferred,	31	import * as Deferred from "effect/Deferred";
32	DateTime,	32	import * as DateTime from "effect/DateTime";
33	Duration,	33	import * as Duration from "effect/Duration";
34	Effect,	34	import * as Effect from "effect/Effect";
35	FileSystem,	35	import * as FileSystem from "effect/FileSystem";
36	Layer,	36	import * as Layer from "effect/Layer";
37	ManagedRuntime,	37	import * as ManagedRuntime from "effect/ManagedRuntime";
38	Option,	38	import * as Option from "effect/Option";
39	Path,	39	import * as Path from "effect/Path";
40	Stream,	40	import * as Stream from "effect/Stream";
41	} from "effect";
42	import { ChildProcessSpawner } from "effect/unstable/process";	41	import { ChildProcessSpawner } from "effect/unstable/process";
43	import {	42	import {
44	FetchHttpClient,	43	FetchHttpClient,
...	@@ -92,6 +91,7 @@ import {	...	@@ -92,6 +91,7 @@ import {
92	import { ProjectFaviconResolverLive } from "./project/Layers/ProjectFaviconResolver.ts";	91	import { ProjectFaviconResolverLive } from "./project/Layers/ProjectFaviconResolver.ts";
93	import {	92	import {
94	ProjectSetupScriptRunner,	93	ProjectSetupScriptRunner,
		94	ProjectSetupScriptRunnerError,
95	type ProjectSetupScriptRunnerShape,	95	type ProjectSetupScriptRunnerShape,
96	} from "./project/Services/ProjectSetupScriptRunner.ts";	96	} from "./project/Services/ProjectSetupScriptRunner.ts";
97	import {	97	import {
...	@@ -116,6 +116,7 @@ import { ServerSecretStoreLive } from "./auth/Layers/ServerSecretStore.ts";	...	@@ -116,6 +116,7 @@ import { ServerSecretStoreLive } from "./auth/Layers/ServerSecretStore.ts";
116	import { ServerAuthLive } from "./auth/Layers/ServerAuth.ts";	116	import { ServerAuthLive } from "./auth/Layers/ServerAuth.ts";
117	import * as ProcessDiagnostics from "./diagnostics/ProcessDiagnostics.ts";	117	import * as ProcessDiagnostics from "./diagnostics/ProcessDiagnostics.ts";
118	import * as TraceDiagnostics from "./diagnostics/TraceDiagnostics.ts";	118	import * as TraceDiagnostics from "./diagnostics/TraceDiagnostics.ts";
		119	import * as Data from "effect/Data";
119		120
120	const defaultProjectId = ProjectId.make("project-default");	121	const defaultProjectId = ProjectId.make("project-default");
121	const defaultThreadId = ThreadId.make("thread-default");	122	const defaultThreadId = ThreadId.make("thread-default");
...	@@ -137,7 +138,7 @@ const testEnvironmentDescriptor = {	...	@@ -137,7 +138,7 @@ const testEnvironmentDescriptor = {
137	},	138	},
138	};	139	};
139	const makeDefaultOrchestrationReadModel = () => {	140	const makeDefaultOrchestrationReadModel = () => {
140	const now = new Date().toISOString();	141	const now = "2026-01-01T00:00:00.000Z";
141	return {	142	return {
142	snapshotSequence: 0,	143	snapshotSequence: 0,
143	updatedAt: now,	144	updatedAt: now,
...	@@ -181,7 +182,7 @@ const makeDefaultOrchestrationReadModel = () => {	...	@@ -181,7 +182,7 @@ const makeDefaultOrchestrationReadModel = () => {
181	const makeDefaultOrchestrationThreadShell = (	182	const makeDefaultOrchestrationThreadShell = (
182	overrides: Partial<OrchestrationThreadShell> = {},	183	overrides: Partial<OrchestrationThreadShell> = {},
183	): OrchestrationThreadShell => {	184	): OrchestrationThreadShell => {
184	const now = new Date().toISOString();	185	const now = "2026-01-01T00:00:00.000Z";
185	return {	186	return {
186	id: defaultThreadId,	187	id: defaultThreadId,
187	projectId: defaultProjectId,	188	projectId: defaultProjectId,
...	@@ -302,15 +303,13 @@ const makeBrowserOtlpPayload = (spanName: string) =>	...	@@ -302,15 +303,13 @@ const makeBrowserOtlpPayload = (spanName: string) =>
302	yield* Effect.promise(() => runtime.dispose());	303	yield* Effect.promise(() => runtime.dispose());
303	}	304	}
304		305
305	const request = yield* Effect.promise(() =>	306	const request = yield* Effect.raceFirst(
306	Promise.race([	307	Effect.promise(() => collector.firstRequest).pipe(Effect.orDie),
307	collector.firstRequest,	308	Effect.sleep(Duration.seconds(1)).pipe(
308	new Promise<never>((_, reject) => {	309	Effect.andThen(Effect.die(new Error("Timed out waiting for OTLP trace export"))),
309	setTimeout(() => reject(new Error("Timed out waiting for OTLP trace export")), 1_000);	310	),
310	}),
311	]),
312	);	311	);
313		312	// @effect-diagnostics-next-line preferSchemaOverJson:off
314	return JSON.parse(request.body) as OtlpTracer.TraceData;	313	return JSON.parse(request.body) as OtlpTracer.TraceData;
315	});	314	});
316		315
...	@@ -629,7 +628,7 @@ const buildAppUnderTest = (options?: {	...	@@ -629,7 +628,7 @@ const buildAppUnderTest = (options?: {
629	snapshotSequence: 0,	628	snapshotSequence: 0,
630	projects: [],	629	projects: [],
631	threads: [],	630	threads: [],
632	updatedAt: new Date(0).toISOString(),	631	updatedAt: "1970-01-01T00:00:00.000Z",
633	}),	632	}),
634	getSnapshotSequence: () => Effect.succeed({ snapshotSequence: 0 }),	633	getSnapshotSequence: () => Effect.succeed({ snapshotSequence: 0 }),
635	getProjectShellById: () => Effect.succeed(Option.none()),	634	getProjectShellById: () => Effect.succeed(Option.none()),
...	@@ -823,17 +822,23 @@ const bootstrapBearerSession = (credential = defaultDesktopBootstrapToken) =>	...	@@ -823,17 +822,23 @@ const bootstrapBearerSession = (credential = defaultDesktopBootstrapToken) =>
823	};	822	};
824	});	823	});
825		824
		825	class AuthenticationGetterError extends Data.TaggedError("AuthenticationGetterError")<{
		826	readonly message: string;
		827	}> {}
		828
826	const getAuthenticatedSessionCookieHeader = (credential = defaultDesktopBootstrapToken) =>	829	const getAuthenticatedSessionCookieHeader = (credential = defaultDesktopBootstrapToken) =>
827	Effect.gen(function* () {	830	Effect.gen(function* () {
828	const { response, cookie } = yield* bootstrapBrowserSession(credential);	831	const { response, cookie } = yield* bootstrapBrowserSession(credential);
829	if (!response.ok) {	832	if (!response.ok) {
830	return yield* Effect.fail(	833	return yield* new AuthenticationGetterError({
831	new Error(`Expected bootstrap session response to succeed, got ${response.status}`),	834	message: `Expected bootstrap session response to succeed, got ${response.status}`,
832	);	835	});
833	}	836	}
834		837
835	if (!cookie) {	838	if (!cookie) {
836	return yield* Effect.fail(new Error("Expected bootstrap session response to set a cookie."));	839	return yield* new AuthenticationGetterError({
		840	message: "Expected bootstrap session response to set a cookie.",
		841	});
837	}	842	}
838		843
839	return cookie.split(";")[0] ?? cookie;	844	return cookie.split(";")[0] ?? cookie;
...	@@ -843,15 +848,15 @@ const getAuthenticatedBearerSessionToken = (credential = defaultDesktopBootstrap	...	@@ -843,15 +848,15 @@ const getAuthenticatedBearerSessionToken = (credential = defaultDesktopBootstrap
843	Effect.gen(function* () {	848	Effect.gen(function* () {
844	const { response, body } = yield* bootstrapBearerSession(credential);	849	const { response, body } = yield* bootstrapBearerSession(credential);
845	if (!response.ok) {	850	if (!response.ok) {
846	return yield* Effect.fail(	851	return yield* new AuthenticationGetterError({
847	new Error(`Expected bearer bootstrap response to succeed, got ${response.status}`),	852	message: `Expected bearer bootstrap response to succeed, got ${response.status}`,
848	);	853	});
849	}	854	}
850		855
851	if (!body.sessionToken) {	856	if (!body.sessionToken) {
852	return yield* Effect.fail(	857	return yield* new AuthenticationGetterError({
853	new Error("Expected bearer bootstrap response to include a session token."),	858	message: "Expected bearer bootstrap response to include a session token.",
854	);	859	});
855	}	860	}
856		861
857	return body.sessionToken;	862	return body.sessionToken;
...	@@ -1758,6 +1763,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -1758,6 +1763,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
1758	"content-type": "application/json",	1763	"content-type": "application/json",
1759	origin: "http://localhost:5733",	1764	origin: "http://localhost:5733",
1760	},	1765	},
		1766	// @effect-diagnostics-next-line preferSchemaOverJson:off
1761	body: HttpBody.text(JSON.stringify(payload), "application/json"),	1767	body: HttpBody.text(JSON.stringify(payload), "application/json"),
1762	});	1768	});
1763		1769
...	@@ -1803,6 +1809,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -1803,6 +1809,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
1803	]);	1809	]);
1804	assert.deepEqual(upstreamRequests, [	1810	assert.deepEqual(upstreamRequests, [
1805	{	1811	{
		1812	// @effect-diagnostics-next-line preferSchemaOverJson:off
1806	body: JSON.stringify(payload),	1813	body: JSON.stringify(payload),
1807	contentType: "application/json",	1814	contentType: "application/json",
1808	},	1815	},
...	@@ -1875,6 +1882,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -1875,6 +1882,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
1875	cookie: yield* getAuthenticatedSessionCookieHeader(),	1882	cookie: yield* getAuthenticatedSessionCookieHeader(),
1876	"content-type": "application/json",	1883	"content-type": "application/json",
1877	},	1884	},
		1885	// @effect-diagnostics-next-line preferSchemaOverJson:off
1878	body: HttpBody.text(JSON.stringify(payload), "application/json"),	1886	body: HttpBody.text(JSON.stringify(payload), "application/json"),
1879	});	1887	});
1880		1888
...	@@ -2182,7 +2190,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -2182,7 +2190,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
2182	version: 1 as const,	2190	version: 1 as const,
2183	sequence: 2,	2191	sequence: 2,
2184	type: "ready" as const,	2192	type: "ready" as const,
2185	payload: { at: new Date().toISOString(), environment: testEnvironmentDescriptor },	2193	payload: { at: "2026-01-01T00:00:00.000Z", environment: testEnvironmentDescriptor },
2186	});	2194	});
2187		2195
2188	yield* buildAppUnderTest({	2196	yield* buildAppUnderTest({
...	@@ -2370,7 +2378,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -2370,7 +2378,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
2370	instanceId: ProviderInstanceId.make("codex"),	2378	instanceId: ProviderInstanceId.make("codex"),
2371	model: "gpt-5-codex",	2379	model: "gpt-5-codex",
2372	},	2380	},
2373	createdAt: new Date().toISOString(),	2381	createdAt: "2026-01-01T00:00:00.000Z",
2374	}),	2382	}),
2375	),	2383	),
2376	);	2384	);
...	@@ -2913,11 +2921,11 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -2913,11 +2921,11 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
2913	});	2921	});
2914		2922
2915	const wsUrl = yield* getWsServerUrl("/ws");	2923	const wsUrl = yield* getWsServerUrl("/ws");
2916	const startedAt = Date.now();	2924	const startedAt = yield* Clock.currentTimeMillis;
2917	const result = yield* Effect.scoped(	2925	const result = yield* Effect.scoped(
2918	withWsRpcClient(wsUrl, (client) => client[WS_METHODS.vcsPull]({ cwd: "/tmp/repo" })),	2926	withWsRpcClient(wsUrl, (client) => client[WS_METHODS.vcsPull]({ cwd: "/tmp/repo" })),
2919	);	2927	);
2920	const elapsedMs = Date.now() - startedAt;	2928	const elapsedMs = (yield* Clock.currentTimeMillis) - startedAt;
2921		2929
2922	assert.equal(result.status, "pulled");	2930	assert.equal(result.status, "pulled");
2923	assertTrue(elapsedMs < 1_000);	2931	assertTrue(elapsedMs < 1_000);
...	@@ -2982,7 +2990,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -2982,7 +2990,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
2982	});	2990	});
2983		2991
2984	const wsUrl = yield* getWsServerUrl("/ws");	2992	const wsUrl = yield* getWsServerUrl("/ws");
2985	const startedAt = Date.now();	2993	const startedAt = yield* Clock.currentTimeMillis;
2986	yield* Effect.scoped(	2994	yield* Effect.scoped(
2987	withWsRpcClient(wsUrl, (client) =>	2995	withWsRpcClient(wsUrl, (client) =>
2988	client[WS_METHODS.gitRunStackedAction]({	2996	client[WS_METHODS.gitRunStackedAction]({
...	@@ -2992,7 +3000,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -2992,7 +3000,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
2992	}).pipe(Stream.runCollect),	3000	}).pipe(Stream.runCollect),
2993	),	3001	),
2994	);	3002	);
2995	const elapsedMs = Date.now() - startedAt;	3003	const elapsedMs = (yield* Clock.currentTimeMillis) - startedAt;
2996		3004
2997	assertTrue(elapsedMs < 1_000);	3005	assertTrue(elapsedMs < 1_000);
2998	}).pipe(Effect.provide(NodeHttpServer.layerTest)),	3006	}).pipe(Effect.provide(NodeHttpServer.layerTest)),
...	@@ -3079,7 +3087,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -3079,7 +3087,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
3079		3087
3080	it.effect("routes websocket rpc orchestration methods", () =>	3088	it.effect("routes websocket rpc orchestration methods", () =>
3081	Effect.gen(function* () {	3089	Effect.gen(function* () {
3082	const now = new Date().toISOString();	3090	const now = "2026-01-01T00:00:00.000Z";
3083	const snapshot = {	3091	const snapshot = {
3084	snapshotSequence: 1,	3092	snapshotSequence: 1,
3085	updatedAt: now,	3093	updatedAt: now,
...	@@ -3292,7 +3300,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -3292,7 +3300,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
3292	const threadId = ThreadId.make("thread-archive");	3300	const threadId = ThreadId.make("thread-archive");
3293	const effects: string[] = [];	3301	const effects: string[] = [];
3294	const dispatchedCommands: Array<OrchestrationCommand> = [];	3302	const dispatchedCommands: Array<OrchestrationCommand> = [];
3295	const now = new Date().toISOString();	3303	const now = "2026-01-01T00:00:00.000Z";
3296		3304
3297	yield* buildAppUnderTest({	3305	yield* buildAppUnderTest({
3298	layers: {	3306	layers: {
...	@@ -3363,7 +3371,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -3363,7 +3371,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
3363	const threadId = ThreadId.make("thread-archive-precheck");	3371	const threadId = ThreadId.make("thread-archive-precheck");
3364	const effects: string[] = [];	3372	const effects: string[] = [];
3365	const dispatchedCommands: Array<OrchestrationCommand> = [];	3373	const dispatchedCommands: Array<OrchestrationCommand> = [];
3366	const now = new Date().toISOString();	3374	const now = "2026-01-01T00:00:00.000Z";
3367	let archived = false;	3375	let archived = false;
3368		3376
3369	yield* buildAppUnderTest({	3377	yield* buildAppUnderTest({
...	@@ -3494,7 +3502,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -3494,7 +3502,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
3494	const threadId = ThreadId.make("thread-archive-stopped-session");	3502	const threadId = ThreadId.make("thread-archive-stopped-session");
3495	const effects: string[] = [];	3503	const effects: string[] = [];
3496	const dispatchedCommands: Array<OrchestrationCommand> = [];	3504	const dispatchedCommands: Array<OrchestrationCommand> = [];
3497	const now = new Date().toISOString();	3505	const now = "2026-01-01T00:00:00.000Z";
3498		3506
3499	yield* buildAppUnderTest({	3507	yield* buildAppUnderTest({
3500	layers: {	3508	layers: {
...	@@ -3560,7 +3568,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -3560,7 +3568,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
3560	const threadId = ThreadId.make("thread-archive-stop-failure");	3568	const threadId = ThreadId.make("thread-archive-stop-failure");
3561	const effects: string[] = [];	3569	const effects: string[] = [];
3562	const dispatchedCommands: Array<OrchestrationCommand> = [];	3570	const dispatchedCommands: Array<OrchestrationCommand> = [];
3563	const now = new Date().toISOString();	3571	const now = "2026-01-01T00:00:00.000Z";
3564		3572
3565	yield* buildAppUnderTest({	3573	yield* buildAppUnderTest({
3566	layers: {	3574	layers: {
...	@@ -3637,7 +3645,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -3637,7 +3645,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
3637	const threadId = ThreadId.make("thread-archive-stop-defect");	3645	const threadId = ThreadId.make("thread-archive-stop-defect");
3638	const effects: string[] = [];	3646	const effects: string[] = [];
3639	const dispatchedCommands: Array<OrchestrationCommand> = [];	3647	const dispatchedCommands: Array<OrchestrationCommand> = [];
3640	const now = new Date().toISOString();	3648	const now = "2026-01-01T00:00:00.000Z";
3641		3649
3642	yield* buildAppUnderTest({	3650	yield* buildAppUnderTest({
3643	layers: {	3651	layers: {
...	@@ -3769,7 +3777,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -3769,7 +3777,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
3769	},	3777	},
3770	});	3778	});
3771		3779
3772	const createdAt = new Date().toISOString();	3780	const createdAt = "2026-01-01T00:00:00.000Z";
3773	const wsUrl = yield* getWsServerUrl("/ws");	3781	const wsUrl = yield* getWsServerUrl("/ws");
3774	const response = yield* Effect.scoped(	3782	const response = yield* Effect.scoped(
3775	withWsRpcClient(wsUrl, (client) =>	3783	withWsRpcClient(wsUrl, (client) =>
...	@@ -3864,7 +3872,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -3864,7 +3872,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
3864	);	3872	);
3865	const runForThread = vi.fn(	3873	const runForThread = vi.fn(
3866	(_: Parameters<ProjectSetupScriptRunnerShape["runForThread"]>[0]) =>	3874	(_: Parameters<ProjectSetupScriptRunnerShape["runForThread"]>[0]) =>
3867	Effect.fail(new Error("pty unavailable")),	3875	Effect.fail(new ProjectSetupScriptRunnerError({ message: "pty unavailable" })),
3868	);	3876	);
3869		3877
3870	yield* buildAppUnderTest({	3878	yield* buildAppUnderTest({
...	@@ -3886,7 +3894,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -3886,7 +3894,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
3886	},	3894	},
3887	});	3895	});
3888		3896
3889	const createdAt = new Date().toISOString();	3897	const createdAt = "2026-01-01T00:00:00.000Z";
3890	const wsUrl = yield* getWsServerUrl("/ws");	3898	const wsUrl = yield* getWsServerUrl("/ws");
3891	const response = yield* Effect.scoped(	3899	const response = yield* Effect.scoped(
3892	withWsRpcClient(wsUrl, (client) =>	3900	withWsRpcClient(wsUrl, (client) =>
...	@@ -4003,7 +4011,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -4003,7 +4011,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
4003	},	4011	},
4004	});	4012	});
4005		4013
4006	const createdAt = new Date().toISOString();	4014	const createdAt = "2026-01-01T00:00:00.000Z";
4007	const wsUrl = yield* getWsServerUrl("/ws");	4015	const wsUrl = yield* getWsServerUrl("/ws");
4008	const response = yield* Effect.scoped(	4016	const response = yield* Effect.scoped(
4009	withWsRpcClient(wsUrl, (client) =>	4017	withWsRpcClient(wsUrl, (client) =>
...	@@ -4087,7 +4095,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -4087,7 +4095,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
4087	},	4095	},
4088	});	4096	});
4089		4097
4090	const createdAt = new Date().toISOString();	4098	const createdAt = "2026-01-01T00:00:00.000Z";
4091	const wsUrl = yield* getWsServerUrl("/ws");	4099	const wsUrl = yield* getWsServerUrl("/ws");
4092	const result = yield* Effect.scoped(	4100	const result = yield* Effect.scoped(
4093	withWsRpcClient(wsUrl, (client) =>	4101	withWsRpcClient(wsUrl, (client) =>
...	@@ -4149,7 +4157,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -4149,7 +4157,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
4149	history: "",	4157	history: "",
4150	exitCode: null,	4158	exitCode: null,
4151	exitSignal: null,	4159	exitSignal: null,
4152	updatedAt: new Date().toISOString(),	4160	updatedAt: "2026-01-01T00:00:00.000Z",
4153	};	4161	};
4154		4162
4155	yield* buildAppUnderTest({	4163	yield* buildAppUnderTest({

apps/server/src/server.ts+5-8

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	import { Effect, Layer } from "effect";	1	import * as Effect from "effect/Effect";
		2	import * as Layer from "effect/Layer";
2	import { FetchHttpClient, HttpRouter, HttpServer } from "effect/unstable/http";	3	import { FetchHttpClient, HttpRouter, HttpServer } from "effect/unstable/http";
3		4
4	import { ServerConfig } from "./config.ts";	5	import { ServerConfig } from "./config.ts";
...	@@ -86,7 +87,7 @@ import {	...	@@ -86,7 +87,7 @@ import {
86	orchestrationDispatchRouteLayer,	87	orchestrationDispatchRouteLayer,
87	orchestrationSnapshotRouteLayer,	88	orchestrationSnapshotRouteLayer,
88	} from "./orchestration/http.ts";	89	} from "./orchestration/http.ts";
89	import { NetService } from "@t3tools/shared/Net";	90	import * as NetService from "@t3tools/shared/Net";
90	import { disableTailscaleServe, ensureTailscaleServe } from "@t3tools/tailscale";	91	import { disableTailscaleServe, ensureTailscaleServe } from "@t3tools/tailscale";
91		92
92	const PtyAdapterLive = Layer.unwrap(	93	const PtyAdapterLive = Layer.unwrap(
...	@@ -333,7 +334,7 @@ export const makeServerLayer = Layer.unwrap(	...	@@ -333,7 +334,7 @@ export const makeServerLayer = Layer.unwrap(
333	return;	334	return;
334	}	335	}
335		336
336	const state = makePersistedServerRuntimeState({	337	const state = yield* makePersistedServerRuntimeState({
337	config,	338	config,
338	port: address.port,	339	port: address.port,
339	});	340	});
...	@@ -418,8 +419,4 @@ export const makeServerLayer = Layer.unwrap(	...	@@ -418,8 +419,4 @@ export const makeServerLayer = Layer.unwrap(
418	);	419	);
419		420
420	// Important: Only `ServerConfig` should be provided by the CLI layer!!! Don't let other requirements leak into the launch layer.	421	// Important: Only `ServerConfig` should be provided by the CLI layer!!! Don't let other requirements leak into the launch layer.
421	export const runServer = Layer.launch(makeServerLayer) satisfies Effect.Effect<	422	export const runServer = Layer.launch(makeServerLayer);
422	never,
423	any,
424	ServerConfig
425	>;

apps/server/src/serverLifecycleEvents.test.ts+3-2

...	@@ -1,7 +1,8 @@	...	@@ -1,7 +1,8 @@
1	import { EnvironmentId } from "@t3tools/contracts";	1	import { EnvironmentId } from "@t3tools/contracts";
2	import { assert, it } from "@effect/vitest";	2	import { assert, it } from "@effect/vitest";
3	import { assertTrue } from "@effect/vitest/utils";	3	import { assertTrue } from "@effect/vitest/utils";
4	import { Effect, Option } from "effect";	4	import * as Effect from "effect/Effect";
		5	import * as Option from "effect/Option";
5		6
6	import { ServerLifecycleEvents, ServerLifecycleEventsLive } from "./serverLifecycleEvents.ts";	7	import { ServerLifecycleEvents, ServerLifecycleEventsLive } from "./serverLifecycleEvents.ts";
7		8
...	@@ -37,7 +38,7 @@ it.effect(	...	@@ -37,7 +38,7 @@ it.effect(
37	version: 1,	38	version: 1,
38	type: "ready",	39	type: "ready",
39	payload: {	40	payload: {
40	at: new Date().toISOString(),	41	at: "2026-01-01T00:00:00.000Z",
41	environment,	42	environment,
42	},	43	},
43	})	44	})

apps/server/src/serverLifecycleEvents.ts+6-1

...	@@ -1,5 +1,10 @@	...	@@ -1,5 +1,10 @@
1	import type { ServerLifecycleStreamEvent } from "@t3tools/contracts";	1	import type { ServerLifecycleStreamEvent } from "@t3tools/contracts";
2	import { Effect, Layer, PubSub, Ref, Context, Stream } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
		4	import * as PubSub from "effect/PubSub";
		5	import * as Ref from "effect/Ref";
		6	import * as Context from "effect/Context";
		7	import * as Stream from "effect/Stream";
3		8
4	type LifecycleEventInput =	9	type LifecycleEventInput =
5	\| Omit<Extract<ServerLifecycleStreamEvent, { type: "welcome" }>, "sequence">	10	\| Omit<Extract<ServerLifecycleStreamEvent, { type: "welcome" }>, "sequence">

apps/server/src/serverLogger.ts+4-1

...	@@ -1,4 +1,7 @@	...	@@ -1,4 +1,7 @@
1	import { Effect, Logger, References, Layer } from "effect";	1	import * as Effect from "effect/Effect";
		2	import * as Logger from "effect/Logger";
		3	import * as References from "effect/References";
		4	import * as Layer from "effect/Layer";
2		5
3	import { ServerConfig } from "./config.ts";	6	import { ServerConfig } from "./config.ts";
4		7

apps/server/src/serverRuntimeStartup.test.ts+6-1

 @@ -1,7 +1,12 @@
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { DEFAULT_MODEL, ProjectId, ProviderInstanceId, ThreadId } from "@t3tools/contracts";
 import { assert, it } from "@effect/vitest";
-import { Deferred, Effect, Fiber, Option, Ref, Stream } from "effect";
+import * as Deferred from "effect/Deferred";
+import * as Effect from "effect/Effect";
+import * as Fiber from "effect/Fiber";
+import * as Option from "effect/Option";
+import * as Ref from "effect/Ref";
+import * as Stream from "effect/Stream";
 import { ServerConfig } from "./config.ts";
 import {

apps/server/src/serverRuntimeStartup.ts+16-17

 @@ -7,20 +7,19 @@ import {
   ProviderInstanceId,
   ThreadId,
 } from "@t3tools/contracts";
-import {
+import * as Data from "effect/Data";
-  Data,
+import * as Deferred from "effect/Deferred";
-  Deferred,
+import * as Effect from "effect/Effect";
-  Effect,
+import * as Exit from "effect/Exit";
-  Exit,
+import * as Layer from "effect/Layer";
-  Layer,
+import * as Option from "effect/Option";
-  Option,
+import * as Path from "effect/Path";
-  Path,
+import * as Queue from "effect/Queue";
-  Queue,
+import * as Ref from "effect/Ref";
-  Ref,
+import * as Scope from "effect/Scope";
-  Scope,
+import * as Context from "effect/Context";
-  Context,
+import * as Console from "effect/Console";
-  Console,
+import * as DateTime from "effect/DateTime";
-} from "effect";
 import { ServerConfig } from "./config.ts";
 import { Keybindings } from "./keybindings.ts";
 @@ -188,7 +187,7 @@ export const resolveAutoBootstrapWelcomeTargets = Effect.gen(function* () {
       let nextProjectDefaultModelSelection: ModelSelection;
       if (Option.isNone(existingProject)) {
-        const createdAt = new Date().toISOString();
+        const createdAt = DateTime.formatIso(yield* DateTime.now);
         nextProjectId = ProjectId.make(crypto.randomUUID());
         const bootstrapProjectTitle = path.basename(serverConfig.cwd) || "project";
         nextProjectDefaultModelSelection = getAutoBootstrapDefaultModelSelection();
 @@ -210,7 +209,7 @@ export const resolveAutoBootstrapWelcomeTargets = Effect.gen(function* () {
       const existingThreadId =
         yield* projectionReadModelQuery.getFirstActiveThreadIdByProjectId(nextProjectId);
       if (Option.isNone(existingThreadId)) {
-        const createdAt = new Date().toISOString();
+        const createdAt = DateTime.formatIso(yield* DateTime.now);
         const createdThreadId = ThreadId.make(crypto.randomUUID());
         yield* orchestrationEngine.dispatch({
           type: "thread.create",
 @@ -423,7 +422,7 @@ export const makeServerRuntimeStartup = Effect.gen(function* () {
           version: 1,
           type: "ready",
           payload: {
-            at: new Date().toISOString(),
+            at: DateTime.formatIso(yield* DateTime.now),
             environment: yield* serverEnvironment.getDescriptor,
           },
         }),

apps/server/src/serverRuntimeState.ts+14-9

 @@ -1,4 +1,8 @@
-import { Effect, FileSystem, Option, Schema } from "effect";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
 import { writeFileStringAtomically } from "./atomicWrite.ts";
 import { type ServerConfigShape } from "./config.ts";
 @@ -30,14 +34,15 @@ const runtimeOriginForConfig = (
 export const makePersistedServerRuntimeState = (input: {
   readonly config: Pick<ServerConfigShape, "host">;
   readonly port: number;
-}): PersistedServerRuntimeState => ({
+}): Effect.Effect<PersistedServerRuntimeState> =>
-  version: 1,
+  Effect.map(DateTime.now, (now) => ({
-  pid: process.pid,
+    version: 1,
-  ...(input.config.host ? { host: input.config.host } : {}),
+    pid: process.pid,
-  port: input.port,
+    ...(input.config.host ? { host: input.config.host } : {}),
-  origin: runtimeOriginForConfig(input.config, input.port),
+    port: input.port,
-  startedAt: new Date().toISOString(),
+    origin: runtimeOriginForConfig(input.config, input.port),
-});
+    startedAt: DateTime.formatIso(now),
+  }));
 export const persistServerRuntimeState = (input: {
   readonly path: string;

apps/server/src/serverSettings.test.ts+6-1

...	@@ -8,7 +8,10 @@ import {	...	@@ -8,7 +8,10 @@ import {
8	} from "@t3tools/contracts";	8	} from "@t3tools/contracts";
9	import { createModelSelection } from "@t3tools/shared/model";	9	import { createModelSelection } from "@t3tools/shared/model";
10	import { assert, it } from "@effect/vitest";	10	import { assert, it } from "@effect/vitest";
11	import { Effect, FileSystem, Layer, Schema } from "effect";	11	import * as Effect from "effect/Effect";
		12	import * as FileSystem from "effect/FileSystem";
		13	import * as Layer from "effect/Layer";
		14	import * as Schema from "effect/Schema";
12	import { ServerConfig } from "./config.ts";	15	import { ServerConfig } from "./config.ts";
13	import { ServerSettingsLive, ServerSettingsService } from "./serverSettings.ts";	16	import { ServerSettingsLive, ServerSettingsService } from "./serverSettings.ts";
14		17
...	@@ -439,6 +442,7 @@ it.layer(NodeServices.layer)("server settings", (it) => {	...	@@ -439,6 +442,7 @@ it.layer(NodeServices.layer)("server settings", (it) => {
439	assert.equal(next.providers.codex.binaryPath, "/opt/homebrew/bin/codex");	442	assert.equal(next.providers.codex.binaryPath, "/opt/homebrew/bin/codex");
440		443
441	const raw = yield* fileSystem.readFileString(serverConfig.settingsPath);	444	const raw = yield* fileSystem.readFileString(serverConfig.settingsPath);
		445	// @effect-diagnostics-next-line preferSchemaOverJson:off
442	assert.deepEqual(JSON.parse(raw), {	446	assert.deepEqual(JSON.parse(raw), {
443	addProjectBaseDirectory: "~/Development",	447	addProjectBaseDirectory: "~/Development",
444	observability: {	448	observability: {
...	@@ -490,6 +494,7 @@ it.layer(NodeServices.layer)("server settings", (it) => {	...	@@ -490,6 +494,7 @@ it.layer(NodeServices.layer)("server settings", (it) => {
490		494
491	const raw = yield* fileSystem.readFileString(serverConfig.settingsPath);	495	const raw = yield* fileSystem.readFileString(serverConfig.settingsPath);
492	assert.notInclude(raw, "sk-or-secret");	496	assert.notInclude(raw, "sk-or-secret");
		497	// @effect-diagnostics-next-line preferSchemaOverJson:off
493	assert.deepEqual(JSON.parse(raw).providerInstances.codex_personal.environment, [	498	assert.deepEqual(JSON.parse(raw).providerInstances.codex_personal.environment, [
494	{	499	{
495	name: "OPENROUTER_API_KEY",	500	name: "OPENROUTER_API_KEY",

apps/server/src/serverSettings.ts+17-19

...	@@ -24,25 +24,23 @@ import {	...	@@ -24,25 +24,23 @@ import {
24	ServerSettingsError,	24	ServerSettingsError,
25	type ServerSettingsPatch,	25	type ServerSettingsPatch,
26	} from "@t3tools/contracts";	26	} from "@t3tools/contracts";
27	import {	27	import * as Cache from "effect/Cache";
28	Cache,	28	import * as Deferred from "effect/Deferred";
29	Deferred,	29	import * as Duration from "effect/Duration";
30	Duration,	30	import * as Effect from "effect/Effect";
31	Effect,	31	import * as Exit from "effect/Exit";
32	Exit,	32	import * as FileSystem from "effect/FileSystem";
33	FileSystem,	33	import * as Layer from "effect/Layer";
34	Layer,	34	import * as Path from "effect/Path";
35	Path,	35	import * as Equal from "effect/Equal";
36	Equal,	36	import * as PubSub from "effect/PubSub";
37	PubSub,	37	import * as Ref from "effect/Ref";
38	Ref,	38	import * as Schema from "effect/Schema";
39	Schema,	39	import * as SchemaIssue from "effect/SchemaIssue";
40	SchemaIssue,	40	import * as Scope from "effect/Scope";
41	Scope,	41	import * as Context from "effect/Context";
42	Context,	42	import * as Stream from "effect/Stream";
43	Stream,	43	import * as Cause from "effect/Cause";
44	Cause,
45	} from "effect";
46	import * as Semaphore from "effect/Semaphore";	44	import * as Semaphore from "effect/Semaphore";
47	import { writeFileStringAtomically } from "./atomicWrite.ts";	45	import { writeFileStringAtomically } from "./atomicWrite.ts";
48	import { ServerConfig } from "./config.ts";	46	import { ServerConfig } from "./config.ts";

apps/server/src/sourceControl/AzureDevOpsCli.test.ts+9-3

...	@@ -1,8 +1,10 @@	...	@@ -1,8 +1,10 @@
1	import * as NodeServices from "@effect/platform-node/NodeServices";	1	import * as NodeServices from "@effect/platform-node/NodeServices";
2	import { assert, it, afterEach, describe, expect, vi } from "@effect/vitest";	2	import { assert, it, afterEach, describe, expect, vi } from "@effect/vitest";
3	import { Effect, FileSystem, Layer, Option } from "effect";	3	import * as Effect from "effect/Effect";
		4	import * as FileSystem from "effect/FileSystem";
		5	import * as Layer from "effect/Layer";
		6	import * as Option from "effect/Option";
4	import { ChildProcessSpawner } from "effect/unstable/process";	7	import { ChildProcessSpawner } from "effect/unstable/process";
5	import type { VcsError } from "@t3tools/contracts";
6		8
7	import * as VcsProcess from "../vcs/VcsProcess.ts";	9	import * as VcsProcess from "../vcs/VcsProcess.ts";
8	import * as AzureDevOpsCli from "./AzureDevOpsCli.ts";	10	import * as AzureDevOpsCli from "./AzureDevOpsCli.ts";
...	@@ -35,6 +37,7 @@ describe("AzureDevOpsCli.layer", () => {	...	@@ -35,6 +37,7 @@ describe("AzureDevOpsCli.layer", () => {
35	mockRun.mockReturnValueOnce(	37	mockRun.mockReturnValueOnce(
36	Effect.succeed(	38	Effect.succeed(
37	processOutput(	39	processOutput(
		40	// @effect-diagnostics-next-line preferSchemaOverJson:off
38	JSON.stringify({	41	JSON.stringify({
39	pullRequestId: 42,	42	pullRequestId: 42,
40	title: "Add Azure provider",	43	title: "Add Azure provider",
...	@@ -91,6 +94,7 @@ describe("AzureDevOpsCli.layer", () => {	...	@@ -91,6 +94,7 @@ describe("AzureDevOpsCli.layer", () => {
91	mockRun.mockReturnValueOnce(	94	mockRun.mockReturnValueOnce(
92	Effect.succeed(	95	Effect.succeed(
93	processOutput(	96	processOutput(
		97	// @effect-diagnostics-next-line preferSchemaOverJson:off
94	JSON.stringify([	98	JSON.stringify([
95	{	99	{
96	pullRequestId: 7,	100	pullRequestId: 7,
...	@@ -149,6 +153,7 @@ describe("AzureDevOpsCli.layer", () => {	...	@@ -149,6 +153,7 @@ describe("AzureDevOpsCli.layer", () => {
149	mockRun.mockReturnValueOnce(	153	mockRun.mockReturnValueOnce(
150	Effect.succeed(	154	Effect.succeed(
151	processOutput(	155	processOutput(
		156	// @effect-diagnostics-next-line preferSchemaOverJson:off
152	JSON.stringify({	157	JSON.stringify({
153	name: "repo",	158	name: "repo",
154	webUrl: "https://dev.azure.com/acme/project/_git/repo",	159	webUrl: "https://dev.azure.com/acme/project/_git/repo",
...	@@ -181,6 +186,7 @@ describe("AzureDevOpsCli.layer", () => {	...	@@ -181,6 +186,7 @@ describe("AzureDevOpsCli.layer", () => {
181	mockRun.mockReturnValueOnce(	186	mockRun.mockReturnValueOnce(
182	Effect.succeed(	187	Effect.succeed(
183	processOutput(	188	processOutput(
		189	// @effect-diagnostics-next-line preferSchemaOverJson:off
184	JSON.stringify({	190	JSON.stringify({
185	name: "repo",	191	name: "repo",
186	webUrl: "https://dev.azure.com/acme/project/_git/repo",	192	webUrl: "https://dev.azure.com/acme/project/_git/repo",
...	@@ -231,7 +237,7 @@ describe("AzureDevOpsCli.layer", () => {	...	@@ -231,7 +237,7 @@ describe("AzureDevOpsCli.layer", () => {
231	it.effect("creates pull requests using the body file as the Azure description", () =>	237	it.effect("creates pull requests using the body file as the Azure description", () =>
232	Effect.gen(function* () {	238	Effect.gen(function* () {
233	const fileSystem = yield* FileSystem.FileSystem;	239	const fileSystem = yield* FileSystem.FileSystem;
234	const bodyFile = `/tmp/t3code-azure-devops-cli-${Date.now()}.md`;	240	const bodyFile = `/tmp/t3code-azure-devops-cli-.md`;
235	yield* fileSystem.writeFileString(bodyFile, "Generated body");	241	yield* fileSystem.writeFileString(bodyFile, "Generated body");
236	mockRun.mockReturnValueOnce(Effect.succeed(processOutput("{}")));	242	mockRun.mockReturnValueOnce(Effect.succeed(processOutput("{}")));
237		243

apps/server/src/sourceControl/AzureDevOpsCli.ts+6-1

...	@@ -1,4 +1,9 @@	...	@@ -1,4 +1,9 @@
1	import { Context, Effect, Layer, Result, Schema, SchemaIssue } from "effect";	1	import * as Context from "effect/Context";
		2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
		4	import * as Result from "effect/Result";
		5	import * as Schema from "effect/Schema";
		6	import * as SchemaIssue from "effect/SchemaIssue";
2	import {	7	import {
3	TrimmedNonEmptyString,	8	TrimmedNonEmptyString,
4	type SourceControlRepositoryVisibility,	9	type SourceControlRepositoryVisibility,

apps/server/src/sourceControl/AzureDevOpsSourceControlProvider.test.ts+3-1

...	@@ -1,5 +1,7 @@	...	@@ -1,5 +1,7 @@
1	import { assert, it } from "@effect/vitest";	1	import { assert, it } from "@effect/vitest";
2	import { Effect, Layer, Option } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
		4	import * as Option from "effect/Option";
3		5
4	import * as AzureDevOpsCli from "./AzureDevOpsCli.ts";	6	import * as AzureDevOpsCli from "./AzureDevOpsCli.ts";
5	import * as AzureDevOpsSourceControlProvider from "./AzureDevOpsSourceControlProvider.ts";	7	import * as AzureDevOpsSourceControlProvider from "./AzureDevOpsSourceControlProvider.ts";

apps/server/src/sourceControl/AzureDevOpsSourceControlProvider.ts+7-6

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	import { Effect, Layer } from "effect";	1	import * as Effect from "effect/Effect";
		2	import * as Layer from "effect/Layer";
2	import { SourceControlProviderError, type ChangeRequest } from "@t3tools/contracts";	3	import { SourceControlProviderError, type ChangeRequest } from "@t3tools/contracts";
3		4
4	import * as AzureDevOpsCli from "./AzureDevOpsCli.ts";	5	import * as AzureDevOpsCli from "./AzureDevOpsCli.ts";
...	@@ -30,7 +31,7 @@ function parseAzureAuth(input: SourceControlProviderDiscovery.SourceControlAuthP	...	@@ -30,7 +31,7 @@ function parseAzureAuth(input: SourceControlProviderDiscovery.SourceControlAuthP
30	});	31	});
31	}	32	}
32		33
33	if (account && account.length > 0) {	34	if (account !== undefined && account.length > 0) {
34	return SourceControlProviderDiscovery.providerAuth({	35	return SourceControlProviderDiscovery.providerAuth({
35	status: "authenticated",	36	status: "authenticated",
36	account,	37	account,
...	@@ -90,7 +91,7 @@ export const make = Effect.fn("makeAzureDevOpsSourceControlProvider")(function*	...	@@ -90,7 +91,7 @@ export const make = Effect.fn("makeAzureDevOpsSourceControlProvider")(function*
90	.listPullRequests({	91	.listPullRequests({
91	cwd: input.cwd,	92	cwd: input.cwd,
92	headSelector: input.headSelector,	93	headSelector: input.headSelector,
93	...(source ? { source } : {}),	94	...(source !== undefined ? { source } : {}),
94	state: input.state,	95	state: input.state,
95	...(input.limit !== undefined ? { limit: input.limit } : {}),	96	...(input.limit !== undefined ? { limit: input.limit } : {}),
96	})	97	})
...	@@ -111,8 +112,8 @@ export const make = Effect.fn("makeAzureDevOpsSourceControlProvider")(function*	...	@@ -111,8 +112,8 @@ export const make = Effect.fn("makeAzureDevOpsSourceControlProvider")(function*
111	cwd: input.cwd,	112	cwd: input.cwd,
112	baseBranch: input.baseRefName,	113	baseBranch: input.baseRefName,
113	headSelector: input.headSelector,	114	headSelector: input.headSelector,
114	...(source ? { source } : {}),	115	...(source !== undefined ? { source } : {}),
115	...(input.target ? { target: input.target } : {}),	116	...(input.target !== undefined ? { target: input.target } : {}),
116	title: input.title,	117	title: input.title,
117	bodyFile: input.bodyFile,	118	bodyFile: input.bodyFile,
118	})	119	})
...	@@ -135,7 +136,7 @@ export const make = Effect.fn("makeAzureDevOpsSourceControlProvider")(function*	...	@@ -135,7 +136,7 @@ export const make = Effect.fn("makeAzureDevOpsSourceControlProvider")(function*
135	.checkoutPullRequest({	136	.checkoutPullRequest({
136	cwd: input.cwd,	137	cwd: input.cwd,
137	reference: input.reference,	138	reference: input.reference,
138	...(input.context ? { remoteName: input.context.remoteName } : {}),	139	...(input.context !== undefined ? { remoteName: input.context.remoteName } : {}),
139	})	140	})
140	.pipe(Effect.mapError((error) => providerError("checkoutChangeRequest", error))),	141	.pipe(Effect.mapError((error) => providerError("checkoutChangeRequest", error))),
141	});	142	});

apps/server/src/sourceControl/BitbucketApi.test.ts+8-1

...	@@ -1,6 +1,11 @@	...	@@ -1,6 +1,11 @@
1	import { assert, it, vi } from "@effect/vitest";	1	import { assert, it, vi } from "@effect/vitest";
2	import * as NodeServices from "@effect/platform-node/NodeServices";	2	import * as NodeServices from "@effect/platform-node/NodeServices";
3	import { ConfigProvider, DateTime, Effect, FileSystem, Layer, Option } from "effect";	3	import * as ConfigProvider from "effect/ConfigProvider";
		4	import * as DateTime from "effect/DateTime";
		5	import * as Effect from "effect/Effect";
		6	import * as FileSystem from "effect/FileSystem";
		7	import * as Layer from "effect/Layer";
		8	import * as Option from "effect/Option";
4	import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http";	9	import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http";
5		10
6	import * as BitbucketApi from "./BitbucketApi.ts";	11	import * as BitbucketApi from "./BitbucketApi.ts";
...	@@ -423,6 +428,7 @@ it.effect("creates repositories through the Bitbucket REST API", () => {	...	@@ -423,6 +428,7 @@ it.effect("creates repositories through the Bitbucket REST API", () => {
423	assert.ok(request);	428	assert.ok(request);
424	const rawBody = (request.body as { readonly body?: Uint8Array }).body;	429	const rawBody = (request.body as { readonly body?: Uint8Array }).body;
425	assert.ok(rawBody);	430	assert.ok(rawBody);
		431	// @effect-diagnostics-next-line preferSchemaOverJson:off
426	assert.deepStrictEqual(JSON.parse(new TextDecoder().decode(rawBody)), {	432	assert.deepStrictEqual(JSON.parse(new TextDecoder().decode(rawBody)), {
427	scm: "git",	433	scm: "git",
428	is_private: true,	434	is_private: true,
...	@@ -458,6 +464,7 @@ it.effect("creates pull requests using the official REST payload shape", () => {	...	@@ -458,6 +464,7 @@ it.effect("creates pull requests using the official REST payload shape", () => {
458	assert.ok(request);	464	assert.ok(request);
459	const rawBody = (request.body as { readonly body?: Uint8Array }).body;	465	const rawBody = (request.body as { readonly body?: Uint8Array }).body;
460	assert.ok(rawBody);	466	assert.ok(rawBody);
		467	// @effect-diagnostics-next-line preferSchemaOverJson:off
461	assert.deepStrictEqual(JSON.parse(new TextDecoder().decode(rawBody)), {	468	assert.deepStrictEqual(JSON.parse(new TextDecoder().decode(rawBody)), {
462	title: "Provider PR",	469	title: "Provider PR",
463	description: "PR body",	470	description: "PR body",

apps/server/src/sourceControl/BitbucketApi.ts+7-1

...	@@ -1,4 +1,10 @@	...	@@ -1,4 +1,10 @@
1	import { Config, Context, Effect, FileSystem, Layer, Option, Schema } from "effect";	1	import * as Config from "effect/Config";
		2	import * as Context from "effect/Context";
		3	import * as Effect from "effect/Effect";
		4	import * as FileSystem from "effect/FileSystem";
		5	import * as Layer from "effect/Layer";
		6	import * as Option from "effect/Option";
		7	import * as Schema from "effect/Schema";
2	import {	8	import {
3	TrimmedNonEmptyString,	9	TrimmedNonEmptyString,
4	type SourceControlProviderAuth,	10	type SourceControlProviderAuth,

apps/server/src/sourceControl/BitbucketSourceControlProvider.test.ts+3-1

...	@@ -1,5 +1,7 @@	...	@@ -1,5 +1,7 @@
1	import { assert, it } from "@effect/vitest";	1	import { assert, it } from "@effect/vitest";
2	import { Effect, Layer, Option } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
		4	import * as Option from "effect/Option";
3		5
4	import * as BitbucketApi from "./BitbucketApi.ts";	6	import * as BitbucketApi from "./BitbucketApi.ts";
5	import * as BitbucketSourceControlProvider from "./BitbucketSourceControlProvider.ts";	7	import * as BitbucketSourceControlProvider from "./BitbucketSourceControlProvider.ts";

apps/server/src/sourceControl/BitbucketSourceControlProvider.ts+3-1

...	@@ -1,4 +1,6 @@	...	@@ -1,4 +1,6 @@
1	import { Effect, Layer, Option } from "effect";	1	import * as Effect from "effect/Effect";
		2	import * as Layer from "effect/Layer";
		3	import * as Option from "effect/Option";
2	import { SourceControlProviderError, type ChangeRequest } from "@t3tools/contracts";	4	import { SourceControlProviderError, type ChangeRequest } from "@t3tools/contracts";
3		5
4	import * as BitbucketApi from "./BitbucketApi.ts";	6	import * as BitbucketApi from "./BitbucketApi.ts";

apps/server/src/sourceControl/GitHubCli.test.ts+7-2

...	@@ -1,7 +1,8 @@	...	@@ -1,7 +1,8 @@
1	import { assert, it, afterEach, describe, expect, vi } from "@effect/vitest";	1	import { assert, it, afterEach, describe, expect, vi } from "@effect/vitest";
2	import { Effect, Layer } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
3	import { ChildProcessSpawner } from "effect/unstable/process";	4	import { ChildProcessSpawner } from "effect/unstable/process";
4	import { VcsProcessExitError, type VcsError } from "@t3tools/contracts";	5	import { VcsProcessExitError } from "@t3tools/contracts";
5		6
6	import * as VcsProcess from "../vcs/VcsProcess.ts";	7	import * as VcsProcess from "../vcs/VcsProcess.ts";
7	import * as GitHubCli from "./GitHubCli.ts";	8	import * as GitHubCli from "./GitHubCli.ts";
...	@@ -34,6 +35,7 @@ describe("GitHubCli.layer", () => {	...	@@ -34,6 +35,7 @@ describe("GitHubCli.layer", () => {
34	mockRun.mockReturnValueOnce(	35	mockRun.mockReturnValueOnce(
35	Effect.succeed(	36	Effect.succeed(
36	processOutput(	37	processOutput(
		38	// @effect-diagnostics-next-line preferSchemaOverJson:off
37	JSON.stringify({	39	JSON.stringify({
38	number: 42,	40	number: 42,
39	title: "Add PR thread creation",	41	title: "Add PR thread creation",
...	@@ -92,6 +94,7 @@ describe("GitHubCli.layer", () => {	...	@@ -92,6 +94,7 @@ describe("GitHubCli.layer", () => {
92	mockRun.mockReturnValueOnce(	94	mockRun.mockReturnValueOnce(
93	Effect.succeed(	95	Effect.succeed(
94	processOutput(	96	processOutput(
		97	// @effect-diagnostics-next-line preferSchemaOverJson:off
95	JSON.stringify({	98	JSON.stringify({
96	number: 42,	99	number: 42,
97	title: " Add PR thread creation \n",	100	title: " Add PR thread creation \n",
...	@@ -137,6 +140,7 @@ describe("GitHubCli.layer", () => {	...	@@ -137,6 +140,7 @@ describe("GitHubCli.layer", () => {
137	mockRun.mockReturnValueOnce(	140	mockRun.mockReturnValueOnce(
138	Effect.succeed(	141	Effect.succeed(
139	processOutput(	142	processOutput(
		143	// @effect-diagnostics-next-line preferSchemaOverJson:off
140	JSON.stringify([	144	JSON.stringify([
141	{	145	{
142	number: 0,	146	number: 0,
...	@@ -187,6 +191,7 @@ describe("GitHubCli.layer", () => {	...	@@ -187,6 +191,7 @@ describe("GitHubCli.layer", () => {
187	mockRun.mockReturnValueOnce(	191	mockRun.mockReturnValueOnce(
188	Effect.succeed(	192	Effect.succeed(
189	processOutput(	193	processOutput(
		194	// @effect-diagnostics-next-line preferSchemaOverJson:off
190	JSON.stringify({	195	JSON.stringify({
191	nameWithOwner: "octocat/codething-mvp",	196	nameWithOwner: "octocat/codething-mvp",
192	url: "https://github.com/octocat/codething-mvp",	197	url: "https://github.com/octocat/codething-mvp",

apps/server/src/sourceControl/GitHubCli.ts+6-1

...	@@ -1,4 +1,9 @@	...	@@ -1,4 +1,9 @@
1	import { Context, Effect, Layer, Result, Schema, SchemaIssue } from "effect";	1	import * as Context from "effect/Context";
		2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
		4	import * as Result from "effect/Result";
		5	import * as Schema from "effect/Schema";
		6	import * as SchemaIssue from "effect/SchemaIssue";
2		7
3	import {	8	import {
4	TrimmedNonEmptyString,	9	TrimmedNonEmptyString,

apps/server/src/sourceControl/GitHubSourceControlProvider.test.ts+4-1

...	@@ -1,5 +1,8 @@	...	@@ -1,5 +1,8 @@
1	import { assert, it } from "@effect/vitest";	1	import { assert, it } from "@effect/vitest";
2	import { DateTime, Effect, Layer, Option } from "effect";	2	import * as DateTime from "effect/DateTime";
		3	import * as Effect from "effect/Effect";
		4	import * as Layer from "effect/Layer";
		5	import * as Option from "effect/Option";
3	import { ChildProcessSpawner } from "effect/unstable/process";	6	import { ChildProcessSpawner } from "effect/unstable/process";
4		7
5	import * as VcsProcess from "../vcs/VcsProcess.ts";	8	import * as VcsProcess from "../vcs/VcsProcess.ts";

apps/server/src/sourceControl/GitHubSourceControlProvider.ts+5-1

...	@@ -1,4 +1,8 @@	...	@@ -1,4 +1,8 @@
1	import { Effect, Layer, Option, Result, Schema } from "effect";	1	import * as Effect from "effect/Effect";
		2	import * as Layer from "effect/Layer";
		3	import * as Option from "effect/Option";
		4	import * as Result from "effect/Result";
		5	import * as Schema from "effect/Schema";
2	import {	6	import {
3	SourceControlProviderError,	7	SourceControlProviderError,
4	type ChangeRequest,	8	type ChangeRequest,

apps/server/src/sourceControl/GitLabCli.test.ts+15-2

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	import { assert, it, afterEach, expect, vi } from "@effect/vitest";	1	import { assert, it, afterEach, expect, vi } from "@effect/vitest";
2	import { Effect, Layer } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
3	import { ChildProcessSpawner } from "effect/unstable/process";	4	import { ChildProcessSpawner } from "effect/unstable/process";
4		5
5	import { VcsProcessExitError } from "@t3tools/contracts";	6	import { VcsProcessExitError } from "@t3tools/contracts";
...	@@ -38,6 +39,7 @@ layer("GitLabCli.layer", (it) => {	...	@@ -38,6 +39,7 @@ layer("GitLabCli.layer", (it) => {
38	mockedRun.mockReturnValueOnce(	39	mockedRun.mockReturnValueOnce(
39	Effect.succeed(	40	Effect.succeed(
40	processOutput(	41	processOutput(
		42	// @effect-diagnostics-next-line preferSchemaOverJson:off
41	JSON.stringify({	43	JSON.stringify({
42	iid: 42,	44	iid: 42,
43	title: "Add MR thread creation",	45	title: "Add MR thread creation",
...	@@ -89,6 +91,7 @@ layer("GitLabCli.layer", (it) => {	...	@@ -89,6 +91,7 @@ layer("GitLabCli.layer", (it) => {
89	mockedRun.mockReturnValueOnce(	91	mockedRun.mockReturnValueOnce(
90	Effect.succeed(	92	Effect.succeed(
91	processOutput(	93	processOutput(
		94	// @effect-diagnostics-next-line preferSchemaOverJson:off
92	JSON.stringify([	95	JSON.stringify([
93	{	96	{
94	iid: 0,	97	iid: 0,
...	@@ -154,6 +157,7 @@ layer("GitLabCli.layer", (it) => {	...	@@ -154,6 +157,7 @@ layer("GitLabCli.layer", (it) => {
154	mockedRun.mockReturnValueOnce(	157	mockedRun.mockReturnValueOnce(
155	Effect.succeed(	158	Effect.succeed(
156	processOutput(	159	processOutput(
		160	// @effect-diagnostics-next-line preferSchemaOverJson:off
157	JSON.stringify({	161	JSON.stringify({
158	path_with_namespace: "octocat/t3code",	162	path_with_namespace: "octocat/t3code",
159	web_url: "https://gitlab.com/octocat/t3code",	163	web_url: "https://gitlab.com/octocat/t3code",
...	@@ -219,10 +223,19 @@ layer("GitLabCli.layer", (it) => {	...	@@ -219,10 +223,19 @@ layer("GitLabCli.layer", (it) => {
219	it.effect("creates repositories under an explicit namespace", () =>	223	it.effect("creates repositories under an explicit namespace", () =>
220	Effect.gen(function* () {	224	Effect.gen(function* () {
221	mockedRun	225	mockedRun
222	.mockReturnValueOnce(Effect.succeed(processOutput(JSON.stringify({ id: 1234 }))))	226
		227	.mockReturnValueOnce(
		228	Effect.succeed(
		229	processOutput(
		230	// @effect-diagnostics-next-line preferSchemaOverJson:off
		231	JSON.stringify({ id: 1234 }),
		232	),
		233	),
		234	)
223	.mockReturnValueOnce(	235	.mockReturnValueOnce(
224	Effect.succeed(	236	Effect.succeed(
225	processOutput(	237	processOutput(
		238	// @effect-diagnostics-next-line preferSchemaOverJson:off
226	JSON.stringify({	239	JSON.stringify({
227	path_with_namespace: "octocat/t3code",	240	path_with_namespace: "octocat/t3code",
228	web_url: "https://gitlab.com/octocat/t3code",	241	web_url: "https://gitlab.com/octocat/t3code",

apps/server/src/sourceControl/GitLabCli.ts+8-1

...	@@ -1,4 +1,11 @@	...	@@ -1,4 +1,11 @@
1	import { Context, Effect, Layer, Option, Result, Schema, SchemaIssue, type DateTime } from "effect";	1	import * as Context from "effect/Context";
		2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
		4	import * as Option from "effect/Option";
		5	import * as Result from "effect/Result";
		6	import * as Schema from "effect/Schema";
		7	import * as SchemaIssue from "effect/SchemaIssue";
		8	import type * as DateTime from "effect/DateTime";
2		9
3	import { TrimmedNonEmptyString, type SourceControlRepositoryVisibility } from "@t3tools/contracts";	10	import { TrimmedNonEmptyString, type SourceControlRepositoryVisibility } from "@t3tools/contracts";
4		11

apps/server/src/sourceControl/GitLabSourceControlProvider.test.ts+3-1

...	@@ -1,5 +1,7 @@	...	@@ -1,5 +1,7 @@
1	import { assert, it } from "@effect/vitest";	1	import { assert, it } from "@effect/vitest";
2	import { Effect, Layer, Option } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
		4	import * as Option from "effect/Option";
3		5
4	import * as GitLabCli from "./GitLabCli.ts";	6	import * as GitLabCli from "./GitLabCli.ts";
5	import * as GitLabSourceControlProvider from "./GitLabSourceControlProvider.ts";	7	import * as GitLabSourceControlProvider from "./GitLabSourceControlProvider.ts";

apps/server/src/sourceControl/GitLabSourceControlProvider.ts+3-1

...	@@ -1,4 +1,6 @@	...	@@ -1,4 +1,6 @@
1	import { Effect, Layer, Option } from "effect";	1	import * as Effect from "effect/Effect";
		2	import * as Layer from "effect/Layer";
		3	import * as Option from "effect/Option";
2	import { SourceControlProviderError, type ChangeRequest } from "@t3tools/contracts";	4	import { SourceControlProviderError, type ChangeRequest } from "@t3tools/contracts";
3		5
4	import * as GitLabCli from "./GitLabCli.ts";	6	import * as GitLabCli from "./GitLabCli.ts";

apps/server/src/sourceControl/SourceControlDiscovery.test.ts+3-1

...	@@ -1,6 +1,8 @@	...	@@ -1,6 +1,8 @@
1	import { assert, it } from "@effect/vitest";	1	import { assert, it } from "@effect/vitest";
2	import * as NodeServices from "@effect/platform-node/NodeServices";	2	import * as NodeServices from "@effect/platform-node/NodeServices";
3	import { Effect, Layer, Option } from "effect";	3	import * as Effect from "effect/Effect";
		4	import * as Layer from "effect/Layer";
		5	import * as Option from "effect/Option";
4	import { ChildProcessSpawner } from "effect/unstable/process";	6	import { ChildProcessSpawner } from "effect/unstable/process";
5	import { VcsProcessSpawnError } from "@t3tools/contracts";	7	import { VcsProcessSpawnError } from "@t3tools/contracts";
6		8

apps/server/src/sourceControl/SourceControlDiscovery.ts+4-1

 @@ -3,7 +3,10 @@ import {
   type VcsDiscoveryItem,
   type VcsDriverKind,
 } from "@t3tools/contracts";
-import { Context, Effect, Layer, Option } from "effect";
+import * as Context from "effect/Context";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
 import { ServerConfig } from "../config.ts";
 import * as VcsProcess from "../vcs/VcsProcess.ts";

apps/server/src/sourceControl/SourceControlProvider.ts+2-1

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	import { Context, Effect } from "effect";	1	import * as Context from "effect/Context";
		2	import * as Effect from "effect/Effect";
2	import type {	3	import type {
3	ChangeRequest,	4	ChangeRequest,
4	ChangeRequestState,	5	ChangeRequestState,

apps/server/src/sourceControl/SourceControlProviderDiscovery.ts+2-1

...	@@ -3,7 +3,8 @@ import type {	...	@@ -3,7 +3,8 @@ import type {
3	SourceControlProviderDiscoveryItem,	3	SourceControlProviderDiscoveryItem,
4	SourceControlProviderKind,	4	SourceControlProviderKind,
5	} from "@t3tools/contracts";	5	} from "@t3tools/contracts";
6	import { Effect, Option } from "effect";	6	import * as Effect from "effect/Effect";
		7	import * as Option from "effect/Option";
7		8
8	import type * as VcsProcess from "../vcs/VcsProcess.ts";	9	import type * as VcsProcess from "../vcs/VcsProcess.ts";
9		10

apps/server/src/sourceControl/SourceControlProviderRegistry.test.ts+4-1

 @@ -1,6 +1,9 @@
 import { assert, it } from "@effect/vitest";
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import { DateTime, Effect, Layer, Option } from "effect";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
 import { ServerConfig } from "../config.ts";
 import type * as VcsDriver from "../vcs/VcsDriver.ts";

apps/server/src/sourceControl/SourceControlProviderRegistry.ts+6-1

...	@@ -1,4 +1,9 @@	...	@@ -1,4 +1,9 @@
1	import { Cache, Context, Duration, Effect, Exit, Layer } from "effect";	1	import * as Cache from "effect/Cache";
		2	import * as Context from "effect/Context";
		3	import * as Duration from "effect/Duration";
		4	import * as Effect from "effect/Effect";
		5	import * as Exit from "effect/Exit";
		6	import * as Layer from "effect/Layer";
2	import {	7	import {
3	SourceControlProviderError,	8	SourceControlProviderError,
4	type SourceControlProviderDiscoveryItem,	9	type SourceControlProviderDiscoveryItem,

apps/server/src/sourceControl/SourceControlRepositoryService.test.ts+3-1

...	@@ -1,6 +1,8 @@	...	@@ -1,6 +1,8 @@
1	import * as NodeServices from "@effect/platform-node/NodeServices";	1	import * as NodeServices from "@effect/platform-node/NodeServices";
2	import { assert, it } from "@effect/vitest";	2	import { assert, it } from "@effect/vitest";
3	import { Effect, FileSystem, Layer } from "effect";	3	import * as Effect from "effect/Effect";
		4	import * as FileSystem from "effect/FileSystem";
		5	import * as Layer from "effect/Layer";
4	import { ChildProcessSpawner } from "effect/unstable/process";	6	import { ChildProcessSpawner } from "effect/unstable/process";
5		7
6	import { GitCommandError, type SourceControlProviderError } from "@t3tools/contracts";	8	import { GitCommandError, type SourceControlProviderError } from "@t3tools/contracts";

apps/server/src/sourceControl/SourceControlRepositoryService.ts+6-1

...	@@ -1,5 +1,10 @@	...	@@ -1,5 +1,10 @@
1	import * as NodeOS from "node:os";	1	import * as NodeOS from "node:os";
2	import { Context, Effect, FileSystem, Layer, Path, Schema } from "effect";	2	import * as Context from "effect/Context";
		3	import * as Effect from "effect/Effect";
		4	import * as FileSystem from "effect/FileSystem";
		5	import * as Layer from "effect/Layer";
		6	import * as Path from "effect/Path";
		7	import * as Schema from "effect/Schema";
3		8
4	import {	9	import {
5	SourceControlRepositoryError,	10	SourceControlRepositoryError,

apps/server/src/sourceControl/azureDevOpsPullRequests.ts+6-1

...	@@ -1,4 +1,9 @@	...	@@ -1,4 +1,9 @@
1	import { Cause, DateTime, Exit, Option, Result, Schema } from "effect";	1	import * as Cause from "effect/Cause";
		2	import * as DateTime from "effect/DateTime";
		3	import * as Exit from "effect/Exit";
		4	import * as Option from "effect/Option";
		5	import * as Result from "effect/Result";
		6	import * as Schema from "effect/Schema";
2	import { PositiveInt, TrimmedNonEmptyString } from "@t3tools/contracts";	7	import { PositiveInt, TrimmedNonEmptyString } from "@t3tools/contracts";
3	import { decodeJsonResult, formatSchemaError } from "@t3tools/shared/schemaJson";	8	import { decodeJsonResult, formatSchemaError } from "@t3tools/shared/schemaJson";
4		9

apps/server/src/sourceControl/bitbucketPullRequests.ts+3-1

...	@@ -1,4 +1,6 @@	...	@@ -1,4 +1,6 @@
1	import { DateTime, Option, Schema } from "effect";	1	import * as DateTime from "effect/DateTime";
		2	import * as Option from "effect/Option";
		3	import * as Schema from "effect/Schema";
2	import { PositiveInt, TrimmedNonEmptyString } from "@t3tools/contracts";	4	import { PositiveInt, TrimmedNonEmptyString } from "@t3tools/contracts";
3		5
4	export interface NormalizedBitbucketPullRequestRecord {	6	export interface NormalizedBitbucketPullRequestRecord {

apps/server/src/sourceControl/gitHubPullRequests.ts+6-1

...	@@ -1,4 +1,9 @@	...	@@ -1,4 +1,9 @@
1	import { Cause, DateTime, Exit, Option, Result, Schema } from "effect";	1	import * as Cause from "effect/Cause";
		2	import * as DateTime from "effect/DateTime";
		3	import * as Exit from "effect/Exit";
		4	import * as Option from "effect/Option";
		5	import * as Result from "effect/Result";
		6	import * as Schema from "effect/Schema";
2	import { PositiveInt, TrimmedNonEmptyString } from "@t3tools/contracts";	7	import { PositiveInt, TrimmedNonEmptyString } from "@t3tools/contracts";
3	import { decodeJsonResult, formatSchemaError } from "@t3tools/shared/schemaJson";	8	import { decodeJsonResult, formatSchemaError } from "@t3tools/shared/schemaJson";
4		9

apps/server/src/sourceControl/gitLabMergeRequests.ts+6-1

...	@@ -1,4 +1,9 @@	...	@@ -1,4 +1,9 @@
1	import { Cause, DateTime, Exit, Option, Result, Schema } from "effect";	1	import * as Cause from "effect/Cause";
		2	import * as DateTime from "effect/DateTime";
		3	import * as Exit from "effect/Exit";
		4	import * as Option from "effect/Option";
		5	import * as Result from "effect/Result";
		6	import * as Schema from "effect/Schema";
2	import { PositiveInt, TrimmedNonEmptyString } from "@t3tools/contracts";	7	import { PositiveInt, TrimmedNonEmptyString } from "@t3tools/contracts";
3	import { decodeJsonResult, formatSchemaError } from "@t3tools/shared/schemaJson";	8	import { decodeJsonResult, formatSchemaError } from "@t3tools/shared/schemaJson";
4		9

apps/server/src/startupAccess.ts+1-1

...	@@ -1,7 +1,7 @@	...	@@ -1,7 +1,7 @@
1	import { networkInterfaces } from "node:os";	1	import { networkInterfaces } from "node:os";
2		2
3	import { QrCode } from "@t3tools/shared/qrCode";	3	import { QrCode } from "@t3tools/shared/qrCode";
4	import { Effect } from "effect";	4	import * as Effect from "effect/Effect";
5	import { HttpServer } from "effect/unstable/http";	5	import { HttpServer } from "effect/unstable/http";
6		6
7	import { ServerConfig } from "./config.ts";	7	import { ServerConfig } from "./config.ts";

apps/server/src/stream/collectUint8StreamText.test.ts+2-1

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	import { assert, describe, it } from "@effect/vitest";	1	import { assert, describe, it } from "@effect/vitest";
2	import { Effect, Stream } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Stream from "effect/Stream";
3		4
4	import { collectUint8StreamText } from "./collectUint8StreamText.ts";	5	import { collectUint8StreamText } from "./collectUint8StreamText.ts";
5		6

apps/server/src/stream/collectUint8StreamText.ts+2-1

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	import { Effect, Stream } from "effect";	1	import * as Effect from "effect/Effect";
		2	import * as Stream from "effect/Stream";
2		3
3	export interface CollectedUint8StreamText {	4	export interface CollectedUint8StreamText {
4	readonly text: string;	5	readonly text: string;

apps/server/src/telemetry/Identify.ts+5-1

...	@@ -1,4 +1,8 @@	...	@@ -1,4 +1,8 @@
1	import { Effect, FileSystem, Path, Random, Schema } from "effect";	1	import * as Effect from "effect/Effect";
		2	import * as FileSystem from "effect/FileSystem";
		3	import * as Path from "effect/Path";
		4	import * as Random from "effect/Random";
		5	import * as Schema from "effect/Schema";
2	import * as Crypto from "node:crypto";	6	import * as Crypto from "node:crypto";
3	import { homedir } from "node:os";	7	import { homedir } from "node:os";
4	import { ServerConfig } from "../config.ts";	8	import { ServerConfig } from "../config.ts";

apps/server/src/telemetry/Layers/AnalyticsService.test.ts+3-1

 @@ -1,7 +1,9 @@
 import * as NodeHttpServer from "@effect/platform-node/NodeHttpServer";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, it } from "@effect/vitest";
-import { ConfigProvider, Effect, Layer } from "effect";
+import * as ConfigProvider from "effect/ConfigProvider";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
 import * as HttpServer from "effect/unstable/http/HttpServer";
 import * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";
 import * as HttpServerResponse from "effect/unstable/http/HttpServerResponse";

apps/server/src/telemetry/Layers/AnalyticsService.ts+5-1

 @@ -7,7 +7,11 @@
  * @module AnalyticsServiceLive
  */
-import { Config, DateTime, Effect, Layer, Ref } from "effect";
+import * as Config from "effect/Config";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Ref from "effect/Ref";
 import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http";
 import { ServerConfig } from "../../config.ts";

apps/server/src/telemetry/Services/AnalyticsService.ts+3-1

 @@ -6,7 +6,9 @@
  *
  * @module AnalyticsService
  */
-import { Effect, Layer, Context } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Context from "effect/Context";
 export interface AnalyticsServiceShape {
   /**

apps/server/src/terminal/Layers/BunPTY.ts+2-1

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	import { Effect, Layer } from "effect";	1	import * as Effect from "effect/Effect";
		2	import * as Layer from "effect/Layer";
2	import { PtyAdapter } from "../Services/PTY.ts";	3	import { PtyAdapter } from "../Services/PTY.ts";
3	import type { PtyAdapterShape, PtyExitEvent, PtyProcess } from "../Services/PTY.ts";	4	import type { PtyAdapterShape, PtyExitEvent, PtyProcess } from "../Services/PTY.ts";
4		5

apps/server/src/terminal/Layers/Manager.test.ts+31-38

 @@ -1,5 +1,3 @@
-import path from "node:path";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, it } from "@effect/vitest";
 import {
 @@ -8,20 +6,19 @@ import {
   type TerminalOpenInput,
   type TerminalRestartInput,
 } from "@t3tools/contracts";
-import {
+import * as Cause from "effect/Cause";
-  Duration,
+import * as Duration from "effect/Duration";
-  Effect,
+import * as Effect from "effect/Effect";
-  Encoding,
+import * as Encoding from "effect/Encoding";
-  Exit,
+import * as Exit from "effect/Exit";
-  Fiber,
+import * as Fiber from "effect/Fiber";
-  FileSystem,
+import * as FileSystem from "effect/FileSystem";
-  Option,
+import * as Path from "effect/Path";
-  PlatformError,
+import * as PlatformError from "effect/PlatformError";
-  Ref,
+import * as Ref from "effect/Ref";
-  Schedule,
+import * as Schedule from "effect/Schedule";
-  Scope,
+import * as Scope from "effect/Scope";
-} from "effect";
+import * as TestClock from "effect/testing/TestClock";
-import { TestClock } from "effect/testing";
 import { expect } from "vitest";
 import type { TerminalManagerShape } from "../Services/Manager.ts";
 @@ -130,20 +127,11 @@ class FakePtyAdapter implements PtyAdapterShape {
 const waitFor = <E, R>(
   predicate: Effect.Effect<boolean, E, R>,
   timeout: Duration.Input = 800,
-): Effect.Effect<void, Error | E, R> =>
+): Effect.Effect<void, E | Cause.TimeoutError, R> =>
   predicate.pipe(
-    Effect.filterOrFail(
+    Effect.filter((done) => done),
-      (done) => done,
-      () => new Error("Condition not met"),
-    ),
     Effect.retry(Schedule.spaced("15 millis")),
-    Effect.timeoutOption(timeout),
+    Effect.timeout(timeout),
-    Effect.flatMap((result) =>
-      Option.match(result, {
-        onNone: () => Effect.fail(new Error("Timed out waiting for condition")),
-        onSome: () => Effect.void,
-      }),
-    ),
   );
 function openInput(overrides: Partial<TerminalOpenInput> = {}): TerminalOpenInput {
 @@ -181,7 +169,7 @@ function multiTerminalHistoryLogName(threadId: string, terminalId: string): stri
 }
 function historyLogPath(logsDir: string, threadId = "thread-1"): string {
-  return path.join(logsDir, historyLogName(threadId));
+  return joinPath(logsDir, historyLogName(threadId));
 }
 function multiTerminalHistoryLogPath(
 @@ -189,7 +177,11 @@ function multiTerminalHistoryLogPath(
   threadId = "thread-1",
   terminalId = "default",
 ): string {
-  return path.join(logsDir, multiTerminalHistoryLogName(threadId, terminalId));
+  return joinPath(logsDir, multiTerminalHistoryLogName(threadId, terminalId));
+}
+function joinPath(...segments: ReadonlyArray<string>): string {
+  return segments.join("/");
 }
 interface CreateManagerOptions {
 @@ -217,12 +209,13 @@ const createManager = (
 ): Effect.Effect<
   ManagerFixture,
   PlatformError.PlatformError,
-  FileSystem.FileSystem | Scope.Scope
+  FileSystem.FileSystem | Path.Path | Scope.Scope
 > =>
   Effect.flatMap(Effect.service(FileSystem.FileSystem), (fs) =>
     Effect.gen(function* () {
+      const pathService = yield* Path.Path;
       const baseDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3code-terminal-" });
-      const logsDir = path.join(baseDir, "userdata", "logs", "terminals");
+      const logsDir = pathService.join(baseDir, "userdata", "logs", "terminals");
       const ptyAdapter = options.ptyAdapter ?? new FakePtyAdapter();
       const manager = yield* makeTerminalManagerWithOptions({
 @@ -302,8 +295,8 @@ it.layer(NodeServices.layer, { excludeTestServices: true })("TerminalManager", (
       if (process.platform === "win32") return;
       const { manager, baseDir } = yield* createManager();
-      const blockedRoot = path.join(baseDir, "blocked-root");
+      const blockedRoot = joinPath(baseDir, "blocked-root");
-      const blockedCwd = path.join(blockedRoot, "cwd");
+      const blockedCwd = joinPath(blockedRoot, "cwd");
       yield* makeDirectory(blockedCwd);
       yield* chmod(blockedRoot, 0o000);
 @@ -441,8 +434,8 @@ it.layer(NodeServices.layer, { excludeTestServices: true })("TerminalManager", (
   it.effect("propagates explicit worktree metadata through snapshots and lifecycle events", () =>
     Effect.gen(function* () {
       const { manager, getEvents, baseDir } = yield* createManager();
-      const firstWorktreePath = path.join(baseDir, "worktrees", "feature-a");
+      const firstWorktreePath = joinPath(baseDir, "worktrees", "feature-a");
-      const secondWorktreePath = path.join(baseDir, "worktrees", "feature-b");
+      const secondWorktreePath = joinPath(baseDir, "worktrees", "feature-b");
       yield* makeDirectory(firstWorktreePath);
       yield* makeDirectory(secondWorktreePath);
       const startedSnapshot = yield* manager.open(
 @@ -478,7 +471,7 @@ it.layer(NodeServices.layer, { excludeTestServices: true })("TerminalManager", (
   it.effect("preserves worktree metadata when reopening an exited session", () =>
     Effect.gen(function* () {
       const { manager, ptyAdapter, getEvents, baseDir } = yield* createManager();
-      const worktreePath = path.join(baseDir, "worktrees", "feature-a");
+      const worktreePath = joinPath(baseDir, "worktrees", "feature-a");
       yield* makeDirectory(worktreePath);
       yield* manager.open(
 @@ -816,7 +809,7 @@ it.layer(NodeServices.layer, { excludeTestServices: true })("TerminalManager", (
   it.effect("migrates legacy transcript filenames to terminal-scoped history path on open", () =>
     Effect.gen(function* () {
       const { manager, logsDir } = yield* createManager();
-      const legacyPath = path.join(logsDir, "thread-1.log");
+      const legacyPath = joinPath(logsDir, "thread-1.log");
       const nextPath = historyLogPath(logsDir);
       yield* writeFileString(legacyPath, "legacy-line\n");

apps/server/src/terminal/Layers/Manager.ts+61-40

 @@ -1,5 +1,3 @@
-import path from "node:path";
 import {
   DEFAULT_TERMINAL_ID,
   type TerminalEvent,
 @@ -7,20 +5,20 @@ import {
   type TerminalSessionStatus,
 } from "@t3tools/contracts";
 import { makeKeyedCoalescingWorker } from "@t3tools/shared/KeyedCoalescingWorker";
-import {
+import * as Effect from "effect/Effect";
-  Effect,
+import * as Encoding from "effect/Encoding";
-  Encoding,
+import * as Equal from "effect/Equal";
-  Equal,
+import * as Exit from "effect/Exit";
-  Exit,
+import * as Fiber from "effect/Fiber";
-  Fiber,
+import * as FileSystem from "effect/FileSystem";
-  FileSystem,
+import * as DateTime from "effect/DateTime";
-  Layer,
+import * as Layer from "effect/Layer";
-  Option,
+import * as Option from "effect/Option";
-  Schema,
+import * as Path from "effect/Path";
-  Scope,
+import * as Schema from "effect/Schema";
-  Semaphore,
+import * as Scope from "effect/Scope";
-  SynchronizedRef,
+import * as Semaphore from "effect/Semaphore";
-} from "effect";
+import * as SynchronizedRef from "effect/SynchronizedRef";
 import { ServerConfig } from "../../config.ts";
 import {
 @@ -213,15 +211,25 @@ function normalizeShellCommand(
   return firstToken.replace(/^['"]|['"]$/g, "");
 }
+function basename(command: string, platform: NodeJS.Platform): string {
+  const normalized = platform === "win32" ? command.replaceAll("/", "\\") : command;
+  const separator = platform === "win32" ? "\\" : "/";
+  return normalized.slice(normalized.lastIndexOf(separator) + 1);
+}
+function joinWindowsPath(...segments: ReadonlyArray<string>): string {
+  return segments
+    .filter((segment) => segment.length > 0)
+    .join("\\")
+    .replace(/\\+/g, "\\");
+}
 function shellCandidateFromCommand(
   command: string | null,
   platform: NodeJS.Platform = process.platform,
 ): ShellCandidate | null {
   if (!command || command.length === 0) return null;
-  const shellName =
+  const shellName = basename(command, platform).toLowerCase();
-    platform === "win32"
-      ? path.win32.basename(command).toLowerCase()
-      : path.basename(command).toLowerCase();
   if (platform === "win32" && (shellName === "pwsh.exe" || shellName === "powershell.exe")) {
     return { shell: command, args: ["-NoLogo"] };
   }
 @@ -236,7 +244,7 @@ function windowsSystemRoot(env: NodeJS.ProcessEnv): string {
 }
 function windowsPowerShellPath(env: NodeJS.ProcessEnv): string {
-  return path.win32.join(
+  return joinWindowsPath(
     windowsSystemRoot(env),
     "System32",
     "WindowsPowerShell",
 @@ -246,7 +254,7 @@ function windowsPowerShellPath(env: NodeJS.ProcessEnv): string {
 }
 function windowsCmdPath(env: NodeJS.ProcessEnv): string {
-  return path.win32.join(windowsSystemRoot(env), "System32", "cmd.exe");
+  return joinWindowsPath(windowsSystemRoot(env), "System32", "cmd.exe");
 }
 function formatShellCandidate(candidate: ShellCandidate): string {
 @@ -714,8 +722,10 @@ const makeTerminalManager = Effect.fn("makeTerminalManager")(function* () {
 export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWithOptions")(
   function* (options: TerminalManagerOptions) {
     const fileSystem = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
     const context = yield* Effect.context<never>();
     const runFork = Effect.runForkWith(context);
+    const nowIso = Effect.map(DateTime.now, DateTime.formatIso);
     const logsDir = options.logsDir;
     const historyLineLimit = options.historyLineLimit ?? DEFAULT_HISTORY_LINE_LIMIT;
 @@ -1160,6 +1170,7 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
       expectedPid: number,
     ) {
       while (true) {
+        const updatedAt = yield* nowIso;
         const action: DrainProcessEventAction = yield* Effect.sync(() => {
           if (session.pid !== expectedPid || !session.process || session.status !== "running") {
             session.pendingProcessEvents = [];
 @@ -1194,7 +1205,7 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
                 historyLineLimit,
               );
             }
-            session.updatedAt = new Date().toISOString();
+            session.updatedAt = updatedAt;
             return {
               type: "output",
 @@ -1221,7 +1232,7 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
           session.exitSignal = Number.isInteger(nextEvent.event.signal)
             ? nextEvent.event.signal
             : null;
-          session.updatedAt = new Date().toISOString();
+          session.updatedAt = updatedAt;
           return {
             type: "exit",
 @@ -1242,22 +1253,24 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
             yield* queuePersist(action.threadId, action.terminalId, action.history);
           }
+          const createdAt = yield* nowIso;
           yield* publishEvent({
             type: "output",
             threadId: action.threadId,
             terminalId: action.terminalId,
-            createdAt: new Date().toISOString(),
+            createdAt,
             data: action.data,
           });
           continue;
         }
         yield* clearKillFiber(action.process);
+        const createdAt = yield* nowIso;
         yield* publishEvent({
           type: "exited",
           threadId: action.threadId,
           terminalId: action.terminalId,
-          createdAt: new Date().toISOString(),
+          createdAt,
           exitCode: action.exitCode,
           exitSignal: action.exitSignal,
         });
 @@ -1272,6 +1285,7 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
       const process = session.process;
       if (!process) return;
+      const updatedAt = yield* nowIso;
       yield* modifyManagerState((state) => {
         cleanupProcessHandles(session);
         session.process = null;
 @@ -1282,7 +1296,7 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
         session.pendingProcessEvents = [];
         session.pendingProcessEventIndex = 0;
         session.processEventDrainRunning = false;
-        session.updatedAt = new Date().toISOString();
+        session.updatedAt = updatedAt;
         return [undefined, state] as const;
       });
 @@ -1361,6 +1375,7 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
         "terminal.cwd": input.cwd,
       });
+      const startingAt = yield* nowIso;
       yield* modifyManagerState((state) => {
         session.status = "starting";
         session.cwd = input.cwd;
 @@ -1373,7 +1388,7 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
         session.pendingProcessEvents = [];
         session.pendingProcessEventIndex = 0;
         session.processEventDrainRunning = false;
-        session.updatedAt = new Date().toISOString();
+        session.updatedAt = startingAt;
         return [undefined, state] as const;
       });
 @@ -1404,11 +1419,12 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
                 runFork(drainProcessEvents(session, processPid));
               });
+              const startedAt = yield* nowIso;
               yield* modifyManagerState((state) => {
                 session.process = ptyProcess;
                 session.pid = processPid;
                 session.status = "running";
-                session.updatedAt = new Date().toISOString();
+                session.updatedAt = startedAt;
                 session.unsubscribeData = unsubscribeData;
                 session.unsubscribeExit = unsubscribeExit;
                 return [undefined, state] as const;
 @@ -1418,7 +1434,7 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
                 type: eventType,
                 threadId: session.threadId,
                 terminalId: session.terminalId,
-                createdAt: new Date().toISOString(),
+                createdAt: startedAt,
                 snapshot: snapshot(session),
               });
             }),
 @@ -1436,6 +1452,7 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
           yield* startKillEscalation(ptyProcess, session.threadId, session.terminalId);
         }
+        const failedAt = yield* nowIso;
         yield* modifyManagerState((state) => {
           session.status = "error";
           session.pid = null;
 @@ -1446,7 +1463,7 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
           session.pendingProcessEvents = [];
           session.pendingProcessEventIndex = 0;
           session.processEventDrainRunning = false;
-          session.updatedAt = new Date().toISOString();
+          session.updatedAt = failedAt;
           return [undefined, state] as const;
         });
 @@ -1457,7 +1474,7 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
           type: "error",
           threadId: session.threadId,
           terminalId: session.terminalId,
-          createdAt: new Date().toISOString(),
+          createdAt: failedAt,
           message,
         });
         yield* Effect.logError("failed to start terminal", {
 @@ -1529,6 +1546,7 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
           return;
         }
+        const updatedAt = yield* nowIso;
         const event = yield* modifyManagerState((state) => {
           const liveSession: Option.Option<TerminalSessionState> = Option.fromNullishOr(
             state.sessions.get(toSessionKey(session.threadId, session.terminalId)),
 @@ -1543,14 +1561,14 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
           }
           liveSession.value.hasRunningSubprocess = hasRunningSubprocess.value;
-          liveSession.value.updatedAt = new Date().toISOString();
+          liveSession.value.updatedAt = updatedAt;
           return [
             Option.some({
               type: "activity" as const,
               threadId: liveSession.value.threadId,
               terminalId: liveSession.value.terminalId,
-              createdAt: new Date().toISOString(),
+              createdAt: updatedAt,
               hasRunningSubprocess: hasRunningSubprocess.value,
             }),
             state,
 @@ -1629,6 +1647,7 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
             const history = yield* readHistory(input.threadId, terminalId);
             const cols = input.cols ?? DEFAULT_OPEN_COLS;
             const rows = input.rows ?? DEFAULT_OPEN_ROWS;
+            const createdAt = yield* nowIso;
             const session: TerminalSessionState = {
               threadId: input.threadId,
               terminalId,
 @@ -1643,7 +1662,7 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
               processEventDrainRunning: false,
               exitCode: null,
               exitSignal: null,
-              updatedAt: new Date().toISOString(),
+              updatedAt: createdAt,
               cols,
               rows,
               process: null,
 @@ -1734,7 +1753,7 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
           if (liveSession.cols !== targetCols || liveSession.rows !== targetRows) {
             liveSession.cols = targetCols;
             liveSession.rows = targetRows;
-            liveSession.updatedAt = new Date().toISOString();
+            liveSession.updatedAt = yield* nowIso;
             liveSession.process.resize(targetCols, targetRows);
           }
 @@ -1768,7 +1787,7 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
       }
       session.cols = input.cols;
       session.rows = input.rows;
-      session.updatedAt = new Date().toISOString();
+      session.updatedAt = yield* nowIso;
       yield* Effect.sync(() => process.resize(input.cols, input.rows));
     });
 @@ -1783,13 +1802,14 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
           session.pendingProcessEvents = [];
           session.pendingProcessEventIndex = 0;
           session.processEventDrainRunning = false;
-          session.updatedAt = new Date().toISOString();
+          const clearedAt = yield* nowIso;
+          session.updatedAt = clearedAt;
           yield* persistHistory(input.threadId, terminalId, session.history);
           yield* publishEvent({
             type: "cleared",
             threadId: input.threadId,
             terminalId,
-            createdAt: new Date().toISOString(),
+            createdAt: clearedAt,
           });
         }),
       );
 @@ -1808,6 +1828,7 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
           if (Option.isNone(existingSession)) {
             const cols = input.cols ?? DEFAULT_OPEN_COLS;
             const rows = input.rows ?? DEFAULT_OPEN_ROWS;
+            const createdAt = yield* nowIso;
             session = {
               threadId: input.threadId,
               terminalId,
 @@ -1822,7 +1843,7 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
               processEventDrainRunning: false,
               exitCode: null,
               exitSignal: null,
-              updatedAt: new Date().toISOString(),
+              updatedAt: createdAt,
               cols,
               rows,
               process: null,

apps/server/src/terminal/Layers/NodePTY.test.ts+3-1

...	@@ -1,4 +1,6 @@	...	@@ -1,4 +1,6 @@
1	import { FileSystem, Path, Effect } from "effect";	1	import * as FileSystem from "effect/FileSystem";
		2	import * as Path from "effect/Path";
		3	import * as Effect from "effect/Effect";
2	import { assert, it } from "@effect/vitest";	4	import { assert, it } from "@effect/vitest";
3		5
4	import { ensureNodePtySpawnHelperExecutable } from "./NodePTY.ts";	6	import { ensureNodePtySpawnHelperExecutable } from "./NodePTY.ts";

apps/server/src/terminal/Layers/NodePTY.ts+4-1

 @@ -1,6 +1,9 @@
 import { createRequire } from "node:module";
-import { Effect, FileSystem, Layer, Path } from "effect";
+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 { PtyAdapter } from "../Services/PTY.ts";
 import {
   PtySpawnError,

apps/server/src/terminal/Services/Manager.ts+2-1

...	@@ -23,7 +23,8 @@ import {	...	@@ -23,7 +23,8 @@ import {
23	TerminalWriteInput,	23	TerminalWriteInput,
24	} from "@t3tools/contracts";	24	} from "@t3tools/contracts";
25	import type { PtyProcess } from "./PTY.ts";	25	import type { PtyProcess } from "./PTY.ts";
26	import { Effect, Context } from "effect";	26	import * as Effect from "effect/Effect";
		27	import * as Context from "effect/Context";
27		28
28	export {	29	export {
29	TerminalCwdError,	30	TerminalCwdError,

apps/server/src/terminal/Services/PTY.ts+3-1

 @@ -6,7 +6,9 @@
  *
  * @module PtyAdapter
  */
-import { Effect, Schema, Context } from "effect";
+import * as Effect from "effect/Effect";
+import * as Schema from "effect/Schema";
+import * as Context from "effect/Context";
 /**
  * PtyError - Error type for PTY adapter operations.

apps/server/src/textGeneration/ClaudeTextGeneration.test.ts+6-1

 @@ -1,7 +1,11 @@
 import { ClaudeSettings, ProviderInstanceId } from "@t3tools/contracts";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { it } from "@effect/vitest";
-import { Effect, FileSystem, Layer, Path, Schema } from "effect";
+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 Schema from "effect/Schema";
 import { createModelSelection } from "@t3tools/shared/model";
 import { expect } from "vitest";
 @@ -287,6 +291,7 @@ it.layer(ClaudeTextGenerationTestLayer)("ClaudeTextGeneration", (it) => {
       const claudeHome = path.join(process.cwd(), ".claude-work-test");
       return yield* withFakeClaudeEnv(
         {
+          // @effect-diagnostics-next-line preferSchemaOverJson:off
           output: JSON.stringify({
             structured_output: {
               title: "Use Claude home",

apps/server/src/textGeneration/ClaudeTextGeneration.ts+10-3

 @@ -7,7 +7,10 @@
  *
  * @module ClaudeTextGeneration
  */
-import { Effect, Option, Schema, Stream } from "effect";
+import * as Effect from "effect/Effect";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
+import * as Stream from "effect/Stream";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 import { type ClaudeSettings, type ModelSelection } from "@t3tools/contracts";
 @@ -93,7 +96,9 @@ export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(fu
     outputSchemaJson: S;
     modelSelection: ModelSelection;
   }): Effect.fn.Return<S["Type"], TextGenerationError, S["DecodingServices"]> {
-    const jsonSchemaStr = JSON.stringify(toJsonSchemaObject(outputSchemaJson));
+    const jsonSchemaStr = Schema.encodeUnknownSync(Schema.UnknownFromJsonString)(
+      toJsonSchemaObject(outputSchemaJson),
+    );
     const caps = getClaudeModelCapabilities(modelSelection.model);
     const descriptors = getProviderOptionDescriptors({
       caps,
 @@ -126,7 +131,9 @@ export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(fu
           "--model",
           resolveClaudeApiModelId(modelSelection),
           ...(cliEffort ? ["--effort", cliEffort] : []),
-          ...(Object.keys(settings).length > 0 ? ["--settings", JSON.stringify(settings)] : []),
+          ...(Object.keys(settings).length > 0
+            ? ["--settings", Schema.encodeUnknownSync(Schema.UnknownFromJsonString)(settings)]
+            : []),
           "--dangerously-skip-permissions",
         ],
         {

apps/server/src/textGeneration/CodexTextGeneration.test.ts+15-5

apps/server/src/textGeneration/CodexTextGeneration.ts+9-2

 @@ -1,4 +1,11 @@
-import { Effect, FileSystem, Option, Path, Random, Schema, Scope, Stream } from "effect";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Option from "effect/Option";
+import * as Path from "effect/Path";
+import * as Random from "effect/Random";
+import * as Schema from "effect/Schema";
+import * as Scope from "effect/Scope";
+import * as Stream from "effect/Stream";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 import { type CodexSettings, type ModelSelection } from "@t3tools/contracts";
 @@ -152,7 +159,7 @@ export const makeCodexTextGeneration = Effect.fn("makeCodexTextGeneration")(func
     const schemaPath = yield* writeTempFile(
       operation,
       "codex-schema",
-      JSON.stringify(toJsonSchemaObject(outputSchemaJson)),
+      Schema.encodeUnknownSync(Schema.UnknownFromJsonString)(toJsonSchemaObject(outputSchemaJson)),
     );
     const outputPath = yield* writeTempFile(operation, "codex-output", "");

apps/server/src/textGeneration/CursorTextGeneration.test.ts+16-9

 @@ -1,3 +1,4 @@
+// @effect-diagnostics nodeBuiltinImport:off
 import * as path from "node:path";
 import * as os from "node:os";
 import { fileURLToPath } from "node:url";
 @@ -5,7 +6,11 @@ import { chmodSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { it } from "@effect/vitest";
-import { Effect, Layer, Schema } from "effect";
+import * as Clock from "effect/Clock";
+import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
+import * as Layer from "effect/Layer";
+import * as Schema from "effect/Schema";
 import { createModelSelection } from "@t3tools/shared/model";
 import { expect } from "vitest";
 @@ -67,17 +72,19 @@ function withFakeAcpAgent<A, E, R>(
 }
 function waitForFileContent(path: string): Effect.Effect<string> {
-  return Effect.promise(async () => {
+  return Effect.gen(function* () {
-    const deadline = Date.now() + 5_000;
+    const deadline = (yield* Clock.currentTimeMillis) + 5_000;
     for (;;) {
-      try {
+      const result = yield* Effect.exit(Effect.sync(() => readFileSync(path, "utf8")));
-        return readFileSync(path, "utf8");
+      if (Exit.isSuccess(result)) {
-      } catch (error) {
+        return result.value;
-        if (Date.now() >= deadline) {
+      }
-          throw error instanceof Error ? error : new Error(String(error));
+      {
+        if ((yield* Clock.currentTimeMillis) >= deadline) {
+          return yield* Effect.die(result.cause);
         }
       }
-      await new Promise((resolve) => setTimeout(resolve, 25));
+      yield* Effect.sleep(25);
     }
   });
 }

apps/server/src/textGeneration/CursorTextGeneration.ts+4-1

...	@@ -1,4 +1,7 @@	...	@@ -1,4 +1,7 @@
1	import { Effect, Option, Ref, Schema } from "effect";	1	import * as Effect from "effect/Effect";
		2	import * as Option from "effect/Option";
		3	import * as Ref from "effect/Ref";
		4	import * as Schema from "effect/Schema";
2	import { ChildProcessSpawner } from "effect/unstable/process";	5	import { ChildProcessSpawner } from "effect/unstable/process";
3		6
4	import { type CursorSettings, type ModelSelection } from "@t3tools/contracts";	7	import { type CursorSettings, type ModelSelection } from "@t3tools/contracts";

apps/server/src/textGeneration/OpenCodeTextGeneration.test.ts+6-3

 @@ -1,9 +1,12 @@
 import { OpenCodeSettings, ProviderInstanceId } from "@t3tools/contracts";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { it } from "@effect/vitest";
-import { Duration, Effect, Layer, Schema } from "effect";
+import * as Duration from "effect/Duration";
-import { TestClock } from "effect/testing";
+import * as Effect from "effect/Effect";
-import { NetService } from "@t3tools/shared/Net";
+import * as Layer from "effect/Layer";
+import * as Schema from "effect/Schema";
+import * as TestClock from "effect/testing/TestClock";
+import * as NetService from "@t3tools/shared/Net";
 import { beforeEach, expect } from "vitest";
 import { ServerConfig } from "../config.ts";

apps/server/src/textGeneration/OpenCodeTextGeneration.ts+5-1

...	@@ -1,4 +1,8 @@	...	@@ -1,4 +1,8 @@
1	import { Effect, Exit, Fiber, Schema, Scope } from "effect";	1	import * as Effect from "effect/Effect";
		2	import * as Exit from "effect/Exit";
		3	import * as Fiber from "effect/Fiber";
		4	import * as Schema from "effect/Schema";
		5	import * as Scope from "effect/Scope";
2	import * as Semaphore from "effect/Semaphore";	6	import * as Semaphore from "effect/Semaphore";
3		7
4	import {	8	import {

apps/server/src/textGeneration/TextGeneration.test.ts+4-1

...	@@ -1,5 +1,8 @@	...	@@ -1,5 +1,8 @@
1	import { it } from "@effect/vitest";	1	import { it } from "@effect/vitest";
2	import { Effect, PubSub, Result, Stream } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as PubSub from "effect/PubSub";
		4	import * as Result from "effect/Result";
		5	import * as Stream from "effect/Stream";
3	import { describe, expect } from "vitest";	6	import { describe, expect } from "vitest";
4		7
5	import { ProviderInstanceId } from "@t3tools/contracts";	8	import { ProviderInstanceId } from "@t3tools/contracts";

apps/server/src/textGeneration/TextGeneration.ts+3-1

...	@@ -1,4 +1,6 @@	...	@@ -1,4 +1,6 @@
1	import { Context, Effect, Layer } from "effect";	1	import * as Context from "effect/Context";
		2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
2	import type { ChatAttachment, ModelSelection, ProviderInstanceId } from "@t3tools/contracts";	4	import type { ChatAttachment, ModelSelection, ProviderInstanceId } from "@t3tools/contracts";
3	import { TextGenerationError } from "@t3tools/contracts";	5	import { TextGenerationError } from "@t3tools/contracts";
4		6

apps/server/src/textGeneration/TextGenerationPolicy.ts+1-1

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	import { Schema } from "effect";	1	import * as Schema from "effect/Schema";
2		2
3	export const TextGenerationPolicyKind = Schema.Literals([	3	export const TextGenerationPolicyKind = Schema.Literals([
4	"default",	4	"default",

apps/server/src/textGeneration/TextGenerationPrompts.ts+1-1

...	@@ -6,7 +6,7 @@	...	@@ -6,7 +6,7 @@
6	*	6	*
7	* @module textGenerationPrompts	7	* @module textGenerationPrompts
8	*/	8	*/
9	import { Schema } from "effect";	9	import * as Schema from "effect/Schema";
10	import type { ChatAttachment } from "@t3tools/contracts";	10	import type { ChatAttachment } from "@t3tools/contracts";
11		11
12	import { limitSection } from "./TextGenerationUtils.ts";	12	import { limitSection } from "./TextGenerationUtils.ts";

apps/server/src/textGeneration/TextGenerationUtils.ts+1-1

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	import { Schema } from "effect";	1	import * as Schema from "effect/Schema";
2		2
3	import { TextGenerationError } from "@t3tools/contracts";	3	import { TextGenerationError } from "@t3tools/contracts";
4		4

apps/server/src/vcs/GitVcsDriver.test.ts+5-1

 @@ -1,5 +1,9 @@
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import { Effect, FileSystem, Layer, Path, PlatformError } from "effect";
+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 PlatformError from "effect/PlatformError";
 import { ChildProcessSpawner } from "effect/unstable/process";
 import { assert, it } from "@effect/vitest";

apps/server/src/vcs/GitVcsDriver.ts+5-1

...	@@ -1,4 +1,8 @@	...	@@ -1,4 +1,8 @@
1	import { Context, DateTime, Effect, Layer, Option } from "effect";	1	import * as Context from "effect/Context";
		2	import * as DateTime from "effect/DateTime";
		3	import * as Effect from "effect/Effect";
		4	import * as Layer from "effect/Layer";
		5	import * as Option from "effect/Option";
2	import { ChildProcessSpawner } from "effect/unstable/process";	6	import { ChildProcessSpawner } from "effect/unstable/process";
3		7
4	import {	8	import {

apps/server/src/vcs/GitVcsDriverCore.test.ts+6-1

 @@ -1,6 +1,11 @@
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, it, describe } from "@effect/vitest";
-import { Effect, FileSystem, Layer, Path, PlatformError, Scope } from "effect";
+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 PlatformError from "effect/PlatformError";
+import * as Scope from "effect/Scope";
 import { GitCommandError } from "@t3tools/contracts";
 import { ServerConfig } from "../config.ts";

apps/server/src/vcs/GitVcsDriverCore.ts+16-18

...	@@ -1,21 +1,19 @@	...	@@ -1,21 +1,19 @@
1	import {	1	import * as Cache from "effect/Cache";
2	Cache,	2	import * as Data from "effect/Data";
3	Data,	3	import * as DateTime from "effect/DateTime";
4	DateTime,	4	import * as Duration from "effect/Duration";
5	Duration,	5	import * as Effect from "effect/Effect";
6	Effect,	6	import * as Exit from "effect/Exit";
7	Exit,	7	import * as FileSystem from "effect/FileSystem";
8	FileSystem,	8	import * as Option from "effect/Option";
9	Option,	9	import * as Path from "effect/Path";
10	Path,	10	import * as PlatformError from "effect/PlatformError";
11	PlatformError,	11	import * as Ref from "effect/Ref";
12	Ref,	12	import * as Result from "effect/Result";
13	Result,	13	import * as Schema from "effect/Schema";
14	Schema,	14	import * as Scope from "effect/Scope";
15	Scope,	15	import * as Semaphore from "effect/Semaphore";
16	Semaphore,	16	import * as Stream from "effect/Stream";
17	Stream,
18	} from "effect";
19	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";	17	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
20		18
21	import { GitCommandError, type VcsRef } from "@t3tools/contracts";	19	import { GitCommandError, type VcsRef } from "@t3tools/contracts";

apps/server/src/vcs/VcsDriver.ts+2-1

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	import { Context, type Effect } from "effect";	1	import * as Context from "effect/Context";
		2	import type * as Effect from "effect/Effect";
2		3
3	import type {	4	import type {
4	VcsDriverCapabilities,	5	VcsDriverCapabilities,

apps/server/src/vcs/VcsDriverRegistry.test.ts+2-1

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	import { assert, it, describe } from "@effect/vitest";	1	import { assert, it, describe } from "@effect/vitest";
2	import { Effect, Layer } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
3	import { ChildProcessSpawner } from "effect/unstable/process";	4	import { ChildProcessSpawner } from "effect/unstable/process";
4		5
5	import * as VcsProcess from "./VcsProcess.ts";	6	import * as VcsProcess from "./VcsProcess.ts";

apps/server/src/vcs/VcsDriverRegistry.ts+6-1

...	@@ -1,4 +1,9 @@	...	@@ -1,4 +1,9 @@
1	import { Cache, Context, Duration, Effect, Exit, Layer } from "effect";	1	import * as Cache from "effect/Cache";
		2	import * as Context from "effect/Context";
		3	import * as Duration from "effect/Duration";
		4	import * as Effect from "effect/Effect";
		5	import * as Exit from "effect/Exit";
		6	import * as Layer from "effect/Layer";
2		7
3	import type { VcsDriverKind, VcsError, VcsRepositoryIdentity } from "@t3tools/contracts";	8	import type { VcsDriverKind, VcsError, VcsRepositoryIdentity } from "@t3tools/contracts";
4	import { VcsUnsupportedOperationError } from "@t3tools/contracts";	9	import { VcsUnsupportedOperationError } from "@t3tools/contracts";

apps/server/src/vcs/VcsProcess.ts+8-1

...	@@ -1,4 +1,11 @@	...	@@ -1,4 +1,11 @@
1	import { Duration, Context, Effect, Layer, Option, PlatformError, Sink, Stream } from "effect";	1	import * as Duration from "effect/Duration";
		2	import * as Context from "effect/Context";
		3	import * as Effect from "effect/Effect";
		4	import * as Layer from "effect/Layer";
		5	import * as Option from "effect/Option";
		6	import * as PlatformError from "effect/PlatformError";
		7	import * as Sink from "effect/Sink";
		8	import * as Stream from "effect/Stream";
2	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";	9	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
3		10
4	import {	11	import {

apps/server/src/vcs/VcsProjectConfig.test.ts+5-1

...	@@ -1,6 +1,9 @@	...	@@ -1,6 +1,9 @@
1	import { assert, it, describe } from "@effect/vitest";	1	import { assert, it, describe } from "@effect/vitest";
2	import * as NodeServices from "@effect/platform-node/NodeServices";	2	import * as NodeServices from "@effect/platform-node/NodeServices";
3	import { Effect, FileSystem, Layer, Path } from "effect";	3	import * as Effect from "effect/Effect";
		4	import * as FileSystem from "effect/FileSystem";
		5	import * as Layer from "effect/Layer";
		6	import * as Path from "effect/Path";
4		7
5	import * as VcsProjectConfig from "./VcsProjectConfig.ts";	8	import * as VcsProjectConfig from "./VcsProjectConfig.ts";
6		9
...	@@ -38,6 +41,7 @@ describe("VcsProjectConfig", () => {	...	@@ -38,6 +41,7 @@ describe("VcsProjectConfig", () => {
38	yield* fileSystem.makeDirectory(nested, { recursive: true });	41	yield* fileSystem.makeDirectory(nested, { recursive: true });
39	yield* fileSystem.writeFileString(	42	yield* fileSystem.writeFileString(
40	path.join(configDir, "vcs.json"),	43	path.join(configDir, "vcs.json"),
		44	// @effect-diagnostics-next-line preferSchemaOverJson:off
41	JSON.stringify({ vcs: { kind: "jj" } }),	45	JSON.stringify({ vcs: { kind: "jj" } }),
42	);	46	);
43		47

apps/server/src/vcs/VcsProjectConfig.ts+6-1

...	@@ -1,4 +1,9 @@	...	@@ -1,4 +1,9 @@
1	import { Context, Effect, FileSystem, Layer, Path, Schema } from "effect";	1	import * as Context from "effect/Context";
		2	import * as Effect from "effect/Effect";
		3	import * as FileSystem from "effect/FileSystem";
		4	import * as Layer from "effect/Layer";
		5	import * as Path from "effect/Path";
		6	import * as Schema from "effect/Schema";
2		7
3	import { VcsDriverKind, type VcsDriverKind as VcsDriverKindType } from "@t3tools/contracts";	8	import { VcsDriverKind, type VcsDriverKind as VcsDriverKindType } from "@t3tools/contracts";
4		9

apps/server/src/vcs/VcsProvisioningService.test.ts+4-1

...	@@ -1,5 +1,8 @@	...	@@ -1,5 +1,8 @@
1	import { assert, it } from "@effect/vitest";	1	import { assert, it } from "@effect/vitest";
2	import { DateTime, Effect, Layer, Option } from "effect";	2	import * as DateTime from "effect/DateTime";
		3	import * as Effect from "effect/Effect";
		4	import * as Layer from "effect/Layer";
		5	import * as Option from "effect/Option";
3	import { ChildProcessSpawner } from "effect/unstable/process";	6	import { ChildProcessSpawner } from "effect/unstable/process";
4		7
5	import * as VcsDriver from "./VcsDriver.ts";	8	import * as VcsDriver from "./VcsDriver.ts";

apps/server/src/vcs/VcsProvisioningService.ts+3-1

...	@@ -1,4 +1,6 @@	...	@@ -1,4 +1,6 @@
1	import { Context, Effect, Layer } from "effect";	1	import * as Context from "effect/Context";
		2	import * as Effect from "effect/Effect";
		3	import * as Layer from "effect/Layer";
2		4
3	import {	5	import {
4	type VcsDriverKind,	6	type VcsDriverKind,

apps/server/src/vcs/VcsStatusBroadcaster.test.ts+13-2

...	@@ -1,6 +1,14 @@	...	@@ -1,6 +1,14 @@
1	import { assert, it, describe } from "@effect/vitest";	1	import { assert, it, describe } from "@effect/vitest";
2	import * as NodeServices from "@effect/platform-node/NodeServices";	2	import * as NodeServices from "@effect/platform-node/NodeServices";
3	import { Deferred, Effect, Exit, FileSystem, Layer, Option, Path, Scope, Stream } from "effect";	3	import * as Deferred from "effect/Deferred";
		4	import * as Effect from "effect/Effect";
		5	import * as Exit from "effect/Exit";
		6	import * as FileSystem from "effect/FileSystem";
		7	import * as Layer from "effect/Layer";
		8	import * as Option from "effect/Option";
		9	import * as Path from "effect/Path";
		10	import * as Scope from "effect/Scope";
		11	import * as Stream from "effect/Stream";
4	import type {	12	import type {
5	VcsStatusLocalResult,	13	VcsStatusLocalResult,
6	VcsStatusRemoteResult,	14	VcsStatusRemoteResult,
...	@@ -46,6 +54,7 @@ function makeTestLayer(state: {	...	@@ -46,6 +54,7 @@ function makeTestLayer(state: {
46	remoteInvalidationCalls: number;	54	remoteInvalidationCalls: number;
47	}) {	55	}) {
48	return VcsStatusBroadcaster.layer.pipe(	56	return VcsStatusBroadcaster.layer.pipe(
		57	Layer.provideMerge(NodeServices.layer),
49	Layer.provide(	58	Layer.provide(
50	Layer.mock(GitWorkflowService.GitWorkflowService)({	59	Layer.mock(GitWorkflowService.GitWorkflowService)({
51	localStatus: () =>	60	localStatus: () =>
...	@@ -185,6 +194,7 @@ describe("VcsStatusBroadcaster", () => {	...	@@ -185,6 +194,7 @@ describe("VcsStatusBroadcaster", () => {
185	remoteInvalidationCalls: 0,	194	remoteInvalidationCalls: 0,
186	};	195	};
187	const testLayer = VcsStatusBroadcaster.layer.pipe(	196	const testLayer = VcsStatusBroadcaster.layer.pipe(
		197	Layer.provideMerge(NodeServices.layer),
188	Layer.provide(	198	Layer.provide(
189	Layer.mock(GitWorkflowService.GitWorkflowService)({	199	Layer.mock(GitWorkflowService.GitWorkflowService)({
190	localStatus: (input) =>	200	localStatus: (input) =>
...	@@ -231,7 +241,7 @@ describe("VcsStatusBroadcaster", () => {	...	@@ -231,7 +241,7 @@ describe("VcsStatusBroadcaster", () => {
231	assert.deepStrictEqual(seenCwds, [realPath, realPath]);	241	assert.deepStrictEqual(seenCwds, [realPath, realPath]);
232	assert.equal(state.localStatusCalls, 1);	242	assert.equal(state.localStatusCalls, 1);
233	assert.equal(state.remoteStatusCalls, 1);	243	assert.equal(state.remoteStatusCalls, 1);
234	}).pipe(Effect.provide(Layer.mergeAll(testLayer, NodeServices.layer)));	244	}).pipe(Effect.provide(testLayer));
235	});	245	});
236		246
237	it.effect("streams a local snapshot first and remote updates later", () => {	247	it.effect("streams a local snapshot first and remote updates later", () => {
...	@@ -286,6 +296,7 @@ describe("VcsStatusBroadcaster", () => {	...	@@ -286,6 +296,7 @@ describe("VcsStatusBroadcaster", () => {
286	let remoteInterruptedDeferred: Deferred.Deferred<void, never> \| null = null;	296	let remoteInterruptedDeferred: Deferred.Deferred<void, never> \| null = null;
287	let remoteStartedDeferred: Deferred.Deferred<void, never> \| null = null;	297	let remoteStartedDeferred: Deferred.Deferred<void, never> \| null = null;
288	const testLayer = VcsStatusBroadcaster.layer.pipe(	298	const testLayer = VcsStatusBroadcaster.layer.pipe(
		299	Layer.provideMerge(NodeServices.layer),
289	Layer.provide(	300	Layer.provide(
290	Layer.mock(GitWorkflowService.GitWorkflowService)({	301	Layer.mock(GitWorkflowService.GitWorkflowService)({
291	localStatus: () =>	302	localStatus: () =>

apps/server/src/vcs/VcsStatusBroadcaster.ts+24-26

...	@@ -1,18 +1,15 @@	...	@@ -1,18 +1,15 @@
1	import { realpathSync } from "node:fs";	1	import * as Context from "effect/Context";
2		2	import * as Duration from "effect/Duration";
3	import {	3	import * as Effect from "effect/Effect";
4	Context,	4	import * as Exit from "effect/Exit";
5	Duration,	5	import * as Fiber from "effect/Fiber";
6	Effect,	6	import * as FileSystem from "effect/FileSystem";
7	Exit,	7	import * as Layer from "effect/Layer";
8	Fiber,	8	import * as PubSub from "effect/PubSub";
9	Layer,	9	import * as Ref from "effect/Ref";
10	PubSub,	10	import * as Scope from "effect/Scope";
11	Ref,	11	import * as Stream from "effect/Stream";
12	Scope,	12	import * as SynchronizedRef from "effect/SynchronizedRef";
13	Stream,
14	SynchronizedRef,
15	} from "effect";
16	import type {	13	import type {
17	GitManagerServiceError,	14	GitManagerServiceError,
18	VcsStatusInput,	15	VcsStatusInput,
...	@@ -69,18 +66,17 @@ function fingerprintStatusPart(status: unknown): string {	...	@@ -69,18 +66,17 @@ function fingerprintStatusPart(status: unknown): string {
69	return JSON.stringify(status);	66	return JSON.stringify(status);
70	}	67	}
71		68
72	function normalizeCwd(cwd: string): string {	69	const normalizeCwd = (cwd: string) =>
73	try {	70	Effect.service(FileSystem.FileSystem).pipe(
74	return realpathSync.native(cwd);	71	Effect.flatMap((fs) => fs.realPath(cwd)),
75	} catch {	72	Effect.orElseSucceed(() => cwd),
76	return cwd;	73	);
77	}
78	}
79		74
80	export const layer = Layer.effect(	75	export const layer = Layer.effect(
81	VcsStatusBroadcaster,	76	VcsStatusBroadcaster,
82	Effect.gen(function* () {	77	Effect.gen(function* () {
83	const workflow = yield* GitWorkflowService.GitWorkflowService;	78	const workflow = yield* GitWorkflowService.GitWorkflowService;
		79	const fs = yield* FileSystem.FileSystem;
84	const changesPubSub = yield* Effect.acquireRelease(	80	const changesPubSub = yield* Effect.acquireRelease(
85	PubSub.unbounded<VcsStatusChange>(),	81	PubSub.unbounded<VcsStatusChange>(),
86	(pubsub) => PubSub.shutdown(pubsub),	82	(pubsub) => PubSub.shutdown(pubsub),
...	@@ -195,10 +191,12 @@ export const layer = Layer.effect(	...	@@ -195,10 +191,12 @@ export const layer = Layer.effect(
195	},	191	},
196	);	192	);
197		193
		194	const withFileSystem = Effect.provideService(FileSystem.FileSystem, fs);
		195
198	const getStatus: VcsStatusBroadcasterShape["getStatus"] = Effect.fn(	196	const getStatus: VcsStatusBroadcasterShape["getStatus"] = Effect.fn(
199	"VcsStatusBroadcaster.getStatus",	197	"VcsStatusBroadcaster.getStatus",
200	)(function* (input) {	198	)(function* (input) {
201	const cwd = normalizeCwd(input.cwd);	199	const cwd = yield* withFileSystem(normalizeCwd(input.cwd));
202	const [local, remote] = yield* Effect.all([	200	const [local, remote] = yield* Effect.all([
203	getOrLoadLocalStatus(cwd),	201	getOrLoadLocalStatus(cwd),
204	getOrLoadRemoteStatus(cwd),	202	getOrLoadRemoteStatus(cwd),
...	@@ -209,7 +207,7 @@ export const layer = Layer.effect(	...	@@ -209,7 +207,7 @@ export const layer = Layer.effect(
209	const refreshLocalStatus: VcsStatusBroadcasterShape["refreshLocalStatus"] = Effect.fn(	207	const refreshLocalStatus: VcsStatusBroadcasterShape["refreshLocalStatus"] = Effect.fn(
210	"VcsStatusBroadcaster.refreshLocalStatus",	208	"VcsStatusBroadcaster.refreshLocalStatus",
211	)(function* (rawCwd) {	209	)(function* (rawCwd) {
212	const cwd = normalizeCwd(rawCwd);	210	const cwd = yield* withFileSystem(normalizeCwd(rawCwd));
213	yield* workflow.invalidateLocalStatus(cwd);	211	yield* workflow.invalidateLocalStatus(cwd);
214	const local = yield* workflow.localStatus({ cwd });	212	const local = yield* workflow.localStatus({ cwd });
215	return yield* updateCachedLocalStatus(cwd, local, { publish: true });	213	return yield* updateCachedLocalStatus(cwd, local, { publish: true });
...	@@ -226,7 +224,7 @@ export const layer = Layer.effect(	...	@@ -226,7 +224,7 @@ export const layer = Layer.effect(
226	const refreshStatus: VcsStatusBroadcasterShape["refreshStatus"] = Effect.fn(	224	const refreshStatus: VcsStatusBroadcasterShape["refreshStatus"] = Effect.fn(
227	"VcsStatusBroadcaster.refreshStatus",	225	"VcsStatusBroadcaster.refreshStatus",
228	)(function* (rawCwd) {	226	)(function* (rawCwd) {
229	const cwd = normalizeCwd(rawCwd);	227	const cwd = yield* withFileSystem(normalizeCwd(rawCwd));
230	const [local, remote] = yield* Effect.all([	228	const [local, remote] = yield* Effect.all([
231	refreshLocalStatus(cwd),	229	refreshLocalStatus(cwd),
232	refreshRemoteStatus(cwd),	230	refreshRemoteStatus(cwd),
...	@@ -312,7 +310,7 @@ export const layer = Layer.effect(	...	@@ -312,7 +310,7 @@ export const layer = Layer.effect(
312	const streamStatus: VcsStatusBroadcasterShape["streamStatus"] = (input) =>	310	const streamStatus: VcsStatusBroadcasterShape["streamStatus"] = (input) =>
313	Stream.unwrap(	311	Stream.unwrap(
314	Effect.gen(function* () {	312	Effect.gen(function* () {
315	const cwd = normalizeCwd(input.cwd);	313	const cwd = yield* withFileSystem(normalizeCwd(input.cwd));
316	const subscription = yield* PubSub.subscribe(changesPubSub);	314	const subscription = yield* PubSub.subscribe(changesPubSub);
317	const initialLocal = yield* getOrLoadLocalStatus(cwd);	315	const initialLocal = yield* getOrLoadLocalStatus(cwd);
318	const initialRemote = (yield* getCachedStatus(cwd))?.remote?.value ?? null;	316	const initialRemote = (yield* getCachedStatus(cwd))?.remote?.value ?? null;

apps/server/src/vcs/testing/VcsDriverContractHarness.ts+8-10

...	@@ -1,14 +1,12 @@	...	@@ -1,14 +1,12 @@
1	import { assert, it, describe } from "@effect/vitest";	1	import { assert, it, describe } from "@effect/vitest";
2	import {	2	import * as Effect from "effect/Effect";
3	Effect,	3	import * as FileSystem from "effect/FileSystem";
4	FileSystem,	4	import * as Layer from "effect/Layer";
5	Layer,	5	import * as Path from "effect/Path";
6	Path,	6	import type * as PlatformError from "effect/PlatformError";
7	type PlatformError,	7	import type * as Scope from "effect/Scope";
8	type Scope,	8	import * as DateTime from "effect/DateTime";
9	DateTime,	9	import * as Option from "effect/Option";
10	Option,
11	} from "effect";
12		10
13	import type { VcsDriverKind } from "@t3tools/contracts";	11	import type { VcsDriverKind } from "@t3tools/contracts";
14	import * as VcsDriver from "../VcsDriver.ts";	12	import * as VcsDriver from "../VcsDriver.ts";

apps/server/src/workspace/Layers/WorkspaceEntries.test.ts+38-7

 @@ -1,8 +1,13 @@
+// @effect-diagnostics nodeBuiltinImport:off
 import fsPromises from "node:fs/promises";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { it, afterEach, describe, expect, vi } from "@effect/vitest";
-import { Effect, FileSystem, Layer, Path, PlatformError } from "effect";
+import * as Effect from "effect/Effect";
+import * as Fiber from "effect/Fiber";
+import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
+import * as Path from "effect/Path";
+import * as PlatformError from "effect/PlatformError";
 import { ServerConfig } from "../../config.ts";
 import * as VcsDriverRegistry from "../../vcs/VcsDriverRegistry.ts";
 @@ -222,25 +227,37 @@ it.layer(TestLayer)("WorkspaceEntriesLive", (it) => {
         yield* writeTextFile(cwd, "src/components/Composer.tsx");
         let rootReadCount = 0;
+        let releaseRootRead: (() => void) | undefined;
+        const rootReadGate = new Promise<void>((resolve) => {
+          releaseRootRead = resolve;
+        });
         const originalReaddir = fsPromises.readdir.bind(fsPromises);
         vi.spyOn(fsPromises, "readdir").mockImplementation((async (
           ...args: Parameters<typeof fsPromises.readdir>
         ) => {
           if (args[0] === cwd) {
             rootReadCount += 1;
-            await new Promise((resolve) => setTimeout(resolve, 20));
+            await rootReadGate;
           }
           return originalReaddir(...args);
         }) as typeof fsPromises.readdir);
-        yield* Effect.all(
+        const searches = yield* Effect.all(
           [
             searchWorkspaceEntries({ cwd, query: "", limit: 100 }),
             searchWorkspaceEntries({ cwd, query: "comp", limit: 100 }),
             searchWorkspaceEntries({ cwd, query: "src", limit: 100 }),
           ],
           { concurrency: "unbounded" },
-        );
+        ).pipe(Effect.forkScoped);
+        for (let attempt = 0; attempt < 50; attempt += 1) {
+          if (rootReadCount > 0) {
+            break;
+          }
+          yield* Effect.yieldNow;
+        }
+        releaseRootRead?.();
+        yield* Fiber.join(searches);
         expect(rootReadCount).toBe(1);
       }),
 @@ -257,6 +274,10 @@ it.layer(TestLayer)("WorkspaceEntriesLive", (it) => {
         let activeReads = 0;
         let peakReads = 0;
+        let releaseReads: (() => void) | undefined;
+        const readsGate = new Promise<void>((resolve) => {
+          releaseReads = resolve;
+        });
         const originalReaddir = fsPromises.readdir.bind(fsPromises);
         vi.spyOn(fsPromises, "readdir").mockImplementation((async (
           ...args: Parameters<typeof fsPromises.readdir>
 @@ -265,7 +286,7 @@ it.layer(TestLayer)("WorkspaceEntriesLive", (it) => {
           if (typeof target === "string" && target.startsWith(cwd)) {
             activeReads += 1;
             peakReads = Math.max(peakReads, activeReads);
-            await new Promise((resolve) => setTimeout(resolve, 4));
+            await readsGate;
             try {
               return await originalReaddir(...args);
             } finally {
 @@ -275,7 +296,17 @@ it.layer(TestLayer)("WorkspaceEntriesLive", (it) => {
           return originalReaddir(...args);
         }) as typeof fsPromises.readdir);
-        yield* searchWorkspaceEntries({ cwd, query: "", limit: 200 });
+        const search = yield* searchWorkspaceEntries({ cwd, query: "", limit: 200 }).pipe(
+          Effect.forkScoped,
+        );
+        for (let attempt = 0; attempt < 50; attempt += 1) {
+          if (activeReads > 0) {
+            break;
+          }
+          yield* Effect.yieldNow;
+        }
+        releaseReads?.();
+        yield* Fiber.join(search);
         expect(peakReads).toBeLessThanOrEqual(32);
       }),

apps/server/src/workspace/Layers/WorkspaceEntries.ts+8-1

 @@ -1,8 +1,15 @@
+// @effect-diagnostics nodeBuiltinImport:off
 import * as OS from "node:os";
 import fsPromises from "node:fs/promises";
 import type { Dirent } from "node:fs";
-import { Cache, DateTime, Duration, Effect, Exit, Layer, Path } from "effect";
+import * as Cache from "effect/Cache";
+import * as DateTime from "effect/DateTime";
+import * as Duration from "effect/Duration";
+import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
+import * as Layer from "effect/Layer";
+import * as Path from "effect/Path";
 import { type FilesystemBrowseInput, type ProjectEntry } from "@t3tools/contracts";
 import { isExplicitRelativePath, isWindowsAbsolutePath } from "@t3tools/shared/path";

apps/server/src/workspace/Layers/WorkspaceFileSystem.test.ts+4-1

 @@ -1,6 +1,9 @@
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { it, describe, expect } from "@effect/vitest";
-import { Effect, FileSystem, Layer, Path } from "effect";
+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 { ServerConfig } from "../../config.ts";
 import * as VcsDriverRegistry from "../../vcs/VcsDriverRegistry.ts";

apps/server/src/workspace/Layers/WorkspaceFileSystem.ts+4-1

...	@@ -1,4 +1,7 @@	...	@@ -1,4 +1,7 @@
1	import { Effect, FileSystem, Layer, Path } from "effect";	1	import * as Effect from "effect/Effect";
		2	import * as FileSystem from "effect/FileSystem";
		3	import * as Layer from "effect/Layer";
		4	import * as Path from "effect/Path";
2		5
3	import {	6	import {
4	WorkspaceFileSystem,	7	WorkspaceFileSystem,

apps/server/src/workspace/Layers/WorkspacePaths.test.ts+4-1

 @@ -1,6 +1,9 @@
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { it, describe, expect } from "@effect/vitest";
-import { Effect, FileSystem, Layer, Path } from "effect";
+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 { WorkspacePaths } from "../Services/WorkspacePaths.ts";
 import { WorkspacePathsLive } from "./WorkspacePaths.ts";

apps/server/src/workspace/Layers/WorkspacePaths.ts+4-1

...	@@ -1,5 +1,8 @@	...	@@ -1,5 +1,8 @@
1	import * as OS from "node:os";	1	import * as OS from "node:os";
2	import { Effect, FileSystem, Layer, Path } from "effect";	2	import * as Effect from "effect/Effect";
		3	import * as FileSystem from "effect/FileSystem";
		4	import * as Layer from "effect/Layer";
		5	import * as Path from "effect/Path";
3		6
4	import {	7	import {
5	WorkspacePaths,	8	WorkspacePaths,

apps/server/src/workspace/Services/WorkspaceEntries.ts+3-2

 @@ -6,8 +6,9 @@
  *
  * @module WorkspaceEntries
  */
-import { Schema, Context } from "effect";
+import * as Schema from "effect/Schema";
-import type { Effect } from "effect";
+import * as Context from "effect/Context";
+import type * as Effect from "effect/Effect";
 import type {
   FilesystemBrowseInput,

apps/server/src/workspace/Services/WorkspaceFileSystem.ts+3-2

 @@ -6,8 +6,9 @@
  *
  * @module WorkspaceFileSystem
  */
-import { Schema, Context } from "effect";
+import * as Schema from "effect/Schema";
-import type { Effect } from "effect";
+import * as Context from "effect/Context";
+import type * as Effect from "effect/Effect";
 import type { ProjectWriteFileInput, ProjectWriteFileResult } from "@t3tools/contracts";
 import { WorkspacePathOutsideRootError } from "./WorkspacePaths.ts";

apps/server/src/workspace/Services/WorkspacePaths.ts+3-2

 @@ -6,8 +6,9 @@
  *
  * @module WorkspacePaths
  */
-import { Schema, Context } from "effect";
+import * as Schema from "effect/Schema";
-import type { Effect } from "effect";
+import * as Context from "effect/Context";
+import type * as Effect from "effect/Effect";
 export class WorkspaceRootNotExistsError extends Schema.TaggedErrorClass<WorkspaceRootNotExistsError>()(
   "WorkspaceRootNotExistsError",

apps/server/src/ws.ts+89-75

...	@@ -1,4 +1,13 @@	...	@@ -1,4 +1,13 @@
1	import { Cause, Duration, Effect, Layer, Option, Queue, Ref, Schema, Stream } from "effect";	1	import * as Cause from "effect/Cause";
		2	import * as DateTime from "effect/DateTime";
		3	import * as Duration from "effect/Duration";
		4	import * as Effect from "effect/Effect";
		5	import * as Layer from "effect/Layer";
		6	import * as Option from "effect/Option";
		7	import * as Queue from "effect/Queue";
		8	import * as Ref from "effect/Ref";
		9	import * as Schema from "effect/Schema";
		10	import * as Stream from "effect/Stream";
2	import {	11	import {
3	type AuthAccessStreamEvent,	12	type AuthAccessStreamEvent,
4	AuthSessionId,	13	AuthSessionId,
...	@@ -78,6 +87,8 @@ import {	...	@@ -78,6 +87,8 @@ import {
78	} from "./auth/Services/SessionCredentialService.ts";	87	} from "./auth/Services/SessionCredentialService.ts";
79	import { respondToAuthError } from "./auth/http.ts";	88	import { respondToAuthError } from "./auth/http.ts";
80		89
		90	const nowIso = Effect.map(DateTime.now, DateTime.formatIso);
		91
81	function isThreadDetailEvent(event: OrchestrationEvent): event is Extract<	92	function isThreadDetailEvent(event: OrchestrationEvent): event is Extract<
82	OrchestrationEvent,	93	OrchestrationEvent,
83	{	94	{
...	@@ -378,83 +389,86 @@ const makeWsRpcLayer = (currentSessionId: AuthSessionId) =>	...	@@ -378,83 +389,86 @@ const makeWsRpcLayer = (currentSessionId: AuthSessionId) =>
378	readonly scriptId: string;	389	readonly scriptId: string;
379	readonly scriptName: string;	390	readonly scriptName: string;
380	readonly terminalId: string;	391	readonly terminalId: string;
381	}) => {	392	}) =>
382	const payload = {	393	Effect.gen(function* () {
383	scriptId: input.scriptId,	394	const startedAt = yield* nowIso;
384	scriptName: input.scriptName,	395	const payload = {
385	terminalId: input.terminalId,	396	scriptId: input.scriptId,
386	worktreePath: input.worktreePath,	397	scriptName: input.scriptName,
387	};	398	terminalId: input.terminalId,
388	return Effect.all([	399	worktreePath: input.worktreePath,
389	appendSetupScriptActivity({	400	};
390	threadId: command.threadId,	401	yield* Effect.all([
391	kind: "setup-script.requested",	402	appendSetupScriptActivity({
392	summary: "Starting setup script",	403	threadId: command.threadId,
393	createdAt: input.requestedAt,	404	kind: "setup-script.requested",
394	payload,	405	summary: "Starting setup script",
395	tone: "info",	406	createdAt: input.requestedAt,
396	}),	407	payload,
397	appendSetupScriptActivity({	408	tone: "info",
398	threadId: command.threadId,	409	}),
399	kind: "setup-script.started",	410	appendSetupScriptActivity({
400	summary: "Setup script started",	411	threadId: command.threadId,
401	createdAt: new Date().toISOString(),	412	kind: "setup-script.started",
402	payload,	413	summary: "Setup script started",
403	tone: "info",	414	createdAt: startedAt,
404	}),	415	payload,
405	]).pipe(	416	tone: "info",
406	Effect.asVoid,	417	}),
407	Effect.catch((error) =>	418	]).pipe(
408	Effect.logWarning(	419	Effect.asVoid,
409	"bootstrap turn start launched setup script but failed to record setup activity",	420	Effect.catch((error) =>
410	{	421	Effect.logWarning(
411	threadId: command.threadId,	422	"bootstrap turn start launched setup script but failed to record setup activity",
412	worktreePath: input.worktreePath,	423	{
413	scriptId: input.scriptId,	424	threadId: command.threadId,
414	terminalId: input.terminalId,	425	worktreePath: input.worktreePath,
415	detail: error.message,	426	scriptId: input.scriptId,
416	},	427	terminalId: input.terminalId,
		428	detail: error.message,
		429	},
		430	),
417	),	431	),
418	),	432	);
419	);	433	});
420	};
421		434
422	const runSetupProgram = () =>	435	const runSetupProgram = () =>
423	bootstrap?.runSetupScript && targetWorktreePath	436	Effect.gen(function* () {
424	? (() => {	437	if (!bootstrap?.runSetupScript \|\| !targetWorktreePath) {
425	const worktreePath = targetWorktreePath;	438	return;
426	const requestedAt = new Date().toISOString();	439	}
427	return projectSetupScriptRunner	440	const worktreePath = targetWorktreePath;
428	.runForThread({	441	const requestedAt = yield* nowIso;
429	threadId: command.threadId,	442	yield* projectSetupScriptRunner
430	...(targetProjectId ? { projectId: targetProjectId } : {}),	443	.runForThread({
431	...(targetProjectCwd ? { projectCwd: targetProjectCwd } : {}),	444	threadId: command.threadId,
432	worktreePath,	445	...(targetProjectId ? { projectId: targetProjectId } : {}),
433	})	446	...(targetProjectCwd ? { projectCwd: targetProjectCwd } : {}),
434	.pipe(	447	worktreePath,
435	Effect.matchEffect({	448	})
436	onFailure: (error) =>	449	.pipe(
437	recordSetupScriptLaunchFailure({	450	Effect.matchEffect({
438	error,	451	onFailure: (error) =>
439	requestedAt,	452	recordSetupScriptLaunchFailure({
440	worktreePath,	453	error,
441	}),	454	requestedAt,
442	onSuccess: (setupResult) => {	455	worktreePath,
443	if (setupResult.status !== "started") {
444	return Effect.void;
445	}
446	return recordSetupScriptStarted({
447	requestedAt,
448	worktreePath,
449	scriptId: setupResult.scriptId,
450	scriptName: setupResult.scriptName,
451	terminalId: setupResult.terminalId,
452	});
453	},
454	}),	456	}),
455	);	457	onSuccess: (setupResult) => {
456	})()	458	if (setupResult.status !== "started") {
457	: Effect.void;	459	return Effect.void;
		460	}
		461	return recordSetupScriptStarted({
		462	requestedAt,
		463	worktreePath,
		464	scriptId: setupResult.scriptId,
		465	scriptName: setupResult.scriptName,
		466	terminalId: setupResult.terminalId,
		467	});
		468	},
		469	}),
		470	);
		471	});
458		472
459	const bootstrapProgram = Effect.gen(function* () {	473	const bootstrapProgram = Effect.gen(function* () {
460	if (bootstrap?.createThread) {	474	if (bootstrap?.createThread) {
...	@@ -597,7 +611,7 @@ const makeWsRpcLayer = (currentSessionId: AuthSessionId) =>	...	@@ -597,7 +611,7 @@ const makeWsRpcLayer = (currentSessionId: AuthSessionId) =>
597	`session-stop-for-archive:${normalizedCommand.commandId}`,	611	`session-stop-for-archive:${normalizedCommand.commandId}`,
598	),	612	),
599	threadId: normalizedCommand.threadId,	613	threadId: normalizedCommand.threadId,
600	createdAt: new Date().toISOString(),	614	createdAt: yield* nowIso,
601	});	615	});
602		616
603	yield* dispatchNormalizedCommand(stopCommand);	617	yield* dispatchNormalizedCommand(stopCommand);

apps/server/tsconfig.json+1-15

...	@@ -3,21 +3,7 @@	...	@@ -3,21 +3,7 @@
3	"compilerOptions": {	3	"compilerOptions": {
4	"composite": true,	4	"composite": true,
5	"types": ["node", "bun"],	5	"types": ["node", "bun"],
6	"lib": ["ESNext", "esnext.disposable"],	6	"lib": ["ESNext", "esnext.disposable"]
7	"plugins": [
8	{
9	"name": "@effect/language-service",
10	"namespaceImportPackages": ["@effect/platform-node"],
11	"diagnosticSeverity": {
12	"importFromBarrel": "error",
13	"anyUnknownInErrorContext": "warning",
14	"instanceOfSchema": "warning",
15	"deterministicKeys": "warning",
16	"preferSchemaOverJson": "off",
17	"globalErrorInEffectFailure": "off"
18	}
19	}
20	]
21	},	7	},
22	"include": ["src", "tsdown.config.ts", "scripts", "integration", "../../scripts/lib"]	8	"include": ["src", "tsdown.config.ts", "scripts", "integration", "../../scripts/lib"]
23	}	9	}

apps/web/src/components/BranchToolbar.logic.ts+1-1

...	@@ -1,5 +1,5 @@	...	@@ -1,5 +1,5 @@
1	import type { EnvironmentId, VcsRef, ProjectId } from "@t3tools/contracts";	1	import type { EnvironmentId, VcsRef, ProjectId } from "@t3tools/contracts";
2	import { Schema } from "effect";	2	import * as Schema from "effect/Schema";
3	export {	3	export {
4	dedupeRemoteBranchesWithLocalMatches,	4	dedupeRemoteBranchesWithLocalMatches,
5	deriveLocalBranchNameFromRemoteRef,	5	deriveLocalBranchNameFromRemoteRef,

apps/web/src/components/ChatView.browser.tsx+1-1

...	@@ -22,7 +22,7 @@ import {	...	@@ -22,7 +22,7 @@ import {
22	import { scopedThreadKey, scopeThreadRef } from "@t3tools/client-runtime";	22	import { scopedThreadKey, scopeThreadRef } from "@t3tools/client-runtime";
23	import { createModelCapabilities, createModelSelection } from "@t3tools/shared/model";	23	import { createModelCapabilities, createModelSelection } from "@t3tools/shared/model";
24	import { RouterProvider, createMemoryHistory } from "@tanstack/react-router";	24	import { RouterProvider, createMemoryHistory } from "@tanstack/react-router";
25	import { Option } from "effect";	25	import * as Option from "effect/Option";
26	import { HttpResponse, http, ws } from "msw";	26	import { HttpResponse, http, ws } from "msw";
27	import { setupWorker } from "msw/browser";	27	import { setupWorker } from "msw/browser";
28	import { page } from "vitest/browser";	28	import { page } from "vitest/browser";

apps/web/src/components/ChatView.logic.ts+1-1

...	@@ -10,7 +10,7 @@ import {	...	@@ -10,7 +10,7 @@ import {
10	} from "@t3tools/contracts";	10	} from "@t3tools/contracts";
11	import { type ChatMessage, type SessionPhase, type Thread, type ThreadSession } from "../types";	11	import { type ChatMessage, type SessionPhase, type Thread, type ThreadSession } from "../types";
12	import { type ComposerImageAttachment, type DraftThreadState } from "../composerDraftStore";	12	import { type ComposerImageAttachment, type DraftThreadState } from "../composerDraftStore";
13	import { Schema } from "effect";	13	import * as Schema from "effect/Schema";
14	import { selectThreadByRef, useStore } from "../store";	14	import { selectThreadByRef, useStore } from "../store";
15	import {	15	import {
16	filterTerminalContextsWithText,	16	filterTerminalContextsWithText,

apps/web/src/components/CommandPalette.tsx+1-1

...	@@ -13,7 +13,7 @@ import {	...	@@ -13,7 +13,7 @@ import {
13	} from "@t3tools/contracts";	13	} from "@t3tools/contracts";
14	import { useQuery, useQueryClient } from "@tanstack/react-query";	14	import { useQuery, useQueryClient } from "@tanstack/react-query";
15	import { useNavigate, useParams } from "@tanstack/react-router";	15	import { useNavigate, useParams } from "@tanstack/react-router";
16	import { Option } from "effect";	16	import * as Option from "effect/Option";
17	import {	17	import {
18	ArrowDownIcon,	18	ArrowDownIcon,
19	ArrowLeftIcon,	19	ArrowLeftIcon,

apps/web/src/components/GitActionsControl.tsx+1-1

...	@@ -12,7 +12,7 @@ import type {	...	@@ -12,7 +12,7 @@ import type {
12	} from "@t3tools/contracts";	12	} from "@t3tools/contracts";
13	import { useIsMutating, useMutation, useQueryClient } from "@tanstack/react-query";	13	import { useIsMutating, useMutation, useQueryClient } from "@tanstack/react-query";
14	import { useNavigate } from "@tanstack/react-router";	14	import { useNavigate } from "@tanstack/react-router";
15	import { Option } from "effect";	15	import * as Option from "effect/Option";
16	import { useCallback, useEffect, useEffectEvent, useMemo, useRef, useState } from "react";	16	import { useCallback, useEffect, useEffectEvent, useMemo, useRef, useState } from "react";
17	import { flushSync } from "react-dom";	17	import { flushSync } from "react-dom";
18	import {	18	import {

apps/web/src/components/settings/ConnectionsSettings.tsx+1-1

...	@@ -17,7 +17,7 @@ import {	...	@@ -17,7 +17,7 @@ import {
17	type DesktopServerExposureState,	17	type DesktopServerExposureState,
18	type EnvironmentId,	18	type EnvironmentId,
19	} from "@t3tools/contracts";	19	} from "@t3tools/contracts";
20	import { DateTime } from "effect";	20	import * as DateTime from "effect/DateTime";
21		21
22	import { useCopyToClipboard } from "../../hooks/useCopyToClipboard";	22	import { useCopyToClipboard } from "../../hooks/useCopyToClipboard";
23	import { cn } from "../../lib/utils";	23	import { cn } from "../../lib/utils";

apps/web/src/components/settings/DiagnosticsSettings.tsx+2-1

...	@@ -9,7 +9,8 @@ import {	...	@@ -9,7 +9,8 @@ import {
9	} from "lucide-react";	9	} from "lucide-react";
10	import { useCallback, useMemo, useState, type ReactNode } from "react";	10	import { useCallback, useMemo, useState, type ReactNode } from "react";
11	import type { ServerProcessDiagnosticsEntry, ServerProcessSignal } from "@t3tools/contracts";	11	import type { ServerProcessDiagnosticsEntry, ServerProcessSignal } from "@t3tools/contracts";
12	import { DateTime, Option } from "effect";	12	import * as DateTime from "effect/DateTime";
		13	import * as Option from "effect/Option";
13		14
14	import { ensureLocalApi } from "../../localApi";	15	import { ensureLocalApi } from "../../localApi";
15	import { cn } from "../../lib/utils";	16	import { cn } from "../../lib/utils";

apps/web/src/components/settings/ProviderSettingsForm.tsx+1-1

...	@@ -1,7 +1,7 @@	...	@@ -1,7 +1,7 @@
1	"use client";	1	"use client";
2		2
3	import { useMemo, type ReactNode } from "react";	3	import { useMemo, type ReactNode } from "react";
4	import { Schema } from "effect";	4	import * as Schema from "effect/Schema";
5	import type {	5	import type {
6	ProviderSettingsFormAnnotation,	6	ProviderSettingsFormAnnotation,
7	ProviderSettingsFormControl,	7	ProviderSettingsFormControl,

apps/web/src/components/settings/SettingsPanels.browser.tsx+3-2

...	@@ -16,7 +16,8 @@ import {	...	@@ -16,7 +16,8 @@ import {
16	type ServerProvider,	16	type ServerProvider,
17	type SourceControlDiscoveryResult,	17	type SourceControlDiscoveryResult,
18	} from "@t3tools/contracts";	18	} from "@t3tools/contracts";
19	import { DateTime, Option } from "effect";	19	import * as DateTime from "effect/DateTime";
		20	import * as Option from "effect/Option";
20	import { page } from "vitest/browser";	21	import { page } from "vitest/browser";
21	import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";	22	import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
22	import { render } from "vitest-browser-react";	23	import { render } from "vitest-browser-react";
...	@@ -261,7 +262,7 @@ function createOutdatedProvider(driver: string): ServerProvider {	...	@@ -261,7 +262,7 @@ function createOutdatedProvider(driver: string): ServerProvider {
261	}	262	}
262		263
263	function makeUtc(value: string) {	264	function makeUtc(value: string) {
264	return DateTime.makeUnsafe(Date.parse(value));	265	return DateTime.makeUnsafe(value);
265	}	266	}
266		267
267	function makePairingLink(input: {	268	function makePairingLink(input: {

apps/web/src/components/settings/SettingsPanels.tsx+1-1

...	@@ -14,7 +14,7 @@ import {	...	@@ -14,7 +14,7 @@ import {
14	import { scopeThreadRef } from "@t3tools/client-runtime";	14	import { scopeThreadRef } from "@t3tools/client-runtime";
15	import { DEFAULT_UNIFIED_SETTINGS } from "@t3tools/contracts/settings";	15	import { DEFAULT_UNIFIED_SETTINGS } from "@t3tools/contracts/settings";
16	import { createModelSelection } from "@t3tools/shared/model";	16	import { createModelSelection } from "@t3tools/shared/model";
17	import { Equal } from "effect";	17	import * as Equal from "effect/Equal";
18	import { APP_VERSION } from "../../branding";	18	import { APP_VERSION } from "../../branding";
19	import {	19	import {
20	canCheckForUpdate,	20	canCheckForUpdate,

apps/web/src/components/settings/SourceControlSettings.tsx+1-1

...	@@ -1,5 +1,5 @@	...	@@ -1,5 +1,5 @@
1	import { GitPullRequestIcon, RefreshCwIcon } from "lucide-react";	1	import { GitPullRequestIcon, RefreshCwIcon } from "lucide-react";
2	import { Option } from "effect";	2	import * as Option from "effect/Option";
3	import { type ReactNode } from "react";	3	import { type ReactNode } from "react";
4	import type {	4	import type {
5	SourceControlProviderKind,	5	SourceControlProviderKind,

apps/web/src/components/settings/providerDriverMeta.ts+1-1

...	@@ -5,7 +5,7 @@ import {	...	@@ -5,7 +5,7 @@ import {
5	OpenCodeSettings,	5	OpenCodeSettings,
6	ProviderDriverKind,	6	ProviderDriverKind,
7	} from "@t3tools/contracts";	7	} from "@t3tools/contracts";
8	import type { Schema } from "effect";	8	import type * as Schema from "effect/Schema";
9	import { ClaudeAI, CursorIcon, type Icon, OpenAI, OpenCodeIcon } from "../Icons";	9	import { ClaudeAI, CursorIcon, type Icon, OpenAI, OpenCodeIcon } from "../Icons";
10		10
11	type ProviderSettingsSchema = {	11	type ProviderSettingsSchema = {

apps/web/src/components/ui/sidebar.tsx+1-1

...	@@ -19,7 +19,7 @@ import { Skeleton } from "~/components/ui/skeleton";	...	@@ -19,7 +19,7 @@ import { Skeleton } from "~/components/ui/skeleton";
19	import { Tooltip, TooltipPopup, TooltipTrigger } from "~/components/ui/tooltip";	19	import { Tooltip, TooltipPopup, TooltipTrigger } from "~/components/ui/tooltip";
20	import { useIsMobile } from "~/hooks/useMediaQuery";	20	import { useIsMobile } from "~/hooks/useMediaQuery";
21	import { getLocalStorageItem, setLocalStorageItem } from "~/hooks/useLocalStorage";	21	import { getLocalStorageItem, setLocalStorageItem } from "~/hooks/useLocalStorage";
22	import { Schema } from "effect";	22	import * as Schema from "effect/Schema";
23		23
24	const SIDEBAR_COOKIE_NAME = "sidebar_state";	24	const SIDEBAR_COOKIE_NAME = "sidebar_state";
25	const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;	25	const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;

apps/web/src/environments/primary/auth.ts+2-1

...	@@ -16,7 +16,8 @@ import {	...	@@ -16,7 +16,8 @@ import {
16	} from "../../pairingUrl";	16	} from "../../pairingUrl";
17		17
18	import { resolvePrimaryEnvironmentHttpUrl } from "./target";	18	import { resolvePrimaryEnvironmentHttpUrl } from "./target";
19	import { Data, Predicate } from "effect";	19	import * as Data from "effect/Data";
		20	import * as Predicate from "effect/Predicate";
20		21
21	export class BootstrapHttpError extends Data.TaggedError("BootstrapHttpError")<{	22	export class BootstrapHttpError extends Data.TaggedError("BootstrapHttpError")<{
22	readonly message: string;	23	readonly message: string;

apps/web/src/hooks/useSettings.ts+1-1

...	@@ -19,7 +19,7 @@ import {	...	@@ -19,7 +19,7 @@ import {
19	UnifiedSettings,	19	UnifiedSettings,
20	} from "@t3tools/contracts/settings";	20	} from "@t3tools/contracts/settings";
21	import { ensureLocalApi } from "~/localApi";	21	import { ensureLocalApi } from "~/localApi";
22	import { Struct } from "effect";	22	import * as Struct from "effect/Struct";
23	import { applyServerSettingsPatch } from "@t3tools/shared/serverSettings";	23	import { applyServerSettingsPatch } from "@t3tools/shared/serverSettings";
24	import { applySettingsUpdated, getServerConfig, useServerSettings } from "~/rpc/serverState";	24	import { applySettingsUpdated, getServerConfig, useServerSettings } from "~/rpc/serverState";
25		25

apps/web/src/lib/gitStatusState.ts+1-1

...	@@ -4,7 +4,7 @@ import {	...	@@ -4,7 +4,7 @@ import {
4	type GitManagerServiceError,	4	type GitManagerServiceError,
5	type VcsStatusResult,	5	type VcsStatusResult,
6	} from "@t3tools/contracts";	6	} from "@t3tools/contracts";
7	import { Cause } from "effect";	7	import * as Cause from "effect/Cause";
8	import { Atom } from "effect/unstable/reactivity";	8	import { Atom } from "effect/unstable/reactivity";
9	import { useEffect } from "react";	9	import { useEffect } from "react";
10		10

apps/web/src/lib/processDiagnosticsState.ts+3-1

...	@@ -1,6 +1,8 @@	...	@@ -1,6 +1,8 @@
1	import { useAtomValue } from "@effect/atom-react";	1	import { useAtomValue } from "@effect/atom-react";
2	import type { ServerProcessDiagnosticsResult } from "@t3tools/contracts";	2	import type { ServerProcessDiagnosticsResult } from "@t3tools/contracts";
3	import { Cause, Effect, Option } from "effect";	3	import * as Cause from "effect/Cause";
		4	import * as Effect from "effect/Effect";
		5	import * as Option from "effect/Option";
4	import { AsyncResult, Atom } from "effect/unstable/reactivity";	6	import { AsyncResult, Atom } from "effect/unstable/reactivity";
5	import { useCallback } from "react";	7	import { useCallback } from "react";
6		8

apps/web/src/lib/projectScriptKeybindings.ts+1-1

...	@@ -4,7 +4,7 @@ import {	...	@@ -4,7 +4,7 @@ import {
4	type KeybindingRule,	4	type KeybindingRule,
5	type ResolvedKeybindingsConfig,	5	type ResolvedKeybindingsConfig,
6	} from "@t3tools/contracts";	6	} from "@t3tools/contracts";
7	import { Schema } from "effect";	7	import * as Schema from "effect/Schema";
8		8
9	export const PROJECT_SCRIPT_KEYBINDING_INVALID_MESSAGE = "Invalid keybinding.";	9	export const PROJECT_SCRIPT_KEYBINDING_INVALID_MESSAGE = "Invalid keybinding.";
10		10

apps/web/src/lib/providerReactQuery.ts+2-1

...	@@ -5,7 +5,8 @@ import {	...	@@ -5,7 +5,8 @@ import {
5	ThreadId,	5	ThreadId,
6	} from "@t3tools/contracts";	6	} from "@t3tools/contracts";
7	import { queryOptions } from "@tanstack/react-query";	7	import { queryOptions } from "@tanstack/react-query";
8	import { Option, Schema } from "effect";	8	import * as Option from "effect/Option";
		9	import * as Schema from "effect/Schema";
9	import { ensureEnvironmentApi } from "../environmentApi";	10	import { ensureEnvironmentApi } from "../environmentApi";
10		11
11	interface CheckpointDiffQueryInput {	12	interface CheckpointDiffQueryInput {

apps/web/src/lib/sourceControlDiscoveryState.ts+1-1

...	@@ -7,7 +7,7 @@ import {	...	@@ -7,7 +7,7 @@ import {
7	sourceControlDiscoveryStateAtom,	7	sourceControlDiscoveryStateAtom,
8	} from "@t3tools/client-runtime";	8	} from "@t3tools/client-runtime";
9	import { EnvironmentId, type SourceControlDiscoveryResult } from "@t3tools/contracts";	9	import { EnvironmentId, type SourceControlDiscoveryResult } from "@t3tools/contracts";
10	import { Effect } from "effect";	10	import * as Effect from "effect/Effect";
11	import { Atom } from "effect/unstable/reactivity";	11	import { Atom } from "effect/unstable/reactivity";
12		12
13	import { readPrimaryEnvironmentDescriptor } from "../environments/primary";	13	import { readPrimaryEnvironmentDescriptor } from "../environments/primary";

apps/web/src/lib/traceDiagnosticsState.ts+3-1

...	@@ -1,6 +1,8 @@	...	@@ -1,6 +1,8 @@
1	import { useAtomValue } from "@effect/atom-react";	1	import { useAtomValue } from "@effect/atom-react";
2	import type { ServerTraceDiagnosticsResult } from "@t3tools/contracts";	2	import type { ServerTraceDiagnosticsResult } from "@t3tools/contracts";
3	import { Cause, Effect, Option } from "effect";	3	import * as Cause from "effect/Cause";
		4	import * as Effect from "effect/Effect";
		5	import * as Option from "effect/Option";
4	import { AsyncResult, Atom } from "effect/unstable/reactivity";	6	import { AsyncResult, Atom } from "effect/unstable/reactivity";
5	import { useCallback } from "react";	7	import { useCallback } from "react";
6		8

apps/web/src/observability/clientTracing.ts+5-1

...	@@ -1,4 +1,8 @@	...	@@ -1,4 +1,8 @@
1	import { Exit, Layer, ManagedRuntime, Scope, Tracer } from "effect";	1	import * as Exit from "effect/Exit";
		2	import * as Layer from "effect/Layer";
		3	import * as ManagedRuntime from "effect/ManagedRuntime";
		4	import * as Scope from "effect/Scope";
		5	import * as Tracer from "effect/Tracer";
2	import { FetchHttpClient, HttpClient } from "effect/unstable/http";	6	import { FetchHttpClient, HttpClient } from "effect/unstable/http";
3	import { OtlpSerialization, OtlpTracer } from "effect/unstable/observability";	7	import { OtlpSerialization, OtlpTracer } from "effect/unstable/observability";
4		8

apps/web/src/projectScripts.ts+1-1

...	@@ -4,7 +4,7 @@ import {	...	@@ -4,7 +4,7 @@ import {
4	type KeybindingCommand,	4	type KeybindingCommand,
5	type ProjectScript,	5	type ProjectScript,
6	} from "@t3tools/contracts";	6	} from "@t3tools/contracts";
7	import { Schema } from "effect";	7	import * as Schema from "effect/Schema";
8		8
9	function normalizeScriptId(value: string): string {	9	function normalizeScriptId(value: string): string {
10	const cleaned = value	10	const cleaned = value

apps/web/src/rpc/protocol.ts+4-1

...	@@ -1,5 +1,8 @@	...	@@ -1,5 +1,8 @@
1	import { WsRpcGroup } from "@t3tools/contracts";	1	import { WsRpcGroup } from "@t3tools/contracts";
2	import { Duration, Effect, Layer, Schedule } from "effect";	2	import * as Duration from "effect/Duration";
		3	import * as Effect from "effect/Effect";
		4	import * as Layer from "effect/Layer";
		5	import * as Schedule from "effect/Schedule";
3	import { RpcClient, RpcSerialization } from "effect/unstable/rpc";	6	import { RpcClient, RpcSerialization } from "effect/unstable/rpc";
4	import * as Socket from "effect/unstable/socket/Socket";	7	import * as Socket from "effect/unstable/socket/Socket";
5		8

apps/web/src/rpc/wsRpcClient.ts+2-1

...	@@ -10,7 +10,8 @@ import {	...	@@ -10,7 +10,8 @@ import {
10	WS_METHODS,	10	WS_METHODS,
11	} from "@t3tools/contracts";	11	} from "@t3tools/contracts";
12	import { applyGitStatusStreamEvent } from "@t3tools/shared/git";	12	import { applyGitStatusStreamEvent } from "@t3tools/shared/git";
13	import { Effect, Stream } from "effect";	13	import * as Effect from "effect/Effect";
		14	import * as Stream from "effect/Stream";
14		15
15	import { type WsRpcProtocolClient } from "./protocol";	16	import { type WsRpcProtocolClient } from "./protocol";
16	import { resetWsReconnectBackoff } from "./wsConnectionState";	17	import { resetWsReconnectBackoff } from "./wsConnectionState";

apps/web/src/rpc/wsTransport.test.ts+1-1

...	@@ -1,5 +1,5 @@	...	@@ -1,5 +1,5 @@
1	import { DEFAULT_SERVER_SETTINGS, WS_METHODS } from "@t3tools/contracts";	1	import { DEFAULT_SERVER_SETTINGS, WS_METHODS } from "@t3tools/contracts";
2	import { Stream } from "effect";	2	import * as Stream from "effect/Stream";
3	import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";	3	import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
4		4
5	import {	5	import {

apps/web/src/rpc/wsTransport.ts+9-11

...	@@ -1,14 +1,12 @@	...	@@ -1,14 +1,12 @@
1	import {	1	import * as Cause from "effect/Cause";
2	Cause,	2	import * as Duration from "effect/Duration";
3	Duration,	3	import * as Effect from "effect/Effect";
4	Effect,	4	import * as Exit from "effect/Exit";
5	Exit,	5	import * as Layer from "effect/Layer";
6	Layer,	6	import * as ManagedRuntime from "effect/ManagedRuntime";
7	ManagedRuntime,	7	import * as Option from "effect/Option";
8	Option,	8	import * as Scope from "effect/Scope";
9	Scope,	9	import * as Stream from "effect/Stream";
10	Stream,
11	} from "effect";
12	import { RpcClient } from "effect/unstable/rpc";	10	import { RpcClient } from "effect/unstable/rpc";
13		11
14	import { ClientTracingLive } from "../observability/clientTracing";	12	import { ClientTracingLive } from "../observability/clientTracing";

apps/web/src/store.ts+1-1

...	@@ -20,7 +20,7 @@ import type {	...	@@ -20,7 +20,7 @@ import type {
20	} from "@t3tools/contracts";	20	} from "@t3tools/contracts";
21	import { isProviderDriverKind, ProviderDriverKind } from "@t3tools/contracts";	21	import { isProviderDriverKind, ProviderDriverKind } from "@t3tools/contracts";
22	import type { ThreadId, TurnId } from "@t3tools/contracts";	22	import type { ThreadId, TurnId } from "@t3tools/contracts";
23	import { Schema } from "effect";	23	import * as Schema from "effect/Schema";
24	import { resolveModelSlugForProvider } from "@t3tools/shared/model";	24	import { resolveModelSlugForProvider } from "@t3tools/shared/model";
25	import { create } from "zustand";	25	import { create } from "zustand";
26	import {	26	import {

apps/web/test/wsRpcHarness.ts+5-1

...	@@ -1,5 +1,9 @@	...	@@ -1,5 +1,9 @@
1	import { Effect, Exit, PubSub, Scope, Stream } from "effect";
2	import { ORCHESTRATION_WS_METHODS, WS_METHODS, WsRpcGroup } from "@t3tools/contracts";	1	import { ORCHESTRATION_WS_METHODS, WS_METHODS, WsRpcGroup } from "@t3tools/contracts";
		2	import * as Effect from "effect/Effect";
		3	import * as Exit from "effect/Exit";
		4	import * as PubSub from "effect/PubSub";
		5	import * as Scope from "effect/Scope";
		6	import * as Stream from "effect/Stream";
3	import { RpcMessage, RpcSerialization, RpcServer } from "effect/unstable/rpc";	7	import { RpcMessage, RpcSerialization, RpcServer } from "effect/unstable/rpc";
4		8
5	type RpcServerInstance = RpcServer.RpcServer<any>;	9	type RpcServerInstance = RpcServer.RpcServer<any>;

apps/web/tsconfig.json+13-3

 @@ -15,12 +15,22 @@
     "plugins": [
       {
         "name": "@effect/language-service",
-        "namespaceImportPackages": ["@effect/platform-node"],
+        "namespaceImportPackages": ["@effect/platform-node", "effect"],
         "diagnosticSeverity": {
           "importFromBarrel": "error",
           "anyUnknownInErrorContext": "error",
-          "instanceOfSchema": "warning",
+          "unsafeEffectTypeAssertion": "error",
-          "deterministicKeys": "warning"
+          "instanceOfSchema": "error",
+          "deterministicKeys": "error",
+          "strictEffectProvide": "off",
+          "missingEffectServiceDependency": "error",
+          "leakingRequirements": "error",
+          "globalErrorInEffectCatch": "error",
+          "globalErrorInEffectFailure": "error",
+          "unknownInEffectCatch": "error",
+          "strictBooleanExpressions": "off",
+          "preferSchemaOverJson": "error",
+          "schemaSyncInEffect": "error"
         }
       }
     ]

bun.lock+1

...	@@ -201,6 +201,7 @@	...	@@ -201,6 +201,7 @@
201	},	201	},
202	"devDependencies": {	202	"devDependencies": {
203	"@effect/language-service": "catalog:",	203	"@effect/language-service": "catalog:",
		204	"@effect/platform-node": "catalog:",
204	"@effect/vitest": "catalog:",	205	"@effect/vitest": "catalog:",
205	"@types/node": "catalog:",	206	"@types/node": "catalog:",
206	"typescript": "catalog:",	207	"typescript": "catalog:",

packages/client-runtime/tsconfig.json+1-14

...	@@ -1,18 +1,5 @@	...	@@ -1,18 +1,5 @@
1	{	1	{
2	"extends": "../../tsconfig.base.json",	2	"extends": "../../tsconfig.base.json",
3	"compilerOptions": {	3	"compilerOptions": {},
4	"plugins": [
5	{
6	"name": "@effect/language-service",
7	"namespaceImportPackages": ["@effect/platform-node", "effect"],
8	"diagnosticSeverity": {
9	"importFromBarrel": "error",
10	"anyUnknownInErrorContext": "error",
11	"instanceOfSchema": "warning",
12	"deterministicKeys": "warning"
13	}
14	}
15	]
16	},
17	"include": ["src"]	4	"include": ["src"]
18	}	5	}

packages/contracts/src/model.ts+2-2

...	@@ -99,10 +99,10 @@ function coerceLegacyOptionsObjectToArray(	...	@@ -99,10 +99,10 @@ function coerceLegacyOptionsObjectToArray(
99	const entries: Array<ProviderOptionSelection> = [];	99	const entries: Array<ProviderOptionSelection> = [];
100	for (const [rawKey, rawValue] of Object.entries(record)) {	100	for (const [rawKey, rawValue] of Object.entries(record)) {
101	const id = typeof rawKey === "string" ? rawKey.trim() : "";	101	const id = typeof rawKey === "string" ? rawKey.trim() : "";
102	if (!id) continue;	102	if (id.length === 0) continue;
103	if (typeof rawValue === "string") {	103	if (typeof rawValue === "string") {
104	const trimmed = rawValue.trim();	104	const trimmed = rawValue.trim();
105	if (trimmed) entries.push({ id, value: trimmed });	105	if (trimmed.length > 0) entries.push({ id, value: trimmed });
106	} else if (typeof rawValue === "boolean") {	106	} else if (typeof rawValue === "boolean") {
107	entries.push({ id, value: rawValue });	107	entries.push({ id, value: rawValue });
108	}	108	}

packages/contracts/src/terminal.test.ts+10-6

 @@ -164,6 +164,8 @@ describe("TerminalCloseInput", () => {
 });
 describe("TerminalSessionSnapshot", () => {
+  const isoTimestamp = "2026-01-01T00:00:00.000Z";
   it("accepts running snapshots", () => {
     expect(
       decodes(TerminalSessionSnapshot, {
 @@ -176,20 +178,22 @@ describe("TerminalSessionSnapshot", () => {
         history: "hello\n",
         exitCode: null,
         exitSignal: null,
-        updatedAt: new Date().toISOString(),
+        updatedAt: isoTimestamp,
       }),
     ).toBe(true);
   });
 });
 describe("TerminalEvent", () => {
+  const isoTimestamp = "2026-01-01T00:00:00.000Z";
   it("accepts output events", () => {
     expect(
       decodes(TerminalEvent, {
         type: "output",
         threadId: "thread-1",
         terminalId: DEFAULT_TERMINAL_ID,
-        createdAt: new Date().toISOString(),
+        createdAt: isoTimestamp,
         data: "line\n",
       }),
     ).toBe(true);
 @@ -201,7 +205,7 @@ describe("TerminalEvent", () => {
         type: "exited",
         threadId: "thread-1",
         terminalId: DEFAULT_TERMINAL_ID,
-        createdAt: new Date().toISOString(),
+        createdAt: isoTimestamp,
         exitCode: 0,
         exitSignal: null,
       }),
 @@ -214,7 +218,7 @@ describe("TerminalEvent", () => {
         type: "activity",
         threadId: "thread-1",
         terminalId: DEFAULT_TERMINAL_ID,
-        createdAt: new Date().toISOString(),
+        createdAt: isoTimestamp,
         hasRunningSubprocess: true,
       }),
     ).toBe(true);
 @@ -226,7 +230,7 @@ describe("TerminalEvent", () => {
         type: "started",
         threadId: "thread-1",
         terminalId: DEFAULT_TERMINAL_ID,
-        createdAt: new Date().toISOString(),
+        createdAt: isoTimestamp,
         snapshot: {
           threadId: "thread-1",
           terminalId: DEFAULT_TERMINAL_ID,
 @@ -237,7 +241,7 @@ describe("TerminalEvent", () => {
           history: "",
           exitCode: null,
           exitSignal: null,
-          updatedAt: new Date().toISOString(),
+          updatedAt: isoTimestamp,
         },
       }),
     ).toBe(true);

packages/contracts/src/terminal.ts+5-2

 @@ -170,10 +170,13 @@ export class TerminalCwdError extends Schema.TaggedErrorClass<TerminalCwdError>(
       return `Terminal cwd does not exist: ${this.cwd}`;
     }
     const causeMessage =
-      this.cause && typeof this.cause === "object" && "message" in this.cause
+      this.cause !== undefined &&
+      this.cause !== null &&
+      typeof this.cause === "object" &&
+      "message" in this.cause
         ? this.cause.message
         : undefined;
-    return causeMessage
+    return typeof causeMessage === "string" && causeMessage.length > 0
       ? `Failed to access terminal cwd: ${this.cwd} (${causeMessage})`
       : `Failed to access terminal cwd: ${this.cwd}`;
   }

packages/contracts/tsconfig.json+1-14

...	@@ -1,18 +1,5 @@	...	@@ -1,18 +1,5 @@
1	{	1	{
2	"extends": "../../tsconfig.base.json",	2	"extends": "../../tsconfig.base.json",
3	"compilerOptions": {	3	"compilerOptions": {},
4	"plugins": [
5	{
6	"name": "@effect/language-service",
7	"namespaceImportPackages": ["@effect/platform-node", "effect"],
8	"diagnosticSeverity": {
9	"importFromBarrel": "error",
10	"anyUnknownInErrorContext": "error",
11	"instanceOfSchema": "warning",
12	"deterministicKeys": "warning"
13	}
14	}
15	]
16	},
17	"include": ["src"]	4	"include": ["src"]
18	}	5	}

packages/effect-acp/test/examples/cursor-acp-client.example.ts+3-3

...	@@ -48,7 +48,7 @@ const program = Effect.gen(function* () {	...	@@ -48,7 +48,7 @@ const program = Effect.gen(function* () {
48	version: "0.0.0",	48	version: "0.0.0",
49	},	49	},
50	});	50	});
51	yield* Console.log("initialized", JSON.stringify(initialized, null, 4));	51	yield* Console.log("initialized", initialized);
52		52
53	const session = yield* acp.agent.createSession({	53	const session = yield* acp.agent.createSession({
54	cwd: process.cwd(),	54	cwd: process.cwd(),
...	@@ -61,7 +61,7 @@ const program = Effect.gen(function* () {	...	@@ -61,7 +61,7 @@ const program = Effect.gen(function* () {
61	value: "claude-opus-4-6",	61	value: "claude-opus-4-6",
62	});	62	});
63		63
64	yield* Console.log("config", JSON.stringify(config, null, 4));	64	yield* Console.log("config", config);
65		65
66	const result = yield* acp.agent.prompt({	66	const result = yield* acp.agent.prompt({
67	sessionId: session.sessionId,	67	sessionId: session.sessionId,
...	@@ -73,7 +73,7 @@ const program = Effect.gen(function* () {	...	@@ -73,7 +73,7 @@ const program = Effect.gen(function* () {
73	],	73	],
74	});	74	});
75		75
76	yield* Console.log("prompt result", JSON.stringify(result));	76	yield* Console.log("prompt result", result);
77	yield* acp.agent.cancel({ sessionId: session.sessionId });	77	yield* acp.agent.cancel({ sessionId: session.sessionId });
78	}).pipe(Effect.provide(acpLayer));	78	}).pipe(Effect.provide(acpLayer));
79	});	79	});

packages/effect-acp/tsconfig.json+1-14

...	@@ -1,18 +1,5 @@	...	@@ -1,18 +1,5 @@
1	{	1	{
2	"extends": "../../tsconfig.base.json",	2	"extends": "../../tsconfig.base.json",
3	"compilerOptions": {	3	"compilerOptions": {},
4	"plugins": [
5	{
6	"name": "@effect/language-service",
7	"namespaceImportPackages": ["@effect/platform-node", "effect"],
8	"diagnosticSeverity": {
9	"importFromBarrel": "error",
10	"anyUnknownInErrorContext": "error",
11	"instanceOfSchema": "warning",
12	"deterministicKeys": "warning"
13	}
14	}
15	]
16	},
17	"include": ["src", "scripts", "test"]	4	"include": ["src", "scripts", "test"]
18	}	5	}

packages/effect-codex-app-server/src/client.ts+20-20

...	@@ -17,6 +17,8 @@ import {	...	@@ -17,6 +17,8 @@ import {
17	} from "./_internal/shared.ts";	17	} from "./_internal/shared.ts";
18	import { makeChildStdio, makeTerminationError } from "./_internal/stdio.ts";	18	import { makeChildStdio, makeTerminationError } from "./_internal/stdio.ts";
19		19
		20	const DEFAULT_APP_SERVER_FORCE_KILL_AFTER = "2 seconds" as const;
		21
20	export interface CodexAppServerClientOptions {	22	export interface CodexAppServerClientOptions {
21	readonly logIncoming?: boolean;	23	readonly logIncoming?: boolean;
22	readonly logOutgoing?: boolean;	24	readonly logOutgoing?: boolean;
...	@@ -273,26 +275,24 @@ export const layerCommand = (	...	@@ -273,26 +275,24 @@ export const layerCommand = (
273	> =>	275	> =>
274	Layer.effect(	276	Layer.effect(
275	CodexAppServerClient,	277	CodexAppServerClient,
276	Effect.acquireRelease(	278	Effect.gen(function* () {
277	Effect.gen(function* () {	279	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
278	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;	280	const command = ChildProcess.make(options.command, [...(options.args ?? [])], {
279	const command = ChildProcess.make(options.command, [...(options.args ?? [])], {	281	...(options.cwd ? { cwd: options.cwd } : {}),
280	...(options.cwd ? { cwd: options.cwd } : {}),	282	...(options.env ? { env: { ...process.env, ...options.env } } : {}),
281	...(options.env ? { env: { ...process.env, ...options.env } } : {}),	283	forceKillAfter: DEFAULT_APP_SERVER_FORCE_KILL_AFTER,
282	shell: process.platform === "win32",	284	shell: process.platform === "win32",
283	});	285	});
284	return yield* spawner.spawn(command).pipe(	286	return yield* spawner.spawn(command).pipe(
285	Effect.mapError(	287	Effect.mapError(
286	(cause) =>	288	(cause) =>
287	new CodexError.CodexAppServerSpawnError({	289	new CodexError.CodexAppServerSpawnError({
288	command: [options.command, ...(options.args ?? [])].join(" "),	290	command: [options.command, ...(options.args ?? [])].join(" "),
289	cause,	291	cause,
290	}),	292	}),
291	),	293	),
292	);	294	);
293	}),	295	}).pipe(
294	(handle) => handle.kill().pipe(Effect.orDie),
295	).pipe(
296	Effect.flatMap((handle) =>	296	Effect.flatMap((handle) =>
297	make(makeChildStdio(handle), options, makeTerminationError(handle)),	297	make(makeChildStdio(handle), options, makeTerminationError(handle)),
298	),	298	),

packages/effect-codex-app-server/test/examples/codex-app-server-probe.ts+3-3

...	@@ -45,17 +45,17 @@ const program = Effect.gen(function* () {	...	@@ -45,17 +45,17 @@ const program = Effect.gen(function* () {
45	optOutNotificationMethods: null,	45	optOutNotificationMethods: null,
46	},	46	},
47	});	47	});
48	yield* Console.log("initialize", JSON.stringify(initialized, null, 2));	48	yield* Console.log("initialize", initialized);
49		49
50	yield* client.notify("initialized", undefined);	50	yield* client.notify("initialized", undefined);
51		51
52	const account = yield* client.request("account/read", {});	52	const account = yield* client.request("account/read", {});
53	yield* Console.log("account/read", JSON.stringify(account, null, 2));	53	yield* Console.log("account/read", account);
54		54
55	const skills = yield* client.request("skills/list", {	55	const skills = yield* client.request("skills/list", {
56	cwds: [process.cwd()],	56	cwds: [process.cwd()],
57	});	57	});
58	yield* Console.log("skills/list", JSON.stringify(skills, null, 2));	58	yield* Console.log("skills/list", skills);
59	}).pipe(Effect.provide(codexLayer));	59	}).pipe(Effect.provide(codexLayer));
60	});	60	});
61		61

packages/effect-codex-app-server/tsconfig.json+1-14

...	@@ -1,18 +1,5 @@	...	@@ -1,18 +1,5 @@
1	{	1	{
2	"extends": "../../tsconfig.base.json",	2	"extends": "../../tsconfig.base.json",
3	"compilerOptions": {	3	"compilerOptions": {},
4	"plugins": [
5	{
6	"name": "@effect/language-service",
7	"namespaceImportPackages": ["@effect/platform-node", "effect"],
8	"diagnosticSeverity": {
9	"importFromBarrel": "error",
10	"anyUnknownInErrorContext": "error",
11	"instanceOfSchema": "warning",
12	"deterministicKeys": "warning"
13	}
14	}
15	]
16	},
17	"include": ["src", "scripts", "test"]	4	"include": ["src", "scripts", "test"]
18	}	5	}

packages/shared/package.json+1

...	@@ -95,6 +95,7 @@	...	@@ -95,6 +95,7 @@
95	},	95	},
96	"devDependencies": {	96	"devDependencies": {
97	"@effect/language-service": "catalog:",	97	"@effect/language-service": "catalog:",
		98	"@effect/platform-node": "catalog:",
98	"@effect/vitest": "catalog:",	99	"@effect/vitest": "catalog:",
99	"@types/node": "catalog:",	100	"@types/node": "catalog:",
100	"typescript": "catalog:",	101	"typescript": "catalog:",

packages/shared/src/Net.test.ts+12-10

 @@ -3,7 +3,7 @@ import * as NodeNet from "node:net";
 import { assert, describe, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
-import * as Net from "./Net.ts";
+import * as NetService from "./Net.ts";
 const closeServer = (server: NodeNet.Server) =>
   Effect.sync(() => {
 @@ -19,19 +19,21 @@ const getPort = (server: NodeNet.Server): number => {
   return typeof address === "object" && address !== null ? address.port : 0;
 };
-const openServer = (host?: string): Effect.Effect<NodeNet.Server, Net.NetError> =>
+const openServer = (host?: string): Effect.Effect<NodeNet.Server, NetService.NetError> =>
-  Effect.callback<NodeNet.Server, Net.NetError>((resume) => {
+  Effect.callback<NodeNet.Server, NetService.NetError>((resume) => {
     const server = NodeNet.createServer();
     let settled = false;
-    const settle = (effect: Effect.Effect<NodeNet.Server, Net.NetError>) => {
+    const settle = (effect: Effect.Effect<NodeNet.Server, NetService.NetError>) => {
       if (settled) return;
       settled = true;
       resume(effect);
     };
     server.once("error", (cause) => {
-      settle(Effect.fail(new Net.NetError({ message: "Failed to open test server", cause })));
+      settle(
+        Effect.fail(new NetService.NetError({ message: "Failed to open test server", cause })),
+      );
     });
     if (host) {
 @@ -43,11 +45,11 @@ const openServer = (host?: string): Effect.Effect<NodeNet.Server, Net.NetError>
     return closeServer(server);
   });
-it.layer(Net.NetService.layer)("NetService", (it) => {
+it.layer(NetService.layer)("NetService", (it) => {
   describe("Net helpers", () => {
     it.effect("reserveLoopbackPort returns a positive loopback port", () =>
       Effect.gen(function* () {
-        const net = yield* Net.NetService;
+        const net = yield* NetService.NetService;
         const port = yield* net.reserveLoopbackPort();
         assert.ok(port > 0);
 @@ -59,7 +61,7 @@ it.layer(Net.NetService.layer)("NetService", (it) => {
         openServer("127.0.0.1"),
         (server) =>
           Effect.gen(function* () {
-            const net = yield* Net.NetService;
+            const net = yield* NetService.NetService;
             const port = getPort(server);
             const available = yield* net.isPortAvailableOnLoopback(port);
 @@ -71,7 +73,7 @@ it.layer(Net.NetService.layer)("NetService", (it) => {
     it.effect("findAvailablePort returns preferred when it is free", () =>
       Effect.gen(function* () {
-        const net = yield* Net.NetService;
+        const net = yield* NetService.NetService;
         const preferred = yield* net.reserveLoopbackPort();
         const resolved = yield* net.findAvailablePort(preferred);
 @@ -84,7 +86,7 @@ it.layer(Net.NetService.layer)("NetService", (it) => {
         openServer(),
         (server) =>
           Effect.gen(function* () {
-            const net = yield* Net.NetService;
+            const net = yield* NetService.NetService;
             const preferred = getPort(server);
             const resolved = yield* net.findAvailablePort(preferred);

packages/shared/src/Net.ts+16-19

 @@ -4,22 +4,21 @@ import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Context from "effect/Context";
+import * as Predicate from "effect/Predicate";
 export class NetError extends Data.TaggedError("NetError")<{
   readonly message: string;
   readonly cause?: unknown;
 }> {}
-function isErrnoExceptionWithCode(cause: unknown): cause is {
+const isErrnoExceptionWithCode = (
+  cause: unknown,
+): cause is {
   readonly code: string;
-} {
+} =>
-  return (
+  Predicate.isObject(cause) &&
-    typeof cause === "object" &&
+  Predicate.hasProperty(cause, "code") &&
-    cause !== null &&
+  Predicate.isString(cause.code);
-    "code" in cause &&
-    typeof (cause as { readonly code: unknown }).code === "string"
-  );
-}
 const closeServer = (server: NodeNet.Server) => {
   try {
 @@ -85,6 +84,13 @@ export interface NetServiceShape {
   readonly findAvailablePort: (preferred: number) => Effect.Effect<number, NetError>;
 }
+/**
+ * NetService - Service tag for startup networking helpers.
+ */
+export class NetService extends Context.Service<NetService, NetServiceShape>()(
+  "@t3tools/shared/Net/NetService",
+) {}
 export const make = () => {
   /**
    * Returns true when a TCP server can bind to {host, port}.
 @@ -175,13 +181,4 @@ export const make = () => {
   } satisfies NetServiceShape;
 };
-/**
+export const layer = Layer.sync(NetService, make);
- * NetService - Service tag for startup networking helpers.
- */
-export class NetService extends Context.Service<NetService, NetServiceShape>()(
-  "@t3tools/shared/Net/NetService",
-) {
-  static readonly layer = Layer.sync(NetService, make);
-}
-export const layer = NetService.layer;

packages/shared/src/logging.ts+1

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import fs from "node:fs";	2	import fs from "node:fs";
2	import path from "node:path";	3	import path from "node:path";
3		4

packages/shared/src/observability.test.ts+108-114

...	@@ -1,11 +1,10 @@	...	@@ -1,11 +1,10 @@
1	import fs from "node:fs";
2	import os from "node:os";
3	import path from "node:path";
4
5	import { assert, describe, it } from "@effect/vitest";	1	import { assert, describe, it } from "@effect/vitest";
		2	import * as NodeServices from "@effect/platform-node/NodeServices";
6	import * as Effect from "effect/Effect";	3	import * as Effect from "effect/Effect";
		4	import * as FileSystem from "effect/FileSystem";
7	import * as Layer from "effect/Layer";	5	import * as Layer from "effect/Layer";
8	import * as Logger from "effect/Logger";	6	import * as Logger from "effect/Logger";
		7	import * as Path from "effect/Path";
9	import * as References from "effect/References";	8	import * as References from "effect/References";
10	import * as Schema from "effect/Schema";	9	import * as Schema from "effect/Schema";
11	import * as Tracer from "effect/Tracer";	10	import * as Tracer from "effect/Tracer";
...	@@ -57,13 +56,14 @@ const makeRecord = (name: string, suffix = ""): TraceRecord => ({	...	@@ -57,13 +56,14 @@ const makeRecord = (name: string, suffix = ""): TraceRecord => ({
57	},	56	},
58	});	57	});
59		58
60	const readTraceRecords = (tracePath: string) =>	59	const readTraceRecords = Effect.fn("readTraceRecords")(function* (tracePath: string) {
61	fs	60	const fileSystem = yield* FileSystem.FileSystem;
62	.readFileSync(tracePath, "utf8")	61	return (yield* fileSystem.readFileString(tracePath))
63	.trim()	62	.trim()
64	.split("\n")	63	.split("\n")
65	.filter((line) => line.length > 0)	64	.filter((line) => line.length > 0)
66	.map((line) => decodeTraceRecordLine(line));	65	.map((line) => decodeTraceRecordLine(line));
		66	});
67		67
68	const makeTestLayer = (tracePath: string) =>	68	const makeTestLayer = (tracePath: string) =>
69	Layer.mergeAll(	69	Layer.mergeAll(
...	@@ -106,9 +106,11 @@ describe("observability", () => {	...	@@ -106,9 +106,11 @@ describe("observability", () => {
106	});	106	});
107		107
108	it("normalizes invalid dates without throwing", () => {	108	it("normalizes invalid dates without throwing", () => {
		109	// @effect-diagnostics-next-line globalDate:off
		110	const invalidDate = new Date("not-a-real-date");
109	assert.deepStrictEqual(	111	assert.deepStrictEqual(
110	compactTraceAttributes({	112	compactTraceAttributes({
111	invalidDate: new Date("not-a-real-date"),	113	invalidDate,
112	}),	114	}),
113	{	115	{
114	invalidDate: "Invalid Date",	116	invalidDate: "Invalid Date",
...	@@ -119,122 +121,116 @@ describe("observability", () => {	...	@@ -119,122 +121,116 @@ describe("observability", () => {
119	it.effect("flushes buffered trace records on close", () =>	121	it.effect("flushes buffered trace records on close", () =>
120	Effect.scoped(	122	Effect.scoped(
121	Effect.gen(function* () {	123	Effect.gen(function* () {
122	const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "t3-trace-sink-"));	124	const fileSystem = yield* FileSystem.FileSystem;
		125	const path = yield* Path.Path;
		126	const tempDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-trace-sink-" });
123	const tracePath = path.join(tempDir, "shared.trace.ndjson");	127	const tracePath = path.join(tempDir, "shared.trace.ndjson");
124		128
125	try {	129	const sink = yield* makeTraceSink({
126	const sink = yield* makeTraceSink({	130	filePath: tracePath,
127	filePath: tracePath,	131	maxBytes: 1024,
128	maxBytes: 1024,	132	maxFiles: 2,
129	maxFiles: 2,	133	batchWindowMs: 10_000,
130	batchWindowMs: 10_000,	134	});
131	});	135
132		136	sink.push(makeRecord("alpha"));
133	sink.push(makeRecord("alpha"));	137	sink.push(makeRecord("beta"));
134	sink.push(makeRecord("beta"));	138	yield* sink.close();
135	yield* sink.close();	139
136		140	const lines = yield* readTraceRecords(tracePath);
137	const lines = readTraceRecords(tracePath);	141
138		142	assert.equal(lines.length, 2);
139	assert.equal(lines.length, 2);	143	assert.equal(lines[0]?.name, "alpha");
140	assert.equal(lines[0]?.name, "alpha");	144	assert.equal(lines[1]?.name, "beta");
141	assert.equal(lines[1]?.name, "beta");	145	}).pipe(Effect.provide(NodeServices.layer)),
142	} finally {
143	fs.rmSync(tempDir, { recursive: true, force: true });
144	}
145	}),
146	),	146	),
147	);	147	);
148		148
149	it.effect("rotates the trace file when the configured max size is exceeded", () =>	149	it.effect("rotates the trace file when the configured max size is exceeded", () =>
150	Effect.scoped(	150	Effect.scoped(
151	Effect.gen(function* () {	151	Effect.gen(function* () {
152	const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "t3-trace-sink-"));	152	const fileSystem = yield* FileSystem.FileSystem;
		153	const path = yield* Path.Path;
		154	const tempDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-trace-sink-" });
153	const tracePath = path.join(tempDir, "shared.trace.ndjson");	155	const tracePath = path.join(tempDir, "shared.trace.ndjson");
154		156
155	try {	157	const sink = yield* makeTraceSink({
156	const sink = yield* makeTraceSink({	158	filePath: tracePath,
157	filePath: tracePath,	159	maxBytes: 180,
158	maxBytes: 180,	160	maxFiles: 2,
159	maxFiles: 2,	161	batchWindowMs: 10_000,
160	batchWindowMs: 10_000,	162	});
161	});	163
162		164	for (let index = 0; index < 8; index += 1) {
163	for (let index = 0; index < 8; index += 1) {	165	sink.push(makeRecord("rotate", `${index}-${"x".repeat(48)}`));
164	sink.push(makeRecord("rotate", `${index}-${"x".repeat(48)}`));	166	yield* sink.flush;
165	yield* sink.flush;
166	}
167	yield* sink.close();
168
169	const matchingFiles = fs
170	.readdirSync(tempDir)
171	.filter(
172	(entry) =>
173	entry === "shared.trace.ndjson" \|\| entry.startsWith("shared.trace.ndjson."),
174	)
175	.toSorted();
176
177	assert.equal(
178	matchingFiles.some((entry) => entry === "shared.trace.ndjson.1"),
179	true,
180	);
181	assert.equal(
182	matchingFiles.some((entry) => entry === "shared.trace.ndjson.3"),
183	false,
184	);
185	} finally {
186	fs.rmSync(tempDir, { recursive: true, force: true });
187	}	167	}
188	}),	168	yield* sink.close();
		169
		170	const matchingFiles = (yield* fileSystem.readDirectory(tempDir))
		171	.filter(
		172	(entry) => entry === "shared.trace.ndjson" \|\| entry.startsWith("shared.trace.ndjson."),
		173	)
		174	.toSorted();
		175
		176	assert.equal(
		177	matchingFiles.some((entry) => entry === "shared.trace.ndjson.1"),
		178	true,
		179	);
		180	assert.equal(
		181	matchingFiles.some((entry) => entry === "shared.trace.ndjson.3"),
		182	false,
		183	);
		184	}).pipe(Effect.provide(NodeServices.layer)),
189	),	185	),
190	);	186	);
191		187
192	it.effect("drops only the invalid trace record when serialization fails", () =>	188	it.effect("drops only the invalid trace record when serialization fails", () =>
193	Effect.scoped(	189	Effect.scoped(
194	Effect.gen(function* () {	190	Effect.gen(function* () {
195	const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "t3-trace-sink-"));	191	const fileSystem = yield* FileSystem.FileSystem;
		192	const path = yield* Path.Path;
		193	const tempDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-trace-sink-" });
196	const tracePath = path.join(tempDir, "shared.trace.ndjson");	194	const tracePath = path.join(tempDir, "shared.trace.ndjson");
197		195
198	try {	196	const sink = yield* makeTraceSink({
199	const sink = yield* makeTraceSink({	197	filePath: tracePath,
200	filePath: tracePath,	198	maxBytes: 1024,
201	maxBytes: 1024,	199	maxFiles: 2,
202	maxFiles: 2,	200	batchWindowMs: 10_000,
203	batchWindowMs: 10_000,	201	});
204	});	202
205		203	const circular: Array<unknown> = [];
206	const circular: Array<unknown> = [];	204	circular.push(circular);
207	circular.push(circular);	205
208		206	sink.push(makeRecord("alpha"));
209	sink.push(makeRecord("alpha"));	207	sink.push({
210	sink.push({	208	...makeRecord("invalid"),
211	...makeRecord("invalid"),	209	attributes: {
212	attributes: {	210	circular,
213	circular,	211	},
214	},	212	} as TraceRecord);
215	} as TraceRecord);	213	sink.push(makeRecord("beta"));
216	sink.push(makeRecord("beta"));	214	yield* sink.close();
217	yield* sink.close();	215
218		216	const lines = yield* readTraceRecords(tracePath);
219	const lines = readTraceRecords(tracePath);	217
220		218	assert.deepStrictEqual(
221	assert.deepStrictEqual(	219	lines.map((line) => line.name),
222	lines.map((line) => line.name),	220	["alpha", "beta"],
223	["alpha", "beta"],	221	);
224	);	222	}).pipe(Effect.provide(NodeServices.layer)),
225	} finally {
226	fs.rmSync(tempDir, { recursive: true, force: true });
227	}
228	}),
229	),	223	),
230	);	224	);
231		225
232	it.effect("writes nested spans to disk and captures log messages as span events", () =>	226	it.effect("writes nested spans to disk and captures log messages as span events", () =>
233	Effect.gen(function* () {	227	Effect.scoped(
234	const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "t3-local-tracer-"));	228	Effect.gen(function* () {
235	const tracePath = path.join(tempDir, "shared.trace.ndjson");	229	const fileSystem = yield* FileSystem.FileSystem;
		230	const path = yield* Path.Path;
		231	const tempDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-local-tracer-" });
		232	const tracePath = path.join(tempDir, "shared.trace.ndjson");
236		233
237	try {
238	yield* Effect.scoped(	234	yield* Effect.scoped(
239	Effect.gen(function* () {	235	Effect.gen(function* () {
240	const program = Effect.gen(function* () {	236	const program = Effect.gen(function* () {
...	@@ -254,7 +250,7 @@ describe("observability", () => {	...	@@ -254,7 +250,7 @@ describe("observability", () => {
254	}),	250	}),
255	);	251	);
256		252
257	const records = readTraceRecords(tracePath);	253	const records = yield* readTraceRecords(tracePath);
258	assert.equal(records.length, 2);	254	assert.equal(records.length, 2);
259		255
260	const parent = records.find((record) => record.name === "parent-span");	256	const parent = records.find((record) => record.name === "parent-span");
...	@@ -281,18 +277,18 @@ describe("observability", () => {	...	@@ -281,18 +277,18 @@ describe("observability", () => {
281	child.events.some((event) => event.attributes["effect.logLevel"] === "INFO"),	277	child.events.some((event) => event.attributes["effect.logLevel"] === "INFO"),
282	true,	278	true,
283	);	279	);
284	} finally {	280	}).pipe(Effect.provide(NodeServices.layer)),
285	fs.rmSync(tempDir, { recursive: true, force: true });	281	),
286	}
287	}),
288	);	282	);
289		283
290	it.effect("serializes interrupted spans with an interrupted exit status", () =>	284	it.effect("serializes interrupted spans with an interrupted exit status", () =>
291	Effect.gen(function* () {	285	Effect.scoped(
292	const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "t3-local-tracer-"));	286	Effect.gen(function* () {
293	const tracePath = path.join(tempDir, "shared.trace.ndjson");	287	const fileSystem = yield* FileSystem.FileSystem;
		288	const path = yield* Path.Path;
		289	const tempDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-local-tracer-" });
		290	const tracePath = path.join(tempDir, "shared.trace.ndjson");
294		291
295	try {
296	yield* Effect.scoped(	292	yield* Effect.scoped(
297	Effect.exit(	293	Effect.exit(
298	Effect.interrupt.pipe(	294	Effect.interrupt.pipe(
...	@@ -302,13 +298,11 @@ describe("observability", () => {	...	@@ -302,13 +298,11 @@ describe("observability", () => {
302	),	298	),
303	);	299	);
304		300
305	const records = readTraceRecords(tracePath);	301	const records = yield* readTraceRecords(tracePath);
306	assert.equal(records.length, 1);	302	assert.equal(records.length, 1);
307	assert.equal(records[0]?.name, "interrupt-span");	303	assert.equal(records[0]?.name, "interrupt-span");
308	assert.equal(records[0]?.exit?._tag, "Interrupted");	304	assert.equal(records[0]?.exit?._tag, "Interrupted");
309	} finally {	305	}).pipe(Effect.provide(NodeServices.layer)),
310	fs.rmSync(tempDir, { recursive: true, force: true });	306	),
311	}
312	}),
313	);	307	);
314	});	308	});

packages/shared/src/schemaJson.ts+18

...	@@ -84,6 +84,10 @@ export const fromLenientJsonString = new SchemaTransformation.Transformation(	...	@@ -84,6 +84,10 @@ export const fromLenientJsonString = new SchemaTransformation.Transformation(
84	SchemaGetter.stringifyJson(),	84	SchemaGetter.stringifyJson(),
85	);	85	);
86		86
		87	export const prettyJsonString = SchemaGetter.parseJson<string>().compose(
		88	SchemaGetter.stringifyJson({ space: 2 }),
		89	);
		90
87	/**	91	/**
88	* Build a schema that decodes a lenient JSON string into `A`.	92	* Build a schema that decodes a lenient JSON string into `A`.
89	*	93	*
...	@@ -92,3 +96,17 @@ export const fromLenientJsonString = new SchemaTransformation.Transformation(	...	@@ -92,3 +96,17 @@ export const fromLenientJsonString = new SchemaTransformation.Transformation(
92	*/	96	*/
93	export const fromLenientJson = <S extends Schema.Top>(schema: S) =>	97	export const fromLenientJson = <S extends Schema.Top>(schema: S) =>
94	Schema.String.pipe(Schema.decodeTo(schema, fromLenientJsonString));	98	Schema.String.pipe(Schema.decodeTo(schema, fromLenientJsonString));
		99
		100	/**
		101	* Build a JSON string schema that encodes with stable 2-space formatting.
		102	*
		103	* Decode behavior matches `Schema.fromJsonString(schema)`. Encode behavior
		104	* keeps the transformation schema-based while preserving human-readable JSON.
		105	*/
		106	export const fromJsonStringPretty = <S extends Schema.Top>(schema: S) =>
		107	Schema.fromJsonString(schema).pipe(
		108	Schema.encode({
		109	decode: prettyJsonString,
		110	encode: prettyJsonString,
		111	}),
		112	);

packages/shared/src/shell.ts+1

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import * as NodeOS from "node:os";	2	import * as NodeOS from "node:os";
2	import { execFileSync } from "node:child_process";	3	import { execFileSync } from "node:child_process";
3	import { accessSync, constants, statSync } from "node:fs";	4	import { accessSync, constants, statSync } from "node:fs";

packages/shared/tsconfig.json+1-14

...	@@ -1,18 +1,5 @@	...	@@ -1,18 +1,5 @@
1	{	1	{
2	"extends": "../../tsconfig.base.json",	2	"extends": "../../tsconfig.base.json",
3	"compilerOptions": {	3	"compilerOptions": {},
4	"plugins": [
5	{
6	"name": "@effect/language-service",
7	"namespaceImportPackages": ["@effect/platform-node", "effect"],
8	"diagnosticSeverity": {
9	"importFromBarrel": "error",
10	"anyUnknownInErrorContext": "error",
11	"instanceOfSchema": "warning",
12	"deterministicKeys": "warning"
13	}
14	}
15	]
16	},
17	"include": ["src"]	4	"include": ["src"]
18	}	5	}

packages/ssh/src/command.test.ts+1-1

...	@@ -7,7 +7,7 @@ import * as Layer from "effect/Layer";	...	@@ -7,7 +7,7 @@ import * as Layer from "effect/Layer";
7	import * as Result from "effect/Result";	7	import * as Result from "effect/Result";
8	import * as Sink from "effect/Sink";	8	import * as Sink from "effect/Sink";
9	import * as Stream from "effect/Stream";	9	import * as Stream from "effect/Stream";
10	import { TestClock } from "effect/testing";	10	import * as TestClock from "effect/testing/TestClock";
11	import { ChildProcessSpawner } from "effect/unstable/process";	11	import { ChildProcessSpawner } from "effect/unstable/process";
12		12
13	import {	13	import {

packages/ssh/src/tunnel.test.ts+4-4

packages/ssh/src/tunnel.ts+6-6

...	@@ -2,7 +2,7 @@ import type {	...	@@ -2,7 +2,7 @@ import type {
2	DesktopSshEnvironmentBootstrap,	2	DesktopSshEnvironmentBootstrap,
3	DesktopSshEnvironmentTarget,	3	DesktopSshEnvironmentTarget,
4	} from "@t3tools/contracts";	4	} from "@t3tools/contracts";
5	import { type NetError, NetService } from "@t3tools/shared/Net";	5	import * as NetService from "@t3tools/shared/Net";
6	import { fromLenientJson } from "@t3tools/shared/schemaJson";	6	import { fromLenientJson } from "@t3tools/shared/schemaJson";
7	import * as Context from "effect/Context";	7	import * as Context from "effect/Context";
8	import * as Deferred from "effect/Deferred";	8	import * as Deferred from "effect/Deferred";
...	@@ -82,7 +82,7 @@ type SshEnvironmentEffectContext =	...	@@ -82,7 +82,7 @@ type SshEnvironmentEffectContext =
82	\| FileSystem.FileSystem	82	\| FileSystem.FileSystem
83	\| Path.Path	83	\| Path.Path
84	\| HttpClient.HttpClient	84	\| HttpClient.HttpClient
85	\| NetService	85	\| NetService.NetService
86	\| SshPasswordPrompt;	86	\| SshPasswordPrompt;
87		87
88	type SshEnvironmentEffectError =	88	type SshEnvironmentEffectError =
...	@@ -92,7 +92,7 @@ type SshEnvironmentEffectError =	...	@@ -92,7 +92,7 @@ type SshEnvironmentEffectError =
92	\| SshPairingError	92	\| SshPairingError
93	\| SshReadinessError	93	\| SshReadinessError
94	\| SshPasswordPromptError	94	\| SshPasswordPromptError
95	\| NetError;	95	\| NetService.NetError;
96		96
97	function makeSshTunnelCancelledError(target: DesktopSshEnvironmentTarget): SshCommandError {	97	function makeSshTunnelCancelledError(target: DesktopSshEnvironmentTarget): SshCommandError {
98	return new SshCommandError({	98	return new SshCommandError({
...	@@ -903,7 +903,7 @@ export const fetchLoopbackSshJson = Effect.fn("ssh/tunnel.fetchLoopbackSshJson")	...	@@ -903,7 +903,7 @@ export const fetchLoopbackSshJson = Effect.fn("ssh/tunnel.fetchLoopbackSshJson")
903	});	903	});
904		904
905	const reserveLocalTunnelPort = Effect.fn("ssh/tunnel.reserveLocalTunnelPort")(function* () {	905	const reserveLocalTunnelPort = Effect.fn("ssh/tunnel.reserveLocalTunnelPort")(function* () {
906	const net = yield* NetService;	906	const net = yield* NetService.NetService;
907	return yield* net.reserveLoopbackPort();	907	return yield* net.reserveLoopbackPort();
908	});	908	});
909		909
...	@@ -923,7 +923,7 @@ const startSshTunnel = Effect.fn("ssh/tunnel.startSshTunnel")(function* (input:	...	@@ -923,7 +923,7 @@ const startSshTunnel = Effect.fn("ssh/tunnel.startSshTunnel")(function* (input:
923	\| FileSystem.FileSystem	923	\| FileSystem.FileSystem
924	\| Path.Path	924	\| Path.Path
925	\| HttpClient.HttpClient	925	\| HttpClient.HttpClient
926	\| NetService	926	\| NetService.NetService
927	\| Scope.Scope	927	\| Scope.Scope
928	> {	928	> {
929	const hostSpec = yield* buildSshHostSpecEffect(input.resolvedTarget);	929	const hostSpec = yield* buildSshHostSpecEffect(input.resolvedTarget);
...	@@ -1076,7 +1076,7 @@ const startSshTunnel = Effect.fn("ssh/tunnel.startSshTunnel")(function* (input:	...	@@ -1076,7 +1076,7 @@ const startSshTunnel = Effect.fn("ssh/tunnel.startSshTunnel")(function* (input:
1076	),	1076	),
1077	Effect.tapError((cause) =>	1077	Effect.tapError((cause) =>
1078	Effect.gen(function* () {	1078	Effect.gen(function* () {
1079	const net = yield* NetService;	1079	const net = yield* NetService.NetService;
1080	const processRunningExit = yield* Effect.exit(child.isRunning);	1080	const processRunningExit = yield* Effect.exit(child.isRunning);
1081	const localPortAvailableExit = yield* Effect.exit(	1081	const localPortAvailableExit = yield* Effect.exit(
1082	net.canListenOnHost(input.localPort, "127.0.0.1"),	1082	net.canListenOnHost(input.localPort, "127.0.0.1"),

packages/ssh/tsconfig.json+1-14

...	@@ -1,18 +1,5 @@	...	@@ -1,18 +1,5 @@
1	{	1	{
2	"extends": "../../tsconfig.base.json",	2	"extends": "../../tsconfig.base.json",
3	"compilerOptions": {	3	"compilerOptions": {},
4	"plugins": [
5	{
6	"name": "@effect/language-service",
7	"namespaceImportPackages": ["@effect/platform-node", "effect"],
8	"diagnosticSeverity": {
9	"importFromBarrel": "error",
10	"anyUnknownInErrorContext": "error",
11	"instanceOfSchema": "warning",
12	"deterministicKeys": "warning"
13	}
14	}
15	]
16	},
17	"include": ["src"]	4	"include": ["src"]
18	}	5	}

packages/tailscale/tsconfig.json+1-13

...	@@ -1,17 +1,5 @@	...	@@ -1,17 +1,5 @@
1	{	1	{
2	"extends": "../../tsconfig.base.json",	2	"extends": "../../tsconfig.base.json",
3	"compilerOptions": {	3	"compilerOptions": {},
4	"plugins": [
5	{
6	"name": "@effect/language-service",
7	"diagnosticSeverity": {
8	"importFromBarrel": "error",
9	"anyUnknownInErrorContext": "warning",
10	"instanceOfSchema": "warning",
11	"deterministicKeys": "warning"
12	}
13	}
14	]
15	},
16	"include": ["src"]	4	"include": ["src"]
17	}	5	}

scripts/apply-web-brand-assets.ts+4-1

 @@ -2,7 +2,10 @@
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import { Effect, FileSystem, Option, Path } from "effect";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Option from "effect/Option";
+import * as Path from "effect/Path";
 import { Argument, Command } from "effect/unstable/cli";
 import { resolveWebIconOverrides, type WebAssetBrand } from "./lib/brand-assets.ts";

scripts/build-desktop-artifact.test.ts+3-1

...	@@ -1,6 +1,8 @@	...	@@ -1,6 +1,8 @@
1	import * as NodeServices from "@effect/platform-node/NodeServices";	1	import * as NodeServices from "@effect/platform-node/NodeServices";
2	import { assert, it } from "@effect/vitest";	2	import { assert, it } from "@effect/vitest";
3	import { ConfigProvider, Effect, Option } from "effect";	3	import * as ConfigProvider from "effect/ConfigProvider";
		4	import * as Effect from "effect/Effect";
		5	import * as Option from "effect/Option";
4		6
5	import {	7	import {
6	resolveBuildOptions,	8	resolveBuildOptions,

scripts/build-desktop-artifact.ts+10-12

...	@@ -10,18 +10,16 @@ import { resolveCatalogDependencies } from "./lib/resolve-catalog.ts";	...	@@ -10,18 +10,16 @@ import { resolveCatalogDependencies } from "./lib/resolve-catalog.ts";
10		10
11	import * as NodeRuntime from "@effect/platform-node/NodeRuntime";	11	import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
12	import * as NodeServices from "@effect/platform-node/NodeServices";	12	import * as NodeServices from "@effect/platform-node/NodeServices";
13	import {	13	import * as Config from "effect/Config";
14	Config,	14	import * as Data from "effect/Data";
15	Data,	15	import * as Effect from "effect/Effect";
16	Effect,	16	import * as FileSystem from "effect/FileSystem";
17	FileSystem,	17	import * as Layer from "effect/Layer";
18	Layer,	18	import * as Logger from "effect/Logger";
19	Logger,	19	import * as Option from "effect/Option";
20	Option,	20	import * as Path from "effect/Path";
21	Path,	21	import * as Schema from "effect/Schema";
22	Schema,	22	import * as Stream from "effect/Stream";
23	Stream,
24	} from "effect";
25	import { Command, Flag } from "effect/unstable/cli";	23	import { Command, Flag } from "effect/unstable/cli";
26	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";	24	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
27		25

scripts/dev-runner.test.ts+2-1

...	@@ -1,7 +1,8 @@	...	@@ -1,7 +1,8 @@
1	import * as NodeServices from "@effect/platform-node/NodeServices";	1	import * as NodeServices from "@effect/platform-node/NodeServices";
2	import * as NodeOS from "node:os";	2	import * as NodeOS from "node:os";
3	import { assert, describe, it } from "@effect/vitest";	3	import { assert, describe, it } from "@effect/vitest";
4	import { Effect, Path } from "effect";	4	import * as Effect from "effect/Effect";
		5	import * as Path from "effect/Path";
5		6
6	import {	7	import {
7	checkPortAvailabilityOnHosts,	8	checkPortAvailabilityOnHosts,

scripts/dev-runner.ts+16-8

 @@ -4,8 +4,16 @@ import * as NodeOS from "node:os";
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import { NetService } from "@t3tools/shared/Net";
+import * as NetService from "@t3tools/shared/Net";
-import { Config, Data, Effect, Hash, Layer, Logger, Option, Path, Schema } from "effect";
+import * as Config from "effect/Config";
+import * as Data from "effect/Data";
+import * as Effect from "effect/Effect";
+import * as Hash from "effect/Hash";
+import * as Layer from "effect/Layer";
+import * as Logger from "effect/Logger";
+import * as Option from "effect/Option";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
 import { Argument, Command, Flag } from "effect/unstable/cli";
 import { ChildProcess } from "effect/unstable/process";
 @@ -238,22 +246,22 @@ export function checkPortAvailabilityOnHosts<R>(
   });
 }
-const defaultCheckPortAvailability: PortAvailabilityCheck<NetService> = (port) =>
+const defaultCheckPortAvailability: PortAvailabilityCheck<NetService.NetService> = (port) =>
   Effect.gen(function* () {
-    const net = yield* NetService;
+    const net = yield* NetService.NetService;
     return yield* checkPortAvailabilityOnHosts(port, DEV_PORT_PROBE_HOSTS, (candidatePort, host) =>
       net.canListenOnHost(candidatePort, host),
     );
   });
-interface FindFirstAvailableOffsetInput<R = NetService> {
+interface FindFirstAvailableOffsetInput<R = NetService.NetService> {
   readonly startOffset: number;
   readonly requireServerPort: boolean;
   readonly requireWebPort: boolean;
   readonly checkPortAvailability?: PortAvailabilityCheck<R>;
 }
-export function findFirstAvailableOffset<R = NetService>({
+export function findFirstAvailableOffset<R = NetService.NetService>({
   startOffset,
   requireServerPort,
   requireWebPort,
 @@ -300,7 +308,7 @@ export function findFirstAvailableOffset<R = NetService>({
   });
 }
-interface ResolveModePortOffsetsInput<R = NetService> {
+interface ResolveModePortOffsetsInput<R = NetService.NetService> {
   readonly mode: DevMode;
   readonly startOffset: number;
   readonly hasExplicitServerPort: boolean;
 @@ -308,7 +316,7 @@ interface ResolveModePortOffsetsInput<R = NetService> {
   readonly checkPortAvailability?: PortAvailabilityCheck<R>;
 }
-export function resolveModePortOffsets<R = NetService>({
+export function resolveModePortOffsets<R = NetService.NetService>({
   mode,
   startOffset,
   hasExplicitServerPort,

scripts/merge-update-manifests.test.ts+3-1

...	@@ -1,6 +1,8 @@	...	@@ -1,6 +1,8 @@
1	import * as NodeServices from "@effect/platform-node/NodeServices";	1	import * as NodeServices from "@effect/platform-node/NodeServices";
2	import { assert, describe, it } from "@effect/vitest";	2	import { assert, describe, it } from "@effect/vitest";
3	import { Effect, FileSystem, Path } from "effect";	3	import * as Effect from "effect/Effect";
		4	import * as FileSystem from "effect/FileSystem";
		5	import * as Path from "effect/Path";
4	import { Command, CliError } from "effect/unstable/cli";	6	import { Command, CliError } from "effect/unstable/cli";
5		7
6	import {	8	import {

scripts/merge-update-manifests.ts+5-1

 @@ -2,7 +2,11 @@
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import { Effect, FileSystem, Option, Path, Schema } from "effect";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Option from "effect/Option";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
 import { Argument, Command, Flag } from "effect/unstable/cli";
 import {

scripts/mock-update-server.test.ts+5-2

 @@ -1,7 +1,10 @@
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import { NodeHttpServer } from "@effect/platform-node";
+import * as NodeHttpServer from "@effect/platform-node/NodeHttpServer";
 import { assert, it } from "@effect/vitest";
-import { Effect, FileSystem, Layer, Path } from "effect";
+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 { HttpClient, HttpRouter } from "effect/unstable/http";
 import { makeMockUpdateRouteLayer } from "./mock-update-server.ts";

scripts/mock-update-server.ts+8-2

 @@ -1,8 +1,14 @@
+// @effect-diagnostics-next-line nodeBuiltinImport:off - NodeHttpServer.layer takes `NodeHttp.createServer` as arg
 import * as NodeHttp from "node:http";
-import { NodeHttpServer, NodeRuntime } from "@effect/platform-node";
+import * as NodeHttpServer from "@effect/platform-node/NodeHttpServer";
+import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import { Config, Effect, FileSystem, Layer, Path } from "effect";
+import * as Config from "effect/Config";
+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 { HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/unstable/http";
 interface MockUpdateServerConfig {

scripts/notify-discord-release.ts+7-1

 @@ -2,7 +2,13 @@
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import { Config, Data, DateTime, Effect, Layer, Logger, Schema } from "effect";
+import * as Config from "effect/Config";
+import * as Data from "effect/Data";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Logger from "effect/Logger";
+import * as Schema from "effect/Schema";
 import { Argument, Command, Flag } from "effect/unstable/cli";
 import {
   FetchHttpClient,

scripts/release-smoke.ts+4-1

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics nodeBuiltinImport:off
1	import { execFileSync } from "node:child_process";	2	import { execFileSync } from "node:child_process";
2	import {	3	import {
3	cpSync,	4	cpSync,
...	@@ -11,6 +12,8 @@ import {	...	@@ -11,6 +12,8 @@ import {
11	import { tmpdir } from "node:os";	12	import { tmpdir } from "node:os";
12	import { dirname, join, resolve } from "node:path";	13	import { dirname, join, resolve } from "node:path";
13	import { fileURLToPath } from "node:url";	14	import { fileURLToPath } from "node:url";
		15	import * as Console from "effect/Console";
		16	import * as Effect from "effect/Effect";
14		17
15	const repoRoot = resolve(dirname(fileURLToPath(import.meta.url)), "..");	18	const repoRoot = resolve(dirname(fileURLToPath(import.meta.url)), "..");
16		19
...	@@ -389,7 +392,7 @@ try {	...	@@ -389,7 +392,7 @@ try {
389	"Windows release smoke unexpectedly removed the x64 builder debug fixture.",	392	"Windows release smoke unexpectedly removed the x64 builder debug fixture.",
390	);	393	);
391		394
392	console.log("Release smoke checks passed.");	395	Effect.runSync(Console.log("Release smoke checks passed."));
393	} finally {	396	} finally {
394	rmSync(tempRoot, { recursive: true, force: true });	397	rmSync(tempRoot, { recursive: true, force: true });
395	}	398	}

scripts/resolve-nightly-release.ts+8-2

 @@ -2,7 +2,13 @@
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import { Config, Effect, FileSystem, Option, Path, Schema } from "effect";
+import * as Console from "effect/Console";
+import * as Config from "effect/Config";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Option from "effect/Option";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
 import { Command, Flag } from "effect/unstable/cli";
 interface NightlyReleaseMetadata {
 @@ -93,7 +99,7 @@ const writeOutput = Effect.fn("writeOutput")(function* (
     yield* fs.writeFileString(githubOutputPath, serialized, { flag: "a" });
   } else {
     for (const [key, value] of entries) {
-      console.log(`${key}=${value}`);
+      yield* Console.log(`${key}=${value}`);
     }
   }
 });

scripts/resolve-previous-release-tag.ts+7-1

 @@ -2,7 +2,13 @@
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import { Array, Config, Effect, FileSystem, Schema, Stream, String } from "effect";
+import * as Array from "effect/Array";
+import * as Config from "effect/Config";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Schema from "effect/Schema";
+import * as Stream from "effect/Stream";
+import * as String from "effect/String";
 import { Command, Flag } from "effect/unstable/cli";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";

scripts/tsconfig.json+1-6

 @@ -3,12 +3,7 @@
   "compilerOptions": {
     "composite": true,
     "types": ["node"],
-    "lib": ["ESNext", "esnext.disposable"],
+    "lib": ["ESNext", "esnext.disposable"]
-    "plugins": [
-      {
-        "name": "@effect/language-service"
-      }
-    ]
   },
   "include": ["**/*.ts"]
 }

scripts/update-release-package-versions.test.ts+11-13

 @@ -1,8 +1,14 @@
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, it } from "@effect/vitest";
-import { ConfigProvider, Effect, FileSystem, Layer, Path, Schema, SchemaGetter } from "effect";
+import * as ConfigProvider from "effect/ConfigProvider";
+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 Schema from "effect/Schema";
 import { Command, CliError } from "effect/unstable/cli";
 import * as TestConsole from "effect/testing/TestConsole";
+import { fromJsonStringPretty } from "@t3tools/shared/schemaJson";
 import {
   releasePackageFiles,
 @@ -13,17 +19,9 @@ import {
 const ScriptTestLayer = Layer.mergeAll(NodeServices.layer, TestConsole.layer);
 const runCli = Command.runWith(updateReleasePackageVersionsCommand, { version: "0.0.0" });
 const PackageJsonSchema = Schema.Record(Schema.String, Schema.Unknown);
-const PrettyJsonString = SchemaGetter.parseJson<string>().compose(
+const PackageJsonPrettyJson = fromJsonStringPretty(PackageJsonSchema);
-  SchemaGetter.stringifyJson({ space: 2 }),
+const decodePackageJson = Schema.decodeEffect(PackageJsonPrettyJson);
-);
+const encodePackageJson = Schema.encodeEffect(PackageJsonPrettyJson);
-const PackageJsonPrettyJson = Schema.fromJsonString(PackageJsonSchema).pipe(
-  Schema.encode({
-    decode: PrettyJsonString,
-    encode: PrettyJsonString,
-  }),
-);
-const decodePackageJson = Schema.decodeUnknownEffect(PackageJsonPrettyJson);
-const encodePackageJson = Schema.encodeSync(PackageJsonPrettyJson);
 const writePackageJsonFixtures = Effect.fn("writePackageJsonFixtures")(function* (
   rootDir: string,
 @@ -37,7 +35,7 @@ const writePackageJsonFixtures = Effect.fn("writePackageJsonFixtures")(function*
     yield* fs.makeDirectory(path.dirname(filePath), { recursive: true });
     yield* fs.writeFileString(
       filePath,
-      `${encodePackageJson({
+      `${yield* encodePackageJson({
         name: relativePath,
         version,
         private: true,

scripts/update-release-package-versions.ts+9-10

 @@ -2,8 +2,15 @@
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import { Config, Console, Effect, FileSystem, Option, Path, Schema, SchemaGetter } from "effect";
+import * as Config from "effect/Config";
+import * as Console from "effect/Console";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Option from "effect/Option";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
 import { Argument, Command, Flag } from "effect/unstable/cli";
+import { fromJsonStringPretty } from "@t3tools/shared/schemaJson";
 export const releasePackageFiles = [
   "apps/server/package.json",
 @@ -17,15 +24,7 @@ interface UpdateReleasePackageVersionsOptions {
 }
 const PackageJsonSchema = Schema.Record(Schema.String, Schema.Unknown);
-const PrettyJsonString = SchemaGetter.parseJson<string>().compose(
+const PackageJsonPrettyJson = fromJsonStringPretty(PackageJsonSchema);
-  SchemaGetter.stringifyJson({ space: 2 }),
-);
-const PackageJsonPrettyJson = Schema.fromJsonString(PackageJsonSchema).pipe(
-  Schema.encode({
-    decode: PrettyJsonString,
-    encode: PrettyJsonString,
-  }),
-);
 const decodePackageJson = Schema.decodeUnknownEffect(PackageJsonPrettyJson);
 const encodePackageJson = Schema.encodeSync(PackageJsonPrettyJson);

tsconfig.base.json+34-1

...	@@ -17,6 +17,39 @@	...	@@ -17,6 +17,39 @@
17	"skipLibCheck": true,	17	"skipLibCheck": true,
18	"allowSyntheticDefaultImports": true,	18	"allowSyntheticDefaultImports": true,
19	"esModuleInterop": true,	19	"esModuleInterop": true,
20	"resolveJsonModule": true	20	"resolveJsonModule": true,
		21	"plugins": [
		22	{
		23	"name": "@effect/language-service",
		24	"namespaceImportPackages": ["@effect/platform-node", "effect"],
		25	"diagnosticSeverity": {
		26	"importFromBarrel": "error",
		27	"anyUnknownInErrorContext": "error",
		28	"unsafeEffectTypeAssertion": "error",
		29	"instanceOfSchema": "error",
		30	"deterministicKeys": "error",
		31	"strictEffectProvide": "off",
		32	"missingEffectServiceDependency": "error",
		33	"leakingRequirements": "error",
		34	"globalErrorInEffectCatch": "error",
		35	"globalErrorInEffectFailure": "error",
		36	"unknownInEffectCatch": "error",
		37	"strictBooleanExpressions": "off",
		38	"preferSchemaOverJson": "error",
		39	"schemaSyncInEffect": "error",
		40	"cryptoRandomUUID": "error",
		41	"cryptoRandomUUIDInEffect": "error",
		42	"nodeBuiltinImport": "error",
		43	"globalDate": "error",
		44	"globalDateInEffect": "error",
		45	"globalConsole": "error",
		46	"globalConsoleInEffect": "error",
		47	"globalRandom": "error",
		48	"globalRandomInEffect": "error",
		49	"globalTimers": "error",
		50	"globalTimersInEffect": "error"
		51	}
		52	}
		53	]
21	}	54	}
22	}	55	}

author	Julius Marminge <julius0216@outlook.com> 2026-05-08 09:58:29-07:00
committer	GitHub <noreply@github.com> 2026-05-08 09:58:29-07:00
log	25b02f4ba28d9c6a1adff3475625e5b3fdacce4b
tree	cf015483f76067409dc4afcfe3edceea84494560
parent	131234be3fa53d9b0daff3e8116138d5bad079ba
signature	Signed by PGP key B5690EEEBB952194

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	// @effect-diagnostics-next-line nodeBuiltinImport:off - NodeHttpServer.layer takes `NodeHttp.createServer` as arg
1	import * as NodeHttp from "node:http";	2	import * as NodeHttp from "node:http";
2	import { mkdtempSync } from "node:fs";	3	import { mkdtempSync } from "node:fs";
3	import { tmpdir } from "node:os";	4	import { tmpdir } from "node:os";
...	@@ -5,7 +6,7 @@ import { join } from "node:path";	...	@@ -5,7 +6,7 @@ import { join } from "node:path";
5		6
6	import * as NodeHttpServer from "@effect/platform-node/NodeHttpServer";	7	import * as NodeHttpServer from "@effect/platform-node/NodeHttpServer";
7	import * as NodeServices from "@effect/platform-node/NodeServices";	8	import * as NodeServices from "@effect/platform-node/NodeServices";
8	import { NetService } from "@t3tools/shared/Net";	9	import * as NetService from "@t3tools/shared/Net";
9	import { assert, it } from "@effect/vitest";	10	import { assert, it } from "@effect/vitest";
10	import * as Effect from "effect/Effect";	11	import * as Effect from "effect/Effect";
11	import * as Layer from "effect/Layer";	12	import * as Layer from "effect/Layer";
...	@@ -138,7 +139,7 @@ const withLiveProjectCliServer = <A, E, R>(baseDir: string, run: () => Effect.Ef	...	@@ -138,7 +139,7 @@ const withLiveProjectCliServer = <A, E, R>(baseDir: string, run: () => Effect.Ef
138	}	139	}
139	yield* persistServerRuntimeState({	140	yield* persistServerRuntimeState({
140	path: config.serverRuntimeStatePath,	141	path: config.serverRuntimeStatePath,
141	state: makePersistedServerRuntimeState({	142	state: yield* makePersistedServerRuntimeState({
142	config,	143	config,
143	port: address.port,	144	port: address.port,
144	}),	145	}),
...	@@ -179,6 +180,7 @@ it.layer(NodeServices.layer)("bin cli parsing", (it) => {	...	@@ -179,6 +180,7 @@ it.layer(NodeServices.layer)("bin cli parsing", (it) => {
179	const createdOutput = yield* captureStdout(	180	const createdOutput = yield* captureStdout(
180	runCli(["auth", "pairing", "create", "--base-dir", baseDir, "--json"]),	181	runCli(["auth", "pairing", "create", "--base-dir", baseDir, "--json"]),
181	);	182	);
		183	// @effect-diagnostics-next-line preferSchemaOverJson:off
182	const created = JSON.parse(createdOutput.output) as {	184	const created = JSON.parse(createdOutput.output) as {
183	readonly id: string;	185	readonly id: string;
184	readonly credential: string;	186	readonly credential: string;
...	@@ -186,6 +188,7 @@ it.layer(NodeServices.layer)("bin cli parsing", (it) => {	...	@@ -186,6 +188,7 @@ it.layer(NodeServices.layer)("bin cli parsing", (it) => {
186	const listedOutput = yield* captureStdout(	188	const listedOutput = yield* captureStdout(
187	runCli(["auth", "pairing", "list", "--base-dir", baseDir, "--json"]),	189	runCli(["auth", "pairing", "list", "--base-dir", baseDir, "--json"]),
188	);	190	);
		191	// @effect-diagnostics-next-line preferSchemaOverJson:off
189	const listed = JSON.parse(listedOutput.output) as ReadonlyArray<{	192	const listed = JSON.parse(listedOutput.output) as ReadonlyArray<{
190	readonly id: string;	193	readonly id: string;
191	readonly credential?: string;	194	readonly credential?: string;
...	@@ -207,6 +210,7 @@ it.layer(NodeServices.layer)("bin cli parsing", (it) => {	...	@@ -207,6 +210,7 @@ it.layer(NodeServices.layer)("bin cli parsing", (it) => {
207	const issuedOutput = yield* captureStdout(	210	const issuedOutput = yield* captureStdout(
208	runCli(["auth", "session", "issue", "--base-dir", baseDir, "--json"]),	211	runCli(["auth", "session", "issue", "--base-dir", baseDir, "--json"]),
209	);	212	);
		213	// @effect-diagnostics-next-line preferSchemaOverJson:off
210	const issued = JSON.parse(issuedOutput.output) as {	214	const issued = JSON.parse(issuedOutput.output) as {
211	readonly sessionId: string;	215	readonly sessionId: string;
212	readonly token: string;	216	readonly token: string;
...	@@ -215,6 +219,7 @@ it.layer(NodeServices.layer)("bin cli parsing", (it) => {	...	@@ -215,6 +219,7 @@ it.layer(NodeServices.layer)("bin cli parsing", (it) => {
215	const listedOutput = yield* captureStdout(	219	const listedOutput = yield* captureStdout(
216	runCli(["auth", "session", "list", "--base-dir", baseDir, "--json"]),	220	runCli(["auth", "session", "list", "--base-dir", baseDir, "--json"]),
217	);	221	);
		222	// @effect-diagnostics-next-line preferSchemaOverJson:off
218	const listed = JSON.parse(listedOutput.output) as ReadonlyArray<{	223	const listed = JSON.parse(listedOutput.output) as ReadonlyArray<{
219	readonly sessionId: string;	224	readonly sessionId: string;
220	readonly token?: string;	225	readonly token?: string;

...	@@ -4,7 +4,8 @@	...	@@ -4,7 +4,8 @@
4	*/	4	*/
5	import * as NodeServices from "@effect/platform-node/NodeServices";	5	import * as NodeServices from "@effect/platform-node/NodeServices";
6	import { it } from "@effect/vitest";	6	import { it } from "@effect/vitest";
7	import { Effect } from "effect";	7	import * as Console from "effect/Console";
		8	import * as Effect from "effect/Effect";
8	import { describe, expect } from "vitest";	9	import { describe, expect } from "vitest";
9	import type * as EffectAcpSchema from "effect-acp/schema";	10	import type * as EffectAcpSchema from "effect-acp/schema";
10		11
...	@@ -44,12 +45,14 @@ describe.runIf(process.env.T3_CURSOR_ACP_PROBE === "1")("Cursor ACP CLI probe",	...	@@ -44,12 +45,14 @@ describe.runIf(process.env.T3_CURSOR_ACP_PROBE === "1")("Cursor ACP CLI probe",
44	const runtime = yield* AcpSessionRuntime;	45	const runtime = yield* AcpSessionRuntime;
45	const started = yield* runtime.start();	46	const started = yield* runtime.start();
46	const result = started.sessionSetupResult;	47	const result = started.sessionSetupResult;
47	console.log("session/new result:", JSON.stringify(result, null, 2));	48	// @effect-diagnostics-next-line preferSchemaOverJson:off
		49	yield* Console.log("session/new result:", JSON.stringify(result, null, 2));
48		50
49	expect(typeof started.sessionId).toBe("string");	51	expect(typeof started.sessionId).toBe("string");
50		52
51	const configOptions = result.configOptions;	53	const configOptions = result.configOptions;
52	console.log("session/new configOptions:", JSON.stringify(configOptions, null, 2));	54	// @effect-diagnostics-next-line preferSchemaOverJson:off
		55	yield* Console.log("session/new configOptions:", JSON.stringify(configOptions, null, 2));
53		56
54	if (Array.isArray(configOptions)) {	57	if (Array.isArray(configOptions)) {
55	const modelConfig = configOptions.find((opt) => opt.category === "model");	58	const modelConfig = configOptions.find((opt) => opt.category === "model");
...	@@ -59,9 +62,11 @@ describe.runIf(process.env.T3_CURSOR_ACP_PROBE === "1")("Cursor ACP CLI probe",	...	@@ -59,9 +62,11 @@ describe.runIf(process.env.T3_CURSOR_ACP_PROBE === "1")("Cursor ACP CLI probe",
59	opt.category === "model_option" \|\|	62	opt.category === "model_option" \|\|
60	opt.category === "model_config",	63	opt.category === "model_config",
61	);	64	);
62	console.log("Model config option:", JSON.stringify(modelConfig, null, 2));	65	// @effect-diagnostics-next-line preferSchemaOverJson:off
63	console.log(	66	yield* Console.log("Model config option:", JSON.stringify(modelConfig, null, 2));
		67	yield* Console.log(
64	"Parameterized model config options:",	68	"Parameterized model config options:",
		69	// @effect-diagnostics-next-line preferSchemaOverJson:off
65	JSON.stringify(parameterizedOptions, null, 2),	70	JSON.stringify(parameterizedOptions, null, 2),
66	);	71	);
67	expect(modelConfig).toBeDefined();	72	expect(modelConfig).toBeDefined();
...	@@ -107,8 +112,8 @@ describe.runIf(process.env.T3_CURSOR_ACP_PROBE === "1")("Cursor ACP CLI probe",	...	@@ -107,8 +112,8 @@ describe.runIf(process.env.T3_CURSOR_ACP_PROBE === "1")("Cursor ACP CLI probe",
107		112
108	const setResult: EffectAcpSchema.SetSessionConfigOptionResponse =	113	const setResult: EffectAcpSchema.SetSessionConfigOptionResponse =
109	yield* runtime.setConfigOption(modelConfigId, "gpt-5.4");	114	yield* runtime.setConfigOption(modelConfigId, "gpt-5.4");
110		115	// @effect-diagnostics-next-line preferSchemaOverJson:off
111	console.log("session/set_config_option result:", JSON.stringify(setResult, null, 2));	116	yield* Console.log("session/set_config_option result:", JSON.stringify(setResult, null, 2));
112		117
113	if (Array.isArray(setResult.configOptions)) {	118	if (Array.isArray(setResult.configOptions)) {
114	const modelConfig = setResult.configOptions.find((opt) => opt.category === "model");	119	const modelConfig = setResult.configOptions.find((opt) => opt.category === "model");

Enable stricter Effect LSP rules (#2596)