@auto-engineer/narrative 0.13.2 → 0.14.0

package/src/integration-registry.ts

@@ -1,6 +1,7 @@
 // integration-helper.ts - Add this to your flow package
-import { Integration } from './types';
+
 import createDebug from 'debug';
+import type { Integration } from './types';
 
 const debug = createDebug('auto:flow:integrations');
 if ('color' in debug && typeof debug === 'object') {

package/src/loader/fs-path.ts

@@ -9,7 +9,7 @@ export function dirname(p: string) {
 export function join(a: string, b: string) {
   const aa = toPosix(a).replace(/\/+$/, '');
   const bb = toPosix(b).replace(/^\/+/, '');
-  return (aa ? aa + '/' : '/') + bb;
+  return (aa ? `${aa}/` : '/') + bb;
 }
 
 export function normalize(path: string): string {
@@ -23,7 +23,7 @@ export function normalize(path: string): string {
     }
     out.push(part);
   }
-  return '/' + out.join('/');
+  return `/${out.join('/')}`;
 }
 
 export const CANDIDATE_EXTS = ['.ts', '.tsx', '.js', '.jsx', '.mjs', '.cjs'];

package/src/loader/graph.ts

@@ -1,25 +1,30 @@
-import createDebug from 'debug';
-import type { Graph } from './types';
 import type { IFileStore } from '@auto-engineer/file-store';
+import createDebug from 'debug';
+import { integrationExportRegistry } from '../integration-export-registry';
+import { toPosix } from './fs-path';
+import { resolveSpecifier } from './resolver';
 import {
+  parseGivenTypeArguments,
   parseImports,
-  parseTypeDefinitions,
   parseIntegrationExports,
   parseIntegrationImports,
-  parseGivenTypeArguments,
-  parseWhenTypeArguments,
   parseThenTypeArguments,
+  parseTypeDefinitions,
+  parseWhenTypeArguments,
   patchImportMeta,
+  type TypeInfo,
   transpileToCjs,
-  TypeInfo,
 } from './ts-utils';
-import { toPosix } from './fs-path';
-import { resolveSpecifier } from './resolver';
-import { integrationExportRegistry } from '../integration-export-registry';
+import type { Graph } from './types';
 import { createVfsCompilerHost } from './vfs-compiler-host';
 
 const debug = createDebug('auto:flow:graph');
 
+function interopDefault<T>(mod: unknown): T {
+  const m = mod as Record<string, unknown> | null;
+  return m !== null && typeof m === 'object' && 'default' in m ? ((m.default as T) ?? (mod as T)) : (mod as T);
+}
+
 async function collectAllTypings(
   vfs: IFileStore,
   externalPkgs: Set<string>,
@@ -166,7 +171,7 @@ export async function buildGraph(
   importMap: Record<string, unknown>,
   rootDir: string,
 ): Promise<BuildGraphResult> {
-  const ts = await import('typescript');
+  const ts = interopDefault<typeof import('typescript')>(await import('typescript'));
 
   const graph: Graph = new Map();
   const visited = new Set<string>();

package/src/loader/index.ts

@@ -1,12 +1,12 @@
 import createDebug from 'debug';
-import type { ExecuteOptions } from './types';
-import { registry } from '../narrative-registry';
-import { integrationRegistry } from '../integration-registry';
 import { integrationExportRegistry } from '../integration-export-registry';
-import { buildGraph, type BuildGraphResult } from './graph';
-import { runGraph } from './runtime-cjs';
-import { createEnhancedImportMap } from './importmap';
+import { integrationRegistry } from '../integration-registry';
 import { setGivenTypesByFile } from '../narrative-context';
+import { registry } from '../narrative-registry';
+import { type BuildGraphResult, buildGraph } from './graph';
+import { createEnhancedImportMap } from './importmap';
+import { runGraph } from './runtime-cjs';
+import type { ExecuteOptions } from './types';
 
 const debug = createDebug('auto:flow:ast-loader:index');
 
@@ -42,7 +42,7 @@ export async function executeAST(
   // auto-map any externals we can load
   const autoMapped: Record<string, unknown> = {};
   for (const spec of first.externals) {
-    if (Object.prototype.hasOwnProperty.call(enhanced, spec)) continue;
+    if (Object.hasOwn(enhanced, spec)) continue;
     try {
       const mod = (await import(spec)) as Record<string, unknown>;
       autoMapped[spec] = interopDefault(mod); // <<< IMPORTANT

package/src/loader/resolver.ts

@@ -8,7 +8,7 @@ export async function resolveSpecifier(
   parent: string,
   importMap: Record<string, unknown>,
 ): Promise<Resolved> {
-  if (Object.prototype.hasOwnProperty.call(importMap, spec)) {
+  if (Object.hasOwn(importMap, spec)) {
     return { kind: 'mapped', value: importMap[spec] };
   }
   if (spec.startsWith('./') || spec.startsWith('../')) {

package/src/loader/runtime-cjs.ts

@@ -1,9 +1,9 @@
 import createDebug from 'debug';
-import type { Graph } from './types';
-import { dirname, toPosix } from './fs-path';
 import { integrationRegistry } from '../integration-registry';
 import { registry } from '../narrative-registry';
 import type { Integration } from '../types';
+import { dirname, toPosix } from './fs-path';
+import type { Graph } from './types';
 
 const debug = createDebug('auto:flow:runtime');
 const dImp = createDebug('auto:flow:runtime:require');
@@ -119,7 +119,7 @@ export function runGraph(entryFiles: string[], graph: Graph): void {
     };
 
     try {
-      const codeWithShim = 'var r = require; var __require = require;\n' + mod.js;
+      const codeWithShim = `var r = require; var __require = require;\n${mod.js}`;
       // eslint-disable-next-line @typescript-eslint/no-implied-eval
       const fn = new Function('require', 'module', 'exports', '__filename', '__dirname', codeWithShim) as (
         req: (s: string) => unknown,

package/src/loader/ts-utils.ts

@@ -1,6 +1,6 @@
 import type { IFileStore } from '@auto-engineer/file-store';
-import { CANDIDATE_EXTS, dirname, join, normalize } from './fs-path';
 import createDebug from 'debug';
+import { CANDIDATE_EXTS, dirname, join, normalize } from './fs-path';
 
 const debug = createDebug('auto:flow:when-types');
 
@@ -16,7 +16,7 @@ export async function resolveRelative(vfs: IFileStore, spec: string, parent: str
   if (await fileExists(vfs, raw)) return raw;
   for (const ext of CANDIDATE_EXTS) if (await fileExists(vfs, raw + ext)) return raw + ext;
   for (const ext of CANDIDATE_EXTS) {
-    const idx = normalize(join(raw, 'index' + ext));
+    const idx = normalize(join(raw, `index${ext}`));
     if (await fileExists(vfs, idx)) return idx;
   }
   return null;
@@ -28,7 +28,7 @@ export async function resolveAbsolute(vfs: IFileStore, spec: string): Promise<st
   if (await fileExists(vfs, raw)) return raw;
   for (const ext of CANDIDATE_EXTS) if (await fileExists(vfs, raw + ext)) return raw + ext;
   for (const ext of CANDIDATE_EXTS) {
-    const idx = normalize(join(raw, 'index' + ext));
+    const idx = normalize(join(raw, `index${ext}`));
     if (await fileExists(vfs, idx)) return idx;
   }
   return null;
@@ -36,7 +36,7 @@ export async function resolveAbsolute(vfs: IFileStore, spec: string): Promise<st
 
 /** Shim import.meta in user code (we only provide a url). */
 export function patchImportMeta(src: string, absPath: string): string {
-  return src.replace(/\bimport\.meta\b/g, `({ url: ${JSON.stringify('file://' + absPath)} })`);
+  return src.replace(/\bimport\.meta\b/g, `({ url: ${JSON.stringify(`file://${absPath}`)} })`);
 }
 
 export function parseImports(ts: typeof import('typescript'), fileName: string, source: string): string[] {
@@ -546,7 +546,7 @@ function findTypeInfo(
     }
   }
 
-  return ti && ti.classification ? ti : null;
+  return ti?.classification ? ti : null;
 }
 
 function createGivenTypeInfo(

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

@@ -1,7 +1,7 @@
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
+import type { Model } from './index';
 import schema from './samples/seasonal-assistant.schema.json';
 import { modelToNarrative } from './transformers/model-to-narrative';
-import { Model } from './index';
 
 describe('modelToNarrative', () => {
   it('should create a full flow DSL from a model', async () => {
@@ -12,7 +12,6 @@ describe('modelToNarrative', () => {
   data,
   describe,
   example,
-  given,
   gql,
   it,
   narrative,
@@ -22,8 +21,6 @@ describe('modelToNarrative', () => {
   sink,
   source,
   specs,
-  then,
-  when,
 } from '@auto-engineer/narrative';
 import type { Command, Event, State } from '@auto-engineer/narrative';
 import { AI, ProductCatalog } from '../server/src/integrations';
@@ -120,36 +117,34 @@ narrative('Seasonal Assistant', () => {
       data([sink().event('ShoppingCriteriaEntered').toStream('shopping-session-\${sessionId}')]);
       specs('When shopper submits criteria, a shopping session is started', () => {
         rule('Valid criteria should start a shopping session', () => {
-          example('User submits shopping criteria for children', () => {
-            when<EnterShoppingCriteria>({
+          example('User submits shopping criteria for children')
+            .when<EnterShoppingCriteria>({
               sessionId: 'shopper-123',
               criteria:
                 'I need back-to-school items for my 7-year-old daughter who loves soccer and crafts, and my 12-year-old son who is into computers and Magic the Gathering.',
-            });
-            then<ShoppingCriteriaEntered>({
+            })
+            .then<ShoppingCriteriaEntered>({
               sessionId: 'shopper-123',
               criteria:
                 'I need back-to-school items for my 7-year-old daughter who loves soccer and crafts, and my 12-year-old son who is into computers and Magic the Gathering.',
             });
-          });
         });
       });
     });
   react('creates a chat session').server(() => {
     specs('When shopping criteria are entered, request wishlist creation', () => {
       rule('Shopping criteria should trigger item suggestion', () => {
-        example('Criteria entered triggers wishlist creation', () => {
-          when<ShoppingCriteriaEntered>({
+        example('Criteria entered triggers wishlist creation')
+          .when<ShoppingCriteriaEntered>({
             sessionId: 'session-abc',
             criteria:
               'I need back-to-school items for my 7-year-old daughter who loves soccer and crafts, and my 12-year-old son who is into computers and Magic the Gathering.',
-          });
-          then<SuggestShoppingItems>({
+          })
+          .then<SuggestShoppingItems>({
             sessionId: 'session-abc',
             prompt:
               'I need back-to-school items for my 7-year-old daughter who loves soccer and crafts, and my 12-year-old son who is into computers and Magic the Gathering.',
           });
-        });
       });
     });
   });
@@ -166,8 +161,8 @@ narrative('Seasonal Assistant', () => {
     ]);
     specs('When chat is triggered, AI suggests items based on product catalog', () => {
       rule('AI should suggest relevant items from available products', () => {
-        example('Product catalog with matching items generates suggestions', () => {
-          given<Products>({
+        example('Product catalog with matching items generates suggestions')
+          .given<Products>({
             products: [
               {
                 productId: 'prod-soccer-ball',
@@ -202,13 +197,13 @@ narrative('Seasonal Assistant', () => {
                 imageUrl: 'https://example.com/mtg-starter.jpg',
               },
             ],
-          });
-          when<SuggestShoppingItems>({
+          })
+          .when<SuggestShoppingItems>({
             sessionId: 'session-abc',
             prompt:
               'I need back-to-school items for my 7-year-old daughter who loves soccer and crafts, and my 12-year-old son who is into computers and Magic the Gathering.',
-          });
-          then<ShoppingItemsSuggested>({
+          })
+          .then<ShoppingItemsSuggested>({
             sessionId: 'session-abc',
             suggestedItems: [
               {
@@ -237,7 +232,6 @@ narrative('Seasonal Assistant', () => {
               },
             ],
           });
-        });
       });
     });
   });
@@ -266,8 +260,8 @@ narrative('Seasonal Assistant', () => {
       data([source().state('SuggestedItems').fromProjection('SuggestedItemsProjection', 'sessionId')]);
       specs('Suggested items are available for viewing', () => {
         rule('Items should be available for viewing after suggestion', () => {
-          example('Item becomes available after AI suggestion event', () => {
-            when<ShoppingItemsSuggested>({
+          example('Item becomes available after AI suggestion event')
+            .when<ShoppingItemsSuggested>({
               sessionId: 'session-abc',
               suggestedItems: [
                 {
@@ -295,8 +289,8 @@ narrative('Seasonal Assistant', () => {
                   reason: 'Ideal starter set for Magic the Gathering enthusiasts',
                 },
               ],
-            });
-            then<SuggestedItems>({
+            })
+            .then<SuggestedItems>({
               sessionId: 'session-abc',
               items: [
                 {
@@ -325,7 +319,6 @@ narrative('Seasonal Assistant', () => {
                 },
               ],
             });
-          });
         });
       });
     });
@@ -341,8 +334,8 @@ narrative('Seasonal Assistant', () => {
       data([sink().event('ItemsAddedToCart').toStream('shopping-session-\${sessionId}')]);
       specs('When shopper accepts items, they are added to cart', () => {
         rule('Accepted items should be added to the shopping cart', () => {
-          example('User selects all suggested items for cart', () => {
-            when<AddItemsToCart>({
+          example('User selects all suggested items for cart')
+            .when<AddItemsToCart>({
               sessionId: 'session-abc',
               items: [
                 { productId: 'prod-soccer-ball', quantity: 1 },
@@ -350,8 +343,8 @@ narrative('Seasonal Assistant', () => {
                 { productId: 'prod-laptop-bag', quantity: 1 },
                 { productId: 'prod-mtg-starter', quantity: 1 },
               ],
-            });
-            then<ItemsAddedToCart>({
+            })
+            .then<ItemsAddedToCart>({
               sessionId: 'session-abc',
               items: [
                 { productId: 'prod-soccer-ball', quantity: 1 },
@@ -360,7 +353,6 @@ narrative('Seasonal Assistant', () => {
                 { productId: 'prod-mtg-starter', quantity: 1 },
               ],
             });
-          });
         });
       });
     });
@@ -613,8 +605,7 @@ narrative('Test Flow with IDs', 'FLOW-123', () => {
 
     const code = await modelToNarrative(modelWithRuleIds);
 
-    expect(code)
-      .toEqual(`import { command, example, narrative, rule, specs, then, when } from '@auto-engineer/narrative';
+    expect(code).toEqual(`import { command, example, narrative, rule, specs } from '@auto-engineer/narrative';
 import type { Command, Event } from '@auto-engineer/narrative';
 type ProcessCommand = Command<
   'ProcessCommand',
@@ -634,10 +625,9 @@ narrative('Test Flow with Rule IDs', 'FLOW-456', () => {
   command('process command', 'SLICE-789').server(() => {
     specs('Command Processing', () => {
       rule('Valid commands should be processed', 'RULE-ABC', () => {
-        example('User submits valid command', () => {
-          when<ProcessCommand>({ id: 'cmd-123', action: 'create' });
-          then<CommandProcessed>({ id: 'cmd-123', status: 'success' });
-        });
+        example('User submits valid command')
+          .when<ProcessCommand>({ id: 'cmd-123', action: 'create' })
+          .then<CommandProcessed>({ id: 'cmd-123', status: 'success' });
       });
     });
   });
@@ -945,7 +935,6 @@ narrative('Questionnaire Flow', 'QUEST-001', () => {});
   describe,
   example,
   experience,
-  given,
   gql,
   it,
   narrative,
@@ -953,8 +942,6 @@ narrative('Questionnaire Flow', 'QUEST-001', () => {});
   rule,
   source,
   specs,
-  then,
-  when,
 } from '@auto-engineer/narrative';
 import type { Event, State } from '@auto-engineer/narrative';
 type QuestionnaireLinkSent = Event<
@@ -1023,21 +1010,21 @@ narrative('Questionnaires', 'Q9m2Kp4Lx', () => {
       data([source().state('QuestionnaireProgress').fromProjection('Questionnaires', 'questionnaire-participantId')]);
       specs(() => {
         rule('questionnaires show current progress', 'r1A3Bp9W', () => {
-          example('a question has already been answered', () => {
-            given<QuestionnaireLinkSent>({
+          example('a question has already been answered')
+            .given<QuestionnaireLinkSent>({
               questionnaireId: 'q-001',
               participantId: 'participant-abc',
               link: 'https://app.example.com/q/q-001?participant=participant-abc',
               sentAt: new Date('2030-01-01T09:00:00.000Z'),
-            });
-            when<QuestionAnswered>({
+            })
+            .when<QuestionAnswered>({
               questionnaireId: 'q-001',
               participantId: 'participant-abc',
               questionId: 'q1',
               answer: 'Yes',
               savedAt: new Date('2030-01-01T09:05:00.000Z'),
-            });
-            then<QuestionnaireProgress>({
+            })
+            .then<QuestionnaireProgress>({
               questionnaireId: 'q-001',
               participantId: 'participant-abc',
               status: 'in_progress',
@@ -1045,7 +1032,6 @@ narrative('Questionnaires', 'Q9m2Kp4Lx', () => {
               remainingQuestions: ['q2', 'q3'],
               answers: [{ questionId: 'q1', value: 'Yes' }],
             });
-          });
         });
       });
     });
@@ -1184,8 +1170,7 @@ narrative('Questionnaires', 'Q9m2Kp4Lx', () => {
 
     const code = await modelToNarrative(modelWithDuplicateRules);
 
-    expect(code)
-      .toEqual(`import { example, given, narrative, query, rule, specs, then, when } from '@auto-engineer/narrative';
+    expect(code).toEqual(`import { example, narrative, query, rule, specs } from '@auto-engineer/narrative';
 import type { Event, State } from '@auto-engineer/narrative';
 type QuestionnaireLinkSent = Event<
   'QuestionnaireLinkSent',
@@ -1213,15 +1198,13 @@ narrative('Test Flow', 'TEST-FLOW', () => {
   query('test slice', 'TEST-SLICE').server(() => {
     specs('Test Rules', () => {
       rule('questionnaires show current progress', 'r1A3Bp9W', () => {
-        example('a question has already been answered', () => {
-          given<QuestionnaireLinkSent>({ questionnaireId: 'q-001', participantId: 'participant-abc' });
-          when<QuestionAnswered>({ questionnaireId: 'q-001', questionId: 'q1', answer: 'Yes' });
-          then<QuestionnaireProgress>({ questionnaireId: 'q-001', status: 'in_progress' });
-        });
-        example('no questions have been answered yet', () => {
-          given<QuestionnaireLinkSent>({ questionnaireId: 'q-001', participantId: 'participant-abc' });
-          then<QuestionnaireProgress>({ questionnaireId: 'q-001', status: 'in_progress' });
-        });
+        example('a question has already been answered')
+          .given<QuestionnaireLinkSent>({ questionnaireId: 'q-001', participantId: 'participant-abc' })
+          .when<QuestionAnswered>({ questionnaireId: 'q-001', questionId: 'q1', answer: 'Yes' })
+          .then<QuestionnaireProgress>({ questionnaireId: 'q-001', status: 'in_progress' });
+        example('no questions have been answered yet')
+          .given<QuestionnaireLinkSent>({ questionnaireId: 'q-001', participantId: 'participant-abc' })
+          .then<QuestionnaireProgress>({ questionnaireId: 'q-001', status: 'in_progress' });
       });
     });
   });
@@ -1391,8 +1374,7 @@ narrative('Test Flow', 'TEST-FLOW', () => {
 
     const code = await modelToNarrative(modelWithMultiGiven);
 
-    expect(code)
-      .toEqual(`import { and, example, given, narrative, query, rule, specs, then, when } from '@auto-engineer/narrative';
+    expect(code).toEqual(`import { example, narrative, query, rule, specs } from '@auto-engineer/narrative';
 import type { Event, State } from '@auto-engineer/narrative';
 type QuestionnaireConfig = State<
   'QuestionnaireConfig',
@@ -1438,36 +1420,36 @@ narrative('Multi Given Flow', 'MULTI-GIVEN', () => {
   query('multi given slice', 'MULTI-SLICE').server(() => {
     specs('Multi Given Rules', () => {
       rule('all questions have been answered', 'MultiGiven', () => {
-        example('questionnaire with multiple events', () => {
-          given<QuestionnaireConfig>({ questionnaireId: 'q-001', numberOfQuestions: 3 });
-          and<QuestionnaireLinkSent>({
+        example('questionnaire with multiple events')
+          .given<QuestionnaireConfig>({ questionnaireId: 'q-001', numberOfQuestions: 3 })
+          .and<QuestionnaireLinkSent>({
             questionnaireId: 'q-001',
             participantId: 'participant-abc',
             link: 'https://example.com/q/q-001',
             sentAt: new Date('2030-01-01T09:00:00.000Z'),
-          });
-          and<QuestionAnswered>({
+          })
+          .and<QuestionAnswered>({
             questionnaireId: 'q-001',
             participantId: 'participant-abc',
             questionId: 'q1',
             answer: 'Yes',
             savedAt: new Date('2030-01-01T09:05:00.000Z'),
-          });
-          and<QuestionAnswered>({
+          })
+          .and<QuestionAnswered>({
             questionnaireId: 'q-001',
             participantId: 'participant-abc',
             questionId: 'q2',
             answer: 'No',
             savedAt: new Date('2030-01-01T09:10:00.000Z'),
-          });
-          when<QuestionAnswered>({
+          })
+          .when<QuestionAnswered>({
             questionnaireId: 'q-001',
             participantId: 'participant-abc',
             questionId: 'q3',
             answer: 'Maybe',
             savedAt: new Date('2030-01-01T09:15:00.000Z'),
-          });
-          then<QuestionnaireProgress>({
+          })
+          .then<QuestionnaireProgress>({
             questionnaireId: 'q-001',
             participantId: 'participant-abc',
             status: 'ready_to_submit',
@@ -1478,7 +1460,6 @@ narrative('Multi Given Flow', 'MULTI-GIVEN', () => {
               { questionId: 'q2', value: 'No' },
             ],
           });
-        });
       });
     });
   });
@@ -1604,8 +1585,9 @@ narrative('Multi Given Flow', 'MULTI-GIVEN', () => {
 
     const code = await modelToNarrative(modelWithReferencedStates);
 
-    expect(code)
-      .toEqual(`import { data, example, given, narrative, query, rule, source, specs, then } from '@auto-engineer/narrative';
+    expect(
+      code,
+    ).toEqual(`import { data, example, narrative, query, rule, source, specs } from '@auto-engineer/narrative';
 import type { State } from '@auto-engineer/narrative';
 type QuestionnaireProgress = State<
   'QuestionnaireProgress',
@@ -1632,19 +1614,18 @@ narrative('Referenced States Flow', 'REF-STATES', () => {
     ]);
     specs('Database State Rules', () => {
       rule('questionnaire config is available when referenced', 'RefState', () => {
-        example('config from database is accessible', () => {
-          given<QuestionnaireConfig>({
+        example('config from database is accessible')
+          .given<QuestionnaireConfig>({
             questionnaireId: 'q-001',
             numberOfQuestions: 5,
             title: 'Customer Satisfaction Survey',
-          });
-          then<QuestionnaireProgress>({
+          })
+          .then<QuestionnaireProgress>({
             questionnaireId: 'q-001',
             participantId: 'participant-abc',
             status: 'in_progress',
             totalQuestions: 5,
           });
-        });
       });
     });
   });
@@ -1758,8 +1739,7 @@ narrative('Referenced States Flow', 'REF-STATES', () => {
 
     const code = await modelToNarrative(modelWithDateFields);
 
-    expect(code)
-      .toEqual(`import { example, given, narrative, query, rule, specs, then, when } from '@auto-engineer/narrative';
+    expect(code).toEqual(`import { example, narrative, query, rule, specs } from '@auto-engineer/narrative';
 import type { Event, State } from '@auto-engineer/narrative';
 type TimestampedEvent = Event<
   'TimestampedEvent',
@@ -1789,21 +1769,20 @@ narrative('Date Handling Flow', 'DATE-FLOW', () => {
   query('date handling slice', 'DATE-SLICE').server(() => {
     specs('Date Field Rules', () => {
       rule('handles Date fields correctly', 'DateRule', () => {
-        example('event with Date fields', () => {
-          given<TimestampedEvent>({
+        example('event with Date fields')
+          .given<TimestampedEvent>({
             id: 'event-123',
             sentAt: new Date('2030-01-01T09:00:00.000Z'),
             savedAt: new Date('2030-01-01T09:05:00.000Z'),
             attemptedAt: new Date('2030-01-01T09:10:00.000Z'),
             submittedAt: new Date('2030-01-01T09:15:00.000Z'),
-          });
-          when<ProcessEvent>({ processedAt: new Date('2030-01-01T10:00:00.000Z') });
-          then<ProcessState>({
+          })
+          .when<ProcessEvent>({ processedAt: new Date('2030-01-01T10:00:00.000Z') })
+          .then<ProcessState>({
             id: 'state-123',
             completedAt: new Date('2030-01-01T11:00:00.000Z'),
             status: 'completed',
           });
-        });
       });
     });
   });
@@ -2025,8 +2004,7 @@ narrative('Response Analytics', () => {
 
     const code = await modelToNarrative(modelWithEmptyWhen);
 
-    expect(code)
-      .toEqual(`import { and, example, given, narrative, query, rule, specs, then } from '@auto-engineer/narrative';
+    expect(code).toEqual(`import { example, narrative, query, rule, specs } from '@auto-engineer/narrative';
 import type { Event, State } from '@auto-engineer/narrative';
 type TodoAdded = Event<
   'TodoAdded',
@@ -2066,22 +2044,22 @@ narrative('Todo List Summary', 'TODO-001', () => {
   query('views completion summary', 'SUMMARY-001').server(() => {
     specs('Summary Statistics', () => {
       rule('summary shows overall todo list statistics', 'RULE-SUMMARY', () => {
-        example('calculates summary from multiple todos', () => {
-          given<TodoAdded>({
+        example('calculates summary from multiple todos')
+          .given<TodoAdded>({
             todoId: 'todo-001',
             description: 'Buy groceries',
             status: 'pending',
             addedAt: new Date('2030-01-01T09:00:00.000Z'),
-          });
-          and<TodoAdded>({
+          })
+          .and<TodoAdded>({
             todoId: 'todo-002',
             description: 'Write report',
             status: 'pending',
             addedAt: new Date('2030-01-01T09:10:00.000Z'),
-          });
-          and<TodoMarkedInProgress>({ todoId: 'todo-001', markedAt: new Date('2030-01-01T10:00:00.000Z') });
-          and<TodoMarkedComplete>({ todoId: 'todo-002', completedAt: new Date('2030-01-01T11:00:00.000Z') });
-          then<TodoListSummary>({
+          })
+          .and<TodoMarkedInProgress>({ todoId: 'todo-001', markedAt: new Date('2030-01-01T10:00:00.000Z') })
+          .and<TodoMarkedComplete>({ todoId: 'todo-002', completedAt: new Date('2030-01-01T11:00:00.000Z') })
+          .then<TodoListSummary>({
             summaryId: 'main-summary',
             totalTodos: 2,
             pendingCount: 0,
@@ -2089,7 +2067,6 @@ narrative('Todo List Summary', 'TODO-001', () => {
             completedCount: 1,
             completionPercentage: 50,
           });
-        });
       });
     });
   });