omnigateway 0.1.4 → 0.1.6

package/bin/omni.js

@@ -147,35 +147,6 @@ function createAdminAuth(store, opts) {
     }
   };
 }
-// packages/control/src/config.ts
-var MIN_KEY_LENGTH = 16;
-var DECIMAL_INTEGER = /^\d+$/;
-function optionalText(value, fallback) {
-  return value?.trim() || fallback;
-}
-function loadConfig(env) {
-  const encryptionKey = env.OMNI_ENCRYPTION_KEY;
-  if (typeof encryptionKey !== "string" || encryptionKey.length < MIN_KEY_LENGTH) {
-    throw new Error(`OMNI_ENCRYPTION_KEY must be set to at least ${MIN_KEY_LENGTH} characters. ` + "Generate one with: openssl rand -base64 32");
-  }
-  const host = optionalText(env.OMNI_HOST, "127.0.0.1");
-  const rawPort = env.OMNI_PORT ?? "9000";
-  const port = Number(rawPort);
-  if (!DECIMAL_INTEGER.test(rawPort) || !Number.isInteger(port) || port < 1 || port > 65535) {
-    throw new Error(`OMNI_PORT must be an integer between 1 and 65535, got "${rawPort}"`);
-  }
-  const derivedBaseUrl = `http://${host}:${port}`;
-  const baseUrl = optionalText(env.OMNI_BASE_URL, derivedBaseUrl).replace(/\/+$/, "") || derivedBaseUrl;
-  const staticDir = env.OMNI_STATIC_DIR?.trim();
-  return {
-    port,
-    host,
-    databasePath: optionalText(env.OMNI_DB_PATH, "./omnigateway.db"),
-    encryptionKey,
-    baseUrl,
-    staticDir: staticDir === undefined || staticDir.length === 0 ? null : staticDir
-  };
-}
 // packages/ir/src/capabilities.ts
 var PROVIDER_CAPABILITIES = {
   anthropic: { tools: true, images: true, reasoning: true },
@@ -215,6 +186,67 @@ class GatewayError extends Error {
     this.retryAfterMs = opts?.retryAfterMs;
   }
 }
