@askalf/dario 5.4.6 → 5.4.7

package/dist/tui/layout.js

@@ -19,7 +19,14 @@ export function renderHeader(width, opts) {
     const left = ` ${brand('dario')} v${opts.version} `;
     const right = opts.status ? ` ${opts.status} ` : '';
     const dashWidth = Math.max(0, width - visibleWidth(left) - visibleWidth(right) - 2);
-    return BOX.topLeft + left + BOX.horizontal.repeat(dashWidth) + right + BOX.topRight;
+    const full = BOX.topLeft + left + BOX.horizontal.repeat(dashWidth) + right + BOX.topRight;
+    if (visibleWidth(full) <= width)
+        return full;
+    // Too narrow for brand + status: `dashWidth` clamps at 0 but both ends
+    // still render full-length, so the row would overflow and wrap. Drop
+    // the status (the proxy URL — also on the Status tab) before clipping
+    // the brand, which is this row's only identity.
+    return truncate(BOX.topLeft + left + BOX.topRight, width);
 }
 /**
  * Render the bottom footer with key-hint pairs. Wide gaps so it doesn't

package/dist/tui/render.js

@@ -181,9 +181,15 @@ export function pad(text, width, align = 'left') {
 export function progressBar(value, width, opts = {}) {
     const filled = opts.filled ?? '█';
     const empty = opts.empty ?? '░';
-    const clamped = Math.max(0, Math.min(1, value));
-    const cells = Math.round(clamped * width);
-    return filled.repeat(cells) + empty.repeat(width - cells);
+    // Callers derive the bar width by subtracting label columns from the
+    // terminal width, so a narrow terminal hands us a NEGATIVE width —
+    // String.repeat() throws RangeError on that, which took the whole TUI
+    // down rather than degrading. Collapse to an empty bar instead; the
+    // surrounding row still renders.
+    const w = Number.isFinite(width) ? Math.max(0, Math.floor(width)) : 0;
+    const clamped = Number.isFinite(value) ? Math.max(0, Math.min(1, value)) : 0;
+    const cells = Math.round(clamped * w);
+    return filled.repeat(cells) + empty.repeat(w - cells);
 }
 /**
  * Box-drawing characters for borders. Set picked to render well on

package/dist/tui/tabs/accounts.js

@@ -24,7 +24,7 @@
  *   To add: `dario accounts add <alias>`
  *   To remove: `dario accounts remove <alias>`
  */
