prismcast 1.6.0 → 1.8.0

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

@@ -2,43 +2,44 @@
  *
  * table.ts: Channel table rendering for the PrismCast configuration interface.
  */
-import { compareChannelSort, getAllProviderTags, getAuthDomainForChannel, getChannelProviderLabel, getChannelProviderTags, getChannelSortKey, getEnabledProviders, getProviderGroup, getProviderTagForChannel, hasMultipleProviders, isChannelAvailableByProvider, isProviderTagEnabled, resolveProviderKey } from "../../../config/providers.js";
+import { ICON_BOLT, ICON_COPY, ICON_DELETE, ICON_DISABLE, ICON_EDIT, ICON_ENABLE, ICON_FILTER, ICON_HEALTH, ICON_LINK, ICON_LOGIN, ICON_MANAGE, ICON_REVERT, ICON_TRANSFER } from "../../icons.js";
+import { compareChannelSort, getAllProviderTags, getAuthDomainForChannel, getChannelProviderLabel, getChannelProviderTags, getChannelSortKey, getEnabledProviders, getProviderGroup, hasMultipleProviders, isChannelAvailableByProvider, isProviderTagEnabled, resolvePredefinedVariant, resolveProviderKey } from "../../../config/providers.js";
 import { escapeHtml, formatTimeAgo } from "../../../utils/index.js";
-import { getCachedProviderChannels, getProviderDomainMap, getProviderGuideUrls } from "../../../browser/channelSelection.js";
+import { getActiveTagVocabulary, getChannelEffectiveTags, getChannelListing, getChannelLogo, getChannelsParseErrorMessage, getPredefinedScopeCounts, getTagRegistry, getUserChannelsFilePath, hasChannelsParseError, isPredefinedChannel, isPredefinedChannelDisabled, isUserChannel } from "../../../config/userChannels.js";
+import { getCachedProviderChannels, getProviderDomainMap, getProviderGuideUrls, getProviderModuleInfo } from "../../../browser/channelSelection.js";
 import { getChannelHealth, getDomainAuth } from "../../../config/health.js";
-import { getChannelListing, getChannelsParseErrorMessage, getPredefinedScopeCounts, getUserChannelsFilePath, hasChannelsParseError, isPredefinedChannel, isPredefinedChannelDisabled, isUserChannel } from "../../../config/userChannels.js";
 import { getProfileForChannel, getProfiles } from "../../../config/profiles.js";
 import { CONFIG } from "../../../config/index.js";
 import { PREDEFINED_CHANNELS } from "../../../channels/index.js";
 import { categorizeProfiles } from "../index.js";
-// SVG icon constants for channel action buttons. Each icon is 14x14px with a 16x16 viewBox, stroke-based with currentColor, and uses round line caps/joins.
-export const ICON_EDIT = "<svg width=\"14\" height=\"14\" viewBox=\"0 0 16 16\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"1.5\" stroke-linecap=\"round\" " +
-    "stroke-linejoin=\"round\"><path d=\"M11.5 1.5l3 3L5 14H2v-3L11.5 1.5z\"/></svg>";
-const ICON_LOGIN = "<svg width=\"14\" height=\"14\" viewBox=\"0 0 16 16\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"1.5\" stroke-linecap=\"round\" " +
-    "stroke-linejoin=\"round\"><path d=\"M6.5 2H3.5a1 1 0 00-1 1v10a1 1 0 001 1h3\"/><path d=\"M10.5 11l3-3-3-3\"/><path d=\"M13.5 8H6.5\"/></svg>";
-export const ICON_DELETE = "<svg width=\"14\" height=\"14\" viewBox=\"0 0 16 16\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"1.5\" stroke-linecap=\"round\" " +
-    "stroke-linejoin=\"round\"><path d=\"M2 4h12\"/><path d=\"M5 4V2.5a.5.5 0 01.5-.5h5a.5.5 0 01.5.5V4\"/><path d=\"M12.5 4l-.5 9.5a1 1 0 01-1 .5H5a1 1 0 " +
-    "01-1-.5L3.5 4\"/></svg>";
-const ICON_ENABLE = "<svg width=\"14\" height=\"14\" viewBox=\"0 0 16 16\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"1.5\" stroke-linecap=\"round\" " +
-    "stroke-linejoin=\"round\"><circle cx=\"8\" cy=\"8\" r=\"6\"/><path d=\"M5.5 8l2 2 3.5-4\"/></svg>";
-const ICON_DISABLE = "<svg width=\"14\" height=\"14\" viewBox=\"0 0 16 16\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"1.5\" stroke-linecap=\"round\" " +
-    "stroke-linejoin=\"round\"><circle cx=\"8\" cy=\"8\" r=\"6\"/><path d=\"M5.5 5.5l5 5\"/></svg>";
-const ICON_HEALTH = "<svg width=\"14\" height=\"14\" viewBox=\"0 0 16 16\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"1.5\" " +
-    "stroke-linecap=\"round\" stroke-linejoin=\"round\"><polyline points=\"1,9 4,9 6,4 8,12 10,7 12,9 15,9\"/></svg>";
-const ICON_REVERT = "<svg width=\"14\" height=\"14\" viewBox=\"0 0 16 16\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"1.5\" stroke-linecap=\"round\" " +
-    "stroke-linejoin=\"round\"><path d=\"M3 8a5 5 0 1 1 1.5 3.5\"/><path d=\"M3 4v4h4\"/></svg>";
-const ICON_COPY = "<svg width=\"14\" height=\"14\" viewBox=\"0 0 16 16\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"1.5\" stroke-linecap=\"round\" " +
-    "stroke-linejoin=\"round\"><rect x=\"5\" y=\"5\" width=\"9\" height=\"9\" rx=\"1\"/><path d=\"M5 11H3a1 1 0 01-1-1V3a1 1 0 011-1h7a1 1 0 011 1v2\"/></svg>";
+import { generateWizardModal } from "../../components.js";
+/**
+ * Generates an annotated provider display span. The client-side page-load script processes these elements via providerIconHtml, rendering the appropriate
+ * icon + text combination. The server just emits the text with data attributes — all icon rendering is client-side through the single providerIconHtml path.
+ * @param name - The provider display name.
+ * @param domain - The provider's domain for icon fallback derivation. Undefined for providers without a known domain.
+ * @param iconUrl - Optional explicit icon URL to try before domain-derived fallbacks.
+ * @param small - When true, uses the small icon variant for chips.
+ * @returns HTML span string with data attributes for client-side processing.
+ */
+function providerDisplaySpan(name, domain, iconUrl, small) {
+    const domainAttr = domain ? " data-domain=\"" + escapeHtml(domain) + "\"" : "";
+    const iconAttr = iconUrl ? " data-icon-url=\"" + escapeHtml(iconUrl) + "\"" : "";
+    const sizeAttr = small ? " data-sm" : "";
+    return "<span class=\"provider-display\"" + domainAttr + iconAttr + sizeAttr + ">" + escapeHtml(name) + "</span>";
+}
 // Optional column definitions for the channels table. These columns can be shown or hidden by the user via the column picker. The order here determines the
 // column order in the table, slotted between Provider and Actions.
 export const OPTIONAL_COLUMNS = [
     { align: "center", cssClass: "col-chnum", field: "channelNumber", label: "Number", width: "70px" },
+    { align: "center", cssClass: "col-hdhr", field: "hdhrEnabled", label: "HDHR", width: "55px" },
     { align: "center", cssClass: "col-stationid", field: "stationId", label: "Station ID", width: "100px" },
     { align: "left", cssClass: "col-profile", field: "profile", label: "Profile", width: "130px" },
-    { align: "left", cssClass: "col-selector", field: "channelSelector", label: "Selector", width: "130px" }
+    { align: "left", cssClass: "col-selector", field: "channelSelector", label: "Selector", width: "130px" },
+    { align: "left", cssClass: "col-tags", field: "tags", label: "Tags", width: "150px" }
 ];
