diff --git a/app/pages/@[login]/[slug].vue b/app/pages/@[login]/[slug].vue
index 568cea34..b546c9c4 100644
--- a/app/pages/@[login]/[slug].vue
+++ b/app/pages/@[login]/[slug].vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
+import { entityRobots } from '#shared/entity-robots'
 import { githubAvatarProxyUrl } from '#shared/image-proxy'
-import { isNoindexCollection } from '#shared/retired-collections'
 
 const route = useRoute()
 const login = computed(() => String(route.params.login))
@@ -35,8 +35,8 @@ useSeoMeta({
   // "Apple Apps · @harlan-zw · skilld · skilld".
   title: () => collection.value ? `${collection.value.name} · @${login.value}` : 'Collection',
   description: () => collection.value?.preamble ?? `Skill collection by @${login.value}`,
-  // The featured band and curator signals need these rows live; search does not need the pages.
-  robots: () => isNoindexCollection(login.value, slug.value) ? 'noindex,follow' : 'index,follow',
+  // Owner decision 2026-10-01: collections stay live and linked, never indexed.
+  robots: entityRobots({ _tag: 'collection' }) ?? undefined,
 })
 
 const canonicalUrl = computed(() => `https://skilld.dev/@${login.value}/${slug.value}`)
diff --git a/app/pages/@[login]/index.vue b/app/pages/@[login]/index.vue
index 02659998..34f456f0 100644
--- a/app/pages/@[login]/index.vue
+++ b/app/pages/@[login]/index.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { OrgProfile } from '#layers/registry/server/api/orgs/[owner].get'
+import { entityRobots } from '#shared/entity-robots'
 import { avatarProxyUrl } from '#shared/image-proxy'
 import { authorBadgeInput } from '../../utils/author-badge'
 
