prismcast 1.8.0 → 1.9.0

package/dist/routes/config/channels/routes.js

@@ -1,15 +1,48 @@
 import { LOG, formatError, generateChannelKey, parseM3U, sanitizeString, stringifySorted } from "../../../utils/index.js";
 import { PREDEFINED_CHANNELS, PREDEFINED_TAGS } from "../../../channels/index.js";
 import { VALID_OPTIONAL_COLUMNS, buildChannelTablePatch, buildChannelTableState, generateTagFilterContent, generateTagManagerBody } from "./table.js";
-import { VALID_SORT_FIELDS, compareChannelSort, getAllProviderTags, getCanonicalKey, getChannelProviderLabel, getEnabledProviders, getProviderGroup, getProviderSelection, getProviderTagForChannel, getResolvedChannel, resolvePredefinedVariant, resolveProviderKey, setEnabledProviders, setProviderSelection } from "../../../config/providers.js";
-import { filterDefaults, loadUserConfig, saveUserConfig } from "../../../config/userConfig.js";
-import { getActiveTagVocabulary, getChannelEffectiveTags, getChannelListing, getEastWithPacificPredefinedKeys, getPacificPredefinedKeys, getPredefinedChannel, getPredefinedChannels, getTagRegistry, getUserChannels, isPredefinedChannel, isUserChannel, loadUserChannels, resolveStoredChannel, saveProviderSelections, saveTagRegistry, saveUserChannels, setTagRegistry, transformChannelTags, validateChannelKey, validateChannelName, validateChannelNumber, validateChannelProfile, validateChannelUrl, validateImportedChannels } from "../../../config/userChannels.js";
+import { VALID_SORT_FIELDS, compareChannelSort, getAllServiceTags, getCanonicalKey, getChannelServiceLabel, getEnabledServices, getResolvedChannel, getServiceDisplayName, getServiceGroup, getServiceSelection, getServiceTagForChannel, isServiceTagEnabled, resolvePredefinedVariant, resolveServiceKey, setEnabledServices, setServiceSelection } from "../../../config/services.js";
+import { getActiveTagVocabulary, getChannelEffectiveTags, getChannelListing, getEastWithPacificPredefinedKeys, getPacificPredefinedKeys, getPredefinedChannel, getPredefinedChannels, getTagRegistry, getUserChannels, isPredefinedChannel, isUserChannel, mutateChannels, resolveStoredChannel, saveServiceSelections, saveTagRegistry, setTagRegistry, tagsMatch, transformChannelTags, validateChannelKey, validateChannelName, validateChannelNumber, validateChannelProfile, validateChannelUrl, validateImportedChannels } from "../../../config/userChannels.js";
 import { CONFIG } from "../../../config/index.js";
+import { FileStoreParseError } from "../../../config/persistence.js";
+import { getDomainConfig } from "../../../config/sites.js";
 import { getProfiles } from "../../../config/profiles.js";
+import { mutateConfig } from "../../../config/userConfig.js";
 import { updateChannelLogo } from "../../../streaming/showInfo.js";
+/**
+ * Sends an appropriate error response for a caught error. FileStoreParseError (corrupt JSON file) produces a 400 with the parse error details. All other errors
+ * produce a 500 with the formatted error message. This is the single error response path for all channel route handlers.
+ * @param res - The Express response object.
+ * @param error - The caught error.
+ * @param action - Human-readable description of the failed action for the log message (e.g., "import channels", "toggle channel").
+ */
+function sendErrorResponse(res, error, action) {
+    if (error instanceof FileStoreParseError) {
+        res.status(400).json({ error: error.message, success: false });
+        return;
+    }
+    LOG.error("Failed to %s: %s.", action, formatError(error));
+    res.status(500).json({ error: "Failed to " + action + ": " + formatError(error), success: false });
+}
 // Fields that appear in the generated M3U playlist and affect Channels DVR's view of the channel. Used to decide whether the playlist reload hint is shown.
-const M3U_FIELDS = ["channelNumber", "name", "stationId", "tvgShift"];
+const M3U_FIELDS = ["channelNumber", "guideTitle", "logoUrl", "name", "stationId", "tvgShift"];
 const PLAYLIST_HINT = " Reload the playlist in Channels DVR to see this change.";
