Merge master into feature/emr

Author: aws-toolkit-automation

package-lock.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q chat: `@prompts` not added to context"
+}

packages/amazonq/.changes/next-release/Bug Fix-ccbc5e50-0a90-4340-b6d5-e57537949898.json

@@ -29,6 +29,7 @@ import {
     ReferenceHoverProvider,
     ReferenceInlineProvider,
     ReferenceLogViewProvider,
+    ImportAdderProvider,
 } from 'aws-core-vscode/codewhisperer'
 
 export class InlineCompletionManager implements Disposable {
@@ -66,6 +67,7 @@ export class InlineCompletionManager implements Disposable {
             item: InlineCompletionItemWithReferences,
             editor: TextEditor,
             requestStartTime: number,
+            startLine: number,
             firstCompletionDisplayLatency?: number
         ) => {
             // TODO: also log the seen state for other suggestions in session
@@ -96,6 +98,9 @@ export class InlineCompletionManager implements Disposable {
                 ReferenceLogViewProvider.instance.addReferenceLog(referenceLog)
                 ReferenceHoverProvider.instance.addCodeReferences(item.insertText as string, item.references)
             }
+            if (item.mostRelevantMissingImports?.length) {
+                await ImportAdderProvider.instance.onAcceptRecommendation(editor, item, startLine)
+            }
         }
         commands.registerCommand('aws.amazonq.acceptInline', onInlineAcceptance)
 
@@ -200,6 +205,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                     item,
                     editor,
                     session.requestStartTime,
+                    position.line,
                     session.firstCompletionDisplayLatency,
                 ],
             }
@@ -208,6 +214,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                 item.insertText as string,
                 item.references
             )
+            ImportAdderProvider.instance.onShowRecommendation(document, position.line, item)
         }
         return items as InlineCompletionItem[]
     }

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

@@ -441,7 +441,7 @@
     "devDependencies": {
         "@aws-sdk/types": "^3.13.1",
         "@aws/chat-client-ui-types": "^0.0.8",
-        "@aws/language-server-runtimes": "^0.2.44",
+        "@aws/language-server-runtimes": "^0.2.49",
         "@cspotcode/source-map-support": "^0.8.1",
         "@sinonjs/fake-timers": "^10.0.2",
         "@types/adm-zip": "^0.4.34",

packages/core/package.json

@@ -70,6 +70,7 @@ export { RecommendationService } from './service/recommendationService'
 export { ClassifierTrigger } from './service/classifierTrigger'
 export { DocumentChangedSource, KeyStrokeHandler, DefaultDocumentChangedType } from './service/keyStrokeHandler'
 export { ReferenceLogViewProvider } from './service/referenceLogViewProvider'
+export { ImportAdderProvider } from './service/importAdderProvider'
 export { LicenseUtil } from './util/licenseUtil'
 export { SecurityIssueProvider } from './service/securityIssueProvider'
 export { listScanResults, mapToAggregatedList, pollScanJobStatus } from './service/securityScanHandler'

packages/core/src/codewhisperer/index.ts

@@ -498,6 +498,7 @@ export class ChatController {
                             command: path.basename(name, promptFileExtension),
                             icon: 'magic' as MynahIconsType,
                             id: 'prompt',
+                            label: 'file' as ContextCommandItemType,
                             route: [userPromptsDirectory, name],
                         }))
                 )