Commit e63d5b240f908ec3cf69b49ac7488b33dc5231c0 | the-knife

apps/server/src/codexAppServerManager.test.ts+9-6

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	import { describe, expect, it, vi } from "vitest";	1	import { describe, expect, it, vi } from "vitest";
		2	import { ProviderSessionId } from "@t3tools/contracts";
2		3
3	import {	4	import {
4	CodexAppServerManager,	5	CodexAppServerManager,
...	@@ -7,6 +8,8 @@ import {	...	@@ -7,6 +8,8 @@ import {
7	normalizeCodexModelSlug,	8	normalizeCodexModelSlug,
8	} from "./codexAppServerManager";	9	} from "./codexAppServerManager";
9		10
		11	const asSessionId = (value: string): ProviderSessionId => ProviderSessionId.makeUnsafe(value);
		12
10	function createSendTurnHarness() {	13	function createSendTurnHarness() {
11	const manager = new CodexAppServerManager();	14	const manager = new CodexAppServerManager();
12	const context = {	15	const context = {
...	@@ -183,7 +186,7 @@ describe("sendTurn", () => {	...	@@ -183,7 +186,7 @@ describe("sendTurn", () => {
183	createSendTurnHarness();	186	createSendTurnHarness();
184		187
185	const result = await manager.sendTurn({	188	const result = await manager.sendTurn({
186	sessionId: "sess_1",	189	sessionId: asSessionId("sess_1"),
187	input: "Inspect this image",	190	input: "Inspect this image",
188	attachments: [	191	attachments: [
189	{	192	{
...	@@ -229,7 +232,7 @@ describe("sendTurn", () => {	...	@@ -229,7 +232,7 @@ describe("sendTurn", () => {
229	const { manager, context, sendRequest } = createSendTurnHarness();	232	const { manager, context, sendRequest } = createSendTurnHarness();
230		233
231	await manager.sendTurn({	234	await manager.sendTurn({
232	sessionId: "sess_1",	235	sessionId: asSessionId("sess_1"),
233	attachments: [	236	attachments: [
234	{	237	{
235	type: "image",	238	type: "image",
...	@@ -257,7 +260,7 @@ describe("sendTurn", () => {	...	@@ -257,7 +260,7 @@ describe("sendTurn", () => {
257		260
258	await expect(	261	await expect(
259	manager.sendTurn({	262	manager.sendTurn({
260	sessionId: "sess_1",	263	sessionId: asSessionId("sess_1"),
261	}),	264	}),
262	).rejects.toThrow("Turn input must include text or attachments.");	265	).rejects.toThrow("Turn input must include text or attachments.");
263	});	266	});
...	@@ -278,7 +281,7 @@ describe("thread checkpoint control", () => {	...	@@ -278,7 +281,7 @@ describe("thread checkpoint control", () => {
278	},	281	},
279	});	282	});
280		283
281	const result = await manager.readThread("sess_1");	284	const result = await manager.readThread(asSessionId("sess_1"));
282		285
283	expect(requireSession).toHaveBeenCalledWith("sess_1");	286	expect(requireSession).toHaveBeenCalledWith("sess_1");
284	expect(sendRequest).toHaveBeenCalledWith(context, "thread/read", {	287	expect(sendRequest).toHaveBeenCalledWith(context, "thread/read", {
...	@@ -308,7 +311,7 @@ describe("thread checkpoint control", () => {	...	@@ -308,7 +311,7 @@ describe("thread checkpoint control", () => {
308	],	311	],
309	});	312	});
310		313
311	const result = await manager.readThread("sess_1");	314	const result = await manager.readThread(asSessionId("sess_1"));
312		315
313	expect(sendRequest).toHaveBeenCalledWith(context, "thread/read", {	316	expect(sendRequest).toHaveBeenCalledWith(context, "thread/read", {
314	threadId: "thread_1",	317	threadId: "thread_1",
...	@@ -334,7 +337,7 @@ describe("thread checkpoint control", () => {	...	@@ -334,7 +337,7 @@ describe("thread checkpoint control", () => {
334	},	337	},
335	});	338	});
336		339
337	const result = await manager.rollbackThread("sess_1", 2);	340	const result = await manager.rollbackThread(asSessionId("sess_1"), 2);
338		341
339	expect(sendRequest).toHaveBeenCalledWith(context, "thread/rollback", {	342	expect(sendRequest).toHaveBeenCalledWith(context, "thread/rollback", {
340	threadId: "thread_1",	343	threadId: "thread_1",

apps/server/src/index.ts+17-177

...	@@ -1,177 +1,17 @@	...	@@ -1,177 +1,17 @@
1	import fs from "node:fs";	1	import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
2	import net from "node:net";	2	import * as NodeServices from "@effect/platform-node/NodeServices";
3	import os from "node:os";	3	import * as Effect from "effect/Effect";
4	import path from "node:path";	4	import * as Layer from "effect/Layer";
5	import { fileURLToPath } from "node:url";	5
6		6	import { CliConfigLive, makeCliCommand } from "./main";
7	import { fixPath } from "./fixPath";	7	import { OpenLive } from "./open";
8	import { createLogger } from "./logger";	8	import { Command } from "effect/unstable/cli";
9	import { createServer } from "./wsServer";	9	import { version } from "../package.json" with { type: "json" };
10		10	import { ServerLive } from "./wsServer";
11	fixPath();	11
12		12	const RuntimeLayer = Layer.mergeAll(CliConfigLive, ServerLive, OpenLive, NodeServices.layer);
13	const DEFAULT_PORT = 3773;	13
14	// Dummy comment for a no-op change request.	14	Command.run(makeCliCommand(), { version }).pipe(
15	// Additional dummy comment requested in chat.	15	Effect.provide(RuntimeLayer),
16	const cwd = process.cwd();	16	NodeRuntime.runMain,
17	const logger = createLogger("server");	17	);
18
19	type RuntimeMode = "web" \| "desktop";
20
21	function parseBooleanEnv(value: string \| undefined): boolean \| undefined {
22	if (value === undefined) return undefined;
23	const normalized = value.trim().toLowerCase();
24	if (["1", "true", "yes", "on"].includes(normalized)) return true;
25	if (["0", "false", "no", "off"].includes(normalized)) return false;
26	return undefined;
27	}
28
29	function parsePort(value: string \| undefined): number \| undefined {
30	if (!value) return undefined;
31	const parsed = Number(value);
32	if (!Number.isInteger(parsed) \|\| parsed < 1 \|\| parsed > 65535) {
33	throw new Error(`Invalid T3CODE_PORT: ${value}`);
34	}
35	return parsed;
36	}
37
38	function expandHomePath(input: string): string {
39	if (input === "~") return os.homedir();
40	if (input.startsWith("~/")) {
41	return path.join(os.homedir(), input.slice(2));
42	}
43	return input;
44	}
45
46	function resolveStateDir(raw: string \| undefined): string {
47	if (!raw \|\| raw.trim().length === 0) {
48	return path.join(os.homedir(), ".t3", "userdata");
49	}
50	return path.resolve(expandHomePath(raw.trim()));
51	}
52
53	async function findAvailablePort(preferred: number): Promise<number> {
54	return new Promise((resolve, reject) => {
55	const server = net.createServer();
56	server.listen(preferred, () => {
57	server.close(() => resolve(preferred));
58	});
59	server.on("error", () => {
60	// Preferred port busy — let the OS pick one
61	const fallback = net.createServer();
62	fallback.listen(0, () => {
63	const addr = fallback.address();
64	const port = typeof addr === "object" && addr !== null ? addr.port : 0;
65	fallback.close(() => {
66	if (port > 0) resolve(port);
67	else reject(new Error("Could not find an available port."));
68	});
69	});
70	fallback.on("error", reject);
71	});
72	});
73	}
74
75	function resolveStaticDir(): string \| undefined {
76	const __dirname = path.dirname(fileURLToPath(import.meta.url));
77
78	// Check for bundled client (npm publish / npx scenario):
79	// dist/client/ lives alongside dist/index.js
80	const bundledClient = path.resolve(__dirname, "client");
81	try {
82	const stat = fs.statSync(path.join(bundledClient, "index.html"));
83	if (stat.isFile()) return bundledClient;
84	} catch {
85	// Not bundled — check monorepo layout
86	}
87
88	// Monorepo layout: apps/server/dist/index.js → apps/web/dist/
89	const monorepoClient = path.resolve(__dirname, "../../web/dist");
90	try {
91	const stat = fs.statSync(path.join(monorepoClient, "index.html"));
92	if (stat.isFile()) return monorepoClient;
93	} catch {
94	// Not found — probably dev mode, Vite will serve
95	}
96
97	return undefined;
98	}
99
100	async function main() {
101	const mode: RuntimeMode = process.env.T3CODE_MODE === "desktop" ? "desktop" : "web";
102	const requestedPort = parsePort(process.env.T3CODE_PORT);
103	const port =
104	requestedPort ?? (mode === "desktop" ? DEFAULT_PORT : await findAvailablePort(DEFAULT_PORT));
105	const stateDir = resolveStateDir(process.env.T3CODE_STATE_DIR);
106	const devUrl = process.env.VITE_DEV_SERVER_URL;
107	const noBrowser = parseBooleanEnv(process.env.T3CODE_NO_BROWSER) ?? mode === "desktop";
108	const authToken = process.env.T3CODE_AUTH_TOKEN;
109	const staticDir = devUrl ? undefined : resolveStaticDir();
110
111	if (!devUrl && !staticDir) {
112	logger.warn("web bundle missing and no VITE_DEV_SERVER_URL; web UI unavailable", {
113	hint: "Run `bun run --cwd apps/web build` or set VITE_DEV_SERVER_URL for dev mode.",
114	});
115	}
116
117	const server = createServer({
118	port,
119	host: mode === "desktop" ? "127.0.0.1" : undefined,
120	cwd,
121	autoBootstrapProjectFromCwd: mode === "web",
122	stateDir,
123	staticDir,
124	devUrl,
125	authToken,
126	});
127	await server.start();
128
129	const url = `http://localhost:${port}`;
130	logger.info("T3 Code running", {
131	url,
132	cwd,
133	mode,
134	stateDir,
135	authEnabled: Boolean(authToken),
136	});
137
138	// Open browser (dynamic import because `open` is ESM-only)
139	if (!noBrowser) {
140	try {
141	const open = await import("open");
142	const target = devUrl ?? url;
143	await open.default(target);
144	} catch {
145	logger.info("browser auto-open unavailable", {
146	hint: `Open ${devUrl ?? url} in your browser.`,
147	});
148	}
149	}
150
151	// Graceful shutdown
152	let shuttingDown = false;
153	async function shutdown() {
154	if (shuttingDown) return;
155	shuttingDown = true;
156	logger.info("shutting down");
157	try {
158	await server.stop();
159	process.exit(0);
160	} catch (error) {
161	logger.error("failed to stop server cleanly", { error });
162	process.exit(1);
163	}
164	}
165
166	process.on("SIGINT", () => {
167	void shutdown();
168	});
169	process.on("SIGTERM", () => {
170	void shutdown();
171	});
172	}
173
174	main().catch((err) => {
175	logger.error("failed to start T3 Code", { error: err });
176	process.exit(1);
177	});

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

...	@@ -326,7 +326,7 @@ function loadCustomKeybindingsConfig(	...	@@ -326,7 +326,7 @@ function loadCustomKeybindingsConfig(
326	const sanitized: Mutable<KeybindingsConfig> = [];	326	const sanitized: Mutable<KeybindingsConfig> = [];
327	let invalidEntries = 0;	327	let invalidEntries = 0;
328	for (const entry of parsed) {	328	for (const entry of parsed) {
329	const result = Schema.decodeUnknownExit(KeybindingRule)(entry);	329	const result = Schema.decodeExit(KeybindingRule)(entry);
330	if (result._tag === "Success") {	330	if (result._tag === "Success") {
331	if (!compileResolvedKeybindingRule(result.value)) {	331	if (!compileResolvedKeybindingRule(result.value)) {
332	invalidEntries += 1;	332	invalidEntries += 1;

apps/server/src/main.test.ts created+131

...	@@ -0,0 +1,131 @@
1	import { NodeServices } from "@effect/platform-node";
2	import { assert, it, vi } from "@effect/vitest";
3	import * as ConfigProvider from "effect/ConfigProvider";
4	import * as Effect from "effect/Effect";
5	import * as Layer from "effect/Layer";
6	import * as Command from "effect/unstable/cli/Command";
7	import { beforeEach } from "vitest";
8
9	import { CliConfig, makeCliCommand, type CliConfigShape } from "./main";
10	import { Open, type OpenShape } from "./open";
11	import { Server, type ServerShape, type ServerOptions } from "./wsServer";
12
13	const start = vi.fn(async () => undefined);
14	const stop = vi.fn(async () => undefined);
15	const createServer = vi.fn((_: ServerOptions) => ({
16	start,
17	stop,
18	httpServer: undefined as never,
19	}));
20	const findAvailablePort = vi.fn((preferred: number) => Effect.succeed(preferred));
21
22	const testLayer = Layer.mergeAll(
23	Layer.succeed(CliConfig, {
24	cwd: "/tmp/t3-test-workspace",
25	fixPath: Effect.void,
26	findAvailablePort,
27	resolveStaticDir: () => undefined,
28	} satisfies CliConfigShape),
29	Layer.succeed(Server, {
30	createServer,
31	} satisfies ServerShape),
32	Layer.succeed(Open, {
33	openBrowser: (_target: string) => Effect.void,
34	openInEditor: () => Effect.void,
35	} satisfies OpenShape),
36	NodeServices.layer,
37	);
38
39	const runCli = (
40	args: ReadonlyArray<string>,
41	env: Record<string, string> = { T3CODE_NO_BROWSER: "true" },
42	) =>
43	Command.runWith(makeCliCommand(), { version: "0.0.0-test" })(args).pipe(
44	Effect.provide(ConfigProvider.layer(ConfigProvider.fromEnv({ env }))),
45	);
46
47	beforeEach(() => {
48	vi.clearAllMocks();
49	start.mockImplementation(async () => undefined);
50	stop.mockImplementation(async () => undefined);
51	createServer.mockImplementation((_: ServerOptions) => ({
52	start,
53	stop,
54	httpServer: undefined as never,
55	}));
56	findAvailablePort.mockImplementation((preferred: number) => Effect.succeed(preferred));
57	});
58
59	it.layer(testLayer)("server cli", (it) => {
60	it.effect("parses --port and --token and wires scoped start/stop", () =>
61	Effect.gen(function* () {
62	yield* runCli(["--port", "4010", "--token", "secret"]);
63
64	assert.equal(createServer.mock.calls.length, 1);
65	const options = createServer.mock.calls[0]?.[0];
66	assert.equal(options?.port, 4010);
67	assert.equal(options?.authToken, "secret");
68	assert.equal(start.mock.calls.length, 1);
69	assert.equal(stop.mock.calls.length, 1);
70	}),
71	);
72
73	it.effect("uses env fallbacks when flags are not provided", () =>
74	Effect.gen(function* () {
75	yield* runCli([], {
76	T3CODE_NO_BROWSER: "true",
77	T3CODE_PORT: "4999",
78	T3CODE_AUTH_TOKEN: "env-token",
79	});
80
81	assert.equal(createServer.mock.calls.length, 1);
82	const options = createServer.mock.calls[0]?.[0];
83	assert.equal(options?.port, 4999);
84	assert.equal(options?.authToken, "env-token");
85	assert.equal(findAvailablePort.mock.calls.length, 0);
86	}),
87	);
88
89	it.effect("uses dynamic port discovery in web mode when port is omitted", () =>
90	Effect.gen(function* () {
91	findAvailablePort.mockImplementation((_preferred: number) => Effect.succeed(5444));
92	yield* runCli([]);
93
94	assert.deepStrictEqual(findAvailablePort.mock.calls, [[3773]]);
95	assert.equal(createServer.mock.calls.length, 1);
96	const options = createServer.mock.calls[0]?.[0];
97	assert.equal(options?.port, 5444);
98	assert.equal(options?.host, undefined);
99	}),
100	);
101
102	it.effect("uses fixed localhost defaults in desktop mode", () =>
103	Effect.gen(function* () {
104	yield* runCli([], {
105	T3CODE_MODE: "desktop",
106	T3CODE_NO_BROWSER: "true",
107	});
108
109	assert.equal(findAvailablePort.mock.calls.length, 0);
110	assert.equal(createServer.mock.calls.length, 1);
111	const options = createServer.mock.calls[0]?.[0];
112	assert.equal(options?.port, 3773);
113	assert.equal(options?.host, "127.0.0.1");
114	}),
115	);
116
117	it.effect("fails for out-of-range --port values", () =>
118	Effect.gen(function* () {
119	const result = yield* Effect.result(runCli(["--port", "70000"]));
120
121	assert.equal(result._tag, "Failure");
122	if (result._tag === "Failure") {
123	assert.equal(
124	result.failure.message,
125	"Invalid --port: 70000. Expected an integer between 1 and 65535.",
126	);
127	}
128	assert.equal(createServer.mock.calls.length, 0);
129	}),
130	);
131	});

apps/server/src/main.ts created+284

...	@@ -0,0 +1,284 @@
1	import fs from "node:fs";
2	import net from "node:net";
3	import os from "node:os";
4	import path from "node:path";
5	import { fileURLToPath } from "node:url";
6
7	import * as Data from "effect/Data";
8	import * as Effect from "effect/Effect";
9	import * as Layer from "effect/Layer";
10	import * as Option from "effect/Option";
11	import * as Config from "effect/Config";
12	import { ServiceMap } from "effect";
13	import * as Command from "effect/unstable/cli/Command";
14	import * as Flag from "effect/unstable/cli/Flag";
15
16	import { fixPath } from "./fixPath";
17	import { Open } from "./open";
18	import { Server } from "./wsServer";
19
20	const DEFAULT_PORT = 3773;
21
22	type RuntimeMode = "web" \| "desktop";
23
24	export class StartupError extends Data.TaggedError("StartupError")<{
25	readonly message: string;
26	readonly cause?: unknown;
27	}> {}
28
29	interface CliInput {
30	readonly port: Option.Option<number>;
31	readonly token: Option.Option<string>;
32	}
33
34	interface ResolvedCliConfig {
35	readonly port: number;
36	readonly mode: RuntimeMode;
37	readonly cwd: string;
38	readonly stateDir: string;
39	readonly devUrl: URL \| undefined;
40	readonly noBrowser: boolean;
41	readonly authToken: string \| undefined;
42	readonly staticDir: string \| undefined;
43	}
44
45	export interface CliConfigShape {
46	readonly cwd: string;
47	readonly fixPath: Effect.Effect<unknown, never>;
48	readonly findAvailablePort: (preferred: number) => Effect.Effect<number, StartupError>;
49	readonly resolveStaticDir: () => string \| undefined;
50	}
51
52	export class CliConfig extends ServiceMap.Service<CliConfig, CliConfigShape>()(
53	"server/CliConfig",
54	) {}
55
56	const CliEnvConfig = Config.all({
57	mode: Config.string("T3CODE_MODE").pipe(
58	Config.option,
59	Config.map(
60	Option.match({
61	onNone: () => "web" as const,
62	onSome: (value) => (value === "desktop" ? "desktop" : "web"),
63	}),
64	),
65	),
66	port: Config.port("T3CODE_PORT").pipe(Config.option, Config.map(Option.getOrUndefined)),
67	stateDir: Config.string("T3CODE_STATE_DIR").pipe(
68	Config.option,
69	Config.map(Option.getOrUndefined),
70	),
71	devUrl: Config.url("VITE_DEV_SERVER_URL").pipe(Config.option, Config.map(Option.getOrUndefined)),
72	noBrowser: Config.boolean("T3CODE_NO_BROWSER").pipe(
73	Config.option,
74	Config.map(Option.getOrUndefined),
75	),
76	authToken: Config.string("T3CODE_AUTH_TOKEN").pipe(
77	Config.option,
78	Config.map(Option.getOrUndefined),
79	),
80	});
81
82	function assertValidPort(value: number, source: string): Effect.Effect<number, StartupError> {
83	if (Number.isInteger(value) && value >= 1 && value <= 65535) {
84	return Effect.succeed(value);
85	}
86	return Effect.fail(
87	new StartupError({
88	message: `Invalid ${source}: ${value}. Expected an integer between 1 and 65535.`,
89	}),
90	);
91	}
92
93	function expandHomePath(input: string): string {
94	if (input === "~") return os.homedir();
95	if (input.startsWith("~/")) {
96	return path.join(os.homedir(), input.slice(2));
97	}
98	return input;
99	}
100
101	function resolveStateDir(raw: string \| undefined): string {
102	if (!raw \|\| raw.trim().length === 0) {
103	return path.join(os.homedir(), ".t3", "userdata");
104	}
105	return path.resolve(expandHomePath(raw.trim()));
106	}
107
108	async function findAvailablePort(preferred: number): Promise<number> {
109	return new Promise((resolve, reject) => {
110	const server = net.createServer();
111	server.listen(preferred, () => {
112	server.close(() => resolve(preferred));
113	});
114	server.on("error", () => {
115	const fallback = net.createServer();
116	fallback.listen(0, () => {
117	const addr = fallback.address();
118	const port = typeof addr === "object" && addr !== null ? addr.port : 0;
119	fallback.close(() => {
120	if (port > 0) resolve(port);
121	else reject(new Error("Could not find an available port."));
122	});
123	});
124	fallback.on("error", reject);
125	});
126	});
127	}
128
129	function resolveStaticDir(): string \| undefined {
130	const __dirname = path.dirname(fileURLToPath(import.meta.url));
131
132	const bundledClient = path.resolve(__dirname, "client");
133	try {
134	const stat = fs.statSync(path.join(bundledClient, "index.html"));
135	if (stat.isFile()) return bundledClient;
136	} catch {
137	// Not bundled — check monorepo layout.
138	}
139
140	const monorepoClient = path.resolve(__dirname, "../../web/dist");
141	try {
142	const stat = fs.statSync(path.join(monorepoClient, "index.html"));
143	if (stat.isFile()) return monorepoClient;
144	} catch {
145	// Not found — probably dev mode.
146	}
147
148	return undefined;
149	}
150
151	function resolveCliConfig(
152	input: CliInput,
153	): Effect.Effect<ResolvedCliConfig, StartupError, CliConfig> {
154	return Effect.gen(function* () {
155	const cliConfig = yield* CliConfig;
156	const env = yield* CliEnvConfig.asEffect().pipe(
157	Effect.mapError(
158	(cause) =>
159	new StartupError({
160	message: "Failed to read environment configuration",
161	cause,
162	}),
163	),
164	);
165	const mode: RuntimeMode = env.mode === "desktop" ? "desktop" : "web";
166
167	const cliPort = Option.getOrUndefined(input.port);
168	const requestedPort =
169	cliPort === undefined ? env.port : yield* assertValidPort(cliPort, "--port");
170
171	const port =
172	requestedPort ??
173	(mode === "desktop" ? DEFAULT_PORT : yield* cliConfig.findAvailablePort(DEFAULT_PORT));
174	const stateDir = resolveStateDir(env.stateDir);
175	const devUrl = env.devUrl;
176	const noBrowser = env.noBrowser ?? mode === "desktop";
177	const authToken = Option.getOrUndefined(input.token) ?? env.authToken;
178	const staticDir = devUrl ? undefined : cliConfig.resolveStaticDir();
179
180	return {
181	mode,
182	port,
183	stateDir,
184	devUrl,
185	noBrowser,
186	authToken,
187	staticDir,
188	cwd: cliConfig.cwd,
189	};
190	});
191	}
192
193	const makeServerProgram = Effect.fn(function* (input: CliInput) {
194	const cliConfig = yield* CliConfig;
195	const serverDeps = yield* Server;
196	const openDeps = yield* Open;
197	yield* cliConfig.fixPath;
198	const config = yield* resolveCliConfig(input);
199
200	if (!config.devUrl && !config.staticDir) {
201	yield* Effect.logWarning("web bundle missing and no VITE_DEV_SERVER_URL; web UI unavailable", {
202	hint: "Run `bun run --cwd apps/web build` or set VITE_DEV_SERVER_URL for dev mode.",
203	});
204	}
205
206	yield* Effect.acquireRelease(
207	Effect.tryPromise({
208	try: async () => {
209	const server = serverDeps.createServer({
210	port: config.port,
211	host: config.mode === "desktop" ? "127.0.0.1" : undefined,
212	cwd: config.cwd,
213	autoBootstrapProjectFromCwd: config.mode === "web",
214	stateDir: config.stateDir,
215	staticDir: config.staticDir,
216	devUrl: config.devUrl?.href,
217	authToken: config.authToken,
218	});
219	await server.start();
220	return server;
221	},
222	catch: (cause) => new StartupError({ message: "Failed to start server", cause }),
223	}),
224	(server) =>
225	Effect.tryPromise({
226	try: () => server.stop(),
227	catch: (cause) => new StartupError({ message: "Failed to stop server", cause }),
228	}).pipe(Effect.catch((error) => Effect.logError("failed to stop server cleanly", { error }))),
229	);
230
231	const url = `http://localhost:${config.port}`;
232	yield* Effect.logInfo("T3 Code running", {
233	url,
234	cwd: config.cwd,
235	mode: config.mode,
236	stateDir: config.stateDir,
237	authEnabled: Boolean(config.authToken),
238	});
239
240	if (!config.noBrowser) {
241	const target = config.devUrl ?? url;
242	yield* openDeps.openBrowser(target.toString()).pipe(
243	Effect.catch(() =>
244	Effect.logInfo("browser auto-open unavailable", {
245	hint: `Open ${target} in your browser.`,
246	}),
247	),
248	);
249	}
250	}, Effect.scoped);
251
252	export function makeCliCommand() {
253	const portFlag = Flag.integer("port").pipe(
254	Flag.withDescription("Port for the HTTP/WebSocket server."),
255	Flag.optional,
256	);
257	const tokenFlag = Flag.string("token").pipe(
258	Flag.withDescription("Auth token required for WebSocket connections."),
259	Flag.optional,
260	);
261
262	return Command.make("t3", {
263	port: portFlag,
264	token: tokenFlag,
265	}).pipe(
266	Command.withDescription("Run the T3 Code server."),
267	Command.withHandler((input) => makeServerProgram(input)),
268	);
269	}
270
271	export const CliConfigLive = Layer.succeed(CliConfig, {
272	cwd: process.cwd(),
273	fixPath: Effect.sync(fixPath),
274	findAvailablePort: (preferred) =>
275	Effect.tryPromise({
276	try: () => findAvailablePort(preferred),
277	catch: (cause) =>
278	new StartupError({
279	message: "Failed to discover an available port",
280	cause,
281	}),
282	}),
283	resolveStaticDir,
284	} satisfies CliConfigShape);

apps/server/src/open.ts created+93

...	@@ -0,0 +1,93 @@
1	import { spawn } from "node:child_process";
2
3	import { EDITORS, type EditorId } from "@t3tools/contracts";
4	import { ServiceMap, Schema, Effect, Layer } from "effect";
5
6	export class OpenError extends Schema.TaggedErrorClass<OpenError>()("OpenError", {
7	message: Schema.String,
8	cause: Schema.optional(Schema.Defect),
9	}) {}
10
11	export interface OpenInEditorInput {
12	readonly cwd: string;
13	readonly editor: EditorId;
14	}
15
16	interface EditorLaunch {
17	readonly command: string;
18	readonly args: ReadonlyArray<string>;
19	}
20
21	export interface OpenShape {
22	readonly openBrowser: (target: string) => Effect.Effect<void, OpenError>;
23	readonly openInEditor: (input: OpenInEditorInput) => Effect.Effect<void, OpenError>;
24	}
25
26	export class Open extends ServiceMap.Service<Open, OpenShape>()("server/Open") {}
27
28	export function resolveEditorLaunch(
29	input: OpenInEditorInput,
30	platform: NodeJS.Platform = process.platform,
31	): EditorLaunch {
32	const editorDef = EDITORS.find((editor) => editor.id === input.editor);
33	if (!editorDef) {
34	throw new OpenError({ message: `Unknown editor: ${input.editor}` });
35	}
36
37	if (editorDef.command) {
38	return { command: editorDef.command, args: [input.cwd] };
39	}
40
41	if (editorDef.id !== "file-manager") {
42	throw new OpenError({ message: `Unsupported editor: ${input.editor}` });
43	}
44
45	switch (platform) {
46	case "darwin":
47	return { command: "open", args: [input.cwd] };
48	case "win32":
49	return { command: "explorer", args: [input.cwd] };
50	default:
51	return { command: "xdg-open", args: [input.cwd] };
52	}
53	}
54
55	const OpenDefault: OpenShape = {
56	openBrowser: (target) =>
57	Effect.tryPromise({
58	try: async () => {
59	const open = await import("open");
60	await open.default(target);
61	},
62	catch: (cause) =>
63	new OpenError({
64	message: "Browser auto-open failed",
65	cause,
66	}),
67	}),
68	openInEditor: (input) =>
69	Effect.try({
70	try: () => {
71	const launch = resolveEditorLaunch(input);
72	const child = spawn(launch.command, [...launch.args], {
73	detached: true,
74	stdio: "ignore",
75	});
76	child.on("error", () => {
77	// Best-effort behavior for detached editor launches.
78	});
79	child.unref();
80	},
81	catch: (cause) =>
82	cause instanceof OpenError
83	? cause
84	: new OpenError({
85	message: "Failed to open editor",
86	cause,
87	}),
88	}),
89	};
90
91	export const OpenLive = Layer.succeed(Open, OpenDefault);
92
93	export const OpenDefaultService = OpenDefault;

apps/server/src/orchestration/Layer.test.ts+75-56

 @@ -1,4 +1,12 @@
-import type { OrchestrationEvent } from "@t3tools/contracts";
+import {
+  CheckpointRef,
+  CommandId,
+  MessageId,
+  ProjectId,
+  ThreadId,
+  TurnId,
+  type OrchestrationEvent,
+} from "@t3tools/contracts";
 import { Effect, Layer, ManagedRuntime, Queue, Stream } from "effect";
 import { describe, expect, it } from "vitest";
 @@ -14,6 +22,13 @@ import { OrchestrationEngineLive } from "./Layers/OrchestrationEngine.ts";
 import { OrchestrationProjectionPipelineLive } from "./Layers/ProjectionPipeline.ts";
 import { OrchestrationEngineService } from "./Services/OrchestrationEngine.ts";
+const asCommandId = (value: string): CommandId => CommandId.makeUnsafe(value);
+const asProjectId = (value: string): ProjectId => ProjectId.makeUnsafe(value);
+const asThreadId = (value: string): ThreadId => ThreadId.makeUnsafe(value);
+const asMessageId = (value: string): MessageId => MessageId.makeUnsafe(value);
+const asTurnId = (value: string): TurnId => TurnId.makeUnsafe(value);
+const asCheckpointRef = (value: string): CheckpointRef => CheckpointRef.makeUnsafe(value);
 async function createOrchestrationSystem() {
   const orchestrationLayer = OrchestrationEngineLive.pipe(
     Layer.provide(OrchestrationProjectionPipelineLive),
 @@ -43,8 +58,8 @@ describe("OrchestrationEngine", () => {
     await system.run(
       engine.dispatch({
         type: "project.create",
-        commandId: "cmd-project-1-create",
+        commandId: asCommandId("cmd-project-1-create"),
-        projectId: "project-1",
+        projectId: asProjectId("project-1"),
         title: "Project 1",
         workspaceRoot: "/tmp/project-1",
         defaultModel: "gpt-5-codex",
 @@ -54,9 +69,9 @@ describe("OrchestrationEngine", () => {
     await system.run(
       engine.dispatch({
         type: "thread.create",
-        commandId: "cmd-thread-1-create",
+        commandId: asCommandId("cmd-thread-1-create"),
-        threadId: "thread-1",
+        threadId: asThreadId("thread-1"),
-        projectId: "project-1",
+        projectId: asProjectId("project-1"),
         title: "Thread",
         model: "gpt-5-codex",
         branch: null,
 @@ -67,10 +82,10 @@ describe("OrchestrationEngine", () => {
     await system.run(
       engine.dispatch({
         type: "thread.turn.start",
-        commandId: "cmd-turn-start-1",
+        commandId: asCommandId("cmd-turn-start-1"),
-        threadId: "thread-1",
+        threadId: asThreadId("thread-1"),
         message: {
-          messageId: "msg-1",
+          messageId: asMessageId("msg-1"),
           role: "user",
           text: "hello",
           attachments: [],
 @@ -93,8 +108,8 @@ describe("OrchestrationEngine", () => {
     await system.run(
       engine.dispatch({
         type: "project.create",
-        commandId: "cmd-project-replay-create",
+        commandId: asCommandId("cmd-project-replay-create"),
-        projectId: "project-replay",
+        projectId: asProjectId("project-replay"),
         title: "Replay Project",
         workspaceRoot: "/tmp/project-replay",
         defaultModel: "gpt-5-codex",
 @@ -104,9 +119,9 @@ describe("OrchestrationEngine", () => {
     await system.run(
       engine.dispatch({
         type: "thread.create",
-        commandId: "cmd-thread-replay-create",
+        commandId: asCommandId("cmd-thread-replay-create"),
-        threadId: "thread-replay",
+        threadId: asThreadId("thread-replay"),
-        projectId: "project-replay",
+        projectId: asProjectId("project-replay"),
         title: "replay",
         model: "gpt-5-codex",
         branch: null,
 @@ -117,8 +132,8 @@ describe("OrchestrationEngine", () => {
     await system.run(
       engine.dispatch({
         type: "thread.delete",
-        commandId: "cmd-thread-replay-delete",
+        commandId: asCommandId("cmd-thread-replay-delete"),
-        threadId: "thread-replay",
+        threadId: asThreadId("thread-replay"),
       }),
     );
 @@ -143,8 +158,8 @@ describe("OrchestrationEngine", () => {
     await system.run(
       engine.dispatch({
         type: "project.create",
-        commandId: "cmd-project-stream-create",
+        commandId: asCommandId("cmd-project-stream-create"),
-        projectId: "project-stream",
+        projectId: asProjectId("project-stream"),
         title: "Stream Project",
         workspaceRoot: "/tmp/project-stream",
         defaultModel: "gpt-5-codex",
 @@ -164,9 +179,9 @@ describe("OrchestrationEngine", () => {
         yield* Effect.sleep("10 millis");
         yield* engine.dispatch({
           type: "thread.create",
-          commandId: "cmd-stream-thread-create",
+          commandId: asCommandId("cmd-stream-thread-create"),
-          threadId: "thread-stream",
+          threadId: asThreadId("thread-stream"),
-          projectId: "project-stream",
+          projectId: asProjectId("project-stream"),
           title: "domain-stream",
           model: "gpt-5-codex",
           branch: null,
 @@ -175,8 +190,8 @@ describe("OrchestrationEngine", () => {
         });
         yield* engine.dispatch({
           type: "thread.meta.update",
-          commandId: "cmd-stream-thread-update",
+          commandId: asCommandId("cmd-stream-thread-update"),
-          threadId: "thread-stream",
+          threadId: asThreadId("thread-stream"),
           title: "domain-stream-updated",
         });
         eventTypes.push((yield* Queue.take(eventQueue)).type);
 @@ -196,8 +211,8 @@ describe("OrchestrationEngine", () => {
     await system.run(
       engine.dispatch({
         type: "project.create",
-        commandId: "cmd-project-turn-diff-create",
+        commandId: asCommandId("cmd-project-turn-diff-create"),
-        projectId: "project-turn-diff",
+        projectId: asProjectId("project-turn-diff"),
         title: "Turn Diff Project",
         workspaceRoot: "/tmp/project-turn-diff",
         defaultModel: "gpt-5-codex",
 @@ -207,9 +222,9 @@ describe("OrchestrationEngine", () => {
     await system.run(
       engine.dispatch({
         type: "thread.create",
-        commandId: "cmd-thread-turn-diff-create",
+        commandId: asCommandId("cmd-thread-turn-diff-create"),
-        threadId: "thread-turn-diff",
+        threadId: asThreadId("thread-turn-diff"),
-        projectId: "project-turn-diff",
+        projectId: asProjectId("project-turn-diff"),
         title: "Turn diff thread",
         model: "gpt-5-codex",
         branch: null,
 @@ -220,11 +235,11 @@ describe("OrchestrationEngine", () => {
     await system.run(
       engine.dispatch({
         type: "thread.turn.diff.complete",
-        commandId: "cmd-turn-diff-complete",
+        commandId: asCommandId("cmd-turn-diff-complete"),
-        threadId: "thread-turn-diff",
+        threadId: asThreadId("thread-turn-diff"),
-        turnId: "turn-1",
+        turnId: asTurnId("turn-1"),
         completedAt: createdAt,
-        checkpointRef: "refs/t3/checkpoints/thread-turn-diff/turn/1",
+        checkpointRef: asCheckpointRef("refs/t3/checkpoints/thread-turn-diff/turn/1"),
         status: "ready",
         files: [],
         checkpointTurnCount: 1,
 @@ -237,9 +252,9 @@ describe("OrchestrationEngine", () => {
     );
     expect(thread?.checkpoints).toEqual([
       {
-        turnId: "turn-1",
+        turnId: asTurnId("turn-1"),
         checkpointTurnCount: 1,
-        checkpointRef: "refs/t3/checkpoints/thread-turn-diff/turn/1",
+        checkpointRef: asCheckpointRef("refs/t3/checkpoints/thread-turn-diff/turn/1"),
         status: "ready",
         files: [],
         assistantMessageId: null,
 @@ -250,13 +265,17 @@ describe("OrchestrationEngine", () => {
   });
   it("keeps processing queued commands after a storage failure", async () => {
-    const events: OrchestrationEvent[] = [];
+    type StoredEvent =
+      ReturnType<OrchestrationEventStoreShape["append"]> extends Effect.Effect<infer A, any, any>
+        ? A
+        : never;
+    const events: StoredEvent[] = [];
     let nextSequence = 1;
     let shouldFailFirstAppend = true;
     const flakyStore: OrchestrationEventStoreShape = {
       append(event) {
-        if (shouldFailFirstAppend && event.commandId === "cmd-flaky-1") {
+        if (shouldFailFirstAppend && event.commandId === asCommandId("cmd-flaky-1")) {
           shouldFailFirstAppend = false;
           return Effect.fail(
             new PersistenceSqlError({
 @@ -268,7 +287,7 @@ describe("OrchestrationEngine", () => {
         const savedEvent = {
           ...event,
           sequence: nextSequence,
-        } satisfies OrchestrationEvent;
+        } as StoredEvent;
         nextSequence += 1;
         events.push(savedEvent);
         return Effect.succeed(savedEvent);
 @@ -295,8 +314,8 @@ describe("OrchestrationEngine", () => {
     await runtime.runPromise(
       engine.dispatch({
         type: "project.create",
-        commandId: "cmd-project-flaky-create",
+        commandId: asCommandId("cmd-project-flaky-create"),
-        projectId: "project-flaky",
+        projectId: asProjectId("project-flaky"),
         title: "Flaky Project",
         workspaceRoot: "/tmp/project-flaky",
         defaultModel: "gpt-5-codex",
 @@ -308,9 +327,9 @@ describe("OrchestrationEngine", () => {
       runtime.runPromise(
         engine.dispatch({
           type: "thread.create",
-          commandId: "cmd-flaky-1",
+          commandId: asCommandId("cmd-flaky-1"),
-          threadId: "thread-flaky-fail",
+          threadId: asThreadId("thread-flaky-fail"),
-          projectId: "project-flaky",
+          projectId: asProjectId("project-flaky"),
           title: "flaky-fail",
           model: "gpt-5-codex",
           branch: null,
 @@ -323,9 +342,9 @@ describe("OrchestrationEngine", () => {
     const result = await runtime.runPromise(
       engine.dispatch({
         type: "thread.create",
-        commandId: "cmd-flaky-2",
+        commandId: asCommandId("cmd-flaky-2"),
-        threadId: "thread-flaky-ok",
+        threadId: asThreadId("thread-flaky-ok"),
-        projectId: "project-flaky",
+        projectId: asProjectId("project-flaky"),
         title: "flaky-ok",
         model: "gpt-5-codex",
         branch: null,
 @@ -347,10 +366,10 @@ describe("OrchestrationEngine", () => {
       system.run(
         engine.dispatch({
           type: "thread.turn.start",
-          commandId: "cmd-invariant-missing-thread",
+          commandId: asCommandId("cmd-invariant-missing-thread"),
-          threadId: "thread-missing",
+          threadId: asThreadId("thread-missing"),
           message: {
-            messageId: "msg-missing",
+            messageId: asMessageId("msg-missing"),
             role: "user",
             text: "hello",
             attachments: [],
 @@ -371,8 +390,8 @@ describe("OrchestrationEngine", () => {
     await system.run(
       engine.dispatch({
         type: "project.create",
-        commandId: "cmd-project-duplicate-create",
+        commandId: asCommandId("cmd-project-duplicate-create"),
-        projectId: "project-duplicate",
+        projectId: asProjectId("project-duplicate"),
         title: "Duplicate Project",
         workspaceRoot: "/tmp/project-duplicate",
         defaultModel: "gpt-5-codex",
 @@ -383,9 +402,9 @@ describe("OrchestrationEngine", () => {
     await system.run(
       engine.dispatch({
         type: "thread.create",
-        commandId: "cmd-thread-duplicate-1",
+        commandId: asCommandId("cmd-thread-duplicate-1"),
-        threadId: "thread-duplicate",
+        threadId: asThreadId("thread-duplicate"),
-        projectId: "project-duplicate",
+        projectId: asProjectId("project-duplicate"),
         title: "duplicate",
         model: "gpt-5-codex",
         branch: null,
 @@ -398,9 +417,9 @@ describe("OrchestrationEngine", () => {
       system.run(
         engine.dispatch({
           type: "thread.create",
-          commandId: "cmd-thread-duplicate-2",
+          commandId: asCommandId("cmd-thread-duplicate-2"),
-          threadId: "thread-duplicate",
+          threadId: asThreadId("thread-duplicate"),
-          projectId: "project-duplicate",
+          projectId: asProjectId("project-duplicate"),
           title: "duplicate",
           model: "gpt-5-codex",
           branch: null,

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

...	@@ -41,6 +41,8 @@ const asCommandId = (value: string): CommandId => CommandId.makeUnsafe(value);	...	@@ -41,6 +41,8 @@ const asCommandId = (value: string): CommandId => CommandId.makeUnsafe(value);
41	const asProjectId = (value: string): ProjectId => ProjectId.makeUnsafe(value);	41	const asProjectId = (value: string): ProjectId => ProjectId.makeUnsafe(value);
42	const asThreadId = (value: string): ThreadId => ThreadId.makeUnsafe(value);	42	const asThreadId = (value: string): ThreadId => ThreadId.makeUnsafe(value);
43	const asSessionId = (value: string): ProviderSessionId => ProviderSessionId.makeUnsafe(value);	43	const asSessionId = (value: string): ProviderSessionId => ProviderSessionId.makeUnsafe(value);
		44	const asProviderThreadId = (value: string): ProviderThreadId =>
		45	ProviderThreadId.makeUnsafe(value);
44	const asTurnId = (value: string): TurnId => TurnId.makeUnsafe(value);	46	const asTurnId = (value: string): TurnId => TurnId.makeUnsafe(value);
45		47
46	function checkpointRefForTurn(threadId: ThreadId, turnCount: number): CheckpointRef {	48	function checkpointRefForTurn(threadId: ThreadId, turnCount: number): CheckpointRef {
...	@@ -62,7 +64,7 @@ function createProviderServiceHarness(cwd: string, hasSession = true) {	...	@@ -62,7 +64,7 @@ function createProviderServiceHarness(cwd: string, hasSession = true) {
62	sessionId: asSessionId("sess-1"),	64	sessionId: asSessionId("sess-1"),
63	provider: "codex",	65	provider: "codex",
64	status: "ready",	66	status: "ready",
65	threadId: asThreadId("thread-1"),	67	threadId: asProviderThreadId("provider-thread-1"),
66	cwd,	68	cwd,
67	createdAt: now,	69	createdAt: now,
68	updatedAt: now,	70	updatedAt: now,

apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts+34-15

 @@ -1,3 +1,13 @@
+import {
+  CheckpointRef,
+  EventId,
+  MessageId,
+  ProjectId,
+  ProviderSessionId,
+  ProviderThreadId,
+  ThreadId,
+  TurnId,
+} from "@t3tools/contracts";
 import { assert, it } from "@effect/vitest";
 import { Effect, Layer } from "effect";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 @@ -7,6 +17,15 @@ import { ORCHESTRATION_PROJECTOR_NAMES } from "./ProjectionPipeline.ts";
 import { OrchestrationProjectionSnapshotQueryLive } from "./ProjectionSnapshotQuery.ts";
 import { ProjectionSnapshotQuery } from "../Services/ProjectionSnapshotQuery.ts";
+const asProjectId = (value: string): ProjectId => ProjectId.makeUnsafe(value);
+const asThreadId = (value: string): ThreadId => ThreadId.makeUnsafe(value);
+const asTurnId = (value: string): TurnId => TurnId.makeUnsafe(value);
+const asMessageId = (value: string): MessageId => MessageId.makeUnsafe(value);
+const asEventId = (value: string): EventId => EventId.makeUnsafe(value);
+const asCheckpointRef = (value: string): CheckpointRef => CheckpointRef.makeUnsafe(value);
+const asProviderSessionId = (value: string): ProviderSessionId => ProviderSessionId.makeUnsafe(value);
+const asProviderThreadId = (value: string): ProviderThreadId => ProviderThreadId.makeUnsafe(value);
 const projectionSnapshotLayer = it.layer(
   OrchestrationProjectionSnapshotQueryLive.pipe(Layer.provideMerge(SqlitePersistenceMemory)),
 );
 @@ -185,7 +204,7 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
       assert.equal(snapshot.updatedAt, "2026-02-24T00:00:09.000Z");
       assert.deepEqual(snapshot.projects, [
         {
-          id: "project-1",
+          id: asProjectId("project-1"),
           title: "Project 1",
           workspaceRoot: "/tmp/project-1",
           defaultModel: "gpt-5-codex",
 @@ -205,22 +224,22 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
       ]);
       assert.deepEqual(snapshot.threads, [
         {
-          id: "thread-1",
+          id: asThreadId("thread-1"),
-          projectId: "project-1",
+          projectId: asProjectId("project-1"),
           title: "Thread 1",
           model: "gpt-5-codex",
           branch: null,
           worktreePath: null,
-          latestTurnId: "turn-1",
+          latestTurnId: asTurnId("turn-1"),
           createdAt: "2026-02-24T00:00:02.000Z",
           updatedAt: "2026-02-24T00:00:03.000Z",
           deletedAt: null,
           messages: [
             {
-              id: "message-1",
+              id: asMessageId("message-1"),
               role: "assistant",
               text: "hello from projection",
-              turnId: "turn-1",
+              turnId: asTurnId("turn-1"),
               streaming: false,
               createdAt: "2026-02-24T00:00:04.000Z",
               updatedAt: "2026-02-24T00:00:05.000Z",
 @@ -228,33 +247,33 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
           ],
           activities: [
             {
-              id: "activity-1",
+              id: asEventId("activity-1"),
               tone: "info",
               kind: "runtime.note",
               summary: "provider started",
               payload: { stage: "start" },
-              turnId: "turn-1",
+              turnId: asTurnId("turn-1"),
               createdAt: "2026-02-24T00:00:06.000Z",
             },
           ],
           checkpoints: [
             {
-              turnId: "turn-1",
+              turnId: asTurnId("turn-1"),
               checkpointTurnCount: 1,
-              checkpointRef: "checkpoint-1",
+              checkpointRef: asCheckpointRef("checkpoint-1"),
               status: "ready",
               files: [{ path: "README.md", kind: "modified", additions: 2, deletions: 1 }],
-              assistantMessageId: "message-1",
+              assistantMessageId: asMessageId("message-1"),
               completedAt: "2026-02-24T00:00:08.000Z",
             },
           ],
           session: {
-            threadId: "thread-1",
+            threadId: asThreadId("thread-1"),
             status: "running",
             providerName: "codex",
-            providerSessionId: "provider-session-1",
+            providerSessionId: asProviderSessionId("provider-session-1"),
-            providerThreadId: "provider-thread-1",
+            providerThreadId: asProviderThreadId("provider-thread-1"),
-            activeTurnId: "turn-1",
+            activeTurnId: asTurnId("turn-1"),
             lastError: null,
             updatedAt: "2026-02-24T00:00:07.000Z",
           },

apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts+7-3

...	@@ -2,11 +2,13 @@ import type { ProviderRuntimeEvent } from "@t3tools/contracts";	...	@@ -2,11 +2,13 @@ import type { ProviderRuntimeEvent } from "@t3tools/contracts";
2	import {	2	import {
3	ApprovalRequestId,	3	ApprovalRequestId,
4	CommandId,	4	CommandId,
		5	MessageId,
5	ProjectId,	6	ProjectId,
6	ProviderSessionId,	7	ProviderSessionId,
7	ProviderThreadId,	8	ProviderThreadId,
8	ProviderTurnId,	9	ProviderTurnId,
9	ThreadId,	10	ThreadId,
		11	TurnId,
10	} from "@t3tools/contracts";	12	} from "@t3tools/contracts";
11	import { Effect, Exit, Layer, ManagedRuntime, PubSub, Scope, Stream } from "effect";	13	import { Effect, Exit, Layer, ManagedRuntime, PubSub, Scope, Stream } from "effect";
12	import { afterEach, describe, expect, it, vi } from "vitest";	14	import { afterEach, describe, expect, it, vi } from "vitest";
...	@@ -30,6 +32,8 @@ const asThreadId = (value: string): ThreadId => ThreadId.makeUnsafe(value);	...	@@ -30,6 +32,8 @@ const asThreadId = (value: string): ThreadId => ThreadId.makeUnsafe(value);
30	const asSessionId = (value: string): ProviderSessionId => ProviderSessionId.makeUnsafe(value);	32	const asSessionId = (value: string): ProviderSessionId => ProviderSessionId.makeUnsafe(value);
31	const asProviderTurnId = (value: string): ProviderTurnId => ProviderTurnId.makeUnsafe(value);	33	const asProviderTurnId = (value: string): ProviderTurnId => ProviderTurnId.makeUnsafe(value);
32	const asApprovalRequestId = (value: string): ApprovalRequestId => ApprovalRequestId.makeUnsafe(value);	34	const asApprovalRequestId = (value: string): ApprovalRequestId => ApprovalRequestId.makeUnsafe(value);
		35	const asMessageId = (value: string): MessageId => MessageId.makeUnsafe(value);
		36	const asTurnId = (value: string): TurnId => TurnId.makeUnsafe(value);
33		37
34	async function waitFor(	38	async function waitFor(
35	predicate: () => boolean,	39	predicate: () => boolean,
...	@@ -166,7 +170,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -166,7 +170,7 @@ describe("ProviderCommandReactor", () => {
166	commandId: asCommandId("cmd-turn-start-1"),	170	commandId: asCommandId("cmd-turn-start-1"),
167	threadId: asThreadId("thread-1"),	171	threadId: asThreadId("thread-1"),
168	message: {	172	message: {
169	messageId: "user-message-1",	173	messageId: asMessageId("user-message-1"),
170	role: "user",	174	role: "user",
171	text: "hello reactor",	175	text: "hello reactor",
172	attachments: [],	176	attachments: [],
...	@@ -198,7 +202,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -198,7 +202,7 @@ describe("ProviderCommandReactor", () => {
198	providerName: "codex",	202	providerName: "codex",
199	providerSessionId: asSessionId("sess-1"),	203	providerSessionId: asSessionId("sess-1"),
200	providerThreadId: ProviderThreadId.makeUnsafe("provider-thread-1"),	204	providerThreadId: ProviderThreadId.makeUnsafe("provider-thread-1"),
201	activeTurnId: "turn-1",	205	activeTurnId: asTurnId("turn-1"),
202	lastError: null,	206	lastError: null,
203	updatedAt: now,	207	updatedAt: now,
204	},	208	},
...	@@ -211,7 +215,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -211,7 +215,7 @@ describe("ProviderCommandReactor", () => {
211	type: "thread.turn.interrupt",	215	type: "thread.turn.interrupt",
212	commandId: asCommandId("cmd-turn-interrupt"),	216	commandId: asCommandId("cmd-turn-interrupt"),
213	threadId: asThreadId("thread-1"),	217	threadId: asThreadId("thread-1"),
214	turnId: "turn-1",	218	turnId: asTurnId("turn-1"),
215	createdAt: now,	219	createdAt: now,
216	}),	220	}),
217	);	221	);

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

...	@@ -313,7 +313,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -313,7 +313,7 @@ describe("ProviderRuntimeIngestion", () => {
313	sessionId: asSessionId("sess-1"),	313	sessionId: asSessionId("sess-1"),
314	createdAt: now,	314	createdAt: now,
315	turnId: asProviderTurnId("turn-9"),	315	turnId: asProviderTurnId("turn-9"),
316	toolKind: "read",	316	toolKind: "other",
317	title: "Read file",	317	title: "Read file",
318	detail: "/tmp/file.ts",	318	detail: "/tmp/file.ts",
319	});	319	});

apps/server/src/orchestration/commandInvariants.test.ts+39-28

 @@ -1,5 +1,12 @@
 import { describe, expect, it } from "vitest";
-import type { OrchestrationCommand, OrchestrationReadModel } from "@t3tools/contracts";
+import {
+  MessageId,
+  CommandId,
+  ProjectId,
+  ThreadId,
+  type OrchestrationCommand,
+  type OrchestrationReadModel,
+} from "@t3tools/contracts";
 import { Effect } from "effect";
 import {
 @@ -17,7 +24,7 @@ const readModel: OrchestrationReadModel = {
   updatedAt: now,
   projects: [
     {
-      id: "project-a",
+      id: ProjectId.makeUnsafe("project-a"),
       title: "Project A",
       workspaceRoot: "/tmp/project-a",
       defaultModel: "gpt-5-codex",
 @@ -27,7 +34,7 @@ const readModel: OrchestrationReadModel = {
       deletedAt: null,
     },
     {
-      id: "project-b",
+      id: ProjectId.makeUnsafe("project-b"),
       title: "Project B",
       workspaceRoot: "/tmp/project-b",
       defaultModel: "gpt-5-codex",
 @@ -39,8 +46,8 @@ const readModel: OrchestrationReadModel = {
   ],
   threads: [
     {
-      id: "thread-1",
+      id: ThreadId.makeUnsafe("thread-1"),
-      projectId: "project-a",
+      projectId: ProjectId.makeUnsafe("project-a"),
       title: "Thread A",
       model: "gpt-5-codex",
       branch: null,
 @@ -52,10 +59,11 @@ const readModel: OrchestrationReadModel = {
       session: null,
       activities: [],
       checkpoints: [],
+      deletedAt: null,
     },
     {
-      id: "thread-2",
+      id: ThreadId.makeUnsafe("thread-2"),
-      projectId: "project-b",
+      projectId: ProjectId.makeUnsafe("project-b"),
       title: "Thread B",
       model: "gpt-5-codex",
       branch: null,
 @@ -67,16 +75,17 @@ const readModel: OrchestrationReadModel = {
       session: null,
       activities: [],
       checkpoints: [],
+      deletedAt: null,
     },
   ],
 };
 const messageSendCommand: OrchestrationCommand = {
   type: "thread.turn.start",
-  commandId: "cmd-1",
+  commandId: CommandId.makeUnsafe("cmd-1"),
-  threadId: "thread-1",
+  threadId: ThreadId.makeUnsafe("thread-1"),
   message: {
-    messageId: "msg-1",
+    messageId: MessageId.makeUnsafe("msg-1"),
     role: "user",
     text: "hello",
     attachments: [],
 @@ -86,11 +95,13 @@ const messageSendCommand: OrchestrationCommand = {
 describe("commandInvariants", () => {
   it("finds threads by id and project", () => {
-    expect(findThreadById(readModel, "thread-1")?.projectId).toBe("project-a");
+    expect(findThreadById(readModel, ThreadId.makeUnsafe("thread-1"))?.projectId).toBe("project-a");
-    expect(findThreadById(readModel, "missing")).toBeUndefined();
+    expect(findThreadById(readModel, ThreadId.makeUnsafe("missing"))).toBeUndefined();
-    expect(listThreadsByProjectId(readModel, "project-b").map((thread) => thread.id)).toEqual([
+    expect(
-      "thread-2",
+      listThreadsByProjectId(readModel, ProjectId.makeUnsafe("project-b")).map(
-    ]);
+        (thread) => thread.id,
+      ),
+    ).toEqual([ThreadId.makeUnsafe("thread-2")]);
   });
   it("requires existing thread", async () => {
 @@ -98,17 +109,17 @@ describe("commandInvariants", () => {
       requireThread({
         readModel,
         command: messageSendCommand,
-        threadId: "thread-1",
+        threadId: ThreadId.makeUnsafe("thread-1"),
       }),
     );
-    expect(thread.id).toBe("thread-1");
+    expect(thread.id).toBe(ThreadId.makeUnsafe("thread-1"));
     await expect(
       Effect.runPromise(
         requireThread({
           readModel,
           command: messageSendCommand,
-          threadId: "missing",
+          threadId: ThreadId.makeUnsafe("missing"),
         }),
       ),
     ).rejects.toThrow("does not exist");
 @@ -120,16 +131,16 @@ describe("commandInvariants", () => {
         readModel,
         command: {
           type: "thread.create",
-          commandId: "cmd-2",
+          commandId: CommandId.makeUnsafe("cmd-2"),
-          threadId: "thread-3",
+          threadId: ThreadId.makeUnsafe("thread-3"),
-          projectId: "project-a",
+          projectId: ProjectId.makeUnsafe("project-a"),
           title: "new",
           model: "gpt-5-codex",
           branch: null,
           worktreePath: null,
           createdAt: now,
         },
-        threadId: "thread-3",
+        threadId: ThreadId.makeUnsafe("thread-3"),
       }),
     );
 @@ -139,16 +150,16 @@ describe("commandInvariants", () => {
           readModel,
           command: {
             type: "thread.create",
-            commandId: "cmd-3",
+            commandId: CommandId.makeUnsafe("cmd-3"),
-            threadId: "thread-1",
+            threadId: ThreadId.makeUnsafe("thread-1"),
-            projectId: "project-a",
+            projectId: ProjectId.makeUnsafe("project-a"),
             title: "dup",
             model: "gpt-5-codex",
             branch: null,
             worktreePath: null,
             createdAt: now,
           },
-          threadId: "thread-1",
+          threadId: ThreadId.makeUnsafe("thread-1"),
         }),
       ),
     ).rejects.toThrow("already exists");
 @@ -157,7 +168,7 @@ describe("commandInvariants", () => {
   it("requires non-negative integers", async () => {
     await Effect.runPromise(
       requireNonNegativeInteger({
-        commandType: "thread.revert",
+        commandType: "thread.checkpoint.revert",
         field: "turnCount",
         value: 0,
       }),
 @@ -166,7 +177,7 @@ describe("commandInvariants", () => {
     await expect(
       Effect.runPromise(
         requireNonNegativeInteger({
-          commandType: "thread.revert",
+          commandType: "thread.checkpoint.revert",
           field: "turnCount",
           value: -1,
         }),

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

 @@ -1,9 +1,16 @@
+import { CommandId, EventId, MessageId, ProjectId, ThreadId } from "@t3tools/contracts";
 import { describe, expect, it } from "vitest";
 import { Effect } from "effect";
 import { decideOrchestrationCommand } from "./decider.ts";
 import { createEmptyReadModel, projectEvent } from "./projector.ts";
+const asCommandId = (value: string): CommandId => CommandId.makeUnsafe(value);
+const asEventId = (value: string): EventId => EventId.makeUnsafe(value);
+const asProjectId = (value: string): ProjectId => ProjectId.makeUnsafe(value);
+const asThreadId = (value: string): ThreadId => ThreadId.makeUnsafe(value);
+const asMessageId = (value: string): MessageId => MessageId.makeUnsafe(value);
 describe("decider project scripts", () => {
   it("emits empty scripts on project.create", async () => {
     const now = new Date().toISOString();
 @@ -13,8 +20,8 @@ describe("decider project scripts", () => {
       decideOrchestrationCommand({
         command: {
           type: "project.create",
-          commandId: "cmd-project-create-scripts",
+          commandId: asCommandId("cmd-project-create-scripts"),
-          projectId: "project-scripts",
+          projectId: asProjectId("project-scripts"),
           title: "Scripts",
           workspaceRoot: "/tmp/scripts",
           createdAt: now,
 @@ -34,17 +41,17 @@ describe("decider project scripts", () => {
     const readModel = await Effect.runPromise(
       projectEvent(initial, {
         sequence: 1,
-        eventId: "evt-project-create-scripts",
+        eventId: asEventId("evt-project-create-scripts"),
-        aggregateType: "project",
+        aggregateKind: "project",
-        aggregateId: "project-scripts",
+        aggregateId: asProjectId("project-scripts"),
         type: "project.created",
         occurredAt: now,
-        commandId: "cmd-project-create-scripts",
+        commandId: asCommandId("cmd-project-create-scripts"),
         causationEventId: null,
-        correlationId: "cmd-project-create-scripts",
+        correlationId: asCommandId("cmd-project-create-scripts"),
         metadata: {},
         payload: {
-          projectId: "project-scripts",
+          projectId: asProjectId("project-scripts"),
           title: "Scripts",
           workspaceRoot: "/tmp/scripts",
           defaultModel: null,
 @@ -69,8 +76,8 @@ describe("decider project scripts", () => {
       decideOrchestrationCommand({
         command: {
           type: "project.meta.update",
-          commandId: "cmd-project-update-scripts",
+          commandId: asCommandId("cmd-project-update-scripts"),
-          projectId: "project-scripts",
+          projectId: asProjectId("project-scripts"),
           scripts: Array.from(scripts),
         },
         readModel,
 @@ -88,17 +95,17 @@ describe("decider project scripts", () => {
     const withProject = await Effect.runPromise(
       projectEvent(initial, {
         sequence: 1,
-        eventId: "evt-project-create",
+        eventId: asEventId("evt-project-create"),
-        aggregateType: "project",
+        aggregateKind: "project",
-        aggregateId: "project-1",
+        aggregateId: asProjectId("project-1"),
         type: "project.created",
         occurredAt: now,
-        commandId: "cmd-project-create",
+        commandId: asCommandId("cmd-project-create"),
         causationEventId: null,
-        correlationId: "cmd-project-create",
+        correlationId: asCommandId("cmd-project-create"),
         metadata: {},
         payload: {
-          projectId: "project-1",
+          projectId: asProjectId("project-1"),
           title: "Project",
           workspaceRoot: "/tmp/project",
           defaultModel: null,
 @@ -111,18 +118,18 @@ describe("decider project scripts", () => {
     const readModel = await Effect.runPromise(
       projectEvent(withProject, {
         sequence: 2,
-        eventId: "evt-thread-create",
+        eventId: asEventId("evt-thread-create"),
-        aggregateType: "thread",
+        aggregateKind: "thread",
-        aggregateId: "thread-1",
+        aggregateId: asThreadId("thread-1"),
         type: "thread.created",
         occurredAt: now,
-        commandId: "cmd-thread-create",
+        commandId: asCommandId("cmd-thread-create"),
         causationEventId: null,
-        correlationId: "cmd-thread-create",
+        correlationId: asCommandId("cmd-thread-create"),
         metadata: {},
         payload: {
-          threadId: "thread-1",
+          threadId: asThreadId("thread-1"),
-          projectId: "project-1",
+          projectId: asProjectId("project-1"),
           title: "Thread",
           model: "gpt-5-codex",
           branch: null,
 @@ -137,10 +144,10 @@ describe("decider project scripts", () => {
       decideOrchestrationCommand({
         command: {
           type: "thread.turn.start",
-          commandId: "cmd-turn-start",
+          commandId: asCommandId("cmd-turn-start"),
-          threadId: "thread-1",
+          threadId: asThreadId("thread-1"),
           message: {
-            messageId: "message-user-1",
+            messageId: asMessageId("message-user-1"),
             role: "user",
             text: "hello",
             attachments: [],

apps/server/src/orchestration/projector.test.ts+29-26

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	import type { OrchestrationEvent } from "@t3tools/contracts";	1	import { CommandId, EventId, ProjectId, ThreadId, type OrchestrationEvent } from "@t3tools/contracts";
2	import { Effect } from "effect";	2	import { Effect } from "effect";
3	import { describe, expect, it } from "vitest";	3	import { describe, expect, it } from "vitest";
4		4
...	@@ -8,24 +8,27 @@ function makeEvent(input: {	...	@@ -8,24 +8,27 @@ function makeEvent(input: {
8	sequence: number;	8	sequence: number;
9	type: OrchestrationEvent["type"];	9	type: OrchestrationEvent["type"];
10	occurredAt: string;	10	occurredAt: string;
11	aggregateType: OrchestrationEvent["aggregateType"];	11	aggregateKind: OrchestrationEvent["aggregateKind"];
12	aggregateId: string;	12	aggregateId: string;
13	commandId: string \| null;	13	commandId: string \| null;
14	payload: unknown;	14	payload: unknown;
15	}): OrchestrationEvent {	15	}): OrchestrationEvent {
16	return {	16	return {
17	sequence: input.sequence,	17	sequence: input.sequence,
18	eventId: `event-${input.sequence}`,	18	eventId: EventId.makeUnsafe(`event-${input.sequence}`),
19	type: input.type,	19	type: input.type,
20	aggregateType: input.aggregateType,	20	aggregateKind: input.aggregateKind,
21	aggregateId: input.aggregateId as OrchestrationEvent["aggregateId"],	21	aggregateId:
		22	input.aggregateKind === "project"
		23	? ProjectId.makeUnsafe(input.aggregateId)
		24	: ThreadId.makeUnsafe(input.aggregateId),
22	occurredAt: input.occurredAt,	25	occurredAt: input.occurredAt,
23	commandId: input.commandId as OrchestrationEvent["commandId"],	26	commandId: input.commandId === null ? null : CommandId.makeUnsafe(input.commandId),
24	causationEventId: null,	27	causationEventId: null,
25	correlationId: null,	28	correlationId: null,
26	metadata: {},	29	metadata: {},
27	payload: input.payload,	30	payload: input.payload as never,
28	};	31	} as OrchestrationEvent;
29	}	32	}
30		33
31	describe("orchestration projector", () => {	34	describe("orchestration projector", () => {
...	@@ -39,7 +42,7 @@ describe("orchestration projector", () => {	...	@@ -39,7 +42,7 @@ describe("orchestration projector", () => {
39	makeEvent({	42	makeEvent({
40	sequence: 1,	43	sequence: 1,
41	type: "thread.created",	44	type: "thread.created",
42	aggregateType: "thread",	45	aggregateKind: "thread",
43	aggregateId: "thread-1",	46	aggregateId: "thread-1",
44	occurredAt: now,	47	occurredAt: now,
45	commandId: "cmd-thread-create",	48	commandId: "cmd-thread-create",
...	@@ -89,7 +92,7 @@ describe("orchestration projector", () => {	...	@@ -89,7 +92,7 @@ describe("orchestration projector", () => {
89	makeEvent({	92	makeEvent({
90	sequence: 1,	93	sequence: 1,
91	type: "thread.created",	94	type: "thread.created",
92	aggregateType: "thread",	95	aggregateKind: "thread",
93	aggregateId: "thread-1",	96	aggregateId: "thread-1",
94	occurredAt: now,	97	occurredAt: now,
95	commandId: "cmd-invalid",	98	commandId: "cmd-invalid",
...	@@ -119,7 +122,7 @@ describe("orchestration projector", () => {	...	@@ -119,7 +122,7 @@ describe("orchestration projector", () => {
119	makeEvent({	122	makeEvent({
120	sequence: 7,	123	sequence: 7,
121	type: "thread.turn-start-requested",	124	type: "thread.turn-start-requested",
122	aggregateType: "thread",	125	aggregateKind: "thread",
123	aggregateId: "thread-1",	126	aggregateId: "thread-1",
124	occurredAt: "2026-01-01T00:00:00.000Z",	127	occurredAt: "2026-01-01T00:00:00.000Z",
125	commandId: "cmd-unhandled",	128	commandId: "cmd-unhandled",
...	@@ -148,7 +151,7 @@ describe("orchestration projector", () => {	...	@@ -148,7 +151,7 @@ describe("orchestration projector", () => {
148	makeEvent({	151	makeEvent({
149	sequence: 1,	152	sequence: 1,
150	type: "thread.created",	153	type: "thread.created",
151	aggregateType: "thread",	154	aggregateKind: "thread",
152	aggregateId: "thread-1",	155	aggregateId: "thread-1",
153	occurredAt: createdAt,	156	occurredAt: createdAt,
154	commandId: "cmd-create",	157	commandId: "cmd-create",
...	@@ -172,7 +175,7 @@ describe("orchestration projector", () => {	...	@@ -172,7 +175,7 @@ describe("orchestration projector", () => {
172	makeEvent({	175	makeEvent({
173	sequence: 2,	176	sequence: 2,
174	type: "thread.session-set",	177	type: "thread.session-set",
175	aggregateType: "thread",	178	aggregateKind: "thread",
176	aggregateId: "thread-1",	179	aggregateId: "thread-1",
177	occurredAt: startedAt,	180	occurredAt: startedAt,
178	commandId: "cmd-running",	181	commandId: "cmd-running",
...	@@ -210,7 +213,7 @@ describe("orchestration projector", () => {	...	@@ -210,7 +213,7 @@ describe("orchestration projector", () => {
210	makeEvent({	213	makeEvent({
211	sequence: 1,	214	sequence: 1,
212	type: "thread.created",	215	type: "thread.created",
213	aggregateType: "thread",	216	aggregateKind: "thread",
214	aggregateId: "thread-1",	217	aggregateId: "thread-1",
215	occurredAt: createdAt,	218	occurredAt: createdAt,
216	commandId: "cmd-create",	219	commandId: "cmd-create",
...	@@ -234,7 +237,7 @@ describe("orchestration projector", () => {	...	@@ -234,7 +237,7 @@ describe("orchestration projector", () => {
234	makeEvent({	237	makeEvent({
235	sequence: 2,	238	sequence: 2,
236	type: "thread.message-sent",	239	type: "thread.message-sent",
237	aggregateType: "thread",	240	aggregateKind: "thread",
238	aggregateId: "thread-1",	241	aggregateId: "thread-1",
239	occurredAt: deltaAt,	242	occurredAt: deltaAt,
240	commandId: "cmd-delta",	243	commandId: "cmd-delta",
...	@@ -258,7 +261,7 @@ describe("orchestration projector", () => {	...	@@ -258,7 +261,7 @@ describe("orchestration projector", () => {
258	makeEvent({	261	makeEvent({
259	sequence: 3,	262	sequence: 3,
260	type: "thread.message-sent",	263	type: "thread.message-sent",
261	aggregateType: "thread",	264	aggregateKind: "thread",
262	aggregateId: "thread-1",	265	aggregateId: "thread-1",
263	occurredAt: completeAt,	266	occurredAt: completeAt,
264	commandId: "cmd-complete",	267	commandId: "cmd-complete",
...	@@ -293,7 +296,7 @@ describe("orchestration projector", () => {	...	@@ -293,7 +296,7 @@ describe("orchestration projector", () => {
293	makeEvent({	296	makeEvent({
294	sequence: 1,	297	sequence: 1,
295	type: "thread.created",	298	type: "thread.created",
296	aggregateType: "thread",	299	aggregateKind: "thread",
297	aggregateId: "thread-1",	300	aggregateId: "thread-1",
298	occurredAt: createdAt,	301	occurredAt: createdAt,
299	commandId: "cmd-create",	302	commandId: "cmd-create",
...	@@ -315,7 +318,7 @@ describe("orchestration projector", () => {	...	@@ -315,7 +318,7 @@ describe("orchestration projector", () => {
315	makeEvent({	318	makeEvent({
316	sequence: 2,	319	sequence: 2,
317	type: "thread.message-sent",	320	type: "thread.message-sent",
318	aggregateType: "thread",	321	aggregateKind: "thread",
319	aggregateId: "thread-1",	322	aggregateId: "thread-1",
320	occurredAt: "2026-02-23T10:00:01.000Z",	323	occurredAt: "2026-02-23T10:00:01.000Z",
321	commandId: "cmd-user-1",	324	commandId: "cmd-user-1",
...	@@ -333,7 +336,7 @@ describe("orchestration projector", () => {	...	@@ -333,7 +336,7 @@ describe("orchestration projector", () => {
333	makeEvent({	336	makeEvent({
334	sequence: 3,	337	sequence: 3,
335	type: "thread.message-sent",	338	type: "thread.message-sent",
336	aggregateType: "thread",	339	aggregateKind: "thread",
337	aggregateId: "thread-1",	340	aggregateId: "thread-1",
338	occurredAt: "2026-02-23T10:00:02.000Z",	341	occurredAt: "2026-02-23T10:00:02.000Z",
339	commandId: "cmd-assistant-1",	342	commandId: "cmd-assistant-1",
...	@@ -351,7 +354,7 @@ describe("orchestration projector", () => {	...	@@ -351,7 +354,7 @@ describe("orchestration projector", () => {
351	makeEvent({	354	makeEvent({
352	sequence: 4,	355	sequence: 4,
353	type: "thread.turn-diff-completed",	356	type: "thread.turn-diff-completed",
354	aggregateType: "thread",	357	aggregateKind: "thread",
355	aggregateId: "thread-1",	358	aggregateId: "thread-1",
356	occurredAt: "2026-02-23T10:00:02.500Z",	359	occurredAt: "2026-02-23T10:00:02.500Z",
357	commandId: "cmd-turn-1-complete",	360	commandId: "cmd-turn-1-complete",
...	@@ -369,7 +372,7 @@ describe("orchestration projector", () => {	...	@@ -369,7 +372,7 @@ describe("orchestration projector", () => {
369	makeEvent({	372	makeEvent({
370	sequence: 5,	373	sequence: 5,
371	type: "thread.activity-appended",	374	type: "thread.activity-appended",
372	aggregateType: "thread",	375	aggregateKind: "thread",
373	aggregateId: "thread-1",	376	aggregateId: "thread-1",
374	occurredAt: "2026-02-23T10:00:02.750Z",	377	occurredAt: "2026-02-23T10:00:02.750Z",
375	commandId: "cmd-activity-1",	378	commandId: "cmd-activity-1",
...	@@ -389,7 +392,7 @@ describe("orchestration projector", () => {	...	@@ -389,7 +392,7 @@ describe("orchestration projector", () => {
389	makeEvent({	392	makeEvent({
390	sequence: 6,	393	sequence: 6,
391	type: "thread.message-sent",	394	type: "thread.message-sent",
392	aggregateType: "thread",	395	aggregateKind: "thread",
393	aggregateId: "thread-1",	396	aggregateId: "thread-1",
394	occurredAt: "2026-02-23T10:00:03.000Z",	397	occurredAt: "2026-02-23T10:00:03.000Z",
395	commandId: "cmd-user-2",	398	commandId: "cmd-user-2",
...	@@ -407,7 +410,7 @@ describe("orchestration projector", () => {	...	@@ -407,7 +410,7 @@ describe("orchestration projector", () => {
407	makeEvent({	410	makeEvent({
408	sequence: 7,	411	sequence: 7,
409	type: "thread.message-sent",	412	type: "thread.message-sent",
410	aggregateType: "thread",	413	aggregateKind: "thread",
411	aggregateId: "thread-1",	414	aggregateId: "thread-1",
412	occurredAt: "2026-02-23T10:00:04.000Z",	415	occurredAt: "2026-02-23T10:00:04.000Z",
413	commandId: "cmd-assistant-2",	416	commandId: "cmd-assistant-2",
...	@@ -425,7 +428,7 @@ describe("orchestration projector", () => {	...	@@ -425,7 +428,7 @@ describe("orchestration projector", () => {
425	makeEvent({	428	makeEvent({
426	sequence: 8,	429	sequence: 8,
427	type: "thread.turn-diff-completed",	430	type: "thread.turn-diff-completed",
428	aggregateType: "thread",	431	aggregateKind: "thread",
429	aggregateId: "thread-1",	432	aggregateId: "thread-1",
430	occurredAt: "2026-02-23T10:00:04.500Z",	433	occurredAt: "2026-02-23T10:00:04.500Z",
431	commandId: "cmd-turn-2-complete",	434	commandId: "cmd-turn-2-complete",
...	@@ -443,7 +446,7 @@ describe("orchestration projector", () => {	...	@@ -443,7 +446,7 @@ describe("orchestration projector", () => {
443	makeEvent({	446	makeEvent({
444	sequence: 9,	447	sequence: 9,
445	type: "thread.activity-appended",	448	type: "thread.activity-appended",
446	aggregateType: "thread",	449	aggregateKind: "thread",
447	aggregateId: "thread-1",	450	aggregateId: "thread-1",
448	occurredAt: "2026-02-23T10:00:04.750Z",	451	occurredAt: "2026-02-23T10:00:04.750Z",
449	commandId: "cmd-activity-2",	452	commandId: "cmd-activity-2",
...	@@ -463,7 +466,7 @@ describe("orchestration projector", () => {	...	@@ -463,7 +466,7 @@ describe("orchestration projector", () => {
463	makeEvent({	466	makeEvent({
464	sequence: 10,	467	sequence: 10,
465	type: "thread.reverted",	468	type: "thread.reverted",
466	aggregateType: "thread",	469	aggregateKind: "thread",
467	aggregateId: "thread-1",	470	aggregateId: "thread-1",
468	occurredAt: "2026-02-23T10:00:05.000Z",	471	occurredAt: "2026-02-23T10:00:05.000Z",
469	commandId: "cmd-revert",	472	commandId: "cmd-revert",

apps/server/src/provider/Layers/CodexAdapter.test.ts+46-34

 @@ -1,10 +1,16 @@
-import type {
+import {
-  ProviderApprovalDecision,
+  ApprovalRequestId,
-  ProviderEvent,
+  EventId,
-  ProviderSendTurnInput,
+  ProviderItemId,
-  ProviderSession,
+  type ProviderApprovalDecision,
-  ProviderSessionStartInput,
+  type ProviderEvent,
-  ProviderTurnStartResult,
+  type ProviderSendTurnInput,
+  ProviderSessionId,
+  type ProviderSession,
+  type ProviderSessionStartInput,
+  ProviderThreadId,
+  ProviderTurnId,
+  type ProviderTurnStartResult,
 } from "@t3tools/contracts";
 import { afterAll, assert, it, vi } from "@effect/vitest";
 import { assertFailure } from "@effect/vitest/utils";
 @@ -16,15 +22,21 @@ import { ProviderAdapterValidationError } from "../Errors.ts";
 import { CodexAdapter } from "../Services/CodexAdapter.ts";
 import { makeCodexAdapterLive } from "./CodexAdapter.ts";
+const asSessionId = (value: string): ProviderSessionId => ProviderSessionId.makeUnsafe(value);
+const asThreadId = (value: string): ProviderThreadId => ProviderThreadId.makeUnsafe(value);
+const asTurnId = (value: string): ProviderTurnId => ProviderTurnId.makeUnsafe(value);
+const asEventId = (value: string): EventId => EventId.makeUnsafe(value);
+const asItemId = (value: string): ProviderItemId => ProviderItemId.makeUnsafe(value);
 class FakeCodexManager extends CodexAppServerManager {
   public startSessionImpl = vi.fn(
     async (input: ProviderSessionStartInput): Promise<ProviderSession> => {
       const now = new Date().toISOString();
       return {
-        sessionId: "sess-1",
+        sessionId: asSessionId("sess-1"),
         provider: "codex",
         status: "ready",
-        threadId: "thread-1",
+        threadId: asThreadId("thread-1"),
         cwd: input.cwd,
         createdAt: now,
         updatedAt: now,
 @@ -34,29 +46,29 @@ class FakeCodexManager extends CodexAppServerManager {
   public sendTurnImpl = vi.fn(
     async (_input: ProviderSendTurnInput): Promise<ProviderTurnStartResult> => ({
-      threadId: "thread-1",
+      threadId: asThreadId("thread-1"),
-      turnId: "turn-1",
+      turnId: asTurnId("turn-1"),
     }),
   );
   public interruptTurnImpl = vi.fn(
-    async (_sessionId: string, _turnId?: string): Promise<void> => undefined,
+    async (_sessionId: ProviderSessionId, _turnId?: ProviderTurnId): Promise<void> => undefined,
   );
-  public readThreadImpl = vi.fn(async (_sessionId: string) => ({
+  public readThreadImpl = vi.fn(async (_sessionId: ProviderSessionId) => ({
-    threadId: "thread-1",
+    threadId: asThreadId("thread-1"),
     turns: [],
   }));
-  public rollbackThreadImpl = vi.fn(async (_sessionId: string, _numTurns: number) => ({
+  public rollbackThreadImpl = vi.fn(async (_sessionId: ProviderSessionId, _numTurns: number) => ({
-    threadId: "thread-1",
+    threadId: asThreadId("thread-1"),
     turns: [],
   }));
   public respondToRequestImpl = vi.fn(
     async (
-      _sessionId: string,
+      _sessionId: ProviderSessionId,
-      _requestId: string,
+      _requestId: ApprovalRequestId,
       _decision: ProviderApprovalDecision,
     ): Promise<void> => undefined,
   );
 @@ -71,33 +83,33 @@ class FakeCodexManager extends CodexAppServerManager {
     return this.sendTurnImpl(input);
   }
-  override interruptTurn(sessionId: string, turnId?: string): Promise<void> {
+  override interruptTurn(sessionId: ProviderSessionId, turnId?: ProviderTurnId): Promise<void> {
     return this.interruptTurnImpl(sessionId, turnId);
   }
-  override readThread(sessionId: string) {
+  override readThread(sessionId: ProviderSessionId) {
     return this.readThreadImpl(sessionId);
   }
-  override rollbackThread(sessionId: string, numTurns: number) {
+  override rollbackThread(sessionId: ProviderSessionId, numTurns: number) {
     return this.rollbackThreadImpl(sessionId, numTurns);
   }
   override respondToRequest(
-    sessionId: string,
+    sessionId: ProviderSessionId,
-    requestId: string,
+    requestId: ApprovalRequestId,
     decision: ProviderApprovalDecision,
   ): Promise<void> {
     return this.respondToRequestImpl(sessionId, requestId, decision);
   }
-  override stopSession(_sessionId: string): void {}
+  override stopSession(_sessionId: ProviderSessionId): void {}
   override listSessions(): ProviderSession[] {
     return [];
   }
-  override hasSession(_sessionId: string): boolean {
+  override hasSession(_sessionId: ProviderSessionId): boolean {
     return false;
   }
 @@ -144,7 +156,7 @@ sessionErrorLayer("CodexAdapterLive session errors", (it) => {
       const adapter = yield* CodexAdapter;
       const result = yield* adapter
         .sendTurn({
-          sessionId: "sess-missing",
+          sessionId: asSessionId("sess-missing"),
           input: "hello",
           attachments: [],
         })
 @@ -176,15 +188,15 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
       const firstEventFiber = yield* Stream.runHead(adapter.streamEvents).pipe(Effect.forkChild);
       const event: ProviderEvent = {
-        id: "evt-msg-complete",
+        id: asEventId("evt-msg-complete"),
         kind: "notification",
         provider: "codex",
-        sessionId: "sess-1",
+        sessionId: asSessionId("sess-1"),
         createdAt: new Date().toISOString(),
         method: "item/completed",
-        threadId: "thread-1",
+        threadId: asThreadId("thread-1"),
-        turnId: "turn-1",
+        turnId: asTurnId("turn-1"),
-        itemId: "msg_1",
+        itemId: asItemId("msg_1"),
         payload: {
           item: {
             type: "agentMessage",
 @@ -220,13 +232,13 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
       ).pipe(Effect.forkChild);
       const event: ProviderEvent = {
-        id: "evt-1",
+        id: asEventId("evt-1"),
         kind: "notification",
         provider: "codex",
-        sessionId: "sess-1",
+        sessionId: asSessionId("sess-1"),
         createdAt: new Date().toISOString(),
         method: "turn/started",
-        turnId: "turn-1",
+        turnId: asTurnId("turn-1"),
       };
       lifecycleManager.emit("event", event);

apps/server/src/provider/Layers/ProviderService.test.ts+22-36

 @@ -45,17 +45,6 @@ import {
   SqlitePersistenceMemory,
 } from "../../persistence/Layers/Sqlite.ts";
-function decodeIssueMessage(cause: unknown): string {
-  if (cause instanceof Error && cause.message.length > 0) {
-    return cause.message;
-  }
-  try {
-    return JSON.stringify(cause);
-  } catch {
-    return "Invalid provider input.";
-  }
-}
 const asSessionId = (value: string): ProviderSessionId => ProviderSessionId.makeUnsafe(value);
 const asThreadId = (value: string): ThreadId => ThreadId.makeUnsafe(value);
 const asTurnId = (value: string): ProviderTurnId => ProviderTurnId.makeUnsafe(value);
 @@ -526,11 +515,18 @@ routing.layer("ProviderServiceLive routing", (it) => {
         const payload = runningRuntime.value.runtimePayload;
         assert.equal(payload !== null && typeof payload === "object", true);
         if (payload !== null && typeof payload === "object" && !Array.isArray(payload)) {
-          assert.equal(payload.cwd, process.cwd());
+          const runtimePayload = payload as {
-          assert.equal(payload.model, null);
+            cwd: string;
-          assert.equal(payload.activeTurnId, "turn-1");
+            model: string | null;
-          assert.equal(payload.lastError, null);
+            activeTurnId: string | null;
-          assert.equal(payload.lastRuntimeEvent, "provider.sendTurn");
+            lastError: string | null;
+            lastRuntimeEvent: string | null;
+          };
+          assert.equal(runtimePayload.cwd, process.cwd());
+          assert.equal(runtimePayload.model, null);
+          assert.equal(runtimePayload.activeTurnId, "turn-1");
+          assert.equal(runtimePayload.lastError, null);
+          assert.equal(runtimePayload.lastRuntimeEvent, "provider.sendTurn");
         }
       }
 @@ -669,32 +665,22 @@ validation.layer("ProviderServiceLive validation", (it) => {
     Effect.gen(function* () {
       const provider = yield* ProviderService;
-      let parseCause: unknown;
-      let decodeFailed = false;
-      try {
-        Schema.decodeUnknownSync(ProviderSessionStartInput)({
-          provider: "invalid-provider",
-        });
-      } catch (cause) {
-        parseCause = cause;
-        decodeFailed = true;
-      }
-      assert.equal(decodeFailed, true);
       const failure = yield* Effect.result(
         provider.startSession({
           provider: "invalid-provider",
         } as never),
       );
-      assertFailure(
+      assert.equal(failure._tag, "Failure");
-        failure,
+      if (failure._tag !== "Failure") {
-        new ProviderValidationError({
+        return;
-          operation: "ProviderService.startSession",
+      }
-          issue: decodeIssueMessage(parseCause),
+      assert.equal(failure.failure._tag, "ProviderValidationError");
-          cause: parseCause,
+      if (failure.failure._tag !== "ProviderValidationError") {
-        }),
+        return;
-      );
+      }
+      assert.equal(failure.failure.operation, "ProviderService.startSession");
+      assert.equal(failure.failure.issue.includes("invalid-provider"), true);
     }),
   );

apps/server/src/wsServer.test.ts+80-17

 @@ -10,15 +10,20 @@ import WebSocket from "ws";
 import {
   DEFAULT_TERMINAL_ID,
+  EventId,
   ORCHESTRATION_WS_CHANNELS,
   ORCHESTRATION_WS_METHODS,
+  ProviderItemId,
+  ProviderSessionId,
+  ProviderThreadId,
+  ProviderTurnId,
   WS_CHANNELS,
   WS_METHODS,
+  type WebSocketResponse,
   type ProviderRuntimeEvent,
   type KeybindingsConfig,
   type ResolvedKeybindingsConfig,
   type WsPush,
-  type WsResponse,
 } from "@t3tools/contracts";
 import { compileResolvedKeybindingRule, DEFAULT_KEYBINDINGS } from "./keybindings";
 import type {
 @@ -34,6 +39,7 @@ import type { TerminalManager } from "./terminalManager";
 import { SqlitePersistenceMemory } from "./persistence/Layers/Sqlite";
 import { SqlClient } from "effect/unstable/sql";
 import { ProviderService, type ProviderServiceShape } from "./provider/Services/ProviderService";
+import type { OpenShape } from "./open";
 interface PendingMessages {
   queue: unknown[];
 @@ -42,6 +48,12 @@ interface PendingMessages {
 const pendingBySocket = new WeakMap<WebSocket, PendingMessages>();
+const asEventId = (value: string): EventId => EventId.makeUnsafe(value);
+const asProviderSessionId = (value: string): ProviderSessionId => ProviderSessionId.makeUnsafe(value);
+const asProviderThreadId = (value: string): ProviderThreadId => ProviderThreadId.makeUnsafe(value);
+const asProviderTurnId = (value: string): ProviderTurnId => ProviderTurnId.makeUnsafe(value);
+const asProviderItemId = (value: string): ProviderItemId => ProviderItemId.makeUnsafe(value);
 class MockTerminalManager extends EventEmitter<{ event: [event: TerminalEvent] }> {
   private readonly sessions = new Map<string, TerminalSessionSnapshot>();
 @@ -187,7 +199,19 @@ function waitForMessage(ws: WebSocket): Promise<unknown> {
   });
 }
-async function sendRequest(ws: WebSocket, method: string, params?: unknown): Promise<WsResponse> {
+function asWebSocketResponse(message: unknown): WebSocketResponse | null {
+  if (typeof message !== "object" || message === null) return null;
+  if (!("id" in message)) return null;
+  const id = (message as { id?: unknown }).id;
+  if (typeof id !== "string") return null;
+  return message as WebSocketResponse;
+}
+async function sendRequest(
+  ws: WebSocket,
+  method: string,
+  params?: unknown,
+): Promise<WebSocketResponse> {
   const id = crypto.randomUUID();
   const body =
     method === ORCHESTRATION_WS_METHODS.dispatchCommand
 @@ -200,12 +224,15 @@ async function sendRequest(ws: WebSocket, method: string, params?: unknown): Pro
   // Wait for response with matching id
   while (true) {
-    const parsed = (await waitForMessage(ws)) as Record<string, unknown>;
+    const parsed = asWebSocketResponse(await waitForMessage(ws));
+    if (!parsed) {
+      continue;
+    }
     if (parsed.id === id) {
-      return parsed as WsResponse;
+      return parsed;
     }
     if (parsed.id === "unknown") {
-      return parsed as WsResponse;
+      return parsed;
     }
   }
 }
 @@ -233,7 +260,7 @@ async function waitForPush(
 }
 function compileKeybindings(bindings: KeybindingsConfig): ResolvedKeybindingsConfig {
-  const resolved: ResolvedKeybindingsConfig = [];
+  const resolved: Array<ResolvedKeybindingsConfig[number]> = [];
   for (const binding of bindings) {
     const compiled = compileResolvedKeybindingRule(binding);
     if (!compiled) {
 @@ -278,6 +305,7 @@ describe("WebSocket Server", () => {
       authToken?: string;
       stateDir?: string;
       providerLayer?: Layer.Layer<ProviderService, unknown>;
+      open?: OpenShape;
       gitManager?: {
         status: (input: { cwd: string }) => Promise<unknown>;
         runStackedAction: (input: { cwd: string; action: string }) => Promise<unknown>;
 @@ -297,6 +325,7 @@ describe("WebSocket Server", () => {
       ...(options.devUrl ? { devUrl: options.devUrl } : {}),
       ...(options.authToken ? { authToken: options.authToken } : {}),
       ...(options.providerLayer ? { providerLayer: options.providerLayer } : {}),
+      ...(options.open ? { open: options.open } : {}),
       ...(options.gitManager ? { gitManager: options.gitManager as never } : {}),
       ...(options.terminalManager ? { terminalManager: options.terminalManager } : {}),
     });
 @@ -420,6 +449,33 @@ describe("WebSocket Server", () => {
     });
   });
+  it("routes shell.openInEditor through the injected open service", async () => {
+    const openCalls: Array<{ cwd: string; editor: string }> = [];
+    const openService: OpenShape = {
+      openBrowser: () => Effect.void,
+      openInEditor: (input) => {
+        openCalls.push({ cwd: input.cwd, editor: input.editor });
+        return Effect.void;
+      },
+    };
+    server = createTestServer({ cwd: "/my/workspace", open: openService });
+    await server.start();
+    const addr = server.httpServer.address();
+    const port = typeof addr === "object" && addr !== null ? addr.port : 0;
+    const ws = await connectWs(port);
+    connections.push(ws);
+    await waitForMessage(ws);
+    const response = await sendRequest(ws, WS_METHODS.shellOpenInEditor, {
+      cwd: "/my/workspace",
+      editor: "cursor",
+    });
+    expect(response.error).toBeUndefined();
+    expect(openCalls).toEqual([{ cwd: "/my/workspace", editor: "cursor" }]);
+  });
   it("reads keybindings from ~/.t3/keybindings.json", async () => {
     const fakeHome = makeTempDir("t3code-home-");
     const configDir = path.join(fakeHome, ".t3");
 @@ -787,7 +843,7 @@ describe("WebSocket Server", () => {
   it("keeps orchestration domain push behavior for provider runtime events", async () => {
     const runtimeEventPubSub = Effect.runSync(PubSub.unbounded<ProviderRuntimeEvent>());
-    const sessionId = "sess-test";
+    const sessionId = asProviderSessionId("sess-test");
     const emitRuntimeEvent = (event: ProviderRuntimeEvent) => {
       Effect.runSync(PubSub.publish(runtimeEventPubSub, event));
     };
 @@ -798,11 +854,15 @@ describe("WebSocket Server", () => {
           sessionId,
           provider: "codex",
           status: "ready",
-          threadId: "provider-thread-1",
+          threadId: asProviderThreadId("provider-thread-1"),
           createdAt: new Date().toISOString(),
           updatedAt: new Date().toISOString(),
         }),
-      sendTurn: () => Effect.succeed({ threadId: "provider-thread-1", turnId: "provider-turn-1" }),
+      sendTurn: () =>
+        Effect.succeed({
+          threadId: asProviderThreadId("provider-thread-1"),
+          turnId: asProviderTurnId("provider-turn-1"),
+        }),
       interruptTurn: () => unsupported(),
       respondToRequest: () => unsupported(),
       stopSession: () => unsupported(),
 @@ -870,12 +930,12 @@ describe("WebSocket Server", () => {
     emitRuntimeEvent({
       type: "message.delta",
-      eventId: "evt-ws-runtime-message-delta",
+      eventId: asEventId("evt-ws-runtime-message-delta"),
       provider: "codex",
       sessionId,
       createdAt: new Date().toISOString(),
-      turnId: "turn-1",
+      turnId: asProviderTurnId("turn-1"),
-      itemId: "item-1",
+      itemId: asProviderItemId("item-1"),
       delta: "hello from runtime",
     });
 @@ -1015,15 +1075,18 @@ describe("WebSocket Server", () => {
     // Send garbage
     ws.send("not json at all");
-    let response: WsResponse | null = null;
+    let response: WebSocketResponse | null = null;
     for (let attempt = 0; attempt < 5; attempt += 1) {
-      const message = (await waitForMessage(ws)) as Record<string, unknown>;
+      const message = asWebSocketResponse(await waitForMessage(ws));
-      if (typeof message.id === "string" && message.id === "unknown") {
+      if (!message) {
-        response = message as WsResponse;
+        continue;
+      }
+      if (message.id === "unknown") {
+        response = message;
         break;
       }
       if (message.error) {
-        response = message as WsResponse;
+        response = message;
         break;
       }
     }

apps/server/src/wsServer.ts+28-48

 @@ -1,4 +1,3 @@
-import { spawn } from "node:child_process";
 import fs from "node:fs";
 import http from "node:http";
 import os from "node:os";
 @@ -7,7 +6,6 @@ import type { Duplex } from "node:stream";
 import {
   CheckpointRef,
-  EDITORS,
   ORCHESTRATION_WS_CHANNELS,
   ORCHESTRATION_WS_METHODS,
   TerminalEvent,
 @@ -18,7 +16,7 @@ import {
   WsResponse,
 } from "@t3tools/contracts";
 import { NodeServices } from "@effect/platform-node";
-import { Effect, Exit, Layer, ManagedRuntime, Schema, Scope, Stream } from "effect";
+import { Effect, Exit, Layer, ManagedRuntime, Schema, Scope, ServiceMap, Stream } from "effect";
 import { WebSocketServer, type WebSocket } from "ws";
 import { createLogger } from "./logger";
 @@ -62,12 +60,16 @@ import { ProviderSessionDirectoryLive } from "./provider/Layers/ProviderSessionD
 import { ProviderService, type ProviderServiceShape } from "./provider/Services/ProviderService";
 import { CheckpointStoreLive } from "./checkpointing/Layers/CheckpointStore";
 import { ProviderSessionRuntimeRepositoryLive } from "./persistence/Layers/ProviderSessionRuntime";
-import { CheckpointStore, type CheckpointStoreShape } from "./checkpointing/Services/CheckpointStore";
+import {
+  CheckpointStore,
+  type CheckpointStoreShape,
+} from "./checkpointing/Services/CheckpointStore";
 import { makeEventNdjsonLogger, type EventNdjsonLogger } from "./provider/Layers/EventNdjsonLogger";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import * as SqlError from "effect/unstable/sql/SqlError";
 import * as Migrator from "effect/unstable/sql/Migrator";
 import { clamp } from "effect/Number";
+import { OpenDefaultService, type OpenShape } from "./open";
 const MIME_TYPES: Record<string, string> = {
   ".html": "text/html; charset=utf-8",
 @@ -100,8 +102,25 @@ export interface ServerOptions {
   terminalManager?: TerminalManager | undefined;
   providerLayer?: Layer.Layer<ProviderService, unknown> | undefined;
   authToken?: string | undefined;
+  open?: OpenShape | undefined;
+}
+export interface ServerRuntime {
+  readonly start: () => Promise<void>;
+  readonly stop: () => Promise<void>;
+  readonly httpServer: http.Server;
 }
+export interface ServerShape {
+  readonly createServer: (options: ServerOptions) => ServerRuntime;
+}
+export class Server extends ServiceMap.Service<Server, ServerShape>()("server/Server") {}
+export const ServerLive = Layer.succeed(Server, {
+  createServer,
+} satisfies ServerShape);
 const isServerNotRunningError = (error: unknown): boolean => {
   if (!(error instanceof Error)) return false;
   const maybeCode = (error as NodeJS.ErrnoException).code;
 @@ -162,9 +181,7 @@ function websocketRawToString(raw: unknown): string | null {
   return null;
 }
-function stripRequestTag<T extends { _tag: string }>(
+function stripRequestTag<T extends { _tag: string }>(body: T): Omit<T, "_tag"> {
-  body: T,
-): Omit<T, "_tag"> {
   const { _tag: _ignoredTag, ...rest } = body;
   return rest;
 }
 @@ -185,7 +202,7 @@ type EffectRuntime = ManagedRuntime.ManagedRuntime<
   unknown
 >;
-export function createServer(options: ServerOptions) {
+export function createServer(options: ServerOptions): ServerRuntime {
   const {
     port,
     host,
 @@ -200,6 +217,7 @@ export function createServer(options: ServerOptions) {
     terminalManager = new TerminalManager(),
     providerLayer: customProviderLayer,
     authToken,
+    open: openService = OpenDefaultService,
   } = options;
   const resolvedStateDir = stateDir ?? path.join(os.homedir(), ".t3", "userdata");
 @@ -626,42 +644,7 @@ export function createServer(options: ServerOptions) {
         return searchWorkspaceEntries(stripRequestTag(request.body));
       case WS_METHODS.shellOpenInEditor: {
-        const body = request.body;
+        await Effect.runPromise(openService.openInEditor(stripRequestTag(request.body)));
-        const editorDef = EDITORS.find((e) => e.id === body.editor);
-        if (!editorDef) throw new Error(`Unknown editor: ${body.editor}`);
-        let command: string;
-        let args: string[];
-        if (editorDef.command) {
-          command = editorDef.command;
-          args = [body.cwd];
-        } else if (editorDef.id === "file-manager") {
-          // Use platform-specific file manager command
-          switch (process.platform) {
-            case "darwin":
-              command = "open";
-              break;
-            case "win32":
-              command = "explorer";
-              break;
-            default:
-              command = "xdg-open";
-              break;
-          }
-          args = [body.cwd];
-        } else {
-          return undefined;
-        }
-        const child = spawn(command, args, {
-          detached: true,
-          stdio: "ignore",
-        });
-        child.on("error", () => {
-          /* ignore spawn failures for detached editors */
-        });
-        child.unref();
         return undefined;
       }
 @@ -763,10 +746,7 @@ export function createServer(options: ServerOptions) {
         );
         return makeProviderServiceLive({
           canonicalEventLogPath: path.join(providerLogsDir, "provider-canonical.ndjson"),
-        }).pipe(
+        }).pipe(Layer.provide(adapterRegistryLayer), Layer.provide(providerSessionDirectoryLayer));
-          Layer.provide(adapterRegistryLayer),
-          Layer.provide(providerSessionDirectoryLayer),
-        );
       })();
     const runtimeServicesLayer = Layer.mergeAll(

apps/server/tsconfig.json+1-2

...	@@ -12,6 +12,5 @@	...	@@ -12,6 +12,5 @@
12	}	12	}
13	]	13	]
14	},	14	},
15	"include": ["src", "tsdown.config.ts", "scripts", "integration"],	15	"include": ["src", "tsdown.config.ts", "scripts", "integration"]
16	"exclude": ["src/*/.test.ts"]
17	}	16	}

packages/contracts/src/git.ts+1-1

...	@@ -68,7 +68,7 @@ export class GitRemoveWorktreeInput extends Schema.Class<GitRemoveWorktreeInput>	...	@@ -68,7 +68,7 @@ export class GitRemoveWorktreeInput extends Schema.Class<GitRemoveWorktreeInput>
68	)({	68	)({
69	cwd: TrimmedNonEmptyString,	69	cwd: TrimmedNonEmptyString,
70	path: TrimmedNonEmptyString,	70	path: TrimmedNonEmptyString,
71	force: Schema.Boolean.pipe(Schema.NullOr),	71	force: Schema.optional(Schema.Boolean),
72	}) {}	72	}) {}
73		73
74	export class GitCreateBranchInput extends Schema.Class<GitCreateBranchInput>(	74	export class GitCreateBranchInput extends Schema.Class<GitCreateBranchInput>(

packages/contracts/src/keybindings.test.ts+1-3

 @@ -12,9 +12,7 @@ const decode = <S extends Schema.Top>(schema: S, input: unknown): Schema.Schema.
   Schema.decodeUnknownSync(schema as never)(input) as Schema.Schema.Type<S>;
 const decodeResolvedRuleStrict = (input: unknown) =>
-  Schema.decodeUnknownSync(ResolvedKeybindingRule as never)(input, {
+  Schema.decodeUnknownSync(ResolvedKeybindingRule as never)(input);
-    onExcessProperty: "error",
-  });
 describe("keybindings contracts", () => {
   it("parses keybinding rules", () => {

packages/contracts/src/keybindings.ts+8-5

 @@ -70,11 +70,14 @@ export type KeybindingWhenNode =
 export class ResolvedKeybindingRule extends Schema.Class<ResolvedKeybindingRule>(
   "ResolvedKeybindingRule",
-)({
+)(
-  command: KeybindingCommand,
+  {
-  shortcut: KeybindingShortcut,
+    command: KeybindingCommand,
-  whenAst: Schema.optional(KeybindingWhenNode),
+    shortcut: KeybindingShortcut,
-}) {}
+    whenAst: Schema.optional(KeybindingWhenNode),
+  },
+  { parseOptions: { onExcessProperty: "error" } },
+) {}
 export const ResolvedKeybindingsConfig = Schema.Array(ResolvedKeybindingRule).check(
   Schema.isMaxLength(256),

scripts/dev-runner.mjs+9

...	@@ -84,6 +84,15 @@ function main() {	...	@@ -84,6 +84,15 @@ function main() {
84	VITE_WS_URL: `ws://localhost:${serverPort}`,	84	VITE_WS_URL: `ws://localhost:${serverPort}`,
85	VITE_DEV_SERVER_URL: `http://localhost:${webPort}`,	85	VITE_DEV_SERVER_URL: `http://localhost:${webPort}`,
86	};	86	};
		87
		88	if (mode === "dev" \|\| mode === "dev:server" \|\| mode === "dev:web") {
		89	// Running server/web in browser mode should not inherit desktop launcher state.
		90	env.T3CODE_MODE = "web";
		91	delete env.T3CODE_NO_BROWSER;
		92	delete env.T3CODE_AUTH_TOKEN;
		93	delete env.T3CODE_DESKTOP_WS_URL;
		94	}
		95
87	if (mode === "dev" && !env.T3CODE_LOG_WS_EVENTS) {	96	if (mode === "dev" && !env.T3CODE_LOG_WS_EVENTS) {
88	env.T3CODE_LOG_WS_EVENTS = "1";	97	env.T3CODE_LOG_WS_EVENTS = "1";
89	}	98	}

author	Julius Marminge <julius0216@outlook.com> 2026-02-24 13:46:30-08:00
committer	Julius Marminge <jmarminge@gmail.com> 2026-02-26 13:20:36-08:00
log	e63d5b240f908ec3cf69b49ac7488b33dc5231c0
tree	9a94782305a744718f9ddb192be5d5f0b97aaaaa
parent	877ab769345a13e90509c564b62ef3f50f480607

effect cli