@bitkyc08/opencodex 2.40.0 → 2.41.0

package/src/client/hub-client.ts

@@ -1,5 +1,6 @@
 import { MAX_REMOTE_CATALOG_BYTES } from "../server/catalog-download";
 import { readBoundedResponseBytes } from "../lib/bounded-body";
+import { clearableDeadline } from "../lib/abort";
 
 /**
  * A pairing grant may cross loopback or authenticated HTTPS, and nothing else.
@@ -84,13 +85,17 @@ async function fetchBounded(
   url: string,
   init: RequestInit,
   timeoutMs: number | undefined,
+  timeoutScope: "request" | "headers" = "request",
 ): Promise<Response> {
+  const timeout = safeTimeout(timeoutMs);
+  const headerDeadline = timeoutScope === "headers" ? clearableDeadline(timeout) : null;
   try {
     const response = await fetchImpl(url, {
       ...init,
       redirect: "manual",
-      signal: AbortSignal.timeout(safeTimeout(timeoutMs)),
+      signal: headerDeadline?.signal ?? AbortSignal.timeout(timeout),
     });
+    headerDeadline?.clear();
     if (response.status >= 300 && response.status < 400 && response.status !== 304) {
       throw new HubClientError("redirect_refused", "Hub request redirect was refused", response.status);
     }
@@ -98,15 +103,24 @@ async function fetchBounded(
   } catch (error) {
     if (error instanceof HubClientError) throw error;
     throw new HubClientError("unreachable", "Hub request did not complete", undefined, { cause: error });
+  } finally {
+    headerDeadline?.clear();
   }
 }
 
-async function boundedText(response: Response, maxBytes: number): Promise<string> {
+async function boundedText(
+  response: Response,
+  maxBytes: number,
+  options: { inactivityTimeoutMs?: number } = {},
+): Promise<string> {
   const declared = Number(response.headers.get("content-length") ?? "0");
   if (Number.isFinite(declared) && declared > maxBytes) {
     throw new HubClientError("body_too_large", "Hub response exceeded the allowed size", response.status);
   }
-  const result = await readBoundedResponseBytes(response, { maxBytes });
+  const result = await readBoundedResponseBytes(response, {
+    maxBytes,
+    ...(options.inactivityTimeoutMs === undefined ? {} : { inactivityTimeoutMs: options.inactivityTimeoutMs }),
+  });
   if (result.oversized) {
     throw new HubClientError("body_too_large", "Hub response exceeded the allowed size", response.status);
   }
@@ -422,7 +436,7 @@ export async function downloadClientCatalog(
   const response = await fetchBounded(options.fetchImpl ?? fetch, `${origin}/v1/catalog`, {
     method: "GET",
     headers,
-  }, options.timeoutMs);
+  }, options.timeoutMs, "headers");
   if (response.status === 304) {
     throw new HubClientError("catalog_unexpected_304", "Hub answered 304 to an unconditional catalog request", 304);
   }
@@ -434,7 +448,17 @@ export async function downloadClientCatalog(
     try { await response.body?.cancel(); } catch { /* best effort */ }
     throw new HubClientError("catalog_content_type_invalid", "Hub catalog response was not JSON", response.status);
   }
-  const body = await boundedText(response, options.maxBytes ?? MAX_REMOTE_CATALOG_BYTES);
+  let body: string;
+  try {
+    body = await boundedText(response, options.maxBytes ?? MAX_REMOTE_CATALOG_BYTES, {
+      inactivityTimeoutMs: safeTimeout(options.timeoutMs),
+    });
+  } catch (error) {
+    if (error instanceof DOMException && error.name === "TimeoutError") {
+      throw new HubClientError("unreachable", "Hub catalog download stalled", undefined, { cause: error });
+    }
+    throw error;
+  }
   const parsed = parseJson(body, "catalog_invalid");
   validateRemoteCatalog(parsed);
   const keyId = response.headers.get("x-opencodex-key-id")?.trim() || undefined;

package/src/clients/config-export.ts

@@ -22,7 +22,7 @@
 import { homedir } from "node:os";
 import { existsSync, readFileSync } from "node:fs";
 import { isAbsolute, join, resolve } from "node:path";
