difit 4.0.2 → 4.0.4

package/README.ja.md

@@ -140,6 +140,7 @@ git diff --cached | difit -
 | --------------------- | --------------- | ------------------------------------------------------------------------------------------ |
 | `<target>`            | HEAD            | コミットハッシュ、タグ、HEAD~n、ブランチ、または特別な引数                                 |
 | `[compare-with]`      | -               | 比較対象の2番目のコミット（2つの間のdiffを表示）                                           |
+| `--merge-base`        | false           | diff 計算前に `git merge-base` で基準側を解決する（Git revision モード専用）               |
 | `--pr <url>`          | -               | レビューするGitHub PRのURL（例：https://github.com/owner/repo/pull/123）                   |
 | `--comment <json>`    | -               | 起動時に初期コメントを注入（複数指定可。JSON object または array を受け付ける）            |
 | `--port`              | 4966            | 優先ポート。使用中の場合は+1にフォールバック                                               |

package/README.ko.md

@@ -140,6 +140,7 @@ git diff --cached | difit -
 | --------------------- | -------------- | --------------------------------------------------------------------------------------------- |
 | `<target>`            | HEAD           | 커밋 해시, 태그, HEAD~n, 브랜치 또는 특수 인수                                                |
 | `[compare-with]`      | -              | 비교할 선택적 두 번째 커밋 (둘 사이의 diff 표시)                                              |
