@aragon-agent/cli 0.6.12 → 0.6.13

package/dist/ui/editor-reducer.js

@@ -23,6 +23,7 @@
  * Extracted from the component so it is unit-testable without mounting Ink.
  */
 import { expandRangeOverTokens, formatPasteToken, makePasteRecord, referencedIds, shouldCollapse, snapOutOfToken, } from './paste-tokens.js';
+import { snapGrapheme, stepGrapheme } from './editor-navigation.js';
 const NO_PASTES = new Map();
 export const INITIAL_EDITOR_STATE = {
     buffer: '',
@@ -42,7 +43,9 @@ export const INITIAL_EDITOR_STATE = {
  * typing again, so suggestions should come back), and re-homes the selection
  * (the candidate list is about to be recomputed).
  */
-const DRAFT_FLAGS = { historyIndex: null, dismissed: false, sel: 0 };
+const DRAFT_FLAGS = {
+    historyIndex: null, dismissed: false, sel: 0, preferredVisualColumn: undefined,
+};
 /**
  * Drop payloads the buffer no longer references (I-7).
  *
@@ -87,12 +90,13 @@ export function editorReducer(state, action) {
         case 'insert': {
             // D-8: typing can never land INSIDE a token. A no-op on a buffer with no
             // tokens, which is every buffer until the first collapse.
-            const cursor = snapOutOfToken(state.buffer, state.cursor);
+            const cursor = snapOutOfToken(state.buffer, snapGrapheme(state.buffer, state.cursor));
+            const buffer = state.buffer.slice(0, cursor) + action.text + state.buffer.slice(cursor);
             return withPrune({
                 ...state,
                 ...DRAFT_FLAGS,
-                buffer: state.buffer.slice(0, cursor) + action.text + state.buffer.slice(cursor),
-                cursor: cursor + action.text.length,
+                buffer,
+                cursor: snapGrapheme(buffer, cursor + action.text.length, true),
             });
         }
         case 'replace':
@@ -100,24 +104,29 @@ export function editorReducer(state, action) {
                 ...state,
                 ...DRAFT_FLAGS,
                 buffer: action.buffer,
-                cursor: action.cursor,
+                cursor: snapGrapheme(action.buffer, action.cursor),
             });
-        case 'backspace': {
-            if (state.cursor <= 0)
+        case 'backspace':
+        case 'delete': {
+            const cursor = snapGrapheme(state.buffer, state.cursor);
+            const backwards = action.type === 'backspace';
+            if (backwards ? cursor <= 0 : cursor >= state.buffer.length)
                 return state;
             // G5: one `Backspace` immediately after `...lines]` removes the whole
             // token and releases its payload, in ONE dispatch.
-            const range = expandRangeOverTokens(state.buffer, state.cursor - 1, state.cursor);
+            const other = stepGrapheme(state.buffer, cursor, backwards ? 'left' : 'right');
+            const range = expandRangeOverTokens(state.buffer, backwards ? other : cursor, backwards ? cursor : other);
+            const buffer = state.buffer.slice(0, range.from) + state.buffer.slice(range.to);
             return withPrune({
                 ...state,
                 ...DRAFT_FLAGS,
-                buffer: state.buffer.slice(0, range.from) + state.buffer.slice(range.to),
-                cursor: range.from,
+                buffer,
+                cursor: snapGrapheme(buffer, range.from),
             });
         }
         case 'input': {
             let buffer = state.buffer;
-            let cursor = snapOutOfToken(buffer, state.cursor);
+            let cursor = snapOutOfToken(buffer, snapGrapheme(buffer, state.cursor));
             let pastes = null;
             for (const segment of action.segments) {
                 const collapse = segment.kind === 'paste' && shouldCollapse(segment.text);
@@ -129,7 +138,7 @@ export function editorReducer(state, action) {
                     pastes.set(record.id, record);
                 }
                 buffer = buffer.slice(0, cursor) + text + buffer.slice(cursor);
-                cursor += text.length;
+                cursor = snapGrapheme(buffer, cursor + text.length, true);
             }
             return withPrune({
                 ...state,
@@ -139,11 +148,15 @@ export function editorReducer(state, action) {
                 ...(pastes ? { pastes } : {}),
             });
         }
-        case 'moveCursor':
+        case 'moveCursor': {
             // NO DRAFT-FLAG RESET. Moving the caret is not an edit: clearing
             // `historyIndex` here would end a history walk the moment the user pressed
             // ← to look at what they recalled.
-            return state.cursor === action.cursor ? state : { ...state, cursor: action.cursor };
+            const cursor = snapGrapheme(state.buffer, action.cursor);
+            const preferredVisualColumn = action.preferredVisualColumn;
+            return state.cursor === cursor && state.preferredVisualColumn === preferredVisualColumn
+                ? state : { ...state, cursor, preferredVisualColumn };
+        }
         case 'recall':
             // `historyIndex` is SET, not reset, which is why recall cannot reuse
             // `replace` — the two differ in exactly the field that keeps the walk
@@ -155,7 +168,8 @@ export function editorReducer(state, action) {
             return withPrune({
                 ...state,
                 buffer: action.buffer,
-                cursor: action.cursor,
+                cursor: snapGrapheme(action.buffer, action.cursor),
+                preferredVisualColumn: undefined,
                 historyIndex: action.historyIndex,
             });
         case 'select':

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

@@ -0,0 +1,77 @@
+/** Product copy is centralized here; Unicode escapes keep UI source ASCII-only. */
+export declare const interactionCopy: {
+    readonly copied: "已复制";
+    readonly lines: "行";
+    readonly copySent: "复制请求已发送，无法确认剪贴板";
+    readonly copyReasons: {
+        readonly empty: "没有可复制的内容";
+        readonly unavailable: "剪贴板工具不可用";
+        readonly write: "写入剪贴板失败";
+        readonly timeout: "剪贴板工具超时";
+        readonly 'too-large': "内容超过剪贴板限制";
+        readonly 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: "输入补充说明…";
+};

package/dist/ui/interaction-copy.js

@@ -0,0 +1,40 @@
+/** Product copy is centralized here; Unicode escapes keep UI source ASCII-only. */
+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',
+};

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

@@ -0,0 +1,18 @@
+export interface ActionHintInput {
+    cols: number;
+    interactionPhase: 'idle' | 'starting' | 'running';
+    interruptHint?: string;
+    selectionPending?: boolean;
+    copyInFlight?: boolean;
+    copyCleanupPending?: boolean;
+    completion?: 'none' | 'slash' | 'file';
+    services?: number;
+    overlay?: string | null;
+    hintsEnabled?: boolean;
+    toast?: string;
+    updateAvailable?: boolean;
+    exitHint?: string;
+    modeToggleKey?: string;
+}
+/** Esc describes its actual owner, including while transient feedback has the row. */
+export declare function buildActionClauses(input: ActionHintInput): readonly string[];

package/dist/ui/interaction-hints.js

@@ -0,0 +1,92 @@
+import stringWidth from 'string-width';
+import { interactionCopy as copy } from './interaction-copy.js';
+import { cleanStatusText } from './layout/status-layout.js';
+function escapeClause(input) {
+    if (input.overlay)
+        return copy.close;
+    if (input.completion && input.completion !== 'none')
+        return copy.closeCompletion;
+    if (input.interactionPhase === 'starting')
+        return /again|confirm/i.test(input.interruptHint ?? '')
+            ? 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;
+}
+function contextClauses(input, escape) {
+    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,
+            ...(selects ? [input.overlay === 'settings' ? copy.saveSettings : copy.confirm] : [])];
+    }
+    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;
+    }
+    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] : [])];
+}
+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 || '';
+    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 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));
+}

