copilot-statusline 0.1.14 → 0.1.16

package/README.md

@@ -264,7 +264,8 @@ Copilot CLI spawns your status line command on every state change, passing sessi
 |--------|------|-------------|
 | Tokens Input | `tokens-input` | Total input tokens |
 | Tokens Output | `tokens-output` | Total output tokens |
-| Tokens Cached | `tokens-cached` | Total cached tokens (read + write) |
+| Tokens Cached | `tokens-cached` | Cached tokens from the most recent API call (`current_usage.cache_creation_input_tokens + cache_read_input_tokens`; rendered as `Last Cache:`) |
+| Tokens Reasoning | `tokens-reasoning` | Total reasoning (thinking) tokens consumed |
 | Tokens Total | `tokens-total` | Total tokens |
 | Last Call Input | `last-call-input` | Input tokens from most recent API call |
 | Last Call Output | `last-call-output` | Output tokens from most recent API call |
@@ -274,11 +275,11 @@ Copilot CLI spawns your status line command on every state change, passing sessi
 ### Context
 | Widget | Type | Description |
 |--------|------|-------------|
-| Context Length | `context-length` | Context window size |
-| Context % | `context-percentage` | Percentage of context window used or remaining |
+| Context Length | `context-length` | Current context length in tokens (live, from `current_context_tokens`) |
+| Context Window | `context-window` | Model's context window size (max tokens, from `displayed_context_limit ?? context_window_size`) |
 | 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 |
+| Context Bar | `context-bar` | Visual progress bar for live context usage |
+| Remaining Tokens | `remaining-tokens` | Live remaining tokens (`displayed_context_limit − current_context_tokens`) |
 
 ### Git
 | Widget | Type | Description |
@@ -289,8 +290,12 @@ Copilot CLI spawns your status line command on every state change, passing sessi
 | Git Deletions | `git-deletions` | Uncommitted deletions only |
 | Git Status | `git-status` | Staged/unstaged/untracked/conflicts indicators |
 | Git Staged | `git-staged` | Staged changes indicator |
+| Git Staged Files | `git-staged-files` | Count of staged files (`S:3`, raw: `3`) |
 | Git Unstaged | `git-unstaged` | Unstaged changes indicator |
+| Git Unstaged Files | `git-unstaged-files` | Count of unstaged tracked files (`M:2`, raw: `2`) |
 | Git Untracked | `git-untracked` | Untracked files indicator |
+| Git Untracked Files | `git-untracked-files` | Count of untracked files (`?:1`, raw: `1`) |
+| Git Clean Status | `git-clean-status` | Working tree clean/dirty status (`✓`/`✗`, raw: `clean`/`dirty`) |
 | Git Conflicts | `git-conflicts` | Merge conflict count |
 | Git Ahead/Behind | `git-ahead-behind` | Commits ahead/behind upstream |
 | Git SHA | `git-sha` | Short commit hash |
@@ -303,6 +308,8 @@ Copilot CLI spawns your status line command on every state change, passing sessi
 | Git Upstream Repo | `git-upstream-repo` | Upstream remote repo name |
 | Git Upstream Owner/Repo | `git-upstream-owner-repo` | Upstream `owner/repo` |
 | Git Is Fork | `git-is-fork` | Fork detection indicator |
+| Git Worktree | `git-worktree` | Current git worktree name (probes `git rev-parse --git-dir`) |
+| Git Worktree Mode | `git-worktree-mode` | `⎇` indicator when current dir is a linked worktree |
 
 ### System
 | Widget | Type | Description |
@@ -339,7 +346,8 @@ These widgets are exclusive to copilot-statusline and not available in ccstatusl
 | Premium Rate | `premium-rate` | Burn rate in requests/minute |
 | Last Call Input | `last-call-input` | Input tokens from the most recent API call |
 | Last Call Output | `last-call-output` | Output tokens from the most recent API call |
-| Remaining Tokens | `remaining-tokens` | Absolute remaining context window tokens |
+| Remaining Tokens | `remaining-tokens` | Live remaining tokens (`displayed_context_limit − current_context_tokens`) |
+| Tokens Reasoning | `tokens-reasoning` | Total reasoning (thinking) tokens consumed |
 | Cache Read Tokens | `cache-read-tokens` | Total cache read tokens |
 | Cache Write Tokens | `cache-write-tokens` | Total cache write tokens |
 
@@ -366,9 +374,11 @@ Widget-specific shortcuts:
 | Widget | Key | Action |
 |--------|-----|--------|
 | Git widgets | `h` | Toggle hide `no git` output |
+| Count widgets | `z` | Toggle hide when rendered value is zero |
 | Git Branch | `l` | Toggle GitHub link |
 | Context % widgets | `u` | Toggle used/remaining display |
