@jeffreycao/copilot-api 2.8.3 → 2.8.4

package/dist/{server-Cw9qn5Gt.js → server-De8OQQe6.js}

@@ -1,9 +1,9 @@
-import { D as isGitHubCopilotEnabled, E as isGitHubCopilotAvailable, M as forwardError, O as state, S as PATHS, T as assertGitHubCopilotEnabled, a as getAnthropicApiKey, c as getConfig, d as getUpstreamTransportConfig, g as isResponsesApiWebSocketEnabled, h as isResponsesApiWebSearchEnabled, i as getAlphaSearchModel, k as HTTPError, l as getMessageApiWebSearchModel, m as isMessagesApiEnabled, o as getClaudeAutoModel, p as isAlphaSearchCodexPriorityEnabled, s as getClaudeTokenMultiplier, u as getOpencodeModelContextWindow, w as GITHUB_COPILOT_PROVIDER, y as reloadConfig } from "./config-store-DFcv4AY0.js";
-import { A as getSmallModelForProvider, D as getModelResponsesApiCompactThreshold$1, E as getModelMappings, F as resolveMappedModel, I as setModelMappings, M as isContextManagementEnabledForResponses, N as isGpt56OrAbove, O as getReasoningEffortForModel, P as isOutputEncryptedContentDisabled, S as getModelsDevModelPricing, T as getExtraPromptForModel, _ as DEFAULT_IMAGE_MODELS, a as normalizeProviderBaseUrl, b as getModelsDevModel, d as isProviderModelVisible, f as resolveProviderModelsDevId, g as getBuiltinProviderModelRecords, h as getBuiltinProviderImageModelRecords, i as listEnabledProviders, j as isContextManagementEnabledForMessages, k as getSmallModel, l as getLocalProviderModelRecords, m as builtinProviderModelRegistry, n as getRawProviderConfig, o as resolveEffectiveProviderType, p as usesModelsDevModelCatalog, s as resolveProviderConfigForModel, t as getProviderConfig, u as getProviderModelConfig, v as IMAGE_PROVIDER_PRIORITY, x as getModelsDevModelMaxOutputTokens, y as getDefaultImageModel } from "./config-B55PwJzQ.js";
-import { $ as buildCodexRequestHeaders, B as getXaiAccessToken, C as copilotHeaders, D as prepareForCompact, E as isOpencodeOauthApp, F as compactTextOnlyGuard, I as createAuthMiddleware, J as readGitHubTokenFromEnv, L as getConfiguredAdminApiKeys, M as compactMessageSections, O as prepareInteractionHeaders, P as compactSystemPromptStarts, Q as CODEX_API_BASE_URL, S as copilotBaseUrl, T as copilotWebSocketHeaders, U as readXaiCredentials, Y as XAI_API_BASE_URL, _ as isAsyncIterable, at as setPluginRequestActualModel, b as parseUserIdMetadata, ct as createResponsesSafeStream, d as generateRequestIdFromPayload, dt as createPooledWebSocketStream, et as forwardCodexResponses, f as getPromptCacheKey, ft as createWebSocketUrl, g as getUUID, h as getSessionAffinityFromHeaders, it as resolveTraceId$1, j as compactAutoContinuePromptStarts, k as prepareMessageProxyHeaders, lt as encodePoolKeyPart, m as getRootSessionIdFromHeaders, mt as stripInternalRequestHeaders, n as invalidateCodexRuntime, nt as generateTraceId, ot as fetchUpstreamWithLifecycle, p as getRootSessionId, q as readGitHubToken, rt as requestContext, s as setupCodexToken, st as createResponsesHttpEventStream, tt as formatPluginActualModel, u as stopCopilotRefreshLoop, ut as getResponsesStreamTerminalDisposition, v as isNullish, x as getCopilotUsage, y as isResponsesStream } from "./token-DFlvOMh2.js";
+import { D as isGitHubCopilotEnabled, E as isGitHubCopilotAvailable, M as forwardError, O as state, S as PATHS, T as assertGitHubCopilotEnabled, a as getAnthropicApiKey, c as getConfig, d as getUpstreamTransportConfig, g as isResponsesApiWebSocketEnabled, h as isResponsesApiWebSearchEnabled, i as getAlphaSearchModel, k as HTTPError, l as getMessageApiWebSearchModel, m as isMessagesApiEnabled, o as getClaudeAutoModel, p as isAlphaSearchCodexPriorityEnabled, s as getClaudeTokenMultiplier, u as getOpencodeModelContextWindow, w as GITHUB_COPILOT_PROVIDER, y as reloadConfig } from "./config-store-SwGZOmmG.js";
+import { A as getSmallModelForProvider, D as getModelResponsesApiCompactThreshold$1, E as getModelMappings, F as resolveMappedModel, I as setModelMappings, M as isContextManagementEnabledForResponses, N as isGpt56OrAbove, O as getReasoningEffortForModel, P as isOutputEncryptedContentDisabled, S as getModelsDevModelPricing, T as getExtraPromptForModel, _ as DEFAULT_IMAGE_MODELS, a as normalizeProviderBaseUrl, b as getModelsDevModel, d as isProviderModelVisible, f as resolveProviderModelsDevId, g as getBuiltinProviderModelRecords, h as getBuiltinProviderImageModelRecords, i as listEnabledProviders, j as isContextManagementEnabledForMessages, k as getSmallModel, l as getLocalProviderModelRecords, m as builtinProviderModelRegistry, n as getRawProviderConfig, o as resolveEffectiveProviderType, p as usesModelsDevModelCatalog, s as resolveProviderConfigForModel, t as getProviderConfig, u as getProviderModelConfig, v as IMAGE_PROVIDER_PRIORITY, x as getModelsDevModelMaxOutputTokens, y as getDefaultImageModel } from "./config-BRBygEXH.js";
+import { $ as buildCodexRequestHeaders, B as getXaiAccessToken, C as copilotHeaders, D as prepareForCompact, E as isOpencodeOauthApp, F as compactTextOnlyGuard, I as createAuthMiddleware, J as readGitHubTokenFromEnv, L as getConfiguredAdminApiKeys, M as compactMessageSections, O as prepareInteractionHeaders, P as compactSystemPromptStarts, Q as CODEX_API_BASE_URL, S as copilotBaseUrl, T as copilotWebSocketHeaders, U as readXaiCredentials, Y as XAI_API_BASE_URL, _ as isAsyncIterable, at as setPluginRequestActualModel, b as parseUserIdMetadata, ct as createResponsesSafeStream, d as generateRequestIdFromPayload, dt as createPooledWebSocketStream, et as forwardCodexResponses, f as getPromptCacheKey, ft as createWebSocketUrl, g as getUUID, h as getSessionAffinityFromHeaders, it as resolveTraceId$1, j as compactAutoContinuePromptStarts, k as prepareMessageProxyHeaders, lt as encodePoolKeyPart, m as getRootSessionIdFromHeaders, mt as stripInternalRequestHeaders, n as invalidateCodexRuntime, nt as generateTraceId, ot as fetchUpstreamWithLifecycle, p as getRootSessionId, q as readGitHubToken, rt as requestContext, s as setupCodexToken, st as createResponsesHttpEventStream, tt as formatPluginActualModel, u as stopCopilotRefreshLoop, ut as getResponsesStreamTerminalDisposition, v as isNullish, x as getCopilotUsage, y as isResponsesStream } from "./token-CMboJXYu.js";
 import { a as isDeferredToolName, c as parseMcpToolSearchSentinel, d as shouldEnableResponsesToolSearch, i as isBridgeToolSearchName, l as resolveBridgeToolSearchName, o as listDeferredToolNames, r as formatToolSearchBridgeArguments, s as normalizeToolSearchBridgeArguments, t as BRIDGE_TOOL_SEARCH_NAME, u as selectDeferredToolsByNames } from "./tool-search-DzipwtCX.js";
-import { n as isProviderAgentModelVisible, t as getProviderAgentModels } from "./provider-management-C6ZgkTJ7.js";
-import { i as registerProcessCleanup, n as stopModelsRefreshLoop, r as EventBus, t as setupCopilotRuntime } from "./copilot-runtime-DNKNavLK.js";
+import { n as isProviderAgentModelVisible, t as getProviderAgentModels } from "./provider-management-BDXwU7oJ.js";
+import { i as registerProcessCleanup, n as stopModelsRefreshLoop, r as EventBus, t as setupCopilotRuntime } from "./copilot-runtime-D--d2K7y.js";
 import consola from "consola";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
 import fs, { createReadStream, createWriteStream, readFileSync, rmSync } from "node:fs";
@@ -18,12 +18,12 @@ import { cors } from "hono/cors";
 import { logger } from "hono/logger";
 import util from "node:util";
 import { streamSSE } from "hono/streaming";
-import { Busboy } from "@fastify/busboy";
-import { Readable, Transform } from "node:stream";
-import { pipeline } from "node:stream/promises";
 import { none } from "stream-chain/core";
 import { jsonParser } from "stream-json/core/parser.js";
 import stringer from "stream-json/core/stringer.js";
+import { Busboy } from "@fastify/busboy";
+import { Readable, Transform } from "node:stream";
+import { pipeline } from "node:stream/promises";
 import { decompress } from "fzstd";
 // src/lib/trace.ts
 const traceIdMiddleware = async (c, next) => {
@@ -3566,1170 +3566,1188 @@ embeddingRoutes.post("/", async (c) => {
 		return await forwardError(c, error);
 	}
 });
