metro-mcp 0.6.2 → 0.6.4

package/dist/bin/metro-mcp.js

@@ -3317,6 +3317,7 @@ function mergeConfig(target, source) {
 // src/server.ts
 import { exec } from "child_process";
 import { promisify } from "util";
+import fs4 from "fs";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { z as z23 } from "zod";
@@ -3740,7 +3741,7 @@ function extractCDPExceptionMessage(details, fallback = "Evaluation failed") {
 // package.json
 var package_default = {
   name: "metro-mcp",
-  version: "0.6.2",
+  version: "0.6.4",
   description: "Plugin-based MCP server for React Native/Expo runtime debugging, inspection, and automation via Metro/CDP",
   homepage: "https://metromcp.dev",
   repository: {
@@ -3941,45 +3942,103 @@ class DeviceBufferManager {
 }
 
 // src/plugins/console.ts
+function formatPreview(preview) {
+  if (!preview.properties)
+    return null;
+  const props = preview.properties.map((p) => {
+    if (p.type === "object" && p.valuePreview) {
+      const nested = formatPreview(p.valuePreview);
+      return `${p.name}: ${nested || p.value || "[object]"}`;
+    }
+    return `${p.name}: ${p.value}`;
+  });
+  const overflow = preview.overflow ? ", ..." : "";
+  if (preview.subtype === "array")
+    return `[${props.join(", ")}${overflow}]`;
+  return `{${props.join(", ")}${overflow}}`;
+}
+function formatRemoteObject(obj) {
+  if (obj.type === "string")
+    return obj.value;
+  if (obj.type === "number")
+    return String(obj.value);
+  if (obj.type === "boolean")
+    return String(obj.value);
+  if (obj.type === "undefined")
+    return "undefined";
+  if (obj.subtype === "null")
+    return "null";
+  if (obj.preview) {
+    const formatted = formatPreview(obj.preview);
+    if (formatted)
+      return formatted;
+  }
+  if (obj.description)
+    return obj.description;
+  if (obj.value !== undefined)
+    return JSON.stringify(obj.value);
+  return obj.className || obj.type || "[object]";
+}
 function formatCDPArgs(args) {
   return args.map((arg) => {
     if (typeof arg === "object" && arg !== null) {
-      const remoteObj = arg;
-      if (remoteObj.type === "string")
-        return remoteObj.value;
-      if (remoteObj.type === "number")
-        return String(remoteObj.value);
-      if (remoteObj.type === "boolean")
-        return String(remoteObj.value);
-      if (remoteObj.type === "undefined")
-        return "undefined";
-      if (remoteObj.subtype === "null")
-        return "null";
-      if (remoteObj.description)
-        return remoteObj.description;
-      if (remoteObj.value !== undefined)
-        return JSON.stringify(remoteObj.value);
-      return remoteObj.className || remoteObj.type || "[object]";
+      return formatRemoteObject(arg);
     }
     return String(arg);
   }).join(" ");
 }
+async function resolveRemoteObject(cdpSend, objectId) {
+  try {
+    const result = await cdpSend("Runtime.callFunctionOn", {
+      objectId,
+      functionDeclaration: 'function() { try { return JSON.stringify(this, null, 2); } catch(e) { return "[unserializable]"; } }',
+      returnByValue: true
+    });
+    const inner = result.result;
+    return inner?.value ? inner.value : null;
+  } catch {
+    return null;
+  }
+}
+async function formatCDPArgsDeep(cdpSend, args) {
+  const parts = await Promise.all(args.map(async (arg) => {
+    if (typeof arg !== "object" || arg === null)
+      return String(arg);
+    const remoteObj = arg;
+    if (remoteObj.objectId && remoteObj.type === "object") {
+      const deep = await resolveRemoteObject(cdpSend, remoteObj.objectId);
+      if (deep)
+        return deep;
+    }
+    return formatRemoteObject(remoteObj);
+  }));
+  return parts.join(" ");
+}
 var consolePlugin = definePlugin({
   name: "console",
   description: "Console log collection and filtering",
   async setup(ctx) {
     const buffers = new DeviceBufferManager(500);
+    const cdpSend = ctx.cdp.send.bind(ctx.cdp);
     ctx.cdp.on("Runtime.consoleAPICalled", (params) => {
       const key = ctx.getActiveDeviceKey();
       if (!key)
         return;
       const args = params.args || [];
-      buffers.getOrCreate(key).push({
+      const entry = {
         timestamp: Date.now(),
         level: params.type,
         message: formatCDPArgs(args),
         stackTrace: params.stackTrace ? JSON.stringify(params.stackTrace.callFrames) : undefined
-      });
+      };
+      buffers.getOrCreate(key).push(entry);
+      const hasResolvable = args.some((arg) => typeof arg === "object" && arg !== null && arg.objectId);
+      if (hasResolvable) {
+        formatCDPArgsDeep(cdpSend, args).then((deep) => {
+          if (deep !== entry.message)
+            entry.message = deep;
+        }).catch(() => {});
+      }
     });
     ctx.events.on("bundle_transform_progressed", (event) => {
       if (event.transformedFileCount === 1) {
@@ -8591,9 +8650,10 @@ var inspectPointPlugin = definePlugin({
 });
 
 // src/plugins/devtools.ts
-import { spawn as spawn2 } from "child_process";
+import fs3 from "fs";
 import { z as z22 } from "zod";
 var logger6 = createLogger("devtools");
+var DEVTOOLS_STATE_FILE = "/tmp/metro-mcp-devtools.json";
 async function findBrowserPath() {
   try {
     const { Launcher: Launcher2 } = await Promise.resolve().then(() => (init_dist(), exports_dist));
@@ -8609,6 +8669,43 @@ async function findBrowserPath() {
   } catch {}
   return null;
 }
+async function tryFocusExisting(frontendUrl) {
+  try {
+    const state = JSON.parse(fs3.readFileSync(DEVTOOLS_STATE_FILE, "utf8"));
+    if (!state.pid || !state.remoteDebuggingPort)
+      return false;
+    try {
+      process.kill(state.pid, 0);
+    } catch {
+      return false;
+    }
+    const resp = await fetch(`http://localhost:${state.remoteDebuggingPort}/json`, {
+      signal: AbortSignal.timeout(1000)
+    });
+    if (!resp.ok)
+      return false;
+    const targets = await resp.json();
+    const target = targets.find((t) => t.url?.includes("rn_fusebox") || t.url === frontendUrl);
+    if (!target?.id)
+      return false;
+    const activate = await fetch(`http://localhost:${state.remoteDebuggingPort}/json/activate/${target.id}`, { signal: AbortSignal.timeout(1000) });
+    return activate.ok;
+  } catch {
+    return false;
+  }
+}
+async function launchDevTools(frontendUrl) {
+  const { launch: launch2 } = await Promise.resolve().then(() => (init_dist(), exports_dist));
+  const chrome2 = await launch2({
+    chromeFlags: [`--app=${frontendUrl}`, "--window-size=1200,600"]
+  });
+  chrome2.process.unref();
+  try {
+    fs3.writeFileSync(DEVTOOLS_STATE_FILE, JSON.stringify({ pid: chrome2.pid, remoteDebuggingPort: chrome2.port }));
+  } catch (err) {
+    logger6.warn("Failed to write devtools state:", err);
+  }
+}
 var devtoolsPlugin = definePlugin({
   name: "devtools",
   description: "Open React Native DevTools via the CDP proxy",
@@ -8630,11 +8727,13 @@ var devtoolsPlugin = definePlugin({
           const browserPath = await findBrowserPath();
           if (browserPath) {
             try {
-              const child = spawn2(browserPath, [`--app=${frontendUrl}`, "--window-size=1200,600"], { detached: true, stdio: "ignore" });
-              child.unref();
+              const focused = await tryFocusExisting(frontendUrl);
+              if (!focused) {
+                await launchDevTools(frontendUrl);
+              }
               return { opened: true, url: frontendUrl };
             } catch (err) {
-              logger6.debug("Failed to launch browser:", err);
+              logger6.debug("Failed to open DevTools:", err);
             }
           } else {
             logger6.debug("No Chrome/Edge installation found");
@@ -8686,20 +8785,34 @@ class CDPProxy {
     return this._port;
   }
   async start(port = 0) {
-    return new Promise((resolve, reject) => {
-      this.httpServer = http.createServer((req, res) => {
-        this.handleHttpRequest(req, res);
+    const tryPort = (p) => new Promise((resolve, reject) => {
+      const httpServer = http.createServer((req, res) => this.handleHttpRequest(req, res));
+      httpServer.on("error", (err) => {
+        httpServer.close();
+        reject(err);
       });
-      this.wss = new WebSocketServer({ server: this.httpServer });
-      this.wss.on("connection", (ws) => this.handleNewClient(ws));
-      this.httpServer.on("error", reject);
-      this.httpServer.listen(port, () => {
-        const addr = this.httpServer.address();
-        this._port = typeof addr === "object" && addr ? addr.port : port;
-        logger7.info(`CDP proxy listening on port ${this._port}`);
-        resolve(this._port);
+      httpServer.listen(p, () => {
+        const addr = httpServer.address();
+        const actualPort = typeof addr === "object" && addr ? addr.port : p;
+        const wss = new WebSocketServer({ server: httpServer });
+        wss.on("connection", (ws) => this.handleNewClient(ws));
+        this.httpServer = httpServer;
+        this.wss = wss;
+        this._port = actualPort;
+        logger7.info(`CDP proxy listening on port ${actualPort}`);
+        resolve(actualPort);
       });
     });
+    if (port !== 0) {
+      try {
+        return await tryPort(port);
+      } catch (err) {
+        if (err.code !== "EADDRINUSE")
+          throw err;
+        logger7.debug(`Preferred proxy port ${port} in use, falling back to auto-assign`);
+      }
+    }
+    return tryPort(0);
   }
   async stop() {
     for (const client of this.clients.values()) {
@@ -9110,6 +9223,61 @@ async function startServer(config) {
       logger8.error(`Failed to initialize plugin ${plugin.name}:`, err);
     }
   }
+  const PROXY_LOCK_FILE = "/tmp/metro-mcp-proxy.json";
+  let isPrimaryInstance = false;
+  async function tryConnectViaProxy() {
+    try {
+      const lockData = JSON.parse(fs4.readFileSync(PROXY_LOCK_FILE, "utf8"));
+      if (lockData.pid && lockData.port) {
+        try {
+          process.kill(lockData.pid, 0);
+        } catch {
+          return false;
+        }
+        const resp = await fetch(`http://127.0.0.1:${lockData.port}/json`, {
+          signal: AbortSignal.timeout(2000)
+        });
+        if (!resp.ok)
+          return false;
+        const targets = await resp.json();
+        if (targets.length > 0 && targets[0].webSocketDebuggerUrl) {
+          logger8.info(`Found existing metro-mcp proxy (PID ${lockData.pid}, port ${lockData.port}) — connecting as secondary`);
+          await cdpClient.connect(targets[0]);
+          if (lockData.metroPort) {
+            eventsClient.connect(config.metro.host, lockData.metroPort);
+            config.metro.port = lockData.metroPort;
+          }
+          config.proxy = {
+            ...config.proxy,
+            port: lockData.port
+          };
+          activeDeviceKey = targets[0].id ? `${lockData.port}-${targets[0].id}` : null;
+          activeDeviceName = targets[0].title || targets[0].id || "secondary";
+          return true;
+        }
+      }
+    } catch {}
+    return false;
+  }
+  function writeProxyLock(proxyPort, metroPort) {
+    try {
+      fs4.writeFileSync(PROXY_LOCK_FILE, JSON.stringify({ pid: process.pid, port: proxyPort, metroPort }));
+      isPrimaryInstance = true;
+      logger8.info(`Wrote proxy lock (port ${proxyPort})`);
+    } catch (err) {
+      logger8.warn("Failed to write proxy lock:", err);
+    }
+  }
+  function cleanProxyLock() {
+    if (!isPrimaryInstance)
+      return;
+    try {
+      const lockData = JSON.parse(fs4.readFileSync(PROXY_LOCK_FILE, "utf8"));
+      if (lockData.pid === process.pid) {
+        fs4.unlinkSync(PROXY_LOCK_FILE);
+      }
+    } catch {}
+  }
   async function connectToMetro() {
     if (isReconnecting) {
       await waitForReconnect();
@@ -9117,6 +9285,9 @@ async function startServer(config) {
     }
     isReconnecting = true;
     try {
+      if (await tryConnectViaProxy()) {
+        return true;
+      }
       let servers;
       if (config.metro.autoDiscover) {
         servers = await scanMetroPorts(config.metro.host);
@@ -9139,6 +9310,10 @@ async function startServer(config) {
       eventsClient.connect(server.host, server.port);
       activeDeviceKey = `${server.port}-${target.id}`;
       activeDeviceName = target.title || target.deviceName || target.id;
+      const proxyPort = config.proxy;
+      if (proxyPort?.port) {
+        writeProxyLock(proxyPort.port, server.port);
+      }
       return true;
     } catch (err) {
       logger8.warn("Could not connect to Metro:", err);
@@ -9171,7 +9346,15 @@ async function startServer(config) {
   if (config.proxy?.enabled !== false) {
     cdpProxy = new CDPProxy(cdpClient);
     try {
-      const proxyPort = await cdpProxy.start(config.proxy?.port ?? 0);
+      let preferredProxyPort = config.proxy?.port ?? 0;
+      if (preferredProxyPort === 0) {
+        try {
+          const stale = JSON.parse(fs4.readFileSync(PROXY_LOCK_FILE, "utf8"));
+          if (stale.port)
+            preferredProxyPort = stale.port;
+        } catch {}
+      }
+      const proxyPort = await cdpProxy.start(preferredProxyPort);
       const devtoolsUrl = cdpProxy.getDevToolsUrl();
       logger8.info(`CDP proxy started on port ${proxyPort}`);
       if (devtoolsUrl) {
@@ -9190,13 +9373,18 @@ async function startServer(config) {
   await mcpServer.connect(transport);
   logger8.info("MCP server started");
   process.on("SIGINT", () => {
+    cleanProxyLock();
     cdpProxy?.stop();
     process.exit(0);
   });
   process.on("SIGTERM", () => {
+    cleanProxyLock();
     cdpProxy?.stop();
     process.exit(0);
   });
+  process.on("exit", () => {
+    cleanProxyLock();
+  });
   connectToMetro();
 }
 

package/dist/index.js

@@ -3325,6 +3325,7 @@ function mergeConfig(target, source) {
 // src/server.ts
 import { exec } from "child_process";
 import { promisify } from "util";
+import fs4 from "fs";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { z as z23 } from "zod";
@@ -3748,7 +3749,7 @@ function extractCDPExceptionMessage(details, fallback = "Evaluation failed") {
 // package.json
 var package_default = {
   name: "metro-mcp",
-  version: "0.6.2",
+  version: "0.6.4",
   description: "Plugin-based MCP server for React Native/Expo runtime debugging, inspection, and automation via Metro/CDP",
   homepage: "https://metromcp.dev",
   repository: {
@@ -3944,45 +3945,103 @@ class DeviceBufferManager {
 }
 
 // src/plugins/console.ts
+function formatPreview(preview) {
+  if (!preview.properties)
+    return null;
+  const props = preview.properties.map((p) => {
+    if (p.type === "object" && p.valuePreview) {
+      const nested = formatPreview(p.valuePreview);
+      return `${p.name}: ${nested || p.value || "[object]"}`;
+    }
+    return `${p.name}: ${p.value}`;
+  });
+  const overflow = preview.overflow ? ", ..." : "";
+  if (preview.subtype === "array")
+    return `[${props.join(", ")}${overflow}]`;
+  return `{${props.join(", ")}${overflow}}`;
+}
+function formatRemoteObject(obj) {
+  if (obj.type === "string")
+    return obj.value;
+  if (obj.type === "number")
+    return String(obj.value);
+  if (obj.type === "boolean")
+    return String(obj.value);
+  if (obj.type === "undefined")
+    return "undefined";
+  if (obj.subtype === "null")
+    return "null";
+  if (obj.preview) {
+    const formatted = formatPreview(obj.preview);
+    if (formatted)
+      return formatted;
+  }
+  if (obj.description)
+    return obj.description;
+  if (obj.value !== undefined)
+    return JSON.stringify(obj.value);
+  return obj.className || obj.type || "[object]";
+}
 function formatCDPArgs(args) {
   return args.map((arg) => {
     if (typeof arg === "object" && arg !== null) {
-      const remoteObj = arg;
-      if (remoteObj.type === "string")
-        return remoteObj.value;
-      if (remoteObj.type === "number")
-        return String(remoteObj.value);
-      if (remoteObj.type === "boolean")
-        return String(remoteObj.value);
-      if (remoteObj.type === "undefined")
-        return "undefined";
-      if (remoteObj.subtype === "null")
-        return "null";
-      if (remoteObj.description)
-        return remoteObj.description;
-      if (remoteObj.value !== undefined)
-        return JSON.stringify(remoteObj.value);
-      return remoteObj.className || remoteObj.type || "[object]";
+      return formatRemoteObject(arg);
     }
     return String(arg);
   }).join(" ");
 }
+async function resolveRemoteObject(cdpSend, objectId) {
+  try {
+    const result = await cdpSend("Runtime.callFunctionOn", {
+      objectId,
+      functionDeclaration: 'function() { try { return JSON.stringify(this, null, 2); } catch(e) { return "[unserializable]"; } }',
+      returnByValue: true
+    });
+    const inner = result.result;
+    return inner?.value ? inner.value : null;
+  } catch {
+    return null;
+  }
+}
+async function formatCDPArgsDeep(cdpSend, args) {
+  const parts = await Promise.all(args.map(async (arg) => {
+    if (typeof arg !== "object" || arg === null)
+      return String(arg);
+    const remoteObj = arg;
+    if (remoteObj.objectId && remoteObj.type === "object") {
+      const deep = await resolveRemoteObject(cdpSend, remoteObj.objectId);
+      if (deep)
+        return deep;
+    }
+    return formatRemoteObject(remoteObj);
+  }));
+  return parts.join(" ");
+}
 var consolePlugin = definePlugin({
   name: "console",
   description: "Console log collection and filtering",
   async setup(ctx) {
     const buffers = new DeviceBufferManager(500);
+    const cdpSend = ctx.cdp.send.bind(ctx.cdp);
     ctx.cdp.on("Runtime.consoleAPICalled", (params) => {
       const key = ctx.getActiveDeviceKey();
       if (!key)
         return;
       const args = params.args || [];
-      buffers.getOrCreate(key).push({
+      const entry = {
         timestamp: Date.now(),
         level: params.type,
         message: formatCDPArgs(args),
         stackTrace: params.stackTrace ? JSON.stringify(params.stackTrace.callFrames) : undefined
-      });
+      };
+      buffers.getOrCreate(key).push(entry);
+      const hasResolvable = args.some((arg) => typeof arg === "object" && arg !== null && arg.objectId);
+      if (hasResolvable) {
+        formatCDPArgsDeep(cdpSend, args).then((deep) => {
+          if (deep !== entry.message)
+            entry.message = deep;
+        }).catch(() => {});
+      }
     });
     ctx.events.on("bundle_transform_progressed", (event) => {
       if (event.transformedFileCount === 1) {
@@ -8594,9 +8653,10 @@ var inspectPointPlugin = definePlugin({
 });
 
 // src/plugins/devtools.ts
-import { spawn as spawn2 } from "child_process";
+import fs3 from "fs";
 import { z as z22 } from "zod";
 var logger6 = createLogger("devtools");
+var DEVTOOLS_STATE_FILE = "/tmp/metro-mcp-devtools.json";
 async function findBrowserPath() {
   try {
     const { Launcher: Launcher2 } = await Promise.resolve().then(() => (init_dist(), exports_dist));
@@ -8612,6 +8672,43 @@ async function findBrowserPath() {
   } catch {}
   return null;
 }
+async function tryFocusExisting(frontendUrl) {
+  try {
+    const state = JSON.parse(fs3.readFileSync(DEVTOOLS_STATE_FILE, "utf8"));
+    if (!state.pid || !state.remoteDebuggingPort)
+      return false;
+    try {
+      process.kill(state.pid, 0);
+    } catch {
+      return false;
+    }
+    const resp = await fetch(`http://localhost:${state.remoteDebuggingPort}/json`, {
+      signal: AbortSignal.timeout(1000)
+    });
+    if (!resp.ok)
+      return false;
+    const targets = await resp.json();
+    const target = targets.find((t) => t.url?.includes("rn_fusebox") || t.url === frontendUrl);
+    if (!target?.id)
+      return false;
+    const activate = await fetch(`http://localhost:${state.remoteDebuggingPort}/json/activate/${target.id}`, { signal: AbortSignal.timeout(1000) });
+    return activate.ok;
+  } catch {
+    return false;
+  }
+}
+async function launchDevTools(frontendUrl) {
+  const { launch: launch2 } = await Promise.resolve().then(() => (init_dist(), exports_dist));
+  const chrome2 = await launch2({
+    chromeFlags: [`--app=${frontendUrl}`, "--window-size=1200,600"]
+  });
+  chrome2.process.unref();
+  try {
+    fs3.writeFileSync(DEVTOOLS_STATE_FILE, JSON.stringify({ pid: chrome2.pid, remoteDebuggingPort: chrome2.port }));
+  } catch (err) {
+    logger6.warn("Failed to write devtools state:", err);
+  }
+}
 var devtoolsPlugin = definePlugin({
   name: "devtools",
   description: "Open React Native DevTools via the CDP proxy",
@@ -8633,11 +8730,13 @@ var devtoolsPlugin = definePlugin({
           const browserPath = await findBrowserPath();
           if (browserPath) {
             try {
-              const child = spawn2(browserPath, [`--app=${frontendUrl}`, "--window-size=1200,600"], { detached: true, stdio: "ignore" });
-              child.unref();
+              const focused = await tryFocusExisting(frontendUrl);
+              if (!focused) {
+                await launchDevTools(frontendUrl);
+              }
               return { opened: true, url: frontendUrl };
             } catch (err) {
-              logger6.debug("Failed to launch browser:", err);
+              logger6.debug("Failed to open DevTools:", err);
             }
           } else {
             logger6.debug("No Chrome/Edge installation found");
@@ -8689,20 +8788,34 @@ class CDPProxy {
     return this._port;
   }
   async start(port = 0) {
-    return new Promise((resolve, reject) => {
-      this.httpServer = http.createServer((req, res) => {
-        this.handleHttpRequest(req, res);
+    const tryPort = (p) => new Promise((resolve, reject) => {
+      const httpServer = http.createServer((req, res) => this.handleHttpRequest(req, res));
+      httpServer.on("error", (err) => {
+        httpServer.close();
+        reject(err);
       });
-      this.wss = new WebSocketServer({ server: this.httpServer });
-      this.wss.on("connection", (ws) => this.handleNewClient(ws));
-      this.httpServer.on("error", reject);
-      this.httpServer.listen(port, () => {
-        const addr = this.httpServer.address();
-        this._port = typeof addr === "object" && addr ? addr.port : port;
-        logger7.info(`CDP proxy listening on port ${this._port}`);
-        resolve(this._port);
+      httpServer.listen(p, () => {
+        const addr = httpServer.address();
+        const actualPort = typeof addr === "object" && addr ? addr.port : p;
+        const wss = new WebSocketServer({ server: httpServer });
+        wss.on("connection", (ws) => this.handleNewClient(ws));
+        this.httpServer = httpServer;
+        this.wss = wss;
+        this._port = actualPort;
+        logger7.info(`CDP proxy listening on port ${actualPort}`);
+        resolve(actualPort);
       });
     });
+    if (port !== 0) {
+      try {
+        return await tryPort(port);
+      } catch (err) {
+        if (err.code !== "EADDRINUSE")
+          throw err;
+        logger7.debug(`Preferred proxy port ${port} in use, falling back to auto-assign`);
+      }
+    }
+    return tryPort(0);
   }
   async stop() {
     for (const client of this.clients.values()) {
@@ -9113,6 +9226,61 @@ async function startServer(config) {
       logger8.error(`Failed to initialize plugin ${plugin.name}:`, err);
     }
   }
+  const PROXY_LOCK_FILE = "/tmp/metro-mcp-proxy.json";
+  let isPrimaryInstance = false;
+  async function tryConnectViaProxy() {
+    try {
+      const lockData = JSON.parse(fs4.readFileSync(PROXY_LOCK_FILE, "utf8"));
+      if (lockData.pid && lockData.port) {
+        try {
+          process.kill(lockData.pid, 0);
+        } catch {
+          return false;
+        }
+        const resp = await fetch(`http://127.0.0.1:${lockData.port}/json`, {
+          signal: AbortSignal.timeout(2000)
+        });
+        if (!resp.ok)
+          return false;
+        const targets = await resp.json();
+        if (targets.length > 0 && targets[0].webSocketDebuggerUrl) {
+          logger8.info(`Found existing metro-mcp proxy (PID ${lockData.pid}, port ${lockData.port}) — connecting as secondary`);
+          await cdpClient.connect(targets[0]);
+          if (lockData.metroPort) {
+            eventsClient.connect(config.metro.host, lockData.metroPort);
+            config.metro.port = lockData.metroPort;
+          }
+          config.proxy = {
+            ...config.proxy,
+            port: lockData.port
+          };
+          activeDeviceKey = targets[0].id ? `${lockData.port}-${targets[0].id}` : null;
+          activeDeviceName = targets[0].title || targets[0].id || "secondary";
+          return true;
+        }
+      }
+    } catch {}
+    return false;
+  }
+  function writeProxyLock(proxyPort, metroPort) {
+    try {
+      fs4.writeFileSync(PROXY_LOCK_FILE, JSON.stringify({ pid: process.pid, port: proxyPort, metroPort }));
+      isPrimaryInstance = true;
+      logger8.info(`Wrote proxy lock (port ${proxyPort})`);
+    } catch (err) {
+      logger8.warn("Failed to write proxy lock:", err);
+    }
+  }
+  function cleanProxyLock() {
+    if (!isPrimaryInstance)
+      return;
+    try {
+      const lockData = JSON.parse(fs4.readFileSync(PROXY_LOCK_FILE, "utf8"));
+      if (lockData.pid === process.pid) {
+        fs4.unlinkSync(PROXY_LOCK_FILE);
+      }
+    } catch {}
+  }
   async function connectToMetro() {
     if (isReconnecting) {
       await waitForReconnect();
@@ -9120,6 +9288,9 @@ async function startServer(config) {
     }
     isReconnecting = true;
     try {
+      if (await tryConnectViaProxy()) {
+        return true;
+      }
       let servers;
       if (config.metro.autoDiscover) {
         servers = await scanMetroPorts(config.metro.host);
@@ -9142,6 +9313,10 @@ async function startServer(config) {
       eventsClient.connect(server.host, server.port);
       activeDeviceKey = `${server.port}-${target.id}`;
       activeDeviceName = target.title || target.deviceName || target.id;
+      const proxyPort = config.proxy;
+      if (proxyPort?.port) {
+        writeProxyLock(proxyPort.port, server.port);
+      }
       return true;
     } catch (err) {
       logger8.warn("Could not connect to Metro:", err);
@@ -9174,7 +9349,15 @@ async function startServer(config) {
   if (config.proxy?.enabled !== false) {
     cdpProxy = new CDPProxy(cdpClient);
     try {
-      const proxyPort = await cdpProxy.start(config.proxy?.port ?? 0);
+      let preferredProxyPort = config.proxy?.port ?? 0;
+      if (preferredProxyPort === 0) {
+        try {
+          const stale = JSON.parse(fs4.readFileSync(PROXY_LOCK_FILE, "utf8"));
+          if (stale.port)
+            preferredProxyPort = stale.port;
+        } catch {}
+      }
+      const proxyPort = await cdpProxy.start(preferredProxyPort);
       const devtoolsUrl = cdpProxy.getDevToolsUrl();
       logger8.info(`CDP proxy started on port ${proxyPort}`);
       if (devtoolsUrl) {
@@ -9193,13 +9376,18 @@ async function startServer(config) {
   await mcpServer.connect(transport);
   logger8.info("MCP server started");
   process.on("SIGINT", () => {
+    cleanProxyLock();
     cdpProxy?.stop();
     process.exit(0);
   });
   process.on("SIGTERM", () => {
+    cleanProxyLock();
     cdpProxy?.stop();
     process.exit(0);
   });
+  process.on("exit", () => {
+    cleanProxyLock();
+  });
   connectToMetro();
 }
 

package/dist/metro/proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/metro/proxy.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAyBjD;;;;;;;;;;;GAWG;AACH,qBAAa,QAAQ;IAUP,OAAO,CAAC,QAAQ,CAAC,SAAS;IATtC,OAAO,CAAC,UAAU,CAA4B;IAC9C,OAAO,CAAC,GAAG,CAAgC;IAC3C,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,eAAe,CAA0C;IACjE,OAAO,CAAC,eAAe,CAA6B;IACpD,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,KAAK,CAAuB;gBAEP,SAAS,EAAE,SAAS;IAsBjD,IAAI,IAAI,IAAI,MAAM,GAAG,IAAI,CAExB;IAED;;OAEG;IACG,KAAK,CAAC,IAAI,SAAI,GAAG,OAAO,CAAC,MAAM,CAAC;IAmBtC;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B3B;;OAEG;IACH,cAAc,IAAI,MAAM,GAAG,IAAI;IAO/B,OAAO,CAAC,iBAAiB;IAiCzB,OAAO,CAAC,eAAe;IAoBvB,OAAO,CAAC,mBAAmB;IA2E3B;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IA+B7B,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,aAAa;IA6BrB;;OAEG;IACH,OAAO,CAAC,eAAe;CAgBxB"}
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/metro/proxy.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAyBjD;;;;;;;;;;;GAWG;AACH,qBAAa,QAAQ;IAUP,OAAO,CAAC,QAAQ,CAAC,SAAS;IATtC,OAAO,CAAC,UAAU,CAA4B;IAC9C,OAAO,CAAC,GAAG,CAAgC;IAC3C,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,eAAe,CAA0C;IACjE,OAAO,CAAC,eAAe,CAA6B;IACpD,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,KAAK,CAAuB;gBAEP,SAAS,EAAE,SAAS;IAsBjD,IAAI,IAAI,IAAI,MAAM,GAAG,IAAI,CAExB;IAED;;OAEG;IACG,KAAK,CAAC,IAAI,SAAI,GAAG,OAAO,CAAC,MAAM,CAAC;IAiCtC;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B3B;;OAEG;IACH,cAAc,IAAI,MAAM,GAAG,IAAI;IAO/B,OAAO,CAAC,iBAAiB;IAiCzB,OAAO,CAAC,eAAe;IAoBvB,OAAO,CAAC,mBAAmB;IA2E3B;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IA+B7B,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,aAAa;IA6BrB;;OAEG;IACH,OAAO,CAAC,eAAe;CAgBxB"}

package/dist/plugins/console.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"console.d.ts","sourceRoot":"","sources":["../../src/plugins/console.ts"],"names":[],"mappings":"AA+BA,eAAO,MAAM,aAAa,yCAkHxB,CAAC"}
+{"version":3,"file":"console.d.ts","sourceRoot":"","sources":["../../src/plugins/console.ts"],"names":[],"mappings":"AAuHA,eAAO,MAAM,aAAa,yCAiIxB,CAAC"}

package/dist/plugins/devtools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"devtools.d.ts","sourceRoot":"","sources":["../../src/plugins/devtools.ts"],"names":[],"mappings":"AA4BA,eAAO,MAAM,cAAc,yCA4DzB,CAAC"}
+{"version":3,"file":"devtools.d.ts","sourceRoot":"","sources":["../../src/plugins/devtools.ts"],"names":[],"mappings":"AAuEA,eAAO,MAAM,cAAc,yCAyDzB,CAAC"}

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,cAAc,EAOf,MAAM,aAAa,CAAC;AA+DrB,wBAAsB,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAiUjF"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,cAAc,EAOf,MAAM,aAAa,CAAC;AAgErB,wBAAsB,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAyZjF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-mcp",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "Plugin-based MCP server for React Native/Expo runtime debugging, inspection, and automation via Metro/CDP",
   "homepage": "https://metromcp.dev",
   "repository": {