@agent-native/core 0.79.16 → 0.79.18

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

@@ -1,9 +1,11 @@
 import {
   ChangelogSettingsCard,
   LanguagePicker,
+  SettingsTabsPage,
   openAgentSettings,
   useT,
 } from "@agent-native/core/client";
+import { TeamPage } from "@agent-native/core/client/org";
 import { Button } from "@agent-native/dispatch/components/ui/button";
 import {
   Card,
@@ -27,63 +29,76 @@ export default function SettingsRoute() {
   const t = useT();
 
   return (
-    <main className="mx-auto w-full max-w-3xl space-y-6 px-4 py-6 sm:px-6 sm:py-10">
-      <div className="space-y-1">
-        <h1 className="text-2xl font-semibold tracking-tight">
-          {t("settings.title")}
-        </h1>
-        <p className="text-sm leading-6 text-muted-foreground">
-          {t("settings.description")}
-        </p>
-      </div>
+    <SettingsTabsPage
+      general={
+        <div className="mx-auto w-full max-w-3xl space-y-6">
+          <p className="text-sm leading-6 text-muted-foreground">
+            {t("settings.description")}
+          </p>
 
-      <Card>
-        <CardHeader>
-          <CardTitle className="text-base">
-            {t("settings.languageTitle")}
-          </CardTitle>
-          <CardDescription>{t("settings.languageDescription")}</CardDescription>
-        </CardHeader>
-        <CardContent className="max-w-xs space-y-1.5">
-          <Label>{t("settings.languageLabel")}</Label>
-          <LanguagePicker label={t("settings.languageLabel")} />
-        </CardContent>
-      </Card>
+          <Card>
+            <CardHeader>
+              <CardTitle className="text-base">
+                {t("settings.languageTitle")}
+              </CardTitle>
+              <CardDescription>
+                {t("settings.languageDescription")}
+              </CardDescription>
+            </CardHeader>
+            <CardContent className="max-w-xs space-y-1.5">
+              <Label>{t("settings.languageLabel")}</Label>
+              <LanguagePicker label={t("settings.languageLabel")} />
+            </CardContent>
+          </Card>
 
-      <Card>
-        <CardHeader>
-          <CardTitle className="text-base">
-            {t("settings.workspaceTitle")}
-          </CardTitle>
-          <CardDescription>
-            {t("settings.workspaceDescription")}
-          </CardDescription>
-        </CardHeader>
-        <CardContent className="flex flex-wrap gap-2">
-          <Button variant="outline" asChild>
-            <Link to="/team">{t("settings.openTeamSettings")}</Link>
-          </Button>
-          <Button variant="outline" asChild>
-            <Link to="/workspace">{t("settings.openResourceSettings")}</Link>
-          </Button>
-        </CardContent>
-      </Card>
+          <Card>
+            <CardHeader>
+              <CardTitle className="text-base">
+                {t("settings.workspaceTitle")}
+              </CardTitle>
+              <CardDescription>
+                {t("settings.workspaceDescription")}
+              </CardDescription>
+            </CardHeader>
+            <CardContent>
+              <Button variant="outline" asChild>
+                <Link to="/workspace">
+                  {t("settings.openResourceSettings")}
+                </Link>
+              </Button>
+            </CardContent>
+          </Card>
 
-      <Card>
-        <CardHeader>
-          <CardTitle className="text-base">
-            {t("settings.agentTitle")}
-          </CardTitle>
-          <CardDescription>{t("settings.agentDescription")}</CardDescription>
-        </CardHeader>
-        <CardContent>
-          <Button variant="outline" onClick={() => openAgentSettings()}>
-            {t("settings.openAgentSettings")}
-          </Button>
-        </CardContent>
-      </Card>
-
-      <ChangelogSettingsCard markdown={changelog} />
-    </main>
+          <Card>
+            <CardHeader>
+              <CardTitle className="text-base">
+                {t("settings.agentTitle")}
+              </CardTitle>
+              <CardDescription>
+                {t("settings.agentDescription")}
+              </CardDescription>
+            </CardHeader>
+            <CardContent>
+              <Button variant="outline" onClick={() => openAgentSettings()}>
+                {t("settings.openAgentSettings")}
+              </Button>
+            </CardContent>
+          </Card>
+        </div>
+      }
+      team={
+        <div className="mx-auto w-full max-w-3xl">
+          <TeamPage
+            showTitle={false}
+            createOrgDescription="Set up a team to share dispatch destinations and approvals with your colleagues."
+          />
+        </div>
+      }
+      whatsNew={
+        <div className="mx-auto w-full max-w-3xl">
+          <ChangelogSettingsCard markdown={changelog} />
+        </div>
+      }
+    />
   );
 }

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

@@ -1 +1,5 @@
-export { default, meta } from "@agent-native/dispatch/routes/pages/team";
+import { Navigate } from "react-router";
+
+export default function TeamRoute() {
+  return <Navigate to="/settings#team" replace />;
+}

package/corpus/templates/forms/actions/db-connect.ts

@@ -1,49 +1,20 @@
-import fs from "fs";
-import path from "path";
-
 import { defineAction } from "@agent-native/core";
 import { z } from "zod";
 
-function upsertEnvLine(lines: string[], key: string, value: string): string[] {
-  if (/[\r\n\0]/.test(value)) {
-    throw new Error(
-      `Invalid value for ${key}: must not contain newlines or null bytes`,
-    );
-  }
-
-  const idx = lines.findIndex((l) => l.startsWith(`${key}=`));
-  const line = `${key}=${value}`;
-  if (idx >= 0) {
-    lines[idx] = line;
-  } else {
-    lines.push(line);
-  }
-  return lines;
-}
-
 export default defineAction({
   description:
-    "Write DATABASE_URL and optional DATABASE_AUTH_TOKEN to .env file.",
+    "Explain how to configure deployment-level database connection settings.",
   schema: z.object({
     url: z.string().describe("DATABASE_URL value (required)"),
     token: z.string().optional().describe("DATABASE_AUTH_TOKEN value"),
   }),
   http: false,
   run: async (args) => {
-    const envPath = path.join(process.cwd(), ".env");
-    let lines: string[] = [];
-
-    if (fs.existsSync(envPath)) {
-      lines = fs.readFileSync(envPath, "utf8").split("\n");
-    }
-
-    upsertEnvLine(lines, "DATABASE_URL", args.url);
-    if (args.token) {
-      upsertEnvLine(lines, "DATABASE_AUTH_TOKEN", args.token);
-    }
-
-    fs.writeFileSync(envPath, lines.join("\n"));
-
-    return `Database connection saved to .env. Restart the dev server for changes to take effect.`;
+    const maskedUrl = args.url.replace(/\/\/.*@/, "//***@");
+    return [
+      `Database connection not written: ${maskedUrl}.`,
+      "DATABASE_URL and DATABASE_AUTH_TOKEN are deployment-level database settings.",
+      "Configure them with your hosting provider and redeploy the app.",
+    ].join(" ");
   },
 });

package/corpus/templates/forms/actions/navigate.ts

@@ -20,13 +20,13 @@ function writeId() {
 
 export default defineAction({
   description:
-    "Navigate the UI to a view or form. Views: home, forms, form, responses, response-insights, team, extensions, form-preview. Use view=responses with a formId when the user asks to see/open all responses for a form. Use view=form with tab=edit|responses|settings|integrations to open a form builder sub-tab.",
+    "Navigate the UI to a view or form. Views: ask, home, forms, form, responses, response-insights, team, extensions, form-preview. Use view=ask/home for the Ask Forms chat tab. Use view=forms to open the forms list/table. Use view=responses with a formId when the user asks to see/open all responses for a form. Use view=form with tab=edit|responses|settings|integrations to open a form builder sub-tab.",
   schema: z.object({
     view: z
       .enum(FORMS_NAVIGATION_VIEWS)
       .optional()
       .describe(
-        "View to navigate to (home, forms, form, responses, response-insights, team, extensions, form-preview)",
+        "View to navigate to (ask, home, forms, form, responses, response-insights, team, extensions, form-preview)",
       ),
     formId: z
       .string()

package/corpus/templates/forms/app/components/CloudUpgrade.tsx

@@ -1,4 +1,4 @@
-import { agentNativePath, appApiPath, useT } from "@agent-native/core/client";
+import { useT } from "@agent-native/core/client";
 import {
   IconCheck,
   IconLoader2,
@@ -120,59 +120,20 @@ export function CloudUpgrade({
     connectingRef.current = true;
 
     if (!dbUrl.trim()) {
-      setErrorMsg(t("cloudUpgrade.databaseUrlRequired"));
+      setErrorMsg(
+        "Database settings are deployment-level. Configure DATABASE_URL with your host and redeploy the app.",
+      );
       setStatus("error");
       connectingRef.current = false;
       return;
     }
 
     try {
-      setStatus("saving");
+      setStatus("error");
       setErrorMsg("");
-
-      const vars: Array<{ key: string; value: string }> = [
-        { key: "DATABASE_URL", value: dbUrl.trim() },
-      ];
-      if (authToken.trim()) {
-        vars.push({ key: "DATABASE_AUTH_TOKEN", value: authToken.trim() });
-      }
-
-      const saveRes = await fetch(agentNativePath("/_agent-native/env-vars"), {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ vars }),
-      });
-
-      if (!saveRes.ok) {
-        const data = await saveRes.json().catch(() => ({}));
-        throw new Error(data.error || t("cloudUpgrade.saveCredentialsFailed"));
-      }
-
-      // Poll db-health until it returns ok
-      setStatus("polling");
-      let ok = false;
-      for (let i = 0; i < 30; i++) {
-        await new Promise((r) => setTimeout(r, 1000));
-        try {
-          const healthRes = await fetch(appApiPath("/api/db-health"));
-          const health = await healthRes.json();
-          if (health.ok && health.local === false) {
-            ok = true;
-            break;
-          }
-        } catch {
-          // Keep polling
-        }
-      }
-
-      if (!ok) {
-        throw new Error(t("cloudUpgrade.connectionFailedAfterAttempts"));
-      }
-
-      setStatus("success");
-      setTimeout(() => {
-        window.location.reload();
-      }, 1500);
+      throw new Error(
+        "Database settings are deployment-level. Configure DATABASE_URL and DATABASE_AUTH_TOKEN with your host, redeploy, then check sharing again.",
+      );
     } catch (e) {
       setErrorMsg(
         e instanceof Error ? e.message : t("cloudUpgrade.connectionFailed"),

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

@@ -7,7 +7,6 @@ const pageTitles: Record<string, string> = {
   "/": "header.forms",
   "/forms": "header.forms",
   "/settings": "header.settings",
-  "/team": "header.team",
 };
 
 function resolveTitle(pathname: string): string {

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

@@ -3,6 +3,7 @@ import {
   focusAgentChat,
   navigateWithAgentChatViewTransition,
   useAgentChatHomeHandoff,
+  useAgentChatHomeHandoffLinks,
   useT,
 } from "@agent-native/core/client";
 import { InvitationBanner } from "@agent-native/core/client/org";
@@ -30,9 +31,15 @@ export function Layout({ children }: LayoutProps) {
   const location = useLocation();
   const navigate = useNavigate();
   const t = useT();
+  const isAskRoute = location.pathname === "/ask";
   const chatHomeHandoffActive = useAgentChatHomeHandoff({
     storageKey: "forms",
     activePath: location.pathname,
+    enabled: !isAskRoute,
+  });
+  useAgentChatHomeHandoffLinks({
+    storageKey: "forms",
+    chatPath: "/ask",
   });
 
   // Bind chat to the currently-open form. The `/forms/:id` URL covers
@@ -53,13 +60,14 @@ export function Layout({ children }: LayoutProps) {
   // Editor routes (/forms/:id, /forms/:id/responses) render their own
   // toolbar with AgentToggleButton — skip the global Header to avoid
   // a double-header.
-  const showHeader = !NO_HEADER_PREFIXES.some((prefix) =>
-    location.pathname.startsWith(prefix),
-  );
+  const showHeader =
+    !NO_HEADER_PREFIXES.some((prefix) =>
+      location.pathname.startsWith(prefix),
+    ) && !isAskRoute;
 
   function openAskAgentFullscreen() {
     focusAgentChat();
-    navigateWithAgentChatViewTransition(navigate, "/");
+    navigateWithAgentChatViewTransition(navigate, "/ask");
   }
 
   return (
@@ -68,28 +76,37 @@ export function Layout({ children }: LayoutProps) {
         <div className="agent-layout-left-drawer flex shrink-0">
           <Sidebar />
         </div>
-        <AgentSidebar
-          position="right"
-          defaultOpen
-          chatViewTransition
-          storageKey="forms"
-          browserTabId={TAB_ID}
-          openOnChatRunning={chatHomeHandoffActive}
-          onFullscreenRequest={openAskAgentFullscreen}
-          emptyStateText={t("agent.emptyState")}
-          suggestions={[
-            t("agent.suggestionSurvey"),
-            t("agent.suggestionSubmissions"),
-            t("agent.suggestionExport"),
-          ]}
-          scope={sidebarScope}
-        >
-          <div className="flex h-full flex-1 flex-col overflow-hidden">
-            {showHeader ? <Header /> : null}
-            <InvitationBanner />
-            <main className="flex-1 overflow-auto">{children}</main>
+        {isAskRoute ? (
+          <div className="agent-layout-main-surface flex min-w-0 flex-1 overflow-hidden">
+            <div className="flex h-full flex-1 flex-col overflow-hidden">
+              <InvitationBanner />
+              <main className="flex-1 overflow-hidden">{children}</main>
+            </div>
           </div>
-        </AgentSidebar>
+        ) : (
+          <AgentSidebar
+            position="right"
+            defaultOpen
+            chatViewTransition
+            storageKey="forms"
+            browserTabId={TAB_ID}
+            openOnChatRunning={chatHomeHandoffActive}
+            onFullscreenRequest={openAskAgentFullscreen}
+            emptyStateText={t("agent.emptyState")}
+            suggestions={[
+              t("agent.suggestionSurvey"),
+              t("agent.suggestionSubmissions"),
+              t("agent.suggestionExport"),
+            ]}
+            scope={sidebarScope}
+          >
+            <div className="flex h-full flex-1 flex-col overflow-hidden">
+              {showHeader ? <Header /> : null}
+              <InvitationBanner />
+              <main className="flex-1 overflow-auto">{children}</main>
+            </div>
+          </AgentSidebar>
+        )}
       </div>
     </HeaderActionsProvider>
   );

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

@@ -10,13 +10,13 @@ import {
 import { ExtensionsSidebarSection } from "@agent-native/core/client/extensions";
 import { OrgSwitcher } from "@agent-native/core/client/org";
 import {
-  IconUsers,
   IconArrowUp,
   IconPlus,
   IconMenu2,
   IconX,
   IconMessageCircle,
   IconSettings,
+  IconForms,
 } from "@tabler/icons-react";
 import { useState, useRef, useEffect, type MouseEvent } from "react";
 import { Link, useLocation, useNavigate } from "react-router";
@@ -29,7 +29,6 @@ import {
   PopoverContent,
 } from "@/components/ui/popover";
 import { ScrollArea } from "@/components/ui/scroll-area";
-import { Skeleton } from "@/components/ui/skeleton";
 import { Textarea } from "@/components/ui/textarea";
 import {
   Tooltip,
@@ -38,22 +37,14 @@ import {
   TooltipTrigger,
 } from "@/components/ui/tooltip";
 import { useAgentPromptRun } from "@/hooks/use-agent-prompt-run";
-import { useForms, useCreateForm } from "@/hooks/use-forms";
+import { useCreateForm } from "@/hooks/use-forms";
 import { useIsMobile } from "@/hooks/use-mobile";
 import { cn } from "@/lib/utils";
 
-const statusDots: Record<string, string> = {
-  draft: "bg-amber-500",
-  published: "bg-emerald-500",
-  closed: "bg-muted-foreground/50",
-};
-
 export function Sidebar() {
   const location = useLocation();
   const navigate = useNavigate();
   const t = useT();
-  const { data: formsData, isLoading: formsLoading } = useForms();
-  const forms = Array.isArray(formsData) ? formsData : [];
   const createForm = useCreateForm();
   const { send } = useSendToAgentChat();
   const promptRun = useAgentPromptRun({
@@ -95,22 +86,31 @@ export function Sidebar() {
   }
 
   function navigateHomeChat(event: MouseEvent<HTMLAnchorElement>) {
+    if (
+      event.metaKey ||
+      event.ctrlKey ||
+      event.shiftKey ||
+      event.altKey ||
+      event.button !== 0
+    ) {
+      return;
+    }
     event.preventDefault();
     if (isMobile) setMobileOpen(false);
     focusAgentChat();
-    navigateWithAgentChatViewTransition(navigate, "/");
+    navigateWithAgentChatViewTransition(navigate, "/ask");
   }
 
   function toggleLogoView() {
     if (isMobile) setMobileOpen(false);
     focusAgentChat();
-    navigateWithAgentChatViewTransition(navigate, "/");
+    navigateWithAgentChatViewTransition(navigate, "/ask");
   }
 
   const newFormButton = (
     <PopoverTrigger asChild>
-      <button className="cursor-pointer flex w-full items-center gap-2 rounded-md px-3 py-2 text-sm text-muted-foreground hover:bg-accent/50 hover:text-foreground min-h-[44px]">
-        <IconPlus size={14} className="shrink-0" />
+      <button className="flex min-h-[44px] w-full cursor-pointer items-center gap-2.5 rounded-md px-3 py-2 text-sm text-muted-foreground transition-all hover:bg-accent/50 hover:text-foreground">
+        <IconPlus className="h-4 w-4 shrink-0" />
         <span>{t("sidebar.newForm")}</span>
       </button>
     </PopoverTrigger>
@@ -223,69 +223,41 @@ export function Sidebar() {
       <ScrollArea className="min-h-0 min-w-0 flex-1">
         <div
           className={cn(
-            "min-w-0 max-w-full overflow-hidden py-2",
+            "grid min-w-0 max-w-full gap-1 overflow-hidden p-2",
             isMobile ? "w-full" : "w-60",
           )}
         >
           <Link
-            to="/"
+            to="/ask"
             onClick={navigateHomeChat}
             className={cn(
-              "flex w-full min-w-0 max-w-full items-center gap-2.5 overflow-hidden rounded-md px-3 py-2 text-sm min-h-[44px]",
-              location.pathname === "/"
+              "flex min-h-[44px] w-full min-w-0 max-w-full items-center gap-2.5 overflow-hidden rounded-md px-3 py-2 text-sm transition-all hover:text-primary",
+              location.pathname === "/ask" || location.pathname === "/"
                 ? "bg-accent text-accent-foreground"
                 : "text-muted-foreground hover:bg-accent/50 hover:text-foreground",
             )}
           >
-            <IconMessageCircle size={14} className="shrink-0" />
+            <IconMessageCircle className="h-4 w-4 shrink-0" />
             <span className="min-w-0 flex-1 basis-0 truncate">
               {t("navigation.askForms")}
             </span>
           </Link>
 
-          {formsLoading && forms.length === 0
-            ? Array.from({ length: 5 }).map((_, i) => (
-                <div
-                  key={i}
-                  className="flex w-full items-center gap-2.5 rounded-md px-3 py-2 min-h-[44px]"
-                >
-                  <Skeleton className="h-1.5 w-1.5 shrink-0 rounded-full" />
-                  <Skeleton
-                    className="h-3.5"
-                    style={{ width: `${50 + ((i * 17) % 40)}%` }}
-                  />
-                </div>
-              ))
-            : null}
-          {forms.map((form) => {
-            const isActive =
-              location.pathname === `/forms/${form.id}` ||
-              location.pathname === `/forms/${form.id}/responses`;
-            return (
-              <Link
-                key={form.id}
-                to={`/forms/${form.id}`}
-                onClick={() => isMobile && setMobileOpen(false)}
-                className={cn(
-                  "flex w-full min-w-0 max-w-full items-center gap-2.5 overflow-hidden rounded-md px-3 py-2 text-sm min-h-[44px]",
-                  isActive
-                    ? "bg-accent text-accent-foreground"
-                    : "text-muted-foreground hover:bg-accent/50 hover:text-foreground",
-                )}
-                title={form.title || t("sidebar.untitledForm")}
-              >
-                <span
-                  className={cn(
-                    "h-1.5 w-1.5 shrink-0 rounded-full",
-                    isActive ? "bg-accent-foreground" : statusDots[form.status],
-                  )}
-                />
-                <span className="min-w-0 flex-1 basis-0 truncate">
-                  {form.title || t("sidebar.untitledForm")}
-                </span>
-              </Link>
-            );
-          })}
+          <Link
+            to="/forms"
+            onClick={() => isMobile && setMobileOpen(false)}
+            className={cn(
+              "flex min-h-[44px] w-full min-w-0 max-w-full items-center gap-2.5 overflow-hidden rounded-md px-3 py-2 text-sm transition-all hover:text-primary",
+              location.pathname.startsWith("/forms")
+                ? "bg-accent text-accent-foreground"
+                : "text-muted-foreground hover:bg-accent/50 hover:text-foreground",
+            )}
+          >
+            <IconForms className="h-4 w-4 shrink-0" />
+            <span className="min-w-0 flex-1 basis-0 truncate">
+              {t("navigation.allForms")}
+            </span>
+          </Link>
 
           <Popover open={popoverOpen} onOpenChange={setPopoverOpen}>
             {newFormButton}
@@ -309,19 +281,6 @@ export function Sidebar() {
           <IconSettings size={14} className="shrink-0" />
           <span>{t("navigation.settings")}</span>
         </Link>
-        <Link
-          to="/team"
-          onClick={() => isMobile && setMobileOpen(false)}
-          className={cn(
-            "flex w-full items-center gap-2.5 rounded-md px-3 py-2 text-sm min-h-[44px]",
-            location.pathname === "/team"
-              ? "bg-accent text-accent-foreground"
-              : "text-muted-foreground hover:bg-accent/50 hover:text-foreground",
-          )}
-        >
-          <IconUsers size={14} className="shrink-0" />
-          <span>{t("navigation.team")}</span>
-        </Link>
       </div>
 
       {/* Tools */}