@nemo-cli/git 0.1.3 → 0.1.4

package/README.md

@@ -19,6 +19,8 @@ pnpm add @nemo-cli/git --global
 - **Conventional Commits**: Interactive commit wizard with type/scope selection from your commitlint config
 - **Smart Branch Management**: Advanced branch operations with merge status and time filtering
 - **Ticket Auto-Detection**: Automatically extracts ticket numbers from branch names for commit messages
+- **Interactive Commit Navigator**: Enhanced `ng blame` for browsing file history with full diff support
+- **Visual History Viewer**: Beautiful `ng hist` command with interactive graph display and keyboard navigation
 
 ## Usage
 
@@ -35,6 +37,8 @@ ng <command> -h
 # Example:
 ng commit -h
 ng branch -h
+ng blame -h
+ng hist -h
 ```
 
 ---
@@ -239,6 +243,180 @@ ng merge -r
 
 ---
 
+### Interactive Commit Navigator (`ng blame`)
+
+Browse file commit history with full diff support and interactive navigation.
+
+```bash
+# View commit history for a file
+ng blame <file-path>
+
+# Example
+ng blame src/commands/blame.ts
+ng blame packages/git/src/commands/blame.ts
+```
+
+**Features:**
+- ✅ **Full Diff Display**: Shows complete diff for each commit (not just commit messages)
+- ✅ **Interactive Navigation**: Browse through commits with keyboard shortcuts
+- ✅ **Smart Caching**: Fetches git history once, then navigates instantly
+- ✅ **Binary File Support**: Detects and handles binary files gracefully
+- ✅ **Large Diff Protection**: Limits display to 50 lines to prevent terminal overflow
+- ✅ **Follow File Renames**: Uses `--follow` to track history across renames
+
+**Interactive Controls:**
+
+| Key | Action | Description |
+|-----|--------|-------------|
+| `n` | Next commit | Move forward in time (to newer commits) |
+| `p` | Previous commit | Move backward in time (to older commits) |
+| `j` | Jump | Jump to a specific commit by number |
+| `q` | Quit | Exit the navigator |
+
+**Display Information:**
+
+Each commit shows:
+- 📝 Commit number (e.g., `Commit 3/10`)
+- 🔖 Short commit hash (8 characters, colored)
+- 👤 Author name (colored)
+- 📅 Commit date (dimmed)
+- 💬 Commit message
+- 📄 Full diff with git standard formatting (red for deletions, green for additions)
+
+**Special Handling:**
+
+- **Binary Files**: Shows "📄 Binary file - diff not available" instead of binary content
+- **Large Diffs**: Displays first 50 lines with truncation notice
+  ```
+  (Showing first 50 lines of 123)
+  ... (truncated)
+  ```
+- **Empty History**: Warns if file has no git history
+- **Missing Files**: Clear error if file doesn't exist
+
+**Example Output:**
+
+```
+Found 10 commits for src/commands/blame.ts
+Use [n/p] to navigate, [j] to jump, [q] to quit
+
+📝 Commit 1/10
+abc123de - John Doe - Mon Feb 2 12:00:00 2026
+feat(git): add interactive commit navigator
+
+--- Diff ---
+diff --git a/src/commands/blame.ts b/src/commands/blame.ts
+new file mode 100644
+index 0000000..1234567
+--- /dev/null
++++ b/src/commands/blame.ts
+@@ -0,0 +1,315 @@
++import path from 'node:path'
++import readline from 'node:readline'
+...
+
+--- Actions ---
+[n] Next commit [p] Previous commit [j] Jump [q] Quit
+```
+
+**Use Cases:**
+
+- 📖 **Code Review**: Understand how a file evolved over time
+- 🐛 **Bug Investigation**: Find when a specific line was changed
+- 📚 **Learning**: Study the development history of a feature
+- 🔍 **Audit**: Review all changes made to a critical file
+
+---
+
+### Git History Viewer (`ng hist` / `ng history`)
+
+Display git history with an interactive, scrollable graph view.
+
+```bash
+# Show full git history
+ng hist
+
+# Limit number of commits
+ng hist -n 20
+ng hist --number 50
+
+# Using alias
+ng history
+ng history -n 10
+```
+
+**Features:**
+- ✅ **Beautiful Graph Format**: Visualizes branch structure with commit tree
+- ✅ **Interactive Navigation**: Scroll through history with keyboard or mouse
+- ✅ **Optimized Display**: Automatically adjusts to terminal size
+- ✅ **Status Bar**: Shows current position and available shortcuts
+- ✅ **Color-Coded Output**:
+  - Cyan: Commit hash
+  - Green: Commit date
+  - Magenta: Author name
+  - Yellow: Branch references
+
+**Interactive Controls:**
+
+| Key | Action | Description |
+|-----|--------|-------------|
+| `↑` / `k` | Scroll up | Move up through commits |
+| `↓` / `j` | Scroll down | Move down through commits |
+| `gg` | Jump to top | Go to the oldest commit |
+| `G` | Jump to bottom | Go to the newest commit (Shift+G) |
+| `Page Up` | Page up | Scroll up one page |
+| `Page Down` | Page down | Scroll down one page |
+| `q` / `Enter` | Quit | Exit the viewer |
+
+**Display Information:**
+
+Each commit shows:
+- 🔖 Short commit hash (cyan, bold)
+- 📅 Commit date and time (green)
+- 👤 Author name (magenta)
+- 🌿 Branch and tag references (yellow)
+- 💬 Commit message
+
+**Status Bar:**
+
+```
+↑↓/jk: Scroll | gg/G: Top/Bottom | PgUp/PgDn | q: Quit | Lines 1-42/150
+```
+
+**Layout Optimization:**
+
+- Automatically calculates optimal view height based on terminal size
+- Reserves space for UI elements (borders, status bar)
+- Ensures minimum of 10 lines for content display
+- Removes unnecessary margins for maximum content visibility
+
+**Use Cases:**
+
+- 📊 **Project Overview**: Quickly see commit history and branch structure
+- 🔍 **Context Browsing**: Understand recent changes before switching branches
+- 📝 **Review History**: Check recent commits before pulling or pushing
+- 🎯 **Navigation**: Find specific commits in the history
+
+**Example Output:**
+
+```
+┌─────────────────────────────────────────────────────────────────┐
+│* abc123de 2026-02-06 14:54:23 [GaoZimeng] (HEAD -> main)      │
+││  refactor(git): main increase hist viewer height line        │
+│* 1a40997 2026-02-06 14:52:15 [GaoZimeng]                      │
+││  feat(git): fetch remote branches before pull                │
+│* a3be508 2026-02-06 14:51:23 [GaoZimeng]                      │
+││  refactor(git): change branch selection from search to select│
+│* 172403f 2026-02-06 14:50:12 [GaoZimeng]                      │
+││  feat(git): enhance merge command with commit customization  │
+├─────────────────────────────────────────────────────────────────┤
+│ ↑↓/jk: Scroll | gg/G: Top/Bottom | PgUp/PgDn | q: Quit | Lines │
+│  1-10/150                                                        │
+└─────────────────────────────────────────────────────────────────┘
+```
+
+---
+
 ### Stash Operations (`ng stash` / `ng st`)
 
 Advanced stash management.
@@ -418,6 +596,93 @@ ng branch clean
 # Confirm deletion
 ```
 
