@genee/omp-opsx-addon 0.5.0 → 0.6.0

package/lib/usage-render.ts

@@ -48,13 +48,46 @@ export interface Painter {
     header(label: string, brandAnsi: string): string;
     /** Numeric balance text (e.g. "余额 ¥18.06"), text-colored. */
     balance(text: string): string;
-    /** Foreground-color an arbitrary span with a named color (waveform cells). */
-    fg(color: PainterColor, text: string): string;
+    /**
+     * Waveform layer paint — btop row gradient over the provider's brand hue.
+     * `brandAnsi` is the raw brand SGR ('' → accent fallback, like header).
+     * Both rows share the hue family with a fixed, theme-independent step:
+     * 'bottom' a curated 256-color bright shade of the hue (aixterm bright /
+     * bold when the code isn't a mapped 16-color SGR), 'top' the plain brand.
+     */
+    wave(brandAnsi: string, layer: 'top' | 'bottom', text: string): string;
 }
 
 const pctValue = (p: number): string => `${Math.round(p * 100)}%`;
 const pctColor = (p: number): PainterColor => (p >= 0.85 ? 'error' : p >= 0.6 ? 'warning' : 'success');
 
+/**
+ * Curated 256-color bottom-row shade per 16-color brand hue (chart only —
+ * headers keep the raw brand SGR). The 256 palette's 16–255 range renders as
+ * FIXED rgb in every terminal, so the bottom/top step is guaranteed visible
+ * regardless of the active 16-color theme. Each shade is anchored on the
+ * de-facto standard dark-theme value of that hue (TokyoNight family) and is
+ * the SAME ink one purity/brightness step up — same hue direction, no hot
+ * magenta/red jumps that would break the "one color" read.
+ */
+const WAVE_SHADES: Record<string, string> = {
+    [X]: '38;5;204', // red    #ff5f87 (TN #f7768e, denser)
+    [G]: '38;5;114', //  green  #87d787 (TN #9ece6a, denser)
+    [BLUE]: '38;5;75', // blue #5fafff (TN #7aa2f7, denser)
+    [PURPLE]: '38;5;177', // purple #d787ff (TN #bb9af7, denser)
+    [CYAN]: '38;5;81', // cyan  #5fd7ff (TN #7dcfff, denser)
+};
+
+/** Aixterm bright variant of a 16-color brand code (`\x1b[3Nm` → `\x1b[9Nm`); undefined when not derivable. */
+const brightVariant = (code: string): string | undefined => {
+    const m = code.match(/^\x1b\[3([0-7])m$/);
+    return m ? `\x1b[9${m[1]}m` : undefined;
+};
+
+/** Bottom-row shade of a raw hue: curated 256 bright shade, aixterm bright, bold as the last step. */
+const bottomShade = (hue: string): string =>
+    WAVE_SHADES[hue] ? `\x1b[${WAVE_SHADES[hue]}m` : brightVariant(hue) ?? BOLD + hue;
+
 /** Pre-refactor hardcoded ANSI — the RPC/print fallback and the test baseline. */
 export const ansiPainter: Painter = {
     pct: (p) => {
@@ -65,21 +98,7 @@ export const ansiPainter: Painter = {
     sep: ` ${D}│${R} `,
     header: (label, brandAnsi) => c(brandAnsi ? BOLD + brandAnsi : BOLD, label),
     balance: (text) => c(WHITE, text),
-    fg: (color, text) =>
-        c(
-            color === 'error'
-                ? X
-                : color === 'warning'
-                  ? Y
-                  : color === 'success'
-                    ? G
-                    : color === 'dim'
-                      ? D
-                      : color === 'accent'
-                        ? CYAN
-                        : WHITE,
-            text,
-        ),
+    wave: (brandAnsi, layer, text) => c(layer === 'bottom' ? bottomShade(brandAnsi || CYAN) : brandAnsi || CYAN, text),
 };
 
 /** Status colors via the active host theme; brand headers keep raw ANSI. */
@@ -90,7 +109,12 @@ export function themePainter(theme: PainterTheme): Painter {
         sep: ` ${theme.fg('dim', '│')} `,
         header: (label, brandAnsi) => (brandAnsi ? c(brandAnsi, label) : theme.fg('accent', label)),
         balance: (text) => theme.fg('text', text),
-        fg: (color, text) => theme.fg(color, text),
+        wave: (brandAnsi, layer, text) =>
+            brandAnsi
+                ? c(layer === 'bottom' ? bottomShade(brandAnsi) : brandAnsi, text)
+                : layer === 'bottom'
+                  ? BOLD + theme.fg('accent', text)
+                  : theme.fg('accent', text),
     };
 }
 
@@ -424,7 +448,7 @@ export function renderUsageReports(
         // placeholder strip, keeping the column height stable.
         if (consumptionTracks) {
             const track = consumptionTracks.get(c.provider);
-            if (track) c.col.push(...renderConsumptionLines(track.samples, painter, waveCols));
+            if (track) c.col.push(...renderConsumptionLines(track.samples, painter, waveCols, providerLabel(c.provider).color));
         }
         if (pad) c.col = c.col.map((l) => padRight(l, blockWidth));
     }
@@ -469,13 +493,6 @@ export function composeChar(leftRows: number, rightRows: number): string {
     return String.fromCharCode(code);
 }
 
-/** Named-color band for a stock consumption level (`1 - remaining`): remaining ≥ 50% → success, ≥ 20% → warning, else error. */
-export function consumptionColor(c: number): PainterColor {
-    if (c <= 0.5) return 'success';
-    if (c <= 0.8) return 'warning';
-    return 'error';
-}
-
 /** One provider's consumption track feeding its embedded mini chart. */
 export interface ConsumptionTrack {
     /** Per-interval consumption increments (raw values), newest last. */
@@ -498,12 +515,17 @@ export interface ConsumptionTrack {
  * window yields a blank placeholder strip, never `undefined`, so every
  * provider column keeps a stable chart area and the layout never jumps.
  *
- * Color is bound to RATE INTENSITY (image-scaling blend, not quota severity —
- * quota urgency already reads in the usage text, e.g. "5h 0%", balance). Each
- * Braille character takes the MEAN of its two half-column interpolated
- * intensities, mapped via consumptionColor (low→green, mid→yellow, high→red),
- * so consecutive chars blend smoothly and never hard-switch. The newest column
- * keeps accent.
+ * Color is a btop-style ROW gradient bound to the vertical position only —
+ * never to the data. The chart paints the provider's brand hue in two layers
+ * with a fixed step: the bottom line takes a curated 256-color bright shade
+ * of the hue (fixed rgb — visible under any 16-color theme; aixterm bright /
+ * bold when the code isn't mapped), the top line the plain brand — visibly
+ * stronger at the base, never washed out. Sliding samples reshape the
+ * envelope while every
+ * pixel's color stays put — the per-column intensity heat bands this
+ * replaces flipped green/yellow/red as the window moved, reading as flicker.
+ * Providers without a curated brand hue fall back to the theme accent.
+ * Quota urgency still reads in the usage text ("5h 0%", balance).
  *
  * Geometry unchanged: 1px per sample (half-char step), right-aligned; each
  * character merges its two half-column samples with max and renders both
@@ -514,6 +536,7 @@ export function renderConsumptionLines(
     samples: readonly number[],
     painter: Painter = ansiPainter,
     cols: number = WAVEFORM_COLS,
+    brandAnsi = '',
 ): string[] {
     const n = samples.length;
     const totalPx = cols * 2;
@@ -564,14 +587,10 @@ export function renderConsumptionLines(
         return plot[m - 1] / max;
     };
 
-    // Each half-column keeps its OWN interpolated height (two samples share one
-    // char, possibly at different heights — the pair-into-one-char geometry);
-    // only COLOR is blended (terminals can't half-tint a char, so the char
-    // takes the mean intensity of its two half-columns).
-    const accentChar = Math.floor((totalPx - 1) / 2);
     // Two-line strip: full scale = 8px (2 Braille rows × 4 dot rows). Each
-    // half-column keeps its OWN interpolated height; only COLOR is blended
-    // (terminals can't half-tint a char, so the char takes the mean intensity).
+    // half-column keeps its OWN interpolated height; COLOR is ROW-bound only
+    // (bottom = 256 bright shade of the brand hue, top = plain brand) and
+    // never varies per column.
     const rows = 2;
     const lines = new Array<string>(rows).fill('');
     for (let c = 0; c < cols; c++) {
@@ -587,10 +606,9 @@ export function renderConsumptionLines(
         // never vanish under the dynamic scale.
         const hL = l > 0 ? Math.max(1, Math.round(8 * l)) : 0;
         const hR = r > 0 ? Math.max(1, Math.round(8 * r)) : 0;
-        const color = c === accentChar ? 'accent' : consumptionColor((l + r) / 2);
         // Row 0 = top (px 4..8), row 1 = bottom (px 0..4) of each column.
-        lines[0] += painter.fg(color, composeChar(Math.max(0, hL - 4), Math.max(0, hR - 4)));
-        lines[1] += painter.fg(color, composeChar(Math.min(4, hL), Math.min(4, hR)));
+        lines[0] += painter.wave(brandAnsi, 'top', composeChar(Math.max(0, hL - 4), Math.max(0, hR - 4)));
+        lines[1] += painter.wave(brandAnsi, 'bottom', composeChar(Math.min(4, hL), Math.min(4, hR)));
     }
     return lines;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genee/omp-opsx-addon",
-  "version": "0.5.0",
+  	"version": "0.6.0",
   "type": "module",
   "description": "Pi Extension: OpenSpec workflow orchestration - coder/reviewer/planner agents, session title & progress",
   "main": "./index.ts",