c64-debug-mcp 1.0.11 → 1.0.12

package/dist/http.cjs

@@ -213,7 +213,7 @@ function parseAddress16(input) {
   }
   return parsed;
 }
-var address16Schema = import_zod2.z.union([import_zod2.z.number().int().min(0).max(65535), import_zod2.z.string()]).describe("16-bit C64 address: decimal (53248) or hex string with prefix ($D000, 0xD000)");
+var address16Schema = import_zod2.z.preprocess(parseAddress16, import_zod2.z.number().int().min(0).max(65535)).describe("16-bit C64 address: decimal (53248) or hex string with prefix ($D000, 0xD000)");
 function parseByte(input) {
   if (typeof input === "number") {
     if (!Number.isInteger(input) || input < 0 || input > 255) {
@@ -337,7 +337,7 @@ function parseByte(input) {
     }
   ]);
 }
-var byteValueSchema = import_zod2.z.union([import_zod2.z.number().int().min(0).max(255), import_zod2.z.string()]).describe("8-bit byte value: decimal (255), hex with prefix ($FF, 0xFF), or binary with prefix (%11111111, 0b11111111)");
+var byteValueSchema = import_zod2.z.preprocess(parseByte, import_zod2.z.number().int().min(0).max(255)).describe("8-bit byte value: decimal (255), hex with prefix ($FF, 0xFF), or binary with prefix (%11111111, 0b11111111)");
 var byteArraySchema = import_zod2.z.array(byteValueSchema).describe('Array of byte values in mixed formats: [255, "$FF", "%11111111", 42]');
 var c64RegisterValueSchema = import_zod2.z.object(
   Object.fromEntries(
@@ -3641,14 +3641,23 @@ var readMemoryTool = createViceTool({
     import_zod4.z.object({
       address: address16Schema.describe("Start address: decimal (53248) or hex string with prefix ($D000, 0xD000)"),
       length: import_zod4.z.number().int().positive().max(65535).describe("Number of bytes to read")
+    }).refine((input) => input.address + input.length <= 65536, {
+      message: "address + length must stay within the 64K address space",
+      path: ["length"]
     }),
     import_zod4.z.object({
       start: address16Schema.describe("Start address (inclusive): decimal (53248) or hex string with prefix ($D000, 0xD000)"),
       end: address16Schema.describe("End address (inclusive): decimal (53248) or hex string with prefix ($D000, 0xD000)")
+    }).refine((input) => input.start <= input.end, {
+      message: "End address must be greater than or equal to start address",
+      path: ["end"]
+    }).refine((input) => input.end < 65536, {
+      message: "End address must stay within the 64K address space",
+      path: ["end"]
     })
   ]),
   dataSchema: import_zod4.z.object({
-    address: address16Schema.describe("Start address of the returned memory chunk"),
+    address: import_zod4.z.number().int().min(0).max(65535).describe("Start address of the returned memory chunk"),
     length: import_zod4.z.number().int().min(0).describe("Number of bytes returned"),
     data: byteArraySchema.describe("Raw bytes returned from memory")
   }),
@@ -3656,21 +3665,11 @@ var readMemoryTool = createViceTool({
     let address;
     let length;
     if ("start" in input && "end" in input) {
-      const start = parseAddress16(input.start);
-      const end = parseAddress16(input.end);
-      if (end < start) {
-        throw new Error("End address must be greater than or equal to start address");
-      }
-      address = start;
-      length = end - start + 1;
-    } else if ("address" in input && "length" in input) {
-      address = parseAddress16(input.address);
-      length = input.length;
+      address = input.start;
+      length = input.end - input.start + 1;
     } else {
-      throw new Error("Invalid input: must provide either (address, length) or (start, end)");
-    }
-    if (address + length > 65536) {
-      throw new Error("address + length must stay within the 64K address space");
+      address = input.address;
+      length = input.length;
     }
     const result = await c64Session.readMemory(address, address + length - 1);
     return {
@@ -3686,20 +3685,16 @@ var writeMemoryTool = createViceTool({
   inputSchema: import_zod4.z.object({
     address: address16Schema.describe("Start address: decimal (53248) or hex string with prefix ($D000, 0xD000)"),
     data: byteArraySchema.min(1).describe("Bytes to write: decimal (255), hex ($FF, 0xFF), or binary (%11111111, 0b11111111). Mixed formats allowed.")
+  }).refine((input) => input.address + input.data.length - 1 <= 65535, {
+    message: "address + data.length must stay within the 16-bit address space",
+    path: ["data"]
   }),
   dataSchema: import_zod4.z.object({
     worked: import_zod4.z.boolean().describe("Whether the write operation completed successfully"),
     address: import_zod4.z.number().int().min(0).max(65535).describe("Start address where the bytes were written"),
     length: import_zod4.z.number().int().min(1).describe("Number of bytes written")
   }).extend(debugStateSchema.shape),
-  execute: async (input) => {
-    const address = parseAddress16(input.address);
-    const data = input.data.map((b) => parseByte(b));
-    if (address + data.length - 1 > 65535) {
-      throw new Error("address + data.length must stay within the 16-bit address space");
-    }
-    return await c64Session.writeMemory(address, data);
-  }
+  execute: async (input) => await c64Session.writeMemory(input.address, input.data)
 });
 var executeTool = createViceTool({
   id: "execute",
@@ -3764,45 +3759,28 @@ var breakpointSetTool = createViceTool({
       label: import_zod4.z.string().optional(),
       temporary: import_zod4.z.boolean().default(false),
       enabled: import_zod4.z.boolean().default(true)
+    }).refine((input) => input.start <= input.end, {
+      message: "End address must be greater than or equal to start address",
+      path: ["end"]
     })
   ]),
   dataSchema: import_zod4.z.object({
     breakpoint: breakpointSchema,
     executionState: executionStateSchema,
     lastStopReason: stopReasonSchema,
-    programCounter: address16Schema.nullable(),
+    programCounter: import_zod4.z.number().int().min(0).max(65535).nullable(),
     registers: c64PartialRegisterValueSchema.nullable()
   }),
   execute: async (input) => {
-    let normalizedInput;
-    if ("start" in input && "end" in input) {
-      const start = parseAddress16(input.start);
-      const end = parseAddress16(input.end);
-      if (end < start) {
-        throw new Error("End address must be greater than or equal to start address");
-      }
-      normalizedInput = {
-        kind: input.kind,
-        address: start,
-        length: end - start + 1,
-        condition: input.condition,
-        label: input.label,
-        temporary: input.temporary,
-        enabled: input.enabled
-      };
-    } else if ("address" in input && "length" in input) {
-      normalizedInput = {
-        kind: input.kind,
-        address: parseAddress16(input.address),
-        length: input.length,
-        condition: input.condition,
-        label: input.label,
-        temporary: input.temporary,
-        enabled: input.enabled
-      };
-    } else {
-      throw new Error("Invalid input: must provide either (address, length) or (start, end)");
-    }
+    const normalizedInput = "start" in input && "end" in input ? {
+      kind: input.kind,
+      address: input.start,
+      length: input.end - input.start + 1,
+      condition: input.condition,
+      label: input.label,
+      temporary: input.temporary,
+      enabled: input.enabled
+    } : input;
     const result = await c64Session.breakpointSet(normalizedInput);
     return {
       breakpoint: normalizeBreakpoint(result.breakpoint),

package/dist/http.js

@@ -190,7 +190,7 @@ function parseAddress16(input) {
   }
   return parsed;
 }
-var address16Schema = z2.union([z2.number().int().min(0).max(65535), z2.string()]).describe("16-bit C64 address: decimal (53248) or hex string with prefix ($D000, 0xD000)");
+var address16Schema = z2.preprocess(parseAddress16, z2.number().int().min(0).max(65535)).describe("16-bit C64 address: decimal (53248) or hex string with prefix ($D000, 0xD000)");
 function parseByte(input) {
   if (typeof input === "number") {
     if (!Number.isInteger(input) || input < 0 || input > 255) {
@@ -314,7 +314,7 @@ function parseByte(input) {
     }
   ]);
 }
-var byteValueSchema = z2.union([z2.number().int().min(0).max(255), z2.string()]).describe("8-bit byte value: decimal (255), hex with prefix ($FF, 0xFF), or binary with prefix (%11111111, 0b11111111)");
+var byteValueSchema = z2.preprocess(parseByte, z2.number().int().min(0).max(255)).describe("8-bit byte value: decimal (255), hex with prefix ($FF, 0xFF), or binary with prefix (%11111111, 0b11111111)");
 var byteArraySchema = z2.array(byteValueSchema).describe('Array of byte values in mixed formats: [255, "$FF", "%11111111", 42]');
 var c64RegisterValueSchema = z2.object(
   Object.fromEntries(
@@ -3618,14 +3618,23 @@ var readMemoryTool = createViceTool({
     z3.object({
       address: address16Schema.describe("Start address: decimal (53248) or hex string with prefix ($D000, 0xD000)"),
       length: z3.number().int().positive().max(65535).describe("Number of bytes to read")
+    }).refine((input) => input.address + input.length <= 65536, {
+      message: "address + length must stay within the 64K address space",
+      path: ["length"]
     }),
     z3.object({
       start: address16Schema.describe("Start address (inclusive): decimal (53248) or hex string with prefix ($D000, 0xD000)"),
       end: address16Schema.describe("End address (inclusive): decimal (53248) or hex string with prefix ($D000, 0xD000)")
+    }).refine((input) => input.start <= input.end, {
+      message: "End address must be greater than or equal to start address",
+      path: ["end"]
+    }).refine((input) => input.end < 65536, {
+      message: "End address must stay within the 64K address space",
+      path: ["end"]
     })
   ]),
   dataSchema: z3.object({
-    address: address16Schema.describe("Start address of the returned memory chunk"),
+    address: z3.number().int().min(0).max(65535).describe("Start address of the returned memory chunk"),
     length: z3.number().int().min(0).describe("Number of bytes returned"),
     data: byteArraySchema.describe("Raw bytes returned from memory")
   }),
@@ -3633,21 +3642,11 @@ var readMemoryTool = createViceTool({
     let address;
     let length;
     if ("start" in input && "end" in input) {
-      const start = parseAddress16(input.start);
-      const end = parseAddress16(input.end);
-      if (end < start) {
-        throw new Error("End address must be greater than or equal to start address");
-      }
-      address = start;
-      length = end - start + 1;
-    } else if ("address" in input && "length" in input) {
-      address = parseAddress16(input.address);
-      length = input.length;
+      address = input.start;
+      length = input.end - input.start + 1;
     } else {
-      throw new Error("Invalid input: must provide either (address, length) or (start, end)");
-    }
-    if (address + length > 65536) {
-      throw new Error("address + length must stay within the 64K address space");
+      address = input.address;
+      length = input.length;
     }
     const result = await c64Session.readMemory(address, address + length - 1);
     return {
@@ -3663,20 +3662,16 @@ var writeMemoryTool = createViceTool({
   inputSchema: z3.object({
     address: address16Schema.describe("Start address: decimal (53248) or hex string with prefix ($D000, 0xD000)"),
     data: byteArraySchema.min(1).describe("Bytes to write: decimal (255), hex ($FF, 0xFF), or binary (%11111111, 0b11111111). Mixed formats allowed.")
+  }).refine((input) => input.address + input.data.length - 1 <= 65535, {
+    message: "address + data.length must stay within the 16-bit address space",
+    path: ["data"]
   }),
   dataSchema: z3.object({
     worked: z3.boolean().describe("Whether the write operation completed successfully"),
     address: z3.number().int().min(0).max(65535).describe("Start address where the bytes were written"),
     length: z3.number().int().min(1).describe("Number of bytes written")
   }).extend(debugStateSchema.shape),
-  execute: async (input) => {
-    const address = parseAddress16(input.address);
-    const data = input.data.map((b) => parseByte(b));
-    if (address + data.length - 1 > 65535) {
-      throw new Error("address + data.length must stay within the 16-bit address space");
-    }
-    return await c64Session.writeMemory(address, data);
-  }
+  execute: async (input) => await c64Session.writeMemory(input.address, input.data)
 });
 var executeTool = createViceTool({
   id: "execute",
@@ -3741,45 +3736,28 @@ var breakpointSetTool = createViceTool({
       label: z3.string().optional(),
       temporary: z3.boolean().default(false),
       enabled: z3.boolean().default(true)
+    }).refine((input) => input.start <= input.end, {
+      message: "End address must be greater than or equal to start address",
+      path: ["end"]
     })
   ]),
   dataSchema: z3.object({
     breakpoint: breakpointSchema,
     executionState: executionStateSchema,
     lastStopReason: stopReasonSchema,
-    programCounter: address16Schema.nullable(),
+    programCounter: z3.number().int().min(0).max(65535).nullable(),
     registers: c64PartialRegisterValueSchema.nullable()
   }),
   execute: async (input) => {
-    let normalizedInput;
-    if ("start" in input && "end" in input) {
-      const start = parseAddress16(input.start);
-      const end = parseAddress16(input.end);
-      if (end < start) {
-        throw new Error("End address must be greater than or equal to start address");
-      }
-      normalizedInput = {
-        kind: input.kind,
-        address: start,
-        length: end - start + 1,
-        condition: input.condition,
-        label: input.label,
-        temporary: input.temporary,
-        enabled: input.enabled
-      };
-    } else if ("address" in input && "length" in input) {
-      normalizedInput = {
-        kind: input.kind,
-        address: parseAddress16(input.address),
-        length: input.length,
-        condition: input.condition,
-        label: input.label,
-        temporary: input.temporary,
-        enabled: input.enabled
-      };
-    } else {
-      throw new Error("Invalid input: must provide either (address, length) or (start, end)");
-    }
+    const normalizedInput = "start" in input && "end" in input ? {
+      kind: input.kind,
+      address: input.start,
+      length: input.end - input.start + 1,
+      condition: input.condition,
+      label: input.label,
+      temporary: input.temporary,
+      enabled: input.enabled
+    } : input;
     const result = await c64Session.breakpointSet(normalizedInput);
     return {
       breakpoint: normalizeBreakpoint(result.breakpoint),

package/dist/stdio.cjs

@@ -210,7 +210,7 @@ function parseAddress16(input) {
   }
   return parsed;
 }
-var address16Schema = import_zod2.z.union([import_zod2.z.number().int().min(0).max(65535), import_zod2.z.string()]).describe("16-bit C64 address: decimal (53248) or hex string with prefix ($D000, 0xD000)");
+var address16Schema = import_zod2.z.preprocess(parseAddress16, import_zod2.z.number().int().min(0).max(65535)).describe("16-bit C64 address: decimal (53248) or hex string with prefix ($D000, 0xD000)");
 function parseByte(input) {
   if (typeof input === "number") {
     if (!Number.isInteger(input) || input < 0 || input > 255) {
@@ -334,7 +334,7 @@ function parseByte(input) {
     }
   ]);
 }
-var byteValueSchema = import_zod2.z.union([import_zod2.z.number().int().min(0).max(255), import_zod2.z.string()]).describe("8-bit byte value: decimal (255), hex with prefix ($FF, 0xFF), or binary with prefix (%11111111, 0b11111111)");
+var byteValueSchema = import_zod2.z.preprocess(parseByte, import_zod2.z.number().int().min(0).max(255)).describe("8-bit byte value: decimal (255), hex with prefix ($FF, 0xFF), or binary with prefix (%11111111, 0b11111111)");
 var byteArraySchema = import_zod2.z.array(byteValueSchema).describe('Array of byte values in mixed formats: [255, "$FF", "%11111111", 42]');
 var c64RegisterValueSchema = import_zod2.z.object(
   Object.fromEntries(
@@ -3638,14 +3638,23 @@ var readMemoryTool = createViceTool({
     import_zod4.z.object({
       address: address16Schema.describe("Start address: decimal (53248) or hex string with prefix ($D000, 0xD000)"),
       length: import_zod4.z.number().int().positive().max(65535).describe("Number of bytes to read")
+    }).refine((input) => input.address + input.length <= 65536, {
+      message: "address + length must stay within the 64K address space",
+      path: ["length"]
     }),
     import_zod4.z.object({
       start: address16Schema.describe("Start address (inclusive): decimal (53248) or hex string with prefix ($D000, 0xD000)"),
       end: address16Schema.describe("End address (inclusive): decimal (53248) or hex string with prefix ($D000, 0xD000)")
+    }).refine((input) => input.start <= input.end, {
+      message: "End address must be greater than or equal to start address",
+      path: ["end"]
+    }).refine((input) => input.end < 65536, {
+      message: "End address must stay within the 64K address space",
+      path: ["end"]
     })
   ]),
   dataSchema: import_zod4.z.object({
-    address: address16Schema.describe("Start address of the returned memory chunk"),
+    address: import_zod4.z.number().int().min(0).max(65535).describe("Start address of the returned memory chunk"),
     length: import_zod4.z.number().int().min(0).describe("Number of bytes returned"),
     data: byteArraySchema.describe("Raw bytes returned from memory")
   }),
@@ -3653,21 +3662,11 @@ var readMemoryTool = createViceTool({
     let address;
     let length;
     if ("start" in input && "end" in input) {
-      const start = parseAddress16(input.start);
-      const end = parseAddress16(input.end);
-      if (end < start) {
-        throw new Error("End address must be greater than or equal to start address");
-      }
-      address = start;
-      length = end - start + 1;
-    } else if ("address" in input && "length" in input) {
-      address = parseAddress16(input.address);
-      length = input.length;
+      address = input.start;
+      length = input.end - input.start + 1;
     } else {
-      throw new Error("Invalid input: must provide either (address, length) or (start, end)");
-    }
-    if (address + length > 65536) {
-      throw new Error("address + length must stay within the 64K address space");
+      address = input.address;
+      length = input.length;
     }
     const result = await c64Session.readMemory(address, address + length - 1);
     return {
@@ -3683,20 +3682,16 @@ var writeMemoryTool = createViceTool({
   inputSchema: import_zod4.z.object({
     address: address16Schema.describe("Start address: decimal (53248) or hex string with prefix ($D000, 0xD000)"),
     data: byteArraySchema.min(1).describe("Bytes to write: decimal (255), hex ($FF, 0xFF), or binary (%11111111, 0b11111111). Mixed formats allowed.")
+  }).refine((input) => input.address + input.data.length - 1 <= 65535, {
+    message: "address + data.length must stay within the 16-bit address space",
+    path: ["data"]
   }),
   dataSchema: import_zod4.z.object({
     worked: import_zod4.z.boolean().describe("Whether the write operation completed successfully"),
     address: import_zod4.z.number().int().min(0).max(65535).describe("Start address where the bytes were written"),
     length: import_zod4.z.number().int().min(1).describe("Number of bytes written")
   }).extend(debugStateSchema.shape),
-  execute: async (input) => {
-    const address = parseAddress16(input.address);
-    const data = input.data.map((b) => parseByte(b));
-    if (address + data.length - 1 > 65535) {
-      throw new Error("address + data.length must stay within the 16-bit address space");
-    }
-    return await c64Session.writeMemory(address, data);
-  }
+  execute: async (input) => await c64Session.writeMemory(input.address, input.data)
 });
 var executeTool = createViceTool({
   id: "execute",
@@ -3761,45 +3756,28 @@ var breakpointSetTool = createViceTool({
       label: import_zod4.z.string().optional(),
       temporary: import_zod4.z.boolean().default(false),
       enabled: import_zod4.z.boolean().default(true)
+    }).refine((input) => input.start <= input.end, {
+      message: "End address must be greater than or equal to start address",
+      path: ["end"]
     })
   ]),
   dataSchema: import_zod4.z.object({
     breakpoint: breakpointSchema,
     executionState: executionStateSchema,
     lastStopReason: stopReasonSchema,
-    programCounter: address16Schema.nullable(),
+    programCounter: import_zod4.z.number().int().min(0).max(65535).nullable(),
     registers: c64PartialRegisterValueSchema.nullable()
   }),
   execute: async (input) => {
-    let normalizedInput;
-    if ("start" in input && "end" in input) {
-      const start = parseAddress16(input.start);
-      const end = parseAddress16(input.end);
-      if (end < start) {
-        throw new Error("End address must be greater than or equal to start address");
-      }
-      normalizedInput = {
-        kind: input.kind,
-        address: start,
-        length: end - start + 1,
-        condition: input.condition,
-        label: input.label,
-        temporary: input.temporary,
-        enabled: input.enabled
-      };
-    } else if ("address" in input && "length" in input) {
-      normalizedInput = {
-        kind: input.kind,
-        address: parseAddress16(input.address),
-        length: input.length,
-        condition: input.condition,
-        label: input.label,
-        temporary: input.temporary,
-        enabled: input.enabled
-      };
-    } else {
-      throw new Error("Invalid input: must provide either (address, length) or (start, end)");
-    }
+    const normalizedInput = "start" in input && "end" in input ? {
+      kind: input.kind,
+      address: input.start,
+      length: input.end - input.start + 1,
+      condition: input.condition,
+      label: input.label,
+      temporary: input.temporary,
+      enabled: input.enabled
+    } : input;
     const result = await c64Session.breakpointSet(normalizedInput);
     return {
       breakpoint: normalizeBreakpoint(result.breakpoint),

package/dist/stdio.js

@@ -187,7 +187,7 @@ function parseAddress16(input) {
   }
   return parsed;
 }
-var address16Schema = z2.union([z2.number().int().min(0).max(65535), z2.string()]).describe("16-bit C64 address: decimal (53248) or hex string with prefix ($D000, 0xD000)");
+var address16Schema = z2.preprocess(parseAddress16, z2.number().int().min(0).max(65535)).describe("16-bit C64 address: decimal (53248) or hex string with prefix ($D000, 0xD000)");
 function parseByte(input) {
   if (typeof input === "number") {
     if (!Number.isInteger(input) || input < 0 || input > 255) {
@@ -311,7 +311,7 @@ function parseByte(input) {
     }
   ]);
 }
-var byteValueSchema = z2.union([z2.number().int().min(0).max(255), z2.string()]).describe("8-bit byte value: decimal (255), hex with prefix ($FF, 0xFF), or binary with prefix (%11111111, 0b11111111)");
+var byteValueSchema = z2.preprocess(parseByte, z2.number().int().min(0).max(255)).describe("8-bit byte value: decimal (255), hex with prefix ($FF, 0xFF), or binary with prefix (%11111111, 0b11111111)");
 var byteArraySchema = z2.array(byteValueSchema).describe('Array of byte values in mixed formats: [255, "$FF", "%11111111", 42]');
 var c64RegisterValueSchema = z2.object(
   Object.fromEntries(
@@ -3615,14 +3615,23 @@ var readMemoryTool = createViceTool({
     z3.object({
       address: address16Schema.describe("Start address: decimal (53248) or hex string with prefix ($D000, 0xD000)"),
       length: z3.number().int().positive().max(65535).describe("Number of bytes to read")
+    }).refine((input) => input.address + input.length <= 65536, {
+      message: "address + length must stay within the 64K address space",
+      path: ["length"]
     }),
     z3.object({
       start: address16Schema.describe("Start address (inclusive): decimal (53248) or hex string with prefix ($D000, 0xD000)"),
       end: address16Schema.describe("End address (inclusive): decimal (53248) or hex string with prefix ($D000, 0xD000)")
+    }).refine((input) => input.start <= input.end, {
+      message: "End address must be greater than or equal to start address",
+      path: ["end"]
+    }).refine((input) => input.end < 65536, {
+      message: "End address must stay within the 64K address space",
+      path: ["end"]
     })
   ]),
   dataSchema: z3.object({
-    address: address16Schema.describe("Start address of the returned memory chunk"),
+    address: z3.number().int().min(0).max(65535).describe("Start address of the returned memory chunk"),
     length: z3.number().int().min(0).describe("Number of bytes returned"),
     data: byteArraySchema.describe("Raw bytes returned from memory")
   }),
@@ -3630,21 +3639,11 @@ var readMemoryTool = createViceTool({
     let address;
     let length;
     if ("start" in input && "end" in input) {
-      const start = parseAddress16(input.start);
-      const end = parseAddress16(input.end);
-      if (end < start) {
-        throw new Error("End address must be greater than or equal to start address");
-      }
-      address = start;
-      length = end - start + 1;
-    } else if ("address" in input && "length" in input) {
-      address = parseAddress16(input.address);
-      length = input.length;
+      address = input.start;
+      length = input.end - input.start + 1;
     } else {
-      throw new Error("Invalid input: must provide either (address, length) or (start, end)");
-    }
-    if (address + length > 65536) {
-      throw new Error("address + length must stay within the 64K address space");
+      address = input.address;
+      length = input.length;
     }
     const result = await c64Session.readMemory(address, address + length - 1);
     return {
@@ -3660,20 +3659,16 @@ var writeMemoryTool = createViceTool({
   inputSchema: z3.object({
     address: address16Schema.describe("Start address: decimal (53248) or hex string with prefix ($D000, 0xD000)"),
     data: byteArraySchema.min(1).describe("Bytes to write: decimal (255), hex ($FF, 0xFF), or binary (%11111111, 0b11111111). Mixed formats allowed.")
+  }).refine((input) => input.address + input.data.length - 1 <= 65535, {
+    message: "address + data.length must stay within the 16-bit address space",
+    path: ["data"]
   }),
   dataSchema: z3.object({
     worked: z3.boolean().describe("Whether the write operation completed successfully"),
     address: z3.number().int().min(0).max(65535).describe("Start address where the bytes were written"),
     length: z3.number().int().min(1).describe("Number of bytes written")
   }).extend(debugStateSchema.shape),
-  execute: async (input) => {
-    const address = parseAddress16(input.address);
-    const data = input.data.map((b) => parseByte(b));
-    if (address + data.length - 1 > 65535) {
-      throw new Error("address + data.length must stay within the 16-bit address space");
-    }
-    return await c64Session.writeMemory(address, data);
-  }
+  execute: async (input) => await c64Session.writeMemory(input.address, input.data)
 });
 var executeTool = createViceTool({
   id: "execute",
@@ -3738,45 +3733,28 @@ var breakpointSetTool = createViceTool({
       label: z3.string().optional(),
       temporary: z3.boolean().default(false),
       enabled: z3.boolean().default(true)
+    }).refine((input) => input.start <= input.end, {
+      message: "End address must be greater than or equal to start address",
+      path: ["end"]
     })
   ]),
   dataSchema: z3.object({
     breakpoint: breakpointSchema,
     executionState: executionStateSchema,
     lastStopReason: stopReasonSchema,
-    programCounter: address16Schema.nullable(),
+    programCounter: z3.number().int().min(0).max(65535).nullable(),
     registers: c64PartialRegisterValueSchema.nullable()
   }),
   execute: async (input) => {
-    let normalizedInput;
-    if ("start" in input && "end" in input) {
-      const start = parseAddress16(input.start);
-      const end = parseAddress16(input.end);
-      if (end < start) {
-        throw new Error("End address must be greater than or equal to start address");
-      }
-      normalizedInput = {
-        kind: input.kind,
-        address: start,
-        length: end - start + 1,
-        condition: input.condition,
-        label: input.label,
-        temporary: input.temporary,
-        enabled: input.enabled
-      };
-    } else if ("address" in input && "length" in input) {
-      normalizedInput = {
-        kind: input.kind,
-        address: parseAddress16(input.address),
-        length: input.length,
-        condition: input.condition,
-        label: input.label,
-        temporary: input.temporary,
-        enabled: input.enabled
-      };
-    } else {
-      throw new Error("Invalid input: must provide either (address, length) or (start, end)");
-    }
+    const normalizedInput = "start" in input && "end" in input ? {
+      kind: input.kind,
+      address: input.start,
+      length: input.end - input.start + 1,
+      condition: input.condition,
+      label: input.label,
+      temporary: input.temporary,
+      enabled: input.enabled
+    } : input;
     const result = await c64Session.breakpointSet(normalizedInput);
     return {
       breakpoint: normalizeBreakpoint(result.breakpoint),

package/package.json

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