Add pull feature with conflict detection and auto-pull on open

Author: whtiehack

main.js

@@ -65,8 +65,52 @@ export async function commitAll(cwd: string, gitPath: string, message: string):
 	}
 }
 
+async function getCurrentBranch(cwd: string, gitPath: string): Promise<string> {
+	const stdout = await runGit({ cwd, gitPath, args: ["rev-parse", "--abbrev-ref", "HEAD"] });
+	return stdout.trim();
+}
+
 export async function push(cwd: string, gitPath: string): Promise<void> {
-	await runGit({ cwd, gitPath, args: ["push"] });
+	const branch = await getCurrentBranch(cwd, gitPath);
+	await runGit({ cwd, gitPath, args: ["push", "-u", "origin", branch] });
+}
+
+export interface PullResult {
+	success: boolean;
+	hasConflicts: boolean;
+	message: string;
+}
+
+export async function pull(cwd: string, gitPath: string): Promise<PullResult> {
+	try {
+		const branch = await getCurrentBranch(cwd, gitPath);
+		const stdout = await runGit({ cwd, gitPath, args: ["pull", "origin", branch] });
+		return { success: true, hasConflicts: false, message: stdout };
+	} catch (e) {
+		const msg = (e as Error).message;
+		if (msg.includes("CONFLICT") || msg.includes("Merge conflict")) {
+			return { success: false, hasConflicts: true, message: msg };
+		}
+		throw e;
+	}
+}
+
+export async function getConflictFiles(cwd: string, gitPath: string): Promise<string[]> {
+	try {
+		const stdout = await runGit({ cwd, gitPath, args: ["diff", "--name-only", "--diff-filter=U"] });
+		return stdout.split("\n").map(f => f.trim()).filter(Boolean);
+	} catch {
+		return [];
+	}
+}
+
+export async function hasConflicts(cwd: string, gitPath: string): Promise<boolean> {
+	const files = await getConflictFiles(cwd, gitPath);
+	return files.length > 0;
+}
+
+export async function markConflictsResolved(cwd: string, gitPath: string): Promise<void> {
+	await runGit({ cwd, gitPath, args: ["add", "-A"] });
 }
 
 export async function isGitRepo(cwd: string, gitPath: string): Promise<boolean> {
@@ -100,7 +144,7 @@ export async function setRemoteUrl(cwd: string, gitPath: string, url: string): P
 	}
 }
 
