Merge branch 'main' into release-please--branches--main

Author: ashishrp-aws

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

@@ -3535,6 +3535,7 @@ export class AgenticChatController implements ChatHandlers {
         if (triggerContext.contextInfo) {
             metric.mergeWith({
                 cwsprChatHasContextList: triggerContext.documentReference?.filePaths?.length ? true : false,
+                cwsprChatHasWorkspaceContext: triggerContext.hasWorkspace ?? false,
                 cwsprChatFolderContextCount: triggerContext.contextInfo.contextCount.folderContextCount,
                 cwsprChatFileContextCount: triggerContext.contextInfo.contextCount.fileContextCount,
                 cwsprChatRuleContextCount: triggerContext.contextInfo.contextCount.activeRuleContextCount,

server/aws-lsp-codewhisperer/src/language-server/chat/telemetry/chatTelemetryController.ts

@@ -338,6 +338,7 @@ export class ChatTelemetryController {
                 chatConversationType: metric.cwsprChatConversationType,
                 chatActiveEditorImportCount: metric.cwsprChatActiveEditorImportCount,
                 cwsprChatHasContextList: metric.cwsprChatHasContextList,
+                cwsprChatHasWorkspaceContext: metric.cwsprChatHasWorkspaceContext,
                 cwsprChatFolderContextCount: metric.cwsprChatFolderContextCount,
                 cwsprChatFileContextCount: metric.cwsprChatFileContextCount,
                 cwsprChatRuleContextCount: metric.cwsprChatRuleContextCount,

server/aws-lsp-codewhisperer/src/shared/telemetry/telemetryService.test.ts

@@ -775,6 +775,7 @@ describe('TelemetryService', () => {
                 },
                 {
                     cwsprChatHasContextList: true,
+                    cwsprChatHasWorkspaceContext: false,
                     cwsprChatFolderContextCount: 0,
                     cwsprChatFileContextCount: 0,
                     cwsprChatRuleContextCount: 0,
@@ -844,6 +845,7 @@ describe('TelemetryService', () => {
                     experimentName: undefined,
                     userVariation: undefined,
                     cwsprChatHasContextList: true,
+                    cwsprChatHasWorkspaceContext: false,
                     cwsprChatFolderContextCount: 0,
                     cwsprChatFileContextCount: 0,
                     cwsprChatRuleContextCount: 0,

server/aws-lsp-codewhisperer/src/shared/telemetry/telemetryService.ts

@@ -563,6 +563,7 @@ export class TelemetryService {
             chatConversationType: ChatConversationType
             chatActiveEditorImportCount?: number
             cwsprChatHasContextList: boolean
+            cwsprChatHasWorkspaceContext?: boolean
             cwsprChatFolderContextCount: number
             cwsprChatFileContextCount: number
             cwsprChatFileContextLength: number
@@ -616,6 +617,7 @@ export class TelemetryService {
                     cwsprChatActiveEditorImportCount: additionalParams.chatActiveEditorImportCount,
                     codewhispererCustomizationArn: params.customizationArn,
                     cwsprChatHasContextList: additionalParams.cwsprChatHasContextList,
+                    cwsprChatHasWorkspaceContext: additionalParams.cwsprChatHasWorkspaceContext,
                     cwsprChatFolderContextCount: additionalParams.cwsprChatFolderContextCount,
                     cwsprChatFileContextCount: additionalParams.cwsprChatFileContextCount,
                     cwsprChatRuleContextCount: additionalParams.cwsprChatRuleContextCount,

server/aws-lsp-codewhisperer/src/shared/telemetry/types.ts

@@ -319,6 +319,7 @@ export type AddMessageEvent = {
 
     // context related metrics
     cwsprChatHasContextList?: boolean
+    cwsprChatHasWorkspaceContext?: boolean
     cwsprChatFolderContextCount?: number
     cwsprChatFileContextCount?: number
     cwsprChatFileContextLength?: number