🐛 修复 Agent 设置与类型定义问题

CodFrm · CodFrm · commit 8178141d877b · 2026-03-19T22:36:02.000+08:00
- 修复 Bing 搜索 URL 移除无效的 count 参数
- 修复 getSummaryModelId 未设置时报错问题
- 修复新会话应使用默认模型而非当前会话模型
- Agent 设置页面添加搜索引擎提示信息和保存成功反馈
- 补全 scriptcat.d.ts 类型定义（Attachment、ScreenshotResult 等）
- 修复 NotificationDetails.text 字段类型错误
diff --git a/src/app/service/agent/tools/web_search.ts b/src/app/service/agent/tools/web_search.ts
@@ -78,7 +78,7 @@ export class WebSearchExecutor implements ToolExecutor {
   }
 
   private async searchBing(query: string, maxResults: number): Promise<string> {
-    const url = `https://www.bing.com/search?q=${encodeURIComponent(query)}&count=${maxResults}`;
+    const url = `https://www.bing.com/search?q=${encodeURIComponent(query)}`;
     const response = await fetch(url, {
       headers: {
         "User-Agent": "Mozilla/5.0 (compatible; ScriptCat Agent)",
diff --git a/src/app/service/service_worker/client.ts b/src/app/service/service_worker/client.ts
@@ -412,9 +412,9 @@ export class AgentClient extends Client {
     return this.do("setDefaultModelId", id);
   }
 
-  // 摘要模型
+  // 摘要模型（未设置时返回空字符串，不能用 doThrow）
   getSummaryModelId(): Promise<string> {
-    return this.doThrow("getSummaryModelId");
+    return this.do("getSummaryModelId").then((id) => id || "");
   }
 
   setSummaryModelId(id: string) {
diff --git a/src/locales/ach-UG/translation.json b/src/locales/ach-UG/translation.json
@@ -691,5 +691,11 @@
   "agent_search_engine": "Search Engine",
   "agent_search_engine_baidu": "Baidu",
   "agent_search_google_api_key": "Google API Key",
-  "agent_search_google_cse_id": "Custom Search Engine ID"
+  "agent_search_google_cse_id": "Custom Search Engine ID",
+  "agent_settings_saved": "Settings saved",
+  "agent_settings_save_failed": "Failed to save settings",
+  "agent_search_engine_tip_bing": "Default search engine with broad global coverage, no extra configuration needed.",
+  "agent_search_engine_tip_duckduckgo": "Privacy-focused search engine, no API key required.",
+  "agent_search_engine_tip_baidu": "Optimized for Chinese content, better results for Chinese queries.",
+  "agent_search_engine_tip_google": "High-quality search results, requires a Google API Key and Custom Search Engine ID."
 }
diff --git a/src/locales/de-DE/translation.json b/src/locales/de-DE/translation.json
@@ -723,5 +723,11 @@
   "agent_search_engine": "Suchmaschine",
   "agent_search_engine_baidu": "Baidu",
   "agent_search_google_api_key": "Google API Key",
-  "agent_search_google_cse_id": "Benutzerdefinierte Suchmaschinen-ID"
+  "agent_search_google_cse_id": "Benutzerdefinierte Suchmaschinen-ID",
+  "agent_settings_saved": "Einstellungen gespeichert",
+  "agent_settings_save_failed": "Einstellungen konnten nicht gespeichert werden",
+  "agent_search_engine_tip_bing": "Standard-Suchmaschine mit breiter globaler Abdeckung, keine zusätzliche Konfiguration erforderlich.",
+  "agent_search_engine_tip_duckduckgo": "Datenschutzorientierte Suchmaschine, kein API-Schlüssel erforderlich.",
+  "agent_search_engine_tip_baidu": "Optimiert für chinesische Inhalte, bessere Ergebnisse für chinesische Suchanfragen.",
+  "agent_search_engine_tip_google": "Hochwertige Suchergebnisse, erfordert einen Google API Key und eine benutzerdefinierte Suchmaschinen-ID."
 }
diff --git a/src/locales/en-US/translation.json b/src/locales/en-US/translation.json
@@ -760,5 +760,11 @@
   "agent_search_engine": "Search Engine",
   "agent_search_engine_baidu": "Baidu",
   "agent_search_google_api_key": "Google API Key",
-  "agent_search_google_cse_id": "Custom Search Engine ID"
+  "agent_search_google_cse_id": "Custom Search Engine ID",
+  "agent_settings_saved": "Settings saved",
+  "agent_settings_save_failed": "Failed to save settings",
+  "agent_search_engine_tip_bing": "Default search engine with broad global coverage, no extra configuration needed.",
+  "agent_search_engine_tip_duckduckgo": "Privacy-focused search engine, no API key required.",
+  "agent_search_engine_tip_baidu": "Optimized for Chinese content, better results for Chinese queries.",
+  "agent_search_engine_tip_google": "High-quality search results, requires a Google API Key and Custom Search Engine ID."
 }
diff --git a/src/locales/ja-JP/translation.json b/src/locales/ja-JP/translation.json
@@ -723,5 +723,11 @@
   "agent_search_engine": "検索エンジン",
   "agent_search_engine_baidu": "Baidu",
   "agent_search_google_api_key": "Google API Key",
-  "agent_search_google_cse_id": "カスタム検索エンジン ID"
+  "agent_search_google_cse_id": "カスタム検索エンジン ID",
+  "agent_settings_saved": "設定を保存しました",
+  "agent_settings_save_failed": "設定の保存に失敗しました",
+  "agent_search_engine_tip_bing": "デフォルトの検索エンジン、グローバルに広くカバー、追加設定不要。",
+  "agent_search_engine_tip_duckduckgo": "プライバシー重視の検索エンジン、API キー不要。",
+  "agent_search_engine_tip_baidu": "中国語コンテンツに最適化、中国語の検索結果がより良好。",
+  "agent_search_engine_tip_google": "高品質な検索結果、Google API Key とカスタム検索エンジン ID の設定が必要。"
 }
diff --git a/src/locales/ru-RU/translation.json b/src/locales/ru-RU/translation.json
@@ -723,5 +723,11 @@
   "agent_search_engine": "Поисковая система",
   "agent_search_engine_baidu": "Baidu",
   "agent_search_google_api_key": "Google API Key",
-  "agent_search_google_cse_id": "ID пользовательской поисковой системы"
+  "agent_search_google_cse_id": "ID пользовательской поисковой системы",
+  "agent_settings_saved": "Настройки сохранены",
+  "agent_settings_save_failed": "Не удалось сохранить настройки",
+  "agent_search_engine_tip_bing": "Поисковая система по умолчанию с широким глобальным охватом, дополнительная настройка не требуется.",
+  "agent_search_engine_tip_duckduckgo": "Поисковая система с акцентом на конфиденциальность, API-ключ не требуется.",
+  "agent_search_engine_tip_baidu": "Оптимизирован для китайского контента, лучшие результаты для запросов на китайском языке.",
+  "agent_search_engine_tip_google": "Высококачественные результаты поиска, требуется Google API Key и ID пользовательской поисковой системы."
 }
