@beignet/cli 0.0.37 → 0.0.39

package/src/index.ts

@@ -15,13 +15,12 @@ import {
 } from "@stricli/core";
 import {
   type CompletionShell,
-  type CreateIntegrationName,
+  type CreateProviderName,
   completionShellChoices,
-  createIntegrationChoices,
+  createProviderChoices,
   type DatabaseName,
   databaseChoices,
   databaseStartCommand,
-  type IntegrationName,
   type MakeFeatureAddon,
   type MakeFeatureRecipe,
   makeFeatureAddonChoices,
@@ -30,7 +29,8 @@ import {
   type ProviderPresetName,
   packageManagerChoices,
   providerPresetChoices,
-  splitCreateIntegrations,
+  type StarterProviderName,
+  splitCreateProviders,
   type TemplateName,
   templateChoices,
 } from "./choices.js";
@@ -56,7 +56,7 @@ type CreateFlags = {
   api?: boolean;
   db?: DatabaseName;
   packageManager?: PackageManager;
-  integrations?: readonly CreateIntegrationName[];
+  providers?: readonly CreateProviderName[];
   yes?: boolean;
   force?: boolean;
   dryRun?: boolean;
@@ -72,11 +72,12 @@ type MakeFlags = {
   force?: boolean;
   dryRun?: boolean;
   json?: boolean;
+  cwd?: string;
 };
 
 type MakeResourceFlags = MakeFlags & {
-  auth?: boolean;
-  tenant?: boolean;
+  authorization?: boolean;
+  tenantScoped?: boolean;
   events?: boolean;
   softDelete?: boolean;
 };
@@ -96,6 +97,10 @@ type MakeScheduleFlags = MakeFlags & {
   route?: boolean;
 };
 
+type MakeUploadFlags = MakeFlags & {
+  ui?: boolean;
+};
+
 type RoutesFlags = {
   json?: boolean;
   cwd?: string;
@@ -126,6 +131,7 @@ type PreflightFlags = {
 type DbFlags = {
   json?: boolean;
   dryRun?: boolean;
+  cwd?: string;
 };
 
 type DatabaseSchemaDialect = "sqlite" | "postgres" | "mysql";
@@ -154,12 +160,14 @@ type TaskRunFlags = {
   input?: string;
   tenant?: string;
   module?: string;
+  cwd?: string;
 };
 
 type OutboxDrainFlags = {
   json?: boolean;
   module?: string;
   batchSize?: number;
+  cwd?: string;
 };
 
 type OutboxMessageStatus = "pending" | "claimed" | "delivered" | "deadLettered";
@@ -185,11 +193,13 @@ type OutboxListFlags = {
   kind?: OutboxMessageKind;
   name?: string;
   limit?: number;
+  cwd?: string;
 };
 
 type OutboxShowFlags = {
   json?: boolean;
   module?: string;
+  cwd?: string;
 };
 
 type OutboxRequeueFlags = {
@@ -197,6 +207,7 @@ type OutboxRequeueFlags = {
   module?: string;
   availableAt?: Date;
   resetAttempts?: boolean;
+  cwd?: string;
 };
 
 type OutboxPurgeFlags = {
@@ -206,6 +217,7 @@ type OutboxPurgeFlags = {
   all?: boolean;
   limit?: number;
   dryRun?: boolean;
+  cwd?: string;
 };
 
 type OutboxPruneFlags = {
@@ -214,17 +226,19 @@ type OutboxPruneFlags = {
   before?: Date;
   limit?: number;
   dryRun?: boolean;
+  cwd?: string;
 };
 
 type ScheduleRunFlags = {
   json?: boolean;
   module?: string;
   payload?: string;
-  id?: string;
+  runId?: string;
   attempt?: number;
   scheduledAt?: string;
   triggeredAt?: string;
   source?: string;
+  cwd?: string;
 };
 
 type McpFlags = {
@@ -277,11 +291,18 @@ const parseDate = (input: string): Date => {
   return value;
 };
 
-const forceFlag = {
+const createForceFlag = {
+  kind: "boolean",
+  optional: true,
+  withNegated: false,
+  brief: "Create the app in a non-empty directory and overwrite conflicts.",
+} as const;
+
+const makeForceFlag = {
   kind: "boolean",
   optional: true,
   withNegated: false,
-  brief: "Overwrite conflicting files or write into a non-empty directory.",
+  brief: "Overwrite conflicting generated files.",
 } as const;
 
 const dryRunFlag = {
@@ -322,7 +343,7 @@ const parsedDateFlag = (brief: string) =>
   }) as const;
 
 const cwdFlag = parsedStringFlag(
-  "App directory to inspect. Defaults to the current working directory.",
+  "App directory. Defaults to the current working directory.",
 );
 
 const formatFlag = {
@@ -334,9 +355,10 @@ const formatFlag = {
 } as const;
 
 const makeFlagParameters = {
-  force: forceFlag,
+  force: makeForceFlag,
   dryRun: dryRunFlag,
   json: jsonFlag,
+  cwd: cwdFlag,
 } satisfies FlagParametersForType<MakeFlags, CliContext>;
 
 const routesFlagParameters = {
@@ -364,6 +386,7 @@ const providerAddFlagParameters = {
 const dbFlagParameters = {
   json: jsonFlag,
   dryRun: dryRunFlag,
+  cwd: cwdFlag,
 } satisfies FlagParametersForType<DbFlags, CliContext>;
 
 const dbSchemaSyncFlagParameters = {
@@ -397,6 +420,7 @@ const taskRunFlagParameters = {
   module: parsedStringFlag(
     "Task registry module. Defaults to server/tasks.ts.",
   ),
+  cwd: cwdFlag,
 } satisfies FlagParametersForType<TaskRunFlags, CliContext>;
 
 const outboxDrainFlagParameters = {
@@ -410,6 +434,7 @@ const outboxDrainFlagParameters = {
     optional: true,
     brief: "Maximum messages to claim in one drain pass.",
   },
+  cwd: cwdFlag,
 } satisfies FlagParametersForType<OutboxDrainFlags, CliContext>;
 
 const outboxListFlagParameters = {
@@ -436,6 +461,7 @@ const outboxListFlagParameters = {
     optional: true,
     brief: "Maximum messages to return. Defaults to 50.",
   },
+  cwd: cwdFlag,
 } satisfies FlagParametersForType<OutboxListFlags, CliContext>;
 
 const outboxShowFlagParameters = {
@@ -443,6 +469,7 @@ const outboxShowFlagParameters = {
   module: parsedStringFlag(
     "Outbox registry module. Defaults to server/outbox.ts.",
   ),
+  cwd: cwdFlag,
 } satisfies FlagParametersForType<OutboxShowFlags, CliContext>;
 
 const outboxRequeueFlagParameters = {
@@ -459,6 +486,7 @@ const outboxRequeueFlagParameters = {
     withNegated: false,
     brief: "Reset attempts to zero before requeueing.",
   },
+  cwd: cwdFlag,
 } satisfies FlagParametersForType<OutboxRequeueFlags, CliContext>;
 
 const outboxPurgeFlagParameters = {
@@ -482,6 +510,7 @@ const outboxPurgeFlagParameters = {
     brief: "Maximum messages to purge.",
   },
   dryRun: operationDryRunFlag,
+  cwd: cwdFlag,
 } satisfies FlagParametersForType<OutboxPurgeFlags, CliContext>;
 
 const outboxPruneFlagParameters = {
@@ -499,6 +528,7 @@ const outboxPruneFlagParameters = {
     brief: "Maximum messages to prune.",
   },
   dryRun: operationDryRunFlag,
+  cwd: cwdFlag,
 } satisfies FlagParametersForType<OutboxPruneFlags, CliContext>;
 
 const scheduleRunFlagParameters = {
@@ -507,7 +537,7 @@ const scheduleRunFlagParameters = {
     "Schedule registry module. Defaults to server/schedules.ts.",
   ),
   payload: parsedStringFlag("JSON payload passed to the schedule schema."),
-  id: parsedStringFlag("Provider or app schedule run ID."),
+  runId: parsedStringFlag("Provider or app schedule run ID."),
   attempt: {
     kind: "parsed",
     parse: parsePositiveInteger,
@@ -517,6 +547,7 @@ const scheduleRunFlagParameters = {
   scheduledAt: parsedStringFlag("Provider scheduled timestamp."),
   triggeredAt: parsedStringFlag("Schedule trigger timestamp."),
   source: parsedStringFlag("Provider or app source label."),
+  cwd: cwdFlag,
 } satisfies FlagParametersForType<ScheduleRunFlags, CliContext>;
 
 const namePositional = {
@@ -588,11 +619,11 @@ and a shadcn UI shell. Pass --api for an API-only scaffold without the
 UI shell, and --db to choose the database.
 
 Available databases: ${databaseChoices.join(", ")}
-Available integrations: ${createIntegrationChoices.join(", ")}
+Available providers: ${createProviderChoices.join(", ")}
 
---integrations accepts the starter template integrations plus the full
-beignet providers add preset catalog; presets are applied to the scaffold
-with the same machinery as beignet providers add.
+--providers accepts the full beignet provider add preset catalog. Providers
+with starter-native setup are rendered directly; the rest use the same
+machinery as beignet provider add.
 
 Running create on an interactive terminal without selection flags opens a
 prompt-based setup. Pass --yes or any selection flag to skip the prompts.`,
@@ -623,13 +654,12 @@ prompt-based setup. Pass --yes or any selection flag to skip the prompts.`,
         optional: true,
         brief: "Package manager to use in next-step commands.",
       },
-      integrations: {
+      providers: {
         kind: "enum",
-        values: createIntegrationChoices,
+        values: createProviderChoices,
         optional: true,
         variadic: ",",
-        brief:
-          "Add first-party integrations or provider presets as a comma-separated list.",
+        brief: "Add provider presets as a comma-separated list.",
       },
       yes: {
         kind: "boolean",
@@ -637,7 +667,7 @@ prompt-based setup. Pass --yes or any selection flag to skip the prompts.`,
         withNegated: false,
         brief: "Skip interactive prompts and use the defaults.",
       },
-      force: forceFlag,
+      force: createForceFlag,
       dryRun: dryRunFlag,
       json: jsonFlag,
     },
@@ -654,7 +684,7 @@ prompt-based setup. Pass --yes or any selection flag to skip the prompts.`,
     },
   },
   loader: async () => {
-    const { createProject } = await import("./create.js");
+    const { createProject, planCreateProject } = await import("./create.js");
     const { promptCreateSelections, shouldPromptInteractively } = await import(
       "./create-prompts.js"
     );
@@ -668,7 +698,7 @@ prompt-based setup. Pass --yes or any selection flag to skip the prompts.`,
         directory,
         api: flags.api,
         db: flags.db,
-        integrations: flags.integrations,
+        providers: flags.providers,
         packageManager: flags.packageManager,
       };
 
@@ -697,43 +727,79 @@ prompt-based setup. Pass --yes or any selection flag to skip the prompts.`,
 
       const api = selections.api ?? false;
       const database = selections.db ?? "sqlite";
-      const { integrations, presets } = splitCreateIntegrations(
-        uniqueValues([...(selections.integrations ?? [])]),
+      const { starterProviders, presets } = splitCreateProviders(
+        uniqueValues([...(selections.providers ?? [])]),
       );
 
       let presetsNeedEnv = false;
       if (presets.length > 0) {
         const { assertCompatibleCreatePresets, providerPresetNeedsEnv } =
           await import("./provider-add.js");
-        assertCompatibleCreatePresets(presets, integrations);
+        assertCompatibleCreatePresets(presets, starterProviders);
         presetsNeedEnv = presets.some(providerPresetNeedsEnv);
       }
 
-      const result = await createProject({
+      const createOptions = {
         name: selections.directory,
         template: flags.template,
         api,
         packageManager: selections.packageManager,
-        integrations,
+        providers: starterProviders,
         db: database,
         force: Boolean(flags.force),
         dryRun: Boolean(flags.dryRun),
-      });
+      } as const;
+
+      let result: Awaited<ReturnType<typeof createProject>>;
+      if (flags.dryRun) {
+        const plan = await planCreateProject(createOptions);
+        if (presets.length === 0) {
+          result = plan.result;
+        } else {
+          const { planProviderPresetsForCreate } = await import(
+            "./provider-add.js"
+          );
+          const providerPlan = await planProviderPresetsForCreate({
+            targetDir: plan.result.targetDir,
+            files: plan.files,
+            names: presets,
+          });
+          result = {
+            ...plan.result,
+            files: providerPlan.files.map((file) => file.path),
+          };
+        }
+      } else {
+        result = await createProject(createOptions);
+      }
 
       if (!flags.dryRun && presets.length > 0) {
         const { addProviderPreset } = await import("./provider-add.js");
+        const presetFiles: string[] = [];
         for (const preset of presets) {
-          await addProviderPreset({ name: preset, cwd: result.targetDir });
+          const presetResult = await addProviderPreset({
+            name: preset,
+            cwd: result.targetDir,
+          });
+          presetFiles.push(...presetResult.files);
         }
+        result = {
+          ...result,
+          files: uniqueValues([...result.files, ...presetFiles]),
+        };
       }
 
       writeOutput(
         this,
         flags.json
-          ? JSON.stringify({ ...result, providerPresets: presets }, null, 2)
+          ? JSON.stringify(
+              { ...result, providers: selections.providers ?? [] },
+              null,
+              2,
+            )
           : nextSteps(result, {
               api,
-              integrations,
+              providers: starterProviders,
               database,
               presets,
               presetsNeedEnv,
@@ -1083,6 +1149,7 @@ function databaseCommand(command: DatabaseCommandName) {
       return async function runDb(this: CliContext, flags: DbFlags) {
         const result = await runDatabaseCommand({
           command,
+          cwd: flags.cwd,
           captureOutput: Boolean(flags.json),
           dryRun: Boolean(flags.dryRun),
         });
@@ -1118,6 +1185,7 @@ const dbSchemaSyncCommand = buildCommand<DbSchemaSyncFlags, [], CliContext>({
       flags: DbSchemaSyncFlags,
     ) {
       const result = await syncDatabaseSchema({
+        cwd: flags.cwd,
         dialect: flags.dialect,
         tables: flags.tables,
         output: flags.output,
@@ -1174,6 +1242,7 @@ const taskRunCommand = buildCommand<TaskRunFlags, [string], CliContext>({
     ) {
       const result = await runAppTask({
         name,
+        cwd: flags.cwd,
         input: flags.input,
         tenant: flags.tenant,
         modulePath: flags.module,
@@ -1210,6 +1279,7 @@ const outboxDrainCommand = buildCommand<OutboxDrainFlags, [], CliContext>({
 
     return async function runDrain(this: CliContext, flags: OutboxDrainFlags) {
       const result = await runOutboxDrain({
+        cwd: flags.cwd,
         modulePath: flags.module,
         batchSize: flags.batchSize,
       });
@@ -1236,6 +1306,7 @@ const outboxListCommand = buildCommand<OutboxListFlags, [], CliContext>({
 
     return async function runList(this: CliContext, flags: OutboxListFlags) {
       const result = await runOutboxList({
+        cwd: flags.cwd,
         modulePath: flags.module,
         status: flags.status,
         kind: flags.kind,
@@ -1270,6 +1341,7 @@ const outboxShowCommand = buildCommand<OutboxShowFlags, [string], CliContext>({
       id: string,
     ) {
       const result = await runOutboxShow({
+        cwd: flags.cwd,
         modulePath: flags.module,
         id,
       });
@@ -1305,6 +1377,7 @@ const outboxRequeueCommand = buildCommand<
       id: string,
     ) {
       const result = await runOutboxRequeue({
+        cwd: flags.cwd,
         modulePath: flags.module,
         id,
         availableAt: flags.availableAt,
@@ -1333,6 +1406,7 @@ const outboxPurgeCommand = buildCommand<OutboxPurgeFlags, [], CliContext>({
 
     return async function runPurge(this: CliContext, flags: OutboxPurgeFlags) {
       const result = await runOutboxPurge({
+        cwd: flags.cwd,
         modulePath: flags.module,
         before: flags.before,
         all: Boolean(flags.all),
@@ -1369,6 +1443,7 @@ const outboxPruneCommand = buildCommand<OutboxPruneFlags, [], CliContext>({
       }
 
       const result = await runOutboxPrune({
+        cwd: flags.cwd,
         modulePath: flags.module,
         before: flags.before,
         limit: flags.limit,
@@ -1418,9 +1493,10 @@ const scheduleRunCommand = buildCommand<ScheduleRunFlags, [string], CliContext>(
       ) {
         const result = await runAppSchedule({
           name,
+          cwd: flags.cwd,
           modulePath: flags.module,
           payload: flags.payload,
-          id: flags.id,
+          id: flags.runId,
           attempt: flags.attempt,
           scheduledAt: flags.scheduledAt,
           triggeredAt: flags.triggeredAt,
@@ -1533,14 +1609,14 @@ const makeResourceCommand = buildCommand<
   parameters: {
     flags: {
       ...makeFlagParameters,
-      auth: {
+      authorization: {
         kind: "boolean",
         optional: true,
         withNegated: false,
         brief:
           "Generate policy metadata and use-case authorization checks for mutating routes.",
       },
-      tenant: {
+      tenantScoped: {
         kind: "boolean",
         optional: true,
         withNegated: false,
@@ -1573,10 +1649,11 @@ const makeResourceCommand = buildCommand<
     ) {
       const result = await makeResource({
         name,
+        cwd: flags.cwd,
         force: Boolean(flags.force),
         dryRun: Boolean(flags.dryRun),
-        auth: Boolean(flags.auth),
-        tenant: Boolean(flags.tenant),
+        authorization: Boolean(flags.authorization),
+        tenantScoped: Boolean(flags.tenantScoped),
         events: Boolean(flags.events),
         softDelete: Boolean(flags.softDelete),
       });
@@ -1604,7 +1681,7 @@ const makeFeatureCommand = buildCommand<MakeFeatureFlags, [string], CliContext>(
           optional: true,
           variadic: ",",
           brief:
-            "Add feature-owned artifacts. Supports policy, factory/factories, seed/seeds, task/tasks, event/events, listener/listeners, job/jobs, notification/notifications, schedule/schedules, ui, and upload/uploads.",
+            "Add feature-owned artifacts. Supports policy, factory, seed, task, event, listener, job, notification, schedule, ui, and upload.",
         },
         recipe: {
           kind: "enum",
@@ -1626,6 +1703,7 @@ const makeFeatureCommand = buildCommand<MakeFeatureFlags, [string], CliContext>(
       ) {
         const result = await makeFeature({
           name,
+          cwd: flags.cwd,
           with: flags.with,
           recipe: flags.recipe,
           force: Boolean(flags.force),
@@ -1654,7 +1732,6 @@ type MakeGeneratorName =
   | "makeSeed"
   | "makeTask"
   | "makeTest"
-  | "makeUpload"
   | "makeUseCase";
 
 function simpleMakeCommand(
@@ -1680,6 +1757,7 @@ function simpleMakeCommand(
       ) {
         const result = await generators[generator]({
           name,
+          cwd: flags.cwd,
           force: Boolean(flags.force),
           dryRun: Boolean(flags.dryRun),
         });
@@ -1694,6 +1772,48 @@ function simpleMakeCommand(
   });
 }
 
+const makeUploadCommand = buildCommand<MakeUploadFlags, [string], CliContext>({
+  docs: {
+    brief: "Generate a feature upload.",
+  },
+  parameters: {
+    flags: {
+      ...makeFlagParameters,
+      ui: {
+        kind: "boolean",
+        optional: true,
+        withNegated: false,
+        brief:
+          "Generate a typed React upload client, uploader component, and component test.",
+      },
+    } satisfies FlagParametersForType<MakeUploadFlags, CliContext>,
+    positional: namePositional,
+  },
+  loader: async () => {
+    const { makeUpload } = await import("./make.js");
+
+    return async function runMakeUpload(
+      this: CliContext,
+      flags: MakeUploadFlags,
+      name: string,
+    ) {
+      const result = await makeUpload({
+        name,
+        cwd: flags.cwd,
+        force: Boolean(flags.force),
+        dryRun: Boolean(flags.dryRun),
+        ui: Boolean(flags.ui),
+      });
+      writeOutput(
+        this,
+        flags.json
+          ? JSON.stringify(result, null, 2)
+          : makeUploadNextSteps(result),
+      );
+    };
+  },
+});
+
 const makeListenerCommand = buildCommand<
   MakeListenerFlags,
   [string],
@@ -1706,7 +1826,7 @@ const makeListenerCommand = buildCommand<
     flags: {
       ...makeFlagParameters,
       event: parsedStringFlag(
-        "Event to listen to, for example posts/published.",
+        "Event to listen to, for example posts.published.",
       ),
     } satisfies FlagParametersForType<MakeListenerFlags, CliContext>,
     positional: namePositional,
@@ -1721,12 +1841,13 @@ const makeListenerCommand = buildCommand<
     ) {
       if (!flags.event) {
         throw new Error(
-          "beignet make listener requires --event feature/name, for example --event posts/published.",
+          "beignet make listener requires --event feature.name, for example --event posts.published.",
         );
       }
 
       const result = await makeListener({
         name,
+        cwd: flags.cwd,
         event: flags.event,
         force: Boolean(flags.force),
         dryRun: Boolean(flags.dryRun),
@@ -1773,6 +1894,7 @@ const makeScheduleCommand = buildCommand<
     ) {
       const result = await makeSchedule({
         name,
+        cwd: flags.cwd,
         cron: flags.cron,
         timezone: flags.timezone,
         route: Boolean(flags.route),
@@ -1803,6 +1925,7 @@ const makePaymentsCommand = buildCommand<MakeFlags, [], CliContext>({
 
     return async function runMakePayments(this: CliContext, flags: MakeFlags) {
       const result = await makePayments({
+        cwd: flags.cwd,
         force: Boolean(flags.force),
         dryRun: Boolean(flags.dryRun),
       });
@@ -1832,6 +1955,7 @@ const makeTenancyCommand = buildCommand<MakeFlags, [], CliContext>({
 
     return async function runMakeTenancy(this: CliContext, flags: MakeFlags) {
       const result = await makeTenancy({
+        cwd: flags.cwd,
         force: Boolean(flags.force),
         dryRun: Boolean(flags.dryRun),
       });
@@ -1861,6 +1985,7 @@ const makeInboxCommand = buildCommand<MakeFlags, [], CliContext>({
 
     return async function runMakeInbox(this: CliContext, flags: MakeFlags) {
       const result = await makeInbox({
+        cwd: flags.cwd,
         force: Boolean(flags.force),
         dryRun: Boolean(flags.dryRun),
       });
@@ -1890,6 +2015,7 @@ const makeOutboxCommand = buildCommand<MakeFlags, [], CliContext>({
 
     return async function runMakeOutbox(this: CliContext, flags: MakeFlags) {
       const result = await makeOutbox({
+        cwd: flags.cwd,
         force: Boolean(flags.force),
         dryRun: Boolean(flags.dryRun),
       });
@@ -1971,11 +2097,7 @@ const makeRoutes = buildRouteMap({
       "Generate a use case test.",
       makeTestNextSteps,
     ),
-    upload: simpleMakeCommand(
-      "makeUpload",
-      "Generate a feature upload.",
-      makeUploadNextSteps,
-    ),
+    upload: makeUploadCommand,
     useCase: simpleMakeCommand(
       "makeUseCase",
       "Generate a use case.",
@@ -2002,15 +2124,11 @@ Run npm create beignet@latest (or bun create beignet) to scaffold a new app.`,
     mcp: mcpCommand,
     outbox: outboxRoutes,
     preflight: preflightCommand,
-    providers: providerRoutes,
+    provider: providerRoutes,
     routes: routesCommand,
     schedule: scheduleRoutes,
     task: taskRoutes,
   },
-  aliases: {
-    // The singular form is a common near-miss for the providers commands.
-    provider: "providers",
-  },
 });
 
 const cli = buildApplication(rootRoutes, {
@@ -2058,6 +2176,7 @@ type MakeNextStepsResult = {
   name: string;
   targetDir: string;
   dryRun: boolean;
+  files: string[];
   createdFiles: string[];
   updatedFiles: string[];
   skippedFiles: string[];
@@ -2245,7 +2364,7 @@ function nextSteps(
   result: CreateNextStepsResult,
   options: {
     api?: boolean;
-    integrations?: readonly IntegrationName[];
+    providers?: readonly StarterProviderName[];
     database?: DatabaseName;
     presets?: readonly ProviderPresetName[];
     presetsNeedEnv?: boolean;
@@ -2255,7 +2374,7 @@ function nextSteps(
     const plannedFiles = result.files.map((file) => `  ${file}`).join("\n");
     const plannedPresets =
       options.presets && options.presets.length > 0
-        ? `\n\nProvider presets applied after scaffold (skipped in dry run):\n${options.presets
+        ? `\n\nProvider presets included in this plan:\n${options.presets
             .map((preset) => `  ${preset}`)
             .join("\n")}`
         : "";
@@ -2269,11 +2388,11 @@ ${plannedFiles}${plannedPresets}`;
   const pm = result.packageManager;
   const run = pm === "npm" ? "npm run" : `${pm} run`;
   const cli = packageRunnerFromPackageManager(pm);
-  const envRequiredIntegrations =
-    options.integrations?.filter(isEnvRequiredProviderIntegration) ?? [];
+  const envRequiredProviders =
+    options.providers?.filter(isEnvRequiredStarterProvider) ?? [];
   const envStep =
-    envRequiredIntegrations.length > 0 || options.presetsNeedEnv
-      ? "  Fill .env.local for selected provider integrations before starting the app.\n"
+    envRequiredProviders.length > 0 || options.presetsNeedEnv
+      ? "  Fill .env.local for selected providers before starting the app.\n"
       : "";
   const presetSection =
     options.presets && options.presets.length > 0
@@ -2281,7 +2400,7 @@ ${plannedFiles}${plannedPresets}`;
           .map((preset) => `  ${preset}`)
           .join(
             "\n",
-          )}\n  See docs/integrations.md for setup notes and follow-up steps.\n`
+          )}\n  See docs/providers.md for setup notes and follow-up steps.\n`
       : "";
   const openStep = options.api
     ? "  open http://localhost:3000 for the API landing page"
@@ -2334,13 +2453,11 @@ function packageRunnerFromPackageManager(pm: PackageManager): string {
   }
 }
 
-function isEnvRequiredProviderIntegration(
-  integration: IntegrationName,
-): boolean {
+function isEnvRequiredStarterProvider(provider: StarterProviderName): boolean {
   return (
-    integration === "inngest" ||
-    integration === "resend" ||
-    integration === "upstash-rate-limit"
+    provider === "jobs-inngest" ||
+    provider === "mail-resend" ||
+    provider === "rate-limit-upstash"
   );
 }
 
@@ -2558,8 +2675,19 @@ function makeScheduleNextSteps(
 }
 
 function makeUploadNextSteps(result: MakeNextStepsResult): string {
+  const includesUi = result.files.some((file) =>
+    file.endsWith("-uploader.tsx"),
+  );
+
   return makeNextSteps(result, "upload", [
     "Replace the starter metadata, constraints, key, authorization, and onComplete behavior.",
+    ...(includesUi
+      ? [
+          "Render the generated uploader with its required resourceId and connect onComplete to refresh the owning view.",
+        ]
+      : [
+          "Add --ui in a full-stack app when you want a typed upload client, component, and component test.",
+        ]),
     "Use the generated upload route for local development, then swap the local storage provider for S3-compatible storage before production.",
   ]);
 }