Merge main into feature/smus-inline-refresh

Author: aws-toolkit-automation

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.test.ts

@@ -479,6 +479,17 @@ describe('AgenticChatController', () => {
             assert.strictEqual(typeof session.conversationId, 'string')
         })
 
+        it('includes conversationId in the request input', async () => {
+            chatController.onTabAdd({ tabId: mockTabId })
+            const session = chatSessionManagementService.getSession(mockTabId).data
+            assert.ok(session)
+
+            await chatController.onChatPrompt({ tabId: mockTabId, prompt: { prompt: 'Hello' } }, mockCancellationToken)
+
+            const requestInput: GenerateAssistantResponseCommandInput = generateAssistantResponseStub.firstCall.firstArg
+            assert.strictEqual(requestInput.conversationState?.conversationId, session.conversationId)
+        })
+
         it('invokes IdleWorkspaceManager recordActivityTimestamp', async () => {
             const recordActivityTimestampStub = sinon.stub(IdleWorkspaceManager, 'recordActivityTimestamp')
 

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts

@@ -1186,7 +1186,8 @@ export class AgenticChatController implements ChatHandlers {
             additionalContext,
             session.modelId,
             this.#origin,
-            images
+            images,
+            session.conversationId
         )
         return requestInput
     }
@@ -1202,7 +1203,8 @@ export class AgenticChatController implements ChatHandlers {
             profileArn,
             this.#getTools(session),
             session.modelId,
-            this.#origin
+            this.#origin,
+            session.conversationId
         )
         return requestInput
     }

server/aws-lsp-codewhisperer/src/language-server/agenticChat/context/agenticChatTriggerContext.ts

@@ -119,10 +119,12 @@ export class AgenticChatTriggerContext {
         profileArn?: string,
         tools: BedrockTools = [],
         modelId?: string,
-        origin?: Origin
+        origin?: Origin,
+        conversationId?: string
     ): ChatCommandInput {
         const data: ChatCommandInput = {
             conversationState: {
+                conversationId,
                 chatTriggerType: ChatTriggerType.MANUAL,
                 currentMessage: {
                     userInputMessage: {
@@ -170,7 +172,8 @@ export class AgenticChatTriggerContext {
         additionalContent?: AdditionalContentEntryAddition[],
         modelId?: string,
         origin?: Origin,
-        imageContext?: ImageBlock[]
+        imageContext?: ImageBlock[],
+        conversationId?: string
     ): Promise<ChatCommandInput> {
         const { prompt } = params
         const workspaceFolders = workspaceUtils.getWorkspaceFolderPaths(this.#workspace).slice(0, maxWorkspaceFolders)
@@ -258,6 +261,7 @@ export class AgenticChatTriggerContext {
 
         const data: ChatCommandInput = {
             conversationState: {
+                conversationId,
                 workspaceId: workspaceId,
                 chatTriggerType: chatTriggerType,
                 currentMessage: {

server/aws-lsp-codewhisperer/src/language-server/agenticChat/context/agenticChatTriggerContexts.test.ts

@@ -159,6 +159,27 @@ describe('AgenticChatTriggerContext', () => {
         assert.strictEqual(chatParams.conversationState?.currentMessage?.userInputMessage?.modelId, undefined)
     })
 
+    it('includes conversationId in chat params when provided', async () => {
+        const triggerContext = new AgenticChatTriggerContext(testFeatures)
+        const conversationId = 'test-conversation-id'
+
+        const chatParams = await triggerContext.getChatParamsFromTrigger(
+            { tabId: 'tab', prompt: {} },
+            {},
+            ChatTriggerType.MANUAL,
+            undefined,
+            undefined,
+            undefined,
+            [],
+            undefined,
+            undefined,
+            undefined,
+            undefined,
+            conversationId
+        )
+        assert.strictEqual(chatParams.conversationState?.conversationId, conversationId)
+    })
+
     it('includes remote workspaceId if it exists and is connected', async () => {
         mockWorkspaceFolderManager = {
             getWorkspaceState: sinon.stub(),