Merge master into feature/sdkv3

packages/core/package.json

@@ -496,30 +496,30 @@
     "dependencies": {
         "@amzn/amazon-q-developer-streaming-client": "file:../../src.gen/@amzn/amazon-q-developer-streaming-client",
         "@amzn/codewhisperer-streaming": "file:../../src.gen/@amzn/codewhisperer-streaming",
-        "@aws-sdk/protocol-http": "^3.370.0",
-        "@aws-sdk/client-cloudformation": "^3.667.0",
-        "@aws-sdk/client-cloudwatch-logs": "^3.666.0",
-        "@aws-sdk/client-cognito-identity": "^3.637.0",
-        "@aws-sdk/client-docdb": "^3.699.0",
-        "@aws-sdk/client-docdb-elastic": "^3.699.0",
-        "@aws-sdk/client-lambda": "^3.637.0",
-        "@aws-sdk/client-sso": "^3.342.0",
-        "@aws-sdk/client-sso-oidc": "^3.574.0",
-        "@aws-sdk/credential-provider-env": "3.696.0",
-        "@aws-sdk/credential-provider-process": "3.37.0",
-        "@aws-sdk/credential-provider-sso": "^3.345.0",
-        "@aws-sdk/property-provider": "3.46.0",
-        "@aws-sdk/smithy-client": "^3.46.0",
-        "@aws-sdk/util-arn-parser": "^3.46.0",
-        "@aws-sdk/client-ssm": "^3.699.0",
+        "@aws-sdk/client-cloudformation": "<3.696.0",
+        "@aws-sdk/client-cloudwatch-logs": "<3.696.0",
+        "@aws-sdk/client-cognito-identity": "<3.696.0",
+        "@aws-sdk/client-docdb": "<3.696.0",
+        "@aws-sdk/client-docdb-elastic": "<3.696.0",
+        "@aws-sdk/client-lambda": "<3.696.0",
+        "@aws-sdk/client-sso": "<3.696.0",
+        "@aws-sdk/client-sso-oidc": "<3.696.0",
+        "@aws-sdk/client-ssm": "<3.696.0",
+        "@aws-sdk/credential-provider-env": "<3.696.0",
+        "@aws-sdk/credential-provider-process": "<3.696.0",
+        "@aws-sdk/credential-provider-sso": "<3.696.0",
+        "@aws-sdk/property-provider": "<3.696.0",
+        "@aws-sdk/smithy-client": "<3.696.0",
+        "@aws-sdk/protocol-http": "<3.696.0",
+        "@aws-sdk/util-arn-parser": "<3.696.0",
         "@aws/mynah-ui": "^4.22.1",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
-        "@smithy/middleware-retry": "^2.3.1",
-        "@smithy/protocol-http": "^3.3.0",
-        "@smithy/service-error-classification": "^2.1.5",
-        "@smithy/shared-ini-file-loader": "^2.2.8",
-        "@smithy/util-retry": "^2.2.0",
+        "@smithy/middleware-retry": "^3.0.0",
+        "@smithy/protocol-http": "^4.0.0",
+        "@smithy/service-error-classification": "^3.0.0",
+        "@smithy/shared-ini-file-loader": "^3.0.0",
+        "@smithy/util-retry": "^3.0.0",
         "@vscode/debugprotocol": "^1.57.0",
         "@zip.js/zip.js": "^2.7.41",
         "adm-zip": "^0.5.10",

packages/core/src/amazonqFeatureDev/client/featureDev.ts

@@ -32,6 +32,7 @@ import {
     MetricData,
     TelemetryEvent,
 } from './featuredevproxyclient'
+import { ExportResultArchiveCommandInput } from '@amzn/codewhisperer-streaming'
 import { FeatureClient } from '../../amazonq/client/client'
 
 // Re-enable once BE is able to handle retries.
@@ -229,7 +230,7 @@ export class FeatureDevClient implements FeatureClient {
             const params = {
                 exportId: conversationId,
                 exportIntent: 'TASK_ASSIST',
-            }
+            } satisfies ExportResultArchiveCommandInput
             getLogger().debug(`Executing exportResultArchive with %O`, params)
             const archiveResponse = await streamingClient.exportResultArchive(params)
             const buffer: number[] = []

packages/core/src/shared/errors.ts

@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode'
 import { AWSError } from 'aws-sdk'
-import { ServiceException } from '@aws-sdk/smithy-client'
+import { ServiceException } from '@smithy/smithy-client'
 import { isThrottlingError, isTransientError } from '@smithy/service-error-classification'
 import { Result } from './telemetry/telemetry'
 import { CancellationError } from './utilities/timeoutUtils'

src.gen/@amzn/amazon-q-developer-streaming-client/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+   Copyright 2018-2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

src.gen/@amzn/amazon-q-developer-streaming-client/README.md

@@ -7,7 +7,7 @@
 AWS SDK for JavaScript QDeveloperStreaming Client for Node.js, Browser and React Native.
 
 ## Installing
-To install the this package, simply type add or install @amzn/amazon-q-developer-streaming-client
+To install this package, simply type add or install @amzn/amazon-q-developer-streaming-client
 using your favorite package manager:
 - `npm install @amzn/amazon-q-developer-streaming-client`
 - `yarn add @amzn/amazon-q-developer-streaming-client`
@@ -194,6 +194,7 @@ To contribute to client you can check our [generate clients scripts](https://git
 This SDK is distributed under the
 [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0),
 see LICENSE for more information.
+
 ## Client Commands (Operations List)
 
 <details>
@@ -324,6 +325,13 @@ UpdateProfile
 </details>
 <details>
 <summary>
+VendKeyGrant
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/VendKeyGrantCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/VendKeyGrantCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/VendKeyGrantCommandOutput/)
+</details>
+<details>
+<summary>
 CreateArtifactUploadUrl
 </summary>
 
@@ -366,6 +374,13 @@ GetCodeAnalysis
 </details>
 <details>
 <summary>
+GetCodeFixJob
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GetCodeFixJobCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetCodeFixJobCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetCodeFixJobCommandOutput/)
+</details>
+<details>
+<summary>
 GetTaskAssistCodeGeneration
 </summary>
 
