@p4code/cli 0.0.35 → 0.0.37

package/dist/bin.mjs

@@ -1,16 +1,28 @@
 #!/usr/bin/env node
 
-import { a as HostProcessEnvironment, c as HostProcessPlatform, i as HostProcessArguments, l as HostProcessUserId, n as PtySpawnError, o as HostProcessExecutablePath, r as HostProcessArchitecture, s as HostProcessHostname, t as PtyAdapter } from "./PtyAdapter-DO4FyE0R.mjs";
+import { a as HostProcessEnvironment, c as HostProcessPlatform, i as HostProcessArguments, l as HostProcessUserId, n as PtySpawnError, o as HostProcessExecutablePath, r as HostProcessArchitecture, s as HostProcessHostname, t as PtyAdapter } from "./PtyAdapter-DLKyoorI.mjs";
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
 import * as NodeServices from "@effect/platform-node/NodeServices";
+import * as Console from "effect/Console";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import { Argument, Command, Flag, GlobalFlag, Prompt } from "effect/unstable/cli";
+import { FetchHttpClient, Headers, HttpBody, HttpClient, HttpClientError, HttpClientRequest, HttpClientResponse, HttpRouter, HttpServer, HttpServerRequest, HttpServerRespondable, HttpServerResponse } from "effect/unstable/http";
+import * as Context from "effect/Context";
+import * as NodeOS from "node:os";
 import * as NodeNet from "node:net";
 import * as Data from "effect/Data";
-import * as Context from "effect/Context";
 import * as Predicate from "effect/Predicate";
+import * as FileSystem from "effect/FileSystem";
+import "effect/LogLevel";
+import * as Path from "effect/Path";
 import * as Schema$1 from "effect/Schema";
+import * as NodePath from "node:path";
+import * as NodeChildProcess from "node:child_process";
+import * as NodeFS from "node:fs";
+import * as DateTime from "effect/DateTime";
+import * as Duration from "effect/Duration";
+import * as Option from "effect/Option";
 import * as SchemaTransformation from "effect/SchemaTransformation";
 import * as HttpApiSchema from "effect/unstable/httpapi/HttpApiSchema";
 import * as HttpApi from "effect/unstable/httpapi/HttpApi";
@@ -19,20 +31,13 @@ import * as HttpApiGroup from "effect/unstable/httpapi/HttpApiGroup";
 import * as HttpApiMiddleware from "effect/unstable/httpapi/HttpApiMiddleware";
 import * as HttpServerRespondable$1 from "effect/unstable/http/HttpServerRespondable";
 import * as HttpServerResponse$1 from "effect/unstable/http/HttpServerResponse";
-import * as Option from "effect/Option";
 import * as SchemaIssue from "effect/SchemaIssue";
 import * as Struct from "effect/Struct";
 import { Schema } from "effect";
-import * as Duration from "effect/Duration";
 import * as Rpc from "effect/unstable/rpc/Rpc";
 import * as RpcGroup from "effect/unstable/rpc/RpcGroup";
-import * as Console from "effect/Console";
 import * as References from "effect/References";
-import * as DateTime from "effect/DateTime";
 import * as HttpServerRequest$1 from "effect/unstable/http/HttpServerRequest";
-import * as FileSystem from "effect/FileSystem";
-import "effect/LogLevel";
-import * as Path from "effect/Path";
 import * as NodeCrypto from "node:crypto";
 import * as Encoding from "effect/Encoding";
 import * as Result from "effect/Result";
@@ -48,12 +53,7 @@ import * as Cause from "effect/Cause";
 import * as Exit from "effect/Exit";
 import * as SchemaGetter from "effect/SchemaGetter";
 import * as Config from "effect/Config";
-import * as NodeFS from "node:fs";
 import * as NodeReadline from "node:readline";
-import * as NodeOS from "node:os";
-import * as NodePath from "node:path";
-import * as NodeChildProcess from "node:child_process";
-import { FetchHttpClient, Headers, HttpBody, HttpClient, HttpClientError, HttpClientRequest, HttpClientResponse, HttpRouter, HttpServer, HttpServerRequest, HttpServerRespondable, HttpServerResponse } from "effect/unstable/http";
 import * as HttpApiClient from "effect/unstable/httpapi/HttpApiClient";
 import * as Clock from "effect/Clock";
 import * as Deferred from "effect/Deferred";
