agy-powerline 1.4.0 → 1.5.0

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,

package/src/lib/layouts/lines.js

@@ -17,6 +17,7 @@ const {
   basenameOf,
   homePath,
   formatResetText,
+  formatClockTime,
   paceIndex,
   paceGlyph,
   formatGitSync,
@@ -25,7 +26,8 @@ const {
   gitFileParts,
   formatTasks,
   formatMode,
-  clipText,
+  limitWidth,
+  shortenPath,
   formatTokens,
   formatContextTokens,
   shortModelName,
@@ -42,10 +44,12 @@ const {
   resolveColor,
   widgetColors,
   widgetTag,
+  OS_ICONS,
   isRaw,
   isPaced,
   METER_STYLES,
   meterStyle,
+  hiddenByThreshold,
   hasNoData,
   RAM_CAUTION,
   RAM_DANGER,
@@ -197,7 +201,7 @@ function rampColor(at, palette) {
 function buildLinesSegment(id, session, palette, emojis, ascii = false, widget = {}, config = {}) {
   // Raw widgets keep only their value: no icon, no label.
   const raw = isRaw(widget, config);
-  const tag = (icon) => widgetTag(id, { emojis, raw, icon });
+  const tag = (icon) => widgetTag(id, { emojis, raw, icon, widget, ascii });
   // Meters: 25 cells, or 12 when the bar is fitted to a narrow terminal;
   // Classic draws the same cells as blocks.
   const classic = config.layout === "classic";
@@ -266,11 +270,14 @@ function buildLinesSegment(id, session, palette, emojis, ascii = false, widget =
     return { thresh, blinkSeq, color };
   }
 
-  if (hasNoData(id, session)) {
+  if (hasNoData(id, session) || hiddenByThreshold(id, widget, session)) {
     return null;
   }
 
   switch (id) {
+    case "clock":
+      return fg(palette.text) + tag() + formatClockTime(new Date(), config.clock) + RESET;
+
     case "model":
       if (!session.model) {
         return null;
@@ -278,7 +285,11 @@ function buildLinesSegment(id, session, palette, emojis, ascii = false, widget =
       return (
         fg(palette.model) +
         tag() +
-        (widget?.short ? shortModelName(session.model, ascii) : session.model) +
+        limitWidth(
+          widget?.short ? shortModelName(session.model, ascii) : session.model,
+          widget,
+          ascii
+        ) +
         RESET
       );
 
@@ -389,7 +400,11 @@ function buildLinesSegment(id, session, palette, emojis, ascii = false, widget =
     }
 
     case "cwd": {
-      const dirname = homePath(session.cwd);
+      const dirname = limitWidth(
+        shortenPath(homePath(session.cwd), widget?.depth, ascii),
+        widget,
+        ascii
+      );
       if (!dirname) {
         return null;
       }
@@ -397,13 +412,28 @@ function buildLinesSegment(id, session, palette, emojis, ascii = false, widget =
     }
 
     case "project": {
-      const proj = basenameOf(session.project);
+      const proj = limitWidth(basenameOf(session.project), widget, ascii);
       if (!proj) {
         return null;
       }
       return fg(palette.location) + tag() + proj + RESET;
     }
 
+    case "os": {
+      if (!session.os) {
+        return null;
+      }
+      return fg(palette.location) + tag(OS_ICONS[session.os]) + session.os + RESET;
+    }
+
+    case "host": {
+      if (!session.hostname) {
+        return null;
+      }
+      const name = session.username ? `${session.username}@${session.hostname}` : session.hostname;
+      return fg(palette.location) + tag() + name + RESET;
+    }
+
     case "git": {
       if (!session.git || !session.git.branch) {
         return null;
@@ -411,11 +441,12 @@ function buildLinesSegment(id, session, palette, emojis, ascii = false, widget =
       const opStr = widget.operation === false ? "" : formatGitOperation(session.git.operation);
       const syncStr = formatGitSync(session.git.ahead, session.git.behind, ascii);
       const syncPart = syncStr ? ` ${syncStr}` : "";
+      const branch = limitWidth(session.git.branch, widget, ascii);
       return (
         fg(palette.git) +
         tag() +
         "(" +
-        session.git.branch +
+        branch +
         (session.git.dirty ? `${fg(palette.gitDirty)}*` : "") +
         (opStr ? `${fg(palette.gitDirty)} ${opStr}` : "") +
         (syncPart ? `${fg(palette.git)}${syncPart}` : "") +
@@ -469,7 +500,9 @@ function buildLinesSegment(id, session, palette, emojis, ascii = false, widget =
       if (!session.gitDetails?.worktree) {
         return null;
       }
-      return fg(palette.git) + tag() + session.gitDetails.worktree + RESET;
+      return (
+        fg(palette.git) + tag() + limitWidth(session.gitDetails.worktree, widget, ascii) + RESET
+      );
 
     case "plan":
       if (!session.plan) {
@@ -506,7 +539,7 @@ function buildLinesSegment(id, session, palette, emojis, ascii = false, widget =
       if (!session.title) {
         return null;
       }
-      return fg(palette.text) + tag() + clipText(session.title, TITLE_MAX, ascii) + RESET;
+      return fg(palette.text) + tag() + limitWidth(session.title, widget, ascii, TITLE_MAX) + RESET;
 
     case "sandbox": {
       if (!session.sandbox) {
@@ -603,11 +636,15 @@ function buildLinesSegment(id, session, palette, emojis, ascii = false, widget =
       if (!widget?.text) {
         return null;
       }
-      return fg(palette.text) + tag() + widget.text + RESET;
+      return fg(palette.text) + tag() + limitWidth(widget.text, widget, ascii) + RESET;
     }
 
     case "exec": {
-      const output = execWidgetOutput(widget, session);
+      // Only real output is cut: the [cmd] preview and blocked markers stay whole.
+      const output =
+        session.execMode === "run"
+          ? limitWidth(execWidgetOutput(widget, session), widget, ascii)
+          : execWidgetOutput(widget, session);
       if (!output) {
         return null;
       }

package/src/lib/layouts/pills.js

@@ -20,6 +20,7 @@ const { pickGlyph, glyphChar } = require("../powerline");
 const {
   quotaColor,
   contextColor,
+  formatClockTime,
   resolveQuotaThresholds,
   resolveContextThresholds,
   shouldBlink,
@@ -34,7 +35,8 @@ const {
   gitFileParts,
   formatTasks,
   formatMode,
-  clipText,
+  limitWidth,
+  shortenPath,
   homePath,
   basenameOf,
   label,
@@ -48,10 +50,12 @@ const {
   resolveColor,
   widgetColors,
   widgetTag,
+  OS_ICONS,
   isRaw,
   isPaced,
   METER_STYLES,
   meterStyle,
+  hiddenByThreshold,
   hasNoData,
   RAM_CAUTION,
   RAM_DANGER,
@@ -169,7 +173,7 @@ function pill(color, text, blink = false) {
 function buildSegment(id, session, colors, emojis, ascii = false, widget = {}, config = {}) {
   // Raw widgets keep only their value: no icon, no label.
   const raw = isRaw(widget, config);
-  const tag = (icon) => widgetTag(id, { emojis, raw, icon });
+  const tag = (icon) => widgetTag(id, { emojis, raw, icon, widget, ascii });
   const lbl = (value, icon) => ` ${tag(icon)}${value} `;
   // The pill frames a colored meter; plain-text meters (ASCII) get brackets.
   const open = ascii ? "[" : "";
@@ -178,18 +182,27 @@ function buildSegment(id, session, colors, emojis, ascii = false, widget = {}, c
   const pace = (quota) => (isPaced(widget, config) ? quota.elapsedPct : null);
   const over200k = session.exceeds200k ? " >200k" : "";
 
-  if (hasNoData(id, session)) {
+  if (hasNoData(id, session) || hiddenByThreshold(id, widget, session)) {
     return null;
   }
 
   switch (id) {
+    case "clock":
+      return pill(colors.meta, lbl(formatClockTime(new Date(), config.clock)));
+
     case "model":
       if (!session.model) {
         return null;
       }
       return pill(
         colors.model,
-        lbl(widget?.short ? shortModelName(session.model, ascii) : session.model)
+        lbl(
+          limitWidth(
+            widget?.short ? shortModelName(session.model, ascii) : session.model,
+            widget,
+            ascii
+          )
+        )
       );
 
     case "quota": {
@@ -480,7 +493,11 @@ function buildSegment(id, session, colors, emojis, ascii = false, widget = {}, c
     }
 
     case "cwd": {
-      const name = homePath(session.cwd);
+      const name = limitWidth(
+        shortenPath(homePath(session.cwd), widget?.depth, ascii),
+        widget,
+        ascii
+      );
       if (!name) {
         return null;
       }
@@ -488,13 +505,28 @@ function buildSegment(id, session, colors, emojis, ascii = false, widget = {}, c
     }
 
     case "project": {
-      const name = basenameOf(session.project);
+      const name = limitWidth(basenameOf(session.project), widget, ascii);
       if (!name) {
         return null;
       }
       return pill(colors.meta, lbl(name));
     }
 
+    case "os": {
+      if (!session.os) {
+        return null;
+      }
+      return pill(colors.meta, lbl(session.os, OS_ICONS[session.os]));
+    }
+
+    case "host": {
+      if (!session.hostname) {
+        return null;
+      }
+      const name = session.username ? `${session.username}@${session.hostname}` : session.hostname;
+      return pill(colors.meta, lbl(name));
+    }
+
     case "git": {
       // Antigravity can send vcs.type without a branch; an empty pill says nothing.
       if (!session.git?.branch) {
@@ -505,9 +537,10 @@ function buildSegment(id, session, colors, emojis, ascii = false, widget = {}, c
       const opPart = opStr ? `|${opStr}` : "";
       const syncStr = formatGitSync(session.git.ahead, session.git.behind, ascii);
       const syncPart = syncStr ? ` ${syncStr}` : "";
+      const branch = limitWidth(session.git.branch, widget, ascii);
       return pill(
         session.git.dirty ? colors.gitDirty : colors.git,
-        lbl(`${mark}${session.git.branch}${opPart}${syncPart}`)
+        lbl(`${mark}${branch}${opPart}${syncPart}`)
       );
     }
 
@@ -545,7 +578,7 @@ function buildSegment(id, session, colors, emojis, ascii = false, widget = {}, c
       if (!session.gitDetails?.worktree) {
         return null;
       }
-      return pill(colors.git, lbl(session.gitDetails.worktree));
+      return pill(colors.git, lbl(limitWidth(session.gitDetails.worktree, widget, ascii)));
 
     case "plan":
       if (!session.plan) {
@@ -590,7 +623,7 @@ function buildSegment(id, session, colors, emojis, ascii = false, widget = {}, c
       if (!session.title) {
         return null;
       }
-      return pill(colors.meta, lbl(clipText(session.title, TITLE_MAX, ascii)));
+      return pill(colors.meta, lbl(limitWidth(session.title, widget, ascii, TITLE_MAX)));
 
     case "ram": {
       const pct = session.ramPct ?? 0;
@@ -679,11 +712,15 @@ function buildSegment(id, session, colors, emojis, ascii = false, widget = {}, c
       if (!widget?.text) {
         return null;
       }
-      return pill(colors.meta, lbl(widget.text));
+      return pill(colors.meta, lbl(limitWidth(widget.text, widget, ascii)));
     }
 
     case "exec": {
-      const output = execWidgetOutput(widget, session);
+      // Only real output is cut: the [cmd] preview and blocked markers stay whole.
+      const output =
+        session.execMode === "run"
+          ? limitWidth(execWidgetOutput(widget, session), widget, ascii)
+          : execWidgetOutput(widget, session);
       if (!output) {
         return null;
       }

package/src/lib/session.js

@@ -1,9 +1,10 @@
 "use strict";
 
 const os = require("os");
-const { formatReset, resetInSeconds, firstText } = require("./formatters");
+const { formatReset, resetInSeconds, firstText, stripControl } = require("./formatters");
 const { resolveGit, resolveGitDetails } = require("./git");
 const { resolveUsage } = require("./usage");
+const { isWsl } = require("./paths");
 
 const FIVE_HOURS = 5 * 3600;
 const SEVEN_DAYS = 7 * 86400;
@@ -22,6 +23,46 @@ const QUOTA_BUCKETS = {
 // No quota window lasts a year: a reset further out is a broken value.
 const MAX_RESET_SECONDS = 366 * 86400;
 
+// Node's platform ids, spelled the way people write them.
+const OS_NAMES = {
+  win32: "Windows",
+  darwin: "macOS",
+  linux: "Linux",
+  android: "Android",
+  freebsd: "FreeBSD",
+  openbsd: "OpenBSD",
+  sunos: "SunOS",
+  aix: "AIX",
+};
+
+function currentOsName() {
+  if (process.platform === "linux" && isWsl()) {
+    return "WSL";
+  }
+  return OS_NAMES[process.platform] || process.platform;
+}
+
+function currentUserAndHost() {
+  let userInfoName = "";
+  try {
+    userInfoName = os.userInfo().username;
+  } catch {
+    // Some containers have no passwd entry for the current user.
+  }
+  const username =
+    [userInfoName, process.env.USER, process.env.USERNAME]
+      .map((name) => stripControl(name).trim())
+      .find(Boolean) || "";
+
+  let hostname = "";
+  try {
+    hostname = stripControl(os.hostname()).split(".")[0].trim();
+  } catch {
+    // The host widget hides when the OS cannot provide a name.
+  }
+  return { username, hostname };
+}
+
 // Payload numbers can be strings, negative or absurd. The bar must never show
 // NaN, a negative count or more than 100%.
 function count(value) {
@@ -193,9 +234,15 @@ function extractSession(data, config, options = {}) {
   const cacheHitPct = cacheTotal > 0 ? Math.round((cacheReadTokens * 100) / cacheTotal) : 0;
 
   const modelName = firstText(data.model?.display_name, data.model?.id);
+  const uses = (id) => Boolean(config?.widgets?.some((widget) => widget?.id === id));
+  const osName = uses("os") ? currentOsName() : "";
+  const { username, hostname } = uses("host") ? currentUserAndHost() : {};
 
   return {
+    os: osName,
     ramPct,
+    username: username || "",
+    hostname: hostname || "",
     model: modelName,
     contextPct,
     contextSize,
@@ -254,5 +301,6 @@ module.exports = {
   readQuota,
   tightestQuota,
   contextUsedPercent,
+  currentUserAndHost,
   extractSession,
 };