@agent-native/core 0.90.11 → 0.91.1

package/corpus/templates/content/actions/add-content-database-source-field-property.ts

@@ -6,14 +6,19 @@ import { z } from "zod";
 import { getDb, schema } from "../server/db/index.js";
 import type {
   AddContentDatabaseSourceFieldPropertyRequest,
+  BuilderCmsModelFieldSummary,
   ContentDatabaseSourceFieldPropertyResponse,
   DocumentPropertyValue,
 } from "../shared/api.js";
 import {
   defaultPropertyOptions,
   normalizePropertyValue,
+  normalizePropertyValueWithOptions,
   normalizePropertyVisibility,
+  serializePropertyOptions,
   serializePropertyValue,
+  type DocumentPropertyOptionColor,
+  type DocumentPropertyOptions,
   type DocumentPropertyType,
 } from "../shared/properties.js";
 import {
@@ -44,12 +49,15 @@ export function sourceFieldPropertyValuesFromRows(
   }>,
   sourceFieldKey: string,
   type: DocumentPropertyType,
+  options?: DocumentPropertyOptions,
 ) {
   return rows
     .map((row) => {
       const sourceValues = parseSourceValues(row.sourceValuesJson);
       const sourceValue = sourceValues[sourceFieldKey];
-      const value = normalizePropertyValue(type, sourceValue);
+      const value = options
+        ? normalizePropertyValueWithOptions(type, sourceValue, options)
+        : normalizePropertyValue(type, sourceValue);
       return {
         itemId: row.databaseItemId,
         documentId: row.documentId,
@@ -61,18 +69,181 @@ export function sourceFieldPropertyValuesFromRows(
 
 export function propertyTypeForSourceField(
   sourceFieldType: string,
+  metadata?: BuilderCmsModelFieldSummary | null,
 ): DocumentPropertyType {
-  if (sourceFieldType === "number") return "number";
-  if (sourceFieldType === "datetime" || sourceFieldType === "date") {
+  const normalized = sourceFieldType.trim().toLowerCase();
+  const metadataKind = [
+    metadata?.type,
+    metadata?.inputType,
+    metadata?.name,
+    metadata?.label,
+  ]
+    .filter((value): value is string => Boolean(value))
+    .join(" ")
+    .trim()
+    .toLowerCase();
+  const hasChoices =
+    (metadata?.enum?.length ?? 0) > 0 || (metadata?.options?.length ?? 0) > 0;
+  const looksMultiSelect = /\b(multi[-_\s]?select|tags?|stringlist)\b/.test(
+    metadataKind,
+  );
+
+  if (normalized === "number") return "number";
+  if (normalized === "datetime" || normalized === "date") {
     return "date";
   }
-  if (sourceFieldType === "url") return "url";
-  if (sourceFieldType === "boolean" || sourceFieldType === "checkbox") {
+  if (normalized === "url") return "url";
+  if (normalized === "boolean" || normalized === "checkbox") {
     return "checkbox";
   }
+  if (normalized === "multi_select" || normalized === "tags") {
+    return "multi_select";
+  }
+  if ((normalized === "list" || normalized === "array") && looksMultiSelect) {
+    return "multi_select";
+  }
+  if (hasChoices && looksMultiSelect) return "multi_select";
+  if (hasChoices && normalized !== "list" && normalized !== "array") {
+    return "select";
+  }
   return "text";
 }
 
+const SOURCE_OPTION_COLORS: DocumentPropertyOptionColor[] = [
+  "blue",
+  "green",
+  "purple",
+  "pink",
+  "orange",
+  "yellow",
+  "red",
+  "gray",
+];
+
+function optionIdFromName(name: string) {
+  return (
+    name
+      .trim()
+      .toLowerCase()
+      .replace(/[^a-z0-9]+/g, "-")
+      .replace(/^-+|-+$/g, "") || "option"
+  );
+}
+
+function uniqueOptionIdFromName(name: string, usedIds: Set<string>) {
+  const baseId = optionIdFromName(name);
+  let id = baseId;
+  let index = 2;
+  while (usedIds.has(id)) {
+    id = `${baseId}-${index++}`;
+  }
+  usedIds.add(id);
+  return id;
+}
+
+function uniqueStringValues(values: unknown[]) {
+  const seen = new Set<string>();
+  const result: string[] = [];
+  for (const value of values) {
+    if (typeof value !== "string") continue;
+    const trimmed = value.trim();
+    if (!trimmed || seen.has(trimmed.toLowerCase())) continue;
+    seen.add(trimmed.toLowerCase());
+    result.push(trimmed);
+  }
+  return result;
+}
+
+function sourceFieldOptionNames(args: {
+  metadata?: BuilderCmsModelFieldSummary | null;
+  rows: Array<{ sourceValuesJson: string | null }>;
+  sourceFieldKey: string;
+  type: DocumentPropertyType;
+}) {
+  const explicit = uniqueStringValues([
+    ...(args.metadata?.options ?? []),
+    ...(args.metadata?.enum ?? []),
+  ]);
+  if (explicit.length > 0) return explicit;
+  if (args.type !== "select" && args.type !== "multi_select") return [];
+
+  const rowValues: string[] = [];
+  for (const row of args.rows) {
+    const value = parseSourceValues(row.sourceValuesJson)[args.sourceFieldKey];
+    if (Array.isArray(value)) rowValues.push(...value);
+    else if (typeof value === "string") rowValues.push(value);
+  }
+  return uniqueStringValues(rowValues).slice(0, 100);
+}
+
+export function sourceFieldPropertyOptions(args: {
+  type: DocumentPropertyType;
+  metadata?: BuilderCmsModelFieldSummary | null;
+  rows: Array<{ sourceValuesJson: string | null }>;
+  sourceFieldKey: string;
+}): DocumentPropertyOptions {
+  const optionNames = sourceFieldOptionNames(args);
+  if (
+    (args.type === "select" || args.type === "multi_select") &&
+    optionNames.length > 0
+  ) {
+    const usedIds = new Set<string>();
+    return {
+      options: optionNames.map((name, index) => ({
+        id: uniqueOptionIdFromName(name, usedIds),
+        name,
+        color: SOURCE_OPTION_COLORS[index % SOURCE_OPTION_COLORS.length],
+      })),
+    };
+  }
+  return defaultPropertyOptions(args.type);
+}
+
+function builderFieldNameForSourceKey(sourceFieldKey: string) {
+  return sourceFieldKey
+    .replace(/^data\./, "")
+    .trim()
+    .toLowerCase();
+}
+
+function builderModelFieldsFromMetadata(
+  metadataJson: string | null | undefined,
+): BuilderCmsModelFieldSummary[] {
+  if (!metadataJson) return [];
+  try {
+    const parsed = JSON.parse(metadataJson) as unknown;
+    if (!parsed || typeof parsed !== "object") return [];
+    const fields = (parsed as { builderModelFields?: unknown })
+      .builderModelFields;
+    return Array.isArray(fields)
+      ? fields.filter((field): field is BuilderCmsModelFieldSummary => {
+          return (
+            !!field &&
+            typeof field === "object" &&
+            typeof (field as BuilderCmsModelFieldSummary).name === "string" &&
+            typeof (field as BuilderCmsModelFieldSummary).type === "string"
+          );
+        })
+      : [];
+  } catch {
+    return [];
+  }
+}
+
+function builderMetadataForSourceField(args: {
+  sourceFieldKey: string;
+  sourceMetadataJson: string | null | undefined;
+}) {
+  const fieldName = builderFieldNameForSourceKey(args.sourceFieldKey);
+  const sourceFieldKey = args.sourceFieldKey.trim().toLowerCase();
+  return (
+    builderModelFieldsFromMetadata(args.sourceMetadataJson).find((field) => {
+      const name = field.name.trim().toLowerCase();
+      return name === fieldName || `data.${name}` === sourceFieldKey;
+    }) ?? null
+  );
+}
+
 export default defineAction({
   description:
     "Create a local database property from an unmapped source field and bind the source field to that property.",
@@ -137,9 +308,7 @@ export default defineAction({
     }
 
     const now = new Date().toISOString();
-    const type = propertyTypeForSourceField(field.sourceFieldType);
     const visibility = normalizePropertyVisibility(undefined);
-    const options = defaultPropertyOptions(type);
     const [maxPos] = await db
       .select({
         max: sql<number>`COALESCE(MAX(position), -1)`,
@@ -156,6 +325,42 @@ export default defineAction({
       );
     const propertyId = nanoid();
 
+    // A federated secondary source's rows have no local document (they join by
+    // canonical key), so we don't materialize their values into
+    // documentPropertyValues — the read path overlays them per row at query
+    // time. Primary sources still copy values onto their backing documents.
+    let federationRole: string | null = null;
+    try {
+      const parsed = JSON.parse(source.metadataJson ?? "{}") as {
+        federation?: { role?: string };
+      };
+      federationRole = parsed.federation?.role ?? null;
+    } catch {
+      federationRole = null;
+    }
+    const isSecondary = federationRole === "secondary";
+
+    const sourceRows = isSecondary
+      ? []
+      : await db
+          .select()
+          .from(schema.contentDatabaseSourceRows)
+          .where(eq(schema.contentDatabaseSourceRows.sourceId, source.id));
+    const builderMetadata = builderMetadataForSourceField({
+      sourceFieldKey: field.sourceFieldKey,
+      sourceMetadataJson: source.metadataJson,
+    });
+    const type = propertyTypeForSourceField(
+      field.sourceFieldType,
+      builderMetadata,
+    );
+    const options = sourceFieldPropertyOptions({
+      type,
+      metadata: builderMetadata,
+      rows: sourceRows,
+      sourceFieldKey: field.sourceFieldKey,
+    });
+
     await db.insert(schema.documentPropertyDefinitions).values({
       id: propertyId,
       ownerEmail: database.ownerEmail,
@@ -164,7 +369,7 @@ export default defineAction({
       name: field.sourceFieldLabel,
       type,
       visibility,
-      optionsJson: JSON.stringify(options),
+      optionsJson: serializePropertyOptions(options),
       position: (maxPos?.max ?? -1) + 1,
       createdAt: now,
       updatedAt: now,
@@ -185,31 +390,11 @@ export default defineAction({
       .set({ updatedAt: now })
       .where(eq(schema.contentDatabaseSources.id, source.id));
 
-    // A federated secondary source's rows have no local document (they join by
-    // canonical key), so we don't materialize their values into
-    // documentPropertyValues — the read path overlays them per row at query
-    // time. Primary sources still copy values onto their backing documents.
-    let federationRole: string | null = null;
-    try {
-      const parsed = JSON.parse(source.metadataJson ?? "{}") as {
-        federation?: { role?: string };
-      };
-      federationRole = parsed.federation?.role ?? null;
-    } catch {
-      federationRole = null;
-    }
-    const isSecondary = federationRole === "secondary";
-
-    const sourceRows = isSecondary
-      ? []
-      : await db
-          .select()
-          .from(schema.contentDatabaseSourceRows)
-          .where(eq(schema.contentDatabaseSourceRows.sourceId, source.id));
     const itemValues = sourceFieldPropertyValuesFromRows(
       sourceRows,
       field.sourceFieldKey,
       type,
+      options,
     );
     if (itemValues.length > 0) {
       await db.insert(schema.documentPropertyValues).values(

package/corpus/templates/content/actions/attach-content-database-source.ts

@@ -284,6 +284,7 @@ export default defineAction({
           fetchedAt: builderRead.fetchedAt,
           now,
           message: builderRead.message,
+          builderModelFields: modelFields,
           ...builderCmsAttachReadMetadata(builderRead),
         });
       }
@@ -417,6 +418,7 @@ export default defineAction({
         fetchedAt: additionalRead.fetchedAt,
         now,
         message: additionalRead.message,
+        builderModelFields: additionalModelFields,
         ...builderCmsAttachReadMetadata(additionalRead),
       });
       await ensureDatabaseSourceProperty({ database, now });
@@ -520,6 +522,7 @@ export default defineAction({
         fetchedAt: builderRead.fetchedAt,
         now,
         message: builderRead.message,
+        builderModelFields,
         ...builderCmsAttachReadMetadata(builderRead),
       });
     }

package/corpus/templates/content/actions/change-content-database-source-role.ts

@@ -415,6 +415,7 @@ export default defineAction({
         now,
         message: read.message,
         syncState: "linked",
+        builderModelFields,
       });
 
       const latestSources = await db

package/corpus/templates/content/app/components/editor/DocumentProperties.tsx

@@ -851,17 +851,21 @@ function PropertyRow({
 
 // Mirror of the server's propertyTypeForSourceField — keep in sync. Used to
 // gate which source fields can bind into a column (type compatibility).
-function propertyTypeForSourceFieldType(
+export function propertyTypeForSourceFieldType(
   sourceFieldType: string,
 ): DocumentPropertyType {
-  if (sourceFieldType === "number") return "number";
-  if (sourceFieldType === "datetime" || sourceFieldType === "date") {
+  const normalized = sourceFieldType.trim().toLowerCase();
+  if (normalized === "number") return "number";
+  if (normalized === "datetime" || normalized === "date") {
     return "date";
   }
-  if (sourceFieldType === "url") return "url";
-  if (sourceFieldType === "boolean" || sourceFieldType === "checkbox") {
+  if (normalized === "url") return "url";
+  if (normalized === "boolean" || normalized === "checkbox") {
     return "checkbox";
   }
+  if (normalized === "tags" || normalized === "multi_select") {
+    return "multi_select";
+  }
   return "text";
 }
 
@@ -2781,33 +2785,39 @@ export function AddProperty({
                     name: group.source.sourceName,
                   })}
                 </div>
-                {group.fields.map((field) => (
-                  <button
-                    key={field.id}
-                    type="button"
-                    aria-label={t("editor.properties.sourceField", {
-                      name: field.sourceFieldLabel,
-                    })}
-                    disabled={isAddingProperty}
-                    aria-busy={pendingSourceFieldId === field.id}
-                    className="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-accent disabled:opacity-50"
-                    onClick={() => void addFromSourceField(field.id)}
-                  >
-                    {pendingSourceFieldId === field.id ? (
-                      <Spinner className="size-4 shrink-0 text-muted-foreground" />
-                    ) : (
-                      <IconLink className="size-4 shrink-0 text-muted-foreground" />
-                    )}
-                    <span className="min-w-0 flex-1 truncate">
-                      {field.sourceFieldLabel}
-                    </span>
-                    <span className="shrink-0 text-xs text-muted-foreground">
-                      {group.source.metadata.federation?.role === "secondary"
-                        ? t("editor.properties.federated")
-                        : t("editor.properties.source")}
-                    </span>
-                  </button>
-                ))}
+                {group.fields.map((field) => {
+                  const SourceFieldIcon =
+                    TYPE_ICONS[
+                      propertyTypeForSourceFieldType(field.sourceFieldType)
+                    ];
+                  return (
+                    <button
+                      key={field.id}
+                      type="button"
+                      aria-label={t("editor.properties.sourceField", {
+                        name: field.sourceFieldLabel,
+                      })}
+                      disabled={isAddingProperty}
+                      aria-busy={pendingSourceFieldId === field.id}
+                      className="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-accent disabled:opacity-50"
+                      onClick={() => void addFromSourceField(field.id)}
+                    >
+                      {pendingSourceFieldId === field.id ? (
+                        <Spinner className="size-4 shrink-0 text-muted-foreground" />
+                      ) : (
+                        <SourceFieldIcon className="size-4 shrink-0 text-muted-foreground" />
+                      )}
+                      <span className="min-w-0 flex-1 truncate">
+                        {field.sourceFieldLabel}
+                      </span>
+                      <span className="shrink-0 text-xs text-muted-foreground">
+                        {group.source.metadata.federation?.role === "secondary"
+                          ? t("editor.properties.federated")
+                          : t("editor.properties.source")}
+                      </span>
+                    </button>
+                  );
+                })}
               </div>
             ))}
             {filteredPropertyTypes.length === 0 ? (