Merge staging into feature/smus

Author: aws-toolkit-automation

package-lock.json

@@ -21,6 +21,7 @@ import {
 import { TelemetryHelper } from './telemetryHelper'
 import { ICursorUpdateRecorder } from './cursorUpdateManager'
 import { getLogger } from 'aws-core-vscode/shared'
+import { getOpenFilesInWindow } from 'aws-core-vscode/utils'
 import { asyncCallWithTimeout } from '../../util/timeoutUtil'
 
 export interface GetAllRecommendationsOptions {
@@ -79,14 +80,15 @@ export class RecommendationService {
                   contentChanges: documentChangeEvent.contentChanges.map((x) => x as TextDocumentContentChangeEvent),
               }
             : undefined
-
+        const openTabs = await getOpenFilesInWindow()
         let request: InlineCompletionWithReferencesParams = {
             textDocument: {
                 uri: document.uri.toString(),
             },
             position,
             context,
             documentChangeParams: documentChangeParams,
+            openTabFilepaths: openTabs,
         }
         if (options.editsStreakToken) {
             request = { ...request, partialResultToken: options.editsStreakToken }

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

@@ -147,6 +147,7 @@ describe('RecommendationService', () => {
                 position: mockPosition,
                 context: mockContext,
                 documentChangeParams: undefined,
+                openTabFilepaths: [],
             })
 
             // Verify session management
@@ -189,6 +190,7 @@ describe('RecommendationService', () => {
                 position: mockPosition,
                 context: mockContext,
                 documentChangeParams: undefined,
+                openTabFilepaths: [],
             }
             const secondRequestArgs = sendRequestStub.secondCall.args[1]
             assert.deepStrictEqual(firstRequestArgs, expectedRequestArgs)

packages/amazonq/test/unit/amazonq/apps/inline/recommendationService.test.ts

@@ -471,7 +471,7 @@
         "@aws-sdk/types": "^3.13.1",
         "@aws/chat-client": "^0.1.4",
         "@aws/chat-client-ui-types": "^0.1.47",
-        "@aws/language-server-runtimes": "^0.2.111",
+        "@aws/language-server-runtimes": "^0.2.119",
         "@aws/language-server-runtimes-types": "^0.1.47",
         "@cspotcode/source-map-support": "^0.8.1",
         "@sinonjs/fake-timers": "^10.0.2",

packages/core/package.json

@@ -8,3 +8,4 @@ export { VSCODE_EXTENSION_ID } from '../extensions'
 export * from './functionUtils'
 export * as messageUtils from './messages'
 export * as CommentUtils from './commentUtils'
+export * from './editorUtilities'