@agent-native/core 0.190.1-nightly-20260926035143 → 0.191.0

package/corpus/README.md

@@ -31,4 +31,4 @@ rg -n "defineAction|useActionQuery" node_modules/@agent-native/core/corpus
 
 ## Generated Counts
 
-- template files: 10002
+- template files: 10028

package/corpus/templates/analytics/CHANGELOG.md

@@ -11,6 +11,7 @@ time from the command menu (Cmd+K → "What's new") or from Settings.
 
 ### Improved
 
+- The chat composer keeps a consistent background while AI setup is open.
 - First-run onboarding records setup choices and Builder connection outcomes
 - Human review previews Analytics dashboards as real charts
 - Relevant metric definitions and saved dashboard examples are available with the first response so Analytics queries can reuse proven definitions and query shapes.

package/corpus/templates/calendar/CHANGELOG.md

@@ -11,6 +11,8 @@ time from the command menu (Cmd+K → "What's new") or from Settings.
 
 ### Fixed
 
+- Booking links without a meeting type now show a not-found page.
+- Personal booking pages use the host's saved timezone for availability.
 - Booking link previews now show their image in browser-based link preview tools
 - Calendar feeds with the same URL keep their own names and colors.
 - Calendar invitation rules surface expired connections and undo safely without duplicate RSVP updates

package/corpus/templates/chat/app/root.tsx

