@agent-native/core-corpus 0.222.1 → 0.222.2-nightly-20261029182928

package/corpus/README.md

@@ -32,4 +32,4 @@ rg -n "defineAction|useActionQuery" node_modules/@agent-native/core-corpus/corpu
 
 ## Generated Counts
 
-- template files: 15073
+- template files: 15141

package/corpus/templates/analytics/.deploy-tmp/agent-native-provided-plugins.mjs

@@ -0,0 +1,10 @@
+// AUTO-GENERATED by @agent-native/core deploy build
+import { markDefaultPluginProvided } from "@agent-native/core/server/edge";
+
+const pluginStems = ["agent-chat","analytics-alert-jobs","analytics-rollup-backfill-jobs","auth","collab","config","content-metrics-collection-jobs","core-routes","creative-context","dashboard-report-jobs","db","feature-flags","labs","onboarding","otel","session-replay-retention-jobs","transactional-emails","uptime-monitor-jobs"];
+
+export default function markBuildDiscoveredPlugins(nitroApp) {
+  for (const stem of pluginStems) {
+    markDefaultPluginProvided(nitroApp, stem);
+  }
+}

package/corpus/templates/assets/.deploy-tmp/agent-native-provided-plugins.mjs

@@ -0,0 +1,10 @@
+// AUTO-GENERATED by @agent-native/core deploy build
+import { markDefaultPluginProvided } from "@agent-native/core/server/edge";
+
+const pluginStems = ["agent-chat","auth","creative-context","db","labs","onboarding","otel"];
+
+export default function markBuildDiscoveredPlugins(nitroApp) {
+  for (const stem of pluginStems) {
+    markDefaultPluginProvided(nitroApp, stem);
+  }
+}

package/corpus/templates/brain/.deploy-tmp/agent-native-provided-plugins.mjs

@@ -0,0 +1,10 @@
+// AUTO-GENERATED by @agent-native/core deploy build
+import { markDefaultPluginProvided } from "@agent-native/core/server/edge";
+
+const pluginStems = ["agent-chat","auth","brain-jobs","core-routes","db","otel"];
+
+export default function markBuildDiscoveredPlugins(nitroApp) {
+  for (const stem of pluginStems) {
+    markDefaultPluginProvided(nitroApp, stem);
+  }
+}

package/corpus/templates/brain/server/plugins/auth.ts

@@ -13,5 +13,5 @@ export default createToolkitAuthPlugin({
       "Review company-wide knowledge through proposal workflows",
     ],
   },
-  publicPaths: ["/api/_agent-native/brain/ingest"],
+  publicPaths: ["/api/_agent-native/brain/ingest", "/api/brain/queue/run"],
 });

package/corpus/templates/brain/server/routes/api/brain/queue/run.post.ts

