Commit 477795697d8546a8db4903bd878a5ad3196423b9 | the-knife

apps/desktop/scripts/dev-electron.mjs+6-3

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	import { spawn, spawnSync } from "node:child_process";	1	import { spawn, spawnSync } from "node:child_process";
2	import { watch } from "node:fs";	2	import { watch } from "node:fs";
		3	import * as NodeOS from "node:os";
3	import { join } from "node:path";	4	import { join } from "node:path";
4		5
5	import {	6	import {
...	@@ -33,6 +34,8 @@ const forcedShutdownTimeoutMs = 1_500;	...	@@ -33,6 +34,8 @@ const forcedShutdownTimeoutMs = 1_500;
33	const restartDebounceMs = 120;	34	const restartDebounceMs = 120;
34	const childTreeGracePeriodMs = 1_200;	35	const childTreeGracePeriodMs = 1_200;
35	const remoteDebuggingPort = process.env.T3CODE_DESKTOP_REMOTE_DEBUGGING_PORT?.trim();	36	const remoteDebuggingPort = process.env.T3CODE_DESKTOP_REMOTE_DEBUGGING_PORT?.trim();
		37	// oxlint-disable-next-line t3code/no-global-process-runtime -- Standalone dev script has no Effect runtime.
		38	const hostPlatform = NodeOS.platform();
36		39
37	await waitForResources({	40	await waitForResources({
38	baseDir: desktopDir,	41	baseDir: desktopDir,
...	@@ -57,7 +60,7 @@ const expectedExits = new WeakSet();	...	@@ -57,7 +60,7 @@ const expectedExits = new WeakSet();
57	const watchers = [];	60	const watchers = [];
58		61
59	function killChildTreeByPid(pid, signal) {	62	function killChildTreeByPid(pid, signal) {
60	if (process.platform === "win32" \|\| typeof pid !== "number") {	63	if (hostPlatform === "win32" \|\| typeof pid !== "number") {
61	return;	64	return;
62	}	65	}
63		66
...	@@ -65,7 +68,7 @@ function killChildTreeByPid(pid, signal) {	...	@@ -65,7 +68,7 @@ function killChildTreeByPid(pid, signal) {
65	}	68	}
66		69
67	function cleanupStaleDevApps() {	70	function cleanupStaleDevApps() {
68	if (process.platform === "win32") {	71	if (hostPlatform === "win32") {
69	return;	72	return;
70	}	73	}
71		74
...	@@ -194,7 +197,7 @@ function startWatchers() {	...	@@ -194,7 +197,7 @@ function startWatchers() {
194	}	197	}
195		198
196	function killChildTree(signal) {	199	function killChildTree(signal) {
197	if (process.platform === "win32") {	200	if (hostPlatform === "win32") {
198	return;	201	return;
199	}	202	}
200		203

apps/desktop/scripts/electron-launcher.mjs+6-3

...	@@ -14,6 +14,7 @@ import {	...	@@ -14,6 +14,7 @@ import {
14	writeFileSync,	14	writeFileSync,
15	} from "node:fs";	15	} from "node:fs";
16	import { createRequire } from "node:module";	16	import { createRequire } from "node:module";
		17	import * as NodeOS from "node:os";
17	import { basename, dirname, join, resolve } from "node:path";	18	import { basename, dirname, join, resolve } from "node:path";
18	import { fileURLToPath } from "node:url";	19	import { fileURLToPath } from "node:url";
19	import { ensureElectronRuntime } from "./ensure-electron-runtime.mjs";	20	import { ensureElectronRuntime } from "./ensure-electron-runtime.mjs";
...	@@ -33,6 +34,8 @@ const APP_PROTOCOL_SCHEMES = isDevelopment ? ["t3code-dev"] : ["t3code"];	...	@@ -33,6 +34,8 @@ const APP_PROTOCOL_SCHEMES = isDevelopment ? ["t3code-dev"] : ["t3code"];
33	const LAUNCHER_VERSION = 11;	34	const LAUNCHER_VERSION = 11;
34	const defaultIconPath = join(desktopDir, "resources", "icon.icns");	35	const defaultIconPath = join(desktopDir, "resources", "icon.icns");
35	const developmentMacIconPngPath = join(repoRoot, "assets", "dev", "blueprint-macos-1024.png");	36	const developmentMacIconPngPath = join(repoRoot, "assets", "dev", "blueprint-macos-1024.png");
		37	// oxlint-disable-next-line t3code/no-global-process-runtime -- Standalone launcher script has no Effect runtime.
		38	const hostPlatform = NodeOS.platform();
36		39
37	function resolveDevelopmentProtocolCallbackPort() {	40	function resolveDevelopmentProtocolCallbackPort() {
38	const configuredPort = Number.parseInt(process.env.T3CODE_PORT ?? "", 10);	41	const configuredPort = Number.parseInt(process.env.T3CODE_PORT ?? "", 10);
...	@@ -312,7 +315,7 @@ function buildMacLauncher(electronBinaryPath) {	...	@@ -312,7 +315,7 @@ function buildMacLauncher(electronBinaryPath) {
312	}	315	}
313		316
314	function isLinuxSetuidSandboxConfigured(electronBinaryPath) {	317	function isLinuxSetuidSandboxConfigured(electronBinaryPath) {
315	if (process.platform !== "linux") {	318	if (hostPlatform !== "linux") {
316	return true;	319	return true;
317	}	320	}
318		321
...	@@ -342,7 +345,7 @@ export function resolveElectronPath() {	...	@@ -342,7 +345,7 @@ export function resolveElectronPath() {
342	const require = createRequire(import.meta.url);	345	const require = createRequire(import.meta.url);
343	const electronBinaryPath = require("electron");	346	const electronBinaryPath = require("electron");
344		347
345	if (process.platform !== "darwin") {	348	if (hostPlatform !== "darwin") {
346	return electronBinaryPath;	349	return electronBinaryPath;
347	}	350	}
348		351
...	@@ -358,7 +361,7 @@ export function resolveElectronLaunchCommand(args = []) {	...	@@ -358,7 +361,7 @@ export function resolveElectronLaunchCommand(args = []) {
358	}	361	}
359		362
360	export function resolveDevProtocolClient() {	363	export function resolveDevProtocolClient() {
361	if (process.platform !== "darwin" \|\| !isDevelopment) {	364	if (hostPlatform !== "darwin" \|\| !isDevelopment) {
362	return null;	365	return null;
363	}	366	}
364		367

apps/desktop/scripts/ensure-electron-runtime.mjs+14-10

 @@ -1,13 +1,17 @@
 import { chmodSync, existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { createRequire } from "node:module";
-import { tmpdir } from "node:os";
+import { arch, platform, tmpdir } from "node:os";
 import { dirname, join } from "node:path";
 import { spawnSync } from "node:child_process";
 const require = createRequire(import.meta.url);
+// oxlint-disable-next-line t3code/no-global-process-runtime -- Standalone repair script has no Effect runtime.
+const hostPlatform = platform();
+// oxlint-disable-next-line t3code/no-global-process-runtime -- Standalone repair script has no Effect runtime.
+const hostArch = arch();
 function getPlatformPath() {
-  switch (process.platform) {
+  switch (hostPlatform) {
     case "darwin":
       return "Electron.app/Contents/MacOS/Electron";
     case "freebsd":
 @@ -17,12 +21,12 @@ function getPlatformPath() {
     case "win32":
       return "electron.exe";
     default:
-      throw new Error(`Electron builds are not available on platform: ${process.platform}`);
+      throw new Error(`Electron builds are not available on platform: ${hostPlatform}`);
   }
 }
 function ensureExecutable(filePath) {
-  if (process.platform !== "win32") {
+  if (hostPlatform !== "win32") {
     chmodSync(filePath, 0o755);
   }
 }
 @@ -39,7 +43,7 @@ function repairPathFile(electronDir, platformPath) {
 function getRequiredRuntimePaths(electronDir, platformPath) {
   const paths = [join(electronDir, "dist", platformPath)];
-  if (process.platform === "darwin") {
+  if (hostPlatform === "darwin") {
     paths.push(
       join(electronDir, "dist", "Electron.app", "Contents", "Info.plist"),
       join(
 @@ -58,7 +62,7 @@ function getRequiredRuntimePaths(electronDir, platformPath) {
 }
 function isMachO(filePath) {
-  if (process.platform !== "darwin") {
+  if (hostPlatform !== "darwin") {
     return true;
   }
 @@ -76,7 +80,7 @@ function missingRuntimePaths(electronDir, platformPath) {
 }
 function invalidRuntimePaths(electronDir, platformPath) {
-  if (process.platform !== "darwin") {
+  if (hostPlatform !== "darwin") {
     return [];
   }
 @@ -111,16 +115,16 @@ function runChecked(command, args) {
 function installElectronRuntime(electronDir, version) {
   const tempDir = mkdtempSync(join(tmpdir(), "t3-electron-"));
-  const zipPath = join(tempDir, `electron-v${version}-${process.platform}-${process.arch}.zip`);
+  const zipPath = join(tempDir, `electron-v${version}-${hostPlatform}-${hostArch}.zip`);
   try {
     runChecked("curl", [
       "-fsSL",
-      `https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-${process.platform}-${process.arch}.zip`,
+      `https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-${hostPlatform}-${hostArch}.zip`,
       "-o",
       zipPath,
     ]);
-    if (process.platform === "darwin") {
+    if (hostPlatform === "darwin") {
       runChecked("ditto", ["-x", "-k", zipPath, join(electronDir, "dist")]);
     } else {
       runChecked("python3", [

apps/desktop/src/app/DesktopAssets.ts+1-1

...	@@ -49,7 +49,7 @@ const resolveIconPath = Effect.fn("desktop.assets.resolveIconPath")(function* (	...	@@ -49,7 +49,7 @@ const resolveIconPath = Effect.fn("desktop.assets.resolveIconPath")(function* (
49	> {	49	> {
50	const fileSystem = yield* FileSystem.FileSystem;	50	const fileSystem = yield* FileSystem.FileSystem;
51	const environment = yield* DesktopEnvironment.DesktopEnvironment;	51	const environment = yield* DesktopEnvironment.DesktopEnvironment;
52	if (environment.isDevelopment && process.platform === "darwin" && ext === "png") {	52	if (environment.isDevelopment && environment.platform === "darwin" && ext === "png") {
53	const developmentDockIconPath = environment.developmentDockIconPath;	53	const developmentDockIconPath = environment.developmentDockIconPath;
54	const developmentDockIconExists = yield* fileSystem	54	const developmentDockIconExists = yield* fileSystem
55	.exists(developmentDockIconPath)	55	.exists(developmentDockIconPath)

apps/desktop/src/electron/ElectronMenu.ts+99-94

...	@@ -5,6 +5,7 @@ import * as Layer from "effect/Layer";	...	@@ -5,6 +5,7 @@ import * as Layer from "effect/Layer";
5	import * as Option from "effect/Option";	5	import * as Option from "effect/Option";
6		6
7	import * as Electron from "electron";	7	import * as Electron from "electron";
		8	import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
8		9
9	export interface ElectronMenuPosition {	10	export interface ElectronMenuPosition {
10	readonly x: number;	11	readonly x: number;
...	@@ -79,109 +80,113 @@ const normalizePosition = (	...	@@ -79,109 +80,113 @@ const normalizePosition = (
79	({ x, y }) => Number.isFinite(x) && Number.isFinite(y) && x >= 0 && y >= 0,	80	({ x, y }) => Number.isFinite(x) && Number.isFinite(y) && x >= 0 && y >= 0,
80	).pipe(Option.map(({ x, y }) => ({ x: Math.floor(x), y: Math.floor(y) })));	81	).pipe(Option.map(({ x, y }) => ({ x: Math.floor(x), y: Math.floor(y) })));
81		82
82	export const layer = Layer.sync(ElectronMenu, () => {	83	export const layer = Layer.effect(
83	let destructiveMenuIconCache: Option.Option<Electron.NativeImage> \| undefined;	84	ElectronMenu,
		85	Effect.gen(function* () {
		86	const platform = yield* HostProcessPlatform;
		87	let destructiveMenuIconCache: Option.Option<Electron.NativeImage> \| undefined;
84		88
85	const getDestructiveMenuIcon = (): Option.Option<Electron.NativeImage> => {	89	const getDestructiveMenuIcon = (): Option.Option<Electron.NativeImage> => {
86	if (process.platform !== "darwin") {	90	if (platform !== "darwin") {
87	return Option.none();	91	return Option.none();
88	}
89	if (destructiveMenuIconCache !== undefined) {
90	return destructiveMenuIconCache;
91	}
92
93	try {
94	const icon = Electron.nativeImage.createFromNamedImage("trash").resize({
95	width: 12,
96	height: 12,
97	});
98	destructiveMenuIconCache = icon.isEmpty() ? Option.none() : Option.some(icon);
99	} catch {
100	destructiveMenuIconCache = Option.none();
101	}
102
103	return destructiveMenuIconCache;
104	};
105
106	const buildTemplate = (
107	entries: readonly ContextMenuItem[],
108	complete: (selectedItemId: Option.Option<string>) => void,
109	): Electron.MenuItemConstructorOptions[] => {
110	const template: Electron.MenuItemConstructorOptions[] = [];
111	let hasInsertedDestructiveSeparator = false;
112
113	for (const item of entries) {
114	if (item.destructive && !hasInsertedDestructiveSeparator && template.length > 0) {
115	template.push({ type: "separator" });
116	hasInsertedDestructiveSeparator = true;
117	}	92	}
118		93	if (destructiveMenuIconCache !== undefined) {
119	const itemOption: Electron.MenuItemConstructorOptions = {	94	return destructiveMenuIconCache;
120	label: item.label,
121	enabled: !item.disabled,
122	};
123	if (item.children && item.children.length > 0) {
124	itemOption.submenu = buildTemplate(item.children, complete);
125	} else {
126	itemOption.click = () => complete(Option.some(item.id));
127	}	95	}
128	if (item.destructive && (!item.children \|\| item.children.length === 0)) {	96
129	const destructiveIcon = getDestructiveMenuIcon();	97	try {
130	if (Option.isSome(destructiveIcon)) {	98	const icon = Electron.nativeImage.createFromNamedImage("trash").resize({
131	itemOption.icon = destructiveIcon.value;	99	width: 12,
132	}	100	height: 12,
		101	});
		102	destructiveMenuIconCache = icon.isEmpty() ? Option.none() : Option.some(icon);
		103	} catch {
		104	destructiveMenuIconCache = Option.none();
133	}	105	}
134		106
135	template.push(itemOption);	107	return destructiveMenuIconCache;
136	}	108	};
137		109
138	return template;	110	const buildTemplate = (
139	};	111	entries: readonly ContextMenuItem[],
140		112	complete: (selectedItemId: Option.Option<string>) => void,
141	return ElectronMenu.of({	113	): Electron.MenuItemConstructorOptions[] => {
142	setApplicationMenu: (template) =>	114	const template: Electron.MenuItemConstructorOptions[] = [];
143	Effect.sync(() => {	115	let hasInsertedDestructiveSeparator = false;
144	Electron.Menu.setApplicationMenu(Electron.Menu.buildFromTemplate([...template]));	116
145	}),	117	for (const item of entries) {
146	popupTemplate: (input) =>	118	if (item.destructive && !hasInsertedDestructiveSeparator && template.length > 0) {
147	Effect.sync(() => {	119	template.push({ type: "separator" });
148	if (input.template.length === 0) {	120	hasInsertedDestructiveSeparator = true;
149	return;
150	}	121	}
151	Electron.Menu.buildFromTemplate([...input.template]).popup({ window: input.window });	122
152	}),	123	const itemOption: Electron.MenuItemConstructorOptions = {
153	showContextMenu: (input) =>	124	label: item.label,
154	Effect.callback<Option.Option<string>>((resume) => {	125	enabled: !item.disabled,
155	const normalizedItems = normalizeContextMenuItems(input.items);	126	};
156	if (normalizedItems.length === 0) {	127	if (item.children && item.children.length > 0) {
157	resume(Effect.succeed(Option.none()));	128	itemOption.submenu = buildTemplate(item.children, complete);
158	return;	129	} else {
		130	itemOption.click = () => complete(Option.some(item.id));
159	}	131	}
		132	if (item.destructive && (!item.children \|\| item.children.length === 0)) {
		133	const destructiveIcon = getDestructiveMenuIcon();
		134	if (Option.isSome(destructiveIcon)) {
		135	itemOption.icon = destructiveIcon.value;
		136	}
		137	}
		138
		139	template.push(itemOption);
		140	}
160		141
161	let completed = false;	142	return template;
162	const complete = (selectedItemId: Option.Option<string>) => {	143	};
163	if (completed) {	144
		145	return ElectronMenu.of({
		146	setApplicationMenu: (template) =>
		147	Effect.sync(() => {
		148	Electron.Menu.setApplicationMenu(Electron.Menu.buildFromTemplate([...template]));
		149	}),
		150	popupTemplate: (input) =>
		151	Effect.sync(() => {
		152	if (input.template.length === 0) {
		153	return;
		154	}
		155	Electron.Menu.buildFromTemplate([...input.template]).popup({ window: input.window });
		156	}),
		157	showContextMenu: (input) =>
		158	Effect.callback<Option.Option<string>>((resume) => {
		159	const normalizedItems = normalizeContextMenuItems(input.items);
		160	if (normalizedItems.length === 0) {
		161	resume(Effect.succeed(Option.none()));
164	return;	162	return;
165	}	163	}
166	completed = true;
167	resume(Effect.succeed(selectedItemId));
168	};
169		164
170	const menu = Electron.Menu.buildFromTemplate(buildTemplate(normalizedItems, complete));	165	let completed = false;
171	const popupPosition = normalizePosition(input.position);	166	const complete = (selectedItemId: Option.Option<string>) => {
172	const popupOptions = Option.match(popupPosition, {	167	if (completed) {
173	onNone: (): Electron.PopupOptions => ({	168	return;
174	window: input.window,	169	}
175	callback: () => complete(Option.none()),	170	completed = true;
176	}),	171	resume(Effect.succeed(selectedItemId));
177	onSome: (position): Electron.PopupOptions => ({	172	};
178	window: input.window,	173
179	x: position.x,	174	const menu = Electron.Menu.buildFromTemplate(buildTemplate(normalizedItems, complete));
180	y: position.y,	175	const popupPosition = normalizePosition(input.position);
181	callback: () => complete(Option.none()),	176	const popupOptions = Option.match(popupPosition, {
182	}),	177	onNone: (): Electron.PopupOptions => ({
183	});	178	window: input.window,
184	menu.popup(popupOptions);	179	callback: () => complete(Option.none()),
185	}),	180	}),
186	});	181	onSome: (position): Electron.PopupOptions => ({
187	});	182	window: input.window,
		183	x: position.x,
		184	y: position.y,
		185	callback: () => complete(Option.none()),
		186	}),
		187	});
		188	menu.popup(popupOptions);
		189	}),
		190	});
		191	}),
		192	);

apps/desktop/src/electron/ElectronWindow.ts+3-1

apps/desktop/src/main.ts+5-2

 @@ -9,6 +9,7 @@ import * as Option from "effect/Option";
 import * as Electron from "electron";
 import * as NetService from "@t3tools/shared/Net";
+import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess";
 import { resolveRemoteT3CliPackageSpec } from "@t3tools/ssh/command";
 import type { RemoteT3RunnerOptions } from "@t3tools/ssh/tunnel";
 import serverPackageJson from "../../server/package.json" with { type: "json" };
 @@ -53,11 +54,13 @@ const desktopEnvironmentLayer = Layer.unwrap(
     const metadata = yield* Effect.service(ElectronApp.ElectronApp).pipe(
       Effect.flatMap((app) => app.metadata),
     );
+    const platform = yield* HostProcessPlatform;
+    const processArch = yield* HostProcessArchitecture;
     return DesktopEnvironment.layer({
       dirname: __dirname,
       homeDirectory: NodeOS.homedir(),
-      platform: process.platform,
+      platform,
-      processArch: process.arch,
+      processArch,
       ...metadata,
     });
   }),

apps/desktop/src/window/DesktopWindow.ts+14-9

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

 @@ -18,6 +18,7 @@ import {
 import { resolveCatalogDependencies } from "../../../scripts/lib/resolve-catalog.ts";
 import { fromJsonStringPretty } from "@t3tools/shared/schemaJson";
 import { fromYaml } from "@t3tools/shared/schemaYaml";
+import { resolveSpawnCommand } from "@t3tools/shared/shell";
 import serverPackageJson from "../package.json" with { type: "json" };
 interface PackageJson {
 @@ -175,6 +176,7 @@ const buildCmd = Command.make(
           cwd: serverDir,
           stdout: config.verbose ? "inherit" : "ignore",
           stderr: "inherit",
+          shell: false,
         }),
       );
 @@ -290,15 +292,15 @@ const publishCmd = Command.make(
         () =>
           Effect.gen(function* () {
             const args = createVpPmPublishArgs(config);
+            const spawnCommand = yield* resolveSpawnCommand("vp", ["pm", ...args]);
             yield* Effect.log(`[cli] Running: vp pm ${args.join(" ")}`);
             yield* runCommand(
-              ChildProcess.make("vp", ["pm", ...args], {
+              ChildProcess.make(spawnCommand.command, spawnCommand.args, {
                 cwd: repoRoot,
                 stdout: config.verbose ? "inherit" : "ignore",
                 stderr: "inherit",
-                // Windows needs shell mode to resolve .cmd shims.
+                shell: spawnCommand.shell,
-                shell: process.platform === "win32",
               }),
             );
           }),

apps/server/scripts/cursor-acp-model-mismatch-probe.ts+5-2

 @@ -3,6 +3,8 @@ import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process";
 import process from "node:process";
 import readline from "node:readline";
 import * as NodeTimers from "node:timers";
+import { resolveSpawnCommand } from "@t3tools/shared/shell";
+import * as Effect from "effect/Effect";
 type JsonPrimitive = null | boolean | number | string;
 type JsonValue = JsonPrimitive | JsonValue[] | { [key: string]: JsonValue };
 @@ -128,9 +130,10 @@ class JsonRpcChild {
   closed = false;
   constructor(bin: string, args: string[], cwd: string) {
-    this.child = spawn(bin, args, {
+    const spawnCommand = Effect.runSync(resolveSpawnCommand(bin, args));
+    this.child = spawn(spawnCommand.command, spawnCommand.args, {
       cwd,
-      shell: process.platform === "win32",
+      shell: spawnCommand.shell,
       stdio: ["pipe", "pipe", "pipe"],
       env: process.env,
     });

apps/server/src/bootstrap.test.ts+6-11

 @@ -3,7 +3,7 @@ import * as NFS from "node:fs";
 import * as path from "node:path";
 import { execFileSync, spawn } from "node:child_process";
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import { assert, it } from "@effect/vitest";
+import { it } from "@effect/vitest";
 import * as FileSystem from "effect/FileSystem";
 import * as Schema from "effect/Schema";
 import * as Duration from "effect/Duration";
 @@ -11,8 +11,9 @@ import * as Effect from "effect/Effect";
 import * as Fiber from "effect/Fiber";
 import * as TestClock from "effect/testing/TestClock";
 import { vi } from "vite-plus/test";
+import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
-import { readBootstrapEnvelope, resolveFdPath } from "./bootstrap.ts";
+import { readBootstrapEnvelope } from "./bootstrap.ts";
 import { assertNone, assertSome } from "@effect/vitest/utils";
 const openSyncInterceptor = vi.hoisted(() => ({ failPath: null as string | null }));
 @@ -41,14 +42,6 @@ const TestEnvelopeSchema = Schema.Struct({ mode: Schema.String });
 const encodeTestEnvelopeSchema = Schema.encodeEffect(Schema.fromJsonString(TestEnvelopeSchema));
 it.layer(NodeServices.layer)("readBootstrapEnvelope", (it) => {
-  it.effect("uses platform-specific fd paths", () =>
-    Effect.sync(() => {
-      assert.equal(resolveFdPath(3, "linux"), "/proc/self/fd/3");
-      assert.equal(resolveFdPath(3, "darwin"), "/dev/fd/3");
-      assert.equal(resolveFdPath(3, "win32"), undefined);
-    }),
-  );
   it.effect("reads a bootstrap envelope from a provided fd", () =>
     Effect.gen(function* () {
       const fs = yield* FileSystem.FileSystem;
 @@ -89,7 +82,9 @@ it.layer(NodeServices.layer)("readBootstrapEnvelope", (it) => {
       openSyncInterceptor.failPath = `/proc/self/fd/${fd}`;
       try {
-        const payload = yield* readBootstrapEnvelope(TestEnvelopeSchema, fd, { timeoutMs: 100 });
+        const payload = yield* readBootstrapEnvelope(TestEnvelopeSchema, fd, {
+          timeoutMs: 100,
+        }).pipe(Effect.provideService(HostProcessPlatform, "linux"));
         assertSome(payload, {
           mode: "desktop",
         });

apps/server/src/bootstrap.ts+32-31

...	@@ -11,6 +11,7 @@ import * as Predicate from "effect/Predicate";	...	@@ -11,6 +11,7 @@ import * as Predicate from "effect/Predicate";
11	import * as Result from "effect/Result";	11	import * as Result from "effect/Result";
12	import * as Schema from "effect/Schema";	12	import * as Schema from "effect/Schema";
13	import { decodeJsonResult } from "@t3tools/shared/schemaJson";	13	import { decodeJsonResult } from "@t3tools/shared/schemaJson";
		14	import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
14		15
15	class BootstrapError extends Data.TaggedError("BootstrapError")<{	16	class BootstrapError extends Data.TaggedError("BootstrapError")<{
16	readonly message: string;	17	readonly message: string;
...	@@ -110,36 +111,39 @@ const isFdReady = (fd: number) =>	...	@@ -110,36 +111,39 @@ const isFdReady = (fd: number) =>
110	);	111	);
111		112
112	const makeBootstrapInputStream = (fd: number) =>	113	const makeBootstrapInputStream = (fd: number) =>
113	Effect.try<Readable, BootstrapError>({	114	Effect.gen(function* () {
114	try: () => {	115	const platform = yield* HostProcessPlatform;
115	const fdPath = resolveFdPath(fd);	116	return yield* Effect.try<Readable, BootstrapError>({
116	if (fdPath === undefined) {	117	try: () => {
117	return makeDirectBootstrapStream(fd);	118	const fdPath = resolveFdPath(fd, platform);
118	}	119	if (fdPath === undefined) {
		120	return makeDirectBootstrapStream(fd);
		121	}
119		122
120	let streamFd: number \| undefined;	123	let streamFd: number \| undefined;
121	try {	124	try {
122	streamFd = NFS.openSync(fdPath, "r");	125	streamFd = NFS.openSync(fdPath, "r");
123	return NFS.createReadStream("", {	126	return NFS.createReadStream("", {
124	fd: streamFd,	127	fd: streamFd,
125	encoding: "utf8",	128	encoding: "utf8",
126	autoClose: true,	129	autoClose: true,
127	});	130	});
128	} catch (error) {	131	} catch (error) {
129	if (isBootstrapFdPathDuplicationError(error)) {	132	if (isBootstrapFdPathDuplicationError(error)) {
130	if (streamFd !== undefined) {	133	if (streamFd !== undefined) {
131	NFS.closeSync(streamFd);	134	NFS.closeSync(streamFd);
		135	}
		136	return makeDirectBootstrapStream(fd);
132	}	137	}
133	return makeDirectBootstrapStream(fd);	138	throw error;
134	}	139	}
135	throw error;	140	},
136	}	141	catch: (error) =>
137	},	142	new BootstrapError({
138	catch: (error) =>	143	message: "Failed to duplicate bootstrap fd.",
139	new BootstrapError({	144	cause: error,
140	message: "Failed to duplicate bootstrap fd.",	145	}),
141	cause: error,	146	});
142	}),
143	});	147	});
144		148
145	const makeDirectBootstrapStream = (fd: number): Readable => {	149	const makeDirectBootstrapStream = (fd: number): Readable => {
...	@@ -165,10 +169,7 @@ const isBootstrapFdPathDuplicationError = Predicate.compose(	...	@@ -165,10 +169,7 @@ const isBootstrapFdPathDuplicationError = Predicate.compose(
165	(_) => _.code === "ENXIO" \|\| _.code === "EINVAL" \|\| _.code === "EPERM",	169	(_) => _.code === "ENXIO" \|\| _.code === "EINVAL" \|\| _.code === "EPERM",
166	);	170	);
167		171
168	export function resolveFdPath(	172	function resolveFdPath(fd: number, platform: NodeJS.Platform): string \| undefined {
169	fd: number,
170	platform: NodeJS.Platform = process.platform,
171	): string \| undefined {
172	if (platform === "linux") {	173	if (platform === "linux") {
173	return `/proc/self/fd/${fd}`;	174	return `/proc/self/fd/${fd}`;
174	}	175	}

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

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	import NodeOS from "node:os";	1	import * as NodeOS from "node:os";
2		2
3	import { assert, expect, it } from "@effect/vitest";	3	import { assert, expect, it } from "@effect/vitest";
4	import * as ConfigProvider from "effect/ConfigProvider";	4	import * as ConfigProvider from "effect/ConfigProvider";

apps/server/src/diagnostics/ProcessDiagnostics.ts+10-4

...	@@ -4,6 +4,7 @@ import type {	...	@@ -4,6 +4,7 @@ import type {
4	ServerProcessSignal,	4	ServerProcessSignal,
5	ServerSignalProcessResult,	5	ServerSignalProcessResult,
6	} from "@t3tools/contracts";	6	} from "@t3tools/contracts";
		7	import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
7	import * as Context from "effect/Context";	8	import * as Context from "effect/Context";
8	import * as DateTime from "effect/DateTime";	9	import * as DateTime from "effect/DateTime";
9	import * as Duration from "effect/Duration";	10	import * as Duration from "effect/Duration";
...	@@ -277,6 +278,9 @@ const runProcess = Effect.fn("runProcess")(	...	@@ -277,6 +278,9 @@ const runProcess = Effect.fn("runProcess")(
277	readonly errorMessage: string;	278	readonly errorMessage: string;
278	}) {	279	}) {
279	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;	280	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
		281	// `ps` and `powershell.exe` are real executables; spawning through cmd.exe
		282	// shell mode would re-tokenize the PowerShell `-Command` payload (which
		283	// contains pipes) before PowerShell ever sees it.
280	const child = yield* spawner.spawn(	284	const child = yield* spawner.spawn(
281	ChildProcess.make(input.command, input.args, {	285	ChildProcess.make(input.command, input.args, {
282	cwd: process.cwd(),	286	cwd: process.cwd(),
...	@@ -369,8 +373,10 @@ function readWindowsProcessRows(): Effect.Effect<	...	@@ -369,8 +373,10 @@ function readWindowsProcessRows(): Effect.Effect<
369	);	373	);
370	}	374	}
371		375
372	export const readProcessRows = (platform = process.platform) =>	376	export const readProcessRows = Effect.gen(function* () {
373	platform === "win32" ? readWindowsProcessRows() : readPosixProcessRows();	377	const platform = yield* HostProcessPlatform;
		378	return yield* platform === "win32" ? readWindowsProcessRows() : readPosixProcessRows();
		379	});
374		380
375	export function aggregateProcessDiagnostics(input: {	381	export function aggregateProcessDiagnostics(input: {
376	readonly serverPid: number;	382	readonly serverPid: number;
...	@@ -387,7 +393,7 @@ function assertDescendantPid(	...	@@ -387,7 +393,7 @@ function assertDescendantPid(
387	return Effect.fail(toProcessDiagnosticsError("Refusing to signal the T3 server process."));	393	return Effect.fail(toProcessDiagnosticsError("Refusing to signal the T3 server process."));
388	}	394	}
389		395
390	return readProcessRows().pipe(	396	return readProcessRows.pipe(
391	Effect.flatMap((rows) => {	397	Effect.flatMap((rows) => {
392	const filteredRows = rows.filter((row) => !isDiagnosticsQueryProcess(row, process.pid));	398	const filteredRows = rows.filter((row) => !isDiagnosticsQueryProcess(row, process.pid));
393	const descendant = buildDescendantEntries(filteredRows, process.pid).some(	399	const descendant = buildDescendantEntries(filteredRows, process.pid).some(
...	@@ -407,7 +413,7 @@ export const make = Effect.fn("makeProcessDiagnostics")(function* () {	...	@@ -407,7 +413,7 @@ export const make = Effect.fn("makeProcessDiagnostics")(function* () {
407		413
408	const read: ProcessDiagnosticsShape["read"] = Effect.gen(function* () {	414	const read: ProcessDiagnosticsShape["read"] = Effect.gen(function* () {
409	const readAt = yield* DateTime.now;	415	const readAt = yield* DateTime.now;
410	const rows = yield* readProcessRows().pipe(	416	const rows = yield* readProcessRows.pipe(
411	Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),	417	Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
412	);	418	);
413	return makeResult({ serverPid: process.pid, rows, readAt });	419	return makeResult({ serverPid: process.pid, rows, readAt });

apps/server/src/diagnostics/ProcessResourceMonitor.ts+1-1

...	@@ -252,7 +252,7 @@ export const make = Effect.fn("makeProcessResourceMonitor")(function* () {	...	@@ -252,7 +252,7 @@ export const make = Effect.fn("makeProcessResourceMonitor")(function* () {
252	const sampleOnce = Effect.gen(function* () {	252	const sampleOnce = Effect.gen(function* () {
253	const sampledAt = yield* DateTime.now;	253	const sampledAt = yield* DateTime.now;
254	const sampledAtMs = DateTime.toEpochMillis(sampledAt);	254	const sampledAtMs = DateTime.toEpochMillis(sampledAt);
255	const rows = yield* readProcessRows().pipe(	255	const rows = yield* readProcessRows.pipe(
256	Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),	256	Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
257	);	257	);
258	const samples = collectMonitoredSamples({	258	const samples = collectMonitoredSamples({

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

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	import { EnvironmentId, type ExecutionEnvironmentDescriptor } from "@t3tools/contracts";	1	import { EnvironmentId, type ExecutionEnvironmentDescriptor } from "@t3tools/contracts";
		2	import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess";
2	import * as Crypto from "effect/Crypto";	3	import * as Crypto from "effect/Crypto";
3	import * as Effect from "effect/Effect";	4	import * as Effect from "effect/Effect";
4	import * as FileSystem from "effect/FileSystem";	5	import * as FileSystem from "effect/FileSystem";
...	@@ -11,8 +12,8 @@ import { ServerEnvironment, type ServerEnvironmentShape } from "../Services/Serv	...	@@ -11,8 +12,8 @@ import { ServerEnvironment, type ServerEnvironmentShape } from "../Services/Serv
11	import packageJson from "../../../package.json" with { type: "json" };	12	import packageJson from "../../../package.json" with { type: "json" };
12	import { resolveServerEnvironmentLabel } from "./ServerEnvironmentLabel.ts";	13	import { resolveServerEnvironmentLabel } from "./ServerEnvironmentLabel.ts";
13		14
14	function platformOs(): ExecutionEnvironmentDescriptor["platform"]["os"] {	15	function platformOs(platform: NodeJS.Platform): ExecutionEnvironmentDescriptor["platform"]["os"] {
15	switch (process.platform) {	16	switch (platform) {
16	case "darwin":	17	case "darwin":
17	return "darwin";	18	return "darwin";
18	case "linux":	19	case "linux":
...	@@ -24,8 +25,10 @@ function platformOs(): ExecutionEnvironmentDescriptor["platform"]["os"] {	...	@@ -24,8 +25,10 @@ function platformOs(): ExecutionEnvironmentDescriptor["platform"]["os"] {
24	}	25	}
25	}	26	}
26		27
27	function platformArch(): ExecutionEnvironmentDescriptor["platform"]["arch"] {	28	function platformArch(
28	switch (process.arch) {	29	architecture: NodeJS.Architecture,
		30	): ExecutionEnvironmentDescriptor["platform"]["arch"] {
		31	switch (architecture) {
29	case "arm64":	32	case "arm64":
30	return "arm64";	33	return "arm64";
31	case "x64":	34	case "x64":
...	@@ -40,6 +43,8 @@ export const makeServerEnvironment = Effect.fn("makeServerEnvironment")(function	...	@@ -40,6 +43,8 @@ export const makeServerEnvironment = Effect.fn("makeServerEnvironment")(function
40	const path = yield* Path.Path;	43	const path = yield* Path.Path;
41	const serverConfig = yield* ServerConfig;	44	const serverConfig = yield* ServerConfig;
42	const crypto = yield* Crypto.Crypto;	45	const crypto = yield* Crypto.Crypto;
		46	const hostPlatform = yield* HostProcessPlatform;
		47	const hostArchitecture = yield* HostProcessArchitecture;
43		48
44	const readPersistedEnvironmentId = Effect.gen(function* () {	49	const readPersistedEnvironmentId = Effect.gen(function* () {
45	const exists = yield* fileSystem	50	const exists = yield* fileSystem
...	@@ -80,8 +85,8 @@ export const makeServerEnvironment = Effect.fn("makeServerEnvironment")(function	...	@@ -80,8 +85,8 @@ export const makeServerEnvironment = Effect.fn("makeServerEnvironment")(function
80	environmentId,	85	environmentId,
81	label,	86	label,
82	platform: {	87	platform: {
83	os: platformOs(),	88	os: platformOs(hostPlatform),
84	arch: platformArch(),	89	arch: platformArch(hostArchitecture),
85	},	90	},
86	serverVersion: packageJson.version,	91	serverVersion: packageJson.version,
87	capabilities: {	92	capabilities: {

apps/server/src/environment/Layers/ServerEnvironmentLabel.test.ts+18-21

 @@ -2,6 +2,7 @@ import { afterEach, describe, expect, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
+import { HostProcessHostname, HostProcessPlatform } from "@t3tools/shared/hostProcess";
 import { vi } from "vite-plus/test";
 import { ProcessRunner, ProcessSpawnError, type ProcessRunnerShape } from "../../processRunner.ts";
 @@ -28,6 +29,16 @@ const LinuxMachineInfoLayer = Layer.merge(
         : Effect.succeed(""),
   }),
 );
+const withHostPlatform = <ROut, E, RIn>(
+  layer: Layer.Layer<ROut, E, RIn>,
+  platform: NodeJS.Platform,
+  hostname: string,
+) =>
+  Layer.mergeAll(
+    layer,
+    Layer.succeed(HostProcessPlatform, platform),
+    Layer.succeed(HostProcessHostname, hostname),
+  );
 afterEach(() => {
   runMock.mockReset();
 @@ -38,9 +49,7 @@ describe("resolveServerEnvironmentLabel", () => {
     Effect.gen(function* () {
       const result = yield* resolveServerEnvironmentLabel({
         cwdBaseName: "t3code",
-        platform: "win32",
+      }).pipe(Effect.provide(withHostPlatform(TestLayer, "win32", "macbook-pro")));
-        hostname: "macbook-pro",
-      }).pipe(Effect.provide(TestLayer));
       expect(result).toBe("macbook-pro");
     }),
 @@ -61,9 +70,7 @@ describe("resolveServerEnvironmentLabel", () => {
       const result = yield* resolveServerEnvironmentLabel({
         cwdBaseName: "t3code",
-        platform: "darwin",
+      }).pipe(Effect.provide(withHostPlatform(TestLayer, "darwin", "macbook-pro")));
-        hostname: "macbook-pro",
-      }).pipe(Effect.provide(TestLayer));
       expect(result).toBe("Julius's MacBook Pro");
       expect(runMock).toHaveBeenCalledWith(
 @@ -80,9 +87,7 @@ describe("resolveServerEnvironmentLabel", () => {
     Effect.gen(function* () {
       const result = yield* resolveServerEnvironmentLabel({
         cwdBaseName: "t3code",
-        platform: "linux",
+      }).pipe(Effect.provide(withHostPlatform(LinuxMachineInfoLayer, "linux", "buildbox")));
-        hostname: "buildbox",
-      }).pipe(Effect.provide(LinuxMachineInfoLayer));
       expect(result).toBe("Build Agent 01");
       expect(runMock).not.toHaveBeenCalled();
 @@ -104,9 +109,7 @@ describe("resolveServerEnvironmentLabel", () => {
       const result = yield* resolveServerEnvironmentLabel({
         cwdBaseName: "t3code",
-        platform: "linux",
+      }).pipe(Effect.provide(withHostPlatform(TestLayer, "linux", "runner-01")));
-        hostname: "runner-01",
-      }).pipe(Effect.provide(TestLayer));
       expect(result).toBe("CI Runner");
       expect(runMock).toHaveBeenCalledWith(
 @@ -123,9 +126,7 @@ describe("resolveServerEnvironmentLabel", () => {
     Effect.gen(function* () {
       const result = yield* resolveServerEnvironmentLabel({
         cwdBaseName: "t3code",
-        platform: "win32",
+      }).pipe(Effect.provide(withHostPlatform(TestLayer, "win32", "JULIUS-LAPTOP")));
-        hostname: "JULIUS-LAPTOP",
-      }).pipe(Effect.provide(TestLayer));
       expect(result).toBe("JULIUS-LAPTOP");
     }),
 @@ -145,9 +146,7 @@ describe("resolveServerEnvironmentLabel", () => {
       const result = yield* resolveServerEnvironmentLabel({
         cwdBaseName: "t3code",
-        platform: "darwin",
+      }).pipe(Effect.provide(withHostPlatform(TestLayer, "darwin", "macbook-pro")));
-        hostname: "macbook-pro",
-      }).pipe(Effect.provide(TestLayer));
       expect(result).toBe("macbook-pro");
     }),
 @@ -168,9 +167,7 @@ describe("resolveServerEnvironmentLabel", () => {
       const result = yield* resolveServerEnvironmentLabel({
         cwdBaseName: "t3code",
-        platform: "linux",
+      }).pipe(Effect.provide(withHostPlatform(TestLayer, "linux", "   ")));
-        hostname: "   ",
-      }).pipe(Effect.provide(TestLayer));
       expect(result).toBe("t3code");
     }),

apps/server/src/environment/Layers/ServerEnvironmentLabel.ts+5-10

...	@@ -1,5 +1,4 @@	...	@@ -1,5 +1,4 @@
1	import * as OS from "node:os";	1	import { HostProcessHostname, HostProcessPlatform } from "@t3tools/shared/hostProcess";
2
3	import * as Effect from "effect/Effect";	2	import * as Effect from "effect/Effect";
4	import * as FileSystem from "effect/FileSystem";	3	import * as FileSystem from "effect/FileSystem";
5	import * as Option from "effect/Option";	4	import * as Option from "effect/Option";
...	@@ -8,8 +7,6 @@ import { ProcessRunner } from "../../processRunner.ts";	...	@@ -8,8 +7,6 @@ import { ProcessRunner } from "../../processRunner.ts";
8		7
9	interface ResolveServerEnvironmentLabelInput {	8	interface ResolveServerEnvironmentLabelInput {
10	readonly cwdBaseName: string;	9	readonly cwdBaseName: string;
11	readonly platform?: NodeJS.Platform;
12	readonly hostname?: string \| null;
13	}	10	}
14		11
15	function normalizeLabel(value: string \| null \| undefined): string \| null {	12	function normalizeLabel(value: string \| null \| undefined): string \| null {
...	@@ -69,9 +66,8 @@ const runFriendlyLabelCommand = Effect.fn("runFriendlyLabelCommand")(function* (	...	@@ -69,9 +66,8 @@ const runFriendlyLabelCommand = Effect.fn("runFriendlyLabelCommand")(function* (
69	return normalizeLabel(result.value.stdout);	66	return normalizeLabel(result.value.stdout);
70	});	67	});
71		68
72	const resolveFriendlyHostLabel = Effect.fn("resolveFriendlyHostLabel")(function* (	69	const resolveFriendlyHostLabel = Effect.fn("resolveFriendlyHostLabel")(function* () {
73	platform: NodeJS.Platform,	70	const platform = yield* HostProcessPlatform;
74	) {
75	if (platform === "darwin") {	71	if (platform === "darwin") {
76	return yield* runFriendlyLabelCommand("scutil", ["--get", "ComputerName"]);	72	return yield* runFriendlyLabelCommand("scutil", ["--get", "ComputerName"]);
77	}	73	}
...	@@ -94,13 +90,12 @@ const resolveFriendlyHostLabel = Effect.fn("resolveFriendlyHostLabel")(function*	...	@@ -94,13 +90,12 @@ const resolveFriendlyHostLabel = Effect.fn("resolveFriendlyHostLabel")(function*
94	export const resolveServerEnvironmentLabel = Effect.fn("resolveServerEnvironmentLabel")(function* (	90	export const resolveServerEnvironmentLabel = Effect.fn("resolveServerEnvironmentLabel")(function* (
95	input: ResolveServerEnvironmentLabelInput,	91	input: ResolveServerEnvironmentLabelInput,
96	) {	92	) {
97	const platform = input.platform ?? process.platform;	93	const friendlyHostLabel = yield* resolveFriendlyHostLabel();
98	const friendlyHostLabel = yield* resolveFriendlyHostLabel(platform);
99	if (friendlyHostLabel) {	94	if (friendlyHostLabel) {
100	return friendlyHostLabel;	95	return friendlyHostLabel;
101	}	96	}
102		97
103	const hostname = normalizeLabel(input.hostname ?? OS.hostname());	98	const hostname = normalizeLabel(yield* HostProcessHostname);
104	if (hostname) {	99	if (hostname) {
105	return hostname;	100	return hostname;
106	}	101	}

apps/server/src/os-jank.ts+54-66

...	@@ -1,21 +1,15 @@	...	@@ -1,21 +1,15 @@
1	import * as NodeOS from "node:os";	1	import { HostProcessEnvironment, HostProcessPlatform } from "@t3tools/shared/hostProcess";
2	import * as Effect from "effect/Effect";
3	import * as Path from "effect/Path";
4	import {	2	import {
5	readPathFromLoginShell,
6	readEnvironmentFromWindowsShell,
7	resolveWindowsEnvironment,
8	type CommandAvailabilityOptions,
9	type WindowsShellEnvironmentReader,
10	listLoginShellCandidates,	3	listLoginShellCandidates,
11	mergePathEntries,	4	mergePathEntries,
		5	readPathFromLoginShell,
12	readPathFromLaunchctl,	6	readPathFromLaunchctl,
		7	resolveWindowsEnvironment,
13	} from "@t3tools/shared/shell";	8	} from "@t3tools/shared/shell";
14		9	import * as Effect from "effect/Effect";
15	type WindowsCommandAvailabilityChecker = (	10	import * as FileSystem from "effect/FileSystem";
16	command: string,	11	import * as Path from "effect/Path";
17	options?: CommandAvailabilityOptions,	12	import * as NodeOS from "node:os";
18	) => boolean;
19		13
20	function logPathHydrationWarning(message: string, error?: unknown): void {	14	function logPathHydrationWarning(message: string, error?: unknown): void {
21	process.stderr.write(	15	process.stderr.write(
...	@@ -23,66 +17,60 @@ function logPathHydrationWarning(message: string, error?: unknown): void {	...	@@ -23,66 +17,60 @@ function logPathHydrationWarning(message: string, error?: unknown): void {
23	);	17	);
24	}	18	}
25		19
26	export function fixPath(	20	function hydratePosixPath(env: NodeJS.ProcessEnv, platform: NodeJS.Platform): void {
27	options: {	21	let shellPath: string \| undefined;
28	env?: NodeJS.ProcessEnv;	22	for (const shell of listLoginShellCandidates(platform, env.SHELL)) {
29	platform?: NodeJS.Platform;	23	try {
30	readPath?: typeof readPathFromLoginShell;	24	shellPath = readPathFromLoginShell(shell);
31	readWindowsEnvironment?: WindowsShellEnvironmentReader;	25	} catch (error) {
32	isWindowsCommandAvailable?: WindowsCommandAvailabilityChecker;	26	logPathHydrationWarning(`Failed to read PATH from login shell ${shell}.`, error);
33	readLaunchctlPath?: typeof readPathFromLaunchctl;
34	userShell?: string;
35	logWarning?: (message: string, error?: unknown) => void;
36	} = {},
37	): void {
38	const platform = options.platform ?? process.platform;
39	const env = options.env ?? process.env;
40	const logWarning = options.logWarning ?? logPathHydrationWarning;
41	const readPath = options.readPath ?? readPathFromLoginShell;
42
43	try {
44	if (platform === "win32") {
45	const repairedEnvironment = resolveWindowsEnvironment(env, {
46	readEnvironment: options.readWindowsEnvironment ?? readEnvironmentFromWindowsShell,
47	...(options.isWindowsCommandAvailable
48	? { commandAvailable: options.isWindowsCommandAvailable }
49	: {}),
50	});
51	for (const [key, value] of Object.entries(repairedEnvironment)) {
52	if (value !== undefined) {
53	env[key] = value;
54	}
55	}
56	return;
57	}	27	}
58		28
59	if (platform !== "darwin" && platform !== "linux") return;	29	if (shellPath) break;
		30	}
60		31
61	let shellPath: string \| undefined;	32	const launchctlPath = platform === "darwin" && !shellPath ? readPathFromLaunchctl() : undefined;
62	for (const shell of listLoginShellCandidates(platform, env.SHELL, options.userShell)) {	33	const mergedPath = mergePathEntries(shellPath ?? launchctlPath, env.PATH, platform);
63	try {	34	if (mergedPath) {
64	shellPath = readPath(shell);	35	env.PATH = mergedPath;
65	} catch (error) {	36	}
66	logWarning(`Failed to read PATH from login shell ${shell}.`, error);	37	}
67	}
68		38
69	if (shellPath) {	39	export const fixPath = Effect.fn("fixPath")(function* (): Effect.fn.Return<
70	break;	40	void,
71	}	41	never,
72	}	42	FileSystem.FileSystem \| Path.Path
		43	> {
		44	const platform = yield* HostProcessPlatform;
		45	const env = yield* HostProcessEnvironment;
73		46
74	const launchctlPath =	47	if (platform === "win32") {
75	platform === "darwin" && !shellPath	48	const repairedEnvironment = yield* resolveWindowsEnvironment(env).pipe(
76	? (options.readLaunchctlPath ?? readPathFromLaunchctl)()	49	Effect.catchDefect((defect) =>
77	: undefined;	50	Effect.sync(() => {
78	const mergedPath = mergePathEntries(shellPath ?? launchctlPath, env.PATH, platform);	51	logPathHydrationWarning("Failed to hydrate PATH from the user environment.", defect);
79	if (mergedPath) {	52	return {} as Partial<NodeJS.ProcessEnv>;
80	env.PATH = mergedPath;	53	}),
		54	),
		55	);
		56	for (const [key, value] of Object.entries(repairedEnvironment)) {
		57	if (value !== undefined) {
		58	env[key] = value;
		59	}
81	}	60	}
82	} catch (error) {	61	return;
83	logWarning("Failed to hydrate PATH from the user environment.", error);
84	}	62	}
85	}	63
		64	if (platform !== "darwin" && platform !== "linux") return;
		65
		66	yield* Effect.sync(() => hydratePosixPath(env, platform)).pipe(
		67	Effect.catchDefect((defect) =>
		68	Effect.sync(() => {
		69	logPathHydrationWarning("Failed to hydrate PATH from the user environment.", defect);
		70	}),
		71	),
		72	);
		73	});
86		74
87	export const expandHomePath = Effect.fn(function* (input: string) {	75	export const expandHomePath = Effect.fn(function* (input: string) {
88	const { join } = yield* Path.Path;	76	const { join } = yield* Path.Path;

apps/server/src/preview/PortScanner.test.ts+8-186

...	@@ -1,21 +1,20 @@	...	@@ -1,21 +1,20 @@
1	import * as net from "node:net";	1	import * as net from "node:net";
2		2
3	import { it as effectIt } from "@effect/vitest";	3	import { it as effectIt } from "@effect/vitest";
4	import { ThreadId } from "@t3tools/contracts";	4	import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
5	import * as Net from "@t3tools/shared/Net";	5	import * as Net from "@t3tools/shared/Net";
6	import { Effect, Layer } from "effect";	6	import { Effect, Layer } from "effect";
7	import { describe, expect, it } from "vite-plus/test";	7	import { expect } from "vite-plus/test";
8		8
9	import { ProcessRunner } from "../processRunner.ts";	9	import { ProcessRunner } from "../processRunner.ts";
10	import * as PortScanner from "./PortScanner.ts";	10	import * as PortScanner from "./PortScanner.ts";
11
12	const { parseLsofOutput, parsePortFromLsofName, parseWindowsListenerOutput, serversEqual } =
13	PortScanner.__testing;
14	const TestProcessRunner = Layer.succeed(ProcessRunner, {	11	const TestProcessRunner = Layer.succeed(ProcessRunner, {
15	run: () => Effect.die("ProcessRunner should not be used by Windows TCP probe tests"),	12	run: () => Effect.die("ProcessRunner should not be used by Windows TCP probe tests"),
16	});	13	});
17	const TestPortDiscoveryLive = PortScanner.layer.pipe(	14	const TestPortDiscoveryLive = PortScanner.layer.pipe(
18	Layer.provide(Layer.mergeAll(TestProcessRunner, Net.layer)),	15	Layer.provide(
		16	Layer.mergeAll(TestProcessRunner, Net.layer, Layer.succeed(HostProcessPlatform, "win32")),
		17	),
19	);	18	);
20		19
21	const openServer = (port: number): Effect.Effect<net.Server \| null> =>	20	const openServer = (port: number): Effect.Effect<net.Server \| null> =>
...	@@ -37,21 +36,6 @@ const closeServer = (server: net.Server): Effect.Effect<void> =>	...	@@ -37,21 +36,6 @@ const closeServer = (server: net.Server): Effect.Effect<void> =>
37	server.close(() => resume(Effect.void));	36	server.close(() => resume(Effect.void));
38	});	37	});
39		38
40	const windowsPlatform = Effect.acquireRelease(
41	Effect.sync(() => {
42	const originalPlatform = process.platform;
43	Object.defineProperty(process, "platform", { value: "win32", configurable: true });
44	return originalPlatform;
45	}),
46	(originalPlatform) =>
47	Effect.sync(() => {
48	Object.defineProperty(process, "platform", {
49	value: originalPlatform,
50	configurable: true,
51	});
52	}),
53	);
54
55	const openCommonDevServer = Effect.fn("PortScannerTest.openCommonDevServer")(function* (	39	const openCommonDevServer = Effect.fn("PortScannerTest.openCommonDevServer")(function* (
56	ports: ReadonlyArray<number>,	40	ports: ReadonlyArray<number>,
57	) {	41	) {
...	@@ -69,176 +53,15 @@ const commonDevServer = Effect.acquireRelease(	...	@@ -69,176 +53,15 @@ const commonDevServer = Effect.acquireRelease(
69	({ server }) => closeServer(server),	53	({ server }) => closeServer(server),
70	);	54	);
71		55
72	describe("parsePortFromLsofName", () => {
73	it("parses *:port", () => {
74	expect(parsePortFromLsofName("*:5173")).toBe(5173);
75	});
76
77	it("parses 127.0.0.1:port", () => {
78	expect(parsePortFromLsofName("127.0.0.1:5173")).toBe(5173);
79	});
80
81	it("parses localhost:port", () => {
82	expect(parsePortFromLsofName("localhost:5173")).toBe(5173);
83	});
84
85	it("parses [::1]:port", () => {
86	expect(parsePortFromLsofName("[::1]:5173")).toBe(5173);
87	});
88
89	it("ignores non-local hosts", () => {
90	expect(parsePortFromLsofName("192.168.1.10:5173")).toBeNull();
91	});
92
93	it("strips trailing description", () => {
94	expect(parsePortFromLsofName("*:5173 (LISTEN)")).toBe(5173);
95	});
96
97	it("rejects garbage", () => {
98	expect(parsePortFromLsofName("")).toBeNull();
99	expect(parsePortFromLsofName("not-a-port")).toBeNull();
100	expect(parsePortFromLsofName("*:0")).toBeNull();
101	expect(parsePortFromLsofName("*:99999")).toBeNull();
102	});
103	});
104
105	describe("parseLsofOutput", () => {
106	it("parses a typical lsof -F pcn output", () => {
107	const sample = [
108	"p12345",
109	"cnode",
110	"n*:5173",
111	"p67890",
112	"cnext-server",
113	"n127.0.0.1:3000",
114	"n127.0.0.1:9229", // node debug port too — same process
115	"p13579",
116	"cChrome",
117	"n192.168.1.10:443", // not local — ignored
118	].join("\n");
119
120	const servers = parseLsofOutput(sample);
121	expect(servers).toEqual([
122	{
123	host: "localhost",
124	port: 3000,
125	url: "http://localhost:3000",
126	processName: "next-server",
127	pid: 67890,
128	terminal: null,
129	},
130	{
131	host: "localhost",
132	port: 5173,
133	url: "http://localhost:5173",
134	processName: "node",
135	pid: 12345,
136	terminal: null,
137	},
138	{
139	host: "localhost",
140	port: 9229,
141	url: "http://localhost:9229",
142	processName: "next-server",
143	pid: 67890,
144	terminal: null,
145	},
146	]);
147	});
148
149	it("handles empty input", () => {
150	expect(parseLsofOutput("")).toEqual([]);
151	});
152
153	it("dedupes by host:port", () => {
154	const sample = ["p1", "cnode", "n*:5173", "n127.0.0.1:5173"].join("\n");
155	const servers = parseLsofOutput(sample);
156	expect(servers).toHaveLength(1);
157	expect(servers[0]?.port).toBe(5173);
158	});
159
160	it("attributes listeners to a registered terminal process", () => {
161	const servers = parseLsofOutput(
162	["p12345", "cnode", "n*:5173"].join("\n"),
163	new Map([
164	[
165	12345,
166	{
167	threadId: ThreadId.make("thread-1"),
168	terminalId: "terminal-1",
169	},
170	],
171	]),
172	);
173
174	expect(servers[0]?.terminal).toEqual({
175	threadId: "thread-1",
176	terminalId: "terminal-1",
177	});
178	});
179	});
180
181	describe("serversEqual", () => {
182	const a = {
183	host: "localhost",
184	port: 5173,
185	url: "http://localhost:5173",
186	processName: "node",
187	pid: 1,
188	terminal: null,
189	};
190	it("returns true for identical lists", () => {
191	expect(serversEqual([a], [{ ...a }])).toBe(true);
192	});
193	it("returns false for different lengths", () => {
194	expect(serversEqual([a], [])).toBe(false);
195	});
196	it("returns false for different processName", () => {
197	expect(serversEqual([a], [{ ...a, processName: "other" }])).toBe(false);
198	});
199	});
200
201	describe("parseWindowsListenerOutput", () => {
202	it("parses and attributes PowerShell listener records", () => {
203	const servers = parseWindowsListenerOutput(
204	"0.0.0.0\|5173\|12345\|node",
205	new Map([
206	[
207	12345,
208	{
209	threadId: ThreadId.make("thread-1"),
210	terminalId: "terminal-1",
211	},
212	],
213	]),
214	);
215
216	expect(servers).toEqual([
217	{
218	host: "localhost",
219	port: 5173,
220	url: "http://localhost:5173",
221	processName: "node",
222	pid: 12345,
223	terminal: {
224	threadId: "thread-1",
225	terminalId: "terminal-1",
226	},
227	},
228	]);
229	});
230	});
231
232	/**	56	/**
233	* Integration tests against a real TCP listener. We force the Windows code	57	* Integration tests against a real TCP listener. We provide the Windows host
234	* path (TCP-probe fallback) by monkey-patching `process.platform` for the	58	* platform so the tests exercise the TCP-probe fallback without depending on
235	* duration of the test so we don't depend on `lsof` being installed.	59	* `lsof` being installed.
236	*/	60	*/
237	effectIt.layer(TestPortDiscoveryLive)("PortDiscovery integration (TCP probe fallback)", (it) => {	61	effectIt.layer(TestPortDiscoveryLive)("PortDiscovery integration (TCP probe fallback)", (it) => {
238	it.effect(	62	it.effect(
239	"scan() returns a server we just opened on a curated dev port",	63	"scan() returns a server we just opened on a curated dev port",
240	Effect.fn("PortScannerTest.scanFindsCommonDevServer")(function* () {	64	Effect.fn("PortScannerTest.scanFindsCommonDevServer")(function* () {
241	yield* windowsPlatform;
242	const { port } = yield* commonDevServer;	65	const { port } = yield* commonDevServer;
243	const scanner = yield* PortScanner.PortDiscovery;	66	const scanner = yield* PortScanner.PortDiscovery;
244	const result = yield* scanner.scan();	67	const result = yield* scanner.scan();
...	@@ -251,7 +74,6 @@ effectIt.layer(TestPortDiscoveryLive)("PortDiscovery integration (TCP probe fall	...	@@ -251,7 +74,6 @@ effectIt.layer(TestPortDiscoveryLive)("PortDiscovery integration (TCP probe fall
251	it.effect(	74	it.effect(
252	"retain drives an immediate broadcast to subscribers",	75	"retain drives an immediate broadcast to subscribers",
253	Effect.fn("PortScannerTest.retainBroadcastsImmediately")(function* () {	76	Effect.fn("PortScannerTest.retainBroadcastsImmediately")(function* () {
254	yield* windowsPlatform;
255	const { port } = yield* commonDevServer;	77	const { port } = yield* commonDevServer;
256	const received: number[] = [];	78	const received: number[] = [];
257	const scanner = yield* PortScanner.PortDiscovery;	79	const scanner = yield* PortScanner.PortDiscovery;

apps/server/src/preview/PortScanner.ts+3-9

...	@@ -12,6 +12,7 @@	...	@@ -12,6 +12,7 @@
12	* polls forever, but each tick is a no-op when the retain count is zero.	12	* polls forever, but each tick is a no-op when the retain count is zero.
13	*/	13	*/
14	import { ThreadId, type DiscoveredLocalServer } from "@t3tools/contracts";	14	import { ThreadId, type DiscoveredLocalServer } from "@t3tools/contracts";
		15	import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
15	import * as Net from "@t3tools/shared/Net";	16	import * as Net from "@t3tools/shared/Net";
16	import { LSOF_LOCAL_HOST_TOKENS } from "@t3tools/shared/preview";	17	import { LSOF_LOCAL_HOST_TOKENS } from "@t3tools/shared/preview";
17	import { Cause, Context, Duration, Effect, Layer, Ref, Schedule, Scope } from "effect";	18	import { Cause, Context, Duration, Effect, Layer, Ref, Schedule, Scope } from "effect";
...	@@ -182,6 +183,7 @@ const serversEqual = (	...	@@ -182,6 +183,7 @@ const serversEqual = (
182	const make = Effect.gen(function* PortDiscoveryMake() {	183	const make = Effect.gen(function* PortDiscoveryMake() {
183	const net = yield* Net.NetService;	184	const net = yield* Net.NetService;
184	const processRunner = yield* ProcessRunner;	185	const processRunner = yield* ProcessRunner;
		186	const hostPlatform = yield* HostProcessPlatform;
185	const stateRef = yield* Ref.make<ScannerState>({	187	const stateRef = yield* Ref.make<ScannerState>({
186	lastSnapshot: [],	188	lastSnapshot: [],
187	listeners: new Set(),	189	listeners: new Set(),
...	@@ -221,7 +223,7 @@ const make = Effect.gen(function* PortDiscoveryMake() {	...	@@ -221,7 +223,7 @@ const make = Effect.gen(function* PortDiscoveryMake() {
221	terminalByProcessId.set(processId, registration.owner);	223	terminalByProcessId.set(processId, registration.owner);
222	}	224	}
223	}	225	}
224	if (process.platform === "win32") {	226	if (hostPlatform === "win32") {
225	const command =	227	const command =
226	'Get-NetTCPConnection -State Listen -ErrorAction Stop \| ForEach-Object { $processName = (Get-Process -Id $_.OwningProcess -ErrorAction SilentlyContinue).ProcessName; Write-Output "$($_.LocalAddress)\|$($_.LocalPort)\|$($_.OwningProcess)\|$processName" }';	228	'Get-NetTCPConnection -State Listen -ErrorAction Stop \| ForEach-Object { $processName = (Get-Process -Id $_.OwningProcess -ErrorAction SilentlyContinue).ProcessName; Write-Output "$($_.LocalAddress)\|$($_.LocalPort)\|$($_.OwningProcess)\|$processName" }';
227	const listeners = yield* processRunner	229	const listeners = yield* processRunner
...	@@ -359,11 +361,3 @@ const make = Effect.gen(function* PortDiscoveryMake() {	...	@@ -359,11 +361,3 @@ const make = Effect.gen(function* PortDiscoveryMake() {
359	}).pipe(Effect.withSpan("PortDiscovery.make"));	361	}).pipe(Effect.withSpan("PortDiscovery.make"));
360		362
361	export const layer = Layer.effect(PortDiscovery, make);	363	export const layer = Layer.effect(PortDiscovery, make);
362
363	/** Exposed for tests. */
364	export const __testing = {
365	parseLsofOutput,
366	parsePortFromLsofName,
367	parseWindowsListenerOutput,
368	serversEqual,
369	};

apps/server/src/process/externalLauncher.test.ts+129-767

...	@@ -1,9 +1,7 @@	...	@@ -1,9 +1,7 @@
1	import * as NodeServices from "@effect/platform-node/NodeServices";	1	import * as NodeServices from "@effect/platform-node/NodeServices";
2	import { assert, it } from "@effect/vitest";	2	import { assert, it } from "@effect/vitest";
3	import { assertSuccess } from "@effect/vitest/utils";	3	import * as ConfigProvider from "effect/ConfigProvider";
4	import * as Crypto from "effect/Crypto";
5	import * as Effect from "effect/Effect";	4	import * as Effect from "effect/Effect";
6	import * as Encoding from "effect/Encoding";
7	import * as FileSystem from "effect/FileSystem";	5	import * as FileSystem from "effect/FileSystem";
8	import * as Layer from "effect/Layer";	6	import * as Layer from "effect/Layer";
9	import * as Path from "effect/Path";	7	import * as Path from "effect/Path";
...	@@ -11,24 +9,9 @@ import * as Sink from "effect/Sink";	...	@@ -11,24 +9,9 @@ import * as Sink from "effect/Sink";
11	import * as Stream from "effect/Stream";	9	import * as Stream from "effect/Stream";
12	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";	10	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
13		11
14	import {	12	import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
15	isCommandAvailable,	13	import { SpawnExecutableResolution } from "@t3tools/shared/shell";
16	launchBrowser,	14	import { ExternalLauncher, layer as ExternalLauncherLive } from "./externalLauncher.ts";
17	launchEditorProcess,
18	resolveAvailableEditors,
19	resolveBrowserLaunch,
20	resolveEditorLaunch,
21	} from "./externalLauncher.ts";
22
23	function encodeUtf16LeBase64(input: string): string {
24	const bytes = new Uint8Array(input.length * 2);
25	for (let index = 0; index < input.length; index += 1) {
26	const code = input.charCodeAt(index);
27	bytes[index * 2] = code & 0xff;
28	bytes[index * 2 + 1] = code >>> 8;
29	}
30	return Encoding.encodeBase64(bytes);
31	}
32		15
33	function makeMockDetachedHandle(onUnref: () => void = () => undefined) {	16	function makeMockDetachedHandle(onUnref: () => void = () => undefined) {
34	return ChildProcessSpawner.makeHandle({	17	return ChildProcessSpawner.makeHandle({
...	@@ -49,756 +32,135 @@ function makeMockDetachedHandle(onUnref: () => void = () => undefined) {	...	@@ -49,756 +32,135 @@ function makeMockDetachedHandle(onUnref: () => void = () => undefined) {
49	});	32	});
50	}	33	}
51		34
52	it.layer(NodeServices.layer)("resolveEditorLaunch", (it) => {	35	const testLayer = (input: {
53	it.effect("returns commands for command-based editors", () =>	36	readonly platform: NodeJS.Platform;
54	Effect.gen(function* () {	37	readonly env?: Record<string, string>;
55	const antigravityLaunch = yield* resolveEditorLaunch(	38	readonly resolveExecutable?: (command: string) => string \| undefined;
56	{ cwd: "/tmp/workspace", editor: "antigravity" },	39	readonly onSpawn?: (command: ChildProcess.StandardCommand) => void;
57	"darwin",	40	readonly onUnref?: () => void;
58	{ PATH: "" },	41	}) => {
59	);	42	const spawnerLayer = Layer.succeed(
60	assert.deepEqual(antigravityLaunch, {	43	ChildProcessSpawner.ChildProcessSpawner,
61	command: "agy",	44	ChildProcessSpawner.make((command) =>
62	args: ["/tmp/workspace"],	45	Effect.sync(() => {
63	});	46	assert.equal(ChildProcess.isStandardCommand(command), true);
64		47	if (!ChildProcess.isStandardCommand(command)) {
65	const cursorLaunch = yield* resolveEditorLaunch(	48	throw new Error("Expected a standard command");
66	{ cwd: "/tmp/workspace", editor: "cursor" },	49	}
67	"darwin",	50	input.onSpawn?.(command);
68	{ PATH: "" },	51	return makeMockDetachedHandle(input.onUnref);
69	);	52	}),
70	assert.deepEqual(cursorLaunch, {
71	command: "cursor",
72	args: ["/tmp/workspace"],
73	});
74
75	const traeLaunch = yield* resolveEditorLaunch(
76	{ cwd: "/tmp/workspace", editor: "trae" },
77	"darwin",
78	);
79	assert.deepEqual(traeLaunch, {
80	command: "trae",
81	args: ["/tmp/workspace"],
82	});
83
84	const kiroLaunch = yield* resolveEditorLaunch(
85	{ cwd: "/tmp/workspace", editor: "kiro" },
86	"darwin",
87	{ PATH: "" },
88	);
89	assert.deepEqual(kiroLaunch, {
90	command: "kiro",
91	args: ["ide", "/tmp/workspace"],
92	});
93
94	const vscodeLaunch = yield* resolveEditorLaunch(
95	{ cwd: "/tmp/workspace", editor: "vscode" },
96	"darwin",
97	{ PATH: "" },
98	);
99	assert.deepEqual(vscodeLaunch, {
100	command: "code",
101	args: ["/tmp/workspace"],
102	});
103
104	const vscodeInsidersLaunch = yield* resolveEditorLaunch(
105	{ cwd: "/tmp/workspace", editor: "vscode-insiders" },
106	"darwin",
107	);
108	assert.deepEqual(vscodeInsidersLaunch, {
109	command: "code-insiders",
110	args: ["/tmp/workspace"],
111	});
112
113	const vscodiumLaunch = yield* resolveEditorLaunch(
114	{ cwd: "/tmp/workspace", editor: "vscodium" },
115	"darwin",
116	);
117	assert.deepEqual(vscodiumLaunch, {
118	command: "codium",
119	args: ["/tmp/workspace"],
120	});
121
122	const zedLaunch = yield* resolveEditorLaunch(
123	{ cwd: "/tmp/workspace", editor: "zed" },
124	"darwin",
125	{ PATH: "" },
126	);
127	assert.deepEqual(zedLaunch, {
128	command: "zed",
129	args: ["/tmp/workspace"],
130	});
131
132	const ideaLaunch = yield* resolveEditorLaunch(
133	{ cwd: "/tmp/workspace", editor: "idea" },
134	"darwin",
135	);
136	assert.deepEqual(ideaLaunch, {
137	command: "idea",
138	args: ["/tmp/workspace"],
139	});
140
141	const aquaLaunch = yield* resolveEditorLaunch(
142	{ cwd: "/tmp/workspace", editor: "aqua" },
143	"darwin",
144	);
145	assert.deepEqual(aquaLaunch, {
146	command: "aqua",
147	args: ["/tmp/workspace"],
148	});
149
150	const clionLaunch = yield* resolveEditorLaunch(
151	{ cwd: "/tmp/workspace", editor: "clion" },
152	"darwin",
153	);
154	assert.deepEqual(clionLaunch, {
155	command: "clion",
156	args: ["/tmp/workspace"],
157	});
158
159	const datagripLaunch = yield* resolveEditorLaunch(
160	{ cwd: "/tmp/workspace", editor: "datagrip" },
161	"darwin",
162	);
163	assert.deepEqual(datagripLaunch, {
164	command: "datagrip",
165	args: ["/tmp/workspace"],
166	});
167
168	const dataspellLaunch = yield* resolveEditorLaunch(
169	{ cwd: "/tmp/workspace", editor: "dataspell" },
170	"darwin",
171	);
172	assert.deepEqual(dataspellLaunch, {
173	command: "dataspell",
174	args: ["/tmp/workspace"],
175	});
176
177	const golandLaunch = yield* resolveEditorLaunch(
178	{ cwd: "/tmp/workspace", editor: "goland" },
179	"darwin",
180	);
181	assert.deepEqual(golandLaunch, {
182	command: "goland",
183	args: ["/tmp/workspace"],
184	});
185
186	const phpstormLaunch = yield* resolveEditorLaunch(
187	{ cwd: "/tmp/workspace", editor: "phpstorm" },
188	"darwin",
189	);
190	assert.deepEqual(phpstormLaunch, {
191	command: "phpstorm",
192	args: ["/tmp/workspace"],
193	});
194
195	const pycharmLaunch = yield* resolveEditorLaunch(
196	{ cwd: "/tmp/workspace", editor: "pycharm" },
197	"darwin",
198	);
199	assert.deepEqual(pycharmLaunch, {
200	command: "pycharm",
201	args: ["/tmp/workspace"],
202	});
203
204	const riderLaunch = yield* resolveEditorLaunch(
205	{ cwd: "/tmp/workspace", editor: "rider" },
206	"darwin",
207	);
208	assert.deepEqual(riderLaunch, {
209	command: "rider",
210	args: ["/tmp/workspace"],
211	});
212
213	const rubymineLaunch = yield* resolveEditorLaunch(
214	{ cwd: "/tmp/workspace", editor: "rubymine" },
215	"darwin",
216	);
217	assert.deepEqual(rubymineLaunch, {
218	command: "rubymine",
219	args: ["/tmp/workspace"],
220	});
221
222	const rustroverLaunch = yield* resolveEditorLaunch(
223	{ cwd: "/tmp/workspace", editor: "rustrover" },
224	"darwin",
225	);
226	assert.deepEqual(rustroverLaunch, {
227	command: "rustrover",
228	args: ["/tmp/workspace"],
229	});
230
231	const webstormLaunch = yield* resolveEditorLaunch(
232	{ cwd: "/tmp/workspace", editor: "webstorm" },
233	"darwin",
234	);
235	assert.deepEqual(webstormLaunch, {
236	command: "webstorm",
237	args: ["/tmp/workspace"],
238	});
239	}),
240	);
241
242	it.effect("applies launch-style-specific navigation arguments", () =>
243	Effect.gen(function* () {
244	const lineOnly = yield* resolveEditorLaunch(
245	{ cwd: "/tmp/workspace/AGENTS.md:48", editor: "cursor" },
246	"darwin",
247	{ PATH: "" },
248	);
249	assert.deepEqual(lineOnly, {
250	command: "cursor",
251	args: ["--goto", "/tmp/workspace/AGENTS.md:48"],
252	});
253
254	const lineAndColumn = yield* resolveEditorLaunch(
255	{ cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "cursor" },
256	"darwin",
257	{ PATH: "" },
258	);
259	assert.deepEqual(lineAndColumn, {
260	command: "cursor",
261	args: ["--goto", "/tmp/workspace/src/process/externalLauncher.ts:71:5"],
262	});
263
264	const traeLineAndColumn = yield* resolveEditorLaunch(
265	{ cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "trae" },
266	"darwin",
267	);
268	assert.deepEqual(traeLineAndColumn, {
269	command: "trae",
270	args: ["--goto", "/tmp/workspace/src/process/externalLauncher.ts:71:5"],
271	});
272
273	const kiroLineAndColumn = yield* resolveEditorLaunch(
274	{ cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "kiro" },
275	"darwin",
276	{ PATH: "" },
277	);
278	assert.deepEqual(kiroLineAndColumn, {
279	command: "kiro",
280	args: ["ide", "--goto", "/tmp/workspace/src/process/externalLauncher.ts:71:5"],
281	});
282
283	const vscodeLineAndColumn = yield* resolveEditorLaunch(
284	{ cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "vscode" },
285	"darwin",
286	{ PATH: "" },
287	);
288	assert.deepEqual(vscodeLineAndColumn, {
289	command: "code",
290	args: ["--goto", "/tmp/workspace/src/process/externalLauncher.ts:71:5"],
291	});
292
293	const vscodeInsidersLineAndColumn = yield* resolveEditorLaunch(
294	{ cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "vscode-insiders" },
295	"darwin",
296	);
297	assert.deepEqual(vscodeInsidersLineAndColumn, {
298	command: "code-insiders",
299	args: ["--goto", "/tmp/workspace/src/process/externalLauncher.ts:71:5"],
300	});
301
302	const vscodiumLineAndColumn = yield* resolveEditorLaunch(
303	{ cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "vscodium" },
304	"darwin",
305	);
306	assert.deepEqual(vscodiumLineAndColumn, {
307	command: "codium",
308	args: ["--goto", "/tmp/workspace/src/process/externalLauncher.ts:71:5"],
309	});
310
311	const zedLineAndColumn = yield* resolveEditorLaunch(
312	{ cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "zed" },
313	"darwin",
314	{ PATH: "" },
315	);
316	assert.deepEqual(zedLineAndColumn, {
317	command: "zed",
318	args: ["/tmp/workspace/src/process/externalLauncher.ts:71:5"],
319	});
320
321	const zedLineOnly = yield* resolveEditorLaunch(
322	{ cwd: "/tmp/workspace/AGENTS.md:48", editor: "zed" },
323	"darwin",
324	{ PATH: "" },
325	);
326	assert.deepEqual(zedLineOnly, {
327	command: "zed",
328	args: ["/tmp/workspace/AGENTS.md:48"],
329	});
330
331	const ideaLineOnly = yield* resolveEditorLaunch(
332	{ cwd: "/tmp/workspace/AGENTS.md:48", editor: "idea" },
333	"darwin",
334	);
335	assert.deepEqual(ideaLineOnly, {
336	command: "idea",
337	args: ["--line", "48", "/tmp/workspace/AGENTS.md"],
338	});
339
340	const ideaLineAndColumn = yield* resolveEditorLaunch(
341	{ cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "idea" },
342	"darwin",
343	);
344	assert.deepEqual(ideaLineAndColumn, {
345	command: "idea",
346	args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],
347	});
348
349	const aquaLineAndColumn = yield* resolveEditorLaunch(
350	{ cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "aqua" },
351	"darwin",
352	);
353	assert.deepEqual(aquaLineAndColumn, {
354	command: "aqua",
355	args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],
356	});
357
358	const clionLineAndColumn = yield* resolveEditorLaunch(
359	{ cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "clion" },
360	"darwin",
361	);
362	assert.deepEqual(clionLineAndColumn, {
363	command: "clion",
364	args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],
365	});
366
367	const datagripLineAndColumn = yield* resolveEditorLaunch(
368	{ cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "datagrip" },
369	"darwin",
370	);
371	assert.deepEqual(datagripLineAndColumn, {
372	command: "datagrip",
373	args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],
374	});
375
376	const dataspellLineAndColumn = yield* resolveEditorLaunch(
377	{ cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "dataspell" },
378	"darwin",
379	);
380	assert.deepEqual(dataspellLineAndColumn, {
381	command: "dataspell",
382	args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],
383	});
384
385	const golandLineAndColumn = yield* resolveEditorLaunch(
386	{ cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "goland" },
387	"darwin",
388	);
389	assert.deepEqual(golandLineAndColumn, {
390	command: "goland",
391	args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],
392	});
393
394	const phpstormLineAndColumn = yield* resolveEditorLaunch(
395	{ cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "phpstorm" },
396	"darwin",
397	);
398	assert.deepEqual(phpstormLineAndColumn, {
399	command: "phpstorm",
400	args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],
401	});
402
403	const pycharmLineAndColumn = yield* resolveEditorLaunch(
404	{ cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "pycharm" },
405	"darwin",
406	);
407	assert.deepEqual(pycharmLineAndColumn, {
408	command: "pycharm",
409	args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],
410	});
411
412	const riderLineAndColumn = yield* resolveEditorLaunch(
413	{ cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "rider" },
414	"darwin",
415	);
416	assert.deepEqual(riderLineAndColumn, {
417	command: "rider",
418	args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],
419	});
420
421	const rubymineLineAndColumn = yield* resolveEditorLaunch(
422	{ cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "rubymine" },
423	"darwin",
424	);
425	assert.deepEqual(rubymineLineAndColumn, {
426	command: "rubymine",
427	args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],
428	});
429
430	const rustroverLineAndColumn = yield* resolveEditorLaunch(
431	{ cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "rustrover" },
432	"darwin",
433	);
434	assert.deepEqual(rustroverLineAndColumn, {
435	command: "rustrover",
436	args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],
437	});
438
439	const webstormLineOnly = yield* resolveEditorLaunch(
440	{ cwd: "/tmp/workspace/AGENTS.md:48", editor: "webstorm" },
441	"darwin",
442	);
443	assert.deepEqual(webstormLineOnly, {
444	command: "webstorm",
445	args: ["--line", "48", "/tmp/workspace/AGENTS.md"],
446	});
447	}),
448	);
449
450	it.effect("falls back to zeditor when zed is not installed", () =>
451	Effect.gen(function* () {
452	const fs = yield* FileSystem.FileSystem;
453	const path = yield* Path.Path;
454	const dir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-external-launcher-test-" });
455	yield* fs.writeFileString(path.join(dir, "zeditor"), "#!/bin/sh\nexit 0\n");
456	yield* fs.chmod(path.join(dir, "zeditor"), 0o755);
457
458	const result = yield* resolveEditorLaunch({ cwd: "/tmp/workspace", editor: "zed" }, "linux", {
459	PATH: dir,
460	});
461
462	assert.deepEqual(result, {
463	command: "zeditor",
464	args: ["/tmp/workspace"],
465	});
466	}),
467	);
468
469	it.effect("falls back to the primary command when no alias is installed", () =>
470	Effect.gen(function* () {
471	const result = yield* resolveEditorLaunch({ cwd: "/tmp/workspace", editor: "zed" }, "linux", {
472	PATH: "",
473	});
474	assert.deepEqual(result, {
475	command: "zed",
476	args: ["/tmp/workspace"],
477	});
478	}),
479	);
480
481	it.effect("maps file-manager editor to OS open commands", () =>
482	Effect.gen(function* () {
483	const launch1 = yield* resolveEditorLaunch(
484	{ cwd: "/tmp/workspace", editor: "file-manager" },
485	"darwin",
486	{ PATH: "" },
487	);
488	assert.deepEqual(launch1, {
489	command: "open",
490	args: ["/tmp/workspace"],
491	});
492
493	const launch2 = yield* resolveEditorLaunch(
494	{ cwd: "C:\\workspace", editor: "file-manager" },
495	"win32",
496	{ PATH: "" },
497	);
498	assert.deepEqual(launch2, {
499	command: "explorer",
500	args: ["C:\\workspace"],
501	});
502
503	const launch3 = yield* resolveEditorLaunch(
504	{ cwd: "/tmp/workspace", editor: "file-manager" },
505	"linux",
506	{ PATH: "" },
507	);
508	assert.deepEqual(launch3, {
509	command: "xdg-open",
510	args: ["/tmp/workspace"],
511	});
512	}),
513	);
514	});
515
516	it("resolveBrowserLaunch maps default browser launchers by platform", () => {
517	const target = "https://example.com/some path?name=o'hara";
518
519	assert.deepEqual(resolveBrowserLaunch(target, "darwin").command, "open");
520	assert.deepEqual(resolveBrowserLaunch(target, "darwin").args, [target]);
521	assert.deepEqual(resolveBrowserLaunch(target, "darwin").options, {
522	detached: true,
523	stdin: "ignore",
524	stdout: "ignore",
525	stderr: "ignore",
526	});
527
528	assert.deepEqual(resolveBrowserLaunch(target, "linux", {}).command, "xdg-open");
529	assert.deepEqual(resolveBrowserLaunch(target, "linux", {}).args, [target]);
530
531	const windows = resolveBrowserLaunch(target, "win32", {
532	SYSTEMROOT: "C:\\Windows",
533	});
534	assert.equal(windows.command, "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe");
535	assert.deepEqual(windows.args, [
536	"-NoProfile",
537	"-NonInteractive",
538	"-ExecutionPolicy",
539	"Bypass",
540	"-EncodedCommand",
541	encodeUtf16LeBase64(
542	"$ProgressPreference = 'SilentlyContinue'; Start 'https://example.com/some path?name=o''hara'",
543	),	53	),
544	]);
545	assert.deepEqual(windows.options, {
546	detached: true,
547	shell: false,
548	stdin: "ignore",
549	stdout: "ignore",
550	stderr: "ignore",
551	});
552	});
553
554	it("resolveBrowserLaunch opens through Windows from WSL when not remote", () => {
555	const launch = resolveBrowserLaunch("https://example.com", "linux", {
556	WSL_DISTRO_NAME: "Ubuntu",
557	});
558	assert.equal(launch.command, "/mnt/c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe");
559	assert.equal(launch.options.detached, true);
560	});
561
562	it("resolveBrowserLaunch keeps xdg-open for WSL over SSH", () => {
563	const launch = resolveBrowserLaunch("https://example.com", "linux", {
564	WSL_DISTRO_NAME: "Ubuntu",
565	SSH_CONNECTION: "client server",
566	});
567	assert.equal(launch.command, "xdg-open");
568	});
569
570	it.layer(NodeServices.layer)("launchBrowser", (it) => {
571	it.effect("spawns through the ChildProcessSpawner service and unrefs the handle", () =>
572	Effect.gen(function* () {
573	let spawnedCommand: ChildProcess.StandardCommand \| undefined;
574	let didUnref = false;
575
576	const spawnerLayer = Layer.mock(ChildProcessSpawner.ChildProcessSpawner, {
577	spawn: (command) =>
578	Effect.sync(() => {
579	assert.equal(ChildProcess.isStandardCommand(command), true);
580	if (!ChildProcess.isStandardCommand(command)) {
581	throw new Error("Expected a standard command");
582	}
583	spawnedCommand = command;
584	return makeMockDetachedHandle(() => {
585	didUnref = true;
586	});
587	}),
588	});
589
590	const result = yield* launchBrowser("https://example.com").pipe(
591	Effect.provide(spawnerLayer),
592	Effect.result,
593	);
594
595	assertSuccess(result, undefined);
596	assert.ok(spawnedCommand);
597	const expectedLaunch = resolveBrowserLaunch("https://example.com");
598	assert.equal(spawnedCommand.command, expectedLaunch.command);
599	assert.deepEqual(spawnedCommand.args, expectedLaunch.args);
600	assert.deepEqual(spawnedCommand.options, expectedLaunch.options);
601	assert.equal(didUnref, true);
602	}),
603	);
604	});
605
606	it.layer(NodeServices.layer)("launchEditorProcess", (it) => {
607	it.effect("spawns through the ChildProcessSpawner service and unrefs the handle", () =>
608	Effect.gen(function* () {
609	let spawnedCommand: ChildProcess.StandardCommand \| undefined;
610	let didUnref = false;
611	const expectedArgs = ["-e", "process.exit(0)"];
612
613	const spawnerLayer = Layer.mock(ChildProcessSpawner.ChildProcessSpawner, {
614	spawn: (command) =>
615	Effect.sync(() => {
616	assert.equal(ChildProcess.isStandardCommand(command), true);
617	if (!ChildProcess.isStandardCommand(command)) {
618	throw new Error("Expected a standard command");
619	}
620	spawnedCommand = command;
621	return makeMockDetachedHandle(() => {
622	didUnref = true;
623	});
624	}),
625	});
626
627	const result = yield* launchEditorProcess({
628	command: process.execPath,
629	args: expectedArgs,
630	}).pipe(Effect.provide(spawnerLayer), Effect.result);
631
632	assertSuccess(result, undefined);
633	assert.ok(spawnedCommand);
634	assert.equal(spawnedCommand.command, process.execPath);
635	assert.deepEqual(
636	spawnedCommand.args,
637	process.platform === "win32" ? expectedArgs.map((arg) => `"${arg}"`) : expectedArgs,
638	);
639	assert.deepEqual(spawnedCommand.options, {
640	detached: true,
641	shell: process.platform === "win32",
642	stdin: "ignore",
643	stdout: "ignore",
644	stderr: "ignore",
645	});
646	assert.equal(didUnref, true);
647	}),
648	);
649
650	it.effect("rejects when command does not exist", () =>
651	Effect.gen(function* () {
652	const spawnerLayer = Layer.mock(ChildProcessSpawner.ChildProcessSpawner, {});
653	const result = yield* launchEditorProcess({
654	command: `t3code-no-such-command-${yield* Crypto.Crypto.pipe(
655	Effect.flatMap((crypto) => crypto.randomUUIDv4),
656	)}`,
657	args: [],
658	}).pipe(Effect.provide(spawnerLayer), Effect.result);
659	assert.equal(result._tag, "Failure");
660	}),
661	);
662	});
663
664	it.layer(NodeServices.layer)("isCommandAvailable", (it) => {
665	it.effect("resolves win32 commands with PATHEXT", () =>
666	Effect.gen(function* () {
667	const fs = yield* FileSystem.FileSystem;
668	const path = yield* Path.Path;
669	const dir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-external-launcher-test-" });
670	yield* fs.writeFileString(path.join(dir, "code.CMD"), "@echo off\r\n");
671	const env = {
672	PATH: dir,
673	PATHEXT: ".COM;.EXE;.BAT;.CMD",
674	} satisfies NodeJS.ProcessEnv;
675	assert.equal(isCommandAvailable("code", { platform: "win32", env }), true);
676	}),
677	);
678
679	it("returns false when a command is not on PATH", () => {
680	const env = {
681	PATH: "",
682	PATHEXT: ".COM;.EXE;.BAT;.CMD",
683	} satisfies NodeJS.ProcessEnv;
684	assert.equal(isCommandAvailable("definitely-not-installed", { platform: "win32", env }), false);
685	});
686
687	it.effect("does not treat bare files without executable extension as available on win32", () =>
688	Effect.gen(function* () {
689	const fs = yield* FileSystem.FileSystem;
690	const path = yield* Path.Path;
691	const dir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-external-launcher-test-" });
692	yield* fs.writeFileString(path.join(dir, "npm"), "echo nope\r\n");
693	const env = {
694	PATH: dir,
695	PATHEXT: ".COM;.EXE;.BAT;.CMD",
696	} satisfies NodeJS.ProcessEnv;
697	assert.equal(isCommandAvailable("npm", { platform: "win32", env }), false);
698	}),
699	);	54	);
700		55
701	it.effect("appends PATHEXT for commands with non-executable extensions on win32", () =>	56	return Layer.mergeAll(
702	Effect.gen(function* () {	57	ExternalLauncherLive.pipe(Layer.provide(Layer.merge(NodeServices.layer, spawnerLayer))),
703	const fs = yield* FileSystem.FileSystem;	58	Layer.succeed(HostProcessPlatform, input.platform),
704	const path = yield* Path.Path;	59	Layer.succeed(
705	const dir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-external-launcher-test-" });	60	SpawnExecutableResolution,
706	yield* fs.writeFileString(path.join(dir, "my.tool.CMD"), "@echo off\r\n");	61	(command) => input.resolveExecutable?.(command) ?? command,
707	const env = {	62	),
708	PATH: dir,	63	ConfigProvider.layer(ConfigProvider.fromEnv({ env: input.env ?? {} })),
709	PATHEXT: ".COM;.EXE;.BAT;.CMD",
710	} satisfies NodeJS.ProcessEnv;
711	assert.equal(isCommandAvailable("my.tool", { platform: "win32", env }), true);
712	}),
713	);	64	);
714		65	};
715	it.effect("uses platform-specific PATH delimiter for platform overrides", () =>	66
716	Effect.gen(function* () {	67	it.effect("launches the default browser through the platform command", () => {
717	const fs = yield* FileSystem.FileSystem;	68	let spawned: ChildProcess.StandardCommand \| undefined;
718	const path = yield* Path.Path;	69	let didUnref = false;
719	const firstDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-external-launcher-test-" });	70	return Effect.gen(function* () {
720	const secondDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-external-launcher-test-" });	71	const launcher = yield* ExternalLauncher;
721	yield* fs.writeFileString(path.join(firstDir, "code.CMD"), "@echo off\r\n");	72
722	yield* fs.writeFileString(path.join(secondDir, "code.CMD"), "MZ");	73	yield* launcher.launchBrowser("https://example.com/some path");
723	const env = {	74
724	PATH: `${firstDir};${secondDir}`,	75	assert.ok(spawned);
725	PATHEXT: ".COM;.EXE;.BAT;.CMD",	76	assert.equal(spawned.command, "xdg-open");
726	} satisfies NodeJS.ProcessEnv;	77	assert.deepEqual(spawned.args, ["https://example.com/some path"]);
727	assert.equal(isCommandAvailable("code", { platform: "win32", env }), true);	78	assert.equal(spawned.options.detached, true);
728	}),	79	assert.equal(didUnref, true);
		80	}).pipe(
		81	Effect.provide(
		82	testLayer({
		83	platform: "linux",
		84	onSpawn: (command) => {
		85	spawned = command;
		86	},
		87	onUnref: () => {
		88	didUnref = true;
		89	},
		90	}),
		91	),
729	);	92	);
730	});	93	});
731		94
732	it.layer(NodeServices.layer)("resolveAvailableEditors", (it) => {	95	it.effect("launches an installed editor with platform-safe arguments", () =>
733	it.effect("returns installed editors for command launches", () =>	96	Effect.gen(function* () {
734	Effect.gen(function* () {	97	const fileSystem = yield* FileSystem.FileSystem;
735	const fs = yield* FileSystem.FileSystem;	98	const path = yield* Path.Path;
736	const path = yield* Path.Path;	99	const binDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-editors-" });
737	const dir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-editors-" });	100	yield* fileSystem.writeFileString(path.join(binDir, "code.CMD"), "@echo off\r\n");
738		101
739	yield* fs.writeFileString(path.join(dir, "trae.CMD"), "@echo off\r\n");	102	let spawned: ChildProcess.StandardCommand \| undefined;
740	yield* fs.writeFileString(path.join(dir, "kiro.CMD"), "@echo off\r\n");	103	yield* Effect.gen(function* () {
741	yield* fs.writeFileString(path.join(dir, "code-insiders.CMD"), "@echo off\r\n");	104	const launcher = yield* ExternalLauncher;
742	yield* fs.writeFileString(path.join(dir, "codium.CMD"), "@echo off\r\n");	105	yield* launcher.launchEditor({
743	yield* fs.writeFileString(path.join(dir, "aqua.CMD"), "@echo off\r\n");	106	editor: "vscode",
744	yield* fs.writeFileString(path.join(dir, "clion.CMD"), "@echo off\r\n");	107	cwd: "C:\\workspace with spaces\\src\\index.ts:12:4",
745	yield* fs.writeFileString(path.join(dir, "datagrip.CMD"), "@echo off\r\n");	108	});
746	yield* fs.writeFileString(path.join(dir, "dataspell.CMD"), "@echo off\r\n");	109	}).pipe(
747	yield* fs.writeFileString(path.join(dir, "goland.CMD"), "@echo off\r\n");	110	Effect.provide(
748	yield* fs.writeFileString(path.join(dir, "phpstorm.CMD"), "@echo off\r\n");	111	testLayer({
749	yield* fs.writeFileString(path.join(dir, "pycharm.CMD"), "@echo off\r\n");	112	platform: "win32",
750	yield* fs.writeFileString(path.join(dir, "rider.CMD"), "@echo off\r\n");	113	env: { PATH: binDir, PATHEXT: ".COM;.EXE;.BAT;.CMD" },
751	yield* fs.writeFileString(path.join(dir, "rubymine.CMD"), "@echo off\r\n");	114	resolveExecutable: (command) =>
752	yield* fs.writeFileString(path.join(dir, "rustrover.CMD"), "@echo off\r\n");	115	command === "code" ? "C:\\Program Files\\Microsoft VS Code\\bin\\code.CMD" : command,
753	yield* fs.writeFileString(path.join(dir, "webstorm.CMD"), "@echo off\r\n");	116	onSpawn: (command) => {
754	yield* fs.writeFileString(path.join(dir, "explorer.CMD"), "MZ");	117	spawned = command;
755	const editors = resolveAvailableEditors("win32", {	118	},
756	PATH: dir,	119	}),
757	PATHEXT: ".COM;.EXE;.BAT;.CMD",	120	),
758	});	121	);
759	assert.deepEqual(editors, [	122
760	"trae",	123	assert.ok(spawned);
761	"kiro",	124	assert.equal(spawned.command, '^"C:\\Program^ Files\\Microsoft^ VS^ Code\\bin\\code.CMD^"');
762	"vscode-insiders",	125	assert.deepEqual(spawned.args, [
763	"vscodium",	126	'^"--goto^"',
764	"aqua",	127	'^"C:\\workspace^ with^ spaces\\src\\index.ts:12:4^"',
765	"clion",	128	]);
766	"datagrip",	129	assert.equal(spawned.options.shell, true);
767	"dataspell",	130	}).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
768	"goland",	131	);
769	"phpstorm",	132
770	"pycharm",	133	it.effect("discovers editors through the service API", () =>
771	"rider",	134	Effect.gen(function* () {
772	"rubymine",	135	const fileSystem = yield* FileSystem.FileSystem;
773	"rustrover",	136	const path = yield* Path.Path;
774	"webstorm",	137	const binDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-editors-" });
775	"file-manager",	138	yield* fileSystem.writeFileString(path.join(binDir, "code.CMD"), "@echo off\r\n");
776	]);	139	yield* fileSystem.writeFileString(path.join(binDir, "explorer.CMD"), "@echo off\r\n");
777	}),	140
778	);	141	const editors = yield* Effect.gen(function* () {
779		142	const launcher = yield* ExternalLauncher;
780	it.effect("includes zed when only the zeditor command is installed", () =>	143	return yield* launcher.resolveAvailableEditors();
781	Effect.gen(function* () {	144	}).pipe(
782	const fs = yield* FileSystem.FileSystem;	145	Effect.provide(
783	const path = yield* Path.Path;	146	testLayer({
784	const dir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-editors-" });	147	platform: "win32",
785		148	env: { PATH: binDir, PATHEXT: ".COM;.EXE;.BAT;.CMD" },
786	yield* fs.writeFileString(path.join(dir, "zeditor"), "#!/bin/sh\nexit 0\n");	149	}),
787	yield* fs.writeFileString(path.join(dir, "xdg-open"), "#!/bin/sh\nexit 0\n");	150	),
788	yield* fs.chmod(path.join(dir, "zeditor"), 0o755);	151	);
789	yield* fs.chmod(path.join(dir, "xdg-open"), 0o755);	152
790		153	assert.equal(editors.includes("vscode"), true);
791	const editors = resolveAvailableEditors("linux", {	154	assert.equal(editors.includes("file-manager"), true);
792	PATH: dir,	155	}).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
793	});	156	);
794	assert.deepEqual(editors, ["zed", "file-manager"]);	157
795	}),	158	it.effect("rejects unknown editors through the service API", () =>
796	);	159	Effect.gen(function* () {
797		160	const launcher = yield* ExternalLauncher;
798	it("omits file-manager when the platform opener is unavailable", () => {	161	const result = yield* launcher
799	const editors = resolveAvailableEditors("linux", {	162	.launchEditor({ editor: "missing-editor" as never, cwd: "/tmp/workspace" })
800	PATH: "",	163	.pipe(Effect.result);
801	});	164	assert.equal(result._tag, "Failure");
802	assert.deepEqual(editors, []);	165	}).pipe(Effect.provide(testLayer({ platform: "linux", env: { PATH: "" } }))),
803	});	166	);
804	});

apps/server/src/process/externalLauncher.ts+103-37

 @@ -12,12 +12,16 @@ import {
   type EditorId,
   type LaunchEditorInput,
 } from "@t3tools/contracts";
-import { isCommandAvailable, type CommandAvailabilityOptions } from "@t3tools/shared/shell";
+import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
+import { isCommandAvailable, resolveSpawnCommand } from "@t3tools/shared/shell";
+import * as Config from "effect/Config";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Encoding from "effect/Encoding";
+import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
+import * as Path from "effect/Path";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 // ==============================
 @@ -26,8 +30,6 @@ import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 export { ExternalLauncherError };
 export type { LaunchEditorInput };
-export { isCommandAvailable } from "@t3tools/shared/shell";
 interface EditorLaunch {
   readonly command: string;
   readonly args: ReadonlyArray<string>;
 @@ -61,6 +63,36 @@ const DETACHED_IGNORE_STDIO_OPTIONS = {
   stderr: "ignore",
 } as const satisfies ChildProcess.CommandOptions;
+const compactEnv = (input: Record<string, Option.Option<string>>): NodeJS.ProcessEnv =>
+  Object.fromEntries(
+    Object.entries(input).flatMap(([key, value]) =>
+      Option.match(value, {
+        onNone: () => [],
+        onSome: (resolved) => [[key, resolved]],
+      }),
+    ),
+  );
+const BrowserLaunchEnvConfig = Config.all({
+  SYSTEMROOT: Config.string("SYSTEMROOT").pipe(Config.option),
+  windir: Config.string("windir").pipe(Config.option),
+  WSL_DISTRO_NAME: Config.string("WSL_DISTRO_NAME").pipe(Config.option),
+  WSL_INTEROP: Config.string("WSL_INTEROP").pipe(Config.option),
+  SSH_CONNECTION: Config.string("SSH_CONNECTION").pipe(Config.option),
+  SSH_TTY: Config.string("SSH_TTY").pipe(Config.option),
+  container: Config.string("container").pipe(Config.option),
+}).pipe(Config.map(compactEnv));
+const CommandLookupEnvConfig = Config.all({
+  PATH: Config.string("PATH").pipe(Config.option),
+  Path: Config.string("Path").pipe(Config.option),
+  path: Config.string("path").pipe(Config.option),
+  PATHEXT: Config.string("PATHEXT").pipe(Config.option),
+}).pipe(Config.map(compactEnv));
+const readBrowserLaunchEnv = BrowserLaunchEnvConfig.pipe(Effect.orElseSucceed(() => ({})));
+const readCommandLookupEnv = CommandLookupEnvConfig.pipe(Effect.orElseSucceed(() => ({})));
 function parseTargetPathAndPosition(target: string): Option.Option<TargetPathAndPosition> {
   const match = TARGET_WITH_POSITION_PATTERN.exec(target);
   if (!match?.[1] || !match[2]) {
 @@ -109,17 +141,17 @@ function resolveEditorArgs(
   return [...baseArgs, ...resolveCommandEditorArgs(editor, target)];
 }
-function resolveAvailableCommand(
+const resolveAvailableCommand = Effect.fn("externalLauncher.resolveAvailableCommand")(function* (
   commands: ReadonlyArray<string>,
-  options: CommandAvailabilityOptions = {},
+  env: NodeJS.ProcessEnv,
-): Option.Option<string> {
+): Effect.fn.Return<Option.Option<string>, never, FileSystem.FileSystem | Path.Path> {
   for (const command of commands) {
-    if (isCommandAvailable(command, options)) {
+    if (yield* isCommandAvailable(command, { env })) {
       return Option.some(command);
     }
   }
   return Option.none();
-}
+});
 function encodeUtf16LeBase64(input: string): string {
   const bytes = new Uint8Array(input.length * 2);
 @@ -135,7 +167,7 @@ function escapePowerShellStringLiteral(input: string): string {
   return `'${input.replaceAll("'", "''")}'`;
 }
-function resolvePowerShellPath(env: NodeJS.ProcessEnv = process.env): string {
+function resolvePowerShellPath(env: NodeJS.ProcessEnv = {}): string {
   return `${env.SYSTEMROOT || env.windir || String.raw`C:\Windows`}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`;
 }
 @@ -145,7 +177,7 @@ function resolveWslPowerShellPath(): string {
 function shouldUseWindowsBrowserFromWsl(
   platform: NodeJS.Platform,
-  env: NodeJS.ProcessEnv = process.env,
+  env: NodeJS.ProcessEnv = {},
 ): boolean {
   return (
     platform === "linux" &&
 @@ -184,10 +216,10 @@ function fileManagerCommandForPlatform(platform: NodeJS.Platform): string {
   }
 }
-export function resolveBrowserLaunch(
+function buildBrowserLaunch(
   target: string,
-  platform: NodeJS.Platform = process.platform,
+  platform: NodeJS.Platform,
-  env: NodeJS.ProcessEnv = process.env,
+  env: NodeJS.ProcessEnv = {},
 ): ProcessLaunch {
   if (platform === "darwin") {
     return {
 @@ -212,34 +244,49 @@ export function resolveBrowserLaunch(
   };
 }
-export function resolveAvailableEditors(
+const buildAvailableEditors = Effect.fn("externalLauncher.buildAvailableEditors")(function* (
-  platform: NodeJS.Platform = process.platform,
+  platform: NodeJS.Platform,
-  env: NodeJS.ProcessEnv = process.env,
+  env: NodeJS.ProcessEnv,
-): ReadonlyArray<EditorId> {
+): Effect.fn.Return<ReadonlyArray<EditorId>, never, FileSystem.FileSystem | Path.Path> {
   const available: EditorId[] = [];
   for (const editor of EDITORS) {
     if (editor.commands === null) {
       const command = fileManagerCommandForPlatform(platform);
-      if (isCommandAvailable(command, { platform, env })) {
+      if (yield* isCommandAvailable(command, { env })) {
         available.push(editor.id);
       }
       continue;
     }
-    const command = resolveAvailableCommand(editor.commands, { platform, env });
+    const command = yield* resolveAvailableCommand(editor.commands, env);
     if (Option.isSome(command)) {
       available.push(editor.id);
     }
   }
   return available;
-}
+});
+const resolveBrowserLaunch = Effect.fn("externalLauncher.resolveBrowserLaunch")(function* (
+  target: string,
+) {
+  const platform = yield* HostProcessPlatform;
+  const env = yield* readBrowserLaunchEnv;
+  return buildBrowserLaunch(target, platform, env);
+});
+const resolveAvailableEditors = Effect.fn("externalLauncher.resolveAvailableEditors")(function* () {
+  const platform = yield* HostProcessPlatform;
+  const env = yield* readCommandLookupEnv;
+  return yield* buildAvailableEditors(platform, env);
+});
 /**
  * ExternalLauncherShape - Service API for browser and editor launch actions.
  */
 export interface ExternalLauncherShape {
+  readonly resolveAvailableEditors: () => Effect.Effect<ReadonlyArray<EditorId>>;
   /**
    * Launch a URL target in the default browser.
    */
 @@ -264,11 +311,11 @@ export class ExternalLauncher extends Context.Service<ExternalLauncher, External
 // Implementations
 // ==============================
-export const resolveEditorLaunch = Effect.fn("resolveEditorLaunch")(function* (
+const resolveEditorLaunch = Effect.fn("resolveEditorLaunch")(function* (
   input: LaunchEditorInput,
-  platform: NodeJS.Platform = process.platform,
+): Effect.fn.Return<EditorLaunch, ExternalLauncherError, FileSystem.FileSystem | Path.Path> {
-  env: NodeJS.ProcessEnv = process.env,
+  const platform = yield* HostProcessPlatform;
-): Effect.fn.Return<EditorLaunch, ExternalLauncherError> {
+  const env = yield* readCommandLookupEnv;
   yield* Effect.annotateCurrentSpan({
     "externalLauncher.editor": input.editor,
     "externalLauncher.cwd": input.cwd,
 @@ -281,7 +328,7 @@ export const resolveEditorLaunch = Effect.fn("resolveEditorLaunch")(function* (
   if (editorDef.commands) {
     const command = Option.getOrElse(
-      resolveAvailableCommand(editorDef.commands, { platform, env }),
+      yield* resolveAvailableCommand(editorDef.commands, env),
       () => editorDef.commands[0],
     );
     return {
 @@ -312,29 +359,35 @@ const launchAndUnref = Effect.fn("externalLauncher.launchAndUnref")(function* (
   );
 });
-export const launchBrowser = Effect.fn("externalLauncher.launchBrowser")(function* (
+const launchBrowser = Effect.fn("externalLauncher.launchBrowser")(function* (
   target: string,
 ): Effect.fn.Return<void, ExternalLauncherError, ChildProcessSpawner.ChildProcessSpawner> {
-  return yield* launchAndUnref(resolveBrowserLaunch(target), "Browser auto-open failed");
+  const launch = yield* resolveBrowserLaunch(target);
+  return yield* launchAndUnref(launch, "Browser auto-open failed");
 });
-export const launchEditorProcess = Effect.fn("externalLauncher.launchEditorProcess")(function* (
+const launchEditorProcess = Effect.fn("externalLauncher.launchEditorProcess")(function* (
   launch: EditorLaunch,
-): Effect.fn.Return<void, ExternalLauncherError, ChildProcessSpawner.ChildProcessSpawner> {
+): Effect.fn.Return<
-  if (!isCommandAvailable(launch.command)) {
+  void,
+  ExternalLauncherError,
+  ChildProcessSpawner.ChildProcessSpawner | FileSystem.FileSystem | Path.Path
+> {
+  const env = yield* readCommandLookupEnv;
+  if (!(yield* isCommandAvailable(launch.command, { env }))) {
     return yield* new ExternalLauncherError({
       message: `Editor command not found: ${launch.command}`,
     });
   }
-  const isWin32 = process.platform === "win32";
+  const spawnCommand = yield* resolveSpawnCommand(launch.command, launch.args, { env });
   yield* launchAndUnref(
     {
-      command: launch.command,
+      command: spawnCommand.command,
-      args: isWin32 ? launch.args.map((arg) => `"${arg}"`) : [...launch.args],
+      args: spawnCommand.args,
       options: {
         detached: true,
-        shell: isWin32,
+        shell: spawnCommand.shell,
         stdin: "ignore",
         stdout: "ignore",
         stderr: "ignore",
 @@ -346,16 +399,29 @@ export const launchEditorProcess = Effect.fn("externalLauncher.launchEditorProce
 const make = Effect.gen(function* () {
   const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+  const fileSystem = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
+  const provideCommandResolutionServices = <A, E, R>(
+    effect: Effect.Effect<A, E, R | FileSystem.FileSystem | Path.Path>,
+  ) =>
+    effect.pipe(
+      Effect.provideService(FileSystem.FileSystem, fileSystem),
+      Effect.provideService(Path.Path, path),
+    );
   return {
+    resolveAvailableEditors: () => provideCommandResolutionServices(resolveAvailableEditors()),
     launchBrowser: (target) =>
       launchBrowser(target).pipe(
         Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
       ),
     launchEditor: (input) =>
-      Effect.flatMap(resolveEditorLaunch(input), (launch) =>
+      provideCommandResolutionServices(
-        launchEditorProcess(launch).pipe(
+        Effect.flatMap(resolveEditorLaunch(input), (launch) =>
-          Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
+          launchEditorProcess(launch).pipe(
+            Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
+          ),
         ),
       ),
   } satisfies ExternalLauncherShape;

apps/server/src/processRunner.test.ts+52-16

...	@@ -8,6 +8,8 @@ import * as Sink from "effect/Sink";	...	@@ -8,6 +8,8 @@ import * as Sink from "effect/Sink";
8	import * as Stream from "effect/Stream";	8	import * as Stream from "effect/Stream";
9	import { TestClock } from "effect/testing";	9	import { TestClock } from "effect/testing";
10	import { ChildProcessSpawner } from "effect/unstable/process";	10	import { ChildProcessSpawner } from "effect/unstable/process";
		11	import { HostProcessEnvironment, HostProcessPlatform } from "@t3tools/shared/hostProcess";
		12	import { SpawnExecutableResolution } from "@t3tools/shared/shell";
11		13
12	import {	14	import {
13	isWindowsCommandNotFound,	15	isWindowsCommandNotFound,
...	@@ -21,6 +23,9 @@ import {	...	@@ -21,6 +23,9 @@ import {
21	type ChildProcessCommand = {	23	type ChildProcessCommand = {
22	readonly command: string;	24	readonly command: string;
23	readonly args: ReadonlyArray<string>;	25	readonly args: ReadonlyArray<string>;
		26	readonly options: {
		27	readonly shell?: boolean \| string;
		28	};
24	};	29	};
25		30
26	// Accesses private properties of ChildProcessCommand for testing purposes	31	// Accesses private properties of ChildProcessCommand for testing purposes
...	@@ -68,7 +73,6 @@ const runWith =	...	@@ -68,7 +73,6 @@ const runWith =
68	Effect.flatMap((runner) =>	73	Effect.flatMap((runner) =>
69	runner.run({	74	runner.run({
70	...input,	75	...input,
71	shell: input.shell ?? false,
72	}),	76	}),
73	),	77	),
74	Effect.provide(	78	Effect.provide(
...	@@ -123,6 +127,44 @@ describe("runProcess", () => {	...	@@ -123,6 +127,44 @@ describe("runProcess", () => {
123	}).pipe(Effect.provide(layer));	127	}).pipe(Effect.provide(layer));
124	});	128	});
125		129
		130	it.effect("resolves and escapes Windows command shims before spawning", () => {
		131	const spawner = makeSpawner((command) =>
		132	Effect.sync(() => {
		133	expect(command.command).toBe('^"C:\\Users\\tester\\AppData\\Roaming\\npm\\az.cmd^"');
		134	expect(command.args).toEqual([
		135	'^"repos^"',
		136	'^"pr^"',
		137	'^"list^"',
		138	'^"--source-branch^"',
		139	'^"feature^ ^&^ release^"',
		140	]);
		141	expect(command.options.shell).toBe(true);
		142	return makeHandle({ stdout: "[]" });
		143	}),
		144	);
		145
		146	return runWith(spawner)({
		147	command: "az",
		148	args: ["repos", "pr", "list", "--source-branch", "feature & release"],
		149	env: { AZURE_CONFIG_DIR: "C:\\Users\\tester\\.azure" },
		150	}).pipe(
		151	Effect.provideService(HostProcessPlatform, "win32"),
		152	Effect.provideService(HostProcessEnvironment, {
		153	PATH: "C:\\Users\\tester\\AppData\\Roaming\\npm",
		154	PATHEXT: ".COM;.EXE;.BAT;.CMD",
		155	}),
		156	Effect.provideService(SpawnExecutableResolution, (_command, _platform, env) =>
		157	env.PATH === "C:\\Users\\tester\\AppData\\Roaming\\npm" &&
		158	env.AZURE_CONFIG_DIR === "C:\\Users\\tester\\.azure"
		159	? "C:\\Users\\tester\\AppData\\Roaming\\npm\\az.cmd"
		160	: undefined,
		161	),
		162	Effect.map((result) => {
		163	expect(result.stdout).toBe("[]");
		164	}),
		165	);
		166	});
		167
126	it.effect("fails when output exceeds max buffer in default mode", () =>	168	it.effect("fails when output exceeds max buffer in default mode", () =>
127	Effect.gen(function* () {	169	Effect.gen(function* () {
128	const spawner = makeSpawner(() => Effect.succeed(makeHandle({ stdout: "x".repeat(2048) })));	170	const spawner = makeSpawner(() => Effect.succeed(makeHandle({ stdout: "x".repeat(2048) })));
...	@@ -280,19 +322,13 @@ describe("runProcess", () => {	...	@@ -280,19 +322,13 @@ describe("runProcess", () => {
280	});	322	});
281		323
282	describe("isWindowsCommandNotFound", () => {	324	describe("isWindowsCommandNotFound", () => {
283	it("matches the localized German cmd.exe error text", () => {	325	it.effect("matches the localized German cmd.exe error text", () =>
284	const originalPlatform = process.platform;	326	Effect.gen(function* () {
285	Object.defineProperty(process, "platform", { value: "win32", configurable: true });	327	const isCommandNotFound = yield* isWindowsCommandNotFound(
286		328	1,
287	try {	329	"wird nicht als interner oder externer Befehl, betriebsfahiges Programm oder Batch-Datei erkannt",
288	expect(	330	).pipe(Effect.provideService(HostProcessPlatform, "win32"));
289	isWindowsCommandNotFound(	331	expect(isCommandNotFound).toBe(true);
290	1,	332	}),
291	"wird nicht als interner oder externer Befehl, betriebsfahiges Programm oder Batch-Datei erkannt",	333	);
292	),
293	).toBe(true);
294	} finally {
295	Object.defineProperty(process, "platform", { value: originalPlatform, configurable: true });
296	}
297	});
298	});	334	});

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

 @@ -8,6 +8,8 @@ import * as PlatformError from "effect/PlatformError";
 import * as Scope from "effect/Scope";
 import * as Stream from "effect/Stream";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
+import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
+import { resolveSpawnCommand } from "@t3tools/shared/shell";
 import {
   collectUint8StreamText,
   type CollectedUint8StreamText,
 @@ -24,7 +26,6 @@ export interface ProcessRunInput {
   readonly maxOutputBytes?: number | undefined;
   readonly outputMode?: "error" | "truncate" | undefined;
   readonly truncatedMarker?: string | undefined;
-  readonly shell?: boolean | string | undefined;
   /**
    * On timeout, return a synthetic timedOut result.
    * Partial stdout/stderr are not preserved.
 @@ -109,11 +110,14 @@ function hasWindowsCommandNotFoundMessage(output: string): boolean {
   return WINDOWS_COMMAND_NOT_FOUND_PATTERNS.some((pattern) => pattern.test(output));
 }
-export function isWindowsCommandNotFound(code: number | null, stderr: string): boolean {
+export const isWindowsCommandNotFound = Effect.fn("processRunner.isWindowsCommandNotFound")(
-  if (process.platform !== "win32") return false;
+  function* (code: number | null, stderr: string) {
-  if (code === 9009) return true;
+    const platform = yield* HostProcessPlatform;
-  return hasWindowsCommandNotFoundMessage(stderr);
+    if (platform !== "win32") return false;
-}
+    if (code === 9009) return true;
+    return hasWindowsCommandNotFoundMessage(stderr);
+  },
+);
 const collectText = Effect.fn("processRunner.collectText")(function* (input: {
   readonly command: string;
 @@ -231,18 +235,24 @@ const runProcessCore = Effect.fn("processRunner.runProcessCore")(function* (
   const maxOutputBytes = input.maxOutputBytes ?? DEFAULT_MAX_OUTPUT_BYTES;
   const outputMode = input.outputMode ?? "error";
   const truncatedMarker = input.truncatedMarker ?? "";
+  const extendEnv = input.env !== undefined;
+  const spawnCommand = yield* resolveSpawnCommand(
+    input.command,
+    input.args,
+    input.env === undefined ? {} : { env: input.env, extendEnv },
+  );
   const child = yield* spawner
     .spawn(
-      ChildProcess.make(input.command, [...input.args], {
+      ChildProcess.make(spawnCommand.command, spawnCommand.args, {
         ...((input.spawnCwd ?? input.cwd) ? { cwd: input.spawnCwd ?? input.cwd } : {}),
         ...(input.env !== undefined
           ? {
               env: input.env,
-              extendEnv: true,
+              extendEnv,
             }
           : {}),
-        ...(input.shell !== undefined ? { shell: input.shell } : {}),
+        shell: spawnCommand.shell,
       }),
     )
     .pipe(

apps/server/src/project/Layers/RepositoryIdentityResolver.ts+2

...	@@ -89,6 +89,8 @@ const resolveRepositoryIdentityCacheKey = Effect.fn("resolveRepositoryIdentityCa	...	@@ -89,6 +89,8 @@ const resolveRepositoryIdentityCacheKey = Effect.fn("resolveRepositoryIdentityCa
89	const processRunner = yield* ProcessRunner.ProcessRunner;	89	const processRunner = yield* ProcessRunner.ProcessRunner;
90	let cacheKey = cwd;	90	let cacheKey = cwd;
91		91
		92	// git is a real executable on every platform — no cmd.exe shell mode, which
		93	// would split paths containing spaces during cmd's re-tokenization.
92	const topLevelResult = yield* processRunner	94	const topLevelResult = yield* processRunner
93	.run({	95	.run({
94	command: "git",	96	command: "git",

apps/server/src/provider/Drivers/ClaudeHome.ts+4-3

 @@ -16,13 +16,14 @@ export const resolveClaudeHomePath = Effect.fn("resolveClaudeHomePath")(function
 export const makeClaudeEnvironment = Effect.fn("makeClaudeEnvironment")(function* (
   config: Pick<ClaudeSettings, "homePath">,
-  baseEnv: NodeJS.ProcessEnv = process.env,
+  baseEnv?: NodeJS.ProcessEnv,
 ): Effect.fn.Return<NodeJS.ProcessEnv, never, Path.Path> {
+  const resolvedBaseEnv = baseEnv ?? process.env;
   const homePath = config.homePath.trim();
-  if (homePath.length === 0) return baseEnv;
+  if (homePath.length === 0) return resolvedBaseEnv;
   const resolvedHomePath = yield* resolveClaudeHomePath(config);
   return {
-    ...baseEnv,
+    ...resolvedBaseEnv,
     HOME: resolvedHomePath,
   };
 });

apps/server/src/provider/Layers/ClaudeProvider.ts+15-9

 @@ -18,6 +18,7 @@ import {
   getProviderOptionCurrentValue,
   getProviderOptionDescriptors,
 } from "@t3tools/shared/model";
+import { resolveSpawnCommand } from "@t3tools/shared/shell";
 import { compareSemverVersions } from "@t3tools/shared/semver";
 import {
   query as claudeQuery,
 @@ -547,7 +548,7 @@ function waitForAbortSignal(signal: AbortSignal): Promise<void> {
  */
 const probeClaudeCapabilities = (
   claudeSettings: ClaudeSettings,
-  environment: NodeJS.ProcessEnv = process.env,
+  environment?: NodeJS.ProcessEnv,
 ) => {
   const abort = new AbortController();
   return Effect.gen(function* () {
 @@ -603,12 +604,15 @@ const probeClaudeCapabilities = (
 const runClaudeCommand = Effect.fn("runClaudeCommand")(function* (
   claudeSettings: ClaudeSettings,
   args: ReadonlyArray<string>,
-  environment: NodeJS.ProcessEnv = process.env,
+  environment?: NodeJS.ProcessEnv,
 ) {
   const claudeEnvironment = yield* makeClaudeEnvironment(claudeSettings, environment);
-  const command = ChildProcess.make(claudeSettings.binaryPath, [...args], {
+  const spawnCommand = yield* resolveSpawnCommand(claudeSettings.binaryPath, args, {
     env: claudeEnvironment,
-    shell: process.platform === "win32",
+  });
+  const command = ChildProcess.make(spawnCommand.command, spawnCommand.args, {
+    env: claudeEnvironment,
+    shell: spawnCommand.shell,
   });
   return yield* spawnAndCollect(claudeSettings.binaryPath, command);
 });
 @@ -618,12 +622,13 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
   resolveCapabilities?: (
     claudeSettings: ClaudeSettings,
   ) => Effect.Effect<ClaudeCapabilitiesProbe | undefined>,
-  environment: NodeJS.ProcessEnv = process.env,
+  environment?: NodeJS.ProcessEnv,
 ): Effect.fn.Return<
   ServerProviderDraft,
   never,
   ChildProcessSpawner.ChildProcessSpawner | Path.Path
 > {
+  const resolvedEnvironment = environment ?? process.env;
   const checkedAt = DateTime.formatIso(yield* DateTime.now);
   const allModels = providerModelsFromSettings(
     BUILT_IN_MODELS,
 @@ -648,10 +653,11 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
     });
   }
-  const versionProbe = yield* runClaudeCommand(claudeSettings, ["--version"], environment).pipe(
+  const versionProbe = yield* runClaudeCommand(
-    Effect.timeoutOption(DEFAULT_TIMEOUT_MS),
+    claudeSettings,
-    Effect.result,
+    ["--version"],
-  );
+    resolvedEnvironment,
+  ).pipe(Effect.timeoutOption(DEFAULT_TIMEOUT_MS), Effect.result);
   if (Result.isFailure(versionProbe)) {
     const error = versionProbe.failure;

apps/server/src/provider/Layers/CodexProvider.ts+36-14

 @@ -7,7 +7,7 @@ import * as Result from "effect/Result";
 import * as Schema from "effect/Schema";
 import * as Scope from "effect/Scope";
 import * as Types from "effect/Types";
-import { ChildProcessSpawner } from "effect/unstable/process";
+import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 import * as CodexClient from "effect-codex-app-server/client";
 import * as CodexSchema from "effect-codex-app-server/schema";
 import * as CodexErrors from "effect-codex-app-server/errors";
 @@ -24,6 +24,7 @@ import type {
 import { ServerSettingsError } from "@t3tools/contracts";
 import { createModelCapabilities } from "@t3tools/shared/model";
+import { resolveSpawnCommand } from "@t3tools/shared/shell";
 import {
   AUTH_PROBE_TIMEOUT_MS,
   buildServerProvider,
 @@ -33,6 +34,8 @@ import { expandHomePath } from "../../pathExpansion.ts";
 import packageJson from "../../../package.json" with { type: "json" };
 const isCodexAppServerSpawnError = Schema.is(CodexErrors.CodexAppServerSpawnError);
+const CODEX_APP_SERVER_PROBE_FORCE_KILL_AFTER = "2 seconds" as const;
 const CODEX_PRESENTATION = {
   displayName: "Codex",
   showInteractionModeToggle: true,
 @@ -292,17 +295,35 @@ const probeCodexAppServerProvider = Effect.fn("probeCodexAppServerProvider")(fun
   // "CODEX_HOME points to '~/.codex_work', but that path does not exist".
   // Expand here for parity with `CodexTextGeneration`/`CodexSessionRuntime`.
   const resolvedHomePath = input.homePath ? expandHomePath(input.homePath) : undefined;
-  const clientContext = yield* Layer.build(
+  const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-    CodexClient.layerCommand({
+  const environment = {
-      command: input.binaryPath,
+    ...input.environment,
-      args: ["app-server"],
+    ...(resolvedHomePath ? { CODEX_HOME: resolvedHomePath } : {}),
-      cwd: input.cwd,
+  };
-      env: {
+  const spawnCommand = yield* resolveSpawnCommand(input.binaryPath, ["app-server"], {
-        ...(input.environment ?? process.env),
+    env: environment,
-        ...(resolvedHomePath ? { CODEX_HOME: resolvedHomePath } : {}),
+    extendEnv: true,
-      },
+  });
-    }),
+  const child = yield* spawner
-  );
+    .spawn(
+      ChildProcess.make(spawnCommand.command, spawnCommand.args, {
+        cwd: input.cwd,
+        env: environment,
+        extendEnv: true,
+        forceKillAfter: CODEX_APP_SERVER_PROBE_FORCE_KILL_AFTER,
+        shell: spawnCommand.shell,
+      }),
+    )
+    .pipe(
+      Effect.mapError(
+        (cause) =>
+          new CodexErrors.CodexAppServerSpawnError({
+            command: `${input.binaryPath} app-server`,
+            cause,
+          }),
+      ),
+    );
+  const clientContext = yield* Layer.build(CodexClient.layerChildProcess(child));
   const client = yield* Effect.service(CodexClient.CodexAppServerClient).pipe(
     Effect.provide(clientContext),
   );
 @@ -449,12 +470,13 @@ export const checkCodexProviderStatus = Effect.fn("checkCodexProviderStatus")(fu
     CodexErrors.CodexAppServerError,
     ChildProcessSpawner.ChildProcessSpawner | Scope.Scope
   > = probeCodexAppServerProvider,
-  environment: NodeJS.ProcessEnv = process.env,
+  environment?: NodeJS.ProcessEnv,
 ): Effect.fn.Return<
   ServerProviderDraft,
   ServerSettingsError,
   ChildProcessSpawner.ChildProcessSpawner
 > {
+  const resolvedEnvironment = environment ?? process.env;
   const checkedAt = DateTime.formatIso(yield* DateTime.now);
   const emptyModels = emptyCodexModelsFromSettings(codexSettings);
 @@ -480,7 +502,7 @@ export const checkCodexProviderStatus = Effect.fn("checkCodexProviderStatus")(fu
     homePath: codexSettings.homePath,
     cwd: process.cwd(),
     customModels: codexSettings.customModels,
-    environment,
+    environment: resolvedEnvironment,
   }).pipe(
     Effect.scoped,
     Effect.timeoutOption(Duration.millis(AUTH_PROBE_TIMEOUT_MS)),

apps/server/src/provider/Layers/CodexSessionRuntime.ts+11-3

 @@ -16,6 +16,7 @@ import {
   ThreadId,
   TurnId,
 } from "@t3tools/contracts";
+import { resolveSpawnCommand } from "@t3tools/shared/shell";
 import { normalizeModelSlug } from "@t3tools/shared/model";
 import * as Crypto from "effect/Crypto";
 import * as DateTime from "effect/DateTime";
 @@ -720,16 +721,23 @@ export const makeCodexSessionRuntime = (
     // `CODEX_HOME=~/.codex_work` reach codex as an absolute path.
     const resolvedHomePath = options.homePath ? expandHomePath(options.homePath) : undefined;
     const env = {
-      ...(options.environment ?? process.env),
+      ...options.environment,
       ...(resolvedHomePath ? { CODEX_HOME: resolvedHomePath } : {}),
     };
+    const extendEnv = options.environment === undefined;
+    const spawnCommand = yield* resolveSpawnCommand(
+      options.binaryPath,
+      ["app-server", ...(options.appServerArgs ?? [])],
+      { env, extendEnv },
+    );
     const child = yield* spawner
       .spawn(
-        ChildProcess.make(options.binaryPath, ["app-server", ...(options.appServerArgs ?? [])], {
+        ChildProcess.make(spawnCommand.command, spawnCommand.args, {
           cwd: options.cwd,
           env,
+          extendEnv,
           forceKillAfter: CODEX_APP_SERVER_FORCE_KILL_AFTER,
-          shell: process.platform === "win32",
+          shell: spawnCommand.shell,
         }),
       )
       .pipe(

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

...	@@ -27,6 +27,7 @@ import {	...	@@ -27,6 +27,7 @@ import {
27	getProviderOptionBooleanSelectionValue,	27	getProviderOptionBooleanSelectionValue,
28	getProviderOptionStringSelectionValue,	28	getProviderOptionStringSelectionValue,
29	} from "@t3tools/shared/model";	29	} from "@t3tools/shared/model";
		30	import { resolveSpawnCommand } from "@t3tools/shared/shell";
30		31
31	import {	32	import {
32	buildBooleanOptionDescriptor,	33	buildBooleanOptionDescriptor,
...	@@ -394,7 +395,7 @@ function buildCursorDiscoveredModelsFromAvailableModelsResponse(	...	@@ -394,7 +395,7 @@ function buildCursorDiscoveredModelsFromAvailableModelsResponse(
394		395
395	const makeCursorAcpProbeRuntime = (	396	const makeCursorAcpProbeRuntime = (
396	cursorSettings: CursorSettings,	397	cursorSettings: CursorSettings,
397	environment: NodeJS.ProcessEnv = process.env,	398	environment?: NodeJS.ProcessEnv,
398	) =>	399	) =>
399	Effect.gen(function* () {	400	Effect.gen(function* () {
400	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;	401	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
...	@@ -407,7 +408,7 @@ const makeCursorAcpProbeRuntime = (	...	@@ -407,7 +408,7 @@ const makeCursorAcpProbeRuntime = (
407	"acp",	408	"acp",
408	],	409	],
409	cwd: process.cwd(),	410	cwd: process.cwd(),
410	env: environment,	411	...(environment ? { env: environment } : {}),
411	},	412	},
412	cwd: process.cwd(),	413	cwd: process.cwd(),
413	clientInfo: { name: "t3-code-provider-probe", version: "0.0.0" },	414	clientInfo: { name: "t3-code-provider-probe", version: "0.0.0" },
...	@@ -421,7 +422,7 @@ const makeCursorAcpProbeRuntime = (	...	@@ -421,7 +422,7 @@ const makeCursorAcpProbeRuntime = (
421	const withCursorAcpProbeRuntime = <A, E, R>(	422	const withCursorAcpProbeRuntime = <A, E, R>(
422	cursorSettings: CursorSettings,	423	cursorSettings: CursorSettings,
423	useRuntime: (acp: AcpSessionRuntime["Service"]) => Effect.Effect<A, E, R>,	424	useRuntime: (acp: AcpSessionRuntime["Service"]) => Effect.Effect<A, E, R>,
424	environment: NodeJS.ProcessEnv = process.env,	425	environment?: NodeJS.ProcessEnv,
425	) =>	426	) =>
426	makeCursorAcpProbeRuntime(cursorSettings, environment).pipe(	427	makeCursorAcpProbeRuntime(cursorSettings, environment).pipe(
427	Effect.flatMap(useRuntime),	428	Effect.flatMap(useRuntime),
...	@@ -542,7 +543,7 @@ export function resolveCursorAcpConfigUpdates(	...	@@ -542,7 +543,7 @@ export function resolveCursorAcpConfigUpdates(
542		543
543	const discoverCursorModelsViaListAvailableModels = (	544	const discoverCursorModelsViaListAvailableModels = (
544	cursorSettings: CursorSettings,	545	cursorSettings: CursorSettings,
545	environment: NodeJS.ProcessEnv = process.env,	546	environment?: NodeJS.ProcessEnv,
546	) =>	547	) =>
547	withCursorAcpProbeRuntime(	548	withCursorAcpProbeRuntime(
548	cursorSettings,	549	cursorSettings,
...	@@ -558,7 +559,7 @@ const discoverCursorModelsViaListAvailableModels = (	...	@@ -558,7 +559,7 @@ const discoverCursorModelsViaListAvailableModels = (
558		559
559	export const discoverCursorModelsViaAcp = (	560	export const discoverCursorModelsViaAcp = (
560	cursorSettings: CursorSettings,	561	cursorSettings: CursorSettings,
561	environment: NodeJS.ProcessEnv = process.env,	562	environment?: NodeJS.ProcessEnv,
562	) => discoverCursorModelsViaListAvailableModels(cursorSettings, environment);	563	) => discoverCursorModelsViaListAvailableModels(cursorSettings, environment);
563		564
564	export function getCursorFallbackModels(	565	export function getCursorFallbackModels(
...	@@ -927,13 +928,18 @@ export function parseCursorAboutOutput(result: CommandResult): CursorAboutResult	...	@@ -927,13 +928,18 @@ export function parseCursorAboutOutput(result: CommandResult): CursorAboutResult
927	const runCursorCommand = (	928	const runCursorCommand = (
928	cursorSettings: CursorSettings,	929	cursorSettings: CursorSettings,
929	args: ReadonlyArray<string>,	930	args: ReadonlyArray<string>,
930	environment: NodeJS.ProcessEnv = process.env,	931	environment?: NodeJS.ProcessEnv,
931	) =>	932	) =>
932	Effect.gen(function* () {	933	Effect.gen(function* () {
933	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;	934	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
934	const command = ChildProcess.make(cursorSettings.binaryPath, [...args], {	935	const spawnCommand = yield* resolveSpawnCommand(
935	env: environment,	936	cursorSettings.binaryPath,
936	shell: process.platform === "win32",	937	args,
		938	environment ? { env: environment } : {},
		939	);
		940	const command = ChildProcess.make(spawnCommand.command, spawnCommand.args, {
		941	...(environment ? { env: environment } : { extendEnv: true }),
		942	shell: spawnCommand.shell,
937	});	943	});
938		944
939	const child = yield* spawner.spawn(command);	945	const child = yield* spawner.spawn(command);
...	@@ -949,10 +955,7 @@ const runCursorCommand = (	...	@@ -949,10 +955,7 @@ const runCursorCommand = (
949	return { stdout, stderr, code: exitCode } satisfies CommandResult;	955	return { stdout, stderr, code: exitCode } satisfies CommandResult;
950	}).pipe(Effect.scoped);	956	}).pipe(Effect.scoped);
951		957
952	const runCursorAboutCommand = (	958	const runCursorAboutCommand = (cursorSettings: CursorSettings, environment?: NodeJS.ProcessEnv) =>
953	cursorSettings: CursorSettings,
954	environment: NodeJS.ProcessEnv = process.env,
955	) =>
956	Effect.gen(function* () {	959	Effect.gen(function* () {
957	const jsonResult = yield* runCursorCommand(	960	const jsonResult = yield* runCursorCommand(
958	cursorSettings,	961	cursorSettings,
...	@@ -967,7 +970,7 @@ const runCursorAboutCommand = (	...	@@ -967,7 +970,7 @@ const runCursorAboutCommand = (
967		970
968	export const checkCursorProviderStatus = Effect.fn("checkCursorProviderStatus")(function* (	971	export const checkCursorProviderStatus = Effect.fn("checkCursorProviderStatus")(function* (
969	cursorSettings: CursorSettings,	972	cursorSettings: CursorSettings,
970	environment: NodeJS.ProcessEnv = process.env,	973	environment?: NodeJS.ProcessEnv,
971	): Effect.fn.Return<	974	): Effect.fn.Return<
972	ServerProviderDraft,	975	ServerProviderDraft,
973	never,	976	never,

apps/server/src/provider/Layers/GrokProvider.ts+14-9

 @@ -15,6 +15,7 @@ import * as Result from "effect/Result";
 import { HttpClient } from "effect/unstable/http";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 import { createModelCapabilities } from "@t3tools/shared/model";
+import { resolveSpawnCommand } from "@t3tools/shared/shell";
 import {
   buildServerProvider,
 @@ -149,16 +150,20 @@ const discoverGrokModelsViaAcp = (
 const runGrokVersionCommand = (
   grokSettings: GrokSettings,
   environment: NodeJS.ProcessEnv = process.env,
-) => {
+) =>
-  const command = grokSettings.binaryPath || "grok";
+  Effect.gen(function* () {
-  return spawnAndCollect(
+    const command = grokSettings.binaryPath || "grok";
-    command,
+    const spawnCommand = yield* resolveSpawnCommand(command, ["--version"], {
-    ChildProcess.make(command, ["--version"], {
       env: environment,
-      shell: process.platform === "win32",
+    });
-    }),
+    return yield* spawnAndCollect(
-  );
+      command,
-};
+      ChildProcess.make(spawnCommand.command, spawnCommand.args, {
+        env: environment,
+        shell: spawnCommand.shell,
+      }),
+    );
+  });
 export const checkGrokProviderStatus = Effect.fn("checkGrokProviderStatus")(function* (
   grokSettings: GrokSettings,

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

apps/server/src/provider/Layers/ProviderRegistry.test.ts+15-24

 @@ -1039,7 +1039,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest(), T
       // This test intentionally avoids `mockCommandSpawnerLayer` so the real
       // `probeCodexAppServerProvider` path runs — including the full
-      // `codex app-server` RPC handshake via `CodexClient.layerCommand`.
+      // `codex app-server` RPC handshake via `CodexClient.layerChildProcess`.
       // We point `binaryPath` at a name that cannot exist on any machine so
       // the real `ChildProcessSpawner` deterministically returns ENOENT; the
       // probe wraps that as `CodexAppServerSpawnError` and
 @@ -1159,6 +1159,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest(), T
         Effect.gen(function* () {
           const firstMissing = `t3code_codex_first_`;
           const secondMissing = `t3code_codex_second_`;
+          const spawnedCommands: Array<string> = [];
           const serverSettings = yield* makeMutableServerSettingsService(
             decodeServerSettings(
               deepMerge(encodedDefaultServerSettings, {
 @@ -1185,10 +1186,12 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest(), T
             Layer.provideMerge(TestHttpClientLive),
             Layer.provideMerge(Layer.succeed(ProviderEventLoggers, NoOpProviderEventLoggers)),
             Layer.provideMerge(OpenCodeRuntimeLive),
-            // `it.live` does not inherit layers from the outer `it.layer`
+            Layer.updateService(ChildProcessSpawner.ChildProcessSpawner, (spawner) =>
-            // wrapper, so provide `NodeServices.layer` inline. This is the
+              ChildProcessSpawner.make((command) => {
-            // same real `ChildProcessSpawner` + `FileSystem` + `Path`
+                spawnedCommands.push((command as { readonly command: string }).command);
-            // services that production uses.
+                return spawner.spawn(command);
+              }),
+            ),
             Layer.provideMerge(NodeServices.layer),
           );
           const runtimeServices = yield* Layer.build(providerRegistryLayer).pipe(
 @@ -1199,10 +1202,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest(), T
             const registry = yield* ProviderRegistry;
             // Boot-time probe: the default codex instance is enabled with
             // `firstMissing`, so the real spawner yields ENOENT and the
-            // snapshot should be `status: "error"`. What *distinguishes*
+            // snapshot should be `status: "error"`.
-            // the two probe runs is `checkedAt` — each probe stamps a
-            // fresh DateTime, so we capture it and assert it advances
-            // after the settings mutation.
             let initialProviders = yield* registry.getProviders;
             for (
               let attempts = 0;
 @@ -1220,13 +1220,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest(), T
             );
             assert.strictEqual(initialCodex?.status, "error");
             assert.strictEqual(initialCodex?.installed, false);
-            const initialCheckedAt = initialCodex?.checkedAt;
+            assert.deepStrictEqual(spawnedCommands, [firstMissing]);
-            assert.notStrictEqual(initialCheckedAt, undefined);
-            // The rebuilt instance may re-probe synchronously during the
-            // settings update. Advance the TestClock first so `checkedAt`
-            // can safely act as the fresh-probe marker this assertion uses.
-            yield* TestClock.adjust("1 second");
             // Drive a settings change. The Hydration layer's
             // `SettingsWatcherLive` consumes this via `streamChanges`,
 @@ -1242,8 +1236,9 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest(), T
               },
             });
-            // Poll with TestClock until `checkedAt` advances or we hit a
+            // Poll until the injected process boundary observes the new
-            // generous virtual 3-second ceiling.
+            // executable. This verifies the public settings-to-probe behavior
+            // without depending on timestamps assigned by TestClock.
             const refreshed = yield* Effect.gen(function* () {
               for (let attempts = 0; attempts < 60; attempts += 1) {
                 const providers = yield* registry.getProviders;
 @@ -1251,7 +1246,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest(), T
                 if (
                   codex !== undefined &&
                   codex.status === "error" &&
-                  codex.checkedAt !== initialCheckedAt
+                  spawnedCommands.includes(secondMissing)
                 ) {
                   return providers;
                 }
 @@ -1262,11 +1257,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest(), T
             });
             const reprobedCodex = refreshed.find((provider) => provider.instanceId === "codex");
-            assert.notStrictEqual(
+            assert.deepStrictEqual(spawnedCommands, [firstMissing, secondMissing]);
-              reprobedCodex?.checkedAt,
-              initialCheckedAt,
-              "Expected a fresh probe after settings change, got the stale snapshot",
-            );
             assert.strictEqual(reprobedCodex?.status, "error");
             assert.strictEqual(reprobedCodex?.installed, false);
           }).pipe(Effect.provide(runtimeServices));

apps/server/src/provider/acp/AcpSessionRuntime.ts+9-3

 @@ -13,6 +13,7 @@ import * as EffectAcpClient from "effect-acp/client";
 import * as EffectAcpErrors from "effect-acp/errors";
 import type * as EffectAcpSchema from "effect-acp/schema";
 import type * as EffectAcpProtocol from "effect-acp/protocol";
+import { resolveSpawnCommand } from "@t3tools/shared/shell";
 import {
   collectSessionConfigOptionValues,
 @@ -201,12 +202,17 @@ const makeAcpSessionRuntime = (
         ),
       );
+    const spawnCommand = yield* resolveSpawnCommand(
+      options.spawn.command,
+      options.spawn.args,
+      options.spawn.env ? { env: options.spawn.env, extendEnv: true } : {},
+    );
     const child = yield* spawner
       .spawn(
-        ChildProcess.make(options.spawn.command, [...options.spawn.args], {
+        ChildProcess.make(spawnCommand.command, spawnCommand.args, {
           ...(options.spawn.cwd ? { cwd: options.spawn.cwd } : {}),
-          ...(options.spawn.env ? { env: { ...process.env, ...options.spawn.env } } : {}),
+          ...(options.spawn.env ? { env: options.spawn.env, extendEnv: true } : {}),
-          shell: process.platform === "win32",
+          shell: spawnCommand.shell,
         }),
       )
       .pipe(

apps/server/src/provider/opencodeRuntime.ts+17-9

 @@ -31,6 +31,8 @@ import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 import { isWindowsCommandNotFound } from "../processRunner.ts";
 import { collectStreamAsString } from "./providerSnapshot.ts";
 import * as NetService from "@t3tools/shared/Net";
+import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
+import { resolveSpawnCommand } from "@t3tools/shared/shell";
 const encodeUnknownJsonStringExit = Schema.encodeUnknownExit(Schema.UnknownFromJsonString);
 const OPENCODE_EMPTY_CONFIG_CONTENT = "{}";
 @@ -276,13 +278,17 @@ function ensureRuntimeError(
 const makeOpenCodeRuntime = Effect.gen(function* () {
   const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
   const netService = yield* NetService.NetService;
+  const hostPlatform = yield* HostProcessPlatform;
+  const resolveCommand = (command: string, args: ReadonlyArray<string>, env?: NodeJS.ProcessEnv) =>
+    resolveSpawnCommand(command, args, env ? { env } : {});
   const runOpenCodeCommand: OpenCodeRuntimeShape["runOpenCodeCommand"] = (input) =>
     Effect.gen(function* () {
+      const spawnCommand = yield* resolveCommand(input.binaryPath, input.args, input.environment);
       const child = yield* spawner.spawn(
-        ChildProcess.make(input.binaryPath, [...input.args], {
+        ChildProcess.make(spawnCommand.command, spawnCommand.args, {
-          shell: process.platform === "win32",
+          shell: spawnCommand.shell,
-          env: input.environment ?? process.env,
+          ...(input.environment ? { env: input.environment } : { extendEnv: true }),
         }),
       );
       const [stdout, stderr, code] = yield* Effect.all(
 @@ -290,7 +296,7 @@ const makeOpenCodeRuntime = Effect.gen(function* () {
         { concurrency: "unbounded" },
       );
       const exitCode = Number(code);
-      if (isWindowsCommandNotFound(exitCode, stderr)) {
+      if (yield* isWindowsCommandNotFound(exitCode, stderr)) {
         return yield* new OpenCodeRuntimeError({
           operation: "runOpenCodeCommand",
           detail: `spawn ${input.binaryPath} ENOENT`,
 @@ -334,16 +340,18 @@ const makeOpenCodeRuntime = Effect.gen(function* () {
         ));
       const timeoutMs = input.timeoutMs ?? DEFAULT_OPENCODE_SERVER_TIMEOUT_MS;
       const args = ["serve", `--hostname=${hostname}`, `--port=${port}`];
+      const spawnCommand = yield* resolveCommand(input.binaryPath, args, input.environment);
       const child = yield* spawner
         .spawn(
-          ChildProcess.make(input.binaryPath, args, {
+          ChildProcess.make(spawnCommand.command, spawnCommand.args, {
-            detached: process.platform !== "win32",
+            detached: hostPlatform !== "win32",
-            shell: process.platform === "win32",
+            shell: spawnCommand.shell,
             env: {
-              ...(input.environment ?? process.env),
+              ...input.environment,
               OPENCODE_CONFIG_CONTENT: OPENCODE_EMPTY_CONFIG_CONTENT,
             },
+            extendEnv: input.environment === undefined,
           }),
         )
         .pipe(
 @@ -359,7 +367,7 @@ const makeOpenCodeRuntime = Effect.gen(function* () {
         );
       const killOpenCodeProcessGroup = (signal: NodeJS.Signals) =>
-        process.platform === "win32"
+        hostPlatform === "win32"
           ? child.kill({ killSignal: signal, forceKillAfter: "1 second" }).pipe(Effect.asVoid)
           : Effect.sync(() => {
               try {

apps/server/src/provider/providerMaintenance.test.ts+68-39

 @@ -1,19 +1,22 @@
 // @effect-diagnostics nodeBuiltinImport:off
-import { afterEach, expect, it } from "@effect/vitest";
+import { expect, it } from "@effect/vitest";
 import { chmodSync, mkdirSync, symlinkSync, writeFileSync } from "node:fs";
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import os from "node:os";
+import * as NodeOS from "node:os";
 import path from "node:path";
 import { ProviderDriverKind } from "@t3tools/contracts";
+import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
 import * as Crypto from "effect/Crypto";
 import * as Effect from "effect/Effect";
+import { HttpClient } from "effect/unstable/http";
 import {
-  clearLatestProviderVersionCacheForTests,
   createProviderVersionAdvisory,
   makePackageManagedProviderMaintenanceResolver,
   makeProviderMaintenanceCapabilities,
   makeStaticProviderMaintenanceResolver,
   normalizeCommandPath,
+  ProviderVersionCache,
+  resolveLatestProviderVersion,
   resolveProviderMaintenanceCapabilitiesEffect,
 } from "./providerMaintenance.ts";
 @@ -21,7 +24,7 @@ const driver = (value: string) => ProviderDriverKind.make(value);
 const makeTempDir = (name: string) =>
   Crypto.Crypto.pipe(
     Effect.flatMap((crypto) => crypto.randomUUIDv4),
-    Effect.map((id) => path.join(os.tmpdir(), `${name}-${id}`)),
+    Effect.map((id) => path.join(NodeOS.tmpdir(), `${name}-${id}`)),
   );
 const isNativeTestCommandPath =
   (expectedPathSegment: string) =>
 @@ -65,11 +68,33 @@ const staticToolUpdate = makeStaticProviderMaintenanceResolver(
   }),
 );
-afterEach(() => {
-  clearLatestProviderVersionCacheForTests();
-});
 it.layer(NodeServices.layer)("providerMaintenance", (it) => {
+  it.effect("reads cached versions through the injectable cache reference", () =>
+    resolveLatestProviderVersion(packageToolUpdate.resolve()).pipe(
+      Effect.provideService(
+        ProviderVersionCache,
+        new Map([
+          [
+            "@example/package-tool",
+            {
+              expiresAt: Number.MAX_SAFE_INTEGER,
+              version: "9.9.9",
+            },
+          ],
+        ]),
+      ),
+      Effect.provideService(
+        HttpClient.HttpClient,
+        HttpClient.make(() =>
+          Effect.die("cached provider version should not make an HTTP request"),
+        ),
+      ),
+      Effect.map((version) => {
+        expect(version).toBe("9.9.9");
+      }),
+    ),
+  );
   it("marks providers with unknown current versions as unknown", () => {
     expect(
       createProviderVersionAdvisory({
 @@ -144,15 +169,17 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
         writeFileSync(packageToolPath, "#!/bin/sh\n");
         chmodSync(packageToolPath, 0o755);
-        expect(
+        const capabilities = yield* resolveProviderMaintenanceCapabilitiesEffect(
-          packageToolUpdate.resolve({
+          packageToolUpdate,
+          {
             binaryPath: "package-tool",
-            platform: "darwin",
             env: {
               PATH: vitePlusBinDir,
             },
-          }),
+          },
-        ).toEqual({
+        ).pipe(Effect.provideService(HostProcessPlatform, "darwin"));
+        expect(capabilities).toEqual({
           provider: driver("packageTool"),
           packageName: "@example/package-tool",
           update: {
 @@ -177,16 +204,18 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
         mkdirSync(bunBinDir, { recursive: true });
         writeFileSync(path.join(bunBinDir, "native-package-tool.exe"), "MZ");
-        expect(
+        const capabilities = yield* resolveProviderMaintenanceCapabilitiesEffect(
-          nativePackageToolUpdate.resolve({
+          nativePackageToolUpdate,
+          {
             binaryPath: "native-package-tool",
-            platform: "win32",
             env: {
               PATH: bunBinDir,
               PATHEXT: ".COM;.EXE;.BAT;.CMD",
             },
-          }),
+          },
-        ).toEqual({
+        ).pipe(Effect.provideService(HostProcessPlatform, "win32"));
+        expect(capabilities).toEqual({
           provider: driver("nativePackageTool"),
           packageName: "@example/native-package-tool",
           update: {
 @@ -213,15 +242,17 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
         writeFileSync(scopedPackageToolPath, "#!/bin/sh\n");
         chmodSync(scopedPackageToolPath, 0o755);
-        expect(
+        const capabilities = yield* resolveProviderMaintenanceCapabilitiesEffect(
-          scopedPackageToolUpdate.resolve({
+          scopedPackageToolUpdate,
+          {
             binaryPath: "scoped-package-tool",
-            platform: "darwin",
             env: {
               PATH: pnpmHomeDir,
             },
-          }),
+          },
-        ).toEqual({
+        ).pipe(Effect.provideService(HostProcessPlatform, "darwin"));
+        expect(capabilities).toEqual({
           provider: driver("scopedPackageTool"),
           packageName: "@example/scoped-package-tool",
           update: {
 @@ -241,7 +272,6 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
     expect(
       packageToolUpdate.resolve({
         binaryPath: "/opt/homebrew/bin/package-tool",
-        platform: "darwin",
         env: {
           PATH: "",
         },
 @@ -272,15 +302,17 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
         writeFileSync(nativePackageToolPath, "#!/bin/sh\n");
         chmodSync(nativePackageToolPath, 0o755);
-        expect(
+        const capabilities = yield* resolveProviderMaintenanceCapabilitiesEffect(
-          nativePackageToolUpdate.resolve({
+          nativePackageToolUpdate,
+          {
             binaryPath: "native-package-tool",
-            platform: "darwin",
             env: {
               PATH: nativeBinDir,
             },
-          }),
+          },
-        ).toEqual({
+        ).pipe(Effect.provideService(HostProcessPlatform, "darwin"));
+        expect(capabilities).toEqual({
           provider: driver("nativePackageTool"),
           packageName: "@example/native-package-tool",
           update: {
 @@ -307,15 +339,17 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
         writeFileSync(scopedPackageToolPath, "#!/bin/sh\n");
         chmodSync(scopedPackageToolPath, 0o755);
-        expect(
+        const capabilities = yield* resolveProviderMaintenanceCapabilitiesEffect(
-          scopedPackageToolUpdate.resolve({
+          scopedPackageToolUpdate,
+          {
             binaryPath: "scoped-package-tool",
-            platform: "darwin",
             env: {
               PATH: nativeBinDir,
             },
-          }),
+          },
-        ).toEqual({
+        ).pipe(Effect.provideService(HostProcessPlatform, "darwin"));
+        expect(capabilities).toEqual({
           provider: driver("scopedPackageTool"),
           packageName: "@example/scoped-package-tool",
           update: {
 @@ -335,7 +369,6 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
     expect(
       nativePackageToolUpdate.resolve({
         binaryPath: "/opt/homebrew/bin/native-package-tool",
-        platform: "darwin",
         env: {
           PATH: "",
         },
 @@ -359,7 +392,6 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
     expect(
       scopedPackageToolUpdate.resolve({
         binaryPath: "/opt/homebrew/bin/scoped-package-tool",
-        platform: "darwin",
         env: {
           PATH: "",
         },
 @@ -401,7 +433,6 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
       const capabilities = yield* resolveProviderMaintenanceCapabilitiesEffect(packageToolUpdate, {
         binaryPath: symlinkPath,
-        platform: "darwin",
         env: {
           PATH: "",
         },
 @@ -449,7 +480,6 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
       const capabilities = yield* resolveProviderMaintenanceCapabilitiesEffect(packageToolUpdate, {
         binaryPath: symlinkPath,
-        platform: "darwin",
         env: {
           PATH: "",
         },
 @@ -475,7 +505,6 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
     expect(
       packageToolUpdate.resolve({
         binaryPath: "C:\\Tools\\package-tool\\package-tool.exe",
-        platform: "win32",
         env: {
           PATH: "",
           PATHEXT: ".COM;.EXE;.BAT;.CMD",

apps/server/src/provider/providerMaintenance.ts+37-15

 @@ -5,6 +5,8 @@ import {
 } from "@t3tools/contracts";
 import { compareSemverVersions } from "@t3tools/shared/semver";
 import { resolveCommandPath } from "@t3tools/shared/shell";
+import * as Config from "effect/Config";
+import * as Context from "effect/Context";
 import * as DateTime from "effect/DateTime";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 @@ -16,6 +18,25 @@ const LATEST_VERSION_CACHE_TTL_MS = 60 * 60 * 1_000;
 const LATEST_VERSION_TIMEOUT_MS = 4_000;
 const PROVIDER_UPDATE_ACTION_TOAST_MESSAGE = "Install the update now or review provider settings.";
+const compactEnv = (input: Record<string, Option.Option<string>>): NodeJS.ProcessEnv =>
+  Object.fromEntries(
+    Object.entries(input).flatMap(([key, value]) =>
+      Option.match(value, {
+        onNone: () => [],
+        onSome: (resolved) => [[key, resolved]],
+      }),
+    ),
+  );
+const CommandLookupEnvConfig = Config.all({
+  PATH: Config.string("PATH").pipe(Config.option),
+  Path: Config.string("Path").pipe(Config.option),
+  path: Config.string("path").pipe(Config.option),
+  PATHEXT: Config.string("PATHEXT").pipe(Config.option),
+}).pipe(Config.map(compactEnv));
+const readCommandLookupEnv = CommandLookupEnvConfig.pipe(Effect.orElseSucceed(() => ({})));
 export interface ProviderMaintenanceCapabilities {
   readonly provider: ProviderDriverKind;
   readonly packageName: string | null;
 @@ -32,7 +53,7 @@ export interface ProviderMaintenanceCommandAction {
 export interface ProviderMaintenanceCapabilityResolutionOptions {
   readonly binaryPath?: string | null;
   readonly env?: NodeJS.ProcessEnv;
-  readonly platform?: NodeJS.Platform;
+  readonly resolvedCommandPath?: string | null;
   readonly realCommandPath?: string | null;
 }
 @@ -54,20 +75,21 @@ export interface PackageManagedProviderMaintenanceDefinition {
   } | null;
 }
-interface LatestVersionCacheEntry {
+export interface ProviderVersionCacheEntry {
   readonly expiresAt: number;
   readonly version: string | null;
 }
-const latestVersionCache = new Map<string, LatestVersionCacheEntry>();
+export const ProviderVersionCache = Context.Reference<Map<string, ProviderVersionCacheEntry>>(
+  "@t3tools/server/providerMaintenance/ProviderVersionCache",
+  {
+    defaultValue: () => new Map(),
+  },
+);
 const NpmLatestVersionResponse = Schema.Struct({
   version: Schema.optional(Schema.String),
 });
-export function clearLatestProviderVersionCacheForTests(): void {
-  latestVersionCache.clear();
-}
 function nonEmptyString(value: unknown): string | null {
   return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
 }
 @@ -251,10 +273,7 @@ export function resolvePackageManagedProviderMaintenance(
   }
   const resolvedCommandPath =
-    resolveCommandPath(binaryPath, {
+    options?.resolvedCommandPath ?? (hasPathSeparator(binaryPath) ? binaryPath : null);
-      ...(options?.platform ? { platform: options.platform } : {}),
-      ...(options?.env ? { env: options.env } : {}),
-    }) ?? (hasPathSeparator(binaryPath) ? binaryPath : null);
   if (resolvedCommandPath) {
     const commandPaths = [
 @@ -335,11 +354,11 @@ export const resolveProviderMaintenanceCapabilitiesEffect = Effect.fn(
     return resolver.resolve(options);
   }
+  const env = options?.env ?? (yield* readCommandLookupEnv);
   const resolvedCommandPath =
-    resolveCommandPath(binaryPath, {
+    (yield* resolveCommandPath(binaryPath, { env }).pipe(
-      ...(options?.platform ? { platform: options.platform } : {}),
+      Effect.catchTag("CommandResolutionError", () => Effect.succeed(null)),
-      ...(options?.env ? { env: options.env } : {}),
+    )) ?? (hasPathSeparator(binaryPath) ? binaryPath : null);
-    }) ?? (hasPathSeparator(binaryPath) ? binaryPath : null);
   if (!resolvedCommandPath) {
     return resolver.resolve(options);
   }
 @@ -350,6 +369,8 @@ export const resolveProviderMaintenanceCapabilitiesEffect = Effect.fn(
     .pipe(Effect.orElseSucceed(() => resolvedCommandPath));
   return resolver.resolve({
     ...options,
+    env,
+    resolvedCommandPath,
     realCommandPath,
   });
 });
 @@ -430,6 +451,7 @@ export const resolveLatestProviderVersion = Effect.fn("resolveLatestProviderVers
     return null;
   }
+  const latestVersionCache = yield* ProviderVersionCache;
   const cached = latestVersionCache.get(packageName);
   const now = DateTime.toEpochMillis(yield* DateTime.now);
   if (cached && cached.expiresAt > now) {

apps/server/src/provider/providerMaintenanceRunner.test.ts+8-7

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	import { afterEach, describe, it, assert } from "@effect/vitest";	1	import { describe, it, assert } from "@effect/vitest";
2	import {	2	import {
3	ProviderDriverKind,	3	ProviderDriverKind,
4	ProviderInstanceId,	4	ProviderInstanceId,
...	@@ -21,8 +21,8 @@ import { ChildProcessSpawner } from "effect/unstable/process";	...	@@ -21,8 +21,8 @@ import { ChildProcessSpawner } from "effect/unstable/process";
21	import { ProviderRegistry, type ProviderRegistryShape } from "./Services/ProviderRegistry.ts";	21	import { ProviderRegistry, type ProviderRegistryShape } from "./Services/ProviderRegistry.ts";
22	import * as ProviderMaintenanceRunner from "./providerMaintenanceRunner.ts";	22	import * as ProviderMaintenanceRunner from "./providerMaintenanceRunner.ts";
23	import {	23	import {
24	clearLatestProviderVersionCacheForTests,
25	makeProviderMaintenanceCapabilities,	24	makeProviderMaintenanceCapabilities,
		25	ProviderVersionCache,
26	type ProviderMaintenanceCapabilities,	26	type ProviderMaintenanceCapabilities,
27	} from "./providerMaintenance.ts";	27	} from "./providerMaintenance.ts";
28	const isServerProviderUpdateError = Schema.is(ServerProviderUpdateError);	28	const isServerProviderUpdateError = Schema.is(ServerProviderUpdateError);
...	@@ -35,10 +35,6 @@ const CURSOR_INSTANCE_ID = ProviderInstanceId.make("cursor");	...	@@ -35,10 +35,6 @@ const CURSOR_INSTANCE_ID = ProviderInstanceId.make("cursor");
35	const OPENCODE_INSTANCE_ID = ProviderInstanceId.make("opencode");	35	const OPENCODE_INSTANCE_ID = ProviderInstanceId.make("opencode");
36	const encoder = new TextEncoder();	36	const encoder = new TextEncoder();
37		37
38	afterEach(() => {
39	clearLatestProviderVersionCacheForTests();
40	});
41
42	function lifecycleFor(provider: ProviderDriverKind): ProviderMaintenanceCapabilities {	38	function lifecycleFor(provider: ProviderDriverKind): ProviderMaintenanceCapabilities {
43	if (provider === CURSOR_DRIVER) {	39	if (provider === CURSOR_DRIVER) {
44	return makeProviderMaintenanceCapabilities({	40	return makeProviderMaintenanceCapabilities({
...	@@ -202,7 +198,12 @@ const makeTestRunner = (registry: ProviderRegistryShape) =>	...	@@ -202,7 +198,12 @@ const makeTestRunner = (registry: ProviderRegistryShape) =>
202	Effect.service(ProviderMaintenanceRunner.ProviderMaintenanceRunner).pipe(	198	Effect.service(ProviderMaintenanceRunner.ProviderMaintenanceRunner).pipe(
203	Effect.provide(	199	Effect.provide(
204	ProviderMaintenanceRunner.layer.pipe(	200	ProviderMaintenanceRunner.layer.pipe(
205	Layer.provide(Layer.succeed(ProviderRegistry, registry)),	201	Layer.provide(
		202	Layer.mergeAll(
		203	Layer.succeed(ProviderRegistry, registry),
		204	Layer.succeed(ProviderVersionCache, new Map()),
		205	),
		206	),
206	),	207	),
207	),	208	),
208	);	209	);

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

...	@@ -75,7 +75,7 @@ export const spawnAndCollect = (binaryPath: string, command: ChildProcess.Comman	...	@@ -75,7 +75,7 @@ export const spawnAndCollect = (binaryPath: string, command: ChildProcess.Comman
75	);	75	);
76		76
77	const result: CommandResult = { stdout, stderr, code: exitCode };	77	const result: CommandResult = { stdout, stderr, code: exitCode };
78	if (isWindowsCommandNotFound(exitCode, stderr)) {	78	if (yield* isWindowsCommandNotFound(exitCode, stderr)) {
79	return yield* new ProviderCommandExecutionError({ message: `spawn ${binaryPath} ENOENT` });	79	return yield* new ProviderCommandExecutionError({ message: `spawn ${binaryPath} ENOENT` });
80	}	80	}
81	return result;	81	return result;

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

...	@@ -579,6 +579,7 @@ const buildAppUnderTest = (options?: {	...	@@ -579,6 +579,7 @@ const buildAppUnderTest = (options?: {
579	),	579	),
580	Layer.provide(	580	Layer.provide(
581	Layer.mock(ExternalLauncher.ExternalLauncher)({	581	Layer.mock(ExternalLauncher.ExternalLauncher)({
		582	resolveAvailableEditors: () => Effect.succeed([]),
582	...options?.layers?.externalLauncher,	583	...options?.layers?.externalLauncher,
583	}),	584	}),
584	),	585	),

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

...	@@ -365,7 +365,7 @@ export const makeServerLayer = Layer.unwrap(	...	@@ -365,7 +365,7 @@ export const makeServerLayer = Layer.unwrap(
365	Effect.gen(function* () {	365	Effect.gen(function* () {
366	const config = yield* ServerConfig;	366	const config = yield* ServerConfig;
367		367
368	fixPath();	368	yield* fixPath();
369		369
370	const httpListeningLayer = Layer.effectDiscard(	370	const httpListeningLayer = Layer.effectDiscard(
371	Effect.gen(function* () {	371	Effect.gen(function* () {

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

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	import { networkInterfaces } from "node:os";	1	import * as NodeOS from "node:os";
2		2
3	import { QrCode } from "@t3tools/shared/qrCode";	3	import { QrCode } from "@t3tools/shared/qrCode";
4	import * as Effect from "effect/Effect";	4	import * as Effect from "effect/Effect";
...	@@ -13,7 +13,7 @@ export interface HeadlessServeAccessInfo {	...	@@ -13,7 +13,7 @@ export interface HeadlessServeAccessInfo {
13	readonly pairingUrl: string;	13	readonly pairingUrl: string;
14	}	14	}
15		15
16	type NetworkInterfacesMap = ReturnType<typeof networkInterfaces>;	16	type NetworkInterfacesMap = ReturnType<typeof NodeOS.networkInterfaces>;
17		17
18	export const isLoopbackHost = (host: string \| undefined): boolean => {	18	export const isLoopbackHost = (host: string \| undefined): boolean => {
19	if (!host \|\| host.length === 0) {	19	if (!host \|\| host.length === 0) {
...	@@ -44,7 +44,7 @@ const isIpv6Family = (family: string \| number): boolean => family === "IPv6" \|\|	...	@@ -44,7 +44,7 @@ const isIpv6Family = (family: string \| number): boolean => family === "IPv6" \|\|
44		44
45	export const resolveHeadlessConnectionHost = (	45	export const resolveHeadlessConnectionHost = (
46	host: string \| undefined,	46	host: string \| undefined,
47	interfaces: NetworkInterfacesMap = networkInterfaces(),	47	interfaces: NetworkInterfacesMap = NodeOS.networkInterfaces(),
48	): string => {	48	): string => {
49	if (!host) {	49	if (!host) {
50	return "localhost";	50	return "localhost";
...	@@ -71,7 +71,7 @@ export const resolveHeadlessConnectionHost = (	...	@@ -71,7 +71,7 @@ export const resolveHeadlessConnectionHost = (
71	export const resolveHeadlessConnectionString = (	71	export const resolveHeadlessConnectionString = (
72	host: string \| undefined,	72	host: string \| undefined,
73	port: number,	73	port: number,
74	interfaces: NetworkInterfacesMap = networkInterfaces(),	74	interfaces: NetworkInterfacesMap = NodeOS.networkInterfaces(),
75	): string => {	75	): string => {
76	const connectionHost = resolveHeadlessConnectionHost(host, interfaces);	76	const connectionHost = resolveHeadlessConnectionHost(host, interfaces);
77	return `http://${formatHostForUrl(connectionHost)}:${port}`;	77	return `http://${formatHostForUrl(connectionHost)}:${port}`;

apps/server/src/telemetry/Identify.ts+4-3

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

 @@ -7,10 +7,12 @@
  * @module AnalyticsServiceLive
  */
+import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess";
 import * as Config from "effect/Config";
 import * as DateTime from "effect/DateTime";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
 import * as Ref from "effect/Ref";
 import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http";
 @@ -37,6 +39,7 @@ const TelemetryEnvConfig = Config.all({
   maxBufferedEvents: Config.number("T3CODE_TELEMETRY_MAX_BUFFERED_EVENTS").pipe(
     Config.withDefault(1_000),
   ),
+  wslDistroName: Config.string("WSL_DISTRO_NAME").pipe(Config.option),
 });
 const makeAnalyticsService = Effect.gen(function* () {
 @@ -46,6 +49,8 @@ const makeAnalyticsService = Effect.gen(function* () {
   const identifier = yield* getTelemetryIdentifier;
   const bufferRef = yield* Ref.make<ReadonlyArray<BufferedAnalyticsEvent>>([]);
   const clientType = serverConfig.mode === "desktop" ? "desktop-app" : "cli-web-client";
+  const hostPlatform = yield* HostProcessPlatform;
+  const hostArchitecture = yield* HostProcessArchitecture;
   const enqueueBufferedEvent = (event: string, properties?: Readonly<Record<string, unknown>>) =>
     Effect.flatMap(DateTime.now, (now) =>
 @@ -87,9 +92,9 @@ const makeAnalyticsService = Effect.gen(function* () {
         properties: {
           ...event.properties,
           $process_person_profile: false,
-          platform: process.platform,
+          platform: hostPlatform,
-          wsl: process.env.WSL_DISTRO_NAME,
+          wsl: Option.getOrUndefined(telemetryConfig.wslDistroName),
-          arch: process.arch,
+          arch: hostArchitecture,
           t3CodeVersion: packageJson.version,
           clientType,
         },

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

...	@@ -2,6 +2,7 @@	...	@@ -2,6 +2,7 @@
2		2
3	import * as Effect from "effect/Effect";	3	import * as Effect from "effect/Effect";
4	import * as Layer from "effect/Layer";	4	import * as Layer from "effect/Layer";
		5	import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
5	import { PtyAdapter } from "../Services/PTY.ts";	6	import { PtyAdapter } from "../Services/PTY.ts";
6	import type { PtyAdapterShape, PtyExitEvent, PtyProcess } from "../Services/PTY.ts";	7	import type { PtyAdapterShape, PtyExitEvent, PtyProcess } from "../Services/PTY.ts";
7		8
...	@@ -95,7 +96,8 @@ class BunPtyProcess implements PtyProcess {	...	@@ -95,7 +96,8 @@ class BunPtyProcess implements PtyProcess {
95	export const layer = Layer.effect(	96	export const layer = Layer.effect(
96	PtyAdapter,	97	PtyAdapter,
97	Effect.gen(function* () {	98	Effect.gen(function* () {
98	if (process.platform === "win32") {	99	const platform = yield* HostProcessPlatform;
		100	if (platform === "win32") {
99	return yield* Effect.die(	101	return yield* Effect.die(
100	"Bun PTY terminal support is unavailable on Windows. Please use Node.js (e.g. by running `npx t3`) instead.",	102	"Bun PTY terminal support is unavailable on Windows. Please use Node.js (e.g. by running `npx t3`) instead.",
101	);	103	);

apps/server/src/terminal/Layers/Manager.test.ts+36-56

 @@ -8,6 +8,7 @@ import {
   type TerminalOpenInput,
   type TerminalRestartInput,
 } from "@t3tools/contracts";
+import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
 import * as Data from "effect/Data";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 @@ -199,7 +200,6 @@ const multiTerminalHistoryLogPath = (
 interface CreateManagerOptions {
   shellResolver?: () => string;
-  platform?: NodeJS.Platform;
   env?: NodeJS.ProcessEnv;
   subprocessInspector?: (terminalPid: number) => Effect.Effect<{
     readonly hasRunningSubprocess: boolean;
 @@ -240,7 +240,6 @@ const createManager = (
         historyLineLimit,
         ptyAdapter,
         ...(options.shellResolver !== undefined ? { shellResolver: options.shellResolver } : {}),
-        ...(options.platform !== undefined ? { platform: options.platform } : {}),
         ...(options.env !== undefined ? { env: options.env } : {}),
         ...(options.subprocessInspector !== undefined
           ? { subprocessInspector: options.subprocessInspector }
 @@ -270,12 +269,13 @@ const createManager = (
     }),
   );
+const withHostPlatform = (platform: NodeJS.Platform) =>
+  Layer.succeed(HostProcessPlatform, platform);
 it.layer(
   Layer.merge(NodeServices.layer, ProcessRunner.layer.pipe(Layer.provide(NodeServices.layer))),
   { excludeTestServices: true },
 )("TerminalManager", (it) => {
-  const itEffectSkipOnWindows = process.platform === "win32" ? it.effect.skip : it.effect;
   it.effect("spawns lazily and reuses running terminal per thread", () =>
     Effect.gen(function* () {
       const { manager, ptyAdapter } = yield* createManager();
 @@ -415,8 +415,10 @@ it.layer(
       fs.writeFileString(filePath, contents),
     );
-  itEffectSkipOnWindows("preserves non-notFound cwd stat failures", () =>
+  it.effect("preserves non-notFound cwd stat failures", () =>
     Effect.gen(function* () {
+      if ((yield* HostProcessPlatform) === "win32") return;
       const path = yield* Path.Path;
       const { manager, baseDir } = yield* createManager();
 @@ -1082,10 +1084,9 @@ it.layer(
   it.effect("retries with fallback shells when preferred shell spawn fails", () =>
     Effect.gen(function* () {
+      const platform = yield* HostProcessPlatform;
       const missingShell =
-        process.platform === "win32"
+        platform === "win32" ? "C:\\definitely\\missing-shell.exe" : "/definitely/missing-shell -l";
-          ? "C:\\definitely\\missing-shell.exe"
-          : "/definitely/missing-shell -l";
       const { manager, ptyAdapter } = yield* createManager(5, {
         shellResolver: () => missingShell,
       });
 @@ -1096,10 +1097,10 @@ it.layer(
       assert.equal(snapshot.status, "running");
       expect(ptyAdapter.spawnInputs.length).toBeGreaterThanOrEqual(2);
       expect(ptyAdapter.spawnInputs[0]?.shell).toBe(
-        process.platform === "win32" ? missingShell : "/definitely/missing-shell",
+        platform === "win32" ? missingShell : "/definitely/missing-shell",
       );
-      if (process.platform === "win32") {
+      if (platform === "win32") {
         expect(
           ptyAdapter.spawnInputs.some(
             (input) =>
 @@ -1121,13 +1122,12 @@ it.layer(
   it.effect("prefers PowerShell over ComSpec for Windows terminals", () =>
     Effect.gen(function* () {
       const { manager, ptyAdapter } = yield* createManager(5, {
-        platform: "win32",
         env: {
           ComSpec: "C:\\Windows\\System32\\cmd.exe",
           PATH: "C:\\Windows\\System32",
           SystemRoot: "C:\\Windows",
         },
-      });
+      }).pipe(Effect.provide(withHostPlatform("win32")));
       yield* manager.open(openInput());
 @@ -1142,15 +1142,16 @@ it.layer(
   it.effect("falls back to built-in PowerShell by absolute path on Windows", () =>
     Effect.gen(function* () {
-      const { manager, ptyAdapter } = yield* createManager(5, {
+      const ptyAdapter = new FakePtyAdapter();
-        platform: "win32",
+      const { manager } = yield* createManager(5, {
+        ptyAdapter,
+        shellResolver: () => "C:\\missing\\custom-shell.exe",
         env: {
           ComSpec: "C:\\Windows\\System32\\cmd.exe",
           PATH: "C:\\Windows\\System32",
           SystemRoot: "C:\\Windows",
         },
-        shellResolver: () => "C:\\missing\\custom-shell.exe",
+      }).pipe(Effect.provide(withHostPlatform("win32")));
-      });
       ptyAdapter.spawnFailures.push(
         new Error("spawn custom-shell.exe ENOENT"),
         new Error("spawn pwsh.exe ENOENT"),
 @@ -1170,46 +1171,25 @@ it.layer(
   it.effect("filters app runtime env variables from terminal sessions", () =>
     Effect.gen(function* () {
-      const originalValues = new Map<string, string | undefined>();
+      const { manager, ptyAdapter } = yield* createManager(5, {
-      const setEnv = (key: string, value: string | undefined) => {
+        env: {
-        if (!originalValues.has(key)) {
+          PORT: "5173",
-          originalValues.set(key, process.env[key]);
+          T3CODE_PORT: "3773",
-        }
+          VITE_DEV_SERVER_URL: "http://localhost:5173",
-        if (value === undefined) {
+          TEST_TERMINAL_KEEP: "keep-me",
-          delete process.env[key];
+        },
-          return;
+      });
-        }
+      yield* manager.open(openInput());
-        process.env[key] = value;
+      const spawnInput = ptyAdapter.spawnInputs[0];
-      };
+      expect(spawnInput).toBeDefined();
-      const restoreEnv = () => {
+      if (!spawnInput) return;
-        for (const [key, value] of originalValues) {
-          if (value === undefined) {
-            delete process.env[key];
-          } else {
-            process.env[key] = value;
-          }
-        }
-      };
-      setEnv("PORT", "5173");
-      setEnv("T3CODE_PORT", "3773");
-      setEnv("VITE_DEV_SERVER_URL", "http://localhost:5173");
-      setEnv("TEST_TERMINAL_KEEP", "keep-me");
-      try {
+      expect(spawnInput.env.PORT).toBeUndefined();
-        const { manager, ptyAdapter } = yield* createManager();
+      expect(spawnInput.env.T3CODE_PORT).toBeUndefined();
-        yield* manager.open(openInput());
+      expect(spawnInput.env.VITE_DEV_SERVER_URL).toBeUndefined();
-        const spawnInput = ptyAdapter.spawnInputs[0];
+      // Arbitrary host env vars must pass through — terminals inherit the
-        expect(spawnInput).toBeDefined();
+      // user's environment apart from the explicit blocklist.
-        if (!spawnInput) return;
+      expect(spawnInput.env.TEST_TERMINAL_KEEP).toBe("keep-me");
-        expect(spawnInput.env.PORT).toBeUndefined();
-        expect(spawnInput.env.T3CODE_PORT).toBeUndefined();
-        expect(spawnInput.env.VITE_DEV_SERVER_URL).toBeUndefined();
-        expect(spawnInput.env.TEST_TERMINAL_KEEP).toBe("keep-me");
-      } finally {
-        restoreEnv();
-      }
     }),
   );
 @@ -1237,7 +1217,7 @@ it.layer(
   it.effect("starts zsh with prompt spacer disabled to avoid `%` end markers", () =>
     Effect.gen(function* () {
-      if (process.platform === "win32") return;
+      if ((yield* HostProcessPlatform) === "win32") return;
       const { manager, ptyAdapter } = yield* createManager(5, {
         shellResolver: () => "/bin/zsh",
       });

apps/server/src/terminal/Layers/Manager.ts+14-10

...	@@ -10,6 +10,7 @@ import {	...	@@ -10,6 +10,7 @@ import {
10	type TerminalSummary,	10	type TerminalSummary,
11	} from "@t3tools/contracts";	11	} from "@t3tools/contracts";
12	import { makeKeyedCoalescingWorker } from "@t3tools/shared/KeyedCoalescingWorker";	12	import { makeKeyedCoalescingWorker } from "@t3tools/shared/KeyedCoalescingWorker";
		13	import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
13	import { getTerminalLabel } from "@t3tools/shared/terminalLabels";	14	import { getTerminalLabel } from "@t3tools/shared/terminalLabels";
14	import * as DateTime from "effect/DateTime";	15	import * as DateTime from "effect/DateTime";
15	import * as Effect from "effect/Effect";	16	import * as Effect from "effect/Effect";
...	@@ -312,10 +313,7 @@ function enqueueProcessEvent(	...	@@ -312,10 +313,7 @@ function enqueueProcessEvent(
312	return true;	313	return true;
313	}	314	}
314		315
315	function defaultShellResolver(	316	function defaultShellResolver(platform: NodeJS.Platform, env: NodeJS.ProcessEnv): string {
316	platform: NodeJS.Platform = process.platform,
317	env: NodeJS.ProcessEnv = process.env,
318	): string {
319	if (platform === "win32") {	317	if (platform === "win32") {
320	return "pwsh.exe";	318	return "pwsh.exe";
321	}	319	}
...	@@ -324,7 +322,7 @@ function defaultShellResolver(	...	@@ -324,7 +322,7 @@ function defaultShellResolver(
324		322
325	function normalizeShellCommand(	323	function normalizeShellCommand(
326	value: string \| undefined,	324	value: string \| undefined,
327	platform: NodeJS.Platform = process.platform,	325	platform: NodeJS.Platform,
328	): string \| null {	326	): string \| null {
329	if (!value) return null;	327	if (!value) return null;
330	const trimmed = value.trim();	328	const trimmed = value.trim();
...	@@ -360,7 +358,7 @@ function joinWindowsPath(...parts: ReadonlyArray<string>): string {	...	@@ -360,7 +358,7 @@ function joinWindowsPath(...parts: ReadonlyArray<string>): string {
360		358
361	function shellCandidateFromCommand(	359	function shellCandidateFromCommand(
362	command: string \| null,	360	command: string \| null,
363	platform: NodeJS.Platform = process.platform,	361	platform: NodeJS.Platform,
364	): ShellCandidate \| null {	362	): ShellCandidate \| null {
365	if (!command \|\| command.length === 0) return null;	363	if (!command \|\| command.length === 0) return null;
366	const shellName = basenameForPlatform(command, platform).toLowerCase();	364	const shellName = basenameForPlatform(command, platform).toLowerCase();
...	@@ -411,8 +409,8 @@ function uniqueShellCandidates(candidates: Array<ShellCandidate \| null>): ShellC	...	@@ -411,8 +409,8 @@ function uniqueShellCandidates(candidates: Array<ShellCandidate \| null>): ShellC
411		409
412	function resolveShellCandidates(	410	function resolveShellCandidates(
413	shellResolver: () => string,	411	shellResolver: () => string,
414	platform: NodeJS.Platform = process.platform,	412	platform: NodeJS.Platform,
415	env: NodeJS.ProcessEnv = process.env,	413	env: NodeJS.ProcessEnv,
416	): ShellCandidate[] {	414	): ShellCandidate[] {
417	const requested = shellCandidateFromCommand(	415	const requested = shellCandidateFromCommand(
418	normalizeShellCommand(shellResolver(), platform),	416	normalizeShellCommand(shellResolver(), platform),
...	@@ -512,6 +510,9 @@ function windowsInspectSubprocess(	...	@@ -512,6 +510,9 @@ function windowsInspectSubprocess(
512	return Effect.gen(function* () {	510	return Effect.gen(function* () {
513	const processRunner = yield* ProcessRunner.ProcessRunner;	511	const processRunner = yield* ProcessRunner.ProcessRunner;
514	return yield* processRunner.run({	512	return yield* processRunner.run({
		513	// powershell.exe is a real executable — never spawn it through cmd.exe
		514	// shell mode, which would re-tokenize the `-Command` payload (pipes,
		515	// semicolons) before PowerShell ever sees it.
515	command: "powershell.exe",	516	command: "powershell.exe",
516	args: ["-NoProfile", "-NonInteractive", "-Command", command],	517	args: ["-NoProfile", "-NonInteractive", "-Command", command],
517	timeout: "1500 millis",	518	timeout: "1500 millis",
...	@@ -976,7 +977,6 @@ interface TerminalManagerOptions {	...	@@ -976,7 +977,6 @@ interface TerminalManagerOptions {
976	historyLineLimit?: number;	977	historyLineLimit?: number;
977	ptyAdapter: PtyAdapterShape;	978	ptyAdapter: PtyAdapterShape;
978	shellResolver?: () => string;	979	shellResolver?: () => string;
979	platform?: NodeJS.Platform;
980	env?: NodeJS.ProcessEnv;	980	env?: NodeJS.ProcessEnv;
981	subprocessInspector?: TerminalSubprocessInspector;	981	subprocessInspector?: TerminalSubprocessInspector;
982	subprocessPollIntervalMs?: number;	982	subprocessPollIntervalMs?: number;
...	@@ -1014,7 +1014,11 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith	...	@@ -1014,7 +1014,11 @@ export const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWith
1014		1014
1015	const logsDir = options.logsDir;	1015	const logsDir = options.logsDir;
1016	const historyLineLimit = options.historyLineLimit ?? DEFAULT_HISTORY_LINE_LIMIT;	1016	const historyLineLimit = options.historyLineLimit ?? DEFAULT_HISTORY_LINE_LIMIT;
1017	const platform = options.platform ?? process.platform;	1017	const platform = yield* HostProcessPlatform;
		1018	// Terminals must inherit the user's full environment (minus the blocklist
		1019	// applied in createTerminalSpawnEnv) — an allowlist here silently strips
		1020	// things like PSModulePath, DISPLAY, proxies, and toolchain variables.
		1021	// `options.env` is the test seam.
1018	const baseEnv = options.env ?? process.env;	1022	const baseEnv = options.env ?? process.env;
1019	const shellResolver = options.shellResolver ?? (() => defaultShellResolver(platform, baseEnv));	1023	const shellResolver = options.shellResolver ?? (() => defaultShellResolver(platform, baseEnv));
1020	const processRunner = yield* ProcessRunner.ProcessRunner;	1024	const processRunner = yield* ProcessRunner.ProcessRunner;

apps/server/src/terminal/Layers/NodePTY.test.ts+57-46

...	@@ -1,47 +1,58 @@	...	@@ -1,47 +1,58 @@
1	import * as FileSystem from "effect/FileSystem";
2	import * as Path from "effect/Path";
3	import * as Effect from "effect/Effect";
4	import { assert, it } from "@effect/vitest";
5
6	import { ensureNodePtySpawnHelperExecutable } from "./NodePTY.ts";
7	import * as NodeServices from "@effect/platform-node/NodeServices";	1	import * as NodeServices from "@effect/platform-node/NodeServices";
8		2	import { assert, it } from "@effect/vitest";
9	it.layer(NodeServices.layer)("ensureNodePtySpawnHelperExecutable", (it) => {	3	import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess";
10	it.effect("adds executable bits when helper exists but is not executable", () =>	4	import * as Effect from "effect/Effect";
11	Effect.gen(function* () {	5	import * as Layer from "effect/Layer";
12	if (process.platform === "win32") return;	6	import { vi } from "vite-plus/test";
13		7
14	const fs = yield* FileSystem.FileSystem;	8	import { PtyAdapter } from "../Services/PTY.ts";
15	const path = yield* Path.Path;	9	import { layer } from "./NodePTY.ts";
16		10
17	const dir = yield* fs.makeTempDirectoryScoped({ prefix: "pty-helper-test-" });	11	const spawn = vi.fn(() => ({
18	const helperPath = path.join(dir, "spawn-helper");	12	pid: 42,
19	yield* fs.writeFileString(helperPath, "#!/bin/sh\nexit 0\n");	13	write: vi.fn(),
20	yield* fs.chmod(helperPath, 0o644);	14	resize: vi.fn(),
21		15	kill: vi.fn(),
22	yield* ensureNodePtySpawnHelperExecutable(helperPath);	16	onData: vi.fn(() => ({ dispose: vi.fn() })),
23		17	onExit: vi.fn(() => ({ dispose: vi.fn() })),
24	const mode = (yield* fs.stat(helperPath)).mode & 0o777;	18	}));
25	assert.equal(mode & 0o111, 0o111);	19
26	}),	20	vi.mock("node-pty", () => ({ spawn }));
27	);	21
28		22	const testLayer = layer.pipe(
29	it.effect("keeps executable helper as executable", () =>	23	Layer.provide(
30	Effect.gen(function* () {	24	Layer.mergeAll(
31	if (process.platform === "win32") return;	25	NodeServices.layer,
32		26	Layer.succeed(HostProcessPlatform, "win32"),
33	const fs = yield* FileSystem.FileSystem;	27	Layer.succeed(HostProcessArchitecture, "x64"),
34	const path = yield* Path.Path;	28	),
35		29	),
36	const dir = yield* fs.makeTempDirectoryScoped({ prefix: "pty-helper-test-" });	30	);
37	const helperPath = path.join(dir, "spawn-helper");	31
38	yield* fs.writeFileString(helperPath, "#!/bin/sh\nexit 0\n");	32	it.effect("spawns through the public adapter with the provided host references", () =>
39	yield* fs.chmod(helperPath, 0o755);	33	Effect.gen(function* () {
40		34	const adapter = yield* PtyAdapter;
41	yield* ensureNodePtySpawnHelperExecutable(helperPath);	35	const process = yield* adapter.spawn({
42		36	shell: "powershell.exe",
43	const mode = (yield* fs.stat(helperPath)).mode & 0o777;	37	args: ["-NoLogo"],
44	assert.equal(mode & 0o111, 0o111);	38	cwd: "C:\\workspace",
45	}),	39	cols: 120,
46	);	40	rows: 40,
47	});	41	env: {},
		42	});
		43
		44	assert.equal(process.pid, 42);
		45	assert.equal(spawn.mock.calls.length, 1);
		46	assert.deepEqual(spawn.mock.calls[0], [
		47	"powershell.exe",
		48	["-NoLogo"],
		49	{
		50	cwd: "C:\\workspace",
		51	cols: 120,
		52	rows: 40,
		53	env: {},
		54	name: "xterm-color",
		55	},
		56	]);
		57	}).pipe(Effect.provide(testLayer)),
		58	);

apps/server/src/terminal/Layers/NodePTY.ts+15-9

 @@ -4,6 +4,7 @@ import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Path from "effect/Path";
+import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess";
 import { PtyAdapter } from "../Services/PTY.ts";
 import {
   PtySpawnError,
 @@ -18,13 +19,15 @@ const resolveNodePtySpawnHelperPath = Effect.gen(function* () {
   const requireForNodePty = createRequire(import.meta.url);
   const path = yield* Path.Path;
   const fs = yield* FileSystem.FileSystem;
+  const platform = yield* HostProcessPlatform;
+  const architecture = yield* HostProcessArchitecture;
   const packageJsonPath = requireForNodePty.resolve("node-pty/package.json");
   const packageDir = path.dirname(packageJsonPath);
   const candidates = [
     path.join(packageDir, "build", "Release", "spawn-helper"),
     path.join(packageDir, "build", "Debug", "spawn-helper"),
-    path.join(packageDir, "prebuilds", `${process.platform}-${process.arch}`, "spawn-helper"),
+    path.join(packageDir, "prebuilds", `${platform}-${architecture}`, "spawn-helper"),
   ];
   for (const candidate of candidates) {
 @@ -35,16 +38,15 @@ const resolveNodePtySpawnHelperPath = Effect.gen(function* () {
   return null;
 }).pipe(Effect.orElseSucceed(() => null));
-export const ensureNodePtySpawnHelperExecutable = Effect.fn(function* (explicitPath?: string) {
+const ensureNodePtySpawnHelperExecutable = Effect.fn(function* () {
   const fs = yield* FileSystem.FileSystem;
-  if (process.platform === "win32") return;
+  const platform = yield* HostProcessPlatform;
-  if (!explicitPath && didEnsureSpawnHelperExecutable) return;
+  if (platform === "win32") return;
+  if (didEnsureSpawnHelperExecutable) return;
-  const helperPath = explicitPath ?? (yield* resolveNodePtySpawnHelperPath);
+  const helperPath = yield* resolveNodePtySpawnHelperPath;
   if (!helperPath) return;
-  if (!explicitPath) {
+  didEnsureSpawnHelperExecutable = true;
-    didEnsureSpawnHelperExecutable = true;
-  }
   if (!(yield* fs.exists(helperPath))) {
     return;
 @@ -102,6 +104,8 @@ export const layer = Layer.effect(
   Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem;
     const path = yield* Path.Path;
+    const platform = yield* HostProcessPlatform;
+    const architecture = yield* HostProcessArchitecture;
     const nodePty = yield* Effect.promise(() => import("node-pty"));
 @@ -109,6 +113,8 @@ export const layer = Layer.effect(
       ensureNodePtySpawnHelperExecutable().pipe(
         Effect.provideService(FileSystem.FileSystem, fs),
         Effect.provideService(Path.Path, path),
+        Effect.provideService(HostProcessPlatform, platform),
+        Effect.provideService(HostProcessArchitecture, architecture),
         Effect.orElseSucceed(() => undefined),
       ),
     );
 @@ -123,7 +129,7 @@ export const layer = Layer.effect(
               cols: input.cols,
               rows: input.rows,
               env: input.env,
-              name: globalThis.process.platform === "win32" ? "xterm-color" : "xterm-256color",
+              name: platform === "win32" ? "xterm-color" : "xterm-256color",
             }),
           catch: (cause) =>
             new PtySpawnError({

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

 @@ -15,6 +15,7 @@ import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 import { type ClaudeSettings, type ModelSelection } from "@t3tools/contracts";
 import { sanitizeBranchFragment, sanitizeFeatureBranchName } from "@t3tools/shared/git";
+import { resolveSpawnCommand } from "@t3tools/shared/shell";
 import { TextGenerationError } from "@t3tools/contracts";
 import { type TextGenerationShape } from "./TextGeneration.ts";
 @@ -59,7 +60,7 @@ const decodeClaudeOutputEnvelope = Schema.decodeEffect(Schema.fromJsonString(Cla
 export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(function* (
   claudeSettings: ClaudeSettings,
-  environment: NodeJS.ProcessEnv = process.env,
+  environment?: NodeJS.ProcessEnv,
 ) {
   const commandSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
   const claudeEnvironment = yield* makeClaudeEnvironment(claudeSettings, environment);
 @@ -156,7 +157,7 @@ export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(fu
         : undefined;
     const runClaudeCommand = Effect.fn("runClaudeJson.runClaudeCommand")(function* () {
-      const command = ChildProcess.make(
+      const spawnCommand = yield* resolveSpawnCommand(
         claudeSettings.binaryPath || "claude",
         [
           "-p",
 @@ -170,15 +171,16 @@ export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(fu
           ...(settingsJson ? ["--settings", settingsJson] : []),
           "--dangerously-skip-permissions",
         ],
-        {
+        { env: claudeEnvironment },
-          env: claudeEnvironment,
-          cwd,
-          shell: process.platform === "win32",
-          stdin: {
-            stream: Stream.encodeText(Stream.make(prompt)),
-          },
-        },
       );
+      const command = ChildProcess.make(spawnCommand.command, spawnCommand.args, {
+        env: claudeEnvironment,
+        cwd,
+        shell: spawnCommand.shell,
+        stdin: {
+          stream: Stream.encodeText(Stream.make(prompt)),
+        },
+      });
       const child = yield* commandSpawner
         .spawn(command)

apps/server/src/textGeneration/CodexTextGeneration.ts+16-13

 @@ -9,6 +9,7 @@ import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 import { type CodexSettings, type ModelSelection } from "@t3tools/contracts";
 import { sanitizeBranchFragment, sanitizeFeatureBranchName } from "@t3tools/shared/git";
+import { resolveSpawnCommand } from "@t3tools/shared/shell";
 import { resolveAttachmentPath } from "../attachmentStore.ts";
 import { ServerConfig } from "../config.ts";
 @@ -44,12 +45,13 @@ const encodeJsonString = Schema.encodeEffect(Schema.UnknownFromJsonString);
  */
 export const makeCodexTextGeneration = Effect.fn("makeCodexTextGeneration")(function* (
   codexConfig: CodexSettings,
-  environment: NodeJS.ProcessEnv = process.env,
+  environment?: NodeJS.ProcessEnv,
 ) {
   const fileSystem = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
   const commandSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
   const serverConfig = yield* Effect.service(ServerConfig);
+  const resolvedEnvironment = environment ?? process.env;
   type MaterializedImageAttachments = {
     readonly imagePaths: ReadonlyArray<string>;
 @@ -180,7 +182,7 @@ export const makeCodexTextGeneration = Effect.fn("makeCodexTextGeneration")(func
         getModelSelectionStringOptionValue(modelSelection, "reasoningEffort") ??
         CODEX_GIT_TEXT_GENERATION_REASONING_EFFORT;
       const serviceTier = getCodexServiceTierOptionValue(modelSelection);
-      const command = ChildProcess.make(
+      const spawnCommand = yield* resolveSpawnCommand(
         codexConfig.binaryPath || "codex",
         [
           "exec",
 @@ -200,18 +202,19 @@ export const makeCodexTextGeneration = Effect.fn("makeCodexTextGeneration")(func
           ...imagePaths.flatMap((imagePath) => ["--image", imagePath]),
           "-",
         ],
-        {
+        { env: resolvedEnvironment },
-          env: {
-            ...environment,
-            ...(codexConfig.homePath ? { CODEX_HOME: expandHomePath(codexConfig.homePath) } : {}),
-          },
-          cwd,
-          shell: process.platform === "win32",
-          stdin: {
-            stream: Stream.encodeText(Stream.make(prompt)),
-          },
-        },
       );
+      const command = ChildProcess.make(spawnCommand.command, spawnCommand.args, {
+        env: {
+          ...resolvedEnvironment,
+          ...(codexConfig.homePath ? { CODEX_HOME: expandHomePath(codexConfig.homePath) } : {}),
+        },
+        cwd,
+        shell: spawnCommand.shell,
+        stdin: {
+          stream: Stream.encodeText(Stream.make(prompt)),
+        },
+      });
       const child = yield* commandSpawner
         .spawn(command)

apps/server/src/textGeneration/CursorTextGeneration.ts+3-2

apps/server/src/textGeneration/OpenCodeTextGeneration.ts+3-2

 @@ -99,10 +99,11 @@ interface SharedOpenCodeTextGenerationServerState {
 export const makeOpenCodeTextGeneration = Effect.fn("makeOpenCodeTextGeneration")(function* (
   openCodeSettings: OpenCodeSettings,
-  environment: NodeJS.ProcessEnv = process.env,
+  environment?: NodeJS.ProcessEnv,
 ) {
   const serverConfig = yield* ServerConfig;
   const openCodeRuntime = yield* OpenCodeRuntime;
+  const resolvedEnvironment = environment ?? process.env;
   const idleFiberScope = yield* Effect.acquireRelease(Scope.make(), (scope) =>
     Scope.close(scope, Exit.void),
   );
 @@ -208,7 +209,7 @@ export const makeOpenCodeTextGeneration = Effect.fn("makeOpenCodeTextGeneration"
                 openCodeRuntime
                   .startOpenCodeServerProcess({
                     binaryPath: input.binaryPath,
-                    environment,
+                    environment: resolvedEnvironment,
                   })
                   .pipe(
                     Effect.provideService(Scope.Scope, serverScope),

apps/server/src/workspace/Layers/WorkspaceEntries.test.ts+10-6

 @@ -10,6 +10,7 @@ import * as Path from "effect/Path";
 import * as PlatformError from "effect/PlatformError";
 import { ServerConfig } from "../../config.ts";
+import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
 import * as VcsDriverRegistry from "../../vcs/VcsDriverRegistry.ts";
 import * as VcsProcess from "../../vcs/VcsProcess.ts";
 import { WorkspaceEntries } from "../Services/WorkspaceEntries.ts";
 @@ -75,9 +76,11 @@ const searchWorkspaceEntries = (input: { cwd: string; query: string; limit: numb
   });
 const appendSeparator = (input: string) =>
-  input.endsWith("/") || input.endsWith("\\")
+  Effect.map(HostProcessPlatform, (platform) =>
-    ? input
+    input.endsWith("/") || input.endsWith("\\")
-    : `${input}${process.platform === "win32" ? "\\" : "/"}`;
+      ? input
+      : `${input}${platform === "win32" ? "\\" : "/"}`,
+  );
 it.layer(TestLayer)("WorkspaceEntriesLive", (it) => {
   afterEach(() => {
 @@ -344,12 +347,13 @@ it.layer(TestLayer)("WorkspaceEntriesLive", (it) => {
         const cwd = yield* makeTempDir({ prefix: "t3code-workspace-browse-hidden-" });
         yield* writeTextFile(cwd, ".config/settings.json", "{}");
         yield* writeTextFile(cwd, "config/settings.json", "{}");
+        const cwdWithSeparator = yield* appendSeparator(cwd);
         const directoryResult = yield* workspaceEntries.browse({
-          partialPath: appendSeparator(cwd),
+          partialPath: cwdWithSeparator,
         });
         const hiddenPrefixResult = yield* workspaceEntries.browse({
-          partialPath: `${appendSeparator(cwd)}.c`,
+          partialPath: `${cwdWithSeparator}.c`,
         });
         expect(directoryResult.entries.map((entry) => entry.name)).toEqual([".config", "config"]);
 @@ -402,7 +406,7 @@ it.layer(TestLayer)("WorkspaceEntriesLive", (it) => {
         vi.spyOn(fsPromises, "readdir").mockRejectedValueOnce(denied);
         const result = yield* workspaceEntries.browse({
-          partialPath: appendSeparator(cwd),
+          partialPath: yield* appendSeparator(cwd),
         });
         expect(result).toEqual({ parentPath: cwd, entries: [] });
       }),

apps/server/src/workspace/Layers/WorkspaceEntries.ts+6-4

...	@@ -1,5 +1,5 @@	...	@@ -1,5 +1,5 @@
1	// @effect-diagnostics nodeBuiltinImport:off	1	// @effect-diagnostics nodeBuiltinImport:off
2	import * as OS from "node:os";	2	import * as NodeOS from "node:os";
3	import fsPromises from "node:fs/promises";	3	import fsPromises from "node:fs/promises";
4	import type { Dirent } from "node:fs";	4	import type { Dirent } from "node:fs";
5		5
...	@@ -12,6 +12,7 @@ import * as Layer from "effect/Layer";	...	@@ -12,6 +12,7 @@ import * as Layer from "effect/Layer";
12	import * as Path from "effect/Path";	12	import * as Path from "effect/Path";
13		13
14	import { type FilesystemBrowseInput, type ProjectEntry } from "@t3tools/contracts";	14	import { type FilesystemBrowseInput, type ProjectEntry } from "@t3tools/contracts";
		15	import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
15	import { isExplicitRelativePath, isWindowsAbsolutePath } from "@t3tools/shared/path";	16	import { isExplicitRelativePath, isWindowsAbsolutePath } from "@t3tools/shared/path";
16	import {	17	import {
17	insertRankedSearchResult,	18	insertRankedSearchResult,
...	@@ -65,10 +66,10 @@ function toPosixPath(input: string): string {	...	@@ -65,10 +66,10 @@ function toPosixPath(input: string): string {
65		66
66	function expandHomePath(input: string, path: Path.Path): string {	67	function expandHomePath(input: string, path: Path.Path): string {
67	if (input === "~") {	68	if (input === "~") {
68	return OS.homedir();	69	return NodeOS.homedir();
69	}	70	}
70	if (input.startsWith("~/") \|\| input.startsWith("~\\")) {	71	if (input.startsWith("~/") \|\| input.startsWith("~\\")) {
71	return path.join(OS.homedir(), input.slice(2));	72	return path.join(NodeOS.homedir(), input.slice(2));
72	}	73	}
73	return input;	74	return input;
74	}	75	}
...	@@ -155,7 +156,8 @@ const resolveBrowseTarget = (	...	@@ -155,7 +156,8 @@ const resolveBrowseTarget = (
155	pathService: Path.Path,	156	pathService: Path.Path,
156	): Effect.Effect<string, WorkspaceEntriesBrowseError> =>	157	): Effect.Effect<string, WorkspaceEntriesBrowseError> =>
157	Effect.gen(function* () {	158	Effect.gen(function* () {
158	if (process.platform !== "win32" && isWindowsAbsolutePath(input.partialPath)) {	159	const platform = yield* HostProcessPlatform;
		160	if (platform !== "win32" && isWindowsAbsolutePath(input.partialPath)) {
159	return yield* new WorkspaceEntriesBrowseError({	161	return yield* new WorkspaceEntriesBrowseError({
160	cwd: input.cwd,	162	cwd: input.cwd,
161	partialPath: input.partialPath,	163	partialPath: input.partialPath,

apps/server/src/workspace/Layers/WorkspacePaths.ts+3-3

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	import * as OS from "node:os";	1	import * as NodeOS from "node:os";
2	import * as Effect from "effect/Effect";	2	import * as Effect from "effect/Effect";
3	import * as FileSystem from "effect/FileSystem";	3	import * as FileSystem from "effect/FileSystem";
4	import * as Layer from "effect/Layer";	4	import * as Layer from "effect/Layer";
...	@@ -19,10 +19,10 @@ function toPosixRelativePath(input: string): string {	...	@@ -19,10 +19,10 @@ function toPosixRelativePath(input: string): string {
19		19
20	function expandHomePath(input: string, path: Path.Path): string {	20	function expandHomePath(input: string, path: Path.Path): string {
21	if (input === "~") {	21	if (input === "~") {
22	return OS.homedir();	22	return NodeOS.homedir();
23	}	23	}
24	if (input.startsWith("~/") \|\| input.startsWith("~\\")) {	24	if (input.startsWith("~/") \|\| input.startsWith("~\\")) {
25	return path.join(OS.homedir(), input.slice(2));	25	return path.join(NodeOS.homedir(), input.slice(2));
26	}	26	}
27	return input;	27	return input;
28	}	28	}

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

...	@@ -761,7 +761,7 @@ const makeWsRpcLayer = (currentSession: AuthenticatedSession) =>	...	@@ -761,7 +761,7 @@ const makeWsRpcLayer = (currentSession: AuthenticatedSession) =>
761	keybindings: keybindingsConfig.keybindings,	761	keybindings: keybindingsConfig.keybindings,
762	issues: keybindingsConfig.issues,	762	issues: keybindingsConfig.issues,
763	providers,	763	providers,
764	availableEditors: ExternalLauncher.resolveAvailableEditors(),	764	availableEditors: yield* externalLauncher.resolveAvailableEditors(),
765	observability: {	765	observability: {
766	logsDirectoryPath: config.logsDir,	766	logsDirectoryPath: config.logsDir,
767	localTracingEnabled: true,	767	localTracingEnabled: true,

oxlint-plugin-t3code/index.ts+2

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	import { definePlugin } from "@oxlint/plugins";	1	import { definePlugin } from "@oxlint/plugins";
2		2
		3	import noGlobalProcessRuntime from "./rules/no-global-process-runtime.ts";
3	import noInlineSchemaCompile from "./rules/no-inline-schema-compile.ts";	4	import noInlineSchemaCompile from "./rules/no-inline-schema-compile.ts";
4	import noManualEffectRuntimeInTests from "./rules/no-manual-effect-runtime-in-tests.ts";	5	import noManualEffectRuntimeInTests from "./rules/no-manual-effect-runtime-in-tests.ts";
5		6
...	@@ -8,6 +9,7 @@ export default definePlugin({	...	@@ -8,6 +9,7 @@ export default definePlugin({
8	name: "t3code",	9	name: "t3code",
9	},	10	},
10	rules: {	11	rules: {
		12	"no-global-process-runtime": noGlobalProcessRuntime,
11	"no-inline-schema-compile": noInlineSchemaCompile,	13	"no-inline-schema-compile": noInlineSchemaCompile,
12	"no-manual-effect-runtime-in-tests": noManualEffectRuntimeInTests,	14	"no-manual-effect-runtime-in-tests": noManualEffectRuntimeInTests,
13	},	15	},

oxlint-plugin-t3code/rules/no-global-process-runtime.test.ts created+94

...	@@ -0,0 +1,94 @@
1	import { assert, describe } from "@effect/vitest";
2
3	import { createOxlintRuleHarness } from "../test/utils.ts";
4
5	const rule = createOxlintRuleHarness("t3code/no-global-process-runtime");
6
7	describe("t3code/no-global-process-runtime", () => {
8	rule.valid(
9	"allows injected host process references",
10	`
11	import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
12	import * as Effect from "effect/Effect";
13
14	export const isWindows = Effect.map(HostProcessPlatform, (platform) => platform === "win32");
15	`,
16	);
17
18	rule.valid(
19	"allows unrelated process members",
20	`
21	process.exitCode = 1;
22	const nodeEnv = process.env.NODE_ENV;
23	`,
24	);
25
26	rule.valid(
27	"allows unrelated node os imports",
28	`
29	import { tmpdir } from "node:os";
30
31	export const tempDirectory = tmpdir();
32	`,
33	);
34
35	rule.invalid(
36	"reports direct platform reads",
37	`
38	export const isWindows = process.platform === "win32";
39	`,
40	(output) => {
41	assert.match(output, /Use HostProcessPlatform/);
42	},
43	);
44
45	rule.invalid(
46	"reports direct architecture reads",
47	`
48	export const isArm = process.arch === "arm64";
49	`,
50	(output) => {
51	assert.match(output, /Use HostProcessArchitecture/);
52	},
53	);
54
55	rule.invalid(
56	"reports globalThis process platform reads",
57	`
58	export const terminalName = globalThis.process.platform === "win32" ? "xterm-color" : "xterm-256color";
59	`,
60	);
61
62	rule.invalid(
63	"reports node os namespace platform reads",
64	`
65	import * as NodeOS from "node:os";
66
67	export const isWindows = NodeOS.platform() === "win32";
68	`,
69	(output) => {
70	assert.match(output, /Use HostProcessPlatform/);
71	},
72	);
73
74	rule.invalid(
75	"reports renamed node os architecture imports",
76	`
77	import { arch as hostArch } from "node:os";
78
79	export const isArm = hostArch() === "arm64";
80	`,
81	(output) => {
82	assert.match(output, /Use HostProcessArchitecture/);
83	},
84	);
85
86	rule.invalid(
87	"reports default node os platform reads",
88	`
89	import os from "node:os";
90
91	export const isWindows = os.platform() === "win32";
92	`,
93	);
94	});

oxlint-plugin-t3code/rules/no-global-process-runtime.ts created+144

...	@@ -0,0 +1,144 @@
1	import { defineRule } from "@oxlint/plugins";
2	import * as Option from "effect/Option";
3
4	import { getPropertyName, isIdentifier, unwrapExpression } from "../utils.ts";
5
6	const RUNTIME_PROPERTIES = new Set(["platform", "arch"]);
7	const HOST_PROCESS_REFERENCE_FILE = "packages/shared/src/hostProcess.ts";
8	const NODE_OS_MODULES = new Set(["node:os", "os"]);
9
10	const normalizePath = (path: string) => path.replaceAll("\\", "/");
11
12	const toRepoPath = (filename: string, cwd: string) => {
13	const normalizedFilename = normalizePath(filename);
14	const normalizedCwd = normalizePath(cwd).replace(/\/+$/u, "");
15	const prefix = `${normalizedCwd}/`;
16	return normalizedFilename.startsWith(prefix)
17	? normalizedFilename.slice(prefix.length)
18	: normalizedFilename;
19	};
20
21	const isHostProcessReferenceFile = (filename: string, cwd: string) =>
22	toRepoPath(filename, cwd) === HOST_PROCESS_REFERENCE_FILE;
23
24	const isGlobalProcessObject = (node: unknown): boolean => {
25	const expression = unwrapExpression(node);
26	if (isIdentifier(expression, "process")) return true;
27	if (Option.isNone(expression) \|\| expression.value.type !== "MemberExpression") return false;
28
29	const object = unwrapExpression(expression.value.object);
30	const property = getPropertyName(expression.value.property);
31	return (
32	isIdentifier(object, "globalThis") && Option.isSome(property) && property.value === "process"
33	);
34	};
35
36	const message = (property: string) =>
37	`Use HostProcess${property === "arch" ? "Architecture" : "Platform"} instead of process.${property}; inject the runtime reference in Effect code and provide it explicitly in tests.`;
38
39	const getLiteralStringValue = (node: unknown): Option.Option<string> => {
40	if (typeof node !== "object" \|\| node === null) return Option.none();
41	if (!("type" in node) \|\| node.type !== "Literal") return Option.none();
42	if (!("value" in node) \|\| typeof node.value !== "string") return Option.none();
43	return Option.some(node.value);
44	};
45
46	export default defineRule({
47	meta: {
48	type: "problem",
49	docs: {
50	description:
51	"Disallow direct host runtime platform/architecture reads outside the shared host process references.",
52	},
53	},
54	createOnce(context) {
55	const nodeOsNamespaces = new Set<string>();
56	const nodeOsRuntimeImports = new Map<string, string>();
57
58	const resetBindings = () => {
59	nodeOsNamespaces.clear();
60	nodeOsRuntimeImports.clear();
61	};
62
63	const trackImportDeclaration = (node: unknown) => {
64	if (typeof node !== "object" \|\| node === null) return;
65	if (!("source" in node)) return;
66
67	const source = getLiteralStringValue(node.source);
68	if (Option.isNone(source) \|\| !NODE_OS_MODULES.has(source.value)) return;
69	if (!("specifiers" in node) \|\| !Array.isArray(node.specifiers)) return;
70
71	for (const specifier of node.specifiers) {
72	if (typeof specifier !== "object" \|\| specifier === null) continue;
73	if (!("local" in specifier)) continue;
74
75	const local = unwrapExpression(specifier.local);
76	if (Option.isNone(local) \|\| local.value.type !== "Identifier") continue;
77	const localName = local.value.name;
78
79	if (
80	specifier.type === "ImportNamespaceSpecifier" \|\|
81	specifier.type === "ImportDefaultSpecifier"
82	) {
83	nodeOsNamespaces.add(localName);
84	continue;
85	}
86
87	if (specifier.type !== "ImportSpecifier" \|\| !("imported" in specifier)) continue;
88
89	const imported = getPropertyName(specifier.imported);
90	if (Option.isSome(imported) && RUNTIME_PROPERTIES.has(imported.value)) {
91	nodeOsRuntimeImports.set(localName, imported.value);
92	}
93	}
94	};
95
96	const getNodeOsRuntimeCall = (callee: unknown): Option.Option<string> => {
97	const expression = unwrapExpression(callee);
98	if (Option.isNone(expression)) return Option.none();
99
100	if (expression.value.type === "Identifier") {
101	const property = nodeOsRuntimeImports.get(expression.value.name);
102	return property === undefined ? Option.none() : Option.some(property);
103	}
104
105	if (expression.value.type !== "MemberExpression") return Option.none();
106
107	const object = unwrapExpression(expression.value.object);
108	if (Option.isNone(object) \|\| object.value.type !== "Identifier") return Option.none();
109	if (!nodeOsNamespaces.has(object.value.name)) return Option.none();
110
111	return Option.filter(getPropertyName(expression.value.property), (property) =>
112	RUNTIME_PROPERTIES.has(property),
113	);
114	};
115
116	return {
117	before: resetBindings,
118	ImportDeclaration: trackImportDeclaration,
119	MemberExpression(node) {
120	if (isHostProcessReferenceFile(context.filename, context.cwd)) return;
121
122	const property = getPropertyName(node.property);
123	if (Option.isNone(property) \|\| !RUNTIME_PROPERTIES.has(property.value)) return;
124	if (!isGlobalProcessObject(node.object)) return;
125
126	context.report({
127	node,
128	message: message(property.value),
129	});
130	},
131	CallExpression(node) {
132	if (isHostProcessReferenceFile(context.filename, context.cwd)) return;
133
134	const property = getNodeOsRuntimeCall(node.callee);
135	if (Option.isNone(property)) return;
136
137	context.report({
138	node,
139	message: message(property.value),
140	});
141	},
142	};
143	},
144	});

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

...	@@ -11,7 +11,7 @@ const program = Effect.gen(function* () {	...	@@ -11,7 +11,7 @@ const program = Effect.gen(function* () {
11	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;	11	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
12	const command = ChildProcess.make("cursor-agent", ["acp"], {	12	const command = ChildProcess.make("cursor-agent", ["acp"], {
13	cwd: process.cwd(),	13	cwd: process.cwd(),
14	shell: process.platform === "win32",	14	shell: false,
15	});	15	});
16	const handle = yield* spawner.spawn(command);	16	const handle = yield* spawner.spawn(command);
17	const acpLayer = AcpClient.layerChildProcess(handle, {	17	const acpLayer = AcpClient.layerChildProcess(handle, {

packages/effect-codex-app-server/src/client.test.ts+6-41

...	@@ -17,13 +17,14 @@ const mockPeerPath = Effect.map(Effect.service(Path.Path), (path) =>	...	@@ -17,13 +17,14 @@ const mockPeerPath = Effect.map(Effect.service(Path.Path), (path) =>
17	const mockPeerArgs = (path: string) => [path];	17	const mockPeerArgs = (path: string) => [path];
18		18
19	it.layer(NodeServices.layer)("effect-codex-app-server client", (it) => {	19	it.layer(NodeServices.layer)("effect-codex-app-server client", (it) => {
20	const makeHandle = () =>	20	const makeHandle = (env?: Record<string, string>) =>
21	Effect.gen(function* () {	21	Effect.gen(function* () {
22	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;	22	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
23	const path = yield* Path.Path;	23	const path = yield* Path.Path;
24	const peerCwd = path.join(import.meta.dirname, "..");	24	const peerCwd = path.join(import.meta.dirname, "..");
25	const command = ChildProcess.make(process.execPath, mockPeerArgs(yield* mockPeerPath), {	25	const command = ChildProcess.make(process.execPath, mockPeerArgs(yield* mockPeerPath), {
26	cwd: peerCwd,	26	cwd: peerCwd,
		27	...(env ? { env: { ...process.env, ...env } } : {}),
27	});	28	});
28	return yield* spawner.spawn(command);	29	return yield* spawner.spawn(command);
29	});	30	});
...	@@ -122,49 +123,13 @@ it.layer(NodeServices.layer)("effect-codex-app-server client", (it) => {	...	@@ -122,49 +123,13 @@ it.layer(NodeServices.layer)("effect-codex-app-server client", (it) => {
122	]);	123	]);
123	}),	124	}),
124	);	125	);
125		126	it.effect("drains child stderr so large diagnostics cannot block protocol responses", () =>
126	it.effect("initializes a command-backed app-server client", () =>
127	Effect.gen(function* () {	127	Effect.gen(function* () {
128	const path = yield* Path.Path;	128	const handle = yield* makeHandle({
129	const scope = yield* Scope.make();	129	CODEX_APP_SERVER_TEST_STDERR_BYTES: String(512 * 1024),
130	const clientLayer = CodexClient.layerCommand({
131	command: "node",
132	args: mockPeerArgs(yield* mockPeerPath),
133	cwd: path.join(import.meta.dirname, ".."),
134	});	130	});
135	const context = yield* Layer.buildWithScope(clientLayer, scope);
136
137	const initialized = yield* Effect.gen(function* () {
138	const client = yield* CodexClient.CodexAppServerClient;
139	return yield* client.request("initialize", {
140	clientInfo: {
141	name: "effect-codex-app-server-test",
142	title: "Effect Codex App Server Test",
143	version: "0.0.0",
144	},
145	capabilities: {
146	experimentalApi: true,
147	optOutNotificationMethods: null,
148	},
149	});
150	}).pipe(Effect.provide(context), Effect.ensuring(Scope.close(scope, Exit.void)));
151
152	assert.equal(initialized.userAgent, "mock-codex-app-server");
153	}),
154	);
155
156	it.effect("drains command stderr so large diagnostics cannot block protocol responses", () =>
157	Effect.gen(function* () {
158	const path = yield* Path.Path;
159	const scope = yield* Scope.make();	131	const scope = yield* Scope.make();
160	const clientLayer = CodexClient.layerCommand({	132	const clientLayer = CodexClient.layerChildProcess(handle);
161	command: "node",
162	args: mockPeerArgs(yield* mockPeerPath),
163	cwd: path.join(import.meta.dirname, ".."),
164	env: {
165	CODEX_APP_SERVER_TEST_STDERR_BYTES: String(512 * 1024),
166	},
167	});
168	const context = yield* Layer.buildWithScope(clientLayer, scope);	133	const context = yield* Layer.buildWithScope(clientLayer, scope);
169		134
170	const initialized = yield* Effect.gen(function* () {	135	const initialized = yield* Effect.gen(function* () {

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

...	@@ -5,7 +5,7 @@ import * as Schema from "effect/Schema";	...	@@ -5,7 +5,7 @@ import * as Schema from "effect/Schema";
5	import * as Scope from "effect/Scope";	5	import * as Scope from "effect/Scope";
6	import * as Stdio from "effect/Stdio";	6	import * as Stdio from "effect/Stdio";
7	import * as Stream from "effect/Stream";	7	import * as Stream from "effect/Stream";
8	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";	8	import { ChildProcessSpawner } from "effect/unstable/process";
9		9
10	import * as CodexRpc from "./_generated/meta.gen.ts";	10	import * as CodexRpc from "./_generated/meta.gen.ts";
11	import * as CodexError from "./errors.ts";	11	import * as CodexError from "./errors.ts";
...	@@ -18,8 +18,6 @@ import {	...	@@ -18,8 +18,6 @@ import {
18	} from "./_internal/shared.ts";	18	} from "./_internal/shared.ts";
19	import { makeChildStdio, makeTerminationError } from "./_internal/stdio.ts";	19	import { makeChildStdio, makeTerminationError } from "./_internal/stdio.ts";
20		20
21	const DEFAULT_APP_SERVER_FORCE_KILL_AFTER = "2 seconds" as const;
22
23	export interface CodexAppServerClientOptions {	21	export interface CodexAppServerClientOptions {
24	readonly logIncoming?: boolean;	22	readonly logIncoming?: boolean;
25	readonly logOutgoing?: boolean;	23	readonly logOutgoing?: boolean;
...	@@ -263,39 +261,3 @@ const makeChildProcessClient = Effect.fn(	...	@@ -263,39 +261,3 @@ const makeChildProcessClient = Effect.fn(
263	yield* Stream.runDrain(handle.stderr).pipe(Effect.ignore, Effect.forkScoped);	261	yield* Stream.runDrain(handle.stderr).pipe(Effect.ignore, Effect.forkScoped);
264	return yield* make(makeChildStdio(handle), options, makeTerminationError(handle));	262	return yield* make(makeChildStdio(handle), options, makeTerminationError(handle));
265	});	263	});
266
267	export interface CodexAppServerCommandLayerOptions extends CodexAppServerClientOptions {
268	readonly command: string;
269	readonly args?: ReadonlyArray<string>;
270	readonly cwd?: string;
271	readonly env?: Record<string, string>;
272	}
273
274	export const layerCommand = (
275	options: CodexAppServerCommandLayerOptions,
276	): Layer.Layer<
277	CodexAppServerClient,
278	CodexError.CodexAppServerSpawnError,
279	ChildProcessSpawner.ChildProcessSpawner
280	> =>
281	Layer.effect(
282	CodexAppServerClient,
283	Effect.gen(function* () {
284	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
285	const command = ChildProcess.make(options.command, [...(options.args ?? [])], {
286	...(options.cwd ? { cwd: options.cwd } : {}),
287	...(options.env ? { env: { ...process.env, ...options.env } } : {}),
288	forceKillAfter: DEFAULT_APP_SERVER_FORCE_KILL_AFTER,
289	shell: process.platform === "win32",
290	});
291	return yield* spawner.spawn(command).pipe(
292	Effect.mapError(
293	(cause) =>
294	new CodexError.CodexAppServerSpawnError({
295	command: [options.command, ...(options.args ?? [])].join(" "),
296	cause,
297	}),
298	),
299	);
300	}).pipe(Effect.flatMap((handle) => makeChildProcessClient(handle, options))),
301	);

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

 @@ -1,5 +1,6 @@
 import * as Console from "effect/Console";
 import * as Effect from "effect/Effect";
+import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 @@ -7,10 +8,14 @@ import * as NodeServices from "@effect/platform-node/NodeServices";
 import * as CodexClient from "../../src/client.ts";
 const program = Effect.gen(function* () {
-  const codexLayer = CodexClient.layerCommand({
+  const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-    command: process.env.CODEX_BIN ?? "codex",
+  const handle = yield* spawner.spawn(
-    args: ["app-server"],
+    ChildProcess.make(process.env.CODEX_BIN ?? "codex", ["app-server"], {
-    cwd: process.cwd(),
+      cwd: process.cwd(),
+      shell: false,
+    }),
+  );
+  const codexLayer = CodexClient.layerChildProcess(handle, {
     logIncoming: true,
     logOutgoing: true,
   });

packages/effect-codex-app-server/test/fixtures/codex-app-server-mock-peer.ts+8-4

 @@ -1,3 +1,5 @@
+import * as NodeOS from "node:os";
 let nextServerRequestId = 10_000;
 let pendingSkillsListRequestId: number | string | null = null;
 let pendingUserInputRequestId: number | null = null;
 @@ -34,14 +36,16 @@ const handleMethod = (message: Record<string, unknown>) => {
   switch (method) {
     case "initialize": {
+      // oxlint-disable-next-line t3code/no-global-process-runtime -- Standalone mock peer process has no Effect runtime.
+      const platform = NodeOS.platform();
       const stderrBytes = Number(process.env.CODEX_APP_SERVER_TEST_STDERR_BYTES ?? 0);
       if (Number.isFinite(stderrBytes) && stderrBytes > 0) {
         process.stderr.write("x".repeat(stderrBytes), () => {
           respond(message.id as number | string, {
             userAgent: "mock-codex-app-server",
             codexHome: process.cwd(),
-            platformFamily: process.platform === "win32" ? "windows" : "unix",
+            platformFamily: platform === "win32" ? "windows" : "unix",
-            platformOs: process.platform === "darwin" ? "macos" : process.platform,
+            platformOs: platform === "darwin" ? "macos" : platform,
           });
         });
         return;
 @@ -49,8 +53,8 @@ const handleMethod = (message: Record<string, unknown>) => {
       respond(message.id as number | string, {
         userAgent: "mock-codex-app-server",
         codexHome: process.cwd(),
-        platformFamily: process.platform === "win32" ? "windows" : "unix",
+        platformFamily: platform === "win32" ? "windows" : "unix",
-        platformOs: process.platform === "darwin" ? "macos" : process.platform,
+        platformOs: platform === "darwin" ? "macos" : platform,
       });
       return;
     }

packages/shared/package.json+4

 @@ -154,6 +154,10 @@
     "./preview": {
       "types": "./src/preview.ts",
       "import": "./src/preview.ts"
+    },
+    "./hostProcess": {
+      "types": "./src/hostProcess.ts",
+      "import": "./src/hostProcess.ts"
     }
   },
   "scripts": {

packages/shared/src/hostProcess.ts created+33

...	@@ -0,0 +1,33 @@
1	import * as Context from "effect/Context";
2	import * as Effect from "effect/Effect";
3	import * as NodeOS from "node:os";
4
5	export const HostProcessPlatform = Context.Reference<NodeJS.Platform>(
6	"@t3tools/shared/hostProcess/HostProcessPlatform",
7	{
8	defaultValue: () => process.platform,
9	},
10	);
11
12	export const HostProcessArchitecture = Context.Reference<NodeJS.Architecture>(
13	"@t3tools/shared/hostProcess/HostProcessArchitecture",
14	{
15	defaultValue: () => process.arch,
16	},
17	);
18
19	export const HostProcessHostname = Context.Reference<string>(
20	"@t3tools/shared/hostProcess/HostProcessHostname",
21	{
22	defaultValue: () => NodeOS.hostname(),
23	},
24	);
25
26	export const HostProcessEnvironment = Context.Reference<NodeJS.ProcessEnv>(
27	"@t3tools/shared/hostProcess/HostProcessEnvironment",
28	{
29	defaultValue: () => process.env,
30	},
31	);
32
33	export const isHostWindows = Effect.map(HostProcessPlatform, (platform) => platform === "win32");

packages/shared/src/relayClient.test.ts+34-36

 @@ -10,15 +10,20 @@ import * as Sink from "effect/Sink";
 import * as Stream from "effect/Stream";
 import { HttpClient, HttpClientResponse } from "effect/unstable/http";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
+import { HostProcessArchitecture, HostProcessPlatform } from "./hostProcess.ts";
 import {
   RelayClientInstallError,
   CLOUDFLARED_VERSION,
   makeCloudflaredRelayClient,
-  resolveManagedCloudflaredPath,
 } from "./relayClient.ts";
-const emptyConfigProvider = () => ConfigProvider.fromEnv({ env: {} });
+const hostRuntimeLayer = (env: Record<string, string> = {}) =>
+  Layer.mergeAll(
+    Layer.succeed(HostProcessPlatform, "linux"),
+    Layer.succeed(HostProcessArchitecture, "x64"),
+    ConfigProvider.layer(ConfigProvider.fromEnv({ env })),
+  );
 function makeHandle(exitCode = 0) {
   return ChildProcessSpawner.makeHandle({
 @@ -69,18 +74,18 @@ describe("RelayClient", () => {
       yield* fileSystem.chmod(overridePath, 0o755);
       const manager = yield* makeCloudflaredRelayClient({
         baseDir,
-        platform: "linux",
-        arch: "x64",
-        configProvider: () =>
-          ConfigProvider.fromEnv({
-            env: {
-              PATH: "",
-              T3CODE_CLOUDFLARED_PATH: overridePath,
-            },
-          }),
       });
-      expect(yield* manager.resolve).toEqual({
+      expect(
+        yield* manager.resolve.pipe(
+          Effect.provideService(
+            ConfigProvider.ConfigProvider,
+            ConfigProvider.fromEnv({
+              env: { PATH: "", T3CODE_CLOUDFLARED_PATH: overridePath },
+            }),
+          ),
+        ),
+      ).toEqual({
         status: "available",
         executablePath: overridePath,
         source: "override",
 @@ -93,6 +98,7 @@ describe("RelayClient", () => {
           NodeServices.layer,
           makeHttpClientLayer(new Uint8Array()),
           makeSpawnerLayer([]),
+          hostRuntimeLayer(),
         ),
       ),
     ),
 @@ -107,14 +113,11 @@ describe("RelayClient", () => {
       const bytes = new TextEncoder().encode("test-cloudflared-binary");
       const manager = yield* makeCloudflaredRelayClient({
         baseDir,
-        platform: "linux",
-        arch: "x64",
         releaseAsset: {
           url: "https://example.test/cloudflared",
           sha256: Encoding.encodeHex(sha256(bytes)),
           archive: "binary",
         },
-        configProvider: emptyConfigProvider,
       });
       const progress: Array<string> = [];
 @@ -125,11 +128,7 @@ describe("RelayClient", () => {
           }
         }),
       );
-      const managedPath = resolveManagedCloudflaredPath({
+      const managedPath = `${baseDir}/tools/cloudflared/${CLOUDFLARED_VERSION}/linux-x64/cloudflared`;
-        baseDir,
-        platform: "linux",
-        arch: "x64",
-      });
       expect(installed).toEqual({
         status: "available",
         executablePath: managedPath,
 @@ -156,6 +155,7 @@ describe("RelayClient", () => {
           NodeServices.layer,
           makeHttpClientLayer(new TextEncoder().encode("test-cloudflared-binary")),
           makeSpawnerLayer([]),
+          hostRuntimeLayer(),
         ),
       ),
     ),
 @@ -169,14 +169,11 @@ describe("RelayClient", () => {
       });
       const manager = yield* makeCloudflaredRelayClient({
         baseDir,
-        platform: "linux",
-        arch: "x64",
         releaseAsset: {
           url: "https://example.test/cloudflared",
           sha256: Encoding.encodeHex(sha256(new TextEncoder().encode("expected"))),
           archive: "binary",
         },
-        configProvider: emptyConfigProvider,
       });
       const error = yield* manager.install.pipe(Effect.flip);
 @@ -189,6 +186,7 @@ describe("RelayClient", () => {
           NodeServices.layer,
           makeHttpClientLayer(new TextEncoder().encode("tampered")),
           makeSpawnerLayer([]),
+          hostRuntimeLayer(),
         ),
       ),
     ),
 @@ -204,14 +202,11 @@ describe("RelayClient", () => {
       });
       const manager = yield* makeCloudflaredRelayClient({
         baseDir,
-        platform: "linux",
-        arch: "x64",
         releaseAsset: {
           url: "https://example.test/cloudflared",
           sha256: Encoding.encodeHex(sha256(bytes)),
           archive: "binary",
         },
-        configProvider: emptyConfigProvider,
       });
       const [first, second] = yield* Effect.all([manager.install, manager.install], {
 @@ -222,25 +217,27 @@ describe("RelayClient", () => {
     }).pipe(
       Effect.scoped,
       Effect.provide(
-        Layer.mergeAll(NodeServices.layer, makeHttpClientLayer(bytes), makeSpawnerLayer(commands)),
+        Layer.mergeAll(
+          NodeServices.layer,
+          makeHttpClientLayer(bytes),
+          makeSpawnerLayer(commands),
+          hostRuntimeLayer(),
+        ),
       ),
     );
   });
-  it.effect("observes PATH changes after the manager has been constructed", () =>
+  it.effect("observes PATH changes after the manager has been constructed", () => {
-    Effect.gen(function* () {
+    const env = { PATH: "" };
+    return Effect.gen(function* () {
       const fileSystem = yield* FileSystem.FileSystem;
       const baseDir = yield* fileSystem.makeTempDirectoryScoped({
         prefix: "t3-cloudflared-test-",
       });
       const binDir = `${baseDir}/bin`;
       const executablePath = `${binDir}/cloudflared`;
-      let path = "";
       const manager = yield* makeCloudflaredRelayClient({
         baseDir,
-        platform: "linux",
-        arch: "x64",
-        configProvider: () => ConfigProvider.fromEnv({ env: { PATH: path } }),
       });
       expect(yield* manager.resolve).toEqual({
 @@ -251,7 +248,7 @@ describe("RelayClient", () => {
       yield* fileSystem.makeDirectory(binDir);
       yield* fileSystem.writeFileString(executablePath, "cloudflared");
       yield* fileSystem.chmod(executablePath, 0o755);
-      path = binDir;
+      env.PATH = binDir;
       expect(yield* manager.resolve).toEqual({
         status: "available",
 @@ -266,8 +263,9 @@ describe("RelayClient", () => {
           NodeServices.layer,
           makeHttpClientLayer(new Uint8Array()),
           makeSpawnerLayer([]),
+          hostRuntimeLayer(env),
         ),
       ),
-    ),
+    );
-  );
+  });
 });

packages/shared/src/relayClient.ts+4-30

 @@ -4,7 +4,6 @@ import type {
   RelayClientInstallProgressStage,
 } from "@t3tools/contracts";
 import * as Config from "effect/Config";
-import * as ConfigProvider from "effect/ConfigProvider";
 import * as Context from "effect/Context";
 import * as Crypto from "effect/Crypto";
 import * as Data from "effect/Data";
 @@ -18,6 +17,7 @@ import * as PlatformError from "effect/PlatformError";
 import * as Semaphore from "effect/Semaphore";
 import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
+import { HostProcessArchitecture, HostProcessPlatform } from "./hostProcess.ts";
 export const CLOUDFLARED_VERSION = "2026.5.2";
 export const CLOUDFLARED_PATH_ENV_NAME = "T3CODE_CLOUDFLARED_PATH";
 @@ -120,10 +120,7 @@ const CloudflaredConfig = Config.all({
 export interface CloudflaredRelayClientOptions {
   readonly baseDir: string;
-  readonly platform?: NodeJS.Platform;
-  readonly arch?: string;
   readonly releaseAsset?: CloudflaredReleaseAsset;
-  readonly configProvider?: () => ConfigProvider.ConfigProvider;
 }
 export interface RelayClientShape {
 @@ -142,22 +139,6 @@ function executableFileName(platform: NodeJS.Platform): string {
   return platform === "win32" ? "cloudflared.exe" : "cloudflared";
 }
-export function resolveManagedCloudflaredPath(input: {
-  readonly baseDir: string;
-  readonly platform: NodeJS.Platform;
-  readonly arch: string;
-}): string {
-  const separator = input.platform === "win32" ? "\\" : "/";
-  return [
-    input.baseDir.replace(/[\\/]+$/u, ""),
-    "tools",
-    "cloudflared",
-    CLOUDFLARED_VERSION,
-    `${input.platform}-${input.arch}`,
-    executableFileName(input.platform),
-  ].join(separator);
-}
 function resolveReleaseAsset(
   platform: NodeJS.Platform,
   arch: string,
 @@ -205,17 +186,10 @@ export const makeCloudflaredRelayClient = Effect.fn("cloudflared.make")(function
   const path = yield* Path.Path;
   const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
   const installSemaphore = yield* Semaphore.make(1);
-  const platform = options.platform ?? process.platform;
+  const platform = yield* HostProcessPlatform;
-  const arch = options.arch ?? process.arch;
+  const arch = yield* HostProcessArchitecture;
   const releaseAsset = options.releaseAsset ?? resolveReleaseAsset(platform, arch);
-  const loadCloudflaredConfig = Effect.suspend(() =>
+  const loadCloudflaredConfig = Effect.suspend(() => CloudflaredConfig).pipe(Effect.orDie);
-    CloudflaredConfig.pipe(
-      Effect.provideService(
-        ConfigProvider.ConfigProvider,
-        options.configProvider?.() ?? ConfigProvider.fromEnv(),
-      ),
-    ),
-  ).pipe(Effect.orDie);
   const managedPath = path.join(
     options.baseDir,
     "tools",

packages/shared/src/shell.test.ts+237-131

...	@@ -1,7 +1,13 @@	...	@@ -1,7 +1,13 @@
		1	import * as NodeServices from "@effect/platform-node/NodeServices";
		2	import { it as effectIt } from "@effect/vitest";
		3	import { HostProcessEnvironment, HostProcessPlatform } from "@t3tools/shared/hostProcess";
		4	import * as Effect from "effect/Effect";
1	import { describe, expect, it, vi } from "vite-plus/test";	5	import { describe, expect, it, vi } from "vite-plus/test";
2		6
3	import {	7	import {
4	extractPathFromShellOutput,	8	extractPathFromShellOutput,
		9	CommandAvailability,
		10	type CommandAvailabilityChecker,
5	isCommandAvailable,	11	isCommandAvailable,
6	listLoginShellCandidates,	12	listLoginShellCandidates,
7	mergePathEntries,	13	mergePathEntries,
...	@@ -12,9 +18,23 @@ import {	...	@@ -12,9 +18,23 @@ import {
12	readPathFromLoginShell,	18	readPathFromLoginShell,
13	resolveCommandPath,	19	resolveCommandPath,
14	resolveKnownWindowsCliDirs,	20	resolveKnownWindowsCliDirs,
		21	resolveSpawnCommand,
15	resolveWindowsEnvironment,	22	resolveWindowsEnvironment,
		23	SpawnExecutableResolution,
		24	WindowsShellEnvironment,
		25	type WindowsShellEnvironmentReader,
16	} from "./shell.ts";	26	} from "./shell.ts";
17		27
		28	const withWindowsEnvironmentMocks = <A, E, R>(
		29	effect: Effect.Effect<A, E, R>,
		30	readEnvironment: WindowsShellEnvironmentReader,
		31	commandAvailable: CommandAvailabilityChecker,
		32	) =>
		33	effect.pipe(
		34	Effect.provideService(WindowsShellEnvironment, readEnvironment),
		35	Effect.provideService(CommandAvailability, commandAvailable),
		36	);
		37
18	describe("extractPathFromShellOutput", () => {	38	describe("extractPathFromShellOutput", () => {
19	it("extracts the path between capture markers", () => {	39	it("extracts the path between capture markers", () => {
20	expect(	40	expect(
...	@@ -322,149 +342,235 @@ describe("resolveKnownWindowsCliDirs", () => {	...	@@ -322,149 +342,235 @@ describe("resolveKnownWindowsCliDirs", () => {
322	});	342	});
323	});	343	});
324		344
325	describe("isCommandAvailable", () => {	345	effectIt.layer(NodeServices.layer)("isCommandAvailable", (it) => {
326	it("returns false when PATH is empty", () => {	346	it.effect("returns false when PATH is empty", () =>
327	expect(	347	Effect.gen(function* () {
328	isCommandAvailable("definitely-not-installed", {	348	expect(
329	platform: "win32",	349	yield* isCommandAvailable("definitely-not-installed", {
330	env: { PATH: "", PATHEXT: ".COM;.EXE;.BAT;.CMD" },	350	env: { PATH: "", PATHEXT: ".COM;.EXE;.BAT;.CMD" },
331	}),	351	}).pipe(Effect.provideService(HostProcessPlatform, "win32")),
332	).toBe(false);	352	).toBe(false);
333	});	353	}),
		354	);
334	});	355	});
335		356
336	describe("resolveCommandPath", () => {	357	effectIt.layer(NodeServices.layer)("resolveCommandPath", (it) => {
337	it("returns the first executable resolved from PATH", () => {	358	it.effect("fails when PATH is empty", () =>
338	expect(	359	Effect.gen(function* () {
339	resolveCommandPath("definitely-not-installed", {	360	const result = yield* resolveCommandPath("definitely-not-installed", {
340	platform: "win32",
341	env: { PATH: "", PATHEXT: ".COM;.EXE;.BAT;.CMD" },	361	env: { PATH: "", PATHEXT: ".COM;.EXE;.BAT;.CMD" },
342	}),	362	}).pipe(Effect.provideService(HostProcessPlatform, "win32"), Effect.result);
343	).toBeNull();	363
344	});	364	expect(result._tag).toBe("Failure");
		365	}),
		366	);
345	});	367	});
346		368
347	describe("resolveWindowsEnvironment", () => {	369	effectIt.layer(NodeServices.layer)("resolveSpawnCommand", (it) => {
348	it("returns the baseline no-profile PATH patch when node is already available", () => {	370	it.effect("runs Windows executables directly without a shell", () =>
349	const readEnvironment = vi.fn(	371	Effect.gen(function* () {
350	(_names: ReadonlyArray<string>, options?: { loadProfile?: boolean }) =>	372	const command = yield* resolveSpawnCommand("node.exe", ["script.js", "hello & goodbye"], {
351	options?.loadProfile	373	env: { PATH: "", PATHEXT: ".COM;.EXE;.BAT;.CMD" },
352	? { PATH: "C:\\Profile\\Bin" }	374	}).pipe(Effect.provideService(HostProcessPlatform, "win32"));
353	: { PATH: "C:\\Shell\\Bin;C:\\Windows\\System32" },	375
354	);	376	expect(command).toEqual({
355	const commandAvailable = vi.fn(() => true);	377	command: "node.exe",
		378	args: ["script.js", "hello & goodbye"],
		379	shell: false,
		380	});
		381	}),
		382	);
		383
		384	it.effect("escapes the executable and arguments for Windows command shims", () =>
		385	Effect.gen(function* () {
		386	const command = yield* resolveSpawnCommand(
		387	"vp",
		388	["run", "value & calc", "%PATH%", 'quote"value'],
		389	{ env: { PATH: "", PATHEXT: ".COM;.EXE;.BAT;.CMD" } },
		390	).pipe(
		391	Effect.provideService(HostProcessPlatform, "win32"),
		392	Effect.provideService(
		393	SpawnExecutableResolution,
		394	() => "C:\\Program Files\\npm & tools\\vp.cmd",
		395	),
		396	);
		397
		398	expect(command.shell).toBe(true);
		399	expect(command.command).not.toContain(" & ");
		400	expect(command.command).toContain("^&");
		401	expect(command.args).toEqual([
		402	'^"run^"',
		403	'^"value^ ^&^ calc^"',
		404	'^"^%PATH^%^"',
		405	'^"quote\\^"value^"',
		406	]);
		407	}),
		408	);
		409
		410	it.effect("resolves against the effective environment when extending host env", () =>
		411	Effect.gen(function* () {
		412	let resolvedEnvironment: NodeJS.ProcessEnv \| undefined;
		413	yield* resolveSpawnCommand("codex", ["app-server"], {
		414	env: { CODEX_HOME: "C:\\Users\\tester\\.codex" },
		415	extendEnv: true,
		416	}).pipe(
		417	Effect.provideService(HostProcessPlatform, "win32"),
		418	Effect.provideService(HostProcessEnvironment, {
		419	PATH: "C:\\Users\\tester\\AppData\\Roaming\\npm",
		420	PATHEXT: ".COM;.EXE;.BAT;.CMD",
		421	}),
		422	Effect.provideService(SpawnExecutableResolution, (_command, _platform, env) => {
		423	resolvedEnvironment = env;
		424	return "C:\\Users\\tester\\AppData\\Roaming\\npm\\codex.cmd";
		425	}),
		426	);
		427
		428	expect(resolvedEnvironment).toEqual({
		429	PATH: "C:\\Users\\tester\\AppData\\Roaming\\npm",
		430	PATHEXT: ".COM;.EXE;.BAT;.CMD",
		431	CODEX_HOME: "C:\\Users\\tester\\.codex",
		432	});
		433	}),
		434	);
		435
		436	it.effect("does not fall back to a shell for unresolved Windows commands", () =>
		437	Effect.gen(function* () {
		438	const command = yield* resolveSpawnCommand("missing & calc", ["unsafe & value"], {
		439	env: { PATH: "", PATHEXT: ".COM;.EXE;.BAT;.CMD" },
		440	}).pipe(Effect.provideService(HostProcessPlatform, "win32"));
		441
		442	expect(command).toEqual({
		443	command: "missing & calc",
		444	args: ["unsafe & value"],
		445	shell: false,
		446	});
		447	}),
		448	);
		449	});
356		450
357	expect(	451	effectIt.layer(NodeServices.layer)("resolveWindowsEnvironment", (it) => {
358	resolveWindowsEnvironment(	452	it.effect("returns the baseline no-profile PATH patch when node is already available", () =>
359	{	453	Effect.gen(function* () {
360	PATH: "C:\\Windows\\System32",	454	const readEnvironment = vi.fn(
361	APPDATA: "C:\\Users\\testuser\\AppData\\Roaming",	455	(_names: ReadonlyArray<string>, options?: { loadProfile?: boolean }) =>
362	LOCALAPPDATA: "C:\\Users\\testuser\\AppData\\Local",	456	options?.loadProfile
363	USERPROFILE: "C:\\Users\\testuser",	457	? { PATH: "C:\\Profile\\Bin" }
364	},	458	: { PATH: "C:\\Shell\\Bin;C:\\Windows\\System32" },
365	{	459	);
		460	const commandAvailable = vi.fn(() => Effect.succeed(true));
		461
		462	expect(
		463	yield* withWindowsEnvironmentMocks(
		464	resolveWindowsEnvironment({
		465	PATH: "C:\\Windows\\System32",
		466	APPDATA: "C:\\Users\\testuser\\AppData\\Roaming",
		467	LOCALAPPDATA: "C:\\Users\\testuser\\AppData\\Local",
		468	USERPROFILE: "C:\\Users\\testuser",
		469	}),
366	readEnvironment,	470	readEnvironment,
367	commandAvailable,	471	commandAvailable,
368	},	472	),
369	),	473	).toEqual({
370	).toEqual({	474	PATH: [
371	PATH: [	475	"C:\\Users\\testuser\\AppData\\Roaming\\npm",
372	"C:\\Users\\testuser\\AppData\\Roaming\\npm",	476	"C:\\Users\\testuser\\AppData\\Local\\Programs\\nodejs",
373	"C:\\Users\\testuser\\AppData\\Local\\Programs\\nodejs",	477	"C:\\Users\\testuser\\AppData\\Local\\Volta\\bin",
374	"C:\\Users\\testuser\\AppData\\Local\\Volta\\bin",	478	"C:\\Users\\testuser\\AppData\\Local\\pnpm",
375	"C:\\Users\\testuser\\AppData\\Local\\pnpm",	479	"C:\\Users\\testuser\\.bun\\bin",
376	"C:\\Users\\testuser\\.bun\\bin",	480	"C:\\Users\\testuser\\scoop\\shims",
377	"C:\\Users\\testuser\\scoop\\shims",	481	"C:\\Shell\\Bin",
378	"C:\\Shell\\Bin",	482	"C:\\Windows\\System32",
379	"C:\\Windows\\System32",	483	].join(";"),
380	].join(";"),	484	});
381	});	485	expect(readEnvironment).toHaveBeenCalledTimes(1);
382	expect(readEnvironment).toHaveBeenCalledTimes(1);	486	expect(readEnvironment).toHaveBeenCalledWith(["PATH"], { loadProfile: false });
383	expect(readEnvironment).toHaveBeenCalledWith(["PATH"], { loadProfile: false });	487	expect(commandAvailable).toHaveBeenCalledWith(
384	expect(commandAvailable).toHaveBeenCalledWith(	488	"node",
385	"node",	489	expect.objectContaining({ env: expect.any(Object) }),
386	expect.objectContaining({	490	);
387	platform: "win32",	491	}),
388	}),	492	);
389	);	493
390	});	494	it.effect("loads the PowerShell profile when baseline env cannot resolve node", () =>
391		495	Effect.gen(function* () {
392	it("loads the PowerShell profile when baseline env cannot resolve node", () => {	496	const readEnvironment = vi.fn(
393	const readEnvironment = vi.fn(	497	(_names: ReadonlyArray<string>, options?: { loadProfile?: boolean }) =>
394	(_names: ReadonlyArray<string>, options?: { loadProfile?: boolean }) =>	498	options?.loadProfile
395	options?.loadProfile	499	? {
396	? {	500	PATH: "C:\\Profile\\Node;C:\\Windows\\System32",
397	PATH: "C:\\Profile\\Node;C:\\Windows\\System32",	501	FNM_DIR: "C:\\Users\\testuser\\AppData\\Roaming\\fnm",
398	FNM_DIR: "C:\\Users\\testuser\\AppData\\Roaming\\fnm",	502	FNM_MULTISHELL_PATH: "C:\\Users\\testuser\\AppData\\Local\\fnm_multishells\\123",
399	FNM_MULTISHELL_PATH: "C:\\Users\\testuser\\AppData\\Local\\fnm_multishells\\123",	503	}
400	}	504	: { PATH: "C:\\Shell\\Bin;C:\\Windows\\System32" },
401	: { PATH: "C:\\Shell\\Bin;C:\\Windows\\System32" },	505	);
402	);	506	const commandAvailable = vi.fn(() => Effect.succeed(false));
403	const commandAvailable = vi.fn(() => false);	507
404		508	expect(
405	expect(	509	yield* withWindowsEnvironmentMocks(
406	resolveWindowsEnvironment(	510	resolveWindowsEnvironment({
407	{	511	PATH: "C:\\Windows\\System32",
408	PATH: "C:\\Windows\\System32",	512	APPDATA: "C:\\Users\\testuser\\AppData\\Roaming",
409	APPDATA: "C:\\Users\\testuser\\AppData\\Roaming",	513	LOCALAPPDATA: "C:\\Users\\testuser\\AppData\\Local",
410	LOCALAPPDATA: "C:\\Users\\testuser\\AppData\\Local",	514	USERPROFILE: "C:\\Users\\testuser",
411	USERPROFILE: "C:\\Users\\testuser",	515	}),
412	},
413	{
414	readEnvironment,	516	readEnvironment,
415	commandAvailable,	517	commandAvailable,
416	},	518	),
417	),	519	).toEqual({
418	).toEqual({	520	PATH: [
419	PATH: [	521	"C:\\Profile\\Node",
420	"C:\\Profile\\Node",	522	"C:\\Windows\\System32",
421	"C:\\Windows\\System32",	523	"C:\\Users\\testuser\\AppData\\Roaming\\npm",
422	"C:\\Users\\testuser\\AppData\\Roaming\\npm",	524	"C:\\Users\\testuser\\AppData\\Local\\Programs\\nodejs",
423	"C:\\Users\\testuser\\AppData\\Local\\Programs\\nodejs",	525	"C:\\Users\\testuser\\AppData\\Local\\Volta\\bin",
424	"C:\\Users\\testuser\\AppData\\Local\\Volta\\bin",	526	"C:\\Users\\testuser\\AppData\\Local\\pnpm",
425	"C:\\Users\\testuser\\AppData\\Local\\pnpm",	527	"C:\\Users\\testuser\\.bun\\bin",
426	"C:\\Users\\testuser\\.bun\\bin",	528	"C:\\Users\\testuser\\scoop\\shims",
427	"C:\\Users\\testuser\\scoop\\shims",	529	"C:\\Shell\\Bin",
428	"C:\\Shell\\Bin",	530	].join(";"),
429	].join(";"),	531	FNM_DIR: "C:\\Users\\testuser\\AppData\\Roaming\\fnm",
430	FNM_DIR: "C:\\Users\\testuser\\AppData\\Roaming\\fnm",	532	FNM_MULTISHELL_PATH: "C:\\Users\\testuser\\AppData\\Local\\fnm_multishells\\123",
431	FNM_MULTISHELL_PATH: "C:\\Users\\testuser\\AppData\\Local\\fnm_multishells\\123",	533	});
432	});	534	expect(readEnvironment).toHaveBeenNthCalledWith(1, ["PATH"], { loadProfile: false });
433	expect(readEnvironment).toHaveBeenNthCalledWith(1, ["PATH"], { loadProfile: false });	535	expect(readEnvironment).toHaveBeenNthCalledWith(
434	expect(readEnvironment).toHaveBeenNthCalledWith(2, ["PATH", "FNM_DIR", "FNM_MULTISHELL_PATH"], {	536	2,
435	loadProfile: true,	537	["PATH", "FNM_DIR", "FNM_MULTISHELL_PATH"],
436	});
437	expect(commandAvailable).toHaveBeenCalledTimes(1);
438	});
439
440	it("keeps the baseline env when profiled probe still does not resolve node", () => {
441	const readEnvironment = vi.fn(
442	(_names: ReadonlyArray<string>, options?: { loadProfile?: boolean }) =>
443	options?.loadProfile ? { FNM_DIR: "C:\\Users\\testuser\\AppData\\Roaming\\fnm" } : {},
444	);
445	const commandAvailable = vi.fn(() => false);
446
447	expect(
448	resolveWindowsEnvironment(
449	{	538	{
450	PATH: "C:\\Windows\\System32",	539	loadProfile: true,
451	APPDATA: "C:\\Users\\testuser\\AppData\\Roaming",
452	USERPROFILE: "C:\\Users\\testuser",
453	},	540	},
454	{	541	);
		542	expect(commandAvailable).toHaveBeenCalledTimes(1);
		543	}),
		544	);
		545
		546	it.effect("keeps the baseline env when profiled probe still does not resolve node", () =>
		547	Effect.gen(function* () {
		548	const readEnvironment = vi.fn(
		549	(_names: ReadonlyArray<string>, options?: { loadProfile?: boolean }) =>
		550	options?.loadProfile ? { FNM_DIR: "C:\\Users\\testuser\\AppData\\Roaming\\fnm" } : {},
		551	);
		552	const commandAvailable = vi.fn(() => Effect.succeed(false));
		553
		554	expect(
		555	yield* withWindowsEnvironmentMocks(
		556	resolveWindowsEnvironment({
		557	PATH: "C:\\Windows\\System32",
		558	APPDATA: "C:\\Users\\testuser\\AppData\\Roaming",
		559	USERPROFILE: "C:\\Users\\testuser",
		560	}),
455	readEnvironment,	561	readEnvironment,
456	commandAvailable,	562	commandAvailable,
457	},	563	),
458	),	564	).toEqual({
459	).toEqual({	565	PATH: [
460	PATH: [	566	"C:\\Users\\testuser\\AppData\\Roaming\\npm",
461	"C:\\Users\\testuser\\AppData\\Roaming\\npm",	567	"C:\\Users\\testuser\\.bun\\bin",
462	"C:\\Users\\testuser\\.bun\\bin",	568	"C:\\Users\\testuser\\scoop\\shims",
463	"C:\\Users\\testuser\\scoop\\shims",	569	"C:\\Windows\\System32",
464	"C:\\Windows\\System32",	570	].join(";"),
465	].join(";"),	571	FNM_DIR: "C:\\Users\\testuser\\AppData\\Roaming\\fnm",
466	FNM_DIR: "C:\\Users\\testuser\\AppData\\Roaming\\fnm",	572	});
467	});	573	expect(commandAvailable).toHaveBeenCalledTimes(1);
468	expect(commandAvailable).toHaveBeenCalledTimes(1);	574	}),
469	});	575	);
470	});	576	});

packages/shared/src/shell.ts+224-46

...	@@ -1,8 +1,15 @@	...	@@ -1,8 +1,15 @@
1	// @effect-diagnostics nodeBuiltinImport:off	1	// @effect-diagnostics nodeBuiltinImport:off
2	import * as NodeOS from "node:os";	2	import * as NodeOS from "node:os";
		3	import * as NodePath from "node:path";
3	import { execFileSync } from "node:child_process";	4	import { execFileSync } from "node:child_process";
4	import { accessSync, constants, statSync } from "node:fs";	5	import { accessSync, constants as fileSystemConstants, statSync } from "node:fs";
5	import { extname, join } from "node:path";	6	import * as Data from "effect/Data";
		7	import * as Effect from "effect/Effect";
		8	import * as FileSystem from "effect/FileSystem";
		9	import * as Path from "effect/Path";
		10
		11	import { HostProcessEnvironment, HostProcessPlatform } from "./hostProcess.ts";
		12	import * as Context from "effect/Context";
6		13
7	const PATH_CAPTURE_START = "__T3CODE_PATH_START__";	14	const PATH_CAPTURE_START = "__T3CODE_PATH_START__";
8	const PATH_CAPTURE_END = "__T3CODE_PATH_END__";	15	const PATH_CAPTURE_END = "__T3CODE_PATH_END__";
...	@@ -17,11 +24,122 @@ type ExecFileSyncLike = (	...	@@ -17,11 +24,122 @@ type ExecFileSyncLike = (
17	options: { encoding: "utf8"; timeout: number },	24	options: { encoding: "utf8"; timeout: number },
18	) => string;	25	) => string;
19		26
		27	function canExecuteFile(filePath: string): boolean {
		28	try {
		29	accessSync(filePath, fileSystemConstants.X_OK);
		30	return true;
		31	} catch {
		32	return false;
		33	}
		34	}
		35
20	export interface CommandAvailabilityOptions {	36	export interface CommandAvailabilityOptions {
21	readonly platform?: NodeJS.Platform;
22	readonly env?: NodeJS.ProcessEnv;	37	readonly env?: NodeJS.ProcessEnv;
		38	readonly extendEnv?: boolean;
		39	}
		40
		41	export type CommandAvailabilityChecker = (
		42	command: string,
		43	options?: CommandAvailabilityOptions,
		44	) => Effect.Effect<boolean, never, FileSystem.FileSystem \| Path.Path>;
		45
		46	export class CommandResolutionError extends Data.TaggedError("CommandResolutionError")<{
		47	readonly command: string;
		48	readonly reason: "not-found";
		49	}> {}
		50
		51	const WINDOWS_SHELL_META_CHARS = /([()\][%!^"`<>&\|;, *?])/g;
		52
		53	/**
		54	* Escapes a single argument for `cmd.exe` shell mode (`spawn(..., { shell: true })`
		55	* on Windows). Node joins the command and arguments with spaces and hands the
		56	* resulting string to `cmd.exe` without any quoting, so every dynamic argument
		57	* must be escaped to survive both cmd.exe parsing and the target program's
		58	* `CommandLineToArgvW` parsing. Mirrors cross-spawn's argument escaping.
		59	*/
		60	function escapeWindowsShellArg(arg: string): string {
		61	// Double up backslashes that precede a double quote, then escape the quote
		62	// itself so it survives CommandLineToArgvW.
		63	let escaped = arg.replace(/(\\*)"/g, '$1$1\\"');
		64	// Double up trailing backslashes so the closing quote is not escaped away.
		65	escaped = escaped.replace(/(\\*)$/, "$1$1");
		66	// Quote the whole argument so embedded whitespace is preserved.
		67	escaped = `"${escaped}"`;
		68	// Escape cmd.exe metacharacters so cmd passes them through verbatim.
		69	return escaped.replace(WINDOWS_SHELL_META_CHARS, "^$1");
		70	}
		71
		72	/**
		73	* Escapes arguments for shell-mode spawns: applies {@link escapeWindowsShellArg}
		74	* when the platform is `win32` (where `shell: true` routes through `cmd.exe`)
		75	* and returns the arguments untouched everywhere else.
		76	*/
		77	function sanitizeShellModeArgsForPlatform(
		78	args: ReadonlyArray<string>,
		79	platform: NodeJS.Platform,
		80	): Array<string> {
		81	return platform === "win32" ? args.map(escapeWindowsShellArg) : [...args];
		82	}
		83
		84	export interface ResolvedSpawnCommand {
		85	readonly command: string;
		86	readonly args: ReadonlyArray<string>;
		87	readonly shell: boolean;
		88	}
		89
		90	export type SpawnExecutableResolver = (
		91	command: string,
		92	platform: NodeJS.Platform,
		93	env: NodeJS.ProcessEnv,
		94	) => string \| undefined;
		95
		96	function resolveSpawnExecutableWithNode(
		97	command: string,
		98	platform: NodeJS.Platform,
		99	env: NodeJS.ProcessEnv,
		100	): string \| undefined {
		101	const path = platform === "win32" ? NodePath.win32 : NodePath.posix;
		102	const windowsPathExtensions = platform === "win32" ? resolveWindowsPathExtensions(env) : [];
		103	const candidates = resolveCommandCandidates(
		104	command,
		105	platform,
		106	windowsPathExtensions,
		107	path.extname,
		108	);
		109	const isExecutable = (candidate: string) => {
		110	try {
		111	if (!statSync(candidate).isFile()) return false;
		112	if (platform === "win32") {
		113	return windowsPathExtensions.includes(path.extname(candidate).toUpperCase());
		114	}
		115	return canExecuteFile(candidate);
		116	} catch {
		117	return false;
		118	}
		119	};
		120
		121	if (command.includes("/") \|\| command.includes("\\")) {
		122	return candidates.find(isExecutable);
		123	}
		124
		125	for (const pathEntry of (readEnvPath(env) ?? "").split(pathDelimiterForPlatform(platform))) {
		126	const normalizedPathEntry = stripWrappingQuotes(pathEntry.trim());
		127	if (normalizedPathEntry.length === 0) continue;
		128	for (const candidate of candidates) {
		129	const candidatePath = path.join(normalizedPathEntry, candidate);
		130	if (isExecutable(candidatePath)) return candidatePath;
		131	}
		132	}
		133	return undefined;
23	}	134	}
24		135
		136	export const SpawnExecutableResolution = Context.Reference<SpawnExecutableResolver>(
		137	"@t3tools/shared/shell/SpawnExecutableResolution",
		138	{
		139	defaultValue: () => resolveSpawnExecutableWithNode,
		140	},
		141	);
		142
25	export interface WindowsEnvironmentProbeOptions {	143	export interface WindowsEnvironmentProbeOptions {
26	readonly loadProfile?: boolean;	144	readonly loadProfile?: boolean;
27	}	145	}
...	@@ -214,6 +332,20 @@ export type WindowsShellEnvironmentReader = (	...	@@ -214,6 +332,20 @@ export type WindowsShellEnvironmentReader = (
214	options?: WindowsEnvironmentProbeOptions,	332	options?: WindowsEnvironmentProbeOptions,
215	) => Partial<Record<string, string>>;	333	) => Partial<Record<string, string>>;
216		334
		335	export const WindowsShellEnvironment = Context.Reference<WindowsShellEnvironmentReader>(
		336	"@t3tools/shared/shell/WindowsShellEnvironment",
		337	{
		338	defaultValue: () => readEnvironmentFromWindowsShell,
		339	},
		340	);
		341
		342	export const CommandAvailability = Context.Reference<CommandAvailabilityChecker>(
		343	"@t3tools/shared/shell/CommandAvailability",
		344	{
		345	defaultValue: () => isCommandAvailable,
		346	},
		347	);
		348
217	export function readEnvironmentFromWindowsShell(	349	export function readEnvironmentFromWindowsShell(
218	names: ReadonlyArray<string>,	350	names: ReadonlyArray<string>,
219	execFile?: ExecFileSyncLike,	351	execFile?: ExecFileSyncLike,
...	@@ -334,6 +466,7 @@ function resolveCommandCandidates(	...	@@ -334,6 +466,7 @@ function resolveCommandCandidates(
334	command: string,	466	command: string,
335	platform: NodeJS.Platform,	467	platform: NodeJS.Platform,
336	windowsPathExtensions: ReadonlyArray<string>,	468	windowsPathExtensions: ReadonlyArray<string>,
		469	extname: (path: string) => string,
337	): ReadonlyArray<string> {	470	): ReadonlyArray<string> {
338	if (platform !== "win32") return [command];	471	if (platform !== "win32") return [command];
339	const extension = extname(command);	472	const extension = extname(command);
...	@@ -358,46 +491,53 @@ function resolveCommandCandidates(	...	@@ -358,46 +491,53 @@ function resolveCommandCandidates(
358	return Array.from(new Set(candidates));	491	return Array.from(new Set(candidates));
359	}	492	}
360		493
361	function isExecutableFile(	494	const isExecutableFile = Effect.fn("shell.isExecutableFile")(function* (
362	filePath: string,	495	filePath: string,
363	platform: NodeJS.Platform,	496	platform: NodeJS.Platform,
364	windowsPathExtensions: ReadonlyArray<string>,	497	windowsPathExtensions: ReadonlyArray<string>,
365	): boolean {	498	): Effect.fn.Return<boolean, never, FileSystem.FileSystem \| Path.Path> {
366	try {	499	const fileSystem = yield* FileSystem.FileSystem;
367	const stat = statSync(filePath);	500	const path = yield* Path.Path;
368	if (!stat.isFile()) return false;	501	const stat = yield* fileSystem.stat(filePath).pipe(Effect.orElseSucceed(() => null));
369	if (platform === "win32") {	502	if (stat === null \|\| stat.type !== "File") return false;
370	const extension = extname(filePath);	503
371	if (extension.length === 0) return false;	504	if (platform === "win32") {
372	return windowsPathExtensions.includes(extension.toUpperCase());	505	const extension = path.extname(filePath);
373	}	506	if (extension.length === 0) return false;
374	accessSync(filePath, constants.X_OK);	507	return windowsPathExtensions.includes(extension.toUpperCase());
375	return true;
376	} catch {
377	return false;
378	}	508	}
379	}
380		509
381	export function resolveCommandPath(	510	return canExecuteFile(filePath);
		511	});
		512
		513	const resolveCommandPathForPlatform = Effect.fn("shell.resolveCommandPathForPlatform")(function* (
382	command: string,	514	command: string,
383	options: CommandAvailabilityOptions = {},	515	options: CommandAvailabilityOptions & { readonly platform: NodeJS.Platform },
384	): string \| null {	516	): Effect.fn.Return<string, CommandResolutionError, FileSystem.FileSystem \| Path.Path> {
385	const platform = options.platform ?? process.platform;	517	const path = yield* Path.Path;
		518	const platform = options.platform;
386	const env = options.env ?? process.env;	519	const env = options.env ?? process.env;
387	const windowsPathExtensions = platform === "win32" ? resolveWindowsPathExtensions(env) : [];	520	const windowsPathExtensions = platform === "win32" ? resolveWindowsPathExtensions(env) : [];
388	const commandCandidates = resolveCommandCandidates(command, platform, windowsPathExtensions);	521	const commandCandidates = resolveCommandCandidates(
		522	command,
		523	platform,
		524	windowsPathExtensions,
		525	path.extname,
		526	);
389		527
390	if (command.includes("/") \|\| command.includes("\\")) {	528	if (command.includes("/") \|\| command.includes("\\")) {
391	for (const candidate of commandCandidates) {	529	for (const candidate of commandCandidates) {
392	if (isExecutableFile(candidate, platform, windowsPathExtensions)) {	530	if (yield* isExecutableFile(candidate, platform, windowsPathExtensions)) {
393	return candidate;	531	return candidate;
394	}	532	}
395	}	533	}
396	return null;	534	return yield* new CommandResolutionError({ command, reason: "not-found" });
397	}	535	}
398		536
399	const pathValue = resolvePathEnvironmentVariable(env);	537	const pathValue = resolvePathEnvironmentVariable(env);
400	if (pathValue.length === 0) return null;	538	if (pathValue.length === 0) {
		539	return yield* new CommandResolutionError({ command, reason: "not-found" });
		540	}
401	const pathEntries: string[] = [];	541	const pathEntries: string[] = [];
402	for (const entry of pathValue.split(pathDelimiterForPlatform(platform))) {	542	for (const entry of pathValue.split(pathDelimiterForPlatform(platform))) {
403	const pathEntry = stripWrappingQuotes(entry.trim());	543	const pathEntry = stripWrappingQuotes(entry.trim());
...	@@ -408,21 +548,65 @@ export function resolveCommandPath(	...	@@ -408,21 +548,65 @@ export function resolveCommandPath(
408		548
409	for (const pathEntry of pathEntries) {	549	for (const pathEntry of pathEntries) {
410	for (const candidate of commandCandidates) {	550	for (const candidate of commandCandidates) {
411	const candidatePath = join(pathEntry, candidate);	551	const candidatePath = path.join(pathEntry, candidate);
412	if (isExecutableFile(candidatePath, platform, windowsPathExtensions)) {	552	if (yield* isExecutableFile(candidatePath, platform, windowsPathExtensions)) {
413	return candidatePath;	553	return candidatePath;
414	}	554	}
415	}	555	}
416	}	556	}
417	return null;	557	return yield* new CommandResolutionError({ command, reason: "not-found" });
418	}	558	});
419		559
420	export function isCommandAvailable(	560	export const resolveCommandPath = Effect.fn("shell.resolveCommandPath")(function* (
421	command: string,	561	command: string,
422	options: CommandAvailabilityOptions = {},	562	options: CommandAvailabilityOptions = {},
423	): boolean {	563	) {
424	return resolveCommandPath(command, options) !== null;	564	return yield* resolveCommandPathForPlatform(command, {
425	}	565	env: options.env ?? (yield* HostProcessEnvironment),
		566	platform: yield* HostProcessPlatform,
		567	});
		568	});
		569
		570	export const resolveSpawnCommand = Effect.fn("shell.resolveSpawnCommand")(function* (
		571	command: string,
		572	args: ReadonlyArray<string>,
		573	options: CommandAvailabilityOptions = {},
		574	): Effect.fn.Return<ResolvedSpawnCommand> {
		575	const platform = yield* HostProcessPlatform;
		576	if (platform !== "win32") {
		577	return { command, args: [...args], shell: false };
		578	}
		579
		580	const hostEnvironment = yield* HostProcessEnvironment;
		581	const env =
		582	options.env === undefined
		583	? hostEnvironment
		584	: options.extendEnv
		585	? { ...hostEnvironment, ...options.env }
		586	: options.env;
		587	const resolveExecutable = yield* SpawnExecutableResolution;
		588	const resolvedCommand = resolveExecutable(command, platform, env) ?? command;
		589	const extension = NodePath.win32.extname(resolvedCommand).toLowerCase();
		590	if (extension !== ".cmd" && extension !== ".bat") {
		591	return { command: resolvedCommand, args: [...args], shell: false };
		592	}
		593
		594	return {
		595	command: escapeWindowsShellArg(resolvedCommand),
		596	args: sanitizeShellModeArgsForPlatform(args, platform),
		597	shell: true,
		598	};
		599	});
		600
		601	export const isCommandAvailable = Effect.fn("shell.isCommandAvailable")(function* (
		602	command: string,
		603	options: CommandAvailabilityOptions = {},
		604	) {
		605	return yield* resolveCommandPath(command, options).pipe(
		606	Effect.as(true),
		607	Effect.catchTag("CommandResolutionError", () => Effect.succeed(false)),
		608	);
		609	});
426		610
427	export function resolveKnownWindowsCliDirs(env: NodeJS.ProcessEnv): ReadonlyArray<string> {	611	export function resolveKnownWindowsCliDirs(env: NodeJS.ProcessEnv): ReadonlyArray<string> {
428	const appData = env.APPDATA?.trim();	612	const appData = env.APPDATA?.trim();
...	@@ -437,11 +621,6 @@ export function resolveKnownWindowsCliDirs(env: NodeJS.ProcessEnv): ReadonlyArra	...	@@ -437,11 +621,6 @@ export function resolveKnownWindowsCliDirs(env: NodeJS.ProcessEnv): ReadonlyArra
437	];	621	];
438	}	622	}
439		623
440	export interface WindowsEnvironmentResolverOptions {
441	readonly readEnvironment?: WindowsShellEnvironmentReader;
442	readonly commandAvailable?: typeof isCommandAvailable;
443	}
444
445	function readWindowsEnvironmentSafely(	624	function readWindowsEnvironmentSafely(
446	readEnvironment: WindowsShellEnvironmentReader,	625	readEnvironment: WindowsShellEnvironmentReader,
447	names: ReadonlyArray<string>,	626	names: ReadonlyArray<string>,
...	@@ -467,12 +646,11 @@ function mergeWindowsEnv(	...	@@ -467,12 +646,11 @@ function mergeWindowsEnv(
467	return nextEnv;	646	return nextEnv;
468	}	647	}
469		648
470	export function resolveWindowsEnvironment(	649	export const resolveWindowsEnvironment = Effect.fn("shell.resolveWindowsEnvironment")(function* (
471	env: NodeJS.ProcessEnv,	650	env: NodeJS.ProcessEnv,
472	options: WindowsEnvironmentResolverOptions = {},	651	): Effect.fn.Return<Partial<NodeJS.ProcessEnv>, never, FileSystem.FileSystem \| Path.Path> {
473	): Partial<NodeJS.ProcessEnv> {	652	const readEnvironment = yield* WindowsShellEnvironment;
474	const readEnvironment = options.readEnvironment ?? readEnvironmentFromWindowsShell;	653	const commandAvailable = yield* CommandAvailability;
475	const commandAvailable = options.commandAvailable ?? isCommandAvailable;
476	const inheritedPath = readEnvPath(env);	654	const inheritedPath = readEnvPath(env);
477	const shellPath = readWindowsEnvironmentSafely(readEnvironment, ["PATH"], {	655	const shellPath = readWindowsEnvironmentSafely(readEnvironment, ["PATH"], {
478	loadProfile: false,	656	loadProfile: false,
...	@@ -483,7 +661,7 @@ export function resolveWindowsEnvironment(	...	@@ -483,7 +661,7 @@ export function resolveWindowsEnvironment(
483	const baselinePatch: Partial<NodeJS.ProcessEnv> = baselinePath ? { PATH: baselinePath } : {};	661	const baselinePatch: Partial<NodeJS.ProcessEnv> = baselinePath ? { PATH: baselinePath } : {};
484	const baselineEnv = mergeWindowsEnv(env, baselinePatch);	662	const baselineEnv = mergeWindowsEnv(env, baselinePatch);
485		663
486	if (commandAvailable("node", { platform: "win32", env: baselineEnv })) {	664	if (yield* commandAvailable("node", { env: baselineEnv })) {
487	return baselinePatch;	665	return baselinePatch;
488	}	666	}
489		667
...	@@ -503,4 +681,4 @@ export function resolveWindowsEnvironment(	...	@@ -503,4 +681,4 @@ export function resolveWindowsEnvironment(
503	return Object.keys(profiledPatch).length > 0	681	return Object.keys(profiledPatch).length > 0
504	? { ...baselinePatch, ...profiledPatch }	682	? { ...baselinePatch, ...profiledPatch }
505	: baselinePatch;	683	: baselinePatch;
506	}	684	});

packages/ssh/src/auth.test.ts+11-4

 @@ -3,7 +3,9 @@ import { assert, describe, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
 import * as Path from "effect/Path";
+import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
 import {
   buildSshAskpassHelperDescriptor,
 @@ -37,7 +39,6 @@ describe("ssh auth", () => {
         authSecret: "super-secret",
         interactiveAuth: true,
         askpassDirectory: directory,
-        platform: "linux",
         baseEnv: {},
       });
 @@ -48,15 +49,21 @@ describe("ssh auth", () => {
       assert.equal(env.DISPLAY, "t3code");
       assert.equal(yield* fs.exists(askpassPath), true);
       assert.include(yield* fs.readFileString(askpassPath), 'printf "%s\\n" "$T3_SSH_AUTH_SECRET"');
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(
+      Effect.provide(Layer.merge(NodeServices.layer, Layer.succeed(HostProcessPlatform, "linux"))),
+      Effect.scoped,
+    ),
   );
   it.effect("builds a windows askpass launcher pair", () =>
     Effect.gen(function* () {
       const descriptor = yield* buildSshAskpassHelperDescriptor({
         directory: "C:\\temp\\t3code-ssh-askpass",
-        platform: "win32",
+      }).pipe(
-      }).pipe(Effect.provide(NodeServices.layer));
+        Effect.provide(
+          Layer.merge(NodeServices.layer, Layer.succeed(HostProcessPlatform, "win32")),
+        ),
+      );
       assert.equal(descriptor.launcherPath, "C:\\temp\\t3code-ssh-askpass\\ssh-askpass.cmd");
       assert.deepEqual(

packages/ssh/src/auth.ts+16-9

 @@ -1,7 +1,10 @@
+import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
+import * as Config from "effect/Config";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
 import * as Path from "effect/Path";
 import * as PlatformError from "effect/PlatformError";
 @@ -55,7 +58,6 @@ export interface SshChildEnvironmentOptions {
   readonly baseEnv?: NodeJS.ProcessEnv;
   readonly askpassDirectory?: string;
   readonly authSecret?: string | null;
-  readonly platform?: NodeJS.Platform;
 }
 const SSH_ASKPASS_DIR_NAME = "t3code-ssh-askpass";
 @@ -110,9 +112,8 @@ export const buildSshAskpassHelperDescriptor = Effect.fn(
   "ssh/auth.buildSshAskpassHelperDescriptor",
 )(function* (input: {
   readonly directory: string;
-  readonly platform?: NodeJS.Platform;
 }): Effect.fn.Return<SshAskpassHelperDescriptor, never, Path.Path> {
-  const platform = input.platform ?? process.platform;
+  const platform = yield* HostProcessPlatform;
   const path = yield* Path.Path;
   const directory = input.directory;
 @@ -148,12 +149,11 @@ export const buildSshAskpassHelperDescriptor = Effect.fn(
 export const ensureSshAskpassHelpers = Effect.fn("ssh/auth.ensureSshAskpassHelpers")(
   function* (input: {
     readonly directory: string;
-    readonly platform?: NodeJS.Platform;
   }): Effect.fn.Return<string, PlatformError.PlatformError, FileSystem.FileSystem | Path.Path> {
     const fs = yield* FileSystem.FileSystem;
     const path = yield* Path.Path;
     const descriptor = yield* buildSshAskpassHelperDescriptor(input);
-    const platform = input.platform ?? process.platform;
+    const platform = yield* HostProcessPlatform;
     yield* fs.makeDirectory(path.dirname(descriptor.launcherPath), { recursive: true });
 @@ -179,21 +179,28 @@ export const buildSshChildEnvironment = Effect.fn("ssh/auth.buildSshChildEnviron
   PlatformError.PlatformError,
   FileSystem.FileSystem | Path.Path
 > {
-  const baseEnv = { ...(input.baseEnv ?? process.env) };
+  const baseEnv = { ...input.baseEnv };
   if (!input.interactiveAuth) {
     return baseEnv;
   }
-  const platform = input.platform ?? process.platform;
+  const platform = yield* HostProcessPlatform;
+  const hostDisplay = input.baseEnv
+    ? input.baseEnv.DISPLAY
+    : yield* Config.string("DISPLAY").pipe(
+        Config.option,
+        Effect.orElseSucceed(() => Option.none<string>()),
+        Effect.map(Option.getOrUndefined),
+      );
   const directory = input.askpassDirectory ?? (yield* getDefaultSshAskpassDirectory());
-  const sshAskpass = yield* ensureSshAskpassHelpers({ directory, platform });
+  const sshAskpass = yield* ensureSshAskpassHelpers({ directory });
   return {
     ...baseEnv,
     SSH_ASKPASS: sshAskpass,
     SSH_ASKPASS_REQUIRE: "force",
     ...(input.authSecret === undefined ? {} : { T3_SSH_AUTH_SECRET: input.authSecret ?? "" }),
-    ...(platform === "win32" || baseEnv.DISPLAY ? {} : { DISPLAY: "t3code" }),
+    ...(platform === "win32" || baseEnv.DISPLAY || hostDisplay ? {} : { DISPLAY: "t3code" }),
   };
 });

packages/ssh/src/command.ts+16-4

...	@@ -1,6 +1,7 @@	...	@@ -1,6 +1,7 @@
1	import * as Crypto from "node:crypto";	1	import * as Crypto from "node:crypto";
2		2
3	import type { DesktopSshEnvironmentTarget, DesktopUpdateChannel } from "@t3tools/contracts";	3	import type { DesktopSshEnvironmentTarget, DesktopUpdateChannel } from "@t3tools/contracts";
		4	import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
4	import * as Duration from "effect/Duration";	5	import * as Duration from "effect/Duration";
5	import * as Effect from "effect/Effect";	6	import * as Effect from "effect/Effect";
6	import * as FileSystem from "effect/FileSystem";	7	import * as FileSystem from "effect/FileSystem";
...	@@ -16,7 +17,16 @@ import { SshCommandError, SshInvalidTargetError } from "./errors.ts";	...	@@ -16,7 +17,16 @@ import { SshCommandError, SshInvalidTargetError } from "./errors.ts";
16	const PUBLISHABLE_T3_VERSION_PATTERN = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/u;	17	const PUBLISHABLE_T3_VERSION_PATTERN = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/u;
17	const DEFAULT_SSH_COMMAND_TIMEOUT_MS = 60_000;	18	const DEFAULT_SSH_COMMAND_TIMEOUT_MS = 60_000;
18	const MAX_SSH_ERROR_OUTPUT_LENGTH = 4_000;	19	const MAX_SSH_ERROR_OUTPUT_LENGTH = 4_000;
19	export const SSH_COMMAND = process.platform === "win32" ? "ssh.exe" : "ssh";	20
		21	/**
		22	* ssh is a real executable everywhere (`ssh.exe` on Windows), so it is always
		23	* spawned directly — cmd.exe shell mode would re-tokenize arguments such as
		24	* identity-file paths containing spaces.
		25	*/
		26	const sshCommandForPlatform = (platform: NodeJS.Platform): string =>
		27	platform === "win32" ? "ssh.exe" : "ssh";
		28
		29	export const resolveSshCommand = Effect.map(HostProcessPlatform, sshCommandForPlatform);
20		30
21	const encoder = new TextEncoder();	31	const encoder = new TextEncoder();
22		32
...	@@ -191,16 +201,18 @@ const runSshCommandInScope = Effect.fn("ssh/command.runSshCommand.inScope")(func	...	@@ -191,16 +201,18 @@ const runSshCommandInScope = Effect.fn("ssh/command.runSshCommand.inScope")(func
191	...(input.remoteCommandArgs ?? []),	201	...(input.remoteCommandArgs ?? []),
192	];	202	];
193	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;	203	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
		204	const sshCommand = yield* resolveSshCommand;
194	yield* Effect.logDebug("ssh.command.start", {	205	yield* Effect.logDebug("ssh.command.start", {
195	...sshTargetLogFields(target),	206	...sshTargetLogFields(target),
196	command: [SSH_COMMAND, ...args],	207	command: [sshCommand, ...args],
197	hasStdin: input.stdin !== undefined,	208	hasStdin: input.stdin !== undefined,
198	timeoutMs: input.timeoutMs ?? DEFAULT_SSH_COMMAND_TIMEOUT_MS,	209	timeoutMs: input.timeoutMs ?? DEFAULT_SSH_COMMAND_TIMEOUT_MS,
199	});	210	});
200	const child = yield* spawner	211	const child = yield* spawner
201	.spawn(	212	.spawn(
202	ChildProcess.make(SSH_COMMAND, args, {	213	ChildProcess.make(sshCommand, args, {
203	env: environment,	214	env: environment,
		215	extendEnv: true,
204	stdin: {	216	stdin: {
205	stream: stdinStream(input.stdin),	217	stream: stdinStream(input.stdin),
206	endOnDone: true,	218	endOnDone: true,
...	@@ -212,7 +224,7 @@ const runSshCommandInScope = Effect.fn("ssh/command.runSshCommand.inScope")(func	...	@@ -212,7 +224,7 @@ const runSshCommandInScope = Effect.fn("ssh/command.runSshCommand.inScope")(func
212	Effect.mapError(	224	Effect.mapError(
213	(cause) =>	225	(cause) =>
214	new SshCommandError({	226	new SshCommandError({
215	command: [SSH_COMMAND, ...args],	227	command: [sshCommand, ...args],
216	exitCode: null,	228	exitCode: null,
217	stderr: "",	229	stderr: "",
218	message:	230	message:

packages/ssh/src/config.ts+11-1

 @@ -1,7 +1,9 @@
 import type { DesktopDiscoveredSshHost } from "@t3tools/contracts";
+import * as Config from "effect/Config";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
+import * as Option from "effect/Option";
 import * as Path from "effect/Path";
 import * as PlatformError from "effect/PlatformError";
 @@ -208,7 +210,15 @@ const readKnownHostsHostnames = Effect.fnUntraced(function* (filePath: string) {
 export const discoverSshHosts = Effect.fnUntraced(
   function* (input: { readonly homeDir?: string }) {
     const path = yield* Path.Path;
-    const homeDir = input?.homeDir ?? process.env.HOME ?? process.env.USERPROFILE ?? "";
+    const env = yield* Config.all({
+      home: Config.string("HOME").pipe(Config.option),
+      userProfile: Config.string("USERPROFILE").pipe(Config.option),
+    });
+    const homeDir =
+      input?.homeDir ??
+      Option.getOrUndefined(env.home) ??
+      Option.getOrUndefined(env.userProfile) ??
+      "";
     if (homeDir.trim().length === 0) {
       return [];
     }

packages/ssh/src/tunnel.ts+5-3

 @@ -34,9 +34,9 @@ import {
   collectProcessOutput,
   getLastNonEmptyOutputLine,
   remoteStateKey,
+  resolveSshCommand,
   resolveSshTarget,
   runSshCommand,
-  SSH_COMMAND,
   targetConnectionKey,
 } from "./command.ts";
 import {
 @@ -1069,7 +1069,8 @@ const startSshTunnel = Effect.fn("ssh/tunnel.startSshTunnel")(function* (input:
     `${input.localPort}:127.0.0.1:${input.remotePort}`,
     hostSpec,
   ];
-  const tunnelCommand = [SSH_COMMAND, ...args];
+  const sshCommand = yield* resolveSshCommand;
+  const tunnelCommand = [sshCommand, ...args];
   const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
   const scope = yield* Scope.Scope;
   yield* Effect.logDebug("ssh.tunnel.spawn.start", {
 @@ -1082,8 +1083,9 @@ const startSshTunnel = Effect.fn("ssh/tunnel.startSshTunnel")(function* (input:
   });
   const child = yield* spawner
     .spawn(
-      ChildProcess.make(SSH_COMMAND, args, {
+      ChildProcess.make(sshCommand, args, {
         env: childEnvironment,
+        extendEnv: true,
         stdin: {
           stream: Stream.empty,
           endOnDone: true,

packages/tailscale/package.json+1

...	@@ -14,6 +14,7 @@	...	@@ -14,6 +14,7 @@
14	},	14	},
15	"dependencies": {	15	"dependencies": {
16	"@effect/platform-node": "catalog:",	16	"@effect/platform-node": "catalog:",
		17	"@t3tools/shared": "workspace:*",
17	"effect": "catalog:"	18	"effect": "catalog:"
18	},	19	},
19	"devDependencies": {	20	"devDependencies": {

packages/tailscale/src/tailscale.ts+10-3

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
1	import * as Data from "effect/Data";	2	import * as Data from "effect/Data";
2	import * as Effect from "effect/Effect";	3	import * as Effect from "effect/Effect";
3	import * as Option from "effect/Option";	4	import * as Option from "effect/Option";
...	@@ -10,7 +11,11 @@ export const DEFAULT_TAILSCALE_SERVE_PORT = 443;	...	@@ -10,7 +11,11 @@ export const DEFAULT_TAILSCALE_SERVE_PORT = 443;
10	export const TAILSCALE_STATUS_TIMEOUT_MS = 1_500;	11	export const TAILSCALE_STATUS_TIMEOUT_MS = 1_500;
11	export const TAILSCALE_SERVE_TIMEOUT_MS = 10_000;	12	export const TAILSCALE_SERVE_TIMEOUT_MS = 10_000;
12	export const TAILSCALE_PROBE_TIMEOUT_MS = 2_500;	13	export const TAILSCALE_PROBE_TIMEOUT_MS = 2_500;
13	const TAILSCALE_COMMAND = process.platform === "win32" ? "tailscale.exe" : "tailscale";	14
		15	// tailscale is a real executable everywhere (`tailscale.exe` on Windows), so
		16	// it is always spawned directly rather than through cmd.exe shell mode.
		17	const tailscaleCommandForPlatform = (platform: NodeJS.Platform): string =>
		18	platform === "win32" ? "tailscale.exe" : "tailscale";
14		19
15	export class TailscaleCommandError extends Data.TaggedError("TailscaleCommandError")<{	20	export class TailscaleCommandError extends Data.TaggedError("TailscaleCommandError")<{
16	readonly command: readonly string[];	21	readonly command: readonly string[];
...	@@ -136,8 +141,9 @@ export const readTailscaleStatus: Effect.Effect<	...	@@ -136,8 +141,9 @@ export const readTailscaleStatus: Effect.Effect<
136	> = Effect.gen(function* () {	141	> = Effect.gen(function* () {
137	const args = ["status", "--json"];	142	const args = ["status", "--json"];
138	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;	143	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
		144	const hostPlatform = yield* HostProcessPlatform;
139	const child = yield* spawner	145	const child = yield* spawner
140	.spawn(ChildProcess.make(TAILSCALE_COMMAND, args))	146	.spawn(ChildProcess.make(tailscaleCommandForPlatform(hostPlatform), args))
141	.pipe(	147	.pipe(
142	Effect.mapError((cause) =>	148	Effect.mapError((cause) =>
143	tailscaleCommandError(	149	tailscaleCommandError(
...	@@ -211,8 +217,9 @@ const runTailscaleCommand = (	...	@@ -211,8 +217,9 @@ const runTailscaleCommand = (
211	): Effect.Effect<void, TailscaleCommandError, ChildProcessSpawner.ChildProcessSpawner> =>	217	): Effect.Effect<void, TailscaleCommandError, ChildProcessSpawner.ChildProcessSpawner> =>
212	Effect.gen(function* () {	218	Effect.gen(function* () {
213	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;	219	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
		220	const hostPlatform = yield* HostProcessPlatform;
214	const child = yield* spawner	221	const child = yield* spawner
215	.spawn(ChildProcess.make(TAILSCALE_COMMAND, args))	222	.spawn(ChildProcess.make(tailscaleCommandForPlatform(hostPlatform), args))
216	.pipe(	223	.pipe(
217	Effect.mapError((cause) =>	224	Effect.mapError((cause) =>
218	tailscaleCommandError(	225	tailscaleCommandError(

pnpm-lock.yaml+3

 @@ -810,6 +810,9 @@ importers:
       '@effect/platform-node':
         specifier: 4.0.0-beta.78
         version: 4.0.0-beta.78(bufferutil@4.1.0)(effect@4.0.0-beta.78(patch_hash=883249d8efbb462e928e21fefef96027b66aec50751178cafdce45f08eee3754))(ioredis@5.11.0)(utf-8-validate@6.0.6)
+      '@t3tools/shared':
+        specifier: workspace:*
+        version: link:../shared
       effect:
         specifier: 4.0.0-beta.78
         version: 4.0.0-beta.78(patch_hash=883249d8efbb462e928e21fefef96027b66aec50751178cafdce45f08eee3754)

scripts/build-desktop-artifact.test.ts+81

...	@@ -2,6 +2,7 @@ import * as NodeServices from "@effect/platform-node/NodeServices";	...	@@ -2,6 +2,7 @@ import * as NodeServices from "@effect/platform-node/NodeServices";
2	import { assert, it } from "@effect/vitest";	2	import { assert, it } from "@effect/vitest";
3	import * as ConfigProvider from "effect/ConfigProvider";	3	import * as ConfigProvider from "effect/ConfigProvider";
4	import * as Effect from "effect/Effect";	4	import * as Effect from "effect/Effect";
		5	import * as Layer from "effect/Layer";
5	import * as Option from "effect/Option";	6	import * as Option from "effect/Option";
6		7
7	import {	8	import {
...	@@ -11,10 +12,12 @@ import {	...	@@ -11,10 +12,12 @@ import {
11	resolveDesktopBuildIconAssets,	12	resolveDesktopBuildIconAssets,
12	resolveDesktopProductName,	13	resolveDesktopProductName,
13	resolveDesktopUpdateChannel,	14	resolveDesktopUpdateChannel,
		15	resolveGitHubPublishConfig,
14	resolveMockUpdateServerPort,	16	resolveMockUpdateServerPort,
15	resolveMockUpdateServerUrl,	17	resolveMockUpdateServerUrl,
16	} from "./build-desktop-artifact.ts";	18	} from "./build-desktop-artifact.ts";
17	import { BRAND_ASSET_PATHS } from "./lib/brand-assets.ts";	19	import { BRAND_ASSET_PATHS } from "./lib/brand-assets.ts";
		20	import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess";
18		21
19	it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {	22	it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {
20	it("resolves the dedicated nightly updater channel from nightly versions", () => {	23	it("resolves the dedicated nightly updater channel from nightly versions", () => {
...	@@ -41,6 +44,47 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {	...	@@ -41,6 +44,47 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {
41	});	44	});
42	});	45	});
43		46
		47	it.effect("resolves GitHub desktop publish config from Effect config", () =>
		48	Effect.gen(function* () {
		49	const latestConfig = yield* resolveGitHubPublishConfig("latest").pipe(
		50	Effect.provide(
		51	ConfigProvider.layer(
		52	ConfigProvider.fromEnv({
		53	env: {
		54	T3CODE_DESKTOP_UPDATE_REPOSITORY: "pingdotgg/t3code",
		55	},
		56	}),
		57	),
		58	),
		59	);
		60	const nightlyConfig = yield* resolveGitHubPublishConfig("nightly").pipe(
		61	Effect.provide(
		62	ConfigProvider.layer(
		63	ConfigProvider.fromEnv({
		64	env: {
		65	GITHUB_REPOSITORY: "pingdotgg/t3code",
		66	},
		67	}),
		68	),
		69	),
		70	);
		71
		72	assert.deepStrictEqual(latestConfig, {
		73	provider: "github",
		74	owner: "pingdotgg",
		75	repo: "t3code",
		76	releaseType: "release",
		77	});
		78	assert.deepStrictEqual(nightlyConfig, {
		79	provider: "github",
		80	owner: "pingdotgg",
		81	repo: "t3code",
		82	releaseType: "prerelease",
		83	channel: "nightly",
		84	});
		85	}),
		86	);
		87
44	it("omits bundled workspace packages from staged desktop dependencies", () => {	88	it("omits bundled workspace packages from staged desktop dependencies", () => {
45	assert.deepStrictEqual(	89	assert.deepStrictEqual(
46	resolveDesktopRuntimeDependencies(	90	resolveDesktopRuntimeDependencies(
...	@@ -122,6 +166,43 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {	...	@@ -122,6 +166,43 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {
122	}),	166	}),
123	);	167	);
124		168
		169	it.effect("resolves default platform and architecture from host references", () =>
		170	Effect.gen(function* () {
		171	const resolved = yield* resolveBuildOptions({
		172	platform: Option.none(),
		173	target: Option.none(),
		174	arch: Option.none(),
		175	buildVersion: Option.none(),
		176	outputDir: Option.none(),
		177	skipBuild: Option.none(),
		178	keepStage: Option.none(),
		179	signed: Option.none(),
		180	verbose: Option.none(),
		181	mockUpdates: Option.none(),
		182	mockUpdateServerPort: Option.none(),
		183	}).pipe(
		184	Effect.provide(
		185	Layer.mergeAll(
		186	Layer.succeed(HostProcessPlatform, "win32"),
		187	Layer.succeed(HostProcessArchitecture, "x64"),
		188	ConfigProvider.layer(
		189	ConfigProvider.fromEnv({
		190	env: {
		191	PROCESSOR_ARCHITECTURE: "AMD64",
		192	PROCESSOR_ARCHITEW6432: "ARM64",
		193	},
		194	}),
		195	),
		196	),
		197	),
		198	);
		199
		200	assert.equal(resolved.platform, "win");
		201	assert.equal(resolved.target, "nsis");
		202	assert.equal(resolved.arch, "arm64");
		203	}),
		204	);
		205
125	it.effect("preserves explicit false boolean flags over true env defaults", () =>	206	it.effect("preserves explicit false boolean flags over true env defaults", () =>
126	Effect.gen(function* () {	207	Effect.gen(function* () {
127	const resolved = yield* resolveBuildOptions({	208	const resolved = yield* resolveBuildOptions({

scripts/build-desktop-artifact.ts+66-38

 @@ -1,6 +1,8 @@
 #!/usr/bin/env node
 import { fromYaml } from "@t3tools/shared/schemaYaml";
+import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
+import { resolveSpawnCommand } from "@t3tools/shared/shell";
 import rootPackageJson from "../package.json" with { type: "json" };
 import desktopPackageJson from "../apps/desktop/package.json" with { type: "json" };
 import serverPackageJson from "../apps/server/package.json" with { type: "json" };
 @@ -101,14 +103,14 @@ function detectHostBuildPlatform(hostPlatform: string): typeof BuildPlatform.Typ
   return undefined;
 }
-function getDefaultArch(platform: typeof BuildPlatform.Type): typeof BuildArch.Type {
+const getDefaultArch = Effect.fn("getDefaultArch")(function* (platform: typeof BuildPlatform.Type) {
   const config = PLATFORM_CONFIG[platform];
   if (!config) {
     return "x64";
   }
-  return getDefaultBuildArch(platform, process.arch, process.env, config);
+  return yield* getDefaultBuildArch(platform, config);
-}
+});
 class BuildScriptError extends Data.TaggedError("BuildScriptError")<{
   readonly message: string;
 @@ -198,13 +200,21 @@ const resolveGitCommitHash = Effect.fn("resolveGitCommitHash")(function* (repoRo
 const resolvePythonForNodeGyp = Effect.fn("resolvePythonForNodeGyp")(function* () {
   const fs = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
-  const configured = process.env.npm_config_python ?? process.env.PYTHON;
+  const hostPlatform = yield* HostProcessPlatform;
+  const env = yield* Config.all({
+    configuredPython: Config.string("npm_config_python").pipe(
+      Config.orElse(() => Config.string("PYTHON")),
+      Config.option,
+    ),
+    localAppData: Config.string("LOCALAPPDATA").pipe(Config.option),
+  });
+  const configured = Option.getOrUndefined(env.configuredPython);
   if (configured && (yield* fs.exists(configured))) {
     return configured;
   }
-  if (process.platform === "win32") {
+  if (hostPlatform === "win32") {
-    const localAppData = process.env.LOCALAPPDATA;
+    const localAppData = Option.getOrUndefined(env.localAppData);
     if (localAppData) {
       for (const version of ["Python313", "Python312", "Python311", "Python310"]) {
         const candidate = path.join(localAppData, "Programs", "Python", version, "python.exe");
 @@ -348,21 +358,23 @@ export const resolveBuildOptions = Effect.fn("resolveBuildOptions")(function* (
   const path = yield* Path.Path;
   const repoRoot = yield* RepoRoot;
   const env = yield* BuildEnvConfig;
+  const hostPlatform = yield* HostProcessPlatform;
   const platform = mergeOptions(
     input.platform,
     env.platform,
-    detectHostBuildPlatform(process.platform),
+    detectHostBuildPlatform(hostPlatform),
   );
   if (!platform) {
     return yield* new BuildScriptError({
-      message: `Unsupported host platform '${process.platform}'.`,
+      message: `Unsupported host platform '${hostPlatform}'.`,
     });
   }
   const target = mergeOptions(input.target, env.target, PLATFORM_CONFIG[platform].defaultTarget);
-  const arch = mergeOptions(input.arch, env.arch, getDefaultArch(platform));
+  const defaultArch = yield* getDefaultArch(platform);
+  const arch = mergeOptions(input.arch, env.arch, defaultArch);
   const version = mergeOptions(input.buildVersion, env.version, undefined);
   const releaseDir = resolveBooleanFlag(input.mockUpdates, env.mockUpdates)
     ? "release-mock"
 @@ -622,19 +634,18 @@ export function resolveDesktopRuntimeDependencies(
   return resolveCatalogDependencies(runtimeDependencies, catalog, "apps/desktop");
 }
-function resolveGitHubPublishConfig(updateChannel: "latest" | "nightly"):
+export const resolveGitHubPublishConfig = Effect.fn("resolveGitHubPublishConfig")(function* (
-  | {
+  updateChannel: "latest" | "nightly",
-      readonly provider: "github";
+) {
-      readonly owner: string;
+  const env = yield* Config.all({
-      readonly repo: string;
+    updateRepository: Config.string("T3CODE_DESKTOP_UPDATE_REPOSITORY").pipe(Config.option),
-      readonly releaseType: "release" | "prerelease";
+    githubRepository: Config.string("GITHUB_REPOSITORY").pipe(Config.option),
-      readonly channel?: "nightly";
+  });
-    }
+  const rawRepo = (
-  | undefined {
+    Option.getOrUndefined(env.updateRepository)?.trim() ||
-  const rawRepo =
+    Option.getOrUndefined(env.githubRepository)?.trim() ||
-    process.env.T3CODE_DESKTOP_UPDATE_REPOSITORY?.trim() ||
+    ""
-    process.env.GITHUB_REPOSITORY?.trim() ||
+  ).trim();
-    "";
   if (!rawRepo) return undefined;
   const [owner, repo, ...rest] = rawRepo.split("/");
 @@ -647,7 +658,7 @@ function resolveGitHubPublishConfig(updateChannel: "latest" | "nightly"):
     releaseType: updateChannel === "nightly" ? "prerelease" : "release",
     ...(updateChannel === "nightly" ? { channel: "nightly" as const } : {}),
   };
-}
+});
 export function resolveDesktopUpdateChannel(version: string): "latest" | "nightly" {
   return /-nightly\.\d{8}\.\d+$/.test(version) ? "nightly" : "latest";
 @@ -696,7 +707,7 @@ const createBuildConfig = Effect.fn("createBuildConfig")(function* (
     },
   };
   const updateChannel = resolveDesktopUpdateChannel(version);
-  const publishConfig = resolveGitHubPublishConfig(updateChannel);
+  const publishConfig = yield* resolveGitHubPublishConfig(updateChannel);
   if (publishConfig) {
     buildConfig.publish = [publishConfig];
   } else if (mockUpdates) {
 @@ -780,6 +791,7 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* (
   const repoRoot = yield* RepoRoot;
   const path = yield* Path.Path;
   const fs = yield* FileSystem.FileSystem;
+  const hostPlatform = yield* HostProcessPlatform;
   const workspaceConfig = yield* readWorkspaceConfig();
   const workspaceCatalog = workspaceConfig.catalog ?? {};
   const workspaceOverrides = workspaceConfig.overrides ?? {};
 @@ -846,12 +858,12 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* (
   if (!options.skipBuild) {
     yield* Effect.log("[desktop-artifact] Building desktop/server/web artifacts...");
+    const spawnCommand = yield* resolveSpawnCommand("vp", ["run", "build:desktop"]);
     yield* runCommand(
-      ChildProcess.make({
+      ChildProcess.make(spawnCommand.command, spawnCommand.args, {
         cwd: repoRoot,
-        // Windows needs shell mode to resolve .cmd shims (e.g. vp.cmd).
+        shell: spawnCommand.shell,
-        shell: process.platform === "win32",
+      }),
-      })`vp run build:desktop`,
       { label: "vp run build:desktop", verbose: options.verbose },
     );
   }
 @@ -933,15 +945,18 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* (
   }
   yield* Effect.log("[desktop-artifact] Installing staged production dependencies...");
+  const installCommand = yield* resolveSpawnCommand("vp", ["install", "--prod", "--no-optional"]);
   yield* runCommand(
-    ChildProcess.make({
+    ChildProcess.make(installCommand.command, installCommand.args, {
       cwd: stageAppDir,
-      // Windows needs shell mode to resolve .cmd shims (e.g. vp.cmd).
+      shell: installCommand.shell,
-      shell: process.platform === "win32",
+    }),
-    })`vp install --prod --no-optional`,
     { label: "vp install --prod --no-optional", verbose: options.verbose },
   );
+  // electron-builder treats several set-but-empty variables (e.g. CSC_LINK="")
+  // as enabled, so copy the host env and scrub empty values instead of relying
+  // on `extendEnv` merging.
   const buildEnv: NodeJS.ProcessEnv = {
     ...process.env,
   };
 @@ -959,7 +974,7 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* (
     delete buildEnv.APPLE_API_ISSUER;
   }
-  if (process.platform === "win32") {
+  if (hostPlatform === "win32") {
     const python = yield* resolvePythonForNodeGyp();
     if (python) {
       buildEnv.PYTHON = python;
 @@ -970,7 +985,7 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* (
   }
   if (options.verbose) {
     buildEnv.DEBUG =
-      buildEnv.DEBUG === undefined || buildEnv.DEBUG === ""
+      buildEnv.DEBUG === undefined
         ? "electron-builder,electron-builder:*"
         : `${buildEnv.DEBUG},electron-builder,electron-builder:*`;
   }
 @@ -978,13 +993,26 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* (
   yield* Effect.log(
     `[desktop-artifact] Building ${options.platform}/${options.target} (arch=${options.arch}, version=${appVersion})...`,
   );
+  const builderArgs = [
+    "exec",
+    "--filter",
+    "@t3tools/desktop",
+    "--",
+    "electron-builder",
+    "--projectDir",
+    stageAppDir,
+    platformConfig.cliFlag,
+    `--${options.arch}`,
+    "--publish",
+    "never",
+  ];
+  const builderCommand = yield* resolveSpawnCommand("vp", builderArgs, { env: buildEnv });
   yield* runCommand(
-    ChildProcess.make({
+    ChildProcess.make(builderCommand.command, builderCommand.args, {
       cwd: repoRoot,
       env: buildEnv,
-      // Windows needs shell mode to resolve .cmd shims.
+      shell: builderCommand.shell,
-      shell: process.platform === "win32",
+    }),
-    })`vp exec --filter @t3tools/desktop -- electron-builder --projectDir ${stageAppDir} ${platformConfig.cliFlag} --${options.arch} --publish never`,
     {
       label: `vp exec --filter @t3tools/desktop -- electron-builder --projectDir ${stageAppDir} ${platformConfig.cliFlag} --${options.arch} --publish never`,
       verbose: options.verbose,

scripts/dev-runner.ts+11-4

 @@ -5,6 +5,8 @@ import * as NodeOS from "node:os";
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import * as NetService from "@t3tools/shared/Net";
+import { HostProcessEnvironment } from "@t3tools/shared/hostProcess";
+import { resolveSpawnCommand } from "@t3tools/shared/shell";
 import * as Config from "effect/Config";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
 @@ -418,9 +420,10 @@ export function runDevRunnerWithInput(input: DevRunnerCliInput) {
       hasExplicitDevUrl: input.devUrl !== undefined,
     });
+    const hostEnvironment = yield* HostProcessEnvironment;
     const env = yield* createDevRunnerEnv({
       mode: input.mode,
-      baseEnv: process.env,
+      baseEnv: hostEnvironment,
       serverOffset,
       webOffset,
       t3Home: input.t3Home,
 @@ -445,14 +448,18 @@ export function runDevRunnerWithInput(input: DevRunnerCliInput) {
       return;
     }
-    const child = yield* ChildProcess.make("vp", [...MODE_ARGS[input.mode], ...input.runArgs], {
+    const spawnCommand = yield* resolveSpawnCommand(
+      "vp",
+      [...MODE_ARGS[input.mode], ...input.runArgs],
+      { env },
+    );
+    const child = yield* ChildProcess.make(spawnCommand.command, spawnCommand.args, {
       stdin: "inherit",
       stdout: "inherit",
       stderr: "inherit",
       env,
       extendEnv: false,
-      // Windows needs shell mode to resolve .cmd shims (e.g. vp.cmd).
+      shell: spawnCommand.shell,
-      shell: process.platform === "win32",
       // Keep Vite+ in the same process group so terminal signals (Ctrl+C)
       // reach it directly. Effect defaults to detached: true on non-Windows,
       // which would put the runner in a new group and require manual forwarding.

scripts/lib/build-target-arch.test.ts+52-57

...	@@ -1,61 +1,56 @@	...	@@ -1,61 +1,56 @@
1	import { assert, describe, it } from "@effect/vitest";	1	import { assert, describe, it } from "@effect/vitest";
2		2	import * as ConfigProvider from "effect/ConfigProvider";
3	import { getDefaultBuildArch, resolveHostProcessArch } from "./build-target-arch.ts";	3	import * as Effect from "effect/Effect";
		4	import * as Layer from "effect/Layer";
		5	import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess";
		6
		7	import { getDefaultBuildArch } from "./build-target-arch.ts";
		8
		9	const compactEnv = (env: Readonly<Record<string, string \| undefined>>): Record<string, string> =>
		10	Object.fromEntries(
		11	Object.entries(env).filter((entry): entry is [string, string] => entry[1] !== undefined),
		12	);
		13
		14	const withHostRuntime = (
		15	platform: NodeJS.Platform,
		16	arch: NodeJS.Architecture,
		17	env: Readonly<Record<string, string \| undefined>> = {},
		18	) =>
		19	Effect.provide(
		20	Layer.mergeAll(
		21	Layer.succeed(HostProcessPlatform, platform),
		22	Layer.succeed(HostProcessArchitecture, arch),
		23	ConfigProvider.layer(ConfigProvider.fromEnv({ env: compactEnv(env) })),
		24	),
		25	);
4		26
5	describe("build-target-arch", () => {	27	describe("build-target-arch", () => {
6	it("prefers arm64 for Windows-on-Arm hosts running x64 emulation", () => {	28	it.effect("uses the resolved host arch when selecting the default Windows build arch", () =>
7	// Windows-on-Arm can run an x64 Node process under emulation while still	29	Effect.gen(function* () {
8	// exposing the real host CPU via PROCESSOR_ARCHITEW6432.	30	// This mirrors the packaging script's default-path behavior: the current
9	const hostArch = resolveHostProcessArch("win32", "x64", {	31	// process is x64, but the machine itself is ARM64, so the default build
10	PROCESSOR_ARCHITECTURE: "AMD64", // The currently running Node process is x64.	32	// target should be win-arm64 rather than win-x64.
11	PROCESSOR_ARCHITEW6432: "ARM64", // Windows exposes the real host CPU here when x64 runs under ARM emulation.	33	const arch = yield* getDefaultBuildArch("win", { archChoices: ["x64", "arm64"] }).pipe(
12	});	34	withHostRuntime("win32", "x64", {
13		35	PROCESSOR_ARCHITECTURE: "AMD64", // The currently running Node process is x64.
14	assert.equal(hostArch, "arm64");	36	PROCESSOR_ARCHITEW6432: "ARM64", // The process is x64, but the actual Windows host is ARM64.
15	});	37	}),
16		38	);
17	it("falls back to x64 for native x64 Windows hosts", () => {	39
18	const hostArch = resolveHostProcessArch("win32", "x64", {	40	assert.equal(arch, "arm64");
19	PROCESSOR_ARCHITECTURE: "AMD64", // Both the process and the Windows host are native x64.	41	}),
20	});	42	);
21		43
22	assert.equal(hostArch, "x64");	44	it.effect("does not apply Windows host env heuristics for non-Windows targets", () =>
23	});	45	Effect.gen(function* () {
24		46	const arch = yield* getDefaultBuildArch("linux", { archChoices: ["x64", "arm64"] }).pipe(
25	it("keeps arm64 when the current process is already native arm64", () => {	47	withHostRuntime("linux", "x64", {
26	const hostArch = resolveHostProcessArch("win32", "arm64", {});	48	PROCESSOR_ARCHITECTURE: "AMD64",
27		49	PROCESSOR_ARCHITEW6432: "ARM64",
28	assert.equal(hostArch, "arm64");	50	}),
29	});	51	);
30		52
31	it("uses the resolved host arch when selecting the default Windows build arch", () => {	53	assert.equal(arch, "x64");
32	// This mirrors the packaging script's default-path behavior: the current	54	}),
33	// process is x64, but the machine itself is ARM64, so the default build	55	);
34	// target should be win-arm64 rather than win-x64.
35	const arch = getDefaultBuildArch(
36	"win",
37	"x64",
38	{
39	PROCESSOR_ARCHITECTURE: "AMD64", // The currently running Node process is x64.
40	PROCESSOR_ARCHITEW6432: "ARM64", // The process is x64, but the actual Windows host is ARM64.
41	},
42	{ archChoices: ["x64", "arm64"] },
43	);
44
45	assert.equal(arch, "arm64");
46	});
47
48	it("does not apply Windows host env heuristics for non-Windows targets", () => {
49	const arch = getDefaultBuildArch(
50	"linux",
51	"x64",
52	{
53	PROCESSOR_ARCHITECTURE: "AMD64",
54	PROCESSOR_ARCHITEW6432: "ARM64",
55	},
56	{ archChoices: ["x64", "arm64"] },
57	);
58
59	assert.equal(arch, "x64");
60	});
61	});	56	});

scripts/lib/build-target-arch.ts+24-16

...	@@ -1,3 +1,8 @@	...	@@ -1,3 +1,8 @@
		1	import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess";
		2	import * as Config from "effect/Config";
		3	import * as Effect from "effect/Effect";
		4	import * as Option from "effect/Option";
		5
1	export type BuildArch = "arm64" \| "x64" \| "universal";	6	export type BuildArch = "arm64" \| "x64" \| "universal";
2	export type BuildPlatform = "mac" \| "linux" \| "win";	7	export type BuildPlatform = "mac" \| "linux" \| "win";
3		8
...	@@ -5,6 +10,11 @@ interface PlatformConfig {	...	@@ -5,6 +10,11 @@ interface PlatformConfig {
5	readonly archChoices: ReadonlyArray<BuildArch>;	10	readonly archChoices: ReadonlyArray<BuildArch>;
6	}	11	}
7		12
		13	const WindowsProcessorArchitectureConfig = Config.all({
		14	processorArchitecture: Config.string("PROCESSOR_ARCHITECTURE").pipe(Config.option),
		15	processorArchitectureW6432: Config.string("PROCESSOR_ARCHITEW6432").pipe(Config.option),
		16	});
		17
8	function normalizeWindowsArch(value: string \| undefined): BuildArch \| undefined {	18	function normalizeWindowsArch(value: string \| undefined): BuildArch \| undefined {
9	const normalized = value?.trim().toLowerCase();	19	const normalized = value?.trim().toLowerCase();
10	if (!normalized) return undefined;	20	if (!normalized) return undefined;
...	@@ -13,38 +23,36 @@ function normalizeWindowsArch(value: string \| undefined): BuildArch \| undefined	...	@@ -13,38 +23,36 @@ function normalizeWindowsArch(value: string \| undefined): BuildArch \| undefined
13	return undefined;	23	return undefined;
14	}	24	}
15		25
16	export function resolveHostProcessArch(	26	const optionToUndefined = <A>(value: Option.Option<A>): A \| undefined =>
17	platform: NodeJS.Platform,	27	Option.getOrUndefined(value);
18	processArch: NodeJS.Architecture,	28
19	env: NodeJS.ProcessEnv,	29	const resolveHostProcessArch = Effect.fn("resolveHostProcessArch")(function* () {
20	): BuildArch \| undefined {	30	const platform = yield* HostProcessPlatform;
		31	const processArch = yield* HostProcessArchitecture;
21	if (processArch === "arm64") return "arm64";	32	if (processArch === "arm64") return "arm64";
22	if (processArch === "x64") {	33	if (processArch === "x64") {
23	if (platform !== "win32") return "x64";	34	if (platform !== "win32") return "x64";
24		35
25	// On Windows-on-Arm, x64 Node/Bun can run under emulation while the host	36	// On Windows-on-Arm, x64 Node/Bun can run under emulation while the host
26	// still reports ARM64 via the processor environment variables.	37	// still reports ARM64 via the processor environment variables.
		38	const env = yield* WindowsProcessorArchitectureConfig;
27	return (	39	return (
28	normalizeWindowsArch(env.PROCESSOR_ARCHITEW6432) ??	40	normalizeWindowsArch(optionToUndefined(env.processorArchitectureW6432)) ??
29	normalizeWindowsArch(env.PROCESSOR_ARCHITECTURE) ??	41	normalizeWindowsArch(optionToUndefined(env.processorArchitecture)) ??
30	"x64"	42	"x64"
31	);	43	);
32	}	44	}
33	return undefined;	45	return undefined;
34	}	46	});
35		47
36	export function getDefaultBuildArch(	48	export const getDefaultBuildArch = Effect.fn("getDefaultBuildArch")(function* (
37	platform: BuildPlatform,	49	platform: BuildPlatform,
38	processArch: NodeJS.Architecture,
39	env: NodeJS.ProcessEnv,
40	platformConfig: PlatformConfig,	50	platformConfig: PlatformConfig,
41	): BuildArch {	51	) {
42	const hostPlatform: NodeJS.Platform =	52	const hostArch = yield* resolveHostProcessArch();
43	platform === "win" ? "win32" : platform === "mac" ? "darwin" : "linux";
44	const hostArch = resolveHostProcessArch(hostPlatform, processArch, env);
45	if (hostArch && platformConfig.archChoices.includes(hostArch)) {	53	if (hostArch && platformConfig.archChoices.includes(hostArch)) {
46	return hostArch;	54	return hostArch;
47	}	55	}
48		56
49	return platformConfig.archChoices[0] ?? "x64";	57	return platformConfig.archChoices[0] ?? "x64";
50	}	58	});

scripts/mobile-native-static-check.ts+5-19

 @@ -2,6 +2,7 @@
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
 import * as NodeServices from "@effect/platform-node/NodeServices";
+import { isCommandAvailable, resolveSpawnCommand } from "@t3tools/shared/shell";
 import * as Console from "effect/Console";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
 @@ -58,23 +59,7 @@ const commandOutputOptions = {
 } as const;
 const commandExists = Effect.fn("commandExists")(function* (command: string) {
-  const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+  return yield* isCommandAvailable(command);
-  const lookupCommand =
-    process.platform === "win32"
-      ? ChildProcess.make("where", [command], {
-          stdout: "ignore",
-          stderr: "ignore",
-        })
-      : ChildProcess.make("/bin/sh", ["-c", `command -v ${command}`], {
-          stdout: "ignore",
-          stderr: "ignore",
-        });
-  return yield* spawner.spawn(lookupCommand).pipe(
-    Effect.flatMap((child) => child.exitCode),
-    Effect.map((exitCode) => exitCode === 0),
-    Effect.orElseSucceed(() => false),
-  );
 });
 const warnMissingTool = (tool: NativeStaticTool, checkName: string) =>
 @@ -89,11 +74,12 @@ const runCommand = Effect.fn("runCommand")(function* (
 ) {
   yield* Console.log(`$ ${[command, ...args].join(" ")}`);
   const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+  const spawnCommand = yield* resolveSpawnCommand(command, args);
   const child = yield* spawner.spawn(
-    ChildProcess.make(command, [...args], {
+    ChildProcess.make(spawnCommand.command, spawnCommand.args, {
       cwd,
       ...commandOutputOptions,
-      shell: process.platform === "win32",
+      shell: spawnCommand.shell,
     }),
   );
   const exitCode = Number(yield* child.exitCode);

vite.config.ts+2-4

 @@ -1,12 +1,9 @@
 import "vite-plus/test/config";
 import { defineConfig } from "vite-plus";
-import { fileURLToPath } from "node:url";
 export default defineConfig({
   resolve: {
-    alias: {
+    tsconfigPaths: true,
-      "~": fileURLToPath(new URL("./apps/web/src", import.meta.url)),
-    },
   },
   test: {
     environment: "node",
 @@ -96,6 +93,7 @@ export default defineConfig({
       "typescript/require-array-sort-compare": "off",
       "typescript/restrict-template-expressions": "off",
       "typescript/unbound-method": "off",
+      "t3code/no-global-process-runtime": "error",
       "t3code/no-inline-schema-compile": "warn",
       "t3code/no-manual-effect-runtime-in-tests": "error",
     },

author	Julius Marminge <julius0216@outlook.com> 2026-06-14 16:47:56-07:00
committer	GitHub <noreply@github.com> 2026-06-14 16:47:56-07:00
log	477795697d8546a8db4903bd878a5ad3196423b9
tree	69b3a8096f413d70ebaaf42ca573809b0b0f94ac
parent	a23b83314ec82dca5976a412e60e27f154ea0451
signature	Signed by PGP key B5690EEEBB952194

...	@@ -6,6 +6,7 @@ import * as Option from "effect/Option";	...	@@ -6,6 +6,7 @@ import * as Option from "effect/Option";
6	import * as Ref from "effect/Ref";	6	import * as Ref from "effect/Ref";
7		7
8	import * as Electron from "electron";	8	import * as Electron from "electron";
		9	import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
9		10
10	export class ElectronWindowCreateError extends Data.TaggedError("ElectronWindowCreateError")<{	11	export class ElectronWindowCreateError extends Data.TaggedError("ElectronWindowCreateError")<{
11	readonly cause: unknown;	12	readonly cause: unknown;
...	@@ -37,6 +38,7 @@ export class ElectronWindow extends Context.Service<ElectronWindow, ElectronWind	...	@@ -37,6 +38,7 @@ export class ElectronWindow extends Context.Service<ElectronWindow, ElectronWind
37	) {}	38	) {}
38		39
39	const make = Effect.gen(function* () {	40	const make = Effect.gen(function* () {
		41	const platform = yield* HostProcessPlatform;
40	const mainWindowRef = yield* Ref.make<Option.Option<Electron.BrowserWindow>>(Option.none());	42	const mainWindowRef = yield* Ref.make<Option.Option<Electron.BrowserWindow>>(Option.none());
41		43
42	const liveMain = Ref.get(mainWindowRef).pipe(	44	const liveMain = Ref.get(mainWindowRef).pipe(
...	@@ -98,7 +100,7 @@ const make = Effect.gen(function* () {	...	@@ -98,7 +100,7 @@ const make = Effect.gen(function* () {
98	window.show();	100	window.show();
99	}	101	}
100		102
101	if (process.platform === "darwin") {	103	if (platform === "darwin") {
102	Electron.app.focus({ steal: true });	104	Electron.app.focus({ steal: true });
103	}	105	}
104		106

...	@@ -82,9 +82,10 @@ function resolveDesktopDevServerUrl(	...	@@ -82,9 +82,10 @@ function resolveDesktopDevServerUrl(
82		82
83	function getIconOption(	83	function getIconOption(
84	iconPaths: DesktopAssets.DesktopIconPaths,	84	iconPaths: DesktopAssets.DesktopIconPaths,
		85	platform: NodeJS.Platform,
85	): { icon: string } \| Record<string, never> {	86	): { icon: string } \| Record<string, never> {
86	if (process.platform === "darwin") return {}; // macOS uses .icns from app bundle	87	if (platform === "darwin") return {}; // macOS uses .icns from app bundle
87	const ext = process.platform === "win32" ? "ico" : "png";	88	const ext = platform === "win32" ? "ico" : "png";
88	return Option.match(iconPaths[ext], {	89	return Option.match(iconPaths[ext], {
89	onNone: () => ({}),	90	onNone: () => ({}),
90	onSome: (icon) => ({ icon }),	91	onSome: (icon) => ({ icon }),
...	@@ -106,8 +107,11 @@ export function isSameOriginRendererNavigation(input: {	...	@@ -106,8 +107,11 @@ export function isSameOriginRendererNavigation(input: {
106	}	107	}
107	}	108	}
108		109
109	function getWindowTitleBarOptions(shouldUseDarkColors: boolean): WindowTitleBarOptions {	110	function getWindowTitleBarOptions(
110	if (process.platform === "darwin") {	111	shouldUseDarkColors: boolean,
		112	platform: NodeJS.Platform,
		113	): WindowTitleBarOptions {
		114	if (platform === "darwin") {
111	return {	115	return {
112	titleBarStyle: "hiddenInset",	116	titleBarStyle: "hiddenInset",
113	trafficLightPosition: { x: 16, y: 18 },	117	trafficLightPosition: { x: 16, y: 18 },
...	@@ -127,6 +131,7 @@ function getWindowTitleBarOptions(shouldUseDarkColors: boolean): WindowTitleBarO	...	@@ -127,6 +131,7 @@ function getWindowTitleBarOptions(shouldUseDarkColors: boolean): WindowTitleBarO
127	function syncWindowAppearance(	131	function syncWindowAppearance(
128	window: Electron.BrowserWindow,	132	window: Electron.BrowserWindow,
129	shouldUseDarkColors: boolean,	133	shouldUseDarkColors: boolean,
		134	platform: NodeJS.Platform,
130	): Effect.Effect<void> {	135	): Effect.Effect<void> {
131	return Effect.sync(() => {	136	return Effect.sync(() => {
132	if (window.isDestroyed()) {	137	if (window.isDestroyed()) {
...	@@ -134,7 +139,7 @@ function syncWindowAppearance(	...	@@ -134,7 +139,7 @@ function syncWindowAppearance(
134	}	139	}
135		140
136	window.setBackgroundColor(getInitialWindowBackgroundColor(shouldUseDarkColors));	141	window.setBackgroundColor(getInitialWindowBackgroundColor(shouldUseDarkColors));
137	const { titleBarOverlay } = getWindowTitleBarOptions(shouldUseDarkColors);	142	const { titleBarOverlay } = getWindowTitleBarOptions(shouldUseDarkColors, platform);
138	if (typeof titleBarOverlay === "object") {	143	if (typeof titleBarOverlay === "object") {
139	window.setTitleBarOverlay(titleBarOverlay);	144	window.setTitleBarOverlay(titleBarOverlay);
140	}	145	}
...	@@ -179,7 +184,7 @@ const make = Effect.gen(function* () {	...	@@ -179,7 +184,7 @@ const make = Effect.gen(function* () {
179	? yield* resolveDesktopDevServerUrl(environment)	184	? yield* resolveDesktopDevServerUrl(environment)
180	: backendHttpUrl.href;	185	: backendHttpUrl.href;
181	const iconPaths = yield* assets.iconPaths;	186	const iconPaths = yield* assets.iconPaths;
182	const iconOption = getIconOption(iconPaths);	187	const iconOption = getIconOption(iconPaths, environment.platform);
183	const shouldUseDarkColors = yield* electronTheme.shouldUseDarkColors;	188	const shouldUseDarkColors = yield* electronTheme.shouldUseDarkColors;
184	const window = yield* electronWindow.create({	189	const window = yield* electronWindow.create({
185	width: 1100,	190	width: 1100,
...	@@ -191,7 +196,7 @@ const make = Effect.gen(function* () {	...	@@ -191,7 +196,7 @@ const make = Effect.gen(function* () {
191	backgroundColor: getInitialWindowBackgroundColor(shouldUseDarkColors),	196	backgroundColor: getInitialWindowBackgroundColor(shouldUseDarkColors),
192	...iconOption,	197	...iconOption,
193	title: environment.displayName,	198	title: environment.displayName,
194	...getWindowTitleBarOptions(shouldUseDarkColors),	199	...getWindowTitleBarOptions(shouldUseDarkColors, environment.platform),
195	webPreferences: {	200	webPreferences: {
196	preload: environment.preloadPath,	201	preload: environment.preloadPath,
197	contextIsolation: true,	202	contextIsolation: true,
...	@@ -318,7 +323,7 @@ const make = Effect.gen(function* () {	...	@@ -318,7 +323,7 @@ const make = Effect.gen(function* () {
318	});	323	});
319		324
320	const revealSubscribers: RevealSubscription[] = [(fire) => window.once("ready-to-show", fire)];	325	const revealSubscribers: RevealSubscription[] = [(fire) => window.once("ready-to-show", fire)];
321	if (process.platform === "linux") {	326	if (environment.platform === "linux") {
322	revealSubscribers.push((fire) => window.webContents.once("did-finish-load", fire));	327	revealSubscribers.push((fire) => window.webContents.once("did-finish-load", fire));
323	}	328	}
324	bindFirstRevealTrigger(revealSubscribers, () => {	329	bindFirstRevealTrigger(revealSubscribers, () => {
...	@@ -408,7 +413,7 @@ const make = Effect.gen(function* () {	...	@@ -408,7 +413,7 @@ const make = Effect.gen(function* () {
408	syncAppearance: Effect.gen(function* () {	413	syncAppearance: Effect.gen(function* () {
409	const shouldUseDarkColors = yield* electronTheme.shouldUseDarkColors;	414	const shouldUseDarkColors = yield* electronTheme.shouldUseDarkColors;
410	yield* electronWindow.syncAllAppearance((window) =>	415	yield* electronWindow.syncAllAppearance((window) =>
411	syncWindowAppearance(window, shouldUseDarkColors),	416	syncWindowAppearance(window, shouldUseDarkColors, environment.platform),
412	);	417	);
413	}).pipe(Effect.withSpan("desktop.window.syncAppearance")),	418	}).pipe(Effect.withSpan("desktop.window.syncAppearance")),
414	});	419	});

...	@@ -301,9 +301,10 @@ export const makePendingOpenCodeProvider = (	...	@@ -301,9 +301,10 @@ export const makePendingOpenCodeProvider = (
301	export const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatus")(function* (	301	export const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatus")(function* (
302	openCodeSettings: OpenCodeSettings,	302	openCodeSettings: OpenCodeSettings,
303	cwd: string,	303	cwd: string,
304	environment: NodeJS.ProcessEnv = process.env,	304	environment?: NodeJS.ProcessEnv,
305	): Effect.fn.Return<ServerProviderDraft, never, OpenCodeRuntime> {	305	): Effect.fn.Return<ServerProviderDraft, never, OpenCodeRuntime> {
306	const openCodeRuntime = yield* OpenCodeRuntime;	306	const openCodeRuntime = yield* OpenCodeRuntime;
		307	const resolvedEnvironment = environment ?? process.env;
307	const checkedAt = DateTime.formatIso(yield* DateTime.now);	308	const checkedAt = DateTime.formatIso(yield* DateTime.now);
308	const customModels = openCodeSettings.customModels;	309	const customModels = openCodeSettings.customModels;
309	const isExternalServer = openCodeSettings.serverUrl.trim().length > 0;	310	const isExternalServer = openCodeSettings.serverUrl.trim().length > 0;
...	@@ -364,7 +365,7 @@ export const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatu	...	@@ -364,7 +365,7 @@ export const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatu
364	.runOpenCodeCommand({	365	.runOpenCodeCommand({
365	binaryPath: openCodeSettings.binaryPath,	366	binaryPath: openCodeSettings.binaryPath,
366	args: ["--version"],	367	args: ["--version"],
367	environment,	368	environment: resolvedEnvironment,
368	})	369	})
369	.pipe(	370	.pipe(
370	Effect.mapError(	371	Effect.mapError(
...	@@ -413,7 +414,7 @@ export const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatu	...	@@ -413,7 +414,7 @@ export const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatu
413	const server = yield* openCodeRuntime.connectToOpenCodeServer({	414	const server = yield* openCodeRuntime.connectToOpenCodeServer({
414	binaryPath: openCodeSettings.binaryPath,	415	binaryPath: openCodeSettings.binaryPath,
415	serverUrl: openCodeSettings.serverUrl,	416	serverUrl: openCodeSettings.serverUrl,
416	environment,	417	environment: resolvedEnvironment,
417	});	418	});
418	return yield* openCodeRuntime.loadOpenCodeInventory(	419	return yield* openCodeRuntime.loadOpenCodeInventory(
419	openCodeRuntime.createOpenCodeSdkClient({	420	openCodeRuntime.createOpenCodeSdkClient({

...	@@ -1,10 +1,11 @@	...	@@ -1,10 +1,11 @@
		1	import * as NodeOS from "node:os";
1	import * as Crypto from "effect/Crypto";	2	import * as Crypto from "effect/Crypto";
2	import * as Effect from "effect/Effect";	3	import * as Effect from "effect/Effect";
3	import * as Encoding from "effect/Encoding";	4	import * as Encoding from "effect/Encoding";
4	import * as FileSystem from "effect/FileSystem";	5	import * as FileSystem from "effect/FileSystem";
5	import * as Path from "effect/Path";	6	import * as Path from "effect/Path";
6	import * as Schema from "effect/Schema";	7	import * as Schema from "effect/Schema";
7	import { homedir } from "node:os";	8
8	import { ServerConfig } from "../config.ts";	9	import { ServerConfig } from "../config.ts";
9		10
10	const CodexAuthJsonSchema = Schema.Struct({	11	const CodexAuthJsonSchema = Schema.Struct({
...	@@ -39,7 +40,7 @@ const getCodexAccountId = Effect.gen(function* () {	...	@@ -39,7 +40,7 @@ const getCodexAccountId = Effect.gen(function* () {
39	const fileSystem = yield* FileSystem.FileSystem;	40	const fileSystem = yield* FileSystem.FileSystem;
40	const path = yield* Path.Path;	41	const path = yield* Path.Path;
41		42
42	const authJsonPath = path.join(homedir(), ".codex", "auth.json");	43	const authJsonPath = path.join(NodeOS.homedir(), ".codex", "auth.json");
43	const authJson = yield* Effect.flatMap(	44	const authJson = yield* Effect.flatMap(
44	fileSystem.readFileString(authJsonPath),	45	fileSystem.readFileString(authJsonPath),
45	Schema.decodeEffect(Schema.fromJsonString(CodexAuthJsonSchema)),	46	Schema.decodeEffect(Schema.fromJsonString(CodexAuthJsonSchema)),
...	@@ -52,7 +53,7 @@ const getClaudeUserId = Effect.gen(function* () {	...	@@ -52,7 +53,7 @@ const getClaudeUserId = Effect.gen(function* () {
52	const fileSystem = yield* FileSystem.FileSystem;	53	const fileSystem = yield* FileSystem.FileSystem;
53	const path = yield* Path.Path;	54	const path = yield* Path.Path;
54		55
55	const claudeJsonPath = path.join(homedir(), ".claude.json");	56	const claudeJsonPath = path.join(NodeOS.homedir(), ".claude.json");
56	const claudeJson = yield* Effect.flatMap(	57	const claudeJson = yield* Effect.flatMap(
57	fileSystem.readFileString(claudeJsonPath),	58	fileSystem.readFileString(claudeJsonPath),
58	Schema.decodeEffect(Schema.fromJsonString(ClaudeJsonSchema)),	59	Schema.decodeEffect(Schema.fromJsonString(ClaudeJsonSchema)),

...	@@ -59,9 +59,10 @@ function isTextGenerationError(error: unknown): error is TextGenerationError {	...	@@ -59,9 +59,10 @@ function isTextGenerationError(error: unknown): error is TextGenerationError {
59	*/	59	*/
60	export const makeCursorTextGeneration = Effect.fn("makeCursorTextGeneration")(function* (	60	export const makeCursorTextGeneration = Effect.fn("makeCursorTextGeneration")(function* (
61	cursorSettings: CursorSettings,	61	cursorSettings: CursorSettings,
62	environment: NodeJS.ProcessEnv = process.env,	62	environment?: NodeJS.ProcessEnv,
63	) {	63	) {
64	const commandSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;	64	const commandSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
		65	const resolvedEnvironment = environment ?? process.env;
65		66
66	const runCursorJson = <S extends Schema.Top>({	67	const runCursorJson = <S extends Schema.Top>({
67	operation,	68	operation,
...	@@ -84,7 +85,7 @@ export const makeCursorTextGeneration = Effect.fn("makeCursorTextGeneration")(fu	...	@@ -84,7 +85,7 @@ export const makeCursorTextGeneration = Effect.fn("makeCursorTextGeneration")(fu
84	const outputRef = yield* Ref.make("");	85	const outputRef = yield* Ref.make("");
85	const runtime = yield* makeCursorAcpRuntime({	86	const runtime = yield* makeCursorAcpRuntime({
86	cursorSettings,	87	cursorSettings,
87	environment,	88	environment: resolvedEnvironment,
88	childProcessSpawner: commandSpawner,	89	childProcessSpawner: commandSpawner,
89	cwd,	90	cwd,
90	clientInfo: { name: "t3-code-git-text", version: "0.0.0" },	91	clientInfo: { name: "t3-code-git-text", version: "0.0.0" },

refactor: resolve host process state through Effect (#2959)