AXON-1938 RovoDev: Fixed MCP permission race condition - users can now type their prompts while MCP permission dialogs are displayed. The send button is disabled during MCP acceptance, but the input remains editable to prevent loss of user input. (#1654)

* - **RovoDev**: Fixed MCP permission race condition - users can now type their prompts while MCP permission dialogs are displayed. The send button is disabled during MCP acceptance, but the input remains editable to prevent loss of user input.

* PR Comments

* PR comments

* changelog typo

---------

Co-authored-by: teg-atlassian <tzewdie@atlassian.com>

Author: bwieger-atlassian-com

CHANGELOG.md

@@ -9,8 +9,9 @@
 
 ## What's new in 4.0.21
 
-### Bug fixes
+### Bug Fixes
 
+- **RovoDev**: Fixed MCP permission race condition - users can now type their prompts while MCP permission dialogs are displayed. The send button is disabled during MCP acceptance, but the input remains editable to prevent loss of user input.
 - Fixed issue description losing line breaks and formatting in edit mode after save (HTML-to-ADF conversion now preserves line breaks as hardBreak nodes)
 
 ## What's new in 4.0.20
@@ -31,13 +32,7 @@
 - Jira Data Center: fixed errors when adding or updating comments (comment body is now sent as string for DC, ADF for Cloud)
 - Jira DC: fixed updating issue description (description is sent as WikiMarkup string for DC, ADF for Cloud)
 - Jira DC: user mentions in comments and description now show the correct username instead of @unknown
-
-### Bug Fixes
-
 - Fixed Rovo Dev UI crashes when markdown content fails to parse
-
-### Bug Fixes
-
 - Improved error messages when git user.name or user.email is not configured, providing helpful setup instructions
 
 ## What's new in 4.0.19

src/rovo-dev/ui/prompt-box/prompt-input/PromptInput.tsx

@@ -33,7 +33,8 @@ import {
 type NonDisabledState = Exclude<State, DisabledState>;
 
 interface PromptInputBoxProps {
-    disabled?: boolean;
+    disableSendButton?: boolean;
+    readOnly?: boolean;
     hideButtons?: boolean;
     currentState: NonDisabledState;
     isDeepPlanEnabled: boolean;
@@ -116,7 +117,8 @@ function createEditor(setIsEmpty: (isEmpty: boolean) => void) {
 }
 
 export const PromptInputBox: React.FC<PromptInputBoxProps> = ({
-    disabled,
+    disableSendButton,
+    readOnly,
     currentState,
     isDeepPlanEnabled,
     isYoloModeEnabled,
@@ -226,10 +228,10 @@ export const PromptInputBox: React.FC<PromptInputBoxProps> = ({
             (currentState.state === 'Initializing' && currentState.isPromptPending);
 
         editor.updateOptions({
-            readOnly: disabled,
+            readOnly: readOnly,
             placeholder: getTextAreaPlaceholder(isGeneratingResponse, currentState),
         });
-    }, [currentState, editor, disabled]);
+    }, [currentState, editor, readOnly]);
 
     // Focus the editor when it becomes visible in the viewport - helps with opening Rovo Dev panel already focused
     React.useEffect(() => {
@@ -404,7 +406,7 @@ export const PromptInputBox: React.FC<PromptInputBoxProps> = ({
                                 id="bordered-button"
                                 aria-label="stop"
                                 onClick={() => onCancel()}
-                                disabled={disabled || currentState.state === 'CancellingResponse'}
+                                disabled={disableSendButton || currentState.state === 'CancellingResponse'}
                             >
                                 <VideoStopOverlayIcon color={token('color.icon.danger')} label="Stop" />
                             </button>
@@ -414,7 +416,7 @@ export const PromptInputBox: React.FC<PromptInputBoxProps> = ({
                             className="prompt-button-primary"
                             aria-label="send"
                             onClick={() => handleSend()}
-                            disabled={disabled || !isWaitingForPrompt || isEmpty}
+                            disabled={disableSendButton || !isWaitingForPrompt || isEmpty}
                         >
                             <SendIcon label="Send prompt" />
                         </button>

src/rovo-dev/ui/rovoDevView.tsx

@@ -1037,8 +1037,10 @@ const RovoDevView: React.FC = () => {
         });
     }, [postMessage, isFullContextModeToggled]);
 
-    const hidePromptBox =
-        currentState.state === 'Disabled' ||
+    const hidePromptBox = currentState.state === 'Disabled';
+
+    const disableSendButton =
+        currentState.state === 'ProcessTerminated' ||
         (currentState.state === 'Initializing' && currentState.subState === 'MCPAcceptance');
 
     return (
@@ -1173,7 +1175,8 @@ const RovoDevView: React.FC = () => {
                                             openJira={openJira}
                                         />
                                         <PromptInputBox
-                                            disabled={currentState.state === 'ProcessTerminated'}
+                                            disableSendButton={disableSendButton}
+                                            readOnly={currentState.state === 'ProcessTerminated'}
                                             currentState={currentState}
                                             isDeepPlanEnabled={isDeepPlanToggled}
                                             isYoloModeEnabled={isYoloModeToggled}