ccstatusline 2.0.4 → 2.0.6

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 ccstatusline contributors
+Copyright (c) 2025 Matthew Breedlove (https://github.com/sirmalloc)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,8 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
+
+---
+Original author: Matthew Breedlove (https://github.com/sirmalloc)
+Official repository: https://github.com/sirmalloc/ccstatusline

package/README.md

@@ -343,7 +343,7 @@ Contributions are welcome! Please feel free to submit a Pull Request.
 ## 🔗 Related Projects
 
 - [tweakcc](https://github.com/Piebald-AI/tweakcc) - Customize Claude Code themes, thinking verbs, and more.
-- [ccusage](https://github.com/samuelint/ccusage) - Track and display Claude Code usage metrics.
+- [ccusage](https://github.com/ryoppippi/ccusage) - Track and display Claude Code usage metrics.
 
 ---
 

package/dist/ccstatusline.js

@@ -51035,7 +51035,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.4";
+var PACKAGE_VERSION = "2.0.6";
 function getPackageVersion() {
   if (/^\d+\.\d+\.\d+/.test(PACKAGE_VERSION)) {
     return PACKAGE_VERSION;
@@ -51949,7 +51949,7 @@ class GitBranchWidget {
   }
   getGitBranch() {
     try {
-      const branch = execSync4("git branch --show-current 2>/dev/null", {
+      const branch = execSync4("git branch --show-current", {
         encoding: "utf8",
         stdio: ["pipe", "pipe", "ignore"]
       }).trim();
@@ -51995,11 +51995,11 @@ class GitChangesWidget {
     try {
       let totalInsertions = 0;
       let totalDeletions = 0;
-      const unstagedStat = execSync5("git diff --shortstat 2>/dev/null", {
+      const unstagedStat = execSync5("git diff --shortstat", {
         encoding: "utf8",
         stdio: ["pipe", "pipe", "ignore"]
       }).trim();
-      const stagedStat = execSync5("git diff --cached --shortstat 2>/dev/null", {
+      const stagedStat = execSync5("git diff --cached --shortstat", {
         encoding: "utf8",
         stdio: ["pipe", "pipe", "ignore"]
       }).trim();
@@ -53243,20 +53243,27 @@ class BlockTimerWidget {
   render(item, context, settings) {
     const displayMode = item.metadata?.display ?? "time";
     if (context.isPreview) {
+      const prefix = item.rawValue ? "" : "Block ";
       if (displayMode === "progress") {
-        return "Block [██████████████████████░░░░░░░░] 73.9%";
+        return `${prefix}[██████████████████████░░░░░░░░] 73.9%`;
       } else if (displayMode === "progress-short") {
-        return "Block [███████░░░░░░░░] 73.9%";
+        return `${prefix}[███████░░░░░░░░] 73.9%`;
       }
       return item.rawValue ? "3hr 45m" : "Block: 3hr 45m";
     }
-    const blockInfo = context.blockMetrics;
-    if (!blockInfo) {
-      return null;
+    const blockMetrics = context.blockMetrics;
+    if (!blockMetrics) {
+      if (displayMode === "progress" || displayMode === "progress-short") {
+        const barWidth = displayMode === "progress" ? 32 : 16;
+        const emptyBar = "░".repeat(barWidth);
+        return item.rawValue ? `[${emptyBar}] 0%` : `Block [${emptyBar}] 0%`;
+      } else {
+        return item.rawValue ? "0hr 0m" : "Block: 0hr 0m";
+      }
     }
     try {
       const now = new Date;
-      const elapsedMs = now.getTime() - blockInfo.startTime.getTime();
+      const elapsedMs = now.getTime() - blockMetrics.startTime.getTime();
       const sessionDurationMs = 5 * 60 * 60 * 1000;
       const progress = Math.min(elapsedMs / sessionDurationMs, 1);
       const percentage = (progress * 100).toFixed(1);
@@ -56945,13 +56952,15 @@ Continue?`;
             },
             onInstallFonts: () => {
               setInstallingFonts(true);
-              installPowerlineFonts().then((result) => {
-                setInstallingFonts(false);
-                setFontInstallMessage(result.message);
-                checkPowerlineFontsAsync().then((asyncStatus) => {
-                  setPowerlineFontStatus(asyncStatus);
+              setTimeout(() => {
+                installPowerlineFonts().then((result) => {
+                  setInstallingFonts(false);
+                  setFontInstallMessage(result.message);
+                  checkPowerlineFontsAsync().then((asyncStatus) => {
+                    setPowerlineFontStatus(asyncStatus);
+                  });
                 });
-              });
+              }, 50);
             },
             installingFonts,
             fontInstallMessage,
@@ -57887,9 +57896,8 @@ function getBlockMetrics(transcriptPath) {
     }
     currentPath = path6.dirname(currentPath);
   }
-  if (!claudePath) {
+  if (!claudePath)
     return null;
-  }
   try {
     return findMostRecentBlockStartTime(claudePath);
   } catch {
@@ -57901,44 +57909,65 @@ function findMostRecentBlockStartTime(rootDir, sessionDurationHours = 5) {
   const now = new Date;
   const pattern = path6.join(rootDir, "projects", "**", "*.jsonl").replace(/\\/g, "/");
   const files = globSync([pattern]);
-  if (files.length === 0) {
+  if (files.length === 0)
     return null;
-  }
   const filesWithStats = files.map((file2) => {
     const stats = statSync3(file2);
     return { file: file2, mtime: stats.mtime };
   });
   filesWithStats.sort((a, b) => b.mtime.getTime() - a.mtime.getTime());
-  const timestamps = [];
-  const cutoffTime = new Date(now.getTime() - 20 * 60 * 60 * 1000);
-  for (const { file: file2, mtime } of filesWithStats) {
-    if (mtime.getTime() < cutoffTime.getTime()) {
-      break;
+  const lookbackChunks = [
+    10,
+    20,
+    48
+  ];
+  let timestamps = [];
+  let mostRecentTimestamp = null;
+  let continuousWorkStart = null;
+  let foundSessionGap = false;
+  for (const lookbackHours of lookbackChunks) {
+    const cutoffTime = new Date(now.getTime() - lookbackHours * 60 * 60 * 1000);
+    timestamps = [];
+    for (const { file: file2, mtime } of filesWithStats) {
+      if (mtime.getTime() < cutoffTime.getTime()) {
+        break;
+      }
+      const fileTimestamps = getAllTimestampsFromFile(file2);
+      timestamps.push(...fileTimestamps);
     }
-    const fileTimestamps = getAllTimestampsFromFile(file2);
-    timestamps.push(...fileTimestamps);
-  }
-  if (timestamps.length === 0) {
-    return null;
-  }
-  timestamps.sort((a, b) => b.getTime() - a.getTime());
-  const mostRecentTimestamp = timestamps[0];
-  if (!mostRecentTimestamp) {
-    return null;
-  }
-  let continuousWorkStart = mostRecentTimestamp;
-  for (let i = 1;i < timestamps.length; i++) {
-    const currentTimestamp = timestamps[i];
-    const previousTimestamp = timestamps[i - 1];
-    if (!currentTimestamp || !previousTimestamp) {
+    if (timestamps.length === 0) {
       continue;
     }
-    const gap = previousTimestamp.getTime() - currentTimestamp.getTime();
-    const oneHourMs = 60 * 60 * 1000;
-    if (gap > oneHourMs) {
+    timestamps.sort((a, b) => b.getTime() - a.getTime());
+    if (!mostRecentTimestamp && timestamps[0]) {
+      mostRecentTimestamp = timestamps[0];
+      const timeSinceLastActivity = now.getTime() - mostRecentTimestamp.getTime();
+      if (timeSinceLastActivity > sessionDurationMs) {
+        return null;
+      }
+    }
+    continuousWorkStart = mostRecentTimestamp;
+    for (let i = 1;i < timestamps.length; i++) {
+      const currentTimestamp = timestamps[i];
+      const previousTimestamp = timestamps[i - 1];
+      if (!currentTimestamp || !previousTimestamp)
+        continue;
+      const gap = previousTimestamp.getTime() - currentTimestamp.getTime();
+      if (gap >= sessionDurationMs) {
+        foundSessionGap = true;
+        break;
+      }
+      continuousWorkStart = currentTimestamp;
+    }
+    if (foundSessionGap) {
+      break;
+    }
+    if (lookbackHours === lookbackChunks[lookbackChunks.length - 1]) {
       break;
     }
-    continuousWorkStart = currentTimestamp;
+  }
+  if (!mostRecentTimestamp || !continuousWorkStart) {
+    return null;
   }
   const flooredWorkStart = floorToHour(continuousWorkStart);
   const totalWorkTime = now.getTime() - flooredWorkStart.getTime();
@@ -57947,13 +57976,15 @@ function findMostRecentBlockStartTime(rootDir, sessionDurationHours = 5) {
     const completedBlocks = Math.floor(totalWorkTime / sessionDurationMs);
     blockStart = new Date(flooredWorkStart.getTime() + completedBlocks * sessionDurationMs);
   }
-  const timeSinceActivity = now.getTime() - mostRecentTimestamp.getTime();
   const blockEnd = new Date(blockStart.getTime() + sessionDurationMs);
-  const isActive = timeSinceActivity < sessionDurationMs && now < blockEnd;
+  const inBlockWindow = now.getTime() >= blockStart.getTime() && now.getTime() <= blockEnd.getTime();
+  const activityInThisBlock = mostRecentTimestamp.getTime() >= blockStart.getTime() && mostRecentTimestamp.getTime() <= now.getTime();
+  const isActive = inBlockWindow && activityInThisBlock;
+  if (!isActive)
+    return null;
   return {
     startTime: blockStart,
-    lastActivity: mostRecentTimestamp,
-    isActive
+    lastActivity: mostRecentTimestamp
   };
 }
 function getAllTimestampsFromFile(filePath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccstatusline",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "A customizable status line formatter for Claude Code CLI",
   "module": "src/ccstatusline.ts",
   "type": "module",
@@ -37,9 +37,11 @@
     "patch-package": "^8.0.0",
     "react": "^19.1.1",
     "react-devtools-core": "^6.1.5",
+    "strip-ansi": "^7.1.0",
     "tinyglobby": "^0.2.14",
     "typescript": "^5.9.2",
-    "typescript-eslint": "^8.39.1"
+    "typescript-eslint": "^8.39.1",
+    "zod": "^4.0.17"
   },
   "keywords": [
     "claude",
@@ -59,9 +61,5 @@
   },
   "trustedDependencies": [
     "unrs-resolver"
-  ],
-  "dependencies": {
-    "strip-ansi": "^7.1.0",
-    "zod": "^4.0.17"
-  }
+  ]
 }