@gitlab/duo-ui 15.0.4 → 15.0.5

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [15.0.5](https://gitlab.com/gitlab-org/duo-ui/compare/v15.0.4...v15.0.5) (2025-12-07)
+
+
+### Bug Fixes
+
+* Do not allow to cancel chat while tool is being processed ([41ba989](https://gitlab.com/gitlab-org/duo-ui/commit/41ba9896584762a5d0064d64a6284dd563494b46))
+* Tool approval buttons enabled too fast ([8977579](https://gitlab.com/gitlab-org/duo-ui/commit/897757973ad54ac69a6bfb225df4c88bcda6426b))
+
 ## [15.0.4](https://gitlab.com/gitlab-org/duo-ui/compare/v15.0.3...v15.0.4) (2025-12-03)
 
 

package/dist/components/agentic_chat/agentic_duo_chat.js

@@ -305,11 +305,7 @@ var script = {
   computed: {
     canSubmit() {
       const shouldAllowSubmit = !this.isLoading && !this.isStreaming && !this.isToolApprovalProcessing && !this.isAwaitingToolApproval;
-
-      // Fallback logic: If we're not loading, not streaming, and not awaiting approval,
-      // but isToolApprovalProcessing is stuck at true, we should still enable submit
-      const isStuckInProcessing = !this.isLoading && !this.isStreaming && !this.isAwaitingToolApproval && this.isToolApprovalProcessing;
-      return shouldAllowSubmit || isStuckInProcessing;
+      return shouldAllowSubmit;
     },
     shouldShowThreadList() {
       return this.isMultithreaded && this.currentView === VIEW_TYPES.LIST;
@@ -398,6 +394,13 @@ var script = {
       return Boolean(
       // It is possible to get tool null, so we assert it is truthy to make sure there is a payload
       lastMessage && lastMessage.message_type === 'request' && lastMessage.tool_info);
+    },
+    canCancelInternal() {
+      // Don't allow cancel while there are pending tool approvals
+      if (this.isAwaitingToolApproval) {
+        return false;
+      }
+      return this.canCancel;
     }
   },
   watch: {
@@ -707,7 +710,7 @@ var __vue_render__ = function () {var _vm=this;var _h=_vm.$createElement;var _c=
   },attrs:{"width":_vm.shouldRenderResizable ? _vm.dimensions.width : null,"height":_vm.shouldRenderResizable ? _vm.dimensions.height : null,"max-width":_vm.shouldRenderResizable ? _vm.dimensions.maxWidth : null,"max-height":_vm.shouldRenderResizable ? _vm.dimensions.maxHeight : null,"min-width":_vm.shouldRenderResizable ? _vm.dimensions.minWidth : null,"left":_vm.shouldRenderResizable ? _vm.dimensions.left : null,"top":_vm.shouldRenderResizable ? _vm.dimensions.top : null,"fit-parent":true,"min-height":_vm.shouldRenderResizable ? _vm.dimensions.minHeight : null,"active":_vm.shouldRenderResizable ? ['l', 't', 'lt'] : null},on:{"resize:end":_vm.updateSize}},[(!_vm.isHidden)?_c('aside',{staticClass:"markdown-code-block duo-chat gl-bottom-0 gl-flex gl-max-h-full gl-flex-col",class:{
       'resizable-content': _vm.shouldRenderResizable,
       'duo-chat-drawer': !_vm.shouldRenderResizable,
-    },attrs:{"id":"chat-component","role":"complementary","data-testid":"chat-component"}},[(_vm.showHeader)?_c('duo-chat-header',{ref:"header",attrs:{"active-thread-id":_vm.activeThreadId,"title":_vm.isMultithreaded && _vm.currentView === 'list' ? _vm.$options.i18n.CHAT_HISTORY_TITLE : _vm.title,"subtitle":_vm.activeThreadTitleForView,"error":_vm.error,"is-multithreaded":_vm.isMultithreaded,"current-view":_vm.currentView,"should-render-resizable":_vm.shouldRenderResizable,"badge-type":_vm.isMultithreaded ? null : _vm.badgeType,"session-id":_vm.sessionId,"agents":_vm.agents},on:{"go-back":_vm.onGoBack,"new-chat":_vm.onNewChat,"close":_vm.hideChat},scopedSlots:_vm._u([{key:"subheader",fn:function(){return [_vm._t("subheader")]},proxy:true}],null,true)}):_vm._e(),_vm._v(" "),_c('div',{staticClass:"gl-flex gl-flex-1 gl-flex-grow gl-flex-col gl-overflow-y-auto gl-overscroll-contain gl-bg-inherit",attrs:{"data-testid":"chat-history"},on:{"scroll":_vm.handleScrollingThrottled}},[(_vm.shouldShowThreadList)?_c('duo-chat-threads',{attrs:{"threads":_vm.threadList,"preferred-locale":_vm.preferredLocale},on:{"new-chat":_vm.onNewChat,"select-thread":_vm.onSelectThread,"delete-thread":_vm.onDeleteThread,"close":_vm.hideChat}}):_c('transition-group',{staticClass:"duo-chat-history gl-mt-auto gl-px-4 gl-pb-4 gl-pt-6",attrs:{"mode":"out-in","tag":"section","name":"message"}},[_vm._l((_vm.conversations),function(conversation,index){return _c('duo-chat-conversation',{key:("conversation-" + index),attrs:{"enable-code-insertion":_vm.enableCodeInsertion,"messages":conversation,"show-delimiter":index > 0,"with-feedback":_vm.withFeedback,"is-tool-approval-processing":_vm.isToolApprovalProcessing,"working-directory":_vm.workingDirectory},on:{"track-feedback":_vm.onTrackFeedback,"insert-code-snippet":_vm.onInsertCodeSnippet,"copy-code-snippet":_vm.onCopyCodeSnippet,"copy-message":_vm.onCopyMessage,"get-context-item-content":_vm.onGetContextItemContent,"approve-tool":_vm.onApproveToolCall,"deny-tool":_vm.onDenyToolCall,"open-file-path":_vm.onOpenFilePath}})}),_vm._v(" "),(!_vm.hasMessages && !_vm.isLoading)?[_c('div',{key:"empty-state-message",staticClass:"duo-chat-message gl-rounded-bl-none gl-leading-20 gl-text-gray-900 gl-break-anywhere",attrs:{"data-testid":"gl-duo-chat-empty-state"}},[(_vm.emptyStateTitle)?_c('p',{staticClass:"gl-m-0",attrs:{"data-testid":"gl-duo-chat-empty-state-title"}},[_vm._v("\n              "+_vm._s(_vm.emptyStateTitle)+"\n            ")]):_vm._e(),_vm._v(" "),_c('duo-chat-predefined-prompts',{key:"predefined-prompts",attrs:{"prompts":_vm.predefinedPrompts},on:{"click":_vm.sendPredefinedPrompt}})],1)]:_vm._e(),_vm._v(" "),(_vm.isLoading)?_c('duo-chat-loader',{key:"loader",attrs:{"tool-name":_vm.toolName}}):_vm._e(),_vm._v(" "),_c('div',{key:"anchor",ref:"anchor",staticClass:"scroll-anchor"})],2)],1),_vm._v(" "),(_vm.isChatAvailable && !_vm.shouldShowThreadList)?_c('footer',{staticClass:"duo-chat-drawer-footer gl-relative gl-z-2 gl-shrink-0",attrs:{"data-testid":"chat-footer"}},[(_vm.$scopedSlots['footer-panel'])?_c('div',{staticClass:"gl-relative gl-max-w-full",attrs:{"data-testid":"footer-panel-wrapper"}},[_vm._t("footer-panel")],2):_vm._e(),_vm._v(" "),(_vm.$scopedSlots['footer-actions'])?_c('div',{staticClass:"gl-my-4 gl-flex gl-items-center gl-justify-between gl-gap-x-4 gl-px-4",attrs:{"data-testid":"footer-actions-wrapper"}},[_vm._t("footer-actions")],2):_vm._e(),_vm._v(" "),_c('gl-form',{attrs:{"data-testid":"chat-prompt-form"},on:{"submit":function($event){$event.stopPropagation();$event.preventDefault();return _vm.sendChatPrompt.apply(null, arguments)}}},[_c('div',{staticClass:"gl-relative gl-max-w-full"},[_vm._t("context-items-menu",null,{"isOpen":_vm.contextItemsMenuIsOpen,"onClose":_vm.closeContextItemsMenuOpen,"setRef":_vm.setContextItemsMenuRef,"focusPrompt":_vm.focusChatInput})],2),_vm._v(" "),_c('gl-form-input-group',{scopedSlots:_vm._u([{key:"append",fn:function(){return [(_vm.canSubmit)?_c('gl-button',{staticClass:"!gl-absolute gl-bottom-2 gl-right-2 !gl-rounded-full",attrs:{"icon":"paper-airplane","category":"primary","variant":"confirm","type":"submit","disabled":_vm.isPromptEmpty || !_vm.hasValidPrompt,"data-testid":"chat-prompt-submit-button","aria-label":_vm.$options.i18n.CHAT_SUBMIT_LABEL}}):_c('gl-button',{staticClass:"!gl-absolute gl-bottom-2 gl-right-2 !gl-rounded-full",attrs:{"icon":"stop","category":"primary","variant":"default","data-testid":"chat-prompt-cancel-button","aria-label":_vm.$options.i18n.CHAT_CANCEL_LABEL,"disabled":!_vm.canCancel},on:{"click":_vm.cancelPrompt}})]},proxy:true}],null,false,2657534213)},[_c('div',{staticClass:"duo-chat-input gl-min-h-8 gl-max-w-full gl-grow gl-align-top",attrs:{"data-value":_vm.prompt}},[(_vm.shouldShowSlashCommands)?_c('gl-card',{ref:"commands",staticClass:"slash-commands !gl-absolute gl-w-full -gl-translate-y-full gl-list-none gl-pl-0 gl-shadow-md",attrs:{"body-class":"!gl-p-2"}},_vm._l((_vm.filteredSlashCommands),function(command,index){return _c('gl-dropdown-item',{key:command.name,class:{ 'active-command': index === _vm.activeCommandIndex },on:{"click":function($event){return _vm.selectSlashCommand(index)}},nativeOn:{"mouseenter":function($event){_vm.activeCommandIndex = index;}}},[_c('span',{staticClass:"gl-flex gl-justify-between"},[_c('span',{staticClass:"gl-block"},[_vm._v(_vm._s(command.name))]),_vm._v(" "),_c('small',{staticClass:"gl-pl-3 gl-text-right gl-italic gl-text-subtle"},[_vm._v(_vm._s(command.description))])])])}),1):_vm._e(),_vm._v(" "),_c('gl-form-textarea',{ref:"prompt",attrs:{"disabled":!_vm.canSubmit,"data-testid":"chat-prompt-input","placeholder":_vm.inputPlaceholder,"character-count-limit":_vm.maxPromptLength,"textarea-classes":[
+    },attrs:{"id":"chat-component","role":"complementary","data-testid":"chat-component"}},[(_vm.showHeader)?_c('duo-chat-header',{ref:"header",attrs:{"active-thread-id":_vm.activeThreadId,"title":_vm.isMultithreaded && _vm.currentView === 'list' ? _vm.$options.i18n.CHAT_HISTORY_TITLE : _vm.title,"subtitle":_vm.activeThreadTitleForView,"error":_vm.error,"is-multithreaded":_vm.isMultithreaded,"current-view":_vm.currentView,"should-render-resizable":_vm.shouldRenderResizable,"badge-type":_vm.isMultithreaded ? null : _vm.badgeType,"session-id":_vm.sessionId,"agents":_vm.agents},on:{"go-back":_vm.onGoBack,"new-chat":_vm.onNewChat,"close":_vm.hideChat},scopedSlots:_vm._u([{key:"subheader",fn:function(){return [_vm._t("subheader")]},proxy:true}],null,true)}):_vm._e(),_vm._v(" "),_c('div',{staticClass:"gl-flex gl-flex-1 gl-flex-grow gl-flex-col gl-overflow-y-auto gl-overscroll-contain gl-bg-inherit",attrs:{"data-testid":"chat-history"},on:{"scroll":_vm.handleScrollingThrottled}},[(_vm.shouldShowThreadList)?_c('duo-chat-threads',{attrs:{"threads":_vm.threadList,"preferred-locale":_vm.preferredLocale},on:{"new-chat":_vm.onNewChat,"select-thread":_vm.onSelectThread,"delete-thread":_vm.onDeleteThread,"close":_vm.hideChat}}):_c('transition-group',{staticClass:"duo-chat-history gl-mt-auto gl-px-4 gl-pb-4 gl-pt-6",attrs:{"mode":"out-in","tag":"section","name":"message"}},[_vm._l((_vm.conversations),function(conversation,index){return _c('duo-chat-conversation',{key:("conversation-" + index),attrs:{"enable-code-insertion":_vm.enableCodeInsertion,"messages":conversation,"show-delimiter":index > 0,"with-feedback":_vm.withFeedback,"is-tool-approval-processing":_vm.isToolApprovalProcessing,"working-directory":_vm.workingDirectory},on:{"track-feedback":_vm.onTrackFeedback,"insert-code-snippet":_vm.onInsertCodeSnippet,"copy-code-snippet":_vm.onCopyCodeSnippet,"copy-message":_vm.onCopyMessage,"get-context-item-content":_vm.onGetContextItemContent,"approve-tool":_vm.onApproveToolCall,"deny-tool":_vm.onDenyToolCall,"open-file-path":_vm.onOpenFilePath}})}),_vm._v(" "),(!_vm.hasMessages && !_vm.isLoading)?[_c('div',{key:"empty-state-message",staticClass:"duo-chat-message gl-rounded-bl-none gl-leading-20 gl-text-gray-900 gl-break-anywhere",attrs:{"data-testid":"gl-duo-chat-empty-state"}},[(_vm.emptyStateTitle)?_c('p',{staticClass:"gl-m-0",attrs:{"data-testid":"gl-duo-chat-empty-state-title"}},[_vm._v("\n              "+_vm._s(_vm.emptyStateTitle)+"\n            ")]):_vm._e(),_vm._v(" "),_c('duo-chat-predefined-prompts',{key:"predefined-prompts",attrs:{"prompts":_vm.predefinedPrompts},on:{"click":_vm.sendPredefinedPrompt}})],1)]:_vm._e(),_vm._v(" "),(_vm.isLoading)?_c('duo-chat-loader',{key:"loader",attrs:{"tool-name":_vm.toolName}}):_vm._e(),_vm._v(" "),_c('div',{key:"anchor",ref:"anchor",staticClass:"scroll-anchor"})],2)],1),_vm._v(" "),(_vm.isChatAvailable && !_vm.shouldShowThreadList)?_c('footer',{staticClass:"duo-chat-drawer-footer gl-relative gl-z-2 gl-shrink-0",attrs:{"data-testid":"chat-footer"}},[(_vm.$scopedSlots['footer-panel'])?_c('div',{staticClass:"gl-relative gl-max-w-full",attrs:{"data-testid":"footer-panel-wrapper"}},[_vm._t("footer-panel")],2):_vm._e(),_vm._v(" "),(_vm.$scopedSlots['footer-actions'])?_c('div',{staticClass:"gl-my-4 gl-flex gl-items-center gl-justify-between gl-gap-x-4 gl-px-4",attrs:{"data-testid":"footer-actions-wrapper"}},[_vm._t("footer-actions")],2):_vm._e(),_vm._v(" "),_c('gl-form',{attrs:{"data-testid":"chat-prompt-form"},on:{"submit":function($event){$event.stopPropagation();$event.preventDefault();return _vm.sendChatPrompt.apply(null, arguments)}}},[_c('div',{staticClass:"gl-relative gl-max-w-full"},[_vm._t("context-items-menu",null,{"isOpen":_vm.contextItemsMenuIsOpen,"onClose":_vm.closeContextItemsMenuOpen,"setRef":_vm.setContextItemsMenuRef,"focusPrompt":_vm.focusChatInput})],2),_vm._v(" "),_c('gl-form-input-group',{scopedSlots:_vm._u([{key:"append",fn:function(){return [(_vm.canSubmit)?_c('gl-button',{staticClass:"!gl-absolute gl-bottom-2 gl-right-2 !gl-rounded-full",attrs:{"icon":"paper-airplane","category":"primary","variant":"confirm","type":"submit","disabled":_vm.isPromptEmpty || !_vm.hasValidPrompt,"data-testid":"chat-prompt-submit-button","aria-label":_vm.$options.i18n.CHAT_SUBMIT_LABEL}}):_c('gl-button',{staticClass:"!gl-absolute gl-bottom-2 gl-right-2 !gl-rounded-full",attrs:{"icon":"stop","category":"primary","variant":"default","data-testid":"chat-prompt-cancel-button","aria-label":_vm.$options.i18n.CHAT_CANCEL_LABEL,"disabled":!_vm.canCancelInternal},on:{"click":_vm.cancelPrompt}})]},proxy:true}],null,false,3149367298)},[_c('div',{staticClass:"duo-chat-input gl-min-h-8 gl-max-w-full gl-grow gl-align-top",attrs:{"data-value":_vm.prompt}},[(_vm.shouldShowSlashCommands)?_c('gl-card',{ref:"commands",staticClass:"slash-commands !gl-absolute gl-w-full -gl-translate-y-full gl-list-none gl-pl-0 gl-shadow-md",attrs:{"body-class":"!gl-p-2"}},_vm._l((_vm.filteredSlashCommands),function(command,index){return _c('gl-dropdown-item',{key:command.name,class:{ 'active-command': index === _vm.activeCommandIndex },on:{"click":function($event){return _vm.selectSlashCommand(index)}},nativeOn:{"mouseenter":function($event){_vm.activeCommandIndex = index;}}},[_c('span',{staticClass:"gl-flex gl-justify-between"},[_c('span',{staticClass:"gl-block"},[_vm._v(_vm._s(command.name))]),_vm._v(" "),_c('small',{staticClass:"gl-pl-3 gl-text-right gl-italic gl-text-subtle"},[_vm._v(_vm._s(command.description))])])])}),1):_vm._e(),_vm._v(" "),_c('gl-form-textarea',{ref:"prompt",attrs:{"disabled":!_vm.canSubmit,"data-testid":"chat-prompt-input","placeholder":_vm.inputPlaceholder,"character-count-limit":_vm.maxPromptLength,"textarea-classes":[
                 'gl-absolute',
                 '!gl-h-full',
                 'gl-rounded-br-none',

package/dist/components/chat/components/duo_chat_message_tool_approval/message_tool_approval.js

@@ -165,13 +165,14 @@ var script = {
       return this.approvalStatus === TOOL_STATUS.Approved;
     },
     isApproving() {
-      return this.isProcessing && this.localProcessingState === PROCESSING_STATE.APPROVING;
+      return this.localProcessingState === PROCESSING_STATE.APPROVING || this.isProcessing;
     },
     isDenying() {
-      return this.isProcessing && this.localProcessingState === PROCESSING_STATE.DENYING;
+      return this.localProcessingState === PROCESSING_STATE.DENYING;
     },
     buttonsDisabled() {
-      return this.isProcessing;
+      // Disable if we've taken action locally OR if parent says we're processing
+      return this.localProcessingState !== PROCESSING_STATE.NONE || this.isProcessing;
     },
     approveButtonText() {
       return this.isApproving ? this.$options.i18n.APPROVING_TEXT : this.$options.i18n.APPROVE_TEXT;
@@ -197,51 +198,45 @@ var script = {
     }
   },
   watch: {
-    // Reset local state when processing completes
-    isProcessing(newVal, oldVal) {
-      if (oldVal === true && newVal === false) {
-        this.resetProcessingState();
+    approvalStatus(newVal) {
+      if (newVal === TOOL_STATUS.Approved) {
+        this.collapsed = true;
       }
     }
   },
   methods: {
-    handleApprove() {
-      if (this.isProcessing) return;
-      this.localProcessingState = PROCESSING_STATE.APPROVING;
-      // Default to primary option type for backward compatibility
-      const approvalPayload = {
-        type: this.primaryApprovalOption.type || acceptedApproveToolPayloads.APPROVE_TOOL_ONCE
-      };
-      this.$emit('approve-tool', approvalPayload);
-    },
-    handlePrimaryApprove() {
-      if (this.isProcessing) return;
+    approveWithType(approvalType) {
+      if (this.localProcessingState !== PROCESSING_STATE.NONE) {
+        return;
+      }
       this.localProcessingState = PROCESSING_STATE.APPROVING;
       this.$emit('approve-tool', {
-        type: this.primaryApprovalOption.type
+        type: approvalType
       });
     },
+    handleApprove() {
+      const approvalType = this.primaryApprovalOption.type || acceptedApproveToolPayloads.APPROVE_TOOL_ONCE;
+      this.approveWithType(approvalType);
+    },
+    handlePrimaryApprove() {
+      this.approveWithType(this.primaryApprovalOption.type);
+    },
     handleDropdownSelection(option) {
-      if (this.isProcessing) return;
-      this.localProcessingState = PROCESSING_STATE.APPROVING;
-      this.$emit('approve-tool', {
-        type: option.type
-      });
+      this.approveWithType(option.type);
     },
     handleDeny() {
-      if (this.isProcessing) return;
       this.showDenialReason = true;
     },
     cancelDenial() {
       this.showDenialReason = false;
       this.denialReason = '';
-      this.localProcessingState = PROCESSING_STATE.NONE;
     },
     submitDenial() {
-      if (this.isProcessing) return;
+      if (this.localProcessingState !== PROCESSING_STATE.NONE) {
+        return;
+      }
       this.localProcessingState = PROCESSING_STATE.DENYING;
       this.$emit('deny-tool', this.denialReason || null);
-      // Don't reset state here - wait for isProcessing to change
     },
     resetProcessingState() {
       this.localProcessingState = PROCESSING_STATE.NONE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitlab/duo-ui",
-  "version": "15.0.4",
+  "version": "15.0.5",
   "description": "Duo UI Components",
   "license": "MIT",
   "main": "dist/index.js",

package/src/components/agentic_chat/agentic_duo_chat.vue

@@ -370,15 +370,7 @@ export default {
         !this.isToolApprovalProcessing &&
         !this.isAwaitingToolApproval;
 
-      // Fallback logic: If we're not loading, not streaming, and not awaiting approval,
-      // but isToolApprovalProcessing is stuck at true, we should still enable submit
-      const isStuckInProcessing =
-        !this.isLoading &&
-        !this.isStreaming &&
-        !this.isAwaitingToolApproval &&
-        this.isToolApprovalProcessing;
-
-      return shouldAllowSubmit || isStuckInProcessing;
+      return shouldAllowSubmit;
     },
     shouldShowThreadList() {
       return this.isMultithreaded && this.currentView === VIEW_TYPES.LIST;
@@ -484,6 +476,14 @@ export default {
         lastMessage && lastMessage.message_type === 'request' && lastMessage.tool_info
       );
     },
+    canCancelInternal() {
+      // Don't allow cancel while there are pending tool approvals
+      if (this.isAwaitingToolApproval) {
+        return false;
+      }
+
+      return this.canCancel;
+    },
   },
   watch: {
     multiThreadedView(newView) {
@@ -1029,7 +1029,7 @@ export default {
                 class="!gl-absolute gl-bottom-2 gl-right-2 !gl-rounded-full"
                 data-testid="chat-prompt-cancel-button"
                 :aria-label="$options.i18n.CHAT_CANCEL_LABEL"
-                :disabled="!canCancel"
+                :disabled="!canCancelInternal"
                 @click="cancelPrompt"
               />
             </template>

package/src/components/chat/components/duo_chat_message_tool_approval/message_tool_approval.vue

@@ -189,13 +189,14 @@ export default {
       return this.approvalStatus === TOOL_STATUS.Approved;
     },
     isApproving() {
-      return this.isProcessing && this.localProcessingState === PROCESSING_STATE.APPROVING;
+      return this.localProcessingState === PROCESSING_STATE.APPROVING || this.isProcessing;
     },
     isDenying() {
-      return this.isProcessing && this.localProcessingState === PROCESSING_STATE.DENYING;
+      return this.localProcessingState === PROCESSING_STATE.DENYING;
     },
     buttonsDisabled() {
-      return this.isProcessing;
+      // Disable if we've taken action locally OR if parent says we're processing
+      return this.localProcessingState !== PROCESSING_STATE.NONE || this.isProcessing;
     },
     approveButtonText() {
       return this.isApproving ? this.$options.i18n.APPROVING_TEXT : this.$options.i18n.APPROVE_TEXT;
@@ -221,52 +222,46 @@ export default {
     },
   },
   watch: {
-    // Reset local state when processing completes
-    isProcessing(newVal, oldVal) {
-      if (oldVal === true && newVal === false) {
-        this.resetProcessingState();
+    approvalStatus(newVal) {
+      if (newVal === TOOL_STATUS.Approved) {
+        this.collapsed = true;
       }
     },
   },
   methods: {
-    handleApprove() {
-      if (this.isProcessing) return;
+    approveWithType(approvalType) {
+      if (this.localProcessingState !== PROCESSING_STATE.NONE) {
+        return;
+      }
 
       this.localProcessingState = PROCESSING_STATE.APPROVING;
-      // Default to primary option type for backward compatibility
-      const approvalPayload = {
-        type: this.primaryApprovalOption.type || acceptedApproveToolPayloads.APPROVE_TOOL_ONCE,
-      };
-      this.$emit('approve-tool', approvalPayload);
+      this.$emit('approve-tool', { type: approvalType });
+    },
+    handleApprove() {
+      const approvalType =
+        this.primaryApprovalOption.type || acceptedApproveToolPayloads.APPROVE_TOOL_ONCE;
+      this.approveWithType(approvalType);
     },
     handlePrimaryApprove() {
-      if (this.isProcessing) return;
-
-      this.localProcessingState = PROCESSING_STATE.APPROVING;
-      this.$emit('approve-tool', { type: this.primaryApprovalOption.type });
+      this.approveWithType(this.primaryApprovalOption.type);
     },
     handleDropdownSelection(option) {
-      if (this.isProcessing) return;
-
-      this.localProcessingState = PROCESSING_STATE.APPROVING;
-      this.$emit('approve-tool', { type: option.type });
+      this.approveWithType(option.type);
     },
     handleDeny() {
-      if (this.isProcessing) return;
-
       this.showDenialReason = true;
     },
     cancelDenial() {
       this.showDenialReason = false;
       this.denialReason = '';
-      this.localProcessingState = PROCESSING_STATE.NONE;
     },
     submitDenial() {
-      if (this.isProcessing) return;
+      if (this.localProcessingState !== PROCESSING_STATE.NONE) {
+        return;
+      }
 
       this.localProcessingState = PROCESSING_STATE.DENYING;
       this.$emit('deny-tool', this.denialReason || null);
-      // Don't reset state here - wait for isProcessing to change
     },
     resetProcessingState() {
       this.localProcessingState = PROCESSING_STATE.NONE;