@aiready/cli 0.12.9 → 0.12.11

package/src/commands/scan.ts

@@ -140,12 +140,14 @@ export async function scanAction(directory: string, options: ScanOptions) {
       const { getSmartDefaults } = await import('@aiready/pattern-detect');
       const patternSmartDefaults = await getSmartDefaults(
         resolvedDir,
-        baseOptions
+        finalOptions.toolConfigs?.[ToolName.PatternDetect] || {}
       );
-      finalOptions = {
+
+      // Merge smart defaults into toolConfigs instead of root level
+      if (!finalOptions.toolConfigs) finalOptions.toolConfigs = {};
+      finalOptions.toolConfigs[ToolName.PatternDetect] = {
         ...patternSmartDefaults,
-        ...finalOptions,
-        ...baseOptions,
+        ...finalOptions.toolConfigs[ToolName.PatternDetect],
       };
     }
 
@@ -182,7 +184,7 @@ export async function scanAction(directory: string, options: ScanOptions) {
     const results = await analyzeUnified({
       ...finalOptions,
       progressCallback,
-      onProgress: () => {},
+      onProgress: () => { },
       suppressToolConfig: true,
     });
 

package/src/index.ts

@@ -3,6 +3,9 @@ import {
   ToolName,
   calculateOverallScore,
   calculateTokenBudget,
+  GLOBAL_SCAN_OPTIONS,
+  GLOBAL_INFRA_OPTIONS,
+  COMMON_FINE_TUNING_OPTIONS,
 } from '@aiready/core';
 import type {
   AnalysisResult,
@@ -28,6 +31,7 @@ export type { ToolScoringOutput, ScoringResult };
 export interface UnifiedAnalysisOptions extends ScanOptions {
   rootDir: string;
   tools?: string[];
+  toolConfigs?: Record<string, any>;
   minSimilarity?: number;
   minLines?: number;
   maxCandidatesPerBlock?: number;
@@ -55,6 +59,7 @@ export interface UnifiedAnalysisResult {
     toolsRun: string[];
     executionTime: number;
     config?: any;
+    toolConfigs?: Record<string, any>;
   };
   scoring?: ScoringResult;
 }
@@ -86,6 +91,20 @@ const TOOL_PACKAGE_MAP: Record<string, string> = {
   'change-amp': '@aiready/change-amplification',
 };
 
+/**
+ * Sanitize tool configuration by removing global options (except rootDir)
+ */
+function sanitizeToolConfig(config: any): any {
+  if (!config || typeof config !== 'object') return config;
+  const sanitized = { ...config };
+  GLOBAL_INFRA_OPTIONS.forEach((key: string) => {
+    if (key !== 'rootDir') {
+      delete (sanitized as any)[key];
+    }
+  });
+  return sanitized;
+}
+
 /**
  * AIReady Unified Analysis
  * Orchestrates all registered tools via the ToolRegistry.
@@ -108,7 +127,8 @@ export async function analyzeUnified(
       totalFiles: 0,
       toolsRun: [],
       executionTime: 0,
-      config: options, // Added as per instruction
+      config: options,
+      toolConfigs: {},
     },
   };
 
@@ -153,23 +173,49 @@ export async function analyzeUnified(
       delete (sanitizedConfig as any).onProgress;
       delete (sanitizedConfig as any).progressCallback;
 
-      const output = await provider.analyze({
-        ...options,
-        onProgress: (processed: number, total: number, message: string) => {
-          if (options.progressCallback) {
-            options.progressCallback({
-              tool: provider!.id,
-              processed,
-              total,
-              message,
-            });
+      // 1. Start with sanitized global subset
+      const toolOptions: any = {
+        rootDir: options.rootDir, // Always include rootDir
+      };
+
+      // 1. Pass through all known infra and fine-tuning options from root level
+      [...GLOBAL_INFRA_OPTIONS, ...COMMON_FINE_TUNING_OPTIONS].forEach(
+        (key) => {
+          if (key in options && key !== 'toolConfigs') {
+            toolOptions[key] = (options as any)[key];
           }
-        },
-      });
+        }
+      );
+
+      // 3. Add tool-specific overrides
+      if (options.toolConfigs?.[provider.id]) {
+        Object.assign(toolOptions, options.toolConfigs[provider.id]);
+      } else if ((options as any)[provider.id]) {
+        // Fallback for legacy tool-specific keys
+        Object.assign(toolOptions, (options as any)[provider.id]);
+      }
 
-      // Inject configuration into metadata for auditing and fine-tuning
+      // 4. Attach progress callback
+      toolOptions.onProgress = (
+        processed: number,
+        total: number,
+        message: string
+      ) => {
+        if (options.progressCallback) {
+          options.progressCallback({
+            tool: provider!.id,
+            processed,
+            total,
+            message,
+          });
+        }
+      };
+
+      const output = await provider.analyze(toolOptions);
+
+      // Inject sanitized configuration into metadata for audit
       if (output.metadata) {
-        output.metadata.config = sanitizedConfig;
+        output.metadata.config = sanitizeToolConfig(toolOptions);
       }
 
       if (options.progressCallback) {
@@ -179,6 +225,21 @@ export async function analyzeUnified(
       result[provider.id] = output;
       result.summary.toolsRun.push(provider.id);
 
+      // Collect tool-specific configuration for the audit log
+      if (output.summary?.config) {
+        result.summary.toolConfigs![provider.id] = sanitizeToolConfig(
+          output.summary.config
+        );
+      } else if (output.metadata?.config) {
+        result.summary.toolConfigs![provider.id] = sanitizeToolConfig(
+          output.metadata.config
+        );
+      } else {
+        // Fallback to our sanitized input options if spoke didn't return config
+        result.summary.toolConfigs![provider.id] =
+          sanitizeToolConfig(toolOptions);
+      }
+
       // Track total files analyzed across all tools
       const toolFiles =
         output.summary?.totalFiles || output.summary?.filesAnalyzed || 0;
@@ -214,6 +275,12 @@ export async function analyzeUnified(
     }
   }
 
+  // Finalize configuration for metadata
+  result.summary.config = {
+    ...options,
+    toolConfigs: result.summary.toolConfigs,
+  };
+
   result.summary.executionTime = Date.now() - startTime;
   return result;
 }