agy-powerline 1.3.0 → 1.5.0

package/src/cli/configure.js

@@ -24,7 +24,7 @@ const {
 } = require("../lib/shared");
 const { resolveInstallDir } = require("../lib/paths");
 const { WIDGET_TAGS } = require("../lib/widget-style");
-const { editFields: getEditFields } = require("../lib/widget-options");
+const { editFields: getEditFields, stepNumberField } = require("../lib/widget-options");
 const { loadEditableConfig } = require("./config-guard");
 const {
   parseColor,
@@ -295,7 +295,15 @@ const TAB_OF_SCREEN = {
   glyphs: "powerline",
 };
 
-const PRESET_ICONS = { default: "🎯", compact: "⚡", workspace: "📂", limits: "🔋", full: "🚀" };
+const PRESET_ICONS = {
+  default: "🎯",
+  compact: "⚡",
+  agent: "🧠",
+  git: "🔀",
+  tokens: "📊",
+  quotas: "🔋",
+  full: "🚀",
+};
 
 // Set by renderFrame so tests can draw a screen at a fixed size.
 let columnsOverride = null;
@@ -409,6 +417,7 @@ function previewParts(width) {
   // The toggle keys work on the widget list, so only that screen names them.
   const key = (letter) => (screen === "main" ? letter : "");
   const chips = [
+    ui.chip("gaps", preview.rowGap, key("v")),
     ui.chip("emojis", preview.emojis, key("e")),
     ui.chip("minimal", preview.minimalist, key("m")),
     ui.chip("pace", preview.pacing, key("r")),
@@ -416,10 +425,7 @@ function previewParts(width) {
     ui.chip("ascii", preview.ascii, key("i")),
   ];
   if (preview.layout === "pills") {
-    chips.unshift(
-      ui.chip("joins", preview.powerline.enabled, key("j")),
-      ui.chip("gaps", preview.rowGap, key("v"))
-    );
+    chips.unshift(ui.chip("joins", preview.powerline.enabled, key("j")));
   }
 
   return { title, bar: String(rendered).split("\n"), chips: chips.join("   ") };
@@ -849,8 +855,7 @@ function setOption(key, value) {
 function stepOption(field, direction) {
   const current = editedWidget()[field.key];
   if (field.number !== undefined) {
-    const from = Number.isFinite(current) ? current : field.number;
-    setOption(field.key, Math.max(0, Math.min(100, from + direction * 5)));
+    setOption(field.key, stepNumberField(field, current, direction));
     return;
   }
   const index = field.values.findIndex((value) => value === current);
@@ -870,11 +875,12 @@ function onEdit(key) {
       setOption(field.key, text || undefined);
       textInput = null;
     } else if (key.name === "backspace" || key.name === "delete") {
-      textInput = textInput.slice(0, -1);
-    } else if (key.sequence && key.sequence.length === 1 && !key.ctrl && !key.meta) {
-      const char = key.sequence;
-      if (char >= " " && char !== "\x7f" && textInput.length < TEXT_MAX) {
-        textInput += char;
+      textInput = Array.from(textInput).slice(0, -1).join("");
+    } else if (key.sequence && !key.ctrl && !key.meta && !/[\x00-\x1f\x7f]/.test(key.sequence)) {
+      // An emoji arrives as one key with two UTF-16 units, so count code points.
+      const max = field?.maxLength ?? TEXT_MAX;
+      if (Array.from(textInput + key.sequence).length <= max) {
+        textInput += key.sequence;
       }
     }
     return;
@@ -1029,21 +1035,38 @@ const toHex = (rgb) => `#${rgb.map((part) => part.toString(16).padStart(2, "0"))
 
 // One color as a pill in that color with the theme's pill text, the way the
 // bar draws it, then its hex value.
-function colorLine(label, rgb, ink) {
-  return { raw: `${ui.pill(` ${label.padEnd(9)}`, rgb, ink)}  ${dim(toHex(rgb))}` };
-}
-
-const PALETTE_SLOTS = [
-  ["model", "Model"],
-  ["context", "Context"],
-  ["git", "Git"],
-  ["weekly", "7d quota"],
-  ["meta", "Details"],
-  ["fiveHour", "OK"],
-  ["caution", "Caution"],
-  ["warn", "Danger"],
+function colorCell(label, rgb, ink) {
+  return `${ui.pill(` ${label.padEnd(9)}`, rgb, ink)}  ${dim(toHex(rgb))}`;
+}
+
+// Widget colors on the left, states on the right; a blank line between rows
+// keeps the pills from touching.
+const PALETTE_ROWS = [
+  [
+    ["model", "Model"],
+    ["fiveHour", "OK"],
+  ],
+  [
+    ["context", "Context"],
+    ["caution", "Caution"],
+  ],
+  [
+    ["git", "Git"],
+    ["warn", "Danger"],
+  ],
+  [
+    ["weekly", "7d quota"],
+    ["meta", "Details"],
+  ],
 ];
 
+function paletteLines(colors) {
+  return PALETTE_ROWS.flatMap((row, index) => [
+    ...(index ? [""] : []),
+    { raw: row.map(([slot, label]) => colorCell(label, colors[slot], colors.text)).join("    ") },
+  ]);
+}
+
 function themeDetails(id) {
   if (id === "custom") {
     return {
@@ -1067,9 +1090,7 @@ function themeDetails(id) {
       ...(background ? [{ raw: `${dim("For")} ${ui.tag(background)}` }] : []),
       "",
       heading("Palette"),
-      ...PALETTE_SLOTS.map(([slot, label]) =>
-        colorLine(label, theme.colors[slot], theme.colors.text)
-      ),
+      ...paletteLines(theme.colors),
       "",
       heading("Sample"),
       ...themeSample(theme.colors),
@@ -1204,7 +1225,7 @@ const POWERLINE_HELP = {
   enabled:
     "On: adjacent widgets share one pill, with a separator between them. Off: every widget gets its own pill.",
   rowGap:
-    "Puts a blank line between Pills rows, so stacked pills don't touch. The bar takes more lines (three rows become five).",
+    "Puts a blank line between rows, in every layout, so stacked pills don't touch and text rows get more air. The bar takes more lines (three rows become five).",
   style: "Sets start caps, end caps and separators in one go. Enter cycles the styles.",
   separators: "Glyphs between widgets of a pill. With several, they cycle per join, left to right.",
   startCaps: "Glyphs that open each pill. With several, they cycle per pill, left to right.",
@@ -1233,7 +1254,7 @@ function powerlineDetails(row) {
 function drawPowerline() {
   const items = POWERLINE_ROWS.map((row) => ({ text: row.label, value: powerlineRowValue(row) }));
   const notes =
-    config.layout === "lines"
+    config.layout !== "pills"
       ? ["Powerline shapes apply to Pills. Switch layout with l."]
       : [
           "A style sets caps and separators together; edit a list to fine-tune it.",
@@ -1318,10 +1339,24 @@ function drawGlyphs() {
   });
 }
 
+// Three short paragraphs per layout, each under 90 columns so a wide panel
+// shows them unwrapped.
 const LAYOUT_HELP = {
-  pills: "Widgets sit in colored pills. The Powerline tab sets their caps, separators and joins.",
-  lines:
-    "Colored text on the terminal background, with dividers and dot meters. Powerline shapes don't apply.",
+  pills: [
+    "Widgets sit in colored pills, joined by powerline caps and separators.",
+    "Meters draw as small dots on the pill's color, with a larger dot as the pace marker.",
+    "The Powerline tab sets the caps, separators, joins and the space between rows.",
+  ],
+  lines: [
+    "Colored text on the terminal background, with thin │ dividers between widgets.",
+    "Meters draw as dots in the ok, caution or danger color, over a dim track.",
+    "Powerline shapes don't apply; the theme, widgets and space between rows do.",
+  ],
+  classic: [
+    "Colored text on the terminal background, with | dividers between widgets.",
+    "Meters draw as blocks in one color: █ filled, ░ empty and │ as the pace marker.",
+    "Powerline shapes don't apply; the theme, widgets and space between rows do.",
+  ],
 };
 
 function drawLayout() {
@@ -1335,10 +1370,9 @@ function drawLayout() {
   return screenFrame({
     title: "Layout",
     items,
-    notes: ["Both layouts use your widgets and theme; Powerline shapes apply to Pills."],
     details: hovered && {
       title: hovered.name,
-      lines: [`${hovered.description}.`, "", LAYOUT_HELP[hovered.id] ?? ""],
+      lines: LAYOUT_HELP[hovered.id].flatMap((line, i) => (i ? ["", line] : [line])),
     },
     keys: [
       [ui.glyph.upDown, "preview"],

package/src/cli/doctor.js

@@ -22,6 +22,7 @@ const {
   readConfigFile,
   setConfigDir,
 } = require("../lib/shared");
+const { currentUserAndHost } = require("../lib/session");
 const { runStatuslineCommand } = require("../lib/run");
 const { detectColorDepth } = require("../lib/colors");
 const { readLog, getLogPath } = require("../lib/log");
@@ -55,6 +56,20 @@ function tildify(text) {
   return out;
 }
 
+// The bar preview can hold the host widget's user@host, and doctor output
+// gets pasted into issues: the names become user and host.
+function maskHost(text, { username, hostname } = currentUserAndHost()) {
+  let out = String(text);
+  if (!hostname) {
+    return out;
+  }
+  if (username) {
+    out = out.split(`${username}@${hostname}`).join("user@host");
+  }
+  const escaped = hostname.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  return out.replace(new RegExp(`(^|[^\\w.-])${escaped}(?![\\w.-])`, "g"), "$1host");
+}
+
 function stripAnsi(text) {
   return String(text).replace(/\x1b\[[0-9;]*m/g, "");
 }
@@ -216,7 +231,7 @@ async function doctorCommand(options = {}) {
       line("spawn", `${GREEN}ok${RESET} (${ms}ms)`);
       // The flex separator pads to the terminal width; shrink those gaps so
       // the widgets fit in the preview on wide terminals.
-      line("output", preview.replace(/ {3,}/g, "  ").slice(0, 120));
+      line("output", maskHost(preview.replace(/ {3,}/g, "  ")).slice(0, 120));
     } else {
       failed += 1;
       line("spawn", `${RED}failed${RESET} exit ${result.code} (${ms}ms)`);
@@ -244,4 +259,5 @@ async function doctorCommand(options = {}) {
 
 module.exports = {
   doctorCommand,
+  maskHost,
 };

package/src/index.js

@@ -102,7 +102,8 @@ const COMMANDS = [
   {
     name: "preset",
     arg: "[name]",
-    description: "View or apply a widget preset (default, compact, workspace, limits, full)",
+    description:
+      "View or apply a widget preset (default, compact, agent, git, tokens, quotas, full)",
     options: {
       list: { type: "boolean", short: "l", help: "list all available presets" },
     },

package/src/lib/catalog.js

@@ -122,6 +122,20 @@ const WIDGET_CATALOG = [
     description: "name of the project folder",
     summary: "project folder name",
   },
+  {
+    id: "os",
+    label: "Operating System",
+    unique: true,
+    description: "system agy runs on, including WSL",
+    summary: "system running agy",
+  },
+  {
+    id: "host",
+    label: "Host",
+    unique: true,
+    description: "current user and short host name",
+    summary: "current user and host",
+  },
   {
     id: "git",
     label: "VCS Branch",
@@ -257,6 +271,13 @@ const WIDGET_CATALOG = [
     description: "session tokens, as a total or split into input and output",
     summary: "session tokens, total or split",
   },
+  {
+    id: "clock",
+    label: "Clock",
+    unique: true,
+    description: "current local time, in the format set under clock",
+    summary: "current local time",
+  },
   {
     id: "tokensToday",
     label: "Tokens Today",

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;
-    }
+// 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];
 
-    return Math.round(((r - 8) / 247) * 24) + 232;
-  }
-
-  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]) {

package/src/lib/config.js

@@ -39,6 +39,8 @@ const VALID_WIDGET_IDS = new Set([
   "contextTokens",
   "cwd",
   "project",
+  "os",
+  "host",
   "git",
   "gitChanges",
   "gitFiles",
@@ -58,6 +60,7 @@ const VALID_WIDGET_IDS = new Set([
   "cacheCreate",
   "cacheHit",
   "totalTokens",
+  "clock",
   "tokensToday",
   "tokensWeek",
   "exec",
@@ -91,9 +94,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";
@@ -255,11 +263,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" },
@@ -277,41 +286,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" },
+    ],
+  },
+  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" },
-      { id: "mode" },
     ],
   },
-  limits: {
-    id: "limits",
-    name: "Heavy usage",
-    description: "5h, 7d, third-party and Argon quotas with resets, one quota per row",
+  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" },
     ],
@@ -319,7 +371,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" },
@@ -344,7 +396,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;

package/src/lib/fit.js

@@ -6,9 +6,12 @@ const { charWidth, visibleWidth } = require("./formatters");
 // first entry first. Ids not listed (custom ones) go before all of them.
 const DROP_ORDER = [
   "customText",
+  "os",
+  "host",
   "gitStash",
   "gitWorktree",
   "title",
+  "clock",
   "version",
   "cacheCreate",
   "cacheRead",

package/src/lib/formatters.js

@@ -374,7 +374,23 @@ function homePath(value) {
     return "";
   }
 
-  const resolved = path.resolve(String(value));
+  const input = String(value);
+  if (input === "~" || /^~[\\/]/.test(input)) {
+    return input;
+  }
+  const windowsAbsolute = /^[a-z]:[\\/]|^\\\\/i.test(input);
+  const posixAbsolute = input.startsWith("/");
+
+  // Payload paths can come from another OS. Preserve absolute paths in that
+  // format instead of resolving them relative to this machine's cwd.
+  if (
+    (windowsAbsolute && process.platform !== "win32") ||
+    (posixAbsolute && process.platform === "win32")
+  ) {
+    return input;
+  }
+
+  const resolved = path.resolve(input);
   const home = path.resolve(os.homedir());
   const prefix =
     process.platform === "win32"
@@ -388,6 +404,60 @@ function homePath(value) {
   return resolved;
 }
 
+function isValidDepth(value) {
+  return Number.isInteger(value) && value >= 1 && value <= 10;
+}
+
+// Keep the path's root and final `depth` folders, replacing any middle
+// folders with one ellipsis. Accept either OS's path separators on every OS.
+function shortenPath(value, depth, ascii = false) {
+  const text = String(value ?? "");
+  if (!text || !isValidDepth(depth)) {
+    return text;
+  }
+
+  let root = "";
+  let rest = text;
+  let separator = text.match(/[\\/]/)?.[0] || "/";
+  // A network share keeps \\server\share (or //server/share) as its root.
+  const unc = text.match(/^([\\/]{2}[^\\/]+[\\/][^\\/]+)([\\/])?(.*)$/);
+  const drive = text.match(/^([a-z]:)([\\/])(.*)$/i);
+
+  if (unc) {
+    root = unc[1];
+    separator = unc[2] || separator;
+    rest = unc[3];
+  } else if (drive) {
+    root = drive[1];
+    separator = drive[2];
+    rest = drive[3];
+  } else if (text === "~" || /^~[\\/]/.test(text)) {
+    root = "~";
+    if (text.length > 1) {
+      separator = text[1];
+      rest = text.slice(2);
+    } else {
+      rest = "";
+    }
+  } else if (text[0] === "/" || text[0] === "\\") {
+    root = text[0];
+    separator = text[0];
+    rest = text.slice(1);
+  }
+
+  const folders = rest.split(/[\\/]+/).filter(Boolean);
+  if (folders.length <= depth) {
+    return text;
+  }
+
+  const suffix = folders.slice(-depth).join(separator);
+  const ellipsis = ascii ? "..." : "…";
+  if (root === "/" || root === "\\") {
+    return `${root}${ellipsis}${separator}${suffix}`;
+  }
+  return `${root ? `${root}${separator}` : ""}${ellipsis}${separator}${suffix}`;
+}
+
 function label(emojis, emoji, named, value) {
   if (emojis) {
     return named ? ` ${emoji} ${named}: ${value} ` : ` ${emoji} ${value} `;
@@ -560,15 +630,44 @@ function clipText(text, max, ascii = false) {
   const ellipsis = ascii ? "..." : "…";
   let out = "";
   let width = 0;
-  for (const char of value) {
-    const w = charWidth(char.codePointAt(0));
+  let index = 0;
+  const escape = /\x1b(?:\[[0-?]*[ -/]*[@-~]|\]8;;[^\x1b\x07]*(?:\x07|\x1b\\))/y;
+  while (index < value.length) {
+    if (value[index] === "\x1b") {
+      escape.lastIndex = index;
+      const match = escape.exec(value);
+      if (match) {
+        out += match[0];
+        index += match[0].length;
+        continue;
+      }
+    }
+
+    const code = value.codePointAt(index);
+    const char = String.fromCodePoint(code);
+    const w = charWidth(code);
     if (width + w > max - ellipsis.length) {
       break;
     }
     out += char;
     width += w;
+    index += char.length;
   }
-  return out.trimEnd() + ellipsis;
+  const clipped = out.trimEnd() + ellipsis;
+  return /\x1b\[[0-?]*[ -/]*m/.test(clipped) ? `${clipped}\x1b[0m` : clipped;
+}
+
+function isValidMaxWidth(value) {
+  return Number.isInteger(value) && value >= 4 && value <= 200;
+}
+
+function limitWidth(value, widget, ascii = false, fallback) {
+  const width = isValidMaxWidth(widget?.maxWidth)
+    ? widget.maxWidth
+    : isValidMaxWidth(fallback)
+      ? fallback
+      : null;
+  return width === null ? value : clipText(value, width, ascii);
 }
 
 // Removes escape sequences and control characters from text that did not
@@ -656,6 +755,10 @@ module.exports = {
   formatTasks,
   formatMode,
   clipText,
+  limitWidth,
+  isValidMaxWidth,
+  shortenPath,
+  isValidDepth,
   quotaColor,
   contextColor,
   resolveQuotaThresholds,