Consolidate play tools

Author: chrisreddington

mcp-server/src/handlers/prompt-handlers.test.ts

@@ -249,7 +249,7 @@ describe('Prompt Handlers', () => {
 
           const gameType = gameName.replace('_rules', '').replace(/_/g, '-')
           expect(content).toContain(`create_game with gameType: '${gameType}'`)
-          expect(content).toContain(`play_${gameName.replace('_rules', '')}`)
+          expect(content).toContain(`play_game with gameType: '${gameType}'`)
         }
       })
 

mcp-server/src/handlers/prompt-handlers.ts

@@ -40,7 +40,7 @@ export const GAME_RULES_PROMPTS: PromptDefinition[] = [
 3. How to make moves (using positions 1-9)
 4. All possible winning conditions
 5. Basic strategy tips for beginners
-6. How to use the MCP commands (create_game with gameType: 'tic-tac-toe', play_tic_tac_toe, wait_for_player_move)
+6. How to use the MCP commands (create_game with gameType: 'tic-tac-toe', play_game with gameType: 'tic-tac-toe', wait_for_player_move)
 7. What happens with perfect play
 
 Make it comprehensive but easy to understand for someone who has never played before.`
@@ -66,7 +66,7 @@ Make it comprehensive but easy to understand for someone who has never played be
 3. Strategy tips for beginners and advanced players
 4. How psychology and pattern recognition work in this game
 5. What the different AI difficulty levels mean and how to counter them
-6. How to use the MCP commands (create_game with gameType: 'rock-paper-scissors', play_rock_paper_scissors, wait_for_player_move)
+6. How to use the MCP commands (create_game with gameType: 'rock-paper-scissors', play_game with gameType: 'rock-paper-scissors', wait_for_player_move)
 7. Why unpredictability is key to mastery
 
 Make it comprehensive and include both basic rules and advanced psychological strategies.`

mcp-server/src/handlers/tool-handlers.ts

@@ -7,31 +7,22 @@ import { elicitGameCreationPreferences } from './elicitation-handlers.js'
 
 export const TOOL_DEFINITIONS = [
   {
-    name: 'play_tic_tac_toe',
-    description: 'Make an AI move in Tic-Tac-Toe game. IMPORTANT: After calling this tool when the game is still playing, you MUST call wait_for_player_move to continue the game flow.',
+    name: 'play_game',
+    description: 'Make an AI move in a game. IMPORTANT: After calling this tool when the game is still playing, you MUST call wait_for_player_move to continue the game flow.',
     inputSchema: {
       type: 'object',
       properties: {
         gameId: {
           type: 'string',
-          description: 'The ID of the Tic-Tac-Toe game to play',
+          description: 'The ID of the game to play',
         },
-      },
-      required: ['gameId'],
-    },
-  },
-  {
-    name: 'play_rock_paper_scissors',
-    description: 'Make an AI choice in Rock Paper Scissors game. IMPORTANT: After calling this tool when the game is still playing, you MUST call wait_for_player_move to continue the game flow.',
-    inputSchema: {
-      type: 'object',
-      properties: {
-        gameId: {
+        gameType: {
           type: 'string',
-          description: 'The ID of the Rock Paper Scissors game to play',
+          enum: ['tic-tac-toe', 'rock-paper-scissors'],
+          description: 'Type of game to play',
         },
       },
-      required: ['gameId'],
+      required: ['gameId', 'gameType'],
     },
   },
   {
@@ -55,7 +46,7 @@ export const TOOL_DEFINITIONS = [
   },
   {
     name: 'wait_for_player_move',
-    description: 'Wait for human player to make their move after AI has played. This tool should be called after any play_* tool when the game is still ongoing.',
+    description: 'Wait for human player to make their move after AI has played. This tool should be called after the play_game tool when the game is still ongoing.',
     inputSchema: {
       type: 'object',
       properties: {
@@ -109,19 +100,18 @@ export const TOOL_DEFINITIONS = [
 export async function handleToolCall(name: string, args: any, server?: any) {
   try {
     switch (name) {
-      case 'play_tic_tac_toe':
-        const { gameId: ticTacToeGameId } = args
-        if (!ticTacToeGameId) {
+      case 'play_game':
+        const { gameId: playGameId, gameType: playGameType } = args
+        if (!playGameId) {
           throw new Error('gameId is required')
         }
-        return await playGame('tic-tac-toe', ticTacToeGameId)
-
-      case 'play_rock_paper_scissors':
-        const { gameId: rpsGameId } = args
-        if (!rpsGameId) {
-          throw new Error('gameId is required')
+        if (!playGameType) {
+          throw new Error('gameType is required')
+        }
+        if (!['tic-tac-toe', 'rock-paper-scissors'].includes(playGameType)) {
+          throw new Error(`Unsupported game type: ${playGameType}`)
         }
-        return await playGame('rock-paper-scissors', rpsGameId)
+        return await playGame(playGameType, playGameId)
 
       case 'analyze_game':
         const { gameId: analyzeGameId, gameType: analyzeGameType } = args

mcp-server/src/integration/integration.test.ts

@@ -156,8 +156,9 @@ describe('MCP Server Integration', () => {
         }
       })
 
-      const result = await handleToolCall('play_tic_tac_toe', {
-        gameId: 'test-game'
+      const result = await handleToolCall('play_game', {
+        gameId: 'test-game',
+        gameType: 'tic-tac-toe'
       })
 
       expect(result.gameId).toBe('test-game')