@aiready/cli 0.12.10 → 0.12.12

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],
       };
     }
 

package/src/index.ts

@@ -4,6 +4,8 @@ import {
   calculateOverallScore,
   calculateTokenBudget,
   GLOBAL_SCAN_OPTIONS,
+  GLOBAL_INFRA_OPTIONS,
+  COMMON_FINE_TUNING_OPTIONS,
 } from '@aiready/core';
 import type {
   AnalysisResult,
@@ -95,7 +97,7 @@ const TOOL_PACKAGE_MAP: Record<string, string> = {
 function sanitizeToolConfig(config: any): any {
   if (!config || typeof config !== 'object') return config;
   const sanitized = { ...config };
-  GLOBAL_SCAN_OPTIONS.forEach((key: string) => {
+  GLOBAL_INFRA_OPTIONS.forEach((key: string) => {
     if (key !== 'rootDir') {
       delete (sanitized as any)[key];
     }
@@ -176,16 +178,29 @@ export async function analyzeUnified(
         rootDir: options.rootDir, // Always include rootDir
       };
 
-      // 2. Add other global options that tools might need
-      GLOBAL_SCAN_OPTIONS.forEach((key) => {
-        if (key in options && key !== 'toolConfigs') {
-          toolOptions[key] = (options as any)[key];
+      // 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' && key !== 'tools') {
+            toolOptions[key] = (options as any)[key];
+          }
         }
-      });
+      );
 
       // 3. Add tool-specific overrides
+      // Check priority:
+      // a) options.toolConfigs[toolId]
+      // b) options.tools[toolId] (if tools is an object, not the array of tool names)
+      // c) options[toolId] (legacy)
       if (options.toolConfigs?.[provider.id]) {
         Object.assign(toolOptions, options.toolConfigs[provider.id]);
+      } else if (
+        options.tools &&
+        !Array.isArray(options.tools) &&
+        typeof options.tools === 'object' &&
+        (options.tools as any)[provider.id]
+      ) {
+        Object.assign(toolOptions, (options.tools as any)[provider.id]);
       } else if ((options as any)[provider.id]) {
         // Fallback for legacy tool-specific keys
         Object.assign(toolOptions, (options as any)[provider.id]);
@@ -271,10 +286,18 @@ export async function analyzeUnified(
     }
   }
 
-  // Finalize configuration for metadata
+  // Finalize configuration for metadata to match AIReadyConfig structure
   result.summary.config = {
-    ...options,
-    toolConfigs: result.summary.toolConfigs,
+    scan: {
+      tools: requestedTools,
+      include: options.include,
+      exclude: options.exclude,
+    },
+    // Use 'tools' for tool-specific configurations to match AIReadyConfig
+    tools: result.summary.toolConfigs,
+    // Keep top-level options for backward compatibility
+    rootDir: options.rootDir,
+    useSmartDefaults: options.useSmartDefaults,
   };
 
   result.summary.executionTime = Date.now() - startTime;