-export type FileStatus = "M" | "A" | "D" | "R" | "?" | "";
+export type FileStatus = "M" | "A" | "D" | "R" | "U" | "?" | "";
 
 export async function getFileStatuses(cwd: string, gitPath: string): Promise<Map<string, FileStatus>> {
 	const statusMap = new Map<string, FileStatus>();

src/git.ts

@@ -14,6 +14,9 @@ type Translations = {
 	autoPushName: string;
 	autoPushDesc: string;
 
+	autoPullOnOpenName: string;
+	autoPullOnOpenDesc: string;
+
 	templateName: string;
 	templateDesc: string;
 
@@ -39,16 +42,26 @@ type Translations = {
 	remoteUrlPlaceholder: string;
 	saveButton: string;
 
+	// Conflict
+	conflictStatusName: string;
+	conflictStatusDesc: string;
+	resolveConflictButton: string;
+
 	// Notices
 	noticeNoChanges: string;
 	noticeCommitted: (count: number) => string;
 	noticePushed: string;
+	noticePulled: string;
 	noticeAutoGitError: (msg: string) => string;
 	noticePushFailed: (msg: string) => string;
+	noticePullFailed: (msg: string) => string;
 	noticeMobileNotSupported: string;
 	noticeDesktopOnly: string;
 	noticeRepoInitialized: string;
 	noticeRemoteSaved: string;
+	noticeConflictDetected: string;
+	noticeConflictResolved: string;
+	noticeCannotCommitConflict: string;
 };
 
 const en: Translations = {
@@ -66,6 +79,9 @@ const en: Translations = {
 	autoPushName: "Auto push after commit",
 	autoPushDesc: "Push to remote after successful commit.",
 
+	autoPullOnOpenName: "Auto pull on open",
+	autoPullOnOpenDesc: "Pull from remote when Obsidian opens.",
+
 	templateName: "Commit message template",
 	templateDesc: "Variables: {{date}}, {{time}}, {{files}}, {{count}}",
 
@@ -90,15 +106,24 @@ const en: Translations = {
 	remoteUrlPlaceholder: "https://github.com/user/repo.git",
 	saveButton: "Save",
 
+	conflictStatusName: "Merge conflicts detected",
+	conflictStatusDesc: "Please resolve conflicts manually, then click the button below.",
+	resolveConflictButton: "Mark as resolved",
+
 	noticeNoChanges: "GitAutoCommit: No changes to commit.",
 	noticeCommitted: (count) => `GitAutoCommit: Committed ${count} file(s).`,
 	noticePushed: "GitAutoCommit: Pushed to remote.",
+	noticePulled: "GitAutoCommit: Pulled from remote.",
 	noticeAutoGitError: (msg) => `GitAutoCommit: Error - ${msg}`,
 	noticePushFailed: (msg) => `GitAutoCommit: Push failed - ${msg}`,
+	noticePullFailed: (msg) => `GitAutoCommit: Pull failed - ${msg}`,
 	noticeMobileNotSupported: "GitAutoCommit: Git not available on mobile.",
 	noticeDesktopOnly: "GitAutoCommit: Requires desktop vault.",
 	noticeRepoInitialized: "GitAutoCommit: Repository initialized.",
 	noticeRemoteSaved: "GitAutoCommit: Remote URL saved.",
+	noticeConflictDetected: "GitAutoCommit: Merge conflicts detected! Please resolve manually.",
+	noticeConflictResolved: "GitAutoCommit: Conflicts marked as resolved.",
+	noticeCannotCommitConflict: "GitAutoCommit: Cannot commit while conflicts exist.",
 };
 
 const zhCN: Translations = {
@@ -116,6 +141,9 @@ const zhCN: Translations = {
 	autoPushName: "提交后自动推送",
 	autoPushDesc: "提交成功后自动推送到远程仓库。",
 
+	autoPullOnOpenName: "打开时自动拉取",
+	autoPullOnOpenDesc: "打开 Obsidian 时自动从远程仓库拉取。",
+
 	templateName: "提交消息模板",
 	templateDesc: "变量: {{date}}, {{time}}, {{files}}, {{count}}",
 
@@ -140,15 +168,24 @@ const zhCN: Translations = {
 	remoteUrlPlaceholder: "https://github.com/user/repo.git",
 	saveButton: "保存",
 
+	conflictStatusName: "检测到合并冲突",
+	conflictStatusDesc: "请手动解决冲突后，点击下方按钮。",
+	resolveConflictButton: "标记为已解决",
+
 	noticeNoChanges: "GitAutoCommit: 没有可提交的更改。",
 	noticeCommitted: (count) => `GitAutoCommit: 已提交 ${count} 个文件。`,
 	noticePushed: "GitAutoCommit: 已推送到远程仓库。",
+	noticePulled: "GitAutoCommit: 已从远程仓库拉取。",
 	noticeAutoGitError: (msg) => `GitAutoCommit: 错误 - ${msg}`,
 	noticePushFailed: (msg) => `GitAutoCommit: 推送失败 - ${msg}`,
+	noticePullFailed: (msg) => `GitAutoCommit: 拉取失败 - ${msg}`,
 	noticeMobileNotSupported: "GitAutoCommit: 移动端不支持 Git。",
 	noticeDesktopOnly: "GitAutoCommit: 需要桌面端。",
 	noticeRepoInitialized: "GitAutoCommit: 仓库已初始化。",
 	noticeRemoteSaved: "GitAutoCommit: 远程地址已保存。",
+	noticeConflictDetected: "GitAutoCommit: 检测到合并冲突！请手动解决。",
+	noticeConflictResolved: "GitAutoCommit: 冲突已标记为解决。",
+	noticeCannotCommitConflict: "GitAutoCommit: 存在冲突时无法提交。",
 };
 
 const translations: Record<string, Translations> = {

src/i18n.ts

@@ -1,6 +1,6 @@
 import { EventRef, Notice, Platform, Plugin, TAbstractFile, TFile, FileSystemAdapter } from "obsidian";
 import { AutoGitSettings, AutoGitSettingTab, DEFAULT_SETTINGS } from "./settings";
-import { getChangedFiles, commitAll, push, getFileStatuses, FileStatus } from "./git";
+import { getChangedFiles, commitAll, push, pull, getFileStatuses, getConflictFiles, hasConflicts, markConflictsResolved, FileStatus } from "./git";
 import { renderTemplate } from "./template";
 import { t } from "./i18n";
 
@@ -13,6 +13,9 @@ export default class AutoGitPlugin extends Plugin {
 	private vaultEventRefs: EventRef[] = [];
 	private statusRefreshInterval: number | null = null;
 	private currentStatuses: Map<string, FileStatus> = new Map();
+	private conflictFiles: Set<string> = new Set();
+	private _hasConflicts = false;
+	private resolveConflictCommand: { id: string } | null = null;
 
 	async onload() {
 		await this.loadSettings();
@@ -35,8 +38,23 @@ export default class AutoGitPlugin extends Plugin {
 			},
 		});
 
+		this.addCommand({
+			id: "pull-now",
+			name: "Pull now",
+			callback: () => this.doPull(),
+		});
+
 		this.setupVaultListeners();
 		this.setupStatusBadges();
+
+		// Auto pull on open
+		if (this.settings.autoPullOnOpen && !Platform.isMobileApp) {
+			// Delay to ensure vault is ready
+			window.setTimeout(() => this.doPull(), 1000);
+		}
+
+		// Check for existing conflicts on load
+		this.checkConflicts();
 	}
 
 	onunload() {
@@ -131,6 +149,14 @@ export default class AutoGitPlugin extends Plugin {
 	}
 
 	async runCommit(reason: "manual" | "auto"): Promise<boolean> {
+		// Don't commit if there are conflicts
+		if (this._hasConflicts) {
+			if (reason === "manual") {
+				new Notice(t().noticeCannotCommitConflict);
+			}
+			return false;
+		}
+
 		if (this.isCommitting) {
 			this.pendingRerun = true;
 			return false;
@@ -197,6 +223,71 @@ export default class AutoGitPlugin extends Plugin {
 		}
 	}
 
+	private async doPull() {
+		if (Platform.isMobileApp) {
+			new Notice(t().noticeMobileNotSupported);
+			return;
+		}
+
+		try {
+			const cwd = this.getVaultPath();
+			const result = await pull(cwd, this.settings.gitPath);
+
+			if (result.hasConflicts) {
+				await this.checkConflicts();
+				new Notice(t().noticeConflictDetected);
+			} else if (result.success) {
+				new Notice(t().noticePulled);
+				this.refreshStatusBadges();
+			}
+		} catch (e) {
+			new Notice(t().noticePullFailed((e as Error).message));
+		}
+	}
+
+	private async checkConflicts() {
+		const cwd = this.getVaultPathSafe();
+		if (!cwd) return;
+
+		const conflicts = await getConflictFiles(cwd, this.settings.gitPath);
+		this.conflictFiles = new Set(conflicts);
+		this.setHasConflicts(conflicts.length > 0);
+		this.refreshStatusBadges();
+	}
+
+	setHasConflicts(value: boolean) {
+		this._hasConflicts = value;
+
+		if (value && !this.resolveConflictCommand) {
+			// Add resolve conflict command when conflicts exist
+			this.resolveConflictCommand = this.addCommand({
+				id: "resolve-conflicts",
+				name: "Mark conflicts as resolved",
+				callback: async () => {
+					const cwd = this.getVaultPathSafe();
+					if (!cwd) return;
+					try {
+						await markConflictsResolved(cwd, this.settings.gitPath);
+						this.conflictFiles.clear();
+						this.setHasConflicts(false);
+						new Notice(t().noticeConflictResolved);
+						this.refreshStatusBadges();
+					} catch (e) {
+						new Notice((e as Error).message);
+					}
+				},
+			});
+		} else if (!value && this.resolveConflictCommand) {
+			// Remove command when no conflicts - Note: Obsidian doesn't support removing commands
+			// So we just clear the reference
+			this.resolveConflictCommand = null;
+		}
+
+		if (!value) {
+			this.conflictFiles.clear();
+		}
+	}
+
 	// Status badge functionality
 	private setupStatusBadges() {
 		if (Platform.isMobileApp || !this.settings.showStatusBadge) return;
@@ -240,15 +331,21 @@ export default class AutoGitPlugin extends Plugin {
 		// Remove old badges
 		document.querySelectorAll(".git-status-badge").forEach((el) => el.remove());
 
-		// Calculate folder statuses from file statuses
-		const folderStatuses = this.calculateFolderStatuses();
+		// Merge conflict files into statuses with highest priority
+		const mergedStatuses = new Map(this.currentStatuses);
+		this.conflictFiles.forEach((file) => {
+			mergedStatuses.set(file, "U" as FileStatus); // U for unmerged/conflict
+		});
+
+		// Calculate folder statuses from merged statuses
+		const folderStatuses = this.calculateFolderStatuses(mergedStatuses);
 
 		// Add badges to files
 		document.querySelectorAll(".nav-file-title").forEach((item) => {
 			const pathAttr = item.getAttribute("data-path");
 			if (!pathAttr) return;
 
-			const status = this.currentStatuses.get(pathAttr);
+			const status = mergedStatuses.get(pathAttr);
 			if (status) {
 				this.addBadgeToElement(item, status);
 			}
@@ -266,16 +363,17 @@ export default class AutoGitPlugin extends Plugin {
 		});
 	}
 
-	private calculateFolderStatuses(): Map<string, FileStatus> {
+	private calculateFolderStatuses(statuses?: Map<string, FileStatus>): Map<string, FileStatus> {
+		const sourceStatuses = statuses || this.currentStatuses;
 		const folderStatuses = new Map<string, FileStatus>();
 
-		this.currentStatuses.forEach((status, filePath) => {
+		sourceStatuses.forEach((status, filePath) => {
 			// Get all parent folders
 			const parts = filePath.split(/[/\\]/);
 			for (let i = 1; i < parts.length; i++) {
 				const folderPath = parts.slice(0, i).join("/");
 				const existing = folderStatuses.get(folderPath);
-				// Priority: A > M > R > D
+				// Priority: U (conflict) > A > M > R > D
 				if (!existing || this.statusPriority(status) > this.statusPriority(existing)) {
 					folderStatuses.set(folderPath, status);
 				}
@@ -287,6 +385,7 @@ export default class AutoGitPlugin extends Plugin {
 
 	private statusPriority(status: FileStatus): number {
 		switch (status) {
+			case "U": return 5; // Conflict - highest priority
 			case "A": return 4;
 			case "M": return 3;
 			case "R": return 2;
@@ -300,7 +399,9 @@ export default class AutoGitPlugin extends Plugin {
 		badge.className = "git-status-badge";
 		badge.textContent = "●";
 
-		if (status === "M") {
+		if (status === "U") {
+			badge.classList.add("conflict");
+		} else if (status === "M") {
 			badge.classList.add("modified");
 		} else if (status === "A") {
 			badge.classList.add("added");