difit 2.0.11 → 2.1.1

package/README.ja.md

@@ -6,6 +6,8 @@
   <a href="./README.md">English</a> | 日本語 | <a href="./README.zh.md">简体中文</a> | <a href="./README.ko.md">한국어</a>
 </p>
 
+![difit screenshot](docs/images/screenshot.png)
+
 **difit**は、ローカルのgit上にある差分をGitHub風のビューアで閲覧・レビューできるCLIツールです。見やすい表示に加え、コメントはAIへのプロンプトとしてコピーできます。AI時代のローカルコードレビューツール！
 
 ## ✨ 機能
@@ -41,7 +43,7 @@ npx difit feature  # featureブランチの最新コミット
 ### 2つのコミットを比較
 
 ```bash
-npx difit HEAD main      # HEADとmainブランチを比較
+npx difit @ main         # mainブランチと比較（@はHEADのエイリアス）
 npx difit feature main   # ブランチ間を比較
 npx difit . origin/main  # 作業ディレクトリとリモートmainを比較
 ```
@@ -76,6 +78,21 @@ Enterprise ServerのPRを表示する場合、あなたのEnterprise Serverイ
 2. 適切なスコープでパーソナルアクセストークンを生成
 3. `GITHUB_TOKEN`環境変数として設定
 
+### 標準入力
+
+パイプを使用して標準入力経由で統一diff形式を渡すことで、任意のツールからのdiffをdifitで表示できます。
+
+```bash
+# 他のツールからのdiffを表示
+diff -u file1.txt file2.txt | npx difit
+
+# 保存されたパッチをレビュー
+cat changes.patch | npx difit
+
+# マージベースとの比較
+git diff --merge-base main feature | npx difit
+```
+
 ## ⚙️ CLIオプション
 
 | フラグ           | デフォルト   | 説明                                                                              |
@@ -83,7 +100,7 @@ Enterprise ServerのPRを表示する場合、あなたのEnterprise Serverイ
 | `<target>`       | HEAD         | コミットハッシュ、タグ、HEAD~n、ブランチ、または特別な引数                        |
 | `[compare-with]` | -            | 比較対象の2番目のコミット（2つの間のdiffを表示）                                  |
 | `--pr <url>`     | -            | レビューするGitHub PRのURL（例：https://github.com/owner/repo/pull/123）          |
-| `--port`         | 3000         | 優先ポート。使用中の場合は+1にフォールバック                                      |
+| `--port`         | 4966         | 優先ポート。使用中の場合は+1にフォールバック                                      |
 | `--host`         | 127.0.0.1    | サーバーをバインドするホストアドレス（外部からアクセスしたい場合は0.0.0.0を指定） |
 | `--no-open`      | false        | ブラウザを自動的に開かない                                                        |
 | `--mode`         | side-by-side | 表示モード。inline`または`side-by-side`                                           |
@@ -116,13 +133,13 @@ src/components/Button.tsx:L42-L48   # この行が自動的に追加されます
 
 ## 🎨 シンタックスハイライト対応言語
 
-- **JavaScript/TypeScript**：`.js`、`.jsx`、`.ts`、`.tsx`
-- **Web技術**：HTML、CSS、JSON、XML、Markdown
-- **シェルスクリプト**：`.sh`、`.bash`、`.zsh`、`.fish`
-- **バックエンド言語**：PHP、SQL、Ruby、Java、Scala
-- **システム言語**：C、C++、C#、Rust、Go
-- **モバイル言語**：Swift、Kotlin、Dart
-- **その他**：Python、YAML、Solidity、Vimスクリプト
+- **JavaScript/TypeScript**：`.js`, `.jsx`, `.ts`, `.tsx`
+- **Web技術**：HTML, CSS, JSON, XML, Markdown
+- **シェルスクリプト**：`.sh`, `.bash`, `.zsh`, `.fish`
+- **バックエンド言語**：PHP, SQL, Ruby, Java, Scala
+- **システム言語**：C, C++, C#, Rust, Go
+- **モバイル言語**：Swift, Kotlin, Dart
+- **その他**：Python, Protobuf, YAML, Solidity, Vim Script
 
 ## 🛠️ 開発
 

package/README.ko.md

@@ -6,6 +6,8 @@
   <a href="./README.md">English</a> | <a href="./README.ja.md">日本語</a> | <a href="./README.zh.md">简体中文</a> | 한국어
 </p>
 
+![difit screenshot](docs/images/screenshot.png)
+
 **difit**은 GitHub 스타일 뷰어로 로컬 git diff를 보고 검토할 수 있는 CLI 도구입니다. 깔끔한 시각적 효과와 함께 코멘트를 AI용 프롬프트로 복사할 수 있습니다. AI 시대의 로컬 코드 리뷰 도구!
 
 ## ✨ 기능
@@ -41,7 +43,7 @@ npx difit feature  # feature 브랜치의 최신 커밋
 ### 두 커밋 비교
 
 ```bash