+| `--merge-base`        | false          | diff 전에 `git merge-base` 로 기준 쪽을 해석 (Git revision 모드 전용)                         |
 | `--pr <url>`          | -              | 검토할 GitHub PR URL (예: https://github.com/owner/repo/pull/123)                             |
 | `--comment <json>`    | -              | 초기 코멘트 주입 (반복 가능; JSON object 또는 array 허용)                                     |
 | `--port`              | 4966           | 선호 포트; 사용 중인 경우 +1로 대체                                                           |

package/README.md

@@ -140,6 +140,7 @@ Stdin mode is selected with intent-first rules:
 | --------------------- | --------------- | ------------------------------------------------------------------------------------------------------- |
 | `<target>`            | HEAD            | Commit hash, tag, HEAD~n, branch, or special arguments                                                  |
 | `[compare-with]`      | -               | Optional second commit to compare with (shows diff between the two)                                     |
+| `--merge-base`        | false           | Resolve the base revision with `git merge-base` before diffing (Git revision mode only)                 |
 | `--pr <url>`          | -               | GitHub PR URL to review (e.g., https://github.com/owner/repo/pull/123)                                  |
 | `--comment <json>`    | -               | Inject initial comments (repeatable; accepts a JSON object or array)                                    |
 | `--port`              | 4966            | Preferred port; falls back to +1 if occupied                                                            |

package/README.zh.md

@@ -140,6 +140,7 @@ git diff --cached | difit -
 | --------------------- | -------------- | --------------------------------------------------------------------------------- |
 | `<target>`            | HEAD           | 提交哈希、标签、HEAD~n、分支或特殊参数                                            |
 | `[compare-with]`      | -              | 要比较的可选第二个提交（显示两者之间的差异）                                      |
+| `--merge-base`        | false          | 在 diff 前先用 `git merge-base` 解析基准 revision（仅限 Git revision 模式）       |
 | `--pr <url>`          | -              | 要审查的 GitHub PR URL（例如：https://github.com/owner/repo/pull/123）            |
 | `--comment <json>`    | -              | 注入初始评论（可重复指定；接受 JSON object 或 array）                             |
 | `--port`              | 4966           | 首选端口；如果被占用则回退到 +1                                                   |

package/dist/cli/index.js

@@ -4,6 +4,7 @@ import React from 'react';
 import { simpleGit } from 'simple-git';
 import pkg from '../../package.json' with { type: 'json' };
 import { startServer } from '../server/server.js';
+import { createDiffSelection } from '../utils/diffSelection.js';
 import { DiffMode } from '../types/watch.js';
 import { DEFAULT_DIFF_VIEW_MODE, normalizeDiffViewMode } from '../utils/diffMode.js';
 import { shouldReadStdin, findUntrackedFiles, markFilesIntentToAdd, promptUser, parseCommentOptions, validateDiffArguments, getGitRoot, } from './utils.js';
@@ -12,7 +13,24 @@ import { warnAboutTuiDeprecation } from './tuiDeprecation.js';
 function isSpecialArg(arg) {
     return arg === 'working' || arg === 'staged' || arg === '.';
 }
-function determineDiffMode(targetCommitish, compareWith) {
+function resolveDiffSelection(commitish, compareWith, mergeBase) {
+    let baseCommitish;
+    if (compareWith) {
+        baseCommitish = compareWith;
+    }
+    else if (commitish === 'working') {
+        baseCommitish = 'staged';
+    }
+    else if (isSpecialArg(commitish)) {
+        baseCommitish = 'HEAD';
+    }
+    else {
+        baseCommitish = commitish + '^';
+    }
+    return createDiffSelection(baseCommitish, commitish, mergeBase ? 'merge-base' : undefined);
+}
+function determineDiffMode(selection, compareWith) {
+    const { targetCommitish } = selection;
     // If comparing specific commits/branches (not involving HEAD), no watching needed
     // Exception: allow watching when targetCommitish is '.' even with compareWith
     if (compareWith && targetCommitish !== 'HEAD' && targetCommitish !== '.') {
@@ -48,6 +66,7 @@ program
     .option('--include-untracked', 'automatically include untracked files in diff')
     .option('--keep-alive', 'keep server running even after browser disconnects')
     .option('--context <lines>', 'number of context lines shown around each change', parseInt)
+    .option('--merge-base', 'resolve the base revision with git merge-base before diffing (Git revision mode only)')
     .action(async (commitish, compareWith, options) => {
     try {
         let stdinDiff;
@@ -72,6 +91,10 @@ program
                 console.error('Error: --pr option cannot be used with positional arguments');
                 process.exit(1);
             }
+            if (options.mergeBase) {
+                console.error('Error: --merge-base option cannot be used with --pr');
+                process.exit(1);
+            }
             if (options.tui) {
                 console.error('Error: --pr option cannot be used with --tui');
                 process.exit(1);
@@ -109,6 +132,10 @@ program
                     console.error('Error: --context option cannot be used with stdin diff');
                     process.exit(1);
                 }
+                if (options.mergeBase) {
+                    console.error('Error: --merge-base option cannot be used with stdin diff');
+                    process.exit(1);
+                }
                 // Read unified diff from stdin
                 stdinDiff = await readStdin();
                 if (!stdinDiff.trim()) {
@@ -146,27 +173,12 @@ program
             // If not in a git repository, fall back to process.cwd()
             repoPath = undefined;
         }
-        // Determine target and base commitish
-        let targetCommitish = commitish;
-        let baseCommitish;
-        if (compareWith) {
-            // If compareWith is provided, use it as base
-            baseCommitish = compareWith;
-        }
-        else {
-            // Handle special arguments
-            if (commitish === 'working') {
-                // working compares working directory with staging area
-                baseCommitish = 'staged';
-            }
-            else if (isSpecialArg(commitish)) {
-                baseCommitish = 'HEAD';
-            }
-            else {
-                baseCommitish = commitish + '^';
-            }
+        const selection = resolveDiffSelection(commitish, compareWith, options.mergeBase);
+        if (options.mergeBase && isSpecialArg(selection.baseCommitish)) {
+            console.error(`Error: --merge-base requires a commit-ish base, but resolved base was "${selection.baseCommitish}"`);
+            process.exit(1);
         }
-        if (commitish === 'working' || commitish === '.') {
+        if (selection.targetCommitish === 'working' || selection.targetCommitish === '.') {
             const git = simpleGit(repoPath);
             await handleUntrackedFiles(git, options.includeUntracked);
         }
@@ -186,22 +198,20 @@ program
             const { render } = await import('ink');
             const { default: TuiApp } = await import('../tui/App.js');
             render(React.createElement(TuiApp, {
-                targetCommitish,
-                baseCommitish,
+                selection,
                 mode: options.mode,
                 repoPath,
                 contextLines: options.context,
             }));
             return;
         }
-        const validation = validateDiffArguments(targetCommitish, compareWith);
+        const validation = validateDiffArguments(selection.targetCommitish, compareWith);
         if (!validation.valid) {
             console.error(`Error: ${validation.error}`);
             process.exit(1);
         }
         const { url, port, isEmpty } = await startServer({
-            targetCommitish,
-            baseCommitish,
+            selection,
             preferredPort: options.port,
             host: options.host,
             openBrowser: options.open,
@@ -209,12 +219,12 @@ program
             clearComments: options.clean,
             keepAlive: options.keepAlive,
             contextLines: options.context,
-            diffMode: determineDiffMode(targetCommitish, compareWith),
+            diffMode: determineDiffMode(selection, compareWith),
             repoPath,
             ...(commentImports.length > 0 ? { commentImports } : {}),
         });
         console.log(`\n🚀 difit server started on ${url}`);
-        console.log(`📋 Reviewing: ${targetCommitish}`);
+        console.log(`📋 Reviewing: ${selection.targetCommitish}`);
         if (options.keepAlive) {
             console.log('🔒 Keep-alive mode: server will stay running after browser disconnects');
         }