feat: Auto fetch models from listAvailableModels API (#2171)

* Updating the model of listAvailableModels (#2064)

* fix(amazonq): fix flickering issue for model selection dropdown and agenticCoding toggle (#2065)

* fix(amazonq): fix flickering issue for modelId and agenticCoding

* fix(amazonq): Fixing flaky tests

* feat(amazonq): Fetching models from backend and adding cache implementation. (#2075)

* fix: removing and refactoring legacy code before implementing model selection

* feat(amazonq): adding cache implementation and fetching models from listAvailableModels api

* feat(amazonq): adding selected model in error case

* feat(amazonq): adding test cases

* fix: addressing comments

* fix: fixing test cases and adding modelName to models

* fix: minor edits

* fix: minor edits

* fix: minor modifications in logs

* fix: adding default model if api throws any errors

* fix: refactoring code

* fix:  Improve model selection fallback logic when user's preferred model is unavailable (#2089)

* fix: if user preferred model does not exist, fall back to default model

* fix: minor test changes

* fix: to support backward compatibility for vs and eclipse, adding back modelSelection in chat-client (#2095)

* fix: check available models from backend before selecting default model from fallback models (#2102)

* feat(amazonq): use model display names (#2123)

* fix: cached model list should be invalidated on sign out (#2131)

* fix: cached model list should be invalidated on sign out

* fix test

* avoid throwing error

* fix: adding default modelId and setting cache ttl to 30 minutes (#2161)

* fix: adding defaultmodelId and setting cache ttl to 30 minutes

* fix: fixing tests

* fix: updating comments

* Updating the model of listAvailableModels (#2064)

* fix(amazonq): fix flickering issue for model selection dropdown and agenticCoding toggle (#2065)

* fix(amazonq): fix flickering issue for modelId and agenticCoding

* fix(amazonq): Fixing flaky tests

* feat(amazonq): Fetching models from backend and adding cache implementation. (#2075)

* fix: removing and refactoring legacy code before implementing model selection

* feat(amazonq): adding cache implementation and fetching models from listAvailableModels api

* feat(amazonq): adding selected model in error case

* feat(amazonq): adding test cases

* fix: addressing comments

* fix: fixing test cases and adding modelName to models

* fix: minor edits

* fix: minor edits

* fix: minor modifications in logs

* fix: adding default model if api throws any errors

* fix: refactoring code

* fix:  Improve model selection fallback logic when user's preferred model is unavailable (#2089)

* fix: if user preferred model does not exist, fall back to default model

* fix: minor test changes

* fix: to support backward compatibility for vs and eclipse, adding back modelSelection in chat-client (#2095)

* fix: check available models from backend before selecting default model from fallback models (#2102)

* feat(amazonq): use model display names (#2123)

* fix: cached model list should be invalidated on sign out (#2131)

* fix: cached model list should be invalidated on sign out

* fix test

* avoid throwing error

* fix: adding default modelId and setting cache ttl to 30 minutes (#2161)

* fix: adding defaultmodelId and setting cache ttl to 30 minutes

* fix: fixing tests

* fix: updating comments

* fix: lint issue while resolving merge conflicts

---------

Co-authored-by: Tai Lai <[email protected]>

Author: laileni-aws

chat-client/src/client/chat.ts

@@ -116,7 +116,6 @@ import { InboundChatApi, createMynahUi } from './mynahUi'
 import { TabFactory } from './tabs/tabFactory'
 import { ChatClientAdapter } from '../contracts/chatClientAdapter'
 import { toMynahContextCommand, toMynahIcon } from './utils'
-import { modelSelectionForRegion } from './texts/modelSelection'
 
 const getDefaultTabConfig = (agenticMode?: boolean) => {
     return {
@@ -264,20 +263,6 @@ export const createChat = (
                             return option
                         }),
                     })
-                } else if (message.params.region) {
-                    // TODO: This can be removed after all clients support aws/chat/listAvailableModels
-                    // get all tabs and update region
-                    const allExistingTabs: MynahUITabStoreModel = mynahUi.getAllTabs()
-                    for (const tabId in allExistingTabs) {
-                        const options = mynahUi.getTabData(tabId).getStore()?.promptInputOptions
-                        mynahUi.updateStore(tabId, {
-                            promptInputOptions: options?.map(option =>
-                                option.id === 'model-selection'
-                                    ? modelSelectionForRegion[message.params.region]
-                                    : option
-                            ),
-                        })
-                    }
                 } else {
                     tabFactory.setInfoMessages((message.params as ChatOptionsUpdateParams).chatNotifications)
                 }

chat-client/src/client/mynahUi.test.ts

@@ -260,7 +260,8 @@ describe('MynahUI', () => {
             sinon.assert.calledThrice(updateStoreSpy)
         })
 
-        it('should create a new tab if current tab is loading', () => {
+        it('should create a new tab if current tab is loading', function (done) {
+            this.timeout(8000)
             // clear create tab stub since set up process calls it twice
             createTabStub.resetHistory()
             getAllTabsStub.returns({ 'tab-1': { store: { loadingChat: true } } })
@@ -274,6 +275,7 @@ describe('MynahUI', () => {
 
             sinon.assert.calledOnceWithExactly(createTabStub, false)
             sinon.assert.calledThrice(updateStoreSpy)
+            done()
         })
 
         it('should not create a new tab if one exists already', () => {

chat-client/src/client/mynahUi.ts

@@ -151,11 +151,20 @@ export const handlePromptInputChange = (mynahUi: MynahUI, tabId: string, options
         }
     }
 
+    const updatedPromptInputOptions = promptInputOptions?.map(option => {
+        option.value = optionsValues[option.id]
+        return option
+    })
+
     mynahUi.updateStore(tabId, {
-        promptInputOptions: promptInputOptions?.map(option => {
-            option.value = optionsValues[option.id]
-            return option
-        }),
+        promptInputOptions: updatedPromptInputOptions,
+    })
+
+    // Store the updated values in tab defaults for new tabs
+    mynahUi.updateTabDefaults({
+        store: {
+            promptInputOptions: updatedPromptInputOptions,
+        },
     })
 }
 
@@ -414,6 +423,12 @@ export const createMynahUi = (
             }
 
             const tabStore = mynahUi.getTabData(tabId).getStore()
+            const storedPromptInputOptions = mynahUi.getTabDefaults().store?.promptInputOptions
+
+            // Retrieve stored model selection and pair programming mode from defaults
+            if (storedPromptInputOptions) {
+                defaultTabConfig.promptInputOptions = storedPromptInputOptions
+            }
 
             // Tabs can be opened through different methods, including server-initiated 'openTab' requests.
             // The 'openTab' request is specifically used for loading historical chat sessions with pre-existing messages.

chat-client/src/client/tabs/tabFactory.test.ts

@@ -2,7 +2,7 @@ import { ChatHistory } from '../features/history'
 import { TabFactory } from './tabFactory'
 import * as assert from 'assert'
 import { pairProgrammingPromptInput } from '../texts/pairProgramming'
-import { modelSelectionForRegion } from '../texts/modelSelection'
+import { modelSelection } from '../texts/modelSelection'
 
 describe('tabFactory', () => {
     describe('getDefaultTabData', () => {
@@ -92,10 +92,7 @@ describe('tabFactory', () => {
 
             const result = tabFactory.createTab(false)
 
-            assert.deepStrictEqual(result.promptInputOptions, [
-                pairProgrammingPromptInput,
-                modelSelectionForRegion['us-east-1'],
-            ])
+            assert.deepStrictEqual(result.promptInputOptions, [pairProgrammingPromptInput, modelSelection])
         })
 
         it('should not include model selection when only agentic mode is enabled', () => {

chat-client/src/client/tabs/tabFactory.ts

@@ -11,7 +11,7 @@ import { disclaimerCard } from '../texts/disclaimer'
 import { ChatMessage } from '@aws/language-server-runtimes-types'
 import { ChatHistory } from '../features/history'
 import { pairProgrammingPromptInput, programmerModeCard } from '../texts/pairProgramming'
-import { modelSelectionForRegion } from '../texts/modelSelection'
+import { modelSelection } from '../texts/modelSelection'
 
 export type DefaultTabData = MynahUIDataModel
 
@@ -52,10 +52,7 @@ export class TabFactory {
             ...this.getDefaultTabData(),
             ...(disclaimerCardActive ? { promptInputStickyCard: disclaimerCard } : {}),
             promptInputOptions: this.agenticMode
-                ? [
-                      pairProgrammingPromptInput,
-                      ...(this.modelSelectionEnabled ? [modelSelectionForRegion['us-east-1']] : []),
-                  ]
+                ? [pairProgrammingPromptInput, ...(this.modelSelectionEnabled ? [modelSelection] : [])]
                 : [],
             cancelButtonWhenLoading: this.agenticMode, // supported for agentic chat only
         }

chat-client/src/client/texts/modelSelection.test.ts

@@ -1,60 +1,11 @@
 import * as assert from 'assert'
-import {
-    BedrockModel,
-    modelSelectionForRegion,
-    getModelSelectionChatItem,
-    modelUnavailableBanner,
-    modelThrottledBanner,
-} from './modelSelection'
+import { getModelSelectionChatItem, modelUnavailableBanner, modelThrottledBanner } from './modelSelection'
 import { ChatItemType } from '@aws/mynah-ui'
 
 /**
  * Tests for modelSelection functionality
- *
- * Note: Some tests are for deprecated code (marked with 'legacy') that is maintained
- * for backward compatibility with older clients. These should be removed once
- * all clients have been updated to use the new API (aws/chat/listAvailableModels).
  */
 describe('modelSelection', () => {
-    describe('BedrockModel enum (legacy)', () => {
-        it('should have the correct model IDs', () => {
-            assert.strictEqual(BedrockModel.CLAUDE_3_7_SONNET_20250219_V1_0, 'CLAUDE_3_7_SONNET_20250219_V1_0')
-            assert.strictEqual(BedrockModel.CLAUDE_SONNET_4_20250514_V1_0, 'CLAUDE_SONNET_4_20250514_V1_0')
-        })
-    })
-
-    describe('modelSelectionForRegion (legacy)', () => {
-        it('should provide all models for us-east-1 region', () => {
-            const usEast1ModelSelection = modelSelectionForRegion['us-east-1']
-            assert.ok(usEast1ModelSelection, 'usEast1ModelSelection should exist')
-            assert.ok(usEast1ModelSelection.type === 'select', 'usEast1ModelSelection should be type select')
-            assert.ok(Array.isArray(usEast1ModelSelection.options), 'options should be an array')
-            assert.strictEqual(usEast1ModelSelection.options.length, 2, 'should have 2 options')
-
-            const modelIds = usEast1ModelSelection.options.map(option => option.value)
-            assert.ok(modelIds.includes(BedrockModel.CLAUDE_SONNET_4_20250514_V1_0), 'should include Claude Sonnet 4')
-            assert.ok(
-                modelIds.includes(BedrockModel.CLAUDE_3_7_SONNET_20250219_V1_0),
-                'should include Claude Sonnet 3.7'
-            )
-        })
-
-        it('should provide all models for eu-central-1 region', () => {
-            const euCentral1ModelSelection = modelSelectionForRegion['eu-central-1']
-            assert.ok(euCentral1ModelSelection, 'euCentral1ModelSelection should exist')
-            assert.ok(euCentral1ModelSelection.type === 'select', 'euCentral1ModelSelection should be type select')
-            assert.ok(Array.isArray(euCentral1ModelSelection.options), 'options should be an array')
-            assert.strictEqual(euCentral1ModelSelection.options.length, 2, 'should have 2 option')
-
-            const modelIds = euCentral1ModelSelection.options.map(option => option.value)
-            assert.ok(modelIds.includes(BedrockModel.CLAUDE_SONNET_4_20250514_V1_0), 'should include Claude Sonnet 4')
-            assert.ok(
-                modelIds.includes(BedrockModel.CLAUDE_3_7_SONNET_20250219_V1_0),
-                'should include Claude Sonnet 3.7'
-            )
-        })
-    })
-
     describe('getModelSelectionChatItem', () => {
         it('should return a chat item with the correct model name', () => {
             const modelName = 'Claude Sonnet 4'

chat-client/src/client/texts/modelSelection.ts

@@ -13,7 +13,7 @@ type ModelDetails = {
 }
 
 const modelRecord: Record<BedrockModel, ModelDetails> = {
-    [BedrockModel.CLAUDE_3_7_SONNET_20250219_V1_0]: { label: 'Claude Sonnet 3.7' },
+    [BedrockModel.CLAUDE_3_7_SONNET_20250219_V1_0]: { label: 'Claude 3.7 Sonnet' },
     [BedrockModel.CLAUDE_SONNET_4_20250514_V1_0]: { label: 'Claude Sonnet 4' },
 }
 
@@ -22,24 +22,16 @@ const modelOptions = Object.entries(modelRecord).map(([value, { label }]) => ({
     label,
 }))
 
-const modelSelection: ChatItemFormItem = {
+export const modelSelection: ChatItemFormItem = {
     type: 'select',
     id: 'model-selection',
-    options: modelOptions,
     mandatory: true,
     hideMandatoryIcon: true,
+    options: modelOptions,
     border: false,
     autoWidth: true,
 }
 
-/**
- * @deprecated use aws/chat/listAvailableModels server request instead
- */
-export const modelSelectionForRegion: Record<string, ChatItemFormItem> = {
-    'us-east-1': modelSelection,
-    'eu-central-1': modelSelection,
-}
-
 export const getModelSelectionChatItem = (modelName: string): ChatItem => ({
     type: ChatItemType.DIRECTIVE,
     contentHorizontalAlignment: 'center',

server/aws-lsp-codewhisperer/src/client/sigv4/codewhisperersigv4client.d.ts

@@ -3,7 +3,7 @@
  * THIS FILE IS AUTOGENERATED BY 'generateServiceClient.ts'.
  * DO NOT EDIT BY HAND.
  */
-
+ 
 import {Request} from 'aws-sdk/lib/request';
 import {Response} from 'aws-sdk/lib/response';
 import {AWSError} from 'aws-sdk/lib/error';

server/aws-lsp-codewhisperer/src/client/token/bearer-token-service.json

@@ -3622,6 +3622,10 @@
                     "shape": "Models",
                     "documentation": "<p>List of available models</p>"
                 },
+                "defaultModel": {
+                    "shape": "Model",
+                    "documentation": "<p>Default model set by the client</p>"
+                },
                 "nextToken": {
                     "shape": "Base64EncodedPaginationToken",
                     "documentation": "<p>Token for retrieving the next page of results</p>"
@@ -3955,6 +3959,10 @@
                     "shape": "ModelId",
                     "documentation": "<p>Unique identifier for the model</p>"
                 },
+                "modelName": {
+                    "shape": "ModelName",
+                    "documentation": "<p>User-facing display name</p>"
+                },
                 "description": {
                     "shape": "Description",
                     "documentation": "<p>Description of the model</p>"
@@ -3972,6 +3980,13 @@
             "min": 1,
             "pattern": "[a-zA-Z0-9_:.-]+"
         },
+        "ModelName": {
+            "type": "string",
+            "documentation": "<p>Identifier for the model Name</p>",
+            "max": 1024,
+            "min": 1,
+            "pattern": "[a-zA-Z0-9-_.]+"
+        },
         "ModelMetadata": {
             "type": "structure",
             "members": {

server/aws-lsp-codewhisperer/src/client/token/codewhispererbearertokenclient.d.ts

@@ -3,6 +3,7 @@
  * THIS FILE IS AUTOGENERATED BY 'generateServiceClient.ts'.
  * DO NOT EDIT BY HAND.
  */
+ 
 import {Request} from 'aws-sdk/lib/request';
 import {Response} from 'aws-sdk/lib/response';
 import {AWSError} from 'aws-sdk/lib/error';
@@ -1132,6 +1133,10 @@ declare namespace CodeWhispererBearerTokenClient {
      * List of available models
      */
     models: Models;
+    /**
+     * Default model set by the client
+     */
+    defaultModel?: Model;
     /**
      * Token for retrieving the next page of results
      */
@@ -1240,6 +1245,10 @@ declare namespace CodeWhispererBearerTokenClient {
      * Unique identifier for the model
      */
     modelId: ModelId;
+    /**
+     * User-facing display name
+     */
+    modelName?: ModelName;
     /**
      * Description of the model
      */
@@ -1250,6 +1259,7 @@ declare namespace CodeWhispererBearerTokenClient {
     modelMetadata?: ModelMetadata;
   }
   export type ModelId = string;
+  export type ModelName = string;
   export interface ModelMetadata {
     /**
      * Maximum number of input tokens the model can process