@agent-native/core 0.120.0 → 0.120.2

package/corpus/templates/forms/app/components/builder/FieldPropertiesPanel.tsx

@@ -1,5 +1,5 @@
 import { useT } from "@agent-native/core/client/i18n";
-import type { FormField, FormFieldType } from "@shared/types";
+import type { ConditionalRule, FormField, FormFieldType } from "@shared/types";
 import { IconPlus, IconX } from "@tabler/icons-react";
 import { useState } from "react";
 
@@ -19,6 +19,7 @@ import { Textarea } from "@/components/ui/textarea";
 
 interface FieldPropertiesPanelProps {
   field: FormField;
+  fields: FormField[];
   onChange: (field: FormField) => void;
   onDelete: () => void;
 }
@@ -39,13 +40,48 @@ const fieldTypeLabels: Record<FormFieldType, string> = {
 
 const hasOptions: FormFieldType[] = ["select", "multiselect", "radio"];
 
+function conditionValueOptions(source: FormField | undefined): string[] {
+  if (!source) return [];
+  if (hasOptions.includes(source.type)) {
+    return (source.options || []).filter(
+      (option, index, options) =>
+        Boolean(option.trim()) && options.indexOf(option) === index,
+    );
+  }
+  if (source.type === "checkbox") return ["true", "false"];
+  if (source.type === "rating") return ["1", "2", "3", "4", "5"];
+  return [];
+}
+
+function defaultConditionOperator(
+  source: FormField,
+): ConditionalRule["operator"] {
+  return source.type === "multiselect" ? "contains" : "equals";
+}
+
 export function FieldPropertiesPanel({
   field,
+  fields,
   onChange,
   onDelete,
 }: FieldPropertiesPanelProps) {
   const t = useT();
   const [newOption, setNewOption] = useState("");
+  const fieldIndex = fields.findIndex((candidate) => candidate.id === field.id);
+  const availableFields =
+    fieldIndex >= 0
+      ? fields.slice(0, fieldIndex)
+      : fields.filter((candidate) => candidate.id !== field.id);
+  const conditionSource =
+    availableFields.find(
+      (candidate) => candidate.id === field.conditional?.fieldId,
+    ) || availableFields[0];
+  const conditionOptions = conditionValueOptions(conditionSource);
+  const conditionFieldId = conditionSource?.id || "";
+  const conditionOperator =
+    field.conditional?.operator ||
+    (conditionSource ? defaultConditionOperator(conditionSource) : "equals");
+  const conditionValue = field.conditional?.value || conditionOptions[0] || "";
 
   function update(partial: Partial<FormField>) {
     onChange({ ...field, ...partial });
@@ -161,6 +197,168 @@ export function FieldPropertiesPanel({
           </Select>
         </div>
 
+        {availableFields.length > 0 && (
+          <>
+            <Separator />
+            <div className="space-y-3">
+              <div className="flex items-start justify-between gap-3">
+                <div className="space-y-0.5">
+                  <Label className="text-xs">
+                    {t("fieldProperties.conditionalVisibility")}
+                  </Label>
+                  <p className="text-[11px] leading-snug text-muted-foreground">
+                    {t("fieldProperties.conditionalVisibilityDescription")}
+                  </p>
+                </div>
+                <Switch
+                  checked={Boolean(field.conditional)}
+                  onCheckedChange={(checked) => {
+                    if (!checked) {
+                      update({ conditional: undefined });
+                      return;
+                    }
+                    if (!conditionSource) return;
+                    update({
+                      conditional: {
+                        fieldId: conditionSource.id,
+                        operator: defaultConditionOperator(conditionSource),
+                        value: conditionOptions[0] || "",
+                      },
+                    });
+                  }}
+                />
+              </div>
+
+              {field.conditional && conditionSource && (
+                <div className="space-y-2 rounded-md border border-border/70 bg-muted/20 p-2.5">
+                  <div className="space-y-1.5">
+                    <Label className="text-xs">
+                      {t("fieldProperties.conditionField")}
+                    </Label>
+                    <Select
+                      value={conditionFieldId}
+                      onValueChange={(value) => {
+                        const nextSource = availableFields.find(
+                          (candidate) => candidate.id === value,
+                        );
+                        if (!nextSource) return;
+                        const nextOptions = conditionValueOptions(nextSource);
+                        update({
+                          conditional: {
+                            fieldId: nextSource.id,
+                            operator: defaultConditionOperator(nextSource),
+                            value: nextOptions[0] || "",
+                          },
+                        });
+                      }}
+                    >
+                      <SelectTrigger className="h-8 text-xs">
+                        <SelectValue />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {availableFields.map((candidate) => (
+                          <SelectItem
+                            key={candidate.id}
+                            value={candidate.id}
+                            className="text-xs"
+                          >
+                            {candidate.label || candidate.id}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                  </div>
+
+                  <div className="space-y-1.5">
+                    <Label className="text-xs">
+                      {t("fieldProperties.conditionOperator")}
+                    </Label>
+                    <Select
+                      value={conditionOperator}
+                      onValueChange={(value) =>
+                        update({
+                          conditional: {
+                            fieldId: conditionFieldId,
+                            operator: value as ConditionalRule["operator"],
+                            value: conditionValue,
+                          },
+                        })
+                      }
+                    >
+                      <SelectTrigger className="h-8 text-xs">
+                        <SelectValue />
+                      </SelectTrigger>
+                      <SelectContent>
+                        <SelectItem value="equals" className="text-xs">
+                          {t("fieldProperties.conditionEquals")}
+                        </SelectItem>
+                        <SelectItem value="not_equals" className="text-xs">
+                          {t("fieldProperties.conditionNotEquals")}
+                        </SelectItem>
+                        <SelectItem value="contains" className="text-xs">
+                          {t("fieldProperties.conditionContains")}
+                        </SelectItem>
+                      </SelectContent>
+                    </Select>
+                  </div>
+
+                  <div className="space-y-1.5">
+                    <Label className="text-xs">
+                      {t("fieldProperties.conditionValue")}
+                    </Label>
+                    {conditionOptions.length > 0 ? (
+                      <Select
+                        value={conditionValue}
+                        onValueChange={(value) =>
+                          update({
+                            conditional: {
+                              fieldId: conditionFieldId,
+                              operator: conditionOperator,
+                              value,
+                            },
+                          })
+                        }
+                      >
+                        <SelectTrigger className="h-8 text-xs">
+                          <SelectValue />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {conditionOptions.map((option) => (
+                            <SelectItem
+                              key={option}
+                              value={option}
+                              className="text-xs"
+                            >
+                              {option}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                    ) : (
+                      <Input
+                        value={conditionValue}
+                        onChange={(event) =>
+                          update({
+                            conditional: {
+                              fieldId: conditionFieldId,
+                              operator: conditionOperator,
+                              value: event.target.value,
+                            },
+                          })
+                        }
+                        placeholder={t(
+                          "fieldProperties.conditionValuePlaceholder",
+                        )}
+                        className="h-8 text-xs"
+                      />
+                    )}
+                  </div>
+                </div>
+              )}
+            </div>
+          </>
+        )}
+
         {/* Options (for select/radio/multiselect) */}
         {hasOptions.includes(field.type) && (
           <>

package/corpus/templates/forms/app/components/layout/Sidebar.tsx

@@ -5,7 +5,6 @@ import {
 } from "@agent-native/core/client/agent-chat";
 import { appPath } from "@agent-native/core/client/api-path";
 import { DevDatabaseLink } from "@agent-native/core/client/db-admin";
-import { ExtensionsSidebarSection } from "@agent-native/core/client/extensions";
 import { useT } from "@agent-native/core/client/i18n";
 import { OrgSwitcher } from "@agent-native/core/client/org";
 import { FeedbackButton } from "@agent-native/core/client/ui";
@@ -277,45 +276,47 @@ export function Sidebar() {
             {newFormPopover}
           </Popover>
 
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <Link
-                to="/agent"
-                aria-label={t("navigation.agent")}
-                className={cn(
-                  "forms-sidebar-nav-item flex size-10 items-center justify-center rounded-lg active:scale-[0.96] transition-[background-color,box-shadow,color,transform]",
-                  location.pathname.startsWith("/agent")
-                    ? "bg-accent text-accent-foreground"
-                    : "text-muted-foreground hover:bg-accent/50 hover:text-foreground",
-                )}
-              >
-                <IconHierarchy2 className="h-4 w-4" />
-              </Link>
-            </TooltipTrigger>
-            <TooltipContent side="right">
-              {t("navigation.agent")}
-            </TooltipContent>
-          </Tooltip>
+          <div className="mt-auto flex flex-col items-center gap-1">
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <Link
+                  to="/agent"
+                  aria-label={t("settings.agentTitle")}
+                  className={cn(
+                    "forms-sidebar-nav-item flex size-10 items-center justify-center rounded-lg active:scale-[0.96] transition-[background-color,box-shadow,color,transform]",
+                    location.pathname.startsWith("/agent")
+                      ? "bg-accent text-accent-foreground"
+                      : "text-muted-foreground hover:bg-accent/50 hover:text-foreground",
+                  )}
+                >
+                  <IconHierarchy2 className="h-4 w-4" />
+                </Link>
+              </TooltipTrigger>
+              <TooltipContent side="right">
+                {t("settings.agentTitle")}
+              </TooltipContent>
+            </Tooltip>
 
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <Link
-                to="/settings"
-                aria-label={t("navigation.settings")}
-                className={cn(
-                  "forms-sidebar-nav-item flex size-10 items-center justify-center rounded-lg active:scale-[0.96] transition-[background-color,box-shadow,color,transform]",
-                  location.pathname === "/settings"
-                    ? "bg-accent text-accent-foreground"
-                    : "text-muted-foreground hover:bg-accent/50 hover:text-foreground",
-                )}
-              >
-                <IconSettings className="h-4 w-4" />
-              </Link>
-            </TooltipTrigger>
-            <TooltipContent side="right">
-              {t("navigation.settings")}
-            </TooltipContent>
-          </Tooltip>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <Link
+                  to="/settings"
+                  aria-label={t("navigation.settings")}
+                  className={cn(
+                    "forms-sidebar-nav-item flex size-10 items-center justify-center rounded-lg active:scale-[0.96] transition-[background-color,box-shadow,color,transform]",
+                    location.pathname === "/settings"
+                      ? "bg-accent text-accent-foreground"
+                      : "text-muted-foreground hover:bg-accent/50 hover:text-foreground",
+                  )}
+                >
+                  <IconSettings className="h-4 w-4" />
+                </Link>
+              </TooltipTrigger>
+              <TooltipContent side="right">
+                {t("navigation.settings")}
+              </TooltipContent>
+            </Tooltip>
+          </div>
         </nav>
       </TooltipProvider>
     </div>
@@ -446,7 +447,7 @@ export function Sidebar() {
           )}
         >
           <IconHierarchy2 size={14} className="shrink-0" />
-          <span>{t("navigation.agent")}</span>
+          <span>{t("settings.agentTitle")}</span>
         </Link>
 
         <Link
@@ -464,11 +465,6 @@ export function Sidebar() {
         </Link>
       </div>
 
-      {/* Tools */}
-      <div className="shrink-0 px-1.5 py-1.5">
-        <ExtensionsSidebarSection />
-      </div>
-
       {/* Footer */}
       <div className="shrink-0 space-y-2 px-3 py-2">
         <OrgSwitcher />

package/corpus/templates/forms/app/i18n/en-US.ts

@@ -88,6 +88,16 @@ const messages = {
     addOption: "Add option",
     min: "Min",
     max: "Max",
+    conditionalVisibility: "Conditional visibility",
+    conditionalVisibilityDescription:
+      "Only show this field when an earlier answer matches.",
+    conditionField: "Earlier answer",
+    conditionOperator: "Condition",
+    conditionEquals: "is",
+    conditionNotEquals: "is not",
+    conditionContains: "contains",
+    conditionValue: "Answer",
+    conditionValuePlaceholder: "Enter an answer...",
     fieldTypes: {
       text: "Short Text",
       email: "Email",
@@ -144,6 +154,7 @@ const messages = {
     integrationsTab: "Integrations",
     settingsSaved: "Settings saved",
     integrationsSaved: "Integrations saved",
+    saveFailed: "Failed to save changes",
     formTitlePlaceholder: "Form Title",
     addDescriptionPlaceholder: "Add a description...",
     dragToReorder: "Drag to reorder",
@@ -210,7 +221,8 @@ const messages = {
         "Sends a JSON POST with submission data. Works with Zapier, Make, n8n, etc.",
       googleSheetsBlurb:
         "Mirror every response into a spreadsheet your team can share.",
-      googleSheetsHelp: "Deploy an Apps Script web app that receives POST data",
+      googleSheetsHelp:
+        "Use a deployed Apps Script /exec URL. It must parse JSON from e.postData.contents and append the row.",
       slackLabel: "Slack",
       discordLabel: "Discord",
       webhookLabel: "Webhook",

package/corpus/templates/forms/app/pages/FormBuilderPage.tsx

@@ -295,6 +295,18 @@ export function FormBuilderPage() {
     [updateForm],
   );
 
+  const saveImmediately = useCallback(
+    async (data: Parameters<typeof updateForm.mutate>[0]) => {
+      clearTimeout(saveTimeout.current);
+      try {
+        await updateForm.mutateAsync(data);
+      } finally {
+        fieldsDirty.current = false;
+      }
+    },
+    [updateForm],
+  );
+
   // Debounced field-op save — uses patch-form-fields (server-side merge) so
   // concurrent edits to different fields both survive.
   const fieldOpTimeout = useRef<ReturnType<typeof setTimeout>>(undefined);
@@ -853,8 +865,17 @@ export function FormBuilderPage() {
               key={JSON.stringify(form.settings)}
               form={form}
               onSave={(settings) => {
-                save({ id: form.id, settings });
-                toast.success(t("builder.settingsSaved"));
+                void saveImmediately({ id: form.id, settings })
+                  .then(() => toast.success(t("builder.settingsSaved")))
+                  .catch((error: unknown) => {
+                    toast.error(
+                      error instanceof Error && error.message
+                        ? error.message
+                        : t("builder.saveFailed", {
+                            defaultValue: "Failed to save changes",
+                          }),
+                    );
+                  });
               }}
             />
           </div>
@@ -868,8 +889,17 @@ export function FormBuilderPage() {
               key={JSON.stringify(form.settings?.integrations)}
               form={form}
               onSave={(settings) => {
-                save({ id: form.id, settings });
-                toast.success(t("builder.integrationsSaved"));
+                void saveImmediately({ id: form.id, settings })
+                  .then(() => toast.success(t("builder.integrationsSaved")))
+                  .catch((error: unknown) => {
+                    toast.error(
+                      error instanceof Error && error.message
+                        ? error.message
+                        : t("builder.saveFailed", {
+                            defaultValue: "Failed to save changes",
+                          }),
+                    );
+                  });
               }}
             />
           </div>
@@ -1054,6 +1084,7 @@ function BuilderContent({
                   >
                     <FieldPropertiesPanel
                       field={field}
+                      fields={fields}
                       onChange={onUpdateField}
                       onDelete={() => onDeleteField(field.id)}
                     />

package/corpus/templates/forms/app/pages/FormFillPage.tsx

@@ -1,5 +1,6 @@
 import { useT } from "@agent-native/core/client/i18n";
 import { Turnstile, PoweredByBadge } from "@agent-native/core/client/ui";
+import { isConditionalFieldVisible } from "@shared/conditional";
 import type { FormField, FormSettings } from "@shared/types";
 import { IconCircleCheck, IconRefresh } from "@tabler/icons-react";
 import { useState, useMemo, useEffect } from "react";
@@ -88,21 +89,7 @@ export function FormFillPage() {
 
   // Evaluate conditional visibility
   const visibleFields = useMemo(() => {
-    return fields.filter((field) => {
-      if (!field.conditional) return true;
-      const { fieldId, operator, value: condValue } = field.conditional;
-      const fieldVal = String(values[fieldId] ?? "");
-      switch (operator) {
-        case "equals":
-          return fieldVal === condValue;
-        case "not_equals":
-          return fieldVal !== condValue;
-        case "contains":
-          return fieldVal.includes(condValue);
-        default:
-          return true;
-      }
-    });
+    return fields.filter((field) => isConditionalFieldVisible(field, values));
   }, [fields, values]);
 
   function handleChange(fieldId: string, value: unknown) {
@@ -166,7 +153,11 @@ export function FormFillPage() {
     submitForm.mutate(
       {
         formId: form.id,
-        data: values,
+        data: Object.fromEntries(
+          visibleFields
+            .filter((field) => values[field.id] !== undefined)
+            .map((field) => [field.id, values[field.id]]),
+        ),
         captchaToken,
         _hp: honeypot,
         _t: pageLoadTime,

package/corpus/templates/forms/app/routes/_app.extensions._index.tsx

@@ -1,4 +1,4 @@
-import { ExtensionsListPage } from "@agent-native/core/client/extensions";
+import { Navigate } from "react-router";
 
 import messages from "@/i18n/en-US";
 
@@ -7,5 +7,5 @@ export function meta() {
 }
 
 export default function ExtensionsRoute() {
-  return <ExtensionsListPage />;
+  return <Navigate to="/settings#extensions" replace />;
 }

package/corpus/templates/forms/changelog/2026-07-23-agent-settings-are-clearly-labeled-manage-agent-in-the-sideb.md

@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-07-23
+---
+
+Agent settings are clearly labeled Manage agent in the sidebar.

package/corpus/templates/forms/changelog/2026-07-23-forms-can-branch-into-follow-up-questions-and-route-response.md

@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-07-23
+---
+
+Forms can branch into follow-up questions and route responses to configured destinations.

package/corpus/templates/forms/netlify.toml

@@ -6,6 +6,7 @@ functions = "templates/forms/.netlify/functions-internal"
 
 [build.environment]
 GA_MEASUREMENT_ID = "G-ESF7FYXGN9"
+GTM_CONTAINER_ID = "GTM-N3WSTXZ"
 NITRO_PRESET = "netlify"
 NPM_CONFIG_PRODUCTION = "false"
 

package/corpus/templates/forms/server/handlers/submissions.ts

@@ -17,6 +17,10 @@ import {
 } from "h3";
 import { nanoid } from "nanoid";
 
+import {
+  isConditionalFieldVisible,
+  sanitizeConditionalValues as sanitizeVisibleValues,
+} from "../../shared/conditional.js";
 import {
   cleanSubmitterEmail,
   publicSubmitterEmail,
@@ -158,43 +162,26 @@ export const submitForm = defineEventHandler(async (event: H3Event) => {
   // Parse form fields and build whitelist of valid field IDs
   const fields: FormField[] = JSON.parse(form.fields);
   const fieldMap = new Map(fields.map((f) => [f.id, f]));
-  const rawData =
+  const submittedData =
     body.data && typeof body.data === "object" && !Array.isArray(body.data)
       ? (body.data as Record<string, unknown>)
       : {};
 
   // Whitelist: only accept keys matching form field IDs
-  const data: Record<string, unknown> = {};
-  for (const [key, value] of Object.entries(rawData)) {
+  const whitelistedData: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(submittedData)) {
     const field = fieldMap.get(key);
     if (!field) continue; // Strip unknown fields
-    data[key] = value;
+    whitelistedData[key] = value;
   }
 
+  const data = sanitizeVisibleValues(fields, whitelistedData);
+
   // Validate required fields and field-specific constraints. Recompute
   // conditional visibility on the server so direct POSTs cannot submit hidden
   // field values or bypass client-side validation.
-  function isFieldVisible(field: FormField): boolean {
-    if (!field.conditional) return true;
-    const { fieldId, operator, value: condValue } = field.conditional;
-    const fieldVal = String(data[fieldId] ?? "");
-    switch (operator) {
-      case "equals":
-        return fieldVal === condValue;
-      case "not_equals":
-        return fieldVal !== condValue;
-      case "contains":
-        return fieldVal.includes(condValue);
-      default:
-        return true;
-    }
-  }
-
   for (const field of fields) {
-    if (!isFieldVisible(field)) {
-      delete data[field.id];
-      continue;
-    }
+    if (field.conditional && !isConditionalFieldVisible(field, data)) continue;
 
     const val = data[field.id];
     if (field.required && isEmptySubmissionValue(val)) {
@@ -268,13 +255,17 @@ export const submitForm = defineEventHandler(async (event: H3Event) => {
 
   if (settings.emailOnNewResponses === true && form.ownerEmail) {
     try {
-      await sendNewResponseEmail({
-        to: form.ownerEmail,
-        formTitle: form.title,
-        fields,
-        data,
-        submittedAt: now,
-      });
+      await runWithRequestContext(
+        { userEmail: form.ownerEmail, orgId: form.orgId ?? undefined },
+        () =>
+          sendNewResponseEmail({
+            to: form.ownerEmail!,
+            formTitle: form.title,
+            fields,
+            data,
+            submittedAt: now,
+          }),
+      );
     } catch (error) {
       // Email is best-effort — a provider outage must not reject a public
       // submission that was already persisted successfully.

package/corpus/templates/forms/server/lib/integrations.ts

@@ -118,9 +118,14 @@ function formatFields(
   data: Record<string, unknown>,
 ): Record<string, unknown> {
   const out: Record<string, unknown> = {};
+  const usedLabels = new Set<string>();
   for (const field of fields) {
     if (data[field.id] !== undefined) {
-      out[field.label] = data[field.id];
+      const label = field.label.trim() || field.id;
+      let key = label;
+      if (usedLabels.has(key)) key = `${label} (${field.id})`;
+      usedLabels.add(key);
+      out[key] = data[field.id];
     }
   }
   return out;
@@ -258,9 +263,13 @@ function buildDiscordPayload(submission: SubmissionPayload) {
 }
 
 /** Google Sheets (Apps Script web app) — flat key/value pairs */
-function buildGoogleSheetsPayload(submission: SubmissionPayload) {
+export function buildGoogleSheetsPayload(submission: SubmissionPayload) {
   return {
+    event: "form_submission",
+    eventVersion: 1,
+    formId: submission.formId,
     formTitle: submission.formTitle,
+    responseId: submission.responseId,
     submittedAt: submission.submittedAt,
     submitterEmail: publicSubmitterEmail(submission.submitterEmail) ?? "",
     chatSessionIds: (submission.chatSessionIds ?? []).join(", "),