gut-cli 0.1.5 → 0.1.6

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { Command as Command11 } from "commander";
+import { Command as Command10 } from "commander";
 
 // src/commands/cleanup.ts
 import { Command } from "commander";
@@ -402,40 +402,6 @@ var CodeReviewSchema = z.object({
   ),
   positives: z.array(z.string()).describe("Good practices observed")
 });
-var DiffSummarySchema = z.object({
-  summary: z.string().describe("Brief one-line summary of what changed"),
-  changes: z.array(
-    z.object({
-      file: z.string(),
-      description: z.string().describe("What changed in this file")
-    })
-  ),
-  impact: z.string().describe("What impact these changes have on the codebase"),
-  notes: z.array(z.string()).optional().describe("Any important notes or considerations")
-});
-async function generateDiffSummary(diff, options) {
-  const model = await getModel(options);
-  const result = await generateObject({
-    model,
-    schema: DiffSummarySchema,
-    prompt: `You are an expert at explaining code changes in a clear and concise way.
-
-Analyze the following git diff and provide a human-friendly summary.
-
-Focus on:
-- What was changed and why it might have been changed
-- The purpose and impact of the changes
-- Any notable patterns or refactoring
-
-Git diff:
-\`\`\`
-${diff.slice(0, 1e4)}
-\`\`\`
-
-Explain the changes in plain language that any developer can understand.`
-  });
-  return result.object;
-}
 async function generateCodeReview(diff, options) {
   const model = await getModel(options);
   const result = await generateObject({
@@ -563,6 +529,7 @@ Explain in a way that helps someone quickly understand this file's purpose and h
     return result2.object;
   }
   let contextInfo;
+  let targetType;
   if (context.type === "pr") {
     contextInfo = `
 Pull Request: #${context.metadata.prNumber}
@@ -571,6 +538,7 @@ Branch: ${context.metadata.headBranch} -> ${context.metadata.baseBranch}
 Commits:
 ${context.metadata.commits?.map((c) => `- ${c}`).join("\n") || "N/A"}
 `;
+    targetType = "pull request";
   } else if (context.type === "file-history") {
     contextInfo = `
 File: ${context.metadata.filePath}
@@ -579,6 +547,12 @@ ${context.metadata.commits?.map((c) => `- ${c}`).join("\n") || "N/A"}
 Latest author: ${context.metadata.author}
 Latest date: ${context.metadata.date}
 `;
+    targetType = "file changes";
+  } else if (context.type === "uncommitted" || context.type === "staged") {
+    contextInfo = `
+${context.type === "staged" ? "Staged changes (ready to commit)" : "Uncommitted changes (work in progress)"}
+`;
+    targetType = context.type === "staged" ? "staged changes" : "uncommitted changes";
   } else {
     contextInfo = `
 Commit: ${context.metadata.hash?.slice(0, 7)}
@@ -586,8 +560,8 @@ Message: ${context.title}
 Author: ${context.metadata.author}
 Date: ${context.metadata.date}
 `;
+    targetType = "commit";
   }
-  const targetType = context.type === "pr" ? "pull request" : context.type === "file-history" ? "file changes" : "commit";
   const result = await generateObject({
     model,
     schema: ExplanationSchema,
@@ -1092,85 +1066,11 @@ function printReview(review) {
   console.log();
 }
 
-// src/commands/ai-diff.ts
+// src/commands/ai-merge.ts
 import { Command as Command6 } from "commander";
 import chalk6 from "chalk";
 import ora5 from "ora";
 import { simpleGit as simpleGit5 } from "simple-git";
-var aiDiffCommand = new Command6("ai-diff").alias("diff").description("Get an AI-powered explanation of your changes").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic)", "gemini").option("-m, --model <model>", "Model to use (provider-specific)").option("-s, --staged", "Explain only staged changes").option("-c, --commit <hash>", "Explain a specific commit").option("--json", "Output as JSON").action(async (options) => {
-  const git = simpleGit5();
-  const isRepo = await git.checkIsRepo();
-  if (!isRepo) {
-    console.error(chalk6.red("Error: Not a git repository"));
-    process.exit(1);
-  }
-  const provider = options.provider.toLowerCase();
-  const spinner = ora5("Getting diff...").start();
-  try {
-    let diff;
-    if (options.commit) {
-      diff = await git.diff([`${options.commit}^`, options.commit]);
-      spinner.text = `Analyzing commit ${options.commit.slice(0, 7)}...`;
-    } else if (options.staged) {
-      diff = await git.diff(["--cached"]);
-      spinner.text = "Analyzing staged changes...";
-    } else {
-      diff = await git.diff();
-      const stagedDiff = await git.diff(["--cached"]);
-      diff = stagedDiff + "\n" + diff;
-      spinner.text = "Analyzing uncommitted changes...";
-    }
-    if (!diff.trim()) {
-      spinner.info("No changes to analyze");
-      process.exit(0);
-    }
-    spinner.text = "AI is analyzing your changes...";
-    const summary = await generateDiffSummary(diff, {
-      provider,
-      model: options.model
-    });
-    spinner.stop();
-    if (options.json) {
-      console.log(JSON.stringify(summary, null, 2));
-      return;
-    }
-    printSummary(summary);
-  } catch (error) {
-    spinner.fail("Failed to analyze diff");
-    console.error(chalk6.red(error instanceof Error ? error.message : "Unknown error"));
-    process.exit(1);
-  }
-});
-function printSummary(summary) {
-  console.log(chalk6.bold("\n\u{1F4DD} Change Summary\n"));
-  console.log(chalk6.cyan("Overview:"));
-  console.log(`  ${summary.summary}
-`);
-  if (summary.changes.length > 0) {
-    console.log(chalk6.cyan("Changes:"));
-    for (const change of summary.changes) {
-      console.log(`  ${chalk6.yellow(change.file)}`);
-      console.log(`    ${chalk6.gray(change.description)}`);
-    }
-    console.log();
-  }
-  console.log(chalk6.cyan("Impact:"));
-  console.log(`  ${summary.impact}
-`);
-  if (summary.notes && summary.notes.length > 0) {
-    console.log(chalk6.cyan("Notes:"));
-    for (const note of summary.notes) {
-      console.log(`  ${chalk6.gray("\u2022")} ${note}`);
-    }
-    console.log();
-  }
-}
-
-// src/commands/ai-merge.ts
-import { Command as Command7 } from "commander";
-import chalk7 from "chalk";
-import ora6 from "ora";
-import { simpleGit as simpleGit6 } from "simple-git";
 import * as fs from "fs";
 import * as path from "path";
 var MERGE_STRATEGY_PATHS = [
@@ -1186,57 +1086,57 @@ function findMergeStrategy(repoRoot) {
   }
   return null;
 }
-var aiMergeCommand = new Command7("ai-merge").alias("merge").description("Merge a branch with AI-powered conflict resolution").argument("<branch>", "Branch to merge").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic)", "gemini").option("-m, --model <model>", "Model to use (provider-specific)").option("--no-commit", "Do not auto-commit after resolving").action(async (branch, options) => {
-  const git = simpleGit6();
+var aiMergeCommand = new Command6("ai-merge").alias("merge").description("Merge a branch with AI-powered conflict resolution").argument("<branch>", "Branch to merge").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic)", "gemini").option("-m, --model <model>", "Model to use (provider-specific)").option("--no-commit", "Do not auto-commit after resolving").action(async (branch, options) => {
+  const git = simpleGit5();
   const isRepo = await git.checkIsRepo();
   if (!isRepo) {
-    console.error(chalk7.red("Error: Not a git repository"));
+    console.error(chalk6.red("Error: Not a git repository"));
     process.exit(1);
   }
   const provider = options.provider.toLowerCase();
   const status = await git.status();
   if (status.modified.length > 0 || status.staged.length > 0) {
-    console.error(chalk7.red("Error: Working directory has uncommitted changes"));
-    console.log(chalk7.gray("Please commit or stash your changes first"));
+    console.error(chalk6.red("Error: Working directory has uncommitted changes"));
+    console.log(chalk6.gray("Please commit or stash your changes first"));
     process.exit(1);
   }
   const branchInfo = await git.branch();
   const currentBranch = branchInfo.current;
