@beignet/cli 0.0.31 → 0.0.33

package/src/make.ts

@@ -30,6 +30,7 @@ import {
   assertUseCaseApp,
   beignetDependencyVersion,
   constantCase,
+  createListenersRegistrySource,
   type DatabaseName,
   type DrizzleDialect,
   defineUploadsInitializerInfo,
@@ -66,6 +67,7 @@ import {
   jobFilePath,
   type ListenerNames,
   listenerFilePath,
+  listenersFilePath,
   type MakeResult,
   mergeMakeResultInto,
   mergeMakeResults,
@@ -115,6 +117,7 @@ import {
   updateInfrastructureGatePolicies,
   updateInfrastructurePortStub,
   updateInfrastructurePorts,
+  updateListenersRegistrySource,
   updateOpenApiRoute,
   updatePackageDependencies,
   updatePackageJson,
@@ -138,12 +141,12 @@ import {
 } from "./make/shared.js";
 import {
   appendToArrayExpression,
-  appendToNamedArray,
   appendToOutboxRegistryArray,
   arrayInitializerInfo,
   identifiersFromArrayExpression,
   insertAfterImports,
 } from "./registry-edits.js";
+import { testSupportTemplateFiles } from "./templates/testing.js";
 
 export type { MakeFeatureAddon, MakeFeatureRecipe } from "./choices.js";
 export {
@@ -1241,7 +1244,7 @@ export async function makeSeed(
   if (
     await updatePackageScripts(
       targetDir,
-      { "db:seed": `bun ${seedEntrypointPath(config)}` },
+      { "db:seed": `tsx ${seedEntrypointPath(config)}` },
       { dryRun: Boolean(options.dryRun) },
     )
   ) {
@@ -1320,6 +1323,9 @@ export async function makeListener(
   if (!options.skipEventAssert) {
     await assertListenerEventExists(targetDir, names.event, config);
   }
+  await updateListenerRegistry(targetDir, names, config, {
+    dryRun: true,
+  });
   await updateListenerProviderWiring(targetDir, names, config, {
     dryRun: true,
   });
@@ -1340,6 +1346,24 @@ export async function makeListener(
     },
   });
 
+  const registryResult = await updateListenerRegistry(
+    targetDir,
+    names,
+    config,
+    {
+      dryRun: Boolean(options.dryRun),
+    },
+  );
+  if (registryResult === "created")
+    result.createdFiles.push(listenersFilePath(config));
+  if (registryResult === "updated")
+    result.updatedFiles.push(listenersFilePath(config));
+  if (registryResult === "skipped")
+    result.skippedFiles.push(listenersFilePath(config));
+  if (!result.files.includes(listenersFilePath(config))) {
+    result.files.push(listenersFilePath(config));
+  }
+
   const providerResult = await updateListenerProviderWiring(
     targetDir,
     names,
@@ -1361,6 +1385,49 @@ export async function makeListener(
   return result;
 }
 
+async function updateListenerRegistry(
+  targetDir: string,
+  names: ListenerNames,
+  config: ResolvedBeignetConfig,
+  options: { dryRun: boolean },
+): Promise<WriteGeneratedFileResult> {
+  const file = listenersFilePath(config);
+  const filePath = path.join(targetDir, file);
+  const listenerIndex = featureArtifactIndexFile("listener", names, config);
+  const original = await readOptionalFile(filePath);
+
+  if (original === undefined) {
+    if (!options.dryRun) {
+      await writeGeneratedFile(
+        targetDir,
+        {
+          path: file,
+          content: createListenersRegistrySource({
+            registryName: listenerIndex.registryName,
+            listenerModule: aliasModule(listenerIndex.path),
+          }),
+        },
+        { force: false, dryRun: false },
+      );
+    }
+    return "created";
+  }
+
+  const result = updateListenersRegistrySource(original, {
+    registryName: listenerIndex.registryName,
+    listenerModule: aliasModule(listenerIndex.path),
+  });
+  if (result.kind === "missing") {
+    throw new Error(
+      `Could not find the exported listeners array in ${file}. Register ${listenerIndex.registryName} manually, or restore the generated listeners file before running make listener.`,
+    );
+  }
+
+  if (result.kind === "unchanged") return "skipped";
+  if (!options.dryRun) await writeFile(filePath, result.source);
+  return "updated";
+}
+
 async function assertListenerEventExists(
   targetDir: string,
   names: EventNames,
@@ -1702,6 +1769,7 @@ async function updateOutboxPorts(
   const filePath = path.join(targetDir, config.paths.ports);
   const original = await readFile(filePath, "utf8");
   let next = addNamedTypeImport(original, "OutboxPort", "@beignet/core/outbox");
+  next = addNamedTypeImport(next, "OutboxAdminPort", "@beignet/core/outbox");
   if (!typeHasTopLevelProperty(next, "AppPorts", "outbox")) {
     next = insertTypeProperty(
       next,
@@ -1710,6 +1778,14 @@ async function updateOutboxPorts(
       `Could not find AppPorts in ${config.paths.ports}. Add outbox: OutboxPort; manually, or restore the generated ports file before running make outbox.`,
     );
   }
+  if (!typeHasTopLevelProperty(next, "AppPorts", "outboxAdmin")) {
+    next = insertTypeProperty(
+      next,
+      "AppPorts",
+      "outboxAdmin: OutboxAdminPort;",
+      `Could not find AppPorts in ${config.paths.ports}. Add outboxAdmin: OutboxAdminPort; manually, or restore the generated ports file before running make outbox.`,
+    );
+  }
   if (!typeHasTopLevelProperty(next, "AppTransactionPorts", "outbox")) {
     next = insertTypeProperty(
       next,
@@ -1731,7 +1807,8 @@ async function updateOutboxInfrastructurePorts(
 ): Promise<boolean> {
   const filePath = path.join(targetDir, config.paths.infrastructurePorts);
   const original = await readFile(filePath, "utf8");
-  const next = appendDeferredPortKey(original, "outbox");
+  let next = appendDeferredPortKey(original, "outbox");
+  next = appendDeferredPortKey(next, "outboxAdmin");
 
   if (next === original) return false;
   if (!options.dryRun) await writeFile(filePath, next);
@@ -1749,13 +1826,20 @@ async function updateOutboxDatabaseProvider(
 
   const database = await detectResourceDatabase(targetDir, config);
   const factoryName = drizzleOutboxPortFactoryName(database);
+  const adminFactoryName = drizzleOutboxAdminPortFactoryName(database);
   const original = await readFile(filePath, "utf8");
   let next = addNamedImport(
     original,
     factoryName,
     `@beignet/provider-db-drizzle/${database}`,
   );
+  next = addNamedImport(
+    next,
+    adminFactoryName,
+    `@beignet/provider-db-drizzle/${database}`,
+  );
   next = appendPickStringLiteralMember(next, "AppPorts", "outbox");
+  next = appendPickStringLiteralMember(next, "AppPorts", "outboxAdmin");
 
   if (!/\bconst\s+outbox\s*=/.test(next)) {
     const beforeOutboxConst = next;
@@ -1770,6 +1854,21 @@ async function updateOutboxDatabaseProvider(
     }
   }
 
+  if (!/\bconst\s+outboxAdmin\s*=/.test(next)) {
+    const beforeOutboxAdminConst = next;
+    next = beforeOutboxAdminConst.replace(
+      new RegExp(
+        `(\\n\\s*const outbox = ${factoryName}\\((dbPort\\.(?:drizzle|db))\\);)`,
+      ),
+      `$1\n\t\tconst outboxAdmin = ${adminFactoryName}($2);`,
+    );
+    if (next === beforeOutboxAdminConst) {
+      throw new Error(
+        `Could not find the outbox port in ${file}. Add const outboxAdmin = ${adminFactoryName}(dbPort.drizzle) manually, or restore the generated database provider before running make outbox.`,
+      );
+    }
+  }
+
   if (!/\boutbox\s*,/.test(next)) {
     const withOutboxPort = next.replace(
       /(\n\s*idempotency,\n)/,
@@ -1783,6 +1882,19 @@ async function updateOutboxDatabaseProvider(
     next = withOutboxPort;
   }
 
+  if (!/\boutboxAdmin\s*,/.test(next)) {
+    const withOutboxAdminPort = next.replace(
+      /(\n\s*outbox,\n)/,
+      `$1\t\t\toutboxAdmin,\n`,
+    );
+    if (withOutboxAdminPort === next) {
+      throw new Error(
+        `Could not find outbox in providedPorts in ${file}. Add outboxAdmin to providedPorts manually, or restore the generated database provider before running make outbox.`,
+      );
+    }
+    next = withOutboxAdminPort;
+  }
+
   if (!new RegExp(`outbox:\\s*${factoryName}\\(tx\\)`).test(next)) {
     const withTransactionOutbox = next.replace(
       /(\n\s*idempotency: createDrizzle[A-Za-z]+IdempotencyPort\(tx\),\n)/,
@@ -1882,6 +1994,12 @@ function drizzleOutboxPortFactoryName(database: DatabaseName): string {
   return "createDrizzleSqliteOutboxPort";
 }
 
+function drizzleOutboxAdminPortFactoryName(database: DatabaseName): string {
+  if (database === "postgres") return "createDrizzlePostgresOutboxAdminPort";
+  if (database === "mysql") return "createDrizzleMysqlOutboxAdminPort";
+  return "createDrizzleSqliteOutboxAdminPort";
+}
+
 async function applyOutboxDrainWiring(
   result: MakeResult,
   targetDir: string,
@@ -1957,7 +2075,10 @@ export async function makeUpload(
     force: Boolean(options.force),
     dryRun: Boolean(options.dryRun),
     name: `${names.feature.kebab}/${names.artifact.kebab}`,
-    files: uploadFiles(names, config),
+    files: [
+      ...(await missingCapabilityBuilderFiles(targetDir, "uploads", config)),
+      ...uploadFiles(names, config),
+    ],
     index: featureArtifactIndexFile("upload", names, config),
     dependencies: {
       "@beignet/core": beignetDependencyVersion,
@@ -2512,6 +2633,7 @@ function resourceFiles(
   const infraDir = infrastructureDir(config);
   const featureDir = resourceFeatureDir(names, config);
   const files: GeneratedFile[] = [
+    ...testSupportTemplateFiles,
     {
       path: resourceContractFilePath(names, config),
       content: contractFile(names, config, mode, options),
@@ -2668,6 +2790,7 @@ function testFiles(
   config: ResolvedBeignetConfig,
 ): GeneratedFile[] {
   return [
+    ...testSupportTemplateFiles,
     {
       path: useCaseTestFilePath(names, config),
       content: useCaseTestFile(names, config),
@@ -3468,7 +3591,7 @@ function listUseCaseFile(
 
   return `import "@beignet/core/server-only";
 import { normalizeCursorPage } from "@beignet/core/pagination";
-import { useCase } from "${relativeModule(filePath, config.paths.useCaseBuilder)}";
+${options.tenant ? `import { requireTenantScope } from "@beignet/core/tenancy";\n` : ""}import { useCase } from "${relativeModule(filePath, config.paths.useCaseBuilder)}";
 import {
 	decode${names.singularPascal}Cursor,
 	List${names.pluralPascal}InputSchema,
@@ -3480,7 +3603,7 @@ export const list${names.pluralPascal}UseCase = useCase
 	.input(List${names.pluralPascal}InputSchema)
 	.output(List${names.pluralPascal}OutputSchema)
 	.run(async ({ ctx, input }) => {
-${options.tenant ? `\t\tconst tenantId = ctx.tenant?.id;\n\t\tif (!tenantId) {\n\t\t\tthrow new Error("Tenant is required to list ${names.pluralKebab}.");\n\t\t}\n\n` : ""}		const page = normalizeCursorPage(input, {
+${options.tenant ? `\t\tconst scope = requireTenantScope(ctx);\n\n` : ""}		const page = normalizeCursorPage(input, {
 			defaultLimit: 20,
 			maxLimit: 100,
 		});
@@ -3491,7 +3614,7 @@ ${options.tenant ? `\t\tconst tenantId = ctx.tenant?.id;\n\t\tif (!tenantId) {\n
 			name: input.name,
 			sortBy: input.sortBy,
 			sortDirection: input.sortDirection,
-${options.tenant ? `\t\t\ttenantId,\n` : ""}		});
+		}${options.tenant ? ", scope" : ""});
 	});
 `;
 }
@@ -3507,7 +3630,7 @@ function createUseCaseFile(
   );
 
   return `import "@beignet/core/server-only";
-import { useCase } from "${relativeModule(filePath, config.paths.useCaseBuilder)}";
+${options.tenant ? `import { requireTenantScope } from "@beignet/core/tenancy";\n` : ""}import { useCase } from "${relativeModule(filePath, config.paths.useCaseBuilder)}";
 import {
 	Create${names.singularPascal}InputSchema,
 	${names.singularPascal}Schema,
@@ -3519,9 +3642,7 @@ export const create${names.singularPascal}UseCase = useCase
 	.input(Create${names.singularPascal}InputSchema)
 	.output(${names.singularPascal}Schema)
 	.run(async ({ ctx, input }) => {
-${options.tenant ? `\t\tconst tenantId = ctx.tenant?.id;\n\t\tif (!tenantId) {\n\t\t\tthrow new Error("Tenant is required to create ${names.singularKebab}.");\n\t\t}\n\n` : ""}${options.auth ? `\t\tawait ctx.gate.authorize("${names.pluralCamel}.create");\n\n` : ""}		const ${names.singularCamel} = await ctx.ports.${names.pluralCamel}.create({
-			...input,
-${options.tenant ? `\t\t\ttenantId,\n` : ""}		});
+${options.tenant ? `\t\tconst scope = requireTenantScope(ctx);\n\n` : ""}${options.auth ? `\t\tawait ctx.gate.authorize("${names.pluralCamel}.create");\n\n` : ""}		const ${names.singularCamel} = await ctx.ports.${names.pluralCamel}.create(input${options.tenant ? ", scope" : ""});
 ${options.events ? `\n\t\tawait ctx.ports.eventBus.publish(${names.singularPascal}Created, {\n\t\t\tid: ${names.singularCamel}.id,\n\t\t});\n` : ""}
 		return ${names.singularCamel};
 	});
@@ -3539,7 +3660,7 @@ function getUseCaseFile(
   );
 
   return `import "@beignet/core/server-only";
-import { appError } from "${relativeModule(filePath, resourceSharedErrorsPath(config))}";
+${options.tenant ? `import { requireTenantScope } from "@beignet/core/tenancy";\n` : ""}import { appError } from "${relativeModule(filePath, resourceSharedErrorsPath(config))}";
 import { useCase } from "${relativeModule(filePath, config.paths.useCaseBuilder)}";
 import {
 	${names.singularPascal}IdInputSchema,
@@ -3551,7 +3672,7 @@ export const get${names.singularPascal}UseCase = useCase
 	.input(${names.singularPascal}IdInputSchema)
 	.output(${names.singularPascal}Schema)
 	.run(async ({ ctx, input }) => {
-${options.tenant ? `\t\tconst tenantId = ctx.tenant?.id;\n\t\tif (!tenantId) {\n\t\t\tthrow new Error("Tenant is required to get ${names.singularKebab}.");\n\t\t}\n\n` : ""}		const ${names.singularCamel} = await ctx.ports.${names.pluralCamel}.findById(input.id${options.tenant ? ", { tenantId }" : ""});
+${options.tenant ? `\t\tconst scope = requireTenantScope(ctx);\n\n` : ""}		const ${names.singularCamel} = await ctx.ports.${names.pluralCamel}.findById(input.id${options.tenant ? ", scope" : ""});
 		if (!${names.singularCamel}) {
 			throw appError("${names.singularPascal}NotFound", {
 				details: { id: input.id },
@@ -3574,7 +3695,7 @@ function updateUseCaseFile(
   );
 
   return `import "@beignet/core/server-only";
-import { appError } from "${relativeModule(filePath, resourceSharedErrorsPath(config))}";
+${options.tenant ? `import { requireTenantScope } from "@beignet/core/tenancy";\n` : ""}import { appError } from "${relativeModule(filePath, resourceSharedErrorsPath(config))}";
 import { useCase } from "${relativeModule(filePath, config.paths.useCaseBuilder)}";
 ${options.events ? `import { ${names.singularPascal}Updated } from "../domain/events";\n` : ""}import {
 	Update${names.singularPascal}InputSchema,
@@ -3586,7 +3707,7 @@ export const update${names.singularPascal}UseCase = useCase
 	.input(Update${names.singularPascal}InputSchema)
 	.output(${names.singularPascal}Schema)
 	.run(async ({ ctx, input }) => {
-${options.tenant ? `\t\tconst tenantId = ctx.tenant?.id;\n\t\tif (!tenantId) {\n\t\t\tthrow new Error("Tenant is required to update ${names.singularKebab}.");\n\t\t}\n\n` : ""}		const existing = await ctx.ports.${names.pluralCamel}.findById(input.id${options.tenant ? ", { tenantId }" : ""});
+${options.tenant ? `\t\tconst scope = requireTenantScope(ctx);\n\n` : ""}		const existing = await ctx.ports.${names.pluralCamel}.findById(input.id${options.tenant ? ", scope" : ""});
 		if (!existing) {
 			throw appError("${names.singularPascal}NotFound", {
 				details: { id: input.id },
@@ -3600,7 +3721,7 @@ ${options.auth ? `\t\tawait ctx.gate.authorize("${names.pluralCamel}.update", ex
 
 		const ${names.singularCamel} = await ctx.ports.${names.pluralCamel}.update({
 			...input,
-${options.tenant ? `\t\t\ttenantId,\n` : ""}		});
+		}${options.tenant ? ", scope" : ""});
 		if (!${names.singularCamel}) {
 			throw appError("${names.singularPascal}Conflict", {
 				details: { id: input.id, expectedVersion: existing.version },
@@ -3624,7 +3745,7 @@ function deleteUseCaseFile(
 
   return `import "@beignet/core/server-only";
 import { z } from "zod";
-import { appError } from "${relativeModule(filePath, resourceSharedErrorsPath(config))}";
+${options.tenant ? `import { requireTenantScope } from "@beignet/core/tenancy";\n` : ""}import { appError } from "${relativeModule(filePath, resourceSharedErrorsPath(config))}";
 import { useCase } from "${relativeModule(filePath, config.paths.useCaseBuilder)}";
 ${options.events ? `import { ${names.singularPascal}Deleted } from "../domain/events";\n` : ""}import { ${names.singularPascal}IdInputSchema } from "../schemas";
 
@@ -3633,7 +3754,7 @@ export const delete${names.singularPascal}UseCase = useCase
 	.input(${names.singularPascal}IdInputSchema)
 	.output(z.void())
 	.run(async ({ ctx, input }) => {
-${options.tenant ? `\t\tconst tenantId = ctx.tenant?.id;\n\t\tif (!tenantId) {\n\t\t\tthrow new Error("Tenant is required to delete ${names.singularKebab}.");\n\t\t}\n\n` : ""}${options.auth ? `\t\tconst existing = await ctx.ports.${names.pluralCamel}.findById(input.id${options.tenant ? ", { tenantId }" : ""});\n\t\tif (!existing) {\n\t\t\tthrow appError("${names.singularPascal}NotFound", {\n\t\t\t\tdetails: { id: input.id },\n\t\t\t});\n\t\t}\n\t\tawait ctx.gate.authorize("${names.pluralCamel}.delete", existing);\n\n` : ""}		const deleted = await ctx.ports.${names.pluralCamel}.delete(input.id${options.tenant ? ", { tenantId }" : ""});
+${options.tenant ? `\t\tconst scope = requireTenantScope(ctx);\n\n` : ""}${options.auth ? `\t\tconst existing = await ctx.ports.${names.pluralCamel}.findById(input.id${options.tenant ? ", scope" : ""});\n\t\tif (!existing) {\n\t\t\tthrow appError("${names.singularPascal}NotFound", {\n\t\t\t\tdetails: { id: input.id },\n\t\t\t});\n\t\t}\n\t\tawait ctx.gate.authorize("${names.pluralCamel}.delete", existing);\n\n` : ""}		const deleted = await ctx.ports.${names.pluralCamel}.delete(input.id${options.tenant ? ", scope" : ""});
 		if (!deleted) {
 			throw appError("${names.singularPascal}NotFound", {
 				details: { id: input.id },
@@ -3673,7 +3794,7 @@ function repositoryPortFile(
 	PageResult,
 	SortDirection,
 } from "@beignet/core/pagination";
-import type {
+${options.tenant ? `import type { TenantScope } from "@beignet/core/tenancy";\n` : ""}import type {
 	Create${names.singularPascal}Input,
 	${names.singularPascal}Cursor,
 	${names.singularPascal}SortBy,
@@ -3687,13 +3808,12 @@ export type List${names.pluralPascal}Query = {
 	name?: string;
 	sortBy: ${names.singularPascal}SortBy;
 	sortDirection: SortDirection;
-${options.tenant ? `\ttenantId: string;\n` : ""}};
-${options.tenant ? `export type ${names.singularPascal}TenantFilter = { tenantId: string };\nexport type Create${names.singularPascal}RepositoryInput = Create${names.singularPascal}Input & ${names.singularPascal}TenantFilter;\n${mode === "resource" ? `export type Update${names.singularPascal}RepositoryInput = Update${names.singularPascal}Input & ${names.singularPascal}TenantFilter;\n` : ""}` : ""}
+};
 
 export interface ${names.singularPascal}Repository {
-	list(query: List${names.pluralPascal}Query): Promise<List${names.pluralPascal}Result>;
-	create(input: ${options.tenant ? `Create${names.singularPascal}RepositoryInput` : `Create${names.singularPascal}Input`}): Promise<${names.singularPascal}>;
-${mode === "resource" ? `	findById(id: string${options.tenant ? `, filter: ${names.singularPascal}TenantFilter` : ""}): Promise<${names.singularPascal} | null>;\n	update(input: ${options.tenant ? `Update${names.singularPascal}RepositoryInput` : `Update${names.singularPascal}Input`}): Promise<${names.singularPascal} | null>;\n	delete(id: string${options.tenant ? `, filter: ${names.singularPascal}TenantFilter` : ""}): Promise<boolean>;\n` : ""}}
+	list(query: List${names.pluralPascal}Query${options.tenant ? ", scope: TenantScope" : ""}): Promise<List${names.pluralPascal}Result>;
+	create(input: Create${names.singularPascal}Input${options.tenant ? ", scope: TenantScope" : ""}): Promise<${names.singularPascal}>;
+${mode === "resource" ? `	findById(id: string${options.tenant ? ", scope: TenantScope" : ""}): Promise<${names.singularPascal} | null>;\n	update(input: Update${names.singularPascal}Input${options.tenant ? ", scope: TenantScope" : ""}): Promise<${names.singularPascal} | null>;\n	delete(id: string${options.tenant ? ", scope: TenantScope" : ""}): Promise<boolean>;\n` : ""}}
 `;
 }
 
@@ -3727,14 +3847,14 @@ function inMemoryRepositoryFile(
     ? " || existing.deletedAt !== null"
     : "";
   const deleteImplementation = options.softDelete
-    ? `${options.tenant ? `\t\t\tconst existing = ${names.pluralCamel}.get(id);\n\t\t\tif (!existing || existing.tenantId !== filter.tenantId || existing.deletedAt !== null) return false;\n` : `\t\t\tconst existing = ${names.pluralCamel}.get(id);\n\t\t\tif (!existing || existing.deletedAt !== null) return false;\n`}			const now = new Date().toISOString();
+    ? `${options.tenant ? `\t\t\tconst existing = ${names.pluralCamel}.get(id);\n\t\t\tif (!existing || existing.tenantId !== tenantId || existing.deletedAt !== null) return false;\n` : `\t\t\tconst existing = ${names.pluralCamel}.get(id);\n\t\t\tif (!existing || existing.deletedAt !== null) return false;\n`}			const now = new Date().toISOString();
 			${names.pluralCamel}.set(id, { ...existing, deletedAt: now, updatedAt: now });
 			return true;`
-    : `${options.tenant ? `\t\t\tconst existing = ${names.pluralCamel}.get(id);\n\t\t\tif (existing?.tenantId !== filter.tenantId) return false;\n` : ""}			return ${names.pluralCamel}.delete(id);`;
+    : `${options.tenant ? `\t\t\tconst existing = ${names.pluralCamel}.get(id);\n\t\t\tif (existing?.tenantId !== tenantId) return false;\n` : ""}			return ${names.pluralCamel}.delete(id);`;
 
   return `import "@beignet/core/server-only";
 import { cursorPageResult } from "@beignet/core/pagination";
-import type { ${names.singularPascal}Repository } from "${aliasModule(repositoryPortPath)}";
+${options.tenant ? `import { tenantScopeId } from "@beignet/core/tenancy";\n` : ""}import type { ${names.singularPascal}Repository } from "${aliasModule(repositoryPortPath)}";
 import { encode${names.singularPascal}Cursor } from "${aliasModule(resourceSchemaFilePath(names, config))}";
 import type {
 	Create${names.singularPascal}Input,
@@ -3802,10 +3922,10 @@ export function createInMemory${names.singularPascal}Repository(
 	);
 
 	return {
-		async list(query) {
+		async list(query${options.tenant ? ", scope" : ""}) {
 			const name = query.name?.toLocaleLowerCase();
-			const all${names.pluralPascal} = Array.from(${names.pluralCamel}.values())
-${activeFilter}${options.tenant ? `\t\t\t\t.filter((${names.singularCamel}) => ${names.singularCamel}.tenantId === query.tenantId)\n` : ""}				.filter((${names.singularCamel}) => !name || ${names.singularCamel}.name.toLocaleLowerCase().includes(name))
+${options.tenant ? `\t\t\tconst tenantId = tenantScopeId(scope);\n` : ""}			const all${names.pluralPascal} = Array.from(${names.pluralCamel}.values())
+${activeFilter}${options.tenant ? `\t\t\t\t.filter((${names.singularCamel}) => ${names.singularCamel}.tenantId === tenantId)\n` : ""}				.filter((${names.singularCamel}) => !name || ${names.singularCamel}.name.toLocaleLowerCase().includes(name))
 				.sort((left, right) => compare${names.pluralPascal}(left, right, query))
 				.filter((${names.singularCamel}) => isAfter${names.singularPascal}Cursor(${names.singularCamel}, query));
 			const pageItems = all${names.pluralPascal}.slice(0, query.page.limit);
@@ -3820,11 +3940,11 @@ ${activeFilter}${options.tenant ? `\t\t\t\t.filter((${names.singularCamel}) => $
 				nextCursor,
 			);
 		},
-		async create(input) {
+		async create(input${options.tenant ? ", scope" : ""}) {
 			const now = new Date().toISOString();
-			const ${names.singularCamel}: ${names.singularPascal} = {
+${options.tenant ? `\t\t\tconst tenantId = tenantScopeId(scope);\n` : ""}			const ${names.singularCamel}: ${names.singularPascal} = {
 				id: crypto.randomUUID(),
-${options.tenant ? `\t\t\t\ttenantId: input.tenantId,\n` : ""}				name: input.name,
+${options.tenant ? `\t\t\t\ttenantId,\n` : ""}				name: input.name,
 				version: 1,
 				createdAt: now,
 				updatedAt: now,
@@ -3834,7 +3954,7 @@ ${options.tenant ? `\t\t\t\ttenantId: input.tenantId,\n` : ""}				name: input.na
 ${newDeletedAtField}			});
 			return ${names.singularCamel};
 		},
-${mode === "resource" ? `		async findById(id: string${options.tenant ? ", filter" : ""}) {\n			const ${names.singularCamel} = ${names.pluralCamel}.get(id) ?? null;\n${options.tenant ? `\t\t\tif (${names.singularCamel}?.tenantId !== filter.tenantId) return null;\n` : ""}${findDeletedGuard}			return ${names.singularCamel} ? to${names.singularPascal}(${names.singularCamel}) : null;\n		},\n		async update(input) {\n			const existing = ${names.pluralCamel}.get(input.id);\n			if (!existing${options.tenant ? " || existing.tenantId !== input.tenantId" : ""}${updateDeletedGuard} || existing.version !== input.version) return null;\n\n			const next: ${mapValueType} = {\n				...existing,\n				name: input.name,\n				version: existing.version + 1,\n				updatedAt: new Date().toISOString(),\n			};\n			${names.pluralCamel}.set(input.id, next);\n			return to${names.singularPascal}(next);\n		},\n		async delete(id: string${options.tenant ? ", filter" : ""}) {\n${deleteImplementation}\n		},\n` : ""}
+${mode === "resource" ? `		async findById(id: string${options.tenant ? ", scope" : ""}) {\n${options.tenant ? `\t\t\tconst tenantId = tenantScopeId(scope);\n` : ""}			const ${names.singularCamel} = ${names.pluralCamel}.get(id) ?? null;\n${options.tenant ? `\t\t\tif (${names.singularCamel}?.tenantId !== tenantId) return null;\n` : ""}${findDeletedGuard}			return ${names.singularCamel} ? to${names.singularPascal}(${names.singularCamel}) : null;\n		},\n		async update(input${options.tenant ? ", scope" : ""}) {\n${options.tenant ? `\t\t\tconst tenantId = tenantScopeId(scope);\n` : ""}			const existing = ${names.pluralCamel}.get(input.id);\n			if (!existing${options.tenant ? " || existing.tenantId !== tenantId" : ""}${updateDeletedGuard} || existing.version !== input.version) return null;\n\n			const next: ${mapValueType} = {\n				...existing,\n				name: input.name,\n				version: existing.version + 1,\n				updatedAt: new Date().toISOString(),\n			};\n			${names.pluralCamel}.set(input.id, next);\n			return to${names.singularPascal}(next);\n		},\n		async delete(id: string${options.tenant ? ", scope" : ""}) {\n${options.tenant ? `\t\t\tconst tenantId = tenantScopeId(scope);\n` : ""}${deleteImplementation}\n		},\n` : ""}
 	};
 }
 `;
@@ -3958,20 +4078,20 @@ function drizzleRepositoryFile(
   const findWhere = drizzleResourceWhere(names, options, [
     `eq(schema.${names.pluralCamel}.id, id)`,
     ...(options.tenant
-      ? [`eq(schema.${names.pluralCamel}.tenantId, filter.tenantId)`]
+      ? [`eq(schema.${names.pluralCamel}.tenantId, tenantScopeId(scope))`]
       : []),
   ]);
   const updateWhere = drizzleResourceWhere(names, options, [
     `eq(schema.${names.pluralCamel}.id, input.id)`,
     `eq(schema.${names.pluralCamel}.version, input.version)`,
     ...(options.tenant
-      ? [`eq(schema.${names.pluralCamel}.tenantId, input.tenantId)`]
+      ? [`eq(schema.${names.pluralCamel}.tenantId, tenantScopeId(scope))`]
       : []),
   ]);
   const deleteWhere = drizzleResourceWhere(names, options, [
     `eq(schema.${names.pluralCamel}.id, id)`,
     ...(options.tenant
-      ? [`eq(schema.${names.pluralCamel}.tenantId, filter.tenantId)`]
+      ? [`eq(schema.${names.pluralCamel}.tenantId, tenantScopeId(scope))`]
       : []),
   ]);
   const drizzleImports = [
@@ -3989,7 +4109,7 @@ function drizzleRepositoryFile(
   // After a version-guarded update succeeds, re-select by identity only —
   // matching what `.returning()` yields on the dialects that support it.
   const updateReselectWhere = options.tenant
-    ? `and(eq(schema.${names.pluralCamel}.id, input.id), eq(schema.${names.pluralCamel}.tenantId, input.tenantId))`
+    ? `and(eq(schema.${names.pluralCamel}.id, input.id), eq(schema.${names.pluralCamel}.tenantId, tenantScopeId(scope)))`
     : `eq(schema.${names.pluralCamel}.id, input.id)`;
   // drizzle-orm/mysql2 has no `.returning(...)`; mutations resolve to a
   // `[ResultSetHeader, FieldPacket[]]` tuple typed as `unknown` through the
@@ -4011,13 +4131,13 @@ function affectedRows(result: unknown): number {
 `
       : "";
   const createMethod = dialect.supportsReturning
-    ? `		async create(input) {
+    ? `		async create(input${options.tenant ? ", scope" : ""}) {
 			const now = new Date().toISOString();
 			const [row] = await db
 				.insert(schema.${names.pluralCamel})
 				.values({
 					id: crypto.randomUUID(),
-${options.tenant ? `\t\t\t\t\ttenantId: input.tenantId,\n` : ""}					name: input.name,
+${options.tenant ? `\t\t\t\t\ttenantId: tenantScopeId(scope),\n` : ""}					name: input.name,
 					version: 1,
 					createdAt: now,
 					updatedAt: now,
@@ -4031,11 +4151,11 @@ ${options.tenant ? `\t\t\t\t\ttenantId: input.tenantId,\n` : ""}					name: input
 			return to${names.singularPascal}(row);
 		},
 `
-    : `		async create(input) {
+    : `		async create(input${options.tenant ? ", scope" : ""}) {
 			const now = new Date().toISOString();
 			const ${names.singularCamel}: ${names.singularPascal} = {
 				id: crypto.randomUUID(),
-${options.tenant ? `\t\t\t\ttenantId: input.tenantId,\n` : ""}				name: input.name,
+${options.tenant ? `\t\t\t\ttenantId: tenantScopeId(scope),\n` : ""}				name: input.name,
 				version: 1,
 				createdAt: now,
 				updatedAt: now,
@@ -4049,7 +4169,7 @@ ${options.tenant ? `\t\t\t\ttenantId: input.tenantId,\n` : ""}				name: input.na
     mode !== "resource"
       ? ""
       : dialect.supportsReturning
-        ? `		async findById(id: string${options.tenant ? ", filter" : ""}) {
+        ? `		async findById(id: string${options.tenant ? ", scope" : ""}) {
 			const [row] = await db
 				.select()
 				.from(schema.${names.pluralCamel})
@@ -4058,7 +4178,7 @@ ${options.tenant ? `\t\t\t\ttenantId: input.tenantId,\n` : ""}				name: input.na
 
 			return row ? to${names.singularPascal}(row) : null;
 		},
-		async update(input) {
+		async update(input${options.tenant ? ", scope" : ""}) {
 			const [row] = await db
 				.update(schema.${names.pluralCamel})
 				.set({
@@ -4071,12 +4191,12 @@ ${options.tenant ? `\t\t\t\ttenantId: input.tenantId,\n` : ""}				name: input.na
 
 			return row ? to${names.singularPascal}(row) : null;
 		},
-		async delete(id: string${options.tenant ? ", filter" : ""}) {
+		async delete(id: string${options.tenant ? ", scope" : ""}) {
 ${options.softDelete ? `\t\t\tconst now = new Date().toISOString();\n\t\t\tconst rows = await db\n\t\t\t\t.update(schema.${names.pluralCamel})\n\t\t\t\t.set({ deletedAt: now, updatedAt: now })\n\t\t\t\t.where(${deleteWhere})\n\t\t\t\t.returning({ id: schema.${names.pluralCamel}.id });\n` : `\t\t\tconst rows = await db\n\t\t\t\t.delete(schema.${names.pluralCamel})\n\t\t\t\t.where(${deleteWhere})\n\t\t\t\t.returning({ id: schema.${names.pluralCamel}.id });\n`}
 			return rows.length > 0;
 		},
 `
-        : `		async findById(id: string${options.tenant ? ", filter" : ""}) {
+        : `		async findById(id: string${options.tenant ? ", scope" : ""}) {
 			const [row] = await db
 				.select()
 				.from(schema.${names.pluralCamel})
@@ -4085,7 +4205,7 @@ ${options.softDelete ? `\t\t\tconst now = new Date().toISOString();\n\t\t\tconst
 
 			return row ? to${names.singularPascal}(row) : null;
 		},
-		async update(input) {
+		async update(input${options.tenant ? ", scope" : ""}) {
 			const result = await db
 				.update(schema.${names.pluralCamel})
 				.set({
@@ -4105,7 +4225,7 @@ ${options.softDelete ? `\t\t\tconst now = new Date().toISOString();\n\t\t\tconst
 
 			return row ? to${names.singularPascal}(row) : null;
 		},
-		async delete(id: string${options.tenant ? ", filter" : ""}) {
+		async delete(id: string${options.tenant ? ", scope" : ""}) {
 ${options.softDelete ? `\t\t\tconst now = new Date().toISOString();\n\t\t\tconst result = await db\n\t\t\t\t.update(schema.${names.pluralCamel})\n\t\t\t\t.set({ deletedAt: now, updatedAt: now })\n\t\t\t\t.where(${deleteWhere});\n` : `\t\t\tconst result = await db\n\t\t\t\t.delete(schema.${names.pluralCamel})\n\t\t\t\t.where(${deleteWhere});\n`}
 			return affectedRows(result) > 0;
 		},
@@ -4113,7 +4233,7 @@ ${options.softDelete ? `\t\t\tconst now = new Date().toISOString();\n\t\t\tconst
 
   return `import "@beignet/core/server-only";
 import { cursorPageResult } from "@beignet/core/pagination";
-import type { ${dialect.dbTypeName} } from "@beignet/provider-db-drizzle/${dialect.subpath}";
+${options.tenant ? `import { tenantScopeId } from "@beignet/core/tenancy";\n` : ""}import type { ${dialect.dbTypeName} } from "@beignet/provider-db-drizzle/${dialect.subpath}";
 import { ${drizzleImports.join(", ")} } from "drizzle-orm";
 import type { ${names.singularPascal}Repository } from "${aliasModule(repositoryPortPath)}";
 import { encode${names.singularPascal}Cursor } from "${aliasModule(resourceSchemaFilePath(names, config))}";
@@ -4160,9 +4280,9 @@ function ${names.singularCamel}CursorFilter(
 
 function ${names.singularCamel}ListWhere(
 	query: List${names.pluralPascal}Query,
-): SQL<unknown> | undefined {
+${options.tenant ? `\tscope: Parameters<${names.singularPascal}Repository["list"]>[1],\n` : ""}): SQL<unknown> | undefined {
 	const filters: SQL<unknown>[] = [
-${options.tenant ? `\t\teq(schema.${names.pluralCamel}.tenantId, query.tenantId),\n` : ""}${options.softDelete ? `\t\tisNull(schema.${names.pluralCamel}.deletedAt),\n` : ""}	];
+${options.tenant ? `\t\teq(schema.${names.pluralCamel}.tenantId, tenantScopeId(scope)),\n` : ""}${options.softDelete ? `\t\tisNull(schema.${names.pluralCamel}.deletedAt),\n` : ""}	];
 	const cursor = ${names.singularCamel}CursorFilter(query);
 
 	if (query.name) {
@@ -4196,8 +4316,8 @@ export function createDrizzle${names.singularPascal}Repository(
 	db: ${dialect.dbTypeName}<typeof schema>,
 ): ${names.singularPascal}Repository {
 	return {
-		async list(query) {
-			const where = ${names.singularCamel}ListWhere(query);
+		async list(query${options.tenant ? ", scope" : ""}) {
+			const where = ${names.singularCamel}ListWhere(query${options.tenant ? ", scope" : ""});
 			const rows = await db
 				.select()
 				.from(schema.${names.pluralCamel})
@@ -4377,7 +4497,7 @@ function useCaseTestFile(
 ): string {
   const filePath = useCaseTestFilePath(names, config);
 
-  return `import { describe, expect, it } from "bun:test";
+  return `import { describe, expect, it } from "@/lib/beignet-test";
 import { createUseCaseTester } from "@beignet/core/application";
 import { createInMemoryDevtools } from "@beignet/devtools";
 import { createTestContextFactory, createTestPorts } from "@beignet/core/testing";
@@ -4549,7 +4669,7 @@ function resourcePolicyTestFile(
   names: ResourceNames,
   options: ResourceGenerationOptions,
 ): string {
-  return `import { describe, expect, it } from "bun:test";
+  return `import { describe, expect, it } from "@/lib/beignet-test";
 import { createPolicyTester } from "@beignet/core/ports/testing";
 import { ${names.singularCamel}Policy } from "../policy";
 import type { ${names.singularPascal} } from "../schemas";
@@ -4800,9 +4920,8 @@ ${names.timezone ? `\t\ttimezone: "${names.timezone}",\n` : ""}\t\tpayload: ${na
 }
 
 function uploadFile(names: UploadNames, config: ResolvedBeignetConfig): string {
-  return `import { defineUpload } from "@beignet/core/uploads";
-import { z } from "zod";
-import type { AppContext } from "${aliasModule(config.paths.appContext)}";
+  return `import { z } from "zod";
+import { defineUpload } from "${aliasModule(config.paths.uploadsBuilder)}";
 
 export const ${names.metadataSchemaName} = z.object({
 \tresourceId: z.string().min(1),
@@ -4810,12 +4929,7 @@ export const ${names.metadataSchemaName} = z.object({
 
 export type ${names.metadataTypeName} = z.infer<typeof ${names.metadataSchemaName}>;
 
-export const ${names.uploadExportName} = defineUpload<
-\t"${names.uploadName}",
-\ttypeof ${names.metadataSchemaName},
-\tAppContext,
-\t{ objectKeys: string[] }
->("${names.uploadName}", {
+export const ${names.uploadExportName} = defineUpload("${names.uploadName}", {
 \tmetadata: ${names.metadataSchemaName},
 \tfile: {
 \t\tcontentTypes: ["application/pdf", "text/plain"],
@@ -5173,7 +5287,7 @@ function testFile(
   );
   const requestTarget = "app";
 
-  return `import { describe, expect, it } from "bun:test";
+  return `import { describe, expect, it } from "@/lib/beignet-test";
 import { createUseCaseTester } from "@beignet/core/application";
 ${mode === "resource" ? `import { isAppError } from "@beignet/core/errors";\n` : ""}import { defineRoutes } from "@beignet/web";
 import { createTestApp } from "@beignet/web/testing";