node-lab-mcp 0.1.0 → 0.1.3

package/dist/index.js

@@ -25315,7 +25315,7 @@ function getPartyInfo(partySocketOptions, defaultProtocol, defaultParams = {}) {
     host: rawHost,
     path: rawPath,
     protocol: rawProtocol,
-    room: room2,
+    room,
     party,
     basePath,
     prefix,
@@ -25328,13 +25328,13 @@ function getPartyInfo(partySocketOptions, defaultProtocol, defaultParams = {}) {
   const name = party ?? "main";
   const path = rawPath ? `/${rawPath}` : "";
   const protocol = rawProtocol || (host.startsWith("localhost:") || host.startsWith("127.0.0.1:") || host.startsWith("192.168.") || host.startsWith("10.") || host.startsWith("172.") && host.split(".")[1] >= "16" && host.split(".")[1] <= "31" || host.startsWith("[::ffff:7f00:1]:") ? defaultProtocol : `${defaultProtocol}s`);
-  const baseUrl = `${protocol}://${host}/${basePath || `${prefix || "parties"}/${name}/${room2}`}${path}`;
+  const baseUrl = `${protocol}://${host}/${basePath || `${prefix || "parties"}/${name}/${room}`}${path}`;
   const makeUrl = (query2 = {}) => `${baseUrl}?${new URLSearchParams([...Object.entries(defaultParams), ...Object.entries(query2).filter(valueIsNotNil)])}`;
   const urlProvider = typeof query === "function" ? async () => makeUrl(await query()) : makeUrl(query);
   return {
     host,
     path,
-    room: room2,
+    room,
     name,
     protocol,
     partyUrl: baseUrl,
@@ -25386,11 +25386,11 @@ var PartySocket = class extends ReconnectingWebSocket {
     this.setWSProperties(wsOptions);
   }
   setWSProperties(wsOptions) {
-    const { _pk, _pkurl, name, room: room2, host, path, basePath } = wsOptions;
+    const { _pk, _pkurl, name, room, host, path, basePath } = wsOptions;
     this._pk = _pk;
     this._pkurl = _pkurl;
     this.name = name;
-    this.room = room2;
+    this.room = room;
     this.host = host;
     this.path = path;
     this.basePath = basePath;
@@ -25453,14 +25453,34 @@ function getWSOptions(partySocketOptions) {
 // party-bridge.ts
 import { randomUUID as randomUUID2 } from "node:crypto";
 var PartyBridge = class {
-  constructor(host, room2) {
+  constructor(host, room) {
     this.host = host;
-    this.room = room2;
-    this.ps = new PartySocket({ host, room: room2 });
-    this.ps.addEventListener("message", (e) => this.onMessage(typeof e.data === "string" ? e.data : ""));
-    this.ps.addEventListener("open", () => process.stderr.write(`[party] joined room "${room2}" on ${host}
+    if (room) this.openRoom(room);
+  }
+  ps = null;
+  pending = /* @__PURE__ */ new Map();
+  peers = 0;
+  room;
+  openRoom(room) {
+    if (this.ps) {
+      try {
+        this.ps.close();
+      } catch {
+      }
+    }
+    for (const [id, p] of this.pending) {
+      clearTimeout(p.timer);
+      p.reject(new Error("relay room switched mid-command"));
+      this.pending.delete(id);
+    }
+    this.peers = 0;
+    this.room = room;
+    const ps = new PartySocket({ host: this.host, room });
+    this.ps = ps;
+    ps.addEventListener("message", (e) => this.onMessage(typeof e.data === "string" ? e.data : ""));
+    ps.addEventListener("open", () => process.stderr.write(`[party] joined room "${room}" on ${this.host}
 `));
-    this.ps.addEventListener("close", () => {
+    ps.addEventListener("close", () => {
       this.peers = 0;
       for (const [id, p] of this.pending) {
         clearTimeout(p.timer);
@@ -25469,18 +25489,27 @@ var PartyBridge = class {
       }
     });
   }
-  ps;
-  pending = /* @__PURE__ */ new Map();
-  peers = 0;
+  // GraphBridge: runtime room switching. The promise resolves immediately after the new socket is
+  // requested — the `open` event follows async; check status()/connected() to know when the editor pairs.
+  async setRoom(room) {
+    this.openRoom(room);
+  }
+  currentRoom() {
+    return this.room;
+  }
   // peers counts everyone in the room including us, so >1 means an editor has joined.
   connected() {
-    return this.ps.readyState === PartySocket.OPEN && this.peers > 1;
+    return this.ps?.readyState === PartySocket.OPEN && this.peers > 1;
   }
   status() {
+    if (!this.ps || !this.room) return `no relay room set \u2014 call set_room with a pairing code from the lab's MCP modal`;
     if (this.ps.readyState !== PartySocket.OPEN) return `connecting to relay ${this.host}\u2026`;
     return this.peers > 1 ? `editor connected via relay (room "${this.room}")` : `in room "${this.room}", waiting for the editor to pair`;
   }
   send(cmd, timeoutMs = 8e3) {
+    if (!this.ps || !this.room) {
+      return Promise.reject(new Error(`No relay room set. Call set_room with the pairing code from the lab's MCP modal.`));
+    }
     if (this.ps.readyState !== PartySocket.OPEN) {
       return Promise.reject(new Error(`Not connected to the relay (${this.host}) yet \u2014 retry in a moment.`));
     }
@@ -25646,18 +25675,20 @@ var AcademySink = class extends BenchNode {
   }
 };
 var ACADEMY_IN = [
-  { type: 0 /* Power */, name: "POWER IN 1" },
-  { type: 0 /* Power */, name: "POWER IN 2" },
-  { type: 1 /* Number */, name: "DATA IN X" },
-  { type: 1 /* Number */, name: "DATA IN Y" },
-  { type: 1 /* Number */, name: "DATA IN Z" }
+  { type: 1 /* Number */, name: "DATA IN X1" },
+  { type: 1 /* Number */, name: "DATA IN X2" },
+  { type: 1 /* Number */, name: "DATA IN X3" },
+  { type: 1 /* Number */, name: "DATA IN X4" },
+  { type: 1 /* Number */, name: "DATA IN X5" },
+  { type: 1 /* Number */, name: "DATA IN X6" }
 ];
 var ACADEMY_OUT = [
-  { type: 0 /* Power */, name: "POWER OUT 1" },
-  { type: 0 /* Power */, name: "POWER OUT 2" },
-  { type: 1 /* Number */, name: "DATA OUT A" },
-  { type: 1 /* Number */, name: "DATA OUT B" },
-  { type: 1 /* Number */, name: "DATA OUT C" }
+  { type: 1 /* Number */, name: "DATA OUT A1" },
+  { type: 1 /* Number */, name: "DATA OUT A2" },
+  { type: 1 /* Number */, name: "DATA OUT A3" },
+  { type: 1 /* Number */, name: "DATA OUT A4" },
+  { type: 1 /* Number */, name: "DATA OUT A5" },
+  { type: 1 /* Number */, name: "DATA OUT A6" }
 ];
 var TwoInGate = class extends BenchNode {
   a;
@@ -26013,10 +26044,10 @@ var Button = class extends BenchNode {
   }
 };
 var Joystick = class extends BenchNode {
-  constructor(id, twoAxis) {
+  constructor(id, axis) {
     super(id);
-    this.twoAxis = twoAxis;
-    if (twoAxis) {
+    this.axis = axis;
+    if (axis === "xy" || axis === "cross") {
       this.addPort(1 /* Number */, false, "X+");
       this.addPort(1 /* Number */, false, "X-");
       this.addPort(1 /* Number */, false, "Y+");
@@ -26028,6 +26059,9 @@ var Joystick = class extends BenchNode {
   }
   x = 0;
   y = 0;
+  get twoAxis() {
+    return this.axis === "xy" || this.axis === "cross";
+  }
   evaluate() {
     const DZ = 0.08;
     const dz = (t) => {
@@ -26036,11 +26070,14 @@ var Joystick = class extends BenchNode {
     };
     const pos = (t) => Math.round(Math.max(0, dz(t)) * 65535);
     const neg = (t) => Math.round(Math.max(0, -dz(t)) * 65535);
-    if (this.twoAxis) {
+    if (this.axis === "xy" || this.axis === "cross") {
       this.outputs[0].value = pos(this.x);
       this.outputs[1].value = neg(this.x);
       this.outputs[2].value = pos(this.y);
       this.outputs[3].value = neg(this.y);
+    } else if (this.axis === "x") {
+      this.outputs[0].value = pos(this.x);
+      this.outputs[1].value = neg(this.x);
     } else {
       this.outputs[0].value = pos(this.y);
       this.outputs[1].value = neg(this.y);
@@ -26155,6 +26192,13 @@ var LightDisplay = class extends BenchNode {
   evaluate() {
   }
 };
+var Notes = class extends BenchNode {
+  text = "# Notes\n\nDouble-click to edit. Supports **markdown** \u2014 headings, lists, `code`, [links](https://example.com).";
+  width = 280;
+  height = 200;
+  evaluate() {
+  }
+};
 var Oscilloscope = class extends BenchNode {
   input;
   samples = [];
@@ -26551,11 +26595,49 @@ var VectorRotate = class extends BenchNode {
   }
 };
 var SHIP_THRUST_ACCEL = 6;
-var SHIP_ANG_ACCEL = 2.5;
+var SHIP_ANG_ACCEL = 0.625;
 var SHIP_DRAG = 0;
 var SHIP_DAMPER_MAX = 3;
 var SHIP_ANG_DAMPER_MAX = 3;
-var ASTEROID_LOCK_RADIUS = 4.5;
+var COMMON_ELEMENTS = [26, 14, 29, 22, 28];
+var RARE_ELEMENTS = [79, 78, 48, 82, 47, 92, 74];
+var MAGNETOSPHERE_M = 2500;
+var STATION_SAFE_M = 500;
+function pickComposition(pool) {
+  const n = Math.random() < 0.5 ? 2 : 3;
+  const picked = [];
+  while (picked.length < n) {
+    const e = pool[Math.floor(Math.random() * pool.length)];
+    if (!picked.includes(e)) picked.push(e);
+  }
+  const weights = picked.map(() => 0.2 + Math.random());
+  const sum = weights.reduce((a, b) => a + b, 0);
+  const comp = {};
+  picked.forEach((e, i) => comp[e] = Math.round(weights[i] / sum * 100) / 100);
+  const total = Object.values(comp).reduce((a, b) => a + b, 0);
+  const delta = Math.round((1 - total) * 100) / 100;
+  if (delta !== 0) comp[picked[0]] = Math.round((comp[picked[0]] + delta) * 100) / 100;
+  return comp;
+}
+function makeAsteroidField() {
+  const out = [];
+  const TOTAL = 400;
+  for (let i = 0; i < TOTAL; i++) {
+    const inner = i < 48;
+    const rMin = inner ? 100 : STATION_SAFE_M;
+    const rMax = inner ? STATION_SAFE_M : MAGNETOSPHERE_M - 100;
+    const r = Math.cbrt(rMin ** 3 + Math.random() * (rMax ** 3 - rMin ** 3));
+    const u = Math.random() * 2 - 1, phi = Math.random() * Math.PI * 2;
+    const s = Math.sqrt(1 - u * u);
+    const pos = vec(r * s * Math.cos(phi), r * u, r * s * Math.sin(phi), 0);
+    const t = Math.random();
+    const radius = 13 + t * 7;
+    const mass = Math.round(30 + t * 70);
+    const comp = pickComposition(inner ? COMMON_ELEMENTS : RARE_ELEMENTS);
+    out.push({ id: `a${i}`, pos, vel: vec(), radius, mass, comp });
+  }
+  return out;
+}
 var STATION_LOCK_RADIUS = 14;
 var BEAM_SLEW = 5 * Math.PI / 180;
 var BEAM_GIMBAL_LIMIT = 80 * Math.PI / 180;
@@ -26578,9 +26660,13 @@ var SHIP_STATE = {
   orient: vec(0, 0, 0, 1),
   dir: vec(0, 0, 1, 0),
   asteroid: vec(),
+  asteroidField: [],
   station: vec(),
   lockedTarget: null,
-  beam: { aim: vec(0, 0, 1, 0), massRange: false, spectro: false }
+  beam: { aim: vec(0, 0, 1, 0), massRange: false, spectro: false },
+  respawnAt: 0,
+  magnetosphere: MAGNETOSPHERE_M,
+  stationSafe: STATION_SAFE_M
 };
 var ShipSim = class {
   pos = vec(100, 0, 0, 0);
@@ -26591,10 +26677,11 @@ var ShipSim = class {
   // quaternion
   angVel = vec();
   // body-frame angular velocity (rad/s) — persists, so the ship coasts its spin
-  // ── world, station = origin (0,0,0). Ship starts at (100,0,0), so the station sits 100 m to port and the
-  // asteroid (86,25,30) is ~30 m ahead / 14 m to port / 25 m up of the ship's start. ──
-  asteroid = { pos: vec(86, 25, 30, 0), vel: vec(), mass: 30, comp: { 26: 0.9, 14: 0.1 } };
-  // 30 T · 90% Fe · 10% Si
+  // ── world, station = origin (0,0,0). Ship starts at (100,0,0). 100 procedurally placed asteroids
+  // (asteroidField) live around the station, inner shell (60–500 m) = common ores, outer shell
+  // (500–2500 m) = rare. `asteroid` is the currently-active scan target (mutated by LOCK BEAM). ──
+  asteroidField = makeAsteroidField();
+  asteroid = this.asteroidField[0];
   station = { pos: vec(0, 0, 0, 0) };
   lockMode = 0;
   // 1 CLEAR · 2 LASER(mass/rock) · 3 PROCESSING PLANT(station) · 4 SHOP · 5 MAILING GUN · 6 CUSTOM (0 = none)
@@ -26628,20 +26715,22 @@ var ShipSim = class {
     const a = this.beam.aim;
     const d = qrotate(this.orient, qnormalize({ x: a.x, y: a.y, z: a.z, w: 0 }));
     let bestT = Infinity;
-    let best = null;
-    const ta = raySphereHit(this.pos, d, this.asteroid.pos, ASTEROID_LOCK_RADIUS);
-    if (ta !== null && ta < bestT) {
-      bestT = ta;
-      best = { pos: this.asteroid.pos, vel: this.asteroid.vel, kind: "asteroid" };
+    let bestAst = null;
+    for (const ast of this.asteroidField) {
+      const t = raySphereHit(this.pos, d, ast.pos, ast.radius);
+      if (t !== null && t < bestT) {
+        bestT = t;
+        bestAst = ast;
+      }
     }
     const ts = raySphereHit(this.pos, d, this.station.pos, STATION_LOCK_RADIUS);
     if (ts !== null && ts < bestT) {
-      bestT = ts;
-      best = { pos: this.station.pos, vel: vec(), kind: "station" };
-    }
-    if (best) {
-      this.lockedTarget = { pos: { ...best.pos }, vel: { ...best.vel } };
-      this.lockKind = best.kind;
+      this.lockedTarget = { pos: { ...this.station.pos }, vel: vec() };
+      this.lockKind = "station";
+    } else if (bestAst) {
+      this.asteroid = bestAst;
+      this.lockedTarget = { pos: { ...bestAst.pos }, vel: vec() };
+      this.lockKind = "asteroid";
     } else {
       this.lockedTarget = null;
       this.lockKind = null;
@@ -26663,7 +26752,7 @@ var ShipSim = class {
     this.lockKind = "station";
   }
   /**
-   * LOCK MODE selects the target type. 6 CUSTOM tracks the CUSTOM TARGET vector live; the others apply on
+   * LOCK MODE selects the target type. 6 CUSTOM tracks the CUSTOM TGT vector live; the others apply on
    * *change* (1 CLEAR wipes, 2 LASER → asteroid/rock, 3–5 → station), so a manual LOCK BEAM/STATION press can
    * override in between. 0 = no command (unwired) → leaves the current lock alone.
    */
@@ -26711,6 +26800,11 @@ var ShipSim = class {
     this.pos.x += this.vel.x * dt;
     this.pos.y += this.vel.y * dt;
     this.pos.z += this.vel.z * dt;
+    const r = Math.hypot(this.pos.x, this.pos.y, this.pos.z);
+    if (r > MAGNETOSPHERE_M) {
+      this.reset();
+      SHIP_STATE.respawnAt = Date.now();
+    }
     const ta = SHIP_ANG_ACCEL;
     this.angVel.x += torqueBody.x * ta * dt;
     this.angVel.y += torqueBody.y * ta * dt;
@@ -26737,6 +26831,7 @@ var ShipSim = class {
     SHIP_STATE.orient = this.orient;
     SHIP_STATE.dir = this.direction();
     SHIP_STATE.asteroid = this.asteroid.pos;
+    SHIP_STATE.asteroidField = this.asteroidField;
     SHIP_STATE.station = this.station.pos;
     SHIP_STATE.lockedTarget = this.lockedTarget ? this.lockedTarget.pos : null;
     SHIP_STATE.beam = this.beam;
@@ -26771,24 +26866,32 @@ var ProximitySensor = class extends BenchNode {
     this.out = this.addPort(1 /* Number */, false, "PROXIMITY");
   }
   evaluate() {
-    const p = SHIP_SIM.pos, a = SHIP_SIM.asteroid.pos, s = SHIP_SIM.station.pos;
-    const da = Math.hypot(p.x - a.x, p.y - a.y, p.z - a.z) - ASTEROID_LOCK_RADIUS;
-    const ds = Math.hypot(p.x - s.x, p.y - s.y, p.z - s.z) - STATION_LOCK_RADIUS;
-    const d = Math.max(0, Math.min(da, ds));
+    const p = SHIP_SIM.pos, s = SHIP_SIM.station.pos;
+    let best = Math.hypot(p.x - s.x, p.y - s.y, p.z - s.z) - STATION_LOCK_RADIUS;
+    for (const ast of SHIP_SIM.asteroidField) {
+      const d2 = Math.hypot(p.x - ast.pos.x, p.y - ast.pos.y, p.z - ast.pos.z) - ast.radius;
+      if (d2 < best) best = d2;
+    }
+    const d = Math.max(0, best);
     this.out.value = d >= PROXIMITY_RANGE ? 0 : clampData((1 - d / PROXIMITY_RANGE) * DATA_MAX);
   }
 };
 var SHIP_IN_CONTROLS = [
   "THRUST",
   "REVERSE",
+  // Order: X+, X-, Y+, Y- so a 2-axis joystick wires straight through (RIGHT→X+, LEFT→X-, UP→Y+, DOWN→Y-).
+  "TRANSLATE RIGHT",
+  "TRANSLATE LEFT",
   "TRANSLATE UP",
   "TRANSLATE DOWN",
+  // YAW first then PITCH so X+/X- / Y+/Y- on a 2-axis joystick map straight onto YAW LEFT / YAW
+  // RIGHT / PITCH UP / PITCH DOWN without crossed cables.
+  "YAW RIGHT",
+  "YAW LEFT",
   "PITCH UP",
   "PITCH DOWN",
-  "YAW LEFT",
-  "YAW RIGHT",
-  "ROLL LEFT",
   "ROLL RIGHT",
+  "ROLL LEFT",
   "LINEAR DAMPER",
   "ANGULAR DAMPER"
 ];
@@ -26803,17 +26906,19 @@ var ShipIn = class extends BenchNode {
   evaluate() {
   }
   refresh() {
+    const FWD = 1, REV = 0.5, STRAFE = 0.5;
     const thrustBody = vec(
-      0,
-      this.ctl("TRANSLATE UP") - this.ctl("TRANSLATE DOWN"),
-      this.ctl("THRUST") - this.ctl("REVERSE"),
+      (this.ctl("TRANSLATE LEFT") - this.ctl("TRANSLATE RIGHT")) * STRAFE,
+      // camera looks +Z; +X is camera-left, so RIGHT must push body −X
+      (this.ctl("TRANSLATE UP") - this.ctl("TRANSLATE DOWN")) * STRAFE,
+      this.ctl("THRUST") * FWD - this.ctl("REVERSE") * REV,
       0
     );
     const torqueBody = vec(
       this.ctl("PITCH DOWN") - this.ctl("PITCH UP"),
       // pitch about X (DOWN − UP: nose-up is −X)
-      this.ctl("YAW RIGHT") - this.ctl("YAW LEFT"),
-      // yaw about Y
+      this.ctl("YAW LEFT") - this.ctl("YAW RIGHT"),
+      // yaw about Y (LEFT yaws nose left)
       this.ctl("ROLL RIGHT") - this.ctl("ROLL LEFT"),
       // roll about Z
       0
@@ -26824,7 +26929,7 @@ var ShipIn = class extends BenchNode {
 var SENSORS_IN_PORTS = [
   { type: 1 /* Number */, name: "LOCK MODE" },
   // 1 CLEAR … 6 CUSTOM
-  { type: 3 /* Vector */, name: "CUSTOM TARGET" },
+  { type: 3 /* Vector */, name: "CUSTOM TGT" },
   // used when LOCK MODE = 6
   { type: 1 /* Number */, name: "BEAM X+" },
   { type: 1 /* Number */, name: "BEAM X-" },
@@ -26865,7 +26970,7 @@ var SensorsIn = class extends BenchNode {
   evaluate() {
   }
   refresh() {
-    SHIP_SIM.applyLockMode(Math.round(this.val("LOCK MODE")), this.vecIn("CUSTOM TARGET"));
+    SHIP_SIM.applyLockMode(Math.round(this.val("LOCK MODE")), this.vecIn("CUSTOM TGT"));
     const yawRate = (this.val("BEAM X-") - this.val("BEAM X+")) / DATA_MAX;
     const pitchRate = (this.val("BEAM Y+") - this.val("BEAM Y-")) / DATA_MAX;
     SHIP_SIM.aimBeam(yawRate, pitchRate, Math.round(this.val("ELEMENT")), 0.02);
@@ -26898,13 +27003,22 @@ var SensorsOut = class extends BenchNode {
       this.out("LOCKED").value = 0;
     }
     const b = SHIP_SIM.beam;
-    const a = SHIP_SIM.asteroid;
     const bd = qrotate(SHIP_SIM.orient, qnormalize({ x: b.aim.x, y: b.aim.y, z: b.aim.z, w: 0 }));
-    const hit = raySphereHit(SHIP_SIM.pos, bd, a.pos, ASTEROID_LOCK_RADIUS);
-    this.out("MASS").value = b.massRange && hit !== null ? clampData(a.mass) : 0;
-    this.out("SCAN RANGE").value = b.massRange && hit !== null ? clampData(hit) : 0;
-    this.out("COMP %").value = b.spectro && hit !== null ? clampData((a.comp[b.element] ?? 0) * DATA_MAX) : 0;
-    this.out("SPECTRO POS").vec = { ...b.aim };
+    let bestT = Infinity;
+    let bestAst = null;
+    for (const ast of SHIP_SIM.asteroidField) {
+      const t = raySphereHit(SHIP_SIM.pos, bd, ast.pos, ast.radius);
+      if (t !== null && t < bestT) {
+        bestT = t;
+        bestAst = ast;
+      }
+    }
+    const aHit = bestAst;
+    const hit = bestAst ? bestT : null;
+    this.out("MASS").value = b.massRange && aHit !== null ? clampData(aHit.mass) : 0;
+    this.out("SCAN RANGE").value = b.massRange && aHit !== null && hit !== null ? clampData(hit) : 0;
+    this.out("COMP %").value = b.spectro && aHit !== null ? clampData((aHit.comp[b.element] ?? 0) * DATA_MAX) : 0;
+    this.out("SPECTRO POS").vec = vec(b.aim.x * DATA_MAX, b.aim.y * DATA_MAX, b.aim.z * DATA_MAX, 0);
   }
 };
 var NODE_LIBRARY = [
@@ -26962,9 +27076,11 @@ var NODE_LIBRARY = [
   { kind: "slider", label: "SLIDER", group: "Controls", nodeType: "analog", make: (id) => new AnalogControl(id, false) },
   { kind: "button1", label: "BUTTON", group: "Controls", nodeType: "button", make: (id) => new Button(id, 1) },
   { kind: "button4", label: "4-BUTTON", group: "Controls", nodeType: "button", make: (id) => new Button(id, 4) },
-  { kind: "joy1", label: "1-AXIS JOYSTICK", group: "Controls", nodeType: "joystick", make: (id) => new Joystick(id, false) },
-  { kind: "joy2", label: "2-AXIS JOYSTICK", group: "Controls", nodeType: "joystick", make: (id) => new Joystick(id, true) },
-  { kind: "throttle", label: "THROTTLE", group: "Controls", nodeType: "throttle", make: (id) => new Joystick(id, false) },
+  { kind: "joy1", label: "1-AXIS JOYSTICK Y", group: "Controls", nodeType: "joystick", make: (id) => new Joystick(id, "y") },
+  { kind: "joy1x", label: "1-AXIS JOYSTICK X", group: "Controls", nodeType: "joystick", make: (id) => new Joystick(id, "x") },
+  { kind: "joy2", label: "2-AXIS JOYSTICK", group: "Controls", nodeType: "joystick", make: (id) => new Joystick(id, "xy") },
+  { kind: "joy2cross", label: "2-AXIS JOYSTICK +", group: "Controls", nodeType: "joystick", make: (id) => new Joystick(id, "cross") },
+  { kind: "throttle", label: "THROTTLE", group: "Controls", nodeType: "throttle", make: (id) => new Joystick(id, "y") },
   { kind: "valuedisp", label: "VALUE DISPLAY", group: "Displays", nodeType: "readout", make: (id) => new ValueDisplay(id) },
   { kind: "elementdisp", label: "ELEMENT DISPLAY", group: "Displays", nodeType: "elementdisp", make: (id) => new ElementDisplay(id) },
   { kind: "counter", label: "COUNTER", group: "Displays", nodeType: "counter", make: (id) => new Counter(id) },
@@ -26973,6 +27089,7 @@ var NODE_LIBRARY = [
   { kind: "linearlight", label: "LINEAR LIGHT", group: "Displays", nodeType: "light", make: (id) => new LightDisplay(id, "linear") },
   { kind: "scope", label: "OSCILLOSCOPE", group: "Displays", nodeType: "scope", make: (id) => new Oscilloscope(id) },
   { kind: "speaker", label: "SPEAKER", group: "Displays", nodeType: "speaker", make: (id) => new Speaker(id) },
+  { kind: "notes", label: "NOTE", group: "Helpers", nodeType: "notes", make: (id) => new Notes(id) },
   { kind: "sine", label: "SINE WAVE", group: "Signal", nodeType: "sine", make: (id) => new SineWave(id) },
   { kind: "triggered", label: "TRIGGERED", group: "Signal", make: (id) => new Triggered(id) },
   { kind: "proximity", label: "PROXIMITY SENSOR", group: "Sensors", make: (id) => new ProximitySensor(id) }
@@ -27096,17 +27213,23 @@ function gradeHeadless(spec, inputs, expected, ticks = 16) {
 }
 
 // server.ts
-var room = process.env.NODE_LAB_ROOM;
+var initialRoom = process.env.NODE_LAB_ROOM;
+var useLocal = process.env.NODE_LAB_LOCAL === "1";
 var bridge;
-if (room) {
-  const host = process.env.NODE_LAB_PARTY_HOST ?? DEFAULT_PARTY_HOST;
-  bridge = new PartyBridge(host, room);
-  process.stderr.write(`[node-lab-mcp] relay mode \u2014 room "${room}" @ ${host}
-`);
-} else {
+if (useLocal) {
   const local = new Bridge();
   local.start(BRIDGE_PORT);
   bridge = local;
+  process.stderr.write(`[node-lab-mcp] local-WS mode \u2014 ws://localhost:${BRIDGE_PORT}
+`);
+} else {
+  const host = process.env.NODE_LAB_PARTY_HOST ?? DEFAULT_PARTY_HOST;
+  bridge = new PartyBridge(host, initialRoom);
+  process.stderr.write(
+    initialRoom ? `[node-lab-mcp] relay mode \u2014 room "${initialRoom}" @ ${host}
+` : `[node-lab-mcp] relay mode (no room yet) \u2014 agent must call set_room with the pairing code @ ${host}
+`
+  );
 }
 var server = new McpServer({ name: "node-lab", version: "0.1.0" });
 var json = (data) => ({ content: [{ type: "text", text: JSON.stringify(data, null, 2) }] });
@@ -27114,6 +27237,30 @@ var fail = (e) => ({
   content: [{ type: "text", text: `ERROR: ${e instanceof Error ? e.message : String(e)}` }],
   isError: true
 });
+server.registerTool(
+  "set_room",
+  {
+    description: `Switch the PartyKit relay room this MCP connects to. Pair with any browser tab on the fly without restarting the MCP server. Pass the 4-4 pairing code from the lab's MCP modal (e.g. "138n-f2le"). Returns the new status \u2014 call bridge_status again after a short delay to confirm the editor joined.`,
+    inputSchema: { room: external_exports.string() }
+  },
+  async ({ room }) => {
+    try {
+      if (!bridge.setRoom) throw new Error("set_room is only available in relay mode. Start the MCP without NODE_LAB_LOCAL=1.");
+      await bridge.setRoom(room);
+      return json({ room, status: bridge.status() });
+    } catch (e) {
+      return fail(e);
+    }
+  }
+);
+server.registerTool(
+  "get_room",
+  {
+    description: "Read the current PartyKit relay room id (the 4-4 pairing code), plus the bridge status.",
+    inputSchema: {}
+  },
+  async () => json({ room: bridge.currentRoom?.() ?? null, status: bridge.status() })
+);
 server.registerTool(
   "bridge_status",
   {
@@ -27207,6 +27354,18 @@ live(
   { nodeId: external_exports.string(), port: external_exports.string(), value: external_exports.number() },
   (a) => ({ cmd: "set_input", nodeId: a.nodeId, port: a.port, value: a.value })
 );
+live(
+  "move_node",
+  "Reposition a node on the canvas in flow-space coordinates (the same units that get_graph reports under position.x/y). Works on every node, fixtures included. Wires re-route automatically.",
+  { id: external_exports.string(), x: external_exports.number(), y: external_exports.number() },
+  (a) => ({ cmd: "move_node", id: a.id, x: a.x, y: a.y })
+);
+live(
+  "set_collapsed",
+  "Collapse a node down to just its header strip (collapsed=true) or restore the full card (collapsed=false). Purely a UI state \u2014 wiring, values, and engine behavior are unchanged.",
+  { id: external_exports.string(), collapsed: external_exports.boolean() },
+  (a) => ({ cmd: "set_collapsed", id: a.id, collapsed: a.collapsed })
+);
 live(
   "clear_graph",
   "Wipe all player-added nodes and cables on the live canvas back to the bare fixed walls.",
@@ -27221,5 +27380,5 @@ live(
 );
 var transport = new StdioServerTransport();
 await server.connect(transport);
-process.stderr.write(`[node-lab-mcp] ready \u2014 ${room ? `relay room "${room}"` : `local bridge ws://localhost:${BRIDGE_PORT}`}
+process.stderr.write(`[node-lab-mcp] ready \u2014 ${bridge.status()}
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-lab-mcp",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "description": "MCP server to drive the IFR Node Lab graph from any MCP client (Claude / Codex / Gemini …) — locally or, via a PartyKit relay, against the deployed app.",
   "type": "module",
   "bin": {