Merge pull request #5203 - merge master into feature/separate-sessions

hayemaxi · web-flow · commit ce525c288933 · 2024-06-21T11:36:57.000-04:00
Merge master into feature/separate-sessions
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-1c7f2455-f6c2-46e9-8673-1a25a0d818ec.json b/packages/amazonq/.changes/next-release/Bug Fix-1c7f2455-f6c2-46e9-8673-1a25a0d818ec.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Security Scan: Fixes an issue where project-scans time out for larger projects."
+}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-4745c9cd-5cbc-4765-89ea-4de83778e803.json b/packages/amazonq/.changes/next-release/Bug Fix-4745c9cd-5cbc-4765-89ea-4de83778e803.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q /dev command: Fix file rejections for files outside of src/"
+}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-7a8b455f-a505-46b6-b5ae-783dcd6e55f4.json b/packages/amazonq/.changes/next-release/Bug Fix-7a8b455f-a505-46b6-b5ae-783dcd6e55f4.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Feature Development: update /dev welcome message"
+}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-8d9d0ab6-a0f7-4622-b0d9-0cd12cc568b3.json b/packages/amazonq/.changes/next-release/Bug Fix-8d9d0ab6-a0f7-4622-b0d9-0cd12cc568b3.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q Chat: Fixed broken code blocks with typewriter text in list items."
+}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-9130bd3b-edc4-4749-8c96-bd9a4fb9f03c.json b/packages/amazonq/.changes/next-release/Bug Fix-9130bd3b-edc4-4749-8c96-bd9a4fb9f03c.json
@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "UX: New style for the login window"
+}
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -4098,7 +4098,7 @@
         "@aws-sdk/property-provider": "3.46.0",
         "@aws-sdk/smithy-client": "^3.46.0",
         "@aws-sdk/util-arn-parser": "^3.46.0",
-        "@aws/mynah-ui": "^4.9.2",
+        "@aws/mynah-ui": "^4.13.0",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@smithy/middleware-retry": "^2.3.1",
diff --git a/packages/core/src/amazonq/activation.ts b/packages/core/src/amazonq/activation.ts
@@ -23,10 +23,6 @@ import { Commands, placeholder } from '../shared/vscode/commands2'
 import { focusAmazonQPanel, focusAmazonQPanelKeybinding } from '../codewhispererChat/commands/registerCommands'
 import { TryChatCodeLensProvider, tryChatCodeLensCommand } from '../codewhispererChat/editor/codelens'
 import { Auth } from '../auth'
-import { learnMoreUri } from '../codewhisperer/models/constants'
-import { openUrl } from '../shared/utilities/vsCodeUtils'
-import { AuthUtil } from '../codewhisperer'
-import { ConnectionStateChangeEvent } from '../auth/auth'
 import { telemetry } from '../shared/telemetry'
 
 export async function activate(context: ExtensionContext) {
@@ -64,10 +60,7 @@ export async function activate(context: ExtensionContext) {
     })
 
     await activateBadge()