package/dist/ui/layout/budget.js

@@ -18,7 +18,7 @@ export function chromeBudget(rows, draftRows = 1) {
     return {
         header: 1,
         toast: 1,
-        composer: 2 + clampDraftRows(rows, draftRows) + (rows >= HINT_MIN_ROWS ? 1 : 0),
+        composer: 2 + clampDraftRows(rows, draftRows),
         status: 1,
     };
 }

package/dist/ui/layout/queue-layout.d.ts

@@ -0,0 +1,19 @@
+import type { PendingSteering } from '../../agent/queued-messages.js';
+export interface QueueLayoutInput {
+    pending: readonly PendingSteering[];
+    columns: number;
+    terminalRows: number;
+    availableRows: number;
+    paused: boolean;
+}
+export interface QueueLayout {
+    rows: number;
+    title: string;
+    items: readonly {
+        queueId: string;
+        label: string;
+    }[];
+    hiddenCount: number;
+}
+/** One allocation drives both footer measurement and rendered rows. */
+export declare function buildQueueLayout(input: QueueLayoutInput): QueueLayout;

package/dist/ui/layout/queue-layout.js

@@ -0,0 +1,26 @@
+import stringWidth from 'string-width';
+import { queueSummary, truncateSummary } from '../QueueStatusRow.js';
+/** One allocation drives both footer measurement and rendered rows. */
+export function buildQueueLayout(input) {
+    const count = input.pending.length;
+    const limit = Math.max(0, Math.min(input.terminalRows >= 20 ? 4 : 2, Math.floor(input.availableRows)));
+    if (!count || !limit)
+        return { rows: 0, title: '', items: [], hiddenCount: count };
+    const shown = Math.min(count, Math.max(1, limit - 1));
+    const items = input.pending.slice(0, shown).map((item, index) => {
+        const prefix = `${index + 1}. `;
+        const lines = item.text.split(/\r\n|[\r\n]/).length;
+        const suffix = lines > 1 ? ` (+${lines - 1}\u884c)` : '';
+        return { queueId: item.queueId, label: prefix + truncateSummary(queueSummary(item.text), Math.max(0, input.columns - stringWidth(prefix + suffix)), '...') + suffix };
+    });
+    const hiddenCount = count - items.length;
+    const paused = input.paused ? ' \u5df2\u6682\u505c' : '';
+    const hidden = hiddenCount ? ` \u53e6${hiddenCount}\u6761` : '';
+    const title = `Queue: \u5f85\u5904\u7406 ${count}${paused}${hidden} /queue`;
+    if (limit === 1)
+        return { rows: 1,
+            title: truncateSummary(`Queue ${count} /queue ${items[0].label}`, input.columns, '...'),
+            items, hiddenCount: count - items.length };
+    return { rows: 1 + items.length, title: stringWidth(title) <= input.columns
+            ? title : `Queue ${count} /queue`, items, hiddenCount };
+}

