gut-cli 0.1.22 → 0.1.24

package/dist/lib/index.d.ts

@@ -1,5 +1,10 @@
 import { z } from 'zod';
 
+type Language = 'en' | 'ja';
+declare function getLanguage(): Language;
+declare function setLanguage(lang: Language, local?: boolean): void;
+declare function getLanguageInstruction(lang: Language): string;
+
 type Provider = 'gemini' | 'openai' | 'anthropic' | 'ollama';
 declare function saveApiKey(provider: Provider, apiKey: string): Promise<void>;
 declare function getApiKey(provider: Provider): Promise<string | null>;
@@ -9,11 +14,6 @@ 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;
@@ -61,7 +61,6 @@ declare const CodeReviewSchema: z.ZodObject<{
     }>, "many">;
     positives: z.ZodArray<z.ZodString, "many">;
 }, "strip", z.ZodTypeAny, {
-    summary: string;
     issues: {
         message: string;
         severity: "critical" | "warning" | "suggestion";
@@ -69,9 +68,9 @@ declare const CodeReviewSchema: z.ZodObject<{
         suggestion?: string | undefined;
         line?: number | undefined;
     }[];
+    summary: string;
     positives: string[];
 }, {
-    summary: string;
     issues: {
         message: string;
         severity: "critical" | "warning" | "suggestion";
@@ -79,6 +78,7 @@ declare const CodeReviewSchema: z.ZodObject<{
         suggestion?: string | undefined;
         line?: number | undefined;
     }[];
+    summary: string;
     positives: string[];
 }>;
 type CodeReview = z.infer<typeof CodeReviewSchema>;

package/dist/lib/index.js

@@ -1,14 +1,121 @@
 // 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";
+
+// src/lib/config.ts
+import { execSync } from "child_process";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { homedir } from "os";
-import { fileURLToPath } from "url";
+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 });
+  }
+}
+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).";
+    default:
+      return "";
+  }
+}
+function getConfiguredModel() {
+  return getConfig().model;
+}
+function getDefaultModel(provider) {
+  return DEFAULT_MODELS[provider] || DEFAULT_MODELS.gemini;
+}
 
 // src/lib/credentials.ts
 import { createRequire } from "module";
@@ -86,36 +193,36 @@ 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) {
@@ -141,16 +248,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);
@@ -189,9 +292,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,
@@ -199,34 +308,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"),
@@ -243,9 +347,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,
@@ -267,13 +376,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,
@@ -301,10 +415,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,
@@ -338,11 +457,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,
@@ -361,12 +485,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,
@@ -395,11 +526,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,
@@ -409,9 +546,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,
@@ -421,9 +564,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,
@@ -453,13 +602,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,
@@ -475,12 +629,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,
@@ -490,11 +649,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,
@@ -502,102 +667,6 @@ 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,