@mettlecast/domain-cli 0.2.54 → 0.2.56

package/dist/commands/create-project.js

@@ -46,8 +46,8 @@ function topoSort(modules, selected) {
         }
         result.push(mod);
     }
-    // Always core first, then backend-lambda, then rest
-    const priorityOrder = ['core', 'backend-lambda'];
+    // Always core first, then domain, then rest
+    const priorityOrder = ['core', 'domain'];
     for (const id of priorityOrder) {
         if (selected.has(id))
             visit(id);
@@ -131,11 +131,11 @@ export async function runCreateProject(opts) {
         console.log(`\nFetching modules for scaffold@${scaffoldVersion}...`);
         const modulesJson = await fetchModulesJson(SCAFFOLD_BUCKET, scaffoldVersion);
         // 4. Resolve module selection
-        const selectedIds = new Set(['core', 'backend-lambda']);
+        const selectedIds = new Set(['core', 'domain']);
         if (includeDatabase)
             selectedIds.add('db-aurora');
         if (includeAuth)
-            selectedIds.add('auth-cognito');
+            selectedIds.add('auth');
         if (includeFrontend)
             selectedIds.add('frontend');
         if (includeFlows)

package/dist/commands/doctor.js

@@ -1594,7 +1594,7 @@ async function runRelocate(projectRoot) {
             const sha256 = manifestEntry?.sha256 ?? computeChecksumString(content);
             upsertManifestFile(manifest, {
                 path: newPath,
-                module: manifestEntry?.module ?? 'backend-lambda',
+                module: manifestEntry?.module ?? 'domain',
                 moduleVersion: manifestEntry?.moduleVersion ?? '1.0.0',
                 sha256,
                 wasTemplate: manifestEntry?.wasTemplate ?? false,

package/dist/commands/upgrade.js

@@ -86,7 +86,7 @@ function topoSort(modules, selected) {
         }
         result.push(mod);
     }
-    for (const id of ['core', 'backend-lambda']) {
+    for (const id of ['core', 'domain']) {
         if (selected.has(id))
             visit(id);
     }

package/dist/utils/header-inject.d.ts

@@ -5,7 +5,7 @@
  *
  * @param content  The file content (post-token-substitution)
  * @param filename The destination filename (used to determine type)
- * @param moduleId The scaffold module id (e.g. 'backend-lambda')
+ * @param moduleId The scaffold module id (e.g. 'domain')
  * @param version  The scaffold module version (e.g. '1.0.0')
  */
 export declare function injectHeader(content: string, filename: string, moduleId: string, version: string): string;

package/dist/utils/header-inject.js

@@ -12,7 +12,7 @@ const JSON_SKIP_LIST = new Set([
  *
  * @param content  The file content (post-token-substitution)
  * @param filename The destination filename (used to determine type)
- * @param moduleId The scaffold module id (e.g. 'backend-lambda')
+ * @param moduleId The scaffold module id (e.g. 'domain')
  * @param version  The scaffold module version (e.g. '1.0.0')
  */
 export function injectHeader(content, filename, moduleId, version) {

package/dist/utils/scaffold-config.d.ts

@@ -1,4 +1,4 @@
-export type ModuleId = 'core' | 'backend-lambda' | 'db-aurora' | 'auth-cognito' | 'frontend' | 'flows' | 'data-management';
+export type ModuleId = 'core' | 'domain' | 'db-aurora' | 'auth' | 'frontend' | 'flows' | 'data-management' | 'tenants' | 'users' | 'shared' | 'data-storage' | 'monitoring' | 'orgs' | 'test-executor';
 export type LogRetentionDays = 30 | 90 | 365 | 2557;
 export interface SecurityOptions {
     /** Enable CMK (KMS customer-managed keys) for DynamoDB, S3, SQS. ~$10–20/month */
@@ -65,7 +65,7 @@ export interface ScaffoldConfig {
     projectName: string;
     awsRegion: string;
     awsAccountId: string;
-    /** Admin email collected at scaffold time (Cognito seed user). Present only when auth-cognito module is enabled. */
+    /** Admin email collected at scaffold time (Cognito seed user). Present only when auth module is enabled. */
     adminEmail?: string;
     /** Domain IDs added via `tib add-domain` — NOT scaffold-owned, user-managed */
     domainIds: string[];

package/dist/utils/scaffold-config.js

@@ -2,7 +2,7 @@ import { readFile, writeFile } from 'fs/promises';
 import path from 'path';
 const DEFAULT_SCAFFOLD_CONFIG = {
     scaffoldVersion: '0.0.0',
-    enabledModules: ['core', 'backend-lambda'],
+    enabledModules: ['core', 'domain'],
     projectName: 'unknown',
     awsRegion: 'eu-north-1',
     awsAccountId: '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mettlecast/domain-cli",
-  "version": "0.2.54",
+  "version": "0.2.56",
   "type": "module",
   "publishConfig": {
     "registry": "https://registry.npmjs.org",

package/src/__tests__/commands/add-module.test.ts

@@ -15,18 +15,18 @@ vi.mock('../../utils/s3-fetch.js', () => ({
         sha256: 'abc123',
       },
       {
-        id: 'backend-lambda',
+        id: 'domain',
         version: '1.0.0',
         description: 'Backend Lambda support',
         dependencies: ['core'],
-        tarball: 'backend-lambda-1.0.0.tar.gz',
+        tarball: 'domain-1.0.0.tar.gz',
         sha256: 'def456',
       },
       {
         id: 'db-aurora',
         version: '1.0.0',
         description: 'Aurora database support',
-        dependencies: ['backend-lambda'],
+        dependencies: ['domain'],
         tarball: 'db-aurora-1.0.0.tar.gz',
         sha256: 'ghi789',
       },
@@ -34,7 +34,7 @@ vi.mock('../../utils/s3-fetch.js', () => ({
         id: 'data-management',
         version: '1.0.0',
         description: 'Data management module',
-        dependencies: ['backend-lambda', 'db-aurora'],
+        dependencies: ['domain', 'db-aurora'],
         tarball: 'data-management-1.0.0.tar.gz',
         sha256: 'jkl012',
       },
@@ -55,7 +55,7 @@ vi.mock('../../utils/s3-fetch.js', () => ({
 vi.mock('../../utils/scaffold-config.js', () => ({
   readScaffoldConfig: vi.fn().mockResolvedValue({
     scaffoldVersion: '1.0.0',
-    enabledModules: ['core', 'backend-lambda'],
+    enabledModules: ['core', 'domain'],
     projectName: 'test-project',
     awsRegion: 'eu-north-1',
     awsAccountId: '123456789012',
@@ -70,7 +70,7 @@ vi.mock('../../utils/manifest.js', () => ({
   readManifest: vi.fn().mockResolvedValue({
     scaffoldVersion: '1.0.0',
     files: [],
-    enabledModules: ['core', 'backend-lambda'],
+    enabledModules: ['core', 'domain'],
     projectName: 'test',
     awsRegion: 'eu-north-1',
     createdAt: '',
@@ -96,7 +96,7 @@ describe('add-module command', () => {
     // Reset to default mock state
     mockReadScaffoldConfig.mockResolvedValue({
       scaffoldVersion: '1.0.0',
-      enabledModules: ['core', 'backend-lambda'],
+      enabledModules: ['core', 'domain'],
       projectName: 'test-project',
       awsRegion: 'eu-north-1',
       awsAccountId: '123456789012',
@@ -118,18 +118,18 @@ describe('add-module command', () => {
           sha256: 'abc123',
         },
         {
-          id: 'backend-lambda',
+          id: 'domain',
           version: '1.0.0',
           description: 'Backend Lambda support',
           dependencies: ['core'],
-          tarball: 'backend-lambda-1.0.0.tar.gz',
+          tarball: 'domain-1.0.0.tar.gz',
           sha256: 'def456',
         },
         {
           id: 'db-aurora',
           version: '1.0.0',
           description: 'Aurora database support',
-          dependencies: ['backend-lambda'],
+          dependencies: ['domain'],
           tarball: 'db-aurora-1.0.0.tar.gz',
           sha256: 'ghi789',
         },
@@ -137,7 +137,7 @@ describe('add-module command', () => {
           id: 'data-management',
           version: '1.0.0',
           description: 'Data management module',
-          dependencies: ['backend-lambda', 'db-aurora'],
+          dependencies: ['domain', 'db-aurora'],
           tarball: 'data-management-1.0.0.tar.gz',
           sha256: 'jkl012',
         },
@@ -157,7 +157,7 @@ describe('add-module command', () => {
   it('rejects already-installed module', async () => {
     mockReadScaffoldConfig.mockResolvedValue({
       scaffoldVersion: '1.0.0',
-      enabledModules: ['core', 'backend-lambda'],
+      enabledModules: ['core', 'domain'],
       projectName: 'test-project',
       awsRegion: 'eu-north-1',
       awsAccountId: '123456789012',
@@ -177,7 +177,7 @@ describe('add-module command', () => {
   it('rejects missing dependency', async () => {
     mockReadScaffoldConfig.mockResolvedValue({
       scaffoldVersion: '1.0.0',
-      enabledModules: ['core', 'backend-lambda'],
+      enabledModules: ['core', 'domain'],
       projectName: 'test-project',
       awsRegion: 'eu-north-1',
       awsAccountId: '123456789012',

package/src/__tests__/commands/create-project.test.ts

@@ -140,11 +140,11 @@ describe('runCreateProject', () => {
           sha256: 'abc123',
         },
         {
-          id: 'backend-lambda',
+          id: 'domain',
           version: '1.0.0',
           description: 'Backend Lambda',
           dependencies: ['core'],
-          tarball: 'backend-lambda.tar.gz',
+          tarball: 'domain.tar.gz',
           sha256: 'def456',
         },
       ],
@@ -241,19 +241,19 @@ describe('runCreateProject', () => {
           sha256: 'abc123',
         },
         {
-          id: 'backend-lambda',
+          id: 'domain',
           version: '1.0.0',
           description: 'Backend Lambda',
           dependencies: ['core'],
-          tarball: 'backend-lambda.tar.gz',
+          tarball: 'domain.tar.gz',
           sha256: 'def456',
         },
         {
-          id: 'auth-cognito',
+          id: 'auth',
           version: '1.0.0',
           description: 'Auth Cognito',
-          dependencies: ['core', 'backend-lambda'],
-          tarball: 'auth-cognito.tar.gz',
+          dependencies: ['core', 'domain'],
+          tarball: 'auth.tar.gz',
           sha256: 'ghi789',
         },
       ],
@@ -326,7 +326,7 @@ describe('runCreateProject', () => {
     expect(authContent).not.toContain('@mettlecast/domain-runtime');
   });
 
-  it('Core module files are written before backend-lambda files (topological order)', async () => {
+  it('Core module files are written before domain files (topological order)', async () => {
     const outputDir = join(tempDir, 'project3');
     const writeCallOrder: string[] = [];
 
@@ -348,11 +348,11 @@ describe('runCreateProject', () => {
           sha256: 'abc123',
         },
         {
-          id: 'backend-lambda',
+          id: 'domain',
           version: '1.0.0',
           description: 'Backend Lambda',
           dependencies: ['core'],
-          tarball: 'backend-lambda.tar.gz',
+          tarball: 'domain.tar.gz',
           sha256: 'def456',
         },
       ],
@@ -447,11 +447,11 @@ describe('runCreateProject', () => {
           sha256: 'abc123',
         },
         {
-          id: 'backend-lambda',
+          id: 'domain',
           version: '1.0.0',
           description: 'Backend Lambda',
           dependencies: ['core'],
-          tarball: 'backend-lambda.tar.gz',
+          tarball: 'domain.tar.gz',
           sha256: 'def456',
         },
       ],
@@ -537,11 +537,11 @@ describe('runCreateProject', () => {
           sha256: 'abc123',
         },
         {
-          id: 'backend-lambda',
+          id: 'domain',
           version: '1.0.0',
           description: 'Backend Lambda',
           dependencies: ['core'],
-          tarball: 'backend-lambda.tar.gz',
+          tarball: 'domain.tar.gz',
           sha256: 'def456',
         },
       ],
@@ -609,7 +609,7 @@ describe('runCreateProject', () => {
     expect(manifest.createdAt).toBeDefined();
     expect(manifest.updatedAt).toBeDefined();
     expect(manifest.enabledModules).toContain('core');
-    expect(manifest.enabledModules).toContain('backend-lambda');
+    expect(manifest.enabledModules).toContain('domain');
 
     // Verify file entries
     expect(manifest.files).toBeInstanceOf(Array);
@@ -625,7 +625,7 @@ describe('runCreateProject', () => {
 
     const backendFile = manifest.files.find((f: any) => f.path === 'backend-config.json');
     expect(backendFile).toBeDefined();
-    expect(backendFile.module).toBe('backend-lambda');
+    expect(backendFile.module).toBe('domain');
     expect(backendFile.moduleVersion).toBe('1.0.0');
   });
 
@@ -650,11 +650,11 @@ describe('runCreateProject', () => {
           sha256: 'abc123',
         },
         {
-          id: 'backend-lambda',
+          id: 'domain',
           version: '1.0.0',
           description: 'Backend Lambda',
           dependencies: ['core'],
-          tarball: 'backend-lambda.tar.gz',
+          tarball: 'domain.tar.gz',
           sha256: 'def456',
         },
         {
@@ -704,7 +704,7 @@ describe('runCreateProject', () => {
     expect(config.awsRegion).toBe('eu-north-1');
     expect(config.awsAccountId).toBe('123456789012');
     expect(config.enabledModules).toContain('core');
-    expect(config.enabledModules).toContain('backend-lambda');
+    expect(config.enabledModules).toContain('domain');
     expect(config.enabledModules).toContain('db-aurora');
     expect(config.domainIds).toEqual([]);
     expect(config.flowIds).toEqual([]);

package/src/__tests__/commands/why.test.ts

@@ -29,7 +29,7 @@ describe('why command', () => {
       join(tmpDir, '.mc', 'manifest.json'),
       JSON.stringify({
         scaffoldVersion: '2.5.0',
-        enabledModules: ['core', 'backend-lambda', 'frontend'],
+        enabledModules: ['core', 'domain', 'frontend'],
       })
     );
     fetchVersionsJsonSpy.mockResolvedValue({
@@ -43,7 +43,7 @@ describe('why command', () => {
     expect(report.latestVersion).toBe('2.5.0');
     expect(report.upgradeAvailable).toBe(false);
     expect(report.versionsBehind).toBe(0);
-    expect(report.enabledModules).toEqual(['core', 'backend-lambda', 'frontend']);
+    expect(report.enabledModules).toEqual(['core', 'domain', 'frontend']);
   });
 
   it('reports upgrade available when current is behind latest', async () => {

package/src/__tests__/doctor.test.ts

@@ -119,7 +119,7 @@ describe('runDoctor', () => {
       await mkdir(join(tempDir, '.husky'), { recursive: true });
       await mkdir(join(tempDir, '.tib', 'infra', 'modules'), { recursive: true });
 
-      await writeFile(join(tempDir, '.tib', 'infra', 'modules', 'app.ts'), '// @mc-scaffold: backend-lambda@1.0.0\n');
+      await writeFile(join(tempDir, '.tib', 'infra', 'modules', 'app.ts'), '// @mc-scaffold: domain@1.0.0\n');
       await writeFile(join(tempDir, '.husky', 'pre-commit'), '#!/bin/sh');
       await writeFile(join(tempDir, '.tib', 'scaffold-config.json'), JSON.stringify({ domainIds: [] }));
 
@@ -130,9 +130,9 @@ describe('runDoctor', () => {
         updatedAt: '2026-01-01T00:00:00Z',
         projectName: 'test',
         awsRegion: 'eu-north-1',
-        enabledModules: ['backend-lambda'],
+        enabledModules: ['domain'],
         files: [
-          { path: '.mc/infra/modules/app.ts', module: 'backend-lambda', moduleVersion: '1.0.0',
+          { path: '.mc/infra/modules/app.ts', module: 'domain', moduleVersion: '1.0.0',
             sha256: 'abc', wasTemplate: true, installedAt: '2026-01-01T00:00:00Z', policy: 'managed' as const }
         ]
       };
@@ -150,7 +150,7 @@ describe('runDoctor', () => {
       await mkdir(join(tempDir, '.husky'), { recursive: true });
       await mkdir(join(tempDir, 'infra', 'modules'), { recursive: true });
 
-      await writeFile(join(tempDir, 'infra', 'modules', 'app.ts'), '// @mc-scaffold: backend-lambda@1.0.0\n');
+      await writeFile(join(tempDir, 'infra', 'modules', 'app.ts'), '// @mc-scaffold: domain@1.0.0\n');
       await writeFile(join(tempDir, '.husky', 'pre-commit'), '#!/bin/sh');
       await writeFile(join(tempDir, '.tib', 'scaffold-config.json'), JSON.stringify({ domainIds: [] }));
 
@@ -161,9 +161,9 @@ describe('runDoctor', () => {
         updatedAt: '2026-01-01T00:00:00Z',
         projectName: 'test',
         awsRegion: 'eu-north-1',
-        enabledModules: ['backend-lambda'],
+        enabledModules: ['domain'],
         files: [
-          { path: 'infra/modules/app.ts', module: 'backend-lambda', moduleVersion: '1.0.0',
+          { path: 'infra/modules/app.ts', module: 'domain', moduleVersion: '1.0.0',
             sha256: 'abc', wasTemplate: true, installedAt: '2026-01-01T00:00:00Z', policy: 'managed' as const }
         ]
       };
@@ -190,9 +190,9 @@ describe('runDoctor', () => {
         updatedAt: '2026-01-01T00:00:00Z',
         projectName: 'test',
         awsRegion: 'eu-north-1',
-        enabledModules: ['backend-lambda'],
+        enabledModules: ['domain'],
         files: [
-          { path: '.mc/infra/missing-file.ts', module: 'backend-lambda', moduleVersion: '1.0.0',
+          { path: '.mc/infra/missing-file.ts', module: 'domain', moduleVersion: '1.0.0',
             sha256: 'abc', wasTemplate: false, installedAt: '2026-01-01T00:00:00Z', policy: 'managed' as const }
         ]
       };
@@ -212,7 +212,7 @@ describe('runDoctor', () => {
       await mkdir(join(tempDir, 'domains'), { recursive: true });
       await mkdir(join(tempDir, '.husky'), { recursive: true });
 
-      const appContent = '// @mc-scaffold: backend-lambda@1.0.0\nimport * as cdk from "aws-cdk-lib";\n';
+      const appContent = '// @mc-scaffold: domain@1.0.0\nimport * as cdk from "aws-cdk-lib";\n';
       await writeFile(join(tempDir, 'infra', 'modules', 'app.ts'), appContent);
       await writeFile(join(tempDir, '.husky', 'pre-commit'), '#!/bin/sh');
       await writeFile(join(tempDir, '.tib', 'scaffold-config.json'), JSON.stringify({ domainIds: [] }));
@@ -227,9 +227,9 @@ describe('runDoctor', () => {
         updatedAt: '2026-01-01T00:00:00Z',
         projectName: 'test',
         awsRegion: 'eu-north-1',
-        enabledModules: ['backend-lambda'],
+        enabledModules: ['domain'],
         files: [
-          { path: 'infra/modules/app.ts', module: 'backend-lambda', moduleVersion: '1.0.0',
+          { path: 'infra/modules/app.ts', module: 'domain', moduleVersion: '1.0.0',
             sha256, wasTemplate: true, installedAt: '2026-01-01T00:00:00Z', policy: 'managed' as const }
         ]
       };
@@ -252,8 +252,8 @@ describe('runDoctor', () => {
       await mkdir(join(tempDir, '.mc'), { recursive: true });
       await mkdir(join(tempDir, 'infra', 'modules'), { recursive: true });
 
-      const originalContent = '// @mc-scaffold: backend-lambda@1.0.0\noriginal\n';
-      const modifiedContent = '// @mc-scaffold: backend-lambda@1.0.0\nmodified by user\n';
+      const originalContent = '// @mc-scaffold: domain@1.0.0\noriginal\n';
+      const modifiedContent = '// @mc-scaffold: domain@1.0.0\nmodified by user\n';
       await writeFile(join(tempDir, 'infra', 'modules', 'app.ts'), modifiedContent);
       await writeFile(join(tempDir, '.tib', 'scaffold-config.json'), JSON.stringify({ domainIds: [] }));
 
@@ -267,9 +267,9 @@ describe('runDoctor', () => {
         updatedAt: '2026-01-01T00:00:00Z',
         projectName: 'test',
         awsRegion: 'eu-north-1',
-        enabledModules: ['backend-lambda'],
+        enabledModules: ['domain'],
         files: [
-          { path: 'infra/modules/app.ts', module: 'backend-lambda', moduleVersion: '1.0.0',
+          { path: 'infra/modules/app.ts', module: 'domain', moduleVersion: '1.0.0',
             sha256: originalSha, wasTemplate: true, installedAt: '2026-01-01T00:00:00Z', policy: 'managed' as const }
         ]
       };
@@ -306,7 +306,7 @@ describe('runDoctor', () => {
       await mkdir(join(tempDir, 'domains'), { recursive: true });
       await mkdir(join(tempDir, '.husky'), { recursive: true });
 
-      const appContent = '// @mc-scaffold: backend-lambda@1.0.0\nimport * as cdk from "aws-cdk-lib";\n';
+      const appContent = '// @mc-scaffold: domain@1.0.0\nimport * as cdk from "aws-cdk-lib";\n';
       await writeFile(join(tempDir, 'infra', 'modules', 'app.ts'), appContent);
       await writeFile(join(tempDir, '.husky', 'pre-commit'), '#!/bin/sh');
       await writeFile(join(tempDir, '.tib', 'scaffold-config.json'), JSON.stringify({ domainIds: [] }));
@@ -321,9 +321,9 @@ describe('runDoctor', () => {
         updatedAt: '2026-01-01T00:00:00Z',
         projectName: 'test',
         awsRegion: 'eu-north-1',
-        enabledModules: ['backend-lambda'],
+        enabledModules: ['domain'],
         files: [
-          { path: 'infra/modules/app.ts', module: 'backend-lambda', moduleVersion: '1.0.0',
+          { path: 'infra/modules/app.ts', module: 'domain', moduleVersion: '1.0.0',
             sha256, wasTemplate: true, installedAt: '2026-01-01T00:00:00Z', policy: 'managed' as const }
         ]
       };
@@ -375,7 +375,7 @@ describe('runDoctor', () => {
         updatedAt: '2026-01-01T00:00:00Z',
         projectName: 'test',
         awsRegion: 'eu-north-1',
-        enabledModules: ['backend-lambda'],
+        enabledModules: ['domain'],
         files: []
       };
       await writeFile(join(tempDir, '.mc', 'manifest.json'), JSON.stringify(manifest));

package/src/__tests__/scaffold-src/part-a-layout.test.ts

@@ -6,19 +6,19 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const repoRoot = resolve(__dirname, '../../../../..');
-const backendLambdaDir = join(repoRoot, 'scaffold-src', 'modules', 'backend-lambda');
+const backendLambdaDir = join(repoRoot, 'scaffold-src', 'modules', 'domain');
 const coreDir = join(repoRoot, 'scaffold-src', 'modules', 'core');
 
 describe('scaffold-src layout (Part A)', () => {
-  it('backend-lambda has app.ts.tpl under .mc/infra/modules/', () => {
+  it('domain has app.ts.tpl under .mc/infra/modules/', () => {
     expect(existsSync(join(backendLambdaDir, '.mc/infra/modules/app.ts.tpl'))).toBe(true);
   });
 
-  it('backend-lambda infra/ directory is removed', () => {
+  it('domain infra/ directory is removed', () => {
     expect(existsSync(join(backendLambdaDir, 'infra'))).toBe(false);
   });
 
-  it('backend-lambda has root cdk.json.tpl seed', () => {
+  it('domain has root cdk.json.tpl seed', () => {
     expect(existsSync(join(backendLambdaDir, 'cdk.json.tpl'))).toBe(true);
     const content = readFileSync(join(backendLambdaDir, 'cdk.json.tpl'), 'utf-8');
     const parsed = JSON.parse(content);

package/src/__tests__/smoke/scaffold.test.ts

@@ -285,9 +285,9 @@ function logFailure(label: string, result: CmdResult): void {
 /** Modules runCreateProject selects when the user says "yes" to all. */
 const DEFAULT_MODULE_IDS = [
   'core',
-  'backend-lambda',
+  'domain',
   'db-aurora',
-  'auth-cognito',
+  'auth',
   'frontend',
 ] as const;
 const SMOKE_VERSION = '99.0.0-smoke';
@@ -400,7 +400,7 @@ describe('scaffold smoke test (issue #3831)', () => {
       'frontend/package.json',
       'frontend/vite.config.ts',
       'frontend/tsconfig.json',
-      'domains/.gitkeep', // backend-lambda seeds this
+      'domains/.gitkeep', // domain seeds this
     ];
     for (const p of requiredPaths) {
       const full = join(projectDir, p);
@@ -448,8 +448,8 @@ describe('scaffold smoke test (issue #3831)', () => {
     expect(tsconfig.compilerOptions.strict).toBe(true);
   });
 
-  it('seeds api handlers from auth-cognito that import defineApi from @mettlecast/domain-runtime', async () => {
-    // The auth-cognito module ships a hand-written seed api/me.ts. We
+  it('seeds api handlers from auth that import defineApi from @mettlecast/domain-runtime', async () => {
+    // The auth module ships a hand-written seed api/me.ts. We
     // confirm it parses (no obvious syntax errors) and uses the runtime
     // primitive. This is a structural check; the wave-2 "import ky + call
     // initOtel()" expectation is documented below as a separate soft gate.
@@ -487,7 +487,7 @@ describe('scaffold smoke test (issue #3831)', () => {
           `seed handler gap: ${apiFile} does not call initOtel()\n` +
             `  hasInitOtel=${hasInitOtel}\n` +
             `  expected: initOtel() at module scope\n` +
-            `  Fix: update scaffold-src/modules/auth-cognito/domains/auth/api/*.ts\n` +
+            `  Fix: update scaffold-src/modules/auth/domains/auth/api/*.ts\n` +
             `  to include \`import { initOtel } from '@mettlecast/domain-runtime';\n` +
             `  initOtel();\` at module scope`,
         );

package/src/__tests__/utils/header-inject.test.ts

@@ -1,13 +1,13 @@
 import { describe, it, expect } from 'vitest';
 import { injectHeader } from '../../utils/header-inject.js';
 
-const MODULE = 'backend-lambda';
+const MODULE = 'domain';
 const VERSION = '1.0.0';
 
 describe('injectHeader — TypeScript files', () => {
   it('prepends // @mc-scaffold header to .ts file', () => {
     const result = injectHeader('const x = 1;\n', 'app.ts', MODULE, VERSION);
-    expect(result).toMatch(/^\/\/ @mc-scaffold: backend-lambda@1\.0\.0\n/);
+    expect(result).toMatch(/^\/\/ @mc-scaffold: domain@1\.0\.0\n/);
     expect(result).toContain('const x = 1;');
   });
 
@@ -27,7 +27,7 @@ describe('injectHeader — TypeScript files', () => {
 describe('injectHeader — YAML files', () => {
   it('prepends # @mc-scaffold header to .yml file', () => {
     const result = injectHeader('name: CI\n', 'ci.yml', MODULE, VERSION);
-    expect(result).toMatch(/^# @mc-scaffold: backend-lambda@1\.0\.0\n/);
+    expect(result).toMatch(/^# @mc-scaffold: domain@1\.0\.0\n/);
     expect(result).toContain('name: CI');
   });
 
@@ -42,7 +42,7 @@ describe('injectHeader — JSON files', () => {
     const result = injectHeader('{"name": "test", "version": "1.0.0"}', 'config.json', MODULE, VERSION);
     const parsed = JSON.parse(result) as Record<string, unknown>;
     expect(Object.keys(parsed)[0]).toBe('_tibScaffold');
-    expect(parsed._tibScaffold).toBe('backend-lambda@1.0.0');
+    expect(parsed._tibScaffold).toBe('domain@1.0.0');
     expect(parsed.name).toBe('test');
   });
 
@@ -68,7 +68,7 @@ describe('injectHeader — JSON files', () => {
 describe('injectHeader — CSS files', () => {
   it('prepends /* @mc-scaffold */ header to .css file', () => {
     const result = injectHeader('@tailwind base;\n', 'index.css', MODULE, VERSION);
-    expect(result).toMatch(/^\/\* @mc-scaffold: backend-lambda@1\.0\.0 \*\//);
+    expect(result).toMatch(/^\/\* @mc-scaffold: domain@1\.0\.0 \*\//);
     expect(result).toContain('@tailwind base;');
   });
 });
@@ -76,7 +76,7 @@ describe('injectHeader — CSS files', () => {
 describe('injectHeader — HTML files', () => {
   it('prepends <!-- @mc-scaffold --> header to .html file', () => {
     const result = injectHeader('<!doctype html>\n', 'index.html', MODULE, VERSION);
-    expect(result).toMatch(/^<!-- @mc-scaffold: backend-lambda@1\.0\.0 -->/);
+    expect(result).toMatch(/^<!-- @mc-scaffold: domain@1\.0\.0 -->/);
   });
 });
 

package/src/commands/create-project.ts

@@ -74,8 +74,8 @@ function topoSort(modules: S3ModuleEntry[], selected: Set<string>): S3ModuleEntr
     result.push(mod);
   }
 
-  // Always core first, then backend-lambda, then rest
-  const priorityOrder = ['core', 'backend-lambda'];
+  // Always core first, then domain, then rest
+  const priorityOrder = ['core', 'domain'];
   for (const id of priorityOrder) {
     if (selected.has(id)) visit(id);
   }
@@ -190,9 +190,9 @@ export async function runCreateProject(opts: CreateProjectOptions): Promise<void
     const modulesJson = await fetchModulesJson(SCAFFOLD_BUCKET, scaffoldVersion);
 
     // 4. Resolve module selection
-    const selectedIds = new Set<string>(['core', 'backend-lambda']);
+    const selectedIds = new Set<string>(['core', 'domain']);
     if (includeDatabase) selectedIds.add('db-aurora');
-    if (includeAuth) selectedIds.add('auth-cognito');
+    if (includeAuth) selectedIds.add('auth');
     if (includeFrontend) selectedIds.add('frontend');
     if (includeFlows) selectedIds.add('flows');
 

package/src/commands/doctor.ts

@@ -1683,7 +1683,7 @@ async function runRelocate(projectRoot: string): Promise<DoctorReport> {
       const sha256 = manifestEntry?.sha256 ?? computeChecksumString(content);
       upsertManifestFile(manifest, {
         path: newPath,
-        module: manifestEntry?.module ?? 'backend-lambda',
+        module: manifestEntry?.module ?? 'domain',
         moduleVersion: manifestEntry?.moduleVersion ?? '1.0.0',
         sha256,
         wasTemplate: manifestEntry?.wasTemplate ?? false,

package/src/commands/upgrade.ts

@@ -139,7 +139,7 @@ function topoSort(modules: S3ModuleEntry[], selected: Set<string>): S3ModuleEntr
     result.push(mod);
   }
 
-  for (const id of ['core', 'backend-lambda']) {
+  for (const id of ['core', 'domain']) {
     if (selected.has(id)) visit(id);
   }
   for (const id of selected) visit(id);

package/src/utils/header-inject.ts

@@ -14,7 +14,7 @@ const JSON_SKIP_LIST = new Set([
  *
  * @param content  The file content (post-token-substitution)
  * @param filename The destination filename (used to determine type)
- * @param moduleId The scaffold module id (e.g. 'backend-lambda')
+ * @param moduleId The scaffold module id (e.g. 'domain')
  * @param version  The scaffold module version (e.g. '1.0.0')
  */
 export function injectHeader(

package/src/utils/scaffold-config.ts

@@ -3,12 +3,19 @@ import path from 'path';
 
 export type ModuleId =
   | 'core'
-  | 'backend-lambda'
+  | 'domain'
   | 'db-aurora'
-  | 'auth-cognito'
+  | 'auth'
   | 'frontend'
   | 'flows'
-  | 'data-management';
+  | 'data-management'
+  | 'tenants'
+  | 'users'
+  | 'shared'
+  | 'data-storage'
+  | 'monitoring'
+  | 'orgs'
+  | 'test-executor';
 
 export type LogRetentionDays = 30 | 90 | 365 | 2557;
 
@@ -83,7 +90,7 @@ export interface ScaffoldConfig {
   projectName: string;
   awsRegion: string;
   awsAccountId: string;
-  /** Admin email collected at scaffold time (Cognito seed user). Present only when auth-cognito module is enabled. */
+  /** Admin email collected at scaffold time (Cognito seed user). Present only when auth module is enabled. */
   adminEmail?: string;
   /** Domain IDs added via `tib add-domain` — NOT scaffold-owned, user-managed */
   domainIds: string[];
@@ -111,7 +118,7 @@ export interface ScaffoldConfig {
 
 const DEFAULT_SCAFFOLD_CONFIG: Omit<ScaffoldConfig, 'domainIds' | 'flowIds'> = {
   scaffoldVersion: '0.0.0',
-  enabledModules: ['core', 'backend-lambda'],
+  enabledModules: ['core', 'domain'],
   projectName: 'unknown',
   awsRegion: 'eu-north-1',
   awsAccountId: '',