Merge branch 'aws:master' into fixUTG

laileni-aws · web-flow · commit 01432e944621 · 2025-02-19T13:16:43.000-08:00
diff --git a/packages/amazonq/src/extension.ts b/packages/amazonq/src/extension.ts
@@ -142,7 +142,7 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
         // Give time for the extension to finish initializing.
         globals.clock.setTimeout(async () => {
             CommonAuthWebview.authSource = ExtStartUpSources.firstStartUp
-            void focusAmazonQPanel.execute(placeholder, 'firstStartUp')
+            void focusAmazonQPanel.execute(placeholder, ExtStartUpSources.firstStartUp)
         }, 1000)
     }
 }
diff --git a/packages/core/src/amazonq/webview/ui/main.ts b/packages/core/src/amazonq/webview/ui/main.ts
@@ -609,7 +609,7 @@ export const createMynahUI = (
                 mynahUI.addChatItem(tabID, {
                     type: ChatItemType.ANSWER_STREAM,
                 })
-            } else if (tabType === 'gumby' || tabType === 'testgen') {
+            } else if (tabType === 'gumby') {
                 connector.requestAnswer(tabID, {
                     chatMessage: prompt.prompt ?? '',
                 })
diff --git a/packages/core/src/amazonqTest/chat/controller/controller.ts b/packages/core/src/amazonqTest/chat/controller/controller.ts
@@ -63,7 +63,6 @@ import {
 } from '../../../codewhisperer/models/constants'
 import { UserWrittenCodeTracker } from '../../../codewhisperer/tracker/userWrittenCodeTracker'
 import { ReferenceLogViewProvider } from '../../../codewhisperer/service/referenceLogViewProvider'
-import { Auth } from '../../../auth/auth'
 
 export interface TestChatControllerEventEmitters {
     readonly tabOpened: vscode.EventEmitter<any>
@@ -801,10 +800,8 @@ export class TestController {
             session.linesOfCodeGenerated
         )
 
-        if (!Auth.instance.isInternalAmazonUser()) {
-            await this.endSession(message, FollowUpTypes.SkipBuildAndFinish)
-            return
-        }
+        await this.endSession(message, FollowUpTypes.SkipBuildAndFinish)
+        return
 
         if (session.listOfTestGenerationJobId.length === 1) {
             this.startInitialBuild(message)
@@ -944,17 +941,12 @@ export class TestController {
 
     private startInitialBuild(data: any) {
         // TODO: Remove the fallback build command after stable version of backend build command.
-        const userMessage = `Would you like me to help build and execute the test? I’ll run following commands.\n\`\`\`sh\n${this.sessionStorage.getSession().shortAnswer?.buildCommand}\n`
+        const userMessage = `Would you like me to help build and execute the test? I will need you to let me know what build command to run if you do.`
         const followUps: FollowUps = {
             text: '',
             options: [
                 {
-                    pillText: `Build and execute`,
-                    type: FollowUpTypes.BuildAndExecute,
-                    status: 'primary',
-                },
-                {
-                    pillText: `Modify command`,
+                    pillText: `Specify command then build and execute`,
                     type: FollowUpTypes.ModifyCommands,
                     status: 'primary',
                 },
@@ -984,6 +976,7 @@ export class TestController {
         const listOfInstallationDependencies = ['']
         const installationDependencies = listOfInstallationDependencies.join('\n')
 
+        this.messenger.sendMessage('Build and execute', data.tabID, 'prompt')
         telemetry.ui_click.emit({ elementId: 'unitTestGeneration_buildAndExecute' })
 
         if (installationDependencies.length > 0) {
@@ -1032,6 +1025,11 @@ export class TestController {
         // const installationDependencies = session.shortAnswer?.installationDependencies ?? []
         // MOCK: ignoring the installation case until backend send response
         const installationDependencies: string[] = []
+        const buildCommands = session.updatedBuildCommands
+        if (!buildCommands) {
+            throw new Error('Build command not found')
+            return
+        }
 
         this.messenger.sendBuildProgressMessage({
             tabID: data.tabID,
@@ -1103,7 +1101,7 @@ export class TestController {
             messageId: TestNamedMessages.TEST_GENERATION_BUILD_STATUS_MESSAGE,
         })
 
-        const buildStatus = await runBuildCommand(this.getBuildCommands())
+        const buildStatus = await runBuildCommand(buildCommands)
         session.buildStatus = buildStatus
 
         if (buildStatus === BuildStatus.FAILURE) {
@@ -1231,17 +1229,10 @@ export class TestController {
             fileList: this.checkCodeDiffLengthAndBuildStatus({ codeDiffLength, buildStatus: session.buildStatus })
                 ? {
                       fileTreeTitle: 'READY FOR REVIEW',
-                      rootFolderTitle: path.basename(session.projectRootPath),
+                      rootFolderTitle: 'tests',
                       filePaths: [session.generatedFilePath],
                   }
                 : undefined,
-            codeReference: session.references.map(
-                (ref: ShortAnswerReference) =>
-                    ({
-                        ...ref,
-                        information: `${ref.licenseName} - <a href="${ref.url}">${ref.repository}</a>`,
-                    }) as CodeReference
-            ),
         })
         this.messenger.sendBuildProgressMessage({
             tabID: data.tabID,
@@ -1270,7 +1261,7 @@ export class TestController {
 
     private modifyBuildCommand(data: any) {
         this.sessionStorage.getSession().conversationState = ConversationState.WAITING_FOR_BUILD_COMMMAND_INPUT
-        this.messenger.sendMessage('Modify Command', data.tabID, 'prompt')
+        this.messenger.sendMessage('Specify commands then build', data.tabID, 'prompt')
         telemetry.ui_click.emit({ elementId: 'unitTestGeneration_modifyCommand' })
         this.messenger.sendMessage(
             'Sure, provide all command lines you’d like me to run to build.',
@@ -1383,16 +1374,21 @@ export class TestController {
     }
 
     // TODO: return build command when product approves
-    private getBuildCommands = (): string[] => {
-        const session = this.sessionStorage.getSession()
-        if (session.updatedBuildCommands?.length) {
-            return [...session.updatedBuildCommands]
-        }
-
-        if (session.shortAnswer && session.shortAnswer?.buildCommand) {
-            return [session.shortAnswer.buildCommand]
-        }
-        // TODO: Add a generic command here for external launch according to the build system.
-        return ['brazil-build release']
-    }
+    // private getBuildCommands = (): string[] => {
+    //     const session = this.sessionStorage.getSession()
+    //     if (session.updatedBuildCommands?.length) {
+    //         return [...session.updatedBuildCommands]
+    //     }
+
+    //     // For Internal amazon users only
+    //     if (Auth.instance.isInternalAmazonUser()) {
+    //         return ['brazil-build release']
+    //     }
+
+    //     if (session.shortAnswer && Array.isArray(session.shortAnswer?.buildCommands)) {
+    //         return [...session.shortAnswer.buildCommands]
+    //     }
+
+    //     return ['source qdev-wbr/.venv/bin/activate && pytest --continue-on-collection-errors']
+    // }
 }
diff --git a/packages/core/src/auth/utils.ts b/packages/core/src/auth/utils.ts
@@ -58,7 +58,7 @@ import { EcsCredentialsProvider } from './providers/ecsCredentialsProvider'
 import { EnvVarsCredentialsProvider } from './providers/envVarsCredentialsProvider'
 import { showMessageWithUrl } from '../shared/utilities/messages'
 import { credentialHelpUrl } from '../shared/constants'
-import { ExtStartUpSources, ExtStartUpSource } from '../shared/telemetry/util'
+import { ExtStartUpSources, ExtStartUpSource, hadClientIdOnStartup } from '../shared/telemetry/util'
 
 // iam-only excludes Builder ID and IAM Identity Center from the list of valid connections
 // TODO: Understand if "iam" should include these from the list at all
@@ -688,17 +688,43 @@ export class ExtensionUse {
             return this.isFirstUseCurrentSession
         }
 
-        this.isFirstUseCurrentSession = globals.globalState.get('isExtensionFirstUse')
-        if (this.isFirstUseCurrentSession === undefined) {
+        // This is for sure not their first use
+        const isFirstUse = globals.globalState.tryGet('isExtensionFirstUse', Boolean)
+        if (isFirstUse === false) {
+            this.isFirstUseCurrentSession = isFirstUse
+            return this.isFirstUseCurrentSession
+        }
+
+        /**
+         * SANITY CHECK: If the clientId already existed on startup, then isFirstUse MUST be false. So
+         * there is a bug in the state.
+         */
+        if (hadClientIdOnStartup(globals.globalState)) {
+            telemetry.function_call.emit({
+                result: 'Failed',
+                functionName: 'isFirstUse',
+                reason: 'ClientIdAlreadyExisted',
+            })
+        }
+
+        if (isAmazonQ()) {
+            this.isFirstUseCurrentSession = true
+            if (hasExistingConnections()) {
+                telemetry.function_call.emit({
+                    result: 'Failed',
+                    functionName: 'isFirstUse',
+                    reason: 'UnexpectedConnections',
+                })
+            }
+        } else {
             // The variable in the store is not defined yet, fallback to checking if they have existing connections.
             this.isFirstUseCurrentSession = !hasExistingConnections()
-
-            getLogger().debug(
-                `isFirstUse: State not found, marking user as '${
-                    this.isFirstUseCurrentSession ? '' : 'NOT '
-                }first use' since they 'did ${this.isFirstUseCurrentSession ? 'NOT ' : ''}have existing connections'.`
-            )
         }
+        getLogger().debug(
+            `isFirstUse: State not found, marking user as '${
+                this.isFirstUseCurrentSession ? '' : 'NOT '
+            }first use' since they 'did ${this.isFirstUseCurrentSession ? 'NOT ' : ''}have existing connections'.`
+        )
 
         // Update state, so next time it is not first use
         this.updateMemento('isExtensionFirstUse', false)
diff --git a/packages/core/src/codewhisperer/commands/startTestGeneration.ts b/packages/core/src/codewhisperer/commands/startTestGeneration.ts
@@ -212,7 +212,7 @@ function runLocalBuild(
         if (spawnResult.stderr) {
             spawnResult.stderr.on('data', async (data) => {
                 const output = data.toString().trim()
-                getLogger().warn(`${output}`)
+                getLogger().warn(`BUILD ERROR: ${output}`)
                 buildLogs += output
             })
         }
diff --git a/packages/core/src/codewhisperer/models/model.ts b/packages/core/src/codewhisperer/models/model.ts
@@ -1177,7 +1177,7 @@ export interface ShortAnswerReference {
 
 export interface ShortAnswer {
     testFilePath: string
-    buildCommand: string
+    buildCommands: string[]
     planSummary: string
     sourceFilePath?: string
     testFramework?: string
diff --git a/packages/core/src/login/webview/commonAuthViewProvider.ts b/packages/core/src/login/webview/commonAuthViewProvider.ts
@@ -46,6 +46,7 @@ import { AuthSources } from './util'
 import { AuthFlowStates } from './vue/types'
 import { getTelemetryMetadataForConn } from '../../auth/connection'
 import { AuthUtil } from '../../codewhisperer/util/authUtil'
+import { ExtensionUse } from '../../auth/utils'
 
 export class CommonAuthViewProvider implements WebviewViewProvider {
     public readonly viewType: string
@@ -83,14 +84,22 @@ export class CommonAuthViewProvider implements WebviewViewProvider {
     ) {
         // Our callback won't fire on the first view.
         if (webviewView.visible) {
-            telemetry.auth_signInPageOpened.emit({ result: 'Succeeded', passive: true })
+            telemetry.auth_signInPageOpened.emit({
+                result: 'Succeeded',
+                passive: true,
+                source: ExtensionUse.instance.sourceForTelemetry(),
+            })
         }
 
         // This will fire whenever the user opens or closes the login page from 'somewhere else'
         // i.e. NOT when switching from/to the chat window, which uses the same view area.
         webviewView.onDidChangeVisibility(async () => {
             if (webviewView.visible) {
-                telemetry.auth_signInPageOpened.emit({ result: 'Succeeded', passive: true })
+                telemetry.auth_signInPageOpened.emit({
+                    result: 'Succeeded',
+                    passive: true,
+                    source: ExtensionUse.instance.sourceForTelemetry(),
+                })
             } else {
                 telemetry.auth_signInPageClosed.emit({ result: 'Succeeded', passive: true })
 
diff --git a/packages/core/src/login/webview/vue/backend.ts b/packages/core/src/login/webview/vue/backend.ts
@@ -61,6 +61,22 @@ export abstract class CommonAuthWebview extends VueWebview {
         return globals.regionProvider.getRegions().reverse()
     }
 
+    private didCall: { login: boolean; reauth: boolean } = { login: false, reauth: false }
+    public setUiReady(state: 'login' | 'reauth') {
+        // Prevent telemetry spam, since showing/hiding chat triggers this each time.
+        // So only emit once.
+        if (this.didCall[state]) {
+            return
+        }
+
+        telemetry.webview_load.emit({
+            passive: true,
+            webviewName: state,
+            result: 'Succeeded',
+        })
+        this.didCall[state] = true
+    }
+
     /**
      * This wraps the execution of the given setupFunc() and handles common errors from the SSO setup process.
      *
diff --git a/packages/core/src/login/webview/vue/login.vue b/packages/core/src/login/webview/vue/login.vue
@@ -368,6 +368,8 @@ export default defineComponent({
         // Pre-select the first available login option
         await this.preselectLoginOption()
         await this.handleUrlInput() // validate the default startUrl
+
+        await client.setUiReady('login')
     },
     methods: {
         toggleItemSelection(itemId: number) {
diff --git a/packages/core/src/login/webview/vue/reauthenticate.vue b/packages/core/src/login/webview/vue/reauthenticate.vue
@@ -127,6 +127,9 @@ export default defineComponent({
 
         this.doShow = true
     },
+    async mounted() {
+        await client.setUiReady('reauth')
+    },
     methods: {
         async reauthenticate() {
             client.emitUiClick('auth_reauthenticate')
diff --git a/packages/core/src/shared/telemetry/telemetryService.ts b/packages/core/src/shared/telemetry/telemetryService.ts
@@ -22,6 +22,7 @@ import { telemetry, MetricBase } from './telemetry'
 import fs from '../fs/fs'
 import fsNode from 'fs/promises'
 import * as collectionUtil from '../utilities/collectionUtils'
+import { ExtensionUse } from '../../auth/utils'
 
 export type TelemetryService = ClassToInterfaceType<DefaultTelemetryService>
 
@@ -98,7 +99,9 @@ export class DefaultTelemetryService {
         // TODO: `readEventsFromCache` should be async
         this._eventQueue.push(...(await DefaultTelemetryService.readEventsFromCache(this.persistFilePath)))
         this._endOfCache = this._eventQueue[this._eventQueue.length - 1]
-        telemetry.session_start.emit()
+        telemetry.session_start.emit({
+            source: ExtensionUse.instance.sourceForTelemetry(),
+        })
         this.startFlushInterval()
     }
 
diff --git a/packages/core/src/shared/telemetry/util.ts b/packages/core/src/shared/telemetry/util.ts
@@ -30,6 +30,7 @@ import { asStringifiedStack, FunctionEntry } from './spans'
 import { telemetry } from './telemetry'
 import { v5 as uuidV5 } from 'uuid'
 import { ToolkitError } from '../errors'
+import { GlobalState } from '../globalState'
 
 const legacySettingsTelemetryValueDisable = 'Disable'
 const legacySettingsTelemetryValueEnable = 'Enable'
@@ -177,6 +178,8 @@ export const getClientId = memoize(
             const localClientId = globalState.tryGet('telemetryClientId', String) // local to extension, despite accessing "global" state
             let clientId: string
 
+            _hadClientIdOnStartup = !!globalClientId || !!localClientId
+
             if (isWeb()) {
                 const machineId = vscode.env.machineId
                 clientId = localClientId ?? machineId
@@ -210,6 +213,22 @@ export const getClientId = memoize(
     }
 )
 
+let _hadClientIdOnStartup = false
+/**
+ * Returns true if the ClientID existed before this session started
+ */
+export const hadClientIdOnStartup = (
+    globalState: GlobalState,
+    update = (globalState: GlobalState) => {
+        getClientId(globalState)
+    }
+) => {
+    // triggers the flow that will update the state, if not done already
+    update(globalState)
+
+    return _hadClientIdOnStartup
+}
+
 export const platformPair = () => `${env.appName.replace(/\s/g, '-')}/${version}`
 
 /**
diff --git a/packages/core/src/shared/telemetry/vscodeTelemetry.json b/packages/core/src/shared/telemetry/vscodeTelemetry.json
@@ -1131,6 +1131,17 @@
             ],
             "passive": true
         },
+        {
+            "name": "auth_signInPageOpened",
+            "description": "When the Amazon Q sign in page is opened and focused.",
+            "metadata": [
+                {
+                    "type": "source",
+                    "required": true
+                }
+            ],
+            "passive": true
+        },
         {
             "name": "function_call",
             "description": "Represents a function call. In most cases this should wrap code with a run(), then you can add context.",
@@ -1207,6 +1218,17 @@
                 }
             ]
         },
+        {
+            "name": "session_start",
+            "description": "Called when starting the plugin",
+            "metadata": [
+                {
+                    "type": "source",
+                    "required": false
+                }
+            ],
+            "passive": true
+        },
         {
             "name": "session_end",
             "description": "Called when stopping the IDE on a best effort basis",
diff --git a/packages/core/src/test/credentials/utils.test.ts b/packages/core/src/test/credentials/utils.test.ts
diff --git a/packages/core/src/test/shared/telemetry/util.test.ts b/packages/core/src/test/shared/telemetry/util.test.ts

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is`
`142`	`142`	`// Give time for the extension to finish initializing.`
`143`	`143`	`globals.clock.setTimeout(async () => {`
`144`	`144`	`CommonAuthWebview.authSource = ExtStartUpSources.firstStartUp`
`145`		`- void focusAmazonQPanel.execute(placeholder, 'firstStartUp')`
	`145`	`+ void focusAmazonQPanel.execute(placeholder, ExtStartUpSources.firstStartUp)`
`146`	`146`	`}, 1000)`
`147`	`147`	`}`
`148`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ function runLocalBuild(`
`212`	`212`	`if (spawnResult.stderr) {`
`213`	`213`	`spawnResult.stderr.on('data', async (data) => {`
`214`	`214`	`const output = data.toString().trim()`
`215`		- getLogger().warn(`${output}`)
	`215`	+ getLogger().warn(`BUILD ERROR: ${output}`)
`216`	`216`	`buildLogs += output`
`217`	`217`	`})`
`218`	`218`	`}`