@dolusoft/claude-collab 1.8.1 → 1.8.3

package/dist/cli.js

@@ -704,10 +704,17 @@ var HubManager = class {
     server.start(port);
     this.hubServer = server;
     this.currentPort = port;
-    await addFirewallRule(port);
     const advertiser = new MdnsAdvertiser();
     advertiser.start(port);
     this.advertiser = advertiser;
+    let firewallAdded = false;
+    try {
+      await addFirewallRule(port);
+      firewallAdded = true;
+    } catch (err) {
+      console.error("[hub-manager] firewall rule failed:", err);
+    }
+    return { firewallAdded };
   }
   async stop() {
     if (!this.isRunning) throw new Error("Hub is not running");
@@ -719,34 +726,51 @@ var HubManager = class {
     this.hubServer.stop();
     this.hubServer = null;
     this.currentPort = null;
-    await removeFirewallRule(port);
+    let firewallRemoved = false;
+    try {
+      await removeFirewallRule(port);
+      firewallRemoved = true;
+    } catch (err) {
+      console.error("[hub-manager] firewall rule removal failed:", err);
+    }
+    return { firewallRemoved };
   }
 };
-function runElevated(netshArgs) {
+function runElevated(argArray) {
+  const argList = argArray.map((a) => `"${a}"`).join(",");
+  const psCommand = `Start-Process -FilePath "netsh" -ArgumentList @(${argList}) -Verb RunAs -Wait`;
   return new Promise((resolve, reject) => {
-    const ps = spawn("powershell", [
-      "-NoProfile",
-      "-Command",
-      `Start-Process -FilePath "netsh" -ArgumentList "${netshArgs}" -Verb RunAs -Wait`
-    ]);
+    const ps = spawn("powershell", ["-NoProfile", "-Command", psCommand]);
     ps.on("close", (code) => {
       if (code === 0) resolve();
-      else reject(new Error(`Firewall command failed (exit code ${code}). User may have cancelled the UAC prompt.`));
+      else reject(new Error(`Firewall UAC prompt was cancelled or denied (exit code ${code}).`));
     });
     ps.on("error", (err) => {
-      reject(new Error(`Failed to launch PowerShell for firewall elevation: ${err.message}`));
+      reject(new Error(`Failed to launch PowerShell: ${err.message}`));
     });
   });
 }
 async function addFirewallRule(port) {
-  await runElevated(
-    `advfirewall firewall add rule name="claude-collab-${port}" protocol=TCP dir=in localport=${port} action=allow`
-  );
+  await runElevated([
+    "advfirewall",
+    "firewall",
+    "add",
+    "rule",
+    `name=claude-collab-${port}`,
+    "protocol=TCP",
+    "dir=in",
+    `localport=${port}`,
+    "action=allow"
+  ]);
 }
 async function removeFirewallRule(port) {
-  await runElevated(
-    `advfirewall firewall delete rule name="claude-collab-${port}"`
-  );
+  await runElevated([
+    "advfirewall",
+    "firewall",
+    "delete",
+    "rule",
+    `name=claude-collab-${port}`
+  ]);
 }
 var askSchema = {
   peer: z.string().describe('Name of the peer to ask (e.g., "alice", "backend")'),
@@ -923,15 +947,14 @@ function registerStartHubTool(server, client, hubManager) {
           }]
         };
       }
+      let firewallAdded = false;
       try {
-        await hubManager.start(port);
+        const result = await hubManager.start(port);
+        firewallAdded = result.firewallAdded;
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
         return {
-          content: [{
-            type: "text",
-            text: `Failed to start hub: ${msg}`
-          }]
+          content: [{ type: "text", text: `Failed to start hub: ${msg}` }]
         };
       }
       try {
@@ -939,22 +962,17 @@ function registerStartHubTool(server, client, hubManager) {
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
         return {
-          content: [{
-            type: "text",
-            text: `Hub started on port ${port}, but failed to self-connect: ${msg}`
-          }]
+          content: [{ type: "text", text: `Hub started on port ${port}, but failed to self-connect: ${msg}` }]
         };
       }
+      const lines = [
+        `Hub started on port ${port}.`,
+        firewallAdded ? `Firewall rule added (claude-collab-${port}) \u2014 LAN peers can connect.` : `WARNING: Firewall rule could not be added (UAC was cancelled or denied). Peers on other machines may be blocked by Windows Firewall. Run start_hub again and accept the UAC prompt to fix this.`,
+        `Others on the LAN will auto-discover and connect via mDNS.`,
+        `Use stop_hub when you are done.`
+      ];
       return {
-        content: [{
-          type: "text",
-          text: [
-            `Hub started on port ${port}.`,
-            `Firewall rule added (claude-collab-${port}).`,
-            `Others on the LAN will auto-discover and connect \u2014 no IP sharing needed.`,
-            `Use stop_hub when you are done to close the hub and remove the firewall rule.`
-          ].join("\n")
-        }]
+        content: [{ type: "text", text: lines.join("\n") }]
       };
     }
   );
