@335g/pi-git 0.0.2 → 0.0.4

package/dist/utils/settings.js

@@ -3,33 +3,31 @@
  *
  * Settings are stored in:
  * - Global: ~/.config/pi-git/settings.json
- * - Local:  <git-root>/.pi-git/settings.json (takes precedence)
+ * - Local:  <git-root>/pi-git.toml (takes precedence)
  */
 import { execSync } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
+import { parse as parseToml, stringify as stringifyToml } from "smol-toml";
 /** Metadata for all valid configuration keys */
 export const VALID_KEYS_META = [
     {
         key: "lang",
         type: "string",
-        description_ja: "表示・コミットメッセージの言語設定",
-        description_en: "Display and commit message language",
+        messageKey: "config.keyDesc.lang",
         valid_values: '"en" or "ja"',
     },
     {
         key: "auto_agg_commit",
         type: "boolean",
-        description_ja: "アシスタント応答後の自動コミット有無",
-        description_en: "Whether to automatically run git-agg-commit after assistant response",
+        messageKey: "config.keyDesc.auto_agg_commit",
         valid_values: "true or false",
     },
     {
         key: "analysis_model",
         type: "string",
-        description_ja: "diff分析に使用するAIモデル（形式: provider/model-id）",
-        description_en: "AI model to use for diff analysis (format: provider/model-id)",
+        messageKey: "config.keyDesc.analysis_model",
         valid_values: "e.g., anthropic/claude-3-5-sonnet-20241022",
     },
 ];
@@ -40,8 +38,8 @@ export const DEFAULT_SETTINGS = {
 };
 export const GLOBAL_CONFIG_DIR = join(homedir(), ".config", "pi-git");
 export const GLOBAL_SETTINGS_FILE = join(GLOBAL_CONFIG_DIR, "settings.json");
-const LOCAL_SETTINGS_DIR = ".pi-git";
-const LOCAL_SETTINGS_FILE = "settings.json";
+const LOCAL_SETTINGS_FILE = "pi-git.toml";
+const LEGACY_LOCAL_PATH = join(".pi-git", "settings.json");
 // ───────────────────────────────────────────────
 // File I/O helpers
 // ───────────────────────────────────────────────
@@ -68,7 +66,21 @@ export function getLocalSettingsPath(cwd) {
         }).trim();
         if (!repoRoot)
             return null;
