difit 3.1.7 → 3.1.9

package/README.ja.md

@@ -32,7 +32,6 @@ difit  # 最新コミットのdiffをWebUIで表示
 ```bash
 difit <target>                    # 単一コミットのdiffを表示
 difit <target> [compare-with]     # 2つのコミット/ブランチを比較
-difit --pr <github-pr-url>        # GitHubプルリクエストをレビュー
 ```
 
 ### 単一コミットのレビュー
@@ -97,8 +96,17 @@ git diff --merge-base main feature | difit
 
 # 既存ファイル全体を新規追加として確認
 git diff -- /dev/null path/to/file | difit
+
+# 明示的に標準入力モードを使う
+git diff --cached | difit -
 ```
 
+標準入力モードは、意図を優先して次のルールで選択されます。
+
+- `-` を指定した場合は常に標準入力モード
+- positional 引数（`<target>` / `[compare-with]`）、`--pr`、`--tui` のいずれかがある場合は Git/PR/TUI モードとして扱い、標準入力を自動読み取りしない
+- 明示モード指定がない場合のみ、stdin が pipe/file/socket のときに自動で標準入力モードになる
+
 ## ⚙️ CLIオプション
 
 | フラグ                | デフォルト | 説明                                                                              |

package/README.ko.md

@@ -32,7 +32,6 @@ difit  # WebUI에서 최신 커밋 diff 보기
 ```bash
 difit <target>                    # 단일 커밋 diff 보기
 difit <target> [compare-with]     # 두 커밋/브랜치 비교
-difit --pr <github-pr-url>        # GitHub 풀 리퀘스트 검토
 ```
 
 ### 단일 커밋 검토
@@ -97,8 +96,17 @@ git diff --merge-base main feature | difit
 
 # 기존 파일 전체를 신규 추가처럼 검토
 git diff -- /dev/null path/to/file | difit
+
+# 명시적 표준 입력 모드
+git diff --cached | difit -
 ```
 
+표준 입력 모드는 의도 우선 규칙으로 선택됩니다:
+
+- `-`를 지정하면 표준 입력 모드가 명시적으로 활성화됩니다
+- positional 인수(`<target>` / `[compare-with]`), `--pr`, `--tui` 중 하나라도 지정되면 Git/PR/TUI 모드로 처리하고 stdin 자동 읽기를 하지 않습니다
+- 명시적 모드 지정이 없고 stdin이 pipe/file/socket 인 경우에만 자동으로 표준 입력 모드가 됩니다
+
 ## ⚙️ CLI 옵션
 
 | 플래그                | 기본값    | 설명                                                              |

package/README.md

@@ -32,7 +32,6 @@ difit  # View the latest commit diff in WebUI
 ```bash
 difit <target>                    # View single commit diff
 difit <target> [compare-with]     # Compare two commits/branches
-difit --pr <github-pr-url>        # Review GitHub pull request
 ```
 
 ### Single commit review
@@ -97,8 +96,17 @@ git diff --merge-base main feature | difit
 
 # Review an entire existing file as newly added
 git diff -- /dev/null path/to/file | difit
+
+# Explicit stdin mode
+git diff --cached | difit -
 ```
 
+Stdin mode is selected with intent-first rules:
+
+- `-` explicitly enables stdin mode
+- If positional arguments (`<target>` / `[compare-with]`), `--pr`, or `--tui` are provided, difit treats the command as Git/PR/TUI mode and does not auto-read stdin
+- Auto stdin detection applies only when no explicit mode is selected and stdin is a pipe/file/socket
+
 ## ⚙️ CLI Options
 
 | Flag                  | Default   | Description                                                                |

package/README.zh.md

@@ -32,7 +32,6 @@ difit  # 在 WebUI 中查看最新提交的差异
 ```bash
 difit <target>                    # 查看单个提交差异
 difit <target> [compare-with]     # 比较两个提交/分支
-difit --pr <github-pr-url>        # 审查 GitHub 拉取请求
 ```
 
 ### 单个提交审查
@@ -97,8 +96,17 @@ git diff --merge-base main feature | difit
 
 # 将整个现有文件视为新添加进行审查
 git diff -- /dev/null path/to/file | difit
+
+# 显式标准输入模式
+git diff --cached | difit -
 ```
 
+标准输入模式按“意图优先”规则选择：
+
+- `-` 会显式启用标准输入模式
+- 当提供 positional 参数（`<target>` / `[compare-with]`）、`--pr` 或 `--tui` 时，difit 会按 Git/PR/TUI 模式处理，不会自动读取 stdin
+- 只有在未显式选择模式且 stdin 为 pipe/file/socket 时，才会自动进入标准输入模式
+
 ## ⚙️ CLI 选项
 
 | 标志                  | 默认值    | 描述                                                                   |

