gut-cli 0.1.17 → 0.1.19

package/README.md

@@ -361,6 +361,15 @@ gut config set lang en --local
 
 # Get current language
 gut config get lang
+
+# Open global config folder
+gut config open
+
+# Open global templates folder
+gut config open --templates
+
+# Open project's .gut/ folder
+gut config open --local
 ```
 
 **Available settings:**
@@ -372,12 +381,19 @@ gut config get lang
 
 ### `gut init`
 
-Initialize `.gut/` templates in your project for customization.
+Initialize templates for customization (project-level or global).
 
 ```bash
 # Copy all templates to .gut/ (translates if language is not English)
 gut init
 
+# Initialize global templates (~/.config/gut/templates/)
+gut init --global
+
+# Initialize and open folder
+gut init --open
+gut init --global --open
+
 # Force overwrite existing templates
 gut init --force
 
@@ -388,8 +404,15 @@ gut init --no-translate
 gut init --provider openai
 ```
 
+To open templates folder without initializing, use `gut config open --templates`.
+
 Templates are automatically translated to your configured language (set via `gut lang`).
 
+**Template precedence:**
+1. Project templates: `.gut/` (highest priority)
+2. Global templates: `~/.config/gut/templates/`
+3. Built-in templates (lowest priority)
+
 ### `gut gitignore`
 
 Generate a .gitignore file by analyzing your project structure.
@@ -466,26 +489,35 @@ API keys are stored securely using your operating system's native credential sto
 
 Keys are never stored in plain text files or configuration files. When you run `gut auth login`, the key is encrypted and managed by your OS.
 
-## Project Configuration
+## Template Configuration
+
+gut supports customizable templates at two levels:
+
+**Project templates** (`.gut/`): Repository-specific customizations that apply only to the current project.
+
+**Global templates** (`~/.config/gut/templates/`): User-wide defaults that apply across all projects.
+
+**Precedence**: Project > Global > Built-in
 
-gut looks for template files in your repository's `.gut/` folder. Each template uses `{{variable}}` syntax for dynamic content.
+Each template uses `{{variable}}` syntax for dynamic content.
 
 | File | Purpose |
 |------|---------|
-| `.gut/commit.md` | Commit message prompt |
-| `.gut/pr.md` | PR description prompt |
-| `.gut/branch.md` | Branch naming rules |
-| `.gut/checkout.md` | Checkout branch name prompt |
-| `.gut/merge.md` | Merge conflict resolution rules |
-| `.gut/review.md` | Code review criteria |
-| `.gut/explain.md` | Explanation context |
-| `.gut/explain-file.md` | File explanation context |
-| `.gut/find.md` | Commit search context |
-| `.gut/changelog.md` | Changelog format |
-| `.gut/stash.md` | Stash name prompt |
-| `.gut/summary.md` | Work summary format |
-| `.gut/gitignore.md` | Gitignore generation prompt |
-| `.github/pull_request_template.md` | GitHub PR template (prioritized over `.gut/pr.md`) |
+| `commit.md` | Commit message prompt |
+| `pr.md` | PR description prompt |
+| `branch.md` | Branch naming rules |
+| `checkout.md` | Checkout branch name prompt |
+| `merge.md` | Merge conflict resolution rules |
+| `review.md` | Code review criteria |
+| `explain.md` | Explanation context |
+| `explain-file.md` | File explanation context |
+| `find.md` | Commit search context |
+| `changelog.md` | Changelog format |
+| `stash.md` | Stash name prompt |
+| `summary.md` | Work summary format |
+| `gitignore.md` | Gitignore generation prompt |
+
+**Special case**: `.github/pull_request_template.md` is prioritized over `pr.md` for PR descriptions.
 
 ## Development
 

package/dist/index.js

@@ -90,6 +90,7 @@ 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",
@@ -106,10 +107,10 @@ var FALLBACK_ENV_MAP = {
   openai: "OPENAI_API_KEY",
   anthropic: "ANTHROPIC_API_KEY"
 };
-async function getKeytar() {
+function getKeytar() {
   try {
-    const keytar = await import("keytar");
-    return keytar.default || keytar;
+    const require2 = createRequire(import.meta.url);
+    return require2("keytar");
   } catch {
     return null;
   }
@@ -118,7 +119,7 @@ async function saveApiKey(provider, apiKey) {
   if (provider === "ollama") {
     throw new Error("Ollama does not require an API key");
   }
-  const keytar = await getKeytar();
+  const keytar = getKeytar();
   if (!keytar) {
     throw new Error("Keychain not available. Set environment variable instead.");
   }
@@ -132,7 +133,7 @@ async function getApiKey(provider) {
   if (envKey) return envKey;
   const fallbackKey = process.env[FALLBACK_ENV_MAP[provider]];
   if (fallbackKey) return fallbackKey;
-  const keytar = await getKeytar();
+  const keytar = getKeytar();
   if (!keytar) return null;
   return keytar.getPassword(SERVICE_NAME, PROVIDER_KEY_MAP[provider]);
 }
@@ -140,7 +141,7 @@ async function deleteApiKey(provider) {
   if (provider === "ollama") {
     throw new Error("Ollama does not use an API key");
   }
-  const keytar = await getKeytar();
+  const keytar = getKeytar();
   if (!keytar) {
     throw new Error("Keychain not available.");
   }
@@ -289,6 +290,7 @@ import { createOllama } from "ollama-ai-provider";
 import { z } from "zod";
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
 import { join as join2, dirname } from "path";
+import { homedir as homedir2 } from "os";
 import { fileURLToPath } from "url";
 
 // src/lib/config.ts
@@ -413,13 +415,27 @@ function loadTemplate(name) {
   }
   throw new Error(`Template not found: ${templatePath}`);
 }
-function findTemplate(repoRoot, templateName) {
-  const templatePath = join2(repoRoot, ".gut", `${templateName}.md`);
+function getGlobalTemplatesDir() {
+  return join2(homedir2(), ".config", "gut", "templates");
+}
+function findGlobalTemplate(templateName) {
+  const templatePath = join2(getGlobalTemplatesDir(), `${templateName}.md`);
   if (existsSync2(templatePath)) {
     return readFileSync2(templatePath, "utf-8");
   }
   return null;
 }
+function findTemplate(repoRoot, templateName) {
+  const projectTemplatePath = join2(repoRoot, ".gut", `${templateName}.md`);
+  if (existsSync2(projectTemplatePath)) {
+    return readFileSync2(projectTemplatePath, "utf-8");
+  }
+  const globalTemplate = findGlobalTemplate(templateName);
+  if (globalTemplate) {
+    return globalTemplate;
+  }
+  return null;
+}
 function applyTemplate(userTemplate, templateName, variables) {
   const langInstruction = getLanguageInstruction(getLanguage());
   let result = userTemplate || loadTemplate(templateName);
@@ -851,14 +867,14 @@ var commitCommand = new Command3("commit").description("Generate a commit messag
         console.log(chalk3.green("\u2713 Committed successfully"));
       } else if (answer.toLowerCase() === "e") {
         console.log(chalk3.gray("Opening editor..."));
-        const { execSync: execSync7 } = await import("child_process");
+        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);
-        execSync7(`${editor} "${tmpFile}"`, { stdio: "inherit" });
+        execSync9(`${editor} "${tmpFile}"`, { stdio: "inherit" });
         const editedMessage = fs2.readFileSync(tmpFile, "utf-8").trim();
         fs2.unlinkSync(tmpFile);
         if (editedMessage) {
@@ -2196,9 +2212,9 @@ var summaryCommand = new Command14("summary").description("Generate a work summa
     const output = options.markdown ? formatMarkdown(summary, author, since, options.until) : null;
     if (options.copy) {
       const textToCopy = output || formatMarkdown(summary, author, since, options.until);
-      const { execSync: execSync7 } = await import("child_process");
+      const { execSync: execSync9 } = await import("child_process");
       try {
-        execSync7("pbcopy", { input: textToCopy });
+        execSync9("pbcopy", { input: textToCopy });
         console.log(chalk15.green("Summary copied to clipboard!"));
         console.log();
       } catch {
@@ -2314,6 +2330,16 @@ 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";
+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") {
@@ -2362,6 +2388,39 @@ configCommand.command("list").description("List all configuration values").actio
     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";
@@ -2394,17 +2453,24 @@ var langCommand = new Command16("lang").description("Set or show output language
 import { Command as Command17 } from "commander";
 import chalk18 from "chalk";
 import ora14 from "ora";
-import { simpleGit as simpleGit14 } from "simple-git";
-import { existsSync as existsSync5, mkdirSync as mkdirSync2, readFileSync as readFileSync6, writeFileSync as writeFileSync3 } from "fs";
-import { join as join5, dirname as dirname2 } from "path";
+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 = join5(__dirname2, "..");
+var GUT_ROOT2 = join6(__dirname2, "..");
 var TEMPLATE_FILES = [
   "branch.md",
   "changelog.md",
@@ -2467,20 +2533,28 @@ Translated template:`
   });
   return text.trim();
 }
