ima2-gen 1.1.21 → 1.1.22

package/lib/oauthProxy/references.ts

@@ -1,45 +0,0 @@
-import { detectImageMimeFromB64 } from "../refs.js";
-
-export interface OAuthReferenceInput {
-  b64?: string;
-  declaredMime?: string | null;
-  detectedMime?: string | null;
-  warnings?: string[];
-  approxBytes?: number | null;
-  source?: string | null;
-}
-
-export type OAuthReferenceRef = string | OAuthReferenceInput | null | undefined;
-
-export function supportedImageMime(mime: string | null | undefined): boolean {
-  return mime === "image/png" || mime === "image/jpeg" || mime === "image/webp";
-}
-
-export function normalizeReferenceForOAuth(ref: OAuthReferenceRef, index: number) {
-  const refObj = (typeof ref === "object" && ref) ? ref : null;
-  const b64 = typeof ref === "string" ? ref : refObj?.b64;
-  const declaredMime = refObj ? refObj.declaredMime || null : null;
-  const detectedMime = refObj
-    ? refObj.detectedMime || detectImageMimeFromB64(b64)
-    : detectImageMimeFromB64(b64);
-  const warnings = Array.isArray(refObj?.warnings) ? [...(refObj?.warnings ?? [])] : [];
-  if (declaredMime && detectedMime && declaredMime !== detectedMime && !warnings.includes("mime_mismatch")) {
-    warnings.push("mime_mismatch");
-  }
-  const requestMime = supportedImageMime(detectedMime)
-    ? detectedMime
-    : supportedImageMime(declaredMime)
-      ? declaredMime
-      : "image/png";
-  return {
-    index,
-    b64,
-    declaredMime,
-    detectedMime,
-    requestMime,
-    b64Chars: typeof b64 === "string" ? b64.length : 0,
-    approxBytes: Number.isFinite(refObj?.approxBytes) ? refObj?.approxBytes ?? null : null,
-    source: refObj?.source || (declaredMime ? "dataUrl" : "rawBase64"),
-    warnings,
-  };
-}

package/lib/oauthProxy/runtime.ts

