@assistant-ui/react-generative-ui 0.0.21 → 0.0.22

package/src/a2ui/convert.test.ts

@@ -1,6 +1,7 @@
 import { describe, expect, it } from "vitest";
 import type { UIElement } from "../ir";
-import { convertSurfaceToUISpec } from "./convert";
+import { resolveFieldReferences } from "../fieldReferences";
+import { convertSurfaceToUISpec, createLiveSurfaceConverter } from "./convert";
 import { applyA2uiOperations } from "./reducer";
 import { surfaceToOperations } from "./snapshot";
 import type { A2uiSurfaceState } from "./types";
@@ -19,6 +20,82 @@ const surfaceFrom = (
 });
 
 describe("convertSurfaceToUISpec", () => {
+  it("keeps absolute bindings rooted while resolving relative template bindings locally", () => {
+    const surface = surfaceFrom(
+      [
+        {
+          id: "root",
+          component: "List",
+          children: { componentId: "row", path: "/items" },
+        },
+        {
+          id: "row",
+          component: "Row",
+          children: ["absolute", "relative", "send", "nested"],
+        },
+        {
+          id: "absolute",
+          component: "TextField",
+          value: { path: "/currency" },
+        },
+        { id: "relative", component: "TextField", value: { path: "currency" } },
+        {
+          id: "send",
+          component: "Button",
+          label: "Send",
+          action: {
+            event: {
+              name: "send",
+              context: {
+                absolute: { path: "/currency" },
+                relative: { path: "currency" },
+              },
+            },
+          },
+        },
+        {
+          id: "nested",
+          component: "List",
+          children: { componentId: "label", path: "/labels" },
+        },
+        { id: "label", component: "Text", text: { path: "name" } },
+      ],
+      {
+        currency: "USD",
+        labels: [{ name: "Root label" }],
+        items: [{ currency: "EUR", labels: [{ name: "Wrong label" }] }],
+      },
+    );
+
+    const result = convertSurfaceToUISpec(surface);
+    expect(result.warnings).toEqual([]);
+    expect(result.spec).toMatchObject({
+      children: [
+        {
+          children: {
+            children: [
+              { $type: "Input", name: "/currency", defaultValue: "USD" },
+              {
+                $type: "Input",
+                name: "/items/0/currency",
+                defaultValue: "EUR",
+              },
+              {
+                $action: {
+                  context: {
+                    absolute: { $field: "/currency", fallback: "USD" },
+                    relative: { $field: "/items/0/currency", fallback: "EUR" },
+                  },
+                },
+              },
+              { children: [{ children: { value: "Root label" } }] },
+            ],
+          },
+        },
+      ],
+    });
+  });
+
   it("replays a surface with bindings, templates, and custom components", () => {
     const initial = applyA2uiOperations(new Map(), [
       {
@@ -38,14 +115,12 @@ describe("convertSurfaceToUISpec", () => {
             {
               id: "items",
               component: "List",
-              children: {
-                template: { componentId: "item", path: "/items" },
-              },
+              children: { componentId: "item", path: "/items" },
             },
             {
               id: "item",
               component: "Text",
-              text: { path: "/name" },
+              text: { path: "name" },
             },
             {
               id: "custom",
@@ -262,12 +337,13 @@ describe("convertSurfaceToUISpec", () => {
           $type: "Input",
           label: "Email",
           placeholder: "you@example.com",
-          name: "email",
+          name: "/form/email",
+          defaultValue: "ada@example.com",
         },
         {
           $type: "Checkbox",
           label: "Accepted",
-          name: "accepted",
+          name: "/form/accepted",
           defaultChecked: true,
         },
       ],
@@ -305,7 +381,6 @@ describe("convertSurfaceToUISpec", () => {
           id: "select",
           component: "ChoicePicker",
           label: "Delivery",
-          placeholder: "Choose delivery",
           variant: "multipleSelection",
           value: { path: "/form/delivery" },
           options: [
@@ -363,14 +438,14 @@ describe("convertSurfaceToUISpec", () => {
             children: [{ $type: "Markdown", value: "Horizontal item" }],
           },
           {
-            $type: "Select",
+            $type: "CheckboxGroup",
             options: [
               { label: "Express", value: "express" },
               { label: "Standard", value: "standard" },
             ],
-            placeholder: "Choose delivery",
             label: "Delivery",
-            name: "delivery",
+            name: "/form/delivery",
+            defaultValue: ["express"],
           },
           {
             $type: "RadioGroup",
@@ -379,7 +454,7 @@ describe("convertSurfaceToUISpec", () => {
               { label: "Pro", value: "pro" },
             ],
             label: "Plan",
-            name: "plan",
+            name: "/form/plan",
             defaultValue: "pro",
           },
           {
@@ -388,7 +463,65 @@ describe("convertSurfaceToUISpec", () => {
             min: "2026-01-01",
             max: "2026-12-31",
             label: "Start date",
-            name: "startDate",
+            name: "/form/startDate",
+          },
+        ],
+      },
+      warnings: [],
+    });
+  });
+
+  it("maps an omitted ChoicePicker variant as mutuallyExclusive and multiple selection chips as a CheckboxGroup", () => {
+    const surface = surfaceFrom(
+      [
+        { id: "root", component: "Column", children: ["plan", "toppings"] },
+        {
+          id: "plan",
+          component: "ChoicePicker",
+          options: [
+            { label: "Free", value: "free" },
+            { label: "Pro", value: "pro" },
+          ],
+          value: { path: "/plan" },
+        },
+        {
+          id: "toppings",
+          component: "ChoicePicker",
+          variant: "multipleSelection",
+          displayStyle: "chips",
+          options: [
+            { label: "Basil", value: "basil" },
+            { label: "Olives", value: "olives" },
+            { label: "Onion", value: "onion" },
+          ],
+          value: { path: "/toppings" },
+        },
+      ],
+      { plan: ["pro"], toppings: ["basil", "onion"] },
+    );
+
+    expect(convertSurfaceToUISpec(surface)).toEqual({
+      spec: {
+        $type: "Col",
+        children: [
+          {
+            $type: "RadioGroup",
+            options: [
+              { label: "Free", value: "free" },
+              { label: "Pro", value: "pro" },
+            ],
+            name: "/plan",
+            defaultValue: "pro",
+          },
+          {
+            $type: "CheckboxGroup",
+            options: [
+              { label: "Basil", value: "basil" },
+              { label: "Olives", value: "olives" },
+              { label: "Onion", value: "onion" },
+            ],
+            name: "/toppings",
+            defaultValue: ["basil", "onion"],
           },
         ],
       },
@@ -396,13 +529,14 @@ describe("convertSurfaceToUISpec", () => {
     });
   });
 
-  it("does not pass a ChoicePicker value to Select without an initial-value prop", () => {
+  it("passes a chips ChoicePicker value to RadioGroup as its initial value", () => {
     const result = convertSurfaceToUISpec(
       surfaceFrom([
         {
           id: "root",
           component: "ChoicePicker",
-          value: "express",
+          displayStyle: "chips",
+          value: ["express"],
           options: [{ label: "Express", value: "express" }],
         },
       ]),
@@ -410,13 +544,267 @@ describe("convertSurfaceToUISpec", () => {
 
     expect(result).toEqual({
       spec: {
-        $type: "Select",
+        $type: "RadioGroup",
         options: [{ label: "Express", value: "express" }],
+        defaultValue: "express",
       },
       warnings: [],
     });
   });
 
+  it.each([
+    ["obscured", "password", "s3cret"],
+    ["obscured", "password", ""],
+    ["number", "number", "12.5"],
+    ["number", "number", ""],
+  ])(
+    "maps a %s TextField to a %s Input holding %j",
+    (variant, inputType, value) => {
+      const result = convertSurfaceToUISpec(
+        surfaceFrom(
+          [
+            { id: "root", component: "Column", children: ["field", "send"] },
+            {
+              id: "field",
+              component: "TextField",
+              variant,
+              label: "Value",
+              value: { path: "/form/value" },
+            },
+            {
+              id: "send",
+              component: "Button",
+              action: {
+                event: { name: "send", context: { form: { path: "/form" } } },
+              },
+            },
+          ],
+          { form: { value } },
+        ),
+      );
+
+      expect(result.warnings).toEqual([]);
+      expect(result.spec?.children).toEqual([
+        {
+          $type: "Input",
+          inputType,
+          label: "Value",
+          name: "/form/value",
+          defaultValue: value,
+        },
+        {
+          $type: "Button",
+          $action: {
+            type: "a2ui:action",
+            name: "send",
+            surfaceId: "",
+            sourceComponentId: "send",
+            context: {
+              form: { value: { $field: "/form/value", fallback: value } },
+            },
+          },
+        },
+      ]);
+    },
+  );
+
+  it.each([
+    { mode: {}, value: "2025-12-15", type: "DatePicker" },
+    {
+      mode: { enableDate: false, enableTime: false },
+      value: "2025-12-15",
+      type: "DatePicker",
+    },
+    { mode: { enableDate: true }, value: "2025-12-15", type: "DatePicker" },
+    {
+      mode: { enableDate: true, enableTime: false },
+      value: "2025-12-15",
+      type: "DatePicker",
+    },
+    { mode: { enableDate: true }, value: "", type: "DatePicker" },
+    { mode: { enableDate: true }, value: undefined, type: "DatePicker" },
+    { mode: {}, value: undefined, type: "DatePicker" },
+    { mode: {}, value: "2025-12-15T17:00:00Z", type: "Input" },
+    {
+      mode: { enableDate: true },
+      value: "2025-12-15T17:00:00Z",
+      type: "Input",
+    },
+    {
+      mode: { enableDate: true, enableTime: true },
+      value: "2025-12-15T17:00:00Z",
+      type: "Input",
+    },
+    {
+      mode: { enableDate: true, enableTime: true },
+      value: "2025-12-15",
+      type: "Input",
+    },
+    { mode: { enableTime: true }, value: "17:00:00", type: "Input" },
+    {
+      mode: { enableDate: false, enableTime: true },
+      value: "17:00:00",
+      type: "Input",
+    },
+    {
+      mode: { enableDate: true },
+      value: "2025-12-15T17:00:00+02:00",
+      type: "Input",
+    },
+  ])(
+    "maps DateTimeInput $mode holding $value to $type with live field references",
+    ({ mode, value, type }) => {
+      const reference = {
+        $field: "/form/due",
+        ...(value !== undefined ? { fallback: value } : {}),
+      };
+      const result = convertSurfaceToUISpec(
+        surfaceFrom(
+          [
+            {
+              id: "root",
+              component: "Column",
+              children: ["due", "send", "call"],
+            },
+            {
+              id: "due",
+              component: "DateTimeInput",
+              ...mode,
+              label: "Due",
+              value: { path: "/form/due" },
+              min: "2025-01-01",
+              max: "2025-12-31",
+            },
+            {
+              id: "send",
+              component: "Button",
+              action: {
+                event: {
+                  name: "send",
+                  context: {
+                    due: { path: "/form/due" },
+                    form: { path: "/form" },
+                  },
+                  userMessage: { path: "/form/due" },
+                },
+              },
+            },
+            {
+              id: "call",
+              component: "Button",
+              action: {
+                functionCall: {
+                  call: "save",
+                  args: { due: { path: "/form/due" } },
+                },
+              },
+            },
+          ],
+          { form: value === undefined ? {} : { due: value } },
+        ),
+      );
+
+      expect(result.warnings).toEqual([]);
+      expect(result.spec?.children).toEqual([
+        {
+          $type: type,
+          label: "Due",
+          name: "/form/due",
+          ...(value !== undefined
+            ? { [type === "DatePicker" ? "value" : "defaultValue"]: value }
+            : {}),
+          ...(type === "DatePicker"
+            ? { min: "2025-01-01", max: "2025-12-31" }
+            : {}),
+        },
+        {
+          $type: "Button",
+          $action: {
+            type: "a2ui:action",
+            name: "send",
+            surfaceId: "",
+            sourceComponentId: "send",
+            context: { due: reference, form: { due: reference } },
+            userMessage: reference,
+          },
+        },
+        {
+          $type: "Button",
+          $action: {
+            type: "a2ui:functionCall",
+            call: "save",
+            surfaceId: "",
+            sourceComponentId: "call",
+            args: { due: reference },
+          },
+        },
+      ]);
+    },
+  );
+
+  it.each([undefined, "mutuallyExclusive"])(
+    "keeps chips with variant %s list-valued when empty and selected",
+    (variant) => {
+      for (const value of [[], ["b"]]) {
+        const options = [
+          { label: "A", value: "a" },
+          { label: "B", value: "b" },
+        ];
+        const result = convertSurfaceToUISpec(
+          surfaceFrom(
+            [
+              { id: "root", component: "Column", children: ["choice", "send"] },
+              {
+                id: "choice",
+                component: "ChoicePicker",
+                variant,
+                displayStyle: "chips",
+                options,
+                value: { path: "/form/choice" },
+              },
+              {
+                id: "send",
+                component: "Button",
+                action: {
+                  name: "send",
+                  context: { choice: { path: "/form/choice" } },
+                },
+              },
+            ],
+            { form: { choice: value } },
+          ),
+        );
+        const reference = {
+          $field: "/form/choice",
+          ...(value[0] !== undefined ? { fallback: value[0] } : {}),
+        };
+        expect(result.warnings).toEqual([]);
+        expect(result.spec?.children).toEqual([
+          {
+            $type: "RadioGroup",
+            name: "/form/choice",
+            options,
+            ...(value[0] !== undefined ? { defaultValue: value[0] } : {}),
+          },
+          {
+            $type: "Button",
+            $action: {
+              type: "a2ui:action",
+              name: "send",
+              surfaceId: "",
+              sourceComponentId: "send",
+              context: { choice: [reference] },
+            },
+          },
+        ]);
+        expect(resolveFieldReferences([reference], {})).toEqual(value);
+        expect(
+          resolveFieldReferences([reference], { "/form/choice": "b" }),
+        ).toEqual(["b"]);
+      }
+    },
+  );
+
   it("drops an unresolvable bound prop without throwing", () => {
     const surface = surfaceFrom([
       {
@@ -432,133 +820,669 @@ describe("convertSurfaceToUISpec", () => {
     });
   });
 
-  it("preserves prototype-named action context fields", () => {
-    const context = JSON.parse(
-      '{"__proto__":{"admin":true},"literal":"kept"}',
-    ) as Record<string, unknown>;
-    const surface = surfaceFrom([
+  it("evaluates v1.0 formatString values against the data model", () => {
+    const { state } = applyA2uiOperations(new Map(), [
       {
-        id: "root",
-        component: "Button",
-        label: "Run",
-        action: { name: "run", context },
+        version: "v1.0",
+        createSurface: {
+          surfaceId: "functions",
+          components: [
+            {
+              id: "root",
+              component: "Text",
+              text: {
+                call: "formatString",
+                args: { value: "Hello ${/name}" },
+              },
+            },
+          ],
+          dataModel: { name: "Ada" },
+        },
       },
     ]);
 
-    const result = convertSurfaceToUISpec(surface);
-    const convertedContext = (result.spec as UIElement).$action
-      ?.context as Record<string, unknown>;
-
-    expect(Object.getPrototypeOf(convertedContext)).toBe(Object.prototype);
-    expect(Object.hasOwn(convertedContext, "__proto__")).toBe(true);
-    expect(convertedContext["__proto__"]).toEqual({ admin: true });
-    expect(JSON.stringify(convertedContext)).toBe(
-      '{"__proto__":{"admin":true},"literal":"kept"}',
-    );
-  });
-
-  it("does not read component fields through a prototype-named prop", () => {
-    const component = JSON.parse(
-      '{"id":"root","component":"Text","__proto__":{"text":"injected"}}',
-    ) as Record<string, unknown>;
-
-    expect(convertSurfaceToUISpec(surfaceFrom([component]))).toEqual({
-      spec: { $type: "Markdown" },
+    expect(convertSurfaceToUISpec(state.get("functions")!)).toEqual({
+      spec: { $type: "Markdown", value: "Hello Ada" },
       warnings: [],
     });
   });
 
-  it("expands template children relative to each bound item", () => {
+  it("evaluates nested value calls and warns when a value function is unknown", () => {
     const surface = surfaceFrom(
       [
         {
           id: "root",
           component: "Column",
-          children: {
-            template: { componentId: "item", path: "/items" },
+          children: ["message", "enabled", "unknown"],
+        },
+        {
+          id: "message",
+          component: "Text",
+          text: {
+            call: "formatString",
+            args: {
+              value:
+                "${formatNumber(value:${/count}, decimals:0, grouping:false)} items",
+            },
           },
         },
         {
-          id: "item",
+          id: "enabled",
+          component: "CheckBox",
+          label: "Enabled",
+          value: { call: "not", args: { value: { path: "/disabled" } } },
+        },
+        {
+          id: "unknown",
           component: "Text",
-          text: { path: "/name" },
+          text: { call: "customValue", args: { value: "ignored" } },
         },
       ],
-      { items: [{ name: "one" }, { name: "two" }] },
+      { count: 12, disabled: false },
     );
 
     expect(convertSurfaceToUISpec(surface)).toEqual({
       spec: {
-        $type: "ListView",
+        $type: "Col",
         children: [
+          { $type: "Markdown", value: "12 items" },
           {
-            $type: "ListViewItem",
-            children: { $type: "Markdown", value: "one" },
-          },
-          {
-            $type: "ListViewItem",
-            children: { $type: "Markdown", value: "two" },
+            $type: "Checkbox",
+            label: "Enabled",
+            defaultChecked: true,
           },
+          { $type: "Markdown" },
         ],
       },
-      warnings: [],
+      warnings: [
+        'A2UI function "customValue" is not supported and was skipped.',
+      ],
     });
   });
 
-  it("preserves a horizontal list container when expanding templates", () => {
+  it("maps a bound Slider with the spec's min default and a continuous step", () => {
     const surface = surfaceFrom(
       [
         {
           id: "root",
-          component: "List",
-          direction: "horizontal",
-          align: "center",
-          children: {
-            template: { componentId: "item", path: "/items" },
-          },
+          component: "Slider",
+          label: "Volume",
+          max: 1,
+          value: { path: "/volume" },
         },
-        { id: "item", component: "Text", text: { path: "/label" } },
       ],
-      { items: [{ label: "One" }, { label: "Two" }] },
+      { volume: 0.35 },
     );
 
     expect(convertSurfaceToUISpec(surface)).toEqual({
       spec: {
-        $type: "Row",
-        align: "center",
-        children: [
-          { $type: "Markdown", value: "One" },
-          { $type: "Markdown", value: "Two" },
-        ],
+        $type: "Slider",
+        min: 0,
+        max: 1,
+        step: 0.01,
+        defaultValue: 0.35,
+        label: "Volume",
+        name: "/volume",
       },
       warnings: [],
     });
   });
 
-  it("counts only emitted template nodes", () => {
-    const components = (root: Record<string, unknown>) => [
-      root,
-      {
-        id: "item",
-        component: "Row",
-        children: Array.from({ length: 49 }, (_, index) => `divider-${index}`),
-      },
-      ...Array.from({ length: 49 }, (_, index) => ({
-        id: `divider-${index}`,
-        component: "Divider",
-      })),
-    ];
-    const dataModel = { items: Array.from({ length: 100 }, () => ({})) };
-    const results = [
-      convertSurfaceToUISpec(
-        surfaceFrom(
-          components({
-            id: "root",
-            component: "List",
-            direction: "horizontal",
-            children: {
-              template: { componentId: "item", path: "/items" },
+  it("divides a Slider range by its steps and keeps integer values exact", () => {
+    const stepped = surfaceFrom([
+      { id: "root", component: "Slider", max: 100, steps: 4, value: 50 },
+    ]);
+    const wide = surfaceFrom([
+      { id: "root", component: "Slider", min: 0, max: 1000, value: 537 },
+    ]);
+
+    expect(convertSurfaceToUISpec(stepped).spec).toEqual({
+      $type: "Slider",
+      min: 0,
+      max: 100,
+      step: 25,
+      defaultValue: 50,
+    });
+    expect(convertSurfaceToUISpec(wide).spec).toEqual({
+      $type: "Slider",
+      min: 0,
+      max: 1000,
+      step: 1,
+      defaultValue: 537,
+    });
+  });
+
+  it("sends a Slider's live value to an action bound to its path", () => {
+    const surface = surfaceFrom(
+      [
+        { id: "root", component: "Column", children: ["volume", "save"] },
+        {
+          id: "volume",
+          component: "Slider",
+          max: 10,
+          value: { path: "/volume" },
+        },
+        {
+          id: "save",
+          component: "Button",
+          label: "Save",
+          action: {
+            event: { name: "save", context: { volume: { path: "/volume" } } },
+          },
+        },
+      ],
+      { volume: 4 },
+    );
+
+    const result = convertSurfaceToUISpec(surface);
+    expect(result.warnings).toEqual([]);
+    expect(result.spec).toMatchObject({
+      children: [
+        { $type: "Slider", name: "/volume", defaultValue: 4 },
+        {
+          $action: {
+            context: { volume: { $field: "/volume", fallback: 4 } },
+          },
+        },
+      ],
+    });
+  });
+
+  it("skips a Slider without a numeric max", () => {
+    const surface = surfaceFrom([
+      { id: "root", component: "Slider", value: 3 },
+    ]);
+
+    expect(convertSurfaceToUISpec(surface).warnings).toEqual([
+      'A2UI component "Slider" could not be mapped and was skipped.',
+    ]);
+  });
+
+  it("warns and omits a malformed formatString template", () => {
+    const surface = surfaceFrom([
+      {
+        id: "root",
+        component: "Text",
+        text: { call: "formatString", args: { value: "Hi ${name" } },
+      },
+    ]);
+
+    expect(convertSurfaceToUISpec(surface)).toEqual({
+      spec: { $type: "Markdown" },
+      warnings: [
+        "A2UI formatString template is malformed: an interpolation is not closed.",
+      ],
+    });
+  });
+
+  it("resolves relative paths in bindings and function arguments against the current item", () => {
+    const usd = (value: number) =>
+      new Intl.NumberFormat(undefined, {
+        style: "currency",
+        currency: "USD",
+      }).format(value);
+    const surface = surfaceFrom(
+      [
+        { id: "root", component: "Column", children: ["total", "rows"] },
+        {
+          id: "total",
+          component: "Text",
+          text: {
+            call: "formatCurrency",
+            args: { value: { path: "total" }, currency: "USD" },
+          },
+        },
+        {
+          id: "rows",
+          component: "Column",
+          children: { componentId: "row", path: "/items" },
+        },
+        {
+          id: "row",
+          component: "Text",
+          text: {
+            call: "formatString",
+            args: {
+              value:
+                "${name}: ${formatCurrency(value: ${price}, currency: 'USD')}",
             },
+          },
+        },
+      ],
+      { total: 12, items: [{ name: "Tea", price: 3 }] },
+    );
+
+    expect(convertSurfaceToUISpec(surface)).toEqual({
+      spec: {
+        $type: "Col",
+        children: [
+          { $type: "Markdown", value: usd(12) },
+          {
+            $type: "Col",
+            children: [{ $type: "Markdown", value: `Tea: ${usd(3)}` }],
+          },
+        ],
+      },
+      warnings: [],
+    });
+  });
+
+  it("evaluates values inside actions but leaves a functionCall for the host to run", () => {
+    const surface = surfaceFrom(
+      [
+        { id: "root", component: "Row", children: ["save", "docs"] },
+        {
+          id: "save",
+          component: "Button",
+          label: "Save",
+          action: {
+            event: {
+              name: "save",
+              context: {
+                summary: {
+                  call: "formatString",
+                  args: { value: "${/count} items" },
+                },
+              },
+            },
+          },
+        },
+        {
+          id: "docs",
+          component: "Button",
+          label: "Docs",
+          action: {
+            functionCall: {
+              call: "openUrl",
+              args: {
+                url: {
+                  call: "formatString",
+                  args: { value: "https://example.com/${/slug}" },
+                },
+              },
+            },
+          },
+        },
+      ],
+      { count: 2, slug: "a2ui" },
+    );
+
+    expect(convertSurfaceToUISpec(surface)).toEqual({
+      spec: {
+        $type: "Row",
+        children: [
+          {
+            $type: "Button",
+            label: "Save",
+            $action: {
+              type: "a2ui:action",
+              name: "save",
+              surfaceId: "",
+              sourceComponentId: "save",
+              context: { summary: "2 items" },
+            },
+          },
+          {
+            $type: "Button",
+            label: "Docs",
+            $action: {
+              type: "a2ui:functionCall",
+              call: "openUrl",
+              surfaceId: "",
+              sourceComponentId: "docs",
+              args: { url: "https://example.com/a2ui" },
+            },
+          },
+        ],
+      },
+      warnings: [],
+    });
+  });
+
+  it("reads a function's arguments entry by entry, even when they look like a binding or a call", () => {
+    const surface = surfaceFrom([
+      { id: "root", component: "Column", children: ["bound", "nested", "ok"] },
+      {
+        id: "bound",
+        component: "Text",
+        text: { call: "formatNumber", args: { path: "/missing" } },
+      },
+      {
+        id: "nested",
+        component: "Text",
+        text: {
+          call: "formatString",
+          args: { value: "${formatNumber(call: 'x')}" },
+        },
+      },
+      { id: "ok", component: "Text", text: "still here" },
+    ]);
+
+    expect(convertSurfaceToUISpec(surface)).toEqual({
+      spec: {
+        $type: "Col",
+        children: [
+          { $type: "Markdown", value: "" },
+          { $type: "Markdown", value: "" },
+          { $type: "Markdown", value: "still here" },
+        ],
+      },
+      warnings: [],
+    });
+  });
+
+  it("keeps a missing operand in and and or instead of dropping it", () => {
+    const operands = [{ path: "/agreed" }, { path: "/verified" }];
+    const surface = surfaceFrom(
+      [
+        { id: "root", component: "Column", children: ["all", "any"] },
+        {
+          id: "all",
+          component: "CheckBox",
+          label: "All",
+          value: { call: "and", args: { values: operands } },
+        },
+        {
+          id: "any",
+          component: "CheckBox",
+          label: "Any",
+          value: { call: "or", args: { values: operands } },
+        },
+      ],
+      { verified: true },
+    );
+
+    expect(convertSurfaceToUISpec(surface)).toEqual({
+      spec: {
+        $type: "Col",
+        children: [
+          { $type: "Checkbox", label: "All", defaultChecked: false },
+          { $type: "Checkbox", label: "Any", defaultChecked: true },
+        ],
+      },
+      warnings: [],
+    });
+  });
+
+  it("stops evaluating functions once the evaluation budget is spent", () => {
+    const surface = surfaceFrom(
+      [
+        {
+          id: "root",
+          component: "Text",
+          text: { call: "formatString", args: { value: { path: "/t" } } },
+        },
+      ],
+      { t: "${formatString(value: /t)}".repeat(380) },
+    );
+
+    const result = convertSurfaceToUISpec(surface);
+
+    expect(result.spec).toEqual({ $type: "Markdown", value: "" });
+    expect(result.warnings).toEqual([
+      "A2UI function nesting cap of 32 was reached.",
+      "A2UI function evaluation budget of 20000 was reached.",
+    ]);
+  });
+
+  it("keeps an object with a call key and other fields as data", () => {
+    const surface = surfaceFrom([
+      {
+        id: "root",
+        component: "ContactCard",
+        phone: { call: "+1 555 0100", label: "Office" },
+      },
+    ]);
+
+    expect(
+      convertSurfaceToUISpec(surface, { keepUnknownComponents: true }),
+    ).toEqual({
+      spec: {
+        $type: "ContactCard",
+        phone: { call: "+1 555 0100", label: "Office" },
+      },
+      warnings: [],
+    });
+  });
+
+  it("leaves validation check calls outside value evaluation", () => {
+    const surface = surfaceFrom([
+      {
+        id: "root",
+        component: "TextField",
+        label: "Name",
+        checks: [{ call: "required", args: { value: { path: "/name" } } }],
+      },
+    ]);
+
+    expect(convertSurfaceToUISpec(surface)).toEqual({
+      spec: { $type: "Input", label: "Name" },
+      warnings: [],
+    });
+  });
+
+  it("preserves prototype-named action context fields", () => {
+    const context = JSON.parse(
+      '{"__proto__":{"admin":true},"literal":"kept"}',
+    ) as Record<string, unknown>;
+    const surface = surfaceFrom([
+      {
+        id: "root",
+        component: "Button",
+        label: "Run",
+        action: { name: "run", context },
+      },
+    ]);
+
+    const result = convertSurfaceToUISpec(surface);
+    const convertedContext = (result.spec as UIElement).$action
+      ?.context as Record<string, unknown>;
+
+    expect(Object.getPrototypeOf(convertedContext)).toBe(Object.prototype);
+    expect(Object.hasOwn(convertedContext, "__proto__")).toBe(true);
+    expect(convertedContext["__proto__"]).toEqual({ admin: true });
+    expect(JSON.stringify(convertedContext)).toBe(
+      '{"__proto__":{"admin":true},"literal":"kept"}',
+    );
+  });
+
+  it("does not read component fields through a prototype-named prop", () => {
+    const component = JSON.parse(
+      '{"id":"root","component":"Text","__proto__":{"text":"injected"}}',
+    ) as Record<string, unknown>;
+
+    expect(convertSurfaceToUISpec(surfaceFrom([component]))).toEqual({
+      spec: { $type: "Markdown" },
+      warnings: [],
+    });
+  });
+
+  it("expands template children relative to each bound item", () => {
+    const surface = surfaceFrom(
+      [
+        {
+          id: "root",
+          component: "List",
+          children: { componentId: "item", path: "/items" },
+        },
+        {
+          id: "item",
+          component: "Text",
+          text: { path: "name" },
+        },
+      ],
+      { items: [{ name: "one" }, { name: "two" }] },
+    );
+
+    expect(convertSurfaceToUISpec(surface)).toEqual({
+      spec: {
+        $type: "ListView",
+        children: [
+          {
+            $type: "ListViewItem",
+            children: { $type: "Markdown", value: "one" },
+          },
+          {
+            $type: "ListViewItem",
+            children: { $type: "Markdown", value: "two" },
+          },
+        ],
+      },
+      warnings: [],
+    });
+  });
+
+  it("keeps a Row or Column template in its own container", () => {
+    const surface = surfaceFrom(
+      [
+        { id: "root", component: "Column", children: ["days", "hours"] },
+        {
+          id: "days",
+          component: "Row",
+          justify: "spaceBetween",
+          children: { componentId: "day", path: "/days" },
+        },
+        {
+          id: "hours",
+          component: "Column",
+          align: "center",
+          children: { componentId: "day", path: "/hours" },
+        },
+        { id: "day", component: "Text", text: { path: "label" } },
+      ],
+      {
+        days: [{ label: "Tue" }, { label: "Wed" }],
+        hours: [{ label: "9am" }],
+      },
+    );
+
+    expect(convertSurfaceToUISpec(surface)).toEqual({
+      spec: {
+        $type: "Col",
+        children: [
+          {
+            $type: "Row",
+            justify: "spaceBetween",
+            children: [
+              { $type: "Markdown", value: "Tue" },
+              { $type: "Markdown", value: "Wed" },
+            ],
+          },
+          {
+            $type: "Col",
+            align: "center",
+            children: [{ $type: "Markdown", value: "9am" }],
+          },
+        ],
+      },
+      warnings: [],
+    });
+  });
+
+  it("expands a template on a component without a child list into a ListView", () => {
+    const surface = surfaceFrom(
+      [
+        {
+          id: "root",
+          component: "Divider",
+          children: { componentId: "item", path: "/items" },
+        },
+        { id: "item", component: "Text", text: { path: "name" } },
+      ],
+      { items: [{ name: "one" }] },
+    );
+
+    expect(convertSurfaceToUISpec(surface)).toEqual({
+      spec: {
+        $type: "ListView",
+        children: [
+          {
+            $type: "ListViewItem",
+            children: { $type: "Markdown", value: "one" },
+          },
+        ],
+      },
+      warnings: [],
+    });
+  });
+
+  it("reads template children wrapped in a template key", () => {
+    const surface = surfaceFrom(
+      [
+        {
+          id: "root",
+          component: "List",
+          children: { template: { componentId: "item", path: "/items" } },
+        },
+        { id: "item", component: "Text", text: { path: "name" } },
+      ],
+      { items: [{ name: "one" }] },
+    );
+
+    expect(convertSurfaceToUISpec(surface)).toEqual({
+      spec: {
+        $type: "ListView",
+        children: [
+          {
+            $type: "ListViewItem",
+            children: { $type: "Markdown", value: "one" },
+          },
+        ],
+      },
+      warnings: [],
+    });
+  });
+
+  it("preserves a horizontal list container when expanding templates", () => {
+    const surface = surfaceFrom(
+      [
+        {
+          id: "root",
+          component: "List",
+          direction: "horizontal",
+          align: "center",
+          children: { componentId: "item", path: "/items" },
+        },
+        { id: "item", component: "Text", text: { path: "label" } },
+      ],
+      { items: [{ label: "One" }, { label: "Two" }] },
+    );
+
+    expect(convertSurfaceToUISpec(surface)).toEqual({
+      spec: {
+        $type: "Row",
+        align: "center",
+        children: [
+          { $type: "Markdown", value: "One" },
+          { $type: "Markdown", value: "Two" },
+        ],
+      },
+      warnings: [],
+    });
+  });
+
+  it("counts only emitted template nodes", () => {
+    const components = (root: Record<string, unknown>) => [
+      root,
+      {
+        id: "item",
+        component: "Row",
+        children: Array.from({ length: 49 }, (_, index) => `divider-${index}`),
+      },
+      ...Array.from({ length: 49 }, (_, index) => ({
+        id: `divider-${index}`,
+        component: "Divider",
+      })),
+    ];
+    const dataModel = { items: Array.from({ length: 100 }, () => ({})) };
+    const results = [
+      convertSurfaceToUISpec(
+        surfaceFrom(
+          components({
+            id: "root",
+            component: "List",
+            direction: "horizontal",
+            children: { componentId: "item", path: "/items" },
           }),
           dataModel,
         ),
@@ -568,9 +1492,7 @@ describe("convertSurfaceToUISpec", () => {
           components({
             id: "root",
             component: "CustomList",
-            children: {
-              template: { componentId: "item", path: "/items" },
-            },
+            children: { componentId: "item", path: "/items" },
           }),
           dataModel,
         ),
@@ -588,93 +1510,526 @@ describe("convertSurfaceToUISpec", () => {
     }
   });
 
-  it("caps template expansion at 100 items", () => {
+  it("caps template expansion at 100 items", () => {
+    const surface = surfaceFrom(
+      [
+        {
+          id: "root",
+          component: "Column",
+          children: { componentId: "item", path: "/items" },
+        },
+        {
+          id: "item",
+          component: "Text",
+          text: { path: "/" },
+        },
+      ],
+      { items: Array.from({ length: 101 }, (_, index) => `item-${index}`) },
+    );
+
+    const result = convertSurfaceToUISpec(surface);
+    expect((result.spec as UIElement).children).toHaveLength(100);
+    expect(result.warnings).toContain(
+      "A2UI template expansion was capped at 100 items.",
+    );
+  });
+
+  it("follows single child references and event actions", () => {
+    const surface = surfaceFrom(
+      [
+        { id: "root", component: "Card", child: "column" },
+        {
+          id: "column",
+          component: "Column",
+          children: ["submit", "close"],
+        },
+        {
+          id: "submit",
+          component: "Button",
+          child: "submit-text",
+          action: {
+            event: {
+              name: "submit",
+              context: { carrier: { path: "/carrier" } },
+            },
+          },
+        },
+        { id: "submit-text", component: "Text", text: { path: "/label" } },
+        {
+          id: "close",
+          component: "Button",
+          child: "close-icon",
+          action: { event: { name: "close" } },
+        },
+        { id: "close-icon", component: "Icon", name: "x" },
+      ],
+      { carrier: ["dhl"], label: "Create label" },
+    );
+
+    expect(convertSurfaceToUISpec(surface)).toEqual({
+      spec: {
+        $type: "Card",
+        children: [
+          {
+            $type: "Col",
+            children: [
+              {
+                $type: "Button",
+                label: "Create label",
+                $action: {
+                  type: "a2ui:action",
+                  name: "submit",
+                  surfaceId: "",
+                  sourceComponentId: "submit",
+                  context: { carrier: ["dhl"] },
+                },
+              },
+              {
+                $type: "Button",
+                $action: {
+                  type: "a2ui:action",
+                  name: "close",
+                  surfaceId: "",
+                  sourceComponentId: "close",
+                },
+                children: [{ $type: "Icon", name: "x" }],
+              },
+            ],
+          },
+        ],
+      },
+      warnings: [],
+    });
+  });
+
+  it("carries an event's userMessage when it resolves to a string", () => {
+    const surface = surfaceFrom(
+      [
+        { id: "root", component: "Row", children: ["greet", "count"] },
+        {
+          id: "greet",
+          component: "Button",
+          label: "Greet",
+          action: {
+            event: {
+              name: "greet",
+              userMessage: {
+                call: "formatString",
+                args: { value: "Greet ${/name}" },
+              },
+            },
+          },
+        },
+        {
+          id: "count",
+          component: "Button",
+          label: "Count",
+          action: { event: { name: "count", userMessage: { path: "/count" } } },
+        },
+      ],
+      { name: "Ada", count: 3 },
+    );
+
+    expect(convertSurfaceToUISpec(surface)).toEqual({
+      spec: {
+        $type: "Row",
+        children: [
+          {
+            $type: "Button",
+            label: "Greet",
+            $action: {
+              type: "a2ui:action",
+              name: "greet",
+              surfaceId: "",
+              sourceComponentId: "greet",
+              userMessage: "Greet Ada",
+            },
+          },
+          {
+            $type: "Button",
+            label: "Count",
+            $action: {
+              type: "a2ui:action",
+              name: "count",
+              surfaceId: "",
+              sourceComponentId: "count",
+            },
+          },
+        ],
+      },
+      warnings: [],
+    });
+  });
+
+  it("points a userMessage only at a lone text input bound to its exact path", () => {
+    const surface = surfaceFrom(
+      [
+        {
+          id: "root",
+          component: "Column",
+          children: [
+            "email",
+            "volume",
+            "note",
+            "qty",
+            "qty-level",
+            "form",
+            "level",
+            "draft",
+            "copy",
+          ],
+        },
+        { id: "email", component: "TextField", value: { path: "/form/email" } },
+        {
+          id: "volume",
+          component: "Slider",
+          max: 10,
+          value: { path: "/volume" },
+        },
+        { id: "note", component: "TextField", value: { path: "/note" } },
+        { id: "qty", component: "TextField", value: { path: "/qty" } },
+        {
+          id: "qty-level",
+          component: "Slider",
+          max: 10,
+          value: { path: "/qty" },
+        },
+        {
+          id: "form",
+          component: "Button",
+          label: "Form",
+          action: { event: { name: "form", userMessage: { path: "/form" } } },
+        },
+        {
+          id: "level",
+          component: "Button",
+          label: "Level",
+          action: {
+            event: { name: "level", userMessage: { path: "/volume" } },
+          },
+        },
+        {
+          id: "draft",
+          component: "Button",
+          label: "Draft",
+          action: { event: { name: "draft", userMessage: { path: "/note" } } },
+        },
+        {
+          id: "copy",
+          component: "Button",
+          label: "Copy",
+          action: { event: { name: "copy", userMessage: { path: "/qty" } } },
+        },
+      ],
+      { form: { email: "ada@example.com" }, volume: 4, qty: "2" },
+    );
+
+    const { spec, warnings } = convertSurfaceToUISpec(surface);
+
+    expect(warnings).toEqual([]);
+    expect(spec?.["children"]).toContainEqual({
+      $type: "Button",
+      label: "Form",
+      $action: {
+        type: "a2ui:action",
+        name: "form",
+        surfaceId: "",
+        sourceComponentId: "form",
+      },
+    });
+    expect(spec?.["children"]).toContainEqual({
+      $type: "Button",
+      label: "Level",
+      $action: {
+        type: "a2ui:action",
+        name: "level",
+        surfaceId: "",
+        sourceComponentId: "level",
+      },
+    });
+    expect(spec?.["children"]).toContainEqual({
+      $type: "Button",
+      label: "Draft",
+      $action: {
+        type: "a2ui:action",
+        name: "draft",
+        surfaceId: "",
+        sourceComponentId: "draft",
+        userMessage: { $field: "/note" },
+      },
+    });
+    expect(spec?.["children"]).toContainEqual({
+      $type: "Button",
+      label: "Copy",
+      $action: {
+        type: "a2ui:action",
+        name: "copy",
+        surfaceId: "",
+        sourceComponentId: "copy",
+        userMessage: "2",
+      },
+    });
+  });
+
+  it("takes a button label only from a Text child and keeps action data as bound", () => {
+    const surface = surfaceFrom(
+      [
+        {
+          id: "root",
+          component: "Column",
+          children: ["custom-label", "bound-context"],
+        },
+        { id: "custom-label", component: "Button", child: "note" },
+        { id: "note", component: "Markdown", value: "Read me", tone: "loud" },
+        {
+          id: "bound-context",
+          component: "Button",
+          label: "Go",
+          action: {
+            event: { name: "go", context: { target: { path: "/target" } } },
+          },
+        },
+      ],
+      { target: { path: "/secret" }, secret: "hidden" },
+    );
+
+    expect(
+      convertSurfaceToUISpec(surface, { keepUnknownComponents: true }),
+    ).toEqual({
+      spec: {
+        $type: "Col",
+        children: [
+          {
+            $type: "Button",
+            children: [{ $type: "Markdown", value: "Read me", tone: "loud" }],
+          },
+          {
+            $type: "Button",
+            label: "Go",
+            $action: {
+              type: "a2ui:action",
+              name: "go",
+              surfaceId: "",
+              sourceComponentId: "bound-context",
+              context: { target: { path: "/secret" } },
+            },
+          },
+        ],
+      },
+      warnings: [],
+    });
+  });
+
+  it("points action context bound to an input at that input, so it resolves when the action fires", () => {
     const surface = surfaceFrom(
       [
         {
           id: "root",
           component: "Column",
-          children: {
-            template: { componentId: "item", path: "/items" },
-          },
+          children: ["name", "plan", "size", "agree", "start", "due", "send"],
         },
         {
-          id: "item",
-          component: "Text",
-          text: { path: "/" },
+          id: "name",
+          component: "TextField",
+          label: "Name",
+          value: { path: "/form/name" },
+        },
+        {
+          id: "plan",
+          component: "ChoicePicker",
+          options: [{ label: "Pro", value: "pro" }],
+          value: { path: "/form/plan" },
+        },
+        {
+          id: "size",
+          component: "ChoicePicker",
+          displayStyle: "chips",
+          options: [{ label: "Medium", value: "m" }],
+          value: { path: "/form/size" },
+        },
+        {
+          id: "agree",
+          component: "CheckBox",
+          label: "Agree",
+          value: { path: "/form/agree" },
+        },
+        {
+          id: "start",
+          component: "DateTimeInput",
+          value: { path: "/form/start" },
+        },
+        {
+          id: "due",
+          component: "DateTimeInput",
+          value: { path: "/form/due" },
+        },
+        {
+          id: "send",
+          component: "Button",
+          label: "Send",
+          action: {
+            event: {
+              name: "send",
+              context: {
+                name: { path: "/form/name" },
+                form: { path: "/form" },
+                owner: { path: "/owner" },
+                literal: "kept",
+              },
+            },
+          },
         },
       ],
-      { items: Array.from({ length: 101 }, (_, index) => `item-${index}`) },
+      {
+        form: {
+          name: "Ada",
+          plan: ["pro"],
+          size: "m",
+          agree: false,
+          start: "2026-01-02",
+          due: "2025-12-15T17:00:00Z",
+          id: 7,
+        },
+        owner: "u1",
+      },
     );
 
-    const result = convertSurfaceToUISpec(surface);
-    expect((result.spec as UIElement).children).toHaveLength(100);
-    expect(result.warnings).toContain(
-      "A2UI template expansion was capped at 100 items.",
-    );
+    const { spec, warnings } = convertSurfaceToUISpec(surface);
+
+    expect(warnings).toEqual([]);
+    expect(spec?.["children"]).toContainEqual({
+      $type: "Button",
+      label: "Send",
+      $action: {
+        type: "a2ui:action",
+        name: "send",
+        surfaceId: "",
+        sourceComponentId: "send",
+        context: {
+          name: { $field: "/form/name", fallback: "Ada" },
+          form: {
+            name: { $field: "/form/name", fallback: "Ada" },
+            plan: [{ $field: "/form/plan", fallback: "pro" }],
+            size: { $field: "/form/size", fallback: "m" },
+            agree: { $field: "/form/agree", fallback: false },
+            start: { $field: "/form/start", fallback: "2026-01-02" },
+            due: { $field: "/form/due", fallback: "2025-12-15T17:00:00Z" },
+            id: 7,
+          },
+          owner: "u1",
+          literal: "kept",
+        },
+      },
+    });
+    expect(surface.dataModel).toEqual({
+      form: {
+        name: "Ada",
+        plan: ["pro"],
+        size: "m",
+        agree: false,
+        start: "2026-01-02",
+        due: "2025-12-15T17:00:00Z",
+        id: 7,
+      },
+      owner: "u1",
+    });
   });
 
-  it("follows single child references and event actions", () => {
+  it("names an input inside a template item by the item's path", () => {
     const surface = surfaceFrom(
       [
-        { id: "root", component: "Card", child: "column" },
+        { id: "root", component: "Column", children: ["lines", "order"] },
         {
-          id: "column",
-          component: "Column",
-          children: ["submit", "close"],
+          id: "lines",
+          component: "List",
+          children: { componentId: "line", path: "/items" },
         },
+        { id: "line", component: "Row", children: ["qty", "remove"] },
         {
-          id: "submit",
+          id: "qty",
+          component: "TextField",
+          label: "Quantity",
+          value: { path: "qty" },
+        },
+        {
+          id: "remove",
           component: "Button",
-          child: "submit-text",
+          label: "Remove",
           action: {
             event: {
-              name: "submit",
-              context: { carrier: { path: "/carrier" } },
+              name: "remove",
+              context: { qty: { path: "qty" }, sku: { path: "sku" } },
             },
           },
         },
-        { id: "submit-text", component: "Text", text: { path: "/label" } },
         {
-          id: "close",
+          id: "order",
           component: "Button",
-          child: "close-icon",
-          action: { event: { name: "close" } },
+          label: "Order",
+          action: {
+            event: { name: "order", context: { items: { path: "/items" } } },
+          },
         },
-        { id: "close-icon", component: "Icon", name: "x" },
       ],
-      { carrier: ["dhl"], label: "Create label" },
+      {
+        items: [
+          { sku: "a", qty: 1 },
+          { sku: "b", qty: 2 },
+        ],
+      },
     );
 
+    const line = (index: number, sku: string, qty: string) => ({
+      $type: "ListViewItem",
+      children: {
+        $type: "Row",
+        children: [
+          {
+            $type: "Input",
+            label: "Quantity",
+            name: `/items/${index}/qty`,
+            defaultValue: qty,
+          },
+          {
+            $type: "Button",
+            label: "Remove",
+            $action: {
+              type: "a2ui:action",
+              name: "remove",
+              surfaceId: "",
+              sourceComponentId: "remove",
+              context: {
+                qty: { $field: `/items/${index}/qty`, fallback: Number(qty) },
+                sku,
+              },
+            },
+          },
+        ],
+      },
+    });
     expect(convertSurfaceToUISpec(surface)).toEqual({
       spec: {
-        $type: "Card",
+        $type: "Col",
         children: [
           {
-            $type: "Col",
-            children: [
-              {
-                $type: "Button",
-                label: "Create label",
-                $action: {
-                  type: "a2ui:action",
-                  name: "submit",
-                  surfaceId: "",
-                  sourceComponentId: "submit",
-                  context: { carrier: ["dhl"] },
-                },
-              },
-              {
-                $type: "Button",
-                $action: {
-                  type: "a2ui:action",
-                  name: "close",
-                  surfaceId: "",
-                  sourceComponentId: "close",
-                },
-                children: [{ $type: "Icon", name: "x" }],
+            $type: "ListView",
+            children: [line(0, "a", "1"), line(1, "b", "2")],
+          },
+          {
+            $type: "Button",
+            label: "Order",
+            $action: {
+              type: "a2ui:action",
+              name: "order",
+              surfaceId: "",
+              sourceComponentId: "order",
+              context: {
+                items: [
+                  { sku: "a", qty: { $field: "/items/0/qty", fallback: 1 } },
+                  { sku: "b", qty: { $field: "/items/1/qty", fallback: 2 } },
+                ],
               },
-            ],
+            },
           },
         ],
       },
@@ -682,47 +2037,121 @@ describe("convertSurfaceToUISpec", () => {
     });
   });
 
-  it("takes a button label only from a Text child and keeps action data as bound", () => {
+  it("grows a bound list for a field reference the way the data model grows", () => {
     const surface = surfaceFrom(
       [
         {
           id: "root",
           component: "Column",
-          children: ["custom-label", "bound-context"],
+          children: ["far", "next", "row", "cleared", "send"],
         },
-        { id: "custom-label", component: "Button", child: "note" },
-        { id: "note", component: "Markdown", value: "Read me", tone: "loud" },
         {
-          id: "bound-context",
+          id: "far",
+          component: "TextField",
+          value: { path: "/items/999999999/name" },
+        },
+        {
+          id: "next",
+          component: "TextField",
+          value: { path: "/items/0/name" },
+        },
+        { id: "row", component: "TextField", value: { path: "/rows/0/name" } },
+        {
+          id: "cleared",
+          component: "TextField",
+          value: { path: "/cleared/0/name" },
+        },
+        {
+          id: "send",
           component: "Button",
-          label: "Go",
+          label: "Send",
           action: {
-            event: { name: "go", context: { target: { path: "/target" } } },
+            event: {
+              name: "send",
+              context: {
+                items: { path: "/items" },
+                rows: { path: "/rows" },
+                cleared: { path: "/cleared" },
+              },
+            },
           },
         },
       ],
-      { target: { path: "/secret" }, secret: "hidden" },
+      { items: [], cleared: null },
     );
 
-    expect(
-      convertSurfaceToUISpec(surface, { keepUnknownComponents: true }),
-    ).toEqual({
+    expect(convertSurfaceToUISpec(surface).spec?.["children"]).toContainEqual({
+      $type: "Button",
+      label: "Send",
+      $action: {
+        type: "a2ui:action",
+        name: "send",
+        surfaceId: "",
+        sourceComponentId: "send",
+        context: {
+          items: [{ name: { $field: "/items/0/name" } }],
+          rows: [{ name: { $field: "/rows/0/name" } }],
+          cleared: [{ name: { $field: "/cleared/0/name" } }],
+        },
+      },
+    });
+  });
+
+  it("points function call arguments and paths the data model does not hold yet at their inputs", () => {
+    const surface = surfaceFrom([
+      { id: "root", component: "Column", children: ["link", "open", "save"] },
+      {
+        id: "link",
+        component: "TextField",
+        label: "Link",
+        value: { path: "/draft/link" },
+      },
+      {
+        id: "open",
+        component: "Button",
+        label: "Open",
+        action: {
+          functionCall: {
+            call: "openUrl",
+            args: { url: { path: "/draft/link" } },
+          },
+        },
+      },
+      {
+        id: "save",
+        component: "Button",
+        label: "Save",
+        action: {
+          event: { name: "save", context: { draft: { path: "/draft" } } },
+        },
+      },
+    ]);
+
+    expect(convertSurfaceToUISpec(surface)).toEqual({
       spec: {
         $type: "Col",
         children: [
+          { $type: "Input", label: "Link", name: "/draft/link" },
           {
             $type: "Button",
-            children: [{ $type: "Markdown", value: "Read me", tone: "loud" }],
+            label: "Open",
+            $action: {
+              type: "a2ui:functionCall",
+              call: "openUrl",
+              surfaceId: "",
+              sourceComponentId: "open",
+              args: { url: { $field: "/draft/link" } },
+            },
           },
           {
             $type: "Button",
-            label: "Go",
+            label: "Save",
             $action: {
               type: "a2ui:action",
-              name: "go",
+              name: "save",
               surfaceId: "",
-              sourceComponentId: "bound-context",
-              context: { target: { path: "/secret" } },
+              sourceComponentId: "save",
+              context: { draft: { link: { $field: "/draft/link" } } },
             },
           },
         ],
@@ -731,6 +2160,117 @@ describe("convertSurfaceToUISpec", () => {
     });
   });
 
+  it("maps button and text field variants", () => {
+    const surface = surfaceFrom(
+      [
+        {
+          id: "root",
+          component: "Column",
+          children: ["save", "skip", "plain", "styled", "notes", "code"],
+        },
+        { id: "save", component: "Button", label: "Save", variant: "primary" },
+        {
+          id: "skip",
+          component: "Button",
+          label: "Skip",
+          variant: "borderless",
+        },
+        { id: "plain", component: "Button", label: "Back", variant: "default" },
+        {
+          id: "styled",
+          component: "Button",
+          label: "Delete",
+          variant: "primary",
+          buttonStyle: "danger",
+        },
+        {
+          id: "notes",
+          component: "TextField",
+          label: "Notes",
+          variant: "longText",
+          value: { path: "/notes" },
+        },
+        {
+          id: "code",
+          component: "TextField",
+          label: "Code",
+          variant: "shortText",
+          value: { path: "/code" },
+        },
+      ],
+      { notes: "", code: "" },
+    );
+
+    expect(convertSurfaceToUISpec(surface)).toEqual({
+      spec: {
+        $type: "Col",
+        children: [
+          { $type: "Button", label: "Save", buttonStyle: "primary" },
+          { $type: "Button", label: "Skip", buttonStyle: "ghost" },
+          { $type: "Button", label: "Back" },
+          { $type: "Button", label: "Delete", buttonStyle: "danger" },
+          {
+            $type: "Input",
+            multiline: true,
+            label: "Notes",
+            name: "/notes",
+            defaultValue: "",
+          },
+          { $type: "Input", label: "Code", name: "/code", defaultValue: "" },
+        ],
+      },
+      warnings: [],
+    });
+  });
+
+  it("maps function call actions and warns about an action it cannot read", () => {
+    const surface = surfaceFrom(
+      [
+        { id: "root", component: "Column", children: ["docs", "broken"] },
+        {
+          id: "docs",
+          component: "Button",
+          child: "docs-text",
+          action: {
+            functionCall: {
+              call: "openUrl",
+              args: { url: { path: "/docsUrl" } },
+            },
+          },
+        },
+        { id: "docs-text", component: "Text", text: "Docs" },
+        {
+          id: "broken",
+          component: "Button",
+          label: "Broken",
+          action: { functionCall: { args: { url: "https://a2ui.org" } } },
+        },
+      ],
+      { docsUrl: "https://a2ui.org" },
+    );
+
+    expect(convertSurfaceToUISpec(surface)).toEqual({
+      spec: {
+        $type: "Col",
+        children: [
+          {
+            $type: "Button",
+            label: "Docs",
+            $action: {
+              type: "a2ui:functionCall",
+              call: "openUrl",
+              surfaceId: "",
+              sourceComponentId: "docs",
+              args: { url: "https://a2ui.org" },
+            },
+          },
+          { $type: "Button", label: "Broken" },
+        ],
+      },
+      warnings: ['Component "broken" has a malformed action.'],
+    });
+  });
+
   it("warns about a child reference it cannot follow", () => {
     const surface = surfaceFrom([
       { id: "root", component: "Column", children: ["missing", "malformed"] },
@@ -998,11 +2538,9 @@ describe("convertSurfaceToUISpec", () => {
           $action: { type: "injected" },
           $key: "injected",
           $status: "injected",
-          children: {
-            template: { componentId: "item", path: "/items" },
-          },
+          children: { componentId: "item", path: "/items" },
         },
-        { id: "item", component: "Text", text: { path: "/label" } },
+        { id: "item", component: "Text", text: { path: "label" } },
       ],
       { items: [{ label: "One" }] },
     );
@@ -1031,11 +2569,9 @@ describe("convertSurfaceToUISpec", () => {
         {
           id: "root",
           component: "CustomList",
-          children: {
-            template: { componentId: "item", path: "/items" },
-          },
+          children: { componentId: "item", path: "/items" },
         },
-        { id: "item", component: "Text", text: { path: "/label" } },
+        { id: "item", component: "Text", text: { path: "label" } },
       ],
       { items: [{ label: "One" }] },
     );
@@ -1061,11 +2597,9 @@ describe("convertSurfaceToUISpec", () => {
           id: "root",
           component: "CustomList",
           title: { path: "/title" },
-          children: {
-            template: { componentId: "item", path: "/items" },
-          },
+          children: { componentId: "item", path: "/items" },
         },
-        { id: "item", component: "Text", text: { path: "/label" } },
+        { id: "item", component: "Text", text: { path: "label" } },
       ],
       { title: "Tasks", items: [{ label: "One" }, { label: "Two" }] },
     );
@@ -1096,3 +2630,85 @@ describe("convertSurfaceToUISpec", () => {
     });
   });
 });
+
+it("keeps live controls internal and action-free while plain conversion stays uncontrolled", () => {
+  const surface = applyA2uiOperations(new Map(), [
+    {
+      version: "v1.0",
+      createSurface: {
+        surfaceId: "main",
+        components: [
+          {
+            id: "root",
+            component: "Column",
+            children: ["field", "pick", "slider"],
+          },
+          { id: "field", component: "TextField", text: { path: "/name" } },
+          {
+            id: "pick",
+            component: "ChoicePicker",
+            value: { path: "/choices" },
+            options: [{ label: "A", value: "a" }],
+          },
+          {
+            id: "slider",
+            component: "Slider",
+            value: { path: "/count" },
+            min: 0,
+            max: 10,
+          },
+        ],
+        dataModel: { name: "Ada", choices: ["a"], count: 2 },
+      },
+    },
+  ]).state.get("main")!;
+  expect(convertSurfaceToUISpec(surface).spec).toMatchObject({
+    children: [
+      { $type: "Input", defaultValue: "Ada" },
+      { $type: "RadioGroup", defaultValue: "a" },
+      { $type: "Slider", defaultValue: 2 },
+    ],
+  });
+  const convert = createLiveSurfaceConverter(surface);
+  const live = convert(surface.dataModel);
+  expect(live.spec).toEqual({
+    $type: "Col",
+    children: [
+      {
+        $type: "Input",
+        value: "Ada",
+        name: "/name",
+      },
+      {
+        $type: "RadioGroup",
+        value: "a",
+        name: "/choices",
+        options: [{ label: "A", value: "a" }],
+      },
+      {
+        $type: "Slider",
+        value: 2,
+        name: "/count",
+        min: 0,
+        max: 10,
+        step: 0.1,
+      },
+    ],
+  });
+  expect(live.bindings).toEqual(
+    new Map([
+      ["/name", { value: "Ada", arrayValue: false }],
+      ["/choices", { value: "a", arrayValue: true }],
+      ["/count", { value: 2, arrayValue: false }],
+    ]),
+  );
+  const updated = convert({ name: "Grace", choices: ["a"], count: 2 });
+  expect((updated.spec!.children as UIElement[])[0]).toEqual({
+    $type: "Input",
+    name: "/name",
+    value: "Grace",
+  });
+  expect((updated.spec!.children as UIElement[])[2]).toBe(
+    (live.spec!.children as UIElement[])[2],
+  );
+});