pi-spark 0.19.3 → 0.21.0

package/LICENSE.md

@@ -0,0 +1,9 @@
+# MIT License
+
+Copyright (c) 2026-present Zilong Liang
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -69,13 +69,19 @@ pi-spark generates a short recap of the current session after it goes idle, or o
 
 ### Title
 
-pi-spark names the session automatically after the first exchange, so it's easy to find later in the session selector.
+pi-spark names the session automatically after the first completed turn, so it's easy to find later in the session selector.
 
-- After the first message is sent and the agent replies, pi-spark generates a short title from the conversation and sets it as the session name.
+- Once the agent completes its first response and any tool calls from that turn, pi-spark generates a short title from the conversation and sets it as the session name.
 - Generation is silent: nothing is shown in the UI, and the usage is recorded in a session entry like the recap.
 - Sessions that already have a name are left untouched.
 - The title generation can use its own model, configured separately from your working model.
 
+### Scrolling write previews
+
+Long, streaming `write` tool calls keep their latest lines visible instead of pinning the preview to the beginning. The omitted-line count appears above the preview, while `ctrl+o` still expands the full content.
+
+https://raw.githubusercontent.com/zlliang/pi-spark/refs/heads/main/assets/screencast-write.mp4
+
 ## Configuration
 
 pi-spark reads config from `~/.pi/agent/spark.json` and from the current project's `.pi/spark.json`. Project config overrides matching global fields.
@@ -120,17 +126,37 @@ All fields are optional. Each top-level feature runs with the defaults below unl
 
 | Field | Value (or `false`) | Description |
 | --- | --- | --- |
-| `credits` | `{}` | Shows the active provider's credit balance or rate-limit usage in the status line. |
+| `credits` | `CreditsConfig` | Shows the active provider's credit balance or rate-limit usage in the status line. |
 | `editor` | `EditorConfig` | Shows a working indicator and the current model on the editor's top border. |
-| `footer` | `{}` | Shows session info, extension statuses, cost, and context usage on one line. |
+| `footer` | `FooterConfig` | Shows session info, extension statuses, cost, and context usage. |
 | `fullscreen` | `{}` | Clears the screen and scrollback on start and exit, and pins the editor and footer to the bottom. |
 | `presets` | `{ [name]: Preset }` | Defines named model presets, keyed by name. |
 | `recap` | `RecapConfig` | Generates a session recap when idle or on demand. |
-| `title` | `TitleConfig` | Names the session automatically after the first exchange. |
+| `title` | `TitleConfig` | Names the session automatically after the first completed turn. |
+| `write` | `{}` | Keeps the latest lines of streaming `write` tool calls visible. |
+
+#### `CreditsConfig`
+
+All supported providers are enabled by default. Set a provider to `false` to disable its credits status, or to `true` to override a global `false` in project config.
+
+```json
+{
+  "credits": {
+    "providers": {
+      "fireworks": false,
+      "openai-codex": true
+    }
+  }
+}
+```
+
+| Field | Value | Description |
+| --- | --- | --- |
+| `providers` | partial map of provider IDs to booleans | Enables or disables credits for individual providers. Valid IDs: `deepseek`, `fireworks`, `kimi-coding`, `moonshotai`, `moonshotai-cn`, `openai-codex`, `openrouter`, and `vercel-ai-gateway`. |
 
 #### `EditorConfig`
 
-The `spinner` field is optional and defaults to `tildes`.
+The `spinner` field is optional and defaults to `tildes`. `thinkingLevelIndicator` is also optional and defaults to `border`.
 
 | Field | Value | Description |
 | --- | --- | --- |
@@ -138,6 +164,17 @@ The `spinner` field is optional and defaults to `tildes`.
 |  | `lights` | `○, ●` |
 |  | `tildes` (default) | `∼, ≈, ≋, ≈, ∼` |
 |  | `pulse` | `·, •, ●, •, ·` |
+| `thinkingLevelIndicator` | `border` (default) | Uses the thinking-level color for the editor border. |
+|  | `model` | Uses the thinking-level color for the model name and the dim color for the editor border. |
+
+#### `FooterConfig`
+
+The `statusPosition` field is optional and defaults to `inline`.
+
+| Field | Value | Description |
+| --- | --- | --- |
+| `statusPosition` | `inline` (default) | Shows extension statuses on the same line as session info, cost, and context usage. |
+|  | `below` | Moves extension statuses to a new line below. |
 
 #### `Preset`
 
