gut-cli 0.1.7 → 0.1.9

package/README.md

@@ -24,6 +24,8 @@ All AI commands support short aliases (without `ai-` prefix):
 | `gut changelog` | - | Generate changelogs |
 | `gut sync` | - | Sync with remote (fetch + rebase/merge) |
 | `gut stash` | - | Stash with AI-generated names |
+| `gut config` | - | Manage configuration (language, etc.) |
+| `gut lang` | - | Set or show output language |
 
 ### `gut commit`
 
@@ -193,20 +195,20 @@ gut branch -d "add user authentication"
 
 ### `gut sync`
 
-Sync current branch with remote (fetch + rebase).
+Sync current branch with remote (fetch + rebase + push).
 
 ```bash
-# Sync current branch (rebase by default)
+# Sync current branch (fetch + rebase + push)
 gut sync
 
-# Use merge instead of rebase
-gut sync --merge
-
 # Auto-stash changes before sync
 gut sync --stash
 
-# Force sync with uncommitted changes
-gut sync --force
+# Use merge instead of rebase
+gut sync --merge
+
+# Skip push
+gut sync --no-push
 ```
 
 ### `gut stash`
@@ -259,6 +261,49 @@ gut changelog --json
 
 **Changelog Template Support**: If `CHANGELOG.md` exists, gut will match its style.
 
+### `gut lang`
+
+Set or show AI output language (shortcut for `gut config set lang`).
+
+```bash
+# Show current language
+gut lang
+
+# Set to Japanese
+gut lang ja
+
+# Set to English
+gut lang en
+
+# Set for current repository only
+gut lang en --local
+```
+
+### `gut config`
+
+Manage gut configuration settings.
+
+```bash
+# List all settings
+gut config list
+
+# Set language to Japanese (global)
+gut config set lang ja
+
+# Set language for current repository only
+gut config set lang en --local
+
+# Get current language
+gut config get lang
+```
+
+**Available settings:**
+- `lang` - Output language for AI responses (`en`, `ja`)
+
+**Configuration precedence:**
+1. Local: `.gut/config.json` (per-repository)
+2. Global: `~/.config/gut/config.json`
+
 ### `gut cleanup`
 
 Delete merged branches safely.

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { Command as Command13 } from "commander";
+import { Command as Command15 } from "commander";
 
 // src/commands/cleanup.ts
 import { Command } from "commander";
@@ -264,8 +264,8 @@ import { Command as Command3 } from "commander";
 import chalk3 from "chalk";
 import ora2 from "ora";
 import { simpleGit as simpleGit2 } from "simple-git";
-import { existsSync, readFileSync } from "fs";
-import { join } from "path";
+import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
+import { join as join2 } from "path";
 
 // src/lib/ai.ts
 import { generateText, generateObject } from "ai";
@@ -273,6 +273,108 @@ import { createGoogleGenerativeAI } from "@ai-sdk/google";
 import { createOpenAI } from "@ai-sdk/openai";
 import { createAnthropic } from "@ai-sdk/anthropic";
 import { z } from "zod";
