@auto-engineer/narrative 1.138.0 → 1.140.0

package/src/model-to-narrative.specs.ts

@@ -19,10 +19,10 @@ describe('modelToNarrative', () => {
   example,
   gql,
   it,
-  narrative,
   query,
   react,
   rule,
+  scene,
   sink,
   source,
   specs,
@@ -107,7 +107,7 @@ type ItemsAddedToCart = Event<
     }[];
   }
 >;
-narrative('Seasonal Assistant', () => {
+scene('Seasonal Assistant', () => {
   command('enters shopping criteria into assistant')
     .client(() => {
       describe('Assistant Chat Interface', () => {
@@ -382,11 +382,11 @@ narrative('Seasonal Assistant', () => {
   it('should handle experience slices in model to flow conversion', async () => {
     const experienceModel: Model = {
       variant: 'specs',
-      narratives: [
+      scenes: [
         {
           name: 'Test Experience Flow',
           id: 'TEST-001',
-          slices: [
+          moments: [
             {
               name: 'Homepage',
               id: 'EXP-001',
@@ -408,8 +408,8 @@ narrative('Seasonal Assistant', () => {
 
     const code = getCode(await modelToNarrative(experienceModel));
 
-    expect(code).toEqual(`import { experience, it, narrative } from '@auto-engineer/narrative';
-narrative('Test Experience Flow', 'TEST-001', () => {
+    expect(code).toEqual(`import { experience, it, scene } from '@auto-engineer/narrative';
+scene('Test Experience Flow', 'TEST-001', () => {
   experience('Homepage', 'EXP-001').client(() => {
     it('show a hero section with a welcome message');
     it('allow user to start the questionnaire');
@@ -421,11 +421,11 @@ narrative('Test Experience Flow', 'TEST-001', () => {
   it('should handle flows and slices without IDs', async () => {
     const modelWithoutIds: Model = {
       variant: 'specs',
-      narratives: [
+      scenes: [
         {
           name: 'Test Flow without IDs',
           // id: undefined - no ID
-          slices: [
+          moments: [
             {
               name: 'Homepage',
               // id: undefined - no ID
@@ -453,8 +453,8 @@ narrative('Test Experience Flow', 'TEST-001', () => {
 
     const code = getCode(await modelToNarrative(modelWithoutIds));
 
-    expect(code).toEqual(`import { describe, experience, it, narrative } from '@auto-engineer/narrative';
-narrative('Test Flow without IDs', () => {
+    expect(code).toEqual(`import { describe, experience, it, scene } from '@auto-engineer/narrative';
+scene('Test Flow without IDs', () => {
   experience('Homepage').client(() => {
     describe('Homepage specs', () => {
       it('show welcome message');
@@ -468,11 +468,11 @@ narrative('Test Flow without IDs', () => {
   it('should include flow and slice IDs in generated code', async () => {
     const modelWithIds: Model = {
       variant: 'specs',
-      narratives: [
+      scenes: [
         {
           name: 'Test Flow with IDs',
           id: 'FLOW-123',
-          slices: [
+          moments: [
             {
               name: 'Homepage',
               id: 'SLICE-ABC',
@@ -527,8 +527,8 @@ narrative('Test Flow without IDs', () => {
 
     const code = getCode(await modelToNarrative(modelWithIds));
 
-    expect(code).toEqual(`import { describe, experience, it, narrative, query, specs } from '@auto-engineer/narrative';
-narrative('Test Flow with IDs', 'FLOW-123', () => {
+    expect(code).toEqual(`import { describe, experience, it, query, scene, specs } from '@auto-engineer/narrative';
+scene('Test Flow with IDs', 'FLOW-123', () => {
   experience('Homepage', 'SLICE-ABC').client(() => {
     describe('Homepage specs', () => {
       it('show welcome message');
@@ -552,11 +552,11 @@ narrative('Test Flow with IDs', 'FLOW-123', () => {
   it('should include rule IDs in server specs when present', async () => {
     const modelWithRuleIds: Model = {
       variant: 'specs',
-      narratives: [
+      scenes: [
         {
           name: 'Test Flow with Rule IDs',
           id: 'FLOW-456',
-          slices: [
+          moments: [
             {
               name: 'process command',
               id: 'SLICE-789',
@@ -628,7 +628,7 @@ narrative('Test Flow with IDs', 'FLOW-123', () => {
 
     const code = getCode(await modelToNarrative(modelWithRuleIds));
 
-    expect(code).toEqual(`import { command, example, narrative, rule, specs } from '@auto-engineer/narrative';
+    expect(code).toEqual(`import { command, example, rule, scene, specs } from '@auto-engineer/narrative';
 import type { Command, Event } from '@auto-engineer/narrative';
 type ProcessCommand = Command<
   'ProcessCommand',
@@ -644,7 +644,7 @@ type CommandProcessed = Event<
     status: string;
   }
 >;
-narrative('Test Flow with Rule IDs', 'FLOW-456', () => {
+scene('Test Flow with Rule IDs', 'FLOW-456', () => {
   command('process command', 'SLICE-789').server(() => {
     specs('Command Processing', () => {
       rule('Valid commands should be processed', 'RULE-ABC', () => {
@@ -661,11 +661,11 @@ narrative('Test Flow with Rule IDs', 'FLOW-456', () => {
   it('should correctly generate Query type alias for query messages', async () => {
     const modelWithQueryMessage: Model = {
       variant: 'specs',
-      narratives: [
+      scenes: [
         {
           name: 'Workout Flow',
           id: 'FLOW-001',
-          slices: [],
+          moments: [],
         },
       ],
       messages: [
@@ -692,7 +692,7 @@ narrative('Test Flow with Rule IDs', 'FLOW-456', () => {
 
     const code = getCode(await modelToNarrative(modelWithQueryMessage));
 
-    expect(code).toEqual(`import { narrative } from '@auto-engineer/narrative';
+    expect(code).toEqual(`import { scene } from '@auto-engineer/narrative';
 import type { Event, Query } from '@auto-engineer/narrative';
 type GetWorkoutHistory = Query<
   'GetWorkoutHistory',
@@ -707,18 +707,18 @@ type WorkoutRecorded = Event<
     workoutId: string;
   }
 >;
-narrative('Workout Flow', 'FLOW-001', () => {});
+scene('Workout Flow', 'FLOW-001', () => {});
 `);
   });
 
   it('should correctly resolve Date types in messages', async () => {
     const modelWithDateTypes: Model = {
       variant: 'specs',
-      narratives: [
+      scenes: [
         {
           name: 'Questionnaire Flow',
           id: 'QUEST-001',
-          slices: [],
+          moments: [],
         },
       ],
       messages: [
@@ -754,7 +754,7 @@ narrative('Workout Flow', 'FLOW-001', () => {});
 
     const code = getCode(await modelToNarrative(modelWithDateTypes));
 
-    expect(code).toEqual(`import { narrative } from '@auto-engineer/narrative';
+    expect(code).toEqual(`import { scene } from '@auto-engineer/narrative';
 import type { Event } from '@auto-engineer/narrative';
 type QuestionnaireLinkSent = Event<
   'QuestionnaireLinkSent',
@@ -775,18 +775,18 @@ type QuestionAnswered = Event<
     savedAt: Date;
   }
 >;
-narrative('Questionnaire Flow', 'QUEST-001', () => {});
+scene('Questionnaire Flow', 'QUEST-001', () => {});
 `);
   });
 
   it('should generate browser-compatible imports without mixing values and types', async () => {
     const questionnairesModel: Model = {
       variant: 'specs',
-      narratives: [
+      scenes: [
         {
           name: 'Questionnaires',
           id: 'Q9m2Kp4Lx',
-          slices: [
+          moments: [
             {
               name: 'Homepage',
               id: 'H1a4Bn6Cy',
@@ -1017,9 +1017,9 @@ narrative('Questionnaire Flow', 'QUEST-001', () => {});
   experience,
   gql,
   it,
-  narrative,
   query,
   rule,
+  scene,
   source,
   specs,
 } from '@auto-engineer/narrative';
@@ -1057,7 +1057,7 @@ type QuestionnaireProgress = State<
     }[];
   }
 >;
-narrative('Questionnaires', 'Q9m2Kp4Lx', () => {
+scene('Questionnaires', 'Q9m2Kp4Lx', () => {
   experience('Homepage', 'H1a4Bn6Cy').client(() => {
     it('show a hero section with a welcome message');
     it('allow user to start the questionnaire');
@@ -1126,11 +1126,11 @@ narrative('Questionnaires', 'Q9m2Kp4Lx', () => {
   it('should consolidate duplicate rules with multiple examples into single rule blocks', async () => {
     const modelWithDuplicateRules: Model = {
       variant: 'specs',
-      narratives: [
+      scenes: [
         {
           name: 'Test Flow',
           id: 'TEST-FLOW',
-          slices: [
+          moments: [
             {
               name: 'test slice',
               id: 'TEST-SLICE',
@@ -1255,7 +1255,7 @@ narrative('Questionnaires', 'Q9m2Kp4Lx', () => {
 
     const code = getCode(await modelToNarrative(modelWithDuplicateRules));
 
-    expect(code).toEqual(`import { example, narrative, query, rule, specs } from '@auto-engineer/narrative';
+    expect(code).toEqual(`import { example, query, rule, scene, specs } from '@auto-engineer/narrative';
 import type { Event, State } from '@auto-engineer/narrative';
 type QuestionnaireLinkSent = Event<
   'QuestionnaireLinkSent',
@@ -1279,7 +1279,7 @@ type QuestionnaireProgress = State<
     status: string;
   }
 >;
-narrative('Test Flow', 'TEST-FLOW', () => {
+scene('Test Flow', 'TEST-FLOW', () => {
   query('test slice', 'TEST-SLICE').server(() => {
     specs('Test Rules', () => {
       rule('questionnaires show current progress', 'r1A3Bp9W', () => {
@@ -1300,11 +1300,11 @@ narrative('Test Flow', 'TEST-FLOW', () => {
   it('should chain multiple given examples with and() syntax', async () => {
     const modelWithMultiGiven: Model = {
       variant: 'specs',
-      narratives: [
+      scenes: [
         {
           name: 'Multi Given Flow',
           id: 'MULTI-GIVEN',
-          slices: [
+          moments: [
             {
               name: 'multi given slice',
               id: 'MULTI-SLICE',
@@ -1460,7 +1460,7 @@ narrative('Test Flow', 'TEST-FLOW', () => {
 
     const code = getCode(await modelToNarrative(modelWithMultiGiven));
 
-    expect(code).toEqual(`import { example, narrative, query, rule, specs } from '@auto-engineer/narrative';
+    expect(code).toEqual(`import { example, query, rule, scene, specs } from '@auto-engineer/narrative';
 import type { Event, State } from '@auto-engineer/narrative';
 type QuestionnaireConfig = State<
   'QuestionnaireConfig',
@@ -1502,7 +1502,7 @@ type QuestionnaireProgress = State<
     }[];
   }
 >;
-narrative('Multi Given Flow', 'MULTI-GIVEN', () => {
+scene('Multi Given Flow', 'MULTI-GIVEN', () => {
   query('multi given slice', 'MULTI-SLICE').server(() => {
     specs('Multi Given Rules', () => {
       rule('all questions have been answered', 'MultiGiven', () => {
@@ -1556,11 +1556,11 @@ narrative('Multi Given Flow', 'MULTI-GIVEN', () => {
   it('should generate types for states referenced in data origins', async () => {
     const modelWithReferencedStates: Model = {
       variant: 'specs',
-      narratives: [
+      scenes: [
         {
           name: 'Referenced States Flow',
           id: 'REF-STATES',
-          slices: [
+          moments: [
             {
               name: 'query with database states',
               id: 'REF-SLICE',
@@ -1674,9 +1674,7 @@ narrative('Multi Given Flow', 'MULTI-GIVEN', () => {
 
     const code = getCode(await modelToNarrative(modelWithReferencedStates));
 
-    expect(
-      code,
-    ).toEqual(`import { data, example, narrative, query, rule, source, specs } from '@auto-engineer/narrative';
+    expect(code).toEqual(`import { data, example, query, rule, scene, source, specs } from '@auto-engineer/narrative';
 import type { State } from '@auto-engineer/narrative';
 type QuestionnaireProgress = State<
   'QuestionnaireProgress',
@@ -1695,7 +1693,7 @@ type QuestionnaireConfig = State<
     title: string;
   }
 >;
-narrative('Referenced States Flow', 'REF-STATES', () => {
+scene('Referenced States Flow', 'REF-STATES', () => {
   query('query with database states', 'REF-SLICE').server(() => {
     data({
       items: [
@@ -1727,11 +1725,11 @@ narrative('Referenced States Flow', 'REF-STATES', () => {
   it('should generate new Date() constructors for Date fields', async () => {
     const modelWithDateFields: Model = {
       variant: 'specs',
-      narratives: [
+      scenes: [
         {
           name: 'Date Handling Flow',
           id: 'DATE-FLOW',
-          slices: [
+          moments: [
             {
               name: 'date handling slice',
               id: 'DATE-SLICE',
@@ -1831,7 +1829,7 @@ narrative('Referenced States Flow', 'REF-STATES', () => {
 
     const code = getCode(await modelToNarrative(modelWithDateFields));
 
-    expect(code).toEqual(`import { example, narrative, query, rule, specs } from '@auto-engineer/narrative';
+    expect(code).toEqual(`import { example, query, rule, scene, specs } from '@auto-engineer/narrative';
 import type { Event, State } from '@auto-engineer/narrative';
 type TimestampedEvent = Event<
   'TimestampedEvent',
@@ -1857,7 +1855,7 @@ type ProcessState = State<
     status: string;
   }
 >;
-narrative('Date Handling Flow', 'DATE-FLOW', () => {
+scene('Date Handling Flow', 'DATE-FLOW', () => {
   query('date handling slice', 'DATE-SLICE').server(() => {
     specs('Date Field Rules', () => {
       rule('handles Date fields correctly', 'DateRule', () => {
@@ -1885,11 +1883,11 @@ narrative('Date Handling Flow', 'DATE-FLOW', () => {
   it('should generate multiple flows when multiple flows have the same sourceFile', async () => {
     const modelWithMultipleFlowsSameSource: Model = {
       variant: 'specs',
-      narratives: [
+      scenes: [
         {
           name: 'Home Screen',
           sourceFile: '/path/to/homepage.narrative.ts',
-          slices: [
+          moments: [
             {
               name: 'Active Surveys Summary',
               id: 'aifPcU3hw',
@@ -1903,7 +1901,7 @@ narrative('Date Handling Flow', 'DATE-FLOW', () => {
         {
           name: 'Create Survey',
           sourceFile: '/path/to/homepage.narrative.ts',
-          slices: [
+          moments: [
             {
               name: 'Create Survey Form',
               id: 'MPviTMrQC',
@@ -1917,7 +1915,7 @@ narrative('Date Handling Flow', 'DATE-FLOW', () => {
         {
           name: 'Response Analytics',
           sourceFile: '/path/to/homepage.narrative.ts',
-          slices: [
+          moments: [
             {
               name: 'Response Rate Charts',
               id: 'eME978Euk',
@@ -1936,18 +1934,18 @@ narrative('Date Handling Flow', 'DATE-FLOW', () => {
 
     const code = getCode(await modelToNarrative(modelWithMultipleFlowsSameSource));
 
-    expect(code).toEqual(`import { experience, it, narrative } from '@auto-engineer/narrative';
-narrative('Home Screen', () => {
+    expect(code).toEqual(`import { experience, it, scene } from '@auto-engineer/narrative';
+scene('Home Screen', () => {
   experience('Active Surveys Summary', 'aifPcU3hw').client(() => {
     it('show active surveys summary');
   });
 });
-narrative('Create Survey', () => {
+scene('Create Survey', () => {
   experience('Create Survey Form', 'MPviTMrQC').client(() => {
     it('allow entering survey title');
   });
 });
-narrative('Response Analytics', () => {
+scene('Response Analytics', () => {
   experience('Response Rate Charts', 'eME978Euk').client(() => {
     it('show daily response rate charts');
   });
@@ -1958,11 +1956,11 @@ narrative('Response Analytics', () => {
   it('should omit .when({}) when given has multiple items and when is empty', async () => {
     const modelWithEmptyWhen: Model = {
       variant: 'specs',
-      narratives: [
+      scenes: [
         {
           name: 'Todo List Summary',
           id: 'TODO-001',
-          slices: [
+          moments: [
             {
               name: 'views completion summary',
               id: 'SUMMARY-001',
@@ -2098,7 +2096,7 @@ narrative('Response Analytics', () => {
 
     const code = getCode(await modelToNarrative(modelWithEmptyWhen));
 
-    expect(code).toEqual(`import { example, narrative, query, rule, specs } from '@auto-engineer/narrative';
+    expect(code).toEqual(`import { example, query, rule, scene, specs } from '@auto-engineer/narrative';
 import type { Event, State } from '@auto-engineer/narrative';
 type TodoAdded = Event<
   'TodoAdded',
@@ -2134,7 +2132,7 @@ type TodoListSummary = State<
     completionPercentage: number;
   }
 >;
-narrative('Todo List Summary', 'TODO-001', () => {
+scene('Todo List Summary', 'TODO-001', () => {
   query('views completion summary', 'SUMMARY-001').server(() => {
     specs('Summary Statistics', () => {
       rule('summary shows overall todo list statistics', 'RULE-SUMMARY', () => {
@@ -2175,11 +2173,11 @@ narrative('Todo List Summary', 'TODO-001', () => {
     it('should generate fromSingletonProjection for singleton projections', async () => {
       const modelWithSingletonProjection: Model = {
         variant: 'specs',
-        narratives: [
+        scenes: [
           {
             name: 'Todo Summary Flow',
             id: 'TODO-SUMMARY',
-            slices: [
+            moments: [
               {
                 name: 'views todo summary',
                 id: 'SUMMARY-SLICE',
@@ -2233,7 +2231,7 @@ narrative('Todo List Summary', 'TODO-001', () => {
 
       const code = getCode(await modelToNarrative(modelWithSingletonProjection));
 
-      expect(code).toEqual(`import { data, narrative, query, source, specs } from '@auto-engineer/narrative';
+      expect(code).toEqual(`import { data, query, scene, source, specs } from '@auto-engineer/narrative';
 import type { State } from '@auto-engineer/narrative';
 type TodoListSummary = State<
   'TodoListSummary',
@@ -2242,7 +2240,7 @@ type TodoListSummary = State<
     totalTodos: number;
   }
 >;
-narrative('Todo Summary Flow', 'TODO-SUMMARY', () => {
+scene('Todo Summary Flow', 'TODO-SUMMARY', () => {
   query('views todo summary', 'SUMMARY-SLICE').server(() => {
     data({ items: [source().state('TodoListSummary').fromSingletonProjection('TodoSummary')] });
     specs('Summary Rules', () => {});
@@ -2254,11 +2252,11 @@ narrative('Todo Summary Flow', 'TODO-SUMMARY', () => {
     it('should generate fromProjection with single idField for regular projections', async () => {
       const modelWithRegularProjection: Model = {
         variant: 'specs',
-        narratives: [
+        scenes: [
           {
             name: 'Todo Flow',
             id: 'TODO-FLOW',
-            slices: [
+            moments: [
               {
                 name: 'views todo',
                 id: 'TODO-SLICE',
@@ -2312,7 +2310,7 @@ narrative('Todo Summary Flow', 'TODO-SUMMARY', () => {
 
       const code = getCode(await modelToNarrative(modelWithRegularProjection));
 
-      expect(code).toEqual(`import { data, narrative, query, source, specs } from '@auto-engineer/narrative';
+      expect(code).toEqual(`import { data, query, scene, source, specs } from '@auto-engineer/narrative';
 import type { State } from '@auto-engineer/narrative';
 type TodoState = State<
   'TodoState',
@@ -2321,7 +2319,7 @@ type TodoState = State<
     description: string;
   }
 >;
-narrative('Todo Flow', 'TODO-FLOW', () => {
+scene('Todo Flow', 'TODO-FLOW', () => {
   query('views todo', 'TODO-SLICE').server(() => {
     data({ items: [source().state('TodoState').fromProjection('Todos', 'todoId')] });
     specs('Todo Rules', () => {});
@@ -2333,11 +2331,11 @@ narrative('Todo Flow', 'TODO-FLOW', () => {
     it('should generate fromCompositeProjection with array idField for composite key projections', async () => {
       const modelWithCompositeProjection: Model = {
         variant: 'specs',
-        narratives: [
+        scenes: [
           {
             name: 'User Project Flow',
             id: 'USER-PROJECT-FLOW',
-            slices: [
+            moments: [
               {
                 name: 'views user project',
                 id: 'USER-PROJECT-SLICE',
@@ -2392,7 +2390,7 @@ narrative('Todo Flow', 'TODO-FLOW', () => {
 
       const code = getCode(await modelToNarrative(modelWithCompositeProjection));
 
-      expect(code).toEqual(`import { data, narrative, query, source, specs } from '@auto-engineer/narrative';
+      expect(code).toEqual(`import { data, query, scene, source, specs } from '@auto-engineer/narrative';
 import type { State } from '@auto-engineer/narrative';
 type UserProjectState = State<
   'UserProjectState',
@@ -2402,7 +2400,7 @@ type UserProjectState = State<
     role: string;
   }
 >;
-narrative('User Project Flow', 'USER-PROJECT-FLOW', () => {
+scene('User Project Flow', 'USER-PROJECT-FLOW', () => {
   query('views user project', 'USER-PROJECT-SLICE').server(() => {
     data({
       items: [source().state('UserProjectState').fromCompositeProjection('UserProjects', ['userId', 'projectId'])],
@@ -2416,11 +2414,11 @@ narrative('User Project Flow', 'USER-PROJECT-FLOW', () => {
     it('should generate all three projection types in a single narrative', async () => {
       const modelWithAllProjectionTypes: Model = {
         variant: 'specs',
-        narratives: [
+        scenes: [
           {
             name: 'All Projection Types',
             id: 'ALL-PROJ',
-            slices: [
+            moments: [
               {
                 name: 'views summary',
                 id: 'SUMMARY-SLICE',
@@ -2559,7 +2557,7 @@ narrative('User Project Flow', 'USER-PROJECT-FLOW', () => {
 
       const code = getCode(await modelToNarrative(modelWithAllProjectionTypes));
 
-      expect(code).toEqual(`import { data, narrative, query, source, specs } from '@auto-engineer/narrative';
+      expect(code).toEqual(`import { data, query, scene, source, specs } from '@auto-engineer/narrative';
 import type { State } from '@auto-engineer/narrative';
 type TodoListSummary = State<
   'TodoListSummary',
@@ -2583,7 +2581,7 @@ type UserProjectTodos = State<
     todos: string[];
   }
 >;
-narrative('All Projection Types', 'ALL-PROJ', () => {
+scene('All Projection Types', 'ALL-PROJ', () => {
   query('views summary', 'SUMMARY-SLICE').server(() => {
     data({ items: [source().state('TodoListSummary').fromSingletonProjection('TodoSummary')] });
     specs('Summary Rules', () => {});
@@ -2607,9 +2605,9 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
     it('generates multiple files for derived modules with different sourceFiles', async () => {
       const model: Model = {
         variant: 'specs',
-        narratives: [
-          { name: 'Orders', id: 'orders-flow', sourceFile: 'orders.narrative.ts', slices: [] },
-          { name: 'Users', id: 'users-flow', sourceFile: 'users.narrative.ts', slices: [] },
+        scenes: [
+          { name: 'Orders', id: 'orders-flow', sourceFile: 'orders.narrative.ts', moments: [] },
+          { name: 'Users', id: 'users-flow', sourceFile: 'users.narrative.ts', moments: [] },
         ],
         messages: [],
         integrations: [],
@@ -2617,13 +2615,13 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
           {
             sourceFile: 'orders.narrative.ts',
             isDerived: true,
-            contains: { narrativeIds: ['orders-flow'] },
+            contains: { sceneIds: ['orders-flow'] },
             declares: { messages: [] },
           },
           {
             sourceFile: 'users.narrative.ts',
             isDerived: true,
-            contains: { narrativeIds: ['users-flow'] },
+            contains: { sceneIds: ['users-flow'] },
             declares: { messages: [] },
           },
         ],
@@ -2637,16 +2635,16 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
       const ordersFile = result.files.find((f) => f.path === 'orders.narrative.ts');
       const usersFile = result.files.find((f) => f.path === 'users.narrative.ts');
 
-      expect(ordersFile?.code).toContain("narrative('Orders', 'orders-flow'");
-      expect(usersFile?.code).toContain("narrative('Users', 'users-flow'");
+      expect(ordersFile?.code).toContain("scene('Orders', 'orders-flow'");
+      expect(usersFile?.code).toContain("scene('Users', 'users-flow'");
     });
 
     it('duplicates types in each derived module file (no cross-module imports)', async () => {
       const model: Model = {
         variant: 'specs',
-        narratives: [
-          { name: 'Flow A', id: 'flow-a', sourceFile: 'a.narrative.ts', slices: [] },
-          { name: 'Flow B', id: 'flow-b', sourceFile: 'b.narrative.ts', slices: [] },
+        scenes: [
+          { name: 'Flow A', id: 'flow-a', sourceFile: 'a.narrative.ts', moments: [] },
+          { name: 'Flow B', id: 'flow-b', sourceFile: 'b.narrative.ts', moments: [] },
         ],
         messages: [
           {
@@ -2661,13 +2659,13 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
           {
             sourceFile: 'a.narrative.ts',
             isDerived: true,
-            contains: { narrativeIds: ['flow-a'] },
+            contains: { sceneIds: ['flow-a'] },
             declares: { messages: [{ kind: 'event', name: 'SharedEvent' }] },
           },
           {
             sourceFile: 'b.narrative.ts',
             isDerived: true,
-            contains: { narrativeIds: ['flow-b'] },
+            contains: { sceneIds: ['flow-b'] },
             declares: { messages: [{ kind: 'event', name: 'SharedEvent' }] },
           },
         ],
@@ -2686,12 +2684,12 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
     it('generates cross-module type imports for authored modules', async () => {
       const model: Model = {
         variant: 'specs',
-        narratives: [
-          { name: 'Shared Types', id: 'shared-types', slices: [] },
+        scenes: [
+          { name: 'Shared Types', id: 'shared-types', moments: [] },
           {
             name: 'Orders',
             id: 'orders-flow',
-            slices: [
+            moments: [
               {
                 name: 'create order',
                 type: 'command',
@@ -2741,13 +2739,13 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
           {
             sourceFile: 'shared/types.narrative.ts',
             isDerived: false,
-            contains: { narrativeIds: ['shared-types'] },
+            contains: { sceneIds: ['shared-types'] },
             declares: { messages: [{ kind: 'event', name: 'OrderCreated' }] },
           },
           {
             sourceFile: 'features/orders.narrative.ts',
             isDerived: false,
-            contains: { narrativeIds: ['orders-flow'] },
+            contains: { sceneIds: ['orders-flow'] },
             declares: { messages: [{ kind: 'command', name: 'CreateOrder' }] },
           },
         ],
@@ -2768,12 +2766,12 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
     it('generates correct relative import paths for nested directories', async () => {
       const model: Model = {
         variant: 'specs',
-        narratives: [
-          { name: 'Core Types', id: 'core', slices: [] },
+        scenes: [
+          { name: 'Core Types', id: 'core', moments: [] },
           {
             name: 'Feature',
             id: 'feature',
-            slices: [
+            moments: [
               {
                 name: 'do something',
                 type: 'command',
@@ -2815,13 +2813,13 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
           {
             sourceFile: 'src/core/types.narrative.ts',
             isDerived: false,
-            contains: { narrativeIds: ['core'] },
+            contains: { sceneIds: ['core'] },
             declares: { messages: [{ kind: 'event', name: 'CoreEvent' }] },
           },
           {
             sourceFile: 'src/features/sub/feature.narrative.ts',
             isDerived: false,
-            contains: { narrativeIds: ['feature'] },
+            contains: { sceneIds: ['feature'] },
             declares: { messages: [] },
           },
         ],
@@ -2837,12 +2835,12 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
     it('groups multiple imported types from same module into single import', async () => {
       const model: Model = {
         variant: 'specs',
-        narratives: [
-          { name: 'Shared', id: 'shared', slices: [] },
+        scenes: [
+          { name: 'Shared', id: 'shared', moments: [] },
           {
             name: 'Consumer',
             id: 'consumer',
-            slices: [
+            moments: [
               {
                 name: 'process',
                 type: 'command',
@@ -2883,7 +2881,7 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
           {
             sourceFile: 'shared.narrative.ts',
             isDerived: false,
-            contains: { narrativeIds: ['shared'] },
+            contains: { sceneIds: ['shared'] },
             declares: {
               messages: [
                 { kind: 'event', name: 'EventA' },
@@ -2894,7 +2892,7 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
           {
             sourceFile: 'consumer.narrative.ts',
             isDerived: false,
-            contains: { narrativeIds: ['consumer'] },
+            contains: { sceneIds: ['consumer'] },
             declares: { messages: [] },
           },
         ],
@@ -2912,13 +2910,13 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
     it('sorts cross-module imports alphabetically by path', async () => {
       const model: Model = {
         variant: 'specs',
-        narratives: [
-          { name: 'Types Z', id: 'z-types', slices: [] },
-          { name: 'Types A', id: 'a-types', slices: [] },
+        scenes: [
+          { name: 'Types Z', id: 'z-types', moments: [] },
+          { name: 'Types A', id: 'a-types', moments: [] },
           {
             name: 'Consumer',
             id: 'consumer',
-            slices: [
+            moments: [
               {
                 name: 'process',
                 type: 'command',
@@ -2959,19 +2957,19 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
           {
             sourceFile: 'z-types.narrative.ts',
             isDerived: false,
-            contains: { narrativeIds: ['z-types'] },
+            contains: { sceneIds: ['z-types'] },
             declares: { messages: [{ kind: 'event', name: 'ZEvent' }] },
           },
           {
             sourceFile: 'a-types.narrative.ts',
             isDerived: false,
-            contains: { narrativeIds: ['a-types'] },
+            contains: { sceneIds: ['a-types'] },
             declares: { messages: [{ kind: 'event', name: 'AEvent' }] },
           },
           {
             sourceFile: 'consumer.narrative.ts',
             isDerived: false,
-            contains: { narrativeIds: ['consumer'] },
+            contains: { sceneIds: ['consumer'] },
             declares: { messages: [] },
           },
         ],
@@ -2992,9 +2990,9 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
     it('derives modules when model has empty modules array', async () => {
       const model: Model = {
         variant: 'specs',
-        narratives: [
-          { name: 'Flow A', id: 'flow-a', sourceFile: 'a.narrative.ts', slices: [] },
-          { name: 'Flow B', id: 'flow-b', sourceFile: 'b.narrative.ts', slices: [] },
+        scenes: [
+          { name: 'Flow A', id: 'flow-a', sourceFile: 'a.narrative.ts', moments: [] },
+          { name: 'Flow B', id: 'flow-b', sourceFile: 'b.narrative.ts', moments: [] },
         ],
         messages: [
           {
@@ -3023,11 +3021,11 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
     it('should generate sink id when provided', async () => {
       const modelWithSinkId: Model = {
         variant: 'specs',
-        narratives: [
+        scenes: [
           {
             name: 'Order Flow',
             id: 'ORDER-FLOW',
-            slices: [
+            moments: [
               {
                 name: 'places order',
                 id: 'ORDER-SLICE',
@@ -3069,11 +3067,11 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
     it('should generate source id when provided', async () => {
       const modelWithSourceId: Model = {
         variant: 'specs',
-        narratives: [
+        scenes: [
           {
             name: 'Order Flow',
             id: 'ORDER-FLOW',
-            slices: [
+            moments: [
               {
                 name: 'views order',
                 id: 'ORDER-SLICE',
@@ -3114,11 +3112,11 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
     it('should not generate id when not provided', async () => {
       const modelWithoutId: Model = {
         variant: 'specs',
-        narratives: [
+        scenes: [
           {
             name: 'Order Flow',
             id: 'ORDER-FLOW',
-            slices: [
+            moments: [
               {
                 name: 'places order',
                 id: 'ORDER-SLICE',
@@ -3160,11 +3158,11 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
     it('should generate target-only event items without destination', async () => {
       const modelWithTarget: Model = {
         variant: 'specs',
-        narratives: [
+        scenes: [
           {
             name: 'React Flow',
             id: 'REACT-FLOW',
-            slices: [
+            moments: [
               {
                 name: 'reacts to event',
                 id: 'REACT-SLICE',
@@ -3199,11 +3197,11 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
     it('should generate target-only event items with id', async () => {
       const modelWithTargetId: Model = {
         variant: 'specs',
-        narratives: [
+        scenes: [
           {
             name: 'React Flow',
             id: 'REACT-FLOW',
-            slices: [
+            moments: [
               {
                 name: 'reacts to event',
                 id: 'REACT-SLICE',
@@ -3238,11 +3236,11 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
     it('should generate _additionalInstructions on source items', async () => {
       const modelWithSourceInstructions: Model = {
         variant: 'specs',
-        narratives: [
+        scenes: [
           {
             name: 'Order Flow',
             id: 'ORDER-FLOW',
-            slices: [
+            moments: [
               {
                 name: 'views order',
                 id: 'ORDER-SLICE',
@@ -3283,11 +3281,11 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
     it('should generate 3 narrative files for gym membership model', async () => {
       const gymModel: Model = {
         variant: 'specs',
-        narratives: [
+        scenes: [
           {
             id: 'mrwDfHhDi',
             name: 'Gym Membership Registration',
-            slices: [
+            moments: [
               {
                 type: 'command',
                 name: 'Register New Member',
@@ -3348,7 +3346,7 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
           {
             id: 'exByqGILR',
             name: 'Gym Class Booking',
-            slices: [
+            moments: [
               {
                 type: 'command',
                 name: 'Book Gym Class',
@@ -3409,7 +3407,7 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
           {
             id: 'o0odruqZA',
             name: 'Gym Check-In',
-            slices: [
+            moments: [
               {
                 type: 'command',
                 name: 'Perform Check-In',
@@ -3491,9 +3489,9 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
 
       // Verify each narrative has proper content
       const code = getCode(result);
-      expect(code).toContain("narrative('Gym Membership Registration'");
-      expect(code).toContain("narrative('Gym Class Booking'");
-      expect(code).toContain("narrative('Gym Check-In'");
+      expect(code).toContain("scene('Gym Membership Registration'");
+      expect(code).toContain("scene('Gym Class Booking'");
+      expect(code).toContain("scene('Gym Check-In'");
 
       // Check slices are generated for each narrative
       expect(code).toContain("command('Register New Member'");
@@ -3505,11 +3503,11 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
   it('generates all declared types for authored modules regardless of usage analysis', async () => {
     const model: Model = {
       variant: 'specs',
-      narratives: [
+      scenes: [
         {
           id: 'narrative-1',
           name: 'Gym Goal Setting',
-          slices: [
+          moments: [
             {
               type: 'command',
               name: 'Set Fitness Goal',
@@ -3551,7 +3549,7 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
         {
           sourceFile: '/narratives/goal-setting.narrative.ts',
           isDerived: false,
-          contains: { narrativeIds: ['narrative-1'] },
+          contains: { sceneIds: ['narrative-1'] },
           declares: {
             messages: [
               { kind: 'command', name: 'SetFitnessGoal' },