@aragon-agent/cli 0.6.14 → 0.6.15

package/dist/ui/interaction-copy.d.ts

@@ -1,77 +1,77 @@
-/** Product copy is centralized here; Unicode escapes keep UI source ASCII-only. */
+/** Built-in product text; user content retains its original language. */
 export declare const interactionCopy: {
-    readonly copied: "已复制";
-    readonly lines: "行";
-    readonly copySent: "复制请求已发送，无法确认剪贴板";
+    readonly copied: "Copied";
+    readonly lines: "lines";
+    readonly copySent: "Copy sent; clipboard confirmation unavailable";
     readonly copyReasons: {
-        readonly empty: "没有可复制的内容";
-        readonly unavailable: "剪贴板工具不可用";
-        readonly write: "写入剪贴板失败";
-        readonly timeout: "剪贴板工具超时";
-        readonly 'too-large': "内容超过剪贴板限制";
-        readonly cancelled: "复制已取消";
+        readonly empty: "Nothing to copy";
+        readonly unavailable: "Clipboard tool unavailable";
+        readonly write: "Clipboard write failed";
+        readonly timeout: "Clipboard tool timed out";
+        readonly 'too-large': "Content exceeds clipboard limit";
+        readonly cancelled: "Copy cancelled";
     };
-    readonly stopServicesShort: "^C 停服务";
-    readonly approveTool: "y 批准";
-    readonly rejectTool: "n/Enter 拒绝";
-    readonly saveSettings: "Enter 保存";
-    readonly modeLabel: "切换模式";
-    readonly idle: readonly ["空闲", "空闲"];
-    readonly starting: readonly ["启动", "启动中"];
-    readonly waiting: readonly ["等待", "等待模型"];
-    readonly thinking: readonly ["思考", "正在思考"];
-    readonly generating: readonly ["生成", "正在生成内容"];
-    readonly preparingTool: readonly ["工具", "正在准备工具"];
-    readonly tool: readonly ["工具", "正在运行工具"];
-    readonly confirming: readonly ["确认", "等待用户确认"];
-    readonly stopping: readonly ["停止中", "停止中"];
-    readonly compacting: readonly ["压缩", "正在压缩上下文"];
-    readonly retrying: readonly ["重试", "等待重试"];
-    readonly ended: readonly ["结束", "已结束"];
-    readonly interrupted: readonly ["中断", "已中断"];
-    readonly failed: readonly ["失败", "运行失败"];
-    readonly readFile: readonly ["读文件", "正在读取文件"];
-    readonly writeFile: readonly ["改文件", "正在修改文件"];
-    readonly command: readonly ["命令", "正在执行命令"];
-    readonly queue: "队";
-    readonly pending: "待处理";
-    readonly context: "上下文";
-    readonly contextUnknown: "上下文未知";
-    readonly sessionInput: "会话 输入";
-    readonly output: "输出";
-    readonly estimatedCost: "会话估算 USD";
-    readonly speed: "本轮均速";
-    readonly elapsed: "耗时";
-    readonly services: "服务";
-    readonly send: "Enter 发送";
-    readonly enqueue: "Enter 入队";
-    readonly newline: "^J 换行";
-    readonly sendLong: "Enter：发送";
-    readonly enqueueLong: "Enter：加入队列";
-    readonly newlineLong: "Ctrl+J：换行";
-    readonly interrupt: "Esc×2 中断";
-    readonly interruptAgain: "再按 Esc 中断";
-    readonly forceStop: "再按 Esc 强制停止";
-    readonly startingHint: "启动中，请稍候";
-    readonly cancelStart: "Esc×2 取消启动";
-    readonly cancelStartAgain: "再按 Esc 取消启动";
-    readonly copy: "Ctrl+C 复制";
-    readonly copying: "正在复制";
-    readonly copyFailed: "复制失败";
-    readonly copyCleanup: "复制失败，正在清理";
-    readonly close: "Esc 关闭";
-    readonly closeCompletion: "Esc 关闭补全";
-    readonly executeCommand: "Enter 执行命令";
-    readonly complete: "Tab 补全";
-    readonly select: "Up/Down 选择";
-    readonly scroll: "PgUp/PgDn 滚动";
-    readonly confirm: "Enter 确认";
-    readonly stopServices: "Ctrl+C 停止服务";
-    readonly exit: "Ctrl+C×2 退出";
-    readonly help: "/help 帮助";
-    readonly shiftNewline: "Shift+Enter 换行需终端支持";
-    readonly mode: "Shift+Tab 切换模式";
-    readonly update: "/update 更新";
-    readonly idlePlaceholder: "输入任务或问题…";
-    readonly runningPlaceholder: "输入补充说明…";
+    readonly stopServicesShort: "^C stop services";
+    readonly approveTool: "y approve";
+    readonly rejectTool: "n/Enter reject";
+    readonly saveSettings: "Enter save";
+    readonly modeLabel: "switch mode";
+    readonly idle: readonly ["Idle", "Idle"];
+    readonly starting: readonly ["Start", "Starting"];
+    readonly waiting: readonly ["Wait", "Waiting for model"];
+    readonly thinking: readonly ["Think", "Thinking"];
+    readonly generating: readonly ["Write", "Generating"];
+    readonly preparingTool: readonly ["Prep", "Preparing tool"];
+    readonly tool: readonly ["Tool", "Running tool"];
+    readonly confirming: readonly ["Ask", "Awaiting confirmation"];
+    readonly stopping: readonly ["Stop", "Stopping"];
+    readonly compacting: readonly ["Pack", "Compacting context"];
+    readonly retrying: readonly ["Retry", "Retrying"];
+    readonly ended: readonly ["Done", "Done"];
+    readonly interrupted: readonly ["Abort", "Interrupted"];
+    readonly failed: readonly ["Error", "Failed"];
+    readonly readFile: readonly ["Tool", "Running tool read_file"];
+    readonly writeFile: readonly ["Tool", "Running tool write_file"];
+    readonly command: readonly ["Tool", "Running tool bash"];
+    readonly queue: "Q";
+    readonly pending: "pending";
+    readonly context: "Context";
+    readonly contextUnknown: "Context ?";
+    readonly sessionInput: "Session input";
+    readonly output: "output";
+    readonly estimatedCost: "Cost";
+    readonly speed: "Run average";
+    readonly elapsed: "Elapsed";
+    readonly services: "Services";
+    readonly send: "Enter send";
+    readonly enqueue: "Enter queue";
+    readonly newline: "^J newline";
+    readonly sendLong: "Enter send";
+    readonly enqueueLong: "Enter queue";
+    readonly newlineLong: "Ctrl+J newline";
+    readonly interrupt: "Esc x2 stop";
+    readonly interruptAgain: "Esc stop";
+    readonly forceStop: "Esc force";
+    readonly startingHint: "Starting; please wait";
+    readonly cancelStart: "Esc x2 cancel";
+    readonly cancelStartAgain: "Esc cancel";
+    readonly copy: "Ctrl+C copy";
+    readonly copying: "Copying";
+    readonly copyFailed: "Copy failed";
+    readonly copyCleanup: "Copy failed; cleaning up";
+    readonly close: "Esc close";
+    readonly closeCompletion: "Esc menu";
+    readonly executeCommand: "Enter command";
+    readonly complete: "Tab complete";
+    readonly select: "Up/Down select";
+    readonly scroll: "PgUp/PgDn scroll";
+    readonly confirm: "Enter confirm";
+    readonly stopServices: "Ctrl+C stop services";
+    readonly exit: "Ctrl+C x2 exit";
+    readonly help: "/help";
+    readonly shiftNewline: "Shift+Enter newline needs terminal support";
+    readonly mode: "Shift+Tab switch mode";
+    readonly update: "/update";
+    readonly idlePlaceholder: "Ask a question or describe a task...";
+    readonly runningPlaceholder: "Add a follow-up...";
 };