-        return join(repoRoot, LOCAL_SETTINGS_DIR, LOCAL_SETTINGS_FILE);
+        return join(repoRoot, LOCAL_SETTINGS_FILE);
+    }
+    catch {
+        return null;
+    }
+}
+function loadToml(path) {
+    if (!existsSync(path))
+        return null;
+    try {
+        const raw = readFileSync(path, "utf-8");
+        const parsed = parseToml(raw);
+        if (typeof parsed !== "object" || parsed === null)
+            return null;
+        return parsed;
     }
     catch {
         return null;
@@ -77,7 +89,28 @@ export function getLocalSettingsPath(cwd) {
 function loadRaw(cwd) {
     const global = loadJson(GLOBAL_SETTINGS_FILE) ?? {};
     const localPath = getLocalSettingsPath(cwd);
-    const local = localPath ? loadJson(localPath) : null;
+    const local = localPath ? loadToml(localPath) : null;
+    // Detect legacy settings file and warn if found
+    if (!local && localPath) {
+        try {
+            const repoRoot = execSync("git rev-parse --show-toplevel", {
+                cwd,
+                encoding: "utf-8",
+                stdio: ["pipe", "pipe", "ignore"],
+            }).trim();
+            if (repoRoot) {
+                const legacyPath = join(repoRoot, LEGACY_LOCAL_PATH);
+                if (existsSync(legacyPath)) {
+                    console.warn("[pi-git] Found legacy .pi-git/settings.json. " +
+                        "Settings are now read from pi-git.toml. " +
+                        "Please migrate your settings manually or create pi-git.toml via /git-config.");
+                }
+            }
+        }
+        catch {
+            // ignore
+        }
+    }
     return { global, local };
 }
 function merge(global, local) {
@@ -137,15 +170,34 @@ export function saveGlobalSettings(settings) {
     writeFileSync(GLOBAL_SETTINGS_FILE, `${JSON.stringify(updated, null, 2)}\n`, "utf-8");
     cache.clear();
 }
+/**
+ * Create (or overwrite) pi-git.toml with DEFAULT_SETTINGS at the repo root.
+ *
+ * @param cwdOrPath - Working directory (to resolve git root) or an already-resolved
+ *   local settings path. If a path ending in "pi-git.toml" is passed, it is used directly
+ *   without re-running git rev-parse.
+ * @returns The written path, or null if not inside a git repo.
+ */
+export function initLocalSettings(cwdOrPath) {
+    const localPath = cwdOrPath?.endsWith("pi-git.toml")
+        ? cwdOrPath
+        : getLocalSettingsPath(cwdOrPath);
+    if (!localPath)
+        return null;
+    mkdirSync(dirname(localPath), { recursive: true });
+    writeFileSync(localPath, stringifyToml(DEFAULT_SETTINGS), "utf-8");
+    cache.clear();
+    return localPath;
+}
 export function saveLocalSettings(settings, cwd) {
     const localPath = getLocalSettingsPath(cwd);
     if (!localPath) {
         throw new Error("Not inside a git repository");
     }
     mkdirSync(dirname(localPath), { recursive: true });
-    const current = loadJson(localPath) ?? {};
+    const current = loadToml(localPath) ?? {};
     const updated = { ...current, ...settings };
-    writeFileSync(localPath, `${JSON.stringify(updated, null, 2)}\n`, "utf-8");
+    writeFileSync(localPath, stringifyToml(updated), "utf-8");
     cache.clear();
 }
 //# sourceMappingURL=settings.js.map

package/dist/utils/settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/utils/settings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/utils/settings.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@335g/pi-git",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Git utilities extension for pi-coding-agent",
   "type": "module",
   "main": "./dist/index.js",
@@ -45,7 +45,8 @@
   "devDependencies": {
     "@earendil-works/pi-tui": "^0.78.0",
     "@types/node": "^25.9.1",
-    "typescript": "^5.9.0"
+    "typescript": "^5.9.0",
+    "typescript-language-server": "^5.3.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": "*",
@@ -56,5 +57,8 @@
     "@earendil-works/pi-tui": {
       "optional": true
     }
+  },
+  "dependencies": {
+    "smol-toml": "^1.6.1"
   }
 }

package/dist/commands/branch.d.ts

@@ -1,8 +0,0 @@
-/**
- * /git-branch command
- *
- * Manage git branches: list, switch, create, and delete.
- */
-import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
-export declare function handleBranch(pi: ExtensionAPI, ctx: ExtensionCommandContext, args: string): Promise<void>;
-//# sourceMappingURL=branch.d.ts.map

package/dist/commands/branch.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"branch.d.ts","sourceRoot":"","sources":["../../src/commands/branch.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,YAAY,EACZ,uBAAuB,EACxB,MAAM,iCAAiC,CAAC;AAYzC,wBAAsB,YAAY,CAChC,EAAE,EAAE,YAAY,EAChB,GAAG,EAAE,uBAAuB,EAC5B,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAuHf"}

package/dist/commands/branch.js

@@ -1,197 +0,0 @@
-/**
- * /git-branch command
- *
- * Manage git branches: list, switch, create, and delete.
- */
-import { createAndSwitchBranch, deleteBranch, getBranches, getCurrentBranch, isGitRepository, switchBranch, } from "../core/git.js";
-import { isJapanese } from "../utils/lang.js";
-import { getSettings } from "../utils/settings.js";
-export async function handleBranch(pi, ctx, args) {
-    if (!ctx.hasUI) {
-        return;
-    }
-    const lang = getSettings(ctx.cwd).lang ?? "en";
-    const ja = isJapanese(lang);
-    if (!(await isGitRepository(pi, ctx.cwd))) {
-        ctx.ui.notify(ja ? "Gitリポジトリではありません" : "Not a git repository", "warning");
-        return;
-    }
-    const tokens = args.trim().split(/\s+/).filter(Boolean);
-    // Parse flags
-    let createNew = false;
-    let deleteFlag = false;
-    let listOnly = false;
-    let help = false;
-    const positional = [];
-    for (const token of tokens) {
-        if (token === "-c" || token === "--create")
-            createNew = true;
-        else if (token === "-d" || token === "--delete")
-            deleteFlag = true;
-        else if (token === "--list" || token === "-l")
-            listOnly = true;
-        else if (token === "--help" || token === "-h")
-            help = true;
-        else
-            positional.push(token);
-    }
-    if (help) {
-        const lines = ja
-            ? [
-                "/git-branch [<branch>] [-c|--create] [-d|--delete] [--list] [--help]",
-                "",
-                "ブランチを管理します。",
-                "",
-                "引数:",
-                "  <branch>        切り替えるブランチ名",
-                "",
-                "フラグ:",
-                "  -c, --create    新しいブランチを作成して切り替え",
-                "  -d, --delete    ブランチを削除（マージ済みのみ）",
-                "  --list, -l      ブランチ一覧を表示",
-                "  --help, -h      このヘルプを表示",
-                "",
-                "引数を省略すると、ブランチ一覧を表示します。",
-            ]
-            : [
-                "/git-branch [<branch>] [-c|--create] [-d|--delete] [--list] [--help]",
-                "",
-                "Manage git branches.",
-                "",
-                "Arguments:",
-                "  <branch>        Branch name to switch to",
-                "",
-                "Flags:",
-                "  -c, --create    Create a new branch and switch to it",
-                "  -d, --delete    Delete a branch (merged only)",
-                "  --list, -l      List all branches",
-                "  --help, -h      Show this help message",
-                "",
-                "Without arguments, lists all branches.",
-            ];
-        ctx.ui.notify(lines.join("\n"), "info");
-        return;
-    }
-    // List branches if no branch specified or --list flag
-    if (listOnly || (positional.length === 0 && !createNew && !deleteFlag)) {
-        await listBranches(pi, ctx, ja);
-        return;
-    }
-    const branchName = positional[0];
-    if (deleteFlag) {
-        // Delete branch
-        await handleDeleteBranch(pi, ctx, branchName, ja);
-    }
-    else if (createNew) {
-        // Create and switch to new branch
-        const result = await createAndSwitchBranch(pi, branchName, ctx.cwd);
-        if (result.success) {
-            ctx.ui.notify(ja
-                ? `新しいブランチ '${branchName}' を作成して切り替えました`
-                : `Created and switched to new branch '${branchName}'`, "info");
-        }
-        else {
-            ctx.ui.notify(ja
-                ? `ブランチの作成に失敗しました: ${result.message}`
-                : `Failed to create branch: ${result.message}`, "error");
-        }
-    }
-    else {
-        // Switch to existing branch
-        const result = await switchBranch(pi, branchName, ctx.cwd);
-        if (result.success) {
-            ctx.ui.notify(ja
-                ? `ブランチ '${branchName}' に切り替えました`
-                : `Switched to branch '${branchName}'`, "info");
-        }
-        else {
-            ctx.ui.notify(ja
-                ? `ブランチの切り替えに失敗しました: ${result.message}`
-                : `Failed to switch branch: ${result.message}`, "error");
-        }
-    }
-}
-async function handleDeleteBranch(pi, ctx, branchName, ja) {
-    // Check if trying to delete current branch
-    try {
-        const currentBranch = await getCurrentBranch(pi, ctx.cwd);
-        if (currentBranch === branchName) {
-            ctx.ui.notify(ja
-                ? `現在のブランチ '${branchName}' は削除できません。まず他のブランチに切り替えてください`
-                : `Cannot delete the current branch '${branchName}'. Please switch to another branch first`, "warning");
-            return;
-        }
-    }
-    catch (error) {
-        ctx.ui.notify(ja
-            ? `現在のブランチの取得に失敗しました: ${error instanceof Error ? error.message : String(error)}`
-            : `Failed to get current branch: ${error instanceof Error ? error.message : String(error)}`, "error");
-        return;
-    }
-    // Confirm deletion
-    const confirmTitle = ja ? "ブランチ削除の確認" : "Confirm Branch Deletion";
-    const confirmMessage = ja
-        ? `ブランチ '${branchName}' を削除してもよろしいですか？`
-        : `Are you sure you want to delete branch '${branchName}'?`;
-    const confirmed = await ctx.ui.confirm(confirmTitle, confirmMessage);
-    if (!confirmed) {
-        ctx.ui.notify(ja ? "削除をキャンセルしました" : "Deletion cancelled", "info");
-        return;
-    }
-    // Delete branch
-    const result = await deleteBranch(pi, branchName, ctx.cwd);
-    if (result.success) {
-        ctx.ui.notify(ja
-            ? `ブランチ '${branchName}' を削除しました`
-            : `Deleted branch '${branchName}'`, "info");
-    }
-    else {
-        ctx.ui.notify(ja
-            ? `ブランチの削除に失敗しました: ${result.message}`
-            : `Failed to delete branch: ${result.message}`, "error");
-    }
-}
-async function listBranches(pi, ctx, ja) {
-    try {
-        const currentBranch = await getCurrentBranch(pi, ctx.cwd);
-        const branches = await getBranches(pi, ctx.cwd);
-        const localBranches = branches.filter((b) => !b.isRemote);
-        const remoteBranches = branches.filter((b) => b.isRemote);
-        const lines = [];
-        if (ja) {
-            lines.push("ローカルブランチ:");
-            for (const branch of localBranches) {
-                const marker = branch.name === currentBranch ? "* " : "  ";
-                lines.push(`${marker}${branch.name}`);
-            }
-            if (remoteBranches.length > 0) {
-                lines.push("");
-                lines.push("リモートブランチ:");
-                for (const branch of remoteBranches) {
-                    lines.push(`  ${branch.name}`);
-                }
-            }
-        }
-        else {
-            lines.push("Local branches:");
-            for (const branch of localBranches) {
-                const marker = branch.name === currentBranch ? "* " : "  ";
-                lines.push(`${marker}${branch.name}`);
-            }
-            if (remoteBranches.length > 0) {
-                lines.push("");
-                lines.push("Remote branches:");
-                for (const branch of remoteBranches) {
-                    lines.push(`  ${branch.name}`);
-                }
-            }
-        }
-        ctx.ui.notify(lines.join("\n"), "info");
-    }
-    catch (error) {
-        ctx.ui.notify(ja
-            ? `ブランチ一覧の取得に失敗しました: ${error instanceof Error ? error.message : String(error)}`
-            : `Failed to list branches: ${error instanceof Error ? error.message : String(error)}`, "error");
-    }
-}
-//# sourceMappingURL=branch.js.map

package/dist/commands/branch.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"branch.js","sourceRoot":"","sources":["../../src/commands/branch.ts"],"names":[],"mappings":"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"}

package/dist/commands/git-diff.d.ts

@@ -1,10 +0,0 @@
-/**
- * /git-diff command
- *
- * Interactive diff review with sequential hunk approval.
- * Allows reviewing AI-generated hunks, viewing diffs, editing messages,
- * and committing approved hunks one at a time.
- */
-import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
-export declare function handleGitDiff(pi: ExtensionAPI, ctx: ExtensionCommandContext, args: string): Promise<void>;
-//# sourceMappingURL=git-diff.d.ts.map

package/dist/commands/git-diff.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"git-diff.d.ts","sourceRoot":"","sources":["../../src/commands/git-diff.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EACV,YAAY,EACZ,uBAAuB,EACxB,MAAM,iCAAiC,CAAC;AAoDzC,wBAAsB,aAAa,CACjC,EAAE,EAAE,YAAY,EAChB,GAAG,EAAE,uBAAuB,EAC5B,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CA+Qf"}

package/dist/commands/git-diff.js

@@ -1,228 +0,0 @@
-/**
- * /git-diff command
- *
- * Interactive diff review with sequential hunk approval.
- * Allows reviewing AI-generated hunks, viewing diffs, editing messages,
- * and committing approved hunks one at a time.
- */
-import { analyzeDiff, parseDiffStats, processHunks, splitDiffByFile, } from "../core/diff-analyzer.js";
-import { collectDiff, ensureReadyToCommit, resetStaging, stageFiles, } from "../core/git.js";
-import { isJapanese } from "../utils/lang.js";
-import { getLanguage } from "../utils/settings.js";
-import { footerManager } from "../utils/footer-manager.js";
-import { HunkReviewComponent, } from "../tui/hunk-review.js";
-/**
- * Review a single hunk using the TUI component
- */
-async function reviewHunk(ctx, hunk, hunkIndex, totalHunks, fileStats, fileDiffs) {
-    if (!ctx.hasUI) {
-        return { type: "quit" };
-    }
-    return await ctx.ui.custom((tui, theme, _keybindings, done) => {
-        const component = new HunkReviewComponent(hunk, hunkIndex, totalHunks, fileStats, fileDiffs, tui, theme, done);
-        return component;
-    });
-}
-export async function handleGitDiff(pi, ctx, args) {
-    const lang = getLanguage(ctx.cwd);
-    const ja = isJapanese(lang);
-    if (/--help/.test(args)) {
-        const lines = ja
-            ? [
-                "/git-diff [--help]",
-                "",
-                "AIが生成したhunkを対話的にレビューし、承認したものをコミットします。",
-                "",
-                "オプション:",
-                "  --help  このヘルプを表示",
-                "",
-                "操作:",
-                "  ↑↓        ファイル間を移動",
-                "  Enter     選択したファイルのdiffを表示",
-                "  a         hunkを承認してコミット",
-                "  e         コミットメッセージを編集",
-                "  s         hunkをスキップ",
-                "  x         選択したファイルをhunkから除外",
-                "  q         終了",
-            ]
-            : [
-                "/git-diff [--help]",
-                "",
-                "Interactively review AI-generated hunks and commit approved ones.",
-                "",
-                "Options:",
-                "  --help  Show this help message",
-                "",
-                "Controls:",
-                "  ↑↓        Navigate between files",
-                "  Enter     View diff for selected file",
-                "  a         Approve and commit hunk",
-                "  e         Edit commit message",
-                "  s         Skip hunk",
-                "  x         Exclude selected file from hunk",
-                "  q         Quit",
-            ];
-        if (ctx.hasUI) {
-            ctx.ui.notify(lines.join("\n"), "info");
-        }
-        return;
-    }
-    if (!ctx.hasUI) {
-        return;
-    }
-    // Check if agg-commit is running
-    if (footerManager.isRunning()) {
-        ctx.ui.notify(ja
-            ? "git-agg-commit 実行中です。完了してから再度実行してください。"
-            : "git-agg-commit is already running. Please wait for it to complete.", "warning");
-        return;
-    }
-    await footerManager.setRunning("diff", "prepare");
-    try {
-        const preCheck = await ensureReadyToCommit(pi, ctx.cwd);
-        if (preCheck) {
-            await footerManager.clearRunning();
-            ctx.ui.notify(preCheck === "not_git_repo"
-                ? ja ? "Gitリポジトリではありません" : "Not a git repository"
-                : ja ? "コミットする変更がありません" : "No changes to commit", preCheck === "not_git_repo" ? "warning" : "info");
-            return;
-        }
-        // Collect diff via stash to freeze the working tree
-        await footerManager.setPhase("collectDiff");
-        const diff = await collectDiff(pi, ctx.cwd);
-        if (diff === null) {
-            await footerManager.clearRunning();
-            ctx.ui.notify(ja ? "変更のstashに失敗しました" : "Failed to stash changes", "warning");
-            return;
-        }
-        if (!diff.trim()) {
-            await footerManager.clearRunning();
-            ctx.ui.notify(ja ? "コミットする変更がありません" : "No changes to commit", "info");
-            return;
-        }
-        // Parse diff by file
-        const fileDiffs = splitDiffByFile(diff);
-        const fileStats = parseDiffStats(diff);
-        // Analyze diff into hunks
-        await footerManager.setPhase("analyze");
-        let hunks = await analyzeDiff(pi, ctx, diff, lang);
-        if (hunks.length === 0) {
-            await footerManager.clearRunning();
-            ctx.ui.notify(ja ? "コミット可能なhunkがありません" : "No hunks found to commit", "info");
-            return;
-        }
-        // Sanitize, deduplicate, and filter hunks
-        hunks = processHunks(hunks);
-        await footerManager.clearRunning();
-        // Review each hunk sequentially
-        const unassignedFiles = [];
-        let committedCount = 0;
-        let skippedCount = 0;
-        let quitRequested = false;
-        for (let i = 0; i < hunks.length; i++) {
-            const hunk = hunks[i];
-            let currentMessage = hunk.message;
-            // Review loop (for message editing)
-            while (true) {
-                const action = await reviewHunk(ctx, { ...hunk, message: currentMessage }, i, hunks.length, fileStats, fileDiffs);
-                if (action.type === "quit") {
-                    // Add current and remaining hunks' files to unassigned
-                    for (let j = i; j < hunks.length; j++) {
-                        unassignedFiles.push(...hunks[j].files);
-                    }
-                    quitRequested = true;
-                    break;
-                }
-                if (action.type === "edit_message") {
-                    // Edit message using pi's built-in input dialog (IME-supported)
-                    const newMessage = await ctx.ui.input(ja ? "コミットメッセージを編集:" : "Edit commit message:", action.currentMessage);
-                    if (newMessage && newMessage.trim()) {
-                        currentMessage = newMessage.trim();
-                    }
-                    // Continue loop to re-show the hunk with updated message
-                    continue;
-                }
-                if (action.type === "skip") {
-                    // Add non-excluded files to unassigned
-                    const files = hunk.files.filter((f) => !action.excludedFiles.includes(f));
-                    unassignedFiles.push(...files, ...action.excludedFiles);
-                    skippedCount++;
-                    break;
-                }
-                if (action.type === "approve") {
-                    // Stage and commit non-excluded files
-                    const files = hunk.files.filter((f) => !action.excludedFiles.includes(f));
-                    if (files.length === 0) {
-                        ctx.ui.notify(ja
-                            ? "コミットするファイルがありません"
-                            : "No files to commit", "warning");
-                        break;
-                    }
-                    try {
-                        await stageFiles(pi, files, ctx.cwd);
-                    }
-                    catch (error) {
-                        ctx.ui.notify(ja
-                            ? `ファイルのステージに失敗しました: ${error instanceof Error ? error.message : String(error)}`
-                            : `Failed to stage files: ${error instanceof Error ? error.message : String(error)}`, "error");
-                        break;
-                    }
-                    const { code: exitCode, stderr } = await pi.exec("git", ["commit", "-m", action.message], { cwd: ctx.cwd });
-                    if (exitCode !== 0) {
-                        try {
-                            await resetStaging(pi, ctx.cwd);
-                        }
-                        catch {
-                            // Ignore reset errors
-                        }
-                        const detail = stderr.trim() ? ` — ${stderr.trim()}` : "";
-                        ctx.ui.notify(ja
-                            ? `コミットに失敗しました: "${action.message}" (exit code ${exitCode})${detail}。ステージをリセットしました。`
-                            : `Commit failed for "${action.message}" (exit code ${exitCode}).${detail} Staging has been reset.`, "warning");
-                        break;
-                    }
-                    committedCount++;
-                    // Add excluded files to unassigned
-                    unassignedFiles.push(...action.excludedFiles);
-                    break;
-                }
-            }
-            if (quitRequested)
-                break;
-        }
-        // Show summary
-        const parts = [];
-        if (committedCount > 0) {
-            parts.push(ja
-                ? `${committedCount}個のhunkをコミットしました`
-                : `Committed ${committedCount} hunk${committedCount > 1 ? "s" : ""}`);
-        }
-        if (skippedCount > 0) {
-            parts.push(ja
-                ? `${skippedCount}個のhunkをスキップしました`
-                : `Skipped ${skippedCount} hunk${skippedCount > 1 ? "s" : ""}`);
-        }
-        if (parts.length > 0) {
-            ctx.ui.notify(parts.join(", "), "info");
-        }
-        // Show unassigned files
-        if (unassignedFiles.length > 0) {
-            const lines = ja
-                ? [
-                    "",
-                    `⚠ ${unassignedFiles.length}個のファイルが未割り当てです:`,
-                    ...unassignedFiles.map((f) => `  ${f}`),
-                ]
-                : [
-                    "",
-                    `⚠ ${unassignedFiles.length} file${unassignedFiles.length > 1 ? "s" : ""} remain unassigned:`,
-                    ...unassignedFiles.map((f) => `  ${f}`),
-                ];
-            ctx.ui.notify(lines.join("\n"), "info");
-        }
-    }
-    finally {
-        await footerManager.clearRunning();
-    }
-}
-//# sourceMappingURL=git-diff.js.map