ai-git-tool 1.0.0 → 1.1.0

package/README.md

@@ -13,7 +13,7 @@ Groq API を使って、ステージ済み差分からコミットメッセー
 ### npm からインストール（推奨）
 
 ```bash
-npm install -g @imakento/ai-git
+npm install -g ai-git-tool
 ```
 
 ### ローカル開発版をリンク
@@ -44,17 +44,18 @@ API キーの取得先: [Groq Console](https://console.groq.com/keys)
 
 ### コミットメッセージ生成
 
-1. 先に変更をステージ
+1. コミットメッセージを生成
 
 ```bash
-git add .
+# 通常（タイトル + 箇条書き本文）
+ai-git commit
 ```
 
-2. コミットメッセージを生成
+`ai-git commit` はデフォルトで `git add .` を実行してから生成します。
 
 ```bash
-# 通常（タイトル + 箇条書き本文）
-ai-git commit
+# 自動 add を無効化（手動でステージした差分のみ使う）
+ai-git commit --no-add
 ```
 
 デフォルト言語は日本語です。
@@ -68,7 +69,7 @@ ai-git --set-lang en
 ai-git --set-lang ja
 ```
 
-3. 確認プロンプトで選択
+2. 確認プロンプトで選択
 
 - `y`: そのままコミット
 - `n`: 中止

package/dist/index.js

@@ -51,6 +51,7 @@ const subcommandArgs = args.slice(1);
 const showHelp = args.includes("--help") || args.includes("-h") || subcommand === "help";
 const setLangArg = getOptionValue(args, "--set-lang");
 const langArg = getOptionValue(subcommandArgs, "--lang");
+const noAdd = subcommandArgs.includes("--no-add");
 const CONFIG_DIR = path.join(os.homedir(), ".ai-commit");
 const CONFIG_PATH = path.join(CONFIG_DIR, "config.json");
 const defaultGroqModel = "llama-3.1-8b-instant";
@@ -78,6 +79,7 @@ Commands:
 
 Commit Options:
   --lang <ja|en>    Set language for this run
+  --no-add          Skip automatic git add .
 
 PR Options:
   --lang <ja|en>    Set language for this run
@@ -114,17 +116,69 @@ async function generateCommitMessage(diff) {
     const inputDiff = truncateByChars(diff, COMMIT_DIFF_COMPACT_CHARS);
     const prompt = buildPrompt(inputDiff, language);
     try {
-        return await generateText(prompt);
+        const raw = await generateText(prompt);
+        return normalizeGeneratedCommitMessage(raw, diff, language);
     }
     catch (error) {
         if (isRequestTooLargeError(error)) {
             const smallerDiff = truncateByChars(diff, 1800);
-            return generateText(buildPrompt(smallerDiff, language));
+            const retryRaw = await generateText(buildPrompt(smallerDiff, language));
+            return normalizeGeneratedCommitMessage(retryRaw, diff, language);
         }
         handleGroqError(error);
         process.exit(1);
     }
 }
+function normalizeGeneratedCommitMessage(raw, diff, lang) {
+    const lines = raw
+        .split("\n")
+        .map((line) => line.replace(/\s+$/g, ""))
+        .filter((_, idx, arr) => !(idx > 0 && arr[idx - 1] === "" && arr[idx] === ""));
+    if (lines.length === 0) {
+        return buildFallbackCommitMessage(diff, lang);
+    }
+    const subjectLine = lines[0]?.trim() || "";
+    const conventionalMatch = /^[a-z]+(\([^)]+\))?:\s+(.+)$/.exec(subjectLine);
+    const hasConventionalPrefix = Boolean(conventionalMatch);
+    const shortDescription = conventionalMatch?.[2]?.trim() || subjectLine;
+    if (!hasConventionalPrefix ||
+        looksLikePathOnly(shortDescription) ||
+        shortDescription.length < 8) {
+        lines[0] = buildFallbackSubjectLine(diff, lang);
+    }
+    return lines.join("\n").trim();
+}
+function looksLikePathOnly(value) {
+    const normalized = value.trim().toLowerCase();
+    if (!normalized) {
+        return false;
+    }
+    const hasPathToken = normalized.includes("/") || normalized.includes(".");
+    return hasPathToken && /^[a-z0-9/_\-.]+$/.test(normalized);
+}
+function buildFallbackCommitMessage(diff, lang) {
+    const subject = buildFallbackSubjectLine(diff, lang);
+    if (lang === "ja") {
+        return `${subject}\n\n- 差分の主目的を明確にし、変更理由が伝わる形に整える`;
+    }
+    return `${subject}\n\n- Clarify the main change intent so the reason is easy to understand`;
+}
+function buildFallbackSubjectLine(diff, lang) {
+    const files = getChangedFiles();
+    const type = inferBranchType(files, diff);
+    const rawTopic = inferTopic(files, diff);
+    const topic = rawTopic ? rawTopic.replace(/-/g, " ") : "";
+    if (lang === "ja") {
+        const description = topic
+            ? `${topic} の変更意図を分かりやすく整理する`
+            : "変更意図が伝わるように更新内容を整理する";
+        return `${type}: ${description}`;
+    }
+    const description = topic
+        ? `clarify the intent behind ${topic} changes`
+        : "clarify update intent in one clear sentence";
+    return `${type}: ${description}`;
+}
 function buildPrompt(diff, lang) {
     if (lang === "ja") {
         return `あなたは git のコミットメッセージ作成の専門家です。
@@ -208,6 +262,13 @@ function doCommit(message) {
         process.exit(1);
     }
 }
