diff --git a/showcase/app/page.tsx b/showcase/app/page.tsx
index 9757a932..cbfa5258 100644
--- a/showcase/app/page.tsx
+++ b/showcase/app/page.tsx
@@ -1,6 +1,6 @@
 import Link from "next/link";
 import { groupedTutorials, tutorials } from "@/content/tutorials";
-import { LANGUAGE_LABEL } from "@/lib/types";
+import { languageTags } from "@/lib/types";
 import { repoUrl } from "@/lib/repo";
 import HeroHandshake from "@/components/HeroHandshake";
 import { ArrowRight, GitHub, Spark } from "@/components/icons";
@@ -85,7 +85,11 @@ export default function HomePage() {
                     <div className="idx-desc">{t.tagline}</div>
                   </div>
                   <div className="idx-meta">
-                    <span className="t-lang">{LANGUAGE_LABEL[t.language]}</span>
+                    {languageTags(t.language).map((tag) => (
+                      <span key={tag} className="t-lang">
+                        {tag}
+                      </span>
+                    ))}
                     <span className={`tier ${t.tier}`}>{t.tier}</span>
                     <a
                       className="idx-gh"
diff --git a/showcase/app/t/[slug]/page.tsx b/showcase/app/t/[slug]/page.tsx
index 89b3c92a..ed579461 100644
--- a/showcase/app/t/[slug]/page.tsx
+++ b/showcase/app/t/[slug]/page.tsx
@@ -2,7 +2,7 @@ import Link from "next/link";
 import { notFound } from "next/navigation";
 import type { Metadata } from "next";
 import { tutorials, getTutorial } from "@/content/tutorials";
-import { PROTOCOL_LABEL, LANGUAGE_LABEL } from "@/lib/types";
+import { PROTOCOL_LABEL, languageTags } from "@/lib/types";
 import { repoUrl, repoFileUrl } from "@/lib/repo";
 import LiveRunPanel from "@/components/LiveRunPanel";
 import RecapPanel from "@/components/RecapPanel";
@@ -31,6 +31,8 @@ export default async function TutorialPage({ params }: { params: Promise<{ slug:
   if (!t) notFound();
 
   const isRecap = t.tier === "recap";
+  // discover tutorials keep the demo (§4) and the video in a separate §5
+  const discoverVideo = t.run.kind === "discover" ? t.run.video : undefined;
 
   return (
     <div className="container">
@@ -46,7 +48,11 @@ export default async function TutorialPage({ params }: { params: Promise<{ slug:
 
         <div className="tut-taglist">
           <span className="t-proto">{PROTOCOL_LABEL[t.protocol]}</span>
-          <span className="t-lang">{LANGUAGE_LABEL[t.language]}</span>
+          {languageTags(t.language).map((tag) => (
+            <span key={tag} className="t-lang">
+              {tag}
+            </span>
+          ))}
           <span className={`tier ${t.tier}`}>
             {t.tier === "recap"
               ? "recap · watch it run"
@@ -168,6 +174,34 @@ export default async function TutorialPage({ params }: { params: Promise<{ slug:
             <RecapPanel run={t.run} />
           )}
         </section>
+
+        {/* 5 — Catalog video (discover tutorials only) */}
+        {discoverVideo ? (
+          <section className="block wide" id="video">
+            <div className="h2">
+              <span className="num">5</span> Catalog video
+            </div>
+            <div className="videowrap">
+              <video controls preload="metadata" playsInline>
+                <source src={discoverVideo.src} type="video/mp4" />
+                {(discoverVideo.subtitles ?? []).map((s) => (
+                  <track
+                    key={s.srcLang}
+                    kind="subtitles"
+                    src={s.src}
+                    srcLang={s.srcLang}
+                    label={s.label}
+                    default={s.default}
+                  />
+                ))}
+                Your browser can&apos;t play this video — see {discoverVideo.caption}.
+              </video>
+              <div className="vidcap">
+                {discoverVideo.caption} · {discoverVideo.duration}
+              </div>
+            </div>
+          </section>
+        ) : null}
       </div>
     </div>
   );
diff --git a/showcase/components/AppShell.tsx b/showcase/components/AppShell.tsx
index 4a996e17..5257aafa 100644
--- a/showcase/components/AppShell.tsx
+++ b/showcase/components/AppShell.tsx
@@ -4,6 +4,7 @@ import { useEffect, useState } from "react";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 import type { Language, Tier, Protocol } from "@/lib/types";
+import { languageTags } from "@/lib/types";
 import {
   Menu,
   Chevron,
@@ -107,7 +108,7 @@ export default function AppShell({
                         <span className={`tdot ${it.tier}`} aria-hidden="true" />
                         <span className="label">{it.title}</span>
                         {it.featured ? <Spark className="spark" size={12} /> : null}
-                        <span className="lang">{it.language}</span>
+                        <span className="lang">{languageTags(it.language).join(" · ")}</span>
                       </Link>
                     );
                   })}
diff --git a/showcase/components/DiscoverPanel.tsx b/showcase/components/DiscoverPanel.tsx
index 4fc81af3..5f271a45 100644
--- a/showcase/components/DiscoverPanel.tsx
+++ b/showcase/components/DiscoverPanel.tsx
@@ -137,22 +137,6 @@ export default function DiscoverPanel({ run }: { run: DiscoverRun }) {
 
   return (
     <div className="dsc">
-      {/* guided-tour video — watch the concept, then run it live below */}
-      {run.video ? (
-        <div className="videowrap" style={{ marginBottom: "22px" }}>
-          <video controls preload="metadata" playsInline>
-            <source src={run.video.src} type="video/mp4" />
-            {(run.video.subtitles ?? []).map((s) => (
-              <track key={s.srcLang} kind="subtitles" src={s.src} srcLang={s.srcLang} label={s.label} default={s.default} />
-            ))}
-            Your browser can&apos;t play this video — see {run.video.caption}.
-          </video>
-          <div className="vidcap">
-            {run.video.caption} · {run.video.duration}
-          </div>
-        </div>
-      ) : null}
-
       {/* readout */}
       <div className="dsc-readout">
         <Stat value={stats?.total} label="agents" />
diff --git a/showcase/content/tutorials.ts b/showcase/content/tutorials.ts
index 57e6cade..8c2e38df 100644
--- a/showcase/content/tutorials.ts
+++ b/showcase/content/tutorials.ts
@@ -568,7 +568,7 @@ weather.ensureCity   # prompt — guide the LLM to request weather`,
     tagline:
       "The half that comes before payment: the same live catalog of pay-per-use AI agents, read three ways — by eye, by an agent, and by a crawler. Public, unauthenticated, and free to read.",
     protocol: "catalog",
-    language: "ts",
+    language: "agnostic",
     tier: "discover",
     repoPath: "catalog/discover-the-catalog/",
     learn: {
diff --git a/showcase/lib/types.ts b/showcase/lib/types.ts
index ad03b227..26994ff0 100644
--- a/showcase/lib/types.ts
+++ b/showcase/lib/types.ts
@@ -2,7 +2,7 @@
 // One shape for all tutorials → uniform pages out of wildly different READMEs.
 
 export type Protocol = "x402" | "mcp" | "langchain" | "catalog";
-export type Language = "ts" | "py" | "autonomous";
+export type Language = "ts" | "py" | "autonomous" | "agnostic";
 export type Tier = "live" | "recap" | "discover";
 
 export interface CodeSample {
@@ -141,4 +141,17 @@ export const LANGUAGE_LABEL: Record<Language, string> = {
   ts: "ts",
   py: "py",
   autonomous: "autonomous",
+  // Required (Record is total) but unreachable for chips: languageTags() returns
+  // LANGUAGE_TAGS["agnostic"] instead. The rendered text lives there, not here.
+  agnostic: "agnostic",
 };
+
+// A tutorial's language, as the chip(s) to show. Most languages are one chip; a
+// language-agnostic tutorial is labelled by the interfaces it teaches instead — its own
+// chip each (e.g. "mcp", "api"). Single source of truth for every render site.
+const LANGUAGE_TAGS: Partial<Record<Language, string[]>> = {
+  agnostic: ["mcp", "api"],
+};
+export function languageTags(language: Language): string[] {
+  return LANGUAGE_TAGS[language] ?? [LANGUAGE_LABEL[language]];
+}