centaurus-cli 2.5.2 → 2.6.0

package/dist/ui/components/App.js

@@ -1,6 +1,7 @@
 import React, { useState, useCallback } from 'react';
 import { Box, Text, useApp, useInput, Static } from 'ink';
 import { spawn } from 'child_process';
+import * as fs from 'fs';
 import { WelcomeBanner } from './WelcomeBanner.js';
 import { InputBox } from './InputBox.js';
 import { MessageDisplay } from './MessageDisplay.js';
@@ -49,13 +50,43 @@ const ApprovalSection = React.memo(({ approvalRequest, onApprove }) => {
     // Only re-render if the approval request message changes
     return prevProps.approvalRequest.message === nextProps.approvalRequest.message;
 });
-export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceived, onResponseStream, onPickerSetup, onPickerSelection, onToolExecutionUpdate, onToolApprovalRequest, onToolStreamingOutput, onPlanModeChange, onPlanApprovalRequest, onCommandModeChange, onToggleCommandMode, onCwdChange, onSubshellContextChange, onPasswordRequest }) => {
+export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceived, onResponseStream, onThoughtStream, onThoughtComplete, onPickerSetup, onPickerSelection, onToolExecutionUpdate, onToolApprovalRequest, onToolStreamingOutput, onPlanModeChange, onPlanApprovalRequest, onCommandModeChange, onToggleCommandMode, onCwdChange, onModelChange, onSubshellContextChange, onPasswordRequest }) => {
     const { exit } = useApp();
     const autoAcceptRef = React.useRef(false);
     // Helper to clear screen
     const clearScreen = useCallback(() => {
         process.stdout.write('\x1b[2J\x1b[3J\x1b[H');
     }, []);
+    // Helper to get max tokens for a model
+    const getMaxTokensForModel = useCallback((model) => {
+        // Import dynamically to avoid circular dependencies
+        try {
+            const { getModelContextWindow } = require('../../config/models.js');
+            return getModelContextWindow(model);
+        }
+        catch (error) {
+            // Fallback to defaults if config loading fails
+            if (model.includes('gemini-3'))
+                return 2000000;
+            if (model.includes('gemini-2.5'))
+                return 2000000;
+            if (model.includes('kimi'))
+                return 128000;
+            return 2000000;
+        }
+    }, []);
+    // Helper to estimate tokens (rough approximation: 1 token ≈ 4 characters)
+    const estimateTokens = useCallback((text) => {
+        return Math.ceil(text.length / 4);
+    }, []);
+    // Helper to calculate total tokens from messages
+    const calculateTotalTokens = useCallback((messages) => {
+        let total = 0;
+        for (const msg of messages) {
+            total += estimateTokens(msg.content);
+        }
+        return total;
+    }, [estimateTokens]);
     const [state, setState] = useState({
         screen: 'chat',
         messageHistory: [],
@@ -63,7 +94,7 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
         autoAcceptMode: false,
         isLoading: false,
         loadingMessage: '',
-        currentModel: initialModel || 'gemini-2.0-flash-exp',
+        currentModel: initialModel || 'gemini-2.5-flash',
         planMode: initialPlanMode || false,
         commandMode: false,
         currentWorkingDirectory: process.cwd(),
@@ -72,6 +103,9 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
         subshellContext: undefined,
         versionInfo: undefined,
         checkingVersion: true,
+        isAiWorking: false,
+        currentTokens: 0,
+        maxTokens: getMaxTokensForModel(initialModel || 'gemini-2.5-flash'),
         pickerOptions: undefined,
         approvalRequest: undefined,
         planApprovalRequest: undefined,
@@ -98,6 +132,20 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
     React.useEffect(() => {
         autoAcceptRef.current = state.autoAcceptMode;
     }, [state.autoAcceptMode]);
+    // Update token count whenever messages change
+    React.useEffect(() => {
+        const allMessages = [...state.messageHistory];
+        if (state.currentMessage) {
+            allMessages.push(state.currentMessage);
+        }
+        const totalTokens = calculateTotalTokens(allMessages);
+        if (totalTokens !== state.currentTokens) {
+            setState(prev => ({
+                ...prev,
+                currentTokens: totalTokens
+            }));
+        }
+    }, [state.messageHistory, state.currentMessage, calculateTotalTokens]);
     // Track if we're currently streaming
     const isStreamingRef = React.useRef(false);
     // Set up callback to receive streaming chunks - only once on mount
@@ -105,33 +153,131 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
         onResponseStream((chunk) => {
             isStreamingRef.current = true; // Mark that we're streaming
             setState(prev => {
-                // If we don't have a current assistant message, create one
+                // If we have a current assistant message (possibly created by thoughts), append to it
+                if (prev.currentMessage && prev.currentMessage.role === 'assistant') {
+                    return {
+                        ...prev,
+                        currentMessage: {
+                            ...prev.currentMessage,
+                            content: prev.currentMessage.content + chunk
+                        },
+                        isAiWorking: true // Keep AI working state active
+                    };
+                }
+                // Otherwise create a new message
+                const now = new Date();
+                const newMessage = {
+                    id: `assistant-${Date.now()}-${Math.random().toString(36).substring(2, 11)}`,
+                    role: 'assistant',
+                    content: chunk,
+                    timestamp: now,
+                    shouldStream: true // AI responses should stream
+                };
+                return {
+                    ...prev,
+                    currentMessage: newMessage,
+                    isLoading: false,
+                    isAiWorking: true // AI is actively working
+                };
+            });
+        });
+    }, [onResponseStream]);
+    // Set up callback to receive thought chunks
+    React.useEffect(() => {
+        onThoughtStream((thought) => {
+            // Debug logging to file
+            try {
+                fs.appendFileSync('cli_frontend_logs.txt', `[${new Date().toISOString()}] [App] Received thought: ${thought.substring(0, 100)}\n`);
+            }
+            catch (e) {
+                // Ignore logging errors
+            }
+            setState(prev => {
+                // If we don't have a current assistant message, create one for the thoughts
                 if (!prev.currentMessage || prev.currentMessage.role !== 'assistant') {
+                    try {
+                        fs.appendFileSync('cli_frontend_logs.txt', `[${new Date().toISOString()}] [App] Creating new assistant message for thoughts\n`);
+                    }
+                    catch (e) {
+                        // Ignore logging errors
+                    }
                     const now = new Date();
+                    const newLines = thought.split('\n').filter(line => line.trim());
+                    const last3Lines = newLines.slice(-3);
                     const newMessage = {
                         id: `assistant-${Date.now()}-${Math.random().toString(36).substring(2, 11)}`,
                         role: 'assistant',
-                        content: chunk,
+                        content: '', // Empty content initially, will be filled when text arrives
                         timestamp: now,
-                        shouldStream: true // AI responses should stream
+                        shouldStream: true,
+                        thoughts: last3Lines
                     };
                     return {
                         ...prev,
                         currentMessage: newMessage,
-                        isLoading: false
+                        isLoading: false,
+                        isAiWorking: true
                     };
                 }
-                // Otherwise append chunk to existing message
+                // Split thought into lines and keep only last 3
+                const newLines = thought.split('\n').filter(line => line.trim());
+                const existingThoughts = prev.currentMessage.thoughts || [];
+                const allLines = [...existingThoughts, ...newLines];
+                const last3Lines = allLines.slice(-3);
+                try {
+                    fs.appendFileSync('cli_frontend_logs.txt', `[${new Date().toISOString()}] [App] Updating thoughts: ${JSON.stringify(last3Lines)}\n`);
+                }
+                catch (e) {
+                    // Ignore logging errors
+                }
                 return {
                     ...prev,
                     currentMessage: {
                         ...prev.currentMessage,
-                        content: prev.currentMessage.content + chunk
+                        thoughts: last3Lines,
+                        thinkingDuration: undefined // Clear duration while thinking
                     }
                 };
             });
         });
-    }, [onResponseStream]);
+    }, [onThoughtStream]);
+    // Set up callback for when thinking completes
+    React.useEffect(() => {
+        onThoughtComplete((durationSeconds) => {
+            try {
+                fs.appendFileSync('cli_frontend_logs.txt', `[${new Date().toISOString()}] [App] onThoughtComplete called with ${durationSeconds}s\n`);
+            }
+            catch (e) {
+                // Ignore
+            }
+            setState(prev => {
+                // Only update if we have a current assistant message
+                if (!prev.currentMessage || prev.currentMessage.role !== 'assistant') {
+                    try {
+                        fs.appendFileSync('cli_frontend_logs.txt', `[${new Date().toISOString()}] [App] No current assistant message for thought completion\n`);
+                    }
+                    catch (e) {
+                        // Ignore
+                    }
+                    return prev;
+                }
+                try {
+                    fs.appendFileSync('cli_frontend_logs.txt', `[${new Date().toISOString()}] [App] Setting thinkingDuration to ${durationSeconds}s on message ${prev.currentMessage.id}\n`);
+                }
+                catch (e) {
+                    // Ignore
+                }
+                return {
+                    ...prev,
+                    currentMessage: {
+                        ...prev.currentMessage,
+                        thoughts: undefined, // Clear thoughts
+                        thinkingDuration: durationSeconds // Set duration
+                    }
+                };
+            });
+        });
+    }, [onThoughtComplete]);
     // Set up callback to receive complete responses (for slash commands and non-streaming responses)
     React.useEffect(() => {
         onResponseReceived((message) => {
@@ -148,7 +294,8 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
                             return {
                                 ...prev,
                                 currentMessage: null,
-                                isLoading: false
+                                isLoading: false,
+                                isAiWorking: false // AI finished working
                             };
                         }
                         // Create complete message with full content
@@ -161,12 +308,14 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
                             ...prev,
                             messageHistory: [...prev.messageHistory, completeMessage],
                             currentMessage: null,
-                            isLoading: false
+                            isLoading: false,
+                            isAiWorking: false // AI finished working
                         };
                     }
                     return {
                         ...prev,
-                        isLoading: false
+                        isLoading: false,
+                        isAiWorking: false // AI finished working
                     };
                 });
                 return;
