@agent-native/core 0.90.11 → 0.91.0

package/corpus/templates/content/app/components/editor/database/settings.tsx

@@ -1942,6 +1942,25 @@ function shouldPreselectDetailField(
   return DETAIL_FIELD_NAME_HINTS.some((hint) => key.includes(hint));
 }
 
+function sourceFieldIconType(
+  sourceFieldType: string,
+): DocumentPropertyType | "name" {
+  const normalized = sourceFieldType.trim().toLowerCase();
+  if (normalized === "number") return "number";
+  if (normalized === "datetime" || normalized === "date") return "date";
+  if (normalized === "url") return "url";
+  if (normalized === "boolean" || normalized === "checkbox") return "checkbox";
+  if (
+    normalized === "list" ||
+    normalized === "array" ||
+    normalized === "tags" ||
+    normalized === "multi_select"
+  ) {
+    return "multi_select";
+  }
+  return "text";
+}
+
 function SourceDetailsFieldPicker({
   documentId,
   source,
@@ -2039,31 +2058,37 @@ function SourceDetailsFieldPicker({
         </div>
       ) : (
         <div className="grid min-w-0 gap-1">
-          {fields.map((field) => (
-            <button
-              key={field.id}
-              type="button"
-              className="flex min-w-0 items-center gap-2 rounded-md px-2 py-1.5 text-left text-sm transition-colors hover:bg-muted focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
-              onClick={() => toggleField(field.id)}
-            >
-              <span
-                className={cn(
-                  "flex size-4 shrink-0 items-center justify-center rounded border",
-                  selected.has(field.id)
-                    ? "border-[#2383e2] bg-[#2383e2] text-white"
-                    : "border-muted-foreground/40 text-transparent",
-                )}
+          {fields.map((field) => {
+            const iconType = sourceFieldIconType(field.sourceFieldType);
+            const Icon =
+              iconType === "name" ? IconFileText : TYPE_ICONS[iconType];
+            return (
+              <button
+                key={field.id}
+                type="button"
+                className="flex min-w-0 items-center gap-2 rounded-md px-2 py-1.5 text-left text-sm transition-colors hover:bg-muted focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+                onClick={() => toggleField(field.id)}
               >
-                <IconCheck className="size-3" />
-              </span>
-              <span className="min-w-0 flex-1 truncate">
-                {field.sourceFieldLabel}
-              </span>
-              <span className="shrink-0 text-[11px] text-muted-foreground">
-                {field.sourceFieldType}
-              </span>
-            </button>
-          ))}
+                <span
+                  className={cn(
+                    "flex size-4 shrink-0 items-center justify-center rounded border",
+                    selected.has(field.id)
+                      ? "border-[#2383e2] bg-[#2383e2] text-white"
+                      : "border-muted-foreground/40 text-transparent",
+                  )}
+                >
+                  <IconCheck className="size-3" />
+                </span>
+                <Icon className="size-3.5 shrink-0 text-muted-foreground" />
+                <span className="min-w-0 flex-1 truncate">
+                  {field.sourceFieldLabel}
+                </span>
+                <span className="shrink-0 text-[11px] text-muted-foreground">
+                  {field.sourceFieldType}
+                </span>
+              </button>
+            );
+          })}
         </div>
       )}
       <div className="flex justify-end gap-2">

package/corpus/templates/content/app/routes/_app.settings.tsx

@@ -4,9 +4,11 @@ import {
   SettingsTabsPage,
   useAgentSettingsTabs,
   useT,
+  type SettingsSearchEntry,
 } from "@agent-native/core/client";
 import { TeamPage } from "@agent-native/core/client/org";
 import { useSetPageTitle } from "@agent-native/toolkit/app-shell";
+import { useMemo } from "react";
 
 import { Label } from "@/components/ui/label";
 import { messagesByLocale } from "@/i18n-data";
@@ -22,18 +24,34 @@ export default function SettingsRoute() {
   const agentSettingsTabs = useAgentSettingsTabs();
   useSetPageTitle(t("settings.title"));
 
+  const generalSearchEntries = useMemo<SettingsSearchEntry[]>(
+    () => [
+      {
+        id: "content-language",
+        label: t("settings.languageTitle"),
+        keywords: "language locale translation i18n",
+        hash: "language",
+      },
+    ],
+    [t],
+  );
+
   return (
     <div className="flex-1 overflow-auto">
       <SettingsTabsPage
         teamLabel={t("team.pageTitle")}
         extraTabs={agentSettingsTabs}
+        generalSearchEntries={generalSearchEntries}
         general={
           <main className="mx-auto w-full max-w-3xl space-y-6">
             <p className="text-sm leading-6 text-muted-foreground">
               {t("settings.description")}
             </p>
 
-            <section className="rounded-lg border border-border bg-card p-5">
+            <section
+              id="language"
+              className="scroll-mt-16 rounded-lg border border-border bg-card p-5"
+            >
               <div className="space-y-1">
                 <h2 className="text-base font-semibold">
                   {t("settings.languageTitle")}

package/corpus/templates/content/changelog/2026-07-07-builder-source-tag-fields-now-import-as-multi-select.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-07
+---
+
+Builder source tag fields now import as multi-select properties with their available choices.

package/corpus/templates/content/changelog/2026-07-08-settings-are-cleaner-and-searchable.md

@@ -0,0 +1,5 @@
+---
+type: improved
+---
+
+Settings are cleaner and searchable, with a consistent navigation that jumps straight to any setting.

package/corpus/templates/content/shared/api.ts

@@ -617,6 +617,9 @@ export interface BuilderCmsModelFieldSummary {
   name: string;
   label?: string;
   type: string;
+  inputType?: string;
+  enum?: string[];
+  options?: string[];
   required: boolean;
 }
 

package/corpus/templates/content/shared/properties.ts

@@ -551,6 +551,48 @@ export function normalizePropertyValue(
   }
 }
 
+function optionMatchKey(value: string) {
+  return value.trim().toLowerCase();
+}
+
+export function normalizePropertyValueWithOptions(
+  type: DocumentPropertyType,
+  value: unknown,
+  options?: DocumentPropertyOptions,
+): DocumentPropertyValue {
+  const normalized = normalizePropertyValue(type, value);
+  const optionList = options?.options ?? [];
+  if (
+    normalized === null ||
+    optionList.length === 0 ||
+    (type !== "select" && type !== "status" && type !== "multi_select")
+  ) {
+    return normalized;
+  }
+
+  const optionIdByName = new Map(
+    optionList.map((option) => [optionMatchKey(option.name), option.id]),
+  );
+  const optionIds = new Set(optionList.map((option) => option.id));
+  const resolveOptionId = (candidate: string) =>
+    optionIds.has(candidate)
+      ? candidate
+      : (optionIdByName.get(optionMatchKey(candidate)) ?? candidate);
+
+  if (type === "multi_select") {
+    const resolved = new Set<string>();
+    for (const item of Array.isArray(normalized) ? normalized : []) {
+      const optionId = resolveOptionId(item);
+      if (optionId.trim()) resolved.add(optionId);
+    }
+    return Array.from(resolved);
+  }
+
+  return typeof normalized === "string"
+    ? resolveOptionId(normalized)
+    : normalized;
+}
+
 export function formulaValueText(value: DocumentPropertyValue): string {
   if (value === null || value === undefined) return "";
   if (Array.isArray(value)) return value.join(", ");

package/corpus/templates/design/actions/generate-design.ts

@@ -125,6 +125,9 @@ const generateDesignAction = defineAction({
     "Do not use this action to replace a selected variant screen after a " +
     "variant pick; call `get-design-snapshot` for the selected `fileId` and " +
     "`edit-design` that same `fileId` instead. " +
+    "When `designSystemId` is provided, first use `get-design-system` and apply " +
+    "its `agentContext` tokens/docs before writing the file content; do not " +
+    "treat the id alone as enough design-system context. " +
     "Do not report a design as ready until this action succeeds. " +
     "When adding multiple screens or states, pass canvasFrames with filenames " +
     "and x/y/width/height so the new screens appear placed on the overview canvas.",

package/corpus/templates/design/actions/get-design-system.ts

@@ -8,9 +8,146 @@ import { z } from "zod";
 
 import "../server/db/index.js"; // ensure registerShareableResource runs
 
+const MAX_AGENT_CONTEXT_CHARS = 14_000;
+const MAX_JSON_CONTEXT_CHARS = 2_500;
+const MAX_BUILDER_DOCS = 8;
+const MAX_BUILDER_DOC_CHARS = 1_200;
+const MAX_TOKEN_VALUES = 48;
+
+interface BuilderGenerationContext {
+  builderDesignSystemId: string;
+  builderJobId: string;
+  builderProjectId?: string;
+  builderUrl?: string;
+  builderStatus?: string;
+  docs: Array<{
+    name?: string;
+    type?: string;
+    description?: string;
+    content?: string;
+    tokenValues?: Record<string, string>;
+  }>;
+  tokenValues: Record<string, string>;
+  docCount: number;
+  warning?: string;
+}
+
+function truncate(value: string, maxChars: number): string {
+  if (value.length <= maxChars) return value;
+  return `${value.slice(0, maxChars).trimEnd()}\n[truncated]`;
+}
+
+function parseJson(value: string | null | undefined): unknown {
+  if (!value) return null;
+  try {
+    return JSON.parse(value);
+  } catch {
+    return null;
+  }
+}
+
+function formatJson(value: unknown, maxChars = MAX_JSON_CONTEXT_CHARS): string {
+  return truncate(JSON.stringify(value, null, 2), maxChars);
+}
+
+function formatTokenValues(tokenValues: Record<string, string>): string[] {
+  const entries = Object.entries(tokenValues)
+    .filter(([, value]) => typeof value === "string" && value.trim())
+    .slice(0, MAX_TOKEN_VALUES);
+  if (entries.length === 0) return [];
+  return [
+    "Builder DSI token values to apply first:",
+    ...entries.map(([name, value]) => `- ${name}: ${value}`),
+  ];
+}
+
+function buildDesignSystemAgentContext({
+  id,
+  title,
+  description,
+  data,
+  assets,
+  customInstructions,
+  builder,
+}: {
+  id: string;
+  title: string;
+  description?: string | null;
+  data?: string | null;
+  assets?: string | null;
+  customInstructions?: string | null;
+  builder: BuilderGenerationContext | null;
+}): string {
+  const lines: string[] = [
+    "## Selected Design System Context",
+    `Use "${title}" (id: ${id}) as the visual source of truth for this generation.`,
+    "Apply these tokens, assets, and usage notes before choosing colors, type, spacing, radius, imagery, or component language.",
+  ];
+
+  if (description?.trim()) {
+    lines.push("", "Description:", description.trim());
+  }
+
+  if (customInstructions?.trim()) {
+    lines.push("", "Custom instructions:", customInstructions.trim());
+  }
+
+  const parsedAssets = parseJson(assets);
+  if (Array.isArray(parsedAssets) && parsedAssets.length > 0) {
+    lines.push("", "Design system assets:", formatJson(parsedAssets));
+  }
+
+  if (builder) {
+    lines.push(
+      "",
+      "Builder DSI:",
+      `- Design system id: ${builder.builderDesignSystemId}`,
+      `- Job id: ${builder.builderJobId}`,
+      builder.builderProjectId
+        ? `- Project id: ${builder.builderProjectId}`
+        : "",
+      builder.builderUrl ? `- URL: ${builder.builderUrl}` : "",
+      builder.builderStatus ? `- Status: ${builder.builderStatus}` : "",
+      "- Builder DSI docs and token values override local proxy placeholders.",
+      "- Do not substitute a generic style if DSI docs or tokens are unavailable; call get-design-system again or tell the user Builder indexing is not ready.",
+    );
+
+    if (builder.warning) {
+      lines.push(`- Warning: ${builder.warning}`);
+    }
+
+    lines.push("", ...formatTokenValues(builder.tokenValues));
+
+    const docs = builder.docs.slice(0, MAX_BUILDER_DOCS);
+    if (docs.length > 0) {
+      lines.push("", "Builder DSI docs to follow:");
+      for (const doc of docs) {
+        const label = [doc.name, doc.type ? `(${doc.type})` : ""]
+          .filter(Boolean)
+          .join(" ");
+        lines.push(
+          "",
+          `### ${label || "Design system doc"}`,
+          doc.description?.trim() ? doc.description.trim() : "",
+          doc.content?.trim()
+            ? truncate(doc.content.trim(), MAX_BUILDER_DOC_CHARS)
+            : "",
+        );
+      }
+    }
+  } else {
+    const parsedData = parseJson(data);
+    if (parsedData) {
+      lines.push("", "Local design-system tokens:", formatJson(parsedData));
+    }
+  }
+
+  return truncate(lines.filter(Boolean).join("\n"), MAX_AGENT_CONTEXT_CHARS);
+}
+
 export default defineAction({
   description:
-    "Get a design system by ID. Returns full design system data including colors, typography, spacing, and assets.",
+    "Get a design system by ID. Returns full design system data including colors, typography, spacing, assets, and a compact agentContext for generation.",
   schema: z.object({
     id: z.string().describe("Design system ID"),
   }),
@@ -51,6 +188,15 @@ export default defineAction({
       createdAt: row.createdAt,
       updatedAt: row.updatedAt,
       builder,
+      agentContext: buildDesignSystemAgentContext({
+        id: row.id,
+        title: row.title,
+        description: row.description,
+        data: row.data,
+        assets: row.assets,
+        customInstructions: row.customInstructions,
+        builder,
+      }),
     };
   },
 });

package/corpus/templates/design/app/routes/settings.tsx

@@ -4,8 +4,10 @@ import {
   LanguagePicker,
   useAgentSettingsTabs,
   useT,
+  type SettingsSearchEntry,
 } from "@agent-native/core/client";
 import { TeamPage } from "@agent-native/core/client/org";
+import { useMemo } from "react";
 
 import {
   Card,
@@ -27,13 +29,26 @@ export default function SettingsRoute() {
   const agentSettingsTabs = useAgentSettingsTabs();
   const t = useT();
 
+  const generalSearchEntries = useMemo<SettingsSearchEntry[]>(
+    () => [
+      {
+        id: "design-language",
+        label: t("settings.languageTitle"),
+        keywords: "language locale translation i18n",
+        hash: "language",
+      },
+    ],
+    [t],
+  );
+
   return (
     <div className="flex h-full min-h-0 flex-col overflow-y-auto bg-background">
       <SettingsTabsPage
         extraTabs={agentSettingsTabs}
+        generalSearchEntries={generalSearchEntries}
         general={
           <div className="mx-auto w-full max-w-2xl space-y-6">
-            <Card>
+            <Card id="language" className="scroll-mt-16">
               <CardHeader>
                 <CardTitle className="text-base">
                   {t("settings.languageTitle")}

package/corpus/templates/design/changelog/2026-07-08-design-generation-now-follows-hydrated-builder-design-system.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-08
+---
+
+Design generation now follows hydrated Builder design-system guidance before creating screens.

package/corpus/templates/design/changelog/2026-07-08-settings-are-cleaner-and-searchable.md

@@ -0,0 +1,5 @@
+---
+type: improved
+---
+
+Settings are cleaner and searchable, with a consistent navigation that jumps straight to any setting.

package/corpus/templates/dispatch/app/routes/settings.tsx

@@ -4,6 +4,7 @@ import {
   SettingsTabsPage,
   useAgentSettingsTabs,
   useT,
+  type SettingsSearchEntry,
 } from "@agent-native/core/client";
 import { TeamPage } from "@agent-native/core/client/org";
 import { Button } from "@agent-native/dispatch/components/ui/button";
@@ -15,6 +16,7 @@ import {
   CardTitle,
 } from "@agent-native/dispatch/components/ui/card";
 import { Label } from "@agent-native/dispatch/components/ui/label";
+import { useMemo } from "react";
 import { Link } from "react-router";
 
 import { messagesByLocale } from "@/i18n-data";
@@ -29,16 +31,35 @@ export default function SettingsRoute() {
   const t = useT();
   const agentSettingsTabs = useAgentSettingsTabs();
 
+  const generalSearchEntries = useMemo<SettingsSearchEntry[]>(
+    () => [
+      {
+        id: "dispatch-language",
+        label: t("settings.languageTitle"),
+        keywords: "language locale translation i18n",
+        hash: "language",
+      },
+      {
+        id: "dispatch-workspace",
+        label: t("settings.workspaceTitle"),
+        keywords: "workspace resources integrations vault destinations",
+        hash: "workspace-resources",
+      },
+    ],
+    [t],
+  );
+
   return (
     <SettingsTabsPage
       extraTabs={agentSettingsTabs}
+      generalSearchEntries={generalSearchEntries}
       general={
         <div className="mx-auto w-full max-w-3xl space-y-6">
           <p className="text-sm leading-6 text-muted-foreground">
             {t("settings.description")}
           </p>
 
-          <Card>
+          <Card id="language" className="scroll-mt-16">
             <CardHeader>
               <CardTitle className="text-base">
                 {t("settings.languageTitle")}
@@ -53,7 +74,7 @@ export default function SettingsRoute() {
             </CardContent>
           </Card>
 
-          <Card>
+          <Card id="workspace-resources" className="scroll-mt-16">
             <CardHeader>
               <CardTitle className="text-base">
                 {t("settings.workspaceTitle")}

package/corpus/templates/dispatch/changelog/2026-07-08-settings-are-cleaner-and-searchable.md

@@ -0,0 +1,5 @@
+---
+type: improved
+---
+
+Settings are cleaner and searchable, with a consistent navigation that jumps straight to any setting.

package/corpus/templates/forms/app/routes/_app.settings.tsx

@@ -4,9 +4,11 @@ import {
   SettingsTabsPage,
   useAgentSettingsTabs,
   useT,
+  type SettingsSearchEntry,
 } from "@agent-native/core/client";
 import { TeamPage } from "@agent-native/core/client/org";
 import { useSetPageTitle } from "@agent-native/toolkit/app-shell";
+import { useMemo } from "react";
 
 import {
   Card,
@@ -29,17 +31,30 @@ export default function SettingsRoute() {
   const agentSettingsTabs = useAgentSettingsTabs();
   useSetPageTitle(t("settings.title"));
 
+  const generalSearchEntries = useMemo<SettingsSearchEntry[]>(
+    () => [
+      {
+        id: "forms-language",
+        label: t("settings.languageTitle"),
+        keywords: "language locale translation i18n",
+        hash: "language",
+      },
+    ],
+    [t],
+  );
+
   return (
     <SettingsTabsPage
       teamLabel={t("navigation.team")}
       extraTabs={agentSettingsTabs}
+      generalSearchEntries={generalSearchEntries}
       general={
         <div className="mx-auto w-full max-w-3xl space-y-6">
           <p className="text-sm leading-6 text-muted-foreground">
             {t("settings.description")}
           </p>
 
-          <Card>
+          <Card id="language" className="scroll-mt-16">
             <CardHeader>
               <CardTitle className="text-base">
                 {t("settings.languageTitle")}

package/corpus/templates/forms/changelog/2026-07-08-settings-are-cleaner-and-searchable.md

@@ -0,0 +1,5 @@
+---
+type: improved
+---
+
+Settings are cleaner and searchable, with a consistent navigation that jumps straight to any setting.

package/corpus/templates/macros/app/routes/settings.tsx

@@ -4,9 +4,11 @@ import {
   SettingsTabsPage,
   useAgentSettingsTabs,
   useT,
+  type SettingsSearchEntry,
 } from "@agent-native/core/client";
 import { TeamPage } from "@agent-native/core/client/org";
 import { useSetPageTitle } from "@agent-native/toolkit/app-shell";
+import { useMemo } from "react";
 
 import {
   Card,
@@ -29,17 +31,30 @@ export default function SettingsRoute() {
   const agentSettingsTabs = useAgentSettingsTabs();
   useSetPageTitle(t("settings.title"));
 
+  const generalSearchEntries = useMemo<SettingsSearchEntry[]>(
+    () => [
+      {
+        id: "macros-language",
+        label: t("settings.languageTitle"),
+        keywords: "language locale translation i18n",
+        hash: "language",
+      },
+    ],
+    [t],
+  );
+
   return (
     <SettingsTabsPage
       teamLabel={t("team.title")}
       extraTabs={agentSettingsTabs}
+      generalSearchEntries={generalSearchEntries}
       general={
         <div className="mx-auto w-full max-w-3xl space-y-6">
           <p className="text-sm leading-6 text-muted-foreground">
             {t("settings.description")}
           </p>
 
-          <Card>
+          <Card id="language" className="scroll-mt-16">
             <CardHeader>
               <CardTitle className="text-base">
                 {t("settings.languageTitle")}

package/corpus/templates/macros/changelog/2026-07-08-settings-are-cleaner-and-searchable.md

@@ -0,0 +1,5 @@
+---
+type: improved
+---
+
+Settings are cleaner and searchable, with a consistent navigation that jumps straight to any setting.

package/corpus/templates/mail/app/components/settings/GmailFiltersSection.tsx

@@ -554,7 +554,7 @@ export function GmailFiltersSection() {
   );
 
   return (
-    <div className="flex-1 overflow-y-auto p-4 sm:p-8">
+    <div>
       <div className="mb-6 flex items-center justify-between">
         <div>
           <h2 className="text-[16px] font-semibold text-foreground">

package/corpus/templates/mail/app/components/settings/SnippetsSection.tsx

@@ -231,7 +231,7 @@ export function SnippetsSection() {
   };
 
   return (
-    <div className="flex-1 p-4 sm:p-8 overflow-y-auto">
+    <div>
       <div className="flex items-center justify-between mb-6">
         <div>
           <h2 className="text-[16px] font-semibold text-foreground">