framer-code-link 0.1.4 → 0.2.1

package/dist/{index.js → index.mjs}

@@ -1,11 +1,9 @@
 #!/usr/bin/env node
-import "node:module";
 import { Command } from "commander";
 import fs from "fs/promises";
 import { WebSocketServer } from "ws";
 import chokidar from "chokidar";
 import path from "path";
-import "url";
 import { createHash } from "crypto";
 import { setupTypeAcquisition } from "@typescript/ata";
 import ts from "typescript";
@@ -17,16 +15,18 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJS = (cb, mod) => function() {
-	return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
+var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
+	if (from && typeof from === "object" || typeof from === "function") {
+		for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+			key = keys[i];
+			if (!__hasOwnProp.call(to, key) && key !== except) {
+				__defProp(to, key, {
+					get: ((k) => from[k]).bind(null, key),
+					enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+				});
+			}
+		}
 	}
 	return to;
 };
@@ -37,7 +37,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 //#endregion
 //#region ../../node_modules/picocolors/picocolors.js
-var require_picocolors = __commonJS({ "../../node_modules/picocolors/picocolors.js"(exports, module) {
+var require_picocolors = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	let p = process || {}, argv = p.argv || [], env = p.env || {};
 	let isColorSupported = !(!!env.NO_COLOR || argv.includes("--no-color")) && (!!env.FORCE_COLOR || argv.includes("--color") || p.platform === "win32" || (p.stdout || {}).isTTY && env.TERM !== "dumb" || !!env.CI);
 	let formatter = (open, close, replace = open) => (input) => {
@@ -102,11 +102,11 @@ var require_picocolors = __commonJS({ "../../node_modules/picocolors/picocolors.
 	};
 	module.exports = createColors();
 	module.exports.createColors = createColors;
-} });
+}));
 
 //#endregion
 //#region src/utils/logging.ts