package/dist/ui/layout/status-layout.d.ts

@@ -0,0 +1,55 @@
+import type { UsageTotal } from '../../agent/reducer.js';
+import type { ContextUsageSnapshot } from '../../compaction/types.js';
+export type RunPhase = 'idle' | 'starting' | 'waiting' | 'thinking' | 'generating' | 'preparing-tool' | 'tool';
+export interface StatusLayoutInput {
+    columns: number;
+    phase: RunPhase;
+    pendingCount: number;
+    context: ContextUsageSnapshot;
+    usageTotal: UsageTotal;
+    thinkingLevel: string;
+    elapsedMs: number;
+    tokPerSec: number;
+    activeTool?: {
+        name: string;
+        toolCallId: string;
+    } | null;
+    runOutcome?: 'none' | 'ended' | 'interrupted' | 'failed';
+    spinner?: string;
+    waitingForConfirmation?: boolean;
+    stopping?: boolean;
+    compacting?: boolean;
+    retryActive?: {
+        attempt: number;
+        max: number;
+        secondsLeft: number;
+    };
+    mode?: string;
+    pendingMode?: string | null;
+    servicesActive?: {
+        live: number;
+    };
+    teamActive?: {
+        running: number;
+        total: number;
+    };
+    todoActive?: {
+        done: number;
+        total: number;
+    };
+    ecoRung?: number;
+    fastActive?: {
+        inFlight: boolean;
+    };
+    scrolledLines?: number;
+}
+export interface StatusField {
+    id: string;
+    text: string;
+    cells: number;
+    tone: 'normal' | 'muted' | 'warning' | 'error';
+}
+export declare function cleanStatusText(text: string): string;
+export declare function phaseLabels(input: Pick<StatusLayoutInput, 'phase' | 'activeTool' | 'runOutcome' | 'waitingForConfirmation' | 'stopping' | 'compacting' | 'retryActive'>): readonly [string, string];
+/** Allocate complete fields before rendering; only the redraw carrier lives outside this budget. */
+export declare function planStatusFields(input: StatusLayoutInput): readonly StatusField[];