@@ -1,115 +0,0 @@
-import { config } from "../../config.js";
-import { logEvent } from "../logger.js";
-import { isAbortError, makeOAuthError } from "./errors.js";
-import type { RouteRuntimeContext } from "../runtimeContext.js";
-
-import { errInfo } from "../errInfo.js";
-const FALLBACK_REASONING_EFFORT = "none";
-const VALID_REASONING_EFFORTS = new Set(["none", "low", "medium", "high", "xhigh"]);
-
-export interface OAuthRuntimeOptions {
-  reasoningEffort?: unknown;
-  webSearchEnabled?: unknown;
-  searchMode?: unknown;
-}
-
-export function resolveReasoningEffort(ctx: RouteRuntimeContext | undefined, options: OAuthRuntimeOptions = {}) {
-  const fromOptions = typeof options.reasoningEffort === "string" ? options.reasoningEffort : null;
-  const fromCtx = typeof ctx?.config?.imageModels?.reasoningEffort === "string"
-    ? ctx.config.imageModels.reasoningEffort
-    : null;
-  const candidate = fromOptions || fromCtx || FALLBACK_REASONING_EFFORT;
-  return VALID_REASONING_EFFORTS.has(candidate) ? candidate : FALLBACK_REASONING_EFFORT;
-}
-
-export function resolveWebSearchEnabled(options: OAuthRuntimeOptions = {}) {
-  return options.webSearchEnabled !== false && options.searchMode !== "off";
-}
-
-export function buildImageTools(webSearchEnabled: boolean, imageOptions: Record<string, unknown>) {
-  return [
-    ...(webSearchEnabled ? [{ type: "web_search" }] : []),
-    { type: "image_generation", ...imageOptions },
-  ];
-}
-
-export function getOAuthUrl(ctx: RouteRuntimeContext = {}) {
-  return ctx.oauthUrl || `http://127.0.0.1:${config.oauth.proxyPort}`;
-}
-
-export function getOAuthGenerationTimeoutMs(ctx: RouteRuntimeContext = {}) {
-  return ctx.config?.oauth?.generationTimeoutMs ?? config.oauth.generationTimeoutMs ?? 400 * 1000;
-}
-
-export function createOAuthGenerationTimeout(ctx: RouteRuntimeContext = {}, requestId: string | null = null, scope: string = "oauth") {
-  const timeoutMs = getOAuthGenerationTimeoutMs(ctx);
-  if (!Number.isFinite(timeoutMs) || timeoutMs <= 0) {
-    return {
-      signal: undefined as AbortSignal | undefined,
-      timeoutMs,
-      clear: () => {},
-      isTimeoutError: (_err: unknown) => false,
-    };
-  }
-  const controller = new AbortController();
-  let timedOut = false;
-  const timer = setTimeout(() => {
-    timedOut = true;
-    logEvent(scope, "timeout", { requestId, timeoutMs });
-    controller.abort();
-  }, timeoutMs);
-  return {
-    signal: controller.signal as AbortSignal | undefined,
-    timeoutMs,
-    clear: () => clearTimeout(timer),
-    isTimeoutError: (err: unknown) => timedOut && isAbortError(err),
-  };
-}
-
-export async function waitForOAuthReady(ctx: RouteRuntimeContext = {}) {
-  if (!ctx || ctx.oauthReadyState === undefined) return;
-  const initialState = ctx.oauthReadyState;
-  if (initialState === "ready" || initialState === "disabled") return;
-  if (initialState === "failed") {
-    throw makeOAuthError("OAuth proxy is unavailable", { code: "OAUTH_UNAVAILABLE", status: 503 });
-  }
-  const timeoutMs = ctx.config?.oauth?.statusTimeoutMs ?? config.oauth.statusTimeoutMs;
-  if (ctx.oauthReadyPromise) {
-    await Promise.race([
-      ctx.oauthReadyPromise,
-      new Promise((resolve) => setTimeout(resolve, timeoutMs)),
-    ]);
-  }
-  const finalState = ctx.oauthReadyState;
-  if (finalState !== "ready" && finalState !== "disabled") {
-    throw makeOAuthError("OAuth proxy is not ready yet", { code: "OAUTH_UNAVAILABLE", status: 503 });
-  }
-}
-
-export async function fetchOAuth(url: string, init: RequestInit, { requestId, scope }: { requestId?: string | null; scope?: string } = {}) {
-  try {
-    return await fetch(url, init);
-  } catch (e) {
-    const err = errInfo(e);
-    if (isAbortError(err.raw)) throw err.raw;
-    logEvent(scope || "oauth", "proxy_unavailable", { requestId, message: err.message });
-    throw makeOAuthError("OAuth proxy is unavailable", {
-      code: "OAUTH_UNAVAILABLE",
-      status: 503,
-      cause: err.raw,
-    });
-  }
-}
-
-export function summarizeEventTypes(eventTypes: Record<string, unknown> = {}) {
-  const entries = Object.entries(eventTypes || {});
-  const countFor = (needle: string) =>
-    entries.reduce((sum, [key, value]) => sum + (key.includes(needle) && Number.isFinite(value) ? (value as number) : 0), 0);
-  return {
-    eventTypeCount: entries.length,
-    eventTypeKeys: entries.slice(0, 12).map(([key]) => key).join(","),
-    imageEventCount: countFor("image"),
-    partialEventCount: countFor("partial"),
-    completedEventCount: countFor("completed"),
-  };
-}

package/lib/oauthProxy/streams.ts

