pi-usereq 0.6.0 → 0.7.0

package/src/core/extension-status.ts

@@ -17,7 +17,6 @@ import type {
 } from "@mariozechner/pi-coding-agent";
 import type { UseReqConfig } from "./config.js";
 import { normalizePathSlashes } from "./path-context.js";
-import { formatPiNotifyBeepStatus, formatPiNotifyPushoverStatus } from "./pi-notify.js";
 
 /**
  * @brief Enumerates the CLI-supported theme tokens consumed by status rendering.
@@ -32,42 +31,24 @@ type StatusForegroundColor = Extract<
 
 /**
  * @brief Describes the raw theme capabilities required for status rendering.
- * @details Accepts the `ctx.ui.theme` foreground renderer plus optional helpers
- * that can convert a foreground color into a background-styled fragment for the
- * context-usage bar. Compile-time only and introduces no runtime cost.
+ * @details Accepts the `ctx.ui.theme` foreground renderer used by the
+ * single-line footer. Compile-time only and introduces no runtime cost.
  */
 interface RawStatusTheme {
   fg: (color: StatusForegroundColor, text: string) => string;
-  bgFromFg?: (color: StatusForegroundColor, text: string) => string;
-  getFgAnsi?: (color: StatusForegroundColor) => string;
 }
 
 /**
  * @brief Describes the normalized theme adapter used by status formatters.
- * @details Exposes deterministic label, value, foreground, background, and
- * context-cell renderers so status text generation stays independent from the
- * raw theme API. Compile-time only and introduces no runtime cost.
+ * @details Exposes deterministic label, value, foreground, and separator
+ * renderers so status text generation stays independent from the raw theme API.
+ * Compile-time only and introduces no runtime cost.
  */
 interface StatusThemeAdapter {
   label: (fieldName: string) => string;
   value: (text: string) => string;
   colorize: (color: StatusForegroundColor, text: string) => string;
-  backgroundize: (color: StatusForegroundColor, text: string) => string;
   separator: string;
-  filledContextCell: string;
-  emptyContextCell: string;
-}
-
-/**
- * @brief Describes one fixed-width context-bar overlay.
- * @details Stores the literal text plus foreground and background color roles
- * used when the context bar must render threshold-specific labels instead of
- * block glyphs. Compile-time only and introduces no runtime cost.
- */
-interface ContextUsageOverlaySpec {
-  backgroundColor: StatusForegroundColor;
-  foregroundColor: StatusForegroundColor;
-  text: "◀ CLEAR ▶ " | " ◀ FULL ▶ ";
 }
 
 /**
@@ -149,90 +130,31 @@ export interface PiUsereqStatusController {
   tickHandle: ReturnType<typeof setInterval> | undefined;
 }
 
-/**
- * @brief Converts a foreground ANSI sequence into the equivalent background ANSI.
- * @details Supports the standard `38;` foreground prefix emitted by pi themes.
- * Returns `undefined` when the input cannot be transformed deterministically.
- * Runtime is O(n) in ANSI sequence length. No external state is mutated.
- * @param[in] foregroundAnsi {string} Foreground ANSI sequence.
- * @return {string | undefined} Background ANSI sequence when derivable.
- */
-function convertForegroundAnsiToBackgroundAnsi(
-  foregroundAnsi: string,
-): string | undefined {
-  if (!foregroundAnsi.includes("\u001b[")) {
-    return undefined;
-  }
-  const backgroundAnsi = foregroundAnsi.replace("[38;", "[48;");
-  return backgroundAnsi === foregroundAnsi ? undefined : backgroundAnsi;
-}
-
-/**
- * @brief Applies a foreground-derived background style to one text fragment.
- * @details Prefers a theme-provided `bgFromFg` encoder for deterministic test
- * rendering and falls back to ANSI conversion when the runtime theme exposes
- * `getFgAnsi`. Runtime is O(n) in fragment length. No external state is
- * mutated.
- * @param[in] theme {RawStatusTheme} Raw theme adapter.
- * @param[in] color {StatusForegroundColor} Foreground color reused as background.
- * @param[in] text {string} Already-colored foreground fragment.
- * @return {string} Background-decorated text fragment.
- */
-function applyForegroundAsBackground(
-  theme: RawStatusTheme,
-  color: StatusForegroundColor,
-  text: string,
-): string {
-  if (typeof theme.bgFromFg === "function") {
-    return theme.bgFromFg(color, text);
-  }
-  if (typeof theme.getFgAnsi === "function") {
-    const backgroundAnsi = convertForegroundAnsiToBackgroundAnsi(
-      theme.getFgAnsi(color),
-    );
-    if (backgroundAnsi) {
-      return `${backgroundAnsi}${text}\u001b[39m\u001b[49m`;
-    }
-  }
-  return text;
-}
-
 /**
  * @brief Builds the normalized theme adapter used by pi-usereq status formatters.
- * @details Precomputes label, value, foreground, background, separator, and
- * context-cell renderers so status formatting remains stable across real TUI
- * themes and deterministic test doubles. Runtime is O(1). No external state
- * is mutated.
+ * @details Precomputes label, value, foreground, and separator renderers so
+ * status formatting remains stable across real TUI themes and deterministic
+ * test doubles. Runtime is O(1). No external state is mutated.
  * @param[in] theme {RawStatusTheme} Raw theme implementation from `ctx.ui.theme`.
  * @return {StatusThemeAdapter} Normalized status-theme adapter.
  */
 function createStatusThemeAdapter(theme: RawStatusTheme): StatusThemeAdapter {
   const colorize = (color: StatusForegroundColor, text: string): string =>
     theme.fg(color, text);
-  const backgroundize = (color: StatusForegroundColor, text: string): string =>
-    applyForegroundAsBackground(theme, color, text);
   return {
     label: (fieldName: string): string => colorize("accent", `${fieldName}:`),
     value: (text: string): string => colorize("warning", text),
     colorize,
-    backgroundize,
     separator: colorize("dim", " • "),
-    filledContextCell: backgroundize(
-      "accent",
-      colorize("warning", "▓"),
-    ),
-    emptyContextCell: backgroundize(
-      "accent",
-      colorize("dim", "▓"),
-    ),
   };
 }
 
 /**
  * @brief Normalizes one raw context-usage snapshot.
  * @details Preserves the runtime token and context-window counts, derives a
- * percentage when the runtime omits it, and clamps percentages into `[0, 100]`.
- * Runtime is O(1). No external state is mutated.
+ * percentage when the runtime omits it, clamps negative percentages to `0`,
+ * and preserves overflow above `100` for footer rendering. Runtime is O(1). No
+ * external state is mutated.
  * @param[in] contextUsage {ContextUsage | undefined} Raw runtime snapshot.
  * @return {ContextUsage | undefined} Normalized snapshot.
  */
