✨ OPFS API 适配 postMessage 通道 & 修复 Blob 传输

- handleOPFSApi 根据 sender 判断通道类型：postMessage 直传 Blob，chrome.runtime 走 blobUrl 中转
- content script middleware 拦截 write Blob 转 blobUrl
- offscreen 新增 fetchBlob handler
- cat_agent_opfs 客户端兼容两种通道返回
- opfs_read Agent 工具一律返回 blobUrl，避免文件内容进入 LLM 上下文
- 移除 bloburl format，GM API read 只保留 text/blob
- saveAttachments 支持无 data 的附件引用（已保存的 imageBlock）
- tool_registry 添加错误日志输出

Author: CodFrm

src/app/repo/skill_repo.ts

@@ -82,16 +82,18 @@ export class SkillRepo extends OPFSRepo {
 
     // 更新 registry
     const registry = await this.readRegistry();
+    const idx = registry.findIndex((s) => s.name === record.name);
     const summary: SkillSummary = {
       name: record.name,
       description: record.description,
       toolNames: record.toolNames,
       referenceNames: record.referenceNames,
       ...(record.config && Object.keys(record.config).length > 0 ? { hasConfig: true } : {}),
+      // 保留已有的 enabled 状态
+      ...(idx >= 0 && registry[idx].enabled !== undefined ? { enabled: registry[idx].enabled } : {}),
       installtime: record.installtime,
       updatetime: record.updatetime,
     };
-    const idx = registry.findIndex((s) => s.name === record.name);
     if (idx >= 0) {
       registry[idx] = summary;
     } else {
@@ -156,6 +158,15 @@ export class SkillRepo extends OPFSRepo {
     }
   }
 
+  async setSkillEnabled(name: string, enabled: boolean): Promise<boolean> {
+    const registry = await this.readRegistry();
+    const idx = registry.findIndex((s) => s.name === name);
+    if (idx < 0) return false;
+    registry[idx].enabled = enabled;
+    await this.writeRegistry(registry);
+    return true;
+  }
+
   async getConfigValues(name: string): Promise<Record<string, unknown>> {
     try {
       const skillDir = await this.getSkillDir(name);

src/app/service/agent/content_utils.ts

@@ -16,6 +16,12 @@ const MIME_EXT_MAP: Record<string, string> = {
   "application/pdf": "pdf",
   "application/zip": "zip",
   "application/json": "json",
+  "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "xlsx",
+  "application/vnd.ms-excel": "xls",
+  "application/vnd.openxmlformats-officedocument.wordprocessingml.document": "docx",
+  "application/msword": "doc",
+  "application/vnd.openxmlformats-officedocument.presentationml.presentation": "pptx",
+  "application/vnd.ms-powerpoint": "ppt",
   "text/plain": "txt",
   "text/html": "html",
   "text/csv": "csv",

src/app/service/agent/system_prompt.ts

@@ -62,10 +62,10 @@ For **complex, multi-step tasks**, use task tools to track your progress:
 
 ## Binary File Workflow
 
-OPFS workspace stores files persistently. Binary files (images, PDFs, etc.) should stay as file references — never put large binary data in your messages.
+OPFS workspace stores files persistently. \`opfs_read\` always returns a blob URL — file content is never loaded into the conversation context.
 
 **Save**: screenshot with \`saveTo\` / SkillScript \`fetch()\` → \`CAT.agent.opfs.write(blob)\` → returns path
-**Use**: \`opfs_read(path, format='bloburl')\` → returns \`blob:chrome-extension://\` URL → pass to \`execute_script(target='page', world='ISOLATED')\` which can \`fetch()\` the blob URL and manipulate page DOM
+**Use**: \`opfs_read(path)\` → returns \`blob:chrome-extension://\` URL → pass to \`execute_script(target='page', world='ISOLATED')\` which can \`fetch()\` the blob URL and manipulate page DOM
 **Note**: Blob URLs are scoped to the extension origin. Only ISOLATED world (or Offscreen) can access them — MAIN world cannot.`;
 
 // Skill 摘要提示词模板

src/app/service/agent/tool_registry.ts

@@ -91,6 +91,7 @@ export class ToolRegistry {
             return { id: tc.id, result: typeof rawResult === "string" ? rawResult : JSON.stringify(rawResult) };
           }
         } catch (e: any) {
+          console.error(`[ToolRegistry] builtin tool "${tc.name}" execution failed:`, e);
           return { id: tc.id, result: JSON.stringify({ error: e.message || "Tool execution failed" }) };
         }
       })
@@ -132,6 +133,19 @@ export class ToolRegistry {
 
     const attachments: Attachment[] = [];
     for (const ad of attachmentDataList) {
+      if (!ad.data) {
+        // 无 data 的附件是已保存的引用（如 skill script 返回的 imageBlock），直接透传元数据
+        if ("attachmentId" in ad && (ad as any).attachmentId) {
+          attachments.push({
+            id: (ad as any).attachmentId,
+            type: ad.type,
+            name: ad.name,
+            mimeType: ad.mimeType,
+            size: (ad as any).size,
+          });
+        }
+        continue;
+      }
       const ext = getExtFromMime(ad.mimeType);
       const id = `${uuidv4()}.${ext}`;
       const size = await this.chatRepo.saveAttachment(id, ad.data);

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

@@ -30,17 +30,11 @@ const OPFS_WRITE_DEFINITION: ToolDefinition = {
 const OPFS_READ_DEFINITION: ToolDefinition = {
   name: "opfs_read",
   description:
-    "Read a file from the workspace. For text files returns content. For binary files use format='bloburl' to get a blob URL usable in executeScript (ISOLATED world).",
+    "Read a file from the workspace. Returns a blob URL (blob:chrome-extension://...) that can be used in executeScript (ISOLATED world) for download, display, or further processing. Never returns file content directly to avoid context overflow.",
   parameters: {
     type: "object",
     properties: {
       path: { type: "string", description: "File path relative to workspace root" },
-      format: {
-        type: "string",
-        enum: ["text", "bloburl"],
-        description:
-          "Output format: 'text' (default) returns file content as string; 'bloburl' returns a blob:chrome-extension:// URL for binary files (usable in executeScript ISOLATED world)",
-      },
     },
     required: ["path"],
   },
@@ -119,27 +113,22 @@ export function createOPFSTools(): {
     execute: async (args: Record<string, unknown>) => {
       const safePath = sanitizePath(args.path as string);
       if (!safePath) throw new Error("path is required");
-      const format = (args.format as string) || "text";
+
+      if (!createBlobUrlFn) {
+        throw new Error("Blob URL creation not available (Offscreen not initialized)");
+      }
 
       const workspace = await getWorkspaceRoot();
       const { dirPath, fileName } = splitPath(safePath);
       const dir = dirPath ? await getDirectory(workspace, dirPath) : workspace;
       const fileHandle = await dir.getFileHandle(fileName);
       const file = await fileHandle.getFile();
 
-      if (format === "bloburl") {
-        if (!createBlobUrlFn) {
-          throw new Error("Blob URL creation not available (Offscreen not initialized)");
-        }
-        const arrayBuffer = await file.arrayBuffer();
-        const mimeType = guessMimeType(safePath);
-        const blobUrl = await createBlobUrlFn(arrayBuffer, mimeType);
-        return JSON.stringify({ path: safePath, blobUrl, size: file.size, mimeType });
-      }
-
-      // 默认 text 模式
-      const content = await file.text();
-      return JSON.stringify({ path: safePath, content, size: file.size });
+      // 一律返回 blob URL，避免文件内容进入 LLM 上下文
+      const arrayBuffer = await file.arrayBuffer();
+      const mimeType = guessMimeType(safePath);
+      const blobUrl = await createBlobUrlFn(arrayBuffer, mimeType);
+      return JSON.stringify({ path: safePath, blobUrl, size: file.size, mimeType });
     },
   };
 

src/app/service/agent/types.ts

@@ -244,6 +244,7 @@ export type SkillSummary = {
   toolNames: string[]; // 随 Skill 打包的脚本名称（scripts/ 目录下）
   referenceNames: string[]; // 参考资料名称（references/ 目录下）
   hasConfig?: boolean; // 是否有 config 字段声明
+  enabled?: boolean; // 是否启用，默认 true（undefined 视为 true）
   installtime: number;
   updatetime: number;
 };

src/app/service/content/gm_api/cat_agent_opfs.test.ts

@@ -94,11 +94,56 @@ describe.concurrent("CATAgentOPFSApi", () => {
     ]);
   });
 
-  it.concurrent("readAttachment 发送请求并通过 CAT_fetchBlob 将 blobUrl 转换为 Blob", async () => {
+  // ---- postMessage 通道：SW 直接返回 Blob ----
+
+  it.concurrent("readAttachment postMessage 通道直接返回 Blob", async () => {
+    const testBlob = new Blob(["image data"], { type: "image/png" });
+    const mockSendMessage = vi.fn().mockResolvedValue({
+      id: "att-1",
+      data: testBlob,
+      size: 10,
+      mimeType: "image/png",
+    });
+    const ctx = { sendMessage: mockSendMessage, scriptRes: { uuid: "test-uuid" } };
+
+    const apis = GMContextApiGet("CAT.agent.opfs")!;
+    const readAttachmentApi = apis.find((a) => a.fnKey === "CAT.agent.opfs.readAttachment")!;
+    const result = await readAttachmentApi.api.call(ctx, "att-1");
+
+    expect(mockSendMessage).toHaveBeenCalledTimes(1);
+    expect((result as any).data).toBe(testBlob);
+  });
+
+  it.concurrent("read blob postMessage 通道直接返回 Blob", async () => {
+    const testBlob = new Blob(["file data"], { type: "image/png" });
+    const mockSendMessage = vi.fn().mockResolvedValue({
+      path: "img.png",
+      data: testBlob,
+      size: 9,
+      mimeType: "image/png",
+    });
+    const ctx = { sendMessage: mockSendMessage, scriptRes: { uuid: "test-uuid" } };
+
+    const apis = GMContextApiGet("CAT.agent.opfs")!;
+    const readApi = apis.find((a) => a.fnKey === "CAT.agent.opfs.read")!;
+    const result = await readApi.api.call(ctx, "img.png", "blob");
+
+    expect(mockSendMessage).toHaveBeenCalledTimes(1);
+    expect((result as any).data).toBe(testBlob);
+  });
+
+  // ---- chrome.runtime 通道：SW 返回 blobUrl，客户端 CAT_fetchBlob 还原 ----
+
+  it.concurrent("readAttachment chrome.runtime 通道通过 CAT_fetchBlob 还原 Blob", async () => {
     const testBlob = new Blob(["image data"], { type: "image/png" });
     const mockSendMessage = vi.fn().mockImplementation((api: string) => {
       if (api === "CAT_agentOPFS") {
-        return Promise.resolve({ id: "att-1", blobUrl: "blob:chrome-extension://test/123", size: 10, mimeType: "image/png" });
+        return Promise.resolve({
+          id: "att-1",
+          blobUrl: "blob:chrome-extension://test/123",
+          size: 10,
+          mimeType: "image/png",
+        });
       }
       if (api === "CAT_fetchBlob") {
         return Promise.resolve(testBlob);
@@ -111,22 +156,21 @@ describe.concurrent("CATAgentOPFSApi", () => {
     const readAttachmentApi = apis.find((a) => a.fnKey === "CAT.agent.opfs.readAttachment")!;
     const result = await readAttachmentApi.api.call(ctx, "att-1");
 
-    // 第一次调用：请求 readAttachment
-    expect(mockSendMessage).toHaveBeenCalledWith("CAT_agentOPFS", [
-      { action: "readAttachment", id: "att-1", scriptUuid: "test-uuid" },
-    ]);
-    // 第二次调用：CAT_fetchBlob 转换 blobUrl → Blob
     expect(mockSendMessage).toHaveBeenCalledWith("CAT_fetchBlob", ["blob:chrome-extension://test/123"]);
-    // 结果应包含 data（Blob）而非 blobUrl
     expect((result as any).data).toBe(testBlob);
     expect((result as any).blobUrl).toBeUndefined();
   });
 
-  it.concurrent("read blob 格式通过 CAT_fetchBlob 将 blobUrl 转换为 Blob", async () => {
+  it.concurrent("read blob chrome.runtime 通道通过 CAT_fetchBlob 还原 Blob", async () => {
     const testBlob = new Blob(["file data"], { type: "image/png" });
     const mockSendMessage = vi.fn().mockImplementation((api: string) => {
       if (api === "CAT_agentOPFS") {
-        return Promise.resolve({ path: "img.png", blobUrl: "blob:chrome-extension://test/456", size: 9, mimeType: "image/png" });
+        return Promise.resolve({
+          path: "img.png",
+          blobUrl: "blob:chrome-extension://test/456",
+          size: 9,
+          mimeType: "image/png",
+        });
       }
       if (api === "CAT_fetchBlob") {
         return Promise.resolve(testBlob);
@@ -143,16 +187,4 @@ describe.concurrent("CATAgentOPFSApi", () => {
     expect((result as any).data).toBe(testBlob);
     expect((result as any).blobUrl).toBeUndefined();
   });
-
-  it.concurrent("read text 格式不调用 CAT_fetchBlob", async () => {
-    const mockSendMessage = vi.fn().mockResolvedValue({ path: "f.txt", content: "hello", size: 5 });
-    const ctx = { sendMessage: mockSendMessage, scriptRes: { uuid: "test-uuid" } };
-
-    const apis = GMContextApiGet("CAT.agent.opfs")!;
-    const readApi = apis.find((a) => a.fnKey === "CAT.agent.opfs.read")!;
-    await readApi.api.call(ctx, "f.txt", "text");
-
-    expect(mockSendMessage).toHaveBeenCalledTimes(1);
-    expect(mockSendMessage).toHaveBeenCalledWith("CAT_agentOPFS", expect.anything());
-  });
 });

src/app/service/content/gm_api/cat_agent_opfs.ts

@@ -3,10 +3,7 @@ import GMContext from "./gm_context";
 
 // 运行时 this 是 GM_Base 实例
 interface GMBaseContext {
-  sendMessage: (
-    api: string,
-    params: any[]
-  ) => Promise<any>;
+  sendMessage: (api: string, params: any[]) => Promise<any>;
   scriptRes?: { uuid: string };
 }
 
@@ -30,14 +27,14 @@ export default class CATAgentOPFSApi {
   @GMContext.API({ follow: "CAT.agent.opfs" })
   public async "CAT.agent.opfs.read"(
     path: string,
-    format?: "text" | "bloburl" | "blob"
-  ): Promise<{ path: string; content?: string; blobUrl?: string; data?: Blob; size: number; mimeType?: string }> {
+    format?: "text" | "blob"
+  ): Promise<{ path: string; content?: string; data?: Blob; size: number; mimeType?: string }> {
     const ctx = this as unknown as GMBaseContext;
     const result = await ctx.sendMessage("CAT_agentOPFS", [
       { action: "read", path, format, scriptUuid: ctx.scriptRes?.uuid || "" } as OPFSApiRequest,
     ]);
-    // blob 格式：SW 返回 blobUrl，通过 CAT_fetchBlob 在 extension-origin 上下文中转换为 Blob
-    if (format === "blob" && result.blobUrl) {
+    // blob 格式：postMessage 通道直接返回 Blob；chrome.runtime 通道返回 blobUrl 需转换
+    if (format === "blob" && !(result.data instanceof Blob) && result.blobUrl) {
       result.data = await ctx.sendMessage("CAT_fetchBlob", [result.blobUrl]);
       delete result.blobUrl;
     }
@@ -60,9 +57,8 @@ export default class CATAgentOPFSApi {
     const result = await ctx.sendMessage("CAT_agentOPFS", [
       { action: "readAttachment", id, scriptUuid: ctx.scriptRes?.uuid || "" } as OPFSApiRequest,
     ]);
-    // SW 返回 blobUrl（chrome.runtime sendResponse 不支持 Blob），
-    // 通过 CAT_fetchBlob 在 extension-origin 上下文（offscreen/content script）中转换为 Blob
-    if (result.blobUrl) {
+    // postMessage 通道直接返回 Blob；chrome.runtime 通道返回 blobUrl 需转换
+    if (!(result.data instanceof Blob) && result.blobUrl) {
       result.data = await ctx.sendMessage("CAT_fetchBlob", [result.blobUrl]);
       delete result.blobUrl;
     }

src/app/service/content/scripting.ts

@@ -79,6 +79,14 @@ export default class ScriptingRuntime {
           case "CAT_fetchBlob": {
             return fetch(data.params[0]).then((res) => res.blob());
           }
+          case "CAT_agentOPFS": {
+            // chrome.runtime 不支持 Blob，write 操作的 Blob content 需先转为 blob URL
+            const req = data.params[0];
+            if (req?.action === "write" && req.content instanceof Blob) {
+              req.content = makeBlobURL({ blob: req.content, persistence: true }) as string;
+            }
+            return false; // 继续转发到 SW
+          }
           case "CAT_fetchDocument": {
             const [url, isContent] = data.params;
             // 根据来源选择不同的消息桥（content / inject）

src/app/service/offscreen/index.ts

@@ -69,5 +69,11 @@ export class OffscreenManager {
     this.windowServer.on("createObjectURL", async (params: { blob: Blob; persistence: boolean }) => {
       return makeBlobURL(params) as string;
     });
+
+    // fetch blob URL 并返回 Blob（供 SW 在 chrome.runtime 通道下还原 content script 创建的 blob URL）
+    this.windowServer.on("fetchBlob", async (params: { url: string }) => {
+      const res = await fetch(params.url);
+      return await res.blob();
+    });
   }
 }