-npx difit HEAD main      # HEAD와 main 브랜치 비교
+npx difit @ main         # main 브랜치와 비교 (@는 HEAD의 별칭)
 npx difit feature main   # 브랜치 간 비교
 npx difit . origin/main  # 작업 디렉토리와 원격 main 비교
 ```
@@ -76,6 +78,21 @@ Enterprise Server PR의 경우 귀하의 Enterprise Server 인스턴스에서
 2. 적절한 범위로 개인 액세스 토큰 생성
 3. `GITHUB_TOKEN` 환경 변수로 설정
 
+### 표준 입력
+
+파이프를 사용하여 표준 입력을 통해 통합 diff를 전달하면 모든 도구의 diff를 difit으로 볼 수 있습니다.
+
+```bash
+# 다른 도구의 diff 보기
+diff -u file1.txt file2.txt | npx difit
+
+# 저장된 패치 검토
+cat changes.patch | npx difit
+
+# 머지 베이스와 비교
+git diff --merge-base main feature | npx difit
+```
+
 ## ⚙️ CLI 옵션
 
 | 플래그           | 기본값       | 설명                                                              |
@@ -83,7 +100,7 @@ Enterprise Server PR의 경우 귀하의 Enterprise Server 인스턴스에서
 | `<target>`       | HEAD         | 커밋 해시, 태그, HEAD~n, 브랜치 또는 특수 인수                    |
 | `[compare-with]` | -            | 비교할 선택적 두 번째 커밋 (둘 사이의 diff 표시)                  |
 | `--pr <url>`     | -            | 검토할 GitHub PR URL (예: https://github.com/owner/repo/pull/123) |
-| `--port`         | 3000         | 선호 포트; 사용 중인 경우 +1로 대체                               |
+| `--port`         | 4966         | 선호 포트; 사용 중인 경우 +1로 대체                               |
 | `--host`         | 127.0.0.1    | 서버를 바인딩할 호스트 주소 (외부 액세스는 0.0.0.0 사용)          |
 | `--no-open`      | false        | 브라우저를 자동으로 열지 않음                                     |
 | `--mode`         | side-by-side | 표시 모드: `inline` 또는 `side-by-side`                           |
@@ -122,7 +139,7 @@ src/components/Button.tsx:L42-L48   # 이 줄은 자동으로 추가됩니다
 - **백엔드 언어**: PHP, SQL, Ruby, Java, Scala
 - **시스템 언어**: C, C++, C#, Rust, Go
 - **모바일 언어**: Swift, Kotlin, Dart
-- **기타**: Python, YAML, Solidity, Vim 스크립트
+- **기타**: Python, Protobuf, YAML, Solidity, Vim 스크립트
 
 ## 🛠️ 개발
 

package/README.md

@@ -6,6 +6,8 @@
   English | <a href="./README.ja.md">日本語</a> | <a href="./README.zh.md">简体中文</a> | <a href="./README.ko.md">한국어</a>
 </p>
 
+![difit screenshot](docs/images/screenshot.png)
+
 **difit** is a CLI tool that lets you view and review local git diffs with a GitHub-style viewer. In addition to clean visuals, comments can be copied as prompts for AI. The local code review tool for the AI era!
 
 ## ✨ Features
@@ -41,7 +43,7 @@ npx difit feature  # Latest commit on feature branch
 ### Compare two commits
 
 ```bash
