More fixes for CDS compilation task retry

Author: data-douser

extractors/cds/tools/dist/cds-extractor.bundle.js

@@ -201,7 +201,7 @@ function compileProjectLevel(
     '--to',
     'json',
     '--dest',
-    'model.cds.json', // TODO: Replace `model.cds.json` with `model.<session_id>.cds.json`
+    'model.cds.json',
     '--locations',
     '--log-level',
     'warn',
@@ -257,7 +257,6 @@ function compileProjectLevel(
       `CDS compiler generated JSON to output directory: ${projectJsonOutPath}`,
     );
     // Recursively rename generated .json files to have a .cds.json extension
-    // TODO: Replace or remove this in favor of session-specific file suffixes (i.e. `.<session_id>.cds.json`).
     recursivelyRenameJsonFiles(projectJsonOutPath);
   } else {
     cdsExtractorLog('info', `CDS compiler generated JSON to file: ${projectJsonOutPath}`);

extractors/cds/tools/dist/cds-extractor.bundle.js.map

@@ -18,8 +18,8 @@ function attemptCompilation(
   cacheDir: string | undefined,
   dependencyGraph: CdsDependencyGraph,
 ): CompilationAttempt {
-  const attemptId = `${task.id}_${Date.now()}_${Math.random().toString(36).substr(2, 5)}`;
   const startTime = new Date();
+  const attemptId = `${task.id}_${startTime.getTime()}`;
 
   const attempt: CompilationAttempt = {
     id: attemptId,

extractors/cds/tools/src/cds/compiler/compile.ts

@@ -229,16 +229,16 @@ function retryCompilationTask(
   projectDir: string,
   dependencyGraph: CdsDependencyGraph,
 ): CompilationAttempt {
-  const attemptId = `${task.id}_retry_${Date.now()}_${Math.random().toString(36).substr(2, 5)}`;
   const startTime = new Date();
+  const attemptId = `${task.id}_retry_${startTime.getTime()}`;
 
-  // Use the original command string for consistency with existing compilation logic
+  // Use the original command string for consistency with existing compilation logic.
   const cdsCommandString = retryCommand.originalCommand;
 
   const attempt: CompilationAttempt = {
     id: attemptId,
     cdsCommand: cdsCommandString,
-    cacheDir: projectDir, // For retry, we use the project directory
+    cacheDir: projectDir,
     timestamp: startTime,
     result: {
       success: false,
@@ -247,14 +247,14 @@ function retryCompilationTask(
   };
 
   try {
-    // Use the same compilation logic as the original attempt
+    // Use the same compilation logic as the original attempt.
     const primarySourceFile = task.sourceFiles[0];
 
     const compilationResult = compileCdsToJson(
       primarySourceFile,
       dependencyGraph.sourceRootDir,
       cdsCommandString,
-      projectDir, // Use project directory instead of cache directory for retry
+      projectDir,
       // Convert CDS projects to BasicCdsProject format expected by compileCdsToJson
       new Map(
         Array.from(dependencyGraph.projects.entries()).map(([key, value]) => [
@@ -288,11 +288,11 @@ function retryCompilationTask(
 }
 
 /**
- * Executes retry compilation for specific tasks
+ * Executes retries for the provided array of {@link CompilationTask} instances.
  * @param tasksToRetry Tasks that need to be retried
- * @param project The project containing the tasks
- * @param dependencyGraph The dependency graph
- * @returns Retry execution results
+ * @param project The {@link CdsProject} associated with the compilation tasks to retry
+ * @param dependencyGraph The {@link CdsDependencyGraph} to update as tasks are retried
+ * @returns The {@link ResultRetryCompilationTask}
  */
 function retryCompilationTasksForProject(
   tasksToRetry: CompilationTask[],

extractors/cds/tools/src/cds/compiler/graph.ts

@@ -207,7 +207,7 @@ export function buildCdsProjectDependencyGraph(sourceRootDir: string): CdsDepend
 
   // Create the initial dependency graph structure
   const dependencyGraph: CdsDependencyGraph = {
-    id: `cds_graph_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`,
+    id: `cds_graph_${Date.now()}`,
     sourceRootDir,
     projects: new Map<string, CdsProject>(),
     debugInfo: {
@@ -245,7 +245,6 @@ export function buildCdsProjectDependencyGraph(sourceRootDir: string): CdsDepend
       successfulCompilations: 0,
       failedCompilations: 0,
       skippedCompilations: 0,
-      retriedCompilations: 0,
       jsonFilesGenerated: 0,
       criticalErrors: [],
       warnings: [],

extractors/cds/tools/src/cds/compiler/retry.ts

@@ -148,8 +148,6 @@ export interface ExtractionStatusSummary {
   failedCompilations: number;
   /** Skipped compilation tasks */
   skippedCompilations: number;
-  /** Number of tasks that were successfully retried */
-  retriedCompilations: number;
   /** JSON files generated */
   jsonFilesGenerated: number;
   /** Critical errors that stopped extraction */

extractors/cds/tools/src/cds/parser/graph.ts

@@ -13,7 +13,7 @@ export function generateStatusReport(dependencyGraph: CdsDependencyGraph): strin
   lines.push('='.repeat(80));
   lines.push('');
 
-  // Overall summary
+  // OVERALL SUMMARY
   lines.push('OVERALL SUMMARY:');
   lines.push(`  Status: ${summary.overallSuccess ? 'SUCCESS' : 'FAILED'}`);
   lines.push(`  Current Phase: ${dependencyGraph.currentPhase.toUpperCase()}`);
@@ -22,16 +22,16 @@ export function generateStatusReport(dependencyGraph: CdsDependencyGraph): strin
   lines.push(`  JSON Files Generated: ${summary.jsonFilesGenerated}`);
   lines.push('');
 
-  // Compilation summary
+  // COMPILATION SUMMARY
   lines.push('COMPILATION SUMMARY:');
   lines.push(`  Total Tasks: ${summary.totalCompilationTasks}`);
   lines.push(`  Successful: ${summary.successfulCompilations}`);
-  lines.push(`  Retried: ${summary.retriedCompilations}`);
+  lines.push(`  Retried: ${dependencyGraph.retryStatus.totalRetryAttempts}`);
   lines.push(`  Failed: ${summary.failedCompilations}`);
   lines.push(`  Skipped: ${summary.skippedCompilations}`);
   lines.push('');
 
-  // Retry summary (if retry attempts were made)
+  // RETRY SUMMARY (if retry attempts were made)
   if (dependencyGraph.retryStatus.totalRetryAttempts > 0) {
     lines.push('RETRY SUMMARY:');
     lines.push(`  Tasks Requiring Retry: ${dependencyGraph.retryStatus.totalTasksRequiringRetry}`);
@@ -48,7 +48,7 @@ export function generateStatusReport(dependencyGraph: CdsDependencyGraph): strin
     lines.push('');
   }
 
-  // Performance metrics
+  // PERFORMANCE metrics
   lines.push('PERFORMANCE:');
   lines.push(`  Total Duration: ${summary.performance.totalDurationMs}ms`);
   lines.push(`  Parsing: ${summary.performance.parsingDurationMs}ms`);

extractors/cds/tools/src/cds/parser/types.ts

@@ -93,7 +93,6 @@ function createMockDependencyGraph(
       successfulCompilations: 0,
       failedCompilations: 0,
       skippedCompilations: 0,
-      retriedCompilations: 0,
       jsonFilesGenerated: 0,
       overallSuccess: false,
       criticalErrors: [],

extractors/cds/tools/src/logging/statusReport.ts

@@ -119,7 +119,6 @@ describe('retry.ts', () => {
         successfulCompilations: 0,
         failedCompilations: 1,
         skippedCompilations: 0,
-        retriedCompilations: 0,
         jsonFilesGenerated: 0,
         criticalErrors: [],
         warnings: [],