@auto-engineer/component-implementor-react 1.107.0 → 1.109.0

package/package.json

@@ -6,13 +6,13 @@
   "dependencies": {
     "ai": "^6.0.0",
     "debug": "^4.4.1",
-    "@auto-engineer/message-bus": "1.107.0",
-    "@auto-engineer/model-factory": "1.107.0"
+    "@auto-engineer/message-bus": "1.109.0",
+    "@auto-engineer/model-factory": "1.109.0"
   },
   "devDependencies": {
     "vitest": "^3.2.1"
   },
-  "version": "1.107.0",
+  "version": "1.109.0",
   "publishConfig": {
     "access": "public"
   },

package/src/commands/implement-component.test.ts

@@ -69,11 +69,6 @@ describe('implement-component', () => {
       vi.mocked(runPipeline).mockResolvedValue({
         success: true,
         llmCalls: 4,
-        fixIterations: 1,
-        typeFixIterations: 0,
-        testFixIterations: 0,
-        lintFixIterations: 0,
-        storyFixIterations: 0,
       });
 
       const result = await handleImplementComponent(makeCommand());
@@ -92,6 +87,9 @@ describe('implement-component', () => {
           ],
           targetDir: '/project/client',
           job: makeCommand().data.job,
+          llmCalls: expect.any(Number),
+          attemptNumber: 0,
+          intermediate: true,
         },
         timestamp: expect.any(Date),
         requestId: 'req-1',
@@ -107,11 +105,6 @@ describe('implement-component', () => {
         success: false,
         error: 'Step "Type Fix Loop" failed: errors remain',
         llmCalls: 5,
-        fixIterations: 3,
-        typeFixIterations: 0,
-        testFixIterations: 0,
-        lintFixIterations: 0,
-        storyFixIterations: 0,
       });
 
       const result = await handleImplementComponent(makeCommand());
@@ -134,11 +127,6 @@ describe('implement-component', () => {
       vi.mocked(runPipeline).mockResolvedValue({
         success: true,
         llmCalls: 3,
-        fixIterations: 0,
-        typeFixIterations: 0,
-        testFixIterations: 0,
-        lintFixIterations: 0,
-        storyFixIterations: 0,
       });
 
       const command = makeCommand({
@@ -195,11 +183,6 @@ describe('implement-component', () => {
       vi.mocked(runPipeline).mockResolvedValue({
         success: true,
         llmCalls: 4,
-        fixIterations: 1,
-        typeFixIterations: 0,
-        testFixIterations: 0,
-        lintFixIterations: 0,
-        storyFixIterations: 0,
       });
 
       const command = {
@@ -237,11 +220,6 @@ describe('implement-component', () => {
       vi.mocked(runPipeline).mockResolvedValue({
         success: true,
         llmCalls: 2,
-        fixIterations: 0,
-        typeFixIterations: 0,
-        testFixIterations: 0,
-        lintFixIterations: 0,
-        storyFixIterations: 0,
       });
 
       const command = {
@@ -283,11 +261,6 @@ describe('implement-component', () => {
       vi.mocked(runPipeline).mockResolvedValue({
         success: true,
         llmCalls: 4,
-        fixIterations: 0,
-        typeFixIterations: 0,
-        testFixIterations: 0,
-        lintFixIterations: 0,
-        storyFixIterations: 0,
       });
 
       const command = makeCommand({
@@ -323,6 +296,9 @@ describe('implement-component', () => {
           ]),
           targetDir: '/project/client',
           job: command.data.job,
+          llmCalls: expect.any(Number),
+          attemptNumber: 0,
+          intermediate: true,
         },
         timestamp: expect.any(Date),
         requestId: 'req-1',
@@ -335,11 +311,6 @@ describe('implement-component', () => {
       vi.mocked(runPipeline).mockResolvedValue({
         success: true,
         llmCalls: 2,
-        fixIterations: 0,
-        typeFixIterations: 0,
-        testFixIterations: 0,
-        lintFixIterations: 0,
-        storyFixIterations: 0,
       });
 
       await handleImplementComponent(makeCommand());
@@ -360,7 +331,6 @@ describe('implement-component', () => {
           },
           isModify: false,
           llmCalls: 0,
-          fixIterations: 0,
         }),
       );
     });
@@ -377,11 +347,6 @@ describe('implement-component', () => {
       vi.mocked(runPipeline).mockResolvedValue({
         success: true,
         llmCalls: 0,
-        fixIterations: 0,
-        typeFixIterations: 0,
-        testFixIterations: 0,
-        lintFixIterations: 0,
-        storyFixIterations: 0,
       });
 
       const result = await commandHandler.handle(makeCommand());
@@ -396,11 +361,6 @@ describe('implement-component', () => {
       vi.mocked(runPipeline).mockResolvedValue({
         success: true,
         llmCalls: 0,
-        fixIterations: 0,
-        typeFixIterations: 0,
-        testFixIterations: 0,
-        lintFixIterations: 0,
-        storyFixIterations: 0,
       });
 
       const command = makeCommand({
@@ -439,11 +399,6 @@ describe('implement-component', () => {
       vi.mocked(runPipeline).mockResolvedValue({
         success: true,
         llmCalls: 1,
-        fixIterations: 0,
-        typeFixIterations: 0,
-        testFixIterations: 0,
-        lintFixIterations: 0,
-        storyFixIterations: 0,
       });
 
       const command = makeCommand({
@@ -481,11 +436,6 @@ describe('implement-component', () => {
       vi.mocked(runPipeline).mockResolvedValue({
         success: true,
         llmCalls: 1,
-        fixIterations: 0,
-        typeFixIterations: 0,
-        testFixIterations: 0,
-        lintFixIterations: 0,
-        storyFixIterations: 0,
       });
 
       const command = makeCommand({
@@ -522,11 +472,6 @@ describe('implement-component', () => {
       vi.mocked(runPipeline).mockResolvedValue({
         success: false,
         llmCalls: 0,
-        fixIterations: 0,
-        typeFixIterations: 0,
-        testFixIterations: 0,
-        lintFixIterations: 0,
-        storyFixIterations: 0,
       });
 
       const result = await handleImplementComponent(makeCommand());
@@ -566,11 +511,6 @@ describe('implement-component', () => {
       vi.mocked(runPipeline).mockResolvedValue({
         success: true,
         llmCalls: 0,
-        fixIterations: 0,
-        typeFixIterations: 0,
-        testFixIterations: 0,
-        lintFixIterations: 0,
-        storyFixIterations: 0,
       });
 
       const command = makeCommand({

package/src/commands/implement-component.ts

@@ -67,6 +67,9 @@ export type ComponentImplementedEvent = Event<
     filesCreated: string[];
     targetDir: string;
     job: ComponentJob;
+    llmCalls: number;
+    attemptNumber: number;
+    intermediate?: boolean;
   }
 >;
 
@@ -130,37 +133,13 @@ function buildPipelineConfig(): PipelineConfig {
         process.env.IMPL_MODEL ??
         process.env.CUSTOM_PROVIDER_DEFAULT_MODEL ??
         '',
-      typeFixer:
-        process.env.STEP_TYPE_FIXER_MODEL ??
-        process.env.IMPL_FIXER_MODEL ??
-        process.env.IMPL_MODEL ??
-        process.env.CUSTOM_PROVIDER_DEFAULT_MODEL ??
-        '',
-      testFixer:
-        process.env.STEP_TEST_FIXER_MODEL ??
-        process.env.IMPL_FIXER_MODEL ??
-        process.env.IMPL_MODEL ??
-        process.env.CUSTOM_PROVIDER_DEFAULT_MODEL ??
-        '',
-      lintFixer:
-        process.env.STEP_LINT_FIXER_MODEL ??
-        process.env.IMPL_FIXER_MODEL ??
-        process.env.IMPL_MODEL ??
-        process.env.CUSTOM_PROVIDER_DEFAULT_MODEL ??
-        '',
-      storyFixer:
-        process.env.STEP_STORY_FIXER_MODEL ??
+      fixer:
+        process.env.STEP_FIXER_MODEL ??
         process.env.IMPL_FIXER_MODEL ??
         process.env.IMPL_MODEL ??
         process.env.CUSTOM_PROVIDER_DEFAULT_MODEL ??
         '',
     },
-    maxTypeFixIterations: 3,
-    maxTestFixIterations: 3,
-    maxLintFixIterations: 2,
-    maxStoryFixIterations: 2,
-    enableStorybookTest: process.env.ENABLE_STORYBOOK_TEST === 'true',
-    enableVisualTest: process.env.ENABLE_VISUAL_TEST === 'true',
   };
 }
 
@@ -169,10 +148,7 @@ function createPipelineModels(): PipelineModels {
   return {
     generateTest: model,
     generateComponent: model,
-    typeFixer: model,
-    testFixer: model,
-    lintFixer: model,
-    storyFixer: model,
+    fixer: model,
   };
 }
 
@@ -209,6 +185,9 @@ export async function handleImplementComponent(
 
     await mkdir(path.dirname(testPath), { recursive: true });
 
+    const attemptNumber = command.data.context?.attemptNumber ?? 0;
+    const errorFeedback = command.data.context?.previousOutputs;
+
     const ctx: PipelineContext = {
       componentName,
       componentPath,
@@ -225,11 +204,8 @@ export async function handleImplementComponent(
       isModify,
       storyVariants: payload.storyVariants,
       llmCalls: 0,
-      fixIterations: 0,
-      typeFixIterations: 0,
-      testFixIterations: 0,
-      lintFixIterations: 0,
-      storyFixIterations: 0,
+      errorFeedback,
+      attemptNumber,
     };
 
     const config = buildPipelineConfig();
@@ -240,12 +216,7 @@ export async function handleImplementComponent(
     const result = await runPipeline(steps, ctx);
 
     if (!result.success) {
-      debug(
-        'Pipeline failed: %s (LLM calls: %d, fix iterations: %d)',
-        result.error,
-        result.llmCalls,
-        result.fixIterations,
-      );
+      debug('Pipeline failed: %s (LLM calls: %d)', result.error, result.llmCalls);
       return {
         type: 'ComponentImplementationFailed',
         data: { error: result.error ?? 'Pipeline failed', name: componentName },
@@ -255,12 +226,7 @@ export async function handleImplementComponent(
       };
     }
 
-    debug(
-      'Pipeline succeeded for %s (LLM calls: %d, fix iterations: %d)',
-      componentName,
-      result.llmCalls,
-      result.fixIterations,
-    );
+    debug('Pipeline succeeded for %s (LLM calls: %d)', componentName, result.llmCalls);
 
     return {
       type: 'ComponentImplemented',
@@ -272,6 +238,9 @@ export async function handleImplementComponent(
         filesCreated: [testPath, componentPath, storyPath],
         targetDir,
         job,
+        llmCalls: result.llmCalls,
+        attemptNumber,
+        intermediate: true,
       },
       timestamp: new Date(),
       requestId: command.requestId,

package/src/pipeline/run-pipeline.test.ts

@@ -7,26 +7,11 @@ vi.mock('./steps/generate-test', () => ({
 vi.mock('./steps/generate-component', () => ({
   generateComponentStep: vi.fn(async () => ({ success: true })),
 }));
-vi.mock('./steps/type-fix-loop', () => ({
-  typeFixLoop: vi.fn(async () => ({ success: true })),
-}));
-vi.mock('./steps/test-fix-loop', () => ({
-  testFixLoop: vi.fn(async () => ({ success: true })),
-}));
-vi.mock('./steps/lint-fix-loop', () => ({
-  lintFixLoop: vi.fn(async () => ({ success: true })),
-}));
 vi.mock('./steps/generate-story', () => ({
   generateStoryStep: vi.fn(async () => ({ success: true })),
 }));
-vi.mock('./steps/story-fix-loop', () => ({
-  storyFixLoop: vi.fn(async () => ({ success: true })),
-}));
-vi.mock('./steps/storybook-test', () => ({
-  storybookTestStep: vi.fn(async () => ({ success: true })),
-}));
-vi.mock('./steps/visual-test', () => ({
-  visualTestStep: vi.fn(async () => ({ success: true })),
+vi.mock('./steps/fix-from-feedback', () => ({
+  fixFromFeedbackStep: vi.fn(async () => ({ success: true })),
 }));
 
 import {
@@ -37,15 +22,10 @@ import {
   type PipelineStep,
   runPipeline,
 } from './run-pipeline';
+import { fixFromFeedbackStep } from './steps/fix-from-feedback';
 import { generateComponentStep } from './steps/generate-component';
 import { generateStoryStep } from './steps/generate-story';
 import { generateTestStep } from './steps/generate-test';
-import { lintFixLoop } from './steps/lint-fix-loop';
-import { storyFixLoop } from './steps/story-fix-loop';
-import { storybookTestStep } from './steps/storybook-test';
-import { testFixLoop } from './steps/test-fix-loop';
-import { typeFixLoop } from './steps/type-fix-loop';
-import { visualTestStep } from './steps/visual-test';
 
 afterEach(() => {
   vi.clearAllMocks();
@@ -64,19 +44,11 @@ function makeCtx(overrides: Partial<PipelineContext> = {}): PipelineContext {
     composes: [],
     isModify: false,
     llmCalls: 0,
-    fixIterations: 0,
-    typeFixIterations: 0,
-    testFixIterations: 0,
-    lintFixIterations: 0,
-    storyFixIterations: 0,
+    attemptNumber: 0,
     ...overrides,
   };
 }
 
-function successStep(name: string): PipelineStep {
-  return { name, run: async () => ({ success: true }) };
-}
-
 function failStep(name: string, error: string): PipelineStep {
   return { name, run: async () => ({ success: false, error }) };
 }
@@ -113,11 +85,6 @@ describe('runPipeline', () => {
     expect(result).toEqual({
       success: true,
       llmCalls: 0,
-      fixIterations: 0,
-      typeFixIterations: 0,
-      testFixIterations: 0,
-      lintFixIterations: 0,
-      storyFixIterations: 0,
     });
     expect(executionOrder).toEqual(['A', 'B', 'C']);
   });
@@ -148,11 +115,6 @@ describe('runPipeline', () => {
       success: false,
       error: 'Step "Step B" failed: something broke',
       llmCalls: 0,
-      fixIterations: 0,
-      typeFixIterations: 0,
-      testFixIterations: 0,
-      lintFixIterations: 0,
-      storyFixIterations: 0,
     });
     expect(executionOrder).toEqual(['A']);
   });
@@ -163,34 +125,24 @@ describe('runPipeline', () => {
     expect(result).toEqual({
       success: true,
       llmCalls: 0,
-      fixIterations: 0,
-      typeFixIterations: 0,
-      testFixIterations: 0,
-      lintFixIterations: 0,
-      storyFixIterations: 0,
     });
   });
 
-  it('reports accumulated llmCalls and fixIterations from context', async () => {
+  it('reports accumulated llmCalls from context', async () => {
     const steps: PipelineStep[] = [{ name: 'Step A', run: async () => ({ success: true }) }];
-    const ctx = makeCtx({ llmCalls: 5, fixIterations: 3 });
+    const ctx = makeCtx({ llmCalls: 5 });
 
     const result = await runPipeline(steps, ctx);
 
     expect(result).toEqual({
       success: true,
       llmCalls: 5,
-      fixIterations: 3,
-      typeFixIterations: 0,
-      testFixIterations: 0,
-      lintFixIterations: 0,
-      storyFixIterations: 0,
     });
   });
 
   it('reports context metrics on failure', async () => {
     const steps: PipelineStep[] = [failStep('Broken', 'oops')];
-    const ctx = makeCtx({ llmCalls: 2, fixIterations: 1 });
+    const ctx = makeCtx({ llmCalls: 2 });
 
     const result = await runPipeline(steps, ctx);
 
@@ -198,11 +150,6 @@ describe('runPipeline', () => {
       success: false,
       error: 'Step "Broken" failed: oops',
       llmCalls: 2,
-      fixIterations: 1,
-      typeFixIterations: 0,
-      testFixIterations: 0,
-      lintFixIterations: 0,
-      storyFixIterations: 0,
     });
   });
 });
@@ -213,101 +160,37 @@ function makeModels(): PipelineModels {
   return {
     generateTest: fakeModel,
     generateComponent: fakeModel,
-    typeFixer: fakeModel,
-    testFixer: fakeModel,
-    lintFixer: fakeModel,
-    storyFixer: fakeModel,
+    fixer: fakeModel,
   };
 }
 
-function makeConfig(overrides: Partial<PipelineConfig> = {}): PipelineConfig {
+function makeConfig(): PipelineConfig {
   return {
     models: {
       generateTest: '',
       generateComponent: '',
-      typeFixer: '',
-      testFixer: '',
-      lintFixer: '',
-      storyFixer: '',
+      fixer: '',
     },
-    maxTypeFixIterations: 3,
-    maxTestFixIterations: 3,
-    maxLintFixIterations: 2,
-    maxStoryFixIterations: 2,
-    enableStorybookTest: false,
-    enableVisualTest: false,
-    ...overrides,
   };
 }
 
 describe('buildPipelineSteps', () => {
-  it('returns 7 core steps by default', () => {
+  it('returns 3 core steps for first attempt', () => {
     const steps = buildPipelineSteps(makeModels(), makeConfig(), makeCtx());
 
-    expect(steps.map((s) => s.name)).toEqual([
-      'Generate Test',
-      'Generate Component',
-      'Type Fix Loop',
-      'Test Fix Loop',
-      'Lint Fix Loop',
-      'Generate Story',
-      'Story Fix Loop',
-    ]);
+    expect(steps.map((s) => s.name)).toEqual(['Generate Test', 'Generate Component', 'Generate Story']);
   });
 
-  it('adds Storybook Test step when enabled', () => {
-    const steps = buildPipelineSteps(makeModels(), makeConfig({ enableStorybookTest: true }), makeCtx());
-
-    expect(steps.map((s) => s.name)).toEqual([
-      'Generate Test',
-      'Generate Component',
-      'Type Fix Loop',
-      'Test Fix Loop',
-      'Lint Fix Loop',
-      'Generate Story',
-      'Story Fix Loop',
-      'Storybook Test',
-    ]);
-  });
-
-  it('adds Visual Test step when enabled', () => {
-    const steps = buildPipelineSteps(makeModels(), makeConfig({ enableVisualTest: true }), makeCtx());
-
-    expect(steps.map((s) => s.name)).toEqual([
-      'Generate Test',
-      'Generate Component',
-      'Type Fix Loop',
-      'Test Fix Loop',
-      'Lint Fix Loop',
-      'Generate Story',
-      'Story Fix Loop',
-      'Visual Test',
-    ]);
-  });
+  it('returns fix + story steps for retry attempt', () => {
+    const ctx = makeCtx({ attemptNumber: 1, errorFeedback: 'Test failed: expected X to equal Y' });
+    const steps = buildPipelineSteps(makeModels(), makeConfig(), ctx);
 
-  it('adds both optional steps when both enabled', () => {
-    const steps = buildPipelineSteps(
-      makeModels(),
-      makeConfig({ enableStorybookTest: true, enableVisualTest: true }),
-      makeCtx(),
-    );
-
-    expect(steps.map((s) => s.name)).toEqual([
-      'Generate Test',
-      'Generate Component',
-      'Type Fix Loop',
-      'Test Fix Loop',
-      'Lint Fix Loop',
-      'Generate Story',
-      'Story Fix Loop',
-      'Storybook Test',
-      'Visual Test',
-    ]);
+    expect(steps.map((s) => s.name)).toEqual(['Fix From Feedback', 'Generate Story']);
   });
 
-  it('wires each step to its corresponding function', async () => {
+  it('wires each step to its corresponding function on first attempt', async () => {
     const models = makeModels();
-    const config = makeConfig({ enableStorybookTest: true, enableVisualTest: true });
+    const config = makeConfig();
     const ctx = makeCtx();
     const steps = buildPipelineSteps(models, config, ctx);
 
@@ -317,12 +200,20 @@ describe('buildPipelineSteps', () => {
 
     expect(generateTestStep).toHaveBeenCalledWith(models.generateTest, ctx);
     expect(generateComponentStep).toHaveBeenCalledWith(models.generateComponent, ctx);
-    expect(typeFixLoop).toHaveBeenCalledWith(models.typeFixer, ctx, 3);
-    expect(testFixLoop).toHaveBeenCalledWith(models.testFixer, ctx, 3);
-    expect(lintFixLoop).toHaveBeenCalledWith(models.lintFixer, ctx, 2);
     expect(generateStoryStep).toHaveBeenCalledWith(ctx);
-    expect(storyFixLoop).toHaveBeenCalledWith(models.storyFixer, ctx, 2);
-    expect(storybookTestStep).toHaveBeenCalledWith(ctx, true);
-    expect(visualTestStep).toHaveBeenCalled();
+  });
+
+  it('wires fix step on retry attempt', async () => {
+    const models = makeModels();
+    const config = makeConfig();
+    const ctx = makeCtx({ attemptNumber: 1, errorFeedback: 'Some error' });
+    const steps = buildPipelineSteps(models, config, ctx);
+
+    for (const step of steps) {
+      await step.run();
+    }
+
+    expect(fixFromFeedbackStep).toHaveBeenCalledWith(models.fixer, ctx);
+    expect(generateStoryStep).toHaveBeenCalledWith(ctx);
   });
 });