package/dist/ui/interaction-copy.js

@@ -1,40 +1,32 @@
-/** Product copy is centralized here; Unicode escapes keep UI source ASCII-only. */
+/** Built-in product text; user content retains its original language. */
 export const interactionCopy = {
-    copied: '\u5df2\u590d\u5236', lines: '\u884c',
-    copySent: '\u590d\u5236\u8bf7\u6c42\u5df2\u53d1\u9001\uff0c\u65e0\u6cd5\u786e\u8ba4\u526a\u8d34\u677f',
-    copyReasons: {
-        empty: '\u6ca1\u6709\u53ef\u590d\u5236\u7684\u5185\u5bb9',
-        unavailable: '\u526a\u8d34\u677f\u5de5\u5177\u4e0d\u53ef\u7528',
-        write: '\u5199\u5165\u526a\u8d34\u677f\u5931\u8d25',
-        timeout: '\u526a\u8d34\u677f\u5de5\u5177\u8d85\u65f6',
-        'too-large': '\u5185\u5bb9\u8d85\u8fc7\u526a\u8d34\u677f\u9650\u5236',
-        cancelled: '\u590d\u5236\u5df2\u53d6\u6d88',
-    },
-    stopServicesShort: '^C \u505c\u670d\u52a1',
-    approveTool: 'y \u6279\u51c6', rejectTool: 'n/Enter \u62d2\u7edd',
-    saveSettings: 'Enter \u4fdd\u5b58',
-    modeLabel: '\u5207\u6362\u6a21\u5f0f',
-    idle: ['\u7a7a\u95f2', '\u7a7a\u95f2'], starting: ['\u542f\u52a8', '\u542f\u52a8\u4e2d'], waiting: ['\u7b49\u5f85', '\u7b49\u5f85\u6a21\u578b'],
-    thinking: ['\u601d\u8003', '\u6b63\u5728\u601d\u8003'], generating: ['\u751f\u6210', '\u6b63\u5728\u751f\u6210\u5185\u5bb9'],
-    preparingTool: ['\u5de5\u5177', '\u6b63\u5728\u51c6\u5907\u5de5\u5177'], tool: ['\u5de5\u5177', '\u6b63\u5728\u8fd0\u884c\u5de5\u5177'],
-    confirming: ['\u786e\u8ba4', '\u7b49\u5f85\u7528\u6237\u786e\u8ba4'], stopping: ['\u505c\u6b62\u4e2d', '\u505c\u6b62\u4e2d'],
-    compacting: ['\u538b\u7f29', '\u6b63\u5728\u538b\u7f29\u4e0a\u4e0b\u6587'], retrying: ['\u91cd\u8bd5', '\u7b49\u5f85\u91cd\u8bd5'],
-    ended: ['\u7ed3\u675f', '\u5df2\u7ed3\u675f'], interrupted: ['\u4e2d\u65ad', '\u5df2\u4e2d\u65ad'], failed: ['\u5931\u8d25', '\u8fd0\u884c\u5931\u8d25'],
-    readFile: ['\u8bfb\u6587\u4ef6', '\u6b63\u5728\u8bfb\u53d6\u6587\u4ef6'], writeFile: ['\u6539\u6587\u4ef6', '\u6b63\u5728\u4fee\u6539\u6587\u4ef6'],
-    command: ['\u547d\u4ee4', '\u6b63\u5728\u6267\u884c\u547d\u4ee4'],
-    queue: '\u961f', pending: '\u5f85\u5904\u7406', context: '\u4e0a\u4e0b\u6587', contextUnknown: '\u4e0a\u4e0b\u6587\u672a\u77e5',
-    sessionInput: '\u4f1a\u8bdd \u8f93\u5165', output: '\u8f93\u51fa', estimatedCost: '\u4f1a\u8bdd\u4f30\u7b97 USD',
-    speed: '\u672c\u8f6e\u5747\u901f', elapsed: '\u8017\u65f6', services: '\u670d\u52a1',
-    send: 'Enter \u53d1\u9001', enqueue: 'Enter \u5165\u961f', newline: '^J \u6362\u884c',
-    sendLong: 'Enter\uff1a\u53d1\u9001', enqueueLong: 'Enter\uff1a\u52a0\u5165\u961f\u5217', newlineLong: 'Ctrl+J\uff1a\u6362\u884c',
-    interrupt: 'Esc\u00d72 \u4e2d\u65ad', interruptAgain: '\u518d\u6309 Esc \u4e2d\u65ad', forceStop: '\u518d\u6309 Esc \u5f3a\u5236\u505c\u6b62',
-    startingHint: '\u542f\u52a8\u4e2d\uff0c\u8bf7\u7a0d\u5019', cancelStart: 'Esc\u00d72 \u53d6\u6d88\u542f\u52a8',
-    cancelStartAgain: '\u518d\u6309 Esc \u53d6\u6d88\u542f\u52a8',
-    copy: 'Ctrl+C \u590d\u5236', copying: '\u6b63\u5728\u590d\u5236', copyFailed: '\u590d\u5236\u5931\u8d25', copyCleanup: '\u590d\u5236\u5931\u8d25\uff0c\u6b63\u5728\u6e05\u7406',
-    close: 'Esc \u5173\u95ed', closeCompletion: 'Esc \u5173\u95ed\u8865\u5168', executeCommand: 'Enter \u6267\u884c\u547d\u4ee4',
-    complete: 'Tab \u8865\u5168', select: 'Up/Down \u9009\u62e9', scroll: 'PgUp/PgDn \u6eda\u52a8',
-    confirm: 'Enter \u786e\u8ba4', stopServices: 'Ctrl+C \u505c\u6b62\u670d\u52a1', exit: 'Ctrl+C\u00d72 \u9000\u51fa',
-    help: '/help \u5e2e\u52a9', shiftNewline: 'Shift+Enter \u6362\u884c\u9700\u7ec8\u7aef\u652f\u6301',
-    mode: 'Shift+Tab \u5207\u6362\u6a21\u5f0f', update: '/update \u66f4\u65b0',
-    idlePlaceholder: '\u8f93\u5165\u4efb\u52a1\u6216\u95ee\u9898\u2026', runningPlaceholder: '\u8f93\u5165\u8865\u5145\u8bf4\u660e\u2026',
+    copied: 'Copied', lines: 'lines',
+    copySent: 'Copy sent; clipboard confirmation unavailable',
+    copyReasons: { empty: 'Nothing to copy', unavailable: 'Clipboard tool unavailable',
+        write: 'Clipboard write failed', timeout: 'Clipboard tool timed out',
+        'too-large': 'Content exceeds clipboard limit', cancelled: 'Copy cancelled' },
+    stopServicesShort: '^C stop services', approveTool: 'y approve', rejectTool: 'n/Enter reject',
+    saveSettings: 'Enter save', modeLabel: 'switch mode',
+    idle: ['Idle', 'Idle'], starting: ['Start', 'Starting'], waiting: ['Wait', 'Waiting for model'],
+    thinking: ['Think', 'Thinking'], generating: ['Write', 'Generating'],
+    preparingTool: ['Prep', 'Preparing tool'], tool: ['Tool', 'Running tool'],
+    confirming: ['Ask', 'Awaiting confirmation'], stopping: ['Stop', 'Stopping'],
+    compacting: ['Pack', 'Compacting context'], retrying: ['Retry', 'Retrying'],
+    ended: ['Done', 'Done'], interrupted: ['Abort', 'Interrupted'], failed: ['Error', 'Failed'],
+    readFile: ['Tool', 'Running tool read_file'], writeFile: ['Tool', 'Running tool write_file'],
+    command: ['Tool', 'Running tool bash'],
+    queue: 'Q', pending: 'pending', context: 'Context', contextUnknown: 'Context ?',
+    sessionInput: 'Session input', output: 'output', estimatedCost: 'Cost',
+    speed: 'Run average', elapsed: 'Elapsed', services: 'Services',
+    send: 'Enter send', enqueue: 'Enter queue', newline: '^J newline',
+    sendLong: 'Enter send', enqueueLong: 'Enter queue', newlineLong: 'Ctrl+J newline',
+    interrupt: 'Esc x2 stop', interruptAgain: 'Esc stop', forceStop: 'Esc force',
+    startingHint: 'Starting; please wait', cancelStart: 'Esc x2 cancel', cancelStartAgain: 'Esc cancel',
+    copy: 'Ctrl+C copy', copying: 'Copying', copyFailed: 'Copy failed', copyCleanup: 'Copy failed; cleaning up',
+    close: 'Esc close', closeCompletion: 'Esc menu', executeCommand: 'Enter command',
+    complete: 'Tab complete', select: 'Up/Down select', scroll: 'PgUp/PgDn scroll',
+    confirm: 'Enter confirm', stopServices: 'Ctrl+C stop services', exit: 'Ctrl+C x2 exit',
+    help: '/help', shiftNewline: 'Shift+Enter newline needs terminal support',
+    mode: 'Shift+Tab switch mode', update: '/update',
+    idlePlaceholder: 'Ask a question or describe a task...', runningPlaceholder: 'Add a follow-up...',
 };

