deepseek-coder-agent-cli 1.0.27 → 1.0.29

package/dist/ui/UnifiedUIRenderer.js

@@ -3221,16 +3221,67 @@ export class UnifiedUIRenderer extends EventEmitter {
         return theme.info(summary);
     }
     /**
-     * Format edit result with enhanced inline diff preview
-     * Shows: ⎿ ✓ Updated (filename) - removed X, added Y chars
-     *        ├─┐
-     *        │ - old content...
-     *        │ + new content...
-     *        └─
+     * Format edit result with inline diff preview
+     * The edit tool already outputs formatted diffs, so we detect and pass through
+     * or format from old_string/new_string if that format is used
      */
     formatEditResultWithDiff(content) {
-        const lines = [];
         const indent = '  ';
+        // Check if content is already formatted by the edit tool (has ⏺ Update or ⏺ Create prefix)
+        // The edit tool outputs: ⏺ Update(path)\n  ⎿  Updated path with X additions\n  [diff lines]
+        if (content.match(/^⏺\s*(Update|Create)\s*\(/)) {
+            // Already formatted - extract and display the diff portion
+            const lines = content.split('\n');
+            const result = [];
+            // Extract file info from first line: ⏺ Update(filepath)
+            const headerMatch = lines[0]?.match(/^⏺\s*(Update|Create)\s*\(([^)]+)\)/);
+            const action = headerMatch?.[1] || 'Edit';
+            const filePath = headerMatch?.[2] || 'file';
+            const fileName = filePath.split('/').pop() || filePath;
+            // Find diff lines (lines with + or - prefix that are colored)
+            const diffLines = lines.filter(line => line.includes('\x1b[1;32m') || // green (additions)
+                line.includes('\x1b[1;31m') || // red (removals)
+                line.match(/^\s+\d+\s*[+-]/) // line number followed by +/-
+            );
+            // Extract summary from second line if present
+            const summaryLine = lines[1];
+            const summaryMatch = summaryLine?.match(/Updated.*?with\s+(.+)/i) ||
+                summaryLine?.match(/Created.*?with\s+(.+)/i);
+            const summary = summaryMatch?.[1] || '';
+            // Build compact display with actual diff preview
+            result.push(`${indent}${theme.ui.muted('⎿')}  ${theme.success('✓')} ${theme.success(action)} ${theme.file?.path ? theme.file.path(fileName) : theme.warning(fileName)}${summary ? theme.ui.muted(` (${summary})`) : ''}`);
+            // Show up to 4 diff lines
+            const maxDiffLines = 4;
+            const diffPreview = diffLines.slice(0, maxDiffLines);
+            if (diffPreview.length > 0) {
+                for (const line of diffPreview) {
+                    // The line already has ANSI colors, just add proper indent
+                    const trimmed = line.trim();
+                    if (trimmed) {
+                        result.push(`${indent}${theme.ui.muted('│')} ${trimmed}`);
+                    }
+                }
+                if (diffLines.length > maxDiffLines) {
+                    result.push(`${indent}${theme.ui.muted('│')} ${theme.ui.muted(`... +${diffLines.length - maxDiffLines} more`)}`);
+                }
+            }
+            // Store for expansion
+            this.collapsedToolResults.push({
+                toolName: 'edit',
+                content,
+                summary: `${action} ${fileName}`,
+                timestamp: Date.now(),
+                metadata: { filePath }
+            });
+            if (this.collapsedToolResults.length > this.maxCollapsedResults) {
+                this.collapsedToolResults.shift();
+            }
+            const hasMore = lines.length > 6 || diffLines.length > maxDiffLines;
+            const expandHint = hasMore ? ` ${theme.ui.muted('(ctrl+o to expand)')}` : '';
+            return result.join('\n') + expandHint + '\n';
+        }
+        // Fallback: try to parse old_string/new_string format (legacy or raw API format)
+        const lines = [];
         // Extract file path from content with better regex
         const filePathMatch = content.match(/(?:file[_\s]*path|path):\s*"([^"]+)"/i) ||
             content.match(/updated.*?([\/\w.\-]+\.\w+)/i) ||