From 65a3c879f15bbcf732e8225e9b0f4b37c96429b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Mon, 13 Jul 2026 10:21:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E7=BD=91?=
 =?UTF-8?q?=E7=AB=99=E5=8C=B9=E9=85=8D/=E6=8E=92=E9=99=A4=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=90=8E=E6=B8=85=E7=A9=BA=E5=88=97=E8=A1=A8(?=
 =?UTF-8?q?=E5=BA=94=E5=9B=9E=E8=90=BD=E8=84=9A=E6=9C=AC=E8=87=AA=E5=B8=A6?=
 =?UTF-8?q?=E8=A7=84=E5=88=99)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ScriptEditor/tabs/SettingsPane.test.tsx   | 26 +++++++++++++++++++
 .../routes/ScriptEditor/tabs/SettingsPane.tsx | 17 +++++++++---
 2 files changed, 40 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 63f2b6f06..a5f9e7c4a 100644
--- a/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.test.tsx
+++ b/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.test.tsx
@@ -259,6 +259,32 @@ describe("SettingsPane 网站匹配/排除", () => {
     fireEvent.click(screen.getByText(t("confirm"), { selector: "button" }));
     expect(resetMatch).toHaveBeenCalledWith("u1", undefined);
   });
+
+  it("重置匹配后应恢复脚本自带规则而非清空列表", async () => {
+    render(<SettingsPane uuid="u1" />);
+    await screen.findByText("*://user.com/*");
+    fireEvent.click(screen.getAllByText(t("reset"), { selector: "button" })[0]);
+    fireEvent.click(screen.getByText(t("confirm"), { selector: "button" }));
+    // 用户添加的 user.com 被清除，脚本自带的 script.com 应保留并标记为「脚本」
+    expect(screen.getByText("*://script.com/*")).toBeInTheDocument();
+    expect(screen.queryByText("*://user.com/*")).toBeNull();
+    expect(screen.getByText(t("editor:from_script"))).toBeInTheDocument();
+  });
+
+  it("重置排除后应恢复脚本自带规则而非清空列表", async () => {
+    fetchScript.mockResolvedValue({
+      ...sampleScript(),
+      metadata: { ...sampleScript().metadata, exclude: ["*://ads.script.com/*"] },
+      selfMetadata: { ...sampleScript().selfMetadata, exclude: ["*://ads.script.com/*", "*://exclude.com/*"] },
+    });
+    render(<SettingsPane uuid="u1" />);
+    await screen.findByText("*://exclude.com/*");
+    fireEvent.click(screen.getAllByText(t("reset"), { selector: "button" })[1]);
+    fireEvent.click(screen.getByText(t("confirm"), { selector: "button" }));
+    // 用户添加的 exclude.com 被清除，脚本自带的 ads.script.com 应保留
+    expect(screen.getByText("*://ads.script.com/*")).toBeInTheDocument();
+    expect(screen.queryByText("*://exclude.com/*")).toBeNull();
+  });
 });
 
 describe("SettingsPane 授权管理(CORS)", () => {
diff --git a/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.tsx b/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.tsx
index 2b3ea1f7b..091a7d7ef 100644
--- a/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.tsx
+++ b/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.tsx
@@ -234,14 +234,25 @@ function SettingsPaneContent({ uuid, data }: SettingsPaneProps & { data: Setting
 
   // ===== 匹配 / 排除 =====
   const setMatchList = (kind: "match" | "exclude", next: string[] | undefined) => {
+    // next 为 undefined 表示重置：删除用户覆盖，生效列表回落到脚本自带的 metadata（与后端 selfMetadataUpdate 一致）
+    const metaList = kind === "match" ? metaMatch : metaExclude;
     if (kind === "match") {
       void scriptClient.resetMatch(uuid, next);
-      setMatches(next ?? []);
+      setMatches(next ?? metaList);
     } else {
       void scriptClient.resetExclude(uuid, next);
-      setExcludes(next ?? []);
+      setExcludes(next ?? metaList);
     }
-    patchSelf({ [kind]: next ?? [] });
+    setScript((prev) => {
+      if (!prev) return prev;
+      const selfMetadata = { ...prev.selfMetadata };
+      if (next === undefined) {
+        delete selfMetadata[kind];
+      } else {
+        selfMetadata[kind] = next;
+      }
+      return { ...prev, selfMetadata };
+    });
   };
   const openBulkMatch = (kind: "match" | "exclude") => {
     setBulkMatchValue("");

From 6e40df369f8acd9ecc0391b6f5e9fbe4684e5576 Mon Sep 17 00:00:00 2001
From: cyfung1031 <44498510+cyfung1031@users.noreply.github.com>
Date: Thu, 16 Jul 2026 00:34:32 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=90=9B=20=E5=88=A0=E9=99=A4=E6=9C=80?=
 =?UTF-8?q?=E5=90=8E=E4=B8=80=E9=A1=B9=E5=8C=B9=E9=85=8D/=E6=8E=92?=
 =?UTF-8?q?=E9=99=A4=E6=97=B6=E5=9B=9E=E8=90=BD=E8=84=9A=E6=9C=AC=E8=87=AA?=
 =?UTF-8?q?=E5=B8=A6=E8=A7=84=E5=88=99(=E5=AF=B9=E9=BD=90=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E7=A9=BA=E8=A6=86=E7=9B=96=E5=8D=B3=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E8=AF=AD=E4=B9=89)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../ScriptEditor/tabs/SettingsPane.test.tsx       | 15 +++++++++++++++
 .../routes/ScriptEditor/tabs/SettingsPane.tsx     | 12 +++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.test.tsx b/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.test.tsx
index a5f9e7c4a..51ab7e726 100644
--- a/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.test.tsx
+++ b/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.test.tsx
@@ -285,6 +285,21 @@ describe("SettingsPane 网站匹配/排除", () => {
     expect(screen.getByText("*://ads.script.com/*")).toBeInTheDocument();
     expect(screen.queryByText("*://exclude.com/*")).toBeNull();
   });
+
+  it("删除最后一项匹配后应回落脚本自带规则而非清空列表", async () => {
+    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" }));
+    // 后端 selfMetadataUpdate 收到空集即删除覆盖，生效列表回落 metadata.match，脚本自带规则应保留
+    expect(resetMatch).toHaveBeenCalledWith("u1", []);
+    expect(screen.getByText("*://script.com/*")).toBeInTheDocument();
+    expect(screen.getByText(t("editor:from_script"))).toBeInTheDocument();
+  });
 });
 
 describe("SettingsPane 授权管理(CORS)", () => {
diff --git a/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.tsx b/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.tsx
index 091a7d7ef..d2200b79e 100644
--- a/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.tsx
+++ b/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.tsx
@@ -234,22 +234,24 @@ function SettingsPaneContent({ uuid, data }: SettingsPaneProps & { data: Setting
 
   // ===== 匹配 / 排除 =====
   const setMatchList = (kind: "match" | "exclude", next: string[] | undefined) => {
-    // next 为 undefined 表示重置：删除用户覆盖，生效列表回落到脚本自带的 metadata（与后端 selfMetadataUpdate 一致）
+    // next 为 undefined（重置）或空数组（删除最后一项）时后端 selfMetadataUpdate 均删除用户覆盖，
+    // 生效列表回落到脚本自带的 metadata，前端乐观更新保持一致
+    const override = next?.length ? next : undefined;
     const metaList = kind === "match" ? metaMatch : metaExclude;
     if (kind === "match") {
       void scriptClient.resetMatch(uuid, next);
-      setMatches(next ?? metaList);
+      setMatches(override ?? metaList);
     } else {
       void scriptClient.resetExclude(uuid, next);
-      setExcludes(next ?? metaList);
+      setExcludes(override ?? metaList);
     }
     setScript((prev) => {
       if (!prev) return prev;
       const selfMetadata = { ...prev.selfMetadata };
-      if (next === undefined) {
+      if (override === undefined) {
         delete selfMetadata[kind];
       } else {
-        selfMetadata[kind] = next;
+        selfMetadata[kind] = override;
       }
       return { ...prev, selfMetadata };
     });

From d61759d6be9da7a5b28baa5fc9c57a6d9d4aa9b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Thu, 16 Jul 2026 15:55:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=90=9B=20selfMetadata=20=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E7=A9=BA=E8=A6=86=E7=9B=96=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=20tag/exclude/run-at=20=E7=9A=84=E5=88=A0=E9=99=A4=E5=8D=B3?=
 =?UTF-8?q?=E5=A4=8D=E6=B4=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

根因：selfMetadataUpdate 把空集合一律当成「删除覆盖」，导致用户永远无法
显式清空脚本自带的 tag / match / exclude——删到空后覆盖被删、生效值回落
metadata，刷新即复活。改为区分 undefined(撤销覆盖) 与空集合(显式清空)：

- selfMetadataUpdate 接受 Set|undefined，空集合持久化为 []
- resetMatch/resetExclude/updateMetadata RPC 边界区分 undefined 与 []
  (excludeUrl 由根因修复自动受益，popup 取消最后一条排除不再复活)
- SettingsPane 前端对齐：重置传 undefined、编辑传数组；删除最后一项 = 显式清空
- 修复 onRunAt 选非 early-start 时下拉框回弹 early-start(空数组被当真值)；
  run-in/run-at 选「默认」改传 undefined 撤销覆盖，保持行为不变
- 重写 8 个语言包 after_deleting_{match,exclude}_item 过时且自相矛盾的文案

对应 review 提出的 4 项遗漏路径(标签/popup 排除/文案/run-at)
---
 src/app/service/service_worker/client.ts      |   3 +-
 src/app/service/service_worker/script.test.ts | 163 ++++++++++++++++++
 src/app/service/service_worker/script.ts      |  14 +-
 src/app/service/service_worker/utils.test.ts  |  26 ++-
 src/app/service/service_worker/utils.ts       |  11 +-
 src/locales/de-DE/editor.json                 |   4 +-
 src/locales/en-US/editor.json                 |   4 +-
 src/locales/ja-JP/editor.json                 |   4 +-
 src/locales/ru-RU/editor.json                 |   4 +-
 src/locales/tr-TR/editor.json                 |   4 +-
 src/locales/vi-VN/editor.json                 |   4 +-
 src/locales/zh-CN/editor.json                 |   4 +-
 src/locales/zh-TW/editor.json                 |   4 +-
 .../ScriptEditor/tabs/SettingsPane.test.tsx   |  39 ++++-
 .../routes/ScriptEditor/tabs/SettingsPane.tsx |  46 ++---
 15 files changed, 278 insertions(+), 56 deletions(-)
 create mode 100644 src/app/service/service_worker/script.test.ts

diff --git a/src/app/service/service_worker/client.ts b/src/app/service/service_worker/client.ts
index 8e874ce95..f11293570 100644
--- a/src/app/service/service_worker/client.ts
+++ b/src/app/service/service_worker/client.ts
@@ -118,7 +118,8 @@ export class ScriptClient extends Client {
     return this.do("setCheckUpdateUrl", { uuid, checkUpdate, checkUpdateUrl });
   }
 
-  updateMetadata(uuid: string, key: string, value: string[]) {
+  // value 为 undefined 表示撤销用户覆盖，生效值回落脚本自带 metadata
+  updateMetadata(uuid: string, key: string, value: string[] | undefined) {
     return this.do("updateMetadata", { uuid, key, value });
   }
   async getBatchUpdateRecordLite(i: number) {
diff --git a/src/app/service/service_worker/script.test.ts b/src/app/service/service_worker/script.test.ts
new file mode 100644
index 000000000..a69116b17
--- /dev/null
+++ b/src/app/service/service_worker/script.test.ts
@@ -0,0 +1,163 @@
+import { initTestEnv } from "@Tests/utils";
+import { ScriptService } from "./script";
+import { vi, describe, it, expect, beforeEach } from "vitest";
+import { randomUUID } from "crypto";
+import type { Script, ScriptDAO } from "@App/app/repo/scripts";
+import { SCRIPT_STATUS_ENABLE, SCRIPT_TYPE_NORMAL } from "@App/app/repo/scripts";
+import type { Group } from "@Packages/message/server";
+import { Server } from "@Packages/message/server";
+import type { IMessageQueue } from "@Packages/message/message_queue";
+import { MessageQueue } from "@Packages/message/message_queue";
+import { MockMessage } from "@Packages/message/mock_message";
+import EventEmitter from "eventemitter3";
+import type { SystemConfig } from "@App/pkg/config/config";
+import type { ValueService } from "./value";
+import type { ResourceService } from "./resource";
+
+initTestEnv();
+
+/**
+ * selfMetadata 是「用户对脚本自带 @metadata 的覆盖」。
+ * undefined 表示撤销覆盖(生效值回落脚本自带 metadata)，空数组表示用户显式清空，两者语义不同。
+ */
+describe("ScriptService selfMetadata 用户覆盖", () => {
+  let scriptService: ScriptService;
+  let mockScriptDAO: ScriptDAO;
+  let mockGroup: Group;
+  let mockMessageQueue: IMessageQueue;
+
+  const createMockScript = (overrides: Partial<Script> = {}): Script => ({
+    uuid: randomUUID(),
+    name: "test-script",
+    namespace: "test-namespace",
+    type: SCRIPT_TYPE_NORMAL,
+    status: SCRIPT_STATUS_ENABLE,
+    sort: 0,
+    runStatus: "running" as const,
+    createtime: Date.now(),
+    checktime: Date.now(),
+    metadata: {
+      name: ["test-script"],
+      match: ["*://script.com/*"],
+      exclude: ["*://ads.script.com/*"],
+      tag: ["script-tag"],
+    },
+    ...overrides,
+  });
+
+  // 取回 scriptDAO.update 实际写入的 selfMetadata
+  const savedSelfMetadata = () => vi.mocked(mockScriptDAO.update).mock.calls[0][1].selfMetadata;
+
+  beforeEach(() => {
+    const eventEmitter = new EventEmitter<string, any>();
+    const server = new Server("test", new MockMessage(eventEmitter));
+    mockGroup = server.group("script");
+    mockMessageQueue = new MessageQueue();
+    mockMessageQueue.publish = vi.fn();
+
+    mockScriptDAO = {
+      get: vi.fn(),
+      update: vi.fn().mockResolvedValue(true),
+    } as any;
+
+    scriptService = new ScriptService(
+      {} as SystemConfig,
+      mockGroup,
+      mockMessageQueue,
+      {} as ValueService,
+      {} as ResourceService,
+      mockScriptDAO
+    );
+  });
+
+  describe("excludeUrl - popup 排除/取消排除", () => {
+    it("取消最后一条排除后应保存空覆盖，而不是回落脚本自带的 exclude", async () => {
+      // 脚本自带 @exclude，用户此前未覆盖：集合以脚本自带规则为起点
+      const script = createMockScript();
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.excludeUrl({ uuid: script.uuid, excludePattern: "*://ads.script.com/*", remove: true });
+
+      // 若删除覆盖，生效 exclude 会回落 metadata.exclude 使该规则复活，用户永远取消不掉
+      expect(savedSelfMetadata()).toEqual({ exclude: [] });
+    });
+
+    it("取消排除后仍有其他规则时应保存剩余规则", async () => {
+      const script = createMockScript({
+        selfMetadata: { exclude: ["*://ads.script.com/*", "*://user.com/*"] },
+      });
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.excludeUrl({ uuid: script.uuid, excludePattern: "*://user.com/*", remove: true });
+
+      expect(savedSelfMetadata()).toEqual({ exclude: ["*://ads.script.com/*"] });
+    });
+
+    it("排除新网站时应追加到覆盖中", async () => {
+      const script = createMockScript();
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.excludeUrl({ uuid: script.uuid, excludePattern: "*://user.com/*", remove: false });
+
+      expect(savedSelfMetadata()).toEqual({ exclude: ["*://ads.script.com/*", "*://user.com/*"] });
+    });
+  });
+
+  describe("resetMatch / resetExclude - 编辑器匹配列表", () => {
+    it("传入 undefined(重置)应删除用户覆盖", async () => {
+      const script = createMockScript({ selfMetadata: { match: ["*://user.com/*"] } });
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.resetMatch({ uuid: script.uuid, match: undefined });
+
+      expect(savedSelfMetadata()).toBeUndefined();
+    });
+
+    it("传入空数组(删除最后一项)应保存空覆盖", async () => {
+      const script = createMockScript({ selfMetadata: { match: ["*://user.com/*"] } });
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.resetMatch({ uuid: script.uuid, match: [] });
+
+      expect(savedSelfMetadata()).toEqual({ match: [] });
+    });
+
+    it("resetExclude 传入 undefined(重置)应删除用户覆盖", async () => {
+      const script = createMockScript({ selfMetadata: { exclude: ["*://user.com/*"] } });
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.resetExclude({ uuid: script.uuid, exclude: undefined });
+
+      expect(savedSelfMetadata()).toBeUndefined();
+    });
+
+    it("resetExclude 传入空数组(删除最后一项)应保存空覆盖", async () => {
+      const script = createMockScript({ selfMetadata: { exclude: ["*://user.com/*"] } });
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.resetExclude({ uuid: script.uuid, exclude: [] });
+
+      expect(savedSelfMetadata()).toEqual({ exclude: [] });
+    });
+  });
+
+  describe("updateMetadata - 标签与运行环境", () => {
+    it("删除最后一个标签时应保存空覆盖，而不是回落脚本自带的 tag", async () => {
+      const script = createMockScript({ selfMetadata: { tag: ["user-tag"] } });
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.updateMetadata({ uuid: script.uuid, key: "tag", value: [] });
+
+      expect(savedSelfMetadata()).toEqual({ tag: [] });
+    });
+
+    it("传入 undefined 应删除用户覆盖(run-in 选择「默认」即跟随脚本)", async () => {
+      const script = createMockScript({ selfMetadata: { "run-in": ["content-script"] } });
+      vi.mocked(mockScriptDAO.get).mockResolvedValue(script);
+
+      await scriptService.updateMetadata({ uuid: script.uuid, key: "run-in", value: undefined });
+
+      expect(savedSelfMetadata()).toBeUndefined();
+    });
+  });
+});
diff --git a/src/app/service/service_worker/script.ts b/src/app/service/service_worker/script.ts
index 541fc79aa..9dd5e3687 100644
--- a/src/app/service/service_worker/script.ts
+++ b/src/app/service/service_worker/script.ts
@@ -761,8 +761,8 @@ export class ScriptService {
     if (!script) {
       throw new Error("script not found");
     }
-    // 建立Set去掉重复（如有）
-    const excludeSet = new Set(exclude || []);
+    // 建立Set去掉重复（如有）；exclude 为 undefined 表示重置，即撤销用户覆盖
+    const excludeSet = exclude === undefined ? undefined : new Set(exclude);
     // 更新 script.selfMetadata.exclude
     script = selfMetadataUpdate(script, "exclude", excludeSet);
     return this.scriptDAO
@@ -783,8 +783,8 @@ export class ScriptService {
     if (!script) {
       throw new Error("script not found");
     }
-    // 建立Set去掉重复（如有）
-    const matchSet = new Set(match || []);
+    // 建立Set去掉重复（如有）；match 为 undefined 表示重置，即撤销用户覆盖
+    const matchSet = match === undefined ? undefined : new Set(match);
     // 更新 script.selfMetadata.match
     script = selfMetadataUpdate(script, "match", matchSet);
     return this.scriptDAO
@@ -1371,13 +1371,13 @@ export class ScriptService {
     return this.scriptDAO.update(uuid, update);
   }
 
-  // 更新脚本元数据
-  async updateMetadata({ uuid, key, value }: { uuid: string; key: string; value: string[] }) {
+  // 更新脚本元数据；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 = new Set(value);
+    const valueSet = value === undefined ? undefined : new Set(value);
     script = selfMetadataUpdate(script, key, valueSet);
     return 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 82ab34556..5f935d6e6 100644
--- a/src/app/service/service_worker/utils.test.ts
+++ b/src/app/service/service_worker/utils.test.ts
@@ -201,16 +201,38 @@ describe.concurrent("selfMetadataUpdate", () => {
     expect(result).not.toBe(script);
   });
 
-  it.concurrent("应该删除空字段并处理空对象", () => {
+  it.concurrent("传入 undefined 应删除用户覆盖并处理空对象", () => {
     const script = createMockScript({
       exclude: ["https://admin.com/*"],
     });
 
-    const result = selfMetadataUpdate(script, "exclude", new Set());
+    const result = selfMetadataUpdate(script, "exclude", undefined);
 
     expect(result.selfMetadata).toBeUndefined();
   });
 
+  it.concurrent("传入空集合应保存为空覆盖而非删除用户覆盖", () => {
+    const script = createMockScript({
+      exclude: ["https://admin.com/*"],
+    });
+
+    const result = selfMetadataUpdate(script, "exclude", new Set());
+
+    // 空覆盖代表「用户显式清空」，与 undefined(撤销覆盖、回落脚本自带 metadata) 是两回事
+    expect(result.selfMetadata).toEqual({ exclude: [] });
+  });
+
+  it.concurrent("传入 undefined 应只删除指定 key，保留其他覆盖", () => {
+    const script = createMockScript({
+      exclude: ["https://admin.com/*"],
+      match: ["https://user.com/*"],
+    });
+
+    const result = selfMetadataUpdate(script, "exclude", undefined);
+
+    expect(result.selfMetadata).toEqual({ match: ["https://user.com/*"] });
+  });
+
   it.concurrent("应该处理没有 selfMetadata 的脚本", () => {
     const script = createMockScript();
 
diff --git a/src/app/service/service_worker/utils.ts b/src/app/service/service_worker/utils.ts
index 446cc63e4..2f141befb 100644
--- a/src/app/service/service_worker/utils.ts
+++ b/src/app/service/service_worker/utils.ts
@@ -148,18 +148,19 @@ export function getCombinedMeta(metaBase: SCMetadata, metaCustom: SCMetadata): S
   return metaRet;
 }
 
-export function selfMetadataUpdate(script: Script, key: string, valueSet: Set<string>) {
+// valueSet 为 undefined 表示撤销用户覆盖(生效值回落脚本自带 metadata)；
+// 空集合表示用户显式清空该项，两者语义不同，不可互相替代
+export function selfMetadataUpdate(script: Script, key: string, valueSet: Set<string> | undefined) {
   // 更新 selfMetadata 时建立浅拷贝
   const selfMetadata = { ...(script.selfMetadata || {}) };
   script = { ...script, selfMetadata };
-  const value = [...valueSet].filter((item) => typeof item === "string");
-  if (value.length > 0) {
-    selfMetadata[key] = value;
-  } else {
+  if (valueSet === undefined) {
     delete selfMetadata[key];
     if (Object.keys(selfMetadata).length === 0) {
       script.selfMetadata = undefined; // delete script.selfMetadata;
     }
+  } else {
+    selfMetadata[key] = [...valueSet].filter((item) => typeof item === "string");
   }
   return script;
 }
diff --git a/src/locales/de-DE/editor.json b/src/locales/de-DE/editor.json
index 7445d9d45..c72b5b263 100644
--- a/src/locales/de-DE/editor.json
+++ b/src/locales/de-DE/editor.json
@@ -66,8 +66,8 @@
   "confirm_reset": "Zurücksetzen bestätigen?",
   "confirm_delete_match": "Diese Übereinstimmung löschen bestätigen?",
   "confirm_delete_exclude": "Diese Ausnahme löschen bestätigen?",
-  "after_deleting_match_item": "Nach dem Löschen werden die vom Skript definierten Übereinstimmungsregeln wieder zur Übereinstimmungsliste hinzugefügt",
-  "after_deleting_exclude_item": "Nach dem Löschen werden die vom Skript definierten Übereinstimmungsregeln wieder zur Ausnahmeliste hinzugefügt",
+  "after_deleting_match_item": "Nach dem Bearbeiten werden benutzerdefinierte Übereinstimmungsregeln verwendet; klicken Sie auf „Zurücksetzen“, um die vom Skript definierten Übereinstimmungsregeln wiederherzustellen.",
+  "after_deleting_exclude_item": "Nach dem Bearbeiten werden benutzerdefinierte Ausnahmeregeln verwendet; klicken Sie auf „Zurücksetzen“, um die vom Skript definierten Ausnahmeregeln wiederherzustellen.",
   "undo": "Rückgängig",
   "redo": "Wiederherstellen",
   "cut": "Ausschneiden",
diff --git a/src/locales/en-US/editor.json b/src/locales/en-US/editor.json
index 941d7a419..7c95b9923 100644
--- a/src/locales/en-US/editor.json
+++ b/src/locales/en-US/editor.json
@@ -66,8 +66,8 @@
   "confirm_reset": "Confirm reset?",
   "confirm_delete_match": "Confirm deletion of this match?",
   "confirm_delete_exclude": "Confirm deletion of this exclusion?",
-  "after_deleting_match_item": "Match rules defined by the script are added back to the match list after deletion",
-  "after_deleting_exclude_item": "Match rules defined by the script are added back to the exclude list after deletion",
+  "after_deleting_match_item": "After editing, your custom match rules are used; click Reset to restore the script's built-in match rules.",
+  "after_deleting_exclude_item": "After editing, your custom exclude rules are used; click Reset to restore the script's built-in exclude rules.",
   "undo": "Undo",
   "redo": "Redo",
   "cut": "Cut",
diff --git a/src/locales/ja-JP/editor.json b/src/locales/ja-JP/editor.json
index cfeeae8f2..29bb523e8 100644
--- a/src/locales/ja-JP/editor.json
+++ b/src/locales/ja-JP/editor.json
@@ -66,8 +66,8 @@
   "confirm_reset": "リセットしてもよろしいですか？",
   "confirm_delete_match": "このマッチを削除してもよろしいですか？",
   "confirm_delete_exclude": "この除外を削除してもよろしいですか？",
-  "after_deleting_match_item": "削除後、スクリプトで定義された対象ルールが対象リストに再度追加されます",
-  "after_deleting_exclude_item": "削除後、スクリプトで定義された対象ルールが除外リストに再度追加されます",
+  "after_deleting_match_item": "編集するとカスタムのマッチルールが使用されます。「リセット」をクリックするとスクリプト本来のマッチルールに戻ります。",
+  "after_deleting_exclude_item": "編集するとカスタムの除外ルールが使用されます。「リセット」をクリックするとスクリプト本来の除外ルールに戻ります。",
   "undo": "元に戻す",
   "redo": "やり直し",
   "cut": "切り取り",
diff --git a/src/locales/ru-RU/editor.json b/src/locales/ru-RU/editor.json
index 4dd28ce31..7227db798 100644
--- a/src/locales/ru-RU/editor.json
+++ b/src/locales/ru-RU/editor.json
@@ -66,8 +66,8 @@
   "confirm_reset": "Подтвердить сброс?",
   "confirm_delete_match": "Подтвердить удаление этого совпадения?",
   "confirm_delete_exclude": "Подтвердить удаление этого исключения?",
-  "after_deleting_match_item": "После удаления правила совпадения, объявленные скриптом, будут добавлены обратно в список совпадений",
-  "after_deleting_exclude_item": "После удаления правила совпадения, объявленные скриптом, будут добавлены обратно в список исключений",
+  "after_deleting_match_item": "После редактирования используются пользовательские правила совпадения; нажмите «Сброс», чтобы восстановить встроенные правила совпадения скрипта.",
+  "after_deleting_exclude_item": "После редактирования используются пользовательские правила исключения; нажмите «Сброс», чтобы восстановить встроенные правила исключения скрипта.",
   "undo": "Отменить",
   "redo": "Повторить",
   "cut": "Вырезать",
diff --git a/src/locales/tr-TR/editor.json b/src/locales/tr-TR/editor.json
index 6d14fe2f0..84bdb7995 100644
--- a/src/locales/tr-TR/editor.json
+++ b/src/locales/tr-TR/editor.json
@@ -66,8 +66,8 @@
   "confirm_reset": "Sıfırlansın mı?",
   "confirm_delete_match": "Bu eşleşme silinsin mi?",
   "confirm_delete_exclude": "Bu dışlama silinsin mi?",
-  "after_deleting_match_item": "Silinen betik tarafından tanımlanan eşleşme kuralları tekrar eşleşme listesine eklenir",
-  "after_deleting_exclude_item": "Silinen betik tarafından tanımlanan dışlama kuralları tekrar dışlama listesine eklenir",
+  "after_deleting_match_item": "Düzenledikten sonra özel eşleşme kuralları kullanılır; betiğin yerleşik eşleşme kurallarını geri yüklemek için «Sıfırla»ya tıklayın.",
+  "after_deleting_exclude_item": "Düzenledikten sonra özel dışlama kuralları kullanılır; betiğin yerleşik dışlama kurallarını geri yüklemek için «Sıfırla»ya tıklayın.",
   "undo": "Geri Al",
   "redo": "Yinele",
   "cut": "Kes",
diff --git a/src/locales/vi-VN/editor.json b/src/locales/vi-VN/editor.json
index 8f0624529..6886888a1 100644
--- a/src/locales/vi-VN/editor.json
+++ b/src/locales/vi-VN/editor.json
@@ -66,8 +66,8 @@
   "confirm_reset": "Xác nhận đặt lại?",
   "confirm_delete_match": "Xác nhận xóa khớp này?",
   "confirm_delete_exclude": "Xác nhận xóa loại trừ này?",
-  "after_deleting_match_item": "Sau khi xóa, các quy tắc khớp do script khai báo sẽ được thêm lại vào danh sách khớp",
-  "after_deleting_exclude_item": "Sau khi xóa, các quy tắc khớp do script khai báo sẽ được thêm lại vào danh sách loại trừ",
+  "after_deleting_match_item": "Sau khi chỉnh sửa, các quy tắc khớp tùy chỉnh sẽ được sử dụng; nhấp «Đặt lại» để khôi phục các quy tắc khớp có sẵn của script.",
+  "after_deleting_exclude_item": "Sau khi chỉnh sửa, các quy tắc loại trừ tùy chỉnh sẽ được sử dụng; nhấp «Đặt lại» để khôi phục các quy tắc loại trừ có sẵn của script.",
   "undo": "Hoàn tác",
   "redo": "Làm lại",
   "cut": "Cắt",
diff --git a/src/locales/zh-CN/editor.json b/src/locales/zh-CN/editor.json
index 8282b1878..1298c136c 100644
--- a/src/locales/zh-CN/editor.json
+++ b/src/locales/zh-CN/editor.json
@@ -66,8 +66,8 @@
   "confirm_reset": "确定重置？",
   "confirm_delete_match": "确认删除该匹配？",
   "confirm_delete_exclude": "确认删除该排除？",
-  "after_deleting_match_item": "脚本设定的匹配项删除后会自动添加到匹配项中",
-  "after_deleting_exclude_item": "脚本设定的匹配项删除后会自动添加到排除项中",
+  "after_deleting_match_item": "编辑后将使用自定义的匹配规则；点击「重置」可恢复脚本自带的匹配规则。",
+  "after_deleting_exclude_item": "编辑后将使用自定义的排除规则；点击「重置」可恢复脚本自带的排除规则。",
   "undo": "撤销",
   "redo": "重做",
   "cut": "剪切",
diff --git a/src/locales/zh-TW/editor.json b/src/locales/zh-TW/editor.json
index 9861118ea..050d31f79 100644
--- a/src/locales/zh-TW/editor.json
+++ b/src/locales/zh-TW/editor.json
@@ -66,8 +66,8 @@
   "confirm_reset": "確定要重設嗎？",
   "confirm_delete_match": "確定要刪除此符合項目嗎？",
   "confirm_delete_exclude": "確定要刪除此排除項目嗎？",
-  "after_deleting_match_item": "腳本設定的符合項目刪除後會自動加入到符合項目中",
-  "after_deleting_exclude_item": "腳本設定的符合項目刪除後會自動加入到排除項目中",
+  "after_deleting_match_item": "編輯後將使用自訂的符合規則；點擊「重設」可恢復腳本自帶的符合規則。",
+  "after_deleting_exclude_item": "編輯後將使用自訂的排除規則；點擊「重設」可恢復腳本自帶的排除規則。",
   "undo": "復原",
   "redo": "重做",
   "cut": "剪下",
diff --git a/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.test.tsx b/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.test.tsx
index 51ab7e726..731bd3790 100644
--- a/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.test.tsx
+++ b/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.test.tsx
@@ -159,6 +159,37 @@ describe("SettingsPane 运行设置", () => {
     // 运行环境与运行时机的默认值均显示本地化「默认」
     expect(screen.getAllByText(t("settings:script_setting.default")).length).toBe(2);
   });
+
+  // 打开 Radix Select（combobox 顺序：运行环境 / 运行时机）并选中给定文案的选项
+  const pickOption = async (comboIndex: number, optionText: string) => {
+    const trigger = screen.getAllByRole("combobox")[comboIndex];
+    fireEvent.keyDown(trigger, { key: "Enter" });
+    await act(() => Promise.resolve());
+    fireEvent.click(screen.getAllByRole("option").find((o) => o.textContent === optionText)!);
+    await act(() => Promise.resolve());
+  };
+
+  it("选择非 early-start 的运行时机后下拉框不应回弹到 early-start", async () => {
+    render(<SettingsPane uuid="u1" />);
+    await screen.findByText("alpha");
+    await pickOption(1, "document-end");
+    // early-start 覆盖须以 undefined 撤销；若写入空数组会被当真值，runAt 计算回落 early-start
+    expect(updateMetadata).toHaveBeenCalledWith("u1", "early-start", undefined);
+    expect(updateMetadata).toHaveBeenCalledWith("u1", "run-at", ["document-end"]);
+    expect(screen.getAllByRole("combobox")[1]).toHaveTextContent("document-end");
+    expect(screen.getAllByRole("combobox")[1]).not.toHaveTextContent("early-start");
+  });
+
+  it("运行环境选「默认」应以 undefined 撤销覆盖而非写入空数组", async () => {
+    fetchScript.mockResolvedValue({
+      ...sampleScript(),
+      selfMetadata: { ...sampleScript().selfMetadata, "run-in": ["all"] },
+    });
+    render(<SettingsPane uuid="u1" />);
+    await screen.findByText("alpha");
+    await pickOption(0, t("settings:script_setting.default"));
+    expect(updateMetadata).toHaveBeenCalledWith("u1", "run-in", undefined);
+  });
 });
 
 describe("SettingsPane 更新URL", () => {
@@ -286,7 +317,7 @@ describe("SettingsPane 网站匹配/排除", () => {
     expect(screen.queryByText("*://exclude.com/*")).toBeNull();
   });
 
-  it("删除最后一项匹配后应回落脚本自带规则而非清空列表", async () => {
+  it("删除最后一项匹配应显式清空覆盖而非复活脚本自带规则", async () => {
     fetchScript.mockResolvedValue({
       ...sampleScript(),
       selfMetadata: { exclude: ["*://exclude.com/*"] },
@@ -295,10 +326,10 @@ describe("SettingsPane 网站匹配/排除", () => {
     await screen.findByText("*://script.com/*");
     fireEvent.click(screen.getByLabelText(`${t("delete")} *://script.com/*`));
     fireEvent.click(screen.getByText(t("confirm"), { selector: "button" }));
-    // 后端 selfMetadataUpdate 收到空集即删除覆盖，生效列表回落 metadata.match，脚本自带规则应保留
+    // 删除最后一项 = 用户显式清空；后端持久化空覆盖，脚本自带的 script.com 不应复活
     expect(resetMatch).toHaveBeenCalledWith("u1", []);
-    expect(screen.getByText("*://script.com/*")).toBeInTheDocument();
-    expect(screen.getByText(t("editor:from_script"))).toBeInTheDocument();
+    expect(screen.queryByText("*://script.com/*")).toBeNull();
+    expect(screen.getByText(t("no_data"))).toBeInTheDocument();
   });
 });
 
diff --git a/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.tsx b/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.tsx
index d2200b79e..f413fc271 100644
--- a/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.tsx
+++ b/src/pages/options/routes/ScriptEditor/tabs/SettingsPane.tsx
@@ -191,11 +191,24 @@ function SettingsPaneContent({ uuid, data }: SettingsPaneProps & { data: Setting
   const runAt = self["early-start"] ? "early-start" : (self["run-at"]?.[0] ?? meta["run-at"]?.[0] ?? "default");
   const checkUpdate = script.checkUpdate !== false;
 
-  const patchSelf = (patch: Record<string, string[]>) =>
-    setScript((prev) => (prev ? { ...prev, selfMetadata: { ...prev.selfMetadata, ...patch } } : prev));
+  // patch 中值为 undefined 的 key 表示撤销该项覆盖（回落脚本自带 metadata），与后端删除覆盖语义一致
+  const patchSelf = (patch: Record<string, string[] | undefined>) =>
+    setScript((prev) => {
+      if (!prev) return prev;
+      const selfMetadata = { ...prev.selfMetadata };
+      for (const [k, v] of Object.entries(patch)) {
+        if (v === undefined) {
+          delete selfMetadata[k];
+        } else {
+          selfMetadata[k] = v;
+        }
+      }
+      return { ...prev, selfMetadata };
+    });
 
   const onRunIn = (value: string) => {
-    const v = value === "default" ? [] : [value];
+    // 选「默认」= 撤销覆盖、跟随脚本自带 @run-in，故传 undefined 而非空数组
+    const v = value === "default" ? undefined : [value];
     void scriptClient.updateMetadata(uuid, "run-in", v);
     patchSelf({ "run-in": v });
   };
@@ -206,10 +219,11 @@ function SettingsPaneContent({ uuid, data }: SettingsPaneProps & { data: Setting
       void scriptClient.updateMetadata(uuid, "run-at", ["document-start"]);
       patchSelf({ "early-start": [""], "run-at": ["document-start"] });
     } else {
-      const v = value === "default" ? [] : [value];
-      void scriptClient.updateMetadata(uuid, "early-start", []);
+      // 撤销 early-start 覆盖须传 undefined：空数组会被当成真值使 runAt 计算回落到 early-start
+      const v = value === "default" ? undefined : [value];
+      void scriptClient.updateMetadata(uuid, "early-start", undefined);
       void scriptClient.updateMetadata(uuid, "run-at", v);
-      patchSelf({ "early-start": [], "run-at": v });
+      patchSelf({ "early-start": undefined, "run-at": v });
     }
   };
 
@@ -234,27 +248,17 @@ function SettingsPaneContent({ uuid, data }: SettingsPaneProps & { data: Setting
 
   // ===== 匹配 / 排除 =====
   const setMatchList = (kind: "match" | "exclude", next: string[] | undefined) => {
-    // next 为 undefined（重置）或空数组（删除最后一项）时后端 selfMetadataUpdate 均删除用户覆盖，
-    // 生效列表回落到脚本自带的 metadata，前端乐观更新保持一致
-    const override = next?.length ? next : undefined;
+    // next 为 undefined 表示重置（撤销覆盖、回落脚本自带 metadata）；数组（含空数组，即删除最后一项）
+    // 表示用户显式覆盖。与后端 selfMetadataUpdate 语义一致，前端乐观更新分别处理，不再把空数组塌成重置。
     const metaList = kind === "match" ? metaMatch : metaExclude;
     if (kind === "match") {
       void scriptClient.resetMatch(uuid, next);
-      setMatches(override ?? metaList);
+      setMatches(next ?? metaList);
     } else {
       void scriptClient.resetExclude(uuid, next);
-      setExcludes(override ?? metaList);
+      setExcludes(next ?? metaList);
     }
-    setScript((prev) => {
-      if (!prev) return prev;
-      const selfMetadata = { ...prev.selfMetadata };
-      if (override === undefined) {
-        delete selfMetadata[kind];
-      } else {
-        selfMetadata[kind] = override;
-      }
-      return { ...prev, selfMetadata };
-    });
+    patchSelf({ [kind]: next });
   };
   const openBulkMatch = (kind: "match" | "exclude") => {
     setBulkMatchValue("");