Merge master into feature/stepfunctions-execution

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"
     ],
@@ -1387,26 +1387,61 @@
                     "fontCharacter": "\\f1e0"
                 }
             },
-            "aws-schemas-registry": {
+            "aws-sagemakerunifiedstudio-catalog": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1e1"
                 }
             },
-            "aws-schemas-schema": {
+            "aws-sagemakerunifiedstudio-spaces": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1e2"
                 }
             },
-            "aws-stepfunctions-preview": {
+            "aws-sagemakerunifiedstudio-spaces-dark": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1e3"
                 }
+            },
+            "aws-sagemakerunifiedstudio-symbol-int": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e4"
+                }
+            },
+            "aws-sagemakerunifiedstudio-table": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e5"
+                }
+            },
+            "aws-schemas-registry": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e6"
+                }
+            },
+            "aws-schemas-schema": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e7"
+                }
+            },
+            "aws-stepfunctions-preview": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e8"
+                }
             }
         },
         "walkthroughs": [
@@ -1435,17 +1470,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/test/unit/codewhisperer/service/codewhisperer.test.ts

@@ -12,7 +12,8 @@ import {
     codeWhispererClient,
 } from 'aws-core-vscode/codewhisperer'
 import { globals, getClientId, getOperatingSystem } from 'aws-core-vscode/shared'
-import { AWSError, Request } from 'aws-sdk'
+import { Request } from 'aws-sdk'
+import { ServiceException } from '@smithy/smithy-client'
 import { createSpyClient } from 'aws-core-vscode/test'
 
 describe('codewhisperer', async function () {
@@ -109,7 +110,7 @@ describe('codewhisperer', async function () {
                         requestId: '',
                     },
                 }),
-        } as Request<SendTelemetryEventResponse, AWSError>)
+        } as Request<SendTelemetryEventResponse, ServiceException>)
 
         const expectedUserContext = {
             ideCategory: 'VSCODE',
@@ -134,7 +135,7 @@ describe('codewhisperer', async function () {
                         requestId: '',
                     },
                 }),
-        } as Request<SendTelemetryEventResponse, AWSError>)
+        } as Request<SendTelemetryEventResponse, ServiceException>)
 
         const authUtilStub = sinon.stub(AuthUtil.instance, 'isValidEnterpriseSsoInUse').returns(isSso)
         await globals.telemetry.setTelemetryEnabled(isTelemetryEnabled)

packages/core/package.json

@@ -547,12 +547,13 @@
         "@types/sinon": "^10.0.5",
         "@types/sinonjs__fake-timers": "^8.1.2",
         "@types/stream-buffers": "^3.0.7",
+        "@types/svgdom": "^0.1.2",
         "@types/tcp-port-used": "^1.0.1",
         "@types/uuid": "^9.0.1",
         "@types/whatwg-url": "^11.0.4",
         "@types/xml2js": "^0.4.11",
-        "@types/svgdom": "^0.1.2",
         "@vue/compiler-sfc": "^3.3.2",
+        "aws-sdk-client-mock": "^4.1.0",
         "c8": "^9.0.0",
         "circular-dependency-plugin": "^5.2.2",
         "css-loader": "^6.10.0",
@@ -580,7 +581,7 @@
         "@amzn/amazon-q-developer-streaming-client": "file:../../src.gen/@amzn/amazon-q-developer-streaming-client",
         "@amzn/codewhisperer-streaming": "file:../../src.gen/@amzn/codewhisperer-streaming",
         "@amzn/sagemaker-client": "file:../../src.gen/@amzn/sagemaker-client/1.0.0.tgz",
-        "@aws-sdk/credential-providers": "<3.731.0",
+        "@aws-sdk/client-accessanalyzer": "^3.888.0",
         "@aws-sdk/client-api-gateway": "<3.731.0",
         "@aws-sdk/client-apprunner": "<3.731.0",
         "@aws-sdk/client-cloudcontrol": "<3.731.0",
@@ -592,19 +593,29 @@
         "@aws-sdk/client-docdb": "<3.731.0",
         "@aws-sdk/client-docdb-elastic": "<3.731.0",
         "@aws-sdk/client-ec2": "<3.731.0",
+        "@aws-sdk/client-ecr": "~3.693.0",
+        "@aws-sdk/client-ecs": "~3.693.0",
         "@aws-sdk/client-glue": "^3.852.0",
         "@aws-sdk/client-iam": "<3.731.0",
+        "@aws-sdk/client-iot": "~3.693.0",
+        "@aws-sdk/client-iotsecuretunneling": "~3.693.0",
         "@aws-sdk/client-lambda": "<3.731.0",