-var import_picocolors = __toESM(require_picocolors(), 1);
+var import_picocolors = /* @__PURE__ */ __toESM(require_picocolors(), 1);
 let LogLevel = /* @__PURE__ */ function(LogLevel$1) {
 	LogLevel$1[LogLevel$1["DEBUG"] = 0] = "DEBUG";
 	LogLevel$1[LogLevel$1["INFO"] = 1] = "INFO";
@@ -126,7 +126,7 @@ function rewriteLastLine(text) {
 let disconnectTimer = null;
 let isShowingDisconnect = false;
 let hadRecentDisconnect = false;
-const DISCONNECT_DELAY_MS = 2e3;
+const DISCONNECT_DELAY_MS = 4e3;
 function setLogLevel(level) {
 	currentLevel = level;
 }
@@ -184,7 +184,10 @@ function info(message, ...args) {
 */
 function warn(message, ...args) {
 	if (currentLevel <= LogLevel.WARN) {
+		if (message === lastMessage) return;
 		flushDedupe();
+		lastMessage = message;
+		lastMessageCount = 1;
 		console.warn(import_picocolors.default.yellow(`⚠ ${message}`), ...args);
 	}
 }
@@ -282,6 +285,12 @@ function resetDisconnectState() {
 //#endregion
 //#region src/helpers/connection.ts
 /**
+* WebSocket connection helper
+*
+* Thin wrapper around ws.Server that normalizes handshake and surfaces
+* simple callbacks. Keeps raw socket API localized.
+*/
+/**
 * Initializes a WebSocket server and returns a connection interface
 * Returns a Promise that resolves when the server is ready, or rejects on startup errors
 */
@@ -301,7 +310,7 @@ function initConnection(port) {
 					error(`  1. Close any other terminal running Code Link for this project`);
 					error(`  2. Or run: lsof -i :${port} | grep LISTEN`);
 					error(`     Then kill the process: kill -9 <PID>`);
-					reject(new Error(`Port ${port} is already in use`));
+					reject(/* @__PURE__ */ new Error(`Port ${port} is already in use`));
 				} else {
 					error(`Failed to start WebSocket server: ${err.message}`);
 					reject(err);
@@ -315,14 +324,17 @@ function initConnection(port) {
 			debug(`WebSocket server listening on port ${port}`);
 			wss.on("connection", (ws) => {
 				const connId = ++connectionId;
+				let handshakeReceived = false;
 				debug(`Client connected (conn ${connId})`);
 				ws.on("message", (data) => {
 					try {
 						const message = JSON.parse(data.toString());
 						if (message.type === "handshake") {
 							debug(`Received handshake (conn ${connId})`);
+							handshakeReceived = true;
 							handlers.onHandshake?.(ws, message);
-						} else handlers.onMessage?.(message);
+						} else if (handshakeReceived) handlers.onMessage?.(message);
+						else debug(`Ignoring ${message.type} before handshake (conn ${connId})`);
 					} catch (err) {
 						error(`Failed to parse message:`, err);
 					}
@@ -440,8 +452,7 @@ function getPortFromHash(projectHash) {
 		hash = (hash << 5) - hash + char;
 		hash = hash & hash;
 	}
-	const portOffset = Math.abs(hash) % 250;
-	return 3847 + portOffset;
+	return 3847 + Math.abs(hash) % 250;
 }
 
 //#endregion
@@ -536,9 +547,8 @@ function sanitizeFilePath(input, capitalizeReactComponent = true) {
 	const dirName = dirname(trimmed).split("/").map((part) => sanitizedDirectoryName(part)).filter((part) => Boolean(part)).join("/");
 	let name = sanitizedVariableName(inputName) ?? "MyComponent";
 	if ((!hasValidExtension(extension) || extension === tsxExtension) && capitalizeReactComponent) name = capitalizeFirstLetter(name);
-	const sanitizedPath = pathJoin(dirName, name + extension);
 	return {
-		path: sanitizedPath,
+		path: pathJoin(dirName, name + extension),
 		dirName,
 		name,
 		extension
@@ -554,13 +564,15 @@ function isSupportedExtension$1(filePath) {
 * @example pluralize(0, "conflict") => "0 conflicts"
 */
 function pluralize(count, singular, plural) {
-	const word = count === 1 ? singular : plural ?? `${singular}s`;
-	return `${count} ${word}`;
+	return `${count} ${count === 1 ? singular : plural ?? `${singular}s`}`;
 }
 
 //#endregion
 //#region src/utils/paths.ts
 /**
+* Path manipulation utilities
+*/
+/**
 * Gets a relative path from the project directory
 */
 function getRelativePath(projectDir, absolutePath) {
@@ -593,6 +605,13 @@ function normalizePath$1(filePath) {
 //#endregion
 //#region src/helpers/watcher.ts
 /**
+* File watcher helper
+*
+* Thin wrapper around chokidar that normalizes file paths and emits
+* only supported file types (ts, tsx, js, json). Controller never worries
+* about addDir or platform separators.
+*/
+/**
 * Initializes a file watcher for the given directory
 */
 function initWatcher(filesDir) {
@@ -606,8 +625,7 @@ function initWatcher(filesDir) {
 	const emitEvent = async (kind, absolutePath) => {
 		if (!isSupportedExtension$1(absolutePath)) return;
 		const rawRelativePath = normalizePath(getRelativePath(filesDir, absolutePath));
-		const sanitized = sanitizeFilePath(rawRelativePath, false);
-		const relativePath = sanitized.path;
+		const relativePath = sanitizeFilePath(rawRelativePath, false).path;
 		let effectiveAbsolutePath = absolutePath;
 		if (relativePath !== rawRelativePath && kind === "add") {
 			const newAbsolutePath = path.join(filesDir, relativePath);
@@ -650,6 +668,13 @@ function initWatcher(filesDir) {
 
 //#endregion
 //#region src/utils/state-persistence.ts
+/**
+* State persistence helper
+*
+* Persists last sync timestamps along with content hashes.
+* We only trust persisted timestamps if the file content hasn't changed
+* (hash matches), because that means the file wasn't edited while CLI was offline.
+*/
 const STATE_FILE_NAME = ".framer-sync-state.json";
 const CURRENT_VERSION = 2;
 const SUPPORTED_EXTENSIONS$1 = [
@@ -719,6 +744,17 @@ async function savePersistedState(projectDir, state) {
 
 //#endregion
 //#region src/helpers/files.ts
+/**
+* File operations helper
+*
+* Single place that understands disk + conflicts. Provides:
+* - listFiles: returns current filesystem state
+* - detectConflicts: compares remote vs local and returns conflicts + safe writes
+* - writeRemoteFiles: applies writes/deletes from remote
+* - deleteLocalFile: removes a file from disk
+*
+* Controller decides WHEN to call these, but never computes conflicts itself.
+*/
 const SUPPORTED_EXTENSIONS = [
 	".ts",
 	".tsx",
@@ -746,9 +782,7 @@ async function listFiles(filesDir) {
 				continue;
 			}
 			if (!isSupportedExtension(entry.name)) continue;
-			const relativePath = path.relative(filesDir, entryPath);
-			const normalizedPath = normalizePath(relativePath);
-			const sanitizedPath = sanitizeFilePath(normalizedPath, false).path;
+			const sanitizedPath = sanitizeFilePath(normalizePath(path.relative(filesDir, entryPath)), false).path;
 			try {
 				const [content, stats] = await Promise.all([fs.readFile(entryPath, "utf-8"), fs.stat(entryPath)]);
 				files.push({
@@ -772,6 +806,7 @@ async function detectConflicts(remoteFiles, filesDir, options = {}) {
 	const conflicts = [];
 	const writes = [];
 	const localOnly = [];
+	const unchanged = [];
 	const detect = options.detectConflicts ?? true;
 	const preferRemote = options.preferRemote ?? false;
 	const persistedState = options.persistedState;
@@ -780,8 +815,7 @@ async function detectConflicts(remoteFiles, filesDir, options = {}) {
 	const localFiles = await listFiles(filesDir);
 	const localFileMap = new Map(localFiles.map((f) => [normalizeForComparison(f.name), f]));
 	const remoteFileMap = new Map(remoteFiles.map((f) => {
-		const normalized = resolveRemoteReference(filesDir, f.name);
-		return [normalizeForComparison(normalized.relativePath), f];
+		return [normalizeForComparison(resolveRemoteReference(filesDir, f.name).relativePath), f];
 	}));
 	const processedFiles = /* @__PURE__ */ new Set();
 	for (const remote of remoteFiles) {
@@ -809,7 +843,14 @@ async function detectConflicts(remoteFiles, filesDir, options = {}) {
 			});
 			continue;
 		}
-		if (local.content === remote.content) continue;
+		if (local.content === remote.content) {
+			unchanged.push({
+				name: normalized.relativePath,
+				content: remote.content,
+				modifiedAt: remote.modifiedAt
+			});
+			continue;
+		}
 		if (!detect || preferRemote) {
 			writes.push({
 				name: normalized.relativePath,
@@ -834,13 +875,15 @@ async function detectConflicts(remoteFiles, filesDir, options = {}) {
 		if (!processedFiles.has(localKey)) {
 			const persisted = getPersistedState(local.name);
 			if (persisted) {
-				debug(`Conflict: ${local.name} deleted in Framer while offline`);
+				const localClean = hashFileContent(local.content) === persisted.contentHash;
+				debug(`Conflict: ${local.name} deleted in Framer (localClean=${localClean})`);
 				conflicts.push({
 					fileName: local.name,
 					localContent: local.content,
 					remoteContent: null,
 					localModifiedAt: local.modifiedAt,
-					lastSyncedAt: persisted?.timestamp
+					lastSyncedAt: persisted?.timestamp,
+					localClean
 				});
 			} else localOnly.push({
 				name: local.name,
@@ -858,7 +901,8 @@ async function detectConflicts(remoteFiles, filesDir, options = {}) {
 	return {
 		conflicts,
 		writes,
-		localOnly
+		localOnly,
+		unchanged
 	};
 }
 function autoResolveConflicts(conflicts, versions, options = {}) {
@@ -870,7 +914,18 @@ function autoResolveConflicts(conflicts, versions, options = {}) {
 	for (const conflict of conflicts) {
 		const latestRemoteVersionMs = versionMap.get(conflict.fileName);
 		const lastSyncedAt = conflict.lastSyncedAt;
+		const localClean = conflict.localClean === true;
 		debug(`Auto-resolve checking ${conflict.fileName}`);
+		if (conflict.remoteContent === null) {
+			if (localClean) {
+				debug(`  Remote deleted, local clean -> REMOTE (delete locally)`);
+				autoResolvedRemote.push(conflict);
+			} else {
+				debug(`  Remote deleted, local modified -> conflict`);
+				remainingConflicts.push(conflict);
+			}
+			continue;
+		}
 		if (!latestRemoteVersionMs) {
 			debug(`  No remote version data, keeping conflict`);
 			remainingConflicts.push(conflict);
@@ -884,7 +939,6 @@ function autoResolveConflicts(conflicts, versions, options = {}) {
 		debug(`  Remote: ${new Date(latestRemoteVersionMs).toISOString()}`);
 		debug(`  Synced: ${new Date(lastSyncedAt).toISOString()}`);
 		const remoteUnchanged = latestRemoteVersionMs <= lastSyncedAt + remoteDriftMs;
-		const localClean = conflict.localClean === true;
 		if (remoteUnchanged && !localClean) {
 			debug(`  Remote unchanged, local changed -> LOCAL`);
 			autoResolvedLocal.push(conflict);
@@ -932,8 +986,7 @@ async function deleteLocalFile(fileName, filesDir, hashTracker) {
 		hashTracker.forget(normalized.relativePath);
 		debug(`Deleted file: ${normalized.relativePath}`);
 	} catch (err) {
-		const nodeError = err;
-		if (nodeError?.code === "ENOENT") {
+		if (err?.code === "ENOENT") {
 			hashTracker.forget(normalized.relativePath);
 			debug(`File already deleted: ${normalized.relativePath}`);
 			return;
@@ -963,9 +1016,7 @@ function resolveRemoteReference(filesDir, rawName) {
 }
 function sanitizeRelativePath(relativePath) {
 	const trimmed = normalizePath(relativePath.trim());
-	const hasExtension = SUPPORTED_EXTENSIONS.some((ext) => trimmed.toLowerCase().endsWith(ext));
-	const candidate = hasExtension ? trimmed : `${trimmed}${DEFAULT_EXTENSION}`;
-	const sanitized = sanitizeFilePath(candidate, false);
+	const sanitized = sanitizeFilePath(SUPPORTED_EXTENSIONS.some((ext) => trimmed.toLowerCase().endsWith(ext)) ? trimmed : `${trimmed}${DEFAULT_EXTENSION}`, false);
 	const normalized = normalizePath(sanitized.path);
 	return {
 		relativePath: normalized,
@@ -1017,12 +1068,14 @@ function extractImports(code) {
 * Attempt to derive an npm-style package specifier from a URL import.
 */
 function extractPackageFromUrl(url) {
-	const match = url.match(/\/(@?[^@\/]+(?:\/[^@\/]+)?)/);
-	return match?.[1] ?? null;
+	return url.match(/\/(@?[^@\/]+(?:\/[^@\/]+)?)/)?.[1] ?? null;
 }
 
 //#endregion
 //#region src/helpers/installer.ts
+/**
+* Type installer helper using @typescript/ata
+*/
 const FETCH_TIMEOUT_MS = 6e4;
 const MAX_FETCH_RETRIES = 3;
 const REACT_TYPES_VERSION = "18.3.12";
@@ -1061,11 +1114,8 @@ var Installer = class {
 					const normalized = receivedPath.replace(/^\//, "");
 					const destination = path.join(this.projectDir, normalized);
 					const pkgMatch = receivedPath.match(/\/node_modules\/(@?[^\/]+(?:\/[^\/]+)?)\//);
-					let isFromCache = false;
 					try {
-						const existing = await fs.readFile(destination, "utf-8");
-						if (existing === code) {
-							isFromCache = true;
+						if (await fs.readFile(destination, "utf-8") === code) {
 							if (pkgMatch && !seenPackages.has(pkgMatch[1])) {
 								seenPackages.add(pkgMatch[1]);
 								debug(`📦 Types: ${pkgMatch[1]} (from disk cache)`);
@@ -1164,15 +1214,9 @@ var Installer = class {
 			const pkg = npmData.versions[version];
 			if (pkg.exports && typeof pkg.exports === "object") {
 				const fixExport = (value) => {
-					if (typeof value === "string") {
-						const tsPath = value.replace(/\.js$/, ".d.ts").replace(/\.cjs$/, ".d.cts");
-						return { types: tsPath };
-					}
+					if (typeof value === "string") return { types: value.replace(/\.js$/, ".d.ts").replace(/\.cjs$/, ".d.cts") };
 					if (value && typeof value === "object") {
-						if ((value.import || value.require) && !value.types) {
-							const base = value.import || value.require;
-							value.types = base.replace(/\.js$/, ".d.ts").replace(/\.cjs$/, ".d.cts");
-						}
+						if ((value.import || value.require) && !value.types) value.types = (value.import || value.require).replace(/\.js$/, ".d.ts").replace(/\.cjs$/, ".d.cts");
 					}
 					return value;
 				};
@@ -1199,7 +1243,7 @@ var Installer = class {
 			await fs.access(tsconfigPath);
 			debug("tsconfig.json already exists");
 		} catch {
-			const config = {
+			await fs.writeFile(tsconfigPath, JSON.stringify({
 				compilerOptions: {
 					noEmit: true,
 					target: "ES2021",
@@ -1222,8 +1266,7 @@ var Installer = class {
 					typeRoots: ["./node_modules/@types"]
 				},
 				include: ["files/**/*", "framer-modules.d.ts"]
-			};
-			await fs.writeFile(tsconfigPath, JSON.stringify(config, null, 2));
+			}, null, 2));
 			debug("Created tsconfig.json");
 		}
 	}
@@ -1233,12 +1276,11 @@ var Installer = class {
 			await fs.access(prettierPath);
 			debug(".prettierrc already exists");
 		} catch {
-			const config = {
+			await fs.writeFile(prettierPath, JSON.stringify({
 				tabWidth: 4,
 				semi: false,
 				trailingComma: "es5"
-			};
-			await fs.writeFile(prettierPath, JSON.stringify(config, null, 2));
+			}, null, 2));
 			debug("Created .prettierrc");
 		}
 	}
@@ -1248,14 +1290,13 @@ var Installer = class {
 			await fs.access(declarationsPath);
 			debug("framer-modules.d.ts already exists");
 		} catch {
-			const declarations = `// Type declarations for Framer URL imports
+			await fs.writeFile(declarationsPath, `// Type declarations for Framer URL imports
 declare module "https://framer.com/m/*"
 
 declare module "https://framerusercontent.com/*"
 
 declare module "*.json"
-`;
-			await fs.writeFile(declarationsPath, declarations);
+`);
 			debug("Created framer-modules.d.ts");
 		}
 	}
@@ -1302,8 +1343,7 @@ declare module "*.json"
 		try {
 			const pkgJsonPath = path.join(destinationDir, "package.json");
 			const pkgJson = await fs.readFile(pkgJsonPath, "utf-8");
-			const parsed = JSON.parse(pkgJson);
-			if (parsed.version !== version) return false;
+			if (JSON.parse(pkgJson).version !== version) return false;
 			for (const file of files) {
 				if (file === "package.json") continue;
 				await fs.access(path.join(destinationDir, file));
@@ -1362,6 +1402,12 @@ async function fetchWithRetry(url, init, retries = MAX_FETCH_RETRIES) {
 //#endregion
 //#region src/utils/hash-tracker.ts
 /**
+* Hash tracking utilities for echo prevention
+*
+* The hash tracker prevents echo loops by remembering content hashes
+* and skipping watcher events for files we just wrote.
+*/
+/**
 * Creates a hash tracker instance for echo prevention
 */
 function createHashTracker() {
@@ -1374,8 +1420,7 @@ function createHashTracker() {
 		},
 		shouldSkip(filePath, content) {
 			const currentHash = hashContent(content);
-			const storedHash = hashes.get(filePath);
-			return storedHash === currentHash;
+			return hashes.get(filePath) === currentHash;
 		},
 		forget(filePath) {
 			hashes.delete(filePath);
@@ -1637,8 +1682,7 @@ async function getProjectHashFromCwd() {
 	try {
 		const packageJsonPath = path.join(process.cwd(), "package.json");
 		const content = await fs.readFile(packageJsonPath, "utf-8");
-		const pkg = JSON.parse(content);
-		return pkg.shortProjectHash ?? null;
+		return JSON.parse(content).shortProjectHash ?? null;
 	} catch {
 		return null;
 	}
@@ -1670,8 +1714,7 @@ async function findOrCreateProjectDir(projectHash, projectName, explicitDir) {
 	return projectDir;
 }
 async function findExistingProjectDir(baseDir, projectHash) {
-	const candidate = path.join(baseDir, "package.json");
-	if (await matchesProject(candidate, projectHash)) return baseDir;
+	if (await matchesProject(path.join(baseDir, "package.json"), projectHash)) return baseDir;
 	const entries = await fs.readdir(baseDir, { withFileTypes: true });
 	for (const entry of entries) {
 		if (!entry.isDirectory()) continue;
@@ -1693,6 +1736,11 @@ async function matchesProject(packageJsonPath, projectHash) {
 
 //#endregion
 //#region src/controller.ts
+/**
+* Controller
+* Single source of truth for all runtime state and orchestrates the sync lifecycle.
+* Helpers are functions that provide data - they never hold control or callbacks.
+*/
 /** Log helper */
 function log(level, message) {
 	return {
@@ -1702,13 +1750,23 @@ function log(level, message) {
 	};
 }
 /**
+* Filter out files whose content matches the last remembered hash.
+* Used to skip inbound echoes of our own local sends.
+*/
+function filterEchoedFiles(files, hashTracker) {
+	return files.filter((file) => {
+		if (file.content === void 0) return true;
+		return !hashTracker.shouldSkip(file.name, file.content);
+	});
+}
+/**
 * Pure state transition function
 * Takes current state + event, returns new state + effects to execute
 */
 function transition(state, event) {
 	const effects = [];
 	switch (event.type) {
-		case "HANDSHAKE": {
+		case "HANDSHAKE":
 			if (state.mode !== "disconnected") {
 				effects.push(log("warn", `Received HANDSHAKE in mode ${state.mode}, ignoring`));
 				return {
@@ -1731,8 +1789,7 @@ function transition(state, event) {
 				},
 				effects
 			};
-		}
-		case "FILE_SYNCED": {
+		case "FILE_SYNCED":
 			effects.push(log("debug", `Remote confirmed sync: ${event.fileName}`), {
 				type: "UPDATE_FILE_METADATA",
 				fileName: event.fileName,
@@ -1742,11 +1799,10 @@ function transition(state, event) {
 				state,
 				effects
 			};
-		}
-		case "DISCONNECT": {
+		case "DISCONNECT":
 			effects.push({ type: "PERSIST_STATE" }, log("debug", "Disconnected, persisting state"));
 			if (state.mode === "conflict_resolution") {
-				const { pendingConflicts: _discarded,...rest } = state;
+				const { pendingConflicts: _discarded, ...rest } = state;
 				return {
 					state: {
 						...rest,
@@ -1764,8 +1820,7 @@ function transition(state, event) {
 				},
 				effects
 			};
-		}
-		case "REQUEST_FILES": {
+		case "REQUEST_FILES":
 			if (state.mode === "disconnected") {
 				effects.push(log("warn", "Received REQUEST_FILES while disconnected, ignoring"));
 				return {
@@ -1778,8 +1833,7 @@ function transition(state, event) {
 				state,
 				effects
 			};
-		}
-		case "FILE_LIST": {
+		case "FILE_LIST":
 			if (state.mode !== "handshaking") {
 				effects.push(log("warn", `Received FILE_LIST in mode ${state.mode}, ignoring`));
 				return {
@@ -1800,7 +1854,6 @@ function transition(state, event) {
 				},
 				effects
 			};
-		}
 		case "CONFLICTS_DETECTED": {
 			if (state.mode !== "snapshot_processing") {
 				effects.push(log("warn", `Received CONFLICTS_DETECTED in mode ${state.mode}, ignoring`));
@@ -1840,7 +1893,6 @@ function transition(state, event) {
 					effects
 				};
 			}
-			const totalSynced = safeWrites.length + localOnly.length;
 			const remoteTotal = state.queuedDiffs.length;
 			const totalCount = remoteTotal + localOnly.length;
 			const updatedCount = safeWrites.length + localOnly.length;
@@ -1881,14 +1933,15 @@ function transition(state, event) {
 			}
 			effects.push(log("debug", `Applying remote change: ${event.file.name}`), {
 				type: "WRITE_FILES",
-				files: [event.file]
+				files: [event.file],
+				skipEcho: true
 			});
 			return {
 				state,
 				effects
 			};
 		}
-		case "REMOTE_FILE_DELETE": {
+		case "REMOTE_FILE_DELETE":
 			if (state.mode === "disconnected") {
 				effects.push(log("warn", `Rejected delete while disconnected: ${event.fileName}`));
 				return {
@@ -1904,8 +1957,7 @@ function transition(state, event) {
 				state,
 				effects
 			};
-		}
-		case "REMOTE_DELETE_CONFIRMED": {
+		case "REMOTE_DELETE_CONFIRMED":
 			effects.push(log("debug", `Delete confirmed: ${event.fileName}`), {
 				type: "DELETE_LOCAL_FILES",
 				names: [event.fileName]
@@ -1914,8 +1966,7 @@ function transition(state, event) {
 				state,
 				effects
 			};
-		}
-		case "REMOTE_DELETE_CANCELLED": {
+		case "REMOTE_DELETE_CANCELLED":
 			effects.push(log("debug", `Delete cancelled: ${event.fileName}`));
 			effects.push({
 				type: "WRITE_FILES",
@@ -1929,7 +1980,6 @@ function transition(state, event) {
 				state,
 				effects
 			};
-		}
 		case "CONFLICTS_RESOLVED": {
 			if (state.mode !== "conflict_resolution") {
 				effects.push(log("warn", `Received CONFLICTS_RESOLVED in mode ${state.mode}, ignoring`));
@@ -1976,7 +2026,7 @@ function transition(state, event) {
 				updatedCount: state.pendingConflicts.length,
 				unchangedCount: 0
 			});
-			const { pendingConflicts: _discarded,...rest } = state;
+			const { pendingConflicts: _discarded, ...rest } = state;
 			return {
 				state: {
 					...rest,
@@ -1996,7 +2046,7 @@ function transition(state, event) {
 			}
 			switch (kind) {
 				case "add":
-				case "change": {
+				case "change":
 					if (content === void 0) {
 						effects.push(log("warn", `Watcher event missing content: ${relativePath}`));
 						return {
@@ -2010,15 +2060,13 @@ function transition(state, event) {
 						content
 					});
 					break;
-				}
-				case "delete": {
+				case "delete":
 					effects.push(log("debug", `Local delete detected: ${relativePath}`), {
 						type: "REQUEST_LOCAL_DELETE_DECISION",
 						fileName: relativePath,
 						requireConfirmation: true
 					});
 					break;
-				}
 			}
 			return {
 				state,
@@ -2084,7 +2132,7 @@ function transition(state, event) {
 				updatedCount: resolvedCount,
 				unchangedCount: 0
 			});
-			const { pendingConflicts: _discarded,...rest } = state;
+			const { pendingConflicts: _discarded, ...rest } = state;
 			return {
 				state: {
 					...rest,
@@ -2094,13 +2142,12 @@ function transition(state, event) {
 				effects
 			};
 		}
-		default: {
+		default:
 			effects.push(log("warn", `Unhandled event type in transition`));
 			return {
 				state,
 				effects
 			};
-		}
 	}
 }
 /**
@@ -2110,7 +2157,7 @@ function transition(state, event) {
 async function executeEffect(effect, context) {
 	const { config, hashTracker, installer, fileMetadataCache, userActions, syncState } = context;
 	switch (effect.type) {
-		case "INIT_WORKSPACE": {
+		case "INIT_WORKSPACE":
 			if (!config.projectDir) {
 				const projectName = config.explicitName ?? effect.projectInfo.projectName;
 				config.projectDir = await findOrCreateProjectDir(config.projectHash, projectName, config.explicitDir);
@@ -2119,14 +2166,12 @@ async function executeEffect(effect, context) {
 				await fs.mkdir(config.filesDir, { recursive: true });
 			}
 			return [];
-		}
-		case "LOAD_PERSISTED_STATE": {
+		case "LOAD_PERSISTED_STATE":
 			if (config.projectDir) {
 				await fileMetadataCache.initialize(config.projectDir);
 				debug(`Loaded persisted metadata for ${fileMetadataCache.size()} files`);
 			}
 			return [];
-		}
 		case "LIST_LOCAL_FILES": {
 			if (!config.filesDir) return [];
 			const files = await listFiles(config.filesDir);
@@ -2138,7 +2183,8 @@ async function executeEffect(effect, context) {
 		}
 		case "DETECT_CONFLICTS": {
 			if (!config.filesDir) return [];
-			const { conflicts, writes, localOnly } = await detectConflicts(effect.remoteFiles, config.filesDir, { persistedState: fileMetadataCache.getPersistedState() });
+			const { conflicts, writes, localOnly, unchanged } = await detectConflicts(effect.remoteFiles, config.filesDir, { persistedState: fileMetadataCache.getPersistedState() });
+			for (const file of unchanged) fileMetadataCache.recordRemoteWrite(file.name, file.content, file.modifiedAt ?? Date.now());
 			return [{
 				type: "CONFLICTS_DETECTED",
 				conflicts,
@@ -2146,36 +2192,34 @@ async function executeEffect(effect, context) {
 				localOnly
 			}];
 		}
-		case "SEND_MESSAGE": {
+		case "SEND_MESSAGE":
 			if (syncState.socket) {
-				const sent = await sendMessage(syncState.socket, effect.payload);
-				if (!sent) warn(`Failed to send message: ${effect.payload.type}`);
+				if (!await sendMessage(syncState.socket, effect.payload)) warn(`Failed to send message: ${effect.payload.type}`);
 			} else warn(`No socket available to send: ${effect.payload.type}`);
 			return [];
-		}
-		case "WRITE_FILES": {
+		case "WRITE_FILES":
 			if (config.filesDir) {
-				await writeRemoteFiles(effect.files, config.filesDir, hashTracker, installer ?? void 0);
-				for (const file of effect.files) {
+				const filesToWrite = effect.skipEcho === true ? filterEchoedFiles(effect.files, hashTracker) : effect.files;
+				if (effect.skipEcho && filesToWrite.length !== effect.files.length) debug(`Skipped ${pluralize(effect.files.length - filesToWrite.length, "echoed change")}`);
+				if (filesToWrite.length === 0) return [];
+				await writeRemoteFiles(filesToWrite, config.filesDir, hashTracker, installer ?? void 0);
+				for (const file of filesToWrite) {
 					if (!effect.silent) fileDown(file.name);
 					const remoteTimestamp = file.modifiedAt ?? Date.now();
 					fileMetadataCache.recordRemoteWrite(file.name, file.content, remoteTimestamp);
 				}
 			}
 			return [];
-		}
-		case "DELETE_LOCAL_FILES": {
+		case "DELETE_LOCAL_FILES":
 			if (config.filesDir) for (const fileName of effect.names) {
 				await deleteLocalFile(fileName, config.filesDir, hashTracker);
 				fileDelete(fileName);
 				fileMetadataCache.recordDelete(fileName);
 			}
 			return [];
-		}
-		case "REQUEST_CONFLICT_DECISIONS": {
+		case "REQUEST_CONFLICT_DECISIONS":
 			await userActions.requestConflictDecisions(syncState.socket, effect.conflicts);
 			return [];
-		}
 		case "REQUEST_CONFLICT_VERSIONS": {
 			if (!syncState.socket) {
 				warn("Cannot request conflict versions without active socket");
@@ -2196,14 +2240,13 @@ async function executeEffect(effect, context) {
 			});
 			return [];
 		}
-		case "REQUEST_DELETE_CONFIRMATION": {
+		case "REQUEST_DELETE_CONFIRMATION":
 			if (syncState.socket) await sendMessage(syncState.socket, {
 				type: "file-delete",
 				fileNames: [effect.fileName],
 				requireConfirmation: effect.requireConfirmation
 			});
 			return [];
-		}
 		case "UPDATE_FILE_METADATA": {
 			if (!config.filesDir || !config.projectDir) return [];
 			const currentContent = await readFileSafe(effect.fileName, config.filesDir);
@@ -2215,8 +2258,7 @@ async function executeEffect(effect, context) {
 		}
 		case "SEND_LOCAL_CHANGE": {
 			const contentHash = hashFileContent(effect.content);
-			const metadata = fileMetadataCache.get(effect.fileName);
-			if (metadata?.lastSyncedHash === contentHash) {
+			if (fileMetadataCache.get(effect.fileName)?.lastSyncedHash === contentHash) {
 				debug(`Skipping local change for ${effect.fileName}: matches last synced content`);
 				return [];
 			}
@@ -2238,18 +2280,16 @@ async function executeEffect(effect, context) {
 			}
 			return [];
 		}
-		case "REQUEST_LOCAL_DELETE_DECISION": {
-			const shouldSkip = hashTracker.shouldSkipDelete(effect.fileName);
-			if (shouldSkip) {
+		case "REQUEST_LOCAL_DELETE_DECISION":
+			if (hashTracker.shouldSkipDelete(effect.fileName)) {
 				hashTracker.clearDelete(effect.fileName);
 				return [];
 			}
 			try {
-				const shouldDelete = await userActions.requestDeleteDecision(syncState.socket, {
+				if (await userActions.requestDeleteDecision(syncState.socket, {
 					fileName: effect.fileName,
 					requireConfirmation: !config.dangerouslyAutoDelete
-				});
-				if (shouldDelete) {
+				})) {
 					hashTracker.forget(effect.fileName);
 					fileMetadataCache.recordDelete(effect.fileName);
 					if (syncState.socket) await sendMessage(syncState.socket, {
@@ -2261,13 +2301,12 @@ async function executeEffect(effect, context) {
 				console.warn(`Failed to handle deletion for ${effect.fileName}:`, err);
 			}
 			return [];
-		}
-		case "PERSIST_STATE": {
+		case "PERSIST_STATE":
 			await fileMetadataCache.flush();
 			return [];
-		}
 		case "SYNC_COMPLETE": {
 			const wasDisconnected = wasRecentlyDisconnected();
+			if (syncState.socket) await sendMessage(syncState.socket, { type: "sync-complete" });
 			if (wasDisconnected) {
 				if (didShowDisconnect()) {
 					success(`Reconnected, synced ${effect.totalCount} files (${effect.updatedCount} updated, ${effect.unchangedCount} unchanged)`);
@@ -2280,11 +2319,9 @@ async function executeEffect(effect, context) {
 			status("Watching for changes...");
 			return [];
 		}
-		case "LOG": {
-			const logFn = effect.level === "info" ? info : effect.level === "warn" ? warn : debug;
-			logFn(effect.message);
+		case "LOG":
+			(effect.level === "info" ? info : effect.level === "warn" ? warn : debug)(effect.message);
 			return [];
-		}
 	}
 }
 /**
@@ -2347,8 +2384,7 @@ async function start(config) {
 			startWatcher();
 		}
 		cancelDisconnectMessage();
-		const wasDisconnected = wasRecentlyDisconnected();
-		if (!wasDisconnected && !didShowDisconnect()) success(`Connected to ${message.projectName}`);
+		if (!wasRecentlyDisconnected() && !didShowDisconnect()) success(`Connected to ${message.projectName}`);
 	});
 	async function handleMessage(message) {
 		if (!config.projectDir || !installer) {
@@ -2380,26 +2416,22 @@ async function start(config) {
 					fileMeta: fileMetadataCache.get(message.fileName)
 				};
 				break;
-			case "file-delete": {
+			case "file-delete":
 				for (const fileName of message.fileNames) await processEvent({
 					type: "REMOTE_FILE_DELETE",
 					fileName
 				});
 				return;
-			}
 			case "delete-confirmed": {
 				const unmatched = [];
-				for (const fileName of message.fileNames) {
-					const handled = userActions.handleConfirmation(`delete:${fileName}`, true);
-					if (!handled) unmatched.push(fileName);
-				}
+				for (const fileName of message.fileNames) if (!userActions.handleConfirmation(`delete:${fileName}`, true)) unmatched.push(fileName);
 				for (const fileName of unmatched) await processEvent({
 					type: "REMOTE_DELETE_CONFIRMED",
 					fileName
 				});
 				return;
 			}
-			case "delete-cancelled": {
+			case "delete-cancelled":
 				for (const file of message.files) {
 					userActions.handleConfirmation(`delete:${file.fileName}`, false);
 					await processEvent({
@@ -2409,7 +2441,6 @@ async function start(config) {
 					});
 				}
 				return;
-			}
 			case "file-synced":
 				event = {
 					type: "FILE_SYNCED",
@@ -2474,6 +2505,12 @@ async function start(config) {
 
 //#endregion
 //#region src/index.ts
+/**
+* Framer Code Link CLI - Next Generation
+*
+* Entry point for the CLI tool. Parses command-line arguments and starts
+* the controller with the appropriate configuration.
+*/
 const program = new Command();
 program.exitOverride((err) => {
 	if (err.code === "commander.missingArgument") {
@@ -2494,13 +2531,12 @@ program.name("code-link").description("Sync Framer code components to your local
 	}
 	const isDev = process.env.NODE_ENV === "development";
 	if (options.logLevel) {
-		const levelMap = {
+		const level = {
 			debug: LogLevel.DEBUG,
 			info: LogLevel.INFO,
 			warn: LogLevel.WARN,
 			error: LogLevel.ERROR
-		};
-		const level = levelMap[options.logLevel.toLowerCase()];
+		}[options.logLevel.toLowerCase()];
 		if (level !== void 0) setLogLevel(level);
 	} else if (options.verbose || isDev) setLogLevel(LogLevel.DEBUG);
 	const port = getPortFromHash(projectHash);