package/dist/ui/layout/status-layout.js

@@ -0,0 +1,109 @@
+import stringWidth from 'string-width';
+import stripAnsi from 'strip-ansi';
+import { formatCost, formatDuration, formatTokens, promptTokensOf } from '../../agent/usage.js';
+import { interactionCopy as copy } from '../interaction-copy.js';
+export function cleanStatusText(text) {
+    // eslint-disable-next-line no-control-regex
+    return stripAnsi(text).replace(/[\x00-\x1f\x7f-\x9f\u2028\u2029]/g, ' ').trim();
+}
+export function phaseLabels(input) {
+    if (input.waitingForConfirmation)
+        return copy.confirming;
+    if (input.stopping)
+        return copy.stopping;
+    if (input.compacting)
+        return copy.compacting;
+    if (input.retryActive)
+        return [copy.retrying[0], `${copy.retrying[1]} ${Math.max(0, Math.ceil(input.retryActive.secondsLeft))}s`];
+    if (input.activeTool) {
+        const name = input.activeTool.name;
+        if (name === 'read_file')
+            return copy.readFile;
+        if (name === 'write_file' || name === 'edit_file')
+            return copy.writeFile;
+        if (name === 'bash')
+            return copy.command;
+        return [copy.tool[0], `${copy.tool[1]} ${cleanStatusText(name)}`];
+    }
+    if (input.phase === 'idle' && input.runOutcome && input.runOutcome !== 'none')
+        return copy[input.runOutcome];
+    if (input.phase === 'preparing-tool')
+        return copy.preparingTool;
+    return copy[input.phase];
+}
+const field = (id, text, tone = 'muted') => ({ id, text, cells: stringWidth(text), tone });
+const width = (fields) => fields.reduce((sum, item) => sum + item.cells, 0) + Math.max(0, fields.length - 1) * 3;
+const scientific = (value) => value.toExponential(1).replace(/\.0e/, 'e').replace('e+', 'e');
+const compactNumber = (value) => value >= 1e9 ? scientific(value) : formatTokens(value).replace(/\.0([kM])$/, '$1');
+function contextText(context, detail = false, exponent = false) {
+    if (![context.occupied, context.window, context.deltaTokens, context.pct].every(Number.isFinite)
+        || context.occupied < 0 || context.window <= 0)
+        return copy.contextUnknown;
+    const number = exponent ? scientific : detail ? formatTokens : compactNumber;
+    const approximate = context.source === 'estimate' || context.deltaTokens > 0 ? '~' : '';
+    return `${copy.context} ${approximate}${number(context.occupied)}/${number(context.window)}${context.windowKnown ? '' : '?'} ${detail ? 'tokens' : 'tok'}`;
+}
+function secondaryFields(input) {
+    const list = [];
+    if ((input.mode && input.mode !== 'build') || input.pendingMode)
+        list.push(field('mode', input.pendingMode ? `${input.mode ?? 'build'}>${input.pendingMode}` : input.mode, 'normal'));
+    if (input.servicesActive?.live)
+        list.push(field('services', `${copy.services} ${input.servicesActive.live}`, 'warning'));
+    if (Number.isFinite(input.usageTotal.costUsd))
+        list.push(field('cost', `${copy.estimatedCost} ${formatCost(input.usageTotal.costUsd).slice(1)}`));
+    if (input.phase !== 'idle') {
+        if (input.tokPerSec > 0 && Number.isFinite(input.tokPerSec))
+            list.push(field('speed', `${copy.speed} ${input.tokPerSec} tok/s`));
+        if (Number.isFinite(input.elapsedMs))
+            list.push(field('elapsed', `${copy.elapsed} ${formatDuration(input.elapsedMs)}`));
+    }
+    if (input.thinkingLevel !== 'off')
+        list.push(field('thinking', `think:${cleanStatusText(input.thinkingLevel)}`));
+    list.push(field('usage', `${copy.sessionInput} ${compactNumber(promptTokensOf(input.usageTotal))} ${copy.output} ${compactNumber(input.usageTotal.outputTokens)} tok`));
+    if (Number.isFinite(input.context.pct))
+        list.push(field('percentage', `${input.context.source === 'estimate' || input.context.deltaTokens > 0 || !input.context.windowKnown ? '~' : ''}${Math.round(input.context.pct)}%`));
+    if (input.ecoRung)
+        list.push(field('eco', 'eco'));
+    if (input.fastActive)
+        list.push(field('fast', `fast${input.fastActive.inFlight ? '*' : ''}`));
+    if (input.teamActive)
+        list.push(field('team', `agents ${input.teamActive.running}/${input.teamActive.total}`));
+    if (input.todoActive)
+        list.push(field('todo', `todo ${input.todoActive.done}/${input.todoActive.total}`));
+    if (input.scrolledLines)
+        list.push(field('scroll', `^${input.scrolledLines}`, 'warning'));
+    return list;
+}
+/** Allocate complete fields before rendering; only the redraw carrier lives outside this budget. */
+export function planStatusFields(input) {
+    const budget = Math.max(0, Math.floor(input.columns) - 1);
+    const [short, long] = phaseLabels(input);
+    const prefix = input.spinner ? `${input.spinner} ` : '';
+    const phaseTone = input.runOutcome === 'failed' ? 'error' : 'normal';
+    const fields = [field('phase', prefix + short, phaseTone)];
+    if (input.pendingCount > 0)
+        fields.push(field('queue', `${copy.queue} ${input.pendingCount}`, 'warning'));
+    fields.push(field('context', contextText(input.context)));
+    const contextIndex = fields.length - 1;
+    if (width(fields) > budget)
+        fields[contextIndex] = field('context', contextText(input.context, false, true));
+    if (width(fields) > budget)
+        fields[contextIndex] = field('context', '/context');
+    if (width(fields) > budget && input.pendingCount > 0)
+        fields[1] = field('queue', '/queue', 'warning');
+    if (width(fields) > budget)
+        return fields.filter((_f, index) => width(fields.slice(0, index + 1)) <= budget);
+    for (const candidate of secondaryFields(input)) {
+        if (width([...fields, candidate]) <= budget)
+            fields.push(candidate);
+    }
+    const upgrades = [field('phase', prefix + long, phaseTone),
+        field('queue', `${copy.pending} ${input.pendingCount}`, 'warning'),
+        field('context', contextText(input.context, true))];
+    for (const upgrade of upgrades) {
+        const index = fields.findIndex((f) => f.id === upgrade.id);
+        if (index >= 0 && width(fields) - fields[index].cells + upgrade.cells <= budget)
+            fields[index] = upgrade;
+    }
+    return fields;
+}

