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

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};