update

Author: leigaol

packages/amazonq/src/inlineChat/controller/inlineChatController.ts

@@ -200,7 +200,6 @@ export class InlineChatController {
                     return
                 }
                 UserWrittenCodeTracker.instance.onQStartsMakingEdits()
-                UserWrittenCodeTracker.instance.onQFeatureInvoked()
                 this.userQuery = query
                 await textDocumentUtil.addEofNewline(editor)
                 this.task = await this.createTask(query, editor.document, editor.selection)

packages/core/src/amazonq/commons/controllers/contentController.ts

@@ -102,6 +102,7 @@ export class EditorContentController {
 
         if (filePath && message?.code?.trim().length > 0 && selection) {
             try {
+                UserWrittenCodeTracker.instance.onQStartsMakingEdits()
                 const doc = await vscode.workspace.openTextDocument(filePath)
 
                 const code = getIndentedCode(message, doc, selection)
@@ -135,6 +136,8 @@ export class EditorContentController {
                 const wrappedError = ChatDiffError.chain(error, `Failed to Accept Diff`, { code: chatDiffCode })
                 getLogger().error('%s: Failed to open diff view %s', chatDiffCode, getErrorMsg(wrappedError, true))
                 throw wrappedError
+            } finally {
+                UserWrittenCodeTracker.instance.onQFinishesEdits()
             }
         }
     }

packages/core/src/amazonqFeatureDev/client/featureDev.ts

@@ -26,6 +26,7 @@ import { getClientId, getOptOutPreference, getOperatingSystem } from '../../shar
 import { extensionVersion } from '../../shared/vscode/env'
 import apiConfig = require('./codewhispererruntime-2022-11-11.json')
 import { FeatureDevCodeAcceptanceEvent, FeatureDevCodeGenerationEvent, TelemetryEvent } from './featuredevproxyclient'
+import { UserWrittenCodeTracker } from '../../codewhisperer'
 
 // Re-enable once BE is able to handle retries.
 const writeAPIRetryOptions = {
@@ -255,6 +256,7 @@ export class FeatureDevClient {
                     references?: CodeReference[]
                 }
             }
+            UserWrittenCodeTracker.instance.onQFeatureInvoked()
 
             const newFileContents: { zipFilePath: string; fileContent: string }[] = []
             for (const [filePath, fileContent] of Object.entries(newFiles)) {

packages/core/src/amazonqTest/chat/controller/controller.ts

@@ -21,6 +21,7 @@ import {
     TestGenerationBuildStep,
     testGenState,
     unitTestGenerationCancelMessage,
+    UserWrittenCodeTracker,
 } from '../../../codewhisperer'
 import {
     fs,
@@ -654,12 +655,14 @@ export class TestController {
             acceptedLines = acceptedLines < 0 ? 0 : acceptedLines
             acceptedChars -= originalContent.length
             acceptedChars = acceptedChars < 0 ? 0 : acceptedChars
+            UserWrittenCodeTracker.instance.onQStartsMakingEdits()
             const document = await vscode.workspace.openTextDocument(absolutePath)
             await applyChanges(
                 document,
                 new vscode.Range(document.lineAt(0).range.start, document.lineAt(document.lineCount - 1).range.end),
                 updatedContent
             )
+            UserWrittenCodeTracker.instance.onQFinishesEdits()
         } else {
             await fs.writeFile(absolutePath, updatedContent)
         }
@@ -821,6 +824,7 @@ export class TestController {
             const chatRequest = triggerPayloadToChatRequest(triggerPayload)
             const client = await createCodeWhispererChatStreamingClient()
             const response = await client.generateAssistantResponse(chatRequest)
+            UserWrittenCodeTracker.instance.onQFeatureInvoked()
             await this.messenger.sendAIResponse(
                 response,
                 session,

packages/core/src/codewhisperer/commands/basicCommands.ts

@@ -66,6 +66,7 @@ import { cancel, confirm } from '../../shared'
 import { startCodeFixGeneration } from './startCodeFixGeneration'
 import { DefaultAmazonQAppInitContext } from '../../amazonq/apps/initContext'
 import path from 'path'
+import { UserWrittenCodeTracker } from '../indexNode'
 
 const MessageTimeOut = 5_000
 
@@ -450,6 +451,7 @@ export const applySecurityFix = Commands.declare(
         }
         let languageId = undefined
         try {
+            UserWrittenCodeTracker.instance.onQStartsMakingEdits()
             const document = await vscode.workspace.openTextDocument(targetFilePath)
             languageId = document.languageId
             const updatedContent = await getPatchedCode(targetFilePath, suggestedFix.code)
@@ -552,6 +554,7 @@ export const applySecurityFix = Commands.declare(
                 applyFixTelemetryEntry.result,
                 !!targetIssue.suggestedFixes.length
             )
+            UserWrittenCodeTracker.instance.onQFinishesEdits()
         }
     }
 )

packages/core/src/codewhisperer/service/testGenHandler.ts

@@ -16,7 +16,7 @@ import CodeWhispererUserClient, {
 import { CreateUploadUrlError, InvalidSourceZipError, TestGenFailedError, TestGenTimedOutError } from '../models/errors'
 import { getMd5, uploadArtifactToS3 } from './securityScanHandler'
 import { fs, randomUUID, sleep, tempDirPath } from '../../shared'
-import { ShortAnswer, TestGenerationJobStatus, testGenState } from '..'
+import { ShortAnswer, TestGenerationJobStatus, testGenState, UserWrittenCodeTracker } from '..'
 import { ChatSessionManager } from '../../amazonqTest/chat/storages/chatSession'
 import { createCodeWhispererChatStreamingClient } from '../../shared/clients/codewhispererChatClient'
 import { downloadExportResultArchive } from '../../shared/utilities/download'
@@ -292,5 +292,6 @@ export async function downloadResultArchive(
         throw e
     } finally {
         cwStreamingClient.destroy()
+        UserWrittenCodeTracker.instance.onQFeatureInvoked()
     }
 }

packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts

@@ -49,6 +49,7 @@ import { ChatSessionManager } from '../../../amazonqGumby/chat/storages/chatSess
 import { encodeHTML } from '../../../shared/utilities/textUtilities'
 import { convertToTimeString } from '../../../shared/datetime'
 import { getAuthType } from '../../../auth/utils'
+import { UserWrittenCodeTracker } from '../../tracker/userWrittenCodeTracker'
 
 export function getSha256(buffer: Buffer) {
     const hasher = crypto.createHash('sha256')
@@ -735,6 +736,7 @@ export async function downloadResultArchive(
         throw e
     } finally {
         cwStreamingClient.destroy()
+        UserWrittenCodeTracker.instance.onQFeatureInvoked()
     }
 }
 

packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts

@@ -27,6 +27,7 @@ import { createCodeWhispererChatStreamingClient } from '../../../shared/clients/
 import { ChatSessionManager } from '../../../amazonqGumby/chat/storages/chatSession'
 import { setContext } from '../../../shared/vscode/setContext'
 import * as codeWhisperer from '../../client/codewhisperer'
+import { UserWrittenCodeTracker } from '../../tracker/userWrittenCodeTracker'
 
 export abstract class ProposedChangeNode {
     abstract readonly resourcePath: string
@@ -426,6 +427,7 @@ export class ProposedTransformationExplorer {
                 throw new Error('Error downloading diff')
             } finally {
                 cwStreamingClient.destroy()
+                UserWrittenCodeTracker.instance.onQFeatureInvoked()
             }
 
             let deserializeErrorMessage = undefined

packages/core/src/codewhispererChat/clients/chat/v0/chat.ts

@@ -49,6 +49,7 @@ export class ChatSession {
             }
         }
 
+        UserWrittenCodeTracker.instance.onQFeatureInvoked()
         return response
     }