From 39905cea2bb9459ee8ed8c905514890444ae6409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Tue, 11 Aug 2026 12:15:46 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=8F=AF=E7=94=A8=E6=80=A7=E4=B8=8E=20popup=20=E7=AB=99?=
 =?UTF-8?q?=E7=82=B9=E6=93=8D=E4=BD=9C=E5=8F=8D=E9=A6=88=EF=BC=88#1590=20?=
 =?UTF-8?q?=E5=89=8D=E7=BD=AE=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ScriptEditor/tabs/SettingsPane.test.tsx   | 21 +++++++
 .../routes/ScriptEditor/tabs/SettingsPane.tsx |  4 +-
 src/pages/popup/usePopupData.test.ts          | 63 ++++++++++++++++++-
 src/pages/popup/usePopupData.ts               |  8 ++-
 4 files changed, 93 insertions(+), 3 deletions(-)

diff --git a/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.test.tsx b/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.test.tsx
index 3b98ef8b0..3ca32afc7 100644
--- a/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.test.tsx
+++ b/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.test.tsx
@@ -324,6 +324,27 @@ describe("SettingsPane 网站匹配/排除", () => {
     expect(screen.queryByText("*://exclude.com/*")).toBeNull();
   });
 
+  it("清空匹配规则后重置按钮应可用并可恢复脚本自带规则", async () => {
+    // 脚本自带 @match 但无用户覆盖；删除最后一项后是显式空覆盖，重置应可撤销它并恢复自带规则
+    fetchScript.mockResolvedValue({
+      ...sampleScript(),
+      selfMetadata: { exclude: ["*://exclude.com/*"] },
+    });
+    render(<SettingsPane uuid="u1" />);
+    await screen.findByText("*://script.com/*");
+    fireEvent.click(screen.getByLabelText(`${t("delete")} *://script.com/*`));
+    fireEvent.click(screen.getByText(t("confirm"), { selector: "button" }));
+    expect(screen.queryByText("*://script.com/*")).toBeNull();
+    // 存在可撤销的空覆盖，重置按钮不应被禁用
+    const resetBtn = screen.getAllByText(t("reset"), { selector: "button" })[0];
+    expect(resetBtn).not.toBeDisabled();
+    // 点击重置应撤销空覆盖、恢复脚本自带规则
+    fireEvent.click(resetBtn);
+    fireEvent.click(screen.getByText(t("confirm"), { selector: "button" }));
+    expect(resetMatch).toHaveBeenCalledWith("u1", undefined);
+    expect(screen.getByText("*://script.com/*")).toBeInTheDocument();
+  });
+
   it("删除最后一项匹配应显式清空覆盖而非复活脚本自带规则", async () => {
     fetchScript.mockResolvedValue({
       ...sampleScript(),
diff --git a/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.tsx b/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.tsx
index ef3bbe9eb..7e1195b1b 100644
--- a/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.tsx
+++ b/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.tsx
@@ -380,11 +380,13 @@ function SettingsPaneContent({ uuid, data }: SettingsPaneProps & { data: Setting
               cancelText={t("editor:cancel")}
               onConfirm={() => setMatchList(kind, undefined)}
             >
+              {/* 重置即撤销用户覆盖（回落脚本自带 metadata）；无覆盖时禁用，而非按列表为空判断——
+                  用户删空匹配/排除后是显式空覆盖，仍应能重置恢复自带规则 */}
               <Button
                 size="sm"
                 variant="ghost"
                 className="text-warning hover:bg-warning/10 hover:text-warning"
-                disabled={list.length === 0}
+                disabled={self[kind] === undefined}
               >
                 <RotateCcw className="size-3.5" />
                 {t("reset")}
diff --git a/src/pages/popup/usePopupData.test.ts b/src/pages/popup/usePopupData.test.ts
index 572284eb3..43a6d3564 100644
--- a/src/pages/popup/usePopupData.test.ts
+++ b/src/pages/popup/usePopupData.test.ts
@@ -1,5 +1,8 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { describe, it, expect, vi, beforeEach, afterEach, beforeAll } from "vitest";
 import { renderHook, act } from "@testing-library/react";
+import { notify } from "@App/pages/components/ui/toast";
+import { t } from "@App/locales/locales";
+import { initTestLanguage } from "@Tests/initTestLanguage";
 
 const popupInitialData = vi.hoisted(() => ({
   tabId: 7,
@@ -35,8 +38,36 @@ vi.mock("@App/pkg/utils/utils", async (importOriginal) => {
   return { ...actual, openInCurrentTab: vi.fn(async () => undefined), getCurrentTab: vi.fn(async () => undefined) };
 });
 
+// toast 反馈打桩：仅验证「成功才调用 notify.success」的反馈逻辑
+const toastMocks = vi.hoisted(() => ({
+  success: vi.fn(),
+  info: vi.fn(),
+  warning: vi.fn(),
+  error: vi.fn(),
+  loading: vi.fn(),
+  promise: vi.fn(),
+  dismiss: vi.fn(),
+}));
+
+vi.mock("@App/pages/components/ui/toast", () => ({ notify: toastMocks }));
+
+// 站点范围快捷操作走真实 ScriptClient 实例，仅替换 onlyRunOnUrl，其余实导出与方法保留
+const mockOnlyRunOnUrl = vi.hoisted(() => vi.fn(async () => true));
+
+vi.mock("../store/features/script", async (importOriginal) => {
+  const actual = await importOriginal<typeof ScriptStore>();
+  return {
+    ...actual,
+    scriptClient: Object.assign(Object.create(actual.scriptClient), { onlyRunOnUrl: mockOnlyRunOnUrl }),
+  };
+});
+
 import { openInCurrentTab } from "@App/pkg/utils/utils";
 import { getMoreScriptUrl, usePopupData } from "./usePopupData";
+import type * as ScriptStore from "../store/features/script";
+
+// usePopupData 内部使用 useTranslation()，需先初始化 i18n 才能正确渲染与取本地化文案
+beforeAll(() => initTestLanguage("zh-CN"));
 
 describe("getMoreScriptUrl 获取更多脚本链接", () => {
   it("ScriptCat：有 host 时带 domain 参数", () => {
@@ -188,3 +219,33 @@ describe("usePopupData 脚本列表展开数量", () => {
     expect(result.current.showSearch).toBe(true);
   });
 });
+
+describe("usePopupData 站点范围快捷操作", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mockOnlyRunOnUrl.mockResolvedValue(true);
+  });
+
+  it("仅在 xxx 执行：成功后乐观更新本地列表并弹出成功提示", async () => {
+    const { result } = renderHook(() => usePopupData());
+    await act(async () => {
+      await result.current.handleOnlyRunOnUrl("script-1");
+    });
+
+    expect(mockOnlyRunOnUrl).toHaveBeenCalledWith("script-1", "*://example.com/*");
+    expect(result.current.scriptList[0]?.isEffective).toBe(true);
+    expect(notify.success).toHaveBeenCalledTimes(1);
+    expect(notify.success).toHaveBeenCalledWith(t("update_success"));
+  });
+
+  it("仅在 xxx 执行：失败时不弹成功提示，并记录错误信息", async () => {
+    mockOnlyRunOnUrl.mockRejectedValue(new Error("mock failure"));
+    const { result } = renderHook(() => usePopupData());
+    await act(async () => {
+      await result.current.handleOnlyRunOnUrl("script-1");
+    });
+
+    expect(notify.success).not.toHaveBeenCalled();
+    expect(result.current.errorMessage).toBe("Error: mock failure");
+  });
+});
diff --git a/src/pages/popup/usePopupData.ts b/src/pages/popup/usePopupData.ts
index 017ca105e..90c710af5 100644
--- a/src/pages/popup/usePopupData.ts
+++ b/src/pages/popup/usePopupData.ts
@@ -1,4 +1,5 @@
 import { useState, useEffect, useCallback, useRef, useMemo } from "react";
+import { useTranslation } from "react-i18next";
 import type { ScriptMenu, ScriptMenuItem, TPopupScript } from "@App/app/service/service_worker/types";
 import type { TDeleteScript, TEnableScript, TScriptRunStatus } from "@App/app/service/queue";
 import { popupClient, scriptClient, runtimeClient, requestOpenBatchUpdatePage } from "../store/features/script";
@@ -8,6 +9,7 @@ import { ExtVersion, ExtServer } from "@App/app/const";
 import { sanitizeHTML } from "@App/pkg/utils/sanitize";
 import { openInCurrentTab } from "@App/pkg/utils/utils";
 import { cacheInstance } from "@App/app/cache";
+import { notify } from "@App/pages/components/ui/toast";
 import { scriptListSorter, type ScriptProvider, usePopupDataQuery } from "./preload";
 export { ExtVersion } from "@App/app/const";
 export { VersionCompare, versionCompare } from "@App/pkg/utils/semver";
@@ -78,6 +80,7 @@ function filterScripts(list: ScriptMenu[], query: string): ScriptMenu[] {
 // ========== Hook ==========
 
 export function usePopupData() {
+  const { t } = useTranslation();
   const popupData = usePopupDataQuery();
   const initialData = popupData.data;
   const [initialized, setInitialized] = useState(!!initialData);
@@ -286,11 +289,14 @@ export function usePopupData() {
       if (!host) return;
       try {
         await scriptClient.onlyRunOnUrl(uuid, `*://${host}/*`);
+        // 与 handleAllowUrl 一致：成功后乐观更新本地列表，并给出 toast 反馈（Toaster 已由 main.tsx 挂载）
+        setScriptList((prev) => prev.map((s) => (s.uuid === uuid ? { ...s, isEffective: true } : s)));
+        notify.success(t("update_success"));
       } catch (e) {
         showError(String(e));
       }
     },
-    [showError]
+    [showError, t]
   );
 
   const handleAllowUrl = useCallback(

From aef412965ec540d30d1bbce81a8bfcc60d343c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Tue, 11 Aug 2026 12:31:20 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E2=9C=A8=20=E5=90=8E=E7=AB=AF=EF=BC=9A?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9=E4=BA=92=E6=96=A5=E6=8E=92=E9=99=A4/?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB=E8=AF=AD=E4=B9=89=EF=BC=8CallowUrl=20?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=8A=98=E5=8F=A0=E4=BD=9C=E8=80=85=20@exclu?=
 =?UTF-8?q?de?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/service/service_worker/client.ts      |   4 +
 src/app/service/service_worker/script.test.ts | 108 +++++++++++++++++-
 src/app/service/service_worker/script.ts      |  24 +++-
 3 files changed, 133 insertions(+), 3 deletions(-)

diff --git a/src/app/service/service_worker/client.ts b/src/app/service/service_worker/client.ts
index 37946ed63..f770d7e0d 100644
--- a/src/app/service/service_worker/client.ts
+++ b/src/app/service/service_worker/client.ts
@@ -108,6 +108,10 @@ export class ScriptClient extends Client {
     return this.do("allowUrl", { uuid, matchPattern, excludePattern });
   }
 
+  excludeFromMatch(uuid: string, matchPattern: string) {
+    return this.do("excludeFromMatch", { uuid, matchPattern });
+  }
+
   // 重置匹配项
   resetMatch(uuid: string, match: string[] | undefined) {
     return this.do("resetMatch", { uuid, match });
diff --git a/src/app/service/service_worker/script.test.ts b/src/app/service/service_worker/script.test.ts
index e35c2ba6c..5fdac069c 100644
--- a/src/app/service/service_worker/script.test.ts
+++ b/src/app/service/service_worker/script.test.ts
@@ -17,6 +17,8 @@ import type { TDeleteScript, TInstallScript } from "@App/app/service/queue";
 import { createMockOPFS } from "@App/app/repo/test-helpers";
 import type { Group } from "@Packages/message/server";
 import type { IMessageQueue } from "@Packages/message/message_queue";
+import type { MessageSend } from "@Packages/message/types";
+import { ScriptClient } from "./client";
 
 initTestEnv();
 
@@ -578,6 +580,20 @@ describe("ScriptService.deleteScripts —— 回收站关闭时直接销毁", ()
  * selfMetadata 是「用户对脚本自带 @metadata 的覆盖」。
  * undefined 表示撤销覆盖(生效值回落脚本自带 metadata)，空数组表示用户显式清空，两者语义不同。
  */
+describe("ScriptClient 站点范围消息", () => {
+  it("排除已匹配站点时应发送对应操作与站点规则", async () => {
+    const sendMessage = vi.fn().mockResolvedValue({ data: true });
+    const client = new ScriptClient({ sendMessage } as unknown as MessageSend);
+
+    await client.excludeFromMatch("script-uuid", "*://current.example/*");
+
+    expect(sendMessage).toHaveBeenCalledWith({
+      action: "serviceWorker/script/excludeFromMatch",
+      data: { uuid: "script-uuid", matchPattern: "*://current.example/*" },
+    });
+  });
+});
+
 describe("ScriptService selfMetadata 用户覆盖", () => {
   let scriptService: ScriptService;
   let mockScriptDAO: ScriptDAO;
@@ -617,8 +633,13 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
       update: vi.fn().mockResolvedValue(true),
     } as any;
 
+    const mockSystemConfig = {
+      getCheckScriptUpdateCycle: vi.fn().mockResolvedValue(0),
+      addListener: vi.fn(),
+    } as unknown as SystemConfig;
+
     scriptService = new ScriptService(
-      {} as SystemConfig,
+      mockSystemConfig,
       mockGroup,
       mockMessageQueue,
       {} as ValueService,
@@ -659,6 +680,29 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
   });
 
   describe("popup 站点范围快捷操作", () => {
+    it("初始化时应注册排除已匹配站点操作", async () => {
+      const alarmsDescriptor = Object.getOwnPropertyDescriptor(chrome, "alarms");
+      Object.defineProperty(chrome, "alarms", {
+        configurable: true,
+        value: { clear: vi.fn().mockResolvedValue(false) },
+      });
+      const on = vi.spyOn(mockGroup, "on");
+      vi.spyOn(scriptService, "listenerScriptInstall").mockImplementation(() => {});
+
+      try {
+        scriptService.init();
+        await vi.waitFor(() => expect(chrome.alarms.clear).toHaveBeenCalledWith("checkScriptUpdate"));
+
+        expect(on).toHaveBeenCalledWith("excludeFromMatch", expect.any(Function));
+      } finally {
+        if (alarmsDescriptor) {
+          Object.defineProperty(chrome, "alarms", alarmsDescriptor);
+        } else {
+          Reflect.deleteProperty(chrome, "alarms");
+        }
+      }
+    });
+
     it("仅在当前站点执行应以当前站点替换用户匹配列表", async () => {
       const script = createMockScript({ selfMetadata: { match: ["*://old.example/*"] } });
       vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
@@ -698,6 +742,68 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
 
       expect(savedSelfMetadata()).toEqual({ exclude: [] });
     });
+
+    it("只有匹配覆盖而没有排除覆盖时应保留作者排除", async () => {
+      const script = createMockScript({
+        metadata: { exclude: ["*://current.example/*"] },
+        selfMetadata: { match: ["*://allowed.example/*"] },
+      });
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.allowUrl({
+        uuid: script.uuid,
+        matchPattern: "*://current.example/*",
+        excludePattern: "*://current.example/*",
+      });
+
+      expect(savedSelfMetadata()).toEqual({
+        match: ["*://allowed.example/*", "*://current.example/*"],
+      });
+    });
+
+    it("排除已包含站点时应移出用户匹配并加入用户排除", async () => {
+      const script = createMockScript({
+        selfMetadata: {
+          match: ["*://allowed.example/*", "*://current.example/*"],
+          exclude: ["*://blocked.example/*"],
+        },
+      });
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.excludeFromMatch({ uuid: script.uuid, matchPattern: "*://current.example/*" });
+
+      expect(savedSelfMetadata()).toEqual({
+        match: ["*://allowed.example/*"],
+        exclude: ["*://blocked.example/*", "*://current.example/*"],
+      });
+    });
+
+    it("排除最后一个用户匹配时应保留显式空匹配覆盖", async () => {
+      const script = createMockScript({ selfMetadata: { match: ["*://current.example/*"] } });
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.excludeFromMatch({ uuid: script.uuid, matchPattern: "*://current.example/*" });
+
+      expect(savedSelfMetadata()).toEqual({ match: [], exclude: ["*://current.example/*"] });
+    });
+
+    it("没有用户匹配覆盖时排除站点不应创建匹配覆盖", async () => {
+      const script = createMockScript();
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.excludeFromMatch({ uuid: script.uuid, matchPattern: "*://current.example/*" });
+
+      expect(savedSelfMetadata()).toEqual({ exclude: ["*://current.example/*"] });
+    });
+
+    it("已有空匹配覆盖时排除站点应保留空覆盖", async () => {
+      const script = createMockScript({ selfMetadata: { match: [] } });
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.excludeFromMatch({ uuid: script.uuid, matchPattern: "*://current.example/*" });
+
+      expect(savedSelfMetadata()).toEqual({ match: [], exclude: ["*://current.example/*"] });
+    });
   });
 
   describe("resetMatch / resetExclude - 编辑器匹配列表", () => {
diff --git a/src/app/service/service_worker/script.ts b/src/app/service/service_worker/script.ts
index 726157eea..b0a8f0198 100644
--- a/src/app/service/service_worker/script.ts
+++ b/src/app/service/service_worker/script.ts
@@ -943,8 +943,27 @@ export class ScriptService {
     if (script.selfMetadata?.match !== undefined) {
       script = selfMetadataUpdate(script, "match", new Set([...script.selfMetadata.match, matchPattern]));
     }
-    const excludeSet = new Set(script.selfMetadata?.exclude || script.metadata?.exclude || []);
-    excludeSet.delete(excludePattern);
+    if (script.selfMetadata?.exclude !== undefined) {
+      const excludeSet = new Set(script.selfMetadata.exclude);
+      excludeSet.delete(excludePattern);
+      script = selfMetadataUpdate(script, "exclude", excludeSet);
+    }
+    return this.scriptDAO.update(uuid, script).then(() => {
+      this.publishInstallScript(script, { update: true });
+      return true;
+    });
+  }
+
+  async excludeFromMatch({ uuid, matchPattern }: { uuid: string; matchPattern: string }) {
+    let script = await this.scriptDAO.get(uuid);
+    if (!script) throw new Error("script not found");
+    if (script.selfMetadata?.match !== undefined) {
+      const matchSet = new Set(script.selfMetadata.match);
+      matchSet.delete(matchPattern);
+      script = selfMetadataUpdate(script, "match", matchSet);
+    }
+    const excludeSet = new Set(script.selfMetadata?.exclude || []);
+    excludeSet.add(matchPattern);
     script = selfMetadataUpdate(script, "exclude", excludeSet);
     return this.scriptDAO.update(uuid, script).then(() => {
       this.publishInstallScript(script, { update: true });
@@ -1701,6 +1720,7 @@ export class ScriptService {
     this.group.on("excludeUrl", this.excludeUrl.bind(this));
     this.group.on("onlyRunOnUrl", this.onlyRunOnUrl.bind(this));
     this.group.on("allowUrl", this.allowUrl.bind(this));
+    this.group.on("excludeFromMatch", this.excludeFromMatch.bind(this));
     this.group.on("resetMatch", this.resetMatch.bind(this));
     this.group.on("resetExclude", this.resetExclude.bind(this));
     this.group.on("requestCheckUpdate", this.requestCheckUpdate.bind(this));

From 97c4e25e7aa076091b85e37438dc6e896f92b67c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Tue, 11 Aug 2026 12:31:57 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E2=9C=A8=20popup=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=A5=91=E7=BA=A6=EF=BC=9AScriptMenu=20=E6=96=B0=E5=A2=9E=20ha?=
 =?UTF-8?q?sMatchOverride=20=E5=8C=BA=E5=88=86=E7=AB=99=E7=82=B9=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/service/service_worker/popup.test.ts  | 45 ++++++++++++++++++-
 src/app/service/service_worker/popup.ts       |  1 +
 .../service_worker/popup_scriptmenu.test.ts   | 21 ++++++++-
 .../service_worker/popup_scriptmenu.ts        |  1 +
 src/app/service/service_worker/types.ts       |  1 +
 src/pages/popup/App.test.tsx                  |  1 +
 src/pages/popup/preload.test.ts               |  1 +
 src/pages/popup/usePopupData.test.ts          |  2 +
 8 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/src/app/service/service_worker/popup.test.ts b/src/app/service/service_worker/popup.test.ts
index 85b3b1721..47885f66d 100644
--- a/src/app/service/service_worker/popup.test.ts
+++ b/src/app/service/service_worker/popup.test.ts
@@ -37,6 +37,7 @@ const createMenu = (uuid: string, overrides: Partial<ScriptMenu> = {}): ScriptMe
   runNumByIframe: 0,
   menus: [],
   isEffective: true,
+  hasMatchOverride: false,
   ...overrides,
 });
 
@@ -288,7 +289,7 @@ describe("PopupService getPopupData Popup 数据获取与合并", () => {
         isUrlBlacklist: vi.fn().mockReturnValue(false),
       },
       scriptDAO: {
-        gets: vi.fn().mockResolvedValue([createScript(uuid)]),
+        gets: vi.fn().mockResolvedValue([createScript(uuid, { selfMetadata: { match: ["*://example.com/*"] } })]),
       },
     });
 
@@ -298,9 +299,29 @@ describe("PopupService getPopupData Popup 数据获取与合并", () => {
     expect(result.scriptList[0].uuid).toBe(uuid);
     expect(result.scriptList[0].isEffective).toBe(true);
     expect(result.scriptList[0].enable).toBe(true);
+    expect(result.scriptList[0].hasMatchOverride).toBe(true);
     expect(result.isBlacklist).toBe(false);
   });
 
+  it("无 match 覆盖的脚本（无运行缓存）hasMatchOverride 应为 false", async () => {
+    const uuid = "no-match-uuid";
+    const matchMap = new Map([[uuid, { uuid, effective: true }]]);
+
+    const { service } = createService({
+      runtime: {
+        getPopupPageScriptMatchingResultByUrl: vi.fn().mockResolvedValue(matchMap),
+        isUrlBlacklist: vi.fn().mockReturnValue(false),
+      },
+      scriptDAO: {
+        gets: vi.fn().mockResolvedValue([createScript(uuid)]),
+      },
+    });
+
+    const result = await service.getPopupData({ tabId: 1, url: "https://example.com/" });
+
+    expect(result.scriptList[0].hasMatchOverride).toBe(false);
+  });
+
   it("脚本同时在匹配结果与运行缓存中，应复用缓存记录（保留 runNum）并更新 enable/isEffective/hasUserConfig", async () => {
     const uuid = "run-uuid";
     const matchMap = new Map([[uuid, { uuid, effective: false }]]);
@@ -326,6 +347,28 @@ describe("PopupService getPopupData Popup 数据获取与合并", () => {
     expect(result.scriptList[0].hasUserConfig).toBe(true); // script.config 存在
   });
 
+  it("合并 run 记录时应按当前脚本同步 hasMatchOverride（match 覆盖存在性）", async () => {
+    const uuid = "run-uuid-2";
+    const matchMap = new Map([[uuid, { uuid, effective: false }]]);
+    // 运行缓存中存有旧的 hasMatchOverride 记录（模拟缓存来自更早的一次合并）
+    await cacheInstance.set(`${CACHE_KEY_TAB_SCRIPT}${1}`, [createMenu(uuid, { runNum: 3, hasMatchOverride: false })]);
+
+    const { service } = createService({
+      runtime: {
+        getPopupPageScriptMatchingResultByUrl: vi.fn().mockResolvedValue(matchMap),
+        isUrlBlacklist: vi.fn().mockReturnValue(false),
+      },
+      scriptDAO: {
+        gets: vi.fn().mockResolvedValue([createScript(uuid, { selfMetadata: { match: ["*://example.com/*"] } })]),
+      },
+    });
+
+    const result = await service.getPopupData({ tabId: 1, url: "https://example.com/" });
+
+    expect(result.scriptList[0].runNum).toBe(3); // 保留缓存中的执行次数
+    expect(result.scriptList[0].hasMatchOverride).toBe(true); // 按当前脚本的 match 覆盖同步
+  });
+
   it("URL 无任何匹配脚本时，scriptList 为空；后台脚本应出现在 backScriptList", async () => {
     const bgUuid = "bg-uuid";
     // 预置后台菜单缓存（tabId = -1）
diff --git a/src/app/service/service_worker/popup.ts b/src/app/service/service_worker/popup.ts
index 0cc63b20a..ee41d7dc7 100644
--- a/src/app/service/service_worker/popup.ts
+++ b/src/app/service/service_worker/popup.ts
@@ -395,6 +395,7 @@ export class PopupService {
         // 如果脚本已经存在，则不添加，更新信息
         run.enable = script.status === SCRIPT_STATUS_ENABLE;
         run.isEffective = o.effective!;
+        run.hasMatchOverride = script.selfMetadata?.match !== undefined;
         run.hasUserConfig = !!script.config;
       } else {
         // 由于目前没有在 Popup 显示 @match @include @exclude, 所以以下代码暂不需要
diff --git a/src/app/service/service_worker/popup_scriptmenu.test.ts b/src/app/service/service_worker/popup_scriptmenu.test.ts
index cebe95c48..3d211d5aa 100644
--- a/src/app/service/service_worker/popup_scriptmenu.test.ts
+++ b/src/app/service/service_worker/popup_scriptmenu.test.ts
@@ -3,7 +3,7 @@ import { changeLanguage } from "@App/locales/locales";
 import { initTestLanguage } from "@Tests/initTestLanguage";
 import type { Script } from "@App/app/repo/scripts";
 import type { ScriptMenu } from "./types";
-import { applyScriptDisplayInfo } from "./popup_scriptmenu";
+import { applyScriptDisplayInfo, scriptToMenu } from "./popup_scriptmenu";
 
 const makeMenu = (over: Partial<ScriptMenu> = {}): ScriptMenu => ({
   uuid: "u1",
@@ -16,6 +16,7 @@ const makeMenu = (over: Partial<ScriptMenu> = {}): ScriptMenu => ({
   runNumByIframe: 0,
   menus: [],
   isEffective: null,
+  hasMatchOverride: false,
   ...over,
 });
 
@@ -24,6 +25,24 @@ const makeMenu = (over: Partial<ScriptMenu> = {}): ScriptMenu => ({
 const makeScript = (metadata: Record<string, string[]>, name = "Raw Name"): Script =>
   ({ name, metadata }) as unknown as Script;
 
+describe("scriptToMenu Script 转 ScriptMenu", () => {
+  it("无 selfMetadata.match 覆盖时 hasMatchOverride 应为 false", () => {
+    expect(scriptToMenu(makeScript({})).hasMatchOverride).toBe(false);
+  });
+
+  it("存在 selfMetadata.match 覆盖时 hasMatchOverride 应为 true", () => {
+    const script = makeScript({});
+    script.selfMetadata = { match: ["*://example.com/*"] };
+    expect(scriptToMenu(script).hasMatchOverride).toBe(true);
+  });
+
+  it("selfMetadata.match 为空数组时（显式空覆盖）hasMatchOverride 应为 true", () => {
+    const script = makeScript({});
+    script.selfMetadata = { match: [] };
+    expect(scriptToMenu(script).hasMatchOverride).toBe(true);
+  });
+});
+
 describe("applyScriptDisplayInfo Popup 展示信息补充", () => {
   beforeAll(() => initTestLanguage("zh-CN"));
 
diff --git a/src/app/service/service_worker/popup_scriptmenu.ts b/src/app/service/service_worker/popup_scriptmenu.ts
index dafa06f3f..fe3391c55 100644
--- a/src/app/service/service_worker/popup_scriptmenu.ts
+++ b/src/app/service/service_worker/popup_scriptmenu.ts
@@ -23,6 +23,7 @@ export const scriptToMenu = (script: Script): ScriptMenu => {
     runNumByIframe: 0,
     menus: [],
     isEffective: null,
+    hasMatchOverride: script.selfMetadata?.match !== undefined,
   };
 };
 
diff --git a/src/app/service/service_worker/types.ts b/src/app/service/service_worker/types.ts
index c4b0bef0b..e8ecafe62 100644
--- a/src/app/service/service_worker/types.ts
+++ b/src/app/service/service_worker/types.ts
@@ -200,6 +200,7 @@ export type ScriptMenu = {
   runNumByIframe: number; // iframe运行次数
   menus: ScriptMenuItem[]; // 脚本菜单
   isEffective: boolean | null; // 是否在当前网址启动
+  hasMatchOverride: boolean; // 是否存在 match 覆盖（selfMetadata.match !== undefined），用于区分 S1/S3 与 S2/S4
 };
 
 /** 批量更新记录 */
diff --git a/src/pages/popup/App.test.tsx b/src/pages/popup/App.test.tsx
index c337f081f..b47017055 100644
--- a/src/pages/popup/App.test.tsx
+++ b/src/pages/popup/App.test.tsx
@@ -90,6 +90,7 @@ function makeScriptMenu(overrides: Record<string, any> = {}) {
     runNumByIframe: 0,
     menus: [],
     isEffective: null,
+    hasMatchOverride: false,
     ...overrides,
   };
 }
diff --git a/src/pages/popup/preload.test.ts b/src/pages/popup/preload.test.ts
index 2e0e96041..7b1129008 100644
--- a/src/pages/popup/preload.test.ts
+++ b/src/pages/popup/preload.test.ts
@@ -41,6 +41,7 @@ function script(uuid: string, enable: boolean): ScriptMenu {
     updatetime: 0,
     hasUserConfig: false,
     isEffective: true,
+    hasMatchOverride: false,
   };
 }
 
diff --git a/src/pages/popup/usePopupData.test.ts b/src/pages/popup/usePopupData.test.ts
index 43a6d3564..6f5facc2c 100644
--- a/src/pages/popup/usePopupData.test.ts
+++ b/src/pages/popup/usePopupData.test.ts
@@ -23,6 +23,8 @@ const popupInitialData = vi.hoisted(() => ({
       menus: [],
       runNum: 0,
       updatetime: 0,
+      isEffective: true,
+      hasMatchOverride: false,
     },
   ],
   backScriptList: [] as unknown[],

From a4b0554355e6bb39441b5bb488b71ea977a9f2bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Tue, 11 Aug 2026 12:42:13 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E2=9C=A8=20popup=20=E7=AB=99=E7=82=B9?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E6=93=8D=E4=BD=9C=EF=BC=9AS1=E2=80=93S4=20?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9C=BA=E6=8C=89=E9=92=AE=E4=B8=8E=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/de-DE/common.json        |  1 +
 src/locales/en-US/common.json        |  1 +
 src/locales/ja-JP/common.json        |  1 +
 src/locales/ko-KR/common.json        |  1 +
 src/locales/pt-BR/common.json        |  1 +
 src/locales/ru-RU/common.json        |  1 +
 src/locales/tr-TR/common.json        |  1 +
 src/locales/vi-VN/common.json        |  1 +
 src/locales/zh-CN/common.json        |  1 +
 src/locales/zh-TW/common.json        |  1 +
 src/pages/popup/App.test.tsx         | 86 ++++++++++++++++++++++++----
 src/pages/popup/App.tsx              | 42 ++++++++------
 src/pages/popup/usePopupData.test.ts | 42 +++++++++++++-
 src/pages/popup/usePopupData.ts      | 22 ++++++-
 14 files changed, 171 insertions(+), 31 deletions(-)

diff --git a/src/locales/de-DE/common.json b/src/locales/de-DE/common.json
index 3c7a448fe..730106c29 100644
--- a/src/locales/de-DE/common.json
+++ b/src/locales/de-DE/common.json
@@ -61,6 +61,7 @@
   "exclude_on": "Wiederherstellen auf $0 zur Ausführung",
   "exclude_off": "Ausschließen auf $0 zur Ausführung",
   "only_on_site": "Nur auf $0 ausführen",
+  "confirm_only_run_on_site": "Die bestehenden Website-Abgleichsregeln des Skripts werden gelöscht. Nur auf dieser Website ausführen?",
   "allow_on_site": "Ausführung auf $0 zulassen",
   "confirm_error": "Bestätigung fehlgeschlagen",
   "import": "Importieren",
diff --git a/src/locales/en-US/common.json b/src/locales/en-US/common.json
index b3599e882..3a27ae70f 100644
--- a/src/locales/en-US/common.json
+++ b/src/locales/en-US/common.json
@@ -61,6 +61,7 @@
   "exclude_on": "Reinstate $0's execution",
   "exclude_off": "Exclude $0's execution",
   "only_on_site": "Run only on $0",
+  "confirm_only_run_on_site": "This will clear the script's existing site match rules. Run only on this site?",
   "allow_on_site": "Allow execution on $0",
   "confirm_error": "Confirmation Failed",
   "import": "Import",
diff --git a/src/locales/ja-JP/common.json b/src/locales/ja-JP/common.json
index 72d09484d..782c6860d 100644
--- a/src/locales/ja-JP/common.json
+++ b/src/locales/ja-JP/common.json
@@ -61,6 +61,7 @@
   "exclude_on": "$0の実行を復元",
   "exclude_off": "$0の実行を除外",
   "only_on_site": "$0 でのみ実行",
+  "confirm_only_run_on_site": "スクリプトの既存のサイト対象ルールが消去されます。このサイトでのみ実行しますか？",
   "allow_on_site": "$0 での実行を許可",
   "confirm_error": "確認に失敗しました",
   "import": "インポート",
diff --git a/src/locales/ko-KR/common.json b/src/locales/ko-KR/common.json
index 90254478a..6bea732aa 100644
--- a/src/locales/ko-KR/common.json
+++ b/src/locales/ko-KR/common.json
@@ -61,6 +61,7 @@
   "exclude_on": "$0에서 다시 실행",
   "exclude_off": "$0에서 실행 제외",
   "only_on_site": "$0에서만 실행",
+  "confirm_only_run_on_site": "스크립트의 기존 사이트 일치 규칙이 모두 삭제됩니다. 이 사이트에서만 실행하시겠습니까?",
   "allow_on_site": "$0에서 실행 허용",
   "confirm_error": "확인 실패",
   "import": "가져오기",
diff --git a/src/locales/pt-BR/common.json b/src/locales/pt-BR/common.json
index e8714ad99..6c7605b1a 100644
--- a/src/locales/pt-BR/common.json
+++ b/src/locales/pt-BR/common.json
@@ -61,6 +61,7 @@
   "exclude_on": "Restaurar a execução de $0",
   "exclude_off": "Impedir a execução em $0",
   "only_on_site": "Executar somente em $0",
+  "confirm_only_run_on_site": "Isso limpará as regras de correspondência de sites existentes do script. Executar somente neste site?",
   "allow_on_site": "Permitir execução em $0",
   "confirm_error": "Falha na confirmação",
   "import": "Importar",
diff --git a/src/locales/ru-RU/common.json b/src/locales/ru-RU/common.json
index 06c75092d..80b612b4c 100644
--- a/src/locales/ru-RU/common.json
+++ b/src/locales/ru-RU/common.json
@@ -61,6 +61,7 @@
   "exclude_on": "Восстановить в $0 выполнении",
   "exclude_off": "Исключить в $0 выполнении",
   "only_on_site": "Выполнять только на $0",
+  "confirm_only_run_on_site": "Существующие правила соответствия сайтов для скрипта будут очищены. Выполнять только на этом сайте?",
   "allow_on_site": "Разрешить выполнение на $0",
   "confirm_error": "Ошибка подтверждения",
   "import": "Импорт",
diff --git a/src/locales/tr-TR/common.json b/src/locales/tr-TR/common.json
index e6d804e88..93b11c7f0 100644
--- a/src/locales/tr-TR/common.json
+++ b/src/locales/tr-TR/common.json
@@ -61,6 +61,7 @@
   "exclude_on": "$0 yürütmesini yeniden etkinleştir",
   "exclude_off": "$0 yürütmesini dışla",
   "only_on_site": "Yalnızca $0 üzerinde çalıştır",
+  "confirm_only_run_on_site": "Betiğin mevcut site eşleştirme kuralları temizlenecek. Yalnızca bu sitede çalıştırılsın mı?",
   "allow_on_site": "$0 üzerinde çalışmasına izin ver",
   "confirm_error": "Onay başarısız",
   "import": "İçe Aktar",
diff --git a/src/locales/vi-VN/common.json b/src/locales/vi-VN/common.json
index b214d9e76..82fecd08a 100644
--- a/src/locales/vi-VN/common.json
+++ b/src/locales/vi-VN/common.json
@@ -61,6 +61,7 @@
   "exclude_on": "Cho phép chạy lại $0",
   "exclude_off": "Loại trừ chạy $0",
   "only_on_site": "Chỉ chạy trên $0",
+  "confirm_only_run_on_site": "Thao tác này sẽ xóa các quy tắc khớp trang web hiện có của script. Chỉ chạy trên trang web này?",
   "allow_on_site": "Cho phép chạy trên $0",
   "confirm_error": "Xác nhận thất bại",
   "import": "Nhập",
diff --git a/src/locales/zh-CN/common.json b/src/locales/zh-CN/common.json
index 1394b0048..7764553c0 100644
--- a/src/locales/zh-CN/common.json
+++ b/src/locales/zh-CN/common.json
@@ -61,6 +61,7 @@
   "exclude_on": "恢复在 $0 上执行",
   "exclude_off": "排除在 $0 上执行",
   "only_on_site": "仅在 $0 执行",
+  "confirm_only_run_on_site": "将清空脚本原有的网站匹配规则，确认仅在此网站运行？",
   "allow_on_site": "允许在 $0 执行",
   "confirm_error": "确认失败",
   "import": "导入",
diff --git a/src/locales/zh-TW/common.json b/src/locales/zh-TW/common.json
index e16ac471a..4ca26967d 100644
--- a/src/locales/zh-TW/common.json
+++ b/src/locales/zh-TW/common.json
@@ -61,6 +61,7 @@
   "exclude_on": "恢復 $0 的執行",
   "exclude_off": "排除 $0 的執行",
   "only_on_site": "僅在 $0 執行",
+  "confirm_only_run_on_site": "這將清除腳本原有的網站匹配規則，確定只在此網站執行嗎？",
   "allow_on_site": "允許在 $0 執行",
   "confirm_error": "確認失敗",
   "import": "匯入",
diff --git a/src/pages/popup/App.test.tsx b/src/pages/popup/App.test.tsx
index b47017055..dd0414860 100644
--- a/src/pages/popup/App.test.tsx
+++ b/src/pages/popup/App.test.tsx
@@ -55,6 +55,7 @@ function makeData(overrides: Record<string, any> = {}) {
     handleOpenScriptSettings: vi.fn(),
     handleOpenUserConfig: vi.fn(),
     handleExcludeUrl: vi.fn(),
+    handleExcludeFromMatch: vi.fn(),
     handleOnlyRunOnUrl: vi.fn(),
     handleAllowUrl: vi.fn(),
     handleMenuClick: vi.fn(),
@@ -162,44 +163,107 @@ describe("Popup 紧凑布局", () => {
 });
 
 describe("Popup 脚本快捷设置与站点范围操作", () => {
-  it("展开脚本后始终显示脚本设置入口，并在开关关闭时隐藏站点范围操作", () => {
+  it.each([false, true])(
+    "开关关闭时有效脚本始终保留排除并回落黑名单动作（hasMatchOverride=%s）",
+    (hasMatchOverride) => {
+      const handleExcludeUrl = vi.fn();
+      mockData = makeData({
+        scriptList: [makeScriptMenu({ isEffective: true, hasMatchOverride })],
+        fullScriptCount: 1,
+        handleExcludeUrl,
+      });
+      render(<App />);
+
+      fireEvent.click(screen.getByRole("button", { name: /Script A/ }));
+
+      expect(screen.getByRole("button", { name: "脚本设置" })).toBeInTheDocument();
+      expect(screen.queryByRole("button", { name: "仅在 example.com 执行" })).not.toBeInTheDocument();
+      expect(screen.queryByRole("button", { name: "允许在 example.com 执行" })).not.toBeInTheDocument();
+      const excludeButton = screen.getByRole("button", { name: "排除在 example.com 上执行" });
+      expect(excludeButton).toHaveClass("text-type-orange");
+      fireEvent.click(excludeButton);
+      expect(handleExcludeUrl).toHaveBeenCalledWith("u1", true);
+    }
+  );
+
+  it("S1 全局生效时显示带确认的仅运行在与黑名单排除", async () => {
+    const handleOnlyRunOnUrl = vi.fn();
+    const handleExcludeUrl = vi.fn();
     mockData = makeData({
-      scriptList: [makeScriptMenu({ isEffective: true })],
+      popupSiteScopeActions: true,
+      scriptList: [makeScriptMenu({ isEffective: true, hasMatchOverride: false })],
       fullScriptCount: 1,
+      handleOnlyRunOnUrl,
+      handleExcludeUrl,
     });
     render(<App />);
 
     fireEvent.click(screen.getByRole("button", { name: /Script A/ }));
 
-    expect(screen.getByRole("button", { name: "脚本设置" })).toBeInTheDocument();
-    expect(screen.queryByRole("button", { name: "仅在 example.com 执行" })).not.toBeInTheDocument();
+    const onlyButton = screen.getByRole("button", { name: "仅在 example.com 执行" });
+    expect(onlyButton).toHaveClass("text-primary");
+    expect(screen.getByRole("button", { name: "排除在 example.com 上执行" })).toHaveClass("text-type-orange");
+
+    fireEvent.click(onlyButton);
+    expect(handleOnlyRunOnUrl).not.toHaveBeenCalled();
+    expect(await screen.findByText("将清空脚本原有的网站匹配规则，确认仅在此网站运行？")).toBeInTheDocument();
+    fireEvent.click(screen.getByTestId("popconfirm-confirm"));
+    expect(handleOnlyRunOnUrl).toHaveBeenCalledWith("u1");
+
+    fireEvent.click(screen.getByRole("button", { name: "排除在 example.com 上执行" }));
+    expect(handleExcludeUrl).toHaveBeenCalledWith("u1", true);
   });
 
-  it("开关开启且本站生效时显示仅在与排除两个动作", () => {
+  it("S3 已包含时只显示排除并调用匹配覆盖操作", () => {
+    const handleExcludeFromMatch = vi.fn();
     mockData = makeData({
       popupSiteScopeActions: true,
-      scriptList: [makeScriptMenu({ isEffective: true })],
+      scriptList: [makeScriptMenu({ isEffective: true, hasMatchOverride: true })],
       fullScriptCount: 1,
+      handleExcludeFromMatch,
     });
     render(<App />);
 
     fireEvent.click(screen.getByRole("button", { name: /Script A/ }));
 
-    expect(screen.getByRole("button", { name: "仅在 example.com 执行" })).toHaveClass("text-primary");
-    expect(screen.getByRole("button", { name: "排除在 example.com 上执行" })).toBeInTheDocument();
+    expect(screen.queryByRole("button", { name: "仅在 example.com 执行" })).not.toBeInTheDocument();
+    expect(screen.queryByRole("button", { name: "允许在 example.com 执行" })).not.toBeInTheDocument();
+    const excludeButton = screen.getByRole("button", { name: "排除在 example.com 上执行" });
+    expect(excludeButton).toHaveClass("text-type-orange");
+    fireEvent.click(excludeButton);
+    expect(handleExcludeFromMatch).toHaveBeenCalledWith("u1");
   });
 
-  it("本站不生效时只显示允许动作", () => {
+  it.each([false, true])("S2/S4 本站不生效时只显示包含动作（hasMatchOverride=%s）", (hasMatchOverride) => {
+    const handleAllowUrl = vi.fn();
     mockData = makeData({
       popupSiteScopeActions: true,
-      scriptList: [makeScriptMenu({ isEffective: false })],
+      scriptList: [makeScriptMenu({ isEffective: false, hasMatchOverride })],
+      fullScriptCount: 1,
+      handleAllowUrl,
+    });
+    render(<App />);
+
+    fireEvent.click(screen.getByRole("button", { name: /Script A/ }));
+
+    const allowButton = screen.getByRole("button", { name: "允许在 example.com 执行" });
+    expect(allowButton).toHaveClass("text-primary");
+    expect(screen.queryByRole("button", { name: "仅在 example.com 执行" })).not.toBeInTheDocument();
+    expect(screen.queryByRole("button", { name: "排除在 example.com 上执行" })).not.toBeInTheDocument();
+    fireEvent.click(allowButton);
+    expect(handleAllowUrl).toHaveBeenCalledWith("u1");
+  });
+
+  it("开关关闭且本站不生效时隐藏包含与排除动作", () => {
+    mockData = makeData({
+      scriptList: [makeScriptMenu({ isEffective: false, hasMatchOverride: true })],
       fullScriptCount: 1,
     });
     render(<App />);
 
     fireEvent.click(screen.getByRole("button", { name: /Script A/ }));
 
-    expect(screen.getByRole("button", { name: "允许在 example.com 执行" })).toHaveClass("text-primary");
+    expect(screen.queryByRole("button", { name: "允许在 example.com 执行" })).not.toBeInTheDocument();
     expect(screen.queryByRole("button", { name: "排除在 example.com 上执行" })).not.toBeInTheDocument();
   });
 });
diff --git a/src/pages/popup/App.tsx b/src/pages/popup/App.tsx
index b4f043e9f..25b4ba0fb 100644
--- a/src/pages/popup/App.tsx
+++ b/src/pages/popup/App.tsx
@@ -167,6 +167,7 @@ export default function App() {
                 onOpenScriptSettings={data.handleOpenScriptSettings}
                 onOpenUserConfig={data.handleOpenUserConfig}
                 onExcludeUrl={data.handleExcludeUrl}
+                onExcludeFromMatch={data.handleExcludeFromMatch}
                 showSiteScopeActions={data.popupSiteScopeActions}
                 onOnlyRunOnUrl={data.handleOnlyRunOnUrl}
                 onAllowUrl={data.handleAllowUrl}
@@ -463,6 +464,7 @@ interface ScriptRowProps {
   onOpenScriptSettings: (uuid: string) => void;
   onOpenUserConfig: (uuid: string) => void;
   onExcludeUrl?: (uuid: string, isEffective: boolean) => void;
+  onExcludeFromMatch?: (uuid: string) => void;
   showSiteScopeActions?: boolean;
   onOnlyRunOnUrl?: (uuid: string) => void;
   onAllowUrl?: (uuid: string) => void;
@@ -483,6 +485,7 @@ function ScriptRow({
   onOpenScriptSettings,
   onOpenUserConfig,
   onExcludeUrl,
+  onExcludeFromMatch,
   showSiteScopeActions = false,
   onOnlyRunOnUrl,
   onAllowUrl,
@@ -501,6 +504,14 @@ function ScriptRow({
     if (shouldTruncateMenus && !isMenuExpanded) return allVisibleMenus.slice(0, menuExpandNum);
     return allVisibleMenus;
   })();
+  const excludeSite =
+    showSiteScopeActions && script.hasMatchOverride
+      ? onExcludeFromMatch
+        ? () => onExcludeFromMatch(script.uuid)
+        : undefined
+      : onExcludeUrl
+        ? () => onExcludeUrl(script.uuid, true)
+        : undefined;
   const statusBadge = getStatusBadge(script, isPageScript, t);
   const displayName = script.name;
 
@@ -574,22 +585,21 @@ function ScriptRow({
               {t("allow_on_site").replace("$0", host)}
             </ActionItem>
           )}
-          {isPageScript && host && showSiteScopeActions && script.isEffective === true && onOnlyRunOnUrl && (
-            <ActionItem
-              icon={<CircleDot className="w-3.5 h-3.5" />}
-              primary
-              onClick={() => onOnlyRunOnUrl(script.uuid)}
-            >
-              {t("only_on_site").replace("$0", host)}
-            </ActionItem>
-          )}
-          {/* 排除/取消排除 host（无二次确认，与旧版一致） */}
-          {isPageScript && host && onExcludeUrl && script.isEffective === true && (
-            <ActionItem
-              icon={<MinusCircle className="w-3.5 h-3.5" />}
-              warn
-              onClick={() => onExcludeUrl(script.uuid, script.isEffective!)}
-            >
+          {isPageScript &&
+            host &&
+            showSiteScopeActions &&
+            script.isEffective === true &&
+            !script.hasMatchOverride &&
+            onOnlyRunOnUrl && (
+              <Popconfirm description={t("confirm_only_run_on_site")} onConfirm={() => onOnlyRunOnUrl(script.uuid)}>
+                <ActionItem icon={<CircleDot className="w-3.5 h-3.5" />} primary>
+                  {t("only_on_site").replace("$0", host)}
+                </ActionItem>
+              </Popconfirm>
+            )}
+          {/* 排除 host 无需确认；开启新语义时 S3 同步移出 match 覆盖，其他状态沿用黑名单。 */}
+          {isPageScript && host && script.isEffective === true && excludeSite && (
+            <ActionItem icon={<MinusCircle className="w-3.5 h-3.5" />} warn onClick={excludeSite}>
               {t("exclude_off").replace("$0", host)}
             </ActionItem>
           )}
diff --git a/src/pages/popup/usePopupData.test.ts b/src/pages/popup/usePopupData.test.ts
index 6f5facc2c..8910f5e36 100644
--- a/src/pages/popup/usePopupData.test.ts
+++ b/src/pages/popup/usePopupData.test.ts
@@ -53,14 +53,18 @@ const toastMocks = vi.hoisted(() => ({
 
 vi.mock("@App/pages/components/ui/toast", () => ({ notify: toastMocks }));
 
-// 站点范围快捷操作走真实 ScriptClient 实例，仅替换 onlyRunOnUrl，其余实导出与方法保留
+// 站点范围快捷操作走真实 ScriptClient 实例，仅替换本任务直接断言的方法，其余实导出与方法保留
 const mockOnlyRunOnUrl = vi.hoisted(() => vi.fn(async () => true));
+const mockExcludeFromMatch = vi.hoisted(() => vi.fn(async () => true));
 
 vi.mock("../store/features/script", async (importOriginal) => {
   const actual = await importOriginal<typeof ScriptStore>();
   return {
     ...actual,
-    scriptClient: Object.assign(Object.create(actual.scriptClient), { onlyRunOnUrl: mockOnlyRunOnUrl }),
+    scriptClient: Object.assign(Object.create(actual.scriptClient), {
+      onlyRunOnUrl: mockOnlyRunOnUrl,
+      excludeFromMatch: mockExcludeFromMatch,
+    }),
   };
 });
 
@@ -223,9 +227,16 @@ describe("usePopupData 脚本列表展开数量", () => {
 });
 
 describe("usePopupData 站点范围快捷操作", () => {
+  const initialScriptList = popupInitialData.scriptList;
+
   beforeEach(() => {
     vi.clearAllMocks();
     mockOnlyRunOnUrl.mockResolvedValue(true);
+    mockExcludeFromMatch.mockResolvedValue(true);
+  });
+
+  afterEach(() => {
+    popupInitialData.scriptList = initialScriptList;
   });
 
   it("仅在 xxx 执行：成功后乐观更新本地列表并弹出成功提示", async () => {
@@ -236,6 +247,7 @@ describe("usePopupData 站点范围快捷操作", () => {
 
     expect(mockOnlyRunOnUrl).toHaveBeenCalledWith("script-1", "*://example.com/*");
     expect(result.current.scriptList[0]?.isEffective).toBe(true);
+    expect(result.current.scriptList[0]?.hasMatchOverride).toBe(true);
     expect(notify.success).toHaveBeenCalledTimes(1);
     expect(notify.success).toHaveBeenCalledWith(t("update_success"));
   });
@@ -250,4 +262,30 @@ describe("usePopupData 站点范围快捷操作", () => {
     expect(notify.success).not.toHaveBeenCalled();
     expect(result.current.errorMessage).toBe("Error: mock failure");
   });
+
+  it("S3 排除：成功后移出当前站并弹出成功提示", async () => {
+    popupInitialData.scriptList = [{ ...initialScriptList[0], hasMatchOverride: true }];
+    const { result } = renderHook(() => usePopupData());
+    await act(async () => {
+      await result.current.handleExcludeFromMatch("script-1");
+    });
+
+    expect(mockExcludeFromMatch).toHaveBeenCalledWith("script-1", "*://example.com/*");
+    expect(result.current.scriptList[0]?.isEffective).toBe(false);
+    expect(result.current.scriptList[0]?.hasMatchOverride).toBe(true);
+    expect(notify.success).toHaveBeenCalledWith(t("update_success"));
+  });
+
+  it("S3 排除：失败时保持原状态且不弹成功提示", async () => {
+    popupInitialData.scriptList = [{ ...initialScriptList[0], hasMatchOverride: true }];
+    mockExcludeFromMatch.mockRejectedValue(new Error("exclude failure"));
+    const { result } = renderHook(() => usePopupData());
+    await act(async () => {
+      await result.current.handleExcludeFromMatch("script-1");
+    });
+
+    expect(result.current.scriptList[0]?.isEffective).toBe(true);
+    expect(result.current.errorMessage).toBe("Error: exclude failure");
+    expect(notify.success).not.toHaveBeenCalled();
+  });
 });
diff --git a/src/pages/popup/usePopupData.ts b/src/pages/popup/usePopupData.ts
index 90c710af5..7c1ca97b5 100644
--- a/src/pages/popup/usePopupData.ts
+++ b/src/pages/popup/usePopupData.ts
@@ -289,8 +289,25 @@ export function usePopupData() {
       if (!host) return;
       try {
         await scriptClient.onlyRunOnUrl(uuid, `*://${host}/*`);
-        // 与 handleAllowUrl 一致：成功后乐观更新本地列表，并给出 toast 反馈（Toaster 已由 main.tsx 挂载）
-        setScriptList((prev) => prev.map((s) => (s.uuid === uuid ? { ...s, isEffective: true } : s)));
+        // 收窄后已创建 match 覆盖，后续排除必须进入 S3 语义。
+        setScriptList((prev) =>
+          prev.map((s) => (s.uuid === uuid ? { ...s, isEffective: true, hasMatchOverride: true } : s))
+        );
+        notify.success(t("update_success"));
+      } catch (e) {
+        showError(String(e));
+      }
+    },
+    [showError, t]
+  );
+
+  const handleExcludeFromMatch = useCallback(
+    async (uuid: string) => {
+      const host = extractHost(stateRef.current.currentUrl);
+      if (!host) return;
+      try {
+        await scriptClient.excludeFromMatch(uuid, `*://${host}/*`);
+        setScriptList((prev) => prev.map((s) => (s.uuid === uuid ? { ...s, isEffective: false } : s)));
         notify.success(t("update_success"));
       } catch (e) {
         showError(String(e));
@@ -453,6 +470,7 @@ export function usePopupData() {
     handleOpenScriptSettings,
     handleOpenUserConfig,
     handleExcludeUrl,
+    handleExcludeFromMatch,
     handleOnlyRunOnUrl,
     handleAllowUrl,
     handleMenuClick,

From c07dffaea87c3582159ec78a430c79fde4f58b89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Tue, 11 Aug 2026 12:51:37 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E7=AB=99=E7=82=B9=E8=8C=83=E5=9B=B4=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E7=8A=B6=E6=80=81=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/service/service_worker/popup.test.ts  | 14 ++++----------
 src/app/service/service_worker/popup.ts       | 13 -------------
 src/app/service/service_worker/script.test.ts |  9 ++++++---
 src/app/service/service_worker/script.ts      |  9 ++++++++-
 src/pages/popup/App.test.tsx                  |  8 ++++----
 src/pages/popup/App.tsx                       | 17 ++++++++---------
 src/pages/popup/usePopupData.test.ts          | 18 ++++++++++++++++++
 src/pages/popup/usePopupData.ts               |  3 ++-
 8 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/src/app/service/service_worker/popup.test.ts b/src/app/service/service_worker/popup.test.ts
index 47885f66d..5134ae579 100644
--- a/src/app/service/service_worker/popup.test.ts
+++ b/src/app/service/service_worker/popup.test.ts
@@ -105,23 +105,17 @@ describe("PopupService 删除脚本后 Popup 菜单残留清理", () => {
     await cacheInstance.clear();
   });
 
-  it("getPopupData 读取 Popup 数据时，应过滤掉 runScripts 缓存里已删除脚本的残留记录", async () => {
+  it("getPopupData 读取 Popup 数据时，不应显示 runScripts 缓存中的未匹配脚本", async () => {
     const deletedUuid = "deleted-script";
     const liveUuid = "live-script";
     await cacheInstance.set(`${CACHE_KEY_TAB_SCRIPT}${1}`, [createMenu(deletedUuid), createMenu(liveUuid)]);
 
-    const { service, scriptDAO } = createService({
-      scriptDAO: {
-        gets: vi.fn(async (uuids: string[]) =>
-          uuids.map((uuid) => (uuid === liveUuid ? createScript(uuid) : undefined))
-        ),
-      },
-    });
+    const { service, scriptDAO } = createService();
 
     const result = await service.getPopupData({ tabId: 1, url: "https://example.com/" });
 
-    expect(result.scriptList.map((script) => script.uuid)).toEqual([liveUuid]);
-    expect(scriptDAO.gets).toHaveBeenCalledWith([deletedUuid, liveUuid]);
+    expect(result.scriptList).toEqual([]);
+    expect(scriptDAO.gets).toHaveBeenCalledWith([]);
   });
 
   it("updateRegisterMenuCommand 应忽略已删除脚本发来的迟到 GM_registerMenuCommand", async () => {
diff --git a/src/app/service/service_worker/popup.ts b/src/app/service/service_worker/popup.ts
index ee41d7dc7..7026ac36b 100644
--- a/src/app/service/service_worker/popup.ts
+++ b/src/app/service/service_worker/popup.ts
@@ -408,19 +408,6 @@ export class PopupService {
       scriptMenuMap.set(uuid, run);
     }
 
-    // 将未匹配当前 url 但仍在运行的脚本，附加到清单末端，避免使用者找不到其菜单。
-    // 这些记录来自 tabScript:<tabId> session cache；脚本删除事件与 Popup 读取可能交错，
-    // 因此这里必须用 DAO 结果做读侧防护，避免已删除脚本残留在 Popup 清单。
-    const unmatchedRunScripts = runScripts.filter((script) => !scriptMenuMap.has(script.uuid));
-    if (unmatchedRunScripts.length) {
-      const existingRunScripts = await this.scriptDAO.gets(unmatchedRunScripts.map((script) => script.uuid));
-      for (let idx = 0, l = unmatchedRunScripts.length; idx < l; idx++) {
-        const script = unmatchedRunScripts[idx];
-        if (existingRunScripts[idx]) {
-          scriptMenuMap.set(script.uuid, script);
-        }
-      }
-    }
     const scriptMenu = [...scriptMenuMap.values()];
     // 检查是否在黑名单中
     const isBlacklist = this.runtime.isUrlBlacklist(url);
diff --git a/src/app/service/service_worker/script.test.ts b/src/app/service/service_worker/script.test.ts
index 5fdac069c..9bc455a63 100644
--- a/src/app/service/service_worker/script.test.ts
+++ b/src/app/service/service_worker/script.test.ts
@@ -703,13 +703,16 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
       }
     });
 
-    it("仅在当前站点执行应以当前站点替换用户匹配列表", async () => {
-      const script = createMockScript({ selfMetadata: { match: ["*://old.example/*"] } });
+    it("仅在当前站点执行应以当前站点替换匹配列表并清空作者 include", async () => {
+      const script = createMockScript({
+        metadata: { include: ["*://included.example/*"] },
+        selfMetadata: { match: ["*://old.example/*"] },
+      });
       vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
 
       await scriptService.onlyRunOnUrl({ uuid: script.uuid, matchPattern: "*://current.example/*" });
 
-      expect(savedSelfMetadata()).toEqual({ match: ["*://current.example/*"] });
+      expect(savedSelfMetadata()).toEqual({ match: ["*://current.example/*"], include: [] });
     });
 
     it("自定义匹配未覆盖当前站点时应把当前站点加入允许列表", async () => {
diff --git a/src/app/service/service_worker/script.ts b/src/app/service/service_worker/script.ts
index b0a8f0198..61bec31f7 100644
--- a/src/app/service/service_worker/script.ts
+++ b/src/app/service/service_worker/script.ts
@@ -926,7 +926,14 @@ export class ScriptService {
   }
 
   async onlyRunOnUrl({ uuid, matchPattern }: { uuid: string; matchPattern: string }) {
-    return this.resetMatch({ uuid, match: [matchPattern] });
+    let script = await this.scriptDAO.get(uuid);
+    if (!script) throw new Error("script not found");
+    script = selfMetadataUpdate(script, "match", new Set([matchPattern]));
+    script = selfMetadataUpdate(script, "include", new Set());
+    return this.scriptDAO.update(uuid, script).then(() => {
+      this.publishInstallScript(script, { update: true });
+      return true;
+    });
   }
 
   async allowUrl({
diff --git a/src/pages/popup/App.test.tsx b/src/pages/popup/App.test.tsx
index dd0414860..2dce2abf7 100644
--- a/src/pages/popup/App.test.tsx
+++ b/src/pages/popup/App.test.tsx
@@ -186,15 +186,15 @@ describe("Popup 脚本快捷设置与站点范围操作", () => {
     }
   );
 
-  it("S1 全局生效时显示带确认的仅运行在与黑名单排除", async () => {
+  it("S1 全局生效时显示带确认的仅运行在与互斥排除", async () => {
     const handleOnlyRunOnUrl = vi.fn();
-    const handleExcludeUrl = vi.fn();
+    const handleExcludeFromMatch = vi.fn();
     mockData = makeData({
       popupSiteScopeActions: true,
       scriptList: [makeScriptMenu({ isEffective: true, hasMatchOverride: false })],
       fullScriptCount: 1,
       handleOnlyRunOnUrl,
-      handleExcludeUrl,
+      handleExcludeFromMatch,
     });
     render(<App />);
 
@@ -211,7 +211,7 @@ describe("Popup 脚本快捷设置与站点范围操作", () => {
     expect(handleOnlyRunOnUrl).toHaveBeenCalledWith("u1");
 
     fireEvent.click(screen.getByRole("button", { name: "排除在 example.com 上执行" }));
-    expect(handleExcludeUrl).toHaveBeenCalledWith("u1", true);
+    expect(handleExcludeFromMatch).toHaveBeenCalledWith("u1");
   });
 
   it("S3 已包含时只显示排除并调用匹配覆盖操作", () => {
diff --git a/src/pages/popup/App.tsx b/src/pages/popup/App.tsx
index 25b4ba0fb..80dae1a32 100644
--- a/src/pages/popup/App.tsx
+++ b/src/pages/popup/App.tsx
@@ -504,14 +504,13 @@ function ScriptRow({
     if (shouldTruncateMenus && !isMenuExpanded) return allVisibleMenus.slice(0, menuExpandNum);
     return allVisibleMenus;
   })();
-  const excludeSite =
-    showSiteScopeActions && script.hasMatchOverride
-      ? onExcludeFromMatch
-        ? () => onExcludeFromMatch(script.uuid)
-        : undefined
-      : onExcludeUrl
-        ? () => onExcludeUrl(script.uuid, true)
-        : undefined;
+  const excludeSite = showSiteScopeActions
+    ? onExcludeFromMatch
+      ? () => onExcludeFromMatch(script.uuid)
+      : undefined
+    : onExcludeUrl
+      ? () => onExcludeUrl(script.uuid, true)
+      : undefined;
   const statusBadge = getStatusBadge(script, isPageScript, t);
   const displayName = script.name;
 
@@ -597,7 +596,7 @@ function ScriptRow({
                 </ActionItem>
               </Popconfirm>
             )}
-          {/* 排除 host 无需确认；开启新语义时 S3 同步移出 match 覆盖，其他状态沿用黑名单。 */}
+          {/* 排除 host 无需确认；站点范围操作开启时同步维护 match 与 exclude 覆盖。 */}
           {isPageScript && host && script.isEffective === true && excludeSite && (
             <ActionItem icon={<MinusCircle className="w-3.5 h-3.5" />} warn onClick={excludeSite}>
               {t("exclude_off").replace("$0", host)}
diff --git a/src/pages/popup/usePopupData.test.ts b/src/pages/popup/usePopupData.test.ts
index 8910f5e36..18149aafe 100644
--- a/src/pages/popup/usePopupData.test.ts
+++ b/src/pages/popup/usePopupData.test.ts
@@ -56,6 +56,7 @@ vi.mock("@App/pages/components/ui/toast", () => ({ notify: toastMocks }));
 // 站点范围快捷操作走真实 ScriptClient 实例，仅替换本任务直接断言的方法，其余实导出与方法保留
 const mockOnlyRunOnUrl = vi.hoisted(() => vi.fn(async () => true));
 const mockExcludeFromMatch = vi.hoisted(() => vi.fn(async () => true));
+const mockAllowUrl = vi.hoisted(() => vi.fn(async () => true));
 
 vi.mock("../store/features/script", async (importOriginal) => {
   const actual = await importOriginal<typeof ScriptStore>();
@@ -64,6 +65,7 @@ vi.mock("../store/features/script", async (importOriginal) => {
     scriptClient: Object.assign(Object.create(actual.scriptClient), {
       onlyRunOnUrl: mockOnlyRunOnUrl,
       excludeFromMatch: mockExcludeFromMatch,
+      allowUrl: mockAllowUrl,
     }),
   };
 });
@@ -233,6 +235,7 @@ describe("usePopupData 站点范围快捷操作", () => {
     vi.clearAllMocks();
     mockOnlyRunOnUrl.mockResolvedValue(true);
     mockExcludeFromMatch.mockResolvedValue(true);
+    mockAllowUrl.mockResolvedValue(true);
   });
 
   afterEach(() => {
@@ -263,6 +266,21 @@ describe("usePopupData 站点范围快捷操作", () => {
     expect(result.current.errorMessage).toBe("Error: mock failure");
   });
 
+  it.each([false, true])(
+    "S2/S4 包含：成功后恢复当前站并弹出成功提示（hasMatchOverride=%s）",
+    async (hasMatchOverride) => {
+      popupInitialData.scriptList = [{ ...initialScriptList[0], isEffective: false, hasMatchOverride }];
+      const { result } = renderHook(() => usePopupData());
+      await act(async () => {
+        await result.current.handleAllowUrl("script-1");
+      });
+
+      expect(mockAllowUrl).toHaveBeenCalledWith("script-1", "*://example.com/*", "*://example.com/*");
+      expect(result.current.scriptList[0]?.isEffective).toBe(true);
+      expect(notify.success).toHaveBeenCalledWith(t("update_success"));
+    }
+  );
+
   it("S3 排除：成功后移出当前站并弹出成功提示", async () => {
     popupInitialData.scriptList = [{ ...initialScriptList[0], hasMatchOverride: true }];
     const { result } = renderHook(() => usePopupData());
diff --git a/src/pages/popup/usePopupData.ts b/src/pages/popup/usePopupData.ts
index 7c1ca97b5..acf130e36 100644
--- a/src/pages/popup/usePopupData.ts
+++ b/src/pages/popup/usePopupData.ts
@@ -323,11 +323,12 @@ export function usePopupData() {
       try {
         await scriptClient.allowUrl(uuid, `*://${host}/*`, `*://${host}/*`);
         setScriptList((prev) => prev.map((s) => (s.uuid === uuid ? { ...s, isEffective: true } : s)));
+        notify.success(t("update_success"));
       } catch (e) {
         showError(String(e));
       }
     },
-    [showError]
+    [showError, t]
   );
 
   /** 调用方需从 script.menus 中按 groupKey 过滤出所有匹配项传入 */

From 607b9ccb4cd4ed4c14f7fcc10f65c4b1dbbdb3db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Tue, 11 Aug 2026 13:13:45 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=F0=9F=90=9B=20=E4=B8=B2=E8=A1=8C?=
 =?UTF-8?q?=E5=8C=96=E5=BC=B9=E7=AA=97=E7=AB=99=E7=82=B9=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/service/service_worker/script.test.ts | 37 ++++++++++++
 src/app/service/service_worker/script.ts      | 58 ++++++++++---------
 2 files changed, 68 insertions(+), 27 deletions(-)

diff --git a/src/app/service/service_worker/script.test.ts b/src/app/service/service_worker/script.test.ts
index 9bc455a63..bdc2690bd 100644
--- a/src/app/service/service_worker/script.test.ts
+++ b/src/app/service/service_worker/script.test.ts
@@ -715,6 +715,43 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
       expect(savedSelfMetadata()).toEqual({ match: ["*://current.example/*"], include: [] });
     });
 
+    it("并发站点范围操作应保留两个操作的覆盖变更", async () => {
+      let stored = createMockScript();
+      let signalFirstUpdate!: () => void;
+      let releaseFirstUpdate!: () => void;
+      const firstUpdateStarted = new Promise<void>((resolve) => {
+        signalFirstUpdate = resolve;
+      });
+      const firstUpdateRelease = new Promise<void>((resolve) => {
+        releaseFirstUpdate = resolve;
+      });
+      let updateCount = 0;
+      vi.mocked(mockScriptDAO.get).mockImplementation(async () => stored);
+      vi.mocked(mockScriptDAO.update).mockImplementation(async (_uuid, next) => {
+        updateCount += 1;
+        if (updateCount === 1) {
+          signalFirstUpdate();
+          await firstUpdateRelease;
+        }
+        stored = { ...stored, ...next };
+        return stored;
+      });
+
+      const onlyRun = scriptService.onlyRunOnUrl({ uuid: stored.uuid, matchPattern: "*://current.example/*" });
+      await firstUpdateStarted;
+      const exclude = scriptService.excludeFromMatch({ uuid: stored.uuid, matchPattern: "*://current.example/*" });
+      await Promise.resolve();
+      await Promise.resolve();
+      releaseFirstUpdate();
+      await Promise.all([onlyRun, exclude]);
+
+      expect(stored.selfMetadata).toEqual({
+        match: [],
+        include: [],
+        exclude: ["*://current.example/*"],
+      });
+    });
+
     it("自定义匹配未覆盖当前站点时应把当前站点加入允许列表", async () => {
       const script = createMockScript({
         selfMetadata: { match: ["*://allowed.example/*"], exclude: ["*://current.example/*"] },
diff --git a/src/app/service/service_worker/script.ts b/src/app/service/service_worker/script.ts
index 61bec31f7..0901fc648 100644
--- a/src/app/service/service_worker/script.ts
+++ b/src/app/service/service_worker/script.ts
@@ -46,6 +46,7 @@ import { LocalStorageDAO } from "@App/app/repo/localStorage";
 import { CompiledResourceDAO } from "@App/app/repo/resource";
 import { initRegularUpdateCheck, watchRegularUpdateCheck } from "./regular_updatecheck";
 import { parseSkillScriptMetadata } from "@App/pkg/utils/skill_script";
+import { stackAsyncTask } from "@App/pkg/utils/async_queue";
 import { TempStorageDAO, TempStorageItemType } from "@App/app/repo/tempStorage";
 import { EnableAgent } from "@App/app/const";
 import { TrashScriptDAO } from "@App/app/repo/trash_script";
@@ -926,11 +927,12 @@ export class ScriptService {
   }
 
   async onlyRunOnUrl({ uuid, matchPattern }: { uuid: string; matchPattern: string }) {
-    let script = await this.scriptDAO.get(uuid);
-    if (!script) throw new Error("script not found");
-    script = selfMetadataUpdate(script, "match", new Set([matchPattern]));
-    script = selfMetadataUpdate(script, "include", new Set());
-    return this.scriptDAO.update(uuid, script).then(() => {
+    return stackAsyncTask("script-site-scope", async () => {
+      let script = await this.scriptDAO.get(uuid);
+      if (!script) throw new Error("script not found");
+      script = selfMetadataUpdate(script, "match", new Set([matchPattern]));
+      script = selfMetadataUpdate(script, "include", new Set());
+      await this.scriptDAO.update(uuid, script);
       this.publishInstallScript(script, { update: true });
       return true;
     });
@@ -945,34 +947,36 @@ export class ScriptService {
     matchPattern: string;
     excludePattern: string;
   }) {
-    let script = await this.scriptDAO.get(uuid);
-    if (!script) throw new Error("script not found");
-    if (script.selfMetadata?.match !== undefined) {
-      script = selfMetadataUpdate(script, "match", new Set([...script.selfMetadata.match, matchPattern]));
-    }
-    if (script.selfMetadata?.exclude !== undefined) {
-      const excludeSet = new Set(script.selfMetadata.exclude);
-      excludeSet.delete(excludePattern);
-      script = selfMetadataUpdate(script, "exclude", excludeSet);
-    }
-    return this.scriptDAO.update(uuid, script).then(() => {
+    return stackAsyncTask("script-site-scope", async () => {
+      let script = await this.scriptDAO.get(uuid);
+      if (!script) throw new Error("script not found");
+      if (script.selfMetadata?.match !== undefined) {
+        script = selfMetadataUpdate(script, "match", new Set([...script.selfMetadata.match, matchPattern]));
+      }
+      if (script.selfMetadata?.exclude !== undefined) {
+        const excludeSet = new Set(script.selfMetadata.exclude);
+        excludeSet.delete(excludePattern);
+        script = selfMetadataUpdate(script, "exclude", excludeSet);
+      }
+      await this.scriptDAO.update(uuid, script);
       this.publishInstallScript(script, { update: true });
       return true;
     });
   }
 
   async excludeFromMatch({ uuid, matchPattern }: { uuid: string; matchPattern: string }) {
-    let script = await this.scriptDAO.get(uuid);
-    if (!script) throw new Error("script not found");
-    if (script.selfMetadata?.match !== undefined) {
-      const matchSet = new Set(script.selfMetadata.match);
-      matchSet.delete(matchPattern);
-      script = selfMetadataUpdate(script, "match", matchSet);
-    }
-    const excludeSet = new Set(script.selfMetadata?.exclude || []);
-    excludeSet.add(matchPattern);
-    script = selfMetadataUpdate(script, "exclude", excludeSet);
-    return this.scriptDAO.update(uuid, script).then(() => {
+    return stackAsyncTask("script-site-scope", async () => {
+      let script = await this.scriptDAO.get(uuid);
+      if (!script) throw new Error("script not found");
+      if (script.selfMetadata?.match !== undefined) {
+        const matchSet = new Set(script.selfMetadata.match);
+        matchSet.delete(matchPattern);
+        script = selfMetadataUpdate(script, "match", matchSet);
+      }
+      const excludeSet = new Set(script.selfMetadata?.exclude || []);
+      excludeSet.add(matchPattern);
+      script = selfMetadataUpdate(script, "exclude", excludeSet);
+      await this.scriptDAO.update(uuid, script);
       this.publishInstallScript(script, { update: true });
       return true;
     });

From f73172133ce6e865e749bc84c3c5991c10a5fcbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Tue, 11 Aug 2026 13:20:37 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=9D=E7=95=99?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9=E6=8E=92=E9=99=A4=E4=B8=AD=E7=9A=84=E4=BD=9C?=
 =?UTF-8?q?=E8=80=85=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/service/service_worker/script.test.ts | 29 ++++++++++++++++---
 src/app/service/service_worker/script.ts      |  2 +-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/app/service/service_worker/script.test.ts b/src/app/service/service_worker/script.test.ts
index bdc2690bd..ae02e54e0 100644
--- a/src/app/service/service_worker/script.test.ts
+++ b/src/app/service/service_worker/script.test.ts
@@ -748,7 +748,7 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
       expect(stored.selfMetadata).toEqual({
         match: [],
         include: [],
-        exclude: ["*://current.example/*"],
+        exclude: ["*://ads.script.com/*", "*://current.example/*"],
       });
     });
 
@@ -824,7 +824,10 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
 
       await scriptService.excludeFromMatch({ uuid: script.uuid, matchPattern: "*://current.example/*" });
 
-      expect(savedSelfMetadata()).toEqual({ match: [], exclude: ["*://current.example/*"] });
+      expect(savedSelfMetadata()).toEqual({
+        match: [],
+        exclude: ["*://ads.script.com/*", "*://current.example/*"],
+      });
     });
 
     it("没有用户匹配覆盖时排除站点不应创建匹配覆盖", async () => {
@@ -833,7 +836,7 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
 
       await scriptService.excludeFromMatch({ uuid: script.uuid, matchPattern: "*://current.example/*" });
 
-      expect(savedSelfMetadata()).toEqual({ exclude: ["*://current.example/*"] });
+      expect(savedSelfMetadata()).toEqual({ exclude: ["*://ads.script.com/*", "*://current.example/*"] });
     });
 
     it("已有空匹配覆盖时排除站点应保留空覆盖", async () => {
@@ -842,7 +845,25 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
 
       await scriptService.excludeFromMatch({ uuid: script.uuid, matchPattern: "*://current.example/*" });
 
-      expect(savedSelfMetadata()).toEqual({ match: [], exclude: ["*://current.example/*"] });
+      expect(savedSelfMetadata()).toEqual({
+        match: [],
+        exclude: ["*://ads.script.com/*", "*://current.example/*"],
+      });
+    });
+
+    it("新增排除覆盖时应保留作者已有的排除规则", async () => {
+      const script = createMockScript({
+        metadata: { exclude: ["*://author-blocked.example/*"] },
+        selfMetadata: { match: ["*://current.example/*"] },
+      });
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.excludeFromMatch({ uuid: script.uuid, matchPattern: "*://current.example/*" });
+
+      expect(savedSelfMetadata()).toEqual({
+        match: [],
+        exclude: ["*://author-blocked.example/*", "*://current.example/*"],
+      });
     });
   });
 
diff --git a/src/app/service/service_worker/script.ts b/src/app/service/service_worker/script.ts
index 0901fc648..82965cd8b 100644
--- a/src/app/service/service_worker/script.ts
+++ b/src/app/service/service_worker/script.ts
@@ -973,7 +973,7 @@ export class ScriptService {
         matchSet.delete(matchPattern);
         script = selfMetadataUpdate(script, "match", matchSet);
       }
-      const excludeSet = new Set(script.selfMetadata?.exclude || []);
+      const excludeSet = new Set(script.selfMetadata?.exclude || script.metadata?.exclude || []);
       excludeSet.add(matchPattern);
       script = selfMetadataUpdate(script, "exclude", excludeSet);
       await this.scriptDAO.update(uuid, script);

From 68dac88e5f54feea5d960c3459e2e5b4af55fd97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Tue, 11 Aug 2026 13:56:30 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=F0=9F=90=9B=20=E7=A9=BA=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E8=A6=86=E7=9B=96=E6=97=B6=E6=B8=85=E7=A9=BA=E6=AE=8B?=
 =?UTF-8?q?=E7=95=99=20matcher=20=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/service_worker/runtime.test.ts    | 19 +++++++++++++++++++
 src/app/service/service_worker/runtime.ts     |  4 ++++
 2 files changed, 23 insertions(+)

diff --git a/src/app/service/service_worker/runtime.test.ts b/src/app/service/service_worker/runtime.test.ts
index fe9e84481..79f1dde0b 100644
--- a/src/app/service/service_worker/runtime.test.ts
+++ b/src/app/service/service_worker/runtime.test.ts
@@ -288,6 +288,25 @@ describe.concurrent("RuntimeService - getPageScriptMatchingResultByUrl 脚本匹
     });
   });
 
+  it.concurrent("match 覆盖清空后不再保留此前的匹配规则", async () => {
+    const { runtime } = createRuntimeTestContext();
+    const script = createMockScript({
+      metadata: { match: ["https://www.example.com/*"] },
+      selfMetadata: { match: ["https://www.example.com/*"] },
+    });
+
+    await runtime.applyScriptMatchInfo(createScriptRunResource(script));
+    expect(runtime.getPageScriptMatchingResultByUrl("https://www.example.com/").has(script.uuid)).toBe(true);
+
+    const emptyMatchOverride = createScriptRunResource({
+      ...script,
+      selfMetadata: { match: [] },
+    });
+    expect(await runtime.applyScriptMatchInfo(emptyMatchOverride)).toBeUndefined();
+
+    expect(runtime.getPageScriptMatchingResultByUrl("https://www.example.com/", true).has(script.uuid)).toBe(false);
+  });
+
   describe.concurrent("includeDisabled 选项", () => {
     it.concurrent("当 includeDisabled=false 时不返回禁用脚本；当 includeDisabled=true 时返回禁用脚本", async () => {
       // Arrange
diff --git a/src/app/service/service_worker/runtime.ts b/src/app/service/service_worker/runtime.ts
index f9c670fbb..8d40634fc 100644
--- a/src/app/service/service_worker/runtime.ts
+++ b/src/app/service/service_worker/runtime.ts
@@ -1692,6 +1692,10 @@ export class RuntimeService {
   async applyScriptMatchInfo(scriptRes: ScriptRunResource) {
     const o = scriptURLPatternResults(scriptRes);
     if (!o) {
+      const { uuid } = scriptRes;
+      this.scriptMatchEnable.clearRules(uuid);
+      this.scriptMatchEnable.clearRules(this.getOriginalMatchUuid(uuid));
+      this.cachedPatterns.delete(uuid);
       return undefined;
     }
     // 构建脚本匹配信息

From 174025cac456b6a859d1927e4561268cfe274662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Tue, 11 Aug 2026 14:39:27 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=F0=9F=94=96=20release=20=E9=A2=84?=
 =?UTF-8?q?=E5=A4=87=EF=BC=9A=E7=89=88=E6=9C=AC=E5=8F=B7=201.5.0-beta.2=20?=
 =?UTF-8?q?/=20manifest=201.5.0.1300=EF=BC=8CFirefox=20=E6=9C=80=E4=BD=8E?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=20153?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                 | 2 +-
 scripts/build-config.js      | 2 +-
 scripts/build-config.test.js | 2 +-
 src/manifest.json            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 61052f25d..2441fc4dd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scriptcat",
-  "version": "1.5.0-beta.1",
+  "version": "1.5.0-beta.2",
   "description": "脚本猫,一个可以执行用户脚本的浏览器扩展,万物皆可脚本化,让你的浏览器可以做更多的事情!",
   "author": "CodFrm",
   "license": "GPLv3",
diff --git a/scripts/build-config.js b/scripts/build-config.js
index 610b6cfe3..680587f00 100644
--- a/scripts/build-config.js
+++ b/scripts/build-config.js
@@ -100,7 +100,7 @@ export function createFirefoxManifest(manifest, agentEnabled, firefoxId) {
         browser_specific_settings: {
           gecko: {
             id: firefoxId,
-            strict_min_version: "154.0a1",
+            strict_min_version: "153",
             data_collection_permissions: {
               required: ["none"],
               optional: ["authenticationInfo", "personallyIdentifyingInfo"],
diff --git a/scripts/build-config.test.js b/scripts/build-config.test.js
index 128f59e46..c6795714e 100644
--- a/scripts/build-config.test.js
+++ b/scripts/build-config.test.js
@@ -136,7 +136,7 @@ describe("构建配置 - 浏览器专用 manifest", () => {
     expect(result.incognito).toBe("spanning");
     expect(result).not.toHaveProperty("message_serialization");
     expect(result.browser_specific_settings.gecko.id).toBe("{firefox-id}");
-    expect(result.browser_specific_settings.gecko.strict_min_version).toBe("154.0a1");
+    expect(result.browser_specific_settings.gecko.strict_min_version).toBe("153");
     expect(result.commands).toEqual({ _execute_action: {} });
     expect(source.optional_permissions).toEqual(["background", "userScripts"]);
     expect(source.background).toHaveProperty("service_worker");
diff --git a/src/manifest.json b/src/manifest.json
index 41ebd002a..547a241cf 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "__MSG_scriptcat__",
-  "version": "1.5.0.1100",
+  "version": "1.5.0.1300",
   "author": "CodFrm",
   "description": "__MSG_scriptcat_description__",
   "options_ui": {

From e8b9ad68f29dc25116414f899c57c618bb700427 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Tue, 11 Aug 2026 15:30:31 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=20popup=20=E7=AB=99=E7=82=B9=E8=8C=83=E5=9B=B4=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E7=9A=84=E3=80=8C=E4=BF=AE=E6=94=B9=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E3=80=8D=E6=88=90=E5=8A=9F=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/popup/usePopupData.test.ts | 16 +++++++---------
 src/pages/popup/usePopupData.ts      | 12 +++---------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/pages/popup/usePopupData.test.ts b/src/pages/popup/usePopupData.test.ts
index 18149aafe..591aeca7d 100644
--- a/src/pages/popup/usePopupData.test.ts
+++ b/src/pages/popup/usePopupData.test.ts
@@ -1,7 +1,6 @@
 import { describe, it, expect, vi, beforeEach, afterEach, beforeAll } from "vitest";
 import { renderHook, act } from "@testing-library/react";
 import { notify } from "@App/pages/components/ui/toast";
-import { t } from "@App/locales/locales";
 import { initTestLanguage } from "@Tests/initTestLanguage";
 
 const popupInitialData = vi.hoisted(() => ({
@@ -40,7 +39,7 @@ vi.mock("@App/pkg/utils/utils", async (importOriginal) => {
   return { ...actual, openInCurrentTab: vi.fn(async () => undefined), getCurrentTab: vi.fn(async () => undefined) };
 });
 
-// toast 反馈打桩：仅验证「成功才调用 notify.success」的反馈逻辑
+// notify 打桩：断言站点操作成功/失败均不弹成功 toast
 const toastMocks = vi.hoisted(() => ({
   success: vi.fn(),
   info: vi.fn(),
@@ -242,7 +241,7 @@ describe("usePopupData 站点范围快捷操作", () => {
     popupInitialData.scriptList = initialScriptList;
   });
 
-  it("仅在 xxx 执行：成功后乐观更新本地列表并弹出成功提示", async () => {
+  it("仅在 xxx 执行：成功后乐观更新本地列表且不弹成功提示", async () => {
     const { result } = renderHook(() => usePopupData());
     await act(async () => {
       await result.current.handleOnlyRunOnUrl("script-1");
@@ -251,8 +250,7 @@ describe("usePopupData 站点范围快捷操作", () => {
     expect(mockOnlyRunOnUrl).toHaveBeenCalledWith("script-1", "*://example.com/*");
     expect(result.current.scriptList[0]?.isEffective).toBe(true);
     expect(result.current.scriptList[0]?.hasMatchOverride).toBe(true);
-    expect(notify.success).toHaveBeenCalledTimes(1);
-    expect(notify.success).toHaveBeenCalledWith(t("update_success"));
+    expect(notify.success).not.toHaveBeenCalled();
   });
 
   it("仅在 xxx 执行：失败时不弹成功提示，并记录错误信息", async () => {
@@ -267,7 +265,7 @@ describe("usePopupData 站点范围快捷操作", () => {
   });
 
   it.each([false, true])(
-    "S2/S4 包含：成功后恢复当前站并弹出成功提示（hasMatchOverride=%s）",
+    "S2/S4 包含：成功后恢复当前站且不弹成功提示（hasMatchOverride=%s）",
     async (hasMatchOverride) => {
       popupInitialData.scriptList = [{ ...initialScriptList[0], isEffective: false, hasMatchOverride }];
       const { result } = renderHook(() => usePopupData());
@@ -277,11 +275,11 @@ describe("usePopupData 站点范围快捷操作", () => {
 
       expect(mockAllowUrl).toHaveBeenCalledWith("script-1", "*://example.com/*", "*://example.com/*");
       expect(result.current.scriptList[0]?.isEffective).toBe(true);
-      expect(notify.success).toHaveBeenCalledWith(t("update_success"));
+      expect(notify.success).not.toHaveBeenCalled();
     }
   );
 
-  it("S3 排除：成功后移出当前站并弹出成功提示", async () => {
+  it("S3 排除：成功后移出当前站且不弹成功提示", async () => {
     popupInitialData.scriptList = [{ ...initialScriptList[0], hasMatchOverride: true }];
     const { result } = renderHook(() => usePopupData());
     await act(async () => {
@@ -291,7 +289,7 @@ describe("usePopupData 站点范围快捷操作", () => {
     expect(mockExcludeFromMatch).toHaveBeenCalledWith("script-1", "*://example.com/*");
     expect(result.current.scriptList[0]?.isEffective).toBe(false);
     expect(result.current.scriptList[0]?.hasMatchOverride).toBe(true);
-    expect(notify.success).toHaveBeenCalledWith(t("update_success"));
+    expect(notify.success).not.toHaveBeenCalled();
   });
 
   it("S3 排除：失败时保持原状态且不弹成功提示", async () => {
diff --git a/src/pages/popup/usePopupData.ts b/src/pages/popup/usePopupData.ts
index acf130e36..779f11d0f 100644
--- a/src/pages/popup/usePopupData.ts
+++ b/src/pages/popup/usePopupData.ts
@@ -1,5 +1,4 @@
 import { useState, useEffect, useCallback, useRef, useMemo } from "react";
-import { useTranslation } from "react-i18next";
 import type { ScriptMenu, ScriptMenuItem, TPopupScript } from "@App/app/service/service_worker/types";
 import type { TDeleteScript, TEnableScript, TScriptRunStatus } from "@App/app/service/queue";
 import { popupClient, scriptClient, runtimeClient, requestOpenBatchUpdatePage } from "../store/features/script";
@@ -9,7 +8,6 @@ import { ExtVersion, ExtServer } from "@App/app/const";
 import { sanitizeHTML } from "@App/pkg/utils/sanitize";
 import { openInCurrentTab } from "@App/pkg/utils/utils";
 import { cacheInstance } from "@App/app/cache";
-import { notify } from "@App/pages/components/ui/toast";
 import { scriptListSorter, type ScriptProvider, usePopupDataQuery } from "./preload";
 export { ExtVersion } from "@App/app/const";
 export { VersionCompare, versionCompare } from "@App/pkg/utils/semver";
@@ -80,7 +78,6 @@ function filterScripts(list: ScriptMenu[], query: string): ScriptMenu[] {
 // ========== Hook ==========
 
 export function usePopupData() {
-  const { t } = useTranslation();
   const popupData = usePopupDataQuery();
   const initialData = popupData.data;
   const [initialized, setInitialized] = useState(!!initialData);
@@ -293,12 +290,11 @@ export function usePopupData() {
         setScriptList((prev) =>
           prev.map((s) => (s.uuid === uuid ? { ...s, isEffective: true, hasMatchOverride: true } : s))
         );
-        notify.success(t("update_success"));
       } catch (e) {
         showError(String(e));
       }
     },
-    [showError, t]
+    [showError]
   );
 
   const handleExcludeFromMatch = useCallback(
@@ -308,12 +304,11 @@ export function usePopupData() {
       try {
         await scriptClient.excludeFromMatch(uuid, `*://${host}/*`);
         setScriptList((prev) => prev.map((s) => (s.uuid === uuid ? { ...s, isEffective: false } : s)));
-        notify.success(t("update_success"));
       } catch (e) {
         showError(String(e));
       }
     },
-    [showError, t]
+    [showError]
   );
 
   const handleAllowUrl = useCallback(
@@ -323,12 +318,11 @@ export function usePopupData() {
       try {
         await scriptClient.allowUrl(uuid, `*://${host}/*`, `*://${host}/*`);
         setScriptList((prev) => prev.map((s) => (s.uuid === uuid ? { ...s, isEffective: true } : s)));
-        notify.success(t("update_success"));
       } catch (e) {
         showError(String(e));
       }
     },
-    [showError, t]
+    [showError]
   );
 
   /** 调用方需从 script.menus 中按 groupKey 过滤出所有匹配项传入 */

From 901e350527ee085a7862e6641b0858a13d486850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Tue, 11 Aug 2026 16:00:28 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=F0=9F=90=9B=20=E5=A4=84=E7=90=86=20PR=20?=
 =?UTF-8?q?#1666=20review=EF=BC=9A=E4=BF=AE=E5=A4=8D=E7=AB=99=E7=82=B9?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E6=93=8D=E4=BD=9C=E5=9B=9B=E7=B1=BB=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 空匹配覆盖时删除持久化 CompiledResource 并注销浏览器旧注册，
  避免 SW 重启后旧范围复活（原先只清内存 matcher）
- resetMatch 重置时一并撤销 onlyRunOnUrl 写入的 include 覆盖，
  @include 型脚本「仅在本站」后可从设置页重置恢复作者规则
- excludeFromMatch / excludeUrl 写入用户排除覆盖时并入作者
  @exclude，避免用户已有覆盖时整体替换丢作者规则（统一合并语义）
---
 .../service/service_worker/runtime.test.ts    | 20 +++++++
 src/app/service/service_worker/runtime.ts     |  9 ++-
 src/app/service/service_worker/script.test.ts | 55 ++++++++++++++++++-
 src/app/service/service_worker/script.ts      | 14 ++++-
 4 files changed, 93 insertions(+), 5 deletions(-)

diff --git a/src/app/service/service_worker/runtime.test.ts b/src/app/service/service_worker/runtime.test.ts
index 79f1dde0b..4fc2fcd4f 100644
--- a/src/app/service/service_worker/runtime.test.ts
+++ b/src/app/service/service_worker/runtime.test.ts
@@ -307,6 +307,26 @@ describe.concurrent("RuntimeService - getPageScriptMatchingResultByUrl 脚本匹
     expect(runtime.getPageScriptMatchingResultByUrl("https://www.example.com/", true).has(script.uuid)).toBe(false);
   });
 
+  it.concurrent("空匹配覆盖时应删除持久化 CompiledResource 并注销旧注册", async () => {
+    const { runtime, mockScriptService } = createRuntimeTestContext();
+    const script = createMockScript({
+      metadata: { match: ["https://www.example.com/*"] },
+      selfMetadata: { match: [] },
+      status: SCRIPT_STATUS_ENABLE,
+    });
+    const scriptRunResource = createScriptRunResource(script);
+    mockScriptService.buildScriptRunResource.mockResolvedValue(scriptRunResource);
+
+    const deleteSpy = vi.spyOn(runtime.compiledResourceDAO, "delete").mockResolvedValue(undefined);
+    const unregisterSpy = vi.spyOn(runtime, "unregistryPageScripts").mockResolvedValue(undefined);
+
+    await runtime.updateResourceOnScriptChange(script);
+
+    // 空覆盖 = 全站不匹配：旧 CompiledResource 与浏览器注册必须被清掉，否则 SW 重启后旧范围复活
+    expect(deleteSpy).toHaveBeenCalledWith(script.uuid);
+    expect(unregisterSpy).toHaveBeenCalledWith([script.uuid]);
+  });
+
   describe.concurrent("includeDisabled 选项", () => {
     it.concurrent("当 includeDisabled=false 时不返回禁用脚本；当 includeDisabled=true 时返回禁用脚本", async () => {
       // Arrange
diff --git a/src/app/service/service_worker/runtime.ts b/src/app/service/service_worker/runtime.ts
index 8d40634fc..88ed68dea 100644
--- a/src/app/service/service_worker/runtime.ts
+++ b/src/app/service/service_worker/runtime.ts
@@ -455,7 +455,14 @@ export class RuntimeService {
     }
     // 安装，启用，或earlyStartScript的value更新
     const ret = await this.buildAndSaveCompiledResourceFromScript(script, true);
-    if (!ret) return;
+    if (!ret) {
+      // 空匹配覆盖（match 与 include 均为空）时脚本不再匹配任何站点。
+      // 内存 matcher 已由 applyScriptMatchInfo 清空，这里再清掉持久化的 CompiledResource
+      // 并注销浏览器旧注册，否则 SW 重启后 waitInit 会信任旧资源、让旧范围复活。
+      await this.compiledResourceDAO.delete(script.uuid);
+      await this.unregistryPageScripts([script.uuid]);
+      return;
+    }
     const { apiScript } = ret;
     await this.loadPageScript(script, apiScript!);
   }
diff --git a/src/app/service/service_worker/script.test.ts b/src/app/service/service_worker/script.test.ts
index ae02e54e0..5bdde3a6a 100644
--- a/src/app/service/service_worker/script.test.ts
+++ b/src/app/service/service_worker/script.test.ts
@@ -677,6 +677,19 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
 
       expect(savedSelfMetadata()).toEqual({ exclude: ["*://ads.script.com/*", "*://user.com/*"] });
     });
+
+    it("已有用户排除覆盖时新增排除应同时保留作者与用户规则", async () => {
+      const script = createMockScript({
+        selfMetadata: { exclude: ["*://user-blocked.example/*"] },
+      });
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.excludeUrl({ uuid: script.uuid, excludePattern: "*://new.example/*", remove: false });
+
+      expect(savedSelfMetadata()).toEqual({
+        exclude: ["*://ads.script.com/*", "*://user-blocked.example/*", "*://new.example/*"],
+      });
+    });
   });
 
   describe("popup 站点范围快捷操作", () => {
@@ -812,9 +825,10 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
 
       await scriptService.excludeFromMatch({ uuid: script.uuid, matchPattern: "*://current.example/*" });
 
+      // 作者 @exclude（ads.script.com）并入用户覆盖，避免用户覆盖整体替换作者规则
       expect(savedSelfMetadata()).toEqual({
         match: ["*://allowed.example/*"],
-        exclude: ["*://blocked.example/*", "*://current.example/*"],
+        exclude: ["*://ads.script.com/*", "*://blocked.example/*", "*://current.example/*"],
       });
     });
 
@@ -865,6 +879,21 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
         exclude: ["*://author-blocked.example/*", "*://current.example/*"],
       });
     });
+
+    it("已有用户排除覆盖时排除站点应同时保留作者与用户排除规则", async () => {
+      const script = createMockScript({
+        metadata: { exclude: ["*://author-blocked.example/*"] },
+        selfMetadata: { match: ["*://current.example/*"], exclude: ["*://user-blocked.example/*"] },
+      });
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.excludeFromMatch({ uuid: script.uuid, matchPattern: "*://current.example/*" });
+
+      expect(savedSelfMetadata()).toEqual({
+        match: [],
+        exclude: ["*://author-blocked.example/*", "*://user-blocked.example/*", "*://current.example/*"],
+      });
+    });
   });
 
   describe("resetMatch / resetExclude - 编辑器匹配列表", () => {
@@ -886,6 +915,30 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
       expect(savedSelfMetadata()).toEqual({ match: [] });
     });
 
+    it("重置时应同时撤销 onlyRunOnUrl 写入的 include 覆盖，恢复作者 include", async () => {
+      const script = createMockScript({
+        metadata: { include: ["*://included.example/*"] },
+        selfMetadata: { match: ["*://current.example/*"], include: [] },
+      });
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.resetMatch({ uuid: script.uuid, match: undefined });
+
+      // match 与 include 覆盖是 onlyRunOnUrl 一并写入的 URL 范围单元，重置须一并撤销
+      expect(savedSelfMetadata()).toBeUndefined();
+    });
+
+    it("传入空数组(删除最后一项)时应保留 include 覆盖", async () => {
+      const script = createMockScript({
+        selfMetadata: { match: ["*://current.example/*"], include: [] },
+      });
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.resetMatch({ uuid: script.uuid, match: [] });
+
+      expect(savedSelfMetadata()).toEqual({ match: [], include: [] });
+    });
+
     it("resetExclude 传入 undefined(重置)应删除用户覆盖", async () => {
       const script = createMockScript({ selfMetadata: { exclude: ["*://user.com/*"] } });
       vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
diff --git a/src/app/service/service_worker/script.ts b/src/app/service/service_worker/script.ts
index 82965cd8b..3e8656c84 100644
--- a/src/app/service/service_worker/script.ts
+++ b/src/app/service/service_worker/script.ts
@@ -901,8 +901,9 @@ export class ScriptService {
     if (!script) {
       throw new Error("script not found");
     }
-    // 建立Set去掉重复（如有）
-    const excludeSet = new Set(script.selfMetadata?.exclude || script.metadata?.exclude || []);
+    // 建立Set去掉重复（如有）；用户覆盖整体替换作者规则，因此须把作者 @exclude 一并并入，
+    // 否则用户已有排除覆盖时会丢作者规则
+    const excludeSet = new Set([...(script.metadata?.exclude || []), ...(script.selfMetadata?.exclude || [])]);
     if (remove) {
       const deleted = excludeSet.delete(excludePattern);
       if (!deleted) {
@@ -973,7 +974,8 @@ export class ScriptService {
         matchSet.delete(matchPattern);
         script = selfMetadataUpdate(script, "match", matchSet);
       }
-      const excludeSet = new Set(script.selfMetadata?.exclude || script.metadata?.exclude || []);
+      // 用户覆盖整体替换作者规则，因此把作者 @exclude 一并并入用户覆盖，避免丢作者规则
+      const excludeSet = new Set([...(script.metadata?.exclude || []), ...(script.selfMetadata?.exclude || [])]);
       excludeSet.add(matchPattern);
       script = selfMetadataUpdate(script, "exclude", excludeSet);
       await this.scriptDAO.update(uuid, script);
@@ -1013,6 +1015,12 @@ export class ScriptService {
     const matchSet = match === undefined ? undefined : new Set(match);
     // 更新 script.selfMetadata.match
     script = selfMetadataUpdate(script, "match", matchSet);
+    if (match === undefined) {
+      // match 与 include 覆盖是 onlyRunOnUrl 一并写入的 URL 范围单元：重置 match 必须同时撤销
+      // include 覆盖，否则 @include 型脚本「仅在本站」后从设置页重置会残留 include:[]，
+      // 有效 metadata 失去全部 URL 规则且无法从设置页恢复
+      script = selfMetadataUpdate(script, "include", undefined);
+    }
     return this.scriptDAO
       .update(uuid, script)
       .then(() => {

From 42ed69f2167e06aa33193d35c9b60b8f1986d0be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Tue, 11 Aug 2026 16:22:54 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E7=9C=9F=E5=AE=9E=E4=BB=93=E5=BA=93=20issue=20=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=A3=80=E6=9F=A5=EF=BC=8C=E6=B6=88=E9=99=A4=20340ms?=
 =?UTF-8?q?=20=E5=81=B6=E5=8F=91=E8=B6=85=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

全量扫描（12 模板 YAML 解析 + 全量 src 预填契约 TS AST 遍历，冷启动
~200ms）原来塞在一个受 fast 项目 340ms 单元预算约束的 it 里，CI 并行
负载下必然偶发 Test timed out in 340ms。把「计算」移进 beforeAll
（vitest hook 走默认 10s 预算，与 testTimeout 无关）并缓存结果，
断言阶段的 it 只做快照校验；行为与 CLI check:issue-templates 不变。
---
 scripts/check-issue-templates.test.mjs | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/scripts/check-issue-templates.test.mjs b/scripts/check-issue-templates.test.mjs
index b2b1f5145..d599cff63 100644
--- a/scripts/check-issue-templates.test.mjs
+++ b/scripts/check-issue-templates.test.mjs
@@ -1,4 +1,4 @@
-import { describe, it, expect, afterEach } from "vitest";
+import { describe, it, expect, beforeAll, afterEach } from "vitest";
 import { mkdirSync, writeFileSync, rmSync } from "node:fs";
 import path from "node:path";
 import os from "node:os";
@@ -81,10 +81,6 @@ describe("issue 模板机械检查", () => {
     expect(problemsOf(makeFixtureRoot())).toEqual([]);
   });
 
-  it("仓库现有的 issue 模板应全部通过检查", () => {
-    expect(problemsOf(REPO_ROOT)).toEqual([]);
-  });
-
   describe("YAML 与 issue-form schema", () => {
     it("未加引号导致的 YAML 解析失败应报错，而不是被跳过", () => {
       // description 里裸露的 `: ` 会让 YAML 认为这里又开了一个映射键。
@@ -224,3 +220,22 @@ describe("issue 模板机械检查", () => {
     });
   });
 });
+
+// 真实仓库模板检查是 I/O 密集的集成检查，不是微单元测试：它要读取全部 12 个模板并做 YAML 解析，
+// 再对全量 src 做 issues/new 预填契约的 TS AST 扫描，还要加载 yaml / typescript 两个重型依赖
+// （冷启动实测 ~200ms，CI 并行负载下还会成倍放大）。它不该套用 fast 项目的 340ms 单元预算——
+// 那正是它偶发超时（CI 偶发 Test timed out in 340ms）的根因，与上面的 fixture 测试成本不同。
+//
+// 因此把「计算」放进 beforeAll：vitest 的 hook 走默认 10s 预算，与 testTimeout 无关，只算一次
+// 并缓存；「断言」阶段的 it 只对已算好的结果做快照校验，微秒级完成，也不会把仓库扫描重复执行。
+// 以后若要加更多真实仓库断言，直接读下面的缓存即可。
+describe("仓库现有模板（集成检查）", () => {
+  let repoCheck;
+  beforeAll(() => {
+    repoCheck = runCheck(REPO_ROOT);
+  });
+
+  it("全部通过机械检查", () => {
+    expect(repoCheck.problems).toEqual([]);
+  });
+});

From e4a9e3057447d8150b86cda3075e5ea83196cb8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Tue, 11 Aug 2026 16:54:14 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=F0=9F=90=9B=20=E5=A4=84=E7=90=86=20PR=20?=
 =?UTF-8?q?#1666=20review=20=E4=BA=8C=E8=BD=AE=EF=BC=9AallowUrl=20?=
 =?UTF-8?q?=E5=B9=B6=E5=85=A5=E4=BD=9C=E8=80=85=20@exclude=EF=BC=8C?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9=E8=8C=83=E5=9B=B4=E8=AF=BB=E6=94=B9=E5=86=99?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E4=B8=B2=E8=A1=8C=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/service/service_worker/script.test.ts |  60 +++++++-
 src/app/service/service_worker/script.ts      | 139 +++++++++---------
 2 files changed, 128 insertions(+), 71 deletions(-)

diff --git a/src/app/service/service_worker/script.test.ts b/src/app/service/service_worker/script.test.ts
index 5bdde3a6a..b31c246cf 100644
--- a/src/app/service/service_worker/script.test.ts
+++ b/src/app/service/service_worker/script.test.ts
@@ -765,6 +765,41 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
       });
     });
 
+    it("并发 onlyRunOnUrl 与 resetMatch 应串行执行并保留两次读改写", async () => {
+      let stored = createMockScript();
+      let signalFirstUpdate!: () => void;
+      let releaseFirstUpdate!: () => void;
+      const firstUpdateStarted = new Promise<void>((resolve) => {
+        signalFirstUpdate = resolve;
+      });
+      const firstUpdateRelease = new Promise<void>((resolve) => {
+        releaseFirstUpdate = resolve;
+      });
+      let updateCount = 0;
+      vi.mocked(mockScriptDAO.get).mockImplementation(async () => stored);
+      vi.mocked(mockScriptDAO.update).mockImplementation(async (_uuid, next) => {
+        updateCount += 1;
+        if (updateCount === 1) {
+          signalFirstUpdate();
+          await firstUpdateRelease;
+        }
+        stored = { ...stored, ...next };
+        return stored;
+      });
+
+      const onlyRun = scriptService.onlyRunOnUrl({ uuid: stored.uuid, matchPattern: "*://current.example/*" });
+      await firstUpdateStarted;
+      const reset = scriptService.resetMatch({ uuid: stored.uuid, match: ["*://edited.example/*"] });
+      await Promise.resolve();
+      await Promise.resolve();
+      releaseFirstUpdate();
+      await Promise.all([onlyRun, reset]);
+
+      // popup 的 onlyRunOnUrl 与设置页的 resetMatch 并发读改写须串行：resetMatch 后写，其
+      // match 覆盖生效，同时不覆盖 onlyRunOnUrl 写入的 include 覆盖
+      expect(stored.selfMetadata).toEqual({ match: ["*://edited.example/*"], include: [] });
+    });
+
     it("自定义匹配未覆盖当前站点时应把当前站点加入允许列表", async () => {
       const script = createMockScript({
         selfMetadata: { match: ["*://allowed.example/*"], exclude: ["*://current.example/*"] },
@@ -777,9 +812,10 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
         excludePattern: "*://current.example/*",
       });
 
+      // 作者 @exclude（ads.script.com）并入用户覆盖，避免移除当前项时丢作者规则
       expect(savedSelfMetadata()).toEqual({
         match: ["*://allowed.example/*", "*://current.example/*"],
-        exclude: [],
+        exclude: ["*://ads.script.com/*"],
       });
     });
 
@@ -793,7 +829,8 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
         excludePattern: "*://current.example/*",
       });
 
-      expect(savedSelfMetadata()).toEqual({ exclude: [] });
+      // 移除当前站点时并入作者 @exclude，避免用户覆盖整体替换丢作者规则
+      expect(savedSelfMetadata()).toEqual({ exclude: ["*://ads.script.com/*"] });
     });
 
     it("只有匹配覆盖而没有排除覆盖时应保留作者排除", async () => {
@@ -814,6 +851,25 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
       });
     });
 
+    it("已有用户排除覆盖时 allowUrl 移除当前站点应保留作者与用户排除规则", async () => {
+      const script = createMockScript({
+        metadata: { exclude: ["*://author-blocked.example/*"] },
+        selfMetadata: { exclude: ["*://current.example/*", "*://user-blocked.example/*"] },
+      });
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.allowUrl({
+        uuid: script.uuid,
+        matchPattern: "*://current.example/*",
+        excludePattern: "*://current.example/*",
+      });
+
+      // 用户覆盖整体替换作者规则，allowUrl 移除当前项时须并入作者 @exclude，避免丢作者规则
+      expect(savedSelfMetadata()).toEqual({
+        exclude: ["*://author-blocked.example/*", "*://user-blocked.example/*"],
+      });
+    });
+
     it("排除已包含站点时应移出用户匹配并加入用户排除", async () => {
       const script = createMockScript({
         selfMetadata: {
diff --git a/src/app/service/service_worker/script.ts b/src/app/service/service_worker/script.ts
index 3e8656c84..6fa6b5670 100644
--- a/src/app/service/service_worker/script.ts
+++ b/src/app/service/service_worker/script.ts
@@ -897,34 +897,34 @@ export class ScriptService {
 
   // ScriptMenuList 的 excludeUrl - 排除或回复
   async excludeUrl({ uuid, excludePattern, remove }: { uuid: string; excludePattern: string; remove: boolean }) {
-    let script = await this.scriptDAO.get(uuid);
-    if (!script) {
-      throw new Error("script not found");
-    }
-    // 建立Set去掉重复（如有）；用户覆盖整体替换作者规则，因此须把作者 @exclude 一并并入，
-    // 否则用户已有排除覆盖时会丢作者规则
-    const excludeSet = new Set([...(script.metadata?.exclude || []), ...(script.selfMetadata?.exclude || [])]);
-    if (remove) {
-      const deleted = excludeSet.delete(excludePattern);
-      if (!deleted) {
-        return; // scriptDAO 不用更新
+    return stackAsyncTask("script-site-scope", async () => {
+      let script = await this.scriptDAO.get(uuid);
+      if (!script) {
+        throw new Error("script not found");
       }
-    } else {
-      excludeSet.add(excludePattern);
-    }
-    // 更新 script.selfMetadata.exclude
-    script = selfMetadataUpdate(script, "exclude", excludeSet);
-    return this.scriptDAO
-      .update(uuid, script)
-      .then(() => {
+      // 建立Set去掉重复（如有）；用户覆盖整体替换作者规则，因此须把作者 @exclude 一并并入，
+      // 否则用户已有排除覆盖时会丢作者规则
+      const excludeSet = new Set([...(script.metadata?.exclude || []), ...(script.selfMetadata?.exclude || [])]);
+      if (remove) {
+        const deleted = excludeSet.delete(excludePattern);
+        if (!deleted) {
+          return; // scriptDAO 不用更新
+        }
+      } else {
+        excludeSet.add(excludePattern);
+      }
+      // 更新 script.selfMetadata.exclude
+      script = selfMetadataUpdate(script, "exclude", excludeSet);
+      try {
+        await this.scriptDAO.update(uuid, script);
         // 广播一下
         this.publishInstallScript(script, { update: true });
         return true;
-      })
-      .catch((e) => {
+      } catch (e) {
         this.logger.error("exclude url error", Logger.E(e));
         throw e;
-      });
+      }
+    });
   }
 
   async onlyRunOnUrl({ uuid, matchPattern }: { uuid: string; matchPattern: string }) {
@@ -955,7 +955,8 @@ export class ScriptService {
         script = selfMetadataUpdate(script, "match", new Set([...script.selfMetadata.match, matchPattern]));
       }
       if (script.selfMetadata?.exclude !== undefined) {
-        const excludeSet = new Set(script.selfMetadata.exclude);
+        // 用户覆盖整体替换作者规则，因此移除当前项时把作者 @exclude 一并并入，避免丢作者规则
+        const excludeSet = new Set([...(script.metadata?.exclude || []), ...script.selfMetadata.exclude]);
         excludeSet.delete(excludePattern);
         script = selfMetadataUpdate(script, "exclude", excludeSet);
       }
@@ -985,53 +986,53 @@ export class ScriptService {
   }
 
   async resetExclude({ uuid, exclude }: { uuid: string; exclude: string[] | undefined }) {
-    let script = await this.scriptDAO.get(uuid);
-    if (!script) {
-      throw new Error("script not found");
-    }
-    // 建立Set去掉重复（如有）；exclude 为 undefined 表示重置，即撤销用户覆盖
-    const excludeSet = exclude === undefined ? undefined : new Set(exclude);
-    // 更新 script.selfMetadata.exclude
-    script = selfMetadataUpdate(script, "exclude", excludeSet);
-    return this.scriptDAO
-      .update(uuid, script)
-      .then(() => {
+    return stackAsyncTask("script-site-scope", async () => {
+      let script = await this.scriptDAO.get(uuid);
+      if (!script) {
+        throw new Error("script not found");
+      }
+      // 建立Set去掉重复（如有）；exclude 为 undefined 表示重置，即撤销用户覆盖
+      const excludeSet = exclude === undefined ? undefined : new Set(exclude);
+      // 更新 script.selfMetadata.exclude
+      script = selfMetadataUpdate(script, "exclude", excludeSet);
+      try {
+        await this.scriptDAO.update(uuid, script);
         // 广播一下
         this.publishInstallScript(script, { update: true });
         return true;
-      })
-      .catch((e) => {
+      } catch (e) {
         this.logger.error("reset exclude error", Logger.E(e));
         throw e;
-      });
+      }
+    });
   }
 
   async resetMatch({ uuid, match }: { uuid: string; match: string[] | undefined }) {
-    let script = await this.scriptDAO.get(uuid);
-    if (!script) {
-      throw new Error("script not found");
-    }
-    // 建立Set去掉重复（如有）；match 为 undefined 表示重置，即撤销用户覆盖
-    const matchSet = match === undefined ? undefined : new Set(match);
-    // 更新 script.selfMetadata.match
-    script = selfMetadataUpdate(script, "match", matchSet);
-    if (match === undefined) {
-      // match 与 include 覆盖是 onlyRunOnUrl 一并写入的 URL 范围单元：重置 match 必须同时撤销
-      // include 覆盖，否则 @include 型脚本「仅在本站」后从设置页重置会残留 include:[]，
-      // 有效 metadata 失去全部 URL 规则且无法从设置页恢复
-      script = selfMetadataUpdate(script, "include", undefined);
-    }
-    return this.scriptDAO
-      .update(uuid, script)
-      .then(() => {
+    return stackAsyncTask("script-site-scope", async () => {
+      let script = await this.scriptDAO.get(uuid);
+      if (!script) {
+        throw new Error("script not found");
+      }
+      // 建立Set去掉重复（如有）；match 为 undefined 表示重置，即撤销用户覆盖
+      const matchSet = match === undefined ? undefined : new Set(match);
+      // 更新 script.selfMetadata.match
+      script = selfMetadataUpdate(script, "match", matchSet);
+      if (match === undefined) {
+        // match 与 include 覆盖是 onlyRunOnUrl 一并写入的 URL 范围单元：重置 match 必须同时撤销
+        // include 覆盖，否则 @include 型脚本「仅在本站」后从设置页重置会残留 include:[]，
+        // 有效 metadata 失去全部 URL 规则且无法从设置页恢复
+        script = selfMetadataUpdate(script, "include", undefined);
+      }
+      try {
+        await this.scriptDAO.update(uuid, script);
         // 广播一下
         this.publishInstallScript(script, { update: true });
         return true;
-      })
-      .catch((e) => {
+      } catch (e) {
         this.logger.error("reset match error", Logger.E(e));
         throw e;
-      });
+      }
+    });
   }
 
   async checkUpdatesAvailable(
@@ -1611,23 +1612,23 @@ export class ScriptService {
 
   // 更新脚本元数据；value 为 undefined 表示撤销用户覆盖，生效值回落脚本自带 metadata
   async updateMetadata({ uuid, key, value }: { uuid: string; key: string; value: string[] | undefined }) {
-    let script = await this.scriptDAO.get(uuid);
-    if (!script) {
-      throw new Error("script not found");
-    }
-    const valueSet = value === undefined ? undefined : new Set(value);
-    script = selfMetadataUpdate(script, key, valueSet);
-    return this.scriptDAO
-      .update(uuid, script)
-      .then(() => {
+    return stackAsyncTask("script-site-scope", async () => {
+      let script = await this.scriptDAO.get(uuid);
+      if (!script) {
+        throw new Error("script not found");
+      }
+      const valueSet = value === undefined ? undefined : new Set(value);
+      script = selfMetadataUpdate(script, key, valueSet);
+      try {
+        await this.scriptDAO.update(uuid, script);
         // 广播一下
         this.mq.publish<TInstallScript>("installScript", { script, update: true });
         return true;
-      })
-      .catch((e) => {
+      } catch (e) {
         this.logger.error("reset exclude error", Logger.E(e));
         throw e;
-      });
+      }
+    });
   }
 
   async getBatchUpdateRecordLite(i: number) {

From 30a1f211130bc155bb6cd371bf8e722932a2513a Mon Sep 17 00:00:00 2001
From: cyfung1031 <44498510+cyfung1031@users.noreply.github.com>
Date: Tue, 11 Aug 2026 18:00:06 +0900
Subject: [PATCH 14/14] fix: preserve explicit include overrides

---
 src/app/repo/metadata.ts                      |  3 ++
 src/app/service/service_worker/script.test.ts | 40 ++++++++++++++++++-
 src/app/service/service_worker/script.ts      | 14 +++++--
 src/app/service/service_worker/utils.test.ts  |  9 +++++
 src/app/service/service_worker/utils.ts       |  4 ++
 5 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/src/app/repo/metadata.ts b/src/app/repo/metadata.ts
index 8a3502559..4c4844de5 100644
--- a/src/app/repo/metadata.ts
+++ b/src/app/repo/metadata.ts
@@ -1,5 +1,8 @@
 export type SCMetadata = Partial<Record<string, string[]>>;
 
+// OnlyRunOnUrl writes an empty include override; retain its provenance so resetMatch can distinguish it from a user override.
+export const SELF_METADATA_ONLY_RUN_ON_URL = "__scriptcat_only_run_on_url";
+
 // 解析标签 允许使用逗号和空格分隔
 export function parseTags(metadata: SCMetadata): string[] {
   const tags = new Set<string>();
diff --git a/src/app/service/service_worker/script.test.ts b/src/app/service/service_worker/script.test.ts
index b31c246cf..4330ce12e 100644
--- a/src/app/service/service_worker/script.test.ts
+++ b/src/app/service/service_worker/script.test.ts
@@ -19,6 +19,7 @@ import type { Group } from "@Packages/message/server";
 import type { IMessageQueue } from "@Packages/message/message_queue";
 import type { MessageSend } from "@Packages/message/types";
 import { ScriptClient } from "./client";
+import { SELF_METADATA_ONLY_RUN_ON_URL } from "@App/app/repo/metadata";
 
 initTestEnv();
 
@@ -725,7 +726,11 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
 
       await scriptService.onlyRunOnUrl({ uuid: script.uuid, matchPattern: "*://current.example/*" });
 
-      expect(savedSelfMetadata()).toEqual({ match: ["*://current.example/*"], include: [] });
+      expect(savedSelfMetadata()).toEqual({
+        match: ["*://current.example/*"],
+        include: [],
+        [SELF_METADATA_ONLY_RUN_ON_URL]: ["*://current.example/*"],
+      });
     });
 
     it("并发站点范围操作应保留两个操作的覆盖变更", async () => {
@@ -974,7 +979,11 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
     it("重置时应同时撤销 onlyRunOnUrl 写入的 include 覆盖，恢复作者 include", async () => {
       const script = createMockScript({
         metadata: { include: ["*://included.example/*"] },
-        selfMetadata: { match: ["*://current.example/*"], include: [] },
+        selfMetadata: {
+          match: ["*://current.example/*"],
+          include: [],
+          [SELF_METADATA_ONLY_RUN_ON_URL]: ["*://current.example/*"],
+        },
       });
       vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
 
@@ -984,6 +993,15 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
       expect(savedSelfMetadata()).toBeUndefined();
     });
 
+    it("重置 match 时应保留独立的 include 覆盖", async () => {
+      const script = createMockScript({ selfMetadata: { include: ["*://user.example/*"] } });
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.resetMatch({ uuid: script.uuid, match: undefined });
+
+      expect(savedSelfMetadata()).toEqual({ include: ["*://user.example/*"] });
+    });
+
     it("传入空数组(删除最后一项)时应保留 include 覆盖", async () => {
       const script = createMockScript({
         selfMetadata: { match: ["*://current.example/*"], include: [] },
@@ -1032,5 +1050,23 @@ describe("ScriptService selfMetadata 用户覆盖", () => {
 
       expect(savedSelfMetadata()).toBeUndefined();
     });
+
+    it("通用 metadata 更新可保存 include 覆盖并清除 onlyRunOnUrl provenance", async () => {
+      const script = createMockScript({
+        selfMetadata: {
+          match: ["*://current.example/*"],
+          include: [],
+          [SELF_METADATA_ONLY_RUN_ON_URL]: ["*://current.example/*"],
+        },
+      });
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.updateMetadata({ uuid: script.uuid, key: "include", value: ["*://user.example/*"] });
+
+      expect(savedSelfMetadata()).toEqual({
+        match: ["*://current.example/*"],
+        include: ["*://user.example/*"],
+      });
+    });
   });
 });
diff --git a/src/app/service/service_worker/script.ts b/src/app/service/service_worker/script.ts
index 6fa6b5670..985067df2 100644
--- a/src/app/service/service_worker/script.ts
+++ b/src/app/service/service_worker/script.ts
@@ -19,6 +19,7 @@ import type {
   ScriptRunResource,
   ScriptSite,
 } from "@App/app/repo/scripts";
+import { SELF_METADATA_ONLY_RUN_ON_URL } from "@App/app/repo/metadata";
 import { SCRIPT_STATUS_DISABLE, SCRIPT_STATUS_ENABLE, ScriptCodeDAO } from "@App/app/repo/scripts";
 import { type IMessageQueue } from "@Packages/message/message_queue";
 import { type ScriptInfo, type InstallSource, createTempCodeEntry } from "@App/pkg/utils/scriptInstall";
@@ -933,6 +934,7 @@ export class ScriptService {
       if (!script) throw new Error("script not found");
       script = selfMetadataUpdate(script, "match", new Set([matchPattern]));
       script = selfMetadataUpdate(script, "include", new Set());
+      script = selfMetadataUpdate(script, SELF_METADATA_ONLY_RUN_ON_URL, new Set([matchPattern]));
       await this.scriptDAO.update(uuid, script);
       this.publishInstallScript(script, { update: true });
       return true;
@@ -953,6 +955,7 @@ export class ScriptService {
       if (!script) throw new Error("script not found");
       if (script.selfMetadata?.match !== undefined) {
         script = selfMetadataUpdate(script, "match", new Set([...script.selfMetadata.match, matchPattern]));
+        script = selfMetadataUpdate(script, SELF_METADATA_ONLY_RUN_ON_URL, undefined);
       }
       if (script.selfMetadata?.exclude !== undefined) {
         // 用户覆盖整体替换作者规则，因此移除当前项时把作者 @exclude 一并并入，避免丢作者规则
@@ -974,6 +977,7 @@ export class ScriptService {
         const matchSet = new Set(script.selfMetadata.match);
         matchSet.delete(matchPattern);
         script = selfMetadataUpdate(script, "match", matchSet);
+        script = selfMetadataUpdate(script, SELF_METADATA_ONLY_RUN_ON_URL, undefined);
       }
       // 用户覆盖整体替换作者规则，因此把作者 @exclude 一并并入用户覆盖，避免丢作者规则
       const excludeSet = new Set([...(script.metadata?.exclude || []), ...(script.selfMetadata?.exclude || [])]);
@@ -1017,12 +1021,11 @@ export class ScriptService {
       const matchSet = match === undefined ? undefined : new Set(match);
       // 更新 script.selfMetadata.match
       script = selfMetadataUpdate(script, "match", matchSet);
-      if (match === undefined) {
-        // match 与 include 覆盖是 onlyRunOnUrl 一并写入的 URL 范围单元：重置 match 必须同时撤销
-        // include 覆盖，否则 @include 型脚本「仅在本站」后从设置页重置会残留 include:[]，
-        // 有效 metadata 失去全部 URL 规则且无法从设置页恢复
+      if (script.selfMetadata?.[SELF_METADATA_ONLY_RUN_ON_URL] !== undefined && match === undefined) {
+        // onlyRunOnUrl owns the empty include override; an imported or explicit include override does not.
         script = selfMetadataUpdate(script, "include", undefined);
       }
+      script = selfMetadataUpdate(script, SELF_METADATA_ONLY_RUN_ON_URL, undefined);
       try {
         await this.scriptDAO.update(uuid, script);
         // 广播一下
@@ -1619,6 +1622,9 @@ export class ScriptService {
       }
       const valueSet = value === undefined ? undefined : new Set(value);
       script = selfMetadataUpdate(script, key, valueSet);
+      if (key === "match" || key === "include") {
+        script = selfMetadataUpdate(script, SELF_METADATA_ONLY_RUN_ON_URL, undefined);
+      }
       try {
         await this.scriptDAO.update(uuid, script);
         // 广播一下
diff --git a/src/app/service/service_worker/utils.test.ts b/src/app/service/service_worker/utils.test.ts
index 5f935d6e6..cd39524fe 100644
--- a/src/app/service/service_worker/utils.test.ts
+++ b/src/app/service/service_worker/utils.test.ts
@@ -9,6 +9,7 @@ import {
   shouldAutoOpenChangelog,
 } from "./utils";
 import type { SCMetadata, Script, ScriptRunResource } from "@App/app/repo/scripts";
+import { SELF_METADATA_ONLY_RUN_ON_URL } from "@App/app/repo/metadata";
 import { SCRIPT_TYPE_NORMAL, SCRIPT_STATUS_ENABLE, SCRIPT_RUN_STATUS_COMPLETE } from "@App/app/repo/scripts";
 import type { ScriptMatchInfo } from "./types";
 import { extractUrlPatterns } from "@App/pkg/utils/url_matcher";
@@ -164,6 +165,14 @@ describe.concurrent("getCombinedMeta", () => {
     expect(result.grant).toEqual([]);
     expect(result.exclude).toEqual(["https://admin.com/*"]);
   });
+
+  it.concurrent("不应把 onlyRunOnUrl provenance 合并为有效 metadata", () => {
+    const result = getCombinedMeta(baseMetadata, {
+      [SELF_METADATA_ONLY_RUN_ON_URL]: ["*://current.example/*"],
+    });
+
+    expect(result).toEqual(baseMetadata);
+  });
 });
 
 describe.concurrent("selfMetadataUpdate", () => {
diff --git a/src/app/service/service_worker/utils.ts b/src/app/service/service_worker/utils.ts
index 2f141befb..4dbc3ae28 100644
--- a/src/app/service/service_worker/utils.ts
+++ b/src/app/service/service_worker/utils.ts
@@ -1,5 +1,6 @@
 export const BrowserNoSupport = new Error("browserNoSupport");
 import type { SCMetadata, Script, ScriptLoadInfo, ScriptRunResource } from "@App/app/repo/scripts";
+import { SELF_METADATA_ONLY_RUN_ON_URL } from "@App/app/repo/metadata";
 import { getMetadataStr, getUserConfigStr } from "@App/pkg/utils/utils";
 import type { ScriptMatchInfo } from "./types";
 import {
@@ -142,6 +143,9 @@ export function getCombinedMeta(metaBase: SCMetadata, metaCustom: SCMetadata): S
     return metaRet;
   }
   for (const key of Object.keys(metaCustom)) {
+    if (key === SELF_METADATA_ONLY_RUN_ON_URL) {
+      continue;
+    }
     const v = metaCustom[key];
     metaRet[key] = v ? [...v] : undefined;
   }