Merge branch 'master' into lint/noCopyPaste2

Author: Hweinstock

docs/telemetry-perf.md

@@ -258,3 +258,70 @@ How long it took from when the user stopped pressing a key to when they were sho
         rHandler->>User: add to already shown results
         end
 ```
+
+## Crash Monitoring
+
+We make an attempt to gather information regarding when the IDE crashes, then report it to telemetry. This is the diagram of the steps that take place.
+
+### Sequence Diagram
+
+> Keep in mind that the entire sequence below is duplicated for each instance of our extension.
+> They all work together to "crash check" on behalf of the other crashed extension instance.
+
+`Crash Service`: The high level "service" that starts the heartbeats and crash checks
+
+`Heartbeat`: Sends heartbeats which signal that the extension is still running and has not crashed
+
+`Crash Checker`: Observes the heartbeats, reporting a telemetry event if a crash is detected
+
+`File System State`: The user's file system where we store the heartbeat files from each extension instance
+
+```mermaid
+%%{init: {'theme':'default'}}%%
+sequenceDiagram
+  autonumber
+
+  participant VSC as VS Code
+  participant Service as Crash Service
+  participant Checker as Crash Checker
+  participant Heartbeat as Heartbeat
+  participant State as File System State
+  participant Telemetry as Telemetry
+
+  rect rgb(121, 210, 121)
+    alt Extension Startup
+        VSC ->> Service: activate() - Start Service
+
+        Service ->> Heartbeat: Start Heartbeats
+        Heartbeat ->> State: Send Initial Heartbeat <br/> (in a folder add a unique file w/ timestamp)
+        rect rgb(64, 191, 64)
+            par every N minutes
+                Heartbeat ->> State: Send Heartbeat <br/> (overwrite the unique file w/ new timestamp)
+            end
+        end
+
+        Service ->> Checker: Start Crash Checking
+        rect rgb(64, 191, 64)
+            par every N*2 minutes
+                Checker ->> Checker: If computer went to sleep, skip this iteration (gives time for a heartbeat)
+                Checker ->> State: Request all heartbeat timestamps (readdir all heartbeat files)
+                State ->> Checker: Receive all heartbeat timestamps
+                loop for each crashed extension (it's timestamp >= N*2 minutes)
+                    Checker ->> State: Delete heartbeat file
+                    Checker ->> Telemetry: Send metric representing a crash: session_end
+                end
+            end
+        end
+    end
+  end
+
+  rect rgb(255, 128, 128)
+    alt Graceful Shutdown
+        VSC ->> Service: deactivate() - Stop Service
+        Service ->> Checker: Stop
+        Service ->> Heartbeat: Stop
+        Heartbeat ->> State: Delete timestamp file <br/> (This is missed when a crash happens)
+    end
+  end
+
+```

packages/amazonq/.changes/next-release/Bug Fix-59d88db7-cfd5-41da-9a63-2a6391b27add.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Update `@workspace` index when adding or deleting a file"
+}

packages/amazonq/.changes/next-release/Bug Fix-771c645f-eeea-4da5-b2d2-4315dfad9506.json

@@ -0,0 +1,4 @@
+{
+    "type": "Bug Fix",
+    "description": "fixed device code detection when running auth through tunneled vscode"
+}

packages/amazonq/.changes/next-release/Feature-3f18ffa1-f90f-4ceb-8af9-a913a56cd5ce.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q /dev: Add stop generation action"
+}

packages/amazonq/package.json

@@ -188,6 +188,11 @@
         },
         "views": {
             "amazonq": [
+                {
+                    "id": "aws.amazonq.notifications",
+                    "name": "%AWS.notifications.title%",
+                    "when": "!isCloud9 && !aws.isSageMaker && aws.amazonq.notifications.show"
+                },
                 {
                     "type": "webview",
                     "id": "aws.amazonq.AmazonCommonAuth",
@@ -370,6 +375,13 @@
                     "group": "cw_chat"
                 }
             ],
+            "view/item/context": [
+                {
+                    "command": "_aws.amazonq.notifications.dismiss",
+                    "when": "viewItem == amazonqNotificationStartUp",
+                    "group": "inline@1"
+                }
+            ],
             "aws.amazonq.submenu.feedback": [
                 {
                     "command": "aws.amazonq.submitFeedback",
@@ -397,6 +409,13 @@
             ]
         },
         "commands": [
+            {
+                "command": "_aws.amazonq.notifications.dismiss",
+                "title": "%AWS.generic.dismiss%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(remove-close)"
+            },
             {
                 "command": "aws.amazonq.explainCode",
                 "title": "%AWS.command.amazonq.explainCode%",

packages/amazonq/src/app/chat/activation.ts

@@ -25,7 +25,11 @@ export async function activate(context: ExtensionContext) {
     await amazonq.TryChatCodeLensProvider.register(appInitContext.onDidChangeAmazonQVisibility.event)
 
     const setupLsp = funcUtil.debounce(async () => {
-        void amazonq.LspController.instance.trySetupLsp(context)
+        void amazonq.LspController.instance.trySetupLsp(context, {
+            startUrl: AuthUtil.instance.startUrl,
+            maxIndexSize: CodeWhispererSettings.instance.getMaxIndexSize(),
+            isVectorIndexEnabled: CodeWhispererSettings.instance.isLocalIndexEnabled(),
+        })
     }, 5000)
 
     context.subscriptions.push(

packages/amazonq/test/unit/amazonq/lsp/lspClient.test.ts

@@ -18,7 +18,7 @@ describe('Amazon Q LSP client', function () {
     })
 
     it('encrypts payload of query ', async () => {
-        await lspClient.query('mock_input')
+        await lspClient.queryVectorIndex('mock_input')
         assert.ok(encryptFunc.calledOnce)
         assert.ok(encryptFunc.calledWith(JSON.stringify({ query: 'mock_input' })))
         const value = await encryptFunc.returnValues[0]
@@ -27,14 +27,15 @@ describe('Amazon Q LSP client', function () {
     })
 
     it('encrypts payload of index files ', async () => {
-        await lspClient.indexFiles(['fileA'], 'path', false)
+        await lspClient.buildIndex(['fileA'], 'path', 'all')
         assert.ok(encryptFunc.calledOnce)
         assert.ok(
             encryptFunc.calledWith(
                 JSON.stringify({
                     filePaths: ['fileA'],
-                    rootPath: 'path',
-                    refresh: false,
+                    projectRoot: 'path',
+                    config: 'all',
+                    language: '',
                 })
             )
         )

packages/core/package.json

@@ -27,7 +27,8 @@
         "./utils": "./dist/src/shared/utilities/index.js",
         "./feedback": "./dist/src/feedback/index.js",
         "./telemetry": "./dist/src/shared/telemetry/index.js",
-        "./dev": "./dist/src/dev/index.js"
+        "./dev": "./dist/src/dev/index.js",
+        "./notifications": "./dist/src/notifications/index.js"
     },
     "contributes": {
         "icons": {

packages/core/package.nls.json

@@ -5,6 +5,7 @@
     "AWS.productName.cn": "Amazon Toolkit",
     "AWS.amazonq.productName": "Amazon Q",
     "AWS.codecatalyst.submenu.title": "Manage CodeCatalyst",
+    "AWS.notifications.title": "Notifications",
     "AWS.configuration.profileDescription": "The name of the credential profile to obtain credentials from.",
     "AWS.configuration.description.lambda.recentlyUploaded": "Recently selected Lambda upload targets.",
     "AWS.configuration.description.ecs.openTerminalCommand": "The command to run when starting a new interactive terminal session.",
@@ -245,6 +246,7 @@
     "AWS.generic.promptUpdate": "Update...",
     "AWS.generic.preview": "Preview",
     "AWS.generic.viewDocs": "View Documentation",
+    "AWS.generic.dismiss": "Dismiss",
     "AWS.ssmDocument.ssm.maxItemsComputed.desc": "Controls the maximum number of problems produced by the SSM Document language server.",
     "AWS.walkthrough.gettingStarted.title": "Get started with AWS",
     "AWS.walkthrough.gettingStarted.description": "These walkthroughs help you set up the AWS Toolkit.",
@@ -299,6 +301,7 @@
     "AWS.amazonq.featureDev.pillText.generatingCode": "Generating code...",
     "AWS.amazonq.featureDev.pillText.requestingChanges": "Requesting changes ...",
     "AWS.amazonq.featureDev.pillText.insertCode": "Accept code",
+    "AWS.amazonq.featureDev.pillText.stoppingCodeGeneration": "Stopping code generation...",
     "AWS.amazonq.featureDev.pillText.sendFeedback": "Send feedback",
     "AWS.amazonq.featureDev.pillText.selectFiles": "Select files for context",
     "AWS.amazonq.featureDev.pillText.retry": "Retry",
@@ -315,7 +318,7 @@
     "AWS.amazonq.featureDev.answer.sessionClosed": "Okay, I've ended this chat session. You can open a new tab to chat or start another workflow.",
     "AWS.amazonq.featureDev.answer.newTaskChanges": "What new task would you like to work on?",
     "AWS.amazonq.featureDev.placeholder.chatInputDisabled": "Chat input is disabled",
-    "AWS.amazonq.featureDev.placeholder.additionalImprovements": "Choose an option to proceed",
+    "AWS.amazonq.featureDev.placeholder.additionalImprovements": "Describe your task or issue in detail",
     "AWS.amazonq.featureDev.placeholder.feedback": "Provide feedback or comments",
     "AWS.amazonq.featureDev.placeholder.describe": "Describe your task or issue in detail",
     "AWS.amazonq.featureDev.placeholder.sessionClosed": "Open a new chat tab to continue"

packages/core/src/amazonq/lsp/lspClient.ts

@@ -17,7 +17,17 @@ import * as jose from 'jose'
 import { Disposable, ExtensionContext } from 'vscode'
 
 import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind } from 'vscode-languageclient'
-import { GetUsageRequestType, IndexRequestType, QueryRequestType, UpdateIndexRequestType, Usage } from './types'
+import {
+    BuildIndexRequestPayload,
+    BuildIndexRequestType,
+    GetUsageRequestType,
+    IndexConfig,
+    QueryInlineProjectContextRequestType,
+    QueryVectorIndexRequestType,
+    UpdateIndexV2RequestPayload,
+    UpdateIndexV2RequestType,
+    Usage,
+} from './types'
 import { Writable } from 'stream'
 import { CodeWhispererSettings } from '../../codewhisperer/util/codewhispererSettings'
 import { fs, getLogger } from '../../shared'
@@ -61,52 +71,67 @@ export class LspClient {
             .encrypt(key)
     }
 
-    async indexFiles(request: string[], rootPath: string, refresh: boolean) {
+    async buildIndex(paths: string[], rootPath: string, config: IndexConfig) {
+        const payload: BuildIndexRequestPayload = {
+            filePaths: paths,
+            projectRoot: rootPath,
+            config: config,
+            language: '',
+        }
         try {
-            const encryptedRequest = await this.encrypt(
-                JSON.stringify({
-                    filePaths: request,
-                    rootPath: rootPath,
-                    refresh: refresh,
-                })
-            )
-            const resp = await this.client?.sendRequest(IndexRequestType, encryptedRequest)
+            const encryptedRequest = await this.encrypt(JSON.stringify(payload))
+            const resp = await this.client?.sendRequest(BuildIndexRequestType, encryptedRequest)
             return resp
         } catch (e) {
-            getLogger().error(`LspClient: indexFiles error: ${e}`)
+            getLogger().error(`LspClient: buildIndex error: ${e}`)
             return undefined
         }
     }
 
-    async query(request: string) {
+    async queryVectorIndex(request: string) {
         try {
             const encryptedRequest = await this.encrypt(
                 JSON.stringify({
                     query: request,
                 })
             )
-            const resp = await this.client?.sendRequest(QueryRequestType, encryptedRequest)
+            const resp = await this.client?.sendRequest(QueryVectorIndexRequestType, encryptedRequest)
             return resp
         } catch (e) {
-            getLogger().error(`LspClient: query error: ${e}`)
+            getLogger().error(`LspClient: queryVectorIndex error: ${e}`)
             return []
         }
     }
 
+    async queryInlineProjectContext(query: string, path: string) {
+        try {
+            const request = JSON.stringify({
+                query: query,
+                filePath: path,
+            })
+            const encrypted = await this.encrypt(request)
+            const resp: any = await this.client?.sendRequest(QueryInlineProjectContextRequestType, encrypted)
+            return resp
+        } catch (e) {
+            getLogger().error(`LspClient: queryInlineProjectContext error: ${e}`)
+            throw e
+        }
+    }
+
     async getLspServerUsage(): Promise<Usage | undefined> {
         if (this.client) {
             return (await this.client.sendRequest(GetUsageRequestType, '')) as Usage
         }
     }
 
-    async updateIndex(filePath: string) {
+    async updateIndex(filePath: string[], mode: 'update' | 'remove' | 'add') {
+        const payload: UpdateIndexV2RequestPayload = {
+            filePaths: filePath,
+            updateMode: mode,
+        }
         try {
-            const encryptedRequest = await this.encrypt(
-                JSON.stringify({
-                    filePath: filePath,
-                })
-            )
-            const resp = await this.client?.sendRequest(UpdateIndexRequestType, encryptedRequest)
+            const encryptedRequest = await this.encrypt(JSON.stringify(payload))
+            const resp = await this.client?.sendRequest(UpdateIndexV2RequestType, encryptedRequest)
             return resp
         } catch (e) {
             getLogger().error(`LspClient: updateIndex error: ${e}`)
@@ -197,15 +222,26 @@ export async function activate(extensionContext: ExtensionContext) {
                 return
             }
             savedDocument = document.uri
-        })
-    )
-    toDispose.push(
+        }),
         vscode.window.onDidChangeActiveTextEditor((editor) => {
             if (savedDocument && editor && editor.document.uri.fsPath !== savedDocument.fsPath) {
-                void LspClient.instance.updateIndex(savedDocument.fsPath)
+                void LspClient.instance.updateIndex([savedDocument.fsPath], 'update')
             }
+        }),
+        vscode.workspace.onDidCreateFiles((e) => {
+            void LspClient.instance.updateIndex(
+                e.files.map((f) => f.fsPath),
+                'add'
+            )
+        }),
+        vscode.workspace.onDidDeleteFiles((e) => {
+            void LspClient.instance.updateIndex(
+                e.files.map((f) => f.fsPath),
+                'remove'
+            )
         })
     )
+
     return LspClient.instance.client.onReady().then(() => {
         const disposableFunc = { dispose: () => rangeFormatting?.dispose() as void }
         toDispose.push(disposableFunc)