@@ -1,232 +0,0 @@
-import { setJobPhase } from "../inflight.js";
-import { logEvent } from "../logger.js";
-import { makeOAuthError } from "./errors.js";
-
-import { errInfo } from "../errInfo.js";
-export function extractSseData(block: string): string {
-  let eventData = "";
-  for (const line of block.split("\n")) {
-    if (line.startsWith("data: ")) eventData += line.slice(6);
-  }
-  return eventData;
-}
-
-interface SseImageData {
-  type?: string;
-  partial_image?: string;
-  image?: string;
-  result?: string;
-  index?: number;
-  item?: {
-    type?: string;
-    partial_image?: string;
-    image?: string;
-    result?: string;
-    revised_prompt?: string;
-    index?: number;
-  };
-  error?: { code?: string };
-  response?: {
-    usage?: unknown;
-    tool_usage?: { web_search?: { num_requests?: number } };
-  };
-}
-
-export function extractPartialImage(data: SseImageData | null | undefined) {
-  if (!data || typeof data?.type !== "string" || !data.type.includes("partial")) return null;
-  const item = data.item || {};
-  const b64 =
-    data.partial_image ||
-    data.image ||
-    data.result ||
-    item.partial_image ||
-    item.image ||
-    item.result;
-  if (typeof b64 !== "string" || b64.length === 0) return null;
-  const index =
-    Number.isFinite(data.index) ? data.index :
-      Number.isFinite(item.index) ? item.index :
-        null;
-  return { b64, index, eventType: data.type };
-}
-
-export async function readImageStream(res: Response, { requestId = null, scope = "oauth", onPartialImage = null as ((p: any) => void) | null }: { requestId?: string | null; scope?: string; onPartialImage?: ((p: any) => void) | null } = {}) {
-  const eventTypes: Record<string, number> = {};
-  let parseSkipCount = 0;
-  if (!res.body) throw makeOAuthError("OAuth response missing body", { code: "OAUTH_NO_BODY" });
-  const reader = res.body.getReader();
-  const decoder = new TextDecoder();
-  let buffer = "";
-  let imageB64: string | null = null;
-  let usage: unknown = null;
-  let webSearchCalls = 0;
-  let eventCount = 0;
-  let revisedPrompt: string | null = null;
-
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) break;
-    buffer += decoder.decode(value, { stream: true });
-
-    let boundary;
-    while ((boundary = buffer.indexOf("\n\n")) !== -1) {
-      const block = buffer.slice(0, boundary);
-      buffer = buffer.slice(boundary + 2);
-      const eventData = extractSseData(block);
-      if (!eventData || eventData === "[DONE]") continue;
-
-      try {
-        const data = JSON.parse(eventData) as SseImageData;
-        eventCount++;
-        const t = typeof data.type === "string" ? data.type : "_unknown";
-        eventTypes[t] = (eventTypes[t] || 0) + 1;
-
-        const partial = extractPartialImage(data);
-        if (partial) {
-          logEvent(scope, "partial", {
-            requestId,
-            index: partial.index,
-            imageChars: partial.b64.length,
-            eventType: partial.eventType,
-          });
-          if (requestId) setJobPhase(requestId, "partial");
-          if (typeof onPartialImage === "function") onPartialImage(partial);
-        }
-        if (data.type === "response.output_item.done" && data.item?.type === "image_generation_call") {
-          if (data.item.result) {
-            const imageB64Local: string = data.item.result;
-            imageB64 = imageB64Local;
-            logEvent(scope, "image", { requestId, imageChars: imageB64.length });
-            if (requestId) setJobPhase(requestId, "decoding");
-          }
-          if (typeof data.item.revised_prompt === "string" && data.item.revised_prompt.length) {
-            revisedPrompt = data.item.revised_prompt;
-          }
-        }
-        if (data.type === "response.output_item.done" && data.item?.type === "web_search_call") {
-          webSearchCalls += 1;
-        }
-        if (data.type === "response.completed") {
-          usage = data.response?.usage || null;
-          const wsNum = data.response?.tool_usage?.web_search?.num_requests;
-          if (typeof wsNum === "number" && wsNum > webSearchCalls) webSearchCalls = wsNum;
-        }
-        if (data.type === "error") {
-          const code = data.error?.code || "OAUTH_STREAM_ERROR";
-          logEvent(scope, "stream_error", { requestId, code, eventType: data.type, eventCount });
-          throw makeOAuthError("OAuth stream returned an error", {
-            code,
-            eventType: data.type,
-            eventCount,
-          });
-        }
-      } catch (e) {
-        const err = errInfo(e);
-        if (err.message && !err.message.startsWith("Unexpected")) throw e;
-        parseSkipCount++;
-      }
-    }
-  }
-
-  if (parseSkipCount > 0) {
-    logEvent(scope, "parse_skip", { requestId, count: parseSkipCount });
-  }
-
-  return { imageB64, usage, webSearchCalls, revisedPrompt, eventCount, eventTypes };
-}
-
-export async function readMultimodeImageStream(
-  res: Response,
-  { requestId = null, maxImages = 1, scope = "oauth-multimode", onPartialImage = null as ((p: any) => void) | null }: { requestId?: string | null; maxImages?: number; scope?: string; onPartialImage?: ((p: any) => void) | null } = {},
-) {
-  const eventTypes: Record<string, number> = {};
-  let parseSkipCount = 0;
-  if (!res.body) throw makeOAuthError("OAuth response missing body", { code: "OAUTH_NO_BODY" });
-  const reader = res.body.getReader();
-  const decoder = new TextDecoder();
-  let buffer = "";
-  const images: Array<{ b64: string; revisedPrompt: string | null; index?: number }> = [];
-  let usage: unknown = null;
-  let webSearchCalls = 0;
-  let eventCount = 0;
-  const limit = Math.min(8, Math.max(1, Math.trunc(Number(maxImages) || 1)));
-  let extraIgnored = 0;
-
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) break;
-    buffer += decoder.decode(value, { stream: true });
-
-    let boundary;
-    while ((boundary = buffer.indexOf("\n\n")) !== -1) {
-      const block = buffer.slice(0, boundary);
-      buffer = buffer.slice(boundary + 2);
-      const eventData = extractSseData(block);
-      if (!eventData || eventData === "[DONE]") continue;
-
-      try {
-        const data = JSON.parse(eventData) as SseImageData;
-        eventCount++;
-        const t = typeof data.type === "string" ? data.type : "_unknown";
-        eventTypes[t] = (eventTypes[t] || 0) + 1;
-
-        const partial = extractPartialImage(data);
-        if (partial) {
-          logEvent(scope, "partial", {
-            requestId,
-            index: partial.index,
-            imageChars: partial.b64.length,
-            eventType: partial.eventType,
-          });
-          if (requestId) setJobPhase(requestId, "partial");
-          if (typeof onPartialImage === "function") onPartialImage(partial);
-        }
-        if (data.type === "response.output_item.done" && data.item?.type === "image_generation_call") {
-          if (data.item.result) {
-            if (images.length < limit) {
-              images.push({
-                b64: data.item.result,
-                revisedPrompt:
-                  typeof data.item.revised_prompt === "string" && data.item.revised_prompt.length
-                    ? data.item.revised_prompt
-                    : null,
-              });
-              logEvent(scope, "image", { requestId, imageChars: data.item.result.length, index: images.length });
-              if (requestId) setJobPhase(requestId, "decoding");
-            } else {
-              extraIgnored += 1;
-              logEvent(scope, "extra_ignored", { requestId, maxImages: limit });
-            }
-          }
-        }
-        if (data.type === "response.output_item.done" && data.item?.type === "web_search_call") {
-          webSearchCalls += 1;
-        }
-        if (data.type === "response.completed") {
-          usage = data.response?.usage || null;
-          const wsNum = data.response?.tool_usage?.web_search?.num_requests;
-          if (typeof wsNum === "number" && wsNum > webSearchCalls) webSearchCalls = wsNum;
-        }
-        if (data.type === "error") {
-          const code = data.error?.code || "OAUTH_STREAM_ERROR";
-          logEvent(scope, "stream_error", { requestId, code, eventType: data.type, eventCount });
-          throw makeOAuthError("OAuth stream returned an error", {
-            code,
-            eventType: data.type,
-            eventCount,
-          });
-        }
-      } catch (e) {
-        const err = errInfo(e);
-        if (err.message && !err.message.startsWith("Unexpected")) throw e;
-        parseSkipCount++;
-      }
-    }
-  }
-
-  if (parseSkipCount > 0) {
-    logEvent(scope, "parse_skip", { requestId, count: parseSkipCount });
-  }
-
-  return { images, usage, webSearchCalls, eventCount, eventTypes, extraIgnored };
-}