@@ -187,7 +336,8 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
                         ...prev,
                         messageHistory: [...prev.messageHistory, outputMessage],
                         currentMessage: null,
-                        isLoading: false
+                        isLoading: false,
+                        isAiWorking: false // AI finished working
                     };
                 }
                 // For non-streaming responses (like slash commands), display the complete message
@@ -205,14 +355,16 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
                         ...prev,
                         messageHistory: [...prev.messageHistory, prev.currentMessage],
                         currentMessage: newMessage,
-                        isLoading: false
+                        isLoading: false,
+                        isAiWorking: false // AI finished working
                     };
                 }
                 // Otherwise just set as current
                 return {
                     ...prev,
                     currentMessage: newMessage,
-                    isLoading: false
+                    isLoading: false,
+                    isAiWorking: false // AI finished working
                 };
             });
         });
@@ -244,36 +396,47 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
                     timestamp: new Date(),
                     toolExecution: { ...update }
                 };
-                // If current message is a tool with same name and executing, update it
+                // If current message is a tool with same name and executing, update it in place
                 if (prev.currentMessage?.role === 'tool' &&
                     prev.currentMessage.toolExecution?.toolName === update.toolName &&
                     prev.currentMessage.toolExecution?.status === 'executing' &&
                     update.status !== 'executing') {
-                    // Move completed tool to history
+                    // Tool completed - update in place and keep as current
                     return {
                         ...prev,
-                        messageHistory: [...prev.messageHistory, { ...prev.currentMessage, toolExecution: { ...update } }],
-                        currentMessage: null
+                        currentMessage: { ...prev.currentMessage, toolExecution: { ...update } },
+                        isAiWorking: true // Keep AI working state active (more tool calls or response may follow)
                     };
                 }