@@ -251,7 +173,7 @@ function normalizeContextUsage(
     ...contextUsage,
     percent: derivedPercent === null
       ? null
-      : Math.max(0, Math.min(100, derivedPercent)),
+      : Math.max(0, derivedPercent),
   };
 }
 
@@ -273,100 +195,52 @@ function refreshContextUsage(
 }
 
 /**
- * @brief Counts the filled cells rendered by the 10-cell context bar.
- * @details Uses ceiling semantics for positive percentages so any non-zero
- * usage occupies at least one cell and zero usage occupies none. Runtime is
- * O(1). No external state is mutated.
- * @param[in] contextUsage {ContextUsage | undefined} Normalized context snapshot.
- * @return {number} Filled-cell count in the inclusive range `[0, 10]`.
- * @satisfies REQ-122
- */
-function countFilledContextCells(
-  contextUsage: ContextUsage | undefined,
-): number {
-  const percent = contextUsage?.percent;
-  if (percent === null || percent === undefined || percent <= 0) {
-    return 0;
-  }
-  return Math.min(10, Math.ceil((percent * 10) / 100));
-}
-
-/**
- * @brief Resolves the threshold-specific context-bar overlay when required.
- * @details Returns the empty-state `◀ CLEAR ▶ ` overlay when normalized context
- * usage is unavailable or non-positive and returns the centered ` ◀ FULL ▶ `
- * overlay with the active theme `error` token when usage exceeds 90 percent.
- * Runtime is O(1). No external state is mutated.
+ * @brief Resolves the icon text for one normalized context-usage snapshot.
+ * @details Maps context usage to one fixed-width icon band so footer rendering
+ * remains compact and deterministic. Unavailable usage degrades to the `0%`
+ * icon. Runtime is O(1). No external state is mutated.
  * @param[in] contextUsage {ContextUsage | undefined} Normalized context snapshot.
- * @return {ContextUsageOverlaySpec | undefined} Overlay spec when a replacement label is required.
- * @satisfies REQ-127, REQ-128
+ * @return {string} Fixed-width gauge icon text.
+ * @satisfies REQ-121, REQ-122
  */
