@marimo-team/frontend 0.25.3-dev20 → 0.25.3-dev21

package/dist/index.html

@@ -66,27 +66,27 @@
     <marimo-server-token data-token="{{ server_token }}" hidden></marimo-server-token>
     <!-- /TODO -->
     <title>{{ title }}</title>
-    <script type="module" crossorigin src="./assets/index-CMx5iSyu.js"></script>
+    <script type="module" crossorigin src="./assets/index-BXheV3uz.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">
     <link rel="modulepreload" crossorigin href="./assets/useEvent-Dfcbgjhg.js">
     <link rel="modulepreload" crossorigin href="./assets/react-dom-_LrxgvjW.js">
     <link rel="modulepreload" crossorigin href="./assets/schemas-ChRqMOTL.js">
+    <link rel="modulepreload" crossorigin href="./assets/objects-snlMn4yk.js">
+    <link rel="modulepreload" crossorigin href="./assets/useEventListener-D9cftcHj.js">
+    <link rel="modulepreload" crossorigin href="./assets/invariant-Ci2dTZ72.js">
+    <link rel="modulepreload" crossorigin href="./assets/utils-B4K466FK.js">
+    <link rel="modulepreload" crossorigin href="./assets/session-DqoWmb7X.js">
+    <link rel="modulepreload" crossorigin href="./assets/Deferred-CrTnjj37.js">
+    <link rel="modulepreload" crossorigin href="./assets/config-BtRLgrlt.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">
     <link rel="modulepreload" crossorigin href="./assets/debounce-aFmHgJZY.js">
     <link rel="modulepreload" crossorigin href="./assets/isArrayLikeObject-DnwgSs_Z.js">
     <link rel="modulepreload" crossorigin href="./assets/_baseMerge-CQpUq7ep.js">
-    <link rel="modulepreload" crossorigin href="./assets/objects-snlMn4yk.js">
-    <link rel="modulepreload" crossorigin href="./assets/useEventListener-D9cftcHj.js">
-    <link rel="modulepreload" crossorigin href="./assets/invariant-Ci2dTZ72.js">
     <link rel="modulepreload" crossorigin href="./assets/config-CA1V-wjh.js">
-    <link rel="modulepreload" crossorigin href="./assets/utils-B4K466FK.js">
-    <link rel="modulepreload" crossorigin href="./assets/session-DqoWmb7X.js">
-    <link rel="modulepreload" crossorigin href="./assets/Deferred-CrTnjj37.js">
-    <link rel="modulepreload" crossorigin href="./assets/config-Dy28fDwn.js">
     <link rel="modulepreload" crossorigin href="./assets/clsx-DB0hHKMi.js">
     <link rel="modulepreload" crossorigin href="./assets/cn-ldLVeaqm.js">
     <link rel="modulepreload" crossorigin href="./assets/jsx-runtime-B74pBk57.js">
@@ -139,7 +139,7 @@
     <link rel="modulepreload" crossorigin href="./assets/useTheme-n8Dj1zH7.js">
     <link rel="modulepreload" crossorigin href="./assets/useAsyncData-C7aJJz0Y.js">
     <link rel="modulepreload" crossorigin href="./assets/purify.es--06brOip.js">
-    <link rel="modulepreload" crossorigin href="./assets/cells-C6YGYGdi.js">
+    <link rel="modulepreload" crossorigin href="./assets/cells-BMs-CYDt.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-DRIpOKqh.js">
+    <link rel="modulepreload" crossorigin href="./assets/config-CMUeR8Wr.js">
     <link rel="modulepreload" crossorigin href="./assets/state-BAJYRhmO.js">
     <link rel="modulepreload" crossorigin href="./assets/state-C3oDoyFe.js">
     <link rel="modulepreload" crossorigin href="./assets/LazyAnyLanguageCodeMirror-B4fCknq1.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-D8O_CYCG.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-DX0Xrrfy.js">
