dominus-cli 0.5.9 → 0.6.0

package/dist/mcp.js

@@ -68,7 +68,12 @@ function serializeMessage(msg) {
 // src/transport/ws-server.ts
 var DominusServer = class extends EventEmitter {
   wss = null;
-  studioClient = null;
+  /** All connected Studio instances, keyed by placeId (0 for unknown) */
+  studioClients = /* @__PURE__ */ new Map();
+  /** Reverse lookup: ws → placeId */
+  wsToPlaceId = /* @__PURE__ */ new Map();
+  /** Which placeId to target. 0 = auto-select if only one is connected. */
+  activePlaceId = 0;
   controllers = /* @__PURE__ */ new Set();
   pendingRequests = /* @__PURE__ */ new Map();
   relayRequests = /* @__PURE__ */ new Map();
@@ -117,7 +122,9 @@ var DominusServer = class extends EventEmitter {
             this.addController(ws);
             ws.send(serializeMessage(createMessage("controller:welcome", {
               studioConnected: this.isConnected(),
-              port: this.port
+              port: this.port,
+              connections: this.listConnections(),
+              activePlaceId: this.activePlaceId
             })));
             return;
           }
@@ -125,7 +132,7 @@ var DominusServer = class extends EventEmitter {
         if (this.controllers.has(ws)) {
           this.handleControllerMessage(ws, msg);
         } else {
-          this.handleStudioMessage(msg);
+          this.handleStudioMessage(ws, msg);
         }
       } catch (err) {
         this.emit("server:error", err);
@@ -137,14 +144,22 @@ var DominusServer = class extends EventEmitter {
         for (const [id, controllerWs] of this.relayRequests) {
           if (controllerWs === ws) this.relayRequests.delete(id);
         }
-      } else if (this.studioClient?.ws === ws) {
-        this.studioClient = null;
-        this.emit("studio:disconnected");
-        this.broadcastToControllers("studio:disconnected", {});
-        for (const [id, pending] of this.pendingRequests) {
-          clearTimeout(pending.timer);
-          pending.reject(new Error("Studio disconnected"));
-          this.pendingRequests.delete(id);
+      } else {
+        const placeId = this.wsToPlaceId.get(ws);
+        if (placeId !== void 0) {
+          const conn = this.studioClients.get(placeId);
+          this.studioClients.delete(placeId);
+          this.wsToPlaceId.delete(ws);
+          this.emit("studio:disconnected", { placeId, placeName: conn?.placeName });
+          this.broadcastToControllers("studio:disconnected", { placeId, placeName: conn?.placeName });
+          for (const [id, pending] of this.pendingRequests) {
+            clearTimeout(pending.timer);
+            pending.reject(new Error(`Studio disconnected (place ${placeId})`));
+            this.pendingRequests.delete(id);
+          }
+          if (this.activePlaceId === placeId) {
+            this.activePlaceId = 0;
+          }
         }
       }
     });
@@ -153,19 +168,24 @@ var DominusServer = class extends EventEmitter {
     });
   }
   setStudioClient(ws, msg) {
-    if (this.studioClient) {
-      this.studioClient.ws.close();
-    }
     const payload = msg.payload;
-    this.studioClient = {
+    const placeId = payload.placeId ?? 0;
+    const existing = this.studioClients.get(placeId);
+    if (existing && existing.ws !== ws) {
+      existing.ws.close();
+      this.wsToPlaceId.delete(existing.ws);
+    }
+    const conn = {
       ws,
       connectedAt: Date.now(),
       studioVersion: payload.studioVersion,
-      placeId: payload.placeId,
+      placeId,
       placeName: payload.placeName
     };
-    this.emit("studio:connected", payload);
-    this.broadcastToControllers("studio:connected", payload);
+    this.studioClients.set(placeId, conn);
+    this.wsToPlaceId.set(ws, placeId);
+    this.emit("studio:connected", { ...payload, placeId });
+    this.broadcastToControllers("studio:connected", { ...payload, placeId });
   }
   addController(ws) {
     this.controllers.add(ws);
@@ -180,25 +200,30 @@ var DominusServer = class extends EventEmitter {
     }
   }
   handleControllerMessage(controllerWs, msg) {
-    if (!this.studioClient || this.studioClient.ws.readyState !== WebSocket.OPEN) {
+    const target = this.resolveTarget();
+    if (!target || target.ws.readyState !== WebSocket.OPEN) {
       controllerWs.send(serializeMessage({
         id: msg.id,
         type: StudioMsg.RESPONSE,
-        payload: { error: "Studio not connected" },
+        payload: { error: this.getTargetError() },
         ts: Date.now()
       }));
       return;
     }
     this.relayRequests.set(msg.id, controllerWs);
-    this.studioClient.ws.send(serializeMessage(msg));
+    target.ws.send(serializeMessage(msg));
   }
-  handleStudioMessage(msg) {
+  handleStudioMessage(ws, msg) {
     if (msg.type === StudioMsg.CONNECTED) {
       const payload = msg.payload;
-      if (this.studioClient) {
-        this.studioClient.studioVersion = payload.studioVersion;
-        this.studioClient.placeId = payload.placeId;
-        this.studioClient.placeName = payload.placeName;
+      const placeId = this.wsToPlaceId.get(ws);
+      if (placeId !== void 0) {
+        const conn = this.studioClients.get(placeId);
+        if (conn) {
+          conn.studioVersion = payload.studioVersion;
+          conn.placeId = payload.placeId;
+          conn.placeName = payload.placeName;
+        }
       }
       this.emit("studio:connected", payload);
       this.broadcastToControllers("studio:connected", payload);
@@ -223,10 +248,35 @@ var DominusServer = class extends EventEmitter {
     this.emit("message", msg);
     this.broadcastToControllers(msg.type, msg.payload);
   }
+  /** Resolve which Studio connection to target */
+  resolveTarget() {
+    if (this.studioClients.size === 0) return null;
+    if (this.activePlaceId !== 0) {
+      const conn = this.studioClients.get(this.activePlaceId);
+      if (conn && conn.ws.readyState === WebSocket.OPEN) return conn;
+      return null;
+    }
+    if (this.studioClients.size === 1) {
+      const conn = this.studioClients.values().next().value;
+      if (conn.ws.readyState === WebSocket.OPEN) return conn;
+      return null;
+    }
+    return null;
+  }
+  /** Generate an appropriate error message when no target found */
+  getTargetError() {
+    if (this.studioClients.size === 0) return "No Studio connection";
+    if (this.activePlaceId !== 0) {
+      return `Active place ${this.activePlaceId} is not connected. Use set_active_place or list_connections.`;
+    }
+    const places = [...this.studioClients.values()].map((c) => `${c.placeName ?? "Unknown"} (${c.placeId})`);
+    return `Multiple Studio instances connected: ${places.join(", ")}. Use set_active_place to choose one.`;
+  }
   sendRequest(type, payload, timeoutMs = 1e4) {
     return new Promise((resolve, reject) => {
-      if (!this.studioClient || this.studioClient.ws.readyState !== WebSocket.OPEN) {
-        reject(new Error("No Studio connection"));
+      const target = this.resolveTarget();
+      if (!target || target.ws.readyState !== WebSocket.OPEN) {
+        reject(new Error(this.getTargetError()));
         return;
       }
       const msg = createMessage(type, payload);
@@ -239,31 +289,45 @@ var DominusServer = class extends EventEmitter {
         reject,
         timer
       });
-      this.studioClient.ws.send(serializeMessage(msg));
+      target.ws.send(serializeMessage(msg));
     });
   }
   sendNotification(type, payload) {
-    if (!this.studioClient || this.studioClient.ws.readyState !== WebSocket.OPEN) {
-      return;
-    }
+    const target = this.resolveTarget();
+    if (!target || target.ws.readyState !== WebSocket.OPEN) return;
     const msg = createMessage(type, payload);
-    this.studioClient.ws.send(serializeMessage(msg));
+    target.ws.send(serializeMessage(msg));
   }
   isConnected() {
-    return this.studioClient !== null && this.studioClient.ws.readyState === WebSocket.OPEN;
+    return this.resolveTarget() !== null;
   }
   getConnectionInfo() {
-    return this.studioClient;
+    return this.resolveTarget();
+  }
+  listConnections() {
+    return [...this.studioClients.values()].filter((c) => c.ws.readyState === WebSocket.OPEN).map((c) => ({
+      placeId: c.placeId ?? 0,
+      placeName: c.placeName,
+      studioVersion: c.studioVersion,
+      connectedAt: c.connectedAt
+    }));
+  }
+  getActivePlaceId() {
+    return this.activePlaceId;
+  }
+  setActivePlaceId(placeId) {
+    this.activePlaceId = placeId;
   }
   getPort() {
     return this.port;
   }
   stop() {
     return new Promise((resolve) => {
-      if (this.studioClient) {
-        this.studioClient.ws.close();
-        this.studioClient = null;
+      for (const conn of this.studioClients.values()) {
+        conn.ws.close();
       }
+      this.studioClients.clear();
+      this.wsToPlaceId.clear();
       for (const ws of this.controllers) {
         ws.close();
       }
@@ -286,7 +350,8 @@ var DominusClient = class extends EventEmitter {
   ws = null;
   port;
   studioConnected = false;
-  connectionInfo = null;
+  connections = /* @__PURE__ */ new Map();
+  activePlaceId = 0;
   pendingRequests = /* @__PURE__ */ new Map();
   constructor(port = 18088) {
     super();
@@ -330,6 +395,20 @@ var DominusClient = class extends EventEmitter {
     if (msg.type === "controller:welcome") {
       const p = msg.payload;
       this.studioConnected = p.studioConnected;
+      if (p.connections) {
+        this.connections.clear();
+        for (const c of p.connections) {
+          this.connections.set(c.placeId, {
+            connectedAt: c.connectedAt,
+            studioVersion: c.studioVersion,
+            placeId: c.placeId,
+            placeName: c.placeName
+          });
+        }
+      }
+      if (p.activePlaceId !== void 0) {
+        this.activePlaceId = p.activePlaceId;
+      }
       if (this.studioConnected) {
         this.emit("studio:connected", {});
       }
@@ -338,19 +417,27 @@ var DominusClient = class extends EventEmitter {
     if (msg.type === "studio:connected") {
       this.studioConnected = true;
       const payload = msg.payload;
-      this.connectionInfo = {
+      const placeId = payload.placeId ?? 0;
+      this.connections.set(placeId, {
         connectedAt: Date.now(),
         studioVersion: payload.studioVersion,
-        placeId: payload.placeId,
+        placeId,
         placeName: payload.placeName
-      };
+      });
       this.emit("studio:connected", payload);
       return;
     }
     if (msg.type === "studio:disconnected") {
-      this.studioConnected = false;
-      this.connectionInfo = null;
-      this.emit("studio:disconnected");
+      const payload = msg.payload;
+      const placeId = payload.placeId ?? 0;
+      this.connections.delete(placeId);
+      if (this.connections.size === 0) {
+        this.studioConnected = false;
+      }
+      if (this.activePlaceId === placeId) {
+        this.activePlaceId = 0;
+      }
+      this.emit("studio:disconnected", payload);
       return;
     }
     if (msg.type === StudioMsg.RESPONSE) {
@@ -394,11 +481,27 @@ var DominusClient = class extends EventEmitter {
     this.ws.send(serializeMessage(msg));
   }
   isConnected() {
-    return this.studioConnected;
+    return this.studioConnected && this.connections.size > 0;
   }
   getConnectionInfo() {
-    if (!this.connectionInfo) return null;
-    return { ...this.connectionInfo, ws: this.ws };
+    if (this.connections.size === 0) return null;
+    const target = this.activePlaceId !== 0 ? this.connections.get(this.activePlaceId) : this.connections.values().next().value;
+    if (!target) return null;
+    return { ...target, ws: this.ws };
+  }
+  listConnections() {
+    return [...this.connections.values()].map((c) => ({
+      placeId: c.placeId ?? 0,
+      placeName: c.placeName,
+      studioVersion: c.studioVersion,
+      connectedAt: c.connectedAt
+    }));
+  }
+  getActivePlaceId() {
+    return this.activePlaceId;
+  }
+  setActivePlaceId(placeId) {
+    this.activePlaceId = placeId;
   }
   getPort() {
     return this.port;
@@ -673,6 +776,7 @@ These are built-in lessons that ship with Dominus. Follow them exactly.
 - **Inspecting user's selection \u2192 \`get_selection\`, then \`get_properties\` or \`serialize_ui\`**
 - **Reading properties \u2192 \`get_properties\` (NEVER \`run_code\` with dump scripts)**
 - **Browsing the tree \u2192 \`get_explorer\`**
+- **Multiple Studios open \u2192 \`list_connections\` to see all, \`set_active_place\` to target one**
 - Anything exotic or procedural \u2192 \`run_code\` as last resort
 
 ### NEVER use run_code for:
@@ -731,7 +835,7 @@ async function startMcpServer() {
   }
   const mcp = new McpServer({
     name: "dominus",
-    version: "0.5.8"
+    version: "0.6.0"
   }, {
     instructions: INTERNAL_MEMORY
   });
@@ -1319,6 +1423,57 @@ ${"	".repeat(_depth)}}`;
       return { content: [{ type: "text", text: code }] };
     }
   );
+  mcp.tool(
+    "list_connections",
+    "List all Roblox Studio instances currently connected to Dominus. Shows placeId, placeName, and connection time for each. Use this when working with multiple Studio windows.",
+    {},
+    async () => {
+      const connections = bridge.listConnections();
+      const activePlaceId = bridge.getActivePlaceId();
+      return {
+        content: [{
+          type: "text",
+          text: JSON.stringify({
+            activePlaceId: activePlaceId || "auto",
+            connections: connections.map((c) => ({
+              ...c,
+              active: activePlaceId === 0 && connections.length === 1 ? true : c.placeId === activePlaceId
+            }))
+          }, null, 2)
+        }]
+      };
+    }
+  );
+  mcp.tool(
+    "set_active_place",
+    "Set which Roblox Studio instance to target when multiple are connected. Pass placeId=0 to reset to auto mode (works when only one is connected). Call list_connections first to see available placeIds.",
+    {
+      placeId: z.number().describe("The placeId to target. Use 0 to reset to auto-select.")
+    },
+    async ({ placeId }) => {
+      const connections = bridge.listConnections();
+      if (placeId !== 0 && !connections.some((c) => c.placeId === placeId)) {
+        const available = connections.map((c) => `${c.placeName ?? "Unknown"} (${c.placeId})`).join(", ");
+        return {
+          content: [{
+            type: "text",
+            text: `Place ${placeId} is not connected. Available: ${available || "none"}`
+          }]
+        };
+      }
+      bridge.setActivePlaceId(placeId);
+      if (placeId === 0) {
+        return { content: [{ type: "text", text: "Active place reset to auto-select." }] };
+      }
+      const target = connections.find((c) => c.placeId === placeId);
+      return {
+        content: [{
+          type: "text",
+          text: `Active place set to ${target?.placeName ?? "Unknown"} (${placeId})`
+        }]
+      };
+    }
+  );
   mcp.tool(
     "recall_memory",
     "Search persistent memory for facts about the current Roblox project",