-                // If starting new tool execution, move current to history if exists
+                // If starting new tool execution
                 if (update.status === 'executing') {
-                    // If there's a current assistant message being streamed, move it to history first
-                    const newHistory = prev.currentMessage && prev.currentMessage.role === 'assistant'
-                        ? [...prev.messageHistory, prev.currentMessage]
-                        : prev.messageHistory;
+                    // IMPORTANT: Always preserve current message by moving it to history first
+                    let newHistory = prev.messageHistory;
+                    if (prev.currentMessage) {
+                        // Move ANY current message to history before showing tool
+                        newHistory = [...prev.messageHistory, prev.currentMessage];
+                    }
                     return {
                         ...prev,
                         messageHistory: newHistory,
                         currentMessage: toolMessage,
-                        isLoading: false // Clear loading state when tool starts
+                        isLoading: false,
+                        isAiWorking: true
                     };
                 }
-                // For completed tools without a current executing one, add directly to history
+                // For completed tools without a current executing one
+                // IMPORTANT: Preserve current message before adding tool to history
+                let newHistory = prev.messageHistory;
+                // If there's a current message, move it to history first
+                if (prev.currentMessage) {
+                    newHistory = [...prev.messageHistory, prev.currentMessage];
+                }
+                // Add tool message to history
                 return {
                     ...prev,
-                    messageHistory: [...prev.messageHistory, toolMessage],
-                    currentMessage: null
+                    messageHistory: [...newHistory, toolMessage],
+                    currentMessage: null,
+                    isAiWorking: true // Keep AI working state active
                 };
             });
         });
