@jant/core 0.6.10 → 0.6.12

package/src/services/navigation.ts

@@ -15,6 +15,7 @@ import {
 import { createEntityId } from "../lib/ids.js";
 import { ValidationError } from "../lib/errors.js";
 import { now } from "../lib/time.js";
+import { normalizePath } from "../lib/url.js";
 import { COLLECTION_FRESHNESS_WINDOW_SECONDS } from "../types.js";
 import type {
   NavItem,
@@ -23,10 +24,15 @@ import type {
   CreateNavItem,
   UpdateNavItem,
   SystemNavKey,
+  SuggestedNavLink,
 } from "../types.js";
 import { SYSTEM_NAV_KEYS } from "../types.js";
 
 const POSITION_RETRY_ATTEMPTS = 5;
+const SUGGESTED_NAV_LINK_CANDIDATES = [
+  { key: "about", path: "/about", label: "About" },
+  { key: "now", path: "/now", label: "Now" },
+] as const;
 
 // Re-export shared constraint detection — see db/dialect.ts
 import { isUniqueConstraintError } from "../db/dialect.js";
@@ -45,6 +51,7 @@ export interface NavItemService {
     afterId: string | null,
     beforeId: string | null,
   ): Promise<NavItem | null>;
+  listSuggestedLinks(): Promise<SuggestedNavLink[]>;
   getCollectionFreshness(collectionIds: string[]): Promise<Map<string, number>>;
 }
 
@@ -53,7 +60,8 @@ export function createNavItemService(
   siteId: string,
   databaseSchema: DatabaseSchema = sqliteSchemaBundle,
 ): NavItemService {
-  const { navItems, postCollections, posts } = databaseSchema;
+  const { navItems, postCollections, posts, pathRegistry, collections } =
+    databaseSchema;
 
   const defaultSystemOrder = [
     "latest",
@@ -121,6 +129,39 @@ export function createNavItemService(
     };
   }
 
+  function withLeadingSlash(path: string): string {
+    const normalized = normalizePath(path);
+    return normalized ? `/${normalized}` : "/";
+  }
+
+  function getComparableInternalPath(url: string): string | null {
+    if (
+      url.startsWith("http://") ||
+      url.startsWith("https://") ||
+      url.startsWith("//") ||
+      url.startsWith("mailto:") ||
+      url.startsWith("tel:") ||
+      url.startsWith("#")
+    ) {
+      return null;
+    }
+
+    try {
+      const pathname = new URL(url, "https://jant.invalid").pathname;
+      return withLeadingSlash(pathname);
+    } catch {
+      return null;
+    }
+  }
+
+  function normalizeSuggestedLabel(
+    label: string | null | undefined,
+    fallback: string,
+  ): string {
+    const trimmed = label?.trim();
+    return trimmed && trimmed.length > 0 ? trimmed : fallback;
+  }
+
   async function getLastPosition(): Promise<string | null> {
     const rows = await db
       .select({ position: navItems.position })
@@ -414,6 +455,119 @@ export function createNavItemService(
       throw new Error("Failed to assign a unique nav item position");
     },
 
+    async listSuggestedLinks() {
+      const existingRows = await db
+        .select({
+          url: navItems.url,
+          collectionId: navItems.collectionId,
+        })
+        .from(navItems)
+        .where(eq(navItems.siteId, siteId));
+      const existingPaths = new Set(
+        existingRows.flatMap((item) => {
+          const path = getComparableInternalPath(item.url);
+          return path ? [path] : [];
+        }),
+      );
+      const existingCollectionIds = new Set(
+        existingRows.flatMap((item) =>
+          item.collectionId ? [item.collectionId] : [],
+        ),
+      );
+
+      const suggestions: SuggestedNavLink[] = [];
+
+      for (const candidate of SUGGESTED_NAV_LINK_CANDIDATES) {
+        const path = withLeadingSlash(candidate.path);
+        if (existingPaths.has(path)) continue;
+
+        const pathRows = await db
+          .select()
+          .from(pathRegistry)
+          .where(
+            and(
+              eq(pathRegistry.siteId, siteId),
+              eq(pathRegistry.path, normalizePath(candidate.path)),
+            ),
+          )
+          .limit(1);
+        const record = pathRows[0];
+        if (!record || record.kind === "redirect") continue;
+
+        if (record.postId) {
+          const postRows = await db
+            .select({
+              title: posts.title,
+              status: posts.status,
+              visibility: posts.visibility,
+            })
+            .from(posts)
+            .where(and(eq(posts.siteId, siteId), eq(posts.id, record.postId)))
+            .limit(1);
+          const post = postRows[0];
+          if (
+            !post ||
+            post.status !== "published" ||
+            post.visibility === "private"
+          ) {
+            continue;
+          }
+
+          suggestions.push({
+            key: candidate.key,
+            label: normalizeSuggestedLabel(post.title, candidate.label),
+            url: path,
+            targetType: "page",
+            navItemType: "link",
+          });
+          continue;
+        }
+
+        if (record.collectionId) {
+          if (existingCollectionIds.has(record.collectionId)) continue;
+
+          const collectionRows = await db
+            .select({
+              title: collections.title,
+            })
+            .from(collections)
+            .where(
+              and(
+                eq(collections.siteId, siteId),
+                eq(collections.id, record.collectionId),
+              ),
+            )
+            .limit(1);
+          const collection = collectionRows[0];
+          if (!collection) continue;
+
+          suggestions.push({
+            key: candidate.key,
+            label: normalizeSuggestedLabel(collection.title, candidate.label),
+            url: path,
+            targetType: "collection",
+            navItemType: record.kind === "slug" ? "collection" : "link",
+            ...(record.kind === "slug" && {
+              collectionId: record.collectionId,
+            }),
+          });
+          continue;
+        }
+
+        if (record.kind === "archive") {
+          suggestions.push({
+            key: candidate.key,
+            label: candidate.label,
+            url: path,
+            targetType: "archive",
+            navItemType: "link",
+          });
+        }
+      }
+
+      return suggestions;
+    },
+
     async getCollectionFreshness(collectionIds) {
       if (collectionIds.length === 0) return new Map<string, number>();
 

package/src/services/post.ts

@@ -1105,6 +1105,21 @@ export function createPostService(
     return conditions;
   }
 
+  function buildCollectionThreadActivityExpr(alias: string) {
+    return sql<number>`MAX(
+      COALESCE(
+        (
+          SELECT root.last_activity_at
+          FROM post AS root
+          WHERE root.site_id = ${siteId}
+            AND root.id = ${posts.threadId}
+        ),
+        ${posts.publishedAt},
+        ${posts.updatedAt}
+      )
+    )`.as(alias);
+  }
+
   function isMediaAttachmentInput(
     attachment: PostAttachmentInput,
   ): attachment is Extract<PostAttachmentInput, { type: "media" }> {
@@ -2845,6 +2860,8 @@ export function createPostService(
         sortOrder === "oldest"
           ? sql<number>`MIN(${posts.publishedAt})`.as("published_at")
           : sql<number>`MAX(${posts.publishedAt})`.as("published_at");
+      const threadActivityAt =
+        buildCollectionThreadActivityExpr("thread_activity_at");
       const ratingPresence = sql<number>`MAX(
         CASE
           WHEN ${posts.rating} IS NULL THEN 0
@@ -2864,6 +2881,7 @@ export function createPostService(
         .select({
           threadId: posts.threadId,
           publishedAt,
+          threadActivityAt,
           collectionPinnedAt,
           ratingPresence,
           ratingValue,
@@ -2891,12 +2909,12 @@ export function createPostService(
                 desc(collectionPinnedAt),
                 desc(ratingPresence),
                 desc(ratingValue),
-                desc(publishedAt),
+                desc(threadActivityAt),
                 desc(posts.threadId),
               )
             : baseQuery.orderBy(
                 desc(collectionPinnedAt),
-                desc(publishedAt),
+                desc(threadActivityAt),
                 desc(posts.threadId),
               );
 
@@ -2923,9 +2941,8 @@ export function createPostService(
         ...buildThreadRootPageConditions(options),
         buildCollectionMembershipCondition(collectionIds),
       ];
-      const publishedAt = sql<number>`MAX(${posts.publishedAt})`.as(
-        "published_at",
-      );
+      const threadActivityAt =
+        buildCollectionThreadActivityExpr("thread_activity_at");
       const collectedAt = sql<number>`MAX(${postCollections.createdAt})`.as(
         "collected_at",
       );
@@ -2937,7 +2954,7 @@ export function createPostService(
       let query = db
         .select({
           threadId: posts.threadId,
-          publishedAt,
+          threadActivityAt,
           collectedAt,
           collectionPinnedAt,
         })
@@ -2953,7 +2970,7 @@ export function createPostService(
         .groupBy(posts.threadId)
         .orderBy(
           desc(collectionPinnedAt),
-          desc(publishedAt),
+          desc(threadActivityAt),
           desc(posts.threadId),
         );
 

package/src/styles/components.css

@@ -1163,6 +1163,26 @@ svg[stroke-width].icon-fine {
     border-color: var(--color-border);
   }
 
+  .nav-suggestions-list {
+    @apply flex flex-col gap-2;
+  }
+
+  .nav-suggestion-item {
+    @apply flex items-center justify-between gap-3 rounded-lg border px-3 py-2;
+  }
+
+  .nav-suggestion-info {
+    @apply flex min-w-0 flex-col;
+  }
+
+  .nav-suggestion-title {
+    @apply truncate text-sm font-medium;
+  }
+
+  .nav-suggestion-meta {
+    @apply truncate text-xs text-muted-foreground;
+  }
+
   /* Collection picker dropdown menu */
   .collection-picker {
     @apply absolute left-0 z-10 mt-1.5 w-64 overflow-y-auto rounded-lg border py-1.5;

package/src/styles/tokens.css

@@ -65,8 +65,8 @@
    *   --type-subtitle   1.8rem  (27px)   — h3
    *   --type-body       1.4rem  (21px)   — running text, form inputs
    *   --type-secondary  1.1rem  (16.5px) — meta, nav, sidenotes, UI labels
-   *   --type-base       1.0rem  (15px)   — code, UI buttons, controls
-   *   --type-sm         0.9rem  (13.5px) — code blocks, small UI text
+   *   --type-base       1.0rem  (15px)   — UI buttons, controls
+   *   --type-sm         0.9rem  (13.5px) — small UI text
    *   --type-xs         0.8rem  (12px)   — captions, descriptions, chips
    *   --type-2xs        0.65rem (9.75px) — tiny labels, file sizes, badges
    */
@@ -84,18 +84,20 @@
      mobile overrides below cap sizes for small screens.
      --type-content-scale uniformly scales all content sizes
      without affecting UI controls. */
-  --type-content-scale: 0.78;
+  --type-content-scale: 0.8;
   --type-content-display: calc(var(--type-display) * var(--type-content-scale));
   --type-content-title: calc(var(--type-title) * var(--type-content-scale));
   --type-content-subtitle: calc(
     var(--type-subtitle) * var(--type-content-scale)
   );
   --type-content-body: calc(var(--type-body) * var(--type-content-scale));
+  --type-content-quote: calc(var(--type-content-body) * 1.16);
+  --type-content-quote-leading: 1.4;
 
   /* Semantic aliases */
-  --type-code: var(--type-base);
-  --type-code-block: var(--type-sm);
   --type-body-size: var(--type-content-body);
+  --type-code: calc(var(--type-body-size) * 0.94);
+  --type-code-block: calc(var(--type-body-size) * 0.9);
   --type-body-tracking: 0;
   --type-ui-title: var(--type-secondary);
   --type-ui-control: var(--type-base);
@@ -107,9 +109,9 @@
   --type-thread-context: var(--type-base);
   --type-thread-context-title: var(--type-secondary);
   --type-thread-context-meta: var(--type-sm);
-  --feed-note-title-size: var(--type-content-title);
+  --feed-note-title-size: calc(var(--type-content-body) * 1.36);
   --feed-note-title-leading: var(--type-heading-leading);
-  --type-body-leading: 1.5;
+  --type-body-leading: 1.7;
   --type-display-leading: 1.15;
   --type-heading-leading: 1.15;
   --type-heading-weight: var(--fw-regular);
@@ -264,6 +266,22 @@
     var(--site-text-primary) 12%,
     transparent
   );
+  --site-code-text: color-mix(
+    in srgb,
+    var(--site-reading-heading) 86%,
+    var(--site-reading-body)
+  );
+  --site-code-bg: color-mix(in srgb, var(--site-reading-meta) 12%, transparent);
+  --site-code-block-bg: color-mix(
+    in srgb,
+    var(--site-elevated-bg) 94%,
+    var(--site-nav-hover-bg)
+  );
+  --site-code-block-border: color-mix(
+    in srgb,
+    var(--site-divider) 62%,
+    transparent
+  );
   --site-feed-divider-color: color-mix(
     in srgb,
     var(--site-text-secondary) 30%,
@@ -484,7 +502,7 @@
   :root {
     /* 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.
+       At 15px root × 0.8 content-scale: 29.4 / 22.2 / 18 / 15.6px.
        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));

package/src/styles/ui.css

@@ -2237,13 +2237,13 @@
   }
 
   .post-header-block {
-    margin-bottom: 1rem;
+    margin-bottom: 1.7rem;
   }
 
   .post-header-block-detail {
     display: flex;
     flex-direction: column;
-    gap: 0.55rem;
+    gap: 0.7rem;
   }
 
   .post-header-block .feed-link-title,
@@ -2944,8 +2944,8 @@
     padding-left: 0;
     font-family: var(--font-serif);
     color: var(--site-text-primary);
-    font-size: var(--type-content-subtitle);
-    line-height: var(--type-heading-leading);
+    font-size: var(--type-content-quote);
+    line-height: var(--type-content-quote-leading);
     white-space: pre-line;
     text-wrap: pretty;
   }
@@ -4535,6 +4535,7 @@
     --compose-title-input-size: var(--type-content-subtitle);
     --compose-title-input-leading: var(--type-display-leading);
     --compose-quote-input-size: var(--type-content-subtitle);
+    --compose-quote-input-leading: 1.32;
     --compose-inline-input-size: var(--type-ui-input);
     --compose-panel-label-size: var(--type-ui-control);
     --compose-panel-hint-size: var(--type-ui-hint);
@@ -5201,7 +5202,7 @@
     font-size: var(--compose-quote-input-size);
     font-style: normal;
     font-weight: var(--fw-regular);
-    line-height: 1.32;
+    line-height: var(--compose-quote-input-leading);
     letter-spacing: -0.02em;
     min-height: 9rem;
     padding-top: 0.5rem;
@@ -7428,6 +7429,53 @@
     position: relative;
   }
 
+  .compose-reply-compose-layout {
+    --compose-title-input-size: var(--type-content-subtitle);
+    --compose-title-input-leading: 1.35;
+    --compose-quote-input-size: calc(var(--type-content-body) * 1.06);
+    --compose-quote-input-leading: 1.42;
+    --compose-inline-input-size: var(--type-base);
+  }
+
+  .compose-reply-compose-layout .compose-quote-wrap {
+    margin-top: 0.4rem;
+    padding: 24px 18px 18px;
+    border-radius: 0.95rem;
+  }
+
+  .compose-reply-compose-layout .compose-link-url-wrap {
+    margin-top: 0.4rem;
+  }
+
+  .compose-reply-compose-layout .compose-quote-mark {
+    top: 0.58rem;
+    left: 0.9rem;
+    width: 1.55rem;
+  }
+
+  .compose-reply-compose-layout .compose-quote-text {
+    min-height: 6.5rem;
+    padding-top: 0.35rem;
+  }
+
+  @media (min-width: 700px) {
+    .compose-reply-compose-layout .compose-quote-wrap {
+      padding: 25px 20px 18px;
+      border-radius: 1rem;
+    }
+
+    .compose-reply-compose-layout .compose-quote-mark {
+      top: 0.62rem;
+      left: 1rem;
+      width: 1.6rem;
+    }
+
+    .compose-reply-compose-layout .compose-quote-text {
+      min-height: 6.5rem;
+      padding-top: 0.35rem;
+    }
+  }
+
   /* Continuous vertical line through the rail */
   .compose-thread-layout::before {
     content: "";
@@ -7490,6 +7538,78 @@
     background: transparent;
   }
 
+  .compose-reply-compose-layout .compose-editor-row .compose-attachments-dock {
+    --compose-reply-attachment-width: 96px;
+    --compose-reply-attachment-height: 72px;
+
+    max-height: min(116px, 18dvh);
+    padding-block: 4px 2px;
+  }
+
+  .compose-reply-compose-layout .compose-editor-row .compose-attachments {
+    gap: 6px;
+    padding-block: 0;
+  }
+
+  .compose-reply-compose-layout .compose-editor-row .compose-attachment {
+    gap: 2px;
+    max-width: none;
+  }
+
+  .compose-reply-compose-layout
+    .compose-editor-row
+    .compose-attachment:only-child
+    .compose-attachment-img,
+  .compose-reply-compose-layout
+    .compose-editor-row
+    .compose-attachment:not(:only-child)
+    .compose-attachment-img {
+    width: var(--compose-reply-attachment-width);
+    height: var(--compose-reply-attachment-height);
+    min-width: 0;
+    max-width: var(--compose-reply-attachment-width);
+    max-height: var(--compose-reply-attachment-height);
+    object-fit: cover;
+    object-position: center;
+  }
+
+  .compose-reply-compose-layout
+    .compose-editor-row
+    .compose-attachment-preview-fallback,
+  .compose-reply-compose-layout
+    .compose-editor-row
+    .compose-attachment-processing {
+    width: var(--compose-reply-attachment-width);
+    height: var(--compose-reply-attachment-height);
+    aspect-ratio: auto;
+  }
+
+  .compose-reply-compose-layout
+    .compose-editor-row
+    .compose-attachment-file-card,
+  .compose-reply-compose-layout
+    .compose-editor-row
+    .compose-attachment:not(:only-child)
+    .compose-attachment-file-card {
+    width: 112px;
+    height: var(--compose-reply-attachment-height);
+    gap: 4px;
+    padding: 8px 10px;
+  }
+
+  .compose-reply-compose-layout .compose-editor-row .compose-attachment-alt {
+    padding: 1px 3px;
+    font-size: var(--type-ui-micro);
+    line-height: 1.2;
+  }
+
+  .compose-reply-compose-layout .compose-editor-row .compose-attachment-remove {
+    top: 4px;
+    right: 4px;
+    width: 20px;
+    height: 20px;
+  }
+
   /* Dot marker for thread positions */
   .compose-thread-dot {
     width: var(--site-thread-marker-size);
@@ -7977,6 +8097,10 @@
     padding-top: 8px;
   }
 
+  .compose-reply-compose-layout .compose-thread-post-header + .compose-body {
+    padding-top: 12px;
+  }
+
   /* Thread format selector: pill-tag style (lighter than the main segmented) */
   .compose-thread-segmented {
     background: transparent;
@@ -8700,6 +8824,11 @@
     font-family: var(--font-body);
   }
 
+  .compose-reply-compose-layout .compose-tiptap-body .tiptap {
+    font-size: var(--type-content-body);
+    line-height: var(--type-body-leading);
+  }
+
   .compose-tiptap-thoughts .tiptap {
     min-height: 72px;
   }
@@ -8738,23 +8867,36 @@
 
   .compose-tiptap-body .tiptap h2 {
     font-size: var(--type-content-title);
-    font-style: italic;
     margin-top: 2.1rem;
     margin-bottom: 1.4rem;
   }
 
   .compose-tiptap-body .tiptap h3 {
     font-size: var(--type-content-subtitle);
-    font-style: italic;
     margin-top: 2rem;
     margin-bottom: 1.4rem;
   }
 
+  .compose-reply-compose-layout
+    .compose-tiptap-body
+    .tiptap
+    :is(h1, h2, h3, h4) {
+    font-size: var(--type-secondary);
+    line-height: 1.32;
+    margin-top: 1.4rem;
+    margin-bottom: 0.75rem;
+  }
+
   .compose-tiptap-body .tiptap p {
     margin-top: 1.4rem;
     margin-bottom: 1.4rem;
   }
 
+  .compose-reply-compose-layout .compose-tiptap-body .tiptap p {
+    margin-top: 1rem;
+    margin-bottom: 1rem;
+  }
+
   /* In inline-format compose (reply / edit-reply / thread — the editors wrapped
      in .compose-editor-row), the format header sits right above the body, so the
      first block's 1.4rem top margin reads as a gap between the format pills and

package/src/types/views.ts

@@ -171,6 +171,19 @@ export interface NavItemView {
   freshAt?: number;
 }
 
+export type SuggestedNavLinkTargetType = "page" | "collection" | "archive";
+
+export type SuggestedNavLinkNavItemType = "link" | "collection";
+
+export interface SuggestedNavLink {
+  key: string;
+  label: string;
+  url: string;
+  targetType: SuggestedNavLinkTargetType;
+  navItemType: SuggestedNavLinkNavItemType;
+  collectionId?: string;
+}
+
 /**
  * Search result from FTS5
  */

package/src/ui/compose/ComposeDialog.tsx

@@ -43,6 +43,22 @@ export const ComposeForm: FC<ComposeFormProps> = ({
         comment: "@context: Close compose dialog",
       }),
     ),
+    imageNotRehosted: i18n._(
+      msg({
+        message:
+          "An image couldn't be saved to your library — its original link was kept.",
+        comment:
+          "@context: Toast when a single pasted remote image couldn't be rehosted (e.g. blocked by the source's hotlink protection)",
+      }),
+    ),
+    imagesNotRehosted: i18n._(
+      msg({
+        message:
+          "{count} images couldn't be saved to your library — their original links were kept.",
+        comment:
+          "@context: Toast when several pasted remote images couldn't be rehosted; {count} is the number of images",
+      }),
+    ),
     note: i18n._(
       msg({
         message: "Note",