+### Investigating File History
+
+```bash
+# Understand how a file evolved over time
+ng blame src/utils/date.ts
+
+# Interactive navigation:
+# - Press 'n' to see next commit
+# - Press 'p' to go back to previous commit
+# - Press 'j' to jump to commit 5/10
+# - Press 'q' when done reviewing
+
+# Each commit shows:
+# - Full commit hash, author, date, message
+# - Complete diff (what changed)
+# - Current position (e.g., "Commit 3/10")
+```
+
+**Real-world scenarios:**
+
+- 🐛 **Bug Investigation**: Find when a bug was introduced
+  ```bash
+  ng blame src/auth/login.ts
+  # Press 'n' repeatedly to review changes chronologically
+  # Look for the commit that broke the functionality
+  ```
+
+- 📖 **Code Review**: Understand the evolution of a complex function
+  ```bash
+  ng blame src/api/handlers.ts
+  # Navigate through commits to see how the logic developed
+  ```
+
+- 🔍 **Audit Trail**: Review all changes to a security-critical file
+  ```bash
+  ng blame src/config/security.ts
+  # Use 'j' to jump to specific commits of interest
+  ```
+
+---
+
+### Browsing Project History
+
+```bash
+# View full git history with beautiful graph
+ng hist
+
+# View last 20 commits
+ng hist -n 20
+
+# Interactive navigation:
+# - Use ↑/↓ or j/k to scroll through commits
+# - Press 'gg' to jump to oldest commit
+# - Press 'G' (Shift+G) to jump to newest commit
+# - Use Page Up/Down to scroll by pages
+# - Press 'q' or Enter to exit
+
+# Features:
+# - Color-coded output (hash, date, author, branches)
+# - Visual commit graph showing branch structure
+# - Status bar showing current position
+# - Automatically adjusts to terminal size
+```
+
+**Real-world scenarios:**
+
+- 📊 **Before Pulling**: Check what's been committed recently
+  ```bash
+  ng hist -n 10
+  # Review recent commits before doing `ng pull`
+  ```
+
+- 🎯 **Finding Commits**: Locate a specific commit in history
+  ```bash
+  ng hist
+  # Press 'gg' to go to oldest commit
+  # Use ↓/j to scroll forward to find what you need
+  # Note the commit hash (e.g., abc123de)
+  ```
+
+- 🌿 **Branch Overview**: Understand branch structure and merges
+  ```bash
+  ng hist -n 50
+  # See how branches diverged and merged
+  # Identify branch points and merge commits
+  ```
+
 ---
 
 ## Comparison: Git vs `ng`
