c64bridge 1.0.3 → 1.0.5

package/mcp/schemas/c64_program.schema.json

@@ -185,8 +185,7 @@
         "boolean",
         "null"
       ],
-      "description": "Capture debugreg state",
-      "default": true
+      "description": "Capture Ultimate debug registers (C64U/U64 only). Defaults to true on C64U/U64 and false on U2/VICE."
     },
     "platforms": {
       "type": [
@@ -199,13 +198,10 @@
         "minLength": 1,
         "enum": [
           "vice",
-          "c64u"
+          "c64u",
+          "u2"
         ]
-      },
-      "default": [
-        "vice",
-        "c64u"
-      ]
+      }
     },
     "messageTemplate": {
       "type": [
@@ -221,7 +217,7 @@
         "boolean",
         "null"
       ],
-      "description": "Capture a framebuffer screenshot and save it as a PNG per backend.",
+      "description": "Capture a framebuffer screenshot on C64U/U64 or VICE. U2 skips screenshots by default; explicitly requesting one on U2 fails before execution.",
       "default": true
     },
     "restoreActiveBackend": {
@@ -623,8 +619,7 @@
               "boolean",
               "null"
             ],
-            "description": "Capture debugreg state",
-            "default": true
+            "description": "Capture Ultimate debug registers (C64U/U64 only). Defaults to true on C64U/U64 and false on U2/VICE."
           },
           "op": {
             "const": "bundle_run"
@@ -667,13 +662,10 @@
               "minLength": 1,
               "enum": [
                 "vice",
-                "c64u"
+                "c64u",
+                "u2"
               ]
-            },
-            "default": [
-              "vice",
-              "c64u"
-            ]
+            }
           },
           "messageTemplate": {
             "type": [
@@ -697,7 +689,7 @@
               "boolean",
               "null"
             ],
-            "description": "Capture a framebuffer screenshot and save it as a PNG per backend.",
+            "description": "Capture a framebuffer screenshot on C64U/U64 or VICE. U2 skips screenshots by default; explicitly requesting one on U2 fails before execution.",
             "default": true
           },
           "outputPath": {

package/mcp/schemas/c64_sound.schema.json

@@ -223,7 +223,7 @@
         "string",
         "null"
       ],
-      "description": "Playback target format.",
+      "description": "Playback target format. PRG works on all backends; SID playback requires C64U/U64 or U2 (SID export with dryRun works everywhere).",
       "enum": [
         "prg",
         "sid"
@@ -249,7 +249,8 @@
         "minLength": 1,
         "enum": [
           "vice",
-          "c64u"
+          "c64u",
+          "u2"
         ]
       }
     },
@@ -815,7 +816,7 @@
               "string",
               "null"
             ],
-            "description": "Playback target format.",
+            "description": "Playback target format. PRG works on all backends; SID playback requires C64U/U64 or U2 (SID export with dryRun works everywhere).",
             "enum": [
               "prg",
               "sid"
@@ -876,7 +877,8 @@
               "minLength": 1,
               "enum": [
                 "vice",
-                "c64u"
+                "c64u",
+                "u2"
               ]
             }
           },
@@ -885,7 +887,7 @@
               "boolean",
               "null"
             ],
-            "description": "Capture and analyze audio on supported backends after playback starts.",
+            "description": "Capture and analyze audio after playback starts: native streaming on C64U/U64, host audio input on U2/VICE (PortAudio required).",
             "default": true
           },
           "analysisDurationSeconds": {
@@ -969,7 +971,7 @@
               "string",
               "null"
             ],