-import { shouldInjectApiAuthHeader } from "../codex/inject";
+import { shouldInjectApiAuthHeader, standaloneCodexRoutingTarget } from "../codex/inject";
 import { FORMAT_MEDIA_TYPE, serializeDocument, type ConfigFormat } from "../integrations/serialize";
 import { providerCodexAccountMode } from "../providers/registry";
 import { canonicalizeReasoningEfforts, sanitizeCodexReasoningEfforts } from "../reasoning-effort";
@@ -301,7 +301,17 @@ export function ompModelsConfigPath(env: OpencodeLaunchEnv = process.env, home:
 }
 
 /** Compose the OpenAI-compatible proxy base URL from a live probe result. */
-export function opencodeProxyBaseUrl(port: number, hostname?: string): string {
+export function opencodeProxyBaseUrl(
+  port: number,
+  hostname?: string,
+  config?: Pick<OcxConfig, "unauthenticatedLoopbackListener">,
+): string {
+  if (config?.unauthenticatedLoopbackListener?.enabled) {
+    return standaloneCodexRoutingTarget(port, {
+      hostname,
+      unauthenticatedLoopbackListener: config.unauthenticatedLoopbackListener,
+    }).baseUrl;
+  }
   return `http://${probeHostname(hostname)}:${port}/v1`;
 }
 

package/src/codex/catalog/aggregation.ts

@@ -162,6 +162,12 @@ export function deriveComboCatalogModel(
     contextWindow,
     ...members.map(member => member.maxInputTokens ?? member.contextWindow!),
   );
+  const knownMaxOutputTokens = members
+    .map(member => member.maxOutputTokens)
+    .filter((value): value is number => typeof value === "number" && value > 0);
+  const maxOutputTokens = knownMaxOutputTokens.length === members.length
+    ? Math.min(...knownMaxOutputTokens)
+    : undefined;
   const autoCompactTokenLimit = Math.min(
     ...members.map(member => clampAutoCompactTokenLimit(
       member.contextWindow!,
@@ -180,6 +186,7 @@ export function deriveComboCatalogModel(
     owned_by: COMBO_NAMESPACE,
     contextWindow,
     maxInputTokens,
+    ...(maxOutputTokens !== undefined ? { maxOutputTokens } : {}),
     autoCompactTokenLimit,
     ...(hasLimitingContextCapMetadata ? { contextCapped } : {}),
     inputModalities,
@@ -320,6 +327,7 @@ export function normalizedOpenAiApiSignature(model: CatalogModel): string {
     id: model.id,
     contextWindow: model.contextWindow ?? null,
     maxInputTokens: model.maxInputTokens ?? null,
+    maxOutputTokens: model.maxOutputTokens ?? null,
     autoCompactTokenLimit: model.autoCompactTokenLimit ?? null,
     inputModalities: [...new Set(model.inputModalities ?? [])].sort(),
     reasoningEfforts: [...new Set(model.reasoningEfforts ?? [])].sort(),

package/src/codex/catalog/metadata.ts

@@ -271,6 +271,11 @@ export function nativeOpenAiContextWindow(slug: string, limits?: NativeContextLi
   return narrowToLimits(raw, slug, limits);
 }
 
+export function nativeOpenAiMaxOutputTokens(slug: string): number | undefined {
+  const sourceSlug = nativeOpenAiCapabilitySourceSlug(slug);
+  return positiveInt(getModelMetadata("openai", sourceSlug)?.maxTokens);
+}
+
 /**
  * Long-context tier for a native slug as a (default, long) pair, for clients that let the user
  * pick a window per request (Cursor's local-agent "Context" selector). The pair is the family's

package/src/codex/catalog/parsing.ts

@@ -112,6 +112,8 @@ export interface CatalogModel {
   defaultReasoningEffort?: string;
   contextWindow?: number;
   maxInputTokens?: number;
+  /** Model-scoped output-token ceiling; omitted when no authoritative value is known. */
+  maxOutputTokens?: number;
   /** Soft client compaction threshold; hard context/input limits remain authoritative. */
   autoCompactTokenLimit?: number;
   contextCap?: number;