package/dist/ui/layout/todo-layout.d.ts

@@ -5,6 +5,7 @@ export interface TodoRailLayoutInput {
     itemCount: number;
     viewportBudget: number;
     teamRows: number;
+    queueRows?: number;
     popupRows: number;
     composerBaseRows?: number;
 }

package/dist/ui/layout/todo-layout.js

@@ -8,7 +8,7 @@ export function buildTodoRailLayout(input) {
     const cols = nonNegativeInt(input.cols);
     const budget = nonNegativeInt(input.viewportBudget);
     const teamRows = Math.min(budget, nonNegativeInt(input.teamRows));
-    const popupMaxHeight = Math.max(0, budget - teamRows - TODO_LIMITS.panelMinRows
+    const popupMaxHeight = Math.max(0, budget - teamRows - nonNegativeInt(input.queueRows ?? 0) - 1
         - nonNegativeInt(input.composerBaseRows ?? 0));
     const popupRows = popupMaxHeight < 3 ? 0 : Math.min(nonNegativeInt(input.popupRows), popupMaxHeight);
     const rows = budget;

package/dist/ui/overlays/HelpOverlay.js

@@ -5,7 +5,7 @@ const KEY_PAD = 24;
 function keyRows(times) {
     return [
         ['Enter', 'Submit (idle) / queue steering (running); re-pins to the newest output'],
-        ['Alt+Enter / Shift+Enter', 'Insert newline'],
+        ['Alt+Enter / Shift+Enter', 'Newline when supported; the host may intercept either binding'],
         ['Ctrl+J', 'Newline fallback; /terminal-setup explains Shift+Enter binding'],
         ['Esc', 'Close menu / overlay'],
         ['Esc twice', 'Interrupt run (within 1.5s)'],
@@ -28,15 +28,14 @@ function keyRows(times) {
         // a key, so it has to be named somewhere they can look it up. The one-shot
         // startup notice is the other place, and it scrolls away.
         ['Drag right edge', 'Scroll messages and input together; type to return'],
-        ['Run status row', 'Spinner and queue / interrupt keys, above the input during a run'],
+        ['Bottom rows', 'Input, fixed action hints, then global runtime / queue / context status'],
         ['Drag text (left button)', 'Select text on screen; the highlight waits'],
         ['Ctrl+C (with a selection)', 'Copy the pending selection - does not arm exit'],
         ['Native terminal selection', 'Copy-on-select is controlled by your terminal settings'],
-        ['Queue', 'Waits for a message receipt, not turn start; paused means not running'],
-        ['P>B / B>P', 'A pending mode switch; P=plan, B=build'],
-        ['E2 / E!', 'Esc twice to interrupt / Esc again to force-stop'],
-        ['S+ / T+', 'Services / TODO present; /bg and /todo status show counts'],
-        ['Queue(p) / (+99+)', 'Paused queue / at least 100 additional messages'],
+        ['Queue / /queue', 'Pending receipt; /queue opens full text, PgUp/PgDn pages, Esc closes'],
+        ['plan>build / build>plan', 'A mode switch pending until the current run ends'],
+        ['/bg / /todo status', 'Show full service and TODO counts when status fields are hidden'],
+        ['Queue paused', 'Unreceived messages persist after interruption until accepted or cancelled'],
         ['Up / Down', 'Prompt history (empty input)'],
         // Pasting is the one affordance here with no key of its own, so the only
         // place a user can learn what happened to their 218 lines is this row.
@@ -63,7 +62,8 @@ const COMMANDS = [
     ['/cwd [dir]', 'Show or change the tool working directory'],
     ['/save [file]', 'Save the session to JSON'],
     ['/resume [file]', 'Load a saved session'],
-    ['/copy', 'Copy the last answer to the clipboard (OSC 52, so it works over ssh)'],
+    ['/copy', 'Copy last answer; native completion confirmed, OSC 52 request unconfirmed'],
+    ['/queue', 'Read every pending message in full; no replay or queue mutation'],
     ['/mouse [on|off]', 'Release the mouse to your terminal, or take it back'],
     ['/terminal-setup', 'Show newline key bindings without changing terminal settings'],
     ['/exit', 'Exit'],

package/dist/ui/overlays/ModelProfileEditor.d.ts

@@ -0,0 +1,12 @@
+import React from 'react';
+import { type ProfileFrameProps } from './ModelProfilePicker.js';
+import { type ProfileEditorDraft, type ModelProfileAction } from './model-profile-state.js';
+interface ModelProfileEditorProps extends ProfileFrameProps {
+    editor: ProfileEditorDraft;
+    users: string;
+    error?: string;
+    dispatch: React.Dispatch<ModelProfileAction>;
+}
+/** Replacement key input starts empty; retention across targets is explicit. */
+export declare function ModelProfileEditor(props: ModelProfileEditorProps): React.ReactElement;
+export {};