mu-harness 0.28.0 → 0.29.0

package/esm/commands/defaults.js

@@ -41,16 +41,24 @@ export const createQuitCommand = (onQuit) => ({
     },
 });
 const estTokens = (chars) => Math.max(1, Math.round(chars / 4));
-const GRID_COLS = 24;
-const GRID_ROWS = 8;
+const GRID_COLS = 20;
+const GRID_ROWS = 10;
 const GRID_CELLS = GRID_COLS * GRID_ROWS;
 const BLOCK = '█';
 const FREE = '·';
+const BUFFER_COLOR = '\x1b[93m'; // bright yellow — the compaction reserve
 // ANSI SGR colours — mu's TUI text utils are ANSI-aware so these render in the terminal;
 // the companion strips them (plain text), keeping the labelled breakdown readable.
 const RESET = '\x1b[0m';
 const DIM = '\x1b[2m';
 const paint = (s, color) => `${color}${s}${RESET}`;
+const fmtTok = (n) => (n >= 1e6 ? `${(n / 1e6).toFixed(1)}M` : n >= 1000 ? `${(n / 1000).toFixed(1)}k` : `${n}`);
+const pctStr = (n, w) => {
+    if (w <= 0)
+        return '';
+    const p = (n / w) * 100;
+    return p > 0 && p < 0.1 ? '<0.1%' : `${p.toFixed(1)}%`;
+};
 const fillColor = (pct) => (pct >= 80 ? '\x1b[31m' : pct >= 50 ? '\x1b[33m' : '\x1b[32m');
 /** Extract a `<tag>…</tag>` block (with tags), or '' when absent. */
 function tagBlock(s, tag) {
@@ -127,26 +135,46 @@ export const createContextCommand = () => ({
         const exact = measured.every((m) => m.exact);
         const total = cats.reduce((s, c) => s + c.n, 0);
         const window = (await ctx.session?.contextWindow?.()) ?? 0;
-        const mark = (n) => (exact ? `${n}` : `~${n}`);
-        const lines = [`context — tokens (${exact ? 'exact, model tokenizer' : 'estimated ≈ chars/4'}):`];
-        for (const c of cats)
-            lines.push(`  ${paint(BLOCK, c.color)} ${c.label.padEnd(13)} ${mark(c.n)}`);
+        const buffer = window > 0 ? Math.min(Math.round(window * 0.2), Math.max(0, window - total)) : 0;
+        const free = Math.max(0, window - total - buffer);
+        const mark = (n) => (exact ? fmtTok(n) : `~${fmtTok(n)}`);
         const pctNum = window ? Math.round((total / window) * 100) : 0;
-        const pct = window ? ` / ${window} ${paint(`(${pctNum}%)`, fillColor(pctNum))}` : '';
-        lines.push(`  ${' '.repeat(15)}── ${mark(total)}${pct}`);
+        // Legend rows (categories, then buffer + free), Claude Code / oh-my-pi style.
+        const rows = cats.map((c) => ({ marker: paint(BLOCK, c.color), label: c.label, n: c.n }));
         if (window > 0) {
+            rows.push({ marker: paint(BLOCK, BUFFER_COLOR), label: 'buffer', n: buffer });
+            rows.push({ marker: paint(FREE, DIM), label: 'free', n: free });
+        }
+        const legend = rows.map((r) => `${r.marker} ${r.label.padEnd(13)} ${mark(r.n).padStart(7)}  ${pctStr(r.n, window).padStart(6)}`);
+        const header = window
+            ? `context · ${mark(total)} / ${fmtTok(window)} ${paint(`(${pctStr(total, window)})`, fillColor(pctNum))}`
+            : `context · ${mark(total)} tokens (no model context window)`;
+        const lines = [header, ''];
+        if (window > 0) {
+            // Build the grid: category cells, then free, with the compaction buffer at the very end.
             const cellTokens = Math.max(1, window / GRID_CELLS);
+            const ratio = (n) => (n <= 0 ? 0 : Math.max(1, Math.round(n / cellTokens)));
             const cells = [];
-            for (const c of cats) {
-                for (let i = 0; i < Math.round(c.n / cellTokens) && cells.length < GRID_CELLS; i++)
+            for (const c of cats)
+                for (let i = 0; i < ratio(c.n) && cells.length < GRID_CELLS; i++)
                     cells.push(paint(BLOCK, c.color));
-            }
-            while (cells.length < GRID_CELLS)
+            const bufCells = Math.min(ratio(buffer), Math.max(0, GRID_CELLS - cells.length));
+            const freeCells = Math.max(0, GRID_CELLS - cells.length - bufCells);
+            for (let i = 0; i < freeCells; i++)
                 cells.push(paint(FREE, DIM));
+            for (let i = 0; i < bufCells; i++)
+                cells.push(paint(BLOCK, BUFFER_COLOR));
             cells.length = GRID_CELLS;
-            lines.push('');
-            for (let r = 0; r < GRID_ROWS; r++)
-                lines.push(`  ${cells.slice(r * GRID_COLS, (r + 1) * GRID_COLS).join('')}`);
+            // Side-by-side: 20×10 grid on the left, the legend on the right.
+            const rowsCount = Math.max(GRID_ROWS, legend.length);
+            for (let r = 0; r < rowsCount; r++) {
+                const gridRow = r < GRID_ROWS ? cells.slice(r * GRID_COLS, (r + 1) * GRID_COLS).join('') : ' '.repeat(GRID_COLS);
+                lines.push(`  ${gridRow}  ${legend[r] ?? ''}`.trimEnd());
+            }
+        }
+        else {
+            for (const l of legend)
+                lines.push(`  ${l.trimEnd()}`);
         }
         return { ok: true, output: lines.join('\n') };
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mu-harness",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "description": "Agent harness: createHarness wires mu-core into a host — XDG paths, model registry, plugins, disk-loaded agents & skills, sub-agents, sessions (JSONL + SQLite catalog), slash commands, permission/approval hooks, an optional scheduler, and a composable TUI chat app",
   "license": "MIT",
   "main": "./script/index.js",
@@ -23,8 +23,8 @@
     "@swc/wasm-typescript": "^1.15.0",
     "cli-highlight": "^2.1.11",
     "croner": "^9.0.0",
-    "mu-core": "^0.28.0",
-    "mu-tui": "^0.28.0",
+    "mu-core": "^0.29.0",
+    "mu-tui": "^0.29.0",
     "ws": "^8.18.0"
   },
   "_generatedBy": "dnt@dev",

package/script/commands/defaults.js

@@ -48,16 +48,24 @@ const createQuitCommand = (onQuit) => ({
 });
 exports.createQuitCommand = createQuitCommand;
 const estTokens = (chars) => Math.max(1, Math.round(chars / 4));
-const GRID_COLS = 24;
-const GRID_ROWS = 8;
+const GRID_COLS = 20;
+const GRID_ROWS = 10;
 const GRID_CELLS = GRID_COLS * GRID_ROWS;
 const BLOCK = '█';
 const FREE = '·';
+const BUFFER_COLOR = '\x1b[93m'; // bright yellow — the compaction reserve
 // ANSI SGR colours — mu's TUI text utils are ANSI-aware so these render in the terminal;
 // the companion strips them (plain text), keeping the labelled breakdown readable.
 const RESET = '\x1b[0m';
 const DIM = '\x1b[2m';
 const paint = (s, color) => `${color}${s}${RESET}`;
+const fmtTok = (n) => (n >= 1e6 ? `${(n / 1e6).toFixed(1)}M` : n >= 1000 ? `${(n / 1000).toFixed(1)}k` : `${n}`);
+const pctStr = (n, w) => {
+    if (w <= 0)
+        return '';
+    const p = (n / w) * 100;
+    return p > 0 && p < 0.1 ? '<0.1%' : `${p.toFixed(1)}%`;
+};
 const fillColor = (pct) => (pct >= 80 ? '\x1b[31m' : pct >= 50 ? '\x1b[33m' : '\x1b[32m');
 /** Extract a `<tag>…</tag>` block (with tags), or '' when absent. */
 function tagBlock(s, tag) {
@@ -134,26 +142,46 @@ const createContextCommand = () => ({
         const exact = measured.every((m) => m.exact);
         const total = cats.reduce((s, c) => s + c.n, 0);
         const window = (await ctx.session?.contextWindow?.()) ?? 0;
-        const mark = (n) => (exact ? `${n}` : `~${n}`);
-        const lines = [`context — tokens (${exact ? 'exact, model tokenizer' : 'estimated ≈ chars/4'}):`];
-        for (const c of cats)
-            lines.push(`  ${paint(BLOCK, c.color)} ${c.label.padEnd(13)} ${mark(c.n)}`);
+        const buffer = window > 0 ? Math.min(Math.round(window * 0.2), Math.max(0, window - total)) : 0;
+        const free = Math.max(0, window - total - buffer);
+        const mark = (n) => (exact ? fmtTok(n) : `~${fmtTok(n)}`);
         const pctNum = window ? Math.round((total / window) * 100) : 0;
-        const pct = window ? ` / ${window} ${paint(`(${pctNum}%)`, fillColor(pctNum))}` : '';
-        lines.push(`  ${' '.repeat(15)}── ${mark(total)}${pct}`);
+        // Legend rows (categories, then buffer + free), Claude Code / oh-my-pi style.
+        const rows = cats.map((c) => ({ marker: paint(BLOCK, c.color), label: c.label, n: c.n }));
         if (window > 0) {
+            rows.push({ marker: paint(BLOCK, BUFFER_COLOR), label: 'buffer', n: buffer });
+            rows.push({ marker: paint(FREE, DIM), label: 'free', n: free });
+        }
+        const legend = rows.map((r) => `${r.marker} ${r.label.padEnd(13)} ${mark(r.n).padStart(7)}  ${pctStr(r.n, window).padStart(6)}`);
+        const header = window
+            ? `context · ${mark(total)} / ${fmtTok(window)} ${paint(`(${pctStr(total, window)})`, fillColor(pctNum))}`
+            : `context · ${mark(total)} tokens (no model context window)`;
+        const lines = [header, ''];
+        if (window > 0) {
+            // Build the grid: category cells, then free, with the compaction buffer at the very end.
             const cellTokens = Math.max(1, window / GRID_CELLS);
+            const ratio = (n) => (n <= 0 ? 0 : Math.max(1, Math.round(n / cellTokens)));
             const cells = [];
-            for (const c of cats) {
-                for (let i = 0; i < Math.round(c.n / cellTokens) && cells.length < GRID_CELLS; i++)
+            for (const c of cats)
+                for (let i = 0; i < ratio(c.n) && cells.length < GRID_CELLS; i++)
                     cells.push(paint(BLOCK, c.color));
-            }
-            while (cells.length < GRID_CELLS)
+            const bufCells = Math.min(ratio(buffer), Math.max(0, GRID_CELLS - cells.length));
+            const freeCells = Math.max(0, GRID_CELLS - cells.length - bufCells);
+            for (let i = 0; i < freeCells; i++)
                 cells.push(paint(FREE, DIM));
+            for (let i = 0; i < bufCells; i++)
+                cells.push(paint(BLOCK, BUFFER_COLOR));
             cells.length = GRID_CELLS;
-            lines.push('');
-            for (let r = 0; r < GRID_ROWS; r++)
-                lines.push(`  ${cells.slice(r * GRID_COLS, (r + 1) * GRID_COLS).join('')}`);
+            // Side-by-side: 20×10 grid on the left, the legend on the right.
+            const rowsCount = Math.max(GRID_ROWS, legend.length);
+            for (let r = 0; r < rowsCount; r++) {
+                const gridRow = r < GRID_ROWS ? cells.slice(r * GRID_COLS, (r + 1) * GRID_COLS).join('') : ' '.repeat(GRID_COLS);
+                lines.push(`  ${gridRow}  ${legend[r] ?? ''}`.trimEnd());
+            }
+        }
+        else {
+            for (const l of legend)
+                lines.push(`  ${l.trimEnd()}`);
         }
         return { ok: true, output: lines.join('\n') };
     },