+        "@aws-sdk/client-redshift": "~3.693.0",
+        "@aws-sdk/client-redshift-data": "~3.693.0",
+        "@aws-sdk/client-redshift-serverless": "~3.693.0",
         "@aws-sdk/client-s3": "<3.731.0",
         "@aws-sdk/client-s3-control": "^3.830.0",
         "@aws-sdk/client-sagemaker": "<3.696.0",
+        "@aws-sdk/client-schemas": "~3.693.0",
+        "@aws-sdk/client-secrets-manager": "~3.693.0",
+        "@aws-sdk/client-sfn": "<3.731.0",
         "@aws-sdk/client-ssm": "<3.731.0",
         "@aws-sdk/client-sso": "<3.731.0",
         "@aws-sdk/client-sso-oidc": "<3.731.0",
-        "@aws-sdk/client-sfn": "<3.731.0",
         "@aws-sdk/credential-provider-env": "<3.731.0",
         "@aws-sdk/credential-provider-process": "<3.731.0",
         "@aws-sdk/credential-provider-sso": "<3.731.0",
+        "@aws-sdk/credential-providers": "<3.731.0",
         "@aws-sdk/lib-storage": "<3.731.0",
         "@aws-sdk/property-provider": "<3.731.0",
         "@aws-sdk/protocol-http": "<3.731.0",
@@ -621,6 +632,7 @@
         "@smithy/service-error-classification": "^4.0.1",
         "@smithy/shared-ini-file-loader": "^4.0.0",
         "@smithy/util-retry": "^4.0.1",
+        "@svgdotjs/svg.js": "^3.0.16",
         "@vscode/debugprotocol": "^1.57.0",
         "@zip.js/zip.js": "^2.7.41",
         "adm-zip": "^0.5.10",
@@ -639,6 +651,7 @@
         "http2": "^3.3.6",
         "i18n-ts": "^1.0.5",
         "immutable": "^4.3.0",
+        "jaro-winkler": "^0.2.8",
         "jose": "5.4.1",
         "js-yaml": "^4.1.0",
         "jsonc-parser": "^3.2.0",
@@ -648,9 +661,11 @@
         "mime-types": "^2.1.32",
         "node-fetch": "^2.7.0",
         "portfinder": "^1.0.32",
+        "protobufjs": "^7.2.6",
         "semver": "^7.5.4",
         "stream-buffers": "^3.0.2",
         "strip-ansi": "^5.2.0",
+        "svgdom": "^0.1.0",
         "tcp-port-used": "^1.0.1",
         "vscode-languageclient": "^6.1.4",
         "vscode-languageserver": "^6.1.1",
@@ -663,11 +678,7 @@
         "winston-transport": "^4.6.0",
         "ws": "^8.16.0",
         "xml2js": "^0.6.1",
