ccstatusline 2.0.27 → 2.0.28

package/README.md

@@ -46,18 +46,18 @@
 
 ## 🆕 Recent Updates
 
-### v2.0.27 - Git Root Dir widget and raw-mode editor guardrails
-
-- **📁 Git Root Dir widget** - Added a new Git widget that shows the repository root directory name.
-
-### v2.0.26 - Session naming, CWD options, and TUI workflow improvements
-
-- **🏷️ Session Name widget** - Added a new widget that shows the current Claude Code session name from `/rename`.
-- **🏠 Current Working Directory home abbreviation** - Added a `~` abbreviation option for CWD display in both preview and live rendering.
-- **🧠 Context model suffix fix** - Context widgets now recognize the `[1m]` suffix across models, not just a single model path.
-- **🧭 Widget picker UX updates** - Improved widget discovery/navigation and added clearer, safer clear-line behavior.
-- **⌨️ TUI editor input fix** - Prevented shortcut/input leakage into widget editor flows.
-- **📄 Repo docs update** - Migrated guidance from `CLAUDE.md` to `AGENTS.md` (with symlink compatibility).
+### v2.0.26 - v2.0.28 - Performance, git internals, and workflow improvements
+
+- **⚡ 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.
+- **📁 Git Root Dir widget (v2.0.27)** - Added a new Git widget that shows the repository root directory name.
+- **🏷️ Session Name widget (v2.0.26)** - Added a new widget that shows the current Claude Code session name from `/rename`.
+- **🏠 Current Working Directory home abbreviation (v2.0.26)** - Added a `~` abbreviation option for CWD display in both preview and live rendering.
+- **🧠 Context model suffix fix (v2.0.26)** - Context widgets now recognize the `[1m]` suffix across models, not just a single model path.
+- **🧭 Widget picker UX updates (v2.0.26)** - Improved widget discovery/navigation and added clearer, safer clear-line behavior.
+- **⌨️ TUI editor input fix (v2.0.26)** - Prevented shortcut/input leakage into widget editor flows.
+- **📄 Repo docs update (v2.0.26)** - Migrated guidance from `CLAUDE.md` to `AGENTS.md` (with symlink compatibility).
 
 ### v2.0.16 - Add fish style path abbreviation toggle to Current Working Directory widget
 

package/dist/ccstatusline.js

@@ -51405,7 +51405,7 @@ import { execSync as execSync3 } from "child_process";
 import * as fs5 from "fs";
 import * as path4 from "path";
 var __dirname = "/Users/sirmalloc/Projects/Personal/ccstatusline/src/utils";
