@marimo-team/islands 0.23.15-dev32 → 0.23.15-dev4

package/src/core/islands/parse.ts

@@ -2,7 +2,6 @@
 
 import {
   ISLAND_DATA_ATTRIBUTES,
-  ISLAND_SOURCE_CHANGED_EVENT,
   ISLAND_TAG_NAMES,
   ISLANDS_JSON_SCRIPT_TYPE,
 } from "@/core/islands/constants";
@@ -75,15 +74,12 @@ interface MarimoIslandPayloadCell {
   displayOutput: boolean;
 }
 
-const retainedPayloadCellIds = new WeakMap<HTMLElement, string>();
-
 /**
  * Parses marimo island apps from the DOM
  * @param root - Root element to search within (defaults to document)
  */
 export function parseMarimoIslandApps(
   root: Document | Element = document,
-  options: { materialize?: boolean } = {},
 ): MarimoIslandApp[] {
   const embeds = [
     ...root.querySelectorAll<HTMLElement>(ISLAND_TAG_NAMES.ISLAND),
@@ -94,12 +90,11 @@ export function parseMarimoIslandApps(
     return [];
   }
 
-  const materialize = options.materialize ?? true;
   if (payloads.length > 0) {
-    return parsePayloadBackedApps({ embeds, materialize, payloads });
+    return parsePayloadBackedApps(embeds, payloads);
   }
 
-  return parseIslandElementsIntoApps(embeds, materialize);
+  return parseIslandElementsIntoApps(embeds);
 }
 
 /**
@@ -108,7 +103,6 @@ export function parseMarimoIslandApps(
  */
 export function parseIslandElementsIntoApps(
   embeds: HTMLElement[],
-  materialize = true,
 ): MarimoIslandApp[] {
   const apps = new Map<string, MarimoIslandApp>();
 
@@ -146,24 +140,16 @@ export function parseIslandElementsIntoApps(
     });
 
     // Add data-cell-idx attribute to the island element
-    if (materialize) {
-      embed.setAttribute(ISLAND_DATA_ATTRIBUTES.CELL_IDX, idx.toString());
-      embed.dispatchEvent(new Event(ISLAND_SOURCE_CHANGED_EVENT));
-    }
+    embed.setAttribute(ISLAND_DATA_ATTRIBUTES.CELL_IDX, idx.toString());
   }
 
   return [...apps.values()];
 }
 
