Merge main into feature/build-execute

aws-toolkit-automation · web-flow · commit 8990e78d7bbd · 2025-06-16T19:07:53.000-04:00
diff --git a/.changes/next-release/feature-e9ce3eeb-09a5-4418-ab15-91185f560532.json b/.changes/next-release/feature-e9ce3eeb-09a5-4418-ab15-91185f560532.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Add model selection feature"
+}
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
@@ -148,6 +148,7 @@ class Browser(parent: Disposable, private val webUri: URI, val project: Project)
                         {
                         agenticMode: true,
                         quickActionCommands: [],
+                        modelSelectionEnabled: true,
                         disclaimerAcknowledged: ${MeetQSettings.getInstance().disclaimerAcknowledged},
                         pairProgrammingAcknowledged: ${MeetQSettings.getInstance().pairProgrammingAcknowledged}
                         },
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/quickActions/handler.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/quickActions/handler.ts
@@ -394,6 +394,8 @@ private handleDocCommand(chatPrompt: ChatPrompt, tabID: string, taskName: string
                 loadingChat: true,
                 cancelButtonWhenLoading: false,
             })
+        } else {
+            this.mynahUI?.updateStore(affectedTabId, { promptInputOptions: [] })
         }
 
         if (affectedTabId && this.isHybridChatEnabled) {

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "feature",
 +  "description" : "Add model selection feature"
 +}
Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,7 @@ class Browser(parent: Disposable, private val webUri: URI, val project: Project)`
`148`	`148`	`{`
`149`	`149`	`agenticMode: true,`
`150`	`150`	`quickActionCommands: [],`
	`151`	`+ modelSelectionEnabled: true,`
`151`	`152`	`disclaimerAcknowledged: ${MeetQSettings.getInstance().disclaimerAcknowledged},`
`152`	`153`	`pairProgrammingAcknowledged: ${MeetQSettings.getInstance().pairProgrammingAcknowledged}`
`153`	`154`	`},`
Original file line number	Diff line number	Diff line change
`@@ -394,6 +394,8 @@ private handleDocCommand(chatPrompt: ChatPrompt, tabID: string, taskName: string`
`394`	`394`	`loadingChat: true,`
`395`	`395`	`cancelButtonWhenLoading: false,`
`396`	`396`	`})`
	`397`	`+ } else {`
	`398`	`+ this.mynahUI?.updateStore(affectedTabId, { promptInputOptions: [] })`
`397`	`399`	`}`
`398`	`400`
`399`	`401`	`if (affectedTabId && this.isHybridChatEnabled) {`