@beignet/cli 0.0.37 → 0.0.38

package/src/inspect.ts

@@ -558,7 +558,7 @@ function inspectConvention(
   ]);
   const missingResourceGenerator = missingRequirements(files, [
     config.paths.appContext,
-    config.paths.infrastructurePorts,
+    config.paths.portWiring,
     config.paths.ports,
     config.paths.server,
     config.paths.useCaseBuilder,
@@ -1515,9 +1515,9 @@ async function inspectCanonicalConformance(
         "server/providers.ts should own provider registration, even when the provider list is small.",
     },
     {
-      file: config.paths.infrastructurePorts,
+      file: config.paths.portWiring,
       reason:
-        "infra/app-ports.ts should wire concrete app ports for the selected runtime.",
+        "infra/port-wiring.ts should wire concrete app ports for the selected runtime.",
     },
     {
       file: config.paths.routesBuilder,
@@ -2067,7 +2067,7 @@ async function inspectProductionReadiness(
   );
   const configFiles = operationalConfigFiles(files, config);
   const infrastructurePath = directoryPath(
-    path.dirname(config.paths.infrastructurePorts),
+    path.dirname(config.paths.portWiring),
   );
   const schemaDir = `${infrastructurePath}/db/schema`;
   let hasSecurityHeadersHook = false;
@@ -2567,7 +2567,7 @@ async function inspectPaymentsProductionReadiness(
     diagnostics.push({
       severity: "warning",
       code: "BEIGNET_BILLING_ENTITLEMENTS_PROVIDER_MISSING",
-      file: path.dirname(config.paths.infrastructurePorts),
+      file: path.dirname(config.paths.portWiring),
       message:
         "features/billing/entitlements.ts exists, but no infra or server provider appears to call createBillingEntitlements(...). Wire the billing-backed entitlements port into AppPorts so paid feature gates use app billing state.",
     });
@@ -3034,7 +3034,7 @@ async function hasBillingEntitlementsProviderWiring(
   config: ResolvedBeignetConfig,
   sourceCache: Map<string, string>,
 ): Promise<boolean> {
-  const infraPath = path.dirname(config.paths.infrastructurePorts);
+  const infraPath = path.dirname(config.paths.portWiring);
   const serverPath = path.dirname(config.paths.server);
   const candidateFiles = files.filter(
     (file) =>
@@ -3419,13 +3419,13 @@ function isInfraOrServerFile(
 ): boolean {
   const serverDir = directoryPath(path.dirname(config.paths.server));
   const infrastructureDir = directoryPath(
-    path.dirname(config.paths.infrastructurePorts),
+    path.dirname(config.paths.portWiring),
   );
 
   return (
     file === config.paths.server ||
     file.startsWith(`${serverDir}/`) ||
-    file === config.paths.infrastructurePorts ||
+    file === config.paths.portWiring ||
     file.startsWith(`${infrastructureDir}/`)
   );
 }
@@ -3550,9 +3550,7 @@ async function inspectWorkflowRegistrationDrift(
     }
   }
 
-  const infraDir = directoryPath(
-    path.dirname(config.paths.infrastructurePorts),
-  );
+  const infraDir = directoryPath(path.dirname(config.paths.portWiring));
   const listenerTarget = drift.listeners.wiringFile
     ? `${drift.listeners.wiringFile}, which already calls registerListeners(...)`
     : drift.listeners.eventBusFile
@@ -4382,7 +4380,7 @@ async function inspectDatabaseLifecycleDrift(
   const sourceCache = new Map<string, string>();
   const resources = await collectResourceNames(targetDir, files, config);
   const infrastructurePath = directoryPath(
-    path.dirname(config.paths.infrastructurePorts),
+    path.dirname(config.paths.portWiring),
   );
   const featuresPath = directoryPath(config.paths.features);
   const repositoriesPath = path.join(
@@ -7301,21 +7299,21 @@ async function inspectResourceSlices(
       "errors.ts",
     );
     const infrastructureDir = `${directoryPath(
-      path.dirname(config.paths.infrastructurePorts),
+      path.dirname(config.paths.portWiring),
     )}/${resource}/`;
     const drizzleSchemaFile = path.join(
-      path.dirname(config.paths.infrastructurePorts),
+      path.dirname(config.paths.portWiring),
       "db",
       "schema",
       `${resource}.ts`,
     );
     const drizzleRepositoryFile = path.join(
-      path.dirname(config.paths.infrastructurePorts),
+      path.dirname(config.paths.portWiring),
       resource,
       `drizzle-${singular}-repository.ts`,
     );
     const memoryRepositoryFile = path.join(
-      path.dirname(config.paths.infrastructurePorts),
+      path.dirname(config.paths.portWiring),
       resource,
       `in-memory-${singular}-repository.ts`,
     );
@@ -7653,7 +7651,7 @@ async function collectResourceNames(
   const portsPath = directoryPath(path.dirname(config.paths.ports));
   const featuresPath = directoryPath(config.paths.features);
   const infrastructurePath = directoryPath(
-    path.dirname(config.paths.infrastructurePorts),
+    path.dirname(config.paths.portWiring),
   );
 
   for (const file of files) {

package/src/lint.ts

@@ -1,5 +1,6 @@
 import { readdir, readFile, stat } from "node:fs/promises";
 import path from "node:path";
+import ts from "typescript";
 import { createPainter } from "./ansi.js";
 import {
   type BeignetConfig,
@@ -89,6 +90,7 @@ export async function lintApp(
   const diagnostics: LintDiagnostic[] = [];
   const sourceFiles = lintSourceFiles(files);
   const sourceFileSet = new Set(sourceFiles);
+  const atAliasRoot = resolveAtAliasRoot(targetDir);
   const sourceByFile = new Map<string, string>();
   const importGraph: ImportGraph = new Map();
 
@@ -96,7 +98,10 @@ export async function lintApp(
     const sourceLayer = classifyPath(file, config);
     const source = await readFile(path.join(targetDir, file), "utf8");
     sourceByFile.set(file, source);
-    importGraph.set(file, parseImports(source, file, sourceFileSet));
+    importGraph.set(
+      file,
+      parseImports(source, file, sourceFileSet, atAliasRoot),
+    );
 
     if (sourceLayer === "test" || sourceLayer === "unknown") continue;
 
@@ -281,15 +286,40 @@ function parseImports(
   source: string,
   importerFile: string,
   files: Set<string>,
+  atAliasRoot: string,
 ): ImportReference[] {
   const references = parseImportSpecifiers(source);
 
   return references.map((reference) => ({
     ...reference,
-    ...resolveImport(reference.importPath, importerFile, files),
+    ...resolveImport(reference.importPath, importerFile, files, atAliasRoot),
   }));
 }
 
+function resolveAtAliasRoot(targetDir: string): string {
+  const tsconfigPath = path.join(targetDir, "tsconfig.json");
+  const parsed = ts.getParsedCommandLineOfConfigFile(
+    tsconfigPath,
+    {},
+    {
+      ...ts.sys,
+      onUnRecoverableConfigFileDiagnostic: () => {},
+    },
+  );
+  const aliasTarget = parsed?.options.paths?.["@/*"]?.[0];
+  if (!aliasTarget) return "";
+
+  const targetWithoutWildcard = aliasTarget.replace(/[/\\]?\*$/, "");
+  const baseUrl = parsed.options.baseUrl ?? targetDir;
+  const absoluteTarget = path.resolve(baseUrl, targetWithoutWildcard);
+  const relativeTarget = normalizePath(
+    path.relative(targetDir, absoluteTarget),
+  );
+  if (relativeTarget === "" || relativeTarget === ".") return "";
+  if (relativeTarget === ".." || relativeTarget.startsWith("../")) return "";
+  return directoryPath(relativeTarget);
+}
+
 function parseImportSpecifiers(
   source: string,
 ): Array<{ importPath: string; kind: ImportKind; offset: number }> {
@@ -590,11 +620,12 @@ function resolveImport(
   importPath: string,
   importerFile: string,
   files: Set<string>,
+  atAliasRoot: string,
 ): Pick<ImportReference, "packageName" | "resolvedPath"> {
   if (importPath.startsWith("@/")) {
     return {
       resolvedPath: resolveLocalImportPath(
-        stripKnownExtension(importPath.slice(2)),
+        stripKnownExtension(path.posix.join(atAliasRoot, importPath.slice(2))),
         files,
       ),
     };
@@ -1171,7 +1202,7 @@ function classifyPath(
   if (
     isUnder(
       normalizedPath,
-      directoryPath(path.dirname(config.paths.infrastructurePorts)),
+      directoryPath(path.dirname(config.paths.portWiring)),
     )
   ) {
     return "infra";

package/src/make/inbox.ts

@@ -265,7 +265,7 @@ export async function updateInboxWiring(
       options,
     )
   ) {
-    updated.add(config.paths.infrastructurePorts);
+    updated.add(config.paths.portWiring);
   }
   if (
     await updateDrizzleSchemaIndexExports(
@@ -1119,7 +1119,7 @@ import {
 \tcreateTestPorts,
 } from "@beignet/core/testing";
 import type { AppContext } from "${aliasModule(config.paths.appContext)}";
-import { appPorts } from "${aliasModule(config.paths.infrastructurePorts)}";
+import { initialPorts } from "${aliasModule(config.paths.portWiring)}";
 import type { AppTransactionPorts } from "${aliasModule(config.paths.ports)}";
 import { getUnreadCountUseCase } from "../use-cases/get-unread-count";
 import { listInboxUseCase } from "../use-cases/list-inbox";
@@ -1140,9 +1140,9 @@ function createHarness(
 \tconst inbox = options.inbox ?? createMemoryInboxRepository();
 \tconst actor = options.actor ?? createTestUserActor("user_test");
 \tconst fixture = createTestPorts<AppContext["ports"], AppTransactionPorts>({
-\t\tbase: appPorts,
+\t\tbase: initialPorts,
 \t\toverrides: {
-\t\t\tgate: appPorts.gate,
+\t\t\tgate: initialPorts.gate,
 \t\t\tinbox,
 \t\t},
 \t});
@@ -1305,7 +1305,7 @@ import {
 \tdefineInboxNotificationChannel,
 \ttype InboxNotificationInput,
 } from "${channelModule}";
-import { appPorts } from "${aliasModule(config.paths.infrastructurePorts)}";
+import { initialPorts } from "${aliasModule(config.paths.portWiring)}";
 import { defineNotification } from "${aliasModule(config.paths.notificationsBuilder)}";
 import type { AppTransactionPorts } from "${aliasModule(config.paths.ports)}";
 import { createMemoryInboxRepository } from "./factories/inbox-notification";
@@ -1340,9 +1340,9 @@ const skippingNotification = defineNotification("inbox.channel-skip-test", {
 function createHarness() {
 \tconst inbox = createMemoryInboxRepository();
 \tconst fixture = createTestPorts<AppContext["ports"], AppTransactionPorts>({
-\t\tbase: appPorts,
+\t\tbase: initialPorts,
 \t\toverrides: {
-\t\t\tgate: appPorts.gate,
+\t\t\tgate: initialPorts.gate,
 \t\t\tinbox,
 \t\t},
 \t});

package/src/make/payments.ts

@@ -82,7 +82,13 @@ export async function makePayments(
 
   const database = await detectResourceDatabase(targetDir, config);
   const ui = await detectUiShell(targetDir, config);
-  const generatedFiles = paymentsFiles(config, database, { ui });
+  const tenantScoped = await fileExists(
+    path.join(targetDir, config.paths.features, "workspaces/contracts.ts"),
+  );
+  const generatedFiles = paymentsFiles(config, database, {
+    ui,
+    idempotencyScope: tenantScoped ? "actor-tenant" : "actor",
+  });
   const plannedFiles = await planGeneratedFiles(targetDir, generatedFiles, {
     force: Boolean(options.force),
   });
@@ -246,7 +252,7 @@ export async function updatePaymentsWiring(
   }
   if (await updatePaymentsEntitlementsPort(targetDir, config, options)) {
     updated.add(config.paths.ports);
-    updated.add(config.paths.infrastructurePorts);
+    updated.add(config.paths.portWiring);
   }
   if (
     await updateInfrastructureDeferredPorts(
@@ -256,7 +262,7 @@ export async function updatePaymentsWiring(
       options,
     )
   ) {
-    updated.add(config.paths.infrastructurePorts);
+    updated.add(config.paths.portWiring);
   }
   if (
     await updateDrizzleSchemaIndexExports(
@@ -354,10 +360,7 @@ export async function updatePaymentsEntitlementsPort(
     if (!options.dryRun) await writeFile(portsFilePath, portsNext);
   }
 
-  const infrastructureFilePath = path.join(
-    targetDir,
-    config.paths.infrastructurePorts,
-  );
+  const infrastructureFilePath = path.join(targetDir, config.paths.portWiring);
   const infrastructureOriginal = await readFile(infrastructureFilePath, "utf8");
   const infrastructureNext = appendDeferredPortKey(
     infrastructureOriginal,
@@ -368,7 +371,7 @@ export async function updatePaymentsEntitlementsPort(
     !/["']entitlements["']/.test(infrastructureOriginal)
   ) {
     throw new Error(
-      `Could not find the deferred port list in ${config.paths.infrastructurePorts}. Add "entitlements" manually, or restore the generated infrastructure ports file before running make payments.`,
+      `Could not find the deferred port list in ${config.paths.portWiring}. Add "entitlements" manually, or restore the generated port wiring file before running make payments.`,
     );
   }
   if (infrastructureNext !== infrastructureOriginal) {
@@ -558,7 +561,10 @@ export async function updateBillingSettingsNav(
 export function paymentsFiles(
   config: ResolvedBeignetConfig,
   database: DatabaseName,
-  options: { ui: boolean } = { ui: false },
+  options: {
+    ui: boolean;
+    idempotencyScope?: "actor" | "actor-tenant";
+  } = { ui: false },
 ): GeneratedFile[] {
   const uiFiles: GeneratedFile[] = options.ui
     ? [
@@ -611,7 +617,7 @@ export function paymentsFiles(
     },
     {
       path: path.join(config.paths.features, "billing/contracts.ts"),
-      content: billingContractsFile(),
+      content: billingContractsFile(options.idempotencyScope ?? "actor"),
     },
     {
       path: path.join(config.paths.features, "billing/use-cases/index.ts"),
@@ -846,7 +852,9 @@ export function isBillingAccountActive(
 `;
 }
 
-export function billingContractsFile(): string {
+export function billingContractsFile(
+  idempotencyScope: "actor" | "actor-tenant" = "actor",
+): string {
   return `import { defineContractGroup } from "@beignet/core/contracts";
 import { z } from "zod";
 import {
@@ -883,7 +891,7 @@ export const createCheckoutSession = checkoutBilling
 \t\tidempotency: {
 \t\t\trequired: true,
 \t\t\theader: "idempotency-key",
-\t\t\tscope: "actor-tenant",
+\t\t\tscope: "${idempotencyScope}",
 \t\t\tttlSec: 86_400,
 \t\t},
 \t})
@@ -1410,7 +1418,7 @@ import {
 \tcreateTestPorts,
 } from "@beignet/core/testing";
 import type { AppContext } from "${aliasModule(config.paths.appContext)}";
-import { appPorts } from "@/infra/app-ports";
+import { initialPorts } from "@/infra/port-wiring";
 import type { AppTransactionPorts } from "@/ports";
 import { createBillingEntitlements } from "../entitlements";
 import type { BillingAccount, BillingRepository } from "../ports";
@@ -1451,11 +1459,11 @@ function createHarness(options: { actor?: AppContext["actor"] } = {}) {
 \tconst billing = createMemoryBillingRepository();
 \tconst actor = options.actor ?? createTestUserActor("user_test");
 \tconst fixture = createTestPorts<AppContext["ports"], AppTransactionPorts>({
-\t\tbase: appPorts,
+\t\tbase: initialPorts,
 \t\toverrides: {
 \t\t\tbilling,
 \t\t\tentitlements: createBillingEntitlements(billing),
-\t\t\tgate: appPorts.gate,
+\t\t\tgate: initialPorts.gate,
 \t\t},
 \t});
 \tconst createContext = createTestContextFactory<

package/src/make/shared.ts

@@ -273,7 +273,7 @@ export type FileChangeSet = {
  * A provider-backed app port a generator depends on.
  *
  * Generated code that publishes events or sends notifications needs the
- * matching port in `AppPorts`, the key deferred in `infra/app-ports.ts`, and a
+ * matching port in `AppPorts`, the key deferred in `infra/port-wiring.ts`, and a
  * dev-default provider registered in `server/providers.ts`. Wiring is
  * generation-time by design: the starter stays lean and each generator wires
  * its own dependencies.
@@ -434,8 +434,13 @@ export function wireListenersProviderSource(
   }
 
   if (!new RegExp(`\\bconst\\s+${providerName}\\b`).test(next)) {
+    next = addNamedImport(
+      next,
+      "tryReportException",
+      "@beignet/core/error-reporting",
+    );
     const providerDefinition = `const ${providerName} = createProvider<
-\tPick<AppPorts, "eventBus" | "logger">,
+\tPick<AppPorts, "errorReporter" | "eventBus" | "logger">,
 \tAppContext,
 \tAppServiceContextInput
 >()({
@@ -451,6 +456,20 @@ export function wireListenersProviderSource(
 \t\t\t\t\terror,
 \t\t\t\t\tlistenerName: listener.name,
 \t\t\t\t});
+\t\t\t\tvoid tryReportException({
+\t\t\t\t\treporter: ports.errorReporter,
+\t\t\t\t\terror,
+\t\t\t\t\treportOptions: {
+\t\t\t\t\t\tlevel: "error",
+\t\t\t\t\t\tmechanism: "beignet.listener",
+\t\t\t\t\t\thandled: false,
+\t\t\t\t\t\ttags: {
+\t\t\t\t\t\t\t"beignet.kind": "listener",
+\t\t\t\t\t\t\t"beignet.listener": listener.name,
+\t\t\t\t\t\t},
+\t\t\t\t\t\tcontexts: { listener: { name: listener.name } },
+\t\t\t\t\t},
+\t\t\t\t});
 \t\t\t},
 \t\t});
 
@@ -496,7 +515,7 @@ export async function wirePortProviders(
   options: { dryRun: boolean },
 ): Promise<{ updatedFiles: string[] }> {
   const portsFile = config.paths.ports;
-  const infrastructureFile = config.paths.infrastructurePorts;
+  const infrastructureFile = config.paths.portWiring;
   const providersFile = providersFilePath(config);
   const manualFor = (wiring: PortProviderWiring) =>
     `Wire the ${wiring.portKey} port manually: add ${wiring.portKey}: ${wiring.portType}; to AppPorts in ${portsFile}, defer "${wiring.portKey}" in ${infrastructureFile}, and register ${wiring.providerFactory}() from ${wiring.providerModule} in ${providersFile}.`;
@@ -536,7 +555,7 @@ export async function wirePortProviders(
   );
   if (infrastructureOriginal === undefined) {
     throw new Error(
-      `Could not find the generated infrastructure ports file ${infrastructureFile}. ${manualFor(active[0])}`,
+      `Could not find the generated port wiring file ${infrastructureFile}. ${manualFor(active[0])}`,
     );
   }
 
@@ -548,7 +567,7 @@ export async function wirePortProviders(
       !new RegExp(`["']${wiring.portKey}["']`).test(infrastructureNext)
     ) {
       throw new Error(
-        `Could not find the deferred port list in ${infrastructureFile}. ${manualFor(wiring)} Or restore the generated infrastructure ports file before running beignet ${wiring.command}.`,
+        `Could not find the deferred port list in ${infrastructureFile}. ${manualFor(wiring)} Or restore the generated port wiring file before running beignet ${wiring.command}.`,
       );
     }
     infrastructureNext = appended;
@@ -651,7 +670,7 @@ export async function assertStandardApp(
 ): Promise<void> {
   const requiredFiles = [
     config.paths.appContext,
-    config.paths.infrastructurePorts,
+    config.paths.portWiring,
     config.paths.ports,
     config.paths.server,
     config.paths.useCaseBuilder,
@@ -688,7 +707,7 @@ export async function assertTestApp(
 ): Promise<void> {
   const requiredFiles = [
     config.paths.appContext,
-    config.paths.infrastructurePorts,
+    config.paths.portWiring,
     useCaseFilePath(names, config),
   ];
 
@@ -707,7 +726,7 @@ export async function assertPortApp(
   targetDir: string,
   config: ResolvedBeignetConfig,
 ): Promise<void> {
-  const requiredFiles = [config.paths.ports, config.paths.infrastructurePorts];
+  const requiredFiles = [config.paths.ports, config.paths.portWiring];
 
   for (const file of requiredFiles) {
     try {
@@ -725,10 +744,7 @@ export async function assertAdapterApp(
   names: PortNames,
   config: ResolvedBeignetConfig,
 ): Promise<void> {
-  const requiredFiles = [
-    config.paths.infrastructurePorts,
-    portFilePath(names, config),
-  ];
+  const requiredFiles = [config.paths.portWiring, portFilePath(names, config)];
 
   for (const file of requiredFiles) {
     try {
@@ -740,16 +756,16 @@ export async function assertAdapterApp(
     }
   }
 
-  const infrastructurePorts = await readFile(
-    path.join(targetDir, config.paths.infrastructurePorts),
+  const portWiring = await readFile(
+    path.join(targetDir, config.paths.portWiring),
     "utf8",
   );
   if (
-    !infrastructurePorts.includes(portStubEntry(names)) &&
-    !infrastructurePorts.includes(adapterEntry(names))
+    !portWiring.includes(portStubEntry(names)) &&
+    !portWiring.includes(adapterEntry(names))
   ) {
     throw new Error(
-      `Could not find the generated ${names.interfaceName} infrastructure stub in ${config.paths.infrastructurePorts}. Wire ${names.adapterFactoryName}() manually or restore the generated stub before running make adapter.`,
+      `Could not find the generated ${names.interfaceName} infrastructure stub in ${config.paths.portWiring}. Wire ${names.adapterFactoryName}() manually or restore the generated stub before running make adapter.`,
     );
   }
 }
@@ -822,7 +838,7 @@ export async function assertServerRuntimeApp(
   const requiredFiles = [
     config.paths.appContext,
     config.paths.server,
-    config.paths.infrastructurePorts,
+    config.paths.portWiring,
   ];
 
   for (const file of requiredFiles) {
@@ -1254,11 +1270,11 @@ export async function updateInfrastructurePortStub(
   config: ResolvedBeignetConfig,
   options: { dryRun: boolean },
 ): Promise<boolean> {
-  const filePath = path.join(targetDir, config.paths.infrastructurePorts);
+  const filePath = path.join(targetDir, config.paths.portWiring);
   const original = await readFile(filePath, "utf8");
   let next = original;
   const portPath = portFilePath(names, config);
-  const importLine = `import type { ${names.interfaceName} } from "${relativeModule(config.paths.infrastructurePorts, portPath)}";`;
+  const importLine = `import type { ${names.interfaceName} } from "${relativeModule(config.paths.portWiring, portPath)}";`;
 
   if (!next.includes(importLine)) {
     next = insertAfterImports(next, importLine);
@@ -1273,7 +1289,7 @@ export async function updateInfrastructurePortStub(
     next = insertDefinePortsProperty(
       next,
       entry.trim(),
-      `Could not find definePorts({ in ${config.paths.infrastructurePorts}. Add the ${names.interfaceName} stub manually, or restore the generated infrastructure ports file before running make port.`,
+      `Could not find definePorts({ in ${config.paths.portWiring}. Add the ${names.interfaceName} stub manually, or restore the generated port wiring file before running make port.`,
     );
   }
 
@@ -1288,18 +1304,18 @@ export async function updateInfrastructureAdapterWiring(
   config: ResolvedBeignetConfig,
   options: { dryRun: boolean },
 ): Promise<boolean> {
-  const filePath = path.join(targetDir, config.paths.infrastructurePorts);
+  const filePath = path.join(targetDir, config.paths.portWiring);
   const original = await readFile(filePath, "utf8");
   let next = original;
   const adapterPath = adapterFilePath(names, config);
-  const adapterImportLine = `import { ${names.adapterFactoryName} } from "${relativeModule(config.paths.infrastructurePorts, adapterPath)}";`;
+  const adapterImportLine = `import { ${names.adapterFactoryName} } from "${relativeModule(config.paths.portWiring, adapterPath)}";`;
 
   if (!next.includes(adapterImportLine)) {
     next = insertAfterImports(next, adapterImportLine);
   }
 
   const portPath = portFilePath(names, config);
-  const portImportLine = `import type { ${names.interfaceName} } from "${relativeModule(config.paths.infrastructurePorts, portPath)}";`;
+  const portImportLine = `import type { ${names.interfaceName} } from "${relativeModule(config.paths.portWiring, portPath)}";`;
   if (next.includes(portImportLine)) {
     next = next.replace(`${portImportLine}\n`, "");
   }
@@ -1310,7 +1326,7 @@ export async function updateInfrastructureAdapterWiring(
     next = next.replace(stub, adapter);
   } else if (!next.includes(adapter)) {
     throw new Error(
-      `Could not find the generated ${names.interfaceName} infrastructure stub in ${config.paths.infrastructurePorts}. Wire ${names.adapterFactoryName}() manually or restore the generated stub before running make adapter.`,
+      `Could not find the generated ${names.interfaceName} infrastructure stub in ${config.paths.portWiring}. Wire ${names.adapterFactoryName}() manually or restore the generated stub before running make adapter.`,
     );
   }
 
@@ -1325,15 +1341,15 @@ export async function updateInfrastructurePorts(
   config: ResolvedBeignetConfig,
   options: { dryRun: boolean },
 ): Promise<boolean> {
-  const filePath = path.join(targetDir, config.paths.infrastructurePorts);
+  const filePath = path.join(targetDir, config.paths.portWiring);
   const original = await readFile(filePath, "utf8");
   let next = original;
   const repositoryPath = path.join(
-    path.dirname(config.paths.infrastructurePorts),
+    path.dirname(config.paths.portWiring),
     names.pluralKebab,
     `in-memory-${names.singularKebab}-repository.ts`,
   );
-  const importLine = `import { createInMemory${names.singularPascal}Repository } from "${relativeModule(config.paths.infrastructurePorts, repositoryPath)}";`;
+  const importLine = `import { createInMemory${names.singularPascal}Repository } from "${relativeModule(config.paths.portWiring, repositoryPath)}";`;
 
   if (!next.includes(importLine)) {
     next = insertAfterImports(next, importLine);
@@ -1343,9 +1359,9 @@ export async function updateInfrastructurePorts(
   if (!next.includes(repositoryConst)) {
     next = replaceRequired(
       next,
-      /(\nexport const appPorts = definePorts(?:<[^>]+>)?\((?:\)\()?\{)/,
+      /(\nexport const initialPorts = definePorts(?:<[^>]+>)?\((?:\)\()?\{)/,
       `\n${repositoryConst}\n$1`,
-      `Could not find definePorts({ in ${config.paths.infrastructurePorts}. Add ${repositoryConst} manually, or restore the generated infrastructure ports file before running make resource.`,
+      `Could not find definePorts({ in ${config.paths.portWiring}. Add ${repositoryConst} manually, or restore the generated port wiring file before running make resource.`,
     );
   }
 
@@ -1358,7 +1374,7 @@ export async function updateInfrastructurePorts(
     next = insertDefinePortsProperty(
       next,
       entry.trim(),
-      `Could not find definePorts({ in ${config.paths.infrastructurePorts}. Add ${entry.trim()} to appPorts manually, or restore the generated infrastructure ports file before running make resource.`,
+      `Could not find definePorts({ in ${config.paths.portWiring}. Add ${entry.trim()} to initialPorts manually, or restore the generated port wiring file before running make resource.`,
     );
   }
 
@@ -1371,7 +1387,7 @@ export async function updateInfrastructurePorts(
     next = insertNoopUnitOfWorkProperty(
       next,
       transactionEntry.trim(),
-      `Could not find the generated Unit of Work port list in ${config.paths.infrastructurePorts}. Add ${transactionEntry.trim()} manually, or restore the generated infrastructure ports file before running make resource.`,
+      `Could not find the generated Unit of Work port list in ${config.paths.portWiring}. Add ${transactionEntry.trim()} manually, or restore the generated port wiring file before running make resource.`,
     );
   }
 
@@ -1386,7 +1402,7 @@ export async function updateInfrastructureGatePolicies(
   config: ResolvedBeignetConfig,
   options: { dryRun: boolean },
 ): Promise<boolean> {
-  const filePath = path.join(targetDir, config.paths.infrastructurePorts);
+  const filePath = path.join(targetDir, config.paths.portWiring);
   const original = await readFile(filePath, "utf8");
   let next = original;
   const policyPath = path.join(
@@ -1394,7 +1410,7 @@ export async function updateInfrastructureGatePolicies(
     names.pluralKebab,
     "policy.ts",
   );
-  const importLine = `import { ${names.singularCamel}Policy } from "${relativeModule(config.paths.infrastructurePorts, policyPath)}";`;
+  const importLine = `import { ${names.singularCamel}Policy } from "${relativeModule(config.paths.portWiring, policyPath)}";`;
 
   if (!next.includes(importLine)) {
     next = insertAfterImports(next, importLine);
@@ -1403,7 +1419,7 @@ export async function updateInfrastructureGatePolicies(
   next = appendCreateGatePolicy(
     next,
     `${names.singularCamel}Policy`,
-    `Could not find createGate({ policies: [...] }) in ${config.paths.infrastructurePorts}. Add ${names.singularCamel}Policy to the gate policies manually, or restore the generated infrastructure ports file before running make resource --auth.`,
+    `Could not find createGate({ policies: [...] }) in ${config.paths.portWiring}. Add ${names.singularCamel}Policy to the gate policies manually, or restore the generated port wiring file before running make resource --auth.`,
   );
 
   if (next === original) return false;
@@ -1713,7 +1729,7 @@ export async function updateInfrastructureDeferredPorts(
   config: ResolvedBeignetConfig,
   options: { dryRun: boolean },
 ): Promise<boolean> {
-  const filePath = path.join(targetDir, config.paths.infrastructurePorts);
+  const filePath = path.join(targetDir, config.paths.portWiring);
   const original = await readFile(filePath, "utf8");
   // Drizzle resources are provided by the app database provider at startup,
   // so deferred-form ports files defer the new repository key. Identity-form
@@ -1745,11 +1761,11 @@ export async function updateServerTransactionPorts(
 
   if (!/\bappPorts\b/.test(next)) {
     throw new Error(
-      `Could not find appPorts in ${config.paths.server}. Add ${names.pluralCamel}: appPorts.${names.pluralCamel} to createTransactionPorts manually, or restore the generated server file before running make resource.`,
+      `Could not find initialPorts in ${config.paths.server}. Add ${names.pluralCamel}: initialPorts.${names.pluralCamel} to createTransactionPorts manually, or restore the generated server file before running make resource.`,
     );
   }
 
-  const entry = `\t\t\t\t\t\t${names.pluralCamel}: appPorts.${names.pluralCamel},`;
+  const entry = `\t\t\t\t\t\t${names.pluralCamel}: initialPorts.${names.pluralCamel},`;
   next = insertDrizzleTransactionPortsProperty(
     next,
     entry.trim(),
@@ -3048,14 +3064,14 @@ export function adapterFilePath(
   config: ResolvedBeignetConfig,
 ): string {
   return path.join(
-    path.dirname(config.paths.infrastructurePorts),
+    path.dirname(config.paths.portWiring),
     names.kebab,
     `${names.kebab}-adapter.ts`,
   );
 }
 
 export function infrastructureDir(config: ResolvedBeignetConfig): string {
-  return path.dirname(config.paths.infrastructurePorts);
+  return path.dirname(config.paths.portWiring);
 }
 
 export function drizzleSchemaIndexPath(config: ResolvedBeignetConfig): string {