gut-cli 0.1.22 → 0.1.24

package/dist/index.js

@@ -3,94 +3,138 @@
 // src/index.ts
 import { Command as Command19 } from "commander";
 
-// src/commands/cleanup.ts
-import { Command } from "commander";
+// src/commands/auth.ts
 import chalk from "chalk";
-import ora from "ora";
-import { simpleGit } from "simple-git";
-var cleanupCommand = new Command("cleanup").description("Delete merged branches safely").option("-r, --remote", "Also delete remote branches").option("-f, --force", "Skip confirmation prompt").option("--dry-run", "Show branches that would be deleted without deleting").option("--base <branch>", "Base branch to compare against (default: main or master)").action(async (options) => {
-  const git = simpleGit();
-  const isRepo = await git.checkIsRepo();
-  if (!isRepo) {
-    console.error(chalk.red("Error: Not a git repository"));
-    process.exit(1);
+import { Command } from "commander";
+
+// src/lib/credentials.ts
+import { createRequire } from "module";
+
+// src/lib/config.ts
+import { execSync } from "child_process";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { homedir } from "os";
+import { join } from "path";
+var DEFAULT_CONFIG = {
+  lang: "en"
+};
+var DEFAULT_MODELS = {
+  gemini: "gemini-2.5-flash",
+  openai: "gpt-4.1-mini",
+  anthropic: "claude-sonnet-4-5",
+  ollama: "llama3.3"
+};
+function getGlobalConfigPath() {
+  const configDir = join(homedir(), ".config", "gut");
+  return join(configDir, "config.json");
+}
+function getRepoRoot() {
+  try {
+    return execSync("git rev-parse --show-toplevel", { encoding: "utf-8" }).trim();
+  } catch {
+    return null;
+  }
+}
+function getLocalConfigPath() {
+  const repoRoot = getRepoRoot();
+  if (!repoRoot) return null;
+  return join(repoRoot, ".gut", "config.json");
+}
+function ensureGlobalConfigDir() {
+  const configDir = join(homedir(), ".config", "gut");
+  if (!existsSync(configDir)) {
+    mkdirSync(configDir, { recursive: true });
+  }
+}
+function ensureLocalConfigDir() {
+  const repoRoot = getRepoRoot();
+  if (!repoRoot) return;
+  const gutDir = join(repoRoot, ".gut");
+  if (!existsSync(gutDir)) {
+    mkdirSync(gutDir, { recursive: true });
   }
-  const spinner = ora("Fetching branch information...").start();
+}
+function readConfigFile(path2) {
+  if (!existsSync(path2)) return {};
   try {
-    await git.fetch(["--prune"]);
-    const currentBranch = (await git.branch()).current;
-    const baseBranch = options.base || await detectBaseBranch(git);
-    spinner.text = `Using ${chalk.cyan(baseBranch)} as base branch`;
-    const mergedResult = await git.branch(["--merged", baseBranch]);
-    const mergedBranches = mergedResult.all.filter((branch) => {
-      const cleanName = branch.trim().replace(/^\* /, "");
-      return cleanName !== currentBranch && cleanName !== baseBranch && !cleanName.startsWith("remotes/") && cleanName !== "main" && cleanName !== "master" && cleanName !== "develop";
-    });
-    spinner.stop();
-    if (mergedBranches.length === 0) {
-      console.log(chalk.green("\u2713 No merged branches to clean up"));
-      return;
-    }
-    console.log(chalk.yellow(`
-Found ${mergedBranches.length} merged branch(es):
-`));
-    mergedBranches.forEach((branch) => {
-      console.log(`  ${chalk.red("\u2022")} ${branch}`);
-    });
-    if (options.dryRun) {
-      console.log(chalk.blue("\n(dry-run mode - no branches were deleted)"));
-      return;
-    }
-    if (!options.force) {
-      const readline = await import("readline");
-      const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout
-      });
-      const answer = await new Promise((resolve) => {
-        rl.question(chalk.yellow("\nDelete these branches? (y/N) "), resolve);
-      });
-      rl.close();
-      if (answer.toLowerCase() !== "y") {
-        console.log(chalk.gray("Cancelled"));
-        return;
-      }
-    }
-    const deleteSpinner = ora("Deleting branches...").start();
-    for (const branch of mergedBranches) {
-      try {
-        await git.deleteLocalBranch(branch, true);
-        deleteSpinner.text = `Deleted ${branch}`;
-        if (options.remote) {
-          try {
-            await git.push("origin", `:${branch}`);
-          } catch {
-          }
-        }
-      } catch (error) {
-        deleteSpinner.warn(`Failed to delete ${branch}`);
-      }
-    }
-    deleteSpinner.succeed(chalk.green(`Deleted ${mergedBranches.length} branch(es)`));
-  } catch (error) {
-    spinner.fail("Failed to cleanup branches");
-    console.error(chalk.red(error instanceof Error ? error.message : "Unknown error"));
-    process.exit(1);
+    return JSON.parse(readFileSync(path2, "utf-8"));
+  } catch {
+    return {};
+  }
+}
+function getGlobalConfig() {
+  const globalPath = getGlobalConfigPath();
+  return { ...DEFAULT_CONFIG, ...readConfigFile(globalPath) };
+}
+function getLocalConfig() {
+  const localPath = getLocalConfigPath();
+  if (!localPath) return {};
+  return readConfigFile(localPath);
+}
+function getConfig() {
+  const globalConfig = getGlobalConfig();
+  const localConfig = getLocalConfig();
+  return { ...globalConfig, ...localConfig };
+}
+function setGlobalConfig(key, value) {
+  ensureGlobalConfigDir();
+  const config = getGlobalConfig();
+  config[key] = value;
+  writeFileSync(getGlobalConfigPath(), JSON.stringify(config, null, 2));
+}
+function setLocalConfig(key, value) {
+  const localPath = getLocalConfigPath();
+  if (!localPath) {
+    throw new Error("Not in a git repository");
+  }
+  ensureLocalConfigDir();
+  const config = getLocalConfig();
+  config[key] = value;
+  writeFileSync(localPath, JSON.stringify(config, null, 2));
+}
+function getLanguage() {
+  return getConfig().lang;
+}
+function setLanguage(lang, local = false) {
+  if (local) {
+    setLocalConfig("lang", lang);
+  } else {
+    setGlobalConfig("lang", lang);
+  }
+}
+var VALID_LANGUAGES = ["en", "ja"];
+function isValidLanguage(lang) {
+  return VALID_LANGUAGES.includes(lang);
+}
+function getConfiguredModel() {
+  return getConfig().model;
+}
+function setModel(model, local = false) {
+  if (local) {
+    setLocalConfig("model", model);
+  } else {
+    setGlobalConfig("model", model);
+  }
+}
+function getDefaultModel(provider) {
+  return DEFAULT_MODELS[provider] || DEFAULT_MODELS.gemini;
+}
+var VALID_PROVIDERS = ["gemini", "openai", "anthropic", "ollama"];
+function isValidProvider(provider) {
+  return VALID_PROVIDERS.includes(provider);
+}
+function getConfiguredProvider() {
+  return getConfig().provider;
+}
+function setProvider(provider, local = false) {
+  if (local) {
+    setLocalConfig("provider", provider);
+  } else {
+    setGlobalConfig("provider", provider);
   }
-});
-async function detectBaseBranch(git) {
-  const branches = await git.branch();
-  if (branches.all.includes("main")) return "main";
-  if (branches.all.includes("master")) return "master";
-  return "main";
 }
-
-// src/commands/auth.ts
-import { Command as Command2 } from "commander";
-import chalk2 from "chalk";
 
 // src/lib/credentials.ts
-import { createRequire } from "module";
 var SERVICE_NAME = "gut-cli";
 var PROVIDER_KEY_MAP = {
   gemini: "gemini-api-key",
@@ -167,12 +211,34 @@ function getProviderDisplayName(provider) {
   };
   return names[provider];
 }