-function parsePayloadBackedApps({
-  embeds,
-  materialize,
-  payloads,
-}: {
-  embeds: HTMLElement[];
-  materialize: boolean;
-  payloads: MarimoIslandPayload[];
-}): MarimoIslandApp[] {
+function parsePayloadBackedApps(
+  embeds: HTMLElement[],
+  payloads: MarimoIslandPayload[],
+): MarimoIslandApp[] {
   const apps = new Map<string, MarimoIslandApp>();
   const matchedPayloadCells = new Map<MarimoIslandPayloadCell, HTMLElement>();
   const consumedEmbeds = new Set<HTMLElement>();
@@ -183,9 +169,7 @@ function parsePayloadBackedApps({
       }
       consumedEmbeds.add(embed);
       matchedPayloadCells.set(cell, embed);
-      if (materialize) {
-        materializeIslandPayload(embed, cell);
-      }
+      materializeIslandPayload(embed, cell);
       hasMatchedIsland = true;
     }
     // Only payloads matched to island anchors can start runtime apps.
@@ -231,7 +215,7 @@ function parsePayloadBackedApps({
         appCell.disabled = true;
       }
       app.cells.push(appCell);
-      if (materialize && cell.reactive) {
+      if (cell.reactive) {
         embed?.setAttribute(ISLAND_DATA_ATTRIBUTES.CELL_IDX, idx.toString());
       }
     }
@@ -239,15 +223,12 @@ function parsePayloadBackedApps({
 
   // A supported payload is the runtime source for its app. Extra same-app DOM
   // islands are disconnected from runtime binding.
-  if (materialize) {
-    for (const embed of embeds) {
-      const appId = embed.getAttribute(ISLAND_DATA_ATTRIBUTES.APP_ID);
-      if (appId && payloadAppIds.has(appId) && !consumedEmbeds.has(embed)) {
-        embed.removeAttribute(ISLAND_DATA_ATTRIBUTES.CELL_ID);
-        embed.removeAttribute(ISLAND_DATA_ATTRIBUTES.CELL_IDX);
-        embed.setAttribute(ISLAND_DATA_ATTRIBUTES.REACTIVE, "false");
-        consumedEmbeds.add(embed);
-      }
+  for (const embed of embeds) {
+    const appId = embed.getAttribute(ISLAND_DATA_ATTRIBUTES.APP_ID);
+    if (appId && payloadAppIds.has(appId) && !consumedEmbeds.has(embed)) {
+      embed.removeAttribute(ISLAND_DATA_ATTRIBUTES.CELL_ID);
+      embed.removeAttribute(ISLAND_DATA_ATTRIBUTES.CELL_IDX);
+      embed.setAttribute(ISLAND_DATA_ATTRIBUTES.REACTIVE, "false");
     }
   }
 
@@ -256,16 +237,7 @@ function parsePayloadBackedApps({
     return !appId || !payloadAppIds.has(appId);
   });
 
-  if (materialize) {
-    for (const embed of consumedEmbeds) {
-      embed.dispatchEvent(new Event(ISLAND_SOURCE_CHANGED_EVENT));
-    }
-  }
-
-  return [
-    ...apps.values(),
-    ...parseIslandElementsIntoApps(domOnlyEmbeds, materialize),
-  ];
+  return [...apps.values(), ...parseIslandElementsIntoApps(domOnlyEmbeds)];
 }
 
 function findMatchingIsland({
@@ -285,8 +257,7 @@ function findMatchingIsland({
     }
     return (
       embed.getAttribute(ISLAND_DATA_ATTRIBUTES.APP_ID) === appId &&
-      (embed.getAttribute(ISLAND_DATA_ATTRIBUTES.CELL_ID) ??
-        retainedPayloadCellIds.get(embed)) === cell.cellId
+      embed.getAttribute(ISLAND_DATA_ATTRIBUTES.CELL_ID) === cell.cellId
     );
   });
 }
@@ -295,7 +266,6 @@ function materializeIslandPayload(
   embed: HTMLElement,
   cell: MarimoIslandPayloadCell,
 ): void {
-  retainedPayloadCellIds.set(embed, cell.cellId);
   embed.setAttribute(
     ISLAND_DATA_ATTRIBUTES.REACTIVE,
     JSON.stringify(cell.reactive),
@@ -334,22 +304,6 @@ function ensureIslandChild(embed: HTMLElement, tagName: string): HTMLElement {
  * @param embed - The island HTML element
  * @returns Cell data or null if invalid
  */
-const retainedIslandSources = new WeakMap<
-  HTMLElement,
-  { output: string; code: string }
->();
-
-export function retainIslandSource(
-  embed: HTMLElement,
-  source: { output: string; code: string },
-): void {
-  if (source.code) {
-    retainedIslandSources.set(embed, source);
-  } else {
-    retainedIslandSources.delete(embed);
-  }
-}
-
 export function parseIslandElement(
   embed: HTMLElement,
 ): { output: string; code: string } | null {
@@ -358,15 +312,14 @@ export function parseIslandElement(
   );
   const code = extractIslandCodeFromEmbed(embed);
 
-  if (cellOutput && code) {
-    return {
-      output: cellOutput.innerHTML,
-      code: code,
-    };
+  if (!cellOutput || !code) {
+    return null;
   }
 
-  const retained = retainedIslandSources.get(embed);
-  return retained?.code ? retained : null;
+  return {
+    output: cellOutput.innerHTML,
+    code: code,
+  };
 }
 
 export function createMarimoFile(app: {

package/src/core/islands/worker/worker.tsx

@@ -1,7 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import type { PyodideInterface } from "pyodide";
-import type { PyProxy } from "pyodide/ffi";
 import {
   createRPC,
   createRPCRequestHandler,
@@ -17,6 +16,7 @@ import { MessageBuffer } from "@/core/wasm/worker/message-buffer";
 import type { RawBridge, SerializedBridge } from "@/core/wasm/worker/types";
 import type { JsonString } from "@/utils/json/base64";
 import { Logger } from "@/utils/Logger";
+import { Deferred } from "../../../utils/Deferred";
 import { prettyError } from "../../../utils/errors";
 import { invariant } from "../../../utils/invariant";
 import { ReadonlyWasmController } from "./controller";
@@ -50,128 +50,59 @@ const messageBuffer = new MessageBuffer(
     rpc.send.kernelMessage({ message });
   },
 );
-interface SessionRequest {
-  code: string;
-  appId: string;
-  sessionGeneration: number;
-}
-
-let activeSession:
-  | (Omit<SessionRequest, "code"> & { bridge: SerializedBridge })
-  | undefined;
-let sessionQueue = Promise.resolve();
-
-async function startSession(
-  opts: SessionRequest,
-  replace: boolean,
-): Promise<void> {
-  await pyodideReadyPromise;
-
-  try {
-    invariant(self.controller, "Controller not loaded");
-    if (replace) {
-      await stopActiveSession();
-    }
-    const notebook = await self.controller.mountFilesystem({
-      code: opts.code,
-      filename: `app-${opts.appId}.py`,
-    });
-    const nextBridge = await self.controller.startSession({
-      ...notebook,
-      onMessage: messageBuffer.push,
-    });
-    if (activeSession) {
-      (nextBridge as unknown as PyProxy).destroy();
-    } else {
-      activeSession = {
-        appId: opts.appId,
-        bridge: nextBridge,
-        sessionGeneration: opts.sessionGeneration,
-      };
-    }
-    rpc.send.initialized({});
-  } catch (error) {
-    rpc.send.initializedError({
-      error: prettyError(error),
-    });
-    throw error;
-  }
-}
-
-async function stopActiveSession(): Promise<void> {
-  const session = activeSession;
-  await self.controller.stopSession();
-  activeSession = undefined;
-  (session?.bridge as unknown as PyProxy | undefined)?.destroy();
-}
-
-function enqueueSession<T>(operation: () => Promise<T>): Promise<T> {
-  const result = sessionQueue.then(operation);
-  sessionQueue = result.then(
-    () => undefined,
-    () => undefined,
-  );
-  return result;
-}
+const bridgeReady = new Deferred<SerializedBridge>();
 
 // Handle RPC requests
 const requestHandler = createRPCRequestHandler({
   /**
    * Start the session
    */
-  startSession: async (opts: SessionRequest) => {
-    await enqueueSession(() => startSession(opts, false));
-  },
-
-  replaceSession: async (opts: SessionRequest) => {
-    await enqueueSession(() => startSession(opts, true));
-  },
+  startSession: async (opts: { code: string; appId: string }) => {
+    await pyodideReadyPromise; // Make sure loading is done
 
-  stopSession: async (opts: { appId: string; sessionGeneration: number }) => {
-    await enqueueSession(async () => {
-      if (
-        activeSession?.appId !== opts.appId ||
-        activeSession?.sessionGeneration !== opts.sessionGeneration
-      ) {
-        return;
-      }
+    try {
       invariant(self.controller, "Controller not loaded");
-      await stopActiveSession();
-    });
+      const notebook = await self.controller.mountFilesystem({
+        code: opts.code,
+        filename: `app-${opts.appId}.py`,
+      });
+      const bridge = await self.controller.startSession({
+        ...notebook,
+        onMessage: messageBuffer.push,
+      });
+      bridgeReady.resolve(bridge);
+      rpc.send.initialized({});
+    } catch (error) {
+      rpc.send.initializedError({
+        error: prettyError(error),
+      });
+    }
+    return;
   },
 
   /**
    * Load packages
    */
-  loadPackages: async (opts: {
-    appId: string;
-    code: string;
-    sessionGeneration: number;
-  }) => {
+  loadPackages: async (code: string) => {
     await pyodideReadyPromise; // Make sure loading is done
-    await enqueueSession(async () => {
-      requireActiveBridge(opts);
-
-      let { code } = opts;
 
-      if (shouldLoadDuckDBPackages(code)) {
-        // Add pandas and duckdb to the code for mo.sql and for remote duckdb sources
-        code = `import pandas\n${code}`;
-        code = `import duckdb\n${code}`;
-        code = `import sqlglot\n${code}`;
-
-        // Polars + SQL requires pyarrow, and installing
-        // after notebook load does not work. As a heuristic,
-        // if it appears that the notebook uses polars, add pyarrow.
-        if (code.includes("polars")) {
-          code = `import pyarrow\n${code}`;
-        }
+    if (shouldLoadDuckDBPackages(code)) {
+      // Add pandas and duckdb to the code for mo.sql and for remote duckdb sources
+      code = `import pandas\n${code}`;
+      code = `import duckdb\n${code}`;
+      code = `import sqlglot\n${code}`;
+
+      // Polars + SQL requires pyarrow, and installing
+      // after notebook load does not work. As a heuristic,
+      // if it appears that the notebook uses polars, add pyarrow.
+      if (code.includes("polars")) {
+        code = `import pyarrow\n${code}`;
       }
+    }
 
-      await self.pyodide.loadPackagesFromImports(code, {
-        messageCallback: Logger.log,
-        errorCallback: Logger.error,
-      });
+    await self.pyodide.loadPackagesFromImports(code, {
+      messageCallback: Logger.log,
+      errorCallback: Logger.error,
     });
   },
 
@@ -179,56 +110,37 @@ const requestHandler = createRPCRequestHandler({
    * Call a function on the bridge
    */
   bridge: async (opts: {
-    appId: string;
     functionName: keyof RawBridge;
     payload: {} | undefined | null;
-    sessionGeneration: number;
   }) => {
     await pyodideReadyPromise; // Make sure loading is done
 
     const { functionName, payload } = opts;
 
     // Perform the function call to the Python bridge
-    return enqueueSession(async () => {
-      const bridge = requireActiveBridge(opts);
-
-      // Serialize the payload
-      const payloadString =
-        payload == null
-          ? null
-          : typeof payload === "string"
-            ? payload
-            : JSON.stringify(payload);
-
-      // Make the request
-      const response =
-        payloadString == null
-          ? // @ts-expect-error ehh TypeScript
-            await bridge[functionName]()
-          : // @ts-expect-error ehh TypeScript
-            await bridge[functionName](payloadString);
-
-      // Post the response back to the main thread
-      return typeof response === "string" ? JSON.parse(response) : response;
-    });
+    const bridge = await bridgeReady.promise;
+
+    // Serialize the payload
+    const payloadString =
+      payload == null
+        ? null
+        : typeof payload === "string"
+          ? payload
+          : JSON.stringify(payload);
+
+    // Make the request
+    const response =
+      payloadString == null
+        ? // @ts-expect-error ehh TypeScript
+          await bridge[functionName]()
+        : // @ts-expect-error ehh TypeScript
+          await bridge[functionName](payloadString);
+
+    // Post the response back to the main thread
+    return typeof response === "string" ? JSON.parse(response) : response;
   },
 });
 
-function requireActiveBridge(opts: {
-  appId: string;
-  sessionGeneration: number;
-}): SerializedBridge {
-  const session = activeSession;
-  if (
-    !session ||
-    opts.appId !== session.appId ||
-    opts.sessionGeneration !== session.sessionGeneration
-  ) {
-    throw new Error("The marimo app session is no longer active.");
-  }
-  return session.bridge;
-}
-
 // create the iframe's schema
 export type WorkerSchema = RPCSchema<
   {

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

@@ -1,6 +1,5 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 import { loadPyodide, type PyodideInterface } from "pyodide";
-import type { PyCallable, PyProxy } from "pyodide/ffi";
 import type { UserConfig } from "@/core/config/config-schema";
 import type { NotificationPayload } from "@/core/kernel/messages";
 import type { JsonString } from "@/utils/json/base64";
@@ -13,12 +12,6 @@ import type { SerializedBridge, WasmController } from "./types";
 import { shouldLoadDuckDBPackages } from "../utils";
 
 const MAKE_SNAPSHOT = false;
-type SessionResources = [
-  bridge: PyProxy,
-  init: PyCallable,
-  packages: PyProxy,
-  stop: PyCallable,
-];
 
 // This class initializes the wasm environment
 // We would like this initialization to be parallelizable
@@ -32,9 +25,6 @@ type SessionResources = [
 
 export class DefaultWasmController implements WasmController {
   protected pyodide: PyodideInterface | null = null;
-  private packageLoadQueue = Promise.resolve();
-  private sessionGeneration = 0;
-  private activeSessionStops = new Set<PyCallable>();
 
   get requirePyodide() {
     invariant(this.pyodide, "Pyodide not loaded");
@@ -121,7 +111,6 @@ export class DefaultWasmController implements WasmController {
     onMessage: (message: JsonString<NotificationPayload>) => void;
     userConfig: UserConfig;
   }): Promise<SerializedBridge> {
-    const sessionGeneration = this.sessionGeneration;
     const { code, filename, onMessage, queryParameters, userConfig } = opts;
     // We pass down a messenger object to the code
     // This is used to have synchronous communication between the JS and Python code
@@ -137,129 +126,47 @@ export class DefaultWasmController implements WasmController {
 
     const span = t.startSpan("startSession.runPython");
     const nbFilename = filename || WasmFileSystem.NOTEBOOK_FILENAME;
-    const sessionResources = this.requirePyodide.runPython(
+    const [bridge, init, packages] = this.requirePyodide.runPython(
       `
       print("[py] Starting marimo...")
       import asyncio
-      import gc
       import js
       from marimo._pyodide.bootstrap import create_session, instantiate
 
       assert js.messenger, "messenger is not defined"
       assert js.query_params, "query_params is not defined"
 
-      def create_session_resources():
-        session, bridge = create_session(
-          filename="${nbFilename}",
-          query_params=js.query_params.to_py(),
-          message_callback=js.messenger.callback,
-          user_config=js.user_config.to_py(),
-        )
-        session_task = None
+      session, bridge = create_session(
+        filename="${nbFilename}",
+        query_params=js.query_params.to_py(),
+        message_callback=js.messenger.callback,
+        user_config=js.user_config.to_py(),
+      )
 
-        def init(auto_instantiate=True):
-          nonlocal session_task
-          instantiate(session, auto_instantiate)
-          session_task = asyncio.create_task(session.start())
+      def init(auto_instantiate=True):
+        instantiate(session, auto_instantiate)
+        asyncio.create_task(session.start())
 
-        async def stop():
-          nonlocal bridge, session, session_task
-          task = session_task
-          kernel_task = getattr(session, "kernel_task", None)
-          if kernel_task is None:
-            if task is not None:
-              task.cancel()
-          else:
-            kernel_task.stop()
-          if task is not None:
-            await asyncio.gather(task, return_exceptions=True)
-          if bridge is not None:
-            bridge.session = None
-          task = None
-          kernel_task = None
-          session_task = None
-          session = None
-          bridge = None
-          gc.collect()
+      # Find the packages to install
+      with open("${nbFilename}", "r") as f:
+        packages = session.find_packages(f.read())
 
-        with open("${nbFilename}", "r") as f:
-          packages = session.find_packages(f.read())
-
-        return bridge, init, packages, stop
-
-      create_session_resources()`,
-    ) as PyProxy;
+      bridge, init, packages`,
+    );
     span.end();
-    let bridgeProxy!: PyProxy;
-    let initSession!: PyCallable;
-    let packagesProxy!: PyProxy;
-    let stopSession!: PyCallable;
-    try {
-      [bridgeProxy, initSession, packagesProxy, stopSession] =
-        sessionResources as unknown as SessionResources;
-    } finally {
-      sessionResources.destroy();
-    }
-    let foundPackages: Set<string>;
-    try {
-      foundPackages = new Set<string>(packagesProxy.toJs());
-    } catch (error) {
-      bridgeProxy.destroy();
-      initSession.destroy();
-      stopSession.destroy();
-      throw error;
-    } finally {
-      packagesProxy.destroy();
-    }
-    this.activeSessionStops.add(stopSession);
+
+    const foundPackages = new Set<string>(packages.toJs());
 
     // Fire and forget:
     // Load notebook dependencies and instantiate the session
     // We don't want to wait for this to finish,
     // so we can show the initial code immediately giving
     // a sense of responsiveness.
-    const dependenciesReady = this.packageLoadQueue.then(() => {
-      if (sessionGeneration !== this.sessionGeneration) {
-        return;
-      }
-      return this.loadNotebookDeps(code, foundPackages);
+    void this.loadNotebookDeps(code, foundPackages).then(() => {
+      return init(userConfig.runtime.auto_instantiate);
     });
-    this.packageLoadQueue = dependenciesReady.catch(() => undefined);
-    void dependenciesReady
-      .then(() => {
-        if (sessionGeneration !== this.sessionGeneration) {
-          return;
-        }
-        return initSession(userConfig.runtime.auto_instantiate);
-      })
-      .catch((error: unknown) => {
-        Logger.error("Failed to load notebook dependencies", error);
-      })
-      .finally(() => initSession.destroy());
-
-    return bridgeProxy as unknown as SerializedBridge;
-  }
 
-  async stopSession(): Promise<void> {
-    this.sessionGeneration += 1;
-    const stops = [...this.activeSessionStops];
-    let hasFailure = false;
-    let firstFailure: unknown;
-    for (const stop of stops) {
-      try {
-        await stop();
-        this.activeSessionStops.delete(stop);
-        stop.destroy();
-      } catch (error) {
-        if (!hasFailure) {
-          hasFailure = true;
-          firstFailure = error;
-        }
-      }
-    }
-    if (hasFailure) {
-      throw firstFailure;
-    }
+    return bridge;
   }
 
   private async loadNotebookDeps(code: string, foundPackages: Set<string>) {

package/src/css/app/Cell.css

@@ -255,12 +255,6 @@
     border: none;
     box-shadow: none;
 
-    /* No dividers between sections. Tailwind v4's divide-y is structural
-     * (`> :not(:last-child)`), so hidden-but-mounted children (e.g. the tray
-     * while presenting) still count as siblings and would otherwise draw a
-     * stray rule under the output. */
-    @apply divide-y-0;
-
     .output-area {
       /* flow-root interferes with margin collapsing, but appears to be unneeded
             * when cell outlines are hidden; clear:both is sufficient.
@@ -449,10 +443,6 @@
   /* Set a fixed gutter width to ensure the hover area is always wide enough */
   /* And make the gutter bigger when the window is super wide */
   --gutter-width: 100px;
-
-  /* Vertical gap between notebook cells (gap-5). Overridable via custom css;
-   * zeroed while presenting, when published cells flow together. */
-  --notebook-cell-gap: 1.25rem;
 }
 
 /* ------------------------ CodeMirror Editor ----------------------------- */