@agent-native/core 0.80.9 → 0.80.11

package/corpus/templates/assets/actions/_tool-activity.ts

@@ -0,0 +1,46 @@
+import type { ActionRunContext } from "@agent-native/core/action";
+
+const DEFAULT_TOOL_ACTIVITY_INTERVAL_MS = 8_000;
+
+type ToolActivityOptions = {
+  label: string;
+  ongoingLabel?: string;
+  intervalMs?: number;
+  tool?: string;
+};
+
+function canEmitToolActivity(
+  context: ActionRunContext | undefined,
+): context is ActionRunContext & Required<Pick<ActionRunContext, "send">> {
+  return context?.caller === "tool" && typeof context.send === "function";
+}
+
+export async function withToolActivity<T>(
+  context: ActionRunContext | undefined,
+  options: ToolActivityOptions,
+  work: () => Promise<T>,
+): Promise<T> {
+  if (!canEmitToolActivity(context)) return work();
+
+  const tool = options.tool ?? context.actionName;
+  const sendActivity = (label: string) => {
+    context.send({
+      type: "activity",
+      label,
+      ...(tool ? { tool } : {}),
+    });
+  };
+
+  sendActivity(options.label);
+  const interval = setInterval(
+    () => sendActivity(options.ongoingLabel ?? options.label),
+    options.intervalMs ?? DEFAULT_TOOL_ACTIVITY_INTERVAL_MS,
+  );
+  interval.unref?.();
+
+  try {
+    return await work();
+  } finally {
+    clearInterval(interval);
+  }
+}

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

@@ -18,7 +18,6 @@ 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";
 