@@ -185,3 +222,18 @@ For example, to disable the customized footer:
   "footer": false
 }
 ```
+
+## Themes
+
+pi-spark ships with two custom themes inspired by [GitHub's VS Code themes](https://github.com/primer/github-vscode-theme):
+
+- [`github-light-default`](themes/github-light-default.json)
+- [`github-dark-default`](themes/github-dark-default.json)
+
+Select either theme in `/settings`, or configure automatic switching between them:
+
+```json
+{
+  "theme": "github-light-default/github-dark-default"
+}
+```

package/index.ts

@@ -6,6 +6,7 @@ import { registerFullscreen } from "./src/features/fullscreen";
 import { registerPresets } from "./src/features/presets";
 import { registerRecap } from "./src/features/recap";
 import { registerTitle } from "./src/features/title";
+import { registerWrite } from "./src/features/write";
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
@@ -26,4 +27,5 @@ export default function (pi: ExtensionAPI) {
   registerPresets(pi);
   registerRecap(pi);
   registerTitle(pi);
+  registerWrite(pi);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-spark",
-  "version": "0.19.3",
+  "version": "0.21.0",
   "description": "Pi package that polishes your daily experience.",
   "keywords": [
     "pi-coding-agent",
@@ -15,6 +15,7 @@
   "files": [
     "index.ts",
     "src",
+    "themes",
     "assets",
     "docs",
     "README.md",
@@ -24,6 +25,9 @@
     "extensions": [
       "./index.ts"
     ],
+    "themes": [
+      "./themes"
+    ],
     "image": "https://raw.githubusercontent.com/zlliang/pi-spark/main/assets/cover.png"
   },
   "scripts": {
@@ -33,22 +37,23 @@
     "@grpc/grpc-js": "^1.14.4",
     "@grpc/proto-loader": "^0.8.1",
     "defu": "^6.1.7",
+    "ky": "^2.0.2",
     "parse-duration": "^2.1.8",
     "pretty-ms": "^9.3.0",
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@earendil-works/pi-agent-core": ">=0.80.8",
-    "@earendil-works/pi-ai": ">=0.80.8",
-    "@earendil-works/pi-coding-agent": ">=0.80.8",
-    "@earendil-works/pi-tui": ">=0.80.8",
+    "@earendil-works/pi-agent-core": ">=0.81.0",
+    "@earendil-works/pi-ai": ">=0.81.0",
+    "@earendil-works/pi-coding-agent": ">=0.81.0",
+    "@earendil-works/pi-tui": ">=0.81.0",
     "typebox": "*"
   },
   "devDependencies": {
-    "@earendil-works/pi-agent-core": ">=0.80.8",
-    "@earendil-works/pi-ai": ">=0.80.8",
-    "@earendil-works/pi-coding-agent": ">=0.80.8",
-    "@earendil-works/pi-tui": ">=0.80.8",
+    "@earendil-works/pi-agent-core": ">=0.81.0",
+    "@earendil-works/pi-ai": ">=0.81.0",
+    "@earendil-works/pi-coding-agent": ">=0.81.0",
+    "@earendil-works/pi-tui": ">=0.81.0",
     "@types/node": "*",
     "typebox": "*",
     "typescript": "^7.0.2"

package/src/config/schema.ts

@@ -7,6 +7,7 @@ import { fullscreenConfigSchema } from "../features/fullscreen/config";
 import { presetsConfigSchema } from "../features/presets/config";
 import { recapConfigSchema } from "../features/recap/config";
 import { titleConfigSchema } from "../features/title/config";
+import { writeConfigSchema } from "../features/write/config";
 
 /**
  * Raw option shape for each feature. The enable/disable/default policy lives in `loadConfig`:
@@ -21,6 +22,7 @@ export const featureSchemas = {
   presets: presetsConfigSchema,
   recap: recapConfigSchema,
   title: titleConfigSchema,
+  write: writeConfigSchema,
 } as const;
 
 /** Resolved config for every feature; `false` means the feature is disabled. */

package/src/features/credits/config.ts

@@ -1,3 +1,20 @@
 import * as z from "zod";
 
-export const creditsConfigSchema = z.object({});
+const creditsProviderIdSchema = z.enum([
+  "deepseek",
+  "fireworks",
+  "kimi-coding",
+  "moonshotai",
+  "moonshotai-cn",
+  "openai-codex",
+  "openrouter",
+  "vercel-ai-gateway",
+]);
+
+export type CreditsProviderId = z.infer<typeof creditsProviderIdSchema>;
+
+export const creditsConfigSchema = z.object({
+  providers: z.partialRecord(creditsProviderIdSchema, z.boolean()).optional(),
+});
+
+export type CreditsConfig = z.infer<typeof creditsConfigSchema>;

package/src/features/credits/index.ts

@@ -1,5 +1,5 @@
 import { CreditsManager } from "./manager";
-import { registerProviderExtensions } from "./providers";
+import { getEnabledProviders, registerProviderExtensions } from "./providers";
 import { loadConfig } from "../../config";
 import { isUsage } from "../../utils/usage";
 
@@ -18,10 +18,13 @@ export function registerCredits(pi: ExtensionAPI): void {
 
   pi.on("session_start", (_event, ctx) => {
     const config = loadConfig(ctx).credits;
-    if (!ctx.hasUI || !config) return;
+    if (ctx.mode !== "tui" || !config) return;
 
-    creditsManager = new CreditsManager();
-    registerProviderExtensions(pi, ctx, async (ctx) => await creditsManager?.refresh(ctx));
+    const providers = getEnabledProviders(config);
+    if (providers.length === 0) return;
+
+    creditsManager = new CreditsManager(providers);
+    registerProviderExtensions(pi, ctx, providers, async (ctx) => await creditsManager?.refresh(ctx));
 
     creditsManager.refresh(ctx);
   });

package/src/features/credits/manager.ts

@@ -5,16 +5,20 @@ import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { CreditsProvider } from "./types";
 
 const STATUS_KEY = "credits";
-const REQUEST_TIMEOUT_MS = 30_000;
 
 export class CreditsManager {
   private inflight: AbortController | undefined = undefined;
+  private providers: CreditsProvider[];
   private currentProvider: string | undefined = undefined;
 
+  constructor(providers: CreditsProvider[]) {
+    this.providers = providers;
+  }
+
   async refresh(ctx: ExtensionContext): Promise<void> {
     this.inflight?.abort();
 
-    const provider = findProvider(ctx.model?.provider);
+    const provider = findProvider(this.providers, ctx.model?.provider);
     if (!provider) {
       this.inflight = undefined;
       this.currentProvider = undefined;
@@ -50,8 +54,7 @@ export class CreditsManager {
         return;
       }
 
-      const signals = AbortSignal.any([AbortSignal.timeout(REQUEST_TIMEOUT_MS), signal]);
-      const credits = await provider.fetch(apiKey, signals);
+      const credits = await provider.fetch(apiKey, signal);
 
       // The active model may have changed while the request was in flight.
       if (ctx.model?.provider !== provider.id) return;

package/src/features/credits/providers/deepseek.ts

@@ -1,4 +1,5 @@
 import { convertToUSD, toNumber } from "../../../utils/format";
+import { http, withAuth } from "../../../utils/http";
 
 import type { Credits, CreditsProvider } from "../types";
 
@@ -19,15 +20,7 @@ export const deepseekProvider: CreditsProvider = {
   label: "DeepSeek",
 
   async fetch(apiKey, signal): Promise<Credits> {
-    const headers: Record<string, string> = {
-      Accept: "application/json",
-      Authorization: `Bearer ${apiKey}`,
-    };
-
-    const response = await fetch(URL, { headers, signal });
-    if (!response.ok) throw new Error("request failed");
-
-    const payload = (await response.json()) as DeepSeekBalanceResponse;
+    const payload = await withAuth(http, apiKey).get(URL, { signal }).json<DeepSeekBalanceResponse>();
     const balance = payload.balance_infos?.find((entry) => entry.currency === "USD") ?? payload.balance_infos?.[0];
     const remaining = await convertToUSD(toNumber(balance?.total_balance), balance?.currency, signal);
 

package/src/features/credits/providers/index.ts

@@ -7,6 +7,7 @@ import { openrouterProvider } from "./openrouter";
 import { vercelAiGatewayProvider } from "./vercel-ai-gateway";
 
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { CreditsConfig } from "../config";
 import type { CreditsProvider, RefreshCredits } from "../types";
 
 const PROVIDERS: CreditsProvider[] = [
@@ -20,10 +21,15 @@ const PROVIDERS: CreditsProvider[] = [
   vercelAiGatewayProvider,
 ];
 
-export function findProvider(provider?: string): CreditsProvider | undefined {
-  return PROVIDERS.find((entry) => entry.id === provider);
+export function getEnabledProviders(config: CreditsConfig): CreditsProvider[] {
+  const settings = config.providers as Partial<Record<string, boolean>> | undefined;
+  return PROVIDERS.filter((provider) => settings?.[provider.id] !== false);
 }
 
-export function registerProviderExtensions(pi: ExtensionAPI, ctx: ExtensionContext, refresh: RefreshCredits): void {
-  for (const provider of PROVIDERS) provider.register?.(pi, ctx, refresh);
+export function findProvider(providers: CreditsProvider[], provider?: string): CreditsProvider | undefined {
+  return providers.find((entry) => entry.id === provider);
+}
+
+export function registerProviderExtensions(pi: ExtensionAPI, ctx: ExtensionContext, providers: CreditsProvider[], refresh: RefreshCredits): void {
+  for (const provider of providers) provider.register?.(pi, ctx, refresh);
 }

package/src/features/credits/providers/kimi-code.ts

@@ -1,21 +1,49 @@
 import { toNumber } from "../../../utils/format";
+import { http, withAuth } from "../../../utils/http";
 
 import type { Credits, CreditsLane, CreditsProvider } from "../types";
 
 const PROVIDER = "kimi-coding";
 const URL = "https://api.kimi.com/coding/v1/usages";
+const BOOSTER_FIXED_POINT_CENTS = 1_000_000;
+
+interface KimiCodeUsage {
+  limit?: string | number;
+  used?: string | number;
+  remaining?: string | number;
+}
+
+interface KimiCodeLimit {
+  window?: { duration?: number; timeUnit?: string } | null;
+  detail?: KimiCodeUsage | null;
+}
+
+interface KimiCodeBoosterWallet {
+  balance?: {
+    type?: string;
+    amount?: string | number;
+    amountLeft?: string | number;
+  } | null;
+}
 
 interface KimiCodeUsageResponse {
-  usage?: { used?: string | number } | null;
-  limits?: {
-    window?: { duration?: number; timeUnit?: string } | null;
-    detail?: { used?: string | number } | null;
-  }[] | null;
+  usage?: KimiCodeUsage | null;
+  limits?: KimiCodeLimit[] | null;
+  boosterWallet?: KimiCodeBoosterWallet | null;
 }
 
-function toPercent(used: number | undefined): number | undefined {
-  if (used === undefined) return undefined;
-  return Math.min(100, Math.max(0, used));
+function toPercent(detail: KimiCodeUsage): number | undefined {
+  const limit = toNumber(detail.limit);
+  let used = toNumber(detail.used);
+
+  if (used === undefined && limit !== undefined) {
+    const remaining = toNumber(detail.remaining);
+    if (remaining !== undefined) used = limit - remaining;
+  }
+
+  if (used === undefined || limit === undefined || limit <= 0) return undefined;
+
+  return Math.min(100, Math.max(0, (used / limit) * 100));
 }
 
 function formatWindowLabel(window?: { duration?: number; timeUnit?: string } | null): string {
@@ -34,8 +62,20 @@ function formatWindowLabel(window?: { duration?: number; timeUnit?: string } | n
   return `${duration}${unit.replace("TIME_UNIT_", "").toLowerCase()}`;
 }
 
-function buildLane(label: string, detail?: KimiCodeUsageResponse["usage"]): CreditsLane {
-  return { label, percent: toPercent(toNumber(detail?.used ?? 0)) };
+function buildLane(label: string, detail: KimiCodeUsage): CreditsLane | undefined {
+  const percent = toPercent(detail);
+  return percent === undefined ? undefined : { label, percent };
+}
+
+function formatSuffix(wallet?: KimiCodeBoosterWallet | null): string | undefined {
+  if (wallet?.balance?.type !== "BOOSTER") return undefined;
+
+  const amount = toNumber(wallet.balance.amount);
+  if (amount === undefined || amount <= 0) return undefined;
+
+  const amountLeft = Math.max(0, toNumber(wallet.balance.amountLeft) ?? 0);
+  const remaining = Math.round(amountLeft / BOOSTER_FIXED_POINT_CENTS) / 100;
+  return `(Extra Usage $${remaining.toFixed(2)})`;
 }
 
 export const kimiCodeProvider: CreditsProvider = {
@@ -43,27 +83,23 @@ export const kimiCodeProvider: CreditsProvider = {
   label: "Kimi Code",
 
   async fetch(apiKey, signal): Promise<Credits> {
-    const headers: Record<string, string> = {
-      Accept: "application/json",
-      Authorization: `Bearer ${apiKey}`,
-    };
-
-    const response = await fetch(URL, { headers, signal });
-    if (!response.ok) throw new Error("request failed");
-
-    const payload = (await response.json()) as KimiCodeUsageResponse;
+    const payload = await withAuth(http, apiKey).get(URL, { signal }).json<KimiCodeUsageResponse>();
     const lanes: CreditsLane[] = [];
 
     payload.limits?.forEach((item) => {
-      if (!item) return;
+      if (!item.detail) return;
 
-      const label = formatWindowLabel(item.window);
-      lanes.push(buildLane(label, item.detail));
+      const lane = buildLane(formatWindowLabel(item.window), item.detail);
+      if (lane) lanes.push(lane);
     });
 
-    const weeklyLane = buildLane("7d", payload.usage);
-    lanes.push(weeklyLane);
+    if (payload.usage) {
+      const weeklyLane = buildLane("7d", payload.usage);
+      if (weeklyLane) lanes.push(weeklyLane);
+    }
+
+    if (lanes.length === 0) throw new Error("no usage data");
 
-    return { type: "windows", lanes };
+    return { type: "windows", lanes, suffix: formatSuffix(payload.boosterWallet) };
   },
 };

package/src/features/credits/providers/moonshot.ts

@@ -1,4 +1,5 @@
 import { convertToUSD, toNumber } from "../../../utils/format";
+import { http, withAuth } from "../../../utils/http";
 
 import type { Credits, CreditsProvider } from "../types";
 
@@ -13,21 +14,13 @@ interface MoonshotBalanceResponse {
  * different currencies (USD vs CNY), which the endpoint does not report, so each Pi provider ID
  * fixes both host and currency.
  */
-function createMoonshotProvider(id: string, host: string, currency: string): CreditsProvider {
+function createMoonshotProvider(id: "moonshotai" | "moonshotai-cn", host: string, currency: string): CreditsProvider {
   return {
     id,
     label: "Moonshot",
 
     async fetch(apiKey, signal): Promise<Credits> {
-      const headers: Record<string, string> = {
-        Accept: "application/json",
-        Authorization: `Bearer ${apiKey}`,
-      };
-
-      const response = await fetch(`https://${host}/v1/users/me/balance`, { headers, signal });
-      if (!response.ok) throw new Error("request failed");
-
-      const payload = (await response.json()) as MoonshotBalanceResponse;
+      const payload = await withAuth(http, apiKey).get(`https://${host}/v1/users/me/balance`, { signal }).json<MoonshotBalanceResponse>();
       const remaining = await convertToUSD(toNumber(payload.data?.available_balance), currency, signal);
 
       return { type: "balance", remaining };

