@beignet/cli 0.0.38 → 0.0.40

package/src/mcp.ts

@@ -78,13 +78,13 @@ const makeInputSchema = {
     .string()
     .optional()
     .describe(
-      "Artifact name. Required except for inbox, outbox, payments, and tenancy. Feature-owned artifacts use feature-scoped paths such as posts/backfill.",
+      "Artifact name. Required except for inbox, outbox, payments, and tenancy. Feature-owned artifacts use identities such as posts.backfill.",
     ),
   with: z
     .array(z.enum(makeFeatureAddonChoices))
     .optional()
     .describe(
-      "feature only: add feature-owned artifacts such as policy, factories, seeds, events, listeners, jobs, notifications, schedules, tasks, ui, and uploads.",
+      "feature only: add feature-owned artifacts such as policy, factory, seed, event, listener, job, notification, schedule, task, ui, and upload.",
     ),
   recipe: z
     .enum(makeFeatureRecipeChoices)
@@ -94,7 +94,7 @@ const makeInputSchema = {
     .string()
     .optional()
     .describe(
-      "listener only (required): event to listen to, for example posts/published.",
+      "listener only (required): event to listen to, for example posts.published.",
     ),
   cron: z
     .string()
@@ -108,13 +108,19 @@ const makeInputSchema = {
     .boolean()
     .optional()
     .describe("schedule only: generate a Next.js cron route for the schedule."),
-  auth: z
+  ui: z
+    .boolean()
+    .optional()
+    .describe(
+      "upload only: generate a typed React upload client and component.",
+    ),
+  authorization: z
     .boolean()
     .optional()
     .describe(
       "resource only: generate policy metadata and use-case authorization checks for mutating routes.",
     ),
-  tenant: z
+  tenantScoped: z
     .boolean()
     .optional()
     .describe(
@@ -163,8 +169,9 @@ type MakeToolInput = {
   cron?: string;
   timezone?: string;
   route?: boolean;
-  auth?: boolean;
-  tenant?: boolean;
+  ui?: boolean;
+  authorization?: boolean;
+  tenantScoped?: boolean;
   events?: boolean;
   softDelete?: boolean;
   force?: boolean;
@@ -268,7 +275,7 @@ async function runMakeTool(
     case "listener":
       if (!input.event) {
         throw new Error(
-          "make listener requires an event, for example event: posts/published.",
+          "make listener requires an event, for example event: posts.published.",
         );
       }
       return makeListener({ ...base, event: input.event });
@@ -281,8 +288,8 @@ async function runMakeTool(
     case "resource":
       return makeResource({
         ...base,
-        auth: input.auth,
-        tenant: input.tenant,
+        authorization: input.authorization,
+        tenantScoped: input.tenantScoped,
         events: input.events,
         softDelete: input.softDelete,
       });
@@ -300,7 +307,7 @@ async function runMakeTool(
     case "test":
       return makeTest(base);
     case "upload":
-      return makeUpload(base);
+      return makeUpload({ ...base, ui: input.ui });
     case "use-case":
       return makeUseCase(base);
   }
@@ -418,7 +425,7 @@ export function buildBeignetMcpServer(options: McpServerOptions): McpServer {
     "make",
     {
       description:
-        "Generate Beignet app files for one artifact: adapter, contract, event, factory, feature, inbox, job, listener, notification, outbox, payments, policy, port, resource, schedule, seed, task, tenancy, test, upload, or use-case. Generators auto-register artifacts, so doctor stays clean. Options by artifact: feature accepts with (addons); resource accepts auth, tenant, events, softDelete; listener requires event; schedule accepts cron, timezone, route. All artifacts accept force and dryRun. Returns created, updated, and skipped files as JSON.",
+        "Generate Beignet app files for one artifact: adapter, contract, event, factory, feature, inbox, job, listener, notification, outbox, payments, policy, port, resource, schedule, seed, task, tenancy, test, upload, or use-case. Generators auto-register artifacts, so doctor stays clean. Options by artifact: feature accepts with (addons); resource accepts authorization, tenantScoped, events, softDelete; listener requires event; schedule accepts cron, timezone, route; upload accepts ui. All artifacts accept force and dryRun. Returns created, updated, and skipped files as JSON.",
       inputSchema: makeInputSchema,
     },
     async (input) =>
@@ -430,7 +437,7 @@ export function buildBeignetMcpServer(options: McpServerOptions): McpServer {
   server.registerTool(
     "provider_add",
     {
-      description: `Add a Beignet provider setup preset to this app. Updates dependencies, provider registration, app port wiring, .env.example, and docs/integrations.md. Presets: ${providerPresetDescription}. Supports dryRun.`,
+      description: `Add a Beignet provider setup preset to this app. Updates dependencies, provider registration, app port wiring, .env.example, and docs/providers.md. Presets: ${providerPresetDescription}. Supports dryRun.`,
       inputSchema: providerAddInputSchema,
     },
     async (input) =>

package/src/provider-add.ts

@@ -1,9 +1,9 @@
 import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
 import path from "node:path";
 import {
-  type IntegrationName,
   type ProviderPresetName,
   providerPresetChoices,
+  type StarterProviderName,
 } from "./choices.js";
 import {
   directoryPath,
@@ -72,6 +72,18 @@ type PlannedFile = {
   result: "created" | "updated" | "skipped";
 };
 
+type ProviderPlanFile = {
+  path: string;
+  content: string;
+};
+
+type ProviderSourceReader = (filePath: string) => Promise<string | undefined>;
+
+export type CreateProviderPresetPlan = {
+  files: ProviderPlanFile[];
+  presets: AddProviderPresetResult[];
+};
+
 const presets: Record<ProviderPresetName, ProviderPreset> = {
   "flags-openfeature": {
     name: "flags-openfeature",
@@ -105,7 +117,7 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
     nextSteps: [
       "Run your package manager install command.",
       "Configure an OpenFeature provider before relying on non-default flag values.",
-      "Run beignet providers audit and beignet doctor --strict.",
+      "Run beignet provider audit and beignet doctor --strict.",
     ],
   },
   "jobs-bullmq": {
@@ -148,7 +160,7 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
       "Run your package manager install command.",
       "Set BULLMQ_REDIS_URL in .env.local or your deployment environment.",
       "Add a worker entrypoint that runs createBullMQJobWorker(...) in a worker process; dispatched jobs do not execute without one. See the jobs docs page.",
-      "Run beignet providers audit and beignet doctor --strict.",
+      "Run beignet provider audit and beignet doctor --strict.",
     ],
     conflictingProviderEntries: ["createInngestJobsProvider"],
   },
@@ -190,7 +202,7 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
       "Run your package manager install command.",
       "Set INNGEST_APP_NAME and, for Inngest cloud, INNGEST_EVENT_KEY in .env.local or your deployment environment.",
       "Expose an Inngest serve route with createInngestJobFunction(...) so dispatched jobs execute. See the jobs docs page.",
-      "Run beignet providers audit and beignet doctor --strict.",
+      "Run beignet provider audit and beignet doctor --strict.",
     ],
     conflictingProviderEntries: ["createBullMQJobsProvider"],
   },
@@ -230,7 +242,7 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
     nextSteps: [
       "Run your package manager install command.",
       "Set RESEND_API_KEY and RESEND_FROM in .env.local or your deployment environment.",
-      "Run beignet providers audit and beignet doctor --strict.",
+      "Run beignet provider audit and beignet doctor --strict.",
     ],
     conflictingProviderEntries: [
       "createSmtpMailProvider",
@@ -276,7 +288,7 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
     nextSteps: [
       "Run your package manager install command.",
       "Set MAIL_HOST, MAIL_PORT, MAIL_USER, MAIL_PASS, and MAIL_FROM in .env.local or your deployment environment.",
-      "Run beignet providers audit and beignet doctor --strict.",
+      "Run beignet provider audit and beignet doctor --strict.",
     ],
     conflictingProviderEntries: [
       "createResendMailProvider",
@@ -327,7 +339,7 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
       "Run your package manager install command.",
       "Set STRIPE_SECRET_KEY and STRIPE_WEBHOOK_SECRET in .env.local or your deployment environment.",
       "Run beignet make payments for the full billing slice; Stripe needs its webhook route before subscription state can sync.",
-      "Run beignet providers audit and beignet doctor --strict.",
+      "Run beignet provider audit and beignet doctor --strict.",
     ],
     conflictingProviderEntries: ["createMemoryPaymentsProvider"],
   },
@@ -368,11 +380,11 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
     nextSteps: [
       "Run your package manager install command.",
       "Set MEILISEARCH_HOST and any needed MEILISEARCH_* values in .env.local or your deployment environment.",
-      "Run beignet providers audit and beignet doctor --strict.",
+      "Run beignet provider audit and beignet doctor --strict.",
     ],
   },
-  sentry: {
-    name: "sentry",
+  "error-reporting-sentry": {
+    name: "error-reporting-sentry",
     displayName: "Sentry error reporting",
     importName: "createSentryErrorReportingProvider",
     importFrom: "@beignet/provider-error-reporting-sentry",
@@ -403,11 +415,11 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
     nextSteps: [
       "Run your package manager install command.",
       "Set SENTRY_DSN in .env.local or your deployment environment.",
-      "Run beignet providers audit and beignet doctor --strict.",
+      "Run beignet provider audit and beignet doctor --strict.",
     ],
   },
-  "redis-cache": {
-    name: "redis-cache",
+  "cache-redis": {
+    name: "cache-redis",
     displayName: "Redis cache",
     importName: "createRedisCacheProvider",
     importFrom: "@beignet/provider-cache-redis",
@@ -442,7 +454,7 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
     nextSteps: [
       "Run your package manager install command.",
       "Set REDIS_URL in .env.local or your deployment environment.",
-      "Run beignet providers audit and beignet doctor --strict.",
+      "Run beignet provider audit and beignet doctor --strict.",
     ],
   },
   "event-bus-redis": {
@@ -485,12 +497,12 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
       "Run your package manager install command.",
       "Set REDIS_EVENT_BUS_URL in .env.local or your deployment environment.",
       "Keep durable side effects on the outbox/jobs path; Redis Pub/Sub does not replay missed events.",
-      "Run beignet providers audit and beignet doctor --strict.",
+      "Run beignet provider audit and beignet doctor --strict.",
     ],
     conflictingProviderEntries: ["createMemoryEventBusProvider"],
   },
-  "redis-locks": {
-    name: "redis-locks",
+  "locks-redis": {
+    name: "locks-redis",
     displayName: "Redis locks",
     importName: "createRedisLocksProvider",
     importFrom: "@beignet/provider-locks-redis",
@@ -526,11 +538,11 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
     nextSteps: [
       "Run your package manager install command.",
       "Set REDIS_LOCKS_URL in .env.local or your deployment environment.",
-      "Run beignet providers audit and beignet doctor --strict.",
+      "Run beignet provider audit and beignet doctor --strict.",
     ],
   },
-  "s3-storage": {
-    name: "s3-storage",
+  "storage-s3": {
+    name: "storage-s3",
     displayName: "S3-compatible storage",
     importName: "createS3StorageProvider",
     importFrom: "@beignet/provider-storage-s3",
@@ -587,15 +599,15 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
     nextSteps: [
       "Run your package manager install command.",
       "Set STORAGE_S3_BUCKET and any needed STORAGE_S3_* credentials in .env.local or your deployment environment.",
-      "Run beignet providers audit and beignet doctor --strict.",
+      "Run beignet provider audit and beignet doctor --strict.",
     ],
     conflictingProviderEntries: [
       "createLocalStorageProvider",
       "createVercelBlobStorageProvider",
     ],
   },
-  "vercel-blob-storage": {
-    name: "vercel-blob-storage",
+  "storage-vercel-blob": {
+    name: "storage-vercel-blob",
     displayName: "Vercel Blob storage",
     importName: "createVercelBlobStorageProvider",
     importFrom: "@beignet/provider-storage-vercel-blob",
@@ -634,15 +646,15 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
     nextSteps: [
       "Run your package manager install command.",
       "Connect a Vercel Blob store to the project (or set BLOB_READ_WRITE_TOKEN manually).",
-      "Run beignet providers audit and beignet doctor --strict.",
+      "Run beignet provider audit and beignet doctor --strict.",
     ],
     conflictingProviderEntries: [
       "createLocalStorageProvider",
       "createS3StorageProvider",
     ],
   },
-  "upstash-rate-limit": {
-    name: "upstash-rate-limit",
+  "rate-limit-upstash": {
+    name: "rate-limit-upstash",
     displayName: "Upstash rate limit",
     importName: "createUpstashRateLimitProvider",
     importFrom: "@beignet/provider-rate-limit-upstash",
@@ -681,7 +693,7 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
     nextSteps: [
       "Run your package manager install command.",
       "Set UPSTASH_REDIS_REST_URL and UPSTASH_REDIS_REST_TOKEN in .env.local or your deployment environment.",
-      "Run beignet providers audit and beignet doctor --strict.",
+      "Run beignet provider audit and beignet doctor --strict.",
     ],
   },
 };
@@ -690,12 +702,12 @@ const providerPresetSet = new Set<string>(providerPresetChoices);
 
 /**
  * Provider entries the starter template wires for each create-time
- * integration, used to pre-validate preset selections at create time.
+ * provider, used to pre-validate preset selections at create time.
  */
-const integrationProviderEntries: Record<IntegrationName, string> = {
-  inngest: "createInngestJobsProvider",
-  resend: "createResendMailProvider",
-  "upstash-rate-limit": "createUpstashRateLimitProvider",
+const starterProviderEntries: Record<StarterProviderName, string> = {
+  "jobs-inngest": "createInngestJobsProvider",
+  "mail-resend": "createResendMailProvider",
+  "rate-limit-upstash": "createUpstashRateLimitProvider",
 };
 
 /**
@@ -707,15 +719,18 @@ export function providerPresetNeedsEnv(name: ProviderPresetName): boolean {
 
 /**
  * Fail fast when a create-time selection combines presets or template
- * integrations that fill the same app port, before any files are written.
+ * starter providers that fill the same app port, before any files are written.
  */
 export function assertCompatibleCreatePresets(
   presetNames: readonly ProviderPresetName[],
-  integrations: readonly IntegrationName[],
+  starterProviders: readonly StarterProviderName[],
 ): void {
   const selectedEntries = new Map<string, string>();
-  for (const integration of integrations) {
-    selectedEntries.set(integrationProviderEntries[integration], integration);
+  for (const starterProvider of starterProviders) {
+    selectedEntries.set(
+      starterProviderEntries[starterProvider],
+      starterProvider,
+    );
   }
   for (const name of presetNames) {
     selectedEntries.set(presets[name].importName, name);
@@ -726,7 +741,7 @@ export function assertCompatibleCreatePresets(
       const other = selectedEntries.get(conflict);
       if (other !== undefined && other !== name) {
         throw new Error(
-          `--integrations selections "${name}" and "${other}" fill the same app port. Pick one of them.`,
+          `--providers selections "${name}" and "${other}" fill the same app port. Pick one of them.`,
         );
       }
     }
@@ -747,18 +762,85 @@ export async function addProviderPreset(
   const preset = presets[options.name as ProviderPresetName];
   const targetDir = path.resolve(options.cwd ?? process.cwd());
   const config = await loadBeignetConfig(targetDir);
-  const packageJsonPath = "package.json";
-  const providersPath = serverProvidersPath(config);
-  const integrationsPath = "docs/integrations.md";
+  const readSource: ProviderSourceReader = (filePath) =>
+    readOptionalAppFile(targetDir, filePath);
+  const filesToPlan = await providerPresetFiles(preset, config, readSource);
+  const plannedFiles = await planFiles(filesToPlan, readSource);
 
-  const packageJsonSource = await readRequiredAppFile(
+  if (!options.dryRun) {
+    for (const file of plannedFiles) {
+      await writePlannedFile(targetDir, file);
+    }
+  }
+
+  return providerPresetResult(
+    preset,
     targetDir,
+    Boolean(options.dryRun),
+    plannedFiles,
+  );
+}
+
+/**
+ * Apply provider presets to an in-memory fresh scaffold. Each preset reads the
+ * previous preset's output so dry runs model the real sequential create path.
+ */
+export async function planProviderPresetsForCreate(options: {
+  targetDir: string;
+  files: readonly ProviderPlanFile[];
+  names: readonly ProviderPresetName[];
+}): Promise<CreateProviderPresetPlan> {
+  const sources = new Map(
+    options.files.map((file) => [file.path, file.content] as const),
+  );
+  const config = await loadBeignetConfig(options.targetDir);
+  const presetResults: AddProviderPresetResult[] = [];
+  const readSource: ProviderSourceReader = async (filePath) => {
+    const generatedSource = sources.get(filePath);
+    return generatedSource ?? readOptionalAppFile(options.targetDir, filePath);
+  };
+
+  for (const name of options.names) {
+    const preset = presets[name];
+    const filesToPlan = await providerPresetFiles(preset, config, readSource);
+    const plannedFiles = await planFiles(filesToPlan, readSource);
+
+    for (const file of plannedFiles) {
+      sources.set(file.path, file.content);
+    }
+
+    presetResults.push(
+      providerPresetResult(preset, options.targetDir, true, plannedFiles),
+    );
+  }
+
+  return {
+    files: [...sources].map(([filePath, content]) => ({
+      path: filePath,
+      content,
+    })),
+    presets: presetResults,
+  };
+}
+
+async function providerPresetFiles(
+  preset: ProviderPreset,
+  config: ResolvedBeignetConfig,
+  readSource: ProviderSourceReader,
+): Promise<ProviderPlanFile[]> {
+  const packageJsonPath = "package.json";
+  const providersPath = serverProvidersPath(config);
+  const providersDocsPath = "docs/providers.md";
+  const packageJsonSource = await readRequiredSource(
+    readSource,
     packageJsonPath,
   );
   const packageJson = parsePackageJson(packageJsonSource);
-  const envExampleSource = await readOptionalAppFile(targetDir, ".env.example");
-  const envExampleContent = updateEnvExample(envExampleSource, preset);
-  const filesToPlan = [
+  const envExampleContent = updateEnvExample(
+    await readSource(".env.example"),
+    preset,
+  );
+  const files = [
     {
       path: packageJsonPath,
       content: updatePackageJson(packageJsonSource, packageJson, preset),
@@ -766,53 +848,51 @@ export async function addProviderPreset(
     {
       path: providersPath,
       content: updateServerProviders(
-        await readRequiredAppFile(targetDir, providersPath),
+        await readRequiredSource(readSource, providersPath),
         preset,
       ),
     },
     {
       path: config.paths.ports,
       content: updatePortsFile(
-        await readRequiredAppFile(targetDir, config.paths.ports),
+        await readRequiredSource(readSource, config.paths.ports),
         preset.appPort,
       ),
     },
     {
       path: config.paths.portWiring,
       content: updateInfrastructurePortsFile(
-        await readRequiredAppFile(targetDir, config.paths.portWiring),
+        await readRequiredSource(readSource, config.paths.portWiring),
         preset.appPort.key,
       ),
     },
     {
-      path: integrationsPath,
-      content: updateIntegrationsDoc(
-        await readOptionalAppFile(targetDir, integrationsPath),
-        preset,
-      ),
+      path: providersDocsPath,
+      content: updateProvidersDoc(await readSource(providersDocsPath), preset),
     },
   ];
 
   if (envExampleContent !== undefined) {
-    filesToPlan.splice(filesToPlan.length - 1, 0, {
+    files.splice(files.length - 1, 0, {
       path: ".env.example",
       content: envExampleContent,
     });
   }
 
-  const plannedFiles = await planFiles(targetDir, filesToPlan);
-
-  if (!options.dryRun) {
-    for (const file of plannedFiles) {
-      await writePlannedFile(targetDir, file);
-    }
-  }
+  return files;
+}
 
+function providerPresetResult(
+  preset: ProviderPreset,
+  targetDir: string,
+  dryRun: boolean,
+  plannedFiles: readonly PlannedFile[],
+): AddProviderPresetResult {
   return {
     schemaVersion: 1,
     name: preset.name,
     targetDir,
-    dryRun: Boolean(options.dryRun),
+    dryRun,
     files: plannedFiles.map((file) => file.path),
     createdFiles: plannedFiles
       .filter((file) => file.result === "created")
@@ -827,6 +907,19 @@ export async function addProviderPreset(
   };
 }
 
+async function readRequiredSource(
+  readSource: ProviderSourceReader,
+  filePath: string,
+): Promise<string> {
+  const content = await readSource(filePath);
+  if (content === undefined) {
+    throw new Error(
+      `Could not find ${filePath}. Run this command in a Beignet app.`,
+    );
+  }
+  return content;
+}
+
 function beignetDependencyVersion(packageJson: PackageJson): string {
   return (
     packageJson.dependencies?.["@beignet/core"] ??
@@ -959,14 +1052,14 @@ function updateEnvExample(
   return appendSection(current, preset.envExample);
 }
 
-function updateIntegrationsDoc(
+function updateProvidersDoc(
   source: string | undefined,
   preset: ProviderPreset,
 ): string {
   const current =
     source ??
     [
-      "# Integrations",
+      "# Providers",
       "",
       "This file tracks app-level provider setup added after the initial scaffold.",
       "",
@@ -1144,13 +1237,13 @@ function sortRecord(record: Record<string, string>): Record<string, string> {
 }
 
 async function planFiles(
-  targetDir: string,
-  files: Array<{ path: string; content: string }>,
+  files: ProviderPlanFile[],
+  readSource: ProviderSourceReader,
 ): Promise<PlannedFile[]> {
   const planned: PlannedFile[] = [];
 
   for (const file of files) {
-    const existing = await readOptionalAppFile(targetDir, file.path);
+    const existing = await readSource(file.path);
     planned.push({
       ...file,
       result:
@@ -1176,19 +1269,6 @@ async function writePlannedFile(
   await writeFile(destination, file.content);
 }
 
-async function readRequiredAppFile(
-  targetDir: string,
-  filePath: string,
-): Promise<string> {
-  const content = await readOptionalAppFile(targetDir, filePath);
-  if (content === undefined) {
-    throw new Error(
-      `Could not find ${filePath}. Run this command in a Beignet app.`,
-    );
-  }
-  return content;
-}
-
 async function readOptionalAppFile(
   targetDir: string,
   filePath: string,

package/src/task.ts

@@ -142,7 +142,7 @@ async function loadTaskModule(
     await stat(absolutePath);
   } catch {
     throw new Error(
-      `Could not find app task registry at ${modulePath}. Create it with beignet make task <feature>/<name> or configure paths.tasks in beignet.config.ts.`,
+      `Could not find app task registry at ${modulePath}. Create it with beignet make task <feature.name> or configure paths.tasks in beignet.config.ts.`,
     );
   }