@agent-native/core 0.84.10 → 0.84.12

package/corpus/templates/assets/app/i18n-data.ts

@@ -127,7 +127,10 @@ const brandKitDetailEnUS = {
     "Eight-second product reveal with slow camera push-in",
   imagePromptPlaceholder: "Blog hero for an article about cold-start latency",
   variants: "{{count}} variants",
+  logo: "Logo",
   compositeCanonicalLogo: "Composite canonical logo",
+  compositeCanonicalLogoHint:
+    "Stamps this kit's canonical logo onto every image from this preset. Requires a canonical logo.",
   openChat: "Open chat",
   defaultTextPolicy:
     "Prefer no embedded text. Keep any requested text short and readable.",
@@ -968,7 +971,10 @@ const brandKitDetailArSA = {
   clearSearch: "مسح البحث",
   clearing: "المقاصة...",
   compiledPrompt: "موجه المترجمة",
+  logo: "شعار",
   compositeCanonicalLogo: "الشعار الأساسي المركب",
+  compositeCanonicalLogoHint:
+    "يضيف الشعار الأساسي لهذه المجموعة إلى كل صورة تُنشأ بهذا الإعداد المسبق. يتطلب وجود شعار أساسي.",
   couldNotAddSelectedToReferences: "لا يمكن إضافة الأصول المحددة إلى المراجع.",
   couldNotAddToReferences: "لا يمكن إضافة الأصل إلى المراجع.",
   couldNotArchiveBrandKit: "تعذر أرشفة مجموعة العلامة التجارية.",
@@ -1137,7 +1143,10 @@ const brandKitDetailDeDE = {
   clearSearch: "Suche löschen",
   clearing: "Löschen...",
   compiledPrompt: "Kompilierte Eingabeaufforderung",
+  logo: "Logo",
   compositeCanonicalLogo: "Zusammengesetztes kanonisches Logo",
+  compositeCanonicalLogoHint:
+    "Fügt das kanonische Logo dieses Kits jedem mit dieser Vorlage erstellten Bild hinzu. Erfordert ein kanonisches Logo.",
   couldNotAddSelectedToReferences:
     "Ausgewählte Assets konnten nicht zu Referenzen hinzugefügt werden.",
   couldNotAddToReferences:
@@ -1312,7 +1321,10 @@ const brandKitDetailEsES = {
   clearSearch: "Borrar búsqueda",
   clearing: "Limpiando...",
   compiledPrompt: "Aviso compilado",
+  logo: "Logotipo",
   compositeCanonicalLogo: "Logotipo canónico compuesto",
+  compositeCanonicalLogoHint:
+    "Añade el logotipo canónico de este kit a cada imagen creada con este ajuste. Requiere un logotipo canónico.",
   couldNotAddSelectedToReferences:
     "No se pudieron agregar los recursos seleccionados a las Referencias.",
   couldNotAddToReferences: "No se pudo agregar activo a Referencias.",
@@ -1489,7 +1501,10 @@ const brandKitDetailFrFR = {
   clearSearch: "Effacer la recherche",
   clearing: "Dégagement...",
   compiledPrompt: "Invite compilée",
+  logo: "Logo",
   compositeCanonicalLogo: "Logo canonique composite",
+  compositeCanonicalLogoHint:
+    "Ajoute le logo canonique de ce kit à chaque image créée avec ce préréglage. Nécessite un logo canonique.",
   couldNotAddSelectedToReferences:
     "Impossible d'ajouter les éléments sélectionnés aux références.",
   couldNotAddToReferences: "Impossible d'ajouter un élément aux références.",
@@ -1664,7 +1679,10 @@ const brandKitDetailHiIN = {
   clearSearch: "स्पष्ट खोज",
   clearing: "समाशोधन...",
   compiledPrompt: "शीघ्र संकलित",
+  logo: "लोगो",
   compositeCanonicalLogo: "समग्र विहित लोगो",
+  compositeCanonicalLogoHint:
+    "इस प्रीसेट से बनी हर छवि पर इस किट का विहित लोगो जोड़ता है। इसके लिए विहित लोगो आवश्यक है।",
   couldNotAddSelectedToReferences:
     "चयनित परिसंपत्तियों को संदर्भों में नहीं जोड़ा जा सका.",
   couldNotAddToReferences: "संदर्भों में संपत्ति नहीं जोड़ी जा सकी.",
@@ -1832,7 +1850,10 @@ const brandKitDetailJaJP = {
   clearSearch: "検索をクリア",
   clearing: "クリア中...",
   compiledPrompt: "コンパイルされたプロンプト",
+  logo: "ロゴ",
   compositeCanonicalLogo: "複合正規ロゴ",
+  compositeCanonicalLogoHint:
+    "このプリセットで生成する各画像に、このキットの正規ロゴを合成します。正規ロゴの設定が必要です。",
   couldNotAddSelectedToReferences:
     "選択したアセットを参照に追加できませんでした。",
   couldNotAddToReferences: "アセットを参照に追加できませんでした。",
@@ -2005,7 +2026,10 @@ const brandKitDetailKoKR = {
   clearSearch: "검색 지우기",
   clearing: "지우는 중...",
   compiledPrompt: "컴파일된 프롬프트",
+  logo: "로고",
   compositeCanonicalLogo: "복합 표준 로고",
+  compositeCanonicalLogoHint:
+    "이 프리셋으로 생성되는 모든 이미지에 이 키트의 표준 로고를 합성합니다. 표준 로고가 필요합니다.",
   couldNotAddSelectedToReferences: "선택한 자산을 참조에 추가할 수 없습니다.",
   couldNotAddToReferences: "참조에 자산을 추가할 수 없습니다.",
   couldNotArchiveBrandKit: "브랜드 키트를 보관할 수 없습니다.",
@@ -2172,7 +2196,10 @@ const brandKitDetailPtBR = {
   clearSearch: "Limpar pesquisa",
   clearing: "Limpando...",
   compiledPrompt: "Prompt compilado",
+  logo: "Logotipo",
   compositeCanonicalLogo: "Logotipo canônico composto",
+  compositeCanonicalLogoHint:
+    "Adiciona o logotipo canônico deste kit a cada imagem criada com esta predefinição. Requer um logotipo canônico.",
   couldNotAddSelectedToReferences:
     "Não foi possível adicionar os ativos selecionados às referências.",
   couldNotAddToReferences: "Não foi possível adicionar recurso às referências.",
@@ -3305,7 +3332,10 @@ export const messagesByLocale = {
       videoPromptPlaceholder: "8 秒产品展示，慢速推近镜头",
       imagePromptPlaceholder: "关于冷启动延迟文章的博客头图",
       variants: "{{count}} 个变体",
+      logo: "徽标",
       compositeCanonicalLogo: "合成规范徽标",
+      compositeCanonicalLogoHint:
+        "为使用此预设生成的每张图片合成此套件的规范徽标。需要已设置规范徽标。",
       openChat: "打开聊天",
       defaultTextPolicy: "尽量不要嵌入文字。如需文字，请保持简短且易读。",
       generationPresetCreated: "生成预设已创建。",

package/corpus/templates/assets/app/routes/brand-kits.$id.tsx

@@ -1151,12 +1151,6 @@ export function BrandKitDetailRoute({
           <IconFolderPlus className="mr-2 h-4 w-4 shrink-0" />
           {t("library.newFolder")}
         </DropdownMenuItem>
-        <ShareButton
-          resourceType="asset-library"
-          resourceId={library.id}
-          resourceTitle={library.title}
-          triggerClassName="w-full justify-start border-0 bg-transparent px-2 py-1.5 text-sm font-normal shadow-none hover:bg-accent hover:text-accent-foreground"
-        />
         <DropdownMenuSeparator />
         <DropdownMenuItem
           disabled={duplicateLibrary.isPending}
@@ -1183,15 +1177,31 @@ export function BrandKitDetailRoute({
       </DropdownMenuContent>
     </DropdownMenu>
   );
+  const shareAction = (
+    <ShareButton
+      trigger="label-icon"
+      resourceType="asset-library"
+      resourceId={library.id}
+      resourceTitle={library.title}
+      triggerClassName="h-10 gap-2 px-4 border-input bg-background hover:bg-accent hover:text-accent-foreground"
+    />
+  );
   const headerActions = (
     <div className="flex flex-wrap items-center gap-2 sm:flex-nowrap lg:shrink-0">
       {uploadAction}
+      {shareAction}
       {moreActions}
     </div>
   );
   const headerPrimaryActionsPortal =
     headerMode === "actions" && headerPrimaryActionsTarget
-      ? createPortal(uploadAction, headerPrimaryActionsTarget)
+      ? createPortal(
+          <>
+            {uploadAction}
+            {shareAction}
+          </>,
+          headerPrimaryActionsTarget,
+        )
       : null;
   const headerMoreActionsPortal =
     headerMode === "actions" && headerMoreActionsTarget
@@ -2036,6 +2046,7 @@ function GenerationPresetsPanel({
   const [aspectRatio, setAspectRatio] = useState<AspectRatio>("1:1");
   const [promptTemplate, setPromptTemplate] = useState("");
   const [textPolicy, setTextPolicy] = useState(t("library.defaultTextPolicy"));
+  const [includeLogo, setIncludeLogo] = useState(false);
 
   function reset() {
     setTitle("");
@@ -2043,6 +2054,7 @@ function GenerationPresetsPanel({
     setAspectRatio("1:1");
     setPromptTemplate("");
     setTextPolicy(t("library.defaultTextPolicy"));
+    setIncludeLogo(false);
   }
 
   function submit() {
@@ -2058,6 +2070,7 @@ function GenerationPresetsPanel({
         promptTemplate: promptTemplate.trim() || undefined,
         textPolicy,
         referencePolicy: "auto",
+        includeLogo,
       },
       {
         onSuccess: () => {
@@ -2101,6 +2114,9 @@ function GenerationPresetsPanel({
                   {preset.title}
                 </span>
                 <Badge variant="outline">{preset.aspectRatio}</Badge>
+                {preset.includeLogo ? (
+                  <Badge variant="secondary">{t("brandKitDetail.logo")}</Badge>
+                ) : null}
               </div>
               <p className="mt-1 line-clamp-2 text-xs text-muted-foreground">
                 {preset.textPolicy || preset.description || preset.category}
@@ -2251,6 +2267,25 @@ function GenerationPresetsPanel({
                 onChange={(event) => setTextPolicy(event.target.value)}
               />
             </div>
+            <label
+              htmlFor="preset-include-logo"
+              className="flex items-start gap-3 rounded-md border border-border p-3"
+            >
+              <Checkbox
+                id="preset-include-logo"
+                checked={includeLogo}
+                onCheckedChange={(checked) => setIncludeLogo(checked === true)}
+                className="mt-0.5"
+              />
+              <span className="grid gap-1">
+                <span className="text-sm font-medium leading-none">
+                  {t("brandKitDetail.compositeCanonicalLogo")}
+                </span>
+                <span className="text-xs text-muted-foreground">
+                  {t("brandKitDetail.compositeCanonicalLogoHint")}
+                </span>
+              </span>
+            </label>
           </div>
           <DialogFooter>
             <Button variant="outline" onClick={() => setOpen(false)}>

package/corpus/templates/assets/app/routes/library.tsx

@@ -2439,7 +2439,8 @@ export function AssetPickerSurface() {
           presetTitle: selectedPreset?.title ?? null,
           tier: hostConfig.tier,
           styleStrength: hostConfig.styleStrength ?? "balanced",
-          includeLogo: hostConfig.includeLogo ?? false,
+          // Omit when unset so the selected preset's logo setting drives it.
+          includeLogo: hostConfig.includeLogo,
         }),
         submit: true,
         openSidebar: true,
@@ -2463,7 +2464,8 @@ export function AssetPickerSurface() {
       })),
       tier: hostConfig.tier,
       styleStrength: hostConfig.styleStrength ?? "balanced",
-      includeLogo: hostConfig.includeLogo ?? false,
+      // Omit when unset so the selected preset's logo setting drives it.
+      includeLogo: hostConfig.includeLogo,
       source: "ui",
       callerAppId: hostConfig.callerAppId,
     } as any);

package/corpus/templates/assets/changelog/2026-07-01-generation-presets-can-now-composite-your-brand-s-canonical-.md

@@ -0,0 +1,6 @@
+---
+type: added
+date: 2026-07-01
+---
+
+Generation presets can now composite your brand's canonical logo onto every image made with them

package/corpus/templates/assets/changelog/2026-07-01-tagging-a-preset-now-briefs-the-agent-on-that-preset-s-aesth.md

@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-07-01
+---
+
+Tagging a preset now briefs the agent on that preset's aesthetics and philosophy before it generates, for more on-brand results

package/corpus/templates/assets/server/lib/preset-chat-context.ts

@@ -0,0 +1,118 @@
+import type { AgentChatReference } from "@agent-native/core/server";
+import { inArray } from "drizzle-orm";
+
+import type { StyleBrief } from "../../shared/api.js";
+import { getDb, schema } from "../db/index.js";
+import { parseJson } from "./json.js";
+
+const PRESET_REF_TYPE = "preset";
+
+type PresetRow = typeof schema.assetGenerationPresets.$inferSelect;
+type LibraryRow = typeof schema.assetLibraries.$inferSelect;
+
+/**
+ * When a user tags one or more generation presets with an `@preset` mention,
+ * embed each preset's aesthetics and creative philosophy into the model-facing
+ * message so the agent internalizes the brief before it generates. The user's
+ * visible message is untouched — only the message the model reads is augmented.
+ */
+export async function preparePresetChatContext(args: {
+  message: string;
+  references: AgentChatReference[];
+}): Promise<{ message?: string } | void> {
+  const presetIds = Array.from(
+    new Set(
+      (args.references ?? [])
+        .filter((ref) => ref.refType === PRESET_REF_TYPE && ref.refId)
+        .map((ref) => ref.refId as string),
+    ),
+  );
+  if (!presetIds.length) return;
+
+  const db = getDb();
+  const presets = (await db
+    .select()
+    .from(schema.assetGenerationPresets)
+    .where(
+      inArray(schema.assetGenerationPresets.id, presetIds),
+    )) as PresetRow[];
+  if (!presets.length) return;
+
+  const libraryIds = Array.from(
+    new Set(presets.map((preset) => preset.libraryId)),
+  );
+  const libraries = (await db
+    .select()
+    .from(schema.assetLibraries)
+    .where(inArray(schema.assetLibraries.id, libraryIds))) as LibraryRow[];
+  const libraryById = new Map(
+    libraries.map((library) => [library.id, library]),
+  );
+
+  const blocks = presets.map((preset) =>
+    describePreset(preset, libraryById.get(preset.libraryId)),
+  );
+
+  const context = [
+    "<tagged-generation-presets>",
+    "The user tagged the generation preset(s) below. Before generating anything, study each preset's aesthetics and creative philosophy and let it drive your composition, mood, lighting, styling, and subject choices. Treat the preset as the creative brief, not just a set of output dimensions.",
+    "",
+    blocks.join("\n\n"),
+    "",
+    "When you call generate-image or generate-image-batch, pass the matching presetId so its saved format, model, tier, logo setting, and prompt template apply automatically — do not restate aspect ratio, size, model, or tier as ad-hoc args. Keep your own prompt focused on the specific subject the user asked for, expressed through the preset's philosophy above.",
+    "</tagged-generation-presets>",
+  ].join("\n");
+
+  return { message: `${args.message}\n\n${context}` };
+}
+
+function describePreset(preset: PresetRow, library?: LibraryRow): string {
+  const settings = parseJson<{ tier?: string; includeLogo?: boolean }>(
+    preset.settings,
+    {},
+  );
+  const style = library
+    ? parseJson<StyleBrief>(library.styleBrief, {})
+    : ({} as StyleBrief);
+
+  const lines = [
+    `Preset "${preset.title}" (id: ${preset.id})`,
+    library ? `- Brand kit: ${library.title}` : "",
+    preset.description ? `- Intent: ${preset.description}` : "",
+    preset.category ? `- Deliverable type: ${preset.category}` : "",
+    preset.promptTemplate
+      ? `- Prompt philosophy / template: ${preset.promptTemplate}`
+      : "",
+    preset.textPolicy ? `- Text policy: ${preset.textPolicy}` : "",
+    `- Output: ${preset.aspectRatio}, ${preset.imageSize}, model ${preset.model}${
+      settings.tier ? `, ${settings.tier} tier` : ""
+    }`,
+    settings.includeLogo === true
+      ? "- Brand logo: the library's canonical logo is composited onto the result; leave a clean upper-right area and do not draw a logo yourself."
+      : "",
+  ];
+
+  const aesthetics = [
+    style.description ? `overall: ${style.description}` : "",
+    style.mood ? `mood: ${style.mood}` : "",
+    style.palette?.length ? `palette: ${style.palette.join(", ")}` : "",
+    style.medium ? `medium: ${style.medium}` : "",
+    style.composition ? `composition: ${style.composition}` : "",
+    style.lighting ? `lighting: ${style.lighting}` : "",
+    style.texture ? `texture: ${style.texture}` : "",
+    style.subjectMatter ? `subject matter: ${style.subjectMatter}` : "",
+    style.typographyPolicy ? `typography: ${style.typographyPolicy}` : "",
+  ].filter(Boolean);
+  if (aesthetics.length) {
+    lines.push(`- Brand aesthetics: ${aesthetics.join("; ")}.`);
+  }
+  if (style.doNot?.length) {
+    lines.push(`- Avoid: ${style.doNot.join("; ")}.`);
+  }
+  const customInstructions = library?.customInstructions?.trim();
+  if (customInstructions) {
+    lines.push(`- Brand custom instructions: ${customInstructions}`);
+  }
+
+  return lines.filter(Boolean).join("\n");
+}

package/corpus/templates/assets/server/plugins/agent-chat.ts

@@ -8,6 +8,7 @@ import { and, asc, desc, inArray, isNull } from "drizzle-orm";
 
 import actionsRegistry from "../../.generated/actions-registry.js";
 import { getDb, schema } from "../db/index.js";
+import { preparePresetChatContext } from "../lib/preset-chat-context.js";
 import "../register-secrets.js";
 
 const ASSETS_BACKGROUND_RUN_SOFT_TIMEOUT_MS = 13 * 60_000;
@@ -49,6 +50,10 @@ export default createAgentChatPlugin({
   initialToolNames: INITIAL_TOOL_NAMES,
   actions: loadActionsFromStaticRegistry(actionsRegistry),
   resolveOrgId: async (event) => (await getOrgContext(event)).orgId,
+  // When a user tags an @preset, embed its aesthetics/philosophy into the
+  // model-facing message so the agent internalizes the brief before generating.
+  prepareRequest: ({ message, references }) =>
+    preparePresetChatContext({ message, references }),
   mentionProviders: {
     mediaTypes: {
       label: "Media type",

package/corpus/templates/assets/shared/api.ts

@@ -237,6 +237,7 @@ export interface GenerationPresetSummary {
   model: ImageModel | VideoModel;
   textPolicy: string;
   referencePolicy: GenerationPresetReferencePolicy;
+  includeLogo: boolean;
   settings: Record<string, unknown>;
   sortOrder: number;
   createdAt?: string;

package/corpus/templates/design/actions/export-html.ts

@@ -9,6 +9,7 @@ import {
   exportFilename,
   trySaveExportFile,
 } from "../server/lib/design-export.js";
+import { isBoardFile } from "../shared/board-file.js";
 import "../server/db/index.js"; // ensure registerShareableResource runs
 
 export default defineAction({
@@ -31,12 +32,13 @@ export default defineAction({
       .select()
       .from(schema.designFiles)
       .where(eq(schema.designFiles.designId, id));
+    const exportFiles = files.filter((file) => !isBoardFile(file.filename));
 
-    const html = buildStandaloneHtml({ title: row.title, files });
+    const html = buildStandaloneHtml({ title: row.title, files: exportFiles });
 
     const filename = exportFilename(row.title, "html");
     const saveResult = await trySaveExportFile(filename, html);
 
-    return { html, filename, ...saveResult, fileCount: files.length };
+    return { html, filename, ...saveResult, fileCount: exportFiles.length };
   },
 });

package/corpus/templates/design/actions/export-pdf.ts

@@ -4,6 +4,7 @@ import { eq } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
+import { isBoardFile } from "../shared/board-file.js";
 import "../server/db/index.js"; // ensure registerShareableResource runs
 
 export default defineAction({
@@ -27,6 +28,7 @@ export default defineAction({
       .select()
       .from(schema.designFiles)
       .where(eq(schema.designFiles.designId, id));
+    const exportFiles = files.filter((file) => !isBoardFile(file.filename));
 
     return {
       id: row.id,
@@ -34,7 +36,7 @@ export default defineAction({
       description: row.description,
       projectType: row.projectType,
       data: row.data ?? null,
-      files: files.map((f) => ({
+      files: exportFiles.map((f) => ({
         id: f.id,
         filename: f.filename,
         fileType: f.fileType,

package/corpus/templates/design/actions/export-svg.ts

@@ -10,6 +10,7 @@ import {
   exportFilename,
   trySaveExportFile,
 } from "../server/lib/design-export.js";
+import { isBoardFile } from "../shared/board-file.js";
 import "../server/db/index.js"; // ensure registerShareableResource runs
 
 export default defineAction({
@@ -45,8 +46,9 @@ export default defineAction({
       .select()
       .from(schema.designFiles)
       .where(eq(schema.designFiles.designId, id));
+    const exportFiles = files.filter((file) => !isBoardFile(file.filename));
 
-    const html = buildStandaloneHtml({ title: row.title, files });
+    const html = buildStandaloneHtml({ title: row.title, files: exportFiles });
     const svg = buildSvgForeignObject({
       html,
       width,
@@ -56,6 +58,6 @@ export default defineAction({
     const filename = exportFilename(row.title, "svg");
     const saveResult = await trySaveExportFile(filename, svg);
 
-    return { svg, filename, ...saveResult, fileCount: files.length };
+    return { svg, filename, ...saveResult, fileCount: exportFiles.length };
   },
 });

package/corpus/templates/design/actions/export-zip.ts

@@ -8,6 +8,7 @@ import {
   exportFilename,
   trySaveExportFile,
 } from "../server/lib/design-export.js";
+import { isBoardFile } from "../shared/board-file.js";
 import "../server/db/index.js"; // ensure registerShareableResource runs
 
 const METADATA_ARCHIVE_DIR = "agent-native-metadata";
@@ -40,6 +41,7 @@ export default defineAction({
       .select()
       .from(schema.designFiles)
       .where(eq(schema.designFiles.designId, id));
+    const exportFiles = files.filter((file) => !isBoardFile(file.filename));
 
     // Dynamic import JSZip
     const JSZip = (await import("jszip")).default;
@@ -57,14 +59,14 @@ export default defineAction({
       "",
       "## Files",
       "",
-      ...files.map((f) => `- ${f.filename} (${f.fileType})`),
+      ...exportFiles.map((f) => `- ${f.filename} (${f.fileType})`),
     ].join("\n");
 
     zip.file(`${METADATA_ARCHIVE_DIR}/README.md`, readme);
 
     // Preserve design-relative paths so exported HTML keeps working with
     // sibling CSS/assets. Strip traversal segments defensively for legacy rows.
-    for (const [index, file] of files.entries()) {
+    for (const [index, file] of exportFiles.entries()) {
       const filename = safeArchivePath(
         file.filename,
         `design-file-${index + 1}.txt`,
@@ -84,6 +86,11 @@ export default defineAction({
     const filename = exportFilename(row.title, "zip");
     const saveResult = await trySaveExportFile(filename, zipBuffer);
 
-    return { zipBase64, filename, ...saveResult, fileCount: files.length };
+    return {
+      zipBase64,
+      filename,
+      ...saveResult,
+      fileCount: exportFiles.length,
+    };
   },
 });

package/corpus/templates/design/actions/update-file.ts

@@ -4,12 +4,24 @@ import {
   applyText,
   seedFromText,
 } from "@agent-native/core/collab";
+import { isPostgres } from "@agent-native/core/db";
 import { accessFilter, assertAccess } from "@agent-native/core/sharing";
-import { and, eq } from "drizzle-orm";
+import { and, eq, sql } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
 
+function rowsAffected(result: unknown): number | undefined {
+  const candidate = result as {
+    rowsAffected?: unknown;
+    rowCount?: unknown;
+    changes?: unknown;
+  } | null;
+  const value =
+    candidate?.rowsAffected ?? candidate?.rowCount ?? candidate?.changes;
+  return typeof value === "number" ? value : undefined;
+}
+
 export default defineAction({
   description:
     "Update an existing file in a design project. " +
@@ -70,13 +82,19 @@ export default defineAction({
 
     await assertAccess("design", file.designId, "editor");
 
-    // Reject a rename that would collide with an existing filename in the same
-    // design. The collision check and the write run in one transaction so they
-    // can't be interleaved by a concurrent rename. (A DB-level UNIQUE index on
-    // (designId, filename) would be the strongest guarantee but is a non-additive
-    // schema change on existing data, so it's deferred.)
-    await db.transaction(async (tx) => {
-      if (filename !== undefined) {
+    const updates: Record<string, unknown> = { updatedAt: now };
+    if (content !== undefined) updates.content = content;
+    if (filename !== undefined) updates.filename = filename;
+    if (fileType !== undefined) updates.fileType = fileType;
+
+    if (filename !== undefined && isPostgres()) {
+      await db.transaction(async (tx) => {
+        // Postgres evaluates concurrent NOT EXISTS updates under MVCC, so a
+        // guarded UPDATE alone can still race. Serialize design-file renames in
+        // this rare path without using SQLite's fragile async savepoint wrapper.
+        await (
+          tx as unknown as { execute: (query: unknown) => Promise<unknown> }
+        ).execute(sql`LOCK TABLE design_files IN SHARE ROW EXCLUSIVE MODE`);
         const [collision] = await tx
           .select({ id: schema.designFiles.id })
           .from(schema.designFiles)
@@ -92,18 +110,51 @@ export default defineAction({
             `File "${filename}" already exists in design ${file.designId}`,
           );
         }
-      }
+        await tx
+          .update(schema.designFiles)
+          .set(updates)
+          .where(eq(schema.designFiles.id, id));
+      });
+    } else {
+      // Reject colliding SQLite renames as part of the write. SQLite's local
+      // async transaction wrapper can fail under concurrent editor/collab writes,
+      // so keep this to one guarded UPDATE instead of a SELECT-then-UPDATE window.
+      const updateWhere =
+        filename === undefined
+          ? eq(schema.designFiles.id, id)
+          : and(
+              eq(schema.designFiles.id, id),
+              sql`NOT EXISTS (
+                SELECT 1 FROM design_files AS sibling
+                WHERE sibling.design_id = ${file.designId}
+                  AND sibling.filename = ${filename}
+                  AND sibling.id <> ${id}
+              )`,
+            );
 
-      const updates: Record<string, unknown> = { updatedAt: now };
-      if (content !== undefined) updates.content = content;
-      if (filename !== undefined) updates.filename = filename;
-      if (fileType !== undefined) updates.fileType = fileType;
-
-      await tx
+      const updateResult = await db
         .update(schema.designFiles)
         .set(updates)
-        .where(eq(schema.designFiles.id, id));
-    });
+        .where(updateWhere);
+
+      if (filename !== undefined && rowsAffected(updateResult) === 0) {
+        const [collision] = await db
+          .select({ id: schema.designFiles.id })
+          .from(schema.designFiles)
+          .where(
+            and(
+              eq(schema.designFiles.designId, file.designId),
+              eq(schema.designFiles.filename, filename),
+            ),
+          )
+          .limit(1);
+        if (collision && collision.id !== id) {
+          throw new Error(
+            `File "${filename}" already exists in design ${file.designId}`,
+          );
+        }
+      }
+    }
 
     // Push content through the collab layer so live editors see the change
     if (content !== undefined && syncCollab) {

package/corpus/templates/design/app/components/design/DesignCanvas.tsx

@@ -1811,14 +1811,15 @@ export function DesignCanvas({
             : "allow-scripts allow-popups allow-popups-to-escape-sandbox allow-same-origin"
         }
         data-design-preview-iframe
-        data-screen-iframe-id={screenId ?? undefined}
+        data-screen-iframe-id={
+          boardSurface ? undefined : (screenId ?? undefined)
+        }
         data-design-source-type={
           sourceType ??
           (externalPreviewUrl
             ? "localhost" // inferred — content is a URL
             : "inline")
         }
-        allowTransparency={transparentBackground || undefined}
         className="block h-full w-full border-0 bg-transparent"
         style={{
           background: iframeBackgroundColor,