ccstatusline 2.0.21 → 2.0.23

package/README.md

@@ -364,8 +364,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 (out of 200k)
-- **Context Percentage (usable)** - Shows percentage of usable context (out of 160k, 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)

package/dist/ccstatusline.js

@@ -818,7 +818,7 @@ See https://react.dev/link/invalid-hook-call for tips about how to debug and fix
 
 // node_modules/react/index.js
 var require_react = __commonJS((exports, module) => {
-  var react_development = __toESM(require_react_development(), 1);
+  var react_development = __toESM(require_react_development());
   if (false) {} else {
     module.exports = react_development;
   }
@@ -1263,7 +1263,7 @@ var require_scheduler_development = __commonJS((exports) => {
 
 // node_modules/react-reconciler/node_modules/scheduler/index.js
 var require_scheduler = __commonJS((exports, module) => {
-  var scheduler_development = __toESM(require_scheduler_development(), 1);
+  var scheduler_development = __toESM(require_scheduler_development());
   if (false) {} else {
     module.exports = scheduler_development;
   }
@@ -1271,8 +1271,8 @@ var require_scheduler = __commonJS((exports, module) => {
 
 // node_modules/react-reconciler/cjs/react-reconciler.development.js
 var require_react_reconciler_development = __commonJS((exports, module) => {
-  var React = __toESM(require_react(), 1);
-  var Scheduler = __toESM(require_scheduler(), 1);
+  var React = __toESM(require_react());
+  var Scheduler = __toESM(require_scheduler());
   module.exports = function($$$config) {
     function findHook(fiber, id) {
       for (fiber = fiber.memoizedState;fiber !== null && 0 < id; )
@@ -28235,7 +28235,7 @@ var require_react_is_development = __commonJS((exports) => {
 
 // node_modules/react-is/index.js
 var require_react_is = __commonJS((exports, module) => {
-  var react_is_development = __toESM(require_react_is_development(), 1);
+  var react_is_development = __toESM(require_react_is_development());
   if (false) {} else {
     module.exports = react_is_development;
   }
@@ -28376,7 +28376,7 @@ var require_checkPropTypes = __commonJS((exports, module) => {
 
 // node_modules/prop-types/factoryWithTypeCheckers.js
 var require_factoryWithTypeCheckers = __commonJS((exports, module) => {
-  var ReactIs = __toESM(require_react_is(), 1);
+  var ReactIs = __toESM(require_react_is());
   var assign = require_object_assign();
   var ReactPropTypesSecret = require_ReactPropTypesSecret();
   var has = require_has();
@@ -28800,7 +28800,7 @@ Valid keys: ` + JSON.stringify(Object.keys(shapeTypes), null, "  "));
 
 // node_modules/prop-types/index.js
 var require_prop_types = __commonJS((exports, module) => {
-  var ReactIs = __toESM(require_react_is(), 1);
+  var ReactIs = __toESM(require_react_is());
   if (true) {
     throwOnDirectAccess = true;
     module.exports = require_factoryWithTypeCheckers()(ReactIs.isElement, throwOnDirectAccess);
@@ -31641,7 +31641,7 @@ var require_gradient_string = __commonJS((exports, module) => {
 
 // node_modules/react/cjs/react-jsx-dev-runtime.development.js
 var require_react_jsx_dev_runtime_development = __commonJS((exports) => {
-  var React14 = __toESM(require_react(), 1);
+  var React14 = __toESM(require_react());
   (function() {
     function getComponentNameFromType(type) {
       if (type == null)
@@ -31855,7 +31855,7 @@ React keys must be passed directly to JSX without using spread:
 
 // node_modules/react/jsx-dev-runtime.js
 var require_jsx_dev_runtime = __commonJS((exports, module) => {
-  var react_jsx_dev_runtime_development = __toESM(require_react_jsx_dev_runtime_development(), 1);
+  var react_jsx_dev_runtime_development = __toESM(require_react_jsx_dev_runtime_development());
   if (false) {} else {
     module.exports = react_jsx_dev_runtime_development;
   }
@@ -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.21";
+var PACKAGE_VERSION = "2.0.23";
 function getPackageVersion() {
   if (/^\d+\.\d+\.\d+/.test(PACKAGE_VERSION)) {
     return PACKAGE_VERSION;
@@ -52523,6 +52523,33 @@ class GitWorktreeWidget {
     return true;
   }
 }
+// src/utils/model-context.ts
+function getContextConfig(modelId) {
+  const defaultConfig = {
+    maxTokens: 200000,
+    usableTokens: 160000
+  };
+  if (!modelId)
+    return defaultConfig;
+  if (modelId.includes("claude-sonnet-4-5") && modelId.toLowerCase().includes("[1m]")) {
+    return {
+      maxTokens: 1e6,
+      usableTokens: 800000
+    };
+  }
+  return defaultConfig;
+}
+
+// src/utils/context-percentage.ts
+function calculateContextPercentage(context) {
+  if (!context.tokenMetrics) {
+    return 0;
+  }
+  const modelId = context.data?.model?.id;
+  const contextConfig = getContextConfig(modelId);
+  return Math.min(100, context.tokenMetrics.contextLength / contextConfig.maxTokens * 100);
+}
+
 // src/utils/renderer.ts
 var ANSI_REGEX = new RegExp(`\\x1b\\[[0-9;]*m`, "g");
 function formatTokens(count) {
@@ -52575,7 +52602,7 @@ function renderPowerlineStatusLine(widgets, settings, context, lineIndex = 0, gl
         terminalWidth = detectedWidth - 40;
       } else if (flexMode === "full-until-compact") {
         const threshold = settings.compactThreshold;
-        const contextPercentage = context.tokenMetrics ? Math.min(100, context.tokenMetrics.contextLength / 200000 * 100) : 0;
+        const contextPercentage = calculateContextPercentage(context);
         if (contextPercentage >= threshold) {
           terminalWidth = detectedWidth - 40;
         } else {
@@ -52949,7 +52976,7 @@ function renderStatusLine(widgets, settings, context, preRenderedWidgets, preCal
         terminalWidth = detectedWidth - 40;
       } else if (flexMode === "full-until-compact") {
         const threshold = settings.compactThreshold;
-        const contextPercentage = context.tokenMetrics ? Math.min(100, context.tokenMetrics.contextLength / 200000 * 100) : 0;
+        const contextPercentage = calculateContextPercentage(context);
         if (contextPercentage >= threshold) {
           terminalWidth = detectedWidth - 40;
         } else {
@@ -53339,7 +53366,7 @@ class ContextPercentageWidget {
     return "blue";
   }
   getDescription() {
-    return "Shows percentage of context window used or remaining (of 200k tokens)";
+    return "Shows percentage of context window used or remaining";
   }
   getDisplayName() {
     return "Context %";
@@ -53374,7 +53401,9 @@ class ContextPercentageWidget {
       const previewValue = isInverse ? "90.7%" : "9.3%";
       return item.rawValue ? previewValue : `Ctx: ${previewValue}`;
     } else if (context.tokenMetrics) {
-      const usedPercentage = Math.min(100, context.tokenMetrics.contextLength / 200000 * 100);
+      const modelId = context.data?.model?.id;
+      const contextConfig = getContextConfig(modelId);
+      const usedPercentage = Math.min(100, context.tokenMetrics.contextLength / contextConfig.maxTokens * 100);
       const displayPercentage = isInverse ? 100 - usedPercentage : usedPercentage;
       return item.rawValue ? `${displayPercentage.toFixed(1)}%` : `Ctx: ${displayPercentage.toFixed(1)}%`;
     }
@@ -53398,7 +53427,7 @@ class ContextPercentageUsableWidget {
     return "green";
   }
   getDescription() {
-    return "Shows percentage of usable context window used or remaining (of 160k tokens before auto-compact)";
+    return "Shows percentage of usable context window used or remaining (80% of max before auto-compact)";
   }
   getDisplayName() {
     return "Context % (usable)";
@@ -53433,7 +53462,9 @@ class ContextPercentageUsableWidget {
       const previewValue = isInverse ? "88.4%" : "11.6%";
       return item.rawValue ? previewValue : `Ctx(u): ${previewValue}`;
     } else if (context.tokenMetrics) {
-      const usedPercentage = Math.min(100, context.tokenMetrics.contextLength / 160000 * 100);
+      const modelId = context.data?.model?.id;
+      const contextConfig = getContextConfig(modelId);
+      const usedPercentage = Math.min(100, context.tokenMetrics.contextLength / contextConfig.usableTokens * 100);
       const displayPercentage = isInverse ? 100 - usedPercentage : usedPercentage;
       return item.rawValue ? `${displayPercentage.toFixed(1)}%` : `Ctx(u): ${displayPercentage.toFixed(1)}%`;
     }
@@ -54277,6 +54308,38 @@ var CurrentWorkingDirEditor = ({ widget, onComplete, onCancel, action }) => {
     children: "Unknown editor mode"
   }, undefined, false, undefined, this);
 };
+// src/widgets/ClaudeSessionId.ts
+class ClaudeSessionIdWidget {
+  getDefaultColor() {
+    return "cyan";
+  }
+  getDescription() {
+    return "Shows the current Claude Code session ID reported in status JSON";
+  }
+  getDisplayName() {
+    return "Claude Session ID";
+  }
+  getEditorDisplay(item) {
+    return { displayText: this.getDisplayName() };
+  }
+  render(item, context, settings) {
+    if (context.isPreview) {
+      return item.rawValue ? "preview-session-id" : "Session ID: preview-session-id";
+    } else {
+      const sessionId = context.data?.session_id;
+      if (!sessionId) {
+        return null;
+      }
+      return item.rawValue ? sessionId : `Session ID: ${sessionId}`;
+    }
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors(item) {
+    return true;
+  }
+}
 // src/utils/widgets.ts
 var widgetRegistry = new Map([
   ["model", new ModelWidget],
@@ -54298,7 +54361,8 @@ var widgetRegistry = new Map([
   ["terminal-width", new TerminalWidthWidget],
   ["version", new VersionWidget],
   ["custom-text", new CustomTextWidget],
-  ["custom-command", new CustomCommandWidget]
+  ["custom-command", new CustomCommandWidget],
+  ["claude-session-id", new ClaudeSessionIdWidget]
 ]);
 function getWidget(type) {
   return widgetRegistry.get(type) ?? null;
@@ -58987,40 +59051,12 @@ async function getTokenMetrics(transcriptPath) {
     return { inputTokens: 0, outputTokens: 0, cachedTokens: 0, totalTokens: 0, contextLength: 0 };
   }
 }
-function getBlockMetrics(transcriptPath) {
-  if (!transcriptPath || typeof transcriptPath !== "string") {
-    return null;
-  }
-  let claudePath = null;
-  if (process.platform === "win32") {
-    const homeDir = process.env.USERPROFILE ?? process.env.HOME;
-    if (homeDir) {
-      claudePath = path6.join(homeDir, ".claude");
-      if (!fs6.existsSync(claudePath)) {
-        return null;
-      }
-    }
-  } else {
-    let currentPath = path6.dirname(transcriptPath);
-    const visitedPaths = new Set;
-    while (currentPath && !visitedPaths.has(currentPath)) {
-      visitedPaths.add(currentPath);
-      const baseName = path6.basename(currentPath);
-      if (baseName === ".claude") {
-        claudePath = currentPath;
-        break;
-      }
-      const parentPath = path6.dirname(currentPath);
-      if (parentPath === currentPath) {
-        break;
-      }
-      currentPath = parentPath;
-    }
-  }
-  if (!claudePath)
+function getBlockMetrics() {
+  const claudeDir = getClaudeConfigDir();
+  if (!claudeDir)
     return null;
   try {
-    return findMostRecentBlockStartTime(claudePath);
+    return findMostRecentBlockStartTime(claudeDir);
   } catch {
     return null;
   }
@@ -59190,14 +59226,17 @@ async function renderMultipleLines(data) {
   const hasSessionClock = lines.some((line) => line.some((item) => item.type === "session-clock"));
   const hasBlockTimer = lines.some((line) => line.some((item) => item.type === "block-timer"));
   let tokenMetrics = null;
-  if (hasTokenItems && data.transcript_path)
+  if (hasTokenItems && data.transcript_path) {
     tokenMetrics = await getTokenMetrics(data.transcript_path);
+  }
   let sessionDuration = null;
-  if (hasSessionClock && data.transcript_path)
+  if (hasSessionClock && data.transcript_path) {
     sessionDuration = await getSessionDuration(data.transcript_path);
+  }
   let blockMetrics = null;
-  if (hasBlockTimer && data.transcript_path)
-    blockMetrics = getBlockMetrics(data.transcript_path);
+  if (hasBlockTimer) {
+    blockMetrics = getBlockMetrics();
+  }
   const context = {
     data,
     tokenMetrics,

package/package.json

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