faux-studio 0.3.8 → 0.3.10

package/dist/index.js

@@ -2267,7 +2267,7 @@ var require_websocket = __commonJS({
     var protocolVersions = [8, 13];
     var readyStates = ["CONNECTING", "OPEN", "CLOSING", "CLOSED"];
     var subprotocolRegex = /^[!#$%&'*+\-.0-9A-Z^_`|a-z~]+$/;
-    var WebSocket3 = class _WebSocket extends EventEmitter {
+    var WebSocket2 = class _WebSocket extends EventEmitter {
       /**
        * Create a new `WebSocket`.
        *
@@ -2637,35 +2637,35 @@ var require_websocket = __commonJS({
         }
       }
     };
-    Object.defineProperty(WebSocket3, "CONNECTING", {
+    Object.defineProperty(WebSocket2, "CONNECTING", {
       enumerable: true,
       value: readyStates.indexOf("CONNECTING")
     });
-    Object.defineProperty(WebSocket3.prototype, "CONNECTING", {
+    Object.defineProperty(WebSocket2.prototype, "CONNECTING", {
       enumerable: true,
       value: readyStates.indexOf("CONNECTING")
     });
-    Object.defineProperty(WebSocket3, "OPEN", {
+    Object.defineProperty(WebSocket2, "OPEN", {
       enumerable: true,
       value: readyStates.indexOf("OPEN")
     });
-    Object.defineProperty(WebSocket3.prototype, "OPEN", {
+    Object.defineProperty(WebSocket2.prototype, "OPEN", {
       enumerable: true,
       value: readyStates.indexOf("OPEN")
     });
-    Object.defineProperty(WebSocket3, "CLOSING", {
+    Object.defineProperty(WebSocket2, "CLOSING", {
       enumerable: true,
       value: readyStates.indexOf("CLOSING")
     });
-    Object.defineProperty(WebSocket3.prototype, "CLOSING", {
+    Object.defineProperty(WebSocket2.prototype, "CLOSING", {
       enumerable: true,
       value: readyStates.indexOf("CLOSING")
     });
-    Object.defineProperty(WebSocket3, "CLOSED", {
+    Object.defineProperty(WebSocket2, "CLOSED", {
       enumerable: true,
       value: readyStates.indexOf("CLOSED")
     });
-    Object.defineProperty(WebSocket3.prototype, "CLOSED", {
+    Object.defineProperty(WebSocket2.prototype, "CLOSED", {
       enumerable: true,
       value: readyStates.indexOf("CLOSED")
     });
@@ -2678,10 +2678,10 @@ var require_websocket = __commonJS({
       "readyState",
       "url"
     ].forEach((property) => {
-      Object.defineProperty(WebSocket3.prototype, property, { enumerable: true });
+      Object.defineProperty(WebSocket2.prototype, property, { enumerable: true });
     });
     ["open", "error", "close", "message"].forEach((method) => {
-      Object.defineProperty(WebSocket3.prototype, `on${method}`, {
+      Object.defineProperty(WebSocket2.prototype, `on${method}`, {
         enumerable: true,
         get() {
           for (const listener of this.listeners(method)) {
@@ -2703,9 +2703,9 @@ var require_websocket = __commonJS({
         }
       });
     });
-    WebSocket3.prototype.addEventListener = addEventListener;
-    WebSocket3.prototype.removeEventListener = removeEventListener;
-    module.exports = WebSocket3;
+    WebSocket2.prototype.addEventListener = addEventListener;
+    WebSocket2.prototype.removeEventListener = removeEventListener;
+    module.exports = WebSocket2;
     function initAsClient(websocket, address, protocols, options) {
       const opts = {
         allowSynchronousEvents: true,
@@ -2893,7 +2893,7 @@ var require_websocket = __commonJS({
       });
       req.on("upgrade", (res, socket, head) => {
         websocket.emit("upgrade", res);
-        if (websocket.readyState !== WebSocket3.CONNECTING) return;
+        if (websocket.readyState !== WebSocket2.CONNECTING) return;
         req = websocket._req = null;
         const upgrade = res.headers.upgrade;
         if (upgrade === void 0 || upgrade.toLowerCase() !== "websocket") {
@@ -2965,7 +2965,7 @@ var require_websocket = __commonJS({
       }
     }
     function emitErrorAndClose(websocket, err) {
-      websocket._readyState = WebSocket3.CLOSING;
+      websocket._readyState = WebSocket2.CLOSING;
       websocket._errorEmitted = true;
       websocket.emit("error", err);
       websocket.emitClose();
@@ -2982,7 +2982,7 @@ var require_websocket = __commonJS({
       return tls.connect(options);
     }
     function abortHandshake(websocket, stream, message) {
-      websocket._readyState = WebSocket3.CLOSING;
+      websocket._readyState = WebSocket2.CLOSING;
       const err = new Error(message);
       Error.captureStackTrace(err, abortHandshake);
       if (stream.setHeader) {
@@ -3057,9 +3057,9 @@ var require_websocket = __commonJS({
     }
     function senderOnError(err) {
       const websocket = this[kWebSocket];
-      if (websocket.readyState === WebSocket3.CLOSED) return;
-      if (websocket.readyState === WebSocket3.OPEN) {
-        websocket._readyState = WebSocket3.CLOSING;
+      if (websocket.readyState === WebSocket2.CLOSED) return;
+      if (websocket.readyState === WebSocket2.OPEN) {
+        websocket._readyState = WebSocket2.CLOSING;
         setCloseTimer(websocket);
       }
       this._socket.end();
@@ -3079,7 +3079,7 @@ var require_websocket = __commonJS({
       this.removeListener("close", socketOnClose);
       this.removeListener("data", socketOnData);
       this.removeListener("end", socketOnEnd);
-      websocket._readyState = WebSocket3.CLOSING;
+      websocket._readyState = WebSocket2.CLOSING;
       if (!this._readableState.endEmitted && !websocket._closeFrameReceived && !websocket._receiver._writableState.errorEmitted && this._readableState.length !== 0) {
         const chunk = this.read(this._readableState.length);
         websocket._receiver.write(chunk);
@@ -3101,7 +3101,7 @@ var require_websocket = __commonJS({
     }
     function socketOnEnd() {
       const websocket = this[kWebSocket];
-      websocket._readyState = WebSocket3.CLOSING;
+      websocket._readyState = WebSocket2.CLOSING;
       websocket._receiver.end();
       this.end();
     }
@@ -3110,7 +3110,7 @@ var require_websocket = __commonJS({
       this.removeListener("error", socketOnError);
       this.on("error", NOOP);
       if (websocket) {
-        websocket._readyState = WebSocket3.CLOSING;
+        websocket._readyState = WebSocket2.CLOSING;
         this.destroy();
       }
     }
@@ -3121,7 +3121,7 @@ var require_websocket = __commonJS({
 var require_stream = __commonJS({
   "node_modules/ws/lib/stream.js"(exports, module) {
     "use strict";
-    var WebSocket3 = require_websocket();
+    var WebSocket2 = require_websocket();
     var { Duplex } = __require("stream");
     function emitClose(stream) {
       stream.emit("close");
@@ -3271,7 +3271,7 @@ var require_websocket_server = __commonJS({
     var extension = require_extension();
     var PerMessageDeflate = require_permessage_deflate();
     var subprotocol = require_subprotocol();
-    var WebSocket3 = require_websocket();
+    var WebSocket2 = require_websocket();
     var { CLOSE_TIMEOUT, GUID, kWebSocket } = require_constants();
     var keyRegex = /^[+/0-9A-Za-z]{22}==$/;
     var RUNNING = 0;
@@ -3331,7 +3331,7 @@ var require_websocket_server = __commonJS({
           host: null,
           path: null,
           port: null,
-          WebSocket: WebSocket3,
+          WebSocket: WebSocket2,
           ...options
         };
         if (options.port == null && !options.server && !options.noServer || options.port != null && (options.server || options.noServer) || options.server && options.noServer) {
@@ -11071,56 +11071,35 @@ async function probeCdpPorts() {
   }
   return null;
 }
-function killFigma() {
-  try {
-    if (process.platform === "darwin") {
-      execSync("pkill -x Figma", { stdio: "ignore" });
-      return true;
-    }
-    if (process.platform === "win32") {
-      execSync("taskkill /IM Figma.exe", { stdio: "ignore" });
-      return true;
-    }
-    execSync("pkill -x figma-linux", { stdio: "ignore" });
-    return true;
-  } catch {
-    return false;
+function launchFigmaProcess(figmaPath, port) {
+  if (process.platform === "darwin") {
+    const binary = `${figmaPath}/Contents/MacOS/Figma`;
+    spawn2(binary, [`--remote-debugging-port=${port}`], {
+      detached: true,
+      stdio: "ignore"
+    }).unref();
+  } else {
+    spawn2(figmaPath, [`--remote-debugging-port=${port}`], {
+      detached: true,
+      stdio: "ignore"
+    }).unref();
   }
 }
-async function launchFigmaWithCdp() {
+function launchFigma() {
   const figmaPath = findFigmaPath();
   if (!figmaPath) {
     throw new Error(
       "Figma Desktop is not installed. Download from https://figma.com/downloads"
     );
   }
-  const port = await findAvailablePort();
-  log(`Launching Figma Desktop (port ${port})...`);
-  launchFigmaProcess(figmaPath, port);
-  const startTime = Date.now();
-  while (Date.now() - startTime < CDP_WAIT_TIMEOUT_MS) {
-    await new Promise((r) => setTimeout(r, CDP_POLL_INTERVAL_MS));
-    const { alive, isFigma } = await isCdpAlive(port);
-    if (alive && isFigma) {
-      await new Promise((r) => setTimeout(r, 2e3));
-      const targets = await listTargets(port);
-      log("Figma Desktop started");
-      return { port, targets };
-    }
-  }
-  throw new Error(
-    `Figma did not respond on port ${port} within ${CDP_WAIT_TIMEOUT_MS / 1e3}s. Try again.`
-  );
-}
-function launchFigmaProcess(figmaPath, port) {
+  log("Launching Figma Desktop...");
   if (process.platform === "darwin") {
-    const binary = `${figmaPath}/Contents/MacOS/Figma`;
-    spawn2(binary, [`--remote-debugging-port=${port}`], {
+    spawn2("open", ["-a", figmaPath], {
       detached: true,
       stdio: "ignore"
     }).unref();
   } else {
-    spawn2(figmaPath, [`--remote-debugging-port=${port}`], {
+    spawn2(figmaPath, [], {
       detached: true,
       stdio: "ignore"
     }).unref();
@@ -11212,6 +11191,7 @@ var PluginWsServer = class {
   // Server Lifecycle
   // -------------------------------------------------------------------------
   async start() {
+    await this.shutdownExisting();
     for (let port = DEFAULT_PORT; port < DEFAULT_PORT + PORT_RANGE; port++) {
       try {
         await this.listen(port);
@@ -11227,6 +11207,53 @@ var PluginWsServer = class {
       `No available port in range ${DEFAULT_PORT}-${DEFAULT_PORT + PORT_RANGE - 1}. Another faux-studio instance may be running.`
     );
   }
+  /**
+   * Connect to any existing faux-studio WS servers and tell them to shut down
+   * their listener. This ensures the plugin reconnects to the newest instance.
+   */
+  async shutdownExisting() {
+    const promises = [];
+    for (let port = DEFAULT_PORT; port < DEFAULT_PORT + PORT_RANGE; port++) {
+      promises.push(this.sendShutdown(port));
+    }
+    await Promise.allSettled(promises);
+    await new Promise((r) => setTimeout(r, 500));
+  }
+  sendShutdown(port) {
+    return new Promise((resolve) => {
+      try {
+        const ws = new import_websocket.default(`ws://127.0.0.1:${port}`);
+        const timer = setTimeout(() => {
+          try {
+            ws.close();
+          } catch {
+          }
+          resolve();
+        }, 1e3);
+        ws.on("open", () => {
+          ws.send(JSON.stringify({ type: "shutdown" }));
+          clearTimeout(timer);
+          setTimeout(() => {
+            try {
+              ws.close();
+            } catch {
+            }
+            resolve();
+          }, 200);
+        });
+        ws.on("error", () => {
+          clearTimeout(timer);
+          resolve();
+        });
+        ws.on("close", () => {
+          clearTimeout(timer);
+          resolve();
+        });
+      } catch {
+        resolve();
+      }
+    });
+  }
   listen(port) {
     return new Promise((resolve, reject) => {
       const wss = new import_websocket_server.default({ port, host: "127.0.0.1" });
@@ -11287,6 +11314,13 @@ var PluginWsServer = class {
       } catch {
         return;
       }
+      if (!identified && msg.type === "shutdown") {
+        clearTimeout(handshakeTimeout);
+        ws.close(1e3, "Shutdown requested");
+        log("Shutdown requested by newer faux-studio instance \u2014 releasing port");
+        this.close();
+        return;
+      }
       if (!identified && msg.type === "handshake") {
         clearTimeout(handshakeTimeout);
         identified = true;
@@ -25591,7 +25625,7 @@ Resources provide quick read-only access to Figma state without tool calls:
 - Create components for reusable UI patterns.`;
 function createMcpServer(deps) {
   const server2 = new Server(
-    { name: "faux-studio", version: "0.3.8" },
+    { name: "faux-studio", version: "0.3.10" },
     {
       capabilities: { tools: { listChanged: true }, resources: {}, logging: {} },
       instructions: INSTRUCTIONS
@@ -25606,15 +25640,10 @@ function createMcpServer(deps) {
       },
       {
         name: "setup_figma",
-        description: "Ensure Figma Desktop is running and connected. Call this before any design work. Checks plugin and CDP transports, launches Figma if needed, or restarts it with the debug port. Idempotent \u2014 safe to call multiple times. Returns connection status and active file info.",
+        description: "Ensure Figma Desktop is running and the plugin is connected. Call this before any design work. Launches Figma if needed, waits for the plugin to connect, and provides setup guidance. Idempotent \u2014 safe to call multiple times. Returns connection status and active file info.",
         inputSchema: {
           type: "object",
-          properties: {
-            force_restart: {
-              type: "boolean",
-              description: "Restart Figma even if it is already running (e.g., to enable the debug port). Figma auto-recovers open files on restart. Only set this if instructed or if the previous call returned needs_restart."
-            }
-          },
+          properties: {},
           required: []
         }
       }
@@ -25674,9 +25703,7 @@ function createMcpServer(deps) {
       }
       if (name === "setup_figma") {
         log("setup_figma called");
-        const result2 = await deps.setupFigma({
-          force_restart: params.force_restart === true
-        });
+        const result2 = await deps.setupFigma(params);
         return {
           content: [{ type: "text", text: JSON.stringify(result2, null, 2) }],
           isError: result2.status === "not_installed"
@@ -25842,16 +25869,31 @@ async function generateWithAuth(toolName, params) {
     throw err;
   }
 }
+var PLUGIN_URL = "https://faux.design/plugin";
+var PLUGIN_WAIT_MS = 1e4;
+var PLUGIN_POLL_MS = 1e3;
+async function waitForPlugin() {
+  if (pluginServer.hasConnections) return true;
+  const start = Date.now();
+  while (Date.now() - start < PLUGIN_WAIT_MS) {
+    await new Promise((r) => setTimeout(r, PLUGIN_POLL_MS));
+    if (pluginServer.hasConnections) return true;
+  }
+  return false;
+}
+function pluginReadyResult() {
+  return {
+    status: "ready",
+    transport: "plugin",
+    message: `Connected via plugin.${pluginServer.activeFileId ? ` Active file: ${pluginServer.activeFileId}` : ""} Ready to design.`,
+    activeFile: pluginServer.activeFileId || void 0,
+    pluginFiles: pluginServer.connectedFiles,
+    port: pluginServer.port
+  };
+}
 async function setupFigma(params) {
-  if (forceTransport !== "cdp" && pluginServer.hasConnections) {
-    return {
-      status: "ready",
-      transport: "plugin",
-      message: `Connected via plugin.${pluginServer.activeFileId ? ` Active file: ${pluginServer.activeFileId}` : ""} Ready to design.`,
-      activeFile: pluginServer.activeFileId || void 0,
-      pluginFiles: pluginServer.connectedFiles,
-      port: pluginServer.port
-    };
+  if (pluginServer.hasConnections) {
+    return pluginReadyResult();
   }
   if (forceTransport !== "plugin" && cdpClient?.connected && cdpClient.hasContext) {
     return {
@@ -25883,86 +25925,55 @@ async function setupFigma(params) {
         } catch {
         }
       }
-      return {
-        status: "no_design_file",
-        transport: "none",
-        message: "Figma is running with the debug port, but no design file is open. Ask the user to open a .fig file in Figma, then call setup_figma again.",
-        port: existing.port
-      };
     }
   }
-  if (isFigmaRunning()) {
-    if (params.force_restart) {
-      log("Restarting Figma with debug port...");
-      killFigma();
-      await new Promise((r) => setTimeout(r, 3e3));
-      try {
-        const conn = await launchFigmaWithCdp();
-        const target = findFigmaDesignTarget(conn.targets);
-        if (target) {
-          try {
-            const client = new CdpClient();
-            await client.connect(target.webSocketDebuggerUrl);
-            await client.discoverFigmaContext();
-            cdpClient = client;
-          } catch {
-          }
-        }
-        return {
-          status: "restarted",
-          transport: target ? "cdp" : "none",
-          message: target ? `Figma restarted with debug port. Connected to: ${target.title}. Ready to design.` : "Figma restarted with debug port. Waiting for a design file to be opened. Call setup_figma again once a file is open.",
-          activeFile: target?.title,
-          port: conn.port
-        };
-      } catch (err) {
-        return {
-          status: "not_installed",
-          transport: "none",
-          message: err instanceof Error ? err.message : "Failed to restart Figma."
-        };
-      }
-    }
-    return {
-      status: "needs_restart",
-      transport: "none",
-      message: "Figma is running but the debug port is not enabled. Figma needs to restart with the debug port for AI tools to work. Figma auto-recovers all open files on restart, so no work will be lost. Ask the user for permission, then call setup_figma again with force_restart: true."
-    };
-  }
   if (!findFigmaPath()) {
     return {
       status: "not_installed",
       transport: "none",
-      message: "Figma Desktop is not installed. Download from https://figma.com/downloads and install it, then call setup_figma again."
+      message: `Figma Desktop is not installed.
+
+1. Download Figma: https://figma.com/downloads
+2. Install and open it
+3. Install the faux-studio plugin: ${PLUGIN_URL}
+4. Call setup_figma again`
     };
   }
-  try {
-    log("Launching Figma Desktop...");
-    const conn = await launchFigmaWithCdp();
-    const target = findFigmaDesignTarget(conn.targets);
-    if (target) {
-      try {
-        const client = new CdpClient();
-        await client.connect(target.webSocketDebuggerUrl);
-        await client.discoverFigmaContext();
-        cdpClient = client;
-      } catch {
-      }
+  if (!isFigmaRunning()) {
+    try {
+      launchFigma();
+    } catch (err) {
+      return {
+        status: "not_installed",
+        transport: "none",
+        message: err instanceof Error ? err.message : "Failed to launch Figma."
+      };
     }
+  }
+  log("Waiting for plugin connection...");
+  const connected = await waitForPlugin();
+  if (connected) {
     return {
-      status: "launched",
-      transport: target ? "cdp" : "none",
-      message: target ? `Figma launched and connected. Active file: ${target.title}. Ready to design.` : "Figma launched. Open a design file to start designing, then call setup_figma again.",
-      activeFile: target?.title,
-      port: conn.port
-    };
-  } catch (err) {
-    return {
-      status: "not_installed",
-      transport: "none",
-      message: err instanceof Error ? err.message : "Failed to launch Figma."
+      ...pluginReadyResult(),
+      status: isFigmaRunning() ? "ready" : "launched"
     };
   }
+  return {
+    status: "waiting_for_plugin",
+    transport: "none",
+    message: `Figma is running but the faux-studio plugin is not connected.
+
+If this is your first time:
+  1. Download the plugin: ${PLUGIN_URL}
+  2. Unzip and import in Figma: Plugins \u2192 Development \u2192 Import plugin from manifest
+
+Then run the plugin:
+  3. Open a design file in Figma
+  4. Plugins \u2192 Development \u2192 faux-studio
+
+Call setup_figma again once the plugin shows "Ready".`,
+    port: pluginServer.port
+  };
 }
 async function main() {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "faux-studio",
-  "version": "0.3.8",
+  "version": "0.3.10",
   "description": "AI-powered Figma design via MCP — connect any AI client to Figma Desktop",
   "type": "module",
   "bin": {