♻️ 重命名 ==CATTool== 为 ==SkillScript==，清除所有 CATTool 残留

- ==CATTool== / ==/CATTool== 头格式改为 ==SkillScript== / ==/SkillScript==
- UUID 前缀从 cattool- 改为 skillscript-
- .cattool.js 文件扩展名改为 .skill.js
- ScriptInfo.cattool 字段改为 skillScript
- 变量/函数名中所有 cattool/CATTool 引用统一为 skillScript

Author: CodFrm

e2e/agent-fixtures.ts

@@ -87,6 +87,15 @@ export const test = base.extend<AgentFixtures>({
     const context = await chromium.launchPersistentContext("", {
       headless: false,
       args: ["--headless=new", `--disable-extensions-except=${pathToExtension}`, `--load-extension=${pathToExtension}`],
+      ...(() => {
+        const proxy =
+          process.env.E2E_PROXY ||
+          process.env.https_proxy ||
+          process.env.http_proxy ||
+          process.env.HTTPS_PROXY ||
+          process.env.HTTP_PROXY;
+        return proxy ? { proxy: { server: proxy } } : {};
+      })(),
     });
 
     await use(context);

e2e/agent-skill.spec.ts

@@ -11,11 +11,11 @@ You are a greeting assistant. Use execute_skill_script to run the say_hello scri
 `;
 
 const SAY_HELLO_CODE = `
-// ==CATTool==
+// ==SkillScript==
 // @name         say_hello
 // @description  Say hello to someone
 // @param        name string [required] Person's name
-// ==/CATTool==
+// ==/SkillScript==
 
 return "Hello, " + args.name + "! Welcome!";
 `.trim();

e2e/fixtures.ts

@@ -11,6 +11,15 @@ export const test = base.extend<{
     const context = await chromium.launchPersistentContext("", {
       headless: false,
       args: ["--headless=new", `--disable-extensions-except=${pathToExtension}`, `--load-extension=${pathToExtension}`],
+      ...(() => {
+        const proxy =
+          process.env.E2E_PROXY ||
+          process.env.https_proxy ||
+          process.env.http_proxy ||
+          process.env.HTTPS_PROXY ||
+          process.env.HTTP_PROXY;
+        return proxy ? { proxy: { server: proxy } } : {};
+      })(),
     });
     await use(context);
     await context.close();

example/agent/README.md

@@ -1,5 +1,5 @@
 # Agent 示例
 
-Agent 相关的 Skills、CATTools 和使用示例已迁移到独立仓库：
+Agent 相关的 Skills、Skill Scripts 和使用示例已迁移到独立仓库：
 
 - **GitHub**: https://github.com/scriptscat/skills

src/app/service/agent/skill_script_executor.test.ts

@@ -18,9 +18,9 @@ function createRecord(
     description: "测试工具",
     params,
     grants: [],
-    code: `// ==CATTool==
+    code: `// ==SkillScript==
 // @name test_tool
-// ==/CATTool==
+// ==/SkillScript==
 return args.value;`,
     installtime: Date.now(),
     updatetime: Date.now(),
@@ -132,9 +132,9 @@ describe("SkillScriptExecutor", () => {
       description: "查天气",
       params: [],
       grants: ["GM.xmlHttpRequest"],
-      code: `// ==CATTool==
+      code: `// ==SkillScript==
 // @name weather
-// ==/CATTool==
+// ==/SkillScript==
 const result = await GM.xmlHttpRequest({url: "http://example.com"});
 return result;`,
       installtime: 1,
@@ -147,7 +147,7 @@ return result;`,
     const params = getCallParams(sender);
     expect(params.grants).toEqual(["GM.xmlHttpRequest"]);
     expect(params.name).toBe("weather");
-    expect(params.code).not.toContain("==CATTool==");
+    expect(params.code).not.toContain("==SkillScript==");
   });
 
   it("应处理多个混合类型参数", async () => {
@@ -164,15 +164,15 @@ return result;`,
     expect(getCallParams(sender).args).toEqual({ city: "上海", days: 7, detailed: true });
   });
 
-  it("应生成 cattool- 前缀的 UUID", async () => {
+  it("应生成 skillscript- 前缀的 UUID", async () => {
     const sender = createMockSender();
     const record = createRecord();
     const executor = new SkillScriptExecutor(record, sender);
 
     await executor.execute({});
 
     const params = getCallParams(sender);
-    expect(params.uuid).toMatch(/^cattool-/);
+    expect(params.uuid).toMatch(/^skillscript-/);
     expect(params.uuid.length).toBeGreaterThan(SKILL_SCRIPT_UUID_PREFIX.length);
   });
 
@@ -235,7 +235,7 @@ return result;`,
 
 describe("getSkillScriptNameByUuid", () => {
   it("未注册的 UUID 应返回空字符串", () => {
-    expect(getSkillScriptNameByUuid("cattool-unknown-uuid")).toBe("");
+    expect(getSkillScriptNameByUuid("skillscript-unknown-uuid")).toBe("");
   });
 
   it("空字符串应返回空字符串", () => {
@@ -245,7 +245,7 @@ describe("getSkillScriptNameByUuid", () => {
 
 describe("getSkillScriptGrantsByUuid", () => {
   it("未注册的 UUID 应返回空数组", () => {
-    expect(getSkillScriptGrantsByUuid("cattool-unknown-uuid")).toEqual([]);
+    expect(getSkillScriptGrantsByUuid("skillscript-unknown-uuid")).toEqual([]);
   });
 
   it("执行期间应能通过 UUID 获取 grants", async () => {
@@ -287,8 +287,8 @@ describe("getSkillScriptGrantsByUuid", () => {
 });
 
 describe("SKILL_SCRIPT_UUID_PREFIX", () => {
-  it("应为 'cattool-'", () => {
-    expect(SKILL_SCRIPT_UUID_PREFIX).toBe("cattool-");
+  it("应为 'skillscript-'", () => {
+    expect(SKILL_SCRIPT_UUID_PREFIX).toBe("skillscript-");
   });
 });
 
@@ -525,7 +525,7 @@ describe("SkillScriptExecutor 超时处理", () => {
     await vi.advanceTimersByTimeAsync(30_000);
     await execPromise;
 
-    expect(capturedUuid).toMatch(/^cattool-/);
+    expect(capturedUuid).toMatch(/^skillscript-/);
     expect(getSkillScriptNameByUuid(capturedUuid)).toBe("");
   });
 

src/app/service/agent/skill_script_executor.ts

@@ -6,7 +6,7 @@ import { executeSkillScript } from "@App/app/service/offscreen/client";
 import { uuidv4 } from "@App/pkg/utils/uuid";
 
 // Skill Script UUID 前缀，用于在 GM API 请求中识别 Skill Script
-export const SKILL_SCRIPT_UUID_PREFIX = "cattool-";
+export const SKILL_SCRIPT_UUID_PREFIX = "skillscript-";
 
 // Skill Script 默认超时（ms）
 const SKILL_SCRIPT_DEFAULT_TIMEOUT_MS = 30_000;

src/app/service/service_worker/agent.test.ts

@@ -59,11 +59,11 @@ function createTestService() {
   return { service, mockRepo, mockSkillRepo, mockModelRepo };
 }
 
-const VALID_CATTOOL_CODE = `// ==CATTool==
+const VALID_SKILLSCRIPT_CODE = `// ==SkillScript==
 // @name test-tool
 // @description A test tool
 // @param {string} input - The input
-// ==/CATTool==
+// ==/SkillScript==
 module.exports = async function(params) { return params.input; }`;
 
 // ---- Skill 系统测试 ----
@@ -431,7 +431,7 @@ You are a full-featured skill.`;
       const scripts = [
         {
           name: "my-tool",
-          code: VALID_CATTOOL_CODE,
+          code: VALID_SKILLSCRIPT_CODE,
         },
       ];
 
@@ -495,7 +495,7 @@ description: Has invalid script
 ---
 Some prompt.`;
 
-      await expect(service.installSkill(skillMd, [{ name: "bad-tool", code: "not a cattool" }])).rejects.toThrow(
+      await expect(service.installSkill(skillMd, [{ name: "bad-tool", code: "not a skillscript" }])).rejects.toThrow(
         "Invalid SkillScript"
       );
     });
@@ -537,7 +537,7 @@ name: taobao-helper
 description: 淘宝购物助手
 ---
 你是一个淘宝购物助手。`,
-        scripts: [{ name: "taobao_extract.js", code: VALID_CATTOOL_CODE }],
+        scripts: [{ name: "taobao_extract.js", code: VALID_SKILLSCRIPT_CODE }],
         references: [
           { name: "api_docs.md", content: "# API Docs\n淘宝接口文档" },
           { name: "guide.txt", content: "使用指南" },
@@ -549,7 +549,7 @@ description: 淘宝购物助手
       expect(record.name).toBe("taobao-helper");
       expect(record.description).toBe("淘宝购物助手");
       expect(record.prompt).toBe("你是一个淘宝购物助手。");
-      expect(record.toolNames).toEqual(["test-tool"]); // 脚本名称从 ==CATTool== metadata 中解析
+      expect(record.toolNames).toEqual(["test-tool"]); // 脚本名称从 ==SkillScript== metadata 中解析
       expect(record.referenceNames).toEqual(["api_docs.md", "guide.txt"]);
 
       // 验证 saveSkill 调用参数
@@ -569,17 +569,17 @@ description: 淘宝购物助手
     it("ZIP 结果中多个脚本应全部安装", async () => {
       const { service, mockSkillRepo } = createTestService();
 
-      const anotherToolCode = `// ==CATTool==
+      const anotherToolCode = `// ==SkillScript==
 // @name another-tool
 // @description Another tool
 // @param {string} query - Search query
-// ==/CATTool==
+// ==/SkillScript==
 return query;`;
 
       const record = await service.installSkill(
         `---\nname: multi-tool\ndescription: Multi tools skill\n---\nMulti tool prompt.`,
         [
-          { name: "tool1.js", code: VALID_CATTOOL_CODE },
+          { name: "tool1.js", code: VALID_SKILLSCRIPT_CODE },
           { name: "tool2.js", code: anotherToolCode },
         ],
         []
@@ -964,7 +964,7 @@ describe("classifyErrorCode", () => {
   });
 
   it("消息含 timed out 应分类为 tool_timeout", () => {
-    expect(classifyErrorCode(new Error('CATTool "foo" timed out after 30s'))).toBe("tool_timeout");
+    expect(classifyErrorCode(new Error('SkillScript "foo" timed out after 30s'))).toBe("tool_timeout");
   });
 
   it("errorCode 属性为 tool_timeout 应分类为 tool_timeout", () => {

src/app/service/service_worker/agent.ts

@@ -190,7 +190,7 @@ export class AgentService {
     if (!this.resourceService) return undefined;
     const rs = this.resourceService;
     return async (url: string) => {
-      const res = await rs.getResource("cattool-require", url, "require", false);
+      const res = await rs.getResource("skillscript-require", url, "require", false);
       return res?.content as string | undefined;
     };
   }
@@ -230,11 +230,11 @@ export class AgentService {
       for (const script of scripts) {
         const metadata = parseSkillScriptMetadata(script.code);
         if (!metadata) {
-          throw new Error(`Invalid SkillScript "${script.name}": missing ==CATTool== header`);
+          throw new Error(`Invalid SkillScript "${script.name}": missing ==SkillScript== header`);
         }
         // 下载并缓存 @require 资源
         if (metadata.requires.length > 0 && this.resourceService) {
-          const dummyUuid = "cattool-require";
+          const dummyUuid = "skillscript-require";
           await Promise.all(
             metadata.requires.map((url) => this.resourceService!.getResource(dummyUuid, url, "require", true))
           );

src/app/service/service_worker/script.ts

@@ -99,8 +99,8 @@ export class ScriptService {
         }
         // 处理url, 实现安装脚本
         let targetUrl: string;
-        // 判断是否为 file:///*/*.user.js 或 file:///*/*.cattool.js
-        if (req.url.startsWith("file://") && (req.url.endsWith(".user.js") || req.url.endsWith(".cattool.js"))) {
+        // 判断是否为 file:///*/*.user.js 或 file:///*/*.skill.js
+        if (req.url.startsWith("file://") && (req.url.endsWith(".user.js") || req.url.endsWith(".skill.js"))) {
           targetUrl = req.url;
         } else {
           const reqUrl = new URL(req.url);
@@ -167,7 +167,7 @@ export class ScriptService {
           { schemes: ["http", "https"], hostEquals: "docs.scriptcat.org", pathPrefix: "/en/docs/script_installation/" },
           { schemes: ["http", "https"], hostEquals: "www.tampermonkey.net", pathPrefix: "/script_installation.php" },
           { schemes: ["file"], pathSuffix: ".user.js" },
-          { schemes: ["file"], pathSuffix: ".cattool.js" },
+          { schemes: ["file"], pathSuffix: ".skill.js" },
         ],
       }
     );
@@ -252,9 +252,9 @@ export class ScriptService {
         isUrlFilterCaseSensitive: false,
         requestDomains: ["bitbucket.org"], // Chrome 101+
       },
-      // CATTool (.cattool.js) 安装检测
+      // SkillScript (.skill.js) 安装检测
       {
-        regexFilter: "^([^?#]+?\\.cattool\\.js)",
+        regexFilter: "^([^?#]+?\\.skill\\.js)",
         resourceTypes: [chrome.declarativeNetRequest.ResourceType.MAIN_FRAME],
         requestMethods: ["get" as chrome.declarativeNetRequest.RequestMethod],
         isUrlFilterCaseSensitive: false,
@@ -913,11 +913,11 @@ export class ScriptService {
       }
     }
     // 检测是否为 SkillScript
-    const cattoolMeta = parseSkillScriptMetadata(code);
-    if (cattoolMeta) {
+    const skillScriptMeta = parseSkillScriptMetadata(code);
+    if (skillScriptMeta) {
       const si = [
         false,
-        { uuid, code, url, source: upsertBy, metadata: {}, userSubscribe: false, cattool: true } as ScriptInfo,
+        { uuid, code, url, source: upsertBy, metadata: {}, userSubscribe: false, skillScript: true } as ScriptInfo,
         options,
       ];
       await cacheInstance.set(`${CACHE_KEY_SCRIPT_INFO}${uuid}`, si);

src/pages/components/layout/MainLayout.tsx

@@ -253,7 +253,7 @@ const MainLayout: React.FC<{
           if (!file.name || !file.size) {
             throw new Error("No Read Access Right for File");
           }
-          // 先检查内容，后弹出安装页面（支持 UserScript 和 CATTool）
+          // 先检查内容，后弹出安装页面（支持 UserScript 和 SkillScript）
           const checkOk = await Promise.allSettled([
             file.text().then((code) => {
               // 先尝试 UserScript 解析