@@ -57,7 +57,7 @@ export function Layout({ children }: { children: React.ReactNode }) {
         <meta charSet="utf-8" />
         <meta
           name="viewport"
-          content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
+          content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, interactive-widget=resizes-content"
         />
         <script
           suppressHydrationWarning

package/corpus/templates/clips/AGENTS.md

@@ -76,22 +76,23 @@ video sharing app. The agent and the UI share the same SQL data and actions.
 | --- | --- |
 | `view-screen`, `navigate` | Read context; open a surface |
 | `list-recordings`, `search-recordings` | Library, trash, `--view=shared` |
-| `get-recording-player-data` | Full transcript, chapters, diagnostics |
+| `get-recording-player-data` | Transcript, chapters, diagnostics |
 | `create-recording`, `finalize-recording` | Create row; finish upload |
-| `import-loom-recording` | Import Loom or direct MP4/WebM URL |
+| `import-loom-recording` | Import Loom or video URLs |
 | `update-recording` | Title, password, expiry, visibility |
-| `move-recording` | Move `id` or `ids` to a folder or root |
+| `move-recording` | Move recordings to folder/root |
 | `archive-`, `trash-`, `restore-recording` | Lifecycle |
 | `reprocess-recording` | Repair unseekable/frozen media |
-| `generate-filmstrip` | Editor timeline frame sprite; `all` backfills |
+| `generate-filmstrip` | Timeline frames |
 | `request-transcript`, `cleanup-transcript` | Transcribe; `force`/`regenerate` |
 | `regenerate-title`, `-summary`, `-chapters` | AI metadata |
+| `generate-workflow`, `complete-workflow` | Generate and save workflow |
 | `trim-`, `split-recording`, `remove-silences`, `remove-filler-words` | Edits |
 | `list-meetings`, `get-`, `update-`, `finalize-meeting` | Meetings |
-| `search-meetings` | Find a meeting by title, summary, notes, attendee, or transcript |
+| `search-meetings` | Search meetings |
 | `list-dictations`, `cleanup-dictation` | Dictation history |
 | `add-comment`, `update-comment`, `create-folder`, `create-space` | Comments, folders |
-| `get-clips-notification-prefs`, `update-clips-notification-prefs` | Read or change optional email notifications |
+| `get-clips-notification-prefs`, `update-clips-notification-prefs` | Read or update email alerts |
 | `share-resource`, `set-resource-visibility`, `build-embed-url` | Share, embed |
 | `create-recording-agent-link` | Two-hour `agent_access` share URL |
 | `prepare-crm-call-evidence` | Opaque clip id plus `/r/<id>` for CRM |

package/corpus/templates/clips/CHANGELOG.md

@@ -7,10 +7,17 @@ from the command menu (Cmd+K → "What's new") or from Settings.
 
 ### Improved
 
+- The no-comments sidebar gives viewers a concise reason to try Clips and a clear path to sign up.
 - Shared clips remember your sidebar choice and help new viewers understand why to sign up.
 
 ### Fixed
 
+- Clips clears a stale recording overlay after an interrupted save
+- Concurrent workflow requests no longer replace an active generation.
+- Generated workflows stay tied to the request that created them.
+- Organization logos can be stored privately and load in settings, shared clips, and email.
+- Private MinIO and S3-compatible endpoints now work with Clips.
+- Workflow drafts are saved before the agent reports them complete
 - Signed-in viewers who hit an unavailable, expired, or private share link now land in their library instead of the public marketing page when they choose "Go home."
 
 ## 2026-09-24

package/corpus/templates/clips/actions/complete-workflow.ts

@@ -0,0 +1,126 @@
+import { defineAction, fail } from "@agent-native/core/action";
+import {
+  compareAndSetAppState,
+  readAppState,
+} from "@agent-native/core/application-state";
+import { assertAccess } from "@agent-native/core/sharing";
+import { z } from "zod";
+
+import {
+  matchesWorkflowRequest,
+  WorkflowKindSchema,
+} from "../shared/workflow.js";
+
+const WorkflowStateSchema = z
+  .object({
+    kind: WorkflowKindSchema.optional(),
+    status: z.string(),
+    recordingId: z.string().min(1),
+    requestedAt: z.string().min(1),
+    requestId: z.string().min(1).optional(),
+  })
+  .passthrough();
+
+export default defineAction({
+  description:
+    "Save the final markdown for a Clips workflow request. Returns saved only after the matching request is persisted as ready.",
+  schema: z.object({
+    recordingId: z.string().min(1).describe("Recording that owns the workflow"),
+    requestedAt: z
+      .string()
+      .min(1)
+      .describe("Exact request timestamp from the generate-workflow context"),
+    requestId: z
+      .string()
+      .min(1)
+      .optional()
+      .describe(
+        "Exact workflow request ID when present in the request context",
+      ),
+    content: z
+      .string()
+      .trim()
+      .min(1)
+      .max(50_000)
+      .describe("Final workflow document in markdown"),
+  }),
+  run: async ({ recordingId, requestedAt, requestId, content }) => {
+    await assertAccess("recording", recordingId, "viewer");
+
+    const stateKey = `clips-workflow-${recordingId}`;
+    const current = await readAppState(stateKey);
+    if (current === null) {
+      fail("No active workflow request was found for this recording.", {
+        statusCode: 409,
+        errorCode: "workflow_not_active",
+      });
+    }
+
+    const parsed = WorkflowStateSchema.safeParse(current);
+    if (!parsed.success) {
+      throw new Error(`Invalid generated workflow state for ${recordingId}`);
+    }
+    if (parsed.data.recordingId !== recordingId) {
+      throw new Error(`Generated workflow state does not match ${recordingId}`);
+    }
+    const expected = { requestedAt, requestId };
+    if (!matchesWorkflowRequest(parsed.data, expected)) {
+      fail("This workflow request has been replaced by a newer request.", {
+        statusCode: 409,
+        errorCode: "stale_workflow_request",
+      });
+    }
+    const result = {
+      recordingId,
+      requestedAt,
+      ...(requestId ? { requestId } : {}),
+    };
+
+    if (parsed.data.status === "ready" && current.content === content) {
+      return { saved: true, ...result, alreadySaved: true };
+    }
+    if (parsed.data.status !== "generating") {
+      fail("This workflow request is no longer generating.", {
+        statusCode: 409,
+        errorCode: "workflow_not_generating",
+      });
+    }
+
+    const nextState = {
+      ...current,
+      status: "ready",
+      content,
+      completedAt: new Date().toISOString(),
+    };
+    const saved = await compareAndSetAppState(stateKey, current, nextState);
+    if (!saved) {
+      const latest = await readAppState(stateKey);
+      if (
+        latest?.status === "ready" &&
+        latest.recordingId === recordingId &&
+        matchesWorkflowRequest(latest, expected) &&
+        latest.content === content
+      ) {
+        return { saved: true, ...result, alreadySaved: true };
+      }
+      fail("The workflow changed before its result could be saved.", {
+        statusCode: 409,
+        errorCode: "workflow_changed",
+      });
+    }
+
+    const persisted = await readAppState(stateKey);
+    if (
+      persisted?.status !== "ready" ||
+      persisted.recordingId !== recordingId ||
+      !matchesWorkflowRequest(persisted, expected) ||
+      persisted.content !== content
+    ) {
+      throw new Error(
+        `Generated workflow was not persisted for ${recordingId}`,
+      );
+    }
+
+    return { saved: true, ...result };
+  },
+});

package/corpus/templates/clips/actions/generate-workflow.ts

@@ -7,15 +7,18 @@
  *   - ticket — a bug/issue ticket
  *   - email  — a ready-to-send email
  *
- * The agent composes the document and stores it in application_state under
- * `clips-workflow-<recordingId>` so the UI can pick it up and display it.
+ * The agent composes the document and saves it with complete-workflow so the
+ * UI can pick it up and display it.
  *
  * Usage:
  *   pnpm action generate-workflow --recordingId=<id> --kind=pr
  */
 
+import { randomUUID } from "node:crypto";
+
 import { defineAction } from "@agent-native/core/action";
 import {
+  compareAndSetManyAppState,
   readAppState,
   writeAppState,
 } from "@agent-native/core/application-state";
@@ -55,14 +58,23 @@ Output markdown.`,
 Keep it concise, warm, and professional.`,
 } as const;
 
