merge: resolve import conflicts

Author: Hweinstock

CONTRIBUTING.md

@@ -368,31 +368,28 @@ The `aws.dev.forceDevMode` setting enables or disables Toolkit "dev mode". Witho
         ```
         tail -F ~/awstoolkit.log
         ```
--   Use the `AWS (Developer): Watch Logs` command to watch and filter Toolkit logs (including
-    telemetry) in VSCode.
-    -   Only available if you enabled "dev mode" (`aws.dev.forceDevMode` setting, see above).
-    -   Enter text in the Debug Console filter box to show only log messages with that text. <br/>
-        <img src="./docs/images/debug-console-filter.png" alt="VSCode Debug Console" width="320"/>
+-   Use the Output panel to watch and filter Toolkit logs (including telemetry) in VSCode.
+    -   Enter text in the Output panel filter box to show only log messages with that text.
 
 #### Enabling Debug Logs
 
 How to enable more detailed debug logs in the extensions.
 If you need to report an issue attach these to give the most detailed information.
 
-1. Open the Command Palette (`cmd/ctrl` + `shift` + `p`), then search for "View Logs". Choose the correct option for the extension you want, eg: `AWS: View Logs` or `Amazon Q: View Logs`
-   ![](./docs/images/logsView.png)
+1. Open the Command Palette (`cmd/ctrl` + `shift` + `p`), then search for "View Logs". Choose either `AWS: View Logs` or `Amazon Q: View Logs`.
+    - ![](./docs/images/logsView.png)
 2. Click the gear icon on the bottom right and select `Debug`
-   ![](./docs/images/logsSetDebug.png)
+    - ![](./docs/images/logsSetDebug.png)
 3. Click the gear icon again and select `Set As Default`. This will ensure we stay in `Debug` until explicitly changed
-   ![](./docs/images/logsSetDefault.png)
+    - ![](./docs/images/logsSetDefault.png)
 4. Open the Command Palette again and select `Reload Window`.
 5. Now you should see additional `[debug]` prefixed logs in the output.
-   ![](./docs/images/logsDebugLog.png)
+    - ![](./docs/images/logsDebugLog.png)
 
 ### Telemetry
 
 -   See [docs/telemetry.md](./docs/telemetry.md) for guidelines on developing telemetry in this project.
