@agent-native/core 0.187.0 → 0.187.1-nightly-20260925003003

package/corpus/templates/mail/server/lib/inbox-sync.ts

@@ -27,17 +27,18 @@ import {
 } from "./google-auth.js";
 import { classifyAutomated } from "./inbox-classify.js";
 import {
-  assertSyncClaimHeld,
   claimSyncAccount,
   deleteInboxThreadRow,
   ensureSyncAccountRow,
   markThreadsOutOfInboxBeforeSync,
   patchSyncAccount,
+  readInboxPushGeneration,
   readSyncAccounts,
   releaseSyncAccount,
   resetSyncAccountProgress,
   SyncClaimLostError,
   upsertInboxThreadRows,
+  withSyncClaim,
   type CachedGmailLabel,
   type SyncAccountPatch,
   type SyncAccountRow,
@@ -297,12 +298,17 @@ async function hydrateAndApply(
       else deletes.push({ id: part.id, readStartedAt });
     }
   }
-  // Fenced immediately before this step's row writes: a claim lost to a
-  // newer worker during the Gmail round trips above must not land here.
-  await assertSyncClaimHeld(ownerEmail, accountEmail, claimId);
-  if (upserts.length > 0) await upsertInboxThreadRows(upserts);
-  for (const { id, readStartedAt } of deletes)
-    await deleteInboxThreadRow(ownerEmail, accountEmail, id, readStartedAt);
+  await withSyncClaim(ownerEmail, accountEmail, claimId, async (tx) => {
+    if (upserts.length > 0) await upsertInboxThreadRows(upserts, tx);
+    for (const { id, readStartedAt } of deletes)
+      await deleteInboxThreadRow(
+        ownerEmail,
+        accountEmail,
+        id,
+        readStartedAt,
+        tx,
+      );
+  });
 }
 
 async function runFullSyncStep(
@@ -348,10 +354,9 @@ async function runFullSyncStep(
         accountEmail,
         connected,
       );
-      // Fenced immediately before the page's row writes: a claim lost to a
-      // newer worker during the Gmail round trips above must not land here.
-      await assertSyncClaimHeld(ownerEmail, accountEmail, claimId);
-      await upsertInboxThreadRows(rows);
+      await withSyncClaim(ownerEmail, accountEmail, claimId, (tx) =>
+        upsertInboxThreadRows(rows, tx),
+      );
     }
     pageToken = page.nextPageToken;
     await patchProgress(ownerEmail, accountEmail, claimId, {
@@ -359,11 +364,13 @@ async function runFullSyncStep(
     });
 
     if (!pageToken) {
-      await assertSyncClaimHeld(ownerEmail, accountEmail, claimId);
-      await markThreadsOutOfInboxBeforeSync(
-        ownerEmail,
-        accountEmail,
-        fullSyncStartedAt!,
+      await withSyncClaim(ownerEmail, accountEmail, claimId, (tx) =>
+        markThreadsOutOfInboxBeforeSync(
+          ownerEmail,
+          accountEmail,
+          fullSyncStartedAt!,
+          tx,
+        ),
       );
       await patchProgress(ownerEmail, accountEmail, claimId, {
         historyId: fullSyncHistoryId,
@@ -555,6 +562,7 @@ export async function syncInboxAccount(
     budgetMs?: number;
     force?: boolean;
     connectedAccountEmails?: readonly string[];
+    pushGeneration?: number;
   },
 ): Promise<InboxSyncAccountStatus> {
   const budgetMs = opts?.budgetMs ?? DEFAULT_BUDGET_MS;
@@ -573,6 +581,9 @@ export async function syncInboxAccount(
 
   let row = claim.row;
   try {
+    const pushGeneration =
+      opts?.pushGeneration ??
+      (await readInboxPushGeneration(ownerEmail, accountEmail));
     let client: { accessToken: string; email: string } | null;
     try {
       client = await getClientForConnectedAccount(ownerEmail, accountEmail);
@@ -647,6 +658,14 @@ export async function syncInboxAccount(
         : "idle";
     if (syncResult.changed) invalidateHistoryCacheForAccount(accountEmail);
     invalidateListCacheForOwner(ownerEmail);
+    if (
+      accountStatus.state === "ready" &&
+      pushGeneration > row.lastPushGeneration
+    ) {
+      await patchProgress(ownerEmail, accountEmail, claim.claimId, {
+        lastPushGeneration: pushGeneration,
+      });
+    }
     await releaseSyncAccount(ownerEmail, accountEmail, claim.claimId, dbStatus);
     return accountStatus;
   } catch (err) {
@@ -692,8 +711,14 @@ export async function ensureInboxFresh(
   const statuses = await Promise.all(
     emails.map(async (accountEmail) => {
       const row = await ensureSyncAccountRow(ownerEmail, accountEmail);
+      const pushGeneration = await readInboxPushGeneration(
+        ownerEmail,
+        accountEmail,
+      );
       const fresh =
-        row.lastSyncedAt != null && now - row.lastSyncedAt < maxAgeMs;
+        row.lastPushGeneration >= pushGeneration &&
+        row.lastSyncedAt != null &&
+        now - row.lastSyncedAt < maxAgeMs;
       if (fresh) return statusFromRow(row);
       try {
         // Accounts run concurrently and share nothing — each has its own
@@ -701,6 +726,7 @@ export async function ensureInboxFresh(
         return await syncInboxAccount(ownerEmail, accountEmail, {
           budgetMs,
           connectedAccountEmails: accounts,
+          pushGeneration,
         });
       } catch (err) {
         // Belt-and-suspenders: syncInboxAccount already records failures on

package/corpus/templates/mail/server/plugins/db.ts

@@ -281,6 +281,25 @@ ADD COLUMN IF NOT EXISTS local_mutation_history_id TEXT;
 ALTER TABLE mail_inbox_threads
 ADD COLUMN IF NOT EXISTS local_mutation_fields INTEGER`,
     },
+    {
+      version: 25,
+      name: "mail-inbox-push-invalidations",
+      sql: `CREATE TABLE IF NOT EXISTS mail_inbox_push_invalidations (
+    id TEXT PRIMARY KEY,
+    owner_email TEXT NOT NULL,
+    account_email TEXT NOT NULL
+  );
+CREATE INDEX IF NOT EXISTS idx_mail_inbox_push_invalidations_owner_account
+  ON mail_inbox_push_invalidations(owner_email, account_email);`,
+    },
+    {
+      version: 26,
+      name: "mail-inbox-push-generation",
+      sql: `ALTER TABLE mail_inbox_push_invalidations
+  ADD COLUMN IF NOT EXISTS generation BIGINT NOT NULL DEFAULT 1;
+ALTER TABLE mail_sync_accounts
+  ADD COLUMN IF NOT EXISTS last_push_generation BIGINT NOT NULL DEFAULT 0;`,
+    },
   ],
   { table: "mail_migrations" },
 );

package/corpus/templates/mail/server/routes/api/gmail/push.post.ts

@@ -12,7 +12,7 @@ import {
   bumpHistoryWatermark,
   invalidateListCacheForOwner,
 } from "../../../lib/google-auth.js";
-import { syncInboxAccount } from "../../../lib/inbox-sync.js";
+import { recordInboxPushInvalidation } from "../../../lib/inbox-store.js";
 
 // Cache Google's public keys for OIDC verification. jose handles TTL + refresh.
 // https://cloud.google.com/pubsub/docs/push#validate_tokens
@@ -123,23 +123,12 @@ export default defineEventHandler(async (event: H3Event) => {
     bumpHistoryWatermark(emailAddress, historyId);
     if (owner) {
       invalidateListCacheForOwner(owner);
-      // Best-effort: drive the synced inbox store off the same push instead
-      // of waiting for the next 15s freshness check. A sync failure here
-      // must never fail the push ack (Pub/Sub would just redeliver it).
-      // Budget stays well under Pub/Sub's default 10s ack deadline — an
-      // incremental history sync (the common case here) is ~1-2s, and a full
-      // sync just resumes on the next request/poll since its progress is
-      // persisted, so there's no need to risk redelivery chasing it to
-      // completion synchronously (fire-and-forget after responding is killed
-      // on Netlify Lambdas, so this can't run past the response either way).
-      await syncInboxAccount(owner, emailAddress, { budgetMs: 4_000 }).catch(
-        (syncErr: any) => {
-          console.warn(`[gmail-push] inbox resync failed: ${syncErr?.message}`);
-        },
-      );
+      await recordInboxPushInvalidation(owner, emailAddress);
     }
   } catch (err: any) {
     console.warn(`[gmail-push] processing failed: ${err.message}`);
+    setResponseStatus(event, 500);
+    return { ok: false, error: "processing failed" };
   }
 
   return { ok: true };

package/corpus/templates/slides/.agents/skills/create-deck/SKILL.md

@@ -192,20 +192,38 @@ pnpm action add-slide --deckId=<id> --layout content --content "..."
 
 ## Slide Wrapper
 
-Every slide's `content` must use this exact outer div:
+Every slide's `content` must use the semantic `--deck-*` contract on its outer
+div. Which of the two forms you use depends on whether a design system is
+linked.
+
+**A design system is linked.** Inherit the renderer's hydrated variables
+(`--ds-bg`, `--ds-text`, `--ds-text-muted`, `--ds-accent`, `--ds-surface`,
+`--ds-heading-font`, `--ds-body-font`, `--ds-radius`) through the contract
+rather than copying values into individual elements:
+
+```html
+<div class="fmd-slide" style="--deck-bg: var(--ds-bg); --deck-ink: var(--ds-text); --deck-muted: var(--ds-text-muted); --deck-accent: var(--ds-accent); --deck-surface: var(--ds-surface); --deck-heading-font: var(--ds-heading-font); --deck-body-font: var(--ds-body-font); --deck-radius: var(--ds-radius); background: var(--deck-bg); color: var(--deck-ink); padding: 64px 80px; display: flex; flex-direction: column; justify-content: flex-start; font-family: var(--deck-body-font);">
+  <!-- slide content here -->
+</div>
+```
+
+**No design system is linked.** There is no house style to fall back to, and
+the renderer publishes no `--ds-*` tokens beyond the slide's own background.
+Derive a contract from the deck's subject and write it as literal values:
 
 ```html
-<div class="fmd-slide" style="--deck-bg: var(--ds-bg, Canvas); --deck-ink: var(--ds-text, CanvasText); --deck-muted: var(--ds-text-muted, GrayText); --deck-accent: var(--ds-accent, currentColor); --deck-surface: var(--ds-surface, transparent); --deck-heading-font: var(--ds-heading-font, sans-serif); --deck-body-font: var(--ds-body-font, sans-serif); --deck-radius: var(--ds-radius, 0px); background: var(--deck-bg); color: var(--deck-ink); padding: 64px 80px; display: flex; flex-direction: column; justify-content: flex-start; font-family: var(--deck-body-font);">
+<div class="fmd-slide" style="--deck-bg: #10261C; --deck-ink: #F2EFE6; --deck-muted: #A8B8AC; --deck-accent: #7FB069; --deck-surface: rgba(255,255,255,0.05); --deck-heading-font: 'Fraunces', Georgia, serif; --deck-body-font: 'Inter', sans-serif; --deck-radius: 4px; background: var(--deck-bg); color: var(--deck-ink); padding: 64px 80px; display: flex; flex-direction: column; justify-content: flex-start; font-family: var(--deck-body-font);">
   <!-- slide content here -->
 </div>
 ```
 
-When a system is linked, use its hydrated values or the renderer variables
-(`--ds-accent`, `--ds-bg`, `--ds-text`, `--ds-text-muted`, `--ds-heading-font`,
-`--ds-body-font`, `--ds-radius`) through the semantic `--deck-*` contract
-instead of copying values into individual elements. With no linked system,
-choose the contract once from the subject and repeat it exactly; do not import
-a stock presentation palette, font, or component language.
+That example is a nature-related deck, so colors match the topic of deck. Pick the values once, before the first slide, and repeat the identical contract on every wrapper.
+
+Inheriting when nothing is linked is the failure mode to avoid: a
+`var(--ds-accent, currentColor)` reference on an unlinked deck silently
+resolves to a browser default, so the deck reads as unstyled rather than as the
+direction you chose. Never import a stock presentation palette, font, or
+component language as a substitute for choosing.
 
 ## Fit budget
 
@@ -219,13 +237,9 @@ stack. Keep body text at or above 16px. Never hide overflow with zoom,
 may reduce the slide's explicit padding, and that padding must remain intact
 when the saved HTML is rendered.
 
-When no reference deck or hydrated design system is available, derive the
-fallback direction from the subject instead of using a fixed palette. Lock one
-background family, readable text/surface roles, type pairing, spacing scale,
-radius, and accent treatment as semantic `--deck-*` values, then repeat them on
-every wrapper. Build an intentional composition beyond a text dump: use a title
-block, two-column split, metric treatment, rule, callout, visual placeholder,
-or simple diagram where it fits the message. Keep the canvas stable across the
+Build an intentional composition beyond a text dump: use a title block,
+two-column split, metric treatment, rule, callout, visual placeholder, or
+simple diagram where it fits the message. Keep the canvas stable across the
 deck, use accents only for hierarchy or meaning, and do not add decorative
 cards, gradients, fake logos, or shapes without a semantic role.
 
@@ -241,33 +255,34 @@ was rendered and compared.
 
 ## Ready-to-Use Templates
 
-Copy and fill in the bracketed values. Each example includes the complete
-semantic wrapper contract. If no design system is linked, replace the
-`--ds-*` fallbacks with the one subject-appropriate contract chosen for this
-deck before copying the wrapper to another slide.
+Copy and fill in the bracketed values. `[WRAPPER STYLE]` stands for the deck
+contract chosen in "Slide Wrapper" - the inherited `var(--ds-*)` form when a
+system is linked, the literal form when none is. It is identical on every
+slide. Inside the slide, read the contract directly (`var(--deck-accent)`), not
+through another layer of fallbacks; the wrapper has already defined every role.
 
 ### Title Slide
 
 ```html
-<div class="fmd-slide" style="--deck-bg: var(--ds-bg, Canvas); --deck-ink: var(--ds-text, CanvasText); --deck-muted: var(--ds-text-muted, GrayText); --deck-accent: var(--ds-accent, currentColor); --deck-surface: var(--ds-surface, transparent); --deck-heading-font: var(--ds-heading-font, sans-serif); --deck-body-font: var(--ds-body-font, sans-serif); --deck-radius: var(--ds-radius, 0px); background: var(--deck-bg); color: var(--deck-ink); padding: 64px 80px; display: flex; flex-direction: column; justify-content: center; align-items: flex-start; gap: 18px; font-family: var(--deck-body-font);">
-  <div style="font-size: 14px; font-weight: 700; letter-spacing: 0.12em; text-transform: uppercase; color: var(--deck-accent, var(--ds-accent, currentColor));">[LABEL OR DATE]</div>
-  <h1 style="font-size: 56px; font-weight: 750; color: var(--deck-ink, var(--ds-text, currentColor)); font-family: var(--deck-heading-font, var(--ds-heading-font, var(--deck-body-font, sans-serif))); line-height: 1.05; letter-spacing: -0.04em; margin: 0; max-width: 760px;">[TITLE]</h1>
-  <p style="font-size: 20px; color: var(--deck-muted, var(--ds-text-muted, currentColor)); margin: 4px 0 0;">[SUBTITLE OR PRESENTER]</p>
+<div class="fmd-slide" style="[WRAPPER STYLE] justify-content: center; align-items: flex-start; gap: 18px;">
+  <div style="font-size: 14px; font-weight: 700; letter-spacing: 0.12em; text-transform: uppercase; color: var(--deck-accent);">[LABEL OR DATE]</div>
+  <h1 style="font-size: 56px; font-weight: 750; color: var(--deck-ink); font-family: var(--deck-heading-font); line-height: 1.05; letter-spacing: -0.04em; margin: 0; max-width: 760px;">[TITLE]</h1>
+  <p style="font-size: 20px; color: var(--deck-muted); margin: 4px 0 0;">[SUBTITLE OR PRESENTER]</p>
 </div>
 ```
 
 ### Content or Two-Column Slide
 
 ```html
-<div class="fmd-slide" style="--deck-bg: var(--ds-bg, Canvas); --deck-ink: var(--ds-text, CanvasText); --deck-muted: var(--ds-text-muted, GrayText); --deck-accent: var(--ds-accent, currentColor); --deck-surface: var(--ds-surface, transparent); --deck-heading-font: var(--ds-heading-font, sans-serif); --deck-body-font: var(--ds-body-font, sans-serif); --deck-radius: var(--ds-radius, 0px); background: var(--deck-bg); color: var(--deck-ink); padding: 64px 80px; display: flex; flex-direction: column; justify-content: flex-start; gap: 18px; font-family: var(--deck-body-font);">
-  <div style="font-size: 13px; font-weight: 700; letter-spacing: 0.1em; text-transform: uppercase; color: var(--deck-accent, var(--ds-accent, currentColor));">[SECTION LABEL]</div>
-  <h2 style="font-size: 34px; font-weight: 750; color: var(--deck-ink, var(--ds-text, currentColor)); font-family: var(--deck-heading-font, var(--ds-heading-font, var(--deck-body-font, sans-serif))); line-height: 1.12; letter-spacing: -0.03em; margin: 0 0 18px;">[SLIDE HEADING]</h2>
+<div class="fmd-slide" style="[WRAPPER STYLE] justify-content: flex-start; gap: 18px;">
+  <div style="font-size: 13px; font-weight: 700; letter-spacing: 0.1em; text-transform: uppercase; color: var(--deck-accent);">[SECTION LABEL]</div>
+  <h2 style="font-size: 34px; font-weight: 750; color: var(--deck-ink); font-family: var(--deck-heading-font); line-height: 1.12; letter-spacing: -0.03em; margin: 0 0 18px;">[SLIDE HEADING]</h2>
   <div style="display: grid; grid-template-columns: 1fr 1fr; gap: 24px; align-items: start;">
     <div style="display: flex; flex-direction: column; gap: 14px;">
-      <div style="border-left: 3px solid var(--deck-accent, var(--ds-accent, currentColor)); padding: 12px 16px; background: var(--deck-surface, var(--ds-surface, transparent)); border-radius: var(--deck-radius, var(--ds-radius, 0px)); font-size: 18px; line-height: 1.4;">[KEY POINT]</div>
-      <div style="border-left: 3px solid var(--deck-accent, var(--ds-accent, currentColor)); padding: 12px 16px; background: var(--deck-surface, var(--ds-surface, transparent)); border-radius: var(--deck-radius, var(--ds-radius, 0px)); font-size: 18px; line-height: 1.4;">[KEY POINT]</div>
+      <div style="border-left: 3px solid var(--deck-accent); padding: 12px 16px; background: var(--deck-surface); border-radius: var(--deck-radius); font-size: 18px; line-height: 1.4;">[KEY POINT]</div>
+      <div style="border-left: 3px solid var(--deck-accent); padding: 12px 16px; background: var(--deck-surface); border-radius: var(--deck-radius); font-size: 18px; line-height: 1.4;">[KEY POINT]</div>
     </div>
-    <div class="fmd-img-placeholder" style="min-height: 220px; border-radius: var(--deck-radius, var(--ds-radius, 0px));">[VISUAL OR IMAGE DESCRIPTION]</div>
+    <div class="fmd-img-placeholder" style="min-height: 220px; border-radius: var(--deck-radius);">[VISUAL OR IMAGE DESCRIPTION]</div>
   </div>
 </div>
 ```
@@ -282,7 +297,7 @@ When a slide needs a visual, use this div. It renders as a styled placeholder
 and can later be replaced with a generated image:
 
 ```html
-<div class="fmd-img-placeholder" style="width: 100%; min-height: 220px; border-radius: var(--deck-radius, var(--ds-radius, 0px));">[Description of what image should show]</div>
+<div class="fmd-img-placeholder" style="width: 100%; min-height: 220px; border-radius: var(--deck-radius);">[Description of what image should show]</div>
 ```
 
 ## Bulk Replacement Only

package/corpus/templates/slides/.agents/skills/slide-editing/SKILL.md

@@ -16,14 +16,30 @@ registry; do not assume a fixed 1920x1080 canvas.
 
 ## Slide HTML Structure
 
-Every slide uses this wrapper:
+Every slide uses the same `--deck-*` wrapper contract. What changes is where
+those values come from.
+
+**A design system is linked** - inherit its tokens:
+
+```html
+<div class="fmd-slide" style="--deck-bg: var(--ds-bg); --deck-ink: var(--ds-text); --deck-muted: var(--ds-text-muted); --deck-accent: var(--ds-accent); --deck-surface: var(--ds-surface); --deck-heading-font: var(--ds-heading-font); --deck-body-font: var(--ds-body-font); --deck-radius: var(--ds-radius); background: var(--deck-bg); color: var(--deck-ink); padding: 64px 80px; display: flex; flex-direction: column; justify-content: flex-start; font-family: var(--deck-body-font);">
+  <!-- Slide content here -->
+</div>
+```
+
+**No design system is linked** - write the deck's chosen values as literals:
 
 ```html
-<div class="fmd-slide" style="--deck-bg: var(--ds-bg, Canvas); --deck-ink: var(--ds-text, CanvasText); --deck-muted: var(--ds-text-muted, GrayText); --deck-accent: var(--ds-accent, currentColor); --deck-surface: var(--ds-surface, transparent); --deck-heading-font: var(--ds-heading-font, sans-serif); --deck-body-font: var(--ds-body-font, sans-serif); --deck-radius: var(--ds-radius, 0px); background: var(--deck-bg); color: var(--deck-ink); padding: 64px 80px; display: flex; flex-direction: column; justify-content: flex-start; font-family: var(--deck-body-font);">
+<div class="fmd-slide" style="--deck-bg: #10261C; --deck-ink: #F2EFE6; --deck-muted: #A8B8AC; --deck-accent: #7FB069; --deck-surface: rgba(255,255,255,0.05); --deck-heading-font: 'Fraunces', Georgia, serif; --deck-body-font: 'Inter', sans-serif; --deck-radius: 4px; background: var(--deck-bg); color: var(--deck-ink); padding: 64px 80px; display: flex; flex-direction: column; justify-content: flex-start; font-family: var(--deck-body-font);">
   <!-- Slide content here -->
 </div>
 ```
 
+The renderer publishes `--ds-bg` from the slide's own background, and nothing
+else, when no system is linked. Every other `var(--ds-*, ...)` reference
+resolves to its fallback, so an unlinked deck that inherits instead of baking
+renders as unstyled browser defaults. Bake the values.
+
 ## Styling Rules
 
 These are fallback defaults only. When a design system is linked, its hydrated

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

@@ -244,25 +244,36 @@ function standaloneDesignSystemVars(
     builderTokenValues,
   );
   const darkBackground = isDarkStandaloneBackground(safeBackground);
+  // Must match SlideRenderer: publishing a token an unlinked deck never chose
+  // overrides the theme baked into its slide HTML.
+  const token = (name: string, value: unknown): string | null => {
+    if (typeof value !== "string" || !value.trim()) return null;
+    const resolved = safeCssToken(value, "", builderTokenValues);
+    return resolved ? `${name}: ${resolved}` : null;
+  };
+  const designSystemTokens = designSystem
+    ? [
+        token("--ds-text", colors?.text),
+        token("--ds-text-muted", colors?.textMuted),
+        token("--ds-accent", colors?.accent),
+        token("--ds-primary", colors?.primary),
+        token("--ds-secondary", colors?.secondary),
+        token("--ds-surface", colors?.surface),
+        token("--ds-heading-font", typography?.headingFont),
+        token("--ds-body-font", typography?.bodyFont),
+        token("--ds-radius", borders?.radius),
+      ].filter((entry): entry is string => entry !== null)
+    : [];
+  const needsDarkTextOverride =
+    darkBackground &&
+    (!colors?.text || isDarkStandaloneBackground(colors.text));
   return [
     `--ds-bg: ${safeBackground}`,
-    // guard:allow-raw-color - standalone export fallback palette
-    // guard:allow-raw-color - standalone export dark-background fallback
-    `--ds-text: ${safeCssToken(colors?.text, darkBackground ? "#FFFFFF" : "#1F2933", builderTokenValues)}`,
-    // guard:allow-raw-color - standalone export fallback palette
-    // guard:allow-raw-color - standalone export dark-background fallback
-    `--ds-text-muted: ${safeCssToken(colors?.textMuted, darkBackground ? "rgba(255, 255, 255, 0.72)" : "#667085", builderTokenValues)}`,
-    // guard:allow-raw-color - standalone export fallback palette
-    `--ds-accent: ${safeCssToken(colors?.accent, "#2457D6", builderTokenValues)}`,
-    // guard:allow-raw-color - standalone export fallback palette
-    `--ds-primary: ${safeCssToken(colors?.primary, "#2457D6", builderTokenValues)}`,
-    // guard:allow-raw-color - standalone export fallback palette
-    `--ds-secondary: ${safeCssToken(colors?.secondary, "#C85C3A", builderTokenValues)}`,
-    // guard:allow-raw-color - standalone export fallback palette
-    `--ds-surface: ${safeCssToken(colors?.surface, "#FFFFFF", builderTokenValues)}`,
-    `--ds-heading-font: ${safeCssToken(typography?.headingFont, "Inter, sans-serif", builderTokenValues)}`,
-    `--ds-body-font: ${safeCssToken(typography?.bodyFont, "Inter, sans-serif", builderTokenValues)}`,
-    `--ds-radius: ${safeCssToken(borders?.radius, "14px", builderTokenValues)}`,
+    ...designSystemTokens,
+    ...(needsDarkTextOverride
+      ? // guard:allow-raw-color - readable defaults on explicit dark backgrounds
+        [`--ds-text: #FFFFFF`, `--ds-text-muted: rgba(255, 255, 255, 0.72)`]
+      : []),
     ...Object.entries(builderTokenValues ?? {})
       .filter(
         ([name, value]) =>

package/corpus/templates/slides/app/hooks/use-deck-design-system.ts

@@ -79,27 +79,24 @@ export function mergeDesignSystemData(value: unknown): DesignSystemData {
 }
 
 export interface DeckDesignSystemResult {
-  designSystem: DesignSystemData;
+  designSystem: DesignSystemData | undefined;
   designSystemTitle: string | null;
   imageStyleReferenceUrls: string[];
   isLoading: boolean;
 }
 
-export function useDeckDesignSystem(designSystemId?: string | null) {
-  const { data, isLoading } = useActionQuery<{
-    id: string;
-    title: string;
-    data: string;
-  }>("get-design-system", designSystemId ? { id: designSystemId } : undefined, {
-    enabled: Boolean(designSystemId),
-  });
-
+// Returning a stock palette for an unlinked deck publishes `--ds-*` values the
+// slide's own `var(--ds-*, ...)` fallbacks can never override, so "no design
+// system" renders as one nobody picked.
+export function resolveDeckDesignSystem(
+  designSystemId: string | null | undefined,
+  data: { title?: string | null; data?: string } | undefined,
+): Omit<DeckDesignSystemResult, "isLoading"> {
   if (!designSystemId || !data?.data) {
     return {
-      designSystem: DEFAULT_DESIGN_SYSTEM,
+      designSystem: undefined,
       designSystemTitle: null,
       imageStyleReferenceUrls: [],
-      isLoading: false,
     };
   }
 
@@ -109,16 +106,31 @@ export function useDeckDesignSystem(designSystemId?: string | null) {
       designSystem: parsed,
       designSystemTitle: data.title ?? null,
       imageStyleReferenceUrls: getDesignSystemImageStyleReferenceUrls(parsed),
-      isLoading,
     };
   } catch {
     return {
-      designSystem: DEFAULT_DESIGN_SYSTEM,
+      designSystem: undefined,
       designSystemTitle: data.title ?? null,
       imageStyleReferenceUrls: [],
-      isLoading,
     };
   }
 }
 
+export function useDeckDesignSystem(
+  designSystemId?: string | null,
+): DeckDesignSystemResult {
+  const { data, isLoading } = useActionQuery<{
+    id: string;
+    title: string;
+    data: string;
+  }>("get-design-system", designSystemId ? { id: designSystemId } : undefined, {
+    enabled: Boolean(designSystemId),
+  });
+
+  return {
+    ...resolveDeckDesignSystem(designSystemId, data),
+    isLoading: designSystemId ? isLoading : false,
+  };
+}
+
 export { DEFAULT_DESIGN_SYSTEM };

package/corpus/templates/slides/app/pages/DeckEditor.tsx

@@ -2817,7 +2817,7 @@ export default function DeckEditor() {
             questions={questionFlowQuestions ?? []}
             onSubmit={handleQuestionSubmit}
             onSkip={handleQuestionSkip}
-            designSystem={deck.designSystemId ? designSystem : undefined}
+            designSystem={designSystem}
             title={questionFlowTitle}
             description={questionFlowDescription}
             skipLabel={questionFlowSkipLabel}

package/corpus/templates/slides/changelog/2026-09-23-decks-with-no-design-system-now-follow-a-theme-chosen-for-th.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-09-23
+---
+
+Decks with no design system now follow a theme chosen for their subject instead of a fixed default palette

package/corpus/templates/slides/shared/slide-background.ts

@@ -1,4 +1,6 @@
-export const DEFAULT_SLIDE_BACKGROUND = "#F5F2EA"; // guard:allow-raw-color - default slide canvas fallback
+// Neutral on purpose: a tinted canvas default reads as a theme the user never
+// chose.
+export const DEFAULT_SLIDE_BACKGROUND = "#FFFFFF"; // guard:allow-raw-color - default slide canvas fallback
 
 // `slide.background` holds either a raw CSS value or a Tailwind arbitrary
 // class (`bg-[...]`), which SlideRenderer applies as a class rather than

package/dist/agent/engine/builder-engine.js

@@ -744,6 +744,14 @@ async function* parseJsonlStream(reader, model, captureContext = {}) {
                 }
                 case "usage": {
                     const cacheWrite = (event.cacheCreatedTokens ?? 0) + (event.cacheCreated1hTokens ?? 0);
+                    if (event.creditsUsed !== undefined &&
+                        (!Number.isFinite(event.creditsUsed) || event.creditsUsed < 0)) {
+                        yield gatewayErrorStop({
+                            error: "Builder gateway returned invalid credit usage",
+                            errorCode: "builder_gateway_error",
+                        }, captureContext.creditsLane, captureContext.requestShape);
+                        return;
+                    }
                     yield {
                         type: "usage",
                         inputTokens: event.inputTokens ?? 0,
@@ -752,6 +760,9 @@ async function* parseJsonlStream(reader, model, captureContext = {}) {
                             ? { cacheReadTokens: event.cacheInputTokens }
                             : {}),
                         ...(cacheWrite > 0 ? { cacheWriteTokens: cacheWrite } : {}),
+                        ...(event.creditsUsed !== undefined
+                            ? { builderCreditsUsed: event.creditsUsed }
+                            : {}),
                     };
                     break;
                 }

package/dist/agent/engine/types.d.ts

@@ -196,6 +196,7 @@ export type EngineEvent = {
     cacheWriteTokens?: number;
     totalTokens?: number;
     reasoningTokens?: number;
+    builderCreditsUsed?: number;
 } | {
     /** Final assistant content for the turn. Engines MUST emit this
      *  exactly once, immediately before the terminal `stop` event. */

package/dist/agent/production-agent.d.ts

@@ -571,6 +571,8 @@ export interface AgentLoopUsage {
     outputTokens: number;
     cacheReadTokens: number;
     cacheWriteTokens: number;
+    builderCreditsUsed?: number;
+    engineName?: string;
     model: string;
     /** Number of provider model-stream attempts, including retries. */
     llmCalls?: number;