gitxplain 0.1.6 → 0.1.9

package/cli/index.js

@@ -3,23 +3,28 @@
 import path from "node:path";
 import process from "node:process";
 import { fileURLToPath } from "node:url";
-import { realpathSync } from "node:fs";
+import { readFileSync, realpathSync } from "node:fs";
 import { generateExplanation } from "./services/aiService.js";
-import { startChatSession } from "./services/chatService.js";
+import { clearCache, getCacheStats } from "./services/cacheService.js";
 import { loadEnvFile } from "./services/envLoader.js";
-import {
-  saveGitConnection,
-  isGitConnected,
-  loadGitConnection,
-  getGitUserInfo,
-  verifyGitToken
-} from "./services/gitConnectionService.js";
 import { copyToClipboard } from "./services/clipboardService.js";
-import { loadConfig } from "./services/configService.js";
+import { getUsageStats } from "./services/usageService.js";
+import {
+  applyConfigEnvironment,
+  getProviderApiKeyField,
+  getUserConfigPath,
+  loadConfig,
+  loadUserConfig,
+  updateUserConfig
+} from "./services/configService.js";
 import {
   buildBranchRange,
   deletePaths,
+  fetchBlameData,
   fetchCommitData,
+  fetchCommitDataForFile,
+  fetchConflictData,
+  fetchStashData,
   fetchWorkingTreeData,
   gitAddFiles,
   gitPull,
@@ -81,10 +86,18 @@ const MODE_FLAGS = new Map([
   ["--lines", "lines"],
   ["--review", "review"],
   ["--security", "security"],
+  ["--refactor", "refactor"],
+  ["--test-suggest", "test-suggest"],
+  ["--pr-description", "pr-description"],
+  ["--changelog", "changelog"],
+  ["--blame", "blame"],
+  ["--conflict", "conflict"],
+  ["--stash", "stash"],
   ["--split", "split"],
   ["--merge", "merge"],
   ["--tag", "tag"],
   ["--commit", "commit"],
+  ["--release", "release"],
   ["--log", "log"],
   ["--status", "status"],
   ["--pipeline", "pipeline"]
@@ -96,9 +109,29 @@ const FORMAT_FLAGS = new Map([
   ["--html", "html"]
 ]);
 
+const ANALYSIS_MODES = new Set([
+  "summary",
+  "issues",
+  "fix",
+  "impact",
+  "full",
+  "lines",
+  "review",
+  "security",
+  "refactor",
+  "test-suggest",
+  "pr-description",
+  "changelog",
+  "blame",
+  "conflict",
+  "stash",
+  "split"
+]);
+
 const RESERVED_SUBCOMMANDS = new Set([
   "help",
-  "example",
+  "cache",
+  "config",
   "install-hook",
   "git",
   "add",
@@ -107,207 +140,114 @@ const RESERVED_SUBCOMMANDS = new Set([
   "bin",
   "pop",
   "pull",
-  "push",
-  "commit",
-  "merge",
-  "tag",
-  "release",
-  "log",
-  "status",
-  "pipeline"
+  "push"
 ]);
 
+const CLI_VERSION = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8")).version;
+
 function printHelp() {
   console.log(`gitxplain - AI-powered Git change analysis, review, and commit workflow CLI
 
 Usage:
-  gitxplain help
   gitxplain --help
-  gitxplain example
-  gitxplain --example
-  gitxplain git <native-git-args...>
-
-Git:
-  gitxplain commit
+  gitxplain --version
+  gitxplain cache clear
+  gitxplain cache stats
+  gitxplain --cost
+  gitxplain install-hook [post-commit|post-merge|pre-push]
+  gitxplain config set provider <name>
+  gitxplain config set api-key <value> [--provider <name>]
+  gitxplain config get [key]
+  gitxplain config list
+  gitxplain <commit-id> [options]
+  gitxplain <start>..<end> [options]
+  gitxplain --branch [base-ref] [options]
+  gitxplain --pr [base-ref] [options]
   gitxplain --commit
-  gitxplain merge
+  gitxplain --release [status]
   gitxplain --merge
-  gitxplain tag
   gitxplain --tag
-  gitxplain release
-  gitxplain release status
-  gitxplain log
+  gitxplain --conflict
+  gitxplain --stash [stash-ref]
   gitxplain --log
-  gitxplain status
   gitxplain --status
   gitxplain --pipeline
-  gitxplain add <path> [more-paths...]
-  gitxplain remove <path> [more-paths...]
-  gitxplain remove hard
-  gitxplain del <path> [more-paths...]
-  gitxplain bin
-  gitxplain pop [stash-index]
-  gitxplain pull [remote] [branch]
-  gitxplain push [remote] [branch]
-  gitxplain install-hook [hook-name]
-
-GitHub:
-  gitxplain --connect-github [token]
-  gitxplain --boot [options]
 
 Analysis:
-  gitxplain <commit-id> [options]
-  gitxplain <start>..<end> [options]
-  gitxplain --branch [base-ref] [options]
-  gitxplain --pr [base-ref] [options]
-
-What It Does:
-  Analyze commits, ranges, branches, and working tree changes
-  Generate summaries, reviews, security checks, and line-by-line walkthroughs
-  Plan commits for uncommitted work and split oversized commits into atomic steps
-  Merge release-version branch changes into a dedicated release branch
-  Tag release-version commit windows on the current branch
-  Inspect release branch health, missing tags, and drift from the source branch
-  Inspect repository history and working tree status without calling the LLM
-  Inspect the current repository and scaffold GitHub Actions CI/CD workflows
-  Run quick local actions to stage, unstage, delete files, pop stashes, or push
-  Pull from a remote or soft-reset the latest commit without leaving the CLI
-  Pass through any native Git command and flags when you need the full Git surface
-
-Modes:
-  --summary    Generate a one-line summary of a change
-  --issues     Focus on the bug, issue, or failure being addressed
-  --fix        Explain the fix in simple, junior-friendly terms
-  --impact     Explain before-vs-after behavior changes
-  --full       Generate a full structured analysis
-  --lines      Walk through the changed code file by file
-  --review     Generate review findings, risks, and suggestions
-  --security   Focus on security-relevant changes and concerns
-  --split      Propose splitting a commit into smaller atomic commits
-  --merge      Preview or apply a merge into the release branch based on version bumps
-  --tag        Preview or create release tags based on version bumps
-  release      Show release branch health, missing tags, and next recommended action
-  --commit     Propose commits for current uncommitted changes
-  --log        Print Git log entries for the current repository
-  --status     Print Git working tree status for the current repository
-  --pipeline   Detect the current repository stack and create CI/CD workflow files
-  --execute    Execute a proposed split or commit plan
-  --dry-run    Preview the plan without executing it (default for --split and --commit)
+  --summary       Generate a one-line summary of a change
+  --issues        Focus on the issue or failure being addressed
+  --fix           Explain the fix in simple terms
+  --impact        Explain behavior changes before vs after
+  --full          Generate a full structured analysis
+  --lines         Walk through the changed code file by file
+  --review        Generate review findings, risks, and suggestions
+  --security      Focus on security-relevant changes and concerns
+  --refactor      Suggest refactoring opportunities in the change
+  --test-suggest  Suggest tests to add or update for the change
+  --pr-description Generate a ready-to-paste PR description
+  --changelog     Generate changelog-style release notes
+  --blame <file>  Analyze ownership and history for one file with git blame
+  --conflict      Suggest resolutions for unresolved merge conflicts in the working tree
+  --stash [ref]   Explain a stash entry, defaulting to stash@{0}
+  --split         Propose splitting a commit into smaller atomic commits
+  --cost          Show cumulative token usage and estimated cost totals
+  --commit        Propose commits for current uncommitted changes
+  --execute       Execute a proposed split or commit plan
+  --dry-run       Preview the plan without executing it
+  --interactive   Review or edit a split plan before execution
+
+Release:
+  --release [status]  Show release branch health and next recommended action
+  --merge         Preview or apply a merge into the release branch
+  --tag           Preview or create release tags from version bumps
+
+Repo:
+  --log           Print Git log entries for the current repository
+  --status        Print Git working tree status for the current repository
+  --pipeline      Detect the current repository stack and create GitHub/GitLab/CircleCI/Bitbucket CI files
 
 Quick Actions:
-  add         Stage one or more files with git add
-  remove      Unstage one or more files with git restore --staged
-  remove hard Hard reset the repository to HEAD
-  del         Delete one or more files from the working tree
-  bin         Soft reset HEAD~1 while keeping your changes
-  pop         Pop a stash entry with a plain numeric index like "pop 2"
-  pull        Run git pull, optionally with a remote and branch
-  push        Run git push, optionally with a remote and branch
+  config          Persist provider, model, and API key settings
+  add             Stage one or more files with git add
+  remove          Unstage one or more files with git restore --staged
+  remove hard     Hard reset the repository to HEAD
+  del             Delete one or more files from the working tree
+  bin             Soft reset HEAD~1 while keeping your changes
+  pop             Pop a stash entry like "pop 2"
+  pull            Run git pull, optionally with a remote and branch
+  push            Run git push, optionally with a remote and branch
+  install-hook    Install a post-commit, post-merge, or pre-push gitxplain hook
+  cache           Manage gitxplain cache entries
+  git             Pass through to native git commands
 
 Output:
-  --json       Print structured JSON output
-  --markdown   Print Markdown output
-  --html       Print HTML output
-  --quiet      Print only the main body without extra framing
-  --verbose    Print provider, model, cache, latency, and usage details
-  --clipboard  Copy the final output to the system clipboard
-  --stream     Stream model output as it is generated when supported
-
-GitHub:
-  --connect-github Save your GitHub Personal Access Token to act autonomously inside Chat
-  --boot            Launch an interactive chat session for dynamic querying, PR creation, and cloning
-
-Providers:
-  --provider   LLM provider: openai, groq, openrouter, gemini, ollama, chutes
-  --model      Override the model name
-
-Diff Budget:
-  --max-diff-lines <n>   Limit diff lines sent to the model
+  --provider <name>
+  --model <name>
+  --json
+  --markdown
+  --html
+  --quiet
+  --verbose
+  --clipboard
+  --stream
+  --no-cache
+  --diff <file>
+  --max-diff-lines <n>
 
 Comparison:
-  --branch [base-ref]    Analyze the current branch against a base branch
-  --pr [base-ref]        Alias for --branch, useful for PR-style comparisons
-
-Provider Setup:
-  OpenAI:
-    export LLM_PROVIDER=openai
-    export OPENAI_API_KEY=your_key
-
-  Groq:
-    export LLM_PROVIDER=groq
-    export GROQ_API_KEY=your_key
-
-  OpenRouter:
-    export LLM_PROVIDER=openrouter
-    export OPENROUTER_API_KEY=your_key
-
-  Gemini:
-    export LLM_PROVIDER=gemini
-    export GEMINI_API_KEY=your_key
-
-  Ollama:
-    export LLM_PROVIDER=ollama
-    export OLLAMA_MODEL=llama3.2
-
-  Chutes:
-    export LLM_PROVIDER=chutes
-    export CHUTES_API_KEY=your_key
+  --branch [base-ref]   Analyze the current branch against a base branch
+  --pr [base-ref]       Alias for --branch, useful for PR-style comparisons
 
 Config:
   Project config: .gitxplainrc or .gitxplainrc.json
-  User config: ~/.gitxplain/config.json
-
-Hook Installation:
-  gitxplain install-hook
-  gitxplain install-hook post-commit
+  User config: ~/.gitxplain/config.json (macOS/Linux) or %USERPROFILE%\\.gitxplain\\config.json (Windows)
 
 Notes:
   Run gitxplain inside a Git repository.
-  If no mode is supplied, gitxplain will prompt you to choose one interactively.
+  If no command or mode is supplied, gitxplain prints this help text.
   Use --provider or --model to override your config or environment for one command.
   Use gitxplain git <args...> to run any native Git subcommand with its normal flags.
-`);
-}
-
-function printExamples() {
-  console.log(`gitxplain examples
-
-Examples:
-  gitxplain --connect-github <token>
-  gitxplain --boot
-  gitxplain HEAD~1 --full
-  gitxplain HEAD~1 --review
-  gitxplain HEAD~5..HEAD --markdown
-  gitxplain --branch main --review
-  gitxplain --pr origin/main --security --stream
-  gitxplain commit
-  gitxplain --commit --execute
-  gitxplain merge
-  gitxplain --merge --execute
-  gitxplain tag
-  gitxplain --tag --execute
-  gitxplain release
-  gitxplain release status
-  gitxplain log
-  gitxplain --log
-  gitxplain status
-  gitxplain --status
-  gitxplain pipeline
-  gitxplain --pipeline
-  gitxplain add README.md
-  gitxplain remove README.md
-  gitxplain remove hard
-  gitxplain del scratch.txt
-  gitxplain bin
-  gitxplain pop
-  gitxplain pop 2
-  gitxplain pull
-  gitxplain pull origin main
-  gitxplain push
-  gitxplain push origin main
-  gitxplain HEAD~1 --split
-  gitxplain HEAD --split --execute
-  gitxplain HEAD~1 --provider chutes --model deepseek-ai/DeepSeek-V3-0324
+  install-hook supports: post-commit, post-merge, pre-push.
 `);
 }
 
@@ -339,6 +279,132 @@ function parseNumber(value, fallback = null) {
   return parsed;
 }
 
+function redactConfigValue(key, value) {
+  if (typeof value !== "string") {
+    return value;
+  }
+
+  if (!/api[_-]?key/i.test(key)) {
+    return value;
+  }
+
+  if (value.length <= 8) {
+    return "*".repeat(value.length);
+  }
+
+  return `${value.slice(0, 4)}...${value.slice(-4)}`;
+}
+
+function printConfigEntries(config) {
+  const entries = Object.entries(config).sort(([left], [right]) => left.localeCompare(right));
+
+  if (entries.length === 0) {
+    console.log("No user config saved yet.");
+    return;
+  }
+
+  for (const [key, value] of entries) {
+    console.log(`${key}: ${redactConfigValue(key, value)}`);
+  }
+}
+
+function resolveConfigSetUpdate(parsed, currentConfig) {
+  const key = parsed.configKey;
+  const value = parsed.configValue;
+
+  if (!key || !value) {
+    throw new Error('Usage: gitxplain config set <provider|model|api-key> <value> [--provider <name>]');
+  }
+
+  if (key === "provider") {
+    return { provider: value.toLowerCase() };
+  }
+
+  if (key === "model") {
+    return { model: value };
+  }
+
+  if (key === "api-key") {
+    const resolvedProvider = (parsed.provider ?? currentConfig.provider ?? currentConfig.LLM_PROVIDER ?? "").toLowerCase();
+    const apiKeyField = getProviderApiKeyField(resolvedProvider);
+
+    if (!apiKeyField) {
+      throw new Error("Set a provider first with `gitxplain config set provider <name>`, or pass `--provider <name>`.");
+    }
+
+    return { [apiKeyField]: value };
+  }
+
+  return { [key]: value };
+}
+
+function handleConfigCommand(parsed) {
+  const currentConfig = loadUserConfig();
+
+  if (parsed.configAction === "list" || parsed.configAction == null) {
+    console.log(`User config: ${getUserConfigPath()}`);
+    printConfigEntries(currentConfig);
+    return 0;
+  }
+
+  if (parsed.configAction === "get") {
+    console.log(`User config: ${getUserConfigPath()}`);
+
+    if (!parsed.configKey) {
+      printConfigEntries(currentConfig);
+      return 0;
+    }
+
+    const value = currentConfig[parsed.configKey];
+    if (value === undefined) {
+      console.log(`No value saved for ${parsed.configKey}.`);
+      return 0;
+    }
+
+    console.log(`${parsed.configKey}: ${redactConfigValue(parsed.configKey, value)}`);
+    return 0;
+  }
+
+  if (parsed.configAction === "set") {
+    const updates = resolveConfigSetUpdate(parsed, currentConfig);
+    const { configPath } = updateUserConfig(updates);
+    const [savedKey, savedValue] = Object.entries(updates)[0];
+    console.log(`Saved ${savedKey} to ${configPath}.`);
+    console.log(`${savedKey}: ${redactConfigValue(savedKey, savedValue)}`);
+    return 0;
+  }
+
+  throw new Error(`Unknown config subcommand: ${parsed.configAction}`);
+}
+
+function handleCacheCommand(parsed) {
+  if (parsed.cacheAction == null) {
+    throw new Error('Usage: gitxplain cache <clear|stats>');
+  }
+
+  if (parsed.cacheAction === "clear") {
+    const deletedCount = clearCache();
+    console.log(`Cleared ${deletedCount} cache entr${deletedCount === 1 ? "y" : "ies"}.`);
+    return 0;
+  }
+
+  if (parsed.cacheAction === "stats") {
+    const stats = getCacheStats();
+    console.log(
+      [
+        "Cache Stats",
+        `Entries: ${stats.entryCount}`,
+        `Size: ${stats.totalSizeBytes} bytes`,
+        `Oldest: ${stats.oldestEntryIso ?? "n/a"}`,
+        `Newest: ${stats.newestEntryIso ?? "n/a"}`
+      ].join("\n")
+    );
+    return 0;
+  }
+
+  throw new Error(`Unknown cache subcommand: ${parsed.cacheAction}`);
+}
+
 function isDirectNativeGitSubcommand(subcommand, knownGitSubcommands) {
   if (!subcommand || subcommand.startsWith("-")) {
     return false;
@@ -356,7 +422,7 @@ export function parseArgs(argv, options = {}) {
   const subcommand = args[0];
   const knownGitSubcommands = options.gitSubcommands ?? listGitSubcommands();
   const flags = new Set(args.filter((arg) => arg.startsWith("--")));
-  const valueFlags = new Set(["--provider", "--model", "--max-diff-lines", "--branch", "--pr"]);
+  const valueFlags = new Set(["--provider", "--model", "--max-diff-lines", "--branch", "--pr", "--blame", "--stash", "--diff"]);
   const positional = [];
 
   for (let index = 0; index < args.length; index += 1) {
@@ -382,20 +448,14 @@ export function parseArgs(argv, options = {}) {
   const explicitMode = [...MODE_FLAGS.entries()].find(([flag]) => flags.has(flag))?.[1] ?? null;
   const explicitFormat = [...FORMAT_FLAGS.entries()].find(([flag]) => flags.has(flag))?.[1] ?? null;
   const isInstallHook = subcommand === "install-hook";
-  const isExample = flags.has("--example") || subcommand === "example";
+  const isConfigCommand = subcommand === "config";
+  const isCacheCommand = subcommand === "cache";
   const isNativeGitWrapper = subcommand === "git";
-  const isConnectGitHub = flags.has("--connect-github") || flags.has("--connect-git");
-  const isBoot = flags.has("--boot");
-  const isLogCommand = subcommand === "log";
-  const isStatusCommand = subcommand === "status";
-  const isCommitCommand = subcommand === "commit";
-  const isMergeCommand = subcommand === "merge";
-  const isTagCommand = subcommand === "tag";
-  const isReleaseCommand = subcommand === "release";
+  const isReleaseCommand = flags.has("--release");
   const isAddCommand = subcommand === "add";
   const isRemoveCommand = subcommand === "remove";
   const isDeleteCommand = subcommand === "del";
-  const isPipelineCommand = subcommand === "pipeline" || flags.has("--pipeline");
+  const isPipelineCommand = flags.has("--pipeline");
   const isBinCommand = subcommand === "bin";
   const isPopCommand = subcommand === "pop";
   const isPullCommand = subcommand === "pull";
@@ -406,18 +466,18 @@ export function parseArgs(argv, options = {}) {
   return {
     subcommand,
     help: flags.has("--help") || subcommand === "help",
-    example: isExample,
+    version: flags.has("--version"),
+    cost: flags.has("--cost"),
     nativeGitCommand: isNativeGitCommand,
     installHook: isInstallHook,
-    connectGitHub: isConnectGitHub,
-    boot: isBoot,
-    logCommand: isLogCommand,
-    statusCommand: isStatusCommand,
-    commitCommand: isCommitCommand,
-    mergeCommand: isMergeCommand,
-    tagCommand: isTagCommand,
+    configCommand: isConfigCommand,
+    cacheCommand: isCacheCommand,
+    configAction: isConfigCommand ? positional[1] ?? null : null,
+    configKey: isConfigCommand ? positional[2] ?? null : null,
+    configValue: isConfigCommand ? positional.slice(3).join(" ") || null : null,
+    cacheAction: isCacheCommand ? positional[1] ?? null : null,
     releaseCommand: isReleaseCommand,
-    releaseAction: isReleaseCommand ? positional[1] ?? "status" : null,
+    releaseAction: isReleaseCommand ? positional[0] ?? "status" : null,
     addCommand: isAddCommand,
     removeCommand: isRemoveCommand,
     deleteCommand: isDeleteCommand,
@@ -431,7 +491,6 @@ export function parseArgs(argv, options = {}) {
     hookName: isInstallHook ? positional[1] ?? "post-commit" : null,
     actionPaths:
       isAddCommand || isDeleteCommand ? positional.slice(1) : isRemoveHardCommand ? [] : isRemoveCommand ? positional.slice(1) : [],
-    connectToken: isConnectGitHub ? positional[0] : null,
     stashIndex: isPopCommand ? positional[1] ?? null : null,
     pullRemote: isPullCommand ? positional[1] ?? null : null,
     pullBranch: isPullCommand ? positional[2] ?? null : null,
@@ -439,15 +498,9 @@ export function parseArgs(argv, options = {}) {
     pushBranch: isPushCommand ? positional[2] ?? null : null,
     commitRef:
       isInstallHook ||
-      isExample ||
+      isConfigCommand ||
+      isCacheCommand ||
       isNativeGitCommand ||
-      isConnectGitHub ||
-      isBoot ||
-      isLogCommand ||
-      isStatusCommand ||
-      isCommitCommand ||
-      isMergeCommand ||
-      isTagCommand ||
       isReleaseCommand ||
       isAddCommand ||
       isRemoveCommand ||
@@ -465,16 +518,22 @@ export function parseArgs(argv, options = {}) {
     provider: getFlagValue(args, "--provider"),
     model: getFlagValue(args, "--model"),
     maxDiffLines: parseNumber(getFlagValue(args, "--max-diff-lines")),
+    blameFile: getFlagValue(args, "--blame"),
+    stashRef: flags.has("--stash") || args.some((arg) => arg.startsWith("--stash=")) ? getFlagValue(args, "--stash") : null,
+    diffFile: getFlagValue(args, "--diff"),
     hasBranchFlag: flags.has("--branch") || args.some((arg) => arg.startsWith("--branch=")),
     branchBase: getFlagValue(args, "--branch"),
     hasPrFlag: flags.has("--pr") || args.some((arg) => arg.startsWith("--pr=")),
     prBase: getFlagValue(args, "--pr"),
     clipboard: flags.has("--clipboard"),
     stream: flags.has("--stream"),
+    noCache: flags.has("--no-cache"),
     verbose: flags.has("--verbose"),
     quiet: flags.has("--quiet"),
     execute: flags.has("--execute"),
     dryRun: flags.has("--dry-run"),
+    interactive: flags.has("--interactive"),
+    release: flags.has("--release"),
     log: flags.has("--log"),
     status: flags.has("--status"),
     merge: flags.has("--merge"),
@@ -494,62 +553,86 @@ function askQuestion(prompt) {
   });
 }
 
-async function chooseModeInteractively() {
-  const answer = await askQuestion(
-    [
-      "What do you want to know?",
-      "1. Summary",
-      "2. Issues Fixed",
-      "3. Fix Explanation",
-      "4. Impact",
-      "5. Full Analysis",
-      "6. Line-by-Line Code Walkthrough",
-      "7. Code Review",
-      "8. Security Review",
-      "9. Split Commit",
-      "10. Merge To Release Branch",
-      "11. Tag Release Commits",
-      "12. Repository Log",
-      "13. Commit Working Tree",
-      "14. Create CI/CD Pipelines",
-      "> "
-    ].join("\n")
-  );
-
-  const selections = {
-    "1": "summary",
-    "2": "issues",
-    "3": "fix",
-    "4": "impact",
-    "5": "full",
-    "6": "lines",
-    "7": "review",
-    "8": "security",
-    "9": "split",
-    "10": "merge",
-    "11": "tag",
-    "12": "log",
-    "13": "commit",
-    "14": "pipeline"
-  };
-
-  return selections[answer] ?? "full";
+function resolveConfiguredAnalysisMode(config) {
+  return ANALYSIS_MODES.has(config.mode) ? config.mode : "full";
 }
 
 function resolveRuntimeOptions(parsed, config) {
   return {
-    mode: parsed.mode ?? config.mode ?? "full",
+    mode: parsed.mode ?? resolveConfiguredAnalysisMode(config),
     format: parsed.format ?? config.format ?? "plain",
     provider: parsed.provider ?? config.provider ?? null,
     model: parsed.model ?? config.model ?? null,
     maxDiffLines: parsed.maxDiffLines ?? config.maxDiffLines ?? 800,
     clipboard: parsed.clipboard || config.clipboard === true,
     stream: parsed.stream || config.stream === true,
+    noCache: parsed.noCache,
     verbose: parsed.verbose || config.verbose === true,
     quiet: parsed.quiet || config.quiet === true
   };
 }
 
+function formatUsageStats(stats) {
+  return [
+    "Usage Stats",
+    `Requests: ${stats.requestCount}`,
+    `Input Tokens: ${stats.inputTokens}`,
+    `Output Tokens: ${stats.outputTokens}`,
+    `Total Tokens: ${stats.totalTokens}`,
+    `Estimated Cost: $${stats.estimatedCostUsd.toFixed(6)}`
+  ].join("\n");
+}
+
+async function reviewSplitPlanInteractively(plan) {
+  const editedCommits = [];
+  const deferredFiles = [];
+
+  for (const commit of [...plan.commits].sort((left, right) => left.order - right.order)) {
+    console.log("");
+    console.log(`${commit.order}. ${commit.message}`);
+    console.log(`Files: ${commit.files.join(", ")}`);
+    console.log(`Why: ${commit.description}`);
+
+    const action = (await askQuestion('Action [keep/edit/skip/abort] > ')).trim().toLowerCase();
+
+    if (action === "abort") {
+      return null;
+    }
+
+    if (action === "skip") {
+      deferredFiles.push(...commit.files);
+      continue;
+    }
+
+    if (action === "edit") {
+      const nextMessage = await askQuestion("New commit message (leave blank to keep current) > ");
+      const nextDescription = await askQuestion("New description (leave blank to keep current) > ");
+      editedCommits.push({
+        ...commit,
+        message: nextMessage.trim() === "" ? commit.message : nextMessage.trim(),
+        description: nextDescription.trim() === "" ? commit.description : nextDescription.trim()
+      });
+      continue;
+    }
+
+    editedCommits.push(commit);
+  }
+
+  if (deferredFiles.length > 0) {
+    editedCommits.push({
+      order: editedCommits.length + 1,
+      message: "chore: include deferred split changes",
+      files: deferredFiles,
+      description: "Captures split groups that were skipped during interactive review."
+    });
+  }
+
+  return {
+    ...plan,
+    commits: editedCommits.map((commit, index) => ({ ...commit, order: index + 1 }))
+  };
+}
+
 function resolveTargetRef(parsed, cwd) {
   if (parsed.commitRef) {
     return parsed.commitRef;
@@ -563,15 +646,6 @@ function resolveTargetRef(parsed, cwd) {
   return null;
 }
 
-export function buildBootSessionArgs(connection, userInfo, parsed) {
-  return {
-    token: connection.token,
-    providerOverride: parsed.provider,
-    modelOverride: parsed.model,
-    username: userInfo.name || connection.user?.login || null
-  };
-}
-
 function renderFinalOutput({ runtimeOptions, mode, commitData, explanation, responseMeta, promptMeta }) {
   if (runtimeOptions.format === "json") {
     return formatJsonOutput({ mode, commitData, explanation, responseMeta, promptMeta });
@@ -595,22 +669,66 @@ function renderFinalOutput({ runtimeOptions, mode, commitData, explanation, resp
   });
 }
 
+async function runPipelineCommand(cwd) {
+  const analysis = inspectRepositoryForPipeline(cwd);
+
+  if (!analysis.supported) {
+    console.log(analysis.reason);
+    return 1;
+  }
+
+  console.log(formatPipelineRecommendations(analysis));
+
+  const answer = await askQuestion(
+    `\nChoose a pipeline option (1-${analysis.options.length}) or type "cancel" > `
+  );
+  const selection = resolvePipelineSelection(analysis, answer);
+
+  if (!selection) {
+    console.log("Aborted.");
+    return 0;
+  }
+
+  const { writtenFiles, notes } = writePipelineFiles(cwd, analysis, selection);
+  console.log(`\nCreated workflow files: ${writtenFiles.join(", ")}`);
+
+  if (notes.length > 0) {
+    console.log(`\n${notes.join("\n")}`);
+  }
+
+  return 0;
+}
+
 export async function main(argv = process.argv) {
   const cwd = process.cwd();
-  const config = loadConfig(cwd);
   const parsed = parseArgs(argv);
   const hasNoCommandOrFlags = argv.slice(2).length === 0;
 
   loadEnvFile(cwd); // Ensure environment is loaded first
+  const config = loadConfig(cwd);
+  applyConfigEnvironment(config);
+
+  if (parsed.version) {
+    console.log(CLI_VERSION);
+    return 0;
+  }
+
+  if (parsed.cost) {
+    console.log(formatUsageStats(getUsageStats()));
+    return 0;
+  }
 
   if (parsed.help || hasNoCommandOrFlags) {
     printHelp();
     return 0;
   }
 
-  if (parsed.example) {
-    printExamples();
-    return 0;
+  if (parsed.configCommand) {
+    return handleConfigCommand(parsed);
+  }
+
+  if (parsed.cacheCommand) {
+    return handleCacheCommand(parsed);
   }
 
   if (parsed.nativeGitCommand) {
@@ -628,62 +746,12 @@ export async function main(argv = process.argv) {
     return 0;
   }
 
-  if (parsed.connectGitHub) {
-    let token = parsed.connectToken;
-    if (!token) {
-      if (process.env.GITHUB_TOKEN) {
-        token = process.env.GITHUB_TOKEN;
-      } else {
-        console.error("Please provide your GitHub Personal Access Token.\nRun: gitxplain --connect-github <YOUR_TOKEN>\nOr set it in your .env as GITHUB_TOKEN=...");
-        return 1;
-      }
-    }
-    try {
-      console.log("Verifying token with GitHub API...");
-      const userInfo = await verifyGitToken(token);
-      await saveGitConnection(token, "github", userInfo);
-      console.log(`\nSuccessfully connected to GitHub as: \x1b[36m${userInfo.login}\x1b[0m`);
-      console.log(`Token saved securely to your local configuration.\n`);
-    } catch (e) {
-      console.error(`Token verification failed: ${e.message}`);
-      return 1;
-    }
-    return 0;
-  }
-
-  if (parsed.boot) {
-    if (!isGitConnected()) {
-      console.error("You must connect a GitHub account first to use the interactive agent.\nCommand: gitxplain --connect-github <YOUR_TOKEN>");
-      return 1;
-    }
-    const connection = loadGitConnection();
-    const userInfo = getGitUserInfo();
-    try {
-      const { getProviderConfig, validateProviderConfig } = await import(
-        "./services/aiService.js"
-      );
-      const config = getProviderConfig(parsed.provider, parsed.model);
-      validateProviderConfig(config);
-      const sessionArgs = buildBootSessionArgs(connection, userInfo, parsed);
-      await startChatSession(
-        sessionArgs.token,
-        sessionArgs.providerOverride,
-        sessionArgs.modelOverride,
-        sessionArgs.username
-      );
-    } catch (configError) {
-      console.error(`Missing LLM Key. Please check your .env variables or --provider flags.\n${configError.message}`);
-      return 1;
-    }
-    return 0;
-  }
-
-  if (parsed.logCommand || parsed.log) {
+  if (parsed.log) {
     console.log(getRepositoryLog(cwd));
     return 0;
   }
 
-  if (parsed.statusCommand || parsed.status) {
+  if (parsed.status) {
     console.log(getRepositoryStatus(cwd));
     return 0;
   }
@@ -697,36 +765,6 @@ export async function main(argv = process.argv) {
     return 0;
   }
 
-  if (parsed.pipelineCommand) {
-    const analysis = inspectRepositoryForPipeline(cwd);
-
-    if (!analysis.supported) {
-      console.log(analysis.reason);
-      return 1;
-    }
-
-    console.log(formatPipelineRecommendations(analysis));
-
-    const answer = await askQuestion(
-      `\nChoose a pipeline option (1-${analysis.options.length}) or type "cancel" > `
-    );
-    const selection = resolvePipelineSelection(analysis, answer);
-
-    if (!selection) {
-      console.log("Aborted.");
-      return 0;
-    }
-
-    const { writtenFiles, notes } = writePipelineFiles(cwd, analysis, selection);
-    console.log(`\nCreated workflow files: ${writtenFiles.join(", ")}`);
-
-    if (notes.length > 0) {
-      console.log(`\n${notes.join("\n")}`);
-    }
-
-    return 0;
-  }
-
   if (
     parsed.addCommand ||
     parsed.removeCommand ||
@@ -795,39 +833,9 @@ export async function main(argv = process.argv) {
   }
 
   const runtimeOptions = resolveRuntimeOptions(parsed, config);
-  const mode = parsed.mode ?? config.mode ?? (await chooseModeInteractively());
-
-  if (mode === "pipeline") {
-    const analysis = inspectRepositoryForPipeline(cwd);
-
-    if (!analysis.supported) {
-      console.log(analysis.reason);
-      return 1;
-    }
-
-    console.log(formatPipelineRecommendations(analysis));
-
-    const answer = await askQuestion(
-      `\nChoose a pipeline option (1-${analysis.options.length}) or type "cancel" > `
-    );
-    const selection = resolvePipelineSelection(analysis, answer);
-
-    if (!selection) {
-      console.log("Aborted.");
-      return 0;
-    }
-
-    const { writtenFiles, notes } = writePipelineFiles(cwd, analysis, selection);
-    console.log(`\nCreated workflow files: ${writtenFiles.join(", ")}`);
-
-    if (notes.length > 0) {
-      console.log(`\n${notes.join("\n")}`);
-    }
+  const mode = ANALYSIS_MODES.has(parsed.mode) ? parsed.mode : resolveConfiguredAnalysisMode(config);
 
-    return 0;
-  }
-
-  if (mode === "commit" || parsed.commitCommand) {
+  if (parsed.mode === "commit") {
     const commitData = fetchWorkingTreeData(cwd);
 
     if (commitData.filesChanged.length === 0 || commitData.diff === "") {
@@ -841,6 +849,7 @@ export async function main(argv = process.argv) {
       providerOverride: runtimeOptions.provider,
       modelOverride: runtimeOptions.model,
       maxDiffLines: runtimeOptions.maxDiffLines,
+      noCache: runtimeOptions.noCache,
       stream: false,
       onChunk: null,
       onStart: null
@@ -877,7 +886,7 @@ export async function main(argv = process.argv) {
     return 0;
   }
 
-  if (mode === "merge" || parsed.mergeCommand || parsed.merge) {
+  if (parsed.mode === "merge" || parsed.merge) {
     if (parsed.commitRef) {
       throw new Error("--merge works from the current branch and does not accept a commit ref.");
     }
@@ -909,7 +918,7 @@ export async function main(argv = process.argv) {
     return 0;
   }
 
-  if (mode === "tag" || parsed.tagCommand || parsed.tag) {
+  if (parsed.mode === "tag" || parsed.tag) {
     if (parsed.commitRef) {
       throw new Error("--tag works from the current branch and does not accept a commit ref.");
     }
@@ -943,12 +952,210 @@ export async function main(argv = process.argv) {
 
   const targetRef = resolveTargetRef(parsed, cwd);
 
+  if (parsed.mode === "blame") {
+    if (!parsed.blameFile) {
+      throw new Error("--blame requires a file path.");
+    }
+
+    const commitData = fetchBlameData(parsed.blameFile, cwd);
+    const canStream = runtimeOptions.stream && runtimeOptions.format === "plain";
+    let streamStarted = false;
+
+    if (runtimeOptions.stream && !canStream && !runtimeOptions.quiet) {
+      console.error(`Streaming is only supported with plain output. Ignoring --stream for ${runtimeOptions.format} format.`);
+    }
+
+    const { explanation, responseMeta, promptMeta } = await generateExplanation({
+      mode: "blame",
+      commitData,
+      providerOverride: runtimeOptions.provider,
+      modelOverride: runtimeOptions.model,
+      maxDiffLines: runtimeOptions.maxDiffLines,
+      noCache: runtimeOptions.noCache,
+      stream: canStream,
+      onStart: canStream
+        ? ({ promptMeta: streamPromptMeta }) => {
+            if (!runtimeOptions.quiet && !streamStarted) {
+              process.stdout.write(
+                formatPreamble({
+                  mode: "blame",
+                  commitData,
+                  responseMeta: null,
+                  promptMeta: streamPromptMeta,
+                  options: runtimeOptions
+                })
+              );
+              streamStarted = true;
+            }
+          }
+        : null,
+      onChunk: canStream ? (chunk) => process.stdout.write(chunk) : null
+    });
+
+    const renderedOutput = renderFinalOutput({
+      runtimeOptions,
+      mode: "blame",
+      commitData,
+      explanation,
+      responseMeta,
+      promptMeta
+    });
+
+    if (canStream) {
+      process.stdout.write("\n");
+      if (runtimeOptions.verbose) {
+        process.stdout.write(formatFooter({ responseMeta, promptMeta, options: runtimeOptions }));
+      }
+    } else {
+      console.log(renderedOutput);
+    }
+
+    if (runtimeOptions.clipboard) {
+      copyToClipboard(renderedOutput);
+      if (!runtimeOptions.quiet) {
+        console.error("Copied output to clipboard.");
+      }
+    }
+
+    return 0;
+  }
+
+  if (parsed.mode === "conflict") {
+    const commitData = fetchConflictData(cwd, parsed.diffFile);
+    const canStream = runtimeOptions.stream && runtimeOptions.format === "plain";
+    let streamStarted = false;
+
+    if (runtimeOptions.stream && !canStream && !runtimeOptions.quiet) {
+      console.error(`Streaming is only supported with plain output. Ignoring --stream for ${runtimeOptions.format} format.`);
+    }
+
+    const { explanation, responseMeta, promptMeta } = await generateExplanation({
+      mode: "conflict",
+      commitData,
+      providerOverride: runtimeOptions.provider,
+      modelOverride: runtimeOptions.model,
+      maxDiffLines: runtimeOptions.maxDiffLines,
+      noCache: runtimeOptions.noCache,
+      stream: canStream,
+      onStart: canStream
+        ? ({ promptMeta: streamPromptMeta }) => {
+            if (!runtimeOptions.quiet && !streamStarted) {
+              process.stdout.write(
+                formatPreamble({
+                  mode: "conflict",
+                  commitData,
+                  responseMeta: null,
+                  promptMeta: streamPromptMeta,
+                  options: runtimeOptions
+                })
+              );
+              streamStarted = true;
+            }
+          }
+        : null,
+      onChunk: canStream ? (chunk) => process.stdout.write(chunk) : null
+    });
+
+    const renderedOutput = renderFinalOutput({
+      runtimeOptions,
+      mode: "conflict",
+      commitData,
+      explanation,
+      responseMeta,
+      promptMeta
+    });
+
+    if (canStream) {
+      process.stdout.write("\n");
+      if (runtimeOptions.verbose) {
+        process.stdout.write(formatFooter({ responseMeta, promptMeta, options: runtimeOptions }));
+      }
+    } else {
+      console.log(renderedOutput);
+    }
+
+    if (runtimeOptions.clipboard) {
+      copyToClipboard(renderedOutput);
+      if (!runtimeOptions.quiet) {
+        console.error("Copied output to clipboard.");
+      }
+    }
+
+    return 0;
+  }
+
+  if (parsed.mode === "stash") {
+    const commitData = fetchStashData(parsed.stashRef, cwd, parsed.diffFile);
+    const canStream = runtimeOptions.stream && runtimeOptions.format === "plain";
+    let streamStarted = false;
+
+    if (runtimeOptions.stream && !canStream && !runtimeOptions.quiet) {
+      console.error(`Streaming is only supported with plain output. Ignoring --stream for ${runtimeOptions.format} format.`);
+    }
+
+    const { explanation, responseMeta, promptMeta } = await generateExplanation({
+      mode: "stash",
+      commitData,
+      providerOverride: runtimeOptions.provider,
+      modelOverride: runtimeOptions.model,
+      maxDiffLines: runtimeOptions.maxDiffLines,
+      noCache: runtimeOptions.noCache,
+      stream: canStream,
+      onStart: canStream
+        ? ({ promptMeta: streamPromptMeta }) => {
+            if (!runtimeOptions.quiet && !streamStarted) {
+              process.stdout.write(
+                formatPreamble({
+                  mode: "stash",
+                  commitData,
+                  responseMeta: null,
+                  promptMeta: streamPromptMeta,
+                  options: runtimeOptions
+                })
+              );
+              streamStarted = true;
+            }
+          }
+        : null,
+      onChunk: canStream ? (chunk) => process.stdout.write(chunk) : null
+    });
+
+    const renderedOutput = renderFinalOutput({
+      runtimeOptions,
+      mode: "stash",
+      commitData,
+      explanation,
+      responseMeta,
+      promptMeta
+    });
+
+    if (canStream) {
+      process.stdout.write("\n");
+      if (runtimeOptions.verbose) {
+        process.stdout.write(formatFooter({ responseMeta, promptMeta, options: runtimeOptions }));
+      }
+    } else {
+      console.log(renderedOutput);
+    }
+
+    if (runtimeOptions.clipboard) {
+      copyToClipboard(renderedOutput);
+      if (!runtimeOptions.quiet) {
+        console.error("Copied output to clipboard.");
+      }
+    }
+
+    return 0;
+  }
+
   if (!targetRef) {
     printHelp();
     return 1;
   }
 
-  const commitData = fetchCommitData(targetRef, cwd);
+  const commitData = parsed.diffFile
+    ? fetchCommitDataForFile(targetRef, parsed.diffFile, cwd)
+    : fetchCommitData(targetRef, cwd);
 
   if (mode === "split") {
     if (commitData.analysisType !== "commit") {
@@ -961,6 +1168,7 @@ export async function main(argv = process.argv) {
       providerOverride: runtimeOptions.provider,
       modelOverride: runtimeOptions.model,
       maxDiffLines: runtimeOptions.maxDiffLines,
+      noCache: runtimeOptions.noCache,
       stream: false,
       onChunk: null,
       onStart: null
@@ -976,6 +1184,17 @@ export async function main(argv = process.argv) {
     console.log(formatSplitPlan(plan));
 
     if (parsed.execute && !parsed.dryRun) {
+      const reviewedPlan = parsed.interactive ? await reviewSplitPlanInteractively(plan) : plan;
+      if (reviewedPlan == null) {
+        console.log("Aborted.");
+        return 0;
+      }
+
+      if (parsed.interactive) {
+        console.log("");
+        console.log(formatSplitPlan(reviewedPlan));
+      }
+
       validateSplitExecutionTarget(commitData.commitId, cwd);
       const confirmed = await askQuestion(
         "\nThis will rewrite git history. Continue? (yes/no) > "
@@ -985,8 +1204,8 @@ export async function main(argv = process.argv) {
         return 0;
       }
 
-      executeSplit(plan, commitData.commitId, cwd);
-      console.log(`\nSplit complete. Created ${plan.commits.length} commits.`);
+      executeSplit(reviewedPlan, commitData.commitId, cwd);
+      console.log(`\nSplit complete. Created ${reviewedPlan.commits.length} commits.`);
     } else {
       console.log("\nThis is a preview. Run with --execute to apply the split.");
     }
@@ -1001,12 +1220,17 @@ export async function main(argv = process.argv) {
   const canStream = runtimeOptions.stream && runtimeOptions.format === "plain";
   let streamStarted = false;
 
+  if (runtimeOptions.stream && !canStream && !runtimeOptions.quiet) {
+    console.error(`Streaming is only supported with plain output. Ignoring --stream for ${runtimeOptions.format} format.`);
+  }
+
   const { explanation, responseMeta, promptMeta } = await generateExplanation({
     mode,
     commitData,
     providerOverride: runtimeOptions.provider,
     modelOverride: runtimeOptions.model,
     maxDiffLines: runtimeOptions.maxDiffLines,
+    noCache: runtimeOptions.noCache,
     stream: canStream,
     onStart: canStream
       ? ({ promptMeta: streamPromptMeta }) => {