@mettlecast/domain-cli 0.2.0 → 0.2.2

package/src/__tests__/utils/manifest.test.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { mkdtemp, rmdir, writeFile, readFile, mkdir } from 'node:fs/promises';
+import { mkdtemp, rm, writeFile, readFile, mkdir } from 'node:fs/promises';
 import { join } from 'node:path';
 import { tmpdir } from 'node:os';
 
@@ -33,16 +33,16 @@ describe('manifest utilities', () => {
 
   afterEach(async () => {
     try {
-      await rmdir(tmpDir, { recursive: true });
+      await rm(tmpDir, { recursive: true, force: true });
     } catch {
       // Ignore cleanup errors
     }
   });
 
   describe('createManifest', () => {
-    it('produces manifest with v2 schema', () => {
+    it('produces manifest with v3 schema', () => {
       const manifest = createManifest('1.0.0', 'test-project', 'eu-north-1', ['core']);
-      expect(manifest.$schema).toBe('https://mc-scaffold.s3.amazonaws.com/schema/manifest.v2.json');
+      expect(manifest.$schema).toBe('https://mc-scaffold.s3.amazonaws.com/schema/manifest.v3.json');
       expect(manifest.scaffoldVersion).toBe('1.0.0');
       expect(manifest.projectName).toBe('test-project');
       expect(manifest.awsRegion).toBe('eu-north-1');
@@ -52,21 +52,21 @@ describe('manifest utilities', () => {
   });
 
   describe('inferPolicyFromPath', () => {
-    it('returns owned for infra/ paths', () => {
-      expect(inferPolicyFromPath('infra/modules/app.ts')).toBe('owned');
-      expect(inferPolicyFromPath('infra/main.tf')).toBe('owned');
+    it('returns managed for infra/ paths', () => {
+      expect(inferPolicyFromPath('infra/modules/app.ts')).toBe('managed');
+      expect(inferPolicyFromPath('infra/main.tf')).toBe('managed');
     });
 
-    it('returns owned for .mc/infra/ paths', () => {
-      expect(inferPolicyFromPath('.mc/infra/stack.ts')).toBe('owned');
+    it('returns editable for .mc/infra/ paths', () => {
+      expect(inferPolicyFromPath('.mc/infra/stack.ts')).toBe('editable');
     });
 
-    it('returns owned for mc-deploy.yml', () => {
-      expect(inferPolicyFromPath('mc-deploy.yml')).toBe('owned');
+    it('returns managed for mc-deploy.yml', () => {
+      expect(inferPolicyFromPath('mc-deploy.yml')).toBe('managed');
     });
 
-    it('returns owned for .github/workflows/ paths', () => {
-      expect(inferPolicyFromPath('.github/workflows/test.yml')).toBe('owned');
+    it('returns managed for .github/workflows/ paths', () => {
+      expect(inferPolicyFromPath('.github/workflows/test.yml')).toBe('managed');
     });
 
     it('returns seed for frontend seed paths', () => {
@@ -78,10 +78,21 @@ describe('manifest utilities', () => {
       expect(inferPolicyFromPath('frontend/src/styles/brand.css')).toBe('seed');
     });
 
-    it('returns tracked for other paths', () => {
-      expect(inferPolicyFromPath('frontend/src/components/button.tsx')).toBe('tracked');
-      expect(inferPolicyFromPath('package.json')).toBe('tracked');
-      expect(inferPolicyFromPath('src/utils/helper.ts')).toBe('tracked');
+    it('returns editable for other paths', () => {
+      expect(inferPolicyFromPath('frontend/src/components/button.tsx')).toBe('editable');
+      expect(inferPolicyFromPath('src/utils/helper.ts')).toBe('editable');
+    });
+
+    it('returns managed for CLAUDE.md, .husky, scaffold-config, modules-hashes', () => {
+      expect(inferPolicyFromPath('CLAUDE.md')).toBe('managed');
+      expect(inferPolicyFromPath('.husky/pre-commit')).toBe('managed');
+      expect(inferPolicyFromPath('.mc/scaffold-config.json')).toBe('managed');
+      expect(inferPolicyFromPath('.mc/modules-hashes.json')).toBe('managed');
+    });
+
+    it('returns editable for vite.config.ts and tailwind.config.ts', () => {
+      expect(inferPolicyFromPath('vite.config.ts')).toBe('editable');
+      expect(inferPolicyFromPath('tailwind.config.ts')).toBe('editable');
     });
   });
 
@@ -95,7 +106,7 @@ describe('manifest utilities', () => {
         sha256: 'abc123',
         wasTemplate: false,
         installedAt: '2026-01-01T00:00:00Z',
-        policy: 'owned',
+        policy: 'managed',
       };
 
       upsertManifestFile(manifest, entry);
@@ -112,7 +123,7 @@ describe('manifest utilities', () => {
         sha256: 'abc123',
         wasTemplate: false,
         installedAt: '2026-01-01T00:00:00Z',
-        policy: 'owned',
+        policy: 'managed',
       };
 
       upsertManifestFile(manifest, entry1);
@@ -158,7 +169,7 @@ describe('manifest utilities', () => {
         sha256: 'abc123',
         wasTemplate: false,
         installedAt: '2026-01-01T00:00:00Z',
-        policy: 'owned',
+        policy: 'managed',
       };
 
       upsertManifestFile(manifest, entry);
@@ -167,7 +178,7 @@ describe('manifest utilities', () => {
       const read = await readManifest(tmpDir);
       expect(read).not.toBeNull();
       expect(read?.files).toHaveLength(1);
-      expect(read?.files[0].policy).toBe('owned');
+      expect(read?.files[0].policy).toBe('managed');
     });
 
     it('auto-migrates v1 entries (missing policy) on read', async () => {
@@ -200,9 +211,9 @@ describe('manifest utilities', () => {
         ],
       };
 
-      await mkdir(join(tmpDir, '.tib'), { recursive: true });
+      await mkdir(join(tmpDir, '.mc'), { recursive: true });
       await writeFile(
-        join(tmpDir, '.tib', 'manifest.json'),
+        join(tmpDir, '.mc', 'manifest.json'),
         JSON.stringify(v1Manifest, null, 2) + '\n',
         'utf-8'
       );
@@ -212,18 +223,52 @@ describe('manifest utilities', () => {
       expect(read!.files).toHaveLength(2);
 
       // Check that policies were inferred
-      const ownedEntry = read!.files.find((f) => f.path === 'infra/main.tf');
-      expect(ownedEntry?.policy).toBe('owned');
+      const managedEntry = read!.files.find((f) => f.path === 'infra/main.tf');
+      expect(managedEntry?.policy).toBe('managed');
 
       const seedEntry = read!.files.find((f) => f.path === 'frontend/src/pages/auth/login.tsx');
       expect(seedEntry?.policy).toBe('seed');
 
-      // Check that manifest was written back with v2 schema and policies
-      const reread = await readFile(join(tmpDir, '.tib', 'manifest.json'), 'utf-8');
+      // Check that manifest was written back with v3 schema and policies
+      const reread = await readFile(join(tmpDir, '.mc', 'manifest.json'), 'utf-8');
       const reparsed = JSON.parse(reread);
-      expect(reparsed.$schema).toBe('https://mc-scaffold.s3.amazonaws.com/schema/manifest.v2.json');
-      expect(reparsed.files[0].policy).toBe('owned');
+      expect(reparsed.$schema).toBe('https://mc-scaffold.s3.amazonaws.com/schema/manifest.v3.json');
+      expect(reparsed.files[0].policy).toBe('managed');
       expect(reparsed.files[1].policy).toBe('seed');
     });
   });
+
+  describe('readManifest > v2→v3 migration', () => {
+    it('renames owned→managed and tracked→editable', async () => {
+      // Create a v2 manifest with old policy names in a temp dir
+      const tmpDir = await mkdtemp(join(tmpdir(), 'v2v3-'));
+      const mcDir = join(tmpDir, '.mc');
+      await mkdir(mcDir, { recursive: true });
+
+      const v2Manifest = {
+        $schema: 'https://mc-scaffold.s3.amazonaws.com/schema/manifest.v3.json',
+        scaffoldVersion: '0.1.0',
+        createdAt: '2026-01-01T00:00:00Z',
+        updatedAt: '2026-01-01T00:00:00Z',
+        projectName: 'test',
+        awsRegion: 'eu-north-1',
+        enabledModules: ['shared'],
+        files: [
+          { path: 'infra/modules/app.ts', module: 'core', moduleVersion: '0.1.0', sha256: 'abc', wasTemplate: false, installedAt: '2026-01-01T00:00:00Z', policy: 'owned' },
+          { path: 'frontend/src/lib/utils.ts', module: 'frontend', moduleVersion: '0.1.0', sha256: 'def', wasTemplate: false, installedAt: '2026-01-01T00:00:00Z', policy: 'tracked' },
+          { path: 'frontend/src/pages/auth/login.tsx', module: 'frontend', moduleVersion: '0.1.0', sha256: 'ghi', wasTemplate: true, installedAt: '2026-01-01T00:00:00Z', policy: 'seed' },
+        ],
+      };
+      await writeFile(join(mcDir, 'manifest.json'), JSON.stringify(v2Manifest, null, 2), 'utf-8');
+
+      const manifest = await readManifest(tmpDir);
+      expect(manifest).not.toBeNull();
+      expect(manifest!.files[0].policy).toBe('managed');
+      expect(manifest!.files[1].policy).toBe('editable');
+      expect(manifest!.files[2].policy).toBe('seed'); // unchanged
+
+      // Clean up
+      await rm(tmpDir, { recursive: true, force: true });
+    });
+  });
 });

package/src/builder/build-registry.ts

@@ -74,6 +74,8 @@ export async function buildRegistry(domainRoot: string): Promise<BuildResult> {
   const domainExports = await load(paths.domain);
   const domainRaw = domainExports.find(e => e['_kind'] === 'domain');
   if (!domainRaw) {
+    // Emit any suppressed tsx load errors to stderr before throwing so they appear in CI logs.
+    for (const w of warnings) process.stderr.write(`[tib validate] ${w}\n`);
     throw new Error(`buildRegistry: no 'domain' export found in ${paths.domain}`);
   }
 

package/src/builder/load-module.ts

@@ -1,6 +1,5 @@
 import { spawn } from 'node:child_process';
 import { writeFile, unlink, mkdir } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
 import { join, dirname } from 'node:path';
 import { randomBytes } from 'node:crypto';
 import { createRequire } from 'node:module';
@@ -107,13 +106,16 @@ export async function loadModuleExports(absoluteFilePath: string): Promise<RawPr
     return await new Promise<RawPrimitiveExport[]>((resolve, reject) => {
       const tsxChild = spawn(process.execPath, [tsxCli, tempPath], {
         stdio: ['ignore', 'pipe', 'pipe'],
-        env: { ...process.env },
       });
 
       let stdout = '';
       let stderr = '';
       tsxChild.stdout.on('data', (chunk: Buffer) => { stdout += chunk.toString(); });
-      tsxChild.stderr.on('data', (chunk: Buffer) => { stderr += chunk.toString(); });
+      // Pipe tsx stderr directly to our process stderr so errors are visible in CI logs.
+      tsxChild.stderr.on('data', (chunk: Buffer) => {
+        stderr += chunk.toString();
+        process.stderr.write(chunk);
+      });
       tsxChild.on('close', (code) => {
         if (code !== 0) {
           reject(new Error(`loadModuleExports: tsx exited ${code} for ${absoluteFilePath}\n${stderr}`));

package/src/commands/add-module.ts

@@ -23,7 +23,7 @@ interface TarballManifestEntry {
   path: string;
   installedAs?: string;
   isTemplate: boolean;
-  policy?: 'owned' | 'tracked' | 'seed';
+  policy?: 'managed' | 'editable' | 'seed';
 }
 
 interface TarEntry {

package/src/commands/create-project.ts

@@ -98,7 +98,7 @@ interface TarballManifestEntry {
   sha256: string;
   isTemplate: boolean;
   installedAs?: string;
-  policy?: 'owned' | 'tracked' | 'seed';
+  policy?: 'managed' | 'editable' | 'seed';
 }
 
 async function parseTarball(buf: Buffer): Promise<TarEntry[]> {
@@ -317,7 +317,7 @@ export async function runCreateProject(opts: CreateProjectOptions): Promise<void
           sha256,
           wasTemplate: fileEntry.isTemplate,
           installedAt: new Date().toISOString(),
-          policy: fileEntry.policy ?? 'tracked',
+          policy: fileEntry.policy ?? 'editable',
         });
       }
     }

package/src/commands/doctor.ts

@@ -1088,7 +1088,7 @@ async function checkLayoutPolicy(projectRoot: string): Promise<DoctorCheck[]> {
   // Check 1: owned files in unexpected locations
   // Policy: owned files should be in .mc/ OR .github/workflows/tib-*
   const ownedOutsideTib = manifest.files.filter(f =>
-    f.policy === 'owned' &&
+    f.policy === 'managed' &&
     !f.path.startsWith('.mc/') &&
     !/^\.github\/workflows\/tib-/.test(f.path)
   );
@@ -1112,7 +1112,7 @@ async function checkLayoutPolicy(projectRoot: string): Promise<DoctorCheck[]> {
 
   // Check 2: tracked/seed files inside .mc/
   const nonOwnedInsideTib = manifest.files.filter(f =>
-    (f.policy === 'tracked' || f.policy === 'seed') &&
+    (f.policy === 'editable' || f.policy === 'seed') &&
     f.path.startsWith('.mc/')
   );
   if (nonOwnedInsideTib.length === 0) {
@@ -1209,15 +1209,15 @@ async function checkLayoutPolicy(projectRoot: string): Promise<DoctorCheck[]> {
 /**
  * Old path → new path mapping for known scaffold files
  */
-const RELOCATION_MAP: Array<{ oldPath: string; newPath: string; policy: 'owned' | 'tracked' | 'seed' }> = [
-  { oldPath: 'infra/modules/app.ts', newPath: '.mc/infra/modules/app.ts', policy: 'owned' },
-  { oldPath: 'infra/modules/shared/SharedStack.ts', newPath: '.mc/infra/modules/shared/SharedStack.ts', policy: 'owned' },
-  { oldPath: 'infra/modules/domains/dispatch-middleware.ts', newPath: '.mc/infra/modules/domains/dispatch-middleware.ts', policy: 'owned' },
-  { oldPath: 'infra/modules/PowerTuningStack.ts', newPath: '.mc/infra/modules/PowerTuningStack.ts', policy: 'owned' },
-  { oldPath: 'infra/cdk.json', newPath: '.mc/infra/cdk.json', policy: 'owned' },
-  { oldPath: 'infra/tsconfig.json', newPath: '.mc/infra/tsconfig.json', policy: 'owned' },
-  { oldPath: 'infra/package.json', newPath: '.mc/infra/package.json', policy: 'owned' },
-  { oldPath: 'mc-deploy.yml', newPath: '.github/workflows/mc-deploy.yml', policy: 'owned' },
+const RELOCATION_MAP: Array<{ oldPath: string; newPath: string; policy: 'managed' | 'editable' | 'seed' }> = [
+  { oldPath: 'infra/modules/app.ts', newPath: '.mc/infra/modules/app.ts', policy: 'managed' },
+  { oldPath: 'infra/modules/shared/SharedStack.ts', newPath: '.mc/infra/modules/shared/SharedStack.ts', policy: 'managed' },
+  { oldPath: 'infra/modules/domains/dispatch-middleware.ts', newPath: '.mc/infra/modules/domains/dispatch-middleware.ts', policy: 'managed' },
+  { oldPath: 'infra/modules/PowerTuningStack.ts', newPath: '.mc/infra/modules/PowerTuningStack.ts', policy: 'managed' },
+  { oldPath: 'infra/cdk.json', newPath: '.mc/infra/cdk.json', policy: 'managed' },
+  { oldPath: 'infra/tsconfig.json', newPath: '.mc/infra/tsconfig.json', policy: 'managed' },
+  { oldPath: 'infra/package.json', newPath: '.mc/infra/package.json', policy: 'managed' },
+  { oldPath: 'mc-deploy.yml', newPath: '.github/workflows/mc-deploy.yml', policy: 'managed' },
 ];
 
 /**

package/src/commands/upgrade-frontend.ts

@@ -14,7 +14,6 @@ interface PackageJson {
 }
 
 const TIB_PACKAGES = [
-  '@mettlecast/design-system',
   '@mettlecast/dashboard-shell',
   '@mettlecast/sdk',
   '@mettlecast/observability',
@@ -25,7 +24,6 @@ const TIB_PACKAGES = [
 type TibPackage = (typeof TIB_PACKAGES)[number];
 
 const REQUIRED_PACKAGES: TibPackage[] = [
-  '@mettlecast/design-system',
   '@mettlecast/dashboard-shell',
   '@mettlecast/sdk',
 ];

package/src/commands/upgrade.ts

@@ -40,12 +40,12 @@ interface TarballManifestEntry {
   sha256: string;
   isTemplate: boolean;
   installedAs?: string;
-  policy?: 'owned' | 'tracked' | 'seed';
+  policy?: 'managed' | 'editable' | 'seed';
 }
 
 // ── Upgrade result tracking ────────────────────────────────────────────────────
 
-type FileStatus = 'added' | 'updated' | 'conflict' | 'deleted' | 'unchanged';
+type FileStatus = 'added' | 'updated' | 'conflict' | 'deleted' | 'unchanged' | 'update-available';
 
 interface UpgradeFileResult {
   path: string;
@@ -513,6 +513,11 @@ export async function runUpgrade(
       // Add to results
       allResults.push({ path: installPath, status: installResult.status, module: mod.id });
 
+      // update-available: do NOT update manifest (file was not written to disk)
+      if (installResult.status === 'update-available') {
+        continue;
+      }
+
       // Update manifest if file was not skipped
       const newChecksum = computeChecksumString(newContent);
       upsertManifestFile(updatedManifest, {

package/src/templates/dashboard-pages/account/api-keys.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import { useApi } from '@mettlecast/sdk';
 import { useProject } from '@mettlecast/dashboard-shell';
-import { TibFormError, TibSubmitButton } from '@mettlecast/design-system';
+import { TibFormError, TibSubmitButton } from '../../components/ui/mc-form';
 
 interface ApiKey {
   keyId: string;

package/src/templates/dashboard-pages/account/audit-log.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import { useApi } from '@mettlecast/sdk';
 import { useProject } from '@mettlecast/dashboard-shell';
-import { TibFormError } from '@mettlecast/design-system';
+import { TibFormError } from '../../components/ui/mc-form';
 
 interface ActivityEvent {
   id: string;

package/src/templates/dashboard-pages/account/members.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import { useApi } from '@mettlecast/sdk';
 import { useProject } from '@mettlecast/dashboard-shell';
-import { TibFormError, TibSubmitButton } from '@mettlecast/design-system';
+import { TibFormError, TibSubmitButton } from '../../components/ui/mc-form';
 
 interface Member {
   userId: string;

package/src/templates/dashboard-pages/account/profile.tsx

@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import { useApi } from '@mettlecast/sdk';
-import { TibFormField, TibFormError, TibSubmitButton } from '@mettlecast/design-system';
+import { TibFormField, TibFormError, TibSubmitButton } from '../../components/ui/mc-form';
 
 export function ProfilePage() {
   const tib = useApi();

package/src/templates/dashboard-pages/account/workspace-settings.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { useApi } from '@mettlecast/sdk';
 import { useProject } from '@mettlecast/dashboard-shell';
-import { TibFormField, TibFormError, TibSubmitButton } from '@mettlecast/design-system';
+import { TibFormField, TibFormError, TibSubmitButton } from '../../components/ui/mc-form';
 
 export function WorkspaceSettingsPage() {
   const tib = useApi();

package/src/templates/dashboard-pages/auth/accept-invitation.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { useApi } from '@mettlecast/sdk';
-import { TibFormField, TibFormError, TibSubmitButton } from '@mettlecast/design-system';
+import { TibFormField, TibFormError, TibSubmitButton } from '../../components/ui/mc-form';
 
 export function AcceptInvitationPage() {
   const tib = useApi();

package/src/templates/dashboard-pages/auth/choose-org.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useApi } from '@mettlecast/sdk';
-import { TibFormError } from '@mettlecast/design-system';
+import { TibFormError } from '../../components/ui/mc-form';
 
 interface OrgItem {
   orgId: string;

package/src/templates/dashboard-pages/auth/forgot-password.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { Link } from 'react-router-dom';
 import { useApi } from '@mettlecast/sdk';
-import { TibFormField, TibFormError, TibSubmitButton } from '@mettlecast/design-system';
+import { TibFormField, TibFormError, TibSubmitButton } from '../../components/ui/mc-form';
 
 export function ForgotPasswordPage() {
   const tib = useApi();

package/src/templates/dashboard-pages/auth/login.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { useNavigate, Link } from 'react-router-dom';
 import { signIn } from '@mettlecast/dashboard-shell';
-import { TibFormField, TibFormError, TibSubmitButton } from '@mettlecast/design-system';
+import { TibFormField, TibFormError, TibSubmitButton } from '../../components/ui/mc-form';
 
 export function LoginPage() {
   const navigate = useNavigate();

package/src/templates/dashboard-pages/auth/mfa-setup.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useApi } from '@mettlecast/sdk';
-import { TibFormField, TibFormError, TibSubmitButton } from '@mettlecast/design-system';
+import { TibFormField, TibFormError, TibSubmitButton } from '../../components/ui/mc-form';
 
 export function MfaSetupPage() {
   const tib = useApi();

package/src/templates/dashboard-pages/auth/mfa-verify.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useApi } from '@mettlecast/sdk';
-import { TibFormField, TibFormError, TibSubmitButton } from '@mettlecast/design-system';
+import { TibFormField, TibFormError, TibSubmitButton } from '../../components/ui/mc-form';
 
 export function MfaVerifyPage() {
   const tib = useApi();

package/src/templates/dashboard-pages/auth/reset-password.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { useApi } from '@mettlecast/sdk';
-import { TibFormField, TibFormError, TibSubmitButton } from '@mettlecast/design-system';
+import { TibFormField, TibFormError, TibSubmitButton } from '../../components/ui/mc-form';
 
 export function ResetPasswordPage() {
   const tib = useApi();

package/src/templates/dashboard-pages/auth/signup.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { useNavigate, Link } from 'react-router-dom';
 import { useApi } from '@mettlecast/sdk';
-import { TibFormField, TibFormError, TibSubmitButton } from '@mettlecast/design-system';
+import { TibFormField, TibFormError, TibSubmitButton } from '../../components/ui/mc-form';
 
 export function SignupPage() {
   const tib = useApi();

package/src/templates/dashboard-pages/auth/verify-email.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { useNavigate, useLocation } from 'react-router-dom';
 import { useApi } from '@mettlecast/sdk';
-import { TibFormField, TibFormError, TibSubmitButton } from '@mettlecast/design-system';
+import { TibFormField, TibFormError, TibSubmitButton } from '../../components/ui/mc-form';
 
 export function VerifyEmailPage() {
   const tib = useApi();

package/src/templates/patterns/api/create-with-event.ts

@@ -41,7 +41,7 @@ export const ${varName} = defineApi({
         const entityId = crypto.randomUUID();
 
         // ── Persist entity ────────────────────────────────────
-        // ctx.db.put({ ... })
+        await ctx.store.put(entityId, { id: entityId, name: input.name });
 
         // ── Publish domain event ──────────────────────────────
         await ctx.publish(
@@ -49,16 +49,12 @@ export const ${varName} = defineApi({
           {
             id: entityId,
             name: input.name,
-            tenantId: ctx.tenantId,
+            tenantId: ctx.tenant.id,
           },
           1,
         );
 
-        await ctx.auditLog({
-          action: '${id}.create',
-          tenantId: ctx.tenantId,
-          entityId,
-        });
+        await ctx.audit.log('${id}.create', entityId, { tenantId: ctx.tenant.id });
 
         return {
           id: entityId,

package/src/templates/patterns/api/idempotent-mutation.ts

@@ -14,10 +14,6 @@ export function idempotentMutationTemplate(domain: string, id: string, tenancy:
   return `import { z } from 'zod';
 import { defineApi } from '@mettlecast/domain-runtime';
 
-// ── Idempotency key header ───────────────────────────────────
-
-const IdempotencyKey = z.string().min(1);
-
 // ── Zod schemas ──────────────────────────────────────────────
 
 const ${varName}Input = z.object({
@@ -43,56 +39,37 @@ export const ${varName} = defineApi({
       input: ${varName}Input,
       output: ${varName}Output,
       handler: async (input, ctx) => {
-        // ── Extract idempotency key from headers ──────────────
-        const idempotencyKey = ctx.headers?.['x-idempotency-key'];
-        if (!idempotencyKey) {
-          throw new Error('Missing x-idempotency-key header');
-        }
-        IdempotencyKey.parse(idempotencyKey);
-
-        // ── Check for duplicate ───────────────────────────────
-        const existing = await ctx.db.get({
-          key: { pk: 'IDEMPOTENCY', sk: idempotencyKey },
-        });
+        // ── Check for duplicate (idempotency key = input.id) ──
+        const existing = await ctx.store.get('IDEMPOTENT#' + input.id);
 
         if (existing) {
-          await ctx.auditLog({
-            action: '${id}.idempotent.duplicate',
-            tenantId: ctx.tenantId,
-            meta: { idempotencyKey },
-          });
+          await ctx.audit.log('${id}.idempotent.duplicate', input.id);
           return {
-            id: existing.entityId as string,
+            id: input.id,
             status: 'already-processed',
-            idempotencyKey,
+            idempotencyKey: input.id,
           };
         }
 
         // ── Apply mutation ────────────────────────────────────
-        const result = await ctx.db.put({
-          pk: '${id.toUpperCase()}',
-          sk: input.id,
-          payload: input.payload,
-        });
+        await ctx.store.put(
+          '${id.toUpperCase()}#' + input.id,
+          { id: input.id, payload: input.payload, createdAt: new Date().toISOString() },
+        );
 
-        // ── Record idempotency token ──────────────────────────
-        await ctx.db.put({
-          key: { pk: 'IDEMPOTENCY', sk: idempotencyKey },
-          entityId: input.id,
-          ttl: Math.floor(Date.now() / 1000) + 86400, // 24h TTL
-        });
+        // ── Record idempotency token with 24h TTL ─────────────
+        await ctx.store.put(
+          'IDEMPOTENT#' + input.id,
+          { entityId: input.id },
+          { ttl: Math.floor(Date.now() / 1000) + 86400 },
+        );
 
-        await ctx.auditLog({
-          action: '${id}.idempotent.applied',
-          tenantId: ctx.tenantId,
-          entityId: input.id,
-          meta: { idempotencyKey },
-        });
+        await ctx.audit.log('${id}.idempotent.applied', input.id, { tenantId: ctx.tenant.id });
 
         return {
           id: input.id,
           status: 'applied',
-          idempotencyKey,
+          idempotencyKey: input.id,
         };
       },
     },

package/src/templates/patterns/api/paginated-list.ts

@@ -47,15 +47,7 @@ export const ${varName} = defineApi({
       handler: async (input, ctx) => {
         const { cursor, limit, filter } = input;
 
-        // Emit EMF (Embedded Metric Format) metrics
-        ctx.metrics?.putMetric('${id}.pageRequest', 1, 'Count');
-        ctx.metrics?.putMetric('${id}.pageSize', limit, 'Count');
-
-        await ctx.auditLog({
-          action: '${id}.list',
-          tenantId: ctx.tenantId,
-          meta: { cursor, limit },
-        });
+        await ctx.audit.log('${id}.list', ctx.tenant.id, { cursor, limit });
 
         // ── paginated data fetch ──────────────────────────────
         const items: Array<{ id: string }> = [];

package/src/templates/patterns/api/simple-crud.ts

@@ -44,7 +44,7 @@ export const ${varName} = defineApi({
       output: ${varName}Output,
       handler: async (input, ctx) => {
         // Create / Read / Update / Delete based on method
-        await ctx.auditLog({ action: '${id}.v1', tenantId: ctx.tenantId, input });
+        await ctx.audit.log('${id}.v1', ctx.tenant.id, { input });
         return {
           id: input.id ?? crypto.randomUUID(),
           createdAt: new Date().toISOString(),
@@ -90,7 +90,7 @@ export const ${varName}List = defineApi({
       input: ${varName}ListInput,
       output: ${varName}ListOutput,
       handler: async (input, ctx) => {
-        await ctx.auditLog({ action: '${id}-list.v1', tenantId: ctx.tenantId });
+        await ctx.audit.log('${id}-list.v1', ctx.tenant.id);
         return { items: [], nextCursor: undefined };
       },
     },