Merge master into feature/stepfunctions-execution

package.json

@@ -75,7 +75,7 @@
         "webpack-merge": "^5.10.0"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.128",
+        "@aws/language-server-runtimes": "^0.3.5",
         "@types/node": "^22.7.5",
         "jaro-winkler": "^0.2.8",
         "vscode-nls": "^5.2.0",

packages/amazonq/.changes/1.101.0.json

@@ -0,0 +1,5 @@
+{
+	"date": "2025-10-22",
+	"version": "1.101.0",
+	"entries": []
+}

packages/amazonq/.changes/1.102.0.json

@@ -0,0 +1,5 @@
+{
+	"date": "2025-10-30",
+	"version": "1.102.0",
+	"entries": []
+}

packages/amazonq/.changes/next-release/Feature-ab31cbb6-3fe4-4ee3-a0a3-290430277856.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Q CodeTransformation: add more job metadata to history table"
+}

packages/amazonq/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.102.0 2025-10-30
+
+- Miscellaneous non-user-facing changes
+
+## 1.101.0 2025-10-22
+
+- Miscellaneous non-user-facing changes
+
 ## 1.100.0 2025-10-16
 
 - Miscellaneous non-user-facing changes

packages/amazonq/package.json

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI–powered assistant for software development.",
-    "version": "1.101.0-SNAPSHOT",
+    "version": "1.103.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
@@ -1289,124 +1289,173 @@
                     "fontCharacter": "\\f1d2"
                 }
             },
-            "aws-lambda-function": {
+            "aws-lambda-deployed-function": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1d3"
                 }
             },
-            "aws-mynah-MynahIconBlack": {
+            "aws-lambda-function": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1d4"
                 }
             },
-            "aws-mynah-MynahIconWhite": {
+            "aws-lambda-invoke-remotely": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1d5"
                 }
             },
-            "aws-mynah-logo": {
+            "aws-mynah-MynahIconBlack": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1d6"
                 }
             },
-            "aws-redshift-cluster": {
+            "aws-mynah-MynahIconWhite": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1d7"
                 }
             },
-            "aws-redshift-cluster-connected": {
+            "aws-mynah-logo": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1d8"
                 }
             },
-            "aws-redshift-database": {
+            "aws-redshift-cluster": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1d9"
                 }
             },
-            "aws-redshift-redshift-cluster-connected": {
+            "aws-redshift-cluster-connected": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1da"
                 }
             },
-            "aws-redshift-schema": {
+            "aws-redshift-database": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1db"
                 }
             },
-            "aws-redshift-table": {
+            "aws-redshift-redshift-cluster-connected": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1dc"
                 }
             },
-            "aws-s3-bucket": {
+            "aws-redshift-schema": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1dd"
                 }
             },
-            "aws-s3-create-bucket": {
+            "aws-redshift-table": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1de"
                 }
             },
-            "aws-sagemaker-code-editor": {
+            "aws-s3-bucket": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1df"
                 }
             },
-            "aws-sagemaker-jupyter-lab": {
+            "aws-s3-create-bucket": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1e0"
                 }
             },
-            "aws-schemas-registry": {
+            "aws-sagemaker-code-editor": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1e1"
                 }
             },
-            "aws-schemas-schema": {
+            "aws-sagemaker-jupyter-lab": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1e2"
                 }
             },
-            "aws-stepfunctions-preview": {
+            "aws-sagemakerunifiedstudio-catalog": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1e3"
                 }
+            },
+            "aws-sagemakerunifiedstudio-spaces": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e4"
+                }
+            },
+            "aws-sagemakerunifiedstudio-spaces-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e5"
+                }
+            },
+            "aws-sagemakerunifiedstudio-symbol-int": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e6"
+                }
+            },
+            "aws-sagemakerunifiedstudio-table": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e7"
+                }
+            },
+            "aws-schemas-registry": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e8"
+                }
+            },
+            "aws-schemas-schema": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e9"
+                }
+            },
+            "aws-stepfunctions-preview": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ea"
+                }
             }
         },
         "walkthroughs": [
@@ -1435,17 +1484,6 @@
                         },
                         "completionEvents": []
                     },
