@agent-native/core 0.84.10 → 0.84.13

package/corpus/core/src/client/chat/run-recovery.tsx

@@ -513,7 +513,9 @@ export function RunErrorRecoveryCard({
   onDismiss: () => void;
 }) {
   const [detailsOpen, setDetailsOpen] = useState(false);
-  const [copied, setCopied] = useState(false);
+  const [copyState, setCopyState] = useState<"idle" | "copied" | "failed">(
+    "idle",
+  );
   const [forking, setForking] = useState(false);
   const [forkError, setForkError] = useState<string | null>(null);
   const builderReconnect = useBuilderConnectFlow({
@@ -538,11 +540,15 @@ export function RunErrorRecoveryCard({
     ]
       .filter(Boolean)
       .join("\n\n");
-    void writeClipboardText(text).then((ok) => {
-      if (!ok) return;
-      setCopied(true);
-      setTimeout(() => setCopied(false), 1200);
-    });
+    void writeClipboardText(text)
+      .then((ok) => {
+        setCopyState(ok ? "copied" : "failed");
+        setTimeout(() => setCopyState("idle"), 1600);
+      })
+      .catch(() => {
+        setCopyState("failed");
+        setTimeout(() => setCopyState("idle"), 1600);
+      });
   }, [info]);
   const startNewChat = useCallback(() => {
     window.dispatchEvent(new CustomEvent("agent-chat:new-chat"));
@@ -705,8 +711,20 @@ export function RunErrorRecoveryCard({
           onClick={copyDetails}
           className="ml-auto inline-flex h-8 items-center gap-1.5 rounded-md px-2.5 text-xs font-medium text-muted-foreground hover:bg-background/80 hover:text-foreground"
         >
-          {copied ? <IconCheck size={13} /> : <IconCopy size={13} />}
-          {copied ? "Copied" : copyLabel}
+          {copyState === "copied" ? (
+            <IconCheck size={13} />
+          ) : copyState === "failed" ? (
+            <IconX size={13} />
+          ) : (
+            <IconCopy size={13} />
+          )}
+          <span aria-live="polite">
+            {copyState === "copied"
+              ? "Copied"
+              : copyState === "failed"
+                ? "Copy failed"
+                : copyLabel}
+          </span>
         </button>
       </div>
       {shouldShowBuilderReconnect && builderReconnect.error && (
@@ -913,42 +931,32 @@ export function PlanModeCallout({
   onSwitchToAct: () => void;
 }) {
   return (
-    <div className="shrink-0 px-3 pt-2">
-      <div className="rounded-lg border border-blue-500/25 bg-blue-500/[0.06] px-3 py-2.5 shadow-sm">
-        <div className="flex items-center gap-2.5">
-          <span className="flex h-7 w-7 shrink-0 items-center justify-center rounded-md bg-blue-500/10 text-blue-600 dark:text-blue-300">
-            <IconClipboardList size={15} />
-          </span>
-          <div className="min-w-0 flex-1">
-            <p className="text-sm font-medium text-foreground">
-              {canImplementPlan ? "Plan ready" : "Plan mode is on"}
-            </p>
-            <p className="mt-0.5 text-xs leading-relaxed text-muted-foreground">
-              {canImplementPlan
-                ? "Switch to Act and run the proposed plan."
-                : "The next turn will stay read-only until you switch to Act."}
-            </p>
-          </div>
-          {canImplementPlan ? (
-            <button
-              type="button"
-              onClick={onImplementPlan}
-              className="inline-flex h-8 shrink-0 items-center gap-1.5 rounded-md bg-foreground px-3 text-xs font-medium text-background hover:opacity-90"
-            >
-              <IconPlayerPlay size={13} />
-              Implement Plan
-            </button>
-          ) : (
-            <button
-              type="button"
-              onClick={onSwitchToAct}
-              className="inline-flex h-8 shrink-0 items-center gap-1.5 rounded-md border border-border bg-background px-3 text-xs font-medium text-foreground hover:bg-accent"
-            >
-              Act
-              <IconArrowRight size={13} />
-            </button>
-          )}
-        </div>
+    <div className="shrink-0 px-3 pt-1">
+      <div className="ml-auto flex w-fit max-w-full items-center gap-2 rounded-full border border-border/70 bg-background/95 px-2 py-1.5 text-xs text-muted-foreground shadow-sm">
+        <IconClipboardList size={13} className="shrink-0" />
+        <span className="min-w-0 truncate">
+          {canImplementPlan ? "Plan ready" : "Plan mode"}
+        </span>
+        {canImplementPlan ? (
+          <button
+            type="button"
+            onClick={onImplementPlan}
+            className="inline-flex h-6 shrink-0 items-center gap-1 rounded-full bg-foreground px-2.5 text-[11px] font-medium text-background hover:opacity-90"
+          >
+            <IconPlayerPlay size={12} />
+            Implement
+          </button>
+        ) : (
+          <button
+            type="button"
+            onClick={onSwitchToAct}
+            className="inline-flex h-6 shrink-0 items-center gap-1 rounded-full border border-border bg-background px-2.5 text-[11px] font-medium text-foreground hover:bg-accent"
+            aria-label="Switch to Act mode"
+          >
+            Act
+            <IconArrowRight size={12} />
+          </button>
+        )}
       </div>
     </div>
   );

package/corpus/core/src/client/chat/tool-call-display.tsx

@@ -692,10 +692,12 @@ export function ToolCallFallback({
   mcpApp?: AgentMcpAppPayload;
   chatUI?: ActionChatUIConfig;
   structuredMeta?: Record<string, unknown>;
+  activity?: boolean;
   approval?: { approvalKey: string; dismissed?: boolean };
 }) {
   const chatRunning = React.useContext(ChatRunningContext);
-  const isRunning = result === undefined && chatRunning;
+  const isRunning =
+    result === undefined && (chatRunning || rest.activity === true);
   return (
     <ToolCallDisplay
       toolName={toolName}
@@ -757,7 +759,10 @@ export function ReconnectStreamMessage({
                 mcpApp={part.mcpApp}
                 chatUI={part.chatUI}
                 structuredMeta={part.structuredMeta}
-                isRunning={part.result === undefined && chatRunning}
+                isRunning={
+                  part.result === undefined &&
+                  (chatRunning || part.activity === true)
+                }
                 approval={part.approval}
               />
             );

package/corpus/core/src/client/require-session.tsx

@@ -70,6 +70,24 @@ export function buildSignInReturnHref(): string {
   return `${base}?return=${encodeURIComponent(ret)}`;
 }
 
+/**
+ * True when the browser is already sitting on the framework sign-in entry
+ * point. Redirecting to sign-in from here would append the current sign-in
+ * URL as a fresh `?return=`, re-encode it, and navigate again — an infinite
+ * loop of ever-growing `…sign-in?return=%252F…sign-in%253Freturn%253D…` URLs.
+ *
+ * This happens when the authenticated app shell (wrapped in `RequireSession`)
+ * is served at the sign-in path instead of the framework login HTML — e.g.
+ * under a base-path deploy where the SPA shell answers `/<app>/_agent-native/
+ * sign-in`. The sign-in page is the framework's job, not the gate's: never
+ * redirect to ourselves. Compared against `agentNativePath(...)` so it matches
+ * whether or not the app is mounted under a base path.
+ */
+export function isOnSignInPage(): boolean {
+  if (typeof window === "undefined") return false;
+  return window.location.pathname === agentNativePath("/_agent-native/sign-in");
+}
+
 export function RequireSession({
   children,
   fallback,
@@ -83,7 +101,8 @@ export function RequireSession({
   // flight is harmless but noisy.
   const redirectedRef = useRef(false);
 
-  const mustRedirect = !bypass && !isLoading && !session && redirect;
+  const mustRedirect =
+    !bypass && !isLoading && !session && redirect && !isOnSignInPage();
 
   useEffect(() => {
     if (!mustRedirect) return;

package/corpus/core/src/client/sharing/ShareButton.tsx

@@ -46,8 +46,10 @@ export interface ShareButtonProps {
   /** @deprecated No longer affects rendering — trigger always says
    *  "Share". Kept for callsite compatibility. */
   variant?: "compact" | "label";
-  /** Optional trigger style. Defaults to the Google-Docs-style "Share" label. */
-  trigger?: "label" | "icon";
+  /** Optional trigger style. Defaults to the Google-Docs-style "Share" label.
+   *  Use "label-icon" to render a leading share glyph alongside the label so
+   *  the trigger matches adjacent icon+label buttons; "icon" is icon-only. */
+  trigger?: "label" | "icon" | "label-icon";
   /** @deprecated Label triggers no longer render a visibility/share glyph. */
   hideTriggerIcon?: boolean;
   /** Optional className applied to the trigger button. */
@@ -355,7 +357,9 @@ export function ShareButton(props: ShareButtonProps) {
   };
 
   // The default trigger stays text-only; the icon trigger keeps the share glyph.
+  // "label-icon" renders the glyph alongside the label for icon+label parity.
   const iconOnly = props.trigger === "icon";
+  const showLabelIcon = props.trigger === "label-icon";
 
   return (
     <Popover open={open} onOpenChange={handleOpenChange}>
@@ -368,7 +372,9 @@ export function ShareButton(props: ShareButtonProps) {
           )}
           aria-label={iconOnly ? "Share" : undefined}
         >
-          {iconOnly ? <IconShare3 size={16} strokeWidth={1.75} /> : null}
+          {iconOnly || showLabelIcon ? (
+            <IconShare3 size={16} strokeWidth={1.75} />
+          ) : null}
           {!iconOnly && <span>Share</span>}
         </button>
       </PopoverTrigger>

package/corpus/core/src/collab/storage.ts

@@ -10,6 +10,41 @@ import { ensureTableExists, ensureColumnExists } from "../db/ddl-guard.js";
 
 let _initPromise: Promise<void> | undefined;
 
+type DbExecClient = ReturnType<typeof getDbExec>;
+type DbExecuteArg = Parameters<DbExecClient["execute"]>[0];
+type DbExecuteResult = Awaited<ReturnType<DbExecClient["execute"]>>;
+
+function isSqliteBusyError(error: unknown): boolean {
+  if (isPostgres()) return false;
+  const candidate = error as { code?: unknown; message?: unknown } | null;
+  return (
+    candidate?.code === "SQLITE_BUSY" ||
+    candidate?.code === "SQLITE_BUSY_RECOVERY" ||
+    (typeof candidate?.message === "string" &&
+      /database is locked|SQLITE_BUSY/i.test(candidate.message))
+  );
+}
+
+function sleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function executeWithSqliteRetry(
+  client: DbExecClient,
+  statement: DbExecuteArg,
+): Promise<DbExecuteResult> {
+  const delays = [25, 75, 150, 300, 600];
+  for (let attempt = 0; ; attempt += 1) {
+    try {
+      return await client.execute(statement);
+    } catch (error) {
+      const delay = delays[attempt];
+      if (delay === undefined || !isSqliteBusyError(error)) throw error;
+      await sleep(delay);
+    }
+  }
+}
+
 async function ensureTable(): Promise<void> {
   if (!_initPromise) {
     _initPromise = (async () => {
@@ -97,7 +132,7 @@ export async function trySaveYDocState(
   const b64 = uint8ArrayToBase64(state);
   const nowExpr = isPostgres() ? "NOW()::text" : "datetime('now')";
   if (expectedVersion === null) {
-    const result = await client.execute({
+    const result = await executeWithSqliteRetry(client, {
       sql: isPostgres()
         ? `INSERT INTO _collab_docs (doc_id, yjs_state, text_snapshot, version, updated_at) VALUES (?, ?, ?, 0, ${nowExpr}) ON CONFLICT (doc_id) DO NOTHING`
         : `INSERT OR IGNORE INTO _collab_docs (doc_id, yjs_state, text_snapshot, version, updated_at) VALUES (?, ?, ?, 0, ${nowExpr})`,
@@ -106,7 +141,7 @@ export async function trySaveYDocState(
     return result.rowsAffected > 0;
   }
 
-  const result = await client.execute({
+  const result = await executeWithSqliteRetry(client, {
     sql: `UPDATE _collab_docs SET yjs_state = ?, text_snapshot = ?, version = version + 1, updated_at = ${nowExpr} WHERE doc_id = ? AND version = ?`,
     args: [b64, textSnapshot, docId, expectedVersion],
   });
@@ -123,13 +158,13 @@ export async function saveYDocState(
   const client = getDbExec();
   const b64 = uint8ArrayToBase64(state);
   const nowExpr = isPostgres() ? "NOW()::text" : "datetime('now')";
-  const updated = await client.execute({
+  const updated = await executeWithSqliteRetry(client, {
     sql: `UPDATE _collab_docs SET yjs_state = ?, text_snapshot = ?, version = version + 1, updated_at = ${nowExpr} WHERE doc_id = ?`,
     args: [b64, textSnapshot, docId],
   });
   if (updated.rowsAffected > 0) return;
 
-  const inserted = await client.execute({
+  const inserted = await executeWithSqliteRetry(client, {
     sql: isPostgres()
       ? `INSERT INTO _collab_docs (doc_id, yjs_state, text_snapshot, version, updated_at) VALUES (?, ?, ?, 0, ${nowExpr}) ON CONFLICT (doc_id) DO NOTHING`
       : `INSERT OR IGNORE INTO _collab_docs (doc_id, yjs_state, text_snapshot, version, updated_at) VALUES (?, ?, ?, 0, ${nowExpr})`,
@@ -137,7 +172,7 @@ export async function saveYDocState(
   });
   if (inserted.rowsAffected > 0) return;
 
-  await client.execute({
+  await executeWithSqliteRetry(client, {
     sql: `UPDATE _collab_docs SET yjs_state = ?, text_snapshot = ?, version = version + 1, updated_at = ${nowExpr} WHERE doc_id = ?`,
     args: [b64, textSnapshot, docId],
   });

package/corpus/core/src/server/agent-chat-plugin.ts

@@ -7694,6 +7694,7 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                   nextTitle,
                   nextPreview,
                   newMessageCount,
+                  { ignoreConflicts: true },
                 );
                 // Scope updates piggyback on the PUT — the client uses this
                 // path for both "detach" (scope: null) and "retag" flows.

package/corpus/core/src/server/auth.ts

@@ -542,6 +542,12 @@ export function safeReturnPath(raw: string | null | undefined): string {
   try {
     const parsed = new URL(raw, "http://safe-base.invalid");
     if (parsed.origin !== "http://safe-base.invalid") return "/";
+    // Never return to the sign-in entry point itself. A `return` that resolves
+    // back to `…/_agent-native/sign-in` re-enters the redirect loop — each hop
+    // nests the prior sign-in URL as a fresh `?return=`. Collapse it to "/" so
+    // the post-sign-in 302 lands on the app, not another sign-in page. Matches
+    // with or without an app base-path prefix (`/<app>/_agent-native/sign-in`).
+    if (parsed.pathname.endsWith("/_agent-native/sign-in")) return "/";
     return parsed.pathname + parsed.search + parsed.hash;
   } catch {
     return "/";

package/corpus/core/src/shared/streaming-text-smoothing.ts

@@ -1,6 +1,7 @@
 export const SMOOTH_STREAMING_COMMIT_INTERVAL_MS = 16;
 export const SMOOTH_STREAMING_LONG_TEXT_THRESHOLD_GRAPHEMES = 640;
 export const SMOOTH_STREAMING_LONG_TEXT_TAIL_GRAPHEMES = 180;
+const SMOOTH_STREAMING_SPEED_MULTIPLIER = 2;
 
 type SegmenterInstance = {
   segment(input: string): Iterable<{ segment: string }>;
@@ -137,7 +138,7 @@ export function smoothStreamingRevealCount({
     return 0;
   }
 
-  const charactersPerSecond = inputDone
+  const baseCharactersPerSecond = inputDone
     ? backlog > 800
       ? 900
       : 420
@@ -148,8 +149,12 @@ export function smoothStreamingRevealCount({
         : backlog > 180
           ? 190
           : 95;
+  const charactersPerSecond =
+    baseCharactersPerSecond * SMOOTH_STREAMING_SPEED_MULTIPLIER;
 
-  const maxBurst = inputDone ? 160 : backlog > 1400 ? 120 : 72;
+  const maxBurst =
+    (inputDone ? 160 : backlog > 1400 ? 120 : 72) *
+    SMOOTH_STREAMING_SPEED_MULTIPLIER;
   const count = Math.floor((elapsedMs / 1000) * charactersPerSecond);
 
   return Math.min(backlog, Math.max(1, count), maxBurst);
@@ -164,15 +169,15 @@ export function smoothStreamingPunctuationDelayMs(
   }
 
   if (grapheme === "\n") {
-    return 80;
+    return 80 / SMOOTH_STREAMING_SPEED_MULTIPLIER;
   }
 
   if (/[.!?)]/.test(grapheme)) {
-    return 70;
+    return 70 / SMOOTH_STREAMING_SPEED_MULTIPLIER;
   }
 
   if (/[,;:]/.test(grapheme)) {
-    return 35;
+    return 35 / SMOOTH_STREAMING_SPEED_MULTIPLIER;
   }
 
   return 0;

package/corpus/templates/assets/.agents/skills/logo-composite/SKILL.md

@@ -10,16 +10,17 @@ LLMs — including Gemini Pro — degrade complex logos. They smear gradients, d
 ## How it works
 
 1. The library has a `canonicalLogoUrl` (set via `set-canonical-logo --libraryId --assetId`). The asset's role is `logo_reference`.
-2. When `generate-image --includeLogo=true` runs, the prompt envelope adds:
+2. **Logo compositing is a preset option.** A generation preset carries `includeLogo` (stored in the preset `settings` and surfaced as a first-class field). When a generation resolves to a preset with `includeLogo: true`, `generate-image` composites the logo. A generate call's own `includeLogo` arg, when passed, overrides the preset for that run; when omitted, the preset's value wins.
+3. When logo compositing is on, the prompt envelope adds:
    > Leave a clean uncluttered area in the upper-right for the real brand logo; do not draw or approximate the logo yourself.
-3. Gemini returns an image with empty space in that corner.
-4. `compositeLogo()` from `server/lib/image-processing.ts` (Sharp) loads the canonical logo PNG / SVG, resizes it to ~16% of the image width with reasonable inset, and composites it onto the generated image.
-5. Output: the image with the actual logo, pixel-perfect, vector-quality if the source is SVG.
+4. Gemini returns an image with empty space in that corner.
+5. `compositeLogo()` from `server/lib/image-processing.ts` (Sharp) loads the canonical logo PNG / SVG, resizes it to ~16% of the image width with reasonable inset, and composites it onto the generated image.
+6. Output: the image with the actual logo, pixel-perfect, vector-quality if the source is SVG.
 
 ## When to use it
 
-- The user explicitly toggled "Use logo" in the Generate popover.
-- The agent infers the user wants the logo (e.g. "make a hero with our brand logo").
+- The user turned on "Composite canonical logo" when creating a generation preset (the preset then stamps the logo on every image made with it).
+- The agent infers the user wants the logo for a one-off (e.g. "make a hero with our brand logo") — pass `includeLogo: true` on that single generate call to override the preset.
 - The image will appear in a customer-facing context where logo accuracy matters.
 
 ## When NOT to use it

package/corpus/templates/assets/AGENTS.md

@@ -47,10 +47,25 @@ prompt, aspectRatio }`.
   composer is empty. The image model is the only remaining composer-side
   default; the image-model picker writes `imageGenerationModel`, which image
   generation actions may use when `model` is omitted.
+- When a `preset` is tagged, the server embeds that preset's aesthetics and
+  creative philosophy (brand style brief, prompt template, text/logo policy,
+  output format) into your message inside a `<tagged-generation-presets>` block.
+  Study and internalize that brief before you generate — let it drive
+  composition, mood, lighting, and subject — then pass the `presetId` to
+  `generate-image` / `generate-image-batch` so the saved format/model/tier/logo
+  apply automatically. Do not restate those as ad-hoc args.
 - For exact visible copy inside a generated image, pass `embeddedText` and
   optional `textPlacement` to `generate-image` or each `generate-image-batch`
   slot. Keep the general `prompt` for creative direction; the structured text
   fields are what allow the pipeline to render copy instead of suppressing it.
+- Logo compositing is a preset option: a generation preset carries
+  `includeLogo`, and `generate-image` / `generate-image-batch` stamp the
+  library's pixel-perfect canonical logo onto the result when the resolved
+  preset has it on (no-op if the library has no canonical logo). Set it via
+  `create-generation-preset` / `update-generation-preset` (`includeLogo`). The
+  model never draws the logo itself. Pass `includeLogo` on a generate call only
+  to override the preset for that one run; otherwise omit it. See the
+  `logo-composite` skill.
 - `asset-variants` is the shared live generation tray state. New image
   candidates should appear there through `generate-image` or
   `generate-image-batch`; do not invent page-local progress surfaces.

package/corpus/templates/assets/actions/_helpers.ts

@@ -155,6 +155,7 @@ export function serializeGenerationRun(row: any) {
 }
 
 export function serializeGenerationPreset(row: any): GenerationPresetSummary {
+  const settings = parseJson<Record<string, unknown>>(row.settings, {});
   return {
     id: row.id,
     libraryId: row.libraryId,
@@ -169,7 +170,8 @@ export function serializeGenerationPreset(row: any): GenerationPresetSummary {
     model: row.model,
     textPolicy: row.textPolicy ?? "",
     referencePolicy: row.referencePolicy ?? "auto",
-    settings: parseJson<Record<string, unknown>>(row.settings, {}),
+    includeLogo: settings.includeLogo === true,
+    settings,
     sortOrder: Number(row.sortOrder ?? 0),
     createdAt: row.createdAt,
     updatedAt: row.updatedAt,

package/corpus/templates/assets/actions/create-generation-preset.ts

@@ -32,6 +32,12 @@ export default defineAction({
     referencePolicy: z
       .enum(GENERATION_PRESET_REFERENCE_POLICIES)
       .default("auto"),
+    includeLogo: z.coerce
+      .boolean()
+      .optional()
+      .describe(
+        "When true, images generated with this preset composite the library's canonical logo (no-op if the library has no canonical logo).",
+      ),
     settings: z.record(z.string(), z.unknown()).optional(),
     sortOrder: z.coerce.number().optional(),
   }),
@@ -62,7 +68,12 @@ export default defineAction({
       model: args.model,
       textPolicy: args.textPolicy,
       referencePolicy: args.referencePolicy,
-      settings: stringifyJson(args.settings ?? {}),
+      settings: stringifyJson({
+        ...(args.settings ?? {}),
+        ...(args.includeLogo !== undefined
+          ? { includeLogo: args.includeLogo }
+          : {}),
+      }),
       sortOrder: args.sortOrder ?? 100,
       createdAt: now,
       updatedAt: now,

package/corpus/templates/assets/actions/generate-asset.ts

@@ -48,7 +48,11 @@ const schema = z.object({
     .describe("Number of image candidates to generate in the picker."),
   tier: z.enum(IMAGE_QUALITY_TIERS).optional(),
   styleStrength: z.enum(STYLE_STRENGTHS).default("balanced"),
-  includeLogo: booleanParam.default(false),
+  includeLogo: booleanParam
+    .optional()
+    .describe(
+      "Override logo compositing for this run. When omitted, the selected preset's logo setting decides whether the library's canonical logo is composited.",
+    ),
   callerAppId: z
     .string()
     .optional()

package/corpus/templates/assets/actions/generate-image-batch.ts

@@ -86,7 +86,12 @@ export default defineAction({
     tier: z.enum(IMAGE_QUALITY_TIERS).optional(),
     intent: z.enum(GENERATION_INTENTS).default("generate"),
     styleStrength: z.enum(STYLE_STRENGTHS).default("balanced"),
-    includeLogo: z.coerce.boolean().default(false),
+    includeLogo: z.coerce
+      .boolean()
+      .optional()
+      .describe(
+        "Composite the library's canonical logo onto every slot. When omitted, the selected preset's logo setting is used; pass an explicit value to override it. No-op if the library has no canonical logo.",
+      ),
     groundingMode: z.enum(["auto", "off", "google-search"]).default("auto"),
     source: z.enum(["chat", "ui", "a2a"]).default("chat"),
     callerAppId: z

package/corpus/templates/assets/actions/generate-image.ts

@@ -103,7 +103,12 @@ export default defineAction({
       .describe(
         "Exact reference assets to use. When omitted, the server deterministically chooses a small relevant subset from the latest library references.",
       ),
-    includeLogo: z.coerce.boolean().default(false),
+    includeLogo: z.coerce
+      .boolean()
+      .optional()
+      .describe(
+        "Composite the library's pixel-perfect canonical logo onto the finished image. When omitted, the selected preset's logo setting is used; pass an explicit value to override it. No-op if the library has no canonical logo.",
+      ),
     slotId: z.string().optional(),
     variantBatchId: z.string().optional(),
     variantScopeId: z
@@ -259,11 +264,13 @@ export default defineAction({
       preset?.imageSize ??
       collection?.defaultImageSize ??
       "2K") as (typeof IMAGE_SIZES)[number];
-    const presetSettings = parseJson<{ tier?: ImageQualityTier }>(
-      preset?.settings,
-      {},
-    );
+    const presetSettings = parseJson<{
+      tier?: ImageQualityTier;
+      includeLogo?: boolean;
+    }>(preset?.settings, {});
     const resolvedTier = args.tier ?? presetSettings.tier;
+    const resolvedIncludeLogo =
+      args.includeLogo ?? presetSettings.includeLogo ?? false;
     const category = (args.categories?.[0] ??
       preset?.category ??
       collection?.category) as ImageCategory | undefined;
@@ -320,7 +327,7 @@ export default defineAction({
       embeddedText: args.embeddedText,
       textPlacement: args.textPlacement,
       referenceCount: references.length,
-      includeLogo: args.includeLogo,
+      includeLogo: resolvedIncludeLogo,
       aspectRatio: resolvedAspectRatio,
       imageSize: resolvedImageSize,
       category,
@@ -363,7 +370,7 @@ export default defineAction({
       aspectRatio: resolvedAspectRatio,
       imageSize: resolvedImageSize,
       groundingMode: args.groundingMode,
-      includeLogo: args.includeLogo,
+      includeLogo: resolvedIncludeLogo,
       categories: resolvedCategories ?? [],
       collectionId: resolvedCollectionId ?? null,
       presetId: preset?.id ?? null,
@@ -386,7 +393,7 @@ export default defineAction({
       intent: args.intent,
       styleStrength: args.styleStrength,
       tier: resolvedTier,
-      includeLogo: args.includeLogo,
+      includeLogo: resolvedIncludeLogo,
       categories: resolvedCategories ?? [],
       presetId: preset?.id,
       sessionId: session?.id,
@@ -463,7 +470,7 @@ export default defineAction({
       await deleteAppState("image-generation-setup").catch(() => {});
       let image = generated.image;
       let mimeType = generated.mimeType;
-      if (args.includeLogo && library.canonicalLogoAssetId) {
+      if (resolvedIncludeLogo && library.canonicalLogoAssetId) {
         const [logo] = await db
           .select()
           .from(schema.assets)
@@ -539,7 +546,7 @@ export default defineAction({
               intent: args.intent,
               styleStrength: args.styleStrength,
               tier: resolvedTier,
-              includeLogo: args.includeLogo,
+              includeLogo: resolvedIncludeLogo,
               presetId: preset?.id,
               sessionId: session?.id,
               generated: true,
@@ -584,7 +591,7 @@ export default defineAction({
             intent: args.intent,
             styleStrength: args.styleStrength,
             tier: resolvedTier,
-            includeLogo: args.includeLogo,
+            includeLogo: resolvedIncludeLogo,
             categories: resolvedCategories ?? [],
             referenceSelection,
             settingsUsed,

package/corpus/templates/assets/actions/open-asset-picker.ts

@@ -72,8 +72,10 @@ const schema = z.object({
     .default("balanced")
     .describe("How strongly to follow the library style during generation."),
   includeLogo: booleanParam
-    .default(false)
-    .describe("Whether auto-generation should include the library logo."),
+    .optional()
+    .describe(
+      "Override logo compositing for auto-generation. When omitted, the selected preset's logo setting decides whether the library's canonical logo is composited.",
+    ),
   callerAppId: z
     .string()
     .optional()

package/corpus/templates/assets/actions/update-generation-preset.ts

@@ -4,7 +4,7 @@ import { eq } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
-import { nowIso, stringifyJson } from "../server/lib/json.js";
+import { nowIso, parseJson, stringifyJson } from "../server/lib/json.js";
 import {
   ASPECT_RATIOS,
   GENERATION_PRESET_REFERENCE_POLICIES,
@@ -29,6 +29,12 @@ export default defineAction({
     model: z.enum(IMAGE_MODELS).optional(),
     textPolicy: z.string().optional(),
     referencePolicy: z.enum(GENERATION_PRESET_REFERENCE_POLICIES).optional(),
+    includeLogo: z.coerce
+      .boolean()
+      .optional()
+      .describe(
+        "When true, images generated with this preset composite the library's canonical logo (no-op if the library has no canonical logo).",
+      ),
     settings: z.record(z.string(), z.unknown()).optional(),
     sortOrder: z.coerce.number().optional(),
   }),
@@ -67,8 +73,15 @@ export default defineAction({
     ] as const) {
       if (args[key] !== undefined) updates[key] = args[key];
     }
-    if (args.settings !== undefined) {
-      updates.settings = stringifyJson(args.settings);
+    if (args.settings !== undefined || args.includeLogo !== undefined) {
+      const nextSettings = {
+        ...parseJson<Record<string, unknown>>(preset.settings, {}),
+        ...(args.settings ?? {}),
+      };
+      if (args.includeLogo !== undefined) {
+        nextSettings.includeLogo = args.includeLogo;
+      }
+      updates.settings = stringifyJson(nextSettings);
     }
     await db
       .update(schema.assetGenerationPresets)