@auto-engineer/server-generator-apollo-emmett 1.55.0 → 1.56.0

package/package.json

@@ -32,8 +32,8 @@
     "uuid": "^11.0.0",
     "web-streams-polyfill": "^4.1.0",
     "zod": "^3.22.4",
-    "@auto-engineer/narrative": "1.55.0",
-    "@auto-engineer/message-bus": "1.55.0"
+    "@auto-engineer/narrative": "1.56.0",
+    "@auto-engineer/message-bus": "1.56.0"
   },
   "publishConfig": {
     "access": "public"
@@ -44,9 +44,9 @@
     "typescript": "^5.8.3",
     "vitest": "^3.2.4",
     "tsx": "^4.19.2",
-    "@auto-engineer/cli": "1.55.0"
+    "@auto-engineer/cli": "1.56.0"
   },
-  "version": "1.55.0",
+  "version": "1.56.0",
   "scripts": {
     "generate:server": "tsx src/cli/index.ts",
     "build": "tsc && tsx ../../scripts/fix-esm-imports.ts && rm -rf dist/src/codegen/templates && mkdir -p dist/src/codegen && cp -r src/codegen/templates dist/src/codegen/templates && cp src/server.ts dist/src && cp -r src/utils dist/src && cp -r src/domain dist/src",

package/src/codegen/scaffoldFromSchema.filter.specs.ts

@@ -47,11 +47,40 @@ const flows: Narrative[] = [
   },
 ];
 
