@marimo-team/islands 0.23.6-dev23 → 0.23.6-dev28

package/src/core/runtime/runtime.ts

@@ -5,6 +5,7 @@ import { Logger } from "@/utils/Logger";
 import { KnownQueryParams } from "../constants";
 import { isIslands } from "../islands/utils";
 import { getSessionId, type SessionId } from "../kernel/session";
+import { isStaticNotebook } from "../static/static-state";
 import { isWasm } from "../wasm/utils";
 import type { RuntimeConfig } from "./types";
 
@@ -178,8 +179,8 @@ export class RuntimeManager {
   }
 
   async isHealthy(): Promise<boolean> {
-    // Always healthy if WASM
-    if (isWasm() || isIslands()) {
+    // Always healthy if WASM, Islands, or a static notebook (no server)
+    if (isWasm() || isIslands() || isStaticNotebook()) {
       return true;
     }
 

package/src/core/wasm/__tests__/bridge.test.ts

@@ -58,7 +58,7 @@ vi.mock("@/core/wasm/store", () => ({
 // Import after all mocks are set up
 import { store } from "@/core/state/jotai";
 import { initialModeAtom } from "@/core/mode";
-import { PyodideBridge } from "../bridge";
+import { getWasmWorkerName, PyodideBridge } from "../bridge";
 
 // Access INSTANCE once at module level so the constructor runs (and
 // addMessageListener populates rpcListeners) before any test executes.
@@ -111,3 +111,28 @@ describe("PyodideBridge.readCode", () => {
     expect(mockNotebookReadFile).not.toHaveBeenCalled();
   });
 });
+
+describe("getWasmWorkerName", () => {
+  afterEach(() => {
+    delete (window as unknown as { __MARIMO_HAS_WASM_CONTROLLER__?: boolean })
+      .__MARIMO_HAS_WASM_CONTROLLER__;
+  });
+
+  it("returns the version without suffix by default", () => {
+    expect(getWasmWorkerName()).toBe("0.0.0-test");
+  });
+
+  it("appends ::controller when the host opts in", () => {
+    (
+      window as unknown as { __MARIMO_HAS_WASM_CONTROLLER__?: boolean }
+    ).__MARIMO_HAS_WASM_CONTROLLER__ = true;
+    expect(getWasmWorkerName()).toBe("0.0.0-test::controller");
+  });
+
+  it("does not append the suffix for non-true values", () => {
+    (
+      window as unknown as { __MARIMO_HAS_WASM_CONTROLLER__?: unknown }
+    ).__MARIMO_HAS_WASM_CONTROLLER__ = "true";
+    expect(getWasmWorkerName()).toBe("0.0.0-test");
+  });
+});

package/src/core/wasm/bridge.ts

@@ -81,9 +81,9 @@ export class PyodideBridge implements RunRequests, EditRequests {
       new URL("./worker/save-worker.ts", import.meta.url),
       {
         type: "module",
-        // Pass the version to the worker
+        // Pass the version (and optional capability suffix) to the worker
         /* @vite-ignore */
-        name: getMarimoVersion(),
+        name: getWasmWorkerName(),
       },
     );
 
@@ -101,9 +101,9 @@ export class PyodideBridge implements RunRequests, EditRequests {
       new URL("./worker/worker.ts", import.meta.url),
       {
         type: "module",
-        // Pass the version to the worker
+        // Pass the version (and optional capability suffix) to the worker
         /* @vite-ignore */
-        name: getMarimoVersion(),
+        name: getWasmWorkerName(),
       },
     );
 
@@ -634,3 +634,17 @@ export function createPyodideConnection(): IConnectionTransport {
     PyodideBridge.INSTANCE.attachMessageConsumer(callback);
   });
 }
+
+// Compose the worker name. The version prefix is read by getMarimoVersion()
+// in the worker; the optional "::controller" suffix tells getController.ts
+// that the host page provides a custom /wasm/controller.js and that the
+// dynamic import should be attempted. Hosts opt in by setting
+// `window.__MARIMO_HAS_WASM_CONTROLLER__ = true` before
+// PyodideBridge/worker initialization.
+export function getWasmWorkerName(): string {
+  const hasCustomController =
+    typeof window !== "undefined" &&
+    (window as unknown as { __MARIMO_HAS_WASM_CONTROLLER__?: boolean })
+      .__MARIMO_HAS_WASM_CONTROLLER__ === true;
+  return getMarimoVersion() + (hasCustomController ? "::controller" : "");
+}

package/src/core/wasm/worker/getController.ts

@@ -5,6 +5,13 @@ import type { WasmController } from "./types";
 // Load the controller
 // Falls back to the default controller
 export async function getController(version: string): Promise<WasmController> {
+  // Hosts that provide a custom /wasm/controller.js opt in via the worker
+  // name (see bridge.ts). Default: skip the dynamic import to avoid a
+  // guaranteed-404 round trip on the standard build.
+  const hasCustomController = self.name?.includes("::controller") ?? false;
+  if (!hasCustomController) {
+    return new DefaultWasmController();
+  }
   try {
     const controller = await import(
       /* @vite-ignore */ `/wasm/controller.js?version=${version}`

package/src/core/wasm/worker/save-worker.ts

@@ -103,5 +103,6 @@ const rpc = createRPC<SaveWorkerSchema, ParentSchema>({
 rpc.send("ready", {});
 
 function getMarimoVersion() {
-  return self.name; // We store the version in the worker name
+  // Worker name is "<version>" or "<version>::<capability>" — see bridge.ts.
+  return self.name.split("::")[0];
 }

package/src/core/wasm/worker/worker.ts

@@ -375,7 +375,8 @@ const namesThatRequireSync = new Set<keyof RawBridge>([
 ]);
 
 function getMarimoVersion() {
-  return self.name; // We store the version in the worker name
+  // Worker name is "<version>" or "<version>::<capability>" — see bridge.ts.
+  return self.name.split("::")[0];
 }
 
 const pyodideReadyPromise = t.wrapAsync(loadPyodideAndPackages)();

package/src/plugins/impl/common/labeled.tsx

@@ -44,7 +44,7 @@ export const Labeled: React.FC<PropsWithChildren<Props>> = ({
   }
 
   const labelElement = (
-    <div part="label" className="m-0 p-0">
+    <div part="label" className="inline-flex items-center m-0 p-0">
       <Label htmlFor={id} className={cn("font-prose", labelClassName)}>
         {renderHTML({ html: label })}
       </Label>