faux-studio 0.4.4 → 0.4.7

package/dist/index.js

@@ -10447,6 +10447,7 @@ function error(message) {
 
 // src/credential-store.ts
 import { readFile, writeFile, mkdir, unlink } from "fs/promises";
+import { execFile } from "child_process";
 import { join } from "path";
 import { homedir } from "os";
 var FAUX_DIR = join(homedir(), ".faux");
@@ -10480,43 +10481,99 @@ var FileCredentialStore = class {
     }
   }
 };
-var KeychainCredentialStore = class {
+function securityExec(...args) {
+  return new Promise((resolve, reject) => {
+    execFile("/usr/bin/security", args, { timeout: 1e4 }, (err, stdout, stderr) => {
+      if (err) return reject(err);
+      resolve({ stdout, stderr });
+    });
+  });
+}
+var SecurityCliKeychainStore = class {
   name = "keychain";
-  entry;
-  constructor(entry) {
-    this.entry = entry;
-  }
+  cached = void 0;
   async load() {
+    if (this.cached !== void 0) return this.cached;
     try {
-      const raw = await this.entry.getPassword();
-      if (!raw) return null;
+      const { stdout } = await securityExec(
+        "find-generic-password",
+        "-s",
+        KEYCHAIN_SERVICE,
+        "-a",
+        KEYCHAIN_ACCOUNT,
+        "-w"
+      );
+      const raw = stdout.trim();
+      if (!raw) {
+        this.cached = null;
+        return null;
+      }
       const creds = JSON.parse(raw);
-      if (!creds.jwt || !creds.refreshToken || !creds.user) return null;
+      if (!creds.jwt || !creds.refreshToken || !creds.user) {
+        this.cached = null;
+        return null;
+      }
+      this.cached = creds;
       return creds;
     } catch {
+      this.cached = null;
       return null;
     }
   }
   async save(creds) {
+    const value = JSON.stringify(creds);
+    try {
+      await securityExec(
+        "delete-generic-password",
+        "-s",
+        KEYCHAIN_SERVICE,
+        "-a",
+        KEYCHAIN_ACCOUNT
+      );
+    } catch {
+    }
     try {
-      await this.entry.setPassword(JSON.stringify(creds));
+      await securityExec(
+        "add-generic-password",
+        "-s",
+        KEYCHAIN_SERVICE,
+        "-a",
+        KEYCHAIN_ACCOUNT,
+        "-w",
+        value,
+        "-A",
+        "-U"
+      );
+      this.cached = creds;
     } catch (err) {
       warn(`Could not save to keychain: ${err instanceof Error ? err.message : err}`);
     }
   }
   async clear() {
     try {
-      await this.entry.deletePassword();
+      await securityExec(
+        "delete-generic-password",
+        "-s",
+        KEYCHAIN_SERVICE,
+        "-a",
+        KEYCHAIN_ACCOUNT
+      );
+      this.cached = null;
     } catch {
     }
   }
 };
 async function tryCreateKeychainStore() {
+  if (process.platform !== "darwin") {
+    log("[keychain] not macOS \u2014 skipping keychain");
+    return null;
+  }
   try {
-    const { AsyncEntry } = await import("@napi-rs/keyring");
-    const entry = new AsyncEntry(KEYCHAIN_SERVICE, KEYCHAIN_ACCOUNT);
-    await entry.getPassword();
-    return new KeychainCredentialStore(entry);
+    log("[keychain] probing macOS security CLI...");
+    const t0 = Date.now();
+    await securityExec("help");
+    log(`[keychain] security CLI available (${Date.now() - t0}ms)`);
+    return new SecurityCliKeychainStore();
   } catch (err) {
     warn(
       `OS keychain not available, using file-based credential storage: ${err instanceof Error ? err.message : err}`
@@ -10532,9 +10589,12 @@ function createCredentialStore() {
   return initPromise;
 }
 async function initStore() {
+  log("[credential-store] initializing...");
+  const t0 = Date.now();
   const fileStore = new FileCredentialStore();
   const keychainStore = await tryCreateKeychainStore();
   if (!keychainStore) {
+    log(`[credential-store] using file store (${Date.now() - t0}ms)`);
     return fileStore;
   }
   const keychainCreds = await keychainStore.load();
@@ -10542,6 +10602,7 @@ async function initStore() {
     const fileCreds = await fileStore.load();
     if (fileCreds) {
       await keychainStore.save(fileCreds);
+      keychainStore["cached"] = void 0;
       const verified = await keychainStore.load();
       if (verified) {
         await fileStore.clear();
@@ -10552,6 +10613,7 @@ async function initStore() {
       }
     }
   }
+  log(`[credential-store] using keychain store (${Date.now() - t0}ms)`);
   return keychainStore;
 }
 
@@ -10648,6 +10710,8 @@ async function authenticate() {
   );
 }
 async function ensureAuth() {
+  log("[auth] ensureAuth() started");
+  const t0 = Date.now();
   const apiKey = process.env.FAUX_API_KEY;
   if (apiKey) {
     log("Using FAUX_API_KEY from environment");
@@ -10658,7 +10722,9 @@ async function ensureAuth() {
       source: "api-key"
     };
   }
+  log("[auth] creating credential store...");
   const credStore = await createCredentialStore();
+  log(`[auth] credential store ready (${credStore.name}) in ${Date.now() - t0}ms`);
   const saved = await credStore.load();
   if (saved) {
     if (!isExpiringSoon(saved)) {
@@ -11215,6 +11281,31 @@ async function probeCdpPorts() {
   }
   return null;
 }
+async function launchFigmaWithCdp() {
+  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) {
   if (process.platform === "darwin") {
     const binary = `${figmaPath}/Contents/MacOS/Figma`;
@@ -25896,8 +25987,11 @@ var RESOURCES = [
 ];
 var INSTRUCTIONS = `You are connected to Figma Desktop via faux-studio. You can create, modify, and inspect designs using the tools below.
 
+## Transport
+faux-studio connects to Figma Desktop via **CDP (Chrome DevTools Protocol)** by default \u2014 no plugin needed. It launches Figma with a debug port and communicates directly. If the Figma plugin is installed and running, it can also connect via plugin WebSocket as a fallback. CDP is the preferred zero-setup transport.
+
 ## Workflow
-1. Call \`setup_figma\` first to ensure Figma is running and connected.
+1. Call \`setup_figma\` first to ensure Figma is running and connected (via CDP or plugin).
 2. Call \`get_page_structure\` or \`get_screenshot\` to understand what's on the canvas.
 3. Use \`create_from_schema\` for all creation \u2014 it accepts declarative JSON schemas.
 4. Use \`modify_via_schema\` to change existing nodes.
@@ -25937,7 +26031,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.4.4" },
+    { name: "faux-studio", version: "0.4.7" },
     {
       capabilities: { tools: { listChanged: true }, resources: {}, logging: {} },
       instructions: INSTRUCTIONS
@@ -25952,7 +26046,7 @@ function createMcpServer(deps) {
       },
       {
         name: "setup_figma",
-        description: "Ensure Figma Desktop is running and connected. Call this before any design work. Launches Figma if needed, detects open files and the active tab, and provides setup guidance. Returns connection status, active file, and list of all open design files. Idempotent \u2014 safe to call multiple times.",
+        description: "Ensure Figma Desktop is running and connected via CDP (preferred) or plugin WebSocket. Call this before any design work. Launches Figma with CDP debug port if needed, detects open files and the active tab. Returns connection status, transport mode, active file, and list of all open design files. Idempotent \u2014 safe to call multiple times.",
         inputSchema: {
           type: "object",
           properties: {},
@@ -26166,13 +26260,19 @@ function lazyInit() {
   return initPromise2;
 }
 async function doInit() {
+  log("[init] lazyInit triggered \u2014 starting auth + tool fetch");
+  const t0 = Date.now();
   auth = await ensureAuth();
+  log(`[init] auth complete in ${Date.now() - t0}ms`);
   try {
+    const t1 = Date.now();
     tools = await getTools(auth.jwt);
+    log(`[init] tools fetched (${tools.length}) in ${Date.now() - t1}ms`);
   } catch (err) {
     error(err instanceof Error ? err.message : String(err));
     process.exit(1);
   }
+  log(`[init] full initialization complete in ${Date.now() - t0}ms`);
 }
 async function tryConnectCdp() {
   try {
@@ -26196,10 +26296,6 @@ async function tryConnectCdp() {
   }
 }
 async function executeScript(script, intents, opts) {
-  if (forceTransport !== "cdp" && pluginServer.hasConnections) {
-    log(`Executing via plugin (file: ${pluginServer.activeFileId || "active"})`);
-    return pluginServer.executeScript(script, void 0, intents);
-  }
   if (forceTransport !== "plugin") {
     const client = await tryConnectCdp();
     if (client) {
@@ -26236,6 +26332,10 @@ async function executeScript(script, intents, opts) {
       }
     }
   }
+  if (forceTransport !== "cdp" && pluginServer.hasConnections) {
+    log(`Executing via plugin (file: ${pluginServer.activeFileId || "active"})`);
+    return pluginServer.executeScript(script, void 0, intents);
+  }
   log("No transport available, waiting for plugin...");
   return pluginServer.executeScript(script, void 0, intents);
 }
@@ -26308,9 +26408,6 @@ function pluginReadyResult() {
   };
 }
 async function setupFigma(params) {
-  if (pluginServer.hasConnections) {
-    return pluginReadyResult();
-  }
   if (forceTransport !== "plugin" && cdpClient?.connected && cdpClient.hasContext) {
     if (fileTracker) {
       const detection = await fileTracker.detectActiveFile();
@@ -26328,6 +26425,9 @@ async function setupFigma(params) {
       message: "Connected via CDP. Ready to design."
     };
   }
+  if (forceTransport !== "cdp" && pluginServer.hasConnections) {
+    return pluginReadyResult();
+  }
   if (forceTransport !== "plugin") {
     const existing = await probeCdpPorts();
     if (existing) {
@@ -26363,25 +26463,77 @@ async function setupFigma(params) {
     return {
       status: "not_installed",
       transport: "none",
-      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`
+      message: "Figma Desktop is not installed.\n\n1. Download Figma: https://figma.com/downloads\n2. Install and open it\n3. Call setup_figma again"
     };
   }
   if (!isFigmaRunning()) {
-    try {
-      launchFigma();
-    } catch (err) {
-      return {
-        status: "not_installed",
-        transport: "none",
-        message: err instanceof Error ? err.message : "Failed to launch Figma."
-      };
+    if (forceTransport === "plugin") {
+      try {
+        launchFigma();
+      } catch (err) {
+        return {
+          status: "not_installed",
+          transport: "none",
+          message: err instanceof Error ? err.message : "Failed to launch Figma."
+        };
+      }
+    } else {
+      try {
+        const connection = await launchFigmaWithCdp();
+        const target = findFigmaDesignTarget(connection.targets);
+        if (target) {
+          const client = new CdpClient();
+          await client.connect(target.webSocketDebuggerUrl);
+          await client.discoverFigmaContext();
+          cdpClient = client;
+          log(`CDP connected after launch: ${target.title}`);
+          if (!fileTracker) {
+            fileTracker = new CdpFileTracker(connection.port);
+          }
+          const detection = await fileTracker.detectActiveFile();
+          fileTracker.acknowledgeActiveFile();
+          return {
+            status: "launched",
+            transport: "cdp",
+            message: `Launched Figma and connected via CDP. Active file: "${detection.activeFile?.fileName ?? target.title}". ${detection.allFiles.length} file(s) open. Ready to design.`,
+            activeFile: detection.activeFile?.fileName ?? target.title,
+            openFiles: detection.allFiles.map((f) => ({ fileKey: f.fileKey, fileName: f.fileName })),
+            port: connection.port
+          };
+        }
+        return {
+          status: "launched",
+          transport: "cdp",
+          message: "Launched Figma with CDP enabled but no design file is open.\n\nOpen or create a design file in Figma, then call setup_figma again.",
+          port: connection.port
+        };
+      } catch (err) {
+        return {
+          status: "not_installed",
+          transport: "none",
+          message: err instanceof Error ? err.message : "Failed to launch Figma."
+        };
+      }
     }
   }
+  if (forceTransport !== "plugin") {
+    return {
+      status: "waiting_for_plugin",
+      transport: "none",
+      message: `Figma is running but the CDP debug port is not enabled.
+
+To fix this:
+  1. Quit Figma completely (Cmd+Q / Alt+F4)
+  2. Call setup_figma again \u2014 it will relaunch Figma with CDP enabled
+
+Alternatively, install the faux-studio plugin:
+  1. Download: ${PLUGIN_URL}
+  2. In Figma: Plugins \u2192 Development \u2192 Import plugin from manifest
+  3. Run: Plugins \u2192 Development \u2192 faux-studio
+  4. Call setup_figma again once the plugin shows "Ready".`,
+      port: pluginServer.port
+    };
+  }
   log("Waiting for plugin connection...");
   const connected = await waitForPlugin();
   if (connected) {
@@ -26408,7 +26560,8 @@ Call setup_figma again once the plugin shows "Ready".`,
   };
 }
 async function main() {
-  log(`faux-studio v${"0.4.4"}`);
+  const startupT0 = Date.now();
+  log(`faux-studio v${"0.4.7"} \u2014 process started (PID ${process.pid}, PPID ${process.ppid})`);
   try {
     const port = await pluginServer.start();
     if (forceTransport === "plugin") {
@@ -26416,7 +26569,7 @@ async function main() {
     } else if (forceTransport === "cdp") {
       log(`Transport: CDP-only mode (FAUX_TRANSPORT=cdp) \u2014 plugin WS on port ${port} (standby)`);
     } else {
-      log(`Transport: auto \u2014 plugin WS on port ${port}, CDP on-demand`);
+      log(`Transport: auto \u2014 CDP preferred, plugin WS on port ${port} (fallback)`);
     }
   } catch (err) {
     warn(`Plugin WS server failed to start: ${err instanceof Error ? err.message : err}`);
@@ -26460,6 +26613,7 @@ async function main() {
   });
   await startServer(server2);
   setServer(server2);
+  log(`[startup] MCP server ready in ${Date.now() - startupT0}ms \u2014 handshake complete`);
   if (forceTransport !== "plugin") {
     try {
       await tryConnectCdp();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "faux-studio",
-  "version": "0.4.4",
+  "version": "0.4.7",
   "description": "AI-powered Figma design via MCP — connect any AI client to Figma Desktop",
   "type": "module",
   "bin": {
@@ -44,7 +44,9 @@
     "url": "https://github.com/uxfreak/faux-studio.git"
   },
   "homepage": "https://faux.design",
-  "optionalDependencies": {
-    "@napi-rs/keyring": "^1.2.0"
-  }
+  "os": [
+    "darwin",
+    "linux",
+    "win32"
+  ]
 }