@@ -303,22 +466,27 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
                             resolve: (approved) => {
                                 // Clear screen and return to chat
                                 clearScreen();
-                                // Add approval result to chat history
-                                const resultMessage = {
-                                    id: `approval-result-${Date.now()}-${Math.random().toString(36).substring(2, 11)}`,
-                                    role: 'system',
-                                    content: approved
-                                        ? `✓ ${request.operationType === 'write_file' ? 'File write' : request.operationType === 'edit_file' ? 'File edit' : 'Command'} approved`
-                                        : `✗ ${request.operationType === 'write_file' ? 'File write' : request.operationType === 'edit_file' ? 'File edit' : 'Command'} declined`,
-                                    timestamp: new Date()
-                                };
                                 // Switch back to chat and clear approval request
-                                setState(prev => ({
-                                    ...prev,
-                                    screen: 'chat',
-                                    approvalRequest: undefined,
-                                    messageHistory: [...prev.messageHistory, resultMessage]
-                                }));
+                                setState(prev => {
+                                    const nextState = {
+                                        ...prev,
+                                        screen: 'chat',
+                                        approvalRequest: undefined,
+                                    };
+                                    if (!approved) {
+                                        const resultMessage = {
+                                            id: `approval-result-${Date.now()}-${Math.random().toString(36).substring(2, 11)}`,
+                                            role: 'system',
+                                            content: `✗ ${request.operationType === 'write_file' ? 'File write' : request.operationType === 'edit_file' ? 'File edit' : 'Command'} declined`,
+                                            timestamp: new Date()
+                                        };
+                                        return {
+                                            ...nextState,
+                                            messageHistory: [...prev.messageHistory, resultMessage]
+                                        };
+                                    }
+                                    return nextState;
+                                });
                                 resolve(approved);
                             }
                         },