package/src/features/credits/providers/openai-codex.ts

@@ -4,8 +4,10 @@ import prettyMilliseconds from "pretty-ms";
 
 import { confirmCodexReset, formatAvailableResets, showCodexResetLoader, showCodexResetSelector } from "./openai-codex-panel";
 import { toNumber } from "../../../utils/format";
+import { http, withAuth } from "../../../utils/http";
 
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { KyInstance } from "ky";
 import type { CodexResetPanelData } from "./openai-codex-panel";
 import type { Credits, CreditsLane, CreditsProvider, RefreshCredits } from "../types";
 
@@ -14,7 +16,6 @@ const BASE_URL = "https://chatgpt.com/backend-api";
 const USAGE_PATH = "/wham/usage";
 const RESET_CREDITS_PATH = "/wham/rate-limit-reset-credits";
 const CONSUME_RESET_PATH = "/wham/rate-limit-reset-credits/consume";
-const REQUEST_TIMEOUT_MS = 30_000;
 
 interface CodexUsageResponse {
   rate_limit?: {
@@ -53,11 +54,10 @@ async function runCodexReset(ctx: ExtensionContext, refresh: RefreshCredits): Pr
   const apiKey = await ctx.modelRegistry.getApiKeyForProvider(PROVIDER);
   if (!apiKey) return;
 
-  const headers = buildHeaders(apiKey);
+  const client = createClient(apiKey);
 
   const credit = await showCodexResetSelector(ctx, async (signal) => {
-    const requestSignal = AbortSignal.any([signal, AbortSignal.timeout(REQUEST_TIMEOUT_MS)]);
-    const [usage, details] = await Promise.all([fetchUsage(headers, requestSignal), fetchResetCredits(headers, requestSignal)]);
+    const [usage, details] = await Promise.all([fetchUsage(client, signal), fetchResetCredits(client, signal)]);
 
     return {
       ...details,
@@ -66,63 +66,42 @@ async function runCodexReset(ctx: ExtensionContext, refresh: RefreshCredits): Pr
   });
   if (!credit || !(await confirmCodexReset(ctx, credit))) return;
 
-  await redeemReset(ctx, headers, credit, refresh);
+  await redeemReset(ctx, client, credit, refresh);
 }
 
-async function redeemReset(ctx: ExtensionContext, headers: Record<string, string>, credit: BankedRateLimitReset, refresh: RefreshCredits): Promise<void> {
+async function redeemReset(ctx: ExtensionContext, client: KyInstance, credit: BankedRateLimitReset, refresh: RefreshCredits): Promise<void> {
   await showCodexResetLoader(ctx, async () => {
-    const response = await consumeReset(headers, uuidv7(), credit.id);
+    const response = await consumeReset(client, uuidv7(), credit.id);
     if (response.code === "nothing_to_reset") throw new Error("No Codex rate-limit window currently needs a reset");
     if (response.code === "no_credit") throw new Error("No Codex resets are available");
   }).finally(() => refresh(ctx));
 }
 
-function buildHeaders(apiKey: string): Record<string, string> {
-  const headers: Record<string, string> = {
-    Accept: "application/json",
-    Authorization: `Bearer ${apiKey}`,
-  };
-
+function createClient(apiKey: string): KyInstance {
+  const client = withAuth(http, apiKey);
   const credential = readStoredCredential(PROVIDER);
   const accountId = credential?.type === "oauth" ? credential.accountId : undefined;
-  if (typeof accountId === "string" && accountId.length > 0) headers["ChatGPT-Account-ID"] = accountId;
-
-  return headers;
-}
-
-async function requestJson<T>(path: string, headers: Record<string, string>, signal: AbortSignal, init: RequestInit = {}): Promise<T> {
-  const requestHeaders = new Headers(headers);
-  new Headers(init.headers).forEach((value, key) => requestHeaders.set(key, value));
-
-  const response = await fetch(`${BASE_URL}${path}`, {
-    ...init,
-    headers: requestHeaders,
-    signal,
-  });
-  if (!response.ok) throw new Error(`Codex backend returned ${response.status}`);
 
-  return (await response.json()) as T;
+  return typeof accountId === "string" && accountId.length > 0
+    ? client.extend({ headers: { "ChatGPT-Account-ID": accountId } })
+    : client;
 }
 
-async function fetchUsage(headers: Record<string, string>, signal: AbortSignal): Promise<CodexUsageResponse> {
-  return requestJson<CodexUsageResponse>(USAGE_PATH, headers, signal);
+async function fetchUsage(client: KyInstance, signal: AbortSignal): Promise<CodexUsageResponse> {
+  return client.get(`${BASE_URL}${USAGE_PATH}`, { signal }).json<CodexUsageResponse>();
 }
 
-async function fetchResetCredits(headers: Record<string, string>, signal: AbortSignal): Promise<RateLimitResetCreditsResponse> {
-  return requestJson<RateLimitResetCreditsResponse>(RESET_CREDITS_PATH, headers, signal);
+async function fetchResetCredits(client: KyInstance, signal: AbortSignal): Promise<RateLimitResetCreditsResponse> {
+  return client.get(`${BASE_URL}${RESET_CREDITS_PATH}`, { signal }).json<RateLimitResetCreditsResponse>();
 }
 
-async function consumeReset(headers: Record<string, string>, redeemRequestId: string, creditId: string): Promise<ConsumeResetResponse> {
-  return requestJson<ConsumeResetResponse>(
-    CONSUME_RESET_PATH,
-    headers,
-    AbortSignal.timeout(REQUEST_TIMEOUT_MS),
-    {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ redeem_request_id: redeemRequestId, credit_id: creditId }),
+async function consumeReset(client: KyInstance, redeemRequestId: string, creditId: string): Promise<ConsumeResetResponse> {
+  return client.post(`${BASE_URL}${CONSUME_RESET_PATH}`, {
+    json: {
+      redeem_request_id: redeemRequestId,
+      credit_id: creditId
     },
-  );
+  }).json<ConsumeResetResponse>();
 }
 
 function toCredits(usage: CodexUsageResponse, suffix?: string): Credits {
@@ -153,8 +132,8 @@ export const openaiCodexProvider: CreditsProvider = {
   label: "Codex",
 
   async fetch(apiKey, signal): Promise<Credits> {
-    const headers = buildHeaders(apiKey);
-    const usage = await fetchUsage(headers, signal);
+    const client = createClient(apiKey);
+    const usage = await fetchUsage(client, signal);
     const availableCount = usage.rate_limit_reset_credits?.available_count ?? 0;
     const suffix = availableCount > 0 ? `(${formatAvailableResets(availableCount)})` : undefined;
 

package/src/features/credits/providers/openrouter.ts

@@ -1,4 +1,5 @@
 import { toNumber } from "../../../utils/format";
+import { http, withAuth } from "../../../utils/http";
 
 import type { Credits, CreditsProvider } from "../types";
 
@@ -17,15 +18,7 @@ export const openrouterProvider: CreditsProvider = {
   label: "OpenRouter",
 
   async fetch(apiKey, signal): Promise<Credits> {
-    const headers: Record<string, string> = {
-      Accept: "application/json",
-      Authorization: `Bearer ${apiKey}`,
-    };
-
-    const response = await fetch(URL, { headers, signal });
-    if (!response.ok) throw new Error("request failed");
-
-    const payload = (await response.json()) as OpenRouterCreditsResponse;
+    const payload = await withAuth(http, apiKey).get(URL, { signal }).json<OpenRouterCreditsResponse>();
     const totalCredits = toNumber(payload.data?.total_credits);
     const totalUsage = toNumber(payload.data?.total_usage);
     const remaining = typeof totalCredits === "number" && typeof totalUsage === "number" ? totalCredits - totalUsage : undefined;

package/src/features/credits/providers/vercel-ai-gateway.ts

@@ -1,4 +1,5 @@
 import { toNumber } from "../../../utils/format";
+import { http, withAuth } from "../../../utils/http";
 
 import type { Credits, CreditsProvider } from "../types";
 
@@ -14,15 +15,7 @@ export const vercelAiGatewayProvider: CreditsProvider = {
   label: "Vercel",
 
   async fetch(apiKey, signal): Promise<Credits> {
-    const headers: Record<string, string> = {
-      Accept: "application/json",
-      Authorization: `Bearer ${apiKey}`,
-    };
-
-    const response = await fetch(URL, { headers, signal });
-    if (!response.ok) throw new Error("request failed");
-
-    const payload = (await response.json()) as VercelCreditsResponse;
+    const payload = await withAuth(http, apiKey).get(URL, { signal }).json<VercelCreditsResponse>();
     const remaining = toNumber(payload.balance);
 
     return { type: "balance", remaining };