From 88fa32679e3f37ce05e7776a538410629ecf3722 Mon Sep 17 00:00:00 2001
From: Jannik Lehmann <jlehmann@gitlab.com>
Date: Thu, 10 Jul 2025 11:14:43 +0200
Subject: [PATCH 1/2] Duo Workflow: Enable mutation feature flag

---
 .../duo_workflow_web_chat_mutation_tools.yml                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename ee/config/feature_flags/{experiment => beta}/duo_workflow_web_chat_mutation_tools.yml (90%)

diff --git a/ee/config/feature_flags/experiment/duo_workflow_web_chat_mutation_tools.yml b/ee/config/feature_flags/beta/duo_workflow_web_chat_mutation_tools.yml
similarity index 90%
rename from ee/config/feature_flags/experiment/duo_workflow_web_chat_mutation_tools.yml
rename to ee/config/feature_flags/beta/duo_workflow_web_chat_mutation_tools.yml
index b675e5a43f8068..b86cc806bb156b 100644
--- a/ee/config/feature_flags/experiment/duo_workflow_web_chat_mutation_tools.yml
+++ b/ee/config/feature_flags/beta/duo_workflow_web_chat_mutation_tools.yml
@@ -6,5 +6,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/195228
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/550853
 milestone: '18.2'
 group: group::duo workflow
-type: experiment
-default_enabled: false
+type: beta
+default_enabled: true
-- 
GitLab


From c3f0e0ea2eaac5740ba1322f21c2053ebac57916 Mon Sep 17 00:00:00 2001
From: Jannik Lehmann <jlehmann@gitlab.com>
Date: Fri, 11 Jul 2025 14:32:56 +0200
Subject: [PATCH 2/2] agentic inline approval

---
 .../ai/duo_agentic_chat/components/app.vue    | 58 ++++++++-----------
 .../ai/tanuki_bot/store/mutations.js          |  1 +
 2 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/ee/app/assets/javascripts/ai/duo_agentic_chat/components/app.vue b/ee/app/assets/javascripts/ai/duo_agentic_chat/components/app.vue
index 376c536e7014fc..028bbe6d2fcba3 100644
--- a/ee/app/assets/javascripts/ai/duo_agentic_chat/components/app.vue
+++ b/ee/app/assets/javascripts/ai/duo_agentic_chat/components/app.vue
@@ -1,7 +1,7 @@
 <script>
 // eslint-disable-next-line no-restricted-imports
 import { mapActions, mapState } from 'vuex';
-import { AgenticDuoChat, AgenticToolApprovalFlow } from '@gitlab/duo-ui';
+import { AgenticDuoChat } from '@gitlab/duo-ui';
 import { GlToggle } from '@gitlab/ui';
 import { renderGFM } from '~/behaviors/markdown/render_gfm';
 import { getCookie } from '~/lib/utils/common_utils';
@@ -31,7 +31,6 @@ export default {
   name: 'DuoAgenticChatApp',
   components: {
     AgenticDuoChat,
-    AgenticToolApprovalFlow,
     GlToggle,
   },
   provide() {
@@ -89,7 +88,7 @@ export default {
       socketManager: null,
       workflowId: null,
       workflowStatus: null,
-      pendingToolCall: null,
+      isProcessingToolApproval: false,
     };
   },
   computed: {
@@ -125,9 +124,6 @@ export default {
         },
       ];
     },
-    showToolApprovalModal() {
-      return this.workflowStatus === DUO_WORKFLOW_STATUS_TOOL_CALL_APPROVAL_REQUIRED;
-    },
     duoAgenticModePreference: {
       get() {
         return getCookie(DUO_AGENTIC_MODE_COOKIE) === 'true';
@@ -147,6 +143,15 @@ export default {
         }
       },
     },
+    workflowStatus(newStatus, oldStatus) {
+      // setting to early!
+      if (
+        oldStatus === 'TOOL_CALL_APPROVAL_REQUIRED' &&
+        newStatus !== 'TOOL_CALL_APPROVAL_REQUIRED'
+      ) {
+        this.isProcessingToolApproval = false;
+      }
+    },
   },
   mounted() {
     this.setDimensions();
@@ -172,7 +177,6 @@ export default {
       this.cleanupSocket();
       this.workflowId = null;
       this.workflowStatus = null;
-      this.pendingToolCall = null;
     },
 
     setDimensions() {
@@ -262,7 +266,7 @@ export default {
             ...msg,
             requestId,
             role,
-            message_type: role,
+            message_type: msg.message_type, // Keep original message_type for tool approval detection
           };
         });
 