package/lib/oauthProxy/types.ts

@@ -1,9 +0,0 @@
-// Shared loose types for the oauthProxy module split.
-//
-// Behavior parity with the pre-split lib/oauthProxy.ts is the priority during
-// Phase 3; strict cleanup is deferred to later phases. The aliases below are
-// intentionally `any` so callers do not see signature changes.
-
-export type ImageOptions = any;
-export type OAuthCtx = any;
-export type Reference = any;

package/lib/oauthProxy.ts

@@ -1,3 +0,0 @@
-// Facade — preserves the public import path `./oauthProxy.js`.
-// All implementation lives under `lib/oauthProxy/`.
-export * from "./oauthProxy/index.js";

package/lib/openDirectory.ts

@@ -1,47 +0,0 @@
-import { spawn } from "node:child_process";
-import { mkdir } from "node:fs/promises";
-
-import { errInfo } from "./errInfo.js";
-export async function openDirectory(dir: string, options: any = {}) {
-  await mkdir(dir, { recursive: true });
-  const platform = options.platform || process.platform;
-  const spawnImpl = options.spawnImpl || spawn;
-  const settleMs = Number.isFinite(options.settleMs) ? options.settleMs : 250;
-  const command =
-    platform === "darwin" ? "open"
-    : platform === "win32" ? "explorer"
-    : "xdg-open";
-
-  return new Promise((resolve) => {
-    try {
-      const isWin = platform === "win32";
-      const child = spawnImpl(command, [dir], {
-        detached: !isWin,
-        stdio: "ignore",
-        windowsHide: !isWin,
-      });
-      let settled = false;
-      const done = (result: { ok: boolean; error?: string }) => {
-        if (settled) return;
-        settled = true;
-        resolve(result);
-      };
-      child.on("error", (err: Error) => {
-        done({ ok: false, error: err.message || String(err) });
-      });
-      child.on("exit", (code: number | null) => {
-        if (platform === "win32") {
-          done({ ok: true });
-          return;
-        }
-        if (code === 0) done({ ok: true });
-        else if (code != null) done({ ok: false, error: `${command} exited with code ${code}` });
-      });
-      child.unref?.();
-      setTimeout(() => done({ ok: true }), settleMs).unref?.();
-    } catch (e) {
-      const err = errInfo(e);
-      resolve({ ok: false, error: err.message || String(err.raw) });
-    }
-  });
-}

