@agi-fans/dsh-tui 0.7.0 → 0.9.0

package/lib/views/event-views.js

@@ -24,6 +24,10 @@ import { renderTool } from "../chrome/tool-renderers.js";
 import { renderToolsPanel } from "../chrome/tools-list.js";
 import { renderCommandOutput, renderCommandSeparator } from "../chrome/command-output.js";
 import { renderPathMentionRows } from "../chrome/path-mentions.js";
+/** True for blocks whose rendered text may still change. */
+function isBlockPending(block) {
+    return (block.kind === 'assistant' && block.streaming) || (block.kind === 'tool' && block.status === 'running');
+}
 /** Empty starting state. */
 export function initialTranscript() {
     return {
@@ -66,12 +70,41 @@ function prettyArgs(raw) {
         return raw;
     }
 }
-/** The streaming assistant block if it is the last block, else undefined. */
-function streamingBlock(state, turn, step) {
-    const last = state.blocks[state.blocks.length - 1];
-    if (last?.kind === 'assistant' && last.streaming && last.turn === turn && last.step === step)
-        return last;
-    return undefined;
+function isRetryNotice(block) {
+    return block?.kind === 'notice' && block.level === 'info' && block.text.startsWith('retrying ');
+}
+function formatRetryNotice(event) {
+    const budget = event.data.mode === 'always'
+        ? `${event.data.retry}`
+        : `${event.data.retry}/${event.data.maxRetries}`;
+    return `retrying ${event.data.failure.code} (${budget})`;
+}
+function dropRetryNotice(blocks) {
+    if (isRetryNotice(blocks[blocks.length - 1]))
+        blocks.pop();
+}
+function isMutableAttemptBlock(block, turn, step) {
+    if (block.kind === 'assistant') {
+        return block.streaming && block.turn === turn && (step === undefined || block.step === step);
+    }
+    return block.kind === 'tool' && (block.status === 'running' || block.partial === true);
+}
+/** Drop trailing live mutable rows from a failed attempt and keep replay indexes aligned. */
+function hideFailedAttempt(blocks, turn, step, indexes) {
+    while (blocks.length > 0) {
+        const last = blocks[blocks.length - 1];
+        if (last === undefined)
+            break;
+        if (isRetryNotice(last)) {
+            blocks.pop();
+            continue;
+        }
+        if (!isMutableAttemptBlock(last, turn, step))
+            break;
+        blocks.pop();
+        if (last.kind === 'tool')
+            indexes?.toolByCallId.delete(last.callId);
+    }
 }
 /** Replace the trailing streaming block with a settled one, or append. */
 function editableBlocks(state, mutable) {
@@ -79,6 +112,7 @@ function editableBlocks(state, mutable) {
 }
 function settleAssistant(state, turn, step, text, reasoning, interrupted, mutable) {
     const blocks = editableBlocks(state, mutable);
+    dropRetryNotice(blocks);
     const last = blocks[blocks.length - 1];
     const settled = {
         kind: 'assistant',
@@ -122,22 +156,38 @@ function foldEvent(state, event, presentation, mutable, indexes) {
     switch (event.type) {
         case 'turn/start':
             return { ...state, status: 'running', turn: event.data.turn, todos: [], compactCommandId: undefined };
+        case 'llm/retry': {
+            const blocks = editableBlocks(state, mutable);
+            hideFailedAttempt(blocks, event.data.turn, event.data.step, indexes);
+            const notice = { kind: 'notice', level: 'info', text: formatRetryNotice(event) };
+            if (isRetryNotice(blocks[blocks.length - 1]))
+                blocks[blocks.length - 1] = notice;
+            else
+                blocks.push(notice);
+            return { ...state, blocks, status: 'running', turn: event.data.turn };
+        }
         case 'turn/end': {
             const last = state.blocks[state.blocks.length - 1];
             const reason = event.data.reason;
             const changesBlocks = (last?.kind === 'assistant' && last.streaming)
+                || (last?.kind === 'tool' && (last.status === 'running' || last.partial === true))
+                || isRetryNotice(last)
                 || reason.kind === 'error'
                 || reason.kind === 'aborted';
             const blocks = changesBlocks ? editableBlocks(state, mutable) : state.blocks;
-            if (last?.kind === 'assistant' && last.streaming) {
-                blocks[blocks.length - 1] = { ...last, streaming: false };
+            if (reason.kind === 'error')
+                hideFailedAttempt(blocks, event.data.turn, undefined, indexes);
+            dropRetryNotice(blocks);
+            const settledLast = blocks[blocks.length - 1];
+            if (settledLast?.kind === 'assistant' && settledLast.streaming) {
+                blocks[blocks.length - 1] = { ...settledLast, streaming: false };
             }
             if (reason.kind === 'error') {
                 blocks.push({ kind: 'notice', level: 'error', text: 'error: ' + reason.error.code + ': ' + reason.error.message });
             }
             else if (reason.kind === 'aborted') {
-                // rc.8 finalizes a cancelled turn's delivered prefix as an assistant
-                // block already marked interrupted; the bare notice only covers a
+                // A cancelled turn that already delivered a prefix finalizes it as an
+                // assistant block marked interrupted; the bare notice only covers a
                 // turn that aborted before any visible content.
                 const settledLast = blocks[blocks.length - 1];
                 if (settledLast?.kind !== 'assistant' || settledLast.interrupted !== true) {
@@ -163,12 +213,10 @@ function foldEvent(state, event, presentation, mutable, indexes) {
             const { turn, step, chunk } = event.data;
             if (chunk.type === 'text-delta') {
                 const blocks = editableBlocks(state, mutable);
-                const last = streamingBlock(state, turn, step);
-                if (last !== undefined) {
-                    const idx = blocks.length - 1;
-                    const found = blocks[idx];
-                    if (found?.kind === 'assistant')
-                        blocks[idx] = { ...found, text: found.text + chunk.text };
+                dropRetryNotice(blocks);
+                const last = blocks[blocks.length - 1];
+                if (last?.kind === 'assistant' && last.streaming && last.turn === turn && last.step === step) {
+                    blocks[blocks.length - 1] = { ...last, text: last.text + chunk.text };
                 }
                 else {
                     blocks.push({ kind: 'assistant', turn, step, text: chunk.text, reasoning: '', streaming: true });
@@ -177,12 +225,10 @@ function foldEvent(state, event, presentation, mutable, indexes) {
             }
             if (chunk.type === 'reasoning-delta') {
                 const blocks = editableBlocks(state, mutable);
-                const last = streamingBlock(state, turn, step);
-                if (last !== undefined) {
-                    const idx = blocks.length - 1;
-                    const found = blocks[idx];
-                    if (found?.kind === 'assistant')
-                        blocks[idx] = { ...found, reasoning: found.reasoning + chunk.text };
+                dropRetryNotice(blocks);
+                const last = blocks[blocks.length - 1];
+                if (last?.kind === 'assistant' && last.streaming && last.turn === turn && last.step === step) {
+                    blocks[blocks.length - 1] = { ...last, reasoning: last.reasoning + chunk.text };
                 }
                 else {
                     blocks.push({ kind: 'assistant', turn, step, text: '', reasoning: chunk.text, streaming: true });
@@ -191,6 +237,7 @@ function foldEvent(state, event, presentation, mutable, indexes) {
             }
             if (chunk.type === 'tool-call-delta') {
                 const blocks = editableBlocks(state, mutable);
+                dropRetryNotice(blocks);
                 const index = indexes === undefined
                     ? blocks.findIndex(block => block.kind === 'tool' && block.callId === chunk.id)
                     : indexes.toolByCallId.get(chunk.id) ?? -1;
@@ -229,6 +276,7 @@ function foldEvent(state, event, presentation, mutable, indexes) {
                 ...(presentation === undefined ? {} : { presentation }),
             };
             const blocks = editableBlocks(state, mutable);
+            dropRetryNotice(blocks);
             const partial = indexes === undefined
                 ? blocks.findIndex(item => item.kind === 'tool' && item.callId === event.data.callId)
                 : indexes.toolByCallId.get(event.data.callId) ?? -1;
@@ -483,12 +531,17 @@ export function blockLines(block, theme, width, spinnerFrame = 0, toolsExpanded
         applyBg: false,
     }, theme);
 }
-function fitFrame(lines, width) {
-    return lines.map((line) => {
+function fitFrame(lines, width, stablePrefix = 0) {
+    let fitted;
+    const start = Math.max(0, Math.min(lines.length, stablePrefix));
+    for (let index = start; index < lines.length; index += 1) {
+        const line = lines[index];
         if (visibleWidth(line) <= width)
-            return line;
-        return truncateToWidth(line, width);
-    });
+            continue;
+        fitted ??= lines.slice();
+        fitted[index] = truncateToWidth(line, width);
+    }
+    return fitted ?? lines;
 }
 /**
  * Scroll, activity, inbox, and composer changes do not alter transcript blocks.
@@ -582,8 +635,6 @@ function commandSurfaceName(block) {
 }
 /** Rows moved per Shift+Arrow (OMP ScrollView `fastScrollLines`). */
 export const TRANSCRIPT_FAST_SCROLL = 5;
-/** Rows moved per mouse-wheel notch. */
-export const TRANSCRIPT_WHEEL_SCROLL = 3;
 function earlierLabel(count) {
     return '… ↑ ' + count + ' earlier line' + (count === 1 ? '' : 's') + ' ⟨Pg↑⟩';
 }
@@ -791,10 +842,10 @@ function subagentRowText(agent) {
     return detail === '' ? indent + agent.label : `${indent}${agent.label} · ${detail}`;
 }
 /** Compact, unframed descendant-subagent tree placed above Todos. */
-export function renderSubagents(roster, theme, width, spinnerFrame = 0, inspectedId) {
+export function renderSubagents(roster, theme, width, spinnerFrame = 0, inspectedId, launcherFocused = false) {
     const agents = roster?.agents ?? [];
     if (agents.length === 0 || width <= 0)
-        return { lines: [], items: [] };
+        return [];
     const running = agents.filter(agent => agent.phase === 'running' || agent.phase === 'starting').length;
     const failed = agents.filter(agent => agent.phase === 'error').length;
     const done = agents.filter(agent => agent.phase === 'completed' || agent.phase === 'waiting').length;
@@ -803,8 +854,10 @@ export function renderSubagents(roster, theme, width, spinnerFrame = 0, inspecte
         done === 0 ? undefined : `${done} done`,
         failed === 0 ? undefined : `${failed} failed`,
     ].filter((part) => part !== undefined);
-    const header = '  ' + theme.bold(theme.fg('accent', 'Agents'))
-        + (counts.length === 0 ? '' : theme.fg('dim', ` · ${counts.join(' · ')}`));
+    const headerBody = theme.bold(theme.fg('accent', 'Agents'))
+        + (counts.length === 0 ? '' : theme.fg('dim', ` · ${counts.join(' · ')}`))
+        + theme.fg('dim', launcherFocused ? ' · Enter open · Esc return' : ' · ↓ select · Alt+A open');
+    const header = '  ' + (launcherFocused ? theme.inverse(headerBody) : headerBody);
     const start = subagentPreviewStart(agents);
     const end = Math.min(agents.length, start + SUBAGENT_PREVIEW);
     const rows = [
@@ -812,12 +865,10 @@ export function renderSubagents(roster, theme, width, spinnerFrame = 0, inspecte
         ...agents.slice(start, end),
         ...(end === agents.length ? [] : [`… ${agents.length - end} more`]),
     ];
-    const items = [];
     const lines = [header, ...rows.map((row, index) => {
             const branch = '  ' + theme.fg('dim', index === rows.length - 1 ? '└─' : '├─') + ' ';
             if (typeof row === 'string')
                 return branch + theme.fg('dim', row);
-            items.push({ id: row.id, row: index + 1 });
             const selected = inspectedId === row.id;
             const paint = row.phase === 'completed'
                 ? (text) => theme.fg('dim', theme.strikethrough(text))
@@ -830,10 +881,7 @@ export function renderSubagents(roster, theme, width, spinnerFrame = 0, inspecte
             const body = marker + subagentPhaseGlyph(row.phase, theme, spinnerFrame) + ' ' + paint(subagentRowText(row));
             return branch + (selected ? theme.bold(body) : body);
         })];
-    return {
-        lines: lines.map(line => truncateToWidth(line, width)),
-        items,
-    };
+    return lines.map(line => truncateToWidth(line, width));
 }
 /** Persistent inspect chrome: stays visible while the child transcript scrolls. */
 export function renderInspectBanner(inspected, theme, width, spinnerFrame = 0) {
@@ -845,10 +893,6 @@ export function renderInspectBanner(inspected, theme, width, spinnerFrame = 0) {
         + theme.fg('dim', ` · ${guidance}`);
     return [truncateToWidth(line, width)];
 }
-/** Hit a painted roster row, or `undefined` when the click is on overflow chrome. */
-export function hitTestSubagentRoster(items, localRow) {
-    return items.find(item => item.row === localRow)?.id;
-}
 function queuedSubmissionLabel(submission) {
     const text = submission.text.replaceAll('\r\n', '\n').replaceAll('\r', '\n')
         .replaceAll('\n', ' ↵ ')
@@ -925,7 +969,6 @@ export function renderView(state, options) {
             lines: fitFrame(settings.lines, width),
             cursor: settings.cursor,
             cursorVisible: false,
-            overlay: { kind: 'settings', start: 0, itemRows: settings.itemRows },
         };
     }
     if (options.promptSelector?.request.presentation === 'fullscreen-list') {
@@ -934,12 +977,6 @@ export function renderView(state, options) {
             lines: fitFrame(selector.lines, width),
             cursor: selector.cursor,
             cursorVisible: true,
-            ...(selector.editor === undefined ? {} : { editor: selector.editor }),
-            overlay: {
-                kind: 'prompt',
-                start: 0,
-                ...(selector.itemRows === undefined ? {} : { itemRows: selector.itemRows }),
-            },
         };
     }
     if (options.promptSelector?.request.presentation === 'plan-review') {
@@ -948,12 +985,7 @@ export function renderView(state, options) {
             lines: fitFrame(review.lines, width),
             cursor: review.cursor,
             cursorVisible: review.cursorVisible === true,
-            ...(review.editor === undefined ? {} : { editor: review.editor }),
-            overlay: {
-                kind: 'prompt',
-                start: 0,
-                ...(review.document === undefined ? {} : { document: review.document }),
-            },
+            ...(review.document === undefined ? {} : { promptDocument: review.document }),
         };
     }
     const welcome = renderWelcome({
@@ -1033,10 +1065,9 @@ export function renderView(state, options) {
         : renderQueuedSubmissions(options.queuedSubmissions ?? [], theme, width, state.nextTurnInbox);
     const todos = editor === undefined || options.inspected !== undefined ? [] : renderTodos(state.todos, theme, width);
     const inspect = editor === undefined ? [] : renderInspectBanner(options.inspected, theme, width, spinnerFrame);
-    const roster = editor === undefined
-        ? { lines: [], items: [] }
-        : renderSubagents(options.subagents, theme, width, spinnerFrame, options.inspected?.id);
-    const subagents = roster.lines;
+    const subagents = editor === undefined
+        ? []
+        : renderSubagents(options.subagents, theme, width, spinnerFrame, options.inspected?.id, options.subagentLauncherFocused);
     const autocomplete = promptSelector !== undefined || settings !== undefined || copySelector !== undefined || search !== undefined
         || options.autocomplete === undefined
         ? []
@@ -1052,8 +1083,13 @@ export function renderView(state, options) {
     const requestedStart = focusStart === undefined
         ? (options.scrollStart ?? Number.POSITIVE_INFINITY)
         : transcriptStart + focusStart;
-    const windowed = windowTranscript(body, budget, requestedStart, theme);
-    const visible = windowed.lines;
+    const hasOverlay = promptSelector !== undefined || settings !== undefined || copySelector !== undefined || search !== undefined;
+    const isFollowing = requestedStart === Number.POSITIVE_INFINITY && !hasOverlay;
+    const livePinned = state.blocks.some(block => block.kind === 'tool' && block.status === 'running');
+    const windowed = isFollowing
+        ? undefined
+        : windowTranscript(body, budget, requestedStart, theme);
+    const visible = windowed?.lines ?? body;
     const lines = [...visible];
     if (visible.length > 0)
         lines.push('');
@@ -1061,9 +1097,7 @@ export function renderView(state, options) {
     const fill = Math.max(0, height - lines.length - bottomRows);
     lines.push(...Array.from({ length: fill }, () => ''));
     lines.push(...working);
-    const inspectStart = lines.length;
     lines.push(...inspect);
-    const subagentStart = lines.length;
     lines.push(...subagents);
     lines.push(...todos);
     lines.push(...queuedSubmissions);
@@ -1071,7 +1105,27 @@ export function renderView(state, options) {
     lines.push(...inputLines);
     lines.push(...autocomplete);
     lines.push(...statusFooter);
-    const trimmed = fitFrame(lines, width);
+    let liveStart;
+    if (isFollowing) {
+        const firstPending = state.blocks.findIndex(isBlockPending);
+        if (firstPending >= 0) {
+            liveStart = transcriptStart + transcript.blockStarts[firstPending];
+        }
+        else {
+            liveStart = lines.length - bottomRows;
+        }
+        // liveStart marks the first row that is still live/mutable. Rows above it
+        // are committed. Off-screen live rows are bounded by the renderer: it only
+        // ever writes the live viewport, so pending rows above the visible window
+        // are not pushed into native scrollback until they become committed.
+    }
+    else {
+        liveStart = 0;
+    }
+    // Every settled block was already rendered against this width. Mirroring
+    // OMP's stable-prefix preparation, only validate the mutable suffix instead
+    // of measuring the complete native-scrollback history on every frame.
+    const trimmed = fitFrame(lines, width, isFollowing ? liveStart : 0);
     const caret = promptSelector?.cursor ?? settings?.cursor ?? copySelector?.cursor ?? search?.cursor ?? editor?.cursor ?? { row: 0, column: 0 };
     return {
         lines: trimmed,
@@ -1083,35 +1137,15 @@ export function renderView(state, options) {
             || (options.inspected !== undefined && options.inspected.writable !== true)
             ? false
             : promptSelector?.cursorVisible ?? (settings === undefined && copySelector === undefined),
-        ...(promptSelector?.editor !== undefined
-            ? { editor: { start: editorStart + promptSelector.editor.start, rows: promptSelector.editor.rows } }
-            : editor === undefined ? {} : { editor: { start: editorStart, rows: editor.lines.length } }),
-        ...(settings !== undefined
-            ? { overlay: { kind: 'settings', start: editorStart } }
-            : copySelector !== undefined
-                ? { overlay: { kind: 'copy', start: editorStart } }
-                : search !== undefined
-                    ? { overlay: { kind: 'search', start: editorStart, resultsRow: search.resultsRow } }
-                    : autocomplete.length > 0
-                        ? { overlay: { kind: 'autocomplete', start: editorStart + (editor?.lines.length ?? 0) } }
-                        : {}),
-        transcript: {
-            start: windowed.start,
-            maxStart: windowed.maxStart,
-            budget: windowed.budget,
-            hiddenAbove: windowed.hiddenAbove,
-            hiddenBelow: windowed.hiddenBelow,
+        liveStart,
+        livePinned,
+        transcript: windowed ?? {
+            start: 0,
+            maxStart: 0,
+            budget,
+            hiddenAbove: 0,
+            hiddenBelow: 0,
         },
-        ...(inspect.length === 0 && subagents.length === 0
-            ? {}
-            : {
-                chrome: {
-                    ...(inspect.length === 0 ? {} : { inspect: { start: inspectStart, rows: inspect.length } }),
-                    ...(subagents.length === 0
-                        ? {}
-                        : { subagents: { start: subagentStart, headerRows: 1, rows: subagents.length, items: roster.items } }),
-                },
-            }),
     };
 }
 //# sourceMappingURL=event-views.js.map