ccstatusline-usage 2.0.41 → 2.0.44

package/README.md

@@ -29,6 +29,7 @@
 This fork adds API-based usage widgets beyond the upstream:
 
 - **Session/Weekly Usage** - Real utilization from Anthropic API with progress bars
+- **Extra Usage** - When weekly limit is reached, shows extra usage spending (e.g. `Extra: €41.24/€47.00`)
 - **Reset Timer** - Time until 5-hour session window resets
 - **Context Window Display** - Visual bar showing context usage
 - **Two-line Layout** - Session info on line 1, context on line 2
@@ -36,7 +37,7 @@ This fork adds API-based usage widgets beyond the upstream:
 ### Enhanced Status Line Preview
 
 ```
-Session: [████░░░░░░░░░░░] 27.0% | Weekly: [████████████░░░] 86.0% | 1:56 hr | Model: Opus 4.5 | Session ID: 714aa815-8a...
+Session: [████░░░░░░░░░░░] 27.0% | Weekly: [████████████░░░] 86.0% | 1:56 hr | Extra: $41.24/$47.00 | Model: Opus 4.6 | Session ID: 714aa815-8a...
   Context: [███████░░░░░░░░] 103k/200k (51%)
 ```
 
@@ -64,6 +65,17 @@ These widgets are enabled by default. Just install and run!
 
 ## 🆕 Recent Updates
 
