@lopecode/channel 0.1.1 → 0.1.3

package/claude-code-pairing-module.js

@@ -26,24 +26,38 @@ const _cc_watches = function _cc_watches(Inputs){return(
   Inputs.input([])
 )};
 
-const _cc_ws = function _cc_ws(cc_config, cc_notebook_id, cc_status, cc_messages, viewof_cc_watches, summarizeJS, observe, invalidation){return(
+const _cc_ws = function _cc_ws(cc_config, cc_notebook_id, cc_status, cc_messages, viewof_cc_watches, summarizeJS, observe, realize, runtime, invalidation){return(
 (function() {
   var port = cc_config.port, host = cc_config.host;
   var ws = null;
   var paired = false;
 
+
   function serializeValue(value, maxLen) {
     maxLen = maxLen || 500;
     try { return String(summarizeJS(value)).slice(0, maxLen); }
     catch(e) { return String(value).slice(0, maxLen); }
   }
 
+  // Framework modules that should not be the default target for define_variable
+  var FRAMEWORK_MODULES = new Set([
+    "bootloader", "builtin",
+    "@tomlarkworthy/lopepage",
+    "@tomlarkworthy/claude-code-pairing",
+    "@tomlarkworthy/module-selection"
+  ]);
+
   function findModule(runtime, moduleName) {
-    if (!moduleName) return null; // no module filter — match any module
-    for (var v of runtime._variables) {
-      if (v._module && v._module._name === moduleName) return v._module;
-      if (v._name && v._name.startsWith("module ") && v._name === "module " + moduleName)
-        return v._module;
+    // Use runtime.mains (Map<name, Module>) — the actual module refs used by the runtime
+    var mains = runtime.mains;
+    if (mains && mains instanceof Map) {
+      if (moduleName) {
+        return mains.get(moduleName) || null;
+      }
+      // No name specified — return the first non-framework main
+      for (var entry of mains) {
+        if (!FRAMEWORK_MODULES.has(entry[0])) return entry[1];
+      }
     }
     return null;
   }
@@ -88,31 +102,36 @@ const _cc_ws = function _cc_ws(cc_config, cc_notebook_id, cc_status, cc_messages
         var definition = cmd.params.definition;
         var inputs = cmd.params.inputs || [];
         var moduleName = cmd.params.module;
-        var targetModule = findModule(runtime, moduleName);
-        if (!targetModule) return { ok: false, error: "Module not found: " + (moduleName || "main") };
+        var mod = runtime.mains && runtime.mains.get(moduleName);
+        if (!mod && runtime.mains) {
+          for (var entry of runtime.mains) {
+            if (!FRAMEWORK_MODULES.has(entry[0])) { mod = entry[1]; break; }
+          }
+        }
+        if (!mod) return { ok: false, error: "Module not found: " + (moduleName || "default") };
 
-        var fn;
-        try {
-          eval("fn = " + definition);
+        return realize([definition], runtime).then(function(results) {
+          var fn = results[0];
           if (typeof fn !== "function") return { ok: false, error: "Definition must evaluate to a function" };
-        } catch (e) {
-          return { ok: false, error: "Failed to parse definition: " + e.message };
-        }
 
-        var existingVar = null;
-        for (var v of runtime._variables) {
-          if (v._name === name && v._module === targetModule) { existingVar = v; break; }
-        }
+          var existingVar = null;
+          for (var v of runtime._variables) {
+            if (v._name === name && v._module === mod) { existingVar = v; break; }
+          }
 
-        try {
-          if (existingVar) { existingVar.define(name, inputs, fn); }
-          else { var nv = targetModule.variable({}); nv.define(name, inputs, fn); }
-          var actualRuntime = findActualRuntime(runtime);
-          if (actualRuntime && actualRuntime._computeNow) actualRuntime._computeNow();
-          return { ok: true, result: { success: true, name: name, module: targetModule._name || "main", redefined: !!existingVar } };
-        } catch (e) {
-          return { ok: false, error: "Failed to define variable: " + e.message };
-        }
+          if (existingVar) {
+            existingVar.define(name, inputs, fn);
+          } else {
+            var obsFactory = null;
+            for (var v of runtime._variables) {
+              if (v._name === "__ojs_observer" && typeof v._value === "function") { obsFactory = v._value; break; }
+            }
+            mod.variable(obsFactory ? obsFactory(name) : {}).define(name, inputs, fn);
+          }
+          return { ok: true, result: { success: true, name: name, module: moduleName || "default" } };
+        }).catch(function(e) {
+          return { ok: false, error: "define failed: " + e.message };
+        });
       }
 
       case "delete-variable": {
@@ -381,7 +400,7 @@ const _cc_ws = function _cc_ws(cc_config, cc_notebook_id, cc_status, cc_messages
   function handleFork(runtime) {
     return new Promise(function(resolve) {
       for (var v of runtime._variables) {
-        if (v._name === "_exportToHTML" && typeof v._value === "function") {
+        if ((v._name === "_exportToHTML" || v._name === "exportToHTML") && typeof v._value === "function") {
           try {
             Promise.resolve(v._value()).then(function(html) {
               resolve({ ok: true, result: { html: html } });
@@ -769,7 +788,7 @@ export default function define(runtime, observer) {
   $def("_cc_messages", "cc_messages", ["Inputs"], _cc_messages);
   $def("_cc_watches", "viewof cc_watches", ["Inputs"], _cc_watches);
   main.variable().define("cc_watches", ["Generators", "viewof cc_watches"], (G, v) => G.input(v));
-  $def("_cc_ws", "cc_ws", ["cc_config","cc_notebook_id","cc_status","cc_messages","viewof cc_watches","summarizeJS","observe","invalidation"], _cc_ws);
+  $def("_cc_ws", "cc_ws", ["cc_config","cc_notebook_id","cc_status","cc_messages","viewof cc_watches","summarizeJS","observe","realize","runtime","invalidation"], _cc_ws);
   $def("_cc_change_forwarder", "cc_change_forwarder", ["cc_ws","invalidation"], _cc_change_forwarder);
 
   // Imports
@@ -780,6 +799,8 @@ export default function define(runtime, observer) {
   main.define("viewof runtime_variables", ["module @tomlarkworthy/runtime-sdk", "@variable"], (_, v) => v.import("viewof runtime_variables", _));
   main.define("runtime_variables", ["module @tomlarkworthy/runtime-sdk", "@variable"], (_, v) => v.import("runtime_variables", _));
   main.define("observe", ["module @tomlarkworthy/runtime-sdk", "@variable"], (_, v) => v.import("observe", _));
+  main.define("realize", ["module @tomlarkworthy/runtime-sdk", "@variable"], (_, v) => v.import("realize", _));
+  main.define("runtime", ["module @tomlarkworthy/runtime-sdk", "@variable"], (_, v) => v.import("runtime", _));
   main.define("module d/57d79353bac56631@44", async () => runtime.module((await import("/d/57d79353bac56631@44.js?v=4")).default));
   main.define("hash", ["module d/57d79353bac56631@44", "@variable"], (_, v) => v.import("hash", _));
   main.define("module @tomlarkworthy/summarizejs", async () => runtime.module((await import("/@tomlarkworthy/summarizejs.js?v=4")).default));

package/lopecode-channel.ts

@@ -16,9 +16,10 @@ import type { ServerWebSocket } from "bun";
 import { join, dirname, basename } from "path";
 
 // --- Configuration ---
-const PORT = Number(process.env.LOPECODE_PORT ?? 8787);
+const REQUESTED_PORT = Number(process.env.LOPECODE_PORT ?? 0); // 0 = OS picks a free port
+let PORT = REQUESTED_PORT;
 
-// --- Pairing token ---
+// --- Pairing token (generated after port binding) ---
 function generateToken(): string {
   const chars = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789"; // no O/0/I/1
   let code = "";
@@ -26,7 +27,7 @@ function generateToken(): string {
   return `LOPE-${PORT}-${code}`;
 }
 
-const PAIRING_TOKEN = generateToken();
+let PAIRING_TOKEN = "";
 
 // --- State ---
 type ConnectionMeta = { url: string; title: string; modules?: string[] };
@@ -94,6 +95,8 @@ Variable updates (when watching):
 - eval_code: Evaluate JS in browser context
 - fork_notebook: Create a copy as sibling HTML file
 
+IMPORTANT: Always specify the module parameter when calling define_variable, get_variable, etc.
+Use the currentModules watch to identify the user's content module (not lopepage, module-selection, or claude-code-pairing).
 When multiple notebooks are connected, specify notebook_id (the URL). When only one is connected, it's used automatically.`,
   }
 );
@@ -307,15 +310,19 @@ mcp.setRequestHandler(CallToolRequestSchema, async (req) => {
         action = "get-variable";
         params = { name: args.name, module: args.module || null };
         break;
-      case "define_variable":
+      case "define_variable": {
         action = "define-variable";
+        let inputs = args.inputs;
+        if (typeof inputs === "string") inputs = JSON.parse(inputs);
+        if (!Array.isArray(inputs)) inputs = [];
         params = {
           name: args.name,
           definition: args.definition,
-          inputs: (args.inputs as string[]) || [],
+          inputs,
           module: args.module || null,
         };
         break;
+      }
       case "delete_variable":
         action = "delete-variable";
         params = { name: args.name, module: args.module || null };
@@ -534,53 +541,40 @@ function handleWsClose(ws: ServerWebSocket<unknown>) {
 await mcp.connect(new StdioServerTransport());
 
 // Start WebSocket + HTTP server
-try {
-  Bun.serve({
-    port: PORT,
-    hostname: "127.0.0.1",
-    fetch(req, server) {
-      const url = new URL(req.url);
-      if (url.pathname === "/ws") {
-        if (server.upgrade(req)) return;
-        return new Response("WebSocket upgrade failed", { status: 400 });
-      }
-      // Health check
-      if (url.pathname === "/health") {
-        return new Response(JSON.stringify({
-          paired: pairedConnections.size,
-          pending: pendingConnections.size,
-        }), { headers: { "content-type": "application/json" } });
-      }
-      // Root: redirect to blank notebook with auto-connect token
-      if (url.pathname === "/") {
-        const notebookUrl = `https://tomlarkworthy.github.io/lopecode/notebooks/@tomlarkworthy_blank-notebook.html#view=R100(S50(@tomlarkworthy/blank-notebook),S25(@tomlarkworthy/module-selection),S25(@tomlarkworthy/claude-code-pairing))&cc=${PAIRING_TOKEN}`;
-        return new Response(null, {
-          status: 302,
-          headers: { Location: notebookUrl },
-        });
-      }
-      return new Response("lopecode-channel", { status: 200 });
-    },
-    websocket: {
-      open(ws) {
-        pendingConnections.add(ws);
-      },
-      message: handleWsMessage,
-      close: handleWsClose,
+const server = Bun.serve({
+  port: REQUESTED_PORT,
+  hostname: "127.0.0.1",
+  fetch(req, server) {
+    const url = new URL(req.url);
+    if (url.pathname === "/ws") {
+      if (server.upgrade(req)) return;
+      return new Response("WebSocket upgrade failed", { status: 400 });
+    }
+    if (url.pathname === "/health") {
+      return new Response(JSON.stringify({
+        paired: pairedConnections.size,
+        pending: pendingConnections.size,
+      }), { headers: { "content-type": "application/json" } });
+    }
+    if (url.pathname === "/") {
+      const notebookUrl = `https://tomlarkworthy.github.io/lopecode/notebooks/@tomlarkworthy_blank-notebook.html#view=R100(S50(@tomlarkworthy/blank-notebook),S25(@tomlarkworthy/module-selection),S25(@tomlarkworthy/claude-code-pairing))&cc=${PAIRING_TOKEN}`;
+      return new Response(null, {
+        status: 302,
+        headers: { Location: notebookUrl },
+      });
+    }
+    return new Response("lopecode-channel", { status: 200 });
+  },
+  websocket: {
+    open(ws) {
+      pendingConnections.add(ws);
     },
-  });
-} catch (err) {
-  const msg = err instanceof Error ? err.message : String(err);
-  if (msg.includes("EADDRINUSE") || msg.includes("address already in use") || msg.includes("port") && msg.includes("in use")) {
-    process.stderr.write(
-      `lopecode-channel: ERROR — port ${PORT} is already in use.\n` +
-      `Another lopecode-channel or other service is running on this port.\n` +
-      `Kill the existing process or set LOPECODE_PORT=<other port>.\n`
-    );
-    process.exit(1);
-  }
-  throw err;
-}
+    message: handleWsMessage,
+    close: handleWsClose,
+  },
+});
 
+PORT = server.port; // read actual port (important when REQUESTED_PORT is 0)
+PAIRING_TOKEN = generateToken();
 process.stderr.write(`lopecode-channel: pairing token: ${PAIRING_TOKEN}\n`);
 process.stderr.write(`lopecode-channel: WebSocket server on ws://127.0.0.1:${PORT}/ws\n`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lopecode/channel",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Pair program with Claude inside Lopecode notebooks. MCP server bridging browser notebooks and Claude Code.",
   "type": "module",
   "bin": {