@willh/copilotstatusline 0.2.3 → 0.2.4

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Matthew Breedlove (https://github.com/sirmalloc)
+Copyright (c) 2025 Will 保哥, 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,4 @@ 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.

package/README.md

@@ -26,6 +26,8 @@ Choose `Install or repair Copilot integration`, or install non-interactively:
 npx -y @willh/copilotstatusline@latest --install npm
 ```
 
+Interactive menus support both the arrow keys and Vim-style navigation: `j` moves down and `k` moves up. Text and search inputs continue to treat these keys as ordinary characters.
+
 The installer merges the following keys into the existing Copilot settings and preserves unrelated settings:
 
 ```json

package/dist/copilotstatusline.js

@@ -15623,6 +15623,9 @@ function renderValue(config2, label, value) {
   return `${config2.prefix}${body}${config2.suffix}`;
 }
 function numericValue(config2, label, value, formatter = formatTokens) {
+  if (value === undefined) {
+    return null;
+  }
   if (config2.hideWhenZero && value === 0) {
     return null;
   }
@@ -15632,7 +15635,7 @@ function contextUsed(status) {
   if (status.context.usedPercentage !== undefined) {
     return status.context.usedPercentage;
   }
-  if (status.context.limitTokens <= 0) {
+  if (status.context.currentTokens === undefined || status.context.limitTokens === undefined || status.context.limitTokens <= 0) {
     return null;
   }
   return status.context.currentTokens / status.context.limitTokens * 100;
@@ -15684,7 +15687,7 @@ function renderWidget(config2, context) {
     case "model":
       return status.modelName === undefined ? null : renderValue(config2, "Model", status.modelName);
     case "model-id":
-      return status.modelId === undefined ? null : renderValue(config2, "Model", status.modelId);
+      return status.modelId === undefined ? null : renderValue(config2, "Model ID", status.modelId);
     case "reasoning":
       return status.reasoningEffort === undefined ? null : renderValue(config2, "Effort", status.reasoningEffort);
     case "copilot-version":
@@ -15692,7 +15695,7 @@ function renderWidget(config2, context) {
     case "session-id":
       return status.sessionId === undefined ? null : renderValue(config2, "Session", status.sessionId);
     case "session-name":
-      return status.sessionName === undefined ? null : renderValue(config2, "Session", status.sessionName);
+      return status.sessionName === undefined ? null : renderValue(config2, "Session Name", status.sessionName);
     case "cwd":
       return status.cwd === undefined ? null : renderValue(config2, "", status.cwd);
     case "context-used": {
@@ -15714,7 +15717,7 @@ function renderWidget(config2, context) {
     case "lines-removed":
       return numericValue(config2, "-", status.cost.linesRemoved, (value) => String(value));
     case "allow-all":
-      return status.allowAll === true ? renderValue(config2, "", "YOLO") : null;
+      return status.allowAll === undefined ? null : renderValue(config2, "Allow All", status.allowAll ? "ON" : "OFF");
     case "git-branch": {
       const branch = cachedCommand(`git-branch:${status.cwd ?? ""}`, context.gitCacheTtlSeconds, () => runFile("git", ["--no-optional-locks", "branch", "--show-current"], status.cwd));
       return branch === null ? null : renderValue(config2, "", branch);
@@ -15786,7 +15789,7 @@ var init_catalog = __esm(() => {
     { type: "session-duration", name: "Session Duration", description: "累計 session 時間", defaultColor: "brightBlack" },
     { type: "lines-added", name: "Lines Added", description: "本 session 新增行數", defaultColor: "green" },
     { type: "lines-removed", name: "Lines Removed", description: "本 session 刪除行數", defaultColor: "red" },
-    { type: "allow-all", name: "Allow All", description: "Allow-all／YOLO 狀態", defaultColor: "brightRed" },
+    { type: "allow-all", name: "Allow All", description: "是否啟用所有工具與路徑權限", defaultColor: "brightRed" },
     { type: "git-branch", name: "Git Branch", description: "目前 Git branch", defaultColor: "magenta" },
     { type: "git-changes", name: "Git Changes", description: "Git staged／unstaged／untracked 數量", defaultColor: "yellow" },
     { type: "jj-change", name: "Jujutsu Change", description: "目前 jj change ID", defaultColor: "magenta" },
@@ -54312,7 +54315,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@willh/copilotstatusline",
-    version: "0.2.3",
+    version: "0.2.4",
     bugs: {
       url: "https://github.com/doggy8088/copilotstatusline/issues"
     },
@@ -54398,6 +54401,26 @@ var init_package = __esm(() => {
   };
 });
 
+// src/tui/vertical-navigation.ts
+function getVerticalNavigationDirection(input, key) {
+  if (key.upArrow) {
+    return -1;
+  }
+  if (key.downArrow) {
+    return 1;
+  }
+  if (key.ctrl || key.meta) {
+    return null;
+  }
+  if (input === "k") {
+    return -1;
+  }
+  if (input === "j") {
+    return 1;
+  }
+  return null;
+}
+
 // node_modules/react/cjs/react-jsx-dev-runtime.development.js
 var require_react_jsx_dev_runtime_development = __commonJS((exports) => {
   var React11 = __toESM(require_react());
@@ -54649,14 +54672,13 @@ function List({
       latestSelectionChange.current?.(selectedValue, selectedIndex);
     }
   }, [selectedIndex, selectedValue]);
-  use_input_default((_, key) => {
+  use_input_default((input, key) => {
     if (selectableItems.length === 0) {
       return;
     }
-    if (key.upArrow) {
-      setSelectedIndex((index) => index === 0 ? selectableItems.length - 1 : index - 1);
-    } else if (key.downArrow) {
-      setSelectedIndex((index) => index === selectableItems.length - 1 ? 0 : index + 1);
+    const direction = getVerticalNavigationDirection(input, key);
+    if (direction !== null) {
+      setSelectedIndex((index) => (index + direction + selectableItems.length) % selectableItems.length);
     } else if (key.return && selectedItem !== undefined) {
       onSelect(selectedItem.value, selectedIndex);
     }
@@ -54799,13 +54821,13 @@ function ColorEditor({
       }
       return;
     }
-    if (key.upArrow || key.downArrow) {
-      const direction = key.upArrow ? -1 : 1;
-      setSelectedIndex((selectedIndex + direction + widgets.length) % widgets.length);
+    const direction = getVerticalNavigationDirection(input, key);
+    if (direction !== null) {
+      setSelectedIndex((index) => (index + direction + widgets.length) % widgets.length);
     } else if ((key.leftArrow || key.rightArrow) && selectedWidget !== undefined) {
-      const direction = key.leftArrow ? -1 : 1;
+      const direction2 = key.leftArrow ? -1 : 1;
       const field = editingBackground ? "backgroundColor" : "color";
-      onUpdate(widgets.map((widget2, index) => index === selectedIndex ? { ...widget2, [field]: cycleColor(widget2[field], direction) } : widget2));
+      onUpdate(widgets.map((widget2, index) => index === selectedIndex ? { ...widget2, [field]: cycleColor(widget2[field], direction2) } : widget2));
     } else if (input === "f") {
       setEditingBackground((value) => !value);
     } else if (input === "b" && selectedWidget !== undefined) {
@@ -54881,7 +54903,7 @@ function ColorEditor({
       /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
         dimColor: true,
         children: [
-          "↑↓ select, ←→ cycle",
+          "↑↓/j/k select, ←→ cycle",
           " ",
           editingBackground ? "background" : "foreground",
           ", (f) toggle bg/fg, (b)old, (r)eset, (c)lear all, ESC back"
@@ -55014,8 +55036,8 @@ function LineSelector({
       return;
     }
     if (moveMode) {
-      if ((key.upArrow || key.downArrow) && lines.length > 1) {
-        const direction = key.upArrow ? -1 : 1;
+      const direction = getVerticalNavigationDirection(input, key);
+      if (direction !== null && lines.length > 1) {
         const target = (selectedIndex + direction + lines.length) % lines.length;
         const reordered = [...lines];
         const current = reordered[selectedIndex];
@@ -55080,7 +55102,7 @@ function LineSelector({
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
         dimColor: true,
-        children: moveMode ? "↑↓ to move line, ESC or Enter to exit move mode" : allowEditing ? "(a) append line, (d) delete line, (m) move line, ESC back" : "ESC to go back"
+        children: moveMode ? "↑↓/j/k to move line, ESC or Enter to exit move mode" : allowEditing ? "↑↓/j/k select, (a) append line, (d) delete line, (m) move line, ESC back" : "↑↓/j/k select, ESC to go back"
       }, undefined, false, undefined, this),
       moveMode ? /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
         marginTop: 1,
@@ -55209,6 +55231,10 @@ function MainMenu({
         bold: true,
         children: "Main Menu"
       }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
+        dimColor: true,
+        children: "↑↓ or j/k to select, Enter to open"
+      }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(List, {
         items: menuItems(integration, hasChanges),
         marginTop: 1,
@@ -55464,8 +55490,8 @@ function WidgetEditor({
           return;
         }
         const current = pickerIndex < 0 ? 0 : pickerIndex;
-        const direction = key.upArrow ? -1 : 1;
-        const nextIndex = (current + direction + filteredCatalog.length) % filteredCatalog.length;
+        const direction2 = key.upArrow ? -1 : 1;
+        const nextIndex = (current + direction2 + filteredCatalog.length) % filteredCatalog.length;
         setPicker({ ...picker, selectedType: filteredCatalog[nextIndex]?.type ?? null });
       } else if (key.return && selectedPickerEntry !== undefined) {
         applyPicker(selectedPickerEntry.type);
@@ -55481,9 +55507,9 @@ function WidgetEditor({
       return;
     }
     if (moveMode) {
-      if ((key.upArrow || key.downArrow) && widgets.length > 1) {
-        const direction = key.upArrow ? -1 : 1;
-        const target = (selectedIndex + direction + widgets.length) % widgets.length;
+      const direction2 = getVerticalNavigationDirection(input, key);
+      if (direction2 !== null && widgets.length > 1) {
+        const target = (selectedIndex + direction2 + widgets.length) % widgets.length;
         const reordered = [...widgets];
         const current = reordered[selectedIndex];
         const replacement = reordered[target];
@@ -55506,9 +55532,9 @@ function WidgetEditor({
     if (globalKeyAction === "ignore") {
       return;
     }
-    if ((key.upArrow || key.downArrow) && widgets.length > 0) {
-      const direction = key.upArrow ? -1 : 1;
-      setSelectedIndex((selectedIndex + direction + widgets.length) % widgets.length);
+    const direction = getVerticalNavigationDirection(input, key);
+    if (direction !== null && widgets.length > 0) {
+      setSelectedIndex((index) => (index + direction + widgets.length) % widgets.length);
     } else if ((key.leftArrow || key.rightArrow) && currentWidget !== undefined) {
       openPicker("change");
     } else if (key.return && currentWidget !== undefined) {
@@ -55521,7 +55547,7 @@ function WidgetEditor({
       const next = widgets.filter((_, index) => index !== selectedIndex);
       onUpdate(next);
       setSelectedIndex(Math.max(0, Math.min(selectedIndex, next.length - 1)));
-    } else if (input === "k" && currentWidget !== undefined) {
+    } else if (input === "y" && currentWidget !== undefined) {
       const clone3 = { ...currentWidget, id: randomUUID() };
       const next = [...widgets];
       next.splice(selectedIndex + 1, 0, clone3);
@@ -55686,7 +55712,7 @@ function WidgetEditor({
       }, undefined, true, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
         dimColor: true,
-        children: moveMode ? "↑↓ move widget, ESC or Enter exit move mode" : "↑↓ select, ←→ change, Enter move, (a)dd, (i)nsert, (k) clone, (d)elete, (c)lear"
+        children: moveMode ? "↑↓/j/k move widget, ESC or Enter exit move mode" : "↑↓/j/k select, ←→ change, Enter move, (a)dd, (i)nsert, (y) clone, (d)elete, (c)lear"
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
         dimColor: true,
@@ -56484,7 +56510,7 @@ var CopilotStatusSchema = exports_external.looseObject({
   allow_all: exports_external.boolean().optional()
 });
 function finiteNumber(value) {
-  return typeof value === "number" && Number.isFinite(value) ? value : 0;
+  return typeof value === "number" && Number.isFinite(value) ? value : undefined;
 }
 function normalizeCopilotStatus(status) {
   const model = status.model;
@@ -56497,7 +56523,15 @@ function normalizeCopilotStatus(status) {
   const cacheWriteTokens = finiteNumber(context?.total_cache_write_tokens);
   const reasoningTokens = finiteNumber(context?.total_reasoning_tokens);
   const reportedTotal = finiteNumber(context?.total_tokens);
-  const totalTokens = reportedTotal > 0 ? reportedTotal : inputTokens + outputTokens + cacheReadTokens + cacheWriteTokens + reasoningTokens;
+  const componentTokens = [
+    inputTokens,
+    outputTokens,
+    cacheReadTokens,
+    cacheWriteTokens,
+    reasoningTokens
+  ];
+  const derivedTotal = componentTokens.some((value) => value !== undefined) ? componentTokens.reduce((sum, value) => sum + (value ?? 0), 0) : undefined;
+  const totalTokens = reportedTotal ?? derivedTotal;
   return {
     sessionId: status.session_id,
     sessionName: status.session_name ?? undefined,
@@ -56699,22 +56733,44 @@ async function loadState(statePath, copilotHome, sessionId, updatedAt, updatedAt
     };
   }
 }
-function assertTokenCounters(status) {
-  const counters = [
+function tokenCounters(status) {
+  const cumulative = [
     status.context.inputTokens,
     status.context.outputTokens,
     status.context.cacheReadTokens,
     status.context.cacheWriteTokens,
     status.context.reasoningTokens,
-    status.context.totalTokens,
+    status.context.totalTokens
+  ];
+  const optional2 = [
     status.context.lastCallInputTokens,
     status.context.lastCallOutputTokens,
     status.context.currentTokens,
     status.context.limitTokens
   ];
-  if (!counters.every((value) => Number.isSafeInteger(value) && value >= 0)) {
+  const present = [...cumulative, ...optional2].filter((value) => value !== undefined);
+  if (!present.every((value) => Number.isSafeInteger(value) && value >= 0)) {
     throw new Error("token counters must be non-negative safe integers");
   }
+  if (cumulative.some((value) => value === undefined)) {
+    return;
+  }
+  const [
+    inputTokens,
+    outputTokens,
+    cacheReadTokens,
+    cacheWriteTokens,
+    reasoningTokens,
+    totalTokens
+  ] = cumulative;
+  return {
+    inputTokens: inputTokens ?? 0,
+    outputTokens: outputTokens ?? 0,
+    cacheReadTokens: cacheReadTokens ?? 0,
+    cacheWriteTokens: cacheWriteTokens ?? 0,
+    reasoningTokens: reasoningTokens ?? 0,
+    totalTokens: totalTokens ?? 0
+  };
 }
 function delta(current, previous) {
   return Math.max(0, current - (previous ?? 0));
@@ -56740,7 +56796,10 @@ async function recordTokenUsage(status, options = {}) {
   if (sessionId === undefined || sessionId.trim() === "") {
     return { recorded: false };
   }
-  assertTokenCounters(status);
+  const counters = tokenCounters(status);
+  if (counters === undefined) {
+    return { recorded: false };
+  }
   const now = options.now ?? new Date;
   const timestamp = localIsoTimestamp(now);
   const copilotHome = options.copilotHome ?? getCopilotHome();
@@ -56756,12 +56815,12 @@ async function recordTokenUsage(status, options = {}) {
     const previous = state.sessions[sessionKey] ?? state.sessions[sessionId];
     const model = status.modelName ?? status.modelId ?? "unknown";
     const modelId = status.modelId ?? "unknown";
-    const deltaInput = delta(status.context.inputTokens, previous?.inputTokens);
-    const deltaOutput = delta(status.context.outputTokens, previous?.outputTokens);
-    const deltaCacheRead = delta(status.context.cacheReadTokens, previous?.cacheReadTokens);
-    const deltaCacheWrite = delta(status.context.cacheWriteTokens, previous?.cacheWriteTokens);
-    const deltaReasoning = delta(status.context.reasoningTokens, previous?.reasoningTokens);
-    const deltaTotal = delta(status.context.totalTokens, previous?.totalTokens);
+    const deltaInput = delta(counters.inputTokens, previous?.inputTokens);
+    const deltaOutput = delta(counters.outputTokens, previous?.outputTokens);
+    const deltaCacheRead = delta(counters.cacheReadTokens, previous?.cacheReadTokens);
+    const deltaCacheWrite = delta(counters.cacheWriteTokens, previous?.cacheWriteTokens);
+    const deltaReasoning = delta(counters.reasoningTokens, previous?.reasoningTokens);
+    const deltaTotal = delta(counters.totalTokens, previous?.totalTokens);
     const previousModel = previous?.model ?? "";
     const modelChanged = previousModel !== "" && previousModel !== model;
     const turnNo = (previous?.turnNo ?? 0) + (deltaTotal > 0 ? 1 : 0);
@@ -56779,12 +56838,12 @@ async function recordTokenUsage(status, options = {}) {
         previous_model: previousModel,
         model_changed: modelChanged,
         tokens: {
-          input: status.context.inputTokens,
-          output: status.context.outputTokens,
-          cache_read: status.context.cacheReadTokens,
-          cache_write: status.context.cacheWriteTokens,
-          reasoning: status.context.reasoningTokens,
-          total: status.context.totalTokens,
+          input: counters.inputTokens,
+          output: counters.outputTokens,
+          cache_read: counters.cacheReadTokens,
+          cache_write: counters.cacheWriteTokens,
+          reasoning: counters.reasoningTokens,
+          total: counters.totalTokens,
           last_call_input: status.context.lastCallInputTokens,
           last_call_output: status.context.lastCallOutputTokens
         },
@@ -56820,12 +56879,12 @@ async function recordTokenUsage(status, options = {}) {
       turnNo,
       model,
       modelId,
-      inputTokens: status.context.inputTokens,
-      outputTokens: status.context.outputTokens,
-      cacheReadTokens: status.context.cacheReadTokens,
-      cacheWriteTokens: status.context.cacheWriteTokens,
-      reasoningTokens: status.context.reasoningTokens,
-      totalTokens: status.context.totalTokens,
+      inputTokens: counters.inputTokens,
+      outputTokens: counters.outputTokens,
+      cacheReadTokens: counters.cacheReadTokens,
+      cacheWriteTokens: counters.cacheWriteTokens,
+      reasoningTokens: counters.reasoningTokens,
+      totalTokens: counters.totalTokens,
       updatedAt: timestamp,
       updatedAtEpochMs: now.getTime()
     };
@@ -56841,7 +56900,7 @@ async function recordTokenUsage(status, options = {}) {
 }
 
 // src/copilotstatusline.ts
-var PACKAGE_VERSION = "0.2.3";
+var PACKAGE_VERSION = "0.2.4";
 async function readStdin() {
   process.stdin.setEncoding("utf8");
   const chunks = [];

package/docs/USAGE.md

@@ -67,6 +67,8 @@ Uninstallation removes `statusLine` only when its command is recognized as belon
 
 ## Formatter settings
 
+The interactive editor accepts Up/Down arrows or Vim-style `k`/`j` for vertical navigation. The same shortcuts move lines and widgets while move mode is active. Widget search and text-editing fields keep `j` and `k` as normal text input. In the widget editor, `y` clones the selected widget.
+
 Default path:
 
 ```text
@@ -141,6 +143,21 @@ The normalized widgets currently use:
 - cost: API duration, total duration, premium requests, and added/removed lines;
 - permission state: `allow_all`.
 
+Widget availability is divided by source:
+
+| Source | Widgets | Availability |
+| --- | --- | --- |
+| Copilot payload | Model, Model ID, Copilot Version, Session ID, Current Directory | Shown when Copilot supplies the corresponding field or supported alias. |
+| Optional Copilot payload | Reasoning, Session Name | Hidden when the active model has no reasoning effort or the session has no name. |
+| Copilot token payload | Input Tokens, Output Tokens, Cache Read, Cache Write, Reasoning Tokens, Total Tokens, Last Call Input, Last Call Output | Zero is shown as a real value; a missing field is hidden instead of being converted to zero. |
+| Copilot context payload | Current Context, Context Limit, Context Used, Context Remaining | Used percentage comes from the payload, or is derived when both the current value and limit are available. |
+| Copilot cost payload | Premium Requests, API Duration, Session Duration, Lines Added, Lines Removed | Shown when the corresponding cumulative counter is available. |
+| Copilot permission payload | Allow All | `Allow All: ON` and `Allow All: OFF` are rendered distinctly; a missing field is hidden. |
+| Repository probes | Git Branch, Git Changes, Jujutsu Change | Requires the matching executable and repository. Failed or timed-out probes are hidden. |
+| Local runtime | Terminal Width, Free Memory | Read from the current terminal and operating system. |
+| User configuration | Custom Text, Custom Command | Requires configured text or a command that produces output. |
+| Layout | Separator, Flex | Always available as formatting controls and does not represent Copilot payload data. |
+
 ## Diagnostics
 
 Inspect integration status:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willh/copilotstatusline",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "bugs": {
     "url": "https://github.com/doggy8088/copilotstatusline/issues"
   },