Merge remote-tracking branch 'upstream/feature/agentic-chat' into feature/agentic-chat

Author: laileni-aws

package-lock.json

@@ -41,7 +41,7 @@
         "skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.314",
+        "@aws-toolkits/telemetry": "^1.0.315",
         "@playwright/browser-chromium": "^1.43.1",
         "@stylistic/eslint-plugin": "^2.11.0",
         "@types/he": "^1.2.3",

package.json

@@ -543,7 +543,11 @@ export class CWCTelemetryHelper {
             cwsprChatFullDisplayLatency: fullDisplayLatency,
             cwsprChatRequestLength: triggerPayload.message.length,
             cwsprChatResponseLength: message.messageLength,
-            cwsprChatConversationType: triggerPayload.origin ? 'AgenticChat' : 'Chat',
+            cwsprChatConversationType: triggerPayload.origin
+                ? triggerPayload.toolResults
+                    ? 'AgenticChatWithToolUse'
+                    : 'AgenticChat'
+                : 'Chat',
             credentialStartUrl: AuthUtil.instance.startUrl,
             codewhispererCustomizationArn: triggerPayload.customization.arn,
             cwsprChatHasProjectContext: hasProjectLevelContext,
@@ -623,7 +627,11 @@ export class CWCTelemetryHelper {
             cwsprChatActiveEditorImportCount: triggerPayload.codeQuery?.fullyQualifiedNames?.used?.length,
             cwsprChatResponseCode: responseCode,
             cwsprChatRequestLength: triggerPayload.message?.length ?? 0,
-            cwsprChatConversationType: triggerPayload.origin ? 'AgenticChat' : 'Chat',
+            cwsprChatConversationType: triggerPayload.origin
+                ? triggerPayload.toolResults
+                    ? 'AgenticChatWithToolUse'
+                    : 'AgenticChat'
+                : 'Chat',
             credentialStartUrl: AuthUtil.instance.startUrl,
             requestId: requestID,
             reasonDesc: getTelemetryReasonDesc(errorReason),