-// Actions for the same recording can arrive concurrently when the player and
-// agent both retry a request. Keep the read-check-write/enqueue sequence
-// single-flight within this runtime so only one request can claim generation.
+// Skip duplicate database work in this runtime; the multi-key CAS below also
+// prevents separate runtimes from claiming the same generation.
 const workflowGenerationLocks = new Set<string>();
 
+function isRecentGeneration(state: Record<string, unknown> | null): boolean {
+  if (state?.status !== "generating") return false;
+  const requestedAt = Date.parse(
+    typeof state.requestedAt === "string" ? state.requestedAt : "",
+  );
+  return (
+    !Number.isFinite(requestedAt) || Date.now() - requestedAt < 10 * 60_000
+  );
+}
+
 export default defineAction({
   description:
-    "Ask the agent to generate a structured workflow doc (pr/sop/ticket/email) from this recording's transcript (and the full video when Include full video is enabled). The agent writes the result to clips-workflow-<recordingId> in application_state.",
+    "Ask the agent to generate a structured workflow doc (pr/sop/ticket/email) from this recording's transcript (and the full video when Include full video is enabled). The agent saves the result with complete-workflow.",
   schema: z.object({
     recordingId: z.string().describe("Recording ID"),
     kind: WorkflowKindSchema.describe("Workflow kind"),
@@ -104,47 +116,44 @@ export default defineAction({
       const includeFullVideoInAi = await readIncludeFullVideoInAi();
 
       const existing = await readAppState(stateKey);
-      if (existing?.status === "generating") {
-        const requestedAt = Date.parse(
-          typeof existing.requestedAt === "string" ? existing.requestedAt : "",
-        );
-        const isRecent =
-          !Number.isFinite(requestedAt) ||
-          Date.now() - requestedAt < 10 * 60_000;
-        if (isRecent) {
-          return {
-            queued: false,
-            duplicate: true,
-            recordingId: args.recordingId,
-            kind: existing.kind ?? args.kind,
-            stateKey,
-          };
-        }
+      if (isRecentGeneration(existing)) {
+        return {
+          queued: false,
+          duplicate: true,
+          recordingId: args.recordingId,
+          kind: existing?.kind ?? args.kind,
+          stateKey,
+        };
       }
 
+      const requestKey = `clips-ai-request-${args.recordingId}`;
+      const existingRequest = await readAppState(requestKey);
       const requestedAt = new Date().toISOString();
-      // Seed the output state with a "generating" placeholder so the UI can show
-      // a loading state immediately.
-      await writeAppState(stateKey, {
+      const requestId = randomUUID();
+      const workflowState = {
         kind: args.kind,
         status: "generating",
         recordingId: args.recordingId,
         requestedAt,
-      } as any);
+        requestId,
+      };
 
       const baseMessage =
         `Generate a ${args.kind.toUpperCase()} workflow document from recording ${args.recordingId} ` +
         `(title: "${rec.title}"). Read the transcript from this request's context. ` +
         `${KIND_PROMPTS[args.kind]} ` +
-        `Then write the final markdown to application_state key "${stateKey}" as ` +
-        `\`{ kind: "${args.kind}", status: "ready", content: "...", recordingId: "${args.recordingId}" }\`. ` +
-        `Finish by replying in chat with the same generated markdown so the user can read it immediately.`;
+        `Then call complete-workflow with recordingId "${args.recordingId}", ` +
+        `the exact requestedAt and requestId "${requestId}" from this request's context, ` +
+        `and the final markdown. ` +
+        `Do not report completion unless that action returns saved: true. ` +
+        `Finish by replying in chat with the same generated markdown.`;
 
       const request = {
         kind: "generate-workflow" as const,
         workflowKind: args.kind,
         recordingId: args.recordingId,
         requestedAt,
+        requestId,
         recordingTitle: rec.title,
         recordingDescription: rec.description,
         transcriptStatus: transcript?.status ?? "pending",
@@ -160,10 +169,40 @@ export default defineAction({
         ),
       };
 
-      await writeAppState(
-        `clips-ai-request-${args.recordingId}`,
-        request as any,
-      );
+      const claimed = await compareAndSetManyAppState([
+        {
+          key: stateKey,
+          expectedValue: existing,
+          nextValue: workflowState,
+        },
+        {
+          key: requestKey,
+          expectedValue: existingRequest,
+          nextValue: request,
+        },
+      ]);
+      if (!claimed) {
+        const current = await readAppState(stateKey);
+        if (isRecentGeneration(current)) {
+          return {
+            queued: false,
+            duplicate: true,
+            recordingId: args.recordingId,
+            kind: current?.kind ?? args.kind,
+            stateKey,
+          };
+        }
+        return {
+          queued: false,
+          duplicate: false,
+          retry: true,
+          reason: "claim-contended",
+          recordingId: args.recordingId,
+          kind: args.kind,
+          stateKey,
+        };
+      }
+
       await writeAppState("refresh-signal", { ts: Date.now() });
 
       console.log(

package/corpus/templates/clips/actions/reconcile-workflow-generation.ts

@@ -7,7 +7,10 @@ import {
 import { assertAccess } from "@agent-native/core/sharing";
 import { z } from "zod";
 
-import { WorkflowKindSchema } from "../shared/workflow.js";
+import {
+  matchesWorkflowRequest,
+  WorkflowKindSchema,
+} from "../shared/workflow.js";
 
 const WorkflowStateSchema = z
   .object({
@@ -16,6 +19,7 @@ const WorkflowStateSchema = z
     content: z.string().optional(),
     recordingId: z.string().optional(),
     requestedAt: z.string().optional(),
+    requestId: z.string().min(1).optional(),
     tabId: z.string().optional(),
     claimedAt: z.string().optional(),
   })
@@ -24,6 +28,7 @@ const WorkflowStateSchema = z
 const WorkflowRequestSchema = z
   .object({
     requestedAt: z.string(),
+    requestId: z.string().min(1).optional(),
     deliveredAt: z.string().optional(),
     deliveredTabId: z.string().optional(),
   })
@@ -45,9 +50,10 @@ export default defineAction({
     ]),
     recordingId: z.string().min(1),
     requestedAt: z.string().min(1),
+    requestId: z.string().min(1).optional(),
     tabId: z.string().min(1),
   }),
-  run: async ({ operation, recordingId, requestedAt, tabId }) => {
+  run: async ({ operation, recordingId, requestedAt, requestId, tabId }) => {
     await assertAccess("recording", recordingId, "viewer");
 
     const requestKey = `clips-ai-request-${recordingId}`;
@@ -62,7 +68,9 @@ export default defineAction({
       if (!parsedRequest.success) {
         throw new Error(`Invalid workflow request state for ${recordingId}`);
       }
-      if (parsedRequest.data.requestedAt !== requestedAt) {
+      if (
+        !matchesWorkflowRequest(parsedRequest.data, { requestedAt, requestId })
+      ) {
         return operation === "consume"
           ? {
               reconciled: false,
@@ -119,7 +127,10 @@ export default defineAction({
               };
         }
         if (
-          parsedState.data.requestedAt !== requestedAt ||
+          !matchesWorkflowRequest(parsedState.data, {
+            requestedAt,
+            requestId,
+          }) ||
           parsedState.data.tabId !== tabId
         ) {
           return {
@@ -178,7 +189,7 @@ export default defineAction({
     if (state.status !== "generating") {
       return { reconciled: false, reason: "terminal" as const };
     }
-    if (state.requestedAt !== requestedAt) {
+    if (!matchesWorkflowRequest(state, { requestedAt, requestId })) {
       return { reconciled: false, reason: "newer-request" as const };
     }
 
@@ -209,7 +220,9 @@ export default defineAction({
       if (!parsedRequest.success) {
         throw new Error(`Invalid workflow request state for ${recordingId}`);
       }
-      if (parsedRequest.data.requestedAt !== requestedAt) {
+      if (
+        !matchesWorkflowRequest(parsedRequest.data, { requestedAt, requestId })
+      ) {
         return { reconciled: false, reason: "newer-request" as const };
       }
 

package/corpus/templates/clips/actions/set-organization-branding.ts

@@ -1,10 +1,10 @@
 /**
- * Update organization branding — org name, brand color, brand logo URL,
+ * Update organization branding — org name, brand color, brand logo reference,
  * default visibility — by updating the framework `organizations` row for the
  * name and upserting the Clips-specific `organization_settings` sidecar row.
  *
  * Usage:
- *   pnpm action set-organization-branding --brandColor="#18181B" --brandLogoUrl=/api/media/abc.png
+ *   pnpm action set-organization-branding --brandColor=<hex-color> --brandLogoUrl=clips-org-logo:v1:<reference>
  */
 
 import { defineAction } from "@agent-native/core/action";
@@ -20,7 +20,7 @@ const VisibilityEnum = z.enum(["private", "org", "public"]);
 
 export default defineAction({
   description:
-    "Update the active organization's Clips branding — brand color (e.g. #18181B), brand logo URL, and default recording visibility. Upserts the organization_settings sidecar row.",
+    "Update the active organization's Clips branding — brand color, brand logo reference, and default recording visibility. Upserts the organization_settings sidecar row.",
   schema: z.object({
     organizationId: z
       .string()
@@ -37,11 +37,11 @@ export default defineAction({
       .string()
       .regex(/^#[0-9a-fA-F]{3,8}$/)
       .optional()
-      .describe("Hex color (e.g. #18181B)"),
+      .describe("Hex color"),
     brandLogoUrl: z
       .string()
       .nullish()
-      .describe("URL of the logo image — pass null to clear"),
+      .describe("Stored logo reference or legacy URL — pass null to clear"),
     defaultVisibility: VisibilityEnum.optional().describe(
       "Default visibility for new recordings",
     ),

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

@@ -446,7 +446,15 @@ export function ClipsCommandMenu({
     <CommandMenu
       open={open}
       onOpenChange={onOpenChange}
-      changelog={changelog}
+      changelog={changelog
+        .split(
+          "The no-comments sidebar gives viewers a concise reason to try Clips and a clear path to sign up.",
+        )
+        .join(t("settings.changelogCommentSignup"))
+        .split(
+          'Signed-in viewers who hit an unavailable, expired, or private share link now land in their library instead of the public marketing page when they choose "Go home."',
+        )
+        .join(t("settings.changelogShareLink"))}
       changelogLabel={t("settings.whatsNew")}
       changelogKey="clips"
       renderResults={renderResults}

package/corpus/templates/clips/app/components/workspace/branding-editor.tsx

@@ -1,4 +1,4 @@
-import { appBasePath } from "@agent-native/core/client/api-path";
+import { appApiPath } from "@agent-native/core/client/api-path";
 import { useActionMutation } from "@agent-native/core/client/hooks";
 import { useT } from "@agent-native/core/client/i18n";
 import { IconPalette, IconPhoto } from "@tabler/icons-react";
@@ -17,6 +17,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
+import { organizationLogoUrl } from "@/lib/organization-logo";
 
 export type RecordingVisibility = "private" | "org" | "public";
 
@@ -41,22 +42,23 @@ const PRESETS = [
   "#111827",
 ];
 
-async function uploadLogo(file: File): Promise<string> {
+async function uploadLogo(file: File, organizationId: string): Promise<string> {
   const body = await file.arrayBuffer();
-  const res = await fetch(
-    `${appBasePath()}/api/media?filename=${encodeURIComponent(file.name)}`,
-    {
-      method: "POST",
-      body,
-      headers: { "Content-Type": file.type || "application/octet-stream" },
-    },
-  );
+  const query = new URLSearchParams({
+    organizationId,
+    filename: file.name,
+  });
+  const res = await fetch(appApiPath(`/api/media?${query}`), {
+    method: "POST",
+    body,
+    headers: { "Content-Type": file.type || "application/octet-stream" },
+  });
   if (!res.ok) {
     throw new Error(`Upload failed (${res.status})`);
   }
-  const json = (await res.json()) as { url?: string };
-  if (!json.url) throw new Error("Upload returned no URL");
-  return json.url;
+  const json = (await res.json()) as { reference?: string };
+  if (!json.reference) throw new Error("Upload returned no reference");
+  return json.reference;
 }
 
 export function BrandingEditor({
@@ -77,6 +79,14 @@ export function BrandingEditor({
     useState<RecordingVisibility>(initialDefaultVisibility);
   const [uploading, setUploading] = useState(false);
   const [dragging, setDragging] = useState(false);
+  const [uploadPreviewUrl, setUploadPreviewUrl] = useState<string | null>(null);
+
+  useEffect(
+    () => () => {
+      if (uploadPreviewUrl) URL.revokeObjectURL(uploadPreviewUrl);
+    },
+    [uploadPreviewUrl],
+  );
 
   // The last-saved values the Save button compares against to show the
   // dirty state. Re-seeded after every successful save so the button
@@ -101,6 +111,8 @@ export function BrandingEditor({
     brandColor !== savedState.brandColor ||
     brandLogoUrl !== savedState.brandLogoUrl ||
     defaultVisibility !== savedState.defaultVisibility;
+  const logoUrl =
+    uploadPreviewUrl ?? organizationLogoUrl(brandLogoUrl, organizationId);
 
   const qc = useQueryClient();
   const save = useActionMutation<
@@ -119,12 +131,14 @@ export function BrandingEditor({
       toast.error(t("brandingEditor.uploadImageFile"));
       return;
     }
+    setUploadPreviewUrl(URL.createObjectURL(file));
     try {
       setUploading(true);
-      const url = await uploadLogo(file);
-      setBrandLogoUrl(url);
+      const reference = await uploadLogo(file, organizationId);
+      setBrandLogoUrl(reference);
       toast.success(t("brandingEditor.logoUploaded"));
     } catch (err) {
+      setUploadPreviewUrl(null);
       toast.error(
         err instanceof Error ? err.message : t("brandingEditor.uploadFailed"),
       );
@@ -144,6 +158,7 @@ export function BrandingEditor({
         defaultVisibility,
       });
       setSavedState({ name, brandColor, brandLogoUrl, defaultVisibility });
+      setUploadPreviewUrl(null);
       toast.success(t("brandingEditor.brandingUpdated"));
       void qc.invalidateQueries({
         queryKey: ["action", "list-organization-state"],
@@ -234,12 +249,12 @@ export function BrandingEditor({
               <div
                 className="h-14 w-14 rounded-md flex items-center justify-center border bg-muted/30"
                 style={{
-                  background: brandLogoUrl ? undefined : brandColor + "20",
+                  background: logoUrl ? undefined : brandColor + "20",
                 }}
               >
-                {brandLogoUrl ? (
+                {logoUrl ? (
                   <img
-                    src={brandLogoUrl}
+                    src={logoUrl}
                     alt={t("brandingEditor.logoPreview")}
                     className="max-h-12 max-w-12 object-contain"
                   />
@@ -278,7 +293,10 @@ export function BrandingEditor({
                       type="button"
                       variant="ghost"
                       size="sm"
-                      onClick={() => setBrandLogoUrl(null)}
+                      onClick={() => {
+                        setBrandLogoUrl(null);
+                        setUploadPreviewUrl(null);
+                      }}
                       disabled={disabled}
                     >
                       {t("brandingEditor.remove")}
@@ -328,9 +346,9 @@ export function BrandingEditor({
               className="rounded-md p-3 flex items-center gap-3 text-white"
               style={{ background: brandColor }}
             >
-              {brandLogoUrl ? (
+              {logoUrl ? (
                 <img
-                  src={brandLogoUrl}
+                  src={logoUrl}
                   alt=""
                   className="h-8 w-8 rounded bg-white/90 object-contain p-1"
                 />
@@ -350,12 +368,8 @@ export function BrandingEditor({
               {t("brandingEditor.emailHeaderPreview")}
             </div>
             <div className="rounded-md border border-[#27272a] bg-[#0a0a0c] p-4 flex items-center justify-center gap-2">
-              {brandLogoUrl ? (
-                <img
-                  src={brandLogoUrl}
-                  alt=""
-                  className="h-7 w-7 object-contain"
-                />
+              {logoUrl ? (
+                <img src={logoUrl} alt="" className="h-7 w-7 object-contain" />
               ) : (
                 <div
                   className="h-7 w-7 rounded bg-white/90 flex items-center justify-center font-semibold text-[12px]"