+// packages/ir/src/logger.ts
+var LEVELS = { debug: 10, info: 20, warn: 30, error: 40 };
+var noopLogger = {
+  debug: () => {},
+  info: () => {},
+  warn: () => {},
+  error: () => {},
+  enabled: () => false
+};
+function parseLogLevel(value) {
+  const normalized = value?.trim().toLowerCase();
+  if (normalized === undefined || normalized.length === 0)
+    return null;
+  return Object.hasOwn(LEVELS, normalized) ? normalized : null;
+}
+// packages/ir/src/request.ts
+function cacheControlOf(block) {
+  return block.type === "thinking" ? undefined : block.cacheControl;
+}
+// packages/ir/src/stream.ts
+function usageFromPromptTotal(promptTokens, outputTokens, cacheReadTokens, cacheWriteTokens = 0) {
+  return {
+    inputTokens: Math.max(0, promptTokens - cacheReadTokens - cacheWriteTokens),
+    outputTokens,
+    cacheReadTokens,
+    cacheWriteTokens
+  };
+}
+// packages/control/src/config.ts
+var MIN_KEY_LENGTH = 16;
+var DECIMAL_INTEGER = /^\d+$/;
+function optionalText(value, fallback) {
+  return value?.trim() || fallback;
+}
+function loadConfig(env) {
+  const encryptionKey = env.OMNI_ENCRYPTION_KEY;
+  if (typeof encryptionKey !== "string" || encryptionKey.length < MIN_KEY_LENGTH) {
+    throw new Error(`OMNI_ENCRYPTION_KEY must be set to at least ${MIN_KEY_LENGTH} characters. ` + "Generate one with: openssl rand -base64 32");
+  }
+  const host = optionalText(env.OMNI_HOST, "127.0.0.1");
+  const rawPort = env.OMNI_PORT ?? "9000";
+  const port = Number(rawPort);
+  if (!DECIMAL_INTEGER.test(rawPort) || !Number.isInteger(port) || port < 1 || port > 65535) {
+    throw new Error(`OMNI_PORT must be an integer between 1 and 65535, got "${rawPort}"`);
+  }
+  const derivedBaseUrl = `http://${host}:${port}`;
+  const baseUrl = optionalText(env.OMNI_BASE_URL, derivedBaseUrl).replace(/\/+$/, "") || derivedBaseUrl;
+  const staticDir = env.OMNI_STATIC_DIR?.trim();
+  const rawLogLevel = env.OMNI_LOG_LEVEL?.trim();
+  const logLevel = parseLogLevel(rawLogLevel);
+  return {
+    logLevel: logLevel ?? "info",
+    logLevelFallbackFrom: logLevel === null && rawLogLevel ? rawLogLevel : null,
+    port,
+    host,
+    databasePath: optionalText(env.OMNI_DB_PATH, "./omnigateway.db"),
+    encryptionKey,
+    baseUrl,
+    staticDir: staticDir === undefined || staticDir.length === 0 ? null : staticDir
+  };
+}
 // packages/providers/src/body.ts
 var BODY_ORDER = {
   anthropic: [
@@ -301,8 +333,13 @@ function applyAnthropicSystem(system) {
     let rewritten = text;
     for (const [from, to] of REWRITES)
       rewritten = rewritten.replaceAll(from, to);
-    if (rewritten.trim().length > 0)
-      kept.push({ type: "text", text: rewritten });
+    if (rewritten.trim().length > 0) {
+      kept.push({
+        type: "text",
+        text: rewritten,
+        ...block.cache_control === undefined ? {} : { cache_control: block.cache_control }
+      });
+    }
   }
   return [{ type: "text", text: billingBlock() }, { type: "text", text: AGENT_PREAMBLE }, ...kept];
 }
@@ -606,6 +643,8 @@ async function* decodeAnthropic(messages) {
   let inputTokens = 0;
   let cacheReadTokens = 0;
   let cacheWriteTokens = 0;
+  let cacheWrite5mTokens;
+  let cacheWrite1hTokens;
   let outputTokens = 0;
   let stopReason = "endTurn";
   let terminal = false;
@@ -619,6 +658,8 @@ async function* decodeAnthropic(messages) {
         inputTokens = m.usage?.input_tokens ?? 0;
         cacheReadTokens = m.usage?.cache_read_input_tokens ?? 0;
         cacheWriteTokens = m.usage?.cache_creation_input_tokens ?? 0;
+        cacheWrite5mTokens = m.usage?.cache_creation?.ephemeral_5m_input_tokens;
+        cacheWrite1hTokens = m.usage?.cache_creation?.ephemeral_1h_input_tokens;
         yield { type: "start", id: String(m.id ?? ""), model: String(m.model ?? "") };
         break;
       }
@@ -678,7 +719,14 @@ async function* decodeAnthropic(messages) {
         yield {
           type: "end",
           stopReason,
-          usage: { inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens }
+          usage: {
+            inputTokens,
+            outputTokens,
+            cacheReadTokens,
+            cacheWriteTokens,
+            ...cacheWrite5mTokens === undefined ? {} : { cacheWrite5mTokens },
+            ...cacheWrite1hTokens === undefined ? {} : { cacheWrite1hTokens }
+          }
         };
         break;
       case "error": {
@@ -708,25 +756,33 @@ async function* decodeAnthropic(messages) {
 
 // packages/providers/src/anthropic/wire.ts
 var OAUTH_IDENTITY = "You are Claude Code, Anthropic's official CLI for Claude.";
+function wireCacheControl(c) {
+  if (c === undefined)
+    return {};
+  return { cache_control: { type: c.type, ...c.ttl === undefined ? {} : { ttl: c.ttl } } };
+}
 function encodeBlock(b) {
+  const cache = wireCacheControl(cacheControlOf(b));
   switch (b.type) {
     case "text":
-      return { type: "text", text: b.text };
+      return { type: "text", text: b.text, ...cache };
     case "image":
       return {
         type: "image",
-        source: { type: "base64", media_type: b.mediaType, data: b.data }
+        source: { type: "base64", media_type: b.mediaType, data: b.data },
+        ...cache
       };
     case "thinking":
       return { type: "thinking", thinking: b.text, signature: b.signature };
     case "toolUse":
-      return { type: "tool_use", id: b.id, name: b.name, input: b.input };
+      return { type: "tool_use", id: b.id, name: b.name, input: b.input, ...cache };
     case "toolResult":
       return {
         type: "tool_result",
         tool_use_id: b.toolUseId,
         content: b.content,
-        is_error: b.isError
+        is_error: b.isError,
+        ...cache
       };
   }
 }
@@ -748,14 +804,25 @@ function encodeToolChoice(c) {
 }
 function toWire(req, model, opts) {
   const degradations = [];
-  let system = req.system?.flatMap((b) => b.type === "text" ? [{ type: "text", text: b.text }] : []);
+  const note2 = (d) => {
+    if (!degradations.includes(d))
+      degradations.push(d);
+  };
+  let system = req.system?.flatMap((b) => b.type === "text" ? [{ type: "text", text: b.text, ...wireCacheControl(b.cacheControl) }] : []);
   if (opts.oauth && system?.[0]?.text !== OAUTH_IDENTITY) {
     system = [{ type: "text", text: OAUTH_IDENTITY }, ...system ?? []];
-    degradations.push("anthropic:oauth-system-prefix");
+    note2("anthropic:oauth-system-prefix");
   }
   const body = {
     model,
-    messages: req.messages.map((m) => m.role === "system" ? { role: m.role, content: encodeSystemTurn(m.content) } : { role: m.role, content: m.content.map(encodeBlock) }),
+    messages: req.messages.map((m) => {
+      if (m.role !== "system")
+        return { role: m.role, content: m.content.map(encodeBlock) };
+      if (m.content.some((b) => cacheControlOf(b) !== undefined)) {
+        note2("anthropic:system-turn-cache-control-dropped");
+      }
+      return { role: m.role, content: encodeSystemTurn(m.content) };
+    }),
     max_tokens: req.maxTokens ?? 4096,
     stream: req.stream
   };
@@ -769,7 +836,8 @@ function toWire(req, model, opts) {
     body.tools = req.tools.map((t) => ({
       name: t.name,
       ...t.description === undefined ? {} : { description: t.description },
-      input_schema: t.inputSchema
+      input_schema: t.inputSchema,
+      ...wireCacheControl(t.cacheControl)
     }));
   }
   if (req.toolChoice !== undefined)
@@ -809,12 +877,13 @@ var anthropicAdapter = {
     const { body, degradations } = toWire(req.request, req.model, { oauth });
     const withSystem = {
       ...body,
-      system: applyAnthropicSystem(body.system ?? [])
+      system: applyAnthropicSystem(body.system ?? []),
+      stream: true
     };
     const protocol = [
       ["Content-Type", "application/json"],
       ["anthropic-version", API_VERSION],
-      ["Accept", req.request.stream ? "text/event-stream" : "application/json"]
+      ["Accept", "text/event-stream"]
     ];
     const betas = new Set(req.request.betas ?? []);
     if (oauth) {
@@ -833,6 +902,7 @@ var anthropicAdapter = {
     const headers = orderHeaders(mergeHeaders(profile.headers, protocol), profile.order);
     const bodyString = signAnthropicBody(JSON.stringify(orderFields(withSystem, BODY_ORDER.anthropic)));
     const res = await req.http({
+      provider: "anthropic",
       url: BASE_URL,
       method: "POST",
       headers,
@@ -853,22 +923,26 @@ var ANTHROPIC_MODELS = {
     {
       id: "claude-fable-5",
       label: "Claude Fable 5",
-      pricing: { input: 10, output: 50, cacheRead: 1 }
+      pricing: { input: 10, output: 50, cacheRead: 1, cacheWrite5m: 12.5, cacheWrite1h: 20 },
+      limits: { contextWindow: 1e6, maxOutputTokens: 128000 }
     },
     {
       id: "claude-opus-5",
       label: "Claude Opus 5",
-      pricing: { input: 5, output: 25, cacheRead: 0.5 }
+      pricing: { input: 5, output: 25, cacheRead: 0.5, cacheWrite5m: 6.25, cacheWrite1h: 10 },
+      limits: { contextWindow: 1e6, maxOutputTokens: 128000 }
     },
     {
       id: "claude-sonnet-5",
       label: "Claude Sonnet 5",
-      pricing: { input: 3, output: 15, cacheRead: 0.3 }
+      pricing: { input: 3, output: 15, cacheRead: 0.3, cacheWrite5m: 3.75, cacheWrite1h: 6 },
+      limits: { contextWindow: 1e6, maxOutputTokens: 128000 }
     },
     {
       id: "claude-haiku-4-5",
       label: "Claude Haiku 4.5",
-      pricing: { input: 1, output: 5, cacheRead: 0.1 }
+      pricing: { input: 1, output: 5, cacheRead: 0.1, cacheWrite5m: 1.25, cacheWrite1h: 2 },
+      limits: { contextWindow: 200000, maxOutputTokens: 64000 }
     }
   ]
 };
@@ -880,22 +954,26 @@ var KIMI_MODELS = {
     {
       id: "k3-256k",
       label: "Kimi K3 \u2014 256K",
-      pricing: { input: 3, output: 15, cacheRead: 0.3 }
+      pricing: { input: 3, output: 15, cacheRead: 0.3, cacheWrite5m: 0, cacheWrite1h: 0 },
+      limits: { contextWindow: 262144, maxOutputTokens: 131072 }
     },
     {
       id: "k3",
       label: "Kimi K3 \u2014 up to 1M",
-      pricing: { input: 3, output: 15, cacheRead: 0.3 }
+      pricing: { input: 3, output: 15, cacheRead: 0.3, cacheWrite5m: 0, cacheWrite1h: 0 },
+      limits: { contextWindow: 1048576, maxOutputTokens: 131072 }
     },
     {
       id: "kimi-for-coding",
       label: "Kimi K2.7 Code",
-      pricing: { input: 0.95, output: 4, cacheRead: 0.19 }
+      pricing: { input: 0.95, output: 4, cacheRead: 0.19, cacheWrite5m: 0, cacheWrite1h: 0 },
+      limits: { contextWindow: 262144, maxOutputTokens: 131072 }
     },
     {
       id: "kimi-for-coding-highspeed",
       label: "Kimi K2.7 Code \u2014 High Speed",
-      pricing: { input: 0.95, output: 8, cacheRead: 0.19 }
+      pricing: { input: 0.95, output: 8, cacheRead: 0.19, cacheWrite5m: 0, cacheWrite1h: 0 },
+      limits: { contextWindow: 262144, maxOutputTokens: 131072 }
     }
   ]
 };
@@ -907,22 +985,30 @@ var OPENAI_MODELS = {
     {
       id: "gpt-5.6",
       label: "GPT-5.6 \u2014 routes to Sol",
-      pricing: { input: 5, output: 30, cacheRead: 0.5 }
+      pricing: { input: 5, output: 30, cacheRead: 0.5, cacheWrite5m: 0, cacheWrite1h: 0 },
+      limits: { contextWindow: 922000, maxOutputTokens: 128000 },
+      oauthLimits: { contextWindow: 272000, maxOutputTokens: 128000 }
     },
     {
       id: "gpt-5.6-sol",
       label: "GPT-5.6 Sol \u2014 deepest reasoning",
-      pricing: { input: 5, output: 30, cacheRead: 0.5 }
+      pricing: { input: 5, output: 30, cacheRead: 0.5, cacheWrite5m: 0, cacheWrite1h: 0 },
+      limits: { contextWindow: 922000, maxOutputTokens: 128000 },
+      oauthLimits: { contextWindow: 272000, maxOutputTokens: 128000 }
     },
     {
       id: "gpt-5.6-terra",
       label: "GPT-5.6 Terra \u2014 balanced",
-      pricing: { input: 2, output: 12, cacheRead: 0.2 }
+      pricing: { input: 2, output: 12, cacheRead: 0.2, cacheWrite5m: 0, cacheWrite1h: 0 },
+      limits: { contextWindow: 922000, maxOutputTokens: 128000 },
+      oauthLimits: { contextWindow: 272000, maxOutputTokens: 128000 }
     },
     {
       id: "gpt-5.6-luna",
       label: "GPT-5.6 Luna \u2014 fastest",
-      pricing: { input: 0.2, output: 1.2, cacheRead: 0.02 }
+      pricing: { input: 0.2, output: 1.2, cacheRead: 0.02, cacheWrite5m: 0, cacheWrite1h: 0 },
+      limits: { contextWindow: 922000, maxOutputTokens: 128000 },
+      oauthLimits: { contextWindow: 272000, maxOutputTokens: 128000 }
     }
   ]
 };
@@ -934,15 +1020,38 @@ var PROVIDER_MODEL_CATALOG = {
   kimi: KIMI_MODELS
 };
 function catalogPricing(provider, model) {
-  return PROVIDER_MODEL_CATALOG[provider].models.find((entry) => entry.id === model)?.pricing ?? null;
+  return PROVIDER_MODEL_CATALOG[provider]?.models.find((entry) => entry.id === model)?.pricing ?? null;
+}
+function catalogLimits(provider, model, auth = "apiKey") {
+  const entry = PROVIDER_MODEL_CATALOG[provider]?.models.find((choice) => choice.id === model);
+  if (entry === undefined)
+    return null;
+  return (auth === "oauth" ? entry.oauthLimits : undefined) ?? entry.limits;
 }
 // packages/providers/src/http-client.ts
 import { request as httpRequest } from "http";
 import { request as httpsRequest } from "https";
 import { Readable } from "stream";
-function nodeHttpClient() {
+function nodeHttpClient(options = {}) {
+  const logger2 = options.logger ?? noopLogger;
+  const now = options.now ?? (() => Date.now());
   return (req) => new Promise((resolve, reject) => {
     const url = new URL(req.url);
+    const startedAt = now();
+    let traced = false;
+    const trace = (status, failed = false) => {
+      if (traced || !logger2.enabled("debug"))
+        return;
+      traced = true;
+      logger2.debug("upstream http", {
+        provider: req.provider,
+        status,
+        host: url.host,
+        path: url.pathname,
+        durationMs: now() - startedAt,
+        reason: failed ? "transport error" : undefined
+      });
+    };
     const send = url.protocol === "https:" ? httpsRequest : httpRequest;
     const bodyBytes = Buffer.from(req.body, "utf8");
     const headers = {};
@@ -970,6 +1079,7 @@ function nodeHttpClient() {
         else if (typeof v === "string")
           responseHeaders.set(k, v);
       }
+      trace(incoming.statusCode);
       resolve({
         status: incoming.statusCode ?? 0,
         headers: responseHeaders,
@@ -985,17 +1095,17 @@ function nodeHttpClient() {
       });
     });
     const onAbort = () => outgoing.destroy(new Error("aborted"));
-    if (req.signal.aborted) {
-      outgoing.destroy(new Error("aborted"));
-      reject(new Error("aborted"));
-      return;
-    }
-    req.signal.addEventListener("abort", onAbort, { once: true });
     outgoing.on("error", (err) => {
       req.signal.removeEventListener("abort", onAbort);
+      trace(undefined, true);
       reject(err);
     });
     outgoing.on("close", () => req.signal.removeEventListener("abort", onAbort));
+    if (req.signal.aborted) {
+      outgoing.destroy(new Error("aborted"));
+      return;
+    }
+    req.signal.addEventListener("abort", onAbort, { once: true });
     if (bodyBytes.byteLength > 0)
       outgoing.write(bodyBytes);
     outgoing.end();
@@ -1064,12 +1174,8 @@ async function* decodeChat(messages) {
       yield { type: "start", id: String(d.id ?? ""), model: String(d.model ?? "") };
     }
     if (d.usage) {
-      usage = {
-        inputTokens: d.usage.prompt_tokens ?? 0,
-        outputTokens: d.usage.completion_tokens ?? 0,
-        cacheReadTokens: d.usage.prompt_cache_hit_tokens ?? 0,
-        cacheWriteTokens: 0
-      };
+      const details = d.usage.prompt_tokens_details;
+      usage = usageFromPromptTotal(d.usage.prompt_tokens ?? 0, d.usage.completion_tokens ?? 0, details?.cached_tokens ?? d.usage.prompt_cache_hit_tokens ?? 0, details?.cache_creation_tokens ?? details?.cache_write_tokens ?? 0);
     }
     const choice = d.choices?.[0];
     if (!choice)
@@ -1195,7 +1301,12 @@ function toChatWire(req, model) {
 `) });
     }
   }
-  const body = { model, messages, stream: req.stream };
+  const body = {
+    model,
+    messages,
+    stream: req.stream,
+    stream_options: { include_usage: true }
+  };
   if (req.maxTokens !== undefined)
     body.max_tokens = req.maxTokens;
   if (req.temperature !== undefined)
@@ -1236,6 +1347,7 @@ var kimiAdapter = {
     const profile = PROFILES.kimi;
     const headers = orderHeaders(mergeHeaders(profile.headers, protocol), profile.order);
     const res = await req.http({
+      provider: "kimi",
       url: BASE_URL2,
       method: "POST",
       headers,
@@ -1366,12 +1478,7 @@ async function* decodeResponses(messages) {
         yield {
           type: "end",
           stopReason,
-          usage: {
-            inputTokens: r.usage?.input_tokens ?? 0,
-            outputTokens: r.usage?.output_tokens ?? 0,
-            cacheReadTokens: r.usage?.input_tokens_details?.cached_tokens ?? 0,
-            cacheWriteTokens: 0
-          }
+          usage: usageFromPromptTotal(r.usage?.input_tokens ?? 0, r.usage?.output_tokens ?? 0, r.usage?.input_tokens_details?.cached_tokens ?? r.usage?.prompt_tokens_details?.cached_tokens ?? 0)
         };
         break;
       }
@@ -1544,6 +1651,7 @@ var openaiAdapter = {
     const profile = PROFILES.openai;
     const headers = orderHeaders(mergeHeaders(profile.headers, protocol), profile.order);
     const res = await req.http({
+      provider: "openai",
       url: oauth ? OAUTH_URL : API_URL,
       method: "POST",
       headers,
@@ -1558,13 +1666,14 @@ var openaiAdapter = {
   }
 };
 // packages/control/src/oauth/types.ts
-async function postJson(deps, url, profile2, opts) {
+async function postJson(deps, provider, url, profile2, opts) {
   const headers = orderHeaders(mergeHeaders(profile2.headers, [
     ["Content-Type", opts.contentType],
     ["Accept", "application/json"],
     ...opts.extraHeaders ?? []
   ]), profile2.order);
   const res = await deps.http({
+    provider,
     url,
     method: "POST",
     headers,
@@ -1578,13 +1687,14 @@ async function postJson(deps, url, profile2, opts) {
   } catch {}
   return { status: res.status, parsed };
 }
-async function getJson(deps, url, profile2, opts) {
+async function getJson(deps, provider, url, profile2, opts) {
   const headers = orderHeaders(mergeHeaders(profile2.headers, [
     ["Authorization", `Bearer ${opts.accessToken}`],
     ["Accept", "application/json"],
     ...opts.extraHeaders ?? []
   ]), profile2.order);
   const res = await deps.http({
+    provider,
     url,
     method: "GET",
     headers,
@@ -1778,7 +1888,7 @@ function deviceCodeFrom(value) {
   };
 }
 async function post(url, body2, device, deps) {
-  const { status, parsed } = await postJson(deps, url, PROFILES.kimi, {
+  const { status, parsed } = await postJson(deps, "kimi", url, PROFILES.kimi, {
     contentType: "application/x-www-form-urlencoded",
     body: new URLSearchParams({ ...body2, client_id: CLIENT_ID }).toString(),
     extraHeaders: kimiDeviceHeaders(device)
@@ -1881,7 +1991,7 @@ var kimiOAuth = {
     if (secrets.accessToken === null)
       return null;
     const device = deviceFrom(providerData);
-    const { status, parsed } = await getJson(deps, USAGE_URL, PROFILES.kimi, {
+    const { status, parsed } = await getJson(deps, "kimi", USAGE_URL, PROFILES.kimi, {
       accessToken: secrets.accessToken,
       extraHeaders: kimiDeviceHeaders(device)
     });
@@ -1950,6 +2060,7 @@ function deviceIdFrom(start) {
   return deviceId;
 }
 function createConnectFlows(deps) {
+  const logger2 = deps.logger ?? noopLogger;
   const flows = createPendingFlows({ now: deps.now, ttlMs: FLOW_TTL_MS });
   const pollsInFlight = new Map;
   const callbackUri = (provider) => provider === "openai" ? "http://localhost:1455/auth/callback" : "";
@@ -1994,6 +2105,10 @@ function createConnectFlows(deps) {
       disabledAt: null,
       ...result.secrets
     });
+    logger2.info("oauth connect completed", {
+      provider: flow.provider,
+      credentialId: id
+    });
     return { id };
   }
   async function pollOutcome(flowId, poll) {
@@ -16369,28 +16484,18 @@ var modelSchema = exports_external.object({
     costPerMTok: exports_external.object({
       input: exports_external.number().min(0),
       output: exports_external.number().min(0),
-      cacheRead: exports_external.number().min(0)
-    }),
-    capabilities: exports_external.object({
-      tools: exports_external.boolean(),
-      images: exports_external.boolean(),
-      reasoning: exports_external.boolean()
-    })
-  }).or(exports_external.object({
-    provider: providerIdSchema,
-    model: exports_external.string().min(1),
-    tier: exports_external.number().int().min(1),
-    weight: exports_external.number().positive(),
-    costPerMTok: exports_external.object({
-      input: exports_external.number().min(0),
-      output: exports_external.number().min(0)
+      cacheRead: exports_external.number().min(0).optional(),
+      cacheWrite5m: exports_external.number().min(0).optional(),
+      cacheWrite1h: exports_external.number().min(0).optional()
     }),
+    contextWindow: exports_external.number().int().positive().optional(),
+    maxOutputTokens: exports_external.number().int().positive().optional(),
     capabilities: exports_external.object({
       tools: exports_external.boolean(),
       images: exports_external.boolean(),
       reasoning: exports_external.boolean()
     })
-  }))).min(1, "a virtual model needs at least one target")
+  })).min(1, "a virtual model needs at least one target")
 });
 var keyCreateSchema = exports_external.object({
   label: exports_external.string().min(1).default("api key"),
@@ -16468,7 +16573,7 @@ async function getCredential(store, id) {
     throw new GatewayError("BAD_REQUEST", "no such credential");
   return summarizeCredential(credential);
 }
-async function createApiKeyCredential(store, input) {
+async function createApiKeyCredential(store, input, logger2 = noopLogger) {
   const provider = parseOrThrow(providerIdSchema, input.provider);
   if (typeof input.apiKey !== "string" || input.apiKey.trim().length === 0) {
     throw new GatewayError("BAD_REQUEST", "apiKey: must not be empty");
@@ -16495,6 +16600,7 @@ async function createApiKeyCredential(store, input) {
     apiKey: input.apiKey,
     idToken: null
   });
+  logger2.info("credential added", { credentialId: created.id, provider: created.provider });
   return summarizeCredential(created);
 }
 async function refreshCredential(deps, id) {
@@ -16554,6 +16660,12 @@ async function patchCredential(deps, id, input) {
     ...patch.tier === undefined ? {} : { tier: patch.tier },
     ...patch.weight === undefined ? {} : { weight: patch.weight }
   });
+  if (patch.enabled !== undefined && patch.enabled !== existing.enabled) {
+    (deps.logger ?? noopLogger).info(patch.enabled ? "credential enabled" : "credential disabled", {
+      credentialId: id,
+      provider: existing.provider
+    });
+  }
 }
 async function removeCredential(store, id) {
   await store.credentials.remove(id);
@@ -17718,7 +17830,9 @@ function createUsageRepo(db) {
 
 // packages/store/src/sqlite/store.ts
 async function createStore(opts) {
+  const logger2 = opts.logger ?? noopLogger;
   const db = openDb(opts.path);
+  logger2.debug("store opened", { path: opts.path });
   const listeners = new Set;
   const emit2 = (change) => {
     for (const listener of listeners) {
@@ -17811,7 +17925,7 @@ var REDIRECT_URI = "https://platform.claude.com/oauth/code/callback";
 var SCOPES = "org:create_api_key user:profile user:inference";
 var USAGE_URL2 = "https://api.anthropic.com/api/oauth/usage";
 async function postToken(body2, deps) {
-  const { status, parsed } = await postJson(deps, TOKEN_URL2, PROFILES.anthropic, {
+  const { status, parsed } = await postJson(deps, "anthropic", TOKEN_URL2, PROFILES.anthropic, {
     contentType: "application/json",
     body: JSON.stringify({ ...body2, client_id: CLIENT_ID2 })
   });
@@ -17889,7 +18003,7 @@ var anthropicOAuth = {
   async usage(secrets, deps) {
     if (secrets.accessToken === null)
       return null;
-    const { status, parsed } = await getJson(deps, USAGE_URL2, PROFILES.anthropic, {
+    const { status, parsed } = await getJson(deps, "anthropic", USAGE_URL2, PROFILES.anthropic, {
       accessToken: secrets.accessToken,
       extraHeaders: [
         ["anthropic-beta", "oauth-2025-04-20"],
@@ -17947,7 +18061,7 @@ function parseTokenResponse(value) {
   };
 }
 async function postToken2(body2, deps) {
-  const { status, parsed } = await postJson(deps, TOKEN_URL3, PROFILES.openai, {
+  const { status, parsed } = await postJson(deps, "openai", TOKEN_URL3, PROFILES.openai, {
     contentType: "application/x-www-form-urlencoded",
     body: new URLSearchParams({ ...body2, client_id: CLIENT_ID3 }).toString()
   });
@@ -18046,7 +18160,7 @@ var openaiOAuth = {
     if (secrets.accessToken === null)
       return null;
     const accountId = accountIdFromProviderData(providerData);
-    const { status, parsed } = await getJson(deps, USAGE_URL3, PROFILES.openai, {
+    const { status, parsed } = await getJson(deps, "openai", USAGE_URL3, PROFILES.openai, {
       accessToken: secrets.accessToken,
       ...accountId === null ? {} : { extraHeaders: [["chatgpt-account-id", accountId]] }
     });
@@ -18064,6 +18178,7 @@ var OAUTH_PROVIDERS = {
 };
 // packages/control/src/oauth/refresh.ts
 function createRefresher(deps) {
+  const logger2 = deps.logger ?? noopLogger;
   const inFlight = new Map;
   async function run(credential) {
     const secrets = await credential.openForRefresh();
@@ -18071,11 +18186,20 @@ function createRefresher(deps) {
       throw new GatewayError("AUTH", `credential ${credential.id} has no refresh token`);
     }
     const provider = deps.providers[credential.provider];
+    logger2.debug("refreshing credential", {
+      provider: credential.provider,
+      credentialId: credential.id
+    });
     let result;
     try {
       result = await provider.refresh(secrets.refreshToken, { http: deps.http, now: deps.now }, credential.providerData);
     } catch (error51) {
       if (error51 instanceof GatewayError && error51.code === "AUTH") {
+        logger2.warn("credential disabled: refresh token rejected", {
+          provider: credential.provider,
+          credentialId: credential.id,
+          code: "AUTH"
+        });
         await deps.store.credentials.update(credential.id, {
           enabled: false,
           disabledReason: "tokenRejected",
@@ -18089,6 +18213,10 @@ function createRefresher(deps) {
       accountEmail: result.accountEmail ?? credential.accountEmail,
       providerData: { ...credential.providerData, ...result.providerData }
     });
+    logger2.debug("credential refreshed", {
+      provider: credential.provider,
+      credentialId: credential.id
+    });
     return result.secrets;
   }
   return function refresh(credential) {
@@ -18696,6 +18824,11 @@ var modelsShow = {
         { header: "WEIGHT", align: "right" },
         { header: "IN $/MTOK", align: "right" },
         { header: "OUT $/MTOK", align: "right" },
+        { header: "CACHE R", align: "right" },
+        { header: "CACHE W 5M", align: "right" },
+        { header: "CACHE W 1H", align: "right" },
+        { header: "CONTEXT", align: "right" },
+        { header: "MAX OUT", align: "right" },
         { header: "CAPABILITIES" }
       ], model.targets.map((target) => [
         provider(ctx, target.provider),
@@ -18704,12 +18837,23 @@ var modelsShow = {
         String(target.weight),
         target.costPerMTok.input.toFixed(2),
         target.costPerMTok.output.toFixed(2),
+        price(target.costPerMTok.cacheRead),
+        price(target.costPerMTok.cacheWrite5m),
+        price(target.costPerMTok.cacheWrite1h),
+        tokens(target.contextWindow),
+        tokens(target.maxOutputTokens),
         capabilityList(target)
       ]))
     ].join(`
 `));
   }
 };
+function price(value) {
+  return value === undefined ? "\u2014" : value.toFixed(2);
+}
+function tokens(value) {
+  return value === undefined ? "\u2014" : value.toLocaleString("en-US");
+}
 function capabilityList(target) {
   const on = Object.entries(target.capabilities).filter(([, enabled]) => enabled).map(([name]) => name);
   return on.length === 0 ? "\u2014" : on.join(",");
@@ -18741,7 +18885,7 @@ function isCatalogProvider(value) {
   return value in PROVIDER_MODEL_CATALOG;
 }
 function catalogRows() {
-  return Object.entries(PROVIDER_MODEL_CATALOG).flatMap(([id, entry]) => entry.models.map((model) => ({ provider: id, id: model.id, label: model.label })));
+  return Object.entries(PROVIDER_MODEL_CATALOG).flatMap(([id, entry]) => entry.models.map((model) => ({ ...model, provider: id })));
 }
 var modelsCatalog = {
   usage: "models catalog [--provider P]",
@@ -18755,15 +18899,29 @@ var modelsCatalog = {
       { header: "MODEL" },
       { header: "LABEL" },
       { header: "IN $/MTOK", align: "right" },
-      { header: "OUT $/MTOK", align: "right" }
+      { header: "OUT $/MTOK", align: "right" },
+      { header: "CACHE R", align: "right" },
+      { header: "CACHE W 5M", align: "right" },
+      { header: "CACHE W 1H", align: "right" },
+      { header: "CONTEXT", align: "right" },
+      { header: "CONTEXT OAUTH", align: "right" },
+      { header: "MAX OUT", align: "right" }
     ], entries.map((entry) => {
-      const price = catalogPricing(entry.provider, entry.id);
+      const listed = catalogPricing(entry.provider, entry.id);
+      const limits = catalogLimits(entry.provider, entry.id);
+      const oauth = catalogLimits(entry.provider, entry.id, "oauth");
       return [
         provider(ctx, entry.provider),
         entry.id,
         entry.label,
-        price === null ? "\u2014" : price.input.toFixed(2),
-        price === null ? "\u2014" : price.output.toFixed(2)
+        price(listed?.input),
+        price(listed?.output),
+        price(listed?.cacheRead),
+        price(listed?.cacheWrite5m),
+        price(listed?.cacheWrite1h),
+        tokens(limits?.contextWindow),
+        oauth?.contextWindow === limits?.contextWindow ? "\u2014" : tokens(oauth?.contextWindow),
+        tokens(limits?.maxOutputTokens)
       ];
     })));
   }