-| Context Bar | `p` | Cycle bar style (short/full) |
+| Context % widgets | `p` | Cycle numeric/short bar display |
+| Context Bar | `p` | Cycle bar style (medium/full/short/short-only) |
 | Current Working Dir | `h` | Toggle `~` home abbreviation |
 | Current Working Dir | `s` | Edit segment limit |
 | Current Working Dir | `f` | Toggle fish-style path |
@@ -620,4 +630,4 @@ This project includes substantial portions of code from [ccstatusline](https://g
 [![npm downloads](https://img.shields.io/npm/dm/copilot-statusline.svg)](https://www.npmjs.com/package/copilot-statusline)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
 
-</div>
+</div>

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.14";
+var PACKAGE_VERSION = "0.1.16";
 function getPackageVersion() {
   if (/^\d+\.\d+\.\d+/.test(PACKAGE_VERSION)) {
     return PACKAGE_VERSION;
@@ -54104,7 +54104,8 @@ function getContextWindowMetrics(data) {
   const cacheWriteTokens = toFiniteNonNegativeNumber(contextWindow.total_cache_write_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;
+  const currentUsage = contextWindow.current_usage;
+  const cachedTokens = currentUsage ? (toFiniteNonNegativeNumber(currentUsage.cache_creation_input_tokens) ?? 0) + (toFiniteNonNegativeNumber(currentUsage.cache_read_input_tokens) ?? 0) : null;
   const totalTokens = toFiniteNonNegativeNumber(contextWindow.total_tokens) ?? (totalInputTokens !== null && totalOutputTokens !== null ? totalInputTokens + totalOutputTokens : null);
   return {
     windowSize,
@@ -54211,7 +54212,7 @@ class TokensCachedWidget {
     return "brightBlack";
   }
   getDescription() {
-    return "Shows total cached tokens (read + write) for the current session";
+    return "Shows cached tokens for the latest API call (cache read + cache creation)";
   }
   getDisplayName() {
     return "Tokens Cached";
@@ -54224,11 +54225,11 @@ class TokensCachedWidget {
   }
   render(item, context, settings) {
     if (context.isPreview) {
-      return formatRawOrLabeledValue(item, "Cached: ", "8.5k");
+      return formatRawOrLabeledValue(item, "Last Cache: ", "8.5k");
     }
     const metrics = getContextWindowMetrics(context.data);
     if (metrics.cachedTokens !== null) {
-      return formatRawOrLabeledValue(item, "Cached: ", formatTokens(metrics.cachedTokens));
+      return formatRawOrLabeledValue(item, "Last Cache: ", formatTokens(metrics.cachedTokens));
     }
     return null;
   }
@@ -54239,6 +54240,49 @@ class TokensCachedWidget {
     return true;
   }
 }
+// src/widgets/shared/editor-display.ts
+function makeModifierText(modifiers) {
+  return modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined;
+}
+
+// src/widgets/shared/metadata.ts
+function isMetadataFlagEnabled(item, key) {
+  return item.metadata?.[key] === "true";
+}
+function toggleMetadataFlag(item, key) {
+  return {
+    ...item,
+    metadata: {
+      ...item.metadata,
+      [key]: (!isMetadataFlagEnabled(item, key)).toString()
+    }
+  };
+}
+
+// src/widgets/shared/hide-when-zero.ts
+var HIDE_WHEN_ZERO_KEY = "hideWhenZero";
+var TOGGLE_HIDE_WHEN_ZERO_ACTION = "toggle-hide-when-zero";
+var HIDE_WHEN_ZERO_KEYBIND = {
+  key: "z",
+  label: "(z) hide when zero",
+  action: TOGGLE_HIDE_WHEN_ZERO_ACTION
+};
+function isHideWhenZeroEnabled(item) {
+  return isMetadataFlagEnabled(item, HIDE_WHEN_ZERO_KEY);
+}
+function getHideWhenZeroLabel(item) {
+  return isHideWhenZeroEnabled(item) ? "hide when zero" : undefined;
+}
+function handleToggleHideWhenZeroAction(action, item) {
+  if (action !== TOGGLE_HIDE_WHEN_ZERO_ACTION) {
+    return null;
+  }
+  return toggleMetadataFlag(item, HIDE_WHEN_ZERO_KEY);
+}
+function getHideWhenZeroKeybinds() {
+  return [HIDE_WHEN_ZERO_KEYBIND];
+}
+
 // src/widgets/TokensReasoning.ts
 class TokensReasoningWidget {
   getDefaultColor() {
@@ -54253,8 +54297,14 @@ class TokensReasoningWidget {
   getCategory() {
     return "Tokens";
   }
-  getEditorDisplay(_item) {
-    return { displayText: this.getDisplayName() };
+  getEditorDisplay(item) {
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: makeModifierText([getHideWhenZeroLabel(item)].filter((label) => label !== undefined))
+    };
+  }
+  handleEditorAction(action, item) {
+    return handleToggleHideWhenZeroAction(action, item);
   }
   render(item, context, _settings) {
     if (context.isPreview) {
@@ -54262,10 +54312,16 @@ class TokensReasoningWidget {
     }
     const metrics = getContextWindowMetrics(context.data);
     if (metrics.reasoningTokens !== null) {
+      if (metrics.reasoningTokens === 0 && isHideWhenZeroEnabled(item)) {
+        return null;
+      }
       return formatRawOrLabeledValue(item, "Reasoning: ", formatTokens(metrics.reasoningTokens));
     }
     return null;
   }
+  getCustomKeybinds() {
+    return getHideWhenZeroKeybinds();
+  }
   supportsRawValue() {
     return true;
   }
@@ -54376,33 +54432,14 @@ class ContextWindowWidget {
     return true;
   }
 }
-// src/widgets/shared/editor-display.ts
-function makeModifierText(modifiers) {
-  return modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined;
-}
-
-// src/widgets/shared/metadata.ts
-function isMetadataFlagEnabled(item, key) {
-  return item.metadata?.[key] === "true";
-}
-function toggleMetadataFlag(item, key) {
-  return {
-    ...item,
-    metadata: {
-      ...item.metadata,
-      [key]: (!isMetadataFlagEnabled(item, key)).toString()
-    }
-  };
-}
-
 // src/widgets/shared/context-inverse.ts
 var INVERSE_KEY = "inverse";
 var TOGGLE_INVERSE_ACTION = "toggle-inverse";
 function isContextInverse(item) {
   return isMetadataFlagEnabled(item, INVERSE_KEY);
 }
-function getContextInverseModifierText(item) {
-  return makeModifierText(isContextInverse(item) ? ["remaining"] : []);
+function getContextInverseLabel(item) {
+  return isContextInverse(item) ? "remaining" : undefined;
 }
 function handleContextInverseAction(action, item) {
   if (action !== TOGGLE_INVERSE_ACTION) {
@@ -54411,6 +54448,64 @@ function handleContextInverseAction(action, item) {
   return toggleMetadataFlag(item, INVERSE_KEY);
 }
 
+// src/widgets/shared/context-slider.ts
+var SLIDER_WIDTH = 10;
+var SLIDER_TOGGLE_KEYBIND = { key: "p", label: "(p)rogress toggle", action: "toggle-slider" };
+function makeSliderBar(percent, width = SLIDER_WIDTH) {
+  const clamped = Math.max(0, Math.min(100, percent));
+  const filled = Math.round(clamped / 100 * width);
+  return "▓".repeat(filled) + "░".repeat(width - filled);
+}
+function getContextSliderMode(item) {
+  const mode = item.metadata?.display;
+  if (mode === "slider" || mode === "slider-only") {
+    return mode;
+  }
+  return "none";
+}
+function cycleContextSliderMode(item) {
+  const currentMode = getContextSliderMode(item);
+  const nextMode = currentMode === "none" ? "slider" : currentMode === "slider" ? "slider-only" : "none";
+  if (nextMode === "none") {
+    const nextMetadata = { ...item.metadata ?? {} };
+    delete nextMetadata.display;
+    return {
+      ...item,
+      metadata: Object.keys(nextMetadata).length > 0 ? nextMetadata : undefined
+    };
+  }
+  return {
+    ...item,
+    metadata: {
+      ...item.metadata ?? {},
+      display: nextMode
+    }
+  };
+}
+function renderContextSlider(mode, percent) {
+  if (mode === "none") {
+    return null;
+  }
+  const slider = makeSliderBar(percent);
+  if (mode === "slider") {
+    return `${slider} ${percent.toFixed(1)}%`;
+  }
+  return slider;
+}
+function getContextSliderLabel(item) {
+  const mode = getContextSliderMode(item);
+  if (mode === "slider") {
+    return "short bar";
+  }
+  if (mode === "slider-only") {
+    return "short bar only";
+  }
+  return;
+}
+function getContextSliderKeybinds() {
+  return [SLIDER_TOGGLE_KEYBIND];
+}
+
 // src/widgets/ContextPercentage.ts
 class ContextPercentageWidget {
   getDefaultColor() {
@@ -54426,31 +54521,44 @@ class ContextPercentageWidget {
     return "Context";
   }
   getEditorDisplay(item) {
+    const labels = [
+      getContextInverseLabel(item),
+      getContextSliderLabel(item)
+    ].filter((label) => label !== undefined);
     return {
       displayText: this.getDisplayName(),
-      modifierText: getContextInverseModifierText(item)
+      modifierText: makeModifierText(labels)
     };
   }
   handleEditorAction(action, item) {
+    if (action === "toggle-slider") {
+      return cycleContextSliderMode(item);
+    }
     return handleContextInverseAction(action, item);
   }
   render(item, context, settings) {
     const isInverse = isContextInverse(item);
+    const label = isInverse ? "Ctx Left: " : "Ctx Used: ";
+    const sliderMode = getContextSliderMode(item);
+    const formatPercentage = (displayPercentage) => {
+      const sliderDisplay = renderContextSlider(sliderMode, displayPercentage);
+      return formatRawOrLabeledValue(item, label, sliderDisplay ?? `${displayPercentage.toFixed(1)}%`);
+    };
     if (context.isPreview) {
-      const previewValue = isInverse ? "90.7%" : "9.3%";
-      return formatRawOrLabeledValue(item, "Ctx: ", previewValue);
+      return formatPercentage(isInverse ? 90.7 : 9.3);
     }
     const metrics = getContextWindowMetrics(context.data);
     if (metrics.currentContextUsedPercentage !== null) {
       const pct = metrics.currentContextUsedPercentage;
       const displayPercentage = isInverse ? 100 - pct : pct;
-      return formatRawOrLabeledValue(item, "Ctx: ", `${displayPercentage.toFixed(1)}%`);
+      return formatPercentage(displayPercentage);
     }
     return null;
   }
   getCustomKeybinds() {
     return [
-      { key: "u", label: "(u)sed/remaining", action: "toggle-inverse" }
+      { key: "u", label: "(u)sed/remaining", action: "toggle-inverse" },
+      ...getContextSliderKeybinds()
     ];
   }
   supportsRawValue() {
@@ -54474,8 +54582,27 @@ function makeUsageProgressBar(percent, width = 15, powerlineMode = false) {
 }
 
 // src/widgets/ContextBar.ts
+var DISPLAY_MODE_CYCLE = {
+  "progress-short": "progress",
+  progress: "slider",
+  slider: "slider-only",
+  "slider-only": "progress-short"
+};
+var DISPLAY_MODE_LABELS = {
+  "progress-short": "medium bar",
+  progress: "",
+  slider: "short bar",
+  "slider-only": "short bar only"
+};
 function getDisplayMode(item) {
-  return item.metadata?.display === "progress" ? "progress" : "progress-short";
+  const mode = item.metadata?.display;
+  if (mode === "progress" || mode === "slider" || mode === "slider-only") {
+    return mode;
+  }
+  return "progress-short";
+}
+function isSliderMode(mode) {
+  return mode === "slider" || mode === "slider-only";
 }
 
 class ContextBarWidget {
@@ -54492,22 +54619,17 @@ class ContextBarWidget {
     return "Context";
   }
   getEditorDisplay(item) {
-    const mode = getDisplayMode(item);
-    const modifiers = [];
-    if (mode === "progress-short") {
-      modifiers.push("short bar");
-    }
+    const label = DISPLAY_MODE_LABELS[getDisplayMode(item)];
     return {
       displayText: this.getDisplayName(),
-      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+      modifierText: label ? `(${label})` : undefined
     };
   }
   handleEditorAction(action, item) {
     if (action !== "toggle-progress") {
       return null;
     }
-    const currentMode = getDisplayMode(item);
-    const nextMode = currentMode === "progress-short" ? "progress" : "progress-short";
+    const nextMode = DISPLAY_MODE_CYCLE[getDisplayMode(item)];
     return {
       ...item,
       metadata: {
@@ -54521,6 +54643,11 @@ class ContextBarWidget {
     const barWidth = displayMode === "progress" ? 32 : 16;
     const powerlineMode = settings.powerline.enabled;
     if (context.isPreview) {
+      if (isSliderMode(displayMode)) {
+        const slider = renderContextSlider("slider-only", 25);
+        const sliderDisplay = displayMode === "slider" ? `${slider} 50k/200k (25%)` : slider;
+        return item.rawValue ? sliderDisplay : `Context: ${sliderDisplay}`;
+      }
       const previewDisplay = `${makeUsageProgressBar(25, barWidth, powerlineMode)} 50k/200k (25%)`;
       return item.rawValue ? previewDisplay : `Context: ${previewDisplay}`;
     }
@@ -54534,6 +54661,11 @@ class ContextBarWidget {
     const clampedPercent = Math.max(0, Math.min(100, upstreamPct));
     const usedK = Math.round(used / 1000);
     const totalK = Math.round(total / 1000);
+    if (isSliderMode(displayMode)) {
+      const slider = renderContextSlider("slider-only", clampedPercent);
+      const sliderDisplay = displayMode === "slider" ? `${slider} ${usedK}k/${totalK}k (${Math.round(clampedPercent)}%)` : slider;
+      return item.rawValue ? sliderDisplay : `Context: ${sliderDisplay}`;
+    }
     const display = `${makeUsageProgressBar(clampedPercent, barWidth, powerlineMode)} ${usedK}k/${totalK}k (${Math.round(clampedPercent)}%)`;
     return item.rawValue ? display : `Context: ${display}`;
   }
@@ -54615,7 +54747,13 @@ class PremiumRequestsWidget {
     return "Session";
   }
   getEditorDisplay(item) {
-    return { displayText: this.getDisplayName() };
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: makeModifierText([getHideWhenZeroLabel(item)].filter((label) => label !== undefined))
+    };
+  }
+  handleEditorAction(action, item) {
+    return handleToggleHideWhenZeroAction(action, item);
   }
   render(item, context, settings) {
     if (context.isPreview) {
@@ -54623,10 +54761,16 @@ class PremiumRequestsWidget {
     }
     const requests = context.data?.cost?.total_premium_requests;
     if (typeof requests === "number") {
+      if (requests === 0 && isHideWhenZeroEnabled(item)) {
+        return null;
+      }
       return formatRawOrLabeledValue(item, "Reqs: ", String(requests));
     }
     return null;
   }
+  getCustomKeybinds() {
+    return getHideWhenZeroKeybinds();
+  }
   supportsRawValue() {
     return true;
   }
@@ -54652,7 +54796,13 @@ class ApiCallsWidget {
     return "Session";
   }
   getEditorDisplay(item) {
-    return { displayText: this.getDisplayName() };
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: makeModifierText([getHideWhenZeroLabel(item)].filter((label) => label !== undefined))
+    };
+  }
+  handleEditorAction(action, item) {
+    return handleToggleHideWhenZeroAction(action, item);
   }
   render(item, context, settings) {
     if (context.isPreview) {
@@ -54665,10 +54815,16 @@ class ApiCallsWidget {
     const parsed = parseDisplayName(context.data?.model?.display_name);
     if (parsed.multiplierValue && parsed.multiplierValue > 0) {
       const apiCalls = Math.round(requests / parsed.multiplierValue);
+      if (apiCalls === 0 && isHideWhenZeroEnabled(item)) {
+        return null;
+      }
       return formatRawOrLabeledValue(item, "Calls: ", String(apiCalls));
     }
     return null;
   }
+  getCustomKeybinds() {
+    return getHideWhenZeroKeybinds();
+  }
   supportsRawValue() {
     return true;
   }
@@ -54890,7 +55046,7 @@ class CacheWriteTokensWidget {
   }
 }
 // src/utils/git.ts
-import { execSync as execSync4 } from "child_process";
+import { execFileSync } from "child_process";
 var gitCommandCache = new Map;
 function resolveGitCwd(context) {
   const candidates = [
@@ -54905,13 +55061,14 @@ function resolveGitCwd(context) {
   return;
 }
 function runGit(command, context) {
+  const args = command.trim().split(/\s+/).filter(Boolean);
   const cwd2 = resolveGitCwd(context);
   const cacheKey = `${command}|${cwd2 ?? ""}`;
   if (gitCommandCache.has(cacheKey)) {
     return gitCommandCache.get(cacheKey) ?? null;
   }
   try {
-    const output = execSync4(`git ${command}`, {
+    const output = execFileSync("git", args, {
       encoding: "utf8",
       stdio: ["pipe", "pipe", "ignore"],
       ...cwd2 ? { cwd: cwd2 } : {}
@@ -54945,6 +55102,23 @@ function getGitChangeCounts(context) {
     deletions: unstagedCounts.deletions + stagedCounts.deletions
   };
 }
+function hasRenameOrCopyStatus(line) {
+  return line.startsWith("R") || line.startsWith("C") || line[1] === "R" || line[1] === "C";
+}
+function forEachPorcelainEntry(output, visit) {
+  const entries = output.split("\x00");
+  for (let index = 0;index < entries.length; index += 1) {
+    const line = entries[index];
+    if (typeof line !== "string" || line.length < 2)
+      continue;
+    const shouldContinue = visit(line);
+    if (hasRenameOrCopyStatus(line)) {
+      index += 1;
+    }
+    if (shouldContinue === false)
+      return;
+  }
+}
 function getGitStatus(context) {
   const output = runGit("--no-optional-locks status --porcelain -z", context);
   if (!output) {
@@ -54954,11 +55128,7 @@ function getGitStatus(context) {
   let unstaged = false;
   let untracked = false;
   let conflicts = false;
-  const entries = output.split("\x00");
-  for (let index = 0;index < entries.length; index += 1) {
-    const line = entries[index];
-    if (typeof line !== "string" || line.length < 2)
-      continue;
+  forEachPorcelainEntry(output, (line) => {
     if (!conflicts && /^(DD|AU|UD|UA|DU|AA|UU)/.test(line))
       conflicts = true;
     if (!staged && /^[MADRCTU]/.test(line))
@@ -54968,14 +55138,32 @@ function getGitStatus(context) {
     if (!untracked && line.startsWith("??"))
       untracked = true;
     if (staged && unstaged && untracked && conflicts)
-      break;
-    const indexStatus = line[0];
-    if (indexStatus === "R" || indexStatus === "C") {
-      index += 1;
-    }
-  }
+      return false;
+    return;
+  });
   return { staged, unstaged, untracked, conflicts };
 }
+function getGitFileStatusCounts(context) {
+  const output = runGit("--no-optional-locks status --porcelain -z", context);
+  if (!output) {
+    return { staged: 0, unstaged: 0, untracked: 0 };
+  }
+  let staged = 0;
+  let unstaged = 0;
+  let untracked = 0;
+  forEachPorcelainEntry(output, (line) => {
+    if (line.startsWith("??")) {
+      untracked += 1;
+      return;
+    }
+    if (/^[MADRCTU]/.test(line))
+      staged += 1;
+    if (/^.[MADRCTU]/.test(line))
+      unstaged += 1;
+    return;
+  });
+  return { staged, unstaged, untracked };
+}
 function getGitAheadBehind(context) {
   const output = runGit("rev-list --left-right --count HEAD...@{upstream}", context);
   if (!output)
@@ -55161,6 +55349,9 @@ var HIDE_NO_GIT_KEYBIND = {
 function isHideNoGitEnabled(item) {
   return isMetadataFlagEnabled(item, HIDE_NO_GIT_KEY);
 }
+function getHideNoGitLabel(item) {
+  return isHideNoGitEnabled(item) ? "hide 'no git'" : undefined;
+}
 function getHideNoGitModifierText(item) {
   return makeModifierText(isHideNoGitEnabled(item) ? ["hide 'no git'"] : []);
 }
@@ -55515,7 +55706,7 @@ class GitRootDirWidget {
   }
 }
 // src/utils/gh-pr-cache.ts
-import { execFileSync } from "child_process";
+import { execFileSync as execFileSync2 } from "child_process";
 import {
   existsSync as existsSync6,
   mkdirSync as mkdirSync3,
@@ -55530,7 +55721,7 @@ var PR_CACHE_TTL = 30000;
 var GH_TIMEOUT = 5000;
 var DEFAULT_TITLE_MAX_WIDTH = 30;
 var DEFAULT_PR_CACHE_DEPS = {
-  execFileSync,
+  execFileSync: execFileSync2,
   existsSync: existsSync6,
   mkdirSync: mkdirSync3,
   readFileSync: readFileSync4,
@@ -55894,6 +56085,59 @@ class GitStagedWidget {
     return true;
   }
 }
+// src/widgets/GitStagedFiles.ts
+class GitStagedFilesWidget {
+  getDefaultColor() {
+    return "green";
+  }
+  getDescription() {
+    return "Shows count of staged files";
+  }
+  getDisplayName() {
+    return "Git Staged Files";
+  }
+  getCategory() {
+    return "Git";
+  }
+  getEditorDisplay(item) {
+    const labels = [getHideNoGitLabel(item), getHideWhenZeroLabel(item)].filter((label) => label !== undefined);
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: makeModifierText(labels)
+    };
+  }
+  handleEditorAction(action, item) {
+    return handleToggleNoGitAction(action, item) ?? handleToggleHideWhenZeroAction(action, item);
+  }
+  render(item, context, _settings) {
+    const hideNoGit = isHideNoGitEnabled(item);
+    if (context.isPreview) {
+      return item.rawValue ? "3" : "S:3";
+    }
+    if (!isInsideGitWorkTree(context)) {
+      return hideNoGit ? null : "(no git)";
+    }
+    const count = getGitFileStatusCounts(context).staged;
+    if (count === 0 && isHideWhenZeroEnabled(item)) {
+      return null;
+    }
+    return item.rawValue ? count.toString() : `S:${count}`;
+  }
+  getCustomKeybinds() {
+    return [...getHideNoGitKeybinds(), ...getHideWhenZeroKeybinds()];
+  }
+  getNumericValue(context, _item) {
+    if (!isInsideGitWorkTree(context))
+      return null;
+    return getGitFileStatusCounts(context).staged;
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors(_item) {
+    return true;
+  }
+}
 // src/widgets/GitUnstaged.ts
 var DEFAULT_SYMBOL2 = "*";
 
@@ -55953,6 +56197,59 @@ class GitUnstagedWidget {
     return true;
   }
 }
+// src/widgets/GitUnstagedFiles.ts
+class GitUnstagedFilesWidget {
+  getDefaultColor() {
+    return "yellow";
+  }
+  getDescription() {
+    return "Shows count of unstaged tracked files";
+  }
+  getDisplayName() {
+    return "Git Unstaged Files";
+  }
+  getCategory() {
+    return "Git";
+  }
+  getEditorDisplay(item) {
+    const labels = [getHideNoGitLabel(item), getHideWhenZeroLabel(item)].filter((label) => label !== undefined);
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: makeModifierText(labels)
+    };
+  }
+  handleEditorAction(action, item) {
+    return handleToggleNoGitAction(action, item) ?? handleToggleHideWhenZeroAction(action, item);
+  }
+  render(item, context, _settings) {
+    const hideNoGit = isHideNoGitEnabled(item);
+    if (context.isPreview) {
+      return item.rawValue ? "2" : "M:2";
+    }
+    if (!isInsideGitWorkTree(context)) {
+      return hideNoGit ? null : "(no git)";
+    }
+    const count = getGitFileStatusCounts(context).unstaged;
+    if (count === 0 && isHideWhenZeroEnabled(item)) {
+      return null;
+    }
+    return item.rawValue ? count.toString() : `M:${count}`;
+  }
+  getCustomKeybinds() {
+    return [...getHideNoGitKeybinds(), ...getHideWhenZeroKeybinds()];
+  }
+  getNumericValue(context, _item) {
+    if (!isInsideGitWorkTree(context))
+      return null;
+    return getGitFileStatusCounts(context).unstaged;
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors(_item) {
+    return true;
+  }
+}
 // src/widgets/GitUntracked.ts
 var DEFAULT_SYMBOL3 = "?";
 
@@ -56012,6 +56309,107 @@ class GitUntrackedWidget {
     return true;
   }
 }
+// src/widgets/GitUntrackedFiles.ts
+class GitUntrackedFilesWidget {
+  getDefaultColor() {
+    return "red";
+  }
+  getDescription() {
+    return "Shows count of untracked files";
+  }
+  getDisplayName() {
+    return "Git Untracked Files";
+  }
+  getCategory() {
+    return "Git";
+  }
+  getEditorDisplay(item) {
+    const labels = [getHideNoGitLabel(item), getHideWhenZeroLabel(item)].filter((label) => label !== undefined);
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: makeModifierText(labels)
+    };
+  }
+  handleEditorAction(action, item) {
+    return handleToggleNoGitAction(action, item) ?? handleToggleHideWhenZeroAction(action, item);
+  }
+  render(item, context, _settings) {
+    const hideNoGit = isHideNoGitEnabled(item);
+    if (context.isPreview) {
+      return item.rawValue ? "1" : "?:1";
+    }
+    if (!isInsideGitWorkTree(context)) {
+      return hideNoGit ? null : "(no git)";
+    }
+    const count = getGitFileStatusCounts(context).untracked;
+    if (count === 0 && isHideWhenZeroEnabled(item)) {
+      return null;
+    }
+    return item.rawValue ? count.toString() : `?:${count}`;
+  }
+  getCustomKeybinds() {
+    return [...getHideNoGitKeybinds(), ...getHideWhenZeroKeybinds()];
+  }
+  getNumericValue(context, _item) {
+    if (!isInsideGitWorkTree(context))
+      return null;
+    return getGitFileStatusCounts(context).untracked;
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors(_item) {
+    return true;
+  }
+}
+// src/widgets/GitCleanStatus.ts
+class GitCleanStatusWidget {
+  getDefaultColor() {
+    return "green";
+  }
+  getDescription() {
+    return "Shows ✓ when the working tree is clean and ✗ when it is dirty";
+  }
+  getDisplayName() {
+    return "Git Clean Status";
+  }
+  getCategory() {
+    return "Git";
+  }
+  getEditorDisplay(item) {
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: getHideNoGitModifierText(item)
+    };
+  }
+  handleEditorAction(action, item) {
+    return handleToggleNoGitAction(action, item);
+  }
+  render(item, context, _settings) {
+    const hideNoGit = isHideNoGitEnabled(item);
+    if (context.isPreview) {
+      return item.rawValue ? "clean" : "✓";
+    }
+    if (!isInsideGitWorkTree(context)) {
+      return hideNoGit ? null : "(no git)";
+    }
+    const status = getGitStatus(context);
+    const clean = !status.staged && !status.unstaged && !status.untracked && !status.conflicts;
+    if (item.rawValue) {
+      return clean ? "clean" : "dirty";
+    }
+    return clean ? "✓" : "✗";
+  }
+  getCustomKeybinds() {
+    return getHideNoGitKeybinds();
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors(_item) {
+    return true;
+  }
+}
 // src/widgets/GitAheadBehind.ts
 class GitAheadBehindWidget {
   getDefaultColor() {
@@ -56099,17 +56497,14 @@ class GitConflictsWidget {
     return "Git";
   }
   getEditorDisplay(item) {
-    const modifiers = [];
-    const noGitText = getHideNoGitModifierText(item);
-    if (noGitText)
-      modifiers.push("hide 'no git'");
+    const labels = [getHideNoGitLabel(item), getHideWhenZeroLabel(item)].filter((label) => label !== undefined);
     return {
       displayText: this.getDisplayName(),
-      modifierText: makeModifierText(modifiers)
+      modifierText: makeModifierText(labels)
     };
   }
   handleEditorAction(action, item) {
-    return handleToggleNoGitAction(action, item);
+    return handleToggleNoGitAction(action, item) ?? handleToggleHideWhenZeroAction(action, item);
   }
   render(item, context, _settings) {
     const hideNoGit = isHideNoGitEnabled(item);
@@ -56122,13 +56517,16 @@ class GitConflictsWidget {
       return hideNoGit ? null : "(no git)";
     }
     const count = getGitConflictCount(context);
+    if (count === 0 && isHideWhenZeroEnabled(item)) {
+      return null;
+    }
     if (item.rawValue) {
       return count.toString();
     }
     return `⚠ ${count}`;
   }
   getCustomKeybinds() {
-    return getHideNoGitKeybinds();
+    return [...getHideNoGitKeybinds(), ...getHideWhenZeroKeybinds()];
   }
   getNumericValue(context, _item) {
     if (!isInsideGitWorkTree(context))
@@ -57008,7 +57406,7 @@ class TerminalWidthWidget {
   }
 }
 // src/widgets/FreeMemory.ts
-import { execSync as execSync5 } from "child_process";
+import { execSync as execSync4 } from "child_process";
 import os8 from "os";
 function formatBytes(bytes) {
   const GB = 1024 ** 3;
@@ -57024,7 +57422,7 @@ function formatBytes(bytes) {
 }
 function getUsedMemoryMacOS() {
   try {
-    const output = execSync5("vm_stat", { encoding: "utf8" });
+    const output = execSync4("vm_stat", { encoding: "utf8" });
     const lines = output.split(`
 `);
     const firstLine = lines[0];
@@ -57337,7 +57735,7 @@ var CustomSymbolEditor = ({ widget, onComplete, onCancel }) => {
   }, undefined, true, undefined, this);
 };
 // src/widgets/CustomCommand.tsx
-import { execSync as execSync6 } from "child_process";
+import { execSync as execSync5 } from "child_process";
 var import_react32 = __toESM(require_react(), 1);
 
 // src/utils/ansi.ts
@@ -57725,7 +58123,7 @@ class CustomCommandWidget {
       try {
         const timeout = item.timeout ?? 1000;
         const jsonInput = JSON.stringify(context.data);
-        let output = execSync6(item.commandPath, {
+        let output = execSync5(item.commandPath, {
           encoding: "utf8",
           input: jsonInput,
           timeout,
@@ -58157,8 +58555,12 @@ var WIDGET_MANIFEST = [
   { type: "git-pr", create: () => new GitPrWidget },
   { type: "git-status", create: () => new GitStatusWidget },
   { type: "git-staged", create: () => new GitStagedWidget },
+  { type: "git-staged-files", create: () => new GitStagedFilesWidget },
   { type: "git-unstaged", create: () => new GitUnstagedWidget },
+  { type: "git-unstaged-files", create: () => new GitUnstagedFilesWidget },
   { type: "git-untracked", create: () => new GitUntrackedWidget },
+  { type: "git-untracked-files", create: () => new GitUntrackedFilesWidget },
+  { type: "git-clean-status", create: () => new GitCleanStatusWidget },
   { type: "git-ahead-behind", create: () => new GitAheadBehindWidget },
   { type: "git-conflicts", create: () => new GitConflictsWidget },
   { type: "git-sha", create: () => new GitShaWidget },
@@ -62429,17 +62831,18 @@ function renderStatusLine(widgets, settings, context, preRenderedWidgets, preCal
     if (!widget)
       continue;
     if (widget.type === "separator") {
-      let hasContentBefore = false;
+      let previousWidgetRenderedContent = false;
       for (let j = i - 1;j >= 0; j--) {
         const prevWidget = widgets[j];
-        if (prevWidget && prevWidget.type !== "separator" && prevWidget.type !== "flex-separator") {
-          if (preRenderedWidgets[j]?.content) {
-            hasContentBefore = true;
-            break;
-          }
+        if (prevWidget?.type === "separator" || prevWidget?.type === "flex-separator") {
+          continue;
+        }
+        if (prevWidget) {
+          previousWidgetRenderedContent = Boolean(preRenderedWidgets[j]?.content);
+          break;
         }
       }
-      if (!hasContentBefore)
+      if (!previousWidgetRenderedContent)
         continue;
       const sepChar = widget.character ?? (settings.defaultSeparator ?? "|");
       const formattedSep = formatSeparator(sepChar);
@@ -63474,8 +63877,8 @@ async function ensureWindowsUtf8CodePage() {
     return;
   }
   try {
-    const { execFileSync: execFileSync2 } = await import("child_process");
-    execFileSync2("chcp.com", ["65001"], { stdio: "ignore" });
+    const { execFileSync: execFileSync3 } = await import("child_process");
+    execFileSync3("chcp.com", ["65001"], { stdio: "ignore" });
   } catch {}
 }
 async function renderMultipleLines(data) {

package/package.json

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