mu-harness 0.28.0 → 0.30.0

package/esm/commands/defaults.js

@@ -41,17 +41,27 @@ 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 = '·';
-// ANSI SGR colours — mu's TUI text utils are ANSI-aware so these render in the terminal;
+const GRID_WIDTH = GRID_COLS * 2 - 1; // glyphs joined by single spaces
+const USED = '⛁'; // a filled context cell (Claude Code's /context glyph)
+const FREEG = '⛶'; // a free cell
+const BUFFER_COLOR = '\x1b[93m'; // bright yellow — the compaction reserve
+// ANSI SGR codes — 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 BOLD = '\x1b[1m';
+const ITALIC_DIM = '\x1b[2;3m';
 const paint = (s, color) => `${color}${s}${RESET}`;
-const fillColor = (pct) => (pct >= 80 ? '\x1b[31m' : pct >= 50 ? '\x1b[33m' : '\x1b[32m');
+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)}%`;
+};
 /** Extract a `<tag>…</tag>` block (with tags), or '' when absent. */
 function tagBlock(s, tag) {
     const i = s.indexOf(`<${tag}>`);
@@ -111,42 +121,68 @@ export const createContextCommand = () => ({
             }
             return { n: estTokens(text.length), exact: false };
         };
-        // label, text, ANSI colour — one per category, in render order.
+        // label, text, ANSI colour — one per category, in render order (descriptive labels à la Claude Code).
         const SPEC = [
-            ['system', sys.agent, '\x1b[36m'], // cyan — the agent prompt
-            ['context', sys.env, '\x1b[33m'], // yellow — the <env> block
-            ['instructions', sys.instructions, '\x1b[34m'], // blue — AGENTS.md / CLAUDE.md
-            ['memory', sys.memory, '\x1b[35m'], // magenta — MEMORY.md
-            ['tools', `${toolSchemas}\n${sys.toolPrompts}`, '\x1b[31m'], // red — schemas + tool prompts
-            ['you', byRole('user'), '\x1b[32m'], // green — your messages
-            ['agent', byRole('assistant'), '\x1b[94m'], // bright blue — assistant replies
-            ['tool-out', byRole('tool'), '\x1b[90m'], // grey — tool results
+            ['System prompt', sys.agent, '\x1b[36m'], // cyan — the agent prompt
+            ['Environment', sys.env, '\x1b[33m'], // yellow — the <env> block
+            ['Instructions', sys.instructions, '\x1b[34m'], // blue — AGENTS.md / CLAUDE.md
+            ['Memory', sys.memory, '\x1b[35m'], // magenta — MEMORY.md
+            ['Tools', `${toolSchemas}\n${sys.toolPrompts}`, '\x1b[31m'], // red — schemas + tool prompts
+            ['You', byRole('user'), '\x1b[32m'], // green — your messages
+            ['Agent', byRole('assistant'), '\x1b[94m'], // bright blue — assistant replies
+            ['Tool results', byRole('tool'), '\x1b[90m'], // grey — tool results
         ];
         const measured = await Promise.all(SPEC.map(([, text]) => measure(text)));
         const cats = SPEC.map(([label, , color], i) => ({ label, n: measured[i].n, color })).filter((c) => c.n > 0);
         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 pctNum = window ? Math.round((total / window) * 100) : 0;
-        const pct = window ? ` / ${window} ${paint(`(${pctNum}%)`, fillColor(pctNum))}` : '';
-        lines.push(`  ${' '.repeat(15)}── ${mark(total)}${pct}`);
+        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 model = ctx.session?.model ?? '';
+        // Right-hand info column — model, totals, then per-category usage (Claude Code's /context).
+        const info = [];
+        if (model) {
+            info.push(model.split('/').pop() ?? model);
+            info.push(paint(model, DIM));
+        }
+        if (window > 0)
+            info.push(paint(`${mark(total)}/${fmtTok(window)} tokens (${pctStr(total, window)})`, DIM));
+        info.push('');
+        info.push(paint('Estimated usage by category', ITALIC_DIM));
+        for (const c of cats) {
+            info.push(`${paint(USED, c.color)} ${c.label}: ${paint(`${mark(c.n)} tokens (${pctStr(c.n, window)})`, DIM)}`);
+        }
+        if (window > 0) {
+            info.push(`${paint(USED, BUFFER_COLOR)} Compaction buffer: ${paint(`${fmtTok(buffer)} tokens (${pctStr(buffer, window)})`, DIM)}`);
+            info.push(`${paint(FREEG, DIM)} Free space: ${paint(`${fmtTok(free)} (${pctStr(free, window)})`, DIM)}`);
+        }
+        const lines = [`${BOLD}Context Usage${RESET}`];
         if (window > 0) {
+            // 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++)
-                    cells.push(paint(BLOCK, c.color));
-            }
-            while (cells.length < GRID_CELLS)
-                cells.push(paint(FREE, DIM));
+            for (const c of cats)
+                for (let i = 0; i < ratio(c.n) && cells.length < GRID_CELLS; i++)
+                    cells.push(paint(USED, c.color));
+            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(FREEG, DIM));
+            for (let i = 0; i < bufCells; i++)
+                cells.push(paint(USED, 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 (space-separated glyphs) on the left, info column on the right.
+            for (let r = 0; r < Math.max(GRID_ROWS, info.length); r++) {
+                const gridRow = r < GRID_ROWS ? cells.slice(r * GRID_COLS, (r + 1) * GRID_COLS).join(' ') : ' '.repeat(GRID_WIDTH);
+                lines.push(`${gridRow}  ${info[r] ?? ''}`.trimEnd());
+            }
+        }
+        else {
+            for (const l of info)
+                lines.push(l.trimEnd());
         }
         return { ok: true, output: lines.join('\n') };
     },

package/esm/session/agent-session.js

@@ -143,6 +143,7 @@ export const createAgentSession = (config) => {
     };
     return {
         id,
+        model: config.model,
         tools,
         get messages() {
             return messages;

package/esm/session/manager.js

@@ -12,6 +12,7 @@ const onFirstMessage = (session, fire) => {
         get tools() {
             return session.tools;
         },
+        model: session.model,
         assembleRequest: session.assembleRequest?.bind(session),
         countTokens: session.countTokens?.bind(session),
         contextWindow: session.contextWindow?.bind(session),

package/esm/session/persist.js

@@ -10,6 +10,7 @@ export const persistTo = (store, session, persisted = 0) => {
         get tools() {
             return session.tools;
         },
+        model: session.model,
         assembleRequest: session.assembleRequest?.bind(session),
         countTokens: session.countTokens?.bind(session),
         contextWindow: session.contextWindow?.bind(session),

package/esm/session/types.d.ts

@@ -19,6 +19,7 @@ export interface AssembledRequest {
 }
 export interface AgentSession {
     readonly id: string;
+    readonly model?: string;
     readonly messages: readonly Message[];
     readonly tools: readonly Tool[];
     /** Assemble the request from the CURRENT in-memory session — what the next turn would send. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mu-harness",
-  "version": "0.28.0",
+  "version": "0.30.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.30.0",
+    "mu-tui": "^0.30.0",
     "ws": "^8.18.0"
   },
   "_generatedBy": "dnt@dev",

package/script/commands/defaults.js

@@ -48,17 +48,27 @@ 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 = '·';
-// ANSI SGR colours — mu's TUI text utils are ANSI-aware so these render in the terminal;
+const GRID_WIDTH = GRID_COLS * 2 - 1; // glyphs joined by single spaces
+const USED = '⛁'; // a filled context cell (Claude Code's /context glyph)
+const FREEG = '⛶'; // a free cell
+const BUFFER_COLOR = '\x1b[93m'; // bright yellow — the compaction reserve
+// ANSI SGR codes — 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 BOLD = '\x1b[1m';
+const ITALIC_DIM = '\x1b[2;3m';
 const paint = (s, color) => `${color}${s}${RESET}`;
-const fillColor = (pct) => (pct >= 80 ? '\x1b[31m' : pct >= 50 ? '\x1b[33m' : '\x1b[32m');
+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)}%`;
+};
 /** Extract a `<tag>…</tag>` block (with tags), or '' when absent. */
 function tagBlock(s, tag) {
     const i = s.indexOf(`<${tag}>`);
@@ -118,42 +128,68 @@ const createContextCommand = () => ({
             }
             return { n: estTokens(text.length), exact: false };
         };
-        // label, text, ANSI colour — one per category, in render order.
+        // label, text, ANSI colour — one per category, in render order (descriptive labels à la Claude Code).
         const SPEC = [
-            ['system', sys.agent, '\x1b[36m'], // cyan — the agent prompt
-            ['context', sys.env, '\x1b[33m'], // yellow — the <env> block
-            ['instructions', sys.instructions, '\x1b[34m'], // blue — AGENTS.md / CLAUDE.md
-            ['memory', sys.memory, '\x1b[35m'], // magenta — MEMORY.md
-            ['tools', `${toolSchemas}\n${sys.toolPrompts}`, '\x1b[31m'], // red — schemas + tool prompts
-            ['you', byRole('user'), '\x1b[32m'], // green — your messages
-            ['agent', byRole('assistant'), '\x1b[94m'], // bright blue — assistant replies
-            ['tool-out', byRole('tool'), '\x1b[90m'], // grey — tool results
+            ['System prompt', sys.agent, '\x1b[36m'], // cyan — the agent prompt
+            ['Environment', sys.env, '\x1b[33m'], // yellow — the <env> block
+            ['Instructions', sys.instructions, '\x1b[34m'], // blue — AGENTS.md / CLAUDE.md
+            ['Memory', sys.memory, '\x1b[35m'], // magenta — MEMORY.md
+            ['Tools', `${toolSchemas}\n${sys.toolPrompts}`, '\x1b[31m'], // red — schemas + tool prompts
+            ['You', byRole('user'), '\x1b[32m'], // green — your messages
+            ['Agent', byRole('assistant'), '\x1b[94m'], // bright blue — assistant replies
+            ['Tool results', byRole('tool'), '\x1b[90m'], // grey — tool results
         ];
         const measured = await Promise.all(SPEC.map(([, text]) => measure(text)));
         const cats = SPEC.map(([label, , color], i) => ({ label, n: measured[i].n, color })).filter((c) => c.n > 0);
         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 pctNum = window ? Math.round((total / window) * 100) : 0;
-        const pct = window ? ` / ${window} ${paint(`(${pctNum}%)`, fillColor(pctNum))}` : '';
-        lines.push(`  ${' '.repeat(15)}── ${mark(total)}${pct}`);
+        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 model = ctx.session?.model ?? '';
+        // Right-hand info column — model, totals, then per-category usage (Claude Code's /context).
+        const info = [];
+        if (model) {
+            info.push(model.split('/').pop() ?? model);
+            info.push(paint(model, DIM));
+        }
+        if (window > 0)
+            info.push(paint(`${mark(total)}/${fmtTok(window)} tokens (${pctStr(total, window)})`, DIM));
+        info.push('');
+        info.push(paint('Estimated usage by category', ITALIC_DIM));
+        for (const c of cats) {
+            info.push(`${paint(USED, c.color)} ${c.label}: ${paint(`${mark(c.n)} tokens (${pctStr(c.n, window)})`, DIM)}`);
+        }
+        if (window > 0) {
+            info.push(`${paint(USED, BUFFER_COLOR)} Compaction buffer: ${paint(`${fmtTok(buffer)} tokens (${pctStr(buffer, window)})`, DIM)}`);
+            info.push(`${paint(FREEG, DIM)} Free space: ${paint(`${fmtTok(free)} (${pctStr(free, window)})`, DIM)}`);
+        }
+        const lines = [`${BOLD}Context Usage${RESET}`];
         if (window > 0) {
+            // 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++)
-                    cells.push(paint(BLOCK, c.color));
-            }
-            while (cells.length < GRID_CELLS)
-                cells.push(paint(FREE, DIM));
+            for (const c of cats)
+                for (let i = 0; i < ratio(c.n) && cells.length < GRID_CELLS; i++)
+                    cells.push(paint(USED, c.color));
+            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(FREEG, DIM));
+            for (let i = 0; i < bufCells; i++)
+                cells.push(paint(USED, 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 (space-separated glyphs) on the left, info column on the right.
+            for (let r = 0; r < Math.max(GRID_ROWS, info.length); r++) {
+                const gridRow = r < GRID_ROWS ? cells.slice(r * GRID_COLS, (r + 1) * GRID_COLS).join(' ') : ' '.repeat(GRID_WIDTH);
+                lines.push(`${gridRow}  ${info[r] ?? ''}`.trimEnd());
+            }
+        }
+        else {
+            for (const l of info)
+                lines.push(l.trimEnd());
         }
         return { ok: true, output: lines.join('\n') };
     },

package/script/session/agent-session.js

@@ -146,6 +146,7 @@ const createAgentSession = (config) => {
     };
     return {
         id,
+        model: config.model,
         tools,
         get messages() {
             return messages;

package/script/session/manager.js

@@ -15,6 +15,7 @@ const onFirstMessage = (session, fire) => {
         get tools() {
             return session.tools;
         },
+        model: session.model,
         assembleRequest: session.assembleRequest?.bind(session),
         countTokens: session.countTokens?.bind(session),
         contextWindow: session.contextWindow?.bind(session),

package/script/session/persist.js

@@ -13,6 +13,7 @@ const persistTo = (store, session, persisted = 0) => {
         get tools() {
             return session.tools;
         },
+        model: session.model,
         assembleRequest: session.assembleRequest?.bind(session),
         countTokens: session.countTokens?.bind(session),
         contextWindow: session.contextWindow?.bind(session),

package/script/session/types.d.ts

@@ -19,6 +19,7 @@ export interface AssembledRequest {
 }
 export interface AgentSession {
     readonly id: string;
+    readonly model?: string;
     readonly messages: readonly Message[];
     readonly tools: readonly Tool[];
     /** Assemble the request from the CURRENT in-memory session — what the next turn would send. */