+/**
+ * Builds a service filter warning when a URL's service tag is not in the active filter. Returns undefined when no filter is active, the tag is "direct", or the
+ * tag is already enabled. The client shows the returned warning as a toast with a one-click enable action.
+ * @param url - The channel URL to derive the service tag from.
+ * @returns The warning with service tag and display label, or undefined if no warning is needed.
+ */
+function buildServiceFilterWarning(url) {
+    if (getEnabledServices().length === 0) {
+        return undefined;
+    }
+    const tag = getDomainConfig(url)?.serviceTag;
+    if (tag && (tag !== "direct") && !isServiceTagEnabled(tag)) {
+        return { serviceLabel: getServiceDisplayName(url), serviceTag: tag };
+    }
+    return undefined;
+}
 /**
  * Checks whether a stored channel entry contains any fields that affect the M3U playlist. Used to decide whether to append the playlist reload hint when reverting
  * or removing an override.
@@ -28,17 +61,18 @@ async function disablePredefinedChannels(keys) {
     if (keys.length === 0) {
         return;
     }
-    const configResult = await loadUserConfig();
-    const userConfig = configResult.config;
-    userConfig.channels ??= {};
-    userConfig.channels.disabledPredefined ??= [];
-    const disabledSet = new Set(userConfig.channels.disabledPredefined);
-    for (const key of keys) {
-        disabledSet.add(key);
-    }
-    userConfig.channels.disabledPredefined = [...disabledSet].sort();
-    await saveUserConfig(userConfig);
-    CONFIG.channels.disabledPredefined = userConfig.channels.disabledPredefined;
+    let updatedList = [];
+    await mutateConfig((config) => {
+        config.channels ??= {};
+        config.channels.disabledPredefined ??= [];
+        const disabledSet = new Set(config.channels.disabledPredefined);
+        for (const key of keys) {
+            disabledSet.add(key);
+        }
+        config.channels.disabledPredefined = [...disabledSet].toSorted();
+        updatedList = config.channels.disabledPredefined;
+    });
+    CONFIG.channels.disabledPredefined = updatedList;
 }
 /**
  * Enables one or more predefined channels by removing their keys from the disabledPredefined list in user config. Updates both the config file and the
@@ -49,17 +83,18 @@ async function enablePredefinedChannels(keys) {
     if (keys.length === 0) {
         return;
     }
-    const configResult = await loadUserConfig();
-    const userConfig = configResult.config;
-    userConfig.channels ??= {};
-    userConfig.channels.disabledPredefined ??= [];
-    const disabledSet = new Set(userConfig.channels.disabledPredefined);
-    for (const key of keys) {
-        disabledSet.delete(key);
-    }
-    userConfig.channels.disabledPredefined = [...disabledSet].sort();
-    await saveUserConfig(userConfig);
-    CONFIG.channels.disabledPredefined = userConfig.channels.disabledPredefined;
+    let updatedList = [];
+    await mutateConfig((config) => {
+        config.channels ??= {};
+        config.channels.disabledPredefined ??= [];
+        const disabledSet = new Set(config.channels.disabledPredefined);
+        for (const key of keys) {
+            disabledSet.delete(key);
+        }
+        config.channels.disabledPredefined = [...disabledSet].toSorted();
+        updatedList = config.channels.disabledPredefined;
+    });
+    CONFIG.channels.disabledPredefined = updatedList;
 }
 /**
  * Installs all channel-related route handlers on the Express application.
@@ -80,8 +115,7 @@ export function setupChannelRoutes(app) {
             res.send(stringifySorted(resolved) + "\n");
         }
         catch (error) {
-            LOG.error("Failed to export channels: %s.", formatError(error));
-            res.status(500).json({ error: "Failed to export channels: " + formatError(error) });
+            sendErrorResponse(res, error, "export channels");
         }
     });
     // POST /config/channels/import - Import channels from JSON, replacing all existing user channels.
@@ -95,8 +129,13 @@ export function setupChannelRoutes(app) {
                 res.status(400).json({ error: "Validation errors:\n" + validationResult.errors.join("\n") });
                 return;
             }
-            // Save the imported channels, replacing all existing user channels.
-            await saveUserChannels(validationResult.channels);
+            // Save the imported channels, replacing all existing user channels. Clear the current map and assign the imported entries.
+            await mutateChannels((channels) => {
+                for (const key of Object.keys(channels)) {
+                    Reflect.deleteProperty(channels, key);
+                }
+                Object.assign(channels, validationResult.channels);
+            });
             const channelCount = Object.keys(validationResult.channels).length;
             // Return a full table patch since a bulk JSON import replaces all user channels — every row in the listing may have changed.
             const allKeys = getChannelListing().map((entry) => entry.key);
@@ -104,8 +143,7 @@ export function setupChannelRoutes(app) {
                 patch: buildChannelTablePatch(allKeys, getProfiles()), success: true });
         }
         catch (error) {
-            LOG.error("Failed to import channels: %s.", formatError(error));
-            res.status(500).json({ error: "Failed to import channels: " + formatError(error) });
+            sendErrorResponse(res, error, "import channels");
         }
     });
     // POST /config/channels/import-m3u - Import channels from M3U playlist file.
@@ -134,9 +172,6 @@ export function setupChannelRoutes(app) {
                 });
                 return;
             }
-            // Load existing user channels.
-            const loadResult = await loadUserChannels();
-            const existingChannels = loadResult.parseError ? {} : loadResult.channels;
             // Track import statistics.
             const affectedKeys = [];
             const conflicts = [];
@@ -145,7 +180,8 @@ export function setupChannelRoutes(app) {
             let imported = 0;
             let replaced = 0;
             let skipped = 0;
-            // Process each parsed channel. Sanitize string values before validation to strip non-printable characters.
+            // Pre-validate and sanitize each parsed channel before entering the mutation. This keeps pure validation outside the serialized write lock.
+            const validEntries = [];
             for (const m3uChannel of parseResult.channels) {
                 m3uChannel.name = sanitizeString(m3uChannel.name);
                 m3uChannel.url = sanitizeString(m3uChannel.url);
@@ -174,19 +210,6 @@ export function setupChannelRoutes(app) {
                     importErrors.push("Channel '" + m3uChannel.name + "': " + nameError);
                     continue;
                 }
-                // Check for conflicts with existing channels.
-                if (key in existingChannels) {
-                    conflicts.push(key);
-                    if (conflictMode === "skip") {
-                        skipped++;
-                        continue;
-                    }
-                    // Replace mode - count as replaced instead of imported.
-                    replaced++;
-                }
-                else {
-                    imported++;
-                }
                 // Build the channel object.
                 const channel = {
                     name: m3uChannel.name,
@@ -196,12 +219,29 @@ export function setupChannelRoutes(app) {
                 if (m3uChannel.stationId) {
                     channel.stationId = m3uChannel.stationId;
                 }
-                // Add to channels collection.
-                existingChannels[key] = channel;
-                affectedKeys.push(key);
+                validEntries.push({ channel, key });
             }
-            // Save the updated channels.
-            await saveUserChannels(existingChannels);
+            // Apply the validated entries inside the transactional mutation. Conflict detection happens against the current stored channels.
+            await mutateChannels((channels) => {
+                for (const { channel, key } of validEntries) {
+                    // Check for conflicts with existing channels.
+                    if (key in channels) {
+                        conflicts.push(key);
+                        if (conflictMode === "skip") {
+                            skipped++;
+                            continue;
+                        }
+                        // Replace mode - count as replaced instead of imported.
+                        replaced++;
+                    }
+                    else {
+                        imported++;
+                    }
+                    // Add to channels collection.
+                    channels[key] = channel;
+                    affectedKeys.push(key);
+                }
+            });
             // Log the import.
             LOG.info("M3U import completed: %d imported, %d replaced, %d skipped.", imported, replaced, skipped);
             // Build response with patch for in-place UI update.
@@ -216,13 +256,12 @@ export function setupChannelRoutes(app) {
             });
         }
         catch (error) {
-            LOG.error("Failed to import M3U channels: %s.", formatError(error));
-            res.status(500).json({ error: "Failed to import channels: " + formatError(error), success: false });
+            sendErrorResponse(res, error, "import channels");
         }
     });
     // POST /config/channels/modify - Apply channel modifications from the browse modal. Handles four action types: 'add' creates new user channels, 'enable'
-    // re-enables a disabled predefined channel and sets its provider, 'switch' changes the provider selection for an existing channel, and 'remove' reverts a
-    // channel to its canonical provider (disabling it if no alternative provider is available). Channel writes and provider selection changes are batched into
+    // re-enables a disabled predefined channel and sets its service, 'switch' changes the service selection for an existing channel, and 'remove' reverts a
+    // channel to its canonical service (disabling it if no alternative service is available). Channel writes and service selection changes are batched into
     // single saves to avoid redundant file I/O.
     app.post("/config/channels/modify", async (req, res) => {
         try {
@@ -233,21 +272,17 @@ export function setupChannelRoutes(app) {
                 res.status(400).json({ error: "No channels provided.", success: false });
                 return;
             }
-            // Load existing user channels.
-            const loadResult = await loadUserChannels();
-            const existingChannels = loadResult.parseError ? {} : loadResult.channels;
-            // Build a set of all existing channel keys (predefined + user) for deduplication.
-            const allKeys = new Set([...Object.keys(PREDEFINED_CHANNELS), ...Object.keys(existingChannels)]);
             const affectedKeys = new Set();
             const disablePredefined = new Set();
             const errors = [];
             let added = 0;
             let removed = 0;
             let switched = 0;
-            let channelsChanged = false;
-            let selectionsChanged = false;
+            // Mutable flags tracking whether channels or selections were modified. Declared as a state object rather than bare booleans so that TypeScript's
+            // control-flow narrowing does not produce false positives when reading the flags after the mutateChannels callback (which mutates them via closure).
+            const modified = { channels: false, selections: false };
             // Build a UserChannel object from an entry's fields. Shared by the switch/enable and add paths to avoid duplicating channel construction logic. When
-            // canonicalKey is provided, the channel is a provider variant — identity fields (name, stationId) are omitted because they're resolved from the canonical
+            // canonicalKey is provided, the channel is a service variant — identity fields (name, stationId) are omitted because they're resolved from the canonical
             // at runtime via applyVariantInheritance. Standalone channels (no canonicalKey) include all fields.
             function buildUserChannel(entry, channelName, channelUrl, selector, canonicalKey) {
                 const channel = {
@@ -260,113 +295,117 @@ export function setupChannelRoutes(app) {
                 }
                 return channel;
             }
-            for (const entry of channels) {
-                const action = entry.action ?? "add";
-                const name = sanitizeString(entry.name?.trim() ?? "");
-                const providerSlug = entry.providerSlug?.trim() ?? "";
-                // Handle enable and switch. Enable re-enables a disabled predefined channel, then falls through to the switch logic to set the provider selection.
-                // Switch changes the provider selection for an existing channel to point to the browsed provider's variant, creating the variant if needed.
-                if ((action === "switch") || (action === "enable")) {
-                    const canonicalKey = entry.canonicalKey?.trim() ?? "";
-                    if (!canonicalKey) {
-                        errors.push("Entry for '" + name + "' missing canonical key.");
+            // Process all entries inside a single transactional mutation to avoid TOCTOU races between load and save.
+            await mutateChannels((existingChannels) => {
+                // Build a set of all existing channel keys (predefined + user) for deduplication.
+                const allKeys = new Set([...Object.keys(PREDEFINED_CHANNELS), ...Object.keys(existingChannels)]);
+                for (const entry of channels) {
+                    const action = entry.action ?? "add";
+                    const name = sanitizeString(entry.name?.trim() ?? "");
+                    const serviceSlug = entry.serviceSlug?.trim() ?? "";
+                    // Handle enable and switch. Enable re-enables a disabled predefined channel, then falls through to the switch logic to set the service selection.
+                    // Switch changes the service selection for an existing channel to point to the browsed service's variant, creating the variant if needed.
+                    if ((action === "switch") || (action === "enable")) {
+                        const canonicalKey = entry.canonicalKey?.trim() ?? "";
+                        if (!canonicalKey) {
+                            errors.push("Entry for '" + name + "' missing canonical key.");
+                            continue;
+                        }
+                        const variantKey = canonicalKey + "-" + serviceSlug;
+                        // If no variant exists for this service, create one as a user channel. The canonicalKey parameter tells buildUserChannel to produce a variant
+                        // (service-specific fields only, no identity fields).
+                        if (!allKeys.has(variantKey)) {
+                            existingChannels[variantKey] = buildUserChannel(entry, name, sanitizeString(entry.url?.trim() ?? ""), sanitizeString(entry.channelSelector?.trim() ?? ""), canonicalKey);
+                            allKeys.add(variantKey);
+                            modified.channels = true;
+                        }
+                        setServiceSelection(canonicalKey, variantKey);
+                        modified.selections = true;
+                        switched++;
+                        affectedKeys.add(canonicalKey);
                         continue;
                     }
-                    // Re-enable the channel if it was disabled. Must complete before setting the provider selection since the config write makes the channel
-                    // visible in the lineup.
-                    if (action === "enable") {
-                        // eslint-disable-next-line no-await-in-loop -- Sequential: config state must be updated before setting provider selection.
-                        await enablePredefinedChannels([canonicalKey]);
+                    // Handle service removal. Reverts the channel away from this service using a three-tier fallback: (1) clear the selection and let
+                    // resolveServiceKey find the next enabled variant or canonical, (2) if the resolved service is still this service (no alternative exists),
+                    // disable the predefined channel or delete the user channel.
+                    if (action === "remove") {
+                        const canonicalKey = entry.canonicalKey?.trim() ?? "";
+                        if (!canonicalKey) {
+                            errors.push("Remove entry for '" + name + "' missing canonical key.");
+                            continue;
+                        }
+                        // Clear the service selection. resolveServiceKey will now return the canonical or the first enabled alternative variant.
+                        setServiceSelection(canonicalKey, canonicalKey);
+                        modified.selections = true;
+                        // Check if the resolved service is still this service. If so, there is no alternative — disable or delete the channel.
+                        const resolvedKey = resolveServiceKey(canonicalKey);
+                        const resolvedTag = getServiceTagForChannel(resolvedKey);
+                        if (resolvedTag === serviceSlug) {
+                            // No alternative service exists. Disable predefined channels or delete user channels.
+                            if (isPredefinedChannel(canonicalKey)) {
+                                disablePredefined.add(canonicalKey);
+                            }
+                            else {
+                                Reflect.deleteProperty(existingChannels, canonicalKey);
+                                modified.channels = true;
+                            }
+                        }
+                        removed++;
+                        affectedKeys.add(canonicalKey);
+                        continue;
                     }
-                    const variantKey = canonicalKey + "-" + providerSlug;
-                    // If no variant exists for this provider, create one as a user channel. The canonicalKey parameter tells buildUserChannel to produce a variant
-                    // (provider-specific fields only, no identity fields).
-                    if (!allKeys.has(variantKey)) {
-                        existingChannels[variantKey] = buildUserChannel(entry, name, sanitizeString(entry.url?.trim() ?? ""), sanitizeString(entry.channelSelector?.trim() ?? ""), canonicalKey);
-                        allKeys.add(variantKey);
-                        channelsChanged = true;
+                    // Handle add. Creates a new user channel for channels not yet in the lineup. The browse modal sends 'add' only for genuinely new channels (no
+                    // existing canonical). Channels that match existing canonicals appear as 'switch' state in the modal.
+                    const url = sanitizeString(entry.url?.trim() ?? "");
+                    const channelSelector = sanitizeString(entry.channelSelector?.trim() ?? "");
+                    if (!name) {
+                        errors.push("Channel entry missing name.");
+                        continue;
                     }
-                    setProviderSelection(canonicalKey, variantKey);
-                    selectionsChanged = true;
-                    switched++;
-                    affectedKeys.add(canonicalKey);
-                    continue;
-                }
-                // Handle provider removal. Reverts the channel away from this provider using a three-tier fallback: (1) clear the selection and let
-                // resolveProviderKey find the next enabled variant or canonical, (2) if the resolved provider is still this provider (no alternative exists),
-                // disable the predefined channel or delete the user channel.
-                if (action === "remove") {
-                    const canonicalKey = entry.canonicalKey?.trim() ?? "";
-                    if (!canonicalKey) {
-                        errors.push("Remove entry for '" + name + "' missing canonical key.");
+                    if (!url) {
+                        errors.push("Channel '" + name + "' missing URL.");
                         continue;
                     }
-                    // Clear the provider selection. resolveProviderKey will now return the canonical or the first enabled alternative variant.
-                    setProviderSelection(canonicalKey, canonicalKey);
-                    selectionsChanged = true;
-                    // Check if the resolved provider is still this provider. If so, there is no alternative — disable or delete the channel.
-                    const resolvedKey = resolveProviderKey(canonicalKey);
-                    const resolvedTag = getProviderTagForChannel(resolvedKey);
-                    if (resolvedTag === providerSlug) {
-                        // No alternative provider exists. Disable predefined channels or delete user channels.
-                        if (isPredefinedChannel(canonicalKey)) {
-                            disablePredefined.add(canonicalKey);
-                        }
-                        else {
-                            Reflect.deleteProperty(existingChannels, canonicalKey);
-                            channelsChanged = true;
-                        }
+                    const urlError = validateChannelUrl(url);
+                    if (urlError) {
+                        errors.push("Channel '" + name + "': " + urlError);
+                        continue;
                     }
-                    removed++;
-                    affectedKeys.add(canonicalKey);
-                    continue;
-                }
-                // Handle add. Creates a new user channel for channels not yet in the lineup. The browse modal sends 'add' only for genuinely new channels (no
-                // existing canonical). Channels that match existing canonicals appear as 'switch' state in the modal instead.
-                const url = sanitizeString(entry.url?.trim() ?? "");
-                const channelSelector = sanitizeString(entry.channelSelector?.trim() ?? "");
-                if (!name) {
-                    errors.push("Channel entry missing name.");
-                    continue;
-                }
-                if (!url) {
-                    errors.push("Channel '" + name + "' missing URL.");
-                    continue;
-                }
-                const urlError = validateChannelUrl(url);
-                if (urlError) {
-                    errors.push("Channel '" + name + "': " + urlError);
-                    continue;
-                }
-                const baseKey = generateChannelKey(name);
-                if (!baseKey) {
-                    errors.push("Could not generate key for channel '" + name + "'.");
-                    continue;
-                }
-                const canonicalExists = allKeys.has(baseKey);
-                const key = (canonicalExists && providerSlug) ? baseKey + "-" + providerSlug : baseKey;
-                // Skip channels that already exist in the lineup.
-                if (allKeys.has(key)) {
-                    continue;
+                    const baseKey = generateChannelKey(name);
+                    if (!baseKey) {
+                        errors.push("Could not generate key for channel '" + name + "'.");
+                        continue;
+                    }
+                    const canonicalExists = allKeys.has(baseKey);
+                    const key = (canonicalExists && serviceSlug) ? baseKey + "-" + serviceSlug : baseKey;
+                    // Skip channels that already exist in the lineup.
+                    if (allKeys.has(key)) {
+                        continue;
+                    }
+                    // When the key differs from baseKey, this is a service variant — pass baseKey as canonicalKey so buildUserChannel produces a variant with only
+                    // service-specific fields. Standalone channels (key === baseKey) get the full channel object with identity fields.
+                    const newChannel = buildUserChannel(entry, name, url, channelSelector, (key !== baseKey) ? baseKey : undefined);
+                    existingChannels[key] = newChannel;
+                    allKeys.add(key);
+                    modified.channels = true;
+                    added++;
+                    affectedKeys.add(canonicalExists ? baseKey : key);
                 }
-                // When the key differs from baseKey, this is a provider variant — pass baseKey as canonicalKey so buildUserChannel produces a variant with only
-                // provider-specific fields. Standalone channels (key === baseKey) get the full channel object with identity fields.
-                const newChannel = buildUserChannel(entry, name, url, channelSelector, (key !== baseKey) ? baseKey : undefined);
-                existingChannels[key] = newChannel;
-                allKeys.add(key);
-                channelsChanged = true;
-                added++;
-                affectedKeys.add(canonicalExists ? baseKey : key);
-            }
-            // Save changes. saveUserChannels() persists both channel data and provider selections in a single file write, so we only need saveProviderSelections()
-            // (which writes the same file using the module-level cache) when selections changed but no new channels were added.
-            if (channelsChanged) {
-                await saveUserChannels(existingChannels);
-            }
-            else if (selectionsChanged) {
-                await saveProviderSelections();
-            }
-            // Disable predefined channels that had no alternative provider after removal.
+            });
+            // Enable predefined channels that had the "enable" action. This must happen after the mutation completes since the config write makes the channel
+            // visible in the lineup.
+            const enableKeys = channels
+                .filter((e) => (e.action === "enable") && Boolean(e.canonicalKey?.trim()))
+                .map((e) => e.canonicalKey.trim());
+            if (enableKeys.length > 0) {
+                await enablePredefinedChannels(enableKeys);
+            }
+            // Save service selections when selections changed but no channel data was written. When channels were modified, the mutation already persisted
+            // selections as part of the channel write.
+            if (!modified.channels && modified.selections) {
+                await saveServiceSelections();
+            }
+            // Disable predefined channels that had no alternative service after removal.
             await disablePredefinedChannels([...disablePredefined]);
             for (const disabledKey of disablePredefined) {
                 affectedKeys.add(disabledKey);
@@ -384,11 +423,14 @@ export function setupChannelRoutes(app) {
             }
             const message = (parts.length > 0 ? parts.join(" ") : "No changes made.") + PLAYLIST_HINT;
             LOG.info("Browse channels completed: %d added, %d switched, %d removed.", added, switched, removed);
-            res.json({ added, errors, message, patch: buildChannelTablePatch([...affectedKeys], getProfiles()), removed, success: true, switched });
+            // Check if the browsed service isn't in the active filter. All channels in a browse batch share the same service — derive the tag from the first add entry.
+            const firstAddUrl = (added > 0) ? channels.find((e) => (e.action === "add"))?.url : undefined;
+            const serviceWarning = firstAddUrl ? buildServiceFilterWarning(firstAddUrl) : undefined;
+            res.json({ added, errors, message, patch: buildChannelTablePatch([...affectedKeys], getProfiles()), removed, serviceWarning, success: true,
+                switched });
         }
         catch (error) {
-            LOG.error("Failed to apply browse changes: %s.", formatError(error));
-            res.status(500).json({ error: "Failed to apply changes: " + formatError(error), success: false });
+            sendErrorResponse(res, error, "apply changes");
         }
     });
     // POST /config/channels/toggle-predefined - Toggle a single predefined channel's enabled/disabled state.
@@ -423,57 +465,55 @@ export function setupChannelRoutes(app) {
             res.json({ enabled, key, patch: buildChannelTablePatch([key], getProfiles()), success: true });
         }
         catch (error) {
-            LOG.error("Failed to toggle predefined channel: %s.", formatError(error));
-            res.status(500).json({ error: "Failed to toggle channel: " + formatError(error), success: false });
+            sendErrorResponse(res, error, "toggle channel");
         }
     });
-    // POST /config/provider - Update provider selection for a multi-provider channel.
-    app.post("/config/provider", async (req, res) => {
+    // POST /config/service - Update service selection for a multi-service channel.
+    app.post("/config/service", async (req, res) => {
         try {
             const body = req.body;
             const channelKey = body.channel?.trim();
-            const providerKey = body.provider?.trim();
+            const serviceKey = body.service?.trim();
             // Validate channel key is provided.
             if (!channelKey) {
                 res.status(400).json({ error: "Channel key is required.", success: false });
                 return;
             }
-            // Validate provider key is provided.
-            if (!providerKey) {
-                res.status(400).json({ error: "Provider key is required.", success: false });
+            // Validate service key is provided.
+            if (!serviceKey) {
+                res.status(400).json({ error: "Service key is required.", success: false });
                 return;
             }
             // Canonicalize the channel key to ensure selections are stored under the canonical key, not variant keys.
             const canonicalKey = getCanonicalKey(channelKey);
-            // Validate the channel has provider options.
-            const providerGroup = getProviderGroup(canonicalKey);
-            if (!providerGroup) {
-                res.status(400).json({ error: "Channel '" + canonicalKey + "' does not have multiple providers.", success: false });
+            // Validate the channel has service options.
+            const serviceGroup = getServiceGroup(canonicalKey);
+            if (!serviceGroup) {
+                res.status(400).json({ error: "Channel '" + canonicalKey + "' does not have multiple services.", success: false });
                 return;
             }
-            // Validate the provider key is valid for this channel.
-            const validProviderKeys = providerGroup.variants.map((v) => v.key);
-            if (!validProviderKeys.includes(providerKey)) {
-                res.status(400).json({ error: "Invalid provider '" + providerKey + "' for channel '" + canonicalKey + "'.", success: false });
+            // Validate the service key is valid for this channel.
+            const validServiceKeys = serviceGroup.variants.map((v) => v.key);
+            if (!validServiceKeys.includes(serviceKey)) {
+                res.status(400).json({ error: "Invalid service '" + serviceKey + "' for channel '" + canonicalKey + "'.", success: false });
                 return;
             }
-            // Update the provider selection.
-            setProviderSelection(canonicalKey, providerKey);
+            // Update the service selection.
+            setServiceSelection(canonicalKey, serviceKey);
             // Save to disk.
-            await saveProviderSelections();
+            await saveServiceSelections();
             // Resolve display names for logging before generating the row HTML.
             const canonicalChannel = getResolvedChannel(canonicalKey);
-            const variantChannel = getResolvedChannel(providerKey);
+            const variantChannel = getResolvedChannel(serviceKey);
             const channelName = canonicalChannel?.name ?? canonicalKey;
-            const providerLabel = variantChannel ? getChannelProviderLabel(variantChannel) : providerKey;
-            LOG.info("Provider for %s changed to %s.", channelName, providerLabel);
+            const serviceLabel = variantChannel ? getChannelServiceLabel(variantChannel) : serviceKey;
+            LOG.info("Service for %s changed to %s.", channelName, serviceLabel);
             // Return a channel table patch so the client can update the row and summary counts in place.
             const profiles = getProfiles();
-            res.json({ channel: canonicalKey, patch: buildChannelTablePatch([canonicalKey], profiles), provider: providerKey, success: true });
+            res.json({ channel: canonicalKey, patch: buildChannelTablePatch([canonicalKey], profiles), service: serviceKey, success: true });
         }
         catch (error) {
-            LOG.error("Failed to update provider selection: %s.", formatError(error));
-            res.status(500).json({ error: "Failed to update provider: " + formatError(error), success: false });
+            sendErrorResponse(res, error, "update service");
         }
     });
     // POST /config/channels/bulk-toggle-predefined - Toggle predefined channels by scope (all, pacific, east).
@@ -508,43 +548,41 @@ export function setupChannelRoutes(app) {
                     break;
                 }
             }
-            // Load current config.
-            const configResult = await loadUserConfig();
-            const userConfig = configResult.config;
-            // Initialize channels.disabledPredefined if not present.
-            userConfig.channels ??= {};
+            let updatedList = [];
             const targetSet = new Set(targetKeys);
-            if (enabled && (scope === "all")) {
-                // Enable all is a full reset — clear the entire disabled list.
-                userConfig.channels.disabledPredefined = [];
-            }
-            else if (enabled) {
-                // Scoped enable: remove target keys from the disabled list (subtractive — preserves other disabled channels).
-                userConfig.channels.disabledPredefined = (userConfig.channels.disabledPredefined ?? []).filter((k) => !targetSet.has(k));
-            }
-            else {
-                // Disable: add target keys to the disabled list (additive — preserves other disabled channels).
-                const existing = new Set(userConfig.channels.disabledPredefined ?? []);
-                for (const k of targetKeys) {
-                    existing.add(k);
+            await mutateConfig((config) => {
+                config.channels ??= {};
+                if (enabled && (scope === "all")) {
+                    // Enable all is a full reset - clear the entire disabled list.
+                    config.channels.disabledPredefined = [];
                 }
-                userConfig.channels.disabledPredefined = [...existing].sort();
-            }
-            await saveUserConfig(userConfig);
+                else if (enabled) {
+                    // Scoped enable: remove target keys from the disabled list (subtractive - preserves other disabled channels).
+                    config.channels.disabledPredefined = (config.channels.disabledPredefined ?? []).filter((k) => !targetSet.has(k));
+                }
+                else {
+                    // Disable: add target keys to the disabled list (additive - preserves other disabled channels).
+                    const existing = new Set(config.channels.disabledPredefined ?? []);
+                    for (const k of targetKeys) {
+                        existing.add(k);
+                    }
+                    config.channels.disabledPredefined = [...existing].toSorted();
+                }
+                updatedList = config.channels.disabledPredefined;
+            });
             // Update the runtime CONFIG to reflect the change immediately.
-            CONFIG.channels.disabledPredefined = userConfig.channels.disabledPredefined;
+            CONFIG.channels.disabledPredefined = updatedList;
             const affected = targetKeys.length;
             const scopeLabel = (scope === "all") ? "All" : (scope === "pacific") ? "Pacific" : "East";
             LOG.info("%s predefined channels %s (%d affected).", scopeLabel, enabled ? "enabled" : "disabled", affected);
             res.json({ affected, enabled, keys: targetKeys, patch: buildChannelTablePatch(targetKeys, getProfiles()), scope, success: true });
         }
         catch (error) {
-            LOG.error("Failed to toggle predefined channels: %s.", formatError(error));
-            res.status(500).json({ error: "Failed to toggle channels: " + formatError(error), success: false });
+            sendErrorResponse(res, error, "toggle channels");
         }
     });
     // POST /config/channels/auto-number - Assign sequential channel numbers to visible channels in the current sort order, or clear all channel numbers when
-    // start is 0. Overwrites existing channel numbers for affected channels. Only channels that are enabled and available by provider filter are affected.
+    // start is 0. Overwrites existing channel numbers for affected channels. Only channels that are enabled and available by service filter are affected.
     app.post("/config/channels/auto-number", async (req, res) => {
         try {
             const body = req.body;
@@ -560,40 +598,35 @@ export function setupChannelRoutes(app) {
                 res.status(400).json({ error: "Invalid sort field.", success: false });
                 return;
             }
-            // Get visible channels (enabled + available by provider filter) sorted by the user's current sort order.
-            const listing = getChannelListing().filter((entry) => entry.enabled && entry.availableByProvider);
+            // Get visible channels (enabled + available by service filter) sorted by the user's current sort order.
+            const listing = getChannelListing().filter((entry) => entry.enabled && entry.availableByService);
             listing.sort((a, b) => compareChannelSort(a.channel, a.key, b.channel, b.key, sortField, sortDir));
-            // Load user channels for modification.
-            const result = await loadUserChannels();
-            if (result.parseError) {
-                res.status(400).json({ error: "Cannot auto-number: channels file contains invalid JSON.", success: false });
-                return;
-            }
             const affectedKeys = [];
-            if (clearMode) {
-                // Clear channel numbers from all visible channels. Null signals "clear this field" — the normalizer in saveUserChannels() handles the storage conventions.
-                for (const entry of listing) {
-                    const existing = result.channels[entry.key] ?? {};
-                    existing.channelNumber = null;
-                    result.channels[entry.key] = existing;
-                    affectedKeys.push(entry.key);
+            await mutateChannels((channels) => {
+                if (clearMode) {
+                    // Clear channel numbers from all visible channels. Null signals "clear this field" - the normalizer handles the storage conventions.
+                    for (const entry of listing) {
+                        const existing = channels[entry.key] ?? {};
+                        existing.channelNumber = null;
+                        channels[entry.key] = existing;
+                        affectedKeys.push(entry.key);
+                    }
                 }
-            }
-            else {
-                // Assign sequential numbers starting from the requested start value.
-                for (let i = 0; i < listing.length; i++) {
-                    const entry = listing[i];
-                    const num = start + i;
-                    if (num > 99999) {
-                        break;
+                else {
+                    // Assign sequential numbers starting from the requested start value.
+                    for (let i = 0; i < listing.length; i++) {
+                        const entry = listing[i];
+                        const num = start + i;
+                        if (num > 99999) {
+                            break;
+                        }
+                        const existing = channels[entry.key] ?? {};
+                        existing.channelNumber = num;
+                        channels[entry.key] = existing;
+                        affectedKeys.push(entry.key);
                     }
-                    const existing = result.channels[entry.key] ?? {};
-                    existing.channelNumber = num;
-                    result.channels[entry.key] = existing;
-                    affectedKeys.push(entry.key);
                 }
-            }
-            await saveUserChannels(result.channels);
+            });
             const action = clearMode ? "Cleared" : "Numbered";
             LOG.info("%s channel numbers for %d channels.", action, affectedKeys.length);
             const profiles = getProfiles();
@@ -603,8 +636,7 @@ export function setupChannelRoutes(app) {
             res.json({ affected: affectedKeys.length, message, patch: buildChannelTablePatch(affectedKeys, profiles), success: true });
         }
         catch (error) {
-            LOG.error("Failed to auto-number channels: %s.", formatError(error));
-            res.status(500).json({ error: "Failed to auto-number channels: " + formatError(error), success: false });
+            sendErrorResponse(res, error, "auto-number channels");
         }
     });
     // POST /config/channels/hdhr-bulk - Toggle HDHomeRun lineup inclusion for all visible channels. When enable is true, all channels are included (hdhrEnabled
@@ -613,31 +645,29 @@ export function setupChannelRoutes(app) {
         try {
             const body = req.body;
             const enable = body.enable === true;
-            // Get visible channels (enabled + available by provider filter).
-            const listing = getChannelListing().filter((entry) => entry.enabled && entry.availableByProvider);
-            // Load user channels for modification.
-            const result = await loadUserChannels();
-            if (result.parseError) {
-                res.status(400).json({ error: "Cannot update HDHR settings: channels file contains invalid JSON.", success: false });
-                return;
-            }
+            // Get visible channels (enabled + available by service filter).
+            const listing = getChannelListing().filter((entry) => entry.enabled && entry.availableByService);
             const affectedKeys = [];
+            // Pre-compute which channels need updating. The listing snapshot is consistent since no concurrent mutation can change it before we enter the lock.
             for (const entry of listing) {
                 const current = entry.channel.hdhrEnabled !== false;
                 // Skip channels that already match the target state.
                 if (current === enable) {
                     continue;
                 }
-                const existing = result.channels[entry.key] ?? {};
-                existing.hdhrEnabled = enable ? null : false;
-                result.channels[entry.key] = existing;
                 affectedKeys.push(entry.key);
             }
             if (affectedKeys.length === 0) {
                 res.json({ affected: 0, message: "No changes needed.", success: true });
                 return;
             }
-            await saveUserChannels(result.channels);
+            await mutateChannels((channels) => {
+                for (const key of affectedKeys) {
+                    const existing = channels[key] ?? {};
+                    existing.hdhrEnabled = enable ? null : false;
+                    channels[key] = existing;
+                }
+            });
             const action = enable ? "included in" : "excluded from";
             LOG.info("Bulk HDHR toggle: %d channels %s HDHR lineup.", affectedKeys.length, action);
             const profiles = getProfiles();
@@ -645,18 +675,17 @@ export function setupChannelRoutes(app) {
             res.json({ affected: affectedKeys.length, message, patch: buildChannelTablePatch(affectedKeys, profiles), success: true });
         }
         catch (error) {
-            LOG.error("Failed to bulk-toggle HDHR: %s.", formatError(error));
-            res.status(500).json({ error: "Failed to toggle HDHR settings: " + formatError(error), success: false });
+            sendErrorResponse(res, error, "toggle HDHR settings");
         }
     });
-    // POST /config/channels/bulk-tags - Add or remove a tag on all enabled, provider-available channels. Operates on the same channel set as other bulk actions.
+    // POST /config/channels/bulk-tags - Add or remove a tag on all enabled, service-available channels. Operates on the same channel set as other bulk actions.
     // transformChannelTags handles loading, delta normalization, and persistence. Returns a channel table patch for all affected rows and an updated tag manager
     // modal body.
     app.post("/config/channels/bulk-tags", async (req, res) => {
         try {
             const body = req.body;
             const action = body.action;
-            const tag = typeof body.tag === "string" ? body.tag.trim().toLowerCase() : "";
+            const tag = typeof body.tag === "string" ? body.tag.trim() : "";
             if ((action !== "add") && (action !== "remove")) {
                 res.status(400).json({ error: "Action must be 'add' or 'remove'.", success: false });
                 return;
@@ -665,13 +694,13 @@ export function setupChannelRoutes(app) {
                 res.status(400).json({ error: "Tag is required.", success: false });
                 return;
             }
-            // Validate the tag is in the active vocabulary.
-            const vocabulary = new Set(getActiveTagVocabulary());
-            if (!vocabulary.has(tag)) {
+            // Validate the tag is in the active vocabulary (case-insensitive).
+            const vocabularyLower = new Set(getActiveTagVocabulary().map((t) => t.toLowerCase()));
+            if (!vocabularyLower.has(tag.toLowerCase())) {
                 res.status(400).json({ error: "Unknown tag: " + tag + ".", success: false });
                 return;
             }
-            const { affectedKeys, error } = await transformChannelTags((entry) => entry.enabled && entry.availableByProvider, (tags) => (action === "add") ? (tags.includes(tag) ? tags : [...tags, tag]) : tags.filter((t) => t !== tag));
+            const { affectedKeys, error } = await transformChannelTags((entry) => entry.enabled && entry.availableByService, (tags) => (action === "add") ? (tags.includes(tag) ? tags : [...tags, tag]) : tags.filter((t) => t !== tag));
             if (error) {
                 res.status(400).json({ error, success: false });
                 return;
@@ -694,66 +723,62 @@ export function setupChannelRoutes(app) {
             });
         }
         catch (error) {
-            LOG.error("Failed to bulk-update tags: %s.", formatError(error));
-            res.status(500).json({ error: "Failed to update tags: " + formatError(error), success: false });
+            sendErrorResponse(res, error, "update tags");
         }
     });
-    // POST /config/provider-filter - Update the provider filter (enabled provider tags).
-    app.post("/config/provider-filter", async (req, res) => {
+    // POST /config/service-filter - Update the service filter (enabled service tags).
+    app.post("/config/service-filter", async (req, res) => {
         try {
             const body = req.body;
-            const tags = body.enabledProviders;
+            const tags = body.enabledServices;
             // Validate tags is an array.
             if (!Array.isArray(tags)) {
-                res.status(400).json({ error: "enabledProviders must be an array.", success: false });
+                res.status(400).json({ error: "enabledServices must be an array.", success: false });
                 return;
             }
-            // Validate all tags are known. Tags already in enabledProviders are accepted even if no current channel or profile produces them — this allows stale tags to be
+            // Validate all tags are known. Tags already in enabledServices are accepted even if no current channel or profile produces them — this allows stale tags to be
             // removed via the UI without blocking the request.
-            const knownTags = new Set(getAllProviderTags().map((t) => t.tag));
-            const currentTags = new Set(getEnabledProviders());
+            const knownTags = new Set(getAllServiceTags().map((t) => t.tag));
+            const currentTags = new Set(getEnabledServices());
             for (const tag of tags) {
                 if (!knownTags.has(tag) && !currentTags.has(tag)) {
-                    res.status(400).json({ error: "Unknown provider tag: " + tag, success: false });
+                    res.status(400).json({ error: "Unknown service tag: " + tag, success: false });
                     return;
                 }
             }
             // Update module-level state.
-            setEnabledProviders(tags);
+            setEnabledServices(tags);
             // Update runtime CONFIG.
-            CONFIG.channels.enabledProviders = [...tags];
+            CONFIG.channels.enabledServices = [...tags];
             // Save to config file.
-            const configResult = await loadUserConfig();
-            const userConfig = configResult.config;
-            userConfig.channels ??= {};
-            userConfig.channels.enabledProviders = tags;
-            await saveUserConfig(filterDefaults(userConfig));
-            LOG.info("Provider filter updated: %s.", tags.length > 0 ? tags.join(", ") : "all providers");
+            await mutateConfig((config) => {
+                config.channels ??= {};
+                config.channels.enabledServices = tags;
+            });
+            LOG.info("Service filter updated: %s.", tags.length > 0 ? tags.join(", ") : "all services");
             // Return counts patch so the client can update summary counts after filter change. No rows — the client applies CSS visibility changes itself.
             const { counts, scopeCounts } = buildChannelTableState();
-            res.json({ enabledProviders: tags, patch: { counts, rows: [], scopeCounts }, success: true });
+            res.json({ enabledServices: tags, patch: { counts, rows: [], scopeCounts }, success: true });
         }
         catch (error) {
-            LOG.error("Failed to update provider filter: %s.", formatError(error));
-            res.status(500).json({ error: "Failed to update provider filter: " + formatError(error), success: false });
+            sendErrorResponse(res, error, "update service filter");
         }
     });
-    // POST /config/channels/setup-completed - Mark the Provider Setup flow as completed. Called when the wizard finishes or the user explicitly skips.
+    // POST /config/channels/setup-completed - Mark the Service Setup flow as completed. Called when the wizard finishes or the user explicitly skips.
     app.post("/config/channels/setup-completed", async (_req, res) => {
         try {
             CONFIG.channels.setupCompleted = true;
-            const configResult = await loadUserConfig();
-            configResult.config.channels ??= {};
-            configResult.config.channels.setupCompleted = true;
-            await saveUserConfig(configResult.config);
+            await mutateConfig((config) => {
+                config.channels ??= {};
+                config.channels.setupCompleted = true;
+            });
             // Return a full patch so the client can refresh the channel table after the setup wizard completes. The wizard's browse step may have added channels
-            // via the modify endpoint, and the provider filter may have changed — the patch ensures the table reflects the current state.
+            // via the modify endpoint, and the service filter may have changed — the patch ensures the table reflects the current state.
             const { counts, scopeCounts } = buildChannelTableState();
             res.json({ patch: { counts, rows: [], scopeCounts }, success: true });
         }
         catch (error) {
-            LOG.error("Failed to save setup completed state: %s.", formatError(error));
-            res.status(500).json({ error: "Failed to save setup state: " + formatError(error), success: false });
+            sendErrorResponse(res, error, "save setup state");
         }
     });
     // POST /config/channels/display-prefs - Update channel table display preferences (visible columns, sort field, sort direction).
@@ -791,28 +816,26 @@ export function setupChannelRoutes(app) {
                 CONFIG.channels.channelSortDirection = body.sortDirection;
             }
             // Persist to config file.
-            const configResult = await loadUserConfig();
-            const userConfig = configResult.config;
-            userConfig.channels ??= {};
-            userConfig.channels.channelSortDirection = CONFIG.channels.channelSortDirection;
-            userConfig.channels.channelSortField = CONFIG.channels.channelSortField;
-            userConfig.channels.visibleColumns = CONFIG.channels.visibleColumns;
-            await saveUserConfig(filterDefaults(userConfig));
+            await mutateConfig((config) => {
+                config.channels ??= {};
+                config.channels.channelSortDirection = CONFIG.channels.channelSortDirection;
+                config.channels.channelSortField = CONFIG.channels.channelSortField;
+                config.channels.visibleColumns = CONFIG.channels.visibleColumns;
+            });
             res.json({ success: true });
         }
         catch (error) {
-            LOG.error("Failed to update display preferences: %s.", formatError(error));
-            res.status(500).json({ error: "Failed to update display preferences: " + formatError(error), success: false });
+            sendErrorResponse(res, error, "update display preferences");
         }
     });
-    // POST /config/provider-bulk-assign - Set all channels to a specific provider.
-    app.post("/config/provider-bulk-assign", async (req, res) => {
+    // POST /config/service-bulk-assign - Set all channels to a specific service.
+    app.post("/config/service-bulk-assign", async (req, res) => {
         try {
             const body = req.body;
-            const providerTag = body.provider?.trim();
-            // Validate provider tag.
-            if (!providerTag) {
-                res.status(400).json({ error: "Provider tag is required.", success: false });
+            const serviceTag = body.service?.trim();
+            // Validate service tag.
+            if (!serviceTag) {
+                res.status(400).json({ error: "Service tag is required.", success: false });
                 return;
             }
             let affected = 0;
@@ -821,17 +844,17 @@ export function setupChannelRoutes(app) {
             // Iterate all channels and set those with a matching variant.
             const listing = getChannelListing();
             for (const entry of listing) {
-                const group = getProviderGroup(entry.key);
+                const group = getServiceGroup(entry.key);
                 if (!group || (group.variants.length <= 1)) {
                     continue;
                 }
-                // Find a variant matching the requested provider tag.
-                const matchingVariant = group.variants.find((v) => (getProviderTagForChannel(v.key) === providerTag));
+                // Find a variant matching the requested service tag.
+                const matchingVariant = group.variants.find((v) => (getServiceTagForChannel(v.key) === serviceTag));
                 if (matchingVariant) {
                     // Snapshot the current selection before overwriting so the client can offer undo.
-                    const currentVariant = getProviderSelection(entry.key);
+                    const currentVariant = getServiceSelection(entry.key);
                     previousSelections[entry.key] = currentVariant ?? null;
-                    setProviderSelection(entry.key, matchingVariant.key);
+                    setServiceSelection(entry.key, matchingVariant.key);
                     affected++;
                     // Collect the resolved profile name for client-side UI update.
                     const resolvedChannel = getResolvedChannel(matchingVariant.key);
@@ -839,17 +862,16 @@ export function setupChannelRoutes(app) {
                 }
             }
             // Save to disk.
-            await saveProviderSelections();
-            LOG.info("Bulk assign to '%s': %d of %d channels affected.", providerTag, affected, listing.length);
+            await saveServiceSelections();
+            LOG.info("Bulk assign to '%s': %d of %d channels affected.", serviceTag, affected, listing.length);
             res.json({ affected, previousSelections, selections, success: true, total: listing.length });
         }
         catch (error) {
-            LOG.error("Failed to bulk assign provider: %s.", formatError(error));
-            res.status(500).json({ error: "Failed to bulk assign provider: " + formatError(error), success: false });
+            sendErrorResponse(res, error, "bulk assign service");
         }
     });
-    // POST /config/provider-bulk-restore - Restore previous provider selections (undo bulk assign).
-    app.post("/config/provider-bulk-restore", async (req, res) => {
+    // POST /config/service-bulk-restore - Restore previous service selections (undo bulk assign).
+    app.post("/config/service-bulk-restore", async (req, res) => {
         try {
             const body = req.body;
             const previousSelections = body.selections;
@@ -860,21 +882,21 @@ export function setupChannelRoutes(app) {
             let restored = 0;
             const selections = {};
             for (const [key, variantKey] of Object.entries(previousSelections)) {
-                const group = getProviderGroup(key);
+                const group = getServiceGroup(key);
                 if (!group) {
                     continue;
                 }
                 // A null value means the channel was using the default (canonical) selection. Restoring by setting the selection to the canonical key clears the override.
                 if (variantKey === null) {
-                    setProviderSelection(key, key);
+                    setServiceSelection(key, key);
                 }
                 else {
-                    // Validate the variant belongs to this channel's provider group before restoring.
+                    // Validate the variant belongs to this channel's service group before restoring.
                     const isValid = group.variants.some((v) => (v.key === variantKey));
                     if (!isValid) {
                         continue;
                     }
-                    setProviderSelection(key, variantKey);
+                    setServiceSelection(key, variantKey);
                 }
                 restored++;
                 // Build the same selection response format as bulk assign for client-side UI updates.
@@ -883,13 +905,12 @@ export function setupChannelRoutes(app) {
                 selections[key] = { profile: resolvedChannel?.profile ?? null, variant: effectiveKey };
             }
             // Save to disk.
-            await saveProviderSelections();
+            await saveServiceSelections();
             LOG.info("Bulk restore: %d channel(s) reverted.", restored);
             res.json({ restored, selections, success: true });
         }
         catch (error) {
-            LOG.error("Failed to bulk restore providers: %s.", formatError(error));
-            res.status(500).json({ error: "Failed to bulk restore providers: " + formatError(error), success: false });
+            sendErrorResponse(res, error, "bulk restore services");
         }
     });
     // POST /config/channels - Handle channel add, edit, delete, and revert operations. Returns JSON response.
@@ -913,16 +934,12 @@ export function setupChannelRoutes(app) {
                     res.status(400).json({ message: "Cannot revert '" + key + "': no override exists.", success: false });
                     return;
                 }
-                // Remove the override.
-                const result = await loadUserChannels();
-                if (result.parseError) {
-                    res.status(400).json({ message: "Cannot revert channel: channels file contains invalid JSON.", success: false });
-                    return;
-                }
-                // Check if the override contains M3U-relevant fields before removing it.
-                const revertHint = playlistHintForStored(result.channels[key]);
-                Reflect.deleteProperty(result.channels, key);
-                await saveUserChannels(result.channels);
+                // Remove the override. Check if it contains M3U-relevant fields before removing so the response can include the playlist reload hint.
+                let revertHint = "";
+                await mutateChannels((channels) => {
+                    revertHint = playlistHintForStored(channels[key]);
+                    Reflect.deleteProperty(channels, key);
+                });
                 LOG.info("Channel '%s' reverted to predefined defaults.", key);
                 res.json({ key, message: "Channel '" + key + "' reverted to defaults." + revertHint,
                     patch: buildChannelTablePatch([key], profiles), success: true });
@@ -949,31 +966,28 @@ export function setupChannelRoutes(app) {
                         return;
                     }
                 }
-                // Load and update the channel. For predefined channels, store a delta override with null to clear fields. For user channels, use undefined to delete.
-                const result = await loadUserChannels();
-                if (result.parseError) {
-                    res.status(400).json({ message: "Cannot edit: channels file contains invalid JSON.", success: false });
-                    return;
-                }
-                // Use a StoredChannelMap-compatible update. The ?? {} creates an empty ChannelDelta for predefined channels that don't have a user override yet. Null signals
-                // "clear this field" for all channel types — the normalizer in saveUserChannels() handles delta comparison for predefined channels and null-stripping for
-                // user channels.
-                const stored = result.channels[key] ?? {};
-                if (field === "channelNumber") {
-                    stored.channelNumber = value ? parseInt(value, 10) : null;
-                }
-                else if (field === "hdhrEnabled") {
-                    stored.hdhrEnabled = (value === "false") ? false : null;
-                }
-                else if (field === "tags") {
-                    const tags = value ? [...new Set(value.split(",").map((t) => t.trim().toLowerCase()).filter((t) => t.length > 0))].sort() : [];
-                    stored.tags = (tags.length > 0) ? tags : null;
-                }
-                else {
-                    stored.stationId = value || null;
-                }
-                result.channels[key] = stored;
-                await saveUserChannels(result.channels);
+                // Update the channel inside a transactional mutation. For predefined channels, store a delta override with null to clear fields. For user channels, use
+                // undefined to delete. The ?? {} creates an empty ChannelDelta for predefined channels that don't have a user override yet. Null signals "clear this field"
+                // for all channel types - the normalizer handles delta comparison for predefined channels and null-stripping for user channels.
+                await mutateChannels((channels) => {
+                    const stored = channels[key] ?? {};
+                    if (field === "channelNumber") {
+                        stored.channelNumber = value ? parseInt(value, 10) : null;
+                    }
+                    else if (field === "hdhrEnabled") {
+                        stored.hdhrEnabled = (value === "false") ? false : null;
+                    }
+                    else if (field === "tags") {
+                        const tags = value ?
+                            [...new Set(value.split(",").map((t) => t.trim()).filter((t) => t.length > 0))].toSorted((a, b) => a.localeCompare(b, undefined, { sensitivity: "base" })) :
+                            [];
+                        stored.tags = (tags.length > 0) ? tags : null;
+                    }
+                    else {
+                        stored.stationId = value || null;
+                    }
+                    channels[key] = stored;
+                });
                 const fieldLabels = {
                     channelNumber: "Channel number", hdhrEnabled: "HDHR lineup", stationId: "Station ID", tags: "Tags"
                 };
@@ -995,13 +1009,9 @@ export function setupChannelRoutes(app) {
                     return;
                 }
                 // Delete the channel.
-                const result = await loadUserChannels();
-                if (result.parseError) {
-                    res.status(400).json({ message: "Cannot delete channel: channels file contains invalid JSON.", success: false });
-                    return;
-                }
-                Reflect.deleteProperty(result.channels, key);
-                await saveUserChannels(result.channels);
+                await mutateChannels((channels) => {
+                    Reflect.deleteProperty(channels, key);
+                });
                 LOG.info("User channel '%s' deleted.", key);
                 // Return a patch. If a predefined channel exists with the same key, the patch includes an "update" row for the predefined version (so the client replaces
                 // the user channel row with the predefined original). Otherwise, the patch includes a "remove" action for the deleted key.
@@ -1025,13 +1035,17 @@ export function setupChannelRoutes(app) {
             const name = sanitizeString(body.name ?? "");
             const url = sanitizeString(body.url ?? "");
             const profile = sanitizeString(body.profile ?? "");
+            const guideTitle = sanitizeString(body.guideTitle ?? "");
+            const logoUrl = sanitizeString(body.logoUrl ?? "");
             const stationId = sanitizeString(body.stationId ?? "");
             const channelSelector = sanitizeString(body.channelSelector ?? "");
             const channelNumberStr = sanitizeString(body.channelNumber ?? "");
             const hdhrEnabled = body.hdhrEnabled !== "false";
-            // Parse tags from comma-separated input. Trim, lowercase, filter empty, sort, deduplicate.
+            // Parse tags from comma-separated input. Trim, filter empty, deduplicate, and sort case-insensitively.
             const tagsRaw = sanitizeString(body.tags ?? "");
-            const tags = tagsRaw ? [...new Set(tagsRaw.split(",").map((t) => t.trim().toLowerCase()).filter((t) => t.length > 0))].sort() : [];
+            const tags = tagsRaw ?
+                [...new Set(tagsRaw.split(",").map((t) => t.trim()).filter((t) => t.length > 0))].toSorted((a, b) => a.localeCompare(b, undefined, { sensitivity: "base" })) :
+                [];
             // Validate channel number if provided.
             const channelNumberError = validateChannelNumber(channelNumberStr, key);
             if (channelNumberError) {
@@ -1064,18 +1078,6 @@ export function setupChannelRoutes(app) {
                 res.status(400).json({ errors: formErrors, success: false });
                 return;
             }
-            // Load existing user channels.
-            const result = await loadUserChannels();
-            if (result.parseError) {
-                // If channels file is corrupt, start fresh on add (which will create a valid file).
-                if (action === "add") {
-                    result.channels = {};
-                }
-                else {
-                    res.status(400).json({ message: "Cannot edit channel: channels file contains invalid JSON.", success: false });
-                    return;
-                }
-            }
             let playlistChanged = false;
             // For predefined channels being edited, compute a delta of only the changed fields. For user-defined channels and adds, build a full channel object.
             const predefinedBase = getPredefinedChannel(key);
@@ -1085,7 +1087,9 @@ export function setupChannelRoutes(app) {
                 const formValues = {
                     channelNumber: channelNumberStr ? parseInt(channelNumberStr, 10) : undefined,
                     channelSelector,
+                    guideTitle,
                     hdhrEnabled,
+                    logoUrl,
                     name,
                     profile,
                     stationId,
@@ -1100,11 +1104,11 @@ export function setupChannelRoutes(app) {
                     }
                     return (field === "channelNumber") ? val : val ?? "";
                 };
-                // First check: did the user change anything from what the form showed? The edit form is pre-populated with the selected provider's resolved channel, which
+                // First check: did the user change anything from what the form showed? The edit form is pre-populated with the selected service's resolved channel, which
                 // may differ from the canonical predefined base when a variant is selected (e.g., the Hulu variant has a different URL and channelSelector). If the submitted
-                // values match the displayChannel exactly, the user saved without modification — no override should be created, and any existing override is preserved.
+                // values match the displayChannel exactly, the user saved without modification - no override should be created, and any existing override is preserved.
                 // Tags are compared separately (array comparison) after the scalar fields.
-                const resolvedKey = resolveProviderKey(key);
+                const resolvedKey = resolveServiceKey(key);
                 const displayChannel = getResolvedChannel(resolvedKey) ?? predefinedBase;
                 const displayTags = getChannelEffectiveTags(displayChannel);
                 const scalarUnchanged = Object.keys(formValues).every((field) => formValues[field] === channelValue(displayChannel, field));
@@ -1137,12 +1141,14 @@ export function setupChannelRoutes(app) {
                 const formMatchesChannel = (ch) => Object.keys(formValues).every((field) => formValues[field] === channelValue(ch, field)) &&
                     (JSON.stringify(tags) === JSON.stringify(getChannelEffectiveTags(ch)));
                 if (!hasChanges) {
-                    // The submitted values match the predefined base exactly. If an override exists, this means the user edited their customizations away — treat it as an
+                    // The submitted values match the predefined base exactly. If an override exists, this means the user edited their customizations away - treat it as an
                     // implicit revert by removing the override and returning the predefined row HTML.
                     if (isUserChannel(key)) {
-                        const implicitRevertHint = playlistHintForStored(result.channels[key]);
-                        Reflect.deleteProperty(result.channels, key);
-                        await saveUserChannels(result.channels);
+                        let implicitRevertHint = "";
+                        await mutateChannels((channels) => {
+                            implicitRevertHint = playlistHintForStored(channels[key]);
+                            Reflect.deleteProperty(channels, key);
+                        });
                         LOG.info("Channel '%s' reverted to predefined defaults (edit matched predefined values).", key);
                         res.json({ key, message: "Channel '" + key + "' reverted to defaults." + implicitRevertHint,
                             patch: buildChannelTablePatch([key], profiles), success: true });
@@ -1151,15 +1157,15 @@ export function setupChannelRoutes(app) {
                     res.json({ key, message: "No changes to save.", success: true });
                     return;
                 }
-                // The delta has changes vs the canonical predefined. Before storing a custom override, check if the form values match any provider variant's predefined
+                // The delta has changes vs the canonical predefined. Before storing a custom override, check if the form values match any service variant's predefined
                 // definition. This handles the case where a user edits from a variant (e.g., Hulu), makes a change, saves (creating a custom override), then edits again
-                // and reverts the change. The URL and channelSelector still differ from the canonical predefined but match the variant — that's a revert to the variant,
+                // and reverts the change. The URL and channelSelector still differ from the canonical predefined but match the variant - that's a revert to the variant,
                 // not a new customization. We resolve each variant against pure PREDEFINED data (not the user-overridden channelsRef) to avoid contamination from the
                 // current override.
-                const providerGroup = getProviderGroup(key);
+                const serviceGroup = getServiceGroup(key);
                 let matchedVariantKey;
-                if (providerGroup && isUserChannel(key)) {
-                    for (const variant of providerGroup.variants) {
+                if (serviceGroup && isUserChannel(key)) {
+                    for (const variant of serviceGroup.variants) {
                         // Skip the canonical entry (already handled by the !hasChanges check above) and :predefined entries (synthetic entries for override UI).
                         if ((variant.key === key) || variant.key.includes(":")) {
                             continue;
@@ -1173,29 +1179,38 @@ export function setupChannelRoutes(app) {
                     }
                 }
                 if (matchedVariantKey) {
-                    // Form values match a known variant — revert the override and switch back to that variant.
-                    const variantRevertHint = playlistHintForStored(result.channels[key]);
-                    Reflect.deleteProperty(result.channels, key);
-                    setProviderSelection(key, matchedVariantKey);
-                    await saveUserChannels(result.channels);
+                    // Form values match a known variant - revert the override and switch back to that variant.
+                    let variantRevertHint = "";
+                    await mutateChannels((channels) => {
+                        variantRevertHint = playlistHintForStored(channels[key]);
+                        Reflect.deleteProperty(channels, key);
+                    });
+                    setServiceSelection(key, matchedVariantKey);
                     LOG.info("Channel '%s' reverted to variant '%s' (edit matched variant values).", key, matchedVariantKey);
                     res.json({ key, message: "Channel '" + key + "' reverted to defaults." + variantRevertHint,
                         patch: buildChannelTablePatch([key], profiles), success: true });
                     return;
                 }
-                // No variant match — store the delta and switch the provider selection to the canonical key (the custom override). This ensures the provider dropdown shows
+                // No variant match - store the delta and switch the service selection to the canonical key (the custom override). This ensures the service dropdown shows
                 // "Custom" after saving, which is the expected behavior when a user customizes a predefined channel.
-                setProviderSelection(key, key);
-                result.channels[key] = delta;
+                setServiceSelection(key, key);
+                await mutateChannels((channels) => {
+                    channels[key] = delta;
+                });
                 playlistChanged = M3U_FIELDS.some((f) => f in delta);
             }
             else {
-                // User-defined channel or add: build a full channel object. For edits, snapshot the old channel to detect M3U-relevant changes.
-                const oldChannel = ((action === "edit") && (key in result.channels)) ? result.channels[key] : undefined;
+                // User-defined channel or add: build a full channel object.
                 const channel = {
                     name,
                     url
                 };
+                if (guideTitle) {
+                    channel.guideTitle = guideTitle;
+                }
+                if (logoUrl) {
+                    channel.logoUrl = logoUrl;
+                }
                 if (profile) {
                     channel.profile = profile;
                 }
@@ -1215,13 +1230,20 @@ export function setupChannelRoutes(app) {
                 if (!hdhrEnabled) {
                     channel.hdhrEnabled = false;
                 }
-                result.channels[key] = channel;
-                // For adds the playlist always changes. For edits, check whether any M3U-relevant field differs from the old stored values.
-                playlistChanged = (action === "add") ||
-                    ((oldChannel !== undefined) &&
-                        M3U_FIELDS.some((f) => channel[f] !== oldChannel[f]));
+                // For edits, snapshot the old channel inside the mutation to detect M3U-relevant changes. For adds the playlist always changes.
+                await mutateChannels((channels) => {
+                    if (action === "edit") {
+                        const oldChannel = (key in channels) ? channels[key] : undefined;
+                        channels[key] = channel;
+                        playlistChanged = (oldChannel !== undefined) &&
+                            M3U_FIELDS.some((f) => channel[f] !== oldChannel[f]);
+                    }
+                    else {
+                        channels[key] = channel;
+                        playlistChanged = true;
+                    }
+                });
             }
-            await saveUserChannels(result.channels);
             // Trigger a logo lookup for the new or updated station ID. Fire-and-forget - the logo appears on the next page load.
             if (stationId) {
                 updateChannelLogo(name || key, stationId);
@@ -1231,18 +1253,20 @@ export function setupChannelRoutes(app) {
             // Generate HTML for the channel row so the client can update the DOM without a full page reload.
             // Append a playlist reload hint when the change affects M3U content that Channels DVR consumes.
             const playlistHint = playlistChanged ? PLAYLIST_HINT : "";
-            // Return success response with patch for client-side DOM update. Changes take effect immediately due to hot-reloading in saveUserChannels().
+            // Check if the new channel's service isn't in the active filter.
+            const serviceWarning = (action === "add") ? buildServiceFilterWarning(url) : undefined;
+            // Return success response with patch for client-side DOM update. Changes take effect immediately due to hot-reloading in mutateChannels().
             res.json({
                 isNew: action === "add",
                 key,
                 message: "Channel '" + key + "' " + actionLabel + " successfully." + playlistHint,
                 patch: buildChannelTablePatch([key], profiles),
+                serviceWarning,
                 success: true
             });
         }
         catch (error) {
-            LOG.error("Failed to save channel: %s.", formatError(error));
-            res.status(500).json({ message: "Failed to save channel: " + formatError(error), success: false });
+            sendErrorResponse(res, error, "save channel");
         }
     });
     // Tag Management Endpoints.
@@ -1261,7 +1285,7 @@ export function setupChannelRoutes(app) {
     app.post("/config/tags", async (req, res) => {
         try {
             const body = req.body;
-            const tag = typeof body.tag === "string" ? body.tag.trim().toLowerCase() : "";
+            const tag = typeof body.tag === "string" ? body.tag.trim() : "";
             if (tag.length === 0) {
                 res.status(400).json({ error: "Tag name is required.", success: false });
                 return;
@@ -1270,19 +1294,19 @@ export function setupChannelRoutes(app) {
                 res.status(400).json({ error: "Tag name must be 30 characters or less.", success: false });
                 return;
             }
-            if (!(/^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/).test(tag)) {
-                res.status(400).json({ error: "Tag name must start and end with a letter or number, and contain only lowercase letters, numbers, and hyphens.", success: false });
+            if (!(/^[a-zA-Z0-9]([a-zA-Z0-9 -]*[a-zA-Z0-9])?$/).test(tag)) {
+                res.status(400).json({ error: "Tag name must start and end with a letter or number, and contain only letters, numbers, spaces, and hyphens.", success: false });
                 return;
             }
-            // Check if the tag already exists in the active vocabulary.
-            const vocabulary = new Set(getActiveTagVocabulary());
-            if (vocabulary.has(tag)) {
+            // Check if the tag already exists in the active vocabulary (case-insensitive).
+            const vocabularyLower = new Set(getActiveTagVocabulary().map((t) => t.toLowerCase()));
+            if (vocabularyLower.has(tag.toLowerCase())) {
                 res.status(409).json({ error: "Tag '" + tag + "' already exists.", success: false });
                 return;
             }
             // Check if the tag is a deleted predefined tag — the user should restore it instead of creating a duplicate.
             const registry = getTagRegistry();
-            if (registry.deletedTags.includes(tag)) {
+            if (registry.deletedTags.some((t) => tagsMatch(t, tag))) {
                 res.status(409).json({ error: "Tag '" + tag + "' is a deleted predefined tag. Use restore instead of creating a new one.", success: false });
                 return;
             }
@@ -1297,8 +1321,7 @@ export function setupChannelRoutes(app) {
             });
         }
         catch (error) {
-            LOG.error("Failed to create tag: %s.", formatError(error));
-            res.status(500).json({ error: "Failed to create tag: " + formatError(error), success: false });
+            sendErrorResponse(res, error, "create tag");
         }
     });
     // DELETE /config/tags/:tag - Delete a tag from the vocabulary and cascade to all channel assignments. For predefined tags, the tag is added to deletedTags. For
@@ -1306,36 +1329,38 @@ export function setupChannelRoutes(app) {
     // override, user channels via direct modification. This ensures re-creating a tag with the same name starts fresh with no ghost assignments.
     app.delete("/config/tags/:tag", async (req, res) => {
         try {
-            const tag = req.params.tag?.toLowerCase() ?? "";
+            const tag = req.params.tag?.trim() ?? "";
             if (tag.length === 0) {
                 res.status(400).json({ error: "Tag name is required.", success: false });
                 return;
             }
             const registry = getTagRegistry();
-            const isPredefined = PREDEFINED_TAGS.includes(tag);
-            const isUserTag = registry.tags.includes(tag);
+            const isPredefined = PREDEFINED_TAGS.some((t) => tagsMatch(t, tag));
+            const isUserTag = registry.tags.some((t) => tagsMatch(t, tag));
             if (!isPredefined && !isUserTag) {
                 res.status(404).json({ error: "Tag '" + tag + "' not found.", success: false });
                 return;
             }
             if (isPredefined) {
+                // Find the canonical predefined form for storage.
+                const canonicalTag = PREDEFINED_TAGS.find((t) => tagsMatch(t, tag)) ?? tag;
                 // Already deleted — no-op, return current state without unnecessary I/O.
-                if (registry.deletedTags.includes(tag)) {
+                if (registry.deletedTags.some((t) => tagsMatch(t, tag))) {
                     res.json({
                         active: getActiveTagVocabulary(), filterContent: generateTagFilterContent(), modalBody: generateTagManagerBody(),
                         registry: getTagRegistry(), success: true
                     });
                     return;
                 }
-                registry.deletedTags.push(tag);
+                registry.deletedTags.push(canonicalTag);
             }
             else {
                 // Remove from user tags.
-                registry.tags = registry.tags.filter((t) => t !== tag);
+                registry.tags = registry.tags.filter((t) => !tagsMatch(t, tag));
             }
             setTagRegistry(registry);
             // Cascade: strip the deleted tag from all channel assignments. transformChannelTags handles loading, delta normalization, and persistence.
-            const { affectedKeys, error } = await transformChannelTags((entry) => entry.channel.tags?.includes(tag) === true, (tags) => tags.filter((t) => t !== tag));
+            const { affectedKeys, error } = await transformChannelTags((entry) => entry.channel.tags?.some((t) => tagsMatch(t, tag)) === true, (tags) => tags.filter((t) => !tagsMatch(t, tag)));
             if (error) {
                 res.status(400).json({ error, success: false });
                 return;
@@ -1351,8 +1376,7 @@ export function setupChannelRoutes(app) {
             });
         }
         catch (error) {
-            LOG.error("Failed to delete tag: %s.", formatError(error));
-            res.status(500).json({ error: "Failed to delete tag: " + formatError(error), success: false });
+            sendErrorResponse(res, error, "delete tag");
         }
     });
     // POST /config/tags/restore - Restore a previously deleted predefined tag. Removes it from deletedTags so it reappears in the active vocabulary, then
@@ -1361,25 +1385,28 @@ export function setupChannelRoutes(app) {
     app.post("/config/tags/restore", async (req, res) => {
         try {
             const body = req.body;
-            const tag = typeof body.tag === "string" ? body.tag.trim().toLowerCase() : "";
+            const tag = typeof body.tag === "string" ? body.tag.trim() : "";
             if (tag.length === 0) {
                 res.status(400).json({ error: "Tag name is required.", success: false });
                 return;
             }
             const registry = getTagRegistry();
-            if (!registry.deletedTags.includes(tag)) {
+            if (!registry.deletedTags.some((t) => tagsMatch(t, tag))) {
                 res.status(404).json({ error: "Tag '" + tag + "' is not a deleted predefined tag.", success: false });
                 return;
             }
-            registry.deletedTags = registry.deletedTags.filter((t) => t !== tag);
+            registry.deletedTags = registry.deletedTags.filter((t) => !tagsMatch(t, tag));
             setTagRegistry(registry);
             // Cascade-restore: add the tag back to predefined channels whose definition includes it but whose current resolved tags don't (stripped during cascade
             // delete). transformChannelTags handles loading, delta normalization, and persistence. The normalizer strips the tags delta when the result matches the
             // predefined definition, cleanly reverting the channel to its default state.
+            // Resolve the canonical predefined tag name for the restored tag so channel data uses the predefined casing.
+            const canonicalTag = PREDEFINED_TAGS.find((t) => tagsMatch(t, tag)) ?? tag;
             const { affectedKeys, error } = await transformChannelTags((entry) => {
                 const predefined = getPredefinedChannel(entry.key);
-                return (predefined?.tags?.includes(tag) === true) && (entry.channel.tags?.includes(tag) !== true);
-            }, (tags) => [...tags, tag]);
+                return (predefined?.tags?.some((t) => tagsMatch(t, tag)) === true) &&
+                    (entry.channel.tags?.some((t) => tagsMatch(t, tag)) !== true);
+            }, (tags) => [...tags, canonicalTag]);
             if (error) {
                 res.status(400).json({ error, success: false });
                 return;
@@ -1395,8 +1422,7 @@ export function setupChannelRoutes(app) {
             });
         }
         catch (error) {
-            LOG.error("Failed to restore tag: %s.", formatError(error));
-            res.status(500).json({ error: "Failed to restore tag: " + formatError(error), success: false });
+            sendErrorResponse(res, error, "restore tag");
         }
     });
     // POST /config/tags/rename - Rename a tag atomically across the vocabulary and all channel assignments. For predefined tags, the old name is added to
@@ -1405,19 +1431,20 @@ export function setupChannelRoutes(app) {
     app.post("/config/tags/rename", async (req, res) => {
         try {
             const body = req.body;
-            const oldTag = typeof body.oldTag === "string" ? body.oldTag.trim().toLowerCase() : "";
-            const newTag = typeof body.newTag === "string" ? body.newTag.trim().toLowerCase() : "";
+            const oldTag = typeof body.oldTag === "string" ? body.oldTag.trim() : "";
+            const newTag = typeof body.newTag === "string" ? body.newTag.trim() : "";
             if (!oldTag || !newTag) {
                 res.status(400).json({ error: "Both old and new tag names are required.", success: false });
                 return;
             }
+            // Exact comparison — case-only renames (e.g., "sports" → "Sports") are valid since tags are freeform with preserved casing.
             if (oldTag === newTag) {
                 res.status(400).json({ error: "New tag name must differ from the old name.", success: false });
                 return;
             }
-            if (!(/^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/).test(newTag)) {
+            if (!(/^[a-zA-Z0-9]([a-zA-Z0-9 -]*[a-zA-Z0-9])?$/).test(newTag)) {
                 res.status(400).json({
-                    error: "Tag name must start and end with a letter or number, and contain only lowercase letters, numbers, and hyphens.", success: false
+                    error: "Tag name must start and end with a letter or number, and contain only letters, numbers, spaces, and hyphens.", success: false
                 });
                 return;
             }
@@ -1425,34 +1452,36 @@ export function setupChannelRoutes(app) {
                 res.status(400).json({ error: "Tag name must be 30 characters or less.", success: false });
                 return;
             }
-            // Validate old tag exists in the active vocabulary.
-            const vocabulary = new Set(getActiveTagVocabulary());
-            if (!vocabulary.has(oldTag)) {
+            // Validate old tag exists in the active vocabulary (case-insensitive).
+            const vocabularyLower = new Set(getActiveTagVocabulary().map((t) => t.toLowerCase()));
+            if (!vocabularyLower.has(oldTag.toLowerCase())) {
                 res.status(404).json({ error: "Tag '" + oldTag + "' not found.", success: false });
                 return;
             }
-            // Validate new tag doesn't already exist.
-            if (vocabulary.has(newTag)) {
+            // Validate new tag doesn't collide with a different existing tag (case-insensitive). A case-only rename of the same tag (e.g., "sports" → "Sports") is
+            // allowed since it's changing the display form of the same identity.
+            if (vocabularyLower.has(newTag.toLowerCase()) && !tagsMatch(oldTag, newTag)) {
                 res.status(409).json({ error: "Tag '" + newTag + "' already exists.", success: false });
                 return;
             }
             // Update the tag registry: replace old with new in the appropriate list.
             const registry = getTagRegistry();
-            const oldIsPredefined = PREDEFINED_TAGS.includes(oldTag);
+            const oldIsPredefined = PREDEFINED_TAGS.some((t) => tagsMatch(t, oldTag));
             if (oldIsPredefined) {
-                // Predefined tag: "delete" the old (add to deletedTags) and create the new as a user tag.
-                if (!registry.deletedTags.includes(oldTag)) {
-                    registry.deletedTags.push(oldTag);
+                // Predefined tag: "delete" the old (add to deletedTags using the canonical predefined form) and create the new as a user tag.
+                const canonicalOld = PREDEFINED_TAGS.find((t) => tagsMatch(t, oldTag)) ?? oldTag;
+                if (!registry.deletedTags.some((t) => tagsMatch(t, oldTag))) {
+                    registry.deletedTags.push(canonicalOld);
                 }
                 registry.tags.push(newTag);
             }
             else {
                 // User tag: replace in the user tags list.
-                registry.tags = registry.tags.map((t) => (t === oldTag) ? newTag : t);
+                registry.tags = registry.tags.map((t) => tagsMatch(t, oldTag) ? newTag : t);
             }
             setTagRegistry(registry);
             // Cascade: substitute the old tag with the new tag across all channel assignments. transformChannelTags handles loading, delta normalization, and persistence.
-            const { affectedKeys, error } = await transformChannelTags((entry) => entry.channel.tags?.includes(oldTag) === true, (tags) => tags.map((t) => (t === oldTag) ? newTag : t));
+            const { affectedKeys, error } = await transformChannelTags((entry) => entry.channel.tags?.some((t) => tagsMatch(t, oldTag)) === true, (tags) => tags.map((t) => tagsMatch(t, oldTag) ? newTag : t));
             if (error) {
                 res.status(400).json({ error, success: false });
                 return;
@@ -1469,8 +1498,7 @@ export function setupChannelRoutes(app) {
             });
         }
         catch (error) {
-            LOG.error("Failed to rename tag: %s.", formatError(error));
-            res.status(500).json({ error: "Failed to rename tag: " + formatError(error), success: false });
+            sendErrorResponse(res, error, "rename tag");
         }
     });
 }