@lisang233/pi-sync 0.2.2 → 0.2.4

package/README.md

@@ -19,9 +19,9 @@ detection and merging are handled by git itself.
   rewritten remote doesn't spuriously conflict.
 - **Git-native three-way merge** — `/sync pull` merges the remote branch into
   the local side. Divergent edits keep local configuration protected while
-  holding conflicts in the mirror; `/sync mergetool` or `--ours`/`--theirs`
-  resolve them, and `/sync merge` validates (no markers, valid JSON) before
-  applying to local files.
+  holding conflicts in the mirror; `--ours`/`--theirs` or manual edits resolve
+  them, and `/sync merge` validates (no markers, valid JSON) before applying to
+  local files.
 - **Deliberate commands** — nothing moves your files without being asked;
   `automatic` only observes at session start.
 - **Sensible defaults** — one `pi-sync.json` points at a git remote and branch,
@@ -48,7 +48,6 @@ pi install npm:@lisang233/pi-sync
 /sync status       # config + sync state + next step (--diff for content)
 /sync fetch        # pull the remote tree without applying
 /sync pull         # fetch + merge (--force overwrites local)
-/sync mergetool    # launch git mergetool for conflicts ([tool])
 /sync merge        # complete merge (--abort, --ours, --theirs)
 /sync push         # publish the local tree (--force overwrites remote)
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@lisang233/pi-sync",
-	"version": "0.2.2",
+	"version": "0.2.4",
 	"description": "Personal Pi extension that syncs Pi configuration through Git with background auto-sync and git-style fetch/merge conflict handling.",
 	"type": "module",
 	"license": "MIT",

package/src/extension.ts

@@ -15,17 +15,7 @@ interface BackgroundSync {
 	settled: Promise<void>;
 }
 
-const COMMANDS = [
-	"init",
-	"status",
-	"push",
-	"pull",
-	"fetch",
-	"merge",
-	"mergetool",
-	"config",
-	"help",
-] as const;
+const COMMANDS = ["init", "status", "push", "pull", "fetch", "merge", "config", "help"] as const;
 
 type Subcommand = (typeof COMMANDS)[number];
 
@@ -41,7 +31,6 @@ const USAGE = [
 	"  fetch               fetch the remote tree without applying",
 	"  pull                fetch + merge (--force overwrites local)",
 	"  merge               complete merge (--abort, --ours, --theirs)",
-	"  mergetool           launch git mergetool for conflicts ([tool])",
 	"  push                publish local tree (--force overwrites remote)",
 	"  help                show this help",
 ].join("\n");
@@ -226,11 +215,6 @@ async function handleCommand(
 				theirs: restTokens.some((token) => token === "--theirs"),
 			});
 			return;
-		case "mergetool": {
-			const tool = restTokens.find((token) => !token.startsWith("-"));
-			await operations.mergetool(ctx, config, tool);
-			return;
-		}
 		case "config":
 			await runConfigEditor(ctx.ui, config);
 			return;

package/src/git.ts

@@ -386,30 +386,6 @@ export async function checkoutTheirs(options: GitRunOptions = {}): Promise<void>
 	await stageAll(options);
 }
 
