agy-powerline 1.2.0 → 1.3.0

package/src/lib/paths.js

@@ -1,3 +1,5 @@
+"use strict";
+
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
@@ -25,6 +27,7 @@ const RUNTIME_FILES = [
   "fit.js",
   "log.js",
   "payload-dump.js",
+  "usage.js",
   path.join("layouts", "lines.js"),
   path.join("layouts", "pills.js"),
 ];
@@ -34,10 +37,17 @@ const RUNTIME_FILES = [
 // machine can't read them (Windows profile folders are private already).
 const PRIVATE_FILES = [
   "statusline.config.json",
+  // The config before the last import (BACKUP_SUFFIX in cli/import.js).
+  "statusline.config.json.bak",
   ".exec-cache.json",
   "last-payload.json",
   // SYNC_CACHE_NAME in git.js: commit IDs of the repos you work in.
   ".git-sync-cache.json",
+  // STATUS_CACHE_NAME in git.js: repo paths with their file and line counts.
+  ".git-status-cache.json",
+  // USAGE_CACHE_NAME in usage.js: tokens per day, keyed by a hash of each
+  // conversation database's path.
+  ".usage-cache.json",
   // LOG_NAME in log.js, spelled out because log.js requires this file.
   "agy-powerline.log",
 ];
@@ -238,15 +248,54 @@ function settingsBackupPath(file = AGY_SETTINGS) {
   return `${file}.agy-powerline.bak`;
 }
 
-// Backs up the current file, then writes atomically.
-function writeJsonSafely(file, data) {
-  fs.mkdirSync(path.dirname(file), { recursive: true });
+function settingsOriginalBackupPath(file = AGY_SETTINGS) {
+  return `${file}.agy-powerline.original.bak`;
+}
 
-  if (fs.existsSync(file)) {
-    fs.copyFileSync(file, settingsBackupPath(file));
+// Two copies before every change: the latest file, replaced each time, and
+// the file as it was before agy-powerline first changed it, written once and
+// never replaced, so running init again can't lose the user's own version.
+// Returns the original backup's path when this call created it.
+function backUpSettings(file) {
+  if (!fs.existsSync(file)) {
+    return null;
+  }
+  const original = settingsOriginalBackupPath(file);
+  const created = !fs.existsSync(original);
+  if (created) {
+    fs.copyFileSync(file, original);
   }
+  fs.copyFileSync(file, settingsBackupPath(file));
+  return created ? original : null;
+}
 
+// Backs up the current file, then writes atomically. Returns what
+// backUpSettings() returns.
+function writeJsonSafely(file, data) {
+  fs.mkdirSync(path.dirname(file), { recursive: true });
+  const originalBackup = backUpSettings(file);
   writeFileAtomic(file, JSON.stringify(data, null, 2) + "\n");
+  return originalBackup;
+}
+
+// Dotfile managers (stow, chezmoi, yadm) link files such as settings.json
+// into place. A write goes through the link to the file it points to, so the
+// link stays a link and the user's real file gets the change; a rename onto
+// the link itself would replace it with a plain file.
+function writeTarget(file) {
+  try {
+    return fs.realpathSync(file);
+  } catch {
+    // Missing file, or a link whose target doesn't exist yet: follow it once.
+    try {
+      if (fs.lstatSync(file).isSymbolicLink()) {
+        return path.resolve(path.dirname(file), fs.readlinkSync(file));
+      }
+    } catch {
+      // Nothing at that path.
+    }
+    return file;
+  }
 }
 
 // Writes via temp file + rename so an interrupted write cannot leave a
@@ -254,9 +303,10 @@ function writeJsonSafely(file, data) {
 // mode the existing file had, so rewriting a file never widens who can read
 // it (the rename would otherwise reset it to the default).
 function writeFileAtomic(file, body, { mode } = {}) {
-  fs.mkdirSync(path.dirname(file), { recursive: true });
-  const tmp = `${file}.${process.pid}.tmp`;
-  const target = process.platform === "win32" ? undefined : (mode ?? existingMode(file));
+  const dest = writeTarget(file);
+  fs.mkdirSync(path.dirname(dest), { recursive: true });
+  const tmp = `${dest}.${process.pid}.tmp`;
+  const target = process.platform === "win32" ? undefined : (mode ?? existingMode(dest));
   fs.writeFileSync(tmp, body, { encoding: "utf8", mode: target ?? 0o666 });
   if (target !== undefined) {
     // The mode passed to writeFileSync is reduced by the umask; set it exactly.
@@ -270,10 +320,10 @@ function writeFileAtomic(file, body, { mode } = {}) {
   }
 
   try {
-    fs.renameSync(tmp, file);
+    fs.renameSync(tmp, dest);
   } catch {
     // Windows can refuse to replace a file another process holds open.
-    fs.writeFileSync(file, body, "utf8");
+    fs.writeFileSync(dest, body, "utf8");
     fs.rmSync(tmp, { force: true });
   }
 }
@@ -301,11 +351,20 @@ function restrictPrivateFiles(installDir) {
   }
 }
 
+// Removes a settings.json that would be left empty. A symlinked one is emptied
+// instead: deleting the link would break the user's dotfiles and leave the
+// real file unchanged. Returns "deleted", "emptied" or null (nothing there).
 function removeSettingsFile(file = AGY_SETTINGS) {
-  if (fs.existsSync(file)) {
-    fs.copyFileSync(file, settingsBackupPath(file));
-    fs.rmSync(file, { force: true });
+  if (!fs.existsSync(file)) {
+    return null;
+  }
+  backUpSettings(file);
+  if (fs.lstatSync(file).isSymbolicLink()) {
+    writeFileAtomic(file, "{}\n");
+    return "emptied";
   }
+  fs.rmSync(file, { force: true });
+  return "deleted";
 }
 
 // Antigravity runs the Windows launcher through `cmd /c`, which splits the
@@ -368,6 +427,7 @@ module.exports = {
   readAgySettings,
   readSettingsForUpdate,
   settingsBackupPath,
+  settingsOriginalBackupPath,
   writeJsonSafely,
   writeFileAtomic,
   removeSettingsFile,

package/src/lib/prompt.js

@@ -1,3 +1,5 @@
+"use strict";
+
 const readline = require("readline");
 
 function createRl() {
@@ -24,8 +26,36 @@ async function confirm(rl, message, defaultYes) {
   return answer === "y" || answer === "yes";
 }
 
+// Numbered options, answered with a number; Enter keeps the default. Anything
+// else asks again, at most 3 times, then the default stands. No raw mode or
+// arrow keys, so it works in every terminal and in cmd. An option can span
+// several lines (a label and its preview). Returns the chosen index.
+async function choose(rl, message, options, defaultIndex = 0, print = console.log) {
+  print(message);
+  options.forEach((option, i) => {
+    const [first, ...rest] = String(option).split("\n");
+    print(`  ${String(i + 1).padStart(2)}) ${first}`);
+    rest.forEach((line) => print(`      ${line}`));
+  });
+
+  for (let attempt = 0; attempt < 3; attempt++) {
+    const answer = (
+      await question(rl, `  Choose 1-${options.length} (Enter: ${defaultIndex + 1}) `)
+    ).trim();
+    if (!answer) {
+      return defaultIndex;
+    }
+    const index = /^\d{1,3}$/.test(answer) ? Number(answer) - 1 : -1;
+    if (index >= 0 && index < options.length) {
+      return index;
+    }
+  }
+  return defaultIndex;
+}
+
 module.exports = {
   createRl,
   question,
   confirm,
+  choose,
 };

package/src/lib/run.js

@@ -1,3 +1,5 @@
+"use strict";
+
 const { spawn } = require("child_process");
 
 function spawnCapture(file, args, input, timeoutMs = 15000) {

package/src/lib/session.js

@@ -2,7 +2,8 @@
 
 const os = require("os");
 const { formatReset, resetInSeconds, firstText } = require("./formatters");
-const { resolveGit } = require("./git");
+const { resolveGit, resolveGitDetails } = require("./git");
+const { resolveUsage } = require("./usage");
 
 const FIVE_HOURS = 5 * 3600;
 const SEVEN_DAYS = 7 * 86400;
@@ -144,7 +145,17 @@ function contextUsedPercent(data) {
   return (current * 100) / size;
 }
 
-function extractSession(data, config) {
+// options.readUsage: the statusline itself may read agy's conversation
+// databases; previews only use the usage cache.
+function extractSession(data, config, options = {}) {
+  const git = resolveGit(data, config);
+  const gitDetails = resolveGitDetails(data, config);
+  // Once git status has been read for gitFiles, the branch's dirty marker can
+  // count uncommitted files too, not only an unfinished merge or rebase.
+  const files = gitDetails?.files;
+  if (git && files && gitDetails.branch === git.branch) {
+    git.dirty = git.dirty || files.staged + files.modified + files.conflicts > 0;
+  }
   const contextPct = percent(contextUsedPercent(data));
   const contextSize = count(data.context_window?.context_window_size);
   const current = data.context_window?.current_usage;
@@ -224,7 +235,10 @@ function extractSession(data, config) {
     version: firstText(data.version),
     sandbox: data.sandbox?.enabled === true,
     sandboxNet: data.sandbox?.allow_network === true,
-    git: resolveGit(data, config),
+    git,
+    gitDetails,
+    // Only read when tokensToday or tokensWeek is on the bar.
+    usage: resolveUsage(config, { read: options.readUsage === true }),
     terminalWidth: terminalWidth(data.terminal_width ?? process.stdout.columns ?? 0),
   };
 }

package/src/lib/shared.js

@@ -54,6 +54,7 @@ const {
 } = require("./formatters");
 
 const { extractSession } = require("./session");
+const { execPayloadJson } = require("./exec");
 const { fitWidgets, truncateLines, widestLine } = require("./fit");
 
 const {
@@ -92,12 +93,21 @@ function renderBar(data, config, overrides) {
   // sequences from every string before any layout prints it.
   // Valid JSON can still be null, a number or an array; read those as empty.
   const payload = data && typeof data === "object" && !Array.isArray(data) ? data : {};
-  const session = sanitizeDeep(extractSession(payload, resolved));
+  const session = sanitizeDeep(
+    extractSession(payload, resolved, { readUsage: overrides.usage === "read" })
+  );
   // Exec widgets only run when the caller opts in ("run"); CLI previews keep
   // the default placeholder so rendering a config never executes it.
   session.execMode =
     overrides.exec === "run" || overrides.exec === "blocked" ? overrides.exec : "preview";
   session.execMemo = new Map();
+  // Built only when a command will run and asked for it.
+  if (
+    session.execMode === "run" &&
+    resolved.widgets.some((widget) => widget.id === "exec" && widget.payload === true)
+  ) {
+    session.execPayload = execPayloadJson(payload);
+  }
 
   const prevDepth = getActiveDepth();
 

package/src/lib/themes.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const { parseColor } = require("./colors");
+const { parseColor, parseGradientStops, luminance } = require("./colors");
 
 // Every theme targets one terminal background:
 //   dark-*        bright colors, dark pill text, for dark terminals
@@ -9,10 +9,10 @@ const { parseColor } = require("./colors");
 //                 protanopia, deuteranopia and tritanopia
 // Most dark-* and light-* colors come from VS Code's default themes (Dark+
 // and Light+ syntax, git decorations, warning/error and terminal colors);
-// nocturne, onyx, metro and cream take their palettes from community themes
-// (credited below). A few colors are adjusted where the checks below need
-// it: darkened or lightened for contrast, and gitDirty moved toward orange so
-// a dirty branch never looks like the caution state.
+// nocturne, onyx, metro, cream and macchiato take their palettes from
+// community themes (credited below). A few colors are adjusted where the
+// checks below need it: darkened or lightened for contrast, and gitDirty
+// moved toward orange so a dirty branch never looks like the caution state.
 // Palettes are checked by tests/shared/themes.test.js: pill text and lines
 // text reach WCAG AA (4.5:1), the ok / caution / danger states are clearly
 // different from each other, and so are gitDirty and caution.
@@ -175,6 +175,22 @@ const THEMES = {
     warn: "#f7768e",
   }),
 
+  // Palette from Catppuccin Macchiato (catppuccin.com, MIT).
+  "dark-macchiato": theme("dark", "Dark Macchiato", "Pastel mauve, teal, peach and green", {
+    text: DARK_TEXT,
+    track: "#494d64",
+    model: "#c6a0f6",
+    fiveHour: "#a6da95",
+    weekly: "#7dc4e4",
+    thirdParty: "#f5a97f",
+    context: "#8aadf4",
+    git: "#8bd5ca",
+    gitDirty: "#f0c6c6",
+    meta: "#b8c0e0",
+    caution: "#eed49f",
+    warn: "#ed8796",
+  }),
+
   "light-paper": theme("light", "Light Paper", "VS Code Light+ colors", {
     text: LIGHT_TEXT,
     track: "#c8c8c8",
@@ -311,6 +327,7 @@ const THEME_ORDER = [
   "dark-nocturne",
   "dark-onyx",
   "dark-metro",
+  "dark-macchiato",
   "light-paper",
   "light-sky",
   "light-sunset",
@@ -398,6 +415,57 @@ function themeColors(themeId, customThemeConfig) {
   return resolveTheme(themeId, customThemeConfig).colors;
 }
 
+// Row gradients. Pill text and Lines text are adjusted per color to stay
+// readable, so a preset works on dark and light terminals alike.
+const GRADIENTS = {
+  aurora: { name: "Aurora", stops: ["#00c9a7", "#4facfe", "#a18cd1"] },
+  sunset: { name: "Sunset", stops: ["#ffd166", "#ff8c61", "#e8457c"] },
+  ocean: { name: "Ocean", stops: ["#2af598", "#009efd"] },
+  forest: { name: "Forest", stops: ["#d4fc79", "#3fb68b", "#1d7a5f"] },
+  neon: { name: "Neon", stops: ["#f72585", "#7209b7", "#4cc9f0"] },
+  candy: { name: "Candy", stops: ["#ff9a9e", "#fbc2eb", "#a1c4fd"] },
+  rainbow: { name: "Rainbow", stops: ["#ff595e", "#ffca3a", "#8ac926", "#1982c4", "#6a4c93"] },
+  mono: { name: "Mono", stops: ["#e0e0e0", "#6e6e6e"] },
+};
+
+const GRADIENT_ORDER = Object.keys(GRADIENTS);
+
+const toHex = (rgb) => `#${rgb.map((n) => n.toString(16).padStart(2, "0")).join("")}`;
+
+// A preset name, or hex stops written as "#rrggbb-#rrggbb"; null when the
+// value is anything else (or "off").
+function normalizeGradient(value) {
+  if (typeof value !== "string") {
+    return null;
+  }
+  const key = value.trim().toLowerCase();
+  if (GRADIENTS[key]) {
+    return key;
+  }
+  const stops = parseGradientStops(key);
+  return stops ? stops.map(toHex).join("-") : null;
+}
+
+function gradientStops(value) {
+  const key = normalizeGradient(value);
+  if (!key) {
+    return null;
+  }
+  return GRADIENTS[key]
+    ? GRADIENTS[key].stops.map((stop) => parseColor(stop))
+    : parseGradientStops(key);
+}
+
+// Typical terminal backgrounds, a little toward the hard side. Themes for
+// light terminals have light pill text on deep colors; dark themes the reverse.
+const TERMINAL_BACKGROUNDS = { dark: [40, 42, 54], light: [245, 245, 240] };
+
+function terminalBackground(colors) {
+  return luminance(colors?.text ?? [0, 0, 0]) > 0.5
+    ? TERMINAL_BACKGROUNDS.light
+    : TERMINAL_BACKGROUNDS.dark;
+}
+
 module.exports = {
   THEMES,
   THEME_ORDER,
@@ -411,4 +479,10 @@ module.exports = {
   resolveThemeId,
   resolveTheme,
   themeColors,
+  GRADIENTS,
+  GRADIENT_ORDER,
+  normalizeGradient,
+  gradientStops,
+  TERMINAL_BACKGROUNDS,
+  terminalBackground,
 };