@@ -271,24 +275,11 @@ export default {
         // Update workflow status and pending tool call
         this.workflowStatus = action.newCheckpoint.status;
 
-        // Check if we need to show tool approval modal
-        if (this.workflowStatus === DUO_WORKFLOW_STATUS_TOOL_CALL_APPROVAL_REQUIRED) {
-          const lastMessage = messages[messages.length - 1];
-          if (lastMessage && lastMessage.tool_info) {
-            this.pendingToolCall = {
-              name: lastMessage.tool_info.name,
-              parameters: lastMessage.tool_info.args || {},
-            };
-          }
-          // DON'T send actionResponse - wait for user approval
-        } else {
-          this.pendingToolCall = null;
+        // Handle tool approval processing state
 
-          // Only send actionResponse when NOT waiting for approval
-          this.socketManager?.send({ actionResponse: { requestID: action.requestID } });
-        }
-
-        if (this.workflowStatus === DUO_WORKFLOW_STATUS_INPUT_REQUIRED) {
+        // Only send actionResponse when NOT waiting for approval
+        this.socketManager?.send({ actionResponse: { requestID: action.requestID } });
+        if (this.workflowStatus === DUO_WORKFLOW_STATUS_TOOL_CALL_APPROVAL_REQUIRED) {
           this.setLoading(false);
         }
       } catch (err) {
@@ -332,7 +323,7 @@ export default {
         }
       }
 
-      const requestId = `${this.workflowId}-${this.messages?.length || 0}`;
+      const requestId = `${this.workflowId}-user-${Date.now()}`;
       const userMessage = { content: question, role: 'user', requestId };
 
       this.startWorkflow(question, {}, this.additionalContext);
@@ -345,9 +336,12 @@ export default {
       this.addDuoChatMessage({ errors: [err.toString()] });
     },
     handleApproveToolCall() {
+      this.isProcessingToolApproval = true;
       this.startWorkflow('', { approval: {} }, this.additionalContext);
     },
-    handleDenyToolCall(message) {
+    handleDenyToolCall(event) {
+      this.isProcessingToolApproval = true;
+      const message = event?.message || event;
       this.startWorkflow(
         '',
         {
@@ -376,11 +370,14 @@ export default {
         :show-header="true"
         badge-type="beta"
         :dimensions="dimensions"
+        :is-tool-approval-processing="isProcessingToolApproval"
         @new-chat="onNewChat"
         @send-chat-prompt="onSendChatPrompt"
         @chat-cancel="onChatCancel"
         @chat-hidden="onChatClose"
         @chat-resize="onChatResize"
+        @approve-tool="handleApproveToolCall"
+        @deny-tool="handleDenyToolCall"
         ><template #footer-controls>
           <div class="gl-flex gl-px-4 gl-pb-2 gl-pt-5">
             <gl-toggle
@@ -391,13 +388,6 @@ export default {
           </div>
         </template>
       </agentic-duo-chat>
-
-      <agentic-tool-approval-flow
-        :visible="showToolApprovalModal"
-        :tool-details="pendingToolCall"
-        @approve="handleApproveToolCall"
-        @deny="handleDenyToolCall"
-      />
     </div>
   </div>
 </template>
diff --git a/ee/app/assets/javascripts/ai/tanuki_bot/store/mutations.js b/ee/app/assets/javascripts/ai/tanuki_bot/store/mutations.js
index 2c0738a199663c..a62605f8e1bd82 100644
--- a/ee/app/assets/javascripts/ai/tanuki_bot/store/mutations.js
+++ b/ee/app/assets/javascripts/ai/tanuki_bot/store/mutations.js
@@ -64,6 +64,7 @@ export default {
           state.messages.push({ ...newMessageData, ...extraData });
         }
       } else if (isToolMessage) {
+        // do we still need this?
         const toolMessageWithRequestIdIndex = getExistingMessagesIndex(GENIE_CHAT_MODEL_ROLES.tool);
         const toolMessageExists = toolMessageWithRequestIdIndex > -1;
 
-- 
GitLab