@@ -432,6 +697,18 @@ ng branch clean
 | List branches | `git branch` | `ng list` (enhanced display) |
 | Merge | `git merge` | `ng merge` (auto stash + searchable) |
 | Stash | `git stash` | `ng stash` (enhanced management) |
+| Blame | `git blame` (line-by-line) | `ng blame` (full commit history with diff) |
+| Log/History | `git log` (static output) | `ng hist` (interactive graph viewer) |
+
+**Key Difference - `ng blame` vs `git blame`:**
+
+| Feature | `git blame` | `ng blame` |
+|---------|-------------|------------|
+| Shows | Line-by-line annotations | Full commit history with diffs |
+| Navigation | Scroll through file | Interactive commit navigation (n/p/j/q) |
+| Diff View | No (use separately) | Yes, included for each commit |
+| File Renames | Limited | Full support with `--follow` |
+| Best For | Finding who changed a line | Understanding file evolution |
 
 ---
 

package/dist/index.js

@@ -1,4 +1,4 @@
-import { addFiles, colors, createCheckbox, createCommand, createConfirm, createHelpExample, createInput, createNote, createOptions, createSearch, createSelect, createSpinner, exit, getCurrentBranch, getGitStatus, intro, isEmpty, isString, loadConfig, log, outro, readPackage, x, xASync } from "@nemo-cli/shared";
+import { addFiles, colors, createCheckbox, createCommand, createConfirm, createHelpExample, createInput, createNote, createOptions, createSelect, createSpinner, exit, getCurrentBranch, getGitStatus, intro, isEmpty, isString, loadConfig, log, outro, readPackage, safeAwait, x, xASync } from "@nemo-cli/shared";
 import { BigText, ErrorMessage, Message, renderHistViewer, renderStashList, renderStatusViewer } from "@nemo-cli/ui";
 import path, { dirname, join } from "node:path";
 import readline from "node:readline";
