omnigateway 0.12.11 → 0.12.13

package/bin/omni.js

@@ -24739,12 +24739,18 @@ var ANTHROPIC_MODELS = {
 };
 var ONE_M_SUFFIX = "[1m]";
 var DATED_SUFFIX = /-\d{8}$/;
-function anthropicReasoningForm(model) {
+function anthropicChoice(model) {
   let id = model.trim();
   if (id.toLowerCase().endsWith(ONE_M_SUFFIX))
     id = id.slice(0, -ONE_M_SUFFIX.length).trim();
   id = id.replace(DATED_SUFFIX, "");
-  return ANTHROPIC_MODELS.models.find((m) => m.id === id)?.reasoningForm ?? "adaptive";
+  return ANTHROPIC_MODELS.models.find((m) => m.id === id);
+}
+function anthropicReasoningForm(model) {
+  return anthropicChoice(model)?.reasoningForm ?? "adaptive";
+}
+function anthropicMaxOutputTokens(model) {
+  return anthropicChoice(model)?.limits.maxOutputTokens;
 }
 
 // packages/providers/src/anthropic/descriptor.ts
@@ -25635,7 +25641,8 @@ function codecAdapter(id, capabilities2, codec2, origins) {
         credentials: req.credentials,
         fail,
         ...req.requestId === undefined ? {} : { requestId: req.requestId },
-        ...req.autoCache === undefined ? {} : { autoCacheEnabled: req.autoCache }
+        ...req.autoCache === undefined ? {} : { autoCacheEnabled: req.autoCache },
+        ...req.maxOutputTokens === undefined ? {} : { maxOutputTokens: req.maxOutputTokens }
       }));
       const described = built?.request ?? {};
       const request2 = {
@@ -27073,6 +27080,69 @@ function systemText(system, provider, note2) {
 `);
 }
 
+// packages/providers/src/toolResultFiles.ts
+function isTextual(mediaType) {
+  const type = mediaType.split(";")[0]?.trim().toLowerCase() ?? "";
+  return type.startsWith("text/") || type.endsWith("+json") || type.endsWith("+xml") || TEXTUAL.has(type);
+}
+var TEXTUAL = new Set([
+  "application/json",
+  "application/x-ndjson",
+  "application/xml",
+  "application/yaml",
+  "application/x-yaml",
+  "application/toml",
+  "application/javascript",
+  "application/typescript",
+  "application/sql",
+  "application/x-sh",
+  "message/rfc822"
+]);
+function fileText(file2) {
+  return Buffer.from(file2.data, "base64").toString("utf8");
+}
+function splitFiles(files, carries) {
+  const text = [];
+  const carried = [];
+  let dropped = false;
+  for (const file2 of files) {
+    if (isTextual(file2.mediaType))
+      text.push(fileText(file2));
+    else if (carries(file2.mediaType))
+      carried.push(file2);
+    else
+      dropped = true;
+  }
+  return { text, carried, dropped };
+}
+function withFileText(content, text) {
+  return [content, ...text].filter((t) => t.length > 0).join(`
+
+`);
+}
+var RESPONSES_FILE_TYPES = Object.assign(Object.create(null), {
+  "application/pdf": "pdf",
+  "application/rtf": "rtf",
+  "application/msword": "doc",
+  "application/vnd.ms-excel": "xls",
+  "application/vnd.ms-powerpoint": "ppt",
+  "application/vnd.openxmlformats-officedocument.wordprocessingml.document": "docx",
+  "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "xlsx",
+  "application/vnd.openxmlformats-officedocument.presentationml.presentation": "pptx"
+});
+function fileName(file2) {
+  return file2.filename ?? `file.${RESPONSES_FILE_TYPES[file2.mediaType] ?? "bin"}`;
+}
+function responsesFiles(files) {
+  const { text, carried, dropped } = splitFiles(files, (t) => (t in RESPONSES_FILE_TYPES));
+  const parts = carried.map((file2) => ({
+    type: "input_file",
+    filename: fileName(file2),
+    file_data: `data:${file2.mediaType};base64,${file2.data}`
+  }));
+  return { parts, text, dropped };
+}
+
 // packages/providers/src/anthropic/wire.ts
 var OAUTH_IDENTITY = "You are Claude Code, Anthropic's official CLI for Claude.";
 function wireCacheControl(c) {
@@ -27110,22 +27180,13 @@ function encodeBlock(b, cloak) {
         ...cache
       };
     case "toolResult": {
-      const documents = (b.files ?? []).flatMap((file2) => {
-        const source = file2.mediaType === "application/pdf" ? { type: "base64", media_type: file2.mediaType, data: file2.data } : file2.mediaType === "text/plain" ? {
-          type: "text",
-          media_type: file2.mediaType,
-          data: Buffer.from(file2.data, "base64").toString("utf8")
-        } : undefined;
-        if (source === undefined)
-          return [];
-        return [
-          {
-            type: "document",
-            source,
-            ...file2.filename !== undefined && { title: file2.filename }
-          }
-        ];
-      });
+      const files = splitFiles(b.files ?? [], (t) => t === "application/pdf");
+      const text = withFileText(b.content, files.text);
+      const documents = files.carried.map((file2) => ({
+        type: "document",
+        source: { type: "base64", media_type: file2.mediaType, data: file2.data },
+        ...file2.filename !== undefined && { title: file2.filename }
+      }));
       const parts = [
         ...(b.images ?? []).map((image) => encodeBlock(image, cloak)),
         ...documents,
@@ -27134,7 +27195,7 @@ function encodeBlock(b, cloak) {
       return {
         type: "tool_result",
         tool_use_id: b.toolUseId,
-        content: parts.length === 0 ? b.content : [...b.content.length > 0 ? [{ type: "text", text: b.content }] : [], ...parts],
+        content: parts.length === 0 ? text : [...text.length > 0 ? [{ type: "text", text }] : [], ...parts],
         is_error: b.isError,
         ...cache
       };
@@ -27286,6 +27347,12 @@ function addAutoCacheBreakpoints(body, req, note2) {
   lastHistory.cache_control = { type: "ephemeral" };
   note2("anthropic:history-cache-breakpoint-added");
 }
+function defaultMaxTokens(model, saved) {
+  const ceiling = anthropicMaxOutputTokens(model);
+  if (saved === undefined)
+    return ceiling ?? 4096;
+  return ceiling === undefined ? saved : Math.min(saved, ceiling);
+}
 function toWire(req, model, opts) {
   const cloak = opts.cloak ?? null;
   const degradations = [];
@@ -27310,8 +27377,12 @@ function toWire(req, model, opts) {
     note2("anthropic:system-turn-cache-control-dropped");
   for (const m of req.messages) {
     for (const b of m.content) {
-      if (b.type === "toolResult" && b.files?.some((f) => f.mediaType !== "application/pdf" && f.mediaType !== "text/plain")) {
-        note2("anthropic:files-dropped");
+      if (b.type === "toolResult" && b.files !== undefined) {
+        const files = splitFiles(b.files, (t) => t === "application/pdf");
+        if (files.text.length > 0)
+          note2("anthropic:tool-result-files-inlined");
+        if (files.dropped)
+          note2("anthropic:files-dropped");
       }
     }
   }
@@ -27328,7 +27399,7 @@ function toWire(req, model, opts) {
       }
       return [{ role: m.role, content: encodeSystemTurn(m.content, cloak) }];
     }),
-    max_tokens: req.maxTokens ?? 4096,
+    max_tokens: req.maxTokens ?? defaultMaxTokens(model, opts.maxOutputTokens),
     stream: req.stream
   };
   if (systemCache.retarget !== undefined) {
@@ -27467,7 +27538,8 @@ var anthropicCodec = {
     const { body, degradations } = toWire(input2.request, input2.model, {
       oauth,
       cloak,
-      autoCache: input2.autoCacheEnabled === true
+      autoCache: input2.autoCacheEnabled === true,
+      ...input2.maxOutputTokens === undefined ? {} : { maxOutputTokens: input2.maxOutputTokens }
     });
     const firstUser = input2.request.messages.find((m) => m.role === "user");
     const firstText = firstUser?.content.find((b) => b.type === "text");
@@ -27800,8 +27872,125 @@ var anthropicOAuthFlow = {
     if (!usageReadable(res.status, "anthropic"))
       return null;
     return parseAnthropicUsage(parsed(res.body), now());
+  },
+  async* resetCredits({ secrets }) {
+    if (secrets.accessToken === null)
+      return null;
+    const res = yield getJsonRequest(RESET_STATUS_URL, anthropicProfile, {
+      accessToken: secrets.accessToken,
+      extraHeaders: SIDE_HEADERS
+    });
+    if (!usageReadable(res.status, "anthropic"))
+      return null;
+    const root = recordOf(parsed(res.body));
+    return root === null ? null : parseResetGrants(root.cedar_ember ?? null);
+  },
+  async* redeemReset({ secrets, creditId, requestId, fail }) {
+    if (secrets.accessToken === null)
+      throw fail("AUTH", "credential holds no access token");
+    const grantId = grantOf(creditId);
+    if (grantId === null)
+      throw fail("CONFLICT", "that reset credit is not available");
+    const profile = yield getJsonRequest(PROFILE_URL, anthropicProfile, {
+      accessToken: secrets.accessToken,
+      extraHeaders: SIDE_HEADERS
+    });
+    if (profile.status < 200 || profile.status >= 300) {
+      throw fail(redeemErrorCode(profile.status), `profile read refused: http_${profile.status}`, {
+        status: profile.status
+      });
+    }
+    const orgId = orgIdOf(parsed(profile.body));
+    if (orgId === null)
+      throw fail("UPSTREAM", "profile names no organization");
+    const res = yield postJsonRequest(`https://api.anthropic.com/api/organizations/${orgId}/reset_rate_limits`, anthropicProfile, {
+      contentType: "application/json",
+      body: JSON.stringify({ program: RESET_PROGRAM, grant_id: grantId, request_id: requestId }),
+      extraHeaders: [["Authorization", `Bearer ${secrets.accessToken}`], ...SIDE_HEADERS]
+    });
+    if (res.status < 200 || res.status >= 300) {
+      throw fail(redeemErrorCode(res.status), `reset claim refused: http_${res.status}`, {
+        status: res.status
+      });
+    }
+    return claimOutcome(parsed(res.body), fail);
   }
 };
