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

package/src/core/{host → transports}/static.ts

@@ -2,9 +2,9 @@
 
 /** A backend that serves a document snapshot without a host. */
 
-import type { NotebookClient } from "@marimo-team/client";
+import type { NotebookClient, NotebookTransport } from "@marimo-team/client";
 import type * as Protocol from "@marimo-team/client/protocol";
-import type { NotebookBackend } from "./backend";
+import type { NotebookBackend } from "../notebook/replica";
 
 /** A document snapshot with its own identity and revision metadata. */
 export interface StaticNotebookSnapshot {
@@ -75,3 +75,10 @@ export function createStaticNotebookBackend(
     },
   };
 }
+
+/** A connection that opens and delivers nothing, for static notebooks. */
+export const idle: NotebookTransport = ({ signal }, { open }) =>
+  new Promise((settle) => {
+    open();
+    signal.addEventListener("abort", () => settle(), { once: true });
+  });

package/src/core/{host → transports}/wasm.ts

@@ -7,7 +7,7 @@ import {
   StreamStopped,
   type unstable_NotebookCall,
 } from "@marimo-team/client";
-import type { NotebookBackend } from "./backend";
+import type { NotebookBackend } from "../notebook/replica";
 
 /** The worker owns the notebook; this interface only carries commands and events. */
 export interface WasmNotebookBridge {

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

@@ -109,10 +109,10 @@ vi.mock("@/core/cells/document-changes", () => ({
 // Import after all mocks are set up
 import { store } from "@/core/state/jotai";
 import { initialModeAtom } from "@/core/mode";
-import { fixtureEvents } from "@/core/host/__tests__/fixtures";
-import { createNotebookReplica } from "@/core/host";
-import { notebookReplicaAtom } from "@/core/websocket/state";
-import { createEditorBackend } from "@/core/websocket/backend";
+import { fixtureEvents } from "@/core/notebook/replica/__tests__/fixtures";
+import { createNotebookReplica } from "@/core/notebook/replica";
+import { activeNotebookReplicaAtom } from "@/core/session/active-notebook";
+import { createEditorBackend } from "@/core/session/backend";
 import { fallbackFileStore, notebookFileStore } from "../store";
 import { getWasmWorkerName, PyodideBridge } from "../bridge";
 
@@ -232,7 +232,7 @@ describe("PyodideBridge.sendSave", () => {
       }
     });
     const replica = createNotebookReplica(store);
-    store.set(notebookReplicaAtom, replica);
+    store.set(activeNotebookReplicaAtom, replica);
     const backend = createEditorBackend({
       static: false,
       transportType: "sse",
@@ -250,7 +250,7 @@ describe("PyodideBridge.sendSave", () => {
 
   afterEach(() => {
     disconnect();
-    store.set(notebookReplicaAtom, null);
+    store.set(activeNotebookReplicaAtom, null);
     store.set(initialModeAtom, undefined);
   });
 
@@ -272,9 +272,9 @@ describe("PyodideBridge.sendSave", () => {
     "does not save when the notebook is %s",
     async (state) => {
       if (state === "unmounted") {
-        store.set(notebookReplicaAtom, null);
+        store.set(activeNotebookReplicaAtom, null);
       } else if (state === "not ready") {
-        store.set(notebookReplicaAtom, createNotebookReplica(store));
+        store.set(activeNotebookReplicaAtom, createNotebookReplica(store));
       } else {
         disconnect();
       }

package/src/core/wasm/bridge.ts

@@ -14,7 +14,7 @@ import { generateUUID } from "@/utils/uuid";
 import { createModuleWorker } from "@/utils/worker";
 import { notebookIsRunningAtom } from "../cells/cells";
 import { flushDocumentChanges } from "../cells/document-changes";
-import { createWasmNotebookBackend } from "../host";
+import { createWasmNotebookBackend } from "../transports/wasm";
 import type { ClientCommand } from "../kernel/messages";
 import { getInitialAppMode } from "../mode";
 import { API } from "../network/api";
@@ -42,7 +42,7 @@ import type {
 } from "../network/types";
 import { filenameAtom } from "../saving/file-state";
 import { store } from "../state/jotai";
-import { notebookReplicaAtom } from "../websocket/state";
+import { activeNotebookReplicaAtom } from "../session/active-notebook";
 import { PyodideRouter } from "./router";
 import { getWorkerRPC, type PersistNotebookRequest } from "./rpc";
 import { getWasmRuntimeConfig } from "./runtime-config";
@@ -267,7 +267,7 @@ export class PyodideBridge implements RunRequests, EditRequests {
   };
 
   private async saveHostNotebook() {
-    const replica = store.get(notebookReplicaAtom);
+    const replica = store.get(activeNotebookReplicaAtom);
     const notebook = replica && store.get(replica.notebookAtom);
     const backend = replica && store.get(replica.backendAtom);
     if (!notebook || !backend) {

package/src/mount.tsx

@@ -62,7 +62,7 @@ import {
 import { maybeRegisterVSCodeBindings } from "./core/vscode/vscode-bindings";
 import type { FileStore } from "./core/wasm/store";
 import { notebookFileStore } from "./core/wasm/store";
-import { ConnectionState } from "./core/websocket/types";
+import { ConnectionState } from "./core/session/types";
 import {
   handleWidgetMessage,
   WIDGET_REGISTRY,

package/src/stories/cell.stories.tsx

@@ -14,7 +14,7 @@ import { connectionAtom } from "@/core/network/connection";
 import { requestClientAtom } from "@/core/network/requests";
 import { resolveRequestClient } from "@/core/network/resolve";
 import type { CellConfig } from "@/core/network/types";
-import { ConnectionState } from "@/core/websocket/types";
+import { ConnectionState } from "@/core/session/types";
 import { MultiColumn } from "@/utils/id-tree";
 import type { Milliseconds, Seconds } from "@/utils/time";
 import { Cell as EditorCell } from "../components/editor/notebook-cell";

package/src/stories/layout/vertical/one-column.stories.tsx

@@ -11,7 +11,7 @@ import { showCodeInRunModeAtom } from "@/core/meta/state";
 import { connectionAtom } from "@/core/network/connection";
 import { requestClientAtom } from "@/core/network/requests";
 import { resolveRequestClient } from "@/core/network/resolve";
-import { ConnectionState } from "@/core/websocket/types";
+import { ConnectionState } from "@/core/session/types";
 import { MultiColumn } from "@/utils/id-tree";
 import type { Milliseconds, Seconds } from "@/utils/time";
 import { CellArray } from "../../../components/editor/renderers/cell-array";

package/src/stories/runtime-story.tsx

@@ -30,7 +30,7 @@ import { requestClientAtom } from "@/core/network/requests";
 import { createStaticRequests } from "@/core/network/requests-static";
 import { sandboxActionsAtom, sandboxAtom } from "@/core/packages/sandbox-state";
 import { filenameAtom } from "@/core/saving/file-state";
-import { WebSocketClosedReason, ConnectionState } from "@/core/websocket/types";
+import { WebSocketClosedReason, ConnectionState } from "@/core/session/types";
 import { HTTPError } from "@/utils/errors";
 
 const manifest = `requires-python = ">=3.13"

package/src/core/attachments/state.ts

@@ -1,18 +0,0 @@
-/* Copyright 2026 Marimo. All rights reserved. */
-
-import { atom } from "jotai";
-import type { Attachment } from "@marimo-team/client/protocol";
-import { notebookReplicaAtom } from "@/core/websocket/state";
-
-export type { Attachment } from "@marimo-team/client/protocol";
-
-export const agentAttachmentsAtom = atom((get) => {
-  const notebook = get(notebookReplicaAtom);
-  return (notebook ? get(notebook.attachmentsAtom) : []).filter(
-    (attachment) => attachment.kind === "agent",
-  );
-});
-
-export function attachmentLabel(attachment: Attachment): string {
-  return attachment.name || "Agent";
-}

package/src/core/host/AGENTS.md

@@ -1,12 +0,0 @@
-# Host core
-
-Production code may import host modules, `@marimo-team/client`,
-`jotai/vanilla`, `zod`, and `@/utils/Logger`. Enforced by
-`marimo/host-imports`. Tests are exempt.
-
-Code outside this directory imports it as `@/core/host`. Enforced by
-`marimo/module-entry`.
-
-The protocol schemas and types live in `@marimo-team/client/protocol`.
-
-Define interfaces here and inject application behavior through adapters.