@agent-native/core 0.78.0 → 0.78.2

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

@@ -1,6 +1,7 @@
 import { getOrgContext } from "@agent-native/core/org";
 import {
   createAgentChatPlugin,
+  getRequestRunContext,
   loadActionsFromStaticRegistry,
   type AgentLoopFinalResponseGuardContext,
 } from "@agent-native/core/server";
@@ -197,6 +198,18 @@ export default createAgentChatPlugin({
       "After creating the extension, briefly tell the user that the request needed bespoke UI/code beyond the native Analytics dashboard or analysis format, so you built it as an extension.\n" +
       "</analytics-artifact-guidance>";
 
+    // In the durable background-function worker, skip the data-dictionary read
+    // + render. That settings read + synchronous render is the heaviest, most
+    // hang-prone part of worker setup on a cold bg-fn instance, and it runs
+    // EAGERLY while the system prompt is built (before any pre-send timeout can
+    // arm), so a stall here is what kept the analytics worker from ever claiming
+    // its run. The agent can still pull dictionary entries on demand via
+    // `list-data-dictionary` / `search-bigquery-schema`; the static guidance is
+    // what it needs to know they exist. Foreground requests keep the full dict.
+    if (getRequestRunContext()?.isBackgroundWorker) {
+      return `${sourceGuidance}\n\n${artifactGuidance}`;
+    }
+
     try {
       const scope = await resolveSettingsScope(event);
       const all = await listScopedSettingRecords(scope, DATA_DICT_PREFIX);

package/corpus/templates/assets/.agents/skills/asset-generation/SKILL.md

@@ -21,12 +21,19 @@ or generated image/video assets that another app can reference by ID and URL.
   when `libraryId` is omitted, generates candidates, returns the picker filtered
   to those run IDs, and works in in-app chat plus external MCP hosts.
 - Use `open-asset-picker` when a person should browse, search, or select an
-  existing asset in UI, or when you want the picker to handle generation itself.
+  existing asset inside an embedded picker, or when you want the picker to
+  handle generation itself. It still opens `/library` with the iframe/bridge
+  contract. The normal human Library workspace is `/library` and `/library/:id`.
   Pass `mediaType: "image"` by default, or `mediaType: "video"` for video
   libraries.
 - Use unattended actions when the agent already knows what to do:
   `search-assets`, `list-assets`, `generate-image`, `generate-image-batch`,
   `generate-video`, `refresh-generation-run`, and `export-asset`.
+- In chat, consume composer `@` references as structured generation inputs:
+  `brand-kit` maps to `libraryId`, `preset` maps to `presetId`, and
+  `media-type` chooses image generation versus video generation. If no mention
+  is available, use `view-screen`, `list-libraries`, and
+  `list-generation-presets` to choose explicit args.
 - Use generation presets when the user asks for a repeatable output format
   like social image, blog hero, or diagram. Call `list-generation-presets` for
   the library and pass `presetId` through generation/refinement actions.
@@ -58,7 +65,8 @@ or generated image/video assets that another app can reference by ID and URL.
    `generate-image-batch` returns, use its returned `images` / asset fields
    directly; do not call `get-generation-run`, `refresh-generation-run`, or
    regenerate just to verify image runs.
-4. For preset-backed work, pass `presetId`; for handoff work, pass `sessionId`.
+4. For preset-backed work, pass a mentioned or selected `presetId`; for handoff
+   work, pass `sessionId`.
 5. Let the server choose a small deterministic reference set unless the user
    named exact assets. Canonical style anchors come from
    `assetLibraries.settings.canonicalStyleAssetIds` and

package/corpus/templates/assets/.agents/skills/image-generation/SKILL.md

@@ -10,8 +10,13 @@ Use this skill before calling `generate-image`, `generate-image-batch`, or
 
 ## Rules
 
-- Start from the current library. Call `view-screen` when the user says "this
-  library" or "this image" and you need fresh IDs.
+- Start from composer `@` mentions when the user tags generation inputs.
+  `brand-kit` references map to `libraryId`, `preset` references map to
+  `presetId`, and `media-type` references choose image generation versus video
+  generation. Call `view-screen` when the user says "this library" or "this
+  image" and you need fresh IDs. The image model may default from the composer
+  image-model picker; all other generation settings should be explicit action
+  args, preset values, or action schema defaults.
 - Use category-tagged references. Blog heroes should prefer `hero`; diagrams
   should prefer `diagram`; product imagery should include `product` and `logo`
   references.
@@ -20,16 +25,18 @@ Use this skill before calling `generate-image`, `generate-image-batch`, or
   `assets.metadata.isStyleAnchor` before sampling other relevant references.
 - Honor library custom instructions. They are persistent prompt guidance and
   should be updated when the user wants durable generation behavior.
-- Generate 2-4 candidates for open-ended requests. Use `generate-image-batch`
-  with stable `slotId`s so the UI can show live slots.
+- Generate the selected candidate count for open-ended requests, usually 2-4.
+  Use `generate-image-batch` with stable `slotId`s so the shared generation tray
+  can show live slots.
 - `generate-image` and `generate-image-batch` are synchronous for images. One
   batch call should produce the requested candidates and return their asset
   IDs/URLs; do not follow it with `get-generation-run`,
   `refresh-generation-run`, or more generation unless the user asks for another
   direction or the returned slot has `ok: false`.
-- For repeatable deliverables, call `list-generation-presets` and pass the
-  selected `presetId` to `generate-image`, `generate-image-batch`,
-  `refine-image`, or `rerun-generation-run`.
+- For repeatable deliverables, honor a `preset` @mention as `presetId` or call
+  `list-generation-presets` when choosing one. Pass the preset through
+  `generate-image`, `generate-image-batch`, `refine-image`, or
+  `rerun-generation-run`.
 - For designer handoff, preserve `sessionId` and call
   `update-generation-session` after each new candidate so the active asset,
   feedback, and run lineage stay resumable.

package/corpus/templates/assets/.agents/skills/library-management/SKILL.md

@@ -7,6 +7,14 @@ description: Schema, CRUD, sharing, and cascade-delete patterns for asset librar
 
 Use this skill before adding fields, changing access checks, or modifying delete behavior.
 
+## User surface
+
+The human Library workspace is canonical at `/library`. The root selects
+"All assets" and browses assets across every accessible brand kit; `/library/:id`
+opens one kit's management detail. Legacy `/brand-kits` URLs redirect here.
+Embedded picker hosts still load `/library` in an iframe and keep the existing
+bridge contract.
+
 ## Schema overview
 
 ```
@@ -24,6 +32,8 @@ image_libraries           — top-level library, has ownableColumns + shares
 Every action that touches an ownable resource must scope its queries:
 
 - **List queries**: `accessFilter(schema.assetLibraries, schema.assetLibraryShares)` in WHERE.
+  Cross-kit asset lists must first resolve the accessible library IDs, then
+  query `image_assets` by those IDs and include the parent kit title for UI chips.
 - **Read by id**: `await resolveAccess("asset-library", libraryId)`. The `requireLibrary(id)` helper in `_helpers.ts` wraps this.
 - **Write**: `await assertAccess("asset-library", libraryId, "editor")` for updates / inserts; `"admin"` for deletes.
 
@@ -52,6 +62,7 @@ Example: adding `image_libraries.icon`:
 ## Sharing
 
 Libraries follow the standard framework sharing model:
+
 - `visibility: "private" | "org" | "public"`
 - Per-user / per-org grants in `image_library_shares` with `viewer | editor | admin` roles.
 - Use the framework actions `share-resource`, `unshare-resource`, `set-resource-visibility` with `--resourceType=asset-library`. The legacy `image-library` alias remains registered for existing grants.
@@ -61,6 +72,7 @@ Generated assets and references inherit the parent library's visibility. v1 does
 ## Cascade delete
 
 `delete-library` deletes in order:
+
 1. `image_assets WHERE library_id = ?`
 2. `image_generation_runs WHERE library_id = ?`
 3. `image_collections WHERE library_id = ?`

package/corpus/templates/assets/AGENTS.md

@@ -21,7 +21,9 @@ Detailed library, generation, image, embed, and engine rules live in
   ad hoc provider calls when the app has an action/engine abstraction.
 - Preserve provenance and metadata for generated or imported assets.
 - Use `view-screen` when the active library, selected asset, picker, generation,
-  or embed target is unclear. The picker is also available from the left nav.
+  or embed target is unclear. The human Library surface is `/library` for
+  cross-kit browsing and `/library/:libraryId` for a single brand kit; embedded
+  picker hosts still use `/library` with their iframe/auth bridge params.
 - The Create tab (`/`) is the full-page Assets chat surface. Use the shared
   `assets` chat thread storage there, keep past chats in the left sidebar, and
   use the right agent sidebar only on non-Create routes with view-transition
@@ -33,8 +35,21 @@ Detailed library, generation, image, embed, and engine rules live in
 ## Application State
 
 - `navigation` exposes library, asset, generation, picker, embed, and selection
-  context. Picker state includes media type, selected library, query, prompt, and
-  aspect ratio when available.
+  context. Human Library state uses
+  `{ view: "library", selection: "all" | libraryId, tab, scope, folderId, search }`.
+  Embedded picker state keeps `{ view: "picker", mediaType, libraryId, query,
+prompt, aspectRatio }`.
+- Composer `@` mentions are the source of generation inputs. Map
+  `brand-kit` references to `libraryId`, `preset` references to `presetId`, and
+  `media-type` references to choosing image (`generate-image` /
+  `generate-image-batch`) or video (`generate-video`) generation. The current
+  library view auto-tags its brand kit as a visible removable chip when the
+  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.
+- `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.
 - `navigate` moves the UI to picker, library, generation, asset, and settings
   surfaces.
 

package/corpus/templates/assets/actions/_image-model-default.ts

@@ -0,0 +1,24 @@
+import { readAppState } from "@agent-native/core/application-state";
+
+import { IMAGE_MODELS, type ImageModel } from "../shared/api.js";
+
+export const IMAGE_MODEL_STATE_KEY = "imageGenerationModel";
+
+function imageModelValue(value: unknown): ImageModel | undefined {
+  return typeof value === "string" &&
+    (IMAGE_MODELS as readonly string[]).includes(value)
+    ? (value as ImageModel)
+    : undefined;
+}
+
+function recordValue(value: unknown): Record<string, unknown> {
+  return value && typeof value === "object" && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : {};
+}
+
+export async function readImageModelDefault(): Promise<ImageModel | undefined> {
+  const raw = await readAppState(IMAGE_MODEL_STATE_KEY).catch(() => null);
+  const state = recordValue(raw);
+  return imageModelValue(state.model) ?? imageModelValue(raw);
+}

package/corpus/templates/assets/actions/dismiss-variant-slots.ts

@@ -1,38 +1,36 @@
 import { defineAction } from "@agent-native/core";
-import {
-  deleteAppState,
-  readAppState,
-  writeAppState,
-} from "@agent-native/core/application-state";
+import type { ActionRunContext } from "@agent-native/core/action";
 import { assertAccess } from "@agent-native/core/sharing";
 import { eq } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
-import type { AssetVariantState } from "../shared/api.js";
+import {
+  deleteVariantState,
+  readVariantState,
+  writeVariantState,
+} from "./variant-slots.js";
 
 export default defineAction({
   description:
-    "Clear one or more live candidate slots from application_state.asset-variants. Use slotId for a single slot, scope='failed' to drop every failed slot, or scope='all' to clear the panel. Any underlying asset rows for cleared slots are deleted (requires editor access on the library).",
+    "Clear one or more live candidate slots from application_state.asset-variants. Uses the current chat thread when available. Use slotId for a single slot, scope='failed' to drop every failed slot, or scope='all' to clear the panel. Any underlying asset rows for cleared slots are deleted (requires editor access on the library).",
   schema: z
     .object({
       slotId: z.string().optional(),
       scope: z.enum(["failed", "all"]).optional(),
+      threadId: z.string().nullable().optional(),
     })
     .refine((v) => Boolean(v.slotId) !== Boolean(v.scope), {
       message: "Provide exactly one of `slotId` or `scope`.",
     }),
-  run: async ({ slotId, scope }) => {
-    const raw = (await readAppState("asset-variants")) as unknown | null;
-    const legacyRaw =
-      raw ??
-      ((await readAppState("image-variants").catch(() => null)) as
-        | unknown
-        | null);
-    const state = (legacyRaw ?? null) as AssetVariantState | null;
+  run: async ({ slotId, scope, threadId }, context?: ActionRunContext) => {
+    const effectiveThreadId = threadId ?? context?.threadId ?? null;
+    const state = await readVariantState(effectiveThreadId);
     if (!state || !Array.isArray(state.slots) || state.slots.length === 0) {
       return { dismissed: 0, assetsDeleted: 0, cleared: true };
     }
+    const stateThreadId =
+      effectiveThreadId ?? state.variantScopeId ?? state.threadId ?? null;
 
     await assertAccess("asset-library", state.libraryId, "editor");
 
@@ -64,8 +62,7 @@ export default defineAction({
     const remaining = state.slots.filter((s) => !removed.has(s.slotId));
 
     if (remaining.length === 0) {
-      await deleteAppState("asset-variants");
-      await deleteAppState("image-variants").catch(() => {});
+      await deleteVariantState(stateThreadId);
       return {
         dismissed: toRemove.length,
         assetsDeleted,
@@ -75,11 +72,7 @@ export default defineAction({
 
     state.slots = remaining;
     state.updatedAt = new Date().toISOString();
-    await writeAppState(
-      "asset-variants",
-      state as unknown as Record<string, unknown>,
-    );
-    await deleteAppState("image-variants").catch(() => {});
+    await writeVariantState(state, stateThreadId);
     return {
       dismissed: toRemove.length,
       assetsDeleted,

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

@@ -1,4 +1,5 @@
 import { defineAction, embedApp } from "@agent-native/core";
+import type { ActionRunContext } from "@agent-native/core/action";
 import { z } from "zod";
 
 import {
@@ -116,16 +117,19 @@ const action = defineAction({
       view: "picker",
     };
   },
-  run: async (args) => {
+  run: async (args, context?: ActionRunContext) => {
     if (args.mediaType === "video") {
-      const picker = (await openAssetPicker.run({
-        mediaType: "video",
-        prompt: args.prompt,
-        libraryId: args.libraryId,
-        libraryHint: args.libraryHint,
-        count: args.count,
-        callerAppId: args.callerAppId,
-      })) as Record<string, unknown>;
+      const picker = (await openAssetPicker.run(
+        {
+          mediaType: "video",
+          prompt: args.prompt,
+          libraryId: args.libraryId,
+          libraryHint: args.libraryHint,
+          count: args.count,
+          callerAppId: args.callerAppId,
+        },
+        context,
+      )) as Record<string, unknown>;
       return {
         ...picker,
         generated: false,
@@ -134,20 +138,23 @@ const action = defineAction({
       };
     }
 
-    const picker = (await openAssetPicker.run({
-      mediaType: "image",
-      prompt: args.prompt,
-      libraryId: args.libraryId,
-      libraryHint: args.libraryHint,
-      aspectRatio: args.aspectRatio,
-      presetId: args.presetId,
-      count: args.count,
-      autoGenerate: true,
-      tier: args.tier,
-      styleStrength: args.styleStrength,
-      includeLogo: args.includeLogo,
-      callerAppId: args.callerAppId,
-    })) as Record<string, unknown>;
+    const picker = (await openAssetPicker.run(
+      {
+        mediaType: "image",
+        prompt: args.prompt,
+        libraryId: args.libraryId,
+        libraryHint: args.libraryHint,
+        aspectRatio: args.aspectRatio,
+        presetId: args.presetId,
+        count: args.count,
+        autoGenerate: true,
+        tier: args.tier,
+        styleStrength: args.styleStrength,
+        includeLogo: args.includeLogo,
+        callerAppId: args.callerAppId,
+      },
+      context,
+    )) as Record<string, unknown>;
     return {
       ...picker,
       generated: false,

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

@@ -1,4 +1,5 @@
 import { defineAction } from "@agent-native/core";
+import type { ActionRunContext } from "@agent-native/core/action";
 import { assertAccess } from "@agent-native/core/sharing";
 import { eq } from "drizzle-orm";
 import { nanoid } from "nanoid";
@@ -17,13 +18,20 @@ import {
   STYLE_STRENGTHS,
 } from "../shared/api.js";
 import { requireGenerationSessionInLibrary } from "./_helpers.js";
+import { readImageModelDefault } from "./_image-model-default.js";
 import generateImage from "./generate-image.js";
+import { upsertVariantSlot } from "./variant-slots.js";
 
 export default defineAction({
   description:
-    "Generate several brand-consistent images in parallel from one library. This is synchronous for images: one call waits for every slot and returns final image artifacts. Use this for slide decks, landing pages, and multi-slot design work. Do not call get-generation-run or refresh-generation-run after a normal image batch result.",
+    "Generate several brand-consistent images in parallel from one brand kit/library. Use @brand-kit mentions as libraryId and @preset mentions as presetId when present. This is synchronous for images: one call waits for every slot and returns final image artifacts. Use this for slide decks, landing pages, and multi-slot design work. Do not call get-generation-run or refresh-generation-run after a normal image batch result.",
   schema: z.object({
-    libraryId: z.string(),
+    libraryId: z
+      .string()
+      .optional()
+      .describe(
+        "Brand kit/library ID. Pass the refId from a brand-kit @mention, or choose a kit from view-screen/list-libraries.",
+      ),
     collectionId: z.string().optional(),
     presetId: z.string().optional(),
     sessionId: z.string().optional(),
@@ -45,6 +53,12 @@ export default defineAction({
       )
       .min(1)
       .max(12),
+    variantScopeId: z
+      .string()
+      .optional()
+      .describe(
+        "Internal UI state scope for live candidate slots. Usually omitted; embedded picker UIs pass a browser-tab scope.",
+      ),
     model: z.enum(IMAGE_MODELS).optional(),
     tier: z.enum(IMAGE_QUALITY_TIERS).optional(),
     intent: z.enum(GENERATION_INTENTS).default("generate"),
@@ -60,41 +74,74 @@ export default defineAction({
       ),
   }),
   parallelSafe: true,
-  run: async ({ slots, ...base }) => {
+  run: async ({ slots, ...inputBase }, context?: ActionRunContext) => {
+    const imageModelDefault = await readImageModelDefault();
+    const libraryId = inputBase.libraryId;
+    if (!libraryId) {
+      throw new Error(
+        "No brand kit selected. Tag a brand kit with @ or pass libraryId.",
+      );
+    }
+    const base = {
+      ...inputBase,
+      libraryId,
+      model: inputBase.model ?? imageModelDefault,
+    };
     await assertAccess("asset-library", base.libraryId, "editor");
     if (base.sessionId) {
       await requireGenerationSessionInLibrary(base.sessionId, base.libraryId);
     }
-    const limit = pLimit(4);
     const variantBatchId = nanoid();
+    await Promise.all(
+      slots.map((slot, index) =>
+        upsertVariantSlot({
+          runId: `pending-${variantBatchId}-${index + 1}`,
+          batchId: variantBatchId,
+          libraryId: base.libraryId,
+          collectionId: base.collectionId ?? null,
+          presetId: base.presetId ?? null,
+          sessionId: base.sessionId ?? null,
+          threadId: context?.threadId ?? null,
+          variantScopeId: base.variantScopeId ?? null,
+          prompt: slot.prompt,
+          slotId: slot.slotId,
+          status: "pending",
+        }),
+      ),
+    );
+    const limit = pLimit(4);
     const results = await Promise.allSettled(
       slots.map((slot) =>
         limit(() =>
-          generateImage.run({
-            libraryId: base.libraryId,
-            collectionId: base.collectionId,
-            presetId: base.presetId,
-            sessionId: base.sessionId,
-            prompt: slot.prompt,
-            aspectRatio: slot.aspectRatio,
-            imageSize: slot.imageSize,
-            model: base.model,
-            tier: base.tier,
-            intent: slot.intent ?? base.intent,
-            styleStrength: slot.styleStrength ?? base.styleStrength,
-            categories: slot.categories,
-            referenceAssetIds: slot.referenceAssetIds,
-            includeLogo: base.includeLogo,
-            groundingMode: base.groundingMode,
-            slotId: slot.slotId,
-            variantBatchId,
-            dismissible: slot.dismissible,
-            sourceAssetId: slot.sourceAssetId,
-            subjectAssetId: slot.subjectAssetId,
-            source: base.source,
-            callerAppId: base.callerAppId,
-            activateSessionAsset: false,
-          }),
+          generateImage.run(
+            {
+              libraryId: base.libraryId,
+              collectionId: base.collectionId,
+              presetId: base.presetId,
+              sessionId: base.sessionId,
+              prompt: slot.prompt,
+              aspectRatio: slot.aspectRatio,
+              imageSize: slot.imageSize,
+              model: base.model,
+              tier: base.tier,
+              intent: slot.intent ?? base.intent,
+              styleStrength: slot.styleStrength ?? base.styleStrength,
+              categories: slot.categories,
+              referenceAssetIds: slot.referenceAssetIds,
+              includeLogo: base.includeLogo,
+              groundingMode: base.groundingMode,
+              slotId: slot.slotId,
+              variantBatchId,
+              variantScopeId: base.variantScopeId,
+              dismissible: slot.dismissible,
+              sourceAssetId: slot.sourceAssetId,
+              subjectAssetId: slot.subjectAssetId,
+              source: base.source,
+              callerAppId: base.callerAppId,
+              activateSessionAsset: false,
+            },
+            context,
+          ),
         ),
       ),
     );

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

@@ -1,6 +1,6 @@
 import { defineAction } from "@agent-native/core";
+import type { ActionRunContext } from "@agent-native/core/action";
 import {
-  readAppState,
   writeAppState,
   deleteAppState,
 } from "@agent-native/core/application-state";
@@ -43,6 +43,7 @@ import {
   requireGenerationSessionInLibrary,
   serializeAsset,
 } from "./_helpers.js";
+import { readImageModelDefault } from "./_image-model-default.js";
 import { upsertVariantSlot, wasVariantSlotDismissed } from "./variant-slots.js";
 
 function resolveModelForTier(
@@ -57,33 +58,16 @@ function resolveModelForTier(
     : "gemini-3.1-flash-image";
 }
 
-/**
- * The user's default image model, chosen from the composer's model picker and
- * persisted in per-user application state. Used as a fallback when no explicit
- * model, tier, or preset model is supplied. Returns undefined when unset or
- * invalid so the hardcoded default still applies.
- */
-async function readUserDefaultImageModel(): Promise<ImageModel | undefined> {
-  try {
-    const stored = await readAppState("imageGenerationModel");
-    const model = stored?.model;
-    if (
-      typeof model === "string" &&
-      (IMAGE_MODELS as readonly string[]).includes(model)
-    ) {
-      return model as ImageModel;
-    }
-  } catch {
-    // No request context or read failure — fall back to defaults below.
-  }
-  return undefined;
-}
-
 export default defineAction({
   description:
-    "Generate one brand-consistent image from a library. This is synchronous for images and returns the final asset with preview/download/embed URLs. Use generate-image-batch for multiple independent slots; do not poll image runs after this action returns.",
+    "Generate one brand-consistent image from a brand kit/library. This is synchronous for images and returns the final asset with preview/download/embed URLs. Use @brand-kit mentions as libraryId and @preset mentions as presetId when present. Use generate-image-batch for multiple independent slots; do not poll image runs after this action returns.",
   schema: z.object({
-    libraryId: z.string(),
+    libraryId: z
+      .string()
+      .optional()
+      .describe(
+        "Brand kit/library ID. Pass the refId from a brand-kit @mention, or choose a kit from view-screen/list-libraries.",
+      ),
     collectionId: z.string().optional(),
     presetId: z.string().optional(),
     sessionId: z.string().optional(),
@@ -104,6 +88,12 @@ export default defineAction({
     includeLogo: z.coerce.boolean().default(false),
     slotId: z.string().optional(),
     variantBatchId: z.string().optional(),
+    variantScopeId: z
+      .string()
+      .optional()
+      .describe(
+        "Internal UI state scope for live candidate slots. Usually omitted; embedded picker UIs pass a browser-tab scope.",
+      ),
     dismissible: z.coerce
       .boolean()
       .default(true)
@@ -135,7 +125,18 @@ export default defineAction({
       ),
   }),
   parallelSafe: true,
-  run: async (args) => {
+  run: async (input, context?: ActionRunContext) => {
+    const imageModelDefault = await readImageModelDefault();
+    const libraryId = input.libraryId;
+    if (!libraryId) {
+      throw new Error(
+        "No brand kit selected. Tag a brand kit with @ or pass libraryId.",
+      );
+    }
+    const args = {
+      ...input,
+      libraryId,
+    };
     await assertAccess("asset-library", args.libraryId, "editor");
     const db = getDb();
     const [library] = await db
@@ -248,9 +249,9 @@ export default defineAction({
       preset?.category ??
       collection?.category) as ImageCategory | undefined;
     const resolvedModel = (args.model ??
+      imageModelDefault ??
       resolveModelForTier(resolvedTier, category) ??
       preset?.model ??
-      (await readUserDefaultImageModel()) ??
       "gemini-3.1-flash-image") as (typeof IMAGE_MODELS)[number];
     const resolvedCategories =
       args.categories ??
@@ -303,6 +304,8 @@ export default defineAction({
     });
     const runId = nanoid();
     const now = nowIso();
+    const slotId = args.slotId ?? runId;
+    const variantScopeId = args.variantScopeId ?? context?.threadId ?? null;
     // Capture identity at insert time so the org-admin audit log can filter
     // by owner / org without re-resolving who triggered the run later.
     const ownerEmail = getRequestUserEmail() ?? null;
@@ -342,11 +345,12 @@ export default defineAction({
       sessionId: session?.id ?? null,
       customInstructions: library.customInstructions ?? "",
     };
-    const slotId = args.slotId ?? runId;
     const dismissibleSlot = args.dismissible !== false && Boolean(slotId);
     const baseMetadata = {
       slotId,
       variantBatchId: args.variantBatchId ?? null,
+      threadId: context?.threadId ?? null,
+      variantScopeId,
       dismissible: dismissibleSlot,
       sourceAssetId: args.sourceAssetId,
       subjectAssetId: args.subjectAssetId,
@@ -389,6 +393,8 @@ export default defineAction({
       collectionId: resolvedCollectionId ?? null,
       presetId: preset?.id ?? null,
       sessionId: session?.id ?? null,
+      threadId: context?.threadId ?? null,
+      variantScopeId,
       prompt: args.prompt,
       slotId,
       status: "pending",
@@ -430,7 +436,10 @@ export default defineAction({
       }
       if (
         dismissibleSlot &&
-        (await wasVariantSlotDismissed(args.libraryId, slotId))
+        (await wasVariantSlotDismissed(args.libraryId, slotId, {
+          threadId: context?.threadId ?? null,
+          variantScopeId,
+        }))
       ) {
         await db
           .update(schema.assetGenerationRuns)
@@ -539,6 +548,8 @@ export default defineAction({
         collectionId: resolvedCollectionId ?? null,
         presetId: preset?.id ?? null,
         sessionId: session?.id ?? null,
+        threadId: context?.threadId ?? null,
+        variantScopeId,
         prompt: args.prompt,
         slotId,
         status: "ready",
@@ -570,7 +581,10 @@ export default defineAction({
         .where(eq(schema.assetGenerationRuns.id, runId));
       if (
         dismissibleSlot &&
-        (await wasVariantSlotDismissed(args.libraryId, slotId))
+        (await wasVariantSlotDismissed(args.libraryId, slotId, {
+          threadId: context?.threadId ?? null,
+          variantScopeId,
+        }))
       ) {
         throw err;
       }
@@ -581,6 +595,8 @@ export default defineAction({
         collectionId: resolvedCollectionId ?? null,
         presetId: preset?.id ?? null,
         sessionId: session?.id ?? null,
+        threadId: context?.threadId ?? null,
+        variantScopeId,
         prompt: args.prompt,
         slotId,
         status: "failed",