merge (#28)

* chore: merge release candidate version rc-20250815 (aws#7916)

## Problem
This merges the released changes for rc-20250815 into main.
MCM-132479224

## Solution


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Co-authored-by: Lei Gao <[email protected]>
Co-authored-by: Na Yue <[email protected]>
Co-authored-by: Will Lo <[email protected]>
Co-authored-by: Aidan Ton <[email protected]>
Co-authored-by: atontb <[email protected]>

* fix(sagemaker): Reduce number of reconnect retries (aws#7827)

## Problem
When a connection to a remote space is severed, the extension will
attempt to reconnect up to 60 times. Each reconnect attempt opens the
Space Details page in a new browser tab. Opening up to 60 new tabs is a
poor user experience.

## Solution
We change the maximum number of retries to 8.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Co-authored-by: Newton Der <[email protected]>

* fix(amazonq): do not auto trigger if the ongoing typeahead does not match (aws#7924)

## Problem

Bug: When inline suggestion is active but user types a character that
does not match the typeahead, this typing event triggered a inline
completion API call that eventually did not manage to display suggestion
on screen, which eventually reported as rejected completions.






## Solution


Previously, before Flare migration, we had this design:


https://github.com/aws/aws-toolkit-vscode/blob/amazonq/v1.74.0/packages/amazonq/src/app/inline/activation.ts#L108

Auto trigger will be disabled if at that moment the suggestion is
visible.

Under the previous design, the first character that does not match the
typeahead will not make a new auto trigger, it simply rejects the
current inline completion.

This PR is to bring back the old design.

It is not customer facing, hence no change log.


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Co-authored-by: tsmithsz <[email protected]>
Co-authored-by: Na Yue <[email protected]>
Co-authored-by: Will Lo <[email protected]>
Co-authored-by: Aidan Ton <[email protected]>
Co-authored-by: atontb <[email protected]>
Co-authored-by: Newton Der <[email protected]>
Co-authored-by: Newton Der <[email protected]>

Author: 7 people

package-lock.json

@@ -0,0 +1,5 @@
+{
+	"date": "2025-08-15",
+	"version": "1.90.0",
+	"entries": []
+}

packages/amazonq/.changes/1.90.0.json

@@ -1,3 +1,7 @@
+## 1.90.0 2025-08-15
+
+- Miscellaneous non-user-facing changes
+
 ## 1.89.0 2025-08-13
 
 - Miscellaneous non-user-facing changes

packages/amazonq/CHANGELOG.md

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI–powered assistant for software development.",
-    "version": "1.90.0-SNAPSHOT",
+    "version": "1.91.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

packages/amazonq/package.json

@@ -391,6 +391,9 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                 }
                 this.languageClient.sendNotification(this.logSessionResultMessageName, params)
                 this.sessionManager.clear()
+                // Do not make auto trigger if user rejects a suggestion
+                // by typing characters that does not match
+                return []
             }
 
             // tell the tutorial that completions has been triggered

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

@@ -46,7 +46,7 @@ _get_ssm_session_info_async() {
     # Generate unique temporary file name to avoid conflicts
     local temp_file="/tmp/ssm_session_response_$$_$(date +%s%N).json"
 
-    local max_retries=60
+    local max_retries=8
     local retry_interval=5
     local attempt=1
 

packages/core/resources/sagemaker_connect

@@ -54,7 +54,7 @@ function Get-SSMSessionInfoAsync {
     $url = "http://localhost:$LocalEndpointPort/get_session_async?connection_identifier=$AwsResourceArn&credentials_type=$CredentialsType&request_id=$requestId"
     Write-Host "Calling Get-SSMSessionInfoAsync with URL: $url"
 
-    $maxRetries = 60
+    $maxRetries = 8
     $retryInterval = 5
 
     for ($attempt = 1; $attempt -le $maxRetries; $attempt++) {