@@ -13,12 +13,6 @@ declare global {
 export const BRAIN_QUEUE_SWEEP_LIMIT = 25;
 export const BRAIN_MAX_DISTILLATIONS_PER_SWEEP = 2;
 
-function productionLike() {
-  return (
-    process.env.NODE_ENV === "production" || process.env.NETLIFY === "true"
-  );
-}
-
 function scheduledFunctionRuntime() {
   return globalThis.__AGENT_NATIVE_BRAIN_SCHEDULED_RUNTIME__ === true;
 }
@@ -35,7 +29,7 @@ function headerMatchesSecret(header: string | undefined, secret: string) {
 export default defineEventHandler(async (event) => {
   const secret = process.env.BRAIN_JOBS_SECRET?.trim(); // guard:allow-env-credential — deployment-level scheduler route secret
   const scheduled = scheduledFunctionRuntime();
-  if (!secret && productionLike() && !scheduled) {
+  if (!secret && !scheduled) {
     throw createError({
       statusCode: 503,
       statusMessage: "BRAIN_JOBS_SECRET is required",

package/corpus/templates/calendar/.deploy-tmp/agent-native-provided-plugins.mjs

@@ -0,0 +1,10 @@
+// AUTO-GENERATED by @agent-native/core deploy build
+import { markDefaultPluginProvided } from "@agent-native/core/server/edge";
+
+const pluginStems = ["agent-chat","auth","core-routes","db","event-rules","oauth-refresh","otel","transactional-emails"];
+
+export default function markBuildDiscoveredPlugins(nitroApp) {
+  for (const stem of pluginStems) {
+    markDefaultPluginProvided(nitroApp, stem);
+  }
+}

package/corpus/templates/chat/.deploy-tmp/agent-native-provided-plugins.mjs

@@ -0,0 +1,10 @@
+// AUTO-GENERATED by @agent-native/core deploy build
+import { markDefaultPluginProvided } from "@agent-native/core/server/edge";
+
+const pluginStems = ["agent-chat","auth","otel"];
+
+export default function markBuildDiscoveredPlugins(nitroApp) {
+  for (const stem of pluginStems) {
+    markDefaultPluginProvided(nitroApp, stem);
+  }
+}

package/corpus/templates/clips/.deploy-tmp/agent-native-provided-plugins.mjs

@@ -0,0 +1,10 @@
+// AUTO-GENERATED by @agent-native/core deploy build
+import { markDefaultPluginProvided } from "@agent-native/core/server/edge";
+
+const pluginStems = ["agent-chat","auth","calendar-jobs","config","core-routes","db","feature-flags","labs","onboarding","onboarding-calendar","otel","transactional-email-catalog"];
+
+export default function markBuildDiscoveredPlugins(nitroApp) {
+  for (const stem of pluginStems) {
+    markDefaultPluginProvided(nitroApp, stem);
+  }
+}

package/corpus/templates/clips/app/components/clips-command-menu.tsx

@@ -1,8 +1,10 @@
 import { useT } from "@agent-native/core/client/i18n";
+import { useLab } from "@agent-native/core/client/labs";
 import { useOrgRole } from "@agent-native/core/client/org";
 import { docsUrl } from "@agent-native/core/shared";
 import { useCommandMenuShortcut } from "@agent-native/toolkit/app/shared";
 import { CommandMenu } from "@agent-native/toolkit/app/shared";
+import { CLIPS_SCREENSHOTS } from "@shared/labs";
 import {
   IconArchive,
   IconPhoto,
@@ -393,6 +395,7 @@ export function ClipsCommandMenu({
   const location = useLocation();
   const navigate = useNavigate();
   const t = useT();
+  const screenshotsEnabled = useLab(CLIPS_SCREENSHOTS);
   const { canManageOrg } = useOrgRole();
   const context = useMemo(
     () => commandRouteContext(location.pathname),
@@ -614,13 +617,15 @@ export function ClipsCommandMenu({
           {t("navigation.dictate")}
           <CommandMenu.Shortcut>G D</CommandMenu.Shortcut>
         </CommandMenu.Item>
-        <CommandMenu.Item
-          onSelect={() => void navigate("/screenshots")}
-          keywords={["screenshots", "screenshot", "images", "stills"]}
-        >
-          <IconPhoto size={16} />
-          {t("navigation.screenshots")}
-        </CommandMenu.Item>
+        {screenshotsEnabled && (
+          <CommandMenu.Item
+            onSelect={() => void navigate("/screenshots")}
+            keywords={["screenshots", "screenshot", "images", "stills"]}
+          >
+            <IconPhoto size={16} />
+            {t("navigation.screenshots")}
+          </CommandMenu.Item>
+        )}
         <CommandMenu.Item
           onSelect={() => void navigate("/archive")}
           keywords={["archive"]}

package/corpus/templates/clips/app/components/import-menu.tsx

@@ -1,4 +1,6 @@
 import { useT } from "@agent-native/core/client/i18n";
+import { useLab } from "@agent-native/core/client/labs";
+import { CLIPS_SCREENSHOTS } from "@shared/labs";
 import { IconChevronDown, IconUpload } from "@tabler/icons-react";
 import { useState } from "react";
 
@@ -63,6 +65,7 @@ export function ImportMenu({
   variant = "outline",
 }: ImportMenuProps) {
   const t = useT();
+  const screenshotsEnabled = useLab(CLIPS_SCREENSHOTS);
   const { input, openUploadPicker } = useUploadVideoPicker();
   const [loomDialogOpen, setLoomDialogOpen] = useState(false);
 
@@ -118,7 +121,7 @@ export function ImportMenu({
               {t("preRecord.uploadVideo")}
             </DropdownMenuItem>
           ) : null}
-          {onScreenshot ? (
+          {onScreenshot && screenshotsEnabled ? (
             <DropdownMenuItem
               disabled={screenshotPending}
               onSelect={(event) => {

package/corpus/templates/clips/app/components/library/library-grid.tsx

@@ -6,7 +6,7 @@ import {
 import { useT } from "@agent-native/core/client/i18n";
 import { normalizeDocumentTitle } from "@agent-native/core/shared";
 import { FileStorageSetupPopover } from "@agent-native/toolkit/app/chat/FileStorageSetupPopover";
-import { IconAlertTriangle } from "@tabler/icons-react";
+import { IconAlertTriangle, IconPhoto } from "@tabler/icons-react";
 import {
   type DragEvent,
   type ReactElement,
@@ -59,7 +59,7 @@ import { resolveVideoMimeType } from "@/lib/video-metadata";
 
 import { BulkActionToolbar, type BulkMoveTarget } from "./bulk-action-toolbar";
 import { DroppedUploadCard } from "./dropped-upload-card";
-import { EmptyState } from "./empty-state";
+import { AppEmptyState, EmptyState } from "./empty-state";
 import { FilterChips, type FilterChip } from "./filter-chips";
 import { FolderCard } from "./folder-card";
 import { buildLibraryActionHrefs } from "./library-action-hrefs";
@@ -757,7 +757,7 @@ export function LibraryGrid({
             />
           )}
           <div className="ms-auto flex shrink-0 items-center gap-2 lg:col-start-3 lg:ms-0 lg:justify-self-end">
-            {!isEmptyState && extraActions}
+            {(!isEmptyState || kind === "image") && extraActions}
             {!isEmptyState && (
               <SortMenu value={sort} onChange={handleSortChange} />
             )}
@@ -834,11 +834,18 @@ export function LibraryGrid({
               ) : recordings.length === 0 &&
                 visibleFolders.length === 0 &&
                 uploads.length === 0 ? (
-                <EmptyState
-                  kind={resolvedEmptyKind}
-                  spaceId={spaceId}
-                  folderId={folderId}
-                />
+                kind === "image" ? (
+                  <AppEmptyState
+                    icon={IconPhoto}
+                    title={t("navigation.screenshots")}
+                  />
+                ) : (
+                  <EmptyState
+                    kind={resolvedEmptyKind}
+                    spaceId={spaceId}
+                    folderId={folderId}
+                  />
+                )
               ) : (
                 <div className="flex flex-col gap-8">
                   {visibleFolders.length > 0 && (

package/corpus/templates/clips/app/components/library/library-layout.tsx

@@ -12,7 +12,11 @@ import {
   AppSidebarFooter,
   AppSidebarHeader,
 } from "@agent-native/toolkit/app/shared";
-import { CLIPS_MEETINGS, CLIPS_VOICE_DICTATION } from "@shared/labs";
+import {
+  CLIPS_MEETINGS,
+  CLIPS_SCREENSHOTS,
+  CLIPS_VOICE_DICTATION,
+} from "@shared/labs";
 import {
   IconInbox,
   IconPhoto,
@@ -195,6 +199,7 @@ export function LibraryLayout({ children }: LibraryLayoutProps) {
   const t = useT();
   const isRecordingRoute = location.pathname.startsWith("/r/");
   const meetingsLabEnabled = useLab(CLIPS_MEETINGS);
+  const screenshotsLabEnabled = useLab(CLIPS_SCREENSHOTS);
   const voiceDictationLabEnabled = useLab(CLIPS_VOICE_DICTATION);
   const recordingScope = useMemo(() => {
     const match = location.pathname.match(/^\/(?:r|share)\/([^/]+)/);
@@ -564,7 +569,10 @@ export function LibraryLayout({ children }: LibraryLayoutProps) {
   ];
 
   const primaryNavItems = navItems.filter(
-    ({ to }) => to !== "/archive" && to !== "/trash",
+    ({ to }) =>
+      to !== "/archive" &&
+      to !== "/trash" &&
+      (to !== "/screenshots" || screenshotsLabEnabled),
   );
   const lifecycleNavItems = navItems.filter(
     ({ to }) => to === "/archive" || to === "/trash",

package/corpus/templates/clips/app/components/player/share-dialog.tsx

@@ -64,6 +64,7 @@ import {
   PopoverTrigger,
   PopoverContent,
 } from "@/components/ui/popover";
+import { Switch } from "@/components/ui/switch";
 import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { cn } from "@/lib/utils";
 
@@ -755,7 +756,7 @@ function RecordingAdvancedAccess({
           >
             {t("embedRoute.passwordRequired")}
           </Label>
-          <ViewerSwitch
+          <Switch
             id="share-password-required"
             checked={passwordEnabled}
             disabled={!canEdit || updateRecording.isPending}
@@ -765,7 +766,7 @@ function RecordingAdvancedAccess({
 
         {passwordEnabled ? (
           <>
-            <div className="flex gap-2">
+            <div className="grid grid-cols-[minmax(0,1fr)_auto] gap-2">
               <Input
                 size="sm"
                 type="text"
@@ -778,12 +779,10 @@ function RecordingAdvancedAccess({
                     ? t("playerSettings.passwordSetPlaceholder")
                     : t("playerSettings.passwordInputPlaceholder")
                 }
-                className="min-w-0"
               />
               <Button
                 type="button"
                 size="sm"
-                className="shrink-0"
                 disabled={
                   !canEdit || updateRecording.isPending || !password.trim()
                 }
@@ -815,7 +814,7 @@ function RecordingAdvancedAccess({
         <Label htmlFor="share-expiry" className="text-sm font-normal">
           {t("shareDialog.linkExpires")}
         </Label>
-        <div className="flex gap-2">
+        <div className="grid grid-cols-[minmax(0,1fr)_auto] gap-2">
           <Input
             id="share-expiry"
             size="sm"
@@ -825,12 +824,10 @@ function RecordingAdvancedAccess({
             onChange={(event) =>
               setExpiryDraft(fromDatetimeLocal(event.target.value))
             }
-            className="min-w-0"
           />
           <Button
             type="button"
             size="sm"
-            className="shrink-0"
             disabled={!canEdit || updateRecording.isPending}
             onClick={() => {
               const nextExpiry = expiryDraft || null;

package/corpus/templates/clips/app/components/sharing/share-ui.tsx

@@ -92,7 +92,7 @@ export function ShareAdvancedPopover({
           align="start"
           sideOffset={6}
           onOpenAutoFocus={(event) => event.preventDefault()}
-          className="w-72 space-y-3 p-3"
+          className="w-80 max-w-[calc(100vw-2rem)] space-y-3 p-3"
         >
           {children}
         </PopoverContent>

package/corpus/templates/clips/app/routes/_app.screenshots.tsx

@@ -1,7 +1,11 @@
 import { useT } from "@agent-native/core/client/i18n";
+import { useLabState } from "@agent-native/core/client/labs";
+import { CLIPS_SCREENSHOTS } from "@shared/labs";
+import { Navigate } from "react-router";
 
 import { LibraryGrid } from "@/components/library/library-grid";
 import { ScreenshotPrimaryAction } from "@/components/library/library-primary-actions";
+import { Button } from "@/components/ui/button";
 import enMessages from "@/i18n/en-US";
 
 export function meta() {
@@ -16,6 +20,18 @@ export function meta() {
  */
 export default function ScreenshotsRoute() {
   const t = useT();
+  const lab = useLabState(CLIPS_SCREENSHOTS.key);
+  if (lab.isLoading) return null;
+  if (lab.isError) {
+    return (
+      <div role="alert" className="flex flex-col items-center gap-4 py-20">
+        <p>{t("sharePage.somethingWentWrong")}</p>
+        <Button onClick={lab.refetch}>{t("libraryGrid.retry")}</Button>
+      </div>
+    );
+  }
+  if (!lab.isSuccess) return null;
+  if (!lab.enabled) return <Navigate replace to="/library" />;
   return (
     <LibraryGrid
       view="library"

package/corpus/templates/clips/app/routes/_app.settings._index.tsx

@@ -4,7 +4,11 @@ import {
   SettingsTabsPage,
   useAgentSettingsTabs,
 } from "@agent-native/toolkit/app/settings";
-import { CLIPS_LABS, CLIPS_VOICE_DICTATION } from "@shared/labs";
+import {
+  CLIPS_LABS,
+  CLIPS_SCREENSHOTS,
+  CLIPS_VOICE_DICTATION,
+} from "@shared/labs";
 import { useMemo } from "react";
 
 import { useClipsSettingsRedesign } from "@/components/settings/clips-settings-redesign";
@@ -54,6 +58,13 @@ export default function SettingsIndexRoute() {
             description: t("settings.labLookbackContextDescription"),
           };
         }
+        if (lab.key === CLIPS_SCREENSHOTS.key) {
+          return {
+            ...lab,
+            displayName: t("navigation.screenshots"),
+            description: t("preRecord.takeScreenshot"),
+          };
+        }
         if (lab.key === CLIPS_VOICE_DICTATION.key) {
           return {
             ...lab,

package/corpus/templates/clips/changelog/2026-10-28-fixed-the-share-advanced-popover-so-the-save-buttons-fit-and.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-10-28
+---
+
+Fixed the Share → Advanced popover so the Save buttons fit and the password toggle matches other switches

package/corpus/templates/clips/changelog/2026-10-29-screenshots-are-available-when-enabled-in-labs.md

@@ -0,0 +1,6 @@
+---
+type: changed
+date: 2026-10-29
+---
+
+Screenshots are available when enabled in Labs.

package/corpus/templates/clips/server/lib/content-clip-peer.ts

@@ -13,7 +13,18 @@ import {
 } from "@agent-native/core/server";
 import { ForbiddenError, resolveAccess } from "@agent-native/core/sharing";
 import { isEmailDerivedName } from "@agent-native/core/user-profile";
-import { and, asc, eq, isNull, sql } from "drizzle-orm";
+import {
+  and,
+  asc,
+  count,
+  eq,
+  inArray,
+  isNotNull,
+  isNull,
+  sql,
+  type SQL,
+} from "drizzle-orm";
+import { alias } from "drizzle-orm/pg-core";
 import { getQuery, getRequestHeader, getRouterParam, type H3Event } from "h3";
 import { z } from "zod";
 
@@ -29,8 +40,13 @@ import {
   CONTENT_CLIP_CLAIMS,
   CONTENT_CLIP_COMMENT_AUTHOR_CHARS,
   CONTENT_CLIP_COMMENT_PREVIEW_CHARS,
+  CONTENT_CLIP_COMMENT_TEXT_CHARS,
+  CONTENT_CLIP_MAX_COMMENT_CHARS,
   CONTENT_CLIP_MAX_COMMENT_THREADS,
+  CONTENT_CLIP_MAX_LISTED_REPLIES,
   CONTENT_CLIP_MAX_TOKEN_SECONDS,
+  CONTENT_CLIP_MAX_VIDEO_TIMESTAMP_MS,
+  CONTENT_CLIP_OPEN_THREADS_VIEW,
   CONTENT_CLIP_PUBLIC_READER,
   CONTENT_CLIP_RECORDING_TITLE_CHARS,
   CONTENT_CLIP_SCOPES,
@@ -92,10 +108,8 @@ const MAX_DOCUMENT_ID_CHARS = 256;
 const MAX_ISSUER_CHARS = 2048;
 const MAX_VIEWER_NAME_CHARS = 200;
 const ISSUED_AT_SKEW_SECONDS = 60;
-const MAX_COMMENT_CHARS = 10_000;
 const MAX_COMMENT_ID_CHARS = 128;
 const MAX_EMOJI_CHARS = 32;
-const MAX_VIDEO_TIMESTAMP_MS = 7 * 24 * 60 * 60 * 1000;
 const MAX_BODY_BYTES = 64 * 1024;
 const viewerEmailSchema = z.string().email().max(320);
 
@@ -556,50 +570,152 @@ const commentListQuerySchema = z.object({
     .transform(Number)
     .pipe(z.number().int().min(1).max(CONTENT_CLIP_MAX_COMMENT_THREADS))
     .default(CONTENT_CLIP_MAX_COMMENT_THREADS),
+  view: z.literal(CONTENT_CLIP_OPEN_THREADS_VIEW).optional(),
 });
 
 /**
  * The first `limit` thread starts by video time, as `list-comments` orders
- * them, reading one more to tell a full page from the whole list. Text and
- * names are cut to the contract's lengths. A signed-out reader's list carries
- * no commenter's email, nor a name made from one.
+ * them, reading one more to tell a full page from the whole list. The
+ * open-threads view lists only open threads, each with its replies up to the
+ * contract's bound. Text and names are cut to the contract's lengths. A
+ * signed-out reader's list carries no commenter's email, nor a name made
+ * from one.
  */
-async function listCommentThreads(peer: ContentClipPeer, limit: number) {
+async function listCommentThreads(
+  peer: ContentClipPeer,
+  limit: number,
+  openThreads: boolean,
+) {
   const { recordingId } = peer;
   const signedOut = peer.viewerEmail === null;
   await assertCommentAccess(recordingId, "read");
   const comments = schema.recordingComments;
+  const text = sql<string>`left(${comments.content}, ${
+    openThreads
+      ? CONTENT_CLIP_COMMENT_TEXT_CHARS
+      : CONTENT_CLIP_COMMENT_PREVIEW_CHARS
+  })`;
   const rows = await getDb()
     .select({
       id: comments.id,
       authorEmail: comments.authorEmail,
       authorName: comments.authorName,
-      content: sql<string>`left(${comments.content}, ${CONTENT_CLIP_COMMENT_PREVIEW_CHARS})`,
+      content: text,
       videoTimestampMs: comments.videoTimestampMs,
+      createdAt: comments.createdAt,
     })
     .from(comments)
     .where(
-      and(eq(comments.recordingId, recordingId), isNull(comments.parentId)),
+      and(
+        eq(comments.recordingId, recordingId),
+        isNull(comments.parentId),
+        openThreads ? eq(comments.resolved, false) : undefined,
+      ),
+    )
+    .orderBy(
+      asc(comments.videoTimestampMs),
+      asc(comments.createdAt),
+      asc(comments.id),
     )
-    .orderBy(asc(comments.videoTimestampMs), asc(comments.createdAt))
     .limit(limit + 1);
+  const author = <
+    Row extends { authorEmail: string; authorName: string | null },
+  >(
+    row: Row,
+  ) => {
+    const authorName =
+      signedOut && isEmailDerivedName(row.authorName, row.authorEmail)
+        ? null
+        : row.authorName;
+    return {
+      ...row,
+      authorEmail: signedOut
+        ? null
+        : row.authorEmail.slice(0, CONTENT_CLIP_COMMENT_AUTHOR_CHARS),
+      authorName:
+        authorName?.slice(0, CONTENT_CLIP_COMMENT_AUTHOR_CHARS) ?? null,
+    };
+  };
   const threads = await hydrateCommentAuthorNames(rows.slice(0, limit));
+  const truncated = rows.length > limit;
+  if (!openThreads) {
+    return {
+      comments: threads.map(({ createdAt: _createdAt, ...thread }) =>
+        author(thread),
+      ),
+      truncated,
+    };
+  }
+
+  const threadIds = threads.map((thread) => thread.id);
+  const replies = threadIds.length
+    ? await listThreadReplies(recordingId, threadIds, text)
+    : { rows: [], counts: new Map<string, number>() };
+  const repliesOf = new Map<string, unknown[]>();
+  for (const { threadId, ...reply } of await hydrateCommentAuthorNames(
+    replies.rows,
+  )) {
+    repliesOf.set(threadId, [
+      ...(repliesOf.get(threadId) ?? []),
+      author(reply),
+    ]);
+  }
   return {
-    comments: threads.map((thread) => {
-      const authorName =
-        signedOut && isEmailDerivedName(thread.authorName, thread.authorEmail)
-          ? null
-          : thread.authorName;
-      return {
-        ...thread,
-        authorEmail: signedOut
-          ? null
-          : thread.authorEmail.slice(0, CONTENT_CLIP_COMMENT_AUTHOR_CHARS),
-        authorName:
-          authorName?.slice(0, CONTENT_CLIP_COMMENT_AUTHOR_CHARS) ?? null,
-      };
-    }),
-    truncated: rows.length > limit,
+    comments: threads.map((thread) => ({
+      ...author(thread),
+      replyCount: replies.counts.get(thread.id) ?? 0,
+      replies: repliesOf.get(thread.id) ?? [],
+    })),
+    truncated,
+  };
+}
+
+/**
+ * The listed threads' replies, oldest first, from the earliest thread on and
+ * no more than the contract's bound, with how many each thread has.
+ */
+async function listThreadReplies(
+  recordingId: string,
+  threadIds: string[],
+  text: SQL<string>,
+) {
+  const comments = schema.recordingComments;
+  const root = alias(comments, "thread_start");
+  const inThreads = and(
+    eq(comments.recordingId, recordingId),
+    inArray(comments.threadId, threadIds),
+    isNotNull(comments.parentId),
+  );
+  const [rows, counts] = await Promise.all([
+    getDb()
+      .select({
+        id: comments.id,
+        threadId: comments.threadId,
+        authorEmail: comments.authorEmail,
+        authorName: comments.authorName,
+        content: text,
+        createdAt: comments.createdAt,
+      })
+      .from(comments)
+      .innerJoin(root, eq(root.id, comments.threadId))
+      .where(inThreads)
+      .orderBy(
+        asc(root.videoTimestampMs),
+        asc(root.createdAt),
+        asc(root.id),
+        asc(comments.createdAt),
+        asc(comments.id),
+      )
+      .limit(CONTENT_CLIP_MAX_LISTED_REPLIES),
+    getDb()
+      .select({ threadId: comments.threadId, replies: count() })
+      .from(comments)
+      .where(inThreads)
+      .groupBy(comments.threadId),
+  ]);
+  return {
+    rows,
+    counts: new Map(counts.map((row) => [row.threadId, Number(row.replies)])),
   };
 }
 
@@ -629,21 +745,35 @@ export async function handleContentClipComments(
       );
     }
     try {
-      return json(await listCommentThreads(peer, query.data.limit));
+      return json(
+        await listCommentThreads(
+          peer,
+          query.data.limit,
+          query.data.view === CONTENT_CLIP_OPEN_THREADS_VIEW,
+        ),
+      );
     } catch (error) {
       return forbiddenResponse(error);
     }
   });
 }
 
-const commentText = z.string().trim().min(1).max(MAX_COMMENT_CHARS);
+const commentText = z
+  .string()
+  .trim()
+  .min(1)
+  .max(CONTENT_CLIP_MAX_COMMENT_CHARS);
 const commentId = z.string().trim().min(1).max(MAX_COMMENT_ID_CHARS);
 const commentWriteSchema = z.discriminatedUnion("operation", [
   z
     .object({
       operation: z.literal("add"),
       content: commentText,
-      videoTimestampMs: z.number().int().min(0).max(MAX_VIDEO_TIMESTAMP_MS),
+      videoTimestampMs: z
+        .number()
+        .int()
+        .min(0)
+        .max(CONTENT_CLIP_MAX_VIDEO_TIMESTAMP_MS),
     })
     .strict(),
   z