@agi-fans/dsh-tui 0.23.0 → 0.24.0

package/lib/views/transcript-render.js

@@ -626,20 +626,27 @@ function processNoticeLine(block, theme, width, indent) {
  * re-laying every call the run already made.
  */
 const groupMemberCache = new WeakMap();
+/** Collapsed process rows share spacing before and after an assistant reply. */
+function compactProcessRow(index, context, thoughtOnly = false) {
+    const block = context.blocks[index];
+    const { options } = context;
+    if (block?.kind === 'notice')
+        return block.process !== undefined && block.framed !== true;
+    if (block?.kind === 'tool') {
+        return options.toolsExpanded !== true && !options.expandedTools?.has(block.callId) && !context.matches.has(index);
+    }
+    return block?.kind === 'assistant' && block.interrupted !== true && (thoughtOnly || block.text === '')
+        && options.hideThinking !== false && !context.openedThoughts.has(reasoningKey(block)) && !context.matches.has(index);
+}
 /** Flat chronological content, shared by live and opened turns. */
 function processGroupBody(group, context) {
     const lines = [];
     const offsets = new Map();
     const spans = [];
     for (const index of groupMembers(group)) {
-        const block = context.blocks[index];
-        const rows = groupMemberLines(index, context, index === group.answer && group.tookThought);
-        const previous = context.blocks[index - 1];
-        const opened = (item, at) => item?.kind === 'tool'
-            ? context.options.toolsExpanded === true || context.options.expandedTools?.has(item.callId) === true || context.matches.has(at)
-            : item?.kind === 'assistant' && item.reasoning !== '' && (context.options.hideThinking === false || context.openedThoughts.has(reasoningKey(item)));
-        const reply = block.kind === 'assistant' && block.text !== '' && index !== group.answer;
-        if (rows.length > 0 && lines.length > 0 && (opened(block, index) || opened(previous, index - 1) || reply || previous?.kind === 'assistant' && previous.text !== ''))
+        const thoughtOnly = index === group.answer && group.tookThought;
+        const rows = groupMemberLines(index, context, thoughtOnly);
+        if (rows.length > 0 && lines.length > 0 && (!compactProcessRow(index, context, thoughtOnly) || !compactProcessRow(index - 1, context)))
             lines.push('');
         offsets.set(index, lines.length);
         if (context.blocks[index]?.kind === 'tool')
@@ -797,7 +804,7 @@ const renderedBlockCache = new WeakMap();
 export function renderedBlocks(state, options) {
     const theme = createTheme(options.colors === true, options.colorDepth ?? 'truecolor', options.themeName ?? 'dark', options.terminal, options.language, options.compactLinks);
     const key = [options.width, options.colors, options.colorDepth, options.themeName,
-        options.language, options.compactLinks, JSON.stringify(options.terminal), options.mathMode, options.mermaidMode].join('\0');
+        options.language, options.compactLinks, JSON.stringify(options.terminal), options.mathMode, options.mermaidMode, options.showFileChanges !== false].join('\0');
     const cached = renderedBlockCache.get(state.blocks)?.get(key);
     if (cached !== undefined)
         return cached;
@@ -805,7 +812,7 @@ export function renderedBlocks(state, options) {
         block: index,
         // The source text is the fallback for a block kind the painter does not lay
         // out as rows of its own; matching something is better than matching nothing.
-        lines: renderedRows(block, theme, options).map(stripAnsi),
+        lines: block.kind === 'workspace' && options.showFileChanges === false ? [] : renderedRows(block, theme, options).map(stripAnsi),
     }));
     const byKey = new Map(renderedBlockCache.get(state.blocks) ?? []);
     byKey.set(key, blocks);
@@ -1143,6 +1150,7 @@ function renderTranscriptBody(state, options, theme, spinnerFrame) {
     const rawTools = [...(options.rawTools ?? [])].sort().join('\0');
     const expandedReasoning = [...(options.expandedReasoning ?? [])].sort().join('\0');
     const hideThinking = options.hideThinking !== false;
+    const showFileChanges = options.showFileChanges !== false;
     const openedGroups = [...(options.openedGroups ?? [])].sort().join('\0');
     // A command output the reader opened paints different rows, so the body cache
     // has to see it; without this the frame is reused and the key looks dead.
@@ -1181,6 +1189,7 @@ function renderTranscriptBody(state, options, theme, spinnerFrame) {
         && cached.rawTools === rawTools
         && cached.expandedReasoning === expandedReasoning
         && cached.hideThinking === hideThinking
+        && cached.showFileChanges === showFileChanges
         && cached.openedGroups === openedGroups
         && cached.expandedOutputs === expandedOutputs
         && cached.toolDetailsKey === options.toolDetailsKey
@@ -1293,6 +1302,8 @@ function renderTranscriptBody(state, options, theme, spinnerFrame) {
     // global tool switch above, so it reports the same kind of mark.
     if (hideThinking)
         foldMarks.push({ key: 'thinking', row: 0 });
+    if (!showFileChanges)
+        foldMarks.push({ key: 'hide-file-changes', row: 0 });
     let liveFrom;
     const context = {
         blocks: state.blocks, theme, themeName, depth, width: options.width,
@@ -1300,11 +1311,6 @@ function renderTranscriptBody(state, options, theme, spinnerFrame) {
         openedThoughts,
         spinnerFrame,
     };
-    const compactProcessRow = (block) => {
-        if (block?.kind === 'notice')
-            return block.process !== undefined && block.framed !== true;
-        return block?.kind === 'tool' && !toolsExpanded && !options.expandedTools?.has(block.callId);
-    };
     // Only a turn's last run is summarized by how long the turn took; an earlier
     // run in the same turn did not take all of it.
     const elapsedOf = (index) => {
@@ -1316,6 +1322,11 @@ function renderTranscriptBody(state, options, theme, spinnerFrame) {
     };
     for (let index = 0; index < state.blocks.length; index += 1) {
         const block = state.blocks[index];
+        if (block.kind === 'workspace' && !showFileChanges) {
+            blockStarts[index] = lines.length;
+            blockDrawStarts[index] = lines.length;
+            continue;
+        }
         const groupIndex = groupOf[index] ?? -1;
         if (groupIndex >= 0) {
             // A run is painted whole by its first block: the header, then its rows
@@ -1429,12 +1440,12 @@ function renderTranscriptBody(state, options, theme, spinnerFrame) {
                 const failed = (trailing?.kind === 'notice' && trailing.level === 'error')
                     || (trailing?.kind === 'tool' && trailing.status === 'error');
                 if (group.live || opened || failed) {
-                    if (lines.length > 0 && !(trailing?.kind === 'notice' && state.blocks[at - 1]?.kind === 'notice'))
-                        lines.push('');
-                    offsets.set(at, lines.length - bodyRow);
                     const rows = !group.live && !opened && trailing?.kind === 'tool'
                         ? toolRowLine(trailing, theme, options.width, spinnerFrame)
                         : groupMemberLines(at, context);
+                    if (rows.length > 0 && lines.length > 0 && (!compactProcessRow(at, context) || !compactProcessRow(at - 1, context)))
+                        lines.push('');
+                    offsets.set(at, lines.length - bodyRow);
                     disclosureAt(at, lines.length);
                     regionsAt(at, lines.length, rows.length);
                     for (const line of rows)
@@ -1479,7 +1490,7 @@ function renderTranscriptBody(state, options, theme, spinnerFrame) {
             if (previousCommand !== undefined && currentCommand !== undefined && previousCommand !== currentCommand) {
                 lines.push('', renderCommandSeparator(theme, options.width), '');
             }
-            else if (!compactProcessRow(block) || !compactProcessRow(state.blocks[index - 1])) {
+            else if (!compactProcessRow(index, context) || !compactProcessRow(index - 1, context)) {
                 lines.push('');
             }
         }
@@ -1542,6 +1553,7 @@ function renderTranscriptBody(state, options, theme, spinnerFrame) {
         rawTools,
         expandedReasoning,
         hideThinking,
+        showFileChanges,
         openedGroups,
         expandedOutputs,
         searchKey,