@marimo-team/frontend 0.25.3-dev40 → 0.25.3-dev42

package/dist/index.html

@@ -66,7 +66,7 @@
     <marimo-server-token data-token="{{ server_token }}" hidden></marimo-server-token>
     <!-- /TODO -->
     <title>{{ title }}</title>
-    <script type="module" crossorigin src="./assets/index-PDJQd7X6.js"></script>
+    <script type="module" crossorigin src="./assets/index-4Nwpioic.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/rolldown-runtime-B0Z9INg1.js">
     <link rel="modulepreload" crossorigin href="./assets/react-DVplv7_D.js">
     <link rel="modulepreload" crossorigin href="./assets/compiler-runtime-BrajqUja.js">
@@ -79,7 +79,7 @@
     <link rel="modulepreload" crossorigin href="./assets/utils-B4K466FK.js">
     <link rel="modulepreload" crossorigin href="./assets/session-B8Y-GJnS.js">
     <link rel="modulepreload" crossorigin href="./assets/Deferred-CrTnjj37.js">
-    <link rel="modulepreload" crossorigin href="./assets/config-CYsbZpwa.js">
+    <link rel="modulepreload" crossorigin href="./assets/config-BwHT0yGp.js">
     <link rel="modulepreload" crossorigin href="./assets/isObject-BCaOs5rp.js">
     <link rel="modulepreload" crossorigin href="./assets/isSymbol-oX0TOjjx.js">
     <link rel="modulepreload" crossorigin href="./assets/now-Cmx0b_zA.js">
@@ -139,7 +139,7 @@
     <link rel="modulepreload" crossorigin href="./assets/useTheme-DLtPc-39.js">
     <link rel="modulepreload" crossorigin href="./assets/useAsyncData-DhhdOGGd.js">
     <link rel="modulepreload" crossorigin href="./assets/purify.es--06brOip.js">
-    <link rel="modulepreload" crossorigin href="./assets/cells-CdH98VSn.js">
+    <link rel="modulepreload" crossorigin href="./assets/cells-BdgzY0of.js">
     <link rel="modulepreload" crossorigin href="./assets/coerce-DWjFeXOY.js">
     <link rel="modulepreload" crossorigin href="./assets/get-DjNf4SIX.js">
     <link rel="modulepreload" crossorigin href="./assets/_hasPath-BmRQipI0.js">
@@ -147,47 +147,47 @@
     <link rel="modulepreload" crossorigin href="./assets/_baseSet-Bpdo9AvU.js">
     <link rel="modulepreload" crossorigin href="./assets/pick-DKIID_Mo.js">
     <link rel="modulepreload" crossorigin href="./assets/errors-CNsgAw6m.js">
-    <link rel="modulepreload" crossorigin href="./assets/config-BoBwH7CU.js">
+    <link rel="modulepreload" crossorigin href="./assets/config-DXjnAwtL.js">
     <link rel="modulepreload" crossorigin href="./assets/state-C0irhlOZ.js">
     <link rel="modulepreload" crossorigin href="./assets/state-DaWgt-rn.js">
     <link rel="modulepreload" crossorigin href="./assets/LazyAnyLanguageCodeMirror-BPYE76jR.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-KlhazlhB.js">
     <link rel="modulepreload" crossorigin href="./assets/micromark-factory-space-D9Dr-k4J.js">
     <link rel="modulepreload" crossorigin href="./assets/chunk-YOKDWASO-BIpRENEC.js">
-    <link rel="modulepreload" crossorigin href="./assets/markdown-renderer-BFyD6Jhs.js">
+    <link rel="modulepreload" crossorigin href="./assets/markdown-renderer-DX2O5YiE.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-Djr5m5ac.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-icon-8-a5vovc.js">
-    <link rel="modulepreload" crossorigin href="./assets/useRunCells-BHBMk9zW.js">
-    <link rel="modulepreload" crossorigin href="./assets/RenderHTML-B1FzB5NY.js">
-    <link rel="modulepreload" crossorigin href="./assets/blob-BQfLiwKr.js">
+    <link rel="modulepreload" crossorigin href="./assets/useRunCells-DP09DHT6.js">
+    <link rel="modulepreload" crossorigin href="./assets/RenderHTML-BFaztTR0.js">
+    <link rel="modulepreload" crossorigin href="./assets/blob-BSfsdCNF.js">
     <link rel="modulepreload" crossorigin href="./assets/kbd-pdKBv96t.js">
