@beignet/cli 0.0.39 → 0.0.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beignet/cli",
-  "version": "0.0.39",
+  "version": "0.0.40",
   "type": "module",
   "description": "CLI for creating and maintaining Beignet apps.",
   "main": "./dist/lib.js",
@@ -69,7 +69,7 @@
     "tsx": "^4.22.4"
   },
   "dependencies": {
-    "@beignet/core": "^0.0.39",
+    "@beignet/core": "^0.0.40",
     "@clack/prompts": "^1.5.1",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "@stricli/core": "^1.2.7",

package/skills/app-structure/SKILL.md

@@ -41,6 +41,7 @@ beignet make job billing.sync
 beignet make schedule billing.nightly --cron "0 2 * * *"
 beignet make task admin.backfill
 beignet make seed demo.users
+beignet make outbox
 beignet make upload issues.attachment
 beignet make upload issues.attachment --ui
 ```
@@ -75,6 +76,12 @@ Hand-written files do not run until registered:
   every job worker or outbox registry that can receive it
 - seeds -> the app-owned seed entrypoint, usually `server/seed.ts`
 
+For generated Next.js 15.1+ apps, `make outbox` also adds a server-local
+provider that wraps the database Unit of Work with a push-assisted `after()`
+trigger. Keep the generated cron route: it is the recovery path for missed
+callbacks, delayed messages, retries, and additional batches. Older Next.js
+apps remain cron-only.
+
 When an app opts into runtime integrity, keep `server/runtime-integrity.ts`
 aligned with those central registries. The boot check is pure and
 serverless-safe: it compares declared listeners, schedules, tasks, and outbox
@@ -89,7 +96,11 @@ low-risk route-group, schedule, task, outbox, and listener registry repair.
 
 ## Path Config
 
-`beignet.config.*` moves paths; it does not change architecture.
+`beignet.config.*` selects the inspected server adapter and moves paths; it
+does not change the application architecture. `framework: "next"` is the
+default. Use `framework: "web"` for `@beignet/web` Fetch servers so `routes`
+and `doctor` inspect the central `defineRoutes(...)` registry instead of
+requiring Next.js `app/api/` handlers.
 
 Common `src/` apps configure:
 
@@ -107,6 +118,10 @@ export default defineConfig({
 });
 ```
 
+Framework-neutral generators work in either profile. `make payments`,
+`make upload`, `make outbox`, and `make schedule --route` still generate
+Next.js handlers and reject the web profile before writing files.
+
 When `appContext` moves under `src/`, root client setup follows that source
 root at `src/client/index.ts`. Other registries and app-bound builders are not
 relocated implicitly; override each path the app has moved, such as

package/src/config.ts

@@ -6,7 +6,7 @@ import { createJiti } from "jiti";
 /**
  * Supported application framework targets for Beignet config.
  */
-export type BeignetFramework = "next";
+export type BeignetFramework = "next" | "web";
 
 /**
  * Configurable app paths used by CLI generators, inspection, linting, and
@@ -306,11 +306,15 @@ function assertConfigObject(
     throw new Error(`${configFile} must export a Beignet config object.`);
   }
 
-  if (config.framework !== undefined && config.framework !== "next") {
+  if (
+    config.framework !== undefined &&
+    config.framework !== "next" &&
+    config.framework !== "web"
+  ) {
     throw new Error(
       `${configFile} uses unsupported framework "${String(
         config.framework,
-      )}". Supported framework: "next".`,
+      )}". Supported frameworks: "next", "web".`,
     );
   }
 

package/src/framework.ts

@@ -0,0 +1,13 @@
+import type { ResolvedBeignetConfig } from "./config.js";
+
+export function assertNextFramework(
+  config: ResolvedBeignetConfig,
+  command: string,
+  generatedSurface: string,
+): void {
+  if (config.framework === "next") return;
+
+  throw new Error(
+    `${command} currently supports framework: "next" because it generates ${generatedSurface}. For framework: "web", define the framework-neutral artifact directly and mount its HTTP entrypoint through @beignet/web.`,
+  );
+}

package/src/inspect.ts

@@ -105,7 +105,7 @@ type InspectedCatalogErrorRef = {
 export type InspectedRoute = InspectedContract & {
   handlerFile?: string;
   handlerExport?: HttpMethod;
-  handlerSource: "next-route" | "route-local" | "missing";
+  handlerSource: "next-route" | "route-local" | "web-server" | "missing";
 };
 
 /**
@@ -132,11 +132,13 @@ export type InspectFix = {
  * Detected app convention and missing convention files.
  */
 export type InspectConvention = {
-  kind: "standard" | "next" | "custom";
+  kind: "standard" | "next" | "web" | "custom";
   nextLayout: boolean;
+  webLayout: boolean;
   resourceGenerator: boolean;
   configFile?: string;
   missingNextLayout: string[];
+  missingWebLayout: string[];
   missingResourceGenerator: string[];
 };
 
@@ -204,13 +206,12 @@ export async function inspectApp(
     : await loadBeignetConfig(targetDir, files);
   const convention = inspectConvention(files, config);
   const contracts = await readContracts(targetDir, files, config);
-  const routeFiles = files.filter(
-    (file) =>
-      file.startsWith(`${directoryPath(config.paths.routes)}/`) &&
-      file.endsWith("/route.ts"),
+  const matchedRoutes = await inspectRouteSurface(
+    targetDir,
+    files,
+    config,
+    contracts,
   );
-  const routeExports = await readRouteExports(targetDir, routeFiles, config);
-  const matchedRoutes = matchRoutes(contracts, routeExports);
   const diagnostics = await inspectDiagnostics(
     targetDir,
     files,
@@ -246,13 +247,12 @@ export async function applyDoctorFixes(
     : await loadBeignetConfig(targetDir, files);
   const convention = inspectConvention(files, config);
   const contracts = await readContracts(targetDir, files, config);
-  const routeFiles = files.filter(
-    (file) =>
-      file.startsWith(`${directoryPath(config.paths.routes)}/`) &&
-      file.endsWith("/route.ts"),
+  const matchedRoutes = await inspectRouteSurface(
+    targetDir,
+    files,
+    config,
+    contracts,
   );
-  const routeExports = await readRouteExports(targetDir, routeFiles, config);
-  const matchedRoutes = matchRoutes(contracts, routeExports);
   const fixes: InspectFix[] = [];
 
   const packageFix = await fixPackageScripts(targetDir, files, convention);
@@ -318,7 +318,9 @@ export function formatRoutes(result: InspectAppResult): string {
     handler:
       route.handlerSource === "missing"
         ? "missing"
-        : `${route.handlerFile ?? "unknown"}:${route.handlerExport ?? route.method}`,
+        : route.handlerSource === "web-server"
+          ? `${route.handlerFile ?? "unknown"}:registry`
+          : `${route.handlerFile ?? "unknown"}:${route.handlerExport ?? route.method}`,
   }));
 
   return table([
@@ -556,6 +558,10 @@ function inspectConvention(
     `${directoryPath(config.paths.routes)}/`,
     config.paths.server,
   ]);
+  const missingWebLayout = missingRequirements(files, [
+    `${directoryPath(config.paths.contracts)}/`,
+    config.paths.server,
+  ]);
   const missingResourceGenerator = missingRequirements(files, [
     config.paths.appContext,
     config.paths.portWiring,
@@ -564,14 +570,23 @@ function inspectConvention(
     config.paths.useCaseBuilder,
   ]);
   const nextLayout = missingNextLayout.length === 0;
+  const webLayout = missingWebLayout.length === 0;
   const resourceGenerator = missingResourceGenerator.length === 0;
 
   return {
-    kind: resourceGenerator ? "standard" : nextLayout ? "next" : "custom",
+    kind: resourceGenerator
+      ? "standard"
+      : config.framework === "web" && webLayout
+        ? "web"
+        : nextLayout
+          ? "next"
+          : "custom",
     nextLayout,
+    webLayout,
     resourceGenerator,
     configFile: config.configFile,
     missingNextLayout,
+    missingWebLayout,
     missingResourceGenerator,
   };
 }
@@ -1289,6 +1304,73 @@ function matchRoutes(
   };
 }
 
+async function inspectRouteSurface(
+  targetDir: string,
+  files: string[],
+  config: ResolvedBeignetConfig,
+  contracts: InspectedContract[],
+): Promise<MatchedRoutesResult> {
+  if (config.framework === "next") {
+    const routeFiles = files.filter(
+      (file) =>
+        file.startsWith(`${directoryPath(config.paths.routes)}/`) &&
+        file.endsWith("/route.ts"),
+    );
+    const routeExports = await readRouteExports(targetDir, routeFiles, config);
+    return matchRoutes(contracts, routeExports);
+  }
+
+  if (!files.includes(config.paths.server)) {
+    return {
+      routes: contracts.map((contract) => ({
+        ...contract,
+        handlerSource: "missing",
+      })),
+      unmatchedRouteHandlers: [],
+    };
+  }
+
+  const serverSource = await readFile(
+    path.join(targetDir, config.paths.server),
+    "utf8",
+  );
+  const routeGroups = await readFeatureRouteGroups(targetDir, files, config);
+  const registeredGroups = await registeredRouteGroupsForServer(
+    targetDir,
+    files,
+    config,
+    serverSource,
+  );
+  const registeredContracts = contractsForRegisteredRouteGroups(
+    contracts,
+    routeGroups,
+    registeredGroups,
+  );
+  const registeredKeys = new Set(registeredContracts.map(contractKey));
+  const handlerFile =
+    routeRegistryFileFromServerSource(
+      serverSource,
+      config.paths.server,
+      files,
+    ) ?? config.paths.server;
+
+  return {
+    routes: contracts.map((contract) =>
+      registeredKeys.has(contractKey(contract))
+        ? {
+            ...contract,
+            handlerFile,
+            handlerSource: "web-server" as const,
+          }
+        : {
+            ...contract,
+            handlerSource: "missing" as const,
+          },
+    ),
+    unmatchedRouteHandlers: [],
+  };
+}
+
 function findContract(
   contracts: InspectedContract[],
   routeExport: RouteExport,
@@ -1349,28 +1431,53 @@ async function inspectDiagnostics(
   strict: boolean,
 ): Promise<InspectDiagnostic[]> {
   const diagnostics: InspectDiagnostic[] = [];
-
-  if (!convention.nextLayout) {
+  const frameworkLayout =
+    config.framework === "next" ? convention.nextLayout : convention.webLayout;
+  const missingFrameworkLayout =
+    config.framework === "next"
+      ? convention.missingNextLayout
+      : convention.missingWebLayout;
+
+  if (!frameworkLayout) {
+    const expectedLayout =
+      config.framework === "next"
+        ? `${directoryPath(config.paths.contracts)}/, ${directoryPath(config.paths.routes)}/, and ${config.paths.server}`
+        : `${directoryPath(config.paths.contracts)}/ and ${config.paths.server}`;
+    const layoutName =
+      config.framework === "next"
+        ? "standard Beignet app layout"
+        : "standard Beignet web app layout";
     diagnostics.push({
       severity: "warning",
       code: "BEIGNET_APP_LAYOUT_NOT_FOUND",
-      message: `This directory does not match the standard Beignet app layout. CLI inspection expects ${directoryPath(config.paths.contracts)}/, ${directoryPath(config.paths.routes)}/, and ${config.paths.server}. Missing: ${convention.missingNextLayout.join(", ")}. Add the missing app files or configure their paths in beignet.config.ts.`,
+      message: `This directory does not match the ${layoutName}. CLI inspection expects ${expectedLayout}. Missing: ${missingFrameworkLayout.join(", ")}. Add the missing app files or configure their paths in beignet.config.ts.`,
     });
   }
 
-  for (const route of matchedRoutes.routes) {
-    if (route.handlerSource !== "missing") continue;
-    diagnostics.push({
-      severity: "error",
-      code: "BEIGNET_ROUTE_MISSING",
-      file: route.file,
-      contract: route.exportName,
-      message: `${route.exportName} (${route.method} ${route.path}) has no matching Next route handler. Add ${methodArticle(route.method)} ${route.method} export to ${directoryPath(config.paths.routes)}/[[...path]]/route.ts or a matching route file, or remove the unused contract.`,
-    });
+  diagnostics.push(
+    ...(await inspectFrameworkAdapter(targetDir, files, config)),
+  );
+
+  if (config.framework === "next" || !convention.resourceGenerator) {
+    for (const route of matchedRoutes.routes) {
+      if (route.handlerSource !== "missing") continue;
+      diagnostics.push({
+        severity: "error",
+        code: "BEIGNET_ROUTE_MISSING",
+        file: route.file,
+        contract: route.exportName,
+        message:
+          config.framework === "next"
+            ? `${route.exportName} (${route.method} ${route.path}) has no matching Next route handler. Add ${methodArticle(route.method)} ${route.method} export to ${directoryPath(config.paths.routes)}/[[...path]]/route.ts or a matching route file, or remove the unused contract.`
+            : `${route.exportName} (${route.method} ${route.path}) is not registered in the route surface passed to createFetchServer(...). Register the contract through defineRoutes(...) or remove the unused contract.`,
+      });
+    }
   }
 
-  for (const routeHandler of matchedRoutes.unmatchedRouteHandlers) {
-    diagnostics.push(unmatchedRouteDiagnostic(routeHandler));
+  if (config.framework === "next") {
+    for (const routeHandler of matchedRoutes.unmatchedRouteHandlers) {
+      diagnostics.push(unmatchedRouteDiagnostic(routeHandler));
+    }
   }
 
   diagnostics.push(
@@ -1460,6 +1567,39 @@ async function inspectDiagnostics(
   return dedupeDiagnostics(diagnostics);
 }
 
+async function inspectFrameworkAdapter(
+  targetDir: string,
+  files: string[],
+  config: ResolvedBeignetConfig,
+): Promise<InspectDiagnostic[]> {
+  if (!files.includes(config.paths.server)) return [];
+
+  const source = await readFile(
+    path.join(targetDir, config.paths.server),
+    "utf8",
+  );
+  const expectedFactory =
+    config.framework === "next" ? "createNextServer" : "createFetchServer";
+  const otherFactory =
+    config.framework === "next" ? "createFetchServer" : "createNextServer";
+
+  if (
+    containsCallExpression(source, expectedFactory) ||
+    !containsCallExpression(source, otherFactory)
+  ) {
+    return [];
+  }
+
+  return [
+    {
+      severity: "error",
+      code: "BEIGNET_FRAMEWORK_MISMATCH",
+      file: config.paths.server,
+      message: `${config.configFile ?? "beignet.config.*"} selects framework: "${config.framework}", but ${config.paths.server} calls ${otherFactory}(...). Use ${expectedFactory}(...) or update the configured framework profile.`,
+    },
+  ];
+}
+
 async function inspectCanonicalConformance(
   targetDir: string,
   files: string[],
@@ -1626,11 +1766,13 @@ async function inspectCanonicalConformance(
     }
 
     if (!importsAppContext(serverSource, config.paths.server, config, files)) {
+      const serverFactory =
+        config.framework === "next" ? "createNextServer" : "createFetchServer";
       diagnostics.push({
         severity: "warning",
         code: "BEIGNET_SERVER_APP_CONTEXT",
         file: config.paths.server,
-        message: `${config.paths.server} should import type { AppContext } from ${config.paths.appContext} and thread that context through createNextServer and hooks.`,
+        message: `${config.paths.server} should import type { AppContext } from ${config.paths.appContext} and thread that context through ${serverFactory} and hooks.`,
       });
     }
 
@@ -2333,7 +2475,7 @@ async function inspectProductionReadiness(
   }
 
   if (installedPackages.has("@beignet/provider-auth-better-auth")) {
-    if (!hasBetterAuthRoute(files, config)) {
+    if (config.framework === "next" && !hasBetterAuthRoute(files, config)) {
       diagnostics.push({
         severity: "warning",
         code: "BEIGNET_AUTH_ROUTE_MISSING",
@@ -2589,7 +2731,10 @@ async function inspectPaymentsProductionReadiness(
     });
   }
 
-  if (!(await hasPaymentWebhookRoute(targetDir, files, config, sourceCache))) {
+  if (
+    config.framework === "next" &&
+    !(await hasPaymentWebhookRoute(targetDir, files, config, sourceCache))
+  ) {
     diagnostics.push({
       severity: "warning",
       code: "BEIGNET_PAYMENTS_WEBHOOK_ROUTE_MISSING",
@@ -4260,6 +4405,7 @@ async function inspectServerlessFootguns(
     const source = await readFile(path.join(targetDir, file), "utf8");
 
     if (
+      config.framework === "next" &&
       convention.resourceGenerator &&
       isNextRouteFile(file, config) &&
       importsEagerServer(source, file, files, config)
@@ -6461,15 +6607,19 @@ async function registeredRouteGroupsForServer(
   serverSource: string,
 ): Promise<Set<string>> {
   const registeredGroups = registeredRouteGroups(serverSource);
-  const imports = parseNamedImports(serverSource, config, config.paths.server);
+  const imports = parseNamedImportSources(serverSource);
 
   for (const identifier of routeOptionIdentifiers(serverSource)) {
     const imported = imports.get(identifier);
-    if (!imported?.contractFile || !files.includes(imported.contractFile)) {
-      continue;
-    }
+    if (!imported) continue;
+    const importedFile = sourceFileFromImport(
+      imported.sourcePath,
+      config.paths.server,
+      files,
+    );
+    if (!importedFile || !files.includes(importedFile)) continue;
 
-    const source = await readFile(path.join(targetDir, imported.contractFile), {
+    const source = await readFile(path.join(targetDir, importedFile), {
       encoding: "utf8",
     });
     for (const routeGroup of registeredRouteGroups(source)) {
@@ -7458,6 +7608,7 @@ async function inspectResourceSlices(
       );
     }
     if (
+      config.framework === "next" &&
       !hasRequirement(files, routeFile) &&
       !hasRequirement(files, catchAllRouteFile)
     ) {

package/src/make/payments.ts

@@ -6,6 +6,7 @@ import {
   type ResolvedBeignetConfig,
   resolveConfig,
 } from "../config.js";
+import { assertNextFramework } from "../framework.js";
 import { appendToNamedArray, insertAfterImports } from "../registry-edits.js";
 import { testSupportTemplateFiles } from "../templates/testing.js";
 import {
@@ -71,6 +72,12 @@ export async function makePayments(
     ? resolveConfig(options.config)
     : await loadBeignetConfig(targetDir);
 
+  assertNextFramework(
+    config,
+    "beignet make payments",
+    "Next.js App Router billing and webhook handlers",
+  );
+
   await assertStandardApp(targetDir, config);
 
   const persistence = await detectResourcePersistence(targetDir, config);

package/src/make.ts

@@ -11,6 +11,7 @@ import {
   type ResolvedBeignetConfig,
   resolveConfig,
 } from "./config.js";
+import { assertNextFramework } from "./framework.js";
 import {
   adapterFilePath,
   addNamedImport,
@@ -143,6 +144,7 @@ import {
 } from "./make/shared.js";
 import {
   appendToArrayExpression,
+  appendToNamedArray,
   appendToOutboxRegistryArray,
   arrayInitializerInfo,
   identifiersFromArrayExpression,
@@ -1499,6 +1501,14 @@ export async function makeSchedule(
     ? resolveConfig(options.config)
     : await loadBeignetConfig(targetDir);
 
+  if (options.route) {
+    assertNextFramework(
+      config,
+      "beignet make schedule --route",
+      "a Next.js App Router cron handler",
+    );
+  }
+
   await assertFeatureArtifactApp(targetDir, config, "schedule", {
     requireServer: Boolean(options.route),
   });
@@ -1714,6 +1724,9 @@ async function updateOutboxPortWiring(
       path.join(infrastructureDir(config), "db/provider.ts"),
     );
   }
+  if (await updateOutboxDrainProvider(targetDir, config, options)) {
+    changes.updatedFiles.push(providersFilePath(config));
+  }
   if (await updateOutboxRepositoriesReturnType(targetDir, config, options)) {
     changes.updatedFiles.push(drizzleRepositoriesPath(config));
   }
@@ -1825,6 +1838,31 @@ async function updateOutboxInfrastructurePorts(
   return true;
 }
 
+async function projectSupportsNextAfter(targetDir: string): Promise<boolean> {
+  const packageJson = JSON.parse(
+    await readFile(path.join(targetDir, "package.json"), "utf8"),
+  ) as PackageJsonLike;
+  const version =
+    packageJson.dependencies?.next ?? packageJson.devDependencies?.next;
+  if (!version) return false;
+
+  return version.split("||").every((range) => {
+    const lowerBound =
+      /^\s*(\^|~|>=|>|=|<=|<)?\s*v?(\d+)(?:\.(\d+|x|\*))?(?:\.(\d+|x|\*))?([+-][0-9A-Za-z.-]+)?(?=\s|$)/.exec(
+        range,
+      );
+    if (!lowerBound) return false;
+
+    const operator = lowerBound[1];
+    if (operator === "<" || operator === "<=") return false;
+    if (lowerBound[5]?.startsWith("-")) return false;
+
+    const major = Number(lowerBound[2]);
+    const minor = /^\d+$/.test(lowerBound[3] ?? "") ? Number(lowerBound[3]) : 0;
+    return major > 15 || (major === 15 && minor >= 1);
+  });
+}
+
 async function updateOutboxDatabaseProvider(
   targetDir: string,
   config: ResolvedBeignetConfig,
@@ -1923,6 +1961,95 @@ async function updateOutboxDatabaseProvider(
   return true;
 }
 
+async function updateOutboxDrainProvider(
+  targetDir: string,
+  config: ResolvedBeignetConfig,
+  options: { dryRun: boolean },
+): Promise<boolean> {
+  if (!(await projectSupportsNextAfter(targetDir))) return false;
+
+  const file = providersFilePath(config);
+  const filePath = path.join(targetDir, file);
+  const original = await readOptionalFile(filePath);
+  if (original === undefined) {
+    throw new Error(
+      `Could not find the generated providers file ${file}. Register the outbox drain trigger manually, or restore the generated providers file before running make outbox.`,
+    );
+  }
+
+  let next = addNamedImport(
+    original,
+    "createObservedUnitOfWork",
+    "@beignet/core/ports",
+  );
+  next = addNamedImport(next, "createProvider", "@beignet/core/providers");
+  next = addNamedImport(next, "createNextOutboxDrainTrigger", "@beignet/next");
+  next = addNamedImport(next, "after", "next/server");
+  next = addNamedTypeImport(
+    next,
+    "AppContext",
+    aliasModule(config.paths.appContext),
+  );
+  next = addNamedTypeImport(next, "AppPorts", aliasModule(config.paths.ports));
+  next = addNamedTypeImport(
+    next,
+    "AppServiceContextInput",
+    aliasModule(path.join(path.dirname(config.paths.server), "context.ts")),
+  );
+
+  const providerName = "outboxDrainProvider";
+  if (!new RegExp(`\\bconst\\s+${providerName}\\b`).test(next)) {
+    const outboxModule = aliasModule(config.paths.outbox);
+    const providerDefinition = `const ${providerName} = createProvider<
+\tPick<AppPorts, "uow">,
+\tAppContext,
+\tAppServiceContextInput
+>()({
+\tname: "outbox-drain-trigger",
+\tsetup({ ports, createServiceContext }): { ports: Pick<AppPorts, "uow"> } {
+\t\tconst triggerOutboxDrain: () => void = createNextOutboxDrainTrigger({
+\t\t\tdefer: after,
+\t\t\tcreateContext: () => createServiceContext(undefined),
+\t\t\tregistry: async () => (await import("${outboxModule}")).outboxRegistry,
+\t\t\tbatchSize: 100,
+\t\t});
+
+\t\treturn {
+\t\t\tports: {
+\t\t\t\tuow: createObservedUnitOfWork({
+\t\t\t\t\tunitOfWork: ports.uow,
+\t\t\t\t\tafterCommit: triggerOutboxDrain,
+\t\t\t\t}),
+\t\t\t},
+\t\t};
+\t},
+});
+`;
+    const withProvider = next.replace(
+      /\nexport const providers = \[/,
+      `\n${providerDefinition}\nexport const providers = [`,
+    );
+    if (withProvider === next) {
+      throw new Error(
+        `Could not find the exported providers array in ${file}. Register outboxDrainProvider manually, or restore the generated providers file before running make outbox.`,
+      );
+    }
+    next = withProvider;
+  }
+
+  const appended = appendToNamedArray(next, "providers", providerName);
+  if (appended.kind === "missing") {
+    throw new Error(
+      `Could not find the exported providers array in ${file}. Register outboxDrainProvider manually, or restore the generated providers file before running make outbox.`,
+    );
+  }
+  if (appended.kind === "updated") next = appended.source;
+
+  if (next === original) return false;
+  if (!options.dryRun) await writeFile(filePath, next);
+  return true;
+}
+
 async function updateOutboxRepositoriesReturnType(
   targetDir: string,
   config: ResolvedBeignetConfig,
@@ -2068,6 +2195,12 @@ export async function makeUpload(
     ? resolveConfig(options.config)
     : await loadBeignetConfig(targetDir);
 
+  assertNextFramework(
+    config,
+    "beignet make upload",
+    "a Next.js App Router upload handler",
+  );
+
   await assertFeatureArtifactApp(targetDir, config, "upload");
   if (options.ui) {
     await assertUploadUiApp(targetDir, config);
@@ -2168,6 +2301,12 @@ export async function makeOutbox(
     ? resolveConfig(options.config)
     : await loadBeignetConfig(targetDir);
 
+  assertNextFramework(
+    config,
+    "beignet make outbox",
+    "a Next.js App Router recovery drain handler",
+  );
+
   await assertServerRuntimeApp(targetDir, config, "outbox");
   await updateOutboxPortWiring(targetDir, config, { dryRun: true });
 
@@ -2219,6 +2358,9 @@ export async function makeOutbox(
       config.paths.ports,
       config.paths.portWiring,
       path.join(infrastructureDir(config), "db/provider.ts"),
+      ...((await projectSupportsNextAfter(targetDir))
+        ? [providersFilePath(config)]
+        : []),
       drizzleRepositoriesPath(config),
       outboxDrizzleSchemaFilePath(config),
       drizzleSchemaIndexPath(config),