kill-switch-mcp 1.2.2 → 1.2.4

package/dist/server.js

@@ -150,7 +150,7 @@ class BotSDK {
         const status = await this.checkBotStatus();
         const shouldLaunch = this.shouldLaunchBrowser(status);
         if (shouldLaunch) {
-          console.log(`[BotSDK] Launching browser...`);
+          console.error(`[BotSDK] Launching browser...`);
           this.browserLaunched = true;
           await this.launchBrowser();
           await this.waitForBotConnection();
@@ -212,7 +212,7 @@ class BotSDK {
               this.browserLaunched = false;
             }
             this.waitForReady(15000).then(() => {
-              console.log("[BotSDK] Connected and game state ready");
+              console.error("[BotSDK] Connected and game state ready");
               resolve();
             }).catch((error) => {
               console.warn("[BotSDK] Connected but game state not ready:", error.message);
@@ -246,21 +246,21 @@ class BotSDK {
   }
   scheduleReconnect() {
     if (this.reconnectAttempt >= this.config.reconnectMaxRetries) {
-      console.log(`[BotSDK] Max reconnection attempts (${this.config.reconnectMaxRetries}) reached, giving up`);
+      console.error(`[BotSDK] Max reconnection attempts (${this.config.reconnectMaxRetries}) reached, giving up`);
       this.setConnectionState("disconnected");
       return;
     }
     this.reconnectAttempt++;
     this.setConnectionState("reconnecting", this.reconnectAttempt);
     const delay = Math.min(this.config.reconnectBaseDelay * Math.pow(2, this.reconnectAttempt - 1), this.config.reconnectMaxDelay);
-    console.log(`[BotSDK] Reconnecting in ${delay}ms (attempt ${this.reconnectAttempt})`);
+    console.error(`[BotSDK] Reconnecting in ${delay}ms (attempt ${this.reconnectAttempt})`);
     this.reconnectTimer = setTimeout(async () => {
       this.reconnectTimer = null;
       try {
         await this.connect();
-        console.log(`[BotSDK] Reconnected successfully after ${this.reconnectAttempt} attempt(s)`);
+        console.error(`[BotSDK] Reconnected successfully after ${this.reconnectAttempt} attempt(s)`);
       } catch (e) {
-        console.log(`[BotSDK] Reconnection attempt ${this.reconnectAttempt} failed`);
+        console.error(`[BotSDK] Reconnection attempt ${this.reconnectAttempt} failed`);
       }
     }, delay);
   }
@@ -304,17 +304,17 @@ class BotSDK {
   async checkBotStatus() {
     const statusUrl = this.getStatusUrl();
     try {
-      console.log(`[BotSDK] Checking bot status via URL: ${statusUrl}`);
+      console.error(`[BotSDK] Checking bot status via URL: ${statusUrl}`);
       const response = await fetch(statusUrl);
       if (!response.ok) {
-        console.log(`[BotSDK] Status check HTTP error: ${response.status} ${response.statusText} (URL: ${statusUrl})`);
+        console.error(`[BotSDK] Status check HTTP error: ${response.status} ${response.statusText} (URL: ${statusUrl})`);
         throw new Error(`Status check failed: ${response.status}`);
       }
       const data = await response.json();
       return data;
     } catch (error) {
       const errorMsg = error instanceof Error ? error.message : String(error);
-      console.log(`[BotSDK] Status check failed: ${errorMsg} (URL: ${statusUrl})`);
+      console.error(`[BotSDK] Status check failed: ${errorMsg} (URL: ${statusUrl})`);
       return {
         status: "dead",
         inGame: false,
@@ -334,15 +334,15 @@ class BotSDK {
       return false;
     }
     if (status.status === "dead") {
-      console.log(`[BotSDK] Bot not connected`);
+      console.error(`[BotSDK] Bot not connected`);
       return true;
     }
-    console.log(`[BotSDK] Active client detected, skipping browser launch`);
+    console.error(`[BotSDK] Active client detected, skipping browser launch`);
     return false;
   }
   async launchBrowser() {
     const url = this.buildClientUrl();
-    console.log(`[BotSDK] Opening browser: ${url}`);
+    console.error(`[BotSDK] Opening browser: ${url}`);
     const { exec } = await import("child_process");
     const command = process.platform === "darwin" ? `open "${url}"` : process.platform === "win32" ? `start "" "${url}"` : `xdg-open "${url}"`;
     return new Promise((resolve, reject) => {
@@ -360,14 +360,14 @@ class BotSDK {
     const startTime = Date.now();
     const pollInterval = 500;
     let attemptCount = 0;
-    console.log(`[BotSDK] Waiting for bot to connect and load game (timeout: ${timeoutMs}ms)...`);
+    console.error(`[BotSDK] Waiting for bot to connect and load game (timeout: ${timeoutMs}ms)...`);
     while (Date.now() - startTime < timeoutMs) {
       attemptCount++;
       const elapsed = Date.now() - startTime;
       const status = await this.checkBotStatus();
-      console.log(`[BotSDK] Poll attempt ${attemptCount} (${elapsed}ms): status="${status.status}", inGame=${status.inGame}, controllers=${status.controllers.length}, observers=${status.observers.length}`);
+      console.error(`[BotSDK] Poll attempt ${attemptCount} (${elapsed}ms): status="${status.status}", inGame=${status.inGame}, controllers=${status.controllers.length}, observers=${status.observers.length}`);
       if (status.status !== "dead" && status.inGame) {
-        console.log(`[BotSDK] Bot connected and in-game!`);
+        console.error(`[BotSDK] Bot connected and in-game!`);
         return;
       }
       await new Promise((resolve) => setTimeout(resolve, pollInterval));
@@ -402,7 +402,7 @@ class BotSDK {
       username: this.config.botUsername,
       password: this.config.password
     }));
-    console.log(`[BotSDK] Sent login command for ${this.config.botUsername} through gateway`);
+    console.error(`[BotSDK] Sent login command for ${this.config.botUsername} through gateway`);
   }
   async waitForConnection(timeout = 60000) {
     if (this.isConnected()) {
@@ -573,7 +573,7 @@ class BotSDK {
   }
   async sendAction(action) {
     if (this.connectionState === "reconnecting") {
-      console.log(`[BotSDK] Waiting for reconnection before sending action: ${action.type}`);
+      console.error(`[BotSDK] Waiting for reconnection before sending action: ${action.type}`);
       await this.waitForConnection();
     }
     if (!this.isConnected()) {
@@ -723,7 +723,7 @@ class BotSDK {
   }
   async sendScreenshot(timeout = 1e4) {
     if (this.connectionState === "reconnecting") {
-      console.log(`[BotSDK] Waiting for reconnection before requesting screenshot`);
+      console.error(`[BotSDK] Waiting for reconnection before requesting screenshot`);
       await this.waitForConnection();
     }
     if (!this.isConnected()) {
@@ -765,22 +765,22 @@ class BotSDK {
     return this.findPath(destX, destZ, maxWaypoints);
   }
   async waitForReady(timeout = 15000) {
-    console.log("[BotSDK] Waiting for game state to be ready...");
+    console.error("[BotSDK] Waiting for game state to be ready...");
     try {
       const state = await this.waitForCondition((s) => {
         const validPosition = !!(s.player && s.player.worldX !== 0 && s.player.worldZ !== 0);
         const inGame = s.inGame;
         const hasEntities = s.nearbyNpcs.length > 0 || s.nearbyLocs.length > 0 || s.groundItems.length > 0;
         if (!validPosition) {
-          console.log(`[BotSDK] Waiting - invalid position: (${s.player?.worldX}, ${s.player?.worldZ})`);
+          console.error(`[BotSDK] Waiting - invalid position: (${s.player?.worldX}, ${s.player?.worldZ})`);
         } else if (!inGame) {
-          console.log("[BotSDK] Waiting - not in game");
+          console.error("[BotSDK] Waiting - not in game");
         } else if (!hasEntities) {
-          console.log("[BotSDK] Waiting - no entities loaded yet");
+          console.error("[BotSDK] Waiting - no entities loaded yet");
         }
         return inGame && validPosition && hasEntities;
       }, timeout);
-      console.log("[BotSDK] Game state ready!");
+      console.error("[BotSDK] Game state ready!");
       return state;
     } catch (error) {
       console.error("[BotSDK] Timeout waiting for game state to be ready");
@@ -1721,7 +1721,7 @@ class BotActions {
         if (!blockedDoors.has(key)) {
           blockedDoors.add(key);
           blockDoor(level, nearest.x, nearest.z);
-          console.log(`[walkTo] Blocked impassable door at (${nearest.x}, ${nearest.z}) — re-routing`);
+          console.error(`[walkTo] Blocked impassable door at (${nearest.x}, ${nearest.z}) — re-routing`);
         }
       }
       return false;
@@ -1761,7 +1761,7 @@ class BotActions {
                     blockedDoors.add(doorKey);
                     blockDoor(door.level, door.x, door.z);
                     requiredDoorKeys.delete(doorKey);
-                    console.log(`[walkTo] Blocked impassable door at (${door.x}, ${door.z}) — re-routing`);
+                    console.error(`[walkTo] Blocked impassable door at (${door.x}, ${door.z}) — re-routing`);
                     break;
                   }
                   break;
@@ -3834,10 +3834,6 @@ var SERVER_URL = (() => {
     return process.argv[idx + 1];
   return process.env.KILL_SWITCH_SERVER || "localhost";
 })();
-function getWebBase() {
-  const isLocal = SERVER_URL === "localhost" || SERVER_URL === "127.0.0.1";
-  return isLocal ? "http://localhost:8888" : `https://${SERVER_URL}`;
-}
 var ERC20_ABI = [
   {
     name: "approve",
@@ -4000,14 +3996,6 @@ function saveAccessKey(privateKey, accountAddress) {
     createdAt: new Date().toISOString()
   });
 }
-async function getTournamentSchedule() {
-  const res = await fetch(`${getWebBase()}/api/paid-schedule`);
-  const data = await res.json();
-  if (data.error) {
-    throw new Error(data.error);
-  }
-  return data.slots || [];
-}
 async function joinTournament(tournamentAddress, username) {
   const wallet = loadWallet();
   if (!wallet) {
@@ -4084,7 +4072,7 @@ YOU are the brain of your bot. Your human talks strategy, you execute it in the
 ## Quick Start
 
 1. \`login\` — connects to the game (creates account if needed)
-2. \`join_game\` with mode \`"shorty"\` — queues you up
+2. \`join_game\` — shows available games and buy-in tiers, or joins an existing queued game
 3. \`wait_for_game_start\` — blocks until teleported to the arena
 4. \`execute_code\` — fight! Use \`bot\`, \`sdk\`, and \`actions\` globals.
 
@@ -4092,18 +4080,25 @@ Before writing any execute_code, read \`killswitch://sdk-reference\` for the com
 
 ---
 
-## Game Modes
+## Joining a Game
+
+Call \`join_game\` with no arguments to see what's available:
+- **If a game is queued**: You'll see the current game's buy-in and player count. You can only join that game.
+- **If no game is queued**: You'll see all available buy-in tiers (Free, $5, $15, $50, $100, $1000). Call \`join_game\` with a \`tier_id\` to start a new game.
+- **If a game is active**: You must wait for it to finish.
+
+**Paid games** require a Tempo wallet (\`setup_game_wallet\`). Your buy-in is deposited on-chain when you join. No refunds once deposited — the only refund path is if the game is cancelled (not enough players).
+
+**Game start triggers:**
+- 12 players join → starts immediately
+- 2+ players joined and 5-minute countdown expires → starts with whoever joined
+- Only 1 player after 30 minutes → game cancelled (refunded if paid)
 
-### Shorty (Quick Battle Royale)
-- **Arena**: Draynor Manor fenced grounds
+### The Arena
 - **Stats**: 50 Attack, 50 Strength, 50 Defence, 99 Hitpoints
 - **Start**: Empty inventory — everything comes from ground loot
 - **Win condition**: Last agent alive
 
-### Longy (Coming Soon)
-- Large map: Falador to Port Sarim
-- Level 1 everything — skill up, craft gear, fish food, outlast everyone
-
 ---
 
 ## The Arena (Shorty)
@@ -4482,17 +4477,15 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
       },
       {
         name: "join_game",
-        description: "Join a game mode queue. Call after login. After joining, call wait_for_game_start.",
+        description: "Join an available game. Call with no arguments to see what's available, or provide tier_id to join a specific buy-in tier. For paid games, handles deposit automatically. After joining, call wait_for_game_start.",
         inputSchema: {
           type: "object",
           properties: {
-            mode: {
-              type: "string",
-              enum: ["shorty", "longy"],
-              description: 'Game mode: "shorty" (quick battle royale) or "longy" (coming soon)'
+            tier_id: {
+              type: "number",
+              description: "Tier ID to join (from available tiers list). Only needed when starting a new game — omit to join an existing queued game."
             }
-          },
-          required: ["mode"]
+          }
         }
       },
       {
@@ -4524,28 +4517,6 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
           type: "object",
           properties: {}
         }
-      },
-      {
-        name: "tournament_schedule",
-        description: "View upcoming paid tournaments — start times, buy-ins, player counts. Read-only.",
-        inputSchema: {
-          type: "object",
-          properties: {}
-        }
-      },
-      {
-        name: "join_tournament",
-        description: "Join a paid tournament by depositing buy-in from game wallet. SPENDS REAL MONEY. Confirm with user before calling. Must be logged in.",
-        inputSchema: {
-          type: "object",
-          properties: {
-            tournament_address: {
-              type: "string",
-              description: "Tournament contract address (from tournament_schedule)"
-            }
-          },
-          required: ["tournament_address"]
-        }
       }
     ]
   };
@@ -4981,29 +4952,84 @@ server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
         if (!connection) {
           return errorResponse("Not connected. Call login first.");
         }
-        const mode = args?.mode;
-        if (!mode || !["shorty", "longy"].includes(mode)) {
-          return errorResponse('mode must be "shorty" or "longy"');
-        }
         const isLocal = SERVER_URL2 === "localhost" || SERVER_URL2 === "127.0.0.1";
         const webBase = isLocal ? `http://localhost:8888` : `https://${SERVER_URL2}`;
-        const apiUrl = `${webBase}/api/join-game?username=${encodeURIComponent(activeBotName)}&mode=${encodeURIComponent(mode)}`;
+        const availRes = await fetch(`${webBase}/api/game/available`);
+        const available = await availRes.json();
+        if (available.status === "active") {
+          return errorResponse(`A game is currently in progress with ${available.player_count} player(s) remaining. Try again when it finishes.`);
+        }
+        const tierId = args?.tier_id;
+        if (available.status === "open" && !tierId) {
+          const tiers = available.tiers;
+          const lines = [
+            "No game currently queued. Available buy-in tiers:",
+            "",
+            ...tiers.map((t) => `  [${t.tier_id}] ${t.label} — $${(t.buy_in / 100).toFixed(2)} buy-in (max ${t.max_players} players)`),
+            "",
+            "Call join_game again with tier_id to start a game."
+          ];
+          return { content: [{ type: "text", text: lines.join(`
+`) }] };
+        }
         try {
-          const res = await fetch(apiUrl, { method: "POST" });
-          const data = await res.json();
-          if (data.error) {
-            return errorResponse(data.error);
+          const joinUrl = `${webBase}/api/game/join?username=${encodeURIComponent(activeBotName)}&tier_id=${tierId ?? ""}`;
+          const joinRes = await fetch(joinUrl, { method: "POST" });
+          const joinData = await joinRes.json();
+          if (joinData.error) {
+            return errorResponse(joinData.error);
+          }
+          if (joinData.contract_address && joinData.player_count === 0) {
+            if (!hasGameWallet()) {
+              return errorResponse("This is a paid game but no game wallet found. Run setup_game_wallet first.");
+            }
+            try {
+              const result = await joinTournament(joinData.contract_address, activeBotName);
+              const parts2 = [
+                `Joined game ${joinData.game_id} (paid).`,
+                `Buy-in deposited: $${result.amount} USDC`,
+                `Transaction: ${result.txHash}`,
+                `Players: waiting for more...`,
+                "",
+                "Once deposited, you cannot leave or get a refund (unless the game is cancelled).",
+                "Next: call wait_for_game_start to wait for the match."
+              ];
+              return { content: [{ type: "text", text: parts2.join(`
+`) }] };
+            } catch (e) {
+              return errorResponse(`Failed to deposit: ${e.message}`);
+            }
+          }
+          if (joinData.contract_address && joinData.player_count > 0) {
+            if (!hasGameWallet()) {
+              return errorResponse("This is a paid game but no game wallet found. Run setup_game_wallet first.");
+            }
+            try {
+              const result = await joinTournament(joinData.contract_address, activeBotName);
+              const parts2 = [
+                `Joined game ${joinData.game_id} (paid).`,
+                `Buy-in deposited: $${result.amount} USDC`,
+                `Players: ${joinData.player_count}/${joinData.max_players}`,
+                "",
+                "Once deposited, you cannot leave or get a refund (unless the game is cancelled).",
+                "Next: call wait_for_game_start to wait for the match."
+              ];
+              return { content: [{ type: "text", text: parts2.join(`
+`) }] };
+            } catch (e) {
+              return errorResponse(`Failed to deposit: ${e.message}`);
+            }
           }
           const parts = [
-            `Joined ${mode.toUpperCase()} queue.`,
-            `Players in queue: ${data.queuePlayers?.join(", ") || "just you"}`,
+            `Joined game ${joinData.game_id} (free).`,
+            `Players: ${joinData.player_count}/${joinData.max_players}`,
             "",
             "Next: call wait_for_game_start to wait for the match."
           ];
           return { content: [{ type: "text", text: parts.join(`
 `) }] };
         } catch (e) {
-          return errorResponse(`Failed to join game: ${e.message}. Is the game server running?`);
+          return errorResponse(`Failed to join game: ${e.message}`);
         }
       }
       case "disconnect_bot": {
@@ -5087,7 +5113,7 @@ Prerequisites:
                 `Account: ${info.address}`,
                 `USDC Balance: $${info.balance}`,
                 "",
-                info.balanceRaw === 0n ? "Your wallet is empty. Fund it by sending USDC to your account address on the Tempo network." : "Your wallet is funded and ready for paid tournaments. Use tournament_schedule to see upcoming games."
+                info.balanceRaw === 0n ? "Your wallet is empty. Fund it by sending USDC to your account address on the Tempo network." : "Your wallet is funded and ready for paid games. Use join_game to see available tiers."
               ].join(`
 `)
             }]
@@ -5096,70 +5122,6 @@ Prerequisites:
           return errorResponse(`Failed to check wallet: ${e.message}`);
         }
       }
-      case "tournament_schedule": {
-        try {
-          const slots = await getTournamentSchedule();
-          if (slots.length === 0) {
-            return {
-              content: [{
-                type: "text",
-                text: "No upcoming paid tournaments scheduled. Check back later, or paid tournaments may not be enabled on this server."
-              }]
-            };
-          }
-          const lines = ["── Upcoming Paid Tournaments ──", ""];
-          for (let i = 0;i < slots.length; i++) {
-            const s = slots[i];
-            const time = new Date(s.startTime).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" });
-            const buyIn = (parseInt(s.buyIn) / 1e6).toFixed(2);
-            lines.push(`[${i + 1}] ${time} — $${buyIn} buy-in — ${s.depositorCount}/${s.maxPlayers} players`);
-            lines.push(`    Contract: ${s.contractAddress}`);
-          }
-          lines.push("");
-          lines.push("To join a tournament, use join_tournament with the contract address.");
-          lines.push("Make sure you have enough USDC in your game wallet (check with check_wallet).");
-          return { content: [{ type: "text", text: lines.join(`
-`) }] };
-        } catch (e) {
-          return errorResponse(`Failed to get tournament schedule: ${e.message}`);
-        }
-      }
-      case "join_tournament": {
-        const tournamentAddress = args?.tournament_address;
-        if (!tournamentAddress || !tournamentAddress.startsWith("0x")) {
-          return errorResponse("A valid tournament contract address (0x...) is required. Use tournament_schedule to find one.");
-        }
-        if (!hasGameWallet()) {
-          return errorResponse("No game wallet found. Run setup_game_wallet first.");
-        }
-        if (!activeBotName) {
-          return errorResponse("Not logged in. Call login first so we know your in-game username.");
-        }
-        try {
-          const result = await joinTournament(tournamentAddress, activeBotName);
-          return {
-            content: [{
-              type: "text",
-              text: [
-                "Tournament joined!",
-                "",
-                `Buy-in: $${result.amount} USDC`,
-                `Transaction: ${result.txHash}`,
-                `Username: ${activeBotName}`,
-                "",
-                "Your deposit is held in the tournament escrow contract.",
-                "Be online when the match starts or you'll be eliminated (buy-in stays in the pot).",
-                "",
-                "If the match is cancelled (< 2 players), you'll get a full refund.",
-                "If the server goes down, you can claim a refund after 1 hour."
-              ].join(`
-`)
-            }]
-          };
-        } catch (e) {
-          return errorResponse(`Failed to join tournament: ${e.message}`);
-        }
-      }
       default:
         throw new Error(`Unknown tool: ${name}`);
     }
@@ -5185,6 +5147,9 @@ function errorResponse(message) {
     isError: true
   };
 }
+process.on("unhandledRejection", (reason) => {
+  console.error("[Kill Switch MCP] Unhandled rejection (suppressed):", reason instanceof Error ? reason.message : reason);
+});
 async function main() {
   console.error("[Kill Switch MCP] Starting Kill Switch MCP server v3.0...");
   console.error(`[Kill Switch MCP] Game server: ${SERVER_URL2}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kill-switch-mcp",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "Kill Switch MCP Server — AI battle royale powered by Claude Code",
   "type": "module",
   "bin": {