diff --git a/src/locales/vi-VN/translation.json b/src/locales/vi-VN/translation.json
@@ -723,5 +723,11 @@
   "agent_search_engine": "Công cụ tìm kiếm",
   "agent_search_engine_baidu": "Baidu",
   "agent_search_google_api_key": "Google API Key",
-  "agent_search_google_cse_id": "ID công cụ tìm kiếm tùy chỉnh"
+  "agent_search_google_cse_id": "ID công cụ tìm kiếm tùy chỉnh",
+  "agent_settings_saved": "Đã lưu cài đặt",
+  "agent_settings_save_failed": "Lưu cài đặt thất bại",
+  "agent_search_engine_tip_bing": "Công cụ tìm kiếm mặc định, phạm vi toàn cầu rộng, không cần cấu hình thêm.",
+  "agent_search_engine_tip_duckduckgo": "Công cụ tìm kiếm chú trọng quyền riêng tư, không cần API Key.",
+  "agent_search_engine_tip_baidu": "Tối ưu cho nội dung tiếng Trung, kết quả tốt hơn cho truy vấn tiếng Trung.",
+  "agent_search_engine_tip_google": "Kết quả tìm kiếm chất lượng cao, cần cấu hình Google API Key và ID công cụ tìm kiếm tùy chỉnh."
 }
diff --git a/src/locales/zh-CN/translation.json b/src/locales/zh-CN/translation.json
@@ -760,5 +760,11 @@
   "agent_search_engine": "搜索引擎",
   "agent_search_engine_baidu": "百度",
   "agent_search_google_api_key": "Google API Key",