@@ -976,26 +994,23 @@ function registerStopHubTool(server, hubManager) {
         };
       }
       const port = hubManager.port;
+      let firewallRemoved = false;
       try {
-        await hubManager.stop();
+        const result = await hubManager.stop();
+        firewallRemoved = result.firewallRemoved;
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
         return {
-          content: [{
-            type: "text",
-            text: `Failed to stop hub: ${msg}`
-          }]
+          content: [{ type: "text", text: `Failed to stop hub: ${msg}` }]
         };
       }
+      const lines = [
+        `Hub stopped (was on port ${port}).`,
+        firewallRemoved ? `Firewall rule removed (claude-collab-${port}).` : `WARNING: Firewall rule could not be removed (UAC was cancelled). Remove it manually: netsh advfirewall firewall delete rule name="claude-collab-${port}"`,
+        `All peers have been disconnected.`
+      ];
       return {
-        content: [{
-          type: "text",
-          text: [
-            `Hub stopped (was on port ${port}).`,
-            `Firewall rule removed (claude-collab-${port}).`,
-            `All peers have been disconnected.`
-          ].join("\n")
-        }]
+        content: [{ type: "text", text: lines.join("\n") }]
       };
     }
   );
@@ -1021,6 +1036,37 @@ async function startMcpServer(options) {
   const transport = new StdioServerTransport();
   await server.connect(transport);
 }
+var SERVICE_TYPE2 = "claude-collab";
+function discoverHub(timeoutMs = 5e3) {
+  return new Promise((resolve) => {
+    const bonjour = new Bonjour();
+    const browser = bonjour.find({ type: SERVICE_TYPE2 });
+    let settled = false;
+    const finish = (result) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      browser.stop();
+      bonjour.destroy();
+      resolve(result);
+    };
+    const timer = setTimeout(() => finish(null), timeoutMs);
+    browser.on("up", (svc) => {
+      finish({ host: svc.host, port: svc.port });
+    });
+  });
+}
+function watchForHub(onFound) {
+  const bonjour = new Bonjour();
+  const browser = bonjour.find({ type: SERVICE_TYPE2 });
+  browser.on("up", (svc) => {
+    onFound({ host: svc.host, port: svc.port });
+  });
+  return () => {
+    browser.stop();
+    bonjour.destroy();
+  };
+}
 
 // src/cli.ts
 var program = new Command();
@@ -1039,19 +1085,42 @@ program.name("claude-collab").description("P2P collaboration between Claude Code
     });
   } else {
     if (!options.name) {
-      console.error("--name is required in client mode");
+      console.error("--name is required");
       process.exit(1);
     }
-    if (!options.server) {
-      console.error("--server is required in client mode (e.g. --server 192.168.1.5:9999)");
-      process.exit(1);
-    }
-    const url = options.server.startsWith("ws") ? options.server : `ws://${options.server}`;
     const client = new HubClient();
     const hubManager = new HubManager();
-    client.setServerUrl(url);
-    await client.join(options.name, options.name);
-    await startMcpServer({ client, hubManager });
+    if (options.server) {
+      const url = options.server.startsWith("ws") ? options.server : `ws://${options.server}`;
+      client.setServerUrl(url);
+      await client.join(options.name, options.name);
+    } else {
+      await client.join(options.name, options.name);
+    }
+    const mcpReady = startMcpServer({ client, hubManager });
+    if (!options.server) {
+      discoverHub(5e3).then(async (hub) => {
+        if (!hub || client.isConnected) return;
+        try {
+          await client.connectToHub(`ws://${hub.host}:${hub.port}`);
+        } catch {
+        }
+      });
+      const stopWatch = watchForHub(async (hub) => {
+        if (client.isConnected) {
+          stopWatch();
+          return;
+        }
+        try {
+          await client.connectToHub(`ws://${hub.host}:${hub.port}`);
+          stopWatch();
+        } catch (err) {
+          const msg = err instanceof Error ? err.message : String(err);
+          console.error(`[cli] auto-connect failed: ${msg}`);
+        }
+      });
+    }
+    await mcpReady;
   }
 });
 program.parse();