firecrawl-cli 1.16.2 → 1.17.0

package/README.md

@@ -1,6 +1,6 @@
 # 🔥 Firecrawl CLI
 
-Command-line interface for Firecrawl. Search, scrape, and interact with the web directly from your terminal.
+Command-line interface for Firecrawl. Search, scrape, interact, crawl, map, and run agent jobs directly from your terminal.
 
 ## Installation
 
@@ -20,7 +20,7 @@ npx -y firecrawl-cli@1.16.2 init -y --browser
 
 ### Setup Skills and MCP
 
-If you are using an AI coding agent like Claude Code, you can also install the skill individually with:
+If you are using an AI coding agent like Claude Code, you can also install the skills manually with:
 
 ```bash
 firecrawl setup skills
@@ -32,7 +32,7 @@ This installs skills globally across all detected coding editors by default. Use
 
 The init command installs both sets of Firecrawl agent skills into AI coding agents (Cursor, Claude Code, Windsurf, etc.):
 
-- **CLI skills** — teach agents how to use the Firecrawl CLI for live web work (search, scrape, interact, map, crawl)
+- **CLI skills** — teach agents how to use the Firecrawl CLI for live web work (search, scrape, interact, map, crawl, agent)
 - **Build skills** — teach agents how to integrate Firecrawl into application code (choose endpoints, wire SDKs, set up API keys)
 
 To reinstall skills manually:

package/dist/__tests__/commands/search.test.js

@@ -18,18 +18,30 @@ vitest_1.vi.mock('../../utils/client', async () => {
 });
 (0, vitest_1.describe)('executeSearch', () => {
     let mockClient;
+    let mockHttpPost;
+    // Wrap a payload in the axios envelope returned by `client.http.post`.
+    // Mirrors the `/v2/search` response shape:
+    //   { success, data: { web?, news?, images? }, id?, creditsUsed?, warning? }
+    const mockSearchResponse = (payload, extras = {}) => {
+        const inner = {
+            success: true,
+            data: Array.isArray(payload) ? { web: payload } : payload,
+            ...extras,
+        };
+        return { data: inner };
+    };
     (0, vitest_1.beforeEach)(() => {
         (0, mock_client_1.setupTest)();
-        // Initialize config with test API key
         (0, config_1.initializeConfig)({
             apiKey: 'test-api-key',
             apiUrl: 'https://api.firecrawl.dev',
         });
-        // Create mock client
+        mockHttpPost = vitest_1.vi.fn();
         mockClient = {
-            search: vitest_1.vi.fn(),
+            http: {
+                post: mockHttpPost,
+            },
         };
-        // Mock getClient to return our mock
         vitest_1.vi.mocked(client_1.getClient).mockReturnValue(mockClient);
     });
     (0, vitest_1.afterEach)(() => {
@@ -37,25 +49,28 @@ vitest_1.vi.mock('../../utils/client', async () => {
         vitest_1.vi.clearAllMocks();
     });
     (0, vitest_1.describe)('API call generation', () => {
-        (0, vitest_1.it)('should call search with correct query and default options', async () => {
-            const mockResponse = {
+        (0, vitest_1.it)('should call /v2/search with correct query and default options', async () => {
+            mockHttpPost.mockResolvedValue(mockSearchResponse({
                 web: [
-                    { url: 'https://example.com', title: 'Example', description: 'Test' },
+                    {
+                        url: 'https://example.com',
+                        title: 'Example',
+                        description: 'Test',
+                    },
                 ],
-            };
-            mockClient.search.mockResolvedValue(mockResponse);
+            }));
             await (0, search_1.executeSearch)({
                 query: 'test query',
             });
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledTimes(1);
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledWith('test query', {
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledTimes(1);
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledWith('/v2/search', {
+                query: 'test query',
                 limit: undefined,
                 integration: 'cli',
             });
         });
         (0, vitest_1.it)('should pass apiUrl to getClient when provided', async () => {
-            const mockResponse = { web: [] };
-            mockClient.search.mockResolvedValue(mockResponse);
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [] }));
             await (0, search_1.executeSearch)({
                 query: 'test query',
                 apiUrl: 'http://localhost:3002',
@@ -66,8 +81,7 @@ vitest_1.vi.mock('../../utils/client', async () => {
             });
         });
         (0, vitest_1.it)('should pass both apiKey and apiUrl to getClient when provided', async () => {
-            const mockResponse = { web: [] };
-            mockClient.search.mockResolvedValue(mockResponse);
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [] }));
             await (0, search_1.executeSearch)({
                 query: 'test query',
                 apiKey: 'fc-custom-key',
@@ -79,157 +93,157 @@ vitest_1.vi.mock('../../utils/client', async () => {
             });
         });
         (0, vitest_1.it)('should include limit option when provided', async () => {
-            const mockResponse = { web: [] };
-            mockClient.search.mockResolvedValue(mockResponse);
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [] }));
             await (0, search_1.executeSearch)({
                 query: 'AI news',
                 limit: 10,
             });
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledWith('AI news', vitest_1.expect.objectContaining({
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledWith('/v2/search', vitest_1.expect.objectContaining({
+                query: 'AI news',
                 limit: 10,
             }));
         });
         (0, vitest_1.it)('should include sources option when provided', async () => {
-            const mockResponse = { web: [], images: [], news: [] };
-            mockClient.search.mockResolvedValue(mockResponse);
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [], images: [], news: [] }));
             await (0, search_1.executeSearch)({
                 query: 'test query',
                 sources: ['web', 'images', 'news'],
             });
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledWith('test query', vitest_1.expect.objectContaining({
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledWith('/v2/search', vitest_1.expect.objectContaining({
+                query: 'test query',
                 sources: [{ type: 'web' }, { type: 'images' }, { type: 'news' }],
             }));
         });
         (0, vitest_1.it)('should include single source correctly', async () => {
-            const mockResponse = { news: [] };
-            mockClient.search.mockResolvedValue(mockResponse);
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ news: [] }));
             await (0, search_1.executeSearch)({
                 query: 'tech news',
                 sources: ['news'],
             });
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledWith('tech news', vitest_1.expect.objectContaining({
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledWith('/v2/search', vitest_1.expect.objectContaining({
+                query: 'tech news',
                 sources: [{ type: 'news' }],
             }));
         });
         (0, vitest_1.it)('should include categories option when provided', async () => {
-            const mockResponse = { web: [] };
-            mockClient.search.mockResolvedValue(mockResponse);
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [] }));
             await (0, search_1.executeSearch)({
                 query: 'web scraping python',
                 categories: ['github'],
             });
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledWith('web scraping python', vitest_1.expect.objectContaining({
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledWith('/v2/search', vitest_1.expect.objectContaining({
+                query: 'web scraping python',
                 categories: [{ type: 'github' }],
             }));
         });
         (0, vitest_1.it)('should include multiple categories correctly', async () => {
-            const mockResponse = { web: [] };
-            mockClient.search.mockResolvedValue(mockResponse);
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [] }));
             await (0, search_1.executeSearch)({
                 query: 'transformer architecture',
                 categories: ['research', 'pdf'],
             });
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledWith('transformer architecture', vitest_1.expect.objectContaining({
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledWith('/v2/search', vitest_1.expect.objectContaining({
+                query: 'transformer architecture',
                 categories: [{ type: 'research' }, { type: 'pdf' }],
             }));
         });
         (0, vitest_1.it)('should include tbs (time-based search) option when provided', async () => {
-            const mockResponse = { web: [] };
-            mockClient.search.mockResolvedValue(mockResponse);
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [] }));
             await (0, search_1.executeSearch)({
                 query: 'AI announcements',
                 tbs: 'qdr:d', // Past day
             });
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledWith('AI announcements', vitest_1.expect.objectContaining({
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledWith('/v2/search', vitest_1.expect.objectContaining({
+                query: 'AI announcements',
                 tbs: 'qdr:d',
             }));
         });
         (0, vitest_1.it)('should include location option when provided', async () => {
-            const mockResponse = { web: [] };
-            mockClient.search.mockResolvedValue(mockResponse);
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [] }));
             await (0, search_1.executeSearch)({
                 query: 'restaurants',
                 location: 'San Francisco,California,United States',
             });
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledWith('restaurants', vitest_1.expect.objectContaining({
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledWith('/v2/search', vitest_1.expect.objectContaining({
+                query: 'restaurants',
                 location: 'San Francisco,California,United States',
             }));
         });
         (0, vitest_1.it)('should include country option when provided', async () => {
-            const mockResponse = { web: [] };
-            mockClient.search.mockResolvedValue(mockResponse);
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [] }));
             await (0, search_1.executeSearch)({
                 query: 'local news',
                 country: 'DE',
             });
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledWith('local news', vitest_1.expect.objectContaining({
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledWith('/v2/search', vitest_1.expect.objectContaining({
+                query: 'local news',
                 country: 'DE',
             }));
         });
         (0, vitest_1.it)('should include timeout option when provided', async () => {
-            const mockResponse = { web: [] };
-            mockClient.search.mockResolvedValue(mockResponse);
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [] }));
             await (0, search_1.executeSearch)({
                 query: 'test query',
                 timeout: 30000,
             });
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledWith('test query', vitest_1.expect.objectContaining({
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledWith('/v2/search', vitest_1.expect.objectContaining({
+                query: 'test query',
                 timeout: 30000,
             }));
         });
         (0, vitest_1.it)('should include ignoreInvalidUrls option when provided', async () => {
-            const mockResponse = { web: [] };
-            mockClient.search.mockResolvedValue(mockResponse);
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [] }));
             await (0, search_1.executeSearch)({
                 query: 'test query',
                 ignoreInvalidUrls: true,
             });
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledWith('test query', vitest_1.expect.objectContaining({
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledWith('/v2/search', vitest_1.expect.objectContaining({
+                query: 'test query',
                 ignoreInvalidURLs: true,
             }));
         });
         (0, vitest_1.it)('should include scrape options when scrape is enabled', async () => {
-            const mockResponse = {
+            mockHttpPost.mockResolvedValue(mockSearchResponse({
                 web: [{ url: 'https://example.com', markdown: '# Test' }],
-            };
-            mockClient.search.mockResolvedValue(mockResponse);
+            }));
             await (0, search_1.executeSearch)({
                 query: 'firecrawl tutorials',
                 scrape: true,
             });
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledWith('firecrawl tutorials', vitest_1.expect.objectContaining({
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledWith('/v2/search', vitest_1.expect.objectContaining({
+                query: 'firecrawl tutorials',
                 scrapeOptions: {
                     formats: [{ type: 'markdown' }],
                 },
             }));
         });
         (0, vitest_1.it)('should include custom scrape formats when provided', async () => {
-            const mockResponse = {
+            mockHttpPost.mockResolvedValue(mockSearchResponse({
                 web: [{ url: 'https://example.com', markdown: '# Test', links: [] }],
-            };
-            mockClient.search.mockResolvedValue(mockResponse);
+            }));
             await (0, search_1.executeSearch)({
                 query: 'API docs',
                 scrape: true,
                 scrapeFormats: ['markdown', 'links'],
             });
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledWith('API docs', vitest_1.expect.objectContaining({
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledWith('/v2/search', vitest_1.expect.objectContaining({
+                query: 'API docs',
                 scrapeOptions: {
                     formats: [{ type: 'markdown' }, { type: 'links' }],
                 },
             }));
         });
         (0, vitest_1.it)('should include onlyMainContent in scrape options when provided', async () => {
-            const mockResponse = {
+            mockHttpPost.mockResolvedValue(mockSearchResponse({
                 web: [{ url: 'https://example.com', markdown: '# Test' }],
-            };
-            mockClient.search.mockResolvedValue(mockResponse);
+            }));
             await (0, search_1.executeSearch)({
                 query: 'test query',
                 scrape: true,
                 onlyMainContent: true,
             });
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledWith('test query', vitest_1.expect.objectContaining({
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledWith('/v2/search', vitest_1.expect.objectContaining({
+                query: 'test query',
                 scrapeOptions: {
                     formats: [{ type: 'markdown' }],
                     onlyMainContent: true,
@@ -237,11 +251,10 @@ vitest_1.vi.mock('../../utils/client', async () => {
             }));
         });
         (0, vitest_1.it)('should combine all options correctly', async () => {
-            const mockResponse = {
+            mockHttpPost.mockResolvedValue(mockSearchResponse({
                 web: [{ url: 'https://example.com', markdown: '# Test' }],
                 news: [{ url: 'https://news.example.com', title: 'News' }],
-            };
-            mockClient.search.mockResolvedValue(mockResponse);
+            }));
             await (0, search_1.executeSearch)({
                 query: 'comprehensive test',
                 limit: 20,
@@ -255,7 +268,8 @@ vitest_1.vi.mock('../../utils/client', async () => {
                 scrapeFormats: ['markdown', 'links'],
                 onlyMainContent: true,
             });
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledWith('comprehensive test', {
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledWith('/v2/search', {
+                query: 'comprehensive test',
                 limit: 20,
                 integration: 'cli',
                 sources: [{ type: 'web' }, { type: 'news' }],
@@ -273,74 +287,62 @@ vitest_1.vi.mock('../../utils/client', async () => {
     });
     (0, vitest_1.describe)('Response handling', () => {
         (0, vitest_1.it)('should return success result with web results', async () => {
-            const mockResponse = {
-                web: [
-                    {
-                        url: 'https://example.com',
-                        title: 'Example',
-                        description: 'Test description',
-                    },
-                    {
-                        url: 'https://example2.com',
-                        title: 'Example 2',
-                        description: 'Another test',
-                    },
-                ],
-            };
-            mockClient.search.mockResolvedValue(mockResponse);
+            const web = [
+                {
+                    url: 'https://example.com',
+                    title: 'Example',
+                    description: 'Test description',
+                },
+                {
+                    url: 'https://example2.com',
+                    title: 'Example 2',
+                    description: 'Another test',
+                },
+            ];
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web }));
             const result = await (0, search_1.executeSearch)({
                 query: 'test query',
             });
             (0, vitest_1.expect)(result.success).toBe(true);
-            (0, vitest_1.expect)(result.data).toEqual({
-                web: mockResponse.web,
-            });
+            (0, vitest_1.expect)(result.data).toEqual({ web });
         });
         (0, vitest_1.it)('should return success result with image results', async () => {
-            const mockResponse = {
-                images: [
-                    {
-                        imageUrl: 'https://example.com/image.jpg',
-                        url: 'https://example.com',
-                        title: 'Image 1',
-                        imageWidth: 800,
-                        imageHeight: 600,
-                    },
-                ],
-            };
-            mockClient.search.mockResolvedValue(mockResponse);
+            const images = [
+                {
+                    imageUrl: 'https://example.com/image.jpg',
+                    url: 'https://example.com',
+                    title: 'Image 1',
+                    imageWidth: 800,
+                    imageHeight: 600,
+                },
+            ];
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ images }));
             const result = await (0, search_1.executeSearch)({
                 query: 'landscapes',
                 sources: ['images'],
             });
             (0, vitest_1.expect)(result.success).toBe(true);
-            (0, vitest_1.expect)(result.data).toEqual({
-                images: mockResponse.images,
-            });
+            (0, vitest_1.expect)(result.data).toEqual({ images });
         });
         (0, vitest_1.it)('should return success result with news results', async () => {
-            const mockResponse = {
-                news: [
-                    {
-                        url: 'https://news.example.com',
-                        title: 'Breaking News',
-                        snippet: 'Something happened',
-                        date: '2024-01-15',
-                    },
-                ],
-            };
-            mockClient.search.mockResolvedValue(mockResponse);
+            const news = [
+                {
+                    url: 'https://news.example.com',
+                    title: 'Breaking News',
+                    snippet: 'Something happened',
+                    date: '2024-01-15',
+                },
+            ];
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ news }));
             const result = await (0, search_1.executeSearch)({
                 query: 'tech news',
                 sources: ['news'],
             });
             (0, vitest_1.expect)(result.success).toBe(true);
-            (0, vitest_1.expect)(result.data).toEqual({
-                news: mockResponse.news,
-            });
+            (0, vitest_1.expect)(result.data).toEqual({ news });
         });
         (0, vitest_1.it)('should handle combined results from multiple sources', async () => {
-            const mockResponse = {
+            const payload = {
                 web: [{ url: 'https://example.com', title: 'Web Result' }],
                 images: [
                     {
@@ -350,20 +352,16 @@ vitest_1.vi.mock('../../utils/client', async () => {
                 ],
                 news: [{ url: 'https://news.example.com', title: 'News' }],
             };
-            mockClient.search.mockResolvedValue(mockResponse);
+            mockHttpPost.mockResolvedValue(mockSearchResponse(payload));
             const result = await (0, search_1.executeSearch)({
                 query: 'machine learning',
                 sources: ['web', 'images', 'news'],
             });
             (0, vitest_1.expect)(result.success).toBe(true);
-            (0, vitest_1.expect)(result.data).toEqual({
-                web: mockResponse.web,
-                images: mockResponse.images,
-                news: mockResponse.news,
-            });
+            (0, vitest_1.expect)(result.data).toEqual(payload);
         });
         (0, vitest_1.it)('should handle response with scraped content', async () => {
-            const mockResponse = {
+            mockHttpPost.mockResolvedValue(mockSearchResponse({
                 web: [
                     {
                         url: 'https://example.com',
@@ -371,8 +369,7 @@ vitest_1.vi.mock('../../utils/client', async () => {
                         markdown: '# Page Content\n\nThis is the content.',
                     },
                 ],
-            };
-            mockClient.search.mockResolvedValue(mockResponse);
+            }));
             const result = await (0, search_1.executeSearch)({
                 query: 'test',
                 scrape: true,
@@ -380,39 +377,8 @@ vitest_1.vi.mock('../../utils/client', async () => {
             (0, vitest_1.expect)(result.success).toBe(true);
             (0, vitest_1.expect)(result.data?.web?.[0].markdown).toBe('# Page Content\n\nThis is the content.');
         });
-        (0, vitest_1.it)('should handle nested data response format', async () => {
-            const mockResponse = {
-                data: {
-                    web: [{ url: 'https://example.com', title: 'Test' }],
-                },
-            };
-            mockClient.search.mockResolvedValue(mockResponse);
-            const result = await (0, search_1.executeSearch)({
-                query: 'test',
-            });
-            (0, vitest_1.expect)(result.success).toBe(true);
-            (0, vitest_1.expect)(result.data?.web).toEqual([
-                { url: 'https://example.com', title: 'Test' },
-            ]);
-        });
-        (0, vitest_1.it)('should handle array response format (legacy)', async () => {
-            const mockResponse = [
-                { url: 'https://example.com', title: 'Test 1' },
-                { url: 'https://example2.com', title: 'Test 2' },
-            ];
-            mockClient.search.mockResolvedValue(mockResponse);
-            const result = await (0, search_1.executeSearch)({
-                query: 'test',
-            });
-            (0, vitest_1.expect)(result.success).toBe(true);
-            (0, vitest_1.expect)(result.data?.web).toEqual(mockResponse);
-        });
         (0, vitest_1.it)('should include warning in result when present', async () => {
-            const mockResponse = {
-                web: [{ url: 'https://example.com', title: 'Test' }],
-                warning: 'Some warning message',
-            };
-            mockClient.search.mockResolvedValue(mockResponse);
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [{ url: 'https://example.com', title: 'Test' }] }, { warning: 'Some warning message' }));
             const result = await (0, search_1.executeSearch)({
                 query: 'test',
             });
@@ -420,11 +386,7 @@ vitest_1.vi.mock('../../utils/client', async () => {
             (0, vitest_1.expect)(result.warning).toBe('Some warning message');
         });
         (0, vitest_1.it)('should include id in result when present', async () => {
-            const mockResponse = {
-                web: [{ url: 'https://example.com', title: 'Test' }],
-                id: 'search-123',
-            };
-            mockClient.search.mockResolvedValue(mockResponse);
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [{ url: 'https://example.com', title: 'Test' }] }, { id: 'search-123' }));
             const result = await (0, search_1.executeSearch)({
                 query: 'test',
             });
@@ -432,11 +394,7 @@ vitest_1.vi.mock('../../utils/client', async () => {
             (0, vitest_1.expect)(result.id).toBe('search-123');
         });
         (0, vitest_1.it)('should include creditsUsed in result when present', async () => {
-            const mockResponse = {
-                web: [{ url: 'https://example.com', title: 'Test' }],
-                creditsUsed: 5,
-            };
-            mockClient.search.mockResolvedValue(mockResponse);
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [{ url: 'https://example.com', title: 'Test' }] }, { creditsUsed: 5 }));
             const result = await (0, search_1.executeSearch)({
                 query: 'test',
             });
@@ -444,8 +402,7 @@ vitest_1.vi.mock('../../utils/client', async () => {
             (0, vitest_1.expect)(result.creditsUsed).toBe(5);
         });
         (0, vitest_1.it)('should handle empty results', async () => {
-            const mockResponse = {};
-            mockClient.search.mockResolvedValue(mockResponse);
+            mockHttpPost.mockResolvedValue(mockSearchResponse({}));
             const result = await (0, search_1.executeSearch)({
                 query: 'nonexistent content xyz123',
             });
@@ -454,7 +411,7 @@ vitest_1.vi.mock('../../utils/client', async () => {
         });
         (0, vitest_1.it)('should return error result when search fails', async () => {
             const errorMessage = 'API Error: Rate limit exceeded';
-            mockClient.search.mockRejectedValue(new Error(errorMessage));
+            mockHttpPost.mockRejectedValue(new Error(errorMessage));
             const result = await (0, search_1.executeSearch)({
                 query: 'test query',
             });
@@ -464,7 +421,7 @@ vitest_1.vi.mock('../../utils/client', async () => {
             });
         });
         (0, vitest_1.it)('should handle non-Error exceptions', async () => {
-            mockClient.search.mockRejectedValue('String error');
+            mockHttpPost.mockRejectedValue('String error');
             const result = await (0, search_1.executeSearch)({
                 query: 'test query',
             });
@@ -474,44 +431,44 @@ vitest_1.vi.mock('../../utils/client', async () => {
     });
     (0, vitest_1.describe)('Time-based search parameters', () => {
         (0, vitest_1.it)('should support qdr:h for past hour', async () => {
-            mockClient.search.mockResolvedValue({ web: [] });
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [] }));
             await (0, search_1.executeSearch)({
                 query: 'breaking news',
                 tbs: 'qdr:h',
             });
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledWith('breaking news', vitest_1.expect.objectContaining({ tbs: 'qdr:h' }));
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledWith('/v2/search', vitest_1.expect.objectContaining({ tbs: 'qdr:h' }));
         });
         (0, vitest_1.it)('should support qdr:d for past day', async () => {
-            mockClient.search.mockResolvedValue({ web: [] });
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [] }));
             await (0, search_1.executeSearch)({
                 query: 'AI announcements',
                 tbs: 'qdr:d',
             });
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledWith('AI announcements', vitest_1.expect.objectContaining({ tbs: 'qdr:d' }));
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledWith('/v2/search', vitest_1.expect.objectContaining({ tbs: 'qdr:d' }));
         });
         (0, vitest_1.it)('should support qdr:w for past week', async () => {
-            mockClient.search.mockResolvedValue({ web: [] });
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [] }));
             await (0, search_1.executeSearch)({
                 query: 'tech news',
                 tbs: 'qdr:w',
             });
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledWith('tech news', vitest_1.expect.objectContaining({ tbs: 'qdr:w' }));
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledWith('/v2/search', vitest_1.expect.objectContaining({ tbs: 'qdr:w' }));
         });
         (0, vitest_1.it)('should support qdr:m for past month', async () => {
-            mockClient.search.mockResolvedValue({ web: [] });
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [] }));
             await (0, search_1.executeSearch)({
                 query: 'startup funding',
                 tbs: 'qdr:m',
             });
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledWith('startup funding', vitest_1.expect.objectContaining({ tbs: 'qdr:m' }));
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledWith('/v2/search', vitest_1.expect.objectContaining({ tbs: 'qdr:m' }));
         });
         (0, vitest_1.it)('should support qdr:y for past year', async () => {
-            mockClient.search.mockResolvedValue({ web: [] });
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [] }));
             await (0, search_1.executeSearch)({
                 query: 'yearly review',
                 tbs: 'qdr:y',
             });
-            (0, vitest_1.expect)(mockClient.search).toHaveBeenCalledWith('yearly review', vitest_1.expect.objectContaining({ tbs: 'qdr:y' }));
+            (0, vitest_1.expect)(mockHttpPost).toHaveBeenCalledWith('/v2/search', vitest_1.expect.objectContaining({ tbs: 'qdr:y' }));
         });
     });
     (0, vitest_1.describe)('Type safety', () => {
@@ -521,7 +478,7 @@ vitest_1.vi.mock('../../utils/client', async () => {
                 'images',
                 'news',
             ];
-            mockClient.search.mockResolvedValue({ web: [], images: [], news: [] });
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [], images: [], news: [] }));
             for (const source of sourceList) {
                 const result = await (0, search_1.executeSearch)({
                     query: 'test',
@@ -536,7 +493,7 @@ vitest_1.vi.mock('../../utils/client', async () => {
                 'research',
                 'pdf',
             ];
-            mockClient.search.mockResolvedValue({ web: [] });
+            mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [] }));
             for (const category of categoryList) {
                 const result = await (0, search_1.executeSearch)({
                     query: 'test',
@@ -553,9 +510,7 @@ vitest_1.vi.mock('../../utils/client', async () => {
                 'links',
             ];
             for (const format of formatList) {
-                mockClient.search.mockResolvedValue({
-                    web: [{ url: 'https://example.com' }],
-                });
+                mockHttpPost.mockResolvedValue(mockSearchResponse({ web: [{ url: 'https://example.com' }] }));
                 const result = await (0, search_1.executeSearch)({
                     query: 'test',
                     scrape: true,