fix(cli): preserve raw auth client reruns

Author: zbeyens

.changeset/ten-bees-swim.md

@@ -7,3 +7,7 @@
 - Fix `bunx --bun kitcn init -t start --yes` so Bun-native parse-time imports
   no longer bypass project aliases and crash first-run codegen on scaffolded
   Start files.
+- Fix raw auth reruns so `http.ts` import detection respects both quote styles,
+  `registerRoutes(http, getAuth, ...)` accepts Better Auth route contracts
+  without a type cast, and raw auth clients keep the app `SITE_URL` while
+  preserving user-edited raw `auth-client.ts` files on reruns.

packages/kitcn/src/cli/cli.commands.ts

@@ -2370,9 +2370,7 @@ describe('cli/cli', () => {
         path.join(dir, 'lib', 'convex', 'auth-client.ts'),
         'utf8'
       );
-      expect(authClientSource).toContain(
-        'process.env.NEXT_PUBLIC_CONVEX_SITE_URL!'
-      );
+      expect(authClientSource).toContain('process.env.NEXT_PUBLIC_SITE_URL!');
       expect(authClientSource).not.toContain('createAuthMutations');
 
       const schemaSource = fs.readFileSync(
@@ -2474,9 +2472,7 @@ describe('cli/cli', () => {
         path.join(dir, 'src', 'lib', 'convex', 'auth-client.ts'),
         'utf8'
       );
-      expect(authClientSource).toContain(
-        'import.meta.env.VITE_CONVEX_SITE_URL!'
-      );
+      expect(authClientSource).toContain('import.meta.env.VITE_SITE_URL!');
       expect(authClientSource).not.toContain('createAuthMutations');
       expect(
         execaStub.mock.calls.some((call) => {
@@ -2566,9 +2562,7 @@ describe('cli/cli', () => {
         path.join(dir, 'src', 'lib', 'convex', 'auth-client.ts'),
         'utf8'
       );
-      expect(authClientSource).toContain(
-        'import.meta.env.VITE_CONVEX_SITE_URL!'
-      );
+      expect(authClientSource).toContain('import.meta.env.VITE_SITE_URL!');
       expect(authClientSource).not.toContain('createAuthMutations');
 
       const httpSource = fs.readFileSync(
@@ -2683,6 +2677,84 @@ describe('cli/cli', () => {
     }
   });
 
+  test('run(add auth --preset convex --yes) preserves a user-edited raw start auth client on rerun', async () => {
+    const dir = fs.mkdtempSync(
+      path.join(os.tmpdir(), 'kitcn-cli-add-auth-convex-start-auth-client-')
+    );
+    const oldCwd = process.cwd();
+    writeRawConvexStartApp(dir);
+    fs.writeFileSync(
+      path.join(dir, '.env.local'),
+      'CONVEX_DEPLOYMENT=local:demo\nVITE_CONVEX_URL=http://127.0.0.1:3210\n'
+    );
+    process.chdir(dir);
+
+    try {
+      const execaStub = mock(async (_cmd: string, args: string[]) => {
+        if (args[0] === '/fake/convex/main.js' && args[1] === 'codegen') {
+          return { exitCode: 0, stdout: '', stderr: '' } as any;
+        }
+
+        return { exitCode: 0 } as any;
+      });
+      const generateMetaStub = mock(async () => {});
+      const syncEnvStub = mock(async () => {});
+      const loadConfigStub = mock(() => createDefaultConfig());
+
+      await run(['add', 'auth', '--preset', 'convex', '--yes'], {
+        realConvex: '/fake/convex/main.js',
+        execa: execaStub as any,
+        generateMeta: generateMetaStub as any,
+        syncEnv: syncEnvStub as any,
+        loadCliConfig: loadConfigStub as any,
+      });
+
+      const authClientPath = path.join(
+        dir,
+        'src',
+        'lib',
+        'convex',
+        'auth-client.ts'
+      );
+      const editedAuthClientSource = `${fs.readFileSync(authClientPath, 'utf8')}
+// user plugin
+`;
+      fs.writeFileSync(authClientPath, editedAuthClientSource, 'utf8');
+      const nodeModulesDir = path.join(dir, 'node_modules');
+      fs.mkdirSync(nodeModulesDir, { recursive: true });
+      fs.symlinkSync(
+        path.join(oldCwd, 'packages', 'kitcn'),
+        path.join(nodeModulesDir, 'kitcn')
+      );
+      fs.symlinkSync(
+        path.join(oldCwd, 'node_modules', 'better-auth'),
+        path.join(nodeModulesDir, 'better-auth')
+      );
+      fs.symlinkSync(
+        path.join(oldCwd, 'node_modules', 'zod'),
+        path.join(nodeModulesDir, 'zod')
+      );
+
+      const exitCode = await run(
+        ['add', 'auth', '--preset', 'convex', '--yes', '--no-codegen'],
+        {
+          realConvex: '/fake/convex/main.js',
+          execa: execaStub as any,
+          generateMeta: generateMetaStub as any,
+          syncEnv: syncEnvStub as any,
+          loadCliConfig: loadConfigStub as any,
+        }
+      );
+
+      expect(exitCode).toBe(0);
+      expect(fs.readFileSync(authClientPath, 'utf8')).toBe(
+        editedAuthClientSource
+      );
+    } finally {
+      process.chdir(oldCwd);
+    }
+  });
+
   test('run(add ratelimit/auth/resend --yes --no-codegen) keeps auth in root schema and other plugins in one ordered extend call', async () => {
     const dir = fs.mkdtempSync(
       path.join(os.tmpdir(), 'kitcn-cli-add-plugin-stack-')

packages/kitcn/src/cli/registry/items/auth/auth-client.template.ts

@@ -53,7 +53,7 @@ export const AUTH_CONVEX_CLIENT_TEMPLATE = `import { createAuthClient } from 'be
 import { convexClient } from 'kitcn/auth/client';
 
 export const authClient = createAuthClient({
-  baseURL: process.env.NEXT_PUBLIC_CONVEX_SITE_URL!,
+  baseURL: process.env.NEXT_PUBLIC_SITE_URL!,
   plugins: [convexClient()],
 });
 `;
@@ -62,7 +62,7 @@ export const AUTH_CONVEX_REACT_CLIENT_TEMPLATE = `import { createAuthClient } fr
 import { convexClient } from 'kitcn/auth/client';
 
 export const authClient = createAuthClient({
-  baseURL: import.meta.env.VITE_CONVEX_SITE_URL!,
+  baseURL: import.meta.env.VITE_SITE_URL!,
   plugins: [convexClient()],
 });
 `;

packages/kitcn/src/cli/registry/items/auth/reconcile-auth-schema.ts

@@ -13,6 +13,7 @@ type AuthSchemaTemplateId = 'auth-schema' | 'auth-schema-convex';
 type UserOwnedAuthTemplateId =
   | 'auth-config'
   | 'auth-config-convex'
+  | 'auth-client-convex'
   | 'auth-runtime'
   | 'auth-runtime-convex';
 
@@ -30,6 +31,7 @@ const AUTH_SCHEMA_TEMPLATE_IDS = new Set<AuthSchemaTemplateId>([
 const USER_OWNED_AUTH_TEMPLATE_IDS = new Set<UserOwnedAuthTemplateId>([
   'auth-config',
   'auth-config-convex',
+  'auth-client-convex',
   'auth-runtime',
   'auth-runtime-convex',
 ]);