From ab95a2e702e34459fb407ec9d4211b8b6e609bdf Mon Sep 17 00:00:00 2001 From: Jacob Chung Date: Mon, 14 Apr 2025 12:21:52 -0700 Subject: [PATCH] chat vs agenticChat --- package-lock.json | 8 ++++---- package.json | 2 +- .../src/codewhispererChat/controllers/chat/controller.ts | 6 +++++- .../codewhispererChat/controllers/chat/telemetryHelper.ts | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 22021f66d56..f50c19aeed7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "vscode-nls-dev": "^4.0.4" }, "devDependencies": { - "@aws-toolkits/telemetry": "^1.0.313", + "@aws-toolkits/telemetry": "^1.0.314", "@playwright/browser-chromium": "^1.43.1", "@stylistic/eslint-plugin": "^2.11.0", "@types/he": "^1.2.3", @@ -10806,9 +10806,9 @@ } }, "node_modules/@aws-toolkits/telemetry": { - "version": "1.0.313", - "resolved": "https://registry.npmjs.org/@aws-toolkits/telemetry/-/telemetry-1.0.313.tgz", - "integrity": "sha512-GHlx2AoUfUuadXjZqMlQmpayVhnH1r6Ndbm7jOXvp80j3cwHqUdOgD/7gqK4mYKuxNBhEFC9yB5ieqmaH1lMuQ==", + "version": "1.0.314", + "resolved": "https://registry.npmjs.org/@aws-toolkits/telemetry/-/telemetry-1.0.314.tgz", + "integrity": "sha512-9Utwv6Z1TO477+l67Y35OhPzWWOFEetj8qcyQ9bBXnJmq0fVGTyvx1RH/OxmcGW42iAIovA9a3ck4oou02rbeQ==", "dev": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index f36a4d32d84..944c3d0f926 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/" }, "devDependencies": { - "@aws-toolkits/telemetry": "^1.0.313", + "@aws-toolkits/telemetry": "^1.0.314", "@playwright/browser-chromium": "^1.43.1", "@stylistic/eslint-plugin": "^2.11.0", "@types/he": "^1.2.3", diff --git a/packages/core/src/codewhispererChat/controllers/chat/controller.ts b/packages/core/src/codewhispererChat/controllers/chat/controller.ts index 240d820b10a..e0cd1c699e8 100644 --- a/packages/core/src/codewhispererChat/controllers/chat/controller.ts +++ b/packages/core/src/codewhispererChat/controllers/chat/controller.ts @@ -414,6 +414,11 @@ export class ChatController { private async processStopResponseMessage(message: StopResponseMessage) { const session = this.sessionStorage.getSession(message.tabID) + + if (session.agenticLoopInProgress === true) { + this.telemetryHelper.recordInteractionWithAgenticChat(AgenticChatInteractionType.StopChat, message) + } + session.tokenSource.cancel() session.setAgenticLoopInProgress(false) session.setToolUseWithError(undefined) @@ -428,7 +433,6 @@ export class ChatController { } this.messenger.sendEmptyMessage(message.tabID, '', undefined) - this.telemetryHelper.recordInteractionWithAgenticChat(AgenticChatInteractionType.StopChat, message) } private async processTriggerTabIDReceived(message: TriggerTabIDReceived) { diff --git a/packages/core/src/codewhispererChat/controllers/chat/telemetryHelper.ts b/packages/core/src/codewhispererChat/controllers/chat/telemetryHelper.ts index b524770ff53..52bb1674f4d 100644 --- a/packages/core/src/codewhispererChat/controllers/chat/telemetryHelper.ts +++ b/packages/core/src/codewhispererChat/controllers/chat/telemetryHelper.ts @@ -225,7 +225,7 @@ export class CWCTelemetryHelper { cwsprAgenticChatInteractionType: interactionType, result: 'Succeeded', cwsprChatConversationId: this.getConversationId(message.tabID ?? '') ?? '', - cwsprChatConversationType: 'Chat', + cwsprChatConversationType: 'AgenticChat', credentialStartUrl: AuthUtil.instance.startUrl, }) } @@ -543,7 +543,7 @@ export class CWCTelemetryHelper { cwsprChatFullDisplayLatency: fullDisplayLatency, cwsprChatRequestLength: triggerPayload.message.length, cwsprChatResponseLength: message.messageLength, - cwsprChatConversationType: 'Chat', + cwsprChatConversationType: triggerPayload.origin ? 'AgenticChat' : 'Chat', credentialStartUrl: AuthUtil.instance.startUrl, codewhispererCustomizationArn: triggerPayload.customization.arn, cwsprChatHasProjectContext: hasProjectLevelContext,