agy-powerline 1.3.0 → 1.5.0

package/src/lib/git.js

@@ -13,6 +13,15 @@ const SYNC_CACHE_NAME = ".git-sync-cache.json";
 const SYNC_CACHE_MAX = 20;
 const COMMIT = /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/;
 
+// A git call that runs past its time is skipped until a later refresh. Tests
+// give git more time: on a busy CI machine a plain call can take longer.
+const timeouts = { sync: 150, detail: 300 };
+function setGitTimeouts(next) {
+  const previous = { ...timeouts };
+  Object.assign(timeouts, next);
+  return previous;
+}
+
 // 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
 // wherever this process runs, and the upward walk would then report that
@@ -392,7 +401,7 @@ function getGitSync(gitDir, branch) {
       ["rev-list", "--left-right", "--count", `${branch}...${branch}@{upstream}`, "--"],
       {
         cwd: path.dirname(gitDir),
-        timeout: 150,
+        timeout: timeouts.sync,
         stdio: ["ignore", "pipe", "ignore"],
         encoding: "utf8",
         // Antigravity may run the statusline without a console; without this,
@@ -414,7 +423,7 @@ function getGitSync(gitDir, branch) {
     // A timeout or missing git is worth knowing about when ahead/behind
     // counts never show.
     if (err.code === "ETIMEDOUT" || err.signal === "SIGTERM") {
-      logWarning("GIT_TIMEOUT", { timeoutMs: 150 });
+      logWarning("GIT_TIMEOUT", { timeoutMs: timeouts.sync });
     } else if (err.code === "ENOENT") {
       logWarning("GIT_NOT_FOUND");
     }
@@ -437,7 +446,6 @@ const DETAIL_NEEDS = {
 const STATUS_CACHE_NAME = ".git-status-cache.json";
 const STATUS_CACHE_MAX = 20;
 const STATUS_TTL_MS = 5000;
-const DETAIL_TIMEOUT_MS = 300;
 
 // No optional locks: the bar must never hold the index lock and make the
 // user's own git commands fail. The -c flags and the submodule skip keep git
@@ -559,7 +567,7 @@ function runGitDetail(cwd, args) {
     const { execFileSync } = require("child_process");
     return execFileSync("git", args, {
       cwd,
-      timeout: DETAIL_TIMEOUT_MS,
+      timeout: timeouts.detail,
       stdio: ["ignore", "pipe", "ignore"],
       encoding: "utf8",
       maxBuffer: 16 * 1024 * 1024,
@@ -567,7 +575,7 @@ function runGitDetail(cwd, args) {
     });
   } catch (err) {
     if (err.code === "ETIMEDOUT" || err.signal === "SIGTERM") {
-      logWarning("GIT_TIMEOUT", { timeoutMs: DETAIL_TIMEOUT_MS });
+      logWarning("GIT_TIMEOUT", { timeoutMs: timeouts.detail });
     } else if (err.code === "ENOENT") {
       logWarning("GIT_NOT_FOUND");
     }
@@ -767,4 +775,5 @@ module.exports = {
   getGitDetails,
   resolveGitDetails,
   clearGitDetailsCache,
+  setGitTimeouts,
 };

package/src/lib/layouts/lines.js

@@ -3,6 +3,7 @@
 const {
   rgb,
   fg,
+  mix,
   RESET,
   DIM,
   BOLD,
@@ -16,6 +17,7 @@ const {
   basenameOf,
   homePath,
   formatResetText,
+  formatClockTime,
   paceIndex,
   paceGlyph,
   formatGitSync,
@@ -24,7 +26,8 @@ const {
   gitFileParts,
   formatTasks,
   formatMode,
-  clipText,
+  limitWidth,
+  shortenPath,
   formatTokens,
   formatContextTokens,
   shortModelName,
@@ -41,10 +44,12 @@ const {
   resolveColor,
   widgetColors,
   widgetTag,
+  OS_ICONS,
   isRaw,
   isPaced,
   METER_STYLES,
   meterStyle,
+  hiddenByThreshold,
   hasNoData,
   RAM_CAUTION,
   RAM_DANGER,
@@ -143,27 +148,41 @@ function renderDotMeter(
       : colorForUsedPct(pct, palette, options));
 
   const marker = paceIndex(options.elapsedPct, width);
-  const [full, blank] = METER_STYLES[options.style] || METER_STYLES.dots;
+  const [full, blank, pace] = METER_STYLES[options.style] || METER_STYLES.dots;
+  // A Classic meter is one color: the empty glyph's own texture (░) sets it
+  // apart, and the pace marker is a thin line.
+  const classic = options.classic === true;
+  const track = palette.track || rgb(60, 65, 75);
+  // ramp shades each filled cell by its place, from the theme's ok color to
+  // caution to danger, over the track; rings keeps the fill's color, faded.
+  const ramp = options.style === "ramp";
+  const trackColor = ramp
+    ? track
+    : options.style === "rings"
+      ? mix(color, track, 0.5)
+      : classic
+        ? color
+        : track;
+  const fillColor = (i) => (ramp ? rampColor(width > 1 ? i / (width - 1) : 0, palette) : color);
+  const markerColor = palette.text || LINES.white;
 
-  if (marker < 0) {
+  if (marker < 0 && !ramp) {
     if (ascii) {
       return fg(color) + "#".repeat(filled) + DIM + "-".repeat(empty) + RESET;
     }
-    const trackColor = palette.track || rgb(60, 65, 75);
     return fg(color) + full.repeat(filled) + fg(trackColor) + blank.repeat(empty) + RESET;
   }
 
   // The marker replaces the dot where the quota window currently is.
-  const trackColor = palette.track || rgb(60, 65, 75);
-  const markerColor = palette.text || LINES.white;
+  const markGlyph = ascii ? paceGlyph(true) : classic ? "│" : pace || paceGlyph(false);
   // ASCII empties are dim; NORMAL ends that without dropping a blink.
   const undim = ascii ? NORMAL : "";
   let out = "";
   for (let i = 0; i < width; i++) {
     if (i === marker) {
-      out += undim + fg(markerColor) + paceGlyph(ascii);
+      out += undim + fg(markerColor) + markGlyph;
     } else if (i < filled) {
-      out += undim + fg(color) + (ascii ? "#" : full);
+      out += undim + fg(fillColor(i)) + (ascii ? "#" : full);
     } else {
       out += ascii ? DIM + "-" : fg(trackColor) + blank;
     }
@@ -171,16 +190,27 @@ function renderDotMeter(
   return out + RESET;
 }
 
+// A point along the meter, 0 to 1, as a color between ok, caution and danger.
+function rampColor(at, palette) {
+  const ok = palette.quotaLow || LINES.green;
+  const caution = palette.quotaHigh || LINES.yellow;
+  const danger = palette.quotaCrit || LINES.red;
+  return at <= 0.5 ? mix(ok, caution, at * 2) : mix(caution, danger, (at - 0.5) * 2);
+}
+
 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 });
-  // Meters: 25 dots, or 12 when the bar is fitted to a narrow terminal.
+  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";
   const dots = widget?.compact ? 12 : 25;
-  const style = meterStyle(widget, config, "lines");
+  const style = meterStyle(widget, config, classic ? "classic" : "lines");
   const pace = (quota, thresh) => ({
     ...thresh,
     style,
+    classic,
     elapsedPct: isPaced(widget, config) ? quota.elapsedPct : null,
   });
   const over200k = session.exceeds200k ? " >200k" : "";
@@ -240,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;
@@ -252,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
       );
 
@@ -328,6 +365,7 @@ function buildLinesSegment(id, session, palette, emojis, ascii = false, widget =
           ...thresh,
           color,
           style,
+          classic,
         }) +
         " " +
         fg(color) +
@@ -362,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;
       }
@@ -370,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;
@@ -384,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}` : "") +
@@ -442,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) {
@@ -479,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) {
@@ -576,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;
       }
@@ -707,7 +771,7 @@ function renderLinesLayout(session, emojis, ascii = false, colors, config) {
     return RESET;
   }
 
-  const pipe = ` ${DIM}${ascii ? "|" : "│"}${RESET} `;
+  const pipe = ` ${DIM}${ascii || config.layout === "classic" ? "|" : "│"}${RESET} `;
 
   return (
     rows
@@ -715,7 +779,8 @@ function renderLinesLayout(session, emojis, ascii = false, colors, config) {
         const parts = groups.map((group) => group.join(pipe));
         return joinFlex(parts, session.terminalWidth);
       })
-      .join("\n") + RESET
+      // rowGap: a line holding a space, as in Pills, so a host keeps it.
+      .join(config.rowGap === true ? "\n \n" : "\n") + RESET
   );
 }
 

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,
@@ -67,7 +71,12 @@ function fillMeter(pct, width, fillColor, emptyColor, segmentColor, pace = {}) {
   const ratio = Math.max(0, Math.min(100, Number(pct))) / 100;
   const used = Math.round(ratio * width);
   const marker = paceIndex(pace.elapsedPct, width);
-  if (METER_STYLES[pace.style]) {
+  // pips, the default, needs a Unicode font: ASCII mode keeps the cells.
+  const pips = pace.style === "pips";
+  if (pips && !pace.ascii && getActiveDepth() !== "none") {
+    return pipMeter(used, marker, width, fillColor, emptyColor) + bg(segmentColor);
+  }
+  if (METER_STYLES[pace.style] && !(pips && pace.ascii)) {
     return glyphMeter(used, marker, width, METER_STYLES[pace.style], pace);
   }
   // The fill is a background color; without color it is drawn with glyphs.
@@ -87,10 +96,30 @@ function fillMeter(pct, width, fillColor, emptyColor, segmentColor, pace = {}) {
   return meter + bg(segmentColor);
 }
 
+// Small dots on the pill's own color: the filled ones in the light fill color,
+// the rest in the dark track color, the same pair cells use. The pace marker
+// is a larger dot in the other color, so nothing in the meter is a line.
+function pipMeter(used, marker, width, fillColor, emptyColor) {
+  let meter = "";
+  let color = null;
+
+  for (let i = 0; i < width; i++) {
+    const filled = i < used;
+    const next = i === marker ? (filled ? emptyColor : fillColor) : filled ? fillColor : emptyColor;
+    if (next !== color) {
+      meter += fg(next);
+      color = next;
+    }
+    meter += i === marker ? METER_STYLES.pips[2] : METER_STYLES.pips[0];
+  }
+
+  return meter;
+}
+
 // A glyph style draws on the pill's own color, with no cells: filled glyphs in
 // the pill's text color (readable on the pill, gradients included), empty
 // ones in the same color dimmed. ASCII mode keeps # and -.
-function glyphMeter(used, marker, width, [full, empty], { ascii, textColor }) {
+function glyphMeter(used, marker, width, [full, empty, pace], { ascii, textColor }) {
   let meter = fg(textColor);
   let dim = false;
 
@@ -101,7 +130,7 @@ function glyphMeter(used, marker, width, [full, empty], { ascii, textColor }) {
       dim = blank;
     }
     if (i === marker) {
-      meter += paceGlyph(ascii);
+      meter += (!ascii && pace) || paceGlyph(ascii);
     } else if (ascii) {
       meter += blank ? "-" : "#";
     } else {
@@ -144,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 ? "[" : "";
@@ -153,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": {
@@ -455,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;
       }
@@ -463,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) {
@@ -480,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}`)
       );
     }
 
@@ -520,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) {
@@ -565,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;
@@ -654,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;
       }
@@ -686,7 +748,6 @@ function buildRows(session, config, colors) {
   // The widgets shown in the current row, so a gradient can be spread over
   // exactly those once the row is complete.
   let placed = [];
-  const splitEveryWidget = !config.powerline.enabled;
   const gradient = gradientStops(config.gradient);
 
   function styledSegment(widget, ownColors) {
@@ -767,13 +828,8 @@ function buildRows(session, config, colors) {
       continue;
     }
 
-    const group = splitEveryWidget ? [] : current;
-    placed.push({ widget, group, index: group.length });
-    group.push(segment);
-
-    if (splitEveryWidget) {
-      groups.push(group);
-    }
+    placed.push({ widget, group: current, index: current.length });
+    current.push(segment);
   }
 
   flushRow();
@@ -794,20 +850,36 @@ function rightCap(color, terminal, glyph) {
   return glyph ? fg(color) + capBackground(terminal) + glyph : "";
 }
 
+// Compared as the terminal will draw them: at 256 colors two different colors
+// can land on the same code, and without color everything is the same.
 function sameColor(a, b) {
-  return String(a) === String(b);
+  return bg(a) === bg(b);
+}
+
+// Each solid Powerline glyph (U+E0B0 to U+E0BE, even code points) has a thin
+// outline twin at the next code point. The round twins are drawn shorter than
+// the cell in many Nerd Fonts, so round joins use a box-drawing line, which
+// spans the full height.
+function thinGlyph(glyph) {
+  const code = glyph.codePointAt(0);
+  if (glyph.length !== 1 || code < 0xe0b0 || code > 0xe0be || code % 2 !== 0) {
+    return glyph;
+  }
+  return code === 0xe0b4 || code === 0xe0b6 ? "│" : String.fromCodePoint(code + 1);
 }
 
 // A separator between two widgets of the same color would vanish, so it is
-// drawn in the text color instead. Inverted separators (meant for
+// drawn as its thin outline in the text color instead, the way Powerline
+// divides one color. ASCII joins are characters, not shapes, so they take the
+// text color too, which reads on any pill. Inverted separators (meant for
 // left-pointing glyphs) take the next widget's color on the previous one's.
-function joinSegments(previous, next, glyph, invert, textColor) {
+function joinSegments(previous, next, glyph, invert, textColor, ascii = false) {
   if (!glyph) {
     return "";
   }
 
-  if (sameColor(previous.color, next.color)) {
-    return fg(next.textColor || textColor) + bg(next.color) + glyph;
+  if (ascii || sameColor(previous.color, next.color)) {
+    return fg(next.textColor || textColor) + bg(next.color) + thinGlyph(glyph);
   }
 
   return invert
@@ -846,13 +918,19 @@ function renderMeterSegment(segment, colors, ascii = false) {
 
 // Caps cycle per pill and separators per join, counted across the whole
 // statusline, so lists with several glyphs alternate from left to right.
+// Glyphs are drawn without bold, which some fonts draw wider or shifted, and
+// the pill ends on the terminal's background so the padding after it stays
+// clear even without an end cap. Without color, solid caps would be blobs of
+// text color, so only ASCII brackets are kept.
 function renderGroup(group, colors, config, counters = { pill: 0, separator: 0 }) {
   const { powerline } = config;
   const ascii = config.ascii === true;
   const terminal = colors.terminal;
   const pillIndex = counters.pill++;
-  const startCap = glyphChar(pickGlyph(powerline.startCaps, pillIndex), "startCap", ascii);
-  const endCap = glyphChar(pickGlyph(powerline.endCaps, pillIndex), "endCap", ascii);
+  const caps = ascii || getActiveDepth() !== "none";
+  const cap = (list, slot) => (caps ? glyphChar(pickGlyph(list, pillIndex), slot, ascii) : "");
+  const startCap = cap(powerline.startCaps, "startCap");
+  const endCap = cap(powerline.endCaps, "endCap");
 
   let out = leftCap(group[0].color, terminal, startCap);
 
@@ -873,13 +951,22 @@ function renderGroup(group, colors, config, counters = { pill: 0, separator: 0 }
       const slot = counters.separator++;
       const glyph = glyphChar(pickGlyph(powerline.separators, slot), "separator", ascii);
       const invert = powerline.separatorInvert[slot % (powerline.separators.length || 1)];
-      out += joinSegments(segment, group[i + 1], glyph, invert === true, colors.text);
+      out +=
+        NORMAL + joinSegments(segment, group[i + 1], glyph, invert === true, colors.text, ascii);
     }
   }
 
-  out += rightCap(group[group.length - 1].color, terminal, endCap);
+  const last = group[group.length - 1].color;
+  return out + NORMAL + (endCap ? rightCap(last, terminal, endCap) : capBackground(terminal));
+}
 
-  return out;
+// With joins off every widget is a pill of its own, one space from the next;
+// the Flex Separator still decides where the row opens up.
+function renderPills(group, colors, config, counters) {
+  if (config.powerline.enabled) {
+    return renderGroup(group, colors, config, counters);
+  }
+  return group.map((segment) => renderGroup([segment], colors, config, counters)).join(" ");
 }
 
 function joinFlex(parts, terminalWidth) {
@@ -917,7 +1004,7 @@ function renderPillRows(rows, session, colors, config) {
   return rows
     .map((row) =>
       joinFlex(
-        row.map((group) => renderGroup(group, colors, config, counters)),
+        row.map((group) => renderPills(group, colors, config, counters)),
         session.terminalWidth
       )
     )