Consolidate create_game tools

Author: chrisreddington

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

@@ -69,7 +69,7 @@ describe('Prompt Handlers', () => {
         expect(message.content.type).toBe('text')
         expect(message.content.text).toContain('Please explain how to play Tic-Tac-Toe')
         expect(message.content.text).toContain('objective of the game')
-        expect(message.content.text).toContain('create_tic_tac_toe_game')
+        expect(message.content.text).toContain("create_game with gameType: 'tic-tac-toe'")
       })
 
       it('should return rock-paper-scissors rules', async () => {
@@ -78,7 +78,7 @@ describe('Prompt Handlers', () => {
         expect(result.messages[0].role).toBe('user')
         expect(result.messages[0].content.text).toContain('Please explain how to play Rock Paper Scissors')
         expect(result.messages[0].content.text).toContain('what beats what')
-        expect(result.messages[0].content.text).toContain('create_rock_paper_scissors_game')
+        expect(result.messages[0].content.text).toContain("create_game with gameType: 'rock-paper-scissors'")
       })
     })
 
@@ -248,7 +248,7 @@ describe('Prompt Handlers', () => {
           const content = result.messages[0].content.text
 
           const gameType = gameName.replace('_rules', '').replace(/_/g, '-')
-          expect(content).toContain(`create_${gameName.replace('_rules', '_game')}`)
+          expect(content).toContain(`create_game with gameType: '${gameType}'`)
           expect(content).toContain(`play_${gameName.replace('_rules', '')}`)
         }
       })

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_tic_tac_toe_game, play_tic_tac_toe, wait_for_player_move)
+6. How to use the MCP commands (create_game with gameType: 'tic-tac-toe', play_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_rock_paper_scissors_game, play_rock_paper_scissors, wait_for_player_move)
+6. How to use the MCP commands (create_game with gameType: 'rock-paper-scissors', play_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

@@ -83,79 +83,23 @@ export const TOOL_DEFINITIONS = [
     },
   },
   {
-    name: 'create_tic_tac_toe_game',
-    description: 'Create a new Tic-Tac-Toe game with optional custom game ID',
+    name: 'create_game',
+    description: 'Create a new game with interactive setup. This will ask you for preferences like difficulty, player options, and other game-specific settings.',
     inputSchema: {
       type: 'object',
       properties: {
-        playerName: {
-          type: 'string',
-          description: 'Name of the human player',
-          default: 'Player',
-        },
-        gameId: {
-          type: 'string',
-          description: 'Optional custom game ID. If not provided, a random UUID will be generated.',
-        },
-        aiDifficulty: {
-          type: 'string',
-          enum: ['easy', 'medium', 'hard'],
-          description: 'AI difficulty level',
-          default: 'medium',
-        },
-        playerSymbol: {
-          type: 'string',
-          enum: ['X', 'O'],
-          description: 'Your symbol: X (goes first) or O (goes second)',
-          default: 'X',
-        },
-      },
-      required: [],
-    },
-  },
-  {
-    name: 'create_rock_paper_scissors_game',
-    description: 'Create a new Rock Paper Scissors game',
-    inputSchema: {
-      type: 'object',
-      properties: {
-        playerName: {
-          type: 'string',
-          description: 'Name of the human player',
-          default: 'Player',
-        },
-        aiDifficulty: {
+        gameType: {
           type: 'string',
-          enum: ['easy', 'medium', 'hard'],
-          description: 'AI difficulty level',
-          default: 'medium',
+          enum: ['tic-tac-toe', 'rock-paper-scissors'],
+          description: 'Type of game to create'
         },
-      },
-      required: [],
-    },
-  },
-  {
-    name: 'create_tic_tac_toe_game_interactive',
-    description: 'Create a new Tic-Tac-Toe game with interactive setup. This will ask you for preferences like difficulty and symbol choice.',
-    inputSchema: {
-      type: 'object',
-      properties: {
         gameId: {
           type: 'string',
-          description: 'Optional custom game ID. If not provided, a random UUID will be generated.',
-        },
+          description: 'Optional custom game ID. If not provided, a random UUID will be generated.'
+        }
       },
-      required: [],
-    },
-  },
-  {
-    name: 'create_rock_paper_scissors_game_interactive',
-    description: 'Create a new Rock Paper Scissors game with interactive setup. This will ask you for preferences like difficulty and number of rounds.',
-    inputSchema: {
-      type: 'object',
-      properties: {},
-      required: [],
-    },
+      required: ['gameType']
+    }
   },
 ]
 
@@ -204,30 +148,15 @@ export async function handleToolCall(name: string, args: any, server?: any) {
         }
         return await waitForPlayerMove(waitGameType, waitGameId, timeoutSeconds, pollInterval)
 
-      case 'create_tic_tac_toe_game':
-        const { 
-          playerName: ticTacToePlayerName = 'Player', 
-          gameId: ticTacToeNewGameId, 
-          aiDifficulty: ticTacToeAiDifficulty = 'medium',
-          playerSymbol: ticTacToePlayerSymbol = 'X'
-        } = args
-        
-        const ticTacToeGameOptions = ticTacToePlayerSymbol ? { playerSymbol: ticTacToePlayerSymbol } : undefined
-        return await createGame('tic-tac-toe', ticTacToePlayerName, ticTacToeNewGameId, ticTacToeAiDifficulty, ticTacToeGameOptions)
-
-      case 'create_rock_paper_scissors_game':
-        const { 
-          playerName: rpsPlayerName = 'Player', 
-          aiDifficulty: rpsAiDifficulty = 'medium' 
-        } = args
-        return await createGame('rock-paper-scissors', rpsPlayerName, undefined, rpsAiDifficulty)
-
-      case 'create_tic_tac_toe_game_interactive':
-        const { gameId: interactiveTTTGameId } = args
-        return await createGameInteractive('tic-tac-toe', interactiveTTTGameId, server)
-
-      case 'create_rock_paper_scissors_game_interactive':
-        return await createGameInteractive('rock-paper-scissors', undefined, server)
+      case 'create_game':
+        const { gameType: genericGameType, gameId: genericGameId } = args
+        if (!genericGameType) {
+          throw new Error('gameType is required')
+        }
+        if (!['tic-tac-toe', 'rock-paper-scissors'].includes(genericGameType)) {
+          throw new Error(`Unsupported game type: ${genericGameType}`)
+        }
+        return await createGameWithElicitation(genericGameType, genericGameId, server)
 
       default:
         throw new Error(`Unknown tool: ${name}`)
@@ -240,7 +169,7 @@ export async function handleToolCall(name: string, args: any, server?: any) {
 /**
  * Create game with interactive elicitation
  */
-async function createGameInteractive(gameType: string, gameId?: string, server?: any) {
+async function createGameWithElicitation(gameType: string, gameId?: string, server?: any) {
   if (!server) {
     // Fallback to regular creation if no server for elicitation
     return await createGame(gameType, 'Player', gameId, 'medium')

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

@@ -127,9 +127,8 @@ describe('MCP Server Integration', () => {
         }
       })
 
-      const result = await handleToolCall('create_tic_tac_toe_game', {
-        playerName: 'Test Player',
-        aiDifficulty: 'medium'
+      const result = await handleToolCall('create_game', {
+        gameType: 'tic-tac-toe'
       })
 
       expect(result.gameId).toBe('new-game-id')