-// Total number of columns in the channels table (4 required + 4 optional).
-const TOTAL_COLUMN_COUNT = 8;
+// Total number of columns in the channels table (4 required + 6 optional).
+const TOTAL_COLUMN_COUNT = 10;
 // Valid optional column field names.
 export const VALID_OPTIONAL_COLUMNS = new Set(OPTIONAL_COLUMNS.map((c) => c.field));
 /**
@@ -259,16 +260,8 @@ function generateProfileReference(profiles) {
     lines.push("</div>");
     return lines.join("\n");
 }
-/**
- * Generates HTML for the advanced fields section (station ID, channel selector, and channel number).
- * @param idPrefix - Prefix for element IDs ("add" or "edit").
- * @param stationIdValue - Current station ID value.
- * @param channelSelectorValue - Current channel selector value.
- * @param channelNumberValue - Current channel number value.
- * @param showHints - Whether to show hint text.
- * @returns Array of HTML strings for the advanced fields section.
- */
-function generateAdvancedFields(idPrefix, stationIdValue, channelSelectorValue, channelNumberValue, showHints = true) {
+function generateAdvancedFields(idPrefix, options = {}) {
+    const { channelNumberValue = "", channelSelectorValue = "", hdhrEnabled = true, showHints = true, stationIdValue = "", tagsValue = "" } = options;
     const lines = [];
     // Advanced fields toggle.
     lines.push("<div class=\"advanced-toggle\" onclick=\"document.getElementById('" + idPrefix +
@@ -278,10 +271,11 @@ function generateAdvancedFields(idPrefix, stationIdValue, channelSelectorValue,
     // Station ID.
     const stationIdHint = showHints ? "Optional Gracenote station ID for guide data (tvc-guide-stationid)." : undefined;
     lines.push(...generateTextField(idPrefix + "-stationId", "stationId", "Station ID", stationIdValue, { hint: stationIdHint, placeholder: showHints ? "e.g., 12345" : undefined }));
-    // Channel selector.
+    // Channel selector. The guide-based provider list is derived from the provider module registry so it stays current as providers are added.
+    const guideProviderNames = getProviderModuleInfo().map((p) => p.label).sort().join(", ");
     const channelSelectorHint = showHints ?
         "Identifies which channel to select on sites that host multiple live streams. Known values are suggested when the URL matches a supported site. " +
-            "For guide-based profiles (Fox, HBO Max, Hulu, Sling, YouTube TV), use the channel name or station code from the guide. " +
+            "For guide-based profiles (" + guideProviderNames + "), use the channel name or station code from the guide. " +
             "For tile and thumbnail profiles, right-click the channel element \u2192 Inspect \u2192 copy a unique value matching the profile's selector pattern " +
             "(typically a portion of the image src URL)." :
         undefined;
@@ -291,6 +285,40 @@ function generateAdvancedFields(idPrefix, stationIdValue, channelSelectorValue,
         "Optional numeric channel number for guide matching in Channels DVR and Plex." :
         undefined;
     lines.push(...generateTextField(idPrefix + "-channelNumber", "channelNumber", "Channel Number", channelNumberValue, { hint: channelNumberHint, placeholder: showHints ? "e.g., 501" : undefined }));
+    // Tags field: checkbox grid of the active tag vocabulary. Checked tags are collected into a hidden input as a comma-separated value on form submission.
+    // This prevents users from entering tag names that don't exist in the managed vocabulary.
+    const vocabulary = getActiveTagVocabulary();
+    const currentTags = new Set(tagsValue ? tagsValue.split(",").map((t) => t.trim().toLowerCase()).filter((t) => t.length > 0) : []);
+    if (vocabulary.length > 0) {
+        lines.push("<div class=\"form-row\">");
+        lines.push("<label>Tags</label>");
+        lines.push("<input type=\"hidden\" name=\"tags\" id=\"" + idPrefix + "-tags-hidden\" value=\"" + escapeHtml(tagsValue) + "\">");
+        lines.push("<div class=\"tag-checkbox-grid\">");
+        for (const tag of vocabulary) {
+            const checked = currentTags.has(tag) ? " checked" : "";
+            lines.push("<label class=\"tag-checkbox-label\">" +
+                "<input type=\"checkbox\" class=\"tag-checkbox\" data-tag=\"" + escapeHtml(tag) + "\"" + checked +
+                " onchange=\"updateTagsHidden(this.closest('.form-row'))\">" +
+                "<span class=\"tag-badge\">" + escapeHtml(tag) + "</span></label>");
+        }
+        lines.push("</div>");
+        if (showHints) {
+            lines.push("<div class=\"hint\">Select tags for playlist filtering. Manage available tags via Manage Channels &gt; Manage Tags.</div>");
+        }
+        lines.push("</div>");
+    }
+    // HDHomeRun lineup inclusion. A hidden input provides the "false" value when the checkbox is unchecked (unchecked checkboxes are not submitted in FormData).
+    // When checked, the checkbox value "true" overwrites the hidden input's "false" since it appears later in DOM order.
+    const hdhrChecked = hdhrEnabled ? " checked" : "";
+    const hdhrHint = showHints ? "When unchecked, this channel is hidden from the HDHomeRun lineup and not available in Plex." : undefined;
+    lines.push("<div class=\"form-row form-row-checkbox\">");
+    lines.push("<label for=\"" + idPrefix + "-hdhrEnabled\">Include in HDHomeRun/Plex Lineup</label>");
+    lines.push("<input type=\"hidden\" name=\"hdhrEnabled\" value=\"false\">");
+    lines.push("<input type=\"checkbox\" id=\"" + idPrefix + "-hdhrEnabled\" name=\"hdhrEnabled\" value=\"true\"" + hdhrChecked + ">");
+    lines.push("</div>");
+    if (hdhrHint) {
+        lines.push("<div class=\"hint\">" + hdhrHint + "</div>");
+    }
     lines.push("</div>"); // End advanced fields.
     return lines;
 }
@@ -305,18 +333,22 @@ function generateAdvancedFields(idPrefix, stationIdValue, channelSelectorValue,
 function generateChannelSelectorData() {
     const byDomain = {};
     const seen = {};
-    for (const channel of Object.values(PREDEFINED_CHANNELS)) {
-        if (!channel.channelSelector) {
+    for (const [key, raw] of Object.entries(PREDEFINED_CHANNELS)) {
+        if (!raw.channelSelector) {
             continue;
         }
+        // Use the resolved channel (with inheritance from the canonical) so stationId, name, and other inherited fields are populated correctly for variants.
+        // The channelSelector is captured from the raw entry (already validated as non-null) to avoid non-null assertions on the resolved channel's optional field.
+        const selector = raw.channelSelector;
+        const channel = resolvePredefinedVariant(key) ?? raw;
         const hostname = new URL(channel.url).hostname;
         seen[hostname] ??= new Set();
-        if (seen[hostname].has(channel.channelSelector)) {
+        if (seen[hostname].has(selector)) {
             continue;
         }
-        seen[hostname].add(channel.channelSelector);
+        seen[hostname].add(selector);
         byDomain[hostname] ??= [];
-        byDomain[hostname].push({ label: channel.name ?? channel.channelSelector, value: channel.channelSelector });
+        byDomain[hostname].push({ label: channel.name ?? selector, stationId: channel.stationId, value: selector });
     }
     // Merge cached provider-discovered channels into the domain map. Predefined entries take precedence — we only add discovered channels whose channelSelector
     // value is not already present for that domain. This enriches the datalist with the full provider lineup when precaching or prior discovery has run.
@@ -342,6 +374,144 @@ function generateChannelSelectorData() {
         "var providerByDomain = " + JSON.stringify(providerByDomain) + ";\n" +
         "var providerGuideUrl = " + JSON.stringify(providerGuideUrl) + ";";
 }
+/**
+ * Generates the tag column filter dropdown content. This is the single source of truth for the filter checkbox list — used for both the initial header render
+ * and for incremental updates after tag CRUD operations. The dropdown shell (button, dropdown-menu wrapper) is rendered by the header generator; this function
+ * provides only the inner content (checkbox labels + "Show All" item).
+ * @returns HTML string for the filter dropdown content.
+ */
+export function generateTagFilterContent() {
+    const vocabulary = getActiveTagVocabulary();
+    const lines = [];
+    for (const tag of vocabulary) {
+        lines.push("<label class=\"provider-option\" onclick=\"event.stopPropagation()\">" +
+            "<input type=\"checkbox\" class=\"tag-filter-checkbox\" data-tag=\"" + escapeHtml(tag) + "\" checked onchange=\"applyTagColumnFilter()\"> " +
+            escapeHtml(tag) + "</label>");
+    }
+    if (vocabulary.length > 0) {
+        lines.push("<div class=\"dropdown-divider\"></div>");
+        lines.push("<div class=\"dropdown-item\" id=\"tag-filter-toggle\" onclick=\"event.stopPropagation(); toggleTagColumnFilter()\">Show None</div>");
+    }
+    return lines.join("");
+}
+/**
+ * Generates the Tag Management modal body HTML. This is the single source of truth for tag manager content — used for both the initial server render and for
+ * incremental updates after tag CRUD operations. The endpoints return this HTML in the response so the client can replace the modal content without a page reload.
+ * @returns HTML string for the tag manager body (tag list, input field, deleted tags section).
+ */
+export function generateTagManagerBody() {
+    const vocabulary = getActiveTagVocabulary();
+    const registry = getTagRegistry();
+    // Build the tag list HTML. Each tag is a badge with a delete button and inline rename on click.
+    const tagListItems = [];
+    for (const tag of vocabulary) {
+        tagListItems.push("<div class=\"tag-manager-item\" data-tag=\"" + escapeHtml(tag) + "\">" +
+            "<span class=\"tag-badge tag-editable\" title=\"Click to rename\" onclick=\"startTagRename(this, '" + escapeHtml(tag) +
+            "')\">" + escapeHtml(tag) + "</span>" +
+            "<button type=\"button\" class=\"btn-icon btn-icon-delete\" title=\"Delete tag\" onclick=\"deleteTag('" + escapeHtml(tag) +
+            "')\">" + ICON_DELETE + "</button></div>");
+    }
+    // Deleted predefined tags section — show restore option for tags the user has deleted.
+    const deletedItems = [];
+    for (const tag of registry.deletedTags) {
+        deletedItems.push("<div class=\"tag-manager-item tag-deleted\" data-tag=\"" + escapeHtml(tag) + "\">" +
+            "<span class=\"tag-badge tag-badge-deleted\">" + escapeHtml(tag) + "</span> <span class=\"tag-annotation\">(deleted)</span>" +
+            "<button type=\"button\" class=\"btn-icon\" title=\"Restore tag\" onclick=\"restoreTag('" + escapeHtml(tag) +
+            "')\">" + ICON_REVERT + "</button></div>");
+    }
+    return "<div class=\"tag-manager\">" +
+        "<p class=\"wizard-hint\">Create and manage the tag vocabulary. Tags can be assigned to channels via the channel table " +
+        "for playlist filtering and organization.</p>" +
+        "<div class=\"tag-manager-add\">" +
+        "<input type=\"text\" id=\"tag-manager-input\" placeholder=\"New tag name\" maxlength=\"30\" " +
+        "pattern=\"[a-z0-9]([a-z0-9-]*[a-z0-9])?\" onkeydown=\"if(event.key==='Enter'){event.preventDefault();createTag();}\">" +
+        "<button type=\"button\" class=\"btn btn-primary btn-sm\" onclick=\"createTag()\">Add</button>" +
+        "</div>" +
+        "<div id=\"tag-manager-error\" class=\"wizard-error\" style=\"display: none;\"></div>" +
+        "<div id=\"tag-manager-list\" class=\"tag-manager-list\">" +
+        (tagListItems.length > 0 ? tagListItems.join("") : "<div class=\"empty-state-text\">No tags defined.</div>") +
+        "</div>" +
+        (deletedItems.length > 0 ? "<div class=\"tag-manager-section-label\">Deleted Predefined Tags</div>" +
+            "<div id=\"tag-manager-deleted\" class=\"tag-manager-list\">" + deletedItems.join("") + "</div>" : "") +
+        "</div>";
+}
+/**
+ * Generates the Tag Management modal shell using the wizard modal infrastructure for consistent styling.
+ * @returns HTML string for the complete tag management modal.
+ */
+function generateTagManagementModal() {
+    return generateWizardModal({
+        body: generateTagManagerBody(),
+        buttons: [
+            { label: "Done", onclick: "closeTagManager()", position: "right", variant: "primary" }
+        ],
+        id: "tag-manager-modal",
+        maxWidth: "420px",
+        onClose: "closeTagManager()",
+        title: "Manage Tags"
+    });
+}
+/**
+ * Generates the Browse Channels 2-step wizard modal. Step 1 is the provider picker grid, step 2 is channel discovery and management. Channel state detection
+ * (new, switch, current) is handled server-side by the annotated discovery response - no client-side matching logic is needed. Provider and guide URL data are
+ * embedded as JSON data blocks for the client-side wizard controller.
+ * @returns HTML string for the browse modal.
+ */
+function generateBrowseModal() {
+    // Build the provider info array from the provider module registry. The client uses this to render the provider picker.
+    const providers = getProviderModuleInfo();
+    const guideUrls = getProviderGuideUrls();
+    return generateWizardModal({
+        buttons: [
+            { id: "browse-back", label: "Back", position: "left", role: "back", visible: false },
+            { label: "Cancel", position: "right", role: "close" },
+            { id: "browse-add-btn", label: "Apply", onclick: "submitBrowseChannels()", position: "right", variant: "primary", visible: false }
+        ],
+        contentId: "browse-content",
+        dataBlocks: [
+            "<script type=\"application/json\" id=\"browse-providers-data\">" + JSON.stringify(providers) + "</script>",
+            "<script type=\"application/json\" id=\"browse-guide-urls-data\">" + JSON.stringify(guideUrls) + "</script>"
+        ],
+        description: "Manage your channel lineup by provider. Add new channels, switch providers for existing channels, or remove channels you no longer need.",
+        id: "browse-modal",
+        steps: ["Provider", "Channels"],
+        title: "Browse Channels",
+        titleId: "browse-title"
+    });
+}
+/**
+ * Generates the Provider Setup 3-step wizard modal. Steps: Providers (multi-select), Sign In (sequential auth), Channels (summary + finish). The
+ * setupCompleted flag is embedded as a data attribute so the client can auto-show the wizard on first visit.
+ * @returns HTML string for the setup wizard modal.
+ */
+function generateSetupWizardModal() {
+    const enabled = getEnabledProviders();
+    // Build provider data with enabled state from the current provider filter. getAllProviderTags is the single source of truth for provider metadata
+    // (domain, iconUrl, displayName). The enabled field lets the client pre-check providers on re-run without scraping DOM state.
+    const tags = getAllProviderTags()
+        .filter((t) => t.tag !== "direct")
+        .map((t) => ({ ...t, enabled: enabled.includes(t.tag) }));
+    return generateWizardModal({
+        buttons: [
+            { id: "setup-back", label: "Back", position: "left", role: "back", visible: false },
+            { id: "setup-skip", label: "Skip Setup", onclick: "skipSetup()", position: "right" },
+            { id: "setup-next", label: "Next", position: "right", role: "next", variant: "primary" },
+            { id: "setup-finish", label: "Finish", onclick: "finishSetup()", position: "right", variant: "primary", visible: false }
+        ],
+        contentId: "setup-content",
+        dataAttributes: { "setup-completed": CONFIG.channels.setupCompleted ? "true" : "false" },
+        dataBlocks: [
+            "<script type=\"application/json\" id=\"setup-providers-data\">" + JSON.stringify(tags) + "</script>"
+        ],
+        description: "Set up your streaming providers in three steps: select your services, sign in, and choose your channels.",
+        errorId: "setup-error",
+        id: "setup-modal",
+        steps: ["Providers", "Sign In", "Channels"],
+        stepsId: "setup-steps",
+        title: "Provider Setup",
+        titleId: "setup-title"
+    });
+}
 /**
  * Generates the HTML for a single channel's table rows (display row and edit form row). All channels — predefined, override, and user-defined — get both rows.
  * The edit form is pre-populated with the effective (resolved) values so users see what they're changing. When called from generateChannelsPanel() which already
@@ -382,9 +552,16 @@ export function generateChannelRowHtml(key, profiles, entry) {
         rowClasses.push("channel-unavailable");
     }
     const rowClassAttr = (rowClasses.length > 0) ? " class=\"" + rowClasses.join(" ") + "\"" : "";
-    displayLines.push("<tr id=\"display-row-" + escapeHtml(key) + "\"" + rowClassAttr + " data-provider-tags=\"" + escapeHtml(providerTags) + "\">");
+    // Compute effective tags early — used for both the row data attribute (tag column filter) and the Tags column cell rendering below.
+    const effectiveTags = getChannelEffectiveTags(channel);
+    const channelTagsAttr = (effectiveTags.length > 0) ? " data-channel-tags=\"" + escapeHtml(effectiveTags.join(",")) + "\"" : "";
+    displayLines.push("<tr id=\"display-row-" + escapeHtml(key) + "\"" + rowClassAttr + " data-provider-tags=\"" + escapeHtml(providerTags) +
+        "\"" + channelTagsAttr + ">");
     displayLines.push("<td class=\"ch-key\" data-sort-value=\"" + escapeHtml(getChannelSortKey(channel, key, "key")) + "\">" + escapeHtml(key) + "</td>");
-    displayLines.push("<td data-sort-value=\"" + escapeHtml(getChannelSortKey(channel, key, "name")) + "\">" + escapeHtml(channel.name ?? key) + "</td>");
+    const channelLogoUrl = getChannelLogo(key) ?? "";
+    const logoAttr = channelLogoUrl ? " data-logo=\"" + escapeHtml(channelLogoUrl) + "\"" : "";
+    displayLines.push("<td data-sort-value=\"" + escapeHtml(getChannelSortKey(channel, key, "name")) + "\"" + logoAttr +
+        "><span class=\"channel-name-cell\">" + escapeHtml(channel.name ?? key) + "</span></td>");
     // Provider column: dropdown for multi-provider channels, static provider name for single-provider. Both states always render a hidden "No available providers"
     // label alongside the provider content so that client-side filterChannelRows() can toggle between them without a page reload.
     displayLines.push("<td data-sort-value=\"" + escapeHtml(getChannelSortKey(channel, key, "provider")) + "\">");
@@ -396,13 +573,12 @@ export function generateChannelRowHtml(key, profiles, entry) {
         // options get the hidden attribute for immediate filtering in Chrome. Safari ignores hidden on option elements, so the page-load JS init calls filterChannelRows()
         // to remove them from the DOM.
         const currentSelection = resolveProviderKey(key);
-        displayLines.push("<select class=\"provider-select\" data-channel=\"" + escapeHtml(key) + "\" onchange=\"updateProviderSelection(this)\"" +
-            contentHidden + ">");
+        displayLines.push("<select class=\"provider-select\" data-channel=\"" + escapeHtml(key) +
+            "\" title=\"Choose which streaming provider delivers this channel\" onchange=\"updateProviderSelection(this)\"" + contentHidden + ">");
         for (const variant of providerGroup.variants) {
             const selected = (variant.key === currentSelection) ? " selected" : "";
-            const tag = getProviderTagForChannel(variant.key);
-            const optionHidden = !isProviderTagEnabled(tag) ? " hidden" : "";
-            displayLines.push("<option value=\"" + escapeHtml(variant.key) + "\" data-provider-tag=\"" + escapeHtml(tag) + "\"" + selected + optionHidden + ">" +
+            const optionHidden = !isProviderTagEnabled(variant.tag) ? " hidden" : "";
+            displayLines.push("<option value=\"" + escapeHtml(variant.key) + "\" data-provider-tag=\"" + escapeHtml(variant.tag) + "\"" + selected + optionHidden + ">" +
                 escapeHtml(variant.label) + "</option>");
         }
         displayLines.push("</select>");
@@ -414,11 +590,20 @@ export function generateChannelRowHtml(key, profiles, entry) {
             escapeHtml(getChannelProviderLabel(channel)) + "</span>");
     }
     displayLines.push("</td>");
-    // Optional columns: Number, Station ID, Profile, Selector. All four are always rendered; visibility is controlled by CSS classes on the table element.
-    displayLines.push("<td class=\"col-chnum\" data-sort-value=\"" + escapeHtml(getChannelSortKey(channel, key, "channelNumber")) + "\">" +
-        (channel.channelNumber ? escapeHtml(String(channel.channelNumber)) : "") + "</td>");
-    displayLines.push("<td class=\"col-stationid\" data-sort-value=\"" + escapeHtml(getChannelSortKey(channel, key, "stationId")) + "\">" +
-        (channel.stationId ? escapeHtml(channel.stationId) : "") + "</td>");
+    // Optional columns: Number, HDHR, Station ID, Profile, Selector. All five are always rendered; visibility is controlled by CSS classes on the table element.
+    const cellKey = escapeHtml(key);
+    displayLines.push("<td class=\"col-chnum editable-cell\" data-sort-value=\"" + escapeHtml(getChannelSortKey(channel, key, "channelNumber")) +
+        "\" data-field=\"channelNumber\" data-key=\"" + cellKey + "\" data-value=\"" + (channel.channelNumber ? escapeHtml(String(channel.channelNumber)) : "") +
+        "\" onclick=\"startInlineEdit(this)\">" + (channel.channelNumber ? escapeHtml(String(channel.channelNumber)) : "<span class=\"text-muted\">&ndash;</span>") +
+        "</td>");
+    // HDHR column: inline checkbox for quick toggling. The checkbox submits changes via the toggleHdhr() client-side function.
+    const hdhrCheckedAttr = (channel.hdhrEnabled !== false) ? " checked" : "";
+    displayLines.push("<td class=\"col-hdhr\" data-sort-value=\"" + escapeHtml(getChannelSortKey(channel, key, "hdhrEnabled")) +
+        "\"><input type=\"checkbox\" data-key=\"" + cellKey + "\"" + hdhrCheckedAttr +
+        " onchange=\"toggleHdhr(this)\" title=\"Include in HDHomeRun/Plex lineup\"></td>");
+    displayLines.push("<td class=\"col-stationid editable-cell\" data-sort-value=\"" + escapeHtml(getChannelSortKey(channel, key, "stationId")) +
+        "\" data-field=\"stationId\" data-key=\"" + cellKey + "\" data-value=\"" + (channel.stationId ? escapeHtml(channel.stationId) : "") +
+        "\" onclick=\"startInlineEdit(this)\">" + (channel.stationId ? escapeHtml(channel.stationId) : "<span class=\"text-muted\">&ndash;</span>") + "</td>");
     // Profile column: show explicit profile as-is, or the auto-resolved friendly name with "(auto)" suffix in muted style.
     const profileSortKey = escapeHtml(getChannelSortKey(channel, key, "profile"));
     if (channel.profile) {
@@ -437,6 +622,14 @@ export function generateChannelRowHtml(key, profiles, entry) {
     }
     displayLines.push("<td class=\"col-selector\" data-sort-value=\"" + escapeHtml(getChannelSortKey(channel, key, "channelSelector")) + "\">" +
         (channel.channelSelector ? escapeHtml(channel.channelSelector) : "<span class=\"text-muted\">&ndash;</span>") + "</td>");
+    // Tags column: render effective tags as pills. Clicking the cell opens a shared portal dropdown (rendered in <body>, positioned via getBoundingClientRect)
+    // for inline tag editing. The cell carries data-key and data-tags so the dropdown can populate the correct checked state.
+    const tagsHtml = (effectiveTags.length > 0) ?
+        effectiveTags.map((tag) => "<span class=\"tag-badge\">" + escapeHtml(tag) + "</span>").join(" ") :
+        "<span class=\"text-muted\">&ndash;</span>";
+    displayLines.push("<td class=\"col-tags editable-cell dropdown\" data-sort-value=\"" + escapeHtml(getChannelSortKey(channel, key, "tags")) +
+        "\" data-key=\"" + cellKey + "\" data-tags=\"" + escapeHtml(effectiveTags.join(",")) +
+        "\" onclick=\"toggleInlineTagDropdown(this)\">" + tagsHtml + "</td>");
     // Actions column with icon buttons. Five positions per row: Edit (always), Login/placeholder, Health/placeholder, context-sensitive, and Copy URL.
     displayLines.push("<td>");
     displayLines.push("<div class=\"btn-group\">");
@@ -472,19 +665,9 @@ export function generateChannelRowHtml(key, profiles, entry) {
     else {
         displayLines.push("<span class=\"btn-icon-placeholder\"></span>");
     }
-    // Position 4: varies by row type.
-    if (isOverride) {
-        // Override: revert to predefined defaults.
-        displayLines.push("<button type=\"button\" class=\"btn-icon btn-icon-revert\" title=\"Revert to defaults\" aria-label=\"Revert to defaults\"" +
-            " onclick=\"revertChannel('" + escapedKey + "')\">" + ICON_REVERT + "</button>");
-    }
-    else if (isUser && !isPredefined) {
-        // User-defined (not an override): delete.
-        displayLines.push("<button type=\"button\" class=\"btn-icon btn-icon-delete\" title=\"Delete\" aria-label=\"Delete\" onclick=\"deleteChannel('" +
-            escapedKey + "')\">" + ICON_DELETE + "</button>");
-    }
-    else if (isPredefined) {
-        // Predefined (no override): enable/disable toggle.
+    // Position 4: enable/disable toggle for predefined channels (regardless of override state), delete for user-defined channels. The enable/disable state and
+    // property overrides are independent concerns — a predefined channel can be disabled AND have customizations, and the toggle always reflects the visibility state.
+    if (isPredefined) {
         if (isDisabled) {
             displayLines.push("<button type=\"button\" class=\"btn-icon btn-icon-enable\" title=\"Enable\" aria-label=\"Enable\" onclick=\"togglePredefinedChannel('" +
                 escapedKey + "', true)\">" + ICON_ENABLE + "</button>");
@@ -494,6 +677,10 @@ export function generateChannelRowHtml(key, profiles, entry) {
                 escapedKey + "', false)\">" + ICON_DISABLE + "</button>");
         }
     }
+    else if (isUser) {
+        displayLines.push("<button type=\"button\" class=\"btn-icon btn-icon-delete\" title=\"Delete\" aria-label=\"Delete\" onclick=\"deleteChannel('" +
+            escapedKey + "')\">" + ICON_DELETE + "</button>");
+    }
     // Position 5: Copy URL dropdown (all channels).
     displayLines.push("<div class=\"dropdown copy-dropdown\">");
     displayLines.push("<button type=\"button\" class=\"btn-icon btn-icon-copy\" title=\"Copy stream URL\" aria-label=\"Copy stream URL\" " +
@@ -531,11 +718,21 @@ export function generateChannelRowHtml(key, profiles, entry) {
     // Profile dropdown.
     editLines.push(...generateProfileDropdown("edit-profile-" + key, channel.profile ?? "", profiles));
     // Advanced fields.
-    editLines.push(...generateAdvancedFields("edit-" + key, channel.stationId ?? "", channel.channelSelector ?? "", channel.channelNumber ? String(channel.channelNumber) : ""));
+    editLines.push(...generateAdvancedFields("edit-" + key, {
+        channelNumberValue: channel.channelNumber ? String(channel.channelNumber) : "",
+        channelSelectorValue: channel.channelSelector ?? "",
+        hdhrEnabled: channel.hdhrEnabled !== false,
+        stationIdValue: channel.stationId ?? "",
+        tagsValue: effectiveTags.join(", ")
+    }));
     // Form buttons.
     editLines.push("<div class=\"form-buttons\">");
     editLines.push("<button type=\"submit\" class=\"btn btn-primary\">Save Changes</button>");
     editLines.push("<button type=\"button\" class=\"btn btn-secondary\" onclick=\"hideEditForm('" + escapedKey + "')\">Cancel</button>");
+    if (isOverride) {
+        editLines.push("<button type=\"button\" class=\"btn btn-secondary btn-revert\" onclick=\"revertChannel('" + escapedKey +
+            "')\">Revert to Defaults</button>");
+    }
     editLines.push("</div>");
     editLines.push("</form>");
     editLines.push("</div>");
@@ -544,6 +741,121 @@ export function generateChannelRowHtml(key, profiles, entry) {
     const editRow = editLines.join("\n");
     return { displayRow, editRow };
 }
+/**
+ * Computes the complete channel table state — summary counts and scope toggle counts — from the current channel listing. This is the server-side single source
+ * of truth for all count computation, replacing the client-side DOM-scanning approach. Called once per mutation as part of building a patch.
+ * @param listing - Optional pre-fetched listing. When omitted, fetches from getChannelListing(). Passing the listing avoids a redundant computation when
+ *   buildChannelTablePatch already has it.
+ * @returns The channel table counts and scope toggle counts.
+ */
+export function buildChannelTableState(listing) {
+    listing ??= getChannelListing();
+    let predefined = 0;
+    let user = 0;
+    let disabled = 0;
+    for (const entry of listing) {
+        if ((entry.source === "user") || (entry.source === "override")) {
+            user++;
+        }
+        else {
+            predefined++;
+        }
+        if (!entry.enabled || !entry.availableByProvider) {
+            disabled++;
+        }
+    }
+    const total = listing.length;
+    const enabled = total - disabled;
+    return {
+        counts: { disabled, enabled, predefined, total, user },
+        scopeCounts: getPredefinedScopeCounts()
+    };
+}
+/**
+ * Counts channels included and excluded from the HDHomeRun lineup. Only counts enabled, provider-available channels (the same set visible in the table).
+ * @param listing - The channel listing entries.
+ * @returns An object with `enabled` (HDHR-included) and `total` counts.
+ */
+function getHdhrCounts(listing) {
+    let enabled = 0;
+    let total = 0;
+    for (const entry of listing) {
+        if (!entry.enabled || !entry.availableByProvider) {
+            continue;
+        }
+        total++;
+        if (entry.channel.hdhrEnabled !== false) {
+            enabled++;
+        }
+    }
+    return { enabled, total };
+}
+/**
+ * Computes per-tag channel counts for the Quick Actions tag bulk toggles. For each tag in the active vocabulary, counts how many enabled, provider-available
+ * channels have that tag in their effective tags. Returns undefined when the tags column is not visible (no tag toggles to update).
+ * @param listing - The channel listing entries.
+ * @returns A record mapping tag names to { count, total }, or undefined when hidden.
+ */
+function getTagCounts(listing) {
+    const visibleCols = new Set(CONFIG.channels.visibleColumns);
+    if (!visibleCols.has("tags")) {
+        return undefined;
+    }
+    const vocabulary = getActiveTagVocabulary();
+    if (vocabulary.length === 0) {
+        return undefined;
+    }
+    const result = {};
+    let total = 0;
+    // Pre-compute the vocabulary Set once for the per-channel effective tags filter.
+    const vocabularySet = new Set(vocabulary);
+    const counts = new Map();
+    for (const tag of vocabulary) {
+        counts.set(tag, 0);
+    }
+    for (const entry of listing) {
+        if (!entry.enabled || !entry.availableByProvider) {
+            continue;
+        }
+        total++;
+        const effectiveTags = entry.channel.tags ? entry.channel.tags.filter((tag) => vocabularySet.has(tag)) : [];
+        for (const tag of effectiveTags) {
+            const current = counts.get(tag);
+            if (current !== undefined) {
+                counts.set(tag, current + 1);
+            }
+        }
+    }
+    for (const tag of vocabulary) {
+        result[tag] = { count: counts.get(tag) ?? 0, total };
+    }
+    return result;
+}
+/**
+ * Builds a complete channel table patch for the given set of affected channel keys. Generates row HTML for keys that exist in the listing (update action) and
+ * remove actions for keys that no longer exist. Includes the current summary counts and scope toggle counts. This is the single function mutation endpoints
+ * call to construct their patch response.
+ * @param affectedKeys - The channel keys that were added, modified, or removed by the mutation.
+ * @param profiles - Available profiles for the edit form dropdown.
+ * @returns A complete ChannelTablePatch ready for client-side application.
+ */
+export function buildChannelTablePatch(affectedKeys, profiles) {
+    const listing = getChannelListing();
+    const listingByKey = new Map(listing.map((entry) => [entry.key, entry]));
+    const rows = [];
+    for (const key of affectedKeys) {
+        const entry = listingByKey.get(key);
+        if (entry) {
+            const rowHtml = generateChannelRowHtml(key, profiles, entry);
+            rows.push({ action: "update", displayRow: rowHtml.displayRow, editRow: rowHtml.editRow, key });
+        }
+        else {
+            rows.push({ action: "remove", key });
+        }
+    }
+    const { counts, scopeCounts } = buildChannelTableState(listing);
+    return { counts, hdhrCounts: getHdhrCounts(listing), rows, scopeCounts, tagCounts: getTagCounts(listing) };
+}
 /**
  * Generates the provider filter toolbar HTML with a multi-select dropdown and dismissable chips.
  * @returns HTML string for the provider filter toolbar.
@@ -554,12 +866,12 @@ export function generateProviderFilterToolbar() {
     const hasFilter = enabled.length > 0;
     const lines = [];
     lines.push("<div class=\"provider-toolbar\">");
-    // Provider filter dropdown and chips.
+    // Provider filter dropdown and chips. The button follows the toolbar dropdown pattern: icon + label + caret in a single button.
     lines.push("<div class=\"toolbar-group\">");
-    lines.push("<span class=\"toolbar-label\">Providers:</span>");
     lines.push("<div class=\"dropdown provider-dropdown\">");
     const buttonText = hasFilter ? "Filtered" : "All Providers";
-    lines.push("<button type=\"button\" class=\"btn btn-sm\" id=\"provider-filter-btn\" onclick=\"toggleDropdown(this)\">" + buttonText + " &#9662;</button>");
+    lines.push("<button type=\"button\" class=\"btn btn-sm toolbar-dropdown-btn\" id=\"provider-filter-btn\" " +
+        "title=\"Filter channels by streaming provider\" onclick=\"toggleDropdown(this)\">" + ICON_FILTER + " " + buttonText + " &#9662;</button>");
     lines.push("<div class=\"dropdown-menu provider-dropdown-menu\">");
     for (const tagInfo of allTags) {
         const isDirectTag = tagInfo.tag === "direct";
@@ -568,7 +880,7 @@ export function generateProviderFilterToolbar() {
         const disabledAttr = isDirectTag ? " disabled" : "";
         lines.push("<label class=\"provider-option\">");
         lines.push("<input type=\"checkbox\" data-tag=\"" + escapeHtml(tagInfo.tag) + "\"" + checkedAttr + disabledAttr +
-            " onchange=\"toggleProviderTag(this)\"> " + escapeHtml(tagInfo.displayName));
+            " onchange=\"toggleProviderTag(this)\"> " + providerDisplaySpan(tagInfo.displayName, tagInfo.domain, tagInfo.iconUrl));
         lines.push("</label>");
     }
     lines.push("</div>");
@@ -580,10 +892,12 @@ export function generateProviderFilterToolbar() {
             if (tag === "direct") {
                 continue;
             }
-            const displayName = allTags.find((t) => t.tag === tag)?.displayName ?? tag;
-            lines.push("<span class=\"provider-chip\" data-tag=\"" + escapeHtml(tag) + "\">" + escapeHtml(displayName) +
-                "<button type=\"button\" class=\"chip-close\" aria-label=\"Remove " + escapeHtml(displayName) + "\" onclick=\"removeProviderChip('" + escapeHtml(tag) +
-                "')\">&times;</button></span>");
+            const chipTag = allTags.find((t) => t.tag === tag);
+            const displayName = chipTag?.displayName ?? tag;
+            lines.push("<span class=\"provider-chip\" data-tag=\"" + escapeHtml(tag) + "\">" +
+                providerDisplaySpan(displayName, chipTag?.domain, chipTag?.iconUrl, true) +
+                "<button type=\"button\" class=\"chip-close\" title=\"Remove " + escapeHtml(displayName) + " from filter\" aria-label=\"Remove " +
+                escapeHtml(displayName) + "\" onclick=\"removeProviderChip('" + escapeHtml(tag) + "')\">&times;</button></span>");
         }
     }
     lines.push("</div>");
@@ -614,29 +928,70 @@ export function generateChannelsPanel(channelMessage, channelError, editingChann
     lines.push("<p>Define and manage streaming channels for the playlist. Customized channels are highlighted.</p>");
     lines.push("<p class=\"description-hint\">Tip: Use the <strong>provider filter</strong> above to show only channels from services you subscribe to &mdash; ", "this also controls which channels Channels DVR sees in the playlist. Use the <strong>provider dropdown</strong> on any multi-provider channel to choose ", "which streaming service delivers it (e.g., Comedy Central via Hulu vs Sling). Click the <strong>edit icon</strong> to customize any channel's name, ", "Gracenote station ID, URL, or other properties.</p>");
     lines.push("</div>");
-    // Toolbar with channel operations.
+    // Toolbar with three dropdown menus: Manage Channels (primary actions), Import/Export (data I/O), and Quick Actions (bulk operations). Each dropdown has an
+    // inline SVG icon + label + chevron for visual discoverability. Grouped menus reduce visual clutter and separate channel management from data I/O and bulk
+    // operations.
     lines.push("<div class=\"channel-toolbar\">");
-    // Channel operations. Import uses a dropdown menu to consolidate M3U and JSON import into a single button.
     lines.push("<div class=\"toolbar-group\">");
-    lines.push("<button type=\"button\" class=\"btn btn-primary btn-sm\" id=\"add-channel-btn\" onclick=\"document.getElementById('add-channel-form')", ".style.display='block'; this.style.display='none';\">Add Channel</button>");
+    // Manage Channels dropdown — primary channel creation and setup actions.
+    lines.push("<div class=\"dropdown\">");
+    lines.push("<button type=\"button\" class=\"btn btn-primary btn-sm toolbar-dropdown-btn\" title=\"Add, browse, or set up channels\" " +
+        "onclick=\"toggleDropdown(this)\">" + ICON_MANAGE + " Manage Channels &#9662;</button>");
+    lines.push("<div class=\"dropdown-menu\">");
+    // Dropdown item icons: tinted variants of the shared icons for visual differentiation in menu items. Each uses a distinct color so items are scannable at
+    // a glance. These are local to this function because the tint colors are context-specific to this dropdown.
+    const TINTED_ADD = "<svg width=\"14\" height=\"14\" viewBox=\"0 0 16 16\" fill=\"none\" stroke=\"#22a563\" stroke-width=\"1.5\" " +
+        "stroke-linecap=\"round\" stroke-linejoin=\"round\"><path d=\"M8 3v10M3 8h10\"/></svg>";
+    const TINTED_BROWSE = "<svg width=\"14\" height=\"14\" viewBox=\"0 0 16 16\" fill=\"none\" stroke=\"#5b8def\" stroke-width=\"1.5\" " +
+        "stroke-linecap=\"round\" stroke-linejoin=\"round\"><rect x=\"2\" y=\"2\" width=\"5\" height=\"5\" rx=\"1\"/><rect x=\"9\" y=\"2\" width=\"5\" " +
+        "height=\"5\" rx=\"1\"/><rect x=\"2\" y=\"9\" width=\"5\" height=\"5\" rx=\"1\"/><rect x=\"9\" y=\"9\" width=\"5\" height=\"5\" rx=\"1\"/></svg>";
+    const TINTED_SETUP = "<svg width=\"14\" height=\"14\" viewBox=\"0 0 16 16\" fill=\"none\" stroke=\"#9b8cd8\" stroke-width=\"1.5\" " +
+        "stroke-linecap=\"round\" stroke-linejoin=\"round\"><circle cx=\"8\" cy=\"8\" r=\"2.5\"/><path d=\"M8 1.5v2M8 12.5v2M1.5 8h2M12.5 8h2M3.1 " +
+        "3.1l1.4 1.4M11.5 11.5l1.4 1.4M3.1 12.9l1.4-1.4M11.5 4.5l1.4-1.4\"/></svg>";
+    const TINTED_TAG = "<svg width=\"14\" height=\"14\" viewBox=\"0 0 16 16\" fill=\"none\" stroke=\"#9b59b6\" stroke-width=\"1.5\" " +
+        "stroke-linecap=\"round\" stroke-linejoin=\"round\"><path d=\"M1.5 8.7V2.5a1 1 0 011-1h6.2a1 1 0 01.7.3l5.1 5.1a1 1 0 010 1.4l-5.5 5.5a1 " +
+        "1 0 01-1.4 0L1.8 9.4a1 1 0 01-.3-.7z\"/><circle cx=\"5\" cy=\"5\" r=\"1\"/></svg>";
+    lines.push("<div class=\"dropdown-item dropdown-item-icon\" onclick=\"closeDropdowns(); " +
+        "document.getElementById('add-channel-form').style.display='block';\">" + TINTED_ADD + " Add Channel</div>");
+    lines.push("<div class=\"dropdown-item dropdown-item-icon\" onclick=\"closeDropdowns(); openBrowseModal()\">" + TINTED_BROWSE +
+        " Browse Provider Channels</div>");
+    lines.push("<div class=\"dropdown-item dropdown-item-icon\" onclick=\"closeDropdowns(); openTagManager()\">" + TINTED_TAG +
+        " Manage Tags</div>");
+    lines.push("<div class=\"dropdown-item dropdown-item-icon\" onclick=\"closeDropdowns(); openSetupWizard()\">" + TINTED_SETUP +
+        " Provider Setup</div>");
+    lines.push("</div>");
+    lines.push("</div>");
+    // Import / Export dropdown — data I/O operations.
     lines.push("<div class=\"dropdown\">");
-    lines.push("<button type=\"button\" class=\"btn btn-secondary btn-sm\" onclick=\"toggleDropdown(this)\">Import &#9662;</button>");
+    lines.push("<button type=\"button\" class=\"btn btn-secondary btn-sm toolbar-dropdown-btn\" title=\"Import or export channel data\" " +
+        "onclick=\"toggleDropdown(this)\">" + ICON_TRANSFER + " Import / Export &#9662;</button>");
     lines.push("<div class=\"dropdown-menu\">");
-    lines.push("<div class=\"dropdown-item\" onclick=\"closeDropdowns(); document.getElementById('import-channels-file').click()\">Channels (JSON)</div>");
+    const TINTED_IMPORT = "<svg width=\"14\" height=\"14\" viewBox=\"0 0 16 16\" fill=\"none\" stroke=\"#5b8def\" stroke-width=\"1.5\" " +
+        "stroke-linecap=\"round\" stroke-linejoin=\"round\"><path d=\"M8 2v8M5 7l3 3 3-3\"/><path d=\"M2 11v2a1 1 0 001 1h10a1 1 0 001-1v-2\"/></svg>";
+    const TINTED_EXPORT = "<svg width=\"14\" height=\"14\" viewBox=\"0 0 16 16\" fill=\"none\" stroke=\"#22a563\" stroke-width=\"1.5\" " +
+        "stroke-linecap=\"round\" stroke-linejoin=\"round\"><path d=\"M8 10V2M5 5l3-3 3 3\"/><path d=\"M2 11v2a1 1 0 001 1h10a1 1 0 001-1v-2\"/></svg>";
+    lines.push("<div class=\"dropdown-item dropdown-item-icon\" onclick=\"closeDropdowns(); document.getElementById('import-channels-file').click()\">" +
+        TINTED_IMPORT + " Import Channels (JSON)</div>");
+    lines.push("<div class=\"dropdown-item dropdown-item-icon\" onclick=\"closeDropdowns(); document.getElementById('import-m3u-file').click()\">" +
+        TINTED_IMPORT + " Import M3U Playlist</div>");
+    lines.push("<label class=\"dropdown-option\"><input type=\"checkbox\" id=\"m3u-replace-duplicates\"> Replace duplicates on M3U import</label>");
     lines.push("<div class=\"dropdown-divider\"></div>");
-    lines.push("<div class=\"dropdown-item\" onclick=\"closeDropdowns(); document.getElementById('import-m3u-file').click()\">M3U Playlist</div>");
-    lines.push("<label class=\"dropdown-option\"><input type=\"checkbox\" id=\"m3u-replace-duplicates\"> Replace duplicates</label>");
+    lines.push("<div class=\"dropdown-item dropdown-item-icon\" onclick=\"closeDropdowns(); exportChannels()\">" +
+        TINTED_EXPORT + " Export Channels (JSON)</div>");
     lines.push("</div>");
     lines.push("</div>");
-    lines.push("<button type=\"button\" class=\"btn btn-secondary btn-sm\" onclick=\"exportChannels()\">Export</button>");
     lines.push("<input type=\"file\" id=\"import-m3u-file\" accept=\".m3u,.m3u8\" style=\"display: none;\" onchange=\"importM3U(this)\">");
+    // Visible column set, used by Quick Actions to gate column-dependent options and by the table header to set initial hide classes.
+    const visibleCols = new Set(CONFIG.channels.visibleColumns);
+    // Quick Actions dropdown — bulk operations for predefined channels.
     lines.push("<div class=\"dropdown quick-actions-dropdown\">");
-    lines.push("<button type=\"button\" class=\"btn btn-secondary btn-sm\" onclick=\"toggleDropdown(this)\">Quick Actions &#9662;</button>");
+    lines.push("<button type=\"button\" class=\"btn btn-secondary btn-sm toolbar-dropdown-btn\" title=\"Bulk operations for predefined channels\" " +
+        "onclick=\"toggleDropdown(this)\">" + ICON_BOLT + " Quick Actions &#9662;</button>");
     lines.push("<div class=\"dropdown-menu\">");
     // Compute initial toggle counts for predefined channel scopes. The server is the single source of truth — the client renders what we return here.
     const scopeCounts = getPredefinedScopeCounts();
-    // Three toggle rows: checkbox + label + "X of Y enabled" count. Clicking toggles the group via bulkTogglePredefined(). The onclick uses event.preventDefault()
-    // to stop the native checkbox toggle — the server response drives the update.
+    // Three toggle rows: checkbox + label + count. Clicking toggles the group via bulkTogglePredefined(). The onclick uses event.preventDefault() to stop the
+    // native checkbox toggle — the server response drives the update.
     const scopes = [
         { count: scopeCounts.all.enabled, label: "All Predefined", scope: "all", total: scopeCounts.all.total },
         { count: scopeCounts.east.enabled, label: "East Variants", scope: "east", total: scopeCounts.east.total },
@@ -645,18 +1000,88 @@ export function generateChannelsPanel(channelMessage, channelError, editingChann
     for (const s of scopes) {
         const checked = (s.count === s.total) ? " checked" : "";
         lines.push("<label class=\"provider-option\" onclick=\"event.preventDefault(); bulkTogglePredefined(!this.querySelector('input').checked, '" + s.scope +
-            "')\">" + "<input type=\"checkbox\" class=\"scope-toggle\" data-scope=\"" + s.scope + "\" data-total=\"" + String(s.total) + "\"" + checked + "> " +
-            s.label + "<span class=\"quick-action-count\" data-scope=\"" + s.scope + "\">" + String(s.count) + " of " + String(s.total) + " enabled</span></label>");
+            "')\">" + "<input type=\"checkbox\" class=\"scope-toggle\" data-scope=\"" + s.scope + "\"" + checked + "> " +
+            s.label + "<span class=\"quick-action-count\" data-scope=\"" + s.scope + "\" data-enabled=\"" + String(s.count) + "\" data-total=\"" + String(s.total) +
+            "\">" + String(s.count) + " of " + String(s.total) + " enabled</span></label>");
     }
     lines.push("<div class=\"dropdown-divider\"></div>");
-    // Bulk assign items — one per provider. Items whose tag is filtered out are hidden so updateBulkAssignOptions() can toggle them when the filter changes.
+    // Bulk assign select — switch all multi-provider channels to a single provider.
     const allTags = getAllProviderTags();
     const enabled = getEnabledProviders();
     const hasFilter = enabled.length > 0;
+    lines.push("<div class=\"bulk-assign-row\">");
+    lines.push("<span>Set all channels to:</span>");
+    lines.push("<select id=\"bulk-assign-select\" class=\"bulk-assign-select\" title=\"Switch all multi-provider channels to this provider\" " +
+        "onchange=\"if(this.value) { closeDropdowns(); bulkAssignProvider(this.value); this.value = ''; }\">");
+    lines.push("<option value=\"\">Select provider</option>");
     for (const tagInfo of allTags) {
-        const hidden = (hasFilter && !enabled.includes(tagInfo.tag) && (tagInfo.tag !== "direct")) ? " style=\"display: none;\"" : "";
-        lines.push("<div class=\"dropdown-item bulk-assign-item\" data-provider-tag=\"" + escapeHtml(tagInfo.tag) + "\"" + hidden +
-            " onclick=\"closeDropdowns(); bulkAssignProvider('" + escapeHtml(tagInfo.tag) + "')\">Set all to " + escapeHtml(tagInfo.displayName) + "</div>");
+        const hidden = (hasFilter && !enabled.includes(tagInfo.tag) && (tagInfo.tag !== "direct")) ? " hidden" : "";
+        lines.push("<option value=\"" + escapeHtml(tagInfo.tag) + "\" data-provider-tag=\"" + escapeHtml(tagInfo.tag) + "\"" + hidden + ">" +
+            escapeHtml(tagInfo.displayName) + "</option>");
+    }
+    lines.push("</select>");
+    lines.push("</div>");
+    // Divider before column-gated quick actions. Hidden when neither the channel number nor HDHR column is visible.
+    const dividerVisible = (visibleCols.has("channelNumber") || visibleCols.has("hdhrEnabled")) ? "" : " style=\"display: none;\"";
+    lines.push("<div class=\"dropdown-divider\" id=\"quick-action-divider\"" + dividerVisible + "></div>");
+    // Auto-number channels — assign sequential channel numbers to visible channels in current sort order. Visible when the channel number column is shown.
+    const autoNumberVisible = visibleCols.has("channelNumber") ? "" : " style=\"display: none;\"";
+    lines.push("<div id=\"quick-action-autonumber\"" + autoNumberVisible + ">");
+    lines.push("<div class=\"bulk-assign-row\">");
+    lines.push("<span>Auto-number from:</span>");
+    lines.push("<input type=\"number\" id=\"auto-number-start\" class=\"auto-number-input\" value=\"1\" min=\"0\" max=\"99999\" " +
+        "placeholder=\"Clear\" onclick=\"event.stopPropagation()\">");
+    lines.push("<button type=\"button\" class=\"btn btn-sm btn-secondary\" onclick=\"closeDropdowns(); autoNumberChannels()\">Apply</button>");
+    lines.push("</div>");
+    lines.push("</div>");
+    // HDHR bulk toggle — tri-state checkbox to enable/disable all channels for the HDHomeRun lineup. Visible when the HDHR column is shown.
+    const hdhrVisible = visibleCols.has("hdhrEnabled") ? "" : " style=\"display: none;\"";
+    const hdhrCounts = getHdhrCounts(listing);
+    const hdhrCheckedAttr = (hdhrCounts.enabled === hdhrCounts.total) ? " checked" : "";
+    const hdhrIndeterminate = ((hdhrCounts.enabled > 0) && (hdhrCounts.enabled < hdhrCounts.total)) ? " data-indeterminate=\"true\"" : "";
+    lines.push("<div id=\"quick-action-hdhr\"" + hdhrVisible + ">");
+    lines.push("<label class=\"provider-option\" onclick=\"event.preventDefault(); bulkToggleHdhr()\">");
+    lines.push("<input type=\"checkbox\" id=\"hdhr-bulk-toggle\"" + hdhrCheckedAttr + hdhrIndeterminate + "> ");
+    lines.push("Include all in HDHR/Plex");
+    lines.push("<span class=\"quick-action-count\" id=\"hdhr-bulk-count\">" + String(hdhrCounts.enabled) + " of " + String(hdhrCounts.total) + "</span>");
+    lines.push("</label>");
+    lines.push("</div>");
+    // Bulk tag toggles — tristate checkboxes for each tag in the active vocabulary. Visible when the tags column is shown. Each checkbox shows how many enabled
+    // channels have the tag, and clicking it adds or removes the tag on all visible channels.
+    const tagsVisible = visibleCols.has("tags") ? "" : " style=\"display: none;\"";
+    const tagsVocabulary = getActiveTagVocabulary();
+    if (tagsVocabulary.length > 0) {
+        // Count how many enabled, provider-available channels have each tag.
+        const enabledListing = listing.filter((entry) => entry.enabled && entry.availableByProvider);
+        const totalEnabled = enabledListing.length;
+        const tagCountMap = new Map();
+        for (const tag of tagsVocabulary) {
+            tagCountMap.set(tag, 0);
+        }
+        for (const entry of enabledListing) {
+            const effectiveTags = getChannelEffectiveTags(entry.channel);
+            for (const tag of effectiveTags) {
+                const current = tagCountMap.get(tag);
+                if (current !== undefined) {
+                    tagCountMap.set(tag, current + 1);
+                }
+            }
+        }
+        lines.push("<div class=\"dropdown-divider\" id=\"quick-action-tags-divider\"" + tagsVisible + "></div>");
+        lines.push("<div id=\"quick-action-tags\"" + tagsVisible + ">");
+        lines.push("<div class=\"quick-action-section-label\">Tag Channels</div>");
+        for (const tag of tagsVocabulary) {
+            const count = tagCountMap.get(tag) ?? 0;
+            const checkedAttr = (count === totalEnabled) ? " checked" : "";
+            const indeterminate = ((count > 0) && (count < totalEnabled)) ? " data-indeterminate=\"true\"" : "";
+            lines.push("<label class=\"provider-option\" onclick=\"event.preventDefault(); bulkToggleTag('" + escapeHtml(tag) +
+                "', !this.querySelector('input').checked)\">" +
+                "<input type=\"checkbox\" class=\"tag-bulk-toggle\" data-tag=\"" + escapeHtml(tag) + "\"" + checkedAttr + indeterminate + "> " +
+                escapeHtml(tag) +
+                "<span class=\"quick-action-count\" data-tag-count=\"" + escapeHtml(tag) + "\">" +
+                String(count) + " of " + String(totalEnabled) + "</span></label>");
+        }
+        lines.push("</div>");
     }
     lines.push("</div>");
     lines.push("</div>");
@@ -706,6 +1131,24 @@ export function generateChannelsPanel(channelMessage, channelError, editingChann
     lines.push("<h3>Add New Channel</h3>");
     lines.push("<form id=\"add-channel-form-el\" onsubmit=\"return submitChannelForm(event, 'add')\">");
     lines.push("<input type=\"hidden\" name=\"action\" value=\"add\">");
+    // Provider pills. Clicking a provider auto-fills the URL field, which triggers the existing URL-change infrastructure (datalist population, profile
+    // resolution). The pills use providerDisplaySpan for icon rendering via the shared processProviderDisplays path. Guide-grid providers fill with their
+    // guideUrl; non-guide-grid providers fill with https://{domain}/.
+    const addFormTags = getAllProviderTags();
+    const addFormGuideUrls = getProviderGuideUrls();
+    lines.push("<div class=\"form-row\"><label>Provider</label>");
+    lines.push("<div class=\"provider-pills\">");
+    for (const tagInfo of addFormTags) {
+        if (tagInfo.tag === "direct") {
+            continue;
+        }
+        const pillUrl = addFormGuideUrls[tagInfo.tag] ?? (tagInfo.domain ? "https://" + tagInfo.domain + "/" : "");
+        lines.push("<button type=\"button\" class=\"provider-pill\" data-slug=\"" + escapeHtml(tagInfo.tag) + "\" data-url=\"" + escapeHtml(pillUrl) +
+            "\" onclick=\"selectProviderPill(this)\">" + providerDisplaySpan(tagInfo.displayName, tagInfo.domain, tagInfo.iconUrl) + "</button>");
+    }
+    lines.push("</div>");
+    lines.push("</div>");
+    lines.push("<div class=\"hint\">Select a provider to auto-fill the URL, or enter one manually below.</div>");
     // Channel key (add form only).
     lines.push(...generateTextField("add-key", "key", "Channel Key", formValues?.get("key") ?? "", {
         hint: "Lowercase letters, numbers, and hyphens only. Used in the URL: /stream/channel-key",
@@ -728,22 +1171,24 @@ export function generateChannelsPanel(channelMessage, channelError, editingChann
     }));
     // Profile dropdown.
     lines.push(...generateProfileDropdown("add-profile", formValues?.get("profile") ?? "", profiles));
-    // Advanced fields (station ID, channel selector, channel number).
-    lines.push(...generateAdvancedFields("add", formValues?.get("stationId") ?? "", formValues?.get("channelSelector") ?? "", formValues?.get("channelNumber") ?? ""));
+    // Advanced fields (station ID, channel selector, channel number, HDHR).
+    lines.push(...generateAdvancedFields("add", {
+        channelNumberValue: formValues?.get("channelNumber") ?? "",
+        channelSelectorValue: formValues?.get("channelSelector") ?? "",
+        hdhrEnabled: formValues?.get("hdhrEnabled") !== "false",
+        stationIdValue: formValues?.get("stationId") ?? ""
+    }));
     // Form buttons.
     lines.push("<div class=\"form-buttons\">");
     lines.push("<button type=\"submit\" class=\"btn btn-primary\">Add Channel</button>");
-    lines.push("<button type=\"button\" class=\"btn btn-secondary\" onclick=\"document.getElementById('add-channel-form').style.display='none'; ", "document.getElementById('add-channel-btn').style.display='inline-block';\">Cancel</button>");
+    lines.push("<button type=\"button\" class=\"btn btn-secondary\" onclick=\"document.getElementById('add-channel-form').style.display='none';\">Cancel</button>");
     lines.push("</div>");
     lines.push("</form>");
     lines.push("</div>"); // End add-channel-form.
-    // Provider filter toolbar with multi-select dropdown and chips. Placed after the add channel form so the form flows directly from its trigger button.
-    lines.push(generateProviderFilterToolbar());
     // Profile reference section (hidden by default, toggled via link in profile dropdown hint).
     lines.push(generateProfileReference(profiles));
     // Channels table. Disabled predefined channels are hidden by default and revealed via the "Show disabled" toggle. The wrapper div enables horizontal scrolling on
     // small screens. Table classes dynamically include hide-col-* for each hidden optional column.
-    const visibleCols = new Set(CONFIG.channels.visibleColumns);
     const tableClasses = ["channel-table", "hide-disabled"];
     for (const col of OPTIONAL_COLUMNS) {
         if (!visibleCols.has(col.field)) {
@@ -752,13 +1197,17 @@ export function generateChannelsPanel(channelMessage, channelError, editingChann
     }
     const sortField = CONFIG.channels.channelSortField;
     const sortDir = CONFIG.channels.channelSortDirection;
-    // Channel summary line with predefined/user breakdown. The user-count span contains the entire user portion (comma, count, and label) so the client can
-    // toggle it by setting textContent. When there are no user channels, the span is empty to avoid "0 user" noise.
+    // Provider filter toolbar with multi-select dropdown and chips.
+    lines.push(generateProviderFilterToolbar());
+    // Channel summary line with predefined/user breakdown, placed directly above the table for visual proximity. The user-count span contains the entire user
+    // portion (comma, count, and label) so the client can toggle it by setting textContent. When there are no user channels, the span is empty.
     const userPortion = (userCount > 0) ? ", " + String(userCount) + " user" : "";
     lines.push("<div class=\"channel-summary\"><span id=\"total-count\">" + String(totalCount) + "</span> channels " +
         "(<span id=\"predefined-count\">" + String(predefinedCount) + "</span> predefined<span id=\"user-count\">" + userPortion + "</span>) &middot; " +
         "<span id=\"enabled-count\">" + String(enabledCount) + "</span> enabled &middot; " +
         "<span id=\"disabled-count\">" + String(totalHiddenCount) + "</span> disabled</div>");
+    // Channels table. The wrapper uses fit-content so it shrinks when columns are hidden, with max-width: 100% to prevent viewport overflow. Centered via auto
+    // margins. Dropdown menus escape the container via portal to <body>.
     lines.push("<div class=\"channel-table-wrapper\">");
     lines.push("<table class=\"" + tableClasses.join(" ") + "\" data-sort-field=\"" + sortField + "\" data-sort-dir=\"" + sortDir + "\">");
     lines.push("<thead>");
@@ -770,13 +1219,36 @@ export function generateChannelsPanel(channelMessage, channelError, editingChann
         { cssClass: "col-provider", field: "provider", label: "Provider" },
         ...OPTIONAL_COLUMNS
     ];
+    // All sortable headers use the same DOM structure: <th onclick> wraps a <span class="sort-label"> for the label text. The sort update logic targets
+    // .sort-label to modify only the label — never touching other children like the Tags filter dropdown. Clicking anywhere on the <th> triggers sort;
+    // additional children (like the filter button) use event.stopPropagation() to prevent sort when interacting with them.
     for (const hdr of sortableHeaders) {
         const isActive = (sortField === hdr.field);
-        const indicator = isActive ? ((sortDir === "asc") ? " &#9650;" : " &#9660;") : "";
-        lines.push("<th class=\"" + hdr.cssClass + " sortable\" data-sort-field=\"" + hdr.field + "\" onclick=\"sortChannelTable('" + hdr.field + "')\">" +
-            hdr.label + indicator + "</th>");
+        const activeIndicator = isActive ? ((sortDir === "asc") ? " &#9650;" : " &#9660;") : "";
+        lines.push("<th class=\"" + hdr.cssClass + " sortable\" data-sort-field=\"" + hdr.field +
+            "\" onclick=\"sortChannelTable('" + hdr.field + "')\">");
+        lines.push("<span class=\"sort-label\">" + hdr.label + activeIndicator + "</span>");
+        // Tags header: additional filter dropdown alongside the sort label. The dropdown is a client-side-only view filter (transient, not persisted) that
+        // shows/hides rows based on their data-channel-tags attribute. The dropdown content comes from generateTagFilterContent() — the single source of truth
+        // shared with the tag CRUD incremental update path.
+        if (hdr.field === "tags") {
+            lines.push("<div class=\"dropdown tag-filter-dropdown\" style=\"display: inline;\">");
+            lines.push("<button type=\"button\" class=\"btn-icon btn-tag-filter\" title=\"Filter by tag\" " +
+                "onclick=\"event.stopPropagation(); toggleDropdown(this)\">" + ICON_FILTER + "</button>");
+            lines.push("<div class=\"dropdown-menu\" id=\"tag-filter-menu\">" + generateTagFilterContent() + "</div>");
+            lines.push("</div>");
+            // Playlist hint icon. Hidden by default, shown by applyTagColumnFilter() when the filter is active. Clicking opens a popover with the playlist URL
+            // that corresponds to the current tag filter, so users can copy it for Channels DVR configuration.
+            lines.push("<div class=\"dropdown\" style=\"display: inline;\">");
+            lines.push("<button type=\"button\" class=\"btn-icon btn-playlist-hint\" id=\"playlist-hint-btn\" " +
+                "title=\"Playlist URL for this filter\" style=\"display: none;\" " +
+                "onclick=\"event.stopPropagation(); showPlaylistHint(this)\">" + ICON_LINK + "</button>");
+            lines.push("<div class=\"dropdown-menu playlist-hint-menu\"></div>");
+            lines.push("</div>");
+        }
+        lines.push("</th>");
     }
-    // Actions header with table options dropdown.
+    // Actions header with table options dropdown (kebab menu). Contains the show-disabled toggle and column visibility checkboxes.
     lines.push("<th class=\"col-actions\"><span>Actions</span>");
     lines.push("<div class=\"dropdown column-picker\">");
     lines.push("<button type=\"button\" class=\"btn-icon btn-col-picker\" title=\"Table options\" aria-label=\"Table options\" " +
@@ -810,6 +1282,24 @@ export function generateChannelsPanel(channelMessage, channelError, editingChann
     // Embed channel selector data for datalist population. The client-side JavaScript uses this to offer known selector suggestions when the URL matches a
     // multi-channel site like Disney+ or USA Network.
     lines.push("<script>" + generateChannelSelectorData() + "</script>");
+    // Browse Channels modal. The shell is server-rendered using wizard modal CSS classes. The content area (provider picker, channel list) is rendered
+    // client-side after fetching discovered channels from the provider endpoint.
+    lines.push(generateBrowseModal());
+    // Provider Setup wizard modal. Follows the same wizard pattern as the provider profile builder. Three steps: pick providers, authenticate, browse channels.
+    // The setupCompleted flag is embedded as a data attribute so the client can auto-show the wizard on first visit.
+    lines.push(generateSetupWizardModal());
+    // Tag Management modal. A simple dialog for creating, deleting, and restoring organizational tags. Client-side handlers drive the CRUD operations via the
+    // tag management API endpoints.
+    lines.push(generateTagManagementModal());
+    // Inline tag edit portal — a shared dropdown portaled to <body> on first use by getTagPortal() in config.ts. One instance shared across all channel rows;
+    // populated dynamically from the clicked cell's data-tags attribute. Positioned via getBoundingClientRect() to escape the table wrapper's overflow:auto clipping.
+    const vocabulary = getActiveTagVocabulary();
+    lines.push("<div id=\"inline-tag-portal\" class=\"dropdown-menu inline-tag-menu\">");
+    for (const tag of vocabulary) {
+        lines.push("<label class=\"provider-option\" onclick=\"event.stopPropagation()\">" +
+            "<input type=\"checkbox\" class=\"inline-tag-checkbox\" data-tag=\"" + escapeHtml(tag) + "\"> " + escapeHtml(tag) + "</label>");
+    }
+    lines.push("</div>");
     return lines.join("\n");
 }
 //# sourceMappingURL=table.js.map