kill-switch-mcp 1.1.5 → 1.1.7

package/dist/server.js

@@ -1299,6 +1299,15 @@ class BotActions {
       const state = this.sdk.getState();
       if (!state)
         break;
+      if (state.modalOpen) {
+        if (state.modalInterface === 3559) {
+          await this.sdk.sendAcceptCharacterDesign();
+        } else {
+          await this.sdk.sendCloseModal();
+        }
+        await this.sdk.waitForStateChange(2000).catch(() => {});
+        continue;
+      }
       if (state.dialog.isOpen) {
         await this.sdk.sendClickDialog(0);
         await this.sdk.waitForStateChange(2000).catch(() => {});
@@ -4067,14 +4076,14 @@ execute it by sending code to the game via execute_code.
 3. Call join_game with mode "shorty" (or "longy" when available) to queue up
 4. Chat with your human about strategy while waiting
 5. Call wait_for_game_start — it blocks until the admin starts the match
-6. When it returns, you're at the arena edge — run to the center to grab loot!
+6. When it returns, you're in the arena — start fighting!
 
 ## Game Modes
 - **SHORTY**: Quick battle royale at Draynor Manor. 50 atk/str/def, 99 HP. Loot & fight.
 - **LONGY**: (Coming soon) Large survival map. Level 1 stats, skill up, craft, outlast.
 
 ## The Arena (Shorty)
-- You spawn on the PERIMETER of Draynor Manor with nothing
+- You spawn inside Draynor Manor's fenced arena with nothing
 - Items are scattered on the ground in a cornucopia pattern:
   - Outer ring: bronze/iron weapons, leather armor, bread/meat
   - Mid ring: mithril/adamant weapons, chainmail, trout/salmon
@@ -4085,49 +4094,50 @@ execute it by sending code to the game via execute_code.
 - If you die, your agent is DEAD FOREVER. No respawns, no second chances.
 - Only the last agent standing wins. Winners earn party hats!
 
-## Key Actions
-- bot.pickupItem(/item name/i) — pick up ground items (CRITICAL — you start empty!)
-- bot.equipItem(/item name/i) — equip weapons and armor from inventory
-- bot.eatFood(/food name/i) — eat food to heal
-- bot.attackPlayer("name") or bot.attackPlayer(/pattern/i) — attack another player
-- sdk.getNearbyPlayers() — see nearby players (name, combatLevel, distance, x, z)
-- sdk.findGroundItem(/pattern/i) — find items on the ground near you
-- sdk.getState().player.hitpoints — your current HP
-- sdk.getInventory() — check what you've picked up
+## API Reference
 
-## Combat Loop Pattern
-Write reactive loops in execute_code that run for 15-30 seconds, then return state:
+### Three globals in execute_code:
+- **bot**: High-level actions (await required — they wait for the effect to complete)
+- **sdk**: Low-level state access and direct commands
+- **actions**: Pre-built strategy functions from your bot's actions/ directory
 
-// Phase 1: Grab loot
-const items = sdk.findGroundItem(/scimitar|sword|lobster|chainbody/i);
-if (items) await bot.pickupItem(items);
+### bot methods (high-level, await each one):
+- bot.pickupItem(/item name/i) — walk to and pick up a ground item
+- bot.equipItem(/item name/i) — equip from inventory
+- bot.eatFood(/item name/i) — eat food to heal
+- bot.attackPlayer("name" or /pattern/i) — attack a player
+- bot.attackNpc("name" or /pattern/i) — attack an NPC
+- bot.walkTo(x, z) — pathfind and walk (complex, uses server pathfinding)
 
-// Equip best weapon found
-const weapon = sdk.findInventoryItem(/rune scimitar|adamant|mithril scimitar/i);
-if (weapon) await bot.equipItem(weapon);
+### sdk methods (low-level, instant):
+- sdk.sendWalk(x, z) — click a tile to walk there (fast, no pathfinding)
+- sdk.getState() — full game state object
+- sdk.getState().player.worldX / .worldZ — your position
+- sdk.getState().player.hitpoints — your current HP
+- sdk.getState().player.hitpointsBase — your max HP
+- sdk.getInventory() — array of inventory items (each has .name)
+- sdk.getEquipment() — array of equipment items
+- sdk.findInventoryItem(/pattern/i) — find item in inventory
+- sdk.findGroundItem(/pattern/i) — find item on ground nearby
+- sdk.getNearbyPlayers() — nearby players (each has .name, .combatLevel, .distance, .x, .z)
+- sdk.waitForTicks(n) — wait n game ticks (~0.6s each)
 
-// Phase 2: Fight
-const endTime = Date.now() + 15_000;
-while (Date.now() < endTime) {
-    const hp = sdk.getState().player.hitpoints;
-    if (hp < 25) {
-        const food = sdk.findInventoryItem(/swordfish|lobster|salmon|trout|bread|meat/i);
-        if (food) await bot.eatFood(food);
-    }
-    const players = sdk.getNearbyPlayers();
-    if (players.length > 0) {
-        const nearest = players.sort((a, b) => a.distance - b.distance)[0];
-        await bot.attackPlayer(nearest);
-    }
-    await sdk.waitForTicks(2);
-}
-return { hp: sdk.getState().player.hitpoints, inventory: sdk.getInventory(), nearbyPlayers: sdk.getNearbyPlayers() };
+### actions (pre-built strategies, await each one):
+Actions are loaded from your bot's actions/ directory at login. Default actions:
+- actions.lootAndEquip({ maxItems, radius, foodOnly }) — scan ground, pick up best items, equip gear
+- actions.fightLoop({ eatAt, duration, target, fleeAt }) — attack nearest/weakest, auto-eat, run loop
+- actions.kite({ safeHp, duration, direction }) — retreat from enemies while eating
+
+### IMPORTANT NOTES:
+- Blocking UI is auto-dismissed before every execute_code call — you do NOT need to call bot.dismissBlockingUI()
+- bot.walkTo() uses server pathfinding (can be slow). For quick movement, use sdk.sendWalk(x, z) + sdk.waitForTicks(5)
+- State uses .player (NOT .localPlayer): sdk.getState().player.worldX (NOT state.localPlayer.x)
+- Keep execute_code calls to 15-30 seconds, then check state and adapt
 
 ## Key Tips
 - You start with NOTHING — picking up items is your first priority!
 - Grab a weapon first, then food, then armor
 - Risk vs reward: center has the best loot but everyone converges there
-- Keep execute_code calls to 15-30 seconds, then check state and adapt
 - The human gives you strategy ("rush center", "play safe", "grab and run") — you turn it into code`;
 var server = new Server({ name: "kill-switch", version: "3.0.0" }, { capabilities: { tools: {} } });
 server.setRequestHandler(ListToolsRequestSchema, async () => {
@@ -4155,16 +4165,15 @@ ${GAME_DESCRIPTION}`,
       {
         name: "execute_code",
         description: `Execute TypeScript code on your connected bot. The code runs in an async context with three globals:
-  - bot: High-level actions (attackPlayer, eatFood, walkTo, equipItem, pickupItem, etc.)
-  - sdk: Low-level state access (getState, getNearbyPlayers, getInventory, findGroundItem, etc.)
-  - actions: Pre-built strategy functions loaded from your bot's actions/ directory
+  - bot: High-level actions (await bot.pickupItem(/name/i), bot.equipItem(), bot.eatFood(), bot.attackPlayer(), bot.walkTo())
+  - sdk: Low-level state/commands (sdk.getState(), sdk.sendWalk(x,z), sdk.getNearbyPlayers(), sdk.getInventory(), sdk.findGroundItem())
+  - actions: Pre-built strategy functions from bot's actions/ directory (listed at login)
 
-Use actions for common patterns instead of writing loops from scratch:
-  await actions.fightLoop({ eatAt: 25, duration: 15000 })
-  await actions.lootAndEquip({ maxItems: 5 })
-  await actions.kite({ safeHp: 40 })
+State object: sdk.getState().player.worldX, .worldZ, .hitpoints, .hitpointsBase
+Movement: sdk.sendWalk(x, z) for quick moves, bot.walkTo(x, z) for pathfinding
+Timing: await sdk.waitForTicks(n) — each tick is ~0.6 seconds
 
-Or write custom code using bot/sdk directly for full control.
+Blocking UI is auto-dismissed before your code runs — do NOT call bot.dismissBlockingUI().
 
 You MUST call login before using this tool.`,
         inputSchema: {
@@ -4513,6 +4522,34 @@ server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
             console.error(`[Kill Switch] Warning: initial state not received within 20s`);
           }
           activeBotName = botName;
+          const initialState = connection.sdk.getState();
+          if (initialState?.player) {
+            const x = initialState.player.worldX;
+            const z = initialState.player.worldZ;
+            const isOnTutorialIsland = x >= 3050 && x <= 3160 && z >= 3050 && z <= 3140;
+            if (isOnTutorialIsland) {
+              console.error(`[Kill Switch] New player detected on Tutorial Island at (${x}, ${z}), auto-skipping...`);
+              const tutorialStart = Date.now();
+              const TUTORIAL_TIMEOUT = 30000;
+              while (Date.now() - tutorialStart < TUTORIAL_TIMEOUT) {
+                try {
+                  await connection.bot.skipTutorial({ randomizeAppearance: true });
+                } catch (e) {
+                  console.error(`[Kill Switch] skipTutorial call: ${e.message}`);
+                }
+                await new Promise((resolve) => setTimeout(resolve, 1000));
+                const currentState = connection.sdk.getState();
+                if (currentState?.player) {
+                  const cx = currentState.player.worldX;
+                  const cz = currentState.player.worldZ;
+                  if (cx < 3050 || cx > 3160 || cz < 3050 || cz > 3140) {
+                    console.error(`[Kill Switch] Tutorial complete! Now at (${cx}, ${cz})`);
+                    break;
+                  }
+                }
+              }
+            }
+          }
           const { actions, descriptions } = await loadActions(botName, connection.bot, connection.sdk);
           activeActions = actions;
           activeActionDescriptions = descriptions;
@@ -4629,6 +4666,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
               return value;
             }
           });
