Sync packages from monorepo (fcba6f6)

Author: github-actions[bot]

packages/cli/src/commands/game/create.ts

@@ -198,7 +198,7 @@ export const gameCreate = async (args: string[]) => {
   const agents = detectAgent()
   const agentChoices = [
     ...agents.map((a) => ({ value: a.binary, label: `${a.displayName} (${a.path})` })),
-    { value: "none", label: "None - I'll run the skills manually" },
+    { value: "none", label: "None - I'll run the steps manually" },
   ]
 
   let selectedAgent: string
@@ -213,7 +213,7 @@ export const gameCreate = async (args: string[]) => {
   }
 
   if (selectedAgent !== "none") {
-    p.log.step("Running Puzzmo skills pipeline...")
+    p.log.step("Running Puzzmo migration pipeline...")
     await runSkillsPipelineTUI(selectedAgent, gameDir)
   }
 

packages/cli/src/skills/mcp-client.ts

@@ -5,15 +5,22 @@ type McpConfig = {
   mcpServers: Record<string, { url: string; headers?: Record<string, string> }>
 }
 
-/** Reads the .mcp.json config from the game directory */
+/** Reads the .mcp.json config, searching the game directory and ancestor directories */
 const readMcpConfig = (gameDir: string): McpConfig | null => {
-  const mcpPath = path.join(gameDir, ".mcp.json")
-  if (!fs.existsSync(mcpPath)) return null
-  try {
-    return JSON.parse(fs.readFileSync(mcpPath, "utf-8"))
-  } catch {
-    return null
+  let dir = path.resolve(gameDir)
+  const root = path.parse(dir).root
+  while (dir !== root) {
+    const mcpPath = path.join(dir, ".mcp.json")
+    if (fs.existsSync(mcpPath)) {
+      try {
+        return JSON.parse(fs.readFileSync(mcpPath, "utf-8"))
+      } catch {
+        return null
+      }
+    }
+    dir = path.dirname(dir)
   }
+  return null
 }
 
 /** Sends a JSON-RPC request to the MCP server and parses the SSE response */
@@ -28,16 +35,21 @@ const mcpRequest = async (url: string, headers: Record<string, string>, method:
     body: JSON.stringify({ jsonrpc: "2.0", id: 1, method, params }),
   })
 
+  if (!response.ok) throw new Error(`MCP server returned ${response.status} ${response.statusText}`)
+
   const text = await response.text()
   // Parse SSE format: lines starting with "data: " contain the JSON payload
   for (const line of text.split("\n")) {
     if (!line.startsWith("data: ")) continue
     try {
       const parsed = JSON.parse(line.slice(6))
+      if (parsed.error) throw new Error(`MCP error: ${parsed.error.message ?? JSON.stringify(parsed.error)}`)
       if (parsed.result) return parsed.result
-    } catch {}
+    } catch (e) {
+      if (e instanceof Error && e.message.startsWith("MCP error:")) throw e
+    }
   }
-  return null
+  throw new Error(`MCP server returned no result. Response body: ${text.slice(0, 200)}`)
 }
 
 /** Returns the MCP server URL from .mcp.json, or null if not configured */
@@ -65,26 +77,25 @@ export const listMcpPrompts = async (gameDir: string): Promise<{ name: string; d
   }
 }
 
