ccstatusline-usage 2.1.6 → 2.1.7

package/README.md

@@ -46,12 +46,19 @@
 
 ## 🆕 Recent Updates
 
+### [v2.1.7](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.1.7) - Battery widget, extra usage fix & upstream sync
+
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Battery widget** — shows `B: xx%` on macOS and Linux when on battery power (hidden when charging)
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Extra usage conditional display** — Extra spending widget now only appears when the weekly budget is fully used (100%), instead of always when extra usage is enabled
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Upstream sync** — Memory Usage widget (v2.0.29)
+
 ### [v2.1.6](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.1.6) - Upstream sync
 
 - [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Upstream sync** — merged 9 upstream commits: Session Name widget, Git Root Dir widget, CWD home abbreviation, block timer caching, git widget refactor, Windows UTF-8 fix, widget picker UX, TUI editor input fix
 
-### v2.0.26 - v2.0.28 - Performance, git internals, and workflow improvements
+### v2.0.26 - v2.0.29 - Performance, git internals, and workflow improvements
 
+- **🧠 Memory Usage widget (v2.0.29)** - Added a new widget that shows current system memory usage (`Mem: used/total`).
 - **⚡ Block timer cache (v2.0.28)** - Cache block timer metrics to reduce JSONL parsing on every render, with per-config hashed cache files and automatic 5-hour block invalidation.
 - **🧱 Git widget command refactor (v2.0.28)** - Refactored git widgets to use shared git command helpers and expanded coverage for failure and edge-case tests.
 - **🪟 Windows UTF-8 piped output fix (v2.0.28)** - Sets the Windows UTF-8 code page for piped status line rendering.
@@ -385,6 +392,8 @@ Once configured, ccstatusline automatically formats your Claude Code status line
 - **Context Percentage** - Shows percentage of context limit used (dynamic: 1M for Sonnet 4.5 with `[1m]` suffix, 200k otherwise)
 - **Context Percentage (usable)** - Shows percentage of usable context (dynamic: 800k for Sonnet 4.5 with `[1m]` suffix, 160k otherwise, accounting for auto-compact at 80%)
 - **Terminal Width** - Shows detected terminal width (for debugging)
+- **Memory Usage** - Shows system memory usage (used/total, e.g., "Mem: 12.4G/16.0G")
+- **Battery** - Shows battery percentage on macOS and Linux (only visible when on battery power, hidden when charging)
 - **Custom Text** - Add your own custom text to the status line
 - **Custom Command** - Execute shell commands and display their output (refreshes whenever the statusline is updated by Claude Code)
 - **Separator** - Visual divider between widgets (customizable: |, -, comma, space)
@@ -618,6 +627,14 @@ Contributions are welcome! Please feel free to submit a Pull Request.
 
 ---
 
+## Support
+
+If ccstatusline is useful to you, consider buying me a coffee:
+
+<a href="https://www.buymeacoffee.com/sirmalloc" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 60px !important;width: 217px !important;" ></a>
+
+---
+
 ## 📄 License
 
 [MIT](LICENSE) © Matthew Breedlove

package/dist/ccstatusline.js

@@ -50987,6 +50987,8 @@ var SettingsSchema = exports_external.object({
       { id: "weekly-usage", type: "weekly-usage", color: "brightBlue" },
       { id: "sep2", type: "separator" },
       { id: "reset-timer", type: "reset-timer", color: "brightBlue" },
+      { id: "sep-battery", type: "separator" },
+      { id: "battery", type: "battery", color: "yellow" },
       { id: "sep3", type: "separator" },
       { id: "model", type: "model", color: "ansi256:124" },
       { id: "sep4", type: "separator" },
@@ -51450,7 +51452,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.1.6";
+var PACKAGE_VERSION = "2.1.7";
 function getPackageVersion() {
   if (/^\d+\.\d+\.\d+/.test(PACKAGE_VERSION)) {
     return PACKAGE_VERSION;
@@ -55003,7 +55005,7 @@ class ResetTimerWidget {
     const data = fetchApiData();
     if (data.error)
       return getErrorMessage(data.error);
-    if (data.extraUsageEnabled && data.extraUsageUsed !== undefined && data.extraUsageLimit !== undefined) {
+    if (data.extraUsageEnabled && data.weeklyUsage !== undefined && data.weeklyUsage >= 100 && data.extraUsageUsed !== undefined && data.extraUsageLimit !== undefined) {
       const used = formatCents(data.extraUsageUsed);
       const limit = formatCents(data.extraUsageLimit);
       return `Extra: ${used}/${limit}`;
@@ -55143,6 +55145,167 @@ class SessionNameWidget {
     return true;
   }
 }
+// src/widgets/FreeMemory.ts
+import { execSync as execSync7 } from "child_process";
+import os6 from "os";
+function formatBytes(bytes) {
+  const GB = 1024 ** 3;
+  const MB = 1024 ** 2;
+  const KB = 1024;
+  if (bytes >= GB)
+    return `${(bytes / GB).toFixed(1)}G`;
+  if (bytes >= MB)
+    return `${(bytes / MB).toFixed(0)}M`;
+  if (bytes >= KB)
+    return `${(bytes / KB).toFixed(0)}K`;
+  return `${bytes}B`;
+}
+function getUsedMemoryMacOS() {
+  try {
+    const output = execSync7("vm_stat", { encoding: "utf8" });
+    const lines = output.split(`
+`);
+    const firstLine = lines[0];
+    if (!firstLine)
+      return null;
+    const pageSizeMatch = /page size of (\d+) bytes/.exec(firstLine);
+    const pageSizeString = pageSizeMatch?.[1];
+    if (!pageSizeString)
+      return null;
+    const pageSize = parseInt(pageSizeString, 10);
+    let activePages = 0;
+    let wiredPages = 0;
+    for (const line of lines) {
+      const activeMatch = /Pages active:\s+(\d+)/.exec(line);
+      const activeValue = activeMatch?.[1];
+      if (activeValue)
+        activePages = parseInt(activeValue, 10);
+      const wiredMatch = /Pages wired down:\s+(\d+)/.exec(line);
+      const wiredValue = wiredMatch?.[1];
+      if (wiredValue)
+        wiredPages = parseInt(wiredValue, 10);
+    }
+    return (activePages + wiredPages) * pageSize;
+  } catch {
+    return null;
+  }
+}
+
+class FreeMemoryWidget {
+  getDefaultColor() {
+    return "cyan";
+  }
+  getDescription() {
+    return "Shows system memory usage (used/total)";
+  }
+  getDisplayName() {
+    return "Memory Usage";
+  }
+  getCategory() {
+    return "Environment";
+  }
+  getEditorDisplay(item) {
+    return { displayText: this.getDisplayName() };
+  }
+  render(item, context, settings) {
+    if (context.isPreview) {
+      return item.rawValue ? "12.4G/16.0G" : "Mem: 12.4G/16.0G";
+    }
+    const total = os6.totalmem();
+    let used;
+    if (os6.platform() === "darwin") {
+      used = getUsedMemoryMacOS() ?? total - os6.freemem();
+    } else {
+      used = total - os6.freemem();
+    }
+    const value = `${formatBytes(used)}/${formatBytes(total)}`;
+    return item.rawValue ? value : `Mem: ${value}`;
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors(item) {
+    return true;
+  }
+}
+// src/widgets/Battery.ts
+import { execSync as execSync8 } from "child_process";
+import { readFileSync as readFileSync6 } from "fs";
+function getMacBatteryInfo() {
+  try {
+    const output = execSync8("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];
+    if (!percentStr || !stateStr) {
+      return null;
+    }
+    const percent = parseInt(percentStr, 10);
+    const state = stateStr.toLowerCase();
+    const charging = state !== "discharging";
+    return { percent, charging };
+  } catch {
+    return null;
+  }
+}
+function getLinuxBatteryInfo() {
+  try {
+    const capacity = readFileSync6("/sys/class/power_supply/BAT0/capacity", "utf-8").trim();
+    const status = readFileSync6("/sys/class/power_supply/BAT0/status", "utf-8").trim().toLowerCase();
+    const percent = parseInt(capacity, 10);
+    if (isNaN(percent)) {
+      return null;
+    }
+    const charging = status !== "discharging";
+    return { percent, charging };
+  } catch {
+    return null;
+  }
+}
+function getBatteryInfo() {
+  if (process.platform === "darwin") {
+    return getMacBatteryInfo();
+  }
+  if (process.platform === "linux") {
+    return getLinuxBatteryInfo();
+  }
+  return null;
+}
+
+class BatteryWidget {
+  getDefaultColor() {
+    return "yellow";
+  }
+  getDescription() {
+    return "Shows battery percentage (only when on battery, hidden when charging)";
+  }
+  getDisplayName() {
+    return "Battery";
+  }
+  getCategory() {
+    return "Environment";
+  }
+  getEditorDisplay(item) {
+    return { displayText: this.getDisplayName() };
+  }
+  render(item, context, settings) {
+    if (context.isPreview) {
+      return item.rawValue ? "72%" : "B: 72%";
+    }
+    const info = getBatteryInfo();
+    if (!info || info.charging) {
+      return null;
+    }
+    const label = item.rawValue ? "" : "B: ";
+    return `${label}${info.percent}%`;
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors(item) {
+    return true;
+  }
+}
 // src/utils/widgets.ts
 var widgetRegistry = new Map([
   ["model", new ModelWidget],
@@ -55171,7 +55334,9 @@ var widgetRegistry = new Map([
   ["weekly-usage", new WeeklyUsageWidget],
   ["reset-timer", new ResetTimerWidget],
   ["context-bar", new ContextBarWidget],
-  ["session-name", new SessionNameWidget]
+  ["session-name", new SessionNameWidget],
+  ["free-memory", new FreeMemoryWidget],
+  ["battery", new BatteryWidget]
 ]);
 function getWidget(type) {
   return widgetRegistry.get(type) ?? null;
@@ -57531,7 +57696,7 @@ var MainMenu = ({ onSelect, isClaudeInstalled, hasChanges, initialSelection = 0,
 };
 // src/tui/components/PowerlineSetup.tsx
 var import_react41 = __toESM(require_react(), 1);
-import * as os6 from "os";
+import * as os7 from "os";
 
 // src/tui/components/PowerlineSeparatorEditor.tsx
 var import_react39 = __toESM(require_react(), 1);
@@ -58248,7 +58413,7 @@ var PowerlineSetup = ({
                   }, undefined, false, undefined, this)
                 ]
               }, undefined, true, undefined, this),
-              os6.platform() === "darwin" && /* @__PURE__ */ jsx_dev_runtime13.jsxDEV(jsx_dev_runtime13.Fragment, {
+              os7.platform() === "darwin" && /* @__PURE__ */ jsx_dev_runtime13.jsxDEV(jsx_dev_runtime13.Fragment, {
                 children: [
                   /* @__PURE__ */ jsx_dev_runtime13.jsxDEV(Text, {
                     dimColor: true,
@@ -58264,7 +58429,7 @@ var PowerlineSetup = ({
                   }, undefined, false, undefined, this)
                 ]
               }, undefined, true, undefined, this),
-              os6.platform() === "linux" && /* @__PURE__ */ jsx_dev_runtime13.jsxDEV(jsx_dev_runtime13.Fragment, {
+              os7.platform() === "linux" && /* @__PURE__ */ jsx_dev_runtime13.jsxDEV(jsx_dev_runtime13.Fragment, {
                 children: [
                   /* @__PURE__ */ jsx_dev_runtime13.jsxDEV(Text, {
                     dimColor: true,
@@ -58280,7 +58445,7 @@ var PowerlineSetup = ({
                   }, undefined, false, undefined, this)
                 ]
               }, undefined, true, undefined, this),
-              os6.platform() === "win32" && /* @__PURE__ */ jsx_dev_runtime13.jsxDEV(jsx_dev_runtime13.Fragment, {
+              os7.platform() === "win32" && /* @__PURE__ */ jsx_dev_runtime13.jsxDEV(jsx_dev_runtime13.Fragment, {
                 children: [
                   /* @__PURE__ */ jsx_dev_runtime13.jsxDEV(Text, {
                     dimColor: true,
@@ -59537,7 +59702,7 @@ function renderCompactOutput(preRenderedLines, settings, maxWidth) {
 // src/utils/jsonl.ts
 import * as fs9 from "fs";
 import { createHash } from "node:crypto";
-import os7 from "node:os";
+import os8 from "node:os";
 import path8 from "node:path";
 
 // node_modules/tinyglobby/dist/index.mjs
@@ -60327,7 +60492,7 @@ function globSync(patternsOrOptions, options) {
 // src/utils/jsonl.ts
 import { promisify } from "util";
 var readFile4 = promisify(fs9.readFile);
-var readFileSync7 = fs9.readFileSync;
+var readFileSync8 = fs9.readFileSync;
 var statSync5 = fs9.statSync;
 var writeFileSync3 = fs9.writeFileSync;
 var mkdirSync4 = fs9.mkdirSync;
@@ -60338,7 +60503,7 @@ function normalizeConfigDir(configDir) {
 function getBlockCachePath(configDir = getClaudeConfigDir()) {
   const normalizedConfigDir = normalizeConfigDir(configDir);
   const configHash = createHash("sha256").update(normalizedConfigDir).digest("hex").slice(0, 16);
-  return path8.join(os7.homedir(), ".cache", "ccstatusline", `block-cache-${configHash}.json`);
+  return path8.join(os8.homedir(), ".cache", "ccstatusline", `block-cache-${configHash}.json`);
 }
 function readBlockCache(expectedConfigDir) {
   try {
@@ -60347,7 +60512,7 @@ function readBlockCache(expectedConfigDir) {
     if (!existsSync8(cachePath)) {
       return null;
     }
-    const content = readFileSync7(cachePath, "utf-8");
+    const content = readFileSync8(cachePath, "utf-8");
     const cache3 = JSON.parse(content);
     if (typeof cache3.startTime !== "string") {
       return null;
@@ -60605,7 +60770,7 @@ function findMostRecentBlockStartTime(rootDir, sessionDurationHours = 5) {
 function getAllTimestampsFromFile(filePath) {
   const timestamps = [];
   try {
-    const content = readFileSync7(filePath, "utf-8");
+    const content = readFileSync8(filePath, "utf-8");
     const lines = content.trim().split(`
 `).filter((line) => line.length > 0);
     for (const line of lines) {

package/package.json

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