@@ -376,7 +376,7 @@ const getLocalBranches = async () => {
 		currentBranch: formatBranch$1(currentBranch)
 	};
 };
-const getRemoteOptions = async () => {
+const getRemoteBranchOptions = async () => {
 	const { branches } = await getRemoteBranches();
 	const currentBranch = await getCurrentBranch();
 	return {
@@ -388,7 +388,7 @@ const getRemoteOptions = async () => {
 		currentBranch
 	};
 };
-const getLocalOptions = async () => {
+const getLocalBranchOptions = async () => {
 	const { branches, currentBranch } = await getLocalBranches();
 	return {
 		options: branches.map((branch) => ({
@@ -399,7 +399,7 @@ const getLocalOptions = async () => {
 		currentBranch
 	};
 };
-const getRemoteOptionsForRemotes = async () => {
+const getRemoteRepositoryOptions = async () => {
 	const { remotes } = await getRemotes();
 	const validRemotes = remotes.filter((remote) => remote.trim().length > 0);
 	const uniqueRemotes = Array.from(new Set(validRemotes));
@@ -494,18 +494,18 @@ const handleMergeCommit = async () => {
 	}
 };
 const handleGitPull = async (branch, options = {}) => {
-	const { rebase = false } = options;
+	const { rebase = false, remote = "origin" } = options;
 	const modeText = rebase ? "rebase" : "merge";
 	log.show(`Pulling from remote (${modeText} mode)...`, { type: "step" });
 	try {
 		const [error, result] = await xASync("git", rebase ? [
 			"pull",
 			"--rebase",
-			"origin",
+			remote,
 			branch
 		] : [
 			"pull",
-			"origin",
+			remote,
 			branch
 		], { nodeOptions: { stdio: "inherit" } });
 		if (error) {
@@ -881,13 +881,13 @@ function checkoutCommand(command) {
 			initialValue: true
 		});
 		if (isLocal) {
-			const { options } = await getLocalOptions();
+			const { options } = await getLocalBranchOptions();
 			handleCheckout(await createSelect({
 				message: `Select the ${colors.bgGreen(" local ")} branch to checkout`,
 				options
 			}));
 		} else {
-			const { options } = await getRemoteOptions();
+			const { options } = await getRemoteBranchOptions();
 			const selectedBranch = await createSelect({
 				message: `Select the ${colors.bgYellow(" remote ")} branch to checkout`,
 				options
@@ -1089,50 +1089,50 @@ const pushInteractive = async () => {
 		log.error("No branch selected. Aborting push operation.");
 		return;
 	}
-	let remotes;
+	let repositories;
 	try {
-		remotes = (await getRemoteOptionsForRemotes()).remotes;
+		repositories = (await getRemoteRepositoryOptions()).remotes;
 	} catch (error) {
 		log.error(`Failed to get remote repositories: ${error instanceof Error ? error.message : String(error)}`);
 		log.show("Hint: Make sure you're in a git repository and have configured remotes.", { type: "info" });
 		return;
 	}
-	if (remotes.length === 0) {
+	if (repositories.length === 0) {
 		log.error("No remote repositories found. Aborting push operation.");
 		log.show("Hint: Run `git remote add <name> <url>` to add a remote repository.", { type: "info" });
 		return;
 	}
-	let selectedRemote = remotes[0];
-	if (remotes.length > 1) selectedRemote = await createSelect({
+	let selectedRepository = repositories[0];
+	if (repositories.length > 1) selectedRepository = await createSelect({
 		message: "Select remote repository",
-		options: remotes.map((remote) => ({
-			label: remote,
-			value: remote
+		options: repositories.map((repo) => ({
+			label: repo,
+			value: repo
 		})),
-		initialValue: remotes[0]
+		initialValue: repositories[0]
 	});
-	if (await createConfirm({ message: `Do you want to push ${colors.bgGreen(currentBranch)} to ${selectedRemote}?` })) {
-		await handlePush(currentBranch, selectedRemote);
+	if (await createConfirm({ message: `Do you want to push ${colors.bgGreen(currentBranch)} to ${selectedRepository}?` })) {
+		await handlePush(currentBranch, selectedRepository);
 		return;
 	}
-	const { options } = await getRemoteOptions();
+	const { options } = await getRemoteBranchOptions();
 	const selectedBranch = await createSelect({
 		message: "Select the branch to push",
 		options,
 		initialValue: "main"
 	});
-	let pushRemote = selectedRemote;
-	if (remotes.length > 1) {
-		if (!await createConfirm({ message: `Push ${colors.bgGreen(selectedBranch)} to ${selectedRemote}?` })) pushRemote = await createSelect({
+	selectedRepository = repositories[0];
+	if (repositories.length > 1) {
+		if (!await createConfirm({ message: `Push ${colors.bgGreen(selectedBranch)} to ${selectedRepository}?` })) selectedRepository = await createSelect({
 			message: "Select remote repository",
-			options: remotes.map((remote) => ({
-				label: remote,
-				value: remote
+			options: repositories.map((repo) => ({
+				label: repo,
+				value: repo
 			})),
-			initialValue: selectedRemote
+			initialValue: selectedRepository
 		});
 	}
-	await handlePush(selectedBranch, pushRemote);
+	await handlePush(selectedBranch, selectedRepository);
 };
 
 //#endregion
@@ -1807,24 +1807,43 @@ function listCommand(command) {
 //#region src/commands/merge.ts
 const handleMerge = async (branch) => {
 	const spinner = createSpinner(`Merging branch ${branch}...`);
-	const args = ["merge", branch];
+	const args = [
+		"merge",
+		"--no-edit",
+		branch
+	];
 	const stashResult = await handleGitStash(void 0, {
 		branch,
 		operation: "merge"
 	});
+	if (!stashResult) {
+		spinner.stop("Cannot proceed with merge: failed to stash changes.");
+		return;
+	}
 	try {
-		const [error] = await xASync("git", args, { nodeOptions: { stdio: "inherit" } });
-		if (error) log.show(`Failed to merge branch ${branch}.`, { type: "error" });
-		else spinner.stop(`Successfully merged branch ${branch}.`);
+		const [error, result] = await xASync("git", args, { nodeOptions: { stdio: "inherit" } });
+		if (error) {
+			spinner.stop();
+			const errorMessage = error instanceof Error ? error.message : String(error);
+			throw new Error(`Failed to merge branch ${branch}: ${errorMessage}`);
+		}
+		spinner.stop();
+		if (result.stdout.includes("Merge branch") || result.stdout.includes("Merge made by")) await handleMergeCommit();
+		log.show(colors.green(`Successfully merged branch ${colors.bgGreen(branch)}.`), { type: "success" });
+	} catch (error) {
+		spinner.stop();
+		log.show(`Failed to merge branch ${branch}.`, { type: "error" });
+		log.error(error);
+		throw error;
 	} finally {
-		stashResult && handleGitPop(stashResult);
+		if (stashResult) await handleGitPop(stashResult);
 	}
 };
 function mergeCommand(command) {
 	command.command("merge").alias("mg").argument("[branch]", "The branch to merge").option("-l, --local", "Merge a local branch").option("-r, --remote", "Merge a remote branch").option("-b, --branch <branch>", "Create and merge a new branch").description("Merge a branch").action(async (branch, params) => {
 		let isLocal = params.local;
 		if (branch) {
-			handleMerge(branch);
+			await handleMerge(branch);
 			return;
 		}
 		if (isEmpty(params)) isLocal = await createSelect({
@@ -1839,18 +1858,20 @@ function mergeCommand(command) {
 			initialValue: false
 		});
 		if (isLocal) {
-			const { options } = await getLocalOptions();
-			handleMerge(await createSearch({
+			const { options, currentBranch } = await getLocalBranchOptions();
+			await handleMerge(await createSelect({
 				message: "Select the branch to merge",
-				options
+				options,
+				initialValue: currentBranch
 			}));
 		} else {
-			const { options } = await getRemoteOptions();
-			const selectedBranch = await createSearch({
+			const { options, currentBranch } = await getRemoteBranchOptions();
+			const selectedBranch = await createSelect({
 				message: "Select the branch to merge",
-				options
+				options,
+				initialValue: currentBranch
 			});
-			if (await createConfirm({ message: `Do you want to merge ${colors.bgRed(selectedBranch)}?` })) handleMerge(selectedBranch);
+			if (await createConfirm({ message: `Do you want to merge ${colors.bgRed(selectedBranch)}?` })) await handleMerge(selectedBranch);
 		}
 	});
 }
@@ -1859,7 +1880,40 @@ function mergeCommand(command) {
 //#region src/commands/pull.ts
 function pullCommand(command) {
 	command.command("pull").alias("pl").description("Pull git branch").option("-r, --rebase", "Use rebase mode instead of merge").option("-m, --merge", "Use merge mode (default)").action(async (options) => {
-		const { options: branchOptions, currentBranch } = await getRemoteOptions();
+		const [error, result] = await safeAwait(getRemoteRepositoryOptions());
+		if (error) {
+			log.error(`Failed to get remote repositories: ${error.message}`);
+			return;
+		}
+		const repositories = result.remotes;
+		if (repositories.length === 0) {
+			log.error("No remote repositories found. Aborting pull operation.");
+			log.show("Hint: Use \"git remote add <name> <url>\" to add a remote repository.", { type: "info" });
+			return;
+		}
+		const selectedRepository = repositories.length > 1 ? (await safeAwait(createSelect({
+			message: "Select remote repository",
+			options: result.options,
+			initialValue: repositories[0]
+		})))[1] : repositories[0];
+		if (!selectedRepository) {
+			log.error("No remote selected. Aborting pull operation.");
+			return;
+		}
+		const spinner = createSpinner("Fetching latest remote branches...");
+		const [fetchError] = await xASync("git", [
+			"fetch",
+			selectedRepository,
+			"--prune"
+		], { timeout: 3e4 });
+		if (fetchError) {
+			spinner.stop("Failed to fetch latest remote branches");
+			log.error(`Failed to fetch from ${selectedRepository}: ${fetchError.message}`);
+			log.show("Please check your network connection and try again.", { type: "info" });
+			return;
+		}
+		spinner.stop("Successfully fetched latest remote branches");
+		const { options: branchOptions, currentBranch } = await getRemoteBranchOptions();
 		if (!branchOptions.length) {
 			log.error("No branches found. Please check your git repository.");
 			return;
@@ -1879,11 +1933,11 @@ function pullCommand(command) {
 			options: [{
 				label: "Merge (default)",
 				value: "merge",
-				hint: "git pull origin <branch>"
+				hint: `git pull ${selectedRepository} ${selectedBranch}`
 			}, {
 				label: "Rebase",
 				value: "rebase",
-				hint: "git pull --rebase origin <branch>"
+				hint: `git pull --rebase ${selectedRepository} ${selectedBranch}`
 			}],
 			initialValue: "merge"
 		}) === "rebase";
@@ -1891,7 +1945,10 @@ function pullCommand(command) {
 			branch: selectedBranch,
 			operation: "pull"
 		});
-		await handleGitPull(selectedBranch, { rebase: useRebase });
+		await handleGitPull(selectedBranch, {
+			remote: selectedRepository,
+			rebase: useRebase
+		});
 		stashResult && handleGitPop(stashResult);
 	});
 }