c64-debug-mcp 1.0.2 → 1.0.6

package/dist/stdio.js

@@ -365,10 +365,15 @@ function publicMessageFor(error) {
     case "program_file_missing":
     case "program_file_invalid":
       return error.message;
+    case "binary_not_found":
+    case "spawn_failed":
+    case "emulator_crashed_on_startup":
+      return error.message;
     case "port_allocation_failed":
     case "port_in_use":
-    case "monitor_timeout":
       return "The server could not start a usable emulator session. Check the emulator configuration and try again.";
+    case "monitor_timeout":
+      return error.message;
     case "not_connected":
     case "connection_closed":
     case "socket_write_failed":
@@ -399,14 +404,21 @@ function publicMessageFor(error) {
   }
 }
 function publicDetailsFor(error) {
-  switch (error.category) {
-    case "validation":
-    case "session_state":
-    case "unsupported":
-    case "io":
+  switch (error.code) {
+    case "binary_not_found":
+    case "spawn_failed":
+    case "emulator_crashed_on_startup":
       return error.details;
     default:
-      return void 0;
+      switch (error.category) {
+        case "validation":
+        case "session_state":
+        case "unsupported":
+        case "io":
+          return error.details;
+        default:
+          return void 0;
+      }
   }
 }
 function normalizeToolError(error) {
@@ -1524,6 +1536,10 @@ var ViceSession = class {
       this.#syncMonitorRuntimeState();
     });
   }