@@ -232,7 +232,713 @@ const make$67 = () => {
 const layer$62 = Layer.sync(NetService, make$67);
 //#endregion
 //#region package.json
-var version = "0.0.35";
+var version = "0.0.37";
+//#endregion
+//#region src/config.ts
+/**
+* ServerConfig - Runtime configuration services.
+*
+* Defines process-level server configuration and networking helpers used by
+* startup and runtime layers.
+*
+* @module ServerConfig
+*/
+const DEFAULT_PORT = 3773;
+const RuntimeMode$1 = Schema$1.Literals(["web", "desktop"]);
+Schema$1.Literals(["browser", "headless"]);
+/**
+* ServerConfig - Service tag for server runtime configuration.
+*/
+var ServerConfig$1 = class extends Context.Service()("@p4code/cli/config/ServerConfig") {
+	/** @deprecated Import and use `layerTest` from this module. */
+	static layerTest = (cwd, baseDirOrPrefix) => layerTest$2(cwd, baseDirOrPrefix);
+};
+const make$66 = (config) => ServerConfig$1.of(config);
+const layer$61 = (config) => Layer.succeed(ServerConfig$1, make$66(config));
+const deriveServerPaths = Effect.fn(function* (baseDir, devUrl, options = {}) {
+	const { join } = yield* Path.Path;
+	const stateDir = join(baseDir, devUrl !== void 0 && !options.baseDirIsExplicit ? "dev" : "userdata");
+	const dbPath = join(stateDir, "state.sqlite");
+	const attachmentsDir = join(stateDir, "attachments");
+	const logsDir = join(stateDir, "logs");
+	const providerLogsDir = join(logsDir, "provider");
+	const providerStatusCacheDir = join(baseDir, "caches");
+	return {
+		stateDir,
+		dbPath,
+		keybindingsConfigPath: join(stateDir, "keybindings.json"),
+		settingsPath: join(stateDir, "settings.json"),
+		providerStatusCacheDir,
+		worktreesDir: join(baseDir, "worktrees"),
+		attachmentsDir,
+		logsDir,
+		serverLogPath: join(logsDir, "server.log"),
+		serverTracePath: join(logsDir, "server.trace.ndjson"),
+		providerLogsDir,
+		providerEventLogPath: join(providerLogsDir, "events.log"),
+		terminalLogsDir: join(logsDir, "terminals"),
+		anonymousIdPath: join(stateDir, "anonymous-id"),
+		environmentIdPath: join(stateDir, "environment-id"),
+		serverRuntimeStatePath: join(stateDir, "server-runtime.json"),
+		secretsDir: join(stateDir, "secrets")
+	};
+});
+const ensureServerDirectories = Effect.fn(function* (derivedPaths) {
+	const fs = yield* FileSystem.FileSystem;
+	const path = yield* Path.Path;
+	yield* Effect.all([
+		fs.makeDirectory(derivedPaths.stateDir, { recursive: true }),
+		fs.makeDirectory(derivedPaths.logsDir, { recursive: true }),
+		fs.makeDirectory(derivedPaths.providerLogsDir, { recursive: true }),
+		fs.makeDirectory(derivedPaths.terminalLogsDir, { recursive: true }),
+		fs.makeDirectory(derivedPaths.attachmentsDir, { recursive: true }),
+		fs.makeDirectory(derivedPaths.worktreesDir, { recursive: true }),
+		fs.makeDirectory(path.dirname(derivedPaths.keybindingsConfigPath), { recursive: true }),
+		fs.makeDirectory(path.dirname(derivedPaths.settingsPath), { recursive: true }),
+		fs.makeDirectory(derivedPaths.providerStatusCacheDir, { recursive: true }),
+		fs.makeDirectory(path.dirname(derivedPaths.anonymousIdPath), { recursive: true }),
+		fs.makeDirectory(path.dirname(derivedPaths.serverRuntimeStatePath), { recursive: true })
+	], { concurrency: "unbounded" });
+});
+const makeTest$1 = Effect.fn("ServerConfig.makeTest")(function* (cwd, baseDirOrPrefix) {
+	const devUrl = void 0;
+	const fs = yield* FileSystem.FileSystem;
+	const baseDir = typeof baseDirOrPrefix === "string" ? baseDirOrPrefix : yield* fs.makeTempDirectoryScoped({ prefix: baseDirOrPrefix.prefix });
+	const derivedPaths = yield* deriveServerPaths(baseDir, devUrl);
+	yield* ensureServerDirectories(derivedPaths);
+	return ServerConfig$1.of({
+		logLevel: "Error",
+		traceMinLevel: "Info",
+		traceTimingEnabled: true,
+		traceBatchWindowMs: 200,
+		traceMaxBytes: 10 * 1024 * 1024,
+		traceMaxFiles: 10,
+		otlpTracesUrl: void 0,
+		otlpMetricsUrl: void 0,
+		otlpExportIntervalMs: 1e4,
+		otlpServiceName: "p4-server",
+		cwd,
+		baseDir,
+		...derivedPaths,
+		mode: "web",
+		autoBootstrapProjectFromCwd: false,
+		logWebSocketEvents: false,
+		tailscaleServeEnabled: false,
+		tailscaleServePort: 443,
+		port: 0,
+		host: void 0,
+		desktopBootstrapToken: void 0,
+		staticDir: void 0,
+		devUrl,
+		devAllowedOrigins: [],
+		noBrowser: false,
+		startupPresentation: "browser"
+	});
+});
+const layerTest$2 = (cwd, baseDirOrPrefix) => Layer.effect(ServerConfig$1, makeTest$1(cwd, baseDirOrPrefix));
+const resolveStaticDir = Effect.fn(function* () {
+	const { join, resolve } = yield* Path.Path;
+	const { exists } = yield* FileSystem.FileSystem;
+	const bundledClient = resolve(join(import.meta.dirname, "client"));
+	if (yield* exists(join(bundledClient, "index.html")).pipe(Effect.orElseSucceed(() => false))) return bundledClient;
+	const monorepoClient = resolve(join(import.meta.dirname, "../../web/dist"));
+	if (yield* exists(join(monorepoClient, "index.html")).pipe(Effect.orElseSucceed(() => false))) return monorepoClient;
+});
+//#endregion
+//#region ../../packages/shared/src/shell.ts
+const SHELL_ENV_NAME_PATTERN = /^[A-Z0-9_]+$/;
+const WINDOWS_PATH_DELIMITER = ";";
+const POSIX_PATH_DELIMITER = ":";
+const WINDOWS_SHELL_CANDIDATES = ["pwsh.exe", "powershell.exe"];
+function canExecuteFile(filePath) {
+	try {
+		NodeFS.accessSync(filePath, NodeFS.constants.X_OK);
+		return true;
+	} catch {
+		return false;
+	}
+}
+var CommandResolutionError = class extends Data.TaggedError("CommandResolutionError") {};
+const WINDOWS_SHELL_META_CHARS = /([()\][%!^"`<>&|;, *?])/g;
+/**
+* Escapes a single argument for `cmd.exe` shell mode (`spawn(..., { shell: true })`
+* on Windows). Node joins the command and arguments with spaces and hands the
+* resulting string to `cmd.exe` without any quoting, so every dynamic argument
+* must be escaped to survive both cmd.exe parsing and the target program's
+* `CommandLineToArgvW` parsing. Mirrors cross-spawn's argument escaping.
+*/
+function escapeWindowsShellArg(arg) {
+	let escaped = arg.replace(/(\\*)"/g, "$1$1\\\"");
+	escaped = escaped.replace(/(\\*)$/, "$1$1");
+	escaped = `"${escaped}"`;
+	return escaped.replace(WINDOWS_SHELL_META_CHARS, "^$1");
+}
+/**
+* Escapes arguments for shell-mode spawns: applies {@link escapeWindowsShellArg}
+* when the platform is `win32` (where `shell: true` routes through `cmd.exe`)
+* and returns the arguments untouched everywhere else.
+*/
+function sanitizeShellModeArgsForPlatform(args, platform) {
+	return platform === "win32" ? args.map(escapeWindowsShellArg) : [...args];
+}
+function resolveSpawnExecutableWithNode(command, platform, env) {
+	const path = platform === "win32" ? NodePath.win32 : NodePath.posix;
+	const windowsPathExtensions = platform === "win32" ? resolveWindowsPathExtensions(env) : [];
+	const candidates = resolveCommandCandidates(command, platform, windowsPathExtensions, path.extname);
+	const isExecutable = (candidate) => {
+		try {
+			if (!NodeFS.statSync(candidate).isFile()) return false;
+			if (platform === "win32") return windowsPathExtensions.includes(path.extname(candidate).toUpperCase());
+			return canExecuteFile(candidate);
+		} catch {
+			return false;
+		}
+	};
+	if (command.includes("/") || command.includes("\\")) return candidates.find(isExecutable);
+	for (const pathEntry of (readEnvPath(env) ?? "").split(pathDelimiterForPlatform(platform))) {
+		const normalizedPathEntry = stripWrappingQuotes(pathEntry.trim());
+		if (normalizedPathEntry.length === 0) continue;
+		for (const candidate of candidates) {
+			const candidatePath = path.join(normalizedPathEntry, candidate);
+			if (isExecutable(candidatePath)) return candidatePath;
+		}
+	}
+}
+const SpawnExecutableResolution = Context.Reference("@p4code/shared/shell/SpawnExecutableResolution", { defaultValue: () => resolveSpawnExecutableWithNode });
+function trimNonEmpty(value) {
+	const trimmed = value?.trim();
+	return trimmed && trimmed.length > 0 ? trimmed : void 0;
+}
+function readUserLoginShell() {
+	try {
+		return trimNonEmpty(NodeOS.userInfo().shell);
+	} catch {
+		return;
+	}
+}
+function listLoginShellCandidates(platform, shell, userShell = readUserLoginShell()) {
+	const fallbackShell = platform === "darwin" ? "/bin/zsh" : platform === "linux" ? "/bin/bash" : void 0;
+	const seen = /* @__PURE__ */ new Set();
+	const candidates = [];
+	for (const candidate of [
+		trimNonEmpty(shell),
+		trimNonEmpty(userShell),
+		fallbackShell
+	]) {
+		if (!candidate || seen.has(candidate)) continue;
+		seen.add(candidate);
+		candidates.push(candidate);
+	}
+	return candidates;
+}
+function readPathFromLoginShell(shell, execFile = NodeChildProcess.execFileSync) {
+	return readEnvironmentFromLoginShell(shell, ["PATH"], execFile).PATH;
+}
+function readPathFromLaunchctl(execFile = NodeChildProcess.execFileSync) {
+	try {
+		return trimNonEmpty(execFile("/bin/launchctl", ["getenv", "PATH"], {
+			encoding: "utf8",
+			timeout: 2e3
+		}));
+	} catch {
+		return;
+	}
+}
+function mergePathEntries(preferredPath, inheritedPath, platform) {
+	const delimiter = platform === "win32" ? ";" : ":";
+	const merged = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const pathValue of [preferredPath, inheritedPath]) {
+		if (!pathValue) continue;
+		for (const entry of pathValue.split(delimiter)) {
+			const trimmedEntry = entry.trim();
+			if (!trimmedEntry || seen.has(trimmedEntry)) continue;
+			seen.add(trimmedEntry);
+			merged.push(trimmedEntry);
+		}
+	}
+	return merged.length > 0 ? merged.join(delimiter) : void 0;
+}
+function envCaptureStart(name) {
+	return `__P4CODE_ENV_${name}_START__`;
+}
+function envCaptureEnd(name) {
+	return `__P4CODE_ENV_${name}_END__`;
+}
+function buildEnvironmentCaptureCommand(names) {
+	return names.map((name) => {
+		if (!SHELL_ENV_NAME_PATTERN.test(name)) throw new Error(`Unsupported environment variable name: ${name}`);
+		return [
+			`printf '%s\\n' '${envCaptureStart(name)}'`,
+			`printenv ${name} || true`,
+			`printf '%s\\n' '${envCaptureEnd(name)}'`
+		].join("; ");
+	}).join("; ");
+}
+function buildWindowsEnvironmentCaptureCommand(names) {
+	return ["$ErrorActionPreference = 'Stop'", ...names.flatMap((name) => {
+		if (!SHELL_ENV_NAME_PATTERN.test(name)) throw new Error(`Unsupported environment variable name: ${name}`);
+		return [
+			`Write-Output '${envCaptureStart(name)}'`,
+			`$value = [Environment]::GetEnvironmentVariable('${name}')`,
+			"if ($null -ne $value -and $value.Length -gt 0) { Write-Output $value }",
+			`Write-Output '${envCaptureEnd(name)}'`
+		];
+	})].join("; ");
+}
+function extractEnvironmentValue(output, name) {
+	const startMarker = envCaptureStart(name);
+	const endMarker = envCaptureEnd(name);
+	const startIndex = output.indexOf(startMarker);
+	if (startIndex === -1) return void 0;
+	const valueStartIndex = startIndex + startMarker.length;
+	const endIndex = output.indexOf(endMarker, valueStartIndex);
+	if (endIndex === -1) return void 0;
+	const value = output.slice(valueStartIndex, endIndex).replace(/^\r?\n/, "").replace(/\r?\n$/, "");
+	return value.length > 0 ? value : void 0;
+}
+const readEnvironmentFromLoginShell = (shell, names, execFile = NodeChildProcess.execFileSync) => {
+	if (names.length === 0) return {};
+	const output = execFile(shell, ["-ilc", buildEnvironmentCaptureCommand(names)], {
+		encoding: "utf8",
+		timeout: 5e3
+	});
+	const environment = {};
+	for (const name of names) {
+		const value = extractEnvironmentValue(output, name);
+		if (value !== void 0) environment[name] = value;
+	}
+	return environment;
+};
+const WindowsShellEnvironment = Context.Reference("@p4code/shared/shell/WindowsShellEnvironment", { defaultValue: () => readEnvironmentFromWindowsShell });
+const CommandAvailability = Context.Reference("@p4code/shared/shell/CommandAvailability", { defaultValue: () => isCommandAvailable });
+function readEnvironmentFromWindowsShell(names, optionsOrExecFile, maybeExecFile) {
+	if (names.length === 0) return {};
+	const options = typeof optionsOrExecFile === "function" ? {} : optionsOrExecFile ?? {};
+	const execFile = typeof optionsOrExecFile === "function" ? optionsOrExecFile : maybeExecFile ?? NodeChildProcess.execFileSync;
+	const command = buildWindowsEnvironmentCaptureCommand(names);
+	const args = [
+		"-NoLogo",
+		...options.loadProfile ? [] : ["-NoProfile"],
+		"-NonInteractive",
+		"-Command",
+		command
+	];
+	for (const shell of WINDOWS_SHELL_CANDIDATES) try {
+		const output = execFile(shell, args, {
+			encoding: "utf8",
+			timeout: 5e3
+		});
+		const environment = {};
+		for (const name of names) {
+			const value = extractEnvironmentValue(output, name);
+			if (value !== void 0) environment[name] = value;
+		}
+		return environment;
+	} catch {
+		continue;
+	}
+	return {};
+}
+function stripWrappingQuotes(value) {
+	return value.replace(/^"+|"+$/g, "");
+}
+function pathDelimiterForPlatform(platform) {
+	return platform === "win32" ? WINDOWS_PATH_DELIMITER : POSIX_PATH_DELIMITER;
+}
+function normalizePathEntryForComparison(entry, platform) {
+	const normalized = stripWrappingQuotes(entry.trim());
+	return platform === "win32" ? normalized.toLowerCase() : normalized;
+}
+function mergePathValues(preferredPath, inheritedPath, platform) {
+	const delimiter = pathDelimiterForPlatform(platform);
+	const merged = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const rawValue of [preferredPath, inheritedPath]) {
+		if (!rawValue) continue;
+		for (const entry of rawValue.split(delimiter)) {
+			const trimmed = entry.trim();
+			if (trimmed.length === 0) continue;
+			const normalized = normalizePathEntryForComparison(trimmed, platform);
+			if (normalized.length === 0 || seen.has(normalized)) continue;
+			seen.add(normalized);
+			merged.push(trimmed);
+		}
+	}
+	return merged.length > 0 ? merged.join(delimiter) : void 0;
+}
+function readEnvPath(env) {
+	return env.PATH ?? env.Path ?? env.path;
+}
+function resolvePathEnvironmentVariable(env) {
+	return readEnvPath(env) ?? "";
+}
+function resolveWindowsPathExtensions(env) {
+	const rawValue = env.PATHEXT;
+	const fallback = [
+		".COM",
+		".EXE",
+		".BAT",
+		".CMD"
+	];
+	if (!rawValue) return fallback;
+	const parsed = [];
+	for (const entry of rawValue.split(";")) {
+		const trimmed = entry.trim();
+		if (trimmed.length === 0) continue;
+		parsed.push(trimmed.startsWith(".") ? trimmed.toUpperCase() : `.${trimmed.toUpperCase()}`);
+	}
+	return parsed.length > 0 ? Array.from(new Set(parsed)) : fallback;
+}
+function resolveCommandCandidates(command, platform, windowsPathExtensions, extname) {
+	if (platform !== "win32") return [command];
+	const extension = extname(command);
+	const normalizedExtension = extension.toUpperCase();
+	if (extension.length > 0 && windowsPathExtensions.includes(normalizedExtension)) {
+		const commandWithoutExtension = command.slice(0, -extension.length);
+		return Array.from(/* @__PURE__ */ new Set([
+			command,
+			`${commandWithoutExtension}${normalizedExtension}`,
+			`${commandWithoutExtension}${normalizedExtension.toLowerCase()}`
+		]));
+	}
+	const candidates = [];
+	for (const candidateExtension of windowsPathExtensions) {
+		candidates.push(`${command}${candidateExtension}`);
+		candidates.push(`${command}${candidateExtension.toLowerCase()}`);
+	}
+	return Array.from(new Set(candidates));
+}
+const isExecutableFile = Effect.fn("shell.isExecutableFile")(function* (filePath, platform, windowsPathExtensions) {
+	const fileSystem = yield* FileSystem.FileSystem;
+	const path = yield* Path.Path;
+	const stat = yield* fileSystem.stat(filePath).pipe(Effect.orElseSucceed(() => null));
+	if (stat === null || stat.type !== "File") return false;
+	if (platform === "win32") {
+		const extension = path.extname(filePath);
+		if (extension.length === 0) return false;
+		return windowsPathExtensions.includes(extension.toUpperCase());
+	}
+	return canExecuteFile(filePath);
+});
+const resolveCommandPathForPlatform = Effect.fn("shell.resolveCommandPathForPlatform")(function* (command, options) {
+	const path = yield* Path.Path;
+	const platform = options.platform;
+	const env = options.env ?? process.env;
+	const windowsPathExtensions = platform === "win32" ? resolveWindowsPathExtensions(env) : [];
+	const commandCandidates = resolveCommandCandidates(command, platform, windowsPathExtensions, path.extname);
+	if (command.includes("/") || command.includes("\\")) {
+		for (const candidate of commandCandidates) if (yield* isExecutableFile(candidate, platform, windowsPathExtensions)) return candidate;
+		return yield* new CommandResolutionError({
+			command,
+			reason: "not-found"
+		});
+	}
+	const pathValue = resolvePathEnvironmentVariable(env);
+	if (pathValue.length === 0) return yield* new CommandResolutionError({
+		command,
+		reason: "not-found"
+	});
+	const pathEntries = [];
+	for (const entry of pathValue.split(pathDelimiterForPlatform(platform))) {
+		const pathEntry = stripWrappingQuotes(entry.trim());
+		if (pathEntry.length > 0) pathEntries.push(pathEntry);
+	}
+	for (const pathEntry of pathEntries) for (const candidate of commandCandidates) {
+		const candidatePath = path.join(pathEntry, candidate);
+		if (yield* isExecutableFile(candidatePath, platform, windowsPathExtensions)) return candidatePath;
+	}
+	return yield* new CommandResolutionError({
+		command,
+		reason: "not-found"
+	});
+});
+const resolveCommandPath = Effect.fn("shell.resolveCommandPath")(function* (command, options = {}) {
+	return yield* resolveCommandPathForPlatform(command, {
+		env: options.env ?? (yield* HostProcessEnvironment),
+		platform: yield* HostProcessPlatform
+	});
+});
+const resolveSpawnCommand = Effect.fn("shell.resolveSpawnCommand")(function* (command, args, options = {}) {
+	const platform = yield* HostProcessPlatform;
+	if (platform !== "win32") return {
+		command,
+		args: [...args],
+		shell: false
+	};
+	const hostEnvironment = yield* HostProcessEnvironment;
+	const env = options.env === void 0 ? hostEnvironment : options.extendEnv ? {
+		...hostEnvironment,
+		...options.env
+	} : options.env;
+	const resolvedCommand = (yield* SpawnExecutableResolution)(command, platform, env) ?? command;
+	const extension = NodePath.win32.extname(resolvedCommand).toLowerCase();
+	if (extension !== ".cmd" && extension !== ".bat") return {
+		command: resolvedCommand,
+		args: [...args],
+		shell: false
+	};
+	return {
+		command: escapeWindowsShellArg(resolvedCommand),
+		args: sanitizeShellModeArgsForPlatform(args, platform),
+		shell: true
+	};
+});
+const isCommandAvailable = Effect.fn("shell.isCommandAvailable")(function* (command, options = {}) {
+	return yield* resolveCommandPath(command, options).pipe(Effect.as(true), Effect.catchTag("CommandResolutionError", () => Effect.succeed(false)));
+});
+function resolveKnownWindowsCliDirs(env) {
+	const appData = env.APPDATA?.trim();
+	const localAppData = env.LOCALAPPDATA?.trim();
+	const userProfile = env.USERPROFILE?.trim();
+	return [
+		...appData ? [`${appData}\\npm`] : [],
+		...localAppData ? [`${localAppData}\\Programs\\nodejs`, `${localAppData}\\Volta\\bin`] : [],
+		...localAppData ? [`${localAppData}\\pnpm`] : [],
+		...userProfile ? [`${userProfile}\\.bun\\bin`, `${userProfile}\\scoop\\shims`] : []
+	];
+}
+function readWindowsEnvironmentSafely(readEnvironment, names, options) {
+	try {
+		return readEnvironment(names, options);
+	} catch {
+		return {};
+	}
+}
+function mergeWindowsEnv(currentEnv, patch) {
+	const nextEnv = { ...currentEnv };
+	for (const [key, value] of Object.entries(patch)) if (value !== void 0) nextEnv[key] = value;
+	return nextEnv;
+}
+const resolveWindowsEnvironment = Effect.fn("shell.resolveWindowsEnvironment")(function* (env) {
+	const readEnvironment = yield* WindowsShellEnvironment;
+	const commandAvailable = yield* CommandAvailability;
+	const inheritedPath = readEnvPath(env);
+	const shellPath = readWindowsEnvironmentSafely(readEnvironment, ["PATH"], { loadProfile: false }).PATH;
+	const mergedPath = mergePathValues(shellPath, inheritedPath, "win32");
+	const baselinePath = mergePathValues(resolveKnownWindowsCliDirs(env).join(WINDOWS_PATH_DELIMITER), mergedPath, "win32");
+	const baselinePatch = baselinePath ? { PATH: baselinePath } : {};
+	if (yield* commandAvailable("node", { env: mergeWindowsEnv(env, baselinePatch) })) return baselinePatch;
+	const profiledEnvironment = readWindowsEnvironmentSafely(readEnvironment, [
+		"PATH",
+		"FNM_DIR",
+		"FNM_MULTISHELL_PATH"
+	], { loadProfile: true });
+	const profiledPath = mergePathValues(profiledEnvironment.PATH, baselinePath, "win32");
+	const profiledPatch = {
+		...profiledPath ? { PATH: profiledPath } : {},
+		...profiledEnvironment.FNM_DIR ? { FNM_DIR: profiledEnvironment.FNM_DIR } : {},
+		...profiledEnvironment.FNM_MULTISHELL_PATH ? { FNM_MULTISHELL_PATH: profiledEnvironment.FNM_MULTISHELL_PATH } : {}
+	};
+	return Object.keys(profiledPatch).length > 0 ? {
+		...baselinePatch,
+		...profiledPatch
+	} : baselinePatch;
+});
+//#endregion
+//#region src/os-jank.ts
+function logPathHydrationWarning(message, error) {
+	process.stderr.write(`[server] ${message} ${error instanceof Error ? error.message : error ?? ""}\n`);
+}
+function hydratePosixPath(env, platform) {
+	let shellPath;
+	for (const shell of listLoginShellCandidates(platform, env.SHELL)) {
+		try {
+			shellPath = readPathFromLoginShell(shell);
+		} catch (error) {
+			logPathHydrationWarning(`Failed to read PATH from login shell ${shell}.`, error);
+		}
+		if (shellPath) break;
+	}
+	const launchctlPath = platform === "darwin" && !shellPath ? readPathFromLaunchctl() : void 0;
+	const mergedPath = mergePathEntries(shellPath ?? launchctlPath, env.PATH, platform);
+	if (mergedPath) env.PATH = mergedPath;
+}
+const fixPath = Effect.fn("fixPath")(function* () {
+	const platform = yield* HostProcessPlatform;
+	const env = yield* HostProcessEnvironment;
+	if (platform === "win32") {
+		const repairedEnvironment = yield* resolveWindowsEnvironment(env).pipe(Effect.catchDefect((defect) => Effect.sync(() => {
+			logPathHydrationWarning("Failed to hydrate PATH from the user environment.", defect);
+			return {};
+		})));
+		for (const [key, value] of Object.entries(repairedEnvironment)) if (value !== void 0) env[key] = value;
+		return;
+	}
+	if (platform !== "darwin" && platform !== "linux") return;
+	yield* Effect.sync(() => hydratePosixPath(env, platform)).pipe(Effect.catchDefect((defect) => Effect.sync(() => {
+		logPathHydrationWarning("Failed to hydrate PATH from the user environment.", defect);
+	})));
+});
+const expandHomePath$4 = Effect.fn(function* (input) {
+	const { join } = yield* Path.Path;
+	if (input === "~") return NodeOS.homedir();
+	if (input.startsWith("~/") || input.startsWith("~\\")) return join(NodeOS.homedir(), input.slice(2));
+	return input;
+});
+/** The data directory used when neither `--base-dir` nor `P4CODE_HOME` is set. */
+const defaultBaseDir = Effect.fn(function* () {
+	const { join } = yield* Path.Path;
+	return join(NodeOS.homedir(), ".p4");
+});
+const resolveBaseDir = Effect.fn(function* (raw) {
+	const { resolve } = yield* Path.Path;
+	if (!raw || raw.trim().length === 0) return yield* defaultBaseDir();
+	return resolve(yield* expandHomePath$4(raw.trim()));
+});
+//#endregion
+//#region ../../packages/shared/src/semver.ts
+const SEMVER_NUMBER_SEGMENT = /^\d+$/;
+function normalizeSemverVersion(version) {
+	const [main, prerelease] = version.trim().split("-", 2);
+	const segments = [];
+	for (const segment of (main ?? "").split(".")) {
+		const trimmed = segment.trim();
+		if (trimmed.length > 0) segments.push(trimmed);
+	}
+	if (segments.length === 2) segments.push("0");
+	return prerelease ? `${segments.join(".")}-${prerelease}` : segments.join(".");
+}
+function parseSemver(value) {
+	const [main = "", prerelease] = normalizeSemverVersion(value).replace(/^v/, "").split("-", 2);
+	const segments = main.split(".");
+	if (segments.length !== 3) return null;
+	const [majorSegment, minorSegment, patchSegment] = segments;
+	if (majorSegment === void 0 || minorSegment === void 0 || patchSegment === void 0) return null;
+	if (!SEMVER_NUMBER_SEGMENT.test(majorSegment) || !SEMVER_NUMBER_SEGMENT.test(minorSegment) || !SEMVER_NUMBER_SEGMENT.test(patchSegment)) return null;
+	const major = Number.parseInt(majorSegment, 10);
+	const minor = Number.parseInt(minorSegment, 10);
+	const patch = Number.parseInt(patchSegment, 10);
+	if (![
+		major,
+		minor,
+		patch
+	].every(Number.isInteger)) return null;
+	return {
+		major,
+		minor,
+		patch,
+		prerelease: parsePrereleaseSegments(prerelease)
+	};
+}
+function parsePrereleaseSegments(prerelease) {
+	if (prerelease === void 0) return [];
+	const segments = [];
+	for (const segment of prerelease.split(".")) {
+		const trimmed = segment.trim();
+		if (trimmed.length > 0) segments.push(trimmed);
+	}
+	return segments;
+}
+function comparePrereleaseIdentifier(left, right) {
+	const leftNumeric = SEMVER_NUMBER_SEGMENT.test(left);
+	const rightNumeric = SEMVER_NUMBER_SEGMENT.test(right);
+	if (leftNumeric && rightNumeric) return Number.parseInt(left, 10) - Number.parseInt(right, 10);
+	if (leftNumeric) return -1;
+	if (rightNumeric) return 1;
+	return left.localeCompare(right);
+}
+function compareSemverVersions(left, right) {
+	const parsedLeft = parseSemver(left);
+	const parsedRight = parseSemver(right);
+	if (!parsedLeft || !parsedRight) return left.localeCompare(right);
+	if (parsedLeft.major !== parsedRight.major) return parsedLeft.major - parsedRight.major;
+	if (parsedLeft.minor !== parsedRight.minor) return parsedLeft.minor - parsedRight.minor;
+	if (parsedLeft.patch !== parsedRight.patch) return parsedLeft.patch - parsedRight.patch;
+	if (parsedLeft.prerelease.length === 0 && parsedRight.prerelease.length === 0) return 0;
+	if (parsedLeft.prerelease.length === 0) return 1;
+	if (parsedRight.prerelease.length === 0) return -1;
+	const length = Math.max(parsedLeft.prerelease.length, parsedRight.prerelease.length);
+	for (let index = 0; index < length; index += 1) {
+		const leftIdentifier = parsedLeft.prerelease[index];
+		const rightIdentifier = parsedRight.prerelease[index];
+		if (leftIdentifier === void 0) return -1;
+		if (rightIdentifier === void 0) return 1;
+		const comparison = comparePrereleaseIdentifier(leftIdentifier, rightIdentifier);
+		if (comparison !== 0) return comparison;
+	}
+	return 0;
+}
+//#endregion
+//#region src/cli/updateCheck.ts
+/**
+* Tells the user when a newer `@p4code/cli` has been published.
+*
+* Deliberately advisory and cheap: at most one registry request a day, a short
+* timeout, every failure swallowed, and never anything that changes an exit
+* code. A version check that can break a command is worse than no check.
+*/
+const PACKAGE_NAME = "@p4code/cli";
+const CHECK_INTERVAL = Duration.hours(24);
+const REQUEST_TIMEOUT = Duration.seconds(3);
+/**
+* A failed lookup is retried far sooner than a successful one. Caching "no
+* answer" for a full day would let one cold-start timeout hide a real update
+* until tomorrow, which is the opposite of the point.
+*/
+const FAILURE_RETRY_INTERVAL = Duration.hours(1);
+const CACHE_FILE = "cli-update-check.json";
+const CacheEntry = Schema$1.Struct({
+	checkedAtMs: Schema$1.Number,
+	latestVersion: Schema$1.NullOr(Schema$1.String)
+});
+const CacheEntryJson = Schema$1.fromJsonString(CacheEntry);
+const decodeCacheEntry = Schema$1.decodeUnknownEffect(CacheEntryJson);
+const encodeCacheEntry = Schema$1.encodeEffect(CacheEntryJson);
+const NpmLatest = Schema$1.Struct({ version: Schema$1.optional(Schema$1.String) });
+const fetchLatestVersion = Effect.fn("cli.updateCheck.fetch")(function* () {
+	const client = yield* HttpClient.HttpClient;
+	const request = HttpClientRequest.get(`https://registry.npmjs.org/${encodeURIComponent(PACKAGE_NAME)}/latest`).pipe(HttpClientRequest.setHeader("accept", "application/json"));
+	const response = yield* client.execute(request).pipe(Effect.timeout(REQUEST_TIMEOUT));
+	if (response.status < 200 || response.status >= 300) return null;
+	const version = (yield* response.json.pipe(Effect.flatMap(Schema$1.decodeUnknownEffect(NpmLatest)))).version?.trim();
+	return version === void 0 || version.length === 0 ? null : version;
+});
+/**
+* Reads the cached answer, refreshing it at most once per CHECK_INTERVAL.
+* Returns the newest published version, or null when it is unknown.
+*/
+const resolveLatestVersion = Effect.fn("cli.updateCheck.resolve")(function* (stateDir) {
+	const fs = yield* FileSystem.FileSystem;
+	const cachePath = (yield* Path.Path).join(stateDir, CACHE_FILE);
+	const nowMs = DateTime.toEpochMillis(yield* DateTime.now);
+	const cached = yield* fs.readFileString(cachePath).pipe(Effect.flatMap(decodeCacheEntry), Effect.asSome, Effect.orElseSucceed(() => Option.none()));
+	if (Option.isSome(cached)) {
+		const age = nowMs - cached.value.checkedAtMs;
+		const interval = cached.value.latestVersion === null ? FAILURE_RETRY_INTERVAL : CHECK_INTERVAL;
+		if (age >= 0 && age < Duration.toMillis(interval)) return cached.value.latestVersion;
+	}
+	const latestVersion = yield* fetchLatestVersion().pipe(Effect.orElseSucceed(() => null));
+	yield* fs.makeDirectory(stateDir, { recursive: true }).pipe(Effect.ignore);
+	yield* encodeCacheEntry({
+		checkedAtMs: nowMs,
+		latestVersion
+	}).pipe(Effect.flatMap((encoded) => fs.writeFileString(cachePath, encoded)), Effect.ignore);
+	return latestVersion;
+});
+/**
+* Both commands, because `npm i -g` only replaces the binary on disk. The
+* service is a running process still executing the old code until
+* `service update` restarts it onto the new one.
+*/
+function formatUpdateReminder(input) {
+	return [`Update available: ${PACKAGE_NAME}@${input.latestVersion} (running ${input.currentVersion}).`, `  npm i -g ${PACKAGE_NAME}@latest && p4 service update`].join("\n");
+}
+/**
+* The reminder line, or null when there is nothing to say. Callers print it;
+* keeping the decision pure makes it testable without a console.
+*/
+const resolveUpdateReminder = Effect.fn("cli.updateCheck.reminder")(function* (input) {
+	if (((yield* HostProcessEnvironment)["P4CODE_NO_UPDATE_CHECK"] ?? "") !== "") return null;
+	if (input.currentVersion.includes("-")) return null;
+	const latestVersion = yield* resolveLatestVersion(input.stateDir);
+	if (latestVersion === null) return null;
+	if (compareSemverVersions(input.currentVersion, latestVersion) >= 0) return null;
+	return formatUpdateReminder({
+		currentVersion: input.currentVersion,
+		latestVersion
+	});
+});
 //#endregion
 //#region ../../packages/contracts/src/baseSchemas.ts
 const TrimmedString = Schema$1.String.pipe(Schema$1.decodeTo(Schema$1.String, SchemaTransformation.transformOrFail({
@@ -928,7 +1634,7 @@ const ModelSelection = Schema$1.Struct({
 		return Effect.succeed(base);
 	}
 })));
-const RuntimeMode$1 = Schema$1.Literals([
+const RuntimeMode = Schema$1.Literals([
 	"approval-required",
 	"auto-accept-edits",
 	"auto",
@@ -1050,7 +1756,7 @@ const OrchestrationSession = Schema$1.Struct({
 	status: OrchestrationSessionStatus,
 	providerName: Schema$1.NullOr(TrimmedNonEmptyString),
 	providerInstanceId: Schema$1.optional(ProviderInstanceId),
-	runtimeMode: RuntimeMode$1.pipe(Schema$1.withDecodingDefault(Effect.succeed(DEFAULT_RUNTIME_MODE$2))),
+	runtimeMode: RuntimeMode.pipe(Schema$1.withDecodingDefault(Effect.succeed(DEFAULT_RUNTIME_MODE$2))),
 	activeTurnId: Schema$1.NullOr(TurnId),
 	lastError: Schema$1.NullOr(TrimmedNonEmptyString),
 	updatedAt: IsoDateTime
@@ -1111,7 +1817,7 @@ const OrchestrationThread = Schema$1.Struct({
 	projectId: ProjectId,
 	title: TrimmedNonEmptyString,
 	modelSelection: ModelSelection,
-	runtimeMode: RuntimeMode$1,
+	runtimeMode: RuntimeMode,
 	interactionMode: ProviderInteractionMode.pipe(Schema$1.withDecodingDefault(Effect.succeed(DEFAULT_PROVIDER_INTERACTION_MODE))),
 	branch: Schema$1.NullOr(TrimmedNonEmptyString),
 	worktreePath: Schema$1.NullOr(TrimmedNonEmptyString),
@@ -1151,7 +1857,7 @@ const OrchestrationThreadShell = Schema$1.Struct({
 	projectId: ProjectId,
 	title: TrimmedNonEmptyString,
 	modelSelection: ModelSelection,
-	runtimeMode: RuntimeMode$1,
+	runtimeMode: RuntimeMode,
 	interactionMode: ProviderInteractionMode.pipe(Schema$1.withDecodingDefault(Effect.succeed(DEFAULT_PROVIDER_INTERACTION_MODE))),
 	branch: Schema$1.NullOr(TrimmedNonEmptyString),
 	worktreePath: Schema$1.NullOr(TrimmedNonEmptyString),
@@ -1273,7 +1979,7 @@ const ThreadCreateCommand = Schema$1.Struct({
 	projectId: ProjectId,
 	title: TrimmedNonEmptyString,
 	modelSelection: ModelSelection,
-	runtimeMode: RuntimeMode$1,
+	runtimeMode: RuntimeMode,
 	interactionMode: ProviderInteractionMode.pipe(Schema$1.withDecodingDefault(Effect.succeed(DEFAULT_PROVIDER_INTERACTION_MODE))),
 	branch: Schema$1.NullOr(TrimmedNonEmptyString),
 	worktreePath: Schema$1.NullOr(TrimmedNonEmptyString),
@@ -1331,7 +2037,7 @@ const ThreadRuntimeModeSetCommand = Schema$1.Struct({
 	type: Schema$1.Literal("thread.runtime-mode.set"),
 	commandId: CommandId,
 	threadId: ThreadId,
-	runtimeMode: RuntimeMode$1,
+	runtimeMode: RuntimeMode,
 	createdAt: IsoDateTime
 });
 const ThreadInteractionModeSetCommand = Schema$1.Struct({
@@ -1345,7 +2051,7 @@ const ThreadTurnStartBootstrapCreateThread = Schema$1.Struct({
 	projectId: ProjectId,
 	title: TrimmedNonEmptyString,
 	modelSelection: ModelSelection,
-	runtimeMode: RuntimeMode$1,
+	runtimeMode: RuntimeMode,
 	interactionMode: ProviderInteractionMode,
 	branch: Schema$1.NullOr(TrimmedNonEmptyString),
 	worktreePath: Schema$1.NullOr(TrimmedNonEmptyString),
@@ -1374,7 +2080,7 @@ const ThreadTurnStartCommand = Schema$1.Struct({
 	}),
 	modelSelection: Schema$1.optional(ModelSelection),
 	titleSeed: Schema$1.optional(TrimmedNonEmptyString),
-	runtimeMode: RuntimeMode$1.pipe(Schema$1.withDecodingDefault(Effect.succeed(DEFAULT_RUNTIME_MODE$2))),
+	runtimeMode: RuntimeMode.pipe(Schema$1.withDecodingDefault(Effect.succeed(DEFAULT_RUNTIME_MODE$2))),
 	interactionMode: ProviderInteractionMode.pipe(Schema$1.withDecodingDefault(Effect.succeed(DEFAULT_PROVIDER_INTERACTION_MODE))),
 	bootstrap: Schema$1.optional(ThreadTurnStartBootstrap),
 	sourceProposedPlan: Schema$1.optional(SourceProposedPlanReference),
@@ -1392,7 +2098,7 @@ const ClientThreadTurnStartCommand = Schema$1.Struct({
 	}),
 	modelSelection: Schema$1.optional(ModelSelection),
 	titleSeed: Schema$1.optional(TrimmedNonEmptyString),
-	runtimeMode: RuntimeMode$1,
+	runtimeMode: RuntimeMode,
 	interactionMode: ProviderInteractionMode,
 	bootstrap: Schema$1.optional(ThreadTurnStartBootstrap),
 	sourceProposedPlan: Schema$1.optional(SourceProposedPlanReference),
@@ -1608,7 +2314,7 @@ const ThreadCreatedPayload$1 = Schema$1.Struct({
 	projectId: ProjectId,
 	title: TrimmedNonEmptyString,
 	modelSelection: ModelSelection,
-	runtimeMode: RuntimeMode$1.pipe(Schema$1.withDecodingDefault(Effect.succeed(DEFAULT_RUNTIME_MODE$2))),
+	runtimeMode: RuntimeMode.pipe(Schema$1.withDecodingDefault(Effect.succeed(DEFAULT_RUNTIME_MODE$2))),
 	interactionMode: ProviderInteractionMode.pipe(Schema$1.withDecodingDefault(Effect.succeed(DEFAULT_PROVIDER_INTERACTION_MODE))),
 	branch: Schema$1.NullOr(TrimmedNonEmptyString),
 	worktreePath: Schema$1.NullOr(TrimmedNonEmptyString),
@@ -1659,7 +2365,7 @@ const ThreadMetaUpdatedPayload$1 = Schema$1.Struct({
 });
 const ThreadRuntimeModeSetPayload$1 = Schema$1.Struct({
 	threadId: ThreadId,
-	runtimeMode: RuntimeMode$1,
+	runtimeMode: RuntimeMode,
 	updatedAt: IsoDateTime
 });
 const ThreadInteractionModeSetPayload$1 = Schema$1.Struct({
@@ -1683,7 +2389,7 @@ const ThreadTurnStartRequestedPayload = Schema$1.Struct({
 	messageId: MessageId,
 	modelSelection: Schema$1.optional(ModelSelection),
 	titleSeed: Schema$1.optional(TrimmedNonEmptyString),
-	runtimeMode: RuntimeMode$1.pipe(Schema$1.withDecodingDefault(Effect.succeed(DEFAULT_RUNTIME_MODE$2))),
+	runtimeMode: RuntimeMode.pipe(Schema$1.withDecodingDefault(Effect.succeed(DEFAULT_RUNTIME_MODE$2))),
 	interactionMode: ProviderInteractionMode.pipe(Schema$1.withDecodingDefault(Effect.succeed(DEFAULT_PROVIDER_INTERACTION_MODE))),
 	sourceProposedPlan: Schema$1.optional(SourceProposedPlanReference),
 	createdAt: IsoDateTime
@@ -3801,7 +4507,7 @@ Schema$1.Struct({
 	provider: ProviderDriverKind,
 	providerInstanceId: Schema$1.optional(ProviderInstanceId),
 	status: ProviderSessionStatus,
-	runtimeMode: RuntimeMode$1,
+	runtimeMode: RuntimeMode,
 	cwd: Schema$1.optional(TrimmedNonEmptyString),
 	model: Schema$1.optional(TrimmedNonEmptyString),
 	threadId: ThreadId,
@@ -3820,7 +4526,7 @@ const ProviderSessionStartInput = Schema$1.Struct({
 	resumeCursor: Schema$1.optional(Schema$1.Unknown),
 	approvalPolicy: Schema$1.optional(ProviderApprovalPolicy),
 	sandboxMode: Schema$1.optional(ProviderSandboxMode),
-	runtimeMode: RuntimeMode$1
+	runtimeMode: RuntimeMode
 });
 const ProviderSendTurnInput = Schema$1.Struct({
 	threadId: ThreadId,
@@ -5371,7 +6077,7 @@ const ServerSignalProcessResult = Schema$1.Struct({
 	signaled: Schema$1.Boolean,
 	message: Schema$1.Option(TrimmedNonEmptyString)
 });
-const ServerConfig$1 = Schema$1.Struct({
+const ServerConfig = Schema$1.Struct({
 	environment: ExecutionEnvironmentDescriptor,
 	auth: ServerAuthDescriptor,
 	cwd: TrimmedNonEmptyString,
@@ -5418,7 +6124,7 @@ const ServerConfigSettingsUpdatedPayload = Schema$1.Struct({ settings: ServerSet
 const ServerConfigStreamSnapshotEvent = Schema$1.Struct({
 	version: Schema$1.Literal(1),
 	type: Schema$1.Literal("snapshot"),
-	config: ServerConfig$1
+	config: ServerConfig
 });
 const ServerConfigStreamKeybindingsUpdatedEvent = Schema$1.Struct({
 	version: Schema$1.Literal(1),
@@ -6623,7 +7329,7 @@ const WsServerProbeRpc = Rpc.make(WS_METHODS.serverProbe, {
 });
 const WsServerGetConfigRpc = Rpc.make(WS_METHODS.serverGetConfig, {
 	payload: Schema$1.Struct({}),
-	success: ServerConfig$1,
+	success: ServerConfig,
 	error: Schema$1.Union([
 		KeybindingsConfigError,
 		ServerSettingsError,
@@ -7006,117 +7712,6 @@ function parseAllowedOAuthScope(input) {
 	return scopes;
 }
 //#endregion
-//#region src/config.ts
-/**
-* ServerConfig - Runtime configuration services.
-*
-* Defines process-level server configuration and networking helpers used by
-* startup and runtime layers.
-*
-* @module ServerConfig
-*/
-const DEFAULT_PORT = 3773;
-const RuntimeMode = Schema$1.Literals(["web", "desktop"]);
-Schema$1.Literals(["browser", "headless"]);
-/**
-* ServerConfig - Service tag for server runtime configuration.
-*/
-var ServerConfig = class extends Context.Service()("@p4code/cli/config/ServerConfig") {
-	/** @deprecated Import and use `layerTest` from this module. */
-	static layerTest = (cwd, baseDirOrPrefix) => layerTest$2(cwd, baseDirOrPrefix);
-};
-const make$66 = (config) => ServerConfig.of(config);
-const layer$61 = (config) => Layer.succeed(ServerConfig, make$66(config));
-const deriveServerPaths = Effect.fn(function* (baseDir, devUrl, options = {}) {
-	const { join } = yield* Path.Path;
-	const stateDir = join(baseDir, devUrl !== void 0 && !options.baseDirIsExplicit ? "dev" : "userdata");
-	const dbPath = join(stateDir, "state.sqlite");
-	const attachmentsDir = join(stateDir, "attachments");
-	const logsDir = join(stateDir, "logs");
-	const providerLogsDir = join(logsDir, "provider");
-	const providerStatusCacheDir = join(baseDir, "caches");
-	return {
-		stateDir,
-		dbPath,
-		keybindingsConfigPath: join(stateDir, "keybindings.json"),
-		settingsPath: join(stateDir, "settings.json"),
-		providerStatusCacheDir,
-		worktreesDir: join(baseDir, "worktrees"),
-		attachmentsDir,
-		logsDir,
-		serverLogPath: join(logsDir, "server.log"),
-		serverTracePath: join(logsDir, "server.trace.ndjson"),
-		providerLogsDir,
-		providerEventLogPath: join(providerLogsDir, "events.log"),
-		terminalLogsDir: join(logsDir, "terminals"),
-		anonymousIdPath: join(stateDir, "anonymous-id"),
-		environmentIdPath: join(stateDir, "environment-id"),
-		serverRuntimeStatePath: join(stateDir, "server-runtime.json"),
-		secretsDir: join(stateDir, "secrets")
-	};
-});
-const ensureServerDirectories = Effect.fn(function* (derivedPaths) {
-	const fs = yield* FileSystem.FileSystem;
-	const path = yield* Path.Path;
-	yield* Effect.all([
-		fs.makeDirectory(derivedPaths.stateDir, { recursive: true }),
-		fs.makeDirectory(derivedPaths.logsDir, { recursive: true }),
-		fs.makeDirectory(derivedPaths.providerLogsDir, { recursive: true }),
-		fs.makeDirectory(derivedPaths.terminalLogsDir, { recursive: true }),
-		fs.makeDirectory(derivedPaths.attachmentsDir, { recursive: true }),
-		fs.makeDirectory(derivedPaths.worktreesDir, { recursive: true }),
-		fs.makeDirectory(path.dirname(derivedPaths.keybindingsConfigPath), { recursive: true }),
-		fs.makeDirectory(path.dirname(derivedPaths.settingsPath), { recursive: true }),
-		fs.makeDirectory(derivedPaths.providerStatusCacheDir, { recursive: true }),
-		fs.makeDirectory(path.dirname(derivedPaths.anonymousIdPath), { recursive: true }),
-		fs.makeDirectory(path.dirname(derivedPaths.serverRuntimeStatePath), { recursive: true })
-	], { concurrency: "unbounded" });
-});
-const makeTest$1 = Effect.fn("ServerConfig.makeTest")(function* (cwd, baseDirOrPrefix) {
-	const devUrl = void 0;
-	const fs = yield* FileSystem.FileSystem;
-	const baseDir = typeof baseDirOrPrefix === "string" ? baseDirOrPrefix : yield* fs.makeTempDirectoryScoped({ prefix: baseDirOrPrefix.prefix });
-	const derivedPaths = yield* deriveServerPaths(baseDir, devUrl);
-	yield* ensureServerDirectories(derivedPaths);
-	return ServerConfig.of({
-		logLevel: "Error",
-		traceMinLevel: "Info",
-		traceTimingEnabled: true,
-		traceBatchWindowMs: 200,
-		traceMaxBytes: 10 * 1024 * 1024,
-		traceMaxFiles: 10,
-		otlpTracesUrl: void 0,
-		otlpMetricsUrl: void 0,
-		otlpExportIntervalMs: 1e4,
-		otlpServiceName: "p4-server",
-		cwd,
-		baseDir,
-		...derivedPaths,
-		mode: "web",
-		autoBootstrapProjectFromCwd: false,
-		logWebSocketEvents: false,
-		tailscaleServeEnabled: false,
-		tailscaleServePort: 443,
-		port: 0,
-		host: void 0,
-		desktopBootstrapToken: void 0,
-		staticDir: void 0,
-		devUrl,
-		devAllowedOrigins: [],
-		noBrowser: false,
-		startupPresentation: "browser"
-	});
-});
-const layerTest$2 = (cwd, baseDirOrPrefix) => Layer.effect(ServerConfig, makeTest$1(cwd, baseDirOrPrefix));
-const resolveStaticDir = Effect.fn(function* () {
-	const { join, resolve } = yield* Path.Path;
-	const { exists } = yield* FileSystem.FileSystem;
-	const bundledClient = resolve(join(import.meta.dirname, "client"));
-	if (yield* exists(join(bundledClient, "index.html")).pipe(Effect.orElseSucceed(() => false))) return bundledClient;
-	const monorepoClient = resolve(join(import.meta.dirname, "../../web/dist"));
-	if (yield* exists(join(monorepoClient, "index.html")).pipe(Effect.orElseSucceed(() => false))) return monorepoClient;
-});
-//#endregion
 //#region src/auth/utils.ts
 const SESSION_COOKIE_NAME = "p4_session";
 /**
@@ -7220,7 +7815,7 @@ function deriveAuthClientMetadata(input) {
 //#region src/auth/EnvironmentAuthPolicy.ts
 var EnvironmentAuthPolicy = class extends Context.Service()("@p4code/cli/auth/EnvironmentAuthPolicy") {};
 const make$65 = Effect.gen(function* () {
-	const config = yield* ServerConfig;
+	const config = yield* ServerConfig$1;
 	const isRemoteReachable = isRemoteReachableHost(config.host);
 	const policy = config.mode === "desktop" ? isRemoteReachable ? "remote-reachable" : "desktop-managed-local" : isRemoteReachable ? "remote-reachable" : "loopback-browser";
 	const descriptor = {
@@ -7599,7 +8194,7 @@ const PAIRING_TOKEN_LENGTH = 12;
 const PAIRING_TOKEN_REJECTION_LIMIT = Math.floor(256 / 32) * 32;
 const make$63 = Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
-	const config = yield* ServerConfig;
+	const config = yield* ServerConfig$1;
 	const pairingLinks = yield* AuthPairingLinkRepository;
 	const seededGrantsRef = yield* Ref.make(/* @__PURE__ */ new Map());
 	const changesPubSub = yield* PubSub.unbounded();
@@ -7866,7 +8461,7 @@ const make$62 = Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
-	const serverConfig = yield* ServerConfig;
+	const serverConfig = yield* ServerConfig$1;
 	yield* fileSystem.makeDirectory(serverConfig.secretsDir, { recursive: true });
 	yield* fileSystem.chmod(serverConfig.secretsDir, 448).pipe(Effect.mapError((cause) => new SecretStoreSecureError({
 		resource: `secrets directory ${serverConfig.secretsDir}`,
@@ -8410,7 +9005,7 @@ function toAuthClientSession(input) {
 }
 const make$60 = Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
-	const serverConfig = yield* ServerConfig;
+	const serverConfig = yield* ServerConfig$1;
 	const secretStore = yield* ServerSecretStore;
 	const authSessions = yield* AuthSessionRepository;
 	const signingSecret = yield* secretStore.getOrCreateRandom(SIGNING_SECRET_NAME$1, 32);
@@ -10271,7 +10866,7 @@ const makeSqlitePersistenceLive = Effect.fn("makeSqlitePersistenceLive")(functio
 	}));
 }, Layer.unwrap);
 Layer.provideMerge(setup, makeRuntimeSqliteLayer({ filename: ":memory:" }));
-const layerConfig = Layer.unwrap(Effect.map(Effect.service(ServerConfig), ({ dbPath }) => makeSqlitePersistenceLive(dbPath)));
+const layerConfig = Layer.unwrap(Effect.map(Effect.service(ServerConfig$1), ({ dbPath }) => makeSqlitePersistenceLive(dbPath)));
 const INTERNAL_ADMINISTRATIVE_BOOTSTRAP_SUBJECT = "administrative-bootstrap";
 const serverAuthInternalErrorContext = { cause: Schema$1.Defect() };
 var ServerAuthBootstrapCredentialValidationError = class extends Schema$1.TaggedErrorClass()("ServerAuthBootstrapCredentialValidationError", { ...serverAuthInternalErrorContext }) {
@@ -10940,646 +11535,204 @@ function normalizePersistedServerSettingString(value) {
 	const trimmed = value?.trim();
 	return trimmed && trimmed.length > 0 ? trimmed : void 0;
 }
-function extractPersistedServerObservabilitySettings(input) {
-	return {
-		otlpTracesUrl: normalizePersistedServerSettingString(input.observability?.otlpTracesUrl),
-		otlpMetricsUrl: normalizePersistedServerSettingString(input.observability?.otlpMetricsUrl)
-	};
-}
-function parsePersistedServerObservabilitySettings(raw) {
-	const decoded = decodeServerSettingsJson(raw);
-	if (Option.isSome(decoded)) return extractPersistedServerObservabilitySettings(decoded.value);
-	return {
-		otlpTracesUrl: void 0,
-		otlpMetricsUrl: void 0
-	};
-}
-function shouldReplaceTextGenerationModelSelection(patch) {
-	return Boolean(patch && (patch.instanceId !== void 0 || patch.model !== void 0));
-}
-function mergeModelSelectionOptionsById(input) {
-	if (input.patch === void 0) return input.current ? [...input.current] : void 0;
-	if (input.patch.length === 0) return;
-	const merged = new Map((input.current ?? []).map((selection) => [selection.id, selection.value]));
-	for (const selection of input.patch) merged.set(selection.id, selection.value);
-	return [...merged.entries()].map(([id, value]) => ({
-		id,
-		value
-	}));
-}
-function applyServerSettingsPatch(current, patch) {
-	const selectionPatch = patch.textGenerationModelSelection;
-	const { automaticGitFetchInterval, ...patchForMerge } = patch;
-	const nextWithReplacements = {
-		...deepMerge(current, patchForMerge),
-		...patch.providerInstances !== void 0 ? { providerInstances: patch.providerInstances } : {},
-		...patch.sourceControlWriterModelSelection !== void 0 ? { sourceControlWriterModelSelection: patch.sourceControlWriterModelSelection } : {},
-		...automaticGitFetchInterval !== void 0 ? { automaticGitFetchInterval } : {}
-	};
-	if (!selectionPatch) return nextWithReplacements;
-	const instanceId = selectionPatch.instanceId ?? current.textGenerationModelSelection.instanceId;
-	const model = selectionPatch.model ?? current.textGenerationModelSelection.model;
-	const options = shouldReplaceTextGenerationModelSelection(selectionPatch) ? selectionPatch.options : mergeModelSelectionOptionsById({
-		current: current.textGenerationModelSelection.options,
-		patch: selectionPatch.options
-	});
-	return {
-		...nextWithReplacements,
-		textGenerationModelSelection: createModelSelection(instanceId, model, options)
-	};
-}
-//#endregion
-//#region src/bootstrap.ts
-var BootstrapFdStatError = class extends Schema$1.TaggedErrorClass()("BootstrapFdStatError", {
-	fd: Schema$1.Number,
-	cause: Schema$1.Defect()
-}) {
-	get message() {
-		return `Failed to stat bootstrap file descriptor ${this.fd}.`;
-	}
-};
-var BootstrapInputStreamOpenError = class extends Schema$1.TaggedErrorClass()("BootstrapInputStreamOpenError", {
-	fd: Schema$1.Number,
-	platform: Schema$1.String,
-	fdPath: Schema$1.optional(Schema$1.String),
-	cause: Schema$1.Defect()
-}) {
-	get message() {
-		const path = this.fdPath === void 0 ? "" : ` via '${this.fdPath}'`;
-		return `Failed to open bootstrap input stream for file descriptor ${this.fd}${path} on '${this.platform}'.`;
-	}
-};
-var BootstrapEnvelopeReadError = class extends Schema$1.TaggedErrorClass()("BootstrapEnvelopeReadError", {
-	fd: Schema$1.Number,
-	cause: Schema$1.Defect()
-}) {
-	get message() {
-		return `Failed to read bootstrap envelope from file descriptor ${this.fd}.`;
-	}
-};
-var BootstrapEnvelopeDecodeError = class extends Schema$1.TaggedErrorClass()("BootstrapEnvelopeDecodeError", {
-	fd: Schema$1.Number,
-	cause: Schema$1.Defect()
-}) {
-	get message() {
-		return `Failed to decode bootstrap envelope from file descriptor ${this.fd}.`;
-	}
-};
-Schema$1.Union([
-	BootstrapFdStatError,
-	BootstrapInputStreamOpenError,
-	BootstrapEnvelopeReadError,
-	BootstrapEnvelopeDecodeError
-]);
-const readBootstrapEnvelope = Effect.fn("readBootstrapEnvelope")(function* (schema, fd, options) {
-	if (!(yield* isFdReady(fd))) return Option.none();
-	const stream = yield* makeBootstrapInputStream(fd);
-	const timeoutMs = options?.timeoutMs ?? 1e3;
-	return yield* Effect.callback((resume) => {
-		const input = NodeReadline.createInterface({
-			input: stream,
-			crlfDelay: Infinity
-		});
-		const cleanup = () => {
-			stream.removeListener("error", handleError);
-			input.removeListener("line", handleLine);
-			input.removeListener("close", handleClose);
-			input.close();
-			stream.destroy();
-		};
-		const handleError = (error) => {
-			if (isUnavailableBootstrapFdError(error)) {
-				resume(Effect.succeedNone);
-				return;
-			}
-			resume(Effect.fail(new BootstrapEnvelopeReadError({
-				fd,
-				cause: error
-			})));
-		};
-		const handleLine = (line) => {
-			const parsed = decodeJsonResult(schema)(line);
-			if (Result.isSuccess(parsed)) resume(Effect.succeedSome(parsed.success));
-			else resume(Effect.fail(new BootstrapEnvelopeDecodeError({
-				fd,
-				cause: parsed.failure
-			})));
-		};
-		const handleClose = () => {
-			resume(Effect.succeedNone);
-		};
-		stream.once("error", handleError);
-		input.once("line", handleLine);
-		input.once("close", handleClose);
-		return Effect.sync(cleanup);
-	}).pipe(Effect.timeoutOption(timeoutMs), Effect.map(Option.flatten));
-});
-const isUnavailableBootstrapFdError = Predicate.compose(Predicate.hasProperty("code"), (_) => _.code === "EBADF" || _.code === "ENOENT");
-const isFdReady = (fd) => Effect.try({
-	try: () => NodeFS.fstatSync(fd),
-	catch: (error) => new BootstrapFdStatError({
-		fd,
-		cause: error
-	})
-}).pipe(Effect.as(true), Effect.catchTags({ BootstrapFdStatError: (error) => isUnavailableBootstrapFdError(error.cause) ? Effect.succeed(false) : Effect.fail(error) }));
-const makeBootstrapInputStream = (fd) => Effect.gen(function* () {
-	const platform = yield* HostProcessPlatform;
-	const fdPath = resolveFdPath(fd, platform);
-	return yield* Effect.try({
-		try: () => {
-			if (fdPath === void 0) return makeDirectBootstrapStream(fd);
-			let streamFd;
-			try {
-				streamFd = NodeFS.openSync(fdPath, "r");
-				return NodeFS.createReadStream("", {
-					fd: streamFd,
-					encoding: "utf8",
-					autoClose: true
-				});
-			} catch (error) {
-				if (isBootstrapFdPathDuplicationError(error)) {
-					if (streamFd !== void 0) NodeFS.closeSync(streamFd);
-					return makeDirectBootstrapStream(fd);
-				}
-				throw error;
-			}
-		},
-		catch: (error) => new BootstrapInputStreamOpenError({
-			fd,
-			platform,
-			...fdPath === void 0 ? {} : { fdPath },
-			cause: error
-		})
-	});
-});
-const makeDirectBootstrapStream = (fd) => {
-	try {
-		return NodeFS.createReadStream("", {
-			fd,
-			encoding: "utf8",
-			autoClose: true
-		});
-	} catch {
-		const stream = new NodeNet.Socket({
-			fd,
-			readable: true,
-			writable: false
-		});
-		stream.setEncoding("utf8");
-		return stream;
-	}
-};
-const isBootstrapFdPathDuplicationError = Predicate.compose(Predicate.hasProperty("code"), (_) => _.code === "ENXIO" || _.code === "EINVAL" || _.code === "EPERM" || _.code === "EACCES");
-function resolveFdPath(fd, platform) {
-	if (platform === "linux") return `/proc/self/fd/${fd}`;
-	if (platform === "win32") return;
-	return `/dev/fd/${fd}`;
-}
-//#endregion
-//#region ../../packages/shared/src/shell.ts
-const SHELL_ENV_NAME_PATTERN = /^[A-Z0-9_]+$/;
-const WINDOWS_PATH_DELIMITER = ";";
-const POSIX_PATH_DELIMITER = ":";
-const WINDOWS_SHELL_CANDIDATES = ["pwsh.exe", "powershell.exe"];
-function canExecuteFile(filePath) {
-	try {
-		NodeFS.accessSync(filePath, NodeFS.constants.X_OK);
-		return true;
-	} catch {
-		return false;
-	}
-}
-var CommandResolutionError = class extends Data.TaggedError("CommandResolutionError") {};
-const WINDOWS_SHELL_META_CHARS = /([()\][%!^"`<>&|;, *?])/g;
-/**
-* Escapes a single argument for `cmd.exe` shell mode (`spawn(..., { shell: true })`
-* on Windows). Node joins the command and arguments with spaces and hands the
-* resulting string to `cmd.exe` without any quoting, so every dynamic argument
-* must be escaped to survive both cmd.exe parsing and the target program's
-* `CommandLineToArgvW` parsing. Mirrors cross-spawn's argument escaping.
-*/
-function escapeWindowsShellArg(arg) {
-	let escaped = arg.replace(/(\\*)"/g, "$1$1\\\"");
-	escaped = escaped.replace(/(\\*)$/, "$1$1");
-	escaped = `"${escaped}"`;
-	return escaped.replace(WINDOWS_SHELL_META_CHARS, "^$1");
-}
-/**
-* Escapes arguments for shell-mode spawns: applies {@link escapeWindowsShellArg}
-* when the platform is `win32` (where `shell: true` routes through `cmd.exe`)
-* and returns the arguments untouched everywhere else.
-*/
-function sanitizeShellModeArgsForPlatform(args, platform) {
-	return platform === "win32" ? args.map(escapeWindowsShellArg) : [...args];
-}
-function resolveSpawnExecutableWithNode(command, platform, env) {
-	const path = platform === "win32" ? NodePath.win32 : NodePath.posix;
-	const windowsPathExtensions = platform === "win32" ? resolveWindowsPathExtensions(env) : [];
-	const candidates = resolveCommandCandidates(command, platform, windowsPathExtensions, path.extname);
-	const isExecutable = (candidate) => {
-		try {
-			if (!NodeFS.statSync(candidate).isFile()) return false;
-			if (platform === "win32") return windowsPathExtensions.includes(path.extname(candidate).toUpperCase());
-			return canExecuteFile(candidate);
-		} catch {
-			return false;
-		}
-	};
-	if (command.includes("/") || command.includes("\\")) return candidates.find(isExecutable);
-	for (const pathEntry of (readEnvPath(env) ?? "").split(pathDelimiterForPlatform(platform))) {
-		const normalizedPathEntry = stripWrappingQuotes(pathEntry.trim());
-		if (normalizedPathEntry.length === 0) continue;
-		for (const candidate of candidates) {
-			const candidatePath = path.join(normalizedPathEntry, candidate);
-			if (isExecutable(candidatePath)) return candidatePath;
-		}
-	}
-}
-const SpawnExecutableResolution = Context.Reference("@p4code/shared/shell/SpawnExecutableResolution", { defaultValue: () => resolveSpawnExecutableWithNode });
-function trimNonEmpty(value) {
-	const trimmed = value?.trim();
-	return trimmed && trimmed.length > 0 ? trimmed : void 0;
-}
-function readUserLoginShell() {
-	try {
-		return trimNonEmpty(NodeOS.userInfo().shell);
-	} catch {
-		return;
-	}
-}
-function listLoginShellCandidates(platform, shell, userShell = readUserLoginShell()) {
-	const fallbackShell = platform === "darwin" ? "/bin/zsh" : platform === "linux" ? "/bin/bash" : void 0;
-	const seen = /* @__PURE__ */ new Set();
-	const candidates = [];
-	for (const candidate of [
-		trimNonEmpty(shell),
-		trimNonEmpty(userShell),
-		fallbackShell
-	]) {
-		if (!candidate || seen.has(candidate)) continue;
-		seen.add(candidate);
-		candidates.push(candidate);
-	}
-	return candidates;
-}
-function readPathFromLoginShell(shell, execFile = NodeChildProcess.execFileSync) {
-	return readEnvironmentFromLoginShell(shell, ["PATH"], execFile).PATH;
-}
-function readPathFromLaunchctl(execFile = NodeChildProcess.execFileSync) {
-	try {
-		return trimNonEmpty(execFile("/bin/launchctl", ["getenv", "PATH"], {
-			encoding: "utf8",
-			timeout: 2e3
-		}));
-	} catch {
-		return;
-	}
-}
-function mergePathEntries(preferredPath, inheritedPath, platform) {
-	const delimiter = platform === "win32" ? ";" : ":";
-	const merged = [];
-	const seen = /* @__PURE__ */ new Set();
-	for (const pathValue of [preferredPath, inheritedPath]) {
-		if (!pathValue) continue;
-		for (const entry of pathValue.split(delimiter)) {
-			const trimmedEntry = entry.trim();
-			if (!trimmedEntry || seen.has(trimmedEntry)) continue;
-			seen.add(trimmedEntry);
-			merged.push(trimmedEntry);
-		}
-	}
-	return merged.length > 0 ? merged.join(delimiter) : void 0;
-}
-function envCaptureStart(name) {
-	return `__P4CODE_ENV_${name}_START__`;
-}
-function envCaptureEnd(name) {
-	return `__P4CODE_ENV_${name}_END__`;
-}
-function buildEnvironmentCaptureCommand(names) {
-	return names.map((name) => {
-		if (!SHELL_ENV_NAME_PATTERN.test(name)) throw new Error(`Unsupported environment variable name: ${name}`);
-		return [
-			`printf '%s\\n' '${envCaptureStart(name)}'`,
-			`printenv ${name} || true`,
-			`printf '%s\\n' '${envCaptureEnd(name)}'`
-		].join("; ");
-	}).join("; ");
-}
-function buildWindowsEnvironmentCaptureCommand(names) {
-	return ["$ErrorActionPreference = 'Stop'", ...names.flatMap((name) => {
-		if (!SHELL_ENV_NAME_PATTERN.test(name)) throw new Error(`Unsupported environment variable name: ${name}`);
-		return [
-			`Write-Output '${envCaptureStart(name)}'`,
-			`$value = [Environment]::GetEnvironmentVariable('${name}')`,
-			"if ($null -ne $value -and $value.Length -gt 0) { Write-Output $value }",
-			`Write-Output '${envCaptureEnd(name)}'`
-		];
-	})].join("; ");
-}
-function extractEnvironmentValue(output, name) {
-	const startMarker = envCaptureStart(name);
-	const endMarker = envCaptureEnd(name);
-	const startIndex = output.indexOf(startMarker);
-	if (startIndex === -1) return void 0;
-	const valueStartIndex = startIndex + startMarker.length;
-	const endIndex = output.indexOf(endMarker, valueStartIndex);
-	if (endIndex === -1) return void 0;
-	const value = output.slice(valueStartIndex, endIndex).replace(/^\r?\n/, "").replace(/\r?\n$/, "");
-	return value.length > 0 ? value : void 0;
-}
-const readEnvironmentFromLoginShell = (shell, names, execFile = NodeChildProcess.execFileSync) => {
-	if (names.length === 0) return {};
-	const output = execFile(shell, ["-ilc", buildEnvironmentCaptureCommand(names)], {
-		encoding: "utf8",
-		timeout: 5e3
-	});
-	const environment = {};
-	for (const name of names) {
-		const value = extractEnvironmentValue(output, name);
-		if (value !== void 0) environment[name] = value;
-	}
-	return environment;
-};
-const WindowsShellEnvironment = Context.Reference("@p4code/shared/shell/WindowsShellEnvironment", { defaultValue: () => readEnvironmentFromWindowsShell });
-const CommandAvailability = Context.Reference("@p4code/shared/shell/CommandAvailability", { defaultValue: () => isCommandAvailable });
-function readEnvironmentFromWindowsShell(names, optionsOrExecFile, maybeExecFile) {
-	if (names.length === 0) return {};
-	const options = typeof optionsOrExecFile === "function" ? {} : optionsOrExecFile ?? {};
-	const execFile = typeof optionsOrExecFile === "function" ? optionsOrExecFile : maybeExecFile ?? NodeChildProcess.execFileSync;
-	const command = buildWindowsEnvironmentCaptureCommand(names);
-	const args = [
-		"-NoLogo",
-		...options.loadProfile ? [] : ["-NoProfile"],
-		"-NonInteractive",
-		"-Command",
-		command
-	];
-	for (const shell of WINDOWS_SHELL_CANDIDATES) try {
-		const output = execFile(shell, args, {
-			encoding: "utf8",
-			timeout: 5e3
-		});
-		const environment = {};
-		for (const name of names) {
-			const value = extractEnvironmentValue(output, name);
-			if (value !== void 0) environment[name] = value;
-		}
-		return environment;
-	} catch {
-		continue;
-	}
-	return {};
-}
-function stripWrappingQuotes(value) {
-	return value.replace(/^"+|"+$/g, "");
-}
-function pathDelimiterForPlatform(platform) {
-	return platform === "win32" ? WINDOWS_PATH_DELIMITER : POSIX_PATH_DELIMITER;
-}
-function normalizePathEntryForComparison(entry, platform) {
-	const normalized = stripWrappingQuotes(entry.trim());
-	return platform === "win32" ? normalized.toLowerCase() : normalized;
-}
-function mergePathValues(preferredPath, inheritedPath, platform) {
-	const delimiter = pathDelimiterForPlatform(platform);
-	const merged = [];
-	const seen = /* @__PURE__ */ new Set();
-	for (const rawValue of [preferredPath, inheritedPath]) {
-		if (!rawValue) continue;
-		for (const entry of rawValue.split(delimiter)) {
-			const trimmed = entry.trim();
-			if (trimmed.length === 0) continue;
-			const normalized = normalizePathEntryForComparison(trimmed, platform);
-			if (normalized.length === 0 || seen.has(normalized)) continue;
-			seen.add(normalized);
-			merged.push(trimmed);
-		}
-	}
-	return merged.length > 0 ? merged.join(delimiter) : void 0;
+function extractPersistedServerObservabilitySettings(input) {
+	return {
+		otlpTracesUrl: normalizePersistedServerSettingString(input.observability?.otlpTracesUrl),
+		otlpMetricsUrl: normalizePersistedServerSettingString(input.observability?.otlpMetricsUrl)
+	};
 }
-function readEnvPath(env) {
-	return env.PATH ?? env.Path ?? env.path;
+function parsePersistedServerObservabilitySettings(raw) {
+	const decoded = decodeServerSettingsJson(raw);
+	if (Option.isSome(decoded)) return extractPersistedServerObservabilitySettings(decoded.value);
+	return {
+		otlpTracesUrl: void 0,
+		otlpMetricsUrl: void 0
+	};
 }
-function resolvePathEnvironmentVariable(env) {
-	return readEnvPath(env) ?? "";
+function shouldReplaceTextGenerationModelSelection(patch) {
+	return Boolean(patch && (patch.instanceId !== void 0 || patch.model !== void 0));
 }
-function resolveWindowsPathExtensions(env) {
-	const rawValue = env.PATHEXT;
-	const fallback = [
-		".COM",
-		".EXE",
-		".BAT",
-		".CMD"
-	];
-	if (!rawValue) return fallback;
-	const parsed = [];
-	for (const entry of rawValue.split(";")) {
-		const trimmed = entry.trim();
-		if (trimmed.length === 0) continue;
-		parsed.push(trimmed.startsWith(".") ? trimmed.toUpperCase() : `.${trimmed.toUpperCase()}`);
-	}
-	return parsed.length > 0 ? Array.from(new Set(parsed)) : fallback;
+function mergeModelSelectionOptionsById(input) {
+	if (input.patch === void 0) return input.current ? [...input.current] : void 0;
+	if (input.patch.length === 0) return;
+	const merged = new Map((input.current ?? []).map((selection) => [selection.id, selection.value]));
+	for (const selection of input.patch) merged.set(selection.id, selection.value);
+	return [...merged.entries()].map(([id, value]) => ({
+		id,
+		value
+	}));
 }
-function resolveCommandCandidates(command, platform, windowsPathExtensions, extname) {
-	if (platform !== "win32") return [command];
-	const extension = extname(command);
-	const normalizedExtension = extension.toUpperCase();
-	if (extension.length > 0 && windowsPathExtensions.includes(normalizedExtension)) {
-		const commandWithoutExtension = command.slice(0, -extension.length);
-		return Array.from(/* @__PURE__ */ new Set([
-			command,
-			`${commandWithoutExtension}${normalizedExtension}`,
-			`${commandWithoutExtension}${normalizedExtension.toLowerCase()}`
-		]));
-	}
-	const candidates = [];
-	for (const candidateExtension of windowsPathExtensions) {
-		candidates.push(`${command}${candidateExtension}`);
-		candidates.push(`${command}${candidateExtension.toLowerCase()}`);
-	}
-	return Array.from(new Set(candidates));
+function applyServerSettingsPatch(current, patch) {
+	const selectionPatch = patch.textGenerationModelSelection;
+	const { automaticGitFetchInterval, ...patchForMerge } = patch;
+	const nextWithReplacements = {
+		...deepMerge(current, patchForMerge),
+		...patch.providerInstances !== void 0 ? { providerInstances: patch.providerInstances } : {},
+		...patch.sourceControlWriterModelSelection !== void 0 ? { sourceControlWriterModelSelection: patch.sourceControlWriterModelSelection } : {},
+		...automaticGitFetchInterval !== void 0 ? { automaticGitFetchInterval } : {}
+	};
+	if (!selectionPatch) return nextWithReplacements;
+	const instanceId = selectionPatch.instanceId ?? current.textGenerationModelSelection.instanceId;
+	const model = selectionPatch.model ?? current.textGenerationModelSelection.model;
+	const options = shouldReplaceTextGenerationModelSelection(selectionPatch) ? selectionPatch.options : mergeModelSelectionOptionsById({
+		current: current.textGenerationModelSelection.options,
+		patch: selectionPatch.options
+	});
+	return {
+		...nextWithReplacements,
+		textGenerationModelSelection: createModelSelection(instanceId, model, options)
+	};
 }
-const isExecutableFile = Effect.fn("shell.isExecutableFile")(function* (filePath, platform, windowsPathExtensions) {
-	const fileSystem = yield* FileSystem.FileSystem;
-	const path = yield* Path.Path;
-	const stat = yield* fileSystem.stat(filePath).pipe(Effect.orElseSucceed(() => null));
-	if (stat === null || stat.type !== "File") return false;
-	if (platform === "win32") {
-		const extension = path.extname(filePath);
-		if (extension.length === 0) return false;
-		return windowsPathExtensions.includes(extension.toUpperCase());
+//#endregion
+//#region src/bootstrap.ts
+var BootstrapFdStatError = class extends Schema$1.TaggedErrorClass()("BootstrapFdStatError", {
+	fd: Schema$1.Number,
+	cause: Schema$1.Defect()
+}) {
+	get message() {
+		return `Failed to stat bootstrap file descriptor ${this.fd}.`;
 	}
-	return canExecuteFile(filePath);
-});
-const resolveCommandPathForPlatform = Effect.fn("shell.resolveCommandPathForPlatform")(function* (command, options) {
-	const path = yield* Path.Path;
-	const platform = options.platform;
-	const env = options.env ?? process.env;
-	const windowsPathExtensions = platform === "win32" ? resolveWindowsPathExtensions(env) : [];
-	const commandCandidates = resolveCommandCandidates(command, platform, windowsPathExtensions, path.extname);
-	if (command.includes("/") || command.includes("\\")) {
-		for (const candidate of commandCandidates) if (yield* isExecutableFile(candidate, platform, windowsPathExtensions)) return candidate;
-		return yield* new CommandResolutionError({
-			command,
-			reason: "not-found"
-		});
+};
+var BootstrapInputStreamOpenError = class extends Schema$1.TaggedErrorClass()("BootstrapInputStreamOpenError", {
+	fd: Schema$1.Number,
+	platform: Schema$1.String,
+	fdPath: Schema$1.optional(Schema$1.String),
+	cause: Schema$1.Defect()
+}) {
+	get message() {
+		const path = this.fdPath === void 0 ? "" : ` via '${this.fdPath}'`;
+		return `Failed to open bootstrap input stream for file descriptor ${this.fd}${path} on '${this.platform}'.`;
 	}
-	const pathValue = resolvePathEnvironmentVariable(env);
-	if (pathValue.length === 0) return yield* new CommandResolutionError({
-		command,
-		reason: "not-found"
-	});
-	const pathEntries = [];
-	for (const entry of pathValue.split(pathDelimiterForPlatform(platform))) {
-		const pathEntry = stripWrappingQuotes(entry.trim());
-		if (pathEntry.length > 0) pathEntries.push(pathEntry);
+};
+var BootstrapEnvelopeReadError = class extends Schema$1.TaggedErrorClass()("BootstrapEnvelopeReadError", {
+	fd: Schema$1.Number,
+	cause: Schema$1.Defect()
+}) {
+	get message() {
+		return `Failed to read bootstrap envelope from file descriptor ${this.fd}.`;
 	}
-	for (const pathEntry of pathEntries) for (const candidate of commandCandidates) {
-		const candidatePath = path.join(pathEntry, candidate);
-		if (yield* isExecutableFile(candidatePath, platform, windowsPathExtensions)) return candidatePath;
+};
+var BootstrapEnvelopeDecodeError = class extends Schema$1.TaggedErrorClass()("BootstrapEnvelopeDecodeError", {
+	fd: Schema$1.Number,
+	cause: Schema$1.Defect()
+}) {
+	get message() {
+		return `Failed to decode bootstrap envelope from file descriptor ${this.fd}.`;
 	}
-	return yield* new CommandResolutionError({
-		command,
-		reason: "not-found"
-	});
-});
-const resolveCommandPath = Effect.fn("shell.resolveCommandPath")(function* (command, options = {}) {
-	return yield* resolveCommandPathForPlatform(command, {
-		env: options.env ?? (yield* HostProcessEnvironment),
-		platform: yield* HostProcessPlatform
-	});
+};
+Schema$1.Union([
+	BootstrapFdStatError,
+	BootstrapInputStreamOpenError,
+	BootstrapEnvelopeReadError,
+	BootstrapEnvelopeDecodeError
+]);
+const readBootstrapEnvelope = Effect.fn("readBootstrapEnvelope")(function* (schema, fd, options) {
+	if (!(yield* isFdReady(fd))) return Option.none();
+	const stream = yield* makeBootstrapInputStream(fd);
+	const timeoutMs = options?.timeoutMs ?? 1e3;
+	return yield* Effect.callback((resume) => {
+		const input = NodeReadline.createInterface({
+			input: stream,
+			crlfDelay: Infinity
+		});
+		const cleanup = () => {
+			stream.removeListener("error", handleError);
+			input.removeListener("line", handleLine);
+			input.removeListener("close", handleClose);
+			input.close();
+			stream.destroy();
+		};
+		const handleError = (error) => {
+			if (isUnavailableBootstrapFdError(error)) {
+				resume(Effect.succeedNone);
+				return;
+			}
+			resume(Effect.fail(new BootstrapEnvelopeReadError({
+				fd,
+				cause: error
+			})));
+		};
+		const handleLine = (line) => {
+			const parsed = decodeJsonResult(schema)(line);
+			if (Result.isSuccess(parsed)) resume(Effect.succeedSome(parsed.success));
+			else resume(Effect.fail(new BootstrapEnvelopeDecodeError({
+				fd,
+				cause: parsed.failure
+			})));
+		};
+		const handleClose = () => {
+			resume(Effect.succeedNone);
+		};
+		stream.once("error", handleError);
+		input.once("line", handleLine);
+		input.once("close", handleClose);
+		return Effect.sync(cleanup);
+	}).pipe(Effect.timeoutOption(timeoutMs), Effect.map(Option.flatten));
 });
-const resolveSpawnCommand = Effect.fn("shell.resolveSpawnCommand")(function* (command, args, options = {}) {
+const isUnavailableBootstrapFdError = Predicate.compose(Predicate.hasProperty("code"), (_) => _.code === "EBADF" || _.code === "ENOENT");
+const isFdReady = (fd) => Effect.try({
+	try: () => NodeFS.fstatSync(fd),
+	catch: (error) => new BootstrapFdStatError({
+		fd,
+		cause: error
+	})
+}).pipe(Effect.as(true), Effect.catchTags({ BootstrapFdStatError: (error) => isUnavailableBootstrapFdError(error.cause) ? Effect.succeed(false) : Effect.fail(error) }));
+const makeBootstrapInputStream = (fd) => Effect.gen(function* () {
 	const platform = yield* HostProcessPlatform;
-	if (platform !== "win32") return {
-		command,
-		args: [...args],
-		shell: false
-	};
-	const hostEnvironment = yield* HostProcessEnvironment;
-	const env = options.env === void 0 ? hostEnvironment : options.extendEnv ? {
-		...hostEnvironment,
-		...options.env
-	} : options.env;
-	const resolvedCommand = (yield* SpawnExecutableResolution)(command, platform, env) ?? command;
-	const extension = NodePath.win32.extname(resolvedCommand).toLowerCase();
-	if (extension !== ".cmd" && extension !== ".bat") return {
-		command: resolvedCommand,
-		args: [...args],
-		shell: false
-	};
-	return {
-		command: escapeWindowsShellArg(resolvedCommand),
-		args: sanitizeShellModeArgsForPlatform(args, platform),
-		shell: true
-	};
-});
-const isCommandAvailable = Effect.fn("shell.isCommandAvailable")(function* (command, options = {}) {
-	return yield* resolveCommandPath(command, options).pipe(Effect.as(true), Effect.catchTag("CommandResolutionError", () => Effect.succeed(false)));
+	const fdPath = resolveFdPath(fd, platform);
+	return yield* Effect.try({
+		try: () => {
+			if (fdPath === void 0) return makeDirectBootstrapStream(fd);
+			let streamFd;
+			try {
+				streamFd = NodeFS.openSync(fdPath, "r");
+				return NodeFS.createReadStream("", {
+					fd: streamFd,
+					encoding: "utf8",
+					autoClose: true
+				});
+			} catch (error) {
+				if (isBootstrapFdPathDuplicationError(error)) {
+					if (streamFd !== void 0) NodeFS.closeSync(streamFd);
+					return makeDirectBootstrapStream(fd);
+				}
+				throw error;
+			}
+		},
+		catch: (error) => new BootstrapInputStreamOpenError({
+			fd,
+			platform,
+			...fdPath === void 0 ? {} : { fdPath },
+			cause: error
+		})
+	});
 });
-function resolveKnownWindowsCliDirs(env) {
-	const appData = env.APPDATA?.trim();
-	const localAppData = env.LOCALAPPDATA?.trim();
-	const userProfile = env.USERPROFILE?.trim();
-	return [
-		...appData ? [`${appData}\\npm`] : [],
-		...localAppData ? [`${localAppData}\\Programs\\nodejs`, `${localAppData}\\Volta\\bin`] : [],
-		...localAppData ? [`${localAppData}\\pnpm`] : [],
-		...userProfile ? [`${userProfile}\\.bun\\bin`, `${userProfile}\\scoop\\shims`] : []
-	];
-}
-function readWindowsEnvironmentSafely(readEnvironment, names, options) {
+const makeDirectBootstrapStream = (fd) => {
 	try {
-		return readEnvironment(names, options);
+		return NodeFS.createReadStream("", {
+			fd,
+			encoding: "utf8",
+			autoClose: true
+		});
 	} catch {
-		return {};
-	}
-}
-function mergeWindowsEnv(currentEnv, patch) {
-	const nextEnv = { ...currentEnv };
-	for (const [key, value] of Object.entries(patch)) if (value !== void 0) nextEnv[key] = value;
-	return nextEnv;
-}
-const resolveWindowsEnvironment = Effect.fn("shell.resolveWindowsEnvironment")(function* (env) {
-	const readEnvironment = yield* WindowsShellEnvironment;
-	const commandAvailable = yield* CommandAvailability;
-	const inheritedPath = readEnvPath(env);
-	const shellPath = readWindowsEnvironmentSafely(readEnvironment, ["PATH"], { loadProfile: false }).PATH;
-	const mergedPath = mergePathValues(shellPath, inheritedPath, "win32");
-	const baselinePath = mergePathValues(resolveKnownWindowsCliDirs(env).join(WINDOWS_PATH_DELIMITER), mergedPath, "win32");
-	const baselinePatch = baselinePath ? { PATH: baselinePath } : {};
-	if (yield* commandAvailable("node", { env: mergeWindowsEnv(env, baselinePatch) })) return baselinePatch;
-	const profiledEnvironment = readWindowsEnvironmentSafely(readEnvironment, [
-		"PATH",
-		"FNM_DIR",
-		"FNM_MULTISHELL_PATH"
-	], { loadProfile: true });
-	const profiledPath = mergePathValues(profiledEnvironment.PATH, baselinePath, "win32");
-	const profiledPatch = {
-		...profiledPath ? { PATH: profiledPath } : {},
-		...profiledEnvironment.FNM_DIR ? { FNM_DIR: profiledEnvironment.FNM_DIR } : {},
-		...profiledEnvironment.FNM_MULTISHELL_PATH ? { FNM_MULTISHELL_PATH: profiledEnvironment.FNM_MULTISHELL_PATH } : {}
-	};
-	return Object.keys(profiledPatch).length > 0 ? {
-		...baselinePatch,
-		...profiledPatch
-	} : baselinePatch;
-});
-//#endregion
-//#region src/os-jank.ts
-function logPathHydrationWarning(message, error) {
-	process.stderr.write(`[server] ${message} ${error instanceof Error ? error.message : error ?? ""}\n`);
-}
-function hydratePosixPath(env, platform) {
-	let shellPath;
-	for (const shell of listLoginShellCandidates(platform, env.SHELL)) {
-		try {
-			shellPath = readPathFromLoginShell(shell);
-		} catch (error) {
-			logPathHydrationWarning(`Failed to read PATH from login shell ${shell}.`, error);
-		}
-		if (shellPath) break;
+		const stream = new NodeNet.Socket({
+			fd,
+			readable: true,
+			writable: false
+		});
+		stream.setEncoding("utf8");
+		return stream;
 	}
-	const launchctlPath = platform === "darwin" && !shellPath ? readPathFromLaunchctl() : void 0;
-	const mergedPath = mergePathEntries(shellPath ?? launchctlPath, env.PATH, platform);
-	if (mergedPath) env.PATH = mergedPath;
+};
+const isBootstrapFdPathDuplicationError = Predicate.compose(Predicate.hasProperty("code"), (_) => _.code === "ENXIO" || _.code === "EINVAL" || _.code === "EPERM" || _.code === "EACCES");
+function resolveFdPath(fd, platform) {
+	if (platform === "linux") return `/proc/self/fd/${fd}`;
+	if (platform === "win32") return;
+	return `/dev/fd/${fd}`;
 }
-const fixPath = Effect.fn("fixPath")(function* () {
-	const platform = yield* HostProcessPlatform;
-	const env = yield* HostProcessEnvironment;
-	if (platform === "win32") {
-		const repairedEnvironment = yield* resolveWindowsEnvironment(env).pipe(Effect.catchDefect((defect) => Effect.sync(() => {
-			logPathHydrationWarning("Failed to hydrate PATH from the user environment.", defect);
-			return {};
-		})));
-		for (const [key, value] of Object.entries(repairedEnvironment)) if (value !== void 0) env[key] = value;
-		return;
-	}
-	if (platform !== "darwin" && platform !== "linux") return;
-	yield* Effect.sync(() => hydratePosixPath(env, platform)).pipe(Effect.catchDefect((defect) => Effect.sync(() => {
-		logPathHydrationWarning("Failed to hydrate PATH from the user environment.", defect);
-	})));
-});
-const expandHomePath$4 = Effect.fn(function* (input) {
-	const { join } = yield* Path.Path;
-	if (input === "~") return NodeOS.homedir();
-	if (input.startsWith("~/") || input.startsWith("~\\")) return join(NodeOS.homedir(), input.slice(2));
-	return input;
-});
-/** The data directory used when neither `--base-dir` nor `P4CODE_HOME` is set. */
-const defaultBaseDir = Effect.fn(function* () {
-	const { join } = yield* Path.Path;
-	return join(NodeOS.homedir(), ".p4");
-});
-const resolveBaseDir = Effect.fn(function* (raw) {
-	const { resolve } = yield* Path.Path;
-	if (!raw || raw.trim().length === 0) return yield* defaultBaseDir();
-	return resolve(yield* expandHomePath$4(raw.trim()));
-});
 //#endregion
 //#region src/cli/config.ts
-const modeFlag = Flag.choice("mode", RuntimeMode.literals).pipe(Flag.withDescription("Runtime mode. `desktop` keeps loopback defaults unless overridden."), Flag.optional);
+const modeFlag = Flag.choice("mode", RuntimeMode$1.literals).pipe(Flag.withDescription("Runtime mode. `desktop` keeps loopback defaults unless overridden."), Flag.optional);
 const portFlag = Flag.integer("port").pipe(Flag.withSchema(PortSchema), Flag.withDescription("Port for the HTTP/WebSocket server."), Flag.optional);
 const hostFlag = Flag.string("host").pipe(Flag.withDescription("Host/interface to bind (for example 127.0.0.1, 0.0.0.0, or a Tailnet IP)."), Flag.optional);
 const baseDirFlag = Flag.string("base-dir").pipe(Flag.withDescription("Explicit P4Code data directory; runtime state is stored under userdata (equivalent to P4CODE_HOME)."), Flag.optional);
@@ -11602,7 +11755,7 @@ const EnvServerConfig = Config.all({
 	otlpMetricsUrl: Config.string("P4CODE_OTLP_METRICS_URL").pipe(Config.option, Config.map(Option.getOrUndefined)),
 	otlpExportIntervalMs: Config.int("P4CODE_OTLP_EXPORT_INTERVAL_MS").pipe(Config.withDefault(1e4)),
 	otlpServiceName: Config.string("P4CODE_OTLP_SERVICE_NAME").pipe(Config.withDefault("p4-server")),
-	mode: Config.schema(RuntimeMode, "P4CODE_MODE").pipe(Config.option, Config.map(Option.getOrUndefined)),
+	mode: Config.schema(RuntimeMode$1, "P4CODE_MODE").pipe(Config.option, Config.map(Option.getOrUndefined)),
 	port: Config.port("P4CODE_PORT").pipe(Config.option, Config.map(Option.getOrUndefined)),
 	host: Config.string("P4CODE_HOST").pipe(Config.option, Config.map(Option.getOrUndefined)),
 	p4Home: Config.string("P4CODE_HOME").pipe(Config.option, Config.map(Option.getOrUndefined)),
@@ -13952,7 +14105,7 @@ const ProjectionThreadSession = Schema$1.Struct({
 	status: OrchestrationSessionStatus,
 	providerName: Schema$1.NullOr(Schema$1.String),
 	providerInstanceId: Schema$1.NullOr(ProviderInstanceId),
-	runtimeMode: RuntimeMode$1,
+	runtimeMode: RuntimeMode,
 	activeTurnId: Schema$1.NullOr(TurnId),
 	lastError: Schema$1.NullOr(Schema$1.String),
 	updatedAt: IsoDateTime
@@ -14047,7 +14200,7 @@ const ProjectionThread = Schema$1.Struct({
 	projectId: ProjectId,
 	title: Schema$1.String,
 	modelSelection: ModelSelection,
-	runtimeMode: RuntimeMode$1,
+	runtimeMode: RuntimeMode,
 	interactionMode: ProviderInteractionMode,
 	branch: Schema$1.NullOr(Schema$1.String),
 	worktreePath: Schema$1.NullOr(Schema$1.String),
@@ -15368,7 +15521,7 @@ function collectThreadAttachmentRelativePaths(threadId, messages) {
 	return relativePaths;
 }
 const runAttachmentSideEffects = Effect.fn("runAttachmentSideEffects")(function* (sideEffects) {
-	const serverConfig = yield* Effect.service(ServerConfig);
+	const serverConfig = yield* Effect.service(ServerConfig$1);
 	const fileSystem = yield* Effect.service(FileSystem.FileSystem);
 	const path = yield* Effect.service(Path.Path);
 	const attachmentsRootDir = serverConfig.attachmentsDir;
@@ -15430,7 +15583,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
 	const projectionPendingApprovalRepository = yield* ProjectionPendingApprovalRepository;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
-	const serverConfig = yield* ServerConfig;
+	const serverConfig = yield* ServerConfig$1;
 	const applyProjectsProjection = Effect.fn("applyProjectsProjection")(function* (event, _attachmentSideEffects) {
 		switch (event.type) {
 			case "project.created":
@@ -16120,9 +16273,9 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
 		})));
 	});
 	const bootstrapProjector = (projector) => projectionStateRepository.getByProjector({ projector: projector.name }).pipe(Effect.flatMap((stateRow) => Stream.runForEach(eventStore.readFromSequence(Option.isSome(stateRow) ? stateRow.value.lastAppliedSequence : 0), (event) => runProjectorForEvent(projector, event))));
-	const projectEvent = (event) => Effect.forEach(projectors, (projector) => runProjectorForEvent(projector, event), { concurrency: 1 }).pipe(Effect.provideService(FileSystem.FileSystem, fileSystem), Effect.provideService(Path.Path, path), Effect.provideService(ServerConfig, serverConfig), Effect.asVoid, Effect.catchTag("SqlError", (sqlError) => Effect.fail(toPersistenceSqlError("ProjectionPipeline.projectEvent:query")(sqlError))));
+	const projectEvent = (event) => Effect.forEach(projectors, (projector) => runProjectorForEvent(projector, event), { concurrency: 1 }).pipe(Effect.provideService(FileSystem.FileSystem, fileSystem), Effect.provideService(Path.Path, path), Effect.provideService(ServerConfig$1, serverConfig), Effect.asVoid, Effect.catchTag("SqlError", (sqlError) => Effect.fail(toPersistenceSqlError("ProjectionPipeline.projectEvent:query")(sqlError))));
 	return {
-		bootstrap: Effect.forEach(projectors, bootstrapProjector, { concurrency: 1 }).pipe(Effect.provideService(FileSystem.FileSystem, fileSystem), Effect.provideService(Path.Path, path), Effect.provideService(ServerConfig, serverConfig), Effect.asVoid, Effect.tap(() => Effect.logDebug("orchestration projection pipeline bootstrapped").pipe(Effect.annotateLogs({ projectors: projectors.length }))), Effect.catchTag("SqlError", (sqlError) => Effect.fail(toPersistenceSqlError("ProjectionPipeline.bootstrap:query")(sqlError)))),
+		bootstrap: Effect.forEach(projectors, bootstrapProjector, { concurrency: 1 }).pipe(Effect.provideService(FileSystem.FileSystem, fileSystem), Effect.provideService(Path.Path, path), Effect.provideService(ServerConfig$1, serverConfig), Effect.asVoid, Effect.tap(() => Effect.logDebug("orchestration projection pipeline bootstrapped").pipe(Effect.annotateLogs({ projectors: projectors.length }))), Effect.catchTag("SqlError", (sqlError) => Effect.fail(toPersistenceSqlError("ProjectionPipeline.bootstrap:query")(sqlError)))),
 		projectEvent
 	};
 });
@@ -18537,7 +18690,7 @@ function mergeWithDefaultKeybindings(custom) {
 */
 var Keybindings = class extends Context.Service()("@p4code/cli/keybindings") {};
 const make$56 = Effect.gen(function* () {
-	const { keybindingsConfigPath } = yield* ServerConfig;
+	const { keybindingsConfigPath } = yield* ServerConfig$1;
 	const fs = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const upsertSemaphore = yield* Semaphore.make(1);
@@ -19186,7 +19339,7 @@ function stripDefaultServerSettings(current, defaults) {
 	return Object.is(current, defaults) ? void 0 : current;
 }
 const make$53 = Effect.gen(function* () {
-	const { settingsPath } = yield* ServerConfig;
+	const { settingsPath } = yield* ServerConfig$1;
 	const fs = yield* FileSystem.FileSystem;
 	const pathService = yield* Path.Path;
 	const secretStore = yield* ServerSecretStore;
@@ -19517,7 +19670,7 @@ const getClaudeUserId = Effect.fn("TelemetryIdentity.getClaudeUserId")(function*
 });
 const upsertAnonymousId = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
-	const { anonymousIdPath } = yield* ServerConfig;
+	const { anonymousIdPath } = yield* ServerConfig$1;
 	const existing = yield* readIdentityFile(fileSystem, "anonymous", anonymousIdPath);
 	if (Option.isSome(existing)) return existing.value;
 	const anonymousId = yield* Crypto.Crypto.pipe(Effect.flatMap((crypto) => crypto.randomUUIDv4), Effect.mapError((cause) => new TelemetryAnonymousIdGenerationError({
@@ -19586,7 +19739,7 @@ var AnalyticsService = class AnalyticsService extends Context.Service()("@p4code
 const make$52 = Effect.gen(function* () {
 	const telemetryConfig = yield* TelemetryEnvConfig;
 	const httpClient = yield* HttpClient$1.HttpClient;
-	const serverConfig = yield* ServerConfig;
+	const serverConfig = yield* ServerConfig$1;
 	const identifier = yield* getTelemetryIdentifier;
 	const bufferRef = yield* Ref.make([]);
 	const clientType = serverConfig.mode === "desktop" ? "desktop-app" : "cli-web-client";
@@ -20202,7 +20355,7 @@ const resolveServerSelfUpdateCapability = Effect.fn("cloud.server_self_update.re
 });
 var ServerSelfUpdate = class extends Context.Service()("@p4code/cli/service/selfUpdate/ServerSelfUpdate") {};
 const make$50 = Effect.fn("cloud.server_self_update.make")(function* (options) {
-	const serverConfig = yield* ServerConfig;
+	const serverConfig = yield* ServerConfig$1;
 	const fs = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const runner = yield* ProcessRunner;
@@ -20484,7 +20637,7 @@ function platformArch(architecture) {
 const make$49 = Effect.gen(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
-	const serverConfig = yield* ServerConfig;
+	const serverConfig = yield* ServerConfig$1;
 	const crypto = yield* Crypto.Crypto;
 	const hostPlatform = yield* HostProcessPlatform;
 	const hostArchitecture = yield* HostProcessArchitecture;
@@ -21473,7 +21626,7 @@ const formatHeadlessServeOutput = (accessInfo) => [
 	""
 ].join("\n");
 const issueHeadlessServeAccessInfo = Effect.fn("issueHeadlessServeAccessInfo")(function* () {
-	const serverConfig = yield* ServerConfig;
+	const serverConfig = yield* ServerConfig$1;
 	const httpServer = yield* HttpServer.HttpServer;
 	const serverAuth = yield* EnvironmentAuth;
 	const connectionString = resolveHeadlessConnectionString(serverConfig.host, resolveListeningPort(httpServer.address, serverConfig.port));
@@ -21487,7 +21640,7 @@ const issueHeadlessServeAccessInfo = Effect.fn("issueHeadlessServeAccessInfo")(f
 //#endregion
 //#region src/serverRuntimeStartup.ts
 var ServerRuntimeStartupError = class extends Schema$1.TaggedErrorClass()("ServerRuntimeStartupError", {
-	mode: RuntimeMode,
+	mode: RuntimeMode$1,
 	host: Schema$1.NullOr(Schema$1.String),
 	port: Schema$1.Number,
 	cause: Schema$1.Defect()
@@ -21540,7 +21693,7 @@ const getAutoBootstrapDefaultModelSelection = () => ({
 	model: DEFAULT_MODEL
 });
 const resolveWelcomeBase = Effect.gen(function* () {
-	const serverConfig = yield* ServerConfig;
+	const serverConfig = yield* ServerConfig$1;
 	const segments = serverConfig.cwd.split(/[/\\]/).filter(Boolean);
 	const projectName = segments[segments.length - 1] ?? "project";
 	return {
@@ -21550,7 +21703,7 @@ const resolveWelcomeBase = Effect.gen(function* () {
 });
 const resolveAutoBootstrapWelcomeTargets = Effect.gen(function* () {
 	const randomUUID = (yield* Crypto.Crypto).randomUUIDv4;
-	const serverConfig = yield* ServerConfig;
+	const serverConfig = yield* ServerConfig$1;
 	const projectionReadModelQuery = yield* ProjectionSnapshotQuery;
 	const orchestrationEngine = yield* OrchestrationEngineService;
 	const path = yield* Path.Path;
@@ -21608,7 +21761,7 @@ const resolveAutoBootstrapWelcomeTargets = Effect.gen(function* () {
 	};
 });
 const resolveStartupBrowserTarget = Effect.gen(function* () {
-	const serverConfig = yield* ServerConfig;
+	const serverConfig = yield* ServerConfig$1;
 	const serverAuth = yield* EnvironmentAuth;
 	const localUrl = `http://localhost:${serverConfig.port}`;
 	const bindUrl = serverConfig.host && !isWildcardHost(serverConfig.host) ? `http://${formatHostForUrl(serverConfig.host)}:${serverConfig.port}` : localUrl;
@@ -21616,12 +21769,12 @@ const resolveStartupBrowserTarget = Effect.gen(function* () {
 	return yield* Effect.succeed(serverConfig.mode === "desktop" ? baseTarget : void 0).pipe(Effect.flatMap((target) => target ? Effect.succeed(target) : serverAuth.issueStartupPairingUrl(baseTarget)));
 });
 const maybeOpenBrowser = (target) => Effect.gen(function* () {
-	if ((yield* ServerConfig).noBrowser) return;
+	if ((yield* ServerConfig$1).noBrowser) return;
 	yield* (yield* ExternalLauncher).launchBrowser(target).pipe(Effect.catch(() => Effect.logInfo("browser auto-open unavailable", { hint: `Open ${target} in your browser.` })));
 });
 const runStartupPhase = (phase, effect) => effect.pipe(Effect.annotateSpans({ "startup.phase": phase }), Effect.withSpan(`server.startup.${phase}`));
 const make$48 = Effect.gen(function* () {
-	const serverConfig = yield* ServerConfig;
+	const serverConfig = yield* ServerConfig$1;
 	const keybindings = yield* Keybindings;
 	const orchestrationReactor = yield* OrchestrationReactor;
 	const providerSessionReaper = yield* ProviderSessionReaper;
@@ -23057,7 +23210,7 @@ const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (input) {
 		}
 		case "attachment": {
 			const attachmentPath = resolveAttachmentPathById({
-				attachmentsDir: (yield* ServerConfig).attachmentsDir,
+				attachmentsDir: (yield* ServerConfig$1).attachmentsDir,
 				attachmentId: input.resource.attachmentId
 			});
 			if (!attachmentPath) return yield* new AssetAttachmentNotFoundError({ resource: input.resource });
@@ -23122,7 +23275,7 @@ const resolveAsset = Effect.fn("AssetAccess.resolveAsset")(function* (token, rel
 	if (!claims || claims.expiresAt <= (yield* Clock.currentTimeMillis)) return null;
 	if (claims.kind === "attachment") {
 		const attachmentPath = resolveAttachmentPathById({
-			attachmentsDir: (yield* ServerConfig).attachmentsDir,
+			attachmentsDir: (yield* ServerConfig$1).attachmentsDir,
 			attachmentId: claims.attachmentId
 		});
 		if (!attachmentPath) return null;
@@ -23410,7 +23563,7 @@ const compressHttpResponse = Effect.fnUntraced(function* (response, acceptEncodi
 });
 const httpCompressionLayer = HttpRouter.middleware((httpEffect) => Effect.flatMap(Effect.all([httpEffect, HttpServerRequest.HttpServerRequest]), ([response, request]) => compressHttpResponse(response, request.headers["accept-encoding"])), { global: true });
 const browserApiCorsLayer = Layer.unwrap(Effect.gen(function* () {
-	const config = yield* ServerConfig;
+	const config = yield* ServerConfig$1;
 	const devOrigin = config.devUrl?.origin;
 	return HttpRouter.cors({
 		...devOrigin ? {
@@ -23452,7 +23605,7 @@ var DecodeOtlpTraceRecordsError = class extends Data.TaggedError("DecodeOtlpTrac
 const otlpTracesProxyRouteLayer = HttpRouter.add("POST", OTLP_TRACES_PROXY_PATH, Effect.gen(function* () {
 	yield* authenticateRawRouteWithScope(AuthOrchestrationOperateScope);
 	const request = yield* HttpServerRequest.HttpServerRequest;
-	const otlpTracesUrl = (yield* ServerConfig).otlpTracesUrl;
+	const otlpTracesUrl = (yield* ServerConfig$1).otlpTracesUrl;
 	const browserTraceCollector = yield* BrowserTraceCollector;
 	const httpClient = yield* HttpClient.HttpClient;
 	const bodyJson = cast(yield* request.json);
@@ -23497,7 +23650,7 @@ const staticAndDevRouteLayer = HttpRouter.add("GET", "*", Effect.gen(function* (
 	const request = yield* HttpServerRequest.HttpServerRequest;
 	const url = HttpServerRequest.toURL(request);
 	if (Option.isNone(url)) return HttpServerResponse.text("Bad Request", { status: 400 });
-	const config = yield* ServerConfig;
+	const config = yield* ServerConfig$1;
 	if (config.devUrl && isDevProxiedPath(url.value.pathname)) return HttpServerResponse.text("Not Found", { status: 404 });
 	if (config.devUrl && isLoopbackHostname(url.value.hostname)) return HttpServerResponse.redirect(resolveDevRedirectUrl(config.devUrl, url.value), { status: 302 });
 	const staticDir = config.staticDir ?? (config.devUrl ? yield* resolveStaticDir() : void 0);
@@ -24036,7 +24189,7 @@ const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function* () {
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const commandSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-	const { worktreesDir } = yield* ServerConfig;
+	const { worktreesDir } = yield* ServerConfig$1;
 	const crypto = yield* Crypto.Crypto;
 	const executeRaw = Effect.fnUntraced(function* (input) {
 		const commandInput = {
@@ -26464,7 +26617,7 @@ const normalizeDispatchCommand = (command) => Effect.gen(function* () {
 	const canonicalCommand = canonicalizeClientCommandTimestamps(command, receivedAt);
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
-	const serverConfig = yield* ServerConfig;
+	const serverConfig = yield* ServerConfig$1;
 	const workspacePaths = yield* WorkspacePaths;
 	const normalizeProjectWorkspaceRoot = (workspaceRoot) => workspacePaths.normalizeWorkspaceRoot(workspaceRoot).pipe(Effect.mapError((cause) => new OrchestrationDispatchCommandError({ message: cause.message })));
 	const normalizeProjectWorkspaceRootForCreate = (workspaceRoot, createIfMissing) => workspacePaths.normalizeWorkspaceRoot(workspaceRoot, { createIfMissing: createIfMissing === true }).pipe(Effect.mapError((cause) => new OrchestrationDispatchCommandError({ message: cause.message })));
@@ -26612,79 +26765,6 @@ const makeProviderMaintenanceCommandCoordinator = Effect.fn("makeProviderMainten
 	return { withCommandLock };
 });
 //#endregion
-//#region ../../packages/shared/src/semver.ts
-const SEMVER_NUMBER_SEGMENT = /^\d+$/;
-function normalizeSemverVersion(version) {
-	const [main, prerelease] = version.trim().split("-", 2);
-	const segments = [];
-	for (const segment of (main ?? "").split(".")) {
-		const trimmed = segment.trim();
-		if (trimmed.length > 0) segments.push(trimmed);
-	}
-	if (segments.length === 2) segments.push("0");
-	return prerelease ? `${segments.join(".")}-${prerelease}` : segments.join(".");
-}
-function parseSemver(value) {
-	const [main = "", prerelease] = normalizeSemverVersion(value).replace(/^v/, "").split("-", 2);
-	const segments = main.split(".");
-	if (segments.length !== 3) return null;
-	const [majorSegment, minorSegment, patchSegment] = segments;
-	if (majorSegment === void 0 || minorSegment === void 0 || patchSegment === void 0) return null;
-	if (!SEMVER_NUMBER_SEGMENT.test(majorSegment) || !SEMVER_NUMBER_SEGMENT.test(minorSegment) || !SEMVER_NUMBER_SEGMENT.test(patchSegment)) return null;
-	const major = Number.parseInt(majorSegment, 10);
-	const minor = Number.parseInt(minorSegment, 10);
-	const patch = Number.parseInt(patchSegment, 10);
-	if (![
-		major,
-		minor,
-		patch
-	].every(Number.isInteger)) return null;
-	return {
-		major,
-		minor,
-		patch,
-		prerelease: parsePrereleaseSegments(prerelease)
-	};
-}
-function parsePrereleaseSegments(prerelease) {
-	if (prerelease === void 0) return [];
-	const segments = [];
-	for (const segment of prerelease.split(".")) {
-		const trimmed = segment.trim();
-		if (trimmed.length > 0) segments.push(trimmed);
-	}
-	return segments;
-}
-function comparePrereleaseIdentifier(left, right) {
-	const leftNumeric = SEMVER_NUMBER_SEGMENT.test(left);
-	const rightNumeric = SEMVER_NUMBER_SEGMENT.test(right);
-	if (leftNumeric && rightNumeric) return Number.parseInt(left, 10) - Number.parseInt(right, 10);
-	if (leftNumeric) return -1;
-	if (rightNumeric) return 1;
-	return left.localeCompare(right);
-}
-function compareSemverVersions(left, right) {
-	const parsedLeft = parseSemver(left);
-	const parsedRight = parseSemver(right);
-	if (!parsedLeft || !parsedRight) return left.localeCompare(right);
-	if (parsedLeft.major !== parsedRight.major) return parsedLeft.major - parsedRight.major;
-	if (parsedLeft.minor !== parsedRight.minor) return parsedLeft.minor - parsedRight.minor;
-	if (parsedLeft.patch !== parsedRight.patch) return parsedLeft.patch - parsedRight.patch;
-	if (parsedLeft.prerelease.length === 0 && parsedRight.prerelease.length === 0) return 0;
-	if (parsedLeft.prerelease.length === 0) return 1;
-	if (parsedRight.prerelease.length === 0) return -1;
-	const length = Math.max(parsedLeft.prerelease.length, parsedRight.prerelease.length);
-	for (let index = 0; index < length; index += 1) {
-		const leftIdentifier = parsedLeft.prerelease[index];
-		const rightIdentifier = parsedRight.prerelease[index];
-		if (leftIdentifier === void 0) return -1;
-		if (rightIdentifier === void 0) return 1;
-		const comparison = comparePrereleaseIdentifier(leftIdentifier, rightIdentifier);
-		if (comparison !== 0) return comparison;
-	}
-	return 0;
-}
-//#endregion
 //#region src/provider/providerMaintenance.ts
 const LATEST_VERSION_CACHE_TTL_MS = 3600 * 1e3;
 const LATEST_VERSION_TIMEOUT_MS = 4e3;
@@ -28276,7 +28356,7 @@ function normalizedRuntimeEnv(env) {
 	return Object.fromEntries(entries.toSorted(([left], [right]) => left.localeCompare(right)));
 }
 const make$35 = Effect.fn("TerminalManager.make")(function* () {
-	const { terminalLogsDir } = yield* ServerConfig;
+	const { terminalLogsDir } = yield* ServerConfig$1;
 	const ptyAdapter = yield* PtyAdapter;
 	const portDiscovery = yield* PortDiscovery;
 	return yield* makeWithOptions$1({
@@ -33227,7 +33307,7 @@ function bindProviderContext(provider, context) {
 	});
 }
 const makeWithProviders = Effect.fn("makeSourceControlProviderRegistryWithProviders")(function* (registrations) {
-	const config = yield* ServerConfig;
+	const config = yield* ServerConfig$1;
 	const process = yield* VcsProcess;
 	const vcsRegistry = yield* VcsDriverRegistry;
 	const providers = new Map(registrations.map((registration) => [registration.kind, registration.provider]));
@@ -35038,7 +35118,7 @@ const layer$10 = Layer.effect(VcsProvisioningService, make$15);
 //#region src/review/ReviewService.ts
 var ReviewService = class extends Context.Service()("@p4code/cli/review/ReviewService") {};
 const make$14 = Effect.gen(function* () {
-	const config = yield* ServerConfig;
+	const config = yield* ServerConfig$1;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const vcsRegistry = yield* VcsDriverRegistry;
@@ -35949,7 +36029,7 @@ const VCS_PROBES = [{
 }];
 var SourceControlDiscovery = class extends Context.Service()("@p4code/cli/sourceControl/SourceControlDiscovery") {};
 const make$10 = Effect.gen(function* () {
-	const config = yield* ServerConfig;
+	const config = yield* ServerConfig$1;
 	const process = yield* VcsProcess;
 	const sourceControlProviders = yield* SourceControlProviderRegistry;
 	const probe = (input) => {
@@ -36031,7 +36111,7 @@ function expandHomePath$1(input, path) {
 	return input;
 }
 const make$9 = Effect.gen(function* () {
-	const config = yield* ServerConfig;
+	const config = yield* ServerConfig$1;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const git = yield* GitVcsDriver;
 	const path = yield* Path.Path;
@@ -36390,7 +36470,7 @@ const makeWsRpcLayer = (currentSession, previewAutomationBroker) => WsRpcGroup.t
 	const providerRegistry = yield* ProviderRegistry;
 	const providerMaintenanceRunner = yield* ProviderMaintenanceRunner;
 	const serverSelfUpdate = yield* ServerSelfUpdate;
-	const config = yield* ServerConfig;
+	const config = yield* ServerConfig$1;
 	const lifecycleEvents = yield* ServerLifecycleEvents;
 	const serverSettings = yield* ServerSettingsService;
 	const startup = yield* ServerRuntimeStartup;
@@ -37034,7 +37114,7 @@ const ProviderSessionRuntime = Schema$1.Struct({
 	*/
 	providerInstanceId: Schema$1.NullOr(ProviderInstanceId),
 	adapterKey: Schema$1.String,
-	runtimeMode: RuntimeMode$1,
+	runtimeMode: RuntimeMode,
 	status: ProviderSessionRuntimeStatus,
 	lastSeenAt: IsoDateTime,
 	resumeCursor: Schema$1.NullOr(Schema$1.Unknown),
@@ -37667,7 +37747,7 @@ var ProviderEventLoggers = class extends Context.Service()("@p4code/cli/provider
 * is `undefined` and writes from that stream become no-ops downstream.
 */
 const ProviderEventLoggersLive = Layer.effect(ProviderEventLoggers, Effect.gen(function* () {
-	const { providerEventLogPath } = yield* ServerConfig;
+	const { providerEventLogPath } = yield* ServerConfig$1;
 	return {
 		native: yield* makeEventNdjsonLogger(providerEventLogPath, { stream: "native" }),
 		canonical: yield* makeEventNdjsonLogger(providerEventLogPath, { stream: "canonical" })
@@ -41136,7 +41216,7 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 	const boundInstanceId = options?.instanceId ?? ProviderInstanceId.make("claudeAgent");
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
-	const serverConfig = yield* ServerConfig;
+	const serverConfig = yield* ServerConfig$1;
 	const crypto = yield* Crypto.Crypto;
 	const claudeEnvironment = yield* makeClaudeEnvironment(claudeSettings, options?.environment).pipe(Effect.provideService(Path.Path, path));
 	const claudeSdkExecutablePath = yield* resolveClaudeSdkExecutablePath(claudeSettings.binaryPath, claudeEnvironment);
@@ -43019,7 +43099,7 @@ const ClaudeDriver = {
 		const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
 		const fileSystem = yield* FileSystem.FileSystem;
 		const path = yield* Path.Path;
-		const { cwd } = yield* ServerConfig;
+		const { cwd } = yield* ServerConfig$1;
 		const httpClient = yield* HttpClient.HttpClient;
 		const serverSettings = yield* ServerSettingsService;
 		const eventLoggers = yield* ProviderEventLoggers;
@@ -43130,7 +43210,7 @@ const makeCodexTextGeneration = Effect.fn("makeCodexTextGeneration")(function* (
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const commandSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-	const serverConfig = yield* Effect.service(ServerConfig);
+	const serverConfig = yield* Effect.service(ServerConfig$1);
 	const resolvedEnvironment = environment ?? process.env;
 	const readStreamAsString = (operation, stream) => stream.pipe(Stream.decodeText(), Stream.runFold(() => "", (acc, chunk) => acc + chunk), Effect.mapError((cause) => normalizeCliError("codex", operation, cause, "Failed to collect process output")));
 	const writeTempFile = (operation, prefix, content) => fileSystem.makeTempFileScoped({ prefix: `p4code-${prefix}-${process.pid}-` }).pipe(Effect.tap((filePath) => fileSystem.writeFileString(filePath, content)), Effect.mapError((cause) => new TextGenerationError({
@@ -63448,7 +63528,7 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 	const fileSystem = yield* FileSystem.FileSystem;
 	const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
 	const crypto = yield* Crypto.Crypto;
-	const serverConfig = yield* Effect.service(ServerConfig);
+	const serverConfig = yield* Effect.service(ServerConfig$1);
 	const nativeEventLogger = options?.nativeEventLogger ?? (options?.nativeEventLogPath !== void 0 ? yield* makeEventNdjsonLogger(options.nativeEventLogPath, { stream: "native" }) : void 0);
 	const managedNativeEventLogger = options?.nativeEventLogger === void 0 ? nativeEventLogger : void 0;
 	const runtimeEventQueue = yield* Queue.unbounded();
@@ -69941,7 +70021,7 @@ function makeCursorAdapter(cursorSettings, options) {
 		const fileSystem = yield* FileSystem.FileSystem;
 		const path = yield* Path.Path;
 		const childProcessSpawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
-		const serverConfig = yield* Effect.service(ServerConfig);
+		const serverConfig = yield* Effect.service(ServerConfig$1);
 		const crypto = yield* Crypto.Crypto;
 		const nativeEventLogger = options?.nativeEventLogger ?? (options?.nativeEventLogPath !== void 0 ? yield* makeEventNdjsonLogger(options.nativeEventLogPath, { stream: "native" }) : void 0);
 		const managedNativeEventLogger = options?.nativeEventLogger === void 0 ? nativeEventLogger : void 0;
@@ -71060,7 +71140,7 @@ function makeGrokAdapter(grokSettings, options) {
 		const fileSystem = yield* FileSystem.FileSystem;
 		const path = yield* Path.Path;
 		const childProcessSpawner = yield* ChildProcessSpawner$1.ChildProcessSpawner;
-		const serverConfig = yield* Effect.service(ServerConfig);
+		const serverConfig = yield* Effect.service(ServerConfig$1);
 		const crypto = yield* Crypto.Crypto;
 		const nativeEventLogger = options?.nativeEventLogger ?? (options?.nativeEventLogPath !== void 0 ? yield* makeEventNdjsonLogger(options.nativeEventLogPath, { stream: "native" }) : void 0);
 		const managedNativeEventLogger = options?.nativeEventLogger === void 0 ? nativeEventLogger : void 0;
@@ -72234,7 +72314,7 @@ function getOpenCodeTextResponse(parts) {
 	return (parts ?? []).filter(isOpenCodeTextPart).map((part) => part.text).join("").trim();
 }
 const makeOpenCodeTextGeneration = Effect.fn("makeOpenCodeTextGeneration")(function* (openCodeSettings, environment) {
-	const serverConfig = yield* ServerConfig;
+	const serverConfig = yield* ServerConfig$1;
 	const openCodeRuntime = yield* OpenCodeRuntime;
 	const resolvedEnvironment = environment ?? process.env;
 	const idleFiberScope = yield* Effect.acquireRelease(Scope.make(), (scope) => Scope.close(scope, Exit.void));
@@ -72765,7 +72845,7 @@ const stopOpenCodeContext = Effect.fn("stopOpenCodeContext")(function* (context)
 function makeOpenCodeAdapter(openCodeSettings, options) {
 	return Effect.gen(function* () {
 		const boundInstanceId = options?.instanceId ?? ProviderInstanceId.make("opencode");
-		const serverConfig = yield* ServerConfig;
+		const serverConfig = yield* ServerConfig$1;
 		const openCodeRuntime = yield* OpenCodeRuntime;
 		const crypto = yield* Crypto.Crypto;
 		const fileSystem = yield* FileSystem.FileSystem;
@@ -73836,7 +73916,7 @@ const BUILT_IN_DRIVERS = [
 		defaultConfig: () => decodeOpenCodeSettings({}),
 		create: ({ instanceId, displayName, accentColor, environment, enabled, config }) => Effect.gen(function* () {
 			const openCodeRuntime = yield* OpenCodeRuntime;
-			const serverConfig = yield* ServerConfig;
+			const serverConfig = yield* ServerConfig$1;
 			const httpClient = yield* HttpClient.HttpClient;
 			const serverSettings = yield* ServerSettingsService;
 			const eventLoggers = yield* ProviderEventLoggers;
@@ -77547,7 +77627,7 @@ const buildSnapshotSource = (instance) => ({
 });
 const ProviderRegistryLive = Layer.effect(ProviderRegistry, Effect.gen(function* () {
 	const instanceRegistry = yield* ProviderInstanceRegistry;
-	const config = yield* ServerConfig;
+	const config = yield* ServerConfig$1;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const changesPubSub = yield* Effect.acquireRelease(PubSub.unbounded(), PubSub.shutdown);
@@ -77774,7 +77854,7 @@ const ProviderRegistryLive = Layer.effect(ProviderRegistry, Effect.gen(function*
 //#endregion
 //#region src/serverLogger.ts
 const ServerLoggerLive = Effect.gen(function* () {
-	const config = yield* ServerConfig;
+	const config = yield* ServerConfig$1;
 	const minimumLogLevelLayer = Layer.succeed(References.MinimumLogLevel, config.logLevel);
 	const loggerLayer = Logger.layer([Logger.consolePretty(), Logger.tracerLogger], { mergeWithExisting: false });
 	return Layer.mergeAll(loggerLayer, minimumLogLevelLayer);
@@ -77783,7 +77863,7 @@ const ServerLoggerLive = Effect.gen(function* () {
 //#region src/observability/Layers/Observability.ts
 const otlpSerializationLayer = OtlpSerialization.layerJson;
 const ObservabilityLive = Layer.unwrap(Effect.gen(function* () {
-	const config = yield* ServerConfig;
+	const config = yield* ServerConfig$1;
 	const traceReferencesLayer = Layer.mergeAll(Layer.succeed(Tracer.MinimumTraceLevel, config.traceMinLevel), Layer.succeed(References.TracerTimingEnabled, config.traceTimingEnabled));
 	const tracerLayer = Layer.unwrap(Effect.gen(function* () {
 		const sink = yield* makeTraceSink({
@@ -78057,11 +78137,11 @@ const disableTailscaleServe = (input = {}) => Effect.gen(function* () {
 //#region src/server.ts
 const HTTP_PREEMPTIVE_SHUTDOWN_GRACE_MS = 0;
 const PtyAdapterLive = Layer.unwrap(Effect.gen(function* () {
-	if (typeof Bun !== "undefined") return (yield* Effect.promise(() => import("./BunPtyAdapter-DogtLQSx.mjs"))).layer;
-	else return (yield* Effect.promise(() => import("./NodePtyAdapter-CS1weRcq.mjs"))).layer;
+	if (typeof Bun !== "undefined") return (yield* Effect.promise(() => import("./BunPtyAdapter-CLDq7yr1.mjs"))).layer;
+	else return (yield* Effect.promise(() => import("./NodePtyAdapter-BQAnH2v0.mjs"))).layer;
 }));
 const HttpServerLive = Layer.unwrap(Effect.gen(function* () {
-	const config = yield* ServerConfig;
+	const config = yield* ServerConfig$1;
 	if (typeof Bun !== "undefined") return (yield* Effect.promise(() => import("@effect/platform-bun/BunHttpServer"))).layer({
 		port: config.port,
 		hostname: config.host ?? "127.0.0.1",
@@ -78112,7 +78192,7 @@ const RuntimeDependenciesLive = ReactorLayerLive.pipe(Layer.provideMerge(Checkpo
 const RuntimeServicesLive = layer$43.pipe(Layer.provideMerge(RuntimeDependenciesLive));
 const makeRoutesLayer = Layer.mergeAll(Layer.mergeAll(HttpApiBuilder.layer(EnvironmentHttpApi).pipe(Layer.provide(authHttpApiLayer), Layer.provide(orchestrationHttpApiLayer), Layer.provide(serverEnvironmentHttpApiLayer), Layer.provide(environmentAuthenticatedAuthLayer)), otlpTracesProxyRouteLayer, assetRouteLayer, staticAndDevRouteLayer, websocketRpcRouteLayer), layer.pipe(Layer.provide(layer$2))).pipe(Layer.provide(layer$29), Layer.provide(layer$45), Layer.provide(browserApiCorsLayer), Layer.provide(httpCompressionLayer));
 const makeServerLayer = Layer.unwrap(Effect.gen(function* () {
-	const config = yield* ServerConfig;
+	const config = yield* ServerConfig$1;
 	yield* fixPath();
 	const httpListeningLayer = Layer.effectDiscard(Effect.gen(function* () {
 		yield* HttpServer.HttpServer;
@@ -78160,7 +78240,7 @@ const runServer = Layer.launch(makeServerLayer);
 //#region src/cli/server.ts
 const runServerCommand = (flags, options) => Effect.gen(function* () {
 	const config = yield* resolveServerConfig(flags, yield* GlobalFlag.LogLevel, options);
-	return yield* runServer.pipe(Effect.provideService(ServerConfig, config));
+	return yield* runServer.pipe(Effect.provideService(ServerConfig$1, config));
 });
 const startCommand = Command.make("start", { ...sharedServerCommandFlags }).pipe(Command.withDescription("Run the P4Code server."), Command.withHandler((flags) => runServerCommand(flags)));
 const serveCommand = Command.make("serve", { ...sharedServerCommandFlags }).pipe(Command.withDescription("Run the P4Code server without opening a browser and print headless pairing details."), Command.withHandler((flags) => runServerCommand(flags, {
@@ -78168,6 +78248,104 @@ const serveCommand = Command.make("serve", { ...sharedServerCommandFlags }).pipe
 	forceAutoBootstrapProjectFromCwd: false
 })));
 //#endregion
+//#region src/cli/completions.ts
+/**
+* Installs the zsh completion script for the `p4` command.
+*
+* zsh ships `_perforce` with `#compdef p4 p4d`, so out of the box tabbing
+* through our subcommands prints "unhandled perforce command: …" from its
+* fallback message. `compinit` resolves duplicate `#compdef` claims by fpath
+* order — first match wins — and `_perforce` lives in the *last* fpath entry
+* (`/usr/share/zsh/<ver>/functions`). Writing our own `_p4` into any earlier
+* directory therefore replaces it outright, with no shell-config edit.
+*/
+const COMPLETION_FILE = "_p4";
+const GENERATE_TIMEOUT_MS = 1e4;
+/**
+* Directories ahead of `/usr/share/zsh/*` in a default fpath, most specific
+* first. `~/.zfunc` is the fallback and is the only one needing an fpath line.
+*/
+function candidateDirectories(input) {
+	return [
+		{
+			dir: input.join(input.homeDir, ".oh-my-zsh", "custom", "completions"),
+			requiresFpathEntry: false
+		},
+		{
+			dir: "/opt/homebrew/share/zsh/site-functions",
+			requiresFpathEntry: false
+		},
+		{
+			dir: "/usr/local/share/zsh/site-functions",
+			requiresFpathEntry: false
+		},
+		{
+			dir: input.join(input.homeDir, ".zfunc"),
+			requiresFpathEntry: true
+		}
+	];
+}
+/**
+* Asks the running CLI for its own completion script rather than rendering one
+* here, so the output cannot drift from what `--completions` produces.
+*/
+const generateZshCompletionScript = Effect.fn("cli.completions.generate")(function* () {
+	const runner = yield* ProcessRunner;
+	const execPath = yield* HostProcessExecutablePath;
+	const entryPath = (yield* HostProcessArguments)[1] ?? "";
+	if (entryPath === "") return null;
+	const result = yield* runner.run({
+		command: execPath,
+		args: [
+			entryPath,
+			"--completions",
+			"zsh"
+		],
+		timeout: GENERATE_TIMEOUT_MS
+	});
+	if (result.code !== 0) return null;
+	const script = result.stdout.trim();
+	return script.length === 0 ? null : `${script}\n`;
+});
+/**
+* Best-effort: returns null when completions are not applicable (Windows, no
+* writable directory) rather than failing the command that asked for them.
+* Installing completions is never the reason an install should fail.
+*/
+const installZshCompletion = Effect.fn("cli.completions.install")(function* () {
+	if ((yield* HostProcessPlatform) === "win32") return null;
+	const fs = yield* FileSystem.FileSystem;
+	const path = yield* Path.Path;
+	const homeDir = (yield* HostProcessEnvironment).HOME ?? "";
+	if (homeDir === "") return null;
+	const script = yield* generateZshCompletionScript();
+	if (script === null) return null;
+	for (const candidate of candidateDirectories({
+		homeDir,
+		join: path.join
+	})) {
+		if (candidate.requiresFpathEntry) {
+			if (!(yield* fs.makeDirectory(candidate.dir, { recursive: true }).pipe(Effect.as(true), Effect.orElseSucceed(() => false)))) continue;
+		} else if (!(yield* fs.exists(candidate.dir).pipe(Effect.orElseSucceed(() => false)))) continue;
+		const target = path.join(candidate.dir, COMPLETION_FILE);
+		if (!(yield* fs.writeFileString(target, script).pipe(Effect.as(true), Effect.orElseSucceed(() => false)))) continue;
+		return {
+			path: target,
+			requiresFpathEntry: candidate.requiresFpathEntry
+		};
+	}
+	return null;
+});
+function formatZshCompletionInstall(install) {
+	const installed = `Installed zsh completions at ${install.path}.`;
+	if (!install.requiresFpathEntry) return `${installed} Open a new shell to use them.`;
+	return [
+		installed,
+		`Add this to ~/.zshrc before compinit runs, then open a new shell:`,
+		`  fpath=(${install.path.replace(/\/[^/]+$/u, "")} $fpath)`
+	].join("\n");
+}
+//#endregion
 //#region src/cli/service.ts
 const isBootServiceCommandError = Schema$1.is(BootServiceCommandError);
 const bootServiceLayer = (config) => layer$46({
@@ -78220,7 +78398,7 @@ const runServiceCommand = Effect.fn("cli.service.run")(function* (flags, run) {
 	const config = yield* resolveCliAuthConfig(flags, yield* GlobalFlag.LogLevel);
 	const baseDirNotice = yield* describeNonDefaultBaseDir(config.baseDir);
 	if (baseDirNotice !== null) yield* Console.error(baseDirNotice);
-	return yield* run.pipe(Effect.tapError((error) => isBootServiceCommandError(error) ? BootService.pipe(Effect.flatMap((service) => Console.error(`Details: ${service.logPath}`))) : Effect.void), Effect.provide(bootServiceLayer(config)));
+	return yield* run.pipe(Effect.tapError((error) => isBootServiceCommandError(error) ? BootService.pipe(Effect.flatMap((service) => Console.error(`Details: ${service.logPath}`))) : Effect.void), Effect.provide(bootServiceLayer(config)), Effect.provide(layer$53));
 });
 const serviceInstallCommand = Command.make("install", projectLocationFlags).pipe(Command.withDescription("Install P4Code as a background service for this user."), Command.withHandler((flags) => runServiceCommand(flags, Effect.gen(function* () {
 	const result = yield* reconcileService();
@@ -78234,6 +78412,8 @@ const serviceInstallCommand = Command.make("install", projectLocationFlags).pipe
 		cliVersion: version,
 		platform: yield* HostProcessPlatform
 	}));
+	const completion = yield* installZshCompletion().pipe(Effect.orElseSucceed(() => null));
+	if (completion !== null) yield* Console.log(formatZshCompletionInstall(completion));
 }))));
 const serviceUpdateCommand = Command.make("update", projectLocationFlags).pipe(Command.withDescription("Update or repair the background service so it runs this CLI build, then restart it."), Command.withHandler((flags) => runServiceCommand(flags, Effect.gen(function* () {
 	const result = yield* reconcileService();
@@ -78280,7 +78460,23 @@ const serviceCommand = Command.make("service").pipe(Command.withDescription("Man
 ]));
 //#endregion
 //#region src/bin.ts
-const CliRuntimeLayer = Layer.mergeAll(NodeServices.layer, layer$62);
+const CliRuntimeLayer = Layer.mergeAll(NodeServices.layer, layer$62, FetchHttpClient.layer);
+/**
+* Prints an update reminder before dispatching, at most once a day.
+*
+* On stderr so it never contaminates `--json` output or a redirected
+* `--completions` script, and fully swallowed: an advisory notice must not be
+* able to fail a command or change its exit code.
+*/
+const reportUpdateAvailable = Effect.gen(function* () {
+	const baseDir = yield* resolveBaseDir((yield* HostProcessEnvironment).P4CODE_HOME);
+	const paths = yield* deriveServerPaths(baseDir, void 0);
+	const reminder = yield* resolveUpdateReminder({
+		currentVersion: version,
+		stateDir: paths.stateDir
+	});
+	if (reminder !== null) yield* Console.error(reminder);
+}).pipe(Effect.ignore);
 const makeCli = () => Command.make("p4", { ...sharedServerCommandFlags }).pipe(Command.withDescription("Run the P4Code server."), Command.withHandler((flags) => runServerCommand(flags)), Command.withSubcommands([
 	startCommand,
 	serveCommand,
@@ -78289,7 +78485,7 @@ const makeCli = () => Command.make("p4", { ...sharedServerCommandFlags }).pipe(C
 	serviceCommand
 ]));
 const cli = makeCli();
-if (import.meta.main) Command.run(cli, { version }).pipe(Effect.scoped, Effect.provide(CliRuntimeLayer), NodeRuntime.runMain);
+if (import.meta.main) reportUpdateAvailable.pipe(Effect.andThen(Command.run(cli, { version })), Effect.scoped, Effect.provide(CliRuntimeLayer), NodeRuntime.runMain);
 //#endregion
 export { cli, makeCli };