@jant/core 0.6.12 → 0.6.13

package/src/lib/__tests__/view.test.ts

@@ -723,7 +723,6 @@ describe("toNavItemView", () => {
     const view = toNavItemView(
       makeNavItem({ url: "https://example.com/about" }),
       "/about",
-      "latest",
       false,
       "",
       undefined,
@@ -738,7 +737,6 @@ describe("toNavItemView", () => {
     const view = toNavItemView(
       makeNavItem({ url: "https://other.com/about" }),
       "/about",
-      "latest",
       false,
       "",
       undefined,
@@ -755,7 +753,6 @@ describe("toNavItemView", () => {
     const view = toNavItemView(
       makeNavItem({ url: "https://jant.example/about" }),
       "/about",
-      "latest",
       false,
       "",
       undefined,
@@ -770,7 +767,6 @@ describe("toNavItemView", () => {
     const view = toNavItemView(
       makeNavItem({ url: "https://example.com/blog/about" }),
       "/blog/about",
-      "latest",
       false,
       "/blog",
       undefined,
@@ -799,7 +795,6 @@ describe("toNavItemView", () => {
         url: "/settings",
       }),
       "/signin",
-      "latest",
       false,
     );
 
@@ -817,7 +812,6 @@ describe("toNavItemView", () => {
         url: "/settings",
       }),
       "/settings",
-      "latest",
       true,
     );
 
@@ -826,7 +820,7 @@ describe("toNavItemView", () => {
     expect(view.isActive).toBe(true);
   });
 
-  it("resolves the latest built-in item to / when it is the home default", () => {
+  it("resolves the latest built-in item to /", () => {
     const view = toNavItemView(
       makeNavItem({
         type: "system",
@@ -835,30 +829,13 @@ describe("toNavItemView", () => {
         url: "/latest",
       }),
       "/",
-      "latest",
     );
 
     expect(view.url).toBe("/");
     expect(view.isActive).toBe(true);
   });
 
-  it("keeps the latest built-in item on /latest when featured owns the homepage", () => {
-    const view = toNavItemView(
-      makeNavItem({
-        type: "system",
-        systemKey: "latest",
-        label: "Latest",
-        url: "/latest",
-      }),
-      "/latest",
-      "featured",
-    );
-
-    expect(view.url).toBe("/latest");
-    expect(view.isActive).toBe(true);
-  });
-
-  it("resolves the featured built-in item to / when it is the home default", () => {
+  it("resolves the featured built-in item to /featured", () => {
     const view = toNavItemView(
       makeNavItem({
         type: "system",
@@ -866,11 +843,10 @@ describe("toNavItemView", () => {
         label: "Featured",
         url: "/featured",
       }),
-      "/",
-      "featured",
+      "/featured",
     );
 
-    expect(view.url).toBe("/");
+    expect(view.url).toBe("/featured");
     expect(view.isActive).toBe(true);
   });
 
@@ -903,9 +879,9 @@ describe("toNavItemViews", () => {
       makeNavItem({ id: UUID_NAV_2, url: "/archive" }),
       makeNavItem({ id: UUID_NAV_3, url: "https://github.com" }),
     ];
-    const views = toNavItemViews(items, "/archive", "featured");
+    const views = toNavItemViews(items, "/archive");
     expect(views).toHaveLength(3);
-    expect(views[0]?.url).toBe("/latest");
+    expect(views[0]?.url).toBe("/");
     expect(views[0]).toHaveProperty("isActive", false);
     expect(views[1]).toHaveProperty("isActive", true);
     expect(views[2]).toHaveProperty("isExternal", true);

package/src/lib/github-sync-site-config.ts

@@ -14,7 +14,6 @@
 
 import type { SiteConfig } from "../services/export.js";
 import type { AppVariables } from "../types/app-context.js";
-import { getHomeDefaultViewFromNavItems } from "./navigation.js";
 
 export async function buildSyncSiteConfig(c: {
   var: Pick<
@@ -31,7 +30,6 @@ export async function buildSyncSiteConfig(c: {
     siteDescription: appConfig.siteDescription,
     siteLanguage: appConfig.siteLanguage,
     showJantBrandingOnHome: appConfig.showJantBrandingOnHome,
-    homeDefaultView: getHomeDefaultViewFromNavItems(navItems),
     mainRssFeed: appConfig.mainRssFeed,
     siteFooter: appConfig.siteFooter,
     showHeaderAvatar: appConfig.showHeaderAvatar,

package/src/lib/hugo-markdown.ts

@@ -118,7 +118,7 @@ export interface HugoFrontMatter {
   collections?: HugoCollectionRef[];
   media?: JantMedia[];
 
-  // Escape hatch for page-type-specific keys (home default view, etc.)
+  // Escape hatch for page-specific export metadata.
   [key: string]: unknown;
 }
 

package/src/lib/navigation.ts

@@ -5,7 +5,7 @@
  */
 
 import type { Context } from "hono";
-import type { Collection, FeedKind, NavItem, NavItemView } from "../types.js";
+import type { Collection, NavItem, NavItemView } from "../types.js";
 import { toNavItemViews } from "./view.js";
 import { render as renderMarkdown, toPlainText } from "./markdown.js";
 
@@ -23,24 +23,11 @@ export interface NavigationData {
   siteDescriptionHtml?: string;
   isAuthenticated: boolean;
   collections: Collection[];
-  homeDefaultView: FeedKind;
   siteAvatarUrl?: string;
   showHeaderAvatar?: boolean;
   siteFooterHtml?: string;
 }
 
-export function getHomeDefaultViewFromNavItems(
-  items: Pick<NavItem, "type" | "systemKey">[],
-): FeedKind {
-  const homeFeedItem = items.find(
-    (item) =>
-      item.type === "system" &&
-      (item.systemKey === "latest" || item.systemKey === "featured"),
-  );
-
-  return homeFeedItem?.systemKey === "featured" ? "featured" : "latest";
-}
-
 /**
  * Fetch navigation data for public pages.
  *
@@ -62,18 +49,16 @@ export function getHomeDefaultViewFromNavItems(
  */
 export async function getNavigationData(
   c: Context,
-  options?: { preloadedItems?: NavItem[] },
+  options?: { preloadedItems?: NavItem[]; includeCollections?: boolean },
 ): Promise<NavigationData> {
-  // Callers that already fetched nav items (e.g. home route, which needs
-  // `homeDefaultView` before deciding which timeline to assemble) can pass
-  // them in to avoid a redundant DB round-trip.
+  // Callers that already fetched nav items can pass them in to avoid a
+  // redundant DB round-trip.
   const items =
     options?.preloadedItems ?? (await c.var.services.navItems.list());
   const currentPath = c.var.publicPath;
   const appConfig = c.var.appConfig;
 
   const siteName = appConfig.siteName;
-  const homeDefaultView = getHomeDefaultViewFromNavItems(items);
   const siteFooter = appConfig.siteFooter;
 
   // Only include description if explicitly set (DB or env), not the default
@@ -112,7 +97,6 @@ export async function getNavigationData(
   const links = toNavItemViews(
     items,
     currentPath,
-    homeDefaultView,
     isAuthenticated,
     appConfig.sitePathPrefix,
     collectionFreshness,
@@ -120,7 +104,7 @@ export async function getNavigationData(
   );
 
   // Only load collections when authenticated (for compose dialog)
-  if (isAuthenticated) {
+  if (isAuthenticated && options?.includeCollections !== false) {
     collections = await c.var.services.collections.listByRecentActivity();
   }
 
@@ -133,7 +117,6 @@ export async function getNavigationData(
     siteDescriptionHtml,
     isAuthenticated,
     collections,
-    homeDefaultView,
     siteAvatarUrl,
     showHeaderAvatar: showHeaderAvatar && !!siteAvatarUrl,
     siteFooterHtml,

package/src/lib/resolve-config.ts

@@ -12,6 +12,7 @@
 import type { Bindings } from "../types/bindings.js";
 import type { AppConfig } from "../types/config.js";
 import { CONFIG_FIELDS } from "../types/config.js";
+import type { FeedKind } from "../types/constants.js";
 import { ASSET_BASE_SEGMENT, getPublicAssetBasePath } from "./asset-path.js";
 import {
   getAuthSecret,
@@ -77,6 +78,10 @@ function parseConfigInt(value: string, fallback: number): number {
   return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
 }
 
+function parseFeedKind(value: string, fallback: FeedKind): FeedKind {
+  return value === "latest" || value === "featured" ? value : fallback;
+}
+
 /**
  * Build a complete AppConfig from environment bindings and DB settings.
  *
@@ -144,8 +149,10 @@ export function resolveConfig(
     siteLanguage: resolve("SITE_LANGUAGE", allSettings, env),
     dashboardLanguage: resolve("DASHBOARD_LANGUAGE", allSettings, env),
     cjkSerifFont: resolve("CJK_SERIF_FONT", allSettings, env),
-    homeDefaultView: resolve("HOME_DEFAULT_VIEW", allSettings, env),
-    mainRssFeed: resolve("MAIN_RSS_FEED", allSettings, env),
+    mainRssFeed: parseFeedKind(
+      resolve("MAIN_RSS_FEED", allSettings, env),
+      "featured",
+    ),
     timeZone: normalizeTimeZone(resolve("TIME_ZONE", allSettings, env)),
     siteFooter: resolve("SITE_FOOTER", allSettings, env),
     showJantBrandingOnHome:

package/src/lib/site-header-fragment.tsx

@@ -0,0 +1,37 @@
+import type { Context } from "hono";
+import type { Bindings } from "../types.js";
+import type { AppVariables } from "../types/app-context.js";
+import { I18nProvider } from "../i18n/context.js";
+import { getNavigationData } from "./navigation.js";
+import { SiteHeader } from "../ui/layouts/SiteLayout.js";
+
+type Env = { Bindings: Bindings; Variables: AppVariables };
+
+/**
+ * Render the current public site header as a replaceable HTML fragment.
+ *
+ * @param c - Current Hono request context
+ * @returns Server-rendered header, drawer backdrop, and mobile drawer HTML
+ *
+ * @example
+ * ```typescript
+ * const headerHtml = await renderSiteHeaderHtml(c);
+ * return c.json({ headerHtml });
+ * ```
+ */
+export async function renderSiteHeaderHtml(c: Context<Env>): Promise<string> {
+  const navData = await getNavigationData(c, { includeCollections: false });
+
+  return String(
+    <I18nProvider c={c}>
+      <SiteHeader
+        siteName={navData.siteName}
+        links={navData.links}
+        currentPath={navData.currentPath}
+        sitePathPrefix={navData.sitePathPrefix}
+        siteAvatarUrl={navData.siteAvatarUrl}
+        showHeaderAvatar={navData.showHeaderAvatar}
+      />
+    </I18nProvider>,
+  );
+}

package/src/lib/view.ts

@@ -23,7 +23,6 @@ import type {
   NavItemType,
   NavItemPlacement,
   AppConfig,
-  FeedKind,
   SystemNavKey,
 } from "../types.js";
 import { SYSTEM_NAV_KEYS } from "../types/constants.js";
@@ -474,7 +473,6 @@ export function toPostViewsFromPosts(
 export function toNavItemView(
   item: NavItem,
   currentPath: string,
-  homeDefaultView: FeedKind = "latest",
   isAuthenticated = false,
   sitePathPrefix = "",
   collectionFreshness?: Map<string, number>,
@@ -491,13 +489,12 @@ export function toNavItemView(
       url = config.url;
     }
 
-    // Special overrides for conditional system URLs
     if (item.systemKey === "latest") {
-      url = homeDefaultView === "latest" ? "/" : "/latest";
+      url = "/";
     }
 
     if (item.systemKey === "featured") {
-      url = homeDefaultView === "featured" ? "/" : "/featured";
+      url = "/featured";
     }
 
     if (item.systemKey === "settings") {
@@ -557,7 +554,6 @@ export function toNavItemView(
 export function toNavItemViews(
   items: NavItem[],
   currentPath: string,
-  homeDefaultView: FeedKind = "latest",
   isAuthenticated = false,
   sitePathPrefix = "",
   collectionFreshness?: Map<string, number>,
@@ -567,7 +563,6 @@ export function toNavItemViews(
     toNavItemView(
       item,
       currentPath,
-      homeDefaultView,
       isAuthenticated,
       sitePathPrefix,
       collectionFreshness,

package/src/node/__tests__/cli-site-snapshot.test.ts

@@ -32,32 +32,41 @@ const REMAPPED_MEDIA_KEY = `media/${REMAPPED_TARGET_SITE_ID}/files/${SNAPSHOT_ME
 const REMAPPED_POSTER_KEY = `media/${REMAPPED_TARGET_SITE_ID}/posters/${SNAPSHOT_MEDIA_ID}.webp`;
 const REMAPPED_AVATAR_KEY = `media/${REMAPPED_TARGET_SITE_ID}/assets/avatar/${SNAPSHOT_AVATAR_MEDIA_ID}.png`;
 const REMAPPED_APPLE_TOUCH_KEY = `media/${REMAPPED_TARGET_SITE_ID}/assets/favicon/apple-touch-icon.png`;
+const NODE_CLI_ENV_KEYS = [
+  "DATABASE_URL",
+  "DATA_DIR",
+  "LOCAL_STORAGE_PATH",
+  "STORAGE_DRIVER",
+  "S3_ENDPOINT",
+  "S3_BUCKET",
+  "S3_REGION",
+  "S3_PUBLIC_URL",
+  "S3_ACCESS_KEY_ID",
+  "S3_SECRET_ACCESS_KEY",
+  "SITE_RESOLUTION_MODE",
+] as const;
+
+function useLocalSnapshotRuntime(databaseUrl: string, storagePath: string) {
+  delete process.env.DATA_DIR;
+  process.env.DATABASE_URL = databaseUrl;
+  process.env.LOCAL_STORAGE_PATH = storagePath;
+  process.env.STORAGE_DRIVER = "local";
+}
 
 describe("jant site snapshot export/import", () => {
   const tempDirs: string[] = [];
-  const originalEnv = {
-    DATABASE_URL: process.env.DATABASE_URL,
-    LOCAL_STORAGE_PATH: process.env.LOCAL_STORAGE_PATH,
-    SITE_RESOLUTION_MODE: process.env.SITE_RESOLUTION_MODE,
-  };
+  const originalEnv = Object.fromEntries(
+    NODE_CLI_ENV_KEYS.map((key) => [key, process.env[key]]),
+  ) as Record<(typeof NODE_CLI_ENV_KEYS)[number], string | undefined>;
 
   afterEach(async () => {
-    if (originalEnv.DATABASE_URL === undefined) {
-      delete process.env.DATABASE_URL;
-    } else {
-      process.env.DATABASE_URL = originalEnv.DATABASE_URL;
-    }
-
-    if (originalEnv.LOCAL_STORAGE_PATH === undefined) {
-      delete process.env.LOCAL_STORAGE_PATH;
-    } else {
-      process.env.LOCAL_STORAGE_PATH = originalEnv.LOCAL_STORAGE_PATH;
-    }
-
-    if (originalEnv.SITE_RESOLUTION_MODE === undefined) {
-      delete process.env.SITE_RESOLUTION_MODE;
-    } else {
-      process.env.SITE_RESOLUTION_MODE = originalEnv.SITE_RESOLUTION_MODE;
+    for (const key of NODE_CLI_ENV_KEYS) {
+      const value = originalEnv[key];
+      if (value === undefined) {
+        delete process.env[key];
+      } else {
+        process.env[key] = value;
+      }
     }
 
     await Promise.all(
@@ -219,8 +228,7 @@ describe("jant site snapshot export/import", () => {
       contentType: "image/png",
     });
 
-    process.env.DATABASE_URL = `file:${sourceDbPath}`;
-    process.env.LOCAL_STORAGE_PATH = sourceStoragePath;
+    useLocalSnapshotRuntime(`file:${sourceDbPath}`, sourceStoragePath);
 
     const exportLogSpy = vi.spyOn(console, "log").mockImplementation(() => {});
     const { run: runExport } =
@@ -241,8 +249,7 @@ describe("jant site snapshot export/import", () => {
       `Exported Node database snapshot to ${snapshotPath}`,
     );
 
-    process.env.DATABASE_URL = `file:${targetDbPath}`;
-    process.env.LOCAL_STORAGE_PATH = targetStoragePath;
+    useLocalSnapshotRuntime(`file:${targetDbPath}`, targetStoragePath);
 
     const importLogSpy = vi.spyOn(console, "log").mockImplementation(() => {});
     const { run: runImport } =
@@ -379,8 +386,7 @@ describe("jant site snapshot export/import", () => {
       sourceSqlite.close();
     }
 
-    process.env.DATABASE_URL = `file:${sourceDbPath}`;
-    process.env.LOCAL_STORAGE_PATH = sourceStoragePath;
+    useLocalSnapshotRuntime(`file:${sourceDbPath}`, sourceStoragePath);
 
     vi.spyOn(console, "log").mockImplementation(() => {});
     const { run: runExport } =
@@ -453,16 +459,14 @@ describe("jant site snapshot export/import", () => {
       targetSqlite.close();
     }
 
-    process.env.DATABASE_URL = `file:${sourceDbPath}`;
-    process.env.LOCAL_STORAGE_PATH = sourceStoragePath;
+    useLocalSnapshotRuntime(`file:${sourceDbPath}`, sourceStoragePath);
 
     vi.spyOn(console, "log").mockImplementation(() => {});
     const { run: runExport } =
       await import("../../../bin/commands/site/snapshot/export.js");
     await runExport(["--output", snapshotPath, "--skip-objects"]);
 
-    process.env.DATABASE_URL = `file:${targetDbPath}`;
-    process.env.LOCAL_STORAGE_PATH = targetStoragePath;
+    useLocalSnapshotRuntime(`file:${targetDbPath}`, targetStoragePath);
 
     const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
     const { run: runImport } =
@@ -538,16 +542,14 @@ describe("jant site snapshot export/import", () => {
       targetSqlite.close();
     }
 
-    process.env.DATABASE_URL = `file:${sourceDbPath}`;
-    process.env.LOCAL_STORAGE_PATH = sourceStoragePath;
+    useLocalSnapshotRuntime(`file:${sourceDbPath}`, sourceStoragePath);
 
     vi.spyOn(console, "log").mockImplementation(() => {});
     const { run: runExport } =
       await import("../../../bin/commands/site/snapshot/export.js");
     await runExport(["--output", snapshotPath, "--skip-objects"]);
 
-    process.env.DATABASE_URL = `file:${targetDbPath}`;
-    process.env.LOCAL_STORAGE_PATH = targetStoragePath;
+    useLocalSnapshotRuntime(`file:${targetDbPath}`, targetStoragePath);
 
     vi.spyOn(console, "warn").mockImplementation(() => {});
     const { run: runImport } =
@@ -580,8 +582,10 @@ describe("jant site snapshot export/import", () => {
     tempDirs.push(root);
 
     const snapshotPath = join(root, "snapshot");
-    process.env.DATABASE_URL = `file:${join(root, "jant.sqlite")}`;
-    process.env.LOCAL_STORAGE_PATH = join(root, "media");
+    useLocalSnapshotRuntime(
+      `file:${join(root, "jant.sqlite")}`,
+      join(root, "media"),
+    );
 
     await rm(snapshotPath, { recursive: true, force: true });
     await mkdir(snapshotPath, { recursive: true });
@@ -702,15 +706,13 @@ describe("jant site snapshot export/import", () => {
       targetSqlite.close();
     }
 
-    process.env.DATABASE_URL = `file:${sourceDbPath}`;
-    process.env.LOCAL_STORAGE_PATH = sourceStoragePath;
+    useLocalSnapshotRuntime(`file:${sourceDbPath}`, sourceStoragePath);
 
     const { run: runExport } =
       await import("../../../bin/commands/site/snapshot/export.js");
     await runExport(["--output", snapshotPath]);
 
-    process.env.DATABASE_URL = `file:${targetDbPath}`;
-    process.env.LOCAL_STORAGE_PATH = targetStoragePath;
+    useLocalSnapshotRuntime(`file:${targetDbPath}`, targetStoragePath);
 
     const { run: runImport } =
       await import("../../../bin/commands/site/snapshot/import.js");
@@ -868,16 +870,14 @@ describe("jant site snapshot export/import", () => {
       targetSqlite.close();
     }
 
-    process.env.DATABASE_URL = `file:${sourceDbPath}`;
-    process.env.LOCAL_STORAGE_PATH = sourceStoragePath;
+    useLocalSnapshotRuntime(`file:${sourceDbPath}`, sourceStoragePath);
     delete process.env.SITE_RESOLUTION_MODE;
 
     const { run: runExport } =
       await import("../../../bin/commands/site/snapshot/export.js");
     await runExport(["--output", snapshotPath]);
 
-    process.env.DATABASE_URL = `file:${targetDbPath}`;
-    process.env.LOCAL_STORAGE_PATH = targetStoragePath;
+    useLocalSnapshotRuntime(`file:${targetDbPath}`, targetStoragePath);
     delete process.env.SITE_RESOLUTION_MODE;
 
     const importLogSpy = vi.spyOn(console, "log").mockImplementation(() => {});

package/src/routes/api/__tests__/nav-items.test.ts

@@ -77,6 +77,32 @@ describe("Nav Items API Routes", () => {
       expect(body.label).toBe("GitHub");
       expect(body.url).toBe("https://github.com");
       expect(body.type).toBe("link");
+      expect(body.headerHtml).toBeUndefined();
+    });
+
+    it("includes a site header fragment for navigation editor requests", async () => {
+      const { app } = createTestApp({ authenticated: true });
+      app.route("/api/nav-items", navItemsApiRoutes);
+
+      const res = await app.request("/api/nav-items", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          "X-Jant-Site-Header": "include",
+        },
+        body: JSON.stringify({
+          type: "link",
+          label: "Docs",
+          url: "/docs",
+        }),
+      });
+
+      expect(res.status).toBe(201);
+      const body = await res.json();
+      expect(body.label).toBe("Docs");
+      expect(body.headerHtml).toContain('data-site-header-fragment="header"');
+      expect(body.headerHtml).toContain('data-site-header-fragment="drawer"');
+      expect(body.headerHtml).toContain("Docs");
     });
 
     it("creates a system nav item when authenticated", async () => {

package/src/routes/api/export.ts

@@ -5,7 +5,6 @@
 import { Hono } from "hono";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../types/app-context.js";
-import { getHomeDefaultViewFromNavItems } from "../../lib/navigation.js";
 import { requireAuthApi } from "../../middleware/auth.js";
 import { createExportService } from "../../services/export.js";
 
@@ -25,7 +24,6 @@ exportApiRoutes.post("/hugo", requireAuthApi(), async (c) => {
       siteDescription: appConfig.siteDescription,
       siteLanguage: appConfig.siteLanguage,
       showJantBrandingOnHome: appConfig.showJantBrandingOnHome,
-      homeDefaultView: getHomeDefaultViewFromNavItems(navItems),
       mainRssFeed: appConfig.mainRssFeed,
       siteFooter: appConfig.siteFooter,
       showHeaderAvatar: appConfig.showHeaderAvatar,

package/src/routes/api/internal/__tests__/uploads.test.ts

@@ -136,7 +136,7 @@ describe("Internal upload admin routes", () => {
     expect(storage.files.has(row.tempStorageKey)).toBe(false);
   });
 
-  it("deletes orphaned media past the grace window and keeps fresh orphans", async () => {
+  it("keeps finalized unattached media during upload cleanup", async () => {
     const storage = createMockStorage();
     const { app, services, sqlite } = createTestApp({
       authenticated: false,
@@ -187,28 +187,24 @@ describe("Internal upload admin routes", () => {
     await expect(res.json()).resolves.toEqual({
       abortedMultipartUploads: 0,
       deletedSessions: 0,
-      deletedOrphanMedia: 1,
-      // The reaped orphan's object is freshly enqueued (30 days out), so the
-      // same sweep purges nothing yet.
+      deletedOrphanMedia: 0,
       purgedStorageObjects: 0,
     });
 
-    // Old orphan: DB row gone, original key freed immediately, bytes moved to
-    // a trash/ key recorded in storage_purge (recoverable within the window).
+    // Finalized media may be referenced from post body JSON without being a
+    // post attachment, so upload cleanup must not delete it from `postId IS
+    // NULL` alone.
     expect(
       sqlite.prepare("select id from media where id = ?").get(oldOrphan.id),
-    ).toBeUndefined();
-    expect(storage.files.has(oldStorageKey)).toBe(false);
-    expect([...storage.files.keys()].some((k) => k.startsWith("trash/"))).toBe(
-      true,
-    );
+    ).toBeDefined();
+    expect(storage.files.has(oldStorageKey)).toBe(true);
     expect(
       sqlite
         .prepare("select id from storage_purge where original_key = ?")
         .get(oldStorageKey),
-    ).toBeDefined();
+    ).toBeUndefined();
 
-    // Fresh orphan: untouched.
+    // Fresh unattached media is also untouched.
     expect(
       sqlite.prepare("select id from media where id = ?").get(freshOrphan.id),
     ).toBeDefined();

package/src/routes/api/internal/sites.ts

@@ -163,11 +163,11 @@ internalSitesRoutes.get(
   },
 );
 
-// Clean up a single managed site's expired upload sessions and orphaned media
-// (uploaded during compose but never published). Invoked per-site by the
-// hosted control plane's scheduled maintenance. Self-hosted operators use the
-// host-scoped `POST /api/internal/uploads/cleanup` route / `jant uploads
-// cleanup` CLI instead.
+// Clean up a single managed site's expired upload sessions and due trash
+// objects. Invoked per-site by the hosted control plane's scheduled
+// maintenance. Self-hosted operators use the host-scoped
+// `POST /api/internal/uploads/cleanup` route / `jant uploads cleanup` CLI
+// instead.
 internalSitesRoutes.post(
   "/:siteId/uploads/cleanup",
   requireInternalAdminApi(),