-  "agent_search_google_cse_id": "自定义搜索引擎 ID"
+  "agent_search_google_cse_id": "自定义搜索引擎 ID",
+  "agent_settings_saved": "设置已保存",
+  "agent_settings_save_failed": "保存设置失败",
+  "agent_search_engine_tip_bing": "默认搜索引擎，全球覆盖广泛，无需额外配置。",
+  "agent_search_engine_tip_duckduckgo": "注重隐私保护的搜索引擎，无需 API Key。",
+  "agent_search_engine_tip_baidu": "针对中文内容优化，中文搜索效果更好。",
+  "agent_search_engine_tip_google": "搜索质量更高，需要配置 Google API Key 和自定义搜索引擎 ID。"
 }
diff --git a/src/locales/zh-TW/translation.json b/src/locales/zh-TW/translation.json
@@ -723,5 +723,11 @@
   "agent_search_engine": "搜尋引擎",
   "agent_search_engine_baidu": "百度",
   "agent_search_google_api_key": "Google API Key",
-  "agent_search_google_cse_id": "自訂搜尋引擎 ID"
+  "agent_search_google_cse_id": "自訂搜尋引擎 ID",
+  "agent_settings_saved": "設定已儲存",
+  "agent_settings_save_failed": "儲存設定失敗",
+  "agent_search_engine_tip_bing": "預設搜尋引擎，全球覆蓋廣泛，無需額外設定。",
+  "agent_search_engine_tip_duckduckgo": "注重隱私保護的搜尋引擎，無需 API Key。",
+  "agent_search_engine_tip_baidu": "針對中文內容最佳化，中文搜尋效果更好。",
+  "agent_search_engine_tip_google": "搜尋品質更高，需要設定 Google API Key 和自訂搜尋引擎 ID。"
 }
