@aiready/cli 0.14.25 → 0.15.0

package/dist/cli.mjs

@@ -3,7 +3,7 @@ import {
   __require,
   analyzeUnified,
   scoreUnified
-} from "./chunk-HUSUJEQJ.mjs";
+} from "./chunk-HX6H3VOE.mjs";
 
 // src/cli.ts
 import { Command } from "commander";
@@ -17,7 +17,7 @@ import { writeFileSync } from "fs";
 import { resolve as resolvePath4 } from "path";
 import {
   handleJSONOutput as handleJSONOutput2,
-  handleCLIError as handleCLIError2,
+  handleCLIError as handleCLIError3,
   resolveOutputPath,
   getRepoMetadata,
   emitIssuesAsAnnotations
@@ -37,8 +37,8 @@ import chalk from "chalk";
 import { loadConfig, mergeConfigWithDefaults } from "@aiready/core";
 async function warnIfGraphCapExceeded(report, dirPath) {
   try {
-    const { loadConfig: loadConfig4 } = await import("@aiready/core");
-    void loadConfig4;
+    const { loadConfig: loadConfig2 } = await import("@aiready/core");
+    void loadConfig2;
     let graphConfig = { maxNodes: 400, maxEdges: 600 };
     const configPath = resolvePath(dirPath, "aiready.json");
     if (existsSync(configPath)) {
@@ -405,7 +405,71 @@ import { loadMergedConfig, ToolName as ToolName2 } from "@aiready/core";
 
 // src/commands/scan-helpers.ts
 import chalk4 from "chalk";
-import { ToolName } from "@aiready/core";
+import {
+  handleCLIError as handleCLIError2,
+  getElapsedTime,
+  prepareActionConfig,
+  resolveOutputFormat,
+  formatStandardReport,
+  handleStandardJSONOutput,
+  ToolName
+} from "@aiready/core";
+async function executeToolAction(directory, options, config) {
+  console.log(chalk4.blue(`${config.emoji} ${config.label}...
+`));
+  const startTime = Date.now();
+  try {
+    const { resolvedDir, finalOptions: baseOptions } = await prepareActionConfig(
+      directory,
+      config.defaults,
+      config.getCliOptions(options)
+    );
+    let finalOptions = baseOptions;
+    if (config.preAnalyze) {
+      finalOptions = await config.preAnalyze(resolvedDir, finalOptions);
+    }
+    const { analyze, generateSummary, calculateScore } = await config.importTool();
+    const results = await analyze(finalOptions);
+    const elapsedTime = getElapsedTime(startTime);
+    const summary = generateSummary(results);
+    let toolScore;
+    if (options.score && calculateScore) {
+      const resultsAny = results;
+      const scoreData = resultsAny.duplicates || resultsAny.issues || results;
+      const filesCount = resultsAny.length || resultsAny.summary?.filesAnalyzed || resultsAny.summary?.totalFiles;
+      toolScore = calculateScore(scoreData, filesCount);
+    }
+    const { format: outputFormat, file: userOutputFile } = resolveOutputFormat(
+      options,
+      finalOptions
+    );
+    const outputData = formatStandardReport({
+      results,
+      summary,
+      elapsedTime,
+      score: toolScore
+    });
+    if (outputFormat === "json") {
+      handleStandardJSONOutput({
+        outputData,
+        outputFile: userOutputFile,
+        resolvedDir
+      });
+    } else {
+      config.renderConsole({
+        results,
+        summary,
+        elapsedTime,
+        score: toolScore,
+        finalOptions
+      });
+    }
+    return outputData;
+  } catch (error) {
+    handleCLIError2(error, config.label);
+    return void 0;
+  }
+}
 function getProfileTools(profile) {
   switch (profile.toLowerCase()) {
     case "agentic":
@@ -485,7 +549,8 @@ var SCAN_DEFAULTS = {
     "testability-index",
     "doc-drift",
     "dependency-health",
-    "change-amplification"
+    "change-amplification",
+    "contract-enforcement"
   ],
   include: void 0,
   exclude: void 0,
@@ -713,15 +778,43 @@ async function scanAction(directory, options) {
       });
     }
     await warnIfGraphCapExceeded(outputData, resolvedDir);
-    await handleGatekeeper(outputData, scoringResult, options, results);
+    await handleGatekeeper(
+      outputData,
+      scoringResult,
+      options,
+      finalOptions,
+      results
+    );
+    const isCI = options.ci ?? process.env.CI === "true";
+    if (!isCI) {
+      console.log(
+        chalk6.dim(
+          "\n\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"
+        )
+      );
+      console.log(chalk6.bold("\u{1F4C8} Want to see the full interactive report?"));
+      console.log(
+        chalk6.cyan(
+          `   Upload this report to: ${chalk6.bold("https://platform.getaiready.dev")}`
+        )
+      );
+      console.log(
+        chalk6.dim("   Or run: ") + chalk6.white(`aiready upload ${outputPath}`)
+      );
+      console.log(
+        chalk6.dim(
+          "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"
+        )
+      );
+    }
   } catch (error) {
-    handleCLIError2(error, "Analysis");
+    handleCLIError3(error, "Analysis");
   }
 }
-async function handleGatekeeper(outputData, scoringResult, options, results) {
+async function handleGatekeeper(outputData, scoringResult, options, finalOptions, results) {
   if (!scoringResult) return;
-  const threshold = options.threshold ? parseInt(options.threshold) : void 0;
-  const failOnLevel = options.failOn ?? "critical";
+  const threshold = options.threshold ? parseInt(options.threshold) : finalOptions.threshold;
+  const failOnLevel = options.failOn ?? finalOptions.failOn ?? "critical";
   const isCI = options.ci ?? process.env.CI === "true";
   let shouldFail = false;
   let failReason = "";
@@ -1026,144 +1119,160 @@ module.exports = ${JSON.stringify(defaultConfig, null, 2)};
 }
 
 // src/commands/patterns.ts
+import chalk9 from "chalk";
+import { printTerminalHeader } from "@aiready/core";
+
+// src/utils/terminal-renderers.ts
 import chalk8 from "chalk";
 import {
-  handleCLIError as handleCLIError3,
-  getElapsedTime,
   formatToolScore,
-  printTerminalHeader,
-  getTerminalDivider,
-  prepareActionConfig,
-  resolveOutputFormat,
-  formatStandardReport,
-  handleStandardJSONOutput
+  getTerminalDivider as coreGetDivider
 } from "@aiready/core";
-async function patternsAction(directory, options) {
-  console.log(chalk8.blue("\u{1F50D} Analyzing patterns...\n"));
-  const startTime = Date.now();
-  try {
-    const useSmartDefaults = !options.fullScan;
-    const defaults = {
-      useSmartDefaults,
-      include: void 0,
-      exclude: void 0,
-      output: {
-        format: "console",
-        file: void 0
-      }
-    };
-    if (!useSmartDefaults) {
-      defaults.minSimilarity = 0.4;
-      defaults.minLines = 5;
-    }
-    const cliOptions = {
-      minSimilarity: options.similarity ? parseFloat(options.similarity) : void 0,
-      minLines: options.minLines ? parseInt(options.minLines) : void 0,
-      useSmartDefaults,
-      include: options.include?.split(","),
-      exclude: options.exclude?.split(",")
-    };
-    if (options.maxCandidates) {
-      cliOptions.maxCandidatesPerBlock = parseInt(options.maxCandidates);
-    }
-    if (options.minSharedTokens) {
-      cliOptions.minSharedTokens = parseInt(options.minSharedTokens);
-    }
-    const { resolvedDir, finalOptions } = await prepareActionConfig(
-      directory,
-      defaults,
-      cliOptions
+var SAFETY_ICONS = {
+  safe: "\u2705",
+  "moderate-risk": "\u26A0\uFE0F ",
+  "high-risk": "\u{1F534}",
+  "blind-risk": "\u{1F480}"
+};
+var SAFETY_COLORS = {
+  safe: chalk8.green,
+  "moderate-risk": chalk8.yellow,
+  "high-risk": chalk8.red,
+  "blind-risk": chalk8.bgRed.white
+};
+function renderToolHeader(label, emoji, score, rating) {
+  console.log(
+    `  ${emoji} ${label}:         ${chalk8.bold(score + "/100")} (${rating})`
+  );
+}
+function renderSafetyRating(safety) {
+  const icon = SAFETY_ICONS[safety] ?? "\u2753";
+  const color = SAFETY_COLORS[safety] ?? chalk8.white;
+  console.log(
+    `     AI Change Safety:  ${color(`${icon} ${safety.toUpperCase()}`)}`
+  );
+}
+function renderIssueSummaryBlock(summary) {
+  const total = (summary.criticalIssues || 0) + (summary.majorIssues || 0) + (summary.minorIssues || 0);
+  if (total === 0) {
+    console.log(chalk8.green("\u2705 No significant issues found!\n"));
+    return;
+  }
+  console.log(chalk8.bold("\u26A0\uFE0F  Issues Found:\n"));
+  if (summary.criticalIssues > 0)
+    console.log(
+      chalk8.red(`   \u{1F534} Critical: ${chalk8.bold(summary.criticalIssues)}`)
     );
-    const { analyzePatterns, generateSummary, calculatePatternScore } = await import("@aiready/pattern-detect");
-    const { results, duplicates } = await analyzePatterns(
-      finalOptions
+  if (summary.majorIssues > 0)
+    console.log(
+      chalk8.yellow(`   \u{1F7E1} Major: ${chalk8.bold(summary.majorIssues)}`)
     );
-    const elapsedTime = getElapsedTime(startTime);
-    const summary = generateSummary(results);
-    let patternScore;
-    if (options.score) {
-      patternScore = calculatePatternScore(duplicates, results.length);
-    }
-    const { format: outputFormat, file: userOutputFile } = resolveOutputFormat(
-      options,
-      finalOptions
+  if (summary.minorIssues > 0)
+    console.log(chalk8.blue(`   \u{1F535} Minor: ${chalk8.bold(summary.minorIssues)}`));
+  if (summary.totalPotentialSavings) {
+    console.log(
+      chalk8.green(
+        `
+   \u{1F4A1} Potential savings: ${chalk8.bold(summary.totalPotentialSavings.toLocaleString())} tokens
+`
+      )
     );
-    if (outputFormat === "json") {
-      const outputData = formatStandardReport({
-        results,
-        summary,
-        elapsedTime,
-        score: patternScore
-      });
-      handleStandardJSONOutput({
-        outputData,
-        outputFile: userOutputFile,
-        resolvedDir
-      });
-    } else {
+  }
+}
+function renderSubSection(title) {
+  console.log("\n" + coreGetDivider());
+  console.log(chalk8.bold.white(`  ${title.toUpperCase()}`));
+  console.log(coreGetDivider() + "\n");
+}
+function renderToolScoreFooter(score) {
+  if (score) {
+    console.log(`
+\u{1F4CA} AI Readiness Score (${score.toolName || "Tool"})
+`);
+    console.log(formatToolScore(score));
+    console.log();
+  }
+}
+
+// src/commands/patterns.ts
+async function patternsAction(directory, options) {
+  return await executeToolAction(directory, options, {
+    toolName: "pattern-detect",
+    label: "Pattern analysis",
+    emoji: "\u{1F50D}",
+    defaults: {
+      useSmartDefaults: !options.fullScan,
+      include: void 0,
+      exclude: void 0,
+      output: { format: "console", file: void 0 },
+      minSimilarity: options.fullScan ? 0.4 : void 0,
+      minLines: options.fullScan ? 5 : void 0
+    },
+    getCliOptions: (opts) => ({
+      minSimilarity: opts.similarity ? parseFloat(opts.similarity) : void 0,
+      minLines: opts.minLines ? parseInt(opts.minLines) : void 0,
+      maxCandidatesPerBlock: opts.maxCandidates ? parseInt(opts.maxCandidates) : void 0,
+      minSharedTokens: opts.minSharedTokens ? parseInt(opts.minSharedTokens) : void 0
+    }),
+    importTool: async () => {
+      const { analyzePatterns, generateSummary, calculatePatternScore } = await import("@aiready/pattern-detect");
+      return {
+        analyze: analyzePatterns,
+        generateSummary,
+        calculateScore: calculatePatternScore
+      };
+    },
+    renderConsole: ({ results, summary, elapsedTime, score }) => {
+      const duplicates = results.duplicates || [];
       printTerminalHeader("PATTERN ANALYSIS SUMMARY");
       console.log(
-        chalk8.white(`\u{1F4C1} Files analyzed: ${chalk8.bold(results.length)}`)
+        chalk9.white(`\u{1F4C1} Files analyzed: ${chalk9.bold(results.length)}`)
       );
       console.log(
-        chalk8.yellow(
-          `\u26A0  Duplicate patterns found: ${chalk8.bold(summary.totalPatterns)}`
+        chalk9.yellow(
+          `\u26A0  Duplicate patterns found: ${chalk9.bold(summary.totalPatterns)}`
         )
       );
       console.log(
-        chalk8.red(
-          `\u{1F4B0} Token cost (wasted): ${chalk8.bold(summary.totalTokenCost.toLocaleString())}`
+        chalk9.red(
+          `\u{1F4B0} Token cost (wasted): ${chalk9.bold(summary.totalTokenCost.toLocaleString())}`
         )
       );
       console.log(
-        chalk8.gray(`\u23F1  Analysis time: ${chalk8.bold(elapsedTime + "s")}`)
+        chalk9.gray(`\u23F1  Analysis time: ${chalk9.bold(elapsedTime + "s")}`)
       );
       const sortedTypes = Object.entries(summary.patternsByType || {}).filter(([, count]) => count > 0).sort(([, a], [, b]) => b - a);
       if (sortedTypes.length > 0) {
-        console.log("\n" + getTerminalDivider());
-        console.log(chalk8.bold.white("  PATTERNS BY TYPE"));
-        console.log(getTerminalDivider() + "\n");
+        renderSubSection("Patterns By Type");
         sortedTypes.forEach(([type, count]) => {
-          console.log(`  ${chalk8.white(type.padEnd(15))} ${chalk8.bold(count)}`);
+          console.log(`  ${chalk9.white(type.padEnd(15))} ${chalk9.bold(count)}`);
         });
       }
       if (summary.totalPatterns > 0 && duplicates.length > 0) {
-        console.log("\n" + getTerminalDivider());
-        console.log(chalk8.bold.white("  TOP DUPLICATE PATTERNS"));
-        console.log(getTerminalDivider() + "\n");
-        const topDuplicates = [...duplicates].sort((a, b) => b.similarity - a.similarity).slice(0, 10);
-        topDuplicates.forEach((dup) => {
-          const severity = dup.similarity > 0.95 ? "CRITICAL" : dup.similarity > 0.9 ? "HIGH" : "MEDIUM";
-          const severityIcon = dup.similarity > 0.95 ? "\u{1F534}" : dup.similarity > 0.9 ? "\u{1F7E1}" : "\u{1F535}";
-          const file1Name = dup.file1.split("/").pop() || dup.file1;
-          const file2Name = dup.file2.split("/").pop() || dup.file2;
+        renderSubSection("Top Duplicate Patterns");
+        [...duplicates].sort((a, b) => b.similarity - a.similarity).slice(0, 10).forEach((dup) => {
+          const isHigh = dup.similarity > 0.9;
+          const icon = dup.similarity > 0.95 ? "\u{1F534}" : isHigh ? "\u{1F7E1}" : "\u{1F535}";
+          const label = dup.similarity > 0.95 ? "CRITICAL" : isHigh ? "HIGH" : "MEDIUM";
           console.log(
-            `${severityIcon} ${severity}: ${chalk8.bold(file1Name)} \u2194 ${chalk8.bold(file2Name)}`
+            `${icon} ${label}: ${chalk9.bold(dup.file1.split("/").pop())} \u2194 ${chalk9.bold(dup.file2.split("/").pop())}`
           );
           console.log(
-            `   Similarity: ${chalk8.bold(Math.round(dup.similarity * 100) + "%")} | Wasted: ${chalk8.bold(dup.tokenCost.toLocaleString())} tokens each`
+            `   Similarity: ${chalk9.bold(Math.round(dup.similarity * 100) + "%")} | Wasted: ${chalk9.bold(dup.tokenCost.toLocaleString())} tokens each`
           );
           console.log(
-            `   Lines: ${chalk8.cyan(dup.line1 + "-" + dup.endLine1)} \u2194 ${chalk8.cyan(dup.line2 + "-" + dup.endLine2)}
+            `   Lines: ${chalk9.cyan(dup.line1 + "-" + dup.endLine1)} \u2194 ${chalk9.cyan(dup.line2 + "-" + dup.endLine2)}
 `
           );
         });
       } else {
         console.log(
-          chalk8.green("\n\u2728 Great! No duplicate patterns detected.\n")
+          chalk9.green("\n\u2728 Great! No duplicate patterns detected.\n")
         );
       }
-      if (patternScore) {
-        console.log(getTerminalDivider());
-        console.log(chalk8.bold.white("  AI READINESS SCORE (Patterns)"));
-        console.log(getTerminalDivider() + "\n");
-        console.log(formatToolScore(patternScore));
-        console.log();
-      }
+      renderToolScoreFooter(score);
     }
-  } catch (error) {
-    handleCLIError3(error, "Pattern analysis");
-  }
+  });
 }
 var PATTERNS_HELP_TEXT = `
 EXAMPLES:
@@ -1173,300 +1282,150 @@ EXAMPLES:
 `;
 
 // src/commands/context.ts
-import chalk9 from "chalk";
-import {
-  handleCLIError as handleCLIError4,
-  getElapsedTime as getElapsedTime2,
-  formatToolScore as formatToolScore2,
-  prepareActionConfig as prepareActionConfig2,
-  resolveOutputFormat as resolveOutputFormat2,
-  formatStandardReport as formatStandardReport2,
-  handleStandardJSONOutput as handleStandardJSONOutput2
-} from "@aiready/core";
+import chalk10 from "chalk";
+import { printTerminalHeader as printTerminalHeader2 } from "@aiready/core";
 async function contextAction(directory, options) {
-  console.log(chalk9.blue("\u{1F9E0} Analyzing context costs...\n"));
-  const startTime = Date.now();
-  try {
-    const defaults = {
+  return await executeToolAction(directory, options, {
+    toolName: "context-analyzer",
+    label: "Context analysis",
+    emoji: "\u{1F9E0}",
+    defaults: {
       maxDepth: 5,
       maxContextBudget: 1e4,
       include: void 0,
       exclude: void 0,
-      output: {
-        format: "console",
-        file: void 0
-      }
-    };
-    const { resolvedDir, finalOptions: baseOptions } = await prepareActionConfig2(directory, defaults, {
-      maxDepth: options.maxDepth ? parseInt(options.maxDepth) : void 0,
-      maxContextBudget: options.maxContext ? parseInt(options.maxContext) : void 0,
-      include: options.include?.split(","),
-      exclude: options.exclude?.split(",")
-    });
-    let finalOptions = { ...baseOptions };
-    const { getSmartDefaults } = await import("@aiready/context-analyzer");
-    const contextSmartDefaults = await getSmartDefaults(
-      resolvedDir,
-      baseOptions
-    );
-    finalOptions = { ...contextSmartDefaults, ...finalOptions };
-    console.log("\u{1F4CB} Configuration:");
-    console.log(`   Max depth: ${finalOptions.maxDepth}`);
-    console.log(`   Max context budget: ${finalOptions.maxContextBudget}`);
-    console.log(
-      `   Min cohesion: ${(finalOptions.minCohesion * 100).toFixed(1)}%`
-    );
-    console.log(
-      `   Max fragmentation: ${(finalOptions.maxFragmentation * 100).toFixed(1)}%`
-    );
-    console.log(`   Analysis focus: ${finalOptions.focus}`);
-    console.log("");
-    const { analyzeContext, generateSummary, calculateContextScore } = await import("@aiready/context-analyzer");
-    const results = await analyzeContext(finalOptions);
-    const elapsedTime = getElapsedTime2(startTime);
-    const summary = generateSummary(results);
-    let contextScore;
-    if (options.score) {
-      contextScore = calculateContextScore(summary);
-    }
-    const { format: outputFormat, file: userOutputFile } = resolveOutputFormat2(
-      options,
-      finalOptions
-    );
-    if (outputFormat === "json") {
-      const outputData = formatStandardReport2({
-        results,
-        summary,
-        elapsedTime,
-        score: contextScore
-      });
-      handleStandardJSONOutput2({
-        outputData,
-        outputFile: userOutputFile,
-        resolvedDir
-      });
-    } else {
-      const terminalWidth = process.stdout.columns ?? 80;
-      const dividerWidth = Math.min(60, terminalWidth - 2);
-      const divider = "\u2501".repeat(dividerWidth);
-      console.log(chalk9.cyan(divider));
-      console.log(chalk9.bold.white("  CONTEXT ANALYSIS SUMMARY"));
-      console.log(chalk9.cyan(divider) + "\n");
+      output: { format: "console", file: void 0 }
+    },
+    getCliOptions: (opts) => ({
+      maxDepth: opts.maxDepth ? parseInt(opts.maxDepth) : void 0,
+      maxContextBudget: opts.maxContext ? parseInt(opts.maxContext) : void 0
+    }),
+    preAnalyze: async (resolvedDir, baseOptions) => {
+      const { getSmartDefaults } = await import("@aiready/context-analyzer");
+      const smartDefaults = await getSmartDefaults(resolvedDir, baseOptions);
+      return { ...smartDefaults, ...baseOptions };
+    },
+    importTool: async () => {
+      const { analyzeContext, generateSummary, calculateContextScore } = await import("@aiready/context-analyzer");
+      return {
+        analyze: analyzeContext,
+        generateSummary,
+        calculateScore: calculateContextScore
+      };
+    },
+    renderConsole: ({ summary, elapsedTime, score }) => {
+      printTerminalHeader2("CONTEXT ANALYSIS SUMMARY");
       console.log(
-        chalk9.white(`\u{1F4C1} Files analyzed: ${chalk9.bold(summary.totalFiles)}`)
+        chalk10.white(`\u{1F4C1} Files analyzed: ${chalk10.bold(summary.totalFiles)}`)
       );
       console.log(
-        chalk9.white(
-          `\u{1F4CA} Total tokens: ${chalk9.bold(summary.totalTokens.toLocaleString())}`
+        chalk10.white(
+          `\u{1F4CA} Total tokens: ${chalk10.bold(summary.totalTokens.toLocaleString())}`
         )
       );
       console.log(
-        chalk9.yellow(
-          `\u{1F4B0} Avg context budget: ${chalk9.bold(summary.avgContextBudget.toFixed(0))} tokens/file`
+        chalk10.yellow(
+          `\u{1F4B0} Avg context budget: ${chalk10.bold(summary.avgContextBudget.toFixed(0))} tokens/file`
         )
       );
       console.log(
-        chalk9.white(`\u23F1  Analysis time: ${chalk9.bold(elapsedTime + "s")}
+        chalk10.white(`\u23F1  Analysis time: ${chalk10.bold(elapsedTime + "s")}
 `)
       );
-      const totalIssues = summary.criticalIssues + summary.majorIssues + summary.minorIssues;
-      if (totalIssues > 0) {
-        console.log(chalk9.bold("\u26A0\uFE0F  Issues Found:\n"));
-        if (summary.criticalIssues > 0) {
-          console.log(
-            chalk9.red(`   \u{1F534} Critical: ${chalk9.bold(summary.criticalIssues)}`)
-          );
-        }
-        if (summary.majorIssues > 0) {
-          console.log(
-            chalk9.yellow(`   \u{1F7E1} Major: ${chalk9.bold(summary.majorIssues)}`)
-          );
-        }
-        if (summary.minorIssues > 0) {
-          console.log(
-            chalk9.blue(`   \u{1F535} Minor: ${chalk9.bold(summary.minorIssues)}`)
-          );
-        }
-        console.log(
-          chalk9.green(
-            `
-   \u{1F4A1} Potential savings: ${chalk9.bold(summary.totalPotentialSavings.toLocaleString())} tokens
-`
-          )
-        );
-      } else {
-        console.log(chalk9.green("\u2705 No significant issues found!\n"));
-      }
-      if (summary.deepFiles.length > 0) {
-        console.log(chalk9.bold("\u{1F4CF} Deep Import Chains:\n"));
-        console.log(
-          chalk9.gray(`   Average depth: ${summary.avgImportDepth.toFixed(1)}`)
-        );
-        console.log(
-          chalk9.gray(`   Maximum depth: ${summary.maxImportDepth}
-`)
-        );
+      renderIssueSummaryBlock(summary);
+      if (summary.deepFiles && summary.deepFiles.length > 0) {
+        renderSubSection("Deep Import Chains");
         summary.deepFiles.slice(0, 10).forEach((item) => {
           const fileName = item.file.split("/").slice(-2).join("/");
           console.log(
-            `   ${chalk9.cyan("\u2192")} ${chalk9.white(fileName)} ${chalk9.dim(`(depth: ${item.depth})`)}`
+            `   ${chalk10.cyan("\u2192")} ${chalk10.white(fileName)} ${chalk10.dim(`(depth: ${item.depth})`)}`
           );
         });
-        console.log();
       }
-      if (summary.fragmentedModules.length > 0) {
-        console.log(chalk9.bold("\u{1F9E9} Fragmented Modules:\n"));
-        console.log(
-          chalk9.gray(
-            `   Average fragmentation: ${(summary.avgFragmentation * 100).toFixed(0)}%
-`
-          )
-        );
+      if (summary.fragmentedModules && summary.fragmentedModules.length > 0) {
+        renderSubSection("Fragmented Modules");
         summary.fragmentedModules.slice(0, 10).forEach((module) => {
           console.log(
-            `   ${chalk9.yellow("\u25CF")} ${chalk9.white(module.domain)} - ${chalk9.dim(`${module.files.length} files, ${(module.fragmentationScore * 100).toFixed(0)}% scattered`)}`
+            `   ${chalk10.yellow("\u25CF")} ${chalk10.white(module.domain)} - ${chalk10.dim(`${module.files.length} files, ${(module.fragmentationScore * 100).toFixed(0)}% scattered`)}`
           );
           console.log(
-            chalk9.dim(
+            chalk10.dim(
               `     Token cost: ${module.totalTokens.toLocaleString()}, Cohesion: ${(module.avgCohesion * 100).toFixed(0)}%`
             )
           );
         });
-        console.log();
-      }
-      if (summary.lowCohesionFiles.length > 0) {
-        console.log(chalk9.bold("\u{1F500} Low Cohesion Files:\n"));
-        console.log(
-          chalk9.gray(
-            `   Average cohesion: ${(summary.avgCohesion * 100).toFixed(0)}%
-`
-          )
-        );
-        summary.lowCohesionFiles.slice(0, 10).forEach((item) => {
-          const fileName = item.file.split("/").slice(-2).join("/");
-          const scorePercent = (item.score * 100).toFixed(0);
-          const color = item.score < 0.4 ? chalk9.red : chalk9.yellow;
-          console.log(
-            `   ${color("\u25CB")} ${chalk9.white(fileName)} ${chalk9.dim(`(${scorePercent}% cohesion)`)}`
-          );
-        });
-        console.log();
-      }
-      if (summary.topExpensiveFiles.length > 0) {
-        console.log(chalk9.bold("\u{1F4B8} Most Expensive Files (Context Budget):\n"));
-        summary.topExpensiveFiles.slice(0, 10).forEach((item) => {
-          const fileName = item.file.split("/").slice(-2).join("/");
-          const severityColor = item.severity === "critical" ? chalk9.red : item.severity === "major" ? chalk9.yellow : chalk9.blue;
-          console.log(
-            `   ${severityColor("\u25CF")} ${chalk9.white(fileName)} ${chalk9.dim(`(${item.contextBudget.toLocaleString()} tokens)`)}`
-          );
-        });
-        console.log();
-      }
-      if (contextScore) {
-        console.log(chalk9.cyan(divider));
-        console.log(chalk9.bold.white("  AI READINESS SCORE (Context)"));
-        console.log(chalk9.cyan(divider) + "\n");
-        console.log(formatToolScore2(contextScore));
-        console.log();
       }
+      renderToolScoreFooter(score);
     }
-  } catch (error) {
-    handleCLIError4(error, "Context analysis");
-  }
+  });
 }
 
 // src/commands/consistency.ts
-import chalk10 from "chalk";
+import chalk11 from "chalk";
 import { writeFileSync as writeFileSync3 } from "fs";
 import {
-  handleCLIError as handleCLIError5,
-  getElapsedTime as getElapsedTime3,
   resolveOutputPath as resolveOutputPath2,
-  formatToolScore as formatToolScore3,
-  prepareActionConfig as prepareActionConfig3,
-  resolveOutputFormat as resolveOutputFormat3,
-  formatStandardReport as formatStandardReport3,
-  handleStandardJSONOutput as handleStandardJSONOutput3
+  formatToolScore as formatToolScore2,
+  resolveOutputFormat as resolveOutputFormat2
 } from "@aiready/core";
 async function consistencyAction(directory, options) {
-  console.log(chalk10.blue("\u{1F50D} Analyzing consistency...\n"));
-  const startTime = Date.now();
-  try {
-    const defaults = {
+  return await executeToolAction(directory, options, {
+    toolName: "naming-consistency",
+    label: "Consistency analysis",
+    emoji: "\u{1F50D}",
+    defaults: {
       checkNaming: true,
       checkPatterns: true,
       minSeverity: "info",
       include: void 0,
       exclude: void 0,
-      output: {
-        format: "console",
-        file: void 0
-      }
-    };
-    const { resolvedDir, finalOptions } = await prepareActionConfig3(
-      directory,
-      defaults,
-      {
-        checkNaming: options.naming !== false,
-        checkPatterns: options.patterns !== false,
-        minSeverity: options.minSeverity,
-        include: options.include?.split(","),
-        exclude: options.exclude?.split(",")
+      output: { format: "console", file: void 0 }
+    },
+    getCliOptions: (opts) => ({
+      checkNaming: opts.naming !== false,
+      checkPatterns: opts.patterns !== false,
+      minSeverity: opts.minSeverity
+    }),
+    importTool: async () => {
+      const { analyzeConsistency, calculateConsistencyScore } = await import("@aiready/consistency");
+      return {
+        analyze: analyzeConsistency,
+        generateSummary: (report) => report.summary,
+        calculateScore: (summary, _resultsCount) => {
+          return calculateConsistencyScore(
+            summary.results?.flatMap((r) => r.issues) ?? [],
+            summary.summary.filesAnalyzed
+          );
+        }
+      };
+    },
+    renderConsole: ({ results, summary, elapsedTime, score, finalOptions }) => {
+      const report = results;
+      const { format: outputFormat, file: userOutputFile } = resolveOutputFormat2(options, finalOptions);
+      if (outputFormat === "markdown") {
+        const markdown = generateMarkdownReport(report, elapsedTime);
+        const outputPath = resolveOutputPath2(
+          userOutputFile,
+          `aiready-report-${getReportTimestamp()}.md`,
+          directory
+        );
+        writeFileSync3(outputPath, markdown);
+        console.log(chalk11.green(`\u2705 Report saved to ${outputPath}`));
+        return;
       }
-    );
-    const { analyzeConsistency, calculateConsistencyScore } = await import("@aiready/consistency");
-    const report = await analyzeConsistency(finalOptions);
-    const elapsedTime = getElapsedTime3(startTime);
-    let consistencyScore;
-    if (options.score) {
-      const issues = report.results?.flatMap((r) => r.issues) ?? [];
-      consistencyScore = calculateConsistencyScore(
-        issues,
-        report.summary.filesAnalyzed
-      );
-    }
-    const { format: outputFormat, file: userOutputFile } = resolveOutputFormat3(
-      options,
-      finalOptions
-    );
-    if (outputFormat === "json") {
-      const outputData = formatStandardReport3({
-        report,
-        summary: report.summary,
-        elapsedTime,
-        score: consistencyScore
-      });
-      handleStandardJSONOutput3({
-        outputData,
-        outputFile: userOutputFile,
-        resolvedDir
-      });
-    } else if (outputFormat === "markdown") {
-      const markdown = generateMarkdownReport(report, elapsedTime);
-      const outputPath = resolveOutputPath2(
-        userOutputFile,
-        `aiready-report-${getReportTimestamp()}.md`,
-        resolvedDir
-      );
-      writeFileSync3(outputPath, markdown);
-      console.log(chalk10.green(`\u2705 Report saved to ${outputPath}`));
-    } else {
-      console.log(chalk10.bold("\n\u{1F4CA} Summary\n"));
-      console.log(
-        `Files Analyzed: ${chalk10.cyan(report.summary.filesAnalyzed)}`
-      );
-      console.log(`Total Issues: ${chalk10.yellow(report.summary.totalIssues)}`);
-      console.log(`  Naming: ${chalk10.yellow(report.summary.namingIssues)}`);
-      console.log(`  Patterns: ${chalk10.yellow(report.summary.patternIssues)}`);
+      console.log(chalk11.bold("\n\u{1F4CA} Summary\n"));
+      console.log(`Files Analyzed: ${chalk11.cyan(summary.filesAnalyzed)}`);
+      console.log(`Total Issues: ${chalk11.yellow(summary.totalIssues)}`);
+      console.log(`  Naming: ${chalk11.yellow(summary.namingIssues)}`);
+      console.log(`  Patterns: ${chalk11.yellow(summary.patternIssues)}`);
       console.log(
-        `  Architecture: ${chalk10.yellow(report.summary.architectureIssues ?? 0)}`
+        `  Architecture: ${chalk11.yellow(summary.architectureIssues ?? 0)}`
       );
-      console.log(`Analysis Time: ${chalk10.gray(elapsedTime + "s")}
+      console.log(`Analysis Time: ${chalk11.gray(elapsedTime + "s")}
 `);
-      if (report.summary.totalIssues === 0) {
+      if (summary.totalIssues === 0) {
         console.log(
-          chalk10.green(
+          chalk11.green(
             "\u2728 No consistency issues found! Your codebase is well-maintained.\n"
           )
         );
@@ -1478,84 +1437,72 @@ async function consistencyAction(directory, options) {
           (r) => r.issues.some((i) => i.category === "patterns")
         );
         if (namingResults.length > 0) {
-          console.log(chalk10.bold("\u{1F3F7}\uFE0F  Naming Issues\n"));
+          console.log(chalk11.bold("\u{1F3F7}\uFE0F  Naming Issues\n"));
           let shown = 0;
           for (const namingFileResult of namingResults) {
             if (shown >= 5) break;
             for (const issue of namingFileResult.issues) {
               if (shown >= 5) break;
-              const severityColor = issue.severity === "critical" ? chalk10.red : issue.severity === "major" ? chalk10.yellow : issue.severity === "minor" ? chalk10.blue : chalk10.gray;
+              const severityColor = issue.severity === "critical" ? chalk11.red : issue.severity === "major" ? chalk11.yellow : issue.severity === "minor" ? chalk11.blue : chalk11.gray;
               console.log(
-                `${severityColor(issue.severity.toUpperCase())} ${chalk10.dim(`${issue.location.file}:${issue.location.line}`)}`
+                `${severityColor(issue.severity.toUpperCase())} ${chalk11.dim(`${issue.location.file}:${issue.location.line}`)}`
               );
               console.log(`  ${issue.message}`);
               if (issue.suggestion) {
                 console.log(
-                  `  ${chalk10.dim("\u2192")} ${chalk10.italic(issue.suggestion)}`
+                  `  ${chalk11.dim("\u2192")} ${chalk11.italic(issue.suggestion)}`
                 );
               }
               console.log();
               shown++;
             }
           }
-          const remaining = namingResults.reduce((sum, r) => sum + r.issues.length, 0) - shown;
-          if (remaining > 0) {
-            console.log(chalk10.dim(`  ... and ${remaining} more issues
-`));
-          }
         }
         if (patternResults.length > 0) {
-          console.log(chalk10.bold("\u{1F504} Pattern Issues\n"));
+          console.log(chalk11.bold("\u{1F504} Pattern Issues\n"));
           let shown = 0;
           for (const patternFileResult of patternResults) {
             if (shown >= 5) break;
             for (const issue of patternFileResult.issues) {
               if (shown >= 5) break;
-              const severityColor = issue.severity === "critical" ? chalk10.red : issue.severity === "major" ? chalk10.yellow : issue.severity === "minor" ? chalk10.blue : chalk10.gray;
+              const severityColor = issue.severity === "critical" ? chalk11.red : issue.severity === "major" ? chalk11.yellow : issue.severity === "minor" ? chalk11.blue : chalk11.gray;
               console.log(
-                `${severityColor(issue.severity.toUpperCase())} ${chalk10.dim(`${issue.location.file}:${issue.location.line}`)}`
+                `${severityColor(issue.severity.toUpperCase())} ${chalk11.dim(`${issue.location.file}:${issue.location.line}`)}`
               );
               console.log(`  ${issue.message}`);
               if (issue.suggestion) {
                 console.log(
-                  `  ${chalk10.dim("\u2192")} ${chalk10.italic(issue.suggestion)}`
+                  `  ${chalk11.dim("\u2192")} ${chalk11.italic(issue.suggestion)}`
                 );
               }
               console.log();
               shown++;
             }
           }
-          const remaining = patternResults.reduce((sum, r) => sum + r.issues.length, 0) - shown;
-          if (remaining > 0) {
-            console.log(chalk10.dim(`  ... and ${remaining} more issues
-`));
-          }
         }
-        if (report.recommendations.length > 0) {
-          console.log(chalk10.bold("\u{1F4A1} Recommendations\n"));
+        if (report.recommendations?.length > 0) {
+          console.log(chalk11.bold("\u{1F4A1} Recommendations\n"));
           report.recommendations.forEach((rec, i) => {
             console.log(`${i + 1}. ${rec}`);
           });
           console.log();
         }
       }
-      if (consistencyScore) {
-        console.log(chalk10.bold("\n\u{1F4CA} AI Readiness Score (Consistency)\n"));
-        console.log(formatToolScore3(consistencyScore));
+      if (score) {
+        console.log(chalk11.bold("\n\u{1F4CA} AI Readiness Score (Consistency)\n"));
+        console.log(formatToolScore2(score));
         console.log();
       }
     }
-  } catch (error) {
-    handleCLIError5(error, "Consistency analysis");
-  }
+  });
 }
 
 // src/commands/visualize.ts
-import chalk11 from "chalk";
+import chalk12 from "chalk";
 import { writeFileSync as writeFileSync4, readFileSync as readFileSync3, existsSync as existsSync3, copyFileSync } from "fs";
 import { resolve as resolvePath5 } from "path";
 import { spawn } from "child_process";
-import { handleCLIError as handleCLIError6 } from "@aiready/core";
+import { handleCLIError as handleCLIError4 } from "@aiready/core";
 import { generateHTML, findLatestReport as findLatestReport2 } from "@aiready/core";
 async function visualizeAction(directory, options) {
   try {
@@ -1566,12 +1513,12 @@ async function visualizeAction(directory, options) {
       if (latestScan) {
         reportPath = latestScan;
         console.log(
-          chalk11.dim(`Found latest report: ${latestScan.split("/").pop()}`)
+          chalk12.dim(`Found latest report: ${latestScan.split("/").pop()}`)
         );
       } else {
-        console.error(chalk11.red("\u274C No AI readiness report found"));
+        console.error(chalk12.red("\u274C No AI readiness report found"));
         console.log(
-          chalk11.dim(
+          chalk12.dim(
             `
 Generate a report with:
   aiready scan --output json
@@ -1701,19 +1648,19 @@ Or specify a custom report:
           return;
         } else {
           console.log(
-            chalk11.yellow(
+            chalk12.yellow(
               "\u26A0\uFE0F  Dev server not available (requires local @aiready/visualizer with web assets)."
             )
           );
           console.log(
-            chalk11.cyan("   Falling back to static HTML generation...\n")
+            chalk12.cyan("   Falling back to static HTML generation...\n")
           );
           useDevMode = false;
         }
       } catch (err) {
         console.error("Failed to start dev server:", err);
         console.log(
-          chalk11.cyan("   Falling back to static HTML generation...\n")
+          chalk12.cyan("   Falling back to static HTML generation...\n")
         );
         useDevMode = false;
       }
@@ -1723,7 +1670,7 @@ Or specify a custom report:
     const defaultOutput = "visualization.html";
     const outPath = resolvePath5(dirPath, options.output ?? defaultOutput);
     writeFileSync4(outPath, html, "utf8");
-    console.log(chalk11.green(`\u2705 Visualization written to: ${outPath}`));
+    console.log(chalk12.green(`\u2705 Visualization written to: ${outPath}`));
     if (options.open || options.serve) {
       const opener = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
       if (options.serve) {
@@ -1753,7 +1700,7 @@ Or specify a custom report:
           server.listen(port, () => {
             const addr = `http://localhost:${port}/`;
             console.log(
-              chalk11.cyan(`\u{1F310} Local visualization server running at ${addr}`)
+              chalk12.cyan(`\u{1F310} Local visualization server running at ${addr}`)
             );
             spawn(opener, [`"${addr}"`], { shell: true });
           });
@@ -1769,7 +1716,7 @@ Or specify a custom report:
       }
     }
   } catch (err) {
-    handleCLIError6(err, "Visualization");
+    handleCLIError4(err, "Visualization");
   }
 }
 var VISUALIZE_HELP_TEXT = `
@@ -1800,72 +1747,134 @@ NOTES:
 `;
 
 // src/commands/shared/standard-tool-actions.ts
-import chalk12 from "chalk";
+import chalk13 from "chalk";
 
 // src/commands/agent-grounding.ts
-import chalk13 from "chalk";
-import { loadConfig as loadConfig2, mergeConfigWithDefaults as mergeConfigWithDefaults2 } from "@aiready/core";
+import chalk14 from "chalk";
 
 // src/commands/testability.ts
-import chalk14 from "chalk";
-import { loadConfig as loadConfig3, mergeConfigWithDefaults as mergeConfigWithDefaults3 } from "@aiready/core";
+import chalk15 from "chalk";
 async function testabilityAction(directory, options) {
-  const { analyzeTestability, calculateTestabilityScore } = await import("@aiready/testability");
-  const config = await loadConfig3(directory);
-  const merged = mergeConfigWithDefaults3(config, {
-    minCoverageRatio: 0.3
-  });
-  const report = await analyzeTestability({
-    rootDir: directory,
-    minCoverageRatio: options.minCoverageRatio ?? merged.minCoverageRatio,
-    include: options.include,
-    exclude: options.exclude
+  return await executeToolAction(directory, options, {
+    toolName: "testability-index",
+    label: "Testability analysis",
+    emoji: "\u{1F9EA}",
+    defaults: {
+      minCoverageRatio: 0.3,
+      include: void 0,
+      exclude: void 0,
+      output: { format: "console", file: void 0 }
+    },
+    getCliOptions: (opts) => ({
+      minCoverageRatio: opts.minCoverage ? parseFloat(opts.minCoverage) : void 0
+    }),
+    importTool: async () => {
+      const tool = await import("@aiready/testability");
+      return {
+        analyze: tool.analyzeTestability,
+        generateSummary: (report) => report.summary,
+        calculateScore: tool.calculateTestabilityScore
+      };
+    },
+    renderConsole: ({ results, summary, score }) => {
+      renderToolHeader("Testability", "\u{1F9EA}", score?.score || 0, summary.rating);
+      renderSafetyRating(summary.aiChangeSafetyRating);
+      const rawData = results.rawData || results;
+      console.log(
+        chalk15.dim(
+          `     Coverage: ${Math.round(summary.coverageRatio * 100)}%  (${rawData.testFiles} test / ${rawData.sourceFiles} source files)`
+        )
+      );
+      if (summary.aiChangeSafetyRating === "blind-risk") {
+        console.log(
+          chalk15.red.bold(
+            "\n     \u26A0\uFE0F  NO TESTS \u2014 AI changes to this codebase are completely unverifiable!\n"
+          )
+        );
+      }
+      if (score) {
+        renderToolScoreFooter(score);
+      }
+    }
   });
-  const scoring = calculateTestabilityScore(report);
-  if (options.output === "json") {
-    return scoring;
-  }
-  const safetyIcons = {
-    safe: "\u2705",
-    "moderate-risk": "\u26A0\uFE0F ",
-    "high-risk": "\u{1F534}",
-    "blind-risk": "\u{1F480}"
-  };
-  const safetyColors = {
-    safe: chalk14.green,
-    "moderate-risk": chalk14.yellow,
-    "high-risk": chalk14.red,
-    "blind-risk": chalk14.bgRed.white
-  };
-  const safety = report.summary.aiChangeSafetyRating;
-  const icon = safetyIcons[safety] ?? "\u2753";
-  const color = safetyColors[safety] ?? chalk14.white;
-  console.log(
-    `  \u{1F9EA} Testability:         ${chalk14.bold(scoring.score + "/100")} (${report.summary.rating})`
-  );
-  console.log(
-    `     AI Change Safety:  ${color(`${icon} ${safety.toUpperCase()}`)}`
-  );
-  console.log(
-    chalk14.dim(
-      `     Coverage: ${Math.round(report.summary.coverageRatio * 100)}%  (${report.rawData.testFiles} test / ${report.rawData.sourceFiles} source files)`
-    )
-  );
-  if (safety === "blind-risk") {
-    console.log(
-      chalk14.red.bold(
-        "\n     \u26A0\uFE0F  NO TESTS \u2014 AI changes to this codebase are completely unverifiable!\n"
-      )
-    );
-  }
-  return scoring;
 }
 
 // src/commands/change-amplification.ts
 import { changeAmplificationAction } from "@aiready/change-amplification/dist/cli.js";
 
+// src/commands/contract-enforcement.ts
+import chalk16 from "chalk";
+async function contractEnforcementAction(directory, options) {
+  return await executeToolAction(directory, options, {
+    toolName: "contract-enforcement",
+    label: "Contract enforcement analysis",
+    emoji: "\u{1F6E1}\uFE0F",
+    defaults: {
+      minChainDepth: 3,
+      include: void 0,
+      exclude: void 0,
+      output: { format: "console", file: void 0 }
+    },
+    getCliOptions: (opts) => ({
+      minChainDepth: opts.minChainDepth ? parseInt(opts.minChainDepth, 10) : void 0
+    }),
+    importTool: async () => {
+      const tool = await import("@aiready/contract-enforcement");
+      return {
+        analyze: tool.analyzeContractEnforcement,
+        generateSummary: (report) => report.summary,
+        calculateScore: tool.calculateContractEnforcementScore
+      };
+    },
+    renderConsole: ({ results, summary, score }) => {
+      renderToolHeader(
+        "Contract Enforcement",
+        "\u{1F6E1}\uFE0F",
+        score?.score || 0,
+        summary.rating
+      );
+      const rawData = results.rawData || results;
+      console.log(
+        chalk16.dim(
+          `     Patterns: ${summary.totalDefensivePatterns}  (${summary.defensiveDensity}/kLOC)  |  ${summary.sourceFiles} files scanned`
+        )
+      );
+      const dims = summary.dimensions;
+      if (dims) {
+        const entries = [
+          ["Type Escape Hatches", dims.typeEscapeHatchScore],
+          ["Fallback Cascades", dims.fallbackCascadeScore],
+          ["Error Transparency", dims.errorTransparencyScore],
+          ["Boundary Validation", dims.boundaryValidationScore]
+        ];
+        for (const [name, val] of entries) {
+          const color = val >= 80 ? chalk16.green : val >= 60 ? chalk16.yellow : chalk16.red;
+          console.log(chalk16.dim(`     ${name}: ${color(val + "/100")}`));
+        }
+      }
+      if (summary.totalDefensivePatterns > 0 && rawData["as-any"] !== void 0) {
+        const breakdown = [
+          rawData["as-any"] && `as-any: ${rawData["as-any"]}`,
+          rawData["as-unknown"] && `as-unknown: ${rawData["as-unknown"]}`,
+          rawData["deep-optional-chain"] && `deep-?.: ${rawData["deep-optional-chain"]}`,
+          rawData["nullish-literal-default"] && `?? literal: ${rawData["nullish-literal-default"]}`,
+          rawData["swallowed-error"] && `swallowed-error: ${rawData["swallowed-error"]}`,
+          rawData["env-fallback"] && `env-fallback: ${rawData["env-fallback"]}`,
+          rawData["unnecessary-guard"] && `guard-clause: ${rawData["unnecessary-guard"]}`,
+          rawData["any-parameter"] && `any-param: ${rawData["any-parameter"]}`,
+          rawData["any-return"] && `any-return: ${rawData["any-return"]}`
+        ].filter(Boolean).join("  |  ");
+        console.log(chalk16.dim(`     ${breakdown}`));
+      }
+      if (score) {
+        renderToolScoreFooter(score);
+      }
+    }
+  });
+}
+
 // src/commands/bug.ts
-import chalk15 from "chalk";
+import chalk17 from "chalk";
 import { execSync } from "child_process";
 async function bugAction(message, options) {
   const repoUrl = "https://github.com/caopengau/aiready-cli";
@@ -1883,35 +1892,35 @@ Generated via AIReady CLI 'bug' command.
 Type: ${type}
     `.trim();
     if (options.submit) {
-      console.log(chalk15.blue("\u{1F680} Submitting issue via GitHub CLI...\n"));
+      console.log(chalk17.blue("\u{1F680} Submitting issue via GitHub CLI...\n"));
       try {
         execSync("gh auth status", { stdio: "ignore" });
         const command = `gh issue create --repo ${repoSlug} --title ${JSON.stringify(title)} --body ${JSON.stringify(body)} --label ${label}`;
         const output = execSync(command, { encoding: "utf8" }).trim();
-        console.log(chalk15.green("\u2705 Issue Created Successfully!"));
-        console.log(chalk15.cyan(output));
+        console.log(chalk17.green("\u2705 Issue Created Successfully!"));
+        console.log(chalk17.cyan(output));
         return;
       } catch {
-        console.error(chalk15.red("\n\u274C Failed to submit via gh CLI."));
+        console.error(chalk17.red("\n\u274C Failed to submit via gh CLI."));
         console.log(
-          chalk15.yellow(
+          chalk17.yellow(
             '   Make sure gh is installed and run "gh auth login".\n'
           )
         );
-        console.log(chalk15.dim("   Falling back to URL generation..."));
+        console.log(chalk17.dim("   Falling back to URL generation..."));
       }
     }
     const template = type === "bug" ? "bug_report.md" : type === "feature" ? "feature_request.md" : "new_metric_idea.md";
     const fullUrl = `${repoUrl}/issues/new?title=${encodeURIComponent(title)}&body=${encodeURIComponent(body)}&labels=${label}&template=${template}`;
-    console.log(chalk15.green("\u{1F680} Issue Draft Prepared!\n"));
-    console.log(chalk15.bold("Title:  ") + title);
-    console.log(chalk15.bold("Type:   ") + type);
-    console.log(chalk15.bold("\nClick the link below to submit this issue:"));
-    console.log(chalk15.cyan(fullUrl));
-    console.log(chalk15.bold("\n\u{1F916} [FOR AI AGENTS]:"));
-    console.log(chalk15.dim("   You have successfully prepared a report."));
+    console.log(chalk17.green("\u{1F680} Issue Draft Prepared!\n"));
+    console.log(chalk17.bold("Title:  ") + title);
+    console.log(chalk17.bold("Type:   ") + type);
+    console.log(chalk17.bold("\nClick the link below to submit this issue:"));
+    console.log(chalk17.cyan(fullUrl));
+    console.log(chalk17.bold("\n\u{1F916} [FOR AI AGENTS]:"));
+    console.log(chalk17.dim("   You have successfully prepared a report."));
     console.log(
-      chalk15.dim(
+      chalk17.dim(
         "   Please present the URL above to the user so they can finalize the submission."
       )
     );
@@ -1920,14 +1929,14 @@ Type: ${type}
   const bugUrl = `${repoUrl}/issues/new?template=bug_report.md`;
   const featureUrl = `${repoUrl}/issues/new?template=feature_request.md`;
   const metricUrl = `${repoUrl}/issues/new?template=new_metric_idea.md`;
-  console.log(chalk15.blue("\u{1F4AC} Feedback & Bug Reports\n"));
-  console.log(`  Report a Bug:        ${chalk15.cyan(bugUrl)}`);
-  console.log(`  Request a Feature:   ${chalk15.cyan(featureUrl)}`);
-  console.log(`  Suggest a Metric:    ${chalk15.cyan(metricUrl)}`);
-  console.log(chalk15.bold("\n\u{1F916} [FOR AI AGENTS]:"));
-  console.log(chalk15.dim("   To prepare a specific report, run:"));
+  console.log(chalk17.blue("\u{1F4AC} Feedback & Bug Reports\n"));
+  console.log(`  Report a Bug:        ${chalk17.cyan(bugUrl)}`);
+  console.log(`  Request a Feature:   ${chalk17.cyan(featureUrl)}`);
+  console.log(`  Suggest a Metric:    ${chalk17.cyan(metricUrl)}`);
+  console.log(chalk17.bold("\n\u{1F916} [FOR AI AGENTS]:"));
+  console.log(chalk17.dim("   To prepare a specific report, run:"));
   console.log(
-    chalk15.cyan(
+    chalk17.cyan(
       '   aiready bug "your description here" --type bug|feature|metric'
     )
   );
@@ -1940,6 +1949,97 @@ EXAMPLES:
   $ aiready bug "Fix typo in scan output" --submit   # Submit directly via gh CLI
 `;
 
+// src/commands/remediate.ts
+import chalk18 from "chalk";
+import { resolve as resolvePath6 } from "path";
+import { existsSync as existsSync4, readdirSync } from "fs";
+import { printTerminalHeader as printTerminalHeader3 } from "@aiready/core";
+async function remediateAction(directory, options) {
+  const resolvedDir = resolvePath6(process.cwd(), directory || ".");
+  const serverUrl = options.server || "https://platform.getaiready.dev";
+  printTerminalHeader3("AIREADY REMEDIATION SWARM");
+  console.log(chalk18.cyan("\u{1F916} Initializing local remediation agent..."));
+  let reportPath = options.report;
+  if (!reportPath) {
+    const aireadyDir = resolvePath6(resolvedDir, ".aiready");
+    if (existsSync4(aireadyDir)) {
+      const files = readdirSync(aireadyDir).filter((f) => f.startsWith("aiready-report-") && f.endsWith(".json")).sort().reverse();
+      if (files.length > 0) {
+        reportPath = resolvePath6(aireadyDir, files[0]);
+        console.log(chalk18.dim(`\u{1F4C2} Using latest report: ${files[0]}`));
+      }
+    }
+  }
+  if (!reportPath || !existsSync4(reportPath)) {
+    console.log(chalk18.yellow("\n\u26A0\uFE0F  No AIReady report found."));
+    console.log(
+      chalk18.dim(
+        "   Remediation requires a recent scan report to identify issues."
+      )
+    );
+    console.log(chalk18.white(`   Run ${chalk18.bold("aiready scan")} first.
+`));
+    return;
+  }
+  console.log(chalk18.green("\n\u2705 Analysis data loaded."));
+  console.log(chalk18.bold("\n\u{1F680} Remediation Strategy:"));
+  if (options.tool === "patterns" || !options.tool) {
+    console.log(
+      chalk18.white(
+        `   \u2022 ${chalk18.bold("Pattern Consolidation")}: Suggested refactors for 95%+ similar code blocks.`
+      )
+    );
+  }
+  if (options.tool === "consistency" || !options.tool) {
+    console.log(
+      chalk18.white(
+        `   \u2022 ${chalk18.bold("Naming Alignment")}: Automated TSDoc generation and constant extraction.`
+      )
+    );
+  }
+  if (options.tool === "context" || !options.tool) {
+    console.log(
+      chalk18.white(
+        `   \u2022 ${chalk18.bold("Context Optimization")}: Barrel file cleanup and import flattening.`
+      )
+    );
+  }
+  console.log(
+    chalk18.dim(
+      "\n\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"
+    )
+  );
+  console.log(chalk18.bold("\u2728 Use the Platform Swarm for Automated Fixes"));
+  console.log(
+    chalk18.cyan(`   The high-performance Remediation Swarm is available at:`)
+  );
+  console.log(chalk18.white(`   ${chalk18.bold(`${serverUrl}/remediate`)}`));
+  console.log(
+    chalk18.dim(
+      "\n   The swarm uses specialized agents to safely refactor your code,"
+    )
+  );
+  console.log(
+    chalk18.dim("   ensuring every change improves your AI-readiness score.")
+  );
+  console.log(
+    chalk18.dim(
+      "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"
+    )
+  );
+  console.log(
+    chalk18.dim(
+      '\n\u{1F4A1} Next Version: Local "aiready fix" command for minor documentation issues.'
+    )
+  );
+}
+var REMEDIATE_HELP_TEXT = `
+EXAMPLES:
+  $ aiready remediate                    # See remediation options for latest report
+  $ aiready remediate --tool patterns    # Focus on pattern consolidation
+  $ aiready remediate --report ./custom-report.json
+`;
+
 // src/cli.ts
 var getDirname = () => {
   if (typeof __dirname !== "undefined") return __dirname;
@@ -2090,9 +2190,19 @@ program.command("change-amplification").description("Analyze graph metrics for c
 program.command("testability").description("Analyze test coverage and AI readiness").argument("[directory]", "Directory to analyze", ".").option("--min-coverage <ratio>", "Minimum acceptable coverage ratio", "0.3").option("--include <patterns>", "File patterns to include (comma-separated)").option("--exclude <patterns>", "File patterns to exclude (comma-separated)").option("-o, --output <format>", "Output format: console, json", "console").option("--output-file <path>", "Output file path (for json)").action(async (directory, options) => {
   await testabilityAction(directory, options);
 });
+program.command("contract").description("Analyze structural contract enforcement and defensive coding").argument("[directory]", "Directory to analyze", ".").option(
+  "--min-chain-depth <depth>",
+  "Minimum optional chain depth to flag",
+  "3"
+).option("--include <patterns>", "File patterns to include (comma-separated)").option("--exclude <patterns>", "File patterns to exclude (comma-separated)").option("-o, --output <format>", "Output format: console, json", "console").option("--output-file <path>", "Output file path (for json)").action(async (directory, options) => {
+  await contractEnforcementAction(directory, options);
+});
 program.command("upload").description("Upload an AIReady report JSON to the platform").argument("<file>", "Report JSON file to upload").option("--api-key <key>", "Platform API key").option("--repo-id <id>", "Platform repository ID (optional)").option("--server <url>", "Custom platform URL").addHelpText("after", UPLOAD_HELP_TEXT).action(async (file, options) => {
   await uploadAction(file, options);
 });
+program.command("remediate").description("Suggest AI-ready refactors based on a scan report").argument("[directory]", "Directory to remediate", ".").option("-r, --report <path>", "AIReady report JSON file").option("-t, --tool <name>", "Filter by tool: patterns, context, consistency").option("--server <url>", "Custom platform URL").addHelpText("after", REMEDIATE_HELP_TEXT).action(async (directory, options) => {
+  await remediateAction(directory, options);
+});
 program.command("bug").description("Report a bug or provide feedback (Agent-friendly)").argument("[message]", "Short description of the issue").option("-t, --type <type>", "Issue type: bug, feature, metric", "bug").option("--submit", "Submit the issue directly using the GitHub CLI (gh)").addHelpText("after", BUG_HELP_TEXT).action(async (message, options) => {
   await bugAction(message, options);
 });