agy-powerline 1.2.0 → 1.4.0

package/src/lib/catalog.js

@@ -126,8 +126,45 @@ const WIDGET_CATALOG = [
     id: "git",
     label: "VCS Branch",
     unique: true,
-    description: "current branch, marked when there are uncommitted changes",
-    summary: "branch and uncommitted changes",
+    description:
+      "current branch, marked when there are uncommitted changes, with how many commits it is ahead of or behind its upstream",
+    summary: "branch, changes and ahead/behind",
+  },
+  {
+    id: "gitChanges",
+    label: "Git Line Changes",
+    unique: true,
+    description:
+      "lines added and removed since the last commit, staged or not (new files that aren't staged don't count)",
+    summary: "lines added and removed",
+  },
+  {
+    id: "gitFiles",
+    label: "Git File Counts",
+    unique: true,
+    description: "how many files are staged, modified, untracked and in conflict",
+    summary: "staged, modified, untracked file counts",
+  },
+  {
+    id: "gitSha",
+    label: "Git Commit",
+    unique: true,
+    description: "short ID of the commit checked out",
+    summary: "short commit ID",
+  },
+  {
+    id: "gitStash",
+    label: "Git Stash Count",
+    unique: true,
+    description: "how many stashes the repository holds; hidden when there are none",
+    summary: "number of stashes",
+  },
+  {
+    id: "gitWorktree",
+    label: "Git Worktree",
+    unique: true,
+    description: "name of the linked worktree you're in; hidden in the main one",
+    summary: "linked worktree name",
   },
   {
     id: "plan",
@@ -220,6 +257,21 @@ const WIDGET_CATALOG = [
     description: "session tokens, as a total or split into input and output",
     summary: "session tokens, total or split",
   },
+  {
+    id: "tokensToday",
+    label: "Tokens Today",
+    unique: true,
+    description: "tokens used today in all agy conversations, from agy's local data (Node 22.13+)",
+    summary: "tokens used today, all conversations",
+  },
+  {
+    id: "tokensWeek",
+    label: "Tokens 7 Days",
+    unique: true,
+    description:
+      "tokens used in the last 7 days in all agy conversations, from agy's local data (Node 22.13+)",
+    summary: "tokens used over 7 days",
+  },
   {
     id: "exec",
     label: "Shell Command",

package/src/lib/colors.js

@@ -91,21 +91,24 @@ function rgb(r, g, b) {
   return [r, g, b];
 }
 
-function rgbToAnsi256([r, g, b]) {
-  if (r === g && g === b) {
-    if (r < 8) {
-      return 16;
-    }
-
-    if (r > 248) {
-      return 231;
-    }
-
-    return Math.round(((r - 8) / 247) * 24) + 232;
-  }
+// The nearest xterm color: the 6x6x6 cube's levels (0, 95, 135, ... 255) are
+// not evenly spaced, and a near-gray reads better from the gray ramp, so both
+// candidates are measured and the closer one wins (as tmux does).
+const CUBE_LEVELS = [0, 95, 135, 175, 215, 255];
 
-  const to6 = (v) => Math.round((v / 255) * 5);
-  return 16 + 36 * to6(r) + 6 * to6(g) + to6(b);
+function rgbToAnsi256([r, g, b]) {
+  const toCube = (v) => (v < 48 ? 0 : v < 115 ? 1 : Math.floor((v - 35) / 40));
+  const [cr, cg, cb] = [toCube(r), toCube(g), toCube(b)];
+  const cube = [CUBE_LEVELS[cr], CUBE_LEVELS[cg], CUBE_LEVELS[cb]];
+
+  const average = (r + g + b) / 3;
+  const grayIndex = average > 238 ? 23 : Math.max(0, Math.floor((average - 3) / 10));
+  const level = 8 + 10 * grayIndex;
+  const distance = ([x, y, z]) => (x - r) ** 2 + (y - g) ** 2 + (z - b) ** 2;
+
+  return distance([level, level, level]) < distance(cube)
+    ? 232 + grayIndex
+    : 16 + 36 * cr + 6 * cg + cb;
 }
 
 function colorSeq(kind, [r, g, b]) {
@@ -196,6 +199,122 @@ function parseColor(value, fallback = [200, 200, 200]) {
   return fallback;
 }
 
+function linear(c) {
+  const v = c / 255;
+  return v <= 0.04045 ? v / 12.92 : ((v + 0.055) / 1.055) ** 2.4;
+}
+
+function gamma(v) {
+  const c = v <= 0.0031308 ? 12.92 * v : 1.055 * v ** (1 / 2.4) - 0.055;
+  return Math.max(0, Math.min(255, Math.round(c * 255)));
+}
+
+// WCAG relative luminance and contrast ratio.
+function luminance([r, g, b]) {
+  return 0.2126 * linear(r) + 0.7152 * linear(g) + 0.0722 * linear(b);
+}
+
+function contrastRatio(a, b) {
+  const [hi, lo] = [luminance(a), luminance(b)].sort((x, y) => y - x);
+  return (hi + 0.05) / (lo + 0.05);
+}
+
+// OKLab (Björn Ottosson): mixing there keeps the middle of a gradient as
+// bright and saturated as its ends, where sRGB mixing turns it muddy.
+function toOklab([r, g, b]) {
+  const [lr, lg, lb] = [linear(r), linear(g), linear(b)];
+  const l = Math.cbrt(0.4122214708 * lr + 0.5363325363 * lg + 0.0514459929 * lb);
+  const m = Math.cbrt(0.2119034982 * lr + 0.6806995451 * lg + 0.1073969566 * lb);
+  const s = Math.cbrt(0.0883024619 * lr + 0.2817188376 * lg + 0.6299787005 * lb);
+  return [
+    0.2104542553 * l + 0.793617785 * m - 0.0040720468 * s,
+    1.9779984951 * l - 2.428592205 * m + 0.4505937099 * s,
+    0.0259040371 * l + 0.7827717662 * m - 0.808675766 * s,
+  ];
+}
+
+function fromOklab([L, a, b]) {
+  const l = (L + 0.3963377774 * a + 0.2158037573 * b) ** 3;
+  const m = (L - 0.1055613458 * a - 0.0638541728 * b) ** 3;
+  const s = (L - 0.0894841775 * a - 1.291485548 * b) ** 3;
+  return [
+    gamma(4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s),
+    gamma(-1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s),
+    gamma(-0.0041960863 * l - 0.7034186147 * m + 1.707614701 * s),
+  ];
+}
+
+const MAX_GRADIENT_STOPS = 6;
+const HEX_STOP = /^#?([0-9a-f]{3}|[0-9a-f]{6})$/i;
+
+// "#ff5f6d-#ffc371" (2 to 6 hex stops, "#" optional) to RGB stops, or null.
+function parseGradientStops(spec) {
+  if (typeof spec !== "string") {
+    return null;
+  }
+  const parts = spec.trim().split("-");
+  if (parts.length < 2 || parts.length > MAX_GRADIENT_STOPS) {
+    return null;
+  }
+  if (!parts.every((part) => HEX_STOP.test(part))) {
+    return null;
+  }
+  return parts.map((part) => parseColor(part));
+}
+
+// The color t (0 to 1) of the way along the stops; the ends are exact.
+function gradientAt(stops, t) {
+  const clamped = Math.max(0, Math.min(1, Number(t) || 0));
+  const span = clamped * (stops.length - 1);
+  const i = Math.min(stops.length - 2, Math.floor(span));
+  const local = span - i;
+  if (local === 0) {
+    return [...stops[i]];
+  }
+  if (local === 1) {
+    return [...stops[i + 1]];
+  }
+  const [a, b] = [toOklab(stops[i]), toOklab(stops[i + 1])];
+  return fromOklab(a.map((value, k) => value + (b[k] - value) * local));
+}
+
+// count evenly spaced colors from the first stop to the last.
+function gradientColors(stops, count) {
+  if (count <= 1) {
+    return count === 1 ? [[...stops[0]]] : [];
+  }
+  return Array.from({ length: count }, (_, i) => gradientAt(stops, i / (count - 1)));
+}
+
+const MIN_CONTRAST = 4.5;
+
+// The preferred text color if it reads on the background, else whichever of
+// the fallbacks contrasts most.
+function readableText(background, preferred, fallbacks) {
+  if (contrastRatio(preferred, background) >= MIN_CONTRAST) {
+    return preferred;
+  }
+  return fallbacks.reduce((best, color) =>
+    contrastRatio(color, background) > contrastRatio(best, background) ? color : best
+  );
+}
+
+// The color moved toward white (on a dark background) or black (on a light
+// one) just far enough to reach the minimum contrast.
+function withContrast(color, background, min = MIN_CONTRAST) {
+  if (contrastRatio(color, background) >= min) {
+    return color;
+  }
+  const target = luminance(background) < 0.5 ? [255, 255, 255] : [0, 0, 0];
+  for (let step = 1; step <= 20; step++) {
+    const moved = mix(color, target, step / 20);
+    if (contrastRatio(moved, background) >= min) {
+      return moved;
+    }
+  }
+  return target;
+}
+
 module.exports = {
   CSI,
   RESET,
@@ -221,4 +340,15 @@ module.exports = {
   shade,
   mix,
   parseColor,
+  luminance,
+  contrastRatio,
+  toOklab,
+  fromOklab,
+  MAX_GRADIENT_STOPS,
+  parseGradientStops,
+  gradientAt,
+  gradientColors,
+  MIN_CONTRAST,
+  readableText,
+  withContrast,
 };

package/src/lib/config-check.js

@@ -0,0 +1,74 @@
+"use strict";
+
+const { defaultConfig, canonicalThemeId, LAYOUTS } = require("./shared");
+const { THEMES, normalizeGradient } = require("./themes");
+const { VALID_WIDGET_IDS } = require("./config");
+const { COLOR_MODES } = require("./colors");
+const { isMeterStyle } = require("./widget-style");
+
+const KNOWN_KEYS = new Set([
+  ...Object.keys(defaultConfig()),
+  "customTheme",
+  "gradient",
+  "meterStyle",
+]);
+
+// Control characters shown as \uXXXX: the text is printed, never interpreted
+// by the terminal or the browser.
+function visible(text) {
+  return String(text).replace(
+    /[\x00-\x1f\x7f-\x9f\u2028\u2029\u202A-\u202E\u2066-\u2069]/g,
+    (char) => `\\u${char.charCodeAt(0).toString(16).padStart(4, "0")}`
+  );
+}
+
+// Settings the raw config has that the bar can't use, so they don't come over
+// on import or in the web configurator.
+function droppedSettings(raw) {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
+    return ["config is not an object"];
+  }
+
+  const dropped = [];
+  for (const key of Object.keys(raw)) {
+    if (!KNOWN_KEYS.has(key)) {
+      dropped.push(`unknown setting "${visible(key)}"`);
+    }
+  }
+  if (Array.isArray(raw.widgets)) {
+    for (const widget of raw.widgets) {
+      if (!widget || typeof widget !== "object" || !VALID_WIDGET_IDS.has(widget.id)) {
+        dropped.push(`unknown widget ${visible(JSON.stringify(widget?.id ?? widget) ?? "")}`);
+      }
+    }
+  } else if (raw.widgets !== undefined) {
+    dropped.push("widgets (not a list)");
+  }
+  if (raw.theme !== undefined && !THEMES[canonicalThemeId(raw.theme)]) {
+    dropped.push(`unknown theme ${visible(JSON.stringify(raw.theme))}`);
+  }
+  if (raw.layout !== undefined && !LAYOUTS[raw.layout]) {
+    dropped.push(`unknown layout ${visible(JSON.stringify(raw.layout))}`);
+  }
+  if (raw.color !== undefined && !COLOR_MODES.includes(raw.color)) {
+    dropped.push(`unknown color mode ${visible(JSON.stringify(raw.color))}`);
+  }
+  if (
+    raw.gradient !== undefined &&
+    raw.gradient !== null &&
+    raw.gradient !== "off" &&
+    !normalizeGradient(raw.gradient)
+  ) {
+    dropped.push(`invalid gradient ${visible(JSON.stringify(raw.gradient))}`);
+  }
+  if (raw.meterStyle !== undefined && !isMeterStyle(raw.meterStyle)) {
+    dropped.push(`unknown meter style ${visible(JSON.stringify(raw.meterStyle))}`);
+  }
+  return dropped;
+}
+
+module.exports = {
+  KNOWN_KEYS,
+  visible,
+  droppedSettings,
+};

package/src/lib/config.js

@@ -3,10 +3,11 @@
 const fs = require("fs");
 const path = require("path");
 const { resolveColorModeId } = require("./colors");
-const { resolveThemeId } = require("./themes");
+const { resolveThemeId, normalizeGradient } = require("./themes");
 const { stripControl, normalizeClock } = require("./formatters");
 const { normalizePowerline } = require("./powerline");
 const { writeFileAtomic, PRIVATE_FILE_MODE } = require("./paths");
+const { isMeterStyle } = require("./widget-style");
 
 // Display text in widget configs is printed as-is, so strip terminal control
 // from it. cmd/command are left alone: they are executed, not printed.
@@ -39,6 +40,11 @@ const VALID_WIDGET_IDS = new Set([
   "cwd",
   "project",
   "git",
+  "gitChanges",
+  "gitFiles",
+  "gitSha",
+  "gitStash",
+  "gitWorktree",
   "plan",
   "agentState",
   "artifacts",
@@ -52,6 +58,8 @@ const VALID_WIDGET_IDS = new Set([
   "cacheCreate",
   "cacheHit",
   "totalTokens",
+  "tokensToday",
+  "tokensWeek",
   "exec",
   "customText",
   "separator",
@@ -83,9 +91,14 @@ const LAYOUTS = {
     name: "Lines",
     description: "Plain colored text with dividers and dot meters",
   },
+  classic: {
+    id: "classic",
+    name: "Classic",
+    description: "Plain colored text with | dividers and █░│ block meters",
+  },
 };
 
-const LAYOUT_ORDER = ["pills", "lines"];
+const LAYOUT_ORDER = ["pills", "lines", "classic"];
 
 function resolveLayoutId(layoutId) {
   return LAYOUTS[layoutId] ? layoutId : "pills";
@@ -175,6 +188,17 @@ function mergeConfig(raw) {
     result.customTheme = raw.customTheme;
   }
 
+  // An unknown meter style is left out: each layout then draws its own.
+  if (isMeterStyle(raw?.meterStyle)) {
+    result.meterStyle = raw.meterStyle;
+  }
+
+  // Only a valid gradient is kept; anything else renders the plain theme.
+  const gradient = normalizeGradient(raw?.gradient);
+  if (gradient) {
+    result.gradient = gradient;
+  }
+
   return result;
 }
 
@@ -236,11 +260,12 @@ function saveConfig(config) {
 }
 
 // Presets set the widget list only; the layout (Pills or Lines) stays the one
-// the user picked. Each keeps all its widgets at 80 columns (full at 100).
+// the user picked. Each answers one question and keeps all its widgets at 80
+// columns (full at 100); widgets with nothing to show hide on their own.
 const PRESETS = {
   default: {
     id: "default",
-    name: "Everyday",
+    name: "Default",
     description: "Model, context and git; 5h and 7d quotas with resets on a second row",
     widgets: [
       { id: "model" },
@@ -258,41 +283,84 @@ const PRESETS = {
   },
   compact: {
     id: "compact",
-    name: "One line",
-    description: "Short model, tightest quota, context % and git on a single row",
+    name: "Compact",
+    description: "One row: short model, tightest quota, context % and git",
     widgets: [{ id: "model", short: true }, { id: "quota" }, { id: "contextPct" }, { id: "git" }],
   },
-  workspace: {
-    id: "workspace",
-    name: "Several repos",
-    description: "Project, git, agent state and model; context, tightest quota and mode below",
+  agent: {
+    id: "agent",
+    name: "Agent activity",
+    description: "Agent state, subagents, title and mode; context, artifacts, quota",
+    widgets: [
+      { id: "agentState" },
+      { id: "tasks" },
+      { id: "title" },
+      { id: "separator" },
+      { id: "mode" },
+      { id: "sandbox" },
+      { id: "lineBreak" },
+      { id: "model", short: true },
+      { id: "contextPct" },
+      { id: "artifacts" },
+      { id: "separator" },
+      { id: "quota" },
+    ],
+  },
+  git: {
+    id: "git",
+    name: "Git focus",
+    description: "Project, branch, worktree, stash; changed files and lines, commit",
     widgets: [
       { id: "project" },
       { id: "git" },
-      { id: "agentState" },
+      { id: "gitWorktree" },
+      { id: "gitStash" },
       { id: "separator" },
       { id: "model", short: true },
       { id: "lineBreak" },
-      { id: "context" },
+      { id: "gitFiles" },
+      { id: "gitChanges" },
+      { id: "gitSha" },
       { id: "separator" },
+      { id: "contextPct" },
       { id: "quota" },
-      { id: "mode" },
     ],
   },
-  limits: {
-    id: "limits",
-    name: "Heavy usage",
-    description: "5h, 7d, third-party and Argon quotas with resets, one quota per row",
+  tokens: {
+    id: "tokens",
+    name: "Token usage",
+    description: "Session tokens in and out, cache hit; tokens today and over 7 days",
     widgets: [
+      { id: "model", short: true },
+      { id: "contextTokens" },
+      { id: "separator" },
+      { id: "totalTokens", split: true },
+      { id: "cacheHit" },
+      { id: "lineBreak" },
+      { id: "tokensToday" },
+      { id: "tokensWeek" },
+      { id: "separator" },
+      { id: "quota" },
+    ],
+  },
+  quotas: {
+    id: "quotas",
+    name: "Quota watch",
+    description: "Plan and model; 5h and 7d quotas side by side; third-party and Argon",
+    widgets: [
+      { id: "plan" },
+      { id: "separator" },
+      { id: "model", short: true },
+      { id: "lineBreak" },
       { id: "fiveHourBar" },
       { id: "fiveHourReset" },
-      { id: "lineBreak" },
+      { id: "separator" },
       { id: "weeklyBar" },
       { id: "weeklyReset" },
       { id: "lineBreak" },
       { id: "thirdPartyFiveHour" },
       { id: "thirdPartyWeekly" },
-      { id: "lineBreak" },
+      { id: "separator" },
       { id: "argonWeekly" },
       { id: "argonReset" },
     ],
@@ -300,7 +368,7 @@ const PRESETS = {
   full: {
     id: "full",
     name: "Everything",
-    description: "Session, project and git; context, tokens and cache; both quotas, on three rows",
+    description: "Session, project and git; context, tokens and cache; both quotas",
     widgets: [
       { id: "agentState" },
       { id: "tasks" },
@@ -325,7 +393,7 @@ const PRESETS = {
   },
 };
 
-const PRESET_ORDER = ["default", "compact", "workspace", "limits", "full"];
+const PRESET_ORDER = ["default", "compact", "agent", "git", "tokens", "quotas", "full"];
 
 function applyPreset(baseConfig, presetName) {
   const preset = PRESETS[presetName] || PRESETS.default;