🐛 修复 Agent 工具测试：替换失效的 vi.mock 别名路径为 mockSender 方案

Author: CodFrm

src/app/service/agent/tools/ask_user.test.ts

@@ -21,7 +21,7 @@ describe("ask_user", () => {
 
     // Resolve the question
     expect(resolvers.size).toBe(1);
-    const [askId, resolve] = Array.from(resolvers.entries())[0];
+    const [_askId, resolve] = Array.from(resolvers.entries())[0];
     resolve("Blue");
 
     const result = await resultPromise;
@@ -71,7 +71,7 @@ describe("ask_user", () => {
     expect(id1).not.toBe(id2);
 
     // Resolve both
-    for (const [id, resolve] of resolvers) {
+    for (const [_id, resolve] of resolvers) {
       resolve("answer");
     }
     await Promise.all([p1, p2]);

src/app/service/agent/tools/sub_agent.ts

@@ -21,9 +21,10 @@ export const SUB_AGENT_DEFINITION: ToolDefinition = {
   },
 };
 
-export function createSubAgentTool(params: {
-  runSubAgent: (prompt: string, description: string) => Promise<string>;
-}): { definition: ToolDefinition; executor: ToolExecutor } {
+export function createSubAgentTool(params: { runSubAgent: (prompt: string, description: string) => Promise<string> }): {
+  definition: ToolDefinition;
+  executor: ToolExecutor;
+} {
   const executor: ToolExecutor = {
     execute: async (args: Record<string, unknown>) => {
       const prompt = args.prompt as string;

src/app/service/agent/tools/task_tools.test.ts

@@ -82,9 +82,7 @@ describe("task_tools", () => {
 
     await create.executor.execute({ subject: "Test", description: "Some desc" });
 
-    const result = JSON.parse(
-      (await update.executor.execute({ task_id: "1", description: "" })) as string
-    );
+    const result = JSON.parse((await update.executor.execute({ task_id: "1", description: "" })) as string);
     expect(result.description).toBe("");
   });
 
@@ -95,9 +93,7 @@ describe("task_tools", () => {
 
     await create.executor.execute({ subject: "Original", description: "Desc" });
 
-    const result = JSON.parse(
-      (await update.executor.execute({ task_id: "1" })) as string
-    );
+    const result = JSON.parse((await update.executor.execute({ task_id: "1" })) as string);
     expect(result.subject).toBe("Original");
     expect(result.description).toBe("Desc");
     expect(result.status).toBe("pending");

src/app/service/agent/tools/web_fetch.test.ts

@@ -1,21 +1,17 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import { WebFetchExecutor, stripHtmlTags } from "./web_fetch";
 
-// Mock offscreen client
-vi.mock("@App/app/service/offscreen/client", () => ({
-  extractHtmlContent: vi.fn(),
-}));
-
-import { extractHtmlContent } from "@App/app/service/offscreen/client";
-const mockExtract = vi.mocked(extractHtmlContent);
+// 通过 mockSender.sendMessage 控制 offscreen extractHtmlContent 的返回值
+let mockExtractReturnValue: string | null = null;
+let mockExtractShouldThrow = false;
 
 describe("stripHtmlTags", () => {
   it("should remove HTML tags", () => {
     expect(stripHtmlTags("<p>Hello <b>World</b></p>")).toBe("Hello World");
   });
 
   it("should remove script and style tags with content", () => {
-    const html = '<div>text<script>alert(1)</script> <style>.x{}</style>more</div>';
+    const html = "<div>text<script>alert(1)</script> <style>.x{}</style>more</div>";
     expect(stripHtmlTags(html)).toBe("text more");
   });
 
@@ -25,11 +21,26 @@ describe("stripHtmlTags", () => {
 });
 
 describe("WebFetchExecutor", () => {
-  const mockSender = {} as any;
+  const mockSender = {
+    sendMessage: vi.fn().mockImplementation(() => {
+      if (mockExtractShouldThrow) {
+        return Promise.reject(new Error("Offscreen unavailable"));
+      }
+      return Promise.resolve({ data: mockExtractReturnValue });
+    }),
+  } as any;
 
   beforeEach(() => {
     vi.clearAllMocks();
     vi.stubGlobal("fetch", vi.fn());
+    mockExtractReturnValue = null;
+    mockExtractShouldThrow = false;
+    mockSender.sendMessage.mockImplementation(() => {
+      if (mockExtractShouldThrow) {
+        return Promise.reject(new Error("Offscreen unavailable"));
+      }
+      return Promise.resolve({ data: mockExtractReturnValue });
+    });
   });
 
   it("should throw for missing url", async () => {
@@ -70,7 +81,7 @@ describe("WebFetchExecutor", () => {
       text: () => Promise.resolve("<html><body><p>Hello World long content here for testing</p></body></html>"),
     });
     vi.stubGlobal("fetch", mockFetch);
-    mockExtract.mockResolvedValue("Hello World long content here for testing extracted properly by offscreen");
+    mockExtractReturnValue = "Hello World long content here for testing extracted properly by offscreen";
 
     const executor = new WebFetchExecutor(mockSender);
     const result = JSON.parse((await executor.execute({ url: "https://example.com" })) as string);
@@ -86,7 +97,7 @@ describe("WebFetchExecutor", () => {
       text: () => Promise.resolve("<p>Simple text</p>"),
     });
     vi.stubGlobal("fetch", mockFetch);
-    mockExtract.mockResolvedValue(null);
+    mockExtractReturnValue = null;
 
     const executor = new WebFetchExecutor(mockSender);
     const result = JSON.parse((await executor.execute({ url: "https://example.com" })) as string);
@@ -129,7 +140,7 @@ describe("WebFetchExecutor", () => {
       text: () => Promise.resolve("<p>Fallback content</p>"),
     });
     vi.stubGlobal("fetch", mockFetch);
-    mockExtract.mockRejectedValue(new Error("Offscreen unavailable"));
+    mockExtractShouldThrow = true;
 
     const executor = new WebFetchExecutor(mockSender);
     const result = JSON.parse((await executor.execute({ url: "https://example.com" })) as string);
@@ -145,7 +156,7 @@ describe("WebFetchExecutor", () => {
       text: () => Promise.resolve("<p>Hi</p>"),
     });
     vi.stubGlobal("fetch", mockFetch);
-    mockExtract.mockResolvedValue("Hi"); // shorter than 50 chars
+    mockExtractReturnValue = "Hi"; // shorter than 50 chars
 
     const executor = new WebFetchExecutor(mockSender);
     const result = JSON.parse((await executor.execute({ url: "https://example.com" })) as string);
@@ -173,16 +184,19 @@ describe("WebFetchExecutor", () => {
     const mockFetch = vi.fn().mockResolvedValue({
       ok: true,
       headers: new Headers({}),
-      text: () => Promise.resolve("<html><body>Long enough content for extraction to work properly and pass the threshold</body></html>"),
+      text: () =>
+        Promise.resolve(
+          "<html><body>Long enough content for extraction to work properly and pass the threshold</body></html>"
+        ),
     });
     vi.stubGlobal("fetch", mockFetch);
-    mockExtract.mockResolvedValue("Long enough content for extraction to work properly and pass the threshold");
+    mockExtractReturnValue = "Long enough content for extraction to work properly and pass the threshold";
 
     const executor = new WebFetchExecutor(mockSender);
     const result = JSON.parse((await executor.execute({ url: "https://example.com" })) as string);
 
     expect(result.content_type).toBe("html");
-    expect(mockExtract).toHaveBeenCalled();
+    expect(mockSender.sendMessage).toHaveBeenCalled();
   });
 
   it("should handle text/plain content-type as plain text", async () => {
@@ -198,7 +212,7 @@ describe("WebFetchExecutor", () => {
 
     expect(result.content_type).toBe("text");
     expect(result.content).toBe("Just plain text");
-    expect(mockExtract).not.toHaveBeenCalled();
+    expect(mockSender.sendMessage).not.toHaveBeenCalled();
   });
 
   it("should use default max_length of 10000", async () => {

src/app/service/agent/tools/web_search.test.ts

@@ -2,16 +2,13 @@ import { describe, it, expect, vi, beforeEach } from "vitest";
 import { WebSearchExecutor } from "./web_search";
 import type { SearchConfigRepo } from "./search_config";
 
-// Mock offscreen client
-vi.mock("@App/app/service/offscreen/client", () => ({
-  extractSearchResults: vi.fn(),
-}));
-
-import { extractSearchResults } from "@App/app/service/offscreen/client";
-const mockExtractResults = vi.mocked(extractSearchResults);
+// mockExtractResults 存储 mock 返回值，通过 mockSender.sendMessage 传递
+let mockExtractReturnValue: any[] = [];
 
 describe("WebSearchExecutor", () => {
-  const mockSender = {} as any;
+  const mockSender = {
+    sendMessage: vi.fn().mockImplementation(() => Promise.resolve({ data: mockExtractReturnValue })),
+  } as any;
 
   const createMockConfigRepo = (engine: "duckduckgo" | "google_custom"): SearchConfigRepo => ({
     getConfig: vi.fn().mockResolvedValue({
@@ -25,6 +22,8 @@ describe("WebSearchExecutor", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     vi.stubGlobal("fetch", vi.fn());
+    mockExtractReturnValue = [];
+    mockSender.sendMessage.mockImplementation(() => Promise.resolve({ data: mockExtractReturnValue }));
   });
 
   it("should throw for missing query", async () => {
@@ -39,10 +38,10 @@ describe("WebSearchExecutor", () => {
     });
     vi.stubGlobal("fetch", mockFetch);
 
-    mockExtractResults.mockResolvedValue([
+    mockExtractReturnValue = [
       { title: "Result 1", url: "https://example.com/1", snippet: "Snippet 1" },
       { title: "Result 2", url: "https://example.com/2", snippet: "Snippet 2" },
-    ]);
+    ];
 
     const executor = new WebSearchExecutor(mockSender, createMockConfigRepo("duckduckgo"));
     const result = JSON.parse((await executor.execute({ query: "test search" })) as string);
@@ -64,7 +63,7 @@ describe("WebSearchExecutor", () => {
       url: `https://example.com/${i}`,
       snippet: `S${i}`,
     }));
-    mockExtractResults.mockResolvedValue(manyResults);
+    mockExtractReturnValue = manyResults;
 
     const executor = new WebSearchExecutor(mockSender, createMockConfigRepo("duckduckgo"));
     const result = JSON.parse((await executor.execute({ query: "test", max_results: 3 })) as string);
@@ -84,7 +83,7 @@ describe("WebSearchExecutor", () => {
       url: `https://example.com/${i}`,
       snippet: `S${i}`,
     }));
-    mockExtractResults.mockResolvedValue(manyResults);
+    mockExtractReturnValue = manyResults;
 
     const executor = new WebSearchExecutor(mockSender, createMockConfigRepo("duckduckgo"));
     const result = JSON.parse((await executor.execute({ query: "test", max_results: 20 })) as string);
@@ -97,9 +96,7 @@ describe("WebSearchExecutor", () => {
       ok: true,
       json: () =>
         Promise.resolve({
-          items: [
-            { title: "Google Result", link: "https://example.com", snippet: "Google snippet" },
-          ],
+          items: [{ title: "Google Result", link: "https://example.com", snippet: "Google snippet" }],
         }),
     });
     vi.stubGlobal("fetch", mockFetch);
@@ -170,9 +167,11 @@ describe("WebSearchExecutor", () => {
     vi.stubGlobal("fetch", mockFetch);
 
     const manyResults = Array.from({ length: 8 }, (_, i) => ({
-      title: `R${i}`, url: `https://example.com/${i}`, snippet: `S${i}`,
+      title: `R${i}`,
+      url: `https://example.com/${i}`,
+      snippet: `S${i}`,
     }));
-    mockExtractResults.mockResolvedValue(manyResults);
+    mockExtractReturnValue = manyResults;
 
     const executor = new WebSearchExecutor(mockSender, createMockConfigRepo("duckduckgo"));
     const result = JSON.parse((await executor.execute({ query: "test" })) as string);

src/app/service/agent/tools/web_search.ts

@@ -61,12 +61,7 @@ export class WebSearchExecutor implements ToolExecutor {
     return JSON.stringify(results.slice(0, maxResults));
   }
 
-  private async searchGoogle(
-    query: string,
-    maxResults: number,
-    apiKey: string,
-    cseId: string
-  ): Promise<string> {
+  private async searchGoogle(query: string, maxResults: number, apiKey: string, cseId: string): Promise<string> {
     if (!apiKey || !cseId) {
       throw new Error("Google Custom Search requires API Key and CSE ID. Configure them in Agent Tool Settings.");
     }

src/app/service/service_worker/agent.ts

@@ -1376,8 +1376,7 @@ export class AgentService {
               model,
               prompt,
               signal: abortController.signal,
-              sendEvent: (evt) =>
-                sendEvent({ type: "sub_agent_event", agentId, description: desc, event: evt }),
+              sendEvent: (evt) => sendEvent({ type: "sub_agent_event", agentId, description: desc, event: evt }),
               excludeTools: ["ask_user", "agent"],
               maxIterations: 20,
             });