refactor(tools): optimize web_search from PR #136/#137 merge

Cherry-pick best of both Codex PRs:
- PR 136: input validation (query.trim), Number.parseInt, error format with status code, braveSearchKey in non-DO toolContext
- PR 137: tool ordering (web_search after fetch_news), vi.useFakeTimers for TTL test, briefing-aggregator test counts 15 tools

https://claude.ai/code/session_01SE5WrUuc6LWTmZC8WBXKY4

Author: claude

src/openrouter/briefing-aggregator.test.ts

@@ -1048,17 +1048,18 @@ describe('Test 18 — /help and /start message verification', () => {
     }
   });
 
-  // Verify the /help message lists all 14 tools by name
+  // Verify the /help message lists all 15 tools by name
   it('should list each tool individually in the new /help format', () => {
     // The new help message lists each tool as a bullet point
     const helpToolSection = [
       'get_weather', 'get_crypto', 'convert_currency', 'fetch_news',
+      'web_search',
       'fetch_url', 'browse_url', 'url_metadata', 'generate_chart',
       'geolocate_ip', 'github_read_file', 'github_list_files', 'github_api',
       'github_create_pr', 'sandbox_exec',
     ];
-    // All 14 are individually named
-    expect(helpToolSection.length).toBe(14);
+    // All 15 are individually named
+    expect(helpToolSection.length).toBe(15);
   });
 
   // Verify /help mentions key features

src/openrouter/tools.test.ts

@@ -2248,15 +2248,13 @@ describe('web_search tool', () => {
   });
 
   it('should invalidate cache after TTL', async () => {
+    vi.useFakeTimers();
     const mockFetch = vi.fn().mockResolvedValue({
       ok: true,
       json: () => Promise.resolve({ web: { results: [{ title: 'TTL', url: 'https://example.com/ttl', description: 'ttl snippet' }] } }),
     });
     vi.stubGlobal('fetch', mockFetch);
 
-    const nowSpy = vi.spyOn(Date, 'now');
-    nowSpy.mockReturnValue(1000);
-
     await executeTool({
       id: 'web_7a',
       type: 'function',
@@ -2266,7 +2264,7 @@ describe('web_search tool', () => {
       },
     }, { braveSearchKey: 'brave-key' });
 
-    nowSpy.mockReturnValue(1000 + 5 * 60 * 1000 + 1);
+    vi.advanceTimersByTime(5 * 60 * 1000 + 1);
 
     await executeTool({
       id: 'web_7b',
@@ -2278,6 +2276,7 @@ describe('web_search tool', () => {
     }, { braveSearchKey: 'brave-key' });
 
     expect(mockFetch).toHaveBeenCalledTimes(2);
+    vi.useRealTimers();
   });
 });
 

src/openrouter/tools.ts

@@ -258,6 +258,27 @@ export const AVAILABLE_TOOLS: ToolDefinition[] = [
       },
     },
   },
+  {
+    type: 'function',
+    function: {
+      name: 'web_search',
+      description: 'Search the web for current information. Returns titles, URLs, and snippets from top results.',
+      parameters: {
+        type: 'object',
+        properties: {
+          query: {
+            type: 'string',
+            description: 'Search query to look up on the web',
+          },
+          num_results: {
+            type: 'string',
+            description: 'Number of results to return (default: 5, max: 10)',
+          },
+        },
+        required: ['query'],
+      },
+    },
+  },
   {
     type: 'function',
     function: {
@@ -322,27 +343,6 @@ export const AVAILABLE_TOOLS: ToolDefinition[] = [
       },
     },
   },
-  {
-    type: 'function',
-    function: {
-      name: 'web_search',
-      description: 'Search the web for current information. Returns titles, URLs, and snippets from top results.',
-      parameters: {
-        type: 'object',
-        properties: {
-          query: {
-            type: 'string',
-            description: 'Search query to look up on the web',
-          },
-          num_results: {
-            type: 'string',
-            description: 'Number of results to return (default: 5, max: 10)',
-          },
-        },
-        required: ['query'],
-      },
-    },
-  },
   {
     type: 'function',
     function: {
@@ -483,6 +483,9 @@ export async function executeTool(toolCall: ToolCall, context?: ToolContext): Pr
       case 'fetch_news':
         result = await fetchNews(args.source, args.topic);
         break;
+      case 'web_search':
+        result = await webSearch(args.query, args.num_results, context?.braveSearchKey);
+        break;
       case 'convert_currency':
         result = await convertCurrency(args.from, args.to, args.amount);
         break;
@@ -492,9 +495,6 @@ export async function executeTool(toolCall: ToolCall, context?: ToolContext): Pr
       case 'geolocate_ip':
         result = await geolocateIp(args.ip);
         break;
-      case 'web_search':
-        result = await webSearch(args.query, args.num_results, context?.braveSearchKey);
-        break;
       case 'browse_url':
         result = await browseUrl(args.url, args.action as 'extract_text' | 'screenshot' | 'pdf' | undefined, args.wait_for, context?.browser);
         break;