deepseek-coder-agent-cli 1.0.39 → 1.0.40

package/dist/ui/UnifiedUIRenderer.js

@@ -18,6 +18,7 @@ import { ContextMeter, disposeAnimations } from './animatedStatus.js';
 import { clampPercentage, getContextColor, } from './uiConstants.js';
 import { formatInlineText } from './richText.js';
 import { initializeInputProtection } from '../core/inputProtection.js';
+import { reportStatus, reportStatusError } from '../utils/statusReporter.js';
 // UI helper methods for security components
 export function createBanner(title, subtitle) {
     const lines = [];
@@ -208,8 +209,7 @@ export class UnifiedUIRenderer extends EventEmitter {
     suggestionIndex = -1;
     availableCommands = [];
     hotkeysInToggleLine = new Set();
-    // Paste region tracking for condensed display of large pastes
-    pasteRegions = [];
+    // Note: collapsed paste functionality removed - pasted content is displayed directly
     mode = 'idle';
     /** Queue for input received during streaming - processed after streaming ends */
     streamingInputQueue = [];
@@ -356,125 +356,6 @@ export class UnifiedUIRenderer extends EventEmitter {
         sanitized = sanitized.replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g, '');
         return sanitized;
     }
-    /** Detect likely programming language from pasted content */
-    detectPasteLanguage(text) {
-        const patterns = {
-            javascript: /\b(const|let|var|function|async|await|import|export|=>)\b/,
-            typescript: /\b(interface|type|enum|namespace|declare|as const)\b/,
-            python: /\b(def|class|import|from|if __name__|async def)\b/,
-            json: /^\s*(?:\{|\[)[\s\S]*(?:\}|\])\s*$/,
-            html: /^<[a-z]/i,
-            css: /^\s*[.#[]?[\w-]+\s*\{/,
-            sql: /\b(SELECT|FROM|WHERE|INSERT|UPDATE|DELETE|CREATE|TABLE)\b/i,
-            bash: /^#!/,
-            yaml: /^[\w-]+:\s*\S/m,
-        };
-        for (const [lang, pattern] of Object.entries(patterns)) {
-            if (pattern.test(text)) {
-                return lang;
-            }
-        }
-        return undefined;
-    }
-    /** Minimum chars/lines to trigger condensed display */
-    pasteCondenseMinChars = 200;
-    pasteCondenseMinLines = 4;
-    /** Record a paste region for condensed display */
-    recordPasteRegion(insertPos, content) {
-        const lines = content.split('\n');
-        const nonEmptyLines = lines.filter(line => line.trim().length > 0);
-        const charCount = content.length;
-        const lineCount = nonEmptyLines.length;
-        // Only condense if paste is large enough
-        if (charCount < this.pasteCondenseMinChars && lineCount < this.pasteCondenseMinLines) {
-            return;
-        }
-        // Create preview: first line truncated to 50 chars
-        let preview = nonEmptyLines[0]?.substring(0, 50) || '';
-        if ((nonEmptyLines[0]?.length ?? 0) > 50) {
-            preview += '…';
-        }
-        const language = this.detectPasteLanguage(content);
-        // Shift existing regions that come after the insertion point
-        for (const region of this.pasteRegions) {
-            if (region.start >= insertPos) {
-                region.start += content.length;
-                region.end += content.length;
-            }
-            else if (region.end > insertPos) {
-                // Insertion in the middle of a region - extend it
-                region.end += content.length;
-            }
-        }
-        // Add new region
-        this.pasteRegions.push({
-            start: insertPos,
-            end: insertPos + content.length,
-            lineCount,
-            charCount,
-            preview,
-            language,
-        });
-    }
-    /** Clear paste regions (called when buffer is cleared) */
-    clearPasteRegions() {
-        this.pasteRegions = [];
-    }
-    /** Adjust paste regions when characters are deleted from the buffer */
-    adjustPasteRegionsForDeletion(deleteStart, deleteEnd) {
-        const deleteLen = deleteEnd - deleteStart;
-        if (deleteLen <= 0)
-            return;
-        // Filter out regions that are fully deleted, and adjust others
-        this.pasteRegions = this.pasteRegions.filter(region => {
-            // Region is fully before deletion - no change
-            if (region.end <= deleteStart) {
-                return true;
-            }
-            // Region is fully after deletion - shift left
-            if (region.start >= deleteEnd) {
-                region.start -= deleteLen;
-                region.end -= deleteLen;
-                return true;
-            }
-            // Region is fully within deletion - remove it
-            if (region.start >= deleteStart && region.end <= deleteEnd) {
-                return false;
-            }
-            // Partial overlap - adjust bounds
-            if (region.start < deleteStart && region.end > deleteEnd) {
-                // Deletion is inside region - shrink region
-                region.end -= deleteLen;
-                return true;
-            }
-            if (region.start < deleteStart) {
-                // Deletion overlaps end of region
-                region.end = deleteStart;
-                return region.end > region.start;
-            }
-            // Deletion overlaps start of region
-            region.start = deleteStart;
-            region.end -= (deleteEnd - region.start);
-            return region.end > region.start;
-        });
-    }
-    /** Adjust paste regions when characters are inserted (not paste - regular typing) */
-    adjustPasteRegionsForInsertion(insertPos, insertLen) {
-        if (insertLen <= 0)
-            return;
-        for (const region of this.pasteRegions) {
-            if (region.start >= insertPos) {
-                // Region is after insertion point - shift right
-                region.start += insertLen;
-                region.end += insertLen;
-            }
-            else if (region.end > insertPos) {
-                // Insertion is inside region - extend the region
-                region.end += insertLen;
-            }
-            // Regions before insertion point are unaffected
-        }
-    }
     formatHotkey(combo) {
         if (!combo?.trim())
             return null;
@@ -554,7 +435,7 @@ export class UnifiedUIRenderer extends EventEmitter {
         // Set up error handling for EventEmitter
         this.on('error', (err) => {
             // Log errors but don't crash
-            console.error('[UnifiedUIRenderer] Error:', err);
+            reportStatusError(err, '[UnifiedUIRenderer] Error');
         });
         this.output = output;
         this.input = input;
@@ -584,7 +465,7 @@ export class UnifiedUIRenderer extends EventEmitter {
         }
         catch (err) {
             // If readline creation fails, create a minimal fallback
-            console.error('[UnifiedUIRenderer] Failed to create readline interface:', err);
+            reportStatusError(err, '[UnifiedUIRenderer] Failed to create readline interface');
             this.rl = readline.createInterface({
                 input: process.stdin,
                 output: process.stdout,
@@ -637,7 +518,6 @@ export class UnifiedUIRenderer extends EventEmitter {
         this.buffer = '';
         this.cursor = 0;
         this.inputRenderOffset = 0;
-        this.clearPasteRegions();
         this.pasteBuffer = '';
         this.pasteBufferOverflow = false;
         this.inPlainPaste = false;
@@ -1133,7 +1013,6 @@ export class UnifiedUIRenderer extends EventEmitter {
             this.buffer = '';
             this.cursor = 0;
             this.inputRenderOffset = 0;
-            this.clearPasteRegions();
             this.resetSuggestions();
             this.renderPrompt();
             this.emitInputChange();
@@ -1189,12 +1068,9 @@ export class UnifiedUIRenderer extends EventEmitter {
         // Insert paste content directly into buffer (supports multi-line)
         // Insert at cursor position
         this.clampCursor();
-        const insertPos = this.cursor;
         this.buffer = this.buffer.slice(0, this.cursor) + sanitized + this.buffer.slice(this.cursor);
         this.cursor += sanitized.length;
         this.clampCursor();
-        // Record paste region for condensed display
-        this.recordPasteRegion(insertPos, sanitized);
         this.updateSuggestions();
         this.resetPlainPasteBurst();
         this.forceNextRender = true;
@@ -1225,12 +1101,9 @@ export class UnifiedUIRenderer extends EventEmitter {
         // Insert paste content directly into buffer (supports multi-line)
         // Insert at cursor position
         this.clampCursor();
-        const insertPos = this.cursor;
         this.buffer = this.buffer.slice(0, this.cursor) + sanitized + this.buffer.slice(this.cursor);
         this.cursor += sanitized.length;
         this.clampCursor();
-        // Record paste region for condensed display
-        this.recordPasteRegion(insertPos, sanitized);
         this.updateSuggestions();
         this.resetPlainPasteBurst();
         this.forceNextRender = true;
@@ -1303,7 +1176,6 @@ export class UnifiedUIRenderer extends EventEmitter {
                     this.buffer = '';
                     this.cursor = 0;
                     this.inputRenderOffset = 0;
-                    this.clearPasteRegions();
                     this.resetSuggestions();
                     this.renderPrompt();
                     this.emitInputChange();
@@ -1481,11 +1353,8 @@ export class UnifiedUIRenderer extends EventEmitter {
                 // Skip word characters
                 while (pos > 0 && this.buffer[pos - 1] !== ' ')
                     pos--;
-                const deleteStart = pos;
-                const deleteEnd = this.cursor;
-                this.buffer = this.buffer.slice(0, deleteStart) + this.buffer.slice(deleteEnd);
+                this.buffer = this.buffer.slice(0, pos) + this.buffer.slice(this.cursor);
                 this.cursor = pos;
-                this.adjustPasteRegionsForDeletion(deleteStart, deleteEnd);
                 this.updateSuggestions();
                 this.renderPrompt();
                 this.emitInputChange();
@@ -1495,10 +1364,7 @@ export class UnifiedUIRenderer extends EventEmitter {
         // Ctrl+K: Delete from cursor to end of line
         if (key.ctrl && key.name === 'k') {
             if (this.cursor < this.buffer.length) {
-                const deleteStart = this.cursor;
-                const deleteEnd = this.buffer.length;
                 this.buffer = this.buffer.slice(0, this.cursor);
-                this.adjustPasteRegionsForDeletion(deleteStart, deleteEnd);
                 this.updateSuggestions();
                 this.renderPrompt();
                 this.emitInputChange();
@@ -1567,11 +1433,8 @@ export class UnifiedUIRenderer extends EventEmitter {
                     pos--;
                 while (pos > 0 && this.buffer[pos - 1] !== ' ')
                     pos--;
-                const deleteStart = pos;
-                const deleteEnd = this.cursor;
-                this.buffer = this.buffer.slice(0, deleteStart) + this.buffer.slice(deleteEnd);
+                this.buffer = this.buffer.slice(0, pos) + this.buffer.slice(this.cursor);
                 this.cursor = pos;
-                this.adjustPasteRegionsForDeletion(deleteStart, deleteEnd);
                 this.updateSuggestions();
                 this.renderPrompt();
                 this.emitInputChange();
@@ -1610,11 +1473,8 @@ export class UnifiedUIRenderer extends EventEmitter {
             this.resetPlainPasteBurst();
             this.cancelPlainPasteCapture();
             if (this.cursor > 0) {
-                const deleteStart = this.cursor - 1;
-                const deleteEnd = this.cursor;
-                this.buffer = this.buffer.slice(0, deleteStart) + this.buffer.slice(deleteEnd);
+                this.buffer = this.buffer.slice(0, this.cursor - 1) + this.buffer.slice(this.cursor);
                 this.cursor--;
-                this.adjustPasteRegionsForDeletion(deleteStart, deleteEnd);
                 this.updateSuggestions();
                 this.forceNextRender = true;
                 this.renderPrompt();
@@ -1627,10 +1487,7 @@ export class UnifiedUIRenderer extends EventEmitter {
             this.resetPlainPasteBurst();
             this.cancelPlainPasteCapture();
             if (this.cursor < this.buffer.length) {
-                const deleteStart = this.cursor;
-                const deleteEnd = this.cursor + 1;
-                this.buffer = this.buffer.slice(0, deleteStart) + this.buffer.slice(deleteEnd);
-                this.adjustPasteRegionsForDeletion(deleteStart, deleteEnd);
+                this.buffer = this.buffer.slice(0, this.cursor) + this.buffer.slice(this.cursor + 1);
                 this.updateSuggestions();
                 this.forceNextRender = true;
                 this.renderPrompt();
@@ -1707,7 +1564,6 @@ export class UnifiedUIRenderer extends EventEmitter {
                 }
                 this.cursor = this.buffer.length;
                 this.inputRenderOffset = 0; // Reset render offset for new buffer
-                this.clearPasteRegions(); // History entries don't have paste regions
                 this.updateSuggestions();
                 this.renderPrompt();
                 this.emitInputChange();
@@ -1734,7 +1590,6 @@ export class UnifiedUIRenderer extends EventEmitter {
                 }
                 this.cursor = this.buffer.length;
                 this.inputRenderOffset = 0; // Reset render offset for new buffer
-                this.clearPasteRegions(); // History entries don't have paste regions
                 this.updateSuggestions();
                 this.renderPrompt();
                 this.emitInputChange();
@@ -1974,12 +1829,9 @@ export class UnifiedUIRenderer extends EventEmitter {
             // Insert paste content directly into buffer (supports multi-line)
             // Insert at cursor position
             this.clampCursor();
-            const insertPos = this.cursor;
             this.buffer = this.buffer.slice(0, this.cursor) + content + this.buffer.slice(this.cursor);
             this.cursor += content.length;
             this.clampCursor();
-            // Record paste region for condensed display
-            this.recordPasteRegion(insertPos, content);
             this.updateSuggestions();
             this.forceNextRender = true;
             this.renderPrompt();
@@ -2156,12 +2008,9 @@ export class UnifiedUIRenderer extends EventEmitter {
         // Insert paste content directly into buffer (supports multi-line)
         // Insert at cursor position
         this.clampCursor();
-        const insertPos = this.cursor;
         this.buffer = this.buffer.slice(0, this.cursor) + content + this.buffer.slice(this.cursor);
         this.cursor += content.length;
         this.clampCursor();
-        // Record paste region for condensed display
-        this.recordPasteRegion(insertPos, content);
         this.updateSuggestions();
         this.forceNextRender = true;
         this.renderPrompt();
@@ -2225,12 +2074,9 @@ export class UnifiedUIRenderer extends EventEmitter {
             return;
         // Ensure cursor is valid before slicing
         this.clampCursor();
-        const insertPos = this.cursor;
         this.buffer = this.buffer.slice(0, this.cursor) + text + this.buffer.slice(this.cursor);
         this.cursor += text.length;
         this.clampCursor(); // Ensure cursor remains valid after modification
-        // Adjust paste regions for the insertion
-        this.adjustPasteRegionsForInsertion(insertPos, text.length);
         this.updateSuggestions();
         // Suppress render during paste detection to prevent visual leak
         const inEmitPaste = this.emitPasteBuffer.length > 0 || this.emitPasteTimer !== null;
@@ -2258,7 +2104,6 @@ export class UnifiedUIRenderer extends EventEmitter {
             this.buffer = '';
             this.cursor = 0;
             this.inputRenderOffset = 0;
-            this.clearPasteRegions();
             this.resetSuggestions();
             this.renderPrompt();
             this.emitInputChange();
@@ -2277,7 +2122,6 @@ export class UnifiedUIRenderer extends EventEmitter {
                 // Prompt blocked - don't submit
                 this.buffer = '';
                 this.cursor = 0;
-                this.clearPasteRegions();
                 this.renderPrompt();
                 return;
             }
@@ -2302,7 +2146,6 @@ export class UnifiedUIRenderer extends EventEmitter {
         }
         this.buffer = '';
         this.cursor = 0;
-        this.clearPasteRegions();
         this.resetSuggestions();
         this.renderPrompt();
         this.emitInputChange();
@@ -2398,6 +2241,10 @@ export class UnifiedUIRenderer extends EventEmitter {
     addEvent(type, content) {
         if (!content)
             return;
+        if (type === 'error') {
+            reportStatus(content);
+            return;
+        }
         const normalized = this.normalizeEventType(type);
         if (!normalized)
             return;
@@ -5166,11 +5013,9 @@ export class UnifiedUIRenderer extends EventEmitter {
         const maxWidth = this.safeWidth();
         const continuationIndent = '  '; // 2 spaces for continuation lines
         const continuationWidth = continuationIndent.length;
-        // Build display buffer with paste regions condensed
-        const { displayBuffer, cursorDisplayPos } = this.buildCondensedDisplayBuffer();
         // Handle multi-line input - split buffer on newlines first
         // In secret mode, mask all characters with bullets
-        const rawBuffer = displayBuffer.replace(/\r/g, '\n');
+        const rawBuffer = this.buffer.replace(/\r/g, '\n');
         const normalized = this.secretMode ? '•'.repeat(rawBuffer.length) : rawBuffer;
         const bufferLines = normalized.split('\n');
         // Wrap each logical line to fit terminal width, expanding vertically
@@ -5201,13 +5046,13 @@ export class UnifiedUIRenderer extends EventEmitter {
                 else {
                     displayLine = `${continuationIndent}${chunk}`;
                 }
-                // Track cursor position (using mapped display position)
+                // Track cursor position
                 if (!foundCursor) {
                     const chunkStart = lineStartChar + (line.length - remaining.length - chunk.length);
                     const chunkEnd = chunkStart + chunk.length;
-                    if (cursorDisplayPos >= chunkStart && cursorDisplayPos <= chunkEnd) {
+                    if (this.cursor >= chunkStart && this.cursor <= chunkEnd) {
                         cursorLine = result.length;
-                        const offsetInChunk = cursorDisplayPos - chunkStart;
+                        const offsetInChunk = this.cursor - chunkStart;
                         cursorCol = ((isFirstLogicalLine && isFirstDisplayLine) ? promptWidth : continuationWidth) + offsetInChunk;
                         foundCursor = true;
                     }
@@ -5244,50 +5089,6 @@ export class UnifiedUIRenderer extends EventEmitter {
         this.cursorVisibleColumn = cursorCol + 1;
         return result.join('\n');
     }
-    /** Build a display buffer with paste regions condensed to summaries */
-    buildCondensedDisplayBuffer() {
-        // If no paste regions, return original buffer
-        if (this.pasteRegions.length === 0) {
-            return { displayBuffer: this.buffer, cursorDisplayPos: this.cursor };
-        }
-        // Sort regions by start position
-        const sortedRegions = [...this.pasteRegions].sort((a, b) => a.start - b.start);
-        let displayBuffer = '';
-        let bufferPos = 0;
-        let cursorDisplayPos = this.cursor;
-        let displayOffset = 0; // Track cumulative offset between buffer and display positions
-        for (const region of sortedRegions) {
-            // Add text before this region
-            if (region.start > bufferPos) {
-                displayBuffer += this.buffer.slice(bufferPos, region.start);
-            }
-            // Build condensed summary for this paste region
-            const langLabel = region.language ? `${region.language.toUpperCase()} ` : '';
-            const summary = `[📋 ${langLabel}${region.lineCount} lines · ${region.charCount} chars: ${region.preview}]`;
-            // Update cursor position if it's within or after this region
-            if (this.cursor >= region.start && this.cursor < region.end) {
-                // Cursor is inside paste region - position at start of summary
-                cursorDisplayPos = displayBuffer.length;
-            }
-            else if (this.cursor >= region.end) {
-                // Cursor is after this region - adjust by the difference
-                const regionLength = region.end - region.start;
-                const summaryLength = summary.length;
-                displayOffset += regionLength - summaryLength;
-            }
-            displayBuffer += summary;
-            bufferPos = region.end;
-        }
-        // Add remaining text after last region
-        if (bufferPos < this.buffer.length) {
-            displayBuffer += this.buffer.slice(bufferPos);
-        }
-        // Adjust cursor position for regions that came before it
-        if (this.cursor >= bufferPos || displayOffset > 0) {
-            cursorDisplayPos = Math.max(0, this.cursor - displayOffset);
-        }
-        return { displayBuffer, cursorDisplayPos };
-    }
     buildInputWindow(available) {
         if (available <= 0) {
             return { text: '', cursor: 0 };
@@ -5340,7 +5141,6 @@ export class UnifiedUIRenderer extends EventEmitter {
             this.buffer = '';
             this.cursor = 0;
             this.inputRenderOffset = 0;
-            this.clearPasteRegions();
             this.resetSuggestions();
             this.renderPrompt();
             this.emitInputChange();
@@ -5454,7 +5254,6 @@ export class UnifiedUIRenderer extends EventEmitter {
         // Validate cursor position to prevent out-of-bounds issues
         const requestedCursor = cursorPos ?? text.length;
         this.cursor = Math.max(0, Math.min(requestedCursor, text.length));
-        this.clearPasteRegions(); // External buffer replacement clears paste tracking
         this.inputRenderOffset = 0;
         this.updateSuggestions();
         this.renderPrompt();
@@ -5469,7 +5268,6 @@ export class UnifiedUIRenderer extends EventEmitter {
         this.buffer = '';
         this.cursor = 0;
         this.inputRenderOffset = 0;
-        this.clearPasteRegions();
         this.suggestions = [];
         this.suggestionIndex = -1;
         this.renderPrompt();