wiggum-cli 0.3.2 → 0.4.0

package/dist/utils/tracing.js.map

@@ -1 +1 @@
-{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/utils/tracing.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAEzB,6BAA6B;AAC7B,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7D;;GAEG;AACH,IAAI,iBAAiB,GAAG,KAAK,CAAC;AAE9B,MAAM,UAAU,WAAW;IACzB,IAAI,iBAAiB;QAAE,OAAO;IAE9B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;IAC9C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,sCAAsC;QACtC,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,UAAU,CAAC;YACT,MAAM;YACN,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,YAAY;SACjE,CAAC,CAAC;QACH,iBAAiB,GAAG,IAAI,CAAC;IAC3B,CAAC;IAAC,MAAM,CAAC;QACP,gDAAgD;IAClD,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB;IAC9B,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;AAC1C,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,WAAW;IACzB,WAAW,EAAE,CAAC;IAEd,IAAI,gBAAgB,EAAE,EAAE,CAAC;QACvB,OAAO,SAAS,CAAC,EAAE,CAAC,CAAC;IACvB,CAAC;IAED,0DAA0D;IAC1D,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,WAAW,CACzB,EAAK,EACL,UAA4C,EAAE;IAE9C,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;QACxB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAC7C,OAAO,UAAU,CAAC,EAAE,EAAE;QACpB,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,UAAU;QAChC,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,IAAI,IAAI,WAAW;KAC7C,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/utils/tracing.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,IAAI,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAEzB,6BAA6B;AAC7B,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7D;;GAEG;AACH,IAAI,iBAAiB,GAAG,KAAK,CAAC;AAC9B,IAAI,sBAAsB,GAAG,KAAK,CAAC;AAEnC,MAAM,UAAU,WAAW;IACzB,IAAI,iBAAiB;QAAE,OAAO;IAE9B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;IAC9C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,sCAAsC;QACtC,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,UAAU,CAAC;YACT,MAAM;YACN,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,YAAY;SACjE,CAAC,CAAC;QACH,iBAAiB,GAAG,IAAI,CAAC;QAEzB,6DAA6D;QAC7D,oBAAoB,EAAE,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,gDAAgD;IAClD,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAS,oBAAoB;IAC3B,IAAI,sBAAsB;QAAE,OAAO;IACnC,sBAAsB,GAAG,IAAI,CAAC;IAE9B,uBAAuB;IACvB,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAClC,MAAM,YAAY,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,2BAA2B;IAC3B,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QAC9B,MAAM,YAAY,EAAE,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,mBAAmB;IACnB,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;QAC/B,MAAM,YAAY,EAAE,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY;IAChC,IAAI,CAAC,iBAAiB;QAAE,OAAO;IAE/B,IAAI,CAAC;QACH,MAAM,eAAe,EAAE,CAAC;IAC1B,CAAC;IAAC,MAAM,CAAC;QACP,+BAA+B;IACjC,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB;IAC9B,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;AAC1C,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,WAAW;IACzB,WAAW,EAAE,CAAC;IAEd,IAAI,gBAAgB,EAAE,EAAE,CAAC;QACvB,OAAO,SAAS,CAAC,EAAE,CAAC,CAAC;IACvB,CAAC;IAED,0DAA0D;IAC1D,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,WAAW,CACzB,EAAK,EACL,UAA4C,EAAE;IAE9C,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;QACxB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAC7C,OAAO,UAAU,CAAC,EAAE,EAAE;QACpB,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,UAAU;QAChC,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,IAAI,IAAI,WAAW;KAC7C,CAAC,CAAC;AACL,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiggum-cli",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "AI-powered feature development loop CLI",
   "type": "module",
   "main": "dist/index.js",
@@ -12,6 +12,8 @@
     "copy-templates": "cp -r src/templates dist/",
     "dev": "tsc --watch",
     "start": "node bin/ralph.js",
+    "test": "vitest run",
+    "test:watch": "vitest",
     "prepublishOnly": "npm run build"
   },
   "keywords": [
@@ -39,7 +41,8 @@
   },
   "devDependencies": {
     "@types/node": "^20.10.0",
-    "typescript": "^5.3.0"
+    "typescript": "^5.3.0",
+    "vitest": "^4.0.17"
   },
   "engines": {
     "node": ">=18.0.0"

package/src/ai/agents/codebase-analyst.ts

@@ -1,6 +1,9 @@
 /**
  * Codebase Analyst Agent
  * Explores the codebase to understand its structure and patterns
+ *
+ * @deprecated Use runContextEnricher from context-enricher.ts instead.
+ * This agent is kept for backward compatibility.
  */
 
 import { stepCountIs, type LanguageModel } from 'ai';

package/src/ai/agents/context-enricher.ts

@@ -0,0 +1,189 @@
+/**
+ * Context Enricher Worker (Phase 2)
+ * Explores the codebase to gather enriched context based on the analysis plan
+ */
+
+import { stepCountIs, type LanguageModel } from 'ai';
+import type { ContextEnricherInput, EnrichedContext } from './types.js';
+import { createExplorationTools } from '../tools.js';
+import { isReasoningModel } from '../providers.js';
+import { logger } from '../../utils/logger.js';
+import { parseJsonSafe } from '../../utils/json-repair.js';
+import { getTracedAI } from '../../utils/tracing.js';
+import { detectProjectType } from './stack-utils.js';
+
+/**
+ * System prompt for the Context Enricher worker
+ */
+const CONTEXT_ENRICHER_SYSTEM_PROMPT = `You are a Context Enricher worker. Your job is to explore specific areas of a codebase and answer specific questions.
+
+## Your Mission
+Based on the analysis plan, explore the codebase to:
+1. Identify entry points and key files
+2. Understand directory structure and purposes
+3. Detect naming conventions
+4. Find available commands (from package.json)
+5. Answer the specific questions provided
+
+## Tools Available
+- searchCode: Search using ripgrep patterns
+- readFile: Read file contents
+- listDirectory: List directory structure
+- getPackageInfo: Get package.json info
+
+## Exploration Strategy
+1. List the areas specified in the plan
+2. Read package.json to understand scripts and dependencies
+3. Search for patterns to answer the specific questions
+4. Identify the project type based on structure
+
+## Project Types
+- MCP Server: Has @modelcontextprotocol dependencies
+- REST API: Express/Fastify/Hono with route handlers
+- React SPA: React with components, no server-side rendering
+- Next.js App: Next.js with app or pages directory
+- CLI Tool: Has bin entry in package.json
+- Library: Published package without app entry
+
+## Output Format
+After exploration, output ONLY valid JSON:
+{
+  "entryPoints": ["src/index.ts"],
+  "keyDirectories": {"src/routes": "API routes", "src/components": "UI components"},
+  "namingConventions": "camelCase files, PascalCase components",
+  "commands": {"test": "npm test", "build": "npm run build"},
+  "answeredQuestions": {"What is the auth strategy?": "NextAuth with JWT"},
+  "projectType": "Next.js App"
+}`;
+
+/**
+ * Run the Context Enricher worker
+ */
+export async function runContextEnricher(
+  model: LanguageModel,
+  modelId: string,
+  input: ContextEnricherInput,
+  verbose: boolean = false
+): Promise<EnrichedContext> {
+  const tools = createExplorationTools(input.scanResult.projectRoot);
+
+  const prompt = `Explore this codebase and gather enriched context.
+
+Project: ${input.scanResult.projectRoot}
+
+## Areas to Explore
+${input.areasToExplore.map(a => `- ${a}`).join('\n')}
+
+## Questions to Answer
+${input.questionsToAnswer.map(q => `- ${q}`).join('\n')}
+
+Start by exploring the specified areas, then answer the questions and produce your analysis as JSON.`;
+
+  try {
+    const { generateText } = getTracedAI();
+
+    const result = await generateText({
+      model,
+      system: CONTEXT_ENRICHER_SYSTEM_PROMPT,
+      prompt,
+      tools,
+      stopWhen: stepCountIs(5),
+      maxOutputTokens: 3000,
+      ...(isReasoningModel(modelId) ? {} : { temperature: 0.3 }),
+      experimental_telemetry: {
+        isEnabled: true,
+        metadata: {
+          agent: 'context-enricher',
+          projectRoot: input.scanResult.projectRoot,
+          areasCount: input.areasToExplore.length,
+          questionsCount: input.questionsToAnswer.length,
+        },
+      },
+    });
+
+    // Parse the response
+    const context = parseEnrichedContext(result.text, result.steps, verbose);
+
+    if (verbose) {
+      logger.info(`Context Enricher: Found ${context.entryPoints.length} entry points, answered ${Object.keys(context.answeredQuestions).length} questions`);
+    }
+
+    return context;
+  } catch (error) {
+    if (verbose) {
+      logger.error(`Context Enricher error: ${error instanceof Error ? error.message : String(error)}`);
+    }
+
+    return getDefaultEnrichedContext(input);
+  }
+}
+
+/**
+ * Parse the enriched context from agent response
+ */
+function parseEnrichedContext(
+  text: string,
+  steps: Array<{ text?: string }> | undefined,
+  verbose: boolean
+): EnrichedContext {
+  // Try to get text from the result or steps
+  let textToParse = text;
+
+  if (!textToParse || textToParse.trim() === '') {
+    const stepsList = steps || [];
+    for (let i = stepsList.length - 1; i >= 0; i--) {
+      const step = stepsList[i];
+      if (step.text && step.text.trim() !== '') {
+        textToParse = step.text;
+        break;
+      }
+    }
+  }
+
+  if (!textToParse || textToParse.trim() === '') {
+    if (verbose) {
+      logger.warn('Context Enricher: No text output found');
+    }
+    return getDefaultEnrichedContext();
+  }
+
+  // Use safe JSON parser with repair capabilities
+  const parsed = parseJsonSafe<Partial<EnrichedContext>>(textToParse);
+
+  if (!parsed) {
+    if (verbose) {
+      logger.warn('Context Enricher: Failed to parse JSON response');
+    }
+    return getDefaultEnrichedContext();
+  }
+
+  // Build result with defaults for missing fields
+  return {
+    entryPoints: parsed.entryPoints || ['src/index.ts'],
+    keyDirectories: parsed.keyDirectories || { src: 'Source code' },
+    namingConventions: parsed.namingConventions || 'camelCase',
+    commands: parsed.commands || { build: 'npm run build' },
+    answeredQuestions: parsed.answeredQuestions || {},
+    projectType: parsed.projectType || 'Unknown',
+  };
+}
+
+/**
+ * Get default enriched context when parsing fails
+ */
+function getDefaultEnrichedContext(input?: ContextEnricherInput): EnrichedContext {
+  const projectType = detectProjectType(input?.scanResult.stack);
+
+  return {
+    entryPoints: ['src/index.ts'],
+    keyDirectories: { src: 'Source code' },
+    namingConventions: 'camelCase',
+    commands: {
+      test: 'npm test',
+      build: 'npm run build',
+      dev: 'npm run dev',
+    },
+    answeredQuestions: {},
+    projectType,
+  };
+}

package/src/ai/agents/evaluator-optimizer.ts

@@ -0,0 +1,277 @@
+/**
+ * Evaluator-Optimizer Agent (Phase 4)
+ * QA loop that validates and improves the analysis result
+ * Max 2 iterations to ensure quality without endless loops
+ */
+
+import { type LanguageModel } from 'ai';
+import { z } from 'zod';
+import type { ScanResult } from '../../scanner/types.js';
+import type { MultiAgentAnalysis, EvaluationResult } from './types.js';
+import { isReasoningModel } from '../providers.js';
+import { logger } from '../../utils/logger.js';
+import { getTracedAI } from '../../utils/tracing.js';
+
+/**
+ * Quality threshold for passing evaluation (1-10 scale)
+ * Results with score >= this value skip optimization
+ */
+const QUALITY_THRESHOLD = 7;
+
+/**
+ * Schema for evaluation output
+ */
+const evaluationSchema = z.object({
+  qualityScore: z.number().min(1).max(10).describe('Overall quality score from 1-10'),
+  hasEntryPoints: z.boolean().describe('Whether entry points are identified'),
+  hasImplementationGuidelines: z.boolean().describe('Whether implementation guidelines are provided'),
+  hasRelevantMcpServers: z.boolean().describe('Whether relevant MCP servers are recommended'),
+  specificIssues: z.array(z.string()).describe('Specific issues found in the analysis'),
+  improvementSuggestions: z.array(z.string()).describe('Suggestions for improving the analysis'),
+});
+
+/**
+ * Schema for optimizer output
+ */
+const optimizerOutputSchema = z.object({
+  improvedGuidelines: z.array(z.string()).describe('Improved implementation guidelines'),
+  additionalEntryPoints: z.array(z.string()).optional().describe('Additional entry points to add'),
+  additionalMcpServers: z.array(z.string()).optional().describe('Additional MCP servers to recommend'),
+});
+
+/**
+ * System prompt for the Evaluator
+ */
+const EVALUATOR_SYSTEM_PROMPT = `You are a QA Evaluator for AI-generated codebase analysis.
+
+## Your Mission
+Evaluate the analysis result for:
+1. Completeness - Are all important areas covered?
+2. Accuracy - Do the recommendations match the detected stack?
+3. Actionability - Are the guidelines specific and useful?
+4. MCP relevance - Are the right MCP servers recommended?
+
+## Scoring Guidelines
+- 9-10: Excellent, comprehensive, highly actionable
+- 7-8: Good, covers main areas, useful guidelines
+- 5-6: Adequate but missing some important details
+- 3-4: Incomplete, vague, or partially incorrect
+- 1-2: Poor, missing critical information
+
+## Quality Checks
+- Entry points should identify actual files, not just "src/"
+- Guidelines should be specific (e.g., "Run npm test" not "Test your code")
+- MCP servers should match the detected database and deployment
+
+Be constructive but honest. If it's good, say so. If it needs work, explain why.`;
+
+/**
+ * System prompt for the Optimizer
+ */
+const OPTIMIZER_SYSTEM_PROMPT = `You are an Optimizer that improves AI-generated codebase analysis based on evaluation feedback.
+
+## Your Mission
+Based on the evaluation feedback, improve:
+1. Implementation guidelines - make them more specific and actionable
+2. Entry points - add any obvious ones that were missed
+3. MCP servers - add any that would be useful
+
+## Guidelines for Improvement
+- Keep guidelines to 5-10 words
+- Start with action verbs
+- Be specific to the detected stack
+- Don't remove good content, only add or improve`;
+
+/**
+ * Run the Evaluator-Optimizer QA loop
+ */
+export async function runEvaluatorOptimizer(
+  model: LanguageModel,
+  modelId: string,
+  result: MultiAgentAnalysis,
+  scanResult: ScanResult,
+  maxIterations: number = 2,
+  verbose: boolean = false
+): Promise<MultiAgentAnalysis> {
+  let currentResult = result;
+  let iterations = 0;
+
+  while (iterations < maxIterations) {
+    // Evaluate current result
+    const evaluation = await evaluateResult(model, modelId, currentResult, scanResult, verbose);
+
+    if (verbose) {
+      logger.info(`Evaluator (iteration ${iterations + 1}): Score ${evaluation.qualityScore}/10`);
+      if (evaluation.specificIssues.length > 0) {
+        logger.info(`Issues: ${evaluation.specificIssues.join(', ')}`);
+      }
+    }
+
+    // Check if quality meets threshold
+    if (
+      evaluation.qualityScore >= QUALITY_THRESHOLD &&
+      evaluation.hasEntryPoints &&
+      evaluation.hasImplementationGuidelines
+    ) {
+      if (verbose) {
+        logger.info('Evaluator: Quality threshold met, skipping optimization');
+      }
+      break;
+    }
+
+    // Optimize based on feedback
+    if (verbose) {
+      logger.info('Evaluator: Running optimizer to improve result');
+    }
+
+    currentResult = await optimizeResult(model, modelId, currentResult, evaluation, verbose);
+    iterations++;
+  }
+
+  return currentResult;
+}
+
+/**
+ * Evaluate the analysis result
+ */
+async function evaluateResult(
+  model: LanguageModel,
+  modelId: string,
+  result: MultiAgentAnalysis,
+  scanResult: ScanResult,
+  verbose: boolean
+): Promise<EvaluationResult> {
+  const prompt = `Evaluate this codebase analysis:
+
+## Analysis Result
+Project Type: ${result.codebaseAnalysis.projectContext.projectType}
+Entry Points: ${result.codebaseAnalysis.projectContext.entryPoints.join(', ') || 'None'}
+Key Directories: ${Object.keys(result.codebaseAnalysis.projectContext.keyDirectories).join(', ') || 'None'}
+Guidelines: ${result.codebaseAnalysis.implementationGuidelines.length} items
+- ${result.codebaseAnalysis.implementationGuidelines.slice(0, 3).join('\n- ')}
+MCP Essential: ${result.mcpServers.essential.join(', ')}
+MCP Recommended: ${result.mcpServers.recommended.join(', ') || 'None'}
+
+## Original Project Context
+Framework: ${scanResult.stack.framework?.name || 'Unknown'}
+Database: ${scanResult.stack.database?.name || 'None detected'}
+Testing: ${scanResult.stack.testing?.unit?.name || 'None detected'}
+
+Evaluate the quality and completeness of this analysis.`;
+
+  try {
+    const { generateObject } = getTracedAI();
+
+    const { object: evaluation } = await generateObject({
+      model,
+      schema: evaluationSchema,
+      system: EVALUATOR_SYSTEM_PROMPT,
+      prompt,
+      ...(isReasoningModel(modelId) ? {} : { temperature: 0.2 }),
+      experimental_telemetry: {
+        isEnabled: true,
+        metadata: {
+          agent: 'evaluator',
+          projectType: result.codebaseAnalysis.projectContext.projectType,
+        },
+      },
+    });
+
+    return evaluation;
+  } catch (error) {
+    if (verbose) {
+      logger.error(`Evaluator error: ${error instanceof Error ? error.message : String(error)}`);
+    }
+
+    // Return a passing evaluation on error to avoid blocking
+    return {
+      qualityScore: 7,
+      hasEntryPoints: result.codebaseAnalysis.projectContext.entryPoints.length > 0,
+      hasImplementationGuidelines: result.codebaseAnalysis.implementationGuidelines.length > 0,
+      hasRelevantMcpServers: result.mcpServers.essential.length > 0,
+      specificIssues: [],
+      improvementSuggestions: [],
+    };
+  }
+}
+
+/**
+ * Optimize the result based on evaluation feedback
+ */
+async function optimizeResult(
+  model: LanguageModel,
+  modelId: string,
+  result: MultiAgentAnalysis,
+  evaluation: EvaluationResult,
+  verbose: boolean
+): Promise<MultiAgentAnalysis> {
+  const prompt = `Improve this codebase analysis based on the evaluation feedback.
+
+## Current Analysis
+Project Type: ${result.codebaseAnalysis.projectContext.projectType}
+Entry Points: ${result.codebaseAnalysis.projectContext.entryPoints.join(', ')}
+Current Guidelines:
+${result.codebaseAnalysis.implementationGuidelines.map(g => `- ${g}`).join('\n')}
+
+## Evaluation Feedback
+Score: ${evaluation.qualityScore}/10
+Issues: ${evaluation.specificIssues.join(', ') || 'None'}
+Suggestions: ${evaluation.improvementSuggestions.join(', ') || 'None'}
+
+Provide improved guidelines and any additional entry points or MCP servers.`;
+
+  try {
+    const { generateObject } = getTracedAI();
+
+    const { object: improvements } = await generateObject({
+      model,
+      schema: optimizerOutputSchema,
+      system: OPTIMIZER_SYSTEM_PROMPT,
+      prompt,
+      ...(isReasoningModel(modelId) ? {} : { temperature: 0.3 }),
+      experimental_telemetry: {
+        isEnabled: true,
+        metadata: {
+          agent: 'optimizer',
+          previousScore: evaluation.qualityScore,
+        },
+      },
+    });
+
+    // Apply improvements to the result
+    const improved: MultiAgentAnalysis = {
+      ...result,
+      codebaseAnalysis: {
+        ...result.codebaseAnalysis,
+        implementationGuidelines: improvements.improvedGuidelines.length > 0
+          ? improvements.improvedGuidelines
+          : result.codebaseAnalysis.implementationGuidelines,
+        projectContext: {
+          ...result.codebaseAnalysis.projectContext,
+          entryPoints: improvements.additionalEntryPoints
+            ? [...new Set([...result.codebaseAnalysis.projectContext.entryPoints, ...improvements.additionalEntryPoints])]
+            : result.codebaseAnalysis.projectContext.entryPoints,
+        },
+      },
+      mcpServers: {
+        ...result.mcpServers,
+        recommended: improvements.additionalMcpServers
+          ? [...new Set([...result.mcpServers.recommended, ...improvements.additionalMcpServers])]
+          : result.mcpServers.recommended,
+      },
+    };
+
+    if (verbose) {
+      logger.info(`Optimizer: Updated ${improvements.improvedGuidelines.length} guidelines`);
+    }
+
+    return improved;
+  } catch (error) {
+    if (verbose) {
+      logger.error(`Optimizer error: ${error instanceof Error ? error.message : String(error)}`);
+    }
+
+    // Return original result on error
+    return result;
+  }
+}