-            "description": "Playback artifact format.",
+            "description": "Playback artifact format. PRG works on all backends; SID attachment playback requires C64U/U64 or U2.",
             "enum": [
               "prg",
               "sid"

package/mcp/schemas/c64_system.schema.json

@@ -22,8 +22,9 @@
     },
     "name": {
       "type": "string",
-      "description": "Unique task name",
-      "minLength": 1
+      "description": "Unique task name (letters, digits, spaces, '_', '-', '.'; must not start with '.' or a space).",
+      "minLength": 1,
+      "pattern": "^[A-Za-z0-9_][A-Za-z0-9_. -]*$"
     },
     "operation": {
       "type": "string",
@@ -91,7 +92,7 @@
   "required": [
     "op"
   ],
-  "description": "System operations available via the c64_system tool.\n\nOperations:\n- pause: Pause the machine until resumed. Required inputs: none.\n- resume: Resume CPU execution after a pause. Required inputs: none.\n- reset: Issue a soft reset without cutting power. Required inputs: none.\n- reboot: Trigger a firmware reboot to recover from faults. Required inputs: none.\n- poweroff: Request a controlled shutdown via the Ultimate firmware. Required inputs: none.\n- power_cycle: Return the active backend to a fresh state. C64U/U64 Tool Menu verification requires machine:menu_screen (a C64U firmware version that provides it, or U64 3.15+); U2-family reboots through REST. Required inputs: none.\n- menu: Toggle the Ultimate menu button for navigation. Required inputs: none.\n- read_menu_screen: Read the active Ultimate menu's raw character and colour matrix through machine:menu_screen (a C64U firmware version that provides it, or U64/U2 3.15+). Required inputs: none.\n- start_task: Start a named background task that runs on an interval. Required inputs: name, operation. Optional inputs: arguments, intervalMs, maxIterations.\n- stop_task: Stop a specific background task and clear its timer. Required inputs: name.\n- stop_all_tasks: Stop every running background task and persist state. Required inputs: none.\n- list_tasks: List known background tasks with status metadata. Required inputs: none.\n- performance_report: Summarize diagnostics spans and tool latencies from the current or latest MCP session. Required inputs: none. Optional inputs: scope, includeTimeline, maxEntries.",
+  "description": "System operations available via the c64_system tool.\n\nOperations:\n- pause: Pause the machine until resumed. Required inputs: none.\n- resume: Resume CPU execution after a pause. Required inputs: none.\n- reset: Issue a soft reset without cutting power. Required inputs: none.\n- reboot: Trigger a firmware reboot to recover from faults. Required inputs: none.\n- poweroff: Shut down C64U/U64 or quit VICE. U2-family hardware cannot power off. Required inputs: none.\n- power_cycle: Return the active backend to a fresh state. C64U/U64 Tool Menu verification requires machine:menu_screen (a C64U firmware version that provides it, or U64 3.15+); U2-family reboots through REST. Required inputs: none.\n- menu: Toggle the Ultimate menu button for navigation. Required inputs: none.\n- read_menu_screen: Read the active Ultimate menu's raw character and colour matrix through machine:menu_screen (a C64U firmware version that provides it, or U64/U2 3.15+). Required inputs: none.\n- start_task: Start a named background task that runs on an interval. Required inputs: name, operation. Optional inputs: arguments, intervalMs, maxIterations.\n- stop_task: Stop a specific background task and clear its timer. Required inputs: name.\n- stop_all_tasks: Stop every running background task and persist state. Required inputs: none.\n- list_tasks: List known background tasks with status metadata. Required inputs: none.\n- performance_report: Summarize diagnostics spans and tool latencies from the current or latest MCP session. Required inputs: none. Optional inputs: scope, includeTimeline, maxEntries.",
   "additionalProperties": false,
   "x-c64bridge-operations": [
     {
@@ -172,12 +173,12 @@
     },
     {
       "op": "poweroff",
-      "description": "Request a controlled shutdown via the Ultimate firmware.",
+      "description": "Shut down C64U/U64 or quit VICE. U2-family hardware cannot power off.",
       "required": [],
       "optional": [],
       "inputSchema": {
         "type": "object",
-        "description": "Request a controlled shutdown via the Ultimate firmware.",
+        "description": "Shut down C64U/U64 or quit VICE. U2-family hardware cannot power off.",
         "properties": {
           "op": {
             "const": "poweroff"
@@ -264,8 +265,9 @@
         "properties": {
           "name": {
             "type": "string",
-            "description": "Unique task name",
-            "minLength": 1
+            "description": "Unique task name (letters, digits, spaces, '_', '-', '.'; must not start with '.' or a space).",
+            "minLength": 1,
+            "pattern": "^[A-Za-z0-9_][A-Za-z0-9_. -]*$"
           },
           "operation": {
             "type": "string",

package/mcp/server.json

@@ -1,6 +1,6 @@
 {
   "name": "c64bridge",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Stdio-based Model Context Protocol (MCP) server that bridges Commodore 64 Ultimate hardware with AI agents.",
   "transports": [
     "stdio"

package/mcp/tools.json

@@ -191,8 +191,7 @@
               "boolean",
               "null"
             ],
-            "description": "Capture debugreg state",
-            "default": true
+            "description": "Capture Ultimate debug registers (C64U/U64 only). Defaults to true on C64U/U64 and false on U2/VICE."
           },
           "platforms": {
             "type": [
@@ -205,13 +204,10 @@
               "minLength": 1,
               "enum": [
                 "vice",
-                "c64u"
+                "c64u",
+                "u2"
               ]
-            },
-            "default": [
-              "vice",
-              "c64u"
-            ]
+            }
           },
           "messageTemplate": {
             "type": [
@@ -227,7 +223,7 @@
               "boolean",
               "null"
             ],
-            "description": "Capture a framebuffer screenshot and save it as a PNG per backend.",
+            "description": "Capture a framebuffer screenshot on C64U/U64 or VICE. U2 skips screenshots by default; explicitly requesting one on U2 fails before execution.",
             "default": true
           },
           "restoreActiveBackend": {
@@ -629,8 +625,7 @@
                     "boolean",
                     "null"
                   ],
-                  "description": "Capture debugreg state",
-                  "default": true
+                  "description": "Capture Ultimate debug registers (C64U/U64 only). Defaults to true on C64U/U64 and false on U2/VICE."
                 },
                 "op": {
                   "const": "bundle_run"
@@ -673,13 +668,10 @@
                     "minLength": 1,
                     "enum": [
                       "vice",
-                      "c64u"
+                      "c64u",
+                      "u2"
                     ]
-                  },
-                  "default": [
-                    "vice",
-                    "c64u"
-                  ]
+                  }
                 },
                 "messageTemplate": {
                   "type": [
@@ -703,7 +695,7 @@
                     "boolean",
                     "null"
                   ],
-                  "description": "Capture a framebuffer screenshot and save it as a PNG per backend.",
+                  "description": "Capture a framebuffer screenshot on C64U/U64 or VICE. U2 skips screenshots by default; explicitly requesting one on U2 fails before execution.",
                   "default": true
                 },
                 "outputPath": {
@@ -815,10 +807,6 @@
           "run_crt": [
             "c64u",
             "u2"
-          ],
-          "bundle_run": [
-            "c64u",
-            "u2"
           ]
         }
       }
@@ -1829,7 +1817,7 @@
               "string",
               "null"
             ],
-            "description": "Playback target format.",
+            "description": "Playback target format. PRG works on all backends; SID playback requires C64U/U64 or U2 (SID export with dryRun works everywhere).",
             "enum": [
               "prg",
               "sid"
@@ -1855,7 +1843,8 @@
               "minLength": 1,
               "enum": [
                 "vice",
-                "c64u"
+                "c64u",
+                "u2"
               ]
             }
           },
@@ -2421,7 +2410,7 @@
                     "string",
                     "null"
                   ],
