Merge main into feature/web-search

Author: aws-toolkit-automation

app/aws-lsp-codewhisperer-runtimes/src/version.json

@@ -1,3 +1,3 @@
 {
-    "agenticChat": "1.63.0"
+    "agenticChat": "1.64.0"
 }

chat-client/package.json

@@ -27,7 +27,7 @@
         "@aws/chat-client-ui-types": "0.1.68",
         "@aws/language-server-runtimes": "^0.3.16",
         "@aws/language-server-runtimes-types": "^0.1.64",
-        "@aws/mynah-ui": "^4.40.0"
+        "@aws/mynah-ui": "^4.40.1"
     },
     "devDependencies": {
         "@types/jsdom": "^21.1.6",

chat-client/src/client/mynahUi.ts

@@ -813,8 +813,12 @@ export const createMynahUi = (
             store: tabFactory.createTab(false),
         },
         onContextCommandFilter: (tabId, searchTerm) => {
+            // Always forward to the server. Server pulls fresh items from
+            // the indexer on every request (no client-side cache), so the
+            // empty-term case (@ press) returns a fresh capped list and
+            // non-empty terms return the scored top matches.
             lastFilterTabId = tabId
-            messager.onFilterContextCommands({ tabId, searchTerm })
+            messager.onFilterContextCommands({ tabId, searchTerm: searchTerm ?? '' })
         },
         config: {
             maxTabs: 10,
@@ -1439,19 +1443,21 @@ ${params.message}`,
             commands: toContextCommands(group.commands),
         }))
 
+        const commandsWithHighlight = [
+            ...(contextCommandGroups || []),
+            ...(featureConfig?.get('highlightCommand')
+                ? [
+                      {
+                          groupName: 'Additional commands',
+                          commands: [toMynahContextCommand(featureConfig.get('highlightCommand'))],
+                      },
+                  ]
+                : []),
+        ]
+
         Object.keys(mynahUi.getAllTabs()).forEach(tabId => {
             mynahUi.updateStore(tabId, {
-                contextCommands: [
-                    ...(contextCommandGroups || []),
-                    ...(featureConfig?.get('highlightCommand')
-                        ? [
-                              {
-                                  groupName: 'Additional commands',
-                                  commands: [toMynahContextCommand(featureConfig.get('highlightCommand'))],
-                              },
-                          ]
-                        : []),
-                ],
+                contextCommands: commandsWithHighlight,
             })
         })
     }

package-lock.json

@@ -128,9 +128,16 @@ describe('Preservation: Context Commands Provider Small Payload Behavior', () =>
      * **Validates: Requirements 3.2**
      *
      * Property 2e: For all valid context item selections, processContextCommandUpdate
-     * sends the full payload to the webview via chat.sendContextCommands and caches items.
+     * dispatches exactly one chat.sendContextCommands call with a contextCommandGroups
+     * payload.
+     *
+     * Note: the prior version of this test also asserted that items were cached on
+     * `cachedContextCommands`. That field was removed in `refactor: remove stale
+     * context command cache, always pull fresh from indexer` — the server now pulls
+     * fresh items from the indexer on every request instead of caching, so the
+     * assertion was deleted.
      */
-    it('processContextCommandUpdate sends all items and caches them for small payloads', async () => {
+    it('processContextCommandUpdate dispatches a single sendContextCommands payload for small payloads', async () => {
         await fc.assert(
             fc.asyncProperty(smallContextItemsArb, async items => {
                 sendContextCommandsSpy.resetHistory()
@@ -144,10 +151,6 @@ describe('Preservation: Context Commands Provider Small Payload Behavior', () =>
                 const sentPayload = sendContextCommandsSpy.firstCall.args[0]
                 if (!sentPayload.contextCommandGroups) return false
 
-                // Cached items should match the input
-                const cached = (provider as any).cachedContextCommands
-                if (cached !== items) return false
-
                 return true
             }),
             { numRuns: 30 }