@jant/core 0.6.8 → 0.6.10

package/src/services/post.ts

@@ -2483,7 +2483,7 @@ export function createPostService(
         .select()
         .from(posts)
         .where(and(eq(posts.siteId, siteId), eq(posts.threadId, rootId)))
-        .orderBy(posts.createdAt);
+        .orderBy(posts.createdAt, posts.id);
 
       return hydratePosts(rows);
     },

package/src/services/settings.ts

@@ -19,6 +19,7 @@ import {
 } from "../lib/constants.js";
 import {
   baseLocale,
+  isLocale,
   isValidContentLanguage,
   normalizeContentLanguage,
 } from "../i18n/locales.js";
@@ -41,6 +42,8 @@ export interface GeneralSettingsData {
   siteDescription: string;
   siteFooter: string;
   siteLanguage: string;
+  /** Admin UI locale; empty string follows the content language. */
+  dashboardLanguage?: string;
   cjkSerifFont: string;
   showJantBrandingOnHome: boolean;
   homeDefaultView?: FeedKind;
@@ -61,6 +64,11 @@ export interface SiteSettingsResult {
 
 export interface LocaleSettingsData {
   siteLanguage: string;
+  /**
+   * Admin dashboard UI locale. Empty string clears the explicit setting so the
+   * dashboard follows the content language. When set, must be a catalog locale.
+   */
+  dashboardLanguage?: string;
   cjkSerifFont: string;
   timeZone: string;
 }
@@ -97,7 +105,11 @@ export interface SettingsService {
   ): Promise<SiteSettingsResult>;
   updateLocaleSettings(
     data: LocaleSettingsData,
-    opts: { oldLanguage: string; oldCjkSerifFont?: string },
+    opts: {
+      oldLanguage: string;
+      oldCjkSerifFont?: string;
+      oldDashboardLanguage?: string;
+    },
   ): Promise<{ languageChanged: boolean }>;
   updateFeedSettings(data: { mainRssFeed?: FeedKind }): Promise<void>;
   updateHomeBranding(showJantBrandingOnHome: boolean): Promise<void>;
@@ -131,15 +143,16 @@ export interface SettingsService {
    */
   uploadAvatar(data: AvatarUploadData, deps: AvatarUploadDeps): Promise<void>;
   /**
-   * Remove avatar and all favicon-related settings.
-   * Deletes the apple-touch-icon from storage if it exists.
-   *
-   * @param storage - Optional storage driver for deleting the apple-touch-icon file
+   * Remove avatar and all favicon-related settings. The apple-touch-icon's
+   * media row is deleted and its storage object is retired (moved to the
+   * recycle bin, or deleted) via the media service when supplied — so removal
+   * is recoverable rather than erasing the bytes with no trace.
    */
-  removeAvatar(
-    storage?: StorageDriver | null,
-    deps?: { media?: MediaService; storageProvider?: string },
-  ): Promise<void>;
+  removeAvatar(deps?: {
+    storage?: StorageDriver | null;
+    media?: MediaService;
+    storageProvider?: string;
+  }): Promise<void>;
 }
 
 export function createSettingsService(
@@ -301,6 +314,26 @@ export function createSettingsService(
         normalizeContentLanguage(trimmedLanguage),
       );
 
+      // Dashboard UI locale. undefined = leave untouched; "" = clear so the
+      // dashboard follows the content language; otherwise it must be one of the
+      // translated catalog locales.
+      let dashboardChanged = false;
+      if (data.dashboardLanguage !== undefined) {
+        const dashboardLanguage = data.dashboardLanguage.trim();
+        if (dashboardLanguage && !isLocale(dashboardLanguage)) {
+          throw new ValidationError(
+            "Choose a dashboard language Jant is translated into.",
+          );
+        }
+        if (dashboardLanguage) {
+          await this.set("DASHBOARD_LANGUAGE", dashboardLanguage);
+        } else {
+          await this.remove("DASHBOARD_LANGUAGE");
+        }
+        dashboardChanged =
+          (opts.oldDashboardLanguage ?? "") !== dashboardLanguage;
+      }
+
       // CJK serif font setting
       const cjkFont = data.cjkSerifFont?.trim() ?? "";
       if (cjkFont && isCjkSerifFont(cjkFont) && cjkFont !== "off") {
@@ -329,7 +362,8 @@ export function createSettingsService(
       return {
         languageChanged:
           opts.oldLanguage !== trimmedLanguage ||
-          (opts.oldCjkSerifFont ?? "off") !== effectiveCjkFont,
+          (opts.oldCjkSerifFont ?? "off") !== effectiveCjkFont ||
+          dashboardChanged,
       };
     },
 
@@ -469,19 +503,19 @@ export function createSettingsService(
       await this.set("SITE_FAVICON_VERSION", version);
     },
 
-    async removeAvatar(storage, deps) {
+    async removeAvatar(deps) {
       const appleTouchKey = await this.get("SITE_FAVICON_APPLE_TOUCH");
-      if (storage && appleTouchKey) {
-        await storage.delete(appleTouchKey);
-      }
 
+      // Retire the apple-touch-icon through the media service so its object goes
+      // to the recycle bin (recoverable) rather than being erased now. Also
+      // removes its media row.
       if (deps?.media && deps.storageProvider && appleTouchKey) {
         const existing = await deps.media.getByStorageKey(
           appleTouchKey,
           deps.storageProvider,
         );
         if (existing) {
-          await deps.media.delete(existing.id);
+          await deps.media.delete(existing.id, deps.storage);
         }
       }
 

package/src/services/upload-session.ts

@@ -148,6 +148,7 @@ export interface UploadSessionService {
     abortedMultipartUploads: number;
     deletedSessions: number;
     deletedOrphanMedia: number;
+    purgedStorageObjects: number;
   }>;
   abort(id: string, deps: { storage: StorageDriver }): Promise<void>;
 }
@@ -766,9 +767,10 @@ export function createUploadSessionService(
       }
 
       // Reap finalized media that was uploaded during compose but never
-      // attached to a post (`postId IS NULL`) past the grace window. Deletes
-      // the S3/R2 objects and DB rows (best-effort storage delete). Bounded by
-      // the same per-run `limit`; any backlog drains over subsequent runs.
+      // attached to a post (`postId IS NULL`) past the grace window. This now
+      // soft-deletes via the media service: the DB row is removed and the
+      // storage object is enqueued for deferred deletion. Bounded by the same
+      // per-run `limit`; any backlog drains over subsequent runs.
       const orphanIds = await media.listOrphanedMediaIds({
         before: now() - ORPHAN_MEDIA_GRACE_SECONDS,
         limit,
@@ -777,10 +779,18 @@ export function createUploadSessionService(
         await media.deleteByIds(orphanIds, deps.storage);
       }
 
+      // Physically delete storage objects whose recycle window has elapsed.
+      // Skips any object a live media row still references (re-uploads).
+      const purgedStorageObjects = await media.purgeDueStorageObjects(
+        { before: now(), limit, provider: deps.storageDriver },
+        deps.storage,
+      );
+
       return {
         abortedMultipartUploads,
         deletedSessions,
         deletedOrphanMedia: orphanIds.length,
+        purgedStorageObjects,
       };
     },
   };

package/src/styles/tokens.css

@@ -381,6 +381,21 @@
 @media (max-width: 760px) {
   :root {
     --site-padding: 1.875rem;
+  }
+}
+
+/* Tufte two-column → single-column collapse.
+ *
+ * Below this width the post column is already narrowed to `min(100%, 35rem)`
+ * (preset.css) and there is no room for a 45% sidenote gutter, so all content
+ * goes full-width. Single images (MediaGallery getSingleVisualWidth) and link
+ * previews (.link-preview) read this token directly, so they collapse here too.
+ *
+ * Keep this breakpoint in sync with the post-column collapse (preset.css /
+ * ui.css feed-divider, both `max-width: 1024px`) and the sidenote float→inline
+ * collapse (ui.css). They are one layout switch; do not let them drift apart. */
+@media (max-width: 1024px) {
+  :root {
     --layout-content-width: 100%;
   }
 }
@@ -467,13 +482,15 @@
 
 @media (max-width: 760px), (hover: none) and (pointer: coarse) {
   :root {
-    /* Content layer — tighter scale for mobile reading
-       Ratio ≈ 1.9 : 1.4 : 1.15 : 1 (display:title:subtitle:body)
-       13px base → 31.9 / 24 / 19.5 / 16.9 */
+    /* Content layer — tighter scale for mobile reading.
+       Ratio ≈ 1.88 : 1.42 : 1.15 : 1 (display:title:subtitle:body).
+       At 15px root × 0.78 content-scale: 28.7 / 21.6 / 17.6 / 15.2px.
+       Body is floored to a 16px minimum below (max()) for readability;
+       the floor still yields to calc() when the user zooms the root up. */
     --type-content-display: calc(2.45rem * var(--type-content-scale));
     --type-content-title: calc(1.85rem * var(--type-content-scale));
     --type-content-subtitle: calc(1.5rem * var(--type-content-scale));
-    --type-content-body: calc(1.3rem * var(--type-content-scale));
+    --type-content-body: max(16px, calc(1.3rem * var(--type-content-scale)));
 
     /* UI layer — pixel floors for touch targets */
     --type-ui-title: max(16px, var(--type-secondary));

package/src/styles/ui.css

@@ -2433,7 +2433,12 @@
     display: none;
   }
 
-  @media (max-width: 760px) {
+  /* Collapse sidenotes from floated margin notes to inline tap-to-toggle at the
+     same width the post column drops to `min(100%, 35rem)` (preset.css) and the
+     Tufte gutter disappears — see --layout-content-width in tokens.css. Below
+     1024px a floated `width: 50%; margin-right: -60%` note has no gutter to land
+     in and overflows the right edge, so it must inline instead. */
+  @media (max-width: 1024px) {
     label.margin-toggle:not(.sidenote-number) {
       display: inline;
       cursor: pointer;
@@ -11110,6 +11115,24 @@
     line-height: 1.28;
   }
 
+  .theme-preview-accent {
+    display: inline-flex;
+    align-items: center;
+    gap: 0.3rem;
+    white-space: nowrap;
+    color: var(--preview-muted-light);
+  }
+
+  .theme-preview-swatch {
+    flex: none;
+    width: 0.62rem;
+    height: 0.62rem;
+    border-radius: 3px;
+    background: var(--preview-primary-light);
+    box-shadow: 0 0 0 1px
+      color-mix(in srgb, var(--preview-fg-light) 18%, transparent);
+  }
+
   .theme-preview-meta {
     color: var(--preview-muted-light);
     line-height: 1.55;
@@ -11143,6 +11166,16 @@
     color: var(--preview-muted-dark);
   }
 
+  .theme-preview-panel[data-theme-preview-mode="dark"] .theme-preview-accent {
+    color: var(--preview-muted-dark);
+  }
+
+  .theme-preview-panel[data-theme-preview-mode="dark"] .theme-preview-swatch {
+    background: var(--preview-primary-dark);
+    box-shadow: 0 0 0 1px
+      color-mix(in srgb, var(--preview-fg-dark) 18%, transparent);
+  }
+
   .theme-preview-panel[data-theme-preview-mode="dark"] .theme-preview-divider {
     border-color: var(--preview-border-dark);
   }
@@ -11671,6 +11704,16 @@
       color: var(--preview-muted-dark);
     }
 
+    .theme-preview-panel[data-theme-preview-mode="auto"] .theme-preview-accent {
+      color: var(--preview-muted-dark);
+    }
+
+    .theme-preview-panel[data-theme-preview-mode="auto"] .theme-preview-swatch {
+      background: var(--preview-primary-dark);
+      box-shadow: 0 0 0 1px
+        color-mix(in srgb, var(--preview-fg-dark) 18%, transparent);
+    }
+
     .theme-preview-panel[data-theme-preview-mode="auto"]
       .theme-preview-divider {
       border-color: var(--preview-border-dark);

package/src/types/bindings.ts

@@ -35,6 +35,7 @@ export interface Bindings {
   SITE_NAME?: EnvBindingValue;
   SITE_DESCRIPTION?: EnvBindingValue;
   SITE_LANGUAGE?: EnvBindingValue;
+  DASHBOARD_LANGUAGE?: EnvBindingValue;
   HOME_DEFAULT_VIEW?: EnvBindingValue;
   MAIN_RSS_FEED?: EnvBindingValue;
   TIME_ZONE?: EnvBindingValue;

package/src/types/config.ts

@@ -41,6 +41,13 @@ export const CONFIG_FIELDS = {
     envOnly: false,
     envKeys: ["SITE_LANGUAGE"],
   },
+  // Admin dashboard UI locale. Empty means "follow the content language"
+  // (resolved through the catalog fallback chain, i.e. today's behaviour).
+  DASHBOARD_LANGUAGE: {
+    defaultValue: "",
+    envOnly: false,
+    envKeys: ["DASHBOARD_LANGUAGE"],
+  },
   CJK_SERIF_FONT: {
     defaultValue: "off",
     envOnly: false,
@@ -455,6 +462,12 @@ export interface AppConfig {
   /** true only when description is set in DB or ENV (not just the default) */
   siteDescriptionExplicit: boolean;
   siteLanguage: string;
+  /**
+   * Admin dashboard UI locale. Empty string means "follow the content
+   * language" (derived via the catalog fallback chain). When set, it is one of
+   * the translated catalog locales ("en", "zh-Hans", "zh-Hant").
+   */
+  dashboardLanguage: string;
   /** CJK serif font locale: "off", "zh-Hans", "zh-Hant", "ja", or "ko" */
   cjkSerifFont: string;
   homeDefaultView: string;

package/src/ui/__tests__/color-themes.test.ts

@@ -2,8 +2,8 @@ import { describe, expect, it } from "vitest";
 import { BUILTIN_COLOR_THEMES } from "../color-themes.js";
 
 describe("BUILTIN_COLOR_THEMES", () => {
-  it("contains 13 themes", () => {
-    expect(BUILTIN_COLOR_THEMES).toHaveLength(14);
+  it("contains 15 themes", () => {
+    expect(BUILTIN_COLOR_THEMES).toHaveLength(15);
   });
 
   it("keeps Tufte as the first theme", () => {

package/src/ui/color-themes.ts

@@ -624,6 +624,38 @@ export const BUILTIN_COLOR_THEMES: ColorTheme[] = [
     },
   }),
 
+  // Pure white with neutral grays — zero tint, clean and clinical
+  defineTheme({
+    id: "snow",
+    name: "Snow",
+    light: {
+      bg: "oklch(1 0 0)",
+      fg: "oklch(0.205 0 0)",
+      primary: "oklch(0.25 0 0)",
+      primaryFg: "oklch(0.99 0 0)",
+      siteAccent: "oklch(0.37 0 0)",
+      muted: "oklch(0.965 0 0)",
+      mutedFg: "oklch(0.5 0 0)",
+      border: "oklch(0.91 0 0)",
+      readingTitle: "oklch(0.17 0 0)",
+      readingHeading: "oklch(0.205 0 0)",
+      readingBody: "oklch(0.24 0 0)",
+      readingQuote: "oklch(0.4 0 0)",
+      dashBg: "oklch(0.975 0 0)",
+    },
+    dark: {
+      bg: "oklch(0.17 0 0)",
+      fg: "oklch(0.92 0 0)",
+      primary: "oklch(0.85 0 0)",
+      primaryFg: "oklch(0.17 0 0)",
+      siteAccent: "oklch(0.78 0 0)",
+      muted: "oklch(0.235 0 0)",
+      mutedFg: "oklch(0.65 0 0)",
+      border: "oklch(0.3 0 0)",
+      dashBg: "oklch(0.15 0 0)",
+    },
+  }),
+
   // Deep coffee brown — rich and grounded
   defineTheme({
     id: "espresso",