@aws/lsp-codewhisperer 0.0.66 → 0.0.68

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## [0.0.68](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.67...lsp-codewhisperer/v0.0.68) (2025-07-22)
+
+
+### Features
+
+* **amazonq:** enable show logs feature ([#1947](https://github.com/aws/language-servers/issues/1947)) ([86ea83d](https://github.com/aws/language-servers/commit/86ea83dd53b447f6decccf16559b76f4989ea712))
+
+## [0.0.67](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.66...lsp-codewhisperer/v0.0.67) (2025-07-22)
+
+
+### Features
+
+* adding extra context as a workspace config for inline chat ([#1942](https://github.com/aws/language-servers/issues/1942)) ([1b402bb](https://github.com/aws/language-servers/commit/1b402bb8b083c5505a4e13ecf7e097a43388d10b))
+* **chat-client:** add auto-approve (trust mode) for built-in tools ([#1949](https://github.com/aws/language-servers/issues/1949)) ([f17b631](https://github.com/aws/language-servers/commit/f17b631d9e06371a11ef8e9cb1413762fb51a143))
+* **chat-client:** add shortcut for stop/reject/run commands ([#1932](https://github.com/aws/language-servers/issues/1932)) ([087f338](https://github.com/aws/language-servers/commit/087f3387ba736e92d014274e195f7ef76e377f1e))
+
+
+### Bug Fixes
+
+* **amazonq:** add image context to chat history ([#1859](https://github.com/aws/language-servers/issues/1859)) ([788920b](https://github.com/aws/language-servers/commit/788920bdd2de0448fd335734b62ac80aba9cff82))
+* **amazonq:** avoid workspace context server missing historical dependency events ([#1946](https://github.com/aws/language-servers/issues/1946)) ([3362956](https://github.com/aws/language-servers/commit/3362956ded75d77296fa98abb172bd87d66e5d5e))
+* **amazonq:** continueous edits trigger returns earlier as first session is already closed ([#1907](https://github.com/aws/language-servers/issues/1907)) ([a2dc5a8](https://github.com/aws/language-servers/commit/a2dc5a87e488e523c12270b98749c1f835b55e87))
+* **amazonq:** fix for mcp server unnecessary refresh from file watchers ([#1933](https://github.com/aws/language-servers/issues/1933)) ([208909b](https://github.com/aws/language-servers/commit/208909b55ecda40ff8d412b2b3be890eccee70bc))
+* **amazonq:** make JSTSDependencyHandler process scoped packages correctly ([#1910](https://github.com/aws/language-servers/issues/1910)) ([3034494](https://github.com/aws/language-servers/commit/303449454254987047649c49b7a377d45ad284b6))
+* **amazonq:** update mcp and persona config to agent config ([#1897](https://github.com/aws/language-servers/issues/1897)) ([530977f](https://github.com/aws/language-servers/commit/530977f8c73c7946a0205f02014248d71b4b1fe0))
+* bug for credential refresh in StreamingClientServiceIAM ([#1944](https://github.com/aws/language-servers/issues/1944)) ([a69ec0c](https://github.com/aws/language-servers/commit/a69ec0c63423187c96bdd2b03d14da8a723c192e))
+* fix blocking regex calls being made before indexing ([#1916](https://github.com/aws/language-servers/issues/1916)) ([3c0592f](https://github.com/aws/language-servers/commit/3c0592fec53922b0493f51b7e88313971cb54e93))
+* fix to remove config from agent file for failed initialization ([#1948](https://github.com/aws/language-servers/issues/1948)) ([45645c2](https://github.com/aws/language-servers/commit/45645c2cd7c241c54ddfebced6f377f38e077957))
+* Make the classifier of auto trigger output the same score as the IDE auto trigger classifier ([#1930](https://github.com/aws/language-servers/issues/1930)) ([be3231f](https://github.com/aws/language-servers/commit/be3231f27d545daf137df149e5f9fd23042c82a9))
+* put compaction feature behind a feature flag ([#1945](https://github.com/aws/language-servers/issues/1945)) ([51f4161](https://github.com/aws/language-servers/commit/51f4161571679408d6b11b61d70d8027097a6ef6))
+* remove hardcoded EDITS predictionTypes for trigger on acceptance ([#1937](https://github.com/aws/language-servers/issues/1937)) ([8ef7986](https://github.com/aws/language-servers/commit/8ef7986424dc4ced8e7414c1378dfca872150fb4))
+* replace cancel with stop ([#1935](https://github.com/aws/language-servers/issues/1935)) ([2f51923](https://github.com/aws/language-servers/commit/2f51923f9d3497469c70162235482b569e2d796e))
+* update ChatHandlers before adding new types dependency ([#1925](https://github.com/aws/language-servers/issues/1925)) ([e94e581](https://github.com/aws/language-servers/commit/e94e581a00fb99d862527ee7b91bf37ef47f4013))
+
 ## [0.0.66](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.65...lsp-codewhisperer/v0.0.66) (2025-07-17)
 
 

package/README.md

@@ -102,6 +102,8 @@ The server supports the following [workspace configurations](https://github.com/
     - This flag controls whether to opt-in or opt-out to telemetry.
 - `aws.q.inlineSuggestions.extraContext` (type: `string | undefined`, default: `undefined`)
     - The extra context to be included for suggestions, an empty string will be interpreted as undefined. See [below](#extra-context-for-q-inline-suggestions) for more context.
+- `aws.q.inlineChat.extraContext` (type: `string | undefined`, default: `undefined`)
+    - The extra context to be included for inline chat, an empty string will be interpreted as undefined. See [below](#extra-context-for-q-inline-chat) for more context.
 - `aws.codeWhisperer.includeSuggestionsWithCodeReferences`: (type: `boolean`, default: `false`)
     - This flag controls whether to include references with code suggestions.
 - `aws.codeWhisperer.shareCodeWhispererContentWithAWS`: (type: `boolean`, default: `false`)
@@ -111,3 +113,6 @@ The client can signal updates to the workspace configuration with the `DidChange
 
 #### Extra context for Q Inline Suggestions
 In cases when the client runs in a specific environment that requires customized suggestions, the server supports a `aws.q.inlineSuggestions.extraContext` workspace configuration. This extra context will be passed to the left file content of the request in the beginning of the file.
+
+#### Extra context for Q Inline Chat
+In cases when the client runs in a specific environment that requires customized inline chat responses, the server supports a `aws.q.inlineChat.extraContext` workspace configuration. This extra context will be prepended to the document text of the request, similar to how inline suggestions work.

package/out/language-server/agenticChat/agenticChatController.d.ts

@@ -17,7 +17,7 @@ import { AgenticChatResultStream } from './agenticChatResultStream';
 import { AdditionalContentEntryAddition } from './context/agenticChatTriggerContext';
 import { PaidTierMode } from '../paidTier/paidTier';
 import { UserContext } from '../../client/token/codewhispererbearertokenclient';
-type ChatHandlers = Omit<LspHandlers<Chat>, 'openTab' | 'sendChatUpdate' | 'sendContextCommands' | 'onListConversations' | 'onConversationClick' | 'onListMcpServers' | 'onMcpServerClick' | 'onTabBarAction' | 'getSerializedChat' | 'chatOptionsUpdate' | 'onListRules' | 'sendPinnedContext' | 'onActiveEditorChanged' | 'onPinnedContextAdd' | 'onPinnedContextRemove' | 'onOpenFileDialog' | 'onListAvailableModels'>;
+type ChatHandlers = Omit<LspHandlers<Chat>, 'openTab' | 'sendChatUpdate' | 'sendContextCommands' | 'onListConversations' | 'onConversationClick' | 'onListMcpServers' | 'onMcpServerClick' | 'onTabBarAction' | 'getSerializedChat' | 'chatOptionsUpdate' | 'onListRules' | 'sendPinnedContext' | 'onActiveEditorChanged' | 'onPinnedContextAdd' | 'onPinnedContextRemove' | 'onOpenFileDialog' | 'onListAvailableModels' | 'sendSubscriptionDetails' | 'onSubscriptionUpgrade'>;
 export declare class AgenticChatController implements ChatHandlers {
     #private;
     /**
@@ -55,7 +55,7 @@ export declare class AgenticChatController implements ChatHandlers {
      * Returns the remaining character budget for chat history.
      * @param request
      */
-    truncateRequest(request: ChatCommandInput, pinnedContext?: AdditionalContentEntryAddition[]): number;
+    truncateRequest(request: ChatCommandInput, additionalContext?: AdditionalContentEntryAddition[]): number;
     /**
      * Creates a promise that does not resolve until the user accepts or rejects the tool usage.
      * @param toolUseId

package/out/language-server/agenticChat/agenticChatController.js

@@ -64,6 +64,7 @@ const imageVerification_1 = require("../../shared/imageVerification");
 const path_1 = require("@aws/lsp-core/out/util/path");
 const agenticChatControllerHelper_1 = require("./utils/agenticChatControllerHelper");
 const activeUserTracker_1 = require("../../shared/activeUserTracker");
+const qAgenticChatServer_1 = require("./qAgenticChatServer");
 class AgenticChatController {
     #features;
     #chatSessionManagementService;
@@ -540,8 +541,6 @@ class AgenticChatController {
             const contextItems = [...additionalContext, ...activeFile];
             triggerContext.documentReference = this.#additionalContextProvider.getFileListFromContext(contextItems);
             const customContext = await this.#additionalContextProvider.getImageBlocksFromContext(params.context, params.tabId);
-            // Add image context to triggerContext.documentReference for transparency
-            await this.#additionalContextProvider.appendCustomContextToTriggerContext(triggerContext, params.context, params.tabId);
             let finalResult;
             if (params.prompt.command === quickActions_1.QuickAction.Compact) {
                 // Get the compaction request input
@@ -559,7 +558,7 @@ class AgenticChatController {
                 const promptId = crypto.randomUUID();
                 session.setCurrentPromptId(promptId);
                 // Start the agent loop
-                finalResult = await this.#runAgentLoop(initialRequestInput, session, metric, chatResultStream, params.tabId, promptId, session.conversationId, token, triggerContext.documentReference, additionalContext.filter(item => item.pinned));
+                finalResult = await this.#runAgentLoop(initialRequestInput, session, metric, chatResultStream, params.tabId, promptId, session.conversationId, token, triggerContext.documentReference, additionalContext);
             }
             // Result Handling - This happens only once
             return await this.#handleFinalResult(finalResult, session, params.tabId, metric, triggerContext, isNewConversation, chatResultStream);
@@ -594,11 +593,11 @@ class AgenticChatController {
     /**
      * Prepares the initial request input for the chat prompt
      */
-    async #prepareRequestInput(params, session, triggerContext, additionalContext, chatResultStream, customContext) {
+    async #prepareRequestInput(params, session, triggerContext, additionalContext, chatResultStream, images) {
         this.#debug('Preparing request input');
         // Get profileArn from the service manager if available
         const profileArn = this.#serviceManager?.getActiveProfileArn();
-        const requestInput = await this.#triggerContext.getChatParamsFromTrigger(params, triggerContext, codewhisperer_streaming_1.ChatTriggerType.MANUAL, this.#customizationArn, chatResultStream, profileArn, this.#getTools(session), additionalContext, session.modelId, this.#origin, customContext);
+        const requestInput = await this.#triggerContext.getChatParamsFromTrigger(params, triggerContext, codewhisperer_streaming_1.ChatTriggerType.MANUAL, this.#customizationArn, chatResultStream, profileArn, this.#getTools(session), additionalContext, session.modelId, this.#origin, images);
         return requestInput;
     }
     /**
@@ -616,7 +615,7 @@ class AgenticChatController {
      */
     #shouldCompact(currentRequestCount) {
         // 80% of 570K limit
-        if (currentRequestCount > 456_000) {
+        if ((0, qAgenticChatServer_1.enabledCompaction)(this.#features.lsp.getClientInitializeParams()) && currentRequestCount > 456_000) {
             this.#debug(`Current request total character count is: ${currentRequestCount}, prompting user to compact`);
             return true;
         }
@@ -726,12 +725,13 @@ class AgenticChatController {
     /**
      * Runs the agent loop, making requests and processing tool uses until completion
      */
-    async #runAgentLoop(initialRequestInput, session, metric, chatResultStream, tabId, promptId, conversationIdentifier, token, documentReference, pinnedContext) {
+    async #runAgentLoop(initialRequestInput, session, metric, chatResultStream, tabId, promptId, conversationIdentifier, token, documentReference, additionalContext) {
         let currentRequestInput = { ...initialRequestInput };
         let finalResult = null;
         let iterationCount = 0;
         let shouldDisplayMessage = true;
         let currentRequestCount = 0;
+        const pinnedContext = additionalContext?.filter(item => item.pinned);
         metric.recordStart();
         this.logSystemInformation();
         while (true) {
@@ -745,7 +745,7 @@ class AgenticChatController {
                 this.#debug('Stopping agent loop - cancelled by user');
                 throw new lsp_core_1.CancellationError('user');
             }
-            this.truncateRequest(currentRequestInput, pinnedContext);
+            this.truncateRequest(currentRequestInput, additionalContext);
             const currentMessage = currentRequestInput.conversationState?.currentMessage;
             const conversationId = conversationIdentifier ?? '';
             if (!currentMessage || !conversationId) {
@@ -807,6 +807,7 @@ class AgenticChatController {
                         shouldDisplayMessage: shouldDisplayMessage &&
                             !currentMessage.userInputMessage?.content?.startsWith('You are Amazon Q'),
                         timestamp: new Date(),
+                        images: currentMessage.userInputMessage?.images,
                     });
                 }
             }
@@ -959,7 +960,7 @@ class AgenticChatController {
      * Returns the remaining character budget for chat history.
      * @param request
      */
-    truncateRequest(request, pinnedContext) {
+    truncateRequest(request, additionalContext) {
         // TODO: Confirm if this limit applies to SendMessage and rename this constant
         let remainingCharacterBudget = constants_2.GENERATE_ASSISTANT_RESPONSE_INPUT_LIMIT;
         if (!request?.conversationState?.currentMessage?.userInputMessage) {
@@ -979,20 +980,63 @@ class AgenticChatController {
                 remainingCharacterBudget = remainingCharacterBudget - message.length;
             }
         }
-        // 2. try to fit @context into budget
-        let truncatedRelevantDocuments = [];
-        if (request.conversationState.currentMessage.userInputMessage.userInputMessageContext?.editorState
-            ?.relevantDocuments) {
-            for (const relevantDoc of request.conversationState.currentMessage.userInputMessage.userInputMessageContext
-                ?.editorState?.relevantDocuments) {
-                const docLength = relevantDoc?.text?.length || 0;
-                if (remainingCharacterBudget > docLength) {
-                    truncatedRelevantDocuments.push(relevantDoc);
-                    remainingCharacterBudget = remainingCharacterBudget - docLength;
+        // 2. try to fit @context and images into budget together
+        const docs = request.conversationState.currentMessage.userInputMessage.userInputMessageContext?.editorState
+            ?.relevantDocuments ?? [];
+        const images = request.conversationState.currentMessage.userInputMessage.images ?? [];
+        // Combine docs and images, preserving the order from additionalContext
+        let combined;
+        if (additionalContext && additionalContext.length > 0) {
+            let docIdx = 0;
+            let imageIdx = 0;
+            combined = additionalContext
+                .map(entry => {
+                if (entry.type === 'image') {
+                    return { type: 'image', value: images[imageIdx++] };
+                }
+                else {
+                    return { type: 'doc', value: docs[docIdx++] };
+                }
+            })
+                .filter(item => item.value !== undefined);
+        }
+        else {
+            combined = [
+                ...docs.map(d => ({ type: 'doc', value: d })),
+                ...images.map(i => ({ type: 'image', value: i })),
+            ];
+        }
+        const truncatedDocs = [];
+        const truncatedImages = [];
+        for (const item of combined) {
+            let itemLength = 0;
+            if (item.type === 'doc') {
+                itemLength = item.value?.text?.length || 0;
+                if (remainingCharacterBudget >= itemLength) {
+                    truncatedDocs.push(item.value);
+                    remainingCharacterBudget -= itemLength;
+                }
+            }
+            else if (item.type === 'image') {
+                // Type guard: only call on ImageBlock
+                if (item.value && typeof item.value === 'object' && 'format' in item.value && 'source' in item.value) {
+                    itemLength = (0, util_1.estimateCharacterCountFromImageBlock)(item.value);
+                    if (remainingCharacterBudget >= itemLength) {
+                        truncatedImages.push(item.value);
+                        remainingCharacterBudget -= itemLength;
+                    }
                 }
             }
+        }
+        // Assign truncated lists back to request
+        if (request.conversationState.currentMessage.userInputMessage.userInputMessageContext?.editorState
+            ?.relevantDocuments) {
             request.conversationState.currentMessage.userInputMessage.userInputMessageContext.editorState.relevantDocuments =
-                truncatedRelevantDocuments;
+                truncatedDocs;
+        }
+        if (request.conversationState.currentMessage.userInputMessage.images !== undefined &&
+            request.conversationState.currentMessage.userInputMessage.images.length > 0) {
+            request.conversationState.currentMessage.userInputMessage.images = truncatedImages;
         }
         // 3. try to fit current file context
         let truncatedCurrentDocument = undefined;
@@ -1008,6 +1052,7 @@ class AgenticChatController {
             request.conversationState.currentMessage.userInputMessage.userInputMessageContext.editorState.document =
                 truncatedCurrentDocument;
         }
+        const pinnedContext = additionalContext?.filter(item => item.pinned);
         // 4. try to fit pinned context into budget
         if (pinnedContext && pinnedContext.length > 0) {
             remainingCharacterBudget = this.truncatePinnedContext(remainingCharacterBudget, pinnedContext);
@@ -1096,24 +1141,35 @@ class AgenticChatController {
                         const { Tool } = toolMap[toolUse.name];
                         const tool = new Tool(this.#features);
                         // For MCP tools, get the permission from McpManager
-                        // const permission = McpManager.instance.getToolPerm('Built-in', toolUse.name)
+                        const permission = mcpManager_1.McpManager.instance.getToolPerm('Built-in', toolUse.name);
                         // If permission is 'alwaysAllow', we don't need to ask for acceptance
-                        // const builtInPermission = permission !== 'alwaysAllow'
+                        const builtInPermission = permission !== 'alwaysAllow';
                         // Get the approved paths from the session
                         const approvedPaths = session.approvedPaths;
                         // Pass the approved paths to the tool's requiresAcceptance method
                         const { requiresAcceptance, warning, commandCategory } = await tool.requiresAcceptance(toolUse.input, approvedPaths);
+                        const isExecuteBash = toolUse.name === toolConstants_1.EXECUTE_BASH;
+                        // check if tool execution's path is out of workspace
+                        const isOutOfWorkSpace = warning === constants_2.OUT_OF_WORKSPACE_WARNING_MSG;
+                        // check if tool involved secured files
+                        const isSecuredFilesInvoled = warning === constants_2.BINARY_FILE_WARNING_MSG || warning === constants_2.CREDENTIAL_FILE_WARNING_MSG;
                         // Honor built-in permission if available, otherwise use tool's requiresAcceptance
-                        // const requiresAcceptance = builtInPermission || toolRequiresAcceptance
-                        if (requiresAcceptance || toolUse.name === toolConstants_1.EXECUTE_BASH) {
+                        let toolRequiresAcceptance = (builtInPermission || isOutOfWorkSpace || isSecuredFilesInvoled) ?? requiresAcceptance;
+                        // if the command is read-only and in-workspace --> flip back to no approval needed
+                        if (isExecuteBash &&
+                            commandCategory === executeBash_2.CommandCategory.ReadOnly &&
+                            !isOutOfWorkSpace &&
+                            !requiresAcceptance) {
+                            toolRequiresAcceptance = false;
+                        }
+                        if (toolRequiresAcceptance || isExecuteBash) {
                             // for executeBash, we till send the confirmation message without action buttons
-                            const confirmationResult = this.#processToolConfirmation(toolUse, requiresAcceptance, warning, commandCategory);
+                            const confirmationResult = this.#processToolConfirmation(toolUse, toolRequiresAcceptance, warning, commandCategory, toolUse.name, builtInPermission);
                             cachedButtonBlockId = await chatResultStream.writeResultBlock(confirmationResult);
-                            const isExecuteBash = toolUse.name === toolConstants_1.EXECUTE_BASH;
                             if (isExecuteBash) {
                                 this.#telemetryController.emitInteractWithAgenticChat('GeneratedCommand', tabId, session.pairProgrammingMode, session.getConversationType(), this.#abTestingAllocation?.experimentName, this.#abTestingAllocation?.userVariation);
                             }
-                            if (requiresAcceptance) {
+                            if (toolRequiresAcceptance) {
                                 await this.waitForToolApproval(toolUse, chatResultStream, cachedButtonBlockId, session, toolUse.name);
                             }
                             if (isExecuteBash) {
@@ -1551,7 +1607,7 @@ class AgenticChatController {
         let headerEmitted = false;
         const initialHeader = {
             body: 'shell',
-            buttons: [{ id: toolConstants_1.BUTTON_STOP_SHELL_COMMAND, text: 'Cancel', icon: 'stop' }],
+            buttons: [this.#renderStopShellCommandButton()],
         };
         const completedHeader = {
             body: 'shell',
@@ -1615,7 +1671,7 @@ class AgenticChatController {
                                 text: 'Rejected',
                             },
                         }),
-                    buttons: isAccept ? [{ id: toolConstants_1.BUTTON_STOP_SHELL_COMMAND, text: 'Cancel', icon: 'stop' }] : [],
+                    buttons: isAccept ? [this.#renderStopShellCommandButton()] : [],
                 },
             };
         }
@@ -1703,7 +1759,7 @@ class AgenticChatController {
                             status: {
                                 status: 'error',
                                 icon: 'stop',
-                                text: 'Canceled',
+                                text: 'Stopped',
                             },
                             buttons: [],
                         },
@@ -1768,8 +1824,8 @@ class AgenticChatController {
     #renderStopShellCommandButton() {
         const stopKey = this.#getKeyBinding('aws.amazonq.stopCmdExecution');
         return {
-            id: 'stop-shell-command',
-            text: 'Cancel',
+            id: toolConstants_1.BUTTON_STOP_SHELL_COMMAND,
+            text: 'Stop',
             icon: 'stop',
             ...(stopKey ? { description: `Stop:  ${stopKey}` } : {}),
         };
@@ -1812,14 +1868,25 @@ class AgenticChatController {
         switch (toolName) {
             case toolConstants_1.EXECUTE_BASH: {
                 const commandString = toolUse.input.command;
+                // get feature flag
+                const shortcut = this.#features.lsp.getClientInitializeParams()?.initializationOptions?.aws?.awsClientCapabilities?.q
+                    ?.shortcut;
+                const runKey = this.#getKeyBinding('aws.amazonq.runCmdExecution');
+                const rejectKey = this.#getKeyBinding('aws.amazonq.rejectCmdExecution');
                 buttons = requiresAcceptance
                     ? [
-                        { id: toolConstants_1.BUTTON_RUN_SHELL_COMMAND, text: 'Run', icon: 'play' },
+                        {
+                            id: toolConstants_1.BUTTON_RUN_SHELL_COMMAND,
+                            text: 'Run',
+                            icon: 'play',
+                            ...(runKey ? { description: `Run:  ${runKey}` } : {}),
+                        },
                         {
                             id: toolConstants_1.BUTTON_REJECT_SHELL_COMMAND,
                             status: 'dimmed-clear',
                             text: 'Reject',
                             icon: 'cancel',
+                            ...(rejectKey ? { description: `Reject:  ${rejectKey}` } : {}),
                         },
                     ]
                     : [];
@@ -1908,7 +1975,7 @@ class AgenticChatController {
                         ? `I need permission to read files.\n${formattedPaths.join('\n')}`
                         : `I need permission to read files outside the workspace.\n${formattedPaths.join('\n')}`;
                 }
-                else {
+                else if (toolName === 'listDirectory') {
                     const readFilePath = toolUse.input.path;
                     // Validate the path using our synchronous utility
                     (0, pathValidation_1.validatePathExists)(readFilePath);
@@ -1917,6 +1984,12 @@ class AgenticChatController {
                         ? `I need permission to list directories.\n\`${readFilePath}\``
                         : `I need permission to list directories outside the workspace.\n\`${readFilePath}\``;
                 }
+                else {
+                    const readFilePath = toolUse.input.path;
+                    body = builtInPermission
+                        ? `I need permission to search files.\n\`${readFilePath}\``
+                        : `I need permission to search files outside the workspace.\n\`${readFilePath}\``;
+                }
                 break;
             }
             default: {
@@ -2143,6 +2216,8 @@ class AgenticChatController {
                 cursorState: undefined,
                 useRelevantDocuments: false,
             };
+        // Clear images to avoid passing them again in follow-up toolUse/toolResult loops, as it is may confuse the model
+        updatedRequestInput.conversationState.currentMessage.userInputMessage.images = [];
         for (const toolResult of toolResults) {
             this.#debug(`ToolResult: ${JSON.stringify(toolResult)}`);
             updatedRequestInput.conversationState.currentMessage.userInputMessage.userInputMessageContext.toolResults.push({