dsh-ssh-tui 0.4.0 → 0.4.1

package/lib/tui.js

@@ -3331,19 +3331,30 @@ export class SshTui {
     /** The transcript rows that support per-row expand/collapse. */
     collapsibleRows() {
         const compact = this.isCompactView();
-        const rows = this.rows.filter((row) => {
-            if (compact && (row.kind === 'reasoning' || row.kind === 'prompt'))
-                return false;
-            return row.kind === 'reasoning'
-                || row.kind === 'tool'
-                || row.kind === 'subagent'
+        if (compact) {
+            const groups = compactToolGroups(this.rows.filter((row) => row.kind === 'tool'));
+            const rows = this.rows.filter((row) => row.kind === 'subagent'
                 || row.kind === 'plan'
                 || row.kind === 'question'
                 || row.kind === 'goal'
-                || row.kind === 'compaction'
-                || row.kind === 'prompt';
-        });
-        if (!compact && this.streaming !== undefined && this.streaming.reasoning !== '') {
+                || row.kind === 'compaction');
+            const callAnchor = groups.calls.at(-1);
+            const editAnchor = groups.edits.at(-1);
+            if (callAnchor !== undefined)
+                rows.push(callAnchor);
+            if (editAnchor !== undefined)
+                rows.push(editAnchor);
+            return rows;
+        }
+        const rows = this.rows.filter((row) => row.kind === 'reasoning'
+            || row.kind === 'tool'
+            || row.kind === 'subagent'
+            || row.kind === 'plan'
+            || row.kind === 'question'
+            || row.kind === 'goal'
+            || row.kind === 'compaction'
+            || row.kind === 'prompt');
+        if (this.streaming !== undefined && this.streaming.reasoning !== '') {
             this.streamingReasoning ??= { kind: 'streaming-reasoning', expanded: false };
             rows.push(this.streamingReasoning);
         }
@@ -3853,22 +3864,9 @@ export class SshTui {
         const compactGroups = compact
             ? compactToolGroups(this.rows.filter((row) => row.kind === 'tool'))
             : undefined;
-        const compactEditCard = compactGroups?.edits[0];
-        const compactCallCard = compactGroups?.calls[0];
         for (const row of this.rows) {
-            if (compact && (row.kind === 'reasoning' || row.kind === 'prompt'))
+            if (compact && (row.kind === 'reasoning' || row.kind === 'prompt' || row.kind === 'tool'))
                 continue;
-            if (compact && compactGroups !== undefined && row.kind === 'tool') {
-                if (row === compactEditCard) {
-                    this.paintCompactSummary(addDisplay, row, 'edits', compactGroups, width);
-                    continue;
-                }
-                if (row === compactCallCard) {
-                    this.paintCompactSummary(addDisplay, row, 'calls', compactGroups, width);
-                    continue;
-                }
-                continue;
-            }
             if (row.kind === 'brand-logo') {
                 const variant = DEEPSEEK_LOGO_VARIANTS.find(candidate => candidate.width <= width - 2)
                     ?? DEEPSEEK_LOGO_VARIANTS[DEEPSEEK_LOGO_VARIANTS.length - 1];
@@ -4109,6 +4107,16 @@ export class SshTui {
                 }
             }
         }
+        if (compact && compactGroups !== undefined) {
+            const editAnchor = compactGroups.edits.at(-1);
+            const callAnchor = compactGroups.calls.at(-1);
+            if (callAnchor !== undefined) {
+                this.paintCompactSummary(addDisplay, callAnchor, 'calls', compactGroups, width);
+            }
+            if (editAnchor !== undefined) {
+                this.paintCompactSummary(addDisplay, editAnchor, 'edits', compactGroups, width);
+            }
+        }
         if (this.waitCardVisible()) {
             const copy = waitCardCopy(this.waitCardSource());
             const started = this.waitStartedAt ?? Date.now();