wiggum-cli 0.3.0 → 0.3.2

package/dist/utils/json-repair.js

@@ -0,0 +1,146 @@
+/**
+ * JSON Repair Utility
+ * Fixes common JSON syntax errors from AI responses
+ */
+/**
+ * Fix mismatched brackets in JSON
+ * AI sometimes writes } instead of ] or vice versa
+ */
+function fixMismatchedBrackets(text) {
+    const chars = text.split('');
+    const stack = [];
+    let inString = false;
+    let escapeNext = false;
+    for (let i = 0; i < chars.length; i++) {
+        const char = chars[i];
+        if (escapeNext) {
+            escapeNext = false;
+            continue;
+        }
+        if (char === '\\' && inString) {
+            escapeNext = true;
+            continue;
+        }
+        if (char === '"') {
+            inString = !inString;
+            continue;
+        }
+        if (inString)
+            continue;
+        if (char === '{' || char === '[') {
+            stack.push({ char, index: i });
+        }
+        else if (char === '}' || char === ']') {
+            if (stack.length > 0) {
+                const last = stack.pop();
+                const expected = last.char === '{' ? '}' : ']';
+                if (char !== expected) {
+                    // Mismatch! Fix it
+                    chars[i] = expected;
+                }
+            }
+        }
+    }
+    return chars.join('');
+}
+/**
+ * Attempt to repair malformed JSON from AI responses
+ */
+export function repairJson(text) {
+    let json = text;
+    // Remove any leading/trailing whitespace
+    json = json.trim();
+    // Fix mismatched brackets (AI writes } instead of ] or vice versa)
+    json = fixMismatchedBrackets(json);
+    // Remove trailing commas before ] or }
+    json = json.replace(/,(\s*[\]}])/g, '$1');
+    // Fix missing commas between array elements or object properties
+    // Pattern: value followed by newline and another value without comma
+    json = json.replace(/("|\d|true|false|null|\]|\})(\s*\n\s*)("|\[|\{)/g, '$1,$2$3');
+    // Fix single quotes to double quotes (but not inside strings)
+    // This is a simplified approach - may not work for all cases
+    json = json.replace(/'/g, '"');
+    // Remove JavaScript-style comments
+    json = json.replace(/\/\/.*$/gm, '');
+    json = json.replace(/\/\*[\s\S]*?\*\//g, '');
+    // Fix unquoted keys (simple cases)
+    json = json.replace(/(\{|\,)\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*:/g, '$1"$2":');
+    // Remove any text before the first { or [
+    const firstBrace = json.indexOf('{');
+    const firstBracket = json.indexOf('[');
+    let startIndex = -1;
+    if (firstBrace !== -1 && firstBracket !== -1) {
+        startIndex = Math.min(firstBrace, firstBracket);
+    }
+    else if (firstBrace !== -1) {
+        startIndex = firstBrace;
+    }
+    else if (firstBracket !== -1) {
+        startIndex = firstBracket;
+    }
+    if (startIndex > 0) {
+        json = json.substring(startIndex);
+    }
+    // Remove any text after the last } or ]
+    const lastBrace = json.lastIndexOf('}');
+    const lastBracket = json.lastIndexOf(']');
+    let endIndex = -1;
+    if (lastBrace !== -1 && lastBracket !== -1) {
+        endIndex = Math.max(lastBrace, lastBracket);
+    }
+    else if (lastBrace !== -1) {
+        endIndex = lastBrace;
+    }
+    else if (lastBracket !== -1) {
+        endIndex = lastBracket;
+    }
+    if (endIndex !== -1 && endIndex < json.length - 1) {
+        json = json.substring(0, endIndex + 1);
+    }
+    return json;
+}
+/**
+ * Parse JSON with repair attempts
+ * Tries to fix common issues before parsing
+ */
+export function parseJsonSafe(text) {
+    // First try parsing as-is
+    try {
+        return JSON.parse(text);
+    }
+    catch {
+        // Try with repairs
+    }
+    // Try repairing the JSON
+    try {
+        const repaired = repairJson(text);
+        return JSON.parse(repaired);
+    }
+    catch {
+        // Repair failed
+    }
+    // Last resort: try to extract JSON from markdown code blocks
+    const jsonMatch = text.match(/```(?:json)?\s*([\s\S]*?)```/);
+    if (jsonMatch) {
+        try {
+            const repaired = repairJson(jsonMatch[1]);
+            return JSON.parse(repaired);
+        }
+        catch {
+            // Still failed
+        }
+    }
+    // Try finding a JSON object
+    const objectMatch = text.match(/\{[\s\S]*\}/);
+    if (objectMatch) {
+        try {
+            const repaired = repairJson(objectMatch[0]);
+            return JSON.parse(repaired);
+        }
+        catch {
+            // Still failed
+        }
+    }
+    return null;
+}
+//# sourceMappingURL=json-repair.js.map

package/dist/utils/json-repair.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"json-repair.js","sourceRoot":"","sources":["../../src/utils/json-repair.ts"],"names":[],"mappings":"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"}

package/dist/utils/tracing.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Braintrust Tracing Utility
+ * Provides AI call tracing for debugging and analysis
+ */
+import * as ai from 'ai';
+export { traced, currentSpan, wrapTraced } from 'braintrust';
+export declare function initTracing(): void;
+/**
+ * Check if tracing is enabled
+ */
+export declare function isTracingEnabled(): boolean;
+/**
+ * Get wrapped AI SDK functions for automatic tracing
+ * Falls back to original functions if tracing not available
+ */
+export declare function getTracedAI(): typeof ai;
+/**
+ * Wrap a function with tracing
+ * No-op if tracing is not enabled
+ */
+export declare function maybeTraced<T extends (...args: unknown[]) => unknown>(fn: T, options?: {
+    type?: string;
+    name?: string;
+}): T;
+//# sourceMappingURL=tracing.d.ts.map

package/dist/utils/tracing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/utils/tracing.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAGzB,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAO7D,wBAAgB,WAAW,IAAI,IAAI,CAkBlC;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAE1C;AAED;;;GAGG;AACH,wBAAgB,WAAW,cAS1B;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,EACnE,EAAE,EAAE,CAAC,EACL,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAO,GAC7C,CAAC,CAUH"}

package/dist/utils/tracing.js

@@ -0,0 +1,64 @@
+/**
+ * Braintrust Tracing Utility
+ * Provides AI call tracing for debugging and analysis
+ */
+import { initLogger, wrapAISDK } from 'braintrust';
+import * as ai from 'ai';
+// Re-export traced utilities
+export { traced, currentSpan, wrapTraced } from 'braintrust';
+/**
+ * Initialize Braintrust logger if API key is available
+ */
+let loggerInitialized = false;
+export function initTracing() {
+    if (loggerInitialized)
+        return;
+    const apiKey = process.env.BRAINTRUST_API_KEY;
+    if (!apiKey) {
+        // Silently skip tracing if no API key
+        return;
+    }
+    try {
+        initLogger({
+            apiKey,
+            projectName: process.env.BRAINTRUST_PROJECT_NAME || 'wiggum-cli',
+        });
+        loggerInitialized = true;
+    }
+    catch {
+        // Silently fail if tracing can't be initialized
+    }
+}
+/**
+ * Check if tracing is enabled
+ */
+export function isTracingEnabled() {
+    return !!process.env.BRAINTRUST_API_KEY;
+}
+/**
+ * Get wrapped AI SDK functions for automatic tracing
+ * Falls back to original functions if tracing not available
+ */
+export function getTracedAI() {
+    initTracing();
+    if (isTracingEnabled()) {
+        return wrapAISDK(ai);
+    }
+    // Return original AI SDK functions if tracing not enabled
+    return ai;
+}
+/**
+ * Wrap a function with tracing
+ * No-op if tracing is not enabled
+ */
+export function maybeTraced(fn, options = {}) {
+    if (!isTracingEnabled()) {
+        return fn;
+    }
+    const { wrapTraced } = require('braintrust');
+    return wrapTraced(fn, {
+        type: options.type || 'function',
+        name: options.name || fn.name || 'anonymous',
+    });
+}
+//# sourceMappingURL=tracing.js.map

package/dist/utils/tracing.js.map

@@ -0,0 +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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiggum-cli",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "AI-powered feature development loop CLI",
   "type": "module",
   "main": "dist/index.js",
@@ -28,8 +28,10 @@
   "dependencies": {
     "@ai-sdk/anthropic": "^3.0.15",
     "@ai-sdk/openai": "^3.0.12",
+    "@braintrust/otel": "^0.2.0",
     "@clack/prompts": "^0.7.0",
     "ai": "^6.0.41",
+    "braintrust": "^2.0.2",
     "cfonts": "^3.2.0",
     "commander": "^12.1.0",
     "picocolors": "^1.0.0",

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

@@ -3,11 +3,13 @@
  * Explores the codebase to understand its structure and patterns
  */
 
-import { generateText, stepCountIs, type LanguageModel } from 'ai';
+import { stepCountIs, type LanguageModel } from 'ai';
 import type { CodebaseAnalysis, CodebaseAnalystInput } 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';
 
 /**
  * System prompt for the Codebase Analyst agent
@@ -82,6 +84,8 @@ Project: ${input.projectRoot}
 Start by exploring the directory structure and package.json, then produce your analysis as JSON.`;
 
   try {
+    const { generateText } = getTracedAI();
+
     const result = await generateText({
       model,
       system: CODEBASE_ANALYST_SYSTEM_PROMPT,
@@ -90,6 +94,10 @@ Start by exploring the directory structure and package.json, then produce your a
       stopWhen: stepCountIs(12),
       maxOutputTokens: 3000,
       ...(isReasoningModel(modelId) ? {} : { temperature: 0.3 }),
+      experimental_telemetry: {
+        isEnabled: true,
+        metadata: { agent: 'codebase-analyst', projectRoot: input.projectRoot },
+      },
     });
 
     // Extract JSON from response
@@ -133,40 +141,29 @@ function parseCodebaseAnalysis(
     return null;
   }
 
-  try {
-    // Remove markdown code blocks if present
-    let jsonText = textToParse;
-    const jsonMatch = textToParse.match(/```(?:json)?\s*([\s\S]*?)```/);
-    if (jsonMatch) {
-      jsonText = jsonMatch[1];
-    }
-
-    // Find JSON object
-    const objectMatch = jsonText.match(/\{[\s\S]*\}/);
-    if (objectMatch) {
-      jsonText = objectMatch[0];
-    }
-
-    const parsed = JSON.parse(jsonText) as CodebaseAnalysis;
-
-    // Validate required fields
-    if (!parsed.projectContext || !parsed.commands) {
-      if (verbose) {
-        logger.warn('Codebase Analyst: Missing required fields in response');
-      }
-      return null;
-    }
+  // Use safe JSON parser with repair capabilities
+  const parsed = parseJsonSafe<CodebaseAnalysis>(textToParse);
 
-    // Ensure projectType is set
-    if (!parsed.projectContext.projectType) {
-      parsed.projectContext.projectType = 'Unknown';
+  if (!parsed) {
+    if (verbose) {
+      logger.warn('Codebase Analyst: Failed to parse JSON response');
+      logger.warn(`Response preview: ${textToParse.substring(0, 200)}...`);
     }
+    return null;
+  }
 
-    return parsed;
-  } catch (error) {
+  // Validate required fields
+  if (!parsed.projectContext || !parsed.commands) {
     if (verbose) {
-      logger.warn(`Codebase Analyst: Failed to parse JSON - ${error instanceof Error ? error.message : String(error)}`);
+      logger.warn('Codebase Analyst: Missing required fields in response');
     }
     return null;
   }
+
+  // Ensure projectType is set
+  if (!parsed.projectContext.projectType) {
+    parsed.projectContext.projectType = 'Unknown';
+  }
+
+  return parsed;
 }

package/src/ai/agents/index.ts

@@ -61,7 +61,7 @@ export async function runMultiAgentAnalysis(
     logger.info('Running Codebase Analyst...');
   }
 
-  const codebaseAnalysis = await runCodebaseAnalyst(
+  let codebaseAnalysis = await runCodebaseAnalyst(
     model,
     modelId,
     {
@@ -75,7 +75,8 @@ export async function runMultiAgentAnalysis(
     if (verbose) {
       logger.warn('Codebase Analyst failed, using defaults');
     }
-    return null;
+    // Use defaults instead of aborting the pipeline
+    codebaseAnalysis = getDefaultCodebaseAnalysis(scanResult);
   }
 
   // Run Stack Researcher
@@ -132,6 +133,40 @@ export async function runMultiAgentAnalysis(
   return finalResult;
 }
 
+/**
+ * Get default codebase analysis when agent fails
+ */
+function getDefaultCodebaseAnalysis(scanResult: ScanResult) {
+  // Detect project type from scan result
+  let projectType = 'Unknown';
+  if (scanResult.stack.mcp?.isProject) {
+    projectType = 'MCP Server';
+  } else if (scanResult.stack.framework?.name.includes('Next')) {
+    projectType = 'Next.js App';
+  } else if (scanResult.stack.framework?.name.includes('React')) {
+    projectType = 'React SPA';
+  } else if (scanResult.stack.framework?.name) {
+    projectType = `${scanResult.stack.framework.name} Project`;
+  }
+
+  return {
+    projectContext: {
+      entryPoints: ['src/index.ts'],
+      keyDirectories: { 'src': 'Source code' },
+      namingConventions: 'camelCase',
+      projectType,
+    },
+    commands: {
+      test: 'npm test',
+      lint: 'npm run lint',
+      build: 'npm run build',
+      dev: 'npm run dev',
+    },
+    implementationGuidelines: ['Follow existing patterns', 'Run tests after changes'],
+    possibleMissedTechnologies: [],
+  };
+}
+
 /**
  * Get default stack research when agent fails
  */

package/src/ai/agents/orchestrator.ts

@@ -3,7 +3,7 @@
  * Coordinates the multi-agent analysis and merges results
  */
 
-import { generateText, type LanguageModel } from 'ai';
+import type { LanguageModel } from 'ai';
 import type {
   CodebaseAnalysis,
   StackResearch,
@@ -14,6 +14,8 @@ import type {
 import type { DetectedStack } from '../../scanner/types.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';
 
 /**
  * System prompt for the Orchestrator
@@ -67,12 +69,18 @@ export async function runOrchestrator(
   const prompt = createOrchestratorPrompt(input);
 
   try {
+    const { generateText } = getTracedAI();
+
     const result = await generateText({
       model,
       system: ORCHESTRATOR_SYSTEM_PROMPT,
       prompt,
       maxOutputTokens: 1000,
       ...(isReasoningModel(modelId) ? {} : { temperature: 0.2 }),
+      experimental_telemetry: {
+        isEnabled: true,
+        metadata: { agent: 'orchestrator', projectType: input.codebaseAnalysis.projectContext.projectType },
+      },
     });
 
     const mcpServers = parseMcpRecommendations(result.text, input.stack, verbose);
@@ -130,36 +138,24 @@ function parseMcpRecommendations(
     return getDefaultMcpRecommendations('Unknown', stack);
   }
 
-  try {
-    // Remove markdown code blocks
-    let jsonText = text;
-    const jsonMatch = text.match(/```(?:json)?\s*([\s\S]*?)```/);
-    if (jsonMatch) {
-      jsonText = jsonMatch[1];
-    }
+  // Use safe JSON parser with repair capabilities
+  const parsed = parseJsonSafe<{ mcpServers?: McpRecommendations }>(text);
 
-    // Find JSON object
-    const objectMatch = jsonText.match(/\{[\s\S]*\}/);
-    if (objectMatch) {
-      jsonText = objectMatch[0];
-    }
-
-    const parsed = JSON.parse(jsonText) as { mcpServers?: McpRecommendations };
-
-    if (parsed.mcpServers) {
-      return {
-        essential: parsed.mcpServers.essential || ['filesystem', 'git'],
-        recommended: parsed.mcpServers.recommended || [],
-      };
-    }
-
-    return getDefaultMcpRecommendations('Unknown', stack);
-  } catch (error) {
+  if (!parsed) {
     if (verbose) {
-      logger.warn(`Orchestrator: Failed to parse JSON - ${error instanceof Error ? error.message : String(error)}`);
+      logger.warn('Orchestrator: Failed to parse JSON response');
     }
     return getDefaultMcpRecommendations('Unknown', stack);
   }
+
+  if (parsed.mcpServers) {
+    return {
+      essential: parsed.mcpServers.essential || ['filesystem', 'git'],
+      recommended: parsed.mcpServers.recommended || [],
+    };
+  }
+
+  return getDefaultMcpRecommendations('Unknown', stack);
 }
 
 /**

package/src/ai/agents/stack-researcher.ts

@@ -4,13 +4,15 @@
  * Gracefully degrades when optional services are unavailable
  */
 
-import { generateText, stepCountIs, type LanguageModel, type Tool } from 'ai';
+import { stepCountIs, type LanguageModel, type Tool } from 'ai';
 import type { StackResearch, StackResearcherInput, AgentCapabilities } from './types.js';
 import type { DetectedStack } from '../../scanner/types.js';
 import { createTavilySearchTool } from '../tools/tavily.js';
 import { createContext7Tool } from '../tools/context7.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';
 
 /**
  * System prompt for Stack Researcher with tools
@@ -200,6 +202,8 @@ export async function runStackResearcher(
   const prompt = createResearchPrompt(input.stack, input.projectType, hasTools);
 
   try {
+    const { generateText } = getTracedAI();
+
     const result = await generateText({
       model,
       system: systemPrompt,
@@ -207,6 +211,10 @@ export async function runStackResearcher(
       ...(hasTools ? { tools, stopWhen: stepCountIs(8) } : {}),
       maxOutputTokens: 2000,
       ...(isReasoningModel(modelId) ? {} : { temperature: 0.3 }),
+      experimental_telemetry: {
+        isEnabled: true,
+        metadata: { agent: 'stack-researcher', researchMode, projectType: input.projectType },
+      },
     });
 
     // Parse the response
@@ -250,37 +258,25 @@ function parseStackResearch(
     return getDefaultStackResearch(researchMode);
   }
 
-  try {
-    // Remove markdown code blocks if present
-    let jsonText = textToParse;
-    const jsonMatch = textToParse.match(/```(?:json)?\s*([\s\S]*?)```/);
-    if (jsonMatch) {
-      jsonText = jsonMatch[1];
-    }
-
-    // Find JSON object
-    const objectMatch = jsonText.match(/\{[\s\S]*\}/);
-    if (objectMatch) {
-      jsonText = objectMatch[0];
-    }
+  // Use safe JSON parser with repair capabilities
+  const parsed = parseJsonSafe<Partial<StackResearch>>(textToParse);
 
-    const parsed = JSON.parse(jsonText) as Partial<StackResearch>;
-
-    // Build result with defaults for missing fields
-    return {
-      bestPractices: parsed.bestPractices || [],
-      antiPatterns: parsed.antiPatterns || [],
-      testingTools: parsed.testingTools || [],
-      debuggingTools: parsed.debuggingTools || [],
-      documentationHints: parsed.documentationHints || [],
-      researchMode: researchMode,
-    };
-  } catch (error) {
+  if (!parsed) {
     if (verbose) {
-      logger.warn(`Stack Researcher: Failed to parse JSON - ${error instanceof Error ? error.message : String(error)}`);
+      logger.warn('Stack Researcher: Failed to parse JSON response');
     }
     return getDefaultStackResearch(researchMode);
   }
+
+  // Build result with defaults for missing fields
+  return {
+    bestPractices: parsed.bestPractices || [],
+    antiPatterns: parsed.antiPatterns || [],
+    testingTools: parsed.testingTools || [],
+    debuggingTools: parsed.debuggingTools || [],
+    documentationHints: parsed.documentationHints || [],
+    researchMode: researchMode,
+  };
 }
 
 /**