@codeyam/codeyam-cli 0.1.0-staging.e38f7bd → 0.1.0-staging.f777668

package/analyzer-template/packages/ai/src/lib/completionCall.ts

@@ -1,5 +1,6 @@
 import OpenAI from 'openai';
 import * as lib from '../lib';
+import { trackDataSnapshot } from './e2eDataTracking';
 
 import PQueue from 'p-queue';
 import { default as PRetry, Options } from 'p-retry';
@@ -9,6 +10,7 @@ import { getModelInfo } from './modelInfo';
 import { AI } from './types';
 import { callClaudeCli } from './services/claudeCliAIService';
 import { isClaudeCliMode } from './services/aiServiceMode';
+import { awsLogDebugLevel } from '~codeyam/utils';
 
 // set to 'true' only locally for e.g. benchmarking unassisted error rates
 const RETRIES_DISABLED = false;
@@ -34,7 +36,6 @@ interface CompletionCallProps {
 const queue = new PQueue({
   concurrency: 100,
   timeout: 20 * 60 * 1000, // 20 minutes
-  throwOnTimeout: true,
   autoStart: true,
 });
 
@@ -66,7 +67,11 @@ export default async function completionCall({
   // When CODEYAM_LLM_FIXTURES_DIR is set, load responses from captured JSON files
   // instead of making real API calls
   if (process.env.CODEYAM_LLM_FIXTURES_DIR) {
-    return await replayLlmCall(type, process.env.CODEYAM_LLM_FIXTURES_DIR);
+    return await replayLlmCall(
+      type,
+      process.env.CODEYAM_LLM_FIXTURES_DIR,
+      systemMessage,
+    );
   }
 
   console.log(
@@ -129,37 +134,63 @@ export default async function completionCall({
   };
   const params = lib.openai.chatRequestToOpenAIChatParams(chatRequest);
 
-  const chatCompletion = await queue.add(
-    () => {
-      queueEndTime = Date.now();
-      return PRetry(
-        () => {
-          return openai.chat.completions.create(params, {
+  const chatCompletionResult = await queue.add(() => {
+    queueEndTime = Date.now();
+    return PRetry(
+      async () => {
+        const callStartTime = Date.now();
+        const waitingMessages = [
+          'Waiting for LLM response',
+          'Still waiting for LLM response',
+          'LLM call in progress',
+          'Processing LLM request',
+          'Awaiting LLM completion',
+        ];
+
+        const logInterval = setInterval(() => {
+          const elapsedSeconds = Math.floor(
+            (Date.now() - callStartTime) / 1000,
+          );
+          const messageIndex =
+            Math.floor(elapsedSeconds / 10) % waitingMessages.length;
+          awsLogDebugLevel(
+            1,
+            `${waitingMessages[messageIndex]} [type=${type}, model=${model}, elapsed=${elapsedSeconds}s]`,
+          );
+        }, 10000);
+
+        try {
+          return await openai.chat.completions.create(params, {
             timeout: 5 * 60 * 1000, // 5 minute timeout
           });
+        } finally {
+          clearInterval(logInterval);
+        }
+      },
+      {
+        ...defaultRetryOptions,
+        onFailedAttempt: (error) => {
+          retryCount++;
+          console.log(
+            `CodeYam Error: Completion call failed [model=${model}]`,
+            {
+              error,
+              prompt,
+              systemMessage,
+              attempts,
+              retryCount,
+            },
+          );
         },
-        {
-          ...defaultRetryOptions,
-          onFailedAttempt: (error) => {
-            retryCount++;
-            console.log(
-              `CodeYam Error: Completion call failed [model=${model}]`,
-              {
-                error,
-                prompt,
-                systemMessage,
-                attempts,
-                retryCount,
-              },
-            );
-          },
-        },
-      );
-    },
-    {
-      throwOnTimeout: true,
-    },
-  );
+      },
+    );
+  });
+
+  if (!chatCompletionResult) {
+    throw new Error('Completion call returned no result');
+  }
+
+  const chatCompletion = chatCompletionResult;
   const endTime = Date.now();
 
   const llmCallStats = getLLMCallStats({
@@ -279,11 +310,32 @@ ${completion}
 
 Please provide a corrected version with valid JSON only. Do not include any explanatory text, just the valid JSON object.`;
 
-        const correctionChatCompletion = await queue.add(
-          () => {
-            return PRetry(
-              () => {
-                return openai.chat.completions.create(
+        const correctionChatCompletionResult = await queue.add(() => {
+          return PRetry(
+            async () => {
+              const correctionStartTime = Date.now();
+              const waitingMessages = [
+                'Waiting for LLM correction response',
+                'Still waiting for LLM correction',
+                'LLM correction in progress',
+                'Processing LLM correction request',
+                'Awaiting LLM correction completion',
+              ];
+
+              const logInterval = setInterval(() => {
+                const elapsedSeconds = Math.floor(
+                  (Date.now() - correctionStartTime) / 1000,
+                );
+                const messageIndex =
+                  Math.floor(elapsedSeconds / 10) % waitingMessages.length;
+                awsLogDebugLevel(
+                  1,
+                  `${waitingMessages[messageIndex]} [type=${type}, model=${model}, elapsed=${elapsedSeconds}s]`,
+                );
+              }, 10000);
+
+              try {
+                return await openai.chat.completions.create(
                   {
                     ...params,
                     messages: [
@@ -297,22 +349,27 @@ Please provide a corrected version with valid JSON only. Do not include any expl
                     timeout: 5 * 60 * 1000,
                   },
                 );
+              } finally {
+                clearInterval(logInterval);
+              }
+            },
+            {
+              ...defaultRetryOptions,
+              onFailedAttempt: (error) => {
+                console.log('CodeYam Error: Correction call failed', {
+                  error,
+                  attempts,
+                });
               },
-              {
-                ...defaultRetryOptions,
-                onFailedAttempt: (error) => {
-                  console.log('CodeYam Error: Correction call failed', {
-                    error,
-                    attempts,
-                  });
-                },
-              },
-            );
-          },
-          {
-            throwOnTimeout: true,
-          },
-        );
+            },
+          );
+        });
+
+        if (!correctionChatCompletionResult) {
+          throw new Error('Correction call returned no result');
+        }
+
+        const correctionChatCompletion = correctionChatCompletionResult;
 
         const correctedRawCompletion =
           correctionChatCompletion.choices?.[0]?.message?.content;
@@ -372,6 +429,12 @@ Please provide a corrected version with valid JSON only. Do not include any expl
     }
   }
 
+  // Track the completion for E2E debugging
+  trackDataSnapshot(`completionCall_${type}`, {
+    completion,
+    finishReason: chatCompletion.choices[0].finish_reason,
+  });
+
   return {
     finishReason: chatCompletion.choices[0].finish_reason,
     completion,
@@ -388,11 +451,13 @@ export const QueueSize = () => queue.size;
  *
  * @param type - The prompt type to look up (e.g., 'generateEntityScenarios')
  * @param fixturesDir - Directory containing captured LLM call JSON files
+ * @param systemMessage - The system message for the call (used for content-based matching)
  * @returns Mocked completion response matching the structure of a real LLM call
  */
 async function replayLlmCall(
   type: string,
   fixturesDir: string,
+  systemMessage?: string,
 ): Promise<{
   finishReason: string;
   completion: string;
@@ -443,43 +508,159 @@ async function replayLlmCall(
       }
     }
 
+    // Sort fixtures by created_at timestamp to ensure deterministic ordering
+    // This is critical because filesystem order is not guaranteed
+    for (const promptType of Object.keys(callsByType)) {
+      callsByType[promptType].sort((a, b) => {
+        const timeA = a.created_at ?? 0;
+        const timeB = b.created_at ?? 0;
+        return timeA - timeB;
+      });
+    }
+
     const matchingCalls = callsByType[type];
 
     if (!matchingCalls || matchingCalls.length === 0) {
       const availableTypes = Object.keys(callsByType).join(', ');
-      throw new Error(
-        `No captured LLM call found for type '${type}'. Available types: ${availableTypes}`,
+      console.warn(
+        `CodeYam Test: No captured LLM call found for type '${type}'. Available types: ${availableTypes}`,
       );
+      // Return empty response - callers should handle gracefully
+      // This allows new LLM call types to be added without breaking existing fixtures
+      return {
+        finishReason: 'stop',
+        completion: '{}',
+        stats: {
+          model: 'fixture-fallback',
+          prompt_type: type,
+          system_message: '',
+          prompt_text: '',
+          response: '{}',
+          input_tokens: 0,
+          output_tokens: 0,
+          cost: 0,
+        },
+      };
     }
 
-    // Track call count per type and cycle through multiple responses
-    const callKey = `${fixturesDir}::${type}`;
-    if (!callIndexByType[callKey]) {
-      callIndexByType[callKey] = 0;
+    // For scenario data generation calls, match by scenario name instead of cycling by index.
+    // This is critical because scenarios may be processed in parallel with Promise.all,
+    // causing non-deterministic call order. Matching by scenario name ensures each call
+    // gets the correct fixture regardless of execution order.
+    //
+    // We group fixtures by scenario name and track indices per scenario to handle
+    // multiple calls for the same scenario (e.g., main call + continuation call).
+    let call: any;
+    const scenarioBasedTypes = [
+      'generateEntityScenarioData',
+      'generateChunkMockData',
+      'generateMissingMockData',
+    ];
+
+    if (scenarioBasedTypes.includes(type) && systemMessage) {
+      // Extract scenario name from system message: 'Scenario name must match exactly: "NAME"'
+      // or from chunk system message which includes scenario name
+      const scenarioNameMatch = systemMessage.match(
+        /Scenario name must match exactly: "([^"]+)"/,
+      );
+      const requestedScenarioName = scenarioNameMatch?.[1];
+
+      if (requestedScenarioName) {
+        // Group fixtures by scenario name
+        const fixturesByScenario: Record<string, any[]> = {};
+        for (const fixture of matchingCalls) {
+          try {
+            const props = JSON.parse(fixture.props || '{}');
+            const scenarioName = props.scenario?.name || '__NO_SCENARIO__';
+            if (!fixturesByScenario[scenarioName]) {
+              fixturesByScenario[scenarioName] = [];
+            }
+            fixturesByScenario[scenarioName].push(fixture);
+          } catch {
+            // Skip fixtures that can't be parsed
+          }
+        }
+
+        const scenarioFixtures = fixturesByScenario[requestedScenarioName];
+        if (scenarioFixtures && scenarioFixtures.length > 0) {
+          // Track call index per (type, scenario) combination
+          const scenarioCallKey = `${fixturesDir}::${type}::${requestedScenarioName}`;
+          if (callIndexByType[scenarioCallKey] === undefined) {
+            callIndexByType[scenarioCallKey] = 0;
+          }
+          const scenarioCallIndex = callIndexByType[scenarioCallKey];
+          callIndexByType[scenarioCallKey] =
+            (scenarioCallIndex + 1) % scenarioFixtures.length;
+
+          call = scenarioFixtures[scenarioCallIndex];
+          console.log(
+            `CodeYam Test: ✅ Matched fixture for scenario '${requestedScenarioName}' [${scenarioCallIndex + 1}/${scenarioFixtures.length}]`,
+          );
+        } else {
+          const availableScenarios = Object.keys(fixturesByScenario).join(', ');
+          console.warn(
+            `CodeYam Test: ⚠️ No fixture found for scenario '${requestedScenarioName}'. Available: [${availableScenarios}]`,
+          );
+        }
+      } else {
+        console.warn(
+          `CodeYam Test: ⚠️ Could not extract scenario name from system message for type '${type}'`,
+        );
+      }
     }
-    const callIndex = callIndexByType[callKey];
-    callIndexByType[callKey] = (callIndex + 1) % matchingCalls.length;
 
-    const call = matchingCalls[callIndex];
+    // Fall back to index-based cycling if no scenario match was found
+    if (!call) {
+      const callKey = `${fixturesDir}::${type}`;
+      if (callIndexByType[callKey] === undefined) {
+        callIndexByType[callKey] = 0;
+      }
+      const callIndex = callIndexByType[callKey];
+      callIndexByType[callKey] = (callIndex + 1) % matchingCalls.length;
+      call = matchingCalls[callIndex];
 
-    console.log(
-      `CodeYam Test: Replaying LLM response for '${type}' [${callIndex + 1}/${matchingCalls.length}]`,
-    );
+      console.log(
+        `CodeYam Test: Replaying LLM response for '${type}' [${callIndex + 1}/${matchingCalls.length}]`,
+      );
+    }
 
     // Extract the actual completion content from the OpenAI response
     // The response field contains the full OpenAI API response as a JSON string
-    let completion: string;
+    let rawCompletion: string;
     try {
       const responseObj = JSON.parse(call.response);
-      completion = responseObj.choices?.[0]?.message?.content || call.response;
+      rawCompletion =
+        responseObj.choices?.[0]?.message?.content || call.response;
     } catch {
       // If parsing fails, use the response as-is (for backwards compatibility)
-      completion = call.response;
+      rawCompletion = call.response;
+    }
+
+    // Apply the same post-processing as real completionCall() does
+    // This ensures replayed responses are processed identically to real API calls
+    // Step 1: Remove <think>...</think> sections that some models include
+    let processedCompletion = rawCompletion;
+    if (rawCompletion) {
+      processedCompletion = rawCompletion
+        .replace(/<think>[\s\S]*?<\/think>/g, '')
+        .trim();
     }
 
+    // Step 2: Extract JSON from text that might have extra content around it
+    // (Only for JSON responses - we assume most LLM calls expect JSON)
+    const completion = processedCompletion
+      ? (processedCompletion.match(/\{[\s\S]*\}/)?.[0] ?? processedCompletion)
+      : processedCompletion;
+
+    // Track the replayed completion for E2E debugging
+    trackDataSnapshot(`completionCall_${type}`, {
+      completion: completion || '',
+      finishReason: 'stop',
+    });
+
     return {
       finishReason: 'stop',
-      completion,
+      completion: completion || '',
       stats: {
         model: call.model ?? 'fixture',
         prompt_type: type,