@agent-native/core 0.79.17 → 0.79.19

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

@@ -1,10 +1,11 @@
 import {
   ChangelogSettingsCard,
   LanguagePicker,
+  SettingsTabsPage,
   openAgentSettings,
   useT,
 } from "@agent-native/core/client";
-import { Link } from "react-router";
+import { TeamPage } from "@agent-native/core/client/org";
 
 import { useSetPageTitle } from "@/components/layout/HeaderActions";
 import { Button } from "@/components/ui/button";
@@ -29,60 +30,59 @@ export default function SettingsRoute() {
   useSetPageTitle(t("settings.title"));
 
   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
+      teamLabel={t("navigation.team")}
+      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>
-          <Button variant="outline" asChild>
-            <Link to="/team">{t("settings.openTeamSettings")}</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 forms and view responses together."
+          />
+        </div>
+      }
+      whatsNew={
+        <div className="mx-auto w-full max-w-3xl">
+          <ChangelogSettingsCard markdown={changelog} />
+        </div>
+      }
+    />
   );
 }

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

@@ -1,16 +1,9 @@
-import { TeamPage } from "@agent-native/core/client/org";
-
-import { useSetPageTitle } from "@/components/layout/HeaderActions";
+import { Navigate } from "react-router";
 
 export function meta() {
   return [{ title: "Team" }];
 }
 
 export default function TeamRoute() {
-  useSetPageTitle("Team");
-  return (
-    <div className="p-8">
-      <TeamPage createOrgDescription="Set up a team to share forms and view responses together." />
-    </div>
-  );
+  return <Navigate to="/settings#team" replace />;
 }

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

@@ -1,34 +1,23 @@
-import {
-  AgentChatHome,
-  appPath,
-  markAgentChatHomeHandoff,
-  navigateWithAgentChatViewTransition,
-  useT,
-} from "@agent-native/core/client";
-import {
-  IconArrowRight,
-  IconChartBar,
-  IconDatabase,
-  IconSettings,
-} from "@tabler/icons-react";
-import { useEffect } from "react";
-import { useNavigate } from "react-router";
+import { DefaultSpinner } from "@agent-native/core/client";
+import { redirect, type LoaderFunctionArgs } from "react-router";
 
-import { ThemeToggle } from "@/components/ThemeToggle";
-import { Button } from "@/components/ui/button";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "@/components/ui/tooltip";
 import messages from "@/i18n/en-US";
-import { scheduleFormsRoutePrewarm } from "@/lib/route-prewarm";
-import { TAB_ID } from "@/lib/tab-id";
 
 const SEO_TITLE = messages.routeTitles.formsIndex;
 const SEO_DESCRIPTION = messages.routeDescriptions.formsIndex;
 