-                    {
-                        "id": "aws.amazonq.walkthrough.securityScan",
-                        "title": "Check for security vulnerabilities",
-                        "description": "Amazon Q scans your code to identify security vulnerabilities and suggests fixes.\n\nStart a scan from the status bar menu.\n\n[Scan your current project](command:_aws.amazonq.walkthrough.securityScanExample)\n\nIdentifies vulnerabilities in Python, Typescript, Ruby, AWS CDK, and [more](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/q-language-ide-support.html#security-scans-language-support)",
-                        "media": {
-                            "markdown": "./resources/walkthrough/amazonq/scans.md"
-                        },
-                        "completionEvents": [
-                            "onCommand:_aws.amazonq.walkthrough.securityScanExample"
-                        ]
-                    },
                     {
                         "id": "aws.amazonq.walkthrough.settings",
                         "title": "Access actions and options",

packages/amazonq/src/app/inline/EditRendering/displayImage.ts

@@ -6,7 +6,7 @@
 import { getContext, getLogger, setContext } from 'aws-core-vscode/shared'
 import * as vscode from 'vscode'
 import { applyPatch, diffLines } from 'diff'
-import { LanguageClient } from 'vscode-languageclient'
+import { BaseLanguageClient } from 'vscode-languageclient'
 import { CodeWhispererSession } from '../sessionManager'
 import { LogInlineCompletionSessionResultsParams } from '@aws/language-server-runtimes/protocol'
 import { InlineCompletionItemWithReferences } from '@aws/language-server-runtimes/protocol'
@@ -309,7 +309,7 @@ export async function displaySvgDecoration(
     newCode: string,
     originalCodeHighlightRanges: Array<{ line: number; start: number; end: number }>,
     session: CodeWhispererSession,
-    languageClient: LanguageClient,
+    languageClient: BaseLanguageClient,
     item: InlineCompletionItemWithReferences,
     inlineCompletionProvider?: AmazonQInlineCompletionItemProvider
 ) {
@@ -323,7 +323,7 @@ export async function displaySvgDecoration(
     if (Math.abs(startLine - currentCursorLine) >= autoDiscardEditCursorDistance) {
         // Emit DISCARD telemetry for edit suggestion that can't be shown because the suggestion is too far away
         const params = createDiscardTelemetryParams(session, item)
-        languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
+        void languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
         logSuggestionFailure('DISCARD', 'cursor is too far away', item.insertText as string)
         return
     }
@@ -342,7 +342,7 @@ export async function displaySvgDecoration(
 
         // Emit DISCARD telemetry for edit suggestion that can't be shown due to active completion
         const params = createDiscardTelemetryParams(session, item)
-        languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
+        void languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
         logSuggestionFailure('DISCARD', 'Conflicting active inline completion', item.insertText as string)
         return
     }
@@ -355,7 +355,7 @@ export async function displaySvgDecoration(
 
         const params = createDiscardTelemetryParams(session, item)
         // TODO: this session is closed on flare side hence discarded is not emitted in flare
-        languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
+        void languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
         logSuggestionFailure('DISCARD', 'Invalid patch', item.insertText as string)
         return
     }
@@ -433,7 +433,7 @@ export async function displaySvgDecoration(
                 firstCompletionDisplayLatency: session.firstCompletionDisplayLatency,
                 isInlineEdit: true,
             }
-            languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
+            void languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
             session.triggerOnAcceptance = true
         },
         async (isDiscard: boolean) => {
@@ -466,7 +466,7 @@ export async function displaySvgDecoration(
                 firstCompletionDisplayLatency: session.firstCompletionDisplayLatency,
                 isInlineEdit: true,
             }
-            languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
+            void languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
         },
         originalCode,
         newCode,

packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts

@@ -7,7 +7,7 @@ import * as vscode from 'vscode'
 import { displaySvgDecoration } from './displayImage'
 import { SvgGenerationService } from './svgGenerator'
 import { getLogger } from 'aws-core-vscode/shared'
-import { LanguageClient } from 'vscode-languageclient'
+import { BaseLanguageClient } from 'vscode-languageclient'
 import { InlineCompletionItemWithReferences } from '@aws/language-server-runtimes/protocol'
 import { CodeWhispererSession } from '../sessionManager'
 import type { AmazonQInlineCompletionItemProvider } from '../completion'
@@ -16,7 +16,7 @@ export async function showEdits(
     item: InlineCompletionItemWithReferences,
     editor: vscode.TextEditor | undefined,
     session: CodeWhispererSession,
-    languageClient: LanguageClient,
+    languageClient: BaseLanguageClient,
     inlineCompletionProvider?: AmazonQInlineCompletionItemProvider
 ) {
     if (!editor) {

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

@@ -23,9 +23,9 @@ import {
     vsCodeState,
 } from 'aws-core-vscode/codewhisperer'
 import { Commands, getLogger, globals, sleep } from 'aws-core-vscode/shared'
-import { LanguageClient } from 'vscode-languageclient'
+import { BaseLanguageClient } from 'vscode-languageclient'
 
-export async function activate(languageClient: LanguageClient) {
+export async function activate(languageClient: BaseLanguageClient) {
     const codewhispererSettings = CodeWhispererSettings.instance
     const client = new DefaultCodeWhispererClient()