@marimo-team/islands 0.25.3-dev34 → 0.25.3-dev349

package/src/core/runtime/__tests__/runtime.test.ts

@@ -2,11 +2,7 @@
 
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { Mocks } from "@/__mocks__/common";
-import {
-  generateSessionId,
-  isSessionId,
-  type SessionId,
-} from "@/core/kernel/session";
+import type { SessionId } from "@/core/kernel/session";
 import { Logger } from "@/utils/Logger";
 import { RuntimeManager } from "../runtime";
 import type { RuntimeConfig } from "../types";
@@ -22,13 +18,11 @@ vi.mock("@/utils/Logger", () => ({ Logger: Mocks.quietLogger() }));
 describe("RuntimeManager", () => {
   const mockConfig: RuntimeConfig = {
     url: "https://example.com",
-    lazy: true,
     authToken: "test-token",
   };
 
   const mockConfigWithoutToken: RuntimeConfig = {
     url: "http://localhost:8080",
-    lazy: true,
   };
 
   describe("constructor", () => {
@@ -49,45 +43,12 @@ describe("RuntimeManager", () => {
     it("should handle URLs without trailing slash", () => {
       const runtime = new RuntimeManager({
         url: "https://example.com/path",
-        lazy: true,
       });
       expect(runtime.httpURL.toString()).toBe("https://example.com/path");
     });
   });
 
   describe("getWsURL", () => {
-    it("uses host notebook events with the existing session and auth parameters", () => {
-      const original = window.location.href;
-      window.history.replaceState({}, "", "/?types=run");
-      try {
-        const runtime = new RuntimeManager({
-          ...mockConfig,
-          url: "https://example.com/nested?file=notebook.py",
-          notebookId: "nb_123",
-        });
-        const sessionId = "s_123456";
-        if (!isSessionId(sessionId)) {
-          throw new Error("Invalid test session ID");
-        }
-        const url = runtime.getWsURL(sessionId);
-        expect({
-          endpoint: `${url.origin}${url.pathname}`,
-          params: Object.fromEntries(url.searchParams),
-        }).toEqual({
-          endpoint:
-            "wss://example.com/nested/api/marimo/v1/notebooks/nb_123/events/ws",
-          params: {
-            file: "notebook.py",
-            types: "notebook,document,cell,attachment,marimo",
-            session_id: sessionId,
-            access_token: "test-token",
-          },
-        });
-      } finally {
-        window.history.replaceState({}, "", original);
-      }
-    });
-
     it("should return WebSocket URL with session ID for https", () => {
       const runtime = new RuntimeManager(mockConfig);
       const sessionId = "1234" as SessionId;
@@ -114,7 +75,6 @@ describe("RuntimeManager", () => {
     it("should preserve existing query params", () => {
       const runtime = new RuntimeManager({
         url: "http://example.com?foo=bar",
-        lazy: true,
       });
       const sessionId = "1234" as SessionId;
       const url = runtime.getWsURL(sessionId);
@@ -127,14 +87,10 @@ describe("RuntimeManager", () => {
   describe("cross-origin auth token in WS URLs", () => {
     it("should add access_token to WS URL when cross-origin with authToken", () => {
       // example.com is cross-origin relative to the test environment (localhost)
-      const runtime = new RuntimeManager(
-        {
-          url: "https://sandbox.example.com",
-          lazy: true,
-          authToken: "my-secret-token",
-        },
-        true,
-      );
+      const runtime = new RuntimeManager({
+        url: "https://sandbox.example.com",
+        authToken: "my-secret-token",
+      });
       const url = runtime.getWsURL("s_123" as SessionId);
 
       expect(url.searchParams.get("access_token")).toBe("my-secret-token");
@@ -142,50 +98,34 @@ describe("RuntimeManager", () => {
     });
 
     it("should not add access_token to WS URL when same-origin", () => {
-      const runtime = new RuntimeManager(
-        {
-          url: window.location.origin,
-          lazy: true,
-          authToken: "my-secret-token",
-        },
-        true,
-      );
+      const runtime = new RuntimeManager({
+        url: window.location.origin,
+        authToken: "my-secret-token",
+      });
       const url = runtime.getWsURL("s_123" as SessionId);
 
       expect(url.searchParams.get("access_token")).toBeNull();
     });
 
     it("should not add access_token when no authToken is configured", () => {
-      const runtime = new RuntimeManager(
-        {
-          url: "https://sandbox.example.com",
-          lazy: true,
-        },
-        true,
-      );
+      const runtime = new RuntimeManager({
+        url: "https://sandbox.example.com",
+      });
       const url = runtime.getWsURL("s_123" as SessionId);
 
       expect(url.searchParams.get("access_token")).toBeNull();
     });
 
     it("should add access_token to all WS URL types when cross-origin", () => {
-      const runtime = new RuntimeManager(
-        {
-          url: "https://sandbox.example.com",
-          lazy: true,
-          authToken: "my-secret-token",
-        },
-        true,
-      );
+      const runtime = new RuntimeManager({
+        url: "https://sandbox.example.com",
+        authToken: "my-secret-token",
+      });
 
       const wsUrl = runtime.getWsURL("s_123" as SessionId);
-      const wsSyncUrl = runtime.getWsSyncURL("s_123" as SessionId);
       const terminalUrl = runtime.getTerminalWsURL();
 
       expect(wsUrl.searchParams.get("access_token")).toBe("my-secret-token");
-      expect(wsSyncUrl.searchParams.get("access_token")).toBe(
-        "my-secret-token",
-      );
       expect(terminalUrl.searchParams.get("access_token")).toBe(
         "my-secret-token",
       );
@@ -194,14 +134,10 @@ describe("RuntimeManager", () => {
 
   describe("formatNavigableHttpURL", () => {
     it("adds access_token when cross-origin with authToken", () => {
-      const runtime = new RuntimeManager(
-        {
-          url: "https://sandbox.example.com",
-          lazy: true,
-          authToken: "my-secret-token",
-        },
-        true,
-      );
+      const runtime = new RuntimeManager({
+        url: "https://sandbox.example.com",
+        authToken: "my-secret-token",
+      });
       const url = runtime.formatNavigableHttpURL(
         "api/files/download",
         new URLSearchParams({ path: "/tmp/data.csv" }),
@@ -213,14 +149,10 @@ describe("RuntimeManager", () => {
     });
 
     it("omits access_token when same-origin", () => {
-      const runtime = new RuntimeManager(
-        {
-          url: window.location.origin,
-          lazy: true,
-          authToken: "my-secret-token",
-        },
-        true,
-      );
+      const runtime = new RuntimeManager({
+        url: window.location.origin,
+        authToken: "my-secret-token",
+      });
       const url = runtime.formatNavigableHttpURL(
         "api/files/download",
         new URLSearchParams({ path: "/tmp/data.csv" }),
@@ -231,20 +163,16 @@ describe("RuntimeManager", () => {
     });
 
     it("omits access_token when no authToken configured", () => {
-      const runtime = new RuntimeManager(
-        { url: "https://sandbox.example.com", lazy: true },
-        true,
-      );
+      const runtime = new RuntimeManager({
+        url: "https://sandbox.example.com",
+      });
       const url = runtime.formatNavigableHttpURL("api/files/download");
 
       expect(url.searchParams.get("access_token")).toBeNull();
     });
 
     it("does not forward a page-inherited access_token when same-origin", () => {
-      const runtime = new RuntimeManager(
-        { url: window.location.origin, lazy: true },
-        true,
-      );
+      const runtime = new RuntimeManager({ url: window.location.origin });
       const original = window.location.href;
       window.history.replaceState({}, "", "/?access_token=page-token");
       try {
@@ -256,34 +184,28 @@ describe("RuntimeManager", () => {
     });
   });
 
-  describe("getSseURL", () => {
-    it.each([undefined, "nb_123"])(
-      "uses the legacy session stream when notebookId is %s",
-      (notebookId) => {
-        const runtime = new RuntimeManager({
-          ...mockConfig,
-          url: "https://example.com/nested?file=notebook.py",
-          notebookId,
-        });
-        const sessionId = generateSessionId();
-        expect(runtime.getSseURL(sessionId).toString()).toBe(
-          `https://example.com/nested/sse?file=notebook.py&session_id=${sessionId}`,
-        );
-      },
-    );
+  describe("getNotebookURL", () => {
+    it("addresses the notebook below the host API without the auth token", () => {
+      const runtime = new RuntimeManager({
+        url: "https://sandbox.example.com/base",
+        authToken: "my-secret-token",
+      });
+      const url = runtime.getNotebookURL("n/1");
+
+      expect(url.pathname).toBe("/base/api/marimo/v1/notebooks/n%2F1");
+      expect(url.toString()).not.toContain("my-secret-token");
+    });
+  });
 
+  describe("getSseURL", () => {
     it("should never put the auth token in the URL, even cross-origin", () => {
       // SSE requests can send headers, so auth travels in the
       // Authorization header; a token in the URL would leak into
       // proxy and server logs.
-      const runtime = new RuntimeManager(
-        {
-          url: "https://sandbox.example.com",
-          lazy: true,
-          authToken: "my-secret-token",
-        },
-        true,
-      );
+      const runtime = new RuntimeManager({
+        url: "https://sandbox.example.com",
+        authToken: "my-secret-token",
+      });
       const url = runtime.getSseURL("s_123" as SessionId);
 
       expect(url.searchParams.get("access_token")).toBeNull();
@@ -300,25 +222,14 @@ describe("RuntimeManager", () => {
         const url = runtime.getSseURL("s_123" as SessionId);
 
         expect(url.searchParams.get("access_token")).toBeNull();
-        expect(url.searchParams.get("foo")).toBe("bar");
+        expect(url.searchParams.get("query_params")).toBe("foo=bar");
+        expect(url.toString()).not.toContain("page-token");
       } finally {
         window.history.pushState({}, "", original);
       }
     });
   });
 
-  describe("getWsSyncURL", () => {
-    it("should return WebSocket Sync URL", () => {
-      const runtime = new RuntimeManager(mockConfig);
-      const sessionId = "1234" as SessionId;
-      const url = runtime.getWsSyncURL(sessionId);
-
-      expect(url.protocol).toBe("wss:");
-      expect(url.pathname).toBe("/ws_sync");
-      expect(url.searchParams.get("session_id")).toBe(sessionId);
-    });
-  });
-
   describe("getTerminalWsURL", () => {
     it("should include dimensions in the terminal handshake", () => {
       const runtime = new RuntimeManager(mockConfig);
@@ -352,7 +263,6 @@ describe("RuntimeManager", () => {
     it("should return copilot URL without non-auth query params", () => {
       const runtime = new RuntimeManager({
         url: "https://example.com?foo=bar&baz=qux",
-        lazy: true,
       });
       const url = runtime.getLSPURL("copilot");
 
@@ -363,14 +273,10 @@ describe("RuntimeManager", () => {
     });
 
     it("should preserve access_token on copilot URL when cross-origin", () => {
-      const runtime = new RuntimeManager(
-        {
-          url: "https://sandbox.example.com?foo=bar",
-          lazy: true,
-          authToken: "my-secret-token",
-        },
-        true,
-      );
+      const runtime = new RuntimeManager({
+        url: "https://sandbox.example.com?foo=bar",
+        authToken: "my-secret-token",
+      });
       const url = runtime.getLSPURL("copilot");
 
       expect(url.protocol).toBe("wss:");
@@ -381,14 +287,10 @@ describe("RuntimeManager", () => {
     });
 
     it("should not have access_token on copilot URL when same-origin", () => {
-      const runtime = new RuntimeManager(
-        {
-          url: window.location.origin,
-          lazy: true,
-          authToken: "my-secret-token",
-        },
-        true,
-      );
+      const runtime = new RuntimeManager({
+        url: window.location.origin,
+        authToken: "my-secret-token",
+      });
       const url = runtime.getLSPURL("copilot");
 
       expect(url.protocol).toBe("ws:");
@@ -480,13 +382,10 @@ describe("RuntimeManager", () => {
         url: "https://sandbox.example.com/health?some_value=abc123",
       });
 
-      const runtime = new RuntimeManager(
-        {
-          ...mockConfig,
-          url: "https://backend.example.com/lazy?some_value=abc123",
-        },
-        true,
-      );
+      const runtime = new RuntimeManager({
+        ...mockConfig,
+        url: "https://backend.example.com/lazy?some_value=abc123",
+      });
       const result = await runtime.probeHealth();
       expect(result).toBe(true);
       expect(runtime.httpURL.hostname).toBe("backend.example.com");
@@ -501,13 +400,10 @@ describe("RuntimeManager", () => {
         url: "https://sandbox.example.com/health?some_value=abc123",
       });
 
-      const runtime = new RuntimeManager(
-        {
-          ...mockConfig,
-          url: "https://backend.example.com/lazy?some_value=abc123",
-        },
-        true, // lazy — don't call init() in constructor
-      );
+      const runtime = new RuntimeManager({
+        ...mockConfig,
+        url: "https://backend.example.com/lazy?some_value=abc123",
+      });
       const result = await runtime.reconcileFromHealth();
 
       expect(result).toBe(true);
@@ -525,7 +421,7 @@ describe("RuntimeManager", () => {
 
   describe("waitForHealthy", () => {
     it("should resolve immediately if healthy", async () => {
-      const runtime = new RuntimeManager(mockConfig, true);
+      const runtime = new RuntimeManager(mockConfig);
 
       vi.spyOn(runtime, "reconcileFromHealth").mockResolvedValue(true);
       runtime.init();
@@ -534,7 +430,7 @@ describe("RuntimeManager", () => {
     });
 
     it("should retry and eventually succeed", async () => {
-      const runtime = new RuntimeManager(mockConfig, true);
+      const runtime = new RuntimeManager(mockConfig);
       const healthySpy = vi
         .spyOn(runtime, "reconcileFromHealth")
         .mockResolvedValueOnce(false)
@@ -548,7 +444,7 @@ describe("RuntimeManager", () => {
     });
 
     it("should throw after max retries", async () => {
-      const runtime = new RuntimeManager(mockConfig, true);
+      const runtime = new RuntimeManager(mockConfig);
       vi.spyOn(runtime, "reconcileFromHealth").mockResolvedValue(false);
       runtime.init({ disableRetryDelay: true });
 
@@ -659,7 +555,6 @@ describe("RuntimeManager", () => {
     it("should remove query params from base URI", async () => {
       const configWithQueryParams: RuntimeConfig = {
         url: "https://example.com/foo?param1=value1&param2=value2",
-        lazy: true,
         authToken: "test-token",
       };
 
@@ -683,7 +578,6 @@ describe("RuntimeManager", () => {
     it("should handle URLs with nested paths", () => {
       const runtime = new RuntimeManager({
         url: "https://example.com/nested/path/",
-        lazy: true,
       });
       const wsUrl = runtime.getWsURL("test" as SessionId);
       const aiUrl = runtime.getAiURL("completion");
@@ -705,7 +599,6 @@ describe("RuntimeManager", () => {
 
       const runtime = new RuntimeManager({
         url: "https://example.com/path?base_param=existing",
-        lazy: true,
       });
 
       const wsUrl = runtime.getWsURL("test" as SessionId);
@@ -720,9 +613,16 @@ describe("RuntimeManager", () => {
       expect(httpUrl.searchParams.get("base_param")).toBe("existing");
 
       // Should preserve all window-level query params (including custom ones)
-      expect(wsUrl.searchParams.get("custom_param")).toBe("value123");
-      expect(wsUrl.searchParams.get("user_token")).toBe("abc");
-      expect(wsUrl.searchParams.get("theme")).toBe("dark");
+      expect(
+        Object.fromEntries(
+          new URLSearchParams(wsUrl.searchParams.get("query_params") ?? ""),
+        ),
+      ).toEqual({
+        base_param: "existing",
+        custom_param: "value123",
+        user_token: "abc",
+        theme: "dark",
+      });
       expect(httpUrl.searchParams.get("custom_param")).toBe("value123");
       expect(httpUrl.searchParams.get("user_token")).toBe("abc");
       expect(httpUrl.searchParams.get("theme")).toBe("dark");
@@ -740,7 +640,6 @@ describe("RuntimeManager", () => {
     it("should handle URLs with query parameters and fragments", () => {
       const runtime = new RuntimeManager({
         url: "https://example.com/path?existing=param#fragment",
-        lazy: true,
       });
       const wsUrl = runtime.getWsURL("test" as SessionId);
 
@@ -752,18 +651,16 @@ describe("RuntimeManager", () => {
 
     it("should throw for invalid URLs", () => {
       expect(() => {
-        new RuntimeManager({ url: "not-a-url", lazy: true });
+        new RuntimeManager({ url: "not-a-url" });
       }).toThrow("Invalid runtime URL");
     });
 
     it("should handle http to ws conversion correctly", () => {
       const httpRuntime = new RuntimeManager({
         url: "http://localhost",
-        lazy: true,
       });
       const httpsRuntime = new RuntimeManager({
         url: "https://localhost",
-        lazy: true,
       });
 
       expect(httpRuntime.getWsURL("test" as SessionId).protocol).toBe("ws:");
@@ -773,7 +670,6 @@ describe("RuntimeManager", () => {
     it("should handle blob URLs", () => {
       const runtime = new RuntimeManager({
         url: "blob:https://example.com/12345678-1234-1234-1234-123456789abc",
-        lazy: true,
       });
 
       expect(runtime.httpURL.toString()).toBe(
@@ -781,15 +677,14 @@ describe("RuntimeManager", () => {
       );
     });
 
-    it("should throw when creating WebSocket URLs from blob URLs", () => {
+    it("warns when creating WebSocket URLs from blob URLs", () => {
       const runtime = new RuntimeManager({
         url: "blob:https://example.com/12345678-1234-1234-1234-123456789abc",
-        lazy: true,
       });
       const sessionId = "test" as SessionId;
 
       expect(runtime.getWsURL(sessionId).toString()).toMatchInlineSnapshot(
-        `"blob:https://example.com/12345678-1234-1234-1234-123456789abc?session_id=test"`,
+        `"blob:https://example.com/12345678-1234-1234-1234-123456789abc?query_params=&session_id=test"`,
       );
       expect(Logger.warn).toHaveBeenCalledOnce();
     });
@@ -797,7 +692,6 @@ describe("RuntimeManager", () => {
     it("should handle blob URLs in AI URLs", () => {
       const runtime = new RuntimeManager({
         url: "blob:https://example.com/12345678-1234-1234-1234-123456789abc",
-        lazy: true,
       });
       const aiUrl = runtime.getAiURL("completion");
 
@@ -810,7 +704,6 @@ describe("RuntimeManager", () => {
     it("should handle blob URLs in health check URLs", () => {
       const runtime = new RuntimeManager({
         url: "blob:https://example.com/12345678-1234-1234-1234-123456789abc",
-        lazy: true,
       });
       const healthUrl = runtime.healthURL();
 
@@ -823,7 +716,6 @@ describe("RuntimeManager", () => {
     it("should handle URLs with userinfo", () => {
       const runtime = new RuntimeManager({
         url: "https://user:pass@example.com",
-        lazy: true,
       });
       const wsUrl = runtime.getWsURL("test" as SessionId);
 
@@ -836,7 +728,6 @@ describe("RuntimeManager", () => {
     it("should handle IPv6 addresses", () => {
       const runtime = new RuntimeManager({
         url: "http://[::1]:8080",
-        lazy: true,
       });
       const wsUrl = runtime.getWsURL("test" as SessionId);
 
@@ -848,7 +739,6 @@ describe("RuntimeManager", () => {
     it("should handle URLs with encoded characters", () => {
       const runtime = new RuntimeManager({
         url: "https://example.com/path%20with%20spaces",
-        lazy: true,
       });
       const aiUrl = runtime.getAiURL("completion");
 
@@ -858,7 +748,6 @@ describe("RuntimeManager", () => {
     it("should handle URLs with multiple trailing slashes", () => {
       const runtime = new RuntimeManager({
         url: "https://example.com/path///",
-        lazy: true,
       });
       const aiUrl = runtime.getAiURL("completion");
 
@@ -868,7 +757,6 @@ describe("RuntimeManager", () => {
     it("should handle URLs with port numbers", () => {
       const runtime = new RuntimeManager({
         url: "https://example.com:9443/app",
-        lazy: true,
       });
       const wsUrl = runtime.getWsURL("test" as SessionId);
 
@@ -886,7 +774,7 @@ describe("RuntimeManager", () => {
       ];
 
       variants.forEach((url) => {
-        const runtime = new RuntimeManager({ url, lazy: true });
+        const runtime = new RuntimeManager({ url });
         const wsUrl = runtime.getWsURL("test" as SessionId);
         expect(wsUrl.protocol).toBe("ws:");
       });
@@ -895,7 +783,6 @@ describe("RuntimeManager", () => {
     it("should handle URLs with complex query parameters", () => {
       const runtime = new RuntimeManager({
         url: "https://example.com?param1=value1&param2=value%20encoded&empty=",
-        lazy: true,
       });
       const wsUrl = runtime.getWsURL("test" as SessionId);
 
@@ -908,7 +795,6 @@ describe("RuntimeManager", () => {
     it("should accept data URLs (valid URL format)", () => {
       const runtime = new RuntimeManager({
         url: "data:text/plain;base64,SGVsbG8gV29ybGQ=",
-        lazy: true,
       });
       expect(runtime.httpURL.protocol).toBe("data:");
     });
@@ -916,7 +802,6 @@ describe("RuntimeManager", () => {
     it("should accept file URLs (valid URL format)", () => {
       const runtime = new RuntimeManager({
         url: "file:///path/to/file",
-        lazy: true,
       });
       expect(runtime.httpURL.protocol).toBe("file:");
     });
@@ -924,14 +809,13 @@ describe("RuntimeManager", () => {
     it("should accept custom protocol URLs (valid URL format)", () => {
       const runtime = new RuntimeManager({
         url: "custom://example.com",
-        lazy: true,
       });
       expect(runtime.httpURL.protocol).toBe("custom:");
     });
 
     it("should handle empty string URL", () => {
       expect(() => {
-        new RuntimeManager({ url: "", lazy: true });
+        new RuntimeManager({ url: "" });
       }).toThrow("Invalid runtime URL");
     });
 
@@ -946,7 +830,7 @@ describe("RuntimeManager", () => {
 
       malformedUrls.forEach((url) => {
         expect(() => {
-          new RuntimeManager({ url, lazy: true });
+          new RuntimeManager({ url });
         }).toThrow("Invalid runtime URL");
       });
     });

package/src/core/runtime/adapter.ts

@@ -1,14 +1,14 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import { type Atom, atom } from "jotai";
-import { kernelStateAtom } from "../kernel/state";
+import { runtimeStatusAtom } from "../executions";
 import { islandsInitializedAtom } from "../islands/state";
 import { isIslands } from "../islands/utils";
 import { connectionAtom } from "../network/connection";
 import { isStaticNotebook } from "../static/static-state";
 import { wasmInitStateAtom } from "../wasm/state";
 import { isWasm } from "../wasm/utils";
-import { ConnectionState } from "../websocket/types";
+import { ConnectionState } from "../session/types";
 
 export type RuntimeKind = "wasm" | "remote" | "static" | "islands";
 
@@ -82,17 +82,10 @@ const remoteStateAtom = atom<AdapterState>((get) => {
       return { kind: "connecting", progress: { label: "Connecting…" } };
     case ConnectionState.NOT_STARTED:
       return { kind: "connecting", progress: { label: "Not connected" } };
-    case ConnectionState.CLOSING:
     case ConnectionState.CLOSED:
       return {
         kind: "failed",
-        error: {
-          message:
-            conn.state === ConnectionState.CLOSED
-              ? conn.reason
-              : "Disconnecting",
-          errorKind: "runtime",
-        },
+        error: { message: conn.reason, errorKind: "runtime" },
       };
   }
 });
@@ -163,8 +156,8 @@ function selectAdapter(): RuntimeAdapter {
 export const runtimeAdapterAtom = atom<RuntimeAdapter>(selectAdapter());
 
 /**
- * Remote runtimes require both the WS to be open *and* the kernel to have
- * ack'd instantiation. WASM/islands have no separate kernel handshake.
+ * Remote runtimes require both the WS to be open *and* the host to report
+ * the runtime running. WASM/islands have no separate kernel handshake.
  * Static notebooks never run cells.
  */
 export const canRunCellsAtom = atom<boolean>((get) => {
@@ -176,7 +169,7 @@ export const canRunCellsAtom = atom<boolean>((get) => {
     return false;
   }
   if (adapter.kind === "remote") {
-    return get(kernelStateAtom).isInstantiated;
+    return get(runtimeStatusAtom) === "running";
   }
   return true;
 });