feat: add model description to dropdown

Author: chungjac

chat-client/package.json

@@ -24,7 +24,7 @@
         "package": "webpack"
     },
     "dependencies": {
-        "@aws/chat-client-ui-types": "^0.1.56",
+        "@aws/chat-client-ui-types": "^0.1.57",
         "@aws/language-server-runtimes": "^0.2.129",
         "@aws/language-server-runtimes-types": "^0.1.50",
         "@aws/mynah-ui": "^4.36.6"

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

@@ -571,7 +571,7 @@ describe('MynahUI', () => {
             // Simulate the response from the server
             const models = [
                 { id: 'CLAUDE_3_7_SONNET_20250219_V1_0', name: 'Claude Sonnet 3.7' },
-                { id: 'CLAUDE_SONNET_4_20250514_V1_0', name: 'Claude Sonnet 4' },
+                { id: 'CLAUDE_SONNET_4_20250514_V1_0', name: 'Claude Sonnet 4', description: 'Test description' },
             ]
 
             const result: ListAvailableModelsResult = {
@@ -589,8 +589,12 @@ describe('MynahUI', () => {
                     {
                         id: 'model-selection',
                         options: [
-                            { value: 'CLAUDE_3_7_SONNET_20250219_V1_0', label: 'Claude Sonnet 3.7' },
-                            { value: 'CLAUDE_SONNET_4_20250514_V1_0', label: 'Claude Sonnet 4' },
+                            { value: 'CLAUDE_3_7_SONNET_20250219_V1_0', label: 'Claude Sonnet 3.7', description: '' },
+                            {
+                                value: 'CLAUDE_SONNET_4_20250514_V1_0',
+                                label: 'Claude Sonnet 4',
+                                description: 'Test description',
+                            },
                         ],
                         type: 'select',
                         value: 'CLAUDE_3_7_SONNET_20250219_V1_0',

chat-client/src/client/mynahUi.ts

@@ -1737,7 +1737,11 @@ ${params.message}`,
                     ? {
                           ...option,
                           type: 'select',
-                          options: params.models.map(model => ({ value: model.id, label: model.name })),
+                          options: params.models.map(model => ({
+                              value: model.id,
+                              label: model.name,
+                              description: model.description ?? '',
+                          })),
                           value: params.selectedModelId,
                       }
                     : option

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

@@ -5,21 +5,24 @@ import { ChatItem, ChatItemFormItem, ChatItemType } from '@aws/mynah-ui'
  */
 export enum BedrockModel {
     CLAUDE_SONNET_4_20250514_V1_0 = 'CLAUDE_SONNET_4_20250514_V1_0',
-    CLAUDE_3_7_SONNET_20250219_V1_0 = 'CLAUDE_3_7_SONNET_20250219_V1_0',
 }
 
 type ModelDetails = {
     label: string
+    description: string
 }
 
 const modelRecord: Record<BedrockModel, ModelDetails> = {
-    [BedrockModel.CLAUDE_3_7_SONNET_20250219_V1_0]: { label: 'Claude 3.7 Sonnet' },
-    [BedrockModel.CLAUDE_SONNET_4_20250514_V1_0]: { label: 'Claude Sonnet 4' },
+    [BedrockModel.CLAUDE_SONNET_4_20250514_V1_0]: {
+        label: 'Claude Sonnet 4',
+        description: 'Hybrid reasoning and coding for regular use',
+    },
 }
 
-const modelOptions = Object.entries(modelRecord).map(([value, { label }]) => ({
+const modelOptions = Object.entries(modelRecord).map(([value, { label, description }]) => ({
     value,
     label,
+    description,
 }))
 
 export const modelSelection: ChatItemFormItem = {

client/vscode/package.json

@@ -351,7 +351,7 @@
     "devDependencies": {
         "@aws-sdk/credential-providers": "^3.731.1",
         "@aws-sdk/types": "^3.734.0",
-        "@aws/chat-client-ui-types": "^0.1.56",
+        "@aws/chat-client-ui-types": "^0.1.57",
         "@aws/language-server-runtimes": "^0.2.129",
         "@types/uuid": "^9.0.8",
         "@types/vscode": "^1.98.0",

package-lock.json

@@ -35,7 +35,7 @@
         "@amzn/codewhisperer-streaming": "file:../../core/codewhisperer-streaming/amzn-codewhisperer-streaming-1.0.0.tgz",
         "@aws-sdk/util-arn-parser": "^3.723.0",
         "@aws-sdk/util-retry": "^3.374.0",
-        "@aws/chat-client-ui-types": "^0.1.56",
+        "@aws/chat-client-ui-types": "^0.1.57",
         "@aws/language-server-runtimes": "^0.2.129",
         "@aws/lsp-core": "^0.0.15",
         "@modelcontextprotocol/sdk": "^1.15.0",

server/aws-lsp-codewhisperer/package.json

@@ -3157,7 +3157,7 @@ ${' '.repeat(8)}}
 
                 // Verify fallback to FALLBACK_MODEL_OPTIONS
                 assert.strictEqual(result.tabId, mockTabId)
-                assert.strictEqual(result.models.length, 2) // FALLBACK_MODEL_OPTIONS length
+                assert.strictEqual(result.models.length, 1) // FALLBACK_MODEL_OPTIONS length
 
                 // Verify cache was not updated due to error
                 sinon.assert.notCalled(setCachedModelsStub)
@@ -3224,7 +3224,7 @@ ${' '.repeat(8)}}
 
             it('should fall back to default model when session has no modelId and no defaultModelId in cache', async () => {
                 getCachedModelsStub.returns({
-                    models: [{ id: 'model1', name: 'Model 1' }],
+                    models: [{ id: 'model1', name: 'Model 1', description: 'Test model' }],
                     defaultModelId: undefined, // No default model
                     timestamp: Date.now(),
                 })

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.test.ts

@@ -761,7 +761,7 @@ export class AgenticChatController implements ChatHandlers {
         const { models, defaultModelId, errorFromAPI } = await this.#fetchModelsWithCache()
 
         // Get the first fallback model option as default
-        const defaultModelOption = FALLBACK_MODEL_OPTIONS[1]
+        const defaultModelOption = FALLBACK_MODEL_OPTIONS[0]
         const DEFAULT_MODEL_ID = defaultModelId || defaultModelOption?.id
 
         const sessionResult = this.#chatSessionManagementService.getSession(params.tabId)

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts

@@ -5,26 +5,28 @@ import { ListAvailableModelsResult } from '@aws/language-server-runtimes/protoco
  */
 export enum BedrockModel {
     CLAUDE_SONNET_4_20250514_V1_0 = 'CLAUDE_SONNET_4_20250514_V1_0',
-    CLAUDE_3_7_SONNET_20250219_V1_0 = 'CLAUDE_3_7_SONNET_20250219_V1_0',
 }
 
 type ModelDetails = {
     label: string
+    description: string
 }
 
 export const FALLBACK_MODEL_RECORD: Record<BedrockModel, ModelDetails> = {
-    [BedrockModel.CLAUDE_3_7_SONNET_20250219_V1_0]: { label: 'Claude 3.7 Sonnet' },
-    [BedrockModel.CLAUDE_SONNET_4_20250514_V1_0]: { label: 'Claude Sonnet 4' },
+    [BedrockModel.CLAUDE_SONNET_4_20250514_V1_0]: {
+        label: 'Claude Sonnet 4',
+        description: 'Hybrid reasoning and coding for regular use',
+    },
 }
 
 export const BEDROCK_MODEL_TO_MODEL_ID: Record<BedrockModel, string> = {
-    [BedrockModel.CLAUDE_3_7_SONNET_20250219_V1_0]: 'claude-3.7-sonnet',
     [BedrockModel.CLAUDE_SONNET_4_20250514_V1_0]: 'claude-sonnet-4',
 }
 
 export const FALLBACK_MODEL_OPTIONS: ListAvailableModelsResult['models'] = Object.entries(FALLBACK_MODEL_RECORD).map(
-    ([value, { label }]) => ({
+    ([value, { label, description }]) => ({
         id: value,
         name: label,
+        description: description,
     })
 )