ccstatusline-usage 2.1.5 → 2.1.6

package/README.md

@@ -46,30 +46,22 @@
 
 ## 🆕 Recent Updates
 
-### [v2.1.5](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.1.5) - Claude Code Teams compatibility
+### [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): **Teams mode support** — automatically detects Claude Code's native Teams sessions (orchestrator + teammates in tmux split panes) and applies compact rendering for the narrow orchestrator pane. Widgets render at half terminal width to fit CC's two-column status bar layout.
+- [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.1.4](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.1.4) - Compact mode widget-boundary wrapping
+### v2.0.26 - v2.0.28 - Performance, git internals, and workflow improvements
 
-- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Widget-boundary wrapping** — compact mode now wraps at widget boundaries instead of mid-widget, using a dedicated compact renderer (`compact-renderer.ts`). Widgets that don't fit on the current line cleanly wrap to the next:
-  ```
-  S: [░░░░] 2.0% | W: [██░░] 43.0% | 4:36 hr
-  M: o4.6 ▌▌▌ | S: 5647528d | C: [██░░] 119k/200k
-  ```
-- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Terminal-agnostic compact detection** — compact mode now triggers on any narrow terminal (< 80 columns), not just tmux
-
-### [v2.1.3](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.1.3) - Mobile/compact mode and thinking effort bars
-
-- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Mobile/compact mode** — in narrow terminals (< 80 effective columns, e.g. tmux panes), widgets auto-switch to compact rendering: `M: o4.6` instead of `Model: claude-opus-4-6`, session ID truncated to 8 chars, and multiple status lines merge into one
-- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Thinking effort bars** — Model widget shows `▌▌▌` bars indicating Claude Code's effort level (1=low, 2=medium, 3=high). Reads from `CLAUDE_CODE_EFFORT_LEVEL` env var or `~/.claude/settings.json`
-- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Tmux pane width detection** — correctly detects actual pane width via `tmux display-message` instead of falling back to default 80 columns
-
-### [v2.1.2](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.1.2) - Token auth fallback and 401 handling
-
-- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): macOS file credential fallback — reads `~/.claude/.credentials.json` when Keychain entry is missing
-- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): 401 auth error handling — invalidates cached token so next call re-reads from disk after `/login`
-- Synced with upstream (101 commits)
+- **⚡ 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
 
@@ -374,12 +366,13 @@ Once configured, ccstatusline automatically formats your Claude Code status line
 
 ### 📊 Available Widgets
 
-- **Model Name** - Shows the current Claude model with thinking effort bars (`▌▌▌`) indicating low/medium/high effort
+- **Model Name** - Shows the current Claude model (e.g., "Claude 3.5 Sonnet")
 - **Git Branch** - Displays current git branch name
 - **Git Changes** - Shows uncommitted insertions/deletions (e.g., "+42,-10")
 - **Git Worktree** - Shows the name of the current git worktree
 - **Session Clock** - Shows elapsed time since session start (e.g., "2hr 15m")
 - **Session Cost** - Shows total session cost in USD (e.g., "$1.23")
+- **Session Name** - Shows the session name set via `/rename` command in Claude Code
 - **Block Timer** - Shows time elapsed in current 5-hour block or progress bar
 - **Current Working Directory** - Shows current working directory with configurable path segments
 - **Version** - Shows Claude Code version
@@ -389,8 +382,8 @@ Once configured, ccstatusline automatically formats your Claude Code status line
 - **Tokens Cached** - Shows cached tokens used
 - **Tokens Total** - Shows total tokens used
 - **Context Length** - Shows current context length in tokens
-- **Context Percentage** - Shows percentage of context limit used (dynamic: 1M for Sonnet 4.5/Opus 4.6 with `[1m]` suffix, 200k otherwise)
-- **Context Percentage (usable)** - Shows percentage of usable context (dynamic: 800k for Sonnet 4.5/Opus 4.6 with `[1m]` suffix, 160k otherwise, accounting for auto-compact at 80%)
+- **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)
 - **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)
@@ -460,7 +453,7 @@ The Block Timer widget helps you track your progress through Claude Code's 5-hou
 ### 🔤 Raw Value Mode
 
 Some widgets support "raw value" mode which displays just the value without a label:
