ccstatusline-usage 2.3.17 → 2.4.0

package/README.md

@@ -36,6 +36,42 @@ This fork adds API-based usage widgets beyond the upstream:
 - **Context Window Display** - Visual bar showing context usage
 - **Off Peak** - Shows peak/off-peak status with countdown timer (peak hours drain sessions faster)
 - **Two-line Layout** - Session info on line 1, context on line 2
+- **Multi-provider routing** - Usage widgets dispatch per model: Anthropic models hit the usage API; opencode/local models (GLM, Kimi, MiniMax, Qwen, Ollama) skip the fetch and gracefully hide usage bars while keeping the real-time context bar.
+
+### Multi-Provider Routing (Opencode / Local Models)
+
+Claude Code can route individual prompts to non-Anthropic backends via opencode or a local Ollama runtime. The status line reads the `model.id` that Claude Code sends on stdin each render and dispatches through a per-provider resolver (`src/utils/usage/resolver.ts`):
+
+- **Anthropic** (`opus`, `sonnet`, `haiku` in the id) — fetches Session/Weekly/Reset from the usage API.
+- **Opencode** (`glm`, `kimi`, `minimax`, `mm-`, `qwen`, `owen`, `mimo`) — no usage API call; Session/Weekly/Reset widgets hide themselves. Context Bar still renders when `context_window` is in the payload.
+- **Unknown model id** — same behavior as opencode (hides usage widgets).
+
+This means opencode-routed turns don't trigger pointless Anthropic API calls or rate-limiting during heavy local usage.
+
+Example — configure Claude Code to route a model through opencode (edit `~/.claude/settings.json`):
+
+```jsonc
+{
+  "statusLine": {
+    "type": "command",
+    "command": "npx -y ccstatusline-usage@latest",
+    "padding": 0
+  },
+  "model": "glm-5.1"   // or "kimi-k2.6", "minimax-m2.7", "qwen-3.6-plus", "qwen3.6:35b-a3b-q4_K_M" for local Ollama
+}
+```
+
+What the status line renders per model:
+
+```
+# Anthropic (opus / sonnet / haiku)
+Session: [████░░░░░░░░░░░] 27.0% | Weekly: [████░░░░░░░░░░░] 34.0% | 2:03 hr | Model: Opus 4.7
+  Context: [██████░░░░░░░░░] 389k/1M (39%) | Pace: [░░░░░░█|░░░░░░░] D4/7 -8% | Off-peak (4:03 hr)
+
+# Opencode / local (glm-5.1, kimi, qwen, …)
+Model: glm-5.1 | Off-peak (4:03 hr)
+  Context: [██░░░░░░░░░░░░░] 50k/200k (25%)
+```
 
 ### Enhanced Status Line Preview
 