-        "yaml-cfn": "^0.3.2",
-        "protobufjs": "^7.2.6",
-        "@svgdotjs/svg.js": "^3.0.16",
-        "svgdom": "^0.1.0",
-        "jaro-winkler": "^0.2.8"
+        "yaml-cfn": "^0.3.2"
     },
     "overrides": {
         "webfont": {

packages/core/package.nls.json

@@ -476,7 +476,8 @@
     "AWS.toolkit.lambda.walkthrough.title": "Get started building your application",
     "AWS.toolkit.lambda.walkthrough.description": "Your quick guide to build an application visually, iterate locally, and deploy to the cloud!",
     "AWS.toolkit.lambda.walkthrough.toolInstall.title": "Complete installation",
-    "AWS.toolkit.lambda.walkthrough.toolInstall.description": "Manage your AWS services and resources with the AWS Command Line Interface (AWS CLI). \n\n[Install AWS CLI](command:aws.toolkit.installAWSCLI)\n\nBuild locally, invoke, and deploy your functions with the Serverless Application Model (SAM) CLI. \n\n[Install SAM CLI](command:aws.toolkit.installSAMCLI)\n\nDocker is an optional, third party tool that assists with local AWS Lambda runtime emulation. Docker is required to invoke Lambda functions on your local machine. \n\n[Install Docker (optional)](command:aws.toolkit.installDocker)\n\nEmulate your AWS cloud services locally with LocalStack to streamline testing in VS Code and CI environments. [Learn more](https://docs.localstack.cloud/aws/). \n\n[Install LocalStack (optional)](command:aws.toolkit.installLocalStack)",
+    "AWS.toolkit.lambda.walkthrough.toolInstall.description.windows": "Manage your AWS services and resources with the AWS Command Line Interface (AWS CLI). \n\n[Install AWS CLI](command:aws.toolkit.installAWSCLI)\n\nBuild locally, invoke, and deploy your functions with the Serverless Application Model (SAM) CLI. \n\n[Install SAM CLI](command:aws.toolkit.installSAMCLI)\n\nDocker is an optional, third party tool that assists with local AWS Lambda runtime emulation. Docker is required to invoke Lambda functions on your local machine. \n\n[Install Docker (optional)](command:aws.toolkit.installDocker)\n\nEmulate your AWS cloud services locally with LocalStack to streamline testing in VS Code and CI environments. [Learn more](https://docs.localstack.cloud/aws/). \n\n[Install LocalStack (optional)](command:aws.toolkit.installLocalStack)",
+    "AWS.toolkit.lambda.walkthrough.toolInstall.description": "Manage your AWS services and resources with the AWS Command Line Interface (AWS CLI). \n\n[Install AWS CLI](command:aws.toolkit.installAWSCLI)\n\nBuild locally, invoke, and deploy your functions with the Serverless Application Model (SAM) CLI. \n\n[Install SAM CLI](command:aws.toolkit.installSAMCLI)\n\nDocker is an optional, third party tool that assists with local AWS Lambda runtime emulation. Docker is required to invoke Lambda functions on your local machine. \n\n[Install Docker (optional)](command:aws.toolkit.installDocker)\n\nEmulate your AWS cloud services locally with LocalStack to streamline testing in VS Code and CI environments. [Learn more]((https://docs.localstack.cloud/aws/). \n\n[Install LocalStack (optional)](command:aws.toolkit.installLocalStack)\n\nFinch is an open source tool for local container development. Finch aims to help promote innovative upstream container projects  by making it easy to install and use them. [Learn more](https://runfinch.com/) \n\n[Install Finch (optional)](command:aws.toolkit.installFinch)",
     "AWS.toolkit.lambda.walkthrough.chooseTemplate.title": "Choose your application template",
     "AWS.toolkit.lambda.walkthrough.chooseTemplate.description": "Select a starter application, visually compose an application from scratch, open an existing application, or browse more application examples. \n\nInfrastructure Composer allows you to visually compose modern applications in the cloud. It will define the necessary permissions between resources when you drag a connection between them. \n\n[Initialize your project](command:aws.toolkit.lambda.initializeWalkthroughProject)",
     "AWS.toolkit.lambda.walkthrough.step1.title": "Iterate locally",

packages/core/src/amazonqGumby/chat/controller/controller.ts

@@ -403,9 +403,11 @@ export class GumbyController {
                 await vscode.commands.executeCommand('aws.amazonq.transformationHub.summary.reveal')
                 break
             case ButtonActions.STOP_TRANSFORMATION_JOB:
-                await stopTransformByQ(transformByQState.getJobId())
-                await postTransformationJob()
-                await cleanupTransformationJob()
+                if (transformByQState.isRunning() || transformByQState.isRefreshInProgress()) {
+                    await stopTransformByQ(transformByQState.getJobId())
+                    await postTransformationJob()
+                    await cleanupTransformationJob()
+                }
                 break
             case ButtonActions.CONFIRM_START_TRANSFORMATION_FLOW:
                 this.resetTransformationChatFlow()

packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts

@@ -400,11 +400,22 @@ export class Messenger {
     }
 
     public sendJobRefreshInProgressMessage(tabID: string, jobId: string) {
-        this.dispatcher.sendAsyncEventProgress(
-            new AsyncEventProgressMessage(tabID, {
-                inProgress: true,
-                message: CodeWhispererConstants.refreshingJobChatMessage(jobId),
-            })
+        const buttons: ChatItemButton[] = []
+        buttons.push({
+            keepCardAfterClick: true,
+            text: CodeWhispererConstants.stopTransformationButtonText,
+            id: ButtonActions.STOP_TRANSFORMATION_JOB,
+            disabled: false,
+        })
+        this.dispatcher.sendChatMessage(
+            new ChatMessage(
+                {
+                    message: CodeWhispererConstants.refreshingJobChatMessage(jobId),
+                    messageType: 'ai-prompt',
+                    buttons: buttons,
+                },
+                tabID
+            )
         )
     }
 

packages/core/src/awsService/accessanalyzer/vue/constants.ts

@@ -30,8 +30,6 @@ export type PolicyChecksCheckType = 'CheckNoNewAccess' | 'CheckAccessNotGranted'
 
 export type PolicyChecksPolicyType = 'Identity' | 'Resource'
 
-export type ValidatePolicyFindingType = 'ERROR' | 'SECURITY_WARNING' | 'SUGGESTION' | 'WARNING'
-
 export type PolicyChecksResult = 'Success' | 'Warning' | 'Error'
 
 export type PolicyChecksUiClick =