copilot-statusline 0.1.7 → 0.1.9

package/README.md

@@ -87,23 +87,24 @@ The interactive configuration tool provides a terminal UI where you can:
 
 > 💡 **Tip:** Your settings are automatically saved to `~/.config/copilot-statusline/settings.json`
 
-### Copilot CLI config.json format
+### Copilot CLI Integration
 
-When you install from the TUI, copilot-statusline writes a `statusLine` command object to your Copilot CLI config:
+When you install from the TUI, copilot-statusline creates a launcher script at `~/.copilot/statusline.sh` that uses `bunx`/`npx` to always run the latest version — **no manual upgrades needed**.
+
+It also writes to your Copilot CLI config:
 
 ```json
+// ~/.copilot/config.json
 {
   "statusLine": {
     "type": "command",
-    "command": "npx -y copilot-statusline@latest",
+    "command": "/Users/you/.copilot/statusline.sh",
     "padding": 0
   }
 }
 ```
 
-Other supported command values:
-- `bunx -y copilot-statusline@latest`
-- `copilot-statusline` (for global installs)
+> 💡 **Auto-upgrade:** The launcher script runs `bunx -y copilot-statusline@latest` (or `npx` if you used npm to run the TUI) under the hood, so you always get the latest version automatically.
 
 **Settings location:** `~/.copilot/config.json` (or use `--config-dir` with Copilot CLI to change)
 
@@ -513,7 +514,7 @@ opus-4.6 | 3x | Ctx: 18.0% | Reqs: 3 | Session: <1m              ⎇ main
 ### Setup
 
 ```bash
-git clone https://github.com/user/copilot-statusline.git
+git clone https://github.com/EncodeTS/copilot-statusline.git
 cd copilot-statusline
 bun install
 ```

package/dist/copilot-statusline.js

@@ -52574,7 +52574,6 @@ import { execSync } from "child_process";
 import * as fs3 from "fs";
 import * as os4 from "os";
 import * as path2 from "path";
-var __dirname = "/Users/ts/workspace/active/statusline/copilot_statusline/src/utils";
 function getCopilotConfigDir() {
   return path2.join(os4.homedir(), ".copilot");
 }
