Merge branch 'master' into reRoute

Author: laileni-aws

packages/amazonq/src/app/inline/cursorUpdateManager.ts

@@ -8,6 +8,7 @@ import { LanguageClient } from 'vscode-languageclient'
 import { getLogger } from 'aws-core-vscode/shared'
 import { globals } from 'aws-core-vscode/shared'
 import { AmazonQInlineCompletionItemProvider } from './completion'
+import { CodeSuggestionsState } from 'aws-core-vscode/codewhisperer'
 
 // Configuration section for cursor updates
 export const cursorUpdateConfigurationSection = 'aws.q.cursorUpdate'
@@ -32,11 +33,23 @@ export class CursorUpdateManager implements vscode.Disposable, ICursorUpdateReco
     private lastSentDocumentUri?: string
     private isActive = false
     private lastRequestTime = 0
+    private autotriggerStateDisposable?: vscode.Disposable
 
     constructor(
         private readonly languageClient: LanguageClient,
         private readonly inlineCompletionProvider?: AmazonQInlineCompletionItemProvider
-    ) {}
+    ) {
+        // Listen for autotrigger state changes to enable/disable the timer
+        this.autotriggerStateDisposable = CodeSuggestionsState.instance.onDidChangeState((isEnabled: boolean) => {
+            if (isEnabled && this.isActive) {
+                // If autotrigger is enabled and we're active, ensure timer is running
+                this.setupUpdateTimer()
+            } else {
+                // If autotrigger is disabled, clear the timer but keep isActive state
+                this.clearUpdateTimer()
+            }
+        })
+    }
 
     /**
      * Start tracking cursor positions and sending periodic updates
@@ -66,7 +79,9 @@ export class CursorUpdateManager implements vscode.Disposable, ICursorUpdateReco
         }
 
         this.isActive = true
-        this.setupUpdateTimer()
+        if (CodeSuggestionsState.instance.isSuggestionsEnabled()) {
+            this.setupUpdateTimer()
+        }
     }
 
     /**
@@ -130,7 +145,7 @@ export class CursorUpdateManager implements vscode.Disposable, ICursorUpdateReco
     }
 
     /**
-     * Send a cursor position update to the language server
+     * Request LSP generate a completion for the current cursor position.
      */
     private async sendCursorUpdate(): Promise<void> {
         // Don't send an update if a regular request was made recently
@@ -185,6 +200,12 @@ export class CursorUpdateManager implements vscode.Disposable, ICursorUpdateReco
      * Dispose of resources
      */
     public dispose(): void {
+        // Dispose of the autotrigger state change listener
+        if (this.autotriggerStateDisposable) {
+            this.autotriggerStateDisposable.dispose()
+            this.autotriggerStateDisposable = undefined
+        }
+
         this.stop()
     }
 }

packages/amazonq/src/lsp/client.ts