@@ -201,6 +202,8 @@ useSeoMeta({
     : `${displayName.value} (@${login.value})`,
   description: () => `${skills.value.length} ${skills.value.length === 1 ? 'skill' : 'skills'} and ${collections.value.length} ${collections.value.length === 1 ? 'collection' : 'collections'} from @${login.value} on skilld.`,
   ogUrl: canonicalUrl,
+  // Owner decision 2026-10-01: profiles stay live and linked, never indexed.
+  robots: entityRobots({ _tag: 'author-profile' }) ?? undefined,
 })
 
 useHead({
diff --git a/docs/work/EXECUTE-seo-recovery.md b/docs/work/EXECUTE-seo-recovery.md
index d015a25a..c1b2f115 100644
--- a/docs/work/EXECUTE-seo-recovery.md
+++ b/docs/work/EXECUTE-seo-recovery.md
@@ -160,6 +160,7 @@ Check each PR with `gh pr view <n> --repo skilld-dev/skilld.dev`.
 | 5 | Crawl waste: `www` 301; 75 to 19 JS preloads; HTML edge cache | [#316](https://github.com/skilld-dev/skilld.dev/pull/316), [#323](https://github.com/skilld-dev/skilld.dev/pull/323), [#328](https://github.com/skilld-dev/skilld.dev/pull/328), [#329](https://github.com/skilld-dev/skilld.dev/pull/329) |
 | 6 | Real 404 and 410 for missing Skills; 503 with `Retry-After` when the lookup fails | [#317](https://github.com/skilld-dev/skilld.dev/pull/317) |
 | 7 | 40 URL panel | [seo-recovery-panel.json](seo-recovery-panel.json) |
+| 8 | Author profiles, collections, owner hubs and multi-Skill repository hubs render `noindex,follow`. The `authors` and `sources` sitemaps are gone (owner decision, 2026-10-01). A single-Skill repository hub is the Skill's page and stays in the skills sitemap when the trending admission rule admits it | this change |
 
 Checks:
 
diff --git a/layers/registry/app/pages/gh/[owner]/[repo]/index.vue b/layers/registry/app/pages/gh/[owner]/[repo]/index.vue
index d29e1dcb..48e86012 100644
--- a/layers/registry/app/pages/gh/[owner]/[repo]/index.vue
+++ b/layers/registry/app/pages/gh/[owner]/[repo]/index.vue
@@ -3,6 +3,7 @@ import type { OrgProfile } from '../../../../../server/api/orgs/[owner].get'
 import type { RepoSourceProfile } from '../../../../../server/api/repos/[owner]/[repo].get'
 import type { RepoHistoryResponse } from '../../../../../server/api/repos/[owner]/[repo]/history.get'
 import type { RepoRouteResolution } from '../../../../../server/api/repos/[owner]/[repo]/route-target.get'
+import { entityRobots } from '#shared/entity-robots'
 import { avatarProxyUrl } from '#shared/image-proxy'
 import { resolveMissingRepoRedirect } from '../../../../utils/missing-repo-recovery'
 import { parseRepoSkillSort, REPO_SKILL_SORT_OPTIONS, sortRepoSkills } from '../../../../utils/repo-skill-layout'
@@ -299,10 +300,8 @@ const skillDescription = computed(() => {
 useSeoMeta({
   title: () => skillTitle.value,
   description: () => skillDescription.value,
-  // Indexable only when the hub renders its source. A renamed repository comes
-  // back under a new identity, `repoSource` is null, and the page shows
-  // "Source not found", so it is noindex. The API applies the same rule.
-  robots: () => repoSource.value?.seoIndexable ? 'index,follow' : 'noindex,follow',
+  // One decision: a hub rendering SkillDetail leaves robots to the Skill page.
+  robots: () => entityRobots({ _tag: 'repo-hub', renderedAsSkill: flatSkillName.value !== null }) ?? undefined,
   ogTitle: () => skillTitle.value,
   ogDescription: () => skillDescription.value,
   twitterTitle: () => skillTitle.value,
diff --git a/layers/registry/app/pages/gh/[owner]/index.vue b/layers/registry/app/pages/gh/[owner]/index.vue
index 63af8251..7213e782 100644
--- a/layers/registry/app/pages/gh/[owner]/index.vue
+++ b/layers/registry/app/pages/gh/[owner]/index.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { OrgProfile } from '../../../../server/api/orgs/[owner].get'
+import { entityRobots } from '#shared/entity-robots'
 import { avatarProxyUrl } from '#shared/image-proxy'
 import { resolveOwnerProfileHandoff } from '../../../utils/owner-profile-handoff'
 
@@ -131,7 +132,8 @@ useSeoMeta({
     return `${data.value.totalSkills} agent skills ${verb} ${data.value.displayName}.`
   },
   ogUrl: canonicalUrl,
-  robots: () => data.value?.seoIndexable ? 'index,follow' : 'noindex,follow',
+  // Owner hubs stay live and linked, never indexed (owner decision 2026-10-01).
+  robots: entityRobots({ _tag: 'owner-hub' }) ?? undefined,
   twitterCard: 'summary_large_image',
 })
 
diff --git a/layers/registry/server/api/__sitemap__/trusted-authors.ts b/layers/registry/server/api/__sitemap__/trusted-authors.ts
deleted file mode 100644
index 46a851fc..00000000
--- a/layers/registry/server/api/__sitemap__/trusted-authors.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import type { TrustedAuthorSourceRow } from '../../utils/trusted-author-sources'
-import { getDB } from '#server/utils/db'
-import { notBrokenSql } from '../../utils/broken'
-import { buildTrustedAuthorSitemapEntries, trustedAuthorRepoKeys } from '../../utils/trusted-author-sources'
-
-export default defineSitemapEventHandler(async (event) => {
-  const db = getDB(event)
-  const rows = await db
-    .prepare(`
-      SELECT
-        lower(s.owner) AS owner,
-        lower(s.repo) AS repo,
-        r.source_owner AS sourceOwner,
-        r.source_repo AS sourceRepo,
-        COUNT(*) AS skillCount,
-        MAX(COALESCE(s.modified_at, s.first_seen_at, r.pushed_at)) AS updatedAt
-      FROM skills s
-      JOIN repos r ON r.owner = s.owner AND r.repo = s.repo
-      WHERE ${notBrokenSql('r')}
-        AND lower(s.owner || '/' || s.repo) IN (SELECT value FROM json_each(?))
-      GROUP BY lower(s.owner), lower(s.repo), r.source_owner, r.source_repo
-      ORDER BY lower(s.owner), lower(s.repo)
-    `)
-    .bind(JSON.stringify(trustedAuthorRepoKeys))
-    .all<TrustedAuthorSourceRow>()
-
-  return buildTrustedAuthorSitemapEntries(rows.results ?? [])
-})
diff --git a/layers/registry/server/api/orgs/[owner].get.ts b/layers/registry/server/api/orgs/[owner].get.ts
index bf9f3342..c644110a 100644
--- a/layers/registry/server/api/orgs/[owner].get.ts
+++ b/layers/registry/server/api/orgs/[owner].get.ts
@@ -8,7 +8,6 @@ import { TAG_BY_SLUG } from '../../jobs/taxonomy'
 import { resolveRepoSourceIdentitiesForOwner } from '../../utils/repo-source-identity'
 import { getGeneratedBatch } from '../../utils/skill-generated'
 import { querySkills } from '../../utils/skills-registry'
-import { isTrustedAuthorOwner } from '../../utils/trusted-author-sources'
 
 export type OrgKind = 'org' | 'user'
 
@@ -42,7 +41,6 @@ export interface OrgProfile {
   skills: RegistrySkill[]
   lastSyncedAt: number | null
   syncStatus: 'ok' | 'failed' | 'never' | null
-  seoIndexable: boolean
   fetchedAt: string
 }
 
@@ -279,7 +277,6 @@ async function loadOrgProfile(event: H3Event, owner: string): Promise<OrgProfile
     skills: registryResult.items,
     lastSyncedAt,
     syncStatus,
-    seoIndexable: isTrustedAuthorOwner(owner),
     fetchedAt: new Date().toISOString(),
   }
 
diff --git a/layers/registry/server/api/repos/[owner]/[repo].get.ts b/layers/registry/server/api/repos/[owner]/[repo].get.ts
index 93a3a0c6..73092615 100644
--- a/layers/registry/server/api/repos/[owner]/[repo].get.ts
+++ b/layers/registry/server/api/repos/[owner]/[repo].get.ts
@@ -1,10 +1,8 @@
 import { getDB } from '#server/utils/db'
-import { hubRendersSource } from '#shared/repo-identity'
 import { isRegistrySkillPath } from '#shared/skill-path'
 import { getRepo, getTree, resolveGithubBindings } from '../../../utils/github-client'
 import { resolveRepoSourceIdentity } from '../../../utils/repo-source-identity'
 import { buildUnavailableRepoSourceProfile } from '../../../utils/repo-source-profile'
-import { isTrustedAuthorRepo } from '../../../utils/trusted-author-sources'
 
 export interface RepoSourceProfile {
   owner: string
@@ -21,7 +19,6 @@ export interface RepoSourceProfile {
   skillFileScanStatus: 'ok' | 'unavailable' | 'truncated'
   skillFileCount: number
   skillFiles: string[]
-  seoIndexable: boolean
 }
 
 export default defineCachedEventHandler(async (event) => {
@@ -32,7 +29,6 @@ export default defineCachedEventHandler(async (event) => {
 
   const owner = ownerParam.toLowerCase()
   const repo = repoParam.toLowerCase()
-  const trusted = isTrustedAuthorRepo(owner, repo)
   const db = getDB(event)
   const source = await resolveRepoSourceIdentity(db, { owner, repo })
   const bindings = resolveGithubBindings(event.context.platform.env)
@@ -46,18 +42,12 @@ export default defineCachedEventHandler(async (event) => {
       'outcome': 'unavailable',
       'upstream.status': repoRes.status || null,
     }))
-    return {
-      ...buildUnavailableRepoSourceProfile(owner, repo),
-      seoIndexable: trusted,
-    } satisfies RepoSourceProfile
+    return buildUnavailableRepoSourceProfile(owner, repo) satisfies RepoSourceProfile
   }
 
   const meta = repoRes.data
   const repoOwner = meta.owner.login
   const repoName = meta.name
-  // A renamed repository comes back under its new identity, and the hub page
-  // then renders "Source not found". Only a hub that renders its source is indexable.
-  const seoIndexable = trusted && hubRendersSource({ owner, repo }, { owner: repoOwner, repo: repoName })
   const treeRes = await getTree(repoOwner, repoName, meta.default_branch, bindings)
   const skillFiles = (treeRes.data?.tree ?? [])
     .filter(entry => entry.type === 'blob' && isRegistrySkillPath(entry.path))
@@ -84,7 +74,6 @@ export default defineCachedEventHandler(async (event) => {
     skillFileScanStatus,
     skillFileCount: skillFiles.length,
     skillFiles,
-    seoIndexable,
   } satisfies RepoSourceProfile
 }, {
   maxAge: 60 * 15,
diff --git a/layers/registry/server/utils/trusted-author-sources.ts b/layers/registry/server/utils/trusted-author-sources.ts
deleted file mode 100644
index af75c4f9..00000000
--- a/layers/registry/server/utils/trusted-author-sources.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { hubRendersSource } from '#shared/repo-identity'
-import { officialRepos } from '../data/official-repos'
-
-export interface TrustedAuthorSourceRow {
-  owner: string
-  repo: string
-  skillCount: number
-  updatedAt: number | null
-  /** GitHub identity stored for the repository, when it differs from the route. */
-  sourceOwner?: string | null
-  sourceRepo?: string | null
-}
-
-export interface TrustedAuthorSitemapEntry {
-  loc: string
-  changefreq: 'weekly'
-  lastmod?: string
-}
-
-export const trustedAuthorRepos = officialRepos
-  .filter(repo => repo.kind === 'user')
-  .map(repo => ({
-    owner: repo.owner.toLowerCase(),
-    repo: repo.repo.toLowerCase(),
-  }))
-
-export const trustedAuthorRepoKeys = trustedAuthorRepos.map(repo => `${repo.owner}/${repo.repo}`)
-
-const trustedAuthorOwners = new Set(trustedAuthorRepos.map(repo => repo.owner))
-const trustedAuthorRepoKeySet = new Set(trustedAuthorRepoKeys)
-
-export function isTrustedAuthorOwner(owner: string): boolean {
-  return trustedAuthorOwners.has(owner.toLowerCase())
-}
-
-export function isTrustedAuthorRepo(owner: string, repo: string): boolean {
-  return trustedAuthorRepoKeySet.has(`${owner}/${repo}`.toLowerCase())
-}
-
-function sitemapEntry(loc: string, updatedAt: number | null): TrustedAuthorSitemapEntry {
-  const entry: TrustedAuthorSitemapEntry = { loc, changefreq: 'weekly' }
-  if (updatedAt)
-    entry.lastmod = new Date(updatedAt * 1000).toISOString()
-  return entry
-}
-
-export function buildTrustedAuthorSitemapEntries(rows: readonly TrustedAuthorSourceRow[]): TrustedAuthorSitemapEntry[] {
-  const updatedAtByOwner = new Map<string, number | null>()
-  for (const row of rows) {
-    const owner = row.owner.toLowerCase()
-    const previous = updatedAtByOwner.get(owner) ?? null
-    if (row.updatedAt != null && (previous == null || row.updatedAt > previous))
-      updatedAtByOwner.set(owner, row.updatedAt)
-    else if (!updatedAtByOwner.has(owner))
-      updatedAtByOwner.set(owner, null)
-  }
-
-  const ownerEntries = [...updatedAtByOwner.entries()]
-    .sort(([a], [b]) => a.localeCompare(b))
-    .map(([owner, updatedAt]) => sitemapEntry(`/gh/${owner}`, updatedAt))
-
-  const repoEntries = rows
-    // A renamed repository renders "Source not found", so its hub is noindex.
-    .filter(row => row.skillCount > 1 && hubRendersSource(row, { owner: row.sourceOwner ?? null, repo: row.sourceRepo ?? null }))
-    .toSorted((a, b) => a.owner.localeCompare(b.owner) || a.repo.localeCompare(b.repo))
-    .map(row => sitemapEntry(`/gh/${row.owner.toLowerCase()}/${row.repo.toLowerCase()}`, row.updatedAt))
-
-  return [...ownerEntries, ...repoEntries]
-}
diff --git a/nuxt.config.ts b/nuxt.config.ts
index a6d9887a..3079d38d 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -721,8 +721,7 @@ export default defineNuxtConfig({
   sitemap: {
     // `/learn` index is a 55-word card list, noindex since 2026-08-22
     // (GOOGLE_RECOVERY.md). Articles stay indexable and sitemap-listed; only
-    // the bare index leaves. Global so no child sitemap can re-adopt it
-    // (authors.xml was listing it via an app-source merge quirk).
+    // the bare index leaves. Global so no child sitemap can re-adopt it.
     exclude: ['/learn'],
     sitemaps: {
       pages: {
@@ -743,14 +742,10 @@ export default defineNuxtConfig({
         includeAppSources: false,
         chunks: 10000,
       },
-      authors: {
-        sources: ['/api/__sitemap__/authors'],
-        includeAppSources: false,
-      },
-      sources: {
-        sources: ['/api/__sitemap__/trusted-authors'],
-        includeAppSources: false,
-      },
+      // `authors` and `sources` removed 2026-10-01 (owner decision): author
+      // profiles, collections, owner hubs and multi-Skill repository hubs render
+      // `noindex,follow`. A single-Skill repository hub is the Skill's own page,
+      // so the skills sitemap lists it when the trending admission rule admits it.
       // `orgs` removed: it listed every owner hub (/gh/<owner>) unconditionally,
       // but those pages render noindex,follow. Advertising noindex URLs in the
       // sitemap was the bulk of GSC "Crawled – currently not indexed" (~8k) and
diff --git a/server/api/__sitemap__/authors.ts b/server/api/__sitemap__/authors.ts
deleted file mode 100644
index a462a045..00000000
--- a/server/api/__sitemap__/authors.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { getDB } from '#server/utils/db'
-import { withoutUnindexedCollections } from '#shared/retired-collections'
-
-interface CollectionRow {
-  author_login: string
-  slug: string
-  updated_at: number
-}
-
-export default defineSitemapEventHandler(async (event) => {
-  const db = getDB(event)
-  const res = await db
-    .prepare(
-      `SELECT u.login AS author_login, c.slug, c.updated_at
-       FROM collections_v2 c
-       JOIN users u ON u.id = c.author_user_id
-       WHERE c.deleted_at IS NULL
-       ORDER BY c.updated_at DESC`,
-    )
-    .all<CollectionRow>()
-
-  const rows = withoutUnindexedCollections(res.results ?? [])
-  const authors = new Map<string, number>()
-  const collectionUrls = rows.map((row) => {
-    const prev = authors.get(row.author_login) ?? 0
-    if (row.updated_at > prev)
-      authors.set(row.author_login, row.updated_at)
-    return {
-      loc: `/@${row.author_login}/${row.slug}`,
-      lastmod: new Date(row.updated_at * 1000).toISOString(),
-    }
-  })
-  const authorUrls = Array.from(authors.entries()).map(([login, lastmod]) => ({
-    loc: `/@${login}`,
-    lastmod: new Date(lastmod * 1000).toISOString(),
-  }))
-  return [...authorUrls, ...collectionUrls]
-})
diff --git a/shared/entity-robots.ts b/shared/entity-robots.ts
new file mode 100644
index 00000000..dac8ab6e
--- /dev/null
+++ b/shared/entity-robots.ts
@@ -0,0 +1,23 @@
+/**
+ * The robots directive for pages that are not Skill pages.
+ *
+ * Owner decision, 2026-10-01: author profiles, collections, owner hubs and
+ * multi-Skill repository hubs stay live and linked, and are never indexed. No
+ * sitemap lists them, so the sitemap equals the indexable set.
+ *
+ * A single-Skill repository hub is the Skill's own page. It returns `null`
+ * here, so the page emits no robots tag of its own and the Skill page decision
+ * (`resolveSkillPageState`) is the only one. Two competing tags would let a
+ * default noindex override an admitted Skill.
+ */
+export type EntityPage
+  = | { _tag: 'author-profile' }
+    | { _tag: 'collection' }
+    | { _tag: 'owner-hub' }
+    | { _tag: 'repo-hub', renderedAsSkill: boolean }
+
+export function entityRobots(page: EntityPage): 'noindex,follow' | null {
+  if (page._tag === 'repo-hub' && page.renderedAsSkill)
+    return null
+  return 'noindex,follow'
+}
diff --git a/shared/retired-collections.ts b/shared/retired-collections.ts
index 4a56246f..832dfd6a 100644
--- a/shared/retired-collections.ts
+++ b/shared/retired-collections.ts
@@ -8,9 +8,10 @@
  * D1 on purpose. `/api/collections/featured` reads only featured rows, so
  * retiring them would empty the homepage band. Retiring them would also drop
  * `curator_count` and `curator_reason_count`, which count live collections only
- * and gate indexability for some Skills. Their pages render `noindex,follow` and
- * stay out of the authors sitemap. Revisit once other collections are featured
- * and the curator signals no longer depend on these rows.
+ * and gate indexability for some Skills. Since 2026-10-01 every collection page
+ * renders `noindex,follow`, so the list only records which rows must stay live.
+ * Revisit once other collections are featured and the curator signals no
+ * longer depend on these rows.
  */
 export interface CollectionRef {
   author: string
@@ -57,12 +58,3 @@ function has(list: readonly CollectionRef[], author: string, slug: string): bool
 export function isRetiredCollection(author: string, slug: string): boolean {
   return has(RETIRED_COLLECTIONS, author, slug)
 }
-
-export function isNoindexCollection(author: string, slug: string): boolean {
-  return has(NOINDEX_COLLECTIONS, author, slug)
-}
-
-/** Drops collections that must stay out of the sitemap. Runs before the migration lands too. */
-export function withoutUnindexedCollections<T extends { author_login: string, slug: string }>(rows: readonly T[]): T[] {
-  return rows.filter(row => !isRetiredCollection(row.author_login, row.slug) && !isNoindexCollection(row.author_login, row.slug))
-}
diff --git a/test/e2e/sitemap.spec.ts b/test/e2e/sitemap.spec.ts
index 387e46cd..070d274c 100644
--- a/test/e2e/sitemap.spec.ts
+++ b/test/e2e/sitemap.spec.ts
@@ -36,26 +36,37 @@ test.describe('multi-sitemap', () => {
       expect(loc).toMatch(/^\/(?:gh\/|skills\/(?:plan|master-agent|docs|review|debug|ship)$)/)
   })
 
-  test('authors sitemap is valid and scoped to /@', async ({ page, baseURL }) => {
-    const res = await page.request.get(`${baseURL}/__sitemap__/authors.xml`)
-    expect(res.status()).toBe(200)
-    const xml = await res.text()
-    expect(xml).toContain('<urlset')
-
-    const locs = Array.from(xml.matchAll(/<loc>([^<]+)<\/loc>/g), m => new URL(m[1]!).pathname)
-    for (const loc of locs)
-      expect(loc).toMatch(/^\/@[^/]+(?:\/[^/]+)?$/)
+  test('authors and sources sitemaps are gone', async ({ page, baseURL }) => {
+    for (const name of ['authors', 'sources']) {
+      const res = await page.request.get(`${baseURL}/__sitemap__/${name}.xml`)
+      expect(res.status()).toBe(404)
+    }
   })
 
-  test('trusted source sitemap contains only owner and repository hubs', async ({ page, baseURL }) => {
-    const res = await page.request.get(`${baseURL}/__sitemap__/sources.xml`)
-    expect(res.status()).toBe(200)
-    const xml = await res.text()
-    expect(xml).toContain('<urlset')
+  test('the index lists no sitemap for noindex pages, and robots.txt lists only the index', async ({ page, baseURL }) => {
+    const index = await (await page.request.get(`${baseURL}/sitemap_index.xml`)).text()
+    expect(index).not.toMatch(/__sitemap__\/(?:authors|sources)\.xml/)
 
-    const locs = Array.from(xml.matchAll(/<loc>([^<]+)<\/loc>/g), m => new URL(m[1]!).pathname)
-    expect(locs.length).toBeGreaterThan(0)
-    for (const loc of locs)
-      expect(loc).toMatch(/^\/gh\/[^/]+(?:\/[^/]+)?$/)
+    const robots = await (await page.request.get(`${baseURL}/robots.txt`)).text()
+    const lines = robots.split('\n').filter(line => /^sitemap:/i.test(line))
+    expect(lines).toHaveLength(1)
+    expect(lines[0]).toContain('/sitemap_index.xml')
   })
 })
+
+test.describe('entity pages stay out of the index', () => {
+  const noindexPaths = [
+    '/@harlan-zw',
+    '/@harlan-zw/design-engineering-essentials',
+    '/gh/anthropics',
+    '/gh/antfu/skills',
+  ]
+  for (const path of noindexPaths) {
+    test(`${path} is noindex,follow in meta and header`, async ({ page, baseURL }) => {
+      const res = await page.request.get(`${baseURL}${path}`)
+      const html = await res.text()
+      expect(html).toMatch(/<meta[^>]*name="robots"[^>]*content="noindex,\s*follow"/i)
+      expect(res.headers()['x-robots-tag']).toMatch(/^noindex,\s*follow$/i)
+    })
+  }
+})
diff --git a/test/unit/entity-robots.test.ts b/test/unit/entity-robots.test.ts
new file mode 100644
index 00000000..5c0ca225
--- /dev/null
+++ b/test/unit/entity-robots.test.ts
@@ -0,0 +1,30 @@
+import { describe, expect, it } from 'vitest'
+import { resolveSkillPageState } from '../../layers/registry/app/utils/skill-page-state'
+import { entityRobots } from '../../shared/entity-robots'
+
+/** What a repository hub tells crawlers: its own decision, else the Skill page's. */
+function hubRobots(renderedAsSkill: boolean, indexable: boolean) {
+  return entityRobots({ _tag: 'repo-hub', renderedAsSkill })
+    ?? resolveSkillPageState({ _tag: 'loaded', indexable, sourceGone: false, registryPath: '/gh/o/r', duplicateCanonicalPath: null }).robots
+}
+
+describe('entityRobots', () => {
+  it('never indexes an author profile, a collection, or an owner hub', () => {
+    expect(entityRobots({ _tag: 'author-profile' })).toBe('noindex,follow')
+    expect(entityRobots({ _tag: 'collection' })).toBe('noindex,follow')
+    expect(entityRobots({ _tag: 'owner-hub' })).toBe('noindex,follow')
+  })
+
+  it('never indexes a multi-Skill repository hub', () => {
+    expect(hubRobots(false, true)).toBe('noindex,follow')
+  })
+
+  it('leaves an admitted single-Skill hub to the Skill page, which indexes it', () => {
+    expect(entityRobots({ _tag: 'repo-hub', renderedAsSkill: true })).toBeNull()
+    expect(hubRobots(true, true)).toBe('index,follow')
+  })
+
+  it('noindexes a single-Skill hub the trending admission rule did not admit', () => {
+    expect(hubRobots(true, false)).toBe('noindex,follow')
+  })
+})
diff --git a/test/unit/retired-collections.test.ts b/test/unit/retired-collections.test.ts
index 00305864..dde4f2a2 100644
--- a/test/unit/retired-collections.test.ts
+++ b/test/unit/retired-collections.test.ts
@@ -6,10 +6,8 @@ import Database from 'better-sqlite3'
 import { describe, expect, it } from 'vitest'
 import {
   findRetiredCollection,
-  isNoindexCollection,
   NOINDEX_COLLECTIONS,
   RETIRED_COLLECTIONS,
-  withoutUnindexedCollections,
 } from '../../shared/retired-collections'
 
 describe('findRetiredCollection', () => {
@@ -39,31 +37,6 @@ describe('findRetiredCollection', () => {
   })
 })
 
-describe('isNoindexCollection', () => {
-  it('flags the old featured trio only', () => {
-    for (const slug of ['agent-building-stack', 'agent-workflow-stack', 'typescript-engineering-stack'])
-      expect(isNoindexCollection('harlan-zw', slug)).toBe(true)
-    expect(isNoindexCollection('someone', 'agent-building-stack')).toBe(false)
-    expect(isNoindexCollection('harlan-zw', 'essentials')).toBe(false)
-    expect(isNoindexCollection('harlan-zw', 'apple-apps')).toBe(false)
-  })
-})
-
-describe('withoutUnindexedCollections', () => {
-  it('drops retired and noindex rows and keeps the rest in order', () => {
-    const rows = [
-      { author_login: 'harlan-zw', slug: 'essentials' },
-      { author_login: 'harlan-zw', slug: 'apple-apps' },
-      { author_login: 'someone', slug: 'apple-apps' },
-      { author_login: 'harlan-zw', slug: 'typescript-engineering-stack' },
-    ]
-    expect(withoutUnindexedCollections(rows)).toEqual([
-      { author_login: 'harlan-zw', slug: 'essentials' },
-      { author_login: 'someone', slug: 'apple-apps' },
-    ])
-  })
-})
-
 describe('migration 0130', () => {
   it('soft-deletes the retired set and leaves the noindex trio live and featured', () => {
     const sqlite = new Database(':memory:')
diff --git a/test/unit/skills-sitemap-single-skill-repo.test.ts b/test/unit/skills-sitemap-single-skill-repo.test.ts
index 3463828b..850b8a5a 100644
--- a/test/unit/skills-sitemap-single-skill-repo.test.ts
+++ b/test/unit/skills-sitemap-single-skill-repo.test.ts
@@ -67,6 +67,15 @@ describe('skills sitemap single-Skill repos', () => {
     expect(locs.some(loc => loc.startsWith('/gh/agg/'))).toBe(false)
   })
 
+  it('lists no author, collection, owner hub or multi-Skill hub, so the sitemap equals the indexable set', async () => {
+    const locs = (await handler(event())).map(entry => entry.loc)
+
+    expect(locs.filter(loc => loc.startsWith('/@'))).toEqual([])
+    expect(locs.filter(loc => /^\/gh\/[^/]+$/.test(loc))).toEqual([])
+    expect(locs).not.toContain('/gh/anthropics/skills')
+    expect(locs).toContain('/gh/anthropics/skills/pdf-processing')
+  })
+
   it('leaves out a Skill that no trending board has admitted', async () => {
     const entries = await handler(event())
 
diff --git a/test/unit/trusted-author-indexing.test.ts b/test/unit/trusted-author-indexing.test.ts
deleted file mode 100644
index 440d45e0..00000000
--- a/test/unit/trusted-author-indexing.test.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import {
-  buildTrustedAuthorSitemapEntries,
-  isTrustedAuthorOwner,
-  isTrustedAuthorRepo,
-} from '../../layers/registry/server/utils/trusted-author-sources'
-
-describe('trusted author indexing', () => {
-  it('recognises reviewed individual authors without treating official orgs as authors', () => {
-    expect(isTrustedAuthorOwner('MattPocock')).toBe(true)
-    expect(isTrustedAuthorRepo('mattpocock', 'SKILLS')).toBe(true)
-    expect(isTrustedAuthorOwner('anthropics')).toBe(false)
-    expect(isTrustedAuthorRepo('anthropics', 'skills')).toBe(false)
-  })
-
-  it('lists trusted owner hubs and multi-skill repository hubs with stable lastmod values', () => {
-    expect(buildTrustedAuthorSitemapEntries([
-      { owner: 'mattpocock', repo: 'skills', skillCount: 22, updatedAt: 20 },
-      { owner: 'mattpocock', repo: 'single', skillCount: 1, updatedAt: 40 },
-      { owner: 'antfu', repo: 'skills', skillCount: 4, updatedAt: 30 },
-    ])).toEqual([
-      { loc: '/gh/antfu', changefreq: 'weekly', lastmod: '1970-01-01T00:00:30.000Z' },
-      { loc: '/gh/mattpocock', changefreq: 'weekly', lastmod: '1970-01-01T00:00:40.000Z' },
-      { loc: '/gh/antfu/skills', changefreq: 'weekly', lastmod: '1970-01-01T00:00:30.000Z' },
-      { loc: '/gh/mattpocock/skills', changefreq: 'weekly', lastmod: '1970-01-01T00:00:20.000Z' },
-    ])
-  })
-
-  it('leaves a renamed repository hub out of the sitemap, because the page renders Source not found', () => {
-    const locs = buildTrustedAuthorSitemapEntries([
-      { owner: 'hyf0', repo: 'vue-skills', skillCount: 5, updatedAt: 1, sourceOwner: 'vuejs-ai', sourceRepo: 'skills' },
-      { owner: 'antfu', repo: 'skills', skillCount: 4, updatedAt: 1, sourceOwner: 'ANTFU', sourceRepo: 'Skills' },
-    ]).map(entry => entry.loc)
-    expect(locs).not.toContain('/gh/hyf0/vue-skills')
-    expect(locs).toContain('/gh/antfu/skills')
-    expect(locs).toContain('/gh/hyf0')
-  })
-})