@@ -52618,28 +52617,6 @@ function isInstalled() {
 function isKnownCommand(command) {
   return command.includes("copilot-statusline") || command.includes("statusline.sh") || command.includes("statusline.cmd");
 }
-function findJsPath() {
-  const bunGlobal = path2.join(os4.homedir(), ".bun", "install", "global", "node_modules", "copilot-statusline", "dist", "copilot-statusline.js");
-  if (fs3.existsSync(bunGlobal)) {
-    return bunGlobal;
-  }
-  try {
-    const npmRoot = execSync("npm root -g", { encoding: "utf-8" }).trim();
-    const npmGlobal = path2.join(npmRoot, "copilot-statusline", "dist", "copilot-statusline.js");
-    if (fs3.existsSync(npmGlobal)) {
-      return npmGlobal;
-    }
-  } catch {}
-  const localDist = path2.resolve(__dirname, "..", "..", "dist", "copilot-statusline.js");
-  if (fs3.existsSync(localDist)) {
-    return localDist;
-  }
-  const bundledPath = path2.resolve(__dirname, "copilot-statusline.js");
-  if (fs3.existsSync(bundledPath)) {
-    return bundledPath;
-  }
-  return null;
-}
 function findRuntime() {
   const isBunRuntime = typeof Bun !== "undefined" || process.env.BUN_INSTALL !== undefined || (process.argv[0] ?? "").includes("bun");
   if (isBunRuntime) {
@@ -52651,38 +52628,34 @@ function findRuntime() {
   } catch {}
   return "node";
 }
-function generateUnixScript(jsPath) {
+function generateUnixScript() {
   const runtime = findRuntime();
+  const runner = runtime === "bun" ? "bunx" : "npx";
   return `#!/bin/bash
 # copilot-statusline — auto-generated launcher
+# Uses ${runner} to always run the latest version.
 # Buffers stdin because Copilot CLI closes the pipe before slow runtimes start.
-JS="${jsPath}"
-RT="${runtime}"
 if [ -t 0 ]; then
-  exec "$RT" "$JS" "$@"
+  exec ${runner} -y copilot-statusline@latest "$@"
 else
   INPUT=$(cat)
-  echo "$INPUT" | exec "$RT" "$JS" "$@"
+  echo "$INPUT" | exec ${runner} -y copilot-statusline@latest "$@"
 fi
 `;
 }
-function generateWindowsScript(jsPath) {
+function generateWindowsScript() {
   const runtime = findRuntime();
+  const runner = runtime === "bun" ? "bunx" : "npx";
   return `@echo off\r
-set "RT=${runtime}"\r
-"%RT%" "${jsPath}" %*\r
+${runner} -y copilot-statusline@latest %*\r
 `;
 }
 function installStatusLine() {
-  const jsPath = findJsPath();
-  if (!jsPath) {
-    throw new Error("Could not find copilot-statusline.js. Install globally first: bun install -g copilot-statusline");
-  }
   const scriptPath = getScriptPath();
   if (process.platform === "win32") {
-    fs3.writeFileSync(scriptPath, generateWindowsScript(jsPath));
+    fs3.writeFileSync(scriptPath, generateWindowsScript());
   } else {
-    fs3.writeFileSync(scriptPath, generateUnixScript(jsPath));
+    fs3.writeFileSync(scriptPath, generateUnixScript());
     fs3.chmodSync(scriptPath, 493);
   }
   const config2 = loadCopilotConfig() ?? {};
@@ -52940,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.7";
+var PACKAGE_VERSION = "0.1.9";
 function getPackageVersion() {
   if (/^\d+\.\d+\.\d+/.test(PACKAGE_VERSION)) {
     return PACKAGE_VERSION;
@@ -54103,15 +54076,17 @@ function getContextWindowMetrics(data) {
   }
   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 = currentUsageTotalTokens ?? usedTokensFromPercentage;
+  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;
   return {
     windowSize,
     usedTokens,
-    contextLengthTokens: contextLengthTokens ?? usedTokens,
+    contextLengthTokens: contextLengthFromAuthoritative ?? contextLengthTokens ?? usedTokens,
     usedPercentage,
     remainingPercentage,
     totalInputTokens,
@@ -54525,17 +54500,14 @@ class ContextBarWidget {
   render(item, context, settings) {
     const displayMode = getDisplayMode(item);
     const barWidth = displayMode === "progress" ? 32 : 16;
-    const powerlineMode = settings.powerline?.enabled === true;
+    const powerlineMode = settings.powerline.enabled;
     if (context.isPreview) {
       const previewDisplay = `${makeUsageProgressBar(25, barWidth, powerlineMode)} 50k/200k (25%)`;
       return item.rawValue ? previewDisplay : `Context: ${previewDisplay}`;
     }
     const contextWindowMetrics = getContextWindowMetrics(context.data);
-    let total = contextWindowMetrics.windowSize;
+    const total = contextWindowMetrics.windowSize;
     const used = contextWindowMetrics.contextLengthTokens;
-    if (total === null) {
-      total = contextWindowMetrics.windowSize;
-    }
     if (used === null || total === null || total <= 0) {
       return null;
     }
@@ -62905,11 +62877,9 @@ var App2 = () => {
   const [powerlineFontStatus, setPowerlineFontStatus] = import_react45.useState({ installed: false });
   const [installingFonts, setInstallingFonts] = import_react45.useState(false);
   const [fontInstallMessage, setFontInstallMessage] = import_react45.useState(null);
-  const [existingStatusLine, setExistingStatusLine] = import_react45.useState(null);
   const [flashMessage, setFlashMessage] = import_react45.useState(null);
   const [previewIsTruncated, setPreviewIsTruncated] = import_react45.useState(false);
   import_react45.useEffect(() => {
-    setExistingStatusLine(getExistingStatusLine());
     loadSettings().then((loadedSettings) => {
       source_default.level = loadedSettings.colorLevel;
       setSettings(loadedSettings);
@@ -62978,7 +62948,6 @@ A launcher script will be created at ~/.copilot/statusline.sh`;
         try {
           installStatusLine();
           setIsCopilotInstalled(true);
-          setExistingStatusLine(getExistingStatusLine());
           setFlashMessage({ text: "✓ Installed to Copilot CLI", color: "green" });
         } catch (e) {
           const errorMsg = e instanceof Error ? e.message : String(e);
@@ -63003,7 +62972,6 @@ A launcher script will be created at ~/.copilot/statusline.sh`;
         action: async () => {
           uninstallStatusLine();
           setIsCopilotInstalled(false);
-          setExistingStatusLine(null);
           setScreen("main");
           setConfirmDialog(null);
           return Promise.resolve();
@@ -63257,9 +63225,7 @@ var CopilotPayloadSchema = exports_external.object({
     id: exports_external.string().nullable().optional(),
     display_name: exports_external.string().nullable().optional()
   }).optional(),
-  workspace: exports_external.object({
-    current_dir: exports_external.string().optional()
-  }).optional(),
+  workspace: exports_external.object({ current_dir: exports_external.string().optional() }).optional(),
   version: exports_external.string().optional(),
   cost: exports_external.object({
     total_api_duration_ms: exports_external.number().optional(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "copilot-statusline",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "A customizable status line formatter for GitHub Copilot CLI — based on ccstatusline",
   "module": "src/copilot-statusline.ts",
   "type": "module",
@@ -28,8 +28,8 @@
     "chalk": "^5.5.0",
     "eslint": "^10.0.0",
     "eslint-import-resolver-typescript": "^4.4.4",
-    "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-import-newlines": "^2.0.0",
+    "eslint-plugin-import-x": "^4.16.2",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^7.0.1",
     "globals": "^17.3.0",
@@ -55,8 +55,16 @@
     "powerline",
     "developer-tools"
   ],
-  "author": "",
+  "author": "EncodeTS (https://github.com/EncodeTS)",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/EncodeTS/copilot-statusline.git"
+  },
+  "homepage": "https://github.com/EncodeTS/copilot-statusline",
+  "bugs": {
+    "url": "https://github.com/EncodeTS/copilot-statusline/issues"
+  },
   "engines": {
     "node": ">=14.0.0"
   },