-var initCommand = new Command17("init").description("Initialize .gut/ templates in your project").option("-p, --provider <provider>", "AI provider for translation (gemini, openai, anthropic)", "gemini").option("-f, --force", "Overwrite existing templates").option("--no-translate", "Skip translation even if language is not English").action(async (options) => {
-  const git = simpleGit14();
-  const isRepo = await git.checkIsRepo();
-  if (!isRepo) {
-    console.error(chalk18.red("Error: Not a git repository"));
-    process.exit(1);
+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"));
+      process.exit(1);
+    }
+    const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
+    targetDir = join6(repoRoot.trim(), ".gut");
   }
-  const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
-  const targetDir = join5(repoRoot.trim(), ".gut");
-  const sourceDir = join5(GUT_ROOT2, ".gut");
-  if (!existsSync5(targetDir)) {
-    mkdirSync2(targetDir, { recursive: true });
+  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();
@@ -2492,12 +2566,12 @@ var initCommand = new Command17("init").description("Initialize .gut/ templates
   let copied = 0;
   let skipped = 0;
   for (const filename of TEMPLATE_FILES) {
-    const sourcePath = join5(sourceDir, filename);
-    const targetPath = join5(targetDir, filename);
-    if (!existsSync5(sourcePath)) {
+    const sourcePath = join6(sourceDir, filename);
+    const targetPath = join6(targetDir, filename);
+    if (!existsSync6(sourcePath)) {
       continue;
     }
-    if (existsSync5(targetPath) && !options.force) {
+    if (existsSync6(targetPath) && !options.force) {
       console.log(chalk18.gray(`  Skipped: ${filename} (already exists)`));
       skipped++;
       continue;
@@ -2521,21 +2595,37 @@ var initCommand = new Command17("init").description("Initialize .gut/ templates
   }
   console.log();
   if (copied > 0) {
-    console.log(chalk18.green(`\u2713 ${copied} template(s) initialized in .gut/`));
+    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)`));
   }
-  console.log(chalk18.gray("\nYou can now customize these templates for your project."));
+  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) {
+    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 simpleGit15 } from "simple-git";
-import { readdirSync as readdirSync2, readFileSync as readFileSync7, existsSync as existsSync6, writeFileSync as writeFileSync4 } from "fs";
-import { join as join6 } from "path";
+import { simpleGit as simpleGit16 } from "simple-git";
+import { readdirSync as readdirSync2, readFileSync as readFileSync7, existsSync as existsSync7, writeFileSync as writeFileSync4 } from "fs";
+import { join as join7 } from "path";
 var CONFIG_FILES = [
   // JavaScript/TypeScript
   "package.json",
@@ -2588,7 +2678,7 @@ function getFiles(dir, maxDepth = 3, currentDepth = 0) {
       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 = join6(dir, entry.name);
+      const fullPath = join7(dir, entry.name);
       if (entry.isDirectory()) {
         files.push(entry.name + "/");
         const subFiles = getFiles(fullPath, maxDepth, currentDepth + 1);
@@ -2610,15 +2700,15 @@ function findConfigFiles(repoRoot) {
         const entries = readdirSync2(repoRoot);
         for (const entry of entries) {
           if (entry.endsWith(ext)) {
-            const content = readFileSync7(join6(repoRoot, entry), "utf-8");
+            const content = readFileSync7(join7(repoRoot, entry), "utf-8");
             found.set(entry, content.slice(0, 2e3));
           }
         }
       } catch {
       }
     } else {
-      const filePath = join6(repoRoot, configFile);
-      if (existsSync6(filePath)) {
+      const filePath = join7(repoRoot, configFile);
+      if (existsSync7(filePath)) {
         try {
           const content = readFileSync7(filePath, "utf-8");
           found.set(configFile, content.slice(0, 2e3));
@@ -2630,7 +2720,7 @@ function findConfigFiles(repoRoot) {
   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 = simpleGit15();
+  const git = simpleGit16();
   const repoRoot = await git.revparse(["--show-toplevel"]).catch(() => process.cwd());
   const root = repoRoot.trim();
   const provider = options.provider.toLowerCase();
@@ -2641,9 +2731,9 @@ var gitignoreCommand = new Command18("gitignore").description("Generate .gitigno
   const spinner = ora15("Analyzing project structure...").start();
   const files = getFiles(root);
   const configFiles = findConfigFiles(root);
-  const gitignorePath = join6(root, options.output);
+  const gitignorePath = join7(root, options.output);
   let existingGitignore;
-  if (existsSync6(gitignorePath)) {
+  if (existsSync7(gitignorePath)) {
     existingGitignore = readFileSync7(gitignorePath, "utf-8");
   }
   let configFilesStr = "";
@@ -2678,7 +2768,7 @@ ${content}
     console.log(gitignoreContent);
     console.log(chalk19.gray("\u2500".repeat(50)));
     console.log();
-    if (existsSync6(gitignorePath) && !options.yes) {
+    if (existsSync7(gitignorePath) && !options.yes) {
       const readline = await import("readline");
       const rl = readline.createInterface({
         input: process.stdin,