dominus-cli 0.1.0 → 0.2.0

package/dist/index.js

@@ -459,6 +459,166 @@ var init_ws_server = __esm({
     };
   }
 });
+async function isPortInUse(port) {
+  return new Promise((resolve) => {
+    const ws = new WebSocket(`ws://localhost:${port}`);
+    const timer = setTimeout(() => {
+      ws.close();
+      resolve(false);
+    }, 1e3);
+    ws.on("open", () => {
+      clearTimeout(timer);
+      ws.close();
+      resolve(true);
+    });
+    ws.on("error", () => {
+      clearTimeout(timer);
+      resolve(false);
+    });
+  });
+}
+var DominusClient;
+var init_ws_client = __esm({
+  "src/transport/ws-client.ts"() {
+    init_protocol();
+    DominusClient = class extends EventEmitter {
+      ws = null;
+      port;
+      studioConnected = false;
+      connectionInfo = null;
+      pendingRequests = /* @__PURE__ */ new Map();
+      constructor(port = 18088) {
+        super();
+        this.port = port;
+      }
+      connect() {
+        return new Promise((resolve, reject) => {
+          const url = `ws://localhost:${this.port}`;
+          const ws = new WebSocket(url);
+          ws.on("open", () => {
+            this.ws = ws;
+            ws.send(serializeMessage(createMessage("controller:connect", {})));
+            this.emit("server:started", { port: this.port, relay: true });
+            resolve();
+          });
+          ws.on("message", (raw) => {
+            try {
+              const msg = parseMessage(raw.toString());
+              this.handleMessage(msg);
+            } catch (err) {
+              this.emit("server:error", err);
+            }
+          });
+          ws.on("close", () => {
+            this.ws = null;
+            this.studioConnected = false;
+            this.emit("studio:disconnected");
+            for (const [id, pending] of this.pendingRequests) {
+              clearTimeout(pending.timer);
+              pending.reject(new Error("Relay connection lost"));
+              this.pendingRequests.delete(id);
+            }
+          });
+          ws.on("error", (err) => {
+            if (!this.ws) reject(err);
+            this.emit("server:error", err);
+          });
+        });
+      }
+      handleMessage(msg) {
+        if (msg.type === "controller:welcome") {
+          const p = msg.payload;
+          this.studioConnected = p.studioConnected;
+          if (this.studioConnected) {
+            this.emit("studio:connected", {});
+          }
+          return;
+        }
+        if (msg.type === "studio:connected") {
+          this.studioConnected = true;
+          const payload = msg.payload;
+          this.connectionInfo = {
+            connectedAt: Date.now(),
+            studioVersion: payload.studioVersion,
+            placeId: payload.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");
+          return;
+        }
+        if (msg.type === StudioMsg.RESPONSE) {
+          const pending = this.pendingRequests.get(msg.id);
+          if (pending) {
+            clearTimeout(pending.timer);
+            pending.resolve(msg);
+            this.pendingRequests.delete(msg.id);
+          }
+          return;
+        }
+        this.emit(msg.type, msg.payload);
+        this.emit("message", msg);
+      }
+      sendRequest(type, payload, timeoutMs = 1e4) {
+        return new Promise((resolve, reject) => {
+          if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
+            reject(new Error("Not connected to Dominus server"));
+            return;
+          }
+          if (!this.studioConnected) {
+            reject(new Error("Studio not connected"));
+            return;
+          }
+          const msg = createMessage(type, payload);
+          const timer = setTimeout(() => {
+            this.pendingRequests.delete(msg.id);
+            reject(new Error(`Request timed out: ${type}`));
+          }, timeoutMs);
+          this.pendingRequests.set(msg.id, {
+            resolve,
+            reject,
+            timer
+          });
+          this.ws.send(serializeMessage(msg));
+        });
+      }
+      sendNotification(type, payload) {
+        if (!this.ws || this.ws.readyState !== WebSocket.OPEN) return;
+        const msg = createMessage(type, payload);
+        this.ws.send(serializeMessage(msg));
+      }
+      isConnected() {
+        return this.studioConnected;
+      }
+      getConnectionInfo() {
+        if (!this.connectionInfo) return null;
+        return { ...this.connectionInfo, ws: this.ws };
+      }
+      getPort() {
+        return this.port;
+      }
+      stop() {
+        return new Promise((resolve) => {
+          for (const [, pending] of this.pendingRequests) {
+            clearTimeout(pending.timer);
+            pending.reject(new Error("Client shutting down"));
+          }
+          this.pendingRequests.clear();
+          if (this.ws) {
+            this.ws.close();
+            this.ws = null;
+          }
+          resolve();
+        });
+      }
+    };
+  }
+});
 
 // src/memory/store.ts
 var store_exports = {};
