Merge pull request #3 from chrisreddington/copilot/fix-2

Tech Debt: Consolidate hardcoded constants and eliminate duplicate difficulty styling

Author: chrisreddington

.vscode/mcp.json

@@ -10,6 +10,17 @@
       "args": [
         "@playwright/mcp@latest"
       ]
+    },
+    "context7": {
+      "type": "http",
+      "url": "https://mcp.context7.com/mcp"
+    },
+    "sequentialthinking": {
+      "command": "npx",
+      "args": [
+        "-y",
+        "@modelcontextprotocol/server-sequential-thinking"
+      ]
     }
-  }
+  }  }
 }

mcp-server/jest.config.cjs

@@ -10,19 +10,19 @@
     "start": "node dist/index.js",
     "clean": "rm -rf dist",
     "type-check": "tsc --noEmit",
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "test:coverage": "jest --coverage"
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:coverage": "vitest run --coverage",
+    "test:ui": "vitest --ui"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.17.0",
     "@turn-based-mcp/shared": "file:../shared"
   },
   "devDependencies": {
-    "@types/jest": "^30.0.0",
     "@types/node": "^24.1.0",
-    "jest": "^30.0.5",
-    "ts-jest": "^29.4.0",
-    "typescript": "^5.5.0"
+    "@vitest/ui": "^3.2.4",
+    "typescript": "^5.5.0",
+    "vitest": "^3.2.4"
   }
 }

mcp-server/package.json

@@ -3,6 +3,8 @@
  * Provides structured ways to gather user preferences and decisions
  */
 