@@ -436,6 +451,13 @@ StartCodeAnalysis
 </details>
 <details>
 <summary>
+StartCodeFixJob
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/StartCodeFixJobCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/StartCodeFixJobCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/StartCodeFixJobCommandOutput/)
+</details>
+<details>
+<summary>
 StartTaskAssistCodeGeneration
 </summary>
 
@@ -485,6 +507,13 @@ GenerateTaskAssistPlan
 </details>
 <details>
 <summary>
+AssociateConnectorResource
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/AssociateConnectorResourceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/AssociateConnectorResourceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/AssociateConnectorResourceCommandOutput/)
+</details>
+<details>
+<summary>
 CreateAssignment
 </summary>
 
@@ -534,6 +563,13 @@ DeletePlugin
 </details>
 <details>
 <summary>
+GetConnector
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GetConnectorCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetConnectorCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetConnectorCommandOutput/)
+</details>
+<details>
+<summary>
 GetConversation
 </summary>
 
@@ -590,6 +626,13 @@ ListConversations
 </details>
 <details>
 <summary>
+ListDashboardMetrics
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ListDashboardMetricsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListDashboardMetricsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListDashboardMetricsCommandOutput/)
+</details>
+<details>
+<summary>
 ListExtensionProviders
 </summary>
 
@@ -639,6 +682,13 @@ PassRequest
 </details>
 <details>
 <summary>
+RejectConnector
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/RejectConnectorCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/RejectConnectorCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/RejectConnectorCommandOutput/)
+</details>
+<details>
+<summary>
 SendEvent
 </summary>