-/**
- * Launch git mergetool interactively in the mirror work tree.
- */
-export async function launchMergetool(tool?: string, options: GitRunOptions = {}): Promise<void> {
-	throwIfAborted(options.signal);
-	const repo = gitCwd();
-	const args = ["mergetool", "-y"];
-	if (tool && tool.trim().length > 0) {
-		args.push(`--tool=${tool.trim()}`);
-	}
-	await new Promise<void>((resolve, reject) => {
-		const child = spawn("git", args, {
-			cwd: repo,
-			stdio: process.stdin.isTTY ? "inherit" : ["ignore", "pipe", "pipe"],
-			windowsHide: false,
-		});
-		child.on("error", reject);
-		child.on("close", (code) => {
-			if (code === 0) resolve();
-			else reject(new Error(`git mergetool exited with status ${code ?? "unknown"}.`));
-		});
-	});
-}
-
 /** Abort an in-progress merge, restoring the work tree to the pre-merge state. */
 export async function abortMerge(options: GitRunOptions = {}): Promise<void> {
 	await runGit(["merge", "--abort"], { cwd: gitCwd(), signal: options.signal });

package/src/operations.ts

@@ -20,7 +20,6 @@ import {
 	ensureMirror,
 	fetchRemote,
 	isMergeInProgress,
-	launchMergetool,
 	listConflictedPaths,
 	mergeRemote,
 	pushBranch,
@@ -31,8 +30,10 @@ import {
 	resetHard,
 	stageAll,
 } from "./git.js";
+import { agentDir } from "./paths.js";
 import { classifyState, type StateClassify, syncIndicatorText } from "./status.js";
 import {
+	agentTarget,
 	collectAgentFiles,
 	copyMirrorToAgent,
 	graftAgentIntoMirror,
@@ -124,7 +125,7 @@ function nextStepHint(info: StateClassify): string {
 		case "behind":
 			return "next: /sync pull to fetch and apply remote changes";
 		case "conflict":
-			return "next: /sync merge (--ours, --theirs, or mergetool), or /sync pull --force to overwrite local";
+			return "next: /sync merge (--ours or --theirs), or /sync pull --force to overwrite local";
 		case "unknown":
 			return "next: /sync fetch to check the remote";
 	}
@@ -227,7 +228,7 @@ export async function pull(
 			// ignore
 		}
 		const conflictList = conflicts.length > 0 ? ` (${conflicts.join(", ")})` : "";
-		const message = `Merge conflict in ${conflicts.length} file(s)${conflictList}. Local configuration was preserved. Resolve with /sync merge --ours, /sync merge --theirs, or /sync mergetool. Then run /sync merge. (remote ${shortId(
+		const message = `Merge conflict in ${conflicts.length} file(s)${conflictList}. Local configuration in ${agentDir()} was preserved. Edit files or resolve with /sync merge --ours / --theirs. Then run /sync merge. (remote ${shortId(
 			remoteRevision,
 		)})`;
 		ctx.ui.notify(message, "warning");
@@ -403,9 +404,18 @@ export async function merge(
 	if (errors.length > 0) {
 		const errorDetails = errors
 			.slice(0, 5)
-			.map((e) => `  - ${e.path}${e.line ? `:${e.line}` : ""}: ${e.reason}`)
+			.map((e) => `  - ${agentTarget(e.path)}${e.line ? `:${e.line}` : ""}: ${e.reason}`)
 			.join("\n");
-		const message = `Cannot complete merge: ${errors.length} unresolved issue(s) detected.\n${errorDetails}\nResolve them or run /sync merge --abort.`;
+		const message = [
+			`Cannot complete merge: ${errors.length} unresolved issue(s) detected.`,
+			errorDetails,
+			"",
+			`To resolve manually, edit files in: ${agentDir()}`,
+			"Or choose a resolution strategy:",
+			"  /sync merge --ours     (keep local configuration)",
+			"  /sync merge --theirs   (use remote configuration)",
+			"  /sync merge --abort    (discard merge and restore)",
+		].join("\n");
 		ctx.ui.notify(message, "error");
 		return { pushed: false, pulled: false, merged: false, message };
 	}
@@ -420,38 +430,6 @@ export async function merge(
 	return { pushed: false, pulled: false, merged: true, message };
 }
 
-export async function mergetool(
-	ctx: CommandContext,
-	config: SyncConfig,
-	tool?: string,
-): Promise<SyncResult> {
-	if (!(await isMergeInProgress({ signal: ctx.signal }))) {
-		const message =
-			"No merge in progress. Run /sync pull to merge remote changes into local files.";
-		ctx.ui.notify(message, "info");
-		return { pushed: false, pulled: false, merged: false, message };
-	}
-
-	try {
-		await launchMergetool(tool, { signal: ctx.signal });
-		await refreshIndicator(ctx, config);
-		const conflicts = await listConflictedPaths({ signal: ctx.signal });
-		if (conflicts.length === 0) {
-			ctx.ui.notify("Mergetool finished. Run /sync merge to validate and apply.", "info");
-		} else {
-			ctx.ui.notify(
-				`Mergetool finished, but ${conflicts.length} file(s) still conflicted.`,
-				"warning",
-			);
-		}
-		return { pushed: false, pulled: false, merged: false, message: "mergetool" };
-	} catch (error) {
-		const message = `Failed to run mergetool: ${error instanceof Error ? error.message : String(error)}`;
-		ctx.ui.notify(message, "error");
-		return { pushed: false, pulled: false, merged: false, message };
-	}
-}
-
 function describeChanges(summary: ReturnType<typeof diffSummary>): string {
 	const parts: string[] = [];
 	if (summary.added > 0) parts.push(`${summary.added} added`);

package/src/status.ts

@@ -135,6 +135,6 @@ export function syncIndicatorText(info: SyncStatusInfo): string {
 		case "behind":
 			return `sync: ${info.behind} behind — pull`;
 		case "conflict":
-			return `sync: conflict (${info.conflicts}) — /sync merge or mergetool`;
+			return `sync: conflict (${info.conflicts}) — /sync merge`;
 	}
 }