@@ -338,21 +506,26 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
                             operationType: request.operationType,
                             operationDetails: request.operationDetails,
                             resolve: (approved) => {
-                                // Add approval result to chat history
-                                const resultMessage = {
-                                    id: `approval-result-${Date.now()}-${Math.random().toString(36).substring(2, 11)}`,
-                                    role: 'system',
-                                    content: approved
-                                        ? `✓ Command approved`
-                                        : `✗ Command declined`,
-                                    timestamp: new Date()
-                                };
-                                // Clear approval request and add result to history
-                                setState(prev => ({
-                                    ...prev,
-                                    approvalRequest: undefined,
-                                    messageHistory: [...prev.messageHistory, resultMessage]
-                                }));
+                                // Clear approval request
+                                setState(prev => {
+                                    const nextState = {
+                                        ...prev,
+                                        approvalRequest: undefined,
+                                    };
+                                    if (!approved) {
+                                        const resultMessage = {
+                                            id: `approval-result-${Date.now()}-${Math.random().toString(36).substring(2, 11)}`,
+                                            role: 'system',
+                                            content: `✗ Command declined`,
+                                            timestamp: new Date()
+                                        };
+                                        return {
+                                            ...nextState,
+                                            messageHistory: [...prev.messageHistory, resultMessage]
+                                        };
+                                    }
+                                    return nextState;
+                                });
                                 resolve(approved);
                             }
                         },
@@ -412,6 +585,15 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
             }));
         });
     }, [onCwdChange]);
+    // Set up callback to receive model changes
+    React.useEffect(() => {
+        onModelChange((modelName) => {
+            setState(prev => ({
+                ...prev,
+                currentModel: modelName
+            }));
+        });
+    }, [onModelChange]);
     // Set up callback to receive subshell context changes
     React.useEffect(() => {
         onSubshellContextChange((context) => {
@@ -493,10 +675,11 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
         // Ctrl+C handling - double press to exit
         if (key.ctrl && input === 'c') {
             // If AI is loading/executing, first Ctrl+C cancels the operation
-            if (state.isLoading) {
+            if (state.isLoading || state.isAiWorking) {
                 setState(prev => ({
                     ...prev,
                     isLoading: false,
+                    isAiWorking: false,
                     currentMessage: null,
                     showExitWarning: true
                 }));
@@ -567,7 +750,8 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
                 ...prev,
                 messageHistory: [],
                 currentMessage: null,
-                isLoading: false
+                isLoading: false,
+                currentTokens: 0
             }));
             // Still call onMessage to clear backend history
             try {
@@ -597,6 +781,7 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
                     messageHistory: [...newHistory, commandMessage],
                     currentMessage: null,
                     isLoading: false,
+                    isAiWorking: false, // Command mode doesn't use AI
                 };
             });
         }
@@ -620,6 +805,7 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
                     currentMessage: null,
                     isLoading: true,
                     loadingMessage: 'Processing your request...',
+                    isAiWorking: true // AI is starting to work
                 };
             });
         }
@@ -629,6 +815,7 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
                 ...prev,
                 isLoading: true,
                 loadingMessage: 'Processing command...',
+                isAiWorking: true // AI is starting to work
             }));
         }
         // Add to command history (avoid duplicates of the last command)
@@ -658,14 +845,16 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
                     ...prev,
                     messageHistory: newHistory,
                     currentMessage: null,
-                    isLoading: false
+                    isLoading: false,
+                    isAiWorking: false // AI finished working
                 };
             });
         }
         finally {
             setState(prev => ({
                 ...prev,
-                isLoading: false
+                isLoading: false,
+                isAiWorking: false // AI finished working
             }));
         }
     }, [onMessage]);
@@ -675,18 +864,16 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
             autoAcceptMode: !prev.autoAcceptMode
         }));
     }, []);
