🧹 修复 Agent 重构遗留的 lint 问题

CodFrm · CodFrm · commit 41e92c16881b · 2026-04-05T20:03:49.000+08:00
- 移除未使用的导入（AgentTask、sendMessage、ToolSource、部分 test helpers）
- html_extractor.ts: inline import() 类型改为顶部 import type
- prettier 格式化修复（with_timeout.ts、web_search.ts 等多处）
diff --git a/src/app/service/agent/core/providers/types.ts b/src/app/service/agent/core/providers/types.ts
@@ -28,9 +28,7 @@ export interface LLMProvider {
   readonly name: string;
 
   /** 构建 fetch 请求所需的 url 与 RequestInit */
-  buildRequest(
-    input: ProviderBuildRequestInput
-  ): ProviderBuildRequestOutput | Promise<ProviderBuildRequestOutput>;
+  buildRequest(input: ProviderBuildRequestInput): ProviderBuildRequestOutput | Promise<ProviderBuildRequestOutput>;
 
   /** 解析 SSE 流式响应，通过 onEvent 推送 ChatStreamEvent */
   parseStream(
diff --git a/src/app/service/agent/core/tool_registry.test.ts b/src/app/service/agent/core/tool_registry.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, vi } from "vitest";
 import { ToolRegistry } from "./tool_registry";
-import type { ToolExecutor, ToolSource } from "./tool_registry";
+import type { ToolExecutor } from "./tool_registry";
 import type { ToolCall, ToolDefinition, ToolResultWithAttachments } from "./types";
 import type { AgentChatRepo } from "@App/app/repo/agent_chat";
 
@@ -439,13 +439,20 @@ describe("ToolRegistry", () => {
   describe("来源追踪 API（register / getSource / listBySource / unregisterBySource）", () => {
     it("register 注册工具后 getSource 应返回正确来源", () => {
       const registry = new ToolRegistry();
-      registry.register("mcp", weatherDef, createExecutor(async () => "ok"));
+      registry.register(
+        "mcp",
+        weatherDef,
+        createExecutor(async () => "ok")
+      );
       expect(registry.getSource("get_weather")).toBe("mcp");
     });
 
     it("registerBuiltin 注册的工具来源应为 builtin", () => {
       const registry = new ToolRegistry();
-      registry.registerBuiltin(weatherDef, createExecutor(async () => "ok"));
+      registry.registerBuiltin(
+        weatherDef,
+        createExecutor(async () => "ok")
+      );
       expect(registry.getSource("get_weather")).toBe("builtin");
     });
 
@@ -456,9 +463,21 @@ describe("ToolRegistry", () => {
 
     it("listBySource 应只返回指定来源的工具名", () => {
       const registry = new ToolRegistry();
-      registry.register("builtin", weatherDef, createExecutor(async () => ""));
-      registry.register("mcp", calcDef, createExecutor(async () => ""));
-      registry.register("skill", { name: "load_skill", description: "加载 skill", parameters: { type: "object", properties: {} } }, createExecutor(async () => ""));
+      registry.register(
+        "builtin",
+        weatherDef,
+        createExecutor(async () => "")
+      );
+      registry.register(
+        "mcp",
+        calcDef,
+        createExecutor(async () => "")
+      );
+      registry.register(
+        "skill",
+        { name: "load_skill", description: "加载 skill", parameters: { type: "object", properties: {} } },
+        createExecutor(async () => "")
+      );
 
       expect(registry.listBySource("builtin")).toEqual(["get_weather"]);
       expect(registry.listBySource("mcp")).toEqual(["calc"]);
@@ -468,9 +487,21 @@ describe("ToolRegistry", () => {
 
     it("unregisterBySource 应批量删除指定来源的工具并返回名称列表", () => {
       const registry = new ToolRegistry();
-      registry.register("mcp", weatherDef, createExecutor(async () => ""));
-      registry.register("mcp", calcDef, createExecutor(async () => ""));
-      registry.register("builtin", { name: "web_fetch", description: "抓取", parameters: { type: "object", properties: {} } }, createExecutor(async () => ""));
+      registry.register(
+        "mcp",
+        weatherDef,
+        createExecutor(async () => "")
+      );
+      registry.register(
+        "mcp",
+        calcDef,
+        createExecutor(async () => "")
+      );
+      registry.register(
+        "builtin",
+        { name: "web_fetch", description: "抓取", parameters: { type: "object", properties: {} } },
+        createExecutor(async () => "")
+      );
 
       const removed = registry.unregisterBySource("mcp");
       expect(removed).toHaveLength(2);
@@ -483,13 +514,21 @@ describe("ToolRegistry", () => {
 
     it("unregisterBySource 无匹配工具时应返回空数组", () => {
       const registry = new ToolRegistry();
-      registry.register("builtin", weatherDef, createExecutor(async () => ""));
+      registry.register(
+        "builtin",
+        weatherDef,
+        createExecutor(async () => "")
+      );
       expect(registry.unregisterBySource("mcp")).toEqual([]);
     });
 
     it("unregister 应按名称删除工具", () => {
       const registry = new ToolRegistry();
-      registry.register("mcp", weatherDef, createExecutor(async () => ""));
+      registry.register(
+        "mcp",
+        weatherDef,
+        createExecutor(async () => "")
+      );
       expect(registry.unregister("get_weather")).toBe(true);
       expect(registry.getDefinitions()).toHaveLength(0);
     });
@@ -503,7 +542,11 @@ describe("ToolRegistry", () => {
   describe("withScopedTools", () => {
     it("fn 正常执行后应清理所有 scoped 工具", async () => {
       const registry = new ToolRegistry();
-      registry.register("builtin", weatherDef, createExecutor(async () => ""));
+      registry.register(
+        "builtin",
+        weatherDef,
+        createExecutor(async () => "")
+      );
 
       await registry.withScopedTools(
         "skill",
@@ -551,8 +594,16 @@ describe("ToolRegistry", () => {
 
     it("多个 scoped 工具应全部被清理", async () => {
       const registry = new ToolRegistry();
-      const toolA: ToolDefinition = { name: "tool_a", description: "A", parameters: { type: "object", properties: {} } };
-      const toolB: ToolDefinition = { name: "tool_b", description: "B", parameters: { type: "object", properties: {} } };
+      const toolA: ToolDefinition = {
+        name: "tool_a",
+        description: "A",
+        parameters: { type: "object", properties: {} },
+      };
+      const toolB: ToolDefinition = {
+        name: "tool_b",
+        description: "B",
+        parameters: { type: "object", properties: {} },
+      };
 
       await registry.withScopedTools(
         "skill",
diff --git a/src/app/service/agent/core/tools/web_search.ts b/src/app/service/agent/core/tools/web_search.ts
@@ -82,11 +82,7 @@ export class WebSearchExecutor implements ToolExecutor {
     let results: Awaited<ReturnType<typeof extractSearchResults>>;
     let extractionFailed = false;
     try {
-      results = await withTimeout(
-        extractSearchResults(this.sender, html),
-        10_000,
-        () => new Error("extract timeout")
-      );
+      results = await withTimeout(extractSearchResults(this.sender, html), 10_000, () => new Error("extract timeout"));
     } catch {
       results = [];
       extractionFailed = true;
@@ -113,11 +109,7 @@ export class WebSearchExecutor implements ToolExecutor {
     let results: Awaited<ReturnType<typeof extractBingResults>>;
     let extractionFailed = false;
     try {
-      results = await withTimeout(
-        extractBingResults(this.sender, html),
-        10_000,
-        () => new Error("extract timeout")
-      );
+      results = await withTimeout(extractBingResults(this.sender, html), 10_000, () => new Error("extract timeout"));
     } catch {
       results = [];
       extractionFailed = true;
@@ -144,11 +136,7 @@ export class WebSearchExecutor implements ToolExecutor {
     let results: Awaited<ReturnType<typeof extractBaiduResults>>;
     let extractionFailed = false;
     try {
-      results = await withTimeout(
-        extractBaiduResults(this.sender, html),
-        10_000,
-        () => new Error("extract timeout")
-      );
+      results = await withTimeout(extractBaiduResults(this.sender, html), 10_000, () => new Error("extract timeout"));
     } catch {
       results = [];
       extractionFailed = true;
diff --git a/src/app/service/agent/service_worker/agent.ts b/src/app/service/agent/service_worker/agent.ts
@@ -13,15 +13,14 @@ import type {
   SkillRecord,
   SkillSummary,
   MessageContent,
-  AgentTask,
   AgentTaskApiRequest,
   ModelApiRequest,
   OPFSApiRequest,
   MCPApiRequest,
 } from "@App/app/service/agent/core/types";
 import { AgentChatRepo } from "@App/app/repo/agent_chat";
-import { AgentModelRepo } from "@App/app/repo/agent_model";
-import { SkillRepo } from "@App/app/repo/skill_repo";
+import type { AgentModelRepo } from "@App/app/repo/agent_model";
+import type { SkillRepo } from "@App/app/repo/skill_repo";
 import { uuidv4 } from "@App/pkg/utils/uuid";
 import { ToolRegistry } from "@App/app/service/agent/core/tool_registry";
 import { SKILL_SCRIPT_UUID_PREFIX } from "@App/app/service/agent/core/skill_script_executor";
@@ -36,7 +35,6 @@ import { AgentTaskService } from "./task_service";
 import { AgentModelService } from "./model_service";
 import { AgentTaskRepo, AgentTaskRunRepo } from "@App/app/repo/agent_task";
 import { AgentTaskScheduler } from "@App/app/service/agent/core/task_scheduler";
-import { sendMessage } from "@Packages/message/client";
 import { WEB_FETCH_DEFINITION, WebFetchExecutor } from "@App/app/service/agent/core/tools/web_fetch";
 import { WEB_SEARCH_DEFINITION, WebSearchExecutor } from "@App/app/service/agent/core/tools/web_search";
 import { SearchConfigRepo, type SearchEngineConfig } from "@App/app/service/agent/core/tools/search_config";
@@ -52,7 +50,6 @@ import { ChatService } from "./chat_service";
 // 保留对外 API（测试文件直接从 "./agent" import 这三个函数）
 export { isRetryableError, withRetry, classifyErrorCode } from "./retry_utils";
 
-
 export class AgentService {
   private _repo = new AgentChatRepo();
   // 测试兼容性：透传访问 repo，setter 同步更新 compactService
diff --git a/src/app/service/agent/service_worker/autocompact.test.ts b/src/app/service/agent/service_worker/autocompact.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
-import { createTestService, makeSSEResponse, makeTextResponse } from "./test-helpers";
+import { createTestService, makeSSEResponse } from "./test-helpers";
 
 // ---- Compact 功能测试 ----
 
diff --git a/src/app/service/agent/service_worker/background.test.ts b/src/app/service/agent/service_worker/background.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
-import { createTestService, makeSSEResponse, makeTextResponse, createRunningConversation } from "./test-helpers";
+import { createTestService, makeTextResponse, createRunningConversation } from "./test-helpers";
 
 // ---- updateStreamingState 快照状态管理 ----
 
diff --git a/src/app/service/agent/service_worker/chat.test.ts b/src/app/service/agent/service_worker/chat.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
-import { createTestService, makeSkillRecord, makeSkillScriptRecord, makeTextResponse, makeSSEResponse } from "./test-helpers";
+import { createTestService, makeSkillRecord, makeSkillScriptRecord, makeTextResponse } from "./test-helpers";
 
 // ---- handleConversationChat skipSaveUserMessage（重新生成 bug 修复验证）----
 
diff --git a/src/app/service/agent/service_worker/chat_service.ts b/src/app/service/agent/service_worker/chat_service.ts
@@ -21,7 +21,11 @@ import type { SubAgentService } from "./sub_agent_service";
 import type { ToolLoopOrchestrator } from "./tool_loop_orchestrator";
 import type { SubAgentRunOptions } from "@App/app/service/agent/core/tools/sub_agent";
 import { buildSystemPrompt } from "@App/app/service/agent/core/system_prompt";
-import { COMPACT_SYSTEM_PROMPT, buildCompactUserPrompt, extractSummary } from "@App/app/service/agent/core/compact_prompt";
+import {
+  COMPACT_SYSTEM_PROMPT,
+  buildCompactUserPrompt,
+  extractSummary,
+} from "@App/app/service/agent/core/compact_prompt";
 import { createTaskTools } from "@App/app/service/agent/core/tools/task_tools";
 import { createAskUserTool } from "@App/app/service/agent/core/tools/ask_user";
 import { createSubAgentTool } from "@App/app/service/agent/core/tools/sub_agent";
diff --git a/src/app/service/agent/service_worker/compact_service.ts b/src/app/service/agent/service_worker/compact_service.ts
@@ -1,5 +1,12 @@
 import type { AgentChatRepo } from "@App/app/repo/agent_chat";
-import type { AgentModelConfig, ChatRequest, ChatStreamEvent, ToolCall, ContentBlock, ToolDefinition } from "@App/app/service/agent/core/types";
+import type {
+  AgentModelConfig,
+  ChatRequest,
+  ChatStreamEvent,
+  ToolCall,
+  ContentBlock,
+  ToolDefinition,
+} from "@App/app/service/agent/core/types";
 import {
   COMPACT_SYSTEM_PROMPT,
   buildCompactUserPrompt,
diff --git a/src/app/service/agent/service_worker/dom.test.ts b/src/app/service/agent/service_worker/dom.test.ts
@@ -182,9 +182,7 @@ describe("AgentDomService", () => {
     });
 
     it("应拒绝导航到 chrome:// URL", async () => {
-      await expect(service.navigate("chrome://settings")).rejects.toThrow(
-        "Agent DOM operation not allowed for URL:"
-      );
+      await expect(service.navigate("chrome://settings")).rejects.toThrow("Agent DOM operation not allowed for URL:");
     });
 
     it("应拒绝导航到 chrome-extension:// URL", async () => {
diff --git a/src/app/service/agent/service_worker/llm.test.ts b/src/app/service/agent/service_worker/llm.test.ts
@@ -161,9 +161,11 @@ describe("callLLM 流式响应解析", () => {
     mockRepo.getMessages.mockResolvedValue([]);
 
     // 401 不重试，只需提供 1 次 mock
-    fetchSpy.mockResolvedValueOnce(
-      ({ ok: false, status: 401, text: async () => "401 Unauthorized" }) as unknown as Response
-    );
+    fetchSpy.mockResolvedValueOnce({
+      ok: false,
+      status: 401,
+      text: async () => "401 Unauthorized",
+    } as unknown as Response);
 
     await (service as any).handleConversationChat({ conversationId: "conv-1", message: "hi" }, sender);
 
@@ -186,9 +188,11 @@ describe("callLLM 流式响应解析", () => {
     mockRepo.getMessages.mockResolvedValue([]);
 
     // 第一次 429，第二次成功
-    fetchSpy.mockResolvedValueOnce(
-      ({ ok: false, status: 429, text: async () => "Too Many Requests" }) as unknown as Response
-    );
+    fetchSpy.mockResolvedValueOnce({
+      ok: false,
+      status: 429,
+      text: async () => "Too Many Requests",
+    } as unknown as Response);
     fetchSpy.mockResolvedValueOnce(
       makeSSEResponse([
         `data: {"choices":[{"delta":{"content":"重试成功"}}]}\n\n`,
diff --git a/src/app/service/agent/service_worker/llm_client.ts b/src/app/service/agent/service_worker/llm_client.ts
@@ -44,9 +44,7 @@ export class LLMClient {
     };
 
     // 预解析消息中 ContentBlock 引用的 attachmentId → base64
-    const attachmentResolver = await resolveAttachments(params.messages, model, (id) =>
-      this.repo.getAttachment(id)
-    );
+    const attachmentResolver = await resolveAttachments(params.messages, model, (id) => this.repo.getAttachment(id));
 
     // zhipu 暂无独立实现，映射到 openai provider；独立实现后可移除此映射
     const providerName = model.provider === "zhipu" ? "openai" : model.provider;
diff --git a/src/app/service/agent/service_worker/model_service.ts b/src/app/service/agent/service_worker/model_service.ts
@@ -1,8 +1,4 @@
-import type {
-  AgentModelConfig,
-  AgentModelSafeConfig,
-  ModelApiRequest,
-} from "@App/app/service/agent/core/types";
+import type { AgentModelConfig, AgentModelSafeConfig, ModelApiRequest } from "@App/app/service/agent/core/types";
 import { AgentModelRepo } from "@App/app/repo/agent_model";
 import { supportsVision, supportsImageOutput } from "@App/pages/options/routes/AgentChat/model_utils";
 import type { Group } from "@Packages/message/server";
diff --git a/src/app/service/agent/service_worker/task_service.ts b/src/app/service/agent/service_worker/task_service.ts
@@ -12,7 +12,7 @@ import type { ScriptToolCallback, ToolRegistry } from "@App/app/service/agent/co
 import type { SkillService } from "./skill_service";
 import type { AgentTaskRepo, AgentTaskRunRepo } from "@App/app/repo/agent_task";
 import type { AgentTaskScheduler } from "@App/app/service/agent/core/task_scheduler";
-import { AgentChatRepo } from "@App/app/repo/agent_chat";
+import type { AgentChatRepo } from "@App/app/repo/agent_chat";
 import { buildSystemPrompt } from "@App/app/service/agent/core/system_prompt";
 import { uuidv4 } from "@App/pkg/utils/uuid";
 import { nextTimeInfo } from "@App/pkg/utils/cron";
diff --git a/src/app/service/agent/service_worker/tool_loop_orchestrator.ts b/src/app/service/agent/service_worker/tool_loop_orchestrator.ts
@@ -1,6 +1,6 @@
 import type { AgentChatRepo } from "@App/app/repo/agent_chat";
 import type { ScriptToolCallback } from "@App/app/service/agent/core/tool_registry";
-import { ToolRegistry } from "@App/app/service/agent/core/tool_registry";
+import type { ToolRegistry } from "@App/app/service/agent/core/tool_registry";
 import type {
   AgentModelConfig,
   ChatRequest,
diff --git a/src/app/service/offscreen/html_extractor.ts b/src/app/service/offscreen/html_extractor.ts
@@ -2,6 +2,7 @@ import type { Group } from "@Packages/message/server";
 // 触发所有搜索引擎注册（副作用导入）
 import "./search_engines";
 import { searchEngineRegistry } from "./search_engines/registry";
+import type { SearchResult } from "./search_engines/types";
 
 export type { SearchResult } from "./search_engines/types";
 
@@ -301,7 +302,7 @@ export class HtmlExtractorService {
   }
 
   // 解析 Bing 搜索结果（适配层：委托给 bingEngine 插件）
-  extractBingResults(html: string): import("./search_engines/types").SearchResult[] {
+  extractBingResults(html: string): SearchResult[] {
     try {
       const doc = new DOMParser().parseFromString(html, "text/html");
       return searchEngineRegistry.get("bing")?.extract(doc) ?? [];
@@ -311,7 +312,7 @@ export class HtmlExtractorService {
   }
 
   // 解析百度搜索结果（适配层：委托给 baiduEngine 插件）
-  extractBaiduResults(html: string): import("./search_engines/types").SearchResult[] {
+  extractBaiduResults(html: string): SearchResult[] {
     try {
       const doc = new DOMParser().parseFromString(html, "text/html");
       return searchEngineRegistry.get("baidu")?.extract(doc) ?? [];
@@ -321,7 +322,7 @@ export class HtmlExtractorService {
   }
 
   // 解析 DuckDuckGo 搜索结果（适配层：委托给 duckduckgoEngine 插件）
-  extractSearchResults(html: string): import("./search_engines/types").SearchResult[] {
+  extractSearchResults(html: string): SearchResult[] {
     try {
       const doc = new DOMParser().parseFromString(html, "text/html");
       return searchEngineRegistry.get("duckduckgo")?.extract(doc) ?? [];
diff --git a/src/pkg/utils/with_timeout.ts b/src/pkg/utils/with_timeout.ts
@@ -4,11 +4,7 @@
  * @param ms 超时毫秒数
  * @param onTimeoutError 可选：自定义超时错误构造器；默认抛 Error("operation timed out")
  */
-export function withTimeout<T>(
-  promise: Promise<T>,
-  ms: number,
-  onTimeoutError?: () => Error
-): Promise<T> {
+export function withTimeout<T>(promise: Promise<T>, ms: number, onTimeoutError?: () => Error): Promise<T> {
   let timer: ReturnType<typeof setTimeout>;
   const timeoutPromise = new Promise<never>((_, reject) => {
     timer = setTimeout(() => {