+function target(url: URL): string {
+  return `/ask${url.search}${url.hash}`;
+}
+
+export function loader({ url }: LoaderFunctionArgs) {
+  throw redirect(target(url));
+}
+
+export function clientLoader({ url }: LoaderFunctionArgs) {
+  throw redirect(target(url));
+}
+
 export function meta() {
   return [
     { title: SEO_TITLE },
@@ -44,112 +33,14 @@ export function meta() {
   ];
 }
 
-export default function Index() {
-  const navigate = useNavigate();
-  const t = useT();
-
-  useEffect(() => {
-    function handleChatRunning(event: Event) {
-      const detail = (event as CustomEvent).detail;
-      if (detail?.isRunning === true) markAgentChatHomeHandoff("forms");
-    }
-
-    const cancelRoutePrewarm = scheduleFormsRoutePrewarm();
-    window.addEventListener("agentNative.chatRunning", handleChatRunning);
-    return () => {
-      cancelRoutePrewarm();
-      window.removeEventListener("agentNative.chatRunning", handleChatRunning);
-    };
-  }, []);
-
-  function openForms() {
-    markAgentChatHomeHandoff("forms");
-    navigateWithAgentChatViewTransition(navigate, "/forms");
-  }
-
+export function HydrateFallback() {
   return (
-    <div className="forms-home-page relative h-[100dvh] min-h-0 overflow-hidden bg-background">
-      <header className="pointer-events-none absolute inset-x-0 top-0 z-20 flex h-16 items-center justify-between px-4 sm:px-6">
-        <TooltipProvider delayDuration={700}>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <button
-                type="button"
-                aria-label={t("home.openDashboard")}
-                className="pointer-events-auto flex items-center gap-2 rounded-md text-sm font-semibold text-foreground transition-colors hover:text-foreground/80 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
-                onClick={openForms}
-              >
-                <img
-                  src={appPath("/agent-native-icon-light.svg")}
-                  alt=""
-                  aria-hidden="true"
-                  className="block h-4 w-auto shrink-0 dark:hidden"
-                />
-                <img
-                  src={appPath("/agent-native-icon-dark.svg")}
-                  alt=""
-                  aria-hidden="true"
-                  className="hidden h-4 w-auto shrink-0 dark:block"
-                />
-                {t("navigation.brand")}
-              </button>
-            </TooltipTrigger>
-            <TooltipContent side="bottom">
-              {t("home.openDashboard")}
-            </TooltipContent>
-          </Tooltip>
-        </TooltipProvider>
-        <div className="pointer-events-auto flex items-center gap-1.5">
-          <ThemeToggle />
-          <Button
-            type="button"
-            variant="ghost"
-            size="sm"
-            className="gap-1.5"
-            onClick={openForms}
-          >
-            {t("home.dashboard")}
-            <IconArrowRight className="size-3.5" />
-          </Button>
-        </div>
-      </header>
-      <AgentChatHome
-        className="relative z-10 h-full min-h-0 overflow-hidden px-4 py-0 sm:px-6 sm:py-0"
-        contentClassName="h-full min-h-0 max-w-4xl"
-        surfaceClassName="forms-home-chat-panel border-0 bg-transparent shadow-none"
-        defaultMode="chat"
-        storageKey="forms"
-        browserTabId={TAB_ID}
-        showHeader={false}
-        showTabBar={false}
-        dynamicSuggestions={false}
-        suggestions={[]}
-        emptyStateText={t("home.emptyState")}
-        emptyStateDisplay="hidden"
-        centerComposerWhenEmpty
-        composerLayoutVariant="hero"
-        composerPlaceholder={t("home.composerPlaceholder")}
-        composerSlot={
-          <div className="forms-chat-intro">
-            <h1>{t("home.heading")}</h1>
-            <p>{t("home.description")}</p>
-            <div className="forms-chat-pill-row" aria-hidden="true">
-              <span>
-                <IconDatabase className="size-3.5" />
-                {t("home.pillForms")}
-              </span>
-              <span>
-                <IconChartBar className="size-3.5" />
-                {t("home.pillAnalytics")}
-              </span>
-              <span>
-                <IconSettings className="size-3.5" />
-                {t("home.pillConfiguration")}
-              </span>
-            </div>
-          </div>
-        }
-      />
+    <div className="flex h-screen w-full items-center justify-center bg-background">
+      <DefaultSpinner />
     </div>
   );
 }
+
+export default function IndexRoute() {
+  return null;
+}

package/corpus/templates/forms/changelog/2026-06-26-ask-forms-opens-as-a-standard-app-tab-with-a-simpler-sidebar.md

@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-06-26
+---
+
+Ask Forms opens as a standard app tab with a simpler sidebar.

package/corpus/templates/forms/changelog/2026-06-26-forms-are-shown-in-a-tighter-row-list-with-a-denser-sidebar.md

@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-06-26
+---
+
+Forms are shown in a tighter row list with a denser sidebar.

package/corpus/templates/forms/shared/navigation.ts

@@ -8,6 +8,7 @@ export const FORM_BUILDER_TABS = [
 export type FormBuilderTab = (typeof FORM_BUILDER_TABS)[number];
 
 export const FORMS_NAVIGATION_VIEWS = [
+  "ask",
   "home",
   "forms",
   "form",
@@ -58,8 +59,9 @@ export function formsRoutePath(target: FormsNavigationTarget): string | null {
   if (!target.view && formId) return formBuilderPath(formId, tab);
 
   switch (target.view) {
+    case "ask":
     case "home":
-      return "/";
+      return "/ask";
     case "forms":
       return "/forms";
     case "form":
@@ -71,7 +73,7 @@ export function formsRoutePath(target: FormsNavigationTarget): string | null {
         ? `/response-insights?formId=${encodeURIComponent(formId)}`
         : "/response-insights";
     case "team":
-      return "/team";
+      return "/settings#team";
     case "extensions":
       return "/extensions";
     case "form-preview":

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

@@ -1,10 +1,11 @@
 import {
   ChangelogSettingsCard,
   LanguagePicker,
+  SettingsTabsPage,
   openAgentSettings,
   useT,
 } from "@agent-native/core/client";
-import { Link } from "react-router";
+import { TeamPage } from "@agent-native/core/client/org";
 
 import { useSetPageTitle } from "@/components/layout/HeaderActions";
 import { Button } from "@/components/ui/button";
@@ -29,60 +30,59 @@ export default function SettingsRoute() {
   useSetPageTitle(t("settings.title"));
 
   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
+      teamLabel={t("team.title")}
+      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>
-          <Button variant="outline" asChild>
-            <Link to="/team">{t("settings.openTeamSettings")}</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={t("team.createOrgDescription")}
+          />
+        </div>
+      }
+      whatsNew={
+        <div className="mx-auto w-full max-w-3xl">
+          <ChangelogSettingsCard markdown={changelog} />
+        </div>
+      }
+    />
   );
 }

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

@@ -1,7 +1,5 @@
-import { useT } from "@agent-native/core/client";
-import { TeamPage } from "@agent-native/core/client/org";
+import { Navigate } from "react-router";
 
-import { useSetPageTitle } from "@/components/layout/HeaderActions";
 import messages from "@/i18n/en-US";
 
 export function meta() {
@@ -9,11 +7,5 @@ export function meta() {
 }
 
 export default function TeamRoute() {
-  const t = useT();
-  useSetPageTitle(t("team.title"));
-  return (
-    <main className="mx-auto w-full max-w-3xl px-4 py-6 sm:px-6 sm:py-10">
-      <TeamPage createOrgDescription={t("team.createOrgDescription")} />
-    </main>
-  );
+  return <Navigate to="/settings#team" replace />;
 }

package/corpus/templates/mail/actions/helpers.ts

@@ -148,6 +148,7 @@ import {
   createOAuth2Client,
   gmailListLabels,
 } from "../server/lib/google-api.js";
+import { getOAuth2Credentials } from "../server/lib/google-auth.js";
 
 interface TokenRecord {
   access_token: string;
@@ -169,8 +170,7 @@ async function resolveAccessToken(
     tokens.expiry_date &&
     tokens.expiry_date < now + 60_000
   ) {
-    const clientId = process.env.GOOGLE_CLIENT_ID!;
-    const clientSecret = process.env.GOOGLE_CLIENT_SECRET!;
+    const { clientId, clientSecret } = await getOAuth2Credentials(accountId);
     const oauth = createOAuth2Client(clientId, clientSecret, "");
     const refreshed = await oauth.refreshToken(tokens.refresh_token);
     const updated = {

package/corpus/templates/mail/app/components/GoogleConnectBanner.tsx

@@ -331,6 +331,7 @@ export function GoogleConnectBanner({
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
+          scope: "workspace",
           vars: [
             { key: "GOOGLE_CLIENT_ID", value: clientId },
             { key: "GOOGLE_CLIENT_SECRET", value: clientSecret },
@@ -345,7 +346,7 @@ export function GoogleConnectBanner({
 
       setSaved(true);
       await fetchStatus();
-      // Reload after a short delay to let Vite restart with new env vars
+      // Reload after the server has persisted the scoped credentials.
       setTimeout(() => window.location.reload(), 1500);
     } catch (err) {
       setSaveError(

package/corpus/templates/mail/app/pages/SettingsPage.tsx

@@ -1490,6 +1490,7 @@ const navItems: {
   icon: React.ComponentType<{ className?: string }>;
 }[] = [
   { id: "general", labelKey: "settings.general", icon: IconSettings },
+  { id: "team", labelKey: "settings.team", icon: IconUsers },
   { id: "whats-new", labelKey: "settings.whatsNew", icon: IconHistory },
   { id: "drafting", labelKey: "settings.drafting", icon: IconSignature },
   { id: "automations", labelKey: "settings.automations", icon: IconBolt },
@@ -1497,7 +1498,6 @@ const navItems: {
   { id: "aliases", labelKey: "settings.aliases", icon: IconUsers },
   { id: "tracking", labelKey: "settings.tracking", icon: IconChartBar },
   { id: "slack", labelKey: "settings.slack", icon: IconBolt },
-  { id: "team", labelKey: "settings.team", icon: IconUsers },
 ];
 
 function isSettingsSection(value: string | null): value is SettingsSection {
@@ -1530,9 +1530,6 @@ export function SettingsPage() {
     <div className="flex flex-1 flex-col sm:flex-row overflow-hidden">
       {/* Top tabs on mobile, left sidebar on desktop */}
       <div className="sm:w-[200px] shrink-0 sm:border-e border-b sm:border-b-0 border-border/30 bg-muted/50 dark:bg-[hsl(220,6%,5%)] sm:p-3 flex sm:flex-col gap-0.5 overflow-x-auto">
-        <p className="hidden sm:block px-2 py-1.5 text-[10px] font-medium text-muted-foreground/40 uppercase tracking-wider mb-1">
-          {t("settings.title")}
-        </p>
         {navItems.map((item) => {
           const Icon = item.icon;
           const isActive = activeSection === item.id;
@@ -1572,7 +1569,10 @@ export function SettingsPage() {
         {activeSection === "slack" && <SlackIntakeSection />}
         {activeSection === "team" && (
           <div className="flex-1 overflow-y-auto">
-            <TeamPage createOrgDescription={t("settings.teamDescription")} />
+            <TeamPage
+              showTitle={false}
+              createOrgDescription={t("settings.teamDescription")}
+            />
           </div>
         )}
       </div>

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

@@ -1,10 +1,11 @@
+import { Navigate } from "react-router";
+
 import messages from "@/i18n/en-US";
-import Team from "@/pages/Team";
 
 export function meta() {
   return [{ title: messages.mail.routeTitles.team }];
 }
 
 export default function TeamRoute() {
-  return <Team />;
+  return <Navigate to="/settings?section=team" replace />;
 }

package/corpus/templates/mail/server/handlers/emails.ts

@@ -62,6 +62,7 @@ import {
   listGmailMessages,
   gmailToEmailMessage,
   getAccountDisplayName,
+  getOAuth2Credentials,
   setAccountDisplayName,
 } from "../lib/google-auth.js";
 import { getSyntheticEmailsForView, getSnoozedThreadIds } from "../lib/jobs.js";
@@ -177,8 +178,8 @@ async function getAccessToken(accountEmail: string): Promise<string | null> {
     tokens.expiry_date < Date.now() + 5 * 60 * 1000
   ) {
     try {
-      const clientId = process.env.GOOGLE_CLIENT_ID!;
-      const clientSecret = process.env.GOOGLE_CLIENT_SECRET!;
+      const { clientId, clientSecret } =
+        await getOAuth2Credentials(accountEmail);
       const oauth = createOAuth2Client(
         clientId,
         clientSecret,