-    <link rel="modulepreload" crossorigin href="./assets/useInstallPackage-Cw0dVELh.js">
+    <link rel="modulepreload" crossorigin href="./assets/useInstallPackage-CVItDn1e.js">
     <link rel="modulepreload" crossorigin href="./assets/share-BZW3tzEX.js">
     <link rel="modulepreload" crossorigin href="./assets/events-CbeVJ6OD.js">
-    <link rel="modulepreload" crossorigin href="./assets/state-TVREh4u4.js">
-    <link rel="modulepreload" crossorigin href="./assets/ErrorBoundary-hliG40Pk.js">
+    <link rel="modulepreload" crossorigin href="./assets/state-BHuYDaxs.js">
+    <link rel="modulepreload" crossorigin href="./assets/ErrorBoundary-DmXl4Nre.js">
     <link rel="modulepreload" crossorigin href="./assets/chevron-right-eAtVhbNZ.js">
     <link rel="modulepreload" crossorigin href="./assets/dropdown-menu-DS6umAnH.js">
     <link rel="modulepreload" crossorigin href="./assets/html-to-image-D_0rd3_B.js">
-    <link rel="modulepreload" crossorigin href="./assets/download-CCZkq0y4.js">
+    <link rel="modulepreload" crossorigin href="./assets/download-RV4i1fWI.js">
     <link rel="modulepreload" crossorigin href="./assets/switch-1h011wlH.js">
     <link rel="modulepreload" crossorigin href="./assets/tabs-CY8E4r9U.js">
     <link rel="modulepreload" crossorigin href="./assets/table-DG7Ap4H4.js">
     <link rel="modulepreload" crossorigin href="./assets/eye-off-CxVozGAC.js">
     <link rel="modulepreload" crossorigin href="./assets/refresh-cw-Qw1f8Jhy.js">
-    <link rel="modulepreload" crossorigin href="./assets/tree-actions-B1vsdenY.js">
+    <link rel="modulepreload" crossorigin href="./assets/tree-actions-Be_mzC1C.js">
     <link rel="modulepreload" crossorigin href="./assets/ellipsis-63DyBLHQ.js">
     <link rel="modulepreload" crossorigin href="./assets/external-link-UrX9KO36.js">
     <link rel="modulepreload" crossorigin href="./assets/spinner-DyNE-o8o.js">
     <link rel="modulepreload" crossorigin href="./assets/message-circle-C3rKm8_a.js">
     <link rel="modulepreload" crossorigin href="./assets/hat-glasses-C8RhSVii.js">
     <link rel="modulepreload" crossorigin href="./assets/package-GSoSTiIK.js">
-    <link rel="modulepreload" crossorigin href="./assets/datasource-BA7YF4eo.js">
-    <link rel="modulepreload" crossorigin href="./assets/error-entries-BVXrGOTZ.js">
+    <link rel="modulepreload" crossorigin href="./assets/datasource-dKk3JHSQ.js">
+    <link rel="modulepreload" crossorigin href="./assets/error-entries-CJS0gOId.js">
     <link rel="modulepreload" crossorigin href="./assets/alert-DTaqCu_d.js">
-    <link rel="modulepreload" crossorigin href="./assets/state-_uXVmwuN.js">
-    <link rel="modulepreload" crossorigin href="./assets/cell-link-B_QkRkm-.js">
-    <link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-BaHdbtck.js">
+    <link rel="modulepreload" crossorigin href="./assets/state-CVgqwwCU.js">
+    <link rel="modulepreload" crossorigin href="./assets/cell-link-DFPHORAO.js">
+    <link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-DVjK8RgY.js">
     <link rel="modulepreload" crossorigin href="./assets/useDateFormatter-DA-62E-Y.js">
     <link rel="modulepreload" crossorigin href="./assets/en-US-Buu61juQ.js">
     <link rel="modulepreload" crossorigin href="./assets/isValid-q_Ad80ug.js">