--   To watch Toolkit telemetry events, use the `AWS (Developer): Watch Logs` command (see [Logging](#logging) above) and enter "telemetry" in the Debug Console filter box.
+-   To watch Toolkit telemetry events, use the `Amazon Q: View Logs` command (see [Logging](#logging) above) and enter "telemetry" in the filter box.
 
 ### Service Endpoints
 

docs/images/debug-console-filter.png

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "`Send to prompt` and other context menu options not sent if chat was closed"
+}

packages/amazonq/.changes/next-release/Bug Fix-704d175a-a99f-4ce7-bf08-b94d6f7218c0.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q /dev: support `.hbs`, `.gjs`, `.gts`, `.astro`, `.mdx`, `.svelte`, `.erb`, `.rake` files"
+}

packages/amazonq/.changes/next-release/Feature-d86356a0-bc42-4187-a7f8-205afbc25d76.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "/transform: automatically download results when ready"
+}

packages/amazonq/.changes/next-release/Feature-d9128dff-2867-4bf4-9046-2a52a36803d7.json

@@ -11,7 +11,7 @@ import { registerInlineCompletion } from '../app/inline/completion'
 import { AmazonQLspAuth, encryptionKey, notificationTypes } from './auth'
 import { AuthUtil } from 'aws-core-vscode/codewhisperer'
 import { ConnectionMetadata } from '@aws/language-server-runtimes/protocol'
-import { ResourcePaths, createServerOptions } from 'aws-core-vscode/shared'
+import { ResourcePaths, Settings, createServerOptions, globals } from 'aws-core-vscode/shared'
 
 const localize = nls.loadMessageBundle()
 
@@ -35,6 +35,9 @@ export async function startLanguageServer(extensionContext: vscode.ExtensionCont
 
     const documentSelector = [{ scheme: 'file', language: '*' }]
 
+    const clientId = 'amazonq'
+    const traceServerEnabled = Settings.instance.isSet(`${clientId}.trace.server`)
+
     // Options to control the language client
     const clientOptions: LanguageClientOptions = {
         // Register the server for json documents
@@ -60,10 +63,20 @@ export async function startLanguageServer(extensionContext: vscode.ExtensionCont
                 providesBearerToken: true,
             },
         },
+        /**
+         * When the trace server is enabled it outputs a ton of log messages so:
+         *   When trace server is enabled, logs go to a seperate "Amazon Q Language Server" output.
+         *   Otherwise, logs go to the regular "Amazon Q Logs" channel.
+         */
+        ...(traceServerEnabled
+            ? {}
+            : {
+                  outputChannel: globals.logOutputChannel,
+              }),
     }
 
     const client = new LanguageClient(
-        'amazonq',
+        clientId,
         localize('amazonq.server.name', 'Amazon Q Language Server'),
         serverOptions,
         clientOptions

packages/amazonq/src/lsp/client.ts

@@ -4,7 +4,6 @@
  */
 
 import * as vscode from 'vscode'
-import { Range } from 'semver'
 import {
     ManifestResolver,
     LanguageServerResolver,
@@ -16,9 +15,12 @@ import {
     getLogger,
 } from 'aws-core-vscode/shared'
 import path from 'path'
+import { Range } from 'semver'
 
-const manifestURL = 'https://aws-toolkit-language-servers.amazonaws.com/codewhisperer/0/manifest.json'
-export const supportedLspServerVersions = '^3.1.1'
+export const manifestURL = 'https://aws-toolkit-language-servers.amazonaws.com/codewhisperer/0/manifest.json'
+export const supportedLspServerVersions = new Range('^3.1.1', {
+    includePrerelease: true,
+})
 const logger = getLogger('amazonqLsp')
 
 export class AmazonQLSPResolver implements LspResolver {
@@ -44,7 +46,7 @@ export class AmazonQLSPResolver implements LspResolver {
         const installationResult = await new LanguageServerResolver(
             manifest,
             name,
-            new Range(supportedLspServerVersions)
+            supportedLspServerVersions
         ).resolve()
 
         const nodePath = path.join(installationResult.assetDirectory, `servers/${getNodeExecutableName()}`)

packages/amazonq/src/lsp/lspInstaller.ts

@@ -9,17 +9,18 @@ import sinon from 'sinon'
 import { registerAuthHook, using } from 'aws-core-vscode/test'
 import { loginToIdC } from './utils/setup'
 import { Messenger } from './framework/messenger'
-import { examples } from 'aws-core-vscode/amazonqFeatureDev'
 import { FollowUpTypes } from 'aws-core-vscode/amazonq'
 import { sleep } from 'aws-core-vscode/shared'
 
 describe('Amazon Q Feature Dev', function () {
     let framework: qTestingFramework
     let tab: Messenger
 
-    const prompt = 'Add blank.txt file with empty content'
-    const codegenApproachPrompt = `${prompt} and add a readme that describes the changes`
-    const fileLevelAcceptPrompt = `${prompt} and add a license, and a contributing file`
+    const prompt = 'Add current timestamp into blank.txt'
+    const iteratePrompt = `Add a new section in readme to explain your change`
+    const fileLevelAcceptPrompt = `${prompt} and ${iteratePrompt}`
+    const informationCard =
+        'After you provide a task, I will:\n1. Generate code based on your description and the code in your workspace\n2. Provide a list of suggestions for you to review and add to your workspace\n3. If needed, iterate based on your feedback\nTo learn more, visit the [user guide](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/software-dev.html)'
     const tooManyRequestsWaitTime = 100000
 
     async function waitForText(text: string) {
@@ -144,34 +145,35 @@ describe('Amazon Q Feature Dev', function () {
     })
 
     describe('/dev entry', () => {
-        it('Clicks examples', async () => {
-            const q = framework.createTab()
-            q.addChatMessage({ command: '/dev' })
+        before(async () => {
+            tab = framework.createTab()
+            tab.addChatMessage({ command: '/dev' }) // This would create a new tab for feature dev.
+            tab = framework.getSelectedTab()
+        })
+
+        it('should display information card', async () => {
             await retryIfRequired(
                 async () => {
-                    await q.waitForChatFinishesLoading()
+                    await tab.waitForChatFinishesLoading()
                 },
                 () => {
-                    q.clickButton(FollowUpTypes.DevExamples)
-
-                    const lastChatItems = q.getChatItems().pop()
-                    assert.deepStrictEqual(lastChatItems?.body, examples)
+                    const lastChatItems = tab.getChatItems().pop()
+                    assert.deepStrictEqual(lastChatItems?.body, informationCard)
                 }
             )
         })
     })
 
-    // Disable failing tests while investigation. The tests are only failing in CI environments.
-    describe.skip('/dev {msg} entry', async () => {
+    describe('/dev {msg} entry', async () => {
         beforeEach(async function () {
+            tab = framework.createTab()
             tab.addChatMessage({ command: '/dev', prompt })
+            tab = framework.getSelectedTab()
             await retryIfRequired(
                 async () => {
                     await tab.waitForChatFinishesLoading()
                 },
-                () => {
-                    tab.addChatMessage({ prompt })
-                }
+                () => {}
             )
         })
 
@@ -211,15 +213,17 @@ describe('Amazon Q Feature Dev', function () {
             })
             tab.clickButton(FollowUpTypes.ProvideFeedbackAndRegenerateCode)
             await tab.waitForChatFinishesLoading()
-            await iterate(codegenApproachPrompt)
+            await iterate(iteratePrompt)
             tab.clickButton(FollowUpTypes.InsertCode)
             await tab.waitForButtons([FollowUpTypes.NewTask, FollowUpTypes.CloseSession])
         })
     })
 
-    describe.skip('file-level accepts', async () => {
+    describe('file-level accepts', async () => {
         beforeEach(async function () {
+            tab = framework.createTab()
             tab.addChatMessage({ command: '/dev', prompt: fileLevelAcceptPrompt })
+            tab = framework.getSelectedTab()
             await retryIfRequired(
                 async () => {
                     await tab.waitForChatFinishesLoading()

packages/amazonq/test/e2e/amazonq/featureDev.test.ts

@@ -105,6 +105,16 @@ export class qTestingFramework {
         return Object.entries(tabs).map(([tabId]) => new Messenger(tabId, this.mynahUIProps, this.mynahUI))
     }
 
+    public getSelectedTab() {
+        const selectedTabId = this.mynahUI.getSelectedTabId()
+        const selectedTab = this.getTabs().find((tab) => tab.tabID === selectedTabId)
+
+        if (!selectedTab) {
+            assert.fail('Selected tab not found')
+        }
+        return selectedTab
+    }
+
     public findTab(title: string) {
         return Object.values(this.getTabs()).find((tab) => tab.getStore().tabTitle === title)
     }