framer-code-link 0.3.0 → 0.4.1

package/dist/index.mjs

@@ -5,6 +5,7 @@ import fs from "fs/promises";
 import { WebSocketServer } from "ws";
 import chokidar from "chokidar";
 import path from "path";
+import { getPortFromHash, isSupportedExtension, normalizePath, pluralize, sanitizeFilePath, shortProjectHash } from "@code-link/shared";
 import { createHash } from "crypto";
 import { setupTypeAcquisition } from "@typescript/ata";
 import ts from "typescript";
@@ -118,7 +119,6 @@ let LogLevel = /* @__PURE__ */ function(LogLevel$1) {
 let currentLevel = LogLevel.INFO;
 let lastMessage = "";
 let lastMessageCount = 0;
-let lastCategory = "other";
 const CLEAR_LINE = "\x1B[2K";
 const MOVE_CURSOR_UP = "\x1B[1A";
 function rewriteLastLine(text) {
@@ -144,16 +144,6 @@ function flushDedupe() {
 	lastMessageCount = 0;
 }
 /**
-* Handle category transition - adds newline when switching categories
-*/
-function transitionCategory(newCategory) {
-	if (lastCategory !== newCategory) {
-		flushDedupe();
-		console.log();
-		lastCategory = newCategory;
-	}
-}
-/**
 * Log with deduplication - repeated messages within window get counted
 */
 function logWithDedupe(message, writer) {
@@ -187,9 +177,10 @@ function debug(message, ...args) {
 */
 function info(message, ...args) {
 	if (currentLevel <= LogLevel.INFO) {
-		transitionCategory("other");
 		const formatted = args.length > 0 ? `${message} ${args.join(" ")}` : message;
-		logWithDedupe(formatted, () => console.log(formatted));
+		logWithDedupe(formatted, () => {
+			console.log(formatted);
+		});
 	}
 }
 /**
@@ -198,7 +189,6 @@ function info(message, ...args) {
 function warn(message, ...args) {
 	if (currentLevel <= LogLevel.WARN) {
 		if (message === lastMessage) return;
-		transitionCategory("other");
 		flushDedupe();
 		lastMessage = message;
 		lastMessageCount = 1;
@@ -210,7 +200,6 @@ function warn(message, ...args) {
 */
 function error(message, ...args) {
 	if (currentLevel <= LogLevel.ERROR) {
-		transitionCategory("other");
 		flushDedupe();
 		console.error(import_picocolors.default.red(`✗ ${message}`), ...args);
 	}
@@ -220,7 +209,6 @@ function error(message, ...args) {
 */
 function success(message, ...args) {
 	if (currentLevel <= LogLevel.INFO) {
-		transitionCategory("other");
 		flushDedupe();
 		console.log(import_picocolors.default.green(`✓ ${message}`), ...args);
 	}
@@ -230,23 +218,26 @@ function success(message, ...args) {
 */
 function fileDown(fileName) {
 	if (currentLevel <= LogLevel.INFO) {
-		transitionCategory("file-sync");
 		const msg = `  ${import_picocolors.default.blue("↓")} ${fileName}`;
-		logWithDedupe(msg, () => console.log(msg));
+		logWithDedupe(msg, () => {
+			console.log(msg);
+		});
 	}
 }
 function fileUp(fileName) {
 	if (currentLevel <= LogLevel.INFO) {
-		transitionCategory("file-sync");
 		const msg = `  ${import_picocolors.default.green("↑")} ${fileName}`;
-		logWithDedupe(msg, () => console.log(msg));
+		logWithDedupe(msg, () => {
+			console.log(msg);
+		});
 	}
 }
 function fileDelete(fileName) {
 	if (currentLevel <= LogLevel.INFO) {
-		transitionCategory("file-sync");
 		const msg = `  ${import_picocolors.default.red("×")} ${fileName}`;
-		logWithDedupe(msg, () => console.log(msg));
+		logWithDedupe(msg, () => {
+			console.log(msg);
+		});
 	}
 }
 /**
@@ -254,7 +245,6 @@ function fileDelete(fileName) {
 */
 function status(message) {
 	if (currentLevel <= LogLevel.INFO) {
-		transitionCategory("other");
 		flushDedupe();
 		console.log(import_picocolors.default.dim(`  ${message}`));
 	}
@@ -307,8 +297,7 @@ function resetDisconnectState() {
 /**
 * WebSocket connection helper
 *
-* Thin wrapper around ws.Server that normalizes handshake and surfaces
-* simple callbacks. Keeps raw socket API localized.
+* Wrapper around ws.Server that normalizes handshake and surfaces callbacks.
 */
 /**
 * Initializes a WebSocket server and returns a connection interface
@@ -360,7 +349,7 @@ function initConnection(port) {
 					}
 				});
 				ws.on("close", (code, reason) => {
-					debug(`Client disconnected (code: ${code}, reason: ${reason?.toString() || "none"})`);
+					debug(`Client disconnected (code: ${code}, reason: ${reason.toString()})`);
 					handlers.onDisconnect?.();
 				});
 				ws.on("error", (err) => {
@@ -369,10 +358,20 @@ function initConnection(port) {
 			});
 			resolve({
 				on(event, handler) {
-					if (event === "handshake") handlers.onHandshake = handler;
-					else if (event === "message") handlers.onMessage = handler;
-					else if (event === "disconnect") handlers.onDisconnect = handler;
-					else if (event === "error") handlers.onError = handler;
+					switch (event) {
+						case "handshake":
+							handlers.onHandshake = handler;
+							break;
+						case "message":
+							handlers.onMessage = handler;
+							break;
+						case "disconnect":
+							handlers.onDisconnect = handler;
+							break;
+						case "error":
+							handlers.onError = handler;
+							break;
+					}
 				},
 				close() {
 					wss.close();
@@ -421,174 +420,7 @@ function sendMessage(socket, message) {
 }
 
 //#endregion
-//#region ../shared/dist/hash.js
-/**
-* Base58 alphabet (no 0/O/I/l to avoid confusion)
-*/
-const BASE58 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
-/**
-* Derive a short, deterministic hash from the full Framer project hash.
-* Uses a simple numeric hash encoded in base58 for compactness.
-* Idempotent: if input is already the target length, returns it unchanged.
-*/
-function shortProjectHash(fullHash, length = 8) {
-	if (fullHash.length === length) return fullHash;
-	let h1 = 0;
-	let h2 = 0;
-	for (let i = 0; i < fullHash.length; i++) {
-		const char = fullHash.charCodeAt(i);
-		h1 = Math.imul(h1 ^ char, 2246822507);
-		h2 = Math.imul(h2 ^ char, 3266489909);
-	}
-	h1 ^= h2 >>> 16;
-	h2 ^= h1 >>> 13;
-	let result = "";
-	const combined = [Math.abs(h1), Math.abs(h2)];
-	for (const num of combined) {
-		let n = num >>> 0;
-		while (n > 0 && result.length < length) {
-			result += BASE58[n % 58];
-			n = Math.floor(n / 58);
-		}
-	}
-	while (result.length < length) result += BASE58[0];
-	return result.slice(0, length);
-}
-
-//#endregion
-//#region ../shared/dist/ports.js
-/**
-* Generate a deterministic port number from a project hash (full or short).
-* Port range: 3847-4096 (250 possible ports)
-* Must match between CLI and plugin.
-*
-* Internally normalizes to the short id so both full and short inputs yield the same port.
-*/
-function getPortFromHash(projectHash) {
-	const shortId = shortProjectHash(projectHash);
-	let hash = 0;
-	for (let i = 0; i < shortId.length; i++) {
-		const char = shortId.charCodeAt(i);
-		hash = (hash << 5) - hash + char;
-		hash = hash & hash;
-	}
-	return 3847 + Math.abs(hash) % 250;
-}
-
-//#endregion
-//#region ../shared/dist/paths.js
-/**
-* File path normalization utilities
-* Framer code files include extensions in their paths (.tsx, .ts, etc.)
-*/
-const firstCharacterRegex = /^[a-zA-Z$_]/;
-const remainingCharactersRegex = /[^a-zA-Z0-9$_]/g;
-const onlyDotsRegex = /^\.+$/;
-const tsxExtension = ".tsx";
-var NameType;
-(function(NameType$1) {
-	NameType$1["Variable"] = "Variable";
-	NameType$1["Selector"] = "Selector";
-	NameType$1["Directory"] = "Directory";
-})(NameType || (NameType = {}));
-function sanitizedName(type, name) {
-	if (!name) return null;
-	let validName = name.trim();
-	if (validName.length === 0) return null;
-	const validFirstChar = type === NameType.Selector ? "_" : "$";
-	if (type === NameType.Directory) {
-		if (onlyDotsRegex.test(validName)) return null;
-	} else if (!firstCharacterRegex.test(validName)) validName = validFirstChar + validName;
-	validName = validName.replace(remainingCharactersRegex, "_");
-	validName = validName.replace(/_+/g, "_");
-	validName = validName.replace(/^\$_/u, validFirstChar);
-	return validName;
-}
-function sanitizedVariableName(name) {
-	return sanitizedName(NameType.Variable, name);
-}
-function sanitizedDirectoryName(name) {
-	return sanitizedName(NameType.Directory, name);
-}
-function capitalizeFirstLetter(str) {
-	if (str.length === 0) return str;
-	return str.charAt(0).toUpperCase() + str.slice(1);
-}
-function hasValidExtension(fileName) {
-	if (fileName.endsWith(".json")) return true;
-	return /\.[tj]sx?$/u.test(fileName);
-}
-function splitExtension(fileName) {
-	const match = fileName.match(/^(.+?)(\.[^.]+)?$/);
-	if (!match) return [fileName, ""];
-	return [match[1], match[2]?.slice(1) || ""];
-}
-function dirname(filePath) {
-	const at = filePath.lastIndexOf("/");
-	if (at < 0) return "";
-	return filePath.slice(0, at);
-}
-function filename(filePath) {
-	const at = filePath.lastIndexOf("/") + 1;
-	return filePath.slice(at);
-}
-function pathJoin(...parts) {
-	let res = "";
-	parts.forEach((part) => {
-		while (part.startsWith("/")) part = part.slice(1);
-		while (part.endsWith("/")) part = part.slice(0, -1);
-		if (part === "") return;
-		if (res !== "") res += "/";
-		res += part;
-	});
-	return res;
-}
-function normalizePath(filePath) {
-	if (!filePath) return "";
-	const isAbsolute = filePath.startsWith("/");
-	const segments = filePath.replace(/\\/g, "/").split("/");
-	const stack = [];
-	for (const segment of segments) {
-		if (!segment || segment === ".") continue;
-		if (segment === "..") {
-			if (stack.length > 0) stack.pop();
-			continue;
-		}
-		stack.push(segment);
-	}
-	const normalized = stack.join("/");
-	if (isAbsolute) return `/${normalized}`;
-	return normalized;
-}
-function sanitizeFilePath(input, capitalizeReactComponent = true) {
-	const trimmed = input.trim();
-	let [inputName, extension] = splitExtension(filename(trimmed));
-	if (extension) extension = `.${extension}`;
-	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);
-	return {
-		path: pathJoin(dirName, name + extension),
-		dirName,
-		name,
-		extension
-	};
-}
-function isSupportedExtension$1(filePath) {
-	return /\.(tsx?|jsx?|json)$/i.test(filePath);
-}
-/**
-* Pluralize a word based on count
-* @example pluralize(1, "file") => "1 file"
-* @example pluralize(3, "file") => "3 files"
-* @example pluralize(0, "conflict") => "0 conflicts"
-*/
-function pluralize(count, singular, plural) {
-	return `${count} ${count === 1 ? singular : plural ?? `${singular}s`}`;
-}
-
-//#endregion
-//#region src/utils/paths.ts
+//#region src/utils/node-paths.ts
 /**
 * Path manipulation utilities
 */
@@ -627,9 +459,7 @@ function normalizePath$1(filePath) {
 /**
 * 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.
+* Wrapper around chokidar that normalizes file paths and filters to ts, tsx, js, json.
 */
 /**
 * Initializes a file watcher for the given directory
@@ -637,13 +467,13 @@ function normalizePath$1(filePath) {
 function initWatcher(filesDir) {
 	const handlers = [];
 	const watcher = chokidar.watch(filesDir, {
-		ignored: /(^|[\/\\])\../,
+		ignored: /(^|[/\\])\.\./,
 		persistent: true,
 		ignoreInitial: false
 	});
 	debug(`Watching directory: ${filesDir}`);
 	const emitEvent = async (kind, absolutePath) => {
-		if (!isSupportedExtension$1(absolutePath)) return;
+		if (!isSupportedExtension(absolutePath)) return;
 		const rawRelativePath = normalizePath(getRelativePath(filesDir, absolutePath));
 		const relativePath = sanitizeFilePath(rawRelativePath, false).path;
 		let effectiveAbsolutePath = absolutePath;
@@ -673,12 +503,18 @@ function initWatcher(filesDir) {
 		debug(`Watcher event: ${kind} ${relativePath}`);
 		for (const handler of handlers) handler(event);
 	};
-	watcher.on("add", (filePath) => emitEvent("add", filePath));
-	watcher.on("change", (filePath) => emitEvent("change", filePath));
-	watcher.on("unlink", (filePath) => emitEvent("delete", filePath));
+	watcher.on("add", (filePath) => {
+		emitEvent("add", filePath);
+	});
+	watcher.on("change", (filePath) => {
+		emitEvent("change", filePath);
+	});
+	watcher.on("unlink", (filePath) => {
+		emitEvent("delete", filePath);
+	});
 	return {
-		on(event, handler) {
-			if (event === "change") handlers.push(handler);
+		on(_event, handler) {
+			handlers.push(handler);
 		},
 		async close() {
 			await watcher.close();
@@ -696,7 +532,7 @@ function initWatcher(filesDir) {
 * (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 CURRENT_VERSION = 1;
 const SUPPORTED_EXTENSIONS$1 = [
 	".ts",
 	".tsx",
@@ -801,7 +637,7 @@ async function listFiles(filesDir) {
 				await walk(entryPath);
 				continue;
 			}
-			if (!isSupportedExtension(entry.name)) continue;
+			if (!isSupportedExtension$1(entry.name)) continue;
 			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)]);
@@ -831,7 +667,7 @@ async function detectConflicts(remoteFiles, filesDir, options = {}) {
 	const preferRemote = options.preferRemote ?? false;
 	const persistedState = options.persistedState;
 	const getPersistedState = (fileName) => persistedState?.get(normalizeForComparison(fileName)) ?? persistedState?.get(fileName);
-	debug(`Detecting conflicts for ${remoteFiles.length} remote files`);
+	debug(`Detecting conflicts for ${String(remoteFiles.length)} remote files`);
 	const localFiles = await listFiles(filesDir);
 	const localFileMap = new Map(localFiles.map((f) => [normalizeForComparison(f.name), f]));
 	const remoteFileMap = new Map(remoteFiles.map((f) => {
@@ -854,7 +690,7 @@ async function detectConflicts(remoteFiles, filesDir, options = {}) {
 					localContent: null,
 					remoteContent: remote.content,
 					remoteModifiedAt: remote.modifiedAt,
-					lastSyncedAt: persisted?.timestamp
+					lastSyncedAt: persisted.timestamp
 				});
 			} else writes.push({
 				name: normalized.relativePath,
@@ -896,13 +732,13 @@ async function detectConflicts(remoteFiles, filesDir, options = {}) {
 			const persisted = getPersistedState(local.name);
 			if (persisted) {
 				const localClean = hashFileContent(local.content) === persisted.contentHash;
-				debug(`Conflict: ${local.name} deleted in Framer (localClean=${localClean})`);
+				debug(`Conflict: ${local.name} deleted in Framer (localClean=${String(localClean)})`);
 				conflicts.push({
 					fileName: local.name,
 					localContent: local.content,
 					remoteContent: null,
 					localModifiedAt: local.modifiedAt,
-					lastSyncedAt: persisted?.timestamp,
+					lastSyncedAt: persisted.timestamp,
 					localClean
 				});
 			} else localOnly.push({
@@ -1006,7 +842,7 @@ async function deleteLocalFile(fileName, filesDir, hashTracker) {
 		hashTracker.forget(normalized.relativePath);
 		debug(`Deleted file: ${normalized.relativePath}`);
 	} catch (err) {
-		if (err?.code === "ENOENT") {
+		if (err.code === "ENOENT") {
 			hashTracker.forget(normalized.relativePath);
 			debug(`File already deleted: ${normalized.relativePath}`);
 			return;
@@ -1026,6 +862,15 @@ async function readFileSafe(fileName, filesDir) {
 		return null;
 	}
 }
+/**
+* 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) => {
+		return !hashTracker.shouldSkip(file.name, file.content);
+	});
+}
 function resolveRemoteReference(filesDir, rawName) {
 	const normalized = sanitizeRelativePath(rawName);
 	const absolutePath = path.join(filesDir, normalized.relativePath);
@@ -1043,7 +888,7 @@ function sanitizeRelativePath(relativePath) {
 		extension: sanitized.extension || path.extname(normalized) || DEFAULT_EXTENSION
 	};
 }
-function isSupportedExtension(fileName) {
+function isSupportedExtension$1(fileName) {
 	const lower = fileName.toLowerCase();
 	return SUPPORTED_EXTENSIONS.some((ext) => lower.endsWith(ext));
 }
@@ -1056,7 +901,7 @@ function isSupportedExtension(fileName) {
 function extractImports(code) {
 	const imports = [];
 	const seen = /* @__PURE__ */ new Set();
-	const npmRegex = /import\s+(?:(?:\*\s+as\s+\w+)|(?:\w+)|(?:\{[^}]*\}))\s+from\s+['"]([^.\/][^'"]+)['"]/g;
+	const npmRegex = /import\s+(?:(?:\*\s+as\s+\w+)|(?:\w+)|(?:\{[^}]*\}))\s+from\s+['"]([^./][^'"]+)['"]/g;
 	const urlRegex = /import\s+(?:(?:\*\s+as\s+\w+)|(?:\w+)|(?:\{[^}]*\}))\s+from\s+['"]https?:\/\/[^'"]+['"]/g;
 	let match;
 	while ((match = npmRegex.exec(code)) !== null) {
@@ -1088,7 +933,7 @@ function extractImports(code) {
 * Attempt to derive an npm-style package specifier from a URL import.
 */
 function extractPackageFromUrl(url) {
-	return url.match(/\/(@?[^@\/]+(?:\/[^@\/]+)?)/)?.[1] ?? null;
+	return /\/(@?[^@/]+(?:\/[^@/]+)?)/.exec(url)?.[1] ?? null;
 }
 
 //#endregion
@@ -1141,29 +986,31 @@ var Installer = class {
 				},
 				progress: () => {},
 				finished: (files) => {
-					if (files && files.size > 0) debug("ATA: type acquisition complete");
+					if (files.size > 0) debug("ATA: type acquisition complete");
 				},
 				errorMessage: (message, error$1) => {
 					warn(`ATA warning: ${message}`, error$1);
 				},
-				receivedFile: async (code, receivedPath) => {
-					const normalized = receivedPath.replace(/^\//, "");
-					const destination = path.join(this.projectDir, normalized);
-					const pkgMatch = receivedPath.match(/\/node_modules\/(@?[^\/]+(?:\/[^\/]+)?)\//);
-					try {
-						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)`);
+				receivedFile: (code, receivedPath) => {
+					(async () => {
+						const normalized = receivedPath.replace(/^\//, "");
+						const destination = path.join(this.projectDir, normalized);
+						const pkgMatch = /\/node_modules\/(@?[^/]+(?:\/[^/]+)?)\//.exec(receivedPath);
+						try {
+							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)`);
+								}
+								return;
 							}
-							return;
+						} catch {}
+						if (pkgMatch && !seenPackages.has(pkgMatch[1])) {
+							seenPackages.add(pkgMatch[1]);
+							debug(`📦 Types: ${pkgMatch[1]}`);
 						}
-					} catch {}
-					if (pkgMatch && !seenPackages.has(pkgMatch[1])) {
-						seenPackages.add(pkgMatch[1]);
-						debug(`📦 Types: ${pkgMatch[1]}`);
-					}
-					await this.writeTypeFile(receivedPath, code);
+						await this.writeTypeFile(receivedPath, code);
+					})();
 				}
 			}
 		});
@@ -1210,10 +1057,10 @@ var Installer = class {
 		});
 	}
 	async processImports(fileName, content) {
-		const allImports = extractImports(content).filter((imp) => imp.type === "npm");
+		const allImports = extractImports(content).filter((i) => i.type === "npm");
 		if (allImports.length === 0) return;
-		const imports = this.allowUnsupportedNpm ? allImports : allImports.filter((imp) => this.isSupportedPackage(imp.name));
-		if (allImports.length - imports.length > 0 && !this.allowUnsupportedNpm) debug(`Skipping unsupported packages: ${allImports.filter((imp) => !this.isSupportedPackage(imp.name)).map((imp) => imp.name).join(", ")} (use --unsupported-npm to enable)`);
+		const imports = this.allowUnsupportedNpm ? allImports : allImports.filter((i) => this.isSupportedPackage(i.name));
+		if (allImports.length - imports.length > 0 && !this.allowUnsupportedNpm) debug(`Skipping unsupported packages: ${allImports.filter((i) => !this.isSupportedPackage(i.name)).map((i) => i.name).join(", ")} (use --unsupported-npm to enable)`);
 		if (imports.length === 0) return;
 		const hash = imports.map((imp) => imp.name).sort().join(",");
 		if (this.processedImports.has(hash)) return;
@@ -1251,11 +1098,11 @@ var Installer = class {
 			warn(`Failed to write type file ${destination}`, err);
 			return;
 		}
-		if (normalized.match(/node_modules\/@types\/[^\/]+\/index\.d\.ts$/)) await this.ensureTypesPackageJson(normalized);
+		if (/node_modules\/@types\/[^/]+\/index\.d\.ts$/.exec(normalized)) await this.ensureTypesPackageJson(normalized);
 		if (normalized.includes("node_modules/@types/react/index.d.ts")) await this.patchReactTypes(destination);
 	}
 	async ensureTypesPackageJson(normalizedPath) {
-		const pkgMatch = normalizedPath.match(/node_modules\/(@types\/[^\/]+)\//);
+		const pkgMatch = /node_modules\/(@types\/[^/]+)\//.exec(normalizedPath);
 		if (!pkgMatch) return;
 		const pkgName = pkgMatch[1];
 		const pkgDir = path.join(this.projectDir, "node_modules", pkgName);
@@ -1267,16 +1114,7 @@ var Installer = class {
 			const version$1 = npmData["dist-tags"]?.latest;
 			if (!version$1 || !npmData.versions?.[version$1]) return;
 			const pkg = npmData.versions[version$1];
-			if (pkg.exports && typeof pkg.exports === "object") {
-				const fixExport = (value) => {
-					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) value.types = (value.import || value.require).replace(/\.js$/, ".d.ts").replace(/\.cjs$/, ".d.cts");
-					}
-					return value;
-				};
-				for (const key of Object.keys(pkg.exports)) pkg.exports[key] = fixExport(pkg.exports[key]);
-			}
+			if (pkg.exports) for (const key of Object.keys(pkg.exports)) pkg.exports[key] = fixExportTypes(pkg.exports[key]);
 			await fs.mkdir(pkgDir, { recursive: true });
 			await fs.writeFile(pkgJsonPath, JSON.stringify(pkg, null, 2));
 		} catch {}
