@aws/lsp-codewhisperer 0.0.65 → 0.0.67

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

@@ -9,6 +9,7 @@ const crypto = require("crypto");
 const path = require("path");
 const os = require("os");
 const codewhisperer_streaming_1 = require("@amzn/codewhisperer-streaming");
+const toolConstants_1 = require("./constants/toolConstants");
 const protocol_1 = require("@aws/language-server-runtimes/protocol");
 const protocol_2 = require("@aws/language-server-runtimes/protocol");
 const server_interface_1 = require("@aws/language-server-runtimes/server-interface");
@@ -62,6 +63,8 @@ const modelSelection_1 = require("./constants/modelSelection");
 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;
@@ -81,6 +84,7 @@ class AgenticChatController {
     #mcpEventHandler;
     #paidTierMode;
     #origin;
+    #activeUserTracker;
     // latency metrics
     #llmRequestStartTime = 0;
     #toolCallLatencies = [];
@@ -100,7 +104,9 @@ class AgenticChatController {
     #getMessageIdForToolUse(toolType, toolUse) {
         const toolUseId = toolUse.toolUseId;
         // Return plain toolUseId for executeBash, add "_permission" suffix for all other tools
-        return toolUse.name === 'executeBash' || toolType === 'executeBash' ? toolUseId : `${toolUseId}_permission`;
+        return toolUse.name === toolConstants_1.EXECUTE_BASH || toolType === toolConstants_1.EXECUTE_BASH
+            ? toolUseId
+            : `${toolUseId}${toolConstants_1.SUFFIX_PERMISSION}`;
     }
     /**
      * Logs system information that can be helpful for debugging customer issues
@@ -119,6 +125,14 @@ class AgenticChatController {
         };
         this.#features.logging.info(`System Information: ${JSON.stringify(systemInfo)}`);
     }
+    /**
+     * Determines the appropriate message ID for a compaction confirmation
+     * @param messageId The original messageId
+     * @returns The message ID to use
+     */
+    #getMessageIdForCompact(messageId) {
+        return `${messageId}_compact`;
+    }
     constructor(chatSessionManagementService, features, telemetryService, serviceManager) {
         this.#features = features;
         this.#chatSessionManagementService = chatSessionManagementService;
@@ -136,6 +150,7 @@ class AgenticChatController {
         this.#contextCommandsProvider = new contextCommandsProvider_1.ContextCommandsProvider(this.#features.logging, this.#features.chat, this.#features.workspace, this.#features.lsp);
         this.#mcpEventHandler = new mcpEventHandler_1.McpEventHandler(features, telemetryService);
         this.#origin = (0, utils_2.getOriginFromClientInfo)(this.#features.lsp.getClientInitializeParams()?.clientInfo?.name);
+        this.#activeUserTracker = activeUserTracker_1.ActiveUserTracker.getInstance(this.#features);
     }
     async onExecuteCommand(params, _token) {
         this.#log(`onExecuteCommand: ${params.command}`);
@@ -152,16 +167,16 @@ class AgenticChatController {
     async onButtonClick(params) {
         this.#log(`onButtonClick event with params: ${JSON.stringify(params)}`);
         const session = this.#chatSessionManagementService.getSession(params.tabId);
-        if (params.buttonId === 'run-shell-command' ||
-            params.buttonId === 'reject-shell-command' ||
-            params.buttonId === 'reject-mcp-tool' ||
-            params.buttonId === 'allow-tools') {
+        if (params.buttonId === toolConstants_1.BUTTON_RUN_SHELL_COMMAND ||
+            params.buttonId === toolConstants_1.BUTTON_REJECT_SHELL_COMMAND ||
+            params.buttonId === toolConstants_1.BUTTON_REJECT_MCP_TOOL ||
+            params.buttonId === toolConstants_1.BUTTON_ALLOW_TOOLS) {
             if (!session.data) {
                 return { success: false, failureReason: `could not find chat session for tab: ${params.tabId} ` };
             }
             // For 'allow-tools', remove suffix as permission card needs to be seperate from file list card
-            const messageId = params.buttonId === 'allow-tools' && params.messageId.endsWith('_permission')
-                ? params.messageId.replace('_permission', '')
+            const messageId = params.buttonId === toolConstants_1.BUTTON_ALLOW_TOOLS && params.messageId.endsWith(toolConstants_1.SUFFIX_PERMISSION)
+                ? params.messageId.replace(toolConstants_1.SUFFIX_PERMISSION, '')
                 : params.messageId;
             const handler = session.data.getDeferredToolExecution(messageId);
             if (!handler?.reject || !handler.resolve) {
@@ -170,7 +185,7 @@ class AgenticChatController {
                     failureReason: `could not find deferred tool execution for message: ${messageId} `,
                 };
             }
-            params.buttonId === 'reject-shell-command' || params.buttonId === 'reject-mcp-tool'
+            params.buttonId === toolConstants_1.BUTTON_REJECT_SHELL_COMMAND || params.buttonId === toolConstants_1.BUTTON_REJECT_MCP_TOOL
                 ? (() => {
                     handler.reject(new toolShared_1.ToolApprovalException('Command was rejected.', true));
                     this.#stoppedToolUses.add(messageId);
@@ -180,7 +195,7 @@ class AgenticChatController {
                 success: true,
             };
         }
-        else if (params.buttonId === 'undo-changes') {
+        else if (params.buttonId === toolConstants_1.BUTTON_UNDO_CHANGES) {
             const toolUseId = params.messageId;
             try {
                 await this.#undoFileChange(toolUseId, session.data);
@@ -194,23 +209,23 @@ class AgenticChatController {
                 success: true,
             };
         }
-        else if (params.buttonId === 'undo-all-changes') {
-            const toolUseId = params.messageId.replace('_undoall', '');
+        else if (params.buttonId === toolConstants_1.BUTTON_UNDO_ALL_CHANGES) {
+            const toolUseId = params.messageId.replace(toolConstants_1.SUFFIX_UNDOALL, '');
             await this.#undoAllFileChanges(params.tabId, toolUseId, session.data);
             return {
                 success: true,
             };
         }
-        else if (params.buttonId === 'stop-shell-command') {
+        else if (params.buttonId === toolConstants_1.BUTTON_STOP_SHELL_COMMAND) {
             this.#stoppedToolUses.add(params.messageId);
             await this.#renderStoppedShellCommand(params.tabId, params.messageId);
             return { success: true };
         }
-        else if (params.buttonId === 'paidtier-upgrade-q-learnmore') {
+        else if (params.buttonId === toolConstants_1.BUTTON_PAIDTIER_UPGRADE_Q_LEARNMORE) {
             (0, paidTier_1.onPaidTierLearnMore)(this.#features.lsp, this.#features.logging);
             return { success: true };
         }
-        else if (params.buttonId === 'paidtier-upgrade-q') {
+        else if (params.buttonId === toolConstants_1.BUTTON_PAIDTIER_UPGRADE_Q) {
             await this.onManageSubscription(params.tabId);
             return { success: true };
         }
@@ -242,7 +257,7 @@ class AgenticChatController {
             return;
         }
         const fileList = cachedToolUse.chatResult?.header?.fileList;
-        const button = cachedToolUse.chatResult?.header?.buttons?.filter(button => button.id !== 'undo-changes');
+        const button = cachedToolUse.chatResult?.header?.buttons?.filter(button => button.id !== toolConstants_1.BUTTON_UNDO_CHANGES);
         const updatedHeader = {
             ...cachedToolUse.chatResult?.header,
             buttons: button,
@@ -290,7 +305,7 @@ class AgenticChatController {
             return;
         }
         for (const messageId of [...toUndo].reverse()) {
-            await this.onButtonClick({ buttonId: 'undo-changes', messageId, tabId });
+            await this.onButtonClick({ buttonId: toolConstants_1.BUTTON_UNDO_CHANGES, messageId, tabId });
         }
     }
     async onOpenFileDialog(params, token) {
@@ -394,6 +409,7 @@ class AgenticChatController {
         this.#contextCommandsProvider?.dispose();
         this.#userWrittenCodeTracker?.dispose();
         this.#mcpEventHandler.dispose();
+        this.#activeUserTracker.dispose();
         clearInterval(this.#abTestingFetchingTimeout);
     }
     async onListConversations(params) {
@@ -457,6 +473,8 @@ class AgenticChatController {
         if (!success) {
             return new server_interface_1.ResponseError(protocol_2.ErrorCodes.InternalError, sessionResult.error);
         }
+        const compactIds = session.getAllDeferredCompactMessageIds();
+        await this.#invalidateCompactCommand(params.tabId, compactIds);
         session.rejectAllDeferredToolExecutions(new toolShared_1.ToolApprovalException('Command ignored: new prompt', false));
         await this.#invalidateAllShellCommands(params.tabId, session);
         const metric = new metric_1.Metric({
@@ -464,6 +482,10 @@ class AgenticChatController {
             experimentName: this.#abTestingAllocation?.experimentName,
             userVariation: this.#abTestingAllocation?.userVariation,
         });
+        const isNewActiveUser = this.#activeUserTracker.isNewActiveUser();
+        if (isNewActiveUser) {
+            this.#telemetryController.emitActiveUser();
+        }
         try {
             const triggerContext = await this.#getTriggerContext(params, metric);
             if (triggerContext.programmingLanguage?.languageName) {
@@ -482,6 +504,8 @@ class AgenticChatController {
                 this.#log('cancellation requested');
                 // Abort all operations immediately
                 session.abortRequest();
+                const compactIds = session.getAllDeferredCompactMessageIds();
+                await this.#invalidateCompactCommand(params.tabId, compactIds);
                 void this.#invalidateAllShellCommands(params.tabId, session);
                 session.rejectAllDeferredToolExecutions(new lsp_core_1.CancellationError('user'));
                 // Then update UI to inform the user
@@ -517,21 +541,31 @@ 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);
-            // Get the initial request input
-            const initialRequestInput = await this.#prepareRequestInput(params, session, triggerContext, additionalContext, chatResultStream, customContext);
-            // Generate a unique ID for this prompt
-            const promptId = crypto.randomUUID();
-            session.setCurrentPromptId(promptId);
-            // Start the agent loop
-            const finalResult = await this.#runAgentLoop(initialRequestInput, session, metric, chatResultStream, params.tabId, promptId, session.conversationId, token, triggerContext.documentReference, additionalContext.filter(item => item.pinned));
-            // Phase 5: Result Handling - This happens only once
-            return await this.#handleFinalResult(finalResult, session, params, metric, triggerContext, isNewConversation, chatResultStream);
+            let finalResult;
+            if (params.prompt.command === quickActions_1.QuickAction.Compact) {
+                // Get the compaction request input
+                const compactionRequestInput = this.#getCompactionRequestInput(session);
+                // Generate a unique ID for this prompt
+                const promptId = crypto.randomUUID();
+                session.setCurrentPromptId(promptId);
+                // Start the compaction call
+                finalResult = await this.#runCompaction(compactionRequestInput, session, metric, chatResultStream, params.tabId, promptId, session.conversationId, token, triggerContext.documentReference);
+            }
+            else {
+                // Get the initial request input
+                const initialRequestInput = await this.#prepareRequestInput(params, session, triggerContext, additionalContext, chatResultStream, customContext);
+                // Generate a unique ID for this prompt
+                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);
+            }
+            // Result Handling - This happens only once
+            return await this.#handleFinalResult(finalResult, session, params.tabId, metric, triggerContext, isNewConversation, chatResultStream);
         }
         catch (err) {
             // HACK: the chat-client needs to have a partial event with the associated messageId sent before it can accept the final result.
-            // Without this, the `thinking` indicator never goes away.
+            // Without this, the `working` indicator never goes away.
             // Note: buttons being explicitly empty is required for this hack to work.
             const errorMessageId = `error-message-id-${(0, uuid_1.v4)()}`;
             await this.#sendProgressToClient({
@@ -559,21 +593,145 @@ 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;
+    }
+    /**
+     * Prepares the initial request input for the chat prompt
+     */
+    #getCompactionRequestInput(session) {
+        this.#debug('Preparing compaction request input');
+        // Get profileArn from the service manager if available
+        const profileArn = this.#serviceManager?.getActiveProfileArn();
+        const requestInput = this.#triggerContext.getCompactionChatCommandInput(profileArn, this.#getTools(session), session.modelId, this.#origin);
         return requestInput;
     }
+    /**
+     * Runs the compaction, making requests and processing tool uses until completion
+     */
+    #shouldCompact(currentRequestCount) {
+        // 80% of 570K limit
+        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;
+        }
+        else {
+            return false;
+        }
+    }
+    /**
+     * Runs the compaction to compact history into a single summary
+     */
+    async #runCompaction(compactionRequestInput, session, metric, chatResultStream, tabId, promptId, conversationIdentifier, token, documentReference) {
+        let currentRequestInput = { ...compactionRequestInput };
+        let finalResult = null;
+        metric.recordStart();
+        this.#debug(`Running compaction for conversation id:`, conversationIdentifier || '');
+        this.#timeToFirstChunk = -1;
+        this.#timeBetweenChunks = [];
+        // Check for cancellation
+        if (this.#isPromptCanceled(token, session, promptId)) {
+            this.#debug('Stopping compaction loop - cancelled by user');
+            throw new lsp_core_1.CancellationError('user');
+        }
+        const currentMessage = currentRequestInput.conversationState?.currentMessage;
+        let messages = [];
+        let characterCount = 0;
+        if (currentMessage) {
+            //  Get and process the messages from history DB to maintain invariants for service requests
+            try {
+                const { messages: historyMessages, count: historyCharCount } = this.#chatHistoryDb.fixAndGetHistory(tabId, currentMessage, []);
+                messages = historyMessages;
+                characterCount = historyCharCount;
+            }
+            catch (err) {
+                if (err instanceof chatDb_1.ToolResultValidationError) {
+                    this.#features.logging.error(`Tool validation error: ${err.message}`);
+                    return (finalResult || {
+                        success: false,
+                        error: 'Compaction loop failed to produce a final result',
+                        data: { chatResult: {}, toolUses: {} },
+                    });
+                }
+            }
+        }
+        currentRequestInput.conversationState.history = messages.map(msg => (0, util_1.messageToStreamingMessage)(msg));
+        const resultStreamWriter = chatResultStream.getResultStreamWriter();
+        if (currentRequestInput.conversationState.history.length == 0) {
+            // early terminate
+            await resultStreamWriter.write({
+                type: 'answer',
+                body: 'History is empty, there is nothing to compact.',
+                messageId: (0, uuid_1.v4)(),
+            });
+            return {
+                success: true,
+                data: {
+                    chatResult: {},
+                    toolUses: {},
+                },
+            };
+        }
+        else {
+            await resultStreamWriter.write({
+                type: 'answer',
+                body: 'Compacting your chat history, this may take a moment.',
+                messageId: (0, uuid_1.v4)(),
+            });
+        }
+        await resultStreamWriter.close();
+        // Add loading message before making the request
+        const loadingMessageId = `loading-${(0, uuid_1.v4)()}`;
+        await chatResultStream.writeResultBlock({ ...constants_1.loadingMessage, messageId: loadingMessageId });
+        this.#debug(`Compacting history with ${characterCount} characters`);
+        this.#llmRequestStartTime = Date.now();
+        // Phase 3: Request Execution
+        // Note: these logs are very noisy, but contain information redacted on the backend.
+        this.#debug(`generateAssistantResponse/SendMessage Request: ${JSON.stringify(currentRequestInput, undefined, 2)}`);
+        const response = await session.getChatResponse(currentRequestInput);
+        if (response.$metadata.requestId) {
+            metric.mergeWith({
+                requestIds: [response.$metadata.requestId],
+            });
+        }
+        this.#features.logging.info(`generateAssistantResponse/SendMessage ResponseMetadata: ${lsp_core_2.loggingUtils.formatObj(response.$metadata)}`);
+        await chatResultStream.removeResultBlock(loadingMessageId);
+        // Phase 4: Response Processing
+        const result = await this.#processAgenticChatResponseWithTimeout(response, metric.mergeWith({
+            cwsprChatResponseCode: response.$metadata.httpStatusCode,
+            cwsprChatMessageId: response.$metadata.requestId,
+        }), chatResultStream, session, documentReference, true);
+        const llmLatency = Date.now() - this.#llmRequestStartTime;
+        this.#debug(`LLM Response Latency for compaction: ${llmLatency}`);
+        this.#telemetryController.emitAgencticLoop_InvokeLLM(response.$metadata.requestId, conversationIdentifier ?? '', 'AgenticChatWithCompaction', undefined, undefined, 'Succeeded', this.#features.runtime.serverInfo.version ?? '', session.modelId, llmLatency, [], this.#timeToFirstChunk, this.#timeBetweenChunks, session.pairProgrammingMode);
+        // replace the history with summary in history DB
+        if (result.data?.chatResult.body !== undefined) {
+            this.#chatHistoryDb.replaceWithSummary(tabId, 'cwc', conversationIdentifier ?? '', {
+                body: result.data?.chatResult.body,
+                type: 'prompt',
+                shouldDisplayMessage: true,
+                timestamp: new Date(),
+            });
+        }
+        else {
+            this.#features.logging.warn('No ChatResult body in response, skipping adding to history');
+        }
+        return result;
+    }
     /**
      * 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) {
@@ -587,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) {
@@ -600,7 +758,11 @@ class AgenticChatController {
             if (currentMessage) {
                 //  Get and process the messages from history DB to maintain invariants for service requests
                 try {
-                    messages = this.#chatHistoryDb.fixAndGetHistory(tabId, currentMessage, pinnedContextMessages);
+                    const newUserInputCount = this.#chatHistoryDb.calculateNewMessageCharacterCount(currentMessage, pinnedContextMessages);
+                    const { messages: historyMessages, count: historyCharacterCount } = this.#chatHistoryDb.fixAndGetHistory(tabId, currentMessage, pinnedContextMessages, newUserInputCount);
+                    messages = historyMessages;
+                    currentRequestCount = newUserInputCount + historyCharacterCount;
+                    this.#debug(`Request total character count: ${currentRequestCount}`);
                 }
                 catch (err) {
                     if (err instanceof chatDb_1.ToolResultValidationError) {
@@ -609,7 +771,7 @@ class AgenticChatController {
                     }
                 }
             }
-            //  Do not include chatHistory for requests going to Mynah Backend
+            // Do not include chatHistory for requests going to Mynah Backend
             currentRequestInput.conversationState.history = currentRequestInput.conversationState?.currentMessage
                 ?.userInputMessage?.userIntent
                 ? []
@@ -620,7 +782,7 @@ class AgenticChatController {
             this.#llmRequestStartTime = Date.now();
             // Phase 3: Request Execution
             // Note: these logs are very noisy, but contain information redacted on the backend.
-            this.#debug(`generateAssistantResponse/SendMessage Request: ${JSON.stringify(currentRequestInput, undefined, 2)}`);
+            this.#debug(`generateAssistantResponse/SendMessage Request: ${JSON.stringify(currentRequestInput, this.#imageReplacer, 2)}`);
             const response = await session.getChatResponse(currentRequestInput);
             if (response.$metadata.requestId) {
                 metric.mergeWith({
@@ -645,6 +807,7 @@ class AgenticChatController {
                         shouldDisplayMessage: shouldDisplayMessage &&
                             !currentMessage.userInputMessage?.content?.startsWith('You are Amazon Q'),
                         timestamp: new Date(),
+                        images: currentMessage.userInputMessage?.images,
                     });
                 }
             }
@@ -758,6 +921,16 @@ class AgenticChatController {
             }
             currentRequestInput = this.#updateRequestInputWithToolResults(currentRequestInput, toolResults, content);
         }
+        if (this.#shouldCompact(currentRequestCount)) {
+            const messageId = this.#getMessageIdForCompact((0, uuid_1.v4)());
+            const confirmationResult = this.#processCompactConfirmation(messageId);
+            const cachedButtonBlockId = await chatResultStream.writeResultBlock(confirmationResult);
+            await this.waitForCompactApproval(messageId, chatResultStream, cachedButtonBlockId, session);
+            // Get the compaction request input
+            const compactionRequestInput = this.#getCompactionRequestInput(session);
+            // Start the compaction call
+            return await this.#runCompaction(compactionRequestInput, session, metric, chatResultStream, tabId, promptId, session.conversationId, token, documentReference);
+        }
         return (finalResult || {
             success: false,
             error: 'Agent loop failed to produce a final result',
@@ -787,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) {
@@ -807,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;
@@ -836,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);
@@ -890,58 +1107,69 @@ class AgenticChatController {
                 // remove progress UI
                 await chatResultStream.removeResultBlockAndUpdateUI(agenticChatResultStream_1.progressPrefix + toolUse.toolUseId);
                 // fsRead and listDirectory write to an existing card and could show nothing in the current position
-                if (!['fsWrite', 'fsReplace', 'fsRead', 'listDirectory'].includes(toolUse.name)) {
+                if (![toolConstants_1.FS_WRITE, toolConstants_1.FS_REPLACE, toolConstants_1.FS_READ, toolConstants_1.LIST_DIRECTORY].includes(toolUse.name)) {
                     await this.#showUndoAllIfRequired(chatResultStream, session);
                 }
                 // fsWrite can take a long time, so we render fsWrite  Explanatory upon partial streaming responses.
-                if (toolUse.name !== 'fsWrite' && toolUse.name !== 'fsReplace') {
+                if (toolUse.name !== toolConstants_1.FS_WRITE && toolUse.name !== toolConstants_1.FS_REPLACE) {
                     const { explanation } = toolUse.input;
                     if (explanation) {
                         await chatResultStream.writeResultBlock({
                             type: 'directive',
-                            messageId: toolUse.toolUseId + '_explanation',
+                            messageId: toolUse.toolUseId + toolConstants_1.SUFFIX_EXPLANATION,
                             body: explanation,
                         });
                     }
                 }
                 switch (toolUse.name) {
-                    case 'fsRead':
-                    case 'listDirectory':
-                    case 'grepSearch':
-                    case 'fileSearch':
-                    case 'fsWrite':
-                    case 'fsReplace':
-                    case 'executeBash': {
+                    case toolConstants_1.FS_READ:
+                    case toolConstants_1.LIST_DIRECTORY:
+                    case toolConstants_1.GREP_SEARCH:
+                    case toolConstants_1.FILE_SEARCH:
+                    case toolConstants_1.FS_WRITE:
+                    case toolConstants_1.FS_REPLACE:
+                    case toolConstants_1.EXECUTE_BASH: {
                         const toolMap = {
-                            fsRead: { Tool: fsRead_1.FsRead },
-                            listDirectory: { Tool: listDirectory_1.ListDirectory },
-                            fsWrite: { Tool: fsWrite_1.FsWrite },
-                            fsReplace: { Tool: fsReplace_1.FsReplace },
-                            executeBash: { Tool: executeBash_1.ExecuteBash },
-                            grepSearch: { Tool: grepSearch_1.GrepSearch },
-                            fileSearch: { Tool: fileSearch_1.FileSearch },
+                            [toolConstants_1.FS_READ]: { Tool: fsRead_1.FsRead },
+                            [toolConstants_1.LIST_DIRECTORY]: { Tool: listDirectory_1.ListDirectory },
+                            [toolConstants_1.FS_WRITE]: { Tool: fsWrite_1.FsWrite },
+                            [toolConstants_1.FS_REPLACE]: { Tool: fsReplace_1.FsReplace },
+                            [toolConstants_1.EXECUTE_BASH]: { Tool: executeBash_1.ExecuteBash },
+                            [toolConstants_1.GREP_SEARCH]: { Tool: grepSearch_1.GrepSearch },
+                            [toolConstants_1.FILE_SEARCH]: { Tool: fileSearch_1.FileSearch },
                         };
                         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 === 'executeBash') {
+                        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 === 'executeBash';
                             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) {
@@ -994,7 +1222,7 @@ class AgenticChatController {
                         }
                         break;
                 }
-                if (toolUse.name === 'fsWrite' || toolUse.name === 'fsReplace') {
+                if (toolUse.name === toolConstants_1.FS_WRITE || toolUse.name === toolConstants_1.FS_REPLACE) {
                     const input = toolUse.input;
                     const document = await this.#triggerContext.getTextDocumentFromPath(input.path, true, true);
                     session.toolUseLookup.set(toolUse.toolUseId, {
@@ -1044,27 +1272,27 @@ class AgenticChatController {
                     content: [toolResultContent],
                 });
                 switch (toolUse.name) {
-                    case 'fsRead':
-                    case 'listDirectory':
-                    case 'fileSearch':
+                    case toolConstants_1.FS_READ:
+                    case toolConstants_1.LIST_DIRECTORY:
+                    case toolConstants_1.FILE_SEARCH:
                         const initialListDirResult = this.#processReadOrListOrSearch(toolUse, chatResultStream);
                         if (initialListDirResult) {
                             await chatResultStream.writeResultBlock(initialListDirResult);
                         }
                         break;
                     // no need to write tool result for listDir,fsRead,fileSearch into chat stream
-                    case 'executeBash':
+                    case toolConstants_1.EXECUTE_BASH:
                         // no need to write tool result for listDir and fsRead into chat stream
                         // executeBash will stream the output instead of waiting until the end
                         break;
-                    case 'grepSearch':
+                    case toolConstants_1.GREP_SEARCH:
                         const grepSearchResult = this.#processGrepSearchResult(toolUse, result, chatResultStream);
                         if (grepSearchResult) {
                             await chatResultStream.writeResultBlock(grepSearchResult);
                         }
                         break;
-                    case 'fsReplace':
-                    case 'fsWrite':
+                    case toolConstants_1.FS_REPLACE:
+                    case toolConstants_1.FS_WRITE:
                         const input = toolUse.input;
                         // Load from the filesystem instead of workspace.
                         // Workspace is likely out of date - when files
@@ -1149,12 +1377,12 @@ class AgenticChatController {
                         continue;
                     }
                     // Rethrow error for executeBash or any named tool
-                    if (toolUse.name === 'executeBash' || toolUse.name) {
+                    if (toolUse.name === toolConstants_1.EXECUTE_BASH || toolUse.name) {
                         throw err;
                     }
                 }
                 // display fs write failure status in the UX of that file card
-                if ((toolUse.name === 'fsWrite' || toolUse.name === 'fsReplace') && toolUse.toolUseId) {
+                if ((toolUse.name === toolConstants_1.FS_WRITE || toolUse.name === toolConstants_1.FS_REPLACE) && toolUse.toolUseId) {
                     const existingCard = chatResultStream.getMessageBlockId(toolUse.toolUseId);
                     const fsParam = toolUse.input;
                     if (fsParam.path) {
@@ -1188,7 +1416,7 @@ class AgenticChatController {
                         }
                     }
                 }
-                else if (toolUse.name === 'executeBash' && toolUse.toolUseId) {
+                else if (toolUse.name === toolConstants_1.EXECUTE_BASH && toolUse.toolUseId) {
                     const existingCard = chatResultStream.getMessageBlockId(toolUse.toolUseId);
                     const command = toolUse.input.command;
                     const completedErrorResult = {
@@ -1246,10 +1474,10 @@ class AgenticChatController {
      * Updates the currentUndoAllId state in the session
      */
     #updateUndoAllState(toolUse, session) {
-        if (toolUse.name === 'fsRead' || toolUse.name === 'listDirectory') {
+        if (toolUse.name === toolConstants_1.FS_READ || toolUse.name === toolConstants_1.LIST_DIRECTORY) {
             return;
         }
-        if (toolUse.name === 'fsWrite' || toolUse.name === 'fsReplace') {
+        if (toolUse.name === toolConstants_1.FS_WRITE || toolUse.name === toolConstants_1.FS_REPLACE) {
             if (session.currentUndoAllId === undefined) {
                 session.currentUndoAllId = toolUse.toolUseId;
             }
@@ -1284,10 +1512,10 @@ class AgenticChatController {
         }
         await chatResultStream.writeResultBlock({
             type: 'answer',
-            messageId: `${session.currentUndoAllId}_undoall`,
+            messageId: `${session.currentUndoAllId}${toolConstants_1.SUFFIX_UNDOALL}`,
             buttons: [
                 {
-                    id: 'undo-all-changes',
+                    id: toolConstants_1.BUTTON_UNDO_ALL_CHANGES,
                     text: 'Undo all changes',
                     icon: 'undo',
                     status: 'clear',
@@ -1315,11 +1543,11 @@ class AgenticChatController {
     #validateToolResult(toolUse, result) {
         let maxToolResponseSize;
         switch (toolUse.name) {
-            case 'fsRead':
-            case 'executeBash':
+            case toolConstants_1.FS_READ:
+            case toolConstants_1.EXECUTE_BASH:
                 // fsRead and executeBash already have truncation logic
                 return;
-            case 'listDirectory':
+            case toolConstants_1.LIST_DIRECTORY:
                 maxToolResponseSize = 50_000;
                 break;
             default:
@@ -1371,7 +1599,7 @@ class AgenticChatController {
         if (toolUse.name === qCodeReview_1.QCodeReview.toolName) {
             return this.#getToolOverWritableStream(chatResultStream, toolUse);
         }
-        if (toolUse.name !== 'executeBash') {
+        if (toolUse.name !== toolConstants_1.EXECUTE_BASH) {
             return;
         }
         const toolMsgId = toolUse.toolUseId;
@@ -1379,7 +1607,7 @@ class AgenticChatController {
         let headerEmitted = false;
         const initialHeader = {
             body: 'shell',
-            buttons: [{ id: 'stop-shell-command', text: 'Stop', icon: 'stop' }],
+            buttons: [this.#renderStopShellCommandButton()],
         };
         const completedHeader = {
             body: 'shell',
@@ -1427,7 +1655,7 @@ class AgenticChatController {
     #getUpdateToolConfirmResult(toolUse, isAccept, originalToolName, toolType) {
         const toolName = originalToolName ?? (toolType || toolUse.name);
         // Handle bash commands with special formatting
-        if (toolName === 'executeBash') {
+        if (toolName === toolConstants_1.EXECUTE_BASH) {
             return {
                 messageId: toolUse.toolUseId,
                 type: 'tool',
@@ -1443,7 +1671,7 @@ class AgenticChatController {
                                 text: 'Rejected',
                             },
                         }),
-                    buttons: isAccept ? [{ id: 'stop-shell-command', text: 'Stop', icon: 'stop' }] : [],
+                    buttons: isAccept ? [this.#renderStopShellCommandButton()] : [],
                 },
             };
         }
@@ -1451,10 +1679,10 @@ class AgenticChatController {
         let header;
         let body;
         switch (toolName) {
-            case 'fsReplace':
-            case 'fsWrite':
-            case 'fsRead':
-            case 'listDirectory':
+            case toolConstants_1.FS_REPLACE:
+            case toolConstants_1.FS_WRITE:
+            case toolConstants_1.FS_READ:
+            case toolConstants_1.LIST_DIRECTORY:
                 header = {
                     body: undefined,
                     status: {
@@ -1464,7 +1692,7 @@ class AgenticChatController {
                     },
                 };
                 break;
-            case 'fileSearch':
+            case toolConstants_1.FILE_SEARCH:
                 const searchPath = toolUse.input.path;
                 header = {
                     body: 'File Search',
@@ -1540,6 +1768,97 @@ class AgenticChatController {
             },
         });
     }
+    #processCompactConfirmation(messageId) {
+        const buttons = [{ id: 'allow-tools', text: 'Allow', icon: 'ok', status: 'clear' }];
+        const header = {
+            icon: 'warning',
+            iconForegroundStatus: 'warning',
+            body: constants_2.COMPACTION_HEADER_BODY,
+            buttons,
+        };
+        const body = constants_2.COMPACTION_BODY;
+        return {
+            type: 'tool',
+            messageId,
+            header,
+            body,
+        };
+    }
+    /**
+     * Creates a promise that does not resolve until the user accepts or rejects the compaction usage.
+     * @param messageId
+     * @param resultStream
+     * @param promptBlockId id of approval block. This allows us to overwrite the buttons with 'accepted' or 'rejected' text.
+     */
+    async waitForCompactApproval(messageId, resultStream, promptBlockId, session) {
+        const deferred = this.#createDeferred();
+        session.setDeferredToolExecution(messageId, deferred.resolve, deferred.reject);
+        this.#log(`Prompting for compaction approval for messageId: ${messageId}`);
+        await deferred.promise;
+        // Note: we want to overwrite the button block because it already exists in the stream.
+        await resultStream.overwriteResultBlock(this.#getUpdateCompactConfirmResult(messageId), promptBlockId);
+    }
+    /**
+     * Creates an updated ChatResult for compaction confirmation
+     * @param messageId The messageId
+     * @returns ChatResult with appropriate confirmation UI
+     */
+    #getUpdateCompactConfirmResult(messageId) {
+        let header;
+        let body;
+        header = {
+            body: undefined,
+            status: {
+                status: 'success',
+                icon: 'ok',
+                text: 'Allowed',
+            },
+        };
+        return {
+            messageId,
+            type: 'tool',
+            body,
+            header,
+        };
+    }
+    #renderStopShellCommandButton() {
+        const stopKey = this.#getKeyBinding('aws.amazonq.stopCmdExecution');
+        return {
+            id: toolConstants_1.BUTTON_STOP_SHELL_COMMAND,
+            text: 'Stop',
+            icon: 'stop',
+            ...(stopKey ? { description: `Stop:  ${stopKey}` } : {}),
+        };
+    }
+    #getKeyBinding(commandId) {
+        // Check for feature flag
+        const shortcut = this.#features.lsp.getClientInitializeParams()?.initializationOptions?.aws?.awsClientCapabilities?.q
+            ?.shortcut;
+        if (!shortcut) {
+            return null;
+        }
+        let defaultKey = '';
+        const OS = os.platform();
+        switch (commandId) {
+            case 'aws.amazonq.runCmdExecution':
+                defaultKey = OS === 'darwin' ? constants_2.DEFAULT_MACOS_RUN_SHORTCUT : constants_2.DEFAULT_WINDOW_RUN_SHORTCUT;
+                break;
+            case 'aws.amazonq.rejectCmdExecution':
+                defaultKey = OS === 'darwin' ? constants_2.DEFAULT_MACOS_REJECT_SHORTCUT : constants_2.DEFAULT_WINDOW_REJECT_SHORTCUT;
+                break;
+            case 'aws.amazonq.stopCmdExecution':
+                defaultKey = OS === 'darwin' ? constants_2.DEFAULT_MACOS_STOP_SHORTCUT : constants_2.DEFAULT_WINDOW_STOP_SHORTCUT;
+                break;
+            default:
+                this.#log(`#getKeyBinding: ${commandId} shortcut is supported by Q `);
+                break;
+        }
+        if (defaultKey === '') {
+            return null;
+        }
+        //TODO: handle case: user change default keybind, suggestion: read `keybinding.json` provided by VSC
+        return defaultKey;
+    }
     #processToolConfirmation(toolUse, requiresAcceptance, warning, commandCategory, toolType, builtInPermission) {
         const toolName = toolType || toolUse.name;
         let buttons = [];
@@ -1547,16 +1866,27 @@ class AgenticChatController {
         let body;
         // Configure tool-specific UI elements
         switch (toolName) {
-            case 'executeBash': {
+            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: 'run-shell-command', text: 'Run', icon: 'play' },
                         {
-                            id: 'reject-shell-command',
+                            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}` } : {}),
                         },
                     ]
                     : [];
@@ -1585,12 +1915,12 @@ class AgenticChatController {
                 body = '```shell\n' + commandString;
                 break;
             }
-            case 'fsWrite': {
+            case toolConstants_1.FS_WRITE: {
                 const writeFilePath = toolUse.input.path;
                 // Validate the path using our synchronous utility
                 (0, pathValidation_1.validatePathBasic)(writeFilePath);
                 this.#debug(`Processing ${toolUse.name} for path: ${writeFilePath}`);
-                buttons = [{ id: 'allow-tools', text: 'Allow', icon: 'ok', status: 'clear' }];
+                buttons = [{ id: toolConstants_1.BUTTON_ALLOW_TOOLS, text: 'Allow', icon: 'ok', status: 'clear' }];
                 header = {
                     icon: 'warning',
                     iconForegroundStatus: 'warning',
@@ -1604,12 +1934,12 @@ class AgenticChatController {
                     : `I need permission to modify files outside of your workspace.\n\`${writeFilePath}\``;
                 break;
             }
-            case 'fsReplace': {
+            case toolConstants_1.FS_REPLACE: {
                 const writeFilePath = toolUse.input.path;
                 // For replace, we need to verify the file exists
                 (0, pathValidation_1.validatePathExists)(writeFilePath);
                 this.#debug(`Processing ${toolUse.name} for path: ${writeFilePath}`);
-                buttons = [{ id: 'allow-tools', text: 'Allow', icon: 'ok', status: 'clear' }];
+                buttons = [{ id: toolConstants_1.BUTTON_ALLOW_TOOLS, text: 'Allow', icon: 'ok', status: 'clear' }];
                 header = {
                     icon: 'warning',
                     iconForegroundStatus: 'warning',
@@ -1623,9 +1953,9 @@ class AgenticChatController {
                     : `I need permission to modify files outside of your workspace.\n\`${writeFilePath}\``;
                 break;
             }
-            case 'fsRead':
-            case 'listDirectory': {
-                buttons = [{ id: 'allow-tools', text: 'Allow', icon: 'ok', status: 'clear' }];
+            case toolConstants_1.FS_READ:
+            case toolConstants_1.LIST_DIRECTORY: {
+                buttons = [{ id: toolConstants_1.BUTTON_ALLOW_TOOLS, text: 'Allow', icon: 'ok', status: 'clear' }];
                 header = {
                     icon: 'tools',
                     iconForegroundStatus: 'tools',
@@ -1634,7 +1964,7 @@ class AgenticChatController {
                         : '#### Allow read-only tools outside your workspace',
                     buttons,
                 };
-                if (toolName === 'fsRead') {
+                if (toolName === toolConstants_1.FS_READ) {
                     const paths = toolUse.input.paths;
                     // Validate paths using our synchronous utility
                     (0, pathValidation_1.validatePaths)(paths);
@@ -1645,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);
@@ -1654,11 +1984,17 @@ 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: {
                 // — DEFAULT ⇒ MCP tools
-                buttons = [{ id: 'allow-tools', text: 'Allow', icon: 'ok', status: 'clear' }];
+                buttons = [{ id: toolConstants_1.BUTTON_ALLOW_TOOLS, text: 'Allow', icon: 'ok', status: 'clear' }];
                 header = {
                     icon: 'tools',
                     iconForegroundStatus: 'warning',
@@ -1676,7 +2012,7 @@ class AgenticChatController {
                 type: 'tool',
                 messageId: this.#getMessageIdForToolUse(toolType, toolUse),
                 header,
-                body: warning ? (toolName === 'executeBash' ? '' : '\n\n') + body : body,
+                body: warning ? (toolName === toolConstants_1.EXECUTE_BASH ? '' : '\n\n') + body : body,
             };
         }
         else {
@@ -1689,9 +2025,9 @@ class AgenticChatController {
                             icon: 'tools',
                             body: `${toolName}`,
                             buttons: [
-                                { id: 'allow-tools', text: 'Run', icon: 'play', status: 'clear' },
+                                { id: toolConstants_1.BUTTON_ALLOW_TOOLS, text: 'Run', icon: 'play', status: 'clear' },
                                 {
-                                    id: 'reject-mcp-tool',
+                                    id: toolConstants_1.BUTTON_REJECT_MCP_TOOL,
                                     text: 'Reject',
                                     icon: 'cancel',
                                     status: 'dimmed-clear',
@@ -1737,7 +2073,7 @@ class AgenticChatController {
                         },
                     },
                 },
-                buttons: [{ id: 'undo-changes', text: 'Undo', icon: 'undo' }],
+                buttons: [{ id: toolConstants_1.BUTTON_UNDO_CHANGES, text: 'Undo', icon: 'undo' }],
             },
         };
     }
@@ -1751,7 +2087,7 @@ class AgenticChatController {
             chatResultStream.setMessageIdToUpdateForTool(toolUse.name, messageIdToUpdate);
         }
         let currentPaths = [];
-        if (toolUse.name === 'fsRead') {
+        if (toolUse.name === toolConstants_1.FS_READ) {
             currentPaths = toolUse.input?.paths;
         }
         else {
@@ -1782,9 +2118,9 @@ class AgenticChatController {
         }
         else {
             title =
-                toolUse.name === 'fsRead'
+                toolUse.name === toolConstants_1.FS_READ
                     ? `${itemCount} file${itemCount > 1 ? 's' : ''} read`
-                    : toolUse.name === 'fileSearch'
+                    : toolUse.name === toolConstants_1.FILE_SEARCH
                         ? `${itemCount} ${itemCount === 1 ? 'directory' : 'directories'} searched`
                         : `${itemCount} ${itemCount === 1 ? 'directory' : 'directories'} listed`;
         }
@@ -1811,7 +2147,7 @@ class AgenticChatController {
      * Process grep search results and format them for display in the chat UI
      */
     #processGrepSearchResult(toolUse, result, chatResultStream) {
-        if (toolUse.name !== 'grepSearch') {
+        if (toolUse.name !== toolConstants_1.GREP_SEARCH) {
             return undefined;
         }
         let messageIdToUpdate = toolUse.toolUseId;
@@ -1880,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({
@@ -1891,22 +2229,22 @@ class AgenticChatController {
     /**
      * Handles the final result after the agent loop completes
      */
-    async #handleFinalResult(result, session, params, metric, triggerContext, isNewConversation, chatResultStream) {
+    async #handleFinalResult(result, session, tabId, metric, triggerContext, isNewConversation, chatResultStream) {
         if (!result.success) {
             throw new errors_2.AgenticChatError(result.error, 'FailedResult');
         }
         const conversationId = session.conversationId;
         this.#debug('Final session conversation id:', conversationId || '');
         if (conversationId) {
-            this.#telemetryController.setConversationId(params.tabId, conversationId);
+            this.#telemetryController.setConversationId(tabId, conversationId);
             if (isNewConversation) {
-                this.#telemetryController.updateTriggerInfo(params.tabId, {
+                this.#telemetryController.updateTriggerInfo(tabId, {
                     startTrigger: {
                         hasUserSnippet: metric.metric.cwsprChatHasCodeSnippet ?? false,
                         triggerType: triggerContext.triggerType,
                     },
                 });
-                this.#telemetryController.emitStartConversationMetric(params.tabId, metric.metric);
+                this.#telemetryController.emitStartConversationMetric(tabId, metric.metric);
             }
         }
         metric.setDimension('codewhispererCustomizationArn', this.#customizationArn);
@@ -1940,8 +2278,8 @@ class AgenticChatController {
                 cwsprChatPinnedPromptContextCount: triggerContext.contextInfo.pinnedContextCount.promptContextCount,
             });
         }
-        await this.#telemetryController.emitAddMessageMetric(params.tabId, metric.metric, 'Succeeded');
-        this.#telemetryController.updateTriggerInfo(params.tabId, {
+        await this.#telemetryController.emitAddMessageMetric(tabId, metric.metric, 'Succeeded');
+        this.#telemetryController.updateTriggerInfo(tabId, {
             lastMessageTrigger: {
                 ...triggerContext,
                 messageId: result.data?.chatResult.messageId,
@@ -2191,7 +2529,7 @@ class AgenticChatController {
         const session = this.#chatSessionManagementService.getSession(params.tabId);
         const toolUseId = params.messageId;
         const toolUse = toolUseId ? session.data?.toolUseLookup.get(toolUseId) : undefined;
-        if (toolUse?.name === 'fsWrite' || toolUse?.name === 'fsReplace') {
+        if (toolUse?.name === toolConstants_1.FS_WRITE || toolUse?.name === toolConstants_1.FS_REPLACE) {
             const input = toolUse.input;
             this.#features.lsp.workspace.openFileDiff({
                 originalFileUri: input.path,
@@ -2200,7 +2538,7 @@ class AgenticChatController {
                 fileContent: toolUse.fileChange?.after,
             });
         }
-        else if (toolUse?.name === 'fsRead') {
+        else if (toolUse?.name === toolConstants_1.FS_READ) {
             await this.#features.lsp.window.showDocument({ uri: vscode_uri_1.URI.file(params.filePath).toString() });
         }
         else {
@@ -2410,9 +2748,31 @@ class AgenticChatController {
         });
         return triggerContext;
     }
+    async #invalidateCompactCommand(tabId, messageIds) {
+        for (const messageId of messageIds) {
+            await this.#features.chat.sendChatUpdate({
+                tabId,
+                state: { inProgress: false },
+                data: {
+                    messages: [
+                        {
+                            messageId,
+                            type: 'tool',
+                            body: constants_2.COMPACTION_BODY,
+                            header: {
+                                body: constants_2.COMPACTION_HEADER_BODY,
+                                status: { icon: 'block', text: 'Ignored' },
+                                buttons: [],
+                            },
+                        },
+                    ],
+                },
+            });
+        }
+    }
     async #invalidateAllShellCommands(tabId, session) {
         for (const [toolUseId, toolUse] of session.toolUseLookup.entries()) {
-            if (toolUse.name !== 'executeBash' || this.#stoppedToolUses.has(toolUseId))
+            if (toolUse.name !== toolConstants_1.EXECUTE_BASH || this.#stoppedToolUses.has(toolUseId))
                 continue;
             const params = toolUse.input;
             const command = params.command;
@@ -2637,7 +2997,7 @@ class AgenticChatController {
             return;
         }
     }
-    async #processAgenticChatResponseWithTimeout(response, metric, chatResultStream, session, contextList) {
+    async #processAgenticChatResponseWithTimeout(response, metric, chatResultStream, session, contextList, isCompaction) {
         const abortController = new AbortController();
         let timeoutId;
         const timeoutPromise = new Promise((_, reject) => {
@@ -2647,7 +3007,7 @@ class AgenticChatController {
             }, constants_2.RESPONSE_TIMEOUT_MS);
         });
         const streamWriter = chatResultStream.getResultStreamWriter();
-        const processResponsePromise = this.#processAgenticChatResponse(response, metric, chatResultStream, streamWriter, session, contextList, abortController.signal);
+        const processResponsePromise = this.#processAgenticChatResponse(response, metric, chatResultStream, streamWriter, session, contextList, abortController.signal, isCompaction);
         try {
             const result = await Promise.race([processResponsePromise, timeoutPromise]);
             clearTimeout(timeoutId);
@@ -2671,7 +3031,7 @@ class AgenticChatController {
         }
         const toolUses = Object.values(data.toolUses);
         for (const toolUse of toolUses) {
-            if ((toolUse.name === 'fsWrite' || toolUse.name === 'fsReplace') && typeof toolUse.input === 'string') {
+            if ((toolUse.name === toolConstants_1.FS_WRITE || toolUse.name === toolConstants_1.FS_REPLACE) && typeof toolUse.input === 'string') {
                 const filepath = extractKey(toolUse.input, 'path');
                 const msgId = agenticChatResultStream_1.progressPrefix + toolUse.toolUseId;
                 // render fs write UI as soon as fs write starts
@@ -2700,7 +3060,7 @@ class AgenticChatController {
                 }
                 // render the tool use explanatory as soon as this is received for fsWrite/fsReplace
                 const explanation = extractKey(toolUse.input, 'explanation');
-                const messageId = agenticChatResultStream_1.progressPrefix + toolUse.toolUseId + '_explanation';
+                const messageId = agenticChatResultStream_1.progressPrefix + toolUse.toolUseId + toolConstants_1.SUFFIX_EXPLANATION;
                 if (explanation && !chatResultStream.hasMessage(messageId)) {
                     await streamWriter.close();
                     await chatResultStream.writeResultBlock({
@@ -2712,12 +3072,12 @@ class AgenticChatController {
             }
         }
     }
-    async #processAgenticChatResponse(response, metric, chatResultStream, streamWriter, session, contextList, abortSignal) {
+    async #processAgenticChatResponse(response, metric, chatResultStream, streamWriter, session, contextList, abortSignal, isCompaction) {
         const requestId = response.$metadata.requestId;
         const chatEventParser = new agenticChatEventParser_1.AgenticChatEventParser(requestId, metric, this.#features.logging);
         // Display context transparency list once at the beginning of response
         // Use a flag to track if contextList has been sent already to avoid ux flickering
-        if (contextList?.filePaths && contextList.filePaths.length > 0 && !session.contextListSent) {
+        if (!isCompaction && contextList?.filePaths && contextList.filePaths.length > 0 && !session.contextListSent) {
             await streamWriter.write({ body: '', contextList });
             session.contextListSent = true;
         }
@@ -2751,7 +3111,7 @@ class AgenticChatController {
             if (chatEvent.assistantResponseEvent && result.data.chatResult.body) {
                 this.recordChunk('chunk');
             }
-            // make sure to save code reference events
+            // update the UI with response
             if (chatEvent.assistantResponseEvent || chatEvent.codeReferenceEvent) {
                 await streamWriter.write(result.data.chatResult);
             }
@@ -2761,9 +3121,17 @@ class AgenticChatController {
             }
         }
         if (isEmptyResponse) {
-            // If the response is empty, we need to send an empty answer message to remove the Thinking... indicator
+            // If the response is empty, we need to send an empty answer message to remove the Working... indicator
             await streamWriter.write({ type: 'answer', body: '', messageId: (0, uuid_1.v4)() });
         }
+        if (isCompaction) {
+            // Show a dummy message to the UI for compaction completion
+            await streamWriter.write({
+                type: 'answer',
+                body: 'Conversation history has been compacted successfully!',
+                messageId: (0, uuid_1.v4)(),
+            });
+        }
         await streamWriter.close();
         metric.mergeWith({
             cwsprChatFullResponseLatency: metric.getTimeElapsed(),
@@ -3027,6 +3395,14 @@ class AgenticChatController {
     #debug(...messages) {
         this.#features.logging.debug(messages.join(' '));
     }
+    // Helper function to sanitize the 'images' field for logging by replacing large binary data (e.g., Uint8Array) with a concise summary.
+    // This prevents logs from being overwhelmed by raw byte arrays and keeps log output readable.
+    #imageReplacer(key, value) {
+        if (key === 'bytes' && value && typeof value.length === 'number') {
+            return `[Uint8Array, length: ${value.length}]`;
+        }
+        return value;
+    }
 }
 exports.AgenticChatController = AgenticChatController;
 //# sourceMappingURL=agenticChatController.js.map