+function stageAllChanges() {
+    const result = (0, child_process_1.spawnSync)("git", ["add", "."], { stdio: "inherit" });
+    if (result.status !== 0) {
+        console.error("Error: git add . failed");
+        process.exit(1);
+    }
+}
 async function mainCheckout() {
     const suggested = await suggestBranchName();
     const branchName = ensureAvailableBranchName(suggested);
@@ -438,6 +499,10 @@ async function main() {
         await mainPR();
         return;
     }
+    if (!noAdd) {
+        console.log("📦 変更をステージしています... (git add .)");
+        stageAllChanges();
+    }
     const diff = getStagedDiff();
     if (!diff.trim()) {
         console.log("No staged changes found. Run `git add` first.");
@@ -770,10 +835,45 @@ function isRequestTooLargeError(error) {
         lower.includes("tokens per minute") ||
         lower.includes("tpm"));
 }
+function makePRTitle(description) {
+    const maxLen = 64;
+    const lines = description
+        .split("\n")
+        .map((v) => v.trim())
+        .filter(Boolean);
+    // Prefer the first sentence under ## Summary
+    const summaryIdx = lines.findIndex((l) => l.toLowerCase().startsWith("## summary"));
+    let candidate = "";
+    if (summaryIdx >= 0) {
+        const summaryLine = lines
+            .slice(summaryIdx + 1)
+            .find((l) => !l.startsWith("##"));
+        candidate = summaryLine || "";
+    }
+    if (!candidate) {
+        candidate = lines.find((l) => !l.startsWith("#") && !l.startsWith("-")) || "";
+    }
+    candidate = candidate
+        .replace(/^this pull request\s+(is|does)\s*/i, "")
+        .replace(/^この\s*pull request\s*は、?/i, "")
+        .replace(/^このprは、?/i, "")
+        .replace(/\s+/g, " ")
+        .trim();
+    // Trim at first sentence boundary when possible.
+    const sentenceCut = candidate.search(/[。.!?]/);
+    if (sentenceCut > 0) {
+        candidate = candidate.slice(0, sentenceCut);
+    }
+    if (!candidate) {
+        candidate = "Update project changes";
+    }
+    if (candidate.length > maxLen) {
+        candidate = `${candidate.slice(0, maxLen - 1).trimEnd()}…`;
+    }
+    return candidate;
+}
 function createPR(description, baseBranch, fallbackURL) {
-    // Extract title from first non-header line
-    const lines = description.split("\n");
-    const titleLine = lines.find((l) => l.trim() && !l.startsWith("#")) || "Pull Request";
+    const titleLine = makePRTitle(description);
     const result = (0, child_process_1.spawnSync)("gh", [
         "pr",
         "create",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-git-tool",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "AI-powered git commit and PR description generator using Groq API",
   "main": "dist/index.js",
   "bin": {