-                  "description": "Playback target format.",
+                  "description": "Playback target format. PRG works on all backends; SID playback requires C64U/U64 or U2 (SID export with dryRun works everywhere).",
                   "enum": [
                     "prg",
                     "sid"
@@ -2482,7 +2471,8 @@
                     "minLength": 1,
                     "enum": [
                       "vice",
-                      "c64u"
+                      "c64u",
+                      "u2"
                     ]
                   }
                 },
@@ -2491,7 +2481,7 @@
                     "boolean",
                     "null"
                   ],
-                  "description": "Capture and analyze audio on supported backends after playback starts.",
+                  "description": "Capture and analyze audio after playback starts: native streaming on C64U/U64, host audio input on U2/VICE (PortAudio required).",
                   "default": true
                 },
                 "analysisDurationSeconds": {
@@ -2575,7 +2565,7 @@
                     "string",
                     "null"
                   ],
-                  "description": "Playback artifact format.",
+                  "description": "Playback artifact format. PRG works on all backends; SID attachment playback requires C64U/U64 or U2.",
                   "enum": [
                     "prg",
                     "sid"
@@ -2838,13 +2828,18 @@
           ],
           "pipeline": [
             "c64u",
-            "u2"
+            "u2",
+            "vice"
           ],
           "analyze": [
-            "c64u"
+            "c64u",
+            "u2",
+            "vice"
           ],
           "record_analyze": [
-            "c64u"
+            "c64u",
+            "u2",
+            "vice"
           ]
         }
       }
