diff --git a/apps/backend/package.json b/apps/backend/package.json
index e38248716..79ffb2d69 100644
--- a/apps/backend/package.json
+++ b/apps/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/backend",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "private": true,
   "type": "module",
diff --git a/apps/backend/src/lib/email-queue-step.test.tsx b/apps/backend/src/lib/email-queue-step.test.tsx
index bb255e77e..be7172666 100644
--- a/apps/backend/src/lib/email-queue-step.test.tsx
+++ b/apps/backend/src/lib/email-queue-step.test.tsx
@@ -1,10 +1,48 @@
 import { EmailOutboxCreatedWith } from "@/generated/prisma/client";
 import { globalPrismaClient } from "@/prisma-client";
-import { afterAll, describe, expect, it } from "vitest";
+import { afterAll, describe, expect, it, vi } from "vitest";
 import { _forTesting } from "./email-queue-step";
 import { DEFAULT_BRANCH_ID, getSoleTenancyFromProjectBranch } from "./tenancies";
 
-const { failEmailsStuckInSending, STUCK_EMAIL_TIMEOUT_MS } = _forTesting;
+const { failEmailsStuckInSending, STUCK_EMAIL_TIMEOUT_MS, updateLastExecutionTime } = _forTesting;
+
+describe.sequential("updateLastExecutionTime", () => {
+  const metadataKeys: string[] = [];
+
+  afterAll(async () => {
+    await globalPrismaClient.emailOutboxProcessingMetadata.deleteMany({
+      where: { key: { in: metadataKeys } },
+    });
+  });
+
+  it("does not move lastExecutedAt backwards when the stored timestamp is ahead", async () => {
+    const key = `email-queue-step-delta-test-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+    metadataKeys.push(key);
+
+    const futureTimestamp = new Date(Date.now() + 60_000);
+    await globalPrismaClient.emailOutboxProcessingMetadata.create({
+      data: {
+        key,
+        lastExecutedAt: futureTimestamp,
+      },
+    });
+
+    const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
+    try {
+      const delta = await updateLastExecutionTime(key);
+
+      expect(delta).toBe(0);
+      expect(warnSpy).not.toHaveBeenCalled();
+
+      const after = await globalPrismaClient.emailOutboxProcessingMetadata.findUniqueOrThrow({
+        where: { key },
+      });
+      expect(after.lastExecutedAt?.toISOString()).toBe(futureTimestamp.toISOString());
+    } finally {
+      warnSpy.mockRestore();
+    }
+  });
+});
 
 // These tests connect to the real dev DB (like payments.test.tsx) and create real EmailOutbox
 // rows against the seeded `internal` tenancy. Each row is tagged with a unique tsxSource so we
diff --git a/apps/backend/src/lib/email-queue-step.tsx b/apps/backend/src/lib/email-queue-step.tsx
index f9584c1cc..3b73e1478 100644
--- a/apps/backend/src/lib/email-queue-step.tsx
+++ b/apps/backend/src/lib/email-queue-step.tsx
@@ -203,32 +203,40 @@ async function failEmailsStuckInSending(additionalWhere?: Prisma.EmailOutboxWher
 export const _forTesting = {
   failEmailsStuckInSending,
   STUCK_EMAIL_TIMEOUT_MS,
+  updateLastExecutionTime,
 };
 
-async function updateLastExecutionTime(): Promise<number> {
-  const key = "EMAIL_QUEUE_METADATA_KEY";
-
+async function updateLastExecutionTime(key = "EMAIL_QUEUE_METADATA_KEY"): Promise<number> {
   // This query atomically claims the next execution slot and returns the delta.
-  // It uses FOR UPDATE to lock the row, preventing concurrent workers from reading
-  // the same previous timestamp. The pattern is:
+  // It uses FOR UPDATE to lock the row, preventing concurrent workers from reading the
+  // same previous timestamp. Use clock_timestamp(), not NOW(): NOW() is fixed at the
+  // transaction start, so a transaction that started earlier but acquired the row lock
+  // later could otherwise move lastExecutedAt backwards by a few milliseconds.
+  // The pattern is:
   // 1. Try UPDATE first (locks row with FOR UPDATE, returns old and new timestamps)
   // 2. If no row exists, INSERT (with ON CONFLICT DO NOTHING for race handling)
   // 3. Compute delta based on the result
   const [{ delta }] = await globalPrismaClient.$queryRaw<{ delta: number }[]>`
-    WITH now_ts AS (
-      SELECT NOW() AS now
-    ),
-    do_update AS (
+    WITH do_update AS (
       -- Update existing row, locking it first and capturing the old timestamp
       UPDATE "EmailOutboxProcessingMetadata" AS m
       SET 
-        "updatedAt" = (SELECT now FROM now_ts),
-        "lastExecutedAt" = (SELECT now FROM now_ts)
+        "updatedAt" = old.next_timestamp,
+        "lastExecutedAt" = old.next_timestamp
       FROM (
-        SELECT "key", "lastExecutedAt" AS previous_timestamp
-      FROM "EmailOutboxProcessingMetadata"
-      WHERE "key" = ${key}
-        FOR UPDATE
+        SELECT
+          locked."key",
+          locked."lastExecutedAt" AS previous_timestamp,
+          GREATEST(locked.observed_timestamp, COALESCE(locked."lastExecutedAt", locked.observed_timestamp)) AS next_timestamp
+        FROM (
+          SELECT
+            "key",
+            "lastExecutedAt",
+            clock_timestamp()::timestamp(3) AS observed_timestamp
+          FROM "EmailOutboxProcessingMetadata"
+          WHERE "key" = ${key}
+            FOR UPDATE
+        ) AS locked
       ) AS old
       WHERE m."key" = old."key"
       RETURNING old.previous_timestamp, m."lastExecutedAt" AS new_timestamp
@@ -236,7 +244,8 @@ async function updateLastExecutionTime(): Promise<number> {
     do_insert AS (
       -- Insert new row if no existing row was updated
       INSERT INTO "EmailOutboxProcessingMetadata" ("key", "lastExecutedAt", "updatedAt")
-      SELECT ${key}, (SELECT now FROM now_ts), (SELECT now FROM now_ts)
+      SELECT ${key}, observed_timestamp, observed_timestamp
+      FROM (SELECT clock_timestamp()::timestamp(3) AS observed_timestamp) AS now_ts
       WHERE NOT EXISTS (SELECT 1 FROM do_update)
       ON CONFLICT ("key") DO NOTHING
       RETURNING NULL::timestamp AS previous_timestamp, "lastExecutedAt" AS new_timestamp
@@ -261,8 +270,7 @@ async function updateLastExecutionTime(): Promise<number> {
   `;
 
   if (delta < 0) {
-    // TODO: why does this happen, actually? investigate.
-    console.warn("Email queue step delta is negative. Not sure why it happened. Ignoring the delta. TODO investigate", { delta });
+    console.warn("Email queue step delta is negative after monotonic timestamp update; ignoring the delta so the send quota cannot go negative", { delta });
     return 0;
   }
 
diff --git a/apps/backend/src/lib/seed-dummy-data.ts b/apps/backend/src/lib/seed-dummy-data.ts
index bf96b91ad..e890e0185 100644
--- a/apps/backend/src/lib/seed-dummy-data.ts
+++ b/apps/backend/src/lib/seed-dummy-data.ts
@@ -2174,7 +2174,7 @@ export async function seedDummyProject(options: SeedDummyProjectOptions): Promis
       branchId: DEFAULT_BRANCH_ID,
       source: {
         type: "pushed-from-github",
-        owner: "hexcalve",
+        owner: "hexclave",
         repo: "config-test",
         branch: "main",
         commit_hash: "abc123def456789",
diff --git a/apps/dashboard/package.json b/apps/dashboard/package.json
index 61fd0dc64..afd7f571f 100644
--- a/apps/dashboard/package.json
+++ b/apps/dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/dashboard",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "private": true,
   "scripts": {
diff --git a/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/(overview)/setup-page.tsx b/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/(overview)/setup-page.tsx
index b618fc3e9..eb7676ade 100644
--- a/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/(overview)/setup-page.tsx
+++ b/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/(overview)/setup-page.tsx
@@ -73,12 +73,50 @@ function buildCloudSetupPrompt(options: {
   `;
 }
 
+function buildCliDevSetupPrompt(options: {
+  docsBaseUrl: string,
+}) {
+  const { docsBaseUrl } = options;
+  const normalizedDocsBaseUrl = docsBaseUrl.replace(/\/$/, '');
+  const reminders = remindersPrompt.replaceAll(PROD_DOCS_BASE_URL, normalizedDocsBaseUrl);
+
+  return deindent`
+    Install and set up Hexclave in this project by following these instructions:
+
+    Read https://skill.hexclave.com and follow the setup instructions it gives for this project's specific framework and language.
+
+    Follow skill.hexclave.com as written, but use the local dashboard / Hexclave CLI development setup. Do not use the cloud environment-variable setup for local development.
+
+    Set up the app's dev command so Hexclave starts through the CLI:
+
+    \`\`\`json
+    {
+      "scripts": {
+        "dev": "hexclave dev --config-file ./hexclave.config.ts -- npm run dev:inner",
+        "dev:inner": "<the app's previous dev command>"
+      }
+    }
+    \`\`\`
+
+    If the Hexclave CLI is not installed globally, use \`npx @hexclave/cli dev --config-file ./hexclave.config.ts -- npm run dev:inner\` instead.
+
+    Do not create Hexclave project keys or ask for Hexclave environment variables for local development. The \`hexclave dev\` command automatically creates or links the local config project and injects the project ID and secret server key into the child app process.
+
+    Keep project configuration in \`hexclave.config.ts\`. Once setup is done, run \`npm run dev\` and create the first user in the app.
+
+    After setup finishes, verify that the Hexclave MCP server is registered in your AI client config — name: \`hexclave\`, transport: \`http\`, URL: \`https://mcp.hexclave.com/mcp\`. If it is not registered, add it manually so future agents have live access to Hexclave docs and APIs.
+
+    ${reminders}
+  `;
+}
+
 export default function SetupPage(props: { toMetrics: () => void }) {
   const adminApp = useAdminApp();
   const [setupMode, setSetupMode] = useState<SetupMode>("recommended");
   const [keys, setKeys] = useState<{ projectId: string, publishableClientKey?: string, secretServerKey: string } | null>(null);
   const projectConfig = adminApp.useProject().useConfig();
   const requirePublishableClientKey = projectConfig.project.requirePublishableClientKey;
+  const isRemoteDevelopmentEnvironment = getPublicEnvVar("NEXT_PUBLIC_STACK_IS_REMOTE_DEVELOPMENT_ENVIRONMENT") === "true";
 
   const onGenerateKeys = async () => {
     const newKey = await adminApp.createInternalApiKey({
@@ -96,11 +134,16 @@ export default function SetupPage(props: { toMetrics: () => void }) {
     });
   };
 
-  const selectedInstallPrompt = buildCloudSetupPrompt({
-    docsBaseUrl: getSetupDocsBaseUrl(),
-    projectId: adminApp.projectId,
-    apiBaseUrl: getSetupApiBaseUrl(),
-  });
+  const setupDocsBaseUrl = getSetupDocsBaseUrl();
+  const selectedInstallPrompt = isRemoteDevelopmentEnvironment
+    ? buildCliDevSetupPrompt({
+      docsBaseUrl: setupDocsBaseUrl,
+    })
+    : buildCloudSetupPrompt({
+      docsBaseUrl: setupDocsBaseUrl,
+      projectId: adminApp.projectId,
+      apiBaseUrl: getSetupApiBaseUrl(),
+    });
   const manualSetupDocsUrl = getManualSetupDocsUrl();
 
   return (
@@ -130,13 +173,18 @@ export default function SetupPage(props: { toMetrics: () => void }) {
               variant='outline'
               size='sm'
               onClick={() => {
-                window.open(getSetupDocsBaseUrl(), '_blank');
+                window.open(setupDocsBaseUrl, '_blank');
               }}
             >
               <BookIcon className="w-4 h-4 mr-2" />
               Full Documentation
             </DesignButton>
           </Typography>
+          {isRemoteDevelopmentEnvironment && (
+            <Typography variant="secondary" className="max-w-xl">
+              For local config projects, run your app with <InlineCode>hexclave dev</InlineCode>. It injects the project ID and secret key automatically, so you do not need to create project keys or write Hexclave environment variables.
+            </Typography>
+          )}
         </div>
       </div>
 
@@ -152,7 +200,31 @@ export default function SetupPage(props: { toMetrics: () => void }) {
       {setupMode === "recommended" ? (
         <div className="flex flex-col mt-4 mx-4">
           <ol className="relative text-gray-500 border-s border-gray-200 dark:border-gray-700 dark:text-gray-400 ">
-            {[
+            {(isRemoteDevelopmentEnvironment ? [
+              {
+                step: 1,
+                title: "Copy Setup Prompt",
+                content: <div className="flex min-w-0 flex-col gap-4">
+                  <CodeBlock
+                    language="text"
+                    content={selectedInstallPrompt}
+                    customRender={
+                      <pre className="max-h-[480px] overflow-y-auto whitespace-pre-wrap break-words p-4 text-sm leading-6 text-foreground">
+                        {selectedInstallPrompt}
+                      </pre>
+                    }
+                    title="Prompt for your AI agent"
+                    icon="code"
+                    maxHeight={480}
+                  />
+                </div>,
+              },
+              {
+                step: 2,
+                title: "Done",
+                content: <SetupRecommendedDoneStep onExploreDashboard={props.toMetrics} />,
+              },
+            ] : [
               {
                 step: 1,
                 title: "Copy Setup Prompt",
@@ -186,7 +258,7 @@ export default function SetupPage(props: { toMetrics: () => void }) {
                 title: "Done",
                 content: <SetupRecommendedDoneStep onExploreDashboard={props.toMetrics} />,
               },
-            ].map((item) => (
+            ]).map((item) => (
               <li key={item.step} className={cn("ms-6 flex flex-col lg:flex-row gap-10 mb-20")}>
                 <div className="flex flex-col justify-center gap-2 max-w-[180px] min-w-[180px]">
                   <span className={`absolute flex items-center justify-center w-8 h-8 bg-zinc-100 dark:bg-zinc-800 rounded-full -start-4 ring-4 ring-white dark:ring-zinc-900`}>
@@ -310,6 +382,22 @@ function SetupRecommendedDoneStep(props: { onExploreDashboard: () => void }) {
   );
 }
 
+function CliDevSetupStep() {
+  return (
+    <div className="flex flex-col gap-4">
+      <Typography>
+        Start the app through the Hexclave CLI instead of copying project keys into an env file.
+      </Typography>
+      <div className={cn(codePanelShellClasses, "w-full overflow-x-auto p-4 font-mono text-sm")}>
+        hexclave dev --config-file ./hexclave.config.ts -- &lt;your-dev-command&gt;
+      </div>
+      <Typography variant="secondary">
+        The CLI creates or links the local config project and injects the project ID and secret server key into the child process automatically. Use <InlineCode>npx @hexclave/cli dev</InlineCode> if the CLI is not installed globally.
+      </Typography>
+    </div>
+  );
+}
+
 function HexclaveKeys(props: {
   keys: { projectId: string, publishableClientKey?: string, secretServerKey: string } | null,
   onGenerateKeys: () => Promise<void>,
diff --git a/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/project-keys/page-client.tsx b/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/project-keys/page-client.tsx
index bccc0d1b6..79df4d7ce 100644
--- a/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/project-keys/page-client.tsx
+++ b/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/project-keys/page-client.tsx
@@ -1,11 +1,13 @@
 "use client";
 import { InternalApiKeyTable } from "@/components/data-table/api-key-table";
-import { DesignAlert, DesignButton } from "@/components/design-components";
+import { DesignAlert, DesignButton, DesignCard } from "@/components/design-components";
 import { EnvKeys } from "@/components/env-keys";
 import { SmartFormDialog } from "@/components/form-dialog";
 import { SelectField } from "@/components/form-fields";
+import { InlineCode } from "@/components/inline-code";
 import { SettingSwitch } from "@/components/settings";
-import { ActionDialog, Button, Typography } from "@/components/ui";
+import { ActionDialog, Typography } from "@/components/ui";
+import { getPublicEnvVar } from "@/lib/env";
 import { InternalApiKeyFirstView } from "@hexclave/next";
 import { useSearchParams } from "next/navigation";
 import { useState } from "react";
@@ -15,15 +17,32 @@ import { useAdminApp } from "../use-admin-app";
 
 
 export default function PageClient() {
+  const hexclaveAdminApp = useAdminApp();
+  const project = hexclaveAdminApp.useProject();
+  const params = useSearchParams();
+  const create = params.get("create") === "true";
+  const isRemoteDevelopmentEnvironment = getPublicEnvVar("NEXT_PUBLIC_STACK_IS_REMOTE_DEVELOPMENT_ENVIRONMENT") === "true";
+  const showLocalConfigInstructions = isRemoteDevelopmentEnvironment && project.isDevelopmentEnvironment;
+
+  if (showLocalConfigInstructions) {
+    return (
+      <PageLayout title="Project Keys">
+        <LocalConfigProjectKeysInstructions />
+      </PageLayout>
+    );
+  }
+
+  return <ProjectKeysManagement create={create} />;
+}
+
+function ProjectKeysManagement(props: { create: boolean }) {
   const hexclaveAdminApp = useAdminApp();
   const project = hexclaveAdminApp.useProject();
   const config = project.useConfig();
   const requirePublishableClientKey = config.project.requirePublishableClientKey;
   const apiKeySets = hexclaveAdminApp.useInternalApiKeys();
-  const params = useSearchParams();
-  const create = params.get("create") === "true";
 
-  const [isNewApiKeyDialogOpen, setIsNewApiKeyDialogOpen] = useState(create);
+  const [isNewApiKeyDialogOpen, setIsNewApiKeyDialogOpen] = useState(props.create);
   const [returnedApiKey, setReturnedApiKey] = useState<InternalApiKeyFirstView | null>(null);
 
   return (
@@ -66,6 +85,51 @@ export default function PageClient() {
   );
 }
 
+function LocalConfigProjectKeysInstructions() {
+  const hexclaveAdminApp = useAdminApp();
+  const project = hexclaveAdminApp.useProject();
+  const config = project.useConfig();
+  const requirePublishableClientKey = config.project.requirePublishableClientKey;
+
+  return (
+    <>
+      <DesignCard glassmorphic contentClassName="space-y-5">
+        <DesignAlert
+          variant="info"
+          title="Project keys are managed by the Hexclave CLI for local configs"
+          description="Local config projects do not create project keys from the dashboard. The CLI starts the dashboard, creates or links the local project, and injects the project ID and secret server key into your app process."
+        />
+
+        <div className="space-y-3">
+          <Typography>
+            Run your app through the CLI so Hexclave can keep <InlineCode>hexclave.config.ts</InlineCode> and your app environment in sync:
+          </Typography>
+          <div className="overflow-x-auto rounded-xl border border-border bg-foreground/[0.03] p-4 font-mono text-sm">
+            npx @hexclave/cli dev --config-file &lt;path-to-hexclave.config.ts&gt; -- &lt;your-dev-command&gt;
+          </div>
+          <Typography>
+            This will automatically provide the correct environment variables to the specified command.
+          </Typography>
+          <Typography>
+            If you have the CLI installed globally, the same command starts with <InlineCode>hexclave dev</InlineCode>. Keep project settings in the config file; the CLI provides the runtime keys automatically.
+          </Typography>
+        </div>
+      </DesignCard>
+
+      <SettingSwitch
+        label="[Advanced] Require publishable client keys"
+        hint="When enabled, client requests must include a publishable client key."
+        checked={requirePublishableClientKey}
+        onCheckedChange={async (checked) => {
+          await project.update({
+            requirePublishableClientKey: checked,
+          });
+        }}
+      />
+    </>
+  );
+}
+
 const neverInMs = 1000 * 60 * 60 * 24 * 365 * 200;
 const expiresInOptions = {
   [1000 * 60 * 60 * 24 * 1]: "1 day",
diff --git a/apps/dashboard/src/components/data-table/user-table.tsx b/apps/dashboard/src/components/data-table/user-table.tsx
index 9d726663e..f0f44411c 100644
--- a/apps/dashboard/src/components/data-table/user-table.tsx
+++ b/apps/dashboard/src/components/data-table/user-table.tsx
@@ -426,7 +426,8 @@ function UserTableBody(props: {
         fetchRows: fetchExportRows,
         emptyExportTitle: "No users to export",
         emptyExportDescription: "There are no users matching the current filters",
-        allScopeLabel: "Export all users in the project",
+        defaultScope: "filtered",
+        allScopeLabel: "Export all users in the project (includes Anonymous)",
         filteredScopeLabel: (
           <>
             Export only filtered/searched users
diff --git a/apps/dashboard/src/components/user-dialog.tsx b/apps/dashboard/src/components/user-dialog.tsx
index 8a206bde8..688562744 100644
--- a/apps/dashboard/src/components/user-dialog.tsx
+++ b/apps/dashboard/src/components/user-dialog.tsx
@@ -3,6 +3,9 @@ import { ServerUser } from "@hexclave/next";
 import { KnownErrors } from "@hexclave/shared";
 import { countryCodeSchema, emailSchema, jsonStringOrEmptySchema, passwordSchema } from "@hexclave/shared/dist/schema-fields";
 import { Accordion, AccordionContent, AccordionItem, AccordionTrigger, Button, Typography } from "@/components/ui";
+import { DesignButton, DesignDialog, DesignDialogClose } from "@/components/design-components";
+import { WarningCircleIcon } from "@phosphor-icons/react";
+import { useState } from "react";
 import * as yup from "yup";
 import { FormDialog } from "./form-dialog";
 import { CountryCodeField } from "./country-code-select";
@@ -24,6 +27,7 @@ export function UserDialog(props: {
 })) {
   const adminApp = useAdminApp();
   const project = adminApp.useProject();
+  const [errorDialog, setErrorDialog] = useState<{ title: string; description: string } | null>(null);
 
   let defaultValues;
   if (props.type === 'edit') {
@@ -127,135 +131,159 @@ export function UserDialog(props: {
       }
     } catch (error) {
       if (KnownErrors.UserWithEmailAlreadyExists.isInstance(error)) {
-        alert("Email already exists. Please choose a different email address.");
-        return 'prevent-close';
+        setErrorDialog({
+          title: "Email already exists",
+          description: "Please choose a different email address.",
+        });
+        return 'prevent-close-and-prevent-reset';
       }
       if (KnownErrors.ContactChannelAlreadyUsedForAuthBySomeoneElse.isInstance(error)) {
-        alert("Email already used for authentication. This email is already used for sign-in by another account. Please choose a different email address.");
-        return 'prevent-close';
+        setErrorDialog({
+          title: "Email already used for authentication",
+          description: "This email is already used for sign-in by another account. Please choose a different email address.",
+        });
+        return 'prevent-close-and-prevent-reset';
       }
       throw error;
     }
   }
 
-  return <FormDialog
-    open={props.open}
-    onOpenChange={props.onOpenChange}
-    trigger={props.trigger}
-    title={props.type === 'edit' ? "Edit User" : "Create User"}
-    formSchema={formSchema}
-    defaultValues={defaultValues}
-    okButton={{ label: props.type === 'edit' ? "Save" : "Create" }}
-    render={(form) => (
-      <>
-        {props.type === 'edit' ? <Typography variant='secondary'>ID: {props.user.id}</Typography> : null}
+  return <>
+    <DesignDialog
+      open={errorDialog !== null}
+      onOpenChange={(open: boolean) => { if (!open) setErrorDialog(null); }}
+      size="sm"
+      icon={WarningCircleIcon}
+      title={errorDialog?.title ?? ""}
+      description={errorDialog?.description ?? ""}
+      footer={
+        <DesignDialogClose asChild>
+          <DesignButton variant="secondary" size="sm">OK</DesignButton>
+        </DesignDialogClose>
+      }
+    />
+    <FormDialog
+      open={props.open}
+      onOpenChange={(open: boolean) => {
+        if (!open) setErrorDialog(null);
+        props.onOpenChange?.(open);
+      }}
+      trigger={props.trigger}
+      title={props.type === 'edit' ? "Edit User" : "Create User"}
+      formSchema={formSchema}
+      defaultValues={defaultValues}
+      okButton={{ label: props.type === 'edit' ? "Save" : "Create" }}
+      render={(form) => (
+        <>
+          {props.type === 'edit' ? <Typography variant='secondary'>ID: {props.user.id}</Typography> : null}
 
-        <div className="flex gap-4 items-end">
-          <div className="flex-1">
-            <InputField control={form.control} label="Primary email" name="primaryEmail" required />
+          <div className="flex gap-4 items-end">
+            <div className="flex-1">
+              <InputField control={form.control} label="Primary email" name="primaryEmail" required />
+            </div>
+            <div className="mb-2">
+              <SwitchField control={form.control} label="Verified" name="primaryEmailVerified" />
+            </div>
           </div>
-          <div className="mb-2">
-            <SwitchField control={form.control} label="Verified" name="primaryEmailVerified" />
-          </div>
-        </div>
 
-        <InputField control={form.control} label="Display name" name="displayName" />
+          <InputField control={form.control} label="Display name" name="displayName" />
 
-        <DateField control={form.control} label="Signed Up At" name="signedUpAt" />
+          <DateField control={form.control} label="Signed Up At" name="signedUpAt" />
 
-        {project.config.magicLinkEnabled && <SwitchField control={form.control} label="OTP/magic link sign-in" name="otpAuthEnabled" />}
-        {project.config.credentialEnabled && <SwitchField control={form.control} label="Password sign-in" name="passwordEnabled" />}
-        {form.watch("passwordEnabled") && (
-          props.type === 'edit' && !form.watch("password") && !form.watch("updatePassword") ? (
-            <Button
-              type="button"
-              variant="outline"
-              onClick={() => form.setValue('updatePassword', true)}
-            >
-              Update Password
-            </Button>
-          ) : (
-            <InputField
-              control={form.control}
-              label={props.type === 'edit' ? "New password" : "Password"}
-              name="password"
-              type="password"
-              autoComplete="off"
-            />
-          )
-        )}
-        {!form.watch("primaryEmailVerified") && form.watch("otpAuthEnabled") && <Typography variant="secondary">Primary email must be verified if OTP/magic link sign-in is enabled</Typography>}
+          {project.config.magicLinkEnabled && <SwitchField control={form.control} label="OTP/magic link sign-in" name="otpAuthEnabled" />}
+          {project.config.credentialEnabled && <SwitchField control={form.control} label="Password sign-in" name="passwordEnabled" />}
+          {form.watch("passwordEnabled") && (
+            props.type === 'edit' && !form.watch("password") && !form.watch("updatePassword") ? (
+              <Button
+                type="button"
+                variant="outline"
+                onClick={() => form.setValue('updatePassword', true)}
+              >
+                Update Password
+              </Button>
+            ) : (
+              <InputField
+                control={form.control}
+                label={props.type === 'edit' ? "New password" : "Password"}
+                name="password"
+                type="password"
+                autoComplete="off"
+              />
+            )
+          )}
+          {!form.watch("primaryEmailVerified") && form.watch("otpAuthEnabled") && <Typography variant="secondary">Primary email must be verified if OTP/magic link sign-in is enabled</Typography>}
+
+          {props.type === "create" && (
+            <Accordion type="single" collapsible>
+              <AccordionItem value="item-risk-and-geo">
+                <AccordionTrigger>Risk and Geo</AccordionTrigger>
+                <AccordionContent className="space-y-4">
+                  <CountryCodeField control={form.control} label="Country code" name="countryCode" placeholder="Select country code..." />
+                  <div className="grid gap-4 md:grid-cols-2">
+                    <InputField control={form.control} label="Risk score: bot" name="botRiskScore" placeholder="0-100" />
+                    <InputField control={form.control} label="Risk score: free trial abuse" name="freeTrialAbuseRiskScore" placeholder="0-100" />
+                  </div>
+                  <Typography variant="secondary">
+                    Optional admin-only values for imports or custom anti-abuse systems. Leave blank to use the defaults.
+                  </Typography>
+                </AccordionContent>
+              </AccordionItem>
+            </Accordion>
+          )}
 
-        {props.type === "create" && (
           <Accordion type="single" collapsible>
-            <AccordionItem value="item-risk-and-geo">
-              <AccordionTrigger>Risk and Geo</AccordionTrigger>
+            <AccordionItem value="item-1">
+              <AccordionTrigger>Metadata</AccordionTrigger>
               <AccordionContent className="space-y-4">
-                <CountryCodeField control={form.control} label="Country code" name="countryCode" placeholder="Select country code..." />
-                <div className="grid gap-4 md:grid-cols-2">
-                  <InputField control={form.control} label="Risk score: bot" name="botRiskScore" placeholder="0-100" />
-                  <InputField control={form.control} label="Risk score: free trial abuse" name="freeTrialAbuseRiskScore" placeholder="0-100" />
-                </div>
-                <Typography variant="secondary">
-                  Optional admin-only values for imports or custom anti-abuse systems. Leave blank to use the defaults.
-                </Typography>
+                <TextAreaField
+                  rows={3}
+                  control={form.control}
+                  label="Client metadata"
+                  name="clientMetadata"
+                  placeholder="null"
+                  monospace
+                  helperText={
+                    <>
+                      Custom JSON clients can read and update; avoid sensitive data.{" "}
+                      <StyledLink href={metadataDocsUrl} target="_blank">Learn more in the docs</StyledLink>.
+                    </>
+                  }
+                />
+                <TextAreaField
+                  rows={3}
+                  control={form.control}
+                  label="Client read only metadata"
+                  name="clientReadOnlyMetadata"
+                  placeholder="null"
+                  monospace
+                  helperText={
+                    <>
+                      Custom JSON clients can read but only your backend can change.{" "}
+                      <StyledLink href={metadataDocsUrl} target="_blank">Learn more in the docs</StyledLink>.
+                    </>
+                  }
+                />
+                <TextAreaField
+                  rows={3}
+                  control={form.control}
+                  label="Server metadata"
+                  name="serverMetadata"
+                  placeholder="null"
+                  monospace
+                  helperText={
+                    <>
+                      Custom JSON reserved for server-side logic and never exposed to clients.{" "}
+                      <StyledLink href={metadataDocsUrl} target="_blank">Learn more in the docs</StyledLink>.
+                    </>
+                  }
+                />
               </AccordionContent>
             </AccordionItem>
           </Accordion>
-        )}
-
-        <Accordion type="single" collapsible>
-          <AccordionItem value="item-1">
-            <AccordionTrigger>Metadata</AccordionTrigger>
-            <AccordionContent className="space-y-4">
-              <TextAreaField
-                rows={3}
-                control={form.control}
-                label="Client metadata"
-                name="clientMetadata"
-                placeholder="null"
-                monospace
-                helperText={
-                  <>
-                    Custom JSON clients can read and update; avoid sensitive data.{" "}
-                    <StyledLink href={metadataDocsUrl} target="_blank">Learn more in the docs</StyledLink>.
-                  </>
-                }
-              />
-              <TextAreaField
-                rows={3}
-                control={form.control}
-                label="Client read only metadata"
-                name="clientReadOnlyMetadata"
-                placeholder="null"
-                monospace
-                helperText={
-                  <>
-                    Custom JSON clients can read but only your backend can change.{" "}
-                    <StyledLink href={metadataDocsUrl} target="_blank">Learn more in the docs</StyledLink>.
-                  </>
-                }
-              />
-              <TextAreaField
-                rows={3}
-                control={form.control}
-                label="Server metadata"
-                name="serverMetadata"
-                placeholder="null"
-                monospace
-                helperText={
-                  <>
-                    Custom JSON reserved for server-side logic and never exposed to clients.{" "}
-                    <StyledLink href={metadataDocsUrl} target="_blank">Learn more in the docs</StyledLink>.
-                  </>
-                }
-              />
-            </AccordionContent>
-          </AccordionItem>
-        </Accordion>
-      </>
-    )}
-    onSubmit={handleSubmit}
-    cancelButton
-  />;
+        </>
+      )}
+      onSubmit={handleSubmit}
+      cancelButton
+    />
+  </>;
 }
diff --git a/apps/dev-launchpad/package.json b/apps/dev-launchpad/package.json
index 7e79ce4e4..6386fa2bf 100644
--- a/apps/dev-launchpad/package.json
+++ b/apps/dev-launchpad/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/dev-launchpad",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "private": true,
   "scripts": {
diff --git a/apps/e2e/package.json b/apps/e2e/package.json
index 8990716da..3fb2f961a 100644
--- a/apps/e2e/package.json
+++ b/apps/e2e/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/e2e-tests",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "private": true,
   "type": "module",
diff --git a/apps/hosted-components/package.json b/apps/hosted-components/package.json
index c83caecfc..9f53c1e72 100644
--- a/apps/hosted-components/package.json
+++ b/apps/hosted-components/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@hexclave/hosted-components",
   "private": true,
-  "version": "1.0.36",
+  "version": "1.0.37",
   "type": "module",
   "scripts": {
     "dev": "vite dev --port ${NEXT_PUBLIC_HEXCLAVE_PORT_PREFIX:-81}09",
diff --git a/apps/internal-tool/package.json b/apps/internal-tool/package.json
index dd591bb43..0f765190f 100644
--- a/apps/internal-tool/package.json
+++ b/apps/internal-tool/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@hexclave/internal-tool",
   "private": true,
-  "version": "1.0.36",
+  "version": "1.0.37",
   "type": "module",
   "scripts": {
     "dev": "node scripts/pre-dev.mjs && next dev --turbopack --port ${NEXT_PUBLIC_HEXCLAVE_PORT_PREFIX:-81}41",
diff --git a/apps/mcp/package.json b/apps/mcp/package.json
index d68c556ce..10f1d48df 100644
--- a/apps/mcp/package.json
+++ b/apps/mcp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/mcp",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "private": true,
   "type": "module",
diff --git a/apps/mock-oauth-server/package.json b/apps/mock-oauth-server/package.json
index a945d2126..b9bc42d31 100644
--- a/apps/mock-oauth-server/package.json
+++ b/apps/mock-oauth-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/mock-oauth-server",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "private": true,
   "main": "index.js",
diff --git a/apps/skills/package.json b/apps/skills/package.json
index 4de8d4616..cecd04030 100644
--- a/apps/skills/package.json
+++ b/apps/skills/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/skills",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "private": true,
   "type": "module",
diff --git a/docs-mintlify/package.json b/docs-mintlify/package.json
index 8eb5be202..57dbb1973 100644
--- a/docs-mintlify/package.json
+++ b/docs-mintlify/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/docs-mintlify",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "private": true,
   "scripts": {
     "dev": "mint dev --port ${NEXT_PUBLIC_HEXCLAVE_PORT_PREFIX:-81}04 --no-open",
diff --git a/docs/package.json b/docs/package.json
index 323bee897..7bf9bb5bc 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/docs",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "description": "",
   "main": "index.js",
diff --git a/examples/cjs-test/package.json b/examples/cjs-test/package.json
index 64cf0a081..de7edfc66 100644
--- a/examples/cjs-test/package.json
+++ b/examples/cjs-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/example-cjs-test",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "private": true,
   "scripts": {
diff --git a/examples/convex/package.json b/examples/convex/package.json
index cd2808c6a..2def235c6 100644
--- a/examples/convex/package.json
+++ b/examples/convex/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/convex-example",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "private": true,
   "scripts": {
diff --git a/examples/demo/package.json b/examples/demo/package.json
index fefe72be7..5bbf52958 100644
--- a/examples/demo/package.json
+++ b/examples/demo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/example-demo-app",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "description": "",
   "private": true,
diff --git a/examples/docs-examples/package.json b/examples/docs-examples/package.json
index 32377198f..f58eea314 100644
--- a/examples/docs-examples/package.json
+++ b/examples/docs-examples/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/docs-examples",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "description": "",
   "private": true,
diff --git a/examples/e-commerce/package.json b/examples/e-commerce/package.json
index be4c09425..984c08933 100644
--- a/examples/e-commerce/package.json
+++ b/examples/e-commerce/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/e-commerce-demo",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "private": true,
   "scripts": {
diff --git a/examples/js-example/package.json b/examples/js-example/package.json
index 523cf3e1e..ca038f432 100644
--- a/examples/js-example/package.json
+++ b/examples/js-example/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/js-example",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "private": true,
   "description": "",
diff --git a/examples/lovable-react-18-example/package.json b/examples/lovable-react-18-example/package.json
index 9a3df8697..87c76baf0 100644
--- a/examples/lovable-react-18-example/package.json
+++ b/examples/lovable-react-18-example/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@hexclave/lovable-react-18-example",
   "private": true,
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "type": "module",
   "scripts": {
diff --git a/examples/middleware/package.json b/examples/middleware/package.json
index acba41221..5c2e2c0ea 100644
--- a/examples/middleware/package.json
+++ b/examples/middleware/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/example-middleware-demo",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "private": true,
   "scripts": {
diff --git a/examples/react-example/package.json b/examples/react-example/package.json
index a69bc0176..8ece1877a 100644
--- a/examples/react-example/package.json
+++ b/examples/react-example/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-example",
   "private": true,
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "type": "module",
   "scripts": {
diff --git a/examples/supabase/package.json b/examples/supabase/package.json
index 137aa413b..acce874f0 100644
--- a/examples/supabase/package.json
+++ b/examples/supabase/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/example-supabase",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "private": true,
   "scripts": {
diff --git a/examples/tanstack-start-demo/package.json b/examples/tanstack-start-demo/package.json
index 0d3139d50..282d723bb 100644
--- a/examples/tanstack-start-demo/package.json
+++ b/examples/tanstack-start-demo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/example-tanstack-start-demo",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "description": "TanStack Start demo app for Hexclave",
   "private": true,
diff --git a/packages/cli/package.json b/packages/cli/package.json
index a8efc88a3..66c6703c5 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/cli",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "description": "The CLI for Hexclave. https://hexclave.com",
   "main": "dist/index.js",
diff --git a/packages/dashboard-ui-components/package.json b/packages/dashboard-ui-components/package.json
index e7c1c8af9..c26854855 100644
--- a/packages/dashboard-ui-components/package.json
+++ b/packages/dashboard-ui-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/dashboard-ui-components",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
diff --git a/packages/dashboard-ui-components/src/components/data-grid/data-grid-export-dialog.tsx b/packages/dashboard-ui-components/src/components/data-grid/data-grid-export-dialog.tsx
index 4c4e3d722..249b158a7 100644
--- a/packages/dashboard-ui-components/src/components/data-grid/data-grid-export-dialog.tsx
+++ b/packages/dashboard-ui-components/src/components/data-grid/data-grid-export-dialog.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { DownloadSimpleIcon } from "@phosphor-icons/react";
-import React, { useCallback, useEffect, useMemo, useState } from "react";
+import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 
 import { DesignButton } from "../button";
 import { DesignDialog } from "../dialog";
@@ -55,7 +55,7 @@ export function DataGridExportDialog<TRow>({
     [exportOptions?.fields, columns],
   );
   const [format, setFormat] = useState<DataGridExportFormat>("csv");
-  const [scope, setScope] = useState<DataGridExportScope>("all");
+  const [scope, setScope] = useState<DataGridExportScope>(exportOptions?.defaultScope ?? "all");
   const [fields, setFields] = useState<readonly DataGridExportField<TRow>[]>(resolvedFields);
   const [isExporting, setIsExporting] = useState(false);
   const [progress, setProgress] = useState<ExportProgress>(idleExportProgress);
@@ -67,6 +67,22 @@ export function DataGridExportDialog<TRow>({
     }
   }, [isExporting, resolvedFields]);
 
+  // Reset the scope to its default each time the dialog opens. The dialog stays
+  // mounted between opens, so without this the scope would retain whatever the
+  // user last picked instead of honoring `defaultScope` on every open. We track
+  // the previous `open` value with a ref so the reset only fires on a genuine
+  // closed->open transition -- not on every render that flips other state (e.g.
+  // `isExporting` going false after a failed/empty export would otherwise wipe
+  // the user's current selection while the dialog is still open).
+  const defaultScope = exportOptions?.defaultScope ?? "all";
+  const wasOpenRef = useRef(false);
+  useEffect(() => {
+    if (open && !wasOpenRef.current) {
+      setScope(defaultScope);
+    }
+    wasOpenRef.current = open;
+  }, [open, defaultScope]);
+
   const entityName = exportOptions?.entityName ?? "row";
   const entityNamePlural = exportOptions?.entityNamePlural ?? "rows";
   const filenamePrefix = exportOptions?.filenamePrefix ?? exportFilename;
diff --git a/packages/dashboard-ui-components/src/components/data-grid/types.ts b/packages/dashboard-ui-components/src/components/data-grid/types.ts
index 965e90894..f4b6ea286 100644
--- a/packages/dashboard-ui-components/src/components/data-grid/types.ts
+++ b/packages/dashboard-ui-components/src/components/data-grid/types.ts
@@ -251,6 +251,8 @@ export type DataGridExportOptions<TRow> = {
   allScopeLabel?: ReactNode;
   filteredScopeLabel?: ReactNode;
   progressSubjectLabel?: string;
+  /** Which export scope is selected by default when the dialog opens. Defaults to `"all"`. */
+  defaultScope?: DataGridExportScope;
 };
 
 // ─── Callbacks ───────────────────────────────────────────────────────
diff --git a/packages/js/package.json b/packages/js/package.json
index 0a185906d..6769e458d 100644
--- a/packages/js/package.json
+++ b/packages/js/package.json
@@ -1,7 +1,7 @@
 {
   "//": "THIS FILE IS AUTO-GENERATED FROM TEMPLATE. DO NOT EDIT IT DIRECTLY UNLESS YOU ALSO EDIT THE CORRESPONDING FILE IN packages/template (FOR package.json FILES, PLEASE EDIT package-template.json)",
   "name": "@hexclave/js",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "sideEffects": false,
   "main": "./dist/index.js",
diff --git a/packages/next/package.json b/packages/next/package.json
index e973c42ef..611454544 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,7 +1,7 @@
 {
   "//": "THIS FILE IS AUTO-GENERATED FROM TEMPLATE. DO NOT EDIT IT DIRECTLY UNLESS YOU ALSO EDIT THE CORRESPONDING FILE IN packages/template (FOR package.json FILES, PLEASE EDIT package-template.json)",
   "name": "@hexclave/next",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "sideEffects": false,
   "main": "./dist/index.js",
diff --git a/packages/react/package.json b/packages/react/package.json
index 5a7b1a22d..e3c3d96c0 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,7 +1,7 @@
 {
   "//": "THIS FILE IS AUTO-GENERATED FROM TEMPLATE. DO NOT EDIT IT DIRECTLY UNLESS YOU ALSO EDIT THE CORRESPONDING FILE IN packages/template (FOR package.json FILES, PLEASE EDIT package-template.json)",
   "name": "@hexclave/react",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "sideEffects": false,
   "main": "./dist/index.js",
diff --git a/packages/sc/package.json b/packages/sc/package.json
index 302d02be8..c0eae2df9 100644
--- a/packages/sc/package.json
+++ b/packages/sc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/sc",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "exports": {
     "./force-react-server": {
diff --git a/packages/shared-backend/package.json b/packages/shared-backend/package.json
index 5f32d00c0..497153785 100644
--- a/packages/shared-backend/package.json
+++ b/packages/shared-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/shared-backend",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
diff --git a/packages/shared-backend/src/index.ts b/packages/shared-backend/src/index.ts
index abe794c34..58eccfe67 100644
--- a/packages/shared-backend/src/index.ts
+++ b/packages/shared-backend/src/index.ts
@@ -5,4 +5,3 @@
 //                       "@hexclave/shared-backend/config-agent" subpath)
 export * from "./config-file";
 export * from "./config-updater";
-
diff --git a/packages/shared/package.json b/packages/shared/package.json
index a63fafcdf..ebf05e2d2 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/shared",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "scripts": {
     "build": "rimraf dist && tsdown",
diff --git a/packages/shared/src/config-rendering.ts b/packages/shared/src/config-rendering.ts
index 9f33938ca..023fb0386 100644
--- a/packages/shared/src/config-rendering.ts
+++ b/packages/shared/src/config-rendering.ts
@@ -115,4 +115,3 @@ import.meta.vitest?.test("detectConfigImportPackage picks first matching package
   expect(detectConfigImportPackage(["lodash", "express"])).toBeUndefined();
   expect(detectConfigImportPackage([])).toBeUndefined();
 });
-
diff --git a/packages/tanstack-start/package.json b/packages/tanstack-start/package.json
index c396708c0..c91d38e94 100644
--- a/packages/tanstack-start/package.json
+++ b/packages/tanstack-start/package.json
@@ -1,7 +1,7 @@
 {
   "//": "THIS FILE IS AUTO-GENERATED FROM TEMPLATE. DO NOT EDIT IT DIRECTLY UNLESS YOU ALSO EDIT THE CORRESPONDING FILE IN packages/template (FOR package.json FILES, PLEASE EDIT package-template.json)",
   "name": "@hexclave/tanstack-start",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "sideEffects": false,
   "main": "./dist/index.js",
diff --git a/packages/template/package-template.json b/packages/template/package-template.json
index cc618c8df..bd4242a3e 100644
--- a/packages/template/package-template.json
+++ b/packages/template/package-template.json
@@ -13,7 +13,7 @@
   
   "//": "NEXT_LINE_PLATFORM template",
   "private": true,
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "sideEffects": false,
   "main": "./dist/index.js",
diff --git a/packages/template/package.json b/packages/template/package.json
index 274aac3ba..a22603532 100644
--- a/packages/template/package.json
+++ b/packages/template/package.json
@@ -2,7 +2,7 @@
   "//": "THIS FILE IS AUTO-GENERATED FROM TEMPLATE. DO NOT EDIT IT DIRECTLY UNLESS YOU ALSO EDIT THE CORRESPONDING FILE IN packages/template (FOR package.json FILES, PLEASE EDIT package-template.json)",
   "name": "@hexclave/template",
   "private": true,
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "sideEffects": false,
   "main": "./dist/index.js",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 02cedd167..75766986a 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/ui",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "repository": "https://github.com/hexclave/hexclave",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
diff --git a/sdks/implementations/swift/package.json b/sdks/implementations/swift/package.json
index 37dc745ab..3c8151553 100644
--- a/sdks/implementations/swift/package.json
+++ b/sdks/implementations/swift/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/swift-sdk",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "private": true,
   "description": "Hexclave Swift SDK",
   "scripts": {
diff --git a/sdks/spec/package.json b/sdks/spec/package.json
index 755fcbd59..ea531cec1 100644
--- a/sdks/spec/package.json
+++ b/sdks/spec/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/sdk-spec",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "private": true,
   "description": "Hexclave SDK specification files",
   "scripts": {}