+    <link rel="modulepreload" crossorigin href="./assets/markdown-renderer-Dg2Tj8xg.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-Djr5m5ac.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-icon-BIiRXh_3.js">
-    <link rel="modulepreload" crossorigin href="./assets/useRunCells-DSJPXE-j.js">
-    <link rel="modulepreload" crossorigin href="./assets/RenderHTML-DX6i99Op.js">
-    <link rel="modulepreload" crossorigin href="./assets/blob-BG8yoQmx.js">
+    <link rel="modulepreload" crossorigin href="./assets/useRunCells-Dyf_vzJl.js">
+    <link rel="modulepreload" crossorigin href="./assets/RenderHTML-PtQ99V0D.js">
+    <link rel="modulepreload" crossorigin href="./assets/blob-ykpU69Lk.js">
     <link rel="modulepreload" crossorigin href="./assets/kbd-pdKBv96t.js">
-    <link rel="modulepreload" crossorigin href="./assets/useInstallPackage-BW06eter.js">
+    <link rel="modulepreload" crossorigin href="./assets/useInstallPackage-B-krIeGp.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-CbjBtkdd.js">
-    <link rel="modulepreload" crossorigin href="./assets/ErrorBoundary-CM13wrd8.js">
+    <link rel="modulepreload" crossorigin href="./assets/state-BAKG3nB6.js">
+    <link rel="modulepreload" crossorigin href="./assets/ErrorBoundary-BkSCfv3B.js">
     <link rel="modulepreload" crossorigin href="./assets/chevron-right-eAtVhbNZ.js">
     <link rel="modulepreload" crossorigin href="./assets/dropdown-menu-C1rnl-0o.js">
     <link rel="modulepreload" crossorigin href="./assets/html-to-image-DK9Zl1lU.js">
-    <link rel="modulepreload" crossorigin href="./assets/download-C03FOElq.js">
+    <link rel="modulepreload" crossorigin href="./assets/download-Bt4rM2gS.js">
     <link rel="modulepreload" crossorigin href="./assets/switch-CTaiAjrz.js">
     <link rel="modulepreload" crossorigin href="./assets/tabs-BuQlZFbt.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-DnUokmva.js">
+    <link rel="modulepreload" crossorigin href="./assets/tree-actions-D5U7Yym8.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-DfbNb83e.js">
-    <link rel="modulepreload" crossorigin href="./assets/error-entries-CLnPDv7b.js">
+    <link rel="modulepreload" crossorigin href="./assets/datasource-CEDUN47W.js">
+    <link rel="modulepreload" crossorigin href="./assets/error-entries-CQTemuon.js">
     <link rel="modulepreload" crossorigin href="./assets/alert-DTaqCu_d.js">
-    <link rel="modulepreload" crossorigin href="./assets/state-DtGB7xeJ.js">
-    <link rel="modulepreload" crossorigin href="./assets/cell-link-8Auigi8P.js">
-    <link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-s_5GOX8k.js">
+    <link rel="modulepreload" crossorigin href="./assets/state-BiuybHTd.js">
+    <link rel="modulepreload" crossorigin href="./assets/cell-link-CmO9D2a2.js">
+    <link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-BLtCVffa.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-yZ06h1Pl.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-Cx1iyibB.js">
+    <link rel="modulepreload" crossorigin href="./assets/JsonOutput-Dq6MGIMV.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-BfSBcO5B.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-d0Tty94N.js">
+    <link rel="modulepreload" crossorigin href="./assets/useBoolean-BHCcNH_F.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-IN24thff.js">
-    <link rel="modulepreload" crossorigin href="./assets/readonly-python-code-ggs4hAzC.js">
+    <link rel="modulepreload" crossorigin href="./assets/useAddCell-C3jdhSc9.js">
+    <link rel="modulepreload" crossorigin href="./assets/readonly-python-code-kOLuuvuL.js">
     <link rel="modulepreload" crossorigin href="./assets/data-grid-types-DgHVN_Zz.js">
     <link rel="modulepreload" crossorigin href="./assets/glide-utils-CIrAxdjv.js">
