agy-powerline 1.1.0 → 1.1.1

package/CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.1] - 2026-10-12
+
+### Changed
+
+- The statusline is installed as a single `statusline.js` instead of about 16 files, which cuts agy-powerline's own share of each refresh by about a third on Windows; run `npx agy-powerline init --yes` to switch, and `init` removes the old files (#23)
+- The ahead/behind counts are kept per pair of commits, so a branch that is ahead of or behind its upstream no longer starts `git` on every refresh (about 60 ms each on Windows) (#24)
+
 ## [1.1.0] - 2026-10-12
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agy-powerline",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Interactive statusline for Google Antigravity",
   "bin": {
     "agy-powerline": "src/index.js"

package/src/cli/bundle.js

@@ -0,0 +1,82 @@
+"use strict";
+
+// Builds the installed statusline.js: the runtime script and the library
+// files in RUNTIME_FILES, joined into one file. Node loads a single file much
+// faster than ~16 small ones (on Windows, opening each file costs more than
+// running its code), and Antigravity starts the script on every refresh.
+//
+// Each file keeps its own scope: its source is wrapped in a function that
+// gets its own module, exports and require, the way Node wraps a file. No
+// eval, no code generation beyond that wrapper. LINES records where each file
+// starts, so the problem log can still name the original file and line.
+
+const fs = require("fs");
+const path = require("path");
+const { RUNTIME_FILES } = require("../lib/paths");
+
+const LIB_DIR = path.join(__dirname, "..", "lib");
+const ENTRY = path.join(__dirname, "..", "runtime", "statusline.js");
+
+// Requires between bundled files resolve inside the bundle; anything else
+// (Node built-ins) goes to Node's own require.
+const PRELUDE = `const __files = {};
+const __cache = {};
+function __require(from, id) {
+  if (!id.startsWith(".")) {
+    return require(id);
+  }
+  let key = require("path").posix.join(require("path").posix.dirname(from), id);
+  if (!key.endsWith(".js")) {
+    key += ".js";
+  }
+  if (!__files[key]) {
+    const err = new Error(\`Cannot find module '\${id}' from '\${from}'\`);
+    err.code = "MODULE_NOT_FOUND";
+    throw err;
+  }
+  if (!__cache[key]) {
+    const module = { exports: {} };
+    __cache[key] = module;
+    __files[key](module, module.exports, (next) => __require(key, next));
+  }
+  return __cache[key].exports;
+}
+`;
+
+function toKey(rel) {
+  return rel.split(path.sep).join("/");
+}
+
+function wrapperLine(key) {
+  return `__files[${JSON.stringify(key)}] = function (module, exports, require) {`;
+}
+
+function buildRuntimeBundle() {
+  const files = [
+    ...RUNTIME_FILES.map((rel) => [toKey(rel), path.join(LIB_DIR, rel)]),
+    ["statusline.js", ENTRY],
+  ];
+  const parts = ["#!/usr/bin/env node", PRELUDE];
+
+  for (const [key, file] of files) {
+    const body = fs
+      .readFileSync(file, "utf8")
+      .replace(/^#!.*\n/, "")
+      .replace(/\n+$/, "");
+    parts.push(wrapperLine(key), body, "};");
+  }
+
+  // [first line of the file in the bundle, file name]; 1-based like stack traces.
+  const text = parts.join("\n");
+  const bundleLines = text.split("\n");
+  const lines = files.map(([key]) => [bundleLines.indexOf(wrapperLine(key)) + 2, key]);
+
+  return [
+    text,
+    `__require("statusline.js", "./log").setBundleLines(${JSON.stringify(lines)});`,
+    `__require("statusline.js", "./statusline");`,
+    "",
+  ].join("\n");
+}
+
+module.exports = { buildRuntimeBundle };

package/src/cli/init.js

@@ -18,9 +18,8 @@ const {
   cmdBreakingMessage,
 } = require("../lib/paths");
 const { createRl, confirm } = require("../lib/prompt");
+const { buildRuntimeBundle } = require("./bundle");
 
-const RUNTIME_DIR = path.join(__dirname, "..", "runtime");
-const LIB_DIR = path.join(__dirname, "..", "lib");
 const DIM = "\x1b[2m";
 const BOLD = "\x1b[1m";
 const CYAN = "\x1b[36m";
@@ -29,6 +28,27 @@ const YELLOW = "\x1b[33m";
 const RED = "\x1b[31m";
 const RESET = "\x1b[0m";
 
+// Up to 1.1.0 the runtime was installed as separate files next to
+// statusline.js. They are part of the one-file statusline.js now; delete the
+// old copies by name (regular files only), then the emptied layouts folder.
+function removeSeparateRuntimeFiles(installDir) {
+  for (const rel of RUNTIME_FILES) {
+    const file = path.join(installDir, rel);
+    try {
+      if (fs.lstatSync(file).isFile()) {
+        fs.unlinkSync(file);
+      }
+    } catch {
+      // Not there: nothing to remove.
+    }
+  }
+  try {
+    fs.rmdirSync(path.join(installDir, "layouts"));
+  } catch {
+    // Missing, or holds something that isn't ours: leave it.
+  }
+}
+
 function assertUnixNode() {
   if (!isWindowsNodeOnWsl()) {
     return;
@@ -104,13 +124,8 @@ async function initCommand(options = {}) {
     }
 
     if (writeScripts) {
-      fs.copyFileSync(path.join(RUNTIME_DIR, "statusline.js"), destStatusline);
-      for (const rel of RUNTIME_FILES) {
-        const src = path.join(LIB_DIR, rel);
-        const dest = path.join(installDir, rel);
-        fs.mkdirSync(path.dirname(dest), { recursive: true });
-        fs.copyFileSync(src, dest);
-      }
+      fs.writeFileSync(destStatusline, buildRuntimeBundle(), "utf8");
+      removeSeparateRuntimeFiles(installDir);
 
       if (process.platform !== "win32") {
         try {

package/src/lib/git.js

@@ -4,6 +4,14 @@ const fs = require("fs");
 const path = require("path");
 const { logWarning } = require("./log");
 const { firstText } = require("./formatters");
+const { writeFileAtomic, PRIVATE_FILE_MODE } = require("./paths");
+
+// Ahead/behind counts depend only on the two commits compared, so they are
+// kept per commit pair: git runs again only when the branch or its upstream
+// moves. Starting git costs ~60 ms on Windows, on every refresh otherwise.
+const SYNC_CACHE_NAME = ".git-sync-cache.json";
+const SYNC_CACHE_MAX = 20;
+const COMMIT = /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/;
 
 // Only an absolute folder that exists can belong to the user's session. A
 // relative path (a Windows path read on Linux, for one) resolves against
@@ -217,6 +225,54 @@ function upstreamRef(commonDir, branch) {
   return remote === "." ? merge : `refs/remotes/${remote}/${tracked}`;
 }
 
+// Only next to a real install's config (like the exec cache); CLI previews
+// and other copies don't write it.
+function syncCachePath() {
+  try {
+    const { getConfigDir } = require("./config");
+    const dir = getConfigDir();
+    return dir && fs.existsSync(path.join(dir, "statusline.config.json"))
+      ? path.join(dir, SYNC_CACHE_NAME)
+      : null;
+  } catch {
+    return null;
+  }
+}
+
+function readSyncCache(file) {
+  try {
+    const data = JSON.parse(fs.readFileSync(file, "utf8"));
+    return data && typeof data === "object" && !Array.isArray(data) ? data : {};
+  } catch {
+    return {};
+  }
+}
+
+function cachedSync(file, key) {
+  const value = file ? readSyncCache(file)[key] : null;
+  const valid =
+    Array.isArray(value) &&
+    value.length === 2 &&
+    value.every((n) => Number.isInteger(n) && n >= 0 && n <= 1e7);
+  return valid ? { ahead: value[0], behind: value[1] } : null;
+}
+
+function saveSync(file, key, sync) {
+  if (!file) {
+    return;
+  }
+  try {
+    // Newest last; the oldest pairs go once there are more than SYNC_CACHE_MAX.
+    const cache = readSyncCache(file);
+    delete cache[key];
+    cache[key] = [sync.ahead, sync.behind];
+    const kept = Object.fromEntries(Object.entries(cache).slice(-SYNC_CACHE_MAX));
+    writeFileAtomic(file, JSON.stringify(kept), { mode: PRIVATE_FILE_MODE });
+  } catch {
+    // Best effort: the next refresh runs git again.
+  }
+}
+
 function getGitSync(gitDir, branch) {
   if (!gitDir || !isSafeBranchName(branch)) {
     return { ahead: 0, behind: 0 };
@@ -232,10 +288,19 @@ function getGitSync(gitDir, branch) {
       return { ahead: 0, behind: 0 };
     }
 
-    if (readRef(commonDir, upstream) === localHash) {
+    const upstreamHash = readRef(commonDir, upstream);
+    if (upstreamHash === localHash) {
       return { ahead: 0, behind: 0 };
     }
 
+    const key =
+      COMMIT.test(localHash) && COMMIT.test(upstreamHash) ? `${localHash}..${upstreamHash}` : "";
+    const cacheFile = key ? syncCachePath() : null;
+    const cached = cachedSync(cacheFile, key);
+    if (cached) {
+      return cached;
+    }
+
     const { execFileSync } = require("child_process");
     const out = execFileSync(
       "git",
@@ -253,10 +318,12 @@ function getGitSync(gitDir, branch) {
 
     const parts = out.split(/\s+/);
     if (parts.length >= 2) {
-      return {
+      const sync = {
         ahead: parseInt(parts[0], 10) || 0,
         behind: parseInt(parts[1], 10) || 0,
       };
+      saveSync(cacheFile, key, sync);
+      return sync;
     }
   } catch (err) {
     // A timeout or missing git is worth knowing about when ahead/behind
@@ -327,4 +394,5 @@ module.exports = {
   gitHasDirtyMarkers,
   vcsFromPayload,
   resolveGit,
+  SYNC_CACHE_NAME,
 };

package/src/lib/log.js

@@ -28,6 +28,28 @@ const IN_REPO = path.basename(__dirname) === "lib";
 let logDir = null;
 let context = {};
 
+// The installed statusline.js is the runtime files joined into one (see
+// src/cli/bundle.js). [first line, file name] for each of them, so a stack
+// frame can still name the original file and line.
+let bundleLines = null;
+
+function setBundleLines(lines) {
+  bundleLines = Array.isArray(lines) ? lines : null;
+}
+
+function originalFrame(rel, line) {
+  if (!bundleLines || rel !== "statusline.js") {
+    return `${rel}:${line}`;
+  }
+  let match = null;
+  for (const entry of bundleLines) {
+    if (entry[0] <= line) {
+      match = entry;
+    }
+  }
+  return match ? `${match[1]}:${line - match[0] + 1}` : `${rel}:${line}`;
+}
+
 // The copied runtime has no package.json; init records the version in
 // install.json instead.
 function agyPowerlineVersion() {
@@ -139,7 +161,7 @@ function ourFrames(stack) {
       continue;
     }
     const fn = match[1] && /^[\w$.<> ]{1,60}$/.test(match[1]) ? `${match[1]} ` : "";
-    frames.push(`${fn}${rel.split(path.sep).join("/")}:${match[3]}`);
+    frames.push(`${fn}${originalFrame(rel.split(path.sep).join("/"), Number(match[3]))}`);
     if (frames.length >= 8) {
       break;
     }
@@ -283,4 +305,5 @@ module.exports = {
   logError,
   logWarning,
   clearLog,
+  setBundleLines,
 };

package/src/lib/paths.js

@@ -8,7 +8,8 @@ const AGY_SETTINGS = path.join(os.homedir(), ".gemini", "antigravity-cli", "sett
 
 const INSTALL_META_NAME = "install.json";
 
-// Library files init copies next to statusline.js (paths relative to src/lib).
+// Library files the runtime needs (paths relative to src/lib). init joins them
+// with src/runtime/statusline.js into the one installed statusline.js.
 const RUNTIME_FILES = [
   "shared.js",
   "colors.js",
@@ -35,13 +36,16 @@ const PRIVATE_FILES = [
   "statusline.config.json",
   ".exec-cache.json",
   "last-payload.json",
+  // SYNC_CACHE_NAME in git.js: commit IDs of the repos you work in.
+  ".git-sync-cache.json",
   // LOG_NAME in log.js, spelled out because log.js requires this file.
   "agy-powerline.log",
 ];
 const PRIVATE_FILE_MODE = 0o600;
 
 // Everything init or the runtime may create in the install dir. uninstall
-// --delete removes only these, never the whole directory tree.
+// --delete removes only these, never the whole directory tree. RUNTIME_FILES
+// are listed for installs from 1.1.0 and earlier, which copied them separately.
 const INSTALLED_FILES = [
   "statusline.js",
   "statusline.cmd",