-    // Check if there are any executing tools to avoid double spinners
-    const hasExecutingTools = React.useMemo(() => state.currentMessage?.role === 'tool' && state.currentMessage?.toolExecution?.status === 'executing', [state.currentMessage]);
     return (React.createElement(Box, { flexDirection: "column" },
         state.screen === 'chat' && (React.createElement(React.Fragment, null,
             React.createElement(MessageList, { history: state.messageHistory, current: state.currentMessage, showBanner: true }),
-            state.isLoading && !hasExecutingTools && React.createElement(LoadingIndicator, { key: "loading-indicator" }),
+            state.isAiWorking && React.createElement(LoadingIndicator, { key: "loading-indicator" }),
             state.approvalRequest ? (React.createElement(ApprovalSection, { key: `approval-${state.approvalRequest.message}`, approvalRequest: state.approvalRequest, onApprove: (approved) => {
                     const resolve = state.approvalRequest?.resolve;
                     if (resolve) {
                         resolve(approved);
                     }
-                } })) : (React.createElement(InputBox, { key: "input-box", onSubmit: handleSubmit, autoAcceptMode: state.autoAcceptMode, model: state.currentModel, planMode: state.planMode, commandMode: state.commandMode, currentWorkingDirectory: state.currentWorkingDirectory, commandHistory: state.commandHistory, onToggleAutoAccept: handleToggleAutoAccept, onToggleCommandMode: onToggleCommandMode, isActive: true, subshellContext: state.subshellContext })),
+                } })) : (React.createElement(InputBox, { key: "input-box", onSubmit: handleSubmit, autoAcceptMode: state.autoAcceptMode, model: state.currentModel, planMode: state.planMode, commandMode: state.commandMode, currentWorkingDirectory: state.currentWorkingDirectory, commandHistory: state.commandHistory, onToggleAutoAccept: handleToggleAutoAccept, onToggleCommandMode: onToggleCommandMode, isActive: true, subshellContext: state.subshellContext, currentTokens: state.currentTokens, maxTokens: state.maxTokens })),
             state.showExitWarning && (React.createElement(Box, { marginTop: 1 },
                 React.createElement(Text, { color: "#ffaa00", bold: true }, "\u26A0\uFE0F  Press Ctrl+C again to exit"))))),
         state.screen === 'approval' && state.approvalRequest && (React.createElement(ApprovalSection, { key: `approval-${state.approvalRequest.message}`, approvalRequest: state.approvalRequest, onApprove: (approved) => {
@@ -700,8 +887,13 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
                 setState(prev => ({ ...prev, screen: 'chat', isLoading: true }));
                 try {
                     await onPickerSelection(value, state.pickerOptions.type);
-                    // Update currentModel (picker is always for model selection now)
-                    setState(prev => ({ ...prev, currentModel: value, isLoading: false }));
+                    // Model name will be updated via onModelChange callback
+                    // Just update loading state here
+                    setState(prev => ({
+                        ...prev,
+                        isLoading: false,
+                        isAiWorking: false
+                    }));
                 }
                 catch (error) {
                     setState(prev => {
@@ -715,7 +907,8 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
                             ...prev,
                             messageHistory: [...prev.messageHistory, errorMessage],
                             currentMessage: null,
-                            isLoading: false
+                            isLoading: false,
+                            isAiWorking: false
                         };
                     });
                 }
@@ -741,7 +934,8 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
                         ...prev,
                         screen: 'chat',
                         planApprovalRequest: undefined,
-                        isLoading: true
+                        isLoading: true,
+                        isAiWorking: true
                     }));
                 }, onNo: () => {
                     const resolve = state.planApprovalRequest?.resolve;
@@ -779,8 +973,14 @@ export const App = ({ onMessage, initialModel, initialPlanMode, onResponseReceiv
                     });
                     installProcess.on('close', (code) => {
                         if (code === 0) {
-                            console.log('\n✅ Update complete!\n');
-                            console.log('Please run "centaurus" again to start the updated version.\n');
+                            console.log('\n✅ Update complete! Restarting Centaurus CLI...\n');
+                            // Restart the CLI
+                            const restartProcess = spawn('centaurus', [], {
+                                stdio: 'inherit',
+                                shell: true,
+                                detached: true
+                            });
+                            restartProcess.unref();
                             process.exit(0);
                         }
                         else {