ai-git-tool 1.3.0 → 1.5.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Imamura Kento
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,6 +1,8 @@
 # ai-git-tool
 
-Groq API を使って、ステージ済み差分からコミットメッセージと PR 説明文を自動生成する TypeScript 製 CLI です。
+AIを使って、ステージ済み差分からコミットメッセージと PR 説明文を自動生成する TypeScript 製 CLI です。
+
+<video src="https://github.com/user-attachments/assets/c3826580-eb80-409a-b3fc-cc19f006cceb" />　　
 
 ## セットアップ
 
@@ -165,6 +167,19 @@ fix/api-error-handling
 docs/readme-update
 ```
 
+### ブランチ切り替え + 最新化
+
+既存ブランチ名を引数に渡すと、ブランチへ移動してから `git pull` で最新化します。
+
+```bash
+ai-git checkout main
+```
+
+実行内容:
+
+- `git checkout <branch>`
+- `git pull`
+
 ### 言語設定
 
 デフォルト言語は日本語です。

package/dist/commands/checkout.js

@@ -8,7 +8,33 @@ const branch_js_1 = require("../services/branch.js");
 /**
  * checkout コマンドの実行
  */
-async function runCheckoutCommand() {
+async function runCheckoutCommand(targetBranch) {
+    if (targetBranch) {
+        const checkoutResult = (0, child_process_1.spawnSync)("git", ["checkout", targetBranch], {
+            stdio: "inherit",
+        });
+        if (checkoutResult.status !== 0) {
+            (0, errors_js_1.showFriendlyError)(`ブランチへの移動に失敗しました: ${targetBranch}`, "git checkout コマンドが失敗しました", [
+                `ブランチが存在するか確認: git branch -a | grep ${targetBranch}`,
+                "現在の変更を確認: git status",
+                "未コミット変更がある場合は commit または stash を実施",
+            ], [`手動で移動: git checkout ${targetBranch}`]);
+            process.exit(1);
+        }
+        console.log(`✅ ブランチに移動しました: ${targetBranch}`);
+        console.log(`🔄 最新を取得中... (${targetBranch})`);
+        const pullResult = (0, child_process_1.spawnSync)("git", ["pull"], { stdio: "inherit" });
+        if (pullResult.status !== 0) {
+            (0, errors_js_1.showFriendlyError)(`pull に失敗しました: ${targetBranch}`, "git pull コマンドが失敗しました（競合や upstream 未設定の可能性があります）", [
+                "upstream を確認: git branch -vv",
+                "必要なら upstream を設定: git branch --set-upstream-to=origin/<branch>",
+                "競合がある場合は解消してから再実行",
+            ], [`手動で実行: git pull origin ${targetBranch}`]);
+            process.exit(1);
+        }
+        console.log(`✅ 最新状態に更新しました: ${targetBranch}`);
+        return;
+    }
     const suggested = await (0, ai_js_1.suggestBranchName)();
     const branchName = (0, branch_js_1.ensureAvailableBranchName)(suggested);
     const result = (0, child_process_1.spawnSync)("git", ["checkout", "-b", branchName], {

package/dist/commands/pr.js

@@ -37,6 +37,8 @@ async function runPRCommand(language) {
         }
         process.exit(1);
     }
+    // ベースブランチとの同期（コンフリクトチェック・マージ）
+    await (0, github_js_1.syncWithBaseBranch)(baseBranch, currentBranch, language);
     // ブランチをプッシュ
     (0, github_js_1.pushBranchForPR)(currentBranch, language);
     console.log(`🤖 PR説明文を生成中... (${baseBranch}...${currentBranch}) [compact summary input]`);

package/dist/index.js

@@ -34,7 +34,7 @@ Commands:
   commit            Generate commit message from staged changes
   push              Commit with AI message and push to remote (git add . + commit + push)
   pr                Generate PR description and create pull request
-  checkout          Create branch from current changes
+  checkout [branch] Create branch from changes, or switch+pull existing branch
 
 Commit Options:
   --lang <ja|en>    Set language for this run
@@ -64,7 +64,7 @@ if (!subcommand ||
     console.error("   ai-git commit   - AI でコミットメッセージを生成してコミット");
     console.error("   ai-git push     - コミット後、リモートにプッシュ");
     console.error("   ai-git pr       - PR の説明を生成して Pull Request を作成");
-    console.error("   ai-git checkout - 変更内容から新しいブランチを作成");
+    console.error("   ai-git checkout - 引数なし: 新規ブランチ作成 / 引数あり: ブランチ移動して pull");
     console.error("");
     console.error("💡 詳しい使い方:");
     console.error("   ai-git --help");
@@ -78,7 +78,7 @@ const language = (0, config_js_1.resolveLanguage)(langArg);
 // ── メイン ───────────────────────────────────────────────
 async function main() {
     if (subcommand === "checkout") {
-        await (0, checkout_js_1.runCheckoutCommand)();
+        await (0, checkout_js_1.runCheckoutCommand)(subcommandArgs[0]);
         return;
     }
     if (subcommand === "pr") {

package/dist/services/github.js

@@ -8,8 +8,11 @@ exports.parseGitHubRepoPath = parseGitHubRepoPath;
 exports.getPullRequestURL = getPullRequestURL;
 exports.createPR = createPR;
 exports.pushBranchForPR = pushBranchForPR;
+exports.checkConflicts = checkConflicts;
+exports.syncWithBaseBranch = syncWithBaseBranch;
 const child_process_1 = require("child_process");
 const errors_js_1 = require("../utils/errors.js");
+const ui_js_1 = require("../utils/ui.js");
 /**
  * GitHub CLI がインストールされているかチェック
  */
@@ -330,3 +333,147 @@ function pushBranchForPR(currentBranch, language) {
         }
     }
 }
+/**
+ * コンフリクトがあるかを非破壊的に検知
+ */
+function checkConflicts(baseBranch) {
+    try {
+        const mergeBase = (0, child_process_1.execSync)(`git merge-base HEAD origin/${baseBranch}`, {
+            encoding: "utf-8",
+            stdio: "pipe",
+        }).trim();
+        const mergeTreeOutput = (0, child_process_1.execSync)(`git merge-tree ${mergeBase} origin/${baseBranch} HEAD`, {
+            encoding: "utf-8",
+            stdio: "pipe",
+        });
+        return mergeTreeOutput.includes("<<<<<<<");
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * ベースブランチとの同期処理（PR作成前）
+ */
+async function syncWithBaseBranch(baseBranch, currentBranch, language) {
+    console.log(language === "ja"
+        ? `🔄 ${baseBranch} との同期を確認中...`
+        : `🔄 Checking sync with ${baseBranch}...`);
+    // 最新を取得
+    try {
+        (0, child_process_1.execSync)(`git fetch origin ${baseBranch}`, { stdio: "pipe" });
+    }
+    catch {
+        if (language === "ja") {
+            (0, errors_js_1.showFriendlyError)("リモートブランチの取得に失敗しました", `origin/${baseBranch} を取得できませんでした`, [
+                "ネットワーク接続を確認してください",
+                "リモートリポジトリの設定を確認: git remote -v",
+                `リモートに ${baseBranch} ブランチが存在するか確認`,
+            ], ["接続を確認後に ai-git pr を再実行"]);
+        }
+        else {
+            (0, errors_js_1.showFriendlyError)("Failed to fetch remote branch", `Could not fetch origin/${baseBranch}`, [
+                "Check network connection",
+                "Check remote repository: git remote -v",
+                `Check if ${baseBranch} branch exists on remote`,
+            ], ["Run ai-git pr again after fixing connection"]);
+        }
+        process.exit(1);
+    }
+    // コンフリクトチェック
+    const hasConflicts = checkConflicts(baseBranch);
+    if (!hasConflicts) {
+        // コンフリクトなし → 自動的にマージ
+        console.log(language === "ja"
+            ? `✅ コンフリクトなし - origin/${baseBranch} をマージ中...`
+            : `✅ No conflicts - merging origin/${baseBranch}...`);
+        const mergeResult = (0, child_process_1.spawnSync)("git", ["merge", `origin/${baseBranch}`], {
+            stdio: "inherit",
+        });
+        if (mergeResult.status !== 0) {
+            if (language === "ja") {
+                (0, errors_js_1.showFriendlyError)("マージに失敗しました", `origin/${baseBranch} のマージ中にエラーが発生しました`, [
+                    "Git の状態を確認: git status",
+                    "マージを中止する場合: git merge --abort",
+                ], ["問題を解決後に ai-git pr を再実行"]);
+            }
+            else {
+                (0, errors_js_1.showFriendlyError)("Merge failed", `Error occurred while merging origin/${baseBranch}`, ["Check git status: git status", "Abort merge: git merge --abort"], ["Run ai-git pr again after fixing"]);
+            }
+            process.exit(1);
+        }
+        console.log(language === "ja"
+            ? `✅ origin/${baseBranch} をマージしました`
+            : `✅ Merged origin/${baseBranch}`);
+        return;
+    }
+    // コンフリクトあり → 選択肢を提示
+    console.log(language === "ja"
+        ? `⚠️  origin/${baseBranch} とのコンフリクトを検知しました`
+        : `⚠️  Conflicts detected with origin/${baseBranch}`);
+    const choices = language === "ja"
+        ? `次の操作を選択してください:
+  [m] merge origin/${baseBranch} してコンフリクトを解消してからPR作成
+  [r] rebase onto origin/${baseBranch} してコンフリクトを解消してからPR作成
+  [s] スキップ（そのままPR作成）
+  [a] 中止
+選択 [m/r/s/a]: `
+        : `Choose an action:
+  [m] merge origin/${baseBranch} and resolve conflicts before creating PR
+  [r] rebase onto origin/${baseBranch} and resolve conflicts before creating PR
+  [s] skip (create PR anyway)
+  [a] abort
+Choice [m/r/s/a]: `;
+    const choice = await (0, ui_js_1.askUser)(choices);
+    if (choice === "m" || choice === "merge") {
+        console.log(language === "ja"
+            ? `🔀 origin/${baseBranch} をマージ中...`
+            : `🔀 Merging origin/${baseBranch}...`);
+        const result = (0, child_process_1.spawnSync)("git", ["merge", `origin/${baseBranch}`], {
+            stdio: "inherit",
+        });
+        if (result.status !== 0) {
+            if (language === "ja") {
+                console.log(`\n⚠️  コンフリクトを解消してください。解消後、以下を実行:`);
+                console.log(`   git add .`);
+                console.log(`   git commit`);
+                console.log(`   ai-git pr\n`);
+            }
+            else {
+                console.log(`\n⚠️  Please resolve conflicts. After resolving, run:`);
+                console.log(`   git add .`);
+                console.log(`   git commit`);
+                console.log(`   ai-git pr\n`);
+            }
+            process.exit(1);
+        }
+    }
+    else if (choice === "r" || choice === "rebase") {
+        console.log(language === "ja"
+            ? `🔀 origin/${baseBranch} へ rebase 中...`
+            : `🔀 Rebasing onto origin/${baseBranch}...`);
+        const result = (0, child_process_1.spawnSync)("git", ["rebase", `origin/${baseBranch}`], {
+            stdio: "inherit",
+        });
+        if (result.status !== 0) {
+            if (language === "ja") {
+                console.log(`\n⚠️  コンフリクトを解消してください。解消後、以下を実行:`);
+                console.log(`   git add .`);
+                console.log(`   git rebase --continue`);
+                console.log(`   ai-git pr\n`);
+            }
+            else {
+                console.log(`\n⚠️  Please resolve conflicts. After resolving, run:`);
+                console.log(`   git add .`);
+                console.log(`   git rebase --continue`);
+                console.log(`   ai-git pr\n`);
+            }
+            process.exit(1);
+        }
+    }
+    else if (choice === "a" || choice === "abort") {
+        console.log(language === "ja" ? "中止しました。" : "Aborted.");
+        process.exit(0);
+    }
+    // 's' または 'skip' の場合はそのまま続行
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-git-tool",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "AI-powered git commit and PR description generator using Groq API",
   "main": "dist/index.js",
   "bin": {
@@ -9,7 +9,10 @@
   "scripts": {
     "build": "tsc",
     "dev": "tsx src/index.ts",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "release:patch": "npm version patch && git push --follow-tags",
+    "release:minor": "npm version minor && git push --follow-tags",
+    "release:major": "npm version major && git push --follow-tags"
   },
   "keywords": [
     "git",