-  console.log(chalk7.bold(`
-Merging ${chalk7.cyan(branch)} into ${chalk7.cyan(currentBranch)}...
+  console.log(chalk6.bold(`
+Merging ${chalk6.cyan(branch)} into ${chalk6.cyan(currentBranch)}...
 `));
   try {
     await git.merge([branch]);
-    console.log(chalk7.green("\u2713 Merged successfully (no conflicts)"));
+    console.log(chalk6.green("\u2713 Merged successfully (no conflicts)"));
     return;
   } catch (error) {
   }
   const conflictStatus = await git.status();
   const conflictedFiles = conflictStatus.conflicted;
   if (conflictedFiles.length === 0) {
-    console.error(chalk7.red("Merge failed for unknown reason"));
+    console.error(chalk6.red("Merge failed for unknown reason"));
     await git.merge(["--abort"]);
     process.exit(1);
   }
-  console.log(chalk7.yellow(`\u26A0 ${conflictedFiles.length} conflict(s) detected
+  console.log(chalk6.yellow(`\u26A0 ${conflictedFiles.length} conflict(s) detected
 `));
-  const spinner = ora6();
+  const spinner = ora5();
   const rootDir = await git.revparse(["--show-toplevel"]);
   const strategy = findMergeStrategy(rootDir.trim());
   if (strategy) {
-    console.log(chalk7.gray("Using merge strategy from project...\n"));
+    console.log(chalk6.gray("Using merge strategy from project...\n"));
   }
   for (const file of conflictedFiles) {
     const filePath = path.join(rootDir.trim(), file);
     const content = fs.readFileSync(filePath, "utf-8");
-    console.log(chalk7.bold(`
+    console.log(chalk6.bold(`
 \u{1F4C4} ${file}`));
     const conflictMatch = content.match(/<<<<<<< HEAD[\s\S]*?>>>>>>>.+/g);
     if (conflictMatch) {
-      console.log(chalk7.gray("\u2500".repeat(50)));
-      console.log(chalk7.gray(conflictMatch[0].slice(0, 500)));
-      if (conflictMatch[0].length > 500) console.log(chalk7.gray("..."));
-      console.log(chalk7.gray("\u2500".repeat(50)));
+      console.log(chalk6.gray("\u2500".repeat(50)));
+      console.log(chalk6.gray(conflictMatch[0].slice(0, 500)));
+      if (conflictMatch[0].length > 500) console.log(chalk6.gray("..."));
+      console.log(chalk6.gray("\u2500".repeat(50)));
     }
     spinner.start("AI is analyzing conflict...");
     try {
@@ -1246,57 +1146,57 @@ Merging ${chalk7.cyan(branch)} into ${chalk7.cyan(currentBranch)}...
         theirsRef: branch
       }, { provider, model: options.model }, strategy || void 0);
       spinner.stop();
-      console.log(chalk7.cyan("\n\u{1F916} AI suggests:"));
-      console.log(chalk7.gray("\u2500".repeat(50)));
+      console.log(chalk6.cyan("\n\u{1F916} AI suggests:"));
+      console.log(chalk6.gray("\u2500".repeat(50)));
       const preview = resolution.resolvedContent.slice(0, 800);
       console.log(preview);
-      if (resolution.resolvedContent.length > 800) console.log(chalk7.gray("..."));
-      console.log(chalk7.gray("\u2500".repeat(50)));
-      console.log(chalk7.gray(`Strategy: ${resolution.strategy}`));
-      console.log(chalk7.gray(`Reason: ${resolution.explanation}`));
+      if (resolution.resolvedContent.length > 800) console.log(chalk6.gray("..."));
+      console.log(chalk6.gray("\u2500".repeat(50)));
+      console.log(chalk6.gray(`Strategy: ${resolution.strategy}`));
+      console.log(chalk6.gray(`Reason: ${resolution.explanation}`));
       const readline = await import("readline");
       const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout
       });
       const answer = await new Promise((resolve) => {
-        rl.question(chalk7.cyan("\nAccept this resolution? (y/n/s to skip) "), resolve);
+        rl.question(chalk6.cyan("\nAccept this resolution? (y/n/s to skip) "), resolve);
       });
       rl.close();
       if (answer.toLowerCase() === "y") {
         fs.writeFileSync(filePath, resolution.resolvedContent);
         await git.add(file);
-        console.log(chalk7.green(`\u2713 Resolved ${file}`));
+        console.log(chalk6.green(`\u2713 Resolved ${file}`));
       } else if (answer.toLowerCase() === "s") {
-        console.log(chalk7.yellow(`\u23ED Skipped ${file}`));
+        console.log(chalk6.yellow(`\u23ED Skipped ${file}`));
       } else {
-        console.log(chalk7.yellow(`\u2717 Rejected - resolve manually: ${file}`));
+        console.log(chalk6.yellow(`\u2717 Rejected - resolve manually: ${file}`));
       }
     } catch (error) {
       spinner.fail("AI resolution failed");
-      console.error(chalk7.red(error instanceof Error ? error.message : "Unknown error"));
-      console.log(chalk7.yellow(`Please resolve manually: ${file}`));
+      console.error(chalk6.red(error instanceof Error ? error.message : "Unknown error"));
+      console.log(chalk6.yellow(`Please resolve manually: ${file}`));
     }
   }
   const finalStatus = await git.status();
   if (finalStatus.conflicted.length > 0) {
-    console.log(chalk7.yellow(`
+    console.log(chalk6.yellow(`
 \u26A0 ${finalStatus.conflicted.length} conflict(s) remaining`));
-    console.log(chalk7.gray("Resolve manually and run: git add <files> && git commit"));
+    console.log(chalk6.gray("Resolve manually and run: git add <files> && git commit"));
   } else if (options.commit !== false) {
     await git.commit(`Merge branch '${branch}' into ${currentBranch}`);
-    console.log(chalk7.green("\n\u2713 All conflicts resolved and committed"));
+    console.log(chalk6.green("\n\u2713 All conflicts resolved and committed"));
   } else {
-    console.log(chalk7.green("\n\u2713 All conflicts resolved"));
-    console.log(chalk7.gray("Run: git commit"));
+    console.log(chalk6.green("\n\u2713 All conflicts resolved"));
+    console.log(chalk6.gray("Run: git commit"));
   }
 });
 
 // src/commands/changelog.ts
-import { Command as Command8 } from "commander";
-import chalk8 from "chalk";
-import ora7 from "ora";
-import { simpleGit as simpleGit7 } from "simple-git";
+import { Command as Command7 } from "commander";
+import chalk7 from "chalk";
+import ora6 from "ora";
+import { simpleGit as simpleGit6 } from "simple-git";
 import { existsSync as existsSync4, readFileSync as readFileSync4 } from "fs";
 import { join as join4 } from "path";
 var CHANGELOG_PATHS = [
@@ -1337,15 +1237,15 @@ function formatChangelog(changelog) {
   }
   return lines.join("\n");
 }
-var changelogCommand = new Command8("changelog").description("Generate a changelog from commits between refs").argument("[from]", "Starting ref (tag, branch, commit)", "HEAD~10").argument("[to]", "Ending ref", "HEAD").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic)", "gemini").option("-m, --model <model>", "Model to use (provider-specific)").option("-t, --tag <tag>", "Generate changelog since this tag").option("--json", "Output as JSON").action(async (from, to, options) => {
-  const git = simpleGit7();
+var changelogCommand = new Command7("changelog").description("Generate a changelog from commits between refs").argument("[from]", "Starting ref (tag, branch, commit)", "HEAD~10").argument("[to]", "Ending ref", "HEAD").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic)", "gemini").option("-m, --model <model>", "Model to use (provider-specific)").option("-t, --tag <tag>", "Generate changelog since this tag").option("--json", "Output as JSON").action(async (from, to, options) => {
+  const git = simpleGit6();
   const isRepo = await git.checkIsRepo();
   if (!isRepo) {
-    console.error(chalk8.red("Error: Not a git repository"));
+    console.error(chalk7.red("Error: Not a git repository"));
     process.exit(1);
   }
   const provider = options.provider.toLowerCase();