-function resolveContextUsageOverlay(
+function resolveContextUsageIconText(
   contextUsage: ContextUsage | undefined,
-): ContextUsageOverlaySpec | undefined {
+): string {
   const percent = contextUsage?.percent;
   if (percent === undefined || percent === null || percent <= 0) {
-    return {
-      backgroundColor: "accent",
-      foregroundColor: "warning",
-      text: "◀ CLEAR ▶ ",
-    };
+    return "▕_▏";
   }
-  if (percent > 90) {
-    return {
-      backgroundColor: "warning",
-      foregroundColor: "error",
-      text: " ◀ FULL ▶ ",
-    };
+  if (percent <= 25) {
+    return "▕▂▏";
   }
-  return undefined;
-}
-
-/**
- * @brief Formats one threshold-specific context-bar overlay.
- * @details Renders the fixed-width overlay text with the requested foreground
- * color and reuses the selected bar color as the background so the bar width
- * and state-specific backdrop remain preserved. Runtime is O(n) in overlay
- * width. No external state is mutated.
- * @param[in] theme {StatusThemeAdapter} Normalized status theme.
- * @param[in] overlay {ContextUsageOverlaySpec} Overlay specification.
- * @return {string} Rendered overlay text.
- * @satisfies REQ-127, REQ-128
- */
-function formatContextUsageOverlay(
-  theme: StatusThemeAdapter,
-  overlay: ContextUsageOverlaySpec,
-): string {
-  return theme.backgroundize(
-    overlay.backgroundColor,
-    theme.colorize(overlay.foregroundColor, overlay.text),
-  );
+  if (percent <= 50) {
+    return "▕▄▏";
+  }
+  if (percent <= 90) {
+    return "▕▆▏";
+  }
+  return "▕█▏";
 }
 
 /**
- * @brief Formats one 10-cell context-usage bar.
- * @details Renders threshold-specific overlays for empty and high-water states;
- * otherwise renders filled cells with the theme `warning` token on an
- * accent-derived background and unfilled cells in `dim` on the same background
- * to preserve constant bar width. Runtime is O(1). No external state is
- * mutated.
+ * @brief Formats one icon-based context-usage gauge.
+ * @details Renders the documented `warning`-colored icon bands for `0-100%` and
+ * applies terminal blink control to the `error`-colored overflow icon so
+ * unsupported terminals degrade to non-blinking red automatically. Runtime is
+ * O(1). No external state is mutated.
  * @param[in] theme {StatusThemeAdapter} Normalized status theme.
  * @param[in] contextUsage {ContextUsage | undefined} Normalized context snapshot.
- * @return {string} Rendered 10-cell bar or overlay.
+ * @return {string} Rendered fixed-width gauge icon.
  * @satisfies REQ-121, REQ-122, REQ-126, REQ-127, REQ-128
  */
 function formatContextUsageBar(
   theme: StatusThemeAdapter,
   contextUsage: ContextUsage | undefined,
 ): string {
-  const overlay = resolveContextUsageOverlay(contextUsage);
-  if (overlay) {
-    return formatContextUsageOverlay(theme, overlay);
+  if ((contextUsage?.percent ?? 0) > 100) {
+    return theme.colorize("error", "\u001b[5m▕█▏\u001b[25m");
   }
-  const filledCells = countFilledContextCells(contextUsage);
-  return Array.from({ length: 10 }, (_value, index) =>
-    index < filledCells ? theme.filledContextCell : theme.emptyContextCell,
-  ).join("");
+  return theme.value(resolveContextUsageIconText(contextUsage));
 }
 
 /**
@@ -404,7 +278,7 @@ function formatCompletedStatusDuration(
  * @brief Formats the consolidated `elapsed` status-bar value.
  * @details Emits the active prompt segment `⏱︎ <active>`, the latest normally
  * completed segment `⚑ <last>`, and the accumulated successful-runtime segment
- * `⌛︎ <total>` with fixed spacing. Runtime is O(1). No external state is
+ * `⌛︎<total>` with fixed spacing. Runtime is O(1). No external state is
  * mutated.
  * @param[in] state {PiUsereqStatusState} Mutable status state snapshot.
  * @param[in] nowMs {number} Current wall-clock time in milliseconds.
@@ -420,7 +294,7 @@ function formatElapsedStatusValue(
     : formatStatusDuration(nowMs - state.runStartTimeMs);
   const lastText = formatCompletedStatusDuration(state.lastRunDurationMs);
   const totalText = formatCompletedStatusDuration(state.totalRunDurationMs);
-  return ` ⏱︎ ${activeText} ⚑ ${lastText} ⌛︎ ${totalText}`;
+  return `⏱︎ ${activeText} ⚑ ${lastText} ⌛︎${totalText}`;
 }
 
 /**
@@ -478,14 +352,16 @@ function didAgentEndAbort(messages: AgentEndEvent["messages"]): boolean {
 
 /**
  * @brief Builds the full single-line pi-usereq status-bar payload.
- * @details Renders base, context, elapsed, beep, sound, and pushover fields in the canonical order with dim bullet separators and threshold-specific context-bar overlays. Runtime is O(1). No external state is mutated.
+ * @details Renders base, context, elapsed, and sound fields in the canonical
+ * order with dim bullet separators and the documented icon-based context gauge.
+ * Runtime is O(1). No external state is mutated.
  * @param[in] cwd {string} Runtime working directory used for base-path derivation.
  * @param[in] config {UseReqConfig} Effective project configuration.
  * @param[in] theme {StatusThemeAdapter} Normalized status theme.
  * @param[in] state {PiUsereqStatusState} Mutable status state snapshot.
  * @param[in] nowMs {number} Current wall-clock time in milliseconds.
  * @return {string} Single-line status-bar text.
- * @satisfies REQ-109, REQ-112, REQ-120, REQ-121, REQ-123, REQ-124, REQ-125, REQ-126, REQ-127, REQ-128, REQ-135, REQ-136, REQ-148, REQ-156, REQ-159, REQ-170, REQ-171
+ * @satisfies REQ-109, REQ-112, REQ-120, REQ-121, REQ-123, REQ-124, REQ-125, REQ-126, REQ-127, REQ-128, REQ-148, REQ-156, REQ-159, REQ-180
  */
 function buildPiUsereqStatusText(
   cwd: string,
@@ -496,9 +372,7 @@ function buildPiUsereqStatusText(
 ): string {
   const baseText = normalizePathSlashes(path.resolve(cwd));
   const elapsedText = formatElapsedStatusValue(state, nowMs);
-  const beepText = formatPiNotifyBeepStatus(config);
   const soundText = config["notify-sound"];
-  const pushoverText = formatPiNotifyPushoverStatus(config);
   return [
     formatStatusField(theme, "base", baseText),
     formatRenderedStatusField(
@@ -507,9 +381,7 @@ function buildPiUsereqStatusText(
       formatContextUsageBar(theme, state.contextUsage),
     ),
     formatStatusField(theme, "elapsed", elapsedText),
-    formatStatusField(theme, "beep", beepText),
     formatStatusField(theme, "sound", soundText),
-    formatStatusField(theme, "pushover", pushoverText),
   ].join(theme.separator);
 }
 
@@ -598,13 +470,13 @@ export function setPiUsereqStatusConfig(
 /**
  * @brief Renders the current pi-usereq status bar into the active UI context.
  * @details Updates the controller's latest context pointer and writes the
- * single-line status text only when configuration is available, including any
- * threshold-specific context-bar overlays. Runtime is O(s) in configured
- * source-path count. Side effect: mutates `ctx.ui` status.
+ * single-line status text only when configuration is available, including the
+ * documented icon-based context gauge. Runtime is O(s) in configured source-
+ * path count. Side effect: mutates `ctx.ui` status.
  * @param[in,out] controller {PiUsereqStatusController} Mutable status controller.
  * @param[in] ctx {ExtensionContext} Active extension context.
  * @return {void} No return value.
- * @satisfies REQ-120, REQ-121, REQ-123, REQ-124, REQ-125, REQ-126, REQ-127, REQ-128, REQ-135, REQ-136, REQ-148, REQ-159, REQ-170, REQ-171
+ * @satisfies REQ-120, REQ-121, REQ-123, REQ-124, REQ-125, REQ-126, REQ-127, REQ-128, REQ-148, REQ-159, REQ-180
  */
 export function renderPiUsereqStatus(
   controller: PiUsereqStatusController,