conduit-mcp 2.1.9 → 2.2.1

package/dist/{chunk-2OAUC6UN.js → chunk-26DDWVEB.js}

@@ -37,6 +37,31 @@ var log = {
   }
 };
 
+// src/utils/version.ts
+import { readFileSync } from "fs";
+import { dirname, join } from "path";
+import { fileURLToPath } from "url";
+var cached = null;
+function getServerVersion() {
+  if (cached) return cached;
+  const here = dirname(fileURLToPath(import.meta.url));
+  for (const rel of ["..", join("..", "..")]) {
+    try {
+      const pkg = JSON.parse(
+        readFileSync(join(here, rel, "package.json"), "utf-8")
+      );
+      if (pkg.name === "conduit-mcp" && typeof pkg.version === "string") {
+        const version = pkg.version;
+        cached = version;
+        return version;
+      }
+    } catch {
+    }
+  }
+  cached = "unknown";
+  return cached;
+}
+
 // src/bridge.ts
 var REQUEST_TIMEOUT_MS = 6e4;
 var HEARTBEAT_CHECK_INTERVAL_MS = 5e3;
@@ -45,7 +70,7 @@ var PING_INTERVAL_MS = 1e4;
 var LONG_POLL_TIMEOUT_MS = 25e3;
 var MAX_PORT_RETRIES = 10;
 var REGISTRATION_TIMEOUT_MS = 1e4;
