fix: restore rule order confirmation gate

Author: Ryson-32

packages/core/src/generator/rules.test.ts

@@ -56,6 +56,8 @@ describe("rule generator", () => {
     });
     const texts = entries.map((entry) => entry.text);
     const customIpEntry = entries.find((entry) => entry.key === "custom-rule:ip-rule");
+    const customRuleSetEntry = entries.find((entry) => entry.key === "custom-rule-set:media-rule");
+    const appleTvPlusEntry = entries.find((entry) => entry.key === "module:streaming-west:apple-tvplus");
 
     expect(resolveModuleName("cn", { cn: "CN Direct" })).toBe("🔒 CN Direct");
     expect(texts).toContain("DOMAIN-SUFFIX,example.com,DIRECT");
@@ -66,9 +68,12 @@ describe("rule generator", () => {
     });
     expect(texts).toContain("RULE-SET,media-rule,Media,no-resolve");
     expect(texts).toContain("RULE-SET,apple-tvplus,📺 Streaming");
-    expect(entries.find((entry) => entry.text === "RULE-SET,apple-tvplus,📺 Streaming")).toMatchObject({
+    expect(customIpEntry).toMatchObject({ editable: true });
+    expect(customRuleSetEntry).toMatchObject({ editable: true });
+    expect(appleTvPlusEntry).toMatchObject({
       key: "module:streaming-west:apple-tvplus",
       kind: "module",
+      editable: false,
     });
     expect(entries.some((entry) => entry.key === "special:apple-tvplus")).toBe(false);
     expect(texts).toContain("RULE-SET,cn,🔒 CN Direct");

packages/core/src/generator/rules.ts

@@ -132,7 +132,7 @@ function buildModuleRuleEntry(
     summary: rule.name,
     target,
     noResolve,
-    editable: true,
+    editable: false,
     enabled: edit?.enabled !== false,
   };
 }

packages/ui/src/product/converter/advanced-mode/sections/rules-management-section.test.ts

@@ -92,6 +92,8 @@ function renderSection(overrides: Record<string, unknown> = {}) {
     experimentalCnUseCnRuleSet: true,
     ruleOrder: ["module:geo", "custom:one"],
     setRuleOrder: vi.fn(),
+    allRulesOrderEditingEnabled: false,
+    setAllRulesOrderEditingEnabled: vi.fn(),
     ...overrides,
   };
   stateMock.setter.mockClear();
@@ -138,15 +140,17 @@ describe("RulesManagementSection", () => {
     const tree = renderSection();
     const text = collectText(tree);
     const header = collectElements(tree, (element) => element.props.title === "规则管理")[0];
+    const switchElement = collectElements(tree, (element) => Boolean((element.props as any).onCheckedChange))[0];
     const orderInputs = collectElements(tree, (element) => (element.props as any).title === "最终规则行号（1=最前）");
 
     expect(header.props.title).toBe("规则管理");
-    expect(collectText(header.props.badge)).toContain("可调 2 / 全部 3");
-    expect(text).toContain("可移动任意非 MATCH 规则");
+    expect(collectText(header.props.badge)).toContain("可调 1 / 全部 3");
+    expect(text).toContain("默认只能调整自定义规则顺序。");
     expect(text).toContain("系统 GEO");
     expect(text).toContain("自定义规则");
     expect(text).toContain("no-resolve");
-    expect(orderInputs.map((input) => input.props.disabled)).toEqual([false, false, true]);
+    expect(switchElement.props.disabled).toBe(false);
+    expect(orderInputs.map((input) => input.props.disabled)).toEqual([true, false, true]);
     expect(mocks.buildGeneratedRuleEntries).toHaveBeenCalledWith(
       expect.objectContaining({
         enabledModules: ["core"],
@@ -179,7 +183,7 @@ describe("RulesManagementSection", () => {
     ];
 
     const defaultTree = renderSection();
-    const allRulesTree = renderSection();
+    const allRulesTree = renderSection({ allRulesOrderEditingEnabled: true });
     const detail = collectElements(
       defaultTree,
       (element) =>
@@ -260,7 +264,7 @@ describe("RulesManagementSection", () => {
       },
       {
         key: "module:education:scholar",
-        editable: true,
+        editable: false,
         summary: "Scholar",
         sourceLabel: "📚 教育学术",
         target: "💬 自定义1",
@@ -287,6 +291,33 @@ describe("RulesManagementSection", () => {
     expect(text).not.toContain("自定义分组 ·");
   });
 
+  it("confirms before enabling all-rules order mode and disables without confirmation", async () => {
+    const switchElement = collectElements(renderSection(), (element) => Boolean((element.props as any).onCheckedChange))[0];
+
+    mocks.confirmDialog.mockResolvedValueOnce(false);
+    await switchElement.props.onCheckedChange(true);
+    expect(mocks.store.setAllRulesOrderEditingEnabled).not.toHaveBeenCalled();
+
+    mocks.confirmDialog.mockResolvedValueOnce(true);
+    await switchElement.props.onCheckedChange(true);
+    expect(mocks.confirmDialog).toHaveBeenCalledWith(
+      expect.objectContaining({
+        title: "开启“调整所有规则顺序”？",
+        cancelText: "保持默认",
+        confirmText: "继续开启",
+        variant: "warning",
+      })
+    );
+    expect(mocks.store.setAllRulesOrderEditingEnabled).toHaveBeenCalledWith(true);
+
+    const enabledSwitch = collectElements(
+      renderSection({ allRulesOrderEditingEnabled: true }),
+      (element) => Boolean((element.props as any).onCheckedChange)
+    )[0];
+    await enabledSwitch.props.onCheckedChange(false);
+    expect(mocks.store.setAllRulesOrderEditingEnabled).toHaveBeenCalledWith(false);
+  });
+
   it("moves editable rules by buttons, absolute order input, blur, and escape cleanup", () => {
     stateMock.value = { "custom:one": "1" };
     const tree = renderSection();
@@ -327,6 +358,8 @@ describe("RulesManagementSection", () => {
       experimentalCnUseCnRuleSet: false,
       ruleOrder: [],
       setRuleOrder: vi.fn(),
+      allRulesOrderEditingEnabled: false,
+      setAllRulesOrderEditingEnabled: vi.fn(),
     };
     const tree = RulesManagementSection({ isExpanded: false, onToggle: vi.fn() });
     const header = collectElements(tree, (element) => element.props.title === "规则管理")[0];

packages/ui/src/product/converter/advanced-mode/sections/rules-management-section.tsx

@@ -3,7 +3,9 @@
 import * as React from "react";
 import { ArrowDown, ArrowUp, ListOrdered } from "lucide-react";
 import { Badge } from "@subboost/ui/components/ui/badge";
+import { confirmDialog } from "@subboost/ui/components/ui/confirm-dialog";
 import { Input } from "@subboost/ui/components/ui/input";
+import { Switch } from "@subboost/ui/components/ui/switch";
 import {
   buildGeneratedRuleEntries,
   type GeneratedRuleEntry,
@@ -47,8 +49,11 @@ export function RulesManagementSection({
     experimentalCnUseCnRuleSet,
     ruleOrder,
     setRuleOrder,
+    allRulesOrderEditingEnabled,
+    setAllRulesOrderEditingEnabled,
   } = useConfigStore();
   const [orderDrafts, setOrderDrafts] = React.useState<Record<string, string>>({});
+  const allRulesMode = allRulesOrderEditingEnabled;
 
   const entries = React.useMemo(
     () =>
@@ -79,7 +84,8 @@ export function RulesManagementSection({
     [entries]
   );
   const preMatchKeys = React.useMemo(() => preMatchEntries.map((entry) => entry.key), [preMatchEntries]);
-  const editableKeys = preMatchKeys;
+  const editableEntries = React.useMemo(() => entries.filter((entry) => entry.editable), [entries]);
+  const editableKeys = React.useMemo(() => editableEntries.map((entry) => entry.key), [editableEntries]);
 
   const applyRuleOrder = React.useCallback(
     (nextRuleOrder: string[]) => {
@@ -123,6 +129,36 @@ export function RulesManagementSection({
     [applyRuleOrder, preMatchEntries.length, preMatchKeys]
   );
 
+  const handleToggleAllRulesMode = React.useCallback(
+    async (checked: boolean) => {
+      if (!checked) {
+        setAllRulesOrderEditingEnabled(false);
+        return;
+      }
+
+      const ok = await confirmDialog({
+        title: "开启“调整所有规则顺序”？",
+        description: (
+          <span className="block pt-2">
+            <span className="block rounded-xl border border-amber-500/20 bg-amber-500/10 px-3 py-2 leading-6 text-amber-100/90">
+              <span className="font-medium text-amber-200">警告：</span>
+              开启后，你可以移动任意规则到任意位置，这会改变分流优先级与命中结果。
+            </span>
+            <span className="mt-3 block leading-6 text-white/65">
+              如果你不知道调整规则顺序的影响，请不要动它。
+            </span>
+          </span>
+        ),
+        cancelText: "保持默认",
+        confirmText: "继续开启",
+        variant: "warning",
+      });
+      if (!ok) return;
+      setAllRulesOrderEditingEnabled(true);
+    },
+    [setAllRulesOrderEditingEnabled]
+  );
+
   return (
     <div>
       <SectionHeader
@@ -132,7 +168,7 @@ export function RulesManagementSection({
         onToggle={onToggle}
         badge={
           <Badge variant="outline" className="ml-auto shrink-0 border-emerald-500/40 bg-emerald-500/10 text-emerald-300">
-            可调 {preMatchEntries.length} / 全部 {entries.length}
+            可调 {allRulesMode ? preMatchEntries.length : editableEntries.length} / 全部 {entries.length}
           </Badge>
         }
       />
@@ -142,15 +178,25 @@ export function RulesManagementSection({
           <div className="rounded-lg border border-white/10 bg-white/5 px-3 py-2">
             <div className="flex min-w-0 flex-wrap items-center justify-between gap-2">
               <div className="min-w-0 flex-[1_1_13rem] text-[11px] leading-5 text-white/60">
-                可移动任意非 MATCH 规则；排序只决定命中优先级，目标只决定命中后进入哪个分流组。
+                {allRulesMode
+                  ? "已开启全规则排序：可移动任意规则，但 MATCH 固定最后。"
+                  : "默认只能调整自定义规则顺序。"}
+              </div>
+              <div className="ml-auto flex shrink-0 items-center gap-2">
+                <span className="text-[11px] whitespace-nowrap text-white/55">调整所有规则顺序</span>
+                <Switch
+                  checked={allRulesMode}
+                  onCheckedChange={handleToggleAllRulesMode}
+                  disabled={preMatchEntries.length <= 1}
+                />
               </div>
             </div>
           </div>
 
           <div className="max-h-[460px] overflow-y-auto overflow-x-hidden rounded-lg border border-white/10 bg-black/10 pr-1 custom-scrollbar">
             {entries.map((entry, index) => {
               const fullIndex = preMatchKeys.indexOf(entry.key);
-              const canEditOrder = entry.key !== "special:match";
+              const canEditOrder = entry.key !== "special:match" && (allRulesMode || entry.editable);
               const canMoveUp = canEditOrder && fullIndex > 0;
               const canMoveDown = canEditOrder && fullIndex >= 0 && fullIndex < preMatchKeys.length - 1;
               const absoluteOrder = index + 1;

packages/ui/src/store/config-store/actions/settings-actions.test.ts

@@ -41,4 +41,15 @@ describe("config store settings actions", () => {
     expect(store.setAndGenerateConfig).toHaveBeenCalledTimes(8);
     expect(store.set).not.toHaveBeenCalled();
   });
+
+  it("updates all-rules order editing as UI-only state", () => {
+    const store = createStore();
+    const actions = createSettingsActions(store.set as any, store.get as any, store.setAndGenerateConfig as any);
+
+    actions.setAllRulesOrderEditingEnabled(1 as unknown as boolean);
+
+    expect(store.state()).toEqual({ allRulesOrderEditingEnabled: true });
+    expect(store.set).toHaveBeenCalledWith({ allRulesOrderEditingEnabled: true });
+    expect(store.setAndGenerateConfig).not.toHaveBeenCalled();
+  });
 });

packages/ui/src/store/config-store/actions/settings-actions.ts

@@ -11,10 +11,11 @@ type SettingsActions = Pick<
   | "setRuleProviderBaseUrl"
   | "setCnIpNoResolve"
   | "setExperimentalCnUseCnRuleSet"
+  | "setAllRulesOrderEditingEnabled"
 >;
 
 export function createSettingsActions(
-  _set: SetState,
+  set: SetState,
   _get: GetState,
   setAndGenerateConfig: SetAndGenerateConfig
 ): SettingsActions {
@@ -50,5 +51,9 @@ export function createSettingsActions(
     setExperimentalCnUseCnRuleSet: (value: boolean) => {
       setAndGenerateConfig(() => ({ experimentalCnUseCnRuleSet: Boolean(value) }));
     },
+
+    setAllRulesOrderEditingEnabled: (enabled: boolean) => {
+      set({ allRulesOrderEditingEnabled: Boolean(enabled) });
+    },
   };
 }

packages/ui/src/store/config-store/actions/template-actions.test.ts

@@ -37,6 +37,7 @@ describe("createTemplateActions", () => {
       customRuleSets: [{ id: "custom-ai", name: "Custom AI", behavior: "domain", path: "geosite/custom-ai.mrs", target: "🤖 AI 服务" }],
       builtinRuleEdits: { "module:ai:anthropic": { enabled: false } },
       ruleOrder: ["module:ai:openai"],
+      allRulesOrderEditingEnabled: true,
       moduleRuleEditWarningAccepted: true,
     });
 
@@ -51,6 +52,7 @@ describe("createTemplateActions", () => {
       customRuleSets: [],
       builtinRuleEdits: {},
       ruleOrder: [],
+      allRulesOrderEditingEnabled: false,
       moduleRuleEditWarningAccepted: false,
     });
 
@@ -161,6 +163,7 @@ describe("createTemplateActions", () => {
         },
       ],
       builtinRuleEdits: { "module:ai:openai": { target: "🔍 Google" } },
+      allRulesOrderEditingEnabled: true,
       moduleRuleEditWarningAccepted: false,
       cnIpNoResolve: false,
       experimentalCnUseCnRuleSet: true,

packages/ui/src/store/config-store/actions/template-actions.ts

@@ -1,7 +1,7 @@
 import { getBuiltinTemplateId } from "@subboost/core/templates/builtin";
 import { TEMPLATES } from "@subboost/core/templates";
 import { ensureCustomRulesHaveIds } from "@subboost/core/rules/custom-rule-utils";
-import { normalizePersistedRuleOrder } from "@subboost/core/generator/rules";
+import { hasFullRuleOrderKeys, normalizePersistedRuleOrder } from "@subboost/core/generator/rules";
 import { PROXY_GROUP_MODULES } from "@subboost/core/generator/proxy-groups";
 import { normalizeRuleModelFromConfig } from "@subboost/core/rules/rule-model";
 import type { ConfigActions, SubBoostTemplateConfig } from "../definitions";
@@ -52,6 +52,7 @@ export function createTemplateActions(
         customRuleSets: [],
         builtinRuleEdits: {},
         ruleOrder: [],
+        allRulesOrderEditingEnabled: false,
         moduleRuleEditWarningAccepted: false,
       }));
     },
@@ -144,6 +145,7 @@ export function createTemplateActions(
               ruleOrder: config.ruleOrder,
             })
           : state.ruleOrder;
+        const legacyAllRulesOrderEditingEnabled = (config as Record<string, unknown>).allRulesOrderEditingEnabled;
 
         return {
           // 不触碰 nodes/sources：模板只描述“生成策略”，节点仍由用户导入
@@ -159,6 +161,12 @@ export function createTemplateActions(
           moduleRuleEditWarningAccepted: false,
           customRules: nextCustomRules,
           ruleOrder: nextRuleOrder,
+          allRulesOrderEditingEnabled:
+            typeof legacyAllRulesOrderEditingEnabled === "boolean"
+              ? legacyAllRulesOrderEditingEnabled
+              : shouldRefreshRuleOrder
+                ? hasFullRuleOrderKeys(nextRuleOrder)
+                : state.allRulesOrderEditingEnabled,
           cnIpNoResolve:
             typeof config.cnIpNoResolve === "boolean" ? config.cnIpNoResolve : state.cnIpNoResolve,
           experimentalCnUseCnRuleSet:

packages/ui/src/store/config-store/auth-handoff.test.ts

@@ -62,6 +62,7 @@ function meaningfulState(overrides: Record<string, unknown> = {}) {
     proxyGroupNameOverrides: { ai: "Labs" },
     proxyGroupOrder: ["module:ai"],
     ruleOrder: ["module:ai:openai"],
+    allRulesOrderEditingEnabled: true,
     moduleRuleEditWarningAccepted: true,
     appliedTemplateId: "template-1",
     template: "full",
@@ -154,6 +155,7 @@ describe("auth config handoff", () => {
       proxyGroupNameOverrides: { ai: "Labs" },
       proxyGroupOrder: ["module:ai"],
       ruleOrder: ["module:ai:openai"],
+      allRulesOrderEditingEnabled: true,
       moduleRuleEditWarningAccepted: true,
       appliedTemplateId: "template-1",
       dnsYaml: "dns: {}",
@@ -286,6 +288,7 @@ describe("auth config handoff", () => {
       dialerProxyGroups: [{ id: "dialer" }],
       proxyGroupOrder: ["module:ai"],
       ruleOrder: ["rule"],
+      allRulesOrderEditingEnabled: true,
       moduleRuleEditWarningAccepted: false,
       appliedTemplateId: null,
       dnsYaml: "dns: {}",

packages/ui/src/store/config-store/auth-handoff.ts

@@ -119,6 +119,7 @@ function hasMeaningfulConfig(state: ConfigState): boolean {
     hasRecordEntries(state.proxyGroupNameOverrides) ||
     state.proxyGroupOrder.length > 0 ||
     state.ruleOrder.length > 0 ||
+    state.allRulesOrderEditingEnabled !== initialState.allRulesOrderEditingEnabled ||
     state.moduleRuleEditWarningAccepted !== initialState.moduleRuleEditWarningAccepted ||
     state.appliedTemplateId !== initialState.appliedTemplateId ||
     state.template !== initialState.template ||
@@ -154,6 +155,7 @@ function buildHandoffState(state: ConfigState): Partial<ConfigState> {
     proxyGroupNameOverrides: state.proxyGroupNameOverrides,
     proxyGroupOrder: state.proxyGroupOrder,
     ruleOrder: state.ruleOrder,
+    allRulesOrderEditingEnabled: state.allRulesOrderEditingEnabled,
     moduleRuleEditWarningAccepted: state.moduleRuleEditWarningAccepted,
     appliedTemplateId: state.appliedTemplateId,
     dnsYaml: state.dnsYaml,
@@ -209,6 +211,7 @@ function normalizeHandoffState(raw: unknown): Partial<ConfigState> | null {
   if (proxyGroupOrder) out.proxyGroupOrder = proxyGroupOrder;
   const ruleOrder = stringArray(raw.ruleOrder);
   if (ruleOrder) out.ruleOrder = ruleOrder;
+  if (typeof raw.allRulesOrderEditingEnabled === "boolean") out.allRulesOrderEditingEnabled = raw.allRulesOrderEditingEnabled;
   if (typeof raw.moduleRuleEditWarningAccepted === "boolean") out.moduleRuleEditWarningAccepted = raw.moduleRuleEditWarningAccepted;
   if (typeof raw.appliedTemplateId === "string" || raw.appliedTemplateId === null) {
     out.appliedTemplateId = raw.appliedTemplateId;