-// src/routes/images/temp-form-data.ts
-const logger$16 = createHandlerLogger("images-temp-form-data");
-const multipartStagingDependencies = { createWriteStream };
-/**
-* Matches the images forwarding timeouts: an upstream upload may take that
-* long, so staged files must survive at least the whole forwarding window.
-*/
-const STAGED_FILES_TTL_MS = 9e5;
-const DEFAULT_MULTIPART_STAGING_LIMITS = {
-	maxBodySizeBytes: 134217728,
-	maxFieldSizeBytes: 10485760,
-	maxFields: 64,
-	maxFileSizeBytes: 67108864,
-	maxFiles: 16,
-	maxParts: 80
-};
-var InvalidMultipartBodyError = class extends Error {
-	constructor(options) {
-		super("Invalid multipart form data body", options);
-		this.name = "InvalidMultipartBodyError";
-	}
-};
-var MultipartBodyTooLargeError = class extends Error {
-	constructor() {
-		super("Multipart form data body exceeds the configured upload limits");
-		this.name = "MultipartBodyTooLargeError";
-	}
-};
-function sanitizeFileName(name) {
-	return name.split(/[\\/]/).pop()?.replaceAll("\0", "") || "file";
-}
-async function createDiskBackedBlob(filePath, type) {
-	if (typeof Bun !== "undefined") return Bun.file(filePath, { type });
-	const { openAsBlob } = await import("node:fs");
-	return await openAsBlob(filePath, { type });
-}
-function toError(error) {
-	return error instanceof Error ? error : new Error(String(error));
+// src/lib/image-json-files.ts
+const IMAGE_JSON_MAX_BYTES = 536870912;
+function imageJsonLimitError() {
+	return new HTTPError("Image JSON upload exceeds the staging limit", Response.json({ error: {
+		message: "Image JSON upload exceeds the staging limit",
+		type: "invalid_request_error"
+	} }, { status: 413 }));
 }
-function parseMultipartBody(body, contentType, directory, entries, limits, signal) {
-	return new Promise((resolve, reject) => {
-		let busboy;
-		try {
-			busboy = new Busboy({
-				headers: { "content-type": contentType },
-				limits: {
-					fieldSize: limits.maxFieldSizeBytes,
-					fields: limits.maxFields,
-					fileSize: limits.maxFileSizeBytes,
-					files: limits.maxFiles,
-					parts: limits.maxParts
-				}
-			});
-		} catch (error) {
-			reject(new InvalidMultipartBodyError({ cause: toError(error) }));
-			return;
-		}
-		const pendingWrites = [];
-		const activeFileStreams = /* @__PURE__ */ new Set();
-		const source = body === null ? Readable.from([]) : Readable.fromWeb(body);
-		let bodySizeBytes = 0;
-		const bodyLimiter = new Transform({ transform(chunk, _encoding, callback) {
-			bodySizeBytes += chunk.byteLength;
-			if (bodySizeBytes > limits.maxBodySizeBytes) {
-				callback(new MultipartBodyTooLargeError());
-				return;
-			}
-			callback(null, chunk);
-		} });
-		let fileIndex = 0;
-		let failure = null;
-		let inputPipeline = null;
-		let settled = false;
-		const settleStreams = () => Promise.allSettled([...inputPipeline ? [inputPipeline] : [], ...pendingWrites]);
-		const fail = (error) => {
-			if (failure || settled) return;
-			const failureError = toError(error);
-			failure = failureError;
-			source.destroy(failureError);
-			bodyLimiter.destroy(failureError);
-			busboy.destroy(failureError);
-			for (const stream of activeFileStreams) stream.destroy(failureError);
-			settleStreams().then(() => {
-				if (settled) return;
-				settled = true;
-				reject(failureError);
-			});
-		};
-		const failLimit = () => fail(new MultipartBodyTooLargeError());
-		busboy.on("field", (name, value, nameTruncated, valueTruncated) => {
-			if (nameTruncated || valueTruncated) {
-				failLimit();
-				return;
-			}
-			entries.push({
-				kind: "field",
-				name,
-				value
-			});
-		});
-		busboy.on("file", (name, stream, fileName, _transferEncoding, mimeType) => {
-			if (failure) {
-				stream.resume();
-				return;
-			}
-			const filePath = join(directory, `${fileIndex}.upload`);
-			fileIndex += 1;
-			entries.push({
-				fileName: sanitizeFileName(fileName),
-				filePath,
-				kind: "file",
-				mimeType,
-				name
-			});
-			activeFileStreams.add(stream);
-			stream.once("error", fail);
-			stream.once("close", () => activeFileStreams.delete(stream));
-			stream.once("limit", failLimit);
-			try {
-				const write = pipeline(stream, multipartStagingDependencies.createWriteStream(filePath));
-				pendingWrites.push(write);
-				write.catch(fail);
-			} catch (error) {
-				fail(error);
-			}
-		});
-		busboy.on("fieldsLimit", failLimit);
-		busboy.on("filesLimit", failLimit);
-		busboy.on("partsLimit", failLimit);
-		inputPipeline = pipeline(source, bodyLimiter, busboy, { signal });
-		inputPipeline.then(() => {
-			Promise.allSettled(pendingWrites).then((results) => {
-				if (failure || settled) return;
-				const failed = results.find((result) => result.status === "rejected");
-				if (failed) fail(failed.reason);
-				else {
-					settled = true;
-					resolve();
-				}
-			});
-		}, (error) => {
-			fail(error instanceof MultipartBodyTooLargeError || signal?.aborted ? error : new InvalidMultipartBodyError({ cause: toError(error) }));
+/** Owns only an mkdtemp-created directory; callers never supply deletion paths. */
+async function createImageJsonFiles(ttlMs = 9e5) {
+	const directory = await mkdtemp(join(tmpdir(), "copilot-image-json-"));
+	let index = 0;
+	let timer;
+	let cleanupPromise;
+	const unregister = registerProcessCleanup(() => {
+		if (timer) clearTimeout(timer);
+		rmSync(directory, {
+			recursive: true,
+			force: true
 		});
 	});
-}
-function resolveStagingLimits(overrides) {
-	const limits = {
-		...DEFAULT_MULTIPART_STAGING_LIMITS,
-		...overrides
-	};
-	for (const [name, value] of Object.entries(limits)) if (!Number.isSafeInteger(value) || value <= 0) throw new RangeError(`${name} must be a positive safe integer`);
-	return limits;
-}
-/**
-* Streams a multipart request body through the parser, writing every file
-* part to a temporary directory as it arrives and rebuilding the form data
-* with disk-backed blobs, so forwarding streams payloads from disk instead
-* of pinning the whole upload in memory.
-*/
-async function stageMultipartBodyToDisk(body, contentType, limitOverrides = {}, signal) {
-	signal?.throwIfAborted();
-	const limits = resolveStagingLimits(limitOverrides);
-	const directory = await mkdtemp(join(tmpdir(), "copilot-api-images-"));
-	const entries = [];
-	try {
-		await parseMultipartBody(body, contentType, directory, entries, limits, signal);
-	} catch (error) {
-		await rm(directory, {
-			force: true,
-			recursive: true
-		});
-		throw error;
-	}
-	const stagedFormData = new FormData();
-	try {
-		for (const entry of entries) if (entry.kind === "field") stagedFormData.append(entry.name, entry.value);
-		else stagedFormData.append(entry.name, await createDiskBackedBlob(entry.filePath, entry.mimeType), entry.fileName);
-	} catch (error) {
-		await rm(directory, {
-			force: true,
-			recursive: true
-		});
-		throw error;
-	}
-	let cleanupPromise = null;
-	let cleanupTimer = null;
-	let unregisterProcessCleanup = null;
 	const cleanup = () => {
 		cleanupPromise ??= (async () => {
-			if (cleanupTimer) {
-				clearTimeout(cleanupTimer);
-				cleanupTimer = null;
-			}
-			try {
-				await rm(directory, {
-					force: true,
-					recursive: true
-				});
-			} catch (error) {
-				logger$16.warn("Failed to remove staged images temp directory", {
-					directory,
-					error
-				});
-			} finally {
-				unregisterProcessCleanup?.();
-				unregisterProcessCleanup = null;
-			}
+			if (timer) clearTimeout(timer);
+			await rm(directory, {
+				recursive: true,
+				force: true,
+				maxRetries: 3,
+				retryDelay: 20
+			});
+			unregister();
 		})();
 		return cleanupPromise;
 	};
-	unregisterProcessCleanup = registerProcessCleanup(() => {
-		if (cleanupTimer) {
-			clearTimeout(cleanupTimer);
-			cleanupTimer = null;
-		}
-		try {
-			rmSync(directory, {
-				force: true,
-				recursive: true
-			});
-		} catch (error) {
-			logger$16.warn("Failed to remove staged images temp directory on exit", {
-				directory,
-				error
-			});
-		} finally {
-			unregisterProcessCleanup?.();
-			unregisterProcessCleanup = null;
-		}
-	});
 	return {
 		directory,
-		formData: stagedFormData,
 		cleanup,
-		scheduleCleanup: () => {
-			if (cleanupPromise || cleanupTimer) return;
-			cleanupTimer = setTimeout(() => void cleanup(), STAGED_FILES_TTL_MS);
-			cleanupTimer.unref();
+		scheduleCleanup() {
+			if (timer || cleanupPromise) return;
+			timer = setTimeout(() => void cleanup().catch(() => {}), ttlMs);
+			timer.unref();
+		},
+		async create() {
+			const path = join(directory, String(index++));
+			return {
+				path,
+				handle: await open(path, "wx")
+			};
 		}
 	};
 }
-// src/services/xai/images.ts
-const XAI_ASPECT_RATIOS = [
-	{
-		label: "1:1",
-		width: 1,
-		height: 1
-	},
-	{
-		label: "16:9",
-		width: 16,
-		height: 9
-	},
-	{
-		label: "9:16",
-		width: 9,
-		height: 16
-	},
-	{
-		label: "4:3",
-		width: 4,
-		height: 3
-	},
-	{
-		label: "3:4",
-		width: 3,
-		height: 4
-	},
-	{
-		label: "3:2",
-		width: 3,
-		height: 2
-	},
-	{
-		label: "2:3",
-		width: 2,
-		height: 3
-	},
-	{
-		label: "2:1",
-		width: 2,
-		height: 1
-	},
-	{
-		label: "1:2",
-		width: 1,
-		height: 2
-	},
-	{
-		label: "19.5:9",
-		width: 19.5,
-		height: 9
-	},
-	{
-		label: "9:19.5",
-		width: 9,
-		height: 19.5
-	},
-	{
-		label: "20:9",
-		width: 20,
-		height: 9
-	},
-	{
-		label: "9:20",
-		width: 9,
-		height: 20
+async function* readImageJsonFile(path, signal) {
+	const stream = createReadStream(path, {
+		highWaterMark: 65536,
+		signal
+	});
+	try {
+		for await (const bytes of stream) yield bytes;
+	} finally {
+		stream.destroy();
 	}
-];
-const XAI_ASPECT_RATIO_LABELS = /* @__PURE__ */ new Set([...XAI_ASPECT_RATIOS.map((ratio) => ratio.label), "auto"]);
-const XAI_RESPONSE_FORMATS = /* @__PURE__ */ new Set(["url", "b64_json"]);
-const XAI_RESOLUTIONS = /* @__PURE__ */ new Set(["1k", "2k"]);
-const MAX_EDIT_IMAGES = 5;
-const MAX_IMAGE_COUNT = 10;
-const HIGH_RESOLUTION_EDGE = 1536;
-var XaiImagesRequestError = class extends Error {
-	constructor(message) {
-		super(message);
-		this.name = "XaiImagesRequestError";
+}
+// src/lib/streaming-json.ts
+const JSON_CHUNK_BYTES = 65536;
+/** Never ask the tokenizer to accumulate untrusted strings, keys, or numbers. */
+var StreamingJsonReader = class {
+	decode = new TextDecoder("utf-8", { fatal: true });
+	parse = jsonParser({ packValues: false });
+	depth = 0;
+	scalarLength = 0;
+	boundedScalar = false;
+	read(bytes) {
+		const text = this.decode.decode(bytes, { stream: bytes !== void 0 });
+		const result = this.parse(text);
+		const tokens = result === none ? [] : result.values;
+		if (bytes === void 0) {
+			const last = this.parse(none);
+			if (last !== none) tokens.push(...last.values);
+		}
+		for (const token of tokens) switch (token.name) {
+			case "startObject":
+			case "startArray":
+				if (++this.depth > 64) throw new SyntaxError("JSON nesting exceeds 64");
+				break;
+			case "endObject":
+			case "endArray":
+				this.depth--;
+				break;
+			case "startKey":
+			case "startNumber":
+				this.scalarLength = 0;
+				this.boundedScalar = true;
+				break;
+			case "endKey":
+			case "endNumber":
+				this.boundedScalar = false;
+				break;
+			case "stringChunk":
+			case "numberChunk": if (this.boundedScalar) {
+				this.scalarLength += token.value.length;
+				if (this.scalarLength > 65536) throw new SyntaxError("JSON key or number is too large");
+			}
+		}
+		return tokens;
 	}
 };
-function isRecord$5(value) {
-	return value !== null && typeof value === "object" && !Array.isArray(value);
-}
-function readPrompt(value) {
-	if (typeof value !== "string" || value.trim() === "") throw new XaiImagesRequestError("prompt is required");
-	return value;
-}
-function assertNotStreaming(value) {
-	if (value === true || value === "true") throw new XaiImagesRequestError("xAI image requests do not support streaming");
-}
-function readCount(value) {
-	if (value === void 0 || value === null) return void 0;
-	const parsed = typeof value === "number" ? value : typeof value === "string" ? Number(value.trim()) : NaN;
-	if (!Number.isInteger(parsed) || parsed < 1 || parsed > MAX_IMAGE_COUNT) throw new XaiImagesRequestError(`n must be an integer from 1 to ${MAX_IMAGE_COUNT}`);
-	return parsed;
-}
-function readQuality(value) {
-	if (typeof value !== "string") return void 0;
-	switch (value.trim().toLowerCase()) {
-		case "low": return "low";
-		case "medium":
-		case "standard":
-		case "high":
-		case "hd": return "medium";
-		case "auto": return "auto";
-		default: return;
+/** Splitting also bounds tokenizer allocations when a runtime supplies a huge chunk. */
+async function* readJsonBytes(body, signal) {
+	if (!body) return;
+	const reader = body.getReader();
+	const abort = () => void reader.cancel(signal?.reason).catch(() => {});
+	signal?.addEventListener("abort", abort, { once: true });
+	let complete = false;
+	try {
+		while (true) {
+			signal?.throwIfAborted();
+			const { done, value } = await reader.read();
+			signal?.throwIfAborted();
+			if (done) {
+				complete = true;
+				return;
+			}
+			for (let offset = 0; offset < value.byteLength; offset += JSON_CHUNK_BYTES) yield value.subarray(offset, offset + JSON_CHUNK_BYTES);
+		}
+	} finally {
+		signal?.removeEventListener("abort", abort);
+		if (!complete) await reader.cancel().catch(() => {});
+		reader.releaseLock();
 	}
 }
-function readChoice(value, allowed, name, normalize = (item) => item) {
-	if (value === void 0 || value === null) return void 0;
-	if (typeof value !== "string") throw new XaiImagesRequestError(`${name} is invalid`);
-	const trimmed = value.trim();
-	if (!trimmed) return void 0;
-	const normalized = normalize(trimmed);
-	if (!allowed.has(normalized)) throw new XaiImagesRequestError(`${name} must be one of ${Array.from(allowed).join(", ")}`);
-	return normalized;
-}
-function readAspectRatio(value) {
-	if (value === void 0) return void 0;
-	if (typeof value !== "string") throw new XaiImagesRequestError("aspect_ratio is invalid");
-	const trimmed = value.trim();
-	if (!trimmed) return void 0;
-	const normalized = trimmed.toLowerCase() === "auto" ? "auto" : trimmed;
-	if (!XAI_ASPECT_RATIO_LABELS.has(normalized)) throw new XaiImagesRequestError("aspect_ratio must be a supported xAI ratio such as 1:1, 16:9, 9:16, or auto");
-	return normalized;
-}
-function readSize(value) {
-	if (typeof value !== "string") return void 0;
-	const trimmed = value.trim().toLowerCase();
-	if (!trimmed) return void 0;
-	if (trimmed === "auto") return "auto";
-	const match = /^(\d+)x(\d+)$/u.exec(trimmed);
-	if (!match?.[1] || !match[2]) return void 0;
-	const width = Number(match[1]);
-	const height = Number(match[2]);
-	if (!Number.isSafeInteger(width) || !Number.isSafeInteger(height) || width <= 0 || height <= 0) return;
+function createJsonByteSource(body, signal) {
+	const controller = new AbortController();
+	const bytes = readJsonBytes(body, AbortSignal.any([signal, controller.signal]));
 	return {
-		height,
-		width
-	};
-}
-function aspectRatioFromSize(size) {
-	if (!size) return void 0;
-	if (size === "auto") return "auto";
-	let best = XAI_ASPECT_RATIOS[0].label;
-	let bestDistance = Number.POSITIVE_INFINITY;
-	const ratio = Math.log(size.width / size.height);
-	for (const candidate of XAI_ASPECT_RATIOS) {
-		const distance = Math.abs(ratio - Math.log(candidate.width / candidate.height));
-		if (distance < bestDistance) {
-			best = candidate.label;
-			bestDistance = distance;
+		bytes,
+		async cancel(reason) {
+			controller.abort(reason);
+			await bytes.return(void 0).catch(() => {});
+			if (body && !body.locked) await body.cancel(reason).catch(() => {});
 		}
-	}
-	return best;
-}
-function resolutionFromSize(size) {
-	if (!size || size === "auto") return void 0;
-	return Math.max(size.width, size.height) >= HIGH_RESOLUTION_EDGE ? "2k" : "1k";
+	};
 }
-function applyCommonImageFields(target, source) {
-	assertNotStreaming(source.stream);
-	const count = readCount(source.n);
-	const quality = readQuality(source.quality);
-	const responseFormat = readChoice(source.response_format, XAI_RESPONSE_FORMATS, "response_format");
-	const aspectRatio = readAspectRatio(source.aspect_ratio) ?? aspectRatioFromSize(readSize(source.size));
-	const resolution = readChoice(source.resolution, XAI_RESOLUTIONS, "resolution", (value) => value.toLowerCase()) ?? resolutionFromSize(readSize(source.size));
-	if (count !== void 0) target.n = count;
-	if (quality && target.model === "grok-imagine-image-2.0") target.quality = quality;
-	target.response_format = responseFormat ?? "b64_json";
-	if (aspectRatio) target.aspect_ratio = aspectRatio;
-	if (resolution) target.resolution = resolution;
-}
-function normalizeImageUrl(value) {
-	const trimmed = value.trim();
-	if (/^https?:\/\//iu.test(trimmed) || /^data:image\/[a-z0-9.+-]+;base64,/iu.test(trimmed)) return trimmed;
-	throw new XaiImagesRequestError("image must be an http(s) URL or a base64 data URL");
-}
-function base64ToDataUrl(value, mime) {
-	const compact = value.trim().replaceAll(/\s+/gu, "");
-	if (compact.startsWith("data:image/")) return normalizeImageUrl(compact);
-	if (!/^[a-z0-9+/]+={0,2}$/iu.test(compact)) throw new XaiImagesRequestError("image b64_json is not valid base64");
-	return `data:${typeof mime === "string" && mime.trim().toLowerCase().startsWith("image/") ? mime.trim().toLowerCase() : "image/png"};base64,${compact}`;
+/** Lazy streams allow a route to choose the original or rebuilt body without teeing. */
+function jsonByteStream(iterator, cancel) {
+	return new ReadableStream({
+		async pull(controller) {
+			try {
+				const { done, value } = await iterator.next();
+				if (done) controller.close();
+				else controller.enqueue(value);
+			} catch (error) {
+				controller.error(error);
+				await iterator.return(void 0).catch(() => {});
+			}
+		},
+		async cancel(reason) {
+			await cancel?.(reason);
+			await iterator.return(void 0);
+		}
+	}, { highWaterMark: 0 });
 }
-function readImageReference(value) {
-	if (typeof value === "string") return {
-		type: "image_url",
-		url: normalizeImageUrl(value)
-	};
-	if (!isRecord$5(value)) throw new XaiImagesRequestError("image must be a URL or an image object");
-	if (typeof value.url === "string") return {
-		type: "image_url",
-		url: normalizeImageUrl(value.url)
-	};
-	if (typeof value.image_url === "string") return {
-		type: "image_url",
-		url: normalizeImageUrl(value.image_url)
-	};
-	if (typeof value.b64_json === "string") return {
-		type: "image_url",
-		url: base64ToDataUrl(value.b64_json, value.mime_type ?? value.media_type)
+var DuplicateImageModelError = class extends SyntaxError {
+	constructor() {
+		super("Duplicate top-level image model");
+	}
+};
+/** Keeps only the top-level model; all image string chunks are discarded. */
+var ImageModelReader = class {
+	model;
+	object = false;
+	complete = false;
+	invalidModel = false;
+	depth = 0;
+	key = "";
+	inKey = false;
+	readingModel = false;
+	modelText = "";
+	seenModel = false;
+	read(tokens) {
+		for (const token of tokens) {
+			if (token.name === "startKey") {
+				this.inKey = true;
+				this.key = "";
+			} else if (token.name === "endKey") {
+				this.inKey = false;
+				if (this.depth === 1 && this.key === "model") {
+					if (this.seenModel) throw new DuplicateImageModelError();
+					this.seenModel = true;
+				}
+			} else if (token.name === "stringChunk") {
+				if (this.inKey) this.key += token.value;
+				else if (this.readingModel) {
+					this.modelText += token.value;
+					if (this.modelText.length > 4096) {
+						this.invalidModel = true;
+						this.readingModel = false;
+						this.modelText = "";
+					}
+				}
+			} else if (token.name === "startString") this.readingModel = this.depth === 1 && this.key === "model";
+			else if (token.name === "endString") {
+				if (this.readingModel) {
+					this.model = this.modelText;
+					this.modelText = "";
+					this.readingModel = false;
+				}
+			} else if (this.depth === 1 && this.key === "model" && [
+				"startObject",
+				"startArray",
+				"startNumber",
+				"nullValue",
+				"trueValue",
+				"falseValue"
+			].includes(token.name)) this.invalidModel = true;
+			if (token.name === "startObject" || token.name === "startArray") {
+				if (this.depth === 0) this.object = token.name === "startObject";
+				this.depth++;
+			} else if (token.name === "endObject" || token.name === "endArray") {
+				if (--this.depth === 0) this.complete = true;
+			}
+		}
+	}
+};
+/** Re-encodes bounded chunks, replacing or inserting the top-level model. */
+async function* rewriteImageModel(input, model, insertModel = false) {
+	const parser = new StreamingJsonReader();
+	const encode = new TextEncoder();
+	const stringify = stringer();
+	let depth = 0;
+	let key = "";
+	let inKey = false;
+	let replacing = false;
+	const process = (tokens) => {
+		const parts = [];
+		const emit = (token) => {
+			const text = stringify(token);
+			if (text !== none) parts.push(text);
+		};
+		for (const token of tokens) {
+			if (insertModel && depth === 0 && token.name === "startObject") {
+				emit(token);
+				emit({ name: "startKey" });
+				emit({
+					name: "stringChunk",
+					value: "model"
+				});
+				emit({ name: "endKey" });
+				emit({ name: "startString" });
+				emit({
+					name: "stringChunk",
+					value: model
+				});
+				emit({ name: "endString" });
+				depth++;
+				continue;
+			}
+			if (replacing) {
+				if (token.name === "endString") replacing = false;
+				continue;
+			}
+			if (token.name === "startKey") {
+				inKey = true;
+				key = "";
+			} else if (token.name === "endKey") inKey = false;
+			else if (token.name === "stringChunk" && inKey) key += token.value;
+			if (token.name === "startString" && depth === 1 && key === "model") {
+				emit(token);
+				emit({
+					name: "stringChunk",
+					value: model
+				});
+				emit({ name: "endString" });
+				replacing = true;
+				continue;
+			}
+			emit(token);
+			if (token.name === "startObject" || token.name === "startArray") depth++;
+			else if (token.name === "endObject" || token.name === "endArray") depth--;
+		}
+		return encode.encode(parts.join(""));
 	};
-	if (value.file_id !== void 0) throw new XaiImagesRequestError("file_id is not supported for xAI image edits; provide an image_url instead");
-	throw new XaiImagesRequestError("image must include a url, image_url, or b64_json");
+	for await (const bytes of input) yield process(parser.read(bytes));
+	const tail = process(parser.read());
+	if (tail.byteLength) yield tail;
 }
-function collectJsonImages(payload) {
-	const values = [];
-	if (isUnknownArray(payload.image)) values.push(...payload.image);
-	else if (payload.image !== void 0) values.push(payload.image);
-	if (isUnknownArray(payload.images)) values.push(...payload.images);
-	if (payload.image_url !== void 0) values.push(payload.image_url);
-	return values;
+// src/lib/image-json-request.ts
+function invalidImageJson(message = "Image request body must be a JSON object") {
+	return new HTTPError(message, Response.json({ error: {
+		message,
+		type: "invalid_request_error"
+	} }, { status: 400 }));
 }
-function isUnknownArray(value) {
-	return Array.isArray(value);
+function rebuild(request, body, changed = false) {
+	const headers = new Headers(request.headers);
+	if (changed) headers.delete("content-length");
+	return new Request(request.url, {
+		method: request.method,
+		headers,
+		body,
+		signal: request.signal,
+		duplex: "half"
+	});
 }
-function buildEditPayload(model, prompt, images, source) {
-	if (source.mask !== void 0) throw new XaiImagesRequestError("xAI image edits do not support mask");
-	if (images.length === 0) throw new XaiImagesRequestError("image is required");
-	if (images.length > MAX_EDIT_IMAGES) throw new XaiImagesRequestError(`xAI image edits accept at most ${MAX_EDIT_IMAGES} images`);
-	const payload = {
-		model,
-		prompt
+/** Read at most 64 KiB before forwarding a model-first request. Late models use disk. */
+async function prepareImageJsonRequest(request, maxStagedBytes = IMAGE_JSON_MAX_BYTES) {
+	const forwardingAbort = new AbortController();
+	const signal = AbortSignal.any([request.signal, forwardingAbort.signal]);
+	const input = createJsonByteSource(request.body, signal);
+	const bytes = input.bytes;
+	const parser = new StreamingJsonReader();
+	const metadata = new ImageModelReader();
+	const scan = (chunk) => {
+		try {
+			metadata.read(parser.read(chunk));
+		} catch (error) {
+			throw invalidImageJson(error instanceof DuplicateImageModelError ? error.message : void 0);
+		}
+		if (metadata.invalidModel) throw invalidImageJson("Image model must be a string of at most 4096 characters");
+	};
+	const prefix = [];
+	let length = 0;
+	let eof = false;
+	let pending;
+	async function* remaining() {
+		if (pending) {
+			const chunk = pending;
+			pending = void 0;
+			yield chunk;
+		}
+		yield* bytes;
+	}
+	let files;
+	let stagedPath;
+	try {
+		while (length < JSON_CHUNK_BYTES) {
+			const next = await bytes.next();
+			if (next.done) {
+				eof = true;
+				scan();
+				break;
+			}
+			const chunk = next.value.subarray(0, JSON_CHUNK_BYTES - length);
+			pending = chunk.byteLength < next.value.byteLength ? next.value.subarray(chunk.byteLength) : void 0;
+			prefix.push(chunk);
+			length += chunk.byteLength;
+			scan(chunk);
+			if (metadata.model !== void 0 || metadata.complete) break;
+		}
+		if (!eof && !metadata.complete && metadata.model === void 0) {
+			files = await createImageJsonFiles();
+			const file = await files.create();
+			stagedPath = file.path;
+			try {
+				for (const chunk of prefix) {
+					if (length > maxStagedBytes) throw imageJsonLimitError();
+					await file.handle.writeFile(chunk);
+				}
+				prefix.length = 0;
+				for await (const chunk of remaining()) {
+					length += chunk.byteLength;
+					if (length > maxStagedBytes) throw imageJsonLimitError();
+					scan(chunk);
+					await file.handle.writeFile(chunk);
+				}
+				eof = true;
+				scan();
+			} finally {
+				await file.handle.close();
+			}
+			files.scheduleCleanup();
+		}
+		if (!metadata.object) throw invalidImageJson();
+	} catch (error) {
+		await input.cancel(error);
+		await files?.cleanup();
+		throw error;
+	}
+	let claimed = false;
+	const abort = () => {
+		input.cancel().catch(() => {});
+		files?.cleanup().catch(() => {});
+	};
+	request.signal.addEventListener("abort", abort, { once: true });
+	async function* source() {
+		if (claimed) throw new Error("Image request body already forwarded");
+		claimed = true;
+		try {
+			signal.throwIfAborted();
+			if (stagedPath) yield* readImageJsonFile(stagedPath, signal);
+			else {
+				yield* prefix;
+				prefix.length = 0;
+				if (!eof) {
+					for await (const chunk of remaining()) {
+						scan(chunk);
+						yield chunk;
+					}
+					scan();
+				}
+			}
+		} finally {
+			request.signal.removeEventListener("abort", abort);
+			await bytes.return(void 0).catch(() => {});
+			await files?.cleanup();
+		}
+	}
+	const cancel = async (reason) => {
+		forwardingAbort.abort(reason);
+		request.signal.removeEventListener("abort", abort);
+		await input.cancel(reason);
+		await files?.cleanup();
 	};
-	applyCommonImageFields(payload, source);
-	if (images.length === 1) payload.image = images[0];
-	else payload.images = images;
-	return payload;
-}
-/**
-* Translates an OpenAI image generation body into an xAI Imagine generation
-* request. The configured model replaces the client model.
-*/
-function translateXaiImageGeneration(payload, model) {
-	if (!isRecord$5(payload)) throw new XaiImagesRequestError("Image generation body must be a JSON object");
-	const translated = {
-		model,
-		prompt: readPrompt(payload.prompt)
+	return {
+		model: metadata.model,
+		originalRequest: rebuild(request, jsonByteStream(source(), cancel)),
+		createRequest: (model) => rebuild(request, jsonByteStream(rewriteImageModel(source(), model, metadata.model === void 0), cancel), true),
+		cleanup: cancel,
+		stagedDirectory: files?.directory
 	};
-	applyCommonImageFields(translated, payload);
-	return translated;
 }
+// src/routes/images/temp-form-data.ts
+const logger$16 = createHandlerLogger("images-temp-form-data");
+const multipartStagingDependencies = { createWriteStream };
 /**
-* Translates an OpenAI JSON image edit body into an xAI Imagine edit request.
+* Matches the images forwarding timeouts: an upstream upload may take that
+* long, so staged files must survive at least the whole forwarding window.
 */
-function translateXaiImageEditJson(payload, model) {
-	if (!isRecord$5(payload)) throw new XaiImagesRequestError("Image edit body must be a JSON object");
-	return buildEditPayload(model, readPrompt(payload.prompt), collectJsonImages(payload).map((image) => readImageReference(image)), payload);
-}
-const MAX_RESPONSE_IMAGE_BYTES = 33554432;
-function responseHasB64Json(value) {
-	return typeof value === "string" && value.trim() !== "";
-}
-function imageCreatedTimestamp(value) {
-	if (typeof value === "number" && Number.isFinite(value) && value > 0) return Math.trunc(value);
-	return Math.floor(Date.now() / 1e3);
-}
-function trustedImageUrl(value) {
-	if (typeof value !== "string" || !value.trim()) return null;
-	try {
-		const url = new URL(value.trim());
-		if (url.protocol !== "https:" || url.hostname !== "imgen.x.ai" || url.port || url.username || url.password) return null;
-		return url.toString();
-	} catch {
-		return null;
-	}
-}
-async function readImageBytes(response) {
-	const declaredLength = Number(response.headers.get("content-length"));
-	if (Number.isFinite(declaredLength) && declaredLength > MAX_RESPONSE_IMAGE_BYTES) {
-		await response.body?.cancel().catch(() => {});
-		return null;
+const STAGED_FILES_TTL_MS = 9e5;
+const DEFAULT_MULTIPART_STAGING_LIMITS = {
+	maxBodySizeBytes: 134217728,
+	maxFieldSizeBytes: 10485760,
+	maxFields: 64,
+	maxFileSizeBytes: 67108864,
+	maxFiles: 16,
+	maxParts: 80
+};
+var InvalidMultipartBodyError = class extends Error {
+	constructor(options) {
+		super("Invalid multipart form data body", options);
+		this.name = "InvalidMultipartBodyError";
 	}
-	if (!response.body) return null;
-	const reader = response.body.getReader();
-	const chunks = [];
-	let length = 0;
-	let complete = false;
-	try {
-		while (true) {
-			const { done, value } = await reader.read();
-			if (done) {
-				complete = true;
-				return length > 0 ? Buffer.concat(chunks, length) : null;
-			}
-			length += value.byteLength;
-			if (length > MAX_RESPONSE_IMAGE_BYTES) return null;
-			chunks.push(value);
-		}
-	} finally {
-		if (!complete) await reader.cancel().catch(() => {});
-		reader.releaseLock();
+};
+var MultipartBodyTooLargeError = class extends Error {
+	constructor() {
+		super("Multipart form data body exceeds the configured upload limits");
+		this.name = "MultipartBodyTooLargeError";
 	}
+};
+function sanitizeFileName(name) {
+	return name.split(/[\\/]/).pop()?.replaceAll("\0", "") || "file";
 }
-function imageDownloadErrorResponse() {
-	return Response.json({ error: {
-		message: "Failed to retrieve xAI image output as b64_json",
-		type: "upstream_error"
-	} }, { status: 502 });
+async function createDiskBackedBlob(filePath, type) {
+	if (typeof Bun !== "undefined") return Bun.file(filePath, { type });
+	const { openAsBlob } = await import("node:fs");
+	return await openAsBlob(filePath, { type });
 }
-function imageOutputUrlForLog(value) {
-	if (typeof value !== "string" || !value.trim()) return null;
-	try {
-		const url = new URL(value.trim());
-		if (url.protocol !== "https:" && url.protocol !== "http:") return null;
-		url.username = "";
-		url.password = "";
-		for (const key of url.searchParams.keys()) if (/token|secret|signature|credential|password|authorization|api[_-]?key|^key$|^sig$/iu.test(key)) url.searchParams.set(key, "[REDACTED]");
-		return url.toString();
-	} catch {
-		return null;
-	}
+function toError(error) {
+	return error instanceof Error ? error : new Error(String(error));
 }
-function rebuildJsonResponse(response, body) {
-	const headers = new Headers(response.headers);
-	headers.delete("content-length");
-	if (!headers.get("content-type")) headers.set("content-type", "application/json");
-	return new Response(body, {
-		headers,
-		status: response.status,
-		statusText: response.statusText
+function parseMultipartBody(body, contentType, directory, entries, limits, signal) {
+	return new Promise((resolve, reject) => {
+		let busboy;
+		try {
+			busboy = new Busboy({
+				headers: { "content-type": contentType },
+				limits: {
+					fieldSize: limits.maxFieldSizeBytes,
+					fields: limits.maxFields,
+					fileSize: limits.maxFileSizeBytes,
+					files: limits.maxFiles,
+					parts: limits.maxParts
+				}
+			});
+		} catch (error) {
+			reject(new InvalidMultipartBodyError({ cause: toError(error) }));
+			return;
+		}
+		const pendingWrites = [];
+		const activeFileStreams = /* @__PURE__ */ new Set();
+		const source = body === null ? Readable.from([]) : Readable.fromWeb(body);
+		let bodySizeBytes = 0;
+		const bodyLimiter = new Transform({ transform(chunk, _encoding, callback) {
+			bodySizeBytes += chunk.byteLength;
+			if (bodySizeBytes > limits.maxBodySizeBytes) {
+				callback(new MultipartBodyTooLargeError());
+				return;
+			}
+			callback(null, chunk);
+		} });
+		let fileIndex = 0;
+		let failure = null;
+		let inputPipeline = null;
+		let settled = false;
+		const settleStreams = () => Promise.allSettled([...inputPipeline ? [inputPipeline] : [], ...pendingWrites]);
+		const fail = (error) => {
+			if (failure || settled) return;
+			const failureError = toError(error);
+			failure = failureError;
+			source.destroy(failureError);
+			bodyLimiter.destroy(failureError);
+			busboy.destroy(failureError);
+			for (const stream of activeFileStreams) stream.destroy(failureError);
+			settleStreams().then(() => {
+				if (settled) return;
+				settled = true;
+				reject(failureError);
+			});
+		};
+		const failLimit = () => fail(new MultipartBodyTooLargeError());
+		busboy.on("field", (name, value, nameTruncated, valueTruncated) => {
+			if (nameTruncated || valueTruncated) {
+				failLimit();
+				return;
+			}
+			entries.push({
+				kind: "field",
+				name,
+				value
+			});
+		});
+		busboy.on("file", (name, stream, fileName, _transferEncoding, mimeType) => {
+			if (failure) {
+				stream.resume();
+				return;
+			}
+			const filePath = join(directory, `${fileIndex}.upload`);
+			fileIndex += 1;
+			entries.push({
+				fileName: sanitizeFileName(fileName),
+				filePath,
+				kind: "file",
+				mimeType,
+				name
+			});
+			activeFileStreams.add(stream);
+			stream.once("error", fail);
+			stream.once("close", () => activeFileStreams.delete(stream));
+			stream.once("limit", failLimit);
+			try {
+				const write = pipeline(stream, multipartStagingDependencies.createWriteStream(filePath));
+				pendingWrites.push(write);
+				write.catch(fail);
+			} catch (error) {
+				fail(error);
+			}
+		});
+		busboy.on("fieldsLimit", failLimit);
+		busboy.on("filesLimit", failLimit);
+		busboy.on("partsLimit", failLimit);
+		inputPipeline = pipeline(source, bodyLimiter, busboy, { signal });
+		inputPipeline.then(() => {
+			Promise.allSettled(pendingWrites).then((results) => {
+				if (failure || settled) return;
+				const failed = results.find((result) => result.status === "rejected");
+				if (failed) fail(failed.reason);
+				else {
+					settled = true;
+					resolve();
+				}
+			});
+		}, (error) => {
+			fail(error instanceof MultipartBodyTooLargeError || signal?.aborted ? error : new InvalidMultipartBodyError({ cause: toError(error) }));
+		});
 	});
 }
+function resolveStagingLimits(overrides) {
+	const limits = {
+		...DEFAULT_MULTIPART_STAGING_LIMITS,
+		...overrides
+	};
+	for (const [name, value] of Object.entries(limits)) if (!Number.isSafeInteger(value) || value <= 0) throw new RangeError(`${name} must be a positive safe integer`);
+	return limits;
+}
 /**
-* Adapts an xAI image body to the OpenAI Images response.
-* Generation returns created: null, and edits omit created. OpenAI clients
-* require a unix timestamp. When b64_json is requested, a URL-only result
-* is downloaded from the xAI CDN with redirects disabled and a byte limit.
+* Streams a multipart request body through the parser, writing every file
+* part to a temporary directory as it arrives and rebuilding the form data
+* with disk-backed blobs, so forwarding streams payloads from disk instead
+* of pinning the whole upload in memory.
 */
-async function ensureImageResponseB64Json(response, fetchImage = globalThis.fetch, { clientSignal, onImageUrl, responseFormat = "b64_json" } = {}) {
-	if (!response.ok) return response;
-	clientSignal?.throwIfAborted();
-	const body = await response.text();
-	let payload;
+async function stageMultipartBodyToDisk(body, contentType, limitOverrides = {}, signal) {
+	signal?.throwIfAborted();
+	const limits = resolveStagingLimits(limitOverrides);
+	const directory = await mkdtemp(join(tmpdir(), "copilot-api-images-"));
+	const entries = [];
 	try {
-		payload = JSON.parse(body);
-	} catch {
-		return rebuildJsonResponse(response, body);
+		await parseMultipartBody(body, contentType, directory, entries, limits, signal);
+	} catch (error) {
+		await rm(directory, {
+			force: true,
+			recursive: true
+		});
+		throw error;
 	}
-	if (!isRecord$5(payload) || !Array.isArray(payload.data)) return rebuildJsonResponse(response, body);
-	let changed = false;
-	const data = [];
-	for (const item of payload.data) {
-		if (isRecord$5(item) && onImageUrl) {
-			const outputUrl = imageOutputUrlForLog(item.url);
-			if (outputUrl) onImageUrl(outputUrl);
-		}
-		if (!isRecord$5(item) || responseFormat === "url" || responseHasB64Json(item.b64_json)) {
-			data.push(item);
-			continue;
+	const stagedFormData = new FormData();
+	try {
+		for (const entry of entries) if (entry.kind === "field") stagedFormData.append(entry.name, entry.value);
+		else stagedFormData.append(entry.name, await createDiskBackedBlob(entry.filePath, entry.mimeType), entry.fileName);
+	} catch (error) {
+		await rm(directory, {
+			force: true,
+			recursive: true
+		});
+		throw error;
+	}
+	let cleanupPromise = null;
+	let cleanupTimer = null;
+	let unregisterProcessCleanup = null;
+	const cleanup = () => {
+		cleanupPromise ??= (async () => {
+			if (cleanupTimer) {
+				clearTimeout(cleanupTimer);
+				cleanupTimer = null;
+			}
+			try {
+				await rm(directory, {
+					force: true,
+					recursive: true
+				});
+			} catch (error) {
+				logger$16.warn("Failed to remove staged images temp directory", {
+					directory,
+					error
+				});
+			} finally {
+				unregisterProcessCleanup?.();
+				unregisterProcessCleanup = null;
+			}
+		})();
+		return cleanupPromise;
+	};
+	unregisterProcessCleanup = registerProcessCleanup(() => {
+		if (cleanupTimer) {
+			clearTimeout(cleanupTimer);
+			cleanupTimer = null;
 		}
-		const url = trustedImageUrl(item.url);
-		if (!url) return imageDownloadErrorResponse();
 		try {
-			clientSignal?.throwIfAborted();
-			const timeoutSignal = AbortSignal.timeout(6e4);
-			const imageResponse = await fetchImage(url, {
-				method: "GET",
-				redirect: "error",
-				signal: clientSignal ? AbortSignal.any([clientSignal, timeoutSignal]) : timeoutSignal
+			rmSync(directory, {
+				force: true,
+				recursive: true
 			});
-			if (!imageResponse.ok) {
-				await imageResponse.body?.cancel().catch(() => {});
-				return imageDownloadErrorResponse();
-			}
-			const bytes = await readImageBytes(imageResponse);
-			if (!bytes) return imageDownloadErrorResponse();
-			data.push({
-				...item,
-				b64_json: bytes.toString("base64")
+		} catch (error) {
+			logger$16.warn("Failed to remove staged images temp directory on exit", {
+				directory,
+				error
 			});
-			changed = true;
-		} catch {
-			clientSignal?.throwIfAborted();
-			return imageDownloadErrorResponse();
+		} finally {
+			unregisterProcessCleanup?.();
+			unregisterProcessCleanup = null;
+		}
+	});
+	return {
+		directory,
+		formData: stagedFormData,
+		cleanup,
+		scheduleCleanup: () => {
+			if (cleanupPromise || cleanupTimer) return;
+			cleanupTimer = setTimeout(() => void cleanup(), STAGED_FILES_TTL_MS);
+			cleanupTimer.unref();
 		}
+	};
+}
+// src/services/xai/images.ts
+const XAI_ASPECT_RATIOS = [
+	{
+		label: "1:1",
+		width: 1,
+		height: 1
+	},
+	{
+		label: "16:9",
+		width: 16,
+		height: 9
+	},
+	{
+		label: "9:16",
+		width: 9,
+		height: 16
+	},
+	{
+		label: "4:3",
+		width: 4,
+		height: 3
+	},
+	{
+		label: "3:4",
+		width: 3,
+		height: 4
+	},
+	{
+		label: "3:2",
+		width: 3,
+		height: 2
+	},
+	{
+		label: "2:3",
+		width: 2,
+		height: 3
+	},
+	{
+		label: "2:1",
+		width: 2,
+		height: 1
+	},
+	{
+		label: "1:2",
+		width: 1,
+		height: 2
+	},
+	{
+		label: "19.5:9",
+		width: 19.5,
+		height: 9
+	},
+	{
+		label: "9:19.5",
+		width: 9,
+		height: 19.5
+	},
+	{
+		label: "20:9",
+		width: 20,
+		height: 9
+	},
+	{
+		label: "9:20",
+		width: 9,
+		height: 20
 	}
-	const created = imageCreatedTimestamp(payload.created);
-	if (!changed && payload.created === created) return rebuildJsonResponse(response, body);
-	return rebuildJsonResponse(response, JSON.stringify({
-		...payload,
-		created,
-		data
-	}));
+];
+const XAI_ASPECT_RATIO_LABELS = /* @__PURE__ */ new Set([...XAI_ASPECT_RATIOS.map((ratio) => ratio.label), "auto"]);
+const XAI_RESPONSE_FORMATS = /* @__PURE__ */ new Set(["url", "b64_json"]);
+const XAI_RESOLUTIONS = /* @__PURE__ */ new Set(["1k", "2k"]);
+const MAX_EDIT_IMAGES = 5;
+const MAX_IMAGE_COUNT = 10;
+const HIGH_RESOLUTION_EDGE = 1536;
+var XaiImagesRequestError = class extends Error {
+	constructor(message) {
+		super(message);
+		this.name = "XaiImagesRequestError";
+	}
+};
+function isRecord$5(value) {
+	return value !== null && typeof value === "object" && !Array.isArray(value);
 }
-// src/routes/images/multipart-edits.ts
-const multipartEditDependencies = { stageMultipartBodyToDisk };
-var ImageEditRequestError = class extends Error {};
-function imageEditRequestErrorResponse(c, error) {
-	if (c.req.raw.signal.aborted) return null;
-	if (!(error instanceof ImageEditRequestError) && !(error instanceof InvalidMultipartBodyError) && !(error instanceof MultipartBodyTooLargeError) && !(error instanceof XaiImagesRequestError)) return null;
-	return c.json({ error: {
-		message: error.message,
-		type: "invalid_request_error"
-	} }, error instanceof MultipartBodyTooLargeError ? 413 : 400);
+function readPrompt(value) {
+	if (typeof value !== "string" || value.trim() === "") throw new XaiImagesRequestError("prompt is required");
+	return value;
 }
-function imageMimeType(bytes, declared) {
-	if (declared.startsWith("image/")) return declared;
-	if (bytes.subarray(0, 8).equals(Buffer.from([
-		137,
-		80,
-		78,
-		71,
-		13,
-		10,
-		26,
-		10
-	]))) return "image/png";
-	if (bytes[0] === 255 && bytes[1] === 216 && bytes[2] === 255) return "image/jpeg";
-	if (bytes.toString("ascii", 0, 4) === "RIFF" && bytes.toString("ascii", 8, 12) === "WEBP") return "image/webp";
-	if (/^GIF8[79]a/u.test(bytes.toString("ascii", 0, 6))) return "image/gif";
-	throw new ImageEditRequestError("Uploaded image must have an image MIME type");
+function assertNotStreaming(value) {
+	if (value === true || value === "true") throw new XaiImagesRequestError("xAI image requests do not support streaming");
+}
+function readCount(value) {
+	if (value === void 0 || value === null) return void 0;
+	const parsed = typeof value === "number" ? value : typeof value === "string" ? Number(value.trim()) : NaN;
+	if (!Number.isInteger(parsed) || parsed < 1 || parsed > MAX_IMAGE_COUNT) throw new XaiImagesRequestError(`n must be an integer from 1 to ${MAX_IMAGE_COUNT}`);
+	return parsed;
 }
-async function imageReference(value, signal) {
-	signal.throwIfAborted();
-	if (typeof value === "string") {
-		const url = value.trim();
-		if (!/^(?:https?:\/\/|data:image\/[a-z0-9.+-]+;base64,)/iu.test(url)) throw new ImageEditRequestError("image must be a file, HTTP URL or base64 data URL");
-		return { image_url: url };
+function readQuality(value) {
+	if (typeof value !== "string") return void 0;
+	switch (value.trim().toLowerCase()) {
+		case "low": return "low";
+		case "medium":
+		case "standard":
+		case "high":
+		case "hd": return "medium";
+		case "auto": return "auto";
+		default: return;
 	}
-	const bytes = Buffer.from(await value.arrayBuffer());
-	signal.throwIfAborted();
-	if (bytes.length === 0) throw new ImageEditRequestError("image is empty");
-	return { image_url: `data:${imageMimeType(bytes, value.type.trim().toLowerCase())};base64,${bytes.toString("base64")}` };
 }
-function fieldValue(name, value) {
-	if ([
-		"n",
-		"partial_images",
-		"output_compression"
-	].includes(name)) {
-		const trimmed = value.trim();
-		const number = Number(trimmed);
-		if (!/^-?\d+$/u.test(trimmed) || !Number.isSafeInteger(number)) throw new ImageEditRequestError(`${name} must be an integer`);
-		return number;
-	}
-	if (name === "stream") {
-		if (value.trim() === "true") return true;
-		if (value.trim() === "false") return false;
-		throw new ImageEditRequestError("stream must be true or false");
-	}
-	return value;
+function readChoice(value, allowed, name, normalize = (item) => item) {
+	if (value === void 0 || value === null) return void 0;
+	if (typeof value !== "string") throw new XaiImagesRequestError(`${name} is invalid`);
+	const trimmed = value.trim();
+	if (!trimmed) return void 0;
+	const normalized = normalize(trimmed);
+	if (!allowed.has(normalized)) throw new XaiImagesRequestError(`${name} must be one of ${Array.from(allowed).join(", ")}`);
+	return normalized;
 }
-async function formPayload(form, signal) {
-	const fields = /* @__PURE__ */ new Map();
-	const images = [];
-	for (const [name, value] of form.entries()) {
-		if (name === "image" || name === "image[]") {
-			images.push(await imageReference(value, signal));
-			continue;
+function readAspectRatio(value) {
+	if (value === void 0) return void 0;
+	if (typeof value !== "string") throw new XaiImagesRequestError("aspect_ratio is invalid");
+	const trimmed = value.trim();
+	if (!trimmed) return void 0;
+	const normalized = trimmed.toLowerCase() === "auto" ? "auto" : trimmed;
+	if (!XAI_ASPECT_RATIO_LABELS.has(normalized)) throw new XaiImagesRequestError("aspect_ratio must be a supported xAI ratio such as 1:1, 16:9, 9:16, or auto");
+	return normalized;
+}
+function readSize(value) {
+	if (typeof value !== "string") return void 0;
+	const trimmed = value.trim().toLowerCase();
+	if (!trimmed) return void 0;
+	if (trimmed === "auto") return "auto";
+	const match = /^(\d+)x(\d+)$/u.exec(trimmed);
+	if (!match?.[1] || !match[2]) return void 0;
+	const width = Number(match[1]);
+	const height = Number(match[2]);
+	if (!Number.isSafeInteger(width) || !Number.isSafeInteger(height) || width <= 0 || height <= 0) return;
+	return {
+		height,
+		width
+	};
+}
+function aspectRatioFromSize(size) {
+	if (!size) return void 0;
+	if (size === "auto") return "auto";
+	let best = XAI_ASPECT_RATIOS[0].label;
+	let bestDistance = Number.POSITIVE_INFINITY;
+	const ratio = Math.log(size.width / size.height);
+	for (const candidate of XAI_ASPECT_RATIOS) {
+		const distance = Math.abs(ratio - Math.log(candidate.width / candidate.height));
+		if (distance < bestDistance) {
+			best = candidate.label;
+			bestDistance = distance;
 		}
-		const key = name === "mask[]" ? "mask" : name;
-		if (fields.has(key)) throw new ImageEditRequestError(`Duplicate image edit field: ${key}`);
-		if (key === "mask") fields.set(key, await imageReference(value, signal));
-		else if (typeof value === "string") fields.set(key, fieldValue(key, value));
-		else throw new ImageEditRequestError(`Unexpected image edit file field: ${key}`);
 	}
-	if (images.length === 0) throw new ImageEditRequestError("image is required");
-	fields.set("images", images);
-	return Object.fromEntries(fields);
+	return best;
 }
-/** Parse multipart once, keeping uploads on disk until the target is known. */
-async function parseMultipartImageEdit(request) {
-	const requestHeaders = new Headers(request.headers);
-	const contentType = requestHeaders.get("content-type");
-	if (contentType?.split(";", 1)[0]?.trim().toLowerCase() !== "multipart/form-data") return null;
-	const staged = await multipartEditDependencies.stageMultipartBodyToDisk(request.body, contentType, {}, request.signal);
-	const form = staged.formData;
-	const model = form.get("model");
-	let payloadPromise;
-	const readPayload = () => {
-		payloadPromise ??= formPayload(form, request.signal).finally(staged.cleanup);
-		return payloadPromise;
+function resolutionFromSize(size) {
+	if (!size || size === "auto") return void 0;
+	return Math.max(size.width, size.height) >= HIGH_RESOLUTION_EDGE ? "2k" : "1k";
+}
+function applyCommonImageFields(target, source) {
+	assertNotStreaming(source.stream);
+	const count = readCount(source.n);
+	const quality = readQuality(source.quality);
+	const responseFormat = readChoice(source.response_format, XAI_RESPONSE_FORMATS, "response_format");
+	const aspectRatio = readAspectRatio(source.aspect_ratio) ?? aspectRatioFromSize(readSize(source.size));
+	const resolution = readChoice(source.resolution, XAI_RESOLUTIONS, "resolution", (value) => value.toLowerCase()) ?? resolutionFromSize(readSize(source.size));
+	if (count !== void 0) target.n = count;
+	if (quality && target.model === "grok-imagine-image-2.0") target.quality = quality;
+	target.response_format = responseFormat ?? "b64_json";
+	if (aspectRatio) target.aspect_ratio = aspectRatio;
+	if (resolution) target.resolution = resolution;
+}
+function normalizeImageUrl(value) {
+	const trimmed = value.trim();
+	if (/^https?:\/\//iu.test(trimmed) || /^data:image\/[a-z0-9.+-]+;base64,/iu.test(trimmed)) return trimmed;
+	throw new XaiImagesRequestError("image must be an http(s) URL or a base64 data URL");
+}
+function base64ToDataUrl(value, mime) {
+	const compact = value.trim().replaceAll(/\s+/gu, "");
+	if (compact.startsWith("data:image/")) return normalizeImageUrl(compact);
+	if (!/^[a-z0-9+/]+={0,2}$/iu.test(compact)) throw new XaiImagesRequestError("image b64_json is not valid base64");
+	return `data:${typeof mime === "string" && mime.trim().toLowerCase().startsWith("image/") ? mime.trim().toLowerCase() : "image/png"};base64,${compact}`;
+}
+function readImageReference(value) {
+	if (typeof value === "string") return {
+		type: "image_url",
+		url: normalizeImageUrl(value)
 	};
-	return {
-		...staged,
-		model: typeof model === "string" ? model : void 0,
-		readPayload,
-		createRequest: async (model, provider = "codex") => {
-			const headers = new Headers(requestHeaders);
-			headers.delete("content-length");
-			let body;
-			if (provider === "codex" || provider === "xai" || provider === "github-copilot") {
-				const payload = {
-					...await readPayload(),
-					...model === void 0 ? {} : { model }
-				};
-				if (provider === "xai" && !model) throw new ImageEditRequestError("model is required for xAI multipart edits");
-				headers.set("content-type", "application/json");
-				body = new TextEncoder().encode(JSON.stringify(provider === "xai" ? translateXaiImageEditJson(payload, model) : payload));
-			} else {
-				if (model !== void 0) form.set("model", model);
-				headers.delete("content-type");
-				body = form;
-			}
-			request.signal.throwIfAborted();
-			return new Request(request.url, {
-				method: request.method,
-				headers,
-				body,
-				signal: request.signal
-			});
-		}
+	if (!isRecord$5(value)) throw new XaiImagesRequestError("image must be a URL or an image object");
+	if (typeof value.url === "string") return {
+		type: "image_url",
+		url: normalizeImageUrl(value.url)
+	};
+	if (typeof value.image_url === "string") return {
+		type: "image_url",
+		url: normalizeImageUrl(value.image_url)
+	};
+	if (typeof value.b64_json === "string") return {
+		type: "image_url",
+		url: base64ToDataUrl(value.b64_json, value.mime_type ?? value.media_type)
 	};
+	if (value.file_id !== void 0) throw new XaiImagesRequestError("file_id is not supported for xAI image edits; provide an image_url instead");
+	throw new XaiImagesRequestError("image must include a url, image_url, or b64_json");
 }
-// src/lib/image-json-files.ts
-const IMAGE_JSON_MAX_BYTES = 536870912;
-function imageJsonLimitError() {
-	return new HTTPError("Image JSON upload exceeds the staging limit", Response.json({ error: {
-		message: "Image JSON upload exceeds the staging limit",
-		type: "invalid_request_error"
-	} }, { status: 413 }));
+function collectJsonImages(payload) {
+	const values = [];
+	if (isUnknownArray(payload.image)) values.push(...payload.image);
+	else if (payload.image !== void 0) values.push(payload.image);
+	if (isUnknownArray(payload.images)) values.push(...payload.images);
+	if (payload.image_url !== void 0) values.push(payload.image_url);
+	return values;
 }
-/** Owns only an mkdtemp-created directory; callers never supply deletion paths. */
-async function createImageJsonFiles(ttlMs = 9e5) {
-	const directory = await mkdtemp(join(tmpdir(), "copilot-image-json-"));
-	let index = 0;
-	let timer;
-	let cleanupPromise;
-	const unregister = registerProcessCleanup(() => {
-		if (timer) clearTimeout(timer);
-		rmSync(directory, {
-			recursive: true,
-			force: true
-		});
-	});
-	const cleanup = () => {
-		cleanupPromise ??= (async () => {
-			if (timer) clearTimeout(timer);
-			await rm(directory, {
-				recursive: true,
-				force: true,
-				maxRetries: 3,
-				retryDelay: 20
-			});
-			unregister();
-		})();
-		return cleanupPromise;
+function isUnknownArray(value) {
+	return Array.isArray(value);
+}
+function buildEditPayload(model, prompt, images, source) {
+	if (source.mask !== void 0) throw new XaiImagesRequestError("xAI image edits do not support mask");
+	if (images.length === 0) throw new XaiImagesRequestError("image is required");
+	if (images.length > MAX_EDIT_IMAGES) throw new XaiImagesRequestError(`xAI image edits accept at most ${MAX_EDIT_IMAGES} images`);
+	const payload = {
+		model,
+		prompt
 	};
-	return {
-		directory,
-		cleanup,
-		scheduleCleanup() {
-			if (timer || cleanupPromise) return;
-			timer = setTimeout(() => void cleanup().catch(() => {}), ttlMs);
-			timer.unref();
-		},
-		async create() {
-			const path = join(directory, String(index++));
-			return {
-				path,
-				handle: await open(path, "wx")
-			};
-		}
+	applyCommonImageFields(payload, source);
+	if (images.length === 1) payload.image = images[0];
+	else payload.images = images;
+	return payload;
+}
+/**
+* Translates an OpenAI image generation body into an xAI Imagine generation
+* request. The configured model replaces the client model.
+*/
+function translateXaiImageGeneration(payload, model) {
+	if (!isRecord$5(payload)) throw new XaiImagesRequestError("Image generation body must be a JSON object");
+	const translated = {
+		model,
+		prompt: readPrompt(payload.prompt)
 	};
+	applyCommonImageFields(translated, payload);
+	return translated;
 }
-async function* readImageJsonFile(path, signal) {
-	const stream = createReadStream(path, {
-		highWaterMark: 65536,
-		signal
-	});
+/**
+* Translates an OpenAI JSON image edit body into an xAI Imagine edit request.
+*/
+function translateXaiImageEditJson(payload, model) {
+	if (!isRecord$5(payload)) throw new XaiImagesRequestError("Image edit body must be a JSON object");
+	return buildEditPayload(model, readPrompt(payload.prompt), collectJsonImages(payload).map((image) => readImageReference(image)), payload);
+}
+const MAX_RESPONSE_IMAGE_BYTES = 33554432;
+function responseHasB64Json(value) {
+	return typeof value === "string" && value.trim() !== "";
+}
+function imageCreatedTimestamp(value) {
+	if (typeof value === "number" && Number.isFinite(value) && value > 0) return Math.trunc(value);
+	return Math.floor(Date.now() / 1e3);
+}
+function trustedImageUrl(value) {
+	if (typeof value !== "string" || !value.trim()) return null;
 	try {
-		for await (const bytes of stream) yield bytes;
-	} finally {
-		stream.destroy();
+		const url = new URL(value.trim());
+		if (url.protocol !== "https:" || url.hostname !== "imgen.x.ai" || url.port || url.username || url.password) return null;
+		return url.toString();
+	} catch {
+		return null;
 	}
 }
-// src/lib/streaming-json.ts
-const JSON_CHUNK_BYTES = 65536;
-/** Never ask the tokenizer to accumulate untrusted strings, keys, or numbers. */
-var StreamingJsonReader = class {
-	decode = new TextDecoder("utf-8", { fatal: true });
-	parse = jsonParser({ packValues: false });
-	depth = 0;
-	scalarLength = 0;
-	boundedScalar = false;
-	read(bytes) {
-		const text = this.decode.decode(bytes, { stream: bytes !== void 0 });
-		const result = this.parse(text);
-		const tokens = result === none ? [] : result.values;
-		if (bytes === void 0) {
-			const last = this.parse(none);
-			if (last !== none) tokens.push(...last.values);
-		}
-		for (const token of tokens) switch (token.name) {
-			case "startObject":
-			case "startArray":
-				if (++this.depth > 64) throw new SyntaxError("JSON nesting exceeds 64");
-				break;
-			case "endObject":
-			case "endArray":
-				this.depth--;
-				break;
-			case "startKey":
-			case "startNumber":
-				this.scalarLength = 0;
-				this.boundedScalar = true;
-				break;
-			case "endKey":
-			case "endNumber":
-				this.boundedScalar = false;
-				break;
-			case "stringChunk":
-			case "numberChunk": if (this.boundedScalar) {
-				this.scalarLength += token.value.length;
-				if (this.scalarLength > 65536) throw new SyntaxError("JSON key or number is too large");
-			}
-		}
-		return tokens;
+async function readImageBytes(response) {
+	const declaredLength = Number(response.headers.get("content-length"));
+	if (Number.isFinite(declaredLength) && declaredLength > MAX_RESPONSE_IMAGE_BYTES) {
+		await response.body?.cancel().catch(() => {});
+		return null;
 	}
-};
-/** Splitting also bounds tokenizer allocations when a runtime supplies a huge chunk. */
-async function* readJsonBytes(body, signal) {
-	if (!body) return;
-	const reader = body.getReader();
-	const abort = () => void reader.cancel(signal?.reason).catch(() => {});
-	signal?.addEventListener("abort", abort, { once: true });
+	if (!response.body) return null;
+	const reader = response.body.getReader();
+	const chunks = [];
+	let length = 0;
 	let complete = false;
 	try {
 		while (true) {
-			signal?.throwIfAborted();
-			const { done, value } = await reader.read();
-			signal?.throwIfAborted();
-			if (done) {
-				complete = true;
-				return;
-			}
-			for (let offset = 0; offset < value.byteLength; offset += JSON_CHUNK_BYTES) yield value.subarray(offset, offset + JSON_CHUNK_BYTES);
-		}
-	} finally {
-		signal?.removeEventListener("abort", abort);
-		if (!complete) await reader.cancel().catch(() => {});
-		reader.releaseLock();
-	}
-}
-function createJsonByteSource(body, signal) {
-	const controller = new AbortController();
-	const bytes = readJsonBytes(body, AbortSignal.any([signal, controller.signal]));
-	return {
-		bytes,
-		async cancel(reason) {
-			controller.abort(reason);
-			await bytes.return(void 0).catch(() => {});
-			if (body && !body.locked) await body.cancel(reason).catch(() => {});
-		}
-	};
-}
-/** Lazy streams allow a route to choose the original or rebuilt body without teeing. */
-function jsonByteStream(iterator, cancel) {
-	return new ReadableStream({
-		async pull(controller) {
-			try {
-				const { done, value } = await iterator.next();
-				if (done) controller.close();
-				else controller.enqueue(value);
-			} catch (error) {
-				controller.error(error);
-				await iterator.return(void 0).catch(() => {});
-			}
-		},
-		async cancel(reason) {
-			await cancel?.(reason);
-			await iterator.return(void 0);
-		}
-	}, { highWaterMark: 0 });
-}
-var DuplicateImageModelError = class extends SyntaxError {
-	constructor() {
-		super("Duplicate top-level image model");
-	}
-};
-/** Keeps only the top-level model; all image string chunks are discarded. */
-var ImageModelReader = class {
-	model;
-	object = false;
-	complete = false;
-	invalidModel = false;
-	depth = 0;
-	key = "";
-	inKey = false;
-	readingModel = false;
-	modelText = "";
-	seenModel = false;
-	read(tokens) {
-		for (const token of tokens) {
-			if (token.name === "startKey") {
-				this.inKey = true;
-				this.key = "";
-			} else if (token.name === "endKey") {
-				this.inKey = false;
-				if (this.depth === 1 && this.key === "model") {
-					if (this.seenModel) throw new DuplicateImageModelError();
-					this.seenModel = true;
-				}
-			} else if (token.name === "stringChunk") {
-				if (this.inKey) this.key += token.value;
-				else if (this.readingModel) {
-					this.modelText += token.value;
-					if (this.modelText.length > 4096) {
-						this.invalidModel = true;
-						this.readingModel = false;
-						this.modelText = "";
-					}
-				}
-			} else if (token.name === "startString") this.readingModel = this.depth === 1 && this.key === "model";
-			else if (token.name === "endString") {
-				if (this.readingModel) {
-					this.model = this.modelText;
-					this.modelText = "";
-					this.readingModel = false;
-				}
-			} else if (this.depth === 1 && this.key === "model" && [
-				"startObject",
-				"startArray",
-				"startNumber",
-				"nullValue",
-				"trueValue",
-				"falseValue"
-			].includes(token.name)) this.invalidModel = true;
-			if (token.name === "startObject" || token.name === "startArray") {
-				if (this.depth === 0) this.object = token.name === "startObject";
-				this.depth++;
-			} else if (token.name === "endObject" || token.name === "endArray") {
-				if (--this.depth === 0) this.complete = true;
-			}
-		}
-	}
-};
-/** Re-encodes bounded chunks, replacing or inserting the top-level model. */
-async function* rewriteImageModel(input, model, insertModel = false) {
-	const parser = new StreamingJsonReader();
-	const encode = new TextEncoder();
-	const stringify = stringer();
-	let depth = 0;
-	let key = "";
-	let inKey = false;
-	let replacing = false;
-	const process = (tokens) => {
-		const parts = [];
-		const emit = (token) => {
-			const text = stringify(token);
-			if (text !== none) parts.push(text);
-		};
-		for (const token of tokens) {
-			if (insertModel && depth === 0 && token.name === "startObject") {
-				emit(token);
-				emit({ name: "startKey" });
-				emit({
-					name: "stringChunk",
-					value: "model"
-				});
-				emit({ name: "endKey" });
-				emit({ name: "startString" });
-				emit({
-					name: "stringChunk",
-					value: model
-				});
-				emit({ name: "endString" });
-				depth++;
-				continue;
-			}
-			if (replacing) {
-				if (token.name === "endString") replacing = false;
-				continue;
-			}
-			if (token.name === "startKey") {
-				inKey = true;
-				key = "";
-			} else if (token.name === "endKey") inKey = false;
-			else if (token.name === "stringChunk" && inKey) key += token.value;
-			if (token.name === "startString" && depth === 1 && key === "model") {
-				emit(token);
-				emit({
-					name: "stringChunk",
-					value: model
-				});
-				emit({ name: "endString" });
-				replacing = true;
-				continue;
+			const { done, value } = await reader.read();
+			if (done) {
+				complete = true;
+				return length > 0 ? Buffer.concat(chunks, length) : null;
 			}
-			emit(token);
-			if (token.name === "startObject" || token.name === "startArray") depth++;
-			else if (token.name === "endObject" || token.name === "endArray") depth--;
+			length += value.byteLength;
+			if (length > MAX_RESPONSE_IMAGE_BYTES) return null;
+			chunks.push(value);
 		}
-		return encode.encode(parts.join(""));
-	};
-	for await (const bytes of input) yield process(parser.read(bytes));
-	const tail = process(parser.read());
-	if (tail.byteLength) yield tail;
+	} finally {
+		if (!complete) await reader.cancel().catch(() => {});
+		reader.releaseLock();
+	}
 }
-// src/lib/image-json-request.ts
-function rebuild(request, body, changed = false) {
-	const headers = new Headers(request.headers);
-	if (changed) headers.delete("content-length");
-	return new Request(request.url, {
-		method: request.method,
+function imageDownloadErrorResponse() {
+	return Response.json({ error: {
+		message: "Failed to retrieve xAI image output as b64_json",
+		type: "upstream_error"
+	} }, { status: 502 });
+}
+function imageOutputUrlForLog(value) {
+	if (typeof value !== "string" || !value.trim()) return null;
+	try {
+		const url = new URL(value.trim());
+		if (url.protocol !== "https:" && url.protocol !== "http:") return null;
+		url.username = "";
+		url.password = "";
+		for (const key of url.searchParams.keys()) if (/token|secret|signature|credential|password|authorization|api[_-]?key|^key$|^sig$/iu.test(key)) url.searchParams.set(key, "[REDACTED]");
+		return url.toString();
+	} catch {
+		return null;
+	}
+}
+function rebuildJsonResponse(response, body) {
+	const headers = new Headers(response.headers);
+	headers.delete("content-length");
+	if (!headers.get("content-type")) headers.set("content-type", "application/json");
+	return new Response(body, {
 		headers,
-		body,
-		signal: request.signal,
-		duplex: "half"
+		status: response.status,
+		statusText: response.statusText
 	});
 }
-/** Read at most 64 KiB before forwarding a model-first request. Late models use disk. */
-async function prepareImageJsonRequest(request, maxStagedBytes = IMAGE_JSON_MAX_BYTES) {
-	const forwardingAbort = new AbortController();
-	const signal = AbortSignal.any([request.signal, forwardingAbort.signal]);
-	const input = createJsonByteSource(request.body, signal);
-	const bytes = input.bytes;
-	const parser = new StreamingJsonReader();
-	const metadata = new ImageModelReader();
-	let valid = true;
-	const scan = (chunk) => {
-		if (!valid) return;
-		try {
-			metadata.read(parser.read(chunk));
-		} catch (error) {
-			if (error instanceof DuplicateImageModelError) throw error;
-			valid = false;
-		}
-	};
-	const prefix = [];
-	let length = 0;
-	let eof = false;
-	let pending;
-	async function* remaining() {
-		if (pending) {
-			const chunk = pending;
-			pending = void 0;
-			yield chunk;
-		}
-		yield* bytes;
-	}
-	let files;
-	let stagedPath;
+/**
+* Adapts an xAI image body to the OpenAI Images response.
+* Generation returns created: null, and edits omit created. OpenAI clients
+* require a unix timestamp. When b64_json is requested, a URL-only result
+* is downloaded from the xAI CDN with redirects disabled and a byte limit.
+*/
+async function ensureImageResponseB64Json(response, fetchImage = globalThis.fetch, { clientSignal, onImageUrl, responseFormat = "b64_json" } = {}) {
+	if (!response.ok) return response;
+	clientSignal?.throwIfAborted();
+	const body = await response.text();
+	let payload;
 	try {
-		while (length < JSON_CHUNK_BYTES) {
-			const next = await bytes.next();
-			if (next.done) {
-				eof = true;
-				scan();
-				break;
-			}
-			const chunk = next.value.subarray(0, JSON_CHUNK_BYTES - length);
-			pending = chunk.byteLength < next.value.byteLength ? next.value.subarray(chunk.byteLength) : void 0;
-			prefix.push(chunk);
-			length += chunk.byteLength;
-			scan(chunk);
-			if (!valid || metadata.model !== void 0 || metadata.invalidModel || metadata.complete) break;
+		payload = JSON.parse(body);
+	} catch {
+		return rebuildJsonResponse(response, body);
+	}
+	if (!isRecord$5(payload) || !Array.isArray(payload.data)) return rebuildJsonResponse(response, body);
+	let changed = false;
+	const data = [];
+	for (const item of payload.data) {
+		if (isRecord$5(item) && onImageUrl) {
+			const outputUrl = imageOutputUrlForLog(item.url);
+			if (outputUrl) onImageUrl(outputUrl);
 		}
-		if (valid && !eof && !metadata.complete && metadata.model === void 0 && !metadata.invalidModel) {
-			files = await createImageJsonFiles();
-			const file = await files.create();
-			stagedPath = file.path;
-			try {
-				for (const chunk of prefix) {
-					if (length > maxStagedBytes) throw imageJsonLimitError();
-					await file.handle.writeFile(chunk);
-				}
-				prefix.length = 0;
-				for await (const chunk of remaining()) {
-					length += chunk.byteLength;
-					if (length > maxStagedBytes) throw imageJsonLimitError();
-					scan(chunk);
-					await file.handle.writeFile(chunk);
-				}
-				eof = true;
-				scan();
-			} finally {
-				await file.handle.close();
+		if (!isRecord$5(item) || responseFormat === "url" || responseHasB64Json(item.b64_json)) {
+			data.push(item);
+			continue;
+		}
+		const url = trustedImageUrl(item.url);
+		if (!url) return imageDownloadErrorResponse();
+		try {
+			clientSignal?.throwIfAborted();
+			const timeoutSignal = AbortSignal.timeout(6e4);
+			const imageResponse = await fetchImage(url, {
+				method: "GET",
+				redirect: "error",
+				signal: clientSignal ? AbortSignal.any([clientSignal, timeoutSignal]) : timeoutSignal
+			});
+			if (!imageResponse.ok) {
+				await imageResponse.body?.cancel().catch(() => {});
+				return imageDownloadErrorResponse();
 			}
-			files.scheduleCleanup();
+			const bytes = await readImageBytes(imageResponse);
+			if (!bytes) return imageDownloadErrorResponse();
+			data.push({
+				...item,
+				b64_json: bytes.toString("base64")
+			});
+			changed = true;
+		} catch {
+			clientSignal?.throwIfAborted();
+			return imageDownloadErrorResponse();
 		}
+	}
+	const created = imageCreatedTimestamp(payload.created);
+	if (!changed && payload.created === created) return rebuildJsonResponse(response, body);
+	return rebuildJsonResponse(response, JSON.stringify({
+		...payload,
+		created,
+		data
+	}));
+}
+// src/routes/images/multipart-edits.ts
+const multipartEditDependencies = { stageMultipartBodyToDisk };
+var ImageEditRequestError = class extends Error {};
+/** Share edit validation and staged-upload cleanup across both route families. */
+async function withImageEditRequest(c, operation, handle) {
+	if (operation !== "edits") return await handle(null);
+	const mediaType = c.req.header("content-type")?.split(";", 1)[0]?.trim().toLowerCase();
+	if (mediaType !== "application/json" && mediaType !== "multipart/form-data") return c.json({ error: {
+		message: "Image edits require application/json or multipart/form-data",
+		type: "invalid_request_error"
+	} }, 415);
+	const multipart = await parseMultipartImageEdit(c.req.raw);
+	try {
+		return await handle(multipart);
 	} catch (error) {
-		await input.cancel(error);
-		await files?.cleanup();
-		if (error instanceof DuplicateImageModelError) throw new HTTPError(error.message, Response.json({ error: {
-			message: error.message,
-			type: "invalid_request_error"
-		} }, { status: 400 }));
+		await multipart?.cleanup();
 		throw error;
+	} finally {
+		multipart?.scheduleCleanup();
 	}
-	let claimed = false;
-	const abort = () => {
-		input.cancel().catch(() => {});
-		files?.cleanup().catch(() => {});
-	};
-	request.signal.addEventListener("abort", abort, { once: true });
-	async function* source() {
-		if (claimed) throw new Error("Image request body already forwarded");
-		claimed = true;
-		try {
-			signal.throwIfAborted();
-			if (stagedPath) yield* readImageJsonFile(stagedPath, signal);
-			else {
-				yield* prefix;
-				prefix.length = 0;
-				if (!eof) {
-					for await (const chunk of remaining()) {
-						scan(chunk);
-						yield chunk;
-					}
-					scan();
-				}
-			}
-		} finally {
-			request.signal.removeEventListener("abort", abort);
-			await bytes.return(void 0).catch(() => {});
-			await files?.cleanup();
+}
+function imageEditRequestErrorResponse(c, error) {
+	if (c.req.raw.signal.aborted) return null;
+	if (!(error instanceof ImageEditRequestError) && !(error instanceof InvalidMultipartBodyError) && !(error instanceof MultipartBodyTooLargeError) && !(error instanceof XaiImagesRequestError)) return null;
+	return c.json({ error: {
+		message: error.message,
+		type: "invalid_request_error"
+	} }, error instanceof MultipartBodyTooLargeError ? 413 : 400);
+}
+function imageMimeType(bytes, declared) {
+	if (declared.startsWith("image/")) return declared;
+	if (bytes.subarray(0, 8).equals(Buffer.from([
+		137,
+		80,
+		78,
+		71,
+		13,
+		10,
+		26,
+		10
+	]))) return "image/png";
+	if (bytes[0] === 255 && bytes[1] === 216 && bytes[2] === 255) return "image/jpeg";
+	if (bytes.toString("ascii", 0, 4) === "RIFF" && bytes.toString("ascii", 8, 12) === "WEBP") return "image/webp";
+	if (/^GIF8[79]a/u.test(bytes.toString("ascii", 0, 6))) return "image/gif";
+	throw new ImageEditRequestError("Uploaded image must have an image MIME type");
+}
+async function imageReference(value, signal) {
+	signal.throwIfAborted();
+	if (typeof value === "string") {
+		const url = value.trim();
+		if (!/^(?:https?:\/\/|data:image\/[a-z0-9.+-]+;base64,)/iu.test(url)) throw new ImageEditRequestError("image must be a file, HTTP URL or base64 data URL");
+		return { image_url: url };
+	}
+	const bytes = Buffer.from(await value.arrayBuffer());
+	signal.throwIfAborted();
+	if (bytes.length === 0) throw new ImageEditRequestError("image is empty");
+	return { image_url: `data:${imageMimeType(bytes, value.type.trim().toLowerCase())};base64,${bytes.toString("base64")}` };
+}
+function fieldValue(name, value) {
+	if ([
+		"n",
+		"partial_images",
+		"output_compression"
+	].includes(name)) {
+		const trimmed = value.trim();
+		const number = Number(trimmed);
+		if (!/^-?\d+$/u.test(trimmed) || !Number.isSafeInteger(number)) throw new ImageEditRequestError(`${name} must be an integer`);
+		return number;
+	}
+	if (name === "stream") {
+		if (value.trim() === "true") return true;
+		if (value.trim() === "false") return false;
+		throw new ImageEditRequestError("stream must be true or false");
+	}
+	return value;
+}
+async function formPayload(form, signal) {
+	const fields = /* @__PURE__ */ new Map();
+	const images = [];
+	for (const [name, value] of form.entries()) {
+		if (name === "image" || name === "image[]") {
+			images.push(await imageReference(value, signal));
+			continue;
 		}
+		const key = name === "mask[]" ? "mask" : name;
+		if (fields.has(key)) throw new ImageEditRequestError(`Duplicate image edit field: ${key}`);
+		if (key === "mask") fields.set(key, await imageReference(value, signal));
+		else if (typeof value === "string") fields.set(key, fieldValue(key, value));
+		else throw new ImageEditRequestError(`Unexpected image edit file field: ${key}`);
 	}
-	const cancel = async (reason) => {
-		forwardingAbort.abort(reason);
-		request.signal.removeEventListener("abort", abort);
-		await input.cancel(reason);
-		await files?.cleanup();
+	if (images.length === 0) throw new ImageEditRequestError("image is required");
+	fields.set("images", images);
+	return Object.fromEntries(fields);
+}
+/** Parse multipart once, keeping uploads on disk until the target is known. */
+async function parseMultipartImageEdit(request) {
+	const requestHeaders = new Headers(request.headers);
+	const contentType = requestHeaders.get("content-type");
+	if (contentType?.split(";", 1)[0]?.trim().toLowerCase() !== "multipart/form-data") return null;
+	const staged = await multipartEditDependencies.stageMultipartBodyToDisk(request.body, contentType, {}, request.signal);
+	const form = staged.formData;
+	const model = form.get("model");
+	let payloadPromise;
+	const readPayload = () => {
+		payloadPromise ??= formPayload(form, request.signal).finally(staged.cleanup);
+		return payloadPromise;
 	};
 	return {
-		valid: valid && metadata.object && !metadata.invalidModel,
-		model: metadata.model,
-		originalRequest: rebuild(request, jsonByteStream(source(), cancel)),
-		createRequest: (model) => rebuild(request, jsonByteStream(rewriteImageModel(source(), model, metadata.model === void 0), cancel), true),
-		cleanup: cancel,
-		stagedDirectory: files?.directory
+		...staged,
+		model: typeof model === "string" ? model : void 0,
+		readPayload,
+		createRequest: async (model, provider = "codex") => {
+			const headers = new Headers(requestHeaders);
+			headers.delete("content-length");
+			let body;
+			if (provider === "codex" || provider === "xai" || provider === "github-copilot") {
+				const payload = {
+					...await readPayload(),
+					...model === void 0 ? {} : { model }
+				};
+				if (provider === "xai" && !model) throw new ImageEditRequestError("model is required for xAI multipart edits");
+				headers.set("content-type", "application/json");
+				body = new TextEncoder().encode(JSON.stringify(provider === "xai" ? translateXaiImageEditJson(payload, model) : payload));
+			} else {
+				if (model !== void 0) form.set("model", model);
+				headers.delete("content-type");
+				body = form;
+			}
+			request.signal.throwIfAborted();
+			return new Request(request.url, {
+				method: request.method,
+				headers,
+				body,
+				signal: request.signal
+			});
+		}
 	};
 }
 // src/lib/image-json-metadata.ts
@@ -4909,35 +4927,6 @@ function observeImagesResponse(response, options) {
 		}
 	}));
 }
-// src/lib/xai-image-model.ts
-/**
-* Resolves one image-route model setting. Empty values keep the OpenAI
-* protocol. Only an xai/model alias selects the xAI Imagine API.
-*/
-function resolveConfiguredXaiImageModel(configured, settingName) {
-	if (configured === void 0 || configured === null) return { status: "disabled" };
-	if (typeof configured !== "string") return {
-		message: `${settingName} must be an xai/model alias`,
-		status: "invalid"
-	};
-	const trimmed = configured.trim();
-	if (!trimmed) return { status: "disabled" };
-	const alias = parseProviderModelAlias(trimmed);
-	if (alias?.provider.toLowerCase() !== "xai") return {
-		message: `${settingName} only supports an xai/model alias, received '${trimmed}'`,
-		status: "invalid"
-	};
-	return {
-		model: alias.model,
-		status: "xai"
-	};
-}
-function getImageGenerationModel() {
-	return resolveConfiguredXaiImageModel(getConfig().imageGenerationModel, "imageGenerationModel");
-}
-function getImageEditModel() {
-	return resolveConfiguredXaiImageModel(getConfig().imageEditModel, "imageEditModel");
-}
 // src/lib/image-json-value.ts
 const STRING_LIMIT = 65536;
 const METADATA_LIMIT = 1048576;
@@ -5292,6 +5281,32 @@ function logImageJsonRequest(logger, label, request, extra, debug) {
 		duplex: "half"
 	});
 }
+DEFAULT_IMAGE_MODELS.codex;
+const CODEX_IMAGES_TIMEOUT_MS = 9e5;
+const codexImagesDispatcher = createTimeoutDispatcher(CODEX_IMAGES_TIMEOUT_MS);
+function resolveCodexImagesUrl(requestUrl, operation) {
+	const upstreamUrl = new URL(`${CODEX_API_BASE_URL}/codex/images/${operation}`);
+	upstreamUrl.search = new URL(requestUrl, "http://localhost").search;
+	return upstreamUrl.toString();
+}
+async function forwardCodexImages(request, operation) {
+	const headers = buildCodexRequestHeaders(request.headers);
+	if (!headers.has("accept")) headers.set("accept", "application/json");
+	if (operation === "generations" && !headers.has("content-type")) headers.set("content-type", "application/json");
+	const init = {
+		method: "POST",
+		headers,
+		body: request.body,
+		duplex: "half",
+		signal: AbortSignal.any([request.signal, AbortSignal.timeout(CODEX_IMAGES_TIMEOUT_MS)])
+	};
+	const upstreamUrl = resolveCodexImagesUrl(request.url, operation);
+	if (typeof Bun !== "undefined") return await fetch(upstreamUrl, init);
+	return await fetch$1(upstreamUrl, {
+		...init,
+		dispatcher: codexImagesDispatcher
+	});
+}
 DEFAULT_IMAGE_MODELS["github-copilot"];
 const COPILOT_CLIENT_VERSION = "copilot/1.0.103-unstable.r40031404408.gba6c003";
 const COPILOT_IMAGES_TIMEOUT_MS = 9e5;
@@ -5337,6 +5352,7 @@ async function forwardCopilotImages(request, operation) {
 	return response;
 }
 // src/routes/images/forward-provider-images.ts
+const imageForwardDependencies = { debugJsonAsync };
 /**
 * Forwards an images request to a configured provider with debug logging.
 * Shared by the top-level images routes (model mapping) and the
@@ -5346,33 +5362,35 @@ async function forwardProviderImagesWithLogging(providerConfig, request, operati
 	let actualModel = model;
 	if (actualModel === void 0 && !request.headers.get("content-type")?.includes("multipart/form-data")) {
 		const parsed = await prepareImageJsonRequest(request);
-		actualModel = parsed.valid ? parsed.model : "unknown";
+		actualModel = parsed.model;
 		request = parsed.originalRequest;
 	}
 	actualModel ??= "unknown";
-	request = await logImageEditRequest(logger, `provider.images.${operation}.request`, request, { provider });
-	let upstreamResponse;
+	const isCodex = providerConfig.name === "codex";
+	const label = isCodex ? `images.${operation}.codex` : `provider.images.${operation}`;
+	const extra = isCodex ? {} : { provider };
 	try {
-		upstreamResponse = providerConfig.name === "github-copilot" ? await forwardCopilotImages(request, operation) : await forwardProviderImages(providerConfig, request, operation);
+		request = await logImageEditRequest(logger, `${label}.request`, request, extra, imageForwardDependencies.debugJsonAsync);
+		const upstreamResponse = isCodex ? await forwardCodexImages(request, operation) : providerConfig.name === "github-copilot" ? await forwardCopilotImages(request, operation) : await forwardProviderImages(providerConfig, request, operation);
+		debugJson(logger, `${label}.response`, {
+			contentType: upstreamResponse.headers.get("content-type"),
+			contentLength: upstreamResponse.headers.get("content-length"),
+			...extra,
+			statusCode: upstreamResponse.status
+		});
+		return observeImagesResponse(upstreamResponse, {
+			model: actualModel,
+			operation,
+			providerConfig,
+			onMetadata: (metadata) => debugJson(logger, `${label}.response.body`, {
+				...extra,
+				...metadata
+			})
+		});
 	} catch (error) {
 		await request.body?.cancel().catch(() => {});
 		throw error;
 	}
-	debugJson(logger, `provider.images.${operation}.response`, {
-		contentType: upstreamResponse.headers.get("content-type"),
-		contentLength: upstreamResponse.headers.get("content-length"),
-		provider,
-		statusCode: upstreamResponse.status
-	});
-	return observeImagesResponse(upstreamResponse, {
-		model: actualModel,
-		operation,
-		providerConfig,
-		onMetadata: (metadata) => debugJson(logger, `provider.images.${operation}.response.body`, {
-			provider,
-			...metadata
-		})
-	});
 }
 async function forwardCopilotImagesWithLogging(request, operation, context) {
 	const config = getRawProviderConfig(GITHUB_COPILOT_PROVIDER);
@@ -5389,7 +5407,7 @@ async function forwardCopilotImagesWithLogging(request, operation, context) {
 /** Forwards translated xAI requests and normalizes OpenAI-compatible output. */
 async function forwardXaiImagesWithLogging(providerConfig, request, operation, payload, { logger, provider }, body) {
 	return await ensureImageResponseB64Json(await forwardProviderImagesWithLogging(providerConfig, new Request(request.url, {
-		body: body ?? new TextEncoder().encode(JSON.stringify(payload)),
+		body,
 		duplex: "half",
 		headers: {
 			accept: "application/json",
@@ -5412,33 +5430,6 @@ async function forwardXaiImagesWithLogging(providerConfig, request, operation, p
 		responseFormat: payload.response_format === "url" ? "url" : "b64_json"
 	});
 }
-// src/services/codex/images.ts
-const DEFAULT_CODEX_IMAGE_MODEL = DEFAULT_IMAGE_MODELS.codex;
-const CODEX_IMAGES_TIMEOUT_MS = 9e5;
-const codexImagesDispatcher = createTimeoutDispatcher(CODEX_IMAGES_TIMEOUT_MS);
-function resolveCodexImagesUrl(requestUrl, operation) {
-	const upstreamUrl = new URL(`${CODEX_API_BASE_URL}/codex/images/${operation}`);
-	upstreamUrl.search = new URL(requestUrl, "http://localhost").search;
-	return upstreamUrl.toString();
-}
-async function forwardCodexImages(request, operation) {
-	const headers = buildCodexRequestHeaders(request.headers);
-	if (!headers.has("accept")) headers.set("accept", "application/json");
-	if (operation === "generations" && !headers.has("content-type")) headers.set("content-type", "application/json");
-	const init = {
-		method: "POST",
-		headers,
-		body: request.body,
-		duplex: "half",
-		signal: AbortSignal.any([request.signal, AbortSignal.timeout(CODEX_IMAGES_TIMEOUT_MS)])
-	};
-	const upstreamUrl = resolveCodexImagesUrl(request.url, operation);
-	if (typeof Bun !== "undefined") return await fetch(upstreamUrl, init);
-	return await fetch$1(upstreamUrl, {
-		...init,
-		dispatcher: codexImagesDispatcher
-	});
-}
 // src/routes/images/xai-json-request.ts
 /** Existing translators validate a bounded skeleton; large strings stay on disk. */
 async function translateXaiImageJsonRequest(request, operation, model) {
@@ -5456,11 +5447,9 @@ async function translateXaiImageJsonRequest(request, operation, model) {
 		} catch {
 			throw new XaiImagesRequestError("image b64_json is not valid base64");
 		}
-		const input = json.value;
 		return {
 			payload,
-			body: externalImageJsonStream(json, payload, request.signal),
-			requestedModel: typeof input.model === "string" ? input.model : model
+			body: externalImageJsonStream(json, payload, request.signal)
 		};
 	} catch (error) {
 		await json.cleanup();
@@ -5468,25 +5457,21 @@ async function translateXaiImageJsonRequest(request, operation, model) {
 	}
 }
 // src/routes/images/default-model.ts
-/** Resolve the three supported image models before sending the request. */
+/** Only missing models and bare gpt-image-2 select an available default. */
 async function resolveImageRequestModel(requestedModel, options = {}) {
-	if (options.provider) {
-		const model = getDefaultImageModel(options.provider);
-		if (model) return model;
+	const requested = requestedModel?.trim();
+	if (requested && requested !== DEFAULT_IMAGE_MODELS.codex) {
+		const alias = parseProviderModelAlias(requested);
+		if (alias) return alias;
+		return {
+			provider: "codex",
+			model: requested
+		};
 	}
-	const availability = /* @__PURE__ */ new Map();
-	const isAvailable = (provider) => {
-		let pending = availability.get(provider);
-		if (!pending) {
-			pending = provider === "github-copilot" ? Promise.resolve((options.isGitHubCopilotAvailable ?? isGitHubCopilotAvailable)()) : (options.resolveProviderConfig ?? resolveProviderConfig)(provider).then((config) => config !== null);
-			availability.set(provider, pending);
-		}
-		return pending;
+	for (const provider of IMAGE_PROVIDER_PRIORITY) if (provider === "github-copilot" ? (options.isGitHubCopilotAvailable ?? isGitHubCopilotAvailable)() : await (options.resolveProviderConfig ?? resolveProviderConfig)(provider) !== null) return {
+		provider,
+		model: DEFAULT_IMAGE_MODELS[provider]
 	};
-	const requested = requestedModel?.trim();
-	const selected = IMAGE_PROVIDER_PRIORITY.find((provider) => requested === DEFAULT_IMAGE_MODELS[provider] || requested === `${provider}/${DEFAULT_IMAGE_MODELS[provider]}`);
-	if (selected && await isAvailable(selected)) return `${selected}/${DEFAULT_IMAGE_MODELS[selected]}`;
-	for (const provider of IMAGE_PROVIDER_PRIORITY) if (await isAvailable(provider)) return `${provider}/${DEFAULT_IMAGE_MODELS[provider]}`;
 	throw new HTTPError("No enabled image provider is available", Response.json({ error: {
 		message: "No enabled image provider is available",
 		type: "invalid_request_error"
@@ -5495,84 +5480,18 @@ async function resolveImageRequestModel(requestedModel, options = {}) {
 // src/routes/images/shared.ts
 const logger$15 = createHandlerLogger("images-handler");
 const imageRouteDependencies = {
-	debugJsonAsync,
-	getImageEditModel,
-	getImageGenerationModel,
 	isGitHubCopilotAvailable,
 	resolveMappedModel,
 	resolveProviderConfig
 };
-function imageEditContentTypeErrorResponse(c) {
-	const mediaType = c.req.header("content-type")?.split(";", 1)[0]?.trim().toLowerCase();
-	if (mediaType === "application/json" || mediaType === "multipart/form-data") return null;
-	return c.json({ error: {
-		message: "Image edits require application/json or multipart/form-data",
-		type: "invalid_request_error"
-	} }, 415);
-}
-function getContentMetadata(headers) {
-	return {
-		contentType: headers.get("content-type"),
-		contentLength: headers.get("content-length")
-	};
-}
-/**
-* Parses an image request body as JSON, retaining the original bytes for
-* unchanged forwarding while allowing model mapping to rebuild the payload.
-* Rebuilt bodies stay binary so Node does not synthesize a text/plain content type.
-*/
-async function parseJsonImagesRequest(request) {
-	const parsed = await prepareImageJsonRequest(request);
-	return parsed.valid ? parsed : parsed.originalRequest;
-}
-/**
-* Handles Codex images proxying. Pass a resolvedProviderConfig when the
-* caller already resolved the codex provider to avoid a second resolve, and
-* pass a request when model mapping rebuilt the request body.
-*/
-async function handleCodexImages(c, operation, resolvedProviderConfig, request = c.req.raw, model) {
-	try {
-		const codexProviderConfig = resolvedProviderConfig ?? await imageRouteDependencies.resolveProviderConfig("codex");
-		if (!codexProviderConfig) {
-			await request.body?.cancel().catch(() => {});
-			return c.json({ error: {
-				message: "Provider 'codex' not found or disabled",
-				type: "invalid_request_error"
-			} }, 404);
-		}
-		let actualModel = model;
-		if (actualModel === void 0 && !request.headers.get("content-type")?.includes("multipart/form-data")) {
-			const parsed = await prepareImageJsonRequest(request);
-			actualModel = parsed.valid ? parsed.model ?? DEFAULT_CODEX_IMAGE_MODEL : "unknown";
-			request = parsed.originalRequest;
-		}
-		actualModel ??= "unknown";
-		request = await logImageEditRequest(logger$15, `images.${operation}.codex.request`, request, {}, imageRouteDependencies.debugJsonAsync);
-		const upstreamResponse = await forwardCodexImages(request, operation);
-		debugJson(logger$15, `images.${operation}.codex.response`, {
-			...getContentMetadata(upstreamResponse.headers),
-			statusCode: upstreamResponse.status
-		});
-		return observeImagesResponse(upstreamResponse, {
-			model: actualModel,
-			operation,
-			providerConfig: codexProviderConfig,
-			onMetadata: (metadata) => debugJson(logger$15, `images.${operation}.codex.response.body`, metadata)
-		});
-	} catch (error) {
-		await request.body?.cancel().catch(() => {});
-		logger$15.error(`images.${operation}.codex.error`, { error });
-		return await forwardError(c, error);
-	}
-}
 /**
-* Applies model mappings and resolves unknown or absent models to an available
-* provider's image default before dispatching.
+* Apply model mappings and resolve automatic defaults before dispatching.
+* Explicit targets retain their model and never fall back to another provider.
 */
-async function routeImagesRequest(c, operation, parsed) {
-	let resolvedModel;
+async function routeImagesRequest(operation, parsed) {
+	let alias;
 	try {
-		resolvedModel = await resolveImageRequestModel(parsed.model?.trim() ? imageRouteDependencies.resolveMappedModel(parsed.model.trim()) : void 0, {
+		alias = await resolveImageRequestModel(parsed.model?.trim() ? imageRouteDependencies.resolveMappedModel(parsed.model.trim()) : void 0, {
 			resolveProviderConfig: imageRouteDependencies.resolveProviderConfig,
 			isGitHubCopilotAvailable: imageRouteDependencies.isGitHubCopilotAvailable
 		});
@@ -5580,9 +5499,7 @@ async function routeImagesRequest(c, operation, parsed) {
 		await parsed.originalRequest?.body?.cancel().catch(() => {});
 		throw error;
 	}
-	const alias = parseProviderModelAlias(resolvedModel);
-	if (!alias) throw new Error("Invalid resolved image model");
-	consola.debug(`Resolved image model: ${parsed.model ?? "(default)"} -> ${resolvedModel}`);
+	consola.debug(`Resolved image model: ${parsed.model ?? "(default)"} -> ${alias.provider}/${alias.model}`);
 	const request = parsed.originalRequest && (alias.provider === "xai" || parsed.model === alias.model) ? parsed.originalRequest : await parsed.createRequest(alias.model, alias.provider);
 	if (alias.provider === "github-copilot") return await forwardCopilotImagesWithLogging(request, operation, {
 		logger: logger$15,
@@ -5596,101 +5513,33 @@ async function routeImagesRequest(c, operation, parsed) {
 			type: "invalid_request_error"
 		} }, { status: 404 }));
 	}
-	if (alias.provider === "codex") return await handleCodexImages(c, operation, providerConfig, request, alias.model);
+	if (alias.provider !== "xai") return await forwardProviderImagesWithLogging(providerConfig, request, operation, {
+		logger: logger$15,
+		...alias
+	});
 	const translated = await translateXaiImageJsonRequest(request, operation, alias.model);
 	return await forwardXaiImagesWithLogging(providerConfig, request, operation, translated.payload, {
 		logger: logger$15,
 		...alias
 	}, translated.body);
 }
-// src/routes/images/xai-handler.ts
-function xaiImagesRequestErrorResponse(c, error) {
-	if (!(error instanceof XaiImagesRequestError)) return null;
-	return c.json({ error: {
-		message: error.message,
-		type: "invalid_request_error"
-	} }, 400);
-}
-async function forwardTranslatedXaiImages(c, operation, payload, body) {
-	const providerConfig = await imageRouteDependencies.resolveProviderConfig("xai");
-	if (!providerConfig) {
-		await body?.cancel();
-		return c.json({ error: {
-			message: "Provider 'xai' not found or disabled",
-			type: "invalid_request_error"
-		} }, 404);
-	}
-	return await forwardXaiImagesWithLogging(providerConfig, c.req.raw, operation, payload, {
-		logger: logger$15,
-		provider: "xai"
-	}, body);
-}
-async function handleXaiImageGeneration(c, model) {
-	const translated = await translateXaiImageJsonRequest(c.req.raw, "generations", model);
-	return await forwardTranslatedXaiImages(c, "generations", translated.payload, translated.body);
-}
-async function handleXaiImageEdit(c, model, multipartPayload) {
-	if (multipartPayload) return await forwardTranslatedXaiImages(c, "edits", translateXaiImageEditJson(multipartPayload, model));
-	const translated = await translateXaiImageJsonRequest(c.req.raw, "edits", model);
-	return await forwardTranslatedXaiImages(c, "edits", translated.payload, translated.body);
-}
-// src/routes/images/edits-handler.ts
-async function handleImagesEdits(c) {
+// src/routes/images/handler.ts
+async function handleImages(c, operation) {
 	try {
-		const configuredModel = imageRouteDependencies.getImageEditModel();
-		if (configuredModel.status === "invalid") return c.json({ error: {
-			message: configuredModel.message,
-			type: "invalid_request_error"
-		} }, 400);
-		const contentTypeError = imageEditContentTypeErrorResponse(c);
-		if (contentTypeError) return contentTypeError;
-		const multipart = await parseMultipartImageEdit(c.req.raw);
-		if (multipart) try {
-			if (configuredModel.status === "xai") return await handleXaiImageEdit(c, configuredModel.model, await multipart.readPayload());
-			return await routeImagesRequest(c, "edits", {
-				model: multipart.model,
-				createRequest: (model, provider) => multipart.createRequest(model, provider)
-			});
-		} catch (error) {
-			await multipart.cleanup();
-			throw error;
-		} finally {
-			multipart.scheduleCleanup();
-		}
-		if (configuredModel.status === "xai") return await handleXaiImageEdit(c, configuredModel.model);
-		const parsed = await parseJsonImagesRequest(c.req.raw);
-		if (parsed instanceof Request) return await handleCodexImages(c, "edits", void 0, parsed, "unknown");
-		return await routeImagesRequest(c, "edits", parsed);
+		return await withImageEditRequest(c, operation, async (multipart) => {
+			return await routeImagesRequest(operation, multipart ?? await prepareImageJsonRequest(c.req.raw));
+		});
 	} catch (error) {
 		const invalidRequest = imageEditRequestErrorResponse(c, error);
 		if (invalidRequest) return invalidRequest;
-		logger$15.error("images.edits.error", { error });
-		return await forwardError(c, error);
-	}
-}
-// src/routes/images/generations-handler.ts
-async function handleImagesGenerations(c) {
-	try {
-		const configuredModel = imageRouteDependencies.getImageGenerationModel();
-		if (configuredModel.status === "invalid") return c.json({ error: {
-			message: configuredModel.message,
-			type: "invalid_request_error"
-		} }, 400);
-		if (configuredModel.status === "xai") return await handleXaiImageGeneration(c, configuredModel.model);
-		const parsed = await parseJsonImagesRequest(c.req.raw);
-		if (parsed instanceof Request) return await handleCodexImages(c, "generations", void 0, parsed, "unknown");
-		return await routeImagesRequest(c, "generations", parsed);
-	} catch (error) {
-		const invalidRequest = xaiImagesRequestErrorResponse(c, error);
-		if (invalidRequest) return invalidRequest;
-		logger$15.error("images.generations.error", { error });
+		logger$15.error(`images.${operation}.error`, { error });
 		return await forwardError(c, error);
 	}
 }
 // src/routes/images/route.ts
 const imageRoutes = new Hono();
-imageRoutes.post("/generations", handleImagesGenerations);
-imageRoutes.post("/edits", handleImagesEdits);
+imageRoutes.post("/generations", (c) => handleImages(c, "generations"));
+imageRoutes.post("/edits", (c) => handleImages(c, "edits"));
 // src/lib/model-pdf-support.ts
 function resolveModelPdfSupport(provider, options) {
 	if (options.supportPdf !== void 0) return options.supportPdf;
@@ -14164,41 +14013,35 @@ const providerImageRoutes = new Hono();
 async function handleProviderImages(c, operation) {
 	const provider = c.req.param("provider") ?? "";
 	try {
-		if (provider === "github-copilot") return await handleCopilotImages(c, operation);
-		const providerConfig = await resolveProviderConfig(provider);
-		if (!providerConfig) return c.json({ error: {
+		const providerConfig = provider === "github-copilot" ? null : await resolveProviderConfig(provider);
+		if (!providerConfig && provider !== "github-copilot") return c.json({ error: {
 			message: `Provider '${provider}' not found or disabled`,
 			type: "invalid_request_error"
 		} }, 404);
-		if (operation === "edits" && (providerConfig.name === "codex" || providerConfig.name === "xai")) {
-			const contentTypeError = imageEditContentTypeErrorResponse(c);
-			if (contentTypeError) return contentTypeError;
-			const multipart = await parseMultipartImageEdit(c.req.raw);
-			if (multipart) try {
-				const model = await resolveImageRequestModel(multipart.model, { provider: providerConfig.name });
-				const request = await multipart.createRequest(model, providerConfig.name);
-				if (providerConfig.name === "codex") return await handleCodexImages(c, operation, providerConfig, request, model);
-				return await forwardProviderImagesWithLogging(providerConfig, request, operation, {
-					logger: logger$6,
-					provider,
-					model
-				});
-			} finally {
-				await multipart.cleanup();
-			}
-		}
-		if (getDefaultImageModel(providerConfig.name)) {
-			const { request, model } = await prepareProviderJsonImages(c.req.raw, providerConfig.name);
-			if (providerConfig.name === "codex") return await handleCodexImages(c, operation, providerConfig, request, model);
-			return await forwardProviderImagesWithLogging(providerConfig, request, operation, {
+		const forward = async (request, model) => {
+			const context = {
 				logger: logger$6,
 				provider,
 				model
-			});
-		}
-		return await forwardProviderImagesWithLogging(providerConfig, c.req.raw, operation, {
-			logger: logger$6,
-			provider
+			};
+			if (!providerConfig) return await forwardCopilotImagesWithLogging(request, operation, context);
+			return await forwardProviderImagesWithLogging(providerConfig, request, operation, context);
+		};
+		const target = providerConfig?.name ?? provider;
+		const defaultModel = getDefaultImageModel(target);
+		if (!defaultModel) return await forward(c.req.raw);
+		return await withImageEditRequest(c, operation, async (multipart) => {
+			const parsed = multipart ?? await prepareImageJsonRequest(c.req.raw);
+			try {
+				const requested = parsed.model?.trim();
+				const alias = requested ? parseProviderModelAlias(requested) : null;
+				const model = (alias?.provider === target ? alias.model : requested) || defaultModel;
+				const request = parsed.model === model && parsed.originalRequest ? parsed.originalRequest : await parsed.createRequest(model, target);
+				return await forward(request, model);
+			} catch (error) {
+				await parsed.originalRequest?.body?.cancel().catch(() => {});
+				throw error;
+			}
 		});
 	} catch (error) {
 		const invalidRequest = imageEditRequestErrorResponse(c, error);
@@ -14210,46 +14053,6 @@ async function handleProviderImages(c, operation) {
 		return await forwardError(c, error);
 	}
 }
-async function handleCopilotImages(c, operation) {
-	if (operation === "edits") {
-		const contentTypeError = imageEditContentTypeErrorResponse(c);
-		if (contentTypeError) return contentTypeError;
-		const multipart = await parseMultipartImageEdit(c.req.raw);
-		if (multipart) try {
-			const model = await resolveImageRequestModel(multipart.model, { provider: GITHUB_COPILOT_PROVIDER });
-			return await forwardCopilotImagesWithLogging(await multipart.createRequest(model, GITHUB_COPILOT_PROVIDER), operation, {
-				logger: logger$6,
-				provider: GITHUB_COPILOT_PROVIDER,
-				model
-			});
-		} finally {
-			await multipart.cleanup();
-		}
-	}
-	const { request, model } = await prepareProviderJsonImages(c.req.raw, GITHUB_COPILOT_PROVIDER);
-	return await forwardCopilotImagesWithLogging(request, operation, {
-		logger: logger$6,
-		provider: GITHUB_COPILOT_PROVIDER,
-		model
-	});
-}
-async function prepareProviderJsonImages(request, provider) {
-	const parsed = await parseJsonImagesRequest(request);
-	if (parsed instanceof Request) return {
-		request: parsed,
-		model: "unknown"
-	};
-	try {
-		const model = await resolveImageRequestModel(parsed.model, { provider });
-		return {
-			model,
-			request: parsed.model === model && parsed.originalRequest ? parsed.originalRequest : await parsed.createRequest(model)
-		};
-	} catch (error) {
-		await parsed.originalRequest?.body?.cancel().catch(() => {});
-		throw error;
-	}
-}
 providerImageRoutes.post("/generations", (c) => handleProviderImages(c, "generations"));
 providerImageRoutes.post("/edits", (c) => handleProviderImages(c, "edits"));
 // src/routes/provider/messages/route.ts
@@ -16270,4 +16073,4 @@ function createServer(options = {}) {
 createServer();
 export { createServer };
 
-//# sourceMappingURL=server-Cw9qn5Gt.js.map
+//# sourceMappingURL=server-De8OQQe6.js.map