@aws/lsp-codewhisperer 0.0.83 → 0.0.85

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

@@ -469,10 +469,13 @@ class AgenticChatController {
             });
             // Wait for the response to be completed before proceeding
             this.#log('Model Response: ', JSON.stringify(responseResult, null, 2));
-            models = Object.values(responseResult.models).map(({ modelId, modelName }) => ({
-                id: modelId,
-                name: modelName ?? modelId,
-            }));
+            if (responseResult.models) {
+                models = Object.values(responseResult.models).map(({ modelId, modelName, description }) => ({
+                    id: modelId ?? 'unknown',
+                    name: modelName ?? modelId ?? 'unknown',
+                    description: description ?? '',
+                }));
+            }
             defaultModelId = responseResult.defaultModel?.modelId;
             // Cache the models with defaultModelId
             this.#chatHistoryDb.setCachedModels(models, defaultModelId);
@@ -505,7 +508,7 @@ class AgenticChatController {
         // Get models from cache or API
         const { models, defaultModelId, errorFromAPI } = await this.#fetchModelsWithCache();
         // Get the first fallback model option as default
-        const defaultModelOption = modelSelection_1.FALLBACK_MODEL_OPTIONS[1];
+        const defaultModelOption = modelSelection_1.FALLBACK_MODEL_OPTIONS[0];
         const DEFAULT_MODEL_ID = defaultModelId || defaultModelOption?.id;
         const sessionResult = this.#chatSessionManagementService.getSession(params.tabId);
         const { data: session, success } = sessionResult;
@@ -654,6 +657,11 @@ class AgenticChatController {
         }
         const compactIds = session.getAllDeferredCompactMessageIds();
         await this.#invalidateCompactCommand(params.tabId, compactIds);
+        // Set compactionDeclined flag if there were pending compaction requests
+        // This prevents endless compaction warning loops when user declines compaction once
+        if (compactIds.length > 0) {
+            session.compactionDeclined = true;
+        }
         session.rejectAllDeferredToolExecutions(new toolShared_1.ToolApprovalException('Command ignored: new prompt', false));
         await this.#invalidateAllShellCommands(params.tabId, session);
         const metric = new metric_1.Metric({
@@ -685,6 +693,10 @@ class AgenticChatController {
                 session.abortRequest();
                 const compactIds = session.getAllDeferredCompactMessageIds();
                 await this.#invalidateCompactCommand(params.tabId, compactIds);
+                // Set compactionDeclined flag if there were pending compaction requests
+                if (compactIds.length > 0) {
+                    session.compactionDeclined = true;
+                }
                 void this.#invalidateAllShellCommands(params.tabId, session);
                 session.rejectAllDeferredToolExecutions(new lsp_core_1.CancellationError('user'));
                 // Then update UI to inform the user
@@ -698,6 +710,13 @@ class AgenticChatController {
                 await this.#telemetryController.emitAddMessageMetric(params.tabId, metric.metric, 'Cancelled');
             });
             session.setConversationType('AgenticChat');
+            // Set up delay notification callback to show retry progress to users
+            session.setDelayNotificationCallback(notification => {
+                if (notification.thresholdExceeded) {
+                    this.#log(`Updating progress message: ${notification.message}`);
+                    void chatResultStream.updateProgressMessage(notification.message);
+                }
+            });
             const additionalContext = await this.#additionalContextProvider.getAdditionalContext(triggerContext, params.tabId, params.context, params.prompt.prompt);
             // Add active file to context list if it's not already there
             const activeFile = triggerContext.text &&
@@ -740,7 +759,12 @@ class AgenticChatController {
                 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);
+            const result = await this.#handleFinalResult(finalResult, session, params.tabId, metric, triggerContext, isNewConversation, chatResultStream);
+            // Reset compactionDeclined flag after successful completion
+            if (session.compactionDeclined) {
+                session.compactionDeclined = false;
+            }
+            return result;
         }
         catch (err) {
             // HACK: the chat-client needs to have a partial event with the associated messageId sent before it can accept the final result.
@@ -782,19 +806,20 @@ class AgenticChatController {
     /**
      * Prepares the initial request input for the chat prompt
      */
-    #getCompactionRequestInput(session) {
+    #getCompactionRequestInput(session, toolResults) {
         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);
+        const requestInput = this.#triggerContext.getCompactionChatCommandInput(profileArn, this.#getTools(session), session.modelId, this.#origin, toolResults);
         return requestInput;
     }
     /**
      * Runs the compaction, making requests and processing tool uses until completion
      */
-    #shouldCompact(currentRequestCount) {
-        if (currentRequestCount > constants_2.COMPACTION_CHARACTER_THRESHOLD) {
-            this.#debug(`Current request total character count is: ${currentRequestCount}, prompting user to compact`);
+    #shouldCompact(currentRequestCount, session) {
+        const EFFECTIVE_COMPACTION_THRESHOLD = constants_2.COMPACTION_CHARACTER_THRESHOLD - constants_2.COMPACTION_PROMPT.length;
+        if (currentRequestCount > EFFECTIVE_COMPACTION_THRESHOLD && !session.compactionDeclined) {
+            this.#debug(`Current request total character count is: ${currentRequestCount}, prompting user to compact (threshold: ${EFFECTIVE_COMPACTION_THRESHOLD})`);
             return true;
         }
         else {
@@ -914,6 +939,8 @@ class AgenticChatController {
         let shouldDisplayMessage = true;
         let currentRequestCount = 0;
         const pinnedContext = additionalContext?.filter(item => item.pinned);
+        // Store initial non-empty prompt for compaction handoff
+        const initialPrompt = initialRequestInput.conversationState?.currentMessage?.userInputMessage?.content?.trim() || '';
         metric.recordStart();
         this.logSystemInformation();
         while (true) {
@@ -963,6 +990,34 @@ class AgenticChatController {
             this.#llmRequestStartTime = Date.now();
             // Phase 3: Request Execution
             currentRequestInput = (0, utils_2.sanitizeRequestInput)(currentRequestInput);
+            if (this.#shouldCompact(currentRequestCount, session)) {
+                this.#features.logging.info(`Entering mid-loop compaction at iteration ${iterationCount} with ${currentRequestCount} characters`);
+                this.#telemetryController.emitMidLoopCompaction(currentRequestCount, iterationCount, this.#features.runtime.serverInfo.version ?? '');
+                const messageId = this.#getMessageIdForCompact((0, uuid_1.v4)());
+                const confirmationResult = this.#processCompactConfirmation(messageId, currentRequestCount);
+                const cachedButtonBlockId = await chatResultStream.writeResultBlock(confirmationResult);
+                await this.waitForCompactApproval(messageId, chatResultStream, cachedButtonBlockId, session);
+                // Run compaction
+                const toolResults = currentRequestInput.conversationState?.currentMessage?.userInputMessage?.userInputMessageContext
+                    ?.toolResults || [];
+                const compactionRequestInput = this.#getCompactionRequestInput(session, toolResults);
+                const compactionResult = await this.#runCompaction(compactionRequestInput, session, metric, chatResultStream, tabId, promptId, types_1.CompactHistoryActionType.Nudge, session.conversationId, token, documentReference);
+                if (!compactionResult.success) {
+                    this.#features.logging.error(`Compaction failed: ${compactionResult.error}`);
+                    return compactionResult;
+                }
+                // Show compaction summary to user before continuing
+                await chatResultStream.writeResultBlock({
+                    type: 'answer',
+                    body: (compactionResult.data?.chatResult.body || '') +
+                        '\n\nConversation history has been compacted successfully!',
+                    messageId: (0, uuid_1.v4)(),
+                });
+                currentRequestInput = this.#updateRequestInputWithToolResults(currentRequestInput, [], constants_2.MID_LOOP_COMPACTION_HANDOFF_PROMPT + initialPrompt);
+                shouldDisplayMessage = false;
+                this.#features.logging.info(`Completed mid-loop compaction, restarting loop with handoff prompt`);
+                continue;
+            }
             // Note: these logs are very noisy, but contain information redacted on the backend.
             this.#debug(`generateAssistantResponse/SendMessage Request: ${JSON.stringify(currentRequestInput, this.#imageReplacer, 2)}`);
             const response = await session.getChatResponse(currentRequestInput);
@@ -1105,7 +1160,7 @@ class AgenticChatController {
             }
             currentRequestInput = this.#updateRequestInputWithToolResults(currentRequestInput, toolResults, content);
         }
-        if (this.#shouldCompact(currentRequestCount)) {
+        if (this.#shouldCompact(currentRequestCount, session)) {
             this.#telemetryController.emitCompactNudge(currentRequestCount, this.#features.runtime.serverInfo.version ?? '');
             const messageId = this.#getMessageIdForCompact((0, uuid_1.v4)());
             const confirmationResult = this.#processCompactConfirmation(messageId, currentRequestCount);
@@ -3713,8 +3768,9 @@ class AgenticChatController {
             codeWhispererServiceToken
                 .listFeatureEvaluations({ userContext })
                 .then(result => {
-                const feature = result.featureEvaluations?.find(feature => ['MaestroWorkspaceContext', 'SematicSearchTool'].includes(feature.feature));
-                if (feature) {
+                const feature = result.featureEvaluations?.find(feature => feature.feature &&
+                    ['MaestroWorkspaceContext', 'SematicSearchTool'].includes(feature.feature));
+                if (feature && feature.feature && feature.variation) {
                     this.#abTestingAllocation = {
                         experimentName: feature.feature,
                         userVariation: feature.variation,