+var RESET_PROGRAM = "cedar_ember";
+var RESET_STATUS_URL = `${USAGE_URL}?cedar_ember=1&skip_spend=1`;
+var PROFILE_URL = "https://api.anthropic.com/api/oauth/profile";
+var ORG_ID = /^[A-Za-z0-9-]{1,64}$/;
+var SIDE_HEADERS = [["anthropic-beta", "oauth-2025-04-20"]];
+var USE_SUFFIX = /-u(\d+)$/;
+function creditIdOf(grantId, left) {
+  return `${grantId}-u${left}`;
+}
+function grantOf(creditId) {
+  const grant = creditId.replace(USE_SUFFIX, "");
+  return grant === creditId || grant === "" ? null : grant;
+}
+function orgIdOf(value) {
+  const org = recordOf(recordOf(value)?.organization);
+  const uuid3 = org?.uuid;
+  return typeof uuid3 === "string" && ORG_ID.test(uuid3) ? uuid3 : null;
+}
+function parseResetGrants(value) {
+  if (value === null)
+    return { available: 0, credits: [] };
+  const block = recordOf(value);
+  if (block === null || !Array.isArray(block.grants))
+    return null;
+  const next = typeof block.next_grant_id === "string" ? block.next_grant_id : null;
+  const atLimit = block.at_limit === true;
+  let available = 0;
+  const credits = block.grants.flatMap((raw) => {
+    const g = recordOf(raw);
+    if (g === null || typeof g.id !== "string")
+      return [];
+    const left = typeof g.resets_left === "number" ? g.resets_left : 0;
+    const claimable = left > 0 && g.usable_now === true && g.paused !== true && (g.use_requires_limit !== true || atLimit) && (next === null || next === g.id);
+    if (claimable)
+      available += left;
+    return [
+      {
+        id: creditIdOf(g.id, left),
+        status: claimable ? "available" : left > 0 ? "unavailable" : "used",
+        title: typeof g.label === "string" && g.label !== "" ? g.label : null,
+        grantedAt: isoOrNull(g.starts_at),
+        expiresAt: isoOrNull(g.ends_at)
+      }
+    ];
+  });
+  return { available, credits };
+}
+function claimOutcome(value, fail) {
+  const body = recordOf(value);
+  const result = typeof body?.result === "string" ? body.result : null;
+  if (result === "reset") {
+    return { windowsReset: Array.isArray(body?.cleared) ? body.cleared.length : null };
+  }
+  if (result === "cooldown")
+    throw fail("RATE_LIMIT", "reset claim refused: cooldown");
+  if (result === "already_used" || result === "not_limited" || result === "ineligible") {
+    throw fail("CONFLICT", `reset claim refused: ${result}`);
+  }
+  throw fail("UPSTREAM", "reset claim answered without a reset");
+}
+function redeemErrorCode(status) {
+  if (status === 429)
+    return "RATE_LIMIT";
+  if (status === 401 || status === 403)
+    return "AUTH";
+  if (status >= 400 && status < 500)
+    return "CONFLICT";
+  return "UPSTREAM";
+}
+function isoOrNull(value) {
+  if (typeof value !== "string")
+    return null;
+  const at = Date.parse(value);
+  return Number.isNaN(at) ? null : at;
+}
 // packages/providers/src/antigravity/codec.ts
 import { createHash as createHash2 } from "crypto";
 