@@ -1286,7 +1124,7 @@ var Installer = class {
 			let content = await fs.readFile(destination, "utf-8");
 			if (content.includes("function useRef<T = undefined>()")) return;
 			const overloadPattern = /function useRef<T>\(initialValue: T \| undefined\): RefObject<T \| undefined>;/;
-			if (!overloadPattern.test(content)) return;
+			if (!content.includes("function useRef<T>(initialValue: T | undefined)")) return;
 			content = content.replace(overloadPattern, `function useRef<T>(initialValue: T | undefined): RefObject<T | undefined>;
     function useRef<T = undefined>(): MutableRefObject<T | undefined>;`);
 			await fs.writeFile(destination, content, "utf-8");
@@ -1426,11 +1264,24 @@ declare module "*.json"
 		}));
 	}
 };
+/**
+* Transform package.json exports to include .d.ts type paths
+*/
+function fixExportTypes(value) {
+	if (typeof value === "string") return { types: value.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;
+}
 async function fetchWithRetry(url, init, retries = MAX_FETCH_RETRIES) {
-	const urlString = typeof url === "string" ? url : url.toString();
+	let urlString;
+	if (typeof url === "string") urlString = url;
+	else if (url instanceof URL) urlString = url.href;
+	else urlString = url.url;
 	for (let attempt = 1; attempt <= retries; attempt++) {
 		const controller = new AbortController();
-		const timeout = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
+		const timeout = setTimeout(() => {
+			controller.abort();
+		}, FETCH_TIMEOUT_MS);
 		try {
 			const response = await fetch(url, {
 				...init,
@@ -1438,12 +1289,13 @@ async function fetchWithRetry(url, init, retries = MAX_FETCH_RETRIES) {
 			});
 			clearTimeout(timeout);
 			return response;
-		} catch (error$1) {
+		} catch (err) {
 			clearTimeout(timeout);
-			const isRetryable = error$1?.cause?.code === "ECONNRESET" || error$1?.cause?.code === "ETIMEDOUT" || error$1?.cause?.code === "UND_ERR_CONNECT_TIMEOUT" || error$1?.message?.includes("timeout");
+			const error$1 = err;
+			const isRetryable = error$1.cause?.code === "ECONNRESET" || error$1.cause?.code === "ETIMEDOUT" || error$1.cause?.code === "UND_ERR_CONNECT_TIMEOUT" || error$1.message.includes("timeout");
 			if (attempt < retries && isRetryable) {
 				const delay = attempt * 1e3;
-				warn(`Fetch failed (${error$1?.cause?.code || error$1?.message}) for ${urlString}, retrying in ${delay}ms...`);
+				warn(`Fetch failed (${error$1.cause?.code ?? error$1.message}) for ${urlString}, retrying in ${delay}ms...`);
 				await new Promise((resolve) => setTimeout(resolve, delay));
 				continue;
 			}
@@ -1575,11 +1427,12 @@ var FileMetadataCache = class {
 		if (this.pendingPersist) await this.pendingPersist;
 	}
 	schedulePersist() {
-		if (!this.projectDir) return;
-		if (!this.pendingPersist) this.pendingPersist = (async () => {
+		const projectDir = this.projectDir;
+		if (!projectDir) return;
+		this.pendingPersist ??= (async () => {
 			try {
 				await Promise.resolve();
-				await savePersistedState(this.projectDir, this.persisted);
+				await savePersistedState(projectDir, this.persisted);
 			} finally {
 				this.pendingPersist = null;
 			}
@@ -1598,12 +1451,24 @@ var PluginDisconnectedError = class extends Error {
 var UserActionCoordinator = class {
 	pendingActions = /* @__PURE__ */ new Map();
 	/**
+	* Register a pending action and return a typed promise
+	*/
+	awaitAction(actionId, description) {
+		return new Promise((resolve, reject) => {
+			this.pendingActions.set(actionId, {
+				resolve,
+				reject
+			});
+			debug(`Awaiting ${description}: ${actionId}`);
+		});
+	}
+	/**
 	* Sends the delete request to the plugin and awaits the user's decision
 	*/
 	async requestDeleteDecision(socket, { fileName, requireConfirmation }) {
 		if (!socket) throw new Error("Cannot request delete decision: plugin not connected");
 		if (requireConfirmation) {
-			const confirmationPromise = this.awaitConfirmation(`delete:${fileName}`, "delete confirmation");
+			const confirmationPromise = this.awaitAction(`delete:${fileName}`, "delete confirmation");
 			await sendMessage(socket, {
 				type: "file-delete",
 				fileNames: [fileName],
@@ -1634,7 +1499,7 @@ var UserActionCoordinator = class {
 		if (conflicts.length === 0) return /* @__PURE__ */ new Map();
 		const pending = conflicts.map((conflict) => ({
 			fileName: conflict.fileName,
-			promise: this.awaitConfirmation(`conflict:${conflict.fileName}`, "conflict resolution")
+			promise: this.awaitAction(`conflict:${conflict.fileName}`, "conflict resolution")
 		}));
 		await sendMessage(socket, {
 			type: "conflicts-detected",
@@ -1652,18 +1517,6 @@ var UserActionCoordinator = class {
 		}
 	}
 	/**
-	* Generic confirmation awaiter
-	*/
-	awaitConfirmation(actionId, description) {
-		return new Promise((resolve, reject) => {
-			this.pendingActions.set(actionId, {
-				resolve,
-				reject
-			});
-			debug(`Awaiting ${description}: ${actionId}`);
-		});
-	}
-	/**
 	* Handle incoming confirmation response
 	*/
 	handleConfirmation(actionId, value) {
@@ -1700,7 +1553,7 @@ var UserActionCoordinator = class {
 * Note: This is for INCOMING changes from remote. Local changes (from watcher)
 * are handled separately and always sent during watching mode.
 */
-function validateIncomingChange(file, fileMeta, currentMode) {
+function validateIncomingChange(fileMeta, currentMode) {
 	if (currentMode === "snapshot_processing" || currentMode === "handshaking") return {
 		action: "queue",
 		reason: "snapshot-in-progress"
@@ -1751,7 +1604,7 @@ async function findOrCreateProjectDir(projectHash, projectName, explicitDir) {
 	const cwd = process.cwd();
 	const existing = await findExistingProjectDir(cwd, projectHash);
 	if (existing) return existing;
-	if (!projectName) throw new Error("Project name is required when creating a new workspace. Pass --name <project name>.");
+	if (!projectName) throw new Error("Failed to get Project name. Pass --name <project name>.");
 	const dirName = toDirName(projectName);
 	const pkgName = toPackageName(projectName);
 	const shortId = shortProjectHash(projectHash);
@@ -1792,9 +1645,10 @@ 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.
+* CLI Controller
+*
+* All runtime state and orchestrates the sync lifecycle.
+* Helpers should provide data, nevering hold control or callbacks.
 */
 /** Log helper */
 function log(level, message) {
@@ -1805,16 +1659,6 @@ 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
 */
@@ -1844,7 +1688,7 @@ function transition(state, event) {
 				},
 				effects
 			};
-		case "FILE_SYNCED":
+		case "FILE_SYNCED_CONFIRMATION":
 			effects.push(log("debug", `Remote confirmed sync: ${event.fileName}`), {
 				type: "UPDATE_FILE_METADATA",
 				fileName: event.fileName,
@@ -1905,7 +1749,7 @@ function transition(state, event) {
 				state: {
 					...state,
 					mode: "snapshot_processing",
-					queuedDiffs: event.files
+					pendingRemoteChanges: event.files
 				},
 				effects
 			};
@@ -1948,7 +1792,7 @@ function transition(state, event) {
 					effects
 				};
 			}
-			const remoteTotal = state.queuedDiffs.length;
+			const remoteTotal = state.pendingRemoteChanges.length;
 			const totalCount = remoteTotal + localOnly.length;
 			const updatedCount = safeWrites.length + localOnly.length;
 			const unchangedCount = Math.max(0, remoteTotal - safeWrites.length);
@@ -1962,19 +1806,19 @@ function transition(state, event) {
 				state: {
 					...state,
 					mode: "watching",
-					queuedDiffs: []
+					pendingRemoteChanges: []
 				},
 				effects
 			};
 		}
 		case "FILE_CHANGE": {
-			const validation = validateIncomingChange(event.file, event.fileMeta, state.mode);
+			const validation = validateIncomingChange(event.fileMeta, state.mode);
 			if (validation.action === "queue") {
 				effects.push(log("debug", `Queueing file change: ${event.file.name} (${validation.reason})`));
 				return {
 					state: {
 						...state,
-						queuedDiffs: [...state.queuedDiffs, event.file]
+						pendingRemoteChanges: [...state.pendingRemoteChanges, event.file]
 					},
 					effects
 				};
@@ -2012,7 +1856,7 @@ function transition(state, event) {
 				state,
 				effects
 			};
-		case "REMOTE_DELETE_CONFIRMED":
+		case "LOCAL_DELETE_APPROVED":
 			effects.push(log("debug", `Delete confirmed: ${event.fileName}`), {
 				type: "DELETE_LOCAL_FILES",
 				names: [event.fileName]
@@ -2021,7 +1865,7 @@ function transition(state, event) {
 				state,
 				effects
 			};
-		case "REMOTE_DELETE_CANCELLED":
+		case "LOCAL_DELETE_REJECTED":
 			effects.push(log("debug", `Delete cancelled: ${event.fileName}`));
 			effects.push({
 				type: "WRITE_FILES",
@@ -2194,7 +2038,7 @@ function transition(state, event) {
 				state: {
 					...rest,
 					mode: "watching",
-					queuedDiffs: []
+					pendingRemoteChanges: []
 				},
 				effects
 			};
@@ -2376,14 +2220,16 @@ async function executeEffect(effect, context) {
 			status("Watching for changes...");
 			return [];
 		}
-		case "LOG":
-			({
+		case "LOG": {
+			const logFn = {
 				info,
 				warn,
 				success,
 				debug
-			}[effect.level] ?? debug)(effect.message);
+			}[effect.level];
+			logFn(effect.message);
 			return [];
+		}
 	}
 }
 /**
@@ -2397,7 +2243,7 @@ async function start(config) {
 	let syncState = {
 		mode: "disconnected",
 		socket: null,
-		queuedDiffs: [],
+		pendingRemoteChanges: [],
 		pendingOperations: /* @__PURE__ */ new Map(),
 		nextOperationId: 1
 	};
@@ -2423,7 +2269,7 @@ async function start(config) {
 		}
 	}
 	const connection = await initConnection(config.port);
-	connection.on("handshake", async (client, message) => {
+	connection.on("handshake", (client, message) => {
 		debug(`Received handshake: ${message.projectName} (${message.projectId})`);
 		const expectedShort = shortProjectHash(config.projectHash);
 		const receivedShort = shortProjectHash(message.projectId);
@@ -2432,24 +2278,26 @@ async function start(config) {
 			client.close();
 			return;
 		}
-		await processEvent({
-			type: "HANDSHAKE",
-			socket: client,
-			projectInfo: {
-				projectId: message.projectId,
-				projectName: message.projectName
-			}
-		});
-		if (config.projectDir && !installer) {
-			installer = new Installer({
-				projectDir: config.projectDir,
-				allowUnsupportedNpm: config.allowUnsupportedNpm
+		(async () => {
+			await processEvent({
+				type: "HANDSHAKE",
+				socket: client,
+				projectInfo: {
+					projectId: message.projectId,
+					projectName: message.projectName
+				}
 			});
-			await installer.initialize();
-			startWatcher();
-		}
-		cancelDisconnectMessage();
-		if (!wasRecentlyDisconnected() && !didShowDisconnect()) success(`Connected to ${message.projectName}`);
+			if (config.projectDir && !installer) {
+				installer = new Installer({
+					projectDir: config.projectDir,
+					allowUnsupportedNpm: config.allowUnsupportedNpm
+				});
+				await installer.initialize();
+				startWatcher();
+			}
+			cancelDisconnectMessage();
+			if (!wasRecentlyDisconnected() && !didShowDisconnect()) success(`Connected to ${message.projectName}`);
+		})();
 	});
 	async function handleMessage(message) {
 		if (!config.projectDir || !installer) {
@@ -2461,15 +2309,13 @@ async function start(config) {
 			case "request-files":
 				event = { type: "REQUEST_FILES" };
 				break;
-			case "file-list": {
-				const totalSize = message.files.reduce((sum, f) => sum + (f.content?.length ?? 0), 0);
-				debug(`Received file list: ${message.files.length} files (${(totalSize / 1024).toFixed(1)}KB)`);
+			case "file-list":
+				debug(`Received file list: ${message.files.length} files`);
 				event = {
 					type: "FILE_LIST",
 					files: message.files
 				};
 				break;
-			}
 			case "file-change":
 				event = {
 					type: "FILE_CHANGE",
@@ -2491,7 +2337,7 @@ async function start(config) {
 				const unmatched = [];
 				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",
+					type: "LOCAL_DELETE_APPROVED",
 					fileName
 				});
 				return;
@@ -2500,7 +2346,7 @@ async function start(config) {
 				for (const file of message.files) {
 					userActions.handleConfirmation(`delete:${file.fileName}`, false);
 					await processEvent({
-						type: "REMOTE_DELETE_CANCELLED",
+						type: "LOCAL_DELETE_REJECTED",
 						fileName: file.fileName,
 						content: file.content ?? ""
 					});
@@ -2508,7 +2354,7 @@ async function start(config) {
 				return;
 			case "file-synced":
 				event = {
-					type: "FILE_SYNCED",
+					type: "FILE_SYNCED_CONFIRMATION",
 					fileName: message.fileName,
 					remoteModifiedAt: message.remoteModifiedAt
 				};
@@ -2529,21 +2375,25 @@ async function start(config) {
 				warn(`Unhandled message type: ${message.type}`);
 				return;
 		}
-		if (event) await processEvent(event);
+		await processEvent(event);
 	}
-	connection.on("message", async (message) => {
-		try {
-			await handleMessage(message);
-		} catch (err) {
-			error("Error handling message:", err);
-		}
+	connection.on("message", (message) => {
+		(async () => {
+			try {
+				await handleMessage(message);
+			} catch (err) {
+				error("Error handling message:", err);
+			}
+		})();
 	});
-	connection.on("disconnect", async () => {
+	connection.on("disconnect", () => {
 		scheduleDisconnectMessage(() => {
 			status("Disconnected, waiting to reconnect...");
 		});
-		await processEvent({ type: "DISCONNECT" });
-		userActions.cleanup();
+		(async () => {
+			await processEvent({ type: "DISCONNECT" });
+			userActions.cleanup();
+		})();
 	});
 	connection.on("error", (err) => {
 		error("Error on WebSocket connection:", err);
@@ -2552,19 +2402,21 @@ async function start(config) {
 	const startWatcher = () => {
 		if (!config.filesDir || watcher) return;
 		watcher = initWatcher(config.filesDir);
-		watcher.on("change", async (event) => {
-			await processEvent({
+		watcher.on("change", (event) => {
+			processEvent({
 				type: "WATCHER_EVENT",
 				event
 			});
 		});
 	};
-	process.on("SIGINT", async () => {
+	process.on("SIGINT", () => {
 		console.log();
 		status("Shutting down...");
-		if (watcher) await watcher.close();
-		connection.close();
-		process.exit(0);
+		(async () => {
+			if (watcher) await watcher.close();
+			connection.close();
+			process.exit(0);
+		})();
 	});
 }
 
@@ -2581,7 +2433,7 @@ const program = new Command();
 program.exitOverride((err) => {
 	if (err.code === "commander.missingArgument") {
 		console.error("Missing Project ID. Copy command via Code Link Plugin.");
-		process.exit(err.exitCode ?? 1);
+		process.exit(err.exitCode);
 	}
 	throw err;
 });
@@ -2595,7 +2447,6 @@ program.name("framer-code-link").description("Sync Framer code components to you
 			process.exit(1);
 		}
 	}
-	const isDev = process.env.NODE_ENV === "development";
 	if (options.logLevel) {
 		const level = {
 			debug: LogLevel.DEBUG,
@@ -2604,7 +2455,7 @@ program.name("framer-code-link").description("Sync Framer code components to you
 			error: LogLevel.ERROR
 		}[options.logLevel.toLowerCase()];
 		if (level !== void 0) setLogLevel(level);
-	} else if (options.verbose || isDev) setLogLevel(LogLevel.DEBUG);
+	} else if (options.verbose) setLogLevel(LogLevel.DEBUG);
 	const port = getPortFromHash(projectHash);
 	banner(version, port);
 	const config = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "framer-code-link",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "CLI tool for syncing Framer code components - controller-centric architecture",
   "main": "dist/index.mjs",
   "type": "module",
@@ -22,6 +22,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
+    "@code-link/shared": "1.0.0",
     "@typescript/ata": "^0.9.8",
     "chokidar": "^5.0.0",
     "commander": "^14.0.2",