@@ -165,6 +165,7 @@ export async function startLanguageServer(
                         pinnedContextEnabled: true,
                         mcp: true,
                         reroute: true,
+                        workspaceFilePath: vscode.workspace.workspaceFile?.fsPath,
                     },
                     window: {
                         notifications: true,

packages/amazonq/test/unit/app/inline/cursorUpdateManager.test.ts

@@ -10,6 +10,7 @@ import { CursorUpdateManager } from '../../../../src/app/inline/cursorUpdateMana
 import { globals } from 'aws-core-vscode/shared'
 import assert from 'assert'
 import { AmazonQInlineCompletionItemProvider } from '../../../../src/app/inline/completion'
+import { CodeSuggestionsState } from 'aws-core-vscode/codewhisperer'
 
 describe('CursorUpdateManager', () => {
     let cursorUpdateManager: CursorUpdateManager
@@ -236,4 +237,93 @@ describe('CursorUpdateManager', () => {
         // Verify the provider was called again
         assert.strictEqual(provideStub.callCount, 1, 'Update should be sent when position has changed')
     })
+
+    describe('autotrigger state handling', () => {
+        class TestCodeSuggestionsState extends CodeSuggestionsState {
+            private _isEnabled: boolean
+            private _onDidChangeStateEmitter = new vscode.EventEmitter<boolean>()
+
+            public constructor(initialState: boolean = true) {
+                super(initialState)
+                this._isEnabled = initialState
+            }
+
+            public override onDidChangeState = this._onDidChangeStateEmitter.event
+
+            public override isSuggestionsEnabled(): boolean {
+                return this._isEnabled
+            }
+
+            public override async setSuggestionsEnabled(enabled: boolean): Promise<void> {
+                if (this._isEnabled !== enabled) {
+                    this._isEnabled = enabled
+                    this._onDidChangeStateEmitter.fire(enabled)
+                }
+            }
+        }
+
+        let testCodeSuggestionsState: TestCodeSuggestionsState
+        let instanceStub: sinon.SinonStub
+        let testCursorUpdateManager: CursorUpdateManager
+
+        beforeEach(() => {
+            // Create test instance
+            testCodeSuggestionsState = new TestCodeSuggestionsState(true)
+
+            // Stub the static getter to return our test instance
+            instanceStub = sinon.stub(CodeSuggestionsState, 'instance').get(() => testCodeSuggestionsState)
+
+            // Create the manager AFTER the stub is in place so it uses the test instance
+            const mockInlineCompletionProvider = {
+                provideInlineCompletionItems: sinon.stub().resolves([]),
+            } as unknown as AmazonQInlineCompletionItemProvider
+            testCursorUpdateManager = new CursorUpdateManager(languageClient, mockInlineCompletionProvider)
+        })
+
+        afterEach(() => {
+            // Dispose the test manager
+            testCursorUpdateManager.dispose()
+            // Restore the original getter
+            instanceStub.restore()
+        })
+
+        it('should not start timer when autotrigger is disabled', async () => {
+            // Test the new behavior: timer doesn't start when autotrigger is disabled
+            await testCodeSuggestionsState.setSuggestionsEnabled(false)
+            sendRequestStub.resolves({})
+
+            await testCursorUpdateManager.start()
+
+            // Manager should be active but timer should not be started
+            assert.strictEqual((testCursorUpdateManager as any).isActive, true)
+            assert.ok(!setIntervalStub.called, 'Timer should NOT be started when autotrigger is disabled')
+        })
+
+        it('should start/stop timer when autotrigger state changes', async () => {
+            // Start with autotrigger enabled
+            await testCodeSuggestionsState.setSuggestionsEnabled(true)
+            sendRequestStub.resolves({})
+            await testCursorUpdateManager.start()
+
+            // Reset stubs to test state changes
+            setIntervalStub.resetHistory()
+            clearIntervalStub.resetHistory()
+
+            // Simulate autotrigger being disabled
+            await testCodeSuggestionsState.setSuggestionsEnabled(false)
+            assert.ok(clearIntervalStub.called, 'Timer should be stopped when autotrigger is disabled')
+
+            // Simulate autotrigger being enabled again
+            await testCodeSuggestionsState.setSuggestionsEnabled(true)
+            assert.ok(setIntervalStub.called, 'Timer should be started when autotrigger is re-enabled')
+        })
+
+        it('should dispose autotrigger state listener on dispose', () => {
+            testCursorUpdateManager.dispose()
+            // The dispose method should clean up the state listener
+            // We can't easily test the disposal without more complex mocking,
+            // but we can at least verify dispose doesn't throw
+            assert.ok(true, 'Dispose should complete without errors')
+        })
+    })
 })

packages/core/scripts/build/copyFiles.ts

@@ -31,6 +31,11 @@ const tasks: CopyTask[] = [
     { target: path.join('src', 'testFixtures') },
     { target: 'src/auth/sso/vue' },
 
+    // Vue.js for webviews
+    {
+        target: path.join('../../node_modules', 'vue', 'dist', 'vue.global.prod.js'),
+        destination: path.join('libs', 'vue.min.js'),
+    },
     // SSM
     {
         target: path.join('../../node_modules', 'aws-ssm-document-language-service', 'dist', 'server.js'),

packages/core/src/amazonq/webview/ui/tabs/constants.ts

@@ -64,7 +64,7 @@ To learn more, visit the [User Guide](${userGuideURL}).`,
         title: 'Q - Code Transformation',
         placeholder: 'Open a new tab to chat with Q',
         welcome:
-            'Welcome to Code Transformation! You can also run transformations from the command line. To install the tool, see the [documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/run-CLI-transformations.html).',
+            'Welcome to Code Transformation! **You can also run transformations from the command line. To install the tool, see the [documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/run-CLI-transformations.html).**',
     },
     review: {
         title: 'Q - Review',

packages/core/src/codewhisperer/models/constants.ts

@@ -515,7 +515,7 @@ If you'd like to update and test your code with fewer changes at a time, I can d
 
 export const uploadingCodeStepMessage = 'Upload your code'
 
-export const buildCodeStepMessage = 'Build uploaded code in secure build environment'
+export const buildCodeStepMessage = 'Analyze uploaded code in secure environment'
 
 export const generatePlanStepMessage = 'Generate transformation plan'
 
@@ -734,7 +734,7 @@ export const cleanTestCompileErrorNotification = `Amazon Q could not run \`mvn c
 export const enterJavaHomeChatMessage = 'Enter the path to JDK'
 
 export const projectPromptChatMessage =
-    "I can upgrade your Java project. To start the transformation, I need some information from you. Choose the project you want to upgrade and the target code version to upgrade to. Then, choose Confirm.\n\nAfter successfully transforming to Java 17 or 21, an additional transformation is required to upgrade your libraries and dependencies. Choose the same source code version and target code version (for example, 17 to 17) to do this.\n\nI will perform the transformation based on your project's requests, descriptions, and content. To maintain security, avoid including external, unvetted artifacts in your project repository prior to starting the transformation and always validate transformed code for both functionality and security."
+    "I can upgrade your Java project. To start the transformation, I need some information from you. Choose the project you want to upgrade and the target code version to upgrade to. Then, choose Confirm.\n\nAfter successfully transforming to Java 17 or 21, an additional transformation is required to upgrade your libraries and dependencies. Choose the same source code version and target code version (for example, 17 to 17) to do this.\n\nI will perform the transformation based on your project's requests, descriptions, and content. To maintain security, avoid including external, unvetted artifacts in your project repository prior to starting the transformation and always validate transformed code for both functionality and security. Do not turn off or close your machine during the transformation because a stable network connection is required."
 
 export const windowsJavaHomeHelpChatMessage =
     'To find the JDK path, run the following commands in a new terminal: `cd "C:/Program Files/Java"` and then `dir`. If you see your JDK version, run `cd <version>` and then `cd` to show the path.'

packages/core/src/codewhisperer/models/model.ts

@@ -680,7 +680,7 @@ export class ZipManifest {
     dependenciesRoot: string = 'dependencies/'
     version: string = '1.0'
     hilCapabilities: string[] = ['HIL_1pDependency_VersionUpgrade']
-    transformCapabilities: string[] = ['EXPLAINABILITY_V1', 'SELECTIVE_TRANSFORMATION_V2', 'CLIENT_SIDE_BUILD']
+    transformCapabilities: string[] = ['EXPLAINABILITY_V1', 'SELECTIVE_TRANSFORMATION_V2', 'CLIENT_SIDE_BUILD', 'IDE']
     noInteractiveMode: boolean = true
     dependencyUpgradeConfigFile?: string = undefined
     compilationsJsonFile: string = 'compilations.json'

packages/core/src/login/webview/commonAuthViewProvider.ts

@@ -148,6 +148,10 @@ export class CommonAuthViewProvider implements WebviewViewProvider {
         const entrypoint =
             serverHostname !== undefined ? Uri.parse(serverHostname).with({ path: `/${this.source}` }) : scriptUri
 
+        // Get Vue.js from dist/libs directory
+        const vueUri = Uri.joinPath(assetsPath, 'dist', 'libs', 'vue.min.js')
+        const vueScript = webview.asWebviewUri(vueUri)
+
         return `
             <!DOCTYPE html>
             <html lang="en">
@@ -158,7 +162,7 @@ export class CommonAuthViewProvider implements WebviewViewProvider {
                     <title>Base View Extension</title>
                 </head>
                 <body>
-                    <script src="https://cdnjs.cloudflare.com/ajax/libs/vue/3.4.4/vue.global.prod.min.js"></script>  
+                    <script src="${vueScript.toString()}"></script>  
                     <script>
                         const vscode = acquireVsCodeApi();
                     </script>