@@ -67,6 +103,13 @@ Session: [████░░░░░░░░░░░] 27.0% | Weekly: [██
 
 ## 🆕 Recent Updates
 
+### [v2.4.0](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.4.0) - Multi-provider router for usage widgets
+
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Provider pattern end-to-end** — Usage widgets now dispatch through `resolveProvider(modelId)` in `src/utils/usage/resolver.ts`. Anthropic models (`opus`/`sonnet`/`haiku`) fetch from the usage API; opencode/local models (`glm`, `kimi`, `minimax`, `mm-`, `qwen`, `owen`, `mimo`) skip the fetch entirely so heavy local-model sessions no longer trigger needless Anthropic API calls or rate-limiting.
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): The prefetch layer (`usage-prefetch.ts`) now reads `data.model.id` from the payload and dispatches via `provider.fetchUsage()` instead of the hardcoded Anthropic path. `opencodeProvider` / `nullProvider` return empty `UsageData`, so Session/Weekly/Reset widgets hide themselves naturally.
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Context Bar stays backend-agnostic** — renders whenever `context_window` is present in the payload, regardless of which provider handled the turn.
+- See the new [Multi-Provider Routing](#multi-provider-routing-opencode--local-models) section under Fork Enhancements for example config.
+
 ### [v2.3.17](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.3.17) - Local model fallback for API usage widgets
 
 - [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Local model fallback** — When the active model is not Opus/Sonnet/Haiku (e.g. a local Ollama model like `qwen3-coder:30b`), the Session, Weekly, and Context widgets now render empty-bar placeholders (`[░░░░░░░░░░░░░░░] -.0%`) and the Reset Timer shows `-:00 hr` instead of misleading Claude API values.

package/dist/ccstatusline.js

@@ -52556,7 +52556,7 @@ class OutputStyleWidget {
 }
 
 // src/utils/git.ts
-import { execSync } from "child_process";
+import { execFileSync } from "child_process";
 function resolveGitCwd(context) {
   const candidates = [
     context.data?.cwd,
@@ -52571,13 +52571,18 @@ function resolveGitCwd(context) {
   return;
 }
 function runGit(command, context) {
+  const args = command.trim().split(/\s+/).filter(Boolean);
+  return runGitArgs(args, context, command);
+}
+function runGitArgs(args, context, cacheCommand) {
   const cwd2 = resolveGitCwd(context);
-  const cacheKey = `${command}|${cwd2 ?? ""}`;
+  const cacheToken = cacheCommand ?? args.join("\x00");
+  const cacheKey = `${cacheToken}|${cwd2 ?? ""}`;
   if (gitCommandCache.has(cacheKey)) {
     return gitCommandCache.get(cacheKey) ?? null;
   }
   try {
-    const output = execSync(`git ${command}`, {
+    const output = execFileSync("git", args, {
       encoding: "utf8",
       stdio: ["pipe", "pipe", "ignore"],
       ...cwd2 ? { cwd: cwd2 } : {}
@@ -53136,7 +53141,7 @@ var init_GitRootDir = __esm(() => {
 });
 
 // src/utils/gh-pr-cache.ts
-import { execFileSync } from "child_process";
+import { execFileSync as execFileSync2 } from "child_process";
 import {
   existsSync as existsSync2,
   mkdirSync,
@@ -53278,7 +53283,7 @@ function truncateTitle(title, maxWidth) {
 var PR_CACHE_TTL = 30000, GH_TIMEOUT = 5000, DEFAULT_TITLE_MAX_WIDTH = 30, DEFAULT_PR_CACHE_DEPS;
 var init_gh_pr_cache = __esm(() => {
   DEFAULT_PR_CACHE_DEPS = {
-    execFileSync,
+    execFileSync: execFileSync2,
     existsSync: existsSync2,
     mkdirSync,
     readFileSync: readFileSync2,
@@ -53956,7 +53961,7 @@ function parseRemoteUrl(url2) {
   }
 }
 function getRemoteInfo(remoteName, context) {
-  const url2 = runGit(`remote get-url ${remoteName}`, context);
+  const url2 = runGitArgs(["remote", "get-url", "--", remoteName], context, `remote get-url -- ${remoteName}`);
   if (!url2) {
     return null;
   }
@@ -55301,6 +55306,15 @@ function getContextConfig(modelIdentifier, contextWindowSize) {
   if (!modelIdentifier) {
     return defaultConfig;
   }
+  const normalizedModel = modelIdentifier.toLowerCase().trim();
+  for (const [modelName, contextSize] of Object.entries(OPENCODE_MODEL_CONTEXT_MAP)) {
+    if (normalizedModel.includes(modelName)) {
+      return {
+        maxTokens: contextSize,
+        usableTokens: Math.floor(contextSize * USABLE_CONTEXT_RATIO)
+      };
+    }
+  }
   const inferredWindowSize = parseContextWindowSize(modelIdentifier);
   if (inferredWindowSize !== null) {
     return {
@@ -55310,7 +55324,24 @@ function getContextConfig(modelIdentifier, contextWindowSize) {
   }
   return defaultConfig;
 }
-var DEFAULT_CONTEXT_WINDOW_SIZE = 200000, USABLE_CONTEXT_RATIO = 0.8;
+var DEFAULT_CONTEXT_WINDOW_SIZE = 200000, USABLE_CONTEXT_RATIO = 0.8, OPENCODE_MODEL_CONTEXT_MAP;
+var init_model_context = __esm(() => {
+  OPENCODE_MODEL_CONTEXT_MAP = {
+    "glm-5.1": 1e6,
+    "glm-4.5": 1e6,
+    "glm-4.0": 1e6,
+    "mm-2.7": 1e6,
+    "mm-2.5": 1e6,
+    "kimi-k2.6": 1e6,
+    "kimi-k2.5": 1e6,
+    "owen-3.6": 1e6,
+    "owen-3.5": 1e6,
+    "qwen-2.5": 1e6,
+    "qwen-2.0": 1e6,
+    "qwen-1.5": 1e6,
+    "qwen-1.0": 1e6
+  };
+});
 
 // src/utils/context-percentage.ts
 function calculateContextPercentage(context) {
@@ -55325,10 +55356,12 @@ function calculateContextPercentage(context) {
   const contextConfig = getContextConfig(modelIdentifier, contextWindowMetrics.windowSize);
   return Math.min(100, context.tokenMetrics.contextLength / contextConfig.maxTokens * 100);
 }
-var init_context_percentage = () => {};
+var init_context_percentage = __esm(() => {
+  init_model_context();
+});
 
 // src/utils/terminal.ts
-import { execSync as execSync2 } from "child_process";
+import { execSync } from "child_process";
 import * as fs2 from "fs";
 import * as path2 from "path";
 function getPackageVersion() {
@@ -55352,7 +55385,7 @@ function getPackageVersion() {
 function probeTerminalWidth() {
   if (process.env.TMUX) {
     try {
-      const output = execSync2("tmux display-message -p '#{pane_width}'", { encoding: "utf8", stdio: ["pipe", "pipe", "ignore"], timeout: 2000 }).trim();
+      const output = execSync("tmux display-message -p '#{pane_width}'", { encoding: "utf8", stdio: ["pipe", "pipe", "ignore"], timeout: 2000 }).trim();
       const parsed = parseInt(output, 10);
       if (!isNaN(parsed) && parsed > 0)
         return parsed;
@@ -55378,7 +55411,7 @@ function probeTerminalWidth() {
     }
   }
   try {
-    const width = execSync2("tput cols 2>/dev/null", {
+    const width = execSync("tput cols 2>/dev/null", {
       encoding: "utf8",
       stdio: ["pipe", "pipe", "ignore"]
     }).trim();
@@ -55395,7 +55428,7 @@ function parsePositiveInteger(value) {
 }
 function getParentProcessId(pid) {
   try {
-    const parentPidOutput = execSync2(`ps -o ppid= -p ${pid}`, {
+    const parentPidOutput = execSync(`ps -o ppid= -p ${pid}`, {
       encoding: "utf8",
       stdio: ["pipe", "pipe", "ignore"],
       shell: "/bin/sh"
@@ -55407,7 +55440,7 @@ function getParentProcessId(pid) {
 }
 function getTTYForProcess(pid) {
   try {
-    const tty2 = execSync2(`ps -o tty= -p ${pid}`, {
+    const tty2 = execSync(`ps -o tty= -p ${pid}`, {
       encoding: "utf8",
       stdio: ["pipe", "pipe", "ignore"],
       shell: "/bin/sh"
@@ -55422,7 +55455,7 @@ function getTTYForProcess(pid) {
 }
 function getWidthForTTY(tty2) {
   try {
-    const width = execSync2(`stty size < /dev/${tty2} | awk '{print $2}'`, {
+    const width = execSync(`stty size < /dev/${tty2} | awk '{print $2}'`, {
       encoding: "utf8",
       stdio: ["pipe", "pipe", "ignore"],
       shell: "/bin/sh"
@@ -55438,7 +55471,7 @@ function getTerminalWidth() {
 function canDetectTerminalWidth() {
   return probeTerminalWidth() !== null;
 }
-var __dirname = "/Users/peter/Documents/Code/ccstatusline-usage/src/utils", PACKAGE_VERSION = "2.3.17";
+var __dirname = "/Users/peter/Documents/Code/ccstatusline-usage/src/utils", PACKAGE_VERSION = "2.4.0";
 var init_terminal = () => {};
 
 // src/utils/renderer.ts
@@ -56311,6 +56344,7 @@ class ContextPercentageWidget {
   }
 }
 var init_ContextPercentage = __esm(() => {
+  init_model_context();
   init_context_inverse();
 });
 
@@ -56371,6 +56405,7 @@ class ContextPercentageUsableWidget {
   }
 }
 var init_ContextPercentageUsable = __esm(() => {
+  init_model_context();
   init_context_inverse();
 });
 
@@ -57026,7 +57061,7 @@ var init_CustomSymbol = __esm(async () => {
 });
 
 // src/widgets/CustomCommand.tsx
-import { execSync as execSync3 } from "child_process";
+import { execSync as execSync2 } from "child_process";
 
 class CustomCommandWidget {
   getDefaultColor() {
@@ -57073,7 +57108,7 @@ class CustomCommandWidget {
       try {
         const timeout = item.timeout ?? 1000;
         const jsonInput = JSON.stringify(context.data);
-        let output = execSync3(item.commandPath, {
+        let output = execSync2(item.commandPath, {
           encoding: "utf8",
           input: jsonInput,
           timeout,
@@ -58237,7 +58272,7 @@ var init_usage_types = __esm(() => {
 });
 
 // src/utils/usage-fetch.ts
-import { execFileSync as execFileSync2 } from "child_process";
+import { execFileSync as execFileSync3 } from "child_process";
 import * as fs3 from "fs";
 import * as https from "https";
 import * as os4 from "os";
@@ -58383,7 +58418,7 @@ function parseMacKeychainCredentialCandidates(rawDump, servicePrefix = MACOS_USA
 }
 function readMacKeychainSecret(service) {
   try {
-    return execFileSync2("security", ["find-generic-password", "-s", service, "-w"], { encoding: "utf8", stdio: ["pipe", "pipe", "ignore"] }).trim();
+    return execFileSync3("security", ["find-generic-password", "-s", service, "-w"], { encoding: "utf8", stdio: ["pipe", "pipe", "ignore"] }).trim();
   } catch {
     return null;
   }
@@ -58394,7 +58429,7 @@ function readUsageTokenFromMacKeychainService(service) {
 }
 function listMacKeychainCredentialCandidates() {
   try {
-    const rawDump = execFileSync2("security", ["dump-keychain"], {
+    const rawDump = execFileSync3("security", ["dump-keychain"], {
       encoding: "utf8",
       maxBuffer: MACOS_SECURITY_DUMP_MAX_BUFFER,
       stdio: ["pipe", "pipe", "ignore"]
@@ -58640,7 +58675,8 @@ var init_usage_fetch = __esm(() => {
     extraUsageLimit: exports_external.number().nullable().optional(),
     extraUsageUsed: exports_external.number().nullable().optional(),
     extraUsageUtilization: exports_external.number().nullable().optional(),
-    error: exports_external.string().nullable().optional()
+    error: exports_external.string().nullable().optional(),
+    provider: exports_external.enum(["anthropic", "opencode"]).nullable().optional()
   });
   UsageApiResponseSchema = exports_external.object({
     five_hour: exports_external.object({
@@ -62796,7 +62832,7 @@ var init_TotalSpeed = __esm(async () => {
 });
 
 // src/widgets/FreeMemory.ts
-import { execSync as execSync4 } from "child_process";
+import { execSync as execSync3 } from "child_process";
 import os7 from "os";
 function formatBytes(bytes) {
   const GB = 1024 ** 3;
@@ -62812,7 +62848,7 @@ function formatBytes(bytes) {
 }
 function getUsedMemoryMacOS() {
   try {
-    const output = execSync4("vm_stat", { encoding: "utf8" });
+    const output = execSync3("vm_stat", { encoding: "utf8" });
     const lines = output.split(`
 `);
     const firstLine = lines[0];
@@ -62934,6 +62970,61 @@ class SessionNameWidget {
 }
 var init_SessionName = () => {};
 
+// src/utils/usage/providers/anthropic.ts
+var anthropicProvider;
+var init_anthropic = __esm(() => {
+  init_usage_fetch();
+  anthropicProvider = {
+    name: "anthropic",
+    async fetchUsage() {
+      const data = await fetchUsageData();
+      return { ...data, provider: "anthropic" };
+    }
+  };
+});
+
+// src/utils/usage/providers/null.ts
+var nullProvider;
+var init_null = __esm(() => {
+  nullProvider = {
+    name: "null",
+    fetchUsage() {
+      return Promise.resolve({ provider: null });
+    }
+  };
+});
+
+// src/utils/usage/providers/opencode.ts
+var opencodeProvider;
+var init_opencode = __esm(() => {
+  opencodeProvider = {
+    name: "opencode",
+    fetchUsage() {
+      return Promise.resolve({ provider: "opencode" });
+    }
+  };
+});
+
+// src/utils/usage/resolver.ts
+function resolveProvider(modelId) {
+  if (!modelId)
+    return nullProvider;
+  const id = modelId.toLowerCase();
+  if (ANTHROPIC_KEYWORDS.some((k) => id.includes(k)))
+    return anthropicProvider;
+  if (OPENCODE_PATTERN.test(id))
+    return opencodeProvider;
+  return nullProvider;
+}
+var OPENCODE_PATTERN, ANTHROPIC_KEYWORDS;
+var init_resolver = __esm(() => {
+  init_anthropic();
+  init_null();
+  init_opencode();
+  OPENCODE_PATTERN = /(?:^|[^a-z])(glm|kimi|minimax|mm-|qwen|owen|mimo)/i;
+  ANTHROPIC_KEYWORDS = ["opus", "sonnet", "haiku"];
+});
+
 // src/widgets/ApiUsage.tsx
 function getDisplaySize(context) {
   const w = context.terminalWidth ?? 0;
@@ -62991,17 +63082,6 @@ function getModelId(context) {
   const model = context.data?.model;
   return (typeof model === "string" ? model : model?.id) ?? "";
 }
-function isLocalModel(context) {
-  const modelId = getModelId(context);
-  if (modelId === "")
-    return false;
-  return !(modelId.includes("opus") || modelId.includes("sonnet") || modelId.includes("haiku"));
-}
-function renderLocalUsageFallback(label, shortLabel, size2) {
-  if (size2 === "mobile")
-    return `${shortLabel}: [░░░░] -.0%`;
-  return `${label}: [░░░░░░░░░░░░░░░] -.0%`;
-}
 
 class SessionUsageWidget {
   getDefaultColor() {
@@ -63028,8 +63108,8 @@ class SessionUsageWidget {
     if (data.sessionUsage === undefined)
       return null;
     const size2 = getDisplaySize(context);
-    if (isLocalModel(context))
-      return renderLocalUsageFallback("Session", "S", size2);
+    if (resolveProvider(getModelId(context)).name === "null")
+      return null;
     const extraUsed = data.extraUsageUsed;
     const extraLimit = data.extraUsageLimit;
     if (size2 !== "mobile" && data.extraUsageEnabled === true && extraUsed !== undefined && extraLimit !== undefined && data.sessionUsage >= 100 && (data.weeklyUsage === undefined || data.weeklyUsage < 100)) {
@@ -63071,8 +63151,8 @@ class WeeklyUsageWidget {
     if (data.weeklyUsage === undefined)
       return null;
     const size2 = getDisplaySize(context);
-    if (isLocalModel(context))
-      return renderLocalUsageFallback("Weekly", "W", size2);
+    if (resolveProvider(getModelId(context)).name === "null")
+      return null;
     const extraUsed = data.extraUsageUsed;
     const extraLimit = data.extraUsageLimit;
     if (data.extraUsageEnabled === true && extraUsed !== undefined && extraLimit !== undefined && data.weeklyUsage >= 100) {
@@ -63111,8 +63191,8 @@ class ResetTimerWidget {
     const data = context.usageData ?? {};
     if (data.error)
       return getUsageErrorMessage(data.error);
-    if (isLocalModel(context))
-      return "-:00 hr";
+    if (resolveProvider(getModelId(context)).name === "null")
+      return null;
     const modelId = getModelId(context);
     const is1mModel = modelId.includes("[1m]");
     const isOpus = modelId.includes("opus");
@@ -63171,8 +63251,6 @@ class ContextBarWidget {
     const cw = context.data?.context_window;
     if (!cw)
       return null;
-    if (isLocalModel(context) && !getModelId(context).includes("qwen"))
-      return renderLocalUsageFallback("Context", "C", getDisplaySize(context));
     const total = Number(cw.context_window_size) || 200000;
     let used = 0;
     if (typeof cw.current_usage === "number") {
@@ -63202,6 +63280,7 @@ class ContextBarWidget {
 var DARK_RED_OPEN2 = "\x1B[38;2;204;0;0m", DARK_RED_CLOSE2 = "\x1B[39m", MOBILE_THRESHOLD = 134, MEDIUM_THRESHOLD2 = 178, MOBILE_BAR_WIDTH = 4, MEDIUM_BAR_WIDTH = 8, DEFAULT_BAR_WIDTH = 15;
 var init_ApiUsage = __esm(() => {
   init_usage();
+  init_resolver();
 });
 
 // src/widgets/WeeklyResetTimer.ts
@@ -63775,11 +63854,11 @@ var init_ThinkingEffort = __esm(() => {
 });
 
 // src/widgets/Battery.ts
-import { execSync as execSync5 } from "child_process";
+import { execSync as execSync4 } from "child_process";
 import { readFileSync as readFileSync11 } from "fs";
 function getMacBatteryInfo() {
   try {
-    const output = execSync5("pmset -g batt", { encoding: "utf-8", timeout: 2000 });
+    const output = execSync4("pmset -g batt", { encoding: "utf-8", timeout: 2000 });
     const match = /(\d+)%;\s*(charging|discharging|charged|finishing charge|AC attached)/i.exec(output);
     const percentStr = match?.[1];
     const stateStr = match?.[2];
@@ -64904,7 +64983,7 @@ var init_config = __esm(() => {
 });
 
 // src/utils/claude-settings.ts
-import { execSync as execSync6 } from "child_process";
+import { execSync as execSync5 } from "child_process";
 import * as fs11 from "fs";
 import * as os9 from "os";
 import * as path9 from "path";
@@ -65013,7 +65092,7 @@ async function isInstalled() {
 function isBunxAvailable() {
   try {
     const command = process.platform === "win32" ? "where bunx" : "which bunx";
-    execSync6(command, { stdio: "ignore" });
+    execSync5(command, { stdio: "ignore" });
     return true;
   } catch {
     return false;
@@ -65021,7 +65100,7 @@ function isBunxAvailable() {
 }
 function getClaudeCodeVersion() {
   try {
-    const output = execSync6("claude --version", { encoding: "utf-8", stdio: ["pipe", "pipe", "ignore"], timeout: 5000 }).trim();
+    const output = execSync5("claude --version", { encoding: "utf-8", stdio: ["pipe", "pipe", "ignore"], timeout: 5000 }).trim();
     const match = /^(\d+\.\d+\.\d+)/.exec(output);
     return match?.[1] ?? null;
   } catch {
@@ -65832,7 +65911,7 @@ function openExternalUrl(url2) {
 }
 
 // src/utils/powerline.ts
-import { execSync as execSync7 } from "child_process";
+import { execSync as execSync6 } from "child_process";
 import * as fs12 from "fs";
 import * as os11 from "os";
 import * as path10 from "path";
@@ -65966,7 +66045,7 @@ async function installPowerlineFonts() {
       if (fs12.existsSync(tempDir)) {
         fs12.rmSync(tempDir, { recursive: true, force: true });
       }
-      execSync7(`git clone --depth=1 https://github.com/powerline/fonts.git "${tempDir}"`, {
+      execSync6(`git clone --depth=1 https://github.com/powerline/fonts.git "${tempDir}"`, {
         stdio: "pipe",
         encoding: "utf8"
       });
@@ -65974,14 +66053,14 @@ async function installPowerlineFonts() {
         const installScript = path10.join(tempDir, "install.sh");
         if (fs12.existsSync(installScript)) {
           fs12.chmodSync(installScript, 493);
-          execSync7(`cd "${tempDir}" && ./install.sh`, {
+          execSync6(`cd "${tempDir}" && ./install.sh`, {
             stdio: "pipe",
             encoding: "utf8",
             shell: "/bin/bash"
           });
           if (platform4 === "linux") {
             try {
-              execSync7("fc-cache -f -v", {
+              execSync6("fc-cache -f -v", {
                 stdio: "pipe",
                 encoding: "utf8"
               });
@@ -71250,56 +71329,7 @@ var StatusJSONSchema = exports_external.looseObject({
 // src/ccstatusline.ts
 init_ansi();
 init_colors();
-init_config();
-init_jsonl();
-await init_renderer2();
 
-// src/utils/skills.ts
-import * as fs13 from "fs";
-import * as os13 from "os";
-import * as path11 from "path";
-var EMPTY = { totalInvocations: 0, uniqueSkills: [], lastSkill: null };
-function getSkillsDir() {
-  return path11.join(os13.homedir(), ".cache", "ccstatusline", "skills");
-}
-function getSkillsFilePath(sessionId) {
-  return path11.join(getSkillsDir(), `skills-${sessionId}.jsonl`);
-}
-function getSkillsMetrics(sessionId) {
-  const filePath = getSkillsFilePath(sessionId);
-  if (!fs13.existsSync(filePath)) {
-    return EMPTY;
-  }
-  try {
-    const invocations = fs13.readFileSync(filePath, "utf-8").trim().split(`
-`).filter((line) => line.trim()).map((line) => {
-      try {
-        return JSON.parse(line);
-      } catch {
-        return null;
-      }
-    }).filter((e) => e !== null && typeof e.skill === "string" && typeof e.session_id === "string");
-    if (invocations.length === 0) {
-      return EMPTY;
-    }
-    const uniqueSkills = [];
-    const seenSkills = new Set;
-    for (let i = invocations.length - 1;i >= 0; i--) {
-      const skill = invocations[i]?.skill;
-      if (skill && !seenSkills.has(skill)) {
-        seenSkills.add(skill);
-        uniqueSkills.push(skill);
-      }
-    }
-    return {
-      totalInvocations: invocations.length,
-      uniqueSkills,
-      lastSkill: invocations[invocations.length - 1]?.skill ?? null
-    };
-  } catch {
-    return EMPTY;
-  }
-}
 // src/utils/compact-renderer.ts
 init_source();
 init_ColorLevel();
@@ -71361,11 +71391,63 @@ function renderCompactOutput(preRenderedLines, settings, maxWidth) {
   }
 }
 
+// src/ccstatusline.ts
+init_config();
+init_jsonl();
+await init_renderer2();
+
+// src/utils/skills.ts
+import * as fs13 from "fs";
+import * as os13 from "os";
+import * as path11 from "path";
+var EMPTY = { totalInvocations: 0, uniqueSkills: [], lastSkill: null };
+function getSkillsDir() {
+  return path11.join(os13.homedir(), ".cache", "ccstatusline", "skills");
+}
+function getSkillsFilePath(sessionId) {
+  return path11.join(getSkillsDir(), `skills-${sessionId}.jsonl`);
+}
+function getSkillsMetrics(sessionId) {
+  const filePath = getSkillsFilePath(sessionId);
+  if (!fs13.existsSync(filePath)) {
+    return EMPTY;
+  }
+  try {
+    const invocations = fs13.readFileSync(filePath, "utf-8").trim().split(`
+`).filter((line) => line.trim()).map((line) => {
+      try {
+        return JSON.parse(line);
+      } catch {
+        return null;
+      }
+    }).filter((e) => e !== null && typeof e.skill === "string" && typeof e.session_id === "string");
+    if (invocations.length === 0) {
+      return EMPTY;
+    }
+    const uniqueSkills = [];
+    const seenSkills = new Set;
+    for (let i = invocations.length - 1;i >= 0; i--) {
+      const skill = invocations[i]?.skill;
+      if (skill && !seenSkills.has(skill)) {
+        seenSkills.add(skill);
+        uniqueSkills.push(skill);
+      }
+    }
+    return {
+      totalInvocations: invocations.length,
+      uniqueSkills,
+      lastSkill: invocations[invocations.length - 1]?.skill ?? null
+    };
+  } catch {
+    return EMPTY;
+  }
+}
+
 // src/ccstatusline.ts
 init_terminal();
 
 // src/utils/usage-prefetch.ts
-init_usage();
+init_resolver();
 var USAGE_WIDGET_TYPES = new Set([
   "session-usage",
   "weekly-usage",
@@ -71406,17 +71488,20 @@ async function prefetchUsageDataIfNeeded(lines, data) {
   if (!hasUsageDependentWidgets(lines)) {
     return null;
   }
+  const model = data?.model;
+  const modelId = (typeof model === "string" ? model : model?.id) ?? "";
+  const provider = resolveProvider(modelId);
   const rateLimitsData = extractUsageDataFromRateLimits(data?.rate_limits);
   if (hasCompleteRateLimitsUsageData(rateLimitsData)) {
     if (hasExtraUsageDependentWidgets(lines)) {
-      const apiData = await fetchUsageData();
+      const apiData = await provider.fetchUsage();
       if (apiData.error === undefined) {
         return { ...rateLimitsData, extraUsageEnabled: apiData.extraUsageEnabled, extraUsageLimit: apiData.extraUsageLimit, extraUsageUsed: apiData.extraUsageUsed, extraUsageUtilization: apiData.extraUsageUtilization };
       }
     }
     return rateLimitsData;
   }
-  return fetchUsageData();
+  return provider.fetchUsage();
 }
 
 // src/ccstatusline.ts
@@ -71460,8 +71545,8 @@ async function ensureWindowsUtf8CodePage() {
     return;
   }
   try {
-    const { execFileSync: execFileSync3 } = await import("child_process");
-    execFileSync3("chcp.com", ["65001"], { stdio: "ignore" });
+    const { execFileSync: execFileSync4 } = await import("child_process");
+    execFileSync4("chcp.com", ["65001"], { stdio: "ignore" });
   } catch {}
 }
 async function renderMultipleLines(data) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccstatusline-usage",
-  "version": "2.3.17",
+  "version": "2.4.0",
   "description": "A customizable status line formatter for Claude Code CLI",
   "module": "src/ccstatusline.ts",
   "type": "module",
@@ -30,8 +30,8 @@
     "chalk": "^5.5.0",
     "eslint": "^10.0.0",
     "eslint-import-resolver-typescript": "^4.4.4",
-    "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-import-newlines": "^2.0.0",
+    "eslint-plugin-import-x": "^4.16.2",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^7.0.1",
     "globals": "^17.3.0",