@mettlecast/domain-cli 0.2.0 → 0.2.2

package/dist/utils/manifest.js

@@ -9,7 +9,32 @@ export function inferPolicyFromPath(filePath) {
         filePath.match(/^\.tib\/infra\//) ||
         filePath === 'mc-deploy.yml' ||
         filePath.match(/^\.github\/workflows\//)) {
-        return 'owned';
+        return 'managed';
+    }
+    // managed: core scaffold files not prefixed with infra/
+    const managedFilePatterns = [
+        /^CLAUDE\.md$/,
+        /^\.husky\//,
+        /^\.mc\/scaffold-config\.json$/,
+        /^\.mc\/modules-hashes\.json$/,
+        /^\.npmrc$/,
+        /^cdk\.json$/,
+        /^\.gitignore$/,
+        /^eslint\.config\.js$/,
+        /^package\.json$/,
+        /^publish-knowledge\.(yml|mjs)$/,
+        /^mc-destroy\.yml$/,
+    ];
+    if (managedFilePatterns.some((p) => p.test(filePath))) {
+        return 'managed';
+    }
+    // editable: user-customisable config files
+    const editableFilePatterns = [
+        /^vite\.config\.ts$/,
+        /^tailwind\.config\.ts$/,
+    ];
+    if (editableFilePatterns.some((p) => p.test(filePath))) {
+        return 'editable';
     }
     // seed: specific frontend paths
     const seedPatterns = [
@@ -24,7 +49,7 @@ export function inferPolicyFromPath(filePath) {
         return 'seed';
     }
     // tracked: everything else
-    return 'tracked';
+    return 'editable';
 }
 export async function readManifest(projectRoot) {
     const manifestPath = path.join(projectRoot, MANIFEST_PATH);
@@ -43,6 +68,23 @@ export async function readManifest(projectRoot) {
             cliLogger.info('manifest: migrating v1→v2 with inferred policies');
             await writeManifest(projectRoot, manifest);
         }
+        // v2→v3 migration: rename 'owned'→'managed', 'tracked'→'editable'
+        let needsV3Migration = false;
+        for (const entry of manifest.files) {
+            const rawPolicy = entry['policy'];
+            if (rawPolicy === 'owned') {
+                entry['policy'] = 'managed';
+                needsV3Migration = true;
+            }
+            else if (rawPolicy === 'tracked') {
+                entry['policy'] = 'editable';
+                needsV3Migration = true;
+            }
+        }
+        if (needsV3Migration) {
+            cliLogger.info('manifest: migrating v2→v3 with renamed policies');
+            await writeManifest(projectRoot, manifest);
+        }
         return manifest;
     }
     catch (err) {
@@ -86,8 +128,8 @@ export function removeManifestFile(manifest, filePath) {
 export function getManifestFile(manifest, filePath) {
     return manifest.files.find((f) => f.path === filePath);
 }
-export function isScaffoldOwned(manifest, filePath) {
+export function isScaffoldManaged(manifest, filePath) {
     const entry = manifest.files.find((f) => f.path === filePath);
-    // Scaffold-managed means in manifest AND policy is not 'seed'
-    return entry != null && entry.policy !== 'seed';
+    // Returns true only when the file is in the manifest with policy 'managed'
+    return entry != null && entry.policy === 'managed';
 }

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

@@ -29,6 +29,11 @@ export interface CostOptions {
     xRaySamplingRate?: number;
     reservedConcurrencyPerDomain?: Record<string, number>;
 }
+/** Monitoring / observability feature opt-ins. */
+export interface MonitoringOptions {
+    /** Replace basic MonitoringStack with full ObservabilityStack (Grafana + Cost Explorer + CloudWatch). ~$9–18/month */
+    enhanced: boolean;
+}
 /** Lifecycle tunables — Phase B. Schema only in Phase A. */
 export interface LifecycleOptions {
     dlqRetentionDays?: 7 | 14;
@@ -81,6 +86,8 @@ export interface ScaffoldConfig {
     costOptions?: CostOptions;
     /** Lifecycle tunables. Phase B — schema present, CDK not yet wired. */
     lifecycleOptions?: LifecycleOptions;
+    /** Monitoring feature opt-ins. All default false. */
+    monitoringOptions?: MonitoringOptions;
     /** Per-environment URL configuration for custom domains. */
     environments?: EnvironmentsConfig;
     /** When true, CORS responses include Allow-Credentials: true (requires non-wildcard origins). */

package/dist/utils/scaffold-config.js

@@ -16,6 +16,9 @@ const DEFAULT_SCAFFOLD_CONFIG = {
     },
     firstDeployedAt: {},
     logRetentionDays: 30,
+    monitoringOptions: {
+        enhanced: false,
+    },
 };
 const CONFIG_PATH = '.mc/scaffold-config.json';
 export async function readScaffoldConfig(projectRoot) {

package/package.json

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

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

@@ -135,7 +135,7 @@ describe('upgrade command', () => {
             sha256: oldChecksum,
             wasTemplate: false,
             installedAt: '2026-01-01T00:00:00Z',
-            policy: 'tracked',
+            policy: 'editable',
           },
         ],
       });
@@ -242,7 +242,7 @@ describe('upgrade command', () => {
             sha256: manifestChecksum, // Original checksum in manifest
             wasTemplate: false,
             installedAt: '2026-01-01T00:00:00Z',
-            policy: 'tracked',
+            policy: 'editable',
           },
         ],
       });
@@ -300,7 +300,7 @@ describe('upgrade command', () => {
 
       const tarballContent = createMockTarball([
         { path: 'MANIFEST.json', content: JSON.stringify([
-          { path: filePath, sha256: newChecksum, isTemplate: false, policy: 'tracked' },
+          { path: filePath, sha256: newChecksum, isTemplate: false, policy: 'editable' },
         ]) },
         { path: filePath, content: newContent },
       ]);
@@ -346,7 +346,7 @@ describe('upgrade command', () => {
             sha256: oldChecksum,
             wasTemplate: false,
             installedAt: '2026-01-01T00:00:00Z',
-            policy: 'owned',
+            policy: 'managed',
           },
         ],
       });
@@ -449,7 +449,7 @@ describe('upgrade command', () => {
             sha256: checksum,
             wasTemplate: false,
             installedAt: '2026-01-01T00:00:00Z',
-            policy: 'owned',
+            policy: 'managed',
           },
         ],
       });
@@ -507,7 +507,7 @@ describe('upgrade command', () => {
 
       const tarballContent = createMockTarball([
         { path: 'MANIFEST.json', content: JSON.stringify([
-          { path: filePath, sha256: checksum, isTemplate: false, policy: 'owned' },
+          { path: filePath, sha256: checksum, isTemplate: false, policy: 'managed' },
         ]) },
         { path: filePath, content },
       ]);
@@ -549,7 +549,7 @@ describe('upgrade command', () => {
             sha256: manifestChecksum,
             wasTemplate: false,
             installedAt: '2026-01-01T00:00:00Z',
-            policy: 'tracked',
+            policy: 'editable',
           },
         ],
       });
@@ -607,7 +607,7 @@ describe('upgrade command', () => {
 
       const tarballContent = createMockTarball([
         { path: 'MANIFEST.json', content: JSON.stringify([
-          { path: filePath, sha256: newChecksum, isTemplate: false, policy: 'tracked' },
+          { path: filePath, sha256: newChecksum, isTemplate: false, policy: 'editable' },
         ]) },
         { path: filePath, content: newContent },
       ]);

package/src/__tests__/doctor.test.ts

@@ -114,6 +114,7 @@ describe('runDoctor', () => {
   describe('layout validation checks', () => {
     it('PASS when manifest has owned files in .mc/', async () => {
       await mkdir(join(tempDir, '.tib'), { recursive: true });
+      await mkdir(join(tempDir, '.mc'), { recursive: true });
       await mkdir(join(tempDir, 'domains'), { recursive: true });
       await mkdir(join(tempDir, '.husky'), { recursive: true });
       await mkdir(join(tempDir, '.tib', 'infra', 'modules'), { recursive: true });
@@ -132,10 +133,10 @@ describe('runDoctor', () => {
         enabledModules: ['backend-lambda'],
         files: [
           { path: '.mc/infra/modules/app.ts', module: 'backend-lambda', moduleVersion: '1.0.0',
-            sha256: 'abc', wasTemplate: true, installedAt: '2026-01-01T00:00:00Z', policy: 'owned' as const }
+            sha256: 'abc', wasTemplate: true, installedAt: '2026-01-01T00:00:00Z', policy: 'managed' as const }
         ]
       };
-      await writeFile(join(tempDir, '.tib', 'manifest.json'), JSON.stringify(manifest));
+      await writeFile(join(tempDir, '.mc', 'manifest.json'), JSON.stringify(manifest));
 
       const report = await runDoctor({ projectRoot: tempDir });
       const check = report.checks.find(c => c.name === 'Layout: owned files in .mc/');
@@ -144,6 +145,7 @@ describe('runDoctor', () => {
 
     it('FAIL when owned file is outside .mc/ (old layout)', async () => {
       await mkdir(join(tempDir, '.tib'), { recursive: true });
+      await mkdir(join(tempDir, '.mc'), { recursive: true });
       await mkdir(join(tempDir, 'domains'), { recursive: true });
       await mkdir(join(tempDir, '.husky'), { recursive: true });
       await mkdir(join(tempDir, 'infra', 'modules'), { recursive: true });
@@ -162,10 +164,10 @@ describe('runDoctor', () => {
         enabledModules: ['backend-lambda'],
         files: [
           { path: 'infra/modules/app.ts', module: 'backend-lambda', moduleVersion: '1.0.0',
-            sha256: 'abc', wasTemplate: true, installedAt: '2026-01-01T00:00:00Z', policy: 'owned' as const }
+            sha256: 'abc', wasTemplate: true, installedAt: '2026-01-01T00:00:00Z', policy: 'managed' as const }
         ]
       };
-      await writeFile(join(tempDir, '.tib', 'manifest.json'), JSON.stringify(manifest));
+      await writeFile(join(tempDir, '.mc', 'manifest.json'), JSON.stringify(manifest));
 
       const report = await runDoctor({ projectRoot: tempDir });
       const check = report.checks.find(c => c.name === 'Layout: owned files in .mc/');
@@ -174,6 +176,7 @@ describe('runDoctor', () => {
 
     it('FAIL when manifest entry points at missing file', async () => {
       await mkdir(join(tempDir, '.tib'), { recursive: true });
+      await mkdir(join(tempDir, '.mc'), { recursive: true });
       await mkdir(join(tempDir, 'domains'), { recursive: true });
       await mkdir(join(tempDir, '.husky'), { recursive: true });
 
@@ -190,10 +193,10 @@ describe('runDoctor', () => {
         enabledModules: ['backend-lambda'],
         files: [
           { path: '.mc/infra/missing-file.ts', module: 'backend-lambda', moduleVersion: '1.0.0',
-            sha256: 'abc', wasTemplate: false, installedAt: '2026-01-01T00:00:00Z', policy: 'owned' as const }
+            sha256: 'abc', wasTemplate: false, installedAt: '2026-01-01T00:00:00Z', policy: 'managed' as const }
         ]
       };
-      await writeFile(join(tempDir, '.tib', 'manifest.json'), JSON.stringify(manifest));
+      await writeFile(join(tempDir, '.mc', 'manifest.json'), JSON.stringify(manifest));
 
       const report = await runDoctor({ projectRoot: tempDir });
       const check = report.checks.find(c => c.name === 'Layout: manifest entries exist on disk');
@@ -204,6 +207,7 @@ describe('runDoctor', () => {
   describe('--relocate flag', () => {
     it('moves scaffold-owned files from old layout to .mc/', async () => {
       await mkdir(join(tempDir, '.tib'), { recursive: true });
+      await mkdir(join(tempDir, '.mc'), { recursive: true });
       await mkdir(join(tempDir, 'infra', 'modules'), { recursive: true });
       await mkdir(join(tempDir, 'domains'), { recursive: true });
       await mkdir(join(tempDir, '.husky'), { recursive: true });
@@ -226,16 +230,16 @@ describe('runDoctor', () => {
         enabledModules: ['backend-lambda'],
         files: [
           { path: 'infra/modules/app.ts', module: 'backend-lambda', moduleVersion: '1.0.0',
-            sha256, wasTemplate: true, installedAt: '2026-01-01T00:00:00Z', policy: 'owned' as const }
+            sha256, wasTemplate: true, installedAt: '2026-01-01T00:00:00Z', policy: 'managed' as const }
         ]
       };
-      await writeFile(join(tempDir, '.tib', 'manifest.json'), JSON.stringify(manifest));
+      await writeFile(join(tempDir, '.mc', 'manifest.json'), JSON.stringify(manifest));
 
       const report = await runDoctor({ projectRoot: tempDir, relocate: true });
 
       // File moved
       const { existsSync } = await import('node:fs');
-      expect(existsSync(join(tempDir, '.tib', 'infra', 'modules', 'app.ts'))).toBe(true);
+      expect(existsSync(join(tempDir, '.mc', 'infra', 'modules', 'app.ts'))).toBe(true);
       expect(existsSync(join(tempDir, 'infra', 'modules', 'app.ts'))).toBe(false);
 
       // Summary pass
@@ -245,6 +249,7 @@ describe('runDoctor', () => {
 
     it('leaves hand-edited files in place with warning on --relocate', async () => {
       await mkdir(join(tempDir, '.tib'), { recursive: true });
+      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';
@@ -265,10 +270,10 @@ describe('runDoctor', () => {
         enabledModules: ['backend-lambda'],
         files: [
           { path: 'infra/modules/app.ts', module: 'backend-lambda', moduleVersion: '1.0.0',
-            sha256: originalSha, wasTemplate: true, installedAt: '2026-01-01T00:00:00Z', policy: 'owned' as const }
+            sha256: originalSha, wasTemplate: true, installedAt: '2026-01-01T00:00:00Z', policy: 'managed' as const }
         ]
       };
-      await writeFile(join(tempDir, '.tib', 'manifest.json'), JSON.stringify(manifest));
+      await writeFile(join(tempDir, '.mc', 'manifest.json'), JSON.stringify(manifest));
 
       await runDoctor({ projectRoot: tempDir, relocate: true });
 

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

@@ -35,12 +35,4 @@ describe('scaffold-src layout (Part A)', () => {
     expect(content).toContain('tib-ci.yml');
   });
 
-  it('backend-lambda tarball-manifest.json maps .mc/deploy.yml.tpl to .github/workflows/mc-deploy.yml', () => {
-    const tmPath = join(backendLambdaDir, 'tarball-manifest.json');
-    expect(existsSync(tmPath)).toBe(true);
-    const tm = JSON.parse(readFileSync(tmPath, 'utf-8'));
-    const deployOverride = tm.fileOverrides.find((e: { path: string }) => e.path === '.mc/deploy.yml.tpl');
-    expect(deployOverride?.installedAs).toBe('.github/workflows/mc-deploy.yml');
-    expect(deployOverride?.policy).toBe('owned');
-  });
 });

package/src/__tests__/scripts/package-scaffold.test.ts

@@ -4,7 +4,7 @@ describe('package-scaffold policy inference', () => {
   function inferPolicyFromPath(filePath: string): string {
     if (/^infra\//.test(filePath) || /^\.tib\/infra\//.test(filePath) ||
         filePath === 'mc-deploy.yml' || /^\.github\/workflows\//.test(filePath)) {
-      return 'owned';
+      return 'managed';
     }
     const seedPatterns = [
       /^frontend\/src\/pages\/auth\//,
@@ -15,18 +15,18 @@ describe('package-scaffold policy inference', () => {
       /^frontend\/src\/styles\/brand\.css$/,
     ];
     if (seedPatterns.some(p => p.test(filePath))) return 'seed';
-    return 'tracked';
+    return 'editable';
   }
 
-  it('returns owned for .mc/infra/ paths', () => {
-    expect(inferPolicyFromPath('.mc/infra/modules/app.ts')).toBe('owned');
-    expect(inferPolicyFromPath('.mc/infra/cdk.json')).toBe('owned');
-    expect(inferPolicyFromPath('.mc/infra/tsconfig.json')).toBe('owned');
+  it('returns managed for .mc/infra/ paths', () => {
+    expect(inferPolicyFromPath('.mc/infra/modules/app.ts')).toBe('managed');
+    expect(inferPolicyFromPath('.mc/infra/cdk.json')).toBe('managed');
+    expect(inferPolicyFromPath('.mc/infra/tsconfig.json')).toBe('managed');
   });
 
-  it('returns owned for .github/workflows/ paths', () => {
-    expect(inferPolicyFromPath('.github/workflows/tib-ci.yml')).toBe('owned');
-    expect(inferPolicyFromPath('.github/workflows/mc-deploy.yml')).toBe('owned');
+  it('returns managed for .github/workflows/ paths', () => {
+    expect(inferPolicyFromPath('.github/workflows/tib-ci.yml')).toBe('managed');
+    expect(inferPolicyFromPath('.github/workflows/mc-deploy.yml')).toBe('managed');
   });
 
   it('returns seed for frontend page paths', () => {
@@ -34,12 +34,12 @@ describe('package-scaffold policy inference', () => {
     expect(inferPolicyFromPath('frontend/src/styles/brand.css')).toBe('seed');
   });
 
-  it('returns tracked for domain files', () => {
-    expect(inferPolicyFromPath('domains/payments/api/charge.ts')).toBe('tracked');
-    expect(inferPolicyFromPath('packages/domain-cli/src/utils/manifest.ts')).toBe('tracked');
+  it('returns editable for domain files', () => {
+    expect(inferPolicyFromPath('domains/payments/api/charge.ts')).toBe('editable');
+    expect(inferPolicyFromPath('packages/domain-cli/src/utils/manifest.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');
   });
 });

package/src/__tests__/utils/install-file.test.ts

@@ -1,7 +1,8 @@
 import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { mkdtemp, rmdir, writeFile, readFile, mkdir } from 'node:fs/promises';
-import { join } from 'node:path';
+import { mkdtemp, rmdir, writeFile, readFile, mkdir, access } from 'node:fs/promises';
+import { join, dirname } from 'node:path';
 import { tmpdir } from 'node:os';
+import { createHash } from 'node:crypto';
 import { installScaffoldFile, type FilePolicy } from '../../utils/install-file.js';
 import { computeChecksumString } from '../../utils/checksum.js';
 import type { ManifestFileEntry } from '../../utils/manifest.js';
@@ -52,15 +53,15 @@ describe('installScaffoldFile', () => {
     });
   });
 
-  describe('owned policy', () => {
+  describe('managed policy', () => {
     it('overwrites existing file with updated status', async () => {
-      const filePath = join(tmpDir, 'test-owned.txt');
+      const filePath = join(tmpDir, 'test-managed.txt');
       const oldContent = 'old content';
       const newContent = 'new content';
 
       await writeFile(filePath, oldContent, 'utf-8');
 
-      const result = await installScaffoldFile(filePath, newContent, 'owned', undefined);
+      const result = await installScaffoldFile(filePath, newContent, 'managed', undefined);
 
       expect(result.status).toBe('updated');
 
@@ -70,10 +71,10 @@ describe('installScaffoldFile', () => {
     });
 
     it('writes new file with added status', async () => {
-      const filePath = join(tmpDir, 'test-owned-new.txt');
+      const filePath = join(tmpDir, 'test-managed-new.txt');
       const content = 'new content';
 
-      const result = await installScaffoldFile(filePath, content, 'owned', undefined);
+      const result = await installScaffoldFile(filePath, content, 'managed', undefined);
 
       expect(result.status).toBe('added');
 
@@ -83,25 +84,25 @@ describe('installScaffoldFile', () => {
     });
   });
 
-  describe('tracked policy', () => {
+  describe('editable policy', () => {
     it('returns unchanged when checksum matches', async () => {
-      const filePath = join(tmpDir, 'test-tracked.txt');
+      const filePath = join(tmpDir, 'test-editable.txt');
       const content = 'content';
       const checksum = computeChecksumString(content);
 
       await writeFile(filePath, content, 'utf-8');
 
       const currentEntry: ManifestFileEntry = {
-        path: 'test-tracked.txt',
+        path: 'test-editable.txt',
         module: 'core',
         moduleVersion: '1.0.0',
         sha256: checksum,
         wasTemplate: false,
         installedAt: '2026-01-01T00:00:00Z',
-        policy: 'tracked',
+        policy: 'editable',
       };
 
-      const result = await installScaffoldFile(filePath, content, 'tracked', currentEntry);
+      const result = await installScaffoldFile(filePath, content, 'editable', currentEntry);
 
       expect(result.status).toBe('unchanged');
 
@@ -110,8 +111,8 @@ describe('installScaffoldFile', () => {
       expect(fileContent).toBe(content);
     });
 
-    it('overwrites when no drift and sha256 differs', async () => {
-      const filePath = join(tmpDir, 'test-tracked-update.txt');
+    it('returns update-available when no drift and sha256 differs', async () => {
+      const filePath = join(tmpDir, 'test-editable-update.txt');
       const oldContent = 'old content';
       const newContent = 'new content';
       const oldChecksum = computeChecksumString(oldContent);
@@ -119,26 +120,52 @@ describe('installScaffoldFile', () => {
       await writeFile(filePath, oldContent, 'utf-8');
 
       const currentEntry: ManifestFileEntry = {
-        path: 'test-tracked-update.txt',
+        path: 'test-editable-update.txt',
         module: 'core',
         moduleVersion: '1.0.0',
         sha256: oldChecksum,
         wasTemplate: false,
         installedAt: '2026-01-01T00:00:00Z',
-        policy: 'tracked',
+        policy: 'editable',
       };
 
-      const result = await installScaffoldFile(filePath, newContent, 'tracked', currentEntry);
+      const result = await installScaffoldFile(filePath, newContent, 'editable', currentEntry);
 
-      expect(result.status).toBe('updated');
+      expect(result.status).toBe('update-available');
 
-      // File should be updated
+      // File should NOT be overwritten
       const content = await readFile(filePath, 'utf-8');
-      expect(content).toBe(newContent);
+      expect(content).toBe(oldContent);
     });
 
-    it('writes conflict file on drift', async () => {
-      const filePath = join(tmpDir, 'test-tracked-drift.txt');
+    it('returns update-available when editable content differs and file exists', async () => {
+      const existingContent = 'old content';
+      const newContent = 'updated content';
+      const filePath = join(tmpDir, 'lib', 'utils.ts');
+      await mkdir(dirname(filePath), { recursive: true });
+      await writeFile(filePath, existingContent, 'utf-8');
+
+      const currentEntry = {
+        path: 'lib/utils.ts',
+        module: 'frontend',
+        moduleVersion: '1.0.0',
+        sha256: createHash('sha256').update(existingContent).digest('hex'),
+        wasTemplate: false,
+        installedAt: '2026-01-01T00:00:00Z',
+        policy: 'editable' as const,
+      };
+
+      const result = await installScaffoldFile(filePath, newContent, 'editable', currentEntry);
+      expect(result.status).toBe('update-available');
+      // Verify NO .tib-upgrade file written
+      await expect(access(filePath + '.tib-upgrade')).rejects.toThrow();
+      // Verify original file NOT overwritten
+      const diskContent = await readFile(filePath, 'utf-8');
+      expect(diskContent).toBe(existingContent);
+    });
+
+    it('returns update-available when file drifted', async () => {
+      const filePath = join(tmpDir, 'test-editable-drift.txt');
       const manifestContent = 'original content';
       const driftedContent = 'user modified content';
       const newContent = 'new content from upgrade';
@@ -148,33 +175,29 @@ describe('installScaffoldFile', () => {
       await writeFile(filePath, driftedContent, 'utf-8');
 
       const currentEntry: ManifestFileEntry = {
-        path: 'test-tracked-drift.txt',
+        path: 'test-editable-drift.txt',
         module: 'core',
         moduleVersion: '1.0.0',
         sha256: manifestChecksum,
         wasTemplate: false,
         installedAt: '2026-01-01T00:00:00Z',
-        policy: 'tracked',
+        policy: 'editable',
       };
 
-      const result = await installScaffoldFile(filePath, newContent, 'tracked', currentEntry);
+      const result = await installScaffoldFile(filePath, newContent, 'editable', currentEntry);
 
-      expect(result.status).toBe('conflict');
+      expect(result.status).toBe('update-available');
 
       // Original file should not be modified
       const originalContent = await readFile(filePath, 'utf-8');
       expect(originalContent).toBe(driftedContent);
-
-      // .tib-upgrade file should be created
-      const conflictFile = await readFile(`${filePath}.tib-upgrade`, 'utf-8');
-      expect(conflictFile).toBe(newContent);
     });
 
-    it('adds new tracked file when no currentEntry', async () => {
-      const filePath = join(tmpDir, 'test-tracked-new.txt');
-      const content = 'new tracked file';
+    it('adds new editable file when no currentEntry', async () => {
+      const filePath = join(tmpDir, 'test-editable-new.txt');
+      const content = 'new editable file';
 
-      const result = await installScaffoldFile(filePath, content, 'tracked', undefined);
+      const result = await installScaffoldFile(filePath, content, 'editable', undefined);
 
       expect(result.status).toBe('added');
 
@@ -189,7 +212,7 @@ describe('installScaffoldFile', () => {
       const filePath = join(tmpDir, 'test-dryrun.txt');
       const content = 'new content';
 
-      const result = await installScaffoldFile(filePath, content, 'owned', undefined, { dryRun: true });
+      const result = await installScaffoldFile(filePath, content, 'managed', undefined, { dryRun: true });
 
       expect(result.status).toBe('added');