package/dist/ui/interaction-hints.d.ts

@@ -1,7 +1,11 @@
+import type { StatusFeedback, EscapeAction } from './status-feedback.js';
 export interface ActionHintInput {
     cols: number;
     interactionPhase: 'idle' | 'starting' | 'running';
     interruptHint?: string;
+    interruptPhase?: 'ready' | 'armed' | 'stopping';
+    escapeAction?: EscapeAction;
+    feedback?: StatusFeedback;
     selectionPending?: boolean;
     copyInFlight?: boolean;
     copyCleanupPending?: boolean;
@@ -14,5 +18,8 @@ export interface ActionHintInput {
     exitHint?: string;
     modeToggleKey?: string;
 }
-/** Esc describes its actual owner, including while transient feedback has the row. */
+export declare function escapeClause(input: ActionHintInput): string;
+export declare function clipStatusText(text: string, cells: number): string;
+/** Ordered actions before width allocation. No interpretation of translated feedback text. */
+export declare function actionCandidates(input: ActionHintInput): string[];
 export declare function buildActionClauses(input: ActionHintInput): readonly string[];

package/dist/ui/interaction-hints.js

@@ -1,92 +1,79 @@
 import stringWidth from 'string-width';
 import { interactionCopy as copy } from './interaction-copy.js';
 import { cleanStatusText } from './layout/status-layout.js';
-function escapeClause(input) {
+import { graphemes } from './editor-navigation.js';
+export function escapeClause(input) {
     if (input.overlay)
         return copy.close;
-    if (input.completion && input.completion !== 'none')
+    if (input.completion && input.completion !== 'none' || input.escapeAction === 'menu')
         return copy.closeCompletion;
+    if (input.escapeAction === 'force-stop' || input.interruptPhase === 'stopping')
+        return copy.forceStop;
     if (input.interactionPhase === 'starting')
-        return /again|confirm/i.test(input.interruptHint ?? '')
-            ? copy.cancelStartAgain : copy.cancelStart;
+        return input.interruptPhase === 'armed' ? copy.cancelStartAgain : copy.cancelStart;
     if (input.interactionPhase !== 'running')
         return '';
-    if (/force|\u5f3a\u5236/i.test(input.interruptHint ?? ''))
-        return copy.forceStop;
-    if (/again|confirm|\u518d\u6309/i.test(input.interruptHint ?? ''))
-        return copy.interruptAgain;
-    return copy.interrupt;
+    return input.interruptPhase === 'armed' ? copy.interruptAgain : copy.interrupt;
 }
-function contextClauses(input, escape) {
+export function clipStatusText(text, cells) {
+    let clipped = '';
+    for (const part of graphemes(cleanStatusText(text))) {
+        if (stringWidth(clipped + part.text) > cells)
+            break;
+        clipped += part.text;
+    }
+    return clipped;
+}
+/** Ordered actions before width allocation. No interpretation of translated feedback text. */
+export function actionCandidates(input) {
     if (input.overlay) {
         if (input.overlay === 'confirm')
-            return [escape, copy.approveTool, copy.rejectTool];
-        const selects = /question|model|session|settings/.test(input.overlay);
-        return [escape, selects ? copy.select : copy.scroll,
+            return [copy.approveTool, copy.rejectTool];
+        const selects = ['question', 'model', 'session', 'settings'].includes(input.overlay);
+        return [selects ? copy.select : copy.scroll,
             ...(selects ? [input.overlay === 'settings' ? copy.saveSettings : copy.confirm] : [])];
     }
+    const actions = [];
+    if (input.selectionPending)
+        actions.push(copy.copy);
+    else if (input.services)
+        actions.push(copy.stopServicesShort);
     if (input.completion && input.completion !== 'none') {
-        const candidates = input.completion === 'slash'
-            ? [copy.executeCommand, escape, copy.complete, copy.select, copy.newline]
-            : [copy.complete, escape, copy.select, copy.newline];
-        if (input.completion === 'file' && input.interactionPhase !== 'starting')
-            candidates.push(input.interactionPhase === 'running' ? copy.enqueue : copy.send);
-        return candidates;
+        actions.push(...(input.completion === 'slash' ? [copy.executeCommand] : []), copy.complete, copy.select);
+        return actions;
     }
-    if (input.interactionPhase === 'starting')
-        return [copy.startingHint, escape];
-    const running = input.interactionPhase === 'running';
-    const narrow = input.cols < 72;
-    return [running ? (narrow ? copy.enqueue : copy.enqueueLong) : (narrow ? copy.send : copy.sendLong),
-        narrow ? copy.newline : copy.newlineLong, ...(escape ? [escape] : [])];
+    if (input.hintsEnabled !== false && input.interactionPhase !== 'starting')
+        actions.push(input.interactionPhase === 'running' ? copy.enqueue : copy.send, input.cols < 72 ? copy.newline : copy.newlineLong);
+    return actions;
 }
-function fitClauses(candidates, budget) {
-    const result = [];
-    for (const text of candidates.filter(Boolean)) {
-        if (stringWidth([...result, text].join(' | ')) <= budget)
-            result.push(text);
-    }
-    return result;
-}
-/** Esc describes its actual owner, including while transient feedback has the row. */
 export function buildActionClauses(input) {
     const budget = Math.max(0, Math.floor(input.cols) - 1);
     const escape = escapeClause(input);
-    const copyFeedback = input.copyCleanupPending
-        ? (input.toast?.includes(copy.copyFailed) ? input.toast : copy.copyCleanup)
-        : input.copyInFlight ? copy.copying : '';
-    const feedback = input.exitHint || copyFeedback || input.toast || '';
+    const result = [];
+    const feedback = input.feedback?.text || input.exitHint || (input.copyCleanupPending ? copy.copyCleanup
+        : input.copyInFlight ? copy.copying : input.toast) || '';
+    const reserve = escape ? stringWidth(escape) + 3 : 0;
     if (feedback) {
-        const reserved = escape ? [escape] : [];
-        const remaining = budget - stringWidth(reserved.join(' | ')) - (reserved.length ? 3 : 0);
-        let text = cleanStatusText(feedback);
-        if (stringWidth(text) > remaining) {
-            const minimum = text.includes(copy.copyFailed) ? copy.copyFailed : '';
-            let clipped = '';
-            for (const char of text) {
-                if (stringWidth(clipped + char) > remaining)
-                    break;
-                clipped += char;
-            }
-            text = minimum && stringWidth(minimum) <= remaining ? minimum : clipped;
-        }
-        return fitClauses([text, ...reserved], budget);
+        const text = clipStatusText(feedback, Math.max(0, budget - reserve));
+        if (text)
+            result.push(text);
     }
-    const clauses = contextClauses(input, escape);
-    if (input.selectionPending)
-        clauses.unshift(copy.copy);
-    if (input.services && !input.selectionPending)
-        clauses.unshift(input.cols < 72
-            ? `${copy.stopServicesShort} ${input.services}` : `${copy.services} ${input.services} ${copy.stopServices}`);
-    if (input.updateAvailable && input.interactionPhase === 'idle' && !input.overlay)
-        clauses.unshift(copy.update);
-    if (!input.selectionPending && !input.services)
-        clauses.push(copy.exit);
-    if (input.hintsEnabled !== false && !input.overlay)
-        clauses.push(copy.shiftNewline, `${(input.modeToggleKey ?? 'shift+tab').split('+').map((key) => key.length === 1 ? key.toUpperCase() : key[0].toUpperCase() + key.slice(1).toLowerCase()).join('+')} ${copy.modeLabel}`, copy.help, '/ commands', '@ files');
-    // Reserve Esc before lower-priority clauses, but preserve the documented display order.
-    if (!escape)
-        return fitClauses(clauses, budget);
-    const selected = fitClauses(clauses.filter((clause) => clause !== escape), budget - stringWidth(escape) - 3);
-    return clauses.filter((clause) => clause === escape || selected.includes(clause));
+    const add = (text, remaining = budget) => {
+        if (stringWidth([...result, text].join(' | ')) <= remaining)
+            result.push(cleanStatusText(text));
+    };
+    if (!feedback) {
+        for (const action of actionCandidates(input))
+            add(action, budget - reserve);
+    }
+    if (escape)
+        add(escape);
+    if (!feedback && input.hintsEnabled !== false && !input.overlay) {
+        if (input.updateAvailable)
+            add(copy.update);
+        add(copy.exit);
+        add((input.modeToggleKey ?? 'Shift+Tab') + ' ' + copy.modeLabel);
+        add(copy.help);
+    }
+    return result;
 }

package/dist/ui/layout/AppShell.d.ts

@@ -5,9 +5,13 @@ export interface AppShellProps {
     cols: number;
     header: React.ReactNode;
     viewport: React.ReactNode;
-    toast: React.ReactNode;
+    composer: React.ReactNode;
+    composerSlotRows: number;
+    viewportRows: number;
+    details?: React.ReactNode;
+    statusRows: 0 | 1 | 2;
     status: React.ReactNode;
     inactive?: boolean;
     placeholder?: React.ReactNode;
 }
-export declare function AppShell({ rows, cols, header, viewport, toast, status, inactive, placeholder, }: AppShellProps): React.ReactElement;
+export declare function AppShell({ rows, cols, header, viewport, composer, composerSlotRows, viewportRows, details, statusRows, status, inactive, placeholder, }: AppShellProps): React.ReactElement;

package/dist/ui/layout/AppShell.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box } from 'ink';
 import { frameHeight } from './frame.js';
-export function AppShell({ rows, cols, header, viewport, toast, status, inactive = false, placeholder, }) {
-    return (_jsxs(Box, { flexDirection: "column", height: frameHeight(rows), width: cols, overflow: "hidden", children: [_jsxs(Box, { display: inactive ? 'none' : 'flex', flexDirection: "column", height: frameHeight(rows), width: cols, overflow: "hidden", children: [_jsx(Box, { height: 1, flexShrink: 0, overflow: "hidden", children: header }), _jsx(Box, { flexDirection: "column", flexGrow: 1, flexShrink: 1, overflow: "hidden", children: viewport }), _jsx(Box, { height: 1, flexShrink: 0, overflow: "hidden", children: toast }), _jsx(Box, { height: 1, flexShrink: 0, overflow: "hidden", children: status })] }), _jsx(Box, { display: inactive ? 'flex' : 'none', height: frameHeight(rows), overflow: "hidden", children: placeholder })] }));
+export function AppShell({ rows, cols, header, viewport, composer, composerSlotRows, viewportRows, details, statusRows, status, inactive = false, placeholder, }) {
+    return (_jsxs(Box, { flexDirection: "column", height: frameHeight(rows), width: cols, overflow: "hidden", flexShrink: 0, children: [_jsxs(Box, { display: inactive ? 'none' : 'flex', flexDirection: "column", height: frameHeight(rows), width: cols, overflow: "hidden", flexShrink: 0, children: [_jsx(Box, { height: 1, flexShrink: 0, overflow: "hidden", children: header }), _jsx(Box, { flexDirection: "column", height: viewportRows, flexShrink: 0, overflow: "hidden", children: viewport }), _jsx(Box, { flexDirection: "column", height: composerSlotRows, justifyContent: "flex-end", flexShrink: 0, overflow: "hidden", children: composer }), _jsx(Box, { height: statusRows > 0 ? 1 : 0, flexShrink: 0, overflow: "hidden", children: status }), statusRows === 2 && _jsx(Box, { height: 1, flexShrink: 0, overflow: "hidden", children: details })] }), _jsx(Box, { display: inactive ? 'flex' : 'none', height: frameHeight(rows), overflow: "hidden", children: placeholder })] }));
 }

package/dist/ui/layout/OverlayFrame.d.ts

@@ -35,4 +35,6 @@ interface OverlayFrameSelfManaged extends OverlayFrameBase {
 }
 export type OverlayFrameProps = OverlayFrameControlled | OverlayFrameSelfManaged;
 export declare function OverlayFrame(props: OverlayFrameProps): React.ReactElement;
+/** Body rows shared by controlled overlays and self-managed focused lists. */
+export declare function overlayBodyRows(maxRows: number, cols: number): number;
 export {};

package/dist/ui/layout/OverlayFrame.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useEffect } from 'react';
+import { useEffect, useMemo } from 'react';
 import { Box, Text } from 'ink';
+import stringWidth from 'string-width';
 import { pickGlyphs } from '../glyphs.js';
 import { sliceWindow } from './overlay-window.js';
 /** Below this width the round border costs more than it conveys (§5.2). */
@@ -19,14 +20,22 @@ const MARGIN_ROWS = 1;
 export function OverlayFrame(props) {
     const { title, hint, maxRows, cols = 80, theme, caps } = props;
     const glyphs = pickGlyphs(caps);
-    const bordered = cols >= BORDERLESS_COLS;
+    // Ink applies changed style keys alone. Recreating this object resets the
+    // unchanged borderTop/borderBottom=false edges to one cell on a later render.
+    const railBorderStyle = useMemo(() => ({
+        topLeft: glyphs.railVertical, top: '', topRight: '', right: '',
+        bottomRight: '', bottom: '', bottomLeft: glyphs.railVertical,
+        left: glyphs.railVertical,
+    }), [glyphs.railVertical]);
+    const compact = Number.isFinite(maxRows) && maxRows < (cols >= BORDERLESS_COLS ? 6 : 4);
+    const bordered = !compact && cols >= BORDERLESS_COLS;
     const unbounded = !Number.isFinite(maxRows);
     let body;
     let position = '';
     /** Set only in controlled mode; `null` means "nothing to report back". */
     let overflowOffset = null;
     if (props.rows) {
-        const chrome = MARGIN_ROWS + (bordered ? CHROME_ROWS : CHROME_ROWS - 2);
+        const chrome = compact ? 2 : MARGIN_ROWS + (bordered ? CHROME_ROWS : CHROME_ROWS - 2);
         const height = unbounded ? props.rows.length : Math.max(1, Math.floor(maxRows) - chrome);
         const win = sliceWindow(props.rows.length, props.scrollOffset, height);
         body = props.rows.slice(win.start, win.start + win.visible);
@@ -49,20 +58,20 @@ export function OverlayFrame(props) {
         if (overflowOffset !== null)
             onScrollClamp?.(overflowOffset);
     }, [overflowOffset, onScrollClamp]);
-    const inner = (_jsxs(_Fragment, { children: [_jsx(Text, { wrap: "truncate", color: theme.primary, bold: true, children: title }), body, _jsxs(Text, { wrap: "truncate", color: theme.hintFg ?? theme.muted, children: [hint, position] })] }));
+    const inner = (_jsxs(_Fragment, { children: [_jsxs(Box, { flexDirection: "row", height: 1, flexShrink: 0, children: [_jsx(Box, { flexGrow: 1, flexShrink: 1, children: _jsx(Text, { wrap: "truncate", color: theme.primary, bold: true, children: title }) }), position && _jsx(Box, { width: stringWidth(position), flexShrink: 0, children: _jsx(Text, { color: theme.muted, children: position }) })] }), _jsx(Box, { flexDirection: "column", flexShrink: 0, height: unbounded ? undefined : Math.max(1, maxRows - (compact ? 2 : bordered ? 5 : 3)), overflowY: "hidden", children: body }), _jsx(Text, { wrap: "truncate", color: theme.hintFg ?? theme.muted, children: hint })] }));
+    if (compact)
+        return _jsx(Box, { width: cols, height: Math.max(0, maxRows), flexDirection: "column", flexShrink: 0, overflowY: "hidden", children: inner });
     if (!bordered) {
         // Narrow terminals trade the box for a rail: same grouping, 2 fewer rows
         // and 4 fewer columns (§5.2).
-        return (_jsx(Box, { flexDirection: "column", flexShrink: 0, marginTop: 1, children: _jsx(Box, { flexDirection: "column", flexShrink: 0, borderStyle: {
-                    topLeft: glyphs.railVertical,
-                    top: '',
-                    topRight: '',
-                    right: '',
-                    bottomRight: '',
-                    bottom: '',
-                    bottomLeft: glyphs.railVertical,
-                    left: glyphs.railVertical,
-                }, borderTop: false, borderBottom: false, borderRight: false, borderColor: theme.primary, paddingLeft: 1, children: inner }) }));
+        return (_jsx(Box, { flexDirection: "column", flexShrink: 0, marginTop: 1, children: _jsx(Box, { flexDirection: "column", flexShrink: 0, borderStyle: railBorderStyle, borderTop: false, borderBottom: false, borderRight: false, borderColor: theme.primary, paddingLeft: 1, children: inner }) }));
     }
     return (_jsx(Box, { flexDirection: "column", flexShrink: 0, borderStyle: glyphs.boxStyle, borderColor: theme.primary, paddingX: 1, marginTop: 1, children: inner }));
 }
+/** Body rows shared by controlled overlays and self-managed focused lists. */
+export function overlayBodyRows(maxRows, cols) {
+    if (!Number.isFinite(maxRows))
+        return 20;
+    const compact = maxRows < (cols >= BORDERLESS_COLS ? 6 : 4);
+    return Math.max(1, Math.floor(maxRows) - (compact ? 2 : cols >= BORDERLESS_COLS ? 5 : 3));
+}

package/dist/ui/layout/ScrollViewport.d.ts

@@ -13,6 +13,8 @@ export interface ScrollViewportProps {
     };
     pinToBottomNonce?: number;
     resetKey?: unknown;
+    geometryKey?: string;
+    onGeometryChange?: () => void;
     onScrolledLinesChange?: (lines: number) => void;
     onViewportShiftChange?: (shift: number) => void;
     tailRowsRef?: TailSink;
@@ -34,5 +36,5 @@ export interface ScrollViewportProps {
     caps: TermCapabilities;
     children: React.ReactNode;
 }
-/** One offset for messages, padding and editor; hidden trees keep their local state. */
+/** One offset for messages, padding and panels; hidden trees keep their local state. */
 export declare function ScrollViewport(props: ScrollViewportProps): React.ReactElement;

package/dist/ui/layout/ScrollViewport.js

@@ -26,7 +26,7 @@ function elementVisible(element, clip) {
     return current === clip && top >= 0 &&
         top + measureElement(element).height <= measureElement(clip).height;
 }
-/** One offset for messages, padding and editor; hidden trees keep their local state. */
+/** One offset for messages, padding and panels; hidden trees keep their local state. */
 export function ScrollViewport(props) {
     const { stdout } = useStdout();
     const { active = true, hold = false, resumeMs = 0, scrollbar } = props;
@@ -55,6 +55,7 @@ export function ScrollViewport(props) {
     const previousActive = useRef(active);
     const geometryRevision = useRef(0);
     const geometryBounds = useRef('');
+    const lastGeometryKey = useRef(props.geometryKey);
     const clearResume = useCallback(() => {
         if (resumeTimer.current)
             clearTimeout(resumeTimer.current);
@@ -125,6 +126,13 @@ export function ScrollViewport(props) {
     }, []);
     useEffect(() => { armResume(); }, [hold, resumeMs, armResume]);
     useLayoutEffect(() => {
+        if (lastGeometryKey.current !== props.geometryKey) {
+            props.onGeometryChange?.();
+            scrollbar?.controller?.cancel();
+            scrollbar?.invalidate();
+            geometryRevision.current++;
+            lastGeometryKey.current = props.geometryKey;
+        }
         const reset = lastReset.current !== props.resetKey;
         lastReset.current = props.resetKey;
         const pin = lastPin.current !== props.pinToBottomNonce;
@@ -148,7 +156,7 @@ export function ScrollViewport(props) {
         const viewport = clipRef.current ? measureElement(clipRef.current).height : 0;
         const body = bodyRef.current ? measureElement(bodyRef.current).height : 0;
         const footer = footerRef.current ? measureElement(footerRef.current).height : 0;
-        const layout = buildDocumentLayout({ rows: viewport + 4, bodyRows: body, footerRows: footer });
+        const layout = buildDocumentLayout({ viewportRows: viewport, bodyRows: body, footerRows: footer });
         const padding = props.footer === undefined ? 0 : layout.paddingRows;
         const content = body + footer + padding;
         const tail = props.tailRowsRef?.current.rows ?? 0;