@agent-native/core-corpus 0.211.0 → 0.211.1-nightly-20261020213022

package/corpus/README.md

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

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/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/actions/delete-recording-permanent.ts

@@ -31,6 +31,44 @@ import {
 } from "../server/lib/video-storage.js";
 import { trashRecordingContextFootage } from "./remove-recording-context.js";
 
+/** The URLs among `urls` that a recording other than `recordingId` uses. */
+async function mediaUsedElsewhere(
+  db: Pick<ReturnType<typeof getDb>, "select">,
+  recordingId: string,
+  urls: string[],
+): Promise<Set<string>> {
+  const used = new Set<string>();
+  if (urls.length === 0) return used;
+  // guard:allow-unscoped — a file another owner's recording uses must survive too; only matching URLs leave this function, never rows.
+  const references = await db
+    .select({
+      videoUrl: schema.recordings.videoUrl,
+      thumbnailUrl: schema.recordings.thumbnailUrl,
+      animatedThumbnailUrl: schema.recordings.animatedThumbnailUrl,
+      imageUrl: schema.recordings.imageUrl,
+      baseImageUrl: schema.recordings.baseImageUrl,
+    })
+    .from(schema.recordings)
+    .where(
+      and(
+        ne(schema.recordings.id, recordingId),
+        or(
+          inArray(schema.recordings.videoUrl, urls),
+          inArray(schema.recordings.thumbnailUrl, urls),
+          inArray(schema.recordings.animatedThumbnailUrl, urls),
+          inArray(schema.recordings.imageUrl, urls),
+          inArray(schema.recordings.baseImageUrl, urls),
+        ),
+      ),
+    );
+  for (const reference of references) {
+    for (const url of recordingMediaUrls(reference)) {
+      if (urls.includes(url)) used.add(url);
+    }
+  }
+  return used;
+}
+
 export default defineAction({
   description:
     "Permanently delete a recording and every related row (comments, reactions, viewers, events, transcript, tags, CTAs, shares, diagnostics, bug reports, screen history context). The context's footage is trashed. This cannot be undone.",
@@ -64,37 +102,6 @@ export default defineAction({
       throw new Error(`Hosted recording allowance not found: ${args.id}`);
     }
 
-    const mediaUrls = recordingMediaUrls(existing);
-    const protectedUrls = new Set<string>();
-    if (mediaUrls.length > 0) {
-      const mediaReferences = await db
-        .select({
-          videoUrl: schema.recordings.videoUrl,
-          thumbnailUrl: schema.recordings.thumbnailUrl,
-          animatedThumbnailUrl: schema.recordings.animatedThumbnailUrl,
-          imageUrl: schema.recordings.imageUrl,
-          baseImageUrl: schema.recordings.baseImageUrl,
-        })
-        .from(schema.recordings)
-        .where(
-          and(
-            ne(schema.recordings.id, args.id),
-            or(
-              inArray(schema.recordings.videoUrl, mediaUrls),
-              inArray(schema.recordings.thumbnailUrl, mediaUrls),
-              inArray(schema.recordings.animatedThumbnailUrl, mediaUrls),
-              inArray(schema.recordings.imageUrl, mediaUrls),
-              inArray(schema.recordings.baseImageUrl, mediaUrls),
-            ),
-          ),
-        );
-      for (const reference of mediaReferences) {
-        for (const url of recordingMediaUrls(reference)) {
-          if (mediaUrls.includes(url)) protectedUrls.add(url);
-        }
-      }
-    }
-
     // Some of a screenshot's files are unredacted: its leftovers, and its
     // base while boxes are still pending. The row is the only record of them,
     // so they go first, and the row stays — with its hold and a way to retry
@@ -139,8 +146,9 @@ export default defineAction({
           ? [existing.baseImageUrl]
           : []),
       ];
+      const usedElsewhere = await mediaUsedElsewhere(db, args.id, unredacted);
       for (const url of new Set(unredacted)) {
-        if (protectedUrls.has(url)) continue;
+        if (usedElsewhere.has(url)) continue;
         let gone = false;
         try {
           gone = await deleteStoredMediaUrl(url, {
@@ -237,36 +245,27 @@ export default defineAction({
       .from(schema.recordingBrowserDiagnostics)
       .where(eq(schema.recordingBrowserDiagnostics.recordingId, args.id));
 
-    // Hosted media goes after every other fallible step and just before the
-    // row: once the row is gone nothing can find the objects or the allowance,
-    // so an unconfirmed delete would strand both, while an earlier delete
-    // would leave a surviving row pointing at deleted objects. Deleting an
-    // already-deleted object succeeds, so a retry finishes it.
-    const cleanupProtectedUrls = new Set([...protectedUrls, ...alreadyDeleted]);
-    let hostedMediaCleanup: Awaited<
-      ReturnType<typeof deleteRecordingMediaObjects>
-    > | null = null;
-    if (hostedAllowance) {
-      hostedMediaCleanup = await deleteRecordingMediaObjects(existing, {
-        protectedUrls: cleanupProtectedUrls,
-      });
-      const unprotectedUrls = mediaUrls.filter(
-        (url) => !cleanupProtectedUrls.has(url),
-      );
-      if (
-        hostedMediaCleanup.deleted + hostedMediaCleanup.external <
-        unprotectedUrls.length
-      ) {
-        fail(
-          "Hosted media for this recording could not be deleted from storage, so the recording was kept. Try again later.",
-          { errorCode: "hosted_media_cleanup_incomplete", statusCode: 502 },
-        );
+    const { deleted, protectedUrls } = await db.transaction(async (tx) => {
+      // The recording is locked before anything that hangs off it, the order
+      // apply-rewind-extension takes, so the two cannot deadlock. Its media is
+      // read under the lock: a write that landed since the read above would
+      // otherwise leave its new files out of the cleanup below.
+      const [locked] = await tx
+        .select()
+        .from(schema.recordings)
+        .where(eq(schema.recordings.id, args.id))
+        .for("update");
+      if (!locked) {
+        fail(`Recording not found: ${args.id}`, {
+          errorCode: "recording_not_found",
+          statusCode: 404,
+        });
       }
-    }
-
-    await db.transaction(async (tx) => {
-      // Cascade delete every related row before deleting remote objects. If any
-      // DB delete fails, the transaction rolls back and provider media stays put.
+      const protectedUrls = await mediaUsedElsewhere(
+        tx,
+        args.id,
+        recordingMediaUrls(locked),
+      );
       await tx
         .delete(schema.recordingComments)
         .where(eq(schema.recordingComments.recordingId, args.id));
@@ -312,16 +311,47 @@ export default defineAction({
       await tx
         .delete(schema.recordings)
         .where(eq(schema.recordings.id, args.id));
+      return { deleted: locked, protectedUrls };
     });
 
-    const mediaCleanup =
-      hostedMediaCleanup ??
-      (await deleteRecordingMediaObjects(existing, {
-        protectedUrls: cleanupProtectedUrls,
-      }));
+    // Media goes only once its rows are gone, so a failed delete above leaves
+    // the Clip whole. A file that fails here stays in storage and nothing
+    // sweeps it later. A finished upload's bytes then stay counted, because
+    // each delete subtracts only the bytes it removed, and the log names the
+    // recording.
+    const cleanupProtectedUrls = new Set([...protectedUrls, ...alreadyDeleted]);
+    const mediaCleanup = await deleteRecordingMediaObjects(deleted, {
+      protectedUrls: cleanupProtectedUrls,
+    });
+    const hostedFilesLeft = hostedAllowance
+      ? recordingMediaUrls(deleted).filter(
+          (url) => !cleanupProtectedUrls.has(url),
+        ).length -
+        mediaCleanup.deleted -
+        mediaCleanup.external
+      : 0;
+    if (hostedFilesLeft > 0) {
+      console.error(
+        `[delete-recording-permanent] deleted ${args.id}, but ${hostedFilesLeft} of its hosted files could not be removed from storage.`,
+        mediaCleanup.errors,
+      );
+    }
 
     if (hostedAllowance) {
-      if (hostedAllowance.status === "consumed") {
+      // Read again now the row is gone: an upload that finished while this
+      // ran has consumed the reservation read above.
+      const allowance = await getHostedClipRecordingAllowance({
+        recordingId: args.id,
+        userId: hostedAllowance.userId,
+      });
+      if (allowance?.status === "reserved") {
+        // Released even with files left: with the row gone nothing else can
+        // reach it, and it would hold one of the owner's hosted Clips for good.
+        await releaseHostedClipRecording({
+          recordingId: args.id,
+          userId: hostedAllowance.userId,
+        });
+      } else if (allowance?.status === "consumed" && hostedFilesLeft === 0) {
         const adjustment = await adjustHostedClipRecordingBytes({
           recordingId: args.id,
           userId: hostedAllowance.userId,
@@ -333,11 +363,6 @@ export default defineAction({
             `Hosted recording retained-byte quota could not be released: ${args.id}`,
           );
         }
-      } else if (hostedAllowance.status === "reserved") {
-        await releaseHostedClipRecording({
-          recordingId: args.id,
-          userId: hostedAllowance.userId,
-        });
       }
     }
     const appActivityCleanup = diagnostics?.appActivityBlobJson

package/corpus/templates/clips/app/components/player/transcript-import-button.tsx

@@ -7,7 +7,7 @@ import {
   type TranscriptImportError,
 } from "@shared/transcript-import";
 import { IconFileUpload, IconLoader2 } from "@tabler/icons-react";
-import { useRef } from "react";
+import { useRef, useState } from "react";
 import { toast } from "sonner";
 
 import {
@@ -70,6 +70,13 @@ export function TranscriptImportButton({
   const inputRef = useRef<HTMLInputElement>(null);
   const triggerRef = useRef<HTMLButtonElement>(null);
   const label = t("transcriptImport.addFile");
+  // The caller clears `replacement` as soon as the question is answered, a
+  // few frames before the dialog finishes closing, so the dialog keeps the
+  // last file it asked about.
+  const [shownReplacement, setShownReplacement] = useState(replacement);
+  if (replacement && replacement !== shownReplacement) {
+    setShownReplacement(replacement);
+  }
 
   // aria-disabled, not disabled: a disabled button cannot take the focus the
   // replace dialog hands back while the import is still saving.
@@ -210,7 +217,7 @@ export function TranscriptImportButton({
             </AlertDialogTitle>
             <AlertDialogDescription>
               {t("transcriptImport.replaceDescription", {
-                fileName: replacement?.fileName ?? "",
+                fileName: shownReplacement?.fileName ?? "",
               })}
             </AlertDialogDescription>
           </AlertDialogHeader>

package/corpus/templates/clips/changelog/2026-10-16-if-permanently-deleting-a-clip-fails-the-clip-and-its-video-.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-10-16
+---
+
+If permanently deleting a Clip fails, the Clip and its video are left intact.

package/corpus/templates/clips/changelog/2026-10-16-the-replace-transcript-dialog-keeps-showing-the-file-name-wh.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-10-16
+---
+
+The Replace transcript dialog keeps showing the file name while it closes.

package/corpus/templates/clips/changelog/2026-10-16-tooltips-no-longer-pop-up-on-their-own-after-a-menu-popover-.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-10-16
+---
+
+Tooltips no longer pop up on their own after a menu, popover, or dialog closes.

package/corpus/templates/clips/changelog/2026-10-16-video-posters-load-again-when-your-own-storage-runs-on-a-pri.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-10-16
+---
+
+Video posters load again when your own storage runs on a private network address.

package/corpus/templates/clips/server/lib/upload-recording-media.ts

@@ -108,6 +108,9 @@ export async function uploadRecordingMedia(
   }
 
   const { recordingId, ownerEmail, ...upload } = input;
+  // Stored under the recording's id, the only names the recording-bound bucket
+  // readers accept, so its own-bucket files load even from a private address.
+  const filename = recordingScopedFilename(recordingId, upload.filename);
   if (recording.storageMode === "hosted") {
     const uploadedBytes = upload.data.byteLength;
     if (!Number.isSafeInteger(uploadedBytes) || uploadedBytes < 0) {
@@ -122,7 +125,7 @@ export async function uploadRecordingMedia(
 
     const uploaded = await clipsHostedFileUploadProvider.upload({
       ...upload,
-      filename: recordingScopedFilename(recordingId, upload.filename),
+      filename,
       ownerEmail,
     });
 
@@ -157,5 +160,5 @@ export async function uploadRecordingMedia(
     return uploaded;
   }
 
-  return uploadFile({ ...upload, ownerEmail });
+  return uploadFile({ ...upload, filename, ownerEmail });
 }

package/corpus/templates/clips/server/routes/api/thumbnail/[recordingId].get.ts

@@ -66,6 +66,7 @@ type ThumbnailRecording = {
   baseImageUrl?: string | null;
   expiresAt?: string | null;
   organizationId?: string | null;
+  ownerEmail?: string | null;
   password?: string | null;
   sharePasswordVersion?: string | null;
   trashedAt?: string | null;
@@ -184,17 +185,48 @@ function defaultSocialImageResponse(): Response {
   });
 }
 
-async function fetchThumbnail(sourceUrl: string): Promise<Response> {
+/** `work`'s result, or null if `deadline` passes before it starts or settles. */
+async function settleBy<T>(
+  work: () => Promise<T>,
+  deadline: number,
+): Promise<T | null> {
+  if (Date.now() >= deadline) return null;
+  let timer: ReturnType<typeof setTimeout> | undefined;
+  try {
+    const result = await Promise.race([
+      work(),
+      new Promise<null>((resolve) => {
+        timer = setTimeout(() => resolve(null), deadline - Date.now());
+      }),
+    ]);
+    // The timer can fire late, so the clock, not the race, says what was late.
+    return Date.now() < deadline ? result : null;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+async function fetchThumbnail(
+  sourceUrl: string,
+  deadline = Date.now() + FETCH_TIMEOUT_MS,
+): Promise<Response> {
   let currentUrl = sourceUrl;
   const dispatcher = (await createSsrfSafeDispatcher()) ?? undefined;
 
   for (let redirects = 0; redirects <= 4; redirects++) {
-    if (await isBlockedExtensionUrlWithDns(currentUrl)) {
-      return imageResponse(null, "text/plain", 403);
+    // A DNS lookup cannot be cancelled, so the check gets only the budget
+    // left; a host it could not clear in time is refused, not fetched.
+    const blocked = await settleBy(
+      () => isBlockedExtensionUrlWithDns(currentUrl),
+      deadline,
+    );
+    if (blocked === null) {
+      throw new Error("Thumbnail fetch ran out of time before the host check");
     }
+    if (blocked) return imageResponse(null, "text/plain", 403);
 
     const controller = new AbortController();
-    const timeout = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
+    const timeout = setTimeout(() => controller.abort(), deadline - Date.now());
     let upstream: Response;
     try {
       const fetchOptions: RequestInit & { dispatcher?: unknown } = {
@@ -244,7 +276,66 @@ async function fetchHostedThumbnail(
     timeoutMs: FETCH_TIMEOUT_MS,
   });
   if (!upstream) return imageResponse(null, "text/plain", 404);
+  return bucketImageResponse(upstream);
+}
 
+/**
+ * Reads a thumbnail from the owner's own bucket with the bucket's credentials,
+ * so it loads even when the bucket sits on a private address the public fetch
+ * refuses. The credentials are the owner's workspace secrets, so they resolve
+ * under the owner, not the viewer. Null means the bucket did not serve it.
+ */
+async function fetchOwnBucketThumbnail(
+  sourceUrl: string,
+  recordingId: string,
+  recording: ThumbnailRecording,
+): Promise<Response | null> {
+  let upstream: Response | null;
+  try {
+    upstream = await runWithRequestContext(
+      {
+        userEmail: recording.ownerEmail ?? undefined,
+        orgId: recording.organizationId ?? undefined,
+      },
+      () =>
+        fetchS3ObjectByUrl(sourceUrl, {
+          recordingId,
+          storageMode: "own",
+          timeoutMs: FETCH_TIMEOUT_MS,
+        }),
+    );
+  } catch (error) {
+    // A bucket that is down or misconfigured still leaves the public URL.
+    captureRouteError(error, {
+      route: "api/thumbnail",
+      extra: { recordingId },
+    });
+    return null;
+  }
+  if (!upstream?.ok) {
+    // A 5xx is the bucket failing, not a file it lacks, and the public
+    // fallback's answer would hide it.
+    if (upstream && upstream.status >= 500) {
+      captureStorageStatus(upstream.status, recordingId);
+    }
+    await upstream?.body?.cancel().catch(() => {});
+    return null;
+  }
+  return bucketImageResponse(upstream);
+}
+
+function captureStorageStatus(status: number, recordingId: string): void {
+  captureRouteError(
+    new Error(`Storage provider returned ${status} for thumbnail`),
+    {
+      route: "api/thumbnail",
+      tags: { upstreamStatus: String(status) },
+      extra: { recordingId },
+    },
+  );
+}
+
+async function bucketImageResponse(upstream: Response): Promise<Response> {
   const contentType =
     upstream.headers
       .get("content-type")
@@ -283,6 +374,7 @@ async function loadRecording(recordingId: string, event: H3Event) {
         storageMode: schema.recordings.storageMode,
         expiresAt: schema.recordings.expiresAt,
         organizationId: schema.recordings.organizationId,
+        ownerEmail: schema.recordings.ownerEmail,
         password: schema.recordings.password,
         sharePasswordVersion: schema.recordings.sharePasswordVersion,
         trashedAt: schema.recordings.trashedAt,
@@ -320,6 +412,7 @@ async function loadRecording(recordingId: string, event: H3Event) {
     .select({
       thumbnailUrl: schema.recordings.thumbnailUrl,
       animatedThumbnailUrl: schema.recordings.animatedThumbnailUrl,
+      storageMode: schema.recordings.storageMode,
       trashedAt: schema.recordings.trashedAt,
     })
     .from(schema.recordings)
@@ -336,6 +429,9 @@ async function loadRecording(recordingId: string, event: H3Event) {
       thumbnailUrl: footage.thumbnailUrl,
       animatedThumbnailUrl: footage.animatedThumbnailUrl,
       baseImageUrl: null,
+      // Its files sit where the footage was stored; only the access and the
+      // owner credentials come from the Clip.
+      storageMode: footage.storageMode,
     },
     role,
     gateId,
@@ -451,27 +547,30 @@ export default defineEventHandler(async (event: H3Event) => {
       }
 
       try {
-        // Imported thumbnails (e.g. Loom's) live outside the bucket, so only
-        // URLs inside it take the recording-bound private fetch.
-        const isHostedObject =
-          recording.storageMode === "hosted" &&
-          (await isUrlInS3Storage(resolvedSourceUrl, {
-            storageMode: "hosted",
-          })) !== false;
-        const response = isHostedObject
-          ? await fetchHostedThumbnail(resolvedSourceUrl, recordingId)
-          : await fetchThumbnail(resolvedSourceUrl);
+        let response: Response;
+        if (recording.storageMode === "hosted") {
+          // Imported thumbnails (e.g. Loom's) live outside the bucket, so only
+          // URLs inside it take the recording-bound private fetch.
+          const isHostedObject =
+            (await isUrlInS3Storage(resolvedSourceUrl, {
+              storageMode: "hosted",
+            })) !== false;
+          response = isHostedObject
+            ? await fetchHostedThumbnail(resolvedSourceUrl, recordingId)
+            : await fetchThumbnail(resolvedSourceUrl);
+        } else {
+          // Both reads share one budget: a bucket that hangs would otherwise
+          // make the public fallback wait out a second timeout.
+          const deadline = Date.now() + FETCH_TIMEOUT_MS;
+          response =
+            (await fetchOwnBucketThumbnail(
+              resolvedSourceUrl,
+              recordingId,
+              recording,
+            )) ?? (await fetchThumbnail(resolvedSourceUrl, deadline));
+        }
         if (response.status >= 500) {
-          captureRouteError(
-            new Error(
-              `Storage provider returned ${response.status} for thumbnail`,
-            ),
-            {
-              route: "api/thumbnail",
-              tags: { upstreamStatus: String(response.status) },
-              extra: { recordingId },
-            },
-          );
+          captureStorageStatus(response.status, recordingId);
         }
         const contentType = response.headers
           .get("content-type")

package/corpus/templates/content/.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","collab","core-routes","creative-context","db","feature-flags","labs","onboarding","otel","suggested-edits","transactional-emails"];
+
+export default function markBuildDiscoveredPlugins(nitroApp) {
+  for (const stem of pluginStems) {
+    markDefaultPluginProvided(nitroApp, stem);
+  }
+}

package/corpus/templates/content/app/components/editor/CommentAiRecipient.tsx

@@ -1,3 +1,4 @@
+import type { EngineModelGroup } from "@agent-native/core/client/agent-chat";
 import { useT } from "@agent-native/core/client/i18n";
 import { AgentMark } from "@agent-native/toolkit/app/shared";
 import { IconCheck, IconChevronDown } from "@tabler/icons-react";
@@ -25,6 +26,34 @@ export interface CommentAiSelection {
 export const commentAiSelectionKey = (selection: CommentAiSelection) =>
   `${selection.engine}:${selection.model}`;
 
+/**
+ * One selection per model name. With Builder.io connected, a provider key
+ * adds its own group, and the two name one model differently ("gpt-5-4",
+ * "gpt-5.4"), so ids alone can't dedupe them. The current choice wins, then
+ * its engine, then the first group listed.
+ */
+export function commentAiSelections(
+  groups: readonly Pick<EngineModelGroup, "engine" | "label" | "models">[],
+  current: { model: string; engine: string },
+): CommentAiSelection[] {
+  const rank = (selection: CommentAiSelection) =>
+    selection.engine !== current.engine
+      ? 0
+      : selection.model === current.model
+        ? 2
+        : 1;
+  const byName = new Map<string, CommentAiSelection>();
+  for (const group of groups) {
+    for (const model of group.models) {
+      const selection = { model, engine: group.engine, provider: group.label };
+      const name = modelDisplayName(model);
+      const kept = byName.get(name);
+      if (!kept || rank(selection) > rank(kept)) byName.set(name, selection);
+    }
+  }
+  return [...byName.values()];
+}
+
 /** Words a person might type after `@` to find a model, e.g. "Sonnet". */
 export function modelAliases(model: string): string[] {
   const name = modelDisplayName(model);