@@ -206,13 +206,13 @@
     <link rel="modulepreload" crossorigin href="./assets/formats-zylfwejq.js">
     <link rel="modulepreload" crossorigin href="./assets/table-vrvqpuKJ.js">
     <link rel="modulepreload" crossorigin href="./assets/react-resizable-panels.browser.esm-Dbe0MrFr.js">
-    <link rel="modulepreload" crossorigin href="./assets/JsonOutput-9tmC-p6h.js">
+    <link rel="modulepreload" crossorigin href="./assets/JsonOutput-BJraU9kp.js">
     <link rel="modulepreload" crossorigin href="./assets/chart-no-axes-column-C4_v6fQW.js">
     <link rel="modulepreload" crossorigin href="./assets/square-function-_W_Lo0P4.js">
     <link rel="modulepreload" crossorigin href="./assets/spec-uCpVvaAR.js">
     <link rel="modulepreload" crossorigin href="./assets/semaphore-BjoL5P0h.js">
     <link rel="modulepreload" crossorigin href="./assets/fileToBase64-BgBraYAr.js">
-    <link rel="modulepreload" crossorigin href="./assets/useBoolean-5g-bBaYF.js">
+    <link rel="modulepreload" crossorigin href="./assets/useBoolean-j0qHaJxu.js">
     <link rel="modulepreload" crossorigin href="./assets/code-xml-SQaZqvcO.js">
     <link rel="modulepreload" crossorigin href="./assets/file-headphone-Dl35U6h3.js">
     <link rel="modulepreload" crossorigin href="./assets/file-BPBVl9pl.js">
@@ -220,11 +220,11 @@
     <link rel="modulepreload" crossorigin href="./assets/file-icons-CdJgUy-I.js">
     <link rel="modulepreload" crossorigin href="./assets/globe-UdPdIbF7.js">
     <link rel="modulepreload" crossorigin href="./assets/esm-CI_o7NhW.js">
-    <link rel="modulepreload" crossorigin href="./assets/useAddCell-DZ-50qEG.js">
-    <link rel="modulepreload" crossorigin href="./assets/readonly-python-code-DrXDDAnA.js">
+    <link rel="modulepreload" crossorigin href="./assets/useAddCell-DK79W1vA.js">
+    <link rel="modulepreload" crossorigin href="./assets/readonly-python-code-BLotL3XP.js">
     <link rel="modulepreload" crossorigin href="./assets/data-grid-types-DgHVN_Zz.js">
     <link rel="modulepreload" crossorigin href="./assets/glide-utils-HFqhvWHI.js">
-    <link rel="modulepreload" crossorigin href="./assets/column-preview-CsEBzIUE.js">
+    <link rel="modulepreload" crossorigin href="./assets/column-preview-ivm1b-GY.js">
     <link rel="modulepreload" crossorigin href="./assets/square-BPmgQFnh.js">
     <link rel="modulepreload" crossorigin href="./assets/triangle-alert-DmIqR8sY.js">
     <link rel="modulepreload" crossorigin href="./assets/prop-types-Djf4O40e.js">
@@ -236,7 +236,7 @@
     <link rel="modulepreload" crossorigin href="./assets/icons-CiZ_8zS-.js">
     <link rel="modulepreload" crossorigin href="./assets/useDeepCompareMemoize-DFIVN9dn.js">
     <link rel="modulepreload" crossorigin href="./assets/pathUtils-DPmlLd-r.js">
-    <link rel="modulepreload" crossorigin href="./assets/floating-outline-CTy-Iakk.js">
+    <link rel="modulepreload" crossorigin href="./assets/floating-outline-CrWdiNQ2.js">
     <link rel="stylesheet" crossorigin href="./assets/cells-0PFKL3SH.css">
     <link rel="stylesheet" crossorigin href="./assets/markdown-renderer-DjIHoF9Z.css">
     <link rel="stylesheet" crossorigin href="./assets/JsonOutput-B0GmlMnR.css">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/frontend",
