diff --git a/app/admin-shell/scripts/admin-shell-overrides.js b/app/admin-shell/scripts/admin-shell-overrides.js
index 1e69e401d..2a9e4886d 100644
--- a/app/admin-shell/scripts/admin-shell-overrides.js
+++ b/app/admin-shell/scripts/admin-shell-overrides.js
@@ -81,7 +81,8 @@ module.exports = {
     'pats',
     'featureFlags',
     'petoberfest',
-    'channels'
+    'channels',
+    'channel-collections'
   ],
 
   //
@@ -163,7 +164,8 @@ module.exports = {
     pats: 'pt',
     featureFlags: 'ffl',
     petoberfest: 'pb',
-    channels: 'ch'
+    channels: 'ch',
+    'channel-collections': 'cc'
   },
 
   //
diff --git a/app/admin-shell/webapp/controller/Shell.controller.js b/app/admin-shell/webapp/controller/Shell.controller.js
index f3a17963a..076810d26 100644
--- a/app/admin-shell/webapp/controller/Shell.controller.js
+++ b/app/admin-shell/webapp/controller/Shell.controller.js
@@ -61,7 +61,8 @@ sap.ui.define([
     petoberfest: "petoberfest",
     petoberfestContests: "petoberfestContests",
     topicClusters: "topicClusters",
-    channels: "channels"
+    channels: "channels",
+    channelCollections: "channelCollections"
   };
 
   var NAV_KEY_TO_TITLE = {
@@ -119,7 +120,8 @@ sap.ui.define([
     petoberfest: "Pet Photo Moderation",
     petoberfestContests: "Petoberfest Contests",
     topicClusters: "Topic Clusters",
-    channels: "Channels"
+    channels: "Channels",
+    channelCollections: "Channel Collections"
   };
 
   return Controller.extend("sap.tutorials.admin.shell.controller.Shell", {
diff --git a/app/admin-shell/webapp/manifest.json b/app/admin-shell/webapp/manifest.json
index 121be54d5..a2153203a 100644
--- a/app/admin-shell/webapp/manifest.json
+++ b/app/admin-shell/webapp/manifest.json
@@ -94,7 +94,8 @@
       "sap.tutorials.admin.pats": "./components/pats",
       "sap.tutorials.admin.featureFlags": "./components/featureFlags",
       "sap.tutorials.admin.petoberfest": "./components/petoberfest",
-      "sap.tutorials.admin.channels": "./components/channels"
+      "sap.tutorials.admin.channels": "./components/channels",
+      "sap.tutorials.admin.channelCollections": "./components/channel-collections"
     },
     "models": {
       "admin": {
@@ -386,6 +387,12 @@
         "settings": {},
         "componentData": {},
         "lazy": true
+      },
+      "channelCollectionsComponent": {
+        "name": "sap.tutorials.admin.channelCollections",
+        "settings": {},
+        "componentData": {},
+        "lazy": true
       }
     },
     "services": {
@@ -906,6 +913,16 @@
             }
           ]
         },
+        {
+          "name": "channelCollections",
+          "pattern": "channel-collections",
+          "target": [
+            {
+              "name": "channelCollectionsTarget",
+              "prefix": "cc"
+            }
+          ]
+        },
         {
           "name": "feedbackDashboard",
           "pattern": "feedback/dashboard",
@@ -1256,6 +1273,13 @@
           "viewLevel": 1,
           "prefix": "ch"
         },
+        "channelCollectionsTarget": {
+          "type": "Component",
+          "usage": "channelCollectionsComponent",
+          "id": "channelCollectionsTarget",
+          "viewLevel": 1,
+          "prefix": "cc"
+        },
         "feedbackDashboardTarget": {
           "viewName": "TutorialFeedbackDashboard",
           "viewLevel": 1
diff --git a/app/admin-shell/webapp/model/navigation.json b/app/admin-shell/webapp/model/navigation.json
index 80b83f456..ab7794964 100644
--- a/app/admin-shell/webapp/model/navigation.json
+++ b/app/admin-shell/webapp/model/navigation.json
@@ -23,6 +23,7 @@
         { "key": "advocates", "title": "Advocates" },
         { "key": "alerts", "title": "Alerts" },
         { "key": "channels", "title": "Channels" },
+        { "key": "channelCollections", "title": "Channel Collections" },
         { "key": "operations", "title": "Featured Tasks" }
       ]
     },
diff --git a/app/admin/channel-collections/package.json b/app/admin/channel-collections/package.json
new file mode 100644
index 000000000..fa4f066f7
--- /dev/null
+++ b/app/admin/channel-collections/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "channel-collections-admin",
+  "version": "0.0.1",
+  "private": true,
+  "description": "Channel Collections - Admin Fiori Elements",
+  "sapux": true,
+  "scripts": {
+    "start": "fiori run --open index.html",
+    "build": "ui5 build --clean-dest"
+  },
+  "devDependencies": {
+    "@sap/ux-specification": "latest",
+    "@ui5/cli": "^4.0.0"
+  }
+}
diff --git a/app/admin/channel-collections/ui5.yaml b/app/admin/channel-collections/ui5.yaml
new file mode 100644
index 000000000..437804d82
--- /dev/null
+++ b/app/admin/channel-collections/ui5.yaml
@@ -0,0 +1,12 @@
+specVersion: "4.0"
+metadata:
+  name: sap.tutorials.admin.channelCollections
+type: application
+framework:
+  name: SAPUI5
+  version: "1.136.0"
+  libraries:
+    - name: sap.m
+    - name: sap.ui.core
+    - name: sap.ushell
+    - name: sap.fe.templates
diff --git a/app/admin/channel-collections/webapp/Component.js b/app/admin/channel-collections/webapp/Component.js
new file mode 100644
index 000000000..2565f7d12
--- /dev/null
+++ b/app/admin/channel-collections/webapp/Component.js
@@ -0,0 +1,4 @@
+sap.ui.define(["sap/fe/core/AppComponent"], function (AppComponent) {
+  "use strict";
+  return AppComponent.extend("sap.tutorials.admin.channelCollections.Component", { metadata: { manifest: "json" } });
+});
diff --git a/app/admin/channel-collections/webapp/i18n/i18n.properties b/app/admin/channel-collections/webapp/i18n/i18n.properties
new file mode 100644
index 000000000..6dd7090b9
--- /dev/null
+++ b/app/admin/channel-collections/webapp/i18n/i18n.properties
@@ -0,0 +1,2 @@
+appTitle=Channel Collections
+appDescription=Manage editorial channel collections
diff --git a/app/admin/channel-collections/webapp/manifest.json b/app/admin/channel-collections/webapp/manifest.json
new file mode 100644
index 000000000..650cc0603
--- /dev/null
+++ b/app/admin/channel-collections/webapp/manifest.json
@@ -0,0 +1,79 @@
+{
+  "_version": "1.65.0",
+  "sap.app": {
+    "id": "sap.tutorials.admin.channelCollections",
+    "type": "application",
+    "title": "{{appTitle}}",
+    "description": "{{appDescription}}",
+    "applicationVersion": { "version": "0.0.1" },
+    "i18n": "i18n/i18n.properties",
+    "dataSources": {
+      "mainService": {
+        "uri": "/admin/",
+        "type": "OData",
+        "settings": { "odataVersion": "4.0" }
+      }
+    },
+    "crossNavigation": {
+      "inbounds": {
+        "ChannelCollections-manage": {
+          "semanticObject": "ChannelCollections",
+          "action": "manage",
+          "title": "{{appTitle}}",
+          "signature": { "parameters": {}, "additionalParameters": "allowed" }
+        }
+      }
+    }
+  },
+  "sap.ui5": {
+    "dependencies": {
+      "minUI5Version": "1.136.0",
+      "libs": { "sap.fe.templates": {} }
+    },
+    "models": {
+      "": {
+        "dataSource": "mainService",
+        "preload": true,
+        "settings": {
+          "synchronizationMode": "None",
+          "operationMode": "Server",
+          "autoExpandSelect": true,
+          "earlyRequests": true
+        }
+      },
+      "i18n": {
+        "type": "sap.ui.model.resource.ResourceModel",
+        "settings": { "bundleName": "sap.tutorials.admin.channelCollections.i18n.i18n" }
+      }
+    },
+    "routing": {
+      "routes": [
+        { "name": "ChannelCollectionsList", "pattern": ":?query:", "target": "ChannelCollectionsList" },
+        { "name": "ChannelCollectionsObject", "pattern": "ChannelCollections({key}):?query:", "target": "ChannelCollectionsObject" }
+      ],
+      "targets": {
+        "ChannelCollectionsList": {
+          "type": "Component",
+          "id": "ChannelCollectionsList",
+          "name": "sap.fe.templates.ListReport",
+          "options": {
+            "settings": {
+              "contextPath": "/ChannelCollections",
+              "initialLoad": "Enabled"
+            }
+          }
+        },
+        "ChannelCollectionsObject": {
+          "type": "Component",
+          "id": "ChannelCollectionsObject",
+          "name": "sap.fe.templates.ObjectPage",
+          "options": {
+            "settings": {
+              "contextPath": "/ChannelCollections"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/db/channels.cds b/db/channels.cds
index 094737819..1cd35f62f 100644
--- a/db/channels.cds
+++ b/db/channels.cds
@@ -1,6 +1,7 @@
 namespace com.sap.developers.ims;
 
 using { managed, cuid } from '@sap/cds/common';
+using { com.sap.developers.ims.AuthoringStatus } from './homepage';
 
 type ChannelOwnerType : String enum {
   SAP_Official; SAP_Developer_Advocate; SAP_Executive;
@@ -41,3 +42,21 @@ entity Channels : cuid, managed {
   linkStatusOverride : String(20);
   lastChecked        : Timestamp;
 }
+
+// --- P2: editorial clusters (LLM-drafted, human-reviewed) --------------------
+entity ChannelCollections : cuid, managed {
+  slug            : String(80)  @mandatory;
+  title           : String(140) @mandatory;
+  intro           : String(1200);
+  sortOrder       : Integer default 100;
+  isPublished     : Boolean default false;
+  authoringStatus : AuthoringStatus default 'BLANK' @assert.range;
+  items           : Composition of many ChannelCollectionItems on items.collection = $self;
+}
+
+entity ChannelCollectionItems : cuid {
+  collection : Association to ChannelCollections;
+  channel    : Association to Channels;
+  sortOrder  : Integer default 100;
+  blurb      : String(280);
+}
diff --git a/db/last-dev/csn.json b/db/last-dev/csn.json
index 1539cd15b..2a40ac451 100644
--- a/db/last-dev/csn.json
+++ b/db/last-dev/csn.json
@@ -2241,6 +2241,111 @@
       },
       "@cds.persistence.name": "COM_SAP_DEVELOPERS_IMS_CHANNELS"
     },
+    "com.sap.developers.ims.ChannelCollections": {
+      "kind": "entity",
+      "@cds.persistence.journal": true,
+      "elements": {
+        "ID": {
+          "key": true,
+          "type": "cds.String",
+          "length": 36,
+          "@cds.persistence.name": "ID"
+        },
+        "createdAt": {
+          "type": "cds.Timestamp",
+          "@cds.persistence.name": "CREATEDAT"
+        },
+        "createdBy": {
+          "type": "cds.String",
+          "length": 255,
+          "@cds.persistence.name": "CREATEDBY"
+        },
+        "modifiedAt": {
+          "type": "cds.Timestamp",
+          "@cds.persistence.name": "MODIFIEDAT"
+        },
+        "modifiedBy": {
+          "type": "cds.String",
+          "length": 255,
+          "@cds.persistence.name": "MODIFIEDBY"
+        },
+        "slug": {
+          "type": "cds.String",
+          "length": 80,
+          "@cds.persistence.name": "SLUG"
+        },
+        "title": {
+          "type": "cds.String",
+          "length": 140,
+          "@cds.persistence.name": "TITLE"
+        },
+        "intro": {
+          "type": "cds.String",
+          "length": 1200,
+          "@cds.persistence.name": "INTRO"
+        },
+        "sortOrder": {
+          "type": "cds.Integer",
+          "default": {
+            "val": 100
+          },
+          "@cds.persistence.name": "SORTORDER"
+        },
+        "isPublished": {
+          "type": "cds.Boolean",
+          "default": {
+            "val": false
+          },
+          "@cds.persistence.name": "ISPUBLISHED"
+        },
+        "authoringStatus": {
+          "type": "cds.String",
+          "default": {
+            "val": "BLANK"
+          },
+          "length": 5000,
+          "@cds.persistence.name": "AUTHORINGSTATUS"
+        }
+      },
+      "@cds.persistence.name": "COM_SAP_DEVELOPERS_IMS_CHANNELCOLLECTIONS"
+    },
+    "com.sap.developers.ims.ChannelCollectionItems": {
+      "kind": "entity",
+      "@cds.persistence.journal": true,
+      "elements": {
+        "ID": {
+          "key": true,
+          "type": "cds.String",
+          "length": 36,
+          "@cds.persistence.name": "ID"
+        },
+        "collection_ID": {
+          "type": "cds.String",
+          "length": 36,
+          "@odata.foreignKey4": "collection",
+          "@cds.persistence.name": "COLLECTION_ID"
+        },
+        "channel_ID": {
+          "type": "cds.String",
+          "length": 36,
+          "@odata.foreignKey4": "channel",
+          "@cds.persistence.name": "CHANNEL_ID"
+        },
+        "sortOrder": {
+          "type": "cds.Integer",
+          "default": {
+            "val": 100
+          },
+          "@cds.persistence.name": "SORTORDER"
+        },
+        "blurb": {
+          "type": "cds.String",
+          "length": 280,
+          "@cds.persistence.name": "BLURB"
+        }
+      },
+      "@cds.persistence.name": "COM_SAP_DEVELOPERS_IMS_CHANNELCOLLECTIONITEMS"
+    },
     "com.sap.developers.ims.FailedEmails": {
       "kind": "entity",
       "@cds.persistence.journal": true,
diff --git a/db/persistence.cds b/db/persistence.cds
index 0d2e2fc98..f8a154c34 100644
--- a/db/persistence.cds
+++ b/db/persistence.cds
@@ -52,3 +52,5 @@ annotate ims.MetricSnapshots with @cds.persistence.journal;
 annotate ims.PublishTimings with @cds.persistence.journal;
 annotate ims.TutorialValidationRules with @cds.persistence.journal;
 annotate ims.Channels with @cds.persistence.journal;
+annotate ims.ChannelCollections with @cds.persistence.journal;
+annotate ims.ChannelCollectionItems with @cds.persistence.journal;
diff --git a/db/src/com.sap.developers.ims.ChannelCollectionItems.hdbmigrationtable b/db/src/com.sap.developers.ims.ChannelCollectionItems.hdbmigrationtable
new file mode 100644
index 000000000..81d728f79
--- /dev/null
+++ b/db/src/com.sap.developers.ims.ChannelCollectionItems.hdbmigrationtable
@@ -0,0 +1,9 @@
+== version=1
+COLUMN TABLE com_sap_developers_ims_ChannelCollectionItems (
+  ID NVARCHAR(36) NOT NULL,
+  collection_ID NVARCHAR(36),
+  channel_ID NVARCHAR(36),
+  sortOrder INTEGER DEFAULT 100,
+  blurb NVARCHAR(280),
+  PRIMARY KEY(ID)
+)
diff --git a/db/src/com.sap.developers.ims.ChannelCollections.hdbmigrationtable b/db/src/com.sap.developers.ims.ChannelCollections.hdbmigrationtable
new file mode 100644
index 000000000..31181dd09
--- /dev/null
+++ b/db/src/com.sap.developers.ims.ChannelCollections.hdbmigrationtable
@@ -0,0 +1,15 @@
+== version=1
+COLUMN TABLE com_sap_developers_ims_ChannelCollections (
+  ID NVARCHAR(36) NOT NULL,
+  createdAt TIMESTAMP,
+  createdBy NVARCHAR(255),
+  modifiedAt TIMESTAMP,
+  modifiedBy NVARCHAR(255),
+  slug NVARCHAR(80),
+  title NVARCHAR(140),
+  intro NVARCHAR(1200),
+  sortOrder INTEGER DEFAULT 100,
+  isPublished BOOLEAN DEFAULT FALSE,
+  authoringStatus NVARCHAR(5000) DEFAULT 'BLANK',
+  PRIMARY KEY(ID)
+)
diff --git a/hugo-apps/src/channels-directory/ChannelsDirectory.vue b/hugo-apps/src/channels-directory/ChannelsDirectory.vue
index 5ed895b2e..fe35c9706 100644
--- a/hugo-apps/src/channels-directory/ChannelsDirectory.vue
+++ b/hugo-apps/src/channels-directory/ChannelsDirectory.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
 import { ref, computed } from 'vue';
 import { filterChannels, ownerBadge, type Channel } from './filter';
+import { visibleCollections, type Collection } from './collections';
 
-const props = defineProps<{ channels: Channel[] }>();
+const props = defineProps<{ channels: Channel[]; collections?: Collection[] }>();
 const query = ref('');
 const category = ref('');
 const platform = ref('');
@@ -23,10 +24,23 @@ const results = computed(() =>
   }));
 const badgeClass = (c: Channel) =>
   c.isSapOwned || ownerBadge(c).startsWith('SAP') ? 'badge--sap' : 'badge--community';
+const cols = computed(() => visibleCollections(props.collections));
 </script>
 
 <template>
   <div class="channels-directory">
+    <section v-if="cols.length" class="channel-collections">
+      <article v-for="col in cols" :key="col.slug" class="collection">
+        <h2>{{ col.title }}</h2>
+        <p v-if="col.intro" class="collection-intro">{{ col.intro }}</p>
+        <ul>
+          <li v-for="it in col.items" :key="it.url">
+            <a :href="it.url">{{ it.name }}</a>
+            <span v-if="it.blurb" class="blurb">— {{ it.blurb }}</span>
+          </li>
+        </ul>
+      </article>
+    </section>
     <div class="channels-directory__controls">
       <input v-model="query" type="search" placeholder="Search channels…" aria-label="Search channels" />
       <select v-model="ownerScope" aria-label="Ownership">
diff --git a/hugo-apps/src/channels-directory/collections.test.ts b/hugo-apps/src/channels-directory/collections.test.ts
new file mode 100644
index 000000000..5dc4dc36b
--- /dev/null
+++ b/hugo-apps/src/channels-directory/collections.test.ts
@@ -0,0 +1,18 @@
+import { describe, it, expect } from 'vitest';
+import { visibleCollections, type Collection } from './collections';
+
+const rows: Collection[] = [
+  { slug: 'a', title: 'A', intro: 'ia', sortOrder: 20, items: [{ url: 'u1', name: 'n1' }] },
+  { slug: 'b', title: 'B', intro: 'ib', sortOrder: 10, items: [] },
+  { slug: 'c', title: 'C', intro: 'ic', sortOrder: 5, items: [{ url: 'u2', name: 'n2' }] },
+];
+
+describe('visibleCollections', () => {
+  it('drops empty collections and sorts by sortOrder', () => {
+    const out = visibleCollections(rows);
+    expect(out.map((c) => c.slug)).toEqual(['c', 'a']); // b dropped (no items), sorted 5,20
+  });
+  it('returns [] for undefined input', () => {
+    expect(visibleCollections(undefined)).toEqual([]);
+  });
+});
diff --git a/hugo-apps/src/channels-directory/collections.ts b/hugo-apps/src/channels-directory/collections.ts
new file mode 100644
index 000000000..a3a1b7f8b
--- /dev/null
+++ b/hugo-apps/src/channels-directory/collections.ts
@@ -0,0 +1,9 @@
+export interface CollectionItem { url: string; name: string; blurb?: string; sortOrder?: number }
+export interface Collection { slug: string; title: string; intro?: string; sortOrder?: number; items: CollectionItem[] }
+
+// Only render collections that have at least one item; order by sortOrder.
+export function visibleCollections(collections: Collection[] | undefined): Collection[] {
+  return (collections || [])
+    .filter((c) => Array.isArray(c.items) && c.items.length > 0)
+    .sort((a, b) => (a.sortOrder ?? 100) - (b.sortOrder ?? 100));
+}
diff --git a/hugo-apps/src/channels-directory/index.ts b/hugo-apps/src/channels-directory/index.ts
index c3f39e205..182b15a59 100644
--- a/hugo-apps/src/channels-directory/index.ts
+++ b/hugo-apps/src/channels-directory/index.ts
@@ -6,7 +6,10 @@ function boot() {
     const dataEl = document.getElementById('channels-data');
     let channels: unknown[] = [];
     try { channels = JSON.parse(dataEl?.textContent || '[]'); } catch { channels = []; }
-    createApp(ChannelsDirectory, { channels }).mount(el);
+    const collectionsEl = document.getElementById('channel-collections-data');
+    let collections: unknown[] = [];
+    try { collections = JSON.parse(collectionsEl?.textContent || '[]'); } catch { collections = []; }
+    createApp(ChannelsDirectory, { channels, collections }).mount(el);
   });
 }
 if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', boot);
diff --git a/hugo/layouts/channels/list.html b/hugo/layouts/channels/list.html
index 0f5ae1b12..19f0dbed6 100644
--- a/hugo/layouts/channels/list.html
+++ b/hugo/layouts/channels/list.html
@@ -5,7 +5,10 @@
     <h1>{{ .Title }}</h1>
     <p>{{ .Description }}</p>
   </header>
-  <script id="channels-data" type="application/json">{{ $channels | jsonify | safeJS }}</script>
+  <script id="channel-collections-data" type="application/json">
+      {{ with .Site.Data.channel_collections }}{{ .collections | jsonify }}{{ else }}[]{{ end }}
+    </script>
+    <script id="channels-data" type="application/json">{{ $channels | jsonify | safeJS }}</script>
   <div data-island="channels-directory"></div>
   <noscript>
     <ul>
diff --git a/package.json b/package.json
index 5606a7195..8e15cec89 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "fetch-tutorials": "tsx scripts/fetch-tutorials.ts --target hugo",
     "fetch-homepage-shelves": "tsx scripts/fetch-homepage-shelves.ts",
     "fetch-channels": "tsx scripts/fetch-channels.ts",
+    "fetch-channel-collections": "tsx scripts/fetch-channel-collections.ts",
     "fetch-verb-definitions": "tsx scripts/fetch-verb-definitions.ts",
     "fetch-tags": "tsx scripts/fetch-tags.ts",
     "fetch-shelf-definitions": "tsx scripts/fetch-shelf-definitions.ts",
@@ -53,6 +54,7 @@
     "kg:reextract": "cross-env KG_EXTRACT_BUILD_CAP=10000 cds bind --exec -- node scripts/kg-reextract.cjs",
     "seed-channels": "cds bind --exec -- node scripts/seed-channels.cjs",
     "promote-channels": "cds bind --exec -- node scripts/promote-channels-to-shelves.cjs",
+    "seed-collections": "cds bind --exec -- node scripts/seed-collections.cjs",
     "seed-tag-labels": "tsx scripts/seed-tag-labels.ts",
     "migrate:reference": "node scripts/migrate-reference-data.js",
     "migrate:users": "node scripts/migrate-user-progress.js",
@@ -91,7 +93,7 @@
     "build:display": "cd app/display-app && npm install && npm run build",
     "copy-joule-vendor": "node scripts/copy-joule-vendor.mjs",
     "check-deploy-cap-target": "node scripts/check-deploy-cap-target.cjs",
-    "build:all": "npm run prebuild && npm run fetch-tutorials -- --regenerate && npm run fetch-advocates && npm run fetch-homepage-shelves && npm run fetch-channels && npm run fetch-verb-definitions && npm run fetch-tags && npm run fetch-shelf-definitions && npm run fetch-featured-topics && npm run fetch-topic-clusters && npm run build:icon-subset && npm run build:css && npm run build:apps && npm run build:island-manifest && npm run check:ui5-single-copy && npx tsx scripts/check-ui5-entry-coverage.ts && npm run build:analytics-explorer && npm run copy-joule-vendor && npm run build:explore && npm run build:hugo && npm run build:page-fallback && npm run build:whats-new-snapshot && npm run retain:assets && npm run build:publish-island-manifest && npm run build:highlight && npm run build:display && npm run build:sdl",
+    "build:all": "npm run prebuild && npm run fetch-tutorials -- --regenerate && npm run fetch-advocates && npm run fetch-homepage-shelves && npm run fetch-channels && npm run fetch-channel-collections && npm run fetch-verb-definitions && npm run fetch-tags && npm run fetch-shelf-definitions && npm run fetch-featured-topics && npm run fetch-topic-clusters && npm run build:icon-subset && npm run build:css && npm run build:apps && npm run build:island-manifest && npm run check:ui5-single-copy && npx tsx scripts/check-ui5-entry-coverage.ts && npm run build:analytics-explorer && npm run copy-joule-vendor && npm run build:explore && npm run build:hugo && npm run build:page-fallback && npm run build:whats-new-snapshot && npm run retain:assets && npm run build:publish-island-manifest && npm run build:highlight && npm run build:display && npm run build:sdl",
     "build:deploy": "npm run check-deploy-cap-target && npm run build:all",
     "deploy": "node scripts/deploy-mta.cjs",
     "build:admin": "npm --prefix app/admin-shell run build",
diff --git a/scripts/fetch-channel-collections.ts b/scripts/fetch-channel-collections.ts
new file mode 100644
index 000000000..f395b1193
--- /dev/null
+++ b/scripts/fetch-channel-collections.ts
@@ -0,0 +1,20 @@
+import { writeFileSync, mkdirSync } from 'node:fs';
+import { resolve } from 'node:path';
+
+const CAP_BASE = process.env.CAP_BASE_URL || 'http://localhost:4004';
+const OUT = resolve('hugo/data/channel_collections.json');
+
+async function main() {
+  let payload: Record<string, unknown> = { collections: [], buildAt: new Date().toISOString() };
+  try {
+    const res = await fetch(`${CAP_BASE}/build/channel-collections`);
+    if (res.ok) payload = { ...payload, ...(await res.json()) };
+    else payload.error = `HTTP ${res.status}`;
+  } catch (e) {
+    payload.error = String((e as Error).message || e);
+  }
+  mkdirSync(resolve('hugo/data'), { recursive: true });
+  writeFileSync(OUT, JSON.stringify(payload, null, 2));
+  console.log(`[fetch-channel-collections] wrote ${OUT} (${(payload.collections as unknown[]).length} collections)`);
+}
+main();
diff --git a/scripts/seed-collections.cjs b/scripts/seed-collections.cjs
new file mode 100644
index 000000000..04b82e32c
--- /dev/null
+++ b/scripts/seed-collections.cjs
@@ -0,0 +1,14 @@
+'use strict';
+// Usage: cds bind --exec -- node scripts/seed-collections.cjs [--commit]
+const cds = require('@sap/cds');
+const { seedCollections } = require('../srv/lib/channels/seed-collections.js');
+
+(async () => {
+  const commit = process.argv.includes('--commit');
+  await cds.load('*'); // ensure cds.model is populated for cds.linked in the lib
+  const db = await cds.connect.to('db');
+  const res = await seedCollections(db, { commit });
+  console.log(`[seed-collections] commit=${commit}`, res);
+  if (!commit) console.log('[seed-collections] dry run — pass --commit to write. Drafts land as AI_SEEDED; review in /admin-ui/#channelCollections.');
+  process.exit(0);
+})().catch((e) => { console.error(e); process.exit(1); });
diff --git a/srv/admin-service.cds b/srv/admin-service.cds
index 81f754097..5facf4781 100644
--- a/srv/admin-service.cds
+++ b/srv/admin-service.cds
@@ -303,6 +303,10 @@ service AdminService {
   @odata.draft.enabled
   entity Channels as projection on ims.Channels;
 
+  @odata.draft.enabled
+  entity ChannelCollections as projection on ims.ChannelCollections;
+  entity ChannelCollectionItems as projection on ims.ChannelCollectionItems;
+
   @cds.redirection.target: true
   @Capabilities.ChangeTracking : { Supported: true }
   @odata.draft.enabled
diff --git a/srv/lib/channels/__tests__/seed-collections.test.js b/srv/lib/channels/__tests__/seed-collections.test.js
new file mode 100644
index 000000000..f526387af
--- /dev/null
+++ b/srv/lib/channels/__tests__/seed-collections.test.js
@@ -0,0 +1,69 @@
+// srv/lib/channels/__tests__/seed-collections.test.js
+import cds from '@sap/cds';
+import { describe, it, expect, beforeAll, afterAll } from 'vitest';
+import { draftCollections, seedCollections } from '../seed-collections.js';
+
+const project = cds.test('serve', '--project', '.', '--in-memory');
+const NS = 'com.sap.developers.ims';
+const linked = () => cds.linked(cds.model).entities(NS);
+
+// Deterministic fake LLM: clusters by first focus area.
+const fakeLlm = async (channels) => {
+  const byFocus = {};
+  for (const c of channels) {
+    const key = (c.focusAreas && c.focusAreas[0]) || 'general';
+    (byFocus[key] ||= []).push(c);
+  }
+  return Object.entries(byFocus).map(([focus, chs], i) => ({
+    slug: `auto-${focus}`, title: `All about ${focus}`, intro: `Curated ${focus} channels.`, sortOrder: (i + 1) * 10,
+    items: chs.map((c, j) => ({ sourceId: c.sourceId, blurb: `${c.name} matters`, sortOrder: (j + 1) * 10 })),
+  }));
+};
+
+describe('draftCollections', () => {
+  it('turns channels into collection drafts via the injected llm', async () => {
+    const drafts = await draftCollections(
+      [{ sourceId: 's1', name: 'CAP', focusAreas: ['cap'] }, { sourceId: 's2', name: 'RAP', focusAreas: ['cap'] }],
+      { llm: fakeLlm },
+    );
+    expect(drafts).toHaveLength(1);
+    expect(drafts[0].slug).toBe('auto-cap');
+    expect(drafts[0].items).toHaveLength(2);
+  });
+});
+
+describe('seedCollections', () => {
+  let s1, s2;
+  beforeAll(async () => {
+    const { Channels } = linked();
+    s1 = cds.utils.uuid(); s2 = cds.utils.uuid();
+    await INSERT.into(Channels).entries([
+      { ID: s1, sourceId: 'sc-cap', name: 'CAP', url: 'https://sc-cap', isPublished: true, focusAreas: ['cap'] },
+      { ID: s2, sourceId: 'sc-ai', name: 'AI', url: 'https://sc-ai', isPublished: true, focusAreas: ['ai'] },
+    ]);
+  });
+  afterAll(async () => {
+    await DELETE.from(linked().ChannelCollectionItems);
+    await DELETE.from(linked().ChannelCollections).where({ slug: { like: 'auto-%' } });
+    await DELETE.from(linked().Channels).where({ sourceId: { in: ['sc-cap', 'sc-ai'] } });
+  });
+
+  it('inserts AI_SEEDED collections and is idempotent, preserving REVIEWED', async () => {
+    const db = await cds.connect.to('db');
+    const first = await seedCollections(db, { commit: true, llm: fakeLlm });
+    expect(first.created).toBeGreaterThan(0);
+    const { ChannelCollections } = linked();
+    const capCol = await SELECT.one.from(ChannelCollections).where({ slug: 'auto-cap' });
+    expect(capCol.authoringStatus).toBe('AI_SEEDED');
+
+    // Curator reviews it:
+    await UPDATE(ChannelCollections).set({ authoringStatus: 'REVIEWED', title: 'Human title' }).where({ slug: 'auto-cap' });
+
+    // Re-run: reviewed row is preserved untouched, others re-drafted.
+    const second = await seedCollections(db, { commit: true, llm: fakeLlm });
+    expect(second.skippedReviewed).toBeGreaterThan(0);
+    const preserved = await SELECT.one.from(ChannelCollections).where({ slug: 'auto-cap' });
+    expect(preserved.title).toBe('Human title');
+    expect(preserved.authoringStatus).toBe('REVIEWED');
+  });
+});
diff --git a/srv/lib/channels/seed-collections.js b/srv/lib/channels/seed-collections.js
new file mode 100644
index 000000000..fa49ad4aa
--- /dev/null
+++ b/srv/lib/channels/seed-collections.js
@@ -0,0 +1,103 @@
+'use strict';
+const cds = require('@sap/cds');
+
+// Pure: given channels + an async llm(channels)->drafts fn, return drafts.
+// The llm fn is injected so tests never touch the AI SDK. The real llm is
+// built lazily by buildLlm() below (never a top-level import — keeps
+// @sap-ai-sdk/orchestration out of srv-qa boot; see project srv-qa cp-list rule).
+async function draftCollections(channels, { llm }) {
+  if (typeof llm !== 'function') throw new Error('draftCollections requires an llm function');
+  const drafts = await llm(channels);
+  return (drafts || []).map((d, i) => ({
+    slug: String(d.slug).toLowerCase(),
+    title: d.title, intro: d.intro, sortOrder: d.sortOrder ?? (i + 1) * 10,
+    items: (d.items || []).map((it, j) => ({ sourceId: it.sourceId, url: it.url, blurb: it.blurb, sortOrder: it.sortOrder ?? (j + 1) * 10 })),
+  }));
+}
+
+// Lazy-built real LLM caller. Mirrors srv/lib/category-classifier-llm.js.
+async function buildLlm() {
+  const { OrchestrationClient } = await import('@sap-ai-sdk/orchestration');
+  const { resolveChatLlmSettings } = await import('../chat-settings-resolver.js');
+  const { modelName, deploymentId } = await resolveChatLlmSettings();
+  return async (channels) => {
+    const catalog = channels.map((c) => ({ sourceId: c.sourceId, name: c.name, purpose: c.purpose, focusAreas: c.focusAreas, tags: c.tags, category: c.category }));
+    const tool = {
+      type: 'function',
+      function: {
+        name: 'submit_collections',
+        description: 'Group SAP developer channels into 5-9 explained editorial collections.',
+        parameters: {
+          type: 'object',
+          properties: {
+            collections: {
+              type: 'array',
+              items: {
+                type: 'object',
+                properties: {
+                  slug: { type: 'string' }, title: { type: 'string' }, intro: { type: 'string' },
+                  items: { type: 'array', items: { type: 'object', properties: {
+                    sourceId: { type: 'string', enum: catalog.map((c) => c.sourceId) },
+                    blurb: { type: 'string' },
+                  }, required: ['sourceId'] } },
+                },
+                required: ['slug', 'title', 'intro', 'items'],
+              },
+            },
+          },
+          required: ['collections'],
+        },
+      },
+    };
+    const client = new OrchestrationClient({
+      promptTemplating: {
+        model: { name: modelName, params: { max_tokens: 4000, temperature: 0.3, tool_choice: { type: 'function', function: { name: 'submit_collections' } } } },
+        prompt: {
+          template: [{ role: 'system', content: 'You are a curator grouping SAP developer channels into a small set of named, explained collections. Each collection has a short slug, a title, a 2-3 sentence intro on how to navigate it, and an ordered list of member channels (by sourceId) each with a one-line blurb.' }],
+          tools: [tool],
+        },
+      },
+    }, { deploymentId });
+    const response = await client.chatCompletion({ messagesHistory: [{ role: 'user', content: JSON.stringify(catalog) }] });
+    const calls = response.getToolCalls() || [];
+    const args = calls[0] && JSON.parse(calls[0].function.arguments);
+    return (args && args.collections) || [];
+  };
+}
+
+async function seedCollections(db, { commit = false, llm } = {}) {
+  const linked = cds.linked(cds.model ?? (await cds.load('*')));
+  const { Channels, ChannelCollections, ChannelCollectionItems } = linked.entities('com.sap.developers.ims');
+  const channels = await db.run(SELECT.from(Channels).where({ isPublished: true }));
+  const effectiveLlm = llm || (await buildLlm());
+  const drafts = await draftCollections(channels, { llm: effectiveLlm });
+  const bySource = new Map(channels.map((c) => [c.sourceId, c]));
+
+  let created = 0, updatedDraft = 0, skippedReviewed = 0;
+  for (const d of drafts) {
+    const existing = await db.run(SELECT.one.from(ChannelCollections).where({ slug: d.slug }));
+    if (existing && existing.authoringStatus === 'REVIEWED') { skippedReviewed++; continue; }
+    if (!commit) { existing ? updatedDraft++ : created++; continue; }
+
+    let colId;
+    if (existing) {
+      colId = existing.ID;
+      await db.run(UPDATE(ChannelCollections).set({ title: d.title, intro: d.intro, sortOrder: d.sortOrder, authoringStatus: 'AI_SEEDED' }).where({ ID: colId }));
+      await db.run(DELETE.from(ChannelCollectionItems).where({ collection_ID: colId }));
+      updatedDraft++;
+    } else {
+      colId = cds.utils.uuid();
+      await db.run(INSERT.into(ChannelCollections).entries({ ID: colId, slug: d.slug, title: d.title, intro: d.intro, sortOrder: d.sortOrder, isPublished: false, authoringStatus: 'AI_SEEDED' }));
+      created++;
+    }
+    const items = d.items
+      .map((it) => ({ ch: it.sourceId ? bySource.get(it.sourceId) : channels.find((c) => c.url === it.url), blurb: it.blurb, sortOrder: it.sortOrder }))
+      .filter((x) => x.ch);
+    if (items.length) {
+      await db.run(INSERT.into(ChannelCollectionItems).entries(items.map((x) => ({ ID: cds.utils.uuid(), collection_ID: colId, channel_ID: x.ch.ID, blurb: x.blurb, sortOrder: x.sortOrder }))));
+    }
+  }
+  return { created, updatedDraft, skippedReviewed };
+}
+
+module.exports = { draftCollections, seedCollections, buildLlm };
diff --git a/srv/server.js b/srv/server.js
index 3bafa78df..20a0cb560 100644
--- a/srv/server.js
+++ b/srv/server.js
@@ -461,6 +461,43 @@ cds.on('bootstrap', (app) => {
     }
   });
 
+  // P2: editorial collections leading the /channels directory landing.
+  // Consumed by scripts/fetch-channel-collections.ts at build time. Public, unauthenticated.
+  // Cache-Control 60s. Filters to isPublished=true + authoringStatus='REVIEWED'
+  // collections; items filtered to published channels with linkStatus!='BROKEN'
+  // (override wins); collections ordered by sortOrder,title; items by sortOrder.
+  app.get('/build/channel-collections', async (_req, res) => {
+    try {
+      const db = await cds.connect.to('db');
+      const NS = 'com.sap.developers.ims';
+      const cols = await db.run(
+        SELECT.from(`${NS}.ChannelCollections`)
+          .where({ isPublished: true, authoringStatus: 'REVIEWED' })
+          .orderBy('sortOrder', 'title'),
+      );
+      const items = await db.run(
+        SELECT.from(`${NS}.ChannelCollectionItems`).orderBy('sortOrder'),
+      );
+      const chans = await db.run(
+        SELECT.from(`${NS}.Channels`).columns('ID', 'name', 'url', 'isPublished', 'linkStatus', 'linkStatusOverride'),
+      );
+      const chById = new Map(chans.map((c) => [c.ID, c]));
+      const collections = cols.map((col) => ({
+        slug: col.slug, title: col.title, intro: col.intro, sortOrder: col.sortOrder,
+        items: items
+          .filter((it) => it.collection_ID === col.ID)
+          .map((it) => ({ ch: chById.get(it.channel_ID), blurb: it.blurb, sortOrder: it.sortOrder }))
+          .filter((x) => x.ch && x.ch.isPublished && (x.ch.linkStatusOverride || x.ch.linkStatus) !== 'BROKEN')
+          .map((x) => ({ url: x.ch.url, name: x.ch.name, blurb: x.blurb, sortOrder: x.sortOrder })),
+      }));
+      res.set('Cache-Control', 'public, max-age=60');
+      res.json({ collections, buildAt: new Date().toISOString() });
+    } catch (err) {
+      console.error('[build/channel-collections]', err.message);
+      res.status(500).json({ collections: [], error: String(err && err.message || err) });
+    }
+  });
+
   // (#1032) Build-time data for Hugo featured topics carousel — consumed by
   // scripts/fetch-tutorials.ts at build time. Public, unauthenticated.
   // Cache-Control 60s (Hugo fetches once per build, not per request).
diff --git a/test/admin-channel-collections-app.test.js b/test/admin-channel-collections-app.test.js
new file mode 100644
index 000000000..f7587aa47
--- /dev/null
+++ b/test/admin-channel-collections-app.test.js
@@ -0,0 +1,28 @@
+// test/admin-channel-collections-app.test.js
+import { describe, it, expect } from 'vitest';
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+
+const app = 'app/admin/channel-collections';
+
+describe('channel-collections admin app', () => {
+  it('has a manifest whose app id matches the folder camelName', () => {
+    const m = JSON.parse(readFileSync(resolve(app, 'webapp/manifest.json'), 'utf8'));
+    expect(m['sap.app'].id).toBe('sap.tutorials.admin.channelCollections');
+    expect(m['sap.app'].dataSources.mainService.uri).toBe('/admin/');
+  });
+  it('targets the ChannelCollections entity on list + object pages', () => {
+    const m = JSON.parse(readFileSync(resolve(app, 'webapp/manifest.json'), 'utf8'));
+    const targets = m['sap.ui5'].routing.targets;
+    const contextPaths = Object.values(targets).map((t) => t.options?.settings?.contextPath);
+    expect(contextPaths).toContain('/ChannelCollections');
+  });
+  it('is registered in the admin-shell nav order and prefix map', () => {
+    const src = readFileSync(resolve('app/admin-shell/scripts/admin-shell-overrides.js'), 'utf8');
+    expect(src).toContain("'channel-collections'");
+  });
+  it('is listed in the shell navigation model', () => {
+    const nav = readFileSync(resolve('app/admin-shell/webapp/model/navigation.json'), 'utf8');
+    expect(nav).toContain('channelCollections');
+  });
+});
diff --git a/test/admin-channel-collections.test.js b/test/admin-channel-collections.test.js
new file mode 100644
index 000000000..867f8569c
--- /dev/null
+++ b/test/admin-channel-collections.test.js
@@ -0,0 +1,15 @@
+// test/admin-channel-collections.test.js
+import cds from '@sap/cds';
+import { describe, it, expect } from 'vitest';
+
+const project = cds.test('serve', '--project', '.', '--in-memory');
+
+describe('AdminService channel collections', () => {
+  it('exposes ChannelCollections as a draft-enabled admin entity', async () => {
+    const { AdminService } = cds.services;
+    const csn = AdminService.model.definitions['AdminService.ChannelCollections'];
+    expect(csn).toBeTruthy();
+    expect(csn['@odata.draft.enabled']).toBe(true);
+    expect(AdminService.model.definitions['AdminService.ChannelCollectionItems']).toBeTruthy();
+  });
+});
diff --git a/test/build-channel-collections-feed.test.js b/test/build-channel-collections-feed.test.js
new file mode 100644
index 000000000..a3704a2d6
--- /dev/null
+++ b/test/build-channel-collections-feed.test.js
@@ -0,0 +1,50 @@
+// test/build-channel-collections-feed.test.js
+import cds from '@sap/cds';
+import { describe, it, expect, beforeAll, afterAll } from 'vitest';
+
+const project = cds.test('serve', '--project', '.', '--in-memory');
+const NS = 'com.sap.developers.ims';
+const linked = () => cds.linked(cds.model).entities(NS);
+let colPub, colUnpub, colDraft, chPub, chBroken;
+
+describe('GET /build/channel-collections', () => {
+  beforeAll(async () => {
+    const { ChannelCollections, ChannelCollectionItems, Channels } = linked();
+    chPub = cds.utils.uuid(); chBroken = cds.utils.uuid();
+    await INSERT.into(Channels).entries([
+      { ID: chPub, sourceId: 'ccf-pub', name: 'Pub', url: 'https://ccf-pub', isPublished: true, linkStatus: 'OK' },
+      { ID: chBroken, sourceId: 'ccf-broken', name: 'Broken', url: 'https://ccf-broken', isPublished: true, linkStatus: 'BROKEN' },
+    ]);
+    colPub = cds.utils.uuid(); colUnpub = cds.utils.uuid(); colDraft = cds.utils.uuid();
+    await INSERT.into(ChannelCollections).entries([
+      { ID: colPub, slug: 'ccf-live', title: 'Live', intro: 'Intro', sortOrder: 10, isPublished: true, authoringStatus: 'REVIEWED' },
+      { ID: colUnpub, slug: 'ccf-unpub', title: 'Unpub', sortOrder: 20, isPublished: false, authoringStatus: 'REVIEWED' },
+      { ID: colDraft, slug: 'ccf-draft', title: 'Draft', sortOrder: 30, isPublished: true, authoringStatus: 'AI_SEEDED' },
+    ]);
+    await INSERT.into(ChannelCollectionItems).entries([
+      { ID: cds.utils.uuid(), collection_ID: colPub, channel_ID: chPub, sortOrder: 5, blurb: 'first' },
+      { ID: cds.utils.uuid(), collection_ID: colPub, channel_ID: chBroken, sortOrder: 6 },
+    ]);
+  });
+  afterAll(async () => {
+    await DELETE.from(linked().ChannelCollectionItems);
+    await DELETE.from(linked().ChannelCollections).where({ slug: { in: ['ccf-live', 'ccf-unpub', 'ccf-draft'] } });
+    await DELETE.from(linked().Channels).where({ sourceId: { in: ['ccf-pub', 'ccf-broken'] } });
+  });
+
+  it('returns only published + REVIEWED collections with published, non-broken items', async () => {
+    const { status, data } = await project.get('/build/channel-collections');
+    expect(status).toBe(200);
+    const slugs = data.collections.map((c) => c.slug);
+    expect(slugs).toContain('ccf-live');
+    expect(slugs).not.toContain('ccf-unpub');   // not published
+    expect(slugs).not.toContain('ccf-draft');   // not REVIEWED
+    const live = data.collections.find((c) => c.slug === 'ccf-live');
+    expect(live.title).toBe('Live');
+    const itemUrls = live.items.map((i) => i.url);
+    expect(itemUrls).toContain('https://ccf-pub');
+    expect(itemUrls).not.toContain('https://ccf-broken'); // broken item filtered
+    expect(live.items[0].blurb).toBe('first');
+    expect(typeof data.buildAt).toBe('string');
+  });
+});
diff --git a/test/channel-collections-model.test.js b/test/channel-collections-model.test.js
new file mode 100644
index 000000000..e9d763d37
--- /dev/null
+++ b/test/channel-collections-model.test.js
@@ -0,0 +1,48 @@
+// test/channel-collections-model.test.js
+import cds from '@sap/cds';
+import { describe, it, expect, afterAll } from 'vitest';
+
+const project = cds.test('serve', '--project', '.', '--in-memory');
+const NS = 'com.sap.developers.ims';
+const linked = () => cds.linked(cds.model).entities(NS);
+
+describe('ChannelCollections model', () => {
+  afterAll(async () => {
+    await DELETE.from(linked().ChannelCollectionItems);
+    await DELETE.from(linked().ChannelCollections).where({ slug: { in: ['t-getting-started', 't-empty'] } });
+  });
+
+  it('persists a collection with ordered items linked to channels', async () => {
+    const { ChannelCollections, ChannelCollectionItems, Channels } = linked();
+    const chId = cds.utils.uuid();
+    await INSERT.into(Channels).entries([
+      { ID: chId, sourceId: 'cc-model-ch', name: 'CAP Docs', url: 'https://cc-model-cap', isPublished: true },
+    ]);
+    const colId = cds.utils.uuid();
+    await INSERT.into(ChannelCollections).entries([
+      { ID: colId, slug: 't-getting-started', title: 'Getting Started', intro: 'Start here.', sortOrder: 10, isPublished: true, authoringStatus: 'REVIEWED' },
+    ]);
+    await INSERT.into(ChannelCollectionItems).entries([
+      { ID: cds.utils.uuid(), collection_ID: colId, channel_ID: chId, sortOrder: 5, blurb: 'Read first' },
+    ]);
+
+    const col = await SELECT.one.from(ChannelCollections).where({ slug: 't-getting-started' });
+    expect(col.title).toBe('Getting Started');
+    expect(col.authoringStatus).toBe('REVIEWED');
+    const items = await SELECT.from(ChannelCollectionItems).where({ collection_ID: colId });
+    expect(items).toHaveLength(1);
+    expect(items[0].channel_ID).toBe(chId);
+    expect(items[0].blurb).toBe('Read first');
+
+    await DELETE.from(Channels).where({ sourceId: 'cc-model-ch' });
+  });
+
+  it('defaults authoringStatus to BLANK and isPublished to false', async () => {
+    const { ChannelCollections } = linked();
+    const colId = cds.utils.uuid();
+    await INSERT.into(ChannelCollections).entries([{ ID: colId, slug: 't-empty', title: 'Empty' }]);
+    const col = await SELECT.one.from(ChannelCollections).where({ ID: colId });
+    expect(col.authoringStatus).toBe('BLANK');
+    expect(col.isPublished).toBe(false);
+  });
+});
diff --git a/test/e2e/channels.e2e.test.js b/test/e2e/channels.e2e.test.js
new file mode 100644
index 000000000..bff818923
--- /dev/null
+++ b/test/e2e/channels.e2e.test.js
@@ -0,0 +1,73 @@
+// e2e: public /channels directory smoke (P2 collections nudge).
+// Path: browser → approuter /channels → baked static page + channel-collections island.
+// No auth — the directory is publicly accessible.
+//
+// Collections assertion is TOLERANT: curators must flip authoringStatus to
+// REVIEWED before any .collection card renders in the feed. The test asserts
+// <main>/<h1> regardless; it only enters the collections branch when a card
+// is actually present — so this passes on a freshly-seeded env with all-BLANK
+// collections AND on a reviewed-and-published env alike.
+//
+// Self-skips when SMOKE_BASE_URL / PLAYWRIGHT_BASE_URL is absent so
+// `npm test` (unit tier) and credential-less local runs stay green.
+//
+// Run against a deployed approuter:
+//   SMOKE_BASE_URL=https://… npx vitest run --project e2e test/e2e/channels.e2e.test.js
+import { describe, it, expect, beforeAll, afterAll } from 'vitest';
+import { hasBaseUrl } from './e2e.config.js';
+import { launchBrowser, newPage } from './_browser.js';
+
+describe.skipIf(!hasBaseUrl())('e2e: /channels directory (public)', () => {
+  let browser;
+  beforeAll(async () => {
+    browser = await launchBrowser();
+  });
+  afterAll(async () => {
+    await browser?.close();
+  });
+
+  it('channels directory renders <main> and a heading', async () => {
+    const { context, page } = await newPage(browser, { authenticated: false });
+    try {
+      const response = await page.goto('/channels', { waitUntil: 'domcontentloaded' });
+      expect(response, 'no response received').not.toBeNull();
+      expect(response.status(), `unexpected status ${response.status()} for /channels`).toBe(200);
+      // Verified repo fact: served pages render <main> + <h1>, NOT <article>.
+      await page.locator('main').first().waitFor({ state: 'visible', timeout: 15_000 });
+      expect(await page.locator('main').count(), '/channels must render a <main> element').toBeGreaterThan(0);
+      expect(await page.locator('h1').count(), '/channels must render a heading').toBeGreaterThan(0);
+    } finally {
+      await context.close();
+    }
+  });
+
+  it('if channel-collections are present, each collection has a title and at least one link', async () => {
+    const { context, page } = await newPage(browser, { authenticated: false });
+    try {
+      await page.goto('/channels', { waitUntil: 'domcontentloaded' });
+      // Wait for the main content area before probing.
+      await page.locator('main').first().waitFor({ state: 'visible', timeout: 15_000 });
+
+      // Collections only appear when at least one ChannelCollection has
+      // authoringStatus === 'REVIEWED'. On a freshly-seeded env the feed
+      // returns an empty array and .channel-collections .collection is absent —
+      // that is a valid state, not a test failure.
+      const collectionCount = await page.locator('.channel-collections .collection').count();
+      if (collectionCount === 0) return; // no reviewed collections yet — tolerant pass
+
+      // At least one collection rendered: assert the structural contract
+      // (Task 6 markup: <article class="collection"> with <h2> + <ul><li><a>).
+      const firstCollection = page.locator('.channel-collections .collection').first();
+      expect(
+        await firstCollection.locator('h2').count(),
+        'rendered collection must have an <h2> title'
+      ).toBeGreaterThan(0);
+      expect(
+        await firstCollection.locator('a').count(),
+        'rendered collection must have at least one <a> link'
+      ).toBeGreaterThan(0);
+    } finally {
+      await context.close();
+    }
+  });
+});