@beignet/cli 0.0.41 → 0.0.43

package/src/registry-edits.ts

@@ -1,3 +1,5 @@
+import ts from "typescript";
+
 /**
  * Shared string-edit helpers for registry files.
  *
@@ -28,21 +30,35 @@ export type AppendResult =
   | { kind: "missing" };
 
 /**
- * Find the index of the delimiter closing the one at `openIndex`, skipping
- * string literals.
+ * Yield indexes that belong to executable source, excluding string literals
+ * and line/block comments. Registry scanners share this lexer so delimiters
+ * in user comments cannot corrupt their depth tracking.
  */
-export function matchingDelimiterIndex(
+export function* codeCharacterIndexes(
   source: string,
-  openIndex: number,
-  open: string,
-  close: string,
-): number {
-  let depth = 0;
+  start = 0,
+  end = source.length,
+): Generator<number> {
   let inString: string | undefined;
   let escaped = false;
+  let inLineComment = false;
+  let inBlockComment = false;
 
-  for (let index = openIndex; index < source.length; index++) {
+  for (let index = start; index < end; index++) {
     const char = source[index];
+    const next = source[index + 1];
+
+    if (inLineComment) {
+      if (char === "\n" || char === "\r") inLineComment = false;
+      continue;
+    }
+    if (inBlockComment) {
+      if (char === "*" && next === "/") {
+        inBlockComment = false;
+        index++;
+      }
+      continue;
+    }
     if (inString) {
       if (escaped) {
         escaped = false;
@@ -54,11 +70,40 @@ export function matchingDelimiterIndex(
       continue;
     }
 
+    if (char === "/" && next === "/") {
+      inLineComment = true;
+      index++;
+      continue;
+    }
+    if (char === "/" && next === "*") {
+      inBlockComment = true;
+      index++;
+      continue;
+    }
     if (char === '"' || char === "'" || char === "`") {
       inString = char;
       continue;
     }
 
+    yield index;
+  }
+}
+
+/**
+ * Find the index of the delimiter closing the one at `openIndex`, skipping
+ * string literals and comments.
+ */
+export function matchingDelimiterIndex(
+  source: string,
+  openIndex: number,
+  open: string,
+  close: string,
+): number {
+  let depth = 0;
+
+  for (const index of codeCharacterIndexes(source, openIndex)) {
+    const char = source[index];
+
     if (char === open) {
       depth++;
       continue;
@@ -77,21 +122,32 @@ export function matchingDelimiterIndex(
  * Insert a line directly after the last top-level import statement.
  */
 export function insertAfterImports(source: string, line: string): string {
-  const lines = source.split("\n");
-  let lastImportIndex = -1;
-
-  for (let index = 0; index < lines.length; index++) {
-    if (lines[index].startsWith("import ")) {
-      lastImportIndex = index;
-    }
+  const sourceFile = ts.createSourceFile(
+    "registry.ts",
+    source,
+    ts.ScriptTarget.Latest,
+    true,
+    ts.ScriptKind.TS,
+  );
+  let lastImport: ts.ImportDeclaration | undefined;
+  for (const statement of sourceFile.statements) {
+    if (ts.isImportDeclaration(statement)) lastImport = statement;
   }
 
-  if (lastImportIndex === -1) {
+  if (!lastImport) {
     return `${line}\n${source}`;
   }
 
-  lines.splice(lastImportIndex + 1, 0, line);
-  return lines.join("\n");
+  const lineBreak = source.includes("\r\n") ? "\r\n" : "\n";
+  const lineEnd = source.indexOf(lineBreak, lastImport.end);
+  if (lineEnd === -1) {
+    return `${source}${lineBreak}${line}${lineBreak}`;
+  }
+
+  const insertAt = lineEnd + lineBreak.length;
+  return `${source.slice(0, insertAt)}${line}${lineBreak}${source.slice(
+    insertAt,
+  )}`;
 }
 
 /**
@@ -147,11 +203,14 @@ export function addNamedValueImport(
 export function identifiersFromArrayExpression(
   expression: string,
 ): Set<string> {
-  const withoutBrackets = expression.replace(/^\[/, "").replace(/\]$/, "");
+  const code = Array.from({ length: expression.length }, () => " ");
+  for (const index of codeCharacterIndexes(expression)) {
+    code[index] = expression[index];
+  }
 
   return new Set(
     Array.from(
-      withoutBrackets.matchAll(/\b[A-Za-z_$][\w$]*\b/g),
+      code.join("").matchAll(/\b[A-Za-z_$][\w$]*\b/g),
       ([name]) => name,
     ),
   );
@@ -342,26 +401,9 @@ function topLevelValueSlice(
   if (start >= hardEnd) return undefined;
 
   let depth = 0;
-  let inString: string | undefined;
-  let escaped = false;
 
-  for (let index = start; index <= hardEnd; index++) {
+  for (const index of codeCharacterIndexes(source, start, hardEnd + 1)) {
     const char = source[index];
-    if (inString) {
-      if (escaped) {
-        escaped = false;
-      } else if (char === "\\") {
-        escaped = true;
-      } else if (char === inString) {
-        inString = undefined;
-      }
-      continue;
-    }
-
-    if (char === '"' || char === "'" || char === "`") {
-      inString = char;
-      continue;
-    }
 
     if (char === "[" || char === "(" || char === "{") {
       depth++;

package/src/templates/agents.ts

@@ -62,8 +62,14 @@ use, so their absence is fine. \`${cli} make event\`, \`${cli} make job\`,
 \`${cli} make listener\`, \`${cli} make schedule\`, \`${cli} make task\`,
 \`${cli} make seed\`, and \`${cli} make upload\` create or update their
 required app entrypoints.
-\`${cli} doctor\` detects registration drift. \`${cli} doctor --fix\` repairs
-route-group, schedule, task, outbox, and listener registration.
+Upload generation validates the central \`uploadRegistry = defineUploads({ ... })\`
+shape before writing; when a custom route cannot be edited safely, follow the
+manual registry instruction in the error.
+\`${cli} doctor\` detects registration drift. Preview exact repair patches
+with \`${cli} doctor --fix --dry-run\`, then apply the returned plan with
+\`${cli} doctor --fix --plan <plan-id>\` and optional
+\`--only <operation-ids>\`. Plain \`${cli} doctor --fix\` remains the
+apply-all shortcut.
 
 ## Prefer generators
 
@@ -73,6 +79,9 @@ artifact list. Use \`${cli} make feature <name> --recipe full-slice\` when you
 need a richer reference slice with policy, client helpers, workflow artifacts,
 events, listener registration, jobs, and outbox wiring. After changing the Drizzle schema in
 \`infra/db/schema/\`, run \`${cli} db generate\` then \`${cli} db migrate\`.
+When MCP is available, use \`db_schema_sync\` for Beignet provider table
+re-exports and \`db\` for \`generate\`, \`migrate\`, \`seed\`, or \`reset\`
+instead of falling back to a shell.
 
 ## The framework already solves these
 
@@ -109,7 +118,11 @@ need one check alone.
 
 Before exploring unfamiliar code, run \`${cli} map\` for the human inventory
 or \`${cli} map --json --feature <name>\` for an evidence-backed graph scoped
-to one feature.
+to one feature. The graph honors the app's complete TypeScript \`baseUrl\` and
+\`paths\` configuration. Fix \`local_import_unresolved\` and
+\`contract_declaration_unresolved\` entries rather than treating their missing
+edges as proof that no relationship exists. Registration diagnostics expose
+the declaration as \`subject.file\` and \`subject.exportName\`.
 
 ## Package skills
 
@@ -148,17 +161,27 @@ skill-loading block.
 \`.mcp.json\` registers the app-local \`@beignet/cli\` bin at
 \`./node_modules/.bin/beignet mcp\`, which exposes the app map, validation, and
 generators as structured tools named exactly: \`app_map\`, \`explain\`,
-\`check\`, \`routes\`, \`doctor\`, \`doctor_fix\`, \`lint\`, \`make\`,
-\`provider_add\`. Use \`app_map\` before broad code search and pass a feature
+\`check\`, \`db\`, \`db_schema_sync\`, \`routes\`, \`doctor\`,
+\`doctor_fix_plan\`, \`doctor_fix\`, \`lint\`, \`make\`, \`provider_add\`.
+Use \`doctor_fix_plan\` to inspect
+stable operation IDs, hashes, exact patches, and current diagnostics before
+passing its \`planId\` and optional \`fixIds\` to \`doctor_fix\`. Guarded
+apply returns the same plan metadata and inspection payload as the CLI. Use
+\`app_map\` before broad code search and pass a feature
 or node kinds to keep context focused. Use \`explain\` for source-backed
-relationships, conventions, findings, and suggested files for one feature,
-route, provider, or diagnostic. Use \`check\` after edits to run the complete
-validation loop; it returns the same versioned result as
+relationships, conventions, findings, and suggested files for any mapped
+concept or diagnostic; its kinds match the app map. Use \`check\` after edits
+to run the complete validation loop; it returns the same versioned result as
 \`${cli} check --json\`, bounds failure output, and cancels the active package
 script when the MCP request is cancelled. It does not apply Beignet fixes, but
-app-owned scripts retain their normal side effects. Clients that do not read
-\`.mcp.json\` can use the same command from the app root; use \`${cli} mcp\`
-only for terminal debugging.
+app-owned scripts retain their normal side effects. Use \`db_schema_sync\` to
+preview or apply idempotent provider-table schema re-exports, then call \`db\`
+with \`generate\` and \`migrate\`; database output is bounded, commands time
+out, and cancellation stops the active process tree. Treat \`seed\` and
+especially \`reset\` as app-owned mutations. Lifecycle \`dryRun\` validates
+and reports the script without executing it; it does not simulate SQL or data
+changes. Clients that do not read \`.mcp.json\` can use the same command from
+the app root; use \`${cli} mcp\` only for terminal debugging.
 `;
 }
 

package/src/templates/base.ts

@@ -1,6 +1,7 @@
 import { databaseLocalUrl, databaseStartCommand } from "../choices.js";
 import { shadcnDependencies, shadcnDevDependencies } from "./shadcn.js";
 import {
+  currentGeneratedPackageScripts,
   externalVersions,
   hasStarterProvider,
   json,
@@ -97,11 +98,11 @@ export function packageJson(ctx: TemplateContext): string {
     start: "next start",
     lint: "biome lint .",
     format: "biome format --write .",
-    test: "tsx lib/beignet-test-runner.ts",
+    test: currentGeneratedPackageScripts.test,
     typecheck: "tsc --noEmit",
     "db:generate": "drizzle-kit generate",
     "db:migrate": "drizzle-kit migrate",
-    "db:reset": "tsx infra/db/reset.ts",
+    "db:reset": currentGeneratedPackageScripts["db:reset"],
   };
 
   return json({
@@ -361,7 +362,7 @@ ${optionalAuthRedirects}
       ? ""
       : "; it refuses non-local hosts unless `BEIGNET_ALLOW_DATABASE_RESET=true`"
   }.
-- Remove \`DEVTOOLS_ENABLED=true\` in production unless you add authentication and stricter redaction.
+- Remove \`DEVTOOLS_ENABLED=true\` outside development unless you add authentication and stricter redaction.
 - Set \`APP_URL\`, \`BETTER_AUTH_SECRET\`, \`LOG_LEVEL\`, and provider-specific variables in your hosting environment.
 - Set \`BETTER_AUTH_TRUSTED_ORIGINS\` before serving auth across multiple origins.
 - Review the starter authorization policy before exposing user-owned data.
@@ -462,7 +463,7 @@ export function envExample(ctx: TemplateContext): string {
     "# Copy to .env.local and fill in values for your app.",
     "APP_URL=http://localhost:3000",
     "",
-    "# Dev-only default; remove or protect in production.",
+    "# Local-development default; remove or protect outside development.",
     "DEVTOOLS_ENABLED=true",
     "",
     "LOG_LEVEL=info",

package/src/templates/db/mysql.ts

@@ -126,9 +126,9 @@ export const todos = mysqlTable(
 		// unmapped, and list ordering compares the strings lexicographically.
 		createdAt: varchar("created_at", { length: 32 }).notNull(),
 	},
-	(table) => ({
-		userIdx: index("todos_user_idx").on(table.userId, table.createdAt),
-	}),
+	(table) => [
+		index("todos_user_idx").on(table.userId, table.createdAt),
+	],
 );
 `,
     drizzleTodoRepository: `import "@beignet/core/server-only";

package/src/templates/db/postgres.ts

@@ -116,9 +116,9 @@ export const todos = pgTable(
 		// unmapped, and list ordering compares the strings lexicographically.
 		createdAt: text("created_at").notNull(),
 	},
-	(table) => ({
-		userIdx: index("todos_user_idx").on(table.userId, table.createdAt),
-	}),
+	(table) => [
+		index("todos_user_idx").on(table.userId, table.createdAt),
+	],
 );
 `,
     drizzleTodoRepository: `import "@beignet/core/server-only";

package/src/templates/db/sqlite.ts

@@ -112,9 +112,9 @@ export const todos = sqliteTable(
 			.default(false),
 		createdAt: text("created_at").notNull(),
 	},
-	(table) => ({
-		userIdx: index("todos_user_idx").on(table.userId, table.createdAt),
-	}),
+	(table) => [
+		index("todos_user_idx").on(table.userId, table.createdAt),
+	],
 );
 `,
   drizzleTodoRepository: `import "@beignet/core/server-only";

package/src/templates/server.ts

@@ -34,7 +34,7 @@ export function serverProviders(ctx: TemplateContext): string {
 
   const entries = [
     "\tcreateDevtoolsProvider(),",
-    "\tcreateBetterAuthProvider<AuthUser, AuthSessionMetadata>(auth),",
+    "\tcreateBetterAuthProvider<AuthUser, AuthSessionMetadata>({ auth }),",
     "\tcreatePinoLoggerProvider(),",
     `\t${db.providerInstance},`,
     "\tstarterDatabaseProvider,",
@@ -196,12 +196,12 @@ export const env = createEnv({
 		NODE_ENV: z
 			.enum(["development", "test", "production"])
 			.default("development"),
-		APP_URL: z.string().url().default("http://localhost:3000"),
+		APP_URL: z.url().default("http://localhost:3000"),
 		DEVTOOLS_ENABLED: BooleanEnv.optional(),
 		BETTER_AUTH_SECRET: isProductionRuntime
 			? BetterAuthSecret
 			: BetterAuthSecret.default(LOCAL_BETTER_AUTH_SECRET),
-		BETTER_AUTH_URL: z.string().url().default("http://localhost:3000"),
+		BETTER_AUTH_URL: z.url().default("http://localhost:3000"),
 		BETTER_AUTH_TRUSTED_ORIGINS: z.string().optional(),
 ${databaseEnvLines}
 		LOG_LEVEL: z
@@ -217,7 +217,7 @@ ${inngestEnvLines}
 export const isProduction = env.NODE_ENV === "production";
 
 export const isDevtoolsEnabled =
-	env.DEVTOOLS_ENABLED ?? process.env.NODE_ENV !== "production";
+	env.DEVTOOLS_ENABLED ?? env.NODE_ENV === "development";
 `;
 }
 

package/src/templates/shared.ts

@@ -67,18 +67,26 @@ export const externalVersions = {
   upstashRedis: "^1.0.0",
 };
 
-export const legacyGeneratedPackageScripts: Record<string, string> = {
-  "db:reset": "bun infra/db/reset.ts",
-  "db:seed": "bun server/seed.ts",
-  test: "bun test",
-};
+export const legacyGeneratedPackageScripts: Record<string, readonly string[]> =
+  {
+    "db:reset": ["bun infra/db/reset.ts"],
+    "db:seed": ["bun server/seed.ts"],
+    test: ["bun test", "tsx lib/beignet-test-runner.ts"],
+  };
 
 export const currentGeneratedPackageScripts: Record<string, string> = {
   "db:reset": "tsx infra/db/reset.ts",
   "db:seed": "tsx server/seed.ts",
-  test: "tsx lib/beignet-test-runner.ts",
+  test: "node --import tsx lib/beignet-test-runner.ts",
 };
 
+export function isLegacyGeneratedPackageScript(
+  name: string,
+  command: string | undefined,
+): boolean {
+  return legacyGeneratedPackageScripts[name]?.includes(command ?? "") ?? false;
+}
+
 /**
  * Dialect-specific names used when rendering database-aware templates.
  */

package/src/templates/todos.ts

@@ -2,7 +2,7 @@ const files = {
   schemas: `import { z } from "zod";
 
 export const TodoSchema = z.object({
-	id: z.string().uuid(),
+	id: z.uuid(),
 	userId: z.string(),
 	title: z.string().min(1),
 	completed: z.boolean(),
@@ -26,7 +26,7 @@ export const ListTodosOutputSchema = z.object({
 });
 
 export const TodoIdInputSchema = z.object({
-	id: z.string().uuid(),
+	id: z.uuid(),
 });
 
 export const CreateTodoInputSchema = z.object({