@acms-subir/core 0.3.4 → 0.3.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @acms-subir/core
 
+## 0.3.6
+
+### Patch Changes
+
+- Add an optional dark-mode logo in Design, exposed as `site.logoDark` to theme headers and footers and as `logoDark` in `/api/v1/site` and the typed client. Built-in branding and the reusable `SiteLogo` component select the matching image without color filters, falling back to the regular logo. Preserve the setting through design drafts, publishing, history, backups, and portable exports. Migration v42 adds the optional setting with an empty default for existing sites.
+
+## 0.3.5
+
+### Patch Changes
+
+- Require an old-site address or content ZIP for Ghost exports with relative asset references. Failed copies retain only absolute source URLs; unavailable sources leave empty references and named failures in the import report instead of broken URLs on the new site. Correct the import warnings to describe these outcomes.
+
 ## 0.3.4
 
 ### Patch Changes

package/cli/remote.mjs

@@ -27,7 +27,7 @@ export async function remoteCommand(group,command,args,flags){
   if(group==='design'){
     if(command==='pull'||command==='history'){const state=await api(url,token,'/api/design');if(command==='history')return {versions:state.versions,audit:state.audit};if(flags.output){if(flags['dry-run'])return {dryRun:true,output:resolve(flags.output),revision:state.revision};await atomicJson(resolve(flags.output),{revision:state.revision,patch:state.draft??state.live});return {output:resolve(flags.output),revision:state.revision};}return state;}
     let body;
-    if(command==='push'){if(!flags.draft)fail('USAGE','Use design push --draft; publishing is separate.');const input=await inputJson(flags.file);const source=input.patch??input;const unknown=Object.keys(source).filter(k=>!['activeTheme','designOverrides','sectionPages','siteLogo','siteFavicon','siteCover','navItems','savedAt','shareEpoch','revision'].includes(k));if(unknown.length)fail('USAGE','Unknown draft fields.',unknown);const patch=Object.fromEntries(Object.entries(source).filter(([k])=>['activeTheme','designOverrides','sectionPages','siteLogo','siteFavicon','siteCover','navItems'].includes(k)));body={operation:'stage',revision:Number(flags.revision??input.revision),patch};}
+    if(command==='push'){if(!flags.draft)fail('USAGE','Use design push --draft; publishing is separate.');const input=await inputJson(flags.file);const source=input.patch??input;const unknown=Object.keys(source).filter(k=>!['activeTheme','designOverrides','sectionPages','siteLogo','siteLogoDark','siteFavicon','siteCover','navItems','savedAt','shareEpoch','revision'].includes(k));if(unknown.length)fail('USAGE','Unknown draft fields.',unknown);const patch=Object.fromEntries(Object.entries(source).filter(([k])=>['activeTheme','designOverrides','sectionPages','siteLogo','siteLogoDark','siteFavicon','siteCover','navItems'].includes(k)));body={operation:'stage',revision:Number(flags.revision??input.revision),patch};}
     else if(['publish','discard','share','revoke','rollback'].includes(command))body={operation:command==='rollback'?'restore':command,revision:Number(flags.revision),...(command==='rollback'?{id:args[0]}:{}),...(command==='share'?{days:Number(flags.days??7)}:{})};
     else fail('USAGE','Unknown design command.');
     if(!Number.isInteger(body.revision)||body.revision<0)fail('USAGE','Supply the revision from design pull.');

package/docs/theme-authoring.md

@@ -36,15 +36,18 @@ Public types: ChromeProps (site), HomeProps (settings, page, posts, tags), PageP
 
 Template filenames: `home.astro`, `event.astro`, `header.astro`, `footer.astro`, `post-<name>.astro`, `page-<name>.astro`.
 
-`header.astro` and `footer.astro` replace the site header and footer on every public page. They receive `ChromeProps` — one `site` prop (`SiteChrome`) with everything already resolved for the request: `title`, `tagline`, `logo`, `homeUrl`, `links` (header nav, each `{ label, url, current, external }`, already localized), `footerLinks`, `social` (with inline SVG `icon`), `readLinks`, `footerHtml`, `languages` (`{ code, label, url, current }`, where `label` is the language's own name, e.g. "Español"), `search` (`{ url, label }` or null), `schemeToggle`, `liveHeader`, `headerStyle`, `footerStyle`. Core behaviors attach through data hooks, so keep them on your own elements: `data-search-open` (opens search), `data-scheme-toggle` (light/dark), `data-menu-open` (phone menu sheet, built from `site.links`) and a hidden `data-live-header` link (shown during a live stream).
+`header.astro` and `footer.astro` replace the site header and footer on every public page. They receive `ChromeProps` — one `site` prop (`SiteChrome`) with everything already resolved for the request: `title`, `tagline`, `logo`, `logoDark`, `homeUrl`, `links` (header nav, each `{ label, url, current, external }`, already localized), `footerLinks`, `social` (with inline SVG `icon`), `readLinks`, `footerHtml`, `languages` (`{ code, label, url, current }`, where `label` is the language's own name, e.g. "Español"), `search` (`{ url, label }` or null), `schemeToggle`, `liveHeader`, `headerStyle`, `footerStyle`. Core behaviors attach through data hooks, so keep them on your own elements: `data-search-open` (opens search), `data-scheme-toggle` (light/dark), `data-menu-open` (phone menu sheet, built from `site.links`) and a hidden `data-live-header` link (shown during a live stream).
+
+Owners upload **Logo (dark mode)** beside Logo in Design → Brand and publish it with the design. `site.logoDark` is an empty string when unset; use the regular logo as the fallback. The built-in header/footer and the `SiteLogo` component below switch without image filters, following the site’s forced scheme, visitor toggle, or OS preference. Custom markup can use `html[data-scheme="dark"]` / `html[data-scheme="light"]`, falling back to `prefers-color-scheme` when the attribute is absent. `/api/v1/site` also returns `logoDark` as an absolute URL (or `""` when unset).
 
 ```astro
 ---
 import type { ChromeProps } from '@acms-subir/core/theme';
+import SiteLogo from '@acms-subir/core/theme/components/SiteLogo.astro';
 const { site } = Astro.props as ChromeProps;
 ---
 <header class="gh-head">
-  <a href={site.homeUrl}>{site.logo ? <img src={site.logo} alt={site.title} /> : site.title}</a>
+  <a class="brand" href={site.homeUrl}><SiteLogo title={site.title} logo={site.logo} logoDark={site.logoDark} /></a>
   <nav>{site.links.map((l) => <a href={l.url} aria-current={l.current ? 'page' : undefined}>{l.label}</a>)}</nav>
   {site.languages.map((l) => <a href={l.url} lang={l.code} aria-current={l.current ? 'true' : undefined}>{l.label}</a>)}
   {site.search && <a href={site.search.url} data-search-open>{site.search.label}</a>}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acms-subir/core",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "publishConfig": {
     "access": "public"
   },

package/src/actions/index.ts

@@ -394,6 +394,7 @@ export const server = {
         activeTheme: z.string().optional(),
         designOverrides: z.record(z.any()).optional(),
         siteLogo: z.string().optional(),
+        siteLogoDark: z.string().optional(),
         siteFavicon: z.string().optional(),
         siteCover: z.string().optional(),
         // IANA zone ('' = UTC) and BCP 47 locale ('' = en-US), same rules as Settings → General
@@ -416,6 +417,7 @@ export const server = {
         activeTheme: z.string().optional(),
         designOverrides: z.record(z.any()).optional(),
         siteLogo: z.string().optional(),
+        siteLogoDark: z.string().optional(),
         siteFavicon: z.string().optional(),
         siteCover: z.string().optional(),
       }),

package/src/components/DesignManager.tsx

@@ -137,11 +137,13 @@ export default function DesignManager({ settings, pendingDesign, themes, pairing
     (settings.designOverrides as Record<string, unknown>) ?? {}
   );
   const [siteLogo, setSiteLogo] = useState(settings.siteLogo);
+  const [siteLogoDark, setSiteLogoDark] = useState(settings.siteLogoDark);
   const [siteFavicon, setSiteFavicon] = useState(settings.siteFavicon);
   const [siteCover, setSiteCover] = useState(settings.siteCover);
   const [saveState, setSaveState] = useState<SaveState>('saved');
   const [saveMessage, setSaveMessage] = useState('');
   const [logoPickerOpen, setLogoPickerOpen] = useState(false);
+  const [logoDarkPickerOpen, setLogoDarkPickerOpen] = useState(false);
   const [faviconPickerOpen, setFaviconPickerOpen] = useState(false);
   const [coverPickerOpen, setCoverPickerOpen] = useState(false);
   const [copied, setCopied] = useState(false);
@@ -242,8 +244,8 @@ export default function DesignManager({ settings, pendingDesign, themes, pairing
     return () => ro.disconnect();
   }, []);
   const timer = useRef<ReturnType<typeof setTimeout> | null>(null);
-  const latest = useRef({ activeTheme, overrides, siteLogo, siteFavicon, siteCover });
-  latest.current = { activeTheme, overrides, siteLogo, siteFavicon, siteCover };
+  const latest = useRef({ activeTheme, overrides, siteLogo, siteLogoDark, siteFavicon, siteCover });
+  latest.current = { activeTheme, overrides, siteLogo, siteLogoDark, siteFavicon, siteCover };
 
   const theme = themes.find((t) => t.slug === activeTheme) ?? themes[0];
   const latestChanges = useRef(changes);
@@ -251,11 +253,12 @@ export default function DesignManager({ settings, pendingDesign, themes, pairing
 
   // saves stage into settings.draftDesign — the live site is untouched
   const doSave = async () => {
-    const { activeTheme, overrides, siteLogo, siteFavicon, siteCover } = latest.current;
+    const { activeTheme, overrides, siteLogo, siteLogoDark, siteFavicon, siteCover } = latest.current;
     const { data, error } = await actions.settings.saveDesignDraft({
       activeTheme,
       designOverrides: overrides,
       siteLogo,
+      siteLogoDark,
       siteFavicon,
       siteCover,
     });
@@ -506,6 +509,24 @@ export default function DesignManager({ settings, pendingDesign, themes, pairing
             </div>
           </div>
 
+          <div className="dm-row">
+            <div className="dm-lab">
+              <span>Logo (dark mode)</span>
+              <small>Optional. Uses the regular logo when empty.</small>
+            </div>
+            <div className="dm-ctl">
+              {siteLogoDark && <img className="dm-logo" src={siteLogoDark} alt="Logo (dark mode)" />}
+              <button className="btn sm" type="button" onClick={() => setLogoDarkPickerOpen(true)}>
+                {siteLogoDark ? 'Replace…' : 'Upload…'}
+              </button>
+              {siteLogoDark && (
+                <button className="btn sm ghost" type="button" onClick={() => { setSiteLogoDark(''); scheduleSave(); }}>
+                  Remove
+                </button>
+              )}
+            </div>
+          </div>
+
           <div className="dm-row">
             <div className="dm-lab">
               <span>Favicon</span>
@@ -1021,6 +1042,16 @@ export default function DesignManager({ settings, pendingDesign, themes, pairing
           scheduleSave();
         }}
       />
+      <ImagePicker
+        open={logoDarkPickerOpen}
+        unsplashEnabled={unsplashEnabled}
+        onClose={() => setLogoDarkPickerOpen(false)}
+        onSelect={(img) => {
+          setSiteLogoDark(img.src);
+          setLogoDarkPickerOpen(false);
+          scheduleSave();
+        }}
+      />
       <ImagePicker
         open={faviconPickerOpen}
         unsplashEnabled={unsplashEnabled}

package/src/components/import/ImportExport.tsx

@@ -23,7 +23,7 @@ interface Report {
 const SOURCE_NAMES: Record<string, string> = { ghost: 'Ghost', acms: 'acms', wordpress: 'WordPress', markdown: 'Markdown' };
 const DEFAULTS: ImportOptionsState = { conflict: 'skip', identity: true, nav: true, redirects: true, headCode: false, authors: {} };
 const SETTING_NAMES: Record<string, string> = {
-  siteTitle: 'title', tagline: 'description', siteLogo: 'logo', siteFavicon: 'icon', siteCover: 'cover image',
+  siteTitle: 'title', tagline: 'description', siteLogo: 'logo', siteLogoDark: 'dark-mode logo', siteFavicon: 'icon', siteCover: 'cover image',
   timezone: 'timezone', locale: 'language', headCode: 'head code',
 };
 const settingNames = (keys: string[]) => keys.map((k) => SETTING_NAMES[k] ?? k).join(', ');
@@ -98,7 +98,7 @@ function ImportTab({ onFinished, openHistory }: { onFinished: () => void; openHi
   const key = planKeyFor(options);
   const stale = !!plan && planKey !== key;
   const assetFiles = bundle ? bundle.assets.filter((a) => a.kind !== 'media').length : 0;
-  const needsFiles = isGhost && assetFiles > 0 && !siteUrl.trim() && !contentZip && !source?.zip;
+  const needsFiles = isGhost && !!bundle?.assets.some((a) => !/^https?:\/\//i.test(a.url)) && !siteUrl.trim() && !contentZip && !source?.zip;
   const resumable = source ? readJournal(source.hash) : null;
   const toImport = plan ? plan.counts.posts.create + plan.counts.posts.update + plan.counts.pages.create + plan.counts.pages.update : 0;
 
@@ -198,7 +198,7 @@ function ImportTab({ onFinished, openHistory }: { onFinished: () => void; openHi
                   <span className="btn sm">{contentZip ? 'Change ZIP' : 'Add content folder ZIP'}</span>
                   <span className="hint">{contentZip ? `${contentZip.name} · ${plural(contentZip.zip.names.length, 'file')}` : 'Optional. Used first; the address is the fallback.'}</span>
                 </label>
-                {needsFiles && <p className="imp-mark warn">Without an address or ZIP, images will point at the old site and break when it goes away.</p>}
+                {needsFiles && <p className="imp-mark warn">Enter the old site’s address or add its content folder ZIP before importing. Missing files without a source URL are left empty and listed in the report.</p>}
               </div>
             )}
 
@@ -252,7 +252,7 @@ function ImportTab({ onFinished, openHistory }: { onFinished: () => void; openHi
             <div className="imp-actions">
               <button type="button" className="btn" disabled={!!busy} onClick={check}>{busy === 'plan' ? 'Checking…' : plan ? 'Check again' : 'Check import'}</button>
               {plan && (
-                <button type="button" className="btn primary" disabled={!!busy || stale || toImport === 0} onClick={run} title={stale ? 'Options changed: check again first' : ''}>
+                <button type="button" className="btn primary" disabled={!!busy || stale || needsFiles || toImport === 0} onClick={run} title={stale ? 'Options changed: check again first' : ''}>
                   {busy === 'run' ? 'Importing…' : resumable?.runId ? `Resume import` : `Import ${plural(toImport, 'item')}`}
                 </button>
               )}
@@ -341,7 +341,7 @@ function Done({ report, reset, openHistory }: { report: Report; reset: () => voi
       )}
       {!!report.failedAssets?.length && (
         <>
-          <p className="imp-mark warn">{plural(report.failedAssets.length, 'file')} couldn’t be copied and still point at the old site</p>
+          <p className="imp-mark warn">{plural(report.failedAssets.length, 'file')} couldn’t be copied. Source URLs are kept when available; otherwise the references are left empty.</p>
           <ul className="imp-list">{report.failedAssets.map((f, i) => <li key={i}>{f.url}<small>{f.error}</small></li>)}</ul>
         </>
       )}

package/src/components/import/runner.ts

@@ -101,8 +101,14 @@ export function findInZip(zip: ZipIndex, path: string): string | null {
 }
 
 export function sourceAssetUrl(bundle: ImportBundle, asset: ImportAsset): string {
-  if (/^https?:\/\//.test(asset.url)) return asset.url;
-  return bundle.source.siteUrl ? `${bundle.source.siteUrl.replace(/\/+$/, '')}/${asset.url}` : `/${asset.url}`;
+  // A ZIP path is not a URL on the destination site. Only an absolute
+  // source URL is safe to retain when copying fails.
+  try {
+    const url = /^[a-z][a-z\d+.-]*:/i.test(asset.url)
+      ? new URL(asset.url)
+      : new URL(asset.url.replace(/^\/+/, ''), `${bundle.source.siteUrl.replace(/\/+$/, '')}/`);
+    return ['http:', 'https:'].includes(url.protocol) ? url.href : '';
+  } catch { return ''; }
 }
 
 async function fetchAsset(bundle: ImportBundle, asset: ImportAsset, contentZip: ZipIndex | null): Promise<File> {
@@ -170,6 +176,10 @@ export async function runImport(
   const journal: Journal = readJournal(hash) ?? { runId: '', assets: {}, failed: {}, done: [], authorIds: {} };
   const save = () => writeJournal(hash, journal);
 
+  if (source.kind === 'ghost' && !files && bundle.assets.some((a) => !journal.assets[a.ref] && !sourceAssetUrl(bundle, a))) {
+    throw new Error('This Ghost export references images or files. Enter the old site’s address or add its content folder ZIP before importing.');
+  }
+
   // 1. files → media library
   const assets = bundle.assets.filter((a) => a.kind !== 'media');
   const total = assets.length + bundle.media.length;
@@ -214,6 +224,13 @@ export async function runImport(
 
   const resolved = new Map(Object.entries(journal.assets).map(([ref, r]) => [ref, r]));
   const fallback = new Map(bundle.assets.map((a) => [a.ref, sourceAssetUrl(bundle, a)]));
+  // Video/audio are not copied yet, but missing source URLs still need to
+  // be reported instead of quietly turning into destination-relative URLs.
+  for (const a of bundle.assets.filter((a) => a.kind === 'media')) {
+    if (!resolved.has(a.ref) && !fallback.get(a.ref)) {
+      journal.failed[a.ref] = 'Video/audio cannot be copied yet. Enter the old site’s address to keep its source URL.';
+    } else delete journal.failed[a.ref];
+  }
   const fix = (v: string) => resolveAssets(v, resolved, fallback);
 
   // 2. run + authors + tags; only people with a byline become authors
@@ -261,7 +278,7 @@ export async function runImport(
   const identity = Object.fromEntries(Object.entries(bundle.identity).map(([k, v]) => [k, typeof v === 'string' ? fix(v) : v]));
   const failedAssets = Object.entries(journal.failed).map(([ref, error]) => {
     const a = bundle.assets.find((x) => x.ref === ref);
-    return { url: a ? sourceAssetUrl(bundle, a) : ref.replace(/^m-/, 'media '), error };
+    return { url: a ? sourceAssetUrl(bundle, a) || a.url : ref.replace(/^m-/, 'media '), error };
   });
   const { report } = await api<{ report: Record<string, unknown> }>({
     op: 'finish', runId: journal.runId, options, identity,

package/src/components/site/SiteLogo.astro

@@ -0,0 +1,23 @@
+---
+interface Props {
+  title: string;
+  logo: string;
+  logoDark?: string;
+}
+const { title, logo, logoDark = '' } = Astro.props;
+---
+
+{logo
+  ? <img class:list={['brand-logo', { 'logo-light': !!logoDark }]} src={logo} alt={title} />
+  : <span class:list={['brand-name', { 'logo-light': !!logoDark }]}>{title}</span>}
+{logoDark && <img class="brand-logo logo-dark" src={logoDark} alt={title} />}
+
+<style>
+  .logo-dark { display: none; }
+  :global(:root[data-scheme='dark']) .logo-light { display: none; }
+  :global(:root[data-scheme='dark']) .logo-dark { display: block; }
+  @media (prefers-color-scheme: dark) {
+    :global(:root:not([data-scheme='light'])) .logo-light { display: none; }
+    :global(:root:not([data-scheme='light'])) .logo-dark { display: block; }
+  }
+</style>

package/src/layouts/Site.astro

@@ -15,6 +15,7 @@ import { getTheme } from '../lib/theme';
 import { analyticsHead, analyticsBody } from '../lib/analytics';
 import { socialIconPath, socialIconSvg } from '../lib/socialIcons';
 import type { SiteChrome } from '../lib/site-chrome';
+import SiteLogo from '../components/site/SiteLogo.astro';
 import '../styles/site.css';
 import '../styles/cards.css';
 import '../styles/live.css';
@@ -144,7 +145,7 @@ const langName = (l: string) => {
 };
 const chromeLink = (n: { label: string; url: string }) => ({ label: n.label, url: lnk(n.url), current: isCurrent(lnk(n.url)), external: isExternal(n.url) });
 const chrome: SiteChrome = {
-  title: settings.siteTitle, tagline: settings.tagline, logo: settings.siteLogo,
+  title: settings.siteTitle, tagline: settings.tagline, logo: settings.siteLogo, logoDark: settings.siteLogoDark,
   homeUrl: reqLocale ? localeHomeUrl(reqLocale) : '/',
   links: headerLinks.map(chromeLink),
   footerLinks: footerNav.map(chromeLink),
@@ -186,7 +187,7 @@ const homeJsonLd =
 ---
 
 <!doctype html>
-<html lang={htmlLang}>
+<html lang={htmlLang} data-scheme={tokens.scheme === 'auto' ? undefined : tokens.scheme}>
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -276,7 +277,7 @@ const homeJsonLd =
       <header class="site-header" data-style={tokens.header}>
         <div class="site-header-in">
           <a class="brand" href={reqLocale ? localeHomeUrl(reqLocale) : '/'}>
-            {settings.siteLogo ? <img class="brand-logo" src={settings.siteLogo} alt={settings.siteTitle} /> : <span class="brand-name">{settings.siteTitle}</span>}
+            <SiteLogo title={settings.siteTitle} logo={settings.siteLogo} logoDark={settings.siteLogoDark} />
           </a>
           <nav class="site-nav" aria-label="Main">
             {headerLinks.map((n) => (
@@ -677,7 +678,7 @@ const homeJsonLd =
           {tokens.footer === 'columns' ? (
             <div class="footer-cols">
               <div class="footer-brand">
-                <a class="brand" href="/">{settings.siteLogo ? <img class="brand-logo" src={settings.siteLogo} alt={settings.siteTitle} /> : <span class="brand-name">{settings.siteTitle}</span>}</a>
+                <a class="brand" href="/"><SiteLogo title={settings.siteTitle} logo={settings.siteLogo} logoDark={settings.siteLogoDark} /></a>
                 {settings.tagline && <p class="footer-blurb">{settings.tagline}</p>}
                 {socialNav.length > 0 && (
                   <nav class="social-nav" aria-label="Social">

package/src/lib/design-service.ts

@@ -15,7 +15,7 @@ import { ThemeTokens } from '../theme-sdk/contract.mjs';
 export const DESIGN_SCOPES = ['design:read', 'design:write-draft', 'design:publish', 'media:read', 'media:write'] as const;
 export const DesignPatch = z.object({
   activeTheme: z.string().max(50).optional(), designOverrides: z.record(z.union([z.string().max(2000), z.number().finite()])).optional(),
-  siteLogo: z.string().max(2000).optional(), siteFavicon: z.string().max(2000).optional(), siteCover: z.string().max(2000).optional(),
+  siteLogo: z.string().max(2000).optional(), siteLogoDark: z.string().max(2000).optional(), siteFavicon: z.string().max(2000).optional(), siteCover: z.string().max(2000).optional(),
   sectionPages: SectionPages.optional(),
   navItems: z.array(z.object({ id:z.string().max(100),label:z.string().max(200),url:z.string().max(2000),area:z.enum(['header','footer','social']) }).strict()).max(200).optional(),
 }).strict();
@@ -93,7 +93,7 @@ export function validateDesignValues(patch: z.infer<typeof DesignPatch>) {
     if(key==='homeMode'&&!['auto','content',''].includes(String(value)))throw new ApiError(400,'Invalid home mode.');
     if (typeof value === 'string' && /[;{}<>]|url\s*\(|@import/i.test(value)) throw new ApiError(400,'Design overrides accept token values, not CSS or HTML.');
   }
-  for (const value of [patch.siteLogo,patch.siteFavicon,patch.siteCover,...(patch.navItems??[]).map(n=>n.url)]) {
+  for (const value of [patch.siteLogo,patch.siteLogoDark,patch.siteFavicon,patch.siteCover,...(patch.navItems??[]).map(n=>n.url)]) {
     if(value && !/^(https?:\/\/|mailto:|tel:|\/(?!\/)|#)/i.test(value.trim())) throw new ApiError(400,'Use an HTTP(S) or site-relative URL.');
   }
 }

package/src/lib/designDiff.ts

@@ -39,7 +39,7 @@ const VALUE_LABELS: Record<string, string> = {
   content: 'Content page',
 };
 
-const IMAGE_LABELS: Record<string, string> = { siteLogo: 'Logo', siteFavicon: 'Favicon', siteCover: 'Share image' };
+const IMAGE_LABELS: Record<string, string> = { siteLogo: 'Logo', siteLogoDark: 'Logo (dark mode)', siteFavicon: 'Favicon', siteCover: 'Share image' };
 const AREA_LABELS: Record<NavItem['area'], string> = { header: 'Header menu', footer: 'Footer menu', social: 'Social links' };
 
 const show = (v: unknown, key?: string): string => {
@@ -97,7 +97,7 @@ export function diffDesign(
     }
   }
 
-  for (const k of ['siteLogo', 'siteFavicon', 'siteCover'] as const) {
+  for (const k of ['siteLogo', 'siteLogoDark', 'siteFavicon', 'siteCover'] as const) {
     if (staged[k] !== undefined && staged[k] !== live[k]) {
       out.push({ key: k, label: IMAGE_LABELS[k], kind: 'image', from: live[k] || '', to: staged[k] || '' });
     }

package/src/lib/drafts.ts

@@ -79,7 +79,7 @@ export function draftSavedAt(doc: Pick<Post | Page | CalEvent, 'draft'>): number
 // ordered navigation list (navItems) — menus stage with the design so one
 // Publish changes the whole look at once — and the share-link epoch.
 export const DESIGN_DRAFT_KEYS = [
-  'activeTheme', 'designOverrides', 'siteLogo', 'siteFavicon', 'siteCover', 'sectionPages',
+  'activeTheme', 'designOverrides', 'siteLogo', 'siteLogoDark', 'siteFavicon', 'siteCover', 'sectionPages',
 ] as const;
 
 type DesignDraftKey = (typeof DESIGN_DRAFT_KEYS)[number];
@@ -124,6 +124,7 @@ export function designSnapshot(settings: Settings, navItems: NavItem[]): Record<
     designOverrides: settings.designOverrides,
     sectionPages: settings.sectionPages,
     siteLogo: settings.siteLogo,
+    siteLogoDark: settings.siteLogoDark,
     siteFavicon: settings.siteFavicon,
     siteCover: settings.siteCover,
     navItems: navItems.map(({ id, label, url, area }) => ({ id, label, url, area })),

package/src/lib/import/bundle.ts

@@ -100,6 +100,7 @@ export const ImportIdentity = z.object({
   siteTitle: z.string().max(200).optional(),
   tagline: z.string().max(1000).optional(),
   siteLogo: z.string().max(2000).optional(),
+  siteLogoDark: z.string().max(2000).optional(),
   siteFavicon: z.string().max(2000).optional(),
   siteCover: z.string().max(2000).optional(),
   timezone: z.string().max(100).optional(),
@@ -146,7 +147,8 @@ export const assetPlaceholder = (ref: string) => `${ASSET_SCHEME}${ref}`;
 // Swap every acms-asset:<ref> for its re-hosted URL. <img> tags built by the
 // importers carry only src/alt/width/height, so images that gained responsive
 // variants get srcset/sizes added here. Unresolved refs (a failed download)
-// fall back to the original URL, which is reported separately.
+// fall back to an absolute source URL, or an empty string if none is known.
+// Copy failures are reported separately by the runner.
 export interface ResolvedAsset { url: string; srcset?: string; sizes?: string }
 const PLACEHOLDER_RE = /acms-asset:([a-z0-9-]{1,40})/g;
 export function resolveAssets(value: string, resolved: Map<string, ResolvedAsset>, fallback: Map<string, string>): string {

package/src/lib/import/export.ts

@@ -19,7 +19,7 @@ export async function exportBundle(repo: ContentRepository, now = Date.now()): P
     version: BUNDLE_VERSION,
     source: { kind: 'acms', version: '', title: settings.siteTitle, siteUrl: settings.siteUrl, exportedAt: new Date(now).toISOString() },
     identity: {
-      siteTitle: settings.siteTitle, tagline: settings.tagline, siteLogo: settings.siteLogo, siteFavicon: settings.siteFavicon,
+      siteTitle: settings.siteTitle, tagline: settings.tagline, siteLogo: settings.siteLogo, siteLogoDark: settings.siteLogoDark, siteFavicon: settings.siteFavicon,
       siteCover: settings.siteCover, timezone: settings.timezone, locale: settings.locale, headCode: settings.headCode,
     },
     // only people with bylines travel; staff accounts stay on this site

package/src/lib/mobile/schemas.ts

@@ -6,7 +6,7 @@ const date = str.datetime(), locale = str.nullable();
 export const Pagination = z.object({ page: z.number().int(), limit: z.number().int(), nextPage: z.number().int().nullable() });
 const Palette = z.object({ bg: str, ink: str, muted: str, line: str, accent: str, panel: str, soft: str });
 export const Site = z.object({
-  name: str, description: str, logo: str, icon: str, menu: z.array(z.object({ label: str, href: str })),
+  name: str, description: str, logo: str, logoDark: str, icon: str, menu: z.array(z.object({ label: str, href: str })),
   languages: z.object({ default: locale, locales: z.array(z.object({ code: str, name: str })) }),
   features: z.object({ blog: z.array(z.object({ key: str, name: str, url: str })), calendar: bool, bookings: bool, search: bool }), apiVersion: z.literal(1),
 });

package/src/lib/mobile/site.ts

@@ -23,7 +23,7 @@ export async function getSite(repo: ContentRepository, url: URL) {
   ];
   return {
     name: settings.siteTitle, description: settings.tagline,
-    logo: safeUrl(settings.siteLogo, origin), icon: safeUrl(settings.siteFavicon, origin),
+    logo: safeUrl(settings.siteLogo, origin), logoDark: safeUrl(settings.siteLogoDark, origin), icon: safeUrl(settings.siteFavicon, origin),
     menu: menu.map(n => ({ label: n.label, href: safeUrl(n.url, origin, true) })),
     languages: { default: I18N.defaultLocale || null, locales: I18N.locales.map(code => ({ code, name: localeName(code, true) })) },
     features: { blog: Object.entries(CONTENT.collections).map(([key, c]) => ({ key, name: c.plural, url: safeUrl(c.base, origin) })), calendar: CALENDAR.enabled, bookings: bookingsEnabled(), search: SEARCH.enabled },

package/src/lib/repo/migrations.ts

@@ -515,6 +515,9 @@ export const MIGRATIONS: Migration[] = [
   EDITOR_GRACE_MIGRATION,
   CALENDAR_SETTINGS_MIGRATION,
   ROOM_HOLD_MIGRATION,
+  { version: 42, statements: [
+    `ALTER TABLE settings ADD COLUMN site_logo_dark TEXT NOT NULL DEFAULT ''`,
+  ] },
 ];
 
 export const LATEST_VERSION = MIGRATIONS[MIGRATIONS.length - 1].version;

package/src/lib/repo/sql.ts

@@ -1839,6 +1839,7 @@ export class SqlRepository implements ContentRepository {
       activeTheme: r?.active_theme ?? '', designOverrides: JSON.parse(String(r?.design_overrides ?? '{}')),
       sectionPages: JSON.parse(String(r?.section_pages ?? '{}')), designRevision: Number(r?.design_revision ?? 0),
       siteLogo: r?.site_logo ?? '',
+      siteLogoDark: r?.site_logo_dark ?? '',
       siteUrl: r?.site_url ?? '', siteFavicon: r?.site_favicon ?? '', siteCover: r?.site_cover ?? '',
       announcement: JSON.parse(String(r?.announcement ?? '{}')),
       analytics: JSON.parse(String(r?.analytics ?? '{}')),
@@ -1862,14 +1863,14 @@ export class SqlRepository implements ContentRepository {
   private settingsStatement(data: Partial<Settings>): SqlStatement | undefined {
     const columns: Record<string, string> = {
       siteTitle:'site_title', tagline:'tagline', footerText:'footer_text', linksName:'links_name', linksBio:'links_bio', linksAvatar:'links_avatar',
-      activeTheme:'active_theme', designOverrides:'design_overrides', sectionPages:'section_pages', siteLogo:'site_logo', siteUrl:'site_url', siteFavicon:'site_favicon', siteCover:'site_cover',
+      activeTheme:'active_theme', designOverrides:'design_overrides', sectionPages:'section_pages', siteLogo:'site_logo', siteLogoDark:'site_logo_dark', siteUrl:'site_url', siteFavicon:'site_favicon', siteCover:'site_cover',
       announcement:'announcement', analytics:'analytics', headCode:'head_code', footerCode:'footer_code', timezone:'timezone', locale:'locale',
       draftsApiKey:'drafts_api_key', draftsAllowedOrigins:'drafts_allowed_origins', draftDesign:'draft_design', ai:'ai', agent:'agent', live:'live', push:'push', calendar:'calendar',
     };
     const jsonKeys = new Set(['designOverrides','sectionPages','announcement','analytics','draftsAllowedOrigins','draftDesign','ai','agent','live','push','calendar']);
     const entries = Object.entries(data).filter(([k,v]) => columns[k] && v !== undefined);
     if (!entries.length) return;
-    const design = entries.some(([k]) => ['activeTheme','designOverrides','sectionPages','siteLogo','siteFavicon','siteCover','draftDesign'].includes(k));
+    const design = entries.some(([k]) => ['activeTheme','designOverrides','sectionPages','siteLogo','siteLogoDark','siteFavicon','siteCover','draftDesign'].includes(k));
     return { sql: `UPDATE settings SET ${entries.map(([k]) => `${columns[k]} = ?`).join(', ')}${design ? ', design_revision = design_revision + 1' : ''} WHERE id = 1`,
       args: entries.map(([k,v]) => jsonKeys.has(k) && v !== null ? JSON.stringify(v) : v) };
   }
@@ -1919,8 +1920,8 @@ export class SqlRepository implements ContentRepository {
     const statements: SqlStatement[] = [
       { sql: 'INSERT INTO design_versions (id,created_at,author,summary,snapshot) VALUES (?,?,?,?,?)', args: [crypto.randomUUID(), Date.now(), opts.author ?? '', opts.summary ?? '', JSON.stringify(designSnapshot(current, liveNav))] },
       { sql: 'DELETE FROM design_versions WHERE id NOT IN (SELECT id FROM design_versions ORDER BY created_at DESC LIMIT 20)' },
-      { sql: 'UPDATE settings SET active_theme=?,design_overrides=?,section_pages=?,site_logo=?,site_favicon=?,site_cover=?,draft_design=NULL WHERE id=1',
-        args: [design.activeTheme, JSON.stringify(design.designOverrides), JSON.stringify(design.sectionPages), design.siteLogo, design.siteFavicon, design.siteCover] },
+      { sql: 'UPDATE settings SET active_theme=?,design_overrides=?,section_pages=?,site_logo=?,site_logo_dark=?,site_favicon=?,site_cover=?,draft_design=NULL WHERE id=1',
+        args: [design.activeTheme, JSON.stringify(design.designOverrides), JSON.stringify(design.sectionPages), design.siteLogo, design.siteLogoDark, design.siteFavicon, design.siteCover] },
     ];
     if (nav) statements.push({ sql: 'DELETE FROM nav_items' }, ...nav.map((n,i) => ({
       sql: 'INSERT INTO nav_items (id,label,url,area,ord) VALUES (?,?,?,?,?)', args: [n.id.startsWith('tmp-') ? crypto.randomUUID() : n.id,n.label,n.url,n.area,i],

package/src/lib/repo/types.ts

@@ -292,7 +292,7 @@ export interface ContentRepository {
   updateSettings(data: Partial<Settings>): Promise<void>;
   // Design-screen staging: save stages into settings.draftDesign, apply
   // copies staged → live design fields and clears, discard just clears
-  saveDesignDraft(data: Partial<Pick<Settings, 'activeTheme' | 'designOverrides' | 'siteLogo' | 'siteFavicon' | 'siteCover' | 'sectionPages'>> & {
+  saveDesignDraft(data: Partial<Pick<Settings, 'activeTheme' | 'designOverrides' | 'siteLogo' | 'siteLogoDark' | 'siteFavicon' | 'siteCover' | 'sectionPages'>> & {
     navItems?: { id: string; label: string; url: string; area: NavItem['area'] }[];
     shareEpoch?: string;
   }): Promise<void>;

package/src/lib/schema.ts

@@ -650,6 +650,7 @@ export const Settings = z.object({
   sectionPages: SectionPages.default({}),
   designRevision: z.number().int().nonnegative().default(0),
   siteLogo: z.string().default(''),
+  siteLogoDark: z.string().default(''),
   // SEO foundation: canonical origin for absolute URLs (sitemap, feeds, OG
   // tags — empty falls back to the request origin), favicon, and the default
   // social-share image used when a post has no cover

package/src/lib/site-chrome.ts

@@ -19,6 +19,7 @@ export interface SiteChrome {
   title: string;
   tagline: string;
   logo: string; // '' when the site has no logo
+  logoDark: string; // '' when unset; themes can fall back to logo
   homeUrl: string;
   links: ChromeLink[]; // header navigation
   footerLinks: ChromeLink[];