From 53d148f9bc8410095a863ef1e9703558952ce54f Mon Sep 17 00:00:00 2001
From: luke <lpukatch@gmail.com>
Date: Sat, 19 Sep 2026 14:39:19 -0400
Subject: [PATCH 1/2] feat(feed): add per-league separation override

---
 frontend/src/api/settings.ts                  |  2 +
 .../src/components/PerLeagueChannelConfig.tsx | 43 ++++++++++++++++++-
 teamarr/api/routes/subscription.py            |  5 +++
 .../event_group_processor/matching.py         | 17 ++++++--
 .../event_group_processor/processor.py        | 14 +++++-
 teamarr/database/migrations/__init__.py       |  2 +
 teamarr/database/migrations/versioned.py      |  7 +++
 teamarr/database/schema.sql                   |  4 +-
 teamarr/database/subscription.py              | 17 ++++++--
 tests/migrations/test_migration_helpers.py    | 19 ++++++++
 tests/test_feed_separation.py                 |  7 +++
 tests/test_matchup_order_setting.py           |  7 +++
 12 files changed, 134 insertions(+), 10 deletions(-)

diff --git a/frontend/src/api/settings.ts b/frontend/src/api/settings.ts
index a397fcbb3..a6bf69e19 100644
--- a/frontend/src/api/settings.ts
+++ b/frontend/src/api/settings.ts
@@ -660,6 +660,7 @@ export interface SubscriptionLeagueConfig {
   channel_group_mode: string | null
   matchup_order: string | null // "auto" | "away_first" | "home_first"; null = global setting
   included_divisions: string[] | null // #811: null = every division ESPN files under the league
+  feed_separation_enabled: boolean | null // #862: null = global setting
 }
 
 export interface LeagueDivision {
@@ -689,6 +690,7 @@ export async function upsertLeagueConfig(
     channel_group_mode?: string | null
     matchup_order?: string | null
     included_divisions?: string[] | null
+    feed_separation_enabled?: boolean | null
   }
 ): Promise<SubscriptionLeagueConfig> {
   return api.put(`/league-configs/${encodeURIComponent(leagueCode)}`, data)
diff --git a/frontend/src/components/PerLeagueChannelConfig.tsx b/frontend/src/components/PerLeagueChannelConfig.tsx
index 74e88f096..16166d4b9 100644
--- a/frontend/src/components/PerLeagueChannelConfig.tsx
+++ b/frontend/src/components/PerLeagueChannelConfig.tsx
@@ -55,6 +55,7 @@ function LeagueConfigRow({
     channel_group_mode?: string | null
     matchup_order?: string | null
     included_divisions?: string[] | null
+    feed_separation_enabled?: boolean | null
   }) => Promise<void>
   onClear: () => Promise<void>
 }) {
@@ -62,6 +63,7 @@ function LeagueConfigRow({
   const [localGroupId, setLocalGroupId] = useState<number | null>(null)
   const [localGroupMode, setLocalGroupMode] = useState<string | null>(null)
   const [localMatchupOrder, setLocalMatchupOrder] = useState<string | null>(null)
+  const [localFeedSeparationEnabled, setLocalFeedSeparationEnabled] = useState<boolean | null>(null)
   // #811: the divisions still ingested. Held as the checked set (null config =
   // all of them), so the UI never has to special-case "no override".
   const [localDivisions, setLocalDivisions] = useState<string[]>([])
@@ -84,12 +86,14 @@ function LeagueConfigRow({
       setLocalGroupId(config.channel_group_id)
       setLocalGroupMode(config.channel_group_mode)
       setLocalMatchupOrder(config.matchup_order ?? null)
+      setLocalFeedSeparationEnabled(config.feed_separation_enabled)
       setLocalDivisions(config.included_divisions ?? divisions.map((d) => d.key))
     } else if (isExpanded && !config) {
       setLocalProfileIds([])
       setLocalGroupId(null)
       setLocalGroupMode(null)
       setLocalMatchupOrder(null)
+      setLocalFeedSeparationEnabled(null)
       setLocalDivisions(divisions.map((d) => d.key))
     }
   }
@@ -134,6 +138,7 @@ function LeagueConfigRow({
         channel_group_id: localGroupId,
         channel_group_mode: localGroupMode,
         matchup_order: localMatchupOrder,
+        feed_separation_enabled: localFeedSeparationEnabled,
         // All of them is stored as "no override" so the selection still means
         // everything if ESPN's slate gains a division later.
         included_divisions:
@@ -178,6 +183,13 @@ function LeagueConfigRow({
             {matchupOrderSummary}
           </span>
         </td>
+        <td className="px-3 py-1.5">
+          <span className={cn("text-xs", !hasOverride && "text-muted-foreground")}>
+            {config?.feed_separation_enabled === null || config?.feed_separation_enabled === undefined
+              ? "Default"
+              : config.feed_separation_enabled ? "Enabled" : "Disabled"}
+          </span>
+        </td>
         <td className="px-3 py-1.5 text-right">
           {hasOverride && (
             <Button
@@ -197,7 +209,7 @@ function LeagueConfigRow({
       </tr>
       {isExpanded && (
         <tr>
-          <td colSpan={8} className="px-4 py-3 bg-muted/20 border-t-0">
+          <td colSpan={9} className="px-4 py-3 bg-muted/20 border-t-0">
             <div className="space-y-4 max-w-2xl">
               {/* Channel Profiles */}
               <div>
@@ -327,6 +339,32 @@ function LeagueConfigRow({
                 </div>
               )}
 
+              {/* Feed separation (#862) */}
+              <div>
+                <Label className="text-sm font-medium">Feed Separation</Label>
+                <p className="text-xs text-muted-foreground mb-2">
+                  Choose whether HOME/AWAY feeds create separate channels for this league.
+                  Default inherits the global setting, which remains the master toggle.
+                </p>
+                <Select
+                  value={
+                    localFeedSeparationEnabled === null
+                      ? ""
+                      : localFeedSeparationEnabled ? "enabled" : "disabled"
+                  }
+                  onChange={(e) =>
+                    setLocalFeedSeparationEnabled(
+                      e.target.value === "" ? null : e.target.value === "enabled"
+                    )
+                  }
+                  className="w-64"
+                >
+                  <option value="">Default (inherit)</option>
+                  <option value="enabled">Enabled</option>
+                  <option value="disabled">Disabled</option>
+                </Select>
+              </div>
+
               {/* Matchup Order (#692) */}
               <div>
                 <Label className="text-sm font-medium">Matchup Order</Label>
@@ -486,6 +524,7 @@ export function PerLeagueChannelConfig() {
                 <th className="px-3 py-2 text-left font-medium">Channel Group</th>
                 <th className="px-3 py-2 text-left font-medium">Group Mode</th>
                 <th className="px-3 py-2 text-left font-medium">Matchup Order</th>
+                <th className="px-3 py-2 text-left font-medium">Feed Separation</th>
                 <th className="px-3 py-2 text-right font-medium w-16"></th>
               </tr>
             </thead>
@@ -537,7 +576,7 @@ export function PerLeagueChannelConfig() {
                 })}
               {filteredLeagues.length === 0 && (
                 <tr>
-                  <td colSpan={7} className="px-3 py-4 text-center text-muted-foreground">
+                  <td colSpan={9} className="px-3 py-4 text-center text-muted-foreground">
                     {leagueSearch ? "No leagues match your search" : "No subscribed leagues"}
                   </td>
                 </tr>
diff --git a/teamarr/api/routes/subscription.py b/teamarr/api/routes/subscription.py
index 9f4ca5b18..e7f71d84f 100644
--- a/teamarr/api/routes/subscription.py
+++ b/teamarr/api/routes/subscription.py
@@ -95,6 +95,7 @@ class LeagueConfigResponse(BaseModel):
     channel_group_mode: str | None = None
     matchup_order: str | None = None  # #692: None = global setting
     included_divisions: list[str] | None = None  # #811: None = every division
+    feed_separation_enabled: bool | None = None  # #862: None = global setting
 
 
 class LeagueConfigUpdate(BaseModel):
@@ -105,6 +106,7 @@ class LeagueConfigUpdate(BaseModel):
     channel_group_mode: str | None = None
     matchup_order: str | None = None  # #692: 'auto' | 'away_first' | 'home_first'
     included_divisions: list[str] | None = None  # #811: None = every division
+    feed_separation_enabled: bool | None = None  # #862: None = global setting
 
 
 class LeagueDivision(BaseModel):
@@ -376,6 +378,7 @@ def list_league_configs():
                 channel_group_mode=c.channel_group_mode,
                 matchup_order=c.matchup_order,
                 included_divisions=c.included_divisions,
+                feed_separation_enabled=c.feed_separation_enabled,
             )
             for c in configs
         ],
@@ -405,6 +408,7 @@ def upsert_league_config_endpoint(league_code: str, request: LeagueConfigUpdate)
             channel_group_mode=request.channel_group_mode,
             matchup_order=request.matchup_order,
             included_divisions=included_divisions,
+            feed_separation_enabled=request.feed_separation_enabled,
         )
     set_league_matchup_order(league_code, config.matchup_order)  # render-time cache (#692)
 
@@ -415,6 +419,7 @@ def upsert_league_config_endpoint(league_code: str, request: LeagueConfigUpdate)
         channel_group_mode=config.channel_group_mode,
         matchup_order=config.matchup_order,
         included_divisions=config.included_divisions,
+        feed_separation_enabled=config.feed_separation_enabled,
     )
 
 
diff --git a/teamarr/consumers/event_group_processor/matching.py b/teamarr/consumers/event_group_processor/matching.py
index a5b4bf411..60484d2a9 100644
--- a/teamarr/consumers/event_group_processor/matching.py
+++ b/teamarr/consumers/event_group_processor/matching.py
@@ -31,8 +31,12 @@
 logger = logging.getLogger(__name__)
 
 
-def _separation_applies(event: Any, separation_sports: list[str] | None) -> bool:
-    """Whether feed separation splits channels for this event's sport (#732).
+def _separation_applies(
+    event: Any,
+    separation_sports: list[str] | None,
+    disabled_leagues: set[str] | None = None,
+) -> bool:
+    """Whether feed separation splits channels for this event (#732, #862).
 
     An empty or missing list means every sport — separation was global before
     #732, so that is both the upgrade default and the "no opinion" answer.
@@ -42,6 +46,8 @@ def _separation_applies(event: Any, separation_sports: list[str] | None) -> bool
     has nothing to say, and the master toggle stands. Excluding here would
     silently un-split channels whenever a provider omitted the field.
     """
+    if getattr(event, "league", None) in (disabled_leagues or set()):
+        return False
     if not separation_sports:
         return True
     sport = getattr(event, "sport", None)
@@ -536,6 +542,7 @@ def _resolve_feed_teams(
         detect_team_names: bool,
         separation_enabled: bool,
         separation_sports: list[str] | None = None,
+        disabled_leagues: set[str] | None = None,
     ) -> list[dict]:
         """Resolve feed hints to actual teams (Phase 2 feed separation).
 
@@ -571,6 +578,8 @@ def _resolve_feed_teams(
                 None means every sport — the pre-#732 behavior, and what
                 existing installs upgrade to. Narrows the master toggle only;
                 it can never turn separation on where the toggle is off.
+            disabled_leagues: League codes whose per-league override disables
+                separation (#862).
         """
         for entry in matched_streams:
             event = entry.get("event")
@@ -610,7 +619,9 @@ def _resolve_feed_teams(
                             source = "team_name_detect"
                             break
 
-            splits = separation_enabled and _separation_applies(event, separation_sports)
+            splits = separation_enabled and _separation_applies(
+                event, separation_sports, disabled_leagues
+            )
 
             entry["stream_feed_team"] = feed_team
             entry["feed_team"] = feed_team if splits else None
diff --git a/teamarr/consumers/event_group_processor/processor.py b/teamarr/consumers/event_group_processor/processor.py
index 208a082aa..c5e463cda 100644
--- a/teamarr/consumers/event_group_processor/processor.py
+++ b/teamarr/consumers/event_group_processor/processor.py
@@ -710,11 +710,19 @@ def _mark(phase: str) -> None:
             # identification persists per-stream for team_feed ordering rules;
             # feed_separation.enabled gates only channel splitting.
             feed_settings = get_feed_separation_settings(conn)
+            from teamarr.database.subscription import get_league_configs
+
+            feed_separation_disabled_leagues = {
+                config.league_code
+                for config in get_league_configs(conn)
+                if config.feed_separation_enabled is False
+            }
             matched_streams = self._resolve_feed_teams(
                 matched_streams,
                 feed_settings.detect_team_names,
                 feed_settings.enabled,
                 feed_settings.sports,
+                feed_separation_disabled_leagues,
             )
 
             # Sort channels: sport → league → time → event_id (fixed order since v59)
@@ -771,7 +779,11 @@ def _effective_event_id(m) -> str | None:
                     eid
                     for m in matched_streams
                     if (eid := _effective_event_id(m))
-                    and _separation_applies(m.get("event"), feed_settings.sports)
+                    and _separation_applies(
+                        m.get("event"),
+                        feed_settings.sports,
+                        feed_separation_disabled_leagues,
+                    )
                 }
                 if feed_settings.enabled
                 else set()
diff --git a/teamarr/database/migrations/__init__.py b/teamarr/database/migrations/__init__.py
index c0f0cb042..2e5d8fe3e 100644
--- a/teamarr/database/migrations/__init__.py
+++ b/teamarr/database/migrations/__init__.py
@@ -48,6 +48,7 @@
     _migrate_v87_cfl_team_selections,
     _migrate_v92_retire_tsdb_tier,
     _migrate_v96_hockeytech_bellmedia,
+    _migrate_v97_league_feed_separation,
     _recover_schema_version_from_v65_backup_if_needed,
     _run_migrations,
     _table_exists,
@@ -93,6 +94,7 @@
     "_migrate_v87_cfl_team_selections",
     "_migrate_v92_retire_tsdb_tier",
     "_migrate_v96_hockeytech_bellmedia",
+    "_migrate_v97_league_feed_separation",
     "_recover_schema_version_from_v65_backup_if_needed",
     "_rename_league_id_column_if_needed",
     "_run_migrations",
diff --git a/teamarr/database/migrations/versioned.py b/teamarr/database/migrations/versioned.py
index 43121b755..a2890d225 100644
--- a/teamarr/database/migrations/versioned.py
+++ b/teamarr/database/migrations/versioned.py
@@ -2761,6 +2761,13 @@ def _migrate_v92_retire_tsdb_tier(conn: sqlite3.Connection) -> None:
     logger.info("[MIGRATE] v92: cleared tsdb_tier on %d league row(s)", cleared)
 
 
+def _migrate_v97_league_feed_separation(conn: sqlite3.Connection) -> None:
+    """Add the nullable per-league feed separation override (#862)."""
+    _add_column_if_not_exists(
+        conn, "subscription_league_config", "feed_separation_enabled", "BOOLEAN DEFAULT NULL"
+    )
+
+
 def _migrate_v95_team_channel_defaults(conn: sqlite3.Connection) -> None:
     """Seed the managed-channel name/logo defaults on existing team templates.
 
diff --git a/teamarr/database/schema.sql b/teamarr/database/schema.sql
index f9aa23ac1..212bd6f59 100644
--- a/teamarr/database/schema.sql
+++ b/teamarr/database/schema.sql
@@ -814,7 +814,9 @@ CREATE TABLE IF NOT EXISTS subscription_league_config (
     -- NCAA divisions this league still ingests (#811): NULL = every division
     -- ESPN files under the league, otherwise a JSON list of division keys
     -- (see COLLEGE_SCOREBOARD_DIVISIONS). A dropped division is never fetched.
-    included_divisions JSON DEFAULT NULL
+    included_divisions JSON DEFAULT NULL,
+    -- Feed separation override (#862): NULL = use global setting
+    feed_separation_enabled BOOLEAN DEFAULT NULL
 );
 
 
diff --git a/teamarr/database/subscription.py b/teamarr/database/subscription.py
index 55a31a31c..91ed9ce61 100644
--- a/teamarr/database/subscription.py
+++ b/teamarr/database/subscription.py
@@ -46,6 +46,8 @@ class SubscriptionLeagueConfig:
     # #811: NCAA divisions this league ingests. None = every division ESPN
     # files under it (the default); otherwise the kept division keys.
     included_divisions: list[str] | None = None
+    # #862: None inherits the global feed separation setting.
+    feed_separation_enabled: bool | None = None
 
 
 @dataclass
@@ -499,19 +501,21 @@ def upsert_league_config(
     channel_group_mode: str | None = None,
     matchup_order: str | None = None,
     included_divisions: list[str] | None = None,
+    feed_separation_enabled: bool | None = None,
 ) -> SubscriptionLeagueConfig:
     """Create or update per-league config. Returns the saved config."""
     conn.execute(
         """INSERT INTO subscription_league_config
            (league_code, channel_profile_ids, channel_group_id,
-            channel_group_mode, matchup_order, included_divisions)
-           VALUES (?, ?, ?, ?, ?, ?)
+             channel_group_mode, matchup_order, included_divisions, feed_separation_enabled)
+            VALUES (?, ?, ?, ?, ?, ?, ?)
            ON CONFLICT(league_code) DO UPDATE SET
                channel_profile_ids = excluded.channel_profile_ids,
                channel_group_id = excluded.channel_group_id,
                channel_group_mode = excluded.channel_group_mode,
                matchup_order = excluded.matchup_order,
-               included_divisions = excluded.included_divisions
+                included_divisions = excluded.included_divisions,
+                feed_separation_enabled = excluded.feed_separation_enabled
         """,
         (
             league_code,
@@ -522,6 +526,7 @@ def upsert_league_config(
             channel_group_mode,
             matchup_order,
             json.dumps(included_divisions) if included_divisions is not None else None,
+            feed_separation_enabled,
         ),
     )
     logger.info("[LEAGUE_CONFIG] Upserted config for %s", league_code)
@@ -564,4 +569,10 @@ def _build_league_config(row) -> SubscriptionLeagueConfig:
         channel_group_mode=row["channel_group_mode"],
         matchup_order=row["matchup_order"] if "matchup_order" in row.keys() else None,
         included_divisions=divisions,
+        feed_separation_enabled=(
+            bool(row["feed_separation_enabled"])
+            if "feed_separation_enabled" in row.keys()
+            and row["feed_separation_enabled"] is not None
+            else None
+        ),
     )
diff --git a/tests/migrations/test_migration_helpers.py b/tests/migrations/test_migration_helpers.py
index 450507e5d..d9b60223b 100644
--- a/tests/migrations/test_migration_helpers.py
+++ b/tests/migrations/test_migration_helpers.py
@@ -277,6 +277,7 @@ def test_relaxes_check_constraint_allowing_custom_pattern(self, db):
             "INSERT INTO subscription_league_config (league_code, channel_group_mode) "
             "VALUES ('eng.1', '{sport} | {league}')"
         )
+
         row = db.execute(
             "SELECT channel_group_mode FROM subscription_league_config WHERE league_code='eng.1'"
         ).fetchone()
@@ -309,6 +310,24 @@ def test_idempotent(self, db):
         assert "default_channel_group_id" in cols
 
 
+# =============================================================================
+# v97: per-league feed separation override
+# =============================================================================
+
+
+class TestV97LeagueFeedSeparation:
+    def test_adds_nullable_feed_separation_override(self, db):
+        from teamarr.database.migrations import (
+            _migrate_v61_subscription_league_config,
+            _migrate_v97_league_feed_separation,
+        )
+
+        _migrate_v61_subscription_league_config(db)
+        _migrate_v97_league_feed_separation(db)
+        columns = {row[1] for row in db.execute("PRAGMA table_info(subscription_league_config)")}
+        assert "feed_separation_enabled" in columns
+
+
 # =============================================================================
 # v66: TSDB tiered provider model
 # =============================================================================
diff --git a/tests/test_feed_separation.py b/tests/test_feed_separation.py
index b27e15537..de1d8f2ec 100644
--- a/tests/test_feed_separation.py
+++ b/tests/test_feed_separation.py
@@ -1413,6 +1413,13 @@ def test_unlisted_sport_does_not_apply(self):
 
         assert _separation_applies(self._event("racing"), ["baseball"]) is False
 
+    def test_disabled_league_does_not_apply(self):
+        from teamarr.consumers.event_group_processor.matching import _separation_applies
+
+        event = self._event("baseball")
+        event.league = "mlb"
+        assert _separation_applies(event, [], {"mlb"}) is False
+
     def test_event_without_a_sport_is_never_excluded(self):
         # The list can only speak about sports; not knowing the sport means it
         # has nothing to say, so the master toggle stands. Excluding here would
diff --git a/tests/test_matchup_order_setting.py b/tests/test_matchup_order_setting.py
index 313386ae1..e4d39cedf 100644
--- a/tests/test_matchup_order_setting.py
+++ b/tests/test_matchup_order_setting.py
@@ -152,6 +152,13 @@ def test_display_setting_and_league_override_persist(db_path):
         assert get_league_config(conn, "eng.1") is None
 
 
+def test_per_league_feed_separation_override_persists(db_path):
+    with get_connection(db_path) as conn:
+        config = upsert_league_config(conn, "nfl", feed_separation_enabled=False)
+        assert config.feed_separation_enabled is False
+        assert get_league_config(conn, "nfl").feed_separation_enabled is False
+
+
 def test_schema_rejects_unknown_modes(db_path):
     with get_connection(db_path) as conn:
         with pytest.raises(sqlite3.IntegrityError):

From dd0c9109b2573dd3bfb6188a219bdc867e4f6241 Mon Sep 17 00:00:00 2001
From: luke <lpukatch@gmail.com>
Date: Sat, 19 Sep 2026 14:40:26 -0400
Subject: [PATCH 2/2] chore(beads): record issue discussion

---
 .beads/interactions.jsonl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.beads/interactions.jsonl b/.beads/interactions.jsonl
index 14107456f..384770387 100644
--- a/.beads/interactions.jsonl
+++ b/.beads/interactions.jsonl
@@ -979,3 +979,4 @@
 {"id":"int-543d6daae23c869734e3476978a94fb7","kind":"field_change","created_at":"2026-09-18T03:32:32.214406398Z","actor":"luke","issue_id":"teamarr-9yg4","extra":{"field":"status","new_value":"closed","old_value":"in_progress","reason":"Replaced the expired fixed date with a window-relative trusted stream date; audited matching tests for comparable calendar coupling."}}
 {"id":"int-8c07dda1ddd1cabe86b73bc8acf24d84","kind":"field_change","created_at":"2026-09-18T03:41:46.985536441Z","actor":"luke","issue_id":"teamarr-ifqc","extra":{"field":"status","new_value":"closed","old_value":"in_progress","reason":"Fixed colon-form NFL schedule prefix parsing; regression test and exact fixture-match reproduction pass."}}
 {"id":"int-ed0574732b9ae1d8b3360da1014ba17a","kind":"field_change","created_at":"2026-09-19T17:28:28.067773275Z","actor":"luke","issue_id":"teamarr-1i0n","extra":{"field":"status","new_value":"closed","old_value":"in_progress","reason":"Implemented orientation-aware tie-breaking with regression coverage; PR pending review."}}
+{"id":"int-04c3e31b14db500af9b552c627ca0e08","kind":"field_change","created_at":"2026-09-19T18:39:25.953893355Z","actor":"luke","issue_id":"teamarr-ecug","extra":{"field":"status","new_value":"closed","old_value":"in_progress","reason":"Implemented per-league feed separation overrides in PR #TBD."}}