+import { DIFFICULTIES, GAME_TYPES, DEFAULT_PLAYER_NAME, DEFAULT_AI_DIFFICULTY } from '@turn-based-mcp/shared'
+
 export interface ElicitationResult {
   action: "accept" | "decline" | "cancel"
   content?: Record<string, any>
@@ -22,7 +24,7 @@ export async function elicitGameCreationPreferences(
       properties: {
         difficulty: {
           type: "string",
-          enum: ["easy", "medium", "hard"],
+          enum: DIFFICULTIES,
           title: "AI Difficulty Level",
           description: "How challenging should the AI opponent be?"
         },
@@ -37,7 +39,7 @@ export async function elicitGameCreationPreferences(
           type: "string",
           title: "Player Name",
           description: "What should we call you in the game?",
-          default: "Player"
+          default: DEFAULT_PLAYER_NAME
         }
       },
       required: ["difficulty"]
@@ -47,7 +49,7 @@ export async function elicitGameCreationPreferences(
       properties: {
         difficulty: {
           type: "string",
-          enum: ["easy", "medium", "hard"],
+          enum: DIFFICULTIES,
           title: "AI Difficulty Level",
           description: "How smart should the AI be at pattern recognition?"
         },
@@ -63,7 +65,7 @@ export async function elicitGameCreationPreferences(
           type: "string", 
           title: "Player Name",
           description: "What should we call you?",
-          default: "Player"
+          default: DEFAULT_PLAYER_NAME
         }
       },
       required: ["difficulty"]
@@ -90,8 +92,8 @@ export async function elicitGameCreationPreferences(
     return {
       action: "accept",
       content: {
-        difficulty: existingArgs?.aiDifficulty || "medium",
-        playerName: existingArgs?.playerName || "Player",
+        difficulty: existingArgs?.aiDifficulty || DEFAULT_AI_DIFFICULTY,
+        playerName: existingArgs?.playerName || DEFAULT_PLAYER_NAME,
         ...(gameType === 'rock-paper-scissors' && { maxRounds: 3 }),
         ...(gameType === 'tic-tac-toe' && { playerSymbol: "X" })
       }
@@ -186,7 +188,7 @@ export async function elicitGameCompletionFeedback(
       },
       gameTypeForNext: {
         type: "string",
-        enum: ["same", "tic-tac-toe", "rock-paper-scissors"],
+        enum: ["same", ...GAME_TYPES],
         enumNames: ["Same Game", "Tic-Tac-Toe", "Rock Paper Scissors"],
         title: "If playing again, which game?",
         description: "Choose the game type for your next match"

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

@@ -6,6 +6,7 @@ import { TicTacToeAI } from '../ai/tic-tac-toe-ai.js'
 import { RockPaperScissorsAI } from '../ai/rock-paper-scissors-ai.js'
 import { TicTacToeGame, RockPaperScissorsGame } from '@turn-based-mcp/shared'
 import { getGameViaAPI, submitMoveViaAPI, createGameViaAPI } from '../utils/http-client.js'
+import { DEFAULT_PLAYER_NAME, DEFAULT_AI_DIFFICULTY } from '@turn-based-mcp/shared'
 
 // Initialize AI and game instances
 const ticTacToeAI = new TicTacToeAI()
@@ -316,9 +317,9 @@ export async function waitForPlayerMove(
  */
 export async function createGame(
   gameType: string, 
-  playerName: string = 'Player', 
+  playerName: string = DEFAULT_PLAYER_NAME, 
   gameId?: string, 
-  aiDifficulty: string = 'medium',
+  aiDifficulty: string = DEFAULT_AI_DIFFICULTY,
   gameSpecificOptions?: Record<string, any>
 ) {
   // Check if game already exists (for games that support custom IDs)

mcp-server/src/handlers/game-operations.ts

@@ -4,6 +4,7 @@
  */
 
 import type { Prompt, PromptMessage } from '@modelcontextprotocol/sdk/types.js'
+import { GAME_TYPES, DIFFICULTIES } from '@turn-based-mcp/shared'
 
 export interface PromptDefinition {
   name: string
@@ -87,12 +88,12 @@ export const STRATEGY_PROMPTS: PromptDefinition[] = [
     arguments: [
       {
         name: 'gameType',
-        description: 'Game type (tic-tac-toe, rock-paper-scissors)',
+        description: `Game type (${GAME_TYPES?.join(', ') || 'tic-tac-toe, rock-paper-scissors'})`,
         required: false
       },
       {
         name: 'difficulty',
-        description: 'AI difficulty level (easy, medium, hard)',
+        description: `AI difficulty level (${DIFFICULTIES?.join(', ') || 'easy, medium, hard'})`,
         required: false
       }
     ],
@@ -296,15 +297,15 @@ function getSpecificStrategyGuide(gameType: string, difficulty: string): string
 function getGameTypeStrategies(gameType: string): string {
   // Return strategies for all difficulties of a specific game
   return `Please provide comprehensive strategies for ${gameType.toUpperCase()} across all difficulty levels:\n\n` +
-    ['easy', 'medium', 'hard'].map(diff => 
+    DIFFICULTIES.map(diff => 
       `For ${diff.toUpperCase()} difficulty: ${getSpecificStrategyGuide(gameType, diff)}\n`
     ).join('\n')
 }
 
 function getDifficultyStrategies(difficulty: string): string {
   // Return strategies for a specific difficulty across all games
   return `Please provide strategies for ${difficulty.toUpperCase()} difficulty across all games:\n\n` +
-    ['tic-tac-toe', 'rock-paper-scissors'].map(game => 
+    GAME_TYPES.map(game => 
       `For ${game.replace(/-/g, ' ').toUpperCase()}: ${getSpecificStrategyGuide(game, difficulty)}\n`
     ).join('\n')
 }

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

@@ -3,8 +3,7 @@
  */
 
 import { getGamesByType, getGameViaAPI } from '../utils/http-client.js'
-
-const SUPPORTED_GAME_TYPES = ['tic-tac-toe', 'rock-paper-scissors']
+import { GAME_TYPES, isSupportedGameType } from '@turn-based-mcp/shared'
 
 /**
  * List all available game resources
@@ -13,7 +12,7 @@ export async function listResources() {
   try {
     const resources = []
 
-    for (const gameType of SUPPORTED_GAME_TYPES) {
+    for (const gameType of GAME_TYPES) {
       try {
         // Get all games of this type
         const games = await getGamesByType(gameType)
@@ -63,7 +62,7 @@ export async function readResource(uri: string) {
   const [, gameType, gameId] = match
 
   // Validate game type
-  if (!SUPPORTED_GAME_TYPES.includes(gameType)) {
+  if (!isSupportedGameType(gameType)) {
     throw new Error(`Invalid game type: ${gameType}`)
   }
 

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

@@ -4,6 +4,7 @@
 
 import { playGame, analyzeGame, waitForPlayerMove, createGame } from './game-operations.js'
 import { elicitGameCreationPreferences } from './elicitation-handlers.js'
+import { GAME_TYPES, DIFFICULTIES, isSupportedGameType, DEFAULT_PLAYER_NAME, DEFAULT_AI_DIFFICULTY } from '@turn-based-mcp/shared'
 
 export const TOOL_DEFINITIONS = [
   {
@@ -18,7 +19,7 @@ export const TOOL_DEFINITIONS = [
         },
         gameType: {
           type: 'string',
-          enum: ['tic-tac-toe', 'rock-paper-scissors'],
+          enum: GAME_TYPES,
           description: 'Type of game to play',
         },
       },
@@ -37,7 +38,7 @@ export const TOOL_DEFINITIONS = [
         },
         gameType: {
           type: 'string',
-          enum: ['tic-tac-toe', 'rock-paper-scissors'],
+          enum: GAME_TYPES,
           description: 'Type of game to analyze',
         },
       },
@@ -56,7 +57,7 @@ export const TOOL_DEFINITIONS = [
         },
         gameType: {
           type: 'string',
-          enum: ['tic-tac-toe', 'rock-paper-scissors'],
+          enum: GAME_TYPES,
           description: 'Type of game to monitor',
         },
         timeoutSeconds: {
@@ -81,7 +82,7 @@ export const TOOL_DEFINITIONS = [
       properties: {
         gameType: {
           type: 'string',
-          enum: ['tic-tac-toe', 'rock-paper-scissors'],
+          enum: GAME_TYPES,
           description: 'Type of game to create'
         },
         gameId: {
@@ -108,7 +109,7 @@ export async function handleToolCall(name: string, args: any, server?: any) {
         if (!playGameType) {
           throw new Error('gameType is required')
         }
-        if (!['tic-tac-toe', 'rock-paper-scissors'].includes(playGameType)) {
+        if (!isSupportedGameType(playGameType)) {
           throw new Error(`Unsupported game type: ${playGameType}`)
         }
         return await playGame(playGameType, playGameId)
@@ -143,7 +144,7 @@ export async function handleToolCall(name: string, args: any, server?: any) {
         if (!genericGameType) {
           throw new Error('gameType is required')
         }
-        if (!['tic-tac-toe', 'rock-paper-scissors'].includes(genericGameType)) {
+        if (!isSupportedGameType(genericGameType)) {
           throw new Error(`Unsupported game type: ${genericGameType}`)
         }
         return await createGameWithElicitation(genericGameType, genericGameId, server)
@@ -162,7 +163,7 @@ export async function handleToolCall(name: string, args: any, 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')
+    return await createGame(gameType, DEFAULT_PLAYER_NAME, gameId, DEFAULT_AI_DIFFICULTY)
   }
 
   try {
@@ -228,5 +229,5 @@ async function createGameWithElicitation(gameType: string, gameId?: string, serv
   }
 
   // Fallback to regular creation
-  return await createGame(gameType, 'Player', gameId, 'medium')
+  return await createGame(gameType, DEFAULT_PLAYER_NAME, gameId, DEFAULT_AI_DIFFICULTY)
 }