-  "version": "0.25.3-dev40",
+  "version": "0.25.3-dev42",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -57,6 +57,7 @@
     "@marimo-team/codemirror-mcp": "^0.1.7",
     "@marimo-team/codemirror-sql": "^0.3.0",
     "@marimo-team/llm-info": "workspace:*",
+    "@marimo-team/client": "workspace:*",
     "@marimo-team/marimo-api": "workspace:*",
     "@marimo-team/react-slotz": "^0.2.0",
     "@marimo-team/smart-cells": "workspace:*",
@@ -185,8 +186,6 @@
     "storybook": "storybook dev -p 6006",
     "build-storybook": "storybook build",
     "sync-katex-css": "node --experimental-strip-types scripts/sync-katex-css.ts",
-    "codegen": "node --experimental-strip-types scripts/generate-host-protocol.ts",
-    "codegen:check": "node --experimental-strip-types scripts/generate-host-protocol.ts --check",
     "doctor": "npx react-doctor@latest"
   },
   "peerDependencies": {
@@ -216,7 +215,6 @@
     "jsdom": "^24.1.3",
     "msw": "^2.15.0",
     "npm-run-all2": "^6.2.6",
-    "orval": "8.40.0",
     "oxc-transform-react": "0.145.0",
     "oxfmt": "^0.68.0",
     "oxlint": "^1.83.0",

package/src/__tests__/host-imports.test.ts

@@ -19,6 +19,7 @@ it("enforces host dependencies for runtime and type imports", () => {
     "src/core/host/allowed.ts": `
       import { atom } from "jotai/vanilla";
       import { z } from "zod";
+      import * as Protocol from "@marimo-team/client/protocol";
       import { Logger } from "@/utils/Logger";
       import type { Document } from "./document";
       export * from "@/core/host/events";

package/src/core/attachments/state.ts

@@ -1,10 +1,10 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import { atom } from "jotai";
-import type { Attachment } from "@/core/host/protocol";
+import type { Attachment } from "@marimo-team/client/protocol";
 import { notebookClientAtom } from "@/core/websocket/state";
 
-export type { Attachment } from "@/core/host/protocol";
+export type { Attachment } from "@marimo-team/client/protocol";
 
 export const agentAttachmentsAtom = atom((get) => {
   const notebook = get(notebookClientAtom);

package/src/core/host/AGENTS.md

@@ -1,7 +1,11 @@
 # Host core
 
-Production code may import host modules, `jotai/vanilla`, `zod`, and
-`@/utils/Logger`. Enforced by `marimo/host-imports`. Tests are exempt.
+Production code may import host modules, `@marimo-team/client`,
+`jotai/vanilla`, `zod`, and `@/utils/Logger`. Enforced by
+`marimo/host-imports`. Tests are exempt.
+
+The protocol schemas and types live in `@marimo-team/client/protocol`.
+The native `marimo` event is a marimo extension and is defined in `events.ts`.
 
 Define interfaces here and inject application behavior through adapters.
 

package/src/core/host/__tests__/attachments.test.ts

@@ -2,15 +2,15 @@
 
 import { describe, expect, it } from "vitest";
 import { attachments } from "../resources/attachments";
-import { createStream } from "../stream";
+import { createReducer } from "@marimo-team/client/reducer";
 import { fixtureEvents } from "./fixtures";
 
-const stream = createStream({ attachments });
+const reducer = createReducer({ attachments });
 const snapshot = fixtureEvents("notebook-events.sse");
 const records = snapshot.flatMap((event) =>
   event.event === "attachment" ? [event.data.attachment] : [],
 );
-const confirmed = () => snapshot.reduce(stream.reduce, stream.initial);
+const confirmed = () => snapshot.reduce(reducer.reduce, reducer.initial);
 
 describe("attachment resource", () => {
   it("collects snapshot records, replaces by id, and removes attachments", () => {
@@ -18,7 +18,7 @@ describe("attachment resource", () => {
     expect(state.resources.attachments).toEqual(records);
     const [browser, agent] = records;
     const renamed = { ...agent, name: "Renamed agent" };
-    const updated = stream.reduce(state, {
+    const updated = reducer.reduce(state, {
       event: "attachment",
       id: "98",
       data: { attachment: renamed },
@@ -26,13 +26,13 @@ describe("attachment resource", () => {
     expect(updated.resources.attachments).toEqual([browser, renamed]);
     expect(state.resources.attachments).toEqual(records);
 
-    const removed = stream.reduce(updated, {
+    const removed = reducer.reduce(updated, {
       event: "attachment.removed",
       id: "99",
       data: { id: browser.id, time: "2026-10-01T09:30:00Z" },
     });
     expect(removed.resources.attachments).toEqual([renamed]);
-    const repeated = stream.reduce(removed, {
+    const repeated = reducer.reduce(removed, {
       event: "attachment.removed",
       id: "100",
       data: { id: browser.id, time: "2026-10-01T09:30:00Z" },
@@ -40,10 +40,9 @@ describe("attachment resource", () => {
     expect(repeated.resources.attachments).toBe(removed.resources.attachments);
   });
 
-  it("retains records for replay and rebuilds them after reset", () => {
+  it("rebuilds records after reset", () => {
     const state = confirmed();
-    expect(stream.resume(state)).toBe(state);
-    const reset = stream.reduce(state, { event: "reset", data: {} });
+    const reset = reducer.reduce(state, { event: "reset", data: {} });
     expect(reset.resources.attachments).toEqual([]);
     const replacement = snapshot
       .filter(
@@ -51,7 +50,7 @@ describe("attachment resource", () => {
           event.event !== "attachment" ||
           event.data.attachment.id === records[0].id,
       )
-      .reduce(stream.reduce, reset);
+      .reduce(reducer.reduce, reset);
     expect(replacement.resources.attachments).toEqual([records[0]]);
   });
 });

package/src/core/host/__tests__/document.test.ts

@@ -1,17 +1,20 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import { describe, expect, it } from "vitest";
-import type { NotebookEvent } from "../events";
+import type * as Protocol from "@marimo-team/client/protocol";
 import { document } from "../resources/document";
-import { createStream } from "../stream";
+import { createReducer } from "@marimo-team/client/reducer";
 import { fixtureEvents } from "./fixtures";
 
-const stream = createStream({ document });
+const reducer = createReducer({ document });
 const snapshot = fixtureEvents("notebook-events.sse");
 const edits = fixtureEvents("edits.sse");
 
-function replay(events: readonly NotebookEvent[], from = stream.initial) {
-  return events.reduce((state, event) => stream.reduce(state, event), from);
+function replay(
+  events: readonly Protocol.EventOutput[],
+  from = reducer.initial,
+) {
+  return events.reduce((state, event) => reducer.reduce(state, event), from);
 }
 
 const confirmed = () => replay(snapshot);
@@ -33,12 +36,12 @@ describe("document resource", () => {
       confirmed(),
     );
     expect(current(pending)).toEqual(first);
-    const changed = stream.reduce(pending, edit);
+    const changed = reducer.reduce(pending, edit);
     expect(current(changed)?.revision).toEqual(edit.data.document);
     expect([...current(changed)!.cells.keys()].toSorted()).toEqual(
       edit.data.document.order.toSorted(),
     );
-    const saved = current(stream.reduce(changed, save));
+    const saved = current(reducer.reduce(changed, save));
     expect(saved?.revision).toEqual(save.data.document);
     expect(saved?.cells.get("c3")?.code).toBe("x = 22");
     expect(saved?.cells.has("k7f2")).toBe(false);
@@ -55,7 +58,7 @@ describe("document resource", () => {
       order: revision.order.toReversed(),
       version: revision.version + 1,
     };
-    const changed = stream.reduce(state, {
+    const changed = reducer.reduce(state, {
       event: "document",
       data: { document: reordered },
       id: "200",
@@ -66,17 +69,17 @@ describe("document resource", () => {
     });
 
     const empty = { ...revision, order: [] };
-    const opening = stream.reduce(stream.initial, {
+    const opening = reducer.reduce(reducer.initial, {
       event: "document",
       data: { document: empty },
     });
     expect(current(opening)).toBeNull();
     expect(
-      current(stream.reduce(opening, { event: "ready", data: {}, id: "0" })),
+      current(reducer.reduce(opening, { event: "ready", data: {}, id: "0" })),
     ).toEqual({ revision: empty, cells: new Map() });
     expect(
       current(
-        stream.reduce(stream.initial, { event: "ready", data: {}, id: "0" }),
+        reducer.reduce(reducer.initial, { event: "ready", data: {}, id: "0" }),
       ),
     ).toBeNull();
   });
@@ -89,7 +92,6 @@ describe("document resource", () => {
     }
     const partial = replay([cell, removed], state);
     expect(current(partial)).toBe(current(state));
-    expect(stream.resume(partial)).toBe(partial);
     const completed = replay(
       [published, { event: "ready", data: {}, id: "113" }],
       partial,
@@ -98,7 +100,7 @@ describe("document resource", () => {
   });
 
   it("removes a notebook without waiting for individual cell removals", () => {
-    const removed = stream.reduce(confirmed(), {
+    const removed = reducer.reduce(confirmed(), {
       event: "notebook.removed",
       data: { id: "n1", time: "2026-10-01T09:30:00Z" },
       id: "200",
@@ -110,15 +112,15 @@ describe("document resource", () => {
     const state = confirmed();
     const revision = current(state)!.revision;
     expect(() =>
-      stream.reduce(state, {
+      reducer.reduce(state, {
         event: "document",
         data: { document: { ...revision, order: ["missing"] } },
         id: "200",
       }),
     ).toThrow("Document records do not match");
-    const partial = stream.reduce(state, edits[0]);
+    const partial = reducer.reduce(state, edits[0]);
     expect(() =>
-      stream.reduce(partial, { event: "ready", data: {}, id: "200" }),
+      reducer.reduce(partial, { event: "ready", data: {}, id: "200" }),
     ).toThrow("incomplete document update");
   });
 });

package/src/core/host/__tests__/events.test.ts

@@ -1,8 +1,8 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import { describe, expect, it } from "vitest";
+import { describe, expect, expectTypeOf, it } from "vitest";
 import { z } from "zod";
-import { parseNotebookEvent } from "../events";
+import { type NotebookEvent, parseNotebookEvent } from "../events";
 
 describe("notebook messages", () => {
   it("normalizes session and host envelopes for native marimo messages", () => {
@@ -10,6 +10,9 @@ describe("notebook messages", () => {
       op: "variables",
       variables: [{ name: "x", value: Number.NaN }],
     };
+    expectTypeOf<
+      Extract<NotebookEvent, { event: "marimo" }>["data"]["marimo"]
+    >().toBeUnknown();
     const host = { event: "marimo", data: { marimo: notification } };
     expect(parseNotebookEvent({ data: notification })).toEqual(host);
     expect(parseNotebookEvent({ ...host, id: "42" })).toEqual({

package/src/core/host/__tests__/fixtures.ts

@@ -2,7 +2,7 @@
 
 import NodeFs from "node:fs";
 import NodeUrl from "node:url";
-import { parseNotebookEvent, type NotebookEvent } from "../events";
+import * as Protocol from "@marimo-team/client/protocol";
 
 /** Read the protocol's portable examples as transport messages. */
 export function fixtureMessages(name: string) {
@@ -33,7 +33,9 @@ export function fixtureMessages(name: string) {
     });
 }
 
-/** Read the protocol's portable examples as decoded notebook events. */
-export function fixtureEvents(name: string): NotebookEvent[] {
-  return fixtureMessages(name).map(parseNotebookEvent);
+/** Read the protocol's portable examples as decoded protocol events. */
+export function fixtureEvents(name: string): Protocol.EventOutput[] {
+  return fixtureMessages(name).map(({ id, ...message }) =>
+    Protocol.Event.parse(id === undefined ? message : { ...message, id }),
+  );
 }

package/src/core/host/events.ts

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import { z } from "zod";
-import * as Protocol from "./protocol";
+import * as Protocol from "@marimo-team/client/protocol";
 
 /**
  * Notebook stream events, including native marimo notifications.
@@ -29,16 +29,29 @@ const knownNames = new Set<string>(
   Protocol.Event.options.flatMap((schema) => schema.shape.event.options),
 );
 
+/**
+ * A native marimo message carried by a host stream.
+ *
+ * The protocol leaves extension events to their producer. The payload is
+ * passed through for the session handler to interpret.
+ */
+const MarimoEvent = z.object({
+  event: z.literal("marimo"),
+  id: z.string().min(1).optional(),
+  data: z.object({ marimo: z.unknown() }),
+});
+
 /** A decoded event, or the name and cursor of an unrecognized event. */
 export type NotebookEvent =
   | Protocol.EventOutput
+  | z.output<typeof MarimoEvent>
   | {
       readonly event: "unknown";
       readonly name: string;
       readonly id?: string;
     };
 
-const sessionEnvelope = z.object({ data: Protocol.MarimoNotification });
+const sessionEnvelope = z.object({ data: z.unknown() });
 
 /**
  * Decode a host event or a legacy `{ data: notification }` session message.
@@ -54,6 +67,9 @@ export function parseNotebookEvent(value: unknown): NotebookEvent {
     };
   }
   const parsed = envelope.parse(value);
+  if (parsed.event === "marimo") {
+    return MarimoEvent.parse(parsed);
+  }
   if (knownNames.has(parsed.event)) {
     return Protocol.Event.parse(parsed);
   }

package/src/core/host/notebook-client.ts

@@ -1,6 +1,8 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import { Logger } from "@/utils/Logger";
+import type { Attachment } from "@marimo-team/client/protocol";
+import { createReducer } from "@marimo-team/client/reducer";
 import { type Atom, atom, type createStore } from "jotai/vanilla";
 import {
   type ConnectionStatus,
@@ -10,11 +12,16 @@ import {
   type NotebookTransport,
   TransportReadyState,
 } from "./connection";
-import { parseNotebookEvent } from "./events";
-import type { Attachment } from "./protocol";
+import { type NotebookEvent, parseNotebookEvent } from "./events";
 import { attachments } from "./resources/attachments";
 import { type Document, document } from "./resources/document";
-import { createStream } from "./stream";
+
+/** Events that may arrive without a cursor after `ready`. */
+const UNCURSORED = new Set<NotebookEvent["event"]>([
+  "reset",
+  "marimo",
+  "unknown",
+]);
 
 /** A connection to a notebook on a marimo host. */
 export interface NotebookClient {
@@ -64,8 +71,8 @@ export function createNotebookClient(store: ReturnType<typeof createStore>) {
     state: ConnectionState.NOT_STARTED,
   });
   // One atom holds the whole stream, which resource atoms derive from.
-  const stream = createStream({ document, attachments });
-  const streamAtom = atom(stream.initial);
+  const reducer = createReducer({ document, attachments });
+  const streamAtom = atom(reducer.initial);
   // A resumed stream is live, but presence waits for this connection's ready.
   const readyAtom = atom(false);
   const documentAtom = atom(
@@ -103,6 +110,8 @@ export function createNotebookClient(store: ReturnType<typeof createStore>) {
     let terminal = false;
     let checkingHealth = false;
     let streamKey: string | undefined;
+    // The id of the last live event. Null before `ready` and after `reset`.
+    let cursor: string | null = null;
     const transport = createTransport(() => {
       if (messageFormat === "session") {
         return url();
@@ -118,15 +127,23 @@ export function createNotebookClient(store: ReturnType<typeof createStore>) {
       identity.searchParams.delete("access_token");
       identity.searchParams.sort();
       const key = identity.toString();
+      const current = store.get(streamAtom);
+      // A live stream keeps its state and resumes from the cursor. An
+      // incomplete snapshot starts over.
       const state =
-        key === streamKey
-          ? stream.resume(store.get(streamAtom))
-          : stream.initial;
+        key !== streamKey
+          ? reducer.initial
+          : current.phase === "snapshot"
+            ? { ...reducer.initial, notebookId: current.notebookId }
+            : current;
+      if (state.phase === "snapshot") {
+        cursor = null;
+      }
       streamKey = key;
       store.set(readyAtom, false);
       store.set(streamAtom, state);
-      if (state.cursor !== null) {
-        next.searchParams.set("cursor", state.cursor);
+      if (cursor !== null) {
+        next.searchParams.set("cursor", cursor);
       }
       return next.toString();
     });
@@ -188,7 +205,22 @@ export function createNotebookClient(store: ReturnType<typeof createStore>) {
       let event;
       try {
         event = parseNotebookEvent(decodeJson(message.data));
-        store.set(streamAtom, stream.reduce(store.get(streamAtom), event));
+        const state = store.get(streamAtom);
+        if (
+          state.phase === "live" &&
+          event.id === undefined &&
+          !UNCURSORED.has(event.event)
+        ) {
+          throw new Error("Live notebook event is missing its cursor");
+        }
+        if (event.event !== "marimo" && event.event !== "unknown") {
+          store.set(streamAtom, reducer.reduce(state, event));
+        }
+        if (event.event === "reset") {
+          cursor = null;
+        } else if (event.event === "ready" || state.phase === "live") {
+          cursor = event.id ?? cursor;
+        }
         if (event.event === "ready" || event.event === "reset") {
           store.set(readyAtom, event.event === "ready");
         }
@@ -198,7 +230,8 @@ export function createNotebookClient(store: ReturnType<typeof createStore>) {
           onMessageError(error);
           return;
         }
-        store.set(streamAtom, stream.initial);
+        store.set(streamAtom, reducer.initial);
+        cursor = null;
         terminal = true;
         setStatus({
           ...disconnected,
@@ -256,7 +289,7 @@ export function createNotebookClient(store: ReturnType<typeof createStore>) {
         transport.removeEventListener("message", onMessage);
         transport.close();
         reconnect = undefined;
-        store.set(streamAtom, stream.initial);
+        store.set(streamAtom, reducer.initial);
         setStatus({ state: ConnectionState.NOT_STARTED });
       },
       { once: true },

package/src/core/host/resources/attachments.ts

@@ -1,10 +1,10 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import type { Attachment } from "../protocol";
-import type { Resource } from "./resource";
+import type { Attachment } from "@marimo-team/client/protocol";
+import type { Resource } from "@marimo-team/client/reducer";
 
 /** Attachment records retained with the stream's resume cursor. */
-export const attachments: Resource<readonly Attachment[]> = {
+export const attachments: Resource<readonly Attachment[], "attachment"> = {
   initial: [],
   on: {
     attachment: (state, { data: { attachment } }) =>

package/src/core/host/resources/document.ts

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import type * as Protocol from "../protocol";
-import type { Resource } from "./resource";
+import type * as Protocol from "@marimo-team/client/protocol";
+import type { Resource } from "@marimo-team/client/reducer";
 
 /**
  * The notebook's content at one revision.
@@ -58,7 +58,7 @@ function publish(
   return { current: { revision, cells }, pending: null };
 }
 
-export const document: Resource<DocumentState> = {
+export const document: Resource<DocumentState, "cell" | "document"> = {
   initial: { current: null, pending: null },
   on: {
     cell: (state, { data }) => {

package/src/core/websocket/__tests__/useNotebookSession.hook.test.tsx

@@ -45,7 +45,7 @@ import { notebookAtom } from "@/core/cells/cells";
 import { AppConfigSchema } from "@/core/config/config-schema";
 import { ConnectionNotice } from "@/components/editor/alerts/connection-notice";
 import { kernelStartupErrorAtom } from "@/core/errors/state";
-import type { RunEvent } from "@/core/host/protocol";
+import type { RunEvent } from "@marimo-team/client/protocol";
 import type { NotificationPayload } from "@/core/kernel/messages";
 import { useRuntimeManager } from "@/core/runtime/config";
 import { initialRunCompletedAtom } from "../../kernel/state";

package/dist/assets/feedback-button-DDzObtF2.js

@@ -1 +0,0 @@
-import{n as e}from"./feedback-button-DaNc3uJa.js";export{e as FeedbackModal};