gut-cli 0.1.19 → 0.1.21

package/dist/lib/index.d.ts

@@ -9,11 +9,17 @@ declare function listProviders(): Promise<{
     hasKey: boolean;
 }[]>;
 
+type Language = 'en' | 'ja';
+declare function getLanguage(): Language;
+declare function setLanguage(lang: Language, local?: boolean): void;
+declare function getLanguageInstruction(lang: Language): string;
+
 interface AIOptions {
     provider: Provider;
     model?: string;
     ollamaBaseUrl?: string;
     apiKey?: string;
+    language?: Language;
 }
 /**
  * Find a user's project template from .gut/ folder
@@ -292,9 +298,4 @@ declare function generateGitignore(context: {
     existingGitignore?: string;
 }, options: AIOptions, template?: string): Promise<string>;
 
-type Language = 'en' | 'ja';
-declare function getLanguage(): Language;
-declare function setLanguage(lang: Language, local?: boolean): void;
-declare function getLanguageInstruction(lang: Language): string;
-
-export { type AIOptions, type Changelog, type CodeReview, type CommitSearchResult, type ConflictResolution, type Explanation, type Provider, type WorkSummary, deleteApiKey, findTemplate, generateBranchName, generateBranchNameFromDiff, generateChangelog, generateCodeReview, generateCommitMessage, generateExplanation, generateGitignore, generatePRDescription, generateStashName, generateWorkSummary, getApiKey, getLanguage, getLanguageInstruction, listProviders, resolveConflict, saveApiKey, searchCommits, setLanguage };
+export { type AIOptions, type Changelog, type CodeReview, type CommitSearchResult, type ConflictResolution, type Explanation, type Language, type Provider, type WorkSummary, deleteApiKey, findTemplate, generateBranchName, generateBranchNameFromDiff, generateChangelog, generateCodeReview, generateCommitMessage, generateExplanation, generateGitignore, generatePRDescription, generateStashName, generateWorkSummary, getApiKey, getLanguage, getLanguageInstruction, listProviders, resolveConflict, saveApiKey, searchCommits, setLanguage };

package/dist/lib/index.js

@@ -5,9 +5,9 @@ import { createOpenAI } from "@ai-sdk/openai";
 import { createAnthropic } from "@ai-sdk/anthropic";
 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 { existsSync, readFileSync } from "fs";
+import { join, dirname } from "path";
+import { homedir } from "os";
 import { fileURLToPath } from "url";
 
 // src/lib/credentials.ts
@@ -80,138 +80,42 @@ async function listProviders() {
   return results;
 }
 
-// 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(path) {
-  if (!existsSync(path)) return {};
-  try {
-    return JSON.parse(readFileSync(path, "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 "";
-  }
-}
-
 // src/lib/ai.ts
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = dirname(__filename);
 function findGutRoot() {
   let current = __dirname;
   for (let i = 0; i < 5; i++) {
-    const gutPath = join2(current, ".gut");
-    if (existsSync2(gutPath)) {
+    const gutPath = join(current, ".gut");
+    if (existsSync(gutPath)) {
       return current;
     }
     current = dirname(current);
   }
-  return join2(__dirname, "..");
+  return join(__dirname, "..");
 }
 var GUT_ROOT = findGutRoot();
 function loadTemplate(name) {
-  const templatePath = join2(GUT_ROOT, ".gut", `${name}.md`);
-  if (existsSync2(templatePath)) {
-    return readFileSync2(templatePath, "utf-8");
+  const templatePath = join(GUT_ROOT, ".gut", `${name}.md`);
+  if (existsSync(templatePath)) {
+    return readFileSync(templatePath, "utf-8");
   }
   throw new Error(`Template not found: ${templatePath}`);
 }
 function getGlobalTemplatesDir() {
-  return join2(homedir2(), ".config", "gut", "templates");
+  return join(homedir(), ".config", "gut", "templates");
 }
 function findGlobalTemplate(templateName) {
-  const templatePath = join2(getGlobalTemplatesDir(), `${templateName}.md`);
-  if (existsSync2(templatePath)) {
-    return readFileSync2(templatePath, "utf-8");
+  const templatePath = join(getGlobalTemplatesDir(), `${templateName}.md`);
+  if (existsSync(templatePath)) {
+    return readFileSync(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 projectTemplatePath = join(repoRoot, ".gut", `${templateName}.md`);
+  if (existsSync(projectTemplatePath)) {
+    return readFileSync(projectTemplatePath, "utf-8");
   }
   const globalTemplate = findGlobalTemplate(templateName);
   if (globalTemplate) {
@@ -219,19 +123,25 @@ function findTemplate(repoRoot, templateName) {
   }
   return null;
 }
-function applyTemplate(userTemplate, templateName, variables) {
-  const langInstruction = getLanguageInstruction(getLanguage());
-  let result = userTemplate || loadTemplate(templateName);
-  result = result.replace(/\{\{#(\w+)\}\}([\s\S]*?)\{\{\/\1\}\}/g, (_, key, content) => {
-    return variables[key] ? content : "";
-  });
-  for (const [key, value] of Object.entries(variables)) {
-    result = result.replace(new RegExp(`\\{\\{${key}\\}\\}`, "g"), value || "");
-  }
-  if (langInstruction) {
-    result += langInstruction;
+function buildPrompt(userTemplate, templateName, context, language, outputFormat) {
+  let contextXml = "<context>\n";
+  for (const [key, value] of Object.entries(context)) {
+    if (value) {
+      contextXml += `<${key}>
+${value}
+</${key}>
+`;
+    }
   }
-  return result;
+  contextXml += "</context>\n\n";
+  const template = userTemplate || loadTemplate(templateName);
+  const langInstruction = language === "ja" ? "\n\nIMPORTANT: Respond in Japanese (\u65E5\u672C\u8A9E\u3067\u56DE\u7B54\u3057\u3066\u304F\u3060\u3055\u3044)." : "";
+  const outputSection = outputFormat ? `
+
+<output-format>
+${outputFormat}
+</output-format>` : "";
+  return contextXml + "<instructions>\n" + template + langInstruction + "\n</instructions>" + outputSection;
 }
 var DEFAULT_MODELS = {
   gemini: "gemini-2.0-flash",
@@ -279,9 +189,9 @@ async function getModel(options) {
 }
 async function generateCommitMessage(diff, options, template) {
   const model = await getModel(options);
-  const prompt = applyTemplate(template, "commit", {
+  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,
@@ -291,12 +201,18 @@ async function generateCommitMessage(diff, options, template) {
 }
 async function generatePRDescription(context, options, template) {
   const model = await getModel(options);
-  const prompt = applyTemplate(template, "pr", {
+  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({
     model,
     prompt,
@@ -327,9 +243,9 @@ var CodeReviewSchema = z.object({
 });
 async function generateCodeReview(diff, options, template) {
   const model = await getModel(options);
-  const prompt = applyTemplate(template, "review", {
+  const prompt = buildPrompt(template, "review", {
     diff: diff.slice(0, 1e4)
-  });
+  }, options.language);
   const result = await generateObject({
     model,
     schema: CodeReviewSchema,
@@ -351,13 +267,13 @@ 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 = applyTemplate(template, "changelog", {
+  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,
@@ -385,10 +301,10 @@ var ExplanationSchema = z.object({
 async function generateExplanation(context, options, template) {
   const model = await getModel(options);
   if (context.type === "file-content") {
-    const prompt2 = applyTemplate(template, "explain-file", {
+    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,
@@ -422,11 +338,11 @@ Author: ${context.metadata.author}
 Date: ${context.metadata.date}`;
     targetType = "commit";
   }
-  const prompt = applyTemplate(template, "explain", {
+  const prompt = buildPrompt(template, "explain", {
     targetType,
-    context: contextInfo,
+    contextInfo,
     diff: context.diff?.slice(0, 12e3) || ""
-  });
+  }, options.language);
   const result = await generateObject({
     model,
     schema: ExplanationSchema,
@@ -446,11 +362,11 @@ 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 = applyTemplate(template, "find", {
+  const prompt = buildPrompt(template, "find", {
     query,
     commits: commitList,
     maxResults: String(maxResults)
-  });
+  }, options.language);
   const result = await generateObject({
     model,
     schema: CommitSearchSchema,
@@ -479,11 +395,11 @@ async function searchCommits(query, commits, options, maxResults = 5, template)
 }
 async function generateBranchName(description, options, context, template) {
   const model = await getModel(options);
-  const prompt = applyTemplate(template, "branch", {
+  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,
@@ -493,9 +409,9 @@ async function generateBranchName(description, options, context, template) {
 }
 async function generateBranchNameFromDiff(diff, options, template) {
   const model = await getModel(options);
-  const prompt = applyTemplate(template, "checkout", {
+  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,
@@ -505,9 +421,9 @@ async function generateBranchNameFromDiff(diff, options, template) {
 }
 async function generateStashName(diff, options, template) {
   const model = await getModel(options);
-  const prompt = applyTemplate(template, "stash", {
+  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,
@@ -537,13 +453,13 @@ 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 = applyTemplate(template, "summary", {
+  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,
@@ -559,12 +475,12 @@ async function generateWorkSummary(context, options, format = "custom", template
 }
 async function resolveConflict(conflictedContent, context, options, template) {
   const model = await getModel(options);
-  const prompt = applyTemplate(template, "merge", {
+  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,
@@ -574,11 +490,11 @@ async function resolveConflict(conflictedContent, context, options, template) {
 }
 async function generateGitignore(context, options, template) {
   const model = await getModel(options);
-  const prompt = applyTemplate(template, "gitignore", {
+  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,
@@ -586,6 +502,102 @@ async function generateGitignore(context, options, template) {
   });
   return result.text.trim();
 }
+
+// src/lib/config.ts
+import { homedir as homedir2 } from "os";
+import { join as join2 } from "path";
+import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, writeFileSync } from "fs";
+import { execSync } from "child_process";
+var DEFAULT_CONFIG = {
+  lang: "en"
+};
+function getGlobalConfigPath() {
+  const configDir = join2(homedir2(), ".config", "gut");
+  return join2(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 join2(repoRoot, ".gut", "config.json");
+}
+function ensureGlobalConfigDir() {
+  const configDir = join2(homedir2(), ".config", "gut");
+  if (!existsSync2(configDir)) {
+    mkdirSync(configDir, { recursive: true });
+  }
+}
+function ensureLocalConfigDir() {
+  const repoRoot = getRepoRoot();
+  if (!repoRoot) return;
+  const gutDir = join2(repoRoot, ".gut");
+  if (!existsSync2(gutDir)) {
+    mkdirSync(gutDir, { recursive: true });
+  }
+}
+function readConfigFile(path) {
+  if (!existsSync2(path)) return {};
+  try {
+    return JSON.parse(readFileSync2(path, "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 "";
+  }
+}
 export {
   deleteApiKey,
   findTemplate,