+async function getFirstAvailableProvider() {
+  const providers = ["gemini", "openai", "anthropic"];
+  for (const provider of providers) {
+    const key = await getApiKey(provider);
+    if (key) {
+      return provider;
+    }
+  }
+  return "ollama";
+}
+async function resolveProvider(cliProvider) {
+  if (cliProvider) {
+    return cliProvider.toLowerCase();
+  }
+  const configProvider = getConfiguredProvider();
+  if (configProvider) {
+    if (configProvider === "ollama" || await getApiKey(configProvider)) {
+      return configProvider;
+    }
+  }
+  return getFirstAvailableProvider();
+}
 
 // src/commands/auth.ts
 var PROVIDERS = ["gemini", "openai", "anthropic"];
 async function readSecretInput(prompt) {
   return new Promise((resolve) => {
-    process.stdout.write(chalk2.cyan(prompt));
+    process.stdout.write(chalk.cyan(prompt));
     let input = "";
     const stdin = process.stdin;
     stdin.setRawMode(true);
@@ -207,126 +273,127 @@ async function readSecretInput(prompt) {
     stdin.on("data", onData);
   });
 }
-var authCommand = new Command2("auth").description("Manage API key authentication");
+var authCommand = new Command("auth").description("Manage API key authentication");
 authCommand.command("login").description("Save an API key to the system keychain").requiredOption("-p, --provider <provider>", "AI provider (gemini, openai, anthropic)").option("-k, --key <key>", "API key (if not provided, will prompt)").action(async (options) => {
   const provider = options.provider.toLowerCase();
   if (!PROVIDERS.includes(provider)) {
-    console.error(chalk2.red(`Invalid provider: ${options.provider}`));
-    console.error(chalk2.gray(`Valid providers: ${PROVIDERS.join(", ")}`));
+    console.error(chalk.red(`Invalid provider: ${options.provider}`));
+    console.error(chalk.gray(`Valid providers: ${PROVIDERS.join(", ")}`));
     process.exit(1);
   }
   let apiKey = options.key;
   if (!apiKey) {
     const providerName = getProviderDisplayName(provider);
-    console.log(chalk2.bold(`
+    console.log(chalk.bold(`
 \u{1F511} ${providerName} API Key Setup
 `));
-    console.log(chalk2.gray(`Your API key will be stored securely in the system keychain.`));
+    console.log(chalk.gray(`Your API key will be stored securely in the system keychain.`));
     console.log();
     apiKey = await readSecretInput(`Enter ${providerName} API key: `);
   }
   if (!apiKey || apiKey.trim() === "") {
-    console.error(chalk2.red("API key cannot be empty"));
+    console.error(chalk.red("API key cannot be empty"));
     process.exit(1);
   }
   try {
     await saveApiKey(provider, apiKey.trim());
-    console.log(chalk2.green(`
-\u2713 API key for ${getProviderDisplayName(provider)} saved to system keychain`));
-  } catch (error) {
-    console.error(chalk2.red("Failed to save API key"));
-    console.error(chalk2.gray(error instanceof Error ? error.message : "Unknown error"));
+    console.log(
+      chalk.green(`
+\u2713 API key for ${getProviderDisplayName(provider)} saved to system keychain`)
+    );
+  } catch (err) {
+    console.error(chalk.red("Failed to save API key"));
+    console.error(chalk.gray(err instanceof Error ? err.message : "Unknown error"));
     process.exit(1);
   }
 });
 authCommand.command("logout").description("Remove an API key from the system keychain").requiredOption("-p, --provider <provider>", "AI provider (gemini, openai, anthropic)").action(async (options) => {
   const provider = options.provider.toLowerCase();
   if (!PROVIDERS.includes(provider)) {
-    console.error(chalk2.red(`Invalid provider: ${options.provider}`));
+    console.error(chalk.red(`Invalid provider: ${options.provider}`));
     process.exit(1);
   }
   try {
     const deleted = await deleteApiKey(provider);
     if (deleted) {
-      console.log(chalk2.green(`\u2713 API key for ${getProviderDisplayName(provider)} removed`));
+      console.log(chalk.green(`\u2713 API key for ${getProviderDisplayName(provider)} removed`));
     } else {
-      console.log(chalk2.yellow(`No API key found for ${getProviderDisplayName(provider)}`));
+      console.log(chalk.yellow(`No API key found for ${getProviderDisplayName(provider)}`));
     }
-  } catch (error) {
-    console.error(chalk2.red("Failed to remove API key"));
+  } catch {
+    console.error(chalk.red("Failed to remove API key"));
     process.exit(1);
   }
 });
 authCommand.command("status").description("Show which providers have API keys configured").action(async () => {
   try {
     const providers = await listProviders();
-    console.log(chalk2.bold("\nAPI Key Status:\n"));
+    console.log(chalk.bold("\nAPI Key Status:\n"));
     for (const { provider, hasKey } of providers) {
-      const status = hasKey ? chalk2.green("\u2713 configured") : chalk2.gray("\u25CB not set");
+      const status = hasKey ? chalk.green("\u2713 configured") : chalk.gray("\u25CB not set");
       console.log(`  ${getProviderDisplayName(provider).padEnd(20)} ${status}`);
     }
-    console.log(
-      chalk2.gray("\nKeys can also be set via environment variables:")
-    );
-    console.log(chalk2.gray("  GUT_GEMINI_API_KEY, GUT_OPENAI_API_KEY, GUT_ANTHROPIC_API_KEY\n"));
-  } catch (error) {
-    console.error(chalk2.red("Failed to check status"));
+    console.log(chalk.gray("\nKeys can also be set via environment variables:"));
+    console.log(chalk.gray("  GUT_GEMINI_API_KEY, GUT_OPENAI_API_KEY, GUT_ANTHROPIC_API_KEY\n"));
+  } catch {
+    console.error(chalk.red("Failed to check status"));
     process.exit(1);
   }
 });
 
-// src/commands/commit.ts
-import { Command as Command3 } from "commander";
+// src/commands/branch.ts
+import { execSync as execSync3 } from "child_process";
 import chalk3 from "chalk";
-import ora2 from "ora";
-import { simpleGit as simpleGit2 } from "simple-git";
+import { Command as Command2 } from "commander";
+import ora from "ora";
+import { simpleGit } from "simple-git";
 
 // src/lib/ai.ts
-import { generateText, generateObject } from "ai";
+import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
+import { homedir as homedir2 } from "os";
+import { dirname, join as join2 } from "path";
+import { fileURLToPath } from "url";
+import { createAnthropic } from "@ai-sdk/anthropic";
 import { createGoogleGenerativeAI } from "@ai-sdk/google";
 import { createOpenAI } from "@ai-sdk/openai";
-import { createAnthropic } from "@ai-sdk/anthropic";
+import { generateObject, generateText } from "ai";
 import { createOllama } from "ollama-ai-provider";
 import { z } from "zod";
-import { existsSync, readFileSync } from "fs";
-import { join, dirname } from "path";
-import { homedir } from "os";
-import { fileURLToPath } from "url";
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = dirname(__filename);
 function findGutRoot() {
   let current = __dirname;
   for (let i = 0; i < 5; i++) {
-    const gutPath = join(current, ".gut");
-    if (existsSync(gutPath)) {
+    const gutPath = join2(current, ".gut");
+    if (existsSync2(gutPath)) {
       return current;
     }
     current = dirname(current);
   }
-  return join(__dirname, "..");
+  return join2(__dirname, "..");
 }
 var GUT_ROOT = findGutRoot();
 function loadTemplate(name) {
-  const templatePath = join(GUT_ROOT, ".gut", `${name}.md`);
-  if (existsSync(templatePath)) {
-    return readFileSync(templatePath, "utf-8");
+  const templatePath = join2(GUT_ROOT, ".gut", `${name}.md`);
+  if (existsSync2(templatePath)) {
+    return readFileSync2(templatePath, "utf-8");
   }
   throw new Error(`Template not found: ${templatePath}`);
 }
 function getGlobalTemplatesDir() {
-  return join(homedir(), ".config", "gut", "templates");
+  return join2(homedir2(), ".config", "gut", "templates");
 }
 function findGlobalTemplate(templateName) {
-  const templatePath = join(getGlobalTemplatesDir(), `${templateName}.md`);
-  if (existsSync(templatePath)) {
-    return readFileSync(templatePath, "utf-8");
+  const templatePath = join2(getGlobalTemplatesDir(), `${templateName}.md`);
+  if (existsSync2(templatePath)) {
+    return readFileSync2(templatePath, "utf-8");
   }
   return null;
 }
 function findTemplate(repoRoot, templateName) {
-  const projectTemplatePath = join(repoRoot, ".gut", `${templateName}.md`);
-  if (existsSync(projectTemplatePath)) {
-    return readFileSync(projectTemplatePath, "utf-8");
+  const projectTemplatePath = join2(repoRoot, ".gut", `${templateName}.md`);
+  if (existsSync2(projectTemplatePath)) {
+    return readFileSync2(projectTemplatePath, "utf-8");
   }
   const globalTemplate = findGlobalTemplate(templateName);
   if (globalTemplate) {
@@ -352,16 +419,12 @@ ${value}
 <output-format>
 ${outputFormat}
 </output-format>` : "";
-  return contextXml + "<instructions>\n" + template + langInstruction + "\n</instructions>" + outputSection;
+  return `${contextXml}<instructions>
+${template}${langInstruction}
+</instructions>${outputSection}`;
 }
-var DEFAULT_MODELS = {
-  gemini: "gemini-2.0-flash",
-  openai: "gpt-4o-mini",
-  anthropic: "claude-sonnet-4-20250514",
-  ollama: "llama3.2"
-};
 async function getModel(options) {
-  const modelName = options.model || DEFAULT_MODELS[options.provider];
+  const modelName = options.model || getConfiguredModel() || getDefaultModel(options.provider);
   async function resolveApiKey() {
     if (options.apiKey) return options.apiKey;
     return getApiKey(options.provider);
@@ -400,9 +463,15 @@ async function getModel(options) {
 }
 async function generateCommitMessage(diff, options, template) {
   const model = await getModel(options);
-  const prompt = buildPrompt(template, "commit", {
-    diff: diff.slice(0, 8e3)
-  }, options.language, "Respond with ONLY the commit message, nothing else.");
+  const prompt = buildPrompt(
+    template,
+    "commit",
+    {
+      diff: diff.slice(0, 8e3)
+    },
+    options.language,
+    "Respond with ONLY the commit message, nothing else."
+  );
   const result = await generateText({
     model,
     prompt,
@@ -410,34 +479,29 @@ async function generateCommitMessage(diff, options, template) {
   });
   return result.text.trim();
 }
+var PRDescriptionSchema = z.object({
+  title: z.string().describe("Concise PR title (50-72 chars)"),
+  body: z.string().describe("PR description in markdown format")
+});
 async function generatePRDescription(context, options, template) {
   const model = await getModel(options);
-  const prompt = buildPrompt(template, "pr", {
-    baseBranch: context.baseBranch,
-    currentBranch: context.currentBranch,
-    commits: context.commits.map((c) => `- ${c}`).join("\n"),
-    diff: context.diff.slice(0, 6e3)
-  }, options.language, `Respond in JSON format:
-\`\`\`json
-{
-  "title": "...",
-  "body": "..."
-}
-\`\`\``);
-  const result = await generateText({
+  const prompt = buildPrompt(
+    template,
+    "pr",
+    {
+      baseBranch: context.baseBranch,
+      currentBranch: context.currentBranch,
+      commits: context.commits.map((c) => `- ${c}`).join("\n"),
+      diff: context.diff.slice(0, 6e3)
+    },
+    options.language
+  );
+  const result = await generateObject({
     model,
-    prompt,
-    maxTokens: 2e3
+    schema: PRDescriptionSchema,
+    prompt
   });
-  try {
-    const cleaned = result.text.replace(/```json\n?|\n?```/g, "").trim();
-    return JSON.parse(cleaned);
-  } catch {
-    return {
-      title: context.currentBranch.replace(/[-_]/g, " "),
-      body: result.text
-    };
-  }
+  return result.object;
 }
 var CodeReviewSchema = z.object({
   summary: z.string().describe("Brief overall assessment"),
@@ -454,9 +518,14 @@ var CodeReviewSchema = z.object({
 });
 async function generateCodeReview(diff, options, template) {
   const model = await getModel(options);
-  const prompt = buildPrompt(template, "review", {
-    diff: diff.slice(0, 1e4)
-  }, options.language);
+  const prompt = buildPrompt(
+    template,
+    "review",
+    {
+      diff: diff.slice(0, 1e4)
+    },
+    options.language
+  );
   const result = await generateObject({
     model,
     schema: CodeReviewSchema,
@@ -478,13 +547,18 @@ var ChangelogSchema = z.object({
 async function generateChangelog(context, options, template) {
   const model = await getModel(options);
   const commitList = context.commits.map((c) => `- ${c.hash.slice(0, 7)} ${c.message} (${c.author})`).join("\n");
-  const prompt = buildPrompt(template, "changelog", {
-    fromRef: context.fromRef,
-    toRef: context.toRef,
-    commits: commitList,
-    diff: context.diff.slice(0, 8e3),
-    todayDate: (/* @__PURE__ */ new Date()).toISOString().split("T")[0]
-  }, options.language);
+  const prompt = buildPrompt(
+    template,
+    "changelog",
+    {
+      fromRef: context.fromRef,
+      toRef: context.toRef,
+      commits: commitList,
+      diff: context.diff.slice(0, 8e3),
+      todayDate: (/* @__PURE__ */ new Date()).toISOString().split("T")[0]
+    },
+    options.language
+  );
   const result = await generateObject({
     model,
     schema: ChangelogSchema,
@@ -512,10 +586,15 @@ var ExplanationSchema = z.object({
 async function generateExplanation(context, options, template) {
   const model = await getModel(options);
   if (context.type === "file-content") {
-    const prompt2 = buildPrompt(template, "explain-file", {
-      filePath: context.metadata.filePath || "",
-      content: context.content?.slice(0, 15e3) || ""
-    }, options.language);
+    const prompt2 = buildPrompt(
+      template,
+      "explain-file",
+      {
+        filePath: context.metadata.filePath || "",
+        content: context.content?.slice(0, 15e3) || ""
+      },
+      options.language
+    );
     const result2 = await generateObject({
       model,
       schema: ExplanationSchema,
@@ -549,11 +628,16 @@ Author: ${context.metadata.author}
 Date: ${context.metadata.date}`;
     targetType = "commit";
   }
-  const prompt = buildPrompt(template, "explain", {
-    targetType,
-    contextInfo,
-    diff: context.diff?.slice(0, 12e3) || ""
-  }, options.language);
+  const prompt = buildPrompt(
+    template,
+    "explain",
+    {
+      targetType,
+      contextInfo,
+      diff: context.diff?.slice(0, 12e3) || ""
+    },
+    options.language
+  );
   const result = await generateObject({
     model,
     schema: ExplanationSchema,
@@ -572,12 +656,19 @@ var CommitSearchSchema = z.object({
 });
 async function searchCommits(query, commits, options, maxResults = 5, template) {
   const model = await getModel(options);
-  const commitList = commits.map((c) => `${c.hash.slice(0, 7)} | ${c.author} | ${c.date.split("T")[0]} | ${c.message.split("\n")[0]}`).join("\n");
-  const prompt = buildPrompt(template, "find", {
-    query,
-    commits: commitList,
-    maxResults: String(maxResults)
-  }, options.language);
+  const commitList = commits.map(
+    (c) => `${c.hash.slice(0, 7)} | ${c.author} | ${c.date.split("T")[0]} | ${c.message.split("\n")[0]}`
+  ).join("\n");
+  const prompt = buildPrompt(
+    template,
+    "find",
+    {
+      query,
+      commits: commitList,
+      maxResults: String(maxResults)
+    },
+    options.language
+  );
   const result = await generateObject({
     model,
     schema: CommitSearchSchema,
@@ -606,11 +697,17 @@ async function searchCommits(query, commits, options, maxResults = 5, template)
 }
 async function generateBranchName(description, options, context, template) {
   const model = await getModel(options);
-  const prompt = buildPrompt(template, "branch", {
-    description,
-    type: context?.type,
-    issue: context?.issue
-  }, options.language, "Respond with ONLY the branch name, nothing else.");
+  const prompt = buildPrompt(
+    template,
+    "branch",
+    {
+      description,
+      type: context?.type,
+      issue: context?.issue
+    },
+    options.language,
+    "Respond with ONLY the branch name, nothing else."
+  );
   const result = await generateText({
     model,
     prompt,
@@ -620,9 +717,15 @@ async function generateBranchName(description, options, context, template) {
 }
 async function generateBranchNameFromDiff(diff, options, template) {
   const model = await getModel(options);
-  const prompt = buildPrompt(template, "checkout", {
-    diff: diff.slice(0, 8e3)
-  }, options.language, "Respond with ONLY the branch name, nothing else.");
+  const prompt = buildPrompt(
+    template,
+    "checkout",
+    {
+      diff: diff.slice(0, 8e3)
+    },
+    options.language,
+    "Respond with ONLY the branch name, nothing else."
+  );
   const result = await generateText({
     model,
     prompt,
@@ -632,9 +735,15 @@ async function generateBranchNameFromDiff(diff, options, template) {
 }
 async function generateStashName(diff, options, template) {
   const model = await getModel(options);
-  const prompt = buildPrompt(template, "stash", {
-    diff: diff.slice(0, 4e3)
-  }, options.language, "Respond with ONLY the stash name, nothing else.");
+  const prompt = buildPrompt(
+    template,
+    "stash",
+    {
+      diff: diff.slice(0, 4e3)
+    },
+    options.language,
+    "Respond with ONLY the stash name, nothing else."
+  );
   const result = await generateText({
     model,
     prompt,
@@ -664,13 +773,18 @@ async function generateWorkSummary(context, options, format = "custom", template
   const commitList = context.commits.map((c) => `- ${c.hash.slice(0, 7)} ${c.message.split("\n")[0]} (${c.date.split("T")[0]})`).join("\n");
   const formatHint = format === "daily" ? "This is a daily report. Focus on today's accomplishments." : format === "weekly" ? "This is a weekly report. Summarize the week's work at a higher level." : `This is a summary from ${context.since}${context.until ? ` to ${context.until}` : ""}.`;
   const period = `${context.since}${context.until ? ` to ${context.until}` : " to now"}`;
-  const prompt = buildPrompt(template, "summary", {
-    author: context.author,
-    period,
-    format: formatHint,
-    commits: commitList,
-    diff: context.diff?.slice(0, 6e3)
-  }, options.language);
+  const prompt = buildPrompt(
+    template,
+    "summary",
+    {
+      author: context.author,
+      period,
+      format: formatHint,
+      commits: commitList,
+      diff: context.diff?.slice(0, 6e3)
+    },
+    options.language
+  );
   const result = await generateObject({
     model,
     schema: WorkSummarySchema,
@@ -686,12 +800,17 @@ async function generateWorkSummary(context, options, format = "custom", template
 }
 async function resolveConflict(conflictedContent, context, options, template) {
   const model = await getModel(options);
-  const prompt = buildPrompt(template, "merge", {
-    filename: context.filename,
-    oursRef: context.oursRef,
-    theirsRef: context.theirsRef,
-    content: conflictedContent
-  }, options.language);
+  const prompt = buildPrompt(
+    template,
+    "merge",
+    {
+      filename: context.filename,
+      oursRef: context.oursRef,
+      theirsRef: context.theirsRef,
+      content: conflictedContent
+    },
+    options.language
+  );
   const result = await generateObject({
     model,
     schema: ConflictResolutionSchema,
@@ -701,11 +820,17 @@ async function resolveConflict(conflictedContent, context, options, template) {
 }
 async function generateGitignore(context, options, template) {
   const model = await getModel(options);
-  const prompt = buildPrompt(template, "gitignore", {
-    files: context.files,
-    configFiles: context.configFiles,
-    existingGitignore: context.existingGitignore
-  }, options.language, "Respond with ONLY the .gitignore content, nothing else. No explanations or markdown code blocks.");
+  const prompt = buildPrompt(
+    template,
+    "gitignore",
+    {
+      files: context.files,
+      configFiles: context.configFiles,
+      existingGitignore: context.existingGitignore
+    },
+    options.language,
+    "Respond with ONLY the .gitignore content, nothing else. No explanations or markdown code blocks."
+  );
   const result = await generateText({
     model,
     prompt,
@@ -714,54 +839,106 @@ async function generateGitignore(context, options, template) {
   return result.text.trim();
 }
 
-// src/commands/commit.ts
-var commitCommand = new Command3("commit").description("Generate a commit message using AI").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic)", "gemini").option("-m, --model <model>", "Model to use (provider-specific)").option("-c, --commit", "Automatically commit with the generated message").option("-a, --all", "Force stage all changes (default: auto-stage if nothing staged)").action(async (options) => {
-  const git = simpleGit2();
-  const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
-  const isRepo = await git.checkIsRepo();
-  if (!isRepo) {
-    console.error(chalk3.red("Error: Not a git repository"));
-    process.exit(1);
+// src/lib/gh.ts
+import { execSync as execSync2 } from "child_process";
+import chalk2 from "chalk";
+var ghInstalledCache = null;
+function isGhCliInstalled() {
+  if (ghInstalledCache !== null) {
+    return ghInstalledCache;
   }
-  const provider = options.provider.toLowerCase();
-  if (options.all) {
-    await git.add("-A");
+  try {
+    execSync2("gh --version", { stdio: "pipe" });
+    ghInstalledCache = true;
+    return true;
+  } catch {
+    ghInstalledCache = false;
+    return false;
   }
-  let diff = await git.diff(["--cached"]);
-  if (!diff.trim()) {
-    const status = await git.status();
-    const unstaged = await git.diff();
-    const hasUntracked = status.not_added.length > 0 || status.created.length > 0;
-    if (!unstaged.trim() && !hasUntracked) {
-      console.error(chalk3.yellow("No changes to commit."));
-      process.exit(1);
-    }
-    console.log(chalk3.gray("No staged changes, staging all changes..."));
-    await git.add("-A");
-    diff = await git.diff(["--cached"]);
+}
+function printGhNotInstalledMessage() {
+  console.log(chalk2.yellow("\n\u26A0 GitHub CLI (gh) is not installed"));
+  console.log(chalk2.gray("  This command requires gh CLI. Install it:"));
+  console.log(chalk2.gray("    brew install gh  (macOS)"));
+  console.log(chalk2.gray("    https://cli.github.com/"));
+}
+function requireGhCli() {
+  if (!isGhCliInstalled()) {
+    printGhNotInstalledMessage();
+    return false;
   }
-  const template = findTemplate(repoRoot.trim(), "commit");
+  return true;
+}
+
+// src/commands/branch.ts
+function getIssueInfo(issueNumber) {
+  try {
+    const result = execSync3(`gh issue view ${issueNumber} --json title,body`, {
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    return JSON.parse(result);
+  } catch {
+    return null;
+  }
+}
+var branchCommand = new Command2("branch").description("Generate a branch name from issue number or description").argument("[issue]", "Issue number (e.g., 123 or #123)").option("-d, --description <description>", "Use description instead of issue").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic, ollama)").option("-m, --model <model>", "Model to use (provider-specific)").option("-t, --type <type>", "Branch type (feature, fix, hotfix, chore, refactor)").option("-c, --checkout", "Create and checkout the branch").action(async (issue, options) => {
+  const git = simpleGit();
+  const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
+  const isRepo = await git.checkIsRepo();
+  if (!isRepo) {
+    console.error(chalk3.red("Error: Not a git repository"));
+    process.exit(1);
+  }
+  let description;
+  let issueNumber;
+  if (options.description) {
+    description = options.description;
+  } else if (issue) {
+    if (!requireGhCli()) {
+      process.exit(1);
+    }
+    const cleanedIssue = issue.replace(/^#/, "");
+    issueNumber = cleanedIssue;
+    const spinner2 = ora(`Fetching issue #${cleanedIssue}...`).start();
+    const issueInfo = getIssueInfo(cleanedIssue);
+    if (!issueInfo) {
+      spinner2.fail(`Could not fetch issue #${issueNumber}`);
+      console.log(chalk3.gray("Make sure you are authenticated: gh auth login"));
+      process.exit(1);
+    }
+    spinner2.stop();
+    console.log(chalk3.gray(`Issue: ${issueInfo.title}`));
+    description = `${issueInfo.title}
+
+${issueInfo.body || ""}`;
+  } else {
+    console.error(chalk3.red("Error: Please provide an issue number or use -d for description"));
+    console.log(chalk3.gray("Usage:"));
+    console.log(chalk3.gray("  gut branch 123"));
+    console.log(chalk3.gray('  gut branch -d "add user authentication"'));
+    process.exit(1);
+  }
+  const provider = await resolveProvider(options.provider);
+  const template = findTemplate(repoRoot.trim(), "branch");
   if (template) {
     console.log(chalk3.gray("Using template from project..."));
   }
-  const spinner = ora2("Generating commit message...").start();
+  const spinner = ora("Generating branch name...").start();
   try {
-    const message = await generateCommitMessage(
-      diff,
+    const branchName = await generateBranchName(
+      description,
       { provider, model: options.model },
+      { type: options.type, issue: issueNumber },
       template || void 0
     );
     spinner.stop();
-    console.log(chalk3.bold("\nGenerated commit message:\n"));
-    console.log(chalk3.green(`  ${message.split("\n")[0]}`));
-    if (message.includes("\n")) {
-      const details = message.split("\n").slice(1).join("\n");
-      console.log(chalk3.gray(details.split("\n").map((l) => `  ${l}`).join("\n")));
-    }
+    console.log(chalk3.bold("\nGenerated branch name:\n"));
+    console.log(chalk3.green(`  ${branchName}`));
     console.log();
-    if (options.commit) {
-      await git.commit(message);
-      console.log(chalk3.green("\u2713 Committed successfully"));
+    if (options.checkout) {
+      await git.checkoutLocalBranch(branchName);
+      console.log(chalk3.green(`\u2713 Created and checked out branch: ${branchName}`));
     } else {
       const readline = await import("readline");
       const rl = readline.createInterface({
@@ -769,566 +946,512 @@ var commitCommand = new Command3("commit").description("Generate a commit messag
         output: process.stdout
       });
       const answer = await new Promise((resolve) => {
-        rl.question(chalk3.cyan("Commit with this message? (y/N/e to edit) "), resolve);
+        rl.question(chalk3.cyan("Create and checkout this branch? (y/N) "), resolve);
       });
       rl.close();
       if (answer.toLowerCase() === "y") {
-        await git.commit(message);
-        console.log(chalk3.green("\u2713 Committed successfully"));
-      } else if (answer.toLowerCase() === "e") {
-        console.log(chalk3.gray("Opening editor..."));
-        const { execSync: execSync9 } = await import("child_process");
-        const editor = process.env.EDITOR || process.env.VISUAL || "vi";
-        const fs2 = await import("fs");
-        const os = await import("os");
-        const path2 = await import("path");
-        const tmpFile = path2.join(os.tmpdir(), "gut-commit-msg.txt");
-        fs2.writeFileSync(tmpFile, message);
-        execSync9(`${editor} "${tmpFile}"`, { stdio: "inherit" });
-        const editedMessage = fs2.readFileSync(tmpFile, "utf-8").trim();
-        fs2.unlinkSync(tmpFile);
-        if (editedMessage) {
-          await git.commit(editedMessage);
-          console.log(chalk3.green("\u2713 Committed successfully"));
-        } else {
-          console.log(chalk3.yellow("Commit cancelled (empty message)"));
-        }
+        await git.checkoutLocalBranch(branchName);
+        console.log(chalk3.green(`\u2713 Created and checked out branch: ${branchName}`));
       } else {
-        console.log(chalk3.gray("Commit cancelled"));
-        console.log(chalk3.gray("\nTo commit manually:"));
-        console.log(chalk3.gray(`  git commit -m "${message.split("\n")[0]}"`));
+        console.log(chalk3.gray("\nTo create manually:"));
+        console.log(chalk3.gray(`  git checkout -b ${branchName}`));
       }
     }
   } catch (error) {
-    spinner.fail("Failed to generate commit message");
+    spinner.fail("Failed to generate branch name");
     console.error(chalk3.red(error instanceof Error ? error.message : "Unknown error"));
     process.exit(1);
   }
 });
 
-// src/commands/pr.ts
-import { Command as Command4 } from "commander";
-import chalk5 from "chalk";
-import ora3 from "ora";
-import { simpleGit as simpleGit3 } from "simple-git";
-import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
-import { join as join2 } from "path";
-import { execSync as execSync2 } from "child_process";
-
-// src/lib/gh.ts
-import { execSync } from "child_process";
+// src/commands/changelog.ts
 import chalk4 from "chalk";
-var ghInstalledCache = null;
-function isGhCliInstalled() {
-  if (ghInstalledCache !== null) {
-    return ghInstalledCache;
-  }
-  try {
-    execSync("gh --version", { stdio: "pipe" });
-    ghInstalledCache = true;
-    return true;
-  } catch {
-    ghInstalledCache = false;
-    return false;
-  }
-}
-function printGhNotInstalledMessage() {
-  console.log(chalk4.yellow("\n\u26A0 GitHub CLI (gh) is not installed"));
-  console.log(chalk4.gray("  This command requires gh CLI. Install it:"));
-  console.log(chalk4.gray("    brew install gh  (macOS)"));
-  console.log(chalk4.gray("    https://cli.github.com/"));
-}
-function requireGhCli() {
-  if (!isGhCliInstalled()) {
-    printGhNotInstalledMessage();
-    return false;
+import { Command as Command3 } from "commander";
+import ora2 from "ora";
+import { simpleGit as simpleGit2 } from "simple-git";
+function formatChangelog(changelog) {
+  const lines = [];
+  const header = changelog.version ? `## [${changelog.version}] - ${changelog.date}` : `## ${changelog.date}`;
+  lines.push(header);
+  lines.push("");
+  if (changelog.summary) {
+    lines.push(changelog.summary);
+    lines.push("");
   }
-  return true;
-}
-
-// src/commands/pr.ts
-var GITHUB_PR_TEMPLATE_PATHS = [
-  ".github/pull_request_template.md",
-  ".github/PULL_REQUEST_TEMPLATE.md",
-  "pull_request_template.md",
-  "PULL_REQUEST_TEMPLATE.md",
-  "docs/pull_request_template.md"
-];
-function findPRTemplate(repoRoot) {
-  for (const templatePath of GITHUB_PR_TEMPLATE_PATHS) {
-    const fullPath = join2(repoRoot, templatePath);
-    if (existsSync2(fullPath)) {
-      return readFileSync2(fullPath, "utf-8");
+  for (const section of changelog.sections) {
+    if (section.items.length > 0) {
+      lines.push(`### ${section.type}`);
+      for (const item of section.items) {
+        lines.push(`- ${item}`);
+      }
+      lines.push("");
     }
   }
-  return findTemplate(repoRoot, "pr");
+  return lines.join("\n");
 }
-var prCommand = new Command4("pr").description("Generate a pull request title and description using AI").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic)", "gemini").option("-m, --model <model>", "Model to use (provider-specific)").option("-b, --base <branch>", "Base branch to compare against (default: main or master)").option("--create", "Create the PR using gh CLI").option("--copy", "Copy the description to clipboard").action(async (options) => {
-  const git = simpleGit3();
+var changelogCommand = new Command3("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, ollama)").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 = simpleGit2();
   const isRepo = await git.checkIsRepo();
   if (!isRepo) {
-    console.error(chalk5.red("Error: Not a git repository"));
+    console.error(chalk4.red("Error: Not a git repository"));
     process.exit(1);
   }
-  const provider = options.provider.toLowerCase();
-  const spinner = ora3("Analyzing branch...").start();
+  const provider = await resolveProvider(options.provider);
+  const spinner = ora2("Analyzing commits...").start();
   try {
-    const branchInfo = await git.branch();
-    const currentBranch = branchInfo.current;
-    let baseBranch = options.base;
-    if (!baseBranch) {
-      if (branchInfo.all.includes("main")) {
-        baseBranch = "main";
-      } else if (branchInfo.all.includes("master")) {
-        baseBranch = "master";
-      } else {
-        baseBranch = "main";
-      }
-    }
-    if (currentBranch === baseBranch) {
-      spinner.fail(`Already on ${baseBranch} branch`);
-      process.exit(1);
+    let fromRef = from;
+    let toRef = to;
+    if (options.tag) {
+      fromRef = options.tag;
+      toRef = "HEAD";
     }
-    spinner.text = `Comparing ${currentBranch} to ${baseBranch}...`;
-    const log = await git.log({ from: baseBranch, to: currentBranch });
-    const commits = log.all.map((c) => c.message.split("\n")[0]);
-    if (commits.length === 0) {
-      spinner.fail("No commits found between branches");
-      process.exit(1);
+    const log = await git.log({ from: fromRef, to: toRef });
+    if (log.all.length === 0) {
+      spinner.info("No commits found in range");
+      process.exit(0);
     }
-    const diff = await git.diff([`${baseBranch}...${currentBranch}`]);
+    spinner.text = `Found ${log.all.length} commits, generating changelog...`;
+    const commits = log.all.map((c) => ({
+      hash: c.hash,
+      message: c.message,
+      author: c.author_name,
+      date: c.date
+    }));
+    const diff = await git.diff([`${fromRef}...${toRef}`]);
     const repoRoot = await git.revparse(["--show-toplevel"]);
-    const template = findPRTemplate(repoRoot.trim());
+    const template = findTemplate(repoRoot.trim(), "changelog");
     if (template) {
-      spinner.text = "Found PR template, generating description...";
-    } else {
-      spinner.text = "Generating PR description...";
+      spinner.text = "Using template from project...";
     }
-    const { title, body } = await generatePRDescription(
-      {
-        baseBranch,
-        currentBranch,
-        commits,
-        diff
-      },
+    const changelog = await generateChangelog(
+      { commits, diff, fromRef, toRef },
       { provider, model: options.model },
       template || void 0
     );
     spinner.stop();
-    console.log(chalk5.bold("\n\u{1F4DD} Generated PR:\n"));
-    console.log(chalk5.cyan("Title:"), chalk5.white(title));
-    console.log(chalk5.cyan("\nDescription:"));
-    console.log(chalk5.gray("\u2500".repeat(50)));
-    console.log(body);
-    console.log(chalk5.gray("\u2500".repeat(50)));
-    if (options.copy) {
-      try {
-        const fullText = `${title}
-
-${body}`;
-        execSync2("pbcopy", { input: fullText });
-        console.log(chalk5.green("\n\u2713 Copied to clipboard"));
-      } catch {
-        console.log(chalk5.yellow("\n\u26A0 Could not copy to clipboard"));
-      }
+    if (options.json) {
+      console.log(JSON.stringify(changelog, null, 2));
+      return;
     }
-    const ghInstalled = isGhCliInstalled();
-    if (!ghInstalled) {
-      console.log(chalk5.yellow("\n\u26A0 GitHub CLI (gh) is not installed"));
-      console.log(chalk5.gray("  To create PRs directly from gut, install gh CLI:"));
-      console.log(chalk5.gray("    brew install gh  (macOS)"));
-      console.log(chalk5.gray("    https://cli.github.com/"));
-      if (!options.copy) {
-        console.log(chalk5.gray("\nTip: Use --copy to copy to clipboard"));
-      }
-    } else {
-      const readline = await import("readline");
-      const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout
-      });
-      const promptMessage = options.create ? chalk5.cyan("\nCreate PR with this description? (y/N) ") : chalk5.cyan("\nCreate PR with gh CLI? (y/N) ");
-      const answer = await new Promise((resolve) => {
-        rl.question(promptMessage, resolve);
-      });
-      rl.close();
-      if (answer.toLowerCase() === "y") {
-        const createSpinner = ora3("Creating PR...").start();
-        try {
-          const escapedTitle = title.replace(/"/g, '\\"');
-          const escapedBody = body.replace(/"/g, '\\"');
-          execSync2(
-            `gh pr create --title "${escapedTitle}" --body "${escapedBody}" --base ${baseBranch}`,
-            { stdio: "pipe" }
-          );
-          createSpinner.succeed("PR created successfully!");
-        } catch (error) {
-          createSpinner.fail("Failed to create PR");
-          console.error(chalk5.gray("Make sure gh CLI is authenticated: gh auth login"));
-        }
-      } else if (!options.copy) {
-        console.log(chalk5.gray("\nTip: Use --copy to copy to clipboard"));
-      }
+    console.log(chalk4.bold("\n\u{1F4CB} Generated Changelog\n"));
+    console.log(chalk4.gray("\u2500".repeat(50)));
+    console.log(formatChangelog(changelog));
+    console.log(chalk4.gray("\u2500".repeat(50)));
+    console.log(chalk4.gray(`
+Range: ${fromRef}..${toRef} (${commits.length} commits)`));
+    if (template) {
+      console.log(chalk4.gray("Style matched from existing CHANGELOG.md"));
     }
   } catch (error) {
-    spinner.fail("Failed to generate PR description");
-    console.error(chalk5.red(error instanceof Error ? error.message : "Unknown error"));
+    spinner.fail("Failed to generate changelog");
+    console.error(chalk4.red(error instanceof Error ? error.message : "Unknown error"));
     process.exit(1);
   }
 });
 
-// src/commands/review.ts
-import { Command as Command5 } from "commander";
-import chalk6 from "chalk";
-import ora4 from "ora";
-import { simpleGit as simpleGit4 } from "simple-git";
-import { execSync as execSync3 } from "child_process";
-async function getPRDiff(prNumber) {
+// src/commands/checkout.ts
+import chalk5 from "chalk";
+import { Command as Command4 } from "commander";
+import ora3 from "ora";
+import { simpleGit as simpleGit3 } from "simple-git";
+var checkoutCommand = new Command4("checkout").description("Generate a branch name from current diff and checkout").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic, ollama)").option("-m, --model <model>", "Model to use (provider-specific)").option("-y, --yes", "Skip confirmation and checkout directly").option("-s, --staged", "Use staged changes only instead of all changes").action(async (options) => {
+  const git = simpleGit3();
+  const isRepo = await git.checkIsRepo();
+  if (!isRepo) {
+    console.error(chalk5.red("Error: Not a git repository"));
+    process.exit(1);
+  }
+  const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
+  const spinner = ora3("Analyzing changes...").start();
+  const status = await git.status();
+  let diff;
+  if (options.staged) {
+    diff = await git.diff(["--cached"]);
+  } else {
+    const stagedDiff = await git.diff(["--cached"]);
+    const unstagedDiff = await git.diff();
+    diff = `${stagedDiff}
+${unstagedDiff}`;
+  }
+  const hasChanges = diff.trim() || status.not_added.length > 0 || status.created.length > 0;
+  if (!hasChanges) {
+    spinner.fail("No changes found");
+    console.log(chalk5.gray("Make some changes first, then run gut checkout"));
+    process.exit(1);
+  }
+  if (!diff.trim() && (status.not_added.length > 0 || status.created.length > 0)) {
+    const untrackedFiles = [...status.not_added, ...status.created];
+    diff = `New files:
+${untrackedFiles.map((f) => `+ ${f}`).join("\n")}`;
+  }
+  spinner.text = "Generating branch name...";
+  const provider = await resolveProvider(options.provider);
+  const template = findTemplate(repoRoot.trim(), "checkout");
+  if (template) {
+    console.log(chalk5.gray("\nUsing template from project..."));
+  }
   try {
-    const diff = execSync3(`gh pr diff ${prNumber}`, { encoding: "utf-8", maxBuffer: 10 * 1024 * 1024 });
-    const prJsonStr = execSync3(`gh pr view ${prNumber} --json number,title,author,url`, { encoding: "utf-8" });
-    const prJson = JSON.parse(prJsonStr);
-    return {
+    const branchName = await generateBranchNameFromDiff(
       diff,
-      prInfo: {
-        number: prJson.number,
-        title: prJson.title,
-        author: prJson.author.login,
-        url: prJson.url
+      { provider, model: options.model },
+      template
+    );
+    spinner.stop();
+    console.log(chalk5.bold("\nGenerated branch name:\n"));
+    console.log(chalk5.green(`  ${branchName}`));
+    console.log();
+    if (options.yes) {
+      await git.checkoutLocalBranch(branchName);
+      console.log(chalk5.green(`\u2713 Created and checked out branch: ${branchName}`));
+    } else {
+      const readline = await import("readline");
+      const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+      });
+      const answer = await new Promise((resolve) => {
+        rl.question(chalk5.cyan("Create and checkout this branch? (y/N) "), resolve);
+      });
+      rl.close();
+      if (answer.toLowerCase() === "y") {
+        await git.checkoutLocalBranch(branchName);
+        console.log(chalk5.green(`\u2713 Created and checked out branch: ${branchName}`));
+      } else {
+        console.log(chalk5.gray("\nTo create manually:"));
+        console.log(chalk5.gray(`  git checkout -b ${branchName}`));
       }
-    };
-  } catch (error) {
-    if (error instanceof Error && error.message.includes("gh: command not found")) {
-      throw new Error("GitHub CLI (gh) is not installed. Install it from https://cli.github.com/");
     }
-    throw error;
+  } catch (error) {
+    spinner.fail("Failed to generate branch name");
+    console.error(chalk5.red(error instanceof Error ? error.message : "Unknown error"));
+    process.exit(1);
   }
-}
-var reviewCommand = new Command5("review").description("Get an AI code review of your changes or a GitHub PR").argument("[pr-number]", "GitHub PR number to review").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic)", "gemini").option("-m, --model <model>", "Model to use (provider-specific)").option("-s, --staged", "Review only staged changes").option("-c, --commit <hash>", "Review a specific commit").option("--json", "Output as JSON").action(async (prNumber, options) => {
+});
+
+// src/commands/cleanup.ts
+import chalk6 from "chalk";
+import { Command as Command5 } from "commander";
+import ora4 from "ora";
+import { simpleGit as simpleGit4 } from "simple-git";
+var cleanupCommand = new Command5("cleanup").description("Delete merged branches safely").option("-r, --remote", "Also delete remote branches").option("-f, --force", "Skip confirmation prompt").option("--dry-run", "Show branches that would be deleted without deleting").option("--base <branch>", "Base branch to compare against (default: main or master)").action(async (options) => {
   const git = simpleGit4();
   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 = ora4("Getting diff...").start();
+  const spinner = ora4("Fetching branch information...").start();
   try {
-    let diff;
-    let prInfo = null;
-    if (prNumber) {
-      spinner.stop();
-      if (!requireGhCli()) {
-        process.exit(1);
-      }
-      spinner.start(`Fetching PR #${prNumber}...`);
-      const result = await getPRDiff(prNumber);
-      diff = result.diff;
-      prInfo = result.prInfo;
-      spinner.text = `Reviewing PR #${prNumber}...`;
-    } else if (options.commit) {
-      diff = await git.diff([`${options.commit}^`, options.commit]);
-      spinner.text = `Reviewing commit ${options.commit.slice(0, 7)}...`;
-    } else if (options.staged) {
-      diff = await git.diff(["--cached"]);
-      spinner.text = "Reviewing staged changes...";
-    } else {
-      diff = await git.diff();
-      const stagedDiff = await git.diff(["--cached"]);
-      diff = stagedDiff + "\n" + diff;
-      spinner.text = "Reviewing uncommitted changes...";
-    }
-    if (!diff.trim()) {
-      spinner.info("No changes to review");
-      process.exit(0);
-    }
-    spinner.text = "AI is reviewing your code...";
-    const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
-    const template = findTemplate(repoRoot.trim(), "review");
-    const review = await generateCodeReview(
-      diff,
-      { provider, model: options.model },
-      template || void 0
-    );
+    await git.fetch(["--prune"]);
+    const currentBranch = (await git.branch()).current;
+    const baseBranch = options.base || await detectBaseBranch(git);
+    spinner.text = `Using ${chalk6.cyan(baseBranch)} as base branch`;
+    const mergedResult = await git.branch(["--merged", baseBranch]);
+    const mergedBranches = mergedResult.all.filter((branch) => {
+      const cleanName = branch.trim().replace(/^\* /, "");
+      return cleanName !== currentBranch && cleanName !== baseBranch && !cleanName.startsWith("remotes/") && cleanName !== "main" && cleanName !== "master" && cleanName !== "develop";
+    });
     spinner.stop();
-    if (options.json) {
-      console.log(JSON.stringify({ prInfo, review }, null, 2));
+    if (mergedBranches.length === 0) {
+      console.log(chalk6.green("\u2713 No merged branches to clean up"));
       return;
     }
-    if (prInfo) {
-      console.log(chalk6.bold(`
-\u{1F517} PR #${prInfo.number}: ${prInfo.title}`));
-      console.log(chalk6.gray(`   by ${prInfo.author} - ${prInfo.url}`));
+    console.log(chalk6.yellow(`
+Found ${mergedBranches.length} merged branch(es):
+`));
+    mergedBranches.forEach((branch) => {
+      console.log(`  ${chalk6.red("\u2022")} ${branch}`);
+    });
+    if (options.dryRun) {
+      console.log(chalk6.blue("\n(dry-run mode - no branches were deleted)"));
+      return;
     }
-    printReview(review);
-  } catch (error) {
-    spinner.fail("Failed to generate review");
-    console.error(chalk6.red(error instanceof Error ? error.message : "Unknown error"));
-    process.exit(1);
-  }
-});
-function printReview(review) {
-  console.log(chalk6.bold("\n\u{1F50D} AI Code Review\n"));
-  console.log(chalk6.cyan("Summary:"));
-  console.log(`  ${review.summary}
-`);
-  if (review.issues.length > 0) {
-    console.log(chalk6.cyan("Issues Found:"));
-    for (const issue of review.issues) {
-      const severityColors = {
-        critical: chalk6.red,
-        warning: chalk6.yellow,
-        suggestion: chalk6.blue
-      };
-      const severityIcons = {
-        critical: "\u{1F534}",
-        warning: "\u{1F7E1}",
-        suggestion: "\u{1F4A1}"
-      };
-      const color = severityColors[issue.severity];
-      const icon = severityIcons[issue.severity];
-      console.log(`
-  ${icon} ${color(issue.severity.toUpperCase())}`);
-      console.log(`     ${chalk6.gray("File:")} ${issue.file}${issue.line ? `:${issue.line}` : ""}`);
-      console.log(`     ${issue.message}`);
-      if (issue.suggestion) {
-        console.log(`     ${chalk6.green("\u2192")} ${issue.suggestion}`);
+    if (!options.force) {
+      const readline = await import("readline");
+      const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+      });
+      const answer = await new Promise((resolve) => {
+        rl.question(chalk6.yellow("\nDelete these branches? (y/N) "), resolve);
+      });
+      rl.close();
+      if (answer.toLowerCase() !== "y") {
+        console.log(chalk6.gray("Cancelled"));
+        return;
       }
     }
-  } else {
-    console.log(chalk6.green("  \u2713 No issues found!\n"));
-  }
-  if (review.positives.length > 0) {
-    console.log(chalk6.cyan("\nGood Practices:"));
-    for (const positive of review.positives) {
-      console.log(`  ${chalk6.green("\u2713")} ${positive}`);
+    const deleteSpinner = ora4("Deleting branches...").start();
+    for (const branch of mergedBranches) {
+      try {
+        await git.deleteLocalBranch(branch, true);
+        deleteSpinner.text = `Deleted ${branch}`;
+        if (options.remote) {
+          try {
+            await git.push("origin", `:${branch}`);
+          } catch {
+          }
+        }
+      } catch {
+        deleteSpinner.warn(`Failed to delete ${branch}`);
+      }
     }
+    deleteSpinner.succeed(chalk6.green(`Deleted ${mergedBranches.length} branch(es)`));
+  } catch (err) {
+    spinner.fail("Failed to cleanup branches");
+    console.error(chalk6.red(err instanceof Error ? err.message : "Unknown error"));
+    process.exit(1);
   }
-  const criticalCount = review.issues.filter((i) => i.severity === "critical").length;
-  const warningCount = review.issues.filter((i) => i.severity === "warning").length;
-  const suggestionCount = review.issues.filter((i) => i.severity === "suggestion").length;
-  console.log(chalk6.gray("\n\u2500".repeat(40)));
-  console.log(
-    `  ${chalk6.red(criticalCount)} critical  ${chalk6.yellow(warningCount)} warnings  ${chalk6.blue(suggestionCount)} suggestions`
-  );
-  console.log();
+});
+async function detectBaseBranch(git) {
+  const branches = await git.branch();
+  if (branches.all.includes("main")) return "main";
+  if (branches.all.includes("master")) return "master";
+  return "main";
 }
 
-// src/commands/merge.ts
-import { Command as Command6 } from "commander";
+// src/commands/commit.ts
 import chalk7 from "chalk";
+import { Command as Command6 } from "commander";
 import ora5 from "ora";
 import { simpleGit as simpleGit5 } from "simple-git";
-import * as fs from "fs";
-import * as path from "path";
-var mergeCommand = new Command6("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) => {
+var commitCommand = new Command6("commit").description("Generate a commit message using AI").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic, ollama)").option("-m, --model <model>", "Model to use (provider-specific)").option("-c, --commit", "Automatically commit with the generated message").option("-a, --all", "Force stage all changes (default: auto-stage if nothing staged)").action(async (options) => {
   const git = simpleGit5();
+  const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
   const isRepo = await git.checkIsRepo();
   if (!isRepo) {
     console.error(chalk7.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"));
-    process.exit(1);
-  }
-  const branchInfo = await git.branch();
-  const currentBranch = branchInfo.current;
-  console.log(chalk7.bold(`
-Merging ${chalk7.cyan(branch)} into ${chalk7.cyan(currentBranch)}...
-`));
-  try {
-    await git.merge([branch]);
-    console.log(chalk7.green("\u2713 Merged successfully (no conflicts)"));
-    return;
-  } catch (error) {
+  const provider = await resolveProvider(options.provider);
+  if (options.all) {
+    await git.add("-A");
   }
-  const conflictStatus = await git.status();
-  const conflictedFiles = conflictStatus.conflicted;
-  if (conflictedFiles.length === 0) {
-    console.error(chalk7.red("Merge failed for unknown reason"));
-    await git.merge(["--abort"]);
-    process.exit(1);
+  let diff = await git.diff(["--cached"]);
+  if (!diff.trim()) {
+    const status = await git.status();
+    const unstaged = await git.diff();
+    const hasUntracked = status.not_added.length > 0 || status.created.length > 0;
+    if (!unstaged.trim() && !hasUntracked) {
+      console.error(chalk7.yellow("No changes to commit."));
+      process.exit(1);
+    }
+    console.log(chalk7.gray("No staged changes, staging all changes..."));
+    await git.add("-A");
+    diff = await git.diff(["--cached"]);
   }
-  console.log(chalk7.yellow(`\u26A0 ${conflictedFiles.length} conflict(s) detected
-`));
-  const spinner = ora5();
-  const rootDir = await git.revparse(["--show-toplevel"]);
-  const template = findTemplate(rootDir.trim(), "merge");
+  const template = findTemplate(repoRoot.trim(), "commit");
   if (template) {
-    console.log(chalk7.gray("Using merge template from project...\n"));
+    console.log(chalk7.gray("Using template from project..."));
   }
-  for (const file of conflictedFiles) {
-    const filePath = path.join(rootDir.trim(), file);
-    const content = fs.readFileSync(filePath, "utf-8");
-    console.log(chalk7.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)));
+  const spinner = ora5("Generating commit message...").start();
+  try {
+    const message = await generateCommitMessage(
+      diff,
+      { provider, model: options.model },
+      template || void 0
+    );
+    spinner.stop();
+    console.log(chalk7.bold("\nGenerated commit message:\n"));
+    console.log(chalk7.green(`  ${message.split("\n")[0]}`));
+    if (message.includes("\n")) {
+      const details = message.split("\n").slice(1).join("\n");
+      console.log(
+        chalk7.gray(
+          details.split("\n").map((l) => `  ${l}`).join("\n")
+        )
+      );
     }
-    spinner.start("AI is analyzing conflict...");
-    try {
-      const resolution = await resolveConflict(content, {
-        filename: file,
-        oursRef: currentBranch,
-        theirsRef: branch
-      }, { provider, model: options.model }, template || void 0);
-      spinner.stop();
-      console.log(chalk7.cyan("\n\u{1F916} AI suggests:"));
-      console.log(chalk7.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}`));
+    console.log();
+    if (options.commit) {
+      await git.commit(message);
+      console.log(chalk7.green("\u2713 Committed successfully"));
+    } else {
       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(chalk7.cyan("Commit with this message? (y/N/e to edit) "), resolve);
       });
       rl.close();
       if (answer.toLowerCase() === "y") {
-        fs.writeFileSync(filePath, resolution.resolvedContent);
-        await git.add(file);
-        console.log(chalk7.green(`\u2713 Resolved ${file}`));
-      } else if (answer.toLowerCase() === "s") {
-        console.log(chalk7.yellow(`\u23ED Skipped ${file}`));
+        await git.commit(message);
+        console.log(chalk7.green("\u2713 Committed successfully"));
+      } else if (answer.toLowerCase() === "e") {
+        console.log(chalk7.gray("Opening editor..."));
+        const { execSync: execSync9 } = await import("child_process");
+        const editor = process.env.EDITOR || process.env.VISUAL || "vi";
+        const fs2 = await import("fs");
+        const os = await import("os");
+        const path2 = await import("path");
+        const tmpFile = path2.join(os.tmpdir(), "gut-commit-msg.txt");
+        fs2.writeFileSync(tmpFile, message);
+        execSync9(`${editor} "${tmpFile}"`, { stdio: "inherit" });
+        const editedMessage = fs2.readFileSync(tmpFile, "utf-8").trim();
+        fs2.unlinkSync(tmpFile);
+        if (editedMessage) {
+          await git.commit(editedMessage);
+          console.log(chalk7.green("\u2713 Committed successfully"));
+        } else {
+          console.log(chalk7.yellow("Commit cancelled (empty message)"));
+        }
       } else {
-        console.log(chalk7.yellow(`\u2717 Rejected - resolve manually: ${file}`));
+        console.log(chalk7.gray("Commit cancelled"));
+        console.log(chalk7.gray("\nTo commit manually:"));
+        console.log(chalk7.gray(`  git commit -m "${message.split("\n")[0]}"`));
       }
-    } 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}`));
     }
-  }
-  const finalStatus = await git.status();
-  if (finalStatus.conflicted.length > 0) {
-    console.log(chalk7.yellow(`
-\u26A0 ${finalStatus.conflicted.length} conflict(s) remaining`));
-    console.log(chalk7.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"));
-  } else {
-    console.log(chalk7.green("\n\u2713 All conflicts resolved"));
-    console.log(chalk7.gray("Run: git commit"));
+  } catch (error) {
+    spinner.fail("Failed to generate commit message");
+    console.error(chalk7.red(error instanceof Error ? error.message : "Unknown error"));
+    process.exit(1);
   }
 });
 
-// src/commands/changelog.ts
-import { Command as Command7 } from "commander";
+// src/commands/config.ts
+import { execSync as execSync4 } from "child_process";
+import { existsSync as existsSync3, mkdirSync as mkdirSync2 } from "fs";
+import { homedir as homedir3 } from "os";
+import { join as join3 } from "path";
 import chalk8 from "chalk";
-import ora6 from "ora";
+import { Command as Command7 } from "commander";
 import { simpleGit as simpleGit6 } from "simple-git";
-function formatChangelog(changelog) {
-  const lines = [];
-  const header = changelog.version ? `## [${changelog.version}] - ${changelog.date}` : `## ${changelog.date}`;
-  lines.push(header);
-  lines.push("");
-  if (changelog.summary) {
-    lines.push(changelog.summary);
-    lines.push("");
-  }
-  for (const section of changelog.sections) {
-    if (section.items.length > 0) {
-      lines.push(`### ${section.type}`);
-      for (const item of section.items) {
-        lines.push(`- ${item}`);
-      }
-      lines.push("");
-    }
-  }
-  return lines.join("\n");
+function openFolder(path2) {
+  const platform = process.platform;
+  const cmd = platform === "darwin" ? "open" : platform === "win32" ? 'start ""' : "xdg-open";
+  execSync4(`${cmd} "${path2}"`);
 }
-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"));
-    process.exit(1);
-  }
-  const provider = options.provider.toLowerCase();
-  const spinner = ora6("Analyzing commits...").start();
-  try {
-    let fromRef = from;
-    let toRef = to;
-    if (options.tag) {
-      fromRef = options.tag;
-      toRef = "HEAD";
+var configCommand = new Command7("config").description("Manage gut configuration");
+configCommand.command("set <key> <value>").description("Set a configuration value").option("--local", "Set for current repository only").action((key, value, options) => {
+  if (key === "lang") {
+    if (!isValidLanguage(value)) {
+      console.error(chalk8.red(`Invalid language: ${value}`));
+      console.error(chalk8.gray(`Valid languages: ${VALID_LANGUAGES.join(", ")}`));
+      process.exit(1);
     }
-    const log = await git.log({ from: fromRef, to: toRef });
-    if (log.all.length === 0) {
-      spinner.info("No commits found in range");
-      process.exit(0);
+    try {
+      setLanguage(value, options.local ?? false);
+      const scope = options.local ? "(local)" : "(global)";
+      console.log(chalk8.green(`\u2713 Language set to: ${value} ${scope}`));
+    } catch (err) {
+      console.error(chalk8.red(err.message));
+      process.exit(1);
     }
-    spinner.text = `Found ${log.all.length} commits, generating changelog...`;
-    const commits = log.all.map((c) => ({
-      hash: c.hash,
-      message: c.message,
-      author: c.author_name,
-      date: c.date
-    }));
-    const diff = await git.diff([`${fromRef}...${toRef}`]);
-    const repoRoot = await git.revparse(["--show-toplevel"]);
-    const template = findTemplate(repoRoot.trim(), "changelog");
-    if (template) {
-      spinner.text = "Using template from project...";
+  } else if (key === "model") {
+    try {
+      setModel(value, options.local ?? false);
+      const scope = options.local ? "(local)" : "(global)";
+      console.log(chalk8.green(`\u2713 Model set to: ${value} ${scope}`));
+      console.log(
+        chalk8.gray(
+          `Default models: ${Object.entries(DEFAULT_MODELS).map(([k, v]) => `${k}=${v}`).join(", ")}`
+        )
+      );
+    } catch (err) {
+      console.error(chalk8.red(err.message));
+      process.exit(1);
     }
-    const changelog = await generateChangelog(
-      { commits, diff, fromRef, toRef },
-      { provider, model: options.model },
-      template || void 0
-    );
-    spinner.stop();
-    if (options.json) {
-      console.log(JSON.stringify(changelog, null, 2));
-      return;
+  } else if (key === "provider") {
+    if (!isValidProvider(value)) {
+      console.error(chalk8.red(`Invalid provider: ${value}`));
+      console.error(chalk8.gray(`Valid providers: ${VALID_PROVIDERS.join(", ")}`));
+      process.exit(1);
     }
-    console.log(chalk8.bold("\n\u{1F4CB} Generated Changelog\n"));
-    console.log(chalk8.gray("\u2500".repeat(50)));
-    console.log(formatChangelog(changelog));
-    console.log(chalk8.gray("\u2500".repeat(50)));
-    console.log(chalk8.gray(`
-Range: ${fromRef}..${toRef} (${commits.length} commits)`));
-    if (template) {
-      console.log(chalk8.gray("Style matched from existing CHANGELOG.md"));
+    try {
+      setProvider(value, options.local ?? false);
+      const scope = options.local ? "(local)" : "(global)";
+      console.log(chalk8.green(`\u2713 Provider set to: ${value} ${scope}`));
+    } catch (err) {
+      console.error(chalk8.red(err.message));
+      process.exit(1);
+    }
+  } else {
+    console.error(chalk8.red(`Unknown config key: ${key}`));
+    console.error(chalk8.gray("Available keys: lang, model, provider"));
+    process.exit(1);
+  }
+});
+configCommand.command("get <key>").description("Get a configuration value").action((key) => {
+  const config = getConfig();
+  if (key in config) {
+    console.log(config[key]);
+  } else {
+    console.error(chalk8.red(`Unknown config key: ${key}`));
+    process.exit(1);
+  }
+});
+configCommand.command("list").description("List all configuration values").action(() => {
+  const localConfig = getLocalConfig();
+  const effectiveConfig = getConfig();
+  console.log(chalk8.bold("Configuration:"));
+  console.log();
+  for (const key of Object.keys(effectiveConfig)) {
+    const value = effectiveConfig[key];
+    const isLocal = key in localConfig;
+    const scope = isLocal ? chalk8.cyan(" (local)") : chalk8.gray(" (global)");
+    console.log(`  ${chalk8.cyan(key)}: ${value}${scope}`);
+  }
+  if (Object.keys(localConfig).length > 0) {
+    console.log();
+    console.log(chalk8.gray("Local config: .gut/config.json"));
+  }
+});
+configCommand.command("open").description("Open configuration or templates folder").option("-t, --templates", "Open templates folder instead of config").option("-g, --global", "Open global folder (default)").option("-l, --local", "Open local/project folder").action(async (options) => {
+  const git = simpleGit6();
+  const isLocal = options.local === true;
+  let targetPath;
+  if (isLocal) {
+    const isRepo = await git.checkIsRepo();
+    if (!isRepo) {
+      console.error(chalk8.red("Error: Not a git repository"));
+      console.error(chalk8.gray("Use --global to open global config folder"));
+      process.exit(1);
+    }
+    const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
+    targetPath = join3(repoRoot.trim(), ".gut");
+  } else {
+    if (options.templates) {
+      targetPath = join3(homedir3(), ".config", "gut", "templates");
+    } else {
+      targetPath = join3(homedir3(), ".config", "gut");
     }
+  }
+  if (!existsSync3(targetPath)) {
+    mkdirSync2(targetPath, { recursive: true });
+    console.log(chalk8.green(`Created ${targetPath}`));
+  }
+  try {
+    openFolder(targetPath);
+    console.log(chalk8.green(`Opened: ${targetPath}`));
   } catch (error) {
-    spinner.fail("Failed to generate changelog");
-    console.error(chalk8.red(error instanceof Error ? error.message : "Unknown error"));
+    console.error(chalk8.red(`Failed to open folder: ${targetPath}`));
+    console.error(chalk8.gray(error.message));
     process.exit(1);
   }
 });
 
 // src/commands/explain.ts
-import { Command as Command8 } from "commander";
+import { execSync as execSync5 } from "child_process";
+import { existsSync as existsSync4, readFileSync as readFileSync3 } from "fs";
 import chalk9 from "chalk";
-import ora7 from "ora";
+import { Command as Command8 } from "commander";
+import ora6 from "ora";
 import { simpleGit as simpleGit7 } from "simple-git";
-import { execSync as execSync4 } from "child_process";
-import { existsSync as existsSync3, readFileSync as readFileSync4 } from "fs";
-var explainCommand = new Command8("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) => {
+var explainCommand = new Command8("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, ollama)").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"));
     process.exit(1);
   }
-  const provider = options.provider.toLowerCase();
+  const provider = await resolveProvider(options.provider);
   const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
-  const spinner = ora7("Analyzing...").start();
+  const spinner = ora6("Analyzing...").start();
   try {
     let context;
     if (!target || options.staged) {
@@ -1339,7 +1462,7 @@ var explainCommand = new Command8("explain").description("Get an AI-powered expl
       }
     } else {
       const isPR = target.match(/^#?\d+$/) || target.includes("/pull/");
-      const isFile = existsSync3(target);
+      const isFile = existsSync4(target);
       if (isPR) {
         spinner.stop();
         if (!requireGhCli()) {
@@ -1349,7 +1472,12 @@ var explainCommand = new Command8("explain").description("Get an AI-powered expl
         context = await getPRContext(target, spinner);
       } else if (isFile) {
         if (options.history) {
-          context = await getFileHistoryContext(target, git, spinner, parseInt(options.commits, 10));
+          context = await getFileHistoryContext(
+            target,
+            git,
+            spinner,
+            parseInt(options.commits, 10)
+          );
         } else {
           context = await getFileContentContext(target, spinner);
         }
@@ -1385,7 +1513,8 @@ 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();
+  const diff = `${stagedDiff}
+${unstagedDiff}`.trim();
   if (!diff) {
     throw new Error("No uncommitted changes to analyze");
   }
@@ -1430,7 +1559,7 @@ async function getCommitContext(hash, git, spinner) {
 }
 async function getFileContentContext(filePath, spinner) {
   spinner.text = `Reading ${filePath}...`;
-  const content = readFileSync4(filePath, "utf-8");
+  const content = readFileSync3(filePath, "utf-8");
   return {
     type: "file-content",
     title: filePath,
@@ -1481,18 +1610,20 @@ async function getPRContext(target, spinner) {
   spinner.text = `Fetching PR #${prNumber}...`;
   let prInfo;
   try {
-    const prJson = execSync4(
+    const prJson = execSync5(
       `gh pr view ${prNumber} --json title,url,baseRefName,headRefName,commits`,
       { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }
     );
     prInfo = JSON.parse(prJson);
   } catch {
-    throw new Error(`Failed to fetch PR #${prNumber}. Make sure gh CLI is installed and authenticated.`);
+    throw new Error(
+      `Failed to fetch PR #${prNumber}. Make sure gh CLI is installed and authenticated.`
+    );
   }
   spinner.text = `Getting diff for PR #${prNumber}...`;
   let diff;
   try {
-    diff = execSync4(`gh pr diff ${prNumber}`, {
+    diff = execSync5(`gh pr diff ${prNumber}`, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"],
       maxBuffer: 10 * 1024 * 1024
@@ -1555,20 +1686,23 @@ ${icon} Explanation
 }
 
 // src/commands/find.ts
-import { Command as Command9 } from "commander";
 import chalk10 from "chalk";
-import ora8 from "ora";
+import { Command as Command9 } from "commander";
+import ora7 from "ora";
 import { simpleGit as simpleGit8 } from "simple-git";
-var findCommand = new Command9("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) => {
+var findCommand = new Command9("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, ollama)").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"));
     process.exit(1);
   }
-  const provider = options.provider.toLowerCase();
+  const provider = await resolveProvider(options.provider);
   const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
-  const spinner = ora8("Searching commits...").start();
+  const spinner = ora7("Searching commits...").start();
   try {
     const logOptions = [`-n`, options.num];
     if (options.path) {
@@ -1649,417 +1783,932 @@ function printResults(results, query) {
   }
 }
 
-// src/commands/branch.ts
-import { Command as Command10 } from "commander";
+// src/commands/gitignore.ts
+import { existsSync as existsSync5, readdirSync, readFileSync as readFileSync4, writeFileSync as writeFileSync2 } from "fs";
+import { join as join4 } from "path";
 import chalk11 from "chalk";
-import ora9 from "ora";
+import { Command as Command10 } from "commander";
+import ora8 from "ora";
 import { simpleGit as simpleGit9 } from "simple-git";
-import { execSync as execSync5 } from "child_process";
-function getIssueInfo(issueNumber) {
+var CONFIG_FILES = [
+  // JavaScript/TypeScript
+  "package.json",
+  "tsconfig.json",
+  "vite.config.ts",
+  "vite.config.js",
+  "next.config.js",
+  "next.config.mjs",
+  "nuxt.config.ts",
+  "astro.config.mjs",
+  // Python
+  "pyproject.toml",
+  "setup.py",
+  "requirements.txt",
+  "Pipfile",
+  "poetry.lock",
+  // Go
+  "go.mod",
+  "go.sum",
+  // Rust
+  "Cargo.toml",
+  "Cargo.lock",
+  // Java/Kotlin
+  "pom.xml",
+  "build.gradle",
+  "build.gradle.kts",
+  // Ruby
+  "Gemfile",
+  "Gemfile.lock",
+  // PHP
+  "composer.json",
+  "composer.lock",
+  // .NET
+  "*.csproj",
+  "*.fsproj",
+  "*.sln",
+  // Elixir
+  "mix.exs",
+  // Dart/Flutter
+  "pubspec.yaml",
+  // Swift
+  "Package.swift"
+];
+function getFiles(dir, maxDepth = 3, currentDepth = 0) {
+  if (currentDepth >= maxDepth) return [];
+  const files = [];
   try {
-    const result = execSync5(`gh issue view ${issueNumber} --json title,body`, {
-      encoding: "utf-8",
-      stdio: ["pipe", "pipe", "pipe"]
-    });
-    return JSON.parse(result);
+    const entries = readdirSync(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.name.startsWith(".") || entry.name === "node_modules" || entry.name === "vendor" || entry.name === "target" || entry.name === "__pycache__" || entry.name === "venv" || entry.name === ".venv") {
+        continue;
+      }
+      const fullPath = join4(dir, entry.name);
+      if (entry.isDirectory()) {
+        files.push(`${entry.name}/`);
+        const subFiles = getFiles(fullPath, maxDepth, currentDepth + 1);
+        files.push(...subFiles.map((f) => `${entry.name}/${f}`));
+      } else {
+        files.push(entry.name);
+      }
+    }
   } catch {
-    return null;
   }
+  return files;
 }
-var branchCommand = new Command10("branch").description("Generate a branch name from issue number or description").argument("[issue]", "Issue number (e.g., 123 or #123)").option("-d, --description <description>", "Use description instead of issue").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic)", "gemini").option("-m, --model <model>", "Model to use (provider-specific)").option("-t, --type <type>", "Branch type (feature, fix, hotfix, chore, refactor)").option("-c, --checkout", "Create and checkout the branch").action(async (issue, options) => {
-  const git = simpleGit9();
-  const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
-  const isRepo = await git.checkIsRepo();
-  if (!isRepo) {
-    console.error(chalk11.red("Error: Not a git repository"));
-    process.exit(1);
-  }
-  let description;
-  let issueNumber;
-  if (options.description) {
-    description = options.description;
-  } else if (issue) {
-    if (!requireGhCli()) {
-      process.exit(1);
-    }
-    const cleanedIssue = issue.replace(/^#/, "");
-    issueNumber = cleanedIssue;
-    const spinner2 = ora9(`Fetching issue #${cleanedIssue}...`).start();
-    const issueInfo = getIssueInfo(cleanedIssue);
-    if (!issueInfo) {
-      spinner2.fail(`Could not fetch issue #${issueNumber}`);
-      console.log(chalk11.gray("Make sure you are authenticated: gh auth login"));
-      process.exit(1);
+function findConfigFiles(repoRoot) {
+  const found = /* @__PURE__ */ new Map();
+  for (const configFile of CONFIG_FILES) {
+    if (configFile.includes("*")) {
+      const ext = configFile.replace("*", "");
+      try {
+        const entries = readdirSync(repoRoot);
+        for (const entry of entries) {
+          if (entry.endsWith(ext)) {
+            const content = readFileSync4(join4(repoRoot, entry), "utf-8");
+            found.set(entry, content.slice(0, 2e3));
+          }
+        }
+      } catch {
+      }
+    } else {
+      const filePath = join4(repoRoot, configFile);
+      if (existsSync5(filePath)) {
+        try {
+          const content = readFileSync4(filePath, "utf-8");
+          found.set(configFile, content.slice(0, 2e3));
+        } catch {
+        }
+      }
     }
-    spinner2.stop();
-    console.log(chalk11.gray(`Issue: ${issueInfo.title}`));
-    description = `${issueInfo.title}
-
-${issueInfo.body || ""}`;
-  } else {
-    console.error(chalk11.red("Error: Please provide an issue number or use -d for description"));
-    console.log(chalk11.gray("Usage:"));
-    console.log(chalk11.gray("  gut branch 123"));
-    console.log(chalk11.gray('  gut branch -d "add user authentication"'));
-    process.exit(1);
   }
-  const provider = options.provider.toLowerCase();
-  const template = findTemplate(repoRoot.trim(), "branch");
+  return found;
+}
+var gitignoreCommand = new Command10("gitignore").description("Generate .gitignore from current codebase").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic, ollama)").option("-m, --model <model>", "Model to use (provider-specific)").option("-o, --output <file>", "Output file (default: .gitignore)", ".gitignore").option("--stdout", "Print to stdout instead of file").option("-y, --yes", "Overwrite existing .gitignore without confirmation").action(async (options) => {
+  const git = simpleGit9();
+  const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
+  const root = repoRoot.trim();
+  const provider = await resolveProvider(options.provider);
+  const template = findTemplate(root, "gitignore");
   if (template) {
     console.log(chalk11.gray("Using template from project..."));
   }
-  const spinner = ora9("Generating branch name...").start();
+  const spinner = ora8("Analyzing project structure...").start();
+  const files = getFiles(root);
+  const configFiles = findConfigFiles(root);
+  const gitignorePath = join4(root, options.output);
+  let existingGitignore;
+  if (existsSync5(gitignorePath)) {
+    existingGitignore = readFileSync4(gitignorePath, "utf-8");
+  }
+  let configFilesStr = "";
+  if (configFiles.size > 0) {
+    const entries = [];
+    for (const [name, content] of configFiles) {
+      entries.push(`### ${name}
+\`\`\`
+${content}
+\`\`\``);
+    }
+    configFilesStr = entries.join("\n\n");
+  }
+  spinner.text = "Generating .gitignore...";
   try {
-    const branchName = await generateBranchName(
-      description,
+    const gitignoreContent = await generateGitignore(
+      {
+        files: files.slice(0, 200).join("\n"),
+        configFiles: configFilesStr,
+        existingGitignore
+      },
       { provider, model: options.model },
-      { type: options.type, issue: issueNumber },
       template || void 0
     );
     spinner.stop();
-    console.log(chalk11.bold("\nGenerated branch name:\n"));
-    console.log(chalk11.green(`  ${branchName}`));
+    if (options.stdout) {
+      console.log(gitignoreContent);
+      return;
+    }
+    console.log(chalk11.bold("\nGenerated .gitignore:\n"));
+    console.log(chalk11.gray("\u2500".repeat(50)));
+    console.log(gitignoreContent);
+    console.log(chalk11.gray("\u2500".repeat(50)));
     console.log();
-    if (options.checkout) {
-      await git.checkoutLocalBranch(branchName);
-      console.log(chalk11.green(`\u2713 Created and checked out branch: ${branchName}`));
-    } else {
+    if (existsSync5(gitignorePath) && !options.yes) {
       const readline = await import("readline");
       const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout
       });
       const answer = await new Promise((resolve) => {
-        rl.question(chalk11.cyan("Create and checkout this branch? (y/N) "), resolve);
+        rl.question(chalk11.cyan(`${options.output} already exists. Overwrite? (y/N) `), resolve);
       });
       rl.close();
-      if (answer.toLowerCase() === "y") {
-        await git.checkoutLocalBranch(branchName);
-        console.log(chalk11.green(`\u2713 Created and checked out branch: ${branchName}`));
-      } else {
-        console.log(chalk11.gray("\nTo create manually:"));
-        console.log(chalk11.gray(`  git checkout -b ${branchName}`));
+      if (answer.toLowerCase() !== "y") {
+        console.log(chalk11.gray("Aborted."));
+        return;
       }
     }
+    writeFileSync2(gitignorePath, gitignoreContent);
+    console.log(chalk11.green(`\u2713 Wrote ${options.output}`));
   } catch (error) {
-    spinner.fail("Failed to generate branch name");
+    spinner.fail("Failed to generate .gitignore");
     console.error(chalk11.red(error instanceof Error ? error.message : "Unknown error"));
     process.exit(1);
   }
 });
 
-// src/commands/checkout.ts
-import { Command as Command11 } from "commander";
+// src/commands/init.ts
+import { execSync as execSync6 } from "child_process";
+import { existsSync as existsSync6, mkdirSync as mkdirSync3, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "fs";
+import { homedir as homedir4 } from "os";
+import { dirname as dirname2, join as join5 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+import { createAnthropic as createAnthropic2 } from "@ai-sdk/anthropic";
+import { createGoogleGenerativeAI as createGoogleGenerativeAI2 } from "@ai-sdk/google";
+import { createOpenAI as createOpenAI2 } from "@ai-sdk/openai";
+import { generateText as generateText2 } from "ai";
 import chalk12 from "chalk";
-import ora10 from "ora";
+import { Command as Command11 } from "commander";
+import ora9 from "ora";
 import { simpleGit as simpleGit10 } from "simple-git";
-var checkoutCommand = new Command11("checkout").description("Generate a branch name from current diff and checkout").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic)", "gemini").option("-m, --model <model>", "Model to use (provider-specific)").option("-y, --yes", "Skip confirmation and checkout directly").option("-s, --staged", "Use staged changes only instead of all changes").action(async (options) => {
-  const git = simpleGit10();
-  const isRepo = await git.checkIsRepo();
-  if (!isRepo) {
-    console.error(chalk12.red("Error: Not a git repository"));
-    process.exit(1);
+function openFolder2(path2) {
+  const platform = process.platform;
+  const cmd = platform === "darwin" ? "open" : platform === "win32" ? 'start ""' : "xdg-open";
+  execSync6(`${cmd} "${path2}"`);
+}
+var __filename2 = fileURLToPath2(import.meta.url);
+var __dirname2 = dirname2(__filename2);
+var GUT_ROOT2 = join5(__dirname2, "..");
+var TEMPLATE_FILES = [
+  "branch.md",
+  "changelog.md",
+  "checkout.md",
+  "commit.md",
+  "explain.md",
+  "explain-file.md",
+  "find.md",
+  "merge.md",
+  "pr.md",
+  "review.md",
+  "stash.md",
+  "summary.md"
+];
+async function translateTemplate(content, targetLang, provider) {
+  const apiKey = await getApiKey(provider);
+  if (!apiKey) {
+    throw new Error(`No API key found for ${provider}`);
   }
-  const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
-  const spinner = ora10("Analyzing changes...").start();
-  const status = await git.status();
-  let diff;
-  if (options.staged) {
-    diff = await git.diff(["--cached"]);
-  } else {
-    const stagedDiff = await git.diff(["--cached"]);
-    const unstagedDiff = await git.diff();
-    diff = stagedDiff + "\n" + unstagedDiff;
+  const modelName = getDefaultModel(provider);
+  let model;
+  switch (provider) {
+    case "gemini": {
+      const google = createGoogleGenerativeAI2({ apiKey });
+      model = google(modelName);
+      break;
+    }
+    case "openai": {
+      const openai = createOpenAI2({ apiKey });
+      model = openai(modelName);
+      break;
+    }
+    case "anthropic": {
+      const anthropic = createAnthropic2({ apiKey });
+      model = anthropic(modelName);
+      break;
+    }
+    default:
+      throw new Error(`Unsupported provider for translation: ${provider}`);
   }
-  const hasChanges = diff.trim() || status.not_added.length > 0 || status.created.length > 0;
-  if (!hasChanges) {
-    spinner.fail("No changes found");
-    console.log(chalk12.gray("Make some changes first, then run gut checkout"));
-    process.exit(1);
+  const langNames = {
+    ja: "Japanese",
+    en: "English",
+    zh: "Chinese",
+    ko: "Korean",
+    es: "Spanish",
+    fr: "French",
+    de: "German"
+  };
+  const targetLangName = langNames[targetLang] || targetLang;
+  const { text } = await generateText2({
+    model,
+    prompt: `Translate the following prompt template to ${targetLangName}.
+Keep all {{variable}} placeholders exactly as they are - do not translate them.
+Keep the markdown formatting intact.
+Only translate the instructional text.
+
+Template to translate:
+${content}
+
+Translated template:`
+  });
+  return text.trim();
+}
+var initCommand = new Command11("init").description("Initialize .gut/ templates in your project or globally").option(
+  "-p, --provider <provider>",
+  "AI provider for translation (gemini, openai, anthropic, ollama)"
+).option("-f, --force", "Overwrite existing templates").option("-g, --global", "Initialize templates globally (~/.config/gut/templates/)").option("-o, --open", "Open the templates folder (can be used alone)").option("--no-translate", "Skip translation even if language is not English").action(async (options) => {
+  const isGlobal = options.global === true;
+  const git = simpleGit10();
+  let targetDir;
+  if (isGlobal) {
+    targetDir = join5(homedir4(), ".config", "gut", "templates");
+  } else {
+    const isRepo = await git.checkIsRepo();
+    if (!isRepo) {
+      console.error(chalk12.red("Error: Not a git repository"));
+      console.error(chalk12.gray("Use --global to initialize templates globally"));
+      process.exit(1);
+    }
+    const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
+    targetDir = join5(repoRoot.trim(), ".gut");
   }
-  if (!diff.trim() && (status.not_added.length > 0 || status.created.length > 0)) {
-    const untrackedFiles = [...status.not_added, ...status.created];
-    diff = `New files:
-${untrackedFiles.map((f) => `+ ${f}`).join("\n")}`;
+  if (!existsSync6(targetDir)) {
+    mkdirSync3(targetDir, { recursive: true });
+    console.log(chalk12.green(`Created ${targetDir}`));
   }
-  spinner.text = "Generating branch name...";
-  const provider = options.provider.toLowerCase();
-  const template = findTemplate(repoRoot.trim(), "checkout");
-  if (template) {
-    console.log(chalk12.gray("\nUsing template from project..."));
+  console.log(
+    chalk12.blue(
+      isGlobal ? "Initializing global templates...\n" : "Initializing project templates...\n"
+    )
+  );
+  const sourceDir = join5(GUT_ROOT2, ".gut");
+  const lang = getLanguage();
+  const langSourceDir = join5(GUT_ROOT2, ".gut", lang);
+  const hasPreTranslated = lang !== "en" && existsSync6(langSourceDir);
+  const needsTranslation = options.translate !== false && lang !== "en" && !hasPreTranslated;
+  const provider = needsTranslation ? await resolveProvider(options.provider) : null;
+  if (hasPreTranslated) {
+    console.log(chalk12.gray(`Language: ${lang} - using pre-translated templates
+`));
+  } else if (needsTranslation) {
+    console.log(chalk12.gray(`Language: ${lang} - templates will be translated
+`));
   }
-  try {
-    const branchName = await generateBranchNameFromDiff(
-      diff,
-      { provider, model: options.model },
-      template
-    );
-    spinner.stop();
-    console.log(chalk12.bold("\nGenerated branch name:\n"));
-    console.log(chalk12.green(`  ${branchName}`));
-    console.log();
-    if (options.yes) {
-      await git.checkoutLocalBranch(branchName);
-      console.log(chalk12.green(`\u2713 Created and checked out branch: ${branchName}`));
-    } else {
-      const readline = await import("readline");
-      const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout
-      });
-      const answer = await new Promise((resolve) => {
-        rl.question(chalk12.cyan("Create and checkout this branch? (y/N) "), resolve);
-      });
-      rl.close();
-      if (answer.toLowerCase() === "y") {
-        await git.checkoutLocalBranch(branchName);
-        console.log(chalk12.green(`\u2713 Created and checked out branch: ${branchName}`));
-      } else {
-        console.log(chalk12.gray("\nTo create manually:"));
-        console.log(chalk12.gray(`  git checkout -b ${branchName}`));
+  const spinner = ora9();
+  let copied = 0;
+  let skipped = 0;
+  for (const filename of TEMPLATE_FILES) {
+    const langSourcePath = join5(langSourceDir, filename);
+    const defaultSourcePath = join5(sourceDir, filename);
+    const sourcePath = hasPreTranslated && existsSync6(langSourcePath) ? langSourcePath : defaultSourcePath;
+    const targetPath = join5(targetDir, filename);
+    if (!existsSync6(sourcePath)) {
+      continue;
+    }
+    if (existsSync6(targetPath) && !options.force) {
+      console.log(chalk12.gray(`  Skipped: ${filename} (already exists)`));
+      skipped++;
+      continue;
+    }
+    let content = readFileSync5(sourcePath, "utf-8");
+    if (needsTranslation && sourcePath === defaultSourcePath && provider) {
+      spinner.start(`Translating ${filename}...`);
+      try {
+        content = await translateTemplate(content, lang, provider);
+        spinner.succeed(`Translated: ${filename}`);
+      } catch (err) {
+        spinner.fail(`Failed to translate ${filename}`);
+        console.error(chalk12.red(`  ${err instanceof Error ? err.message : "Unknown error"}`));
+        console.log(chalk12.gray(`  Using original English template`));
       }
+    } else {
+      console.log(chalk12.green(`  Copied: ${filename}`));
+    }
+    writeFileSync3(targetPath, content);
+    copied++;
+  }
+  console.log();
+  if (copied > 0) {
+    const location = isGlobal ? "~/.config/gut/templates/" : ".gut/";
+    console.log(chalk12.green(`\u2713 ${copied} template(s) initialized in ${location}`));
+  }
+  if (skipped > 0) {
+    console.log(chalk12.gray(`  ${skipped} template(s) skipped (use --force to overwrite)`));
+  }
+  if (isGlobal) {
+    console.log(chalk12.gray("\nGlobal templates will be used as fallback for all projects."));
+    console.log(
+      chalk12.gray("Project-level templates (.gut/) take priority over global templates.")
+    );
+  } else {
+    console.log(chalk12.gray("\nYou can now customize these templates for your project."));
+  }
+  if (options.open) {
+    try {
+      openFolder2(targetDir);
+      console.log(chalk12.green(`
+Opened: ${targetDir}`));
+    } catch {
+      console.error(chalk12.red(`
+Failed to open folder: ${targetDir}`));
     }
-  } catch (error) {
-    spinner.fail("Failed to generate branch name");
-    console.error(chalk12.red(error instanceof Error ? error.message : "Unknown error"));
-    process.exit(1);
   }
 });
 
-// src/commands/sync.ts
-import { Command as Command12 } from "commander";
+// src/commands/lang.ts
 import chalk13 from "chalk";
-import ora11 from "ora";
+import { Command as Command12 } from "commander";
+var langCommand = new Command12("lang").description("Set or show output language").argument("[language]", `Language to set (${VALID_LANGUAGES.join(", ")})`).option("--local", "Set for current repository only").action((language, options) => {
+  if (!language) {
+    const lang = getLanguage();
+    const localConfig = getLocalConfig();
+    const isLocal = "lang" in localConfig;
+    const scope = isLocal ? chalk13.cyan("(local)") : chalk13.gray("(global)");
+    console.log(`${lang} ${scope}`);
+    return;
+  }
+  if (!isValidLanguage(language)) {
+    console.error(chalk13.red(`Invalid language: ${language}`));
+    console.error(chalk13.gray(`Valid languages: ${VALID_LANGUAGES.join(", ")}`));
+    process.exit(1);
+  }
+  try {
+    setLanguage(language, options.local ?? false);
+    const scope = options.local ? "(local)" : "(global)";
+    console.log(chalk13.green(`\u2713 Language set to: ${language} ${scope}`));
+  } catch (err) {
+    console.error(chalk13.red(err.message));
+    process.exit(1);
+  }
+});
+
+// src/commands/merge.ts
+import * as fs from "fs";
+import * as path from "path";
+import chalk14 from "chalk";
+import { Command as Command13 } from "commander";
+import ora10 from "ora";
 import { simpleGit as simpleGit11 } from "simple-git";
-var syncCommand = new Command12("sync").description("Sync current branch with remote (fetch + rebase/merge)").option("-m, --merge", "Use merge instead of rebase").option("--no-push", "Skip push after syncing").option("--stash", "Auto-stash changes before sync").option("-f, --force", "Force sync even with uncommitted changes").action(async (options) => {
+var mergeCommand = new Command13("merge").description("Merge a branch with AI-powered conflict resolution").argument("<branch>", "Branch to merge").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic, ollama)").option("-m, --model <model>", "Model to use (provider-specific)").option("--no-commit", "Do not auto-commit after resolving").action(async (branch, options) => {
   const git = simpleGit11();
   const isRepo = await git.checkIsRepo();
   if (!isRepo) {
-    console.error(chalk13.red("Error: Not a git repository"));
+    console.error(chalk14.red("Error: Not a git repository"));
     process.exit(1);
   }
-  const spinner = ora11("Checking repository status...").start();
+  const provider = await resolveProvider(options.provider);
+  const status = await git.status();
+  if (status.modified.length > 0 || status.staged.length > 0) {
+    console.error(chalk14.red("Error: Working directory has uncommitted changes"));
+    console.log(chalk14.gray("Please commit or stash your changes first"));
+    process.exit(1);
+  }
+  const branchInfo = await git.branch();
+  const currentBranch = branchInfo.current;
+  console.log(
+    chalk14.bold(`
+Merging ${chalk14.cyan(branch)} into ${chalk14.cyan(currentBranch)}...
+`)
+  );
   try {
-    const status = await git.status();
-    const hasChanges = !status.isClean();
-    if (hasChanges && !options.stash && !options.force) {
-      spinner.stop();
-      console.log(chalk13.yellow("You have uncommitted changes:"));
-      if (status.modified.length > 0) {
-        console.log(chalk13.gray(`  Modified: ${status.modified.length} file(s)`));
-      }
-      if (status.not_added.length > 0) {
-        console.log(chalk13.gray(`  Untracked: ${status.not_added.length} file(s)`));
-      }
-      console.log();
-      console.log(chalk13.gray("Use --stash to auto-stash, or --force to sync anyway"));
-      process.exit(1);
-    }
-    let stashed = false;
-    if (hasChanges && options.stash) {
-      spinner.text = "Stashing changes...";
-      await git.stash(["push", "-m", `gut-sync: auto-stash before sync`]);
-      stashed = true;
-    }
-    spinner.text = "Fetching from remote...";
-    await git.fetch(["--all", "--prune"]);
-    const currentBranch = status.current;
-    if (!currentBranch) {
-      spinner.fail("Could not determine current branch");
-      process.exit(1);
-    }
-    const trackingBranch = status.tracking;
-    if (!trackingBranch) {
-      spinner.warn(`Branch ${currentBranch} has no upstream tracking branch`);
-      console.log(chalk13.gray(`
-To set upstream: git push -u origin ${currentBranch}`));
-      if (stashed) {
-        await git.stash(["pop"]);
-        console.log(chalk13.gray("Restored stashed changes"));
-      }
-      return;
+    await git.merge([branch]);
+    console.log(chalk14.green("\u2713 Merged successfully (no conflicts)"));
+    return;
+  } catch {
+  }
+  const conflictStatus = await git.status();
+  const conflictedFiles = conflictStatus.conflicted;
+  if (conflictedFiles.length === 0) {
+    console.error(chalk14.red("Merge failed for unknown reason"));
+    await git.merge(["--abort"]);
+    process.exit(1);
+  }
+  console.log(chalk14.yellow(`\u26A0 ${conflictedFiles.length} conflict(s) detected
+`));
+  const spinner = ora10();
+  const rootDir = await git.revparse(["--show-toplevel"]);
+  const template = findTemplate(rootDir.trim(), "merge");
+  if (template) {
+    console.log(chalk14.gray("Using merge template from project...\n"));
+  }
+  for (const file of conflictedFiles) {
+    const filePath = path.join(rootDir.trim(), file);
+    const content = fs.readFileSync(filePath, "utf-8");
+    console.log(chalk14.bold(`
+\u{1F4C4} ${file}`));
+    const conflictMatch = content.match(/<<<<<<< HEAD[\s\S]*?>>>>>>>.+/g);
+    if (conflictMatch) {
+      console.log(chalk14.gray("\u2500".repeat(50)));
+      console.log(chalk14.gray(conflictMatch[0].slice(0, 500)));
+      if (conflictMatch[0].length > 500) console.log(chalk14.gray("..."));
+      console.log(chalk14.gray("\u2500".repeat(50)));
     }
-    const strategy = options.merge ? "merge" : "rebase";
-    spinner.text = `Syncing with ${trackingBranch} (${strategy})...`;
+    spinner.start("AI is analyzing conflict...");
     try {
-      if (options.merge) {
-        await git.merge([trackingBranch]);
-      } else {
-        await git.rebase([trackingBranch]);
-      }
-    } catch (error) {
-      spinner.fail(`${strategy} failed - you may have conflicts`);
-      console.log(chalk13.yellow("\nResolve conflicts and then:"));
-      if (options.merge) {
-        console.log(chalk13.gray("  git add . && git commit"));
-      } else {
-        console.log(chalk13.gray("  git add . && git rebase --continue"));
-      }
-      if (stashed) {
-        console.log(chalk13.yellow("\nNote: You have stashed changes. Run `git stash pop` after resolving."));
-      }
-      process.exit(1);
-    }
-    const newStatus = await git.status();
-    const ahead = newStatus.ahead || 0;
-    const behind = newStatus.behind || 0;
-    spinner.succeed(chalk13.green("Synced successfully"));
-    if (behind > 0) {
-      console.log(chalk13.yellow(`  \u2193 ${behind} commit(s) behind`));
-    }
-    if (ahead > 0) {
-      if (options.push !== false) {
-        const pushSpinner = ora11("Pushing to remote...").start();
-        try {
-          await git.push();
-          pushSpinner.succeed(chalk13.green(`Pushed ${ahead} commit(s)`));
-        } catch (error) {
-          pushSpinner.fail("Push failed");
-          console.error(chalk13.red(error instanceof Error ? error.message : "Unknown error"));
-        }
+      const resolution = await resolveConflict(
+        content,
+        {
+          filename: file,
+          oursRef: currentBranch,
+          theirsRef: branch
+        },
+        { provider, model: options.model },
+        template || void 0
+      );
+      spinner.stop();
+      console.log(chalk14.cyan("\n\u{1F916} AI suggests:"));
+      console.log(chalk14.gray("\u2500".repeat(50)));
+      const preview = resolution.resolvedContent.slice(0, 800);
+      console.log(preview);
+      if (resolution.resolvedContent.length > 800) console.log(chalk14.gray("..."));
+      console.log(chalk14.gray("\u2500".repeat(50)));
+      console.log(chalk14.gray(`Strategy: ${resolution.strategy}`));
+      console.log(chalk14.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(chalk14.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(chalk14.green(`\u2713 Resolved ${file}`));
+      } else if (answer.toLowerCase() === "s") {
+        console.log(chalk14.yellow(`\u23ED Skipped ${file}`));
       } else {
-        console.log(chalk13.cyan(`  \u2191 ${ahead} commit(s) ahead`));
-      }
-    }
-    if (stashed) {
-      spinner.start("Restoring stashed changes...");
-      try {
-        await git.stash(["pop"]);
-        spinner.succeed("Restored stashed changes");
-      } catch {
-        spinner.warn("Could not auto-restore stash (may have conflicts)");
-        console.log(chalk13.gray("  Run `git stash pop` manually"));
+        console.log(chalk14.yellow(`\u2717 Rejected - resolve manually: ${file}`));
       }
+    } catch (err) {
+      spinner.fail("AI resolution failed");
+      console.error(chalk14.red(err instanceof Error ? err.message : "Unknown error"));
+      console.log(chalk14.yellow(`Please resolve manually: ${file}`));
     }
-  } catch (error) {
-    spinner.fail("Sync failed");
-    console.error(chalk13.red(error instanceof Error ? error.message : "Unknown error"));
-    process.exit(1);
+  }
+  const finalStatus = await git.status();
+  if (finalStatus.conflicted.length > 0) {
+    console.log(chalk14.yellow(`
+\u26A0 ${finalStatus.conflicted.length} conflict(s) remaining`));
+    console.log(chalk14.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(chalk14.green("\n\u2713 All conflicts resolved and committed"));
+  } else {
+    console.log(chalk14.green("\n\u2713 All conflicts resolved"));
+    console.log(chalk14.gray("Run: git commit"));
   }
 });
 
-// src/commands/stash.ts
-import { Command as Command13 } from "commander";
-import chalk14 from "chalk";
-import ora12 from "ora";
+// src/commands/pr.ts
+import { execSync as execSync7 } from "child_process";
+import { existsSync as existsSync7, readFileSync as readFileSync7 } from "fs";
+import { join as join7 } from "path";
+import chalk15 from "chalk";
+import { Command as Command14 } from "commander";
+import ora11 from "ora";
 import { simpleGit as simpleGit12 } from "simple-git";
-var stashCommand = new Command13("stash").description("Stash changes with AI-generated name").argument("[name]", "Custom stash name (skips AI generation)").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic)", "gemini").option("-m, --model <model>", "Model to use (provider-specific)").option("-l, --list", "List all stashes").option("-a, --apply [index]", "Apply stash (default: latest)").option("--pop [index]", "Pop stash (default: latest)").option("-d, --drop [index]", "Drop stash").option("--clear", "Clear all stashes").action(async (name, options) => {
+var GITHUB_PR_TEMPLATE_PATHS = [
+  ".github/pull_request_template.md",
+  ".github/PULL_REQUEST_TEMPLATE.md",
+  "pull_request_template.md",
+  "PULL_REQUEST_TEMPLATE.md",
+  "docs/pull_request_template.md"
+];
+function findPRTemplate(repoRoot) {
+  for (const templatePath of GITHUB_PR_TEMPLATE_PATHS) {
+    const fullPath = join7(repoRoot, templatePath);
+    if (existsSync7(fullPath)) {
+      return readFileSync7(fullPath, "utf-8");
+    }
+  }
+  return findTemplate(repoRoot, "pr");
+}
+var prCommand = new Command14("pr").description("Generate a pull request title and description using AI").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic, ollama)").option("-m, --model <model>", "Model to use (provider-specific)").option("-b, --base <branch>", "Base branch to compare against (default: main or master)").option("--create", "Create the PR using gh CLI").option("--copy", "Copy the description to clipboard").action(async (options) => {
   const git = simpleGit12();
   const isRepo = await git.checkIsRepo();
   if (!isRepo) {
-    console.error(chalk14.red("Error: Not a git repository"));
+    console.error(chalk15.red("Error: Not a git repository"));
     process.exit(1);
   }
-  if (options.list) {
-    const stashList = await git.stashList();
-    if (stashList.all.length === 0) {
-      console.log(chalk14.gray("No stashes found"));
-      return;
+  const provider = await resolveProvider(options.provider);
+  const spinner = ora11("Analyzing branch...").start();
+  try {
+    const branchInfo = await git.branch();
+    const currentBranch = branchInfo.current;
+    let baseBranch = options.base;
+    if (!baseBranch) {
+      if (branchInfo.all.includes("main")) {
+        baseBranch = "main";
+      } else if (branchInfo.all.includes("master")) {
+        baseBranch = "master";
+      } else {
+        baseBranch = "main";
+      }
     }
-    console.log(chalk14.bold("\nStashes:\n"));
-    stashList.all.forEach((stash, index) => {
-      console.log(`  ${chalk14.cyan(index.toString())} ${stash.message}`);
-    });
-    console.log();
-    return;
-  }
-  if (options.apply !== void 0) {
-    const index = typeof options.apply === "string" ? options.apply : "0";
-    try {
-      await git.stash(["apply", `stash@{${index}}`]);
-      console.log(chalk14.green(`\u2713 Applied stash@{${index}}`));
-    } catch (error) {
-      console.error(chalk14.red(`Failed to apply stash: ${error instanceof Error ? error.message : "Unknown error"}`));
+    if (currentBranch === baseBranch) {
+      spinner.fail(`Already on ${baseBranch} branch`);
       process.exit(1);
     }
-    return;
-  }
-  if (options.pop !== void 0) {
-    const index = typeof options.pop === "string" ? options.pop : "0";
-    try {
-      await git.stash(["pop", `stash@{${index}}`]);
-      console.log(chalk14.green(`\u2713 Popped stash@{${index}}`));
-    } catch (error) {
-      console.error(chalk14.red(`Failed to pop stash: ${error instanceof Error ? error.message : "Unknown error"}`));
+    spinner.text = `Comparing ${currentBranch} to ${baseBranch}...`;
+    const log = await git.log({ from: baseBranch, to: currentBranch });
+    const commits = log.all.map((c) => c.message.split("\n")[0]);
+    if (commits.length === 0) {
+      spinner.fail("No commits found between branches");
       process.exit(1);
     }
-    return;
-  }
-  if (options.drop !== void 0) {
-    const index = typeof options.drop === "string" ? options.drop : "0";
-    try {
-      await git.stash(["drop", `stash@{${index}}`]);
-      console.log(chalk14.green(`\u2713 Dropped stash@{${index}}`));
-    } catch (error) {
-      console.error(chalk14.red(`Failed to drop stash: ${error instanceof Error ? error.message : "Unknown error"}`));
-      process.exit(1);
+    const diff = await git.diff([`${baseBranch}...${currentBranch}`]);
+    const repoRoot = await git.revparse(["--show-toplevel"]);
+    const template = findPRTemplate(repoRoot.trim());
+    if (template) {
+      spinner.text = "Found PR template, generating description...";
+    } else {
+      spinner.text = "Generating PR description...";
     }
-    return;
-  }
-  if (options.clear) {
-    const readline = await import("readline");
-    const rl = readline.createInterface({
-      input: process.stdin,
+    const { title, body } = await generatePRDescription(
+      {
+        baseBranch,
+        currentBranch,
+        commits,
+        diff
+      },
+      { provider, model: options.model },
+      template || void 0
+    );
+    spinner.stop();
+    console.log(chalk15.bold("\n\u{1F4DD} Generated PR:\n"));
+    console.log(chalk15.cyan("Title:"), chalk15.white(title));
+    console.log(chalk15.cyan("\nDescription:"));
+    console.log(chalk15.gray("\u2500".repeat(50)));
+    console.log(body);
+    console.log(chalk15.gray("\u2500".repeat(50)));
+    if (options.copy) {
+      try {
+        const fullText = `${title}
+
+${body}`;
+        execSync7("pbcopy", { input: fullText });
+        console.log(chalk15.green("\n\u2713 Copied to clipboard"));
+      } catch {
+        console.log(chalk15.yellow("\n\u26A0 Could not copy to clipboard"));
+      }
+    }
+    const ghInstalled = isGhCliInstalled();
+    if (!ghInstalled) {
+      console.log(chalk15.yellow("\n\u26A0 GitHub CLI (gh) is not installed"));
+      console.log(chalk15.gray("  To create PRs directly from gut, install gh CLI:"));
+      console.log(chalk15.gray("    brew install gh  (macOS)"));
+      console.log(chalk15.gray("    https://cli.github.com/"));
+      if (!options.copy) {
+        console.log(chalk15.gray("\nTip: Use --copy to copy to clipboard"));
+      }
+    } else {
+      const readline = await import("readline");
+      const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+      });
+      const promptMessage = options.create ? chalk15.cyan("\nCreate PR with this description? (y/N) ") : chalk15.cyan("\nCreate PR with gh CLI? (y/N) ");
+      const answer = await new Promise((resolve) => {
+        rl.question(promptMessage, resolve);
+      });
+      rl.close();
+      if (answer.toLowerCase() === "y") {
+        const createSpinner = ora11("Creating PR...").start();
+        try {
+          const escapedTitle = title.replace(/"/g, '\\"');
+          const escapedBody = body.replace(/"/g, '\\"');
+          execSync7(
+            `gh pr create --title "${escapedTitle}" --body "${escapedBody}" --base ${baseBranch}`,
+            { stdio: "pipe" }
+          );
+          createSpinner.succeed("PR created successfully!");
+        } catch {
+          createSpinner.fail("Failed to create PR");
+          console.error(chalk15.gray("Make sure gh CLI is authenticated: gh auth login"));
+        }
+      } else if (!options.copy) {
+        console.log(chalk15.gray("\nTip: Use --copy to copy to clipboard"));
+      }
+    }
+  } catch (err) {
+    spinner.fail("Failed to generate PR description");
+    console.error(chalk15.red(err instanceof Error ? err.message : "Unknown error"));
+    process.exit(1);
+  }
+});
+
+// src/commands/review.ts
+import { execSync as execSync8 } from "child_process";
+import chalk16 from "chalk";
+import { Command as Command15 } from "commander";
+import ora12 from "ora";
+import { simpleGit as simpleGit13 } from "simple-git";
+async function getPRDiff(prNumber) {
+  try {
+    const diff = execSync8(`gh pr diff ${prNumber}`, {
+      encoding: "utf-8",
+      maxBuffer: 10 * 1024 * 1024
+    });
+    const prJsonStr = execSync8(`gh pr view ${prNumber} --json number,title,author,url`, {
+      encoding: "utf-8"
+    });
+    const prJson = JSON.parse(prJsonStr);
+    return {
+      diff,
+      prInfo: {
+        number: prJson.number,
+        title: prJson.title,
+        author: prJson.author.login,
+        url: prJson.url
+      }
+    };
+  } catch (err) {
+    if (err instanceof Error && err.message.includes("gh: command not found")) {
+      throw new Error("GitHub CLI (gh) is not installed. Install it from https://cli.github.com/", {
+        cause: err
+      });
+    }
+    throw err;
+  }
+}
+var reviewCommand = new Command15("review").description("Get an AI code review of your changes or a GitHub PR").argument("[pr-number]", "GitHub PR number to review").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic, ollama)").option("-m, --model <model>", "Model to use (provider-specific)").option("-s, --staged", "Review only staged changes").option("-c, --commit <hash>", "Review a specific commit").option("--json", "Output as JSON").action(async (prNumber, options) => {
+  const git = simpleGit13();
+  const isRepo = await git.checkIsRepo();
+  if (!isRepo) {
+    console.error(chalk16.red("Error: Not a git repository"));
+    process.exit(1);
+  }
+  const provider = await resolveProvider(options.provider);
+  const spinner = ora12("Getting diff...").start();
+  try {
+    let diff;
+    let prInfo = null;
+    if (prNumber) {
+      spinner.stop();
+      if (!requireGhCli()) {
+        process.exit(1);
+      }
+      spinner.start(`Fetching PR #${prNumber}...`);
+      const result = await getPRDiff(prNumber);
+      diff = result.diff;
+      prInfo = result.prInfo;
+      spinner.text = `Reviewing PR #${prNumber}...`;
+    } else if (options.commit) {
+      diff = await git.diff([`${options.commit}^`, options.commit]);
+      spinner.text = `Reviewing commit ${options.commit.slice(0, 7)}...`;
+    } else if (options.staged) {
+      diff = await git.diff(["--cached"]);
+      spinner.text = "Reviewing staged changes...";
+    } else {
+      diff = await git.diff();
+      const stagedDiff = await git.diff(["--cached"]);
+      diff = `${stagedDiff}
+${diff}`;
+      spinner.text = "Reviewing uncommitted changes...";
+    }
+    if (!diff.trim()) {
+      spinner.info("No changes to review");
+      process.exit(0);
+    }
+    spinner.text = "AI is reviewing your code...";
+    const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
+    const template = findTemplate(repoRoot.trim(), "review");
+    const review = await generateCodeReview(
+      diff,
+      { provider, model: options.model },
+      template || void 0
+    );
+    spinner.stop();
+    if (options.json) {
+      console.log(JSON.stringify({ prInfo, review }, null, 2));
+      return;
+    }
+    if (prInfo) {
+      console.log(chalk16.bold(`
+\u{1F517} PR #${prInfo.number}: ${prInfo.title}`));
+      console.log(chalk16.gray(`   by ${prInfo.author} - ${prInfo.url}`));
+    }
+    printReview(review);
+  } catch (error) {
+    spinner.fail("Failed to generate review");
+    console.error(chalk16.red(error instanceof Error ? error.message : "Unknown error"));
+    process.exit(1);
+  }
+});
+function printReview(review) {
+  console.log(chalk16.bold("\n\u{1F50D} AI Code Review\n"));
+  console.log(chalk16.cyan("Summary:"));
+  console.log(`  ${review.summary}
+`);
+  if (review.issues.length > 0) {
+    console.log(chalk16.cyan("Issues Found:"));
+    for (const issue of review.issues) {
+      const severityColors = {
+        critical: chalk16.red,
+        warning: chalk16.yellow,
+        suggestion: chalk16.blue
+      };
+      const severityIcons = {
+        critical: "\u{1F534}",
+        warning: "\u{1F7E1}",
+        suggestion: "\u{1F4A1}"
+      };
+      const color = severityColors[issue.severity];
+      const icon = severityIcons[issue.severity];
+      console.log(`
+  ${icon} ${color(issue.severity.toUpperCase())}`);
+      console.log(`     ${chalk16.gray("File:")} ${issue.file}${issue.line ? `:${issue.line}` : ""}`);
+      console.log(`     ${issue.message}`);
+      if (issue.suggestion) {
+        console.log(`     ${chalk16.green("\u2192")} ${issue.suggestion}`);
+      }
+    }
+  } else {
+    console.log(chalk16.green("  \u2713 No issues found!\n"));
+  }
+  if (review.positives.length > 0) {
+    console.log(chalk16.cyan("\nGood Practices:"));
+    for (const positive of review.positives) {
+      console.log(`  ${chalk16.green("\u2713")} ${positive}`);
+    }
+  }
+  const criticalCount = review.issues.filter((i) => i.severity === "critical").length;
+  const warningCount = review.issues.filter((i) => i.severity === "warning").length;
+  const suggestionCount = review.issues.filter((i) => i.severity === "suggestion").length;
+  console.log(chalk16.gray("\n\u2500".repeat(40)));
+  console.log(
+    `  ${chalk16.red(criticalCount)} critical  ${chalk16.yellow(warningCount)} warnings  ${chalk16.blue(suggestionCount)} suggestions`
+  );
+  console.log();
+}
+
+// src/commands/stash.ts
+import chalk17 from "chalk";
+import { Command as Command16 } from "commander";
+import ora13 from "ora";
+import { simpleGit as simpleGit14 } from "simple-git";
+var stashCommand = new Command16("stash").description("Stash changes with AI-generated name").argument("[name]", "Custom stash name (skips AI generation)").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic, ollama)").option("-m, --model <model>", "Model to use (provider-specific)").option("-l, --list", "List all stashes").option("-a, --apply [index]", "Apply stash (default: latest)").option("--pop [index]", "Pop stash (default: latest)").option("-d, --drop [index]", "Drop stash").option("--clear", "Clear all stashes").action(async (name, options) => {
+  const git = simpleGit14();
+  const isRepo = await git.checkIsRepo();
+  if (!isRepo) {
+    console.error(chalk17.red("Error: Not a git repository"));
+    process.exit(1);
+  }
+  if (options.list) {
+    const stashList = await git.stashList();
+    if (stashList.all.length === 0) {
+      console.log(chalk17.gray("No stashes found"));
+      return;
+    }
+    console.log(chalk17.bold("\nStashes:\n"));
+    stashList.all.forEach((stash, index) => {
+      console.log(`  ${chalk17.cyan(index.toString())} ${stash.message}`);
+    });
+    console.log();
+    return;
+  }
+  if (options.apply !== void 0) {
+    const index = typeof options.apply === "string" ? options.apply : "0";
+    try {
+      await git.stash(["apply", `stash@{${index}}`]);
+      console.log(chalk17.green(`\u2713 Applied stash@{${index}}`));
+    } catch (err) {
+      console.error(
+        chalk17.red(
+          `Failed to apply stash: ${err instanceof Error ? err.message : "Unknown error"}`
+        )
+      );
+      process.exit(1);
+    }
+    return;
+  }
+  if (options.pop !== void 0) {
+    const index = typeof options.pop === "string" ? options.pop : "0";
+    try {
+      await git.stash(["pop", `stash@{${index}}`]);
+      console.log(chalk17.green(`\u2713 Popped stash@{${index}}`));
+    } catch (err) {
+      console.error(
+        chalk17.red(`Failed to pop stash: ${err instanceof Error ? err.message : "Unknown error"}`)
+      );
+      process.exit(1);
+    }
+    return;
+  }
+  if (options.drop !== void 0) {
+    const index = typeof options.drop === "string" ? options.drop : "0";
+    try {
+      await git.stash(["drop", `stash@{${index}}`]);
+      console.log(chalk17.green(`\u2713 Dropped stash@{${index}}`));
+    } catch (err) {
+      console.error(
+        chalk17.red(`Failed to drop stash: ${err instanceof Error ? err.message : "Unknown error"}`)
+      );
+      process.exit(1);
+    }
+    return;
+  }
+  if (options.clear) {
+    const readline = await import("readline");
+    const rl = readline.createInterface({
+      input: process.stdin,
       output: process.stdout
     });
     const answer = await new Promise((resolve) => {
-      rl.question(chalk14.yellow("Clear all stashes? This cannot be undone. (y/N) "), resolve);
+      rl.question(chalk17.yellow("Clear all stashes? This cannot be undone. (y/N) "), resolve);
     });
     rl.close();
     if (answer.toLowerCase() === "y") {
       await git.stash(["clear"]);
-      console.log(chalk14.green("\u2713 Cleared all stashes"));
+      console.log(chalk17.green("\u2713 Cleared all stashes"));
     } else {
-      console.log(chalk14.gray("Cancelled"));
+      console.log(chalk17.gray("Cancelled"));
     }
     return;
   }
   const status = await git.status();
   if (status.isClean()) {
-    console.log(chalk14.yellow("No changes to stash"));
+    console.log(chalk17.yellow("No changes to stash"));
     return;
   }
   let stashName;
   if (name) {
     stashName = name;
   } else {
-    const provider = options.provider.toLowerCase();
+    const provider = await resolveProvider(options.provider);
     const diff = await git.diff();
     const stagedDiff = await git.diff(["--cached"]);
-    const fullDiff = diff + "\n" + stagedDiff;
+    const fullDiff = `${diff}
+${stagedDiff}`;
     if (!fullDiff.trim()) {
       stashName = `WIP: untracked files (${status.not_added.length} files)`;
     } else {
-      const spinner = ora12("Generating stash name...").start();
+      const spinner = ora13("Generating stash name...").start();
       try {
         const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
         const template = findTemplate(repoRoot.trim(), "stash");
-        stashName = await generateStashName(fullDiff, { provider, model: options.model }, template || void 0);
+        stashName = await generateStashName(
+          fullDiff,
+          { provider, model: options.model },
+          template || void 0
+        );
         spinner.stop();
-      } catch (error) {
+      } catch {
         spinner.fail("Failed to generate name, using default");
         stashName = `WIP: ${status.modified.length} modified, ${status.not_added.length} untracked`;
       }
     }
   }
   await git.stash(["push", "-u", "-m", stashName]);
-  console.log(chalk14.green(`\u2713 Stashed: ${stashName}`));
+  console.log(chalk17.green(`\u2713 Stashed: ${stashName}`));
 });
 
 // src/commands/summary.ts
-import { Command as Command14 } from "commander";
-import chalk15 from "chalk";
-import ora13 from "ora";
-import { simpleGit as simpleGit13 } from "simple-git";
-var summaryCommand = new Command14("summary").description("Generate a work summary from your commits (for daily/weekly reports)").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic)", "gemini").option("-m, --model <model>", "Model to use (provider-specific)").option("--since <date>", "Start date (default: today)", "today").option("--until <date>", "End date").option("--author <author>", "Filter by author (default: current user)").option("--daily", "Generate daily report (alias for --since today)").option("--weekly", 'Generate weekly report (alias for --since "1 week ago")').option("--with-diff", "Include diff analysis for more detail").option("--markdown", "Output as markdown").option("--json", "Output as JSON").option("--copy", "Copy to clipboard").action(async (options) => {
-  const git = simpleGit13();
+import chalk18 from "chalk";
+import { Command as Command17 } from "commander";
+import ora14 from "ora";
+import { simpleGit as simpleGit15 } from "simple-git";
+var summaryCommand = new Command17("summary").description("Generate a work summary from your commits (for daily/weekly reports)").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic, ollama)").option("-m, --model <model>", "Model to use (provider-specific)").option("--since <date>", "Start date (default: today)", "today").option("--until <date>", "End date").option("--author <author>", "Filter by author (default: current user)").option("--daily", "Generate daily report (alias for --since today)").option("--weekly", 'Generate weekly report (alias for --since "1 week ago")').option("--with-diff", "Include diff analysis for more detail").option("--markdown", "Output as markdown").option("--json", "Output as JSON").option("--copy", "Copy to clipboard").action(async (options) => {
+  const git = simpleGit15();
   const isRepo = await git.checkIsRepo();
   if (!isRepo) {
-    console.error(chalk15.red("Error: Not a git repository"));
+    console.error(chalk18.red("Error: Not a git repository"));
     process.exit(1);
   }
-  const provider = options.provider.toLowerCase();
-  const spinner = ora13("Generating summary...").start();
+  const provider = await resolveProvider(options.provider);
+  const spinner = ora14("Generating summary...").start();
   try {
     let author = options.author;
     if (!author) {
@@ -2126,10 +2775,10 @@ var summaryCommand = new Command14("summary").description("Generate a work summa
       const { execSync: execSync9 } = await import("child_process");
       try {
         execSync9("pbcopy", { input: textToCopy });
-        console.log(chalk15.green("Summary copied to clipboard!"));
+        console.log(chalk18.green("Summary copied to clipboard!"));
         console.log();
       } catch {
-        console.log(chalk15.yellow("Could not copy to clipboard"));
+        console.log(chalk18.yellow("Could not copy to clipboard"));
       }
     }
     if (options.markdown) {
@@ -2139,7 +2788,7 @@ var summaryCommand = new Command14("summary").description("Generate a work summa
     }
   } catch (error) {
     spinner.fail("Failed to generate summary");
-    console.error(chalk15.red(error instanceof Error ? error.message : "Unknown error"));
+    console.error(chalk18.red(error instanceof Error ? error.message : "Unknown error"));
     process.exit(1);
   }
 });
@@ -2207,29 +2856,29 @@ function formatDate(d) {
 }
 function printSummary(summary, author, since, until) {
   const period = until ? `${since} - ${until}` : `${since} - now`;
-  console.log(chalk15.bold(`
+  console.log(chalk18.bold(`
 \u{1F4CA} ${summary.title}
 `));
-  console.log(chalk15.gray(`Author: ${author}`));
-  console.log(chalk15.gray(`Period: ${period}`));
+  console.log(chalk18.gray(`Author: ${author}`));
+  console.log(chalk18.gray(`Period: ${period}`));
   if (summary.stats) {
-    console.log(chalk15.gray(`Commits: ${summary.stats.commits}`));
+    console.log(chalk18.gray(`Commits: ${summary.stats.commits}`));
   }
   console.log();
-  console.log(chalk15.cyan("Overview:"));
+  console.log(chalk18.cyan("Overview:"));
   console.log(`  ${summary.overview}`);
   console.log();
   if (summary.highlights.length > 0) {
-    console.log(chalk15.cyan("Highlights:"));
+    console.log(chalk18.cyan("Highlights:"));
     for (const highlight of summary.highlights) {
-      console.log(`  ${chalk15.green("\u2605")} ${highlight}`);
+      console.log(`  ${chalk18.green("\u2605")} ${highlight}`);
     }
     console.log();
   }
   if (summary.details.length > 0) {
-    console.log(chalk15.cyan("Details:"));
+    console.log(chalk18.cyan("Details:"));
     for (const section of summary.details) {
-      console.log(`  ${chalk15.yellow(section.category)}`);
+      console.log(`  ${chalk18.yellow(section.category)}`);
       for (const item of section.items) {
         console.log(`    \u2022 ${item}`);
       }
@@ -2238,561 +2887,116 @@ function printSummary(summary, author, since, until) {
   }
 }
 
-// src/commands/config.ts
-import { Command as Command15 } from "commander";
-import chalk16 from "chalk";
-import { execSync as execSync7 } from "child_process";
-import { existsSync as existsSync5, mkdirSync as mkdirSync2 } from "fs";
-import { join as join5 } from "path";
-import { homedir as homedir3 } from "os";
-import { simpleGit as simpleGit14 } from "simple-git";
-
-// src/lib/config.ts
-import { homedir as homedir2 } from "os";
-import { join as join4 } from "path";
-import { existsSync as existsSync4, mkdirSync, readFileSync as readFileSync5, writeFileSync as writeFileSync2 } from "fs";
-import { execSync as execSync6 } from "child_process";
-var DEFAULT_CONFIG = {
-  lang: "en"
-};
-function getGlobalConfigPath() {
-  const configDir = join4(homedir2(), ".config", "gut");
-  return join4(configDir, "config.json");
-}
-function getRepoRoot() {
-  try {
-    return execSync6("git rev-parse --show-toplevel", { encoding: "utf-8" }).trim();
-  } catch {
-    return null;
-  }
-}
-function getLocalConfigPath() {
-  const repoRoot = getRepoRoot();
-  if (!repoRoot) return null;
-  return join4(repoRoot, ".gut", "config.json");
-}
-function ensureGlobalConfigDir() {
-  const configDir = join4(homedir2(), ".config", "gut");
-  if (!existsSync4(configDir)) {
-    mkdirSync(configDir, { recursive: true });
-  }
-}
-function ensureLocalConfigDir() {
-  const repoRoot = getRepoRoot();
-  if (!repoRoot) return;
-  const gutDir = join4(repoRoot, ".gut");
-  if (!existsSync4(gutDir)) {
-    mkdirSync(gutDir, { recursive: true });
-  }
-}
-function readConfigFile(path2) {
-  if (!existsSync4(path2)) return {};
-  try {
-    return JSON.parse(readFileSync5(path2, "utf-8"));
-  } catch {
-    return {};
-  }
-}
-function getGlobalConfig() {
-  const globalPath = getGlobalConfigPath();
-  return { ...DEFAULT_CONFIG, ...readConfigFile(globalPath) };
-}
-function getLocalConfig() {
-  const localPath = getLocalConfigPath();
-  if (!localPath) return {};
-  return readConfigFile(localPath);
-}
-function getConfig() {
-  const globalConfig = getGlobalConfig();
-  const localConfig = getLocalConfig();
-  return { ...globalConfig, ...localConfig };
-}
-function setGlobalConfig(key, value) {
-  ensureGlobalConfigDir();
-  const config = getGlobalConfig();
-  config[key] = value;
-  writeFileSync2(getGlobalConfigPath(), JSON.stringify(config, null, 2));
-}
-function setLocalConfig(key, value) {
-  const localPath = getLocalConfigPath();
-  if (!localPath) {
-    throw new Error("Not in a git repository");
-  }
-  ensureLocalConfigDir();
-  const config = getLocalConfig();
-  config[key] = value;
-  writeFileSync2(localPath, JSON.stringify(config, null, 2));
-}
-function getLanguage() {
-  return getConfig().lang;
-}
-function setLanguage(lang, local = false) {
-  if (local) {
-    setLocalConfig("lang", lang);
-  } else {
-    setGlobalConfig("lang", lang);
-  }
-}
-var VALID_LANGUAGES = ["en", "ja"];
-function isValidLanguage(lang) {
-  return VALID_LANGUAGES.includes(lang);
-}
-
-// src/commands/config.ts
-function openFolder(path2) {
-  const platform = process.platform;
-  const cmd = platform === "darwin" ? "open" : platform === "win32" ? 'start ""' : "xdg-open";
-  execSync7(`${cmd} "${path2}"`);
-}
-var configCommand = new Command15("config").description("Manage gut configuration");
-configCommand.command("set <key> <value>").description("Set a configuration value").option("--local", "Set for current repository only").action((key, value, options) => {
-  if (key === "lang") {
-    if (!isValidLanguage(value)) {
-      console.error(chalk16.red(`Invalid language: ${value}`));
-      console.error(chalk16.gray(`Valid languages: ${VALID_LANGUAGES.join(", ")}`));
-      process.exit(1);
-    }
-    try {
-      setLanguage(value, options.local ?? false);
-      const scope = options.local ? "(local)" : "(global)";
-      console.log(chalk16.green(`\u2713 Language set to: ${value} ${scope}`));
-    } catch (err) {
-      console.error(chalk16.red(err.message));
-      process.exit(1);
-    }
-  } else {
-    console.error(chalk16.red(`Unknown config key: ${key}`));
-    console.error(chalk16.gray("Available keys: lang"));
-    process.exit(1);
-  }
-});
-configCommand.command("get <key>").description("Get a configuration value").action((key) => {
-  const config = getConfig();
-  if (key in config) {
-    console.log(config[key]);
-  } else {
-    console.error(chalk16.red(`Unknown config key: ${key}`));
-    process.exit(1);
-  }
-});
-configCommand.command("list").description("List all configuration values").action(() => {
-  const localConfig = getLocalConfig();
-  const effectiveConfig = getConfig();
-  console.log(chalk16.bold("Configuration:"));
-  console.log();
-  for (const key of Object.keys(effectiveConfig)) {
-    const value = effectiveConfig[key];
-    const isLocal = key in localConfig;
-    const scope = isLocal ? chalk16.cyan(" (local)") : chalk16.gray(" (global)");
-    console.log(`  ${chalk16.cyan(key)}: ${value}${scope}`);
-  }
-  if (Object.keys(localConfig).length > 0) {
-    console.log();
-    console.log(chalk16.gray("Local config: .gut/config.json"));
-  }
-});
-configCommand.command("open").description("Open configuration or templates folder").option("-t, --templates", "Open templates folder instead of config").option("-g, --global", "Open global folder (default)").option("-l, --local", "Open local/project folder").action(async (options) => {
-  const git = simpleGit14();
-  const isLocal = options.local === true;
-  let targetPath;
-  if (isLocal) {
-    const isRepo = await git.checkIsRepo();
-    if (!isRepo) {
-      console.error(chalk16.red("Error: Not a git repository"));
-      console.error(chalk16.gray("Use --global to open global config folder"));
-      process.exit(1);
-    }
-    const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
-    targetPath = join5(repoRoot.trim(), ".gut");
-  } else {
-    if (options.templates) {
-      targetPath = join5(homedir3(), ".config", "gut", "templates");
-    } else {
-      targetPath = join5(homedir3(), ".config", "gut");
-    }
-  }
-  if (!existsSync5(targetPath)) {
-    mkdirSync2(targetPath, { recursive: true });
-    console.log(chalk16.green(`Created ${targetPath}`));
-  }
-  try {
-    openFolder(targetPath);
-    console.log(chalk16.green(`Opened: ${targetPath}`));
-  } catch (error) {
-    console.error(chalk16.red(`Failed to open folder: ${targetPath}`));
-    console.error(chalk16.gray(error.message));
-    process.exit(1);
-  }
-});
-
-// src/commands/lang.ts
-import { Command as Command16 } from "commander";
-import chalk17 from "chalk";
-var langCommand = new Command16("lang").description("Set or show output language").argument("[language]", `Language to set (${VALID_LANGUAGES.join(", ")})`).option("--local", "Set for current repository only").action((language, options) => {
-  if (!language) {
-    const lang = getLanguage();
-    const localConfig = getLocalConfig();
-    const isLocal = "lang" in localConfig;
-    const scope = isLocal ? chalk17.cyan("(local)") : chalk17.gray("(global)");
-    console.log(`${lang} ${scope}`);
-    return;
-  }
-  if (!isValidLanguage(language)) {
-    console.error(chalk17.red(`Invalid language: ${language}`));
-    console.error(chalk17.gray(`Valid languages: ${VALID_LANGUAGES.join(", ")}`));
+// src/commands/sync.ts
+import chalk19 from "chalk";
+import { Command as Command18 } from "commander";
+import ora15 from "ora";
+import { simpleGit as simpleGit16 } from "simple-git";
+var syncCommand = new Command18("sync").description("Sync current branch with remote (fetch + rebase/merge)").option("-m, --merge", "Use merge instead of rebase").option("--no-push", "Skip push after syncing").option("--stash", "Auto-stash changes before sync").option("-f, --force", "Force sync even with uncommitted changes").action(async (options) => {
+  const git = simpleGit16();
+  const isRepo = await git.checkIsRepo();
+  if (!isRepo) {
+    console.error(chalk19.red("Error: Not a git repository"));
     process.exit(1);
   }
+  const spinner = ora15("Checking repository status...").start();
   try {
-    setLanguage(language, options.local ?? false);
-    const scope = options.local ? "(local)" : "(global)";
-    console.log(chalk17.green(`\u2713 Language set to: ${language} ${scope}`));
-  } catch (err) {
-    console.error(chalk17.red(err.message));
-    process.exit(1);
-  }
-});
-
-// src/commands/init.ts
-import { Command as Command17 } from "commander";
-import chalk18 from "chalk";
-import ora14 from "ora";
-import { simpleGit as simpleGit15 } from "simple-git";
-import { existsSync as existsSync6, mkdirSync as mkdirSync3, readFileSync as readFileSync6, writeFileSync as writeFileSync3 } from "fs";
-import { join as join6, dirname as dirname2 } from "path";
-import { homedir as homedir4 } from "os";
-import { fileURLToPath as fileURLToPath2 } from "url";
-import { execSync as execSync8 } from "child_process";
-import { generateText as generateText2 } from "ai";
-import { createGoogleGenerativeAI as createGoogleGenerativeAI2 } from "@ai-sdk/google";
-import { createOpenAI as createOpenAI2 } from "@ai-sdk/openai";
-import { createAnthropic as createAnthropic2 } from "@ai-sdk/anthropic";
-function openFolder2(path2) {
-  const platform = process.platform;
-  const cmd = platform === "darwin" ? "open" : platform === "win32" ? 'start ""' : "xdg-open";
-  execSync8(`${cmd} "${path2}"`);
-}
-var __filename2 = fileURLToPath2(import.meta.url);
-var __dirname2 = dirname2(__filename2);
-var GUT_ROOT2 = join6(__dirname2, "..");
-var TEMPLATE_FILES = [
-  "branch.md",
-  "changelog.md",
-  "checkout.md",
-  "commit.md",
-  "explain.md",
-  "explain-file.md",
-  "find.md",
-  "merge.md",
-  "pr.md",
-  "review.md",
-  "stash.md",
-  "summary.md"
-];
-async function translateTemplate(content, targetLang, provider) {
-  const apiKey = await getApiKey(provider);
-  if (!apiKey) {
-    throw new Error(`No API key found for ${provider}`);
-  }
-  const modelName = provider === "gemini" ? "gemini-2.0-flash" : provider === "openai" ? "gpt-4o-mini" : "claude-sonnet-4-20250514";
-  let model;
-  switch (provider) {
-    case "gemini": {
-      const google = createGoogleGenerativeAI2({ apiKey });
-      model = google(modelName);
-      break;
-    }
-    case "openai": {
-      const openai = createOpenAI2({ apiKey });
-      model = openai(modelName);
-      break;
-    }
-    case "anthropic": {
-      const anthropic = createAnthropic2({ apiKey });
-      model = anthropic(modelName);
-      break;
-    }
-    default:
-      throw new Error(`Unsupported provider for translation: ${provider}`);
-  }
-  const langNames = {
-    ja: "Japanese",
-    en: "English",
-    zh: "Chinese",
-    ko: "Korean",
-    es: "Spanish",
-    fr: "French",
-    de: "German"
-  };
-  const targetLangName = langNames[targetLang] || targetLang;
-  const { text } = await generateText2({
-    model,
-    prompt: `Translate the following prompt template to ${targetLangName}.
-Keep all {{variable}} placeholders exactly as they are - do not translate them.
-Keep the markdown formatting intact.
-Only translate the instructional text.
-
-Template to translate:
-${content}
-
-Translated template:`
-  });
-  return text.trim();
-}
-var initCommand = new Command17("init").description("Initialize .gut/ templates in your project or globally").option("-p, --provider <provider>", "AI provider for translation (gemini, openai, anthropic)", "gemini").option("-f, --force", "Overwrite existing templates").option("-g, --global", "Initialize templates globally (~/.config/gut/templates/)").option("-o, --open", "Open the templates folder (can be used alone)").option("--no-translate", "Skip translation even if language is not English").action(async (options) => {
-  const isGlobal = options.global === true;
-  const git = simpleGit15();
-  let targetDir;
-  if (isGlobal) {
-    targetDir = join6(homedir4(), ".config", "gut", "templates");
-  } else {
-    const isRepo = await git.checkIsRepo();
-    if (!isRepo) {
-      console.error(chalk18.red("Error: Not a git repository"));
-      console.error(chalk18.gray("Use --global to initialize templates globally"));
+    const status = await git.status();
+    const hasChanges = !status.isClean();
+    if (hasChanges && !options.stash && !options.force) {
+      spinner.stop();
+      console.log(chalk19.yellow("You have uncommitted changes:"));
+      if (status.modified.length > 0) {
+        console.log(chalk19.gray(`  Modified: ${status.modified.length} file(s)`));
+      }
+      if (status.not_added.length > 0) {
+        console.log(chalk19.gray(`  Untracked: ${status.not_added.length} file(s)`));
+      }
+      console.log();
+      console.log(chalk19.gray("Use --stash to auto-stash, or --force to sync anyway"));
       process.exit(1);
     }
-    const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
-    targetDir = join6(repoRoot.trim(), ".gut");
-  }
-  if (!existsSync6(targetDir)) {
-    mkdirSync3(targetDir, { recursive: true });
-    console.log(chalk18.green(`Created ${targetDir}`));
-  }
-  console.log(chalk18.blue(isGlobal ? "Initializing global templates...\n" : "Initializing project templates...\n"));
-  const sourceDir = join6(GUT_ROOT2, ".gut");
-  const lang = getLanguage();
-  const needsTranslation = options.translate !== false && lang !== "en";
-  const provider = options.provider.toLowerCase();
-  if (needsTranslation) {
-    console.log(chalk18.gray(`Language: ${lang} - templates will be translated
-`));
-  }
-  const spinner = ora14();
-  let copied = 0;
-  let skipped = 0;
-  for (const filename of TEMPLATE_FILES) {
-    const sourcePath = join6(sourceDir, filename);
-    const targetPath = join6(targetDir, filename);
-    if (!existsSync6(sourcePath)) {
-      continue;
+    let stashed = false;
+    if (hasChanges && options.stash) {
+      spinner.text = "Stashing changes...";
+      await git.stash(["push", "-m", `gut-sync: auto-stash before sync`]);
+      stashed = true;
     }
-    if (existsSync6(targetPath) && !options.force) {
-      console.log(chalk18.gray(`  Skipped: ${filename} (already exists)`));
-      skipped++;
-      continue;
+    spinner.text = "Fetching from remote...";
+    await git.fetch(["--all", "--prune"]);
+    const currentBranch = status.current;
+    if (!currentBranch) {
+      spinner.fail("Could not determine current branch");
+      process.exit(1);
     }
-    let content = readFileSync6(sourcePath, "utf-8");
-    if (needsTranslation) {
-      spinner.start(`Translating ${filename}...`);
-      try {
-        content = await translateTemplate(content, lang, provider);
-        spinner.succeed(`Translated: ${filename}`);
-      } catch (error) {
-        spinner.fail(`Failed to translate ${filename}`);
-        console.error(chalk18.red(`  ${error instanceof Error ? error.message : "Unknown error"}`));
-        console.log(chalk18.gray(`  Using original English template`));
+    const trackingBranch = status.tracking;
+    if (!trackingBranch) {
+      spinner.warn(`Branch ${currentBranch} has no upstream tracking branch`);
+      console.log(chalk19.gray(`
+To set upstream: git push -u origin ${currentBranch}`));
+      if (stashed) {
+        await git.stash(["pop"]);
+        console.log(chalk19.gray("Restored stashed changes"));
       }
-    } else {
-      console.log(chalk18.green(`  Copied: ${filename}`));
+      return;
     }
-    writeFileSync3(targetPath, content);
-    copied++;
-  }
-  console.log();
-  if (copied > 0) {
-    const location = isGlobal ? "~/.config/gut/templates/" : ".gut/";
-    console.log(chalk18.green(`\u2713 ${copied} template(s) initialized in ${location}`));
-  }
-  if (skipped > 0) {
-    console.log(chalk18.gray(`  ${skipped} template(s) skipped (use --force to overwrite)`));
-  }
-  if (isGlobal) {
-    console.log(chalk18.gray("\nGlobal templates will be used as fallback for all projects."));
-    console.log(chalk18.gray("Project-level templates (.gut/) take priority over global templates."));
-  } else {
-    console.log(chalk18.gray("\nYou can now customize these templates for your project."));
-  }
-  if (options.open) {
+    const strategy = options.merge ? "merge" : "rebase";
+    spinner.text = `Syncing with ${trackingBranch} (${strategy})...`;
     try {
-      openFolder2(targetDir);
-      console.log(chalk18.green(`
-Opened: ${targetDir}`));
-    } catch (error) {
-      console.error(chalk18.red(`
-Failed to open folder: ${targetDir}`));
-    }
-  }
-});
-
-// src/commands/gitignore.ts
-import { Command as Command18 } from "commander";
-import chalk19 from "chalk";
-import ora15 from "ora";
-import { simpleGit as simpleGit16 } from "simple-git";
-import { readdirSync, readFileSync as readFileSync7, existsSync as existsSync7, writeFileSync as writeFileSync4 } from "fs";
-import { join as join7 } from "path";
-var CONFIG_FILES = [
-  // JavaScript/TypeScript
-  "package.json",
-  "tsconfig.json",
-  "vite.config.ts",
-  "vite.config.js",
-  "next.config.js",
-  "next.config.mjs",
-  "nuxt.config.ts",
-  "astro.config.mjs",
-  // Python
-  "pyproject.toml",
-  "setup.py",
-  "requirements.txt",
-  "Pipfile",
-  "poetry.lock",
-  // Go
-  "go.mod",
-  "go.sum",
-  // Rust
-  "Cargo.toml",
-  "Cargo.lock",
-  // Java/Kotlin
-  "pom.xml",
-  "build.gradle",
-  "build.gradle.kts",
-  // Ruby
-  "Gemfile",
-  "Gemfile.lock",
-  // PHP
-  "composer.json",
-  "composer.lock",
-  // .NET
-  "*.csproj",
-  "*.fsproj",
-  "*.sln",
-  // Elixir
-  "mix.exs",
-  // Dart/Flutter
-  "pubspec.yaml",
-  // Swift
-  "Package.swift"
-];
-function getFiles(dir, maxDepth = 3, currentDepth = 0) {
-  if (currentDepth >= maxDepth) return [];
-  const files = [];
-  try {
-    const entries = readdirSync(dir, { withFileTypes: true });
-    for (const entry of entries) {
-      if (entry.name.startsWith(".") || entry.name === "node_modules" || entry.name === "vendor" || entry.name === "target" || entry.name === "__pycache__" || entry.name === "venv" || entry.name === ".venv") {
-        continue;
+      if (options.merge) {
+        await git.merge([trackingBranch]);
+      } else {
+        await git.rebase([trackingBranch]);
       }
-      const fullPath = join7(dir, entry.name);
-      if (entry.isDirectory()) {
-        files.push(entry.name + "/");
-        const subFiles = getFiles(fullPath, maxDepth, currentDepth + 1);
-        files.push(...subFiles.map((f) => entry.name + "/" + f));
+    } catch {
+      spinner.fail(`${strategy} failed - you may have conflicts`);
+      console.log(chalk19.yellow("\nResolve conflicts and then:"));
+      if (options.merge) {
+        console.log(chalk19.gray("  git add . && git commit"));
       } else {
-        files.push(entry.name);
+        console.log(chalk19.gray("  git add . && git rebase --continue"));
       }
-    }
-  } catch {
-  }
-  return files;
-}
-function findConfigFiles(repoRoot) {
-  const found = /* @__PURE__ */ new Map();
-  for (const configFile of CONFIG_FILES) {
-    if (configFile.includes("*")) {
-      const ext = configFile.replace("*", "");
-      try {
-        const entries = readdirSync(repoRoot);
-        for (const entry of entries) {
-          if (entry.endsWith(ext)) {
-            const content = readFileSync7(join7(repoRoot, entry), "utf-8");
-            found.set(entry, content.slice(0, 2e3));
-          }
-        }
-      } catch {
+      if (stashed) {
+        console.log(
+          chalk19.yellow("\nNote: You have stashed changes. Run `git stash pop` after resolving.")
+        );
       }
-    } else {
-      const filePath = join7(repoRoot, configFile);
-      if (existsSync7(filePath)) {
+      process.exit(1);
+    }
+    const newStatus = await git.status();
+    const ahead = newStatus.ahead || 0;
+    const behind = newStatus.behind || 0;
+    spinner.succeed(chalk19.green("Synced successfully"));
+    if (behind > 0) {
+      console.log(chalk19.yellow(`  \u2193 ${behind} commit(s) behind`));
+    }
+    if (ahead > 0) {
+      if (options.push !== false) {
+        const pushSpinner = ora15("Pushing to remote...").start();
         try {
-          const content = readFileSync7(filePath, "utf-8");
-          found.set(configFile, content.slice(0, 2e3));
-        } catch {
+          await git.push();
+          pushSpinner.succeed(chalk19.green(`Pushed ${ahead} commit(s)`));
+        } catch (err) {
+          pushSpinner.fail("Push failed");
+          console.error(chalk19.red(err instanceof Error ? err.message : "Unknown error"));
         }
+      } else {
+        console.log(chalk19.cyan(`  \u2191 ${ahead} commit(s) ahead`));
       }
     }
-  }
-  return found;
-}
-var gitignoreCommand = new Command18("gitignore").description("Generate .gitignore from current codebase").option("-p, --provider <provider>", "AI provider (gemini, openai, anthropic)", "gemini").option("-m, --model <model>", "Model to use (provider-specific)").option("-o, --output <file>", "Output file (default: .gitignore)", ".gitignore").option("--stdout", "Print to stdout instead of file").option("-y, --yes", "Overwrite existing .gitignore without confirmation").action(async (options) => {
-  const git = simpleGit16();
-  const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
-  const root = repoRoot.trim();
-  const provider = options.provider.toLowerCase();
-  const template = findTemplate(root, "gitignore");
-  if (template) {
-    console.log(chalk19.gray("Using template from project..."));
-  }
-  const spinner = ora15("Analyzing project structure...").start();
-  const files = getFiles(root);
-  const configFiles = findConfigFiles(root);
-  const gitignorePath = join7(root, options.output);
-  let existingGitignore;
-  if (existsSync7(gitignorePath)) {
-    existingGitignore = readFileSync7(gitignorePath, "utf-8");
-  }
-  let configFilesStr = "";
-  if (configFiles.size > 0) {
-    const entries = [];
-    for (const [name, content] of configFiles) {
-      entries.push(`### ${name}
-\`\`\`
-${content}
-\`\`\``);
-    }
-    configFilesStr = entries.join("\n\n");
-  }
-  spinner.text = "Generating .gitignore...";
-  try {
-    const gitignoreContent = await generateGitignore(
-      {
-        files: files.slice(0, 200).join("\n"),
-        configFiles: configFilesStr,
-        existingGitignore
-      },
-      { provider, model: options.model },
-      template || void 0
-    );
-    spinner.stop();
-    if (options.stdout) {
-      console.log(gitignoreContent);
-      return;
-    }
-    console.log(chalk19.bold("\nGenerated .gitignore:\n"));
-    console.log(chalk19.gray("\u2500".repeat(50)));
-    console.log(gitignoreContent);
-    console.log(chalk19.gray("\u2500".repeat(50)));
-    console.log();
-    if (existsSync7(gitignorePath) && !options.yes) {
-      const readline = await import("readline");
-      const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout
-      });
-      const answer = await new Promise((resolve) => {
-        rl.question(chalk19.cyan(`${options.output} already exists. Overwrite? (y/N) `), resolve);
-      });
-      rl.close();
-      if (answer.toLowerCase() !== "y") {
-        console.log(chalk19.gray("Aborted."));
-        return;
+    if (stashed) {
+      spinner.start("Restoring stashed changes...");
+      try {
+        await git.stash(["pop"]);
+        spinner.succeed("Restored stashed changes");
+      } catch {
+        spinner.warn("Could not auto-restore stash (may have conflicts)");
+        console.log(chalk19.gray("  Run `git stash pop` manually"));
       }
     }
-    writeFileSync4(gitignorePath, gitignoreContent);
-    console.log(chalk19.green(`\u2713 Wrote ${options.output}`));
-  } catch (error) {
-    spinner.fail("Failed to generate .gitignore");
-    console.error(chalk19.red(error instanceof Error ? error.message : "Unknown error"));
+  } catch (err) {
+    spinner.fail("Sync failed");
+    console.error(chalk19.red(err instanceof Error ? err.message : "Unknown error"));
     process.exit(1);
   }
 });