@deepseekdev/coder 1.0.74 → 1.0.75

package/dist/ui/UnifiedUIRenderer.js

@@ -1823,11 +1823,19 @@ export class UnifiedUIRenderer extends EventEmitter {
                 this.inBracketedPaste = false;
                 this.pasteBuffer = '';
                 this.pasteBufferOverflow = false;
+                this.cancelPlainPasteCapture();
+                this.forceNextRender = true;
+                this.renderPrompt();
                 return;
             }
             sanitized = validation.sanitized;
         }
-        let content = sanitized.replace(/\r\n?/g, '\n');
+        const content = sanitized.replace(/\r\n?/g, '\n');
+        // Clear bracketed paste state BEFORE render to allow prompt redraw
+        this.inBracketedPaste = false;
+        this.pasteBuffer = '';
+        this.pasteBufferOverflow = false;
+        this.cancelPlainPasteCapture();
         if (content) {
             // Insert paste content directly into buffer (supports multi-line)
             // Insert at cursor position
@@ -1840,10 +1848,10 @@ export class UnifiedUIRenderer extends EventEmitter {
             this.renderPrompt();
             this.emitInputChange();
         }
-        this.inBracketedPaste = false;
-        this.pasteBuffer = '';
-        this.pasteBufferOverflow = false;
-        this.cancelPlainPasteCapture();
+        else {
+            this.forceNextRender = true;
+            this.renderPrompt();
+        }
     }
     handlePlainPaste(str, key) {
         // Fallback paste capture when bracketed paste isn't supported
@@ -2824,14 +2832,31 @@ export class UnifiedUIRenderer extends EventEmitter {
         return false;
     }
     looksLikeDiffOutput(content) {
-        const lines = content.split('\n');
+        const lines = content.split('\n').map(line => this.stripAnsi(line).trim());
+        let hasHeader = false;
+        let hasHunk = false;
+        let hasFileHeader = false;
+        let hasFileNew = false;
+        let hasChange = false;
         for (const line of lines) {
-            const stripped = this.stripAnsi(line);
-            if (this.isDiffLine(stripped)) {
-                return true;
-            }
-        }
-        return false;
+            if (!line)
+                continue;
+            if (line.startsWith('diff --git'))
+                hasHeader = true;
+            if (line.startsWith('@@'))
+                hasHunk = true;
+            if (line.startsWith('--- '))
+                hasFileHeader = true;
+            if (line.startsWith('+++ '))
+                hasFileNew = true;
+            if (/^\d+\s*[+-]/.test(line))
+                hasChange = true;
+            if ((line.startsWith('+') && !line.startsWith('+++')) || (line.startsWith('-') && !line.startsWith('---'))) {
+                hasChange = true;
+            }
+        }
+        const hasFilePair = hasFileHeader && hasFileNew;
+        return hasChange && (hasHeader || hasHunk || hasFilePair);
     }
     isDiffLine(line) {
         const trimmed = line.trim();
@@ -2846,9 +2871,6 @@ export class UnifiedUIRenderer extends EventEmitter {
         if (/^[+-]/.test(trimmed)) {
             return true;
         }
-        if (/^[+-]\s*L\d+\s*\|/.test(trimmed)) {
-            return true;
-        }
         return false;
     }
     /**
@@ -3179,15 +3201,18 @@ export class UnifiedUIRenderer extends EventEmitter {
         if (!trimmed) {
             return null;
         }
-        const parenMatch = trimmed.match(/^([A-Za-z0-9_.-]+)\s*\(/);
+        const parenMatch = trimmed.match(/^[^\w\[]*([A-Za-z0-9_.-]+)\s*\(/);
         if (parenMatch) {
             return parenMatch[1] || null;
         }
-        const bracketMatch = trimmed.match(/^\[([A-Za-z0-9_.-]+)\]/);
+        const bracketMatch = trimmed.match(/^[^\w\[]*\[([A-Za-z0-9_.-]+)\]/);
         if (bracketMatch) {
             return bracketMatch[1] || null;
         }
-        if (/^running:\s*\$/i.test(trimmed)) {
+        if (/^[^\w\[]*running:\s*\$/i.test(trimmed)) {
+            return 'bash';
+        }
+        if (/^[^\w\[]*done:\s*$/i.test(trimmed)) {
             return 'bash';
         }
         return null;
@@ -3370,6 +3395,10 @@ export class UnifiedUIRenderer extends EventEmitter {
         if (this.looksLikeEditOutput(sanitized)) {
             return this.formatEditResultWithDiff(sanitized);
         }
+        const diffPreview = this.extractUnifiedDiffPreview(sanitized);
+        if (diffPreview) {
+            return this.formatUnifiedDiffPreview(sanitized, diffPreview);
+        }
         // Parse common result patterns for summary
         const lineMatch = sanitized.match(/(\d+)\s*lines?/i);
         const fileMatch = sanitized.match(/(\d+)\s*(?:files?|matches?)/i);
@@ -3511,7 +3540,7 @@ export class UnifiedUIRenderer extends EventEmitter {
             }
             // Store for expansion
             this.collapsedToolResults.push({
-                toolName: 'edit',
+                toolName: this.lastToolName || 'edit',
                 content,
                 summary: `${action} ${fileName}`,
                 timestamp: Date.now(),
@@ -3572,7 +3601,7 @@ export class UnifiedUIRenderer extends EventEmitter {
         }
         // Store for expansion with enhanced metadata
         this.collapsedToolResults.push({
-            toolName: 'edit',
+            toolName: this.lastToolName || 'edit',
             content,
             summary: `Updated ${fileName} (-${oldLen}, +${newLen})`,
             timestamp: Date.now(),
@@ -3590,6 +3619,110 @@ export class UnifiedUIRenderer extends EventEmitter {
             ` ${theme.ui.muted('(ctrl+o to expand)')}` : '';
         return lines.join('\n') + expandHint + '\n';
     }
+    extractUnifiedDiffPreview(content, maxLines = 4) {
+        const lines = content.split('\n');
+        let startIndex = -1;
+        let hasHeader = false;
+        let hasHunk = false;
+        let hasChange = false;
+        for (let i = 0; i < lines.length; i++) {
+            const line = this.stripAnsi(lines[i] ?? '');
+            if (!line)
+                continue;
+            if (startIndex === -1 && (line.startsWith('diff --git') || line.startsWith('@@') || line.startsWith('+++') || line.startsWith('---'))) {
+                startIndex = i;
+            }
+            if (line.startsWith('diff --git'))
+                hasHeader = true;
+            if (line.startsWith('@@'))
+                hasHunk = true;
+            if ((line.startsWith('+') && !line.startsWith('+++')) || (line.startsWith('-') && !line.startsWith('---'))) {
+                hasChange = true;
+            }
+        }
+        if (!hasChange || !(hasHeader || hasHunk)) {
+            return null;
+        }
+        if (startIndex < 0) {
+            startIndex = lines.findIndex((line) => {
+                const stripped = this.stripAnsi(line);
+                return stripped.startsWith('diff --git') || stripped.startsWith('@@');
+            });
+            if (startIndex < 0)
+                startIndex = 0;
+        }
+        const diffLines = lines.slice(startIndex).filter((line) => this.isUnifiedDiffLine(line));
+        if (diffLines.length === 0) {
+            return null;
+        }
+        return {
+            previewLines: diffLines.slice(0, maxLines),
+            totalLines: diffLines.length,
+        };
+    }
+    isUnifiedDiffLine(line) {
+        const stripped = this.stripAnsi(line).trimEnd();
+        if (!stripped)
+            return false;
+        return (stripped.startsWith('diff --git') ||
+            stripped.startsWith('index ') ||
+            stripped.startsWith('@@') ||
+            stripped.startsWith('+++') ||
+            stripped.startsWith('---') ||
+            stripped.startsWith('+') ||
+            stripped.startsWith('-'));
+    }
+    formatUnifiedDiffPreview(content, preview) {
+        const indent = '  ';
+        const toolLabel = this.lastToolName ? `${this.lastToolName} diff` : 'Diff output';
+        const result = [];
+        result.push(`${indent}${theme.ui.muted('⎿')}  ${theme.success('✓')} ${theme.info(toolLabel)}`);
+        for (const line of preview.previewLines) {
+            const colored = this.colorUnifiedDiffLine(line);
+            const trimmed = colored.trim();
+            if (trimmed) {
+                result.push(`${indent}${theme.ui.muted('│')} ${trimmed}`);
+            }
+        }
+        if (preview.totalLines > preview.previewLines.length) {
+            result.push(`${indent}${theme.ui.muted('│')} ${theme.ui.muted(`... +${preview.totalLines - preview.previewLines.length} more`)}`);
+        }
+        this.collapsedToolResults.push({
+            toolName: this.lastToolName || 'tool',
+            content,
+            summary: toolLabel,
+            timestamp: Date.now(),
+        });
+        if (this.collapsedToolResults.length > this.maxCollapsedResults) {
+            this.collapsedToolResults.shift();
+        }
+        const expandHint = preview.totalLines > preview.previewLines.length
+            ? ` ${theme.ui.muted('(ctrl+o to expand)')}`
+            : '';
+        return result.join('\n') + expandHint + '\n';
+    }
+    colorUnifiedDiffLine(line) {
+        if (!line)
+            return line;
+        if (line.includes('\x1b['))
+            return line;
+        const leadingMatch = line.match(/^\s*/);
+        const leading = leadingMatch ? leadingMatch[0] : '';
+        const body = line.slice(leading.length);
+        if (body.startsWith('diff --git') || body.startsWith('index ') || body.startsWith('+++') || body.startsWith('---')) {
+            return leading + theme.diff.meta(body);
+        }
+        if (body.startsWith('@@')) {
+            return leading + theme.diff.hunk(body);
+        }
+        if (body.startsWith('+')) {
+            return leading + theme.diff.added(body);
+        }
+        if (body.startsWith('-')) {
+            return leading + theme.diff.removed(body);
+        }
+        return line;
+    }
     /**
      * Format a compact response with bullet on first line
      */