-npx difit HEAD main      # Compare HEAD with main branch
+npx difit @ main         # Compare with main branch (@ is alias for HEAD)
 npx difit feature main   # Compare branches
 npx difit . origin/main  # Compare working directory with remote main
 ```
@@ -76,6 +78,21 @@ For Enterprise Server PRs, you must set a token generated on YOUR Enterprise Ser
 2. Generate a personal access token with appropriate scopes
 3. Set it as `GITHUB_TOKEN` environment variable
 
+### Stdin
+
+By using a pipe to pass unified diffs via stdin, you can view diffs from any tool with difit.
+
+```bash
+# View diffs from other tools
+diff -u file1.txt file2.txt | npx difit
+
+# Review saved patches
+cat changes.patch | npx difit
+
+# Compare against merge base
+git diff --merge-base main feature | npx difit
+```
+
 ## ⚙️ CLI Options
 
 | Flag             | Default      | Description                                                            |
@@ -83,7 +100,7 @@ For Enterprise Server PRs, you must set a token generated on YOUR Enterprise Ser
 | `<target>`       | HEAD         | Commit hash, tag, HEAD~n, branch, or special arguments                 |
 | `[compare-with]` | -            | Optional second commit to compare with (shows diff between the two)    |
 | `--pr <url>`     | -            | GitHub PR URL to review (e.g., https://github.com/owner/repo/pull/123) |
-| `--port`         | 3000         | Preferred port; falls back to +1 if occupied                           |
+| `--port`         | 4966         | Preferred port; falls back to +1 if occupied                           |
 | `--host`         | 127.0.0.1    | Host address to bind server to (use 0.0.0.0 for external access)       |
 | `--no-open`      | false        | Don't automatically open browser                                       |
 | `--mode`         | side-by-side | Display mode: `inline` or `side-by-side`                               |
@@ -122,7 +139,7 @@ This section is unnecessary
 - **Backend Languages**: PHP, SQL, Ruby, Java, Scala
 - **Systems Languages**: C, C++, C#, Rust, Go
 - **Mobile Languages**: Swift, Kotlin, Dart
-- **Others**: Python, YAML, Solidity, Vim script
+- **Others**: Python, Protobuf, YAML, Solidity, Vim script
 
 ## 🛠️ Development
 

package/README.zh.md

@@ -6,6 +6,8 @@
   <a href="./README.md">English</a> | <a href="./README.ja.md">日本語</a> | 简体中文 | <a href="./README.ko.md">한국어</a>
 </p>
 
+![difit screenshot](docs/images/screenshot.png)
+
 **difit** 是一个让你使用 GitHub 风格查看器查看和审查本地 git 差异的 CLI 工具。除了清晰的视觉效果外，评论还可以作为 AI 提示进行复制。AI 时代的本地代码审查工具！
 
 ## ✨ 功能
@@ -41,7 +43,7 @@ npx difit feature  # feature 分支上的最新提交
 ### 比较两个提交
 
 ```bash