package/lib/pngInfo.ts

@@ -1,26 +0,0 @@
-const PNG_SIGNATURE_HEX = "89504e470d0a1a0a";
-const IHDR_TYPE = "IHDR";
-
-export function parsePngInfo(buffer: Buffer) {
-  if (!Buffer.isBuffer(buffer) || buffer.length < 33) {
-    return { error: "INVALID_PNG" };
-  }
-  if (buffer.subarray(0, 8).toString("hex") !== PNG_SIGNATURE_HEX) {
-    return { error: "INVALID_PNG" };
-  }
-  const ihdrLength = buffer.readUInt32BE(8);
-  const chunkType = buffer.subarray(12, 16).toString("ascii");
-  if (ihdrLength !== 13 || chunkType !== IHDR_TYPE) {
-    return { error: "INVALID_PNG_IHDR" };
-  }
-  return {
-    width: buffer.readUInt32BE(16),
-    height: buffer.readUInt32BE(20),
-    bitDepth: buffer.readUInt8(24),
-    colorType: buffer.readUInt8(25),
-  };
-}
-
-export function hasPngAlphaChannel(info: { colorType?: number } | null | undefined) {
-  return info?.colorType === 4 || info?.colorType === 6;
-}

package/lib/promptBuilder/attachments.ts

