@ru-code/ru-code 3.0.0 → 3.0.1

package/dist/bin.mjs

@@ -15294,20 +15294,7 @@ const layer$20 = sync$2(NetService, make$34);
 
 //#endregion
 //#region package.json
-var version = "2.0.0";
-
-//#endregion
-//#region ../../packages/contracts/src/appName.ts
-/**
-* APP_NAME — single source of truth for the application's short name.
-*
-* Used to derive every user-visible identifier that should be branded with
-* the app: the home directory (`~/.${APP_NAME}`), env var prefixes, temp
-* file prefixes, etc. Change here to rebrand everywhere.
-*/
-const APP_NAME$1 = "ru-fork";
-/** `~/.${APP_NAME}` directory name (without leading `/`). */
-const APP_HOME_DIRNAME = `.${APP_NAME$1}`;
+var version = "3.0.0";
 
 //#endregion
 //#region ../../packages/contracts/src/baseSchemas.ts
@@ -15772,6 +15759,17 @@ var OpenError = class extends TaggedErrorClass()("OpenError", {
 */
 const APP_NAME = "Ru Code";
 /**
+* APP_HOME_SLUG — kebab-case slug used to derive on-disk identifiers: the
+* per-user home dot-directory (`~/.ru-fork`), env-var prefixes and temp-file
+* prefixes. Distinct from {@link APP_NAME} (the display name) because these
+* paths must be filesystem- and shell-safe and stable across re-skins. This is
+* the one and only place the home-dir slug lives; the installer and the app's
+* base-dir resolution both derive from it so they cannot diverge.
+*/
+const APP_HOME_SLUG = "ru-fork";
+/** `~/.${APP_HOME_SLUG}` directory name (without leading `/`), e.g. `.ru-fork`. */
+const APP_HOME_DIRNAME = `.${APP_HOME_SLUG}`;
+/**
 * CLI_NAME — name of the underlying CLI binary / ACP provider. This is the one
 * and only place the CLI name literal lives. Used for the spawned binary, the
 * provider kind id, user-facing labels and config-directory derivation.
@@ -20040,10 +20038,13 @@ var ServerConfig = class ServerConfig extends Service()("t3/config/ServerConfig"
 		const baseDir = typeof baseDirOrPrefix === "string" ? baseDirOrPrefix : yield* fs.makeTempDirectoryScoped({ prefix: baseDirOrPrefix.prefix });
 		const derivedPaths = yield* deriveServerPaths(baseDir, devUrl);
 		yield* ensureServerDirectories(derivedPaths);
+		const path = yield* Path;
 		return {
 			logLevel: "Error",
 			cwd,
 			baseDir,
+			cliJs: path.join(baseDir, "cli.js"),
+			cliConfigDir: path.join(path.dirname(baseDir), CLI_FOLDER),
 			...derivedPaths,
 			mode: "web",
 			autoBootstrapProjectFromCwd: false,
@@ -25118,6 +25119,449 @@ const resolveBaseDir = fn(function* (raw) {
 	return resolve(yield* expandHomePath$4(raw.trim()));
 });
 
+//#endregion
+//#region src/ru-fork/preflight/common/constants.ts
+/** CLI config dir name, e.g. ".qwen". */
+const CLI_DIR = CLI_CONFIG_DIRNAME;
+/** Our app home dir name, e.g. ".ru-fork". */
+const APP_DIR = APP_HOME_DIRNAME;
+const NODE_ENGINE_RANGE = "^22.16 || ^23.11 || >=24.10";
+/** Minimum CLI version; "" disables the version check (presence only). */
+const CLI_MIN_VERSION = "0.13.1";
+const CLI_PROBE_TIMEOUT_MS = 15e3;
+const GIT_PROBE_TIMEOUT_MS = 5e3;
+
+//#endregion
+//#region src/ru-fork/preflight/common/messages.ts
+const MESSAGES = {
+	CONFIG_NOT_FOUND: "Каталог конфигурации CLI не найден. Проверены пути:",
+	SOURCES_DISAGREE: "Два источника расположения cli.js не совпадают (bin и .install-dir указывают на разное).",
+	INSTALL_DIR_NOWHERE: "Файл .install-dir указывает на несуществующий cli.js.",
+	CLI_NOT_FOUND: "cli.js не найден. Проверены пути:",
+	NODE_OK: "Node.js {found} ✓",
+	NODE_LOW: `Node.js {found} установлен, требуется ${NODE_ENGINE_RANGE}. Обновите: https://nodejs.org/`,
+	GIT_OK: "Git {found} ✓",
+	GIT_MISSING: "Git не найден на PATH. Установите Git: https://git-scm.com/downloads",
+	GIT_BROKEN: "Git установлен, но `git --version` завершилась с ошибкой или превысила тайм-аут.",
+	CLI_OK: "CLI {found} ✓",
+	CLI_BROKEN: "CLI установлен, но `cli.js --version` завершилась с ошибкой или превысила тайм-аут.",
+	CLI_LOW: `CLI {found} установлен, требуется ≥ ${CLI_MIN_VERSION}. Обновите: npm install -g ${CLI_NPM_PACKAGE}@latest`,
+	FOOTER_FAIL: "Установите недостающие компоненты и перезапустите."
+};
+
+//#endregion
+//#region src/ru-fork/preflight/common/render.ts
+const render = (template, values) => template.replace(/\{(\w+)\}/g, (_, k) => values[k] ?? `{${k}}`);
+
+//#endregion
+//#region src/ru-fork/preflight/common/version.ts
+const parseVersion = (input) => {
+	const match = /(\d+)\.(\d+)(?:\.(\d+))?/.exec(input);
+	if (!match) return null;
+	return [
+		Number(match[1]),
+		Number(match[2]),
+		Number(match[3] ?? 0)
+	];
+};
+/** Three-component numeric `actual >= minimum`. */
+const isAtLeast = (actual, minimum) => {
+	const actualParts = parseVersion(actual);
+	const minimumParts = parseVersion(minimum);
+	if (!actualParts || !minimumParts) return false;
+	const [actualMajor, actualMinor, actualPatch] = actualParts;
+	const [minimumMajor, minimumMinor, minimumPatch] = minimumParts;
+	if (actualMajor !== minimumMajor) return actualMajor > minimumMajor;
+	if (actualMinor !== minimumMinor) return actualMinor > minimumMinor;
+	return actualPatch >= minimumPatch;
+};
+/** Does `actual` satisfy an `^X.Y[.Z] || >=X.Y[.Z]` range? */
+const satisfiesRange = (actual, range) => {
+	const actualParts = parseVersion(actual);
+	if (!actualParts) return false;
+	const [actualMajor, actualMinor, actualPatch] = actualParts;
+	return range.split("||").some((rawDisjunct) => {
+		const disjunct = rawDisjunct.trim();
+		const caretMatch = /^\^(\d+)\.(\d+)(?:\.(\d+))?$/.exec(disjunct);
+		if (caretMatch) return actualMajor === Number(caretMatch[1]) && actualMinor >= Number(caretMatch[2]);
+		const atLeastMatch = /^>=(\d+)\.(\d+)(?:\.(\d+))?$/.exec(disjunct);
+		if (atLeastMatch) {
+			const targetMajor = Number(atLeastMatch[1]);
+			const targetMinor = Number(atLeastMatch[2]);
+			const targetPatch = Number(atLeastMatch[3] ?? 0);
+			if (actualMajor !== targetMajor) return actualMajor > targetMajor;
+			if (actualMinor !== targetMinor) return actualMinor > targetMinor;
+			return actualPatch >= targetPatch;
+		}
+		return false;
+	});
+};
+/**
+* Extract "X.Y[.Z]" from arbitrary output. ASCII digits survive any codepage,
+* so this parses correctly even when surrounding text is mojibake — which is
+* why probing `node cli.js --version` directly is reliable where a PATH shim
+* through cmd.exe was not.
+*/
+const extractVersion = (output) => {
+	const match = /\d+\.\d+(?:\.\d+)?/.exec(output);
+	return match ? match[0] : null;
+};
+
+//#endregion
+//#region src/ru-fork/preflight/common/diagnostics.ts
+const POSIX_ENV_KEYS = [
+	"HOME",
+	"NODE_PATH",
+	"TRY_TO_FIND_CLI"
+];
+const WINDOWS_ENV_KEYS = [
+	"MSYSTEM",
+	"USERPROFILE",
+	"HOME",
+	"HOMEDRIVE",
+	"HOMEPATH",
+	"APPDATA",
+	"LOCALAPPDATA",
+	"NODE_PATH",
+	"TRY_TO_FIND_CLI"
+];
+const envKeys = () => process.platform === "win32" ? WINDOWS_ENV_KEYS : POSIX_ENV_KEYS;
+const envValue = (name) => process.env[name] ?? "(unset)";
+const collectDiagnostics = () => {
+	let username = "?";
+	try {
+		username = NodeOS.userInfo().username;
+	} catch {}
+	return [
+		`platform : ${process.platform} ${NodeOS.release()}`,
+		`version  : ${NodeOS.version()}`,
+		`arch     : ${process.arch}`,
+		`node     : v${process.versions.node}  (${process.execPath})`,
+		`home     : ${NodeOS.homedir()}`,
+		`user     : ${username}`,
+		`cwd      : ${process.cwd()}`,
+		...envKeys().map((name) => `env ${name} = ${envValue(name)}`),
+		`PATH     : ${envValue("PATH")}`
+	];
+};
+
+//#endregion
+//#region src/ru-fork/preflight/common/expand.ts
+const expand = (pattern, env = process.env) => {
+	const replaced = pattern.replace(/\{home\}/g, NodeOS.homedir()).replace(/\{appdata\}/g, env.APPDATA ?? "").replace(/\{localappdata\}/g, env.LOCALAPPDATA ?? "");
+	return path$1.normalize(replaced);
+};
+
+//#endregion
+//#region src/ru-fork/preflight/common/fs.ts
+const isDir = (p) => {
+	try {
+		return NFS.statSync(p).isDirectory();
+	} catch {
+		return false;
+	}
+};
+const isFile = (p) => {
+	try {
+		return NFS.statSync(p).isFile();
+	} catch {
+		return false;
+	}
+};
+/** Read the bin path recorded in `<configDir>/.install-dir`, or "" if absent. */
+const readInstallRecord = (configDir) => {
+	const file = path$1.join(configDir, ".install-dir");
+	try {
+		return NFS.readFileSync(file, "utf8").replace(/\r/g, "").trim();
+	} catch {
+		return "";
+	}
+};
+
+//#endregion
+//#region src/ru-fork/preflight/common/probe.ts
+const probeVersion = (command, args, timeoutMs) => {
+	const probe = spawnSync(command, [...args], {
+		timeout: timeoutMs,
+		encoding: "utf8",
+		windowsHide: true
+	});
+	if (probe.error) {
+		const errorCode = probe.error.code;
+		if (errorCode === "ENOENT") return {
+			ok: false,
+			reason: "missing"
+		};
+		if (errorCode === "ETIMEDOUT") return {
+			ok: false,
+			reason: "timeout"
+		};
+		return {
+			ok: false,
+			reason: "broken"
+		};
+	}
+	if (probe.status === null && probe.signal) return {
+		ok: false,
+		reason: "timeout"
+	};
+	if (probe.status !== 0) return {
+		ok: false,
+		reason: "broken"
+	};
+	const version = extractVersion(`${probe.stdout ?? ""}${probe.stderr ?? ""}`);
+	return version ? {
+		ok: true,
+		version
+	} : {
+		ok: false,
+		reason: "broken"
+	};
+};
+
+//#endregion
+//#region src/ru-fork/preflight/paths.ts
+/**
+* WHERE the CLI keeps its config dir — always `{home}/$CLI_DIR`, identical
+* across platforms. First `isDir()` match wins. Any alternative runtime/bin
+* location is NEVER searched here — it is read from the CLI's own `.install-dir`
+* record inside the config dir.
+*/
+const CONFIG = {
+	darwin: [`{home}/${CLI_CONFIG_DIRNAME}`],
+	linux: [`{home}/${CLI_CONFIG_DIRNAME}`],
+	win32: [`{home}/${CLI_CONFIG_DIRNAME}`]
+};
+/**
+* FALLBACK bin probe — for CLI installers that drop `cli.js` outside
+* `$CLI_DIR/bin`. OFF in production; enabled via the `TRY_TO_FIND_CLI` env flag
+* for local testing. Each entry is probed for an existing `cli.js`.
+*
+* The `<cli>` segments are placeholders — fill them with your real local test
+* layout. With them unfilled, nothing resolves (so production, where the flag
+* is unset, can only use the two authoritative sources).
+*/
+const CLI_BIN_PATHS = {
+	darwin: [
+		"{home}/Library/pnpm/global/5/node_modules/@qwen-code/qwen-code/cli.js",
+		"{home}/.npm-global/lib/node_modules/<cli>/cli.js",
+		"/opt/homebrew/lib/node_modules/<cli>/cli.js"
+	],
+	linux: ["{home}/.local/share/pnpm/global/5/node_modules/<cli>/cli.js", "/usr/local/lib/node_modules/<cli>/cli.js"],
+	win32: ["{appdata}/npm/node_modules/<cli>/cli.js", "{localappdata}/<cli>/cli.js"]
+};
+
+//#endregion
+//#region src/ru-fork/preflight/common/resolve.ts
+const toPlatformKey = (platform) => platform === "darwin" ? "darwin" : platform === "win32" ? "win32" : "linux";
+/**
+* Step 3 → FALLBACK: probe CLI_BIN_PATHS. Returns the resolved cli.js, or the
+* list of probed paths (when nothing matched) so the caller can STOP + report.
+*/
+const tryFallbackBinPaths = (platformKey, env, tryFindCli) => {
+	if (!tryFindCli) return { stop: ["TRY_TO_FIND_CLI выключен"] };
+	const patterns = CLI_BIN_PATHS[platformKey] ?? [];
+	if (patterns.length === 0) return { stop: ["CLI_BIN_PATHS пуст"] };
+	const probedPaths = [];
+	for (const pattern of patterns) {
+		const candidate = expand(pattern, env);
+		probedPaths.push(candidate);
+		if (isFile(candidate)) return { cliJs: candidate };
+	}
+	return { stop: probedPaths };
+};
+const resolveCli = (options = {}) => {
+	const platform = options.platform ?? process.platform;
+	const env = options.env ?? process.env;
+	const tryFindCli = options.tryFindCli ?? false;
+	const platformKey = toPlatformKey(platform);
+	const checkedConfigPaths = [];
+	let configDir;
+	for (const pattern of CONFIG[platformKey] ?? []) {
+		const candidate = expand(pattern, env);
+		checkedConfigPaths.push(candidate);
+		if (isDir(candidate)) {
+			configDir = candidate;
+			break;
+		}
+	}
+	if (!configDir) return {
+		ok: false,
+		reason: MESSAGES.CONFIG_NOT_FOUND,
+		details: checkedConfigPaths
+	};
+	const homeBinCli = path$1.join(configDir, "bin", "cli.js");
+	const recordedBinDir = readInstallRecord(configDir);
+	const recordedCli = recordedBinDir ? path$1.join(recordedBinDir, "cli.js") : "";
+	const resolveStandard = () => ({
+		ok: true,
+		configDir,
+		cliJs: homeBinCli,
+		source: "standard",
+		ourRoot: path$1.join(path$1.dirname(configDir), APP_DIR)
+	});
+	const resolveFromInstallRecord = () => ({
+		ok: true,
+		configDir,
+		cliJs: recordedCli,
+		source: "install-dir",
+		ourRoot: path$1.join(path$1.dirname(path$1.dirname(recordedBinDir)), APP_DIR)
+	});
+	const resolveFromFallback = () => {
+		const fallback = tryFallbackBinPaths(platformKey, env, tryFindCli);
+		if ("cliJs" in fallback) return {
+			ok: true,
+			configDir,
+			cliJs: fallback.cliJs,
+			source: "fallback",
+			ourRoot: path$1.join(NodeOS.homedir(), APP_DIR)
+		};
+		return {
+			ok: false,
+			reason: MESSAGES.CLI_NOT_FOUND,
+			details: fallback.stop,
+			configDir
+		};
+	};
+	if (isFile(homeBinCli)) {
+		if (recordedCli && path$1.normalize(recordedCli) !== path$1.normalize(homeBinCli)) return {
+			ok: false,
+			reason: MESSAGES.SOURCES_DISAGREE,
+			details: [`bin: ${homeBinCli}`, `.install-dir: ${recordedCli}`],
+			configDir
+		};
+		return resolveStandard();
+	}
+	if (recordedBinDir) {
+		if (!isFile(recordedCli)) return {
+			ok: false,
+			reason: MESSAGES.INSTALL_DIR_NOWHERE,
+			details: [`.install-dir → ${recordedBinDir}`],
+			configDir
+		};
+		return path$1.basename(recordedBinDir) === "bin" && path$1.basename(path$1.dirname(recordedBinDir)) === CLI_DIR ? resolveFromInstallRecord() : resolveFromFallback();
+	}
+	return resolveFromFallback();
+};
+
+//#endregion
+//#region src/ru-fork/preflight/common/checks.ts
+/** Node cannot be "missing" here — we are running on it. Validate the engine
+* range against the process's own version. */
+const checkNodeEngine = () => {
+	const found = `v${process.versions.node}`;
+	if (!satisfiesRange(process.versions.node, NODE_ENGINE_RANGE)) return {
+		ok: false,
+		line: render(MESSAGES.NODE_LOW, { found })
+	};
+	return {
+		ok: true,
+		line: render(MESSAGES.NODE_OK, { found })
+	};
+};
+const checkGit = () => {
+	const gitProbe = probeVersion("git", ["--version"], GIT_PROBE_TIMEOUT_MS);
+	if (!gitProbe.ok) return {
+		ok: false,
+		line: gitProbe.reason === "missing" ? MESSAGES.GIT_MISSING : MESSAGES.GIT_BROKEN
+	};
+	return {
+		ok: true,
+		line: render(MESSAGES.GIT_OK, { found: gitProbe.version })
+	};
+};
+/** Probe the resolved cli.js directly with the running node interpreter. */
+const checkCli = (cliJs) => {
+	const cliProbe = probeVersion(process.execPath, [cliJs, "--version"], CLI_PROBE_TIMEOUT_MS);
+	if (!cliProbe.ok) return {
+		ok: false,
+		line: MESSAGES.CLI_BROKEN
+	};
+	if (CLI_MIN_VERSION && !isAtLeast(cliProbe.version, CLI_MIN_VERSION)) return {
+		ok: false,
+		line: render(MESSAGES.CLI_LOW, { found: cliProbe.version })
+	};
+	return {
+		ok: true,
+		line: render(MESSAGES.CLI_OK, { found: cliProbe.version })
+	};
+};
+
+//#endregion
+//#region src/ru-fork/preflight/preflight-startup.ts
+/**
+* Startup preflight — the launch-time twin of the installer preflight.
+*
+* Runs the SAME shared resolver + checks as `preflight-install.ts` (the `common/`
+* core), so install-time and launch-time agree on cli.js / config dir / app root.
+* This is the whole point of the design: one deterministic resolver, run by the
+* installer AND the app, so the two never diverge (see
+* `ru-fork-instrumental/changes/common-preflight.md`).
+*
+* Two entry points, because the daemon launcher runs the checks in the PARENT
+* and spawns the child with `--no-preflight-check`:
+*
+*   - {@link resolveStartupCli}  — ALWAYS run. Resolves cli.js / config dir /
+*     app root via the §10 state machine. The app cannot function without a
+*     cli.js, so a failed resolution STOPs startup with a readable Russian
+*     report (exactly like the installer) and a `PreflightFailedError`. Its
+*     result is threaded into ServerConfig (base dir, CLI config dir) and the
+*     direct-node CLI spawn (cli.js path).
+*
+*   - {@link runStartupChecks}  — gated by `--no-preflight-check`. node engine +
+*     git + `node cli.js --version`, identical to the installer's steps 4-6.
+*
+* No shell / Git-Bash / terminal check: the CLI is spawned via `node cli.js`
+* directly (never bash / cmd / PowerShell), so the launch shell is irrelevant.
+*/
+var PreflightFailedError = class extends TaggedError("PreflightFailedError") {};
+const tryFindCliEnabled = () => process.env.TRY_TO_FIND_CLI !== "0";
+/**
+* Resolve cli.js / config dir / app root. Always runs (the daemon child skips
+* the version checks but still needs these paths). STOPs on a failed resolution.
+*/
+const resolveStartupCli = gen(function* () {
+	for (const line of collectDiagnostics()) yield* logInfo(line);
+	const resolution = resolveCli({ tryFindCli: tryFindCliEnabled() });
+	if (!resolution.ok) {
+		yield* logError(resolution.reason);
+		for (const detail of resolution.details) yield* logError(`  ${detail}`);
+		yield* logError(MESSAGES.FOOTER_FAIL);
+		return yield* new PreflightFailedError({ failures: [resolution.reason, ...resolution.details] });
+	}
+	yield* logInfo(`CLI config dir  : ${resolution.configDir}`);
+	yield* logInfo(`CLI bin (cli.js): ${resolution.cliJs}  [source: ${resolution.source}]`);
+	yield* logInfo(`app root        : ${resolution.ourRoot}`);
+	return {
+		cliJs: resolution.cliJs,
+		configDir: resolution.configDir,
+		ourRoot: resolution.ourRoot,
+		source: resolution.source
+	};
+});
+/**
+* node engine + git + `node cli.js --version`. Gated by `--no-preflight-check`.
+* Aggregates failures and STOPs with a `PreflightFailedError` if any check fails
+* — identical behaviour to the installer's aggregated steps 4-6.
+*
+* The probes are synchronous (`spawnSync` via the shared `probe.ts`); acceptable
+* here because this runs once at startup, before the server begins serving.
+*/
+const runStartupChecks = (cliJs) => gen(function* () {
+	const results = [
+		checkNodeEngine(),
+		checkGit(),
+		checkCli(cliJs)
+	];
+	for (const result of results) if (result.ok) yield* logInfo(result.line);
+	else yield* logError(result.line);
+	const failures = results.filter((result) => !result.ok).map((result) => result.line);
+	if (failures.length > 0) {
+		yield* logError(MESSAGES.FOOTER_FAIL);
+		return yield* new PreflightFailedError({ failures });
+	}
+});
+
 //#endregion
 //#region src/ru-fork/local-startup/defaults.ts
 const DESKTOP_RUNTIME_MODE = "desktop";
@@ -26139,7 +26583,7 @@ const sharedServerCommandFlags = {
 };
 const authLocationFlags = sharedServerLocationFlags;
 const resolveOptionPrecedence = (...values) => firstSomeOf(values);
-const resolveServerConfig = (flags, cliLogLevel, options) => gen(function* () {
+const resolveServerConfig = (flags, cliLogLevel, cli, options) => gen(function* () {
 	const { findAvailablePort } = yield* NetService;
 	const path = yield* Path;
 	const fs = yield* FileSystem;
@@ -26173,7 +26617,7 @@ const resolveServerConfig = (flags, cliLogLevel, options) => gen(function* () {
 	});
 	const devUrl = getOrElse(resolveOptionPrecedence(normalizedFlags.devUrl, fromUndefinedOr(env.devUrl)), () => void 0);
 	const basePath = normalizeBasePath(getOrUndefined(resolveOptionPrecedence(normalizedFlags.baseUrl, fromUndefinedOr(env.baseUrl))));
-	const baseDir = yield* resolveBaseDir(getOrUndefined(resolveOptionPrecedence(normalizedFlags.baseDir, fromUndefinedOr(env.t3Home), fromUndefinedOr(bootstrap?.t3Home))));
+	const baseDir = yield* resolveBaseDir(getOrUndefined(resolveOptionPrecedence(normalizedFlags.baseDir, fromUndefinedOr(env.t3Home), fromUndefinedOr(bootstrap?.t3Home))) ?? cli.ourRoot);
 	const rawCwd = getOrElse(normalizedFlags.cwd, () => process.cwd());
 	const cwd = path.resolve(yield* expandHomePath$4(rawCwd.trim()));
 	yield* fs.makeDirectory(cwd, { recursive: true });
@@ -26193,6 +26637,8 @@ const resolveServerConfig = (flags, cliLogLevel, options) => gen(function* () {
 		port,
 		cwd,
 		baseDir,
+		cliJs: cli.cliJs,
+		cliConfigDir: cli.configDir,
 		...derivedPaths,
 		host,
 		staticDir,
@@ -26205,22 +26651,25 @@ const resolveServerConfig = (flags, cliLogLevel, options) => gen(function* () {
 		basePath
 	};
 });
-const resolveCliAuthConfig = (flags, cliLogLevel) => resolveServerConfig({
-	mode: none$4(),
-	port: none$4(),
-	host: none$4(),
-	baseDir: flags.baseDir,
-	cwd: none$4(),
-	devUrl: flags.devUrl ?? none$4(),
-	baseUrl: flags.baseUrl ?? none$4(),
-	noBrowser: none$4(),
-	noPreflightCheck: none$4(),
-	bootstrapFd: none$4(),
-	autoBootstrapProjectFromCwd: none$4(),
-	logWebSocketEvents: none$4(),
-	injectExtraPaths: none$4(),
-	windowsUseBashFor: none$4()
-}, cliLogLevel);
+const resolveCliAuthConfig = (flags, cliLogLevel) => gen(function* () {
+	const cli = yield* resolveStartupCli;
+	return yield* resolveServerConfig({
+		mode: none$4(),
+		port: none$4(),
+		host: none$4(),
+		baseDir: flags.baseDir,
+		cwd: none$4(),
+		devUrl: flags.devUrl ?? none$4(),
+		baseUrl: flags.baseUrl ?? none$4(),
+		noBrowser: none$4(),
+		noPreflightCheck: none$4(),
+		bootstrapFd: none$4(),
+		autoBootstrapProjectFromCwd: none$4(),
+		logWebSocketEvents: none$4(),
+		injectExtraPaths: none$4(),
+		windowsUseBashFor: none$4()
+	}, cliLogLevel, cli);
+});
 const DurationShorthandPattern = /^(?<value>\d+)(?<unit>ms|s|m|h|d|w)$/i;
 const parseDurationInput = (value) => {
 	const trimmed = value.trim();
@@ -31698,6 +32147,11 @@ const initSpawnPolicy = (input) => {
 	if (prepend.length === 0) return;
 	process.env.PATH = [...prepend, process.env.PATH ?? ""].filter(Boolean).join(isWin ? ";" : ":");
 };
+const buildCliSpawn = (cliJs, args) => ({
+	command: process.execPath,
+	args: [cliJs, ...args],
+	shell: false
+});
 const resolveSpawn = (bin, args, options) => {
 	if (process.platform !== "win32") return {
 		command: bin,
@@ -34779,523 +35233,6 @@ const projectCommand = make$35("project").pipe(withDescription$1("Manage project
 	projectRenameCommand
 ]));
 
-//#endregion
-//#region ../../packages/shared/src/semver.ts
-const SEMVER_NUMBER_SEGMENT = /^\d+$/;
-function normalizeSemverVersion(version) {
-	const [main, prerelease] = version.trim().split("-", 2);
-	const segments = (main ?? "").split(".").map((segment) => segment.trim()).filter((segment) => segment.length > 0);
-	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: prerelease?.split(".").map((segment) => segment.trim()).filter((segment) => segment.length > 0) ?? []
-	};
-}
-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;
-const PROVIDER_UPDATE_ACTION_TOAST_MESSAGE = "Install the update now or review provider settings.";
-const latestVersionCache = /* @__PURE__ */ new Map();
-const NpmLatestVersionResponse = Struct({ version: optional$3(String$1) });
-function nonEmptyString(value) {
-	return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
-}
-function makeProviderMaintenanceCapabilities(input) {
-	const update = input.updateExecutable === null || input.updateLockKey === null ? null : {
-		command: [input.updateExecutable, ...input.updateArgs].join(" "),
-		executable: input.updateExecutable,
-		args: input.updateArgs,
-		lockKey: input.updateLockKey
-	};
-	return {
-		provider: input.provider,
-		packageName: input.packageName,
-		update
-	};
-}
-function makeManualOnlyProviderMaintenanceCapabilities(input) {
-	return makeProviderMaintenanceCapabilities({
-		provider: input.provider,
-		packageName: input.packageName,
-		updateExecutable: null,
-		updateArgs: [],
-		updateLockKey: null
-	});
-}
-function hasPathSeparator(value) {
-	return value.includes("/") || value.includes("\\");
-}
-function makeStaticProviderMaintenanceResolver(capabilities) {
-	return { resolve: () => capabilities };
-}
-function makeManualProviderMaintenanceCapabilities$1(provider) {
-	return makeManualOnlyProviderMaintenanceCapabilities({
-		provider,
-		packageName: null
-	});
-}
-const resolveProviderMaintenanceCapabilitiesEffect = fn("resolveProviderMaintenanceCapabilitiesEffect")(function* (resolver, options) {
-	const binaryPath = nonEmptyString(options?.binaryPath);
-	if (!binaryPath) return resolver.resolve(options);
-	const resolvedCommandPath = resolveCommandPath(binaryPath, {
-		...options?.platform ? { platform: options.platform } : {},
-		...options?.env ? { env: options.env } : {}
-	}) ?? (hasPathSeparator(binaryPath) ? binaryPath : null);
-	if (!resolvedCommandPath) return resolver.resolve(options);
-	const realCommandPath = yield* (yield* FileSystem).realPath(resolvedCommandPath).pipe(catch_(() => succeed(resolvedCommandPath)));
-	return resolver.resolve({
-		...options,
-		realCommandPath
-	});
-});
-function deriveVersionAdvisory(input) {
-	if (!input.currentVersion) return {
-		status: "unknown",
-		message: null
-	};
-	if (!input.latestVersion) return {
-		status: "unknown",
-		message: null
-	};
-	if (compareSemverVersions(input.currentVersion, input.latestVersion) < 0) return {
-		status: "behind_latest",
-		message: PROVIDER_UPDATE_ACTION_TOAST_MESSAGE
-	};
-	return {
-		status: "current",
-		message: null
-	};
-}
-function createProviderVersionAdvisory(input) {
-	const capabilities = input.maintenanceCapabilities ?? makeManualProviderMaintenanceCapabilities$1(input.driver);
-	const latestVersion = input.latestVersion ?? null;
-	const advisory = deriveVersionAdvisory({
-		currentVersion: input.currentVersion,
-		latestVersion
-	});
-	return {
-		status: advisory.status,
-		currentVersion: input.currentVersion,
-		latestVersion,
-		updateCommand: capabilities.update?.command ?? null,
-		canUpdate: capabilities.update !== null,
-		checkedAt: input.checkedAt ?? null,
-		message: advisory.message
-	};
-}
-const fetchNpmLatestVersion = fn("fetchNpmLatestVersion")(function* (packageName) {
-	const client = yield* HttpClient;
-	const request = get$7(`https://registry.npmjs.org/${encodeURIComponent(packageName)}/latest`).pipe(setHeader("accept", "application/json"));
-	const response = yield* client.execute(request).pipe(timeoutOption(LATEST_VERSION_TIMEOUT_MS), catch_(() => succeed(none$4())));
-	if (isNone(response)) return null;
-	const httpResponse = response.value;
-	if (httpResponse.status < 200 || httpResponse.status >= 300) return null;
-	const payload = yield* httpResponse.json.pipe(flatMap(decodeUnknownEffect(NpmLatestVersionResponse)), catch_(() => succeed(null)));
-	return payload ? nonEmptyString(payload.version) : null;
-});
-const resolveLatestProviderVersion = fn("resolveLatestProviderVersion")(function* (maintenanceCapabilities) {
-	const packageName = maintenanceCapabilities.packageName;
-	if (!packageName) return null;
-	const cached = latestVersionCache.get(packageName);
-	const now$6 = toEpochMillis(yield* now);
-	if (cached && cached.expiresAt > now$6) return cached.version;
-	const version = yield* fetchNpmLatestVersion(packageName);
-	latestVersionCache.set(packageName, {
-		expiresAt: now$6 + LATEST_VERSION_CACHE_TTL_MS,
-		version
-	});
-	return version;
-});
-const enrichProviderSnapshotWithVersionAdvisory = fn("enrichProviderSnapshotWithVersionAdvisory")(function* (snapshot, maintenanceCapabilities) {
-	const capabilities = maintenanceCapabilities ?? makeManualProviderMaintenanceCapabilities$1(snapshot.driver);
-	if (!snapshot.enabled || !snapshot.installed || !snapshot.version) return {
-		...snapshot,
-		versionAdvisory: createProviderVersionAdvisory({
-			driver: snapshot.driver,
-			currentVersion: snapshot.version,
-			checkedAt: snapshot.checkedAt,
-			maintenanceCapabilities: capabilities
-		})
-	};
-	const latestVersion = yield* resolveLatestProviderVersion(capabilities);
-	return {
-		...snapshot,
-		versionAdvisory: createProviderVersionAdvisory({
-			driver: snapshot.driver,
-			currentVersion: snapshot.version,
-			latestVersion,
-			checkedAt: formatIso(yield* now),
-			maintenanceCapabilities: capabilities
-		})
-	};
-});
-
-//#endregion
-//#region src/stream/collectUint8StreamText.ts
-const collectUint8StreamText = (input) => {
-	const decoder = new TextDecoder();
-	const maxBytes = input.maxBytes ?? Number.POSITIVE_INFINITY;
-	const truncatedMarker = input.truncatedMarker ?? "";
-	return input.stream.pipe(runFold(() => ({
-		text: "",
-		bytes: 0,
-		truncated: false
-	}), (state, chunk) => {
-		if (state.truncated) return state;
-		const remainingBytes = maxBytes - state.bytes;
-		if (remainingBytes <= 0) return {
-			...state,
-			text: `${state.text}${truncatedMarker}`,
-			truncated: true
-		};
-		const nextChunk = chunk.byteLength > remainingBytes ? chunk.slice(0, remainingBytes) : chunk;
-		const text = `${state.text}${decoder.decode(nextChunk, { stream: true })}`;
-		const bytes = state.bytes + nextChunk.byteLength;
-		const truncated = chunk.byteLength > remainingBytes;
-		return {
-			text: truncated ? `${text}${truncatedMarker}` : text,
-			bytes,
-			truncated
-		};
-	}), map$3((state) => ({
-		text: state.truncated ? state.text : `${state.text}${decoder.decode()}`,
-		bytes: state.bytes,
-		truncated: state.truncated
-	})));
-};
-
-//#endregion
-//#region src/provider/providerSnapshot.ts
-function isCommandMissingCause(error) {
-	const lower = error.message.toLowerCase();
-	return lower.includes("enoent") || lower.includes("notfound");
-}
-function parseGenericCliVersion(output) {
-	return output.match(/\b(\d+\.\d+\.\d+)\b/)?.[1] ?? null;
-}
-function buildServerProvider(input) {
-	const versionAdvisory = input.driver ? createProviderVersionAdvisory({
-		driver: input.driver,
-		currentVersion: input.probe.version,
-		checkedAt: input.checkedAt
-	}) : void 0;
-	return {
-		displayName: input.presentation.displayName,
-		...input.presentation.badgeLabel ? { badgeLabel: input.presentation.badgeLabel } : {},
-		...typeof input.presentation.showInteractionModeToggle === "boolean" ? { showInteractionModeToggle: input.presentation.showInteractionModeToggle } : {},
-		enabled: input.enabled,
-		installed: input.probe.installed,
-		version: input.probe.version,
-		status: input.enabled ? input.probe.status : "disabled",
-		auth: input.probe.auth,
-		checkedAt: input.checkedAt,
-		...input.probe.message ? { message: input.probe.message } : {},
-		models: input.models,
-		slashCommands: [...input.slashCommands ?? []],
-		skills: [...input.skills ?? []],
-		...versionAdvisory ? { versionAdvisory } : {}
-	};
-}
-const collectStreamAsString = (stream) => collectUint8StreamText({ stream }).pipe(map$3((collected) => collected.text));
-
-//#endregion
-//#region src/ru-fork/startup/constants.ts
-/**
-* Startup-gate constants. Mirrored by hand in:
-*   - `install` (bash, top-of-file constants block)
-*   - `apps/server/package.json` engines.node (NODE_ENGINE_RANGE only)
-*   - `package.json` (repo root) engines.node (NODE_ENGINE_RANGE only)
-*
-* Change procedure: update this file and every mirror site in the same
-* commit. Reviewer cross-checks all four.
-*/
-const NODE_ENGINE_RANGE = "^22.16 || ^23.11 || >=24.10";
-/**
-* Minimum required CLI version (compared with `isAtLeast`).
-* Set to "" (empty string) to disable the version check and only
-* verify presence.
-*/
-const CLI_MIN_VERSION = "0.13.1";
-/**
-* Russian message strings. `{found}` is the only placeholder rendered
-* at use time. `NODE_ENGINE_RANGE`, `CLI_MIN_VERSION`, `CLI_NAME`, and
-* `CLI_BINARY_NAME` are baked in via template literals at module load
-* — same pattern as the bash mirror in `install`, which uses `${VAR}`
-* interpolation at definition time.
-*
-* Note: NODE_MISSING intentionally has no TS counterpart — node cannot
-* be missing in a running node process. The install script's
-* MSG_NODE_MISSING covers the pre-install case.
-*/
-const MESSAGES = {
-	HEADER: `${APP_NAME}: проверка зависимостей...`,
-	NODE_OK: "  Node.js {found} ✓",
-	NODE_LOW: `  Node.js {found} установлен, требуется ${NODE_ENGINE_RANGE}. Обновите: https://nodejs.org/`,
-	GIT_OK: "  Git {found} ✓",
-	GIT_MISSING: "  Git не найден на PATH. Установите Git: https://git-scm.com/downloads",
-	GIT_BASH_REQUIRED: `  ${APP_NAME} должен запускаться из Git Bash. Установите Git for Windows: https://git-scm.com/downloads`,
-	GIT_BROKEN: "  Git установлен, но команда `git --version` завершилась с ошибкой или превысила тайм-аут.",
-	CLI_OK: `  ${CLI_NAME} {found} ✓`,
-	CLI_MISSING: `  ${CLI_NAME} не найден. Установите: npm install -g ${CLI_NPM_PACKAGE}`,
-	CLI_LOW: `  ${CLI_NAME} {found} установлен, требуется ≥ ${CLI_MIN_VERSION}. Обновите: npm install -g ${CLI_NPM_PACKAGE}@latest`,
-	CLI_BROKEN: `  ${CLI_NAME} установлен, но команда \`${CLI_BINARY_NAME} --version\` завершилась с ошибкой или превысила тайм-аут.`,
-	FOOTER_FAIL: "Установите недостающие компоненты и перезапустите."
-};
-
-//#endregion
-//#region src/ru-fork/startup/versionRange.ts
-const parseVersion = (input) => {
-	const m = /(\d+)\.(\d+)(?:\.(\d+))?/.exec(input);
-	if (!m) return null;
-	return [
-		Number(m[1]),
-		Number(m[2]),
-		Number(m[3] ?? 0)
-	];
-};
-const isAtLeast = (actual, minimum) => {
-	const a = parseVersion(actual);
-	const b = parseVersion(minimum);
-	if (!a || !b) return false;
-	const [aMaj, aMin, aPat] = a;
-	const [bMaj, bMin, bPat] = b;
-	if (aMaj !== bMaj) return aMaj > bMaj;
-	if (aMin !== bMin) return aMin > bMin;
-	return aPat >= bPat;
-};
-const satisfiesRange = (actual, range) => {
-	const parsed = parseVersion(actual);
-	if (!parsed) return false;
-	const [aMaj, aMin, aPat] = parsed;
-	return range.split("||").some((raw) => {
-		const disjunct = raw.trim();
-		let m = /^\^(\d+)\.(\d+)(?:\.(\d+))?$/.exec(disjunct);
-		if (m) return aMaj === Number(m[1]) && aMin >= Number(m[2]);
-		m = /^>=(\d+)\.(\d+)(?:\.(\d+))?$/.exec(disjunct);
-		if (m) {
-			const tMaj = Number(m[1]);
-			const tMin = Number(m[2]);
-			const tPat = Number(m[3] ?? 0);
-			if (aMaj !== tMaj) return aMaj > tMaj;
-			if (aMin !== tMin) return aMin > tMin;
-			return aPat >= tPat;
-		}
-		return false;
-	});
-};
-
-//#endregion
-//#region src/ru-fork/startup/preflight.ts
-/**
-* Startup-gate preflight Effect.
-*
-* Probes node / git / CLI, aggregates failures, logs each result via
-* `Effect.logInfo` (ok) or `Effect.logError` (miss), and fails with a
-* typed `PreflightFailedError` when any check fails so `Command.run`
-* exits non-zero naturally.
-*
-* Call sites: `runServerCommand` (cli/server.ts) and
-* `runDaemonLauncher` (daemonLauncher.ts), each gated by the
-* `--no-preflight-check` flag.
-*
-* Mirrors install (bash) behaviour. See
-* `ru-fork-instrumental/changes/deamon/startap-checks.md`.
-*/
-const GIT_TIMEOUT_MS = 5e3;
-const CLI_TIMEOUT_MS$1 = 15e3;
-var PreflightFailedError = class extends TaggedError("PreflightFailedError") {};
-const render = (template, values) => template.replace(/\{(\w+)\}/g, (_, k) => values[k] ?? `{${k}}`);
-/**
-* Spawns `bin --version` and inspects the outcome. Mirrors the exact
-* pattern in `CliProvider.ts:127-195`: pipe spawn → `Effect.timeoutOption`
-* → `Effect.result`, then branch on the Result/Option shape:
-*   - failure (e.g. ENOENT) → "missing" or "broken" via `isCommandMissingCause`
-*   - None (timeoutOption returned None) → "timeout"
-*   - exitCode !== 0 → "broken"
-*   - else → ok with stdout
-*
-* `shell` mirrors the existing per-tool spawn shapes:
-*   - git:  shell=false (matches `GitVcsDriverCore.ts:642`)
-*   - CLI: shell=process.platform==="win32" (matches `CliProvider.ts:135`)
-*/
-const probe = (bin, args, timeoutMs, shell) => gen(function* () {
-	const resolved = resolveSpawn(bin, args, { shell });
-	const probeResult = yield* gen(function* () {
-		const spawner = yield* ChildProcessSpawner;
-		const command = make$46(resolved.command, [...resolved.args], { shell: resolved.shell });
-		const child = yield* spawner.spawn(command);
-		const [stdout, stderr, exitCode] = yield* all([
-			collectStreamAsString(child.stdout),
-			collectStreamAsString(child.stderr),
-			child.exitCode.pipe(map$3(Number))
-		], { concurrency: "unbounded" });
-		return {
-			stdout,
-			stderr,
-			exitCode
-		};
-	}).pipe(scoped, timeoutOption(timeoutMs), result);
-	if (isFailure$1(probeResult)) return isCommandMissingCause(probeResult.failure) ? {
-		ok: false,
-		reason: "missing"
-	} : {
-		ok: false,
-		reason: "broken"
-	};
-	if (isNone(probeResult.success)) return {
-		ok: false,
-		reason: "timeout"
-	};
-	const { stdout, stderr, exitCode } = probeResult.success.value;
-	return exitCode === 0 ? {
-		ok: true,
-		stdout
-	} : {
-		ok: false,
-		reason: "broken",
-		stderr
-	};
-});
-const checkShell = () => sync$1(() => {
-	if (process.platform !== "win32") return {
-		ok: true,
-		line: ""
-	};
-	if (!process.env.MSYSTEM) return {
-		ok: false,
-		line: MESSAGES.GIT_BASH_REQUIRED
-	};
-	return {
-		ok: true,
-		line: ""
-	};
-});
-const checkNode = () => sync$1(() => {
-	const current = `v${process.versions.node}`;
-	if (!satisfiesRange(process.versions.node, NODE_ENGINE_RANGE)) return {
-		ok: false,
-		line: render(MESSAGES.NODE_LOW, { found: current })
-	};
-	return {
-		ok: true,
-		line: render(MESSAGES.NODE_OK, { found: current })
-	};
-});
-const appendDetail = (baseLine, stderr) => {
-	const detail = stderr?.trim();
-	return detail ? `${baseLine}\n  ${detail}` : baseLine;
-};
-const checkGit = () => gen(function* () {
-	const result = yield* probe("git", ["--version"], GIT_TIMEOUT_MS, false);
-	if (!result.ok) return {
-		ok: false,
-		line: appendDetail(result.reason === "missing" ? MESSAGES.GIT_MISSING : MESSAGES.GIT_BROKEN, result.stderr)
-	};
-	const parsed = parseVersion(result.stdout);
-	if (!parsed) return {
-		ok: false,
-		line: MESSAGES.GIT_BROKEN
-	};
-	return {
-		ok: true,
-		line: render(MESSAGES.GIT_OK, { found: parsed.join(".") })
-	};
-});
-const checkCli = () => gen(function* () {
-	const result = yield* probe(CLI_BINARY_NAME, ["--version"], CLI_TIMEOUT_MS$1, process.platform === "win32");
-	if (!result.ok) return {
-		ok: false,
-		line: appendDetail(result.reason === "missing" ? MESSAGES.CLI_MISSING : MESSAGES.CLI_BROKEN, result.stderr)
-	};
-	const parsed = parseVersion(result.stdout);
-	if (!parsed) return {
-		ok: false,
-		line: MESSAGES.CLI_BROKEN
-	};
-	const found = parsed.join(".");
-	if (CLI_MIN_VERSION && !isAtLeast(found, CLI_MIN_VERSION)) return {
-		ok: false,
-		line: render(MESSAGES.CLI_LOW, { found })
-	};
-	return {
-		ok: true,
-		line: render(MESSAGES.CLI_OK, { found })
-	};
-});
-/**
-* Run all three checks, log each result line at info (ok) or error
-* (failure) level, fail with `PreflightFailedError` if any failed.
-*/
-const runPreflight = gen(function* () {
-	yield* logInfo(MESSAGES.HEADER);
-	const results = yield* all([
-		checkShell(),
-		checkNode(),
-		checkGit(),
-		checkCli()
-	], { concurrency: "unbounded" });
-	for (const r of results) {
-		if (r.line.length === 0) continue;
-		if (r.ok) yield* logInfo(r.line);
-		else yield* logError(r.line);
-	}
-	const failureLines = results.filter((r) => !r.ok).map((r) => r.line).filter((line) => line.length > 0);
-	if (failureLines.length > 0) {
-		yield* logError(MESSAGES.FOOTER_FAIL);
-		return yield* new PreflightFailedError({ failures: failureLines });
-	}
-});
-
 //#endregion
 //#region src/ru-fork/local-startup/assertLocalPortAvailable.ts
 var PortInUseError = class extends TaggedError("PortInUseError") {};
@@ -39871,6 +39808,241 @@ const makeProviderMaintenanceCommandCoordinator = fn("makeProviderMaintenanceCom
 	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 = (main ?? "").split(".").map((segment) => segment.trim()).filter((segment) => segment.length > 0);
+	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: prerelease?.split(".").map((segment) => segment.trim()).filter((segment) => segment.length > 0) ?? []
+	};
+}
+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;
+const PROVIDER_UPDATE_ACTION_TOAST_MESSAGE = "Install the update now or review provider settings.";
+const latestVersionCache = /* @__PURE__ */ new Map();
+const NpmLatestVersionResponse = Struct({ version: optional$3(String$1) });
+function nonEmptyString(value) {
+	return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
+}
+function makeProviderMaintenanceCapabilities(input) {
+	const update = input.updateExecutable === null || input.updateLockKey === null ? null : {
+		command: [input.updateExecutable, ...input.updateArgs].join(" "),
+		executable: input.updateExecutable,
+		args: input.updateArgs,
+		lockKey: input.updateLockKey
+	};
+	return {
+		provider: input.provider,
+		packageName: input.packageName,
+		update
+	};
+}
+function makeManualOnlyProviderMaintenanceCapabilities(input) {
+	return makeProviderMaintenanceCapabilities({
+		provider: input.provider,
+		packageName: input.packageName,
+		updateExecutable: null,
+		updateArgs: [],
+		updateLockKey: null
+	});
+}
+function hasPathSeparator(value) {
+	return value.includes("/") || value.includes("\\");
+}
+function makeStaticProviderMaintenanceResolver(capabilities) {
+	return { resolve: () => capabilities };
+}
+function makeManualProviderMaintenanceCapabilities$1(provider) {
+	return makeManualOnlyProviderMaintenanceCapabilities({
+		provider,
+		packageName: null
+	});
+}
+const resolveProviderMaintenanceCapabilitiesEffect = fn("resolveProviderMaintenanceCapabilitiesEffect")(function* (resolver, options) {
+	const binaryPath = nonEmptyString(options?.binaryPath);
+	if (!binaryPath) return resolver.resolve(options);
+	const resolvedCommandPath = resolveCommandPath(binaryPath, {
+		...options?.platform ? { platform: options.platform } : {},
+		...options?.env ? { env: options.env } : {}
+	}) ?? (hasPathSeparator(binaryPath) ? binaryPath : null);
+	if (!resolvedCommandPath) return resolver.resolve(options);
+	const realCommandPath = yield* (yield* FileSystem).realPath(resolvedCommandPath).pipe(catch_(() => succeed(resolvedCommandPath)));
+	return resolver.resolve({
+		...options,
+		realCommandPath
+	});
+});
+function deriveVersionAdvisory(input) {
+	if (!input.currentVersion) return {
+		status: "unknown",
+		message: null
+	};
+	if (!input.latestVersion) return {
+		status: "unknown",
+		message: null
+	};
+	if (compareSemverVersions(input.currentVersion, input.latestVersion) < 0) return {
+		status: "behind_latest",
+		message: PROVIDER_UPDATE_ACTION_TOAST_MESSAGE
+	};
+	return {
+		status: "current",
+		message: null
+	};
+}
+function createProviderVersionAdvisory(input) {
+	const capabilities = input.maintenanceCapabilities ?? makeManualProviderMaintenanceCapabilities$1(input.driver);
+	const latestVersion = input.latestVersion ?? null;
+	const advisory = deriveVersionAdvisory({
+		currentVersion: input.currentVersion,
+		latestVersion
+	});
+	return {
+		status: advisory.status,
+		currentVersion: input.currentVersion,
+		latestVersion,
+		updateCommand: capabilities.update?.command ?? null,
+		canUpdate: capabilities.update !== null,
+		checkedAt: input.checkedAt ?? null,
+		message: advisory.message
+	};
+}
+const fetchNpmLatestVersion = fn("fetchNpmLatestVersion")(function* (packageName) {
+	const client = yield* HttpClient;
+	const request = get$7(`https://registry.npmjs.org/${encodeURIComponent(packageName)}/latest`).pipe(setHeader("accept", "application/json"));
+	const response = yield* client.execute(request).pipe(timeoutOption(LATEST_VERSION_TIMEOUT_MS), catch_(() => succeed(none$4())));
+	if (isNone(response)) return null;
+	const httpResponse = response.value;
+	if (httpResponse.status < 200 || httpResponse.status >= 300) return null;
+	const payload = yield* httpResponse.json.pipe(flatMap(decodeUnknownEffect(NpmLatestVersionResponse)), catch_(() => succeed(null)));
+	return payload ? nonEmptyString(payload.version) : null;
+});
+const resolveLatestProviderVersion = fn("resolveLatestProviderVersion")(function* (maintenanceCapabilities) {
+	const packageName = maintenanceCapabilities.packageName;
+	if (!packageName) return null;
+	const cached = latestVersionCache.get(packageName);
+	const now$6 = toEpochMillis(yield* now);
+	if (cached && cached.expiresAt > now$6) return cached.version;
+	const version = yield* fetchNpmLatestVersion(packageName);
+	latestVersionCache.set(packageName, {
+		expiresAt: now$6 + LATEST_VERSION_CACHE_TTL_MS,
+		version
+	});
+	return version;
+});
+const enrichProviderSnapshotWithVersionAdvisory = fn("enrichProviderSnapshotWithVersionAdvisory")(function* (snapshot, maintenanceCapabilities) {
+	const capabilities = maintenanceCapabilities ?? makeManualProviderMaintenanceCapabilities$1(snapshot.driver);
+	if (!snapshot.enabled || !snapshot.installed || !snapshot.version) return {
+		...snapshot,
+		versionAdvisory: createProviderVersionAdvisory({
+			driver: snapshot.driver,
+			currentVersion: snapshot.version,
+			checkedAt: snapshot.checkedAt,
+			maintenanceCapabilities: capabilities
+		})
+	};
+	const latestVersion = yield* resolveLatestProviderVersion(capabilities);
+	return {
+		...snapshot,
+		versionAdvisory: createProviderVersionAdvisory({
+			driver: snapshot.driver,
+			currentVersion: snapshot.version,
+			latestVersion,
+			checkedAt: formatIso(yield* now),
+			maintenanceCapabilities: capabilities
+		})
+	};
+});
+
+//#endregion
+//#region src/stream/collectUint8StreamText.ts
+const collectUint8StreamText = (input) => {
+	const decoder = new TextDecoder();
+	const maxBytes = input.maxBytes ?? Number.POSITIVE_INFINITY;
+	const truncatedMarker = input.truncatedMarker ?? "";
+	return input.stream.pipe(runFold(() => ({
+		text: "",
+		bytes: 0,
+		truncated: false
+	}), (state, chunk) => {
+		if (state.truncated) return state;
+		const remainingBytes = maxBytes - state.bytes;
+		if (remainingBytes <= 0) return {
+			...state,
+			text: `${state.text}${truncatedMarker}`,
+			truncated: true
+		};
+		const nextChunk = chunk.byteLength > remainingBytes ? chunk.slice(0, remainingBytes) : chunk;
+		const text = `${state.text}${decoder.decode(nextChunk, { stream: true })}`;
+		const bytes = state.bytes + nextChunk.byteLength;
+		const truncated = chunk.byteLength > remainingBytes;
+		return {
+			text: truncated ? `${text}${truncatedMarker}` : text,
+			bytes,
+			truncated
+		};
+	}), map$3((state) => ({
+		text: state.truncated ? state.text : `${state.text}${decoder.decode()}`,
+		bytes: state.bytes,
+		truncated: state.truncated
+	})));
+};
+
 //#endregion
 //#region src/provider/providerMaintenanceRunner.ts
 const isServerProviderUpdateError = is(ServerProviderUpdateError);
@@ -40257,9 +40429,8 @@ const makeCachedFsScanner = (config) => gen(function* () {
 
 //#endregion
 //#region src/ru-fork/common/cliRoots.ts
-const cliUserRoot = (baseDir, subdir) => gen(function* () {
-	const path = yield* Path;
-	return path.join(path.dirname(baseDir), CLI_FOLDER, subdir);
+const cliUserRoot = (configDir, subdir) => gen(function* () {
+	return (yield* Path).join(configDir, subdir);
 });
 const cliProjectRoot = (cwd, subdir) => gen(function* () {
 	return (yield* Path).join(cwd, CLI_FOLDER, subdir);
@@ -40390,7 +40561,7 @@ const makeScanner$1 = gen(function* () {
 		itemSchema: ServerProviderSkill,
 		scanUser: (now) => gen(function* () {
 			return {
-				items: yield* scanCliSkillsDir(yield* cliUserRoot(config.baseDir, SKILLS_SUBDIR), SCOPE_USER),
+				items: yield* scanCliSkillsDir(yield* cliUserRoot(config.cliConfigDir, SKILLS_SUBDIR), SCOPE_USER),
 				scannedAt: now
 			};
 		}),
@@ -40508,7 +40679,7 @@ const makeScanner = gen(function* () {
 		itemSchema: ServerProviderSubagent,
 		scanUser: (now) => gen(function* () {
 			return {
-				items: yield* scanCliAgentsDir(yield* cliUserRoot(config.baseDir, AGENTS_SUBDIR), SCOPE_USER),
+				items: yield* scanCliAgentsDir(yield* cliUserRoot(config.cliConfigDir, AGENTS_SUBDIR), SCOPE_USER),
 				scannedAt: now
 			};
 		}),
@@ -46663,8 +46834,15 @@ const makeProviderService = fn("makeProviderService")(function* (options) {
 			const routed = yield* resolveRoutableSession({
 				threadId: input.threadId,
 				operation: "ProviderService.interruptTurn",
-				allowRecovery: true
+				allowRecovery: false
 			});
+			if (!routed.isActive) {
+				yield* logDebug("[provider.interruptTurn] no live session — skipping (no-op)", {
+					threadId: input.threadId,
+					operation: "ProviderService.interruptTurn"
+				});
+				return;
+			}
 			metricProvider = routed.adapter.provider;
 			yield* annotateCurrentSpan({
 				"provider.operation": "interrupt-turn",
@@ -47568,7 +47746,7 @@ function extractCliResultText(rawStdout) {
 	const assistantMsg = messages.find((m) => m.type === "assistant");
 	return ((assistantMsg && assistantMsg.message?.content?.find((part) => part.type === "text")?.text) ?? "").trim();
 }
-const makeCliTextGeneration = fn("makeCliTextGeneration")(function* (cliSettings, environment = process.env) {
+const makeCliTextGeneration = fn("makeCliTextGeneration")(function* (cliJs, cliSettings, environment = process.env) {
 	const commandSpawner = yield* ChildProcessSpawner;
 	const cliEnvironment = {
 		...environment,
@@ -47576,12 +47754,12 @@ const makeCliTextGeneration = fn("makeCliTextGeneration")(function* (cliSettings
 	};
 	const readStreamAsString = (operation, stream) => stream.pipe(decodeText(), runFold(() => "", (acc, chunk) => acc + chunk), mapError((cause) => normalizeCliError(CLI_NAME$1, operation, cause, "Failed to collect process output")));
 	const runCliCommand = fn("runCliCommand")(function* (input) {
-		const resolved = resolveSpawn(CLI_BINARY_NAME, [
+		const resolved = buildCliSpawn(cliJs, [
 			"-p",
 			input.prompt,
 			"--output-format",
 			"json"
-		], { shell: process.platform === "win32" });
+		]);
 		const command = make$46(resolved.command, [...resolved.args], {
 			env: cliEnvironment,
 			cwd: input.cwd,
@@ -52008,14 +52186,13 @@ const makeAcpSessionRuntime = (options) => gen(function* () {
 		status: "failed",
 		cause
 	})))));
-	const resolved = resolveSpawn(options.spawn.command, options.spawn.args, { shell: process.platform === "win32" });
-	const child = yield* spawner.spawn(make$46(resolved.command, [...resolved.args], {
+	const child = yield* spawner.spawn(make$46(options.spawn.command, [...options.spawn.args], {
 		...options.spawn.cwd ? { cwd: options.spawn.cwd } : {},
 		...options.spawn.env ? { env: {
 			...process.env,
 			...options.spawn.env
 		} } : {},
-		shell: resolved.shell
+		shell: false
 	})).pipe(provideService(Scope, runtimeScope), mapError((cause) => new AcpSpawnError({
 		command: options.spawn.command,
 		cause
@@ -52464,14 +52641,15 @@ function parseLaunchArgs(launchArgs) {
 	if (!trimmed || trimmed.length === 0) return [];
 	return trimmed.split(/\s+/);
 }
-function buildCliAcpSpawnInput(cliSettings, cwd, environment) {
+function buildCliAcpSpawnInput(cliJs, cliSettings, cwd, environment) {
 	const env = { ...environment };
 	const homePath = cliSettings?.homePath?.trim();
 	if (homePath) env.CLI_HOME = homePath;
 	if (ACP_SERVER_NO_SSL) env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
+	const spawn = buildCliSpawn(cliJs, [...parseLaunchArgs(cliSettings?.launchArgs), "--acp"]);
 	return {
-		command: CLI_BINARY_NAME,
-		args: [...parseLaunchArgs(cliSettings?.launchArgs), "--acp"],
+		command: spawn.command,
+		args: [...spawn.args],
 		cwd,
 		...Object.keys(env).length > 0 ? { env } : {}
 	};
@@ -52479,7 +52657,7 @@ function buildCliAcpSpawnInput(cliSettings, cwd, environment) {
 const makeCliAcpRuntime = (input) => gen(function* () {
 	const acpContext = yield* build(AcpSessionRuntime.layer({
 		...input,
-		spawn: buildCliAcpSpawnInput(input.cliSettings, input.cwd, input.environment),
+		spawn: buildCliAcpSpawnInput(input.cliJs, input.cliSettings, input.cwd, input.environment),
 		authMethodId: CLI_AUTH_METHOD_ID
 	}).pipe(provide$2(succeed$3(ChildProcessSpawner, input.childProcessSpawner))));
 	return yield* service(AcpSessionRuntime).pipe(provide(acpContext));
@@ -53194,6 +53372,7 @@ function makeCliAdapter(cliSettings, options) {
 				cliSettings,
 				...options?.environment ? { environment: options.environment } : {},
 				childProcessSpawner,
+				cliJs: serverConfig.cliJs,
 				cwd,
 				clientInfo: {
 					name: "t3-code",
@@ -53870,6 +54049,40 @@ function makeCliAdapter(cliSettings, options) {
 	});
 }
 
+//#endregion
+//#region src/provider/providerSnapshot.ts
+function isCommandMissingCause(error) {
+	const lower = error.message.toLowerCase();
+	return lower.includes("enoent") || lower.includes("notfound");
+}
+function parseGenericCliVersion(output) {
+	return output.match(/\b(\d+\.\d+\.\d+)\b/)?.[1] ?? null;
+}
+function buildServerProvider(input) {
+	const versionAdvisory = input.driver ? createProviderVersionAdvisory({
+		driver: input.driver,
+		currentVersion: input.probe.version,
+		checkedAt: input.checkedAt
+	}) : void 0;
+	return {
+		displayName: input.presentation.displayName,
+		...input.presentation.badgeLabel ? { badgeLabel: input.presentation.badgeLabel } : {},
+		...typeof input.presentation.showInteractionModeToggle === "boolean" ? { showInteractionModeToggle: input.presentation.showInteractionModeToggle } : {},
+		enabled: input.enabled,
+		installed: input.probe.installed,
+		version: input.probe.version,
+		status: input.enabled ? input.probe.status : "disabled",
+		auth: input.probe.auth,
+		checkedAt: input.checkedAt,
+		...input.probe.message ? { message: input.probe.message } : {},
+		models: input.models,
+		slashCommands: [...input.slashCommands ?? []],
+		skills: [...input.skills ?? []],
+		...versionAdvisory ? { versionAdvisory } : {}
+	};
+}
+const collectStreamAsString = (stream) => collectUint8StreamText({ stream }).pipe(map$3((collected) => collected.text));
+
 //#endregion
 //#region src/provider/Layers/CliProvider.ts
 const VERSION_TIMEOUT_MS = 8e3;
@@ -53928,9 +54141,9 @@ function buildInitialCliProviderSnapshot(cliSettings) {
 		});
 	});
 }
-const runCliVersionCommand = (cliSettings, environment = process.env) => gen(function* () {
+const runCliVersionCommand = (cliJs, environment = process.env) => gen(function* () {
 	const spawner = yield* ChildProcessSpawner;
-	const resolved = resolveSpawn(CLI_BINARY_NAME, ["--version"], { shell: process.platform === "win32" });
+	const resolved = buildCliSpawn(cliJs, ["--version"]);
 	const command = make$46(resolved.command, [...resolved.args], {
 		env: environment,
 		shell: resolved.shell
@@ -53947,7 +54160,7 @@ const runCliVersionCommand = (cliSettings, environment = process.env) => gen(fun
 		code: exitCode
 	};
 }).pipe(scoped);
-const checkCliProviderStatus = fn("checkCliProviderStatus")(function* (cliSettings, environment = process.env) {
+const checkCliProviderStatus = fn("checkCliProviderStatus")(function* (cliJs, cliSettings, environment = process.env) {
 	const checkedAt = formatIso(yield* now);
 	if (!cliSettings.enabled) return buildServerProvider({
 		presentation: CLI_PRESENTATION,
@@ -53962,7 +54175,7 @@ const checkCliProviderStatus = fn("checkCliProviderStatus")(function* (cliSettin
 			message: `${CLI_NAME} отключён в настройках ${APP_NAME}.`
 		}
 	});
-	const versionProbe = yield* runCliVersionCommand(cliSettings, environment).pipe(timeoutOption(VERSION_TIMEOUT_MS), result);
+	const versionProbe = yield* runCliVersionCommand(cliJs, environment).pipe(timeoutOption(VERSION_TIMEOUT_MS), result);
 	if (isFailure$1(versionProbe)) {
 		const error = versionProbe.failure;
 		return buildServerProvider({
@@ -54138,6 +54351,7 @@ const CliDriver = {
 	defaultConfig: () => decodeCliSettings({}),
 	create: ({ instanceId, displayName, accentColor, environment, enabled, config }) => gen(function* () {
 		const spawner = yield* ChildProcessSpawner;
+		const serverConfig = yield* ServerConfig;
 		const eventLoggers = yield* ProviderEventLoggers;
 		const processEnv = mergeProviderInstanceEnvironment(environment);
 		const continuationIdentity = defaultProviderContinuationIdentity({
@@ -54163,8 +54377,8 @@ const CliDriver = {
 			...eventLoggers.native ? { nativeEventLogger: eventLoggers.native } : {},
 			instanceId
 		});
-		const textGeneration = yield* makeCliTextGeneration(effectiveConfig, processEnv);
-		const checkProvider = checkCliProviderStatus(effectiveConfig, processEnv).pipe(map$3(stampIdentity), provideService(ChildProcessSpawner, spawner));
+		const textGeneration = yield* makeCliTextGeneration(serverConfig.cliJs, effectiveConfig, processEnv);
+		const checkProvider = checkCliProviderStatus(serverConfig.cliJs, effectiveConfig, processEnv).pipe(map$3(stampIdentity), provideService(ChildProcessSpawner, spawner));
 		return {
 			instanceId,
 			driverKind: DRIVER_KIND,
@@ -57732,6 +57946,13 @@ const make$3 = gen(function* () {
 			const turnId = toTurnId$1(event.turnId);
 			if (turnId) {
 				const assistantMessageIds = yield* getAssistantMessageIdsForTurn(thread.id, turnId);
+				yield* logDebug("[ingestion.turn-completed] finalize assistant messages", {
+					threadId: thread.id,
+					turnId,
+					state: event.type === "turn.completed" ? event.payload.state : void 0,
+					assistantMessageIdCount: assistantMessageIds.size,
+					assistantMessageIds: Array.from(assistantMessageIds)
+				});
 				yield* forEach(assistantMessageIds, (assistantMessageId) => finalizeAssistantMessage({
 					event,
 					threadId: thread.id,
@@ -60850,8 +61071,9 @@ const runServerCommand = (flags, options) => gen(function* () {
 		injectExtraPaths: getOrUndefined(flags.injectExtraPaths),
 		windowsUseBashFor: getOrUndefined(flags.windowsUseBashFor)
 	});
-	if (!getOrElse(flags.noPreflightCheck, () => false)) yield* runPreflight;
-	const config = yield* resolveServerConfig(flags, yield* LogLevel, options);
+	const cli = yield* resolveStartupCli;
+	if (!getOrElse(flags.noPreflightCheck, () => false)) yield* runStartupChecks(cli.cliJs);
+	const config = yield* resolveServerConfig(flags, yield* LogLevel, cli, options);
 	if (config.mode === DESKTOP_RUNTIME_MODE) yield* assertLocalPortAvailable(config.port);
 	return yield* runServer.pipe(provideService(ServerConfig, config), provide(succeed$3(MinimumLogLevel, config.logLevel)));
 });
@@ -61028,7 +61250,7 @@ const fetchPairingStartupUrl = (origin) => tryPromise({
 	})
 }).pipe(catch_(() => succeed(null)));
 const resolveDerivedPaths = (input) => gen(function* () {
-	return yield* deriveServerPaths(yield* resolveBaseDir(input.baseDirOverride !== void 0 ? yield* expandHomePath$4(input.baseDirOverride.trim()) : void 0), input.devUrlOverride);
+	return yield* deriveServerPaths(yield* resolveBaseDir((input.baseDirOverride !== void 0 ? yield* expandHomePath$4(input.baseDirOverride.trim()) : void 0) ?? input.ourRoot), input.devUrlOverride);
 });
 const announceReady = (input) => gen(function* () {
 	yield* printDaemonReadyBanner({
@@ -61043,8 +61265,12 @@ const runDaemonLauncher = (input) => gen(function* () {
 		injectExtraPaths: input.injectExtraPaths,
 		windowsUseBashFor: input.windowsUseBashFor
 	});
-	if (!input.noPreflightCheck) yield* runPreflight;
-	const { serverRuntimeStatePath, logsDir } = yield* resolveDerivedPaths(input);
+	const cli = yield* resolveStartupCli;
+	if (!input.noPreflightCheck) yield* runStartupChecks(cli.cliJs);
+	const { serverRuntimeStatePath, logsDir } = yield* resolveDerivedPaths({
+		...input,
+		ourRoot: cli.ourRoot
+	});
 	const launcherLogPath = path$1.join(logsDir, "ru-fork.log");
 	const existingState = yield* readPersistedServerRuntimeState(serverRuntimeStatePath);
 	if (existingState._tag === "Some") {
@@ -61082,7 +61308,11 @@ const runDaemonLauncher = (input) => gen(function* () {
 	});
 });
 const runStopCommand = (input) => gen(function* () {
-	const state = yield* readPersistedServerRuntimeState((yield* resolveDerivedPaths(input)).serverRuntimeStatePath);
+	const cli = yield* resolveStartupCli;
+	const state = yield* readPersistedServerRuntimeState((yield* resolveDerivedPaths({
+		...input,
+		ourRoot: cli.ourRoot
+	})).serverRuntimeStatePath);
 	if (state._tag !== "Some") {
 		yield* log("");
 		yield* log(headline(ARROW_DIM, "ru-fork не запущен"));