diff --git a/app/components/Package/Playgrounds.vue b/app/components/Package/Playgrounds.vue
index 199439e04..5193e9696 100644
--- a/app/components/Package/Playgrounds.vue
+++ b/app/components/Package/Playgrounds.vue
@@ -3,9 +3,22 @@ import type { PlaygroundLink } from '#shared/types'
 import { decodeHtmlEntities } from '~/utils/formatters'
 
 const props = defineProps<{
-  links: PlaygroundLink[]
+  packageName: string
+  requestedVersion: string | null
 }>()
 
+// Fetch README for specific version if requested, otherwise latest
+const { data } = useLazyFetch<ReadmeResponse>(
+  () => {
+    const base = `/api/registry/readme/${props.packageName}`
+    const version = props.requestedVersion
+    return version ? `${base}/v/${version}` : base
+  },
+  { default: () => ({ html: '', md: '', playgroundLinks: [], toc: [] }) },
+)
+
+const links = computed<PlaygroundLink[]>(() => data.value?.playgroundLinks ?? [])
+
 // Map provider id to icon class
 const providerIcons: Record<string, string> = {
   'stackblitz': 'i-simple-icons:stackblitz',
@@ -51,9 +64,9 @@ onClickOutside(dropdownRef, () => {
 })
 
 // Single vs multiple
-const hasSingleLink = computed(() => props.links.length === 1)
-const hasMultipleLinks = computed(() => props.links.length > 1)
-const firstLink = computed(() => props.links[0])
+const hasSingleLink = computed(() => links.value.length === 1)
+const hasMultipleLinks = computed(() => links.value.length > 1)
+const firstLink = computed(() => links.value[0])
 
 function closeDropdown() {
   isOpen.value = false
@@ -78,12 +91,12 @@ function handleKeydown(event: KeyboardEvent) {
       break
     case 'ArrowDown':
       event.preventDefault()
-      focusedIndex.value = (focusedIndex.value + 1) % props.links.length
+      focusedIndex.value = (focusedIndex.value + 1) % links.value.length
       focusMenuItem(focusedIndex.value)
       break
     case 'ArrowUp':
       event.preventDefault()
-      focusedIndex.value = focusedIndex.value <= 0 ? props.links.length - 1 : focusedIndex.value - 1
+      focusedIndex.value = focusedIndex.value <= 0 ? links.value.length - 1 : focusedIndex.value - 1
       focusMenuItem(focusedIndex.value)
       break
     case 'Home':
@@ -93,8 +106,8 @@ function handleKeydown(event: KeyboardEvent) {
       break
     case 'End':
       event.preventDefault()
-      focusedIndex.value = props.links.length - 1
-      focusMenuItem(props.links.length - 1)
+      focusedIndex.value = links.value.length - 1
+      focusMenuItem(links.value.length - 1)
       break
     case 'Tab':
       closeDropdown()
diff --git a/app/components/Package/Readme.vue b/app/components/Package/Readme.vue
new file mode 100644
index 000000000..3bacadb28
--- /dev/null
+++ b/app/components/Package/Readme.vue
@@ -0,0 +1,112 @@
+<script setup lang="ts">
+import Readme from '../Readme.vue'
+
+const props = defineProps<{
+  packageName: string
+  requestedVersion: string | null
+  repositoryUrl: string | null
+}>()
+
+// Fetch README for specific version if requested, otherwise latest
+const { data, status, error } = useLazyFetch<ReadmeResponse>(() => {
+  const base = `/api/registry/readme/${props.packageName}`
+  const version = props.requestedVersion
+  return version ? `${base}/v/${version}` : base
+})
+
+// Track active TOC item based on scroll position
+const tocItems = computed(() => data.value?.toc ?? [])
+const { activeId: activeTocId } = useActiveTocItem(tocItems)
+
+//copy README file as Markdown
+const { copied: copiedReadme, copy: copyReadme } = useClipboard({
+  source: () => data.value?.md ?? '',
+  copiedDuring: 2000,
+})
+</script>
+
+<template>
+  <div class="flex flex-wrap items-center justify-between mb-3 px-1">
+    <h2 id="readme-heading" class="group text-xs text-fg-subtle uppercase tracking-wider">
+      <LinkBase to="#readme">
+        {{ $t('package.readme.title') }}
+      </LinkBase>
+    </h2>
+    <div class="flex gap-2">
+      <!-- Copy readme as Markdown button -->
+      <TooltipApp
+        v-if="data?.md || status === 'pending' || status === 'idle'"
+        :text="$t('package.readme.copy_as_markdown')"
+        position="bottom"
+      >
+        <ButtonBase
+          @click="copyReadme()"
+          :aria-pressed="copiedReadme"
+          :aria-label="copiedReadme ? $t('common.copied') : $t('package.readme.copy_as_markdown')"
+          :classicon="copiedReadme ? 'i-carbon:checkmark' : 'i-simple-icons:markdown'"
+          :disabled="status === 'pending' || status === 'idle'"
+        >
+          {{ copiedReadme ? $t('common.copied') : $t('common.copy') }}
+        </ButtonBase>
+      </TooltipApp>
+      <ReadmeTocDropdown
+        v-if="data?.toc && data.toc.length > 1"
+        :toc="data.toc"
+        :active-id="activeTocId"
+        :disabled="!data || !data.toc"
+      />
+      <ButtonBase
+        v-else-if="status === 'pending' || status === 'idle'"
+        disabled
+        classicon="i-carbon:list"
+        block
+      >
+        <span class="i-carbon:chevron-down w-3 h-3" aria-hidden="true" />
+      </ButtonBase>
+    </div>
+  </div>
+
+  <!-- eslint-disable vue/no-v-html -- HTML is sanitized server-side -->
+  <Readme v-if="status === 'success' && data?.html" :html="data.html" />
+  <div class="space-y-4" v-else-if="status === 'pending' || status === 'idle'">
+    <!-- Heading -->
+    <SkeletonBlock class="h-7 w-2/3" />
+    <!-- Paragraphs -->
+    <SkeletonBlock class="h-4 w-full" />
+    <SkeletonBlock class="h-4 w-full" />
+    <SkeletonBlock class="h-4 w-4/5" />
+    <!-- Gap for section break -->
+    <SkeletonBlock class="h-6 w-1/2 mt-6" />
+    <SkeletonBlock class="h-4 w-full" />
+    <SkeletonBlock class="h-4 w-full" />
+    <SkeletonBlock class="h-4 w-3/4" />
+    <!-- Code block placeholder -->
+    <SkeletonBlock class="h-24 w-full rounded-lg mt-4" />
+    <SkeletonBlock class="h-4 w-full" />
+    <SkeletonBlock class="h-4 w-5/6" />
+  </div>
+  <div v-else-if="status === 'error'" class="text-red-500">
+    {{ $t('package.readme.load_error') }}
+  </div>
+  <p v-else class="text-fg-muted italic">
+    {{ $t('package.readme.no_readme') }}
+    <a
+      v-if="repositoryUrl"
+      :href="repositoryUrl"
+      target="_blank"
+      rel="noopener noreferrer"
+      class="link text-fg underline underline-offset-4 decoration-fg-subtle hover:(decoration-fg text-fg) transition-colors duration-200"
+      >{{ $t('package.readme.view_on_github') }}</a
+    >
+  </p>
+</template>
+
+<style module>
+.areaReadme {
+  grid-area: readme;
+}
+
+.areaReadme > :global(.readme) {
+  overflow-x: hidden;
+}
+</style>
diff --git a/app/components/ReadmeTocDropdown.vue b/app/components/ReadmeTocDropdown.vue
index 0fba743c9..d4a24c1f5 100644
--- a/app/components/ReadmeTocDropdown.vue
+++ b/app/components/ReadmeTocDropdown.vue
@@ -152,7 +152,6 @@ function handleKeydown(event: KeyboardEvent) {
     @click="toggle"
     @keydown="handleKeydown"
     classicon="i-carbon:list"
-    class="px-2.5"
     block
   >
     <span
diff --git a/app/pages/package/[[org]]/[name].vue b/app/pages/package/[[org]]/[name].vue
index 002326d73..8fda50f03 100644
--- a/app/pages/package/[[org]]/[name].vue
+++ b/app/pages/package/[[org]]/[name].vue
@@ -4,7 +4,6 @@ import type {
   PackageVersionInfo,
   PackumentVersion,
   ProvenanceDetails,
-  ReadmeResponse,
   SkillsListResponse,
 } from '#shared/types'
 import type { JsrPackageInfo } from '#shared/types/jsr'
@@ -98,26 +97,6 @@ if (import.meta.server) {
   assertValidPackageName(packageName.value)
 }
 
-// Fetch README for specific version if requested, otherwise latest
-const { data: readmeData } = useLazyFetch<ReadmeResponse>(
-  () => {
-    const base = `/api/registry/readme/${packageName.value}`
-    const version = requestedVersion.value
-    return version ? `${base}/v/${version}` : base
-  },
-  { default: () => ({ html: '', md: '', playgroundLinks: [], toc: [] }) },
-)
-
-//copy README file as Markdown
-const { copied: copiedReadme, copy: copyReadme } = useClipboard({
-  source: () => readmeData.value?.md ?? '',
-  copiedDuring: 2000,
-})
-
-// Track active TOC item based on scroll position
-const tocItems = computed(() => readmeData.value?.toc ?? [])
-const { activeId: activeTocId } = useActiveTocItem(tocItems)
-
 // Check if package exists on JSR (only for scoped packages)
 const { data: jsrInfo } = useLazyFetch<JsrPackageInfo>(() => `/api/jsr/${packageName.value}`, {
   default: () => ({ exists: false }),
@@ -1213,53 +1192,12 @@ const showSkeleton = shallowRef(false)
         </ClientOnly>
       </div>
 
-      <!-- README -->
-      <section id="readme" class="min-w-0 scroll-mt-20" :class="$style.areaReadme">
-        <div class="flex flex-wrap items-center justify-between mb-3 px-1">
-          <h2 id="readme-heading" class="group text-xs text-fg-subtle uppercase tracking-wider">
-            <LinkBase to="#readme">
-              {{ $t('package.readme.title') }}
-            </LinkBase>
-          </h2>
-          <div class="flex gap-2">
-            <!-- Copy readme as Markdown button -->
-            <TooltipApp
-              v-if="readmeData?.md"
-              :text="$t('package.readme.copy_as_markdown')"
-              position="bottom"
-            >
-              <ButtonBase
-                @click="copyReadme()"
-                :aria-pressed="copiedReadme"
-                :aria-label="
-                  copiedReadme ? $t('common.copied') : $t('package.readme.copy_as_markdown')
-                "
-                :classicon="copiedReadme ? 'i-carbon:checkmark' : 'i-simple-icons:markdown'"
-              >
-                {{ copiedReadme ? $t('common.copied') : $t('common.copy') }}
-              </ButtonBase>
-            </TooltipApp>
-            <ReadmeTocDropdown
-              v-if="readmeData?.toc && readmeData.toc.length > 1"
-              :toc="readmeData.toc"
-              :active-id="activeTocId"
-            />
-          </div>
-        </div>
-
-        <!-- eslint-disable vue/no-v-html -- HTML is sanitized server-side -->
-        <Readme v-if="readmeData?.html" :html="readmeData.html" />
-        <p v-else class="text-fg-muted italic">
-          {{ $t('package.readme.no_readme') }}
-          <a
-            v-if="repositoryUrl"
-            :href="repositoryUrl"
-            target="_blank"
-            rel="noopener noreferrer"
-            class="link text-fg underline underline-offset-4 decoration-fg-subtle hover:(decoration-fg text-fg) transition-colors duration-200"
-            >{{ $t('package.readme.view_on_github') }}</a
-          >
-        </p>
+      <section id="readme" class="min-w-0 scroll-mt-20">
+        <PackageReadme
+          :package-name="pkg.name"
+          :requested-version="resolvedVersion ?? null"
+          :repository-url="repositoryUrl"
+        />
 
         <section
           v-if="hasProvenance(displayVersion) && isMounted"
@@ -1320,8 +1258,8 @@ const showSkeleton = shallowRef(false)
 
           <!-- Playground links -->
           <PackagePlaygrounds
-            v-if="readmeData?.playgroundLinks?.length"
-            :links="readmeData.playgroundLinks"
+            :package-name="pkg.name"
+            :requested-version="resolvedVersion ?? null"
           />
 
           <PackageCompatibility :engines="displayVersion?.engines" />
@@ -1471,14 +1409,6 @@ const showSkeleton = shallowRef(false)
   overflow-x: hidden;
 }
 
-.areaReadme {
-  grid-area: readme;
-}
-
-.areaReadme > :global(.readme) {
-  overflow-x: hidden;
-}
-
 .areaSidebar {
   grid-area: sidebar;
 }
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index e3f07511e..201fb53ff 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -236,6 +236,7 @@
       "no_readme": "No README available.",
       "view_on_github": "View on GitHub",
       "toc_title": "Outline",
+      "load_error": "Failed to load README",
       "callout": {
         "note": "Note",
         "tip": "Tip",
diff --git a/i18n/schema.json b/i18n/schema.json
index 84cbbd10c..6d9aaa6fe 100644
--- a/i18n/schema.json
+++ b/i18n/schema.json
@@ -712,6 +712,9 @@
             "toc_title": {
               "type": "string"
             },
+            "load_error": {
+              "type": "string"
+            },
             "callout": {
               "type": "object",
               "properties": {
diff --git a/lunaria/files/en-GB.json b/lunaria/files/en-GB.json
index 458a5f8f7..2e8654880 100644
--- a/lunaria/files/en-GB.json
+++ b/lunaria/files/en-GB.json
@@ -235,6 +235,7 @@
       "no_readme": "No README available.",
       "view_on_github": "View on GitHub",
       "toc_title": "Outline",
+      "load_error": "Failed to load README",
       "callout": {
         "note": "Note",
         "tip": "Tip",
diff --git a/lunaria/files/en-US.json b/lunaria/files/en-US.json
index a4424e083..850aae18d 100644
--- a/lunaria/files/en-US.json
+++ b/lunaria/files/en-US.json
@@ -235,6 +235,7 @@
       "no_readme": "No README available.",
       "view_on_github": "View on GitHub",
       "toc_title": "Outline",
+      "load_error": "Failed to load README",
       "callout": {
         "note": "Note",
         "tip": "Tip",
diff --git a/server/api/registry/file/[...pkg].get.ts b/server/api/registry/file/[...pkg].get.ts
index c1dd76c1b..7f2497c40 100644
--- a/server/api/registry/file/[...pkg].get.ts
+++ b/server/api/registry/file/[...pkg].get.ts
@@ -94,7 +94,7 @@ async function fetchFileContent(
  * - /api/registry/file/@scope/packageName/v/1.2.3/path/to/file.ts
  */
 export default defineCachedEventHandler(
-  async event => {
+  async (event): Promise<PackageFileContentResponse> => {
     // Parse: [pkg, 'v', version, ...filePath] or [@scope, pkg, 'v', version, ...filePath]
     const pkgParamSegments = getRouterParam(event, 'pkg')?.split('/') ?? []
 
diff --git a/server/api/registry/readme/[...pkg].get.ts b/server/api/registry/readme/[...pkg].get.ts
index ca64a55c0..82e8e0a08 100644
--- a/server/api/registry/readme/[...pkg].get.ts
+++ b/server/api/registry/readme/[...pkg].get.ts
@@ -56,7 +56,7 @@ async function fetchReadmeFromJsdelivr(
  * - /api/registry/readme/@scope/packageName/v/1.2.3 - scoped package, specific version
  */
 export default defineCachedEventHandler(
-  async event => {
+  async (event): Promise<ReadmeResponse> => {
     // Parse package name and optional version from URL segments
     // Patterns: [pkg] or [pkg, 'v', version] or [@scope, pkg] or [@scope, pkg, 'v', version]
     const pkgParamSegments = getRouterParam(event, 'pkg')?.split('/') ?? []
@@ -107,7 +107,7 @@ export default defineCachedEventHandler(
       }
 
       if (!readmeContent || readmeContent === NPM_MISSING_README_SENTINEL) {
-        return { html: '', playgroundLinks: [], toc: [] }
+        return { html: '', playgroundLinks: [], toc: [], md: '' }
       }
 
       // Parse repository info for resolving relative URLs to GitHub