copilot-statusline 0.1.12 → 0.1.14

package/README.md

@@ -24,6 +24,8 @@
 
 > **Based on [ccstatusline](https://github.com/sirmalloc/ccstatusline)** by [@sirmalloc](https://github.com/sirmalloc) — the excellent customizable statusline for Claude Code CLI. This project adapts its architecture, TUI, and rendering engine for the GitHub Copilot CLI payload format. Huge thanks to Matthew Breedlove for the original work.
 
+> **Requirements:** GitHub Copilot CLI **≥ 1.0.35** for live context widgets (`Context %`, `Context Bar`, `Context Length`, `Remaining Tokens`). Older versions miss the underlying `current_context_tokens` / `displayed_context_limit` fields and these widgets render blank.
+
 ---
 
 ## 📚 Table of Contents
@@ -274,7 +276,7 @@ Copilot CLI spawns your status line command on every state change, passing sessi
 |--------|------|-------------|
 | Context Length | `context-length` | Context window size |
 | Context % | `context-percentage` | Percentage of context window used or remaining |
-| Context % (Usable) | `context-percentage-usable` | Percentage of usable context (80% of max) |
+| Context % | `context-percentage` | Live context % from Copilot (`current_context_used_percentage`) |
 | Context Bar | `context-bar` | Visual progress bar for context usage |
 | Remaining Tokens | `remaining-tokens` | Absolute remaining context tokens |
 

package/dist/copilot-statusline.js

@@ -52913,7 +52913,7 @@ import { execSync as execSync3 } from "child_process";
 import * as fs5 from "fs";
 import * as path4 from "path";
 var __dirname = "/Users/ts/workspace/active/statusline/copilot_statusline/src/utils";
-var PACKAGE_VERSION = "0.1.12";
+var PACKAGE_VERSION = "0.1.14";
 function getPackageVersion() {
   if (/^\d+\.\d+\.\d+/.test(PACKAGE_VERSION)) {
     return PACKAGE_VERSION;
@@ -54074,15 +54074,14 @@ function getContextWindowMetrics(data) {
   const contextWindow = data?.context_window;
   const empty = {
     windowSize: null,
-    usedTokens: null,
-    contextLengthTokens: null,
-    usedPercentage: null,
-    remainingPercentage: null,
+    displayedContextLimit: null,
+    currentContextTokens: null,
+    currentContextUsedPercentage: null,
     totalInputTokens: null,
     totalOutputTokens: null,
     cachedTokens: null,
     totalTokens: null,
-    remainingTokens: null,
+    reasoningTokens: null,
     lastCallInputTokens: null,
     lastCallOutputTokens: null,
     cacheReadTokens: null,
@@ -54093,45 +54092,30 @@ function getContextWindowMetrics(data) {
   }
   const rawWindowSize = toFiniteNonNegativeNumber(contextWindow.context_window_size);
   const windowSize = rawWindowSize !== null && rawWindowSize > 0 ? rawWindowSize : null;
+  const rawDisplayedLimit = toFiniteNonNegativeNumber(contextWindow.displayed_context_limit);
+  const displayedContextLimit = rawDisplayedLimit !== null && rawDisplayedLimit > 0 ? rawDisplayedLimit : null;
+  const currentContextTokens = toFiniteNonNegativeNumber(contextWindow.current_context_tokens);
+  const rawCurrentPct = toFiniteNonNegativeNumber(contextWindow.current_context_used_percentage);
+  const currentContextUsedPercentage = rawCurrentPct !== null ? clampPercentage(rawCurrentPct) : null;
+  const reasoningTokens = toFiniteNonNegativeNumber(contextWindow.total_reasoning_tokens);
   const totalInputTokens = toFiniteNonNegativeNumber(contextWindow.total_input_tokens);
   const totalOutputTokens = toFiniteNonNegativeNumber(contextWindow.total_output_tokens);
   const cacheReadTokens = toFiniteNonNegativeNumber(contextWindow.total_cache_read_tokens);
   const cacheWriteTokens = toFiniteNonNegativeNumber(contextWindow.total_cache_write_tokens);
-  const remainingTokens = toFiniteNonNegativeNumber(contextWindow.remaining_tokens);
   const lastCallInputTokens = toFiniteNonNegativeNumber(contextWindow.last_call_input_tokens);
   const lastCallOutputTokens = toFiniteNonNegativeNumber(contextWindow.last_call_output_tokens);
   const cachedTokens = cacheReadTokens !== null || cacheWriteTokens !== null ? (cacheReadTokens ?? 0) + (cacheWriteTokens ?? 0) : null;
-  let currentUsageTotalTokens = null;
-  let contextLengthTokens = null;
-  if (contextWindow.current_usage && typeof contextWindow.current_usage === "object") {
-    const usage = contextWindow.current_usage;
-    const inputTokens = toFiniteNonNegativeNumber(usage.input_tokens) ?? 0;
-    const outputTokens = toFiniteNonNegativeNumber(usage.output_tokens) ?? 0;
-    const cacheCreationTokens = toFiniteNonNegativeNumber(usage.cache_creation_input_tokens) ?? 0;
-    const cacheReadInputTokens = toFiniteNonNegativeNumber(usage.cache_read_input_tokens) ?? 0;
-    currentUsageTotalTokens = inputTokens + outputTokens + cacheCreationTokens + cacheReadInputTokens;
-    contextLengthTokens = inputTokens + cacheCreationTokens + cacheReadInputTokens;
-  }
-  const rawUsedPercentage = toFiniteNonNegativeNumber(contextWindow.used_percentage);
-  const rawRemainingPercentage = toFiniteNonNegativeNumber(contextWindow.remaining_percentage);
-  const usedTokensFromRemaining = windowSize !== null && remainingTokens !== null ? windowSize - remainingTokens : null;
-  const usedTokensFromPercentage = rawUsedPercentage !== null && windowSize !== null ? rawUsedPercentage / 100 * windowSize : null;
-  const usedTokens = usedTokensFromRemaining ?? usedTokensFromPercentage ?? currentUsageTotalTokens;
-  const usedPercentage = rawUsedPercentage !== null ? clampPercentage(rawUsedPercentage) : usedTokens !== null && windowSize !== null && windowSize > 0 ? clampPercentage(usedTokens / windowSize * 100) : null;
-  const remainingPercentage = rawRemainingPercentage !== null ? clampPercentage(rawRemainingPercentage) : usedPercentage !== null ? 100 - usedPercentage : null;
-  const totalTokens = currentUsageTotalTokens ?? toFiniteNonNegativeNumber(contextWindow.total_tokens) ?? (totalInputTokens !== null && totalOutputTokens !== null ? totalInputTokens + totalOutputTokens : null);
-  const contextLengthFromAuthoritative = usedTokensFromRemaining ?? usedTokensFromPercentage;
+  const totalTokens = toFiniteNonNegativeNumber(contextWindow.total_tokens) ?? (totalInputTokens !== null && totalOutputTokens !== null ? totalInputTokens + totalOutputTokens : null);
   return {
     windowSize,
-    usedTokens,
-    contextLengthTokens: contextLengthFromAuthoritative ?? contextLengthTokens ?? usedTokens,
-    usedPercentage,
-    remainingPercentage,
+    displayedContextLimit,
+    currentContextTokens,
+    currentContextUsedPercentage,
     totalInputTokens,
     totalOutputTokens,
     cachedTokens,
     totalTokens,
-    remainingTokens,
+    reasoningTokens,
     lastCallInputTokens,
     lastCallOutputTokens,
     cacheReadTokens,
@@ -54255,6 +54239,40 @@ class TokensCachedWidget {
     return true;
   }
 }
+// src/widgets/TokensReasoning.ts
+class TokensReasoningWidget {
+  getDefaultColor() {
+    return "magenta";
+  }
+  getDescription() {
+    return "Shows total reasoning (thinking) tokens consumed this session";
+  }
+  getDisplayName() {
+    return "Tokens Reasoning";
+  }
+  getCategory() {
+    return "Tokens";
+  }
+  getEditorDisplay(_item) {
+    return { displayText: this.getDisplayName() };
+  }
+  render(item, context, _settings) {
+    if (context.isPreview) {
+      return formatRawOrLabeledValue(item, "Reasoning: ", "1.2k");
+    }
+    const metrics = getContextWindowMetrics(context.data);
+    if (metrics.reasoningTokens !== null) {
+      return formatRawOrLabeledValue(item, "Reasoning: ", formatTokens(metrics.reasoningTokens));
+    }
+    return null;
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors(_item) {
+    return true;
+  }
+}
 // src/widgets/TokensTotal.ts
 class TokensTotalWidget {
   getDefaultColor() {
@@ -54295,7 +54313,7 @@ class ContextLengthWidget {
     return "brightBlack";
   }
   getDescription() {
-    return "Shows context window size";
+    return "Shows current context length in tokens (live)";
   }
   getDisplayName() {
     return "Context Length";
@@ -54308,11 +54326,11 @@ class ContextLengthWidget {
   }
   render(item, context, settings) {
     if (context.isPreview) {
-      return formatRawOrLabeledValue(item, "Ctx: ", "200k");
+      return formatRawOrLabeledValue(item, "Ctx: ", "33k");
     }
     const metrics = getContextWindowMetrics(context.data);
-    if (metrics.windowSize !== null) {
-      return formatRawOrLabeledValue(item, "Ctx: ", formatTokens(metrics.windowSize));
+    if (metrics.currentContextTokens !== null) {
+      return formatRawOrLabeledValue(item, "Ctx: ", formatTokens(metrics.currentContextTokens));
     }
     return null;
   }
@@ -54323,6 +54341,41 @@ class ContextLengthWidget {
     return true;
   }
 }
+// src/widgets/ContextWindow.ts
+class ContextWindowWidget {
+  getDefaultColor() {
+    return "brightBlack";
+  }
+  getDescription() {
+    return "Shows the model's context window size (max tokens)";
+  }
+  getDisplayName() {
+    return "Context Window";
+  }
+  getCategory() {
+    return "Context";
+  }
+  getEditorDisplay(_item) {
+    return { displayText: this.getDisplayName() };
+  }
+  render(item, context, _settings) {
+    if (context.isPreview) {
+      return formatRawOrLabeledValue(item, "Window: ", "1000k");
+    }
+    const metrics = getContextWindowMetrics(context.data);
+    const size2 = metrics.displayedContextLimit ?? metrics.windowSize;
+    if (size2 !== null) {
+      return formatRawOrLabeledValue(item, "Window: ", formatTokens(size2));
+    }
+    return null;
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors(_item) {
+    return true;
+  }
+}
 // src/widgets/shared/editor-display.ts
 function makeModifierText(modifiers) {
   return modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined;
@@ -54388,8 +54441,9 @@ class ContextPercentageWidget {
       return formatRawOrLabeledValue(item, "Ctx: ", previewValue);
     }
     const metrics = getContextWindowMetrics(context.data);
-    if (metrics.usedPercentage !== null) {
-      const displayPercentage = isInverse ? 100 - metrics.usedPercentage : metrics.usedPercentage;
+    if (metrics.currentContextUsedPercentage !== null) {
+      const pct = metrics.currentContextUsedPercentage;
+      const displayPercentage = isInverse ? 100 - pct : pct;
       return formatRawOrLabeledValue(item, "Ctx: ", `${displayPercentage.toFixed(1)}%`);
     }
     return null;
@@ -54406,79 +54460,6 @@ class ContextPercentageWidget {
     return true;
   }
 }
-// src/utils/model-context.ts
-var DEFAULT_CONTEXT_WINDOW_SIZE = 200000;
-var USABLE_CONTEXT_RATIO = 0.8;
-function toValidWindowSize(value) {
-  if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) {
-    return null;
-  }
-  return value;
-}
-function getContextConfig(contextWindowSize) {
-  const statusWindowSize = toValidWindowSize(contextWindowSize);
-  if (statusWindowSize !== null) {
-    return {
-      maxTokens: statusWindowSize,
-      usableTokens: Math.floor(statusWindowSize * USABLE_CONTEXT_RATIO)
-    };
-  }
-  return {
-    maxTokens: DEFAULT_CONTEXT_WINDOW_SIZE,
-    usableTokens: Math.floor(DEFAULT_CONTEXT_WINDOW_SIZE * USABLE_CONTEXT_RATIO)
-  };
-}
-
-// src/widgets/ContextPercentageUsable.ts
-class ContextPercentageUsableWidget {
-  getDefaultColor() {
-    return "blue";
-  }
-  getDescription() {
-    return "Shows percentage of usable context window used or remaining (80% of total)";
-  }
-  getDisplayName() {
-    return "Context % (Usable)";
-  }
-  getCategory() {
-    return "Context";
-  }
-  getEditorDisplay(item) {
-    return {
-      displayText: this.getDisplayName(),
-      modifierText: getContextInverseModifierText(item)
-    };
-  }
-  handleEditorAction(action, item) {
-    return handleContextInverseAction(action, item);
-  }
-  render(item, context, settings) {
-    const isInverse = isContextInverse(item);
-    if (context.isPreview) {
-      const previewValue = isInverse ? "88.4%" : "11.6%";
-      return formatRawOrLabeledValue(item, "Usable: ", previewValue);
-    }
-    const metrics = getContextWindowMetrics(context.data);
-    if (metrics.usedTokens !== null && metrics.windowSize !== null) {
-      const contextConfig = getContextConfig(metrics.windowSize);
-      const usablePercent = Math.min(100, metrics.usedTokens / contextConfig.usableTokens * 100);
-      const displayPercentage = isInverse ? 100 - usablePercent : usablePercent;
-      return formatRawOrLabeledValue(item, "Usable: ", `${displayPercentage.toFixed(1)}%`);
-    }
-    return null;
-  }
-  getCustomKeybinds() {
-    return [
-      { key: "u", label: "(u)sed/remaining", action: "toggle-inverse" }
-    ];
-  }
-  supportsRawValue() {
-    return true;
-  }
-  supportsColors(item) {
-    return true;
-  }
-}
 // src/utils/progress-bar.ts
 var PROGRESS_BAR_FG_RESTORE = "\x1B[0;999;0q";
 function makeUsageProgressBar(percent, width = 15, powerlineMode = false) {
@@ -54544,13 +54525,13 @@ class ContextBarWidget {
       return item.rawValue ? previewDisplay : `Context: ${previewDisplay}`;
     }
     const contextWindowMetrics = getContextWindowMetrics(context.data);
-    const total = contextWindowMetrics.windowSize;
-    const used = contextWindowMetrics.contextLengthTokens;
-    if (used === null || total === null || total <= 0) {
+    const total = contextWindowMetrics.displayedContextLimit ?? contextWindowMetrics.windowSize;
+    const used = contextWindowMetrics.currentContextTokens;
+    const upstreamPct = contextWindowMetrics.currentContextUsedPercentage;
+    if (used === null || total === null || total <= 0 || upstreamPct === null) {
       return null;
     }
-    const percent = used / total * 100;
-    const clampedPercent = Math.max(0, Math.min(100, percent));
+    const clampedPercent = Math.max(0, Math.min(100, upstreamPct));
     const usedK = Math.round(used / 1000);
     const totalK = Math.round(total / 1000);
     const display = `${makeUsageProgressBar(clampedPercent, barWidth, powerlineMode)} ${usedK}k/${totalK}k (${Math.round(clampedPercent)}%)`;
@@ -54810,7 +54791,7 @@ class RemainingTokensWidget {
     return "brightBlack";
   }
   getDescription() {
-    return "Shows absolute remaining context tokens";
+    return "Shows remaining tokens in current context (displayed_context_limit − current_context_tokens)";
   }
   getDisplayName() {
     return "Remaining Tokens";
@@ -54826,8 +54807,10 @@ class RemainingTokensWidget {
       return formatRawOrLabeledValue(item, "Remaining: ", "164.8k");
     }
     const metrics = getContextWindowMetrics(context.data);
-    if (metrics.remainingTokens !== null) {
-      return formatRawOrLabeledValue(item, "Remaining: ", formatTokens(metrics.remainingTokens));
+    const limit = metrics.displayedContextLimit ?? metrics.windowSize;
+    if (limit !== null && metrics.currentContextTokens !== null) {
+      const remaining = Math.max(0, limit - metrics.currentContextTokens);
+      return formatRawOrLabeledValue(item, "Remaining: ", formatTokens(remaining));
     }
     return null;
   }
@@ -58151,10 +58134,11 @@ var WIDGET_MANIFEST = [
   { type: "tokens-input", create: () => new TokensInputWidget },
   { type: "tokens-output", create: () => new TokensOutputWidget },
   { type: "tokens-cached", create: () => new TokensCachedWidget },
+  { type: "tokens-reasoning", create: () => new TokensReasoningWidget },
   { type: "tokens-total", create: () => new TokensTotalWidget },
   { type: "context-length", create: () => new ContextLengthWidget },
+  { type: "context-window", create: () => new ContextWindowWidget },
   { type: "context-percentage", create: () => new ContextPercentageWidget },
-  { type: "context-percentage-usable", create: () => new ContextPercentageUsableWidget },
   { type: "context-bar", create: () => new ContextBarWidget },
   { type: "session-clock", create: () => new SessionClockWidget },
   { type: "premium-requests", create: () => new PremiumRequestsWidget },
@@ -62043,8 +62027,8 @@ function advanceGlobalPowerlineThemeIndex(currentIndex, entries) {
 // src/utils/context-percentage.ts
 function calculateContextPercentage(context) {
   const contextWindowMetrics = getContextWindowMetrics(context.data);
-  if (contextWindowMetrics.usedPercentage !== null) {
-    return contextWindowMetrics.usedPercentage;
+  if (contextWindowMetrics.currentContextUsedPercentage !== null) {
+    return contextWindowMetrics.currentContextUsedPercentage;
   }
   return 0;
 }
@@ -63422,6 +63406,7 @@ var CopilotPayloadSchema = exports_external.object({
     reasoning_effort: exports_external.string().nullable().optional()
   }).optional(),
   workspace: exports_external.object({ current_dir: exports_external.string().optional() }).optional(),
+  remote: exports_external.object({ connected: exports_external.boolean().optional() }).optional(),
   version: exports_external.string().optional(),
   cost: exports_external.object({
     total_api_duration_ms: exports_external.number().optional(),
@@ -63436,12 +63421,16 @@ var CopilotPayloadSchema = exports_external.object({
     total_output_tokens: exports_external.number().optional(),
     total_cache_read_tokens: exports_external.number().optional(),
     total_cache_write_tokens: exports_external.number().optional(),
+    total_reasoning_tokens: exports_external.number().optional(),
     total_tokens: exports_external.number().optional(),
     used_percentage: OptionalNumber,
     remaining_percentage: OptionalNumber,
     remaining_tokens: OptionalNumber,
     last_call_input_tokens: exports_external.number().optional(),
     last_call_output_tokens: exports_external.number().optional(),
+    current_context_tokens: OptionalNumber,
+    current_context_used_percentage: OptionalNumber,
+    displayed_context_limit: OptionalNumber,
     current_usage: exports_external.object({
       input_tokens: exports_external.number().optional(),
       output_tokens: exports_external.number().optional(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "copilot-statusline",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "A customizable status line formatter for GitHub Copilot CLI — based on ccstatusline",
   "module": "src/copilot-statusline.ts",
   "type": "module",