diff --git a/packages/core/src/generator/index.test.ts b/packages/core/src/generator/index.test.ts
index 19ddd86..5936655 100644
--- a/packages/core/src/generator/index.test.ts
+++ b/packages/core/src/generator/index.test.ts
@@ -77,6 +77,55 @@ describe("generateClashConfig", () => {
     ]);
   });
 
+  it("generates group listeners bound to existing proxy groups with validation and dedupe", () => {
+    const config = generateClashConfig({
+      nodes: [ssNode()],
+      dialerProxyGroups: [
+        { id: "d1", name: "美国中转", relayNodes: ["Node"], targetNodes: [], type: "select" },
+        { id: "d2", name: "香港中转", relayNodes: ["Node"], targetNodes: [], type: "select" },
+      ],
+      userConfig: {
+        dnsYaml: "",
+        mixedPort: 7890,
+        listenerPorts: { Node: 12000 },
+      },
+      groupListeners: [
+        { id: "a", target: "美国中转", port: 7891 },
+        { id: "b", target: "不存在的组", port: 7892 },
+        { id: "c", target: "美国中转", port: 7893 },
+        { id: "d", target: "香港中转", port: 12000 },
+        { id: "e", target: "香港中转", port: 7890 },
+        { id: "f", target: "香港中转", port: 7894 },
+      ],
+    });
+
+    expect(config.listeners).toEqual([
+      { name: "mixed0", type: "mixed", port: 12000, proxy: "Node" },
+      { name: "group-in-0", type: "mixed", listen: "0.0.0.0", port: 7891, proxy: "美国中转", udp: true },
+      { name: "group-in-1", type: "mixed", listen: "0.0.0.0", port: 7894, proxy: "香港中转", udp: true },
+    ]);
+  });
+
+  it("appends group listeners after base config listeners and node listeners", () => {
+    const config = generateClashConfig({
+      nodes: [ssNode()],
+      dialerProxyGroups: [
+        { id: "d1", name: "美国中转", relayNodes: ["Node"], targetNodes: [], type: "select" },
+      ],
+      userConfig: {
+        dnsYaml: ["listeners:", "  - name: base-in", "    type: socks", "    port: 18000"].join("\n"),
+        listenerPorts: { Node: 12000 },
+      },
+      groupListeners: [{ id: "a", target: "美国中转", port: 7891 }],
+    });
+
+    expect(config.listeners).toEqual([
+      { name: "base-in", type: "socks", port: 18000 },
+      { name: "mixed0", type: "mixed", port: 12000, proxy: "Node" },
+      { name: "group-in-0", type: "mixed", listen: "0.0.0.0", port: 7891, proxy: "美国中转", udp: true },
+    ]);
+  });
+
   it("moves root nameserver-policy under dns and merges proxy providers", () => {
     const config = generateClashConfig({
       nodes: [ssNode()],
@@ -366,9 +415,13 @@ describe("generateClashConfig", () => {
     });
   });
 
-  it("applies persisted proxy group order across dialer, custom, and module groups", () => {
+  it("applies persisted proxy group order across dialer, custom, module, and provider groups", () => {
     const config = generateClashConfig({
       nodes: [ssNode({ name: "Relay" }), ssNode({ name: "Target", server: "target.example.com" })],
+      proxyProviders: {
+        air: { type: "http", url: "https://air.example.com/sub", path: "./air.yaml" },
+      },
+      proxyProviderAttachments: [{ key: "air", mode: "grouped", groupName: "✈️ Air" }],
       dialerProxyGroups: [
         {
           id: "chain",
@@ -386,14 +439,15 @@ describe("generateClashConfig", () => {
           groupType: "select",
         },
       ],
-      proxyGroupOrder: ["custom:custom", "dialer:chain", "module:auto", "missing", "module:auto"],
+      proxyGroupOrder: ["name:✈️ Air", "custom:custom", "dialer:chain", "module:auto", "missing", "module:auto"],
       userConfig: {
         dnsYaml: "",
         enabledGroups: ["select", "auto", "global", "final"],
       },
     });
 
-    expect(config["proxy-groups"]?.slice(0, 4).map((group) => group.name)).toEqual([
+    expect(config["proxy-groups"]?.slice(0, 5).map((group) => group.name)).toEqual([
+      "✈️ Air",
       "Custom",
       "Chain",
       "⚡ 自动选择",
@@ -615,4 +669,201 @@ describe("generateClashConfig", () => {
     expect(yaml).toContain("proxy-groups:");
     expect(yaml).toContain("rules:");
   });
+
+  it("keeps legacy inline behavior when providers carry no attachments", () => {
+    const config = generateClashConfig({
+      nodes: [ssNode()],
+      proxyProviders: {
+        remote: { type: "http", url: "https://example.com/provider.yaml", path: "./remote.yaml" },
+      },
+      userConfig: { dnsYaml: "" },
+    });
+
+    const groups = config["proxy-groups"] ?? [];
+    const select = groups.find((group) => group.name === "🚀 节点选择");
+    expect(select).toMatchObject({ use: ["remote"] });
+    // 未声明 attachments 时不生成机场组
+    expect(groups.filter((group) => Array.isArray(group.use) && group.use.length === 1 && !group.proxies)).toHaveLength(0);
+  });
+
+  it("wires grouped, inline, and bare providers according to their attachments", () => {
+    const config = generateClashConfig({
+      nodes: [ssNode()],
+      proxyProviders: {
+        grouped_a: { type: "http", url: "https://a.example.com/sub", path: "./a.yaml" },
+        inline_b: { type: "http", url: "https://b.example.com/sub", path: "./b.yaml" },
+        bare_c: { type: "http", url: "https://c.example.com/sub", path: "./c.yaml" },
+      },
+      proxyProviderAttachments: [
+        { key: "grouped_a", mode: "grouped", groupName: "✈️ 测试机场" },
+        { key: "inline_b", mode: "inline" },
+        { key: "bare_c", mode: "bare" },
+      ],
+      userConfig: { dnsYaml: "" },
+    });
+
+    const groups = config["proxy-groups"] ?? [];
+
+    // 机场组：select + use，插在节点选择/自动选择之后
+    const airport = groups.find((group) => group.name === "✈️ 测试机场");
+    expect(airport).toMatchObject({
+      type: "select",
+      use: ["grouped_a"],
+    });
+    expect(airport).not.toHaveProperty("icon");
+    const airportIndex = groups.findIndex((group) => group.name === "✈️ 测试机场");
+    const selectIndex = groups.findIndex((group) => group.name === "🚀 节点选择");
+    const autoIndex = groups.findIndex((group) => group.name === "⚡ 自动选择");
+    expect(airportIndex).toBeGreaterThan(Math.max(selectIndex, autoIndex));
+
+    // 机场组进入「节点选择」候选；provider 注入只保留 inline
+    const select = groups.find((group) => group.name === "🚀 节点选择");
+    expect(select?.proxies).toContain("✈️ 测试机场");
+    expect(select).toMatchObject({ use: ["inline_b"] });
+    // 机场组默认进入所有内置手选类分流组候选
+    for (const group of groups) {
+      if (group.name === "✈️ 测试机场") continue;
+      if (group.type !== "select") continue;
+      expect(group.proxies).toContain("✈️ 测试机场");
+    }
+    for (const group of groups) {
+      if (group.name === "✈️ 测试机场") continue;
+      if (!Array.isArray(group.use)) continue;
+      expect(group.use).toEqual(["inline_b"]);
+    }
+    // bare 不出现在任何 use 里
+    expect(groups.some((group) => Array.isArray(group.use) && group.use.includes("bare_c"))).toBe(false);
+  });
+
+  it("excludes a default airport group from a group via advanced.excludedMembers", () => {
+    const config = generateClashConfig({
+      nodes: [ssNode()],
+      proxyProviders: {
+        grouped_a: { type: "http", url: "https://a.example.com/sub", path: "./a.yaml" },
+      },
+      proxyProviderAttachments: [{ key: "grouped_a", mode: "grouped", groupName: "✈️ 测试机场" }],
+      proxyGroupAdvanced: {
+        select: { excludedMembers: [{ kind: "provider-group", key: "grouped_a" }] },
+      },
+      userConfig: { dnsYaml: "" },
+    });
+    const groups = config["proxy-groups"] ?? [];
+    // 「节点选择」排除了机场组 → 其 proxies 不含机场组名；机场组本体仍生成，其它组仍含
+    const select = groups.find((group) => group.name === "🚀 节点选择");
+    expect(select?.proxies).not.toContain("✈️ 测试机场");
+    expect(groups.some((group) => group.name === "✈️ 测试机场")).toBe(true);
+    const auto = groups.find((group) => group.name === "⚡ 自动选择");
+    // ⚡ 自动选择是 url-test，不注入机场组；换个手选组验证仍默认含
+    const anotherSelect = groups.find(
+      (group) => group.type === "select" && group.name !== "🚀 节点选择" && group.name !== "✈️ 测试机场",
+    );
+    expect(anotherSelect?.proxies).toContain("✈️ 测试机场");
+    void auto;
+  });
+
+  it("reorders a default airport group within a group via advanced.memberOrder", () => {
+    const config = generateClashConfig({
+      nodes: [ssNode()],
+      proxyProviders: {
+        grouped_a: { type: "http", url: "https://a.example.com/sub", path: "./a.yaml" },
+      },
+      proxyProviderAttachments: [{ key: "grouped_a", mode: "grouped", groupName: "✈️ 测试机场" }],
+      proxyGroupAdvanced: {
+        select: {
+          memberOrder: [
+            { kind: "provider-group", key: "grouped_a" },
+            { kind: "module", id: "auto" },
+          ],
+        },
+      },
+      userConfig: { dnsYaml: "" },
+    });
+    const groups = config["proxy-groups"] ?? [];
+    const select = groups.find((group) => group.name === "🚀 节点选择");
+    const proxies = select?.proxies ?? [];
+    // memberOrder 把机场组排到自动选择之前
+    expect(proxies.indexOf("✈️ 测试机场")).toBeLessThan(proxies.indexOf("⚡ 自动选择"));
+  });
+
+  it("suffixes airport group names that collide with existing groups or nodes", () => {
+    const config = generateClashConfig({
+      nodes: [ssNode({ name: "撞名机场" })],
+      proxyProviders: {
+        p1: { type: "http", url: "https://a.example.com/sub", path: "./a.yaml" },
+        p2: { type: "http", url: "https://b.example.com/sub", path: "./b.yaml" },
+      },
+      proxyProviderAttachments: [
+        { key: "p1", mode: "grouped", groupName: "撞名机场" },
+        { key: "p2", mode: "grouped", groupName: "撞名机场" },
+      ],
+      userConfig: { dnsYaml: "" },
+    });
+
+    const groups = config["proxy-groups"] ?? [];
+    const airportNames = groups.filter((group) => Array.isArray(group.use)).map((group) => group.name);
+    expect(airportNames).toEqual(["撞名机场 2", "撞名机场 3"]);
+  });
+
+  it("places the airport group right after 自动选择 (core area) and adds it to custom groups", () => {
+    const config = generateClashConfig({
+      nodes: [ssNode()],
+      proxyProviders: {
+        grouped_a: { type: "http", url: "https://a.example.com/sub", path: "./a.yaml" },
+      },
+      proxyProviderAttachments: [{ key: "grouped_a", mode: "grouped", groupName: "✈️ 测试机场" }],
+      customProxyGroups: [{ id: "cg1", name: "🧩 我的分组", emoji: "🧩", groupType: "select", enabled: true }],
+      userConfig: { dnsYaml: "" },
+    });
+
+    const groups = config["proxy-groups"] ?? [];
+    const names = groups.map((group) => group.name);
+    // 机场组紧跟“⚡ 自动选择”之后（核心区内）
+    const autoIndex = names.indexOf("⚡ 自动选择");
+    expect(names[autoIndex + 1]).toBe("✈️ 测试机场");
+    // 自定义分组默认也带上机场组候选
+    const custom = groups.find((group) => group.name === "🧩 我的分组");
+    expect(custom?.proxies).toContain("✈️ 测试机场");
+  });
+
+  it("appends manually added provider members (Provider 组 panel) to use and proxies", () => {
+    const config = generateClashConfig({
+      nodes: [ssNode()],
+      proxyProviders: {
+        grouped_a: { type: "http", url: "https://a.example.com/sub", path: "./a.yaml" },
+        bare_b: { type: "http", url: "https://b.example.com/sub", path: "./b.yaml" },
+      },
+      proxyProviderAttachments: [
+        { key: "grouped_a", mode: "grouped", groupName: "✈️ 测试机场" },
+        { key: "bare_b", mode: "bare" },
+      ],
+      customProxyGroups: [
+        {
+          id: "cg1",
+          name: "🧩 我的分组",
+          emoji: "🧩",
+          groupType: "select",
+          enabled: true,
+          advanced: {
+            // 手动把 bare provider 以内联方式并入本组，并追加分组模式机场组
+            extraMembers: [
+              { kind: "provider-inline", key: "bare_b" },
+              { kind: "provider-group", key: "grouped_a" },
+            ],
+          },
+        },
+      ],
+      userConfig: { dnsYaml: "" },
+    });
+
+    const groups = config["proxy-groups"] ?? [];
+    const custom = groups.find((group) => group.name === "🧩 我的分组");
+    // 内联的 bare provider 落到该组 use（bare 默认不注入，靠手动追加）
+    expect(custom?.use).toContain("bare_b");
+    // 机场组名落到 proxies（去重，不因候选已含而重复）
+    const airportCount = (custom?.proxies ?? []).filter((name) => name === "✈️ 测试机场").length;
+    expect(airportCount).toBe(1);
+    // 其他组不受影响：不会平白多出 bare_b 的 use
+    const select = groups.find((group) => group.name === "🚀 节点选择");
+    expect(select?.use ?? []).not.toContain("bare_b");
+  });
 });
diff --git a/packages/core/src/generator/index.ts b/packages/core/src/generator/index.ts
index 5157b1c..d5b4acd 100644
--- a/packages/core/src/generator/index.ts
+++ b/packages/core/src/generator/index.ts
@@ -8,6 +8,7 @@ import {
   buildDefaultUserConfig,
 } from "@subboost/core/config/defaults";
 import {
+  buildProviderProxyGroups,
   generateProxyGroups,
   generateRules,
   generateRuleProviders,
@@ -26,12 +27,14 @@ import type {
   ClashConfig,
   CustomProxyGroup,
   CustomRuleSet,
+  GroupListenerBinding,
   ProxyGroup,
   ProxyGroupAdvancedConfig,
   TemplateType,
   UserConfig,
 } from "@subboost/core/types/config";
 import type { DialerProxyGroup } from "@subboost/core/types/template-config";
+import type { ProxyProviderAttachment } from "@subboost/core/subscription/proxy-providers";
 import { collectDnsPolicyEntries, configToYaml } from "./yaml";
 import { isMihomoSupportedProxyNode, normalizeMihomoVlessForGeneration } from "../mihomo/proxy-sanitizer";
 import { chooseFallbackPolicyTarget, withBuiltinPolicyTargets } from "./policy-targets";
@@ -39,6 +42,10 @@ import { chooseFallbackPolicyTarget, withBuiltinPolicyTargets } from "./policy-t
 export interface GenerateOptions {
   nodes: ParsedNode[];
   proxyProviders?: Record<string, unknown>;
+  // 各 provider 的接入方式（key 对应 proxyProviders 的键）：
+  // grouped=生成机场组挂入节点选择；inline=直接 use 注入所有策略组；bare=仅生成不挂接。
+  // 未提供条目的 key 按 inline 处理（与历史行为一致）。
+  proxyProviderAttachments?: ProxyProviderAttachment[];
   template?: TemplateType;
   userConfig?: Partial<UserConfig>;
   dialerProxyGroups?: DialerProxyGroup[];
@@ -48,6 +55,7 @@ export interface GenerateOptions {
   builtinRuleEdits?: BuiltinRuleEdits;
   proxyGroupNameOverrides?: Record<string, string>;
   proxyGroupOrder?: string[];
+  groupListeners?: GroupListenerBinding[];
 }
 
 type BaseConfig = Record<string, unknown>;
@@ -179,6 +187,7 @@ export function generateClashConfig(options: GenerateOptions): ClashConfig {
   const {
     nodes,
     proxyProviders,
+    proxyProviderAttachments = [],
     template = "standard",
     userConfig = {},
     dialerProxyGroups = [],
@@ -204,6 +213,19 @@ export function generateClashConfig(options: GenerateOptions): ClashConfig {
     ? Object.keys(resolvedProxyProviders).map((k) => k.trim()).filter(Boolean).sort((a, b) => a.localeCompare(b))
     : [];
 
+  // provider 接入模式：grouped/inline/bare；未声明的 key 按 inline（历史行为）
+  const attachmentByKey = new Map<string, ProxyProviderAttachment>();
+  for (const attachment of proxyProviderAttachments) {
+    if (!attachment || typeof attachment.key !== "string" || !attachment.key.trim()) continue;
+    attachmentByKey.set(attachment.key.trim(), attachment);
+  }
+  const providerModeOf = (key: string) => {
+    const mode = attachmentByKey.get(key)?.mode;
+    return mode === "grouped" || mode === "bare" ? mode : "inline";
+  };
+  const inlineProviderNames = proxyProviderNames.filter((key) => providerModeOf(key) === "inline");
+  const groupedProviderKeys = proxyProviderNames.filter((key) => providerModeOf(key) === "grouped");
+
   // 解析用户自定义的基础配置（提前解析：用于规范化补齐）
   const baseConfigYaml = (hasExplicitBaseConfigYaml ? userConfig.dnsYaml : config.dnsYaml) ?? "";
   const baseConfig = baseConfigYaml.trim() ? parseBaseConfigYaml(baseConfigYaml) : {};
@@ -338,18 +360,40 @@ export function generateClashConfig(options: GenerateOptions): ClashConfig {
     return out.length > 0 ? out : undefined;
   })();
 
+  // 生成机场组（proxy-providers 分组模式）：与可视化预览共用同一构建函数，保证组名一致
+  const groupedAttachments = groupedProviderKeys
+    .map((key) => attachmentByKey.get(key))
+    .filter((attachment): attachment is ProxyProviderAttachment => Boolean(attachment));
+  const { groups: providerGroups, names: providerGroupNames } = buildProviderProxyGroups(groupedAttachments, [
+    "DIRECT",
+    "REJECT",
+    ...nodeNameSet,
+    ...moduleGroupNameSet,
+    ...customGroupNameSet,
+    ...sanitizedDialerProxyGroups.map((g) => g.name.trim()).filter(Boolean),
+  ]);
+  // key→机场组名映射（供 Provider 组面板手动追加 provider-group 成员时解析组名）
+  const providerGroupNameByKey: Record<string, string> = {};
+  for (const providerGroup of providerGroups) {
+    const key = Array.isArray(providerGroup.use) ? providerGroup.use[0] : undefined;
+    if (typeof key === "string" && key) providerGroupNameByKey[key] = providerGroup.name;
+  }
+
   // 生成中转代理组
   const dialerGroups = generateDialerProxyGroups(
     sanitizedDialerProxyGroups,
     config.testUrl,
     config.testInterval,
-    proxyProviderNames
+    inlineProviderNames
   ) as unknown as ProxyGroup[];
 
   // 生成选项
   const generateOpts = {
     nodes: outputNodes,
-    proxyProviderNames,
+    proxyProviderNames: inlineProviderNames,
+    providerGroupNames,
+    allProviderKeys: proxyProviderNames,
+    providerGroupNameByKey,
     enabledModules: config.enabledGroups,
     ruleProviderBaseUrl: config.ruleProviderBaseUrl,
     testUrl: config.testUrl,
@@ -376,8 +420,9 @@ export function generateClashConfig(options: GenerateOptions): ClashConfig {
     const allGroups = generateProxyGroups(generateOpts);
 
     const mergedGroups = (() => {
-      // 如果没有中转组，直接返回
-      if (dialerGroups.length === 0) {
+      // 机场组与中转组一起插入到“节点选择/自动选择”之后
+      const extraGroups = [...providerGroups, ...dialerGroups];
+      if (extraGroups.length === 0) {
         return allGroups;
       }
 
@@ -390,11 +435,11 @@ export function generateClashConfig(options: GenerateOptions): ClashConfig {
         // 在节点选择和自动选择之后插入中转组
         const before = allGroups.slice(0, insertAfter + 1);
         const after = allGroups.slice(insertAfter + 1);
-        return [...before, ...dialerGroups, ...after];
+        return [...before, ...extraGroups, ...after];
       }
 
       // 如果找不到，就放在最前面
-      return [...dialerGroups, ...allGroups];
+      return [...extraGroups, ...allGroups];
     })();
 
     const orderKeys = Array.isArray(options.proxyGroupOrder)
@@ -476,9 +521,53 @@ export function generateClashConfig(options: GenerateOptions): ClashConfig {
     availablePolicyTargets
   );
   const resolvedListeners = (() => {
-    if (!listeners) return baseTopLevelPatch.listeners;
-    if (baseTopLevelPatch.listeners === undefined) return listeners;
-    if (Array.isArray(baseTopLevelPatch.listeners)) return [...baseTopLevelPatch.listeners, ...listeners];
+    // 分组监听：给"已存在的策略组"绑定 inbound 端口；端口在节点监听与 mixed-port 之间去重。
+    const groupListenerEntries = (() => {
+      const list = Array.isArray(options.groupListeners) ? options.groupListeners : [];
+      if (list.length === 0) return [] as Array<Record<string, unknown>>;
+
+      const validTargets = new Set(availablePolicyTargets);
+      const usedPorts = new Set<number>(Array.isArray(listeners) ? listeners.map((l) => l.port) : []);
+      if (typeof config.mixedPort === "number" && Number.isInteger(config.mixedPort)) {
+        usedPorts.add(config.mixedPort);
+      }
+      const usedNames = new Set<string>(Array.isArray(listeners) ? listeners.map((l) => l.name) : []);
+      const usedTargets = new Set<string>();
+
+      const out: Array<Record<string, unknown>> = [];
+      let autoIndex = 0;
+      for (const binding of list) {
+        if (!binding || typeof binding !== "object") continue;
+
+        const target = typeof binding.target === "string" ? binding.target.trim() : "";
+        if (!target || !validTargets.has(target)) continue;
+        // 一组一端口：同 target 重复绑定只取首条
+        if (usedTargets.has(target)) continue;
+
+        const port = binding.port;
+        if (typeof port !== "number" || !Number.isInteger(port)) continue;
+        if (port < 1 || port > 65535) continue;
+        if (usedPorts.has(port)) continue;
+        usedPorts.add(port);
+        usedTargets.add(target);
+
+        let name = `group-in-${autoIndex++}`;
+        while (usedNames.has(name)) name = `group-in-${autoIndex++}`;
+        usedNames.add(name);
+
+        out.push({ name, type: "mixed", listen: "0.0.0.0", port, proxy: target, udp: true });
+      }
+      return out;
+    })();
+
+    const generatedListeners: Array<Record<string, unknown>> = [
+      ...(Array.isArray(listeners) ? (listeners as Array<Record<string, unknown>>) : []),
+      ...groupListenerEntries,
+    ];
+
+    if (generatedListeners.length === 0) return baseTopLevelPatch.listeners;
+    if (baseTopLevelPatch.listeners === undefined) return generatedListeners;
+    if (Array.isArray(baseTopLevelPatch.listeners)) return [...baseTopLevelPatch.listeners, ...generatedListeners];
     throw new BaseConfigYamlError("基础和 DNS 配置中的 listeners 必须是数组，才能与节点监听端口合并。");
   })();
 
diff --git a/packages/core/src/generator/proxy-groups.ts b/packages/core/src/generator/proxy-groups.ts
index 63d56d5..e19e8bc 100644
--- a/packages/core/src/generator/proxy-groups.ts
+++ b/packages/core/src/generator/proxy-groups.ts
@@ -27,7 +27,7 @@ import {
 } from "./rules";
 import { getModuleRuleOrderKey } from "./module-rules";
 import { buildRuleSetUrlFromPath } from "@subboost/core/rules/rule-model";
-import { buildTypedProxyGroup } from "./proxy-group-type";
+import { buildTypedProxyGroup, uniqueProxyNames } from "./proxy-group-type";
 
 export { PROXY_GROUP_MODULES };
 export type { ProxyGroupModule, ProxyGroupRule };
@@ -51,6 +51,12 @@ export const CATEGORY_INFO: Record<string, { name: string; order: number }> = {
 export interface GenerateOptions {
   nodes: ParsedNode[];
   proxyProviderNames?: string[];
+  // 机场组（proxy-providers 分组模式）的组名：仅用于把机场组注入“节点选择”候选与可选成员池，
+  // 组本体在 generator/index.ts 中生成并插入（携带 use/icon 完整信息）。
+  providerGroupNames?: string[];
+  // provider 手动追加（高级模式 Provider 组面板）用：全部 provider key、以及 key→机场组名 映射。
+  allProviderKeys?: string[];
+  providerGroupNameByKey?: Record<string, string>;
   enabledModules: string[];
   ruleProviderBaseUrl: string;
   testUrl: string;
@@ -69,6 +75,36 @@ export interface GenerateOptions {
 
 export { isSubscriptionInfoNodeName };
 
+/**
+ * 构建机场组（proxy-providers 分组模式）：select + use。
+ * 组名与保留名（既有组/节点等）冲突时自动加序号后缀。
+ * generator/index.ts 与可视化预览共用，保证两边组名一致。
+ */
+export function buildProviderProxyGroups(
+  attachments: Array<{ key: string; mode: string; groupName?: string }>,
+  reservedNames: Iterable<string>
+): { groups: ProxyGroup[]; names: string[] } {
+  const reserved = new Set(reservedNames);
+  const groups: ProxyGroup[] = [];
+  const names: string[] = [];
+  for (const attachment of attachments) {
+    if (!attachment || attachment.mode !== "grouped") continue;
+    const key = typeof attachment.key === "string" ? attachment.key.trim() : "";
+    if (!key) continue;
+    const rawGroupName = typeof attachment.groupName === "string" ? attachment.groupName.trim() : "";
+    const baseName = rawGroupName || key;
+    let groupName = baseName;
+    let suffix = 2;
+    while (reserved.has(groupName)) {
+      groupName = `${baseName} ${suffix++}`;
+    }
+    reserved.add(groupName);
+    names.push(groupName);
+    groups.push({ name: groupName, type: "select", use: [key] });
+  }
+  return { groups, names };
+}
+
 function getEnabledCustomProxyGroups(customProxyGroups: CustomProxyGroup[]): CustomProxyGroup[] {
   return customProxyGroups.filter((group) => group && group.enabled !== false);
 }
@@ -134,6 +170,9 @@ export function generateProxyGroups(options: GenerateOptions): ProxyGroup[] {
   const {
     nodes,
     proxyProviderNames = [],
+    providerGroupNames = [],
+    allProviderKeys = [],
+    providerGroupNameByKey = {},
     enabledModules,
     testUrl,
     testInterval,
@@ -206,8 +245,32 @@ export function generateProxyGroups(options: GenerateOptions): ProxyGroup[] {
     ...filteredNodeNames,
     ...PROXY_GROUP_MODULES.filter((module) => enabledSet.has(module.id)).map((module) => moduleNames[module.id]),
     ...customGroupNames,
+    ...providerGroupNames,
   );
 
+  // 机场组（proxy-providers 分组模式）作为普通默认成员参与解析：{key,name} 列表供 resolve
+  // 把机场组名解析成 provider-group 成员（可排除/排序/经 extraMembers 追加）。
+  const providerKeyByName = new Map<string, string>();
+  for (const [key, name] of Object.entries(providerGroupNameByKey)) {
+    if (typeof name === "string" && name) providerKeyByName.set(name, key);
+  }
+  const providerGroups = providerGroupNames
+    .map((name) => ({ key: providerKeyByName.get(name) ?? "", name }))
+    .filter((item) => item.key);
+
+  // 默认注入机场组名：在 resolve 之前对 defaultProxyNames 做锚点插入（自动选择/节点选择之后），
+  // 使 excludedMembers/memberOrder/extraMembers 对机场组天然生效。算法与原 withProviderGroups 一致。
+  const withProviderGroupDefaults = (proxies: string[]) => {
+    if (providerGroupNames.length === 0) return proxies;
+    const missing = providerGroupNames.filter((name) => !proxies.includes(name));
+    if (missing.length === 0) return proxies;
+    const autoIndex = autoTarget ? proxies.indexOf(autoTarget) : -1;
+    const selectIndex = selectTarget ? proxies.indexOf(selectTarget) : -1;
+    const anchorIndex = autoIndex >= 0 ? autoIndex : selectIndex;
+    const insertAt = anchorIndex >= 0 ? anchorIndex + 1 : 0;
+    return [...proxies.slice(0, insertAt), ...missing, ...proxies.slice(insertAt)];
+  };
+
   const resolveGroupProxyNames = (
     defaultProxyNames: string[],
     advanced: ProxyGroupAdvancedConfig | undefined,
@@ -219,6 +282,7 @@ export function generateProxyGroups(options: GenerateOptions): ProxyGroup[] {
       nodes,
       moduleNames,
       customProxyGroups: activeCustomProxyGroups,
+      providerGroups,
       advanced,
       self,
     }).proxyNames;
@@ -258,7 +322,7 @@ export function generateProxyGroups(options: GenerateOptions): ProxyGroup[] {
             name: moduleName,
             type: "select",
             // “节点选择”组本身不应包含自己；默认先走“⚡ 自动选择”更符合开箱即用
-            proxies: resolveGroupProxyNames(defaultProxies, advanced, {
+            proxies: resolveGroupProxyNames(withProviderGroupDefaults(defaultProxies), advanced, {
               kind: "module",
               id: module.id,
               name: moduleName,
@@ -270,7 +334,7 @@ export function generateProxyGroups(options: GenerateOptions): ProxyGroup[] {
           groups.push({
             name: moduleName,
             type: "select",
-            proxies: resolveGroupProxyNames(defaultProxies, advanced, {
+            proxies: resolveGroupProxyNames(withProviderGroupDefaults(defaultProxies), advanced, {
               kind: "module",
               id: module.id,
               name: moduleName,
@@ -323,7 +387,7 @@ export function generateProxyGroups(options: GenerateOptions): ProxyGroup[] {
           groups.push({
             name: moduleName,
             type: "select",
-            proxies: resolveGroupProxyNames(defaultProxies, advanced, {
+            proxies: resolveGroupProxyNames(withProviderGroupDefaults(defaultProxies), advanced, {
               kind: "module",
               id: module.id,
               name: moduleName,
@@ -347,7 +411,7 @@ export function generateProxyGroups(options: GenerateOptions): ProxyGroup[] {
             name: moduleName,
             type: "select",
             // 私有网络/国内服务：默认 DIRECT，但也提供自动选择
-            proxies: resolveGroupProxyNames(defaultProxies, advanced, {
+            proxies: resolveGroupProxyNames(withProviderGroupDefaults(defaultProxies), advanced, {
               kind: "module",
               id: module.id,
               name: moduleName,
@@ -407,8 +471,10 @@ export function generateProxyGroups(options: GenerateOptions): ProxyGroup[] {
         name: customGroup.name,
         type: "select",
         proxies: resolveCustom(
-          fallbackTargets("DIRECT", "REJECT", ...filteredNodeNames).filter(
-            (target) => target !== customGroup.name
+          withProviderGroupDefaults(
+            fallbackTargets("DIRECT", "REJECT", ...filteredNodeNames).filter(
+              (target) => target !== customGroup.name
+            )
           )
         ),
         ...providerUse,
@@ -419,8 +485,10 @@ export function generateProxyGroups(options: GenerateOptions): ProxyGroup[] {
         name: customGroup.name,
         type: "select",
         proxies: resolveCustom(
-          fallbackTargets("REJECT", "DIRECT", ...filteredNodeNames).filter(
-            (target) => target !== customGroup.name
+          withProviderGroupDefaults(
+            fallbackTargets("REJECT", "DIRECT", ...filteredNodeNames).filter(
+              (target) => target !== customGroup.name
+            )
           )
         ),
         ...providerUse,
@@ -429,7 +497,7 @@ export function generateProxyGroups(options: GenerateOptions): ProxyGroup[] {
     return {
       name: customGroup.name,
       type: "select",
-      proxies: resolveCustom(customBaseProxies.filter((target) => target !== customGroup.name)),
+      proxies: resolveCustom(withProviderGroupDefaults(customBaseProxies.filter((target) => target !== customGroup.name))),
       ...providerUse,
     };
   };
@@ -473,6 +541,37 @@ export function generateProxyGroups(options: GenerateOptions): ProxyGroup[] {
     }
   }
 
+  // Provider 组面板：把各组 advanced.extraMembers 里手动追加的 provider-inline 成员落到 use。
+  // provider-group（机场组）已作为普通成员由 resolveGroupProxyNames 处理（进 proxies 并参与排序），此处不再重复追加。
+  if (allProviderKeys.length > 0) {
+    const providerKeySet = new Set(allProviderKeys);
+    const advancedByGroupName = new Map<string, ProxyGroupAdvancedConfig>();
+    for (const proxyModule of PROXY_GROUP_MODULES) {
+      const adv = proxyGroupAdvanced[proxyModule.id];
+      if (adv?.extraMembers?.length) advancedByGroupName.set(moduleNames[proxyModule.id], adv);
+    }
+    for (const customGroup of activeCustomProxyGroups) {
+      const name = typeof customGroup.name === "string" ? customGroup.name.trim() : "";
+      if (name && customGroup.advanced?.extraMembers?.length) {
+        advancedByGroupName.set(name, customGroup.advanced);
+      }
+    }
+    for (const group of groups) {
+      const advanced = advancedByGroupName.get(group.name);
+      if (!advanced?.extraMembers?.length) continue;
+      const inlineKeys: string[] = [];
+      for (const ref of advanced.extraMembers) {
+        if (ref.kind === "provider-inline" && providerKeySet.has(ref.key)) {
+          inlineKeys.push(ref.key);
+        }
+      }
+      if (inlineKeys.length > 0) {
+        const existing = Array.isArray(group.use) ? group.use : [];
+        group.use = uniqueProxyNames([...existing, ...inlineKeys]);
+      }
+    }
+  }
+
   return groups;
 }
 
diff --git a/packages/core/src/proxy-group-advanced.test.ts b/packages/core/src/proxy-group-advanced.test.ts
index 764a8ac..e648292 100644
--- a/packages/core/src/proxy-group-advanced.test.ts
+++ b/packages/core/src/proxy-group-advanced.test.ts
@@ -23,6 +23,10 @@ describe("resolveProxyGroupMembers", () => {
     expect(normalizeProxyGroupMemberRef({ kind: "node", name: " Node A " })).toEqual({ kind: "node", name: "Node A" });
     expect(normalizeProxyGroupMemberRef({ kind: "module", id: " auto " })).toEqual({ kind: "module", id: "auto" });
     expect(normalizeProxyGroupMemberRef({ kind: "custom", id: " media " })).toEqual({ kind: "custom", id: "media" });
+    expect(normalizeProxyGroupMemberRef({ kind: "provider-inline", key: " lxy " })).toEqual({ kind: "provider-inline", key: "lxy" });
+    expect(normalizeProxyGroupMemberRef({ kind: "provider-group", key: " lxy " })).toEqual({ kind: "provider-group", key: "lxy" });
+    expect(normalizeProxyGroupMemberRef({ kind: "provider-inline", key: " " })).toBeNull();
+    expect(normalizeProxyGroupMemberRef({ kind: "provider-group" })).toBeNull();
     expect(normalizeProxyGroupMemberRef({ kind: "direct" })).toEqual({ kind: "direct" });
     expect(normalizeProxyGroupMemberRef({ kind: "reject" })).toEqual({ kind: "reject" });
     expect(normalizeProxyGroupMemberRef(null)).toBeNull();
@@ -425,4 +429,62 @@ describe("resolveProxyGroupMembers", () => {
     ]);
     expect(result.excluded.map((member) => member.key)).toEqual(["direct:DIRECT"]);
   });
+
+  it("resolves airport group names as provider-group members when providerGroups is passed", () => {
+    const result = resolveProxyGroupMembers({
+      defaultProxyNames: ["DIRECT", "✈️ 香港机场"],
+      nodes: [],
+      providerGroups: [{ key: "lxy", name: "✈️ 香港机场" }],
+    });
+    const airport = result.included.find((member) => member.kind === "provider-group");
+    expect(airport).toMatchObject({ kind: "provider-group", key: "provider-group:lxy", name: "✈️ 香港机场" });
+    expect(airport?.ref).toEqual({ kind: "provider-group", key: "lxy" });
+  });
+
+  it("ignores airport group names when providerGroups is not passed (old behavior)", () => {
+    const result = resolveProxyGroupMembers({
+      defaultProxyNames: ["DIRECT", "✈️ 香港机场"],
+      nodes: [],
+    });
+    expect(result.proxyNames).toEqual(["DIRECT"]);
+    expect(result.included.some((member) => member.kind === "provider-group")).toBe(false);
+  });
+
+  it("excludes a default airport group via excludedMembers", () => {
+    const result = resolveProxyGroupMembers({
+      defaultProxyNames: ["DIRECT", "✈️ 香港机场"],
+      availableProxyNames: ["DIRECT", "✈️ 香港机场"],
+      nodes: [],
+      providerGroups: [{ key: "lxy", name: "✈️ 香港机场" }],
+      advanced: { excludedMembers: [{ kind: "provider-group", key: "lxy" }] },
+    });
+    expect(result.proxyNames).toEqual(["DIRECT"]);
+    expect(result.excluded.some((member) => member.key === "provider-group:lxy")).toBe(true);
+  });
+
+  it("reorders a provider-group member via memberOrder", () => {
+    const result = resolveProxyGroupMembers({
+      defaultProxyNames: ["DIRECT", "✈️ 香港机场", "REJECT"],
+      nodes: [],
+      providerGroups: [{ key: "lxy", name: "✈️ 香港机场" }],
+      advanced: {
+        memberOrder: [
+          { kind: "provider-group", key: "lxy" },
+          { kind: "direct" },
+          { kind: "reject" },
+        ],
+      },
+    });
+    expect(result.proxyNames).toEqual(["✈️ 香港机场", "DIRECT", "REJECT"]);
+  });
+
+  it("drops an orphan provider-group ref in extraMembers (key not in providerGroups)", () => {
+    const result = resolveProxyGroupMembers({
+      defaultProxyNames: ["DIRECT"],
+      nodes: [],
+      providerGroups: [{ key: "lxy", name: "✈️ 香港机场" }],
+      advanced: { extraMembers: [{ kind: "provider-group", key: "ghost" }] },
+    });
+    expect(result.included.some((member) => member.key === "provider-group:ghost")).toBe(false);
+  });
 });
diff --git a/packages/core/src/proxy-group-advanced.ts b/packages/core/src/proxy-group-advanced.ts
index 1b2187e..d2ee5d1 100644
--- a/packages/core/src/proxy-group-advanced.ts
+++ b/packages/core/src/proxy-group-advanced.ts
@@ -48,6 +48,9 @@ export interface ResolveProxyGroupMembersOptions {
   nodes: ParsedNode[];
   moduleNames?: Record<string, string>;
   customProxyGroups?: CustomProxyGroup[];
+  // 机场组（proxy-providers 分组模式）：{key, name} 列表，让机场组名可解析成 provider-group 成员，
+  // 与普通成员一样参与排除/排序/插入。不传则 provider-group 名字不被识别（与旧行为一致）。
+  providerGroups?: Array<{ key: string; name: string }>;
   advanced?: ProxyGroupAdvancedConfig;
   self?: { kind: "module" | "custom"; id: string; name: string };
 }
@@ -148,6 +151,12 @@ export function normalizeProxyGroupMemberRef(value: unknown): ProxyGroupMemberRe
   if (item.kind === "custom" && typeof item.id === "string" && item.id.trim()) {
     return { kind: "custom", id: item.id.trim() };
   }
+  if (item.kind === "provider-inline" && typeof item.key === "string" && item.key.trim()) {
+    return { kind: "provider-inline", key: item.key.trim() };
+  }
+  if (item.kind === "provider-group" && typeof item.key === "string" && item.key.trim()) {
+    return { kind: "provider-group", key: item.key.trim() };
+  }
   return null;
 }
 
@@ -201,6 +210,7 @@ function buildMemberFromName(
     nodeNameSet: Set<string>;
     moduleNameToId: Map<string, string>;
     customNameToId: Map<string, string>;
+    providerNameToKey?: Map<string, string>;
   }
 ): ProxyGroupResolvedMember | null {
   const trimmed = name.trim();
@@ -215,6 +225,9 @@ function buildMemberFromName(
     if (moduleId) ref = { kind: "module", id: moduleId };
     const customId = options.customNameToId.get(trimmed);
     if (!ref && customId) ref = { kind: "custom", id: customId };
+    // 机场组名（proxy-providers 分组模式）→ provider-group 成员；组名经 reserved 去重不会与上述冲突
+    const providerKey = options.providerNameToKey?.get(trimmed);
+    if (!ref && providerKey) ref = { kind: "provider-group", key: providerKey };
   }
 
   if (!ref) return null;
@@ -232,6 +245,7 @@ function buildMemberFromRef(
     nodeNameSet: Set<string>;
     moduleNames: Record<string, string>;
     customGroupsById: Map<string, CustomProxyGroup>;
+    providerKeyToName?: Map<string, string>;
   }
 ): ProxyGroupResolvedMember | null {
   const key = getProxyGroupMemberKey(ref);
@@ -245,6 +259,13 @@ function buildMemberFromRef(
     const name = options.moduleNames[ref.id]?.trim();
     return name ? { ref, key, name, kind: ref.kind } : null;
   }
+  // provider-inline 注入 use，不进 proxies、无顺序语义，不参与常规 member 解析
+  if (ref.kind === "provider-inline") return null;
+  // provider-group（机场组）：查 key→组名，命中即作为普通成员；孤儿（源已改/删）返回 null
+  if (ref.kind === "provider-group") {
+    const name = options.providerKeyToName?.get(ref.key);
+    return name ? { ref, key, name, kind: ref.kind } : null;
+  }
   const group = options.customGroupsById.get(ref.id);
   const name = group?.name?.trim();
   return name ? { ref, key, name, kind: ref.kind } : null;
@@ -295,13 +316,23 @@ export function resolveProxyGroupMembers(options: ResolveProxyGroupMembersOption
       customGroupsById.set(group.id, group);
     }
   }
+  const providerNameToKey = new Map<string, string>();
+  const providerKeyToName = new Map<string, string>();
+  for (const item of options.providerGroups || []) {
+    const key = typeof item.key === "string" ? item.key.trim() : "";
+    const name = typeof item.name === "string" ? item.name.trim() : "";
+    if (key && name) {
+      providerNameToKey.set(name, key);
+      providerKeyToName.set(key, name);
+    }
+  }
 
   const buildMembersFromNames = (names: string[]) => {
     const out: ProxyGroupResolvedMember[] = [];
     const seen = new Set<string>();
     for (const rawName of names || []) {
       if (typeof rawName !== "string") continue;
-      const member = buildMemberFromName(rawName, { nodeNameSet, moduleNameToId, customNameToId });
+      const member = buildMemberFromName(rawName, { nodeNameSet, moduleNameToId, customNameToId, providerNameToKey });
       if (!member || seen.has(member.key)) continue;
       if (options.self && member.key === `${options.self.kind}:${options.self.id}`) continue;
       seen.add(member.key);
@@ -320,6 +351,7 @@ export function resolveProxyGroupMembers(options: ResolveProxyGroupMembersOption
       nodeNameSet,
       moduleNames: options.moduleNames || {},
       customGroupsById,
+      providerKeyToName,
     });
     if (!member || candidateMap.has(member.key)) continue;
     if (options.self && member.key === `${options.self.kind}:${options.self.id}`) continue;
diff --git a/packages/core/src/proxy-group-targets.ts b/packages/core/src/proxy-group-targets.ts
index 3ca3f6d..0608e70 100644
--- a/packages/core/src/proxy-group-targets.ts
+++ b/packages/core/src/proxy-group-targets.ts
@@ -32,6 +32,10 @@ export function getProxyGroupMemberKey(member: ProxyGroupMemberRef): string {
       return `module:${member.id}`;
     case "custom":
       return `custom:${member.id}`;
+    case "provider-inline":
+      return `provider-inline:${member.key}`;
+    case "provider-group":
+      return `provider-group:${member.key}`;
     case "direct":
       return "direct:DIRECT";
     case "reject":
diff --git a/packages/core/src/subscription/config-utils.test.ts b/packages/core/src/subscription/config-utils.test.ts
index 27bbf7a..81d1896 100644
--- a/packages/core/src/subscription/config-utils.test.ts
+++ b/packages/core/src/subscription/config-utils.test.ts
@@ -448,6 +448,40 @@ describe("subscription config utils", () => {
     expect(options.dialerProxyGroups).toBeUndefined();
   });
 
+  it("normalizes group listeners: trims fields, drops invalid entries and dedupes targets", () => {
+    const options = buildGenerateOptionsFromConfig(
+      {
+        groupListeners: [
+          { id: " g1 ", target: " AI 组 ", port: 7891 },
+          { id: "g2", target: "Media", port: "7892" },
+          { id: "g3", target: "  ", port: 7893 },
+          { id: "g4", target: "AI 组", port: 7894 },
+          "bad",
+          { id: "g5", target: "Games", port: 0 },
+          { id: "g6", target: "Games", port: 65536 },
+          { target: "Games", port: 7895 },
+        ],
+      },
+      { nodes: [node()] },
+    );
+
+    expect(options.groupListeners).toEqual([
+      { id: "g1", target: "AI 组", port: 7891 },
+      { id: "group_listener_8", target: "Games", port: 7895 },
+    ]);
+  });
+
+  it("omits group listeners when none survive normalization", () => {
+    const options = buildGenerateOptionsFromConfig(
+      {
+        groupListeners: [{ id: "g1", target: "", port: 7891 }, 42],
+      },
+      { nodes: [node()] },
+    );
+
+    expect(options).not.toHaveProperty("groupListeners");
+  });
+
   it("uses legacy custom group fallback when rule model normalization returns no groups", async () => {
     vi.resetModules();
     vi.doMock("@subboost/core/rules/rule-model", () => ({
diff --git a/packages/core/src/subscription/config-utils.ts b/packages/core/src/subscription/config-utils.ts
index 09d4517..8eb8622 100644
--- a/packages/core/src/subscription/config-utils.ts
+++ b/packages/core/src/subscription/config-utils.ts
@@ -8,12 +8,13 @@ import {
   isProxyGroupGroupType,
   type CustomProxyGroup,
   type CustomRule,
+  type GroupListenerBinding,
   type ProxyGroupRuleTarget,
   type TemplateType,
   type UserConfig,
 } from "@subboost/core/types/config";
 import { stripImportedNodeControlFieldsFromList } from "@subboost/core/subscription/imported-node-controls";
-import { buildProxyProvidersFromConfig } from "@subboost/core/subscription/proxy-providers";
+import { buildProxyProviderPlanFromConfig } from "@subboost/core/subscription/proxy-providers";
 import { ensureCustomRuleId } from "@subboost/core/rules/custom-rule-utils";
 import { DEFAULT_SUBBOOST_CONFIG } from "@subboost/core/config/defaults";
 import { normalizeRuleModelFromConfig } from "@subboost/core/rules/rule-model";
@@ -127,6 +128,31 @@ function normalizeListenerPorts(value: unknown): Record<string, number> | undefi
   return Object.keys(out).length > 0 ? out : undefined;
 }
 
+function normalizeGroupListeners(value: unknown): GroupListenerBinding[] {
+  if (!Array.isArray(value)) return [];
+  const out: GroupListenerBinding[] = [];
+  const usedIds = new Set<string>();
+  const usedTargets = new Set<string>();
+  for (let index = 0; index < value.length; index += 1) {
+    const item = value[index];
+    if (!isRecord(item)) continue;
+
+    const target = toTrimmedString(item.target);
+    const port = normalizePort(item.port);
+    if (!target || port === undefined) continue;
+    // 一组一端口：同 target 重复绑定只保留首个
+    if (usedTargets.has(target)) continue;
+    usedTargets.add(target);
+
+    let id = toTrimmedString(item.id) || `group_listener_${index + 1}`;
+    while (usedIds.has(id)) id = `${id}_${index + 1}`;
+    usedIds.add(id);
+
+    out.push({ id, target, port });
+  }
+  return out;
+}
+
 function normalizeEnabledList(value: unknown): string[] | undefined {
   const list = normalizeStringArray(value);
   return list.length > 0 ? list : undefined;
@@ -237,8 +263,11 @@ export function buildGenerateOptionsFromConfig(
 ): GenerateOptions {
   const config = rawConfig;
   const { testUrl, testInterval } = getEffectiveTestOptions(config);
-  const proxyProviders =
-    opts.proxyProviders ?? buildProxyProvidersFromConfig(config, { testUrl, testInterval });
+  // attachments 始终从 config.sources 派生（描述各 provider 的接入方式）；
+  // opts.proxyProviders 显式传入时（server 路径）与之同源，key 保持一致
+  const providerPlan = buildProxyProviderPlanFromConfig(config, { testUrl, testInterval });
+  const proxyProviders = opts.proxyProviders ?? providerPlan?.providers;
+  const proxyProviderAttachments = providerPlan?.attachments;
 
   const template = normalizeTemplate(config.template, "standard");
 
@@ -298,6 +327,7 @@ export function buildGenerateOptionsFromConfig(
 
   const dialerProxyGroups = normalizeDialerProxyGroups(config.dialerProxyGroups);
   const proxyGroupOrder = normalizeProxyGroupOrder(config.proxyGroupOrder);
+  const groupListeners = normalizeGroupListeners(config.groupListeners);
   const sanitizedNodes = stripImportedNodeControlFieldsFromList(opts.nodes);
   const proxyGroupAdvanced = isRecord(config.proxyGroupAdvanced)
     ? Object.fromEntries(
@@ -310,6 +340,7 @@ export function buildGenerateOptionsFromConfig(
   return {
     nodes: sanitizedNodes,
     ...(proxyProviders ? { proxyProviders } : {}),
+    ...(proxyProviderAttachments && proxyProviderAttachments.length > 0 ? { proxyProviderAttachments } : {}),
     template,
     userConfig,
     ...(dialerProxyGroups.length > 0 ? { dialerProxyGroups } : {}),
@@ -319,5 +350,6 @@ export function buildGenerateOptionsFromConfig(
     ...(Object.keys(builtinRuleEdits).length > 0 ? { builtinRuleEdits } : {}),
     ...(proxyGroupNameOverrides ? { proxyGroupNameOverrides } : {}),
     ...(proxyGroupOrder ? { proxyGroupOrder } : {}),
+    ...(groupListeners.length > 0 ? { groupListeners } : {}),
   };
 }
diff --git a/packages/core/src/subscription/proxy-providers.test.ts b/packages/core/src/subscription/proxy-providers.test.ts
index 2a10926..dd2e620 100644
--- a/packages/core/src/subscription/proxy-providers.test.ts
+++ b/packages/core/src/subscription/proxy-providers.test.ts
@@ -1,5 +1,10 @@
 import { describe, expect, it } from "vitest";
-import { buildProxyProvidersFromConfig } from "./proxy-providers";
+import {
+  buildProxyProviderPlanFromConfig,
+  buildProxyProvidersFromConfig,
+  DEFAULT_PROVIDER_GROUP_EMOJI,
+  DEFAULT_PROXY_PROVIDER_FILTER,
+} from "./proxy-providers";
 
 describe("proxy provider config builder", () => {
   it("returns undefined when no URL source can safely become a provider", () => {
@@ -38,12 +43,14 @@ describe("proxy provider config builder", () => {
       url_airport_one: {
         type: "http",
         url: "https://a.example.com/sub",
-        interval: 3600,
+        interval: 43200,
         path: "./proxy_providers/url_airport_one.yaml",
         "health-check": {
           enable: true,
           url: "https://test.example.com",
-          interval: 120,
+          interval: 300,
+          timeout: 5000,
+          lazy: true,
         },
       },
       url_1: {
@@ -57,4 +64,125 @@ describe("proxy provider config builder", () => {
     });
     expect(Object.keys(providers || {})).toEqual(["url_airport_one", "url_1", "url_bad_url"]);
   });
+
+  it("treats legacy sources without providerMode as inline attachments", () => {
+    const plan = buildProxyProviderPlanFromConfig(
+      {
+        sources: [{ id: "s1", type: "url", useProxyProviders: true, content: "https://a.example.com/sub" }],
+      },
+      { testUrl: "https://test.example.com", testInterval: 60 }
+    );
+
+    expect(plan?.attachments).toEqual([{ key: "url_s1", mode: "inline" }]);
+  });
+
+  it("honors custom provider keys while keeping the path in sync with the key", () => {
+    const plan = buildProxyProviderPlanFromConfig(
+      {
+        sources: [
+          {
+            id: "s1",
+            type: "url",
+            useProxyProviders: true,
+            content: "https://a.example.com/sub",
+            providerKey: " lxy ",
+            providerMode: "bare",
+          },
+          // 自定义 key 重复时后者被跳过（与默认 key 重复行为一致）
+          {
+            id: "s2",
+            type: "url",
+            useProxyProviders: true,
+            content: "https://b.example.com/sub",
+            providerKey: "lxy",
+          },
+          // 全中文 key：文件名无安全字符，path 回落源 id 默认名
+          {
+            id: "s3",
+            type: "url",
+            useProxyProviders: true,
+            content: "https://c.example.com/sub",
+            providerKey: "我的机场",
+          },
+        ],
+      },
+      { testUrl: "https://test.example.com", testInterval: 60 }
+    );
+
+    expect(Object.keys(plan?.providers ?? {})).toEqual(["lxy", "我的机场"]);
+    // path 文件名跟随 key（安全化）
+    expect(plan?.providers["lxy"]).toMatchObject({
+      url: "https://a.example.com/sub",
+      path: "./proxy_providers/lxy.yaml",
+    });
+    // 全非法字符 key 回落源 id 默认名
+    expect(plan?.providers["我的机场"]).toMatchObject({
+      path: "./proxy_providers/url_s3.yaml",
+    });
+    expect(plan?.attachments).toEqual([
+      { key: "lxy", mode: "bare" },
+      { key: "我的机场", mode: "inline" },
+    ]);
+  });
+
+  it("fills grouped attachments with fallback emoji group name", () => {
+    const plan = buildProxyProviderPlanFromConfig(
+      {
+        sources: [
+          {
+            id: "s1",
+            type: "url",
+            useProxyProviders: true,
+            content: "https://a.example.com/sub",
+            providerMode: "grouped",
+          },
+          {
+            id: "s2",
+            type: "url",
+            useProxyProviders: true,
+            content: "https://b.example.com/sub",
+            providerMode: "grouped",
+            providerGroupName: " ✈️ 测试机场 ",
+          },
+        ],
+      },
+      { testUrl: "https://test.example.com", testInterval: 60 }
+    );
+
+    expect(plan?.attachments).toEqual([
+      { key: "url_s1", mode: "grouped", groupName: `${DEFAULT_PROVIDER_GROUP_EMOJI} url_s1` },
+      { key: "url_s2", mode: "grouped", groupName: "✈️ 测试机场" },
+    ]);
+    // 未设置 providerFilter → 写入默认过滤正则
+    expect(plan?.providers["url_s1"]).toMatchObject({ filter: DEFAULT_PROXY_PROVIDER_FILTER });
+  });
+
+  it("treats providerFilter as tri-state: default when unset, omitted when explicitly cleared", () => {
+    const plan = buildProxyProviderPlanFromConfig(
+      {
+        sources: [
+          { id: "s1", type: "url", useProxyProviders: true, content: "https://a.example.com/sub" },
+          {
+            id: "s2",
+            type: "url",
+            useProxyProviders: true,
+            content: "https://b.example.com/sub",
+            providerFilter: "",
+          },
+          {
+            id: "s3",
+            type: "url",
+            useProxyProviders: true,
+            content: "https://c.example.com/sub",
+            providerFilter: "(?i)hk",
+          },
+        ],
+      },
+      { testUrl: "https://test.example.com", testInterval: 60 }
+    );
+
+    expect(plan?.providers["url_s1"]).toMatchObject({ filter: DEFAULT_PROXY_PROVIDER_FILTER });
+    expect(plan?.providers["url_s2"]).not.toHaveProperty("filter");
+    expect(plan?.providers["url_s3"]).toMatchObject({ filter: "(?i)hk" });
+  });
 });
diff --git a/packages/core/src/subscription/proxy-providers.ts b/packages/core/src/subscription/proxy-providers.ts
index c412567..af2476e 100644
--- a/packages/core/src/subscription/proxy-providers.ts
+++ b/packages/core/src/subscription/proxy-providers.ts
@@ -6,17 +6,50 @@ import { tryNormalizeSubscriptionUrlInput } from "@subboost/core/subscription/ur
  * 注意：
  * - 仅对 sources 里标记 useProxyProviders=true 的 URL 源生效
  * - 不触发任何出站请求
- * - provider key 需是安全字符串（避免 YAML key 解析问题）
+ * - provider key 支持自定义（providerKey），默认 url_<源id>；缓存 path 文件名跟随 key
+ *   （文件名安全化，全非法字符回落 url_<源id>，撞名自动 _2 后缀）
+ * - filter：providerFilter 未设置时写入默认正则（过滤到期/套餐类信息节点）；显式清空则不写 filter
+ * - 接入模式（providerMode）：grouped=生成机场组挂入节点选择；inline=直接 use 注入所有策略组（旧行为，
+ *   旧数据无此字段时按 inline 处理保持兼容）；bare=仅生成 proxy-providers 不挂接
  */
 
-export function buildProxyProvidersFromConfig(
-  config: Record<string, unknown>,
+export type ProxyProviderAttachmentMode = "grouped" | "inline" | "bare";
+
+export interface ProxyProviderAttachment {
+  key: string;
+  mode: ProxyProviderAttachmentMode;
+  // 仅 grouped 模式生效：机场组名（留空回落为 "✈️ <key>"，emoji 按上游惯例拼在组名前缀）
+  groupName?: string;
+}
+
+export interface ProxyProviderPlan {
+  providers: Record<string, unknown>;
+  attachments: ProxyProviderAttachment[];
+}
+
+// 机场组默认 emoji（拼进组名前缀，参考上游自定义分组）
+export const DEFAULT_PROVIDER_GROUP_EMOJI = "✈️";
+
+// provider 默认节点过滤正则：剔除到期/套餐/官网等信息节点
+export const DEFAULT_PROXY_PROVIDER_FILTER = "(?i)^(?!.*(到期时间|套餐到期|官网|更新|到期)).*";
+
+function toFileSafeName(value: string): string {
+  return value.replace(/[^a-zA-Z0-9_-]/g, "_");
+}
+
+function normalizeAttachmentMode(value: unknown): ProxyProviderAttachmentMode {
+  return value === "grouped" || value === "bare" || value === "inline" ? value : "inline";
+}
+
+export function buildProxyProviderPlanFromSources(
+  rawSources: unknown[],
   opts: { testUrl: string; testInterval: number }
-): Record<string, unknown> | undefined {
-  const rawSources = Array.isArray(config.sources) ? config.sources : [];
+): ProxyProviderPlan | undefined {
   if (rawSources.length === 0) return undefined;
 
-  const out: Record<string, unknown> = {};
+  const providers: Record<string, unknown> = {};
+  const attachments: ProxyProviderAttachment[] = [];
+  const usedPathNames = new Set<string>();
   let fallbackIndex = 0;
 
   for (const raw of rawSources) {
@@ -42,22 +75,70 @@ export function buildProxyProvidersFromConfig(
     const rawId = typeof item.id === "string" ? item.id.trim() : "";
     const id = rawId || String(++fallbackIndex);
     const safeId = id.replace(/[^a-zA-Z0-9_-]/g, "_");
-    const name = `url_${safeId}`;
-    if (Object.prototype.hasOwnProperty.call(out, name)) continue;
+    const defaultKey = `url_${safeId}`;
+
+    const customKey = typeof item.providerKey === "string" ? item.providerKey.trim() : "";
+    const key = customKey || defaultKey;
+    // key 重复时跳过后者（与旧行为一致）；UI 层负责重复提示
+    if (Object.prototype.hasOwnProperty.call(providers, key)) continue;
 
-    out[name] = {
+    // path 文件名与 key 呼应：安全化后跟随 key；全非法字符则回落源 id 默认名；撞名加后缀
+    const fileSafeKey = toFileSafeName(key);
+    const pathBase = /[a-zA-Z0-9]/.test(fileSafeKey) ? fileSafeKey : defaultKey;
+    let pathName = pathBase;
+    let pathSuffix = 2;
+    while (usedPathNames.has(pathName)) {
+      pathName = `${pathBase}_${pathSuffix++}`;
+    }
+    usedPathNames.add(pathName);
+
+    // filter 三态：未设置→默认正则；显式空串→不写；有值→写
+    const rawFilter = typeof item.providerFilter === "string" ? item.providerFilter.trim() : undefined;
+    const filter = rawFilter === undefined ? DEFAULT_PROXY_PROVIDER_FILTER : rawFilter;
+
+    providers[key] = {
       type: "http",
       url,
-      interval: 3600,
-      path: `./proxy_providers/${name}.yaml`,
+      interval: 43200,
+      path: `./proxy_providers/${pathName}.yaml`,
+      ...(filter ? { filter } : {}),
       "health-check": {
         enable: true,
         url: opts.testUrl,
-        interval: opts.testInterval,
+        interval: 300,
+        timeout: 5000,
+        lazy: true,
       },
     };
+
+    const mode = normalizeAttachmentMode(item.providerMode);
+    if (mode === "grouped") {
+      const rawGroupName = typeof item.providerGroupName === "string" ? item.providerGroupName.trim() : "";
+      attachments.push({
+        key,
+        mode,
+        groupName: rawGroupName || `${DEFAULT_PROVIDER_GROUP_EMOJI} ${key}`,
+      });
+    } else {
+      attachments.push({ key, mode });
+    }
   }
 
-  return Object.keys(out).length > 0 ? out : undefined;
+  if (Object.keys(providers).length === 0) return undefined;
+  return { providers, attachments };
 }
 
+export function buildProxyProviderPlanFromConfig(
+  config: Record<string, unknown>,
+  opts: { testUrl: string; testInterval: number }
+): ProxyProviderPlan | undefined {
+  const rawSources = Array.isArray(config.sources) ? config.sources : [];
+  return buildProxyProviderPlanFromSources(rawSources, opts);
+}
+
+export function buildProxyProvidersFromConfig(
+  config: Record<string, unknown>,
+  opts: { testUrl: string; testInterval: number }
+): Record<string, unknown> | undefined {
+  return buildProxyProviderPlanFromConfig(config, opts)?.providers;
+}
diff --git a/packages/core/src/subscription/subscription-utils.test.ts b/packages/core/src/subscription/subscription-utils.test.ts
index 56a42c0..9c9c1cd 100644
--- a/packages/core/src/subscription/subscription-utils.test.ts
+++ b/packages/core/src/subscription/subscription-utils.test.ts
@@ -213,12 +213,14 @@ describe("subscription URL and config helpers", () => {
         url_main_source: {
           type: "http",
           url: "https://sub.example.com/list?token=abc",
-          interval: 3600,
+          interval: 43200,
           path: "./proxy_providers/url_main_source.yaml",
           "health-check": {
             enable: true,
             url: "https://probe.example.com/204",
-            interval: 120,
+            interval: 300,
+            timeout: 5000,
+            lazy: true,
           },
         },
       },
diff --git a/packages/core/src/types/config.ts b/packages/core/src/types/config.ts
index 49babde..3ff0533 100644
--- a/packages/core/src/types/config.ts
+++ b/packages/core/src/types/config.ts
@@ -95,6 +95,17 @@ export interface ListenerConfig {
   [key: string]: unknown;
 }
 
+/**
+ * 分组监听绑定：给一个"已存在的策略组"开本地 inbound 监听端口。
+ * 生成时映射为 listeners 条目：{ name: 自动, type: mixed, listen: 0.0.0.0, port, proxy: target, udp: true }。
+ */
+export interface GroupListenerBinding {
+  id: string;
+  // 绑定的策略组名（写入 listener 的 proxy 字段）
+  target: string;
+  port: number;
+}
+
 export interface SnifferConfig {
   enable?: boolean;
   "parse-pure-ip"?: boolean;
@@ -220,6 +231,11 @@ export type ProxyGroupMemberRef =
   | { kind: "node"; name: string }
   | { kind: "module"; id: string }
   | { kind: "custom"; id: string }
+  // provider 成员（存 provider key，稳定标识）：
+  // provider-inline → 本组 use: [key]（把该订阅节点内联进本组）
+  // provider-group  → 本组 proxies 追加该 provider 的机场组名（引用已生成的机场组）
+  | { kind: "provider-inline"; key: string }
+  | { kind: "provider-group"; key: string }
   | { kind: "direct" }
   | { kind: "reject" };
 
diff --git a/packages/server-core/src/subscription/refresh-node-snapshot.test.ts b/packages/server-core/src/subscription/refresh-node-snapshot.test.ts
index dd71235..3a39205 100644
--- a/packages/server-core/src/subscription/refresh-node-snapshot.test.ts
+++ b/packages/server-core/src/subscription/refresh-node-snapshot.test.ts
@@ -572,4 +572,39 @@ describe("refreshNodeSnapshot", () => {
       }),
     ]);
   });
+
+  it("keeps provider settings on saved sources after refresh", async () => {
+    const result = await refreshNodeSnapshot({
+      config: {
+        sources: [
+          {
+            id: "provider",
+            type: "url",
+            content: "https://provider.example.com/sub",
+            useProxyProviders: true,
+            providerKey: "my_key",
+            providerMode: "grouped",
+            providerGroupName: "✈️ 机场A",
+            providerFilter: "",
+          },
+        ],
+      },
+      urls: [],
+      storedNodes: [],
+      fetchUrlNodes: vi.fn(),
+    });
+
+    expect(result.savedSources).toEqual([
+      {
+        id: "provider",
+        type: "url",
+        content: "https://provider.example.com/sub",
+        useProxyProviders: true,
+        providerKey: "my_key",
+        providerMode: "grouped",
+        providerGroupName: "✈️ 机场A",
+        providerFilter: "",
+      },
+    ]);
+  });
 });
diff --git a/packages/server-core/src/subscription/saved-sources.test.ts b/packages/server-core/src/subscription/saved-sources.test.ts
index d03da96..ec718af 100644
--- a/packages/server-core/src/subscription/saved-sources.test.ts
+++ b/packages/server-core/src/subscription/saved-sources.test.ts
@@ -138,4 +138,116 @@ describe("normalizeSavedSourcesForPersistence", () => {
       },
     ]);
   });
+
+  it("preserves provider settings on url sources", () => {
+    expect(
+      normalizeSavedSourcesForPersistence([
+        {
+          id: "src-1",
+          type: "url",
+          content: "https://example.com/sub",
+          useProxyProviders: true,
+          providerKey: " my_key ",
+          providerMode: "grouped",
+          providerGroupName: " ✈️ 机场A ",
+          providerFilter: "(?i)^(?!.*到期).*",
+        },
+      ])
+    ).toEqual([
+      {
+        id: "src-1",
+        type: "url",
+        content: "https://example.com/sub",
+        useProxyProviders: true,
+        providerKey: "my_key",
+        providerMode: "grouped",
+        providerGroupName: "✈️ 机场A",
+        providerFilter: "(?i)^(?!.*到期).*",
+      },
+    ]);
+  });
+
+  it("keeps empty-string providerFilter (explicit no-filter) but drops empty providerKey/providerGroupName", () => {
+    expect(
+      normalizeSavedSourcesForPersistence([
+        {
+          id: "src-1",
+          type: "url",
+          content: "https://example.com/sub",
+          useProxyProviders: true,
+          providerKey: "   ",
+          providerMode: "bare",
+          providerGroupName: "",
+          providerFilter: "",
+        },
+      ])
+    ).toEqual([
+      {
+        id: "src-1",
+        type: "url",
+        content: "https://example.com/sub",
+        useProxyProviders: true,
+        providerMode: "bare",
+        providerFilter: "",
+      },
+    ]);
+  });
+
+  it("drops invalid providerMode values and provider settings on non-url sources", () => {
+    expect(
+      normalizeSavedSourcesForPersistence([
+        {
+          id: "src-1",
+          type: "url",
+          content: "https://example.com/sub",
+          providerMode: "unknown",
+          providerFilter: 42,
+        },
+        {
+          id: "src-2",
+          type: "yaml",
+          content: "proxies: []",
+          providerKey: "my_key",
+          providerMode: "grouped",
+          providerGroupName: "✈️ 机场A",
+          providerFilter: "",
+        },
+      ])
+    ).toEqual([
+      {
+        id: "src-1",
+        type: "url",
+        content: "https://example.com/sub",
+      },
+      {
+        id: "src-2",
+        type: "yaml",
+        content: "proxies: []",
+      },
+    ]);
+  });
+
+  it("preserves provider settings even when useProxyProviders is off", () => {
+    expect(
+      normalizeSavedSourcesForPersistence([
+        {
+          id: "src-1",
+          type: "url",
+          content: "https://example.com/sub",
+          providerKey: "my_key",
+          providerMode: "grouped",
+          providerGroupName: "✈️ 机场A",
+        },
+      ])
+    ).toEqual([
+      {
+        id: "src-1",
+        type: "url",
+        content: "https://example.com/sub",
+        providerKey: "my_key",
+        providerMode: "grouped",
+        providerGroupName: "✈️ 机场A",
+      },
+    ]);
+  });
 });
diff --git a/packages/server-core/src/subscription/saved-sources.ts b/packages/server-core/src/subscription/saved-sources.ts
index 4c29add..55a9387 100644
--- a/packages/server-core/src/subscription/saved-sources.ts
+++ b/packages/server-core/src/subscription/saved-sources.ts
@@ -12,6 +12,10 @@ export type SavedSource = {
   type: SavedSourceType;
   content: string;
   useProxyProviders?: boolean;
+  providerKey?: string;
+  providerMode?: "grouped" | "inline" | "bare";
+  providerGroupName?: string;
+  providerFilter?: string;
   userinfoUrl?: string;
   userinfoUserAgent?: string;
   subscriptionUserInfo?: SubscriptionUserInfo;
@@ -85,12 +89,24 @@ export function normalizeSavedSourcesForPersistence(
     const lastParsedContent = toTrimmedString(record.lastParsedContent);
     const lastParsedTag = toTrimmedString(record.lastParsedTag);
     const lastParsedNameTemplate = toTrimmedString(record.lastParsedNameTemplate);
+    const providerKey = toTrimmedString(record.providerKey);
+    const providerMode =
+      record.providerMode === "grouped" || record.providerMode === "inline" || record.providerMode === "bare"
+        ? record.providerMode
+        : undefined;
+    const providerGroupName = toTrimmedString(record.providerGroupName);
+    // providerFilter 保留空串（空串=显式不过滤，与"未设置走默认正则"区分），不能 trim
+    const providerFilter = typeof record.providerFilter === "string" ? record.providerFilter : undefined;
 
     return {
       id: nextId(preferredId),
       type,
       content: type === "url" ? normalizeUrlContent(content) : content,
       ...(type === "url" && record.useProxyProviders === true ? { useProxyProviders: true } : {}),
+      ...(type === "url" && providerKey ? { providerKey } : {}),
+      ...(type === "url" && providerMode ? { providerMode } : {}),
+      ...(type === "url" && providerGroupName ? { providerGroupName } : {}),
+      ...(type === "url" && providerFilter !== undefined ? { providerFilter } : {}),
       ...(type === "url" && userinfoUrl ? { userinfoUrl: normalizeUrlContent(userinfoUrl) } : {}),
       ...(type === "url" && userinfoUserAgent ? { userinfoUserAgent } : {}),
       ...(subscriptionUserInfo ? { subscriptionUserInfo } : {}),
diff --git a/packages/ui/src/product/converter/advanced-mode/sections/dialer-proxy-groups-section.test.ts b/packages/ui/src/product/converter/advanced-mode/sections/dialer-proxy-groups-section.test.ts
index fadddcf..9dd6d13 100644
--- a/packages/ui/src/product/converter/advanced-mode/sections/dialer-proxy-groups-section.test.ts
+++ b/packages/ui/src/product/converter/advanced-mode/sections/dialer-proxy-groups-section.test.ts
@@ -108,6 +108,10 @@ vi.mock("@subboost/ui/components/ui/switch", () => ({
   },
 }));
 vi.mock("@subboost/ui/components/ui/toaster", () => ({ toast: mocks.toast }));
+vi.mock("./proxy-groups-group-listeners", () => ({
+  GroupListenerPortBadge: () => null,
+  ProxyGroupsGroupListeners: () => null,
+}));
 vi.mock("@subboost/core/generator/proxy-groups", () => ({
   PROXY_GROUP_MODULES: [
     { id: "auto", name: "Auto" },
diff --git a/packages/ui/src/product/converter/advanced-mode/sections/dialer-proxy-groups-section.tsx b/packages/ui/src/product/converter/advanced-mode/sections/dialer-proxy-groups-section.tsx
index 1e74f58..1ca3d4f 100644
--- a/packages/ui/src/product/converter/advanced-mode/sections/dialer-proxy-groups-section.tsx
+++ b/packages/ui/src/product/converter/advanced-mode/sections/dialer-proxy-groups-section.tsx
@@ -21,6 +21,7 @@ import {
   type ProxyGroupNameDraft,
 } from "./proxy-group-name-editor";
 import { ProxyGroupSummary } from "./proxy-group-summary";
+import { GroupListenerPortBadge } from "./proxy-groups-group-listeners";
 import {
   getLoadBalanceStrategyLabel,
   getProxyGroupTypeLabel,
@@ -263,6 +264,7 @@ export function DialerProxyGroupsSection({
                     <span className="text-sm font-medium text-white truncate" title={group.name}>
                       {group.name}
                     </span>
+                    <GroupListenerPortBadge name={group.name} />
                     <Button
                       variant="ghost"
                       size="sm"
diff --git a/packages/ui/src/product/converter/advanced-mode/sections/input-section.test.ts b/packages/ui/src/product/converter/advanced-mode/sections/input-section.test.ts
index 8ed3683..65fe071 100644
--- a/packages/ui/src/product/converter/advanced-mode/sections/input-section.test.ts
+++ b/packages/ui/src/product/converter/advanced-mode/sections/input-section.test.ts
@@ -163,6 +163,12 @@ vi.mock("@subboost/ui/product/converter/subscription-import-error", () => ({
     return null;
   },
 }));
+vi.mock("@subboost/ui/product/converter/provider-mode-status-bar", () => ({
+  ProviderModeStatusBar: (props: any) => {
+    mocks.captures.statusBars.push(props);
+    return null;
+  },
+}));
 vi.mock("./input-source-editor-dialog", () => ({
   InputSourceEditorDialog: (props: any) => {
     mocks.captures.editor = props;
@@ -204,6 +210,7 @@ function renderSection(overrides: Record<number, unknown> = {}, props = { isExpa
   mocks.captures.inputs = [];
   mocks.captures.rawButtons = [];
   mocks.captures.textareas = [];
+  mocks.captures.statusBars = [];
   try {
     const html = renderToStaticMarkup(React.createElement(InputSection, props));
     return { html, setters: stateMock.setters };
@@ -222,7 +229,7 @@ describe("advanced mode InputSection", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     stateMock.runEffects = false;
-    mocks.captures = { buttons: [], inputs: [], textareas: [] };
+    mocks.captures = { buttons: [], inputs: [], textareas: [], statusBars: [] };
     mocks.userInfoDisplay = { traffic: "1 GB", expire: "2026-01-01" };
     mocks.markSourceAsPendingImport.mockImplementation((source) => ({ ...source, pendingImport: true }));
     mocks.moveSubscriptionSource.mockImplementation((sources) => sources.slice().reverse());
@@ -250,7 +257,13 @@ describe("advanced mode InputSection", () => {
         previewName: "[{tag}] {name}:HK:节点名称",
       })
     );
-    expect(mocks.captures.inputs.some((props: any) => props.value === "https://example.com/sub")).toBe(true);
+    expect(mocks.captures.textareas.some((props: any) => props.value === "https://example.com/sub")).toBe(true);
+    expect(mocks.captures.statusBars).toEqual([
+      expect.objectContaining({
+        source: expect.objectContaining({ id: "s1", useProxyProviders: false }),
+        defaultProviderKey: "url_s1",
+      }),
+    ]);
     expect(mocks.captures.textareas.some((props: any) => props.value === "ss://node")).toBe(true);
     expect(mocks.captures.buttons.at(-1)).toEqual(expect.objectContaining({ variant: "outline", size: "sm" }));
   });
@@ -258,11 +271,23 @@ describe("advanced mode InputSection", () => {
   it("updates source content and metadata through captured fields", () => {
     renderSection({ 1: "s1" });
 
-    const mainUrlInput = mocks.captures.inputs.find((props: any) => props.placeholder === "https://example.com/sub");
-    mainUrlInput.onChange({ target: { value: "https://new.example/sub" } });
+    const mainUrlEditor = mocks.captures.textareas.find((props: any) => props.placeholder === "https://example.com/sub");
+    mainUrlEditor.onChange({ target: { value: "https://new.example/sub\n" } });
     expect(mocks.store.setSources).toHaveBeenCalledWith(expect.any(Array));
     expect(mocks.markSourceAsPendingImport).toHaveBeenCalledWith(expect.objectContaining({ content: "https://new.example/sub" }));
 
+    const enterEvent = { key: "Enter", preventDefault: vi.fn() };
+    mainUrlEditor.onKeyDown(enterEvent);
+    expect(enterEvent.preventDefault).toHaveBeenCalled();
+
+    mocks.captures.statusBars[0].onCheckedChange(true);
+    expect(mocks.markSourceAsPendingImport).toHaveBeenCalledWith(
+      expect.objectContaining({ useProxyProviders: true, providerMode: "grouped" })
+    );
+
+    mocks.captures.statusBars[0].onUpdateMeta("s1", { providerKey: "my_airport" });
+    expect(mocks.store.setSources).toHaveBeenCalledWith(expect.any(Array));
+
     const textArea = mocks.captures.textareas.find((props: any) => props.value === "ss://node");
     textArea.onChange({ target: { value: "trojan://node" } });
     expect(mocks.markSourceAsPendingImport).toHaveBeenCalledWith(expect.objectContaining({ content: "trojan://node" }));
diff --git a/packages/ui/src/product/converter/advanced-mode/sections/input-section.tsx b/packages/ui/src/product/converter/advanced-mode/sections/input-section.tsx
index e769332..b4df4f8 100644
--- a/packages/ui/src/product/converter/advanced-mode/sections/input-section.tsx
+++ b/packages/ui/src/product/converter/advanced-mode/sections/input-section.tsx
@@ -4,7 +4,6 @@ import * as Popover from "@radix-ui/react-popover";
 import { AlertCircle, Check, HelpCircle, Loader2, Maximize2, Plus, Server, X, Menu, ChevronUp, ChevronDown } from "lucide-react";
 import { Badge } from "@subboost/ui/components/ui/badge";
 import { Button } from "@subboost/ui/components/ui/button";
-import { Input } from "@subboost/ui/components/ui/input";
 import { Textarea } from "@subboost/ui/components/ui/textarea";
 import { cn } from "@subboost/ui/lib/utils";
 import type { SourceType } from "@subboost/ui/store/config-store";
@@ -14,6 +13,7 @@ import { useSubscriptionSourcesController } from "@subboost/ui/product/converter
 import { sourceTypeInfo } from "../constants";
 import { SectionHeader } from "../section-header";
 import { SubscriptionImportErrorBadge } from "@subboost/ui/product/converter/subscription-import-error";
+import { ProviderModeStatusBar } from "@subboost/ui/product/converter/provider-mode-status-bar";
 import { InputSourceEditorDialog } from "./input-source-editor-dialog";
 
 export function InputSection({
@@ -206,12 +206,31 @@ export function InputSection({
                   </div>
                 </div>
                 {source.type === "url" ? (
-                  <Input
-                    value={source.content}
-                    onChange={(e) => updateSource(source.id, e.target.value)}
-                    placeholder={typeInfo.placeholder}
-                    className="text-xs h-8"
-                  />
+                  <div className="flex flex-col overflow-hidden rounded-xl border border-white/10 bg-white/5 transition-all duration-200 focus-within:border-indigo-500 focus-within:ring-2 focus-within:ring-indigo-500/50">
+                    <Textarea
+                      rows={1}
+                      wrap="off"
+                      value={source.content}
+                      onChange={(e) => updateSource(source.id, e.target.value.replace(/[\r\n]+/g, ""))}
+                      onKeyDown={(e) => {
+                        if (e.key === "Enter") e.preventDefault();
+                      }}
+                      placeholder={typeInfo.placeholder}
+                      className="block h-8 min-h-0 w-full resize-none overflow-x-auto rounded-none border-0 bg-transparent px-4 py-0 text-xs leading-8 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden focus:ring-0"
+                    />
+                    <ProviderModeStatusBar
+                      source={source}
+                      defaultProviderKey={`url_${source.id}`}
+                      onCheckedChange={(checked) =>
+                        updateSourceMeta(source.id, {
+                          useProxyProviders: checked,
+                          // UI 新开启时默认分组模式；旧数据（已保存无此字段）保持 inline 兼容
+                          ...(checked && !source.providerMode ? { providerMode: "grouped" as const } : {}),
+                        })
+                      }
+                      onUpdateMeta={updateSourceMeta}
+                    />
+                  </div>
                 ) : (
                   <Textarea
                     value={source.content}
diff --git a/packages/ui/src/product/converter/advanced-mode/sections/input-source-editor-dialog.test.ts b/packages/ui/src/product/converter/advanced-mode/sections/input-source-editor-dialog.test.ts
index 534b03c..9043c7f 100644
--- a/packages/ui/src/product/converter/advanced-mode/sections/input-source-editor-dialog.test.ts
+++ b/packages/ui/src/product/converter/advanced-mode/sections/input-source-editor-dialog.test.ts
@@ -6,6 +6,7 @@ const mocks = vi.hoisted(() => ({
   buttons: [] as any[],
   dialogs: [] as any[],
   inputs: [] as any[],
+  providerSettings: [] as any[],
   switches: [] as any[],
   textareas: [] as any[],
 }));
@@ -18,6 +19,8 @@ vi.mock("@radix-ui/react-popover", () => ({
   Trigger: (props: any) => React.createElement("div", null, props.children),
 }));
 vi.mock("lucide-react", () => ({
+  ChevronDown: () => React.createElement("span", null, "chevron-down"),
+  ChevronRight: () => React.createElement("span", null, "chevron-right"),
   HelpCircle: () => React.createElement("span", null, "help-icon"),
 }));
 vi.mock("@subboost/ui/components/ui/button", () => ({
@@ -56,6 +59,12 @@ vi.mock("@subboost/ui/components/ui/textarea", () => ({
 vi.mock("@subboost/core/node-name-template", () => ({
   DEFAULT_NODE_NAME_TEMPLATE: "{tag}-{name}",
 }));
+vi.mock("@subboost/ui/product/converter/provider-settings-fields", () => ({
+  ProviderSettingsFields: (props: any) => {
+    mocks.providerSettings.push(props);
+    return React.createElement("div", null, "provider-settings-fields");
+  },
+}));
 vi.mock("../constants", () => ({
   sourceTypeInfo: {
     url: { label: "订阅链接", placeholder: "https://example.com/sub" },
@@ -81,6 +90,7 @@ function renderDialog(props: Partial<React.ComponentProps<typeof InputSourceEdit
   mocks.buttons = [];
   mocks.dialogs = [];
   mocks.inputs = [];
+  mocks.providerSettings = [];
   mocks.switches = [];
   mocks.textareas = [];
   const handlers = {
@@ -120,21 +130,28 @@ describe("InputSourceEditorDialog", () => {
     expect(html).toContain("proxy-providers模式");
     expect(html).toContain("proxy-providers 模式");
     expect(html).toContain("subscription-userinfo");
-
-    mocks.inputs[0].onChange({ target: { value: "B" } });
-    mocks.inputs[1].onChange({ target: { value: "{name}" } });
-    expect(mocks.inputs[2]).toEqual(expect.objectContaining({ value: "A-Node", readOnly: true }));
-    mocks.inputs[3].onChange({ target: { value: "https://next.example/sub" } });
+    // url 输入行在标签（tag）行之前（红蓝换位后的顺序）
+    expect(html.indexOf("https://example.com/sub")).toBeGreaterThan(-1);
+    expect(html.indexOf("https://example.com/sub")).toBeLessThan(html.indexOf("标签（tag）"));
+
+    mocks.inputs[0].onChange({ target: { value: "https://next.example/sub" } });
+    mocks.inputs[1].onChange({ target: { value: "B" } });
+    mocks.inputs[2].onChange({ target: { value: "{name}" } });
+    expect(mocks.inputs[3]).toEqual(expect.objectContaining({ value: "A-Node", readOnly: true }));
     mocks.inputs[4].onChange({ target: { value: "https://next.example/userinfo" } });
     mocks.inputs[5].onChange({ target: { value: "Meta" } });
     mocks.switches[0].onCheckedChange(true);
 
+    expect(handlers.onUpdateContent).toHaveBeenCalledWith("source-url", "https://next.example/sub");
     expect(handlers.onUpdateMeta).toHaveBeenCalledWith("source-url", { tag: "B" });
     expect(handlers.onUpdateMeta).toHaveBeenCalledWith("source-url", { nameTemplate: "{name}" });
-    expect(handlers.onUpdateContent).toHaveBeenCalledWith("source-url", "https://next.example/sub");
     expect(handlers.onUpdateMeta).toHaveBeenCalledWith("source-url", { userinfoUrl: "https://next.example/userinfo" });
     expect(handlers.onUpdateMeta).toHaveBeenCalledWith("source-url", { userinfoUserAgent: "Meta" });
-    expect(handlers.onUpdateMeta).toHaveBeenCalledWith("source-url", { useProxyProviders: true });
+    // 开启开关时（旧数据无 providerMode）默认写入分组模式
+    expect(handlers.onUpdateMeta).toHaveBeenCalledWith("source-url", {
+      useProxyProviders: true,
+      providerMode: "grouped",
+    });
   });
 
   it("edits yaml and node text sources with a textarea", () => {
diff --git a/packages/ui/src/product/converter/advanced-mode/sections/input-source-editor-dialog.tsx b/packages/ui/src/product/converter/advanced-mode/sections/input-source-editor-dialog.tsx
index 9903d9d..ca59169 100644
--- a/packages/ui/src/product/converter/advanced-mode/sections/input-source-editor-dialog.tsx
+++ b/packages/ui/src/product/converter/advanced-mode/sections/input-source-editor-dialog.tsx
@@ -1,7 +1,8 @@
 "use client";
 
+import * as React from "react";
 import * as Popover from "@radix-ui/react-popover";
-import { HelpCircle } from "lucide-react";
+import { ChevronDown, ChevronRight, HelpCircle } from "lucide-react";
 import { Button } from "@subboost/ui/components/ui/button";
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@subboost/ui/components/ui/dialog";
 import { Input } from "@subboost/ui/components/ui/input";
@@ -9,6 +10,7 @@ import { Switch } from "@subboost/ui/components/ui/switch";
 import { Textarea } from "@subboost/ui/components/ui/textarea";
 import { DEFAULT_NODE_NAME_TEMPLATE } from "@subboost/core/node-name-template";
 import type { SubscriptionSource } from "@subboost/ui/store/config-store";
+import { ProviderSettingsFields } from "@subboost/ui/product/converter/provider-settings-fields";
 import { sourceTypeInfo } from "../constants";
 
 type InputSourceEditorDialogProps = {
@@ -26,6 +28,7 @@ export function InputSourceEditorDialog({
   onUpdateContent,
   onUpdateMeta,
 }: InputSourceEditorDialogProps) {
+  const [providerSettingsOpen, setProviderSettingsOpen] = React.useState(false);
   return (
     <Dialog
       open={Boolean(source)}
@@ -42,6 +45,108 @@ export function InputSourceEditorDialog({
 
         {source && (
           <div className="space-y-3">
+            {source.type === "url" && (
+              <div className="space-y-1">
+                <div className="text-xs text-white/60">{sourceTypeInfo[source.type].label}</div>
+                <div className="flex items-center gap-3">
+                  <Input
+                    value={source.content}
+                    onChange={(e) => onUpdateContent(source.id, e.target.value)}
+                    placeholder={sourceTypeInfo[source.type].placeholder}
+                    className="text-xs min-w-0 flex-1"
+                  />
+
+                  <div className="flex h-10 flex-none items-center gap-2 rounded-xl border border-white/10 bg-white/5 px-3">
+                    <div className="text-xs text-white/70 whitespace-nowrap">proxy-providers模式</div>
+                    <Popover.Root>
+                      <Popover.Trigger asChild>
+                        <button
+                          type="button"
+                          className="inline-flex h-6 w-6 flex-none items-center justify-center rounded-full border border-white/10 bg-white/5 text-white/40 transition-colors hover:bg-white/10 hover:text-white/80 focus:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500/50 focus-visible:ring-offset-2 focus-visible:ring-offset-black"
+                          aria-label="proxy-providers 模式说明"
+                          title="proxy-providers 模式说明"
+                        >
+                          <HelpCircle className="h-3.5 w-3.5" />
+                        </button>
+                      </Popover.Trigger>
+                      <Popover.Portal>
+                        <Popover.Content
+                          side="bottom"
+                          align="end"
+                          sideOffset={8}
+                          className="z-50 w-[360px] rounded-xl border border-white/10 bg-black/90 backdrop-blur-md shadow-2xl p-3"
+                        >
+                          <div className="space-y-2 text-xs">
+                            <div className="flex items-center gap-2">
+                              <HelpCircle className="h-4 w-4 text-amber-300" />
+                              <div className="text-white font-medium">proxy-providers 模式</div>
+                            </div>
+                            <div className="text-white/60 leading-relaxed">
+                              部分订阅限制 CN IP 导入，url 无法在 SubBoost 内拉取解析。开启后 SubBoost
+                              不再拉取/解析该 url，而是在最终配置中写入{" "}
+                              <span className="font-mono">proxy-providers</span>，交由客户端自行拉取节点。
+                            </div>
+                            <div className="pt-2 border-t border-white/10 text-white/60 space-y-1">
+                              <div className="font-medium text-white/80">注意开启后：</div>
+                              <ul className="ml-4 list-disc space-y-1">
+                                <li>无法在预览中查看/管理该 url 的节点</li>
+                                <li>无法将这些节点用于中转代理组、分流组高级模式等高级功能</li>
+                                <li>节点命名模板与 tag 在该模式下不生效</li>
+                              </ul>
+                            </div>
+                            <div className="pt-2 border-t border-white/10 text-[10px] text-white/40">
+                              若导入 url 报“未解析到有效节点/获取失败”等，可尝试开启此模式。
+                            </div>
+                          </div>
+                          <Popover.Arrow className="fill-white/10" />
+                        </Popover.Content>
+                      </Popover.Portal>
+                    </Popover.Root>
+                    <Switch
+                      checked={Boolean(source.useProxyProviders)}
+                      onCheckedChange={(checked) =>
+                        onUpdateMeta(source.id, {
+                          useProxyProviders: Boolean(checked),
+                          // UI 新开启时默认分组模式；旧数据（已保存无此字段）保持 inline 兼容
+                          ...(checked && !source.providerMode ? { providerMode: "grouped" as const } : {}),
+                        })
+                      }
+                    />
+                  </div>
+                </div>
+
+                {/* provider 设置：可折叠分组，开启 proxy-providers 模式后可用 */}
+                <div>
+                  <button
+                    type="button"
+                    onClick={() => setProviderSettingsOpen((open) => !open)}
+                    disabled={!source.useProxyProviders}
+                    className="flex items-center gap-2 py-1 px-2 rounded-lg text-white/70 transition-colors hover:bg-white/5 hover:text-white disabled:cursor-not-allowed disabled:opacity-40 disabled:hover:bg-transparent"
+                  >
+                    {providerSettingsOpen && source.useProxyProviders ? (
+                      <ChevronDown className="h-3.5 w-3.5 text-white/50" />
+                    ) : (
+                      <ChevronRight className="h-3.5 w-3.5 text-white/50" />
+                    )}
+                    <span className="text-xs font-medium">provider 设置</span>
+                    {!source.useProxyProviders && (
+                      <span className="text-[10px] text-white/40">开启 proxy-providers 模式后可用</span>
+                    )}
+                  </button>
+                  {providerSettingsOpen && source.useProxyProviders && (
+                    <div className="mt-1 pl-6">
+                      <ProviderSettingsFields
+                        source={source}
+                        defaultProviderKey={`url_${source.id}`}
+                        onUpdateMeta={onUpdateMeta}
+                        showFilter
+                      />
+                    </div>
+                  )}
+                </div>
+              </div>
+            )}
+
             <div className="grid gap-3 sm:grid-cols-3">
               <div className="space-y-1">
                 <div className="text-xs text-white/60">标签（tag）</div>
@@ -70,108 +175,45 @@ export function InputSourceEditorDialog({
               可用占位符：{"{tag}"}、{"{name}"}；留空则默认：{DEFAULT_NODE_NAME_TEMPLATE}
             </div>
 
-            <div className="space-y-1">
-              <div className="text-xs text-white/60">{sourceTypeInfo[source.type].label}</div>
-              {source.type === "url" ? (
-                <div className="space-y-3">
-                  <div className="flex items-center gap-3">
+            {source.type === "url" ? (
+              <div className="space-y-3">
+                <div className="grid gap-3 sm:grid-cols-2">
+                  <div className="space-y-1">
+                    <div className="text-xs text-white/60">流量/到期信息 URL（可选）</div>
                     <Input
-                      value={source.content}
-                      onChange={(e) => onUpdateContent(source.id, e.target.value)}
-                      placeholder={sourceTypeInfo[source.type].placeholder}
-                      className="text-xs min-w-0 flex-1"
+                      value={source.userinfoUrl ?? ""}
+                      onChange={(e) => onUpdateMeta(source.id, { userinfoUrl: e.target.value })}
+                      placeholder="留空则默认使用当前订阅源 URL"
+                      className="text-xs"
                     />
-
-                    <div className="flex h-10 flex-none items-center gap-2 rounded-xl border border-white/10 bg-white/5 px-3">
-                      <div className="text-xs text-white/70 whitespace-nowrap">proxy-providers模式</div>
-                      <Popover.Root>
-                        <Popover.Trigger asChild>
-                          <button
-                            type="button"
-                            className="inline-flex h-6 w-6 flex-none items-center justify-center rounded-full border border-white/10 bg-white/5 text-white/40 transition-colors hover:bg-white/10 hover:text-white/80 focus:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500/50 focus-visible:ring-offset-2 focus-visible:ring-offset-black"
-                            aria-label="proxy-providers 模式说明"
-                            title="proxy-providers 模式说明"
-                          >
-                            <HelpCircle className="h-3.5 w-3.5" />
-                          </button>
-                        </Popover.Trigger>
-                        <Popover.Portal>
-                          <Popover.Content
-                            side="bottom"
-                            align="end"
-                            sideOffset={8}
-                            className="z-50 w-[360px] rounded-xl border border-white/10 bg-black/90 backdrop-blur-md shadow-2xl p-3"
-                          >
-                            <div className="space-y-2 text-xs">
-                              <div className="flex items-center gap-2">
-                                <HelpCircle className="h-4 w-4 text-amber-300" />
-                                <div className="text-white font-medium">proxy-providers 模式</div>
-                              </div>
-                              <div className="text-white/60 leading-relaxed">
-                                部分订阅限制 CN IP 导入，url 无法在 SubBoost 内拉取解析。开启后 SubBoost
-                                不再拉取/解析该 url，而是在最终配置中写入{" "}
-                                <span className="font-mono">proxy-providers</span>，交由客户端自行拉取节点。
-                              </div>
-                              <div className="pt-2 border-t border-white/10 text-white/60 space-y-1">
-                                <div className="font-medium text-white/80">注意开启后：</div>
-                                <ul className="ml-4 list-disc space-y-1">
-                                  <li>无法在预览中查看/管理该 url 的节点</li>
-                                  <li>无法将这些节点用于中转代理组、分流组高级模式等高级功能</li>
-                                  <li>节点命名模板与 tag 在该模式下不生效</li>
-                                </ul>
-                              </div>
-                              <div className="pt-2 border-t border-white/10 text-[10px] text-white/40">
-                                若导入 url 报“未解析到有效节点/获取失败”等，可尝试开启此模式。
-                              </div>
-                            </div>
-                            <Popover.Arrow className="fill-white/10" />
-                          </Popover.Content>
-                        </Popover.Portal>
-                      </Popover.Root>
-                      <Switch
-                        checked={Boolean(source.useProxyProviders)}
-                        onCheckedChange={(checked) =>
-                          onUpdateMeta(source.id, { useProxyProviders: Boolean(checked) })
-                        }
-                      />
-                    </div>
                   </div>
-
-                  <div className="grid gap-3 sm:grid-cols-2">
-                    <div className="space-y-1">
-                      <div className="text-xs text-white/60">流量/到期信息 URL（可选）</div>
-                      <Input
-                        value={source.userinfoUrl ?? ""}
-                        onChange={(e) => onUpdateMeta(source.id, { userinfoUrl: e.target.value })}
-                        placeholder="留空则默认使用当前订阅源 URL"
-                        className="text-xs"
-                      />
-                    </div>
-                    <div className="space-y-1">
-                      <div className="text-xs text-white/60">流量信息 User-Agent（可选）</div>
-                      <Input
-                        value={source.userinfoUserAgent ?? ""}
-                        onChange={(e) => onUpdateMeta(source.id, { userinfoUserAgent: e.target.value })}
-                        placeholder="例如 clash.meta/v1.19.16"
-                        className="text-xs"
-                      />
-                    </div>
+                  <div className="space-y-1">
+                    <div className="text-xs text-white/60">流量信息 User-Agent（可选）</div>
+                    <Input
+                      value={source.userinfoUserAgent ?? ""}
+                      onChange={(e) => onUpdateMeta(source.id, { userinfoUserAgent: e.target.value })}
+                      placeholder="例如 clash.meta/v1.19.16"
+                      className="text-xs"
+                    />
                   </div>
+                </div>
 
-                  <div className="text-[11px] text-white/40">
-                    有些订阅源不会直接返回 <span className="font-mono">subscription-userinfo</span>，但会提供独立的流量接口。
-                    设置后，SubBoost 会在导入/刷新时额外抓取该接口，用来更新这个源自己的流量与到期快照。
-                  </div>
+                <div className="text-[11px] text-white/40">
+                  有些订阅源不会直接返回 <span className="font-mono">subscription-userinfo</span>，但会提供独立的流量接口。
+                  设置后，SubBoost 会在导入/刷新时额外抓取该接口，用来更新这个源自己的流量与到期快照。
                 </div>
-              ) : (
+              </div>
+            ) : (
+              <div className="space-y-1">
+                <div className="text-xs text-white/60">{sourceTypeInfo[source.type].label}</div>
                 <Textarea
                   value={source.content}
                   onChange={(e) => onUpdateContent(source.id, e.target.value)}
                   placeholder={sourceTypeInfo[source.type].placeholder}
                   className="min-h-[60vh] text-xs font-mono"
                 />
-              )}
-            </div>
+              </div>
+            )}
           </div>
         )}
 
diff --git a/packages/ui/src/product/converter/advanced-mode/sections/provider-group-plan.ts b/packages/ui/src/product/converter/advanced-mode/sections/provider-group-plan.ts
new file mode 100644
index 0000000..18b6be4
--- /dev/null
+++ b/packages/ui/src/product/converter/advanced-mode/sections/provider-group-plan.ts
@@ -0,0 +1,65 @@
+import {
+  PROXY_GROUP_MODULES,
+  buildProviderProxyGroups,
+} from "@subboost/core/generator/proxy-groups";
+import { resolveProxyGroupModuleName } from "@subboost/core/proxy-group-name";
+import { buildProxyProviderPlanFromSources } from "@subboost/core/subscription/proxy-providers";
+import type { CustomProxyGroup } from "@subboost/core/types/config";
+import type { ParsedNode } from "@subboost/core/types/node";
+
+export interface ProviderGroupInfo {
+  /** grouped 模式生成的机场组名（按生成顺序，已去重后缀） */
+  names: string[];
+  /** provider key → 机场组名 */
+  nameByKey: Record<string, string>;
+  /** 全部 provider key（grouped/inline/bare），供 generateProxyGroups 的 allProviderKeys */
+  keys: string[];
+}
+
+const EMPTY: ProviderGroupInfo = { names: [], nameByKey: {}, keys: [] };
+
+/**
+ * 计算 provider 分组模式的机场组信息（组名 + key↔名映射 + 全部 key）。
+ * reserved 名单与生成器 / categories 完全一致，保证组名去重后缀不分叉。
+ * 面板与 categories 共用本函数，避免各自算出不同的机场组名。
+ */
+export function buildProviderGroupInfo(
+  sources: unknown[],
+  opts: {
+    nodes: ParsedNode[];
+    proxyGroupNameOverrides?: Record<string, string>;
+    customProxyGroups?: CustomProxyGroup[];
+    dialerProxyGroups?: Array<{ name?: string } | null | undefined>;
+    testUrl: string;
+    testInterval: number;
+  },
+): ProviderGroupInfo {
+  const plan = buildProxyProviderPlanFromSources(sources, {
+    testUrl: opts.testUrl,
+    testInterval: opts.testInterval,
+  });
+  if (!plan) return EMPTY;
+
+  const reserved = [
+    "DIRECT",
+    "REJECT",
+    ...opts.nodes.map((node) => node.name),
+    ...PROXY_GROUP_MODULES.map((module) =>
+      resolveProxyGroupModuleName(module, opts.proxyGroupNameOverrides?.[module.id]),
+    ),
+    ...(opts.customProxyGroups ?? [])
+      .map((group) => (typeof group.name === "string" ? group.name.trim() : ""))
+      .filter(Boolean),
+    ...(opts.dialerProxyGroups ?? [])
+      .map((group) => (group && typeof group.name === "string" ? group.name.trim() : ""))
+      .filter(Boolean),
+  ];
+
+  const { groups, names } = buildProviderProxyGroups(plan.attachments, reserved);
+  const nameByKey: Record<string, string> = {};
+  for (const group of groups) {
+    const key = Array.isArray(group.use) ? group.use[0] : undefined;
+    if (typeof key === "string" && key) nameByKey[key] = group.name;
+  }
+  return { names, nameByKey, keys: Object.keys(plan.providers) };
+}
diff --git a/packages/ui/src/product/converter/advanced-mode/sections/provider-group-readonly-card.tsx b/packages/ui/src/product/converter/advanced-mode/sections/provider-group-readonly-card.tsx
new file mode 100644
index 0000000..6674a6c
--- /dev/null
+++ b/packages/ui/src/product/converter/advanced-mode/sections/provider-group-readonly-card.tsx
@@ -0,0 +1,36 @@
+"use client";
+
+import * as React from "react";
+import { Lock } from "lucide-react";
+import { Badge } from "@subboost/ui/components/ui/badge";
+import { GroupListenerPortBadge } from "./proxy-groups-group-listeners";
+
+/**
+ * provider 分组模式生成的机场组：核心组分类里的只读卡片。
+ * 成员恒为该 provider 的全部节点，不提供高级模式/成员编辑/删除。
+ */
+export function ProviderGroupReadonlyCard({ name }: { name: string }) {
+  return (
+    <div className="overflow-hidden rounded border border-sky-500/20 bg-sky-500/[0.06]">
+      <div className="flex min-w-0 w-full flex-wrap items-center justify-between gap-x-2 gap-y-1 px-2 py-1.5">
+        <div className="flex min-w-0 max-w-full items-center gap-2">
+          <span className="min-w-0 break-words text-sm font-medium text-white">{name}</span>
+          <Badge
+            variant="outline"
+            className="shrink-0 border-sky-500/40 bg-sky-500/10 text-[10px] text-sky-200"
+          >
+            Provider
+          </Badge>
+          <GroupListenerPortBadge name={name} />
+        </div>
+        <span
+          className="flex shrink-0 items-center gap-1 text-[10px] text-white/40"
+          title="机场组由 proxy-providers 分组模式自动生成，成员为该订阅的全部节点，不可编辑"
+        >
+          <Lock className="h-3 w-3" />
+          只读
+        </span>
+      </div>
+    </div>
+  );
+}
diff --git a/packages/ui/src/product/converter/advanced-mode/sections/proxy-group-advanced-panel-interactions.test.ts b/packages/ui/src/product/converter/advanced-mode/sections/proxy-group-advanced-panel-interactions.test.ts
index 98a8a0c..f5a0e5d 100644
--- a/packages/ui/src/product/converter/advanced-mode/sections/proxy-group-advanced-panel-interactions.test.ts
+++ b/packages/ui/src/product/converter/advanced-mode/sections/proxy-group-advanced-panel-interactions.test.ts
@@ -57,13 +57,18 @@ vi.mock("@subboost/ui/lib/utils", () => ({
   cn: (...parts: unknown[]) => parts.filter(Boolean).join(" "),
 }));
 
-vi.mock("@subboost/core/generator/proxy-groups", () => ({
-  PROXY_GROUP_MODULES: [
-    { id: "select", name: "Select" },
-    { id: "auto", name: "Auto" },
-  ],
-  generateProxyGroups: () => mocks.generatedProxyGroups,
-}));
+vi.mock("@subboost/core/generator/proxy-groups", async (importActual) => {
+  const actual = await importActual<typeof import("@subboost/core/generator/proxy-groups")>();
+  return {
+    PROXY_GROUP_MODULES: [
+      { id: "select", name: "Select" },
+      { id: "auto", name: "Auto" },
+    ],
+    generateProxyGroups: () => mocks.generatedProxyGroups,
+    // 机场组名去重用真实实现（buildProviderGroupInfo 依赖），保持组名与生成端一致
+    buildProviderProxyGroups: actual.buildProviderProxyGroups,
+  };
+});
 
 vi.mock("@subboost/core/proxy-group-name", () => ({
   resolveProxyGroupModuleName: (module: { id: string; name: string }, override?: string) => override || module.name,
@@ -144,6 +149,41 @@ describe("ProxyGroupAdvancedPanel interactions", () => {
     };
   });
 
+  it("orders excluded members like the generated YAML member sequence", () => {
+    mocks.store.sources = [
+      ...mocks.store.sources,
+      {
+        id: "source-p",
+        type: "url",
+        content: "https://provider.example/sub",
+        useProxyProviders: true,
+        providerMode: "grouped",
+        providerGroupName: "✈️ AirportA",
+      },
+    ];
+
+    const tree = ProxyGroupAdvancedPanel({
+      target: { kind: "custom", id: "media", name: "Media" },
+      advanced: {},
+      onChange: vi.fn(),
+      rulesCount: 0,
+      rulesContent: null,
+    });
+    const excludedChips = flattenElements(tree).filter(
+      (element) => element.type === "button" && String(element.props.className || "").includes("hover:border-emerald"),
+    );
+
+    // 未启用成员顺序对齐生成器默认成员序：节点选择 → 自动选择 → 机场组 → DIRECT/REJECT → 自定义组 → 节点
+    expect(excludedChips.map((element) => element.props.title)).toEqual([
+      "Select",
+      "Auto",
+      "✈️ AirportA",
+      "REJECT",
+      "Other",
+      "Extra Node",
+    ]);
+  });
+
   it("fires native source, region, member, and drag callbacks", () => {
     const onChange = vi.fn();
     const tree = ProxyGroupAdvancedPanel({
@@ -393,4 +433,261 @@ describe("ProxyGroupAdvancedPanel interactions", () => {
       memberOrder: [],
     });
   });
+
+  it("renders only inline provider chips (grouped airport group is a default member, not a chip)", () => {
+    mocks.store.sources = [
+      {
+        id: "gp",
+        type: "url",
+        useProxyProviders: true,
+        providerMode: "grouped",
+        providerKey: "lxy",
+        providerGroupName: "✈️ 香港机场",
+      },
+      { id: "bare", type: "url", useProxyProviders: true, providerMode: "bare" },
+      // inline 源不产胶囊
+      { id: "inl", type: "url", useProxyProviders: true, providerMode: "inline" },
+    ];
+    const onChange = vi.fn();
+    const tree = ProxyGroupAdvancedPanel({
+      target: { kind: "custom", id: "media", name: "Media" },
+      advanced: {},
+      onChange,
+      rulesCount: 0,
+      rulesContent: null,
+    });
+    const chipButtons = flattenElements(tree).filter(
+      (element) => element.type === "button" && String(element.props.title || "").match(/内联|机场/),
+    );
+    // grouped 与 bare 各产 1 个内联胶囊；机场组名不再是胶囊（已作为默认成员进已启用列表）
+    expect(chipButtons.map((element) => element.props.title)).toEqual(["内联 lxy", "内联 url_bare"]);
+
+    chipButtons[0].props.onClick();
+    expect(onChange).toHaveBeenCalledWith({ extraMembers: [{ kind: "provider-inline", key: "lxy" }] });
+
+    chipButtons[1].props.onClick();
+    expect(onChange).toHaveBeenCalledWith({ extraMembers: [{ kind: "provider-inline", key: "url_bare" }] });
+  });
+
+  it("removes an already-selected provider member on toggle", () => {
+    mocks.store.sources = [
+      { id: "bare", type: "url", useProxyProviders: true, providerMode: "bare", providerKey: "abc" },
+    ];
+    const onChange = vi.fn();
+    const tree = ProxyGroupAdvancedPanel({
+      target: { kind: "custom", id: "media", name: "Media" },
+      advanced: { extraMembers: [{ kind: "provider-inline", key: "abc" }] },
+      onChange,
+      rulesCount: 0,
+      rulesContent: null,
+    });
+    const chip = flattenElements(tree).find(
+      (element) => element.type === "button" && element.props.title === "内联 abc",
+    );
+    // 已选态高亮
+    expect(String(chip?.props.className)).toContain("bg-indigo-500/20");
+    chip?.props.onClick();
+    expect(onChange).toHaveBeenCalledWith({ extraMembers: [] });
+  });
+
+  it("shows selected provider members at the end of the included list", () => {
+    mocks.store.sources = [
+      {
+        id: "gp",
+        type: "url",
+        useProxyProviders: true,
+        providerMode: "grouped",
+        providerKey: "lxy",
+        providerGroupName: "✈️ 香港机场",
+      },
+    ];
+    const tree = ProxyGroupAdvancedPanel({
+      target: { kind: "custom", id: "media", name: "Media" },
+      advanced: {
+        extraMembers: [
+          { kind: "provider-inline", key: "lxy" },
+          { kind: "provider-group", key: "lxy" },
+        ],
+      },
+      onChange: vi.fn(),
+      rulesCount: 0,
+      rulesContent: null,
+    });
+    // 已启用列表里 provider 行标签为「Provider」「机场组」，且 label 正确
+    const kindLabels = flattenElements(tree)
+      .filter((el) => el.type === "div" && /^(Provider|机场组|节点|内置组|自定义组)$/.test(String(el.props.children)))
+      .map((el) => String(el.props.children));
+    // 普通节点在前，provider 两项在末尾
+    expect(kindLabels.slice(-2)).toEqual(["Provider", "机场组"]);
+    expect(kindLabels).toContain("节点");
+
+    // provider 行不可拖拽
+    const providerRow = flattenElements(tree).find(
+      (el) => el.type === "div" && el.props.draggable === false && /内联 lxy|香港机场/.test(JSON.stringify(el.props)),
+    );
+    expect(providerRow).toBeTruthy();
+  });
+
+  it("removes a provider member via the included-list X, equivalent to chip toggle", () => {
+    mocks.store.sources = [
+      { id: "bare", type: "url", useProxyProviders: true, providerMode: "bare", providerKey: "abc" },
+    ];
+    const onChange = vi.fn();
+    const tree = ProxyGroupAdvancedPanel({
+      target: { kind: "custom", id: "media", name: "Media" },
+      advanced: { extraMembers: [{ kind: "provider-inline", key: "abc" }] },
+      onChange,
+      rulesCount: 0,
+      rulesContent: null,
+    });
+    // 已启用列表里 provider 行的「排除」按钮（provider 行固定在列表末尾，取最后一个）
+    const excludeBtns = flattenElements(tree).filter(
+      (el) => el.type === "button" && el.props.title === "排除",
+    );
+    const excludeBtn = excludeBtns[excludeBtns.length - 1];
+    excludeBtn?.props.onClick();
+    // 只写 extraMembers（删掉该项），不写 excludedMembers/memberOrder
+    expect(onChange).toHaveBeenCalledWith({ extraMembers: [] });
+    const payload = onChange.mock.calls[0][0];
+    expect(payload).not.toHaveProperty("excludedMembers");
+    expect(payload).not.toHaveProperty("memberOrder");
+  });
+
+  it("remove-all-nodes also removes provider-inline members", () => {
+    mocks.store.sources = [
+      { id: "bare", type: "url", useProxyProviders: true, providerMode: "bare", providerKey: "abc" },
+    ];
+    const onChange = vi.fn();
+    const tree = ProxyGroupAdvancedPanel({
+      target: { kind: "custom", id: "media", name: "Media" },
+      advanced: { extraMembers: [{ kind: "provider-inline", key: "abc" }] },
+      onChange,
+      rulesCount: 0,
+      rulesContent: null,
+    });
+    const removeAll = flattenElements(tree).find(
+      (el) => el.type === "button" && el.props.title === "移除全部节点",
+    );
+    removeAll?.props.onClick();
+    const payload = onChange.mock.calls[0][0];
+    expect(payload.extraMembers).not.toContainEqual({ kind: "provider-inline", key: "abc" });
+    // provider 不写入 excludedMembers
+    expect(payload.excludedMembers ?? []).not.toContainEqual({ kind: "provider-inline", key: "abc" });
+  });
+
+  it("remove-all-proxy-groups removes the airport group and writes it to excludedMembers", () => {
+    // 带 content URL 的 grouped 源 → 机场组被解析为非孤儿的普通成员
+    mocks.store.sources = [
+      {
+        id: "gp",
+        type: "url",
+        content: "https://example.com/hk",
+        useProxyProviders: true,
+        providerMode: "grouped",
+        providerKey: "lxy",
+        providerGroupName: "✈️ 香港机场",
+      },
+    ];
+    const onChange = vi.fn();
+    const tree = ProxyGroupAdvancedPanel({
+      target: { kind: "custom", id: "media", name: "Media" },
+      advanced: {},
+      onChange,
+      rulesCount: 0,
+      rulesContent: null,
+    });
+    const removeAll = flattenElements(tree).find(
+      (el) => el.type === "button" && el.props.title === "移除全部代理组",
+    );
+    removeAll?.props.onClick();
+    const payload = onChange.mock.calls[0][0];
+    // 机场组是普通默认成员：移除全部代理组时写入 excludedMembers 才能压过默认注入
+    expect(payload.excludedMembers ?? []).toContainEqual({ kind: "provider-group", key: "lxy" });
+  });
+
+  it("enables remove-all-nodes when only provider-inline members are included", () => {
+    // 目标组 proxies 不含真实节点，普通已启用节点为 0
+    mocks.generatedProxyGroups = [{ name: "Media", proxies: ["DIRECT"] }];
+    mocks.store.sources = [
+      { id: "bare", type: "url", useProxyProviders: true, providerMode: "bare", providerKey: "abc" },
+    ];
+    const tree = ProxyGroupAdvancedPanel({
+      target: { kind: "custom", id: "media", name: "Media" },
+      advanced: { extraMembers: [{ kind: "provider-inline", key: "abc" }] },
+      onChange: vi.fn(),
+      rulesCount: 0,
+      rulesContent: null,
+    });
+    const removeAll = flattenElements(tree).find(
+      (el) => el.type === "button" && el.props.title === "移除全部节点",
+    );
+    expect(removeAll?.props.disabled).toBe(false);
+  });
+
+  it("renders orphan provider members with fallback label", () => {
+    // extraMembers 里有 sources 中不存在的 provider key → 用兜底 label 显示
+    mocks.store.sources = [];
+    const tree = ProxyGroupAdvancedPanel({
+      target: { kind: "custom", id: "media", name: "Media" },
+      advanced: { extraMembers: [{ kind: "provider-inline", key: "ghost" }] },
+      onChange: vi.fn(),
+      rulesCount: 0,
+      rulesContent: null,
+    });
+    const labelDiv = flattenElements(tree).find(
+      (el) => el.type === "div" && String(el.props.children) === "内联 ghost",
+    );
+    expect(labelDiv).toBeTruthy();
+  });
+
+  it("shows the airport group as a default draggable member and X writes excludedMembers", () => {
+    // 带 content URL 的 grouped 源，且目标组 proxies 含机场组名（模拟生成器默认注入）
+    mocks.generatedProxyGroups = [
+      { name: "Media", proxies: ["DIRECT", "✈️ 香港机场", "US Source"] },
+    ];
+    mocks.store.sources = [
+      {
+        id: "gp",
+        type: "url",
+        content: "https://example.com/hk",
+        useProxyProviders: true,
+        providerMode: "grouped",
+        providerKey: "lxy",
+        providerGroupName: "✈️ 香港机场",
+      },
+    ];
+    const onChange = vi.fn();
+    const tree = ProxyGroupAdvancedPanel({
+      target: { kind: "custom", id: "media", name: "Media" },
+      advanced: {},
+      onChange,
+      rulesCount: 0,
+      rulesContent: null,
+    });
+    // 机场组作为默认成员出现在已启用列表，且可拖拽（非合成成员）
+    const airportRow = flattenElements(tree).find(
+      (el) =>
+        el.type === "div" &&
+        el.props.draggable === true &&
+        /✈️ 香港机场/.test(JSON.stringify(el.props.children ?? "")),
+    );
+    expect(airportRow).toBeTruthy();
+
+    // 列表 X 排除机场组 → 写 excludedMembers（普通成员路径）
+    const excludeBtns = flattenElements(tree).filter(
+      (el) => el.type === "button" && el.props.title === "排除",
+    );
+    // 找到机场组那一行的排除按钮：遍历所有 X，点击后断言 payload 含 provider-group
+    let wrote = false;
+    for (const btn of excludeBtns) {
+      onChange.mockClear();
+      btn.props.onClick();
+      const payload = onChange.mock.calls[0]?.[0];
+      if ((payload?.excludedMembers ?? []).some((m: { kind: string }) => m.kind === "provider-group")) {
+        wrote = true;
+        break;
+      }
+    }
+    expect(wrote).toBe(true);
+  });
 });
diff --git a/packages/ui/src/product/converter/advanced-mode/sections/proxy-group-advanced-panel.tsx b/packages/ui/src/product/converter/advanced-mode/sections/proxy-group-advanced-panel.tsx
index 4d856f4..4b6bd42 100644
--- a/packages/ui/src/product/converter/advanced-mode/sections/proxy-group-advanced-panel.tsx
+++ b/packages/ui/src/product/converter/advanced-mode/sections/proxy-group-advanced-panel.tsx
@@ -35,6 +35,11 @@ import {
   type ResolvedMember,
 } from "./proxy-group-member-bulk";
 import { ProxyGroupMemberSectionHeader } from "./proxy-group-member-section-header";
+import { buildProviderGroupInfo } from "./provider-group-plan";
+import {
+  PROVIDER_GROUP_DEFAULT_EMOJI,
+  resolveProviderMode,
+} from "@subboost/ui/product/converter/provider-settings-fields";
 
 export {
   insertMemberAfterProtected,
@@ -62,6 +67,10 @@ export function memberKindLabel(member: ResolvedMember): string {
       return "内置组";
     case "custom":
       return "自定义组";
+    case "provider-inline":
+      return "Provider";
+    case "provider-group":
+      return "机场组";
     case "direct":
       return "直连";
     case "reject":
@@ -75,6 +84,7 @@ export function buildMemberFromName(
     nodes: ParsedNode[];
     moduleNames: Record<string, string>;
     customProxyGroups: CustomProxyGroup[];
+    providerNameToKey?: Map<string, string>;
   },
 ): ResolvedMember | null {
   const trimmed = name.trim();
@@ -89,6 +99,11 @@ export function buildMemberFromName(
     const customEntry = options.customProxyGroups.find((group) => group.name === trimmed);
     if (moduleEntry) ref = { kind: "module", id: moduleEntry[0] };
     else if (customEntry) ref = { kind: "custom", id: customEntry.id };
+    else {
+      // 机场组名（proxy-providers 分组模式）→ provider-group 成员，与生成器 resolve 保持一致
+      const providerKey = options.providerNameToKey?.get(trimmed);
+      if (providerKey) ref = { kind: "provider-group", key: providerKey };
+    }
   }
 
   if (!ref) return null;
@@ -119,6 +134,14 @@ function DragHandle() {
 const ADVANCED_PANEL_TITLE_CLASS = "mb-2 block text-[11px] font-medium text-white/50";
 const ADVANCED_PANEL_TITLE_ROW_CLASS = "mb-2 flex min-h-5 items-center gap-2";
 
+function CountBadge({ children }: { children: React.ReactNode }) {
+  return (
+    <Badge variant="outline" className="ml-auto border-white/10 bg-white/5 text-[10px] text-white/45">
+      {children}
+    </Badge>
+  );
+}
+
 export function ProxyGroupAdvancedPanel({
   target,
   advanced,
@@ -141,6 +164,7 @@ export function ProxyGroupAdvancedPanel({
     proxyGroupAdvanced,
     builtinRuleEdits,
     proxyGroupNameOverrides,
+    dialerProxyGroups,
     testUrl,
     testInterval,
     ruleProviderBaseUrl,
@@ -176,6 +200,25 @@ export function ProxyGroupAdvancedPanel({
     [proxyGroupNameOverrides],
   );
 
+  // 机场组信息（组名/key↔名/全部key），与生成器共用同一构建逻辑，保证预览与真实生成一致
+  const providerInfo = React.useMemo(
+    () =>
+      buildProviderGroupInfo(sources, {
+        nodes,
+        proxyGroupNameOverrides,
+        customProxyGroups,
+        dialerProxyGroups,
+        testUrl,
+        testInterval,
+      }),
+    [sources, nodes, proxyGroupNameOverrides, customProxyGroups, dialerProxyGroups, testUrl, testInterval],
+  );
+  const providerNameToKey = React.useMemo(() => {
+    const map = new Map<string, string>();
+    for (const [key, name] of Object.entries(providerInfo.nameByKey)) map.set(name, key);
+    return map;
+  }, [providerInfo]);
+
   const generatedProxyGroups = React.useMemo(() => {
     return generateProxyGroups({
       nodes,
@@ -188,6 +231,9 @@ export function ProxyGroupAdvancedPanel({
       proxyGroupAdvanced,
       builtinRuleEdits,
       proxyGroupNameOverrides,
+      providerGroupNames: providerInfo.names,
+      allProviderKeys: providerInfo.keys,
+      providerGroupNameByKey: providerInfo.nameByKey,
     });
   }, [
     nodes,
@@ -200,44 +246,118 @@ export function ProxyGroupAdvancedPanel({
     proxyGroupAdvanced,
     builtinRuleEdits,
     proxyGroupNameOverrides,
+    providerInfo,
   ]);
   const generatedProxyNames = React.useMemo(() => {
     if (nodes.length === 0) return [];
     return generatedProxyGroups.find((group) => group.name === target.name)?.proxies ?? [];
   }, [generatedProxyGroups, nodes.length, target.name]);
 
+  const extraRefs = normalizeList(advanced.extraMembers);
+
+  // Provider 组胶囊：只保留 grouped/bare 源的「内联 key」胶囊（写 provider-inline，注入 use）。
+  // grouped 的机场组已作为默认成员出现在「已启用成员」列表，不再另设机场组名胶囊。
+  const providerChips = React.useMemo(() => {
+    const out: Array<{ ref: ProxyGroupMemberRef; label: string }> = [];
+    for (const source of sources) {
+      if (source.type !== "url" || !source.useProxyProviders) continue;
+      const mode = resolveProviderMode(source);
+      if (mode !== "grouped" && mode !== "bare") continue;
+      const key = source.providerKey?.trim() || `url_${source.id}`;
+      out.push({ ref: { kind: "provider-inline", key }, label: `内联 ${key}` });
+    }
+    return out;
+  }, [sources]);
+
+  // 合成成员（不经生成器 proxies 反解析、直接拼进已启用列表末尾的 provider 成员）：
+  // - provider-inline：注入 use，本就不在 proxies，固定末尾；
+  // - 孤儿 provider-group：源已删/改，nameByKey 查不到组名，兜底显示、可手动移除。
+  // 非孤儿机场组由 generatedProxyNames 反解析进列表（位置=YAML），走普通成员路径。
+  const selectedProviderMembers = React.useMemo<ResolvedMember[]>(() => {
+    const out: ResolvedMember[] = [];
+    const seen = new Set<string>();
+    for (const ref of normalizeList(advanced.extraMembers)) {
+      let synthetic: ResolvedMember | null = null;
+      if (ref.kind === "provider-inline") {
+        synthetic = { key: getProxyGroupMemberKey(ref), ref, name: `内联 ${ref.key}`, kind: ref.kind };
+      } else if (ref.kind === "provider-group" && !providerInfo.nameByKey[ref.key]) {
+        synthetic = {
+          key: getProxyGroupMemberKey(ref),
+          ref,
+          name: `${PROVIDER_GROUP_DEFAULT_EMOJI} ${ref.key}`,
+          kind: ref.kind,
+        };
+      }
+      if (!synthetic || seen.has(synthetic.key)) continue;
+      seen.add(synthetic.key);
+      out.push(synthetic);
+    }
+    return out;
+  }, [advanced.extraMembers, providerInfo]);
+
+  // 合成成员判定：provider-inline 或 孤儿 provider-group（源已删/改）——固定末尾、不可拖、X 只删 extraMembers。
+  // 非孤儿机场组不属于合成成员，走普通成员路径（可拖拽、X 写 excludedMembers）。
+  const isSyntheticMember = React.useCallback(
+    (member: ResolvedMember): boolean => {
+      if (member.kind === "provider-inline") return true;
+      if (member.kind === "provider-group" && member.ref.kind === "provider-group") {
+        return !providerInfo.nameByKey[member.ref.key];
+      }
+      return false;
+    },
+    [providerInfo],
+  );
+
   const candidateMembers = React.useMemo(() => {
+    // 候选池顺序对齐生成器的默认成员序（moduleBaseProxies + withProviderGroupDefaults 锚点）：
+    // 节点选择 → 自动选择 → 机场组 → DIRECT/REJECT → 其余模块组 → 自定义组 → 节点，
+    // 使"未启用成员"的展示序与成员重新启用后在 YAML 中的位置一致。
+    const enabledModules = PROXY_GROUP_MODULES.filter((module) => enabledProxyGroups.includes(module.id));
+    const anchorModuleNames = ["select", "auto"]
+      .map((id) => (enabledModules.some((module) => module.id === id) ? moduleNames[id] : undefined))
+      .filter((name): name is string => Boolean(name));
+    const otherModuleNames = enabledModules
+      .filter((module) => module.id !== "select" && module.id !== "auto")
+      .map((module) => moduleNames[module.id]);
     const rawNames = [
+      ...anchorModuleNames,
+      ...providerInfo.names,
       "DIRECT",
       "REJECT",
-      ...activeNodes.map((node) => node.name),
-      ...PROXY_GROUP_MODULES.filter((module) => enabledProxyGroups.includes(module.id)).map((module) => moduleNames[module.id]),
+      ...otherModuleNames,
       ...activeCustomProxyGroups.map((group) => group.name),
+      ...activeNodes.map((node) => node.name),
     ];
     const out: ResolvedMember[] = [];
     const seen = new Set<string>();
     for (const rawName of rawNames) {
       if (typeof rawName !== "string" || !rawName.trim()) continue;
-      const member = buildMemberFromName(rawName, { nodes: activeNodes, moduleNames, customProxyGroups: activeCustomProxyGroups });
+      const member = buildMemberFromName(rawName, { nodes: activeNodes, moduleNames, customProxyGroups: activeCustomProxyGroups, providerNameToKey });
       if (!member || seen.has(member.key)) continue;
       if (member.key === `${target.kind}:${target.id}`) continue;
       seen.add(member.key);
       out.push(member);
     }
     return out;
-  }, [activeCustomProxyGroups, activeNodes, enabledProxyGroups, moduleNames, target.id, target.kind]);
+  }, [activeCustomProxyGroups, activeNodes, enabledProxyGroups, moduleNames, providerInfo, providerNameToKey, target.id, target.kind]);
 
   const includedMembers = React.useMemo(() => {
     const out: ResolvedMember[] = [];
     const seen = new Set<string>();
     for (const name of generatedProxyNames) {
-      const member = buildMemberFromName(name, { nodes: activeNodes, moduleNames, customProxyGroups: activeCustomProxyGroups });
+      const member = buildMemberFromName(name, { nodes: activeNodes, moduleNames, customProxyGroups: activeCustomProxyGroups, providerNameToKey });
       if (!member || seen.has(member.key)) continue;
       seen.add(member.key);
       out.push(member);
     }
+    // 合成成员（provider-inline / 孤儿 provider-group）固定追加在普通成员之后
+    for (const member of selectedProviderMembers) {
+      if (seen.has(member.key)) continue;
+      seen.add(member.key);
+      out.push(member);
+    }
     return out;
-  }, [activeCustomProxyGroups, activeNodes, generatedProxyNames, moduleNames]);
+  }, [activeCustomProxyGroups, activeNodes, generatedProxyNames, moduleNames, providerNameToKey, selectedProviderMembers]);
 
   const excludedMembers = React.useMemo(() => {
     const included = new Set(includedMembers.map((member) => member.key));
@@ -300,7 +420,10 @@ export function ProxyGroupAdvancedPanel({
   const moveMember = React.useCallback(
     (fromKey: string, toKey: string) => {
       if (fromKey === toKey) return;
-      const current = includedMembers.map((member) => member.ref);
+      // 合成成员（inline / 孤儿机场组）不参与排序，memberOrder 里不能混入它们的 ref
+      const current = includedMembers
+        .filter((member) => !isSyntheticMember(member))
+        .map((member) => member.ref);
       const from = current.findIndex((member) => getProxyGroupMemberKey(member) === fromKey);
       const to = current.findIndex((member) => getProxyGroupMemberKey(member) === toKey);
       if (from < 0 || to < 0) return;
@@ -309,12 +432,11 @@ export function ProxyGroupAdvancedPanel({
       next.splice(to, 0, item);
       onChange({ memberOrder: next });
     },
-    [includedMembers, onChange],
+    [includedMembers, isSyntheticMember, onChange],
   );
 
   const sourceIds = normalizeList(advanced.sourceIds);
   const regions = normalizeList(advanced.regions);
-  const extraRefs = normalizeList(advanced.extraMembers);
   const excludedRefs = normalizeList(advanced.excludedMembers);
   const memberOrderRefs = normalizeList(advanced.memberOrder);
   const hasMemberOverrides =
@@ -322,13 +444,19 @@ export function ProxyGroupAdvancedPanel({
 
   const disableMember = React.useCallback(
     (member: ResolvedMember) => {
+      // 合成成员（inline / 孤儿机场组）的"排除"就是从 extraMembers 删掉，与胶囊取消等价；
+      // 不写 excludedMembers（不在常规候选池，排除记录是脏数据）。
+      if (isSyntheticMember(member)) {
+        onChange({ extraMembers: withoutMember(extraRefs, member.key) });
+        return;
+      }
       onChange({
         extraMembers: withoutMember(extraRefs, member.key),
         excludedMembers: withMember(excludedRefs, member.ref),
         memberOrder: withoutMember(advanced.memberOrder, member.key),
       });
     },
-    [advanced.memberOrder, excludedRefs, extraRefs, onChange],
+    [advanced.memberOrder, excludedRefs, extraRefs, isSyntheticMember, onChange],
   );
 
   const enableMember = React.useCallback(
@@ -356,10 +484,14 @@ export function ProxyGroupAdvancedPanel({
     onChange(
       buildRemoveAllMembersPatch({
         advanced,
-        membersToRemove: nodeMembers,
+        // provider-inline 语义是"该订阅节点内联进本组"，移除全部节点时一并移除
+        membersToRemove: [
+          ...nodeMembers,
+          ...includedMembers.filter((member) => member.kind === "provider-inline"),
+        ],
       }),
     );
-  }, [advanced, nodeMembers, onChange]);
+  }, [advanced, includedMembers, nodeMembers, onChange]);
 
   const addAllProxyGroups = React.useCallback(() => {
     if (addableProxyGroupMembers.length > 0) {
@@ -391,10 +523,14 @@ export function ProxyGroupAdvancedPanel({
     onChange(
       buildRemoveAllMembersPatch({
         advanced,
-        membersToRemove: proxyGroupMembers,
+        // 非孤儿机场组已在 proxyGroupMembers（候选池含机场组名）；孤儿机场组只在 includedMembers，需另补
+        membersToRemove: [
+          ...proxyGroupMembers,
+          ...includedMembers.filter((member) => member.kind === "provider-group" && isSyntheticMember(member)),
+        ],
       }),
     );
-  }, [advanced, onChange, proxyGroupMembers]);
+  }, [advanced, includedMembers, isSyntheticMember, onChange, proxyGroupMembers]);
 
   const restoreDefaultMembers = React.useCallback(async () => {
     const confirmed = await confirmDialog({
@@ -407,6 +543,15 @@ export function ProxyGroupAdvancedPanel({
     onChange({ extraMembers: [], excludedMembers: [], memberOrder: [] });
   }, [onChange]);
 
+  const toggleProviderMember = React.useCallback(
+    (ref: ProxyGroupMemberRef) => {
+      const key = getProxyGroupMemberKey(ref);
+      const selected = extraRefs.some((item) => getProxyGroupMemberKey(item) === key);
+      onChange({ extraMembers: selected ? withoutMember(extraRefs, key) : withMember(extraRefs, ref) });
+    },
+    [extraRefs, onChange],
+  );
+
   return (
     <div className="border-t border-white/10">
       <div className="grid gap-0 md:grid-cols-[1fr_1fr_1fr]">
@@ -499,11 +644,13 @@ export function ProxyGroupAdvancedPanel({
           </div>
         ) : (
           <div className="max-h-52 space-y-1 overflow-y-auto pr-1 custom-scrollbar">
-            {includedMembers.map((member) => (
+            {includedMembers.map((member) => {
+              const synthetic = isSyntheticMember(member);
+              return (
               <div
                 key={member.key}
-                draggable
-                onDragStart={() => setDraggingKey(member.key)}
+                draggable={!synthetic}
+                onDragStart={synthetic ? undefined : () => setDraggingKey(member.key)}
                 onDragOver={(event) => event.preventDefault()}
                 onDrop={() => {
                   if (draggingKey) moveMember(draggingKey, member.key);
@@ -515,7 +662,13 @@ export function ProxyGroupAdvancedPanel({
                   draggingKey === member.key && "opacity-50",
                 )}
               >
-                <span className="flex h-5 w-4 cursor-grab items-center justify-center">
+                {/* 合成成员不参与排序，占位保持网格对齐 */}
+                <span
+                  className={cn(
+                    "flex h-5 w-4 items-center justify-center",
+                    synthetic ? "opacity-0" : "cursor-grab",
+                  )}
+                >
                   <DragHandle />
                 </span>
                 <div className="min-w-0">
@@ -535,7 +688,43 @@ export function ProxyGroupAdvancedPanel({
                   <X className="h-3.5 w-3.5" />
                 </Button>
               </div>
-            ))}
+              );
+            })}
+          </div>
+        )}
+
+        {providerChips.length > 0 && (
+          <div className="mt-3">
+            <div className={ADVANCED_PANEL_TITLE_ROW_CLASS}>
+              <div className="text-[11px] font-medium text-white/50">Provider 组</div>
+              <CountBadge>{providerChips.length} 项</CountBadge>
+            </div>
+            <div className="flex flex-wrap gap-1.5">
+              {providerChips.map((chip) => {
+                const key = getProxyGroupMemberKey(chip.ref);
+                const selected = extraRefs.some((item) => getProxyGroupMemberKey(item) === key);
+                return (
+                  <button
+                    key={key}
+                    type="button"
+                    className={cn(
+                      "inline-flex max-w-full items-center gap-1 rounded border px-2 py-1 text-[10px] transition-colors",
+                      selected
+                        ? "border-indigo-400/40 bg-indigo-500/20 text-indigo-100"
+                        : "border-white/10 bg-white/5 text-white/55 hover:border-indigo-400/30 hover:bg-indigo-500/10 hover:text-indigo-100",
+                    )}
+                    title={chip.label}
+                    onClick={() => toggleProviderMember(chip.ref)}
+                  >
+                    {selected ? <X className="h-3 w-3" /> : <Plus className="h-3 w-3" />}
+                    <span className="truncate">{chip.label}</span>
+                  </button>
+                );
+              })}
+            </div>
+            <div className="mt-1 text-[10px] text-white/35">
+              点击把该 provider 追加进本组；已加入的再点一次取消
+            </div>
           </div>
         )}
 
diff --git a/packages/ui/src/product/converter/advanced-mode/sections/proxy-group-member-bulk.test.ts b/packages/ui/src/product/converter/advanced-mode/sections/proxy-group-member-bulk.test.ts
index f4d27ce..de94154 100644
--- a/packages/ui/src/product/converter/advanced-mode/sections/proxy-group-member-bulk.test.ts
+++ b/packages/ui/src/product/converter/advanced-mode/sections/proxy-group-member-bulk.test.ts
@@ -15,7 +15,9 @@ function resolved(ref: ProxyGroupMemberRef, name: string): ResolvedMember {
       ? `node:${ref.name}`
       : ref.kind === "module" || ref.kind === "custom"
         ? `${ref.kind}:${ref.id}`
-        : `${ref.kind}:${ref.kind === "direct" ? "DIRECT" : "REJECT"}`;
+        : ref.kind === "provider-inline" || ref.kind === "provider-group"
+          ? `${ref.kind}:${ref.key}`
+          : `${ref.kind}:${ref.kind === "direct" ? "DIRECT" : "REJECT"}`;
   return { key, ref, name, kind: ref.kind };
 }
 
@@ -95,6 +97,8 @@ describe("proxy group member bulk helpers", () => {
     const moduleMember = resolved({ kind: "module", id: "auto" }, "Auto");
     const custom = resolved({ kind: "custom", id: "media" }, "Media");
     const direct = resolved({ kind: "direct" }, "DIRECT");
+    const providerInline = resolved({ kind: "provider-inline", key: "lxy" }, "内联 lxy");
+    const providerGroup = resolved({ kind: "provider-group", key: "lxy" }, "✈️ 香港机场");
 
     expect(isNodeMember(node)).toBe(true);
     expect(isNodeMember(moduleMember)).toBe(false);
@@ -102,6 +106,35 @@ describe("proxy group member bulk helpers", () => {
     expect(isProxyGroupMember(custom)).toBe(true);
     expect(isProxyGroupMember(node)).toBe(false);
     expect(isProxyGroupMember(direct)).toBe(false);
+    // provider-inline 按节点、provider-group 按代理组，各归各类、互不交叉
+    expect(isNodeMember(providerInline)).toBe(true);
+    expect(isProxyGroupMember(providerInline)).toBe(false);
+    expect(isProxyGroupMember(providerGroup)).toBe(true);
+    expect(isNodeMember(providerGroup)).toBe(false);
+  });
+
+  it("removes provider members from extraMembers without writing them to excludedMembers", () => {
+    const providerInline = resolved({ kind: "provider-inline", key: "lxy" }, "内联 lxy");
+    const nodeA = resolved({ kind: "node", name: "A" }, "A");
+
+    expect(
+      buildRemoveAllMembersPatch({
+        advanced: {
+          extraMembers: [
+            { kind: "provider-inline", key: "lxy" },
+            { kind: "node", name: "A" },
+          ],
+          excludedMembers: [],
+          memberOrder: [{ kind: "node", name: "A" }],
+        },
+        membersToRemove: [providerInline, nodeA],
+      }),
+    ).toEqual({
+      // provider 从 extraMembers 删除，node 走常规排除
+      extraMembers: [],
+      excludedMembers: [{ kind: "node", name: "A" }],
+      memberOrder: [],
+    });
   });
 
   it("blocks direct and transitive proxy group cycles", () => {
diff --git a/packages/ui/src/product/converter/advanced-mode/sections/proxy-group-member-bulk.ts b/packages/ui/src/product/converter/advanced-mode/sections/proxy-group-member-bulk.ts
index bc42638..47dcf0d 100644
--- a/packages/ui/src/product/converter/advanced-mode/sections/proxy-group-member-bulk.ts
+++ b/packages/ui/src/product/converter/advanced-mode/sections/proxy-group-member-bulk.ts
@@ -85,12 +85,14 @@ export function insertMemberAfterProtected(
   return insertMembersAfterProtected(currentMembers, [member]);
 }
 
+// provider-inline 语义上是"把该订阅的节点内联进本组"，批量节点操作按节点对待；
+// provider-group 引用的机场组是策略组，批量代理组操作按代理组对待。
 export function isNodeMember(member: ResolvedMember): boolean {
-  return member.kind === "node";
+  return member.kind === "node" || member.kind === "provider-inline";
 }
 
 export function isProxyGroupMember(member: ResolvedMember): boolean {
-  return member.kind === "module" || member.kind === "custom";
+  return member.kind === "module" || member.kind === "custom" || member.kind === "provider-group";
 }
 
 export function buildAddAllMembersPatch(options: {
@@ -121,6 +123,9 @@ export function buildRemoveAllMembersPatch(options: {
   const keys = new Set(options.membersToRemove.map((member) => member.key));
   let excludedMembers = normalizeList(options.advanced.excludedMembers);
   for (const member of options.membersToRemove) {
+    // provider-inline 注入 use、不在常规候选池，写 excludedMembers 只会变脏数据 → 仅从 extraMembers 删除。
+    // provider-group（机场组）是普通默认成员，必须写 excludedMembers 才能压过默认注入，走常规路径。
+    if (member.kind === "provider-inline") continue;
     excludedMembers = withMember(excludedMembers, member.ref);
   }
   return {
diff --git a/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-categories.test.ts b/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-categories.test.ts
index 35b862b..c5b0afe 100644
--- a/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-categories.test.ts
+++ b/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-categories.test.ts
@@ -98,6 +98,21 @@ vi.mock("@subboost/core/generator/proxy-groups", () => ({
 	    { id: "fallback", name: "Fallback", category: "core", rules: [] },
 	  ],
   generateProxyGroups: vi.fn(() => []),
+  buildProviderProxyGroups: (attachments: any[]) => {
+    const grouped = attachments.filter((a) => a && a.mode === "grouped");
+    return {
+      groups: grouped.map((a) => ({ name: a.groupName || a.key, type: "select", use: [a.key] })),
+      names: grouped.map((a) => a.groupName || a.key),
+    };
+  },
+}));
+vi.mock("@subboost/core/subscription/proxy-providers", () => ({
+  buildProxyProviderPlanFromSources: (sources: any[]) => {
+    const attachments = (sources || [])
+      .filter((s) => s && s.type === "url" && s.useProxyProviders && s.providerMode === "grouped")
+      .map((s) => ({ key: `url_${s.id}`, mode: "grouped", groupName: s.providerGroupName || `✈️ url_${s.id}` }));
+    return attachments.length > 0 ? { providers: {}, attachments } : undefined;
+  },
 }));
 vi.mock("@subboost/core/proxy-group-name", () => ({
   resolveProxyGroupModuleName: (module: { name: string }, override?: string) => override || module.name,
@@ -127,12 +142,22 @@ vi.mock("./proxy-groups-custom-routing-rules", () => ({
     return null;
   },
 }));
+vi.mock("./proxy-groups-group-listeners", () => ({
+  GroupListenerPortBadge: () => null,
+  ProxyGroupsGroupListeners: () => null,
+}));
 vi.mock("./proxy-groups-module-card", () => ({
   ProxyGroupsModuleCard: (props: any) => {
     mocks.captures.moduleCards.push(props);
     return null;
   },
 }));
+vi.mock("./provider-group-readonly-card", () => ({
+  ProviderGroupReadonlyCard: (props: any) => {
+    mocks.captures.providerCards.push(props);
+    return null;
+  },
+}));
 
 import { ProxyGroupsCategories } from "./proxy-groups-categories";
 import { generateProxyGroups } from "@subboost/core/generator/proxy-groups";
@@ -146,6 +171,7 @@ function renderCategories(overrides: Record<number, unknown> = {}) {
   mocks.captures.inputs = [];
   mocks.captures.dropdownItems = [];
   mocks.captures.moduleCards = [];
+  mocks.captures.providerCards = [];
   mocks.captures.customPanelRendered = false;
   mocks.captures.customRulesRendered = false;
   try {
@@ -165,6 +191,7 @@ function renderCategoryTree(overrides: Record<number, unknown> = {}) {
   mocks.captures.inputs = [];
   mocks.captures.dropdownItems = [];
   mocks.captures.moduleCards = [];
+  mocks.captures.providerCards = [];
   mocks.captures.customPanelRendered = false;
   mocks.captures.customRulesRendered = false;
   try {
@@ -193,7 +220,7 @@ describe("ProxyGroupsCategories", () => {
     vi.clearAllMocks();
     stateMock.refOverride = undefined;
     mocks.confirmDialog.mockResolvedValue(true);
-    mocks.captures = { inputs: [], dropdownItems: [], moduleCards: [] };
+    mocks.captures = { inputs: [], dropdownItems: [], moduleCards: [], providerCards: [] };
     mocks.store = {
       ruleProviderBaseUrl: "https://rules.example/base/",
       nodes: [],
@@ -288,6 +315,29 @@ describe("ProxyGroupsCategories", () => {
     expect(mocks.captures.customRulesRendered).toBe(true);
   });
 
+  it("renders airport groups as read-only cards after the auto module in the core category", () => {
+    mocks.store.sources = [
+      {
+        id: "s1",
+        type: "url",
+        useProxyProviders: true,
+        providerMode: "grouped",
+        providerGroupName: "✈️ 测试机场",
+      },
+      // 非分组模式的 provider 不产生只读卡片
+      { id: "s2", type: "url", useProxyProviders: true, providerMode: "inline" },
+    ];
+    renderCategories({ 0: new Set(["core"]) });
+
+    expect(mocks.captures.providerCards).toEqual([expect.objectContaining({ name: "✈️ 测试机场" })]);
+  });
+
+  it("does not render airport cards when no grouped provider source exists", () => {
+    mocks.store.sources = [{ id: "s1", type: "url", useProxyProviders: true, providerMode: "bare" }];
+    renderCategories({ 0: new Set(["core"]) });
+    expect(mocks.captures.providerCards).toHaveLength(0);
+  });
+
   it("handles module card actions, confirmations, and rule movement", async () => {
     const { setters } = renderCategories({ 0: new Set(["core"]) });
     const card = mocks.captures.moduleCards[0];
diff --git a/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-categories.tsx b/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-categories.tsx
index e12d52d..122ddf8 100644
--- a/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-categories.tsx
+++ b/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-categories.tsx
@@ -31,9 +31,12 @@ import {
   listCustomRulesForTarget,
 } from "./proxy-group-rule-targets";
 import { ProxyGroupsCustomGroupsPanel } from "./proxy-groups-custom-groups-panel";
+import { buildProviderGroupInfo } from "./provider-group-plan";
 import { ProxyGroupsCustomRoutingRules } from "./proxy-groups-custom-routing-rules";
+import { ProxyGroupsGroupListeners } from "./proxy-groups-group-listeners";
 import { ProxyGroupAdvancedPanel } from "./proxy-group-advanced-panel";
 import { ProxyGroupsModuleCard } from "./proxy-groups-module-card";
+import { ProviderGroupReadonlyCard } from "./provider-group-readonly-card";
 
 const PROXY_GROUP_SECTION_LABEL_ROW_CLASS = "flex min-h-7 items-center gap-2";
 const PROXY_GROUP_SECTION_LABEL_CLASS = "text-xs text-white/50";
@@ -75,8 +78,23 @@ export function ProxyGroupsCategories() {
     setProxyGroupAdvancedModeEnabled,
     updateProxyGroupAdvanced,
     dialerProxyGroups = [],
+    sources = [],
   } = useConfigStore();
 
+  // provider 分组模式生成的机场组名（与生成器/面板共用同一构建逻辑，保证组名一致）
+  const providerGroupNames = React.useMemo(
+    () =>
+      buildProviderGroupInfo(sources, {
+        nodes,
+        proxyGroupNameOverrides,
+        customProxyGroups,
+        dialerProxyGroups,
+        testUrl,
+        testInterval,
+      }).names,
+    [sources, testUrl, testInterval, nodes, proxyGroupNameOverrides, customProxyGroups, dialerProxyGroups],
+  );
+
   const [expandedCategories, setExpandedCategories] = React.useState<
     Set<string>
   >(new Set(customProxyGroups.length > 0 ? [CUSTOM_CATEGORY_ID] : []));
@@ -157,6 +175,12 @@ export function ProxyGroupsCategories() {
     }
     return grouped;
   }, [hiddenProxyGroups]);
+  // 机场组只读卡片挂在“⚡ 自动选择”之后；若 auto 被隐藏则落到核心组末尾
+  const coreProviderAnchorId = React.useMemo(() => {
+    const coreModules = modulesByCategory["core"] || [];
+    if (coreModules.some((module) => module.id === "auto")) return "auto";
+    return coreModules[coreModules.length - 1]?.id ?? null;
+  }, [modulesByCategory]);
   const generatedProxyGroupNodeCounts = React.useMemo(() => {
     if (nodes.length === 0) return new Map<string, number>();
     const generated = generateProxyGroups({
@@ -525,8 +549,8 @@ export function ProxyGroupsCategories() {
                           };
 
                           return (
+                            <React.Fragment key={module.id}>
                             <ProxyGroupsModuleCard
-                              key={module.id}
                               module={module}
                               display={display}
                               isCore={isCore}
@@ -622,6 +646,12 @@ export function ProxyGroupsCategories() {
                                 />
                               )}
                             />
+                            {/* 机场组只读卡片：核心组分类中排在“⚡ 自动选择”之后 */}
+                            {categoryId === "core" && module.id === coreProviderAnchorId &&
+                              providerGroupNames.map((groupName) => (
+                                <ProviderGroupReadonlyCard key={`provider:${groupName}`} name={groupName} />
+                              ))}
+                            </React.Fragment>
                           );
                         })
                       ) : (
@@ -638,6 +668,8 @@ export function ProxyGroupsCategories() {
         </div>
       </div>
 
+      <ProxyGroupsGroupListeners />
+
       <ProxyGroupsCustomRoutingRules />
     </>
   );
diff --git a/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-custom-groups-panel.test.ts b/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-custom-groups-panel.test.ts
index abbc63c..9027446 100644
--- a/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-custom-groups-panel.test.ts
+++ b/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-custom-groups-panel.test.ts
@@ -96,6 +96,10 @@ vi.mock("./proxy-group-rule-targets", () => ({
   listCustomRulesForTarget: (_rules: any[], target: string) =>
     target === "🧩 Custom" ? [{ rule: { id: "manual-1" }, index: 0 }] : [],
 }));
+vi.mock("./proxy-groups-group-listeners", () => ({
+  GroupListenerPortBadge: () => null,
+  ProxyGroupsGroupListeners: () => null,
+}));
 vi.mock("./proxy-group-rule-row", () => ({
   ProxyGroupManualRuleRow: (props: any) => {
     mocks.captures.manualRows.push(props);
diff --git a/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-group-listeners.test.ts b/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-group-listeners.test.ts
new file mode 100644
index 0000000..581ad88
--- /dev/null
+++ b/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-group-listeners.test.ts
@@ -0,0 +1,343 @@
+import * as React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const mocks = vi.hoisted(() => ({
+  captures: {
+    buttons: [] as any[],
+    inputs: [] as any[],
+    selects: [] as any[],
+    selectItems: [] as any[],
+  },
+  store: {} as Record<string, any>,
+  confirmDialog: vi.fn(),
+}));
+
+const stateMock = vi.hoisted(() => ({
+  enabled: false,
+  effects: [] as Array<React.EffectCallback>,
+  callIndex: 0,
+  overrides: {} as Record<number, unknown>,
+  setters: [] as Array<ReturnType<typeof vi.fn>>,
+}));
+
+vi.mock("react", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("react")>();
+  return {
+    ...actual,
+    useCallback: (callback: (...args: any[]) => unknown, deps?: React.DependencyList) => {
+      if (stateMock.enabled) return callback;
+      return actual.useCallback(callback, deps ?? []);
+    },
+    useMemo: (factory: () => unknown, deps?: React.DependencyList) => {
+      if (stateMock.enabled) return factory();
+      return actual.useMemo(factory, deps ?? []);
+    },
+    useEffect: (effect: React.EffectCallback, deps?: React.DependencyList) => {
+      if (stateMock.enabled) {
+        stateMock.effects.push(effect);
+        return undefined;
+      }
+      return actual.useEffect(effect, deps);
+    },
+    useState: (initial: unknown) => {
+      if (!stateMock.enabled) return actual.useState(initial);
+      const index = stateMock.callIndex++;
+      const resolvedInitial = typeof initial === "function" ? (initial as () => unknown)() : initial;
+      const value = Object.prototype.hasOwnProperty.call(stateMock.overrides, index)
+        ? stateMock.overrides[index]
+        : resolvedInitial;
+      const setter = vi.fn((next: unknown) => {
+        const resolved = typeof next === "function" ? (next as (prev: unknown) => unknown)(value) : next;
+        (setter as any).lastValue = resolved;
+        return resolved;
+      });
+      stateMock.setters[index] = setter;
+      return [value, setter];
+    },
+  };
+});
+
+vi.mock("lucide-react", () => ({
+  ChevronDown: () => null,
+  ChevronRight: () => null,
+  Plus: () => null,
+  Trash2: () => null,
+}));
+vi.mock("@subboost/ui/components/ui/badge", () => ({ Badge: (props: any) => props.children ?? null }));
+vi.mock("@subboost/ui/components/ui/button", () => ({
+  Button: (props: any) => {
+    mocks.captures.buttons.push(props);
+    return props.children ?? null;
+  },
+}));
+vi.mock("@subboost/ui/components/ui/input", () => ({
+  Input: (props: any) => {
+    mocks.captures.inputs.push(props);
+    return props.value ?? null;
+  },
+}));
+vi.mock("@subboost/ui/components/ui/select", () => ({
+  Select: (props: any) => {
+    mocks.captures.selects.push(props);
+    return props.children ?? null;
+  },
+  SelectTrigger: (props: any) => props.children ?? null,
+  SelectValue: (props: any) => props.placeholder ?? null,
+  SelectContent: (props: any) => props.children ?? null,
+  SelectItem: (props: any) => {
+    mocks.captures.selectItems.push(props);
+    return props.children ?? null;
+  },
+}));
+vi.mock("@subboost/ui/components/ui/confirm-dialog", () => ({ confirmDialog: mocks.confirmDialog }));
+vi.mock("@subboost/ui/store/config-store", () => ({
+  useConfigStore: (selector?: (state: any) => unknown) => (selector ? selector(mocks.store) : mocks.store),
+}));
+vi.mock("./provider-group-plan", () => ({
+  buildProviderGroupInfo: () => ({ names: ["✈️ 机场A"], nameByKey: {}, keys: [] }),
+}));
+
+import { GroupListenerPortBadge, ProxyGroupsGroupListeners } from "./proxy-groups-group-listeners";
+
+function baseStore(overrides: Record<string, unknown> = {}) {
+  return {
+    groupListeners: [] as Array<{ id: string; target: string; port: number }>,
+    addGroupListener: vi.fn(),
+    updateGroupListener: vi.fn(),
+    removeGroupListener: vi.fn(),
+    enabledProxyGroups: [] as string[],
+    hiddenProxyGroups: [] as string[],
+    customProxyGroups: [{ id: "c1", name: "🎯 自定义组", emoji: "🎯", groupType: "select" }],
+    proxyGroupNameOverrides: {},
+    dialerProxyGroups: [
+      { id: "d1", name: "美国中转", relayNodes: [], targetNodes: [], type: "select" },
+      { id: "d2", name: "停用中转", enabled: false, relayNodes: [], targetNodes: [], type: "select" },
+    ],
+    sources: [],
+    nodes: [],
+    testUrl: "https://test.example.com",
+    testInterval: 300,
+    listenerPorts: {} as Record<string, number>,
+    mixedPort: 7890,
+    ruleProviderBaseUrl: "https://rules.example.com",
+    customRuleSets: [],
+    proxyGroupAdvanced: {},
+    builtinRuleEdits: {},
+    proxyGroupOrder: [] as string[],
+    ...overrides,
+  };
+}
+
+function resetCaptures() {
+  mocks.captures.buttons = [];
+  mocks.captures.inputs = [];
+  mocks.captures.selects = [];
+  mocks.captures.selectItems = [];
+}
+
+function findAddButton() {
+  return mocks.captures.buttons.find((props) => String(props.className ?? "").includes("border-dashed"));
+}
+
+async function flushAsync() {
+  await new Promise((resolve) => setTimeout(resolve, 0));
+}
+
+describe("ProxyGroupsGroupListeners", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    resetCaptures();
+    mocks.store = baseStore();
+    stateMock.enabled = false;
+    stateMock.effects = [];
+    stateMock.callIndex = 0;
+    stateMock.overrides = {};
+    stateMock.setters = [];
+    delete (globalThis as any).window;
+  });
+
+  it("renders a collapsed optional card when no bindings exist", () => {
+    const markup = renderToStaticMarkup(React.createElement(ProxyGroupsGroupListeners));
+
+    expect(markup).toContain("分组监听管理");
+    expect(markup).toContain("可选");
+    expect(markup).not.toContain("暂无分组监听");
+  });
+
+  it("renders rows, target options and stale-target placeholders when bindings exist", () => {
+    mocks.store = baseStore({
+      groupListeners: [
+        { id: "g1", target: "美国中转", port: 7891 },
+        { id: "g2", target: "已删除组", port: 7892 },
+      ],
+    });
+
+    const markup = renderToStaticMarkup(React.createElement(ProxyGroupsGroupListeners));
+
+    expect(markup).toContain("2 条");
+    expect(markup).toContain("（已不存在）");
+
+    const optionValues = mocks.captures.selectItems.map((props) => props.value);
+    expect(optionValues).toContain("🎯 自定义组");
+    expect(optionValues).toContain("美国中转");
+    expect(optionValues).toContain("✈️ 机场A");
+    expect(optionValues).not.toContain("停用中转");
+
+    // 一组一端口：g1 已绑定的「美国中转」在 g2 的下拉中被禁用
+    const usOptions = mocks.captures.selectItems.filter((props) => props.value === "美国中转");
+    expect(usOptions.some((props) => props.disabled === true)).toBe(true);
+    expect(usOptions.some((props) => !props.disabled)).toBe(true);
+
+    const portValues = mocks.captures.inputs.map((props) => props.value);
+    expect(portValues).toContain("7891");
+    expect(portValues).toContain("7892");
+  });
+
+  it("orders dropdown targets like the generated YAML group sequence", () => {
+    mocks.store = baseStore({
+      groupListeners: [{ id: "g1", target: "美国中转", port: 7891 }],
+    });
+
+    renderToStaticMarkup(React.createElement(ProxyGroupsGroupListeners));
+
+    // 模块组未启用时基础序只有自定义组；机场组+中转组插在其后（对齐生成器/可视化预览的插位逻辑）
+    expect(mocks.captures.selectItems.map((props) => props.value)).toEqual([
+      "🎯 自定义组",
+      "✈️ 机场A",
+      "美国中转",
+    ]);
+  });
+
+  it("applies proxyGroupOrder drag order to dropdown targets", () => {
+    mocks.store = baseStore({
+      groupListeners: [{ id: "g1", target: "美国中转", port: 7891 }],
+      proxyGroupOrder: ["dialer:d1"],
+    });
+
+    renderToStaticMarkup(React.createElement(ProxyGroupsGroupListeners));
+
+    expect(mocks.captures.selectItems.map((props) => props.value)).toEqual([
+      "美国中转",
+      "🎯 自定义组",
+      "✈️ 机场A",
+    ]);
+  });
+
+  it("flags conflicts against mixed-port, node listener ports and sibling rows", () => {
+    mocks.store = baseStore({
+      listenerPorts: { "Node A": 41000 },
+      groupListeners: [
+        { id: "g1", target: "美国中转", port: 7890 },
+        { id: "g2", target: "✈️ 机场A", port: 41000 },
+        { id: "g3", target: "🎯 自定义组", port: 7893 },
+        { id: "g4", target: "已删除组", port: 7893 },
+      ],
+    });
+
+    const markup = renderToStaticMarkup(React.createElement(ProxyGroupsGroupListeners));
+
+    expect(markup).toContain("与 mixed-port（7890）冲突");
+    expect(markup).toContain("与节点监听端口冲突");
+    expect(markup).toContain("与「🎯 自定义组」冲突");
+  });
+
+  it("commits valid port edits and records format errors for invalid input", () => {
+    mocks.store = baseStore({
+      groupListeners: [{ id: "g1", target: "美国中转", port: 7891 }],
+    });
+    stateMock.enabled = true;
+    stateMock.overrides = { 0: true };
+
+    renderToStaticMarkup(React.createElement(ProxyGroupsGroupListeners));
+
+    const portInput = mocks.captures.inputs[0];
+    expect(portInput).toBeTruthy();
+
+    portInput.onChange({ target: { value: "abc" } });
+    expect(mocks.store.updateGroupListener).not.toHaveBeenCalled();
+    expect(stateMock.setters[2]).toHaveBeenCalled();
+    expect((stateMock.setters[2] as any).lastValue).toMatchObject({ g1: "端口需为 1-65535 的整数" });
+
+    portInput.onChange({ target: { value: "8080" } });
+    expect(mocks.store.updateGroupListener).toHaveBeenCalledWith("g1", { port: 8080 });
+  });
+
+  it("updates targets and removes bindings from row controls", () => {
+    mocks.store = baseStore({
+      groupListeners: [{ id: "g1", target: "美国中转", port: 7891 }],
+    });
+    stateMock.enabled = true;
+    stateMock.overrides = { 0: true };
+
+    renderToStaticMarkup(React.createElement(ProxyGroupsGroupListeners));
+
+    mocks.captures.selects[0].onValueChange("🎯 自定义组");
+    expect(mocks.store.updateGroupListener).toHaveBeenCalledWith("g1", { target: "🎯 自定义组" });
+
+    const removeButton = mocks.captures.buttons.find((props) => props.title === "删除");
+    removeButton.onClick();
+    expect(mocks.store.removeGroupListener).toHaveBeenCalledWith("g1");
+  });
+
+  it("requires one-time public exposure confirmation before the first add", async () => {
+    stateMock.enabled = true;
+    stateMock.overrides = { 0: true };
+    renderToStaticMarkup(React.createElement(ProxyGroupsGroupListeners));
+
+    const addButton = findAddButton();
+    expect(addButton).toBeTruthy();
+
+    mocks.confirmDialog.mockResolvedValueOnce(false);
+    addButton.onClick();
+    await flushAsync();
+    expect(mocks.confirmDialog).toHaveBeenCalledTimes(1);
+    expect(mocks.store.addGroupListener).not.toHaveBeenCalled();
+
+    mocks.confirmDialog.mockResolvedValueOnce(true);
+    addButton.onClick();
+    await flushAsync();
+    expect(mocks.store.addGroupListener).toHaveBeenCalledTimes(1);
+  });
+
+  it("skips the warning when it was accepted before (shared storage key)", async () => {
+    Object.defineProperty(globalThis, "window", {
+      configurable: true,
+      value: {
+        localStorage: {
+          getItem: (key: string) => (key === "subboost.listenerPortWarningAccepted" ? "1" : null),
+          setItem: vi.fn(),
+        },
+      },
+    });
+    stateMock.enabled = true;
+    stateMock.overrides = { 0: true };
+    renderToStaticMarkup(React.createElement(ProxyGroupsGroupListeners));
+
+    findAddButton().onClick();
+    await flushAsync();
+    expect(mocks.confirmDialog).not.toHaveBeenCalled();
+    expect(mocks.store.addGroupListener).toHaveBeenCalledTimes(1);
+  });
+});
+
+describe("GroupListenerPortBadge", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    resetCaptures();
+    stateMock.enabled = false;
+    mocks.store = baseStore({
+      groupListeners: [{ id: "g1", target: "美国中转", port: 7891 }],
+    });
+  });
+
+  it("shows the bound port for the named group", () => {
+    const markup = renderToStaticMarkup(React.createElement(GroupListenerPortBadge, { name: "美国中转" }));
+    expect(markup).toContain(":7891");
+  });
+
+  it("renders nothing for groups without a binding", () => {
+    const markup = renderToStaticMarkup(React.createElement(GroupListenerPortBadge, { name: "别的组" }));
+    expect(markup).toBe("");
+  });
+});
diff --git a/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-group-listeners.tsx b/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-group-listeners.tsx
new file mode 100644
index 0000000..c025bcd
--- /dev/null
+++ b/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-group-listeners.tsx
@@ -0,0 +1,435 @@
+"use client";
+
+import * as React from "react";
+import { ChevronDown, ChevronRight, Plus, Trash2 } from "lucide-react";
+import { Badge } from "@subboost/ui/components/ui/badge";
+import { Button } from "@subboost/ui/components/ui/button";
+import { Input } from "@subboost/ui/components/ui/input";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@subboost/ui/components/ui/select";
+import { confirmDialog } from "@subboost/ui/components/ui/confirm-dialog";
+import { cn } from "@subboost/ui/lib/utils";
+import { PROXY_GROUP_MODULES, generateProxyGroups } from "@subboost/core/generator/proxy-groups";
+import { resolveProxyGroupModuleName } from "@subboost/core/proxy-group-name";
+import { useConfigStore } from "@subboost/ui/store/config-store";
+import { buildManualRuleTargets } from "./proxy-group-rule-targets";
+import { buildProviderGroupInfo } from "./provider-group-plan";
+
+// 与「节点管理」区的监听端口警告共用同一 key（写同名字面量，不 import 该文件）：
+// 任一侧确认过公网暴露警告，另一侧不再重复弹出。
+const LISTENER_PORT_WARNING_STORAGE_KEY = "subboost.listenerPortWarningAccepted";
+
+function hasAcceptedListenerPortWarning(): boolean {
+  if (typeof window === "undefined") return false;
+  try {
+    return window.localStorage.getItem(LISTENER_PORT_WARNING_STORAGE_KEY) === "1";
+  } catch {
+    return false;
+  }
+}
+
+function rememberListenerPortWarningAccepted() {
+  if (typeof window === "undefined") return;
+  try {
+    window.localStorage.setItem(LISTENER_PORT_WARNING_STORAGE_KEY, "1");
+  } catch {
+    // ignore
+  }
+}
+
+function isValidListenerPort(port: unknown): port is number {
+  return typeof port === "number" && Number.isInteger(port) && port >= 1 && port <= 65535;
+}
+
+/**
+ * 组卡片头部的监听端口徽标：该组绑定了分组监听时显示 ":端口"。
+ * 自读 store，插入点无需透传任何 props。
+ */
+export function GroupListenerPortBadge({ name, className }: { name: string; className?: string }) {
+  const groupListeners = useConfigStore((state) => state.groupListeners);
+  const port = React.useMemo(() => {
+    const hit = groupListeners.find((binding) => binding.target === name && isValidListenerPort(binding.port));
+    return hit?.port;
+  }, [groupListeners, name]);
+
+  if (port === undefined) return null;
+  return (
+    <Badge
+      variant="outline"
+      className={cn("shrink-0 border-indigo-500/40 bg-indigo-500/10 text-[10px] text-indigo-300", className)}
+      title={`分组监听端口 ${port}`}
+    >
+      :{port}
+    </Badge>
+  );
+}
+
+export function ProxyGroupsGroupListeners() {
+  const {
+    groupListeners,
+    addGroupListener,
+    updateGroupListener,
+    removeGroupListener,
+    enabledProxyGroups,
+    hiddenProxyGroups,
+    customProxyGroups,
+    proxyGroupNameOverrides,
+    dialerProxyGroups,
+    sources,
+    nodes,
+    testUrl,
+    testInterval,
+    listenerPorts,
+    mixedPort,
+    ruleProviderBaseUrl,
+    customRuleSets,
+    proxyGroupAdvanced,
+    builtinRuleEdits,
+    proxyGroupOrder,
+  } = useConfigStore();
+
+  const hasBindings = groupListeners.length > 0;
+  const [isExpanded, setIsExpanded] = React.useState(() => hasBindings);
+  React.useEffect(() => {
+    if (hasBindings) setIsExpanded(true);
+  }, [hasBindings]);
+
+  // 可绑定目标 = 内置模块组（改名后）+ 自定义分组 + 启用的中转组 + provider 机场组
+  const manualTargets = React.useMemo(
+    () =>
+      buildManualRuleTargets({
+        enabledProxyGroups,
+        hiddenProxyGroups,
+        customProxyGroups,
+        proxyGroupNameOverrides,
+      }),
+    [enabledProxyGroups, hiddenProxyGroups, customProxyGroups, proxyGroupNameOverrides],
+  );
+  const providerGroupNames = React.useMemo(
+    () =>
+      buildProviderGroupInfo(sources, {
+        nodes,
+        proxyGroupNameOverrides,
+        customProxyGroups,
+        dialerProxyGroups,
+        testUrl,
+        testInterval,
+      }).names,
+    [sources, testUrl, testInterval, nodes, proxyGroupNameOverrides, customProxyGroups, dialerProxyGroups],
+  );
+  const targetGroupNames = React.useMemo(() => {
+    // 可绑定目标集合 = 内置模块组（改名后）+ 自定义分组 + 启用的中转组 + provider 机场组
+    const validNames = new Set<string>();
+    for (const target of manualTargets) validNames.add(target.name);
+    for (const group of dialerProxyGroups) {
+      if (!group || group.enabled === false) continue;
+      if (typeof group.name === "string" && group.name.trim()) validNames.add(group.name.trim());
+    }
+    for (const name of providerGroupNames) validNames.add(name);
+
+    // 展示顺序对齐生成 YAML 的最终组序（与可视化预览同一套镜像逻辑）：
+    // generateProxyGroups 基础序 → 机场组+中转组插到「⚡ 自动选择」之后 → proxyGroupOrder 拖拽重排
+    const generated = generateProxyGroups({
+      nodes,
+      enabledModules: enabledProxyGroups,
+      ruleProviderBaseUrl,
+      testUrl,
+      testInterval,
+      customProxyGroups,
+      customRuleSets,
+      proxyGroupAdvanced,
+      builtinRuleEdits,
+      proxyGroupNameOverrides,
+    });
+    const moduleIdByName = new Map(
+      PROXY_GROUP_MODULES.map((module) => [
+        resolveProxyGroupModuleName(module, proxyGroupNameOverrides?.[module.id]),
+        module.id,
+      ]),
+    );
+    const customIdByName = new Map(
+      customProxyGroups
+        .filter((group) => group?.id && typeof group.name === "string" && group.name.trim())
+        .map((group) => [group.name.trim(), group.id]),
+    );
+    type OrderEntry = { key: string; name: string };
+    const base: OrderEntry[] = [];
+    for (const group of generated) {
+      const name = typeof group.name === "string" ? group.name.trim() : "";
+      if (!name) continue;
+      const moduleId = moduleIdByName.get(name);
+      const customId = customIdByName.get(name);
+      base.push({ key: moduleId ? `module:${moduleId}` : customId ? `custom:${customId}` : `name:${name}`, name });
+    }
+    const extras: OrderEntry[] = [
+      ...providerGroupNames.map((name) => ({ key: `name:${name}`, name })),
+      ...dialerProxyGroups
+        .filter((group) => group && group.enabled !== false && typeof group.name === "string" && group.name.trim())
+        .map((group) => ({ key: `dialer:${group.id}`, name: group.name.trim() })),
+    ];
+    const autoIndex = base.findIndex((entry) => entry.key === "module:auto");
+    const insertAt = autoIndex >= 0 ? autoIndex + 1 : Math.min(2, base.length);
+    const merged = extras.length > 0 ? [...base.slice(0, insertAt), ...extras, ...base.slice(insertAt)] : base;
+
+    const byKey = new Map<string, OrderEntry>();
+    const defaultKeys: string[] = [];
+    for (const entry of merged) {
+      if (byKey.has(entry.key)) continue;
+      byKey.set(entry.key, entry);
+      defaultKeys.push(entry.key);
+    }
+    const orderKeys = proxyGroupOrder
+      .filter((key) => typeof key === "string" && Boolean(key.trim()))
+      .map((key) => key.trim());
+    const nextKeys: string[] = [];
+    const used = new Set<string>();
+    for (const key of orderKeys) {
+      if (used.has(key) || !byKey.has(key)) continue;
+      used.add(key);
+      nextKeys.push(key);
+    }
+    for (const key of defaultKeys) {
+      if (used.has(key)) continue;
+      used.add(key);
+      nextKeys.push(key);
+    }
+
+    const seen = new Set<string>();
+    const names: string[] = [];
+    for (const key of nextKeys) {
+      const name = byKey.get(key)?.name ?? "";
+      if (!name || seen.has(name) || !validNames.has(name)) continue;
+      seen.add(name);
+      names.push(name);
+    }
+    // 兜底：有效目标若未出现在生成序中（异常场景），仍保持可选
+    for (const name of validNames) {
+      if (seen.has(name)) continue;
+      seen.add(name);
+      names.push(name);
+    }
+    return names;
+  }, [
+    manualTargets,
+    dialerProxyGroups,
+    providerGroupNames,
+    nodes,
+    enabledProxyGroups,
+    ruleProviderBaseUrl,
+    testUrl,
+    testInterval,
+    customProxyGroups,
+    customRuleSets,
+    proxyGroupAdvanced,
+    builtinRuleEdits,
+    proxyGroupNameOverrides,
+    proxyGroupOrder,
+  ]);
+
+  const [portDrafts, setPortDrafts] = React.useState<Record<string, string>>({});
+  const [portFormatErrors, setPortFormatErrors] = React.useState<Record<string, string>>({});
+
+  const nodeListenerPortSet = React.useMemo(
+    () => new Set(Object.values(listenerPorts).filter((port) => isValidListenerPort(port))),
+    [listenerPorts],
+  );
+
+  const conflictMessageFor = React.useCallback(
+    (id: string, port: number): string | null => {
+      if (!isValidListenerPort(port)) return null;
+      if (port === mixedPort) return `与 mixed-port（${mixedPort}）冲突`;
+      if (nodeListenerPortSet.has(port)) return "与节点监听端口冲突";
+      const other = groupListeners.find((binding) => binding.id !== id && binding.port === port);
+      if (other) return `与「${other.target || "未选择分组"}」冲突`;
+      return null;
+    },
+    [groupListeners, mixedPort, nodeListenerPortSet],
+  );
+
+  const handlePortChange = (id: string, raw: string) => {
+    setPortDrafts((prev) => ({ ...prev, [id]: raw }));
+    const trimmed = raw.trim();
+    const port = Number(trimmed);
+    if (trimmed === "" || !Number.isInteger(port) || port < 1 || port > 65535) {
+      setPortFormatErrors((prev) => ({ ...prev, [id]: "端口需为 1-65535 的整数" }));
+      return;
+    }
+    setPortFormatErrors((prev) => {
+      if (!(id in prev)) return prev;
+      const next = { ...prev };
+      delete next[id];
+      return next;
+    });
+    updateGroupListener(id, { port });
+  };
+
+  const portValueOf = (id: string, port: number) =>
+    Object.prototype.hasOwnProperty.call(portDrafts, id)
+      ? portDrafts[id]
+      : isValidListenerPort(port)
+        ? String(port)
+        : "";
+
+  const handleRemove = (id: string) => {
+    removeGroupListener(id);
+    setPortDrafts((prev) => {
+      if (!(id in prev)) return prev;
+      const next = { ...prev };
+      delete next[id];
+      return next;
+    });
+    setPortFormatErrors((prev) => {
+      if (!(id in prev)) return prev;
+      const next = { ...prev };
+      delete next[id];
+      return next;
+    });
+  };
+
+  const handleAdd = React.useCallback(async () => {
+    if (!hasAcceptedListenerPortWarning()) {
+      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>
+            <span className="mt-3 block leading-6 text-white/65">
+              如果你不清楚安全风险及规避方法，请不要开启。
+            </span>
+          </span>
+        ),
+        cancelText: "取消",
+        confirmText: "我已了解，开启",
+        variant: "warning",
+      });
+      if (!ok) return;
+      rememberListenerPortWarningAccepted();
+    }
+    addGroupListener();
+    setIsExpanded(true);
+  }, [addGroupListener]);
+
+  return (
+    <div className="overflow-hidden rounded-lg border border-white/10">
+      <button
+        type="button"
+        onClick={() => setIsExpanded((value) => !value)}
+        className="flex w-full items-center gap-2 bg-white/5 px-2 py-1.5 transition-colors hover:bg-white/10"
+      >
+        {isExpanded ? (
+          <ChevronDown className="h-3.5 w-3.5 text-white/50" />
+        ) : (
+          <ChevronRight className="h-3.5 w-3.5 text-white/50" />
+        )}
+        <span className="text-xs font-medium text-white">分组监听管理</span>
+        <Badge
+          variant="outline"
+          className={cn(
+            "ml-auto text-[10px]",
+            hasBindings
+              ? "border-indigo-500/50 bg-indigo-500/10 text-indigo-300"
+              : "border-white/15 bg-white/5 text-white/60",
+          )}
+        >
+          {hasBindings ? `${groupListeners.length} 条` : "可选"}
+        </Badge>
+      </button>
+
+      {isExpanded && (
+        <div className="space-y-1 p-2">
+          <div className="text-[10px] leading-relaxed text-white/35">
+            为已存在的策略组生成本地 mixed 入站（listeners：proxy 绑定组名、listen 0.0.0.0、UDP 开启）；端口不可与
+            mixed-port、节点监听端口重复。
+          </div>
+
+          {groupListeners.length === 0 ? (
+            <div className="py-4 text-center text-xs text-white/40">暂无分组监听，点击下方添加</div>
+          ) : (
+            <div className="space-y-1">
+              {groupListeners.map((binding) => {
+                const boundByOthers = new Set(
+                  groupListeners
+                    .filter((item) => item.id !== binding.id)
+                    .map((item) => item.target)
+                    .filter(Boolean),
+                );
+                const targetMissing = Boolean(binding.target) && !targetGroupNames.includes(binding.target);
+                const errorText = portFormatErrors[binding.id] ?? conflictMessageFor(binding.id, binding.port);
+                return (
+                  <div key={binding.id} className="space-y-0.5">
+                    <div className="flex items-center gap-2">
+                      <Select
+                        value={binding.target || undefined}
+                        onValueChange={(value) => updateGroupListener(binding.id, { target: value })}
+                      >
+                        <SelectTrigger
+                          className={cn(
+                            "h-7 min-w-0 flex-1 text-xs",
+                            targetMissing && "border-red-500/40 text-red-300",
+                          )}
+                        >
+                          <SelectValue placeholder="选择策略组..." />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {targetMissing && (
+                            <SelectItem value={binding.target} className="text-red-300">
+                              {binding.target}（已不存在）
+                            </SelectItem>
+                          )}
+                          {targetGroupNames.map((name) => (
+                            <SelectItem key={name} value={name} disabled={boundByOthers.has(name)}>
+                              {name}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                      <Input
+                        value={portValueOf(binding.id, binding.port)}
+                        onChange={(event) => handlePortChange(binding.id, event.target.value)}
+                        inputMode="numeric"
+                        placeholder="7891"
+                        title={errorText || "本地 inbound 监听端口"}
+                        className={cn(
+                          "h-7 w-24 shrink-0 border-white/10 bg-white/5 text-xs",
+                          errorText && "border-red-500/40 focus:border-red-500/50",
+                        )}
+                      />
+                      <Button
+                        type="button"
+                        variant="ghost"
+                        size="sm"
+                        onClick={() => handleRemove(binding.id)}
+                        className="h-7 w-7 shrink-0 px-0 text-white/30 hover:text-red-400"
+                        title="删除"
+                      >
+                        <Trash2 className="h-3.5 w-3.5" />
+                      </Button>
+                    </div>
+                    {errorText && <div className="pl-1 text-[10px] text-red-400">{errorText}</div>}
+                  </div>
+                );
+              })}
+            </div>
+          )}
+
+          <Button
+            variant="outline"
+            size="sm"
+            className="h-7 w-full border-dashed border-white/20 text-xs text-white/50 hover:border-white/30 hover:text-white/70"
+            onClick={() => void handleAdd()}
+          >
+            <Plus className="mr-1 h-3.5 w-3.5" />
+            添加分组监听
+          </Button>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-module-card.test.ts b/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-module-card.test.ts
index 0f4e0ac..143f7df 100644
--- a/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-module-card.test.ts
+++ b/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-module-card.test.ts
@@ -70,6 +70,10 @@ vi.mock("./proxy-groups-module-rules-panel", () => ({
     return React.createElement("div", null, "rules-panel");
   },
 }));
+vi.mock("./proxy-groups-group-listeners", () => ({
+  GroupListenerPortBadge: () => null,
+  ProxyGroupsGroupListeners: () => null,
+}));
 
 import { ProxyGroupsModuleCard } from "./proxy-groups-module-card";
 
diff --git a/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-module-card.tsx b/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-module-card.tsx
index cc08d63..f304f36 100644
--- a/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-module-card.tsx
+++ b/packages/ui/src/product/converter/advanced-mode/sections/proxy-groups-module-card.tsx
@@ -26,6 +26,7 @@ import {
   ProxyGroupNameEditor,
 } from "./proxy-group-name-editor";
 import { ProxyGroupSummary } from "./proxy-group-summary";
+import { GroupListenerPortBadge } from "./proxy-groups-group-listeners";
 import {
   ProxyGroupTypeMenu,
   getLoadBalanceStrategyLabel,
@@ -331,6 +332,7 @@ export function ProxyGroupsModuleCard({
                 <span className="min-w-0 break-words text-sm font-medium text-white">
                   {display.full}
                 </span>
+                <GroupListenerPortBadge name={display.full} />
                 <div className="flex shrink-0 items-center gap-1">
                   {!isCore && (
                     <Button
diff --git a/packages/ui/src/product/converter/provider-mode-status-bar.test.ts b/packages/ui/src/product/converter/provider-mode-status-bar.test.ts
new file mode 100644
index 0000000..cf31743
--- /dev/null
+++ b/packages/ui/src/product/converter/provider-mode-status-bar.test.ts
@@ -0,0 +1,95 @@
+import * as React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const mocks = vi.hoisted(() => ({
+  switches: [] as any[],
+  providerSettings: [] as any[],
+}));
+
+vi.mock("@radix-ui/react-popover", () => ({
+  Arrow: () => React.createElement("span", null, "arrow"),
+  Content: (props: any) => React.createElement("div", props, props.children),
+  Portal: (props: any) => React.createElement("div", null, props.children),
+  Root: (props: any) => React.createElement("div", null, props.children),
+  Trigger: (props: any) => React.createElement("div", null, props.children),
+}));
+vi.mock("lucide-react", () => ({
+  HelpCircle: () => React.createElement("span", null, "help-icon"),
+}));
+vi.mock("@subboost/ui/components/ui/switch", () => ({
+  Switch: (props: any) => {
+    mocks.switches.push(props);
+    return React.createElement("input", { type: "checkbox", checked: props.checked, onChange: props.onCheckedChange });
+  },
+}));
+vi.mock("./provider-settings-fields", () => ({
+  ProviderSettingsFields: (props: any) => {
+    mocks.providerSettings.push(props);
+    return React.createElement("div", null, "provider-settings-fields");
+  },
+}));
+
+import { ProviderModeStatusBar } from "./provider-mode-status-bar";
+
+const baseSource = {
+  id: "s1",
+  type: "url",
+  content: "https://example.com/sub",
+} as any;
+
+function renderBar(sourceOverrides: Record<string, unknown> = {}, props: Record<string, unknown> = {}) {
+  mocks.switches = [];
+  mocks.providerSettings = [];
+  const handlers = {
+    source: { ...baseSource, ...sourceOverrides },
+    defaultProviderKey: "url_s1",
+    onCheckedChange: vi.fn(),
+    onUpdateMeta: vi.fn(),
+    ...props,
+  };
+  const html = renderToStaticMarkup(React.createElement(ProviderModeStatusBar, handlers as any));
+  return { html, handlers };
+}
+
+describe("ProviderModeStatusBar", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it("renders the embedded bar with the proxy-providers help copy", () => {
+    const { html } = renderBar({}, { className: "custom-bar-class" });
+
+    expect(html).toContain("proxy-providers模式");
+    expect(html).toContain("proxy-providers 模式");
+    expect(html).toContain("交由客户端自行拉取节点");
+    expect(html).toContain("custom-bar-class");
+    expect(html).toContain("border-t");
+    expect(mocks.switches[0]).toEqual(expect.objectContaining({ checked: false }));
+    // 关闭时不渲染右侧设置区
+    expect(mocks.providerSettings).toEqual([]);
+    expect(html).not.toContain("provider-settings-fields");
+  });
+
+  it("forwards switch changes as booleans", () => {
+    const { handlers } = renderBar();
+
+    mocks.switches[0].onCheckedChange(true);
+    expect(handlers.onCheckedChange).toHaveBeenCalledWith(true);
+    mocks.switches[0].onCheckedChange(false);
+    expect(handlers.onCheckedChange).toHaveBeenCalledWith(false);
+  });
+
+  it("shows provider settings on the right side when enabled", () => {
+    const { html, handlers } = renderBar({ useProxyProviders: true, providerMode: "grouped" });
+
+    expect(html).toContain("provider-settings-fields");
+    expect(mocks.providerSettings[0]).toEqual(
+      expect.objectContaining({
+        source: expect.objectContaining({ id: "s1", providerMode: "grouped" }),
+        defaultProviderKey: "url_s1",
+        onUpdateMeta: handlers.onUpdateMeta,
+      })
+    );
+  });
+});
diff --git a/packages/ui/src/product/converter/provider-mode-status-bar.tsx b/packages/ui/src/product/converter/provider-mode-status-bar.tsx
new file mode 100644
index 0000000..1dc5282
--- /dev/null
+++ b/packages/ui/src/product/converter/provider-mode-status-bar.tsx
@@ -0,0 +1,103 @@
+"use client";
+
+import * as React from "react";
+import * as Popover from "@radix-ui/react-popover";
+import { HelpCircle } from "lucide-react";
+import { Switch } from "@subboost/ui/components/ui/switch";
+import { cn } from "@subboost/ui/lib/utils";
+import type { SubscriptionSource } from "@subboost/ui/store/config-store";
+import { ProviderSettingsFields } from "./provider-settings-fields";
+
+/**
+ * proxy-providers 模式状态栏：url 订阅源编辑框底部内嵌的一条状态栏。
+ * 左右水平布局——左块为「proxy-providers模式 + 说明 + 开关」，
+ * 开启后右侧显示接入方式/key/组名等设置（空间不足时自动换行）。
+ */
+export function ProviderModeStatusBar({
+  source,
+  defaultProviderKey,
+  onCheckedChange,
+  onUpdateMeta,
+  className,
+}: {
+  source: SubscriptionSource;
+  defaultProviderKey: string;
+  onCheckedChange: (checked: boolean) => void;
+  onUpdateMeta: (id: string, patch: Partial<SubscriptionSource>) => void;
+  className?: string;
+}) {
+  const checked = Boolean(source.useProxyProviders);
+
+  return (
+    <div
+      className={cn(
+        // 固定 h-9(36px)：内部控件垂直居中，保证 provider 开/关两态状态栏同高（关闭时最高子元素 20px、
+        // 开启时接入方式按钮组约 25px，若靠内容撑高会差 6px）；相比最初 h-7 上下间距各 +4px，不挤压控件
+        "flex h-9 flex-none flex-nowrap items-center gap-x-3 overflow-x-auto border-t border-white/10 bg-white/5 px-3",
+        "[scrollbar-width:none] [&::-webkit-scrollbar]:hidden",
+        className,
+      )}
+    >
+      <div className="flex flex-none items-center gap-2">
+        <span className="text-xs text-white/60 whitespace-nowrap">proxy-providers模式</span>
+        <Popover.Root>
+          <Popover.Trigger asChild>
+            <button
+              type="button"
+              className="inline-flex h-5 w-5 flex-none items-center justify-center rounded-full border border-white/10 bg-white/5 text-white/40 transition-colors hover:bg-white/10 hover:text-white/80 focus:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500/50 focus-visible:ring-offset-2 focus-visible:ring-offset-black"
+              aria-label="proxy-providers 模式说明"
+              title="proxy-providers 模式说明"
+            >
+              <HelpCircle className="h-3 w-3" />
+            </button>
+          </Popover.Trigger>
+          <Popover.Portal>
+            <Popover.Content
+              side="bottom"
+              align="start"
+              sideOffset={8}
+              className="z-50 w-[360px] rounded-xl border border-white/10 bg-black/90 backdrop-blur-md shadow-2xl p-3"
+            >
+              <div className="space-y-2 text-xs">
+                <div className="flex items-center gap-2">
+                  <HelpCircle className="h-4 w-4 text-amber-300" />
+                  <div className="text-white font-medium">proxy-providers 模式</div>
+                </div>
+                <div className="text-white/60 leading-relaxed">
+                  部分订阅限制 CN IP 导入，url 无法在 SubBoost 内拉取解析。开启后 SubBoost
+                  不再拉取/解析该 url，而是在最终配置中写入{" "}
+                  <span className="font-mono">proxy-providers</span>，交由客户端自行拉取节点。
+                </div>
+                <div className="pt-2 border-t border-white/10 text-white/60 space-y-1">
+                  <div className="font-medium text-white/80">注意开启后：</div>
+                  <ul className="ml-4 list-disc space-y-1">
+                    <li>无法在预览中查看/管理该 url 的节点</li>
+                    <li>无法将这些节点用于中转代理组、分流组高级模式等高级功能</li>
+                    <li>节点命名模板与 tag 在该模式下不生效</li>
+                  </ul>
+                </div>
+                <div className="pt-2 border-t border-white/10 text-[10px] text-white/40">
+                  若导入 url 报“未解析到有效节点/获取失败”等，可尝试开启此模式。
+                </div>
+              </div>
+              <Popover.Arrow className="fill-white/10" />
+            </Popover.Content>
+          </Popover.Portal>
+        </Popover.Root>
+        <Switch
+          checked={checked}
+          onCheckedChange={(value) => onCheckedChange(Boolean(value))}
+        />
+      </div>
+
+      {checked && (
+        <ProviderSettingsFields
+          source={source}
+          defaultProviderKey={defaultProviderKey}
+          onUpdateMeta={onUpdateMeta}
+          className="flex-1 flex-nowrap"
+        />
+      )}
+    </div>
+  );
+}
diff --git a/packages/ui/src/product/converter/provider-settings-fields.test.ts b/packages/ui/src/product/converter/provider-settings-fields.test.ts
new file mode 100644
index 0000000..2a8025c
--- /dev/null
+++ b/packages/ui/src/product/converter/provider-settings-fields.test.ts
@@ -0,0 +1,140 @@
+import * as React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const mocks = vi.hoisted(() => ({
+  inputs: [] as any[],
+  menuItems: [] as any[],
+}));
+
+vi.mock("lucide-react", () => ({
+  ChevronDown: () => React.createElement("span", null, "chevron-down"),
+  Shuffle: () => React.createElement("span", null, "shuffle-icon"),
+}));
+vi.mock("@subboost/ui/components/ui/input", () => ({
+  Input: (props: any) => {
+    mocks.inputs.push(props);
+    return React.createElement("input", props);
+  },
+}));
+vi.mock("@subboost/ui/components/ui/dropdown-menu", () => ({
+  DropdownMenu: (props: any) => React.createElement("div", null, props.children),
+  DropdownMenuContent: (props: any) => React.createElement("div", null, props.children),
+  DropdownMenuItem: (props: any) => {
+    mocks.menuItems.push(props);
+    return React.createElement("div", null, props.children);
+  },
+  DropdownMenuTrigger: (props: any) => React.createElement("div", null, props.children),
+}));
+vi.mock("@subboost/ui/product/converter/advanced-mode/sections/proxy-group-name-editor", () => ({
+  PROXY_GROUP_EMOJI_LIBRARY: ["✈️", "🚀", "🧩"],
+  pickRandomEmoji: () => "🎲",
+  parseProxyGroupNameDraft: (raw: string, fallbackEmoji = "🧩") => {
+    const match = typeof raw === "string" ? raw.match(/^(\S+)\s+(.*)$/) : null;
+    if (match) return { emoji: match[1], name: match[2] };
+    return { emoji: fallbackEmoji, name: (raw ?? "").trim() };
+  },
+  buildProxyGroupName: (draft: any) => {
+    const name = (draft?.name ?? "").trim();
+    const emoji = (draft?.emoji ?? "").trim();
+    if (!name) return "";
+    return emoji ? `${emoji} ${name}` : name;
+  },
+}));
+
+import {
+  PROVIDER_GROUP_DEFAULT_EMOJI,
+  PROVIDER_MODE_OPTIONS,
+  ProviderSettingsFields,
+  resolveProviderMode,
+} from "./provider-settings-fields";
+import { DEFAULT_PROXY_PROVIDER_FILTER } from "@subboost/core/subscription/proxy-providers";
+
+const baseSource = { id: "s1" } as any;
+
+function renderFields(sourceOverrides: Record<string, unknown> = {}, props: Record<string, unknown> = {}) {
+  mocks.inputs = [];
+  mocks.menuItems = [];
+  const onUpdateMeta = vi.fn();
+  const html = renderToStaticMarkup(
+    React.createElement(ProviderSettingsFields, {
+      source: { ...baseSource, ...sourceOverrides },
+      defaultProviderKey: "url_s1",
+      onUpdateMeta,
+      ...props,
+    })
+  );
+  return { html, onUpdateMeta };
+}
+
+describe("ProviderSettingsFields", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it("resolves legacy sources without providerMode as inline", () => {
+    expect(resolveProviderMode({ id: "s1" } as any)).toBe("inline");
+    expect(resolveProviderMode({ id: "s1", providerMode: "grouped" } as any)).toBe("grouped");
+    expect(resolveProviderMode({ id: "s1", providerMode: "bare" } as any)).toBe("bare");
+  });
+
+  it("renders mode options and forwards mode changes", () => {
+    const { html, onUpdateMeta } = renderFields({ providerMode: "grouped" });
+
+    for (const option of PROVIDER_MODE_OPTIONS) {
+      expect(html).toContain(option.label);
+    }
+
+    const keyInput = mocks.inputs.find((props: any) => props.placeholder === "url_s1");
+    keyInput.onChange({ target: { value: "my_airport" } });
+    expect(onUpdateMeta).toHaveBeenCalledWith("s1", { providerKey: "my_airport" });
+  });
+
+  it("merges the emoji picker and group name into a single edit box (grouped mode only)", () => {
+    const grouped = renderFields({ providerMode: "grouped", providerGroupName: "" });
+
+    // 默认 emoji ✈️ 显示在合并编辑框左侧的选择按钮上
+    expect(grouped.html).toContain(PROVIDER_GROUP_DEFAULT_EMOJI);
+    expect(grouped.html).toContain("选择 emoji");
+    // 名称输入是同一容器内的无边框输入（border-l 分隔）
+    const nameInput = mocks.inputs.find((props: any) => props.placeholder === "xx机场");
+    expect(String(nameInput.className)).toContain("border-l");
+    // emoji 拼进组名（上游惯例）
+    nameInput.onChange({ target: { value: "测试机场" } });
+    expect(grouped.onUpdateMeta).toHaveBeenCalledWith("s1", {
+      providerGroupName: `${PROVIDER_GROUP_DEFAULT_EMOJI} 测试机场`,
+    });
+
+    const inline = renderFields({ providerMode: "inline" });
+    expect(mocks.inputs.find((props: any) => props.placeholder === "xx机场")).toBeUndefined();
+    expect(inline.html).not.toContain("组名:");
+  });
+
+  it("commits emoji selections from the embedded dropdown", () => {
+    const { onUpdateMeta } = renderFields({ providerMode: "grouped", providerGroupName: "✈️ 机场A" });
+
+    const rocketItem = mocks.menuItems.find((props: any) => props.children === "🚀");
+    rocketItem.onClick();
+    expect(onUpdateMeta).toHaveBeenCalledWith("s1", { providerGroupName: "🚀 机场A" });
+
+    const shuffleItem = mocks.menuItems.find((props: any) => props.title === "随机 emoji");
+    shuffleItem.onClick();
+    expect(onUpdateMeta).toHaveBeenCalledWith("s1", { providerGroupName: "🎲 机场A" });
+  });
+
+  it("shows the filter editor only when requested and keeps the default regex visible", () => {
+    const withoutFilter = renderFields({ providerMode: "grouped" });
+    expect(withoutFilter.html).not.toContain("filter:");
+
+    const { onUpdateMeta } = renderFields({ providerMode: "grouped" }, { showFilter: true });
+    const filterInput = mocks.inputs.find((props: any) => props.placeholder === DEFAULT_PROXY_PROVIDER_FILTER);
+    // 未设置时编辑框显示默认正则（与生成层一致）
+    expect(filterInput).toEqual(expect.objectContaining({ value: DEFAULT_PROXY_PROVIDER_FILTER }));
+    filterInput.onChange({ target: { value: "(?i)hk" } });
+    expect(onUpdateMeta).toHaveBeenCalledWith("s1", { providerFilter: "(?i)hk" });
+
+    renderFields({ providerMode: "grouped", providerFilter: "" }, { showFilter: true });
+    const clearedInput = mocks.inputs.find((props: any) => props.placeholder === DEFAULT_PROXY_PROVIDER_FILTER);
+    expect(clearedInput).toEqual(expect.objectContaining({ value: "" }));
+  });
+});
diff --git a/packages/ui/src/product/converter/provider-settings-fields.tsx b/packages/ui/src/product/converter/provider-settings-fields.tsx
new file mode 100644
index 0000000..b557c27
--- /dev/null
+++ b/packages/ui/src/product/converter/provider-settings-fields.tsx
@@ -0,0 +1,189 @@
+"use client";
+
+import * as React from "react";
+import { ChevronDown, Shuffle } from "lucide-react";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@subboost/ui/components/ui/dropdown-menu";
+import { Input } from "@subboost/ui/components/ui/input";
+import { cn } from "@subboost/ui/lib/utils";
+import { DEFAULT_PROXY_PROVIDER_FILTER } from "@subboost/core/subscription/proxy-providers";
+import type { SubscriptionSource } from "@subboost/ui/store/config-store";
+import {
+  buildProxyGroupName,
+  parseProxyGroupNameDraft,
+  pickRandomEmoji,
+  PROXY_GROUP_EMOJI_LIBRARY,
+} from "@subboost/ui/product/converter/advanced-mode/sections/proxy-group-name-editor";
+
+/**
+ * proxy-providers 模式的设置字段（接入模式三选 + key + 组名/emoji [+ filter]）。
+ * 主界面状态栏与高级编辑对话框的 provider 设置区共用，都读写同一 source 字段。
+ * 组名编辑框：emoji 选择器与名称输入合并在同一个边框容器内（emoji 拼进组名前缀）。
+ */
+
+export const PROVIDER_MODE_OPTIONS: Array<{
+  value: "grouped" | "inline" | "bare";
+  label: string;
+  title: string;
+}> = [
+  { value: "grouped", label: "分组", title: "生成机场组并加入各分流组候选" },
+  { value: "inline", label: "内嵌", title: "provider 节点直接注入所有策略组（旧行为）" },
+  { value: "bare", label: "仅生成", title: "只写入 proxy-providers，不挂接任何策略组" },
+];
+
+// 机场组默认 emoji（与 core 生成回落一致）
+export const PROVIDER_GROUP_DEFAULT_EMOJI = "✈️";
+
+type ProviderSettingsSource = Pick<
+  SubscriptionSource,
+  "id" | "providerKey" | "providerMode" | "providerGroupName" | "providerFilter"
+>;
+
+export function resolveProviderMode(source: ProviderSettingsSource): "grouped" | "inline" | "bare" {
+  // 旧数据无 providerMode 按内嵌处理（与生成层一致）
+  return source.providerMode === "grouped" || source.providerMode === "bare" ? source.providerMode : "inline";
+}
+
+export function ProviderSettingsFields({
+  source,
+  defaultProviderKey,
+  onUpdateMeta,
+  showFilter = false,
+  className,
+}: {
+  source: ProviderSettingsSource;
+  defaultProviderKey: string;
+  onUpdateMeta: (id: string, patch: Partial<SubscriptionSource>) => void;
+  // filter 编辑框仅在高级编辑对话框的 provider 设置区展示（状态栏空间有限）
+  showFilter?: boolean;
+  className?: string;
+}) {
+  const mode = resolveProviderMode(source);
+  const groupNameDraft = parseProxyGroupNameDraft(source.providerGroupName ?? "", PROVIDER_GROUP_DEFAULT_EMOJI);
+  // 组名为空时 buildProxyGroupName 返回空串，选中的 emoji 无处落盘——用本地态记住，等名字键入后一起写入
+  const [draftEmoji, setDraftEmoji] = React.useState<string | null>(null);
+  const [emojiQuery, setEmojiQuery] = React.useState("");
+  const emoji = (draftEmoji ?? groupNameDraft.emoji) || PROVIDER_GROUP_DEFAULT_EMOJI;
+  const filteredEmojis = React.useMemo(() => {
+    const keyword = emojiQuery.trim();
+    if (!keyword) return PROXY_GROUP_EMOJI_LIBRARY;
+    return PROXY_GROUP_EMOJI_LIBRARY.filter((item) => item.includes(keyword));
+  }, [emojiQuery]);
+
+  const commitGroupName = (nextEmoji: string, nextName: string) => {
+    setDraftEmoji(nextEmoji);
+    onUpdateMeta(source.id, { providerGroupName: buildProxyGroupName({ emoji: nextEmoji, name: nextName }) });
+  };
+
+  return (
+    <div className={cn("flex min-w-0 flex-wrap items-center gap-x-3 gap-y-1.5", className)}>
+      <div
+        role="radiogroup"
+        aria-label="provider 接入方式"
+        className="inline-flex flex-none items-center rounded-md border border-white/10 bg-white/5 p-0.5"
+      >
+        {PROVIDER_MODE_OPTIONS.map((option) => (
+          <button
+            key={option.value}
+            type="button"
+            role="radio"
+            aria-checked={mode === option.value}
+            onClick={() => onUpdateMeta(source.id, { providerMode: option.value })}
+            className={cn(
+              "px-2 py-0.5 rounded text-[10px] whitespace-nowrap transition-colors",
+              mode === option.value
+                ? "bg-indigo-500/20 text-indigo-300"
+                : "text-white/40 hover:text-white/60 hover:bg-white/5"
+            )}
+            title={option.title}
+          >
+            {option.label}
+          </button>
+        ))}
+      </div>
+
+      <div className="ml-auto flex flex-none items-center justify-end gap-x-3">
+        <div className="flex flex-none items-center gap-1.5">
+          <span className="text-xs text-white/50 whitespace-nowrap">key:</span>
+          <Input
+            value={source.providerKey ?? ""}
+            onChange={(e) => onUpdateMeta(source.id, { providerKey: e.target.value })}
+            placeholder={defaultProviderKey}
+            className="h-6 w-[130px] rounded-md px-2 text-xs"
+          />
+        </div>
+
+        {mode === "grouped" && (
+          <div className="flex flex-none items-center gap-1.5">
+            <span className="text-xs text-white/50 whitespace-nowrap">组名:</span>
+            <div className="flex items-center overflow-hidden rounded-md border border-white/10 bg-white/5 transition-all duration-200 focus-within:border-indigo-500 focus-within:ring-2 focus-within:ring-indigo-500/50">
+              <DropdownMenu>
+                <DropdownMenuTrigger asChild>
+                  <button
+                    type="button"
+                    className="flex h-6 flex-none items-center gap-0.5 px-1.5 transition-colors hover:bg-white/10 focus:outline-none"
+                    title="选择 emoji"
+                    aria-label="选择 emoji"
+                  >
+                    <span className="text-xs leading-none">{emoji}</span>
+                    <ChevronDown className="h-3 w-3 text-white/45" />
+                  </button>
+                </DropdownMenuTrigger>
+                <DropdownMenuContent align="start" className="w-72 p-2">
+                  <Input
+                    value={emojiQuery}
+                    onChange={(e) => setEmojiQuery(e.target.value)}
+                    className="mb-2 h-7 text-xs"
+                    placeholder="搜索 emoji"
+                  />
+                  <div className="grid max-h-64 grid-cols-8 gap-1 overflow-y-auto pr-1">
+                    <DropdownMenuItem
+                      className="flex h-8 items-center justify-center p-0 text-white/75"
+                      title="随机 emoji"
+                      aria-label="随机 emoji"
+                      onClick={() => commitGroupName(pickRandomEmoji(emoji), groupNameDraft.name)}
+                    >
+                      <Shuffle className="h-3.5 w-3.5" />
+                    </DropdownMenuItem>
+                    {filteredEmojis.map((item) => (
+                      <DropdownMenuItem
+                        key={item}
+                        className="flex h-8 items-center justify-center p-0 text-base"
+                        onClick={() => commitGroupName(item, groupNameDraft.name)}
+                      >
+                        {item}
+                      </DropdownMenuItem>
+                    ))}
+                  </div>
+                </DropdownMenuContent>
+              </DropdownMenu>
+              <Input
+                value={groupNameDraft.name}
+                onChange={(e) => commitGroupName(emoji, e.target.value)}
+                placeholder="xx机场"
+                className="h-6 w-[130px] rounded-none border-0 border-l border-white/10 bg-transparent px-2 text-xs focus:ring-0 focus:border-white/10"
+              />
+            </div>
+          </div>
+        )}
+      </div>
+
+      {showFilter && (
+        <div className="flex w-full min-w-0 items-center gap-1.5">
+          <span className="text-xs text-white/50 whitespace-nowrap">filter:</span>
+          <Input
+            value={source.providerFilter ?? DEFAULT_PROXY_PROVIDER_FILTER}
+            onChange={(e) => onUpdateMeta(source.id, { providerFilter: e.target.value })}
+            placeholder={DEFAULT_PROXY_PROVIDER_FILTER}
+            title="节点过滤正则（mihomo proxy-providers filter）；清空则不过滤"
+            className="h-6 min-w-0 flex-1 rounded-md px-2 text-xs font-mono"
+          />
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/packages/ui/src/product/converter/quick-mode/sources-section.test.ts b/packages/ui/src/product/converter/quick-mode/sources-section.test.ts
index 1f59b3a..5ed67dc 100644
--- a/packages/ui/src/product/converter/quick-mode/sources-section.test.ts
+++ b/packages/ui/src/product/converter/quick-mode/sources-section.test.ts
@@ -76,6 +76,7 @@ vi.mock("lucide-react", () => ({
   AlertCircle: () => null,
   Check: () => null,
   ChevronDown: () => null,
+  ChevronRight: () => null,
   ChevronUp: () => null,
   HelpCircle: () => null,
   Loader2: () => null,
@@ -142,6 +143,18 @@ vi.mock("@subboost/ui/product/converter/subscription-import-error", () => ({
     return null;
   },
 }));
+vi.mock("@subboost/ui/product/converter/provider-mode-status-bar", () => ({
+  ProviderModeStatusBar: (props: any) => {
+    mocks.captures.statusBars.push(props);
+    return null;
+  },
+}));
+vi.mock("@subboost/ui/product/converter/provider-settings-fields", () => ({
+  ProviderSettingsFields: (props: any) => {
+    mocks.captures.providerSettings.push(props);
+    return null;
+  },
+}));
 vi.mock("@subboost/ui/product/subscription/subscription-userinfo-display", () => ({
   getSubscriptionUserInfoDisplay: mocks.getSubscriptionUserInfoDisplay,
 }));
@@ -204,6 +217,8 @@ function renderSection(overrides: Record<number, unknown> = {}) {
   mocks.captures.inputs = [];
   mocks.captures.textareas = [];
   mocks.captures.switches = [];
+  mocks.captures.statusBars = [];
+  mocks.captures.providerSettings = [];
   mocks.captures.rawButtons = [];
   try {
     const html = renderToStaticMarkup(React.createElement(SourcesSection));
@@ -216,7 +231,7 @@ function renderSection(overrides: Record<number, unknown> = {}) {
 describe("quick mode SourcesSection", () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    mocks.captures = { buttons: [], inputs: [], textareas: [], switches: [], rawButtons: [] };
+    mocks.captures = { buttons: [], inputs: [], textareas: [], switches: [], statusBars: [], providerSettings: [], rawButtons: [] };
     mocks.getSubscriptionUserInfoDisplay.mockReturnValue({ traffic: "1 GB", expire: "2026-01-01" });
     mocks.markSourceAsPendingImport.mockImplementation((source) => ({ ...source, pendingImport: true }));
     mocks.moveSubscriptionSource.mockImplementation((sources) => sources.slice().reverse());
@@ -239,15 +254,36 @@ describe("quick mode SourcesSection", () => {
     expect(mocks.captures.errorBadge).toEqual(expect.objectContaining({ errorMessage: "parse failed" }));
     expect(mocks.captures.dialog).toEqual(expect.objectContaining({ open: true }));
     expect(mocks.captures.inputs.some((props: any) => props.value === "https://example.com/sub")).toBe(true);
+    // 对话框换位后，url 输入行是对话框里的第一个 Input
+    expect(mocks.captures.inputs[0]).toEqual(expect.objectContaining({ value: "https://example.com/sub" }));
     expect(mocks.captures.inputs.some((props: any) => props.value === "HK")).toBe(true);
     expect(mocks.captures.inputs.some((props: any) => props.readOnly)).toBe(true);
     expect(mocks.captures.textareas.some((props: any) => props.value === "ss://node")).toBe(true);
+    // 主界面 url 编辑框：textarea + 内嵌状态栏
+    expect(mocks.captures.textareas.some((props: any) => props.value === "https://example.com/sub")).toBe(true);
+    expect(mocks.captures.statusBars).toEqual([
+      expect.objectContaining({
+        source: expect.objectContaining({ id: "s1", useProxyProviders: false }),
+        defaultProviderKey: "url_s1",
+      }),
+    ]);
     expect(mocks.captures.switches).toEqual([expect.objectContaining({ checked: false })]);
   });
 
   it("updates source content and metadata through captured inputs", () => {
     renderSection({ 1: "s1" });
 
+    const mainUrlEditor = mocks.captures.textareas.find((props: any) => props.placeholder === "https://example.com/sub");
+    mainUrlEditor.onChange({ target: { value: "https://main.example/sub\n" } });
+    expect(mocks.markSourceAsPendingImport).toHaveBeenCalledWith(expect.objectContaining({ content: "https://main.example/sub" }));
+
+    const enterEvent = { key: "Enter", preventDefault: vi.fn() };
+    mainUrlEditor.onKeyDown(enterEvent);
+    expect(enterEvent.preventDefault).toHaveBeenCalled();
+
+    mocks.captures.statusBars[0].onCheckedChange(true);
+    expect(mocks.markSourceAsPendingImport).toHaveBeenCalledWith(expect.objectContaining({ useProxyProviders: true }));
+
     const mainUrlInput = mocks.captures.inputs.find((props: any) => props.placeholder === "https://example.com/sub" && props.value === urlSource.content);
     mainUrlInput.onChange({ target: { value: "https://new.example/sub" } });
     expect(mocks.store.setSources).toHaveBeenCalledWith(expect.any(Array));
@@ -321,8 +357,8 @@ describe("quick mode SourcesSection", () => {
     expect(mocks.captures.dialog).toEqual(expect.objectContaining({ open: false }));
 
     mocks.store.setSources.mockClear();
-    const emptyInput = mocks.captures.inputs.find((props: any) => props.placeholder === "https://example.com/sub");
-    emptyInput.onChange({ target: { value: "" } });
+    const emptyEditor = mocks.captures.textareas.find((props: any) => props.placeholder === "https://example.com/sub");
+    emptyEditor.onChange({ target: { value: "" } });
     expect(mocks.store.setSources).toHaveBeenCalledWith(expect.any(Array));
   });
 
diff --git a/packages/ui/src/product/converter/quick-mode/sources-section.tsx b/packages/ui/src/product/converter/quick-mode/sources-section.tsx
index 260c219..2c05494 100644
--- a/packages/ui/src/product/converter/quick-mode/sources-section.tsx
+++ b/packages/ui/src/product/converter/quick-mode/sources-section.tsx
@@ -1,5 +1,6 @@
+import * as React from "react";
 import * as Popover from "@radix-ui/react-popover";
-import { Plus, X, AlertCircle, Check, Loader2, Maximize2, HelpCircle, Menu, ChevronUp, ChevronDown } from "lucide-react";
+import { Plus, X, AlertCircle, Check, Loader2, Maximize2, HelpCircle, Menu, ChevronUp, ChevronDown, ChevronRight } from "lucide-react";
 import { Button } from "@subboost/ui/components/ui/button";
 import { Textarea } from "@subboost/ui/components/ui/textarea";
 import { Input } from "@subboost/ui/components/ui/input";
@@ -10,6 +11,8 @@ import { cn } from "@subboost/ui/lib/utils";
 import { DEFAULT_NODE_NAME_TEMPLATE } from "@subboost/core/node-name-template";
 import type { SourceType } from "@subboost/ui/store/config-store";
 import { SubscriptionImportErrorBadge } from "@subboost/ui/product/converter/subscription-import-error";
+import { ProviderModeStatusBar } from "@subboost/ui/product/converter/provider-mode-status-bar";
+import { ProviderSettingsFields } from "@subboost/ui/product/converter/provider-settings-fields";
 import { getSubscriptionUserInfoDisplay } from "@subboost/ui/product/subscription/subscription-userinfo-display";
 import { buildSourceDisplayLabel } from "@subboost/ui/product/converter/source-display-label";
 import { useSubscriptionSourcesController } from "@subboost/ui/product/converter/use-subscription-sources-controller";
@@ -36,6 +39,8 @@ export function SourcesSection() {
     updateSourceType,
   } = useSubscriptionSourcesController({ mode: "quick" });
 
+  const [providerSettingsOpen, setProviderSettingsOpen] = React.useState(false);
+
   return (
     <>
       {/* Sources List */}
@@ -189,12 +194,31 @@ export function SourcesSection() {
 
               {/* Source Input */}
               {source.type === "url" ? (
-                <Input
-                  value={source.content}
-                  onChange={(e) => updateSource(source.id, e.target.value)}
-                  placeholder={typeInfo.placeholder}
-                  className="text-xs h-9"
-                />
+                <div className="flex flex-col overflow-hidden rounded-xl border border-white/10 bg-white/5 transition-all duration-200 focus-within:border-indigo-500 focus-within:ring-2 focus-within:ring-indigo-500/50">
+                  <Textarea
+                    rows={1}
+                    wrap="off"
+                    value={source.content}
+                    onChange={(e) => updateSource(source.id, e.target.value.replace(/[\r\n]+/g, ""))}
+                    onKeyDown={(e) => {
+                      if (e.key === "Enter") e.preventDefault();
+                    }}
+                    placeholder={typeInfo.placeholder}
+                    className="block h-9 min-h-0 w-full resize-none overflow-x-auto rounded-none border-0 bg-transparent px-4 py-0 text-xs leading-9 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden focus:ring-0"
+                  />
+                  <ProviderModeStatusBar
+                    source={source}
+                    defaultProviderKey={`url_${source.id}`}
+                    onCheckedChange={(checked) =>
+                      updateSourceMeta(source.id, {
+                        useProxyProviders: checked,
+                        // UI 新开启时默认分组模式；旧数据（已保存无此字段）保持 inline 兼容
+                        ...(checked && !source.providerMode ? { providerMode: "grouped" as const } : {}),
+                      })
+                    }
+                    onUpdateMeta={updateSourceMeta}
+                  />
+                </div>
               ) : (
                 <Textarea
                   value={source.content}
@@ -272,6 +296,108 @@ export function SourcesSection() {
 
           {expandedSource && (
             <div className="space-y-3">
+              {expandedSource.type === "url" && (
+                <div className="space-y-1">
+                  <div className="text-xs text-white/60">{sourceTypeInfo[expandedSource.type].label}</div>
+                  <div className="flex items-center gap-3">
+                    <Input
+                      value={expandedSource.content}
+                      onChange={(e) => updateSource(expandedSource.id, e.target.value)}
+                      placeholder={sourceTypeInfo[expandedSource.type].placeholder}
+                      className="text-xs min-w-0 flex-1"
+                    />
+
+                    <div className="flex h-10 flex-none items-center gap-2 rounded-xl border border-white/10 bg-white/5 px-3">
+                      <div className="text-xs text-white/70 whitespace-nowrap">proxy-providers模式</div>
+                      <Popover.Root>
+                        <Popover.Trigger asChild>
+                          <button
+                            type="button"
+                            className="inline-flex h-6 w-6 flex-none items-center justify-center rounded-full border border-white/10 bg-white/5 text-white/40 transition-colors hover:bg-white/10 hover:text-white/80 focus:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500/50 focus-visible:ring-offset-2 focus-visible:ring-offset-black"
+                            aria-label="proxy-providers 模式说明"
+                            title="proxy-providers 模式说明"
+                          >
+                            <HelpCircle className="h-3.5 w-3.5" />
+                          </button>
+                        </Popover.Trigger>
+                        <Popover.Portal>
+                          <Popover.Content
+                            side="bottom"
+                            align="end"
+                            sideOffset={8}
+                            className="z-50 w-[360px] rounded-xl border border-white/10 bg-black/90 backdrop-blur-md shadow-2xl p-3"
+                          >
+                            <div className="space-y-2 text-xs">
+                              <div className="flex items-center gap-2">
+                                <HelpCircle className="h-4 w-4 text-amber-300" />
+                                <div className="text-white font-medium">proxy-providers 模式</div>
+                              </div>
+                              <div className="text-white/60 leading-relaxed">
+                                部分订阅限制 CN IP 导入，url 无法在 SubBoost 内拉取解析。开启后 SubBoost
+                                不再拉取/解析该 url，而是在最终配置中写入{" "}
+                                <span className="font-mono">proxy-providers</span>，交由客户端自行拉取节点。
+                              </div>
+                              <div className="pt-2 border-t border-white/10 text-white/60 space-y-1">
+                                <div className="font-medium text-white/80">注意开启后：</div>
+                                <ul className="ml-4 list-disc space-y-1">
+                                  <li>无法在预览中查看/管理该 url 的节点</li>
+                                  <li>无法将这些节点用于中转代理组、分流组高级模式等高级功能</li>
+                                  <li>节点命名模板与 tag 在该模式下不生效</li>
+                                </ul>
+                              </div>
+                              <div className="pt-2 border-t border-white/10 text-[10px] text-white/40">
+                                若导入 url 报“未解析到有效节点/获取失败”等，可尝试开启此模式。
+                              </div>
+                            </div>
+                            <Popover.Arrow className="fill-white/10" />
+                          </Popover.Content>
+                        </Popover.Portal>
+                      </Popover.Root>
+                      <Switch
+                        checked={Boolean(expandedSource.useProxyProviders)}
+                        onCheckedChange={(checked) =>
+                          updateSourceMeta(expandedSource.id, {
+                            useProxyProviders: Boolean(checked),
+                            // UI 新开启时默认分组模式；旧数据（已保存无此字段）保持 inline 兼容
+                            ...(checked && !expandedSource.providerMode ? { providerMode: "grouped" as const } : {}),
+                          })
+                        }
+                      />
+                    </div>
+                  </div>
+
+                  {/* provider 设置：可折叠分组，开启 proxy-providers 模式后可用 */}
+                  <div>
+                    <button
+                      type="button"
+                      onClick={() => setProviderSettingsOpen((open) => !open)}
+                      disabled={!expandedSource.useProxyProviders}
+                      className="flex items-center gap-2 py-1 px-2 rounded-lg text-white/70 transition-colors hover:bg-white/5 hover:text-white disabled:cursor-not-allowed disabled:opacity-40 disabled:hover:bg-transparent"
+                    >
+                      {providerSettingsOpen && expandedSource.useProxyProviders ? (
+                        <ChevronDown className="h-3.5 w-3.5 text-white/50" />
+                      ) : (
+                        <ChevronRight className="h-3.5 w-3.5 text-white/50" />
+                      )}
+                      <span className="text-xs font-medium">provider 设置</span>
+                      {!expandedSource.useProxyProviders && (
+                        <span className="text-[10px] text-white/40">开启 proxy-providers 模式后可用</span>
+                      )}
+                    </button>
+                    {providerSettingsOpen && expandedSource.useProxyProviders && (
+                      <div className="mt-1 pl-6">
+                        <ProviderSettingsFields
+                          source={expandedSource}
+                          defaultProviderKey={`url_${expandedSource.id}`}
+                          onUpdateMeta={updateSourceMeta}
+                          showFilter
+                        />
+                      </div>
+                    )}
+                  </div>
+                </div>
+              )}
+
               <div className="grid gap-3 sm:grid-cols-3">
                 <div className="space-y-1">
                   <div className="text-xs text-white/60">标签（tag）</div>
@@ -300,110 +426,47 @@ export function SourcesSection() {
                 可用占位符：{"{tag}"}、{"{name}"}；留空则默认：{DEFAULT_NODE_NAME_TEMPLATE}
               </div>
 
-              <div className="space-y-1">
-                <div className="text-xs text-white/60">{sourceTypeInfo[expandedSource.type].label}</div>
-                {expandedSource.type === "url" ? (
-                  <div className="space-y-3">
-                    <div className="flex items-center gap-3">
+              {expandedSource.type === "url" ? (
+                <div className="space-y-3">
+                  <div className="grid gap-3 sm:grid-cols-2">
+                    <div className="space-y-1">
+                      <div className="text-xs text-white/60">流量/到期信息 URL（可选）</div>
                       <Input
-                        value={expandedSource.content}
-                        onChange={(e) => updateSource(expandedSource.id, e.target.value)}
-                        placeholder={sourceTypeInfo[expandedSource.type].placeholder}
-                        className="text-xs min-w-0 flex-1"
+                        value={expandedSource.userinfoUrl ?? ""}
+                        onChange={(e) => updateSourceMeta(expandedSource.id, { userinfoUrl: e.target.value })}
+                        placeholder="留空则默认使用当前订阅源 URL"
+                        className="text-xs"
                       />
-
-                      <div className="flex h-10 flex-none items-center gap-2 rounded-xl border border-white/10 bg-white/5 px-3">
-                        <div className="text-xs text-white/70 whitespace-nowrap">proxy-providers模式</div>
-                        <Popover.Root>
-                          <Popover.Trigger asChild>
-                            <button
-                              type="button"
-                              className="inline-flex h-6 w-6 flex-none items-center justify-center rounded-full border border-white/10 bg-white/5 text-white/40 transition-colors hover:bg-white/10 hover:text-white/80 focus:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500/50 focus-visible:ring-offset-2 focus-visible:ring-offset-black"
-                              aria-label="proxy-providers 模式说明"
-                              title="proxy-providers 模式说明"
-                            >
-                              <HelpCircle className="h-3.5 w-3.5" />
-                            </button>
-                          </Popover.Trigger>
-                          <Popover.Portal>
-                            <Popover.Content
-                              side="bottom"
-                              align="end"
-                              sideOffset={8}
-                              className="z-50 w-[360px] rounded-xl border border-white/10 bg-black/90 backdrop-blur-md shadow-2xl p-3"
-                            >
-                              <div className="space-y-2 text-xs">
-                                <div className="flex items-center gap-2">
-                                  <HelpCircle className="h-4 w-4 text-amber-300" />
-                                  <div className="text-white font-medium">proxy-providers 模式</div>
-                                </div>
-                                <div className="text-white/60 leading-relaxed">
-                                  部分订阅限制 CN IP 导入，url 无法在 SubBoost 内拉取解析。开启后 SubBoost
-                                  不再拉取/解析该 url，而是在最终配置中写入{" "}
-                                  <span className="font-mono">proxy-providers</span>，交由客户端自行拉取节点。
-                                </div>
-                                <div className="pt-2 border-t border-white/10 text-white/60 space-y-1">
-                                  <div className="font-medium text-white/80">注意开启后：</div>
-                                  <ul className="ml-4 list-disc space-y-1">
-                                    <li>无法在预览中查看/管理该 url 的节点</li>
-                                    <li>无法将这些节点用于中转代理组、分流组高级模式等高级功能</li>
-                                    <li>节点命名模板与 tag 在该模式下不生效</li>
-                                  </ul>
-                                </div>
-                                <div className="pt-2 border-t border-white/10 text-[10px] text-white/40">
-                                  若导入 url 报“未解析到有效节点/获取失败”等，可尝试开启此模式。
-                                </div>
-                              </div>
-                              <Popover.Arrow className="fill-white/10" />
-                            </Popover.Content>
-                          </Popover.Portal>
-                        </Popover.Root>
-                        <Switch
-                          checked={Boolean(expandedSource.useProxyProviders)}
-                          onCheckedChange={(checked) =>
-                            updateSourceMeta(expandedSource.id, { useProxyProviders: Boolean(checked) })
-                          }
-                        />
-                      </div>
                     </div>
-
-                    <div className="grid gap-3 sm:grid-cols-2">
-                      <div className="space-y-1">
-                        <div className="text-xs text-white/60">流量/到期信息 URL（可选）</div>
-                        <Input
-                          value={expandedSource.userinfoUrl ?? ""}
-                          onChange={(e) => updateSourceMeta(expandedSource.id, { userinfoUrl: e.target.value })}
-                          placeholder="留空则默认使用当前订阅源 URL"
-                          className="text-xs"
-                        />
-                      </div>
-                      <div className="space-y-1">
-                        <div className="text-xs text-white/60">流量信息 User-Agent（可选）</div>
-                        <Input
-                          value={expandedSource.userinfoUserAgent ?? ""}
-                          onChange={(e) =>
-                            updateSourceMeta(expandedSource.id, { userinfoUserAgent: e.target.value })
-                          }
-                          placeholder="例如 clash.meta/v1.19.16"
-                          className="text-xs"
-                        />
-                      </div>
+                    <div className="space-y-1">
+                      <div className="text-xs text-white/60">流量信息 User-Agent（可选）</div>
+                      <Input
+                        value={expandedSource.userinfoUserAgent ?? ""}
+                        onChange={(e) =>
+                          updateSourceMeta(expandedSource.id, { userinfoUserAgent: e.target.value })
+                        }
+                        placeholder="例如 clash.meta/v1.19.16"
+                        className="text-xs"
+                      />
                     </div>
+                  </div>
 
-                    <div className="text-[11px] text-white/40">
-                      有些订阅源不会直接返回 <span className="font-mono">subscription-userinfo</span>，但会提供独立的流量接口。
-                      设置后，SubBoost 会在导入/刷新时额外抓取该接口，用来更新这个源自己的流量与到期快照。
-                    </div>
+                  <div className="text-[11px] text-white/40">
+                    有些订阅源不会直接返回 <span className="font-mono">subscription-userinfo</span>，但会提供独立的流量接口。
+                    设置后，SubBoost 会在导入/刷新时额外抓取该接口，用来更新这个源自己的流量与到期快照。
                   </div>
-                ) : (
+                </div>
+              ) : (
+                <div className="space-y-1">
+                  <div className="text-xs text-white/60">{sourceTypeInfo[expandedSource.type].label}</div>
                   <Textarea
                     value={expandedSource.content}
                     onChange={(e) => updateSource(expandedSource.id, e.target.value)}
                     placeholder={sourceTypeInfo[expandedSource.type].placeholder}
                     className="min-h-[60vh] text-xs font-mono"
                   />
-                )}
-              </div>
+                </div>
+              )}
             </div>
           )}
 
diff --git a/packages/ui/src/product/converter/use-subscription-sources-controller.ts b/packages/ui/src/product/converter/use-subscription-sources-controller.ts
index fc05fc9..bb6abfa 100644
--- a/packages/ui/src/product/converter/use-subscription-sources-controller.ts
+++ b/packages/ui/src/product/converter/use-subscription-sources-controller.ts
@@ -236,6 +236,10 @@ export function useSubscriptionSourcesController({ mode }: Options) {
             type,
             content: "",
             useProxyProviders: type === "url" ? Boolean(source.useProxyProviders) : undefined,
+            providerKey: type === "url" ? source.providerKey : undefined,
+            providerMode: type === "url" ? source.providerMode : undefined,
+            providerGroupName: type === "url" ? source.providerGroupName : undefined,
+            providerFilter: type === "url" ? source.providerFilter : undefined,
             userinfoUrl: type === "url" ? source.userinfoUrl : undefined,
             userinfoUserAgent: type === "url" ? source.userinfoUserAgent : undefined,
             lastParsedContent: undefined,
diff --git a/packages/ui/src/product/home/use-editing-subscription-loader.ts b/packages/ui/src/product/home/use-editing-subscription-loader.ts
index 5a615c7..a6467d1 100644
--- a/packages/ui/src/product/home/use-editing-subscription-loader.ts
+++ b/packages/ui/src/product/home/use-editing-subscription-loader.ts
@@ -143,6 +143,10 @@ export function useEditingSubscriptionLoader({
               const tag = (item as any).tag;
               const nameTemplate = (item as any).nameTemplate;
               const useProxyProviders = (item as any).useProxyProviders;
+              const providerKey = (item as any).providerKey;
+              const providerMode = (item as any).providerMode;
+              const providerGroupName = (item as any).providerGroupName;
+              const providerFilter = (item as any).providerFilter;
               const userinfoUrl = (item as any).userinfoUrl;
               const userinfoUserAgent = (item as any).userinfoUserAgent;
               const subscriptionUserInfo = normalizeSubscriptionUserInfo((item as any).subscriptionUserInfo);
@@ -170,6 +174,18 @@ export function useEditingSubscriptionLoader({
                 nameTemplate: typeof nameTemplate === "string" && nameTemplate.trim() ? nameTemplate.trim() : undefined,
                 subscriptionUserInfo: hasSubscriptionUserInfo(subscriptionUserInfo) ? subscriptionUserInfo : undefined,
                 useProxyProviders: t === "url" && useProxyProviders === true ? true : undefined,
+                providerKey:
+                  t === "url" && typeof providerKey === "string" && providerKey.trim() ? providerKey.trim() : undefined,
+                providerMode:
+                  t === "url" && (providerMode === "grouped" || providerMode === "inline" || providerMode === "bare")
+                    ? providerMode
+                    : undefined,
+                providerGroupName:
+                  t === "url" && typeof providerGroupName === "string" && providerGroupName.trim()
+                    ? providerGroupName.trim()
+                    : undefined,
+                // providerFilter 保留空串（空串=显式不过滤，与"未设置走默认正则"区分）
+                providerFilter: t === "url" && typeof providerFilter === "string" ? providerFilter : undefined,
                 userinfoUrl: normalizedUserinfoUrl,
                 userinfoUserAgent:
                   t === "url" && typeof userinfoUserAgent === "string" && userinfoUserAgent.trim()
@@ -191,6 +207,10 @@ export function useEditingSubscriptionLoader({
               nameTemplate?: string;
               subscriptionUserInfo?: SubscriptionUserInfo;
               useProxyProviders?: boolean;
+              providerKey?: string;
+              providerMode?: "grouped" | "inline" | "bare";
+              providerGroupName?: string;
+              providerFilter?: string;
               userinfoUrl?: string;
               userinfoUserAgent?: string;
               lastParsedTag?: string;
@@ -257,6 +277,19 @@ export function useEditingSubscriptionLoader({
               ...(typeof s.nameTemplate === "string" && s.nameTemplate.trim() ? { nameTemplate: s.nameTemplate.trim() } : {}),
               ...(hasSubscriptionUserInfo(s.subscriptionUserInfo) ? { subscriptionUserInfo: s.subscriptionUserInfo } : {}),
               ...(s.type === "url" && s.useProxyProviders ? { useProxyProviders: true } : {}),
+              ...(s.type === "url" && typeof s.providerKey === "string" && s.providerKey.trim()
+                ? { providerKey: s.providerKey.trim() }
+                : {}),
+              ...(s.type === "url" &&
+              (s.providerMode === "grouped" || s.providerMode === "inline" || s.providerMode === "bare")
+                ? { providerMode: s.providerMode }
+                : {}),
+              ...(s.type === "url" && typeof s.providerGroupName === "string" && s.providerGroupName.trim()
+                ? { providerGroupName: s.providerGroupName.trim() }
+                : {}),
+              ...(s.type === "url" && typeof s.providerFilter === "string"
+                ? { providerFilter: s.providerFilter }
+                : {}),
               ...(s.type === "url" && typeof s.userinfoUrl === "string" && s.userinfoUrl.trim()
                 ? { userinfoUrl: tryNormalizeSubscriptionUrlInput(s.userinfoUrl) ?? s.userinfoUrl.trim() }
                 : {}),
@@ -317,6 +350,19 @@ export function useEditingSubscriptionLoader({
               ...(typeof s.nameTemplate === "string" && s.nameTemplate.trim() ? { nameTemplate: s.nameTemplate.trim() } : {}),
               ...(hasSubscriptionUserInfo(subscriptionUserInfo) ? { subscriptionUserInfo } : {}),
               ...(s.type === "url" && s.useProxyProviders ? { useProxyProviders: true } : {}),
+              ...(s.type === "url" && typeof s.providerKey === "string" && s.providerKey.trim()
+                ? { providerKey: s.providerKey.trim() }
+                : {}),
+              ...(s.type === "url" &&
+              (s.providerMode === "grouped" || s.providerMode === "inline" || s.providerMode === "bare")
+                ? { providerMode: s.providerMode }
+                : {}),
+              ...(s.type === "url" && typeof s.providerGroupName === "string" && s.providerGroupName.trim()
+                ? { providerGroupName: s.providerGroupName.trim() }
+                : {}),
+              ...(s.type === "url" && typeof s.providerFilter === "string"
+                ? { providerFilter: s.providerFilter }
+                : {}),
               ...(s.type === "url" && typeof s.userinfoUrl === "string" && s.userinfoUrl.trim()
                 ? { userinfoUrl: tryNormalizeSubscriptionUrlInput(s.userinfoUrl) ?? s.userinfoUrl.trim() }
                 : {}),
@@ -482,6 +528,27 @@ export function useEditingSubscriptionLoader({
           }
           return out;
         })();
+        const groupListenersFromCfg = (() => {
+          const raw = (cfg as any).groupListeners;
+          if (!Array.isArray(raw)) return [];
+          const out: Array<{ id: string; target: string; port: number }> = [];
+          const usedTargets = new Set<string>();
+          for (let index = 0; index < raw.length; index += 1) {
+            const item = raw[index];
+            if (!item || typeof item !== "object") continue;
+            const target = typeof (item as any).target === "string" ? (item as any).target.trim() : "";
+            const port = (item as any).port;
+            if (!target || typeof port !== "number" || !Number.isInteger(port) || port < 1 || port > 65535) continue;
+            if (usedTargets.has(target)) continue;
+            usedTargets.add(target);
+            const id =
+              typeof (item as any).id === "string" && (item as any).id.trim()
+                ? ((item as any).id as string)
+                : `group_listener_${index + 1}`;
+            out.push({ id, target, port });
+          }
+          return out;
+        })();
         const appliedTemplateIdFromCfg =
           typeof cfg.appliedTemplateId === "string" && cfg.appliedTemplateId.trim()
             ? (cfg.appliedTemplateId as string)
@@ -534,6 +601,7 @@ export function useEditingSubscriptionLoader({
           proxyGroupOrder: proxyGroupOrderFromCfg ? proxyGroupOrderFromCfg : state.proxyGroupOrder,
           ruleOrder: ruleOrderFromCfg.length > 0 ? ruleOrderFromCfg : state.ruleOrder,
           listenerPorts: listenerPortsFromCfg,
+          groupListeners: groupListenersFromCfg,
           appliedTemplateId: appliedTemplateIdFromCfg ?? state.appliedTemplateId,
           dnsYaml: typeof cfg.dnsYaml === "string" ? (cfg.dnsYaml as string) : state.dnsYaml,
           ruleProviderBaseUrl:
diff --git a/packages/ui/src/product/home/use-subscription-link.tsx b/packages/ui/src/product/home/use-subscription-link.tsx
index 8d0822e..762a12b 100644
--- a/packages/ui/src/product/home/use-subscription-link.tsx
+++ b/packages/ui/src/product/home/use-subscription-link.tsx
@@ -347,6 +347,19 @@ export function useSubscriptionLink({
                     ? { subscriptionUserInfo: sourceSubscriptionUserInfo }
                     : {}),
                   ...(s.type === "url" && s.useProxyProviders ? { useProxyProviders: true } : {}),
+                  ...(s.type === "url" && typeof s.providerKey === "string" && s.providerKey.trim()
+                    ? { providerKey: s.providerKey.trim() }
+                    : {}),
+                  ...(s.type === "url" &&
+                  (s.providerMode === "grouped" || s.providerMode === "inline" || s.providerMode === "bare")
+                    ? { providerMode: s.providerMode }
+                    : {}),
+                  ...(s.type === "url" && typeof s.providerGroupName === "string" && s.providerGroupName.trim()
+                    ? { providerGroupName: s.providerGroupName.trim() }
+                    : {}),
+                  ...(s.type === "url" && typeof s.providerFilter === "string"
+                    ? { providerFilter: s.providerFilter }
+                    : {}),
                   ...(s.type === "url" && typeof s.userinfoUrl === "string" && s.userinfoUrl.trim()
                     ? { userinfoUrl: tryNormalizeSubscriptionUrlInput(s.userinfoUrl) ?? s.userinfoUrl.trim() }
                     : {}),
@@ -388,6 +401,7 @@ export function useSubscriptionLink({
             proxyGroupNameOverrides,
             proxyGroupOrder: useConfigStore.getState().proxyGroupOrder,
             listenerPorts,
+            groupListeners: useConfigStore.getState().groupListeners,
             dnsYaml,
             ruleProviderBaseUrl,
             testUrl,
diff --git a/packages/ui/src/product/preview/visual-graph.test.ts b/packages/ui/src/product/preview/visual-graph.test.ts
index da37c11..8fd73ef 100644
--- a/packages/ui/src/product/preview/visual-graph.test.ts
+++ b/packages/ui/src/product/preview/visual-graph.test.ts
@@ -91,6 +91,22 @@ vi.mock("@subboost/core/generator/proxy-groups", () => ({
 	    { id: "ad", name: "🛑 广告拦截", emoji: "🛑", groupType: "select", category: "other" },
 	  ],
   generateProxyGroups: vi.fn(() => mocks.generatedProxyGroups),
+  buildProviderProxyGroups: (attachments: any[], reservedNames: Iterable<string>) => {
+    const reserved = new Set(reservedNames);
+    const groups: any[] = [];
+    const names: string[] = [];
+    for (const attachment of attachments) {
+      if (!attachment || attachment.mode !== "grouped") continue;
+      const base = attachment.groupName || attachment.key;
+      let name = base;
+      let suffix = 2;
+      while (reserved.has(name)) name = `${base} ${suffix++}`;
+      reserved.add(name);
+      names.push(name);
+      groups.push({ name, type: "select", use: [attachment.key] });
+    }
+    return { groups, names };
+  },
 }));
 vi.mock("@subboost/core/generator/module-rules", () => ({
   getModuleRuleOrderKey: (moduleId: string, ruleId: string) => `module:${moduleId}:${ruleId}`,
@@ -98,6 +114,11 @@ vi.mock("@subboost/core/generator/module-rules", () => ({
 }));
 vi.mock("@subboost/core/proxy-group-name", () => ({
   resolveProxyGroupModuleName: (module: { id: string; name: string }, override?: string) => override || module.name,
+  splitLeadingEmoji: (raw: string) => {
+    const match = typeof raw === "string" ? raw.match(/^(\S+)\s+(.+)$/) : null;
+    if (match) return { hasEmojiPrefix: true, emoji: match[1], label: match[2] };
+    return { hasEmojiPrefix: false, emoji: "", label: raw ?? "" };
+  },
 }));
 vi.mock("@subboost/core/rules/custom-routing-rule-sets", () => ({
   collectCustomRoutingRuleSets: vi.fn(() => mocks.customRuleSets),
@@ -159,6 +180,7 @@ describe("VisualGraph", () => {
     mocks.effectiveRules = [{ id: "r1", name: "Rule One", behavior: "domain" }];
     mocks.store = {
       nodes,
+      sources: [],
       enabledProxyGroups: ["select", "auto"],
       dialerProxyGroups: [{ id: "d1", name: "Relay", enabled: true, relayNodes: ["Relay"], targetNodes: ["Beta"], type: "select" }],
       customRules: [{ id: "manual" }],
@@ -182,6 +204,64 @@ describe("VisualGraph", () => {
     expect(mocks.captures.proxyGroupsPreview).toBeUndefined();
   });
 
+  it("shows airport groups derived from grouped provider sources", () => {
+    mocks.store.proxyGroupOrder = [];
+    mocks.store.sources = [
+      {
+        id: "s1",
+        type: "url",
+        content: "https://a.example.com/sub",
+        useProxyProviders: true,
+        providerMode: "grouped",
+        providerGroupName: "✈️ 测试机场",
+      },
+      {
+        id: "s2",
+        type: "url",
+        content: "https://b.example.com/sub",
+        useProxyProviders: true,
+        providerMode: "bare",
+      },
+    ];
+    renderGraph();
+
+    const groups = mocks.captures.proxyGroupsPreview.displayGroups;
+    const providerGroups = groups.filter((group: any) => group.category === "provider");
+    // 仅分组模式的 provider 生成机场组卡片
+    expect(providerGroups).toHaveLength(1);
+    expect(providerGroups[0]).toMatchObject({
+      id: "name:✈️ 测试机场",
+      name: "✈️ 测试机场",
+      emoji: "✈️",
+      groupType: "select",
+      rules: [],
+    });
+    // 插在自动选择之后
+    const autoIndex = groups.findIndex((group: any) => group.id === "module:auto");
+    const airportIndex = groups.findIndex((group: any) => group.id === "name:✈️ 测试机场");
+    expect(airportIndex).toBe(autoIndex + 1);
+  });
+
+  it("reorders airport groups via proxyGroupOrder using generator-compatible name keys", () => {
+    mocks.store.proxyGroupOrder = ["name:✈️ 测试机场", "module:select"];
+    mocks.store.sources = [
+      {
+        id: "s1",
+        type: "url",
+        content: "https://a.example.com/sub",
+        useProxyProviders: true,
+        providerMode: "grouped",
+        providerGroupName: "✈️ 测试机场",
+      },
+    ];
+    renderGraph();
+
+    const groups = mocks.captures.proxyGroupsPreview.displayGroups;
+    // 拖拽序（name: 前缀 key）能命中机场组：机场组排到最前，不再被追加到末尾
+    expect(groups[0]).toMatchObject({ id: "name:✈️ 测试机场" });
+    expect(groups[1]).toMatchObject({ id: "module:select" });
+  });
+
   it("builds display groups, node previews, custom rules, and drag callbacks", () => {
     const { html, setters } = renderGraph({ 0: new Set(["module:auto"]), 1: null, 2: null, 3: 360 });
 
diff --git a/packages/ui/src/product/preview/visual-graph.tsx b/packages/ui/src/product/preview/visual-graph.tsx
index 029796d..74df536 100644
--- a/packages/ui/src/product/preview/visual-graph.tsx
+++ b/packages/ui/src/product/preview/visual-graph.tsx
@@ -8,10 +8,12 @@ import { cn } from "@subboost/ui/lib/utils";
 import { useConfigStore } from "@subboost/ui/store/config-store";
 import {
   PROXY_GROUP_MODULES,
+  buildProviderProxyGroups,
   generateProxyGroups,
 } from "@subboost/core/generator/proxy-groups";
 import { getModuleRuleOrderKey } from "@subboost/core/generator/module-rules";
-import { resolveProxyGroupModuleName } from "@subboost/core/proxy-group-name";
+import { buildProxyProviderPlanFromSources } from "@subboost/core/subscription/proxy-providers";
+import { resolveProxyGroupModuleName, splitLeadingEmoji } from "@subboost/core/proxy-group-name";
 import { resolveProxyGroupTargetName } from "@subboost/core/proxy-group-targets";
 import { collectCustomRoutingRuleSets } from "@subboost/core/rules/custom-routing-rule-sets";
 import { CustomRulesPreview } from "./visual-graph/custom-rules-preview";
@@ -28,6 +30,7 @@ import {
 export function VisualGraph() {
   const {
     nodes,
+    sources,
     enabledProxyGroups,
     dialerProxyGroups,
     customRules,
@@ -44,6 +47,7 @@ export function VisualGraph() {
   } = useConfigStore(
     useShallow((state) => ({
       nodes: state.nodes,
+      sources: state.sources ?? [],
       enabledProxyGroups: state.enabledProxyGroups,
       dialerProxyGroups: state.dialerProxyGroups ?? [],
       customRules: state.customRules ?? [],
@@ -265,16 +269,47 @@ export function VisualGraph() {
             },
           }));
 
+    // 机场组（proxy-providers 分组模式）：与生成器共用 buildProviderProxyGroups 保证组名一致
+    const providerPlan = buildProxyProviderPlanFromSources(sources, { testUrl, testInterval });
+    const providerDisplayGroups: VisualDisplayGroup[] = (() => {
+      if (!providerPlan) return [];
+      const reserved = [
+        "DIRECT",
+        "REJECT",
+        ...nodes.map((n) => n.name),
+        ...PROXY_GROUP_MODULES.map((m) => resolveModuleName(m)),
+        ...activeCustomProxyGroups
+          .map((g) => (typeof g.name === "string" ? g.name.trim() : ""))
+          .filter(Boolean),
+        ...enabledDialerProxyGroups.map((g) => g.name.trim()).filter(Boolean),
+      ];
+      const { groups: providerGroups } = buildProviderProxyGroups(providerPlan.attachments, reserved);
+      return providerGroups.map((g) => {
+        const parsed = splitLeadingEmoji(g.name);
+        return {
+          // id 用 name: 前缀：与生成器 getKeyByName 对机场组的 key 一致，
+          // 且能通过 setProxyGroupOrder 的前缀白名单（provider: 会被过滤导致拖拽排序丢失）。
+          id: `name:${g.name}`,
+          name: g.name,
+          emoji: parsed.hasEmojiPrefix ? parsed.emoji : "✈️",
+          groupType: g.type,
+          category: "provider",
+          rules: [],
+        };
+      });
+    })();
+
     const merged = (() => {
-      if (dialerGroups.length === 0) return base;
+      const extraGroups = [...providerDisplayGroups, ...dialerGroups];
+      if (extraGroups.length === 0) return base;
 
-      // 按 Clash UI 默认顺序：插入到“自动选择(auto)”和“广告拦截(ad)”之间
+      // 按 Clash UI 默认顺序：插入到“自动选择(auto)”之后
       const autoIndex = base.findIndex((g) => g.id === "module:auto");
       const insertAt =
         autoIndex >= 0 ? autoIndex + 1 : Math.min(2, base.length);
       return [
         ...base.slice(0, insertAt),
-        ...dialerGroups,
+        ...extraGroups,
         ...base.slice(insertAt),
       ];
     })();
@@ -320,6 +355,10 @@ export function VisualGraph() {
     proxyGroupAdvanced,
     proxyGroupOrder,
     resolveModuleName,
+    nodes,
+    sources,
+    testUrl,
+    testInterval,
   ]);
 
   const defaultProxyByGroupName = React.useMemo(() => {
diff --git a/packages/ui/src/product/preview/visual-graph/proxy-groups-preview.tsx b/packages/ui/src/product/preview/visual-graph/proxy-groups-preview.tsx
index 3e44fff..42ef5b0 100644
--- a/packages/ui/src/product/preview/visual-graph/proxy-groups-preview.tsx
+++ b/packages/ui/src/product/preview/visual-graph/proxy-groups-preview.tsx
@@ -119,6 +119,8 @@ function getGroupColor(category: string) {
       return "border-indigo-500/50 bg-indigo-500/10";
     case "dialer":
       return "border-amber-500/50 bg-amber-500/10";
+    case "provider":
+      return "border-sky-500/50 bg-sky-500/10";
     default:
       return "border-white/20 bg-white/5";
   }
diff --git a/packages/ui/src/store/config-store.ts b/packages/ui/src/store/config-store.ts
index 66b5dd6..1c4c3d2 100644
--- a/packages/ui/src/store/config-store.ts
+++ b/packages/ui/src/store/config-store.ts
@@ -13,6 +13,7 @@ import { createTemplateActions } from "./config-store/actions/template-actions";
 import { createCustomActions } from "./config-store/actions/custom-actions";
 import { createProxyGroupActions } from "./config-store/actions/proxy-group-actions";
 import { createDialerActions } from "./config-store/actions/dialer-actions";
+import { createGroupListenerActions } from "./config-store/actions/group-listener-actions";
 import { createSettingsActions } from "./config-store/actions/settings-actions";
 import { createHistoryActions } from "./config-store/actions/history-actions";
 import {
@@ -72,6 +73,7 @@ export const useConfigStore = create<ConfigState & ConfigActions>()(
         ...createCustomActions(set, get, setAndGenerateConfig),
         ...createProxyGroupActions(set, get, setAndGenerateConfig),
         ...createDialerActions(set, get, setAndGenerateConfig),
+        ...createGroupListenerActions(set, get, setAndGenerateConfig),
         ...createSettingsActions(set, get, setAndGenerateConfig),
         ...createHistoryActions(set, get),
       };
diff --git a/packages/ui/src/store/config-store/actions/group-listener-actions.ts b/packages/ui/src/store/config-store/actions/group-listener-actions.ts
new file mode 100644
index 0000000..9b1fba1
--- /dev/null
+++ b/packages/ui/src/store/config-store/actions/group-listener-actions.ts
@@ -0,0 +1,44 @@
+import type { GroupListenerBinding } from "@subboost/core/types/config";
+import type { ConfigActions } from "../definitions";
+import type { GetState, SetAndGenerateConfig, SetState } from "../store-types";
+
+type GroupListenerActions = Pick<
+  ConfigActions,
+  "addGroupListener" | "updateGroupListener" | "removeGroupListener"
+>;
+
+export function createGroupListenerActions(
+  _set: SetState,
+  _get: GetState,
+  setAndGenerateConfig: SetAndGenerateConfig
+): GroupListenerActions {
+  return {
+    addGroupListener: (binding?: Partial<Omit<GroupListenerBinding, "id">>) => {
+      const id = `group-listener-${Date.now()}`;
+      setAndGenerateConfig((state) => ({
+        groupListeners: [
+          ...state.groupListeners,
+          {
+            id,
+            target: binding?.target ?? "",
+            port: binding?.port ?? 0,
+          },
+        ],
+      }));
+    },
+
+    updateGroupListener: (id: string, patch: Partial<Omit<GroupListenerBinding, "id">>) => {
+      setAndGenerateConfig((state) => ({
+        groupListeners: state.groupListeners.map((binding) =>
+          binding.id === id ? { ...binding, ...patch } : binding
+        ),
+      }));
+    },
+
+    removeGroupListener: (id: string) => {
+      setAndGenerateConfig((state) => ({
+        groupListeners: state.groupListeners.filter((binding) => binding.id !== id),
+      }));
+    },
+  };
+}
diff --git a/packages/ui/src/store/config-store/auth-handoff.test.ts b/packages/ui/src/store/config-store/auth-handoff.test.ts
index 9e805fb..7ff2425 100644
--- a/packages/ui/src/store/config-store/auth-handoff.test.ts
+++ b/packages/ui/src/store/config-store/auth-handoff.test.ts
@@ -77,6 +77,7 @@ function meaningfulState(overrides: Record<string, unknown> = {}) {
     cnIpNoResolve: false,
     experimentalCnUseCnRuleSet: true,
     listenerPorts: { "Node A": 41000 },
+    groupListeners: [{ id: "gl-1", target: "Relay", port: 42000 }],
     ...overrides,
   } as any;
 }
@@ -167,6 +168,7 @@ describe("auth config handoff", () => {
       cnIpNoResolve: false,
       experimentalCnUseCnRuleSet: true,
       listenerPorts: { "Node A": 41000 },
+      groupListeners: [{ id: "gl-1", target: "Relay", port: 42000 }],
     });
     expect(storage.removeItem).toHaveBeenCalledWith(AUTH_CONFIG_HANDOFF_STORAGE_NAME);
   });
diff --git a/packages/ui/src/store/config-store/auth-handoff.ts b/packages/ui/src/store/config-store/auth-handoff.ts
index 79cee51..221d68b 100644
--- a/packages/ui/src/store/config-store/auth-handoff.ts
+++ b/packages/ui/src/store/config-store/auth-handoff.ts
@@ -69,6 +69,12 @@ function sourceArray(value: unknown): SubscriptionSource[] | undefined {
       ...(typeof item.tag === "string" ? { tag: item.tag } : {}),
       ...(typeof item.nameTemplate === "string" ? { nameTemplate: item.nameTemplate } : {}),
       ...(typeof item.useProxyProviders === "boolean" ? { useProxyProviders: item.useProxyProviders } : {}),
+      ...(typeof item.providerKey === "string" ? { providerKey: item.providerKey } : {}),
+      ...(item.providerMode === "grouped" || item.providerMode === "inline" || item.providerMode === "bare"
+        ? { providerMode: item.providerMode }
+        : {}),
+      ...(typeof item.providerGroupName === "string" ? { providerGroupName: item.providerGroupName } : {}),
+      ...(typeof item.providerFilter === "string" ? { providerFilter: item.providerFilter } : {}),
       ...(typeof item.userinfoUrl === "string" ? { userinfoUrl: item.userinfoUrl } : {}),
       ...(typeof item.userinfoUserAgent === "string" ? { userinfoUserAgent: item.userinfoUserAgent } : {}),
       ...(typeof item.parsed === "boolean" ? { parsed: item.parsed } : {}),
@@ -134,7 +140,8 @@ function hasMeaningfulConfig(state: ConfigState): boolean {
     state.ruleProviderBaseUrl !== initialState.ruleProviderBaseUrl ||
     state.cnIpNoResolve !== initialState.cnIpNoResolve ||
     state.experimentalCnUseCnRuleSet !== initialState.experimentalCnUseCnRuleSet ||
-    Object.keys(state.listenerPorts).length > 0
+    Object.keys(state.listenerPorts).length > 0 ||
+    state.groupListeners.length > 0
   );
 }
 
@@ -168,6 +175,7 @@ function buildHandoffState(state: ConfigState): Partial<ConfigState> {
     cnIpNoResolve: state.cnIpNoResolve,
     experimentalCnUseCnRuleSet: state.experimentalCnUseCnRuleSet,
     listenerPorts: state.listenerPorts,
+    groupListeners: state.groupListeners,
   };
 }
 
@@ -233,6 +241,8 @@ function normalizeHandoffState(raw: unknown): Partial<ConfigState> | null {
   }
   const listenerPorts = numberRecord(raw.listenerPorts);
   if (listenerPorts) out.listenerPorts = listenerPorts;
+  const groupListeners = objectArray<ConfigState["groupListeners"][number]>(raw.groupListeners);
+  if (groupListeners) out.groupListeners = groupListeners;
 
   return out;
 }
diff --git a/packages/ui/src/store/config-store/definitions.ts b/packages/ui/src/store/config-store/definitions.ts
index 91e2dc0..c5e0536 100644
--- a/packages/ui/src/store/config-store/definitions.ts
+++ b/packages/ui/src/store/config-store/definitions.ts
@@ -4,6 +4,7 @@ import type {
   CustomProxyGroup,
   CustomRule,
   CustomRuleSet,
+  GroupListenerBinding,
   ProxyGroupAdvancedConfig,
   TemplateType,
 } from "@subboost/core/types/config";
@@ -62,6 +63,15 @@ export interface SubscriptionSource {
   nameTemplate?: string;
   // URL 源使用 proxy-providers 模式：不在 SubBoost 内拉取/解析节点，仅在最终配置中写入 proxy-providers 供客户端拉取
   useProxyProviders?: boolean;
+  // proxy-providers 的自定义 key（留空用默认 url_<源id>）
+  providerKey?: string;
+  // provider 接入方式：grouped=生成机场组挂入节点选择（UI 默认）；inline=直接 use 注入所有策略组（旧行为，
+  // 旧数据无此字段时按 inline 兼容）；bare=仅生成 proxy-providers 不挂接
+  providerMode?: "grouped" | "inline" | "bare";
+  // 机场组名（仅 grouped 模式生效；emoji 拼在组名前缀，留空回落为 "✈️ <key>"）
+  providerGroupName?: string;
+  // provider 节点过滤正则（mihomo proxy-providers filter）；未设置时生成默认正则，显式清空则不写 filter
+  providerFilter?: string;
   // 独立的流量/到期元信息 URL（可选）
   userinfoUrl?: string;
   // 获取流量/到期元信息时使用的自定义 User-Agent（可选）
@@ -212,6 +222,9 @@ export interface ConfigState {
   // 节点监听端口（用于生成 listeners）
   listenerPorts: Record<string, number>;
 
+  // 分组监听：给已存在的策略组绑定 inbound 端口（用于生成 listeners）
+  groupListeners: GroupListenerBinding[];
+
   // 生成结果
   generatedYaml: string;
   generatedYamlError: string | null;
@@ -301,6 +314,11 @@ export interface ConfigActions {
   setListenerPort: (nodeName: string, port: number | null) => void;
   bulkSetListenerPorts: (patch: Record<string, number | null>) => void;
 
+  // 分组监听
+  addGroupListener: (binding?: Partial<Omit<GroupListenerBinding, "id">>) => void;
+  updateGroupListener: (id: string, patch: Partial<Omit<GroupListenerBinding, "id">>) => void;
+  removeGroupListener: (id: string) => void;
+
   // 生成配置
   generateConfig: () => string;
   setGeneratedYaml: (yaml: string) => void;
@@ -360,6 +378,7 @@ export const initialState: ConfigState = {
   cnIpNoResolve: DEFAULT_SUBBOOST_CONFIG.cnIpNoResolve,
   experimentalCnUseCnRuleSet: DEFAULT_SUBBOOST_CONFIG.experimentalCnUseCnRuleSet,
   listenerPorts: {},
+  groupListeners: [],
   generatedYaml: "",
   generatedYamlError: null,
   history: [],
diff --git a/packages/ui/src/store/config-store/generated-yaml.test.ts b/packages/ui/src/store/config-store/generated-yaml.test.ts
index dc4c0e8..5531f57 100644
--- a/packages/ui/src/store/config-store/generated-yaml.test.ts
+++ b/packages/ui/src/store/config-store/generated-yaml.test.ts
@@ -58,6 +58,7 @@ describe("computeGeneratedYamlResult", () => {
         testInterval: 600,
         enabledProxyGroups: ["select", "ai"],
         ruleOrder: ["module:ai"],
+        groupListeners: [{ id: "g1", target: "美国中转", port: 7891 }],
       })
     );
 
@@ -70,15 +71,20 @@ describe("computeGeneratedYamlResult", () => {
           "url_source-1": {
             type: "http",
             url: "https://example.com/sub.yaml",
-            interval: 3600,
+            interval: 43200,
             path: "./proxy_providers/url_source-1.yaml",
+            filter: "(?i)^(?!.*(到期时间|套餐到期|官网|更新|到期)).*",
             "health-check": {
               enable: true,
               url: "https://cp.cloudflare.com/generate_204",
-              interval: 600,
+              interval: 300,
+              timeout: 5000,
+              lazy: true,
             },
           },
         },
+        proxyProviderAttachments: [{ key: "url_source-1", mode: "inline" }],
+        groupListeners: [{ id: "g1", target: "美国中转", port: 7891 }],
         userConfig: expect.objectContaining({
           enabledGroups: ["select", "ai"],
           enabledRules: ["select", "ai"],
diff --git a/packages/ui/src/store/config-store/generated-yaml.ts b/packages/ui/src/store/config-store/generated-yaml.ts
index b202822..ac8e475 100644
--- a/packages/ui/src/store/config-store/generated-yaml.ts
+++ b/packages/ui/src/store/config-store/generated-yaml.ts
@@ -1,40 +1,13 @@
 import { generateClashYaml } from "@subboost/core/generator";
+import { buildProxyProviderPlanFromSources, type ProxyProviderPlan } from "@subboost/core/subscription/proxy-providers";
 import { stripImportedNodeControlFieldsFromList } from "@subboost/core/subscription/imported-node-controls";
 import type { ConfigState } from "./definitions";
 
-function buildProxyProvidersFromSources(
-  state: ConfigState
-): Record<string, unknown> | undefined {
-  const out: Record<string, unknown> = {};
-
-  for (const source of state.sources) {
-    if (!source || source.type !== "url" || !source.useProxyProviders) continue;
-    const url = typeof source.content === "string" ? source.content.trim() : "";
-    if (!url) continue;
-
-    let parsed: URL;
-    try {
-      parsed = new URL(url);
-    } catch {
-      continue;
-    }
-    if (!["http:", "https:"].includes(parsed.protocol)) continue;
-
-    const name = `url_${source.id}`;
-    out[name] = {
-      type: "http",
-      url,
-      interval: 3600,
-      path: `./proxy_providers/${name}.yaml`,
-      "health-check": {
-        enable: true,
-        url: state.testUrl,
-        interval: state.testInterval,
-      },
-    };
-  }
-
-  return Object.keys(out).length > 0 ? out : undefined;
+function buildProxyProviderPlan(state: ConfigState): ProxyProviderPlan | undefined {
+  return buildProxyProviderPlanFromSources(state.sources, {
+    testUrl: state.testUrl,
+    testInterval: state.testInterval,
+  });
 }
 
 export type GeneratedYamlResult = {
@@ -50,11 +23,12 @@ function formatGeneratedYamlError(error: unknown): string {
 
 function buildGenerateClashYamlOptions(
   state: ConfigState,
-  proxyProviders: Record<string, unknown> | undefined
+  providerPlan: ProxyProviderPlan | undefined
 ): GenerateClashYamlOptions {
   return {
     nodes: stripImportedNodeControlFieldsFromList(state.nodes),
-    proxyProviders,
+    proxyProviders: providerPlan?.providers,
+    proxyProviderAttachments: providerPlan?.attachments,
     template: state.template,
     userConfig: {
       enabledGroups: state.enabledProxyGroups,
@@ -79,15 +53,16 @@ function buildGenerateClashYamlOptions(
     proxyGroupAdvanced: state.proxyGroupAdvanced,
     proxyGroupNameOverrides: state.proxyGroupNameOverrides,
     proxyGroupOrder: state.proxyGroupOrder,
+    groupListeners: state.groupListeners,
   };
 }
 
 export function computeGeneratedYamlResult(state: ConfigState): GeneratedYamlResult {
-  const proxyProviders = buildProxyProvidersFromSources(state);
-  const hasPreviewContent = state.nodes.length > 0 || Boolean(proxyProviders);
+  const providerPlan = buildProxyProviderPlan(state);
+  const hasPreviewContent = state.nodes.length > 0 || Boolean(providerPlan);
 
   try {
-    const yaml = generateClashYaml(buildGenerateClashYamlOptions(state, proxyProviders));
+    const yaml = generateClashYaml(buildGenerateClashYamlOptions(state, providerPlan));
     return { yaml: hasPreviewContent ? yaml : "", error: null };
   } catch (error) {
     return { yaml: "", error: formatGeneratedYamlError(error) };