@@ -2877,8 +2872,9 @@
           },
           "name": {
             "type": "string",
-            "description": "Unique task name",
-            "minLength": 1
+            "description": "Unique task name (letters, digits, spaces, '_', '-', '.'; must not start with '.' or a space).",
+            "minLength": 1,
+            "pattern": "^[A-Za-z0-9_][A-Za-z0-9_. -]*$"
           },
           "operation": {
             "type": "string",
@@ -2946,7 +2942,7 @@
         "required": [
           "op"
         ],
-        "description": "System operations available via the c64_system tool.\n\nOperations:\n- pause: Pause the machine until resumed. Required inputs: none.\n- resume: Resume CPU execution after a pause. Required inputs: none.\n- reset: Issue a soft reset without cutting power. Required inputs: none.\n- reboot: Trigger a firmware reboot to recover from faults. Required inputs: none.\n- poweroff: Request a controlled shutdown via the Ultimate firmware. Required inputs: none.\n- power_cycle: Return the active backend to a fresh state. C64U/U64 Tool Menu verification requires machine:menu_screen (a C64U firmware version that provides it, or U64 3.15+); U2-family reboots through REST. Required inputs: none.\n- menu: Toggle the Ultimate menu button for navigation. Required inputs: none.\n- read_menu_screen: Read the active Ultimate menu's raw character and colour matrix through machine:menu_screen (a C64U firmware version that provides it, or U64/U2 3.15+). Required inputs: none.\n- start_task: Start a named background task that runs on an interval. Required inputs: name, operation. Optional inputs: arguments, intervalMs, maxIterations.\n- stop_task: Stop a specific background task and clear its timer. Required inputs: name.\n- stop_all_tasks: Stop every running background task and persist state. Required inputs: none.\n- list_tasks: List known background tasks with status metadata. Required inputs: none.\n- performance_report: Summarize diagnostics spans and tool latencies from the current or latest MCP session. Required inputs: none. Optional inputs: scope, includeTimeline, maxEntries.",
+        "description": "System operations available via the c64_system tool.\n\nOperations:\n- pause: Pause the machine until resumed. Required inputs: none.\n- resume: Resume CPU execution after a pause. Required inputs: none.\n- reset: Issue a soft reset without cutting power. Required inputs: none.\n- reboot: Trigger a firmware reboot to recover from faults. Required inputs: none.\n- poweroff: Shut down C64U/U64 or quit VICE. U2-family hardware cannot power off. Required inputs: none.\n- power_cycle: Return the active backend to a fresh state. C64U/U64 Tool Menu verification requires machine:menu_screen (a C64U firmware version that provides it, or U64 3.15+); U2-family reboots through REST. Required inputs: none.\n- menu: Toggle the Ultimate menu button for navigation. Required inputs: none.\n- read_menu_screen: Read the active Ultimate menu's raw character and colour matrix through machine:menu_screen (a C64U firmware version that provides it, or U64/U2 3.15+). Required inputs: none.\n- start_task: Start a named background task that runs on an interval. Required inputs: name, operation. Optional inputs: arguments, intervalMs, maxIterations.\n- stop_task: Stop a specific background task and clear its timer. Required inputs: name.\n- stop_all_tasks: Stop every running background task and persist state. Required inputs: none.\n- list_tasks: List known background tasks with status metadata. Required inputs: none.\n- performance_report: Summarize diagnostics spans and tool latencies from the current or latest MCP session. Required inputs: none. Optional inputs: scope, includeTimeline, maxEntries.",
         "additionalProperties": false,
         "x-c64bridge-operations": [
           {
@@ -3027,12 +3023,12 @@
           },
           {
             "op": "poweroff",
-            "description": "Request a controlled shutdown via the Ultimate firmware.",
+            "description": "Shut down C64U/U64 or quit VICE. U2-family hardware cannot power off.",
             "required": [],
             "optional": [],
             "inputSchema": {
               "type": "object",
-              "description": "Request a controlled shutdown via the Ultimate firmware.",
+              "description": "Shut down C64U/U64 or quit VICE. U2-family hardware cannot power off.",
               "properties": {
                 "op": {
                   "const": "poweroff"
@@ -3119,8 +3115,9 @@
               "properties": {
                 "name": {
                   "type": "string",
-                  "description": "Unique task name",
-                  "minLength": 1
+                  "description": "Unique task name (letters, digits, spaces, '_', '-', '.'; must not start with '.' or a space).",
+                  "minLength": 1,
+                  "pattern": "^[A-Za-z0-9_][A-Za-z0-9_. -]*$"
                 },
                 "operation": {
                   "type": "string",
@@ -3338,6 +3335,10 @@
           "vice"
         ],
         "operationPlatforms": {
+          "poweroff": [
+            "c64u",
+            "vice"
+          ],
           "pause": [
             "c64u",
             "u2"
@@ -4183,7 +4184,13 @@
           "c64u",
           "u2",
           "vice"
-        ]
+        ],
+        "operationPlatforms": {
+          "capture_frame": [
+            "c64u",
+            "vice"
+          ]
+        }
       }
     },
     {
@@ -5732,7 +5739,7 @@
               "boolean",
               "null"
             ],
-            "description": "When true, save the restored configuration to flash immediately.",
+            "description": "When true, save the restored configuration to flash immediately (C64U/U64 and U2 only).",
             "default": false
           },
           "root": {
@@ -6131,7 +6138,7 @@
                     "boolean",
                     "null"
                   ],
-                  "description": "When true, save the restored configuration to flash immediately.",
+                  "description": "When true, save the restored configuration to flash immediately (C64U/U64 and U2 only).",
                   "default": false
                 },
                 "op": {
@@ -6954,8 +6961,16 @@
           "Summarise output file paths or sample counts so users can inspect artifacts quickly."
         ],
         "platforms": [
-          "c64u"
-        ]
+          "c64u",
+          "u2",
+          "vice"
+        ],
+        "operationPlatforms": {
+          "fs_stats": [
+            "c64u",
+            "u2"
+          ]
+        }
       }
     },
     {

package/mcp.json

@@ -1,6 +1,6 @@
 {
   "name": "c64bridge",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Stdio-based Model Context Protocol (MCP) server that bridges Commodore 64 Ultimate hardware with AI agents.",
   "entry": "dist/index.js",
   "type": "stdio",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c64bridge",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "mcpName": "io.github.chrisgleissner/c64bridge",
   "description": "C64 Bridge MCP server for Commodore 64 Ultimate hardware and VICE emulator control",
   "repository": {

package/scripts/mockC64Server.mjs

@@ -250,6 +250,14 @@ function cancelHeartbeatOnWrite(state, address, length) {
 }
 
 function seedReadyPrompt(state) {
+  // After a reset the KERNAL clears screen RAM to spaces and BASIC sets up an
+  // empty program: TXTTAB=$0801, VARTAB/ARYTAB/STREND=$0803, FRETOP/MEMSIZ=$A000
+  // (as read from an Ultimate 64 after machine:reset).
+  state.memory.fill(toScreenCode(" "), 0x0400, 0x0400 + 1000);
+  state.memory.set([0x01, 0x08, 0x03, 0x08, 0x03, 0x08, 0x03, 0x08, 0x00, 0xa0], 0x2b);
+  state.memory.set([0x00, 0xa0], 0x37);
+  state.memory.set([0x00, 0x00], 0x0801);
+
   const text = "READY.";
   const buffer = new Uint8Array(text.length + 1);
   for (let i = 0; i < text.length; i += 1) {
@@ -259,6 +267,26 @@ function seedReadyPrompt(state) {
   state.memory.set(buffer, 0x0400);
 }
 
+/**
+ * BASIC LINKPRG ($A533): walk the line chain from $0801 and rewrite each link
+ * pointer to the byte after the line's terminating zero. Stops at a zero link
+ * high byte, as the ROM does; the step limit only guards the mock.
+ */
+function relinkBasicProgram(memory) {
+  let line = 0x0801;
+  for (let steps = 0; steps < 0x10000 && line < 0xfffb; steps += 1) {
+    if (memory[line + 1] === 0) return;
+    let y = 4;
+    do {
+      y += 1;
+    } while (line + y < 0xffff && memory[line + y] !== 0);
+    const next = line + y + 1;
+    memory[line] = next & 0xff;
+    memory[line + 1] = (next >> 8) & 0xff;
+    line = next;
+  }
+}
+
 export async function startMockC64Server(options = {}) {
   const state = createInitialState();
   const streamRuntime = createStreamRuntime();
@@ -269,9 +297,14 @@ export async function startMockC64Server(options = {}) {
   // seed memory with READY prompt at $0400 using screen codes
   seedReadyPrompt(state);
 
+  // Firmware drive ids (route_drives.h DriveToSubsys): a and b are the
+  // emulated drives, softiec the IEC file system; anything else is rejected.
+  const FIRMWARE_DRIVE_BUS_IDS = { a: 8, b: 9, softiec: 11 };
+
   function ensureDriveState(id) {
     if (!state.drives[id]) {
       state.drives[id] = {
+        busId: FIRMWARE_DRIVE_BUS_IDS[id] ?? null,
         mountedImage: null,
         mode: "1541",
         power: "off",
@@ -282,14 +315,20 @@ export async function startMockC64Server(options = {}) {
     return state.drives[id];
   }
 
-  ensureDriveState("drive8");
+  function seedDrives() {
+    ensureDriveState("a");
+    ensureDriveState("b");
+    ensureDriveState("softiec");
+  }
+
+  seedDrives();
 
   function resetState() {
     stopAllStreams();
     const fresh = createInitialState();
     Object.assign(state, fresh);
     seedReadyPrompt(state);
-    ensureDriveState("drive8");
+    seedDrives();
   }
 
   function stopAllStreams() {
@@ -401,18 +440,32 @@ export async function startMockC64Server(options = {}) {
     }
 
     if (method === "GET" && url === "/v1/drives") {
-      const drives = {};
-      for (const [driveId, driveState] of Object.entries(state.drives)) {
-        drives[driveId] = {
-          enabled: driveState.power !== "off",
-          power: driveState.power,
-          mode: driveState.mode,
-          // Mirror the real firmware's DriveInfo shape (image_path is a
-          // plain string), not the internal mount-params object.
-          image_path: driveState.mountedImage?.image ?? null,
-          type: driveState.mountedImage?.type ?? driveState.mode ?? null,
+      // Firmware shape (route_drives.cc drive_info, IecInterface::info): a list
+      // of single-key objects. Power is `enabled`; the mounted image is split
+      // into its directory (image_path) and file name (image_file). The soft
+      // IEC drive is listed as "IEC Drive" although its route id is softiec,
+      // and the printer is listed but is not a drive.
+      const splitImage = (image) => {
+        if (!image) return { image_file: "", image_path: "" };
+        const slash = image.lastIndexOf("/");
+        return { image_file: image.slice(slash + 1), image_path: slash > 0 ? image.slice(0, slash) : "/" };
+      };
+      const drives = ["a", "b"].map((driveId) => {
+        const driveState = state.drives[driveId];
+        return {
+          [driveId]: {
+            enabled: driveState.power !== "off",
+            bus_id: driveState.busId,
+            type: driveState.mode,
+            rom: `${driveState.mode}.rom`,
+            ...splitImage(driveState.mountedImage?.image),
+          },
         };
-      }
+      });
+      drives.push(
+        { "IEC Drive": { bus_id: state.drives.softiec.busId, enabled: state.drives.softiec.power !== "off", type: "DOS emulation", last_error: "00, OK, 00, 00", partitions: [{ id: 1, path: "/Temp/" }] } },
+        { "Printer Emulation": { bus_id: 4, enabled: false } },
+      );
       sendJson(res, { drives });
       return;
     }
@@ -526,11 +579,20 @@ export async function startMockC64Server(options = {}) {
       state.lastLoadedPrg = prg;
       state.loadCount += 1;
 
-      // Mirror real firmware: place the PRG body at its embedded load
-      // address without starting it (no RUN, no BASIC pointer changes).
+      // Mirror Ultimate 64 firmware 3.15: the PRG body is placed at its
+      // embedded load address without starting it, and, as after a BASIC
+      // LOAD, VARTAB/ARYTAB/STREND are set to the end address and the BASIC
+      // program at $0801 is relinked (which rewrites raw code at $0801).
       if (prg.length >= 2) {
         const loadAddress = prg.readUInt16LE(0);
-        state.memory.set(prg.subarray(2), loadAddress);
+        const body = prg.subarray(2);
+        state.memory.set(body.subarray(0, 0x10000 - loadAddress), loadAddress);
+        const endAddress = Math.min(0xffff, loadAddress + body.length);
+        for (const pointer of [0x2d, 0x2f, 0x31]) {
+          state.memory[pointer] = endAddress & 0xff;
+          state.memory[pointer + 1] = endAddress >> 8;
+        }
+        relinkBasicProgram(state.memory);
       }
 
       sendJson(res, { result: "ok", bytes: prg.length });
@@ -564,9 +626,22 @@ export async function startMockC64Server(options = {}) {
           }
 
           const attachment = Buffer.concat(chunks);
+          // Like the firmware, a multipart upload is a list of files in part
+          // order: the SID first, optional song lengths second. A text field
+          // (for example a JSON-serialised Buffer) is not a SID upload.
+          const contentType = String(req.headers["content-type"] ?? "");
+          const files = contentType.startsWith("multipart/form-data")
+            ? [...(await new Response(attachment, { headers: { "content-type": contentType } }).formData()).values()]
+            : null;
+          if (files && (files.length === 0 || files.some((part) => typeof part === "string"))) {
+            sendJson(res, { errors: ["Upload of file failed."] }, 400);
+            return;
+          }
+          const sid = files ? Buffer.from(await files[0].arrayBuffer()) : attachment;
+          const songlengths = files?.[1] ? Buffer.from(await files[1].arrayBuffer()) : null;
           state.sidAttachmentCount += 1;
-          state.lastSidAttachment = { songnr, bytes: attachment.length };
-          sendJson(res, { result: "sidplay_attachment", bytes: attachment.length, songnr });
+          state.lastSidAttachment = { songnr, bytes: sid.length, sid, songlengths };
+          sendJson(res, { result: "sidplay_attachment", bytes: sid.length, songnr });
           return;
         }
       }
@@ -816,8 +891,12 @@ export async function startMockC64Server(options = {}) {
       if (routeUrl) {
         const match = /^\/v1\/drives\/([^:]+):(mount|remove|reset|on|off|load_rom|set_mode)$/.exec(routeUrl.pathname);
         if (match) {
-          const driveId = decodeURIComponent(match[1]);
+          const driveId = decodeURIComponent(match[1]).toLowerCase();
           const action = match[2];
+          if (!Object.hasOwn(FIRMWARE_DRIVE_BUS_IDS, driveId)) {
+            sendJson(res, { errors: [`Invalid Drive '${decodeURIComponent(match[1])}'`] }, 400);
+            return;
+          }
           const driveState = ensureDriveState(driveId);
 
           const respond = (payload) => {