@lisang233/pi-sync 0.2.2 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@lisang233/pi-sync",
-	"version": "0.2.2",
+	"version": "0.2.3",
 	"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/operations.ts

@@ -31,8 +31,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,
@@ -227,7 +229,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. Resolve with /sync merge --ours, /sync merge --theirs, or /sync mergetool. Then run /sync merge. (remote ${shortId(
 			remoteRevision,
 		)})`;
 		ctx.ui.notify(message, "warning");
@@ -403,9 +405,19 @@ 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 mergetool        (open 3-way merge tool)",
+			"  /sync merge --abort    (discard merge and restore)",
+		].join("\n");
 		ctx.ui.notify(message, "error");
 		return { pushed: false, pulled: false, merged: false, message };
 	}