Merge 'public/master' into feature/q-region-expansion

Author: justinmk3

package-lock.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q Chat: Update chat history icon"
+}

packages/amazonq/.changes/next-release/Bug Fix-2daaf655-9a45-4104-94f9-06b9d8c703e2.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q Chat: chat occasionally freezes and displays gray screen"
+}

packages/amazonq/.changes/next-release/Bug Fix-338b0a7b-81fd-460a-82f4-8e65e4a0614c.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q Chat: Set owner-only permissions for chat history and saved prompt files"
+}

packages/amazonq/.changes/next-release/Bug Fix-b6e474f1-b7ef-4016-8e1c-c9e7e6a45cc2.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q chat: Click export icon to save chat transcript in Markdown or HTML"
+}

packages/amazonq/.changes/next-release/Feature-4b7ab0af-2fe3-4e21-be78-5fcb1896257c.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "SageMaker: Disable the unsupported agentic commands and welcome prompt"
+}

packages/amazonq/.changes/next-release/Feature-80edcce3-4e32-4e74-a35a-af2242782181.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q Chat: Add @Code context for PHP, Ruby, Scala, Shell, and Swift projects"
+}

packages/amazonq/.changes/next-release/Feature-846afd38-d618-4bd1-a3aa-7c74597502f1.json

@@ -127,6 +127,10 @@
                         "amazonQWorkspaceLspManifestMessage": {
                             "type": "boolean",
                             "default": false
+                        },
+                        "amazonQChatDisclaimer": {
+                            "type": "boolean",
+                            "default": false
                         }
                     },
                     "additionalProperties": false
@@ -439,6 +443,7 @@
                 },
                 {
                     "command": "aws.amazonq.generateUnitTests",
+                    "when": "!aws.isSageMaker",
                     "group": "cw_chat@5"
                 },
                 {
@@ -474,6 +479,7 @@
                 },
                 {
                     "command": "aws.amazonq.exploreAgents",
+                    "when": "!aws.isSageMaker",
                     "group": "1_help@2"
                 },
                 {
@@ -528,7 +534,7 @@
                 "command": "aws.amazonq.security.scan-statusbar",
                 "title": "%AWS.command.amazonq.security.scan%",
                 "category": "%AWS.amazonq.title%",
-                "enablement": "aws.codewhisperer.connected"
+                "enablement": "aws.codewhisperer.connected && !aws.isSageMaker"
             },
             {
                 "command": "aws.amazonq.refactorCode",
@@ -558,7 +564,7 @@
                 "command": "aws.amazonq.generateUnitTests",
                 "title": "%AWS.command.amazonq.generateUnitTests%",
                 "category": "%AWS.amazonq.title%",
-                "enablement": "aws.codewhisperer.connected"
+                "enablement": "aws.codewhisperer.connected && !aws.isSageMaker"
             },
             {
                 "command": "aws.amazonq.reconnect",
@@ -768,7 +774,7 @@
                 "command": "aws.amazonq.exploreAgents",
                 "title": "%AWS.amazonq.exploreAgents%",
                 "category": "%AWS.amazonq.title%",
-                "enablement": "aws.codewhisperer.connected"
+                "enablement": "aws.codewhisperer.connected && !aws.isSageMaker"
             },
             {
                 "command": "aws.amazonq.walkthrough.show",

packages/amazonq/package.json

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { InlineCompletionItemWithReferences } from '@aws/language-server-runtimes-types/inlineCompletionWithReferences'
+import { InlineCompletionItemWithReferences } from '@aws/language-server-runtimes-types'
 
 // TODO: add more needed data to the session interface
 interface CodeWhispererSession {

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

@@ -147,6 +147,9 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
     // Hide the Amazon Q tree in toolkit explorer
     await setContext('aws.toolkit.amazonq.dismissed', true)
 
+    // set context var to check if its SageMaker AI or not
+    await setContext('aws.isSageMaker', isSageMaker())
+
     // set context var to check if its SageMaker Unified Studio or not
     await setContext('aws.isSageMakerUnifiedStudio', isSageMaker('SMUS'))