diff --git a/COPY.md b/COPY.md
index 404e06d9..ef6e2fdb 100644
--- a/COPY.md
+++ b/COPY.md
@@ -11,7 +11,7 @@ contradicts this file is a bug.
 
 ## Canonical assets
 
-The optional welcome email uses the subject "Welcome to skilld".
+The signup welcome email uses the subject "Welcome to skilld".
 Its greeting is "Hi! I’m Harlan."
 Its story is "I built skilld to discover new Skills without spending all day on social media, read their source, and keep up with updates."
 Its account line is "Your account lets you save liked Skills, watch Repositories, and choose which update emails you receive."
@@ -19,7 +19,17 @@ After its main action, it says "Let me know if you’d like to see any changes :
 Replies go to `harlan@harlanzw.com`.
 Its one main action is "Open your account", linking to `/me`.
 Its footer is "Stop welcome emails", linking to a signed welcome unsubscribe URL.
-Onboarding offers an unchecked choice: "Send me one welcome email with account tips."
+Signup sends one welcome email automatically when GitHub supplies an email address.
+Onboarding has no welcome checkbox. It offers previews of the welcome, weekly, and digest emails.
+Preview labels are "Preview the welcome", "Preview the weekly", and "Preview the digest".
+The welcome preview footer says "Email preferences" and links to `/me`.
+Preview loading says "Loading email preview". Failure says "Could not load the email preview. Try again."
+The weekly footer says "Your account is set to receive the weekly email."
+The digest heading is "Skill updates". Its introduction is "Recent commits from repos you watch."
+Its changes section is "Recent commits". Show author commit subjects, never generated summaries or Skill descriptions.
+If commit details are missing, say "Commit details are unavailable." Link "View commits" to the Skill file's GitHub history.
+New accounts start with the weekly and digest choices unchecked. Saved choices stay as selected.
+Onboarding and the welcome email say "We’ll only send other emails if you’ve opted in."
 The missing-address message is "Add an email address, or turn off all email choices."
 Welcome unsubscribe says "You will not get welcome emails. Your weekly and digest settings are unchanged."
 
diff --git a/GLOSSARY.md b/GLOSSARY.md
index 7fa02240..46c2af39 100644
--- a/GLOSSARY.md
+++ b/GLOSSARY.md
@@ -199,7 +199,7 @@ UI fixtures are labelled Example data. They are not recorded runs or evaluation
 
 **Is:** the monthly email that summarises changes to watched Repositories. The user can turn it off.
 
-**Never:** newsletter, notification, alert. "the weekly" is the separate opt-out email.
+**Never:** newsletter, notification, alert. "the weekly" is the separate weekly email.
 
 ### trending
 
@@ -377,7 +377,8 @@ Existing route paths, table names, and protocol fields keep their identifiers.
 
 ### weekly
 
-**Is:** the one email everyone gets: Skills you liked that changed, plus what trended. Opt-out, on by default.
+**Is:** the weekly email with distinct trending Skills. New accounts choose during onboarding; both recurring email choices start unchecked.
+Existing accounts keep their saved choices.
 
 **Use for:** "the weekly", lowercase. It sits beside **digest**, which is the separate watched-Repository email. They are not the same send.
 
diff --git a/layers/identity/app/layouts/auth.vue b/layers/identity/app/layouts/auth.vue
index 0d636439..62812ace 100644
--- a/layers/identity/app/layouts/auth.vue
+++ b/layers/identity/app/layouts/auth.vue
@@ -14,7 +14,7 @@ const route = useRoute()
     <main id="main-content" tabindex="-1" class="editorial-band flex flex-1 flex-col items-center justify-center px-4 pt-6 pb-16 sm:px-6">
       <div v-if="route.meta.authWide" class="editorial-atmosphere" data-palette="rose" data-geometry="bloom" data-intensity="ambient" aria-hidden="true" />
       <NuxtLink to="/" aria-label="skilld, home" class="editorial-band__content mb-10 flex min-h-11 items-center rounded-lg">
-        <AppLogo :class="route.meta.authWide ? 'h-auto w-36' : undefined" />
+        <AppLogo class="h-auto w-48" />
       </NuxtLink>
       <div class="editorial-band__content w-full" :class="route.meta.authWide ? 'max-w-[51rem]' : 'max-w-2xl'">
         <slot />
diff --git a/layers/identity/app/pages/onboarding/email.vue b/layers/identity/app/pages/onboarding/email.vue
index b176a863..39f242a7 100644
--- a/layers/identity/app/pages/onboarding/email.vue
+++ b/layers/identity/app/pages/onboarding/email.vue
@@ -14,14 +14,13 @@ onMounted(() => recordSignup({ stage: 'email', outcome: 'viewed', entry: 'onboar
 const email = ref(me.value?.digest_email || me.value?.email || '')
 // A stored address records a deliberate choice, including a previous opt-out.
 const hasEmailChoices = computed(() => !!me.value?.onboarded_at || !!me.value?.digest_email)
-const optIn = ref(hasEmailChoices.value ? !!me.value?.email_opt_in : true)
-const weeklyOptIn = ref(hasEmailChoices.value ? !!me.value?.weekly_opt_in : true)
-const welcomeEmail = ref(false)
+const optIn = ref(hasEmailChoices.value ? !!me.value?.email_opt_in : false)
+const weeklyOptIn = ref(hasEmailChoices.value ? !!me.value?.weekly_opt_in : false)
 watch(me, (account, previous) => {
   if (account && !previous) {
     email.value = account.digest_email || account.email || ''
-    optIn.value = hasEmailChoices.value ? account.email_opt_in : true
-    weeklyOptIn.value = hasEmailChoices.value ? account.weekly_opt_in : true
+    optIn.value = hasEmailChoices.value ? account.email_opt_in : false
+    weeklyOptIn.value = hasEmailChoices.value ? account.weekly_opt_in : false
   }
 })
 
@@ -44,7 +43,7 @@ const finishOnboardingMutation = useNuxtMutation<void, IdentityMutationResponse>
 
 // Opting in needs somewhere to send the digest, so the address is required
 // exactly when the box is ticked.
-const missingAddress = computed(() => (optIn.value || weeklyOptIn.value || welcomeEmail.value)
+const missingAddress = computed(() => (optIn.value || weeklyOptIn.value)
   && !/^[^\s@]+@[^\s@][^\s.@]*\.[^\s@]+$/.test(email.value.trim()))
 
 const submitting = computed(() => saveEmailMutation.pending.value || finishOnboardingMutation.pending.value)
@@ -55,7 +54,6 @@ async function finish() {
     digest_email: email.value,
     email_opt_in: optIn.value,
     weekly_opt_in: weeklyOptIn.value,
-    ...(welcomeEmail.value ? { welcome_email: true } : {}),
   })
   if (saved._tag === 'err') {
     recordSignup({ stage: 'email', outcome: 'failed', entry: 'onboarding' })
@@ -74,6 +72,24 @@ async function finish() {
   await navigateTo('/me?welcome=1')
 }
 
+const preview = ref<'weekly' | 'digest' | 'welcome' | null>(null)
+const { data: previewHtml, status: previewStatus, error: previewError, refresh: loadPreview } = useFetch<string>(() => `/${preview.value || 'welcome'}/preview`, { immediate: false, watch: false, responseType: 'text' })
+// Keep email links out of the sandboxed preview frame.
+const previewDocument = computed(() => previewHtml.value?.replace(/<head\b[^>]*>/i, '$&<base target="_blank">'))
+function openPreview(kind: 'weekly' | 'digest' | 'welcome') {
+  preview.value = kind
+  loadPreview()
+}
+const previewOpen = computed({
+  get: () => preview.value !== null,
+  set: (open: boolean) => {
+    if (!open)
+      preview.value = null
+  },
+})
+const previewTitle = computed(() => preview.value === 'weekly' ? 'Preview the weekly' : preview.value === 'digest' ? 'Preview the digest' : 'Preview the welcome')
+const checkboxUi = { base: 'size-6', container: 'h-6', wrapper: 'ms-3', label: 'min-h-11 cursor-pointer font-normal leading-6' }
+
 useSeoMeta({ title: 'Email opt-in', robots: 'noindex' })
 </script>
 
@@ -111,29 +127,22 @@ useSeoMeta({ title: 'Email opt-in', robots: 'noindex' })
         </p>
       </div>
 
-      <label class="flex min-h-11 items-start gap-3 cursor-pointer">
-        <input v-model="weeklyOptIn" type="checkbox" :disabled="submitting" class="mt-0.5 size-4 accent-primary">
-        <span class="text-sm text-muted leading-relaxed">
-          Send me distinct trending Skills each Monday.
-        </span>
-      </label>
-
-      <label class="flex min-h-11 items-start gap-3 cursor-pointer">
-        <input v-model="optIn" type="checkbox" :disabled="submitting" class="mt-0.5 size-4 accent-primary">
-        <span class="text-sm text-muted leading-relaxed">
-          Send me watched changes once a month.
-        </span>
-      </label>
-
-      <label class="flex min-h-11 items-start gap-3 cursor-pointer">
-        <input v-model="welcomeEmail" type="checkbox" :disabled="submitting" class="mt-0.5 size-4 accent-primary">
-        <span class="text-sm text-muted leading-relaxed">
-          {{ WELCOME_EMAIL_COPY.consent }}
-        </span>
-      </label>
-
-      <p v-if="!optIn && !weeklyOptIn && !welcomeEmail" class="rounded-lg border border-default bg-elevated/50 p-3 text-xs text-muted">
-        You won't receive any emails. You can opt in later from your dashboard.
+      <div class="space-y-1">
+        <UCheckbox v-model="weeklyOptIn" size="xl" :disabled="submitting" :ui="checkboxUi" label="Send me distinct trending Skills each Monday." />
+        <UButton label="Preview the weekly" color="neutral" variant="link" class="min-h-11 px-0 ms-9" trailing-icon="i-lucide-arrow-up-right" @click="openPreview('weekly')" />
+      </div>
+
+      <div class="space-y-1">
+        <UCheckbox v-model="optIn" size="xl" :disabled="submitting" :ui="checkboxUi" label="Send me watched changes once a month." />
+        <UButton label="Preview the digest" color="neutral" variant="link" class="min-h-11 px-0 ms-9" trailing-icon="i-lucide-arrow-up-right" @click="openPreview('digest')" />
+      </div>
+
+      <div class="border-t border-default pt-3">
+        <UButton label="Preview the welcome" color="neutral" variant="link" class="min-h-11 px-0" trailing-icon="i-lucide-arrow-up-right" @click="openPreview('welcome')" />
+      </div>
+
+      <p class="text-sm leading-relaxed text-muted">
+        {{ WELCOME_EMAIL_COPY.emailChoices }}
       </p>
     </form>
 
@@ -158,5 +167,17 @@ useSeoMeta({ title: 'Email opt-in', robots: 'noindex' })
         form="email-onboarding-form"
       />
     </div>
+    <UModal v-model:open="previewOpen" :title="previewTitle" :ui="{ content: 'max-w-2xl', body: 'p-0 sm:p-0' }">
+      <template #body>
+        <div v-if="previewStatus === 'pending'" role="status" class="flex min-h-80 items-center justify-center text-muted">
+          Loading email preview
+        </div>
+        <div v-else-if="previewError" role="alert" class="min-h-80 p-6">
+          <p>Could not load the email preview. Try again.</p>
+          <UButton label="Retry" color="neutral" variant="outline" class="mt-4 min-h-11" @click="loadPreview()" />
+        </div>
+        <iframe v-else-if="previewHtml" :srcdoc="previewDocument" :title="previewTitle" sandbox="allow-popups allow-popups-to-escape-sandbox" class="h-[65dvh] min-h-80 w-full border-0 bg-muted" />
+      </template>
+    </UModal>
   </section>
 </template>
diff --git a/layers/identity/server/api/digest/demo.get.ts b/layers/identity/server/api/digest/demo.get.ts
index 499593c7..468e54a2 100644
--- a/layers/identity/server/api/digest/demo.get.ts
+++ b/layers/identity/server/api/digest/demo.get.ts
@@ -1,6 +1,7 @@
 import { defineApiHandler } from '#shared/server/handler'
 import {
   loadPublicDigestChanges,
+  publicDigestCommitsSchema,
   publicDigestSkillSchema,
   publicDigestUpdatesSchema,
 } from '../../utils/public-digest'
@@ -25,6 +26,9 @@ export default defineCachedEventHandler(defineApiHandler({ handler: async () =>
     loadSkill: async item => publicDigestSkillSchema.parse(await $fetch(
       `/api/v1/skills/${encodeURIComponent(item.owner)}/${encodeURIComponent(item.repo)}/${encodeURIComponent(item.name)}`,
     )),
+    loadCommits: async item => publicDigestCommitsSchema.parse(await $fetch(
+      `/api/skill-related/${encodeURIComponent(item.owner)}/${encodeURIComponent(item.repo)}/${encodeURIComponent(item.name)}`,
+    )),
   })
   return { changes, windowStart, windowEnd }
 }, presenter: ({ changes, windowStart, windowEnd }): DigestDemoResponse => {
@@ -51,4 +55,4 @@ export default defineCachedEventHandler(defineApiHandler({ handler: async () =>
     windowEnd,
     rowCount: changes.length,
   }
-} }), { maxAge: 3600, swr: true, name: 'public-digest-demo-v1' })
+} }), { maxAge: 3600, swr: true, name: 'public-digest-demo-v3' })
diff --git a/layers/identity/server/api/me/email.patch.ts b/layers/identity/server/api/me/email.patch.ts
index a9dcb18b..b7666841 100644
--- a/layers/identity/server/api/me/email.patch.ts
+++ b/layers/identity/server/api/me/email.patch.ts
@@ -6,7 +6,6 @@ import { planAccountSettings, updateAccountSettings } from '../../utils/account-
 import { sendEmailWithEnv, signUnsubToken } from '../../utils/email'
 import { sendSkillValidationSummary } from '../../utils/skill-validation-email'
 import { requireUserRow } from '../../utils/users'