diff --git a/src/pages/options/routes/AgentChat/index.tsx b/src/pages/options/routes/AgentChat/index.tsx
@@ -53,9 +53,10 @@ export default function AgentChat() {
   const effectiveModelId = selectedModelId || defaultModelId;
 
   const handleCreate = useCallback(async () => {
-    const { conv } = await createConversation(effectiveModelId, selectedSkills);
+    // 新会话始终使用默认模型，而非当前会话的模型
+    const { conv } = await createConversation(defaultModelId, selectedSkills);
     setActiveId(conv.id);
-  }, [createConversation, effectiveModelId, selectedSkills, setActiveId]);
+  }, [createConversation, defaultModelId, selectedSkills, setActiveId]);
 
   // 当会话标题变更时重新加载会话列表
   const handleTitleChange = useCallback(() => {
diff --git a/src/pages/options/routes/AgentSettings.tsx b/src/pages/options/routes/AgentSettings.tsx
@@ -1,10 +1,17 @@
-import { Card, Message, Select, Input, Space, Typography } from "@arco-design/web-react";
+import { Card, Message, Select, Input, Space, Typography, Alert } from "@arco-design/web-react";
 import { useTranslation } from "react-i18next";
 import { useCallback, useEffect, useState } from "react";
 import type { AgentModelConfig } from "@App/app/service/agent/types";
 import type { SearchEngineConfig } from "@App/app/service/agent/tools/search_config";
 import { agentClient } from "@App/pages/store/features/script";
 
+const engineTipKeys: Record<SearchEngineConfig["engine"], string> = {
+  bing: "agent_search_engine_tip_bing",
+  duckduckgo: "agent_search_engine_tip_duckduckgo",
+  baidu: "agent_search_engine_tip_baidu",
+  google_custom: "agent_search_engine_tip_google",
+};
+
 function AgentSettings() {
   const { t } = useTranslation();
   const [models, setModels] = useState<AgentModelConfig[]>([]);
@@ -24,14 +31,20 @@ function AgentSettings() {
   const handleSummaryModelChange = useCallback((value: string | undefined) => {
     const id = value || "";
     setSummaryModelId(id);
-    agentClient.setSummaryModelId(id).catch(() => Message.error("Save failed"));
+    agentClient
+      .setSummaryModelId(id)
+      .then(() => Message.success(t("agent_settings_saved")))
+      .catch(() => Message.error(t("agent_settings_save_failed")));
   }, []);
 
   const handleEngineChange = useCallback(
     (value: string) => {
       const newConfig = { ...searchConfig, engine: value as SearchEngineConfig["engine"] };
       setSearchConfig(newConfig);
-      agentClient.saveSearchConfig(newConfig).catch(() => Message.error("Save failed"));
+      agentClient
+        .saveSearchConfig(newConfig)
+        .then(() => Message.success(t("agent_settings_saved")))
+        .catch(() => Message.error(t("agent_settings_save_failed")));
     },
     [searchConfig]
   );
@@ -40,7 +53,10 @@ function AgentSettings() {
     (value: string) => {
       const newConfig = { ...searchConfig, googleApiKey: value };
       setSearchConfig(newConfig);
-      agentClient.saveSearchConfig(newConfig).catch(() => Message.error("Save failed"));
+      agentClient
+        .saveSearchConfig(newConfig)
+        .then(() => Message.success(t("agent_settings_saved")))
+        .catch(() => Message.error(t("agent_settings_save_failed")));
     },
     [searchConfig]
   );
@@ -49,7 +65,10 @@ function AgentSettings() {
     (value: string) => {
       const newConfig = { ...searchConfig, googleCseId: value };
       setSearchConfig(newConfig);
-      agentClient.saveSearchConfig(newConfig).catch(() => Message.error("Save failed"));
+      agentClient
+        .saveSearchConfig(newConfig)
+        .then(() => Message.success(t("agent_settings_saved")))
+        .catch(() => Message.error(t("agent_settings_save_failed")));
     },
     [searchConfig]
   );
@@ -104,6 +123,13 @@ function AgentSettings() {
                 </Select.Option>
               ))}
             </Select>
+            <Alert
+              className="tw-mt-2"
+              type="info"
+              content={t(engineTipKeys[searchConfig.engine])}
+              closable={false}
+              style={{ maxWidth: 500 }}
+            />
           </div>
 
           {searchConfig.engine === "google_custom" && (
diff --git a/src/types/scriptcat.d.ts b/src/types/scriptcat.d.ts
@@ -230,12 +230,12 @@ declare function GM_updateNotification(id: string, details: GMTypes.Notification
 declare function GM_setClipboard(data: string, info?: string | { type?: string; mimetype?: string }): void;
 
 /** Add a DOM element to the page. */
-declare function GM_addElement(tag: string, attributes: Record<string, string | number | boolean>): HTMLElement;
+declare function GM_addElement(tag: string, attributes: Record<string, string | number | boolean>): Element | undefined;
 declare function GM_addElement(
   parentNode: Node,
   tag: string,
   attrs: Record<string, string | number | boolean>
-): HTMLElement;
+): Element | undefined;
 
 /** Inject a CSS stylesheet into the page. */
 declare function GM_addStyle(css: string): Element | undefined;
@@ -752,7 +752,7 @@ declare namespace GMTypes {
     image: NotificationDetails["image"];
     silent: NotificationDetails["silent"];
     tag: NotificationDetails["tag"];
-    text: NotificationDetails["tag"];
+    text: NotificationDetails["text"];
     timeout: NotificationDetails["timeout"];
     title: NotificationDetails["title"];
     url: NotificationDetails["url"];
@@ -889,6 +889,20 @@ declare namespace CATAgent {
 
   // ---- Tool call ----
 
+  /** Attachment metadata for tool results and messages. */
+  interface Attachment {
+    /** Attachment ID. */
+    id: string;
+    /** Attachment type. */
+    type: "image" | "file" | "audio";
+    /** File name. */
+    name: string;
+    /** MIME type (e.g. "image/jpeg", "application/zip"). */
+    mimeType: string;
+    /** File size in bytes. */
+    size?: number;
+  }
+
   /** Record of a tool call made by the LLM. */
   interface ToolCallInfo {
     /** Unique call ID. */
@@ -899,6 +913,8 @@ declare namespace CATAgent {
     arguments: string;
     /** Tool execution result (populated after execution). */
     result?: string;
+    /** Attachments from tool execution (e.g. screenshots, files). */
+    attachments?: Attachment[];
     /** Call status. */
     status?: "pending" | "running" | "completed" | "error";
   }
@@ -1107,6 +1123,20 @@ declare namespace CATAgentDom {
     quality?: number;
     /** Capture the full scrollable page. */
     fullPage?: boolean;
+    /** CSS selector to capture a specific element region. */
+    selector?: string;
+    /** OPFS workspace relative path to save the binary screenshot. */
+    saveTo?: string;
+  }
+
+  /** Result of a `screenshot()` call. */
+  interface ScreenshotResult {
+    /** Base64-encoded data URL. */
+    dataUrl: string;
+    /** OPFS path (when `saveTo` is used). */
+    path?: string;
+    /** File size in bytes (when `saveTo` is used). */
+    size?: number;
   }
 
   /** Options for `navigate()`. */
@@ -1179,6 +1209,8 @@ declare namespace CATAgentDom {
   interface ExecuteScriptOptions {
     /** Target tab ID. */
     tabId?: number;
+    /** Script execution world. MAIN shares page globals, ISOLATED is extension-isolated. Default: ISOLATED. */
+    world?: "MAIN" | "ISOLATED";
   }
 
   /** Result of `stopMonitor()` — collected DOM changes during monitoring. */
@@ -1213,8 +1245,8 @@ declare namespace CATAgentDom {
     /** Read the HTML content of a page (or a selected element). */
     readPage(options?: ReadPageOptions): Promise<PageContent>;
 
-    /** Capture a screenshot of a tab. Returns a base64-encoded data URL. */
-    screenshot(options?: ScreenshotOptions): Promise<string>;
+    /** Capture a screenshot of a tab. */
+    screenshot(options?: ScreenshotOptions): Promise<ScreenshotResult>;
 
     /** Click an element matching the CSS selector. */
     click(selector: string, options?: DomActionOptions): Promise<ActionResult>;
@@ -1487,10 +1519,14 @@ declare namespace CATAgentOPFS {
   interface ReadResult {
     /** Sanitized path that was read. */
     path: string;
-    /** File text content. */
-    content: string;
+    /** File text content (when format is "text" or omitted). */
+    content?: string;
+    /** Blob URL (when format is "bloburl"). Scoped to the extension origin. */
+    blobUrl?: string;
     /** Size in bytes. */
     size: number;
+    /** Detected MIME type (when format is "bloburl"). */
+    mimeType?: string;
   }
 
   /**
@@ -1499,11 +1535,11 @@ declare namespace CATAgentOPFS {
    * @grant CAT.agent.opfs
    */
   interface OPFSAPI {
-    /** Write text content to a file. Creates parent directories automatically. */
-    write(path: string, content: string): Promise<WriteResult>;
+    /** Write content to a file. Creates parent directories automatically. Accepts string, Blob, or data URL. */
+    write(path: string, content: string | Blob): Promise<WriteResult>;
 
-    /** Read text content from a file. */
-    read(path: string): Promise<ReadResult>;
+    /** Read content from a file. Use `format: "bloburl"` to get a blob URL for binary files. */
+    read(path: string, format?: "text" | "bloburl"): Promise<ReadResult>;
 
     /** List files and directories. Defaults to workspace root if path is omitted. */
     list(path?: string): Promise<FileEntry[]>;
diff --git a/src/types/scriptcat.zh-CN.d.ts b/src/types/scriptcat.zh-CN.d.ts

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ export class WebSearchExecutor implements ToolExecutor {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`private async searchBing(query: string, maxResults: number): Promise<string> {`
`81`		- const url = `https://www.bing.com/search?q=${encodeURIComponent(query)}&count=${maxResults}`;
	`81`	+ const url = `https://www.bing.com/search?q=${encodeURIComponent(query)}`;
`82`	`82`	`const response = await fetch(url, {`
`83`	`83`	`headers: {`
`84`	`84`	`"User-Agent": "Mozilla/5.0 (compatible; ScriptCat Agent)",`
Original file line number	Diff line number	Diff line change
`@@ -412,9 +412,9 @@ export class AgentClient extends Client {`
`412`	`412`	`return this.do("setDefaultModelId", id);`
`413`	`413`	`}`
`414`	`414`
`415`		`- // 摘要模型`
	`415`	`+ // 摘要模型（未设置时返回空字符串，不能用 doThrow）`
`416`	`416`	`getSummaryModelId(): Promise<string> {`
`417`		`- return this.doThrow("getSummaryModelId");`
	`417`	`+ return this.do("getSummaryModelId").then((id) => id \|\| "");`
`418`	`418`	`}`
`419`	`419`
`420`	`420`	`setSummaryModelId(id: string) {`