package/dist/cli/index.js

@@ -6,7 +6,7 @@ import pkg from '../../package.json' with { type: 'json' };
 import { startServer } from '../server/server.js';
 import { DiffMode } from '../types/watch.js';
 import { DEFAULT_DIFF_VIEW_MODE, normalizeDiffViewMode } from '../utils/diffMode.js';
-import { findUntrackedFiles, markFilesIntentToAdd, promptUser, validateDiffArguments, resolvePrCommits, getGitRoot, } from './utils.js';
+import { shouldReadStdin, findUntrackedFiles, markFilesIntentToAdd, promptUser, validateDiffArguments, resolvePrCommits, getGitRoot, } from './utils.js';
 function isSpecialArg(arg) {
     return arg === 'working' || arg === 'staged' || arg === '.';
 }
@@ -46,8 +46,13 @@ program
     .action(async (commitish, compareWith, options) => {
     try {
         // Check if we should read from stdin
-        const shouldReadStdin = !process.stdin.isTTY || commitish === '-';
-        if (shouldReadStdin) {
+        const readFromStdin = shouldReadStdin({
+            commitish,
+            hasPositionalArgs: program.args.length > 0,
+            hasPrOption: Boolean(options.pr),
+            hasTuiOption: Boolean(options.tui),
+        });
+        if (readFromStdin) {
             // Read unified diff from stdin
             const diffContent = await readStdin();
             if (!diffContent.trim()) {

package/dist/cli/utils.d.ts

@@ -1,4 +1,16 @@
+import { type Stats } from 'node:fs';
 import type { SimpleGit } from 'simple-git';
+type StdinStat = Pick<Stats, 'isFIFO' | 'isFile' | 'isSocket'>;
+export type StdinSource = 'pipe' | 'file' | 'socket' | 'tty';
+export declare function detectStdinSource(stdinStat?: StdinStat): StdinSource;
+export interface ShouldReadStdinOptions {
+    commitish: string;
+    hasPositionalArgs: boolean;
+    hasPrOption: boolean;
+    hasTuiOption: boolean;
+    stdinSource?: StdinSource;
+}
+export declare function shouldReadStdin(options: ShouldReadStdinOptions): boolean;
 export declare function getGitRoot(): string;
 export declare function validateCommitish(commitish: string): boolean;
 export declare function shortHash(hash: string): string;
@@ -9,18 +21,7 @@ export interface PullRequestInfo {
     pullNumber: number;
     hostname: string;
 }
-export interface PullRequestDetails {
-    baseSha: string;
-    headSha: string;
-    baseRef: string;
-    headRef: string;
-}
 export declare function parseGitHubPrUrl(url: string): PullRequestInfo | null;
-export declare function fetchPrDetails(prInfo: PullRequestInfo): Promise<PullRequestDetails>;
-export declare function resolveCommitInLocalRepo(sha: string, context?: {
-    owner: string;
-    repo: string;
-}): string;
 export declare function resolvePrCommits(prUrl: string): Promise<{
     targetCommitish: string;
     baseCommitish: string;
@@ -32,3 +33,4 @@ export declare function validateDiffArguments(targetCommitish: string, baseCommi
 export declare function findUntrackedFiles(git: SimpleGit): Promise<string[]>;
 export declare function markFilesIntentToAdd(git: SimpleGit, files: string[]): Promise<void>;
 export declare function promptUser(message: string): Promise<boolean>;
+export {};

package/dist/cli/utils.js

@@ -1,6 +1,29 @@
 import { execSync } from 'child_process';
+import { fstatSync } from 'node:fs';
 import { createInterface } from 'readline/promises';
 import { Octokit } from '@octokit/rest';
+export function detectStdinSource(stdinStat = fstatSync(0)) {
+    if (stdinStat.isFIFO()) {
+        return 'pipe';
+    }
+    if (stdinStat.isFile()) {
+        return 'file';
+    }
+    if (stdinStat.isSocket()) {
+        return 'socket';
+    }
+    return 'tty';
+}
+export function shouldReadStdin(options) {
+    if (options.commitish === '-') {
+        return true;
+    }
+    if (options.hasPositionalArgs || options.hasPrOption || options.hasTuiOption) {
+        return false;
+    }
+    const stdinSource = options.stdinSource ?? detectStdinSource();
+    return stdinSource === 'pipe' || stdinSource === 'file' || stdinSource === 'socket';
+}
 export function getGitRoot() {
     try {
         const result = execSync('git rev-parse --show-toplevel', { encoding: 'utf8', stdio: 'pipe' });
@@ -114,7 +137,7 @@ function getGitHubToken() {
         return undefined;
     }
 }
-export async function fetchPrDetails(prInfo) {
+async function fetchPrDetails(prInfo) {
     const token = getGitHubToken();
     const octokitOptions = {
         auth: token,
@@ -160,7 +183,7 @@ export async function fetchPrDetails(prInfo) {
         throw new Error('Failed to fetch PR details: Unknown error');
     }
 }
-export function resolveCommitInLocalRepo(sha, context) {
+function resolveCommitInLocalRepo(sha, context) {
     try {
         // Verify if the commit exists locally
         execSync(`git cat-file -e ${sha}`, { stdio: 'ignore' });

package/dist/cli/utils.test.js

@@ -1,6 +1,104 @@
 import { describe, it, expect } from 'vitest';
-import { validateCommitish, validateDiffArguments, shortHash, parseGitHubPrUrl } from './utils';
+import { detectStdinSource, parseGitHubPrUrl, shortHash, shouldReadStdin, validateCommitish, validateDiffArguments, } from './utils';
 describe('CLI Utils', () => {
+    describe('stdin detection', () => {
+        it('detects pipe from stdin stat', () => {
+            expect(detectStdinSource({
+                isFIFO: () => true,
+                isFile: () => false,
+                isSocket: () => false,
+            })).toBe('pipe');
+        });
+        it('detects file from stdin stat', () => {
+            expect(detectStdinSource({
+                isFIFO: () => false,
+                isFile: () => true,
+                isSocket: () => false,
+            })).toBe('file');
+        });
+        it('detects socket from stdin stat', () => {
+            expect(detectStdinSource({
+                isFIFO: () => false,
+                isFile: () => false,
+                isSocket: () => true,
+            })).toBe('socket');
+        });
+        it('detects tty for character device stdin stat', () => {
+            expect(detectStdinSource({
+                isFIFO: () => false,
+                isFile: () => false,
+                isSocket: () => false,
+            })).toBe('tty');
+        });
+        it('reads stdin when commitish is explicit stdin marker', () => {
+            expect(shouldReadStdin({
+                commitish: '-',
+                hasPositionalArgs: true,
+                hasPrOption: true,
+                hasTuiOption: true,
+                stdinSource: 'tty',
+            })).toBe(true);
+        });
+        it('does not read stdin when positional args are explicitly passed', () => {
+            expect(shouldReadStdin({
+                commitish: '.',
+                hasPositionalArgs: true,
+                hasPrOption: false,
+                hasTuiOption: false,
+                stdinSource: 'pipe',
+            })).toBe(false);
+        });
+        it('does not read stdin when --pr is specified', () => {
+            expect(shouldReadStdin({
+                commitish: 'HEAD',
+                hasPositionalArgs: false,
+                hasPrOption: true,
+                hasTuiOption: false,
+                stdinSource: 'pipe',
+            })).toBe(false);
+        });
+        it('does not read stdin when --tui is specified', () => {
+            expect(shouldReadStdin({
+                commitish: 'HEAD',
+                hasPositionalArgs: false,
+                hasPrOption: false,
+                hasTuiOption: true,
+                stdinSource: 'pipe',
+            })).toBe(false);
+        });
+        it('auto-detects stdin for pipe/file/socket only when no explicit git mode is selected', () => {
+            expect(shouldReadStdin({
+                commitish: 'HEAD',
+                hasPositionalArgs: false,
+                hasPrOption: false,
+                hasTuiOption: false,
+                stdinSource: 'pipe',
+            })).toBe(true);
+            expect(shouldReadStdin({
+                commitish: 'HEAD',
+                hasPositionalArgs: false,
+                hasPrOption: false,
+                hasTuiOption: false,
+                stdinSource: 'file',
+            })).toBe(true);
+            expect(shouldReadStdin({
+                commitish: 'HEAD',
+                hasPositionalArgs: false,
+                hasPrOption: false,
+                hasTuiOption: false,
+                stdinSource: 'socket',
+            })).toBe(true);
+        });
+        it('does not auto-read stdin for tty source', () => {
+            expect(shouldReadStdin({
+                commitish: 'HEAD',
+                hasPositionalArgs: false,
+                hasPrOption: false,
+                hasTuiOption: false,
+                stdinSource: 'tty',
+            })).toBe(false);
+        });
+    });
     describe('validateCommitish', () => {
         it('should validate full SHA hashes', () => {
             expect(validateCommitish('a1b2c3d4e5f6789012345678901234567890abcd')).toBe(true);