-  const spinner = ora7("Analyzing commits...").start();
+  const spinner = ora6("Analyzing commits...").start();
   try {
     let fromRef = from;
     let toRef = to;
@@ -1391,27 +1291,27 @@ var changelogCommand = new Command8("changelog").description("Generate a changel
       console.log(JSON.stringify(changelog, null, 2));
       return;
     }
-    console.log(chalk8.bold("\n\u{1F4CB} Generated Changelog\n"));
-    console.log(chalk8.gray("\u2500".repeat(50)));
+    console.log(chalk7.bold("\n\u{1F4CB} Generated Changelog\n"));
+    console.log(chalk7.gray("\u2500".repeat(50)));
     console.log(formatChangelog(changelog));
-    console.log(chalk8.gray("\u2500".repeat(50)));
-    console.log(chalk8.gray(`
+    console.log(chalk7.gray("\u2500".repeat(50)));
+    console.log(chalk7.gray(`
 Range: ${fromRef}..${toRef} (${commits.length} commits)`));
     if (existingChangelog) {
-      console.log(chalk8.gray("Style matched from existing CHANGELOG.md"));
+      console.log(chalk7.gray("Style matched from existing CHANGELOG.md"));
     }
   } catch (error) {
     spinner.fail("Failed to generate changelog");
-    console.error(chalk8.red(error instanceof Error ? error.message : "Unknown error"));
+    console.error(chalk7.red(error instanceof Error ? error.message : "Unknown error"));
     process.exit(1);
   }
 });
 
 // src/commands/ai-explain.ts
-import { Command as Command9 } from "commander";
-import chalk9 from "chalk";
-import ora8 from "ora";
-import { simpleGit as simpleGit8 } from "simple-git";
+import { Command as Command8 } from "commander";
+import chalk8 from "chalk";
+import ora7 from "ora";
+import { simpleGit as simpleGit7 } from "simple-git";
 import { execSync as execSync2 } from "child_process";
 import { existsSync as existsSync5, readFileSync as readFileSync5 } from "fs";
 import { join as join5 } from "path";
@@ -1427,37 +1327,42 @@ function findExplainContext(repoRoot) {
   }
   return null;
 }
-var aiExplainCommand = new Command9("ai-explain").alias("explain").description("Get an AI-powered explanation of a commit, PR, or file changes").argument("[target]", "Commit hash, PR number, PR URL, or file path").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic)", "gemini").option("-m, --model <model>", "Model to use (provider-specific)").option("-n, --commits <n>", "Number of commits to analyze for file history (default: 1)", "1").option("--history", "Explain file change history instead of content").option("--json", "Output as JSON").action(async (target, options) => {
-  const git = simpleGit8();
+var aiExplainCommand = new Command8("ai-explain").alias("explain").description("Get an AI-powered explanation of changes, commits, PRs, or files").argument("[target]", "Commit hash, PR number, PR URL, or file path (default: uncommitted changes)").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic)", "gemini").option("-m, --model <model>", "Model to use (provider-specific)").option("-s, --staged", "Explain only staged changes").option("-n, --commits <n>", "Number of commits to analyze for file history (default: 1)", "1").option("--history", "Explain file change history instead of content").option("--json", "Output as JSON").action(async (target, options) => {
+  const git = simpleGit7();
   const isRepo = await git.checkIsRepo();
   if (!isRepo) {
-    console.error(chalk9.red("Error: Not a git repository"));
+    console.error(chalk8.red("Error: Not a git repository"));
     process.exit(1);
   }
   const provider = options.provider.toLowerCase();
   const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
-  const spinner = ora8("Analyzing...").start();
+  const spinner = ora7("Analyzing...").start();
   try {
     let context;
-    if (!target) {
-      target = "HEAD";
-    }
-    const isPR = target.match(/^#?\d+$/) || target.includes("/pull/");
-    const isFile = existsSync5(target);
-    if (isPR) {
-      context = await getPRContext(target, spinner);
-    } else if (isFile) {
-      if (options.history) {
-        context = await getFileHistoryContext(target, git, spinner, parseInt(options.commits, 10));
+    if (!target || options.staged) {
+      if (options.staged) {
+        context = await getStagedContext(git, spinner);
       } else {
-        context = await getFileContentContext(target, spinner);
+        context = await getUncommittedContext(git, spinner);
       }
     } else {
-      context = await getCommitContext(target, git, spinner);
+      const isPR = target.match(/^#?\d+$/) || target.includes("/pull/");
+      const isFile = existsSync5(target);
+      if (isPR) {
+        context = await getPRContext(target, spinner);
+      } else if (isFile) {
+        if (options.history) {
+          context = await getFileHistoryContext(target, git, spinner, parseInt(options.commits, 10));
+        } else {
+          context = await getFileContentContext(target, spinner);
+        }
+      } else {
+        context = await getCommitContext(target, git, spinner);
+      }
     }
     const projectContext = findExplainContext(repoRoot.trim());
     if (projectContext) {
-      console.log(chalk9.gray("Using project context..."));
+      console.log(chalk8.gray("Using project context..."));
     }
     spinner.text = "AI is generating explanation...";
     const explanation = await generateExplanation(context, {
@@ -1472,10 +1377,38 @@ var aiExplainCommand = new Command9("ai-explain").alias("explain").description("
     printExplanation(explanation, context.type);
   } catch (error) {
     spinner.fail("Failed to generate explanation");
-    console.error(chalk9.red(error instanceof Error ? error.message : "Unknown error"));
+    console.error(chalk8.red(error instanceof Error ? error.message : "Unknown error"));
     process.exit(1);
   }
 });
+async function getUncommittedContext(git, spinner) {
+  spinner.text = "Analyzing uncommitted changes...";
+  const stagedDiff = await git.diff(["--cached"]);
+  const unstagedDiff = await git.diff();
+  const diff = (stagedDiff + "\n" + unstagedDiff).trim();
+  if (!diff) {
+    throw new Error("No uncommitted changes to analyze");
+  }
+  return {
+    type: "uncommitted",
+    title: "Uncommitted changes",
+    diff,
+    metadata: {}
+  };
+}
+async function getStagedContext(git, spinner) {
+  spinner.text = "Analyzing staged changes...";
+  const diff = await git.diff(["--cached"]);
+  if (!diff.trim()) {
+    throw new Error("No staged changes to analyze");
+  }
+  return {
+    type: "staged",
+    title: "Staged changes",
+    diff,
+    metadata: {}
+  };
+}
 async function getCommitContext(hash, git, spinner) {
   spinner.text = `Analyzing commit ${hash.slice(0, 7)}...`;
   const log = await git.log({ from: `${hash}^`, to: hash, maxCount: 1 });
@@ -1586,44 +1519,46 @@ function printExplanation(explanation, type) {
     pr: "\u{1F500}",
     "file-content": "\u{1F4C4}",
     "file-history": "\u{1F4DC}",
-    commit: "\u{1F4DD}"
+    commit: "\u{1F4DD}",
+    uncommitted: "\u270F\uFE0F",
+    staged: "\u{1F4CB}"
   };
   const icon = icons[type] || "\u{1F4DD}";
-  console.log(chalk9.bold(`
+  console.log(chalk8.bold(`
 ${icon} Explanation
 `));
-  console.log(chalk9.cyan("Summary:"));
+  console.log(chalk8.cyan("Summary:"));
   console.log(`  ${explanation.summary}
 `);
-  console.log(chalk9.cyan("Purpose:"));
+  console.log(chalk8.cyan("Purpose:"));
   console.log(`  ${explanation.purpose}
 `);
   if (explanation.changes.length > 0) {
     const header = type === "file-content" ? "Components:" : "Key Changes:";
-    console.log(chalk9.cyan(header));
+    console.log(chalk8.cyan(header));
     for (const change of explanation.changes) {
-      console.log(`  ${chalk9.yellow(change.file)}`);
-      console.log(`    ${chalk9.gray(change.description)}`);
+      console.log(`  ${chalk8.yellow(change.file)}`);
+      console.log(`    ${chalk8.gray(change.description)}`);
     }
     console.log();
   }
-  console.log(chalk9.cyan("Impact:"));
+  console.log(chalk8.cyan("Impact:"));
   console.log(`  ${explanation.impact}
 `);
   if (explanation.notes && explanation.notes.length > 0) {
-    console.log(chalk9.cyan("Notes:"));
+    console.log(chalk8.cyan("Notes:"));
     for (const note of explanation.notes) {
-      console.log(`  ${chalk9.gray("\u2022")} ${note}`);
+      console.log(`  ${chalk8.gray("\u2022")} ${note}`);
     }
     console.log();
   }
 }
 
 // src/commands/ai-find.ts
-import { Command as Command10 } from "commander";
-import chalk10 from "chalk";
-import ora9 from "ora";
-import { simpleGit as simpleGit9 } from "simple-git";
+import { Command as Command9 } from "commander";
+import chalk9 from "chalk";
+import ora8 from "ora";
+import { simpleGit as simpleGit8 } from "simple-git";
 import { existsSync as existsSync6, readFileSync as readFileSync6 } from "fs";
 import { join as join6 } from "path";
 var CONTEXT_PATHS2 = [".gut/find.md"];
@@ -1636,16 +1571,16 @@ function findProjectContext(repoRoot) {
   }
   return null;
 }
-var aiFindCommand = new Command10("ai-find").alias("find").description("Find commits matching a vague description using AI").argument("<query>", 'Description of the change you are looking for (e.g., "login feature added")').option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic)", "gemini").option("-m, --model <model>", "Model to use (provider-specific)").option("-n, --num <n>", "Number of commits to search through", "100").option("--path <path>", "Limit search to commits affecting this path").option("--author <author>", "Limit search to commits by this author").option("--since <date>", "Limit search to commits after this date").option("--until <date>", "Limit search to commits before this date").option("--max-results <n>", "Maximum number of matching commits to return", "5").option("--json", "Output as JSON").action(async (query, options) => {
-  const git = simpleGit9();
+var aiFindCommand = new Command9("ai-find").alias("find").description("Find commits matching a vague description using AI").argument("<query>", 'Description of the change you are looking for (e.g., "login feature added")').option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic)", "gemini").option("-m, --model <model>", "Model to use (provider-specific)").option("-n, --num <n>", "Number of commits to search through", "100").option("--path <path>", "Limit search to commits affecting this path").option("--author <author>", "Limit search to commits by this author").option("--since <date>", "Limit search to commits after this date").option("--until <date>", "Limit search to commits before this date").option("--max-results <n>", "Maximum number of matching commits to return", "5").option("--json", "Output as JSON").action(async (query, options) => {
+  const git = simpleGit8();
   const isRepo = await git.checkIsRepo();
   if (!isRepo) {
-    console.error(chalk10.red("Error: Not a git repository"));
+    console.error(chalk9.red("Error: Not a git repository"));
     process.exit(1);
   }
   const provider = options.provider.toLowerCase();
   const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
