figma-rust-mcp 4.1.0 → 5.0.2

package/README.md

@@ -18,7 +18,7 @@ Enables AI agents (Google Antigravity, Claude Code, Cursor, Windsurf, VS Code, Z
 - **Batch Asset Extractor (`figma_export_assets` / `figma_export_asset`)**: Extracts SVG icons and raster images directly to project folders (`outputPath`) with auto-generated TypeScript barrel exports (`index.ts`) — zero chat token bloating.
 - **Sandboxed JS Drawing Engine (`figma_write`)**: Powered by **Boa** (pure Rust ECMAScript engine) with built-in asset resolvers and 7 icon packs (*Ionicons, Lucide, Tabler, Bootstrap, Fluent, Phosphor*).
 - **Multi-Tab / Multi-Session Support**: Seamlessly connects to multiple open Figma files simultaneously.
-- **100% Localhost Privacy**: All communication stays strictly on `127.0.0.1:38451`.
+- **100% Localhost Privacy**: All communication stays strictly on `127.0.0.1:41730`.
 
 ---
 
@@ -36,7 +36,7 @@ Enables AI agents (Google Antigravity, Claude Code, Cursor, Windsurf, VS Code, Z
 │  • Sandboxed JS Runtime (Boa ECMAScript Engine)                        │
 │  • Binary MessagePack & Progressive Subtree Chunk Receiver             │
 └───────────────▲────────────────────────────────────────▲───────────────┘
-                │ (ws://127.0.0.1:38451/ws)              │ (http://127.0.0.1:38451/mcp)
+                │ (ws://127.0.0.1:41730/ws)              │ (http://127.0.0.1:41730/mcp)
                 │ (Dynamic Code Streaming & Hot-Reload)  │ (JSON-RPC 2.0 / Streamable HTTP)
       ┌─────────┴─────────┐                    ┌─────────┴─────────┐
       │   Figma Desktop   │                    │ AI Assistant(s)   │
@@ -50,9 +50,10 @@ Enables AI agents (Google Antigravity, Claude Code, Cursor, Windsurf, VS Code, Z
 
 ### 🔌 How the Zero-Touch Connection Works:
 1. **Permanent Thin Loader**: You only import the Figma plugin **once** (`~/.figma-rust-mcp/plugin/manifest.json`).
-2. **Dynamic Runtime Streaming**: Upon launch, the Thin Loader contacts `http://127.0.0.1:38451/plugin/code.js` to fetch and execute the latest runtime in memory.
-3. **Live WebSocket Hot-Reload**: The plugin connects to `ws://127.0.0.1:38451/ws`. When you upgrade `figma-rust-mcp` or restart the daemon, the plugin automatically detects the new server version and hot-reloads seamlessly — **no need to re-import or restart the plugin in Figma**.
+2. **Dynamic Runtime Streaming**: Upon launch, the Thin Loader contacts `http://127.0.0.1:41730/plugin/code.js` to fetch and execute the latest runtime in memory.
+3. **Live WebSocket Hot-Reload**: The plugin connects to `ws://127.0.0.1:41730/ws`. When you upgrade `figma-rust-mcp` or restart the daemon, the plugin automatically detects the new server version and hot-reloads seamlessly — **no need to re-import or restart the plugin in Figma**.
 4. **Auto-Reconnect & Offline Buffer**: If Figma is opened before the Rust service starts, the plugin displays a waiting screen and connects automatically the instant the service is up.
+5. **Port Range & Auto-Switch**: The bridge uses ports `41730–41739`. On start it reuses a running server of the same version, skips any port held by another app or a different figma-rust-mcp version, and starts on the first free port. The plugin scans the same range, so it follows automatically. MCP clients configured by URL point at `41730`; the server prints a warning with the new port if it had to move.
 
 ---
 
@@ -148,13 +149,13 @@ Use the `/mcp` endpoint. It accepts `POST` JSON-RPC requests directly:
 
 ```toml
 [mcp_servers.figma-rust-mcp]
-url = "http://127.0.0.1:38451/mcp"
+url = "http://127.0.0.1:41730/mcp"
 ```
 
 For Codex CLI, the equivalent command is:
 
 ```bash
-codex mcp add figma-rust-mcp --url http://127.0.0.1:38451/mcp
+codex mcp add figma-rust-mcp --url http://127.0.0.1:41730/mcp
 ```
 
 #### Google Antigravity (SSE Transport)
@@ -163,7 +164,7 @@ Add to your `~/.gemini/config/mcp_config.json` or project `.agents/mcp_config.js
 {
   "mcpServers": {
     "figma-rust-mcp": {
-      "serverUrl": "http://127.0.0.1:38451/sse"
+      "serverUrl": "http://127.0.0.1:41730/sse"
     }
   }
 }
@@ -176,7 +177,7 @@ These clients can use the Streamable HTTP `/mcp` endpoint:
 {
   "mcpServers": {
     "figma-rust-mcp": {
-      "url": "http://127.0.0.1:38451/mcp"
+      "url": "http://127.0.0.1:41730/mcp"
     }
   }
 }
@@ -200,7 +201,7 @@ Alternatively, configure a stdio subprocess via NPX:
 Check the runtime bundle currently served to Figma Desktop:
 
 ```bash
-curl http://127.0.0.1:38451/plugin/version
+curl http://127.0.0.1:41730/plugin/version
 ```
 
 The response includes `version` and `runtimeHash`. If the hash changes after an
@@ -421,21 +422,49 @@ recently used entry when its 64-entry capacity is reached.
 
 ## 📏 Benchmarks
 
-`npm run bench` builds the release binary, spawns it on a random port and prints:
+`npm run bench` builds the release binary and prints a JSON report from a fresh
+server: cold start, process startup, server RAM and MCP dispatch latency. A fresh
+server has no Figma session, so plugin and index measurements are explicitly
+skipped.
 
-| Metric | How it is measured |
+To measure real work, connect the Figma plugin and use the existing server:
+
+```bash
+# Server report, including its current index and plugin round trip
+node scripts/bench.mjs --url http://127.0.0.1:41730
+
+# Read all descendants of a frame, index that frame, and export it as a 1x PNG
+node scripts/bench.mjs --url http://127.0.0.1:41730 \
+  --target 'SESSION_ID=FRAME_ID' --samples 3 > benchmark.json
+
+# Run the same workloads concurrently on two tabs
+node scripts/bench.mjs --url http://127.0.0.1:41730 \
+  --target 'FIRST_SESSION=FIRST_FRAME' --target 'SECOND_SESSION=SECOND_FRAME'
+```
+
+Find session IDs at `GET /sessions` and frame IDs in the plugin selection card.
+Use one frame per session and 1–10 samples per workload. Workloads read Figma
+content; they do not modify canvas nodes. Indexing updates the bridge's cache,
+and PNG export may briefly move the viewport before restoring it.
+
+| Measurement | What it includes |
 |---|---|
-| Cold start | `spawn` → first successful `GET /health`, from outside the process |
-| Startup | `main()` entry → HTTP listener bound |
-| RAM | Resident set size (macOS/Linux; not reported on Windows) |
 | MCP `tools/list` | 200 in-process dispatches, p50/p95 |
-| Index search | 200 searches over the current tab's index, p50/p95 (plugin tab only) |
-| Plugin round trip | 10 `get_viewport` calls through Figma, p50/p95 (plugin tab only) |
-
-The plugin's **Bench** tab runs the same report (`POST /benchmark`) against the
-live server, so index and plugin numbers reflect your real file. Sample run on an
-Apple Silicon Mac (v4.0.1): cold start 45–530ms, startup 26–126ms, RSS ~7.6MB,
-`tools/list` p50 0.07ms. Your numbers will differ; quote your own.
+| Index search | 200 searches over the current index, when available |
+| Plugin round trip | 10 `get_viewport` calls, when connected |
+| Frame read | All paginated `read_nodes` responses, node/page counts and JSON bytes |
+| Frame index | Plugin scan and response time; bridge commit acknowledgement is separate |
+| PNG export | Figma export, transfer and decoded image bytes |
+| Concurrent tabs | Workloads run sequentially per tab and concurrently across tabs |
+| RAM | Server RSS before/after workloads, not peak RAM or Figma's memory |
+
+Reports contain each sample plus p50/p95/max. Reads use the normal cache, so the
+samples are not guaranteed cold reads. Truncated reads remain marked incomplete;
+failed workloads retain their error and the CLI exits with status 1. Real Figma
+results depend on your file; simulated integration tests only verify the path.
+
+The plugin's existing **Bench** tab retains the basic `POST /benchmark` report.
+Use the CLI for the heavier frame and concurrent-tab workloads.
 
 ## 💻 Development & Testing
 

package/bin/agent-config.js

@@ -4,7 +4,7 @@ import os from 'node:os';
 import { applyEdits, modify, parse } from 'jsonc-parser';
 
 const SERVER_NAME = 'figma-rust-mcp';
-const HTTP_URL = 'http://127.0.0.1:38451/mcp';
+const HTTP_URL = 'http://127.0.0.1:41730/mcp';
 
 function existsAny(paths) {
   return paths.some(candidate => candidate && fs.existsSync(candidate));
@@ -78,7 +78,7 @@ function upsertCodex(filePath) {
 
 export function configureAgent(agent) {
   const entry = agent.id === 'antigravity'
-    ? { serverUrl: 'http://127.0.0.1:38451/sse' }
+    ? { serverUrl: 'http://127.0.0.1:41730/sse' }
     : agent.id === 'claude' || agent.id === 'vscode'
       ? { type: 'http', url: HTTP_URL }
       : { url: HTTP_URL };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "figma-rust-mcp",
-  "version": "4.1.0",
+  "version": "5.0.2",
   "description": "Claude Code to Figma — Bidirectional MCP bridge. AI draws UI on Figma canvas, reads designs back. Works with Claude, Cursor, VS Code, Windsurf, Antigravity. No API key needed.",
   "mcpName": "io.github.BuiHung1612/figma-rust-mcp",
   "type": "module",

package/plugin/manifest.json

@@ -5,21 +5,33 @@
   "main": "code.js",
   "ui": "ui.html",
   "documentAccess": "dynamic-page",
-  "editorType": ["figma", "dev"],
+  "editorType": [
+    "figma",
+    "dev"
+  ],
   "networkAccess": {
     "allowedDomains": [
-      "http://localhost:38451",
-      "http://localhost:38452",
-      "http://localhost:38453",
-      "http://localhost:38454",
-      "http://localhost:38455",
-      "ws://localhost:38451",
-      "ws://localhost:38452",
-      "ws://localhost:38453",
-      "ws://localhost:38454",
-      "ws://localhost:38455"
+      "http://localhost:41730",
+      "http://localhost:41731",
+      "http://localhost:41732",
+      "http://localhost:41733",
+      "http://localhost:41734",
+      "http://localhost:41735",
+      "http://localhost:41736",
+      "http://localhost:41737",
+      "http://localhost:41738",
+      "http://localhost:41739",
+      "ws://localhost:41730",
+      "ws://localhost:41731",
+      "ws://localhost:41732",
+      "ws://localhost:41733",
+      "ws://localhost:41734",
+      "ws://localhost:41735",
+      "ws://localhost:41736",
+      "ws://localhost:41737",
+      "ws://localhost:41738",
+      "ws://localhost:41739"
     ],
-    "reasoning": "Thin loader connecting dynamically to the local figma-rust-mcp Rust engine on ports 38451-38455."
+    "reasoning": "Thin loader connecting dynamically to the local figma-rust-mcp Rust engine on ports 41730-41739."
   }
 }
-

package/plugin/ui.html

@@ -6,18 +6,18 @@
   <title>Figma Rust MCP Loader</title>
   <style>
     :root {
-      --bg: #0d0e12;
-      --surface-base: #12141a;
-      --surface-card: #171922;
-      --border-subtle: rgba(255, 255, 255, 0.08);
-      --border-ghost: rgba(147, 129, 255, 0.35);
-      --text-primary: #f4f4f7;
-      --text-secondary: #9aa1b2;
-      --text-muted: #52596d;
-      --ghost-lavender: #9381ff;
-      --ghost-mint: #34d399;
-      --font-ui: -apple-system, BlinkMacSystemFont, 'Inter', 'SF Pro Text', sans-serif;
-      --font-mono: 'JetBrains Mono', 'SF Mono', Menlo, monospace;
+      --bg: #fdf1dc;
+      --surface-base: #fffaf0;
+      --surface-card: #fffdf7;
+      --border-subtle: #1c1a17;
+      --border-ghost: #1c1a17;
+      --text-primary: #1c1a17;
+      --text-secondary: #4a453d;
+      --text-muted: #7d7567;
+      --ghost-lavender: #f4532c;
+      --ghost-mint: #2f8f3a;
+      --font-ui: ui-rounded, 'SF Pro Rounded', -apple-system, BlinkMacSystemFont, 'Inter', sans-serif;
+      --font-mono: ui-monospace, 'SF Mono', 'JetBrains Mono', Menlo, monospace;
     }
     *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
     html, body { width: 100%; height: 100%; overflow: hidden; background: var(--bg); color: var(--text-primary); font-family: var(--font-ui); font-size: 11px; }
@@ -58,7 +58,7 @@
       height: 14px;
       border-radius: 50%;
       background: var(--ghost-lavender);
-      box-shadow: 0 0 16px var(--ghost-lavender);
+      border: 2px solid #1c1a17;
     }
 
     @keyframes pulse {
@@ -85,7 +85,8 @@
       gap: 6px;
       padding: 4px 10px;
       background: var(--surface-card);
-      border: 1px solid var(--border-subtle);
+      border: 2px solid var(--border-subtle);
+      box-shadow: 2px 2px 0 #1c1a17;
       border-radius: 9999px;
       font-family: var(--font-mono);
       font-size: 10px;
@@ -94,7 +95,8 @@
     }
     .hint-box {
       background: var(--surface-base);
-      border: 1px solid var(--border-subtle);
+      border: 2px solid var(--border-subtle);
+      box-shadow: 2px 2px 0 #1c1a17;
       border-radius: 8px;
       padding: 10px 12px;
       max-width: 280px;
@@ -108,7 +110,7 @@
       color: var(--ghost-lavender);
       display: block;
       margin-top: 4px;
-      background: rgba(0,0,0,0.3);
+      background: rgba(28,26,23,0.06);
       padding: 3px 6px;
       border-radius: 4px;
     }
@@ -123,9 +125,9 @@
       <div class="radar-core"></div>
     </div>
     <div class="title">Connecting to figma-rust-mcp</div>
-    <div id="status" class="status-text">Scanning local ports (38451-38455)...</div>
+    <div id="status" class="status-text">Scanning local ports (41730-41739)...</div>
     <div class="badge">
-      <span>●</span> <span id="port-label">localhost:38451</span>
+      <span>●</span> <span id="port-label">localhost:41730</span>
     </div>
     <div class="hint-box">
       Ensure the local Rust server is running:
@@ -134,7 +136,8 @@
   </div>
 
   <script>
-    const PORTS = [38451, 38452, 38453, 38454, 38455];
+    // Must match DEFAULT_PORT / PORT_RANGE in src/bridge/server.rs and manifest.json.
+    const PORTS = Array.from({ length: 10 }, (_, i) => 41730 + i);
     let attempts = 0;
 
     async function checkPort(port) {
@@ -148,8 +151,9 @@
         clearTimeout(timeoutId);
         if (res.ok) {
           const data = await res.json();
-          return { ok: true, data };
+          if (data && data.name === "figma-rust-mcp") return { ok: true, data };
         }
+        return { ok: false, answered: true };
       } catch (_) {
         clearTimeout(timeoutId);
       }
@@ -174,7 +178,8 @@
         if (!uiRes.ok) throw new Error("Failed to load plugin UI: " + uiRes.status);
         const uiHtml = await uiRes.text();
 
-        // 3. Inject full UI cleanly
+        // 3. Inject full UI cleanly; the runtime reads the port from here (globals survive document.open).
+        window.__FIGMA_MCP_PORT = port;
         document.open();
         document.write(uiHtml);
         document.close();
@@ -190,17 +195,20 @@
       const statusEl = document.getElementById("status");
       const portEl = document.getElementById("port-label");
 
-      for (const port of PORTS) {
-        if (portEl) portEl.textContent = `localhost:${port}`;
-        const result = await checkPort(port);
-        if (result.ok) {
-          await bootstrapFromPort(port);
-          return;
-        }
+      if (portEl) portEl.textContent = `localhost:${PORTS[0]}-${PORTS[PORTS.length - 1]}`;
+      const results = await Promise.all(PORTS.map(checkPort));
+      const hit = results.findIndex(r => r.ok);
+      if (hit >= 0) {
+        if (portEl) portEl.textContent = `localhost:${PORTS[hit]}`;
+        await bootstrapFromPort(PORTS[hit]);
+        return;
       }
 
       if (statusEl) {
-        statusEl.textContent = `Waiting for server (attempt #${attempts})...`;
+        const busy = PORTS.filter((_, i) => results[i].answered);
+        statusEl.textContent = busy.length
+          ? `Port ${busy.join(", ")} answered but is not a compatible figma-rust-mcp. Run: npx -y figma-rust-mcp@latest --install-service (attempt #${attempts})`
+          : `Waiting for server (attempt #${attempts})...`;
       }
       setTimeout(findAndConnect, 1000);
     }

package/scripts/bench-workloads.mjs

@@ -0,0 +1,85 @@
+// Read-only live workloads. The server and Figma plugin must already be running.
+export async function requestJson(base, route, body) {
+  const response = await fetch(new URL(route, base), {
+    method: body === undefined ? 'GET' : 'POST',
+    headers: body === undefined ? {} : { 'Content-Type': 'application/json' },
+    body: body === undefined ? undefined : JSON.stringify(body),
+    signal: AbortSignal.timeout(120000),
+  });
+  if (!response.ok) throw new Error(`${route}: HTTP ${response.status}`);
+  return response.json();
+}
+
+export function summarize(samples) {
+  const times = samples.map(sample => sample.durationMs).sort((a, b) => a - b);
+  const pick = q => times[Math.round((times.length - 1) * q)];
+  return { n: times.length, p50Ms: pick(.5), p95Ms: pick(.95), maxMs: times.at(-1), samples };
+}
+
+export async function benchmarkTargets(base, targets, samples = 3) {
+  if (!Number.isInteger(samples) || samples < 1 || samples > 10) throw new Error('samples must be from 1 to 10');
+  if (!targets.length || targets.some(target => !target.sessionId || !target.nodeId)) throw new Error('Each target needs sessionId and nodeId');
+  if (new Set(targets.map(target => target.sessionId)).size !== targets.length) throw new Error('Use one target per session for concurrent tab measurements');
+  const memoryBefore = (await requestJson(base, '/health')).stats?.memoryMb ?? null;
+  const started = performance.now();
+  const results = await Promise.all(targets.map(async ({ sessionId, nodeId }) => {
+    const workloads = {};
+    const exec = async (operation, params) => {
+      const result = await requestJson(base, `/exec?sessionId=${encodeURIComponent(sessionId)}`, { operation, params });
+      if (!result.success) throw new Error(result.error || `${operation} failed`);
+      return result.data;
+    };
+    const runs = {
+      readFrame: async () => {
+        let cursor, nodes = 0, pages = 0, responseBytes = 0, complete;
+        const cursors = new Set();
+        do {
+          const data = await exec('read_nodes', cursor ? { cursor, limit: 500 } :
+            { id: nodeId, depth: 'full', expandInstances: true, fields: ['geometry', 'content', 'style', 'text'], limit: 500 });
+          if (!Array.isArray(data.nodes)) throw new Error('read_nodes returned no node list');
+          nodes += data.nodes.length; pages++;
+          responseBytes += Buffer.byteLength(JSON.stringify(data));
+          complete = data.complete === true;
+          cursor = data.nextCursor;
+          if (cursor && cursors.has(cursor)) throw new Error('read_nodes repeated a cursor');
+          if (cursor) cursors.add(cursor);
+          if (cursor && pages >= 100) throw new Error('read_nodes exceeded 100 pages');
+        } while (cursor);
+        return { nodes, pages, responseBytes, complete };
+      },
+      indexFrame: async () => {
+        const data = await exec('index_scan', { id: nodeId, depth: 'full', expandInstances: true, deferComponents: true });
+        if (data.cancelled) throw new Error('Index cancelled by a document or page change');
+        return { complete: data.complete === true, nodesTruncated: data.nodesTruncated === true };
+      },
+      exportPng: async () => {
+        const data = await exec('export_image', { id: nodeId, format: 'PNG', scale: 1 });
+        if (typeof data.base64 !== 'string') throw new Error('export_image returned no image');
+        return { imageBytes: Buffer.from(data.base64, 'base64').length, width: data.width, height: data.height };
+      },
+    };
+    for (const [name, run] of Object.entries(runs)) {
+      const timings = [];
+      try {
+        for (let i = 0; i < samples; i++) {
+          const start = performance.now();
+          const data = await run();
+          timings.push({ durationMs: performance.now() - start, ...data });
+        }
+        workloads[name] = summarize(timings);
+      } catch (error) {
+        workloads[name] = { error: error.message, completedSamples: timings.length, samples: timings };
+        break; // Do not keep loading a tab after a timeout or disconnect.
+      }
+    }
+    return { sessionId, nodeId, workloads };
+  }));
+  const memoryAfter = (await requestJson(base, '/health')).stats?.memoryMb ?? null;
+  return {
+    mode: 'live', concurrentTabs: targets.length, samplesPerWorkload: samples,
+    wallTimeMs: performance.now() - started,
+    serverRssBeforeMb: memoryBefore, serverRssAfterMb: memoryAfter,
+    note: 'RSS is server memory at the boundaries, not peak memory or Figma memory. Reads may use the normal cache. Index timing includes plugin scan/response, not bridge commit acknowledgement.',
+    targets: results,
+  };
+}

package/scripts/bench.mjs

@@ -1,37 +1,59 @@
-// Benchmark: cold start measured from outside (spawn → /health answers), then the
-// server's in-process report from POST /benchmark (same numbers as the plugin "Bench" tab).
-// Usage: npm run bench   or   node scripts/bench.mjs [path/to/figma-rust-mcp]
-import { spawn } from "node:child_process";
-import { statSync } from "node:fs";
+// Cold: node scripts/bench.mjs [binary]
+// Live: node scripts/bench.mjs --url http://127.0.0.1:41730 --target SESSION=NODE [--target SESSION=NODE] [--samples 3]
+import { spawn } from 'node:child_process';
+import { createServer } from 'node:net';
+import { statSync } from 'node:fs';
+import { benchmarkTargets, requestJson } from './bench-workloads.mjs';
 
-const bin = process.argv[2] ?? `target/release/figma-rust-mcp${process.platform === "win32" ? ".exe" : ""}`;
-const port = 40000 + Math.floor(Math.random() * 10000);
-const base = `http://127.0.0.1:${port}`;
-
-const t0 = performance.now();
-const child = spawn(bin, ["--server", "--port", String(port)], { stdio: "ignore" });
-let coldStartMs;
+const args = process.argv.slice(2), targets = [];
+let base, samples = 3, bin = `target/release/figma-rust-mcp${process.platform === 'win32' ? '.exe' : ''}`;
+for (let i = 0; i < args.length; i++) {
+  const arg = args[i];
+  if (arg === '--url') base = args[++i];
+  else if (arg === '--samples') samples = Number(args[++i]);
+  else if (arg === '--target') {
+    const target = args[++i] || '', separator = target.indexOf('=');
+    if (separator < 1 || separator === target.length - 1) throw new Error('--target must be SESSION=NODE');
+    targets.push({ sessionId: target.slice(0, separator), nodeId: target.slice(separator + 1) });
+  } else if (!arg.startsWith('-') && i === 0) bin = arg;
+  else throw new Error(`Unknown argument: ${arg}`);
+}
+if (args.includes('--url') && !base) throw new Error('--url needs a server URL');
+if (!Number.isInteger(samples) || samples < 1 || samples > 10) throw new Error('--samples must be from 1 to 10');
+if (targets.length && !base) throw new Error('--target requires --url for an existing Figma connection');
+if (base && !['http:', 'https:'].includes(new URL(base).protocol)) throw new Error('--url must use HTTP or HTTPS');
+let child, coldStartMs;
 try {
-  while (coldStartMs === undefined) {
-    if (performance.now() - t0 > 10_000) throw new Error("server did not answer /health within 10s");
-    try {
-      if ((await fetch(`${base}/health`)).ok) coldStartMs = performance.now() - t0;
-    } catch {
-      await new Promise((r) => setTimeout(r, 2));
+  if (!base) {
+    const reservation = createServer();
+    await new Promise(resolve => reservation.listen(0, '127.0.0.1', resolve));
+    const port = reservation.address().port;
+    await new Promise(resolve => reservation.close(resolve));
+    base = `http://127.0.0.1:${port}`;
+    const start = performance.now();
+    let spawnError;
+    child = spawn(bin, ['--server', '--port', String(port)], { stdio: 'ignore' });
+    child.on('error', error => { spawnError = error; });
+    while (coldStartMs === undefined) {
+      if (spawnError) throw spawnError;
+      if (child.exitCode !== null) throw new Error(`Server exited: ${child.exitCode}`);
+      if (performance.now() - start > 10000) throw new Error('Server did not answer /health within 10s');
+      try {
+        const response = await fetch(`${base}/health`, { signal: AbortSignal.timeout(500) });
+        if (response.ok) coldStartMs = performance.now() - start;
+      } catch {}
+      if (coldStartMs === undefined) await new Promise(resolve => setTimeout(resolve, 2));
     }
   }
-  const r = await (await fetch(`${base}/benchmark`, { method: "POST" })).json();
-  const lat = (s) => (s ? `p50 ${s.p50Ms.toFixed(3)}ms · p95 ${s.p95Ms.toFixed(3)}ms (n=${s.n})` : "skipped");
-  const rows = {
-    version: `v${r.version}`,
-    "binary size": `${(statSync(bin).size / 1024 / 1024).toFixed(1)}MB`,
-    "cold start (spawn → /health)": `${coldStartMs.toFixed(1)}ms`,
-    "startup (main → listening)": r.startupMs != null ? `${r.startupMs.toFixed(2)}ms` : "—",
-    "RAM (RSS)": r.memoryMb != null ? `${r.memoryMb.toFixed(1)}MB` : "n/a on this OS",
-    "MCP tools/list (in-process)": lat(r.mcpToolsList),
-    "plugin round trip": r.pluginRoundTrip ? lat(r.pluginRoundTrip) : "skipped (fresh server has no Figma session)",
-  };
-  for (const [k, v] of Object.entries(rows)) console.log(`${k.padEnd(30)} ${v}`);
+  const report = await requestJson(base, '/benchmark', {});
+  report.mode = child ? 'cold-start' : 'live';
+  if (child) {
+    report.coldStartMs = coldStartMs;
+    report.binarySizeMb = statSync(bin).size / 1024 / 1024;
+  }
+  if (targets.length) report.workloads = await benchmarkTargets(base, targets, samples);
+  console.log(JSON.stringify(report, null, 2));
+  if (report.workloads?.targets.some(target => Object.values(target.workloads).some(workload => workload.error || workload.samples?.some(sample => sample.complete === false)))) process.exitCode = 1;
 } finally {
-  child.kill();
+  child?.kill();
 }

package/scripts/helpers/index-sync-ui.mjs

@@ -0,0 +1,22 @@
+import { readFileSync } from 'node:fs';
+import vm from 'node:vm';
+
+export function indexSyncUi(socket = { readyState: 1, send() {} }) {
+  const html = readFileSync('plugin-runtime/ui.html', 'utf8');
+  const element = () => {
+    const classes = new Set();
+    return { disabled: false, title: 'Sync index', attributes: {},
+      setAttribute(name, value) { this.attributes[name] = value; },
+      classList: { add: name => classes.add(name), remove: name => classes.delete(name),
+        contains: name => classes.has(name), toggle: (name, active) => active ? classes.add(name) : classes.delete(name) } };
+  };
+  const timers = new Map();
+  let timerId = 0;
+  const ui = vm.createContext({ reindexBtn: element(), indexProgressWrap: element(), indexProgressText: element(),
+    ws: socket, WebSocket: { OPEN: 1 }, log() {},
+    setTimeout(callback, delay) { timers.set(++timerId, { callback, delay }); return timerId; },
+    clearTimeout(id) { timers.delete(id); } });
+  vm.runInContext(html.slice(html.indexOf('    var activeIndexScan ='), html.indexOf('    function focusSelection()')), ui);
+  ui.fireTimers = delay => { for (const [id, timer] of timers) if (timer.delay === delay) { timers.delete(id); timer.callback(); } };
+  return ui;
+}

package/scripts/test-bench.mjs

@@ -0,0 +1,98 @@
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+import { createServer } from 'node:http';
+import { spawn } from 'node:child_process';
+import { benchmarkTargets, summarize } from './bench-workloads.mjs';
+
+async function fixture(t, exec) {
+  const calls = [];
+  const server = createServer(async (request, response) => {
+    try {
+      const url = new URL(request.url, 'http://localhost');
+      response.setHeader('Content-Type', 'application/json');
+      if (url.pathname === '/health') return response.end(JSON.stringify({ stats: { memoryMb: 12 } }));
+      if (url.pathname === '/benchmark') return response.end(JSON.stringify({ version: 'test', pluginRoundTrip: null }));
+      let body = '';
+      for await (const chunk of request) body += chunk;
+      const call = { sessionId: url.searchParams.get('sessionId'), ...JSON.parse(body) };
+      calls.push(call);
+      response.end(JSON.stringify(await exec(call)));
+    } catch (error) {
+      response.statusCode = 500; response.end(JSON.stringify({ error: error.message }));
+    }
+  });
+  await new Promise(resolve => server.listen(0, '127.0.0.1', resolve));
+  t.after(() => { server.closeAllConnections(); server.close(); });
+  return { base: `http://127.0.0.1:${server.address().port}`, calls };
+}
+
+const result = data => ({ success: true, data });
+function success(call) {
+  if (call.operation === 'read_nodes') return result({ nodes: [{ id: call.params.cursor ? 'child' : call.params.id }],
+    nextCursor: call.params.cursor ? null : `${call.sessionId}:next`, complete: !!call.params.cursor });
+  if (call.operation === 'index_scan') return result({ complete: true, nodesTruncated: false });
+  if (call.operation === 'export_image') return result({ base64: Buffer.from('png').toString('base64'), width: 100, height: 80 });
+  throw new Error(`Unexpected operation: ${call.operation}`);
+}
+
+function cli(args) {
+  return new Promise((resolve, reject) => {
+    const child = spawn(process.execPath, ['scripts/bench.mjs', ...args]);
+    let stdout = '', stderr = '';
+    child.stdout.on('data', chunk => { stdout += chunk; });
+    child.stderr.on('data', chunk => { stderr += chunk; });
+    child.on('error', reject);
+    child.on('exit', code => resolve({ code, stdout, stderr }));
+  });
+}
+
+test('live benchmark paginates reads, measures all workloads and runs tabs concurrently', { timeout: 5000 }, async t => {
+  let active = 0, peak = 0;
+  const { base, calls } = await fixture(t, async call => {
+    active++; peak = Math.max(peak, active);
+    await new Promise(resolve => setTimeout(resolve, 5));
+    active--;
+    return success(call);
+  });
+  const report = await benchmarkTargets(base, [{ sessionId: 'one', nodeId: 'frame:1' }, { sessionId: 'two', nodeId: 'frame:2' }], 2);
+  assert.equal(report.concurrentTabs, 2);
+  assert.ok(peak >= 2);
+  assert.equal(report.serverRssBeforeMb, 12);
+  for (const target of report.targets) {
+    assert.equal(target.workloads.readFrame.n, 2);
+    assert.equal(target.workloads.readFrame.samples[0].nodes, 2);
+    assert.equal(target.workloads.readFrame.samples[0].pages, 2);
+    assert.equal(target.workloads.readFrame.samples[0].complete, true);
+    assert.ok(target.workloads.readFrame.samples[0].responseBytes > 0);
+    assert.equal(target.workloads.indexFrame.samples[0].complete, true);
+    assert.equal(target.workloads.exportPng.samples[0].imageBytes, 3);
+  }
+  assert.equal(calls.length, 16);
+  assert.ok(calls.filter(call => call.params.cursor).every(call => call.params.cursor.startsWith(call.sessionId)));
+});
+
+test('live benchmark exposes bridge failures and stops loading the failed tab', async t => {
+  const { base, calls } = await fixture(t, () => ({ success: false, error: 'Plugin disconnected' }));
+  const report = await benchmarkTargets(base, [{ sessionId: 'one', nodeId: 'frame' }]);
+  assert.equal(report.targets[0].workloads.readFrame.error, 'Plugin disconnected');
+  assert.equal(calls.length, 1);
+  await assert.rejects(benchmarkTargets(base, [{ sessionId: 'one', nodeId: 'a' }, { sessionId: 'one', nodeId: 'b' }]), /one target per session/);
+  await assert.rejects(benchmarkTargets(base, [{ sessionId: 'one', nodeId: 'a' }], 0), /samples/);
+});
+
+test('benchmark rejects repeated cursors and CLI preserves failure status in JSON', async t => {
+  const { base } = await fixture(t, () => result({ nodes: [], nextCursor: 'same', complete: false }));
+  const output = await cli(['--url', base, '--target', 'one=frame', '--samples', '1']);
+  assert.equal(output.code, 1, output.stderr);
+  const report = JSON.parse(output.stdout);
+  assert.match(report.workloads.targets[0].workloads.readFrame.error, /repeated a cursor/);
+  const invalid = await cli(['--target', 'invalid']);
+  assert.equal(invalid.code, 1);
+  assert.match(invalid.stderr, /SESSION=NODE/);
+});
+
+test('benchmark reports sorted percentile samples', () => {
+  const report = summarize([5, 1, 3, 2, 4].map(durationMs => ({ durationMs })));
+  assert.equal(report.p50Ms, 3);
+  assert.equal(report.p95Ms, 5);
+});

package/scripts/test-bridge-sessions.mjs

@@ -158,3 +158,121 @@ test('multiple tabs, reconnect ownership and independent frame tasks across MCP
   const restarted = decode(ok(await rpc('figma_task', { action: 'start', sessionId: 'tab-b', frameId: 'frame-c' })));
   ok(await rpc('figma_task', { action: 'end', taskId: restarted.taskId }));
 });
+
+test('index sync travels from plugin through UI to bridge and returns a matching confirmation', { timeout: 20000 }, async t => {
+  const { indexSyncUi } = await import('./helpers/index-sync-ui.mjs');
+  const reservation = createServer();
+  await new Promise(resolve => reservation.listen(0, '127.0.0.1', resolve));
+  const port = reservation.address().port;
+  await new Promise(resolve => reservation.close(resolve));
+  const server = spawn(process.env.FIGMA_TEST_BINARY || 'target/debug/figma-rust-mcp',
+    ['--server', '--port', String(port)], { stdio: ['ignore', 'ignore', 'pipe'] });
+  let stderr = ''; server.stderr.on('data', bytes => { stderr = (stderr + bytes).slice(-4000); });
+  const sockets = [];
+  t.after(() => { sockets.forEach(socket => socket.close()); server.kill(); });
+  const base = `http://127.0.0.1:${port}`;
+  await until(async () => { try { return (await fetch(`${base}/health`)).ok; } catch { assert.equal(server.exitCode, null, stderr); return false; } });
+  const ui = indexSyncUi(null);
+  const page = { id: 'page', children: [{ id: 'frame', name: 'Frame', type: 'FRAME', width: 100, height: 100 }] };
+  const runtime = vm.createContext({ figma: { currentPage: page, root: { name: 'Sync test' },
+    ui: { postMessage: msg => ui.handleIndexMessage(msg) } }, handlers: {}, console, setTimeout, Map, Set, Uint8Array });
+  for (const file of ['utils', 'token-helpers', 'read-helpers', 'handlers-read-detail', 'handlers-read', 'handlers-tokens', 'handlers-write-ops', 'node-reader']) {
+    vm.runInContext(readFileSync(`plugin-src/${file}.js`, 'utf8'), runtime);
+  }
+  runtime.handlers.get_styles = async () => ({});
+  runtime.handlers.get_variables = async () => ({});
+  const html = readFileSync('plugin-runtime/ui.html', 'utf8');
+  Object.assign(ui, { WebSocket, BRIDGE: base, sessionId: 'sync-test', fileName: 'Sync test', documentId: 'sync-doc',
+    uiDisposed: false, wsConnected: false, everConnected: false, retryTimer: null, polling: false, consecutiveErrors: 0,
+    currentPort: port, window: {}, READ_OPS: [], setInterval: () => 1, clearInterval() {},
+    sendRuntimeCapabilities() {}, setStatus() {}, updateRuntimeVersion() {}, startLongPoll() {},
+    dispatchToMain() {}, showSetupGuide() {}, parent: { postMessage: () => runtime.handlers.index_scan({ deferComponents: true }) } });
+  vm.runInContext(html.slice(html.indexOf('    function connectWs()'), html.indexOf('    async function startLongPoll()')), ui);
+  const connect = async () => { ui.connectWs(); sockets.push(ui.ws); await until(() => ui.wsConnected); };
+  await connect();
+  const confirmed = ui.receiveIndexAck;
+  const acks = [];
+  ui.receiveIndexAck = ack => acks.push(ack);
+  await runtime.handlers.index_scan({ deferComponents: true });
+  await until(() => acks.length === 1);
+  assert.equal(acks[0].success, true);
+  assert.equal(ui.reindexBtn.disabled, true, 'local scan completion must wait for bridge ack');
+  confirmed({ ...acks[0], scanId: 'older-scan' });
+  assert.equal(ui.reindexBtn.disabled, true);
+  confirmed(acks.shift());
+  assert.equal(ui.reindexBtn.disabled, false);
+  assert.match(ui.reindexBtn.title, /Last synced/);
+  const lastSuccess = ui.reindexBtn.title;
+  ui.receiveIndexAck = ack => { acks.push(ack); confirmed(ack); };
+  const unmatched = { type: 'index-start', pageId: 'page', scanId: 'unmatched', revision: 0, scope: { id: 'page' } };
+  // The UI begins a scan but the bridge never receives its start/chunks.
+  ui.handleIndexMessage({ ...unmatched, type: 'index-progress', stage: 'starting' });
+  ui.handleIndexMessage({ ...unmatched, type: 'index-update', data: {} });
+  await until(() => acks.length === 1);
+  assert.equal(acks[0].success, false);
+  assert.equal(ui.reindexBtn.disabled, false);
+  assert.match(ui.indexProgressText.textContent, /no longer active/);
+  assert.equal(ui.reindexBtn.title, lastSuccess);
+
+  ui.handleIndexMessage({ ...unmatched, scanId: 'disconnect' });
+  ui.ws.close();
+  await until(() => !ui.wsConnected);
+  assert.equal(ui.reindexBtn.disabled, false);
+  assert.match(ui.indexProgressText.textContent, /disconnected/);
+  await connect();
+  acks.length = 0;
+  await ui.triggerManualReindex();
+  await until(() => acks.length === 1);
+  assert.equal(acks[0].success, true);
+  assert.equal(ui.reindexBtn.disabled, false);
+
+  runtime.handlers.get_styles = async () => { throw new Error('Styles unavailable'); };
+  await assert.rejects(runtime.handlers.index_scan({ deferComponents: true }), /Styles unavailable/);
+  assert.equal(ui.reindexBtn.disabled, false);
+  assert.match(ui.indexProgressText.textContent, /Styles unavailable/);
+  runtime.handlers.get_styles = async () => { runtime.figma.currentPage = { id: 'new-page', children: [] }; return {}; };
+  const cancelled = await runtime.handlers.index_scan({ deferComponents: true });
+  assert.equal(cancelled.cancelled, true);
+  assert.equal(ui.reindexBtn.disabled, false);
+  assert.match(ui.indexProgressText.textContent, /Document changed/);
+  runtime.handlers.get_styles = async () => ({});
+  acks.length = 0;
+  await runtime.handlers.index_scan({ deferComponents: true });
+  await until(() => acks.length === 1);
+  assert.equal(acks[0].pageId, 'new-page');
+  assert.equal(acks[0].success, true);
+  assert.equal(ui.reindexBtn.disabled, false);
+
+  const { benchmarkTargets } = await import('./bench-workloads.mjs');
+  page.type = 'PAGE';
+  const frame = page.children[0];
+  frame.parent = page;
+  frame.children = Array.from({ length: 600 }, (_, i) => ({ id: `bench:${i}`, type: 'TEXT',
+    name: `Child ${i}`, characters: `Text ${i}`, parent: frame, width: 10, height: 10 }));
+  let exported = 0;
+  frame.exportAsync = async () => { exported++; return new Uint8Array([1, 2, 3]); };
+  runtime.figma.currentPage = page;
+  runtime.figma.getNodeByIdAsync = async id => id === frame.id ? frame : null;
+  const operations = [];
+  ui.READ_OPS = ['read_nodes', 'index_scan', 'export_image'];
+  ui.dispatchToMain = async req => {
+    if (!req.operation) return;
+    operations.push(req.operation);
+    try {
+      const data = await runtime.handlers[req.operation](req.params);
+      ui.ws.send(JSON.stringify({ id: req.id, sessionId: ui.sessionId, success: true, data }));
+    } catch (error) {
+      ui.ws.send(JSON.stringify({ id: req.id, sessionId: ui.sessionId, success: false, error: error.message }));
+    }
+  };
+  const measurements = await benchmarkTargets(base, [{ sessionId: ui.sessionId, nodeId: frame.id }], 1);
+  const workloads = measurements.targets[0].workloads;
+  assert.equal(workloads.readFrame.samples[0].nodes, 601);
+  assert.equal(workloads.readFrame.samples[0].pages, 2);
+  assert.equal(workloads.readFrame.samples[0].complete, true);
+  assert.equal(workloads.indexFrame.samples[0].complete, true);
+  assert.equal(workloads.exportPng.samples[0].imageBytes, 3);
+  assert.equal(exported, 1);
+  assert.deepEqual(operations, ['read_nodes', 'read_nodes', 'index_scan', 'export_image']);
+
+});

package/scripts/test-plugin-tokens.mjs

@@ -1,4 +1,5 @@
 import { test } from 'node:test';
+import { indexSyncUi } from './helpers/index-sync-ui.mjs';
 import assert from 'node:assert/strict';
 import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import os from 'node:os';
@@ -53,6 +54,20 @@ test('compact tree and scan preserve mixed typography instead of using the first
   assert.equal(r.resolveTextStyle(node).fontWeight, undefined);
 });
 
+test('scan_design expands instances by default and flags opaque ones as incomplete', async () => {
+  const text = { id: '1:3', name: 'Label', type: 'TEXT', characters: 'Hi', fontSize: 12, fontName: { family: 'Inter', style: 'Regular' }, visible: true };
+  const inst = { id: '1:2', name: 'Button', type: 'INSTANCE', visible: true, children: [text], getMainComponentAsync: async () => null };
+  const frame = { id: '1:1', name: 'Frame', type: 'FRAME', visible: true, children: [inst] };
+  const r = runtime({ root: { id: '0:0' }, currentPage: { id: '0:1' }, getNodeByIdAsync: async () => frame });
+  const full = plain(await r.handlers.scan_design({ id: '1:1' }));
+  assert.equal(full.totals.textNodes, 1);
+  assert.equal(full.complete, true);
+  const opaque = plain(await r.handlers.scan_design({ id: '1:1', expandInstances: false }));
+  assert.equal(opaque.totals.textNodes, 0);
+  assert.equal(opaque.totals.opaqueInstances, 1);
+  assert.equal(opaque.complete, false);
+});
+
 test('equivalent CSS syntaxes preserve alpha in reads and writes', () => {
   const r = runtime();
   for (const color of ['rgba(255, 0, 0, .5)', 'rgb(100% 0% 0% / 50%)', 'hsl(0 100% 50% / .5)', 'hsla(0, 100%, 50%, .5)']) {
@@ -171,6 +186,76 @@ test('UI badge uses release version initially and follows the server on reconnec
   assert.ok(html.includes('type: "runtime-ready"'));
 });
 
+test('sync waits for a matching bridge confirmation and ignores final and silent progress', async () => {
+  const ui = indexSyncUi(), messages = [];
+  const page = { id: 'page', children: [] };
+  const r = runtime({ currentPage: page, root: { name: 'File' },
+    ui: { postMessage: message => { messages.push(message); ui.handleIndexMessage(message); } } });
+  r.handlers.get_styles = async () => ({});
+  r.handlers.get_variables = async () => ({});
+  for (let i = 0; i < 2; i++) {
+    await r.handlers.index_scan({ deferComponents: true });
+    assert.equal(messages.at(-1).stage, 'done');
+    assert.equal(ui.reindexBtn.disabled, true);
+    assert.match(ui.indexProgressText.textContent, /confirmation/);
+    ui.receiveIndexAck({ scanId: 'old', pageId: 'page', success: true });
+    assert.equal(ui.reindexBtn.disabled, true);
+    const update = messages.findLast(msg => msg.type === 'index-update');
+    ui.receiveIndexAck({ ...update, success: true });
+    assert.equal(ui.reindexBtn.disabled, false);
+    assert.equal(ui.reindexBtn.classList.contains('indexing'), false);
+    assert.match(ui.reindexBtn.title, /Last synced/);
+    ui.handleIndexMessage({ ...update, type: 'index-progress', stage: 'done' });
+    ui.handleIndexMessage({ ...update, type: 'index-progress', stage: 'starting', silent: true });
+    assert.equal(ui.reindexBtn.disabled, false);
+    ui.fireTimers(1200);
+    assert.equal(ui.indexProgressWrap.classList.contains('active'), false);
+  }
+});
+
+test('sync reports read failures, page cancellation, rejection, missing ack and disconnect', async () => {
+  const ui = indexSyncUi();
+  const page = { id: 'page', children: [] };
+  const r = runtime({ currentPage: page, root: { name: 'File' },
+    ui: { postMessage: message => ui.handleIndexMessage(message) } });
+  r.handlers.read_nodes = async () => { throw new Error('Cannot read layers'); };
+  await assert.rejects(r.handlers.index_scan({}), /Cannot read layers/);
+  assert.equal(ui.reindexBtn.disabled, false);
+  assert.match(ui.indexProgressText.textContent, /Cannot read layers/);
+  r.handlers.read_nodes = async () => {
+    r.figma.currentPage = { id: 'next' };
+    return { revision: 0, scope: { id: 'page' }, nodes: [] };
+  };
+  await r.handlers.index_scan({});
+  assert.equal(ui.reindexBtn.disabled, false);
+  assert.match(ui.indexProgressText.textContent, /Document changed/);
+  const start = { type: 'index-start', scanId: 'retry', pageId: 'page' };
+  ui.handleIndexMessage(start);
+  ui.receiveIndexAck({ ...start, success: false, error: 'Rejected stale revision' });
+  assert.match(ui.indexProgressText.textContent, /Rejected stale revision/);
+  ui.handleIndexMessage(start);
+  ui.handleIndexMessage({ ...start, type: 'index-update' });
+  ui.fireTimers(30000);
+  assert.equal(ui.reindexBtn.disabled, false);
+  assert.match(ui.indexProgressText.textContent, /No bridge confirmation/);
+  ui.ws.readyState = 3;
+  ui.handleIndexMessage(start);
+  assert.equal(ui.reindexBtn.disabled, false);
+  assert.match(ui.indexProgressText.textContent, /disconnected/);
+  assert.equal(ui.reindexBtn.title, 'Sync index');
+  ui.ws.readyState = 1;
+  ui.parent = { postMessage() {} };
+  ui.triggerManualReindex();
+  ui.fireTimers(30000);
+  assert.equal(ui.reindexBtn.disabled, false);
+  assert.match(ui.indexProgressText.textContent, /Canvas did not start/);
+  ui.handleIndexMessage(start);
+  ui.receiveIndexAck({ ...start, success: true });
+  ui.handleIndexMessage({ ...start, scanId: 'new' });
+  ui.fireTimers(1200);
+  assert.equal(ui.indexProgressWrap.classList.contains('active'), true);
+});
+
 test('build rejects wrong release tags and checked-in bundle matches source', () => {
   const check = spawnSync(process.execPath, ['scripts/build-plugin.js', '--check'], { encoding: 'utf8' });
   assert.equal(check.status, 0, check.stderr);
@@ -204,8 +289,8 @@ test('agent setup detects installed clients and preserves existing JSONC and TOM
       configureAgent(agent);
       const config = parseJsonc(readFileSync(agent.configPath, 'utf8')).mcpServers['figma-rust-mcp'];
       assert.ok(config);
-      if (id === 'antigravity') assert.equal(config.serverUrl, 'http://127.0.0.1:38451/sse');
-      else assert.equal(config.url, 'http://127.0.0.1:38451/mcp');
+      if (id === 'antigravity') assert.equal(config.serverUrl, 'http://127.0.0.1:41730/sse');
+      else assert.equal(config.url, 'http://127.0.0.1:41730/mcp');
     }
 
     const cursor = agents.find(agent => agent.id === 'cursor');
@@ -215,21 +300,21 @@ test('agent setup detects installed clients and preserves existing JSONC and TOM
     const cursorConfig = parseJsonc(cursorText);
     assert.match(cursorText, /keep this note/);
     assert.equal(cursorConfig.mcpServers.other.url, 'http://example.test');
-    assert.equal(cursorConfig.mcpServers['figma-rust-mcp'].url, 'http://127.0.0.1:38451/mcp');
+    assert.equal(cursorConfig.mcpServers['figma-rust-mcp'].url, 'http://127.0.0.1:41730/mcp');
     assert.equal(configureAgent(cursor), false);
 
     const zed = agents.find(agent => agent.id === 'zed');
     writeFileSync(zed.configPath, '{\n  "theme": "One Dark",\n}\n');
     configureAgent(zed);
     assert.equal(parseJsonc(readFileSync(zed.configPath, 'utf8')).theme, 'One Dark');
-    assert.equal(parseJsonc(readFileSync(zed.configPath, 'utf8')).context_servers['figma-rust-mcp'].url, 'http://127.0.0.1:38451/mcp');
+    assert.equal(parseJsonc(readFileSync(zed.configPath, 'utf8')).context_servers['figma-rust-mcp'].url, 'http://127.0.0.1:41730/mcp');
 
     const codex = agents.find(agent => agent.id === 'codex');
     writeFileSync(codex.configPath, '[mcp_servers.other]\nurl = "http://other.test"\n');
     configureAgent(codex);
     const codexText = readFileSync(codex.configPath, 'utf8');
     assert.match(codexText, /\[mcp_servers\.other\]/);
-    assert.match(codexText, /\[mcp_servers\.figma-rust-mcp\]\nurl = "http:\/\/127\.0\.0\.1:38451\/mcp"/);
+    assert.match(codexText, /\[mcp_servers\.figma-rust-mcp\]\nurl = "http:\/\/127\.0\.0\.1:41730\/mcp"/);
     assert.equal(configureAgent(codex), false);
   } finally {
     rmSync(home, { recursive: true, force: true });
@@ -525,11 +610,11 @@ test('old UI socket callbacks cannot clear or dispatch through a replacement soc
     close() {} send() {}
   }
   const r = vm.createContext({
-    ws: null, wsConnected: false, sessionId: null, fileName: 'File', documentId: 'doc', BRIDGE: 'http://localhost:38451',
+    uiDisposed: false, ws: null, wsConnected: false, sessionId: null, fileName: 'File', documentId: 'doc', BRIDGE: 'http://localhost:41730',
     WebSocket: Socket, setInterval: () => 1, clearInterval: () => {}, setTimeout: () => 1, clearTimeout: () => {},
     sendRuntimeCapabilities: () => {}, consecutiveErrors: 0, everConnected: false, retryTimer: null, polling: true,
-    setStatus: () => {}, log: () => {}, currentPort: 38451, READ_OPS: [],
-    startLongPoll: () => assert.fail('stale socket started poll'), dispatchToMain: req => dispatched.push(req),
+    setStatus: () => {}, log: () => {}, currentPort: 41730, READ_OPS: [],
+    activeIndexScan: null, startLongPoll: () => assert.fail('stale socket started poll'), dispatchToMain: req => dispatched.push(req),
   });
   vm.runInContext(source, r);
   r.connectWs(); assert.equal(sockets.length, 0);
@@ -574,3 +659,156 @@ test('tree reads preserve Regular font weight, collect Regular font tokens, and
   assert.equal(tree.textStyle, 'Lato/18px/regular');
   assert.ok(tokenCollector.fonts.has('Lato/Regular/18px'));
 });
+
+test('hot reload removes old Figma listeners and timers before installing the next runtime', async () => {
+  const events = new Map(), pageEvents = new Set(), timers = new Map(), messages = [];
+  let timerId = 0;
+  const page = { id: 'page', children: [], selection: [], on: (_, fn) => pageEvents.add(fn), off: (_, fn) => pageEvents.delete(fn) };
+  let styleName = 'Before';
+  const figma = { getLocalTextStylesAsync: async () => [{ id: 'text-style', name: styleName }], currentPage: page, root: { name: 'File', getPluginData: () => 'document' },
+    clientStorage: { getAsync: async () => null }, ui: { postMessage: msg => messages.push(msg) },
+    on: (event, fn) => { if (!events.has(event)) events.set(event, new Set()); events.get(event).add(fn); },
+    off: (event, fn) => events.get(event)?.delete(fn) };
+  const main = readFileSync('plugin-src/main.js', 'utf8');
+  const runtimes = [];
+  for (let i = 0; i < 3; i++) {
+    const r = runtime(figma);
+    r.setTimeout = (fn, delay) => { timers.set(++timerId, { fn, delay }); return timerId; };
+    r.clearTimeout = id => timers.delete(id);
+    r.__html__ = '';
+    vm.runInContext(main, r);
+    runtimes.push(r);
+    for (const listeners of events.values()) assert.equal(listeners.size, 1);
+    assert.equal(pageEvents.size, 1);
+    assert.equal(timers.size, 1, 'only the current startup timer survives');
+  }
+  assert.equal(runtimes[0].runtimeDisposed, true);
+  messages.length = 0;
+  for (const fn of events.get('selectionchange')) fn();
+  assert.equal(messages.filter(msg => msg.type === 'selection-change').length, 1);
+  const live = runtimes.at(-1);
+  assert.equal((await live.getStyleNameMapAsync())['text-style'], 'Before');
+  styleName = 'After';
+  for (const fn of events.get('stylechange')) fn({});
+  assert.equal((await live.getStyleNameMapAsync())['text-style'], 'After');
+  let releaseStyles;
+  live.handlers.get_styles = () => new Promise(resolve => { releaseStyles = resolve; });
+  live.handlers.get_variables = async () => ({});
+  const scan = live.handlers.index_scan({ deferComponents: true });
+  while (!releaseStyles) await new Promise(resolve => setTimeout(resolve, 0));
+  figma.ui.onmessage.dispose();
+  messages.length = 0;
+  releaseStyles({});
+  assert.equal((await scan).cancelled, true);
+  assert.ok(!messages.some(msg => msg.type === 'index-update'));
+  assert.equal(timers.size, 0);
+  assert.equal(pageEvents.size, 0);
+  for (const listeners of events.values()) assert.equal(listeners.size, 0);
+});
+
+test('style names share in-flight reads and refresh after invalidation or a failed getter', async () => {
+  const calls = {};
+  let name = 'Before', failPaint = false;
+  const figma = Object.fromEntries(['Paint', 'Text', 'Effect', 'Grid'].map(kind => [`getLocal${kind}StylesAsync`, async () => {
+    calls[kind] = (calls[kind] || 0) + 1;
+    if (kind === 'Paint' && failPaint) throw new Error('temporary failure');
+    return [{ id: kind, name }];
+  }]));
+  const r = runtime(figma);
+  const [first, second] = await Promise.all([r.makeWalkStateAsync({}), r.makeWalkStateAsync({})]);
+  assert.equal(first.styleMap.Text, 'Before');
+  assert.equal(second.styleMap.Paint, 'Before');
+  assert.deepEqual(Object.values(calls), [1, 1, 1, 1]);
+  name = 'After'; r.invalidateStyleNameMap();
+  assert.equal((await r.makeWalkStateAsync({})).styleMap.Text, 'After');
+  assert.deepEqual(Object.values(calls), [2, 2, 2, 2]);
+  failPaint = true; r.invalidateStyleNameMap();
+  assert.equal((await r.makeWalkStateAsync({})).styleMap.Paint, undefined);
+  failPaint = false;
+  assert.equal((await r.makeWalkStateAsync({})).styleMap.Paint, 'After');
+  assert.equal(calls.Paint, 4);
+  let release;
+  r.figma.getLocalPaintStylesAsync = () => new Promise(resolve => { release = resolve; });
+  r.invalidateStyleNameMap();
+  const old = r.getStyleNameMapAsync();
+  r.invalidateStyleNameMap();
+  r.figma.getLocalPaintStylesAsync = async () => [{ id: 'Paint', name: 'Newest' }];
+  assert.equal((await r.getStyleNameMapAsync()).Paint, 'Newest');
+  release([{ id: 'Paint', name: 'Obsolete' }]);
+  await old;
+  assert.equal((await r.getStyleNameMapAsync()).Paint, 'Newest');
+});
+
+for (const lineEnding of ['\n', '\r\n']) test(`UI reload clears previous timers, listeners and socket while keeping inline controls available (${lineEnding === '\n' ? 'LF' : 'CRLF'})`, () => {
+  const html = readFileSync('plugin-runtime/ui.html', 'utf8');
+  const source = html.match(/<script>([\s\S]*?)<\/script>/)[1].replace(/\r?\n/g, lineEnding);
+  const timers = new Set();
+  let timerId = 0, socketCloses = 0, cancelledRaf = 0;
+  const elements = new Map();
+  const target = () => {
+    const listeners = new Map();
+    return {
+      listeners, style: {}, dataset: {}, classList: { add() {}, remove() {}, contains: () => false, toggle() {} },
+      addEventListener(name, fn, options) {
+        if (options?.signal?.aborted) return;
+        if (!listeners.has(name)) listeners.set(name, new Set());
+        listeners.get(name).add(fn);
+        options?.signal?.addEventListener('abort', () => listeners.get(name).delete(fn), { once: true });
+      },
+      removeEventListener(name, fn) { listeners.get(name)?.delete(fn); },
+      setPointerCapture() {}, releasePointerCapture() {},
+      setAttribute() {}, querySelectorAll: () => [], querySelector: () => null,
+    };
+  };
+  const window = { ...target(), innerWidth: 360, innerHeight: 600,
+    setTimeout() { timers.add(++timerId); return timerId; }, clearTimeout: id => timers.delete(id),
+    setInterval() { timers.add(++timerId); return timerId; }, clearInterval: id => timers.delete(id),
+  };
+  const document = { ...target(), getElementById: id => {
+    if (!elements.has(id)) elements.set(id, target());
+    return elements.get(id);
+  }, querySelectorAll: () => [] };
+  class Socket {
+    static OPEN = 1;
+    constructor() { this.readyState = 1; }
+    close() { socketCloses++; }
+    send() {}
+  }
+  const r = vm.createContext({ window, document, WebSocket: Socket, AbortController, AbortSignal,
+    console, navigator: {}, fetch: () => new Promise(() => {}), parent: { postMessage() {} },
+    requestAnimationFrame: () => 42, cancelAnimationFrame: () => cancelledRaf++ });
+  for (let i = 0; i < 3; i++) {
+    const entryPoint = /^( {4})initConnection\(\);(?=\r?$)/m;
+    assert.match(source, entryPoint, 'startup entry point must be replaced by the socket fixture');
+    vm.runInContext(source.replace(entryPoint, "$1sessionId = 's'; connectWs();"), r);
+    assert.equal(timers.size, 1, 'only current stats interval remains');
+    assert.equal(window.listeners.get('focus').size, 1);
+    assert.equal(document.listeners.get('keydown').size, 1);
+    assert.equal(document.listeners.get('visibilitychange').size, 1);
+    for (const name of [...html.matchAll(/onclick="([A-Za-z][A-Za-z0-9_]*)\(/g)].map(match => match[1]).filter(name => name !== 'document')) {
+      assert.equal(typeof window[name], 'function', `${name} must remain available to inline controls`);
+    }
+  }
+  // Cleanup also covers a resize in progress.
+  const grip = elements.get('resize-grip');
+  for (const fn of grip.listeners.get('pointerdown')) fn({ preventDefault() {}, pointerId: 1, clientX: 0, clientY: 0 });
+  for (const fn of window.listeners.get('pointermove')) fn({ clientX: 10, clientY: 10 });
+  window.__disposeFigmaMcpUi();
+  assert.equal(timers.size, 0);
+  assert.equal(cancelledRaf, 1);
+  for (const listeners of window.listeners.values()) assert.equal(listeners.size, 0);
+  for (const listeners of document.listeners.values()) assert.equal(listeners.size, 0);
+  window.__disposeFigmaMcpUi();
+  assert.equal(cancelledRaf, 1, 'cleanup is idempotent');
+  assert.equal(socketCloses, 3);
+});
+
+
+test('creating a paint style invalidates the style names before the next design read', async () => {
+  const styles = [];
+  const r = runtime({ getLocalPaintStylesAsync: async () => styles,
+    createPaintStyle: () => { const style = { id: 'new-style' }; styles.push(style); return style; } });
+  assert.equal((await r.getStyleNameMapAsync())['new-style'], undefined);
+  await r.handlers.createPaintStyle({ name: 'Brand/New', color: '#ff0000' });
+  assert.equal((await r.getStyleNameMapAsync())['new-style'], 'Brand/New');
+});