@@ -1994,11 +2154,19 @@ __export(server_exports, {
 async function startMcpServer() {
   const config = loadConfig();
   await initMemoryStore();
-  wsServer = new DominusServer(config.port);
-  await wsServer.start();
+  const portTaken = await isPortInUse(config.port);
+  if (portTaken) {
+    const client = new DominusClient(config.port);
+    await client.connect();
+    bridge = client;
+  } else {
+    const server = new DominusServer(config.port);
+    await server.start();
+    bridge = server;
+  }
   const mcp = new McpServer({
     name: "dominus",
-    version: "0.1.0"
+    version: "0.2.0"
   });
   mcp.tool(
     "read_script",
@@ -2006,7 +2174,7 @@ async function startMcpServer() {
     { path: z.string().describe('Full instance path, e.g. "ServerScriptService.GameManager"') },
     async ({ path: path4 }) => {
       assertConnected();
-      const res = await wsServer.sendRequest(CliMsg.GET_SCRIPT, { path: path4 });
+      const res = await bridge.sendRequest(CliMsg.GET_SCRIPT, { path: path4 });
       return { content: [{ type: "text", text: JSON.stringify(res.payload, null, 2) }] };
     }
   );
@@ -2019,7 +2187,7 @@ async function startMcpServer() {
     },
     async ({ path: path4, source }) => {
       assertConnected();
-      const res = await wsServer.sendRequest(CliMsg.SET_SCRIPT, { path: path4, source });
+      const res = await bridge.sendRequest(CliMsg.SET_SCRIPT, { path: path4, source });
       return { content: [{ type: "text", text: JSON.stringify(res.payload) }] };
     }
   );
@@ -2029,7 +2197,7 @@ async function startMcpServer() {
     { code: z.string().describe("Luau code to execute") },
     async ({ code }) => {
       assertConnected();
-      const res = await wsServer.sendRequest(CliMsg.RUN_CODE, { code });
+      const res = await bridge.sendRequest(CliMsg.RUN_CODE, { code });
       return { content: [{ type: "text", text: JSON.stringify(res.payload, null, 2) }] };
     }
   );
@@ -2042,7 +2210,7 @@ async function startMcpServer() {
     },
     async ({ rootPath, maxDepth }) => {
       assertConnected();
-      const res = await wsServer.sendRequest(CliMsg.GET_EXPLORER, {
+      const res = await bridge.sendRequest(CliMsg.GET_EXPLORER, {
         rootPath: rootPath ?? null,
         maxDepth
       });
@@ -2055,7 +2223,7 @@ async function startMcpServer() {
     { path: z.string().describe("Full instance path") },
     async ({ path: path4 }) => {
       assertConnected();
-      const res = await wsServer.sendRequest(CliMsg.GET_PROPERTIES, { path: path4 });
+      const res = await bridge.sendRequest(CliMsg.GET_PROPERTIES, { path: path4 });
       return { content: [{ type: "text", text: JSON.stringify(res.payload, null, 2) }] };
     }
   );
@@ -2068,7 +2236,7 @@ async function startMcpServer() {
     },
     async ({ path: path4, properties }) => {
       assertConnected();
-      const res = await wsServer.sendRequest(CliMsg.SET_PROPERTIES, { path: path4, properties });
+      const res = await bridge.sendRequest(CliMsg.SET_PROPERTIES, { path: path4, properties });
       return { content: [{ type: "text", text: JSON.stringify(res.payload) }] };
     }
   );
@@ -2083,7 +2251,7 @@ async function startMcpServer() {
     },
     async ({ className, parentPath, name, properties }) => {
       assertConnected();
-      const res = await wsServer.sendRequest(CliMsg.INSERT_INSTANCE, {
+      const res = await bridge.sendRequest(CliMsg.INSERT_INSTANCE, {
         className,
         parentPath,
         name,
@@ -2098,7 +2266,7 @@ async function startMcpServer() {
     { path: z.string().describe("Full instance path to delete") },
     async ({ path: path4 }) => {
       assertConnected();
-      const res = await wsServer.sendRequest(CliMsg.DELETE_INSTANCE, { path: path4 });
+      const res = await bridge.sendRequest(CliMsg.DELETE_INSTANCE, { path: path4 });
       return { content: [{ type: "text", text: JSON.stringify(res.payload) }] };
     }
   );
@@ -2108,7 +2276,7 @@ async function startMcpServer() {
     {},
     async () => {
       assertConnected();
-      const res = await wsServer.sendRequest(CliMsg.GET_SELECTION, {});
+      const res = await bridge.sendRequest(CliMsg.GET_SELECTION, {});
       return { content: [{ type: "text", text: JSON.stringify(res.payload, null, 2) }] };
     }
   );
@@ -2121,7 +2289,7 @@ async function startMcpServer() {
     },
     async ({ query, maxResults }) => {
       assertConnected();
-      const res = await wsServer.sendRequest(CliMsg.SEARCH_SCRIPTS, { query, maxResults });
+      const res = await bridge.sendRequest(CliMsg.SEARCH_SCRIPTS, { query, maxResults });
       return { content: [{ type: "text", text: JSON.stringify(res.payload, null, 2) }] };
     }
   );
@@ -2134,7 +2302,7 @@ async function startMcpServer() {
     },
     async ({ limit, level }) => {
       assertConnected();
-      const res = await wsServer.sendRequest(CliMsg.GET_OUTPUT, {
+      const res = await bridge.sendRequest(CliMsg.GET_OUTPUT, {
         limit,
         level: level ?? null
       });
@@ -2147,7 +2315,7 @@ async function startMcpServer() {
     { className: z.string().describe('Roblox class name, e.g. "Frame", "TextLabel", "Part", "MeshPart"') },
     async ({ className }) => {
       assertConnected();
-      const res = await wsServer.sendRequest(CliMsg.GET_REFLECTION, { className });
+      const res = await bridge.sendRequest(CliMsg.GET_REFLECTION, { className });
       return { content: [{ type: "text", text: JSON.stringify(res.payload, null, 2) }] };
     }
   );
@@ -2162,7 +2330,7 @@ async function startMcpServer() {
     },
     async ({ parent, tree }) => {
       assertConnected();
-      const res = await wsServer.sendRequest(
+      const res = await bridge.sendRequest(
         CliMsg.BUILD_UI,
         { parent: parent ?? "StarterGui", tree }
       );
@@ -2175,7 +2343,7 @@ async function startMcpServer() {
     { testName: z.string().optional().describe("Specific test name, or omit to run all") },
     async ({ testName }) => {
       assertConnected();
-      const res = await wsServer.sendRequest(CliMsg.RUN_TESTS, {
+      const res = await bridge.sendRequest(CliMsg.RUN_TESTS, {
         testName: testName ?? null
       });
       return { content: [{ type: "text", text: JSON.stringify(res.payload, null, 2) }] };
@@ -2187,7 +2355,7 @@ async function startMcpServer() {
     { args: z.unknown().optional().describe("Arguments passed to the test session. Server scripts get this via StudioTestService:GetTestArgs()") },
     async ({ args }) => {
       assertConnected();
-      const res = await wsServer.sendRequest(CliMsg.EXECUTE_RUN_TEST, { args: args ?? null }, 12e4);
+      const res = await bridge.sendRequest(CliMsg.EXECUTE_RUN_TEST, { args: args ?? null }, 12e4);
       return { content: [{ type: "text", text: JSON.stringify(res.payload, null, 2) }] };
     }
   );
@@ -2197,7 +2365,7 @@ async function startMcpServer() {
     { args: z.unknown().optional().describe("Arguments passed to the test session. Server scripts get this via StudioTestService:GetTestArgs()") },
     async ({ args }) => {
       assertConnected();
-      const res = await wsServer.sendRequest(CliMsg.EXECUTE_PLAY_TEST, { args: args ?? null }, 12e4);
+      const res = await bridge.sendRequest(CliMsg.EXECUTE_PLAY_TEST, { args: args ?? null }, 12e4);
       return { content: [{ type: "text", text: JSON.stringify(res.payload, null, 2) }] };
     }
   );
@@ -2236,7 +2404,7 @@ async function startMcpServer() {
       if (params.canCollide !== void 0) properties.CanCollide = params.canCollide;
       if (params.shape && params.shape !== "Block") properties.Shape = params.shape;
       const className = params.shape === "Wedge" ? "WedgePart" : params.shape === "CornerWedge" ? "CornerWedgePart" : "Part";
-      const res = await wsServer.sendRequest(CliMsg.INSERT_INSTANCE, {
+      const res = await bridge.sendRequest(CliMsg.INSERT_INSTANCE, {
         className,
         parentPath: params.parent ?? "Workspace",
         name: params.name,
@@ -2275,7 +2443,7 @@ async function startMcpServer() {
         lines.push(`end`);
       }
       lines.push(`print("Cloned: " .. clone:GetFullName())`);
-      const res = await wsServer.sendRequest(CliMsg.RUN_CODE, { code: lines.join("\n") });
+      const res = await bridge.sendRequest(CliMsg.RUN_CODE, { code: lines.join("\n") });
       return { content: [{ type: "text", text: JSON.stringify(res.payload, null, 2) }] };
     }
   );
@@ -2308,7 +2476,7 @@ async function startMcpServer() {
         ...resolves.map((r) => `${r}.Parent = group`),
         `print("Grouped ${params.paths.length} instances into: " .. group:GetFullName())`
       ].join("\n");
-      const res = await wsServer.sendRequest(CliMsg.RUN_CODE, { code });
+      const res = await bridge.sendRequest(CliMsg.RUN_CODE, { code });
       return { content: [{ type: "text", text: JSON.stringify(res.payload, null, 2) }] };
     }
   );
@@ -2367,7 +2535,7 @@ async function startMcpServer() {
         lines.push(`${v}.Parent = ${groupName ? "_group" : resolveP(p.parent ?? "Workspace")}`);
       }
       lines.push(`print("Built ${parts.length} parts${groupName ? ` in ${groupName}` : ""}")`);
-      const res = await wsServer.sendRequest(CliMsg.RUN_CODE, { code: lines.join("\n") });
+      const res = await bridge.sendRequest(CliMsg.RUN_CODE, { code: lines.join("\n") });
       return { content: [{ type: "text", text: JSON.stringify(res.payload, null, 2) }] };
     }
   );
@@ -2403,16 +2571,16 @@ async function startMcpServer() {
     "studio://status",
     "studio://status",
     async () => {
-      const info = wsServer.getConnectionInfo();
+      const info = bridge.getConnectionInfo();
       return {
         contents: [{
           uri: "studio://status",
           text: JSON.stringify({
-            connected: wsServer.isConnected(),
+            connected: bridge.isConnected(),
             placeName: info?.placeName,
             placeId: info?.placeId,
             studioVersion: info?.studioVersion,
-            port: wsServer.getPort()
+            port: bridge.getPort()
           }, null, 2),
           mimeType: "application/json"
         }]
@@ -2423,16 +2591,17 @@ async function startMcpServer() {
   await mcp.connect(transport);
 }
 function assertConnected() {
-  if (!wsServer.isConnected()) {
+  if (!bridge.isConnected()) {
     throw new Error(
       "Roblox Studio is not connected. Open Studio and click the Dominus plugin Connect button."
     );
   }
 }
-var wsServer;
+var bridge;
 var init_server = __esm({
   "src/mcp/server.ts"() {
     init_ws_server();
+    init_ws_client();
     init_protocol();
     init_store();
     init_config();
@@ -3475,163 +3644,7 @@ var App = ({ server, agent: initialAgent, version }) => {
 
 // src/index.tsx
 init_ws_server();
-
-// src/transport/ws-client.ts
-init_protocol();
-var DominusClient = class extends EventEmitter {
-  ws = null;
-  port;
-  studioConnected = false;
-  connectionInfo = null;
-  pendingRequests = /* @__PURE__ */ new Map();
-  constructor(port = 18088) {
-    super();
-    this.port = port;
-  }
-  connect() {
-    return new Promise((resolve, reject) => {
-      const url = `ws://localhost:${this.port}`;
-      const ws = new WebSocket(url);
-      ws.on("open", () => {
-        this.ws = ws;
-        ws.send(serializeMessage(createMessage("controller:connect", {})));
-        this.emit("server:started", { port: this.port, relay: true });
-        resolve();
-      });
-      ws.on("message", (raw) => {
-        try {
-          const msg = parseMessage(raw.toString());
-          this.handleMessage(msg);
-        } catch (err) {
-          this.emit("server:error", err);
-        }
-      });
-      ws.on("close", () => {
-        this.ws = null;
-        this.studioConnected = false;
-        this.emit("studio:disconnected");
-        for (const [id, pending] of this.pendingRequests) {
-          clearTimeout(pending.timer);
-          pending.reject(new Error("Relay connection lost"));
-          this.pendingRequests.delete(id);
-        }
-      });
-      ws.on("error", (err) => {
-        if (!this.ws) reject(err);
-        this.emit("server:error", err);
-      });
-    });
-  }
-  handleMessage(msg) {
-    if (msg.type === "controller:welcome") {
-      const p = msg.payload;
-      this.studioConnected = p.studioConnected;
-      if (this.studioConnected) {
-        this.emit("studio:connected", {});
-      }
-      return;
-    }
-    if (msg.type === "studio:connected") {
-      this.studioConnected = true;
-      const payload = msg.payload;
-      this.connectionInfo = {
-        connectedAt: Date.now(),
-        studioVersion: payload.studioVersion,
-        placeId: payload.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");
-      return;
-    }
-    if (msg.type === StudioMsg.RESPONSE) {
-      const pending = this.pendingRequests.get(msg.id);
-      if (pending) {
-        clearTimeout(pending.timer);
-        pending.resolve(msg);
-        this.pendingRequests.delete(msg.id);
-      }
-      return;
-    }
-    this.emit(msg.type, msg.payload);
-    this.emit("message", msg);
-  }
-  sendRequest(type, payload, timeoutMs = 1e4) {
-    return new Promise((resolve, reject) => {
-      if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
-        reject(new Error("Not connected to Dominus server"));
-        return;
-      }
-      if (!this.studioConnected) {
-        reject(new Error("Studio not connected"));
-        return;
-      }
-      const msg = createMessage(type, payload);
-      const timer = setTimeout(() => {
-        this.pendingRequests.delete(msg.id);
-        reject(new Error(`Request timed out: ${type}`));
-      }, timeoutMs);
-      this.pendingRequests.set(msg.id, {
-        resolve,
-        reject,
-        timer
-      });
-      this.ws.send(serializeMessage(msg));
-    });
-  }
-  sendNotification(type, payload) {
-    if (!this.ws || this.ws.readyState !== WebSocket.OPEN) return;
-    const msg = createMessage(type, payload);
-    this.ws.send(serializeMessage(msg));
-  }
-  isConnected() {
-    return this.studioConnected;
-  }
-  getConnectionInfo() {
-    if (!this.connectionInfo) return null;
-    return { ...this.connectionInfo, ws: this.ws };
-  }
-  getPort() {
-    return this.port;
-  }
-  stop() {
-    return new Promise((resolve) => {
-      for (const [, pending] of this.pendingRequests) {
-        clearTimeout(pending.timer);
-        pending.reject(new Error("Client shutting down"));
-      }
-      this.pendingRequests.clear();
-      if (this.ws) {
-        this.ws.close();
-        this.ws = null;
-      }
-      resolve();
-    });
-  }
-};
-async function isPortInUse(port) {
-  return new Promise((resolve) => {
-    const ws = new WebSocket(`ws://localhost:${port}`);
-    const timer = setTimeout(() => {
-      ws.close();
-      resolve(false);
-    }, 1e3);
-    ws.on("open", () => {
-      clearTimeout(timer);
-      ws.close();
-      resolve(true);
-    });
-    ws.on("error", () => {
-      clearTimeout(timer);
-      resolve(false);
-    });
-  });
-}
+init_ws_client();
 
 // src/ai/provider.ts
 init_config();
@@ -4293,7 +4306,7 @@ function createDefaultRegistry() {
 // src/index.tsx
 init_store();
 init_config();
-var VERSION = "0.1.0";
+var VERSION = "0.2.0";
 var program = new Command();
 program.name("dominus").description("AI-powered autonomous agent for Roblox Studio development").version(VERSION);
 program.command("start", { isDefault: true }).description("Launch the Dominus TUI agent").option("-p, --port <port>", "WebSocket server port", "18088").action(async (opts) => {