+  async getSessionState() {
+    await this.#ensureReady();
+    return this.snapshot();
+  }
   snapshot() {
     return {
       transportState: this.#transportState,
@@ -1760,6 +1776,17 @@ var ViceSession = class {
   async continueExecution(waitUntilRunningStable = false) {
     return this.#withExecutionLock(async () => {
       await this.#ensureReady();
+      if (this.#executionState === "running") {
+        const runtime2 = this.#client.runtimeState();
+        const debugState2 = this.#lastRegisters == null ? await this.#readDebugState() : this.#buildDebugState(this.#lastRegisters);
+        return {
+          executionState: "running",
+          lastStopReason: this.#lastStopReason,
+          programCounter: runtime2.programCounter ?? debugState2.programCounter,
+          registers: debugState2.registers,
+          warnings: []
+        };
+      }
       if (this.#executionState !== "stopped") {
         debuggerNotPausedError("execute resume", {
           executionState: this.#executionState,
@@ -1938,7 +1965,6 @@ var ViceSession = class {
   async programLoad(options) {
     const filePath = path.resolve(options.filePath);
     await this.#assertReadableProgramFile(filePath);
-    await this.#ensureRunning("program_load");
     this.#explicitPauseActive = false;
     const result = await this.autostartProgram(filePath, options.autoStart ?? true, options.fileIndex ?? 0);
     return {
@@ -2189,134 +2215,137 @@ var ViceSession = class {
     }
   }
   async writeText(text) {
-    await this.#ensureRunning("write_text");
-    const encoded = decodeWriteTextToPetscii(text);
-    if (encoded.length > MAX_WRITE_TEXT_BYTES) {
-      validationError("write_text exceeds the maximum allowed byte length for one request", {
-        length: encoded.length,
-        max: MAX_WRITE_TEXT_BYTES
-      });
-    }
-    this.#writeProcessLogLine(`[tx] write_text length=${encoded.length} text=${JSON.stringify(text)}`);
-    await this.#client.sendKeys(Buffer.from(encoded).toString("binary"));
-    await this.#settleInputState("write_text", "running");
-    return {
-      sent: true,
-      length: encoded.length
-    };
+    return await this.#withAutoResumeForInput("write_text", async () => {
+      const encoded = decodeWriteTextToPetscii(text);
+      if (encoded.length > MAX_WRITE_TEXT_BYTES) {
+        validationError("write_text exceeds the maximum allowed byte length for one request", {
+          length: encoded.length,
+          max: MAX_WRITE_TEXT_BYTES
+        });
+      }
+      this.#writeProcessLogLine(`[tx] write_text length=${encoded.length} text=${JSON.stringify(text)}`);
+      await this.#client.sendKeys(Buffer.from(encoded).toString("binary"));
+      await this.#settleInputState("write_text", "running");
+      return {
+        sent: true,
+        length: encoded.length
+      };
+    });
   }
   async keyboardInput(action, keys, durationMs) {
-    await this.#ensureRunning("keyboard_input");
-    if (!Array.isArray(keys) || keys.length === 0 || keys.length > 4) {
-      validationError("keyboard_input requires between 1 and 4 keys", { keys });
-    }
-    const resolvedKeys = keys.map((key) => resolveKeyboardInputKey(key));
-    const normalizedKeys = resolvedKeys.map((key) => key.canonical);
-    this.#writeProcessLogLine(
-      `[tx] keyboard_input action=${action} keys=${normalizedKeys.join(",")}${durationMs == null ? "" : ` durationMs=${durationMs}`}`
-    );
-    switch (action) {
-      case "tap": {
-        const duration = clampTapDuration(durationMs);
-        const bytes = Uint8Array.from(resolvedKeys.flatMap((key) => Array.from(key.bytes)));
-        await this.#client.sendKeys(Buffer.from(bytes).toString("binary"));
-        await this.#settleInputState("keyboard_input", "running");
-        await sleep(duration);
-        return {
-          action,
-          keys: normalizedKeys,
-          applied: true,
-          held: false,
-          mode: "buffered_text"
-        };
+    return await this.#withAutoResumeForInput("keyboard_input", async () => {
+      if (!Array.isArray(keys) || keys.length === 0 || keys.length > 4) {
+        validationError("keyboard_input requires between 1 and 4 keys", { keys });
       }
-      case "press": {
-        const singleByteKeys = resolvedKeys.map((key) => {
-          if (key.bytes.length !== 1) {
-            unsupportedError("keyboard_input press/release only supports keys that map to a single PETSCII byte.", {
-              key: key.canonical
-            });
-          }
-          return key.bytes[0];
-        });
-        for (let index = 0; index < normalizedKeys.length; index += 1) {
-          const heldKey = normalizedKeys[index];
-          const byte = singleByteKeys[index];
-          if (!this.#heldKeyboardIntervals.has(heldKey)) {
-            await this.#client.sendKeys(Buffer.from([byte]).toString("binary"));
-            await this.#settleInputState("keyboard_input", "running");
-            const interval = setInterval(() => {
-              void this.#client.sendKeys(Buffer.from([byte]).toString("binary")).then(() => this.#settleInputState("keyboard_input", "running")).catch(() => void 0);
-            }, DEFAULT_KEYBOARD_REPEAT_MS);
-            this.#heldKeyboardIntervals.set(heldKey, interval);
-          }
+      const resolvedKeys = keys.map((key) => resolveKeyboardInputKey(key));
+      const normalizedKeys = resolvedKeys.map((key) => key.canonical);
+      this.#writeProcessLogLine(
+        `[tx] keyboard_input action=${action} keys=${normalizedKeys.join(",")}${durationMs == null ? "" : ` durationMs=${durationMs}`}`
+      );
+      switch (action) {
+        case "tap": {
+          const duration = clampTapDuration(durationMs);
+          const bytes = Uint8Array.from(resolvedKeys.flatMap((key) => Array.from(key.bytes)));
+          await this.#client.sendKeys(Buffer.from(bytes).toString("binary"));
+          await this.#settleInputState("keyboard_input", "running");
+          await sleep(duration);
+          return {
+            action,
+            keys: normalizedKeys,
+            applied: true,
+            held: false,
+            mode: "buffered_text"
+          };
         }
-        return {
-          action,
-          keys: normalizedKeys,
-          applied: true,
-          held: true,
-          mode: "buffered_text_repeat"
-        };
-      }
-      case "release": {
-        for (const key of resolvedKeys) {
-          if (key.bytes.length !== 1) {
-            unsupportedError("keyboard_input press/release only supports keys that map to a single PETSCII byte.", {
-              key: key.canonical
-            });
+        case "press": {
+          const singleByteKeys = resolvedKeys.map((key) => {
+            if (key.bytes.length !== 1) {
+              unsupportedError("keyboard_input press/release only supports keys that map to a single PETSCII byte.", {
+                key: key.canonical
+              });
+            }
+            return key.bytes[0];
+          });
+          for (let index = 0; index < normalizedKeys.length; index += 1) {
+            const heldKey = normalizedKeys[index];
+            const byte = singleByteKeys[index];
+            if (!this.#heldKeyboardIntervals.has(heldKey)) {
+              await this.#client.sendKeys(Buffer.from([byte]).toString("binary"));
+              await this.#settleInputState("keyboard_input", "running");
+              const interval = setInterval(() => {
+                void this.#client.sendKeys(Buffer.from([byte]).toString("binary")).then(() => this.#settleInputState("keyboard_input", "running")).catch(() => void 0);
+              }, DEFAULT_KEYBOARD_REPEAT_MS);
+              this.#heldKeyboardIntervals.set(heldKey, interval);
+            }
           }
+          return {
+            action,
+            keys: normalizedKeys,
+            applied: true,
+            held: true,
+            mode: "buffered_text_repeat"
+          };
         }
-        for (const heldKey of normalizedKeys) {
-          const interval = this.#heldKeyboardIntervals.get(heldKey);
-          if (interval) {
-            clearInterval(interval);
-            this.#heldKeyboardIntervals.delete(heldKey);
+        case "release": {
+          for (const key of resolvedKeys) {
+            if (key.bytes.length !== 1) {
+              unsupportedError("keyboard_input press/release only supports keys that map to a single PETSCII byte.", {
+                key: key.canonical
+              });
+            }
           }
+          for (const heldKey of normalizedKeys) {
+            const interval = this.#heldKeyboardIntervals.get(heldKey);
+            if (interval) {
+              clearInterval(interval);
+              this.#heldKeyboardIntervals.delete(heldKey);
+            }
+          }
+          return {
+            action,
+            keys: normalizedKeys,
+            applied: true,
+            held: false,
+            mode: "buffered_text_repeat"
+          };
         }
-        return {
-          action,
-          keys: normalizedKeys,
-          applied: true,
-          held: false,
-          mode: "buffered_text_repeat"
-        };
       }
-    }
+    });
   }
   async joystickInput(port, action, control, durationMs) {
-    await this.#ensureRunning("joystick_input");
-    const previousExecutionState = this.#executionState;
-    const bit = JOYSTICK_CONTROL_BITS[control];
-    if (bit == null) {
-      validationError("Unsupported joystick control", { control });
-    }
-    this.#writeProcessLogLine(
-      `[tx] joystick_input port=${port} action=${action} control=${control}${durationMs == null ? "" : ` durationMs=${durationMs}`}`
-    );
-    switch (action) {
-      case "tap": {
-        const duration = clampTapDuration(durationMs);
-        await this.#applyJoystickMask(port, this.#getJoystickMask(port) & ~bit);
-        await sleep(duration);
-        await this.#applyJoystickMask(port, this.#getJoystickMask(port) | bit);
-        break;
+    return await this.#withAutoResumeForInput("joystick_input", async () => {
+      const previousExecutionState = this.#executionState;
+      const bit = JOYSTICK_CONTROL_BITS[control];
+      if (bit == null) {
+        validationError("Unsupported joystick control", { control });
       }
-      case "press":
-        await this.#applyJoystickMask(port, this.#getJoystickMask(port) & ~bit);
-        break;
-      case "release":
-        await this.#applyJoystickMask(port, this.#getJoystickMask(port) | bit);
-        break;
-    }
-    await this.#settleInputState("joystick_input", previousExecutionState);
-    return {
-      port,
-      action,
-      control,
-      applied: true,
-      state: this.#describeJoystickState(port)
-    };
+      this.#writeProcessLogLine(
+        `[tx] joystick_input port=${port} action=${action} control=${control}${durationMs == null ? "" : ` durationMs=${durationMs}`}`
+      );
+      switch (action) {
+        case "tap": {
+          const duration = clampTapDuration(durationMs);
+          await this.#applyJoystickMask(port, this.#getJoystickMask(port) & ~bit);
+          await sleep(duration);
+          await this.#applyJoystickMask(port, this.#getJoystickMask(port) | bit);
+          break;
+        }
+        case "press":
+          await this.#applyJoystickMask(port, this.#getJoystickMask(port) & ~bit);
+          break;
+        case "release":
+          await this.#applyJoystickMask(port, this.#getJoystickMask(port) | bit);
+          break;
+      }
+      await this.#settleInputState("joystick_input", previousExecutionState);
+      return {
+        port,
+        action,
+        control,
+        applied: true,
+        state: this.#describeJoystickState(port)
+      };
+    });
   }
   async waitForState(targetState, timeoutMs = 5e3, stableMs = targetState === "running" ? INPUT_RUNNING_STABLE_MS : 0) {
     await this.#ensureReady();
@@ -2379,6 +2408,27 @@ var ViceSession = class {
       });
     }
   }
+  async #withAutoResumeForInput(commandName, operation) {
+    await this.#ensureReady();
+    this.#syncMonitorRuntimeState();
+    const wasRunning = this.#executionState === "running";
+    const wasPaused = this.#explicitPauseActive;
+    if (!wasRunning) {
+      this.#writeProcessLogLine(`[${commandName}] auto-resuming for input operation`);
+      await this.#client.continueExecution();
+      await this.waitForState("running", 5e3, INPUT_RUNNING_STABLE_MS);
+    }
+    try {
+      return await operation();
+    } finally {
+      if (!wasRunning && wasPaused) {
+        this.#writeProcessLogLine(`[${commandName}] restoring paused state after input`);
+        await this.#client.ping();
+        await this.waitForState("stopped", 5e3, 0);
+        this.#explicitPauseActive = true;
+      }
+    }
+  }
   async #ensureHealthyConnection() {
     if (this.#recoveryPromise) {
       await this.#recoveryPromise;
@@ -2427,6 +2477,16 @@ var ViceSession = class {
     const port = await this.#portAllocator.allocate();
     await this.#portAllocator.ensureFree(port, host);
     const binary = config.binaryPath ?? DEFAULT_C64_BINARY;
+    const binaryCheck = await checkBinaryExists(binary);
+    if (!binaryCheck.exists) {
+      throw new ViceMcpError(
+        "binary_not_found",
+        `VICE emulator binary '${binary}' not found. Please install VICE or configure the correct path using the 'binaryPath' setting.`,
+        "process_launch",
+        false,
+        { binary, searchedPath: process.env.PATH }
+      );
+    }
     const args = ["-autostartprgmode", "1", "-binarymonitor", "-binarymonitoraddress", `${host}:${port}`];
     if (config.arguments) {
       args.push(...splitCommandLine(config.arguments));
@@ -2444,11 +2504,15 @@ var ViceSession = class {
     this.#lastRuntimeEventType = "unknown";
     this.#lastRuntimeProgramCounter = null;
     const env = await buildViceLaunchEnv();
+    let spawnError = void 0;
     const child = spawn(binary, args, {
       cwd: config.workingDirectory ? path.resolve(config.workingDirectory) : void 0,
       env,
       stdio: ["ignore", "pipe", "pipe"]
     });
+    child.once("error", (err) => {
+      spawnError = err;
+    });
     this.#process = child;
     this.#attachProcessLogging(child, binary, args);
     this.#bindProcessLifecycle(child);
@@ -2456,6 +2520,16 @@ var ViceSession = class {
     this.#transportState = "waiting_for_monitor";
     try {
       await waitForMonitor(host, port, 5e3);
+      if (spawnError !== void 0) {
+        const err = spawnError;
+        throw new ViceMcpError(
+          "spawn_failed",
+          `Failed to start VICE emulator '${binary}': ${err.message}`,
+          "process_launch",
+          false,
+          { binary, error: err.message, resolvedPath: binaryCheck.path }
+        );
+      }
       await this.#client.connect(host, port);
       this.#transportState = "connected";
       this.#connectedSince = nowIso();
@@ -2468,6 +2542,19 @@ var ViceSession = class {
     } catch (error) {
       this.#processState = "crashed";
       this.#transportState = "faulted";
+      if (error instanceof ViceMcpError && error.code === "monitor_timeout" && spawnError !== void 0) {
+        const err = spawnError;
+        const enhancedError = new ViceMcpError(
+          "emulator_crashed_on_startup",
+          `VICE emulator '${binary}' crashed during startup: ${err.message}`,
+          "process_launch",
+          false,
+          { binary, error: err.message, resolvedPath: binaryCheck.path }
+        );
+        this.#warnings = [...this.#warnings.filter((warning) => warning.code !== "launch_failed"), makeWarning(enhancedError.message, "launch_failed")];
+        await this.#stopManagedProcess(true);
+        throw enhancedError;
+      }
       this.#warnings = [...this.#warnings.filter((warning) => warning.code !== "launch_failed"), makeWarning(String(error.message ?? error), "launch_failed")];
       await this.#stopManagedProcess(true);
       throw error;
@@ -3208,6 +3295,27 @@ function splitCommandLine(input) {
   }
   return result;
 }
+async function checkBinaryExists(binaryPath) {
+  if (path.isAbsolute(binaryPath)) {
+    try {
+      await fs.access(binaryPath, fs.constants.X_OK);
+      return { exists: true, path: binaryPath };
+    } catch {
+      return { exists: false };
+    }
+  }
+  const pathEnv = process.env.PATH || "";
+  const pathDirs = pathEnv.split(path.delimiter);
+  for (const dir of pathDirs) {
+    const fullPath = path.join(dir, binaryPath);
+    try {
+      await fs.access(fullPath, fs.constants.X_OK);
+      return { exists: true, path: fullPath };
+    } catch {
+    }
+  }
+  return { exists: false };
+}
 async function waitForMonitor(host, port, timeoutMs) {
   const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
@@ -3216,7 +3324,7 @@ async function waitForMonitor(host, port, timeoutMs) {
     }
     await sleep(100);
   }
-  throw new ViceMcpError("monitor_timeout", `Debugger monitor did not open on ${host}:${port}`, "timeout", true, {
+  throw new ViceMcpError("monitor_timeout", `Debugger monitor did not open on ${host}:${port}. The emulator may have failed to start or crashed during startup.`, "timeout", true, {
     host,
     port
   });
@@ -3281,7 +3389,7 @@ var getSessionStateTool = createViceTool({
   description: "Returns emulator session state including transport/process status, auto-resume state, and the most recent hit checkpoint.",
   inputSchema: noInputSchema,
   dataSchema: sessionStateResultSchema,
-  execute: async () => c64Session.snapshot()
+  execute: async () => await c64Session.getSessionState()
 });
 var getRegistersTool = createViceTool({
   id: "get_registers",
@@ -3347,7 +3455,7 @@ var writeMemoryTool = createViceTool({
 });
 var executeTool = createViceTool({
   id: "execute",
-  description: "Controls execution with pause, resume, step, step_over, step_out, or reset. Resume can optionally wait until running becomes stable.",
+  description: "Controls execution with pause, resume, step, step_over, step_out, or reset. Pause and resume are idempotent (safe to call multiple times).",
   inputSchema: z3.object({
     action: z3.enum(["pause", "resume", "step", "step_over", "step_out", "reset"]),
     count: z3.number().int().positive().default(1).describe("Instruction count for step and step_over actions"),
@@ -3469,7 +3577,7 @@ var getDisplayTextTool = createViceTool({
 });
 var writeTextTool = createViceTool({
   id: "write_text",
-  description: 'Types text into the C64. Requires emulator to be running - call execute(action="resume") first if stopped. Supports escaped characters and PETSCII brace tokens like {RETURN}, {CLR}, {HOME}, {PI}, and color names. Limit 64 bytes per request.',
+  description: "Types text into the C64. Automatically resumes if stopped and restores pause state after. Supports escaped characters and PETSCII brace tokens like {RETURN}, {CLR}, {HOME}, {PI}, and color names. Limit 64 bytes per request.",
   inputSchema: z3.object({
     text: z3.string()
   }),
@@ -3481,7 +3589,7 @@ var writeTextTool = createViceTool({
 });
 var keyboardInputTool = createViceTool({
   id: "keyboard_input",
-  description: 'Sends one to four keys or PETSCII tokens to the C64. Requires emulator to be running - call execute(action="resume") first if stopped. Use for key presses, releases, and taps.',
+  description: "Sends one to four keys or PETSCII tokens to the C64. Automatically resumes if stopped and restores pause state after. Use for key presses, releases, and taps.",
   inputSchema: z3.object({
     action: inputActionSchema.describe("Use tap for a single key event or press/release for repeated buffered input"),
     keys: z3.array(z3.string().min(1)).min(1).max(4).describe("One to four literal keys or PETSCII token names such as RETURN, CLR, HOME, PI, LEFT, RED, or F1"),
@@ -3492,7 +3600,7 @@ var keyboardInputTool = createViceTool({
 });
 var joystickInputTool = createViceTool({
   id: "joystick_input",
-  description: 'Sends joystick input to C64 joystick port 1 or 2. Requires emulator to be running - call execute(action="resume") first if stopped.',
+  description: "Sends joystick input to C64 joystick port 1 or 2. Automatically resumes if stopped and restores pause state after.",
   inputSchema: z3.object({
     port: joystickPortSchema.describe("Joystick port number"),
     action: inputActionSchema.describe("Joystick action to apply"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c64-debug-mcp",
-  "version": "1.0.2",
+  "version": "1.0.6",
   "description": "Model Context Protocol server for C64 debugging via VICE emulator",
   "type": "module",
   "keywords": [