pushwork 1.1.3 → 1.1.4

package/src/core/change-detection.ts

@@ -25,6 +25,11 @@ import {
 import {isContentEqual, contentHash} from "../utils/content"
 import {out} from "../utils/output"
 
+const isDebug = !!process.env.DEBUG
+function debug(...args: any[]) {
+	if (isDebug) console.error("[pushwork:change-detection]", ...args)
+}
+
 /**
  * Change detection engine
  */
@@ -50,7 +55,7 @@ export class ChangeDetector {
 	/**
 	 * Detect all changes between local filesystem and snapshot
 	 */
-	async detectChanges(snapshot: SyncSnapshot): Promise<DetectedChange[]> {
+	async detectChanges(snapshot: SyncSnapshot, excludePaths?: Set<string>): Promise<DetectedChange[]> {
 		const changes: DetectedChange[] = []
 
 		// Get current filesystem state
@@ -65,7 +70,7 @@ export class ChangeDetector {
 		changes.push(...remoteChanges)
 
 		// Check for new remote documents not in snapshot (critical for clone scenarios)
-		const newRemoteDocuments = await this.detectNewRemoteDocuments(snapshot)
+		const newRemoteDocuments = await this.detectNewRemoteDocuments(snapshot, excludePaths)
 		changes.push(...newRemoteDocuments)
 
 		return changes
@@ -337,7 +342,8 @@ export class ChangeDetector {
 	 * This is critical for clone scenarios where local snapshot is empty
 	 */
 	private async detectNewRemoteDocuments(
-		snapshot: SyncSnapshot
+		snapshot: SyncSnapshot,
+		excludePaths?: Set<string>
 	): Promise<DetectedChange[]> {
 		const changes: DetectedChange[] = []
 
@@ -352,7 +358,8 @@ export class ChangeDetector {
 				snapshot.rootDirectoryUrl,
 				"",
 				snapshot,
-				changes
+				changes,
+				excludePaths
 			)
 		} catch (error) {
 			out.taskLine(`Failed to discover remote documents: ${error}`, true)
@@ -368,7 +375,8 @@ export class ChangeDetector {
 		directoryUrl: AutomergeUrl,
 		currentPath: string,
 		snapshot: SyncSnapshot,
-		changes: DetectedChange[]
+		changes: DetectedChange[],
+		excludePaths?: Set<string>
 	): Promise<void> {
 		try {
 			// Find and wait for document to be available (retries on "unavailable")
@@ -387,6 +395,12 @@ export class ChangeDetector {
 					: entry.name
 
 				if (entry.type === "file") {
+					// Skip files that were deliberately deleted during this sync cycle
+					if (excludePaths?.has(entryPath)) {
+						debug(`skipping deleted path during re-detection: ${entryPath}`)
+						continue
+					}
+
 					// Check if this file is already tracked in the snapshot
 					const existingEntry = snapshot.files.get(entryPath)
 
@@ -470,7 +484,8 @@ export class ChangeDetector {
 						entry.url,
 						entryPath,
 						snapshot,
-						changes
+						changes,
+						excludePaths
 					)
 				}
 			}

package/src/core/sync-engine.ts

@@ -433,6 +433,8 @@ export class SyncEngine {
 			// Detect all changes
 			debug("sync: detecting changes")
 			out.update("Detecting local and remote changes")
+			// Capture pre-push snapshot file paths to detect deletions after push
+			const prePushFilePaths = new Set(snapshot.files.keys())
 			const changes = await this.changeDetector.detectChanges(snapshot)
 
 			// Detect moves
@@ -560,8 +562,18 @@ export class SyncEngine {
 			}
 
 			// Re-detect changes after network sync for fresh state
+			// Compute paths deleted during push so they aren't resurrected during pull
+			const deletedPaths = new Set<string>()
+			for (const p of prePushFilePaths) {
+				if (!snapshot.files.has(p)) {
+					deletedPaths.add(p)
+				}
+			}
+			if (deletedPaths.size > 0) {
+				debug(`sync: excluding ${deletedPaths.size} deleted paths from re-detection`)
+			}
 			debug("sync: re-detecting changes after network sync")
-			const freshChanges = await this.changeDetector.detectChanges(snapshot)
+			const freshChanges = await this.changeDetector.detectChanges(snapshot, deletedPaths)
 			const freshRemoteChanges = freshChanges.filter(
 				c =>
 					c.changeType === ChangeType.REMOTE_ONLY ||