-import { fg, dim, brand, pad } from '../render.js';
+import { fg, dim, brand, pad, truncate } from '../render.js';
 import { renderKvRow } from '../layout.js';
 export const AccountsTab = {
     id: 'accounts',
@@ -57,21 +57,27 @@ export const AccountsTab = {
     render(state, dimv) {
         const lines = [];
         const w = dimv.cols;
-        lines.push(' ' + brand('Accounts'));
+        // Bound every row at the push site rather than at each call site. The
+        // column header (68 wide) and the disk-fallback path (which
+        // interpolates `~/.dario/accounts/<alias>.json`, unbounded by alias
+        // length) both overflowed; hand-auditing 15 separate pushes is how
+        // that got missed.
+        const push = (s) => lines.push(truncate(s, w));
+        push(' ' + brand('Accounts'));
         if (state.loading && state.accounts.length === 0) {
-            lines.push('');
-            lines.push('  ' + dim('Loading accounts…'));
+            push('');
+            push('  ' + dim('Loading accounts…'));
             return lines.join('\n');
         }
         if (state.accounts.length === 0) {
-            lines.push('');
+            push('');
             if (state.source === 'single-account') {
-                lines.push('  ' + dim('Single-account mode (`dario login`) — no pool.'));
-                lines.push('  ' + 'Start a pool: ' + fg('cyan', 'dario accounts add <alias>'));
+                push('  ' + dim('Single-account mode (`dario login`) — no pool.'));
+                push('  ' + 'Start a pool: ' + fg('cyan', 'dario accounts add <alias>'));
             }
             else {
-                lines.push('  ' + dim('No accounts in the pool.'));
-                lines.push('  ' + 'Add one: ' + fg('cyan', 'dario accounts add <alias>'));
+                push('  ' + dim('No accounts in the pool.'));
+                push('  ' + 'Add one: ' + fg('cyan', 'dario accounts add <alias>'));
             }
             return lines.join('\n');
         }
@@ -79,13 +85,13 @@ export const AccountsTab = {
         // doesn't, so show the util columns only when the pool populated them.
         const hasUtil = state.accounts.some((a) => a.util5h !== undefined);
         if (state.source === 'disk') {
-            lines.push('  ' + fg('yellow', 'proxy unreachable — showing on-disk accounts (may be stale)'));
+            push('  ' + fg('yellow', 'proxy unreachable — showing on-disk accounts (may be stale)'));
         }
         // Header row
-        lines.push('  ' + dim(hasUtil
+        push('  ' + dim(hasUtil
             ? pad('alias', 20) + pad('expires', 14) + pad('util5h', 9) + pad('util7d', 9) + pad('status', 14)
             : pad('alias', 20) + pad('expires', 16) + pad('source', 24)));
-        lines.push('  ' + dim('─'.repeat(Math.min(w - 4, 66))));
+        push('  ' + dim('─'.repeat(Math.min(w - 4, 66))));
         for (const acc of state.accounts) {
             const aliasCol = pad(acc.alias, 20);
             if (hasUtil) {
@@ -94,22 +100,22 @@ export const AccountsTab = {
                 const u7 = pad(acc.util7d !== undefined ? `${Math.round(acc.util7d * 100)}%` : '—', 9);
                 const statusCol = acc.status ?? '—';
                 const statusFg = statusCol === 'auth-cooldown' ? fg('yellow', statusCol) : dim(statusCol);
-                lines.push('  ' + aliasCol + expiresCol + u5 + u7 + statusFg);
+                push('  ' + aliasCol + expiresCol + u5 + u7 + statusFg);
             }
             else {
                 const expiresCol = pad(formatExpiry(acc.expiresAt), 16);
                 const sourceCol = '~/.dario/accounts/' + acc.alias + '.json';
-                lines.push('  ' + aliasCol + expiresCol + dim(sourceCol));
+                push('  ' + aliasCol + expiresCol + dim(sourceCol));
             }
         }
-        lines.push('');
-        lines.push(' ' + dim('Mutations via CLI:'));
-        lines.push('   ' + fg('cyan', 'dario accounts add <alias>'));
-        lines.push('   ' + fg('cyan', 'dario accounts remove <alias>'));
+        push('');
+        push(' ' + dim('Mutations via CLI:'));
+        push('   ' + fg('cyan', 'dario accounts add <alias>'));
+        push('   ' + fg('cyan', 'dario accounts remove <alias>'));
         // Refresh hint
-        lines.push('');
-        lines.push(' ' + renderKvRow('', '', w - 2)); // spacer
-        lines.push(' ' + dim(`Press ${fg('cyan', 'r')} to refresh.`));
+        push('');
+        push(' ' + renderKvRow('', '', w - 2)); // spacer
+        push(' ' + dim(`Press ${fg('cyan', 'r')} to refresh.`));
         return lines.join('\n');
     },
 };

package/dist/tui/tabs/status.js

@@ -139,7 +139,8 @@ export const StatusTab = {
                 const remainingMs = Math.max(0, s.cooldownUntil - Date.now());
                 const remaining = formatDuration(remainingMs);
                 // Red banner header — this is the loud surface when halted
-                lines.push('  ' + fg('red', '⚠ HALTED') + '  ' + dim(`${s.request.claim} detected ${formatAgo(s.since)} ago`));
+                // formatAgo() already ends in "ago" — don't append a second one.
+                lines.push('  ' + fg('red', '⚠ HALTED') + '  ' + dim(`${s.request.claim} detected ${formatAgo(s.since)}`));
                 lines.push('  ' + renderKvRow('Request', `${s.request.model}  ${dim('account=' + s.request.account)}`, w - 4));
                 lines.push('  ' + renderKvRow('Cause', `representative-claim = ${fg('red', s.request.claim)}`, w - 4));
                 lines.push('  ' + renderKvRow('Auto-resume in', remaining === '0s' ? fg('yellow', 'now (cooldown elapsed)') : remaining, w - 4));

package/dist/tui/tui-app.d.ts

@@ -39,3 +39,12 @@ export interface TuiAppOpts {
     version: string;
 }
 export declare function startTuiApp(opts: TuiAppOpts): Promise<void>;
+/**
+ * Compose one full frame: header, tab strip, rule, active tab body,
+ * footer. Exported for tests — the frame-height invariant (never more
+ * physical rows than the terminal has) is asserted against this.
+ */
+export declare function renderTui(state: TuiState, dim_: {
+    cols: number;
+    rows: number;
+}, version: string, proxyUrl: string): string;

package/dist/tui/tui-app.js

@@ -10,7 +10,7 @@
  */
 import { App } from './app.js';
 import { ProxyClient } from './proxy-client.js';
-import { fg, dim } from './render.js';
+import { fg, dim, truncate } from './render.js';
 import { renderFooter, renderHeader, renderTabStrip } from './layout.js';
 import { StatusTab } from './tabs/status.js';
 import { ConfigTab } from './tabs/config.js';
@@ -180,7 +180,12 @@ function withTabState(s, idx, sliceVal) {
     return { ...s, [key]: sliceVal };
 }
 // ── Rendering ───────────────────────────────────────────────────
-function renderTui(state, dim_, version, proxyUrl) {
+/**
+ * Compose one full frame: header, tab strip, rule, active tab body,
+ * footer. Exported for tests — the frame-height invariant (never more
+ * physical rows than the terminal has) is asserted against this.
+ */
+export function renderTui(state, dim_, version, proxyUrl) {
     const cols = dim_.cols;
     const rows = dim_.rows;
     const out = [];
@@ -191,11 +196,29 @@ function renderTui(state, dim_, version, proxyUrl) {
     out.push(renderTabStrip(cols, tabLabels, state.activeTab));
     out.push(dim('─'.repeat(cols)));
     // Body — passed (cols, rows-5) so the tab knows it has rows 4..rows-2
-    const bodyRows = rows - 5;
+    const bodyRows = Math.max(1, rows - 5);
     const tab = TABS[state.activeTab];
     const slice = stateOf(state, state.activeTab);
     const body = tab.render(slice, { cols, rows: bodyRows });
-    out.push(body);
+    const bodyLineArr = body.split('\n');
+    // A tab that renders past its row budget used to push the header and
+    // tab strip off the top of the alt-screen: App.redraw writes the frame
+    // from row 1 with no scrollback, so the overflow costs the chrome the
+    // user needs most — including which tab is even active. Clip the tail
+    // instead, and say how much was dropped so the loss isn't silent.
+    //
+    // This is a floor, not a substitute for a tab budgeting its own
+    // content: a tab that overflows here is still choosing what to drop by
+    // accident of ordering. Config and Hits size themselves; the rest do
+    // not yet.
+    if (bodyLineArr.length > bodyRows) {
+        const hidden = bodyLineArr.length - bodyRows + 1;
+        const note = ` … ${hidden} more row${hidden === 1 ? '' : 's'} — resize for the rest`;
+        out.push(bodyLineArr.slice(0, bodyRows - 1).concat(truncate(dim(note), cols)).join('\n'));
+    }
+    else {
+        out.push(body);
+    }
     // Footer — fixed key hints (tab-cycling stays universal; per-tab
     // hints are inside each tab body to keep the global footer stable).
     const footerHints = [
@@ -206,12 +229,14 @@ function renderTui(state, dim_, version, proxyUrl) {
     // Pad body to fill rows before the footer so the footer's row stays
     // at the bottom (close to it — slight underflow OK; row count
     // depends on each tab's content).
-    const bodyLines = body.split('\n').length;
+    const bodyLines = bodyLineArr.length;
     if (bodyLines < bodyRows) {
         out.push(''.padEnd(bodyRows - bodyLines, '\n'));
     }
     out.push(renderFooter(cols, footerHints));
     // Connect with newlines
     void fg; // silence unused if neither tab uses it through this module
-    return out.join('\n');
+    // Absolute floor — whatever a tab did, never hand the terminal more
+    // physical rows than it has.
+    return out.join('\n').split('\n').slice(0, rows).join('\n');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askalf/dario",
-  "version": "5.4.6",
+  "version": "5.4.7",
   "description": "Use your Claude Pro/Max subscription in any tool — Cursor, Cline, Aider, the Agent SDK, your scripts — at subscription pricing, not per-token API bills. One local Anthropic + OpenAI-compatible endpoint.",
   "type": "module",
   "bin": {