-    <link rel="modulepreload" crossorigin href="./assets/column-preview-BZ_iNhtJ.js">
+    <link rel="modulepreload" crossorigin href="./assets/column-preview-BQ4k86Lv.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-B5MaM1JS.js">
+    <link rel="modulepreload" crossorigin href="./assets/floating-outline-kOJ_XOxZ.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-dev20",
+  "version": "0.25.3-dev21",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/components/editor/chrome/wrapper/__tests__/attachment-status.test.tsx

@@ -8,13 +8,13 @@ import {
   screen,
   waitFor,
 } from "@testing-library/react";
-import { createStore, Provider } from "jotai";
+import { atom, createStore, Provider } from "jotai";
 import { userEvent } from "storybook/test";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { PAIR_CONFIG } from "@/__tests__/fixtures/pair-config";
 import { TooltipProvider } from "@/components/ui/tooltip";
 import { toast } from "@/components/ui/use-toast";
-import { type Attachment, attachmentsAtom } from "@/core/attachments/state";
+import type { Attachment } from "@/core/attachments/state";
 import { pairConfigAtom } from "@/core/config/pair";
 import {
   type StableSessionId,
@@ -22,13 +22,16 @@ import {
 } from "@/core/kernel/session";
 import { API } from "@/core/network/api";
 import { connectionAtom } from "@/core/network/connection";
-import { WebSocketClosedReason, ConnectionState } from "@/core/websocket/types";
+import { notebookClientAtom } from "@/core/websocket/state";
+import { ConnectionState } from "@/core/websocket/types";
 import { Deferred } from "@/utils/Deferred";
 import { AttachmentStatus } from "../footer-items/attachment-status";
 
 vi.mock("@/components/ui/use-toast", () => ({ toast: vi.fn() }));
 vi.mock("@/core/network/api", () => ({ API: { post: vi.fn() } }));
 
+const attachmentsAtom = atom<Attachment[]>([]);
+
 const AGENT: Attachment = {
   id: "a1",
   kind: "agent",
@@ -41,6 +44,12 @@ function renderStatus(attachments: Attachment[] = [AGENT], preview = true) {
   const store = createStore();
   store.set(connectionAtom, { state: ConnectionState.OPEN });
   store.set(pairConfigAtom, { ...PAIR_CONFIG, hostEnabled: preview });
+  store.set(notebookClientAtom, {
+    connectionAtom: atom({ state: ConnectionState.OPEN }),
+    documentAtom: atom(null),
+    attachmentsAtom,
+    reconnect: async () => undefined,
+  });
   store.set(attachmentsAtom, attachments);
   store.set(stableSessionIdAtom, "stable/test" as StableSessionId);
   return {
@@ -342,21 +351,6 @@ describe("AttachmentStatus", () => {
     ).toBeDisabled();
   });
 
-  it.each([
-    { state: ConnectionState.CONNECTING },
-    { state: ConnectionState.CLOSING },
-    { state: ConnectionState.NOT_STARTED },
-    {
-      state: ConnectionState.CLOSED,
-      code: WebSocketClosedReason.KERNEL_DISCONNECTED,
-      reason: "offline",
-    },
-  ])("hides connected claims while the browser is %j", (connection) => {
-    const { store, container } = renderStatus();
-    act(() => store.set(connectionAtom, connection));
-    expect(container).toBeEmptyDOMElement();
-  });
-
   it("removes detached agents when the list is replaced", () => {
     const { store, container } = renderStatus([
       AGENT,

package/src/components/editor/errors/__tests__/send-error-report-button.test.tsx

@@ -8,7 +8,7 @@ import {
   screen,
   waitFor,
 } from "@testing-library/react";
-import { createStore, Provider, useAtomValue } from "jotai";
+import { atom, createStore, Provider, useAtomValue } from "jotai";
 import type React from "react";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { MockNotebook } from "@/__mocks__/notebook";
@@ -16,7 +16,7 @@ import { cellId } from "@/__tests__/branded";
 import { PAIR_CONFIG } from "@/__tests__/fixtures/pair-config";
 import { TooltipProvider } from "@/components/ui/tooltip";
 import { toast } from "@/components/ui/use-toast";
-import { type Attachment, attachmentsAtom } from "@/core/attachments/state";
+import type { Attachment } from "@/core/attachments/state";
 import { exportedForTesting, notebookAtom } from "@/core/cells/cells";
 import {
   type CellOutputMessage,
@@ -32,7 +32,8 @@ import {
 } from "@/core/kernel/session";
 import { API } from "@/core/network/api";
 import { connectionAtom } from "@/core/network/connection";
-import { WebSocketClosedReason, ConnectionState } from "@/core/websocket/types";
+import { notebookClientAtom } from "@/core/websocket/state";
+import { ConnectionState } from "@/core/websocket/types";
 import { Deferred } from "@/utils/Deferred";
 import { HTTPError } from "@/utils/errors";
 import { MarimoErrorOutput } from "../../output/MarimoErrorOutput";
@@ -48,6 +49,8 @@ vi.mock("@/components/editor/chrome/wrapper/useOpenAiAssistant", () => ({
 
 const CELL_ID = cellId("test-cell");
 const STABLE_ID = "stable/test" as StableSessionId;
+const attachmentsAtom = atom<Attachment[]>([]);
+
 const AGENT: Attachment = {
   id: "a1",
   kind: "agent",
@@ -93,6 +96,12 @@ function renderButton({
   const store = createStore();
   store.set(connectionAtom, { state: ConnectionState.OPEN });
   store.set(pairConfigAtom, { ...PAIR_CONFIG, hostEnabled: preview });
+  store.set(notebookClientAtom, {
+    connectionAtom: atom({ state: ConnectionState.OPEN }),
+    documentAtom: atom(null),
+    attachmentsAtom,
+    reconnect: async () => undefined,
+  });
   store.set(attachmentsAtom, attachments);
   store.set(stableSessionIdAtom, stableId);
   const wrapper = ({ children }: { children: React.ReactNode }) => (
@@ -177,26 +186,6 @@ describe("SendErrorReportButton", () => {
     expect(screen.getByRole("button")).toBeDisabled();
   });
 
-  it.each([
-    { state: ConnectionState.CONNECTING },
-    { state: ConnectionState.CLOSING },
-    { state: ConnectionState.NOT_STARTED },
-    {
-      state: ConnectionState.CLOSED,
-      code: WebSocketClosedReason.KERNEL_DISCONNECTED,
-      reason: "offline",
-    },
-  ])(
-    "does not send from a stale snapshot while the browser is %j",
-    (connection) => {
-      const { store } = renderButton();
-      act(() => store.set(connectionAtom, connection));
-      expect(screen.getByRole("button")).toBeDisabled();
-      send();
-      expect(API.post).not.toHaveBeenCalled();
-    },
-  );
-
   it.each([
     [new HTTPError(409, "Conflict"), "No agent attached"],
     [new HTTPError(500, "Server error"), "Could not send error"],

package/src/core/attachments/state.ts

@@ -1,17 +1,14 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import type { components } from "@marimo-team/marimo-api";
 import { atom } from "jotai";
-import { isConnectedAtom } from "@/core/network/connection";
+import type { Attachment } from "@/core/host/protocol";
+import { notebookClientAtom } from "@/core/websocket/state";
 
-export type Attachment = components["schemas"]["Attachment"];
+export type { Attachment } from "@/core/host/protocol";
 
-export const attachmentsAtom = atom<Attachment[]>([]);
 export const agentAttachmentsAtom = atom((get) => {
-  if (!get(isConnectedAtom)) {
-    return [];
-  }
-  return get(attachmentsAtom).filter(
+  const notebook = get(notebookClientAtom);
+  return (notebook ? get(notebook.attachmentsAtom) : []).filter(
     (attachment) => attachment.kind === "agent",
   );
 });

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

@@ -0,0 +1,57 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { describe, expect, it } from "vitest";
+import { attachments } from "../resources/attachments";
+import { createStream } from "../stream";
+import { fixtureEvents } from "./fixtures";
+
+const stream = createStream({ 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);
+
+describe("attachment resource", () => {
+  it("collects snapshot records, replaces by id, and removes attachments", () => {
+    const state = confirmed();
+    expect(state.resources.attachments).toEqual(records);
+    const [browser, agent] = records;
+    const renamed = { ...agent, name: "Renamed agent" };
+    const updated = stream.reduce(state, {
+      event: "attachment",
+      id: "98",
+      data: { attachment: renamed },
+    });
+    expect(updated.resources.attachments).toEqual([browser, renamed]);
+    expect(state.resources.attachments).toEqual(records);
+
+    const removed = stream.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, {
+      event: "attachment.removed",
+      id: "100",
+      data: { id: browser.id, time: "2026-10-01T09:30:00Z" },
+    });
+    expect(repeated.resources.attachments).toBe(removed.resources.attachments);
+  });
+
+  it("retains records for replay and rebuilds them after reset", () => {
+    const state = confirmed();
+    expect(stream.resume(state)).toBe(state);
+    const reset = stream.reduce(state, { event: "reset", data: {} });
+    expect(reset.resources.attachments).toEqual([]);
+    const replacement = snapshot
+      .filter(
+        (event) =>
+          event.event !== "attachment" ||
+          event.data.attachment.id === records[0].id,
+      )
+      .reduce(stream.reduce, reset);
+    expect(replacement.resources.attachments).toEqual([records[0]]);
+  });
+});

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

@@ -8,7 +8,7 @@ import { Deferred } from "@/utils/Deferred";
 import { jsonParseWithSpecialChar } from "@/utils/json/json-parser";
 import { classifyCloseEvent } from "../../websocket/connection-state";
 import { createNotebookClient } from "../notebook-client";
-import { fixtureMessages } from "./fixtures";
+import { fixtureEvents, fixtureMessages } from "./fixtures";
 
 function notebookMessage(id: string) {
   const notebook = {
@@ -301,3 +301,133 @@ describe("NotebookClient lifetime", () => {
     second.abort();
   });
 });
+
+async function open() {
+  const url = vi.fn(() => "ws://localhost/ws?session_id=first&cursor=999");
+  const setupResult = setup(url);
+  const lifetime = new AbortController();
+  setupResult.connect(lifetime.signal);
+  setupResult.healthy.resolve();
+  await setupResult.healthy.promise;
+  setupResult.events.dispatchEvent(new Event("open"));
+  return { ...setupResult, lifetime, url };
+}
+
+describe("NotebookClient attachments", () => {
+  const [browser, agent] = fixtureEvents("notebook-events.sse").flatMap(
+    (event) => (event.event === "attachment" ? [event.data.attachment] : []),
+  );
+
+  it("publishes a complete snapshot and applies live changes independently of kernel readiness", async () => {
+    const { client, store, receive, lifetime } = await open();
+    const snapshot = fixtureMessages("notebook-events.sse");
+    const readyIndex = snapshot.findIndex((event) => event.event === "ready");
+    snapshot.slice(0, readyIndex).forEach(receive);
+    expect(store.get(client.attachmentsAtom)).toEqual([]);
+    snapshot.slice(readyIndex).forEach(receive);
+    expect(store.get(client.attachmentsAtom)).toEqual([browser, agent]);
+    const renamed = { ...agent, name: "Renamed agent" };
+    receive({ event: "attachment", id: "98", data: { attachment: renamed } });
+    receive({
+      event: "attachment.removed",
+      id: "99",
+      data: { id: browser.id },
+    });
+    expect(store.get(client.attachmentsAtom)).toEqual([renamed]);
+    receive({ data: { op: "kernel-ready", resumed: false } });
+    expect(store.get(client.attachmentsAtom)).toEqual([renamed]);
+    receive({ event: "attachment.removed", id: "100", data: { id: agent.id } });
+    expect(store.get(client.attachmentsAtom)).toEqual([]);
+    lifetime.abort();
+  });
+
+  it("resumes attachments alongside an incomplete document and waits for replay ready", async () => {
+    const { client, store, receive, events, urls, lifetime } = await open();
+    expect(urls[0].searchParams.has("cursor")).toBe(false);
+    fixtureMessages("notebook-events.sse").forEach(receive);
+    const confirmed = store.get(client.documentAtom);
+    const edits = fixtureMessages("edits.sse");
+    edits.slice(0, 3).forEach(receive);
+    const renamed = { ...agent, name: "Renamed agent" };
+    receive({ event: "attachment", id: "112a", data: { attachment: renamed } });
+    expect(store.get(client.attachmentsAtom)).toEqual([browser, renamed]);
+    events.dispatchEvent(new CloseEvent("close"));
+    expect(store.get(client.attachmentsAtom)).toEqual([]);
+    expect(urls.at(-1)!.searchParams.get("cursor")).toBe("112a");
+    events.dispatchEvent(new Event("open"));
+    expect(store.get(client.attachmentsAtom)).toEqual([]);
+    expect(store.get(client.documentAtom)).toBe(confirmed);
+    edits.slice(3).forEach(receive);
+    receive({
+      event: "attachment.removed",
+      id: "115",
+      data: { id: browser.id },
+    });
+    expect(store.get(client.attachmentsAtom)).toEqual([]);
+    receive({ event: "ready", id: "116", data: {} });
+    expect(store.get(client.attachmentsAtom)).toEqual([renamed]);
+    const revisions = fixtureEvents("edits.sse").flatMap((event) =>
+      event.event === "document" ? [event.data.document] : [],
+    );
+    expect(store.get(client.documentAtom)?.revision).toEqual(revisions.at(-1));
+    lifetime.abort();
+  });
+
+  it("replaces stale attachments with an empty snapshot after reset", async () => {
+    const { client, store, receive, lifetime } = await open();
+    fixtureMessages("notebook-events.sse").forEach(receive);
+    receive({ event: "reset", data: {} });
+    expect(store.get(client.attachmentsAtom)).toEqual([]);
+    fixtureMessages("notebook-events.sse")
+      .filter((event) => event.event !== "attachment")
+      .forEach(receive);
+    expect(store.get(client.attachmentsAtom)).toEqual([]);
+    lifetime.abort();
+  });
+
+  it.each(["close", "error", "malformed", "removed", "abort", "identity"])(
+    "clears presence on %s and ignores messages after disposal",
+    async (reason) => {
+      const { client, store, receive, events, url, lifetime } = await open();
+      fixtureMessages("notebook-events.sse").forEach(receive);
+      expect(store.get(client.attachmentsAtom)).toEqual([browser, agent]);
+      switch (reason) {
+        case "close":
+          events.dispatchEvent(
+            new CloseEvent("close", { reason: "MARIMO_UNAUTHORIZED" }),
+          );
+          break;
+        case "error":
+          events.dispatchEvent(new Event("error"));
+          break;
+        case "malformed":
+          receive({ event: "attachment", id: "98", data: {} });
+          break;
+        case "removed":
+          receive({ event: "notebook.removed", id: "98", data: { id: "n1" } });
+          break;
+        case "identity":
+          url.mockReturnValue(
+            "ws://localhost/api/marimo/v1/notebooks/n2/events/ws",
+          );
+          events.dispatchEvent(new CloseEvent("close"));
+          receive({ event: "ready", id: "98", data: {} });
+          break;
+        default:
+          lifetime.abort();
+      }
+      expect(store.get(client.attachmentsAtom)).toEqual([]);
+      lifetime.abort();
+      fixtureMessages("notebook-events.sse").forEach(receive);
+      expect(store.get(client.attachmentsAtom)).toEqual([]);
+    },
+  );
+
+  it("keeps legacy sessions empty", async () => {
+    const { client, store, receive, lifetime } = await open();
+    receive({ data: { op: "kernel-ready" } });
+    receive({ data: { op: "reconnected" } });
+    expect(store.get(client.attachmentsAtom)).toEqual([]);
+    lifetime.abort();
+  });
+});

package/src/core/host/events.ts

@@ -15,6 +15,7 @@ export const NOTEBOOK_EVENT_TYPES = [
   "notebook",
   "document",
   "cell",
+  "attachment",
   "marimo",
 ] as const satisfies readonly (Protocol.ObjectType | "marimo")[];
 

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

@@ -11,6 +11,8 @@ import {
   TransportReadyState,
 } from "./connection";
 import { parseNotebookEvent } from "./events";
+import type { Attachment } from "./protocol";
+import { attachments } from "./resources/attachments";
 import { type Document, document } from "./resources/document";
 import { createStream } from "./stream";
 
@@ -26,6 +28,8 @@ export interface NotebookClient {
    * retains the last document. Partial updates are not exposed.
    */
   readonly documentAtom: Atom<Document | null>;
+  /** Live attachments, empty until the stream is ready or while disconnected. */
+  readonly attachmentsAtom: Atom<readonly Attachment[]>;
   /** Attempt to restore a closed connection after checking host health. */
   reconnect(): Promise<void>;
 }
@@ -60,15 +64,23 @@ 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 });
+  const stream = createStream({ document, attachments });
   const streamAtom = atom(stream.initial);
+  // A resumed stream is live, but presence waits for this connection's ready.
+  const readyAtom = atom(false);
   const documentAtom = atom(
     (get) => get(streamAtom).resources.document.current,
   );
+  const attachmentsAtom = atom((get) =>
+    get(readyAtom) && get(connectionAtom).state === ConnectionState.OPEN
+      ? get(streamAtom).resources.attachments
+      : attachments.initial,
+  );
   let reconnect: (() => Promise<void>) | undefined;
   const client: NotebookClient = {
     connectionAtom,
     documentAtom,
+    attachmentsAtom,
     reconnect: async () => reconnect?.(),
   };
 
@@ -111,14 +123,17 @@ export function createNotebookClient(store: ReturnType<typeof createStore>) {
           ? stream.resume(store.get(streamAtom))
           : stream.initial;
       streamKey = key;
+      store.set(readyAtom, false);
       store.set(streamAtom, state);
       if (state.cursor !== null) {
         next.searchParams.set("cursor", state.cursor);
       }
       return next.toString();
     });
-    const setStatus = (status: ConnectionStatus) =>
+    const setStatus = (status: ConnectionStatus) => {
+      store.set(readyAtom, false);
       store.set(connectionAtom, status);
+    };
     const disconnected = {
       state: ConnectionState.CLOSED,
       code: ConnectionClosedReason.KERNEL_DISCONNECTED,
@@ -174,6 +189,9 @@ export function createNotebookClient(store: ReturnType<typeof createStore>) {
       try {
         event = parseNotebookEvent(decodeJson(message.data));
         store.set(streamAtom, stream.reduce(store.get(streamAtom), event));
+        if (event.event === "ready" || event.event === "reset") {
+          store.set(readyAtom, event.event === "ready");
+        }
       } catch (error) {
         Logger.error("Failed to decode notebook message", error);
         if (messageFormat === "session") {

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

@@ -0,0 +1,19 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import type { Attachment } from "../protocol";
+import type { Resource } from "./resource";
+
+/** Attachment records retained with the stream's resume cursor. */
+export const attachments: Resource<readonly Attachment[]> = {
+  initial: [],
+  on: {
+    attachment: (state, { data: { attachment } }) =>
+      state.some((item) => item.id === attachment.id)
+        ? state.map((item) => (item.id === attachment.id ? attachment : item))
+        : [...state, attachment],
+    "attachment.removed": (state, { data }) =>
+      state.some((item) => item.id === data.id)
+        ? state.filter((item) => item.id !== data.id)
+        : state,
+  },
+};