attocode 0.1.4 → 0.1.6

package/dist/src/tui/app.js

@@ -10,6 +10,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  */
 import { useState, useCallback, useEffect, memo, useRef, useMemo } from 'react';
 import { Box, Text, useApp, useInput, Static } from 'ink';
+import { DiffView } from './components/DiffView.js';
 import { getTheme, getThemeNames } from './theme/index.js';
 import { ControlledCommandPalette } from './input/CommandPalette.js';
 import { ApprovalDialog } from './components/ApprovalDialog.js';
@@ -114,9 +115,18 @@ const ToolCallItem = memo(function ToolCallItem({ tc, expanded, colors }) {
     const argsStr = formatToolArgsCompact(tc.args);
     if (expanded) {
         const expandedArgs = formatToolArgsExpanded(tc.args);
-        return (_jsxs(Box, { marginLeft: 2, flexDirection: "column", children: [_jsxs(Box, { gap: 1, children: [_jsx(Text, { color: statusColor, children: icon }), _jsx(Text, { color: "#DDA0DD", bold: true, children: tc.name }), tc.duration ? _jsxs(Text, { color: colors.textMuted, dimColor: true, children: ["(", tc.duration, "ms)"] }) : null] }), expandedArgs.map((argLine, i) => (_jsx(Box, { marginLeft: 3, children: _jsx(Text, { color: "#87CEEB", dimColor: true, children: argLine }) }, i))), tc.status === 'success' && tc.result !== undefined && tc.result !== null ? (_jsx(Box, { marginLeft: 3, children: _jsx(Text, { color: "#98FB98", dimColor: true, children: `-> ${String(tc.result).slice(0, 150)}${String(tc.result).length > 150 ? '...' : ''}` }) })) : null, tc.status === 'error' && tc.error && (_jsx(Box, { marginLeft: 3, children: _jsx(Text, { color: "#FF6B6B", children: `x ${tc.error}` }) }))] }));
+        return (_jsxs(Box, { marginLeft: 2, flexDirection: "column", children: [_jsxs(Box, { gap: 1, children: [_jsx(Text, { color: statusColor, children: icon }), _jsx(Text, { color: "#DDA0DD", bold: true, children: tc.name }), tc.duration ? _jsxs(Text, { color: colors.textMuted, dimColor: true, children: ["(", tc.duration, "ms)"] }) : null] }), expandedArgs.map((argLine, i) => (_jsx(Box, { marginLeft: 3, children: _jsx(Text, { color: "#87CEEB", dimColor: true, children: argLine }) }, i))), tc.status === 'success' && tc.result !== undefined && tc.result !== null ? (_jsx(Box, { marginLeft: 3, flexDirection: "column", children: (tc.name === 'edit_file' || tc.name === 'write_file') &&
+                        typeof tc.result === 'object' && tc.result !== null &&
+                        'metadata' in tc.result &&
+                        typeof tc.result.metadata?.diff === 'string' ? (_jsx(DiffView, { diff: tc.result.metadata.diff, expanded: true, maxLines: 15 })) : (_jsx(Text, { color: "#98FB98", dimColor: true, children: `-> ${String(tc.result).slice(0, 150)}${String(tc.result).length > 150 ? '...' : ''}` })) })) : null, tc.status === 'error' && tc.error && (_jsx(Box, { marginLeft: 3, children: _jsx(Text, { color: "#FF6B6B", children: `x ${tc.error}` }) }))] }));
     }
-    return (_jsxs(Box, { marginLeft: 2, gap: 1, children: [_jsx(Text, { color: statusColor, children: icon }), _jsx(Text, { color: "#DDA0DD", bold: true, children: tc.name }), argsStr ? _jsx(Text, { color: colors.textMuted, dimColor: true, children: argsStr }) : null, tc.duration ? _jsxs(Text, { color: colors.textMuted, dimColor: true, children: ["(", tc.duration, "ms)"] }) : null] }));
+    // Check if result has diff metadata for collapsed summary
+    const hasDiff = tc.status === 'success' &&
+        (tc.name === 'edit_file' || tc.name === 'write_file') &&
+        typeof tc.result === 'object' && tc.result !== null &&
+        'metadata' in tc.result &&
+        typeof tc.result.metadata?.diff === 'string';
+    return (_jsxs(Box, { marginLeft: 2, gap: 1, children: [_jsx(Text, { color: statusColor, children: icon }), _jsx(Text, { color: "#DDA0DD", bold: true, children: tc.name }), argsStr ? _jsx(Text, { color: colors.textMuted, dimColor: true, children: argsStr }) : null, hasDiff && (_jsx(DiffView, { diff: tc.result.metadata.diff, expanded: false })), tc.duration ? _jsxs(Text, { color: colors.textMuted, dimColor: true, children: ["(", tc.duration, "ms)"] }) : null] }));
 });
 const MemoizedInputArea = memo(function MemoizedInputArea({ onSubmit, disabled, borderColor, textColor, cursorColor, onCtrlC, onCtrlL, onCtrlP, onEscape, onToggleToolExpand, onToggleThinking, onToggleTransparency, onPageUp, onPageDown, onHome, onEnd, commandPaletteOpen, onCommandPaletteInput, approvalDialogOpen, approvalDenyReasonMode, onApprovalApprove, onApprovalAlwaysAllow, onApprovalDeny, onApprovalDenyWithReason, onApprovalCancelDenyReason, onApprovalDenyReasonInput, }) {
     const [value, setValue] = useState('');
@@ -304,6 +314,8 @@ export function TUIApp({ agent, sessionStore, mcpClient, compactor, lspManager,
     const [contextTokens, setContextTokens] = useState(0);
     const [elapsedTime, setElapsedTime] = useState(0);
     const processingStartRef = useRef(null);
+    const [executionMode, setExecutionMode] = useState('idle');
+    const executionModeRef = useRef('idle');
     // Display toggles
     const [toolCallsExpanded, setToolCallsExpanded] = useState(false);
     const [showThinking, setShowThinking] = useState(true);
@@ -400,6 +412,203 @@ export function TUIApp({ agent, sessionStore, mcpClient, compactor, lspManager,
             });
         }
     }, [approvalBridge, handleApprovalRequest]);
+    // =========================================================================
+    // UNIFIED EVENT HANDLER
+    // Consolidated handler for all agent events - prevents duplicate messages
+    // =========================================================================
+    const handleAgentEvent = useCallback((event) => {
+        const mode = executionModeRef.current;
+        if (mode === 'idle')
+            return; // No active execution, ignore events
+        // Extract subagent from event if present (not all events have it)
+        const eventWithSubagent = event;
+        const subagentPrefix = eventWithSubagent.subagent ? `[${eventWithSubagent.subagent}] ` : '';
+        // -------------------------------------------------------------------------
+        // Approving-only events (plan execution)
+        // -------------------------------------------------------------------------
+        if (mode === 'approving') {
+            if (event.type === 'plan.approved') {
+                const e = event;
+                addMessage('system', `[PLAN] Executing ${e.changeCount} change(s)...`);
+                return;
+            }
+            if (event.type === 'plan.executing') {
+                const e = event;
+                setStatus(s => ({ ...s, mode: `executing ${e.changeIndex + 1}/${e.totalChanges}` }));
+                return;
+            }
+        }
+        // -------------------------------------------------------------------------
+        // Shared events (both processing and approving modes)
+        // -------------------------------------------------------------------------
+        // Subagent lifecycle events
+        if (event.type === 'agent.spawn') {
+            const e = event;
+            addMessage('system', `[AGENT] Spawning ${e.name}: ${e.task.slice(0, 100)}${e.task.length > 100 ? '...' : ''}`);
+            return;
+        }
+        if (event.type === 'agent.complete') {
+            const e = event;
+            const statusText = e.success ? 'completed' : 'failed';
+            addMessage('system', `[AGENT] ${e.agentId} ${statusText}`);
+            // Show output preview if substantive
+            if (e.output && e.output.length > 50) {
+                const preview = e.output.slice(0, 300);
+                addMessage('system', `[AGENT OUTPUT]\n${preview}${e.output.length > 300 ? '\n...(truncated)' : ''}`);
+            }
+            return;
+        }
+        if (event.type === 'agent.error') {
+            const e = event;
+            addMessage('system', `[AGENT] ${e.agentId} error: ${e.error}`);
+            return;
+        }
+        if (event.type === 'agent.pending_plan') {
+            const e = event;
+            addMessage('system', `[AGENT] ${e.agentId} queued ${e.changes.length} change(s) to pending plan`);
+            return;
+        }
+        // Tool events
+        if (event.type === 'tool.start') {
+            const e = event;
+            const displayName = e.subagent ? `${e.subagent}:${e.tool}` : e.tool;
+            setStatus(s => ({ ...s, mode: `calling ${displayName}` }));
+            setToolCalls(prev => [...prev.slice(-4), {
+                    id: `${displayName}-${Date.now()}`,
+                    name: displayName,
+                    args: e.args || {},
+                    status: 'running',
+                    startTime: new Date(),
+                }]);
+            return;
+        }
+        if (event.type === 'tool.complete') {
+            const e = event;
+            const displayName = e.subagent ? `${e.subagent}:${e.tool}` : e.tool;
+            const modeText = e.subagent ? `${e.subagent} thinking` : (mode === 'approving' ? 'executing plan' : 'thinking');
+            setStatus(s => ({ ...s, mode: modeText }));
+            setToolCalls(prev => prev.map(t => t.name === displayName ? {
+                ...t,
+                status: 'success',
+                result: e.result,
+                duration: t.startTime ? Date.now() - t.startTime.getTime() : undefined,
+            } : t));
+            return;
+        }
+        if (event.type === 'tool.blocked') {
+            const e = event;
+            const displayName = e.subagent ? `${e.subagent}:${e.tool}` : e.tool;
+            setToolCalls(prev => prev.map(t => t.name === displayName ? {
+                ...t,
+                status: 'error',
+                error: e.reason || 'Blocked',
+            } : t));
+            return;
+        }
+        // LLM events
+        if (event.type === 'llm.start') {
+            const e = event;
+            const modeText = e.subagent ? `${e.subagent} thinking` : (mode === 'approving' ? 'executing plan' : 'thinking');
+            setStatus(s => ({ ...s, mode: modeText, iter: s.iter + 1 }));
+            return;
+        }
+        if (event.type === 'llm.complete' && eventWithSubagent.subagent && showThinking) {
+            const e = event;
+            const thinking = e.response?.thinking;
+            if (thinking) {
+                const preview = thinking.length > 500 ? thinking.slice(0, 500) + '...' : thinking;
+                addMessage('system', `[${eventWithSubagent.subagent}] ${preview}`);
+            }
+            return;
+        }
+        // Error events
+        if (event.type === 'error') {
+            const e = event;
+            const prefix = e.subagent ? `[${e.subagent} ERROR]` : '[ERROR]';
+            const errorMsg = typeof e.error === 'string' ? e.error : e.error?.message || 'Unknown error';
+            addMessage('error', `${prefix} ${errorMsg}`);
+            return;
+        }
+        // Insight events
+        if (event.type === 'insight.tokens' && showThinking) {
+            const e = event;
+            addMessage('system', `${subagentPrefix}* ${e.inputTokens.toLocaleString()} in, ${e.outputTokens.toLocaleString()} out${e.cost ? ` $${e.cost.toFixed(6)}` : ''}`);
+            return;
+        }
+        // Resilience events
+        if (event.type === 'resilience.retry') {
+            const e = event;
+            addMessage('system', `[RETRY] ${e.reason} (${e.attempt}/${e.maxAttempts})`);
+            return;
+        }
+        if (event.type === 'resilience.recovered') {
+            const e = event;
+            addMessage('system', `[RECOVERED] ${e.reason} after ${e.attempts} attempt(s)`);
+            return;
+        }
+        // Subagent visibility events
+        if (event.type === 'subagent.iteration') {
+            const e = event;
+            setStatus(s => ({ ...s, mode: `${e.agentId} iter ${e.iteration}/${e.maxIterations}` }));
+            return;
+        }
+        if (event.type === 'subagent.phase') {
+            const e = event;
+            setStatus(s => ({ ...s, mode: `${e.agentId} ${e.phase}` }));
+            return;
+        }
+        // -------------------------------------------------------------------------
+        // Processing-only events (normal message submission)
+        // -------------------------------------------------------------------------
+        if (mode === 'processing') {
+            if (event.type === 'plan.change.queued') {
+                const e = event;
+                const summary = e.summary ? `: ${e.summary}` : '';
+                const prefix = e.subagent ? `[${e.subagent} PLAN]` : '[PLAN]';
+                addMessage('system', `${prefix} Queued ${e.tool}${summary}`);
+                return;
+            }
+            if (event.type === 'plan.change.complete') {
+                const e = event;
+                if (e.error) {
+                    addMessage('system', `[PLAN ${e.changeIndex + 1}] ${e.tool} FAILED: ${e.error}`);
+                }
+                else if (e.tool === 'spawn_agent' && e.result) {
+                    const output = typeof e.result === 'object' && e.result !== null && 'output' in e.result
+                        ? String(e.result.output)
+                        : String(e.result);
+                    const preview = output.length > 800 ? output.slice(0, 800) + '\n... (truncated)' : output;
+                    addMessage('system', `[PLAN ${e.changeIndex + 1}] ${e.tool} result:\n${preview}`);
+                }
+                else {
+                    addMessage('system', `[PLAN ${e.changeIndex + 1}] ${e.tool} completed`);
+                }
+                return;
+            }
+            if (event.type === 'cache.hit' && showThinking) {
+                const e = event;
+                addMessage('system', `[CACHE HIT] similarity: ${(e.similarity * 100).toFixed(0)}%`);
+                return;
+            }
+            if (event.type === 'cache.miss' && showThinking) {
+                addMessage('system', `[CACHE MISS]`);
+                return;
+            }
+            if (event.type === 'compaction.auto') {
+                const e = event;
+                const before = (e.tokensBefore / 1000).toFixed(1);
+                const after = (e.tokensAfter / 1000).toFixed(1);
+                addMessage('system', `[COMPACT] ${before}k -> ${after}k tokens (${e.messagesCompacted} messages)`);
+                return;
+            }
+            if (event.type === 'compaction.warning' && showThinking) {
+                const e = event;
+                const pct = Math.round((e.currentTokens / e.threshold) * 100);
+                addMessage('system', `[!] Context at ${pct}% of threshold`);
+                return;
+            }
+        }
+    }, [addMessage, showThinking]);
     // Set up transparency aggregator and subscribe to agent events
     useEffect(() => {
         const aggregator = new TransparencyAggregator();
@@ -411,12 +620,13 @@ export function TUIApp({ agent, sessionStore, mcpClient, compactor, lspManager,
         // Subscribe to agent events
         const unsubscribeAgent = agent.subscribe((event) => {
             aggregator.processEvent(event);
+            handleAgentEvent(event); // Unified event handler for TUI display
         });
         return () => {
             unsubscribeAggregator();
             unsubscribeAgent();
         };
-    }, [agent]);
+    }, [agent, handleAgentEvent]);
     // =========================================================================
     // COMMAND HANDLER
     // =========================================================================
@@ -809,16 +1019,32 @@ export function TUIApp({ agent, sessionStore, mcpClient, compactor, lspManager,
                     addMessage('system', 'No plan to approve.');
                     return;
                 }
-                const count = args[0] ? parseInt(args[0], 10) : undefined;
-                const result = await agent.approvePlan(count);
-                if (result.success) {
-                    addMessage('system', `[OK] Executed ${result.executed} change(s)`);
+                // Set execution mode - unified event handler will display events
+                setIsProcessing(true);
+                executionModeRef.current = 'approving';
+                setExecutionMode('approving');
+                setStatus(s => ({ ...s, mode: 'executing plan' }));
+                try {
+                    const count = args[0] ? parseInt(args[0], 10) : undefined;
+                    const result = await agent.approvePlan(count);
+                    if (result.success) {
+                        addMessage('system', `[OK] Executed ${result.executed} change(s)`);
+                    }
+                    else {
+                        addMessage('system', `[!] ${result.executed} done, ${result.errors.length} errors:\n${result.errors.join('\n')}`);
+                    }
                 }
-                else {
-                    addMessage('system', `[!] ${result.executed} done, ${result.errors.length} errors`);
+                catch (e) {
+                    addMessage('error', `Plan execution failed: ${e.message}`);
                 }
-                if (agent.getMode() === 'plan') {
-                    agent.setMode('build');
+                finally {
+                    executionModeRef.current = 'idle';
+                    setExecutionMode('idle');
+                    setIsProcessing(false);
+                    setToolCalls([]);
+                    if (agent.getMode() === 'plan') {
+                        agent.setMode('build');
+                    }
                     setStatus(s => ({ ...s, mode: 'ready' }));
                 }
                 return;
@@ -1111,7 +1337,7 @@ export function TUIApp({ agent, sessionStore, mcpClient, compactor, lspManager,
             default:
                 addMessage('system', `Unknown: /${cmd}. Try /help`);
         }
-    }, [addMessage, exit, agent, mcpClient, lspManager, sessionStore, compactor, model, currentThemeName, currentSessionId, formatSessionsTable, saveCheckpointToStore]);
+    }, [addMessage, exit, agent, mcpClient, lspManager, sessionStore, compactor, model, currentThemeName, currentSessionId, formatSessionsTable, saveCheckpointToStore, showThinking]);
     // =========================================================================
     // SUBMIT HANDLER
     // =========================================================================
@@ -1125,60 +1351,11 @@ export function TUIApp({ agent, sessionStore, mcpClient, compactor, lspManager,
             await handleCommand(parts[0], parts.slice(1));
             return;
         }
+        // Set execution mode - unified event handler will display events
         setIsProcessing(true);
+        executionModeRef.current = 'processing';
+        setExecutionMode('processing');
         setStatus(s => ({ ...s, mode: 'thinking' }));
-        const unsub = agent.subscribe((event) => {
-            // Check if event is from a subagent
-            const subagentPrefix = event.subagent ? `[${event.subagent}] ` : '';
-            if (event.type === 'agent.spawn') {
-                // A subagent is starting
-                addMessage('system', `[AGENT] Spawning ${event.name}: ${event.task.slice(0, 100)}${event.task.length > 100 ? '...' : ''}`);
-            }
-            else if (event.type === 'agent.complete') {
-                // A subagent finished
-                addMessage('system', `[AGENT] ${event.agentId} ${event.success ? 'completed' : 'failed'}`);
-            }
-            else if (event.type === 'tool.start') {
-                const displayName = event.subagent ? `${event.subagent}:${event.tool}` : event.tool;
-                setStatus(s => ({ ...s, mode: `calling ${displayName}` }));
-                setToolCalls(prev => [...prev.slice(-4), {
-                        id: `${displayName}-${Date.now()}`,
-                        name: displayName,
-                        args: event.args || {},
-                        status: 'running',
-                        startTime: new Date(),
-                    }]);
-            }
-            else if (event.type === 'tool.complete') {
-                const displayName = event.subagent ? `${event.subagent}:${event.tool}` : event.tool;
-                setStatus(s => ({ ...s, mode: event.subagent ? `${event.subagent} thinking` : 'thinking' }));
-                setToolCalls(prev => prev.map(t => t.name === displayName ? {
-                    ...t,
-                    status: 'success',
-                    result: event.result,
-                    duration: t.startTime ? Date.now() - t.startTime.getTime() : undefined,
-                } : t));
-            }
-            else if (event.type === 'tool.blocked') {
-                const displayName = event.subagent ? `${event.subagent}:${event.tool}` : event.tool;
-                setToolCalls(prev => prev.map(t => t.name === displayName ? {
-                    ...t,
-                    status: 'error',
-                    error: event.reason || 'Blocked',
-                } : t));
-            }
-            else if (event.type === 'llm.start') {
-                setStatus(s => ({ ...s, mode: event.subagent ? `${event.subagent} thinking` : 'thinking', iter: s.iter + 1 }));
-            }
-            else if (event.type === 'insight.tokens' && showThinking) {
-                const e = event;
-                addMessage('system', `${subagentPrefix}* ${e.inputTokens.toLocaleString()} in, ${e.outputTokens.toLocaleString()} out${e.cost ? ` $${e.cost.toFixed(6)}` : ''}`);
-            }
-            else if (event.type === 'plan.change.queued') {
-                const summary = event.summary ? `: ${event.summary}` : '';
-                addMessage('system', `[PLAN] Queued ${event.tool}${summary}`);
-            }
-        });
         try {
             const result = await agent.run(trimmed);
             const metrics = agent.getMetrics();
@@ -1231,11 +1408,12 @@ export function TUIApp({ agent, sessionStore, mcpClient, compactor, lspManager,
             addMessage('error', e.message);
         }
         finally {
-            unsub();
+            executionModeRef.current = 'idle';
+            setExecutionMode('idle');
             setIsProcessing(false);
             setToolCalls([]);
         }
-    }, [addMessage, handleCommand, agent, sessionStore, saveCheckpointToStore, persistenceDebug, showThinking]);
+    }, [addMessage, handleCommand, agent, sessionStore, saveCheckpointToStore, persistenceDebug]);
     // =========================================================================
     // COMMAND PALETTE ITEMS
     // =========================================================================