@@ -1,74 +0,0 @@
-import {
-  MAX_ATTACHMENTS,
-  MAX_TEXT_ATTACHMENT_CHARS,
-  MAX_ATTACHMENT_NAME_CHARS,
-  MAX_ATTACHMENT_MIME_CHARS,
-} from "./constants.js";
-import type { PromptBuilderAttachment } from "./types.js";
-
-export function normalizeAttachments(
-  raw: unknown,
-): PromptBuilderAttachment[] | undefined {
-  if (!Array.isArray(raw)) return undefined;
-  const attachments = raw.slice(0, MAX_ATTACHMENTS).flatMap((attachment): PromptBuilderAttachment[] => {
-    if (!attachment || typeof attachment !== "object") return [];
-    const item = attachment as Record<string, unknown>;
-    const kind =
-      item.kind === "image" || item.kind === "text" || item.kind === "file"
-        ? item.kind
-        : "file";
-    const name =
-      typeof item.name === "string" && item.name.trim()
-        ? item.name.trim().slice(0, MAX_ATTACHMENT_NAME_CHARS)
-        : "attachment";
-    const mimeType =
-      typeof item.mimeType === "string" && item.mimeType.trim()
-        ? item.mimeType.trim().slice(0, MAX_ATTACHMENT_MIME_CHARS)
-        : "application/octet-stream";
-    const size =
-      typeof item.size === "number" && Number.isFinite(item.size)
-        ? Math.max(0, Math.trunc(item.size))
-        : 0;
-    if (kind === "image") {
-      const dataUrl =
-        typeof item.dataUrl === "string" && item.dataUrl.startsWith("data:image/")
-          ? item.dataUrl
-          : "";
-      if (!dataUrl) return [];
-      return [{ kind, name, mimeType, size, dataUrl }];
-    }
-    if (kind === "text") {
-      const text = typeof item.text === "string" ? item.text.slice(0, MAX_TEXT_ATTACHMENT_CHARS) : "";
-      return [{ kind, name, mimeType, size, text }];
-    }
-    return [{ kind, name, mimeType, size }];
-  });
-  return attachments.length > 0 ? attachments : undefined;
-}
-
-export function attachmentText(
-  attachments: PromptBuilderAttachment[] | undefined,
-): string {
-  if (!attachments || attachments.length === 0) return "";
-  const lines = attachments.flatMap((attachment, index) => {
-    const label = `Attachment ${index + 1}: ${attachment.name} (${attachment.mimeType}, ${attachment.size} bytes)`;
-    if (attachment.kind === "text" && attachment.text?.trim()) {
-      return [`${label}\n${attachment.text.trim()}`];
-    }
-    if (attachment.kind === "image") {
-      return [`${label}\nImage is attached as visual reference.`];
-    }
-    return [label];
-  });
-  return `User attachments:\n${lines.join("\n\n")}`;
-}
-
-export function hasImageAttachments(
-  messages: Array<{ attachments?: PromptBuilderAttachment[] }>,
-): boolean {
-  return messages.some((message) =>
-    message.attachments?.some(
-      (attachment) => attachment.kind === "image" && attachment.dataUrl,
-    ),
-  );
-}

package/lib/promptBuilder/client.ts