-npx difit HEAD main      # 比较 HEAD 与 main 分支
+npx difit @ main         # 与 main 分支比较（@ 是 HEAD 的别名）
 npx difit feature main   # 比较分支
 npx difit . origin/main  # 比较工作目录与远程 main
 ```
@@ -76,6 +78,21 @@ difit 使用以下方式自动处理 GitHub 认证：
 2. 生成具有适当范围的个人访问令牌
 3. 将其设置为 `GITHUB_TOKEN` 环境变量
 
+### 标准输入
+
+通过使用管道通过标准输入传递统一差异，您可以使用 difit 查看来自任何工具的差异。
+
+```bash
+# 查看来自其他工具的差异
+diff -u file1.txt file2.txt | npx difit
+
+# 审查保存的补丁
+cat changes.patch | npx difit
+
+# 与合并基础比较
+git diff --merge-base main feature | npx difit
+```
+
 ## ⚙️ CLI 选项
 
 | 标志             | 默认值       | 描述                                                                   |
@@ -83,7 +100,7 @@ difit 使用以下方式自动处理 GitHub 认证：
 | `<target>`       | HEAD         | 提交哈希、标签、HEAD~n、分支或特殊参数                                 |
 | `[compare-with]` | -            | 要比较的可选第二个提交（显示两者之间的差异）                           |
 | `--pr <url>`     | -            | 要审查的 GitHub PR URL（例如：https://github.com/owner/repo/pull/123） |
-| `--port`         | 3000         | 首选端口；如果被占用则回退到 +1                                        |
+| `--port`         | 4966         | 首选端口；如果被占用则回退到 +1                                        |
 | `--host`         | 127.0.0.1    | 绑定服务器的主机地址（使用 0.0.0.0 进行外部访问）                      |
 | `--no-open`      | false        | 不自动打开浏览器                                                       |
 | `--mode`         | side-by-side | 显示模式：`inline` 或 `side-by-side`                                   |
@@ -116,13 +133,13 @@ src/components/Button.tsx:L42-L48   # 此行自动添加
 
 ## 🎨 语法高亮语言
 
-- **JavaScript/TypeScript**：`.js`、`.jsx`、`.ts`、`.tsx`
-- **Web 技术**：HTML、CSS、JSON、XML、Markdown
-- **Shell 脚本**：`.sh`、`.bash`、`.zsh`、`.fish`
-- **后端语言**：PHP、SQL、Ruby、Java、Scala
-- **系统语言**：C、C++、C#、Rust、Go
-- **移动语言**：Swift、Kotlin、Dart
-- **其他**：Python、YAML、Solidity、Vim 脚本
+- **JavaScript/TypeScript**：`.js`, `.jsx`, `.ts`, `.tsx`
+- **Web 技术**：HTML, CSS, JSON, XML, Markdown
+- **Shell 脚本**：`.sh`, `.bash`, `.zsh`, `.fish`
+- **后端语言**：PHP, SQL, Ruby, Java, Scala
+- **系统语言**：C, C++, C#, Rust, Go
+- **移动语言**：Swift, Kotlin, Dart
+- **其他**：Python, Protobuf, YAML, Solidity, Vim Script
 
 ## 🛠️ 开发
 

package/dist/cli/index.js

@@ -4,10 +4,28 @@ import React from 'react';
 import { simpleGit } from 'simple-git';
 import pkg from '../../package.json' with { type: 'json' };
 import { startServer } from '../server/server.js';
+import { DiffMode } from '../types/watch.js';
 import { findUntrackedFiles, markFilesIntentToAdd, promptUser, validateDiffArguments, resolvePrCommits, } from './utils.js';
 function isSpecialArg(arg) {
     return arg === 'working' || arg === 'staged' || arg === '.';
 }
+function determineDiffMode(targetCommitish, compareWith) {
+    // If comparing specific commits/branches (not involving HEAD), no watching needed
+    if (compareWith && targetCommitish !== 'HEAD') {
+        return DiffMode.SPECIFIC;
+    }
+    if (targetCommitish === 'working') {
+        return DiffMode.WORKING;
+    }
+    if (targetCommitish === 'staged') {
+        return DiffMode.STAGED;
+    }
+    if (targetCommitish === '.') {
+        return DiffMode.DOT;
+    }
+    // Default mode: HEAD^ vs HEAD or HEAD vs other commits (watch for HEAD changes)
+    return DiffMode.DEFAULT;
+}
 const program = new Command();
 program
     .name('difit')
@@ -24,6 +42,29 @@ program
     .option('--clean', 'start with a clean slate by clearing all existing comments')
     .action(async (commitish, compareWith, options) => {
     try {
+        // Check if we should read from stdin
+        const shouldReadStdin = !process.stdin.isTTY || commitish === '-';
+        if (shouldReadStdin) {
+            // Read unified diff from stdin
+            const diffContent = await readStdin();
+            if (!diffContent.trim()) {
+                console.error('Error: No diff content received from stdin');
+                process.exit(1);
+            }
+            // Start server with stdin diff
+            const { url } = await startServer({
+                stdinDiff: diffContent,
+                preferredPort: options.port,
+                host: options.host,
+                openBrowser: options.open,
+                mode: options.mode,
+                clearComments: options.clean,
+            });
+            console.log(`\n🚀 difit server started on ${url}`);
+            console.log(`📋 Reviewing: diff from stdin`);
+            console.log('\nPress Ctrl+C to stop the server');
+            return;
+        }
         // Determine target and base commitish
         let targetCommitish = commitish;
         let baseCommitish;
@@ -88,6 +129,7 @@ program
                 process.exit(1);
             }
         }
+        const diffMode = determineDiffMode(targetCommitish, compareWith);
         const { url, port, isEmpty } = await startServer({
             targetCommitish,
             baseCommitish,
@@ -96,6 +138,7 @@ program
             openBrowser: options.open,
             mode: options.mode,
             clearComments: options.clean,
+            diffMode,
         });
         console.log(`\n🚀 difit server started on ${url}`);
         console.log(`📋 Reviewing: ${targetCommitish}`);
@@ -137,6 +180,13 @@ program
 });
 program.parse();
 // Check for untracked files and prompt user to add them for diff visibility
+async function readStdin() {
+    const chunks = [];
+    for await (const chunk of process.stdin) {
+        chunks.push(chunk);
+    }
+    return Buffer.concat(chunks).toString('utf8');
+}
 async function handleUntrackedFiles(git) {
     const files = await findUntrackedFiles(git);
     if (files.length === 0) {

package/dist/cli/index.test.js

@@ -1,6 +1,7 @@
 import { Command } from 'commander';
 import React from 'react';
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { DiffMode } from '../types/watch.js';
 // Mock all external dependencies
 vi.mock('simple-git');
 vi.mock('../server/server.js');
@@ -37,8 +38,8 @@ describe('CLI index.ts', () => {
         vi.mocked(simpleGit).mockReturnValue(mockGit);
         mockStartServer = vi.mocked(startServer);
         mockStartServer.mockResolvedValue({
-            port: 3000,
-            url: 'http://localhost:3000',
+            port: 4966,
+            url: 'http://localhost:4966',
             isEmpty: false,
         });
         mockPromptUser = vi.mocked(promptUser);
@@ -421,8 +422,8 @@ describe('CLI index.ts', () => {
         it('displays clean message when flag is used', async () => {
             mockFindUntrackedFiles.mockResolvedValue([]);
             mockStartServer.mockResolvedValue({
-                port: 3000,
-                url: 'http://localhost:3000',
+                port: 4966,
+                url: 'http://localhost:4966',
                 isEmpty: false,
             });
             const program = new Command();
@@ -461,8 +462,8 @@ describe('CLI index.ts', () => {
         it('does not display clean message when flag is not used', async () => {
             mockFindUntrackedFiles.mockResolvedValue([]);
             mockStartServer.mockResolvedValue({
-                port: 3000,
-                url: 'http://localhost:3000',
+                port: 4966,
+                url: 'http://localhost:4966',
                 isEmpty: false,
             });
             const program = new Command();
@@ -503,8 +504,8 @@ describe('CLI index.ts', () => {
         it('displays server startup message with correct URL', async () => {
             mockFindUntrackedFiles.mockResolvedValue([]);
             mockStartServer.mockResolvedValue({
-                port: 3000,
-                url: 'http://localhost:3000',
+                port: 4966,
+                url: 'http://localhost:4966',
                 isEmpty: false,
             });
             const program = new Command();
@@ -540,14 +541,14 @@ describe('CLI index.ts', () => {
                 }
             });
             await program.parseAsync([], { from: 'user' });
-            expect(console.log).toHaveBeenCalledWith('\n🚀 difit server started on http://localhost:3000');
+            expect(console.log).toHaveBeenCalledWith('\n🚀 difit server started on http://localhost:4966');
             expect(console.log).toHaveBeenCalledWith('📋 Reviewing: HEAD');
         });
         it('displays correct message when no differences found', async () => {
             mockFindUntrackedFiles.mockResolvedValue([]);
             mockStartServer.mockResolvedValue({
-                port: 3000,
-                url: 'http://localhost:3000',
+                port: 4966,
+                url: 'http://localhost:4966',
                 isEmpty: true,
             });
             const program = new Command();
@@ -578,7 +579,7 @@ describe('CLI index.ts', () => {
             });
             await program.parseAsync([], { from: 'user' });
             expect(console.log).toHaveBeenCalledWith('\n! No differences found. Browser will not open automatically.');
-            expect(console.log).toHaveBeenCalledWith('   Server is running at http://localhost:3000 if you want to check manually.\n');
+            expect(console.log).toHaveBeenCalledWith('   Server is running at http://localhost:4966 if you want to check manually.\n');
         });
     });
     describe('Server mode option handling', () => {
@@ -812,4 +813,132 @@ describe('CLI index.ts', () => {
             expect(process.exit).toHaveBeenCalledWith(1);
         });
     });
+    describe('Diff mode determination', () => {
+        const testCases = [
+            {
+                name: 'determines DEFAULT mode for HEAD',
+                args: ['HEAD'],
+                expectedMode: 'default',
+            },
+            {
+                name: 'determines WORKING mode for working',
+                args: ['working'],
+                expectedMode: 'working',
+            },
+            {
+                name: 'determines STAGED mode for staged',
+                args: ['staged'],
+                expectedMode: 'staged',
+            },
+            {
+                name: 'determines DOT mode for dot argument',
+                args: ['.'],
+                expectedMode: 'dot',
+            },
+            {
+                name: 'determines SPECIFIC mode for commit comparison',
+                args: ['abc123', 'def456'],
+                expectedMode: 'specific',
+            },
+            {
+                name: 'determines DEFAULT mode for custom commit',
+                args: ['main'],
+                expectedMode: 'default',
+            },
+        ];
+        testCases.forEach(({ name, args, expectedMode }) => {
+            it(name, async () => {
+                mockFindUntrackedFiles.mockResolvedValue([]);
+                const program = new Command();
+                program
+                    .argument('[commit-ish]', 'commit-ish', 'HEAD')
+                    .argument('[compare-with]', 'compare-with')
+                    .option('--port <port>', 'port', parseInt)
+                    .option('--host <host>', 'host', '')
+                    .option('--no-open', 'no-open')
+                    .option('--mode <mode>', 'mode', 'side-by-side')
+                    .option('--tui', 'tui')
+                    .option('--pr <url>', 'pr')
+                    .action(async (commitish, compareWith, options) => {
+                    // Simulate determineDiffMode function behavior
+                    let diffMode;
+                    if (compareWith && commitish !== 'HEAD') {
+                        diffMode = DiffMode.SPECIFIC;
+                    }
+                    else if (commitish === 'working') {
+                        diffMode = DiffMode.WORKING;
+                    }
+                    else if (commitish === 'staged') {
+                        diffMode = DiffMode.STAGED;
+                    }
+                    else if (commitish === '.') {
+                        diffMode = DiffMode.DOT;
+                    }
+                    else {
+                        diffMode = DiffMode.DEFAULT;
+                    }
+                    await startServer({
+                        targetCommitish: commitish,
+                        baseCommitish: compareWith || commitish + '^',
+                        preferredPort: options.port,
+                        host: options.host,
+                        openBrowser: options.open,
+                        mode: options.mode,
+                        diffMode,
+                    });
+                });
+                await program.parseAsync(args, { from: 'user' });
+                expect(mockStartServer).toHaveBeenCalledWith(expect.objectContaining({
+                    diffMode: expectedMode,
+                }));
+            });
+        });
+        it('handles HEAD comparison with different commit', async () => {
+            mockFindUntrackedFiles.mockResolvedValue([]);
+            const program = new Command();
+            program
+                .argument('[commit-ish]', 'commit-ish', 'HEAD')
+                .argument('[compare-with]', 'compare-with')
+                .option('--port <port>', 'port', parseInt)
+                .option('--host <host>', 'host', '')
+                .option('--no-open', 'no-open')
+                .option('--mode <mode>', 'mode', 'side-by-side')
+                .option('--tui', 'tui')
+                .option('--pr <url>', 'pr')
+                .action(async (commitish, compareWith, options) => {
+                // Simulate determineDiffMode function behavior
+                let diffMode;
+                if (compareWith && commitish !== 'HEAD') {
+                    diffMode = DiffMode.SPECIFIC;
+                }
+                else if (commitish === 'working') {
+                    diffMode = DiffMode.WORKING;
+                }
+                else if (commitish === 'staged') {
+                    diffMode = DiffMode.STAGED;
+                }
+                else if (commitish === '.') {
+                    diffMode = DiffMode.DOT;
+                }
+                else {
+                    diffMode = DiffMode.DEFAULT;
+                }
+                await startServer({
+                    targetCommitish: commitish,
+                    baseCommitish: compareWith || commitish + '^',
+                    preferredPort: options.port,
+                    host: options.host,
+                    openBrowser: options.open,
+                    mode: options.mode,
+                    diffMode,
+                });
+            });
+            await program.parseAsync(['HEAD', 'main'], { from: 'user' });
+            expect(mockStartServer).toHaveBeenCalledWith(expect.objectContaining({
+                diffMode: 'default', // HEAD with comparison is still DEFAULT mode
+                targetCommitish: 'HEAD',
+                baseCommitish: 'main',
+            }));
+        });
+    });
 });

package/dist/cli/utils.js

@@ -21,6 +21,7 @@ export function validateCommitish(commitish) {
         /^[a-f0-9]{4,40}\^+$/i, // SHA hashes with ^ suffix (parent references)
         /^[a-f0-9]{4,40}~\d+$/i, // SHA hashes with ~N suffix (ancestor references)
         /^HEAD(~\d+|\^\d*)*$/, // HEAD, HEAD~1, HEAD^, HEAD^2, etc.
+        /^@(~\d+|\^\d*)*$/, // @, @~1, @^, @^2, etc. (@ is Git alias for HEAD)
     ];
     // Check if it matches any specific patterns first
     if (validPatterns.some((pattern) => pattern.test(trimmed))) {
@@ -35,8 +36,7 @@ function isValidBranchName(name) {
         return false; // Cannot start with dash
     if (name.endsWith('.'))
         return false; // Cannot end with dot
-    if (name === '@')
-        return false; // Cannot be just @
+    // @ is a valid Git alias for HEAD, so we should allow it
     if (name.includes('..'))
         return false; // No consecutive dots
     if (name.includes('@{'))

package/dist/cli/utils.test.js

@@ -27,6 +27,15 @@ describe('CLI Utils', () => {
             expect(validateCommitish('HEAD^2')).toBe(true);
             expect(validateCommitish('HEAD~2^1')).toBe(true);
         });
+        it('should validate @ references (Git alias for HEAD)', () => {
+            expect(validateCommitish('@')).toBe(true);
+            expect(validateCommitish('@~1')).toBe(true);
+            expect(validateCommitish('@~10')).toBe(true);
+            expect(validateCommitish('@^')).toBe(true);
+            expect(validateCommitish('@^1')).toBe(true);
+            expect(validateCommitish('@^2')).toBe(true);
+            expect(validateCommitish('@~2^1')).toBe(true);
+        });
         it('should validate branch names', () => {
             // Valid branch names according to git rules
             expect(validateCommitish('main')).toBe(true);
@@ -56,7 +65,7 @@ describe('CLI Utils', () => {
             // Invalid branch names according to git rules
             expect(validateCommitish('-feature')).toBe(false); // cannot start with dash
             expect(validateCommitish('feature.')).toBe(false); // cannot end with dot
-            expect(validateCommitish('@')).toBe(false); // cannot be just @
+            expect(validateCommitish('@')).toBe(true); // @ is a valid Git alias for HEAD
             expect(validateCommitish('feature..test')).toBe(false); // no consecutive dots
             expect(validateCommitish('feature@{upstream}')).toBe(false); // no @{ sequence
             expect(validateCommitish('feature//test')).toBe(false); // no consecutive slashes