Merge master into feature/flare-inline (aws#7310)

## Automatic merge failed

- Resolve conflicts and push to this PR branch.
- **Do not squash-merge** this PR. Use the "Create a merge commit"
option to do a regular merge.

## Command line hint

To perform the merge from the command line, you could do something like
the following (where "origin" is the name of the remote in your local
git repo):
```
git stash
git fetch --all
git checkout origin/feature/flare-inline
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/flare-inline
```

---------

Signed-off-by: nkomonen-amazon <[email protected]>
Co-authored-by: aws-toolkit-automation <>
Co-authored-by: Tom Zu <[email protected]>
Co-authored-by: Will Lo <[email protected]>
Co-authored-by: Tai Lai <[email protected]>
Co-authored-by: Josh Pinkney <[email protected]>
Co-authored-by: Nikolas Komonen <[email protected]>
Co-authored-by: Adam Khamis <[email protected]>
Co-authored-by: Na Yue <[email protected]>
Co-authored-by: Laxman Reddy <[email protected]>
Co-authored-by: Jiatong Li <[email protected]>
Co-authored-by: Avi Alpert <[email protected]>
Co-authored-by: Brad Skaggs <[email protected]>
Co-authored-by: Zoe Lin <[email protected]>
Co-authored-by: chungjac <[email protected]>
Co-authored-by: Lei Gao <[email protected]>
Co-authored-by: Hweinstock <[email protected]>
Co-authored-by: invictus <[email protected]>
Co-authored-by: hkobew <[email protected]>

Author: 17 people

CONTRIBUTING.md

@@ -387,6 +387,9 @@ If you need to report an issue attach these to give the most detailed informatio
 4. Open the Command Palette again and select `Reload Window`.
 5. Now you should see additional `[debug]` prefixed logs in the output.
     - ![](./docs/images/logsDebugLog.png)
+6. To export logs, click the kebab (`...`), select `Export Logs`, and then select the appropriate channel (`Amazon Q Logs` for Amazon Q)
+    - ![](./docs/images/openExportLogs.png)
+    - ![](./docs/images/exportAmazonQLogs.png)
 
 ### Telemetry
 

docs/images/exportAmazonQLogs.png

@@ -41,7 +41,7 @@
         "skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.319",
+        "@aws-toolkits/telemetry": "^1.0.322",
         "@playwright/browser-chromium": "^1.43.1",
         "@stylistic/eslint-plugin": "^2.11.0",
         "@types/he": "^1.2.3",

docs/images/openExportLogs.png

@@ -0,0 +1,14 @@
+{
+	"date": "2025-05-14",
+	"version": "1.67.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Previous and subsequent cells are used as context for completion in a Jupyter notebook"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Support chat in AL2 aarch64"
+		}
+	]
+}

package-lock.json

@@ -0,0 +1,18 @@
+{
+	"date": "2025-05-15",
+	"version": "1.68.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Fix Error: 'Amazon Q service is not signed in'"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix Error: 'Amazon Q Profile is not selected for IDC connection type'"
+		},
+		{
+			"type": "Feature",
+			"description": "Add inline completion support for abap language"
+		}
+	]
+}

package.json

@@ -1,3 +1,14 @@
+## 1.68.0 2025-05-15
+
+- **Bug Fix** Fix Error: 'Amazon Q service is not signed in'
+- **Bug Fix** Fix Error: 'Amazon Q Profile is not selected for IDC connection type'
+- **Feature** Add inline completion support for abap language
+
+## 1.67.0 2025-05-14
+
+- **Bug Fix** Previous and subsequent cells are used as context for completion in a Jupyter notebook
+- **Bug Fix** Support chat in AL2 aarch64
+
 ## 1.66.0 2025-05-09
 
 - **Bug Fix** Avoid inline completion 'Improperly formed request' errors when file is too large

packages/amazonq/.changes/1.67.0.json

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
-    "version": "1.67.0-SNAPSHOT",
+    "version": "1.69.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

packages/amazonq/.changes/1.68.0.json

@@ -18,6 +18,7 @@ import { AuthUtil } from 'aws-core-vscode/codewhisperer'
 import { Writable } from 'stream'
 import { onceChanged } from 'aws-core-vscode/utils'
 import { getLogger, oneMinute } from 'aws-core-vscode/shared'
+import { isSsoConnection } from 'aws-core-vscode/auth'
 
 export const encryptionKey = crypto.randomBytes(32)
 
@@ -76,8 +77,8 @@ export class AmazonQLspAuth {
      * @param force bypass memoization, and forcefully update the bearer token
      */
     async refreshConnection(force: boolean = false) {
-        const activeConnection = this.authUtil.auth.activeConnection
-        if (activeConnection?.state === 'valid' && activeConnection?.type === 'sso') {
+        const activeConnection = this.authUtil.conn
+        if (this.authUtil.isConnectionValid() && isSsoConnection(activeConnection)) {
             // send the token to the language server
             const token = await this.authUtil.getBearerToken()
             await (force ? this._updateBearerToken(token) : this.updateBearerToken(token))
@@ -118,7 +119,7 @@ export class AmazonQLspAuth {
             data: jwt,
             metadata: {
                 sso: {
-                    startUrl: AuthUtil.instance.auth.startUrl,
+                    startUrl: AuthUtil.instance.startUrl,
                 },
             },
             encrypted: true,