-var PACKAGE_VERSION = "2.0.27";
+var PACKAGE_VERSION = "2.0.28";
 function getPackageVersion() {
   if (/^\d+\.\d+\.\d+/.test(PACKAGE_VERSION)) {
     return PACKAGE_VERSION;
@@ -52313,9 +52313,39 @@ class OutputStyleWidget {
     return true;
   }
 }
-// src/widgets/GitBranch.ts
+// src/utils/git.ts
 import { execSync as execSync4 } from "child_process";
+function resolveGitCwd(context) {
+  const candidates = [
+    context.data?.cwd,
+    context.data?.workspace?.current_dir,
+    context.data?.workspace?.project_dir
+  ];
+  for (const candidate of candidates) {
+    if (typeof candidate === "string" && candidate.trim().length > 0) {
+      return candidate;
+    }
+  }
+  return;
+}
+function runGit(command, context) {
+  try {
+    const cwd2 = resolveGitCwd(context);
+    const output = execSync4(`git ${command}`, {
+      encoding: "utf8",
+      stdio: ["pipe", "pipe", "ignore"],
+      ...cwd2 ? { cwd: cwd2 } : {}
+    }).trim();
+    return output.length > 0 ? output : null;
+  } catch {
+    return null;
+  }
+}
+function isInsideGitWorkTree(context) {
+  return runGit("rev-parse --is-inside-work-tree", context) === "true";
+}
 
+// src/widgets/GitBranch.ts
 class GitBranchWidget {
   getDefaultColor() {
     return "magenta";
@@ -52358,21 +52388,16 @@ class GitBranchWidget {
     if (context.isPreview) {
       return item.rawValue ? "main" : "⎇ main";
     }
-    const branch = this.getGitBranch();
+    if (!isInsideGitWorkTree(context)) {
+      return hideNoGit ? null : "⎇ no git";
+    }
+    const branch = this.getGitBranch(context);
     if (branch)
       return item.rawValue ? branch : `⎇ ${branch}`;
     return hideNoGit ? null : "⎇ no git";
   }
-  getGitBranch() {
-    try {
-      const branch = execSync4("git branch --show-current", {
-        encoding: "utf8",
-        stdio: ["pipe", "pipe", "ignore"]
-      }).trim();
-      return branch || null;
-    } catch {
-      return null;
-    }
+  getGitBranch(context) {
+    return runGit("branch --show-current", context);
   }
   getCustomKeybinds() {
     return [
@@ -52387,8 +52412,6 @@ class GitBranchWidget {
   }
 }
 // src/widgets/GitChanges.ts
-import { execSync as execSync5 } from "child_process";
-
 class GitChangesWidget {
   getDefaultColor() {
     return "yellow";
@@ -52431,40 +52454,33 @@ class GitChangesWidget {
     if (context.isPreview) {
       return "(+42,-10)";
     }
-    const changes = this.getGitChanges();
+    if (!isInsideGitWorkTree(context)) {
+      return hideNoGit ? null : "(no git)";
+    }
+    const changes = this.getGitChanges(context);
     if (changes)
       return `(+${changes.insertions},-${changes.deletions})`;
     else
       return hideNoGit ? null : "(no git)";
   }
-  getGitChanges() {
-    try {
-      let totalInsertions = 0;
-      let totalDeletions = 0;
-      const unstagedStat = execSync5("git diff --shortstat", {
-        encoding: "utf8",
-        stdio: ["pipe", "pipe", "ignore"]
-      }).trim();
-      const stagedStat = execSync5("git diff --cached --shortstat", {
-        encoding: "utf8",
-        stdio: ["pipe", "pipe", "ignore"]
-      }).trim();
-      if (unstagedStat) {
-        const insertMatch = /(\d+) insertion/.exec(unstagedStat);
-        const deleteMatch = /(\d+) deletion/.exec(unstagedStat);
-        totalInsertions += insertMatch?.[1] ? parseInt(insertMatch[1], 10) : 0;
-        totalDeletions += deleteMatch?.[1] ? parseInt(deleteMatch[1], 10) : 0;
-      }
-      if (stagedStat) {
-        const insertMatch = /(\d+) insertion/.exec(stagedStat);
-        const deleteMatch = /(\d+) deletion/.exec(stagedStat);
-        totalInsertions += insertMatch?.[1] ? parseInt(insertMatch[1], 10) : 0;
-        totalDeletions += deleteMatch?.[1] ? parseInt(deleteMatch[1], 10) : 0;
-      }
-      return { insertions: totalInsertions, deletions: totalDeletions };
-    } catch {
-      return null;
-    }
+  getGitChanges(context) {
+    let totalInsertions = 0;
+    let totalDeletions = 0;
+    const unstagedStat = runGit("diff --shortstat", context) ?? "";
+    const stagedStat = runGit("diff --cached --shortstat", context) ?? "";
+    if (unstagedStat) {
+      const insertMatch = /(\d+) insertion/.exec(unstagedStat);
+      const deleteMatch = /(\d+) deletion/.exec(unstagedStat);
+      totalInsertions += insertMatch?.[1] ? parseInt(insertMatch[1], 10) : 0;
+      totalDeletions += deleteMatch?.[1] ? parseInt(deleteMatch[1], 10) : 0;
+    }
+    if (stagedStat) {
+      const insertMatch = /(\d+) insertion/.exec(stagedStat);
+      const deleteMatch = /(\d+) deletion/.exec(stagedStat);
+      totalInsertions += insertMatch?.[1] ? parseInt(insertMatch[1], 10) : 0;
+      totalDeletions += deleteMatch?.[1] ? parseInt(deleteMatch[1], 10) : 0;
+    }
+    return { insertions: totalInsertions, deletions: totalDeletions };
   }
   getCustomKeybinds() {
     return [
@@ -52479,8 +52495,6 @@ class GitChangesWidget {
   }
 }
 // src/widgets/GitRootDir.ts
-import { execSync as execSync6 } from "child_process";
-
 class GitRootDirWidget {
   getDefaultColor() {
     return "cyan";
@@ -52523,22 +52537,17 @@ class GitRootDirWidget {
     if (context.isPreview) {
       return "my-repo";
     }
-    const rootDir = this.getGitRootDir();
+    if (!isInsideGitWorkTree(context)) {
+      return hideNoGit ? null : "no git";
+    }
+    const rootDir = this.getGitRootDir(context);
     if (rootDir) {
       return this.getRootDirName(rootDir);
     }
     return hideNoGit ? null : "no git";
   }
-  getGitRootDir() {
-    try {
-      const rootDir = execSync6("git rev-parse --show-toplevel", {
-        encoding: "utf8",
-        stdio: ["pipe", "pipe", "ignore"]
-      }).trim();
-      return rootDir || null;
-    } catch {
-      return null;
-    }
+  getGitRootDir(context) {
+    return runGit("rev-parse --show-toplevel", context);
   }
   getRootDirName(rootDir) {
     const trimmedRootDir = rootDir.replace(/[\\/]+$/, "");
@@ -52560,8 +52569,6 @@ class GitRootDirWidget {
   }
 }
 // src/widgets/GitWorktree.ts
-import { execSync as execSync7 } from "child_process";
-
 class GitWorktreeWidget {
   getDefaultColor() {
     return "blue";
@@ -52603,24 +52610,29 @@ class GitWorktreeWidget {
     const hideNoGit = item.metadata?.hideNoGit === "true";
     if (context.isPreview)
       return item.rawValue ? "main" : "\uD81A\uDC30 main";
-    const worktree = this.getGitWorktree();
+    if (!isInsideGitWorkTree(context)) {
+      return hideNoGit ? null : "\uD81A\uDC30 no git";
+    }
+    const worktree = this.getGitWorktree(context);
     if (worktree)
       return item.rawValue ? worktree : `\uD81A\uDC30 ${worktree}`;
     return hideNoGit ? null : "\uD81A\uDC30 no git";
   }
-  getGitWorktree() {
-    try {
-      const worktreeDir = execSync7("git rev-parse --git-dir", {
-        encoding: "utf8",
-        stdio: ["pipe", "pipe", "ignore"]
-      }).trim();
-      if (worktreeDir.endsWith("/.git") || worktreeDir === ".git")
-        return "main";
-      const [, worktree] = worktreeDir.split(".git/worktrees/");
-      return worktree ?? null;
-    } catch {
+  getGitWorktree(context) {
+    const worktreeDir = runGit("rev-parse --git-dir", context);
+    if (!worktreeDir) {
       return null;
     }
+    const normalizedGitDir = worktreeDir.replace(/\\/g, "/");
+    if (normalizedGitDir.endsWith("/.git") || normalizedGitDir === ".git")
+      return "main";
+    const marker = ".git/worktrees/";
+    const markerIndex = normalizedGitDir.lastIndexOf(marker);
+    if (markerIndex === -1) {
+      return null;
+    }
+    const worktree = normalizedGitDir.slice(markerIndex + marker.length);
+    return worktree.length > 0 ? worktree : null;
   }
   getCustomKeybinds() {
     return [
@@ -53904,7 +53916,7 @@ var CustomTextEditor = ({ widget, onComplete, onCancel }) => {
   }, undefined, true, undefined, this);
 };
 // src/widgets/CustomCommand.tsx
-import { execSync as execSync8 } from "child_process";
+import { execSync as execSync5 } from "child_process";
 var import_react30 = __toESM(require_react(), 1);
 var jsx_dev_runtime2 = __toESM(require_jsx_dev_runtime(), 1);
 
@@ -53953,7 +53965,7 @@ class CustomCommandWidget {
       try {
         const timeout = item.timeout ?? 1000;
         const jsonInput = JSON.stringify(context.data);
-        let output = execSync8(item.commandPath, {
+        let output = execSync5(item.commandPath, {
           encoding: "utf8",
           input: jsonInput,
           timeout,
@@ -58923,6 +58935,8 @@ var StatusJSONSchema = exports_external.looseObject({
 
 // src/utils/jsonl.ts
 import * as fs7 from "fs";
+import { createHash } from "node:crypto";
+import os7 from "node:os";
 import path6 from "node:path";
 
 // node_modules/tinyglobby/dist/index.mjs
@@ -59714,6 +59728,81 @@ import { promisify } from "util";
 var readFile4 = promisify(fs7.readFile);
 var readFileSync5 = fs7.readFileSync;
 var statSync4 = fs7.statSync;
+var writeFileSync2 = fs7.writeFileSync;
+var mkdirSync3 = fs7.mkdirSync;
+var existsSync7 = fs7.existsSync;
+function normalizeConfigDir(configDir) {
+  return path6.resolve(configDir);
+}
+function getBlockCachePath(configDir = getClaudeConfigDir()) {
+  const normalizedConfigDir = normalizeConfigDir(configDir);
+  const configHash = createHash("sha256").update(normalizedConfigDir).digest("hex").slice(0, 16);
+  return path6.join(os7.homedir(), ".cache", "ccstatusline", `block-cache-${configHash}.json`);
+}
+function readBlockCache(expectedConfigDir) {
+  try {
+    const normalizedExpectedConfigDir = expectedConfigDir !== undefined ? normalizeConfigDir(expectedConfigDir) : undefined;
+    const cachePath = getBlockCachePath(normalizedExpectedConfigDir);
+    if (!existsSync7(cachePath)) {
+      return null;
+    }
+    const content = readFileSync5(cachePath, "utf-8");
+    const cache3 = JSON.parse(content);
+    if (typeof cache3.startTime !== "string") {
+      return null;
+    }
+    if (normalizedExpectedConfigDir !== undefined) {
+      if (typeof cache3.configDir !== "string") {
+        return null;
+      }
+      if (cache3.configDir !== normalizedExpectedConfigDir) {
+        return null;
+      }
+    }
+    const date5 = new Date(cache3.startTime);
+    if (Number.isNaN(date5.getTime())) {
+      return null;
+    }
+    return date5;
+  } catch {
+    return null;
+  }
+}
+function writeBlockCache(startTime, configDir = getClaudeConfigDir()) {
+  try {
+    const normalizedConfigDir = normalizeConfigDir(configDir);
+    const cachePath = getBlockCachePath(normalizedConfigDir);
+    const cacheDir = path6.dirname(cachePath);
+    if (!existsSync7(cacheDir)) {
+      mkdirSync3(cacheDir, { recursive: true });
+    }
+    const cache3 = {
+      startTime: startTime.toISOString(),
+      configDir: normalizedConfigDir
+    };
+    writeFileSync2(cachePath, JSON.stringify(cache3), "utf-8");
+  } catch {}
+}
+function getCachedBlockMetrics(sessionDurationHours = 5) {
+  const sessionDurationMs = sessionDurationHours * 60 * 60 * 1000;
+  const now = new Date;
+  const activeConfigDir = getClaudeConfigDir();
+  const cachedStartTime = readBlockCache(activeConfigDir);
+  if (cachedStartTime) {
+    const blockEndTime = new Date(cachedStartTime.getTime() + sessionDurationMs);
+    if (now.getTime() <= blockEndTime.getTime()) {
+      return {
+        startTime: cachedStartTime,
+        lastActivity: now
+      };
+    }
+  }
+  const metrics = getBlockMetrics();
+  if (metrics) {
+    writeBlockCache(metrics.startTime, activeConfigDir);
+  }
+  return metrics;
+}
 async function getSessionDuration(transcriptPath) {
   try {
     if (!fs7.existsSync(transcriptPath)) {
@@ -59974,6 +60063,15 @@ async function readStdin() {
     return null;
   }
 }
+async function ensureWindowsUtf8CodePage() {
+  if (process.platform !== "win32") {
+    return;
+  }
+  try {
+    const { execFileSync } = await import("child_process");
+    execFileSync("chcp.com", ["65001"], { stdio: "ignore" });
+  } catch {}
+}
 async function renderMultipleLines(data) {
   const settings = await loadSettings();
   source_default.level = settings.colorLevel;
@@ -59992,7 +60090,7 @@ async function renderMultipleLines(data) {
   }
   let blockMetrics = null;
   if (hasBlockTimer) {
-    blockMetrics = getBlockMetrics();
+    blockMetrics = getCachedBlockMetrics();
   }
   const context = {
     data,
@@ -60040,6 +60138,7 @@ async function renderMultipleLines(data) {
 }
 async function main() {
   if (!process.stdin.isTTY) {
+    await ensureWindowsUtf8CodePage();
     const input = await readStdin();
     if (input && input.trim() !== "") {
       try {

package/package.json

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