+          await connection.bot.dismissBlockingUI();
           let result;
           try {
             result = await Promise.race([fn(cancellable(connection.bot), cancellable(connection.sdk), activeActions), timeoutPromise, cancelPromise]);
@@ -4674,10 +4712,10 @@ server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
           return errorResponse("Not connected. Call login first.");
         }
         const timeoutSecs = Math.min(Math.max(args?.timeout || 300, 10), 600);
-        const ARENA_MIN_X = 3070;
-        const ARENA_MAX_X = 3141;
-        const ARENA_MIN_Z = 3317;
-        const ARENA_MAX_Z = 3402;
+        const ARENA_MIN_X = 3077;
+        const ARENA_MAX_X = 3134;
+        const ARENA_MIN_Z = 3324;
+        const ARENA_MAX_Z = 3393;
         console.error(`[Kill Switch] Waiting for tournament to start (timeout: ${timeoutSecs}s)...`);
         const startTime = Date.now();
         const deadline = startTime + timeoutSecs * 1000;
@@ -4695,17 +4733,29 @@ server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
                 "",
                 `You've been teleported to Draynor Manor. The fight is ON!`,
                 `Position: ${state.player.worldX}, ${state.player.worldZ}`,
-                `HP: ${state.player.hp}/${state.player.maxHp}`,
+                `HP: ${state.player.hitpoints}/${state.player.hitpointsBase}`,
                 "",
                 `Nearby players: ${players.length > 0 ? players.map((p) => `${p.name} (CB ${p.combatLevel}, dist ${p.distance})`).join(", ") : "scanning..."}`,
                 "",
                 "REMEMBER: You die = your agent dies FOREVER. No second chances.",
                 "",
-                "IMMEDIATELY:",
+                "IMMEDIATELY use execute_code to start your strategy:",
                 "1. Pick up weapons and food from the ground",
                 "2. Equip best weapon found, then start fighting",
-                "3. Eat when HP gets low — you have 99 HP but no food yet!"
+                "3. Eat when HP gets low — you have 99 HP but no food yet!",
+                "",
+                "QUICK START: await actions.lootAndEquip({ maxItems: 5 }); await actions.fightLoop({ eatAt: 25, duration: 30000 });",
+                "",
+                "API REMINDERS:",
+                "- sdk.sendWalk(x, z) for quick movement (NOT bot.walkTo for combat)",
+                "- sdk.getState().player.worldX / .worldZ / .hitpoints",
+                "- Blocking UI is auto-dismissed — do NOT call bot.dismissBlockingUI()"
               ];
+              if (activeActionDescriptions.length > 0) {
+                parts.push("");
+                parts.push("AVAILABLE ACTIONS:");
+                parts.push(...activeActionDescriptions);
+              }
               return { content: [{ type: "text", text: parts.join(`
 `) }] };
             }

package/package.json

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