+const makeSliceWithCommand = (name: string, commandName: string): CommandSlice => ({
+  name,
+  type: 'command',
+  client: { specs: [] },
+  server: {
+    description: `Handle ${name}`,
+    specs: [
+      {
+        type: 'gherkin',
+        feature: name,
+        rules: [
+          {
+            name: 'rule',
+            examples: [
+              {
+                name: 'example',
+                steps: [
+                  { keyword: 'When', text: commandName },
+                  { keyword: 'Then', text: `${commandName}Done` },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+});
+
 describe('generateScaffoldFilePlans with affectedSliceIds filter', () => {
   const baseDir = join(tmpdir(), `scaffold-filter-test-${Date.now()}`);
 
   it('generates plans for all slices when no filter is provided', async () => {
-    const plans = await generateScaffoldFilePlans(flows, messages, undefined, baseDir);
+    const { plans } = await generateScaffoldFilePlans(flows, messages, undefined, baseDir);
     const sliceDirs = new Set(plans.map((p) => p.outputPath.split('/').slice(-3, -1).join('/')));
     expect(sliceDirs.has('todo/add-todo')).toBe(true);
     expect(sliceDirs.has('todo/remove-todo')).toBe(true);
@@ -59,9 +88,44 @@ describe('generateScaffoldFilePlans with affectedSliceIds filter', () => {
 
   it('generates plans only for affected slices when filter is provided', async () => {
     const affectedSliceIds = new Set(['todo/add-todo']);
-    const plans = await generateScaffoldFilePlans(flows, messages, undefined, baseDir, affectedSliceIds);
+    const { plans } = await generateScaffoldFilePlans(flows, messages, undefined, baseDir, affectedSliceIds);
     const sliceDirs = new Set(plans.map((p) => p.outputPath.split('/').slice(-3, -1).join('/')));
     expect(sliceDirs.has('todo/add-todo')).toBe(true);
     expect(sliceDirs.has('todo/remove-todo')).toBe(false);
   });
 });
+
+describe('generateScaffoldFilePlans with duplicate command handlers', () => {
+  const baseDir = join(tmpdir(), `scaffold-duplicate-test-${Date.now()}`);
+
+  it('skips register.ts for slices with duplicate command handlers across flows', async () => {
+    const duplicateMessages: Message[] = [
+      { name: 'DoAction', type: 'command', fields: [{ name: 'id', type: 'string', required: true }] },
+      { name: 'DoActionDone', type: 'event', fields: [{ name: 'id', type: 'string', required: true }] },
+    ];
+
+    const duplicateFlows: Narrative[] = [
+      { name: 'FlowA', slices: [makeSliceWithCommand('HandleAction', 'DoAction')] },
+      { name: 'FlowB', slices: [makeSliceWithCommand('ProcessAction', 'DoAction')] },
+    ];
+
+    const result = await generateScaffoldFilePlans(duplicateFlows, duplicateMessages, undefined, baseDir);
+
+    const flowAFiles = result.plans.filter((p) => p.outputPath.includes('flow-a/handle-action'));
+    const flowBFiles = result.plans.filter((p) => p.outputPath.includes('flow-b/process-action'));
+
+    const flowAHasRegister = flowAFiles.some((p) => p.outputPath.endsWith('register.ts'));
+    const flowBHasRegister = flowBFiles.some((p) => p.outputPath.endsWith('register.ts'));
+
+    expect(flowAHasRegister).toBe(true);
+    expect(flowBHasRegister).toBe(false);
+
+    expect(result.duplicateCommands).toEqual([
+      {
+        command: 'DoAction',
+        existingFlow: 'FlowA',
+        existingSlice: 'HandleAction',
+      },
+    ]);
+  });
+});

package/src/codegen/scaffoldFromSchema.ts

@@ -262,6 +262,17 @@ export interface FilePlan {
   contents: string;
 }
 
+export interface DuplicateCommandInfo {
+  command: string;
+  existingFlow: string;
+  existingSlice: string;
+}
+
+export interface ScaffoldResult {
+  plans: FilePlan[];
+  duplicateCommands: DuplicateCommandInfo[];
+}
+
 async function renderTemplate(
   templatePath: string,
   data: Record<string, unknown>,
@@ -724,15 +735,18 @@ async function generateFilesForSlice(
   flows: Narrative[],
   unionToEnumName: Map<string, string>,
   integrations?: Model['integrations'],
-): Promise<FilePlan[]> {
+  registeredCommands?: Map<string, { flowName: string; sliceName: string }>,
+): Promise<{ plans: FilePlan[]; duplicateCommands: DuplicateCommandInfo[] }> {
   debugSlice('Generating files for slice: %s (type: %s)', slice.name, slice.type);
   debugSlice('  Flow: %s', flow.name);
   debugSlice('  Output directory: %s', sliceDir);
 
+  const duplicateCommands: DuplicateCommandInfo[] = [];
+
   const templates = defaultFilesByType[slice.type];
   if (!templates?.length) {
     debugSlice('  No templates found for slice type: %s', slice.type);
-    return [];
+    return { plans: [], duplicateCommands };
   }
   debugSlice('  Found %d templates for slice type', templates.length);
 
@@ -741,7 +755,7 @@ async function generateFilesForSlice(
     !slice.server?.specs?.some((spec) => spec.rules?.some((rule) => rule.examples?.length > 0))
   ) {
     debugSlice('  Skipping react slice with no examples: %s', slice.name);
-    return [];
+    return { plans: [], duplicateCommands };
   }
 
   const extracted = extractMessagesFromSpecs(slice, messages);
@@ -757,6 +771,40 @@ async function generateFilesForSlice(
   annotateEventSources(extracted.events, flows, flow.name, slice.name, slice.type);
   annotateCommandSources(extracted.commands, flows, flow.name, slice.name, slice.type);
 
+  let filteredTemplates = templates;
+
+  if (slice.type === 'command' && registeredCommands) {
+    const commandTypes = extracted.commands.map((c) => c.type);
+    const isDuplicate = commandTypes.some((ct) => registeredCommands.has(ct));
+
+    if (isDuplicate) {
+      for (const ct of commandTypes) {
+        const existing = registeredCommands.get(ct);
+        if (existing) {
+          debugSlice(
+            '  Duplicate command handler detected: %s (already in %s/%s)',
+            ct,
+            existing.flowName,
+            existing.sliceName,
+          );
+          duplicateCommands.push({
+            command: ct,
+            existingFlow: existing.flowName,
+            existingSlice: existing.sliceName,
+          });
+        }
+      }
+      filteredTemplates = templates.filter((t) => t !== 'register.ts.ejs');
+      debugSlice('  Filtered out register.ts.ejs for duplicate command slice');
+    }
+
+    for (const ct of commandTypes) {
+      if (!registeredCommands.has(ct)) {
+        registeredCommands.set(ct, { flowName: flow.name, sliceName: slice.name });
+      }
+    }
+  }
+
   const templateData = await prepareTemplateData(
     slice,
     flow,
@@ -770,12 +818,14 @@ async function generateFilesForSlice(
     integrations,
   );
 
-  debugSlice('  Generating %d files from templates', templates.length);
+  debugSlice('  Generating %d files from templates', filteredTemplates.length);
   const plans = await Promise.all(
-    templates.map((template) => generateFileForTemplate(template, slice, sliceDir, templateData, unionToEnumName)),
+    filteredTemplates.map((template) =>
+      generateFileForTemplate(template, slice, sliceDir, templateData, unionToEnumName),
+    ),
   );
   debugSlice('  Generated %d file plans for slice: %s', plans.length, slice.name);
-  return plans;
+  return { plans, duplicateCommands };
 }
 
 export async function generateScaffoldFilePlans(
@@ -784,7 +834,7 @@ export async function generateScaffoldFilePlans(
   integrations?: Model['integrations'],
   baseDir = 'src/domain/flows',
   affectedSliceIds?: Set<string>,
-): Promise<FilePlan[]> {
+): Promise<ScaffoldResult> {
   debug('Generating scaffold file plans');
   debug('  Number of flows: %d', flows.length);
   debug('  Number of messages: %d', messages?.length ?? 0);
@@ -797,6 +847,8 @@ export async function generateScaffoldFilePlans(
   await appendEnumsToSharedTypes(domainBaseDir, enums);
 
   const allPlans: FilePlan[] = [];
+  const allDuplicateCommands: DuplicateCommandInfo[] = [];
+  const registeredCommands = new Map<string, { flowName: string; sliceName: string }>();
 
   for (const flow of flows) {
     debugFlow('Processing flow: %s', flow.name);
@@ -812,7 +864,7 @@ export async function generateScaffoldFilePlans(
       debugFlow('  Processing slice: %s (type: %s)', slice.name, slice.type);
       const sliceDir = ensureDirPath(flowDir, toKebabCase(slice.name));
       debugFlow('    Slice directory: %s', sliceDir);
-      const plans = await generateFilesForSlice(
+      const { plans, duplicateCommands } = await generateFilesForSlice(
         slice,
         flow,
         sliceDir,
@@ -820,15 +872,17 @@ export async function generateScaffoldFilePlans(
         flows,
         unionToEnumName,
         integrations,
+        registeredCommands,
       );
       debugFlow('    Generated %d plans for slice', plans.length);
       allPlans.push(...plans);
+      allDuplicateCommands.push(...duplicateCommands);
     }
     debugFlow('  Completed flow: %s', flow.name);
   }
 
   debug('Total file plans generated: %d', allPlans.length);
-  return allPlans;
+  return { plans: allPlans, duplicateCommands: allDuplicateCommands };
 }
 
 export async function writeScaffoldFilePlans(plans: FilePlan[]) {
@@ -861,7 +915,7 @@ export async function scaffoldFromSchema(
   debug('  Messages: %d', messages?.length ?? 0);
   debug('  Base directory: %s', baseDir);
 
-  const plans = await generateScaffoldFilePlans(flows, messages, undefined, baseDir);
+  const { plans } = await generateScaffoldFilePlans(flows, messages, undefined, baseDir);
   debug('Generated %d file plans, writing to disk...', plans.length);
 
   await writeScaffoldFilePlans(plans);

package/src/codegen/templates/command/commands.specs.ts

@@ -77,7 +77,7 @@ describe('commands.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const commandFile = plans.find((p) => p.outputPath.endsWith('commands.ts'));
 
     expect(commandFile?.contents).toMatchInlineSnapshot(`

package/src/codegen/templates/command/decide.specs.specs.ts

@@ -96,7 +96,7 @@ describe('spec.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const specFile = plans.find((p) => p.outputPath.endsWith('specs.ts'));
 
     expect(specFile?.contents).toMatchInlineSnapshot(`
@@ -242,7 +242,7 @@ describe('spec.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const specFile = plans.find((p) => p.outputPath.endsWith('specs.ts'));
 
     expect(specFile?.contents).toMatchInlineSnapshot(`
@@ -436,7 +436,7 @@ describe('spec.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const specFile = plans.find((p) => p.outputPath.endsWith('specs.ts'));
 
     expect(specFile?.contents).toMatchInlineSnapshot(`
@@ -596,7 +596,7 @@ describe('spec.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const specFile = plans.find((p) => p.outputPath.endsWith('specs.ts'));
     const contents = specFile?.contents ?? '';
 
@@ -665,7 +665,7 @@ describe('spec.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const decideFile = plans.find((p) => p.outputPath.endsWith('decide.ts'));
     expect(decideFile?.contents).toBeDefined();
 

package/src/codegen/templates/command/decide.specs.ts

@@ -77,7 +77,7 @@ describe('decide.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const decideFile = plans.find((p) => p.outputPath.endsWith('decide.ts'));
 
     expect(decideFile?.contents).toMatchInlineSnapshot(`
@@ -210,7 +210,7 @@ describe('decide.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const decideFile = plans.find((p) => p.outputPath.endsWith('decide.ts'));
 
     expect(decideFile?.contents).toMatchInlineSnapshot(`
@@ -363,7 +363,7 @@ describe('decide.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const decideFile = plans.find((p) => p.outputPath.endsWith('decide.ts'));
 
     expect(decideFile?.contents).toMatchInlineSnapshot(`
@@ -559,7 +559,7 @@ describe('decide.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, spec.integrations);
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, spec.integrations);
     const decideFile = plans.find((p) => p.outputPath.endsWith('decide.ts'));
 
     expect(decideFile?.contents).toMatchInlineSnapshot(`

package/src/codegen/templates/command/events.specs.ts

@@ -98,7 +98,7 @@ describe('events.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const eventFile = plans.find((p) => p.outputPath.endsWith('events.ts'));
 
     expect(eventFile?.contents).toMatchInlineSnapshot(`

package/src/codegen/templates/command/evolve.specs.ts

@@ -77,7 +77,7 @@ describe('evolve.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const evolveFile = plans.find((p) => p.outputPath.endsWith('evolve.ts'));
 
     expect(evolveFile?.contents).toMatchInlineSnapshot(`

package/src/codegen/templates/command/handle.specs.ts

@@ -104,7 +104,7 @@ describe('generateScaffoldFilePlans', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const handleFile = plans.find((p) => p.outputPath.endsWith('handle.ts'));
 
     expect(handleFile?.contents).toMatchInlineSnapshot(`
@@ -282,7 +282,7 @@ describe('generateScaffoldFilePlans', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(
+    const { plans } = await generateScaffoldFilePlans(
       spec.narratives,
       spec.messages,
       spec.integrations,

package/src/codegen/templates/command/mutation.resolver.specs.ts

@@ -77,7 +77,7 @@ describe('mutation.resolver.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const mutationFile = plans.find((p) => p.outputPath.endsWith('mutation.resolver.ts'));
 
     expect(mutationFile?.contents).toMatchInlineSnapshot(`
@@ -225,7 +225,7 @@ describe('mutation.resolver.ts.ejs', () => {
       integrations: [],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const mutationFile = plans.find(
       (p) =>
         p.outputPath.endsWith('mutation.resolver.ts') && p.contents.includes('export class AnswerQuestionResolver'),
@@ -325,7 +325,7 @@ describe('mutation.resolver.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const mutationFile = plans.find(
       (p) =>
         p.outputPath.endsWith('mutation.resolver.ts') && p.contents.includes('export class AddItemsToCartResolver'),
@@ -432,7 +432,7 @@ export class AddItemsToCartResolver {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const mutationFile = plans.find((p) => p.outputPath.endsWith('mutation.resolver.ts'));
 
     expect(mutationFile?.contents).toContain(
@@ -505,7 +505,7 @@ export class AddItemsToCartResolver {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const mutationFile = plans.find(
       (p) => p.outputPath.endsWith('mutation.resolver.ts') && p.contents.includes('export class PlaceOrderResolver'),
     );

package/src/codegen/templates/command/register.specs.ts

@@ -105,7 +105,7 @@ describe('generateScaffoldFilePlans', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const registerFile = plans.find((p) => p.outputPath.endsWith('register.ts'));
 
     expect(registerFile?.contents).toMatchInlineSnapshot(`

package/src/codegen/templates/command/state.specs.ts

@@ -83,7 +83,7 @@ describe('state.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const stateFile = plans.find((p) => p.outputPath.endsWith('state.ts'));
 
     expect(stateFile?.contents).toMatchInlineSnapshot(`

package/src/codegen/templates/query/projection.specs.specs.ts

@@ -192,7 +192,7 @@ describe('projection.specs.ts.ejs', () => {
       ],
     } as SpecsSchema;
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const specFile = plans.find((p) => p.outputPath.endsWith('projection.specs.ts'));
 
     expect(specFile?.contents).toMatchInlineSnapshot(`
@@ -378,7 +378,7 @@ describe('projection.specs.ts.ejs', () => {
       ],
     } as SpecsSchema;
 
-    const plans = await generateScaffoldFilePlans(
+    const { plans } = await generateScaffoldFilePlans(
       questionnaireSpec.narratives,
       questionnaireSpec.messages,
       undefined,
@@ -598,7 +598,7 @@ describe('projection.specs.ts.ejs', () => {
       ],
     } as SpecsSchema;
 
-    const plans = await generateScaffoldFilePlans(
+    const { plans } = await generateScaffoldFilePlans(
       spec.narratives,
       [
         {
@@ -787,7 +787,7 @@ describe('projection.specs.ts.ejs', () => {
       ],
     } as SpecsSchema;
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const specFile = plans.find((p) => p.outputPath.endsWith('view-summary/projection.specs.ts'));
 
     expect(specFile?.contents).toMatchInlineSnapshot(`
@@ -983,7 +983,7 @@ describe('projection.specs.ts.ejs', () => {
       ],
     } as SpecsSchema;
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const specFile = plans.find((p) => p.outputPath.endsWith('view-user-projects/projection.specs.ts'));
 
     expect(specFile?.contents).toMatchInlineSnapshot(`
@@ -1162,7 +1162,7 @@ describe('projection.specs.ts.ejs', () => {
       ],
     } as SpecsSchema;
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const specFile = plans.find((p) => p.outputPath.endsWith('view-workout-history/projection.specs.ts'));
 
     expect(specFile?.contents).toMatchInlineSnapshot(`
@@ -1355,7 +1355,7 @@ describe('projection.specs.ts.ejs', () => {
       ],
     } as SpecsSchema;
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const specFile = plans.find((p) => p.outputPath.endsWith('view-member-stats/projection.specs.ts'));
 
     expect(specFile?.contents).toMatchInlineSnapshot(`
@@ -1541,7 +1541,7 @@ describe('projection.specs.ts.ejs', () => {
       ],
     } as SpecsSchema;
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const projectionFile = plans.find((p) => p.outputPath.endsWith('view-workout-history/projection.ts'));
 
     expect(projectionFile?.contents).toMatchInlineSnapshot(`
@@ -1772,7 +1772,7 @@ describe('projection.specs.ts.ejs', () => {
       ],
     } as SpecsSchema;
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const projectionFile = plans.find((p) => p.outputPath.endsWith('view-items/projection.ts'));
     expect(projectionFile?.contents).toBeDefined();
 
@@ -1960,7 +1960,7 @@ describe('projection.specs.ts.ejs', () => {
       ],
     } as SpecsSchema;
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const projectionFile = plans.find((p) => p.outputPath.endsWith('view-orders/projection.ts'));
     expect(projectionFile?.contents).toBeDefined();
 
@@ -2086,7 +2086,7 @@ describe('projection.specs.ts.ejs', () => {
       ],
     } as SpecsSchema;
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const specFile = plans.find((p) => p.outputPath.endsWith('view-appointments/projection.specs.ts'));
 
     expect(specFile?.contents).toContain("appointmentId: 'appt_789'");

package/src/codegen/templates/query/projection.specs.ts

@@ -213,7 +213,7 @@ describe('projection.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(flows.narratives, flows.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(flows.narratives, flows.messages, undefined, 'src/domain/flows');
     const projectionFile = plans.find((p) => p.outputPath.endsWith('projection.ts'));
 
     expect(projectionFile?.contents).toMatchInlineSnapshot(`
@@ -349,7 +349,7 @@ describe('projection.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const resolverFile = plans.find((p) => p.outputPath.endsWith('query.resolver.ts'));
 
     expect(resolverFile?.contents).toMatchInlineSnapshot(`
@@ -538,7 +538,7 @@ describe('projection.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(flows.narratives, flows.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(flows.narratives, flows.messages, undefined, 'src/domain/flows');
     const projectionFile = plans.find((p) => p.outputPath.endsWith('view-summary/projection.ts'));
 
     expect(projectionFile?.contents).toMatchInlineSnapshot(`
@@ -767,7 +767,7 @@ describe('projection.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(flows.narratives, flows.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(flows.narratives, flows.messages, undefined, 'src/domain/flows');
     const projectionFile = plans.find((p) => p.outputPath.endsWith('view-user-projects/projection.ts'));
 
     expect(projectionFile?.contents).toMatchInlineSnapshot(`
@@ -957,7 +957,7 @@ describe('projection.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(flows.narratives, flows.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(flows.narratives, flows.messages, undefined, 'src/domain/flows');
     const projectionFile = plans.find((p) => p.outputPath.endsWith('view-order-status/projection.ts'));
 
     expect(projectionFile?.contents).not.toContain('number | "pending"');