@jant/core 0.6.6 → 0.6.8

package/src/ui/dash/settings/SettingsRootContent.tsx

@@ -3,8 +3,9 @@
  */
 
 import { msg } from "@lingui/core/macro";
+import { coalesceDisplayText } from "../../../lib/display-text.js";
 import { useLingui } from "../../../i18n/context.js";
-import { toPublicPath } from "../../../lib/url.js";
+import { extractDomain, toPublicPath } from "../../../lib/url.js";
 import {
   SettingsDirectoryLink,
   SettingsDirectorySection,
@@ -25,14 +26,19 @@ const ICONS = {
   shield: `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M20 13c0 5-3.5 7.5-7.66 8.95a1 1 0 0 1-.67-.01C7.5 20.5 4 18 4 13V6a1 1 0 0 1 1-1c2 0 4.5-1.2 6.24-2.72a1.17 1.17 0 0 1 1.52 0C14.51 3.81 17 5 19 5a1 1 0 0 1 1 1z"/></svg>`,
   gitBranch: `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="6" x2="6" y1="3" y2="15"/><circle cx="18" cy="6" r="3"/><circle cx="6" cy="18" r="3"/><path d="M18 9a9 9 0 0 1-9 9"/></svg>`,
   send: `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14.536 21.686a.5.5 0 0 0 .937-.024l6.5-19a.496.496 0 0 0-.635-.635l-19 6.5a.5.5 0 0 0-.024.937l7.93 3.18a2 2 0 0 1 1.112 1.11z"/><path d="m21.854 2.147-10.94 10.939"/></svg>`,
+  cloud: `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17.5 19H9a7 7 0 1 1 6.71-9h1.79a4.5 4.5 0 1 1 0 9Z"/></svg>`,
 };
 
 export function SettingsRootContent({
   sitePathPrefix = "",
   demoMode = false,
+  hostedControlPlaneSiteSettingsUrl,
+  hostedControlPlaneProviderLabel,
 }: {
   sitePathPrefix?: string;
   demoMode?: boolean;
+  hostedControlPlaneSiteSettingsUrl?: string | null;
+  hostedControlPlaneProviderLabel?: string | null;
 }) {
   const { i18n } = useLingui();
   const accountDescription = demoMode
@@ -50,6 +56,19 @@ export function SettingsRootContent({
             "@context: Settings item description for account settings on the settings home page",
         }),
       );
+  const hostingProviderLabel = hostedControlPlaneSiteSettingsUrl
+    ? (coalesceDisplayText(
+        hostedControlPlaneProviderLabel,
+        extractDomain(hostedControlPlaneSiteSettingsUrl),
+      ) ??
+      i18n._(
+        msg({
+          message: "Hosted account",
+          comment:
+            "@context: Generic hosted auth provider label when no explicit provider name is configured",
+        }),
+      ))
+    : null;
 
   return (
     <div class="settings-root">
@@ -320,6 +339,32 @@ export function SettingsRootContent({
           )}
           description={accountDescription}
         />
+        {hostedControlPlaneSiteSettingsUrl && hostingProviderLabel ? (
+          <SettingsDirectoryLink
+            href={hostedControlPlaneSiteSettingsUrl}
+            target="_blank"
+            rel="noopener noreferrer"
+            icon={ICONS.cloud}
+            tone="subtle"
+            name={i18n._(
+              msg({
+                message: "Manage Hosting",
+                comment:
+                  "@context: Settings item label for opening this site's hosted management page (domains, plan, billing) in the connected control plane",
+              }),
+            )}
+            description={i18n._(
+              msg({
+                message: "Domains, plan, and billing in {providerLabel}",
+                comment:
+                  "@context: Settings item description for the hosted site management external link",
+              }),
+              {
+                providerLabel: hostingProviderLabel,
+              },
+            )}
+          />
+        ) : null}
       </SettingsDirectorySection>
 
       <div class="settings-root-signout">

package/src/ui/dash/settings/__tests__/SettingsRootContent.test.tsx

@@ -0,0 +1,55 @@
+import type { Context } from "hono";
+import { renderToString } from "hono/jsx/dom/server";
+import { describe, expect, it } from "vitest";
+import { I18nProvider } from "../../../../i18n/context.js";
+import { createI18n } from "../../../../i18n/i18n.js";
+import { SettingsRootContent } from "../SettingsRootContent.js";
+
+function renderSettingsRootContent(
+  props: Parameters<typeof SettingsRootContent>[0],
+): string {
+  const i18n = createI18n("en");
+  const c = {
+    get(key: string) {
+      if (key === "i18n") return i18n;
+      return undefined;
+    },
+  } as unknown as Context;
+
+  I18nProvider({ c, children: "" });
+  return renderToString(SettingsRootContent(props));
+}
+
+describe("SettingsRootContent", () => {
+  it("omits Manage Hosting when no hosted site settings URL is configured", () => {
+    const html = renderSettingsRootContent({});
+
+    expect(html).not.toContain("Manage Hosting");
+  });
+
+  it("renders the Manage Hosting external link with the configured provider label", () => {
+    const html = renderSettingsRootContent({
+      hostedControlPlaneSiteSettingsUrl:
+        "https://cloud.example/sites/core/site_123/settings",
+      hostedControlPlaneProviderLabel: "jant.me",
+    });
+
+    expect(html).toContain("Manage Hosting");
+    expect(html).toContain("Domains, plan, and billing in jant.me");
+    expect(html).toContain(
+      'href="https://cloud.example/sites/core/site_123/settings"',
+    );
+    expect(html).toContain('target="_blank"');
+    expect(html).toContain('rel="noopener noreferrer"');
+  });
+
+  it("falls back to the hosted URL host when the provider label is blank", () => {
+    const html = renderSettingsRootContent({
+      hostedControlPlaneSiteSettingsUrl:
+        "https://cloud.example/sites/core/site_123/settings",
+      hostedControlPlaneProviderLabel: "   ",
+    });
+
+    expect(html).toContain("Domains, plan, and billing in cloud.example");
+  });
+});

package/src/ui/feed/NoteCard.tsx

@@ -5,7 +5,9 @@
  * With title: article-style rendering with summary excerpt and "Read more" link.
  */
 
+import { msg } from "@lingui/core/macro";
 import type { FC } from "hono/jsx";
+import { useLingui } from "../../i18n/context.js";
 import type { TimelineCardProps } from "../../types.js";
 import { MediaGallery } from "../shared/MediaGallery.js";
 import { StarRating } from "../shared/StarRating.js";
@@ -27,6 +29,7 @@ export const NoteCard: FC<TimelineCardProps> = ({
   mode = "feed",
   display,
 }) => {
+  const { i18n } = useLingui();
   const isCompact = mode === "compact";
   const isDetail = mode === "detail";
   const isArticle = !!post.title;
@@ -35,8 +38,42 @@ export const NoteCard: FC<TimelineCardProps> = ({
   const fullBodyHtml = showFullBody
     ? stripContinueAnchor(post.bodyHtml)
     : post.bodyHtml;
+  // Untitled notes only carry summaryHtml when their body was truncated; fall
+  // back to the full body so non-truncated notes render every block.
   const displayHtml =
-    isDetail || !isArticle || showFullBody ? fullBodyHtml : post.summaryHtml;
+    isDetail || showFullBody
+      ? fullBodyHtml
+      : (post.summaryHtml ?? fullBodyHtml);
+  const continueLabel = i18n._(
+    msg({
+      message: "Continue →",
+      comment:
+        "@context: Feed link from a truncated article excerpt to its full page",
+    }),
+  );
+  const readMoreLabel = i18n._(
+    msg({
+      message: "Read more",
+      comment:
+        "@context: Expand the rest of a truncated untitled note in place in the feed",
+    }),
+  );
+  const readLessLabel = i18n._(
+    msg({
+      message: "Read less",
+      comment:
+        "@context: Collapse an expanded untitled note back to its preview in the feed",
+    }),
+  );
+  // Untitled notes long enough to truncate render their full body with a
+  // `data-note-break` marker; this flag tells CSS to clamp the tail until the
+  // reader expands it in place.
+  const clampNote =
+    !isArticle &&
+    !isDetail &&
+    !isCompact &&
+    !showFullBody &&
+    post.summaryHasMore === true;
   const hasVisibleRating =
     !!post.rating && post.rating > 0 && !display?.hideRating;
   const showHeaderRating = isDetail && isArticle && hasVisibleRating;
@@ -88,6 +125,7 @@ export const NoteCard: FC<TimelineCardProps> = ({
         <div
           class={`e-content prose ${isCompact ? "prose-sm" : isDetail || showFullBody ? "post-detail-body" : isArticle ? "post-body-summary" : ""}`}
           data-post-body
+          {...(clampNote ? { "data-note-clamp": "" } : {})}
           dangerouslySetInnerHTML={{ __html: displayHtml }}
         />
       )}
@@ -105,12 +143,23 @@ export const NoteCard: FC<TimelineCardProps> = ({
             {!isDetail &&
               !isCompact &&
               !showFullBody &&
-              isArticle &&
-              post.summaryHasMore && (
+              post.summaryHasMore &&
+              (isArticle ? (
                 <a href={getContinueHref(post)} class="feed-continue-link">
-                  Continue →
+                  {continueLabel}
+                </a>
+              ) : (
+                <a
+                  href={getContinueHref(post)}
+                  class="feed-continue-link"
+                  data-note-expand
+                  aria-expanded="false"
+                  data-label-more={readMoreLabel}
+                  data-label-less={readLessLabel}
+                >
+                  {readMoreLabel}
                 </a>
-              )}
+              ))}
             {!isCompact && !showHeaderRating && !display?.hideRating && (
               <StarRating rating={post.rating} />
             )}

package/src/ui/feed/__tests__/timeline-cards.test.ts

@@ -312,6 +312,79 @@ describe("timeline cards", () => {
 
     expect(html).toContain('href="/post-1"');
     expect(html).not.toContain("#continue");
+    // Titled articles link out; they do not expand in place.
+    expect(html).not.toContain("data-note-expand");
+  });
+
+  it("clamps the body and renders an expand control for truncated untitled notes", () => {
+    const post = createPostView({
+      format: "note",
+      title: undefined,
+      bodyHtml: "<p>Intro</p><span data-note-break></span><p>Rest</p>",
+      summaryHasMore: true,
+    });
+
+    const html = renderWithI18n(NoteCard({ post, mode: "feed" }));
+
+    expect(html).toContain("data-note-expand");
+    expect(html).toContain('href="/post-1"');
+    expect(html).toContain('aria-expanded="false"');
+    expect(html).toContain('data-label-more="Read more"');
+    expect(html).toContain('data-label-less="Read less"');
+    // The full body is rendered (the marker + CSS clamp hide the tail), and the
+    // body carries the clamp flag.
+    expect(html).toContain("data-note-clamp");
+    expect(html).toContain("data-note-break");
+    expect(html).toContain("<p>Intro</p>");
+    expect(html).toContain("<p>Rest</p>");
+  });
+
+  it("renders untitled notes in full without a control when not truncated", () => {
+    const post = createPostView({
+      format: "note",
+      title: undefined,
+      bodyHtml: "<p>Whole note</p>",
+      summaryHasMore: undefined,
+    });
+
+    const html = renderWithI18n(NoteCard({ post, mode: "feed" }));
+
+    expect(html).toContain("<p>Whole note</p>");
+    expect(html).not.toContain("data-note-expand");
+    expect(html).not.toContain("data-note-clamp");
+    expect(html).not.toContain("feed-continue-link");
+  });
+
+  it("shows the full untitled note body without clamping on the detail page", () => {
+    const post = createPostView({
+      format: "note",
+      title: undefined,
+      bodyHtml: "<p>Intro</p><span data-note-break></span><p>Rest</p>",
+      summaryHasMore: true,
+    });
+
+    const html = renderWithI18n(NoteCard({ post, mode: "detail" }));
+
+    expect(html).toContain("<p>Rest</p>");
+    expect(html).not.toContain("data-note-expand");
+    expect(html).not.toContain("data-note-clamp");
+  });
+
+  it("renders the full untitled body with showFullBody and no clamp", () => {
+    const post = createPostView({
+      format: "note",
+      title: undefined,
+      bodyHtml: "<p>Intro</p><span data-note-break></span><p>Rest</p>",
+      summaryHasMore: true,
+    });
+
+    const html = renderWithI18n(
+      NoteCard({ post, mode: "feed", display: { showFullBody: true } }),
+    );
+
+    expect(html).toContain("<p>Rest</p>");
+    expect(html).not.toContain("data-note-expand");
+    expect(html).not.toContain("data-note-clamp");
   });
 
   it("moves rated link detail cards into the title block without changing feed ordering", () => {

package/src/ui/pages/ArchivePage.tsx

@@ -45,14 +45,22 @@ function buildFilterUrl(
   if (merged.format) params.set("format", merged.format);
   if (merged.mediaKinds && merged.mediaKinds.length > 0) {
     params.set("media", merged.mediaKinds.join(","));
-  }
-  if (merged.hasMedia !== undefined) {
-    params.set("hasMedia", merged.hasMedia ? "1" : "0");
+  } else if (merged.hasMedia !== undefined) {
+    params.set("media", merged.hasMedia ? "any" : "none");
   }
   if (merged.hasTitle !== undefined) {
-    params.set("hasTitle", merged.hasTitle ? "1" : "0");
+    params.set("title", merged.hasTitle ? "any" : "none");
+  }
+  if (merged.hasReplies !== undefined) {
+    params.set("replies", merged.hasReplies ? "any" : "none");
+  }
+  if (merged.visibility) {
+    // "hidden" is the URL spelling of the internal latest_hidden value
+    params.set(
+      "visibility",
+      merged.visibility === "latest_hidden" ? "hidden" : merged.visibility,
+    );
   }
-  if (merged.visibility) params.set("visibility", merged.visibility);
   if (merged.view && merged.view !== "grid") params.set("view", merged.view);
 
   const qs = params.toString();
@@ -493,9 +501,9 @@ const ViewToggle: FC<{
 
 const ARCHIVE_VISIBILITIES: ArchiveVisibility[] = [
   "public",
+  "featured",
   "latest_hidden",
   "private",
-  "featured",
 ];
 
 function getVisibilityLabel(v: ArchiveVisibility): string {
@@ -547,9 +555,16 @@ const FILTER_ICONS = {
   collection: "monitor",
   format: "shapes",
   media: "video",
+  thread: "git-branch",
   visibility: "scan-eye",
 } as const;
 
+/** Icons for the thread filter options. */
+const THREAD_ICONS = {
+  threads: "list-tree",
+  single: "git-commit-horizontal",
+} as const;
+
 const FilterBar: FC<{
   filters: ArchiveFilters;
   availableYears: number[];
@@ -756,6 +771,63 @@ const FilterBar: FC<{
     })),
   ];
 
+  // --- Thread options ---------------------------------------------------------
+
+  const threadClearUrl = buildFilterUrl(
+    { ...filters, hasReplies: undefined },
+    { hasReplies: undefined },
+    sitePathPrefix,
+  );
+
+  const threadsLabel = i18n._(
+    msg({
+      message: "Threads",
+      comment: "@context: Archive thread filter - thread roots with replies",
+    }),
+  );
+  const singlePostsLabel = i18n._(
+    msg({
+      message: "Single posts",
+      comment: "@context: Archive thread filter - posts without replies",
+    }),
+  );
+
+  const threadOptions: ChipSelectOption[] = [
+    {
+      label: i18n._(
+        msg({
+          message: "All posts",
+          comment: "@context: Archive thread filter - threads and single posts",
+        }),
+      ),
+      icon: FILTER_ICONS.thread,
+      value: threadClearUrl,
+    },
+    {
+      label: threadsLabel,
+      icon: THREAD_ICONS.threads,
+      value: buildFilterUrl(filters, { hasReplies: true }, sitePathPrefix),
+    },
+    {
+      label: singlePostsLabel,
+      icon: THREAD_ICONS.single,
+      value: buildFilterUrl(filters, { hasReplies: false }, sitePathPrefix),
+    },
+  ];
+
+  const threadActiveLabel =
+    filters.hasReplies === true
+      ? threadsLabel
+      : filters.hasReplies === false
+        ? singlePostsLabel
+        : undefined;
+  const threadActiveIcon =
+    filters.hasReplies === true
+      ? THREAD_ICONS.threads
+      : filters.hasReplies === false
+        ? THREAD_ICONS.single
+        : undefined;
+
   const activeKinds = filters.mediaKinds ?? [];
   const mediaActiveLabel =
     filters.hasMedia === false
@@ -829,6 +901,17 @@ const FilterBar: FC<{
           iconOnly
         />
 
+        <ChipSelect
+          id="af-thread"
+          icon={FILTER_ICONS.thread}
+          options={threadOptions}
+          currentValue={currentUrl}
+          clearUrl={threadClearUrl}
+          activeLabel={threadActiveLabel}
+          activeIcon={threadActiveIcon}
+          iconOnly
+        />
+
         <ChipMediaSelect
           id="af-media"
           icon={FILTER_ICONS.media}

package/src/ui/pages/CollectionsPage.tsx

@@ -15,6 +15,7 @@ export const CollectionsPage: FC<CollectionsPageProps> = ({
   items,
   isAuthenticated,
   sitePathPrefix = "",
+  siteOrigin = "",
 }) => {
   const { i18n } = useLingui();
   const emptyMessage = i18n._(
@@ -27,7 +28,11 @@ export const CollectionsPage: FC<CollectionsPageProps> = ({
   if (isAuthenticated) {
     return (
       <div class="py-6" data-page="collections">
-        <CollectionsManager items={items} sitePathPrefix={sitePathPrefix} />
+        <CollectionsManager
+          items={items}
+          sitePathPrefix={sitePathPrefix}
+          siteOrigin={siteOrigin}
+        />
       </div>
     );
   }
@@ -54,6 +59,7 @@ export const CollectionsPage: FC<CollectionsPageProps> = ({
           items={items}
           emptyMessage={emptyMessage}
           sitePathPrefix={sitePathPrefix}
+          siteOrigin={siteOrigin}
         />
       </div>
     </div>

package/src/ui/pages/__tests__/ArchivePage.test.tsx

@@ -69,4 +69,41 @@ describe("ArchivePage", () => {
 
     expect(html).toContain('title="Published on Mar 30, 2026 at 20:00"');
   });
+
+  it("renders the collection filter alongside the thread filter", () => {
+    const html = renderArchivePage({
+      availableCollections: [{ slug: "tech", title: "Tech" }],
+    });
+
+    expect(html).toContain('id="af-collection"');
+    expect(html).toContain('id="af-thread"');
+  });
+
+  it("renders the thread filter with all options", () => {
+    const html = renderArchivePage();
+
+    expect(html).toContain('id="af-thread"');
+    expect(html).toContain("All posts");
+    expect(html).toContain("Threads");
+    expect(html).toContain("Single posts");
+    expect(html).toContain("replies=any");
+    expect(html).toContain("replies=none");
+  });
+
+  it("serializes visibility latest_hidden as the hidden URL alias", () => {
+    const html = renderArchivePage({
+      isAuthenticated: true,
+      filters: { visibility: "latest_hidden" },
+    });
+
+    expect(html).toContain("visibility=hidden");
+    expect(html).not.toContain("visibility=latest_hidden");
+  });
+
+  it("marks the thread filter active when filtering single posts", () => {
+    const html = renderArchivePage({ filters: { hasReplies: false } });
+
+    expect(html).toContain("archive-chip-active");
+    expect(html).toContain("Single posts");
+  });
 });

package/src/ui/shared/CollectionDirectory.tsx

@@ -6,12 +6,13 @@ import { getCollectionSelectionPath } from "../../lib/collection-paths.js";
 import { getDividerCollectionGroup } from "../../lib/collection-groups.js";
 import { render as renderMarkdown } from "../../lib/markdown.js";
 import { formatRelativeAge, toISOString } from "../../lib/time.js";
-import { toPublicHref, toPublicPath } from "../../lib/url.js";
+import { toPublicHref, toPublicPath, toSameSitePath } from "../../lib/url.js";
 
 export interface CollectionDirectoryProps {
   items: CollectionDirectoryItem[];
   emptyMessage?: string;
   sitePathPrefix?: string;
+  siteOrigin?: string;
 }
 
 const hasDirectoryContent = (items: CollectionDirectoryItem[]) =>
@@ -112,6 +113,7 @@ export const CollectionDirectory: FC<CollectionDirectoryProps> = ({
   items,
   emptyMessage,
   sitePathPrefix = "",
+  siteOrigin = "",
 }) => {
   const { i18n } = useLingui();
 
@@ -173,8 +175,16 @@ export const CollectionDirectory: FC<CollectionDirectoryProps> = ({
 
         if (item.type === "link" && item.label && item.url) {
           const sequence = sequenceLabels[index];
+          // A full URL pointing at this site's own origin is really internal,
+          // so render it without external-link affordances.
+          const sameSitePath = toSameSitePath(item.url, siteOrigin);
+          const linkHref =
+            sameSitePath !== null
+              ? toPublicHref(sameSitePath, sitePathPrefix)
+              : toPublicHref(item.url, sitePathPrefix);
           const isExternal =
-            item.url.startsWith("http://") || item.url.startsWith("https://");
+            sameSitePath === null &&
+            (item.url.startsWith("http://") || item.url.startsWith("https://"));
 
           return (
             <div
@@ -187,7 +197,7 @@ export const CollectionDirectory: FC<CollectionDirectoryProps> = ({
                 </span>
                 <div class="collection-directory-title-row">
                   <a
-                    href={toPublicHref(item.url, sitePathPrefix)}
+                    href={linkHref}
                     class="collection-directory-title-link"
                     {...(isExternal
                       ? { target: "_blank", rel: "noopener noreferrer" }

package/src/ui/shared/CollectionsManager.tsx

@@ -16,11 +16,13 @@ const escapeJson = (data: unknown) =>
 export interface CollectionsManagerProps {
   items: CollectionDirectoryItem[];
   sitePathPrefix?: string;
+  siteOrigin?: string;
 }
 
 export const CollectionsManager: FC<CollectionsManagerProps> = ({
   items,
   sitePathPrefix = "",
+  siteOrigin = "",
 }) => {
   const { i18n } = useLingui();
   const collectionsHref = toPublicPath(
@@ -315,6 +317,7 @@ export const CollectionsManager: FC<CollectionsManagerProps> = ({
           items={items}
           emptyMessage={labels.emptyState}
           sitePathPrefix={sitePathPrefix}
+          siteOrigin={siteOrigin}
         />
       </jant-collections-manager>
     </div>

package/dist/app-CL2PC1Fl.js

@@ -1,6 +0,0 @@
-import "./url-XF0GbKGO.js";
-import { t as createApp } from "./app-BJkOcMbZ.js";
-import "./export-DLukCOO3.js";
-import "./env-CoSe-1y4.js";
-import "./github-sync-BtHY2AST.js";
-export { createApp };