-var FIRST_CONNECT_WAIT_MS = 3e3;
+var FIRST_CONNECT_WAIT_MS = 1e4;
 var Bridge = class extends EventEmitter {
   constructor(port = 3200) {
     super();
@@ -68,6 +93,9 @@ var Bridge = class extends EventEmitter {
   // HTTP fallback state (per-studio)
   httpPendingCommands = /* @__PURE__ */ new Map();
   httpPollWaiters = /* @__PURE__ */ new Map();
+  // Set by the host process; reports whether the MCP client driving this server
+  // is still attached. Used to refuse /shutdown while we're actively serving.
+  clientAliveCheck = null;
   get isConnected() {
     for (const [, studio] of this.studios) {
       if (studio.ws.readyState === WebSocket.OPEN) return true;
@@ -99,8 +127,37 @@ var Bridge = class extends EventEmitter {
   }
   // ── Server lifecycle ───────────────────────────────────────────
   /**
-   * Try to shut down a stale Conduit instance on the target port.
-   * Returns true if the port was freed (or was already free).
+   * Check whether the process holding a port is a healthy Conduit server.
+   * Returns true only when /health answers with the Conduit signature —
+   * meaning another live MCP session is being served on that port.
+   */
+  async isLiveConduit(port) {
+    return new Promise((resolve) => {
+      const req = http.request(
+        { hostname: "127.0.0.1", port, path: "/health", method: "GET", timeout: 2e3 },
+        (res) => {
+          let body = "";
+          res.on("data", (chunk) => body += chunk);
+          res.on("end", () => {
+            try {
+              resolve(JSON.parse(body)?.status === "ok");
+            } catch {
+              resolve(false);
+            }
+          });
+        }
+      );
+      req.on("error", () => resolve(false));
+      req.on("timeout", () => {
+        req.destroy();
+        resolve(false);
+      });
+      req.end();
+    });
+  }
+  /**
+   * Try to shut down a wedged Conduit instance on the target port.
+   * Returns true if the shutdown request was accepted.
    */
   async evictStaleInstance(port) {
     return new Promise((resolve) => {
@@ -114,7 +171,7 @@ var Bridge = class extends EventEmitter {
         },
         (res) => {
           res.resume();
-          setTimeout(() => resolve(true), 500);
+          setTimeout(() => resolve(res.statusCode === 200), 500);
         }
       );
       req.on("error", () => resolve(false));
@@ -126,20 +183,29 @@ var Bridge = class extends EventEmitter {
     });
   }
   async start() {
-    await this.evictStaleInstance(this.port);
     return new Promise((resolve, reject) => {
       let attempts = 0;
-      const tryPort = (port) => {
+      const tryPort = (port, allowEvict) => {
         const server = http.createServer(
           (req, res) => this.handleHttp(req, res)
         );
-        server.once("error", (err) => {
+        server.once("error", async (err) => {
           if (err.code === "EADDRINUSE" && attempts < MAX_PORT_RETRIES) {
             attempts++;
-            log.warn(
-              `Port ${port} still in use after eviction \u2014 trying ${port + 1}`
-            );
-            tryPort(port + 1);
+            if (await this.isLiveConduit(port)) {
+              log.info(
+                `Port ${port} is serving another Conduit session \u2014 trying ${port + 1}`
+              );
+              tryPort(port + 1, true);
+              return;
+            }
+            if (allowEvict && await this.evictStaleInstance(port)) {
+              log.warn(`Evicted unresponsive instance on port ${port} \u2014 retrying`);
+              tryPort(port, false);
+              return;
+            }
+            log.warn(`Port ${port} in use \u2014 trying ${port + 1}`);
+            tryPort(port + 1, true);
           } else {
             reject(err);
           }
@@ -153,7 +219,7 @@ var Bridge = class extends EventEmitter {
           resolve(port);
         });
       };
-      tryPort(this.port);
+      tryPort(this.port, true);
     });
   }
   async stop() {
@@ -239,9 +305,11 @@ var Bridge = class extends EventEmitter {
             clearTimeout(timer);
             this.pendingRequests.delete(id);
             log.warn(
-              `WebSocket send failed for studio "${this.activeStudioId}": ${err.message}`
+              `WebSocket send failed for studio "${targetStudioId}": ${err.message}`
             );
-            this.evictStaleStudio(this.activeStudioId);
+            if (targetStudioId) {
+              this.evictStaleStudio(targetStudioId);
+            }
             reject(
               new Error(
                 `Failed to send to Roblox Studio: ${err.message}. The plugin connection may have dropped \u2014 it should auto-reconnect shortly. Please retry.`
@@ -413,7 +481,8 @@ var Bridge = class extends EventEmitter {
             studioId: msg.studioId,
             placeId: msg.placeId,
             placeName: msg.placeName,
-            connectedAt: Date.now()
+            connectedAt: Date.now(),
+            pluginVersion: msg.version
           });
           return;
         }
@@ -455,9 +524,31 @@ var Bridge = class extends EventEmitter {
     }
     this.studios.set(studioId, { ws, info });
     this.lastHeartbeats.set(studioId, Date.now());
+    if (this.httpStudios.has(studioId)) {
+      this.httpStudios.delete(studioId);
+      const waiters = this.httpPollWaiters.get(studioId) ?? [];
+      for (const waiter of waiters) {
+        clearTimeout(waiter.timer);
+        waiter.res.writeHead(204);
+        waiter.res.end();
+      }
+      this.httpPollWaiters.delete(studioId);
+      const queued = this.httpPendingCommands.get(studioId) ?? [];
+      this.httpPendingCommands.delete(studioId);
+      for (const cmd of queued) {
+        ws.send(JSON.stringify(cmd));
+      }
+      if (queued.length > 0) {
+        log.info(
+          `Re-dispatched ${queued.length} queued command(s) over WebSocket for studio ${studioId}`
+        );
+      }
+    }
     ws.isAlive = true;
+    ws.missedPongs = 0;
     ws.on("pong", () => {
       ws.isAlive = true;
+      ws.missedPongs = 0;
     });
     if (this.activeStudioId === null || this.activeStudioId === studioId) {
       this.activeStudioId = studioId;
@@ -466,6 +557,7 @@ var Bridge = class extends EventEmitter {
     log.info(
       `Studio registered: ${studioId}` + (info.placeName ? ` (${info.placeName})` : "")
     );
+    this.warnOnVersionMismatch(info);
     this.startHeartbeatMonitor();
     this.startPingInterval();
     if (ws.__earlyClose) {
@@ -520,6 +612,14 @@ var Bridge = class extends EventEmitter {
       }
     });
   }
+  warnOnVersionMismatch(info) {
+    const serverVersion = getServerVersion();
+    if (info.pluginVersion && serverVersion !== "unknown" && info.pluginVersion !== serverVersion) {
+      log.warn(
+        `Plugin version ${info.pluginVersion} does not match server ${serverVersion} \u2014 run "npx conduit-mcp --install" and restart Studio to update the plugin`
+      );
+    }
+  }
   failPendingForStudio(studioId, code, reason) {
     for (const [id, pending] of this.pendingRequests) {
       if (pending.studioId === studioId) {
@@ -560,6 +660,10 @@ var Bridge = class extends EventEmitter {
       const now = Date.now();
       for (const [studioId, lastBeat] of this.lastHeartbeats) {
         if (now - lastBeat > HEARTBEAT_TIMEOUT_MS) {
+          if (!this.studios.has(studioId) && (this.httpPollWaiters.get(studioId)?.length ?? 0) > 0) {
+            this.lastHeartbeats.set(studioId, now);
+            continue;
+          }
           const studio = this.studios.get(studioId);
           if (studio) {
             log.warn(
@@ -602,14 +706,23 @@ var Bridge = class extends EventEmitter {
       for (const [studioId, studio] of this.studios) {
         const ws = studio.ws;
         if (ws.isAlive === false) {
-          log.warn(
-            `Ping timeout for studio "${studioId}" \u2014 terminating connection`
-          );
-          ws.terminate();
-          return;
+          ws.missedPongs = (ws.missedPongs ?? 0) + 1;
+          if (ws.missedPongs >= 2) {
+            log.warn(
+              `No pong from studio "${studioId}" after ${ws.missedPongs} pings \u2014 terminating connection`
+            );
+            ws.terminate();
+            continue;
+          }
+          log.warn(`Missed pong from studio "${studioId}" \u2014 retrying`);
+        } else {
+          ws.missedPongs = 0;
         }
         ws.isAlive = false;
-        ws.ping();
+        try {
+          ws.ping();
+        } catch {
+        }
       }
     }, PING_INTERVAL_MS);
   }
@@ -640,6 +753,12 @@ var Bridge = class extends EventEmitter {
         res.end("Forbidden");
         return;
       }
+      if (this.clientAliveCheck && this.clientAliveCheck()) {
+        log.warn("Refusing shutdown request \u2014 MCP client is still attached");
+        res.writeHead(409);
+        res.end("busy");
+        return;
+      }
       log.info("Received shutdown request from new Conduit instance");
       res.writeHead(200);
       res.end("ok");
@@ -655,6 +774,7 @@ var Bridge = class extends EventEmitter {
           status: "ok",
           connected: this.isConnected,
           port: this.actualPort,
+          serverVersion: getServerVersion(),
           studios: this.getStudios(),
           activeStudioId: this.activeStudioId
         })
@@ -663,7 +783,11 @@ var Bridge = class extends EventEmitter {
     }
     if (req.method === "GET" && pathname === "/poll") {
       const studioId = parsedUrl.searchParams.get("studioId") ?? this.activeStudioId ?? "_default";
-      this.handlePoll(studioId, res);
+      this.handlePoll(
+        studioId,
+        parsedUrl.searchParams.get("version") ?? void 0,
+        res
+      );
       return;
     }
     if (req.method === "POST" && pathname === "/result") {
@@ -678,17 +802,19 @@ var Bridge = class extends EventEmitter {
     res.writeHead(404);
     res.end("Not found");
   }
-  handlePoll(studioId, res) {
+  handlePoll(studioId, pluginVersion, res) {
     if (!this.studios.has(studioId) && studioId !== "_default") {
       if (!this.httpStudios.has(studioId)) {
         const info = {
           studioId,
-          connectedAt: Date.now()
+          connectedAt: Date.now(),
+          pluginVersion
         };
         this.httpStudios.set(studioId, info);
         this.lastHeartbeats.set(studioId, Date.now());
         this.emit("studio-connected", info);
         log.info(`HTTP-only studio registered: ${studioId}`);
+        this.warnOnVersionMismatch(info);
         this.startHeartbeatMonitor();
       }
       this.lastHeartbeats.set(studioId, Date.now());
@@ -732,6 +858,16 @@ var Bridge = class extends EventEmitter {
     const waiters = this.httpPollWaiters.get(studioId) ?? [];
     waiters.push({ res, timer });
     this.httpPollWaiters.set(studioId, waiters);
+    res.on("close", () => {
+      if (res.writableEnded) return;
+      clearTimeout(timer);
+      const current = this.httpPollWaiters.get(studioId);
+      if (current) {
+        const idx = current.findIndex((w) => w.res === res);
+        if (idx !== -1) current.splice(idx, 1);
+        if (current.length === 0) this.httpPollWaiters.delete(studioId);
+      }
+    });
   }
   handleResult(req, res) {
     const MAX_BODY_SIZE = 10 * 1024 * 1024;
@@ -766,10 +902,17 @@ var Bridge = class extends EventEmitter {
     const queue = this.httpPendingCommands.get(studioId) ?? [];
     while (waiters.length > 0 && queue.length > 0) {
       const waiter = waiters.shift();
-      const cmd = queue.shift();
       clearTimeout(waiter.timer);
-      waiter.res.writeHead(200, { "Content-Type": "application/json" });
-      waiter.res.end(JSON.stringify(cmd));
+      if (waiter.res.destroyed || waiter.res.writableEnded) {
+        continue;
+      }
+      const cmd = queue.shift();
+      try {
+        waiter.res.writeHead(200, { "Content-Type": "application/json" });
+        waiter.res.end(JSON.stringify(cmd));
+      } catch {
+        queue.unshift(cmd);
+      }
     }
     if (waiters.length === 0) this.httpPollWaiters.delete(studioId);
     if (queue.length === 0) this.httpPendingCommands.delete(studioId);
@@ -1620,14 +1763,18 @@ ${outputText}
 // src/tools/playtest.ts
 import { z as z4 } from "zod";
 var playtestStartedAt = null;
+var errorWatchCursor = null;
+var errorWatchSeenAtCursor = /* @__PURE__ */ new Set();
+var errorWatchStudioId = null;
+var ERROR_WATCH_FETCH_LIMIT = 500;
 function register4(server, bridge) {
   server.registerTool(
     "playtest",
     {
       title: "Playtest Control & Virtual Input",
-      description: "Control Roblox Studio playtesting and simulate user input.\n\nIMPORTANT: Use mode='run' (default) for reliable MCP control during playtest. Run mode keeps the plugin connection stable. Play mode (F5) may briefly drop the connection during transition.\n\nActions:\n- `start`: Begin a playtest session. Default: Run mode (F8, server-side). Set mode='play' for Play mode (F5, client with player character \u2014 connection may briefly drop).\n- `stop`: End the current playtest.\n- `execute`: Run Lua code in the game context. Works in both edit mode and during playtest.\n- `get_output`: Get console/log output from Studio (works in edit mode and during playtest).\n- `inspect`: Evaluate a Luau expression and return the typed result. Can access Workspace, ServerStorage, Players, etc.\n- `navigate`: Walk a player character to a position using PathfindingService (requires active playtest with a player character).\n- `mouse_click`: Simulate a mouse click at screen coordinates (requires active playtest).\n- `mouse_move`: Move the virtual mouse to screen coordinates (requires active playtest).\n- `key_press`: Press and release a key (requires active playtest).\n- `key_down`: Hold a key down (requires active playtest).\n- `key_up`: Release a held key (requires active playtest).\n- `screenshot`: Capture the viewport. Useful for seeing the game state visually.",
+      description: "Control Roblox Studio playtesting and simulate user input.\n\nIMPORTANT: Use mode='run' (default) for reliable MCP control during playtest. Run mode keeps the plugin connection stable. Play mode (F5) may briefly drop the connection during transition.\n\nActions:\n- `start`: Begin a playtest session. Default: Run mode (F8, server-side). Set mode='play' for Play mode (F5, client with player character \u2014 connection may briefly drop).\n- `stop`: End the current playtest.\n- `execute`: Run Lua code in the game context. Works in both edit mode and during playtest.\n- `get_output`: Get console/log output from Studio (works in edit mode and during playtest).\n- `get_new_errors`: Return only errors/warnings that appeared since the previous get_new_errors call (first call: since playtest start, or recent history). Cheap to poll in edit\u2192test\u2192fix loops.\n- `inspect`: Evaluate a Luau expression and return the typed result. Can access Workspace, ServerStorage, Players, etc.\n- `navigate`: Walk a player character to a position using PathfindingService (requires active playtest with a player character).\n- `mouse_click`: Simulate a mouse click at screen coordinates (requires active playtest).\n- `mouse_move`: Move the virtual mouse to screen coordinates (requires active playtest).\n- `key_press`: Press and release a key (requires active playtest).\n- `key_down`: Hold a key down (requires active playtest).\n- `key_up`: Release a held key (requires active playtest).\n- `screenshot`: Capture the viewport. Useful for seeing the game state visually.",
       inputSchema: z4.object({
-        action: z4.enum(["start", "stop", "execute", "get_output", "inspect", "navigate", "mouse_click", "mouse_move", "key_press", "key_down", "key_up", "screenshot"]).describe("Playtest action"),
+        action: z4.enum(["start", "stop", "execute", "get_output", "get_new_errors", "inspect", "navigate", "mouse_click", "mouse_move", "key_press", "key_down", "key_up", "screenshot"]).describe("Playtest action"),
         mode: z4.enum(["play", "run"]).default("run").describe("Playtest mode: 'run' (F8, default, reliable MCP control) or 'play' (F5, full client with player \u2014 connection may briefly drop)"),
         code: z4.string().optional().describe("Lua code to execute (for 'execute' action)"),
         // get_output params
@@ -1679,6 +1826,62 @@ ${logText}
           content: [{ type: "text", text: applyTokenBudget(text2, void 0) }]
         };
       }
+      if (params.action === "get_new_errors") {
+        const activeStudio = bridge.getActiveStudioId();
+        if (activeStudio !== errorWatchStudioId) {
+          errorWatchStudioId = activeStudio;
+          errorWatchCursor = null;
+          errorWatchSeenAtCursor = /* @__PURE__ */ new Set();
+        }
+        const since = errorWatchCursor ?? playtestStartedAt ?? void 0;
+        const result2 = await bridge.send("get_log_output", {
+          messageTypes: ["MessageError", "MessageWarning"],
+          since,
+          limit: ERROR_WATCH_FETCH_LIMIT
+        });
+        const keyOf = (l) => `${l.messageType}|${l.message}`;
+        const fresh = result2.logs.filter(
+          (l) => errorWatchCursor === null || l.timestamp > errorWatchCursor || l.timestamp === errorWatchCursor && !errorWatchSeenAtCursor.has(keyOf(l))
+        );
+        if (fresh.length > 0) {
+          const maxTs = Math.max(...fresh.map((l) => l.timestamp));
+          if (maxTs !== errorWatchCursor) {
+            errorWatchSeenAtCursor = /* @__PURE__ */ new Set();
+          }
+          errorWatchCursor = maxTs;
+          for (const l of fresh) {
+            if (l.timestamp === maxTs) {
+              errorWatchSeenAtCursor.add(keyOf(l));
+            }
+          }
+        }
+        if (fresh.length === 0) {
+          return {
+            content: [{ type: "text", text: "No new errors or warnings." }]
+          };
+        }
+        const displayLimit = params.limit ?? 50;
+        const shown = fresh.slice(0, displayLimit);
+        const notes = [];
+        if (fresh.length > shown.length) {
+          notes.push(
+            `_\u2026${fresh.length - shown.length} newer entries omitted (oldest shown first \u2014 the first occurrence is usually the root cause)._`
+          );
+        }
+        if (result2.total > result2.logs.length) {
+          notes.push(
+            `_Log buffer overflowed: ${result2.total - result2.logs.length} entries were dropped before this check._`
+          );
+        }
+        const text2 = `**New Errors/Warnings** (${fresh.length})
+
+\`\`\`
+` + shown.map((l) => `[${l.messageType}] ${l.message}`).join("\n") + "\n```" + (notes.length > 0 ? `
+${notes.join("\n")}` : "");
+        return {
+          content: [{ type: "text", text: applyTokenBudget(text2, void 0) }]
+        };
+      }
       if (params.action === "inspect") {
         if (!params.expression) {
           return {
@@ -2386,12 +2589,14 @@ function register8(server, bridge) {
           ]
         };
       }
+      const serverVersion = getServerVersion();
       const lines = studios.map((s) => {
         const active = s.studioId === activeId ? " **\u2190 active**" : "";
         const place = s.placeName ? ` \u2014 ${s.placeName}` : "";
         const placeId = s.placeId ? ` (Place ID: ${s.placeId})` : "";
         const duration = Math.floor((Date.now() - s.connectedAt) / 1e3);
-        return `- \`${s.studioId}\`${place}${placeId} \u2014 connected ${duration}s ago${active}`;
+        const version = s.pluginVersion && serverVersion !== "unknown" && s.pluginVersion !== serverVersion ? ` \u26A0 plugin v${s.pluginVersion} \u2260 server v${serverVersion} \u2014 user should run \`npx conduit-mcp --install\` and restart Studio` : "";
+        return `- \`${s.studioId}\`${place}${placeId} \u2014 connected ${duration}s ago${active}${version}`;
       });
       const text = `**Connected Studios (${studios.length}):**
 ${lines.join("\n")}`;
@@ -2437,16 +2642,16 @@ import { z as z9 } from "zod";
 
 // src/utils/builds.ts
 import { homedir } from "os";
-import { join } from "path";
+import { join as join2 } from "path";
 import {
   existsSync,
   mkdirSync,
-  readFileSync,
+  readFileSync as readFileSync2,
   writeFileSync,
   readdirSync,
   statSync
 } from "fs";
-var BUILDS_DIR = join(homedir(), ".conduit", "builds");
+var BUILDS_DIR = join2(homedir(), ".conduit", "builds");
 function ensureDir() {
   if (!existsSync(BUILDS_DIR)) {
     mkdirSync(BUILDS_DIR, { recursive: true });
@@ -2467,7 +2672,7 @@ function saveBuild(name, root, description) {
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
     root
   };
-  const filePath = join(BUILDS_DIR, `${name}.json`);
+  const filePath = join2(BUILDS_DIR, `${name}.json`);
   writeFileSync(filePath, JSON.stringify(data, null, 2), "utf-8");
   return {
     name,
@@ -2479,19 +2684,19 @@ function saveBuild(name, root, description) {
 }
 function loadBuild(name) {
   validateBuildName(name);
-  const filePath = join(BUILDS_DIR, `${name}.json`);
+  const filePath = join2(BUILDS_DIR, `${name}.json`);
   if (!existsSync(filePath)) {
     throw new Error(`Build "${name}" not found. Use builds --action list to see available builds.`);
   }
-  return JSON.parse(readFileSync(filePath, "utf-8"));
+  return JSON.parse(readFileSync2(filePath, "utf-8"));
 }
 function listBuilds() {
   ensureDir();
   const files = readdirSync(BUILDS_DIR).filter((f) => f.endsWith(".json"));
   return files.map((f) => {
-    const filePath = join(BUILDS_DIR, f);
+    const filePath = join2(BUILDS_DIR, f);
     try {
-      const data = JSON.parse(readFileSync(filePath, "utf-8"));
+      const data = JSON.parse(readFileSync2(filePath, "utf-8"));
       const rootObj = data.root;
       return {
         name: data.name,
@@ -2643,7 +2848,7 @@ async function startServer(port = 3200, options = {}) {
   const server = new McpServer(
     {
       name: "conduit-mcp",
-      version: "2.0.0"
+      version: getServerVersion()
     },
     {
       instructions: [
@@ -2694,6 +2899,7 @@ async function startServer(port = 3200, options = {}) {
     if (shuttingDown) return;
     shuttingDown = true;
     log.info("Shutting down...");
+    setTimeout(() => process.exit(1), 5e3).unref();
     await bridge.stop();
     await server.close();
     process.exit(0);
@@ -2701,9 +2907,19 @@ async function startServer(port = 3200, options = {}) {
   bridge.on("shutdown", shutdown);
   process.on("SIGINT", shutdown);
   process.on("SIGTERM", shutdown);
+  let clientAlive = true;
+  const onClientGone = () => {
+    if (!clientAlive) return;
+    clientAlive = false;
+    log.info("MCP client disconnected (stdin closed) \u2014 shutting down");
+    void shutdown();
+  };
+  process.stdin.on("end", onClientGone);
+  process.stdin.on("close", onClientGone);
+  bridge.clientAliveCheck = () => clientAlive;
 }
 
 export {
   startServer
 };
-//# sourceMappingURL=chunk-2OAUC6UN.js.map
+//# sourceMappingURL=chunk-26DDWVEB.js.map