-/** Fetches a skill prompt's content from the MCP server configured in .mcp.json */
-export const fetchSkillPrompt = async (skillName: string, gameDir: string): Promise<string | null> => {
+/** Fetches a step's instructions from the MCP server configured in .mcp.json */
+export const fetchSkillPrompt = async (stepName: string, gameDir: string): Promise<string> => {
   const config = readMcpConfig(gameDir)
-  if (!config) return null
+  if (!config) throw new Error(`No .mcp.json found in ${gameDir}`)
 
   const server = Object.values(config.mcpServers)[0]
-  if (!server) return null
+  if (!server) throw new Error("No MCP server configured in .mcp.json")
 
-  try {
-    const result = await mcpRequest(server.url, server.headers ?? {}, "prompts/get", { name: skillName })
-    if (!result?.messages?.length) return null
+  const result = await mcpRequest(server.url, server.headers ?? {}, "prompts/get", { name: stepName })
+  if (!result?.messages?.length) throw new Error(`MCP server returned no instructions for "${stepName}"`)
 
-    return result.messages
-      .map((m: any) => {
-        if (typeof m.content === "string") return m.content
-        if (m.content?.text) return m.content.text
-        return ""
-      })
-      .join("\n")
-  } catch {
-    return null
-  }
+  const text = result.messages
+    .map((m: any) => {
+      if (typeof m.content === "string") return m.content
+      if (m.content?.text) return m.content.text
+      return ""
+    })
+    .join("\n")
+
+  if (!text.trim()) throw new Error(`MCP server returned empty instructions for "${stepName}"`)
+  return text
 }

packages/cli/src/skills/runner.ts

@@ -5,11 +5,10 @@ import { verifyBuild, runCommand, gitCommit } from "../util/exec.js"
 import { fetchSkillPrompt } from "./mcp-client.js"
 import { runPipelineTUI } from "../tui/pipeline.js"
 
-/** Fetches skill instructions from the MCP server, then builds a self-contained prompt for the agent */
-const buildPrompt = async (skillName: string, gameDir: string): Promise<string> => {
-  const instructions = await fetchSkillPrompt(skillName, gameDir)
-  if (instructions) return `${instructions}\n\nThe game source is in the current directory.`
-  return `Run the skill "${skillName}". The game source is in the current directory.`
+/** Fetches step instructions from the MCP server and wraps them as an agent prompt */
+const buildPrompt = async (stepName: string, gameDir: string): Promise<string> => {
+  const instructions = await fetchSkillPrompt(stepName, gameDir)
+  return `Follow these instructions. The game source is in the current directory.\n\n${instructions}`
 }
 
 /** Invokes an LLM agent with a prompt (plain mode, stdio inherited) */
@@ -38,7 +37,7 @@ export const runSkillsPipeline = async (agent: string, gameDir: string) => {
   for (let i = 0; i < total; i++) {
     const skill = skillsPipeline[i]
     const step = i + 1
-    console.log(`[${step}/${total}] Running skill: ${skill.name}`)
+    console.log(`[${step}/${total}] Running step: ${skill.name}`)
 
     const prompt = await buildPrompt(skill.name, gameDir)
     let result = invokeAgent(agent, prompt, gameDir)
@@ -47,7 +46,7 @@ export const runSkillsPipeline = async (agent: string, gameDir: string) => {
       console.log(`  Agent failed, retrying...`)
       result = invokeAgent(agent, prompt, gameDir)
       if (!result.success) {
-        console.error(`  Skill ${skill.name} failed after retry. Stopping pipeline.`)
+        console.error(`  Step ${skill.name} failed after retry. Stopping pipeline.`)
         process.exit(1)
       }
     }
@@ -56,7 +55,7 @@ export const runSkillsPipeline = async (agent: string, gameDir: string) => {
     const buildResult = verifyBuild(gameDir)
     if (!buildResult.success) {
       console.log(`  Build failed after ${skill.name}, asking agent to fix...`)
-      const fixPrompt = `The vite build failed after running skill ${skill.name}. Fix the build errors:\n\n${buildResult.error}`
+      const fixPrompt = `The vite build failed after the "${skill.name}" step. Fix the build errors:\n\n${buildResult.error}`
       invokeAgent(agent, fixPrompt, gameDir)
 
       const retryBuild = verifyBuild(gameDir)
@@ -69,7 +68,7 @@ export const runSkillsPipeline = async (agent: string, gameDir: string) => {
     // Commit
     try {
       runCommand("git add -A", { cwd: gameDir })
-      gitCommit(`skill: ${skill.name}`, { cwd: gameDir })
+      gitCommit(`step: ${skill.name}`, { cwd: gameDir })
       console.log(`  Committed.`)
     } catch {
       console.log(`  No changes to commit.`)

packages/cli/src/tui/pipeline.ts

@@ -58,11 +58,10 @@ const buildAgentCmd = (agent: string, prompt: string): { cmd: string; args: stri
   return { cmd: agent, args: [prompt] }
 }
 
-/** Fetches skill instructions from the MCP server, then builds a self-contained prompt for the agent */
-const buildPrompt = async (skillName: string, gameDir: string): Promise<string> => {
-  const instructions = await fetchSkillPrompt(skillName, gameDir)
-  if (instructions) return `${instructions}\n\nThe game source is in the current directory.`
-  return `Run the skill "${skillName}". The game source is in the current directory.`
+/** Fetches step instructions from the MCP server and wraps them as an agent prompt */
+const buildPrompt = async (stepName: string, gameDir: string): Promise<string> => {
+  const instructions = await fetchSkillPrompt(stepName, gameDir)
+  return `Follow these instructions. The game source is in the current directory.\n\n${instructions}`
 }
 
 class PipelineTUI {
@@ -115,7 +114,7 @@ class PipelineTUI {
 
     // Sidebar header
     buf += moveTo(2, 1)
-    buf += "│ " + bold("Migration Pipeline") + " ".repeat(Math.max(0, sidebarWidth - 21)) + "│"
+    buf += "│ " + bold("Migration Steps") + " ".repeat(Math.max(0, sidebarWidth - 18)) + "│"
 
     // Output panel header
     const headerLabel = this.done ? "Done" : `${skillsPipeline[this.currentStep]?.name ?? ""} ${dim(`(${this.phase})`)}`
@@ -399,7 +398,17 @@ class PipelineTUI {
     this.phase = "agent"
     this.render()
 
-    const prompt = await buildPrompt(skill.name, this.gameDir)
+    let prompt: string
+    try {
+      prompt = await buildPrompt(skill.name, this.gameDir)
+    } catch (e: any) {
+      this.appendOutput(`Failed to fetch instructions: ${e.message}`)
+      this.writeSkillLog(skill.name)
+      this.states[stepIndex] = "failed"
+      this.render()
+      return false
+    }
+
     let success = await this.runAgent(prompt)
 
     if (!success) {
@@ -420,7 +429,7 @@ class PipelineTUI {
     const buildResult = this.runCmd("npx vite build")
     if (!buildResult.success) {
       this.appendOutput("Asking agent to fix...")
-      const fixPrompt = `The vite build failed after running skill ${skill.name}. Fix the build errors:\n\n${buildResult.output}`
+      const fixPrompt = `The vite build failed after the "${skill.name}" step. Fix the build errors:\n\n${buildResult.output}`
       await this.runAgent(fixPrompt)
 
       const retry = this.runCmd("npx vite build")
@@ -436,7 +445,7 @@ class PipelineTUI {
     this.phase = "commit"
     this.render()
     this.runCmd("git add -A")
-    const commitResult = this.runCmd(`git commit -m "skill: ${skill.name}"`)
+    const commitResult = this.runCmd(`git commit -m "step: ${skill.name}"`)
     if (commitResult.success) this.appendOutput("Committed.")
     else this.appendOutput("No changes to commit.")