-import { sendWelcomeEmail } from '../../utils/welcome-email'
 
 export default defineApiHandler({
   schema: identityEmailPatchBodySchema,
@@ -27,22 +26,6 @@ export default defineApiHandler({
     await updateAccountSettings(platform.db, u.id, plan.columns)
     const config = useRuntimeConfig(event)
     const updated = await requireUserRow(event)
-    const welcome = sendWelcomeEmail({
-      db: platform.db,
-      userId: updated.id,
-      // The request address owns this consent, even if another save races this one.
-      to: body.digest_email ?? '',
-      consent: body.welcome_email === true,
-      now: Math.floor(Date.now() / 1000),
-      attemptId: crypto.randomUUID(),
-      signUnsubscribe: userId => signUnsubToken(userId, config.tokenKey, 'welcome'),
-      send: input => sendEmailWithEnv(platform.env, { ...input, from: config.email.from }),
-    }).then((outcome) => {
-      if (outcome === 'rejected' || outcome === 'uncertain')
-        emitOperationalEvent(createWideEvent({ operation: 'welcome-email', outcome: 'failed' }))
-    }).catch(() => {
-      emitOperationalEvent(createWideEvent({ operation: 'welcome-email', outcome: 'failed' }))
-    })
     const summary = sendSkillValidationSummary({
       db: platform.db,
       user: updated,
@@ -57,9 +40,9 @@ export default defineApiHandler({
     })
     const context = (event.context as { cloudflare?: { context?: { waitUntil?: (p: Promise<unknown>) => void } } }).cloudflare?.context
     if (context?.waitUntil)
-      context.waitUntil(Promise.all([summary, welcome]))
+      context.waitUntil(summary)
     else
-      await Promise.all([summary, welcome])
+      await summary
     const current = session as unknown as UserSession | null
     if (current?.user && (body.email_opt_in !== undefined || body.weekly_opt_in !== undefined)) {
       await setUserSession(event, {
diff --git a/layers/identity/server/routes/auth/github.get.ts b/layers/identity/server/routes/auth/github.get.ts
index debaa872..77fcb409 100644
--- a/layers/identity/server/routes/auth/github.get.ts
+++ b/layers/identity/server/routes/auth/github.get.ts
@@ -10,6 +10,7 @@ import { emitSignupEvent } from '../../utils/signup-analytics'
 import { sendSkillValidationSummary } from '../../utils/skill-validation-email'
 import { upsertUserFromGithub } from '../../utils/users'
 import { handleWatchAction } from '../../utils/watch-actions'
+import { sendWelcomeEmail } from '../../utils/welcome-email'
 
 const githubTokensSchema = z.object({
   access_token: z.string().min(1).max(2048),
@@ -58,7 +59,7 @@ const githubHandler = defineOAuthGitHubEventHandler({
       return null
     })
 
-    const row = await upsertUserFromGithub(event, { ...profile, email }, {
+    const signIn = await upsertUserFromGithub(event, { ...profile, email }, {
       accessToken,
       accessTokenExpiresIn: parsedTokens.expires_in ?? null,
       refreshToken: parsedTokens.refresh_token ?? null,
@@ -66,7 +67,29 @@ const githubHandler = defineOAuthGitHubEventHandler({
       clientId: platform.env.NUXT_OAUTH_GITHUB_CLIENT_ID,
       scopes,
     })
+    const row = signIn.user
     const config = useRuntimeConfig(event)
+    if (signIn._tag === 'created' && row.email) {
+      const welcome = sendWelcomeEmail({
+        db: platform.db,
+        userId: row.id,
+        to: email ?? '',
+        now: Math.floor(Date.now() / 1000),
+        attemptId: crypto.randomUUID(),
+        signUnsubscribe: userId => signUnsubToken(userId, config.tokenKey, 'welcome'),
+        send: input => sendEmailWithEnv(platform.env, { ...input, from: config.email.from }),
+      }).then((outcome) => {
+        if (outcome === 'rejected' || outcome === 'uncertain')
+          emitOperationalEvent(createWideEvent({ operation: 'welcome-email', outcome: 'failed' }))
+      }).catch(() => {
+        emitOperationalEvent(createWideEvent({ operation: 'welcome-email', outcome: 'failed' }))
+      })
+      const context = (event.context as { cloudflare?: { context?: { waitUntil?: (p: Promise<unknown>) => void } } }).cloudflare?.context
+      if (context?.waitUntil)
+        context.waitUntil(welcome)
+      else
+        await welcome
+    }
     const sendValidationSummary = () => sendSkillValidationSummary({
       db: platform.db,
       user: row,
diff --git a/layers/identity/server/routes/digest/preview.get.ts b/layers/identity/server/routes/digest/preview.get.ts
index 68c8c727..8b268231 100644
--- a/layers/identity/server/routes/digest/preview.get.ts
+++ b/layers/identity/server/routes/digest/preview.get.ts
@@ -3,4 +3,4 @@ export default defineCachedEventHandler(async (event) => {
   setHeader(event, 'content-type', 'text/html; charset=utf-8')
   setHeader(event, 'x-robots-tag', 'noindex, follow')
   return demo.html
-}, { maxAge: 3600, swr: true, name: 'public-digest-preview-v1' })
+}, { maxAge: 3600, swr: true, name: 'public-digest-preview-v3' })
diff --git a/layers/identity/server/routes/welcome/preview.get.ts b/layers/identity/server/routes/welcome/preview.get.ts
new file mode 100644
index 00000000..391b1720
--- /dev/null
+++ b/layers/identity/server/routes/welcome/preview.get.ts
@@ -0,0 +1,7 @@
+import { renderWelcomeEmail } from '../../utils/welcome-email'
+
+export default defineEventHandler((event) => {
+  setHeader(event, 'content-type', 'text/html; charset=utf-8')
+  setHeader(event, 'x-robots-tag', 'noindex, follow')
+  return renderWelcomeEmail('https://skilld.dev/me', 'Email preferences').html
+})
diff --git a/layers/identity/server/utils/digest-template.ts b/layers/identity/server/utils/digest-template.ts
index 5d8452db..3ac8fc1c 100644
--- a/layers/identity/server/utils/digest-template.ts
+++ b/layers/identity/server/utils/digest-template.ts
@@ -14,7 +14,7 @@ export interface DigestRepoEntry {
     changeUrl: string
   }>
   changeCount: number
-  /** Optional generated sentence. Commit messages remain the fallback. */
+  /** Delivery metadata. Author commit messages remain the email content. */
   summary?: string | null
 }
 
@@ -39,7 +39,7 @@ export interface DigestRender {
 
 export function renderDigest(input: DigestRenderInput): DigestRender {
   const siteUrl = input.siteUrl ?? 'https://skilld.dev'
-  const changes = input.entries.flatMap(entry => entry.skills.map((skill, index) => ({
+  const changes = input.entries.flatMap(entry => entry.skills.map(skill => ({
     owner: entry.owner,
     repo: entry.repo,
     name: skill.name,
@@ -47,9 +47,7 @@ export function renderDigest(input: DigestRenderInput): DigestRender {
     description: skill.description,
     changeCount: skill.changeCount,
     changedAt: skill.changedAt,
-    commitMessages: entry.summary && index === 0
-      ? [`Generated summary: ${entry.summary}`]
-      : skill.commitMessages,
+    commitMessages: skill.commitMessages,
     sourceUrl: skill.sourceUrl,
     changeUrl: skill.changeUrl,
   })))
diff --git a/layers/identity/server/utils/public-digest.ts b/layers/identity/server/utils/public-digest.ts
index e099e55f..c23de9f5 100644
--- a/layers/identity/server/utils/public-digest.ts
+++ b/layers/identity/server/utils/public-digest.ts
@@ -8,9 +8,14 @@ const updateSchema = z.discriminatedUnion('kind', [
     repo: z.string(),
     name: z.string(),
     occurredAt: z.number(),
-    changeSummary: z.string().nullable(),
   }),
-  z.object({ kind: z.literal('repo') }),
+  z.object({
+    kind: z.literal('repo'),
+    owner: z.string(),
+    repo: z.string(),
+    occurredAt: z.number(),
+    skills: z.array(z.object({ name: z.string() })),
+  }),
 ])
 
 export const publicDigestUpdatesSchema = z.object({ items: z.array(updateSchema) })
@@ -19,29 +24,62 @@ export const publicDigestSkillSchema = z.object({
   sourceUrl: z.string().url(),
   sourceGone: z.boolean(),
   sourceCommit: z.string().nullable(),
+  updatedAt: z.iso.datetime().nullable(),
+})
+export const publicDigestCommitsSchema = z.object({
+  commits: z.array(z.object({
+    sha: z.string().min(1),
+    message: z.string(),
+    date: z.string(),
+    url: z.string().url(),
+  })),
 })
 
-type PublicDigestUpdate = Extract<z.infer<typeof updateSchema>, { kind: 'skill' }>
+interface PublicDigestUpdate {
+  owner: string
+  repo: string
+  name: string
+  occurredAt: number | null
+}
 
 export interface PublicDigestDependencies {
   windowStart: number
   windowEnd: number
   loadUpdates: () => Promise<z.infer<typeof publicDigestUpdatesSchema>>
   loadSkill: (update: PublicDigestUpdate) => Promise<z.infer<typeof publicDigestSkillSchema>>
+  loadCommits: (skill: Pick<PublicDigestUpdate, 'owner' | 'repo' | 'name'>) => Promise<z.infer<typeof publicDigestCommitsSchema>>
 }
 
 /** Public changes only. Never read an account's watches for an anonymous example. */
 export async function loadPublicDigestChanges(deps: PublicDigestDependencies): Promise<WeeklyLikedChange[]> {
   const updates = await deps.loadUpdates()
-  const recent = updates.items.filter((item): item is PublicDigestUpdate =>
-    item.kind === 'skill'
-    && item.occurredAt >= deps.windowStart
+  const seen = new Set<string>()
+  const recent = updates.items.filter(item =>
+    item.occurredAt >= deps.windowStart
     && item.occurredAt <= deps.windowEnd,
-  ).slice(0, 5)
+  ).flatMap((item): PublicDigestUpdate[] => item.kind === 'skill'
+    ? [item]
+    : item.skills.map(skill => ({
+        owner: item.owner,
+        repo: item.repo,
+        name: skill.name,
+        // Repository cards span 90 days. Their timestamp and summary belong
+        // to the latest entry, not every Skill named on the card.
+        occurredAt: null,
+      }))).filter((item) => {
+    const key = JSON.stringify([item.owner.toLowerCase(), item.repo.toLowerCase(), item.name])
+    if (seen.has(key))
+      return false
+    seen.add(key)
+    return true
+  }).slice(0, 30)
   const changes = await Promise.all(recent.map(async (item): Promise<WeeklyLikedChange | null> => {
     const skill = await deps.loadSkill(item)
     if (skill.sourceGone)
       return null
+    const changedAt = item.occurredAt ?? (skill.updatedAt === null ? null : Date.parse(skill.updatedAt) / 1000)
+    if (changedAt === null || changedAt < deps.windowStart || changedAt > deps.windowEnd)
+      return null
     return {
       owner: item.owner,
       repo: item.repo,
@@ -49,8 +87,8 @@ export async function loadPublicDigestChanges(deps: PublicDigestDependencies): P
       slug: item.name,
       description: skill.description,
       changeCount: 1,
-      changedAt: item.occurredAt,
-      commitMessages: item.changeSummary ? [item.changeSummary] : [],
+      changedAt,
+      commitMessages: [],
       sourceUrl: skill.sourceUrl,
       // Feed hashes identify blobs. The detail API identifies revision commits.
       changeUrl: skill.sourceCommit
@@ -58,5 +96,21 @@ export async function loadPublicDigestChanges(deps: PublicDigestDependencies): P
         : skill.sourceUrl.replace('/blob/', '/commits/'),
     }
   }))
-  return changes.filter((item): item is WeeklyLikedChange => item !== null)
+  const admitted = changes.filter((item): item is WeeklyLikedChange => item !== null).slice(0, 5)
+  return Promise.all(admitted.map(async (skill) => {
+    // Only admitted Skills fetch history. This endpoint scopes GitHub commits
+    // to the exact SKILL.md file, rather than every commit in its Repository.
+    const history = await deps.loadCommits(skill)
+    const recentCommits = history.commits.map(commit => ({ ...commit, occurredAt: Date.parse(commit.date) / 1000 }))
+      .filter(commit => Number.isFinite(commit.occurredAt)
+        && commit.occurredAt >= deps.windowStart && commit.occurredAt <= deps.windowEnd)
+      .sort((a, b) => b.occurredAt - a.occurredAt)
+    return {
+      ...skill,
+      changedAt: recentCommits[0]?.occurredAt ?? skill.changedAt,
+      changeCount: recentCommits.length || skill.changeCount,
+      commitMessages: recentCommits.map(commit => commit.message.split('\n')[0]!.trim()).filter(Boolean),
+      changeUrl: recentCommits[0]?.url ?? skill.changeUrl,
+    }
+  }))
 }
diff --git a/layers/identity/server/utils/users.ts b/layers/identity/server/utils/users.ts
index 7d441393..ab1211ad 100644
--- a/layers/identity/server/utils/users.ts
+++ b/layers/identity/server/utils/users.ts
@@ -39,6 +39,10 @@ export interface GithubUserCredentials {
   scopes: string[]
 }
 
+export type GithubSignInResult
+  = | { _tag: 'created', user: UserRow }
+    | { _tag: 'existing', user: UserRow }
+
 function db(event: H3Event): D1Database {
   return event.context.platform.db
 }
@@ -47,7 +51,7 @@ export async function upsertUserFromGithub(
   event: H3Event,
   profile: GitHubProfile,
   credentials: GithubUserCredentials,
-): Promise<UserRow> {
+): Promise<GithubSignInResult> {
   const config = useRuntimeConfig(event)
   const encrypted = await encryptToken(credentials.accessToken, config.tokenKey as string)
   const encryptedRefreshToken = credentials.refreshToken
@@ -62,6 +66,20 @@ export async function upsertUserFromGithub(
     : now + credentials.refreshTokenExpiresIn
   const d = db(event)
 
+  const values = [
+    profile.id,
+    profile.login,
+    profile.name ?? null,
+    profile.email ?? null,
+    profile.avatar_url ?? null,
+    encrypted,
+    credentials.scopes.join(' '),
+    accessTokenExpiresAt,
+    encryptedRefreshToken,
+    refreshTokenExpiresAt,
+    credentials.clientId,
+    now,
+  ]
   // Merge ghost rows seeded by 0022 backfill (github_id < 0, login matches).
   await d.prepare(
     `UPDATE users
@@ -69,42 +87,36 @@ export async function upsertUserFromGithub(
      WHERE github_id < 0 AND login = ?2`,
   ).bind(profile.id, profile.login).run()
 
-  await d.prepare(
+  // Only the callback that inserts the account owns its signup welcome.
+  const created = await d.prepare(
     `INSERT INTO users (
        github_id, login, name, email, avatar,
        github_token_encrypted, github_token_scopes, github_token_expires_at,
        github_refresh_token_encrypted, github_refresh_token_expires_at,
        github_token_client_id,
-       created_at, last_login_at
-     ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?12)
-     ON CONFLICT(github_id) DO UPDATE SET
-       login = excluded.login,
-       name = excluded.name,
+       created_at, last_login_at, weekly_opt_out
+     ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?12, 1)
+     ON CONFLICT(github_id) DO NOTHING
+     RETURNING id`,
+  ).bind(...values).first<{ id: number }>()
+
+  if (!created) {
+    await d.prepare(`UPDATE users SET
+       login = ?2,
+       name = ?3,
        -- A private profile or a failed /user/emails lookup yields no address;
        -- that must not erase the one an earlier sign-in stored.
-       email = COALESCE(excluded.email, users.email),
-       avatar = excluded.avatar,
-       github_token_encrypted = excluded.github_token_encrypted,
-       github_token_scopes = excluded.github_token_scopes,
-       github_token_expires_at = excluded.github_token_expires_at,
-       github_refresh_token_encrypted = excluded.github_refresh_token_encrypted,
-       github_refresh_token_expires_at = excluded.github_refresh_token_expires_at,
-       github_token_client_id = excluded.github_token_client_id,
-       last_login_at = excluded.last_login_at`,
-  ).bind(
-    profile.id,
-    profile.login,
-    profile.name ?? null,
-    profile.email ?? null,
-    profile.avatar_url ?? null,
-    encrypted,
-    credentials.scopes.join(' '),
-    accessTokenExpiresAt,
-    encryptedRefreshToken,
-    refreshTokenExpiresAt,
-    credentials.clientId,
-    now,
-  ).run()
+       email = COALESCE(?4, users.email),
+       avatar = ?5,
+       github_token_encrypted = ?6,
+       github_token_scopes = ?7,
+       github_token_expires_at = ?8,
+       github_refresh_token_encrypted = ?9,
+       github_refresh_token_expires_at = ?10,
+       github_token_client_id = ?11,
+       last_login_at = ?12
+       WHERE github_id = ?1`).bind(...values).run()
+  }
 
   const row = await d.prepare(
     `SELECT id, github_id, login, name, email, avatar,
@@ -115,7 +127,7 @@ export async function upsertUserFromGithub(
 
   if (!row)
     throw createError({ statusCode: 500, message: 'User upsert failed' })
-  return row
+  return { _tag: created ? 'created' : 'existing', user: row }
 }
 
 export async function getUserById(event: H3Event, id: number): Promise<UserRow | null> {
diff --git a/layers/identity/server/utils/weekly-template.ts b/layers/identity/server/utils/weekly-template.ts
index 54b240cb..3b96f170 100644
--- a/layers/identity/server/utils/weekly-template.ts
+++ b/layers/identity/server/utils/weekly-template.ts
@@ -516,11 +516,11 @@ function trendingRow(t: Tokens, options: {
         <img class="weekly-border" src="${esc(avatarUrl(options.siteUrl, options.owner))}" width="28" height="28" alt=""
              style="width:28px;height:28px;border-radius:14px;display:block;border:1px solid ${t.border};background:${t.quote};" />
       </td>
-      <td valign="top">
+      <td valign="top" style="overflow-wrap:anywhere;">
         <table role="presentation" cellpadding="0" cellspacing="0" border="0" width="100%">
           <tr>
-            <td valign="top"><a href="${esc(options.href)}" style="display:inline-block;padding:0 0 3px;font-family:${MONO};font-size:14px;line-height:1.45;font-weight:600;color:${t.text};text-decoration:underline;text-decoration-color:${t.borderStrong};text-underline-offset:3px;">${esc(options.title)}</a></td>
-            ${options.spark ? `<td valign="top" align="right" style="padding-left:12px;white-space:nowrap;">${sparkHtml(t, options.spark)}</td>` : ''}
+            <td class="weekly-row-heading" valign="top"><a href="${esc(options.href)}" style="display:inline-block;padding:0 0 3px;font-family:${MONO};font-size:14px;line-height:1.45;font-weight:600;color:${t.text};text-decoration:underline;text-decoration-color:${t.borderStrong};text-underline-offset:3px;">${esc(options.title)}</a></td>
+            ${options.spark ? `<td class="weekly-row-spark" valign="top" align="right" style="padding-left:12px;white-space:nowrap;">${sparkHtml(t, options.spark)}</td>` : ''}
           </tr>
         </table>
         ${description ? `<div style="margin-top:3px;font-family:${SANS};font-size:14px;line-height:1.55;color:${t.body};">${esc(description)}</div>` : ''}
@@ -665,7 +665,7 @@ function preheader(input: WeeklyRenderInput): string {
 
 function greeting(input: WeeklyRenderInput): string {
   if (input.changeSource === 'watches')
-    return input.likedChanges.length ? 'Source files changed in the repos you watch.' : 'No source changes this week.'
+    return input.likedChanges.length ? 'Recent commits from repos you watch.' : 'No source changes this week.'
   if ((input.edition ?? 'weekly') === 'weekly')
     return 'Here are this week’s trending Skills.'
   const liked = input.likedChanges.length + input.likedOverflow
@@ -706,7 +706,7 @@ export function renderWeekly(input: WeeklyRenderInput): WeeklyRender {
   const subject = subjectFor(input)
   const edition = input.edition ?? 'weekly'
   const trendsOnly = edition === 'weekly'
-  const changeLabel = input.changeSource === 'watches' ? 'Repos you watch' : 'Skills you like'
+  const changeLabel = input.changeSource === 'watches' ? 'Recent commits' : 'Skills you like'
   const empty = !input.likedChanges.length && !input.trackedCount && !input.trending.length
 
   // Only the HTML is counted. Plain-text clients show the raw URL and often
@@ -726,9 +726,8 @@ export function renderWeekly(input: WeeklyRenderInput): WeeklyRender {
       owner: change.owner,
       title: change.name,
       href: sourceUrl,
-      // The description explains the skill, and it only earns its line when
-      // there are no commit subjects to explain what actually changed.
-      description: subjects.length ? null : change.description,
+      // A watched change must explain its commits or disclose missing details.
+      description: subjects.length ? null : input.changeSource === 'watches' ? 'Commit details are unavailable.' : change.description,
       body: commitList(t, change.commitMessages),
       meta: joinMeta([
         `${change.owner}/${change.repo}`,
@@ -736,7 +735,9 @@ export function renderWeekly(input: WeeklyRenderInput): WeeklyRender {
         relativeDay(change.changedAt, now),
       ]),
       links: rowLinks(t, [
-        ...(change.changeUrl ? [{ href: track(change.changeUrl, 'liked'), label: 'View change' }] : []),
+        ...(input.changeSource === 'watches'
+          ? [{ href: sourceUrl.replace('/blob/', '/commits/'), label: 'View commits' }]
+          : change.changeUrl ? [{ href: track(change.changeUrl, 'liked'), label: 'View change' }] : []),
         { href: sourceUrl, label: 'Open SKILL.md' },
       ]),
     })
@@ -810,7 +811,7 @@ export function renderWeekly(input: WeeklyRenderInput): WeeklyRender {
 
         <table role="presentation" cellpadding="0" cellspacing="0" border="0" width="100%">
           <tr><td style="padding:22px 0 8px;">
-            <h1 style="margin:0;font-family:${SANS};font-size:20px;font-weight:600;line-height:1.35;color:${t.text};">${trendsOnly ? 'This week’s trending Skills' : input.recipientName ? `Hi ${esc(input.recipientName)},` : 'Your Skill updates'}</h1>
+            <h1 style="margin:0;font-family:${SANS};font-size:20px;font-weight:600;line-height:1.35;color:${t.text};">${trendsOnly ? 'This week’s trending Skills' : input.changeSource === 'watches' ? 'Skill updates' : input.recipientName ? `Hi ${esc(input.recipientName)},` : 'Your Skill updates'}</h1>
             <div style="margin-top:6px;font-family:${SANS};font-size:14px;line-height:1.6;color:${t.body};">${esc(greeting(input))}</div>
           </td></tr>
           ${body}
@@ -823,7 +824,7 @@ export function renderWeekly(input: WeeklyRenderInput): WeeklyRender {
       <tr><td style="height:3px;background:${t.mark};font-size:0;line-height:0;">&nbsp;</td></tr>
       <tr><td class="weekly-border" style="padding:16px 20px 20px;border-top:1px solid ${t.border};font-family:${MONO};font-size:14px;line-height:1.7;color:${t.faint};">
         ${edition === 'weekly'
-          ? 'You get this once a week because you have a skilld account.'
+          ? 'Your account is set to receive the weekly email.'
           : 'You get this because you enabled the digest.'}
         <a href="${esc(track(input.settingsUrl, 'footer'))}" style="display:inline-block;padding:12px 0;color:${t.muted};text-decoration:underline;text-underline-offset:3px;">Settings</a>
         &middot;
@@ -842,6 +843,7 @@ export function renderWeekly(input: WeeklyRenderInput): WeeklyRender {
 <style>
 @media (prefers-color-scheme: dark){.weekly-border{border-color:${PALETTE.dark.borderStrong}!important;}}
 [data-ogsc] .weekly-border{border-color:${PALETTE.dark.borderStrong}!important;}
+@media(max-width:480px){.weekly-row-heading,.weekly-row-spark{display:block!important;width:auto!important;}.weekly-row-spark{padding-left:0!important;padding-top:4px!important;text-align:left!important;}}
 </style>
 </head>
 <body style="margin:0;padding:0;background:${t.page};-webkit-font-smoothing:antialiased;">
@@ -863,7 +865,7 @@ export function renderWeekly(input: WeeklyRenderInput): WeeklyRender {
 export function renderWeeklyText(input: WeeklyRenderInput): string {
   const now = input.windowEnd
   const trendsOnly = (input.edition ?? 'weekly') === 'weekly'
-  const changeLabel = input.changeSource === 'watches' ? 'REPOS YOU WATCH' : 'SKILLS YOU LIKE'
+  const changeLabel = input.changeSource === 'watches' ? 'RECENT COMMITS' : 'SKILLS YOU LIKE'
   const lines: string[] = [
     `skilld ${input.edition ?? 'weekly'}  ${formatWindow(input.windowStart, input.windowEnd)}`,
     '',
@@ -883,12 +885,14 @@ export function renderWeeklyText(input: WeeklyRenderInput): string {
         lines.push(...subjects.map(subject => `  * ${subject}`))
       }
       else {
-        const description = trimDescription(change.description)
+        const description = input.changeSource === 'watches' ? 'Commit details are unavailable.' : trimDescription(change.description)
         if (description)
           lines.push(`  ${description}`)
       }
       lines.push(`  ${change.owner}/${change.repo}, ${change.changeCount} ${plural(change.changeCount, 'change', 'changes')}, ${relativeDay(change.changedAt, now)}`)
-      if (change.changeUrl)
+      if (input.changeSource === 'watches')
+        lines.push(`  Commits: ${(change.sourceUrl ?? skillUrl(input.siteUrl, change)).replace('/blob/', '/commits/')}`)
+      else if (change.changeUrl)
         lines.push(`  Change: ${change.changeUrl}`)
       lines.push(`  Source: ${change.sourceUrl ?? skillUrl(input.siteUrl, change)}`)
       lines.push('')
diff --git a/layers/identity/server/utils/welcome-email.ts b/layers/identity/server/utils/welcome-email.ts
index b27763f1..0a9801fc 100644
--- a/layers/identity/server/utils/welcome-email.ts
+++ b/layers/identity/server/utils/welcome-email.ts
@@ -6,14 +6,13 @@ interface WelcomeEmailInput {
   db: D1Database
   userId: number
   to: string
-  consent: boolean
   now: number
   attemptId: string
   signUnsubscribe: (userId: number) => Promise<string>
   send: (input: SendEmailInput) => Promise<SendEmailResult>
 }
 
-export function renderWelcomeEmail(unsubscribeUrl: string): Pick<SendEmailInput, 'subject' | 'html' | 'text'> {
+export function renderWelcomeEmail(unsubscribeUrl: string, footerLabel: string = copy.unsubscribe): Pick<SendEmailInput, 'subject' | 'html' | 'text'> {
   const link = 'https://skilld.dev/me'
   const safeUnsubscribeUrl = unsubscribeUrl.replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/</g, '&lt;')
   return {
@@ -30,15 +29,16 @@ export function renderWelcomeEmail(unsubscribeUrl: string): Pick<SendEmailInput,
 <p style="margin:28px 0"><a href="${link}" style="display:inline-block;background:#be123c;color:#fff;text-decoration:none;font-weight:bold;padding:14px 20px;border-radius:8px">${copy.action}</a></p>
 <p style="font-size:16px;line-height:1.6">${copy.feedback}</p>
 <p style="font-size:16px;line-height:1.6;margin-bottom:0">${copy.signature}</p>
-</td></tr><tr><td style="padding:16px 0;font-size:12px"><a href="${safeUnsubscribeUrl}" style="color:#57504b">${copy.unsubscribe}</a></td></tr></table>
+<p style="font-size:12px;line-height:1.6;color:#57504b;margin:24px 0 0">${copy.emailChoices}</p>
+</td></tr><tr><td style="padding:16px 0;font-size:12px"><a href="${safeUnsubscribeUrl}" style="color:#57504b">${footerLabel}</a></td></tr></table>
 </td></tr></table></body></html>`,
-    text: `${copy.greeting}\n\n${copy.story}\n\n${copy.account}\n\n${copy.action}: ${link}\n\n${copy.feedback}\n\n${copy.signature}\n\n${copy.unsubscribe}: ${unsubscribeUrl}`,
+    text: `${copy.greeting}\n\n${copy.story}\n\n${copy.account}\n\n${copy.action}: ${link}\n\n${copy.feedback}\n\n${copy.signature}\n\n${copy.emailChoices}\n\n${footerLabel}: ${unsubscribeUrl}`,
   }
 }
 
 /** Only preparation can retry. Dispatch is terminal even if its receipt is lost. */
 export async function sendWelcomeEmail(input: WelcomeEmailInput): Promise<'skipped' | SendEmailResult['_tag']> {
-  if (!input.consent || !input.to.trim())
+  if (!input.to.trim())
     return 'skipped'
   const { db, userId, now, attemptId } = input
   const claimed = await db.prepare(`
diff --git a/layers/identity/shared/contracts/account.ts b/layers/identity/shared/contracts/account.ts
index 50ba18d1..807f19bf 100644
--- a/layers/identity/shared/contracts/account.ts
+++ b/layers/identity/shared/contracts/account.ts
@@ -11,19 +11,14 @@ export const identityEmailPatchBodySchema = z.object({
    * The weekly email, stored inverted as `weekly_opt_out`.
    *
    * The API speaks opt-in because that is what the switch in the UI means.
-   * The column is the opposite so the switch reads on by default; delivery
-   * still requires consent, which a captured profile address never provides.
+   * The stored flag is inverted. New accounts choose it during onboarding;
+   * a captured profile address never provides delivery consent.
    */
   weekly_opt_in: z.boolean().optional(),
-  /** One welcome email, requested explicitly. It does not enroll either list. */
-  welcome_email: z.boolean().optional(),
 }).refine(
-  input => !(input.email_opt_in || input.weekly_opt_in || input.welcome_email)
+  input => !(input.email_opt_in || input.weekly_opt_in)
     || z.string().email().safeParse(input.digest_email).success,
   { path: ['digest_email'], message: 'Add a valid email address to receive emails' },
-).refine(
-  input => !input.welcome_email || (input.email_opt_in !== undefined && input.weekly_opt_in !== undefined),
-  { message: 'Choose weekly and monthly email settings before requesting a welcome email' },
 )
 
 export const identityMeSchema = z.object({
diff --git a/server/api/weekly/demo.get.ts b/server/api/weekly/demo.get.ts
index 31855408..f193f43d 100644
--- a/server/api/weekly/demo.get.ts
+++ b/server/api/weekly/demo.get.ts
@@ -73,5 +73,5 @@ export default defineCachedEventHandler(
   // spend D1 reads to serve an answer that cannot have changed.
   // The name changes whenever the card markup changes, so a deploy never serves
   // the previous markup from cache.
-  { maxAge: 3600, swr: true, name: 'weekly-demo-v2' },
+  { maxAge: 3600, swr: true, name: 'weekly-demo-v3' },
 )
diff --git a/server/routes/weekly/preview.get.ts b/server/routes/weekly/preview.get.ts
index a057e9f4..75e2da00 100644
--- a/server/routes/weekly/preview.get.ts
+++ b/server/routes/weekly/preview.get.ts
@@ -47,5 +47,5 @@ export default defineCachedEventHandler(
     setHeader(event, 'x-robots-tag', 'noindex, follow')
     return rendered.html
   },
-  { maxAge: 3600, swr: true, name: 'weekly-preview-v1' },
+  { maxAge: 3600, swr: true, name: 'weekly-preview-v2' },
 )
diff --git a/shared/welcome-email-copy.ts b/shared/welcome-email-copy.ts
index d2493f06..c9fb09b4 100644
--- a/shared/welcome-email-copy.ts
+++ b/shared/welcome-email-copy.ts
@@ -7,7 +7,7 @@ export const WELCOME_EMAIL_COPY = {
   signature: 'Harlan',
   action: 'Open your account',
   unsubscribe: 'Stop welcome emails',
-  consent: 'Send me one welcome email with account tips.',
+  emailChoices: 'We’ll only send other emails if you’ve opted in.',
   missingAddress: 'Add an email address, or turn off all email choices.',
   stopped: 'You will not get welcome emails. Your weekly and digest settings are unchanged.',
 } as const
diff --git a/test/unit/digest-opt-in-address.test.ts b/test/unit/digest-opt-in-address.test.ts
index aaf5d954..70c13c5d 100644
--- a/test/unit/digest-opt-in-address.test.ts
+++ b/test/unit/digest-opt-in-address.test.ts
@@ -167,17 +167,14 @@ describe('me email patch endpoint', () => {
       .toEqual({ digest_email: 'harlan@example.com', email_opt_in: 1 })
   })
 
-  it('uses the address explicitly consented for welcome despite a racing account save', async () => {
-    sqlite.exec(`CREATE TRIGGER racing_address AFTER UPDATE OF digest_email ON users
-      BEGIN UPDATE users SET digest_email = 'other@example.com' WHERE id = NEW.id; END;`)
+  it('never sends a welcome when saving recurring email preferences', async () => {
     vi.stubGlobal('readBody', () => Promise.resolve({
       digest_email: 'welcome@example.com',
-      welcome_email: true,
       email_opt_in: false,
       weekly_opt_in: false,
     }))
     await emailPatchHandler(patchEvent())
-    expect(welcomeSend).toHaveBeenCalledWith(expect.objectContaining({ consent: true, to: 'welcome@example.com' }))
+    expect(welcomeSend).not.toHaveBeenCalled()
     expect(sqlite.prepare('SELECT email_opt_in, weekly_opt_out FROM users WHERE id = 1').get())
       .toEqual({ email_opt_in: 0, weekly_opt_out: 1 })
   })
diff --git a/test/unit/digest-preview.test.ts b/test/unit/digest-preview.test.ts
index 1faf872d..84626412 100644
--- a/test/unit/digest-preview.test.ts
+++ b/test/unit/digest-preview.test.ts
@@ -53,7 +53,7 @@ describe('digest rehearsal', () => {
     expect(result._tag).toBe('rendered')
     if (result._tag !== 'rendered')
       throw new Error('Expected rendered preview')
-    expect(result.rendered.html).toContain(entry.skills[0]!.changeUrl)
+    expect(result.rendered.html).toContain(entry.skills[0]!.sourceUrl.replace('/blob/', '/commits/'))
     expect(result.rendered.text).toContain('Improve review')
     expect(deps.send).not.toHaveBeenCalled()
   })
diff --git a/test/unit/digest-template.test.ts b/test/unit/digest-template.test.ts
new file mode 100644
index 00000000..ffa88f8b
--- /dev/null
+++ b/test/unit/digest-template.test.ts
@@ -0,0 +1,43 @@
+import { describe, expect, it } from 'vitest'
+import { renderDigest } from '../../layers/identity/server/utils/digest-template'
+
+const skill = {
+  name: 'review',
+  description: 'A generic description of what this Skill does.',
+  changeCount: 2,
+  commitMessages: ['fix: handle keyboard focus\n\nDetailed author explanation', 'feat: check dialog labels'],
+  changedAt: 100,
+  sourceUrl: 'https://github.com/acme/skills/blob/main/review/SKILL.md',
+  changeUrl: 'https://github.com/acme/skills/commit/abc',
+}
+function render(commitMessages = skill.commitMessages) {
+  const entry = {
+    owner: 'acme',
+    repo: 'skills',
+    skillNames: ['review'],
+    changeCount: 2,
+    summary: 'A generated sentence that hides the actual commits.',
+    skills: [{ ...skill, commitMessages }],
+  }
+  return renderDigest({ login: 'reader', windowStart: 1, windowEnd: 200, entries: [entry], unsubscribeUrl: 'https://skilld.dev/api/unsubscribe?t=example' })
+}
+
+describe('digest commit content', () => {
+  it('shows author commit subjects even when delivery has a generated summary', () => {
+    const rendered = render()
+    for (const content of [rendered.html, rendered.text]) {
+      expect(content).toContain('fix: handle keyboard focus')
+      expect(content).toContain('feat: check dialog labels')
+      expect(content).not.toContain('A generated sentence')
+      expect(content).not.toContain(skill.description)
+      expect(content).toContain('https://github.com/acme/skills/commits/main/review/SKILL.md')
+    }
+  })
+  it('explains missing commit details without substituting a Skill description', () => {
+    const rendered = render([])
+    for (const content of [rendered.html, rendered.text]) {
+      expect(content).toContain('Commit details are unavailable.')
+      expect(content).not.toContain(skill.description)
+    }
+  })
+})
diff --git a/test/unit/email-form-submit.nuxt.test.ts b/test/unit/email-form-submit.nuxt.test.ts
index b88fea0e..179f0803 100644
--- a/test/unit/email-form-submit.nuxt.test.ts
+++ b/test/unit/email-form-submit.nuxt.test.ts
@@ -1,3 +1,4 @@
+import type { DOMWrapper, VueWrapper } from '@vue/test-utils'
 import { mockNuxtImport, mountSuspended } from '@nuxt/test-utils/runtime'
 import { flushPromises } from '@vue/test-utils'
 import { ref } from 'vue'
@@ -10,7 +11,7 @@ const account = ref({
   login: 'email-review',
   name: 'Email review',
   email: 'review@example.com',
-  digest_email: 'review@example.com',
+  digest_email: 'review@example.com' as string | null,
   email_opt_in: true,
   weekly_opt_in: true,
   likes_public: false,
@@ -26,7 +27,7 @@ mockNuxtImport('useNuxtRpcQuery', () => (operation: { path: string }) => ({
   error: ref(),
   refresh: vi.fn(),
 }))
-mockNuxtImport('useFetch', () => () => ({ data: ref({ items: [] }), status: ref('success'), error: ref(), refresh: vi.fn() }))
+mockNuxtImport('useFetch', () => (url: unknown) => ({ data: ref(typeof url === 'function' ? '<html><head></head><body>Example email</body></html>' : { items: [] }), status: ref('success'), error: ref(), refresh: vi.fn() }))
 mockNuxtImport('useNuxtRpc', () => () => ({ execute: mocks.execute, query: mocks.query }))
 mockNuxtImport('useAuth', () => () => ({ fetchSession: mocks.session }))
 mockNuxtImport('navigateTo', () => mocks.navigate)
@@ -37,6 +38,19 @@ mockNuxtImport('useNuxtMutation', () => (options: { mutation: (body?: unknown) =
   mutateSafe: async (body?: unknown) => ({ _tag: 'ok', data: await options.mutation(body) }),
 }))
 
+function checkboxes(form: DOMWrapper<Element> | VueWrapper) {
+  return form.findAll('[role="checkbox"], input[type="checkbox"]:not([aria-hidden="true"])')
+}
+async function setChecked(checkbox: DOMWrapper<Element>, checked: boolean) {
+  if (checkbox.attributes('role') === 'checkbox') {
+    if ((checkbox.attributes('aria-checked') === 'true') !== checked)
+      await checkbox.trigger('click')
+  }
+  else {
+    await checkbox.setValue(checked)
+  }
+}
+
 const screens = [
   { name: 'account settings', component: Account, form: '#email-settings-form' },
   { name: 'onboarding', component: OnboardingEmail, form: '#email-onboarding-form' },
@@ -47,6 +61,7 @@ beforeEach(() => {
   mocks.execute.mockResolvedValue({ ok: true })
   mocks.query.mockResolvedValue({ ...account.value })
   account.value.onboarded_at = null
+  account.value.digest_email = 'review@example.com'
   account.value.email_opt_in = true
   account.value.weekly_opt_in = true
 })
@@ -56,8 +71,8 @@ it('keeps saved email choices when returning to completed onboarding', async ()
   account.value.email_opt_in = false
   account.value.weekly_opt_in = false
   const wrapper = await mountSuspended(OnboardingEmail, { route: '/onboarding/email' })
-  for (const checkbox of wrapper.findAll('input[type="checkbox"]'))
-    expect((checkbox.element as HTMLInputElement).checked).toBe(false)
+  for (const checkbox of checkboxes(wrapper))
+    expect(checkbox.attributes('role') === 'checkbox' ? checkbox.attributes('aria-checked') === 'true' : (checkbox.element as HTMLInputElement).checked).toBe(false)
   wrapper.unmount()
 })
 
@@ -70,35 +85,33 @@ it('offers unfinished accounts a path back to email choices', async () => {
   wrapper.unmount()
 })
 
-it('offers one unchecked welcome and allows it without recurring emails', async () => {
+it('offers new accounts only optional recurring emails', async () => {
+  account.value.digest_email = null
   const wrapper = await mountSuspended(OnboardingEmail, { attachTo: document.body, route: '/onboarding/email' })
   const form = wrapper.get('#email-onboarding-form')
-  const choices = form.findAll('input[type="checkbox"]')
-  expect((choices[2]!.element as HTMLInputElement).checked).toBe(false)
-  await choices[0]!.setValue(false)
-  await choices[1]!.setValue(false)
-  await choices[2]!.setValue(true)
+  const choices = form.findAll('[role="checkbox"], input[type="checkbox"]:not([aria-hidden="true"])')
+  expect(choices).toHaveLength(2)
   ;(form.element as HTMLFormElement).requestSubmit()
   await flushPromises()
   expect(mocks.execute).toHaveBeenCalledWith(expect.objectContaining({ path: '/api/me/email' }), {
     digest_email: 'review@example.com',
     email_opt_in: false,
     weekly_opt_in: false,
-    welcome_email: true,
   })
   wrapper.unmount()
 })
 
-it('requires a valid address when only the welcome is selected', async () => {
+it.each([
+  ['weekly', 'Preview the weekly'],
+  ['digest', 'Preview the digest'],
+  ['welcome', 'Preview the welcome'],
+])('opens the %s preview without changing email choices', async (kind, label) => {
   const wrapper = await mountSuspended(OnboardingEmail, { attachTo: document.body, route: '/onboarding/email' })
-  const form = wrapper.get('#email-onboarding-form')
-  await form.get('input[type="email"]').setValue('broken@')
-  for (const [index, checkbox] of form.findAll('input[type="checkbox"]').entries())
-    await checkbox.setValue(index === 2)
-  ;(form.element as HTMLFormElement).requestSubmit()
+  await wrapper.findAll('button').find(button => button.text() === label)!.trigger('click')
   await flushPromises()
+  expect(document.querySelector('iframe')?.getAttribute('title')).toBe(label)
+  expect(document.querySelector('iframe')?.getAttribute('srcdoc')).toBe('<html><head><base target="_blank"></head><body>Example email</body></html>')
   expect(mocks.execute).not.toHaveBeenCalled()
-  expect(form.get('#email-error').text()).toBe('Add an email address, or turn off all email choices.')
   wrapper.unmount()
 })
 
@@ -114,8 +127,8 @@ describe.each(screens)('$name email submission', ({ component, form: selector })
     const { wrapper, form } = await mountForm()
     try {
       await form.get('input[type="email"]').setValue('broken@')
-      for (const checkbox of form.findAll('input[type="checkbox"]'))
-        await checkbox.setValue(false)
+      for (const checkbox of checkboxes(form))
+        await setChecked(checkbox, false)
 
       // Use native submission. A synthetic submit event skips browser validation.
       ;(form.element as HTMLFormElement).requestSubmit()
@@ -139,8 +152,8 @@ describe.each(screens)('$name email submission', ({ component, form: selector })
     const { wrapper, form } = await mountForm()
     try {
       await form.get('input[type="email"]').setValue('broken@')
-      for (const [index, checkbox] of form.findAll('input[type="checkbox"]').entries())
-        await checkbox.setValue(index === enabledChoice)
+      for (const [index, checkbox] of checkboxes(form).entries())
+        await setChecked(checkbox, index === enabledChoice)
 
       ;(form.element as HTMLFormElement).requestSubmit()
       await flushPromises()
diff --git a/test/unit/github-login-intent.nuxt.test.ts b/test/unit/github-login-intent.nuxt.test.ts
index 5a7ff2f4..9e4e6b22 100644
--- a/test/unit/github-login-intent.nuxt.test.ts
+++ b/test/unit/github-login-intent.nuxt.test.ts
@@ -9,12 +9,15 @@ const mocks = vi.hoisted(() => ({
   email: vi.fn(),
   establish: vi.fn(),
   analytics: vi.fn(),
+  welcome: vi.fn(),
 }))
 vi.mock('h3', async importOriginal => ({ ...await importOriginal<typeof import('h3')>(), useSession: mocks.session }))
 vi.mock('../../layers/identity/server/utils/users', () => ({ upsertUserFromGithub: mocks.upsert }))
 vi.mock('../../layers/identity/server/utils/watch-actions', () => ({ handleWatchAction: mocks.replay }))
 vi.mock('../../layers/identity/server/utils/scan-owned-repos', () => ({ scanOwnedRepos: mocks.scan, ownedRepoScanWarning: () => false }))
 vi.mock('../../layers/identity/server/utils/github-emails', () => ({ fetchVerifiedPrimaryEmail: mocks.email }))
+vi.mock('../../layers/identity/server/utils/welcome-email', () => ({ sendWelcomeEmail: mocks.welcome }))
+vi.mock('../../layers/identity/server/utils/skill-validation-email', () => ({ sendSkillValidationSummary: vi.fn().mockResolvedValue('skipped') }))
 
 // Simulate GitHub's callback: it carries code and state, never our query fields.
 describe('gitHub browser login round trip', () => {
@@ -35,14 +38,15 @@ describe('gitHub browser login round trip', () => {
     intent = {}
     failure = false
     providerFailure = false
-    mocks.upsert.mockResolvedValue({ id: 1, github_id: 1, login: 'octocat', onboarded_at: 1 })
+    mocks.upsert.mockResolvedValue({ _tag: 'existing', user: { id: 1, github_id: 1, login: 'octocat', onboarded_at: 1 } })
+    mocks.welcome.mockResolvedValue('accepted')
     mocks.replay.mockResolvedValue(undefined)
     vi.stubGlobal('getQuery', () => query)
     vi.stubGlobal('getCookie', () => undefined)
     vi.stubGlobal('deleteCookie', vi.fn())
     vi.stubGlobal('defineEventHandler', (fn: unknown) => fn)
     vi.stubGlobal('setUserSession', mocks.establish)
-    vi.stubGlobal('useRuntimeConfig', () => ({ session: { password: 'x'.repeat(32) } }))
+    vi.stubGlobal('useRuntimeConfig', () => ({ session: { password: 'x'.repeat(32) }, email: { from: 'agent@example.com' } }))
     vi.stubGlobal('emitOperationalEvent', vi.fn())
     vi.stubGlobal('createWideEvent', vi.fn())
     vi.stubGlobal('sendRedirect', (_event: unknown, target: string) => target)
@@ -69,6 +73,36 @@ describe('gitHub browser login round trip', () => {
     handler = (await import('../../layers/identity/server/routes/auth/github.get')).default as typeof handler
   })
 
+  it('sends the new account welcome without subscribing to recurring emails', async () => {
+    mocks.upsert.mockResolvedValue({ _tag: 'created', user: { id: 1, github_id: 1, login: 'octocat', email: 'octocat@example.com', onboarded_at: null, repo_indexing: 0 } })
+    query = { code: 'github-code', state: 'valid-state' }
+    expect(await handler(event)).toBe('/onboarding/discover')
+    expect(mocks.welcome).toHaveBeenCalledWith(expect.objectContaining({ userId: 1, to: 'octocat@example.com' }))
+    expect(mocks.establish).toHaveBeenCalledWith(event, expect.objectContaining({ user: expect.objectContaining({ id: 1 }) }))
+  })
+
+  it('does not send welcome for a returning account that has not finished onboarding', async () => {
+    mocks.upsert.mockResolvedValue({ _tag: 'existing', user: { id: 1, github_id: 1, login: 'octocat', email: 'octocat@example.com', onboarded_at: null, repo_indexing: 0 } })
+    query = { code: 'github-code', state: 'valid-state' }
+    expect(await handler(event)).toBe('/onboarding/discover')
+    expect(mocks.welcome).not.toHaveBeenCalled()
+  })
+
+  it('keeps signup working when the welcome cannot send', async () => {
+    mocks.upsert.mockResolvedValue({ _tag: 'created', user: { id: 1, github_id: 1, login: 'octocat', email: 'octocat@example.com', onboarded_at: null, repo_indexing: 0 } })
+    mocks.welcome.mockRejectedValue(new Error('Email unavailable'))
+    query = { code: 'github-code', state: 'valid-state' }
+    expect(await handler(event)).toBe('/onboarding/discover')
+    expect(mocks.establish).toHaveBeenCalled()
+  })
+
+  it('does not attempt a welcome when signup has no address', async () => {
+    mocks.upsert.mockResolvedValue({ _tag: 'created', user: { id: 1, github_id: 1, login: 'octocat', email: null, onboarded_at: null, repo_indexing: 0 } })
+    query = { code: 'github-code', state: 'valid-state' }
+    expect(await handler(event)).toBe('/onboarding/discover')
+    expect(mocks.welcome).not.toHaveBeenCalled()
+  })
+
   it('returns to the starting page and replays the pending like', async () => {
     query = { return_to: '/gh/nuxt/ui/motion?from=search#run', action: 'like-skill' }
     await handler(event)
diff --git a/test/unit/github-private-email.nuxt.test.ts b/test/unit/github-private-email.nuxt.test.ts
index 10dd6109..e65ee3f5 100644
--- a/test/unit/github-private-email.nuxt.test.ts
+++ b/test/unit/github-private-email.nuxt.test.ts
@@ -92,14 +92,30 @@ describe('upsertUserFromGithub email', () => {
     await upsertUserFromGithub(event(), { id: 1, login: 'octo', email: 'me@example.com' }, credentials)
     const row = await upsertUserFromGithub(event(), { id: 1, login: 'octo', email: null }, credentials)
 
-    expect(row.email).toBe('me@example.com')
+    expect(row.user.email).toBe('me@example.com')
   })
 
   it('replaces a stored email when GitHub reports a new one', async () => {
     await upsertUserFromGithub(event(), { id: 1, login: 'octo', email: 'old@example.com' }, credentials)
     const row = await upsertUserFromGithub(event(), { id: 1, login: 'octo', email: 'new@example.com' }, credentials)
 
-    expect(row.email).toBe('new@example.com')
+    expect(row.user.email).toBe('new@example.com')
+  })
+
+  it('identifies exactly one new account across concurrent callbacks', async () => {
+    const results = await Promise.all([
+      upsertUserFromGithub(event(), { id: 1, login: 'octo', email: 'me@example.com' }, credentials),
+      upsertUserFromGithub(event(), { id: 1, login: 'octo', email: 'me@example.com' }, credentials),
+    ])
+    expect(results.map(result => result._tag).sort()).toEqual(['created', 'existing'])
+    expect(results[0]!.user.id).toBe(results[1]!.user.id)
+  })
+
+  it('treats a seeded account as existing', async () => {
+    d1.raw.exec('INSERT INTO users (github_id, login, created_at, last_login_at) VALUES (-900001, \'octo\', 1, 1)')
+    const result = await upsertUserFromGithub(event(), { id: 1, login: 'octo', email: 'me@example.com' }, credentials)
+    expect(result._tag).toBe('existing')
+    expect(result.user.github_id).toBe(1)
   })
 
   it('never enrolls a never-consenting user in the weekly list', async () => {
diff --git a/test/unit/github-signup-weekly.test.ts b/test/unit/github-signup-weekly.test.ts
new file mode 100644
index 00000000..a34a133b
--- /dev/null
+++ b/test/unit/github-signup-weekly.test.ts
@@ -0,0 +1,55 @@
+import type { H3Event } from 'h3'
+import type { SqliteD1 } from './helpers/d1-sqlite'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { updateAccountSettings } from '../../layers/identity/server/utils/account-settings'
+import { upsertUserFromGithub } from '../../layers/identity/server/utils/users'
+import { loadWeeklyRecipients } from '../../layers/identity/server/utils/weekly-select'
+import { allMigrations, createSqliteD1 } from './helpers/d1-sqlite'
+
+vi.mock('../../layers/identity/server/utils/crypto', () => ({
+  encryptToken: async () => 'encrypted',
+}))
+vi.mock('#app/nuxt', async importOriginal => ({
+  ...await importOriginal<typeof import('#app/nuxt')>(),
+  useRuntimeConfig: () => ({ tokenKey: 'key' }),
+}))
+
+describe('signup weekly choices', () => {
+  let d1: SqliteD1
+  const credentials = {
+    accessToken: 'token',
+    accessTokenExpiresIn: null,
+    refreshToken: null,
+    refreshTokenExpiresIn: null,
+    clientId: 'client',
+    scopes: ['read:user', 'user:email'],
+  }
+
+  beforeEach(() => {
+    d1 = createSqliteD1(allMigrations())
+  })
+  afterEach(() => {
+    d1.close()
+    vi.unstubAllGlobals()
+  })
+  const profile = { id: 900002, login: 'signup-quiet', email: 'signup@example.com' }
+  function event(): H3Event {
+    return { context: { platform: { db: d1.db } } } as unknown as H3Event
+  }
+
+  it('keeps the weekly off when a new account saves an address before choosing emails', async () => {
+    const result = await upsertUserFromGithub(event(), profile, credentials)
+    await updateAccountSettings(d1.db, result.user.id, { digest_email: 'chosen@example.com' })
+    const recipients = await loadWeeklyRecipients(d1.db)
+    expect(recipients.map(user => user.login)).not.toContain(profile.login)
+    expect(result.user.weekly_opt_out).toBe(1)
+  })
+
+  it('preserves an existing account weekly choice when it signs in again', async () => {
+    d1.raw.exec(`INSERT INTO users (github_id, login, digest_email, weekly_opt_out, created_at, last_login_at)
+      VALUES (900002, 'signup-quiet', 'chosen@example.com', 0, 1, 1)`)
+    const result = await upsertUserFromGithub(event(), profile, credentials)
+    expect(result.user.weekly_opt_out).toBe(0)
+    expect((await loadWeeklyRecipients(d1.db)).map(user => user.login)).toContain(profile.login)
+  })
+})
diff --git a/test/unit/public-digest.test.ts b/test/unit/public-digest.test.ts
index 1a502488..8491a831 100644
--- a/test/unit/public-digest.test.ts
+++ b/test/unit/public-digest.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { loadPublicDigestChanges } from '../../layers/identity/server/utils/public-digest'
+import { loadPublicDigestChanges, publicDigestCommitsSchema, publicDigestUpdatesSchema } from '../../layers/identity/server/utils/public-digest'
 
 describe('public digest example', () => {
   const update = {
@@ -11,12 +11,52 @@ describe('public digest example', () => {
     sha: 'abc',
     changeSummary: 'Add keyboard checks',
   }
-  const skill = { description: 'Review interfaces', sourceUrl: 'https://github.com/example/skills/blob/main/review/SKILL.md', sourceGone: false, sourceCommit: 'def' }
+  const skill = { description: 'Review interfaces', sourceUrl: 'https://github.com/example/skills/blob/main/review/SKILL.md', sourceGone: false, sourceCommit: 'def', updatedAt: new Date(100_000).toISOString() }
+  const commits = { commits: [
+    { sha: 'def', message: 'Fix keyboard focus\nExplain author reasoning', date: new Date(100_000).toISOString(), url: 'https://github.com/example/skills/commit/def' },
+    { sha: 'old', message: 'Old change', date: new Date(80_000).toISOString(), url: 'https://github.com/example/skills/commit/old' },
+    { sha: 'future', message: 'Future change', date: new Date(120_000).toISOString(), url: 'https://github.com/example/skills/commit/future' },
+  ] }
+
+  it('finds grouped repository changes without attributing old sibling Skills to this week', async () => {
+    const calls: string[] = []
+    const result = await loadPublicDigestChanges({
+      windowStart: 90,
+      windowEnd: 110,
+      loadCommits: async () => commits,
+      loadUpdates: async () => publicDigestUpdatesSchema.parse({ items: [{
+        kind: 'repo',
+        owner: 'example',
+        repo: 'skills',
+        occurredAt: 105,
+        changeSummary: 'Only the head Skill changed',
+        skills: [{ name: 'review' }, { name: 'old-sibling' }, { name: 'removed' }],
+      }] }),
+      loadSkill: async (item) => {
+        calls.push(item.name)
+        return { ...skill, updatedAt: new Date((item.name === 'old-sibling' ? 80 : 100) * 1000).toISOString(), sourceGone: item.name === 'removed' }
+      },
+    })
+    expect(calls).toEqual(['review', 'old-sibling', 'removed'])
+    expect(result).toEqual([{
+      owner: 'example',
+      repo: 'skills',
+      name: 'review',
+      slug: 'review',
+      description: skill.description,
+      changeCount: 1,
+      changedAt: 100,
+      commitMessages: ['Fix keyboard focus'],
+      sourceUrl: skill.sourceUrl,
+      changeUrl: 'https://github.com/example/skills/commit/def',
+    }])
+  })
 
   it('shows real source changes without account or trending data', async () => {
     const result = await loadPublicDigestChanges({
       windowStart: 90,
       windowEnd: 110,
+      loadCommits: async () => commits,
       loadUpdates: async () => ({ items: [update] }),
       loadSkill: async () => skill,
     })
@@ -28,7 +68,7 @@ describe('public digest example', () => {
       description: 'Review interfaces',
       changeCount: 1,
       changedAt: 100,
-      commitMessages: ['Add keyboard checks'],
+      commitMessages: ['Fix keyboard focus'],
       sourceUrl: skill.sourceUrl,
       changeUrl: 'https://github.com/example/skills/commit/def',
     }])
@@ -38,10 +78,73 @@ describe('public digest example', () => {
     const result = await loadPublicDigestChanges({
       windowStart: 90,
       windowEnd: 110,
+      loadCommits: async () => ({ commits: [] }),
       loadUpdates: async () => ({ items: [update] }),
       loadSkill: async () => ({ ...skill, sourceCommit: null }),
     })
     expect(result[0]?.changeUrl).toBe('https://github.com/example/skills/commits/main/review/SKILL.md')
+    expect(result[0]?.commitMessages).toEqual([])
+  })
+
+  it('keeps the fallback truthful when file history has no dated author messages', async () => {
+    const result = await loadPublicDigestChanges({
+      windowStart: 90,
+      windowEnd: 110,
+      loadUpdates: async () => ({ items: [update] }),
+      loadSkill: async () => skill,
+      loadCommits: async () => publicDigestCommitsSchema.parse({ commits: [
+        { sha: 'unknown', message: 'No source date', date: '', url: 'https://github.com/example/skills/commit/unknown' },
+        ...commits.commits.filter(commit => commit.sha !== 'def'),
+      ] }),
+    })
+    expect(result[0]?.commitMessages).toEqual([])
+    expect(result[0]?.changedAt).toBe(100)
+    expect(result[0]?.changeUrl).toBe('https://github.com/example/skills/commit/def')
+  })
+
+  it('omits grouped entries without a source change date', async () => {
+    const result = await loadPublicDigestChanges({
+      windowStart: 90,
+      windowEnd: 110,
+      loadCommits: async () => ({ commits: [] }),
+      loadUpdates: async () => publicDigestUpdatesSchema.parse({ items: [{
+        kind: 'repo',
+        owner: 'example',
+        repo: 'skills',
+        occurredAt: 100,
+        skills: [{ name: 'unknown' }],
+      }] }),
+      loadSkill: async () => ({ ...skill, updatedAt: null }),
+    })
+    expect(result).toEqual([])
+  })
+
+  it('bounds detail reads and reads duplicate Skills only once', async () => {
+    const calls: string[] = []
+    const commitCalls: string[] = []
+    const names = ['review', 'review', ...Array.from({ length: 35 }, (_, index) => `skill-${index}`)]
+    const result = await loadPublicDigestChanges({
+      windowStart: 90,
+      windowEnd: 110,
+      loadCommits: async (item) => {
+        commitCalls.push(item.name)
+        return commits
+      },
+      loadUpdates: async () => publicDigestUpdatesSchema.parse({ items: [{
+        kind: 'repo',
+        owner: 'example',
+        repo: 'skills',
+        occurredAt: 100,
+        skills: names.map(name => ({ name })),
+      }] }),
+      loadSkill: async (item) => {
+        calls.push(item.name)
+        return skill
+      },
+    })
+    expect(calls).toEqual(['review', ...Array.from({ length: 29 }, (_, index) => `skill-${index}`)])
+    expect(result.map(item => item.name)).toEqual(['review', 'skill-0', 'skill-1', 'skill-2', 'skill-3'])
+    expect(commitCalls).toEqual(['review', 'skill-0', 'skill-1', 'skill-2', 'skill-3'])
   })
 
   it('omits removed sources and changes outside the example window', async () => {
@@ -49,11 +152,12 @@ describe('public digest example', () => {
     const result = await loadPublicDigestChanges({
       windowStart: 90,
       windowEnd: 110,
+      loadCommits: async () => ({ commits: [] }),
       loadUpdates: async () => ({ items: [
         { ...update, occurredAt: 80 },
         { ...update, occurredAt: 120 },
         update,
-        { kind: 'repo' as const },
+        { kind: 'repo' as const, owner: 'example', repo: 'other', occurredAt: 80, skills: [{ name: 'older' }] },
       ] }),
       loadSkill: async (item) => {
         calls.push(item.name)
diff --git a/test/unit/weekly-email-improvements.test.ts b/test/unit/weekly-email-improvements.test.ts
index 1af804cc..402efe8a 100644
--- a/test/unit/weekly-email-improvements.test.ts
+++ b/test/unit/weekly-email-improvements.test.ts
@@ -46,6 +46,12 @@ function input(): WeeklyRenderInput {
 }
 
 describe('weekly email improvement contract', () => {
+  it('describes the weekly setting without claiming the reader enabled it', () => {
+    const rendered = renderWeekly({ ...input(), edition: 'weekly' })
+    expect(rendered.html).toContain('Your account is set to receive the weekly email.')
+    expect(rendered.html).not.toContain('you enabled the weekly')
+  })
+
   it('removes install commands and cuts on a word boundary', () => {
     const quote = trimQuote(`Useful release. npx skills add competitor/pkg ${'long words '.repeat(30)}`)
 
diff --git a/test/unit/welcome-email.test.ts b/test/unit/welcome-email.test.ts
index 694a6f0d..9e90d35a 100644
--- a/test/unit/welcome-email.test.ts
+++ b/test/unit/welcome-email.test.ts
@@ -7,7 +7,7 @@ import { sendWelcomeEmail } from '../../layers/identity/server/utils/welcome-ema
 import { identityEmailPatchBodySchema } from '../../layers/identity/shared/contracts/account'
 import { allMigrations, createSqliteD1 } from './helpers/d1-sqlite'
 
-describe('one optional welcome email', () => {
+describe('one signup welcome email', () => {
   let d1: SqliteD1
   beforeEach(() => {
     d1 = createSqliteD1(allMigrations())
@@ -16,12 +16,11 @@ describe('one optional welcome email', () => {
   })
   afterEach(() => d1.close())
 
-  function input(consent = true, now = 10, attemptId = 'first') {
+  function input(now = 10, attemptId = 'first') {
     return {
       db: d1.db,
       userId: 900001,
       to: 'account@example.com',
-      consent,
       now,
       attemptId,
       signUnsubscribe: async () => 'signed-token',
@@ -42,13 +41,8 @@ describe('one optional welcome email', () => {
     }))
   })
 
-  it('requires an address when only the welcome email is selected', () => {
-    expect(identityEmailPatchBodySchema.safeParse({ welcome_email: true }).success).toBe(false)
-  })
-
-  it('requires explicit recurring choices and preserves a welcome-only opt-in', async () => {
-    expect(identityEmailPatchBodySchema.safeParse({ digest_email: 'account@example.com', welcome_email: true }).success).toBe(false)
-    const body = identityEmailPatchBodySchema.parse({ digest_email: 'account@example.com', welcome_email: true, weekly_opt_in: false, email_opt_in: false })
+  it('keeps both recurring emails off when saving that choice', async () => {
+    const body = identityEmailPatchBodySchema.parse({ digest_email: 'account@example.com', weekly_opt_in: false, email_opt_in: false })
     const plan = planAccountSettings({ email: 'account@example.com', digest_email: null }, {
       email: body.digest_email,
       weekly: body.weekly_opt_in,
@@ -78,13 +72,13 @@ describe('one optional welcome email', () => {
     expect(deps.send).toHaveBeenCalledTimes(1)
   })
 
-  it('never sends without its own consent', async () => {
-    const deps = input(false)
-    expect(await sendWelcomeEmail(deps)).toBe('skipped')
+  it('never sends without an address', async () => {
+    const deps = input()
+    expect(await sendWelcomeEmail({ ...deps, to: '' })).toBe('skipped')
     expect(deps.send).not.toHaveBeenCalled()
   })
 
-  it('sends once despite concurrent saves and later requests', async () => {
+  it('sends once despite concurrent dispatches and later requests', async () => {
     const deps = input()
     const outcomes = await Promise.all([sendWelcomeEmail(deps), sendWelcomeEmail({ ...deps, attemptId: 'second' })])
     expect(outcomes.sort()).toEqual(['accepted', 'skipped'])
diff --git a/test/unit/welcome-preview.test.ts b/test/unit/welcome-preview.test.ts
new file mode 100644
index 00000000..27b3b8f6
--- /dev/null
+++ b/test/unit/welcome-preview.test.ts
@@ -0,0 +1,21 @@
+import type { EventHandler, H3Event } from 'h3'
+import { afterEach, expect, it, vi } from 'vitest'
+import { WELCOME_EMAIL_COPY } from '../../shared/welcome-email-copy'
+
+afterEach(() => vi.unstubAllGlobals())
+
+it('renders a public welcome preview without account data or a delivery token', async () => {
+  const header = vi.fn()
+  vi.stubGlobal('defineEventHandler', (handler: EventHandler) => handler)
+  vi.stubGlobal('setHeader', header)
+  const handler = (await import('../../layers/identity/server/routes/welcome/preview.get')).default
+  const event = { method: 'GET', context: {} } as H3Event
+  const html = await handler(event)
+  expect(html).toContain(WELCOME_EMAIL_COPY.story)
+  expect(html).toContain('href="https://skilld.dev/me"')
+  expect(html).toContain('Email preferences')
+  expect(html).not.toContain('Stop welcome emails')
+  expect(html).not.toContain('/api/unsubscribe')
+  expect(header).toHaveBeenCalledWith(event, 'x-robots-tag', 'noindex, follow')
+  expect(header).toHaveBeenCalledWith(event, 'content-type', 'text/html; charset=utf-8')
+})