@@ -1,130 +0,0 @@
-import { errInfo } from "../errInfo.js";
-import { logWarn } from "../logger.js";
-import { fetchOAuth, waitForOAuthReady } from "../oauthProxy/runtime.js";
-import type { RouteRuntimeContext } from "../runtimeContext.js";
-import { promptBuilderError } from "./errors.js";
-import { normalizeModel, normalizeMessages } from "./requestSchema.js";
-import { buildTransportPayload } from "./transport.js";
-import {
-  parseUpstreamError,
-  responseSummary,
-  extractChatText,
-  readResponsesResult,
-} from "./responseParser.js";
-import type {
-  PromptBuilderRequest,
-  PromptBuilderChatResult,
-  ChatCompletionBody,
-  ResponsesReadResult,
-} from "./types.js";
-
-export async function requestPromptBuilderChat(
-  ctx: RouteRuntimeContext,
-  input: PromptBuilderRequest,
-): Promise<PromptBuilderChatResult> {
-  const model = normalizeModel(input.model);
-  const messages = normalizeMessages(input.messages);
-
-  await waitForOAuthReady(ctx);
-
-  const timeoutMs = ctx.config?.oauth?.generationTimeoutMs ?? 120_000;
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-
-  try {
-    const { endpoint, body: payload } = buildTransportPayload(
-      model,
-      messages,
-      input.context,
-    );
-    const url = `${ctx.oauthUrl}${endpoint === "responses" ? "/v1/responses" : "/v1/chat/completions"}`;
-
-    const res = await fetchOAuth(
-      url,
-      {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        signal: controller.signal,
-        body: JSON.stringify(payload),
-      },
-      { scope: "prompt-builder" },
-    );
-
-    if (!res.ok) {
-      const text = await res.text();
-      const upstream = parseUpstreamError(text);
-      logWarn("prompt-builder", "upstream_failed", {
-        endpoint,
-        model,
-        status: res.status,
-        hasImageAttachments: endpoint === "responses",
-        upstreamBodyChars: text.length,
-        upstreamCode: upstream.upstreamCode,
-        upstreamType: upstream.upstreamType,
-        upstreamParam: upstream.upstreamParam,
-      });
-      const err = promptBuilderError(
-        "Prompt builder upstream failed",
-        "PROMPT_BUILDER_UPSTREAM_FAILED",
-        502,
-      );
-      err.upstreamStatus = res.status;
-      err.upstreamBodyChars = text.length;
-      err.upstreamEndpoint = endpoint;
-      err.upstreamCode = upstream.upstreamCode;
-      err.upstreamType = upstream.upstreamType;
-      err.upstreamParam = upstream.upstreamParam;
-      throw err;
-    }
-
-    const useResponses = endpoint === "responses";
-    const responseBody = useResponses
-      ? await readResponsesResult(res)
-      : ((await res.json()) as ChatCompletionBody);
-    const content = (
-      useResponses
-        ? (responseBody as ResponsesReadResult).content
-        : extractChatText(responseBody as ChatCompletionBody)
-    ).trim();
-
-    if (!content) {
-      const summary = useResponses
-        ? (responseBody as ResponsesReadResult).summary
-        : responseSummary(responseBody);
-      logWarn("prompt-builder", "empty_response", {
-        endpoint,
-        model,
-        ...summary,
-      });
-      const err = promptBuilderError(
-        "Prompt builder returned an empty response",
-        "PROMPT_BUILDER_EMPTY_RESPONSE",
-        502,
-      );
-      err.upstreamEndpoint = endpoint;
-      Object.assign(err, summary);
-      throw err;
-    }
-
-    return {
-      provider: "oauth",
-      model,
-      message: { role: "assistant", content },
-      usage: useResponses
-        ? (responseBody as ResponsesReadResult).usage
-        : ((responseBody as ChatCompletionBody).usage ?? null),
-    };
-  } catch (error) {
-    const info = errInfo(error);
-    if (info.name === "AbortError") {
-      throw promptBuilderError(
-        "Prompt builder timed out",
-        "PROMPT_BUILDER_TIMEOUT",
-        504,
-      );
-    }
-    throw info.raw;
-  } finally {
-    clearTimeout(timer);
-  }
-}