@marimo-team/islands 0.25.3-dev100 → 0.25.3-dev102

package/dist/{ErrorBoundary-GScQVnJ8.js → ErrorBoundary-CTqzlCgA.js}

@@ -135,7 +135,7 @@ function F(e) {
 }
 //#endregion
 //#region src/components/editor/boundary/ErrorBoundary.tsx
-var I = (0, T.lazy)(() => import("./feedback-button-BXcB6llx.js").then((e) => ({ default: e.FeedbackModal }))), L = (e) => {
+var I = (0, T.lazy)(() => import("./feedback-button-CoLi84rn.js").then((e) => ({ default: e.FeedbackModal }))), L = (e) => {
 	let t = (0, w.c)(2), n;
 	return t[0] === e.children ? n = t[1] : (n = /* @__PURE__ */ (0, j.jsx)(O, {
 		FallbackComponent: R,

package/dist/{code-visibility-DnqM5oW_.js → code-visibility-BXe6iFL5.js}

@@ -18,7 +18,7 @@ function x() {
 		return e.warn("Failed to get version from mount config"), null;
 	}
 }
-var S = x() || "0.25.3-dev100", C = u(S), w = u(!0);
+var S = x() || "0.25.3-dev102", C = u(S), w = u(!0);
 u(null);
 //#endregion
 //#region src/core/wasm/state.ts

package/dist/{common-D2HSo8Gy.js → common-DKpWKeru.js}

@@ -12,7 +12,7 @@ import { t as lt } from "./check-P35dc2dH.js";
 import { A as ut, C as dt, M as ft, O as pt, S as mt, _ as ht, b as gt, c as _t, d as vt, g as yt, h as bt, i as xt, l as St, m as Ct, n as wt, p as Tt, s as Et, t as Dt, u as Ot, v as kt, y as At } from "./select-B0LRDH0g.js";
 import { $ as jt, $t as Mt, A as Nt, At as Pt, B as Ft, Bt as It, Ct as Lt, D as Rt, Dt as zt, E as Bt, Et as Vt, F as Ht, Ft as Ut, G as Wt, Gt, H as Kt, Ht as qt, I as Jt, It as Yt, J as Xt, Jt as Zt, Kt as Qt, L as $t, Lt as en, M as tn, Mt as nn, N as rn, Nt as an, O as on, Ot as sn, P as cn, Pt as ln, Q as un, Qt as dn, R as fn, Rt as pn, S as mn, St as hn, T as gn, Tt as _n, U as vn, Ut as yn, V as bn, Vt as xn, W as Sn, Wt as Cn, X as wn, Xt as Tn, Y as En, Yt as Dn, Z as On, Zt as kn, _ as An, _n as jn, _t as Mn, a as Nn, an as Pn, at as Fn, b as In, bt as Ln, cn as Rn, ct as zn, d as Bn, dn as Vn, en as Hn, et as Un, f as Wn, fn as Gn, ft as Kn, gn as qn, gt as Jn, h as Yn, hn as Xn, ht as Zn, i as Qn, in as $n, it as er, j as tr, jt as nr, k as rr, kt as ir, l as ar, ln as or, lt as sr, mn as cr, mt as lr, n as ur, nn as dr, nt as fr, o as pr, ot as mr, pn as hr, pt as gr, qt as _r, rn as vr, rt as yr, s as br, sn as xr, st as Sr, t as Cr, tt as wr, u as Tr, ut as Er, vn as Dr, vt as Or, w as kr, wt as Ar, x as jr, xt as Mr, y as Nr, yn as Pr, yt as Fr, z as Ir, zt as Lr } from "./dropdown-menu-B_7xD2X4.js";
 import { a as Rr, c as zr, d as Br, i as Vr, l as Hr, n as Ur, o as Wr, r as Gr, t as Kr, v as qr, x as Jr, y as Yr } from "./toDate-DKH0_kMo.js";
-import { n as Xr, t as Zr } from "./ErrorBoundary-GScQVnJ8.js";
+import { n as Xr, t as Zr } from "./ErrorBoundary-CTqzlCgA.js";
 import { t as Qr } from "./clsx-CoeGtWvn.js";
 import { t as $r } from "./react-dom-DUmH0GXv.js";
 import { t as ei } from "./jsx-runtime-3BD1kT0s.js";

package/dist/{data-grid-overlay-editor-BgIMQs9G.js → data-grid-overlay-editor-D-lYQf1c.js}

@@ -2,7 +2,7 @@ import { a as e } from "./rolldown-runtime-Cb76FRpK.js";
 import { t } from "./react-sHtZdjeP.js";
 import { t as n } from "./react-dom-DUmH0GXv.js";
 import { c as r, l as i, u as a } from "./data-grid-types-0PJ-9N5n.js";
-import { a as o, i as s, n as c, r as l } from "./glide-data-editor-S-_J-7SO.js";
+import { a as o, i as s, n as c, r as l } from "./glide-data-editor-bMB-b4l2.js";
 //#region ../node_modules/.pnpm/@glideapps+glide-data-grid@6.0.4-alpha24_lodash@4.17.21_marked@15.0.12_react-dom@19.3.0_27cffe7f1bc30287d59ac27db3240c5b/node_modules/@glideapps/glide-data-grid/dist/esm/internal/data-grid-overlay-editor/data-grid-overlay-editor-style.js
 var u = /* @__PURE__ */ e(t(), 1), d = /* @__PURE__ */ e(n(), 1), f = /*#__PURE__*/ o("div")({
 	name: "DataGridOverlayEditorStyle",

package/dist/{feedback-button-BXcB6llx.js → feedback-button-CoLi84rn.js}

@@ -5,12 +5,12 @@ import { t as i } from "./compiler-runtime-CldRdSsv.js";
 import { t as a } from "./copy-icon-CPoxUG7G.js";
 import { Dt as o, G as s, It as c, K as l, Rt as u, V as d, dn as f, h as p, i as m, n as h } from "./error-entries-TAO6kEhF.js";
 import { b as g } from "./select-B0LRDH0g.js";
-import { n as ee, t as te } from "./globals-D4vBwcD6.js";
+import { n as ee, t as te } from "./globals-CmP7eFM1.js";
 import { t as _ } from "./jsx-runtime-3BD1kT0s.js";
 import { C as v, _ as ne, i as y } from "./useTheme-CfeaVw5D.js";
 import { a as re, i as ie, n as ae, r as oe } from "./dialog-C1PcpCqX.js";
 import { t as se } from "./useAsyncData-D0mLJstx.js";
-import { t as ce } from "./code-visibility-DnqM5oW_.js";
+import { t as ce } from "./code-visibility-BXe6iFL5.js";
 //#region src/components/ui/skeleton.tsx
 var b = /* @__PURE__ */ e(r(), 1), x = i(), S = _(), le = (e) => {
 	let n = (0, x.c)(8), r, i;

package/dist/{glide-data-editor-S-_J-7SO.js → glide-data-editor-bMB-b4l2.js}

@@ -6,7 +6,7 @@ import { i as s, n as c, r as l } from "./copy-icon-CPoxUG7G.js";
 import { C as u, c as d, i as f, n as p, s as m, t as h, x as g } from "./select-B0LRDH0g.js";
 import { d as _, h as v, i as y, l as b, n as x, o as S, s as C, t as w, u as T } from "./dropdown-menu-B_7xD2X4.js";
 import { c as E, d as D, l as O, n as k, o as A, s as ee, t as j, u as te } from "./glide-utils-Bt8_pBa2.js";
-import { n as ne, t as re } from "./ErrorBoundary-GScQVnJ8.js";
+import { n as ne, t as re } from "./ErrorBoundary-CTqzlCgA.js";
 import { t as ie } from "./react-dom-DUmH0GXv.js";
 import { t as M } from "./jsx-runtime-3BD1kT0s.js";
 import { t as N } from "./label-BRnUC0NX.js";
@@ -7062,7 +7062,7 @@ function rs(e, t, n, r, i) {
 }
 //#endregion
 //#region ../node_modules/.pnpm/@glideapps+glide-data-grid@6.0.4-alpha24_lodash@4.17.21_marked@15.0.12_react-dom@19.3.0_27cffe7f1bc30287d59ac27db3240c5b/node_modules/@glideapps/glide-data-grid/dist/esm/data-editor/data-editor.js
-var is = /* @__PURE__ */ e(_r(), 1), as = /* @__PURE__ */ e(xr(), 1), os = K.lazy(async () => await import("./data-grid-overlay-editor-BgIMQs9G.js")), ss = 0;
+var is = /* @__PURE__ */ e(_r(), 1), as = /* @__PURE__ */ e(xr(), 1), os = K.lazy(async () => await import("./data-grid-overlay-editor-D-lYQf1c.js")), ss = 0;
 function cs(e) {
 	return (0, is.default)((0, as.default)((0, as.default)(e).filter((e) => e.span !== void 0).map((e) => (0, Za.default)((e.span?.[0] ?? 0) + 1, (e.span?.[1] ?? 0) + 1))));
 }
@@ -9293,7 +9293,7 @@ function Vs(e, t, n, r, i) {
 }
 //#endregion
 //#region ../node_modules/.pnpm/@glideapps+glide-data-grid@6.0.4-alpha24_lodash@4.17.21_marked@15.0.12_react-dom@19.3.0_27cffe7f1bc30287d59ac27db3240c5b/node_modules/@glideapps/glide-data-grid/dist/esm/cells/number-cell.js
-var Hs = K.lazy(async () => await import("./number-overlay-editor-CUrUm7Np.js")), Us = {
+var Hs = K.lazy(async () => await import("./number-overlay-editor-JFjUfbs3.js")), Us = {
 	getAccessibilityString: (e) => e.data?.toString() ?? "",
 	kind: W.Number,
 	needsHover: (e) => e.hoverEffect === !0,

package/dist/{globals-D4vBwcD6.js → globals-CmP7eFM1.js}

@@ -1,6 +1,6 @@
 import { h as e } from "./tooltip-CKO1pHJo.js";
 import { _ as t } from "./useTheme-CfeaVw5D.js";
-import { r as n } from "./code-visibility-DnqM5oW_.js";
+import { r as n } from "./code-visibility-BXe6iFL5.js";
 var r = e("triangle-alert", [
 	["path", {
 		d: "m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3",

package/dist/main.js

@@ -7,7 +7,7 @@ import { C as w, F as T, G as E, I as D, J as O, K as k, L as A, P as j, R as M,
 import { a as oe, d as se, f as ce, h as V, i as le, n as ue, o as de, r as fe, t as pe } from "./tooltip-CKO1pHJo.js";
 import { $t as me, At as he, B as ge, Bt as _e, D as ve, Dt as ye, E as be, Et as xe, Ft as Se, Gt as Ce, J as we, Jt as Te, Kt as Ee, M as De, Mt as Oe, N as ke, O as Ae, Ot as je, Q as Me, R as Ne, S as Pe, Ut as Fe, V as Ie, Vt as Le, W as Re, Y as ze, Yt as Be, Z as Ve, _ as He, b as Ue, bt as We, cn as Ge, dt as Ke, en as qe, f as Je, fn as Ye, ft as Xe, g as Ze, gn as Qe, gt as $e, h as et, hn as tt, ht as nt, in as rt, j as it, jt as at, k as ot, kt as st, ln as ct, m as lt, nn as ut, nt as dt, o as ft, p as pt, pn as mt, q as ht, qt as gt, rt as _t, s as vt, sn as yt, st as bt, tn as xt, u as St, un as Ct, ut as wt, v as Tt, wt as Et, y as Dt, z as Ot, zt as kt } from "./error-entries-TAO6kEhF.js";
 import { D as At, E as jt, O as Mt, S as Nt, T as Pt, _ as Ft, a as It, c as Lt, d as Rt, f as zt, g as Bt, h as Vt, i as Ht, l as Ut, m as Wt, n as Gt, o as Kt, p as qt, r as Jt, s as Yt, t as Xt, u as Zt, v as Qt, w as $t, x as en, y as tn } from "./spec-CcT0slVc.js";
-import { $ as nn, $t as rn, A as an, At as on, B as sn, Bt as cn, C as ln, Ct as un, D as dn, Dt as fn, E as pn, Et as mn, F as hn, Ft as gn, G as _n, Gt as vn, H as yn, Ht as bn, I as xn, It as Sn, J as Cn, Jt as wn, K as Tn, Kt as En, L as Dn, Lt as On, M as kn, Mt as An, N as jn, Nt as Mn, O as Nn, Ot as Pn, P as Fn, Pt as In, Qt as Ln, R as Rn, Rt as zn, S as Bn, St as Vn, T as Hn, Tt as Un, U as Wn, Ut as Gn, V as Kn, Vt as qn, W as Jn, Wt as Yn, Xt as Xn, Y as Zn, Yt as Qn, Zt as $n, _ as er, _t as tr, at as nr, b as rr, c as ir, cn as ar, ct as or, d as sr, dn as cr, dt as lr, en as ur, et as dr, f as fr, fn as pr, ft as mr, g as hr, gt as gr, h as _r, ht as vr, in as yr, it as br, j as xr, jt as Sr, k as Cr, kt as wr, ln as Tr, lt as Er, m as Dr, mn as Or, mt as kr, nn as Ar, nt as jr, on as Mr, ot as Nr, p as Pr, pn as Fr, pt as Ir, q as Lr, qt as Rr, r as zr, rn as Br, rt as Vr, sn as Hr, st as Ur, t as Wr, tn as Gr, tt as Kr, u as qr, un as Jr, ut as Yr, v as Xr, vt as Zr, w as Qr, wt as $r, x as ei, xt as ti, y as ni, z as ri, zt as ii } from "./common-D2HSo8Gy.js";
+import { $ as nn, $t as rn, A as an, At as on, B as sn, Bt as cn, C as ln, Ct as un, D as dn, Dt as fn, E as pn, Et as mn, F as hn, Ft as gn, G as _n, Gt as vn, H as yn, Ht as bn, I as xn, It as Sn, J as Cn, Jt as wn, K as Tn, Kt as En, L as Dn, Lt as On, M as kn, Mt as An, N as jn, Nt as Mn, O as Nn, Ot as Pn, P as Fn, Pt as In, Qt as Ln, R as Rn, Rt as zn, S as Bn, St as Vn, T as Hn, Tt as Un, U as Wn, Ut as Gn, V as Kn, Vt as qn, W as Jn, Wt as Yn, Xt as Xn, Y as Zn, Yt as Qn, Zt as $n, _ as er, _t as tr, at as nr, b as rr, c as ir, cn as ar, ct as or, d as sr, dn as cr, dt as lr, en as ur, et as dr, f as fr, fn as pr, ft as mr, g as hr, gt as gr, h as _r, ht as vr, in as yr, it as br, j as xr, jt as Sr, k as Cr, kt as wr, ln as Tr, lt as Er, m as Dr, mn as Or, mt as kr, nn as Ar, nt as jr, on as Mr, ot as Nr, p as Pr, pn as Fr, pt as Ir, q as Lr, qt as Rr, r as zr, rn as Br, rt as Vr, sn as Hr, st as Ur, t as Wr, tn as Gr, tt as Kr, u as qr, un as Jr, ut as Yr, v as Xr, vt as Zr, w as Qr, wt as $r, x as ei, xt as ti, y as ni, z as ri, zt as ii } from "./common-DKpWKeru.js";
 import { c as ai, i as oi, n as si, o as ci, t as li } from "./useLifecycle-Dum8WSXq.js";
 import { t as ui } from "./check-P35dc2dH.js";
 import { A as di, C as fi, D as pi, E as mi, M as hi, O as gi, S as _i, T as vi, a as yi, b as bi, c as xi, i as Si, k as Ci, l as wi, n as Ti, o as Ei, r as Di, s as Oi, t as ki, w as Ai, x as ji } from "./select-B0LRDH0g.js";
@@ -15,8 +15,8 @@ import { At as Mi, C as Ni, Dt as Pi, J as Fi, K as Ii, R as Li, S as Ri, U as z
 import { C as ua, _ as da, a as fa, b as pa, c as ma, f as ha, h as ga, m as _a, p as va, s as ya, u as ba, x as xa, y as Sa } from "./toDate-DKH0_kMo.js";
 import { a as Ca, c as wa, d as Ta, f as Ea, i as Da, l as Oa, n as ka, o as Aa, r as ja, s as Ma, t as Na } from "./process-output-DD-oSvZk.js";
 import { a as Pa, c as Fa, d as Ia, i as La, l as Ra, r as za, u as Ba } from "./glide-utils-Bt8_pBa2.js";
-import { n as Va, t as Ha } from "./ErrorBoundary-GScQVnJ8.js";
-import { n as Ua, t as Wa } from "./globals-D4vBwcD6.js";
+import { n as Va, t as Ha } from "./ErrorBoundary-CTqzlCgA.js";
+import { n as Ua, t as Wa } from "./globals-CmP7eFM1.js";
 import { t as Ga } from "./react-dom-DUmH0GXv.js";
 import { t as Ka } from "./jsx-runtime-3BD1kT0s.js";
 import { B as qa, C as H, Ct as Ja, D as Ya, E as Xa, F as U, G as Za, H as Qa, I as $a, L as eo, M as W, N as to, O as no, P as ro, Q as io, R as ao, S as G, St as oo, Tt as so, U as co, W as lo, Y as uo, Z as fo, _ as po, _t as mo, a as ho, b as go, bt as _o, c as vo, d as yo, f as bo, g as xo, h as So, ht as Co, i as wo, j as K, k as To, l as Eo, m as Do, n as Oo, o as ko, p as Ao, r as jo, s as Mo, u as No, ut as Po, v as Fo, vt as Io, w as Lo, wt as Ro, x as zo, xt as Bo, y as Vo, yt as Ho } from "./use-restore-focus-DBCITLeF.js";
@@ -39,7 +39,7 @@ import { t as Ms } from "./useAsyncData-D0mLJstx.js";
 import { i as Ns, n as Ps, r as Fs } from "./formats-V8ifA0Bk.js";
 import { D as Is, O as Ls } from "./vega-loader.browser-B9Pz0EGP.js";
 import { a as Rs, n as zs } from "./loader-Bm8cy3e8.js";
-import { c as Bs, d as Vs, i as Hs, l as Us, o as Ws, s as Gs, t as Ks, u as qs } from "./code-visibility-DnqM5oW_.js";
+import { c as Bs, d as Vs, i as Hs, l as Us, o as Ws, s as Gs, t as Ks, u as qs } from "./code-visibility-BXe6iFL5.js";
 import { t as Js } from "./useDeepCompareMemoize-BpPWi3G3.js";
 import { t as Ys } from "./esm-D2gTsXEV.js";
 //#region ../node_modules/.pnpm/iconify-icon@2.3.0/node_modules/iconify-icon/dist/iconify-icon.mjs
@@ -10578,7 +10578,7 @@ function VC(e, t) {
 }
 //#endregion
 //#region src/plugins/impl/DataEditorPlugin.tsx
-var HC = J.lazy(() => import("./glide-data-editor-S-_J-7SO.js").then((e) => e.t)), UC = wS("marimo-data-editor", { cssStyles: [qS] }).withData(W({
+var HC = J.lazy(() => import("./glide-data-editor-bMB-b4l2.js").then((e) => e.t)), UC = wS("marimo-data-editor", { cssStyles: [qS] }).withData(W({
 	initialValue: W({ edits: G(W({
 		rowIdx: K(),
 		columnId: U(),
@@ -30305,7 +30305,7 @@ function VR(e) {
 }
 //#endregion
 //#region src/components/editor/renderers/slides-layout/slides-layout.tsx
-var HR = J.lazy(() => import("./reveal-component-CFzdsOg8.js")), UR = (e) => {
+var HR = J.lazy(() => import("./reveal-component-BT1D05hU.js")), UR = (e) => {
 	let t = (0, X.c)(33), { layout: n, setLayout: r, cells: i, mode: a } = e, o = ns(da), s = a === "read" || o, c = ns(He) > 1, [l, u] = (0, J.useState)(null), d;
 	t[0] !== i || t[1] !== n ? (d = zP(i, n), t[0] = i, t[1] = n, t[2] = d) : d = t[2];
 	let { slideCells: f, skippedIds: p, noOutputIds: m, slideTypes: h, startCellIndex: g } = d, _;

package/dist/{number-overlay-editor-CUrUm7Np.js → number-overlay-editor-JFjUfbs3.js}

@@ -1,6 +1,6 @@
 import { a as e } from "./rolldown-runtime-Cb76FRpK.js";
 import { t } from "./react-sHtZdjeP.js";
-import { a as n } from "./glide-data-editor-S-_J-7SO.js";
+import { a as n } from "./glide-data-editor-bMB-b4l2.js";
 //#region ../node_modules/.pnpm/@glideapps+glide-data-grid@6.0.4-alpha24_lodash@4.17.21_marked@15.0.12_react-dom@19.3.0_27cffe7f1bc30287d59ac27db3240c5b/node_modules/@glideapps/glide-data-grid/dist/esm/internal/data-grid-overlay-editor/private/number-overlay-editor-style.js
 var r = /* @__PURE__ */ e(t()), i = /*#__PURE__*/ n("div")({
 	name: "NumberOverlayEditorStyle",

package/dist/{reveal-component-CFzdsOg8.js → reveal-component-BT1D05hU.js}

@@ -4,14 +4,14 @@ import { t as o } from "./react-sHtZdjeP.js";
 import { t as s } from "./compiler-runtime-CldRdSsv.js";
 import { h as c, t as l } from "./tooltip-CKO1pHJo.js";
 import { O as u } from "./error-entries-TAO6kEhF.js";
-import { Q as d, X as f, Z as p, an as m, cn as h, i as g, in as _, l as v, n as y, r as b, t as x, u as S } from "./common-D2HSo8Gy.js";
+import { Q as d, X as f, Z as p, an as m, cn as h, i as g, in as _, l as v, n as y, r as b, t as x, u as S } from "./common-DKpWKeru.js";
 import { M as C } from "./select-B0LRDH0g.js";
 import { q as ee } from "./dropdown-menu-B_7xD2X4.js";
 import { _ as w } from "./toDate-DKH0_kMo.js";
 import { t as T } from "./jsx-runtime-3BD1kT0s.js";
 import { q as E } from "./use-restore-focus-DBCITLeF.js";
 import { A as D, C as O, b as k } from "./useTheme-CfeaVw5D.js";
-import { a as A, n as te, t as ne } from "./code-visibility-DnqM5oW_.js";
+import { a as A, n as te, t as ne } from "./code-visibility-BXe6iFL5.js";
 /* empty css                */
 var j = c("sticky-note", [["path", {
 	d: "M21 9a2.4 2.4 0 0 0-.706-1.706l-3.588-3.588A2.4 2.4 0 0 0 15 3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2z",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/islands",
-  "version": "0.25.3-dev100",
+  "version": "0.25.3-dev102",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/core/document/__tests__/lifecycle-scenarios.test.ts

@@ -0,0 +1,61 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { vi } from "vitest";
+import { test } from "./scenario-fixture";
+
+test("closing a session before the debounce prevents submission", async ({
+  expect,
+  session: { user, notebook, controller },
+}) => {
+  user.changeCode("c3", "local");
+  const reason = new Error("Editing session ended");
+  controller.abort(reason);
+  await vi.advanceTimersByTimeAsync(1000);
+  expect(notebook.edit).not.toHaveBeenCalled();
+  expect(vi.getTimerCount()).toBe(0);
+  await expect(user.sync()).rejects.toBe(reason);
+});
+
+test("closing a session before a queued flush starts prevents submission", async ({
+  expect,
+  session: { user, notebook, controller },
+}) => {
+  user.changeCode("c3", "local");
+  const flushed = user.sync();
+  const reason = new Error("Editing session ended");
+  controller.abort(reason);
+  await expect(flushed).rejects.toBe(reason);
+  expect(notebook.edit).not.toHaveBeenCalled();
+  expect(vi.getTimerCount()).toBe(0);
+});
+
+test.for(["request", "confirmation", "retry"] as const)(
+  "closing a session during %s stops synchronization",
+  async (phase, { expect, session: { user, host, notebook, controller } }) => {
+    user.changeCode("c3", "local");
+    const flushed = user.sync();
+    const request = await host.nextRequest();
+    if (phase === "confirmation") {
+      request.process();
+      request.deliverResponse();
+    } else if (phase === "retry") {
+      request.loseResponse();
+    }
+    await vi.advanceTimersByTimeAsync(0);
+    const reason = new Error("Editing session ended");
+    controller.abort(reason);
+    await expect(flushed).rejects.toBe(reason);
+    if (phase === "request") {
+      expect(request.signal.aborted).toBe(true);
+    }
+
+    host.changeCell("c1", { code: "later" });
+    host.deliverSnapshot();
+    user.changeCode("c3", "after closing");
+    await vi.advanceTimersByTimeAsync(1000);
+    expect(notebook.edit).toHaveBeenCalledOnce();
+    expect(vi.getTimerCount()).toBe(0);
+    await expect(user.sync()).rejects.toBe(reason);
+    await expect(user.retry()).rejects.toBe(reason);
+  },
+);

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

@@ -67,8 +67,8 @@ function setup() {
     unmounted,
     edit: (code: string) =>
       store.set(model.editAtom, (tx) => tx.setCode("c1", code)),
-    state: () => store.get(model.syncStateAtom),
-    value: () => store.get(model.cellAtom("c1")),
+    status: () => store.get(model.syncStatusAtom),
+    value: () => store.get(model.documentAtom)?.cells.get("c1"),
   };
 }
 
@@ -101,71 +101,8 @@ describe("document synchronization", () => {
     expect(vi.getTimerCount()).toBe(0);
   });
 
-  it("releases unsent reversals and flushes an unchanged document without a request", async () => {
-    const { store, source, sent, edit, model, state, value } = setup();
-    edit("temporary");
-    edit("x = 1");
-    expect(state()).toEqual({ status: "idle" });
-    const remote = withCells(document(), { c1: cell("c1", "remote") });
-    store.set(source, remote);
-    expect(value()?.code).toBe("remote");
-    await expect(model.flush()).resolves.toEqual(remote.revision);
-    await vi.advanceTimersByTimeAsync(1000);
-    expect(sent).not.toHaveBeenCalled();
-  });
-
-  it("flushes edits made after an earlier drain finishes but before its promise settles", async () => {
-    const { store, source, sent, replies, edit, model } = setup();
-    const first = model.flush();
-    await Promise.resolve();
-    edit("new code");
-    const second = model.flush();
-    const settled = vi.fn();
-    void second.then(settled, settled);
-
-    await vi.advanceTimersByTimeAsync(0);
-    expect(sent).toHaveBeenCalledOnce();
-    expect(settled).not.toHaveBeenCalled();
-    expect(sent.mock.calls[0][0].changes).toMatchObject([
-      { cell: { id: "c1", code: "new code" } },
-    ]);
-
-    const accepted = withCells(document(), {
-      c1: cell("c1", "new code", { etag: "accepted", version: 2 }),
-    });
-    replies[0].resolve(response(accepted));
-    store.set(source, accepted);
-    await expect(second).resolves.toEqual(accepted.revision);
-    await expect(first).resolves.toEqual(document().revision);
-  });
-
-  it("manually retries an uncertain request with its original identity", async () => {
-    const { store, source, sent, replies, edit, model } = setup();
-    edit("local");
-    const flushed = model.flush();
-    expect(model.flush()).toBe(flushed);
-    const rejected = expectFailure(flushed, "offline");
-    await vi.advanceTimersByTimeAsync(0);
-    replies[0].reject(new Error("offline"));
-    await vi.advanceTimersByTimeAsync(500);
-    replies[1].reject(new Error("offline"));
-    await vi.advanceTimersByTimeAsync(1000);
-    replies[2].reject(new Error("offline"));
-    await rejected;
-    const retried = model.retry();
-    await vi.advanceTimersByTimeAsync(0);
-    expect(sent.mock.calls[3][0]).toMatchObject({
-      idempotencyKey: sent.mock.calls[0][0].idempotencyKey,
-      changes: sent.mock.calls[0][0].changes,
-    });
-    const accepted = withCells(document(), { c1: cell("c1", "local") });
-    replies[3].resolve(response(accepted));
-    store.set(source, accepted);
-    await expect(retried).resolves.toEqual(accepted.revision);
-  });
-
   it("fails without repeating a request when the response names another notebook", async () => {
-    const { sent, replies, edit, model, state } = setup();
+    const { sent, replies, edit, model, status } = setup();
     edit("local");
     const rejected = expectFailure(model.flush(), "another notebook");
     await vi.advanceTimersByTimeAsync(0);
@@ -173,260 +110,9 @@ describe("document synchronization", () => {
     await rejected;
     await vi.advanceTimersByTimeAsync(5000);
     expect(sent).toHaveBeenCalledOnce();
-    expect(state()).toMatchObject({ status: "error" });
-  });
-
-  it("debounces typing and waits for streamed confirmation before sending newer edits", async () => {
-    const { store, source, sent, replies, edit, model, state, value } = setup();
-    edit("first");
-    await vi.advanceTimersByTimeAsync(300);
-    edit("sent");
-    await vi.advanceTimersByTimeAsync(399);
-    expect(sent).not.toHaveBeenCalled();
-    await vi.advanceTimersByTimeAsync(1);
-    expect(sent).toHaveBeenCalledOnce();
-    expect(sent.mock.calls[0][0].changes[0]).toMatchObject({
-      cell: { code: "sent" },
-    });
-    edit("newer");
-    const accepted = withCells(document(), {
-      c1: cell("c1", "sent", { etag: "accepted" }),
-    });
-    replies[0].resolve(response(accepted));
-    await vi.advanceTimersByTimeAsync(0);
-    expect(state()).toEqual({ status: "confirming" });
-    await vi.advanceTimersByTimeAsync(1000);
-    expect(sent).toHaveBeenCalledOnce();
-    store.set(source, accepted);
-    await vi.advanceTimersByTimeAsync(0);
-    expect(sent).toHaveBeenCalledTimes(2);
-    expect(sent.mock.calls[1][0].changes[0]).toMatchObject({
-      base_etag: "accepted",
-      cell: { code: "newer" },
-    });
-    const latest = withCells(accepted, { c1: cell("c1", "newer") });
-    const flushed = model.flush();
-    replies[1].resolve(response(latest));
-    store.set(source, latest);
-    await expect(flushed).resolves.toEqual(latest.revision);
-    expect(state()).toEqual({ status: "idle" });
-    expect(value()?.code).toBe("newer");
-  });
-
-  it.each(["response", "snapshot"] as const)(
-    "confirms a reset when %s arrives first without opening a stream",
-    async (first) => {
-      const { store, source, sent, replies, edit, model } = setup();
-      edit("sent");
-      const flushed = model.flush();
-      await vi.advanceTimersByTimeAsync(0);
-      store.set(source, null);
-      const accepted = withCells(document(), { c1: cell("c1", "sent") });
-      const later = withCells(accepted, { c2: cell("c2", "remote") });
-      if (first === "response") {
-        replies[0].resolve(response(accepted));
-      } else {
-        store.set(source, later);
-      }
-      await vi.advanceTimersByTimeAsync(0);
-      expect(store.get(model.syncStateAtom)).toEqual({
-        status: first === "response" ? "confirming" : "sending",
-      });
-      if (first === "response") {
-        store.set(source, later);
-      } else {
-        replies[0].resolve(response(accepted));
-      }
-      await expect(flushed).resolves.toEqual(later.revision);
-      expect(sent).toHaveBeenCalledOnce();
-      expect(store.get(model.syncStateAtom)).toEqual({ status: "idle" });
-    },
-  );
-
-  it("retries a lost response with the captured body and key, preserving subsequent typing", async () => {
-    const { store, source, sent, replies, edit, model, value } = setup();
-    edit("sent");
-    const flushed = model.flush();
-    await vi.advanceTimersByTimeAsync(0);
-    const accepted = withCells(document(), {
-      c1: cell("c1", "sent", { etag: "accepted" }),
-    });
-    store.set(source, accepted);
-    edit("newer");
-    replies[0].reject(new Error("response lost"));
-    await vi.advanceTimersByTimeAsync(500);
-    expect(sent).toHaveBeenCalledTimes(2);
-    const original = sent.mock.calls[0][0];
-    const retry = sent.mock.calls[1][0];
-    expect(retry.idempotencyKey).toBe(original.idempotencyKey);
-    expect(retry.changes).toBe(original.changes);
-    replies[1].resolve(response(accepted));
-    await vi.advanceTimersByTimeAsync(0);
-    expect(sent).toHaveBeenCalledTimes(3);
-    expect(sent.mock.calls[2][0].idempotencyKey).not.toBe(
-      original.idempotencyKey,
-    );
-    const latest = withCells(accepted, { c1: cell("c1", "newer") });
-    store.set(source, latest);
-    replies[2].resolve(response(latest));
-    await expect(flushed).resolves.toEqual(latest.revision);
-    expect(value()?.code).toBe("newer");
-  });
-
-  it("exposes conflicts and only retries explicitly against a fresh confirmed revision", async () => {
-    const { store, source, sent, replies, edit, model, state, value } = setup();
-    edit("local");
-    const flushed = model.flush();
-    const rejected = expectFailure(flushed, "conflict");
-    await vi.advanceTimersByTimeAsync(0);
-    const remote = withCells(document(), {
-      c1: cell("c1", "remote", { etag: "remote" }),
-    });
-    const problem: Protocol.Problem = {
-      type: "tag:marimo.io,2026:host/conflict",
-      title: "conflict",
-      status: 409,
-      edit: {
-        change: 0,
-        cell: remote.cells.get("c1")!,
-        document: remote.revision,
-      },
-    };
-    replies[0].resolve({ ok: false, status: 409, problem });
-    await rejected;
-    expect(state()).toMatchObject({
-      status: "error",
-      problem,
-      retryable: true,
-    });
-    await expect(model.retry()).rejects.toThrow("Wait for the host");
-    edit("updated local");
-    store.set(source, remote);
-    await vi.advanceTimersByTimeAsync(2000);
-    expect(sent).toHaveBeenCalledOnce();
-    expect(value()?.code).toBe("updated local");
-    const retry = model.retry();
-    await vi.advanceTimersByTimeAsync(0);
-    expect(sent.mock.calls[1][0].changes[0]).toMatchObject({
-      base_etag: "remote",
-      cell: { code: "updated local" },
-    });
-    const accepted = withCells(remote, { c1: cell("c1", "updated local") });
-    replies[1].resolve(response(accepted));
-    store.set(source, accepted);
-    await expect(retry).resolves.toEqual(accepted.revision);
+    expect(status()).toMatchObject({ status: "error" });
   });
 
-  it("retains a draft after remote deletion and never sends the other edits alone", async () => {
-    const { store, source, model, sent, replies, edit } = setup();
-    edit("keep this");
-    const flushed = model.flush();
-    const rejected = expectFailure(flushed, "removed");
-    await vi.advanceTimersByTimeAsync(0);
-    const removed = withCells(document(), { c1: null });
-    store.set(source, removed);
-    replies[0].resolve({
-      ok: false,
-      status: 409,
-      problem: {
-        type: "tag:marimo.io,2026:host/conflict",
-        title: "removed",
-        status: 409,
-        edit: { change: 0, cell: null, document: removed.revision },
-      },
-    });
-    await rejected;
-    store.set(model.editAtom, (tx) => tx.setCode("c2", "other edit"));
-    await expect(model.retry()).rejects.toThrow("unavailable");
-    expect(sent).toHaveBeenCalledOnce();
-    store.set(source, withCells(removed, { c1: cell("c1", "restored") }));
-    expect(store.get(model.cellAtom("c1"))?.code).toBe("keep this");
-  });
-
-  it("bounds retries and never replays an uncertain write after receipt expiry", async () => {
-    const { sent, replies, edit, model, state } = setup();
-    edit("local");
-    const flushed = model.flush();
-    const rejected = expectFailure(flushed, "offline");
-    await vi.advanceTimersByTimeAsync(0);
-    replies[0].reject(new Error("offline"));
-    await vi.advanceTimersByTimeAsync(500);
-    replies[1].reject(new Error("offline"));
-    await vi.advanceTimersByTimeAsync(1000);
-    replies[2].reject(new Error("offline"));
-    await rejected;
-    expect(state()).toMatchObject({ status: "error", retryable: true });
-    await vi.advanceTimersByTimeAsync(60_000);
-    await expect(model.retry()).rejects.toThrow("retry window expired");
-    expect(sent).toHaveBeenCalledTimes(3);
-    expect(state()).toMatchObject({ status: "error", retryable: false });
-  });
-
-  it("times out a hung attempt, aborts it, and retries the same request", async () => {
-    const { store, source, sent, replies, edit, model } = setup();
-    edit("local");
-    const flushed = model.flush();
-    await vi.advanceTimersByTimeAsync(10_500);
-    expect(sent).toHaveBeenCalledTimes(2);
-    expect(sent.mock.calls[0][0].signal.aborted).toBe(true);
-    expect(sent.mock.calls[1][0].idempotencyKey).toBe(
-      sent.mock.calls[0][0].idempotencyKey,
-    );
-    const accepted = withCells(document(), { c1: cell("c1", "local") });
-    replies[1].resolve(response(accepted));
-    store.set(source, accepted);
-    await expect(flushed).resolves.toEqual(accepted.revision);
-  });
-
-  it("aborts before the debounce without sending any edits", async () => {
-    const { sent, edit, model, controller } = setup();
-    edit("local");
-    controller.abort();
-    await vi.advanceTimersByTimeAsync(1000);
-    expect(sent).not.toHaveBeenCalled();
-    expect(vi.getTimerCount()).toBe(0);
-    await expect(model.flush()).rejects.toThrow("aborted");
-  });
-
-  it.each(["request", "confirmation", "retry"] as const)(
-    "aborts during %s without leaving work or subscriptions",
-    async (phase) => {
-      const {
-        store,
-        source,
-        sent,
-        replies,
-        edit,
-        model,
-        controller,
-        unmounted,
-      } = setup();
-      edit("local");
-      const flushed = model.flush();
-      const reason = new Error("Editing session ended");
-      const rejected = expectAbort(flushed, reason);
-      await vi.advanceTimersByTimeAsync(0);
-      if (phase === "confirmation") {
-        replies[0].resolve(
-          response(withCells(document(), { c1: cell("c1", "local") })),
-        );
-      }
-      if (phase === "retry") {
-        replies[0].reject(new Error("offline"));
-      }
-      await vi.advanceTimersByTimeAsync(0);
-      controller.abort(reason);
-      await rejected;
-      expect(unmounted).toHaveBeenCalledOnce();
-      expect(sent).toHaveBeenCalledOnce();
-      store.set(source, withCells(document(), { c1: cell("c1", "later") }));
-      edit("after disposal");
-      expect(vi.getTimerCount()).toBe(0);
-      await expect(model.flush()).rejects.toBe(reason);
-      await expect(model.retry()).rejects.toBe(reason);
-    },
-  );
-
   it("ignores a late response and source update after its lifetime ends", async () => {
     const {
       store,
@@ -458,19 +144,8 @@ describe("document synchronization", () => {
     expect(vi.getTimerCount()).toBe(0);
   });
 
-  it("rejects a queued flush when aborted before submission", async () => {
-    const { model, edit, sent, controller } = setup();
-    edit("local");
-    const reason = new Error("Editing session ended");
-    const rejected = expectAbort(model.flush(), reason);
-    controller.abort(reason);
-    await rejected;
-    expect(sent).not.toHaveBeenCalled();
-    expect(vi.getTimerCount()).toBe(0);
-  });
-
   it("aborts an in-flight edit when notebook identity changes", async () => {
-    const { store, source, sent, edit, model, state } = setup();
+    const { store, source, sent, edit, model, status } = setup();
     edit("local");
     const flushed = model.flush();
     const rejected = expectFailure(flushed, "notebook changed");
@@ -478,6 +153,6 @@ describe("document synchronization", () => {
     store.set(source, document("n2"));
     await rejected;
     expect(sent.mock.calls[0][0].signal.aborted).toBe(true);
-    expect(state()).toMatchObject({ status: "error", retryable: false });
+    expect(status()).toMatchObject({ status: "error", retryable: false });
   });
 });

package/src/core/document/__tests__/protocol-fixtures.ts

@@ -0,0 +1,38 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { readFileSync } from "node:fs";
+import NodeUrl from "node:url";
+import type * as Protocol from "@marimo-team/client/protocol";
+import { invariant } from "@/utils/invariant";
+import { fixtureEvents } from "../../host/__tests__/fixtures";
+import type { Document } from "../../host/resources/document";
+
+export function protocolFixture(name: string): unknown {
+  return JSON.parse(
+    readFileSync(
+      new NodeUrl.URL(
+        `../../../../../protocols/host/fixtures/${name}`,
+        import.meta.url,
+      ),
+      "utf8",
+    ),
+  );
+}
+
+export function initialDocument(): Document {
+  const cells = new Map<Protocol.CellId, Protocol.Cell>();
+  let revision: Protocol.Document | undefined;
+  for (const event of fixtureEvents("notebook-events.sse")) {
+    if (event.event === "ready") {
+      break;
+    }
+    if (event.event === "cell") {
+      cells.set(event.data.cell.id, event.data.cell);
+    }
+    if (event.event === "document") {
+      revision = event.data.document;
+    }
+  }
+  invariant(revision !== undefined, "Fixture has no document");
+  return { revision, cells };
+}