@agent-native/core 0.134.0 → 0.135.0

package/corpus/templates/design/vitest.config.ts

@@ -1,15 +1,21 @@
 import path from "node:path";
 
-export default {
-  resolve: {
-    alias: {
-      "@": path.resolve(__dirname, "./app"),
-      "@shared": path.resolve(__dirname, "./shared"),
+import baseConfig from "@agent-native/core/vitest-config";
+import { defineConfig, mergeConfig } from "vitest/config";
+
+export default mergeConfig(
+  baseConfig,
+  defineConfig({
+    resolve: {
+      alias: {
+        "@": path.resolve(__dirname, "./app"),
+        "@shared": path.resolve(__dirname, "./shared"),
+      },
+    },
+    test: {
+      include: ["**/*.{test,spec}.?(c|m)[jt]s?(x)"],
+      // e2e/ holds Playwright (@playwright/test) specs; run via `pnpm e2e`, not vitest.
+      exclude: ["**/node_modules/**", "**/.git/**", "**/dist/**", "**/e2e/**"],
     },
-  },
-  test: {
-    include: ["**/*.{test,spec}.?(c|m)[jt]s?(x)"],
-    // e2e/ holds Playwright (@playwright/test) specs; run via `pnpm e2e`, not vitest.
-    exclude: ["**/node_modules/**", "**/.git/**", "**/dist/**", "**/e2e/**"],
-  },
-};
+  }),
+);

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

@@ -3,19 +3,13 @@ import { LanguagePicker, useT } from "@agent-native/core/client/i18n";
 import { TeamPage } from "@agent-native/core/client/org";
 import {
   AccountSettingsCard,
+  SettingsGroup,
+  SettingsRow,
   SettingsTabsPage,
   useAgentSettingsTabs,
   type SettingsSearchEntry,
 } from "@agent-native/core/client/settings";
 import { Button } from "@agent-native/dispatch/components/ui/button";
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from "@agent-native/dispatch/components/ui/card";
-import { Label } from "@agent-native/dispatch/components/ui/label";
 import { useMemo } from "react";
 import { Link } from "react-router";
 
@@ -60,38 +54,30 @@ export default function SettingsRoute() {
             {t("settings.description")}
           </p>
 
-          <Card id="language" className="scroll-mt-16">
-            <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 id="workspace-resources" className="scroll-mt-16">
-            <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>
+          <SettingsGroup>
+            <SettingsRow
+              id="language"
+              label={t("settings.languageTitle")}
+              description={t("settings.languageDescription")}
+              control={
+                <div className="w-56">
+                  <LanguagePicker label={t("settings.languageLabel")} />
+                </div>
+              }
+            />
+            <SettingsRow
+              id="workspace-resources"
+              label={t("settings.workspaceTitle")}
+              description={t("settings.workspaceDescription")}
+              control={
+                <Button variant="outline" asChild>
+                  <Link to="/workspace">
+                    {t("settings.openResourceSettings")}
+                  </Link>
+                </Button>
+              }
+            />
+          </SettingsGroup>
         </div>
       }
       team={

package/corpus/templates/dispatch/vitest.config.ts

@@ -1,13 +1,17 @@
-import { defineConfig } from "vitest/config";
+import baseConfig from "@agent-native/core/vitest-config";
+import { defineConfig, mergeConfig } from "vitest/config";
 
 /**
  * Minimal node test runner for the Dispatch template's server-side unit
  * tests (currently the identity-SSO redirect-allowlist + claim logic).
  * Scoped to `server/**` so it never tries to bundle the React app.
  */
-export default defineConfig({
-  test: {
-    environment: "node",
-    include: ["server/**/*.spec.ts"],
-  },
-});
+export default mergeConfig(
+  baseConfig,
+  defineConfig({
+    test: {
+      environment: "node",
+      include: ["server/**/*.spec.ts"],
+    },
+  }),
+);

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

@@ -3,6 +3,8 @@ import { LanguagePicker, useT } from "@agent-native/core/client/i18n";
 import { TeamPage } from "@agent-native/core/client/org";
 import {
   AccountSettingsCard,
+  SettingsGroup,
+  SettingsRow,
   SettingsTabsPage,
   useAgentSettingsTabs,
   type SettingsSearchEntry,
@@ -10,14 +12,6 @@ import {
 import { useSetPageTitle } from "@agent-native/toolkit/app-shell";
 import { useMemo } from "react";
 
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from "@/components/ui/card";
-import { Label } from "@/components/ui/label";
 import { APP_TITLE } from "@/lib/app-config";
 
 import changelog from "../../CHANGELOG.md?raw";
@@ -55,20 +49,18 @@ export default function SettingsRoute() {
             {t("settings.description")}
           </p>
 
-          <Card id="language" className="scroll-mt-16">
-            <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>
+          <SettingsGroup>
+            <SettingsRow
+              id="language"
+              label={t("settings.languageTitle")}
+              description={t("settings.languageDescription")}
+              control={
+                <div className="w-56">
+                  <LanguagePicker label={t("settings.languageLabel")} />
+                </div>
+              }
+            />
+          </SettingsGroup>
         </div>
       }
       team={

package/corpus/templates/factory/vitest.config.ts

@@ -0,0 +1,9 @@
+import baseConfig from "@agent-native/core/vitest-config";
+import { mergeConfig } from "vitest/config";
+
+import viteConfig from "./vite.config";
+
+// Kept separate from vite.config.ts so the production config never imports
+// vitest: `agent-native build` loads vite.config.ts in installs where vitest
+// is absent.
+export default mergeConfig(viteConfig, baseConfig);

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

@@ -3,6 +3,8 @@ import { LanguagePicker, useT } from "@agent-native/core/client/i18n";
 import { TeamPage } from "@agent-native/core/client/org";
 import {
   AccountSettingsCard,
+  SettingsGroup,
+  SettingsRow,
   SettingsTabsPage,
   useAgentSettingsTabs,
   type SettingsSearchEntry,
@@ -10,14 +12,6 @@ import {
 import { useSetPageTitle } from "@agent-native/toolkit/app-shell";
 import { useMemo } from "react";
 
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from "@/components/ui/card";
-import { Label } from "@/components/ui/label";
 import messages from "@/i18n/en-US";
 
 import changelog from "../../CHANGELOG.md?raw";
@@ -55,20 +49,18 @@ export default function SettingsRoute() {
             {t("settings.description")}
           </p>
 
-          <Card id="language" className="forms-settings-card scroll-mt-16">
-            <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>
+          <SettingsGroup className="forms-settings-card">
+            <SettingsRow
+              id="language"
+              label={t("settings.languageTitle")}
+              description={t("settings.languageDescription")}
+              control={
+                <div className="w-56">
+                  <LanguagePicker label={t("settings.languageLabel")} />
+                </div>
+              }
+            />
+          </SettingsGroup>
         </div>
       }
       team={

package/corpus/templates/forms/vitest.config.ts

@@ -1,27 +1,31 @@
 import path from "node:path";
 
-import { defineConfig } from "vitest/config";
+import baseConfig from "@agent-native/core/vitest-config";
+import { defineConfig, mergeConfig } from "vitest/config";
 
-export default defineConfig({
-  resolve: {
-    alias: {
-      "@": path.resolve(__dirname, "./app"),
-      "@shared": path.resolve(__dirname, "./shared"),
+export default mergeConfig(
+  baseConfig,
+  defineConfig({
+    resolve: {
+      alias: {
+        "@": path.resolve(__dirname, "./app"),
+        "@shared": path.resolve(__dirname, "./shared"),
+      },
     },
-  },
-  test: {
-    // The existing *.spec.ts files in this template are standalone tsx scripts
-    // that call process.exit() directly — they predate vitest and run via tsx.
-    // Exclude them so vitest does not attempt to execute them as test suites.
-    // Remove this exclude entry when those files are migrated to proper vitest tests.
-    include: ["**/*.{test,spec}.?(c|m)[jt]s?(x)"],
-    exclude: [
-      "**/node_modules/**",
-      "**/.git/**",
-      "**/dist/**",
-      "shared/types.public-settings.spec.ts",
-      "server/lib/submission-validation.spec.ts",
-    ],
-    passWithNoTests: true,
-  },
-});
+    test: {
+      // The existing *.spec.ts files in this template are standalone tsx scripts
+      // that call process.exit() directly — they predate vitest and run via tsx.
+      // Exclude them so vitest does not attempt to execute them as test suites.
+      // Remove this exclude entry when those files are migrated to proper vitest tests.
+      include: ["**/*.{test,spec}.?(c|m)[jt]s?(x)"],
+      exclude: [
+        "**/node_modules/**",
+        "**/.git/**",
+        "**/dist/**",
+        "shared/types.public-settings.spec.ts",
+        "server/lib/submission-validation.spec.ts",
+      ],
+      passWithNoTests: true,
+    },
+  }),
+);

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

@@ -3,6 +3,8 @@ import { LanguagePicker, useT } from "@agent-native/core/client/i18n";
 import { TeamPage } from "@agent-native/core/client/org";
 import {
   AccountSettingsCard,
+  SettingsGroup,
+  SettingsRow,
   SettingsTabsPage,
   useAgentSettingsTabs,
   type SettingsSearchEntry,
@@ -10,14 +12,6 @@ import {
 import { useSetPageTitle } from "@agent-native/toolkit/app-shell";
 import { useMemo } from "react";
 
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from "@/components/ui/card";
-import { Label } from "@/components/ui/label";
 import messages from "@/i18n/en-US";
 
 import changelog from "../../CHANGELOG.md?raw";
@@ -55,20 +49,18 @@ export default function SettingsRoute() {
             {t("settings.description")}
           </p>
 
-          <Card id="language" className="scroll-mt-16">
-            <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>
+          <SettingsGroup>
+            <SettingsRow
+              id="language"
+              label={t("settings.languageTitle")}
+              description={t("settings.languageDescription")}
+              control={
+                <div className="w-56">
+                  <LanguagePicker label={t("settings.languageLabel")} />
+                </div>
+              }
+            />
+          </SettingsGroup>
         </div>
       }
       team={

package/corpus/templates/macros/vitest.config.ts

@@ -1,16 +1,20 @@
 import path from "node:path";
 
-import { defineConfig } from "vitest/config";
+import baseConfig from "@agent-native/core/vitest-config";
+import { defineConfig, mergeConfig } from "vitest/config";
 
-export default defineConfig({
-  resolve: {
-    alias: {
-      "@": path.resolve(__dirname, "./app"),
-      "@shared": path.resolve(__dirname, "./shared"),
+export default mergeConfig(
+  baseConfig,
+  defineConfig({
+    resolve: {
+      alias: {
+        "@": path.resolve(__dirname, "./app"),
+        "@shared": path.resolve(__dirname, "./shared"),
+      },
     },
-  },
-  test: {
-    include: ["**/*.{test,spec}.?(c|m)[jt]s?(x)"],
-    exclude: ["**/node_modules/**", "**/.git/**", "**/dist/**"],
-  },
-});
+    test: {
+      include: ["**/*.{test,spec}.?(c|m)[jt]s?(x)"],
+      exclude: ["**/node_modules/**", "**/.git/**", "**/dist/**"],
+    },
+  }),
+);

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

@@ -10,6 +10,8 @@ import { LanguagePicker, useT } from "@agent-native/core/client/i18n";
 import { TeamPage } from "@agent-native/core/client/org";
 import {
   AccountSettingsCard,
+  SettingsGroup,
+  SettingsRow,
   SettingsTabsPage,
   useAgentSettingsTabs,
   type SettingsSearchEntry,
@@ -1431,22 +1433,18 @@ function GeneralSection() {
         </p>
       </div>
 
-      <div
-        id="language"
-        className="max-w-2xl scroll-mt-4 rounded-lg border border-border/20 bg-card/50 p-4"
-      >
-        <div className="mb-3">
-          <h3 className="text-[13px] font-semibold text-foreground">
-            {t("settings.languageTitle")}
-          </h3>
-          <p className="mt-0.5 text-[12px] text-muted-foreground">
-            {t("settings.languageDescription")}
-          </p>
-        </div>
-        <div className="max-w-sm">
-          <LanguagePicker label={t("settings.languageLabel")} />
-        </div>
-      </div>
+      <SettingsGroup className="max-w-2xl border-border/20 bg-card/50">
+        <SettingsRow
+          id="language"
+          label={t("settings.languageTitle")}
+          description={t("settings.languageDescription")}
+          control={
+            <div className="w-56">
+              <LanguagePicker label={t("settings.languageLabel")} />
+            </div>
+          }
+        />
+      </SettingsGroup>
     </div>
   );
 }

package/corpus/templates/mail/vitest.config.ts

@@ -1,16 +1,20 @@
 import path from "node:path";
 
-import { defineConfig } from "vitest/config";
+import baseConfig from "@agent-native/core/vitest-config";
+import { defineConfig, mergeConfig } from "vitest/config";
 
-export default defineConfig({
-  resolve: {
-    alias: {
-      "@": path.resolve(__dirname, "./app"),
-      "@shared": path.resolve(__dirname, "./shared"),
+export default mergeConfig(
+  baseConfig,
+  defineConfig({
+    resolve: {
+      alias: {
+        "@": path.resolve(__dirname, "./app"),
+        "@shared": path.resolve(__dirname, "./shared"),
+      },
     },
-  },
-  test: {
-    include: ["**/*.{test,spec}.?(c|m)[jt]s?(x)"],
-    exclude: ["**/node_modules/**", "**/.git/**", "**/dist/**"],
-  },
-});
+    test: {
+      include: ["**/*.{test,spec}.?(c|m)[jt]s?(x)"],
+      exclude: ["**/node_modules/**", "**/.git/**", "**/dist/**"],
+    },
+  }),
+);

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

@@ -3,6 +3,8 @@ import { LanguagePicker, useT } from "@agent-native/core/client/i18n";
 import { TeamPage } from "@agent-native/core/client/org";
 import {
   AccountSettingsCard,
+  SettingsGroup,
+  SettingsRow,
   SettingsTabsPage,
   useAgentSettingsTabs,
   type SettingsSearchEntry,
@@ -11,14 +13,6 @@ import { useSetPageTitle } from "@agent-native/toolkit/app-shell";
 import { useMemo } from "react";
 
 import { Button } from "@/components/ui/button";
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from "@/components/ui/card";
-import { Label } from "@/components/ui/label";
 import { APP_TITLE } from "@/lib/app-config";
 
 import changelog from "../../CHANGELOG.md?raw";
@@ -62,42 +56,34 @@ export default function SettingsRoute() {
             {t("settings.description")}
           </p>
 
-          <Card id="language" className="scroll-mt-16">
-            <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 id="editor" className="scroll-mt-16">
-            <CardHeader>
-              <CardTitle className="text-base">
-                {t("settings.editorTitle")}
-              </CardTitle>
-              <CardDescription>
-                {t("settings.editorDescription")}
-              </CardDescription>
-            </CardHeader>
-            <CardContent>
-              <Button variant="outline" asChild>
-                <a
-                  href="https://marketplace.visualstudio.com/items?itemName=Builder.agent-native"
-                  target="_blank"
-                  rel="noreferrer noopener"
-                >
-                  {t("settings.openEditorExtension")}
-                </a>
-              </Button>
-            </CardContent>
-          </Card>
+          <SettingsGroup>
+            <SettingsRow
+              id="language"
+              label={t("settings.languageTitle")}
+              description={t("settings.languageDescription")}
+              control={
+                <div className="w-56">
+                  <LanguagePicker label={t("settings.languageLabel")} />
+                </div>
+              }
+            />
+            <SettingsRow
+              id="editor"
+              label={t("settings.editorTitle")}
+              description={t("settings.editorDescription")}
+              control={
+                <Button variant="outline" asChild>
+                  <a
+                    href="https://marketplace.visualstudio.com/items?itemName=Builder.agent-native"
+                    target="_blank"
+                    rel="noreferrer noopener"
+                  >
+                    {t("settings.openEditorExtension")}
+                  </a>
+                </Button>
+              }
+            />
+          </SettingsGroup>
         </div>
       }
       team={

package/corpus/templates/plan/vitest.config.ts

@@ -1,24 +1,28 @@
 import path from "node:path";
 
-import { defineConfig } from "vitest/config";
+import baseConfig from "@agent-native/core/vitest-config";
+import { defineConfig, mergeConfig } from "vitest/config";
 
-export default defineConfig({
-  resolve: {
-    alias: {
-      "@": path.resolve(__dirname, "./app"),
-      "@shared": path.resolve(__dirname, "./shared"),
+export default mergeConfig(
+  baseConfig,
+  defineConfig({
+    resolve: {
+      alias: {
+        "@": path.resolve(__dirname, "./app"),
+        "@shared": path.resolve(__dirname, "./shared"),
+      },
     },
-  },
-  test: {
-    hookTimeout: 60000,
-    include: ["**/*.{test,spec}.?(c|m)[jt]s?(x)"],
-    exclude: [
-      "**/node_modules/**",
-      "**/.git/**",
-      "**/dist/**",
-      "**/.output/**",
-      "**/.react-router/**",
-      "**/e2e/**",
-    ],
-  },
-});
+    test: {
+      hookTimeout: 60000,
+      include: ["**/*.{test,spec}.?(c|m)[jt]s?(x)"],
+      exclude: [
+        "**/node_modules/**",
+        "**/.git/**",
+        "**/dist/**",
+        "**/.output/**",
+        "**/.react-router/**",
+        "**/e2e/**",
+      ],
+    },
+  }),
+);