centaurus-cli 2.9.9 → 3.0.0

package/dist/ui/components/App.js

@@ -175,7 +175,7 @@ const RenameInputScreen = ({ currentTitle, onRename, onCancel }) => {
         React.createElement(Box, { marginTop: 1 },
             React.createElement(Text, { dimColor: true }, "Press Enter to save, ESC to cancel"))));
 };
-export const App = ({ onMessage, onCancelRequest, initialModel, initialPlanMode, onResponseReceived, onDirectMessage, onResponseStream, onClearStreamedResponse, onThoughtStream, onThoughtComplete, onPickerSetup, onPickerSelection, onToolExecutionUpdate, onToolApprovalRequest, onToolStreamingOutput, onPlanModeChange, onPlanApprovalRequest, onPlanCreated, onTaskCompleted, onCommandModeChange, onToggleCommandMode, onBackgroundModeChange, onToggleBackgroundMode, onBackgroundTaskCountChange, onSubAgentCountChange, onSetAutoModeSetup, onCwdChange, onModelChange, onSubshellContextChange, onPasswordRequest, onShellInput, onShellSignal, onKillProcess, onInteractiveEditorMode, onConnectionStatusUpdate, onTokenCountUpdate, onContextLimitReached, onChatPickerSetup, onChatPickerSelection, onChatDeletePickerSetup, onChatDeletePickerSelection, onChatListSetup, onChatRenamePickerSetup, onChatRename, onRestoreMessagesSetup, onUIMessageHistoryUpdate, onBackgroundTaskListSetup, onBackgroundTaskSelection, onBackgroundTaskCancelSetup, onBackgroundTaskCancel, onBackgroundTaskViewSetup, onSessionQuotaUpdate, onMCPAddScreenSetup, onMCPRemoveScreenSetup, onMCPEnableScreenSetup, onMCPDisableScreenSetup, onMCPListScreenSetup, onMCPAddServer, onMCPRemoveServer, onMCPEnableServer, onMCPDisableServer, onMCPValidateConfig, onPromptAnswered, getMainConversation, onWarpifySession, onAiAutoSuggestChange, onWorkflowCreatorSetup, onWorkflowSave, getCheckpoints, onRevertToCheckpointSetup, onSetInputSetup }) => {
+export const App = ({ onMessage, onCancelRequest, initialModel, initialPlanMode, onResponseReceived, onDirectMessage, onResponseStream, onClearStreamedResponse, onThoughtStream, onThoughtComplete, onPickerSetup, onPickerSelection, onToolExecutionUpdate, onToolApprovalRequest, onToolStreamingOutput, onPlanModeChange, onPlanApprovalRequest, onPlanCreated, onTaskCompleted, onCommandModeChange, onToggleCommandMode, onBackgroundModeChange, onToggleBackgroundMode, onBackgroundTaskCountChange, onSubAgentCountChange, onSetAutoModeSetup, onCwdChange, onModelChange, onSubshellContextChange, onPasswordRequest, onShellInput, onShellSignal, onKillProcess, onInteractiveEditorMode, onConnectionStatusUpdate, onTokenCountUpdate, onContextLimitReached, onChatPickerSetup, onChatPickerSelection, onChatDeletePickerSetup, onChatDeletePickerSelection, onChatListSetup, onChatRenamePickerSetup, onChatRename, onRestoreMessagesSetup, onUIMessageHistoryUpdate, onBackgroundTaskListSetup, onBackgroundTaskSelection, onBackgroundTaskCancelSetup, onBackgroundTaskCancel, onBackgroundTaskViewSetup, onSessionQuotaUpdate, onMCPAddScreenSetup, onMCPRemoveScreenSetup, onMCPEnableScreenSetup, onMCPDisableScreenSetup, onMCPListScreenSetup, onMCPAddServer, onMCPRemoveServer, onMCPEnableServer, onMCPDisableServer, onMCPValidateConfig, onPromptAnswered, getMainConversation, onWarpifySession, onAiAutoSuggestChange, onWorkflowCreatorSetup, onWorkflowSave, getCheckpoints, onRevertToCheckpointSetup, onSetInputSetup, onInterruptQueueUpdate, onQueuedMessageDispatched }) => {
     const { exit } = useApp();
     // Calculate limit for paginated lists (75% of terminal height)
     const listLimit = Math.max(5, Math.floor((process.stdout.rows || 24) * 0.75));
@@ -254,6 +254,7 @@ export const App = ({ onMessage, onCancelRequest, initialModel, initialPlanMode,
         sessionQuotaExhausted: false,
         sessionQuotaTimeRemaining: '',
         aiAutoSuggest: false,
+        interruptQueue: [],
     });
     // Track last terminal width to detect actual width changes
     const lastTerminalWidthRef = React.useRef(process.stdout.columns || 80);
@@ -405,6 +406,38 @@ export const App = ({ onMessage, onCancelRequest, initialModel, initialPlanMode,
             InputDetectionAgent.updateOutput(state.shellState.shellId, state.shellState.output);
         }
     }, [state.shellState?.output, state.shellState?.isAgentControlled, state.shellState?.shellId]);
+    // Handle interrupt queue updates
+    React.useEffect(() => {
+        onInterruptQueueUpdate((queue) => {
+            setState(prev => ({ ...prev, interruptQueue: [...queue] }));
+        });
+    }, [onInterruptQueueUpdate]);
+    // Handle queued message dispatch: add user message to history when it's actually being processed
+    // This ensures the correct order: only show the message when it's the AI's next turn, not when queued
+    React.useEffect(() => {
+        onQueuedMessageDispatched((message) => {
+            setState(prev => {
+                const userMessage = {
+                    id: `user-queued-${Date.now()}-${Math.random().toString(36).substring(2, 11)}`,
+                    role: 'user',
+                    content: message,
+                    timestamp: new Date()
+                };
+                // Move current message to history if present (skip thought-only)
+                const newHistory = prev.currentMessage && !shouldSkipMessage(prev.currentMessage)
+                    ? [...prev.messageHistory, prev.currentMessage, userMessage]
+                    : [...prev.messageHistory, userMessage];
+                return {
+                    ...prev,
+                    messageHistory: newHistory,
+                    currentMessage: null,
+                    isLoading: true,
+                    loadingMessage: 'Processing your request...',
+                    isAiWorking: true
+                };
+            });
+        });
+    }, [onQueuedMessageDispatched]);
     // Ref to track if we should strictly block incoming AI updates (Zombie Agent Protection)
     // This is set to true when an Agent-Controlled shell exits, essentially killing the "AI Agent"
     // associated with it from the UI perspective. It is reset when the user manually inputs a new message.
@@ -2351,34 +2384,10 @@ export const App = ({ onMessage, onCancelRequest, initialModel, initialPlanMode,
             });
         }
         else if (!isSlashCommand) {
-            // Only add user message to display if it's not a slash command
-            // INTERRUPT HANDLING: If AI is currently working, cancel and clean up first
-            // This allows the new message to replace the interrupted turn
-            if (state.isAiWorking || state.isLoading) {
-                // Cancel current request (cli-adapter will clean up its history)
-                onCancelRequest();
-                // Small delay to allow abort to propagate before new request starts
-                await new Promise(resolve => setTimeout(resolve, 50));
-                // Clean up UI state: remove any partial/interrupted messages
-                setState(prev => {
-                    // Filter out the last user message (the one we're replacing)
-                    let cleanedHistory = [...prev.messageHistory];
-                    for (let i = cleanedHistory.length - 1; i >= 0; i--) {
-                        if (cleanedHistory[i].role === 'user') {
-                            cleanedHistory.splice(i, 1);
-                            break; // Only remove the most recent user message
-                        }
-                    }
-                    return {
-                        ...prev,
-                        messageHistory: cleanedHistory,
-                        currentMessage: null,
-                        isLoading: false,
-                        isAiWorking: false,
-                        approvalRequest: undefined, // Clear any pending approval
-                    };
-                });
-            }
+            // Only add user message to display if it's not a slash command.
+            // The user message is added to messageHistory via the onQueuedMessageDispatched
+            // callback (fired by cli-adapter at the very start of processing, for both direct
+            // messages and queued interrupts). This ensures correct ordering and no duplicates.
             // Show user message IMMEDIATELY with file breadcrumbs (uploading state)
             // Files will be uploaded in background, then AI will be called
             const hasFilesToUpload = clipboardFiles && clipboardFiles.length > 0;
@@ -2396,25 +2405,16 @@ export const App = ({ onMessage, onCancelRequest, initialModel, initialPlanMode,
             }
             // Generate a stable message ID that we can use to update the message later
             const userMessageId = `user-${Date.now()}-${Math.random().toString(36).substring(2, 11)}`;
-            setState(prev => {
-                const newHistory = prev.currentMessage && !shouldSkipMessage(prev.currentMessage)
-                    ? [...prev.messageHistory, prev.currentMessage]
-                    : prev.messageHistory;
-                const userMessage = {
-                    id: userMessageId,
-                    role: 'user',
-                    content: initialDisplayContent,
-                    timestamp: new Date()
-                };
-                return {
-                    ...prev,
-                    messageHistory: [...newHistory, userMessage],
-                    currentMessage: null,
-                    isLoading: true,
-                    loadingMessage: hasFilesToUpload ? 'Uploading file(s)...' : 'Processing your request...',
-                    isAiWorking: true
-                };
-            });
+            // Update loading state immediately so the UI shows "processing" feedback.
+            // Note: we do NOT add to messageHistory here — that is handled by the
+            // onQueuedMessageDispatched callback which fires synchronously inside
+            // cli-adapter.handleMessage before AI processing begins.
+            setState(prev => ({
+                ...prev,
+                isLoading: true,
+                loadingMessage: hasFilesToUpload ? 'Uploading file(s)...' : 'Processing your request...',
+                isAiWorking: true
+            }));
         }
         else {
             // For slash commands, just show loading state
@@ -2775,6 +2775,13 @@ export const App = ({ onMessage, onCancelRequest, initialModel, initialPlanMode,
                 !(state.currentMessage?.toolExecution?.status === 'executing') && (React.createElement(Box, { marginBottom: 1, paddingLeft: 1 },
                 React.createElement(LoadingIndicator, { key: "loading-indicator" }),
                 React.createElement(AgentTimer, { key: "agent-timer" }))),
+            state.interruptQueue && state.interruptQueue.length > 0 && (React.createElement(Box, { flexDirection: "column", marginBottom: 1 }, state.interruptQueue.map((msg, i) => (React.createElement(Text, { key: `interrupt-${i}`, color: "gray", dimColor: true },
+                "[Queued Interrupt ",
+                i + 1,
+                "/",
+                state.interruptQueue.length,
+                "] ",
+                msg))))),
             !state.shellState?.isFocused && (state.passwordRequest ? (React.createElement(PasswordPrompt, { message: state.passwordRequest.message, onSubmit: (password) => {
                     const resolve = state.passwordRequest?.resolve;
                     if (resolve) {