-- Normal: `Model: Claude Opus 4.6` → Raw: `Claude Opus 4.6`
+- Normal: `Model: Claude 3.5 Sonnet` → Raw: `Claude 3.5 Sonnet`
 - Normal: `Session: 2hr 15m` → Raw: `2hr 15m`
 - Normal: `Block: 3hr 45m` → Raw: `3hr 45m`
 - Normal: `Ctx: 18.6k` → Raw: `18.6k`
@@ -637,11 +630,6 @@ Contributions are welcome! Please feel free to submit a Pull Request.
 
 - GitHub: [@sirmalloc](https://github.com/sirmalloc)
 
-**Fork maintained by Peter van Velzen**
-
-- GitHub: [@pcvelz](https://github.com/pcvelz)
-- Fork: [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage)
-
 ---
 
 ## 🔗 Related Projects
@@ -661,11 +649,11 @@ Contributions are welcome! Please feel free to submit a Pull Request.
 
 ## Star History
 
-<a href="https://www.star-history.com/#pcvelz/ccstatusline-usage&Timeline">
+<a href="https://www.star-history.com/#sirmalloc/ccstatusline&Timeline">
  <picture>
-   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=pcvelz/ccstatusline-usage&type=Timeline&theme=dark" />
-   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=pcvelz/ccstatusline-usage&type=Timeline" />
-   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=pcvelz/ccstatusline-usage&type=Timeline" />
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=sirmalloc/ccstatusline&type=Timeline&theme=dark" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=sirmalloc/ccstatusline&type=Timeline" />
+   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=sirmalloc/ccstatusline&type=Timeline" />
  </picture>
 </a>
 
@@ -675,21 +663,21 @@ Contributions are welcome! Please feel free to submit a Pull Request.
 
 Give a ⭐ if this project helped you!
 
-[![GitHub stars](https://img.shields.io/github/stars/pcvelz/ccstatusline-usage?style=social)](https://github.com/pcvelz/ccstatusline-usage/stargazers)
-[![GitHub forks](https://img.shields.io/github/forks/pcvelz/ccstatusline-usage?style=social)](https://github.com/pcvelz/ccstatusline-usage/network/members)
-[![GitHub watchers](https://img.shields.io/github/watchers/pcvelz/ccstatusline-usage?style=social)](https://github.com/pcvelz/ccstatusline-usage/watchers)
+[![GitHub stars](https://img.shields.io/github/stars/sirmalloc/ccstatusline?style=social)](https://github.com/sirmalloc/ccstatusline/stargazers)
+[![GitHub forks](https://img.shields.io/github/forks/sirmalloc/ccstatusline?style=social)](https://github.com/sirmalloc/ccstatusline/network/members)
+[![GitHub watchers](https://img.shields.io/github/watchers/sirmalloc/ccstatusline?style=social)](https://github.com/sirmalloc/ccstatusline/watchers)
 
-[![npm version](https://img.shields.io/npm/v/ccstatusline-usage.svg)](https://www.npmjs.com/package/ccstatusline-usage)
-[![npm downloads](https://img.shields.io/npm/dm/ccstatusline-usage.svg)](https://www.npmjs.com/package/ccstatusline-usage)
-[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/pcvelz/ccstatusline-usage/blob/main/LICENSE)
+[![npm version](https://img.shields.io/npm/v/ccstatusline.svg)](https://www.npmjs.com/package/ccstatusline)
+[![npm downloads](https://img.shields.io/npm/dm/ccstatusline.svg)](https://www.npmjs.com/package/ccstatusline)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/sirmalloc/ccstatusline/blob/main/LICENSE)
 [![Made with Bun](https://img.shields.io/badge/Made%20with-Bun-000000.svg?logo=bun)](https://bun.sh)
 
-[![Issues](https://img.shields.io/github/issues/pcvelz/ccstatusline-usage)](https://github.com/pcvelz/ccstatusline-usage/issues)
-[![Pull Requests](https://img.shields.io/github/issues-pr/pcvelz/ccstatusline-usage)](https://github.com/pcvelz/ccstatusline-usage/pulls)
-[![Contributors](https://img.shields.io/github/contributors/pcvelz/ccstatusline-usage)](https://github.com/pcvelz/ccstatusline-usage/graphs/contributors)
+[![Issues](https://img.shields.io/github/issues/sirmalloc/ccstatusline)](https://github.com/sirmalloc/ccstatusline/issues)
+[![Pull Requests](https://img.shields.io/github/issues-pr/sirmalloc/ccstatusline)](https://github.com/sirmalloc/ccstatusline/pulls)
+[![Contributors](https://img.shields.io/github/contributors/sirmalloc/ccstatusline)](https://github.com/sirmalloc/ccstatusline/graphs/contributors)
 
 ### 💬 Connect
 
-[Report Bug](https://github.com/pcvelz/ccstatusline-usage/issues) · [Request Feature](https://github.com/pcvelz/ccstatusline-usage/issues) · [Discussions](https://github.com/pcvelz/ccstatusline-usage/discussions)
+[Report Bug](https://github.com/sirmalloc/ccstatusline/issues) · [Request Feature](https://github.com/sirmalloc/ccstatusline/issues) · [Discussions](https://github.com/sirmalloc/ccstatusline/discussions)
 
 </div>

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.1.5";
+var PACKAGE_VERSION = "2.1.6";
 function getPackageVersion() {
   if (/^\d+\.\d+\.\d+/.test(PACKAGE_VERSION)) {
     return PACKAGE_VERSION;
@@ -52425,9 +52425,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";
@@ -52470,21 +52500,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 [
@@ -52499,8 +52524,6 @@ class GitBranchWidget {
   }
 }
 // src/widgets/GitChanges.ts
-import { execSync as execSync5 } from "child_process";
-
 class GitChangesWidget {
   getDefaultColor() {
     return "yellow";
@@ -52543,40 +52566,107 @@ 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 [
+      { key: "h", label: "(h)ide 'no git' message", action: "toggle-nogit" }
+    ];
+  }
+  supportsRawValue() {
+    return false;
+  }
+  supportsColors(item) {
+    return true;
+  }
+}
+// src/widgets/GitRootDir.ts
+class GitRootDirWidget {
+  getDefaultColor() {
+    return "cyan";
+  }
+  getDescription() {
+    return "Shows the git repository root directory name";
+  }
+  getDisplayName() {
+    return "Git Root Dir";
+  }
+  getCategory() {
+    return "Git";
+  }
+  getEditorDisplay(item) {
+    const hideNoGit = item.metadata?.hideNoGit === "true";
+    const modifiers = [];
+    if (hideNoGit) {
+      modifiers.push("hide 'no git'");
+    }
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+    };
+  }
+  handleEditorAction(action, item) {
+    if (action === "toggle-nogit") {
+      const currentState = item.metadata?.hideNoGit === "true";
+      return {
+        ...item,
+        metadata: {
+          ...item.metadata,
+          hideNoGit: (!currentState).toString()
+        }
+      };
     }
+    return null;
+  }
+  render(item, context, _settings) {
+    const hideNoGit = item.metadata?.hideNoGit === "true";
+    if (context.isPreview) {
+      return "my-repo";
+    }
+    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(context) {
+    return runGit("rev-parse --show-toplevel", context);
+  }
+  getRootDirName(rootDir) {
+    const trimmedRootDir = rootDir.replace(/[\\/]+$/, "");
+    const normalizedRootDir = trimmedRootDir.length > 0 ? trimmedRootDir : rootDir;
+    const parts = normalizedRootDir.split(/[\\/]/).filter(Boolean);
+    const lastPart = parts[parts.length - 1];
+    return lastPart && lastPart.length > 0 ? lastPart : normalizedRootDir;
   }
   getCustomKeybinds() {
     return [
@@ -52591,8 +52681,6 @@ class GitChangesWidget {
   }
 }
 // src/widgets/GitWorktree.ts
-import { execSync as execSync6 } from "child_process";
-
 class GitWorktreeWidget {
   getDefaultColor() {
     return "blue";
@@ -52634,24 +52722,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 = execSync6("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 [
@@ -53935,7 +54028,7 @@ var CustomTextEditor = ({ widget, onComplete, onCancel }) => {
   }, undefined, true, undefined, this);
 };
 // src/widgets/CustomCommand.tsx
-import { execSync as execSync7 } 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);
 
@@ -53984,7 +54077,7 @@ class CustomCommandWidget {
       try {
         const timeout = item.timeout ?? 1000;
         const jsonInput = JSON.stringify(context.data);
-        let output = execSync7(item.commandPath, {
+        let output = execSync5(item.commandPath, {
           encoding: "utf8",
           input: jsonInput,
           timeout,
@@ -54324,7 +54417,11 @@ class CurrentWorkingDirWidget {
   getEditorDisplay(item) {
     const segments = item.metadata?.segments ? parseInt(item.metadata.segments, 10) : undefined;
     const fishStyle = item.metadata?.fishStyle === "true";
+    const abbreviateHome = item.metadata?.abbreviateHome === "true";
     const modifiers = [];
+    if (abbreviateHome) {
+      modifiers.push("~");
+    }
     if (fishStyle) {
       modifiers.push("fish-style");
     } else if (segments && segments > 0) {
@@ -54336,11 +54433,31 @@ class CurrentWorkingDirWidget {
     };
   }
   handleEditorAction(action, item) {
+    if (action === "toggle-abbreviate-home") {
+      const currentAbbreviateHome = item.metadata?.abbreviateHome === "true";
+      const newAbbreviateHome = !currentAbbreviateHome;
+      if (newAbbreviateHome) {
+        const { fishStyle, ...restMetadata } = item.metadata ?? {};
+        return {
+          ...item,
+          metadata: {
+            ...restMetadata,
+            abbreviateHome: "true"
+          }
+        };
+      } else {
+        const { abbreviateHome, ...restMetadata } = item.metadata ?? {};
+        return {
+          ...item,
+          metadata: Object.keys(restMetadata).length > 0 ? restMetadata : undefined
+        };
+      }
+    }
     if (action === "toggle-fish-style") {
       const currentFishStyle = item.metadata?.fishStyle === "true";
       const newFishStyle = !currentFishStyle;
       if (newFishStyle) {
-        const { segments, ...restMetadata } = item.metadata ?? {};
+        const { segments, abbreviateHome, ...restMetadata } = item.metadata ?? {};
         return {
           ...item,
           metadata: {
@@ -54361,10 +54478,19 @@ class CurrentWorkingDirWidget {
   render(item, context, settings) {
     const segments = item.metadata?.segments ? parseInt(item.metadata.segments, 10) : undefined;
     const fishStyle = item.metadata?.fishStyle === "true";
+    const abbreviateHome = item.metadata?.abbreviateHome === "true";
     if (context.isPreview) {
       let previewPath;
       if (fishStyle) {
         previewPath = "~/D/P/my-project";
+      } else if (abbreviateHome && segments && segments > 0) {
+        if (segments === 1) {
+          previewPath = "~/.../my-project";
+        } else {
+          previewPath = "~/.../Projects/my-project";
+        }
+      } else if (abbreviateHome) {
+        previewPath = "~/Documents/Projects/my-project";
       } else if (segments && segments > 0) {
         if (segments === 1) {
           previewPath = ".../project";
@@ -54382,20 +54508,27 @@ class CurrentWorkingDirWidget {
     let displayPath = cwd2;
     if (fishStyle) {
       displayPath = this.abbreviatePath(cwd2);
-    } else if (segments && segments > 0) {
-      const useBackslash = cwd2.includes("\\") && !cwd2.includes("/");
-      const outSep = useBackslash ? "\\" : "/";
-      const pathParts = cwd2.split(/[\\/]+/);
-      const filteredParts = pathParts.filter((part) => part !== "");
-      if (filteredParts.length > segments) {
-        const selectedSegments = filteredParts.slice(-segments);
-        displayPath = "..." + outSep + selectedSegments.join(outSep);
+    } else {
+      if (abbreviateHome) {
+        displayPath = this.abbreviateHomeDir(displayPath);
+      }
+      if (segments && segments > 0) {
+        const useBackslash = displayPath.includes("\\") && !displayPath.includes("/");
+        const outSep = useBackslash ? "\\" : "/";
+        const pathParts = displayPath.split(/[\\/]+/);
+        const filteredParts = pathParts.filter((part) => part !== "");
+        if (filteredParts.length > segments) {
+          const selectedSegments = filteredParts.slice(-segments);
+          const prefix = displayPath.startsWith("~") ? `~${outSep}` : "";
+          displayPath = prefix + "..." + outSep + selectedSegments.join(outSep);
+        }
       }
     }
     return item.rawValue ? displayPath : `cwd: ${displayPath}`;
   }
   getCustomKeybinds() {
     return [
+      { key: "h", label: "(h)ome ~", action: "toggle-abbreviate-home" },
       { key: "s", label: "(s)egments", action: "edit-segments" },
       { key: "f", label: "(f)ish style", action: "toggle-fish-style" }
     ];
@@ -54411,6 +54544,20 @@ class CurrentWorkingDirWidget {
   supportsColors(item) {
     return true;
   }
+  abbreviateHomeDir(path6) {
+    const homeDir = os5.homedir();
+    if (path6 === homeDir) {
+      return "~";
+    }
+    if (path6.startsWith(homeDir)) {
+      const boundaryChar = path6[homeDir.length];
+      if (boundaryChar !== "/" && boundaryChar !== "\\") {
+        return path6;
+      }
+      return "~" + path6.slice(homeDir.length);
+    }
+    return path6;
+  }
   abbreviatePath(path6) {
     const homeDir = os5.homedir();
     const useBackslash = path6.includes("\\") && !path6.includes("/");
@@ -54538,7 +54685,7 @@ class ClaudeSessionIdWidget {
 }
 // src/widgets/ApiUsage.tsx
 import {
-  execSync as execSync8,
+  execSync as execSync6,
   spawnSync
 } from "child_process";
 import * as fs7 from "fs";
@@ -54563,7 +54710,7 @@ function readTokenFromFile() {
 }
 function readTokenFromKeychain() {
   try {
-    const result = execSync8('security find-generic-password -s "Claude Code-credentials" -w 2>/dev/null', { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] }).trim();
+    const result = execSync6('security find-generic-password -s "Claude Code-credentials" -w 2>/dev/null', { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] }).trim();
     const parsed = JSON.parse(result);
     return parsed?.claudeAiOauth?.accessToken ?? null;
   } catch {
@@ -54944,12 +55091,65 @@ class ContextBarWidget {
     return true;
   }
 }
+// src/widgets/SessionName.ts
+import * as fs8 from "fs";
+
+class SessionNameWidget {
+  getDefaultColor() {
+    return "cyan";
+  }
+  getDescription() {
+    return "Shows the session name set via /rename command in Claude Code";
+  }
+  getDisplayName() {
+    return "Session Name";
+  }
+  getCategory() {
+    return "Session";
+  }
+  getEditorDisplay(item) {
+    return { displayText: this.getDisplayName() };
+  }
+  render(item, context, settings) {
+    if (context.isPreview) {
+      return item.rawValue ? "my-session" : "Session: my-session";
+    }
+    const transcriptPath = context.data?.transcript_path;
+    if (!transcriptPath) {
+      return null;
+    }
+    try {
+      const content = fs8.readFileSync(transcriptPath, "utf-8");
+      const lines = content.split(`
+`);
+      for (let i = lines.length - 1;i >= 0; i--) {
+        const line = lines[i]?.trim();
+        if (!line)
+          continue;
+        try {
+          const entry = JSON.parse(line);
+          if (entry.type === "custom-title" && entry.customTitle) {
+            return item.rawValue ? entry.customTitle : `Session: ${entry.customTitle}`;
+          }
+        } catch {}
+      }
+    } catch {}
+    return null;
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors(item) {
+    return true;
+  }
+}
 // src/utils/widgets.ts
 var widgetRegistry = new Map([
   ["model", new ModelWidget],
   ["output-style", new OutputStyleWidget],
   ["git-branch", new GitBranchWidget],
   ["git-changes", new GitChangesWidget],
+  ["git-root-dir", new GitRootDirWidget],
   ["git-worktree", new GitWorktreeWidget],
   ["current-working-dir", new CurrentWorkingDirWidget],
   ["tokens-input", new TokensInputWidget],
@@ -54970,7 +55170,8 @@ var widgetRegistry = new Map([
   ["session-usage", new SessionUsageWidget],
   ["weekly-usage", new WeeklyUsageWidget],
   ["reset-timer", new ResetTimerWidget],
-  ["context-bar", new ContextBarWidget]
+  ["context-bar", new ContextBarWidget],
+  ["session-name", new SessionNameWidget]
 ]);
 function getWidget(type) {
   return widgetRegistry.get(type) ?? null;
@@ -56466,7 +56667,11 @@ var ItemsEditor = ({ widgets, onUpdate, onBack, lineNumber, settings }) => {
         }
       } else if (input === "r" && widgets.length > 0) {
         const currentWidget2 = widgets[selectedIndex];
-        if (currentWidget2 && currentWidget2.type !== "separator" && currentWidget2.type !== "flex-separator" && currentWidget2.type !== "custom-text") {
+        if (currentWidget2 && currentWidget2.type !== "separator" && currentWidget2.type !== "flex-separator") {
+          const widgetImpl = getWidget(currentWidget2.type);
+          if (!widgetImpl?.supportsRawValue()) {
+            return;
+          }
           const newWidgets = [...widgets];
           newWidgets[selectedIndex] = { ...currentWidget2, rawValue: !currentWidget2.rawValue };
           onUpdate(newWidgets);
@@ -56875,6 +57080,7 @@ var ItemsEditor = ({ widgets, onUpdate, onBack, lineNumber, settings }) => {
               const isSelected = index === selectedIndex;
               const widgetImpl = widget.type !== "separator" && widget.type !== "flex-separator" ? getWidget(widget.type) : null;
               const { displayText, modifierText } = widgetImpl?.getEditorDisplay(widget) ?? { displayText: getWidgetDisplay(widget) };
+              const supportsRawValue = widgetImpl?.supportsRawValue() ?? false;
               return /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
                 flexDirection: "row",
                 flexWrap: "nowrap",
@@ -56897,7 +57103,7 @@ var ItemsEditor = ({ widgets, onUpdate, onBack, lineNumber, settings }) => {
                       modifierText
                     ]
                   }, undefined, true, undefined, this),
-                  widget.rawValue && /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Text, {
+                  supportsRawValue && widget.rawValue && /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Text, {
                     dimColor: true,
                     children: " (raw value)"
                   }, undefined, false, undefined, this),
@@ -59329,7 +59535,9 @@ function renderCompactOutput(preRenderedLines, settings, maxWidth) {
 }
 
 // src/utils/jsonl.ts
-import * as fs8 from "fs";
+import * as fs9 from "fs";
+import { createHash } from "node:crypto";
+import os7 from "node:os";
 import path8 from "node:path";
 
 // node_modules/tinyglobby/dist/index.mjs
@@ -59464,12 +59672,12 @@ function build$3(options) {
   return options.group ? groupFiles : empty;
 }
 var resolveSymlinksAsync = function(path7, state, callback$1) {
-  const { queue, fs: fs8, options: { suppressErrors } } = state;
+  const { queue, fs: fs9, options: { suppressErrors } } = state;
   queue.enqueue();
-  fs8.realpath(path7, (error43, resolvedPath) => {
+  fs9.realpath(path7, (error43, resolvedPath) => {
     if (error43)
       return queue.dequeue(suppressErrors ? null : error43, state);
-    fs8.stat(resolvedPath, (error$1, stat) => {
+    fs9.stat(resolvedPath, (error$1, stat) => {
       if (error$1)
         return queue.dequeue(suppressErrors ? null : error$1, state);
       if (stat.isDirectory() && isRecursive(path7, resolvedPath, state))
@@ -59480,11 +59688,11 @@ var resolveSymlinksAsync = function(path7, state, callback$1) {
   });
 };
 var resolveSymlinks = function(path7, state, callback$1) {
-  const { queue, fs: fs8, options: { suppressErrors } } = state;
+  const { queue, fs: fs9, options: { suppressErrors } } = state;
   queue.enqueue();
   try {
-    const resolvedPath = fs8.realpathSync(path7);
-    const stat = fs8.statSync(resolvedPath);
+    const resolvedPath = fs9.realpathSync(path7);
+    const stat = fs9.statSync(resolvedPath);
     if (stat.isDirectory() && isRecursive(path7, resolvedPath, state))
       return;
     callback$1(stat, resolvedPath);
@@ -59567,23 +59775,23 @@ var walkAsync = (state, crawlPath, directoryPath, currentDepth, callback$1) => {
   state.queue.enqueue();
   if (currentDepth < 0)
     return state.queue.dequeue(null, state);
-  const { fs: fs8 } = state;
+  const { fs: fs9 } = state;
   state.visited.push(crawlPath);
   state.counts.directories++;
-  fs8.readdir(crawlPath || ".", readdirOpts, (error43, entries = []) => {
+  fs9.readdir(crawlPath || ".", readdirOpts, (error43, entries = []) => {
     callback$1(entries, directoryPath, currentDepth);
     state.queue.dequeue(state.options.suppressErrors ? null : error43, state);
   });
 };
 var walkSync = (state, crawlPath, directoryPath, currentDepth, callback$1) => {
-  const { fs: fs8 } = state;
+  const { fs: fs9 } = state;
   if (currentDepth < 0)
     return;
   state.visited.push(crawlPath);
   state.counts.directories++;
   let entries = [];
   try {
-    entries = fs8.readdirSync(crawlPath || ".", readdirOpts);
+    entries = fs9.readdirSync(crawlPath || ".", readdirOpts);
   } catch (e) {
     if (!state.options.suppressErrors)
       throw e;
@@ -60118,12 +60326,87 @@ function globSync(patternsOrOptions, options) {
 
 // src/utils/jsonl.ts
 import { promisify } from "util";
-var readFile4 = promisify(fs8.readFile);
-var readFileSync6 = fs8.readFileSync;
-var statSync5 = fs8.statSync;
+var readFile4 = promisify(fs9.readFile);
+var readFileSync7 = fs9.readFileSync;
+var statSync5 = fs9.statSync;
+var writeFileSync3 = fs9.writeFileSync;
+var mkdirSync4 = fs9.mkdirSync;
+var existsSync8 = fs9.existsSync;
+function normalizeConfigDir(configDir) {
+  return path8.resolve(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`);
+}
+function readBlockCache(expectedConfigDir) {
+  try {
+    const normalizedExpectedConfigDir = expectedConfigDir !== undefined ? normalizeConfigDir(expectedConfigDir) : undefined;
+    const cachePath = getBlockCachePath(normalizedExpectedConfigDir);
+    if (!existsSync8(cachePath)) {
+      return null;
+    }
+    const content = readFileSync7(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 = path8.dirname(cachePath);
+    if (!existsSync8(cacheDir)) {
+      mkdirSync4(cacheDir, { recursive: true });
+    }
+    const cache3 = {
+      startTime: startTime.toISOString(),
+      configDir: normalizedConfigDir
+    };
+    writeFileSync3(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 (!fs8.existsSync(transcriptPath)) {
+    if (!fs9.existsSync(transcriptPath)) {
       return null;
     }
     const content = await readFile4(transcriptPath, "utf-8");
@@ -60175,7 +60458,7 @@ async function getSessionDuration(transcriptPath) {
 }
 async function getTokenMetrics(transcriptPath) {
   try {
-    if (!fs8.existsSync(transcriptPath)) {
+    if (!fs9.existsSync(transcriptPath)) {
       return { inputTokens: 0, outputTokens: 0, cachedTokens: 0, totalTokens: 0, contextLength: 0 };
     }
     const content = await readFile4(transcriptPath, "utf-8");
@@ -60322,7 +60605,7 @@ function findMostRecentBlockStartTime(rootDir, sessionDurationHours = 5) {
 function getAllTimestampsFromFile(filePath) {
   const timestamps = [];
   try {
-    const content = readFileSync6(filePath, "utf-8");
+    const content = readFileSync7(filePath, "utf-8");
     const lines = content.trim().split(`
 `).filter((line) => line.length > 0);
     for (const line of lines) {
@@ -60390,6 +60673,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;
@@ -60408,7 +60700,7 @@ async function renderMultipleLines(data) {
   }
   let blockMetrics = null;
   if (hasBlockTimer) {
-    blockMetrics = getBlockMetrics();
+    blockMetrics = getCachedBlockMetrics();
   }
   const terminalWidth = getTerminalWidth();
   const compact = shouldUseCompactMode(terminalWidth, data);
@@ -60465,6 +60757,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-usage",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "A customizable status line formatter for Claude Code CLI",
   "module": "src/ccstatusline.ts",
   "type": "module",