-    void setupAuthNotification(
-        appInitContext.onDidChangeAmazonQVisibility.event,
-        Auth.instance.onDidChangeConnectionState
-    )
+    void setupAuthNotification()
 }
 
 function registerApps(appInitContext: AmazonQAppInitContext) {
@@ -80,85 +73,38 @@ function registerApps(appInitContext: AmazonQAppInitContext) {
  * Display a notification to user for Log In.
  *
  * Authentication Notification is displayed when:
- * - The user closes the Amazon Q chat panel, and
- * - The user has not performed any authentication action.
- *
- * Error Notification is displayed when:
- * - The user closes the Amazon Q chat panel, and
- * - The user attempts an authentication action but is not logged in.
+ * - User is not authenticated
+ * - Once every session
  *
- * @param {Event} onAmazonQChatVisibility - Event indicating the visibility status of the Amazon Q chat.
- * @param {Event} onDidUpdateConnection - Event indicating the authentication connection update.
  */
-async function setupAuthNotification(
-    onAmazonQChatVisibility: vscode.Event<boolean>,
-    onDidUpdateConnection: vscode.Event<ConnectionStateChangeEvent | undefined>
-) {
-    let isAmazonQVisible = true // Assume Chat is open by default.
+async function setupAuthNotification() {
     let notificationDisplayed = false // Auth Notification should be displayed only once.
-    let authConnection: ConnectionStateChangeEvent
-
-    // Updates the visibility state of the Amazon Q chat.
-    const updateVisibility = async (visible: boolean) => {
-        isAmazonQVisible = visible
-        await tryShowNotification()
-    }
+    await tryShowNotification()
 
-    // Updates the source of the connection for Amazon Q sign in.
-    const updateConnection = async (connection: ConnectionStateChangeEvent | undefined) => {
-        if (connection) {
-            authConnection = connection
-            await tryShowNotification()
+    async function tryShowNotification() {
+        // Do not show the notification if the IDE starts and user is already authenticated.
+        if (Auth.instance.activeConnection) {
+            notificationDisplayed = true
         }
-    }
-
-    const disposables: vscode.Disposable[] = [
-        onAmazonQChatVisibility(updateVisibility),
-        onDidUpdateConnection(updateConnection),
-    ]
 
-    async function tryShowNotification() {
-        if (notificationDisplayed || Auth.instance.activeConnection) {
+        if (notificationDisplayed) {
             return
         }
 
         const source = 'authNotification'
-
-        if (!isAmazonQVisible && !authConnection && !AuthUtil.instance.isConnectionExpired()) {
-            const buttonAction = 'Sign In'
-            notificationDisplayed = true
-            disposables.forEach(item => item.dispose())
-
-            telemetry.toolkit_showNotification.emit({
-                component: 'editor',
-                id: source,
-                reason: 'notLoggedIn',
-                result: 'Succeeded',
-            })
-            const selection = await vscode.window.showWarningMessage('Start using Amazon Q', buttonAction)
-
-            if (selection === buttonAction) {
-                void focusAmazonQPanel.execute(placeholder, source)
-            }
-        } else if (!isAmazonQVisible && authConnection.state === 'authenticating') {
-            const buttonAction = 'Open documentation'
-            notificationDisplayed = true
-            disposables.forEach(item => item.dispose())
-
-            telemetry.toolkit_showNotification.emit({
-                component: 'editor',
-                id: source,
-                reason: 'authenticating',
-                result: 'Succeeded',
-            })
-            const selection = await vscode.window.showWarningMessage(
-                'See Amazon Q documentation for help on signing in',
-                buttonAction
-            )
-
-            if (selection === buttonAction) {
-                void openUrl(vscode.Uri.parse(`${learnMoreUri}#q-in-IDE-setup-bid`), source)
-            }
+        const buttonAction = 'Sign In'
+        notificationDisplayed = true
+
+        telemetry.toolkit_showNotification.emit({
+            component: 'editor',
+            id: source,
+            reason: 'notLoggedIn',
+            result: 'Succeeded',
+        })
+        const selection = await vscode.window.showWarningMessage('Start using Amazon Q', buttonAction)
+
+        if (selection === buttonAction) {
+            void focusAmazonQPanel.execute(placeholder, source)
         }
     }
 }
diff --git a/packages/core/src/amazonq/webview/ui/tabs/generator.ts b/packages/core/src/amazonq/webview/ui/tabs/generator.ts
@@ -46,7 +46,7 @@ export class TabDataGenerator {
         ],
         [
             'featuredev',
-            `Welcome to feature development.
+            `Hi, I'm the Amazon Q Developer Agent for software development.
 
 I can generate code to implement new functionality across your workspace. We'll start by discussing an implementation plan, and then we can review and regenerate code based on your feedback. 
             
diff --git a/packages/core/src/amazonqFeatureDev/client/codewhispererruntime-2022-11-11.json b/packages/core/src/amazonqFeatureDev/client/codewhispererruntime-2022-11-11.json
@@ -1036,6 +1036,15 @@
             },
             "documentation": "<p>Represents the state of an Editor</p>"
         },
+        "FeatureDevEvent": {
+            "type": "structure",
+            "required": ["conversationId"],
+            "members": {
+                "conversationId": {
+                    "shape": "ConversationId"
+                }
+            }
+        },
         "FeatureEvaluation": {
             "type": "structure",
             "required": ["feature", "variation", "value"],
@@ -1918,6 +1927,9 @@
                 },
                 "metricData": {
                     "shape": "MetricData"
+                },
+                "featureDevEvent": {
+                    "shape": "FeatureDevEvent"
                 }
             },
             "union": true
diff --git a/packages/core/src/amazonqFeatureDev/client/featureDev.ts b/packages/core/src/amazonqFeatureDev/client/featureDev.ts
@@ -308,4 +308,34 @@ export class FeatureDevClient {
             throw new ToolkitError((e as Error).message, { code: 'ExportResultArchiveFailed' })
         }
     }
+
+    /**
+     * This event is specific to ABTesting purposes.
+     *
+     * No need to fail currently if the event fails in the request. In addition, currently there is no need for a return value.
+     *
+     * @param conversationId
+     */
+    public async sendFeatureDevTelemetryEvent(conversationId: string) {
+        try {
+            const client = await this.getClient()
+            const params: FeatureDevProxyClient.SendTelemetryEventRequest = {
+                telemetryEvent: {
+                    featureDevEvent: {
+                        conversationId,
+                    },
+                },
+            }
+            const response = await client.sendTelemetryEvent(params).promise()
+            getLogger().debug(
+                `${featureName}: successfully sent featureDevEvent: ConversationId: ${conversationId} RequestId: ${response.$response.requestId}`
+            )
+        } catch (e) {
+            getLogger().error(
+                `${featureName}: failed to send feature dev telemetry: ${(e as Error).name}: ${
+                    (e as Error).message
+                } RequestId: ${(e as any).requestId}`
+            )
+        }
+    }
 }
diff --git a/packages/core/src/amazonqFeatureDev/session/session.ts b/packages/core/src/amazonqFeatureDev/session/session.ts
@@ -61,6 +61,7 @@ export class Session {
             await this.setupConversation(msg)
             this.preloaderFinished = true
             this.messenger.sendAsyncEventProgress(this.tabID, true, undefined)
+            await this.proxyClient.sendFeatureDevTelemetryEvent(this.conversationId) // send the event only once per conversation.
         }
     }
 
diff --git a/packages/core/src/amazonqFeatureDev/util/telemetryHelper.ts b/packages/core/src/amazonqFeatureDev/util/telemetryHelper.ts
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { globals } from '../../shared'
 import { getLogger } from '../../shared/logger/logger'
 import { AmazonqApproachInvoke, AmazonqCodeGenerationInvoke, Metric } from '../../shared/telemetry/telemetry'
 import { LLMResponseType } from '../types'
@@ -41,7 +42,9 @@ export class TelemetryHelper {
             amazonqGenerateApproachLatency: performance.now() - this.generateApproachLastInvocationTime,
             amazonqGenerateApproachResponseType: responseType,
         }
-        getLogger().debug(`recordUserApproachTelemetry: %O`, event)
+        if (globals.telemetry.telemetryEnabled) {
+            getLogger().debug(`recordUserApproachTelemetry: %O`, event)
+        }
         span.record(event)
     }
 
diff --git a/packages/core/src/codewhisperer/commands/startSecurityScan.ts b/packages/core/src/codewhisperer/commands/startSecurityScan.ts
@@ -29,7 +29,6 @@ import {
     CodeScanTelemetryEntry,
 } from '../models/model'
 import { cancel, ok } from '../../shared/localizedText'
-import { getDirSize } from '../../shared/filesystemUtilities'
 import { telemetry } from '../../shared/telemetry/telemetry'
 import { isAwsError } from '../../shared/errors'
 import { openUrl } from '../../shared/utilities/vsCodeUtils'
@@ -288,16 +287,6 @@ export async function emitCodeScanTelemetry(
     scope: CodeWhispererConstants.CodeAnalysisScope
 ) {
     codeScanTelemetryEntry.codewhispererCodeScanProjectBytes = 0
-    const now = performance.now()
-    if (scope === CodeWhispererConstants.CodeAnalysisScope.PROJECT) {
-        for (const folder of vscode.workspace.workspaceFolders ?? []) {
-            codeScanTelemetryEntry.codewhispererCodeScanProjectBytes += await getDirSize(
-                folder.uri.fsPath,
-                now,
-                CodeWhispererConstants.projectSizeCalculateTimeoutSeconds * 1000
-            )
-        }
-    }
     telemetry.codewhisperer_securityScan.emit({
         ...codeScanTelemetryEntry,
         passive: codeScanTelemetryEntry.codewhispererCodeScanScope === CodeAnalysisScope.FILE,
diff --git a/packages/core/src/codewhisperer/models/constants.ts b/packages/core/src/codewhisperer/models/constants.ts
@@ -216,7 +216,7 @@ export const fileScanPayloadSizeLimitBytes = 200 * Math.pow(2, 10) // 200 KB
 
 export const fileScanUploadIntent = 'AUTOMATIC_FILE_SECURITY_SCAN'
 
-export const projectScanPayloadSizeLimitBytes = 500 * Math.pow(2, 20) // 500 MB
+export const projectScanPayloadSizeLimitBytes = 1 * Math.pow(2, 30) // 1GB
 
 export const projectScanUploadIntent = 'FULL_PROJECT_SECURITY_SCAN'
 
diff --git a/packages/core/src/login/webview/vue/login.vue b/packages/core/src/login/webview/vue/login.vue
@@ -1,11 +1,17 @@
 <!-- This Vue File is the login webview of AWS Toolkit and Amazon Q.-->
 <template>
-    <div v-bind:class="[disabled ? 'disabled-form' : '']" class="auth-container" @click="handleDocumentClick">
+    <div
+        v-bind:class="[disabled ? 'disabled-form' : '']"
+        class="auth-container"
+        :data-app="app"
+        @click="handleDocumentClick"
+        v-if="stage !== 'CONNECTED'"
+    >
         <div class="logoIcon bottomMargin">
             <!-- Icon -->
 
             <svg
-                v-if="app === 'AMAZONQ' && stage !== 'CONNECTED'"
+                v-if="app === 'AMAZONQ'"
                 width="71"
                 height="71"
                 viewBox="0 0 71 71"
@@ -46,7 +52,7 @@
                 </defs>
             </svg>
             <svg
-                v-if="app === 'TOOLKIT' && stage !== 'CONNECTED'"
+                v-if="app === 'TOOLKIT'"
                 width="100"
                 height="80"
                 viewBox="0 0 54 40"
@@ -226,7 +232,6 @@
             </div>
         </template>
 
-        <template v-if="stage === 'CONNECTED'"> </template>
         <template v-if="stage === 'AWS_PROFILE'">
             <button class="back-button bottomMargin" @click="handleBackButtonClick">
                 <svg width="13" height="11" viewBox="0 0 13 11" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -602,6 +607,16 @@ export default defineComponent({
     width: 260px;
 }
 
+.auth-container[data-app='AMAZONQ'] {
+    border-radius: 11px;
+    background: rgba(30, 30, 30, 0.8);
+    padding: 15px;
+}
+
+.vscode-light .auth-container[data-app='AMAZONQ'] {
+    background: rgba(255, 255, 255, 1);
+}
+
 .header {
     font-size: var(--font-size-base);
     font-weight: bold;
diff --git a/packages/core/src/login/webview/vue/reauthenticate.vue b/packages/core/src/login/webview/vue/reauthenticate.vue
diff --git a/packages/core/src/login/webview/vue/root.vue b/packages/core/src/login/webview/vue/root.vue
diff --git a/packages/core/src/login/webview/vue/selectableItem.vue b/packages/core/src/login/webview/vue/selectableItem.vue
diff --git a/packages/core/src/shared/errors.ts b/packages/core/src/shared/errors.ts
diff --git a/packages/core/src/test/shared/errors.test.ts b/packages/core/src/test/shared/errors.test.ts
diff --git a/packages/core/src/testInteg/globalSetup.test.ts b/packages/core/src/testInteg/globalSetup.test.ts

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Bug Fix",
 +	"description": "Security Scan: Fixes an issue where project-scans time out for larger projects."
 +}
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ export class TabDataGenerator {`
`46`	`46`	`],`
`47`	`47`	`[`
`48`	`48`	`'featuredev',`
`49`		- `Welcome to feature development.
	`49`	+ `Hi, I'm the Amazon Q Developer Agent for software development.
`50`	`50`
`51`	`51`	`I can generate code to implement new functionality across your workspace. We'll start by discussing an implementation plan, and then we can review and regenerate code based on your feedback.`
`52`	`52`