@marimo-team/islands 0.25.3-dev140 → 0.25.3-dev142

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

@@ -12,6 +12,7 @@ import type { UserConfig } from "@/core/config/config-schema";
 import type {
   ListPackagesResponse,
   PackageOperationResponse,
+  NotebookDocumentTransactionRequest,
   SaveNotebookRequest,
 } from "@/core/network/types";
 import { decodeUtf8 } from "@/utils/strings";
@@ -83,14 +84,6 @@ async function getNotebook() {
 }
 
 const requestHandler = createRPCRequestHandler({
-  notebookInfo: async () => {
-    const notebook = await getNotebook();
-    try {
-      return { id: notebook.id };
-    } finally {
-      notebook.destroy();
-    }
-  },
   notebookSubscribe: (request: { id: string; cursor: string | null }) => {
     let canceled = false;
     const subscribing = (async () => {
@@ -172,6 +165,17 @@ const requestHandler = createRPCRequestHandler({
         queryParameters: opts.queryParameters,
         userConfig: opts.userConfig,
       });
+      const notebook = session.bridge.notebook;
+      try {
+        notebook.set_persistence(async (contents, filename) => {
+          // Keep file operations in the execution worker from syncing stale source.
+          self.pyodide.FS.writeFile(filename, contents);
+          self.pyodide.FS.writeFile(WasmFileSystem.NOTEBOOK_FILENAME, contents);
+          await rpc.proxy.request.persistNotebook({ filename, contents });
+        });
+      } finally {
+        notebook.destroy();
+      }
       sessionReady.resolve(session);
       rpc.send.initializingMessage({
         message: "Initializing notebook...",
@@ -298,13 +302,21 @@ const requestHandler = createRPCRequestHandler({
     };
   },
 
-  /**
-   * Save the notebook
-   */
-  saveNotebook: async (opts: SaveNotebookRequest) => {
-    await pyodideReadyPromise; // Make sure loading is done
-    const { bridge } = await sessionReady.promise;
-    await bridge.save(JSON.stringify(opts));
+  documentTransaction: async (request: NotebookDocumentTransactionRequest) => {
+    const notebook = await getNotebook();
+    try {
+      await notebook.transaction(JSON.stringify(request));
+    } finally {
+      notebook.destroy();
+    }
+  },
+  setNotebookLayout: async (layout: SaveNotebookRequest["layout"]) => {
+    const notebook = await getNotebook();
+    try {
+      await notebook.set_layout(JSON.stringify(layout));
+    } finally {
+      notebook.destroy();
+    }
   },
 
   /**
@@ -403,6 +415,8 @@ const rpc = createRPC<WorkerSchema, ParentSchema>({
     transportId: TRANSPORT_ID,
   }),
   requestHandler,
+  // Persistence can include bootstrapping the storage worker.
+  maxRequestTime: Infinity,
 });
 
 rpc.addMessageListener("bootstrap", (config) => runtimeConfig.resolve(config));
@@ -410,8 +424,6 @@ rpc.addMessageListener("bootstrap", (config) => runtimeConfig.resolve(config));
 rpc.send("ready", {});
 
 const namesThatRequireSync = new Set<keyof RawBridge>([
-  "save",
-  "save_app_config",
   "rename_file",
   "create_file_or_directory",
   "delete_file_or_directory",

package/src/core/websocket/__tests__/backend.test.ts

@@ -5,7 +5,11 @@ import { createStore } from "jotai/vanilla";
 import { afterEach, describe, expect, it, onTestFinished, vi } from "vitest";
 import { Deferred } from "@/utils/Deferred";
 import { ConnectionState } from "../../host/connection";
-import { type FakeEdit, fakeBackend } from "../../host/__tests__/fixtures";
+import {
+  type FakeEdit,
+  type FakeSave,
+  fakeBackend,
+} from "../../host/__tests__/fixtures";
 import { createNotebookReplica } from "../../host/replica";
 import { createEditorBackend } from "../backend";
 
@@ -119,11 +123,12 @@ describe("createEditorBackend", () => {
     expect(fetch).not.toHaveBeenCalled();
   });
 
-  it("edits the WASM notebook through the worker once its stream starts", async () => {
+  it("routes WASM commands through the worker once its stream starts", async () => {
     wasm.enabled = true;
     const edit = vi.fn<FakeEdit>();
+    const save = vi.fn<FakeSave>();
     const transport = vi.fn(async () => undefined);
-    wasm.create.mockResolvedValue(fakeBackend({ transport, edit }));
+    wasm.create.mockResolvedValue(fakeBackend({ transport, edit, save }));
     const backend = createEditorBackend(options);
     expect(wasm.create).not.toHaveBeenCalled();
     expect(() => backend.notebook("n1")).toThrow("has not started");
@@ -136,6 +141,8 @@ describe("createEditorBackend", () => {
     expect(transport).toHaveBeenCalledWith(attempt, handlers);
     await backend.notebook("n1").edit([], { idempotencyKey: "edit-1" });
     expect(edit).toHaveBeenCalledWith("n1", [], { idempotencyKey: "edit-1" });
+    await backend.notebook("n2").save({ idempotencyKey: "save-1" });
+    expect(save).toHaveBeenCalledWith("n2", { idempotencyKey: "save-1" });
   });
 
   it("stops following WASM when the worker does not start", async () => {

package/src/core/websocket/backend.ts

@@ -92,17 +92,16 @@ function wasm(): NotebookBackend {
 
 /** Commands for a notebook the editor cannot change through its backend. */
 function uneditable(): ReturnType<NotebookBackend["notebook"]> {
-  return {
-    edit: async () => ({
-      ok: false,
+  const unsupported: NotebookClient["save"] = async () => ({
+    ok: false,
+    status: 501,
+    problem: {
+      type: "tag:marimo.io,2026:host/unsupported-operation",
+      title: "Document mutations are unavailable on this connection",
       status: 501,
-      problem: {
-        type: "tag:marimo.io,2026:host/unsupported-operation",
-        title: "Document editing is unavailable on this connection",
-        status: 501,
-      },
-    }),
-  };
+    },
+  });
+  return { edit: () => unsupported(), save: unsupported };
 }
 
 /** Choose the backend for the editor's notebook. */