+### [v2.0.43](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.0.43) - Extra usage spending display
+
+- Show extra usage spending in Reset Timer widget when weekly limit is reached (e.g. `Extra: €41.24/€47.00`)
+- Auto-detect currency from timezone (Europe/* = €, else $)
+- Updated README release notes
+
+### [v2.0.42](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.0.42) - Fix reset timer API field
+
+- Fixed API field name from `reset_at` to `resets_at` — reset timer now displays correctly
+- Merged latest changes from upstream ccstatusline
+
 ### v2.0.16 - Add fish style path abbreviation toggle to Current Working Directory widget
 
 ### v2.0.15 - Block Timer calculation fixes
@@ -369,10 +381,10 @@ Once configured, ccstatusline automatically formats your Claude Code status line
 
 ### 📊 Available Widgets
 
-#### API Usage Widgets (Fork Enhancement)
+#### API Usage Widgets ([pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage))
 - **Session Usage** - 5-hour session utilization with progress bar (e.g., "Session: [████░░░░░░░░░░░] 29.0%")
 - **Weekly Usage** - 7-day utilization with progress bar (e.g., "Weekly: [█░░░░░░░░░░░░░░] 7.0%")
-- **Reset Timer** - Time until 5-hour session window resets (e.g., "2:59 hr")
+- **Reset Timer / Extra Usage** - Time until 5-hour session window resets (e.g., "2:59 hr"), or extra usage spending when weekly limit is reached (e.g., "Extra: €41.24/€47.00")
 - **Context Bar** - Visual context window usage with bar (e.g., "Context: [███████░░░░░░░░] 103k/200k (51%)")
 
 #### Standard Widgets

package/dist/ccstatusline.js

@@ -51450,7 +51450,7 @@ import { execSync as execSync3 } from "child_process";
 import * as fs5 from "fs";
 import * as path4 from "path";
 var __dirname = "/Users/peter/Documents/Code/ccstatusline-usage/src/utils";
-var PACKAGE_VERSION = "2.0.41";
+var PACKAGE_VERSION = "2.0.44";
 function getPackageVersion() {
   if (/^\d+\.\d+\.\d+/.test(PACKAGE_VERSION)) {
     return PACKAGE_VERSION;
@@ -52296,8 +52296,11 @@ class ModelWidget {
   render(item, context, settings) {
     if (context.isPreview) {
       return item.rawValue ? "Claude" : "Model: Claude";
-    } else if (context.data?.model?.display_name) {
-      return item.rawValue ? context.data.model.display_name : `Model: ${context.data.model.display_name}`;
+    }
+    const model = context.data?.model;
+    const modelDisplayName = typeof model === "string" ? model : model?.display_name ?? model?.id;
+    if (modelDisplayName) {
+      return item.rawValue ? modelDisplayName : `Model: ${modelDisplayName}`;
     }
     return null;
   }
@@ -52590,7 +52593,8 @@ function calculateContextPercentage(context) {
   if (!context.tokenMetrics) {
     return 0;
   }
-  const modelId = context.data?.model?.id;
+  const model = context.data?.model;
+  const modelId = typeof model === "string" ? model : model?.id;
   const contextConfig = getContextConfig(modelId);
   return Math.min(100, context.tokenMetrics.contextLength / contextConfig.maxTokens * 100);
 }
@@ -53446,7 +53450,8 @@ class ContextPercentageWidget {
       const previewValue = isInverse ? "90.7%" : "9.3%";
       return item.rawValue ? previewValue : `Ctx: ${previewValue}`;
     } else if (context.tokenMetrics) {
-      const modelId = context.data?.model?.id;
+      const model = context.data?.model;
+      const modelId = typeof model === "string" ? model : model?.id;
       const contextConfig = getContextConfig(modelId);
       const usedPercentage = Math.min(100, context.tokenMetrics.contextLength / contextConfig.maxTokens * 100);
       const displayPercentage = isInverse ? 100 - usedPercentage : usedPercentage;
@@ -53519,7 +53524,8 @@ class ContextPercentageUsableWidget {
       const previewValue = isInverse ? "88.4%" : "11.6%";
       return item.rawValue ? previewValue : `Ctx(u): ${previewValue}`;
     } else if (context.tokenMetrics) {
-      const modelId = context.data?.model?.id;
+      const model = context.data?.model;
+      const modelId = typeof model === "string" ? model : model?.id;
       const contextConfig = getContextConfig(modelId);
       const usedPercentage = Math.min(100, context.tokenMetrics.contextLength / contextConfig.usableTokens * 100);
       const displayPercentage = isInverse ? 100 - usedPercentage : usedPercentage;
@@ -54398,7 +54404,10 @@ class ClaudeSessionIdWidget {
   }
 }
 // src/widgets/ApiUsage.tsx
-import { execSync as execSync8, spawnSync } from "child_process";
+import {
+  execSync as execSync8,
+  spawnSync
+} from "child_process";
 import * as fs6 from "fs";
 import * as path5 from "path";
 var CACHE_FILE = path5.join(process.env.HOME ?? "", ".cache", "ccstatusline-api.json");
@@ -54538,11 +54547,17 @@ function fetchApiData() {
     const apiData = {};
     if (data.five_hour) {
       apiData.sessionUsage = data.five_hour.utilization;
-      apiData.sessionResetAt = data.five_hour.reset_at;
+      apiData.sessionResetAt = data.five_hour.resets_at;
     }
     if (data.seven_day) {
       apiData.weeklyUsage = data.seven_day.utilization;
     }
+    if (data.extra_usage) {
+      apiData.extraUsageEnabled = data.extra_usage.is_enabled === true;
+      apiData.extraUsageLimit = data.extra_usage.monthly_limit;
+      apiData.extraUsageUsed = data.extra_usage.used_credits;
+      apiData.extraUsageUtilization = data.extra_usage.utilization;
+    }
     if (apiData.sessionUsage === undefined && apiData.weeklyUsage === undefined) {
       const stale = readStaleCache();
       if (stale && !stale.error)
@@ -54653,7 +54668,7 @@ class ResetTimerWidget {
     return "brightBlue";
   }
   getDescription() {
-    return "Shows time until daily limit reset";
+    return "Shows extra usage spending or time until limit reset";
   }
   getDisplayName() {
     return "Reset Timer";
@@ -54667,6 +54682,11 @@ class ResetTimerWidget {
     const data = fetchApiData();
     if (data.error)
       return getErrorMessage(data.error);
+    if (data.extraUsageEnabled && data.extraUsageUsed !== undefined && data.extraUsageLimit !== undefined) {
+      const used = formatCents(data.extraUsageUsed);
+      const limit = formatCents(data.extraUsageLimit);
+      return `Extra: ${used}/${limit}`;
+    }
     if (!data.sessionResetAt)
       return null;
     try {
@@ -54689,6 +54709,18 @@ class ResetTimerWidget {
     return true;
   }
 }
+function getCurrencySymbol() {
+  try {
+    const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
+    if (tz.startsWith("Europe/"))
+      return "€";
+  } catch {}
+  return "$";
+}
+function formatCents(cents) {
+  const symbol2 = getCurrencySymbol();
+  return `${symbol2}${(cents / 100).toFixed(2)}`;
+}
 
 class ContextBarWidget {
   getDefaultColor() {
@@ -56306,6 +56338,7 @@ var LineSelector = ({
 }) => {
   const [selectedIndex, setSelectedIndex] = import_react37.useState(initialSelection);
   const [showDeleteDialog, setShowDeleteDialog] = import_react37.useState(false);
+  const [moveMode, setMoveMode] = import_react37.useState(false);
   const [localLines, setLocalLines] = import_react37.useState(lines);
   import_react37.useEffect(() => {
     setLocalLines(lines);
@@ -56337,6 +56370,32 @@ var LineSelector = ({
       onBack();
       return;
     }
+    if (moveMode) {
+      if (key.upArrow && selectedIndex > 0) {
+        const newLines = [...localLines];
+        const temp = newLines[selectedIndex];
+        const prev = newLines[selectedIndex - 1];
+        if (temp && prev) {
+          [newLines[selectedIndex], newLines[selectedIndex - 1]] = [prev, temp];
+        }
+        setLocalLines(newLines);
+        onLinesUpdate(newLines);
+        setSelectedIndex(selectedIndex - 1);
+      } else if (key.downArrow && selectedIndex < localLines.length - 1) {
+        const newLines = [...localLines];
+        const temp = newLines[selectedIndex];
+        const next = newLines[selectedIndex + 1];
+        if (temp && next) {
+          [newLines[selectedIndex], newLines[selectedIndex + 1]] = [next, temp];
+        }
+        setLocalLines(newLines);
+        onLinesUpdate(newLines);
+        setSelectedIndex(selectedIndex + 1);
+      } else if (key.escape || key.return) {
+        setMoveMode(false);
+      }
+      return;
+    }
     switch (input) {
       case "a":
         if (allowEditing) {
@@ -56348,6 +56407,11 @@ var LineSelector = ({
           setShowDeleteDialog(true);
         }
         return;
+      case "m":
+        if (allowEditing && localLines.length > 1 && selectedIndex < localLines.length) {
+          setMoveMode(true);
+        }
+        return;
     }
     if (key.escape) {
       onBack();
@@ -56470,17 +56534,31 @@ var LineSelector = ({
     children: /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
       flexDirection: "column",
       children: [
-        /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
-          bold: true,
-          children: title ?? "Select Line to Edit"
-        }, undefined, false, undefined, this),
+        /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+          children: [
+            /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+              bold: true,
+              children: [
+                title ?? "Select Line to Edit",
+                " "
+              ]
+            }, undefined, true, undefined, this),
+            moveMode && /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+              color: "blue",
+              children: "[MOVE MODE]"
+            }, undefined, false, undefined, this)
+          ]
+        }, undefined, true, undefined, this),
         /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
           dimColor: true,
           children: "Choose which status line to configure"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+        moveMode ? /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
           dimColor: true,
-          children: allowEditing ? localLines.length > 1 ? "(a) to append new line, (d) to delete line, ESC to go back" : "(a) to append new line, ESC to go back" : "ESC to go back"
+          children: "↑↓ to move line, ESC or Enter to exit move mode"
+        }, undefined, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+          dimColor: true,
+          children: allowEditing ? localLines.length > 1 ? "(a) to append new line, (d) to delete line, (m) to move line, ESC to go back" : "(a) to append new line, ESC to go back" : "ESC to go back"
         }, undefined, false, undefined, this),
         /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
           marginTop: 1,
@@ -56491,10 +56569,10 @@ var LineSelector = ({
               const suffix = line.length ? import_pluralize.default("widget", line.length, true) : "empty";
               return /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
                 children: /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
-                  color: isSelected ? "green" : undefined,
+                  color: isSelected ? moveMode ? "blue" : "green" : undefined,
                   children: [
                     /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
-                      children: isSelected ? "▶  " : "   "
+                      children: isSelected ? moveMode ? "◆  " : "▶  " : "   "
                     }, undefined, false, undefined, this),
                     /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
                       children: [
@@ -56520,7 +56598,7 @@ var LineSelector = ({
                 }, undefined, true, undefined, this)
               }, index, false, undefined, this);
             }),
-            /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+            !moveMode && /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
               marginTop: 1,
               children: /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
                 color: selectedIndex === localLines.length ? "green" : undefined,
@@ -58540,10 +58618,13 @@ var StatusJSONSchema = exports_external.looseObject({
   session_id: exports_external.string().optional(),
   transcript_path: exports_external.string().optional(),
   cwd: exports_external.string().optional(),
-  model: exports_external.object({
-    id: exports_external.string().optional(),
-    display_name: exports_external.string().optional()
-  }).optional(),
+  model: exports_external.union([
+    exports_external.string(),
+    exports_external.object({
+      id: exports_external.string().optional(),
+      display_name: exports_external.string().optional()
+    })
+  ]).optional(),
   workspace: exports_external.object({
     current_dir: exports_external.string().optional(),
     project_dir: exports_external.string().optional()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccstatusline-usage",
-  "version": "2.0.41",
+  "version": "2.0.44",
   "description": "A customizable status line formatter for Claude Code CLI",
   "module": "src/ccstatusline.ts",
   "type": "module",