@@ -35,14 +34,36 @@ export default defineAction({
         "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(),
+    presetId: z
+      .string()
+      .optional()
+      .describe(
+        "Generation preset ID (from a @preset mention or list-generation-presets). The preset already defines aspectRatio, imageSize, model, tier, and category. When you set presetId, OMIT each slot's aspectRatio/imageSize and the top-level model/tier so the preset's values are used; only pass one when the user explicitly asks for a value that differs from the preset.",
+      ),
     sessionId: z.string().optional(),
     slots: z
       .array(
         z.object({
           slotId: z.string(),
           prompt: z.string().min(1),
-          aspectRatio: z.enum(ASPECT_RATIOS).optional(),
+          embeddedText: z
+            .string()
+            .optional()
+            .describe(
+              "Exact words to render inside the image, spelled exactly. When set, the image is allowed to contain this text; when omitted, the image avoids embedded text.",
+            ),
+          textPlacement: z
+            .string()
+            .optional()
+            .describe(
+              "Where/how the embedded text should appear, e.g. 'centered headline', 'lower-left label'.",
+            ),
+          aspectRatio: z
+            .enum(ASPECT_RATIOS)
+            .optional()
+            .describe(
+              "Slot aspect ratio. When a presetId is set, omit this — the preset's aspect ratio is used unless the user explicitly asks for a different ratio for this slot.",
+            ),
           imageSize: z.enum(IMAGE_SIZES).optional(),
           categories: z.array(z.enum(IMAGE_CATEGORIES)).optional(),
           referenceAssetIds: z.array(z.string()).optional(),
@@ -78,7 +99,6 @@ export default defineAction({
   parallelSafe: true,
   timeoutMs: IMAGE_GENERATION_TOOL_TIMEOUT_MS,
   run: async ({ slots, ...inputBase }, context?: ActionRunContext) => {
-    const imageModelDefault = await readImageModelDefault();
     const libraryId = inputBase.libraryId;
     if (!libraryId) {
       throw new Error(
@@ -88,7 +108,6 @@ export default defineAction({
     const base = {
       ...inputBase,
       libraryId,
-      model: inputBase.model ?? imageModelDefault,
     };
     await assertAccess("asset-library", base.libraryId, "editor");
     if (base.sessionId) {
@@ -123,6 +142,8 @@ export default defineAction({
               presetId: base.presetId,
               sessionId: base.sessionId,
               prompt: slot.prompt,
+              embeddedText: slot.embeddedText,
+              textPlacement: slot.textPlacement,
               aspectRatio: slot.aspectRatio,
               imageSize: slot.imageSize,
               model: base.model,

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

@@ -21,6 +21,7 @@ import {
   DEFAULT_GENERATION_REFERENCE_LIMIT,
   generateWithManagedImageProvider,
   isImageGenerationSetupError,
+  resolveImageModelForRequest,
   selectReferences,
 } from "../server/lib/generation.js";
 import { compositeLogo } from "../server/lib/image-processing.js";
@@ -35,7 +36,6 @@ import {
   IMAGE_SIZES,
   STYLE_STRENGTHS,
   type ImageCategory,
-  type ImageModel,
   type ImageQualityTier,
   type StyleBrief,
 } from "../shared/api.js";
@@ -44,22 +44,11 @@ import {
   serializeAsset,
 } from "./_helpers.js";
 import { readImageModelDefault } from "./_image-model-default.js";
+import { withToolActivity } from "./_tool-activity.js";
 import { upsertVariantSlot, wasVariantSlotDismissed } from "./variant-slots.js";
 
 const IMAGE_GENERATION_TOOL_TIMEOUT_MS = 12 * 60_000;
 
-function resolveModelForTier(
-  tier: ImageQualityTier | undefined,
-  category: ImageCategory | undefined,
-): ImageModel | undefined {
-  if (!tier) return undefined;
-  if (tier === "fast") return "gemini-3.1-flash-image";
-  if (tier === "best") return "gemini-3-pro-image";
-  return ["hero", "landing", "logo", "campaign"].includes(category ?? "")
-    ? "gemini-3-pro-image"
-    : "gemini-3.1-flash-image";
-}
-
 export default defineAction({
   description:
     "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.",
@@ -71,11 +60,38 @@ export default defineAction({
         "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(),
+    presetId: z
+      .string()
+      .optional()
+      .describe(
+        "Generation preset ID (from a @preset mention or list-generation-presets). A preset already defines aspectRatio, imageSize, model, tier, and category. When you set presetId, OMIT those args so the preset's values are used; only pass one of them when the user explicitly asks for a value that differs from the preset.",
+      ),
     sessionId: z.string().optional(),
     prompt: z.string().min(1),
-    aspectRatio: z.enum(ASPECT_RATIOS).optional(),
-    imageSize: z.enum(IMAGE_SIZES).optional(),
+    embeddedText: z
+      .string()
+      .optional()
+      .describe(
+        "Exact words to render inside the image, spelled exactly. When set, the image is allowed to contain this text; when omitted, the image avoids embedded text.",
+      ),
+    textPlacement: z
+      .string()
+      .optional()
+      .describe(
+        "Where/how the embedded text should appear, e.g. 'centered headline', 'lower-left label'.",
+      ),
+    aspectRatio: z
+      .enum(ASPECT_RATIOS)
+      .optional()
+      .describe(
+        "Image aspect ratio. When a presetId is set, omit this — the preset's aspect ratio is used. Pass a value only when there is no preset, or when the user explicitly asks for a ratio different from the preset's.",
+      ),
+    imageSize: z
+      .enum(IMAGE_SIZES)
+      .optional()
+      .describe(
+        "Output resolution tier. When a presetId is set, omit this — the preset's size is used unless the user explicitly requests a different one.",
+      ),
     model: z.enum(IMAGE_MODELS).optional(),
     tier: z.enum(IMAGE_QUALITY_TIERS).optional(),
     intent: z.enum(GENERATION_INTENTS).default("generate"),
@@ -251,11 +267,15 @@ export default defineAction({
     const category = (args.categories?.[0] ??
       preset?.category ??
       collection?.category) as ImageCategory | undefined;
-    const resolvedModel = (args.model ??
-      imageModelDefault ??
-      resolveModelForTier(resolvedTier, category) ??
-      preset?.model ??
-      "gemini-3.1-flash-image") as (typeof IMAGE_MODELS)[number];
+    const resolvedModel = resolveImageModelForRequest({
+      explicitModel: args.model,
+      imageModelDefault,
+      explicitTier: args.tier,
+      resolvedTier,
+      category,
+      presetModel: preset?.model as (typeof IMAGE_MODELS)[number] | undefined,
+      embeddedText: args.embeddedText,
+    }) as (typeof IMAGE_MODELS)[number];
     const resolvedCategories =
       args.categories ??
       (preset?.category ? ([preset.category] as any) : undefined);
@@ -297,6 +317,8 @@ export default defineAction({
         .filter((item) => item?.trim())
         .join("\n\n"),
       prompt: promptForRun,
+      embeddedText: args.embeddedText,
+      textPlacement: args.textPlacement,
       referenceCount: references.length,
       includeLogo: args.includeLogo,
       aspectRatio: resolvedAspectRatio,
@@ -346,6 +368,8 @@ export default defineAction({
       collectionId: resolvedCollectionId ?? null,
       presetId: preset?.id ?? null,
       sessionId: session?.id ?? null,
+      embeddedText: args.embeddedText ?? null,
+      textPlacement: args.textPlacement ?? null,
       customInstructions: library.customInstructions ?? "",
     };
     const dismissibleSlot = args.dismissible !== false && Boolean(slotId);
@@ -357,6 +381,8 @@ export default defineAction({
       dismissible: dismissibleSlot,
       sourceAssetId: args.sourceAssetId,
       subjectAssetId: args.subjectAssetId,
+      embeddedText: args.embeddedText,
+      textPlacement: args.textPlacement,
       intent: args.intent,
       styleStrength: args.styleStrength,
       tier: resolvedTier,
@@ -404,22 +430,36 @@ export default defineAction({
     });
 
     try {
-      const generated = await generateWithManagedImageProvider({
-        prompt: promptForRun,
-        compiledPrompt,
-        references,
-        model: resolvedModel,
-        aspectRatio: resolvedAspectRatio,
-        imageSize: resolvedImageSize,
-        groundingMode: args.groundingMode,
-        intent: args.intent,
-        styleStrength: args.styleStrength,
-        runId,
-        libraryId: args.libraryId,
-        collectionId: resolvedCollectionId ?? null,
-        source: args.source,
-        callerAppId: args.callerAppId,
-      });
+      const generated = await withToolActivity(
+        context,
+        {
+          label: "Generating image.",
+          ongoingLabel: "Still generating image.",
+          // Intentionally no explicit `tool`: withToolActivity falls back to
+          // context.actionName, which is the ACTUAL dispatched tool. When this
+          // action is invoked directly that is "generate-image"; when it runs as
+          // a sub-step of generate-image-batch / rerun-generation-run it is the
+          // parent tool, so the activity event matches the real tool_start card
+          // instead of spawning an orphan "generate-image" activity card.
+        },
+        () =>
+          generateWithManagedImageProvider({
+            prompt: promptForRun,
+            compiledPrompt,
+            references,
+            model: resolvedModel,
+            aspectRatio: resolvedAspectRatio,
+            imageSize: resolvedImageSize,
+            groundingMode: args.groundingMode,
+            intent: args.intent,
+            styleStrength: args.styleStrength,
+            runId,
+            libraryId: args.libraryId,
+            collectionId: resolvedCollectionId ?? null,
+            source: args.source,
+            callerAppId: args.callerAppId,
+          }),
+      );
       await deleteAppState("image-generation-setup").catch(() => {});
       let image = generated.image;
       let mimeType = generated.mimeType;
@@ -468,37 +508,48 @@ export default defineAction({
           Artifacts: [],
         };
       }
-      const asset = await createAssetFromBuffer({
-        libraryId: args.libraryId,
-        collectionId: resolvedCollectionId ?? null,
-        buffer: image,
-        mimeType,
-        role: "generated",
-        status: "candidate",
-        prompt: args.prompt,
-        model: generated.model,
-        aspectRatio: resolvedAspectRatio,
-        imageSize: resolvedImageSize,
-        generationRunId: runId,
-        metadata: {
-          provider: generated.provider,
-          compiledPrompt,
-          referenceAssetIds: references.map((ref) => ref.id),
-          sourceAssetId: args.sourceAssetId,
-          subjectAssetId: args.subjectAssetId,
-          intent: args.intent,
-          styleStrength: args.styleStrength,
-          tier: resolvedTier,
-          includeLogo: args.includeLogo,
-          presetId: preset?.id,
-          sessionId: session?.id,
-          generated: true,
-          sourceUrl: generated.sourceUrl,
-          providerGenerationId: generated.providerGenerationId,
-          creditsCharged: generated.creditsCharged,
+      const asset = await withToolActivity(
+        context,
+        {
+          label: "Saving generated image.",
+          ongoingLabel: "Still saving generated image.",
+          // See above: omit `tool` so the activity is tagged with the real
+          // dispatched tool (context.actionName) rather than a hardcoded
+          // "generate-image" that orphans under batch/rerun.
         },
-        category,
-      });
+        () =>
+          createAssetFromBuffer({
+            libraryId: args.libraryId,
+            collectionId: resolvedCollectionId ?? null,
+            buffer: image,
+            mimeType,
+            role: "generated",
+            status: "candidate",
+            prompt: args.prompt,
+            model: generated.model,
+            aspectRatio: resolvedAspectRatio,
+            imageSize: resolvedImageSize,
+            generationRunId: runId,
+            metadata: {
+              provider: generated.provider,
+              compiledPrompt,
+              referenceAssetIds: references.map((ref) => ref.id),
+              sourceAssetId: args.sourceAssetId,
+              subjectAssetId: args.subjectAssetId,
+              intent: args.intent,
+              styleStrength: args.styleStrength,
+              tier: resolvedTier,
+              includeLogo: args.includeLogo,
+              presetId: preset?.id,
+              sessionId: session?.id,
+              generated: true,
+              sourceUrl: generated.sourceUrl,
+              providerGenerationId: generated.providerGenerationId,
+              creditsCharged: generated.creditsCharged,
+            },
+            category,
+          }),
+      );
       if (session) {
         const itemCreatedAt = nowIso();
         await db.insert(schema.assetGenerationSessionItems).values({

package/corpus/templates/assets/actions/list-draft-assets.ts

@@ -0,0 +1,50 @@
+import { defineAction } from "@agent-native/core";
+import { accessFilter } from "@agent-native/core/sharing";
+import { and, desc, eq, inArray, isNull } from "drizzle-orm";
+import { z } from "zod";
+
+import { getDb, schema } from "../server/db/index.js";
+import { serializeAsset } from "./_helpers.js";
+
+export default defineAction({
+  description:
+    "List unsaved draft generations (generated candidate assets) across accessible libraries, newest first.",
+  schema: z.object({
+    libraryId: z.string().optional(),
+    limit: z.coerce.number().int().min(1).max(500).optional(),
+  }),
+  http: { method: "GET" },
+  readOnly: true,
+  run: async ({ libraryId, limit }) => {
+    const db = getDb();
+    const libraryFilters = [
+      accessFilter(schema.assetLibraries, schema.assetLibraryShares),
+      isNull(schema.assetLibraries.archivedAt),
+    ];
+    if (libraryId) libraryFilters.push(eq(schema.assetLibraries.id, libraryId));
+    const accessibleLibraries = await db
+      .select({ id: schema.assetLibraries.id })
+      .from(schema.assetLibraries)
+      .where(and(...libraryFilters));
+    const libraryIds = accessibleLibraries.map((row) => row.id);
+    if (!libraryIds.length) return { count: 0, assets: [] };
+
+    const rows = await db
+      .select()
+      .from(schema.assets)
+      .where(
+        and(
+          inArray(schema.assets.libraryId, libraryIds),
+          eq(schema.assets.role, "generated"),
+          eq(schema.assets.status, "candidate"),
+        ),
+      )
+      .orderBy(desc(schema.assets.createdAt))
+      .limit(limit ?? 50);
+
+    return {
+      count: rows.length,
+      assets: rows.map((row) => serializeAsset(row)),
+    };
+  },
+});

package/corpus/templates/assets/actions/rerun-generation-run.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 { z } from "zod";
@@ -30,7 +31,10 @@ export default defineAction({
       ),
   }),
   parallelSafe: true,
-  run: async ({ runId, slotId, sessionId, source, callerAppId }) => {
+  run: async (
+    { runId, slotId, sessionId, source, callerAppId },
+    context?: ActionRunContext,
+  ) => {
     const db = getDb();
     const [run] = await db
       .select()
@@ -52,6 +56,8 @@ export default defineAction({
         intent?: string;
         styleStrength?: string;
         subjectAssetId?: string;
+        embeddedText?: string | null;
+        textPlacement?: string | null;
       };
       includeLogo?: boolean;
       categories?: string[];
@@ -60,39 +66,54 @@ export default defineAction({
       intent?: string;
       styleStrength?: string;
       tier?: string | null;
+      embeddedText?: string | null;
+      textPlacement?: string | null;
     }>(run.metadata, {});
     const categories =
       metadata.settingsUsed?.categories ?? metadata.categories ?? undefined;
 
-    return generateImage.run({
-      libraryId: run.libraryId,
-      collectionId: run.collectionId ?? undefined,
-      presetId: run.presetId ?? undefined,
-      sessionId: resolvedSessionId,
-      prompt: run.prompt,
-      aspectRatio: run.aspectRatio as any,
-      imageSize: run.imageSize as any,
-      model: run.model as any,
-      tier: (metadata.settingsUsed?.tier ?? metadata.tier ?? undefined) as any,
-      intent: (metadata.settingsUsed?.intent ??
-        metadata.intent ??
-        "generate") as any,
-      styleStrength: (metadata.settingsUsed?.styleStrength ??
-        metadata.styleStrength ??
-        "balanced") as any,
-      categories: categories as any,
-      includeLogo: Boolean(
-        metadata.settingsUsed?.includeLogo ?? metadata.includeLogo,
-      ),
-      groundingMode: run.groundingMode as any,
-      sourceAssetId: metadata.sourceAssetId,
-      subjectAssetId:
-        metadata.settingsUsed?.subjectAssetId ??
-        metadata.subjectAssetId ??
-        undefined,
-      slotId,
-      source,
-      callerAppId,
-    });
+    return generateImage.run(
+      {
+        libraryId: run.libraryId,
+        collectionId: run.collectionId ?? undefined,
+        presetId: run.presetId ?? undefined,
+        sessionId: resolvedSessionId,
+        prompt: run.prompt,
+        embeddedText:
+          metadata.settingsUsed?.embeddedText ??
+          metadata.embeddedText ??
+          undefined,
+        textPlacement:
+          metadata.settingsUsed?.textPlacement ??
+          metadata.textPlacement ??
+          undefined,
+        aspectRatio: run.aspectRatio as any,
+        imageSize: run.imageSize as any,
+        model: run.model as any,
+        tier: (metadata.settingsUsed?.tier ??
+          metadata.tier ??
+          undefined) as any,
+        intent: (metadata.settingsUsed?.intent ??
+          metadata.intent ??
+          "generate") as any,
+        styleStrength: (metadata.settingsUsed?.styleStrength ??
+          metadata.styleStrength ??
+          "balanced") as any,
+        categories: categories as any,
+        includeLogo: Boolean(
+          metadata.settingsUsed?.includeLogo ?? metadata.includeLogo,
+        ),
+        groundingMode: run.groundingMode as any,
+        sourceAssetId: metadata.sourceAssetId,
+        subjectAssetId:
+          metadata.settingsUsed?.subjectAssetId ??
+          metadata.subjectAssetId ??
+          undefined,
+        slotId,
+        source,
+        callerAppId,
+      },
+      context,
+    );
   },
 });

package/corpus/templates/assets/app/components/create/RecentDraftsSection.tsx

@@ -0,0 +1,100 @@
+import { useActionQuery, useT } from "@agent-native/core/client";
+import { IconArrowUpRight, IconPhoto } from "@tabler/icons-react";
+import { Link } from "react-router";
+
+import { Button } from "@/components/ui/button";
+import { Skeleton } from "@/components/ui/skeleton";
+
+type DraftAsset = {
+  id: string;
+  title?: string | null;
+  prompt?: string | null;
+  mediaType?: string | null;
+  mimeType?: string | null;
+  thumbnailUrl?: string | null;
+  previewUrl?: string | null;
+  url?: string | null;
+};
+
+const RECENT_DRAFTS_LIMIT = 5;
+
+export function RecentDraftsSection() {
+  const t = useT();
+  const { data, isLoading } = useActionQuery("list-draft-assets", {
+    limit: RECENT_DRAFTS_LIMIT,
+  });
+  const drafts = ((data as any)?.assets ?? []) as DraftAsset[];
+
+  if (!isLoading && drafts.length === 0) return null;
+
+  return (
+    <section className="space-y-3">
+      <div className="flex flex-wrap items-center justify-between gap-3">
+        <h2 className="text-sm font-semibold text-foreground">
+          {t("library.recentDrafts")}
+        </h2>
+        <Button asChild variant="outline" size="sm">
+          <Link to="/library?tab=drafts">
+            {t("library.viewAllDrafts")}
+            <IconArrowUpRight size={15} className="ml-1.5" />
+          </Link>
+        </Button>
+      </div>
+
+      <div className="grid grid-cols-3 gap-3 sm:grid-cols-5">
+        {isLoading
+          ? Array.from({ length: RECENT_DRAFTS_LIMIT }).map((_, index) => (
+              <Skeleton key={index} className="aspect-square rounded-lg" />
+            ))
+          : drafts.map((draft) => (
+              <Link
+                key={draft.id}
+                to={`/asset/${encodeURIComponent(draft.id)}`}
+                title={draft.title || draft.prompt || t("library.draftAsset")}
+                className="group block overflow-hidden rounded-lg border border-border bg-card shadow-sm transition hover:border-primary/60 hover:shadow-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+              >
+                <div className="aspect-square bg-muted">
+                  <DraftThumbnail draft={draft} />
+                </div>
+              </Link>
+            ))}
+      </div>
+    </section>
+  );
+}
+
+function DraftThumbnail({ draft }: { draft: DraftAsset }) {
+  const t = useT();
+  const isVideo =
+    draft.mediaType === "video" || draft.mimeType?.startsWith("video/");
+  const source = draft.thumbnailUrl ?? draft.previewUrl ?? draft.url ?? "";
+
+  if (isVideo && !draft.thumbnailUrl) {
+    return (
+      <video
+        src={draft.previewUrl ?? draft.url ?? undefined}
+        muted
+        playsInline
+        preload="metadata"
+        className="h-full w-full object-cover transition group-hover:scale-[1.02]"
+      />
+    );
+  }
+
+  if (!source) {
+    return (
+      <div className="flex h-full w-full items-center justify-center text-muted-foreground">
+        <IconPhoto className="size-5" />
+      </div>
+    );
+  }
+
+  return (
+    <img
+      src={source}
+      alt={draft.title ?? draft.prompt ?? t("library.draftAsset")}
+      loading="lazy"
+      className="h-full w-full object-cover transition group-hover:scale-[1.02]"
+    />
+  );
+}

package/corpus/templates/assets/app/i18n/zh-TW.ts

@@ -628,6 +628,13 @@ const messages = {
     videosCount: "{{count}} 個影片",
   },
   library: {
+    drafts: "草稿",
+    allLibraries: "所有資料庫",
+    noDrafts: "尚無草稿。",
+    noMatchingDrafts: "沒有符合的草稿。",
+    recentDrafts: "最近草稿",
+    viewAllDrafts: "查看所有草稿",
+    draftAsset: "草稿資產",
     addedToReferences: "已新增到參考。",
     addedAssetsToReferences: "已將 {{count}} 個資產新增到參考。",
     add: "新增",