-  const spinner = ora9("Searching commits...").start();
+  const spinner = ora8("Searching commits...").start();
   try {
     const logOptions = [`-n`, options.num];
     if (options.path) {
@@ -1687,8 +1622,8 @@ var aiFindCommand = new Command10("ai-find").alias("find").description("Find com
     );
     spinner.stop();
     if (results.matches.length === 0) {
-      console.log(chalk10.yellow("\nNo matching commits found for your query."));
-      console.log(chalk10.gray(`Searched ${commits.length} commits.`));
+      console.log(chalk9.yellow("\nNo matching commits found for your query."));
+      console.log(chalk9.gray(`Searched ${commits.length} commits.`));
       process.exit(0);
     }
     if (options.json) {
@@ -1698,46 +1633,45 @@ var aiFindCommand = new Command10("ai-find").alias("find").description("Find com
     printResults(results, query);
   } catch (error) {
     spinner.fail("Failed to search commits");
-    console.error(chalk10.red(error instanceof Error ? error.message : "Unknown error"));
+    console.error(chalk9.red(error instanceof Error ? error.message : "Unknown error"));
     process.exit(1);
   }
 });
 function printResults(results, query) {
-  console.log(chalk10.bold(`
+  console.log(chalk9.bold(`
 \u{1F50D} Found ${results.matches.length} matching commit(s)
 `));
-  console.log(chalk10.gray(`Query: "${query}"
+  console.log(chalk9.gray(`Query: "${query}"
 `));
   for (let i = 0; i < results.matches.length; i++) {
     const match = results.matches[i];
     const num = i + 1;
-    console.log(chalk10.cyan(`\u{1F4DD} Commit ${num}`));
-    console.log(`  ${chalk10.gray("Hash:")}    ${chalk10.yellow(match.hash.slice(0, 7))}`);
-    console.log(`  ${chalk10.gray("Message:")} ${match.message.split("\n")[0]}`);
-    console.log(`  ${chalk10.gray("Author:")}  ${match.author} <${match.email}>`);
-    console.log(`  ${chalk10.gray("Date:")}    ${match.date}`);
-    console.log(`  ${chalk10.gray("Reason:")}  ${chalk10.green(match.reason)}`);
+    console.log(chalk9.cyan(`\u{1F4DD} Commit ${num}`));
+    console.log(`  ${chalk9.gray("Hash:")}    ${chalk9.yellow(match.hash.slice(0, 7))}`);
+    console.log(`  ${chalk9.gray("Message:")} ${match.message.split("\n")[0]}`);
+    console.log(`  ${chalk9.gray("Author:")}  ${match.author} <${match.email}>`);
+    console.log(`  ${chalk9.gray("Date:")}    ${match.date}`);
+    console.log(`  ${chalk9.gray("Reason:")}  ${chalk9.green(match.reason)}`);
     if (match.relevance) {
-      const relevanceColor = match.relevance === "high" ? chalk10.green : match.relevance === "medium" ? chalk10.yellow : chalk10.gray;
-      console.log(`  ${chalk10.gray("Match:")}   ${relevanceColor(match.relevance)}`);
+      const relevanceColor = match.relevance === "high" ? chalk9.green : match.relevance === "medium" ? chalk9.yellow : chalk9.gray;
+      console.log(`  ${chalk9.gray("Match:")}   ${relevanceColor(match.relevance)}`);
     }
     console.log();
   }
   if (results.summary) {
-    console.log(chalk10.gray("---"));
-    console.log(chalk10.gray(`Summary: ${results.summary}`));
+    console.log(chalk9.gray("---"));
+    console.log(chalk9.gray(`Summary: ${results.summary}`));
   }
 }
 
 // src/index.ts
-var program = new Command11();
+var program = new Command10();
 program.name("gut").description("Git Utility Tool - AI-powered git commands").version("0.1.0");
 program.addCommand(cleanupCommand);
 program.addCommand(authCommand);
 program.addCommand(aiCommitCommand);
 program.addCommand(aiPrCommand);
 program.addCommand(aiReviewCommand);
-program.addCommand(aiDiffCommand);
 program.addCommand(aiMergeCommand);
 program.addCommand(changelogCommand);
 program.addCommand(aiExplainCommand);