proxitor 0.9.0-beta.4 → 0.9.0-beta.5

package/dist/cli.mjs

@@ -8,7 +8,7 @@ import { formatWithOptions, styleText } from "node:util";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join, resolve, sep } from "node:path";
 import * as l$1 from "node:readline";
-import f from "node:readline";
+import l__default from "node:readline";
 import { createHash } from "node:crypto";
 import { createServer } from "node:net";
 import { STATUS_CODES, createServer as createServer$1 } from "node:http";
@@ -10809,15 +10809,10 @@ function applyOverride(result, override) {
 		...override.headers
 	};
 	if (override.cacheControl !== void 0) result.cacheControl = override.cacheControl;
-	if (override.cacheControlTtl === null) result.cacheControlTtl = void 0;
-	else if (override.cacheControlTtl !== void 0) result.cacheControlTtl = override.cacheControlTtl;
+	if (override.cacheControlTtl !== void 0) result.cacheControlTtl = override.cacheControlTtl ?? void 0;
 	if (override.sessionId !== void 0) result.sessionId = override.sessionId;
 }
-/**
-* Throw if a URL ends with /v1 — a common misconfiguration after the URL routing change.
-* Paths like /v1/chat/completions are now forwarded as-is, so including /v1 in the base
-* URL would produce doubled paths like /v1/v1/chat/completions.
-*/
+/** Reject base URLs ending in /v1 — paths are forwarded as-is, so /v1 suffix causes doubled paths. */
 function throwIfV1Suffix(url, field) {
 	const { pathname } = new URL(url);
 	if (pathname.endsWith("/v1") || pathname.endsWith("/v1/")) throw new Error(`${field} "${url}" ends with /v1 — paths are now forwarded as-is, so this would produce doubled paths like /v1/v1/chat/completions. Remove the /v1 suffix (use "${url.replace(/\/v1\/?$/, "")}")`);
@@ -10834,9 +10829,8 @@ async function loadConfig(options) {
 		...options.host !== void 0 ? { host: options.host } : {},
 		...options.port !== void 0 ? { port: options.port } : {},
 		...options.verbose !== void 0 ? { verbose: options.verbose } : {},
-		...options.openrouterKey ? { openrouterKey: options.openrouterKey } : {}
+		openrouterKey: options.openrouterKey || fileConfig.openrouterKey || process.env.OPENROUTER_API_KEY || ""
 	};
-	if (!merged.openrouterKey) merged.openrouterKey = process.env.OPENROUTER_API_KEY ?? "";
 	const result = proxyConfigSchema.safeParse(merged);
 	if (!result.success) throw new ConfigValidationError("(merged config)", result.error);
 	if (!result.data.openrouterKey) throw new Error("OpenRouter API key is required. Set OPENROUTER_API_KEY env var, pass --openrouter-key flag, or set it in config file.");
@@ -10864,30 +10858,16 @@ const XDG_CONFIG_CANDIDATES = [
 function getConfigSearchPaths() {
 	return [...LOCAL_CONFIG_CANDIDATES.map((c) => resolve(c)), ...XDG_CONFIG_CANDIDATES.map((c) => join(getXdgConfigDir(), c))];
 }
-/**
-* Return the path of the first existing config file, or `null` if none was found.
-* Use this when "no config" is a valid outcome (e.g. wizard, doctor, validate).
-*/
+/** Returns first existing config file, or null. Use when "no config" is valid (wizard, doctor, validate). */
 function tryFindConfigFile(explicitPath) {
 	if (explicitPath) {
 		if (!existsSync(explicitPath)) throw new Error(`Config file not found: ${explicitPath}`);
 		return resolve(explicitPath);
 	}
-	for (const candidate of LOCAL_CONFIG_CANDIDATES) {
-		const fullPath = resolve(candidate);
-		if (existsSync(fullPath)) return fullPath;
-	}
-	const xdgDir = getXdgConfigDir();
-	for (const candidate of XDG_CONFIG_CANDIDATES) {
-		const fullPath = join(xdgDir, candidate);
-		if (existsSync(fullPath)) return fullPath;
-	}
+	for (const fullPath of getConfigSearchPaths()) if (existsSync(fullPath)) return fullPath;
 	return null;
 }
-/**
-* Resolve a config file path, throwing {@link MissingConfigError} if discovery
-* (with no explicit path) fails. Use this when the config is required.
-*/
+/** Like tryFindConfigFile but throws MissingConfigError when no config is found. */
 function findConfigFile(explicitPath) {
 	const found = tryFindConfigFile(explicitPath);
 	if (found) return found;
@@ -11463,7 +11443,7 @@ var V = class {
 					this.state = "cancel", this.close();
 				}, { once: true });
 			}
-			this.rl = f.createInterface({
+			this.rl = l__default.createInterface({
 				input: this.input,
 				tabSize: 2,
 				prompt: "",
@@ -19607,7 +19587,7 @@ const r = Object.create(null), i = (e) => globalThis.process?.env || import.meta
 		const e = i(true);
 		return Object.keys(e);
 	}
-}), t = typeof process < "u" && process.env && process.env.NODE_ENV || "", f$1 = [
+}), t = typeof process < "u" && process.env && process.env.NODE_ENV || "", f = [
 	["APPVEYOR"],
 	[
 		"AWS_AMPLIFY",
@@ -19699,7 +19679,7 @@ const r = Object.create(null), i = (e) => globalThis.process?.env || import.meta
 	]
 ];
 function b() {
-	if (globalThis.process?.env) for (const e of f$1) {
+	if (globalThis.process?.env) for (const e of f) {
 		const s = e[1] || e[0];
 		if (globalThis.process?.env[s]) return {
 			name: e[0].toLowerCase(),
@@ -21025,25 +21005,21 @@ var OpenRouterClient = class {
 };
 //#endregion
 //#region src/openrouter/data-client.ts
-const OPENROUTER_FALLBACK_URL = OPENROUTER_API_URL;
 const MODELS_CACHE_TTL_MS = 300 * 1e3;
 const modelsCache = /* @__PURE__ */ new Map();
-function isValidProvidersResponse(data) {
+function isValidArrayDataResponse(data) {
 	return typeof data === "object" && data !== null && "data" in data && Array.isArray(data.data);
 }
+function isValidProvidersResponse(data) {
+	return isValidArrayDataResponse(data);
+}
 function isValidModelsResponse(data) {
-	return typeof data === "object" && data !== null && "data" in data && Array.isArray(data.data);
+	return isValidArrayDataResponse(data);
 }
 function isValidEndpointsResponse(data) {
 	return typeof data === "object" && data !== null && "data" in data && typeof data.data === "object" && data.data !== null && "endpoints" in data.data && Array.isArray(data.data.endpoints);
 }
-/**
-* Client for fetching provider/model data with automatic fallback to OpenRouter.
-*
-* When the primary API (openrouterDataUrl or openrouterBaseUrl) doesn't support
-* OpenRouter-specific data endpoints, falls back to https://openrouter.ai/api
-* which hosts public, unauthenticated endpoints for /providers, /models, etc.
-*/
+/** Fetches provider/model data with fallback to OpenRouter. */
 var OpenRouterDataClient = class {
 	primaryClient;
 	fallbackClient;
@@ -21052,9 +21028,9 @@ var OpenRouterDataClient = class {
 	cacheKey;
 	constructor(config) {
 		const primaryUrl = config.openrouterDataUrl ?? config.openrouterBaseUrl;
-		this.skipFallback = primaryUrl === OPENROUTER_FALLBACK_URL;
+		this.skipFallback = primaryUrl === OPENROUTER_API_URL;
 		this.primaryClient = new OpenRouterClient(config.apiKey, primaryUrl, config.authType);
-		this.fallbackClient = new OpenRouterClient(OPENROUTER_FALLBACK_URL);
+		this.fallbackClient = new OpenRouterClient(OPENROUTER_API_URL);
 		this.onFallback = config.onFallback;
 		const keyHash = createHash("sha256").update(config.apiKey).digest("hex").slice(0, 8);
 		this.cacheKey = `${primaryUrl}|${config.authType}|${keyHash}`;
@@ -21065,7 +21041,6 @@ var OpenRouterDataClient = class {
 	async fetchModels() {
 		const cached = modelsCache.get(this.cacheKey);
 		if (cached && Date.now() - cached.at < MODELS_CACHE_TTL_MS) return cached.models;
-		if (cached) modelsCache.delete(this.cacheKey);
 		const models = (await this.withFallback("/v1/models", () => this.primaryClient.get("/v1/models"), isValidModelsResponse)).data.data;
 		modelsCache.set(this.cacheKey, {
 			at: Date.now(),
@@ -21077,10 +21052,7 @@ var OpenRouterDataClient = class {
 		const path = `/v1/models/${author}/${slug}/endpoints`;
 		return (await this.withFallback(path, () => this.primaryClient.get(path), isValidEndpointsResponse)).data.data.endpoints ?? [];
 	}
-	/**
-	* Try primary, validate response, fallback on failure.
-	* Network errors get 1 retry before fallback.
-	*/
+	/** Primary with retry, then fallback. */
 	async withFallback(path, primaryFn, validate) {
 		if (this.skipFallback) {
 			const data = await primaryFn();
@@ -21118,24 +21090,19 @@ function isNetworkError(error) {
 	const message = error.message.toLowerCase();
 	return message.includes("fetch") || message.includes("network") || message.includes("econnrefused") || message.includes("enotfound") || message.includes("timeout") || message.includes("aborted") || error.name === "TypeError";
 }
-/**
-* Best-effort probe of the upstream API. Non-blocking — used by the wizard
-* to give early feedback on key validity without preventing save.
-*/
+/** Probes upstream to validate key and count models. */
 async function probeUpstream(baseUrl, apiKey, authType, timeoutMs = 3e3) {
+	if (!apiKey) return {
+		ok: false,
+		reason: "No API key provided"
+	};
 	const url = `${baseUrl.replace(/\/$/, "")}/v1/models`;
 	const controller = new AbortController();
 	const timer = setTimeout(() => controller.abort(), timeoutMs);
 	try {
-		if (!apiKey) return {
-			ok: false,
-			reason: "No API key provided"
-		};
-		const headers = {};
-		headers.Authorization = formatAuthHeader(apiKey, authType);
 		const res = await fetch(url, {
 			signal: controller.signal,
-			headers
+			headers: { Authorization: formatAuthHeader(apiKey, authType) }
 		});
 		if (res.status === 401 || res.status === 403) return {
 			ok: false,
@@ -21544,7 +21511,7 @@ async function runConfigMenu(client) {
 }
 //#endregion
 //#region src/version.ts
-const version = "0.9.0-beta.4";
+const version = "0.9.0-beta.5";
 //#endregion
 //#region src/commands/doctor.ts
 const DEFAULT_TIMEOUT_MS = 3e3;
@@ -24515,6 +24482,19 @@ function filterHeaders(incoming, blocklist) {
 	}
 	return headers;
 }
+/**
+* Canonicalize a header record to lowercase keys.
+*
+* HTTP header names are case-insensitive (RFC 9110 §5.1), but a plain object
+* treats `Content-Type` and `content-type` as distinct keys. Lowercasing folds
+* case-variant keys into one so the merged record can never carry two headers
+* that differ only by case. Returns a new object; does not mutate the input.
+*/
+function lowercaseKeys(record) {
+	const result = {};
+	for (const [key, value] of Object.entries(record)) result[key.toLowerCase()] = value;
+	return result;
+}
 /** Filter response headers and add SSE-friendly defaults */
 function buildResponseHeaders(from) {
 	const headers = filterHeaders(from, STRIP_RESPONSE);
@@ -24524,48 +24504,65 @@ function buildResponseHeaders(from) {
 }
 //#endregion
 //#region src/proxy/middleware/build-upstream-req.ts
+const encoder = new TextEncoder();
 const PROTO_POLLUTION_KEYS = new Set([
 	"__proto__",
 	"constructor",
 	"prototype"
 ]);
-function resolveForwardBody(c) {
-	if (c.var.bodyMutated && c.var.parsedBody) try {
-		return new TextEncoder().encode(JSON.stringify(c.var.parsedBody)).buffer;
+function resolveForwardBody(opts) {
+	if (opts.bodyMutated && opts.parsedBody) try {
+		return encoder.encode(JSON.stringify(opts.parsedBody)).buffer;
 	} catch (err) {
-		logger.warn(withReq(c.var.reqId, `Failed to re-serialize mutated body (${err instanceof Error ? err.message : "unknown"}); forwarding raw body as-is`));
-		return c.var.rawBody;
+		logger.warn(withReq(opts.reqId, `Failed to re-serialize mutated body (${err instanceof Error ? err.message : "unknown"}); forwarding raw body as-is`));
+		return opts.rawBody;
 	}
-	return c.var.rawBody;
+	return opts.rawBody;
 }
-function applyProxyHeaders(headers, config) {
-	headers.Authorization = formatAuthHeader(config.openrouterKey, config.authType);
-	headers["HTTP-Referer"] = config.attributionReferer;
-	headers["X-OpenRouter-Title"] = config.attributionTitle;
-	headers["Accept-Encoding"] = "identity";
+function proxyHeaders(config) {
+	return {
+		Authorization: formatAuthHeader(config.openrouterKey, config.authType),
+		"HTTP-Referer": config.attributionReferer,
+		"X-OpenRouter-Title": config.attributionTitle,
+		"Accept-Encoding": "identity"
+	};
 }
-function applyExtraHeaders(headers, extraHeaders) {
-	if (!extraHeaders) return;
+function sanitizeExtraHeaders(extraHeaders) {
+	const safe = {};
+	if (!extraHeaders) return safe;
 	for (const [key, value] of Object.entries(extraHeaders)) {
 		if (PROTO_POLLUTION_KEYS.has(key)) continue;
-		headers[key] = value;
+		safe[key] = value;
 	}
+	return safe;
+}
+function withSessionId(headers, sessionId) {
+	const { "x-claude-code-session-id": _omit, ...rest } = headers;
+	return {
+		...rest,
+		"x-session-id": sessionId
+	};
 }
-function forceJsonContentType(headers) {
-	for (const key of Object.keys(headers)) if (key.toLowerCase() === "content-type") delete headers[key];
-	headers["Content-Type"] = "application/json";
+function withJsonContentType(headers) {
+	return {
+		...headers,
+		"content-type": "application/json"
+	};
 }
 const buildUpstreamReq = createMiddleware(async (c, next) => {
-	c.set("forwardBody", resolveForwardBody(c));
-	const headers = filterHeaders(c.req.raw.headers, STRIP_REQUEST);
-	applyProxyHeaders(headers, c.var.config);
-	applyExtraHeaders(headers, c.var.resolvedConfig.headers);
-	if (c.var.effectiveSessionId !== void 0) {
-		delete headers["x-claude-code-session-id"];
-		delete headers["x-session-id"];
-		headers["x-session-id"] = c.var.effectiveSessionId;
-	}
-	if (c.var.bodyMutated) forceJsonContentType(headers);
+	c.set("forwardBody", resolveForwardBody({
+		reqId: c.var.reqId,
+		bodyMutated: c.var.bodyMutated,
+		parsedBody: c.var.parsedBody,
+		rawBody: c.var.rawBody
+	}));
+	let headers = lowercaseKeys({
+		...filterHeaders(c.req.raw.headers, STRIP_REQUEST),
+		...proxyHeaders(c.var.config),
+		...sanitizeExtraHeaders(c.var.resolvedConfig.headers)
+	});
+	if (c.var.effectiveSessionId !== void 0) headers = withSessionId(headers, c.var.effectiveSessionId);
+	if (c.var.bodyMutated) headers = withJsonContentType(headers);
 	c.set("upstreamHeaders", headers);
 	await next();
 });
@@ -24687,10 +24684,7 @@ function buildUpstreamResponseWithLogging(upstream, method, reqId) {
 }
 //#endregion
 //#region src/proxy/utils/error.ts
-/**
-* OpenRouter error format:
-*   { error: { code, message, metadata: { raw, provider_name } } }
-*/
+/** OpenRouter error: { error: { code, message, metadata: { raw, provider_name } } } */
 function formatMetadata(meta) {
 	const parts = [];
 	if (meta.provider_name) parts.push(`provider=${meta.provider_name}`);
@@ -24718,6 +24712,7 @@ function extractErrorDetail(bodyText) {
 }
 //#endregion
 //#region src/proxy/middleware/forward-request.ts
+const DUPLEX_HALF = { duplex: "half" };
 function buildErrorResponse(err, ctx) {
 	if (err instanceof TypeError) {
 		logger.error(withReq(ctx.reqId, "Upstream fetch error:"), err);
@@ -24754,14 +24749,14 @@ const forwardRequest = createMiddleware(async (c) => {
 		method,
 		path,
 		startedAt,
-		upstreamShort: upstreamUrl.replace(/^https?:\/\//, ""),
-		modelLog: c.var.modelName ? ` model=${c.var.modelName}` : "",
 		bodyMutated: c.var.bodyMutated
 	};
 	const controller = new AbortController();
 	const onClientAbort = () => controller.abort();
 	c.req.raw.signal.addEventListener("abort", onClientAbort);
-	logger.info(withReq(reqId, `${method} ${path} → ${ctx.upstreamShort}${ctx.bodyMutated ? " [inject]" : ""}${ctx.modelLog}`));
+	const upstreamShort = upstreamUrl.replace(/^https?:\/\//, "");
+	const modelLog = c.var.modelName ? ` model=${c.var.modelName}` : "";
+	logger.info(withReq(reqId, `${method} ${path} → ${upstreamShort}${ctx.bodyMutated ? " [inject]" : ""}${modelLog}`));
 	let upstream;
 	try {
 		upstream = await fetch(upstreamUrl, {
@@ -24769,7 +24764,7 @@ const forwardRequest = createMiddleware(async (c) => {
 			headers: upstreamHeaders,
 			body: forwardBody,
 			signal: controller.signal,
-			...forwardBody ? { duplex: "half" } : {}
+			...forwardBody ? DUPLEX_HALF : {}
 		});
 	} catch (err) {
 		return buildErrorResponse(err, ctx);
@@ -24813,16 +24808,11 @@ function shouldInjectCacheControl(mode, modelName, path) {
 	if (mode === "always") return true;
 	return isAnthropicEndpoint(modelName, path);
 }
-/**
-* Build cache_control value for injection.
-* Merges existing cache_control with configured TTL.
-* If TTL is configured and the endpoint is Anthropic, it always overrides.
-*/
 function buildCacheControl(existing, ttl, isAnthropic) {
-	const result = existing !== null && typeof existing === "object" && !Array.isArray(existing) ? { ...existing } : { type: "ephemeral" };
-	if (!("type" in result)) result.type = "ephemeral";
-	if (ttl && isAnthropic) result.ttl = ttl;
-	return result;
+	const base = existing !== null && typeof existing === "object" && !Array.isArray(existing) ? { ...existing } : {};
+	if (!("type" in base)) base.type = "ephemeral";
+	if (ttl && isAnthropic) base.ttl = ttl;
+	return base;
 }
 //#endregion
 //#region src/proxy/middleware/inject-cache-control.ts
@@ -24860,6 +24850,18 @@ const injectProvider = createMiddleware(async (c, next) => {
 //#endregion
 //#region src/proxy/utils/session-id.ts
 const PROXY_SESSION_ID = crypto.randomUUID();
+function firstContent(messages, ...roles) {
+	if (!Array.isArray(messages)) return void 0;
+	return messages.find((m) => roles.includes(m.role ?? "") && m.content != null)?.content;
+}
+/** Returns '' for non-serializable values (e.g. BigInt). */
+function safeStringify(value) {
+	try {
+		return JSON.stringify(value);
+	} catch {
+		return "";
+	}
+}
 function extractConversationFingerprint(parsedBody, path) {
 	let system;
 	let user;
@@ -24868,30 +24870,15 @@ function extractConversationFingerprint(parsedBody, path) {
 			system = parsedBody.instructions;
 			user = parsedBody.input;
 			break;
-		case "messages": {
+		case "messages":
 			system = parsedBody.system;
-			const messages = parsedBody.messages;
-			if (Array.isArray(messages)) user = messages.find((m) => m.role === "user" && m.content != null)?.content;
+			user = firstContent(parsedBody.messages, "user");
 			break;
-		}
-		default: {
-			const messages = parsedBody.messages;
-			if (Array.isArray(messages)) {
-				const firstSystem = messages.find((m) => (m.role === "system" || m.role === "developer") && m.content != null);
-				const firstUser = messages.find((m) => m.role === "user" && m.content != null);
-				system = firstSystem?.content;
-				user = firstUser?.content;
-			}
-		}
+		default:
+			system = firstContent(parsedBody.messages, "system", "developer");
+			user = firstContent(parsedBody.messages, "user");
 	}
 	if (system == null && user == null) return null;
-	const safeStringify = (value) => {
-		try {
-			return JSON.stringify(value);
-		} catch {
-			return "";
-		}
-	};
 	const hash = createHash("sha256");
 	hash.update(String(parsedBody.model ?? ""));
 	if (system != null) hash.update(safeStringify(system));
@@ -25065,14 +25052,10 @@ function startProxyServer(config, onReady) {
 //#endregion
 //#region src/cli-commands.ts
 /**
-* Command tree for the proxitor CLI.
-*
-* Kept in a separate module from `cli.ts` so tests can import the commands
-* without triggering the top-level `run()` invocation that `cli.ts` performs
-* on import.
+* CLI command tree. Separated from `cli.ts` so tests can import commands
+* without triggering `run()`.
 */
-/** Flags that every command touching the config file accepts. */
-const configArgs$1 = {
+const configArgs = {
 	configPath: (0, import_cjs.option)({
 		long: "config",
 		short: "c",
@@ -25087,16 +25070,14 @@ const configArgs$1 = {
 		description: "OpenRouter API key (overrides config file & env)"
 	})
 };
-/** `--json` flag for commands that can produce structured output. */
 const jsonFlag = { json: (0, import_cjs.flag)({
 	long: "json",
 	description: "Output as JSON instead of formatted text"
 }) };
-/** Build an OpenRouterDataClient from already-parsed args. */
 async function makeClient(args) {
 	const cfg = await loadConfig({
-		configPath: args.configPath ?? void 0,
-		openrouterKey: args.openrouterKey ?? void 0
+		configPath: args.configPath,
+		openrouterKey: args.openrouterKey
 	});
 	return new OpenRouterDataClient({
 		openrouterBaseUrl: cfg.openrouterBaseUrl,
@@ -25136,7 +25117,7 @@ const startCommand = (0, import_cjs.command)({
 		}
 	],
 	args: {
-		configPath: configArgs$1.configPath,
+		configPath: configArgs.configPath,
 		port: (0, import_cjs.option)({
 			long: "port",
 			short: "p",
@@ -25156,7 +25137,7 @@ const startCommand = (0, import_cjs.command)({
 			long: "no-config",
 			description: "Skip config file discovery"
 		}),
-		openrouterKey: configArgs$1.openrouterKey,
+		openrouterKey: configArgs.openrouterKey,
 		verbose: (0, import_cjs.flag)({
 			long: "verbose",
 			description: "Enable verbose logging"
@@ -25165,11 +25146,11 @@ const startCommand = (0, import_cjs.command)({
 	handler: async ({ configPath, port, host, noConfig, openrouterKey, verbose }) => {
 		try {
 			const cfg = await loadConfig({
-				configPath: configPath ?? void 0,
+				configPath,
 				noConfig,
 				port,
 				host,
-				openrouterKey: openrouterKey ?? void 0,
+				openrouterKey,
 				verbose
 			});
 			startProxyServer(cfg, () => {
@@ -25207,7 +25188,7 @@ const configCli = (0, import_cjs.subcommands)({
 		add: (0, import_cjs.command)({
 			name: "add",
 			description: "Add a model override (interactive)",
-			args: { ...configArgs$1 },
+			args: { ...configArgs },
 			handler: async (args) => {
 				await addOverrideCommand({
 					client: await makeClient(args),
@@ -25218,7 +25199,7 @@ const configCli = (0, import_cjs.subcommands)({
 		edit: (0, import_cjs.command)({
 			name: "edit",
 			description: "Edit an existing model override (interactive)",
-			args: { ...configArgs$1 },
+			args: { ...configArgs },
 			handler: async (args) => {
 				await editOverrideCommand(await makeClient(args), args.configPath);
 			}
@@ -25226,7 +25207,7 @@ const configCli = (0, import_cjs.subcommands)({
 		remove: (0, import_cjs.command)({
 			name: "remove",
 			description: "Remove one or more model overrides (interactive)",
-			args: { ...configArgs$1 },
+			args: { ...configArgs },
 			handler: async (args) => {
 				await removeOverrideCommand({ configPath: args.configPath });
 			}
@@ -25235,7 +25216,7 @@ const configCli = (0, import_cjs.subcommands)({
 			name: "list",
 			description: "List all model overrides",
 			args: {
-				...configArgs$1,
+				...configArgs,
 				...jsonFlag
 			},
 			handler: async (args) => {
@@ -25248,7 +25229,7 @@ const configCli = (0, import_cjs.subcommands)({
 		browse: (0, import_cjs.command)({
 			name: "browse",
 			description: "Browse OpenRouter models (interactive)",
-			args: { ...configArgs$1 },
+			args: { ...configArgs },
 			handler: async (args) => {
 				await browseModelsCommand(await makeClient(args));
 			}
@@ -25257,7 +25238,7 @@ const configCli = (0, import_cjs.subcommands)({
 			name: "validate",
 			description: "Validate the current config (exit 0 ok, 1 invalid)",
 			args: {
-				...configArgs$1,
+				...configArgs,
 				...jsonFlag
 			},
 			handler: async (args) => {
@@ -25272,7 +25253,7 @@ const configCli = (0, import_cjs.subcommands)({
 			name: "show",
 			description: "Show resolved configuration (merged from defaults + file + env + flags)",
 			args: {
-				...configArgs$1,
+				...configArgs,
 				...jsonFlag
 			},
 			handler: async (args) => {
@@ -25286,7 +25267,7 @@ const configCli = (0, import_cjs.subcommands)({
 		wizard: (0, import_cjs.command)({
 			name: "wizard",
 			description: "Run interactive setup wizard",
-			args: { ...configArgs$1 },
+			args: { ...configArgs },
 			handler: async (args) => {
 				await runWizard({ configPath: args.configPath });
 			}
@@ -25294,7 +25275,7 @@ const configCli = (0, import_cjs.subcommands)({
 		menu: (0, import_cjs.command)({
 			name: "menu",
 			description: "Open interactive configuration menu",
-			args: { ...configArgs$1 },
+			args: { ...configArgs },
 			handler: async (args) => {
 				await runConfigMenu(await makeClient(args));
 			}
@@ -25319,10 +25300,7 @@ const doctorCli = (0, import_cjs.command)({
 		}
 	],
 	args: {
-		json: (0, import_cjs.flag)({
-			long: "json",
-			description: "Output as JSON instead of formatted text"
-		}),
+		...jsonFlag,
 		offline: (0, import_cjs.flag)({
 			long: "offline",
 			description: "Skip network checks (upstream, npm)"
@@ -25356,8 +25334,14 @@ const rootCli = (0, import_cjs.subcommands)({
 });
 //#endregion
 //#region src/cli.ts
+const INFO_FLAGS = [
+	"--help",
+	"-h",
+	"--version",
+	"-v"
+];
 const userArgs = process.argv.slice(2);
-const isInfo = userArgs.includes("--help") || userArgs.includes("-h") || userArgs.includes("--version") || userArgs.includes("-v");
+const isInfo = userArgs.some((a) => INFO_FLAGS.includes(a));
 if (!isInfo) (0, import_main.config)({ quiet: true });
 async function handleStartupError(err) {
 	if (err instanceof MissingConfigError && process.stdin.isTTY) {
@@ -25399,17 +25383,11 @@ const finalArgv = needsDefault && !isInfo ? [
 	"proxitor",
 	"start",
 	...userArgs
-] : [...process.argv];
-const configArgs = !needsDefault && firstNonFlag === "config" ? userArgs.slice(userArgs.indexOf("config") + 1) : [];
-const configSub = configArgs.find((a) => !a.startsWith("-"));
-const configHasInfo = configArgs.some((a) => [
-	"--help",
-	"-h",
-	"--version",
-	"-v"
-].includes(a));
-if (!needsDefault && firstNonFlag === "config" && !configHasInfo) {
-	if (!configSub || !KNOWN_CONFIG_SUBS.has(configSub)) finalArgv.splice(finalArgv.lastIndexOf("config") + 1, 0, "menu");
+] : process.argv;
+if (!needsDefault && firstNonFlag === "config") {
+	const configArgs = userArgs.slice(userArgs.indexOf("config") + 1);
+	const configSub = configArgs.find((a) => !a.startsWith("-"));
+	if (!configArgs.some((a) => INFO_FLAGS.includes(a)) && (!configSub || !KNOWN_CONFIG_SUBS.has(configSub))) finalArgv.splice(finalArgv.lastIndexOf("config") + 1, 0, "menu");
 }
 (0, import_cjs.run)((0, import_cjs.binary)(rootCli), finalArgv).catch((err) => void handleStartupError(err));
 //#endregion