@@ -28406,16 +28595,19 @@ function toAntigravityWire(req, model, identity) {
             note2("antigravity:tool-result-unmatched");
           if (block.isError === true)
             note2("antigravity:tool-result-error-flag-dropped");
+          const files = splitFiles(block.files ?? [], () => true);
+          if (files.text.length > 0)
+            note2("antigravity:tool-result-files-inlined");
           parts.push({
             functionResponse: {
               name: cloakName2(cloak, name ?? block.toolUseId),
-              response: { output: block.content }
+              response: { output: withFileText(block.content, files.text) }
             }
           });
           for (const image of block.images ?? []) {
             parts.push({ inlineData: { mimeType: image.mediaType, data: image.data } });
           }
-          for (const file2 of block.files ?? []) {
+          for (const file2 of files.carried) {
             parts.push({ inlineData: { mimeType: file2.mediaType, data: file2.data } });
           }
           role = "user";
@@ -29120,7 +29312,7 @@ var grokOAuthFlow = {
 
 // packages/providers/src/kilo/oauth.ts
 var CODES_URL = "https://api.kilo.ai/api/device-auth/codes";
-var PROFILE_URL = "https://api.kilo.ai/api/profile";
+var PROFILE_URL2 = "https://api.kilo.ai/api/profile";
 var FALLBACK_VERIFICATION_URL = "https://kilo.ai";
 var DEFAULT_EXPIRES_SECONDS = 300;
 var POLL_INTERVAL_SECONDS = 3;
@@ -29152,7 +29344,7 @@ function deviceCodeFrom(value, fail) {
 }
 async function* orgIdFor(accessToken) {
   try {
-    const res = yield getJsonRequest(PROFILE_URL, kiloProfile, { accessToken });
+    const res = yield getJsonRequest(PROFILE_URL2, kiloProfile, { accessToken });
     if (res.status < 200 || res.status >= 300)
       return null;
     const record2 = recordFrom(parsed(res.body));
@@ -29660,6 +29852,7 @@ var AUTHORIZE_URL3 = "https://auth.openai.com/oauth/authorize";
 var TOKEN_URL5 = "https://auth.openai.com/oauth/token";
 var SCOPES4 = "openid profile email offline_access";
 var USAGE_URL3 = "https://chatgpt.com/backend-api/wham/usage";
+var RESET_CREDITS_URL = "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits";
 function isRecord7(value) {
   return typeof value === "object" && value !== null;
 }
@@ -29813,8 +30006,78 @@ var openaiOAuthFlow = {
     if (!usageReadable(res.status, "openai"))
       return null;
     return parseOpenAIUsage(parsed(res.body), now());
+  },
+  async* resetCredits({ secrets, providerData }) {
+    if (secrets.accessToken === null)
+      return null;
+    const res = yield getJsonRequest(RESET_CREDITS_URL, openaiProfile, {
+      accessToken: secrets.accessToken,
+      extraHeaders: accountHeader(providerData)
+    });
+    if (!usageReadable(res.status, "openai"))
+      return null;
+    return parseResetCredits(parsed(res.body));
+  },
+  async* redeemReset({ secrets, providerData, creditId, requestId, fail }) {
+    if (secrets.accessToken === null)
+      throw fail("AUTH", "credential holds no access token");
+    const res = yield postJsonRequest(`${RESET_CREDITS_URL}/consume`, openaiProfile, {
+      contentType: "application/json",
+      body: JSON.stringify({ credit_id: creditId, redeem_request_id: requestId }),
+      extraHeaders: [
+        ["Authorization", `Bearer ${secrets.accessToken}`],
+        ...accountHeader(providerData)
+      ]
+    });
+    if (res.status < 200 || res.status >= 300) {
+      throw fail(redeemErrorCode2(res.status), `reset credit redeem refused: http_${res.status}`, {
+        status: res.status
+      });
+    }
+    const body = recordOf(parsed(res.body));
+    const windowsReset = body === null ? null : numberOf(body, ["windows_reset"]);
+    return { windowsReset };
   }
 };
+function accountHeader(providerData) {
+  const accountId = accountIdFromProviderData(providerData);
+  return accountId === null ? [] : [["chatgpt-account-id", accountId]];
+}
+function redeemErrorCode2(status) {
+  if (status === 429)
+    return "RATE_LIMIT";
+  if (status === 401 || status === 403)
+    return "AUTH";
+  if (status >= 400 && status < 500)
+    return "CONFLICT";
+  return "UPSTREAM";
+}
+function isoOrNull2(value) {
+  if (typeof value !== "string")
+    return null;
+  const at = Date.parse(value);
+  return Number.isFinite(at) ? at : null;
+}
+function parseResetCredits(value) {
+  const root = recordOf(value);
+  if (root === null || !Array.isArray(root.credits))
+    return null;
+  const credits = root.credits.flatMap((raw) => {
+    const c = recordOf(raw);
+    if (c === null || typeof c.id !== "string" || typeof c.status !== "string")
+      return [];
+    return [
+      {
+        id: c.id,
+        status: c.status,
+        title: typeof c.title === "string" ? c.title : null,
+        grantedAt: isoOrNull2(c.granted_at),
+        expiresAt: isoOrNull2(c.expires_at)
+      }
+    ];
+  });
+  return { available: credits.filter((c) => c.status === "available").length, credits };
+}
 
 // packages/providers/src/builtinOAuth.ts
 function builtinOAuthFlows() {
@@ -30158,61 +30421,6 @@ async function* decodeCustomResponses(messages) {
   }
 }
 
-// packages/providers/src/responsesFile.ts
-var ACCEPTED = new Set([
-  "application/pdf",
-  "text/plain",
-  "text/csv",
-  "text/markdown",
-  "text/html",
-  "text/css",
-  "text/xml",
-  "text/calendar",
-  "text/tab-separated-values",
-  "text/javascript",
-  "text/x-python",
-  "text/x-c",
-  "text/x-java",
-  "text/x-sh",
-  "text/x-sql",
-  "text/x-typescript",
-  "text/x-yaml",
-  "application/json",
-  "application/javascript",
-  "application/typescript",
-  "application/toml",
-  "application/yaml",
-  "application/x-yaml",
-  "message/rfc822",
-  "application/rtf",
-  "application/msword",
-  "application/vnd.ms-excel",
-  "application/vnd.ms-powerpoint",
-  "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-  "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-  "application/vnd.openxmlformats-officedocument.presentationml.presentation"
-]);
-var TEXTUAL = new Set(["application/xml", "application/sql", "application/x-sh"]);
-function responsesFiles(files) {
-  const parts = [];
-  const text = [];
-  let dropped = false;
-  for (const file2 of files) {
-    if (ACCEPTED.has(file2.mediaType)) {
-      parts.push({
-        type: "input_file",
-        ...file2.filename !== undefined && { filename: file2.filename },
-        file_data: `data:${file2.mediaType};base64,${file2.data}`
-      });
-    } else if (file2.mediaType.startsWith("text/") || TEXTUAL.has(file2.mediaType)) {
-      text.push(Buffer.from(file2.data, "base64").toString("utf8"));
-    } else {
-      dropped = true;
-    }
-  }
-  return { parts, text, dropped };
-}
-
 // packages/providers/src/custom/wire.ts
 function encodeChatToolChoice(c) {
   switch (c.type) {
@@ -30276,19 +30484,23 @@ function toCustomChatWire(req, model) {
             function: { name: block.name, arguments: JSON.stringify(block.input) }
           });
           break;
-        case "toolResult":
+        case "toolResult": {
           if (block.native !== undefined)
             note2("custom:anthropic-native-block-dropped");
+          const files = splitFiles(block.files ?? [], () => false);
           messages.push({
             role: "tool",
             tool_call_id: block.toolUseId,
-            content: block.content
+            content: withFileText(block.content, files.text)
           });
           if (block.images !== undefined)
             note2("custom:images-dropped");
-          if (block.files !== undefined)
+          if (files.text.length > 0)
+            note2("custom:tool-result-files-inlined");
+          if (files.dropped)
             note2("custom:files-dropped");
           break;
+        }
         case "providerNative":
           note2("custom:anthropic-native-block-dropped");
           break;
@@ -30410,9 +30622,7 @@ function toCustomResponsesWire(req, model) {
           input2.push({
             type: "function_call_output",
             call_id: block.toolUseId,
-            output: [block.content, ...files.text].filter((t) => t.length > 0).join(`
-
-`)
+            output: withFileText(block.content, files.text)
           });
           if (block.images !== undefined) {
             note2("custom:tool-result-images-moved");
@@ -30798,9 +31008,7 @@ function toGrokWire(req, model) {
           input2.push({
             type: "function_call_output",
             call_id: block.toolUseId,
-            output: [block.content, ...files.text].filter((t) => t.length > 0).join(`
-
-`)
+            output: withFileText(block.content, files.text)
           });
           if (block.images !== undefined) {
             note2("grok:tool-result-images-moved");
@@ -31258,15 +31466,20 @@ function toKiloWire(req, model) {
             function: { name: block.name, arguments: JSON.stringify(block.input) }
           });
           break;
-        case "toolResult":
+        case "toolResult": {
           if (block.native !== undefined)
             note2("kilo:anthropic-native-block-dropped");
           flush();
+          const files = splitFiles(block.files ?? [], (t) => t === "application/pdf");
           messages.push({
             role: "tool",
             tool_call_id: block.toolUseId,
-            content: block.content
+            content: withFileText(block.content, files.text)
           });
+          if (files.text.length > 0)
+            note2("kilo:tool-result-files-inlined");
+          if (files.dropped)
+            note2("kilo:files-dropped");
           for (const image of block.images ?? []) {
             note2("kilo:tool-result-images-moved");
             toolImages.push({
@@ -31274,17 +31487,18 @@ function toKiloWire(req, model) {
               image_url: { url: `data:${image.mediaType};base64,${image.data}` }
             });
           }
-          for (const file2 of block.files ?? []) {
+          for (const file2 of files.carried) {
             note2("kilo:tool-result-files-moved");
             toolImages.push({
               type: "file",
               file: {
-                ...file2.filename !== undefined && { filename: file2.filename },
+                filename: fileName(file2),
                 file_data: `data:${file2.mediaType};base64,${file2.data}`
               }
             });
           }
           break;
+        }
         case "providerNative":
           note2("kilo:anthropic-native-block-dropped");
           break;
@@ -31538,19 +31752,23 @@ function toChatWire(req, model, vendor = "kimi") {
             function: { name: block.name, arguments: JSON.stringify(block.input) }
           });
           break;
-        case "toolResult":
+        case "toolResult": {
           if (block.native !== undefined)
             note2("kimi:anthropic-native-block-dropped");
+          const files = splitFiles(block.files ?? [], () => false);
           messages.push({
             role: "tool",
             tool_call_id: block.toolUseId,
-            content: block.content
+            content: withFileText(block.content, files.text)
           });
           if (block.images !== undefined)
             note2("kimi:images-dropped");
-          if (block.files !== undefined)
+          if (files.text.length > 0)
+            note2("kimi:tool-result-files-inlined");
+          if (files.dropped)
             note2("kimi:files-dropped");
           break;
+        }
         case "providerNative":
           note2("kimi:anthropic-native-block-dropped");
           break;
@@ -31957,9 +32175,7 @@ function toMuseWire(req, model) {
           input2.push({
             type: "function_call_output",
             call_id: block.toolUseId,
-            output: [block.content, ...files.text].filter((t) => t.length > 0).join(`
-
-`)
+            output: withFileText(block.content, files.text)
           });
           if (block.images !== undefined) {
             note2("muse:tool-result-images-moved");
@@ -32385,9 +32601,7 @@ function toResponsesWire(req, model, opts = { oauth: false }) {
           input2.push({
             type: "function_call_output",
             call_id: block.toolUseId,
-            output: [block.content, ...files.text].filter((t) => t.length > 0).join(`
-
-`)
+            output: withFileText(block.content, files.text)
           });
           if (block.images !== undefined) {
             note2("openai:tool-result-images-moved");
@@ -32794,6 +33008,11 @@ var quotaRefreshSchema = exports_external.discriminatedUnion("kind", [
   }).strict(),
   exports_external.object({ kind: exports_external.literal("all") }).strict()
 ]);
+var accountIdSchema = exports_external.string().trim().min(1).max(64).regex(/^[A-Za-z0-9_-]+$/, "credentialId must be an account id");
+var redeemResetSchema = exports_external.object({
+  credentialId: accountIdSchema,
+  creditId: exports_external.string().min(1).max(128).regex(/^[A-Za-z0-9_-]+$/).optional()
+}).strict();
 var dimensionSchema = exports_external.enum([
   "credential",
   "model",
@@ -35203,6 +35422,29 @@ function oauthAdapter(id, flow, opts = {}) {
           return Promise.resolve(null);
         return runStep(id, "usage", step, deps, origins);
       }
+    },
+    ...flow.resetCredits === undefined ? {} : {
+      resetCredits: (secrets, deps, providerData) => {
+        const step = flow.resetCredits?.({ secrets, providerData, ...helpers(deps) });
+        if (step === undefined)
+          return Promise.resolve(null);
+        return runStep(id, "resetCredits", step, deps, origins);
+      }
+    },
+    ...flow.redeemReset === undefined ? {} : {
+      redeemReset: (secrets, deps, providerData, creditId, requestId) => {
+        const step = flow.redeemReset?.({
+          secrets,
+          providerData,
+          creditId,
+          requestId,
+          ...helpers(deps)
+        });
+        if (step === undefined) {
+          return Promise.reject(flowFailure(id, "redeemReset", "has no redeem step"));
+        }
+        return runStep(id, "redeemReset", step, deps, origins);
+      }
     }
   };
   if (flow.kind === "pkce")
@@ -35238,11 +35480,32 @@ function isAuthorizeStart(value) {
   const candidate = value;
   return typeof candidate.authorizeUrl === "string" && typeof candidate.pending === "object" && candidate.pending !== null;
 }
+function isResetCreditsOrNull(value) {
+  if (value === null)
+    return true;
+  if (typeof value !== "object")
+    return false;
+  const candidate = value;
+  return typeof candidate.available === "number" && Array.isArray(candidate.credits) && candidate.credits.every((c) => {
+    if (typeof c !== "object" || c === null)
+      return false;
+    const row = c;
+    return typeof row.id === "string" && typeof row.status === "string" && (row.title === null || typeof row.title === "string") && (row.grantedAt === null || typeof row.grantedAt === "number") && (row.expiresAt === null || typeof row.expiresAt === "number");
+  });
+}
+function isResetRedeemed(value) {
+  if (typeof value !== "object" || value === null)
+    return false;
+  const held = value.windowsReset;
+  return held === null || typeof held === "number";
+}
 var RETURN_SHAPE = {
   start: isAuthorizeStart,
   begin: isAuthorizeStart,
   exchange: isFlowResult,
-  refresh: isFlowResult
+  refresh: isFlowResult,
+  resetCredits: isResetCreditsOrNull,
+  redeemReset: isResetRedeemed
 };
 
 // packages/control/src/oauth/index.ts
@@ -35462,6 +35725,11 @@ function validateOAuthFlow(id, value) {
   if (value.usage !== undefined) {
     checkAt(typeof value.usage === "function", id, "oauth.usage", "a function");
   }
+  for (const fn of ["resetCredits", "redeemReset"]) {
+    if (value[fn] !== undefined) {
+      checkAt(typeof value[fn] === "function", id, `oauth.${fn}`, "a function");
+    }
+  }
   if (kind === "device") {
     checkAt(typeof value.begin === "function", id, "oauth.begin", "a function");
     checkAt(typeof value.needsDeviceId === "boolean", id, "oauth.needsDeviceId", "a boolean");
@@ -35657,6 +35925,52 @@ async function quotaHistory(deps, input2) {
 
 // packages/control/src/quota/clientHistory.ts
 var MAX_SPAN_MS = 16 * 24 * 60 * 60 * 1000;
+// packages/control/src/quota/resets.ts
+async function resettable(deps, credentialId) {
+  const credential = await deps.store.credentials.get(credentialId.trim());
+  if (credential === null)
+    throw new GatewayError("BAD_REQUEST", "no such credential");
+  const provider = deps.providers[credential.provider];
+  const list = provider?.resetCredits;
+  const redeem = provider?.redeemReset;
+  if (credential.authType !== "oauth" || list === undefined || redeem === undefined) {
+    throw new GatewayError("BAD_REQUEST", "this account's provider has no quota resets");
+  }
+  return { credential, list, redeem };
+}
+async function listFor(deps, r) {
+  const secrets = await usageSecretsFor(deps, r.credential);
+  const read = await r.list(secrets, { http: deps.http, now: deps.now }, r.credential.providerData);
+  if (read === null) {
+    throw new GatewayError("UPSTREAM", "provider answered the reset list with nothing usable", {
+      gatewayAuthored: true
+    });
+  }
+  return read;
+}
+async function listResetCredits(deps, credentialId) {
+  const r = await resettable(deps, credentialId);
+  return { credentialId: r.credential.id, ...await listFor(deps, r) };
+}
+async function redeemResetCredit(deps, request2) {
+  const r = await resettable(deps, request2.credentialId);
+  return deps.coord.mutex.withLock(PROBE_LOCK_PREFIX + r.credential.id, PROBE_LOCK_TTL_MS, PROBE_LOCK_WAIT_MS, () => redeemLocked(deps, r, request2));
+}
+async function redeemLocked(deps, r, request2) {
+  const available = (await listFor(deps, r)).credits.filter((c) => c.status === "available").sort((a, b) => (a.expiresAt ?? Number.POSITIVE_INFINITY) - (b.expiresAt ?? Number.POSITIVE_INFINITY));
+  const credit = request2.creditId === undefined ? available[0] : available.find((c) => c.id === request2.creditId);
+  if (credit === undefined) {
+    throw new GatewayError("CONFLICT", request2.creditId === undefined ? "no reset credit is available for this account" : "that reset credit is not available");
+  }
+  const secrets = await usageSecretsFor(deps, r.credential);
+  const { windowsReset } = await r.redeem(secrets, { http: deps.http, now: deps.now }, r.credential.providerData, credit.id, crypto.randomUUID());
+  let quotaRefreshed = false;
+  try {
+    quotaRefreshed = await probe(deps, r.credential) !== null;
+  } catch {}
+  return { credentialId: r.credential.id, creditId: credit.id, windowsReset, quotaRefreshed };
+}
+
 // packages/control/src/quota/poll.ts
 var CONCURRENCY = 4;
 var RATE_LIMIT_COOLDOWN_MS = 180000;
@@ -35664,14 +35978,17 @@ var COOLDOWN_PREFIX = "quota:cooldown:";
 var PROBE_LOCK_PREFIX = "quota:probe:";
 var PROBE_LOCK_TTL_MS = 60000;
 var PROBE_LOCK_WAIT_MS = 30000;
+async function usageSecretsFor(deps, credential) {
+  const refreshed = credential.hasRefreshToken && credential.expiresAt !== null && credential.expiresAt - SCHEDULER_REFRESH_LEAD_MS <= deps.now() ? await deps.refresh(credential) : null;
+  return refreshed === null ? await credential.openForUsage() : { accessToken: refreshed.accessToken };
+}
 async function probe(deps, credential) {
   if (credential.authType !== "oauth")
     return null;
   const provider = deps.providers[credential.provider];
   if (provider?.usage === undefined)
     return null;
-  const refreshed = credential.hasRefreshToken && credential.expiresAt !== null && credential.expiresAt - SCHEDULER_REFRESH_LEAD_MS <= deps.now() ? await deps.refresh(credential) : null;
-  const secrets = refreshed === null ? await credential.openForUsage() : { accessToken: refreshed.accessToken };
+  const secrets = await usageSecretsFor(deps, credential);
   const report = await provider.usage(secrets, { http: deps.http, now: deps.now }, credential.providerData);
   if (report === null || report.windows.length === 0)
     return null;
@@ -35834,6 +36151,12 @@ function quotaOps(deps) {
         outcomes.push(result?.outcome ?? { kind: "failed", credentialId: credential.id, code: "INTERNAL" });
       }
       return { outcomes };
+    },
+    resetCredits: (credentialId) => listResetCredits(deps, credentialId),
+    redeemReset: (request2) => redeemResetCredit(deps, request2),
+    hasResets: (provider) => {
+      const flow = deps.providers[provider];
+      return flow?.resetCredits !== undefined && flow.redeemReset !== undefined;
     }
   };
 }
@@ -38018,16 +38341,7 @@ var quotaRefresh = {
     const store = await ctx.store();
     const credentials = await listCredentials(store);
     const wanted = id === undefined ? credentials : credentials.filter((c) => c.id === id);
-    const providers = wanted.every((c) => Object.hasOwn(PROVIDER_DESCRIPTORS, c.provider)) ? OAUTH_PROVIDERS : (await connectRegistryFor(ctx.root.root)).providers;
-    const http = nodeHttpClient();
-    const ops = quotaOps({
-      store,
-      coord: memoryCoord({ now: ctx.now }),
-      providers,
-      http,
-      refresh: createRefresher({ store, providers, http, now: ctx.now }),
-      now: ctx.now
-    });
+    const ops = await opsFor(ctx, wanted);
     note(ctx, writer, id === undefined ? "refreshing every account\u2026" : `refreshing ${id}\u2026`);
     const result = await ops.refresh(id === undefined ? { kind: "all" } : { kind: "one", credentialId: id });
     const labels = new Map(credentials.map((c) => [c.id, c.label]));
@@ -38053,6 +38367,59 @@ var quotaRefresh = {
     }
   }
 };
+async function opsFor(ctx, wanted) {
+  const store = await ctx.store();
+  const providers = wanted.every((c) => Object.hasOwn(PROVIDER_DESCRIPTORS, c.provider)) ? OAUTH_PROVIDERS : (await connectRegistryFor(ctx.root.root)).providers;
+  const http = nodeHttpClient();
+  return quotaOps({
+    store,
+    coord: memoryCoord({ now: ctx.now }),
+    providers,
+    http,
+    refresh: createRefresher({ store, providers, http, now: ctx.now }),
+    now: ctx.now
+  });
+}
+var quotaResets = {
+  usage: "quota resets <id>",
+  summary: "List an account's banked quota resets (Codex, Claude)",
+  async run(args, { ctx, writer }) {
+    const id = requirePositional(args, 0, "credential id");
+    const credentials = (await listCredentials(await ctx.store())).filter((c) => c.id === id);
+    const listed = await (await opsFor(ctx, credentials)).resetCredits(id);
+    emit(ctx, writer, listed, () => [
+      table([{ header: "CREDIT" }, { header: "STATUS" }, { header: "TITLE" }, { header: "EXPIRES" }], listed.credits.map((c) => [c.id, c.status, c.title ?? dash, formatTime(c.expiresAt)])),
+      "",
+      `${listed.available} available`
+    ].join(`
+`));
+  }
+};
+var quotaReset = {
+  usage: "quota reset <id> [--credit CREDIT_ID]",
+  summary: "Spend one banked quota reset on an account (irreversible)",
+  options: { credit: { type: "string" } },
+  async run(args, { ctx, writer, prompt }) {
+    const id = requirePositional(args, 0, "credential id");
+    const creditId = stringFlag(args.values, "credit");
+    const credentials = (await listCredentials(await ctx.store())).filter((c) => c.id === id);
+    const label3 = credentials[0]?.label ?? id;
+    const ops = await opsFor(ctx, credentials);
+    const provider2 = credentials[0]?.provider;
+    if (provider2 === undefined)
+      throw new CliError("no such credential");
+    if (!ops.hasResets(provider2))
+      throw new CliError("this account's provider has no quota resets");
+    if (!await prompt.confirm(`spend one banked quota reset on "${label3}" (${id})?`)) {
+      throw new CliError("cancelled");
+    }
+    const result = await ops.redeemReset({
+      credentialId: id,
+      ...creditId === undefined ? {} : { creditId }
+    });
+    emit(ctx, writer, result, () => `${label3}: reset ${result.creditId} redeemed` + (result.windowsReset === null ? "" : `, ${result.windowsReset} window(s) reset`) + (result.quotaRefreshed ? "; quota re-read" : "; quota re-read failed, next poll will update it"));
+  }
+};
 
 // apps/cli/src/commands/service.ts
 import { existsSync as existsSync5 } from "fs";
@@ -38143,7 +38510,7 @@ function createServiceDeps(input2) {
 }
 
 // apps/cli/src/version.ts
-var VERSION = "0.12.11";
+var VERSION = "0.12.13";
 
 // apps/cli/src/commands/service.ts
 function gatewayArgv(root) {
@@ -38860,6 +39227,8 @@ var COMMANDS = {
   "credentials add-key": credentialsAddKey,
   "credentials health": credentialsHealth,
   "quota refresh": quotaRefresh,
+  "quota resets": quotaResets,
+  "quota reset": quotaReset,
   "models list": modelsList,
   "models show": modelsShow,
   "models put": modelsPut,