+
+// src/lib/config.ts
+import { homedir } from "os";
+import { join } from "path";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { execSync } from "child_process";
+var DEFAULT_CONFIG = {
+  lang: "en"
+};
+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 });
+  }
+}
+function readConfigFile(path2) {
+  if (!existsSync(path2)) return {};
+  try {
+    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);
+  }
+}
+function getLanguageInstruction(lang) {
+  switch (lang) {
+    case "ja":
+      return "\n\nIMPORTANT: Respond in Japanese (\u65E5\u672C\u8A9E\u3067\u56DE\u7B54\u3057\u3066\u304F\u3060\u3055\u3044).";
+    case "en":
+    default:
+      return "";
+  }
+}
+var VALID_LANGUAGES = ["en", "ja"];
+function isValidLanguage(lang) {
+  return VALID_LANGUAGES.includes(lang);
+}
+
+// src/lib/ai.ts
 var DEFAULT_MODELS = {
   gemini: "gemini-2.0-flash",
   openai: "gpt-4o-mini",
@@ -317,6 +419,7 @@ Rules:
 - Description should be lowercase, imperative mood, no period at end
 - Keep the first line under 72 characters
 - If changes are complex, add a blank line and bullet points for details`;
+  const langInstruction = getLanguageInstruction(getLanguage());
   const prompt = `You are an expert at writing git commit messages.
 
 Analyze the following git diff and generate a concise, meaningful commit message.
@@ -327,7 +430,7 @@ Git diff:
 ${diff.slice(0, 8e3)}
 \`\`\`
 
-Respond with ONLY the commit message, nothing else.`;
+Respond with ONLY the commit message, nothing else.${langInstruction}`;
   const result = await generateText({
     model,
     prompt,
@@ -351,6 +454,7 @@ Rules for description:
   - ## Summary section with 2-3 bullet points
   - ## Changes section listing key modifications
   - ## Test Plan section (suggest what to test)`;
+  const langInstruction = getLanguageInstruction(getLanguage());
   const prompt = `You are an expert at writing pull request descriptions.
 
 Generate a clear and informative PR title and description based on the following information.
@@ -373,7 +477,7 @@ Respond in JSON format:
 {
   "title": "...",
   "body": "..."
-}`;
+}${langInstruction}`;
   const result = await generateText({
     model,
     prompt,
@@ -404,6 +508,7 @@ var CodeReviewSchema = z.object({
 });
 async function generateCodeReview(diff, options) {
   const model = await getModel(options);
+  const langInstruction = getLanguageInstruction(getLanguage());
   const result = await generateObject({
     model,
     schema: CodeReviewSchema,
@@ -421,7 +526,7 @@ Git diff:
 ${diff.slice(0, 1e4)}
 \`\`\`
 
-Be constructive and specific. Include line numbers when possible.`
+Be constructive and specific. Include line numbers when possible.${langInstruction}`
   });
   return result.object;
 }
@@ -451,6 +556,7 @@ Use Keep a Changelog format (https://keepachangelog.com/):
 - Each item should be a concise description of the change
 - Use past tense`;
   const commitList = context.commits.map((c) => `- ${c.hash.slice(0, 7)} ${c.message} (${c.author})`).join("\n");
+  const langInstruction = getLanguageInstruction(getLanguage());
   const result = await generateObject({
     model,
     schema: ChangelogSchema,
@@ -472,7 +578,7 @@ Focus on:
 - Bug fixes and their impact
 - Breaking changes (highlight these)
 - Group related changes together
-- Write for end users, not developers (unless it's a library)`
+- Write for end users, not developers (unless it's a library)${langInstruction}`
   });
   return result.object;
 }
@@ -502,6 +608,7 @@ IMPORTANT: Use this project context to provide more accurate explanations:
 ${projectContext.slice(0, 4e3)}
 --- PROJECT CONTEXT END ---
 ` : "";
+  const langInstruction = getLanguageInstruction(getLanguage());
   if (context.type === "file-content") {
     const result2 = await generateObject({
       model,
@@ -524,7 +631,7 @@ Focus on:
 - Dependencies and what it interacts with
 - Any important patterns or architecture decisions
 
-Explain in a way that helps someone quickly understand this file's purpose and how it fits into the larger codebase.`
+Explain in a way that helps someone quickly understand this file's purpose and how it fits into the larger codebase.${langInstruction}`
     });
     return result2.object;
   }
@@ -582,7 +689,7 @@ Focus on:
 - The broader context and purpose
 - Any important implications or side effects
 
-Explain in a way that helps someone understand not just the "what" but the "why" behind these changes.`
+Explain in a way that helps someone understand not just the "what" but the "why" behind these changes.${langInstruction}`
   });
   return result.object;
 }
@@ -605,6 +712,7 @@ ${projectContext.slice(0, 3e3)}
 --- PROJECT CONTEXT END ---
 ` : "";
   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 langInstruction = getLanguageInstruction(getLanguage());
   const result = await generateObject({
     model,
     schema: CommitSearchSchema,
@@ -627,7 +735,7 @@ Only include commits that actually match the query - if none match well, return
 
 For each match, provide:
 - The commit hash (first 7 characters are fine)
-- A brief reason explaining why this commit matches the query`
+- A brief reason explaining why this commit matches the query${langInstruction}`
   });
   const enrichedMatches = result.object.matches.map((match) => {
     const commit = commits.find((c) => c.hash.startsWith(match.hash));
@@ -765,9 +873,9 @@ var CONVENTION_PATHS = [
 ];
 function findCommitConvention(repoRoot) {
   for (const conventionPath of CONVENTION_PATHS) {
-    const fullPath = join(repoRoot, conventionPath);
-    if (existsSync(fullPath)) {
-      return readFileSync(fullPath, "utf-8");
+    const fullPath = join2(repoRoot, conventionPath);
+    if (existsSync2(fullPath)) {
+      return readFileSync2(fullPath, "utf-8");
     }
   }
   return null;
@@ -832,14 +940,14 @@ var aiCommitCommand = new Command3("ai-commit").alias("commit").description("Gen
         console.log(chalk3.green("\u2713 Committed successfully"));
       } else if (answer.toLowerCase() === "e") {
         console.log(chalk3.gray("Opening editor..."));
-        const { execSync: execSync4 } = await import("child_process");
+        const { execSync: execSync5 } = 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);
-        execSync4(`${editor} "${tmpFile}"`, { stdio: "inherit" });
+        execSync5(`${editor} "${tmpFile}"`, { stdio: "inherit" });
         const editedMessage = fs2.readFileSync(tmpFile, "utf-8").trim();
         fs2.unlinkSync(tmpFile);
         if (editedMessage) {
@@ -866,8 +974,8 @@ import { Command as Command4 } from "commander";
 import chalk4 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 { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
+import { join as join3 } from "path";
 var PR_TEMPLATE_PATHS = [
   ".gut/pr-template.md",
   ".github/pull_request_template.md",
@@ -878,9 +986,9 @@ var PR_TEMPLATE_PATHS = [
 ];
 function findPRTemplate(repoRoot) {
   for (const templatePath of PR_TEMPLATE_PATHS) {
-    const fullPath = join2(repoRoot, templatePath);
-    if (existsSync2(fullPath)) {
-      return readFileSync2(fullPath, "utf-8");
+    const fullPath = join3(repoRoot, templatePath);
+    if (existsSync3(fullPath)) {
+      return readFileSync3(fullPath, "utf-8");
     }
   }
   return null;
@@ -948,11 +1056,11 @@ var aiPrCommand = new Command4("ai-pr").alias("pr").description("Generate a pull
     console.log(chalk4.gray("\u2500".repeat(50)));
     if (options.copy) {
       try {
-        const { execSync: execSync4 } = await import("child_process");
+        const { execSync: execSync5 } = await import("child_process");
         const fullText = `${title}
 
 ${body}`;
-        execSync4("pbcopy", { input: fullText });
+        execSync5("pbcopy", { input: fullText });
         console.log(chalk4.green("\n\u2713 Copied to clipboard"));
       } catch {
         console.log(chalk4.yellow("\n\u26A0 Could not copy to clipboard"));
@@ -971,10 +1079,10 @@ ${body}`;
       if (answer.toLowerCase() === "y") {
         const createSpinner = ora3("Creating PR...").start();
         try {
-          const { execSync: execSync4 } = await import("child_process");
+          const { execSync: execSync5 } = await import("child_process");
           const escapedTitle = title.replace(/"/g, '\\"');
           const escapedBody = body.replace(/"/g, '\\"');
-          execSync4(
+          execSync5(
             `gh pr create --title "${escapedTitle}" --body "${escapedBody}" --base ${baseBranch}`,
             { stdio: "pipe" }
           );
@@ -1002,11 +1110,11 @@ import { Command as Command5 } from "commander";
 import chalk5 from "chalk";
 import ora4 from "ora";
 import { simpleGit as simpleGit4 } from "simple-git";
-import { execSync } from "child_process";
+import { execSync as execSync2 } from "child_process";
 async function getPRDiff(prNumber) {
   try {
-    const diff = execSync(`gh pr diff ${prNumber}`, { encoding: "utf-8", maxBuffer: 10 * 1024 * 1024 });
-    const prJsonStr = execSync(`gh pr view ${prNumber} --json number,title,author,url`, { encoding: "utf-8" });
+    const diff = execSync2(`gh pr diff ${prNumber}`, { encoding: "utf-8", maxBuffer: 10 * 1024 * 1024 });
+    const prJsonStr = execSync2(`gh pr view ${prNumber} --json number,title,author,url`, { encoding: "utf-8" });
     const prJson = JSON.parse(prJsonStr);
     return {
       diff,
@@ -1258,8 +1366,8 @@ import { Command as Command7 } from "commander";
 import chalk7 from "chalk";
 import ora6 from "ora";
 import { simpleGit as simpleGit6 } from "simple-git";
-import { existsSync as existsSync4, readFileSync as readFileSync4 } from "fs";
-import { join as join4 } from "path";
+import { existsSync as existsSync5, readFileSync as readFileSync5 } from "fs";
+import { join as join5 } from "path";
 var CHANGELOG_PATHS = [
   ".gut/changelog-template.md",
   ".gut/CHANGELOG.md",
@@ -1271,9 +1379,9 @@ var CHANGELOG_PATHS = [
 ];
 function findChangelog(repoRoot) {
   for (const changelogPath of CHANGELOG_PATHS) {
-    const fullPath = join4(repoRoot, changelogPath);
-    if (existsSync4(fullPath)) {
-      return readFileSync4(fullPath, "utf-8");
+    const fullPath = join5(repoRoot, changelogPath);
+    if (existsSync5(fullPath)) {
+      return readFileSync5(fullPath, "utf-8");
     }
   }
   return null;
@@ -1373,17 +1481,17 @@ import { Command as Command8 } from "commander";
 import chalk8 from "chalk";
 import ora7 from "ora";
 import { simpleGit as simpleGit7 } from "simple-git";
-import { execSync as execSync2 } from "child_process";
-import { existsSync as existsSync5, readFileSync as readFileSync5 } from "fs";
-import { join as join5 } from "path";
+import { execSync as execSync3 } from "child_process";
+import { existsSync as existsSync6, readFileSync as readFileSync6 } from "fs";
+import { join as join6 } from "path";
 var CONTEXT_PATHS = [
   ".gut/explain.md"
 ];
 function findExplainContext(repoRoot) {
   for (const contextPath of CONTEXT_PATHS) {
-    const fullPath = join5(repoRoot, contextPath);
-    if (existsSync5(fullPath)) {
-      return readFileSync5(fullPath, "utf-8");
+    const fullPath = join6(repoRoot, contextPath);
+    if (existsSync6(fullPath)) {
+      return readFileSync6(fullPath, "utf-8");
     }
   }
   return null;
@@ -1408,7 +1516,7 @@ var aiExplainCommand = new Command8("ai-explain").alias("explain").description("
       }
     } else {
       const isPR = target.match(/^#?\d+$/) || target.includes("/pull/");
-      const isFile = existsSync5(target);
+      const isFile = existsSync6(target);
       if (isPR) {
         context = await getPRContext(target, spinner);
       } else if (isFile) {
@@ -1491,7 +1599,7 @@ async function getCommitContext(hash, git, spinner) {
 }
 async function getFileContentContext(filePath, spinner) {
   spinner.text = `Reading ${filePath}...`;
-  const content = readFileSync5(filePath, "utf-8");
+  const content = readFileSync6(filePath, "utf-8");
   return {
     type: "file-content",
     title: filePath,
@@ -1542,7 +1650,7 @@ async function getPRContext(target, spinner) {
   spinner.text = `Fetching PR #${prNumber}...`;
   let prInfo;
   try {
-    const prJson = execSync2(
+    const prJson = execSync3(
       `gh pr view ${prNumber} --json title,url,baseRefName,headRefName,commits`,
       { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }
     );
@@ -1553,7 +1661,7 @@ async function getPRContext(target, spinner) {
   spinner.text = `Getting diff for PR #${prNumber}...`;
   let diff;
   try {
-    diff = execSync2(`gh pr diff ${prNumber}`, {
+    diff = execSync3(`gh pr diff ${prNumber}`, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"],
       maxBuffer: 10 * 1024 * 1024
@@ -1620,14 +1728,14 @@ import { Command as Command9 } from "commander";
 import chalk9 from "chalk";
 import ora8 from "ora";
 import { simpleGit as simpleGit8 } from "simple-git";
-import { existsSync as existsSync6, readFileSync as readFileSync6 } from "fs";
-import { join as join6 } from "path";
+import { existsSync as existsSync7, readFileSync as readFileSync7 } from "fs";
+import { join as join7 } from "path";
 var CONTEXT_PATHS2 = [".gut/find.md"];
 function findProjectContext(repoRoot) {
   for (const contextPath of CONTEXT_PATHS2) {
-    const fullPath = join6(repoRoot, contextPath);
-    if (existsSync6(fullPath)) {
-      return readFileSync6(fullPath, "utf-8");
+    const fullPath = join7(repoRoot, contextPath);
+    if (existsSync7(fullPath)) {
+      return readFileSync7(fullPath, "utf-8");
     }
   }
   return null;
@@ -1730,22 +1838,22 @@ import { Command as Command10 } from "commander";
 import chalk10 from "chalk";
 import ora9 from "ora";
 import { simpleGit as simpleGit9 } from "simple-git";
-import { existsSync as existsSync7, readFileSync as readFileSync7 } from "fs";
-import { join as join7 } from "path";
-import { execSync as execSync3 } from "child_process";
+import { existsSync as existsSync8, readFileSync as readFileSync8 } from "fs";
+import { join as join8 } from "path";
+import { execSync as execSync4 } from "child_process";
 var CONVENTION_PATHS2 = [".gut/branch-convention.md", ".github/branch-convention.md"];
 function findBranchConvention(repoRoot) {
   for (const conventionPath of CONVENTION_PATHS2) {
-    const fullPath = join7(repoRoot, conventionPath);
-    if (existsSync7(fullPath)) {
-      return readFileSync7(fullPath, "utf-8");
+    const fullPath = join8(repoRoot, conventionPath);
+    if (existsSync8(fullPath)) {
+      return readFileSync8(fullPath, "utf-8");
     }
   }
   return null;
 }
 function getIssueInfo(issueNumber) {
   try {
-    const result = execSync3(`gh issue view ${issueNumber} --json title,body`, {
+    const result = execSync4(`gh issue view ${issueNumber} --json title,body`, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -1840,7 +1948,7 @@ import { Command as Command11 } from "commander";
 import chalk11 from "chalk";
 import ora10 from "ora";
 import { simpleGit as simpleGit10 } from "simple-git";
-var syncCommand = new Command11("sync").description("Sync current branch with remote (fetch + rebase/merge)").option("-m, --merge", "Use merge instead of rebase").option("-a, --all", "Sync all branches").option("--stash", "Auto-stash changes before sync").option("-f, --force", "Force sync even with uncommitted changes").action(async (options) => {
+var syncCommand = new Command11("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 = simpleGit10();
   const isRepo = await git.checkIsRepo();
   if (!isRepo) {
@@ -1913,12 +2021,23 @@ To set upstream: git push -u origin ${currentBranch}`));
     const ahead = newStatus.ahead || 0;
     const behind = newStatus.behind || 0;
     spinner.succeed(chalk11.green("Synced successfully"));
-    if (ahead > 0) {
-      console.log(chalk11.cyan(`  \u2191 ${ahead} commit(s) ahead - run 'git push' to publish`));
-    }
     if (behind > 0) {
       console.log(chalk11.yellow(`  \u2193 ${behind} commit(s) behind`));
     }
+    if (ahead > 0) {
+      if (options.push !== false) {
+        const pushSpinner = ora10("Pushing to remote...").start();
+        try {
+          await git.push();
+          pushSpinner.succeed(chalk11.green(`Pushed ${ahead} commit(s)`));
+        } catch (error) {
+          pushSpinner.fail("Push failed");
+          console.error(chalk11.red(error instanceof Error ? error.message : "Unknown error"));
+        }
+      } else {
+        console.log(chalk11.cyan(`  \u2191 ${ahead} commit(s) ahead`));
+      }
+    }
     if (stashed) {
       spinner.start("Restoring stashed changes...");
       try {
@@ -2042,8 +2161,87 @@ var stashCommand = new Command12("stash").description("Stash changes with AI-gen
   console.log(chalk12.green(`\u2713 Stashed: ${stashName}`));
 });
 
+// src/commands/config.ts
+import { Command as Command13 } from "commander";
+import chalk13 from "chalk";
+var configCommand = new Command13("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(chalk13.red(`Invalid language: ${value}`));
+      console.error(chalk13.gray(`Valid languages: ${VALID_LANGUAGES.join(", ")}`));
+      process.exit(1);
+    }
+    try {
+      setLanguage(value, options.local ?? false);
+      const scope = options.local ? "(local)" : "(global)";
+      console.log(chalk13.green(`\u2713 Language set to: ${value} ${scope}`));
+    } catch (err) {
+      console.error(chalk13.red(err.message));
+      process.exit(1);
+    }
+  } else {
+    console.error(chalk13.red(`Unknown config key: ${key}`));
+    console.error(chalk13.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(chalk13.red(`Unknown config key: ${key}`));
+    process.exit(1);
+  }
+});
+configCommand.command("list").description("List all configuration values").action(() => {
+  const globalConfig = getGlobalConfig();
+  const localConfig = getLocalConfig();
+  const effectiveConfig = getConfig();
+  console.log(chalk13.bold("Configuration:"));
+  console.log();
+  for (const key of Object.keys(effectiveConfig)) {
+    const value = effectiveConfig[key];
+    const isLocal = key in localConfig;
+    const scope = isLocal ? chalk13.cyan(" (local)") : chalk13.gray(" (global)");
+    console.log(`  ${chalk13.cyan(key)}: ${value}${scope}`);
+  }
+  if (Object.keys(localConfig).length > 0) {
+    console.log();
+    console.log(chalk13.gray("Local config: .gut/config.json"));
+  }
+});
+
+// src/commands/lang.ts
+import { Command as Command14 } from "commander";
+import chalk14 from "chalk";
+var langCommand = new Command14("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 ? chalk14.cyan("(local)") : chalk14.gray("(global)");
+    console.log(`${lang} ${scope}`);
+    return;
+  }
+  if (!isValidLanguage(language)) {
+    console.error(chalk14.red(`Invalid language: ${language}`));
+    console.error(chalk14.gray(`Valid languages: ${VALID_LANGUAGES.join(", ")}`));
+    process.exit(1);
+  }
+  try {
+    setLanguage(language, options.local ?? false);
+    const scope = options.local ? "(local)" : "(global)";
+    console.log(chalk14.green(`\u2713 Language set to: ${language} ${scope}`));
+  } catch (err) {
+    console.error(chalk14.red(err.message));
+    process.exit(1);
+  }
+});
+
 // src/index.ts
-var program = new Command13();
+var program = new Command15();
 program.name("gut").description("Git Utility Tool - AI-powered git commands").version("0.1.0");
 program.addCommand(cleanupCommand);
 program.addCommand(authCommand);
@@ -2057,5 +2255,7 @@ program.addCommand(aiFindCommand);
 program.addCommand(aiBranchCommand);
 program.addCommand(syncCommand);
 program.addCommand(stashCommand);
+program.addCommand(configCommand);
+program.addCommand(langCommand);
 program.parse();
 //# sourceMappingURL=index.js.map