Merge branch 'master' into ec2/tryRun

Author: Hweinstock

packages/amazonq/.changes/next-release/Bug Fix-ee447a9f-6a92-47c5-8e94-069c1aee46ab.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q /test: Fixing the issue of target file does not exist."
+}

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)
     }
 }

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 ?? '',
                 })

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']
+    // }
 }

packages/core/src/auth/activation.ts

@@ -7,11 +7,8 @@ import * as vscode from 'vscode'
 import { Auth } from './auth'
 import { LoginManager } from './deprecated/loginManager'
 import { fromString } from './providers/credentials'
-import { getLogger } from '../shared/logger/logger'
-import { ExtensionUse, initializeCredentialsProviderManager } from './utils'
-import { isAmazonQ, isCloud9, isSageMaker } from '../shared/extensionUtilities'
-import { isInDevEnv } from '../shared/vscode/env'
-import { isWeb } from '../shared/extensionGlobals'
+import { initializeCredentialsProviderManager } from './utils'
+import { isAmazonQ, isSageMaker } from '../shared/extensionUtilities'
 
 interface SagemakerCookie {
     authMode?: 'Sso' | 'Iam'
@@ -33,28 +30,4 @@ export async function initialize(loginManager: LoginManager): Promise<void> {
             await loginManager.logout()
         }
     })
-
-    await showManageConnectionsOnStartup()
-}
-
-/**
- * Show the Manage Connections page when the extension starts up, if it should be shown.
- */
-async function showManageConnectionsOnStartup() {
-    // Do not show connection management to user in certain scenarios.
-    let reason: string = ''
-    if (isWeb()) {
-        // TODO: Figure out how we want users to connect to auth in browser mode
-        reason = 'We are in the browser'
-    } else if (!ExtensionUse.instance.isFirstUse()) {
-        reason = 'This is not the users first use of the extension'
-    } else if (isInDevEnv()) {
-        reason = 'The user is in a Dev Evironment'
-    } else if (isCloud9('any')) {
-        reason = 'The user is in Cloud9'
-    }
-    if (reason) {
-        getLogger().debug(`firstStartup: ${reason}. Skipped showing Add Connections page.`)
-        return
-    }
 }

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)

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
             })
         }

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

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

@@ -506,6 +506,11 @@ export function addTableMarkdown(plan: string, stepId: string, tableMapping: { [
         return plan
     }
     const table = JSON.parse(tableObj)
+    if (table.rows.length === 0) {
+        // empty table
+        plan += `\n\nThere are no ${table.name.toLowerCase()} to display.\n\n`
+        return plan
+    }
     plan += `\n\n\n${table.name}\n|`
     const columns = table.columnNames
     // eslint-disable-next-line unicorn/no-array-for-each

packages/core/src/codewhisperer/util/zipUtil.ts

@@ -410,9 +410,14 @@ export class ZipUtil {
             return
         }
 
-        const sourceFiles = await collectFiles(projectPaths, vscode.workspace.workspaceFolders as CurrentWsFolders, {
-            maxSizeBytes: this.getProjectScanPayloadSizeLimitInBytes(),
-        })
+        const sourceFiles = await collectFiles(
+            projectPaths,
+            vscode.workspace.workspaceFolders as CurrentWsFolders,
+            {
+                maxSizeBytes: this.getProjectScanPayloadSizeLimitInBytes(),
+            },
+            useCase
+        )
         for (const file of sourceFiles) {
             const projectName = path.basename(file.workspaceFolder.uri.fsPath)
             const zipEntryPath = this.getZipEntryPath(projectName, file.relativeFilePath)