@marimo-team/islands 0.25.3-dev143 → 0.25.3-dev145

package/dist/{data-grid-overlay-editor-CBsr8Yo0.js → data-grid-overlay-editor-Bw6eRAP6.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-i7BEAfhs.js";
+import { a as o, i as s, n as c, r as l } from "./glide-data-editor-C5McBx2B.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-B_9o6DdV.js → feedback-button-DXCqy1zU.js}

@@ -5,12 +5,12 @@ import { t as i } from "./compiler-runtime-CldRdSsv.js";
 import { t as a } from "./copy-icon-C1trdvVt.js";
 import { H as o, K as s, Lt as c, Ot as l, fn as u, h as d, i as f, n as p, q as m, zt as h } from "./error-entries-CmFDQ9CA.js";
 import { b as g } from "./select-CkF_GBxO.js";
-import { n as ee, t as te } from "./globals-BDzA_Re9.js";
+import { n as ee, t as te } from "./globals-axkELZAO.js";
 import { t as _ } from "./jsx-runtime-3BD1kT0s.js";
 import { C as v, _ as ne, i as y } from "./useTheme-Bq9pi_vz.js";
 import { a as re, i as ie, n as ae, r as oe } from "./dialog-DgeqyrEZ.js";
 import { t as se } from "./useAsyncData-BmVgnMP5.js";
-import { t as ce } from "./code-visibility-CAgcNzoX.js";
+import { t as ce } from "./code-visibility-ClBVaJxO.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-i7BEAfhs.js → glide-data-editor-C5McBx2B.js}

@@ -6,7 +6,7 @@ import { i as s, n as c, r as l } from "./copy-icon-C1trdvVt.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-CkF_GBxO.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-GWcGCcxE.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-Dz_F4pAY.js";
-import { n as ne, t as re } from "./ErrorBoundary-BRBKqg2U.js";
+import { n as ne, t as re } from "./ErrorBoundary-wSOY07qE.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-D9_-zSg-.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-CBsr8Yo0.js")), ss = 0;
+var is = /* @__PURE__ */ e(_r(), 1), as = /* @__PURE__ */ e(xr(), 1), os = K.lazy(async () => await import("./data-grid-overlay-editor-Bw6eRAP6.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-D9WjQlOL.js")), Us = {
+var Hs = K.lazy(async () => await import("./number-overlay-editor-bp_Nz8bW.js")), Us = {
 	getAccessibilityString: (e) => e.data?.toString() ?? "",
 	kind: W.Number,
 	needsHover: (e) => e.hoverEffect === !0,

package/dist/{globals-BDzA_Re9.js → globals-axkELZAO.js}

@@ -1,6 +1,6 @@
 import { m as e } from "./tooltip-CJ4Rqasp.js";
 import { _ as t } from "./useTheme-Bq9pi_vz.js";
-import { r as n } from "./code-visibility-CAgcNzoX.js";
+import { r as n } from "./code-visibility-ClBVaJxO.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 T, F as E, G as D, I as O, J as k, K as A, L as j, P as M, R as N,
 import { a as oe, d as se, i as ce, m as le, n as ue, o as de, p as fe, r as pe, t as me } from "./tooltip-CJ4Rqasp.js";
 import { $ as he, A as ge, At as _e, B as ve, Bt as ye, D as be, Dt as xe, G as Se, H as Ce, Ht as we, It as Te, J as Ee, Jt as De, Kt as Oe, M as ke, Mt as Ae, N as je, Nt as Me, O as Ne, Ot as Pe, P as Fe, Q as Ie, S as Le, Tt as Re, V as ze, Vt as Be, Wt as Ve, X as He, Xt as Ue, Y as We, Yt as Ge, _ as Ke, _n as qe, _t as Je, an as Ye, b as Xe, cn as Ze, ct as Qe, dn as $e, dt as et, en as tt, f as nt, ft as rt, g as it, gn as at, gt as ot, h as st, it as ct, jt as lt, k as ut, kt as dt, ln as ft, m as pt, mn as mt, nn as ht, o as gt, p as _t, pn as vt, pt as yt, qt as bt, rn as xt, rt as St, s as Ct, tn as wt, u as Tt, un as Et, v as Dt, xt as Ot, y as kt, z as At } from "./error-entries-CmFDQ9CA.js";
 import { D as jt, E as Mt, O as Nt, S as Pt, T as Ft, _ as It, a as Lt, c as Rt, d as zt, f as Bt, g as Vt, h as Ht, i as Ut, l as Wt, m as Gt, n as Kt, o as qt, p as Jt, r as Yt, s as Xt, t as Zt, u as Qt, v as $t, w as en, x as tn, y as nn } from "./spec-DiSh_qJC.js";
-import { $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, X as Xn, Xt as Zn, Y as Qn, Yt as $n, Zt as er, _ as tr, _t as nr, an as rr, at as ir, b as ar, c as or, cn as sr, ct as cr, d as lr, dn as ur, dt as dr, en as fr, et as pr, f as mr, fn as hr, ft as gr, g as _r, gt as vr, h as yr, hn as br, ht as xr, in as Sr, it as Cr, j as wr, jt as Tr, k as Er, kt as Dr, ln as Or, lt as kr, m as Ar, mn as jr, mt as Mr, nn as Nr, nt as Pr, ot as Fr, p as Ir, pn as Lr, pt as Rr, q as zr, qt as Br, r as Vr, rn as Hr, rt as Ur, sn as Wr, st as Gr, t as Kr, tn as qr, tt as Jr, u as Yr, un as Xr, ut as Zr, v as Qr, vt as $r, w as ei, wt as ti, x as ni, y as ri, yt as ii, z as ai, zt as oi } from "./common-BovIV1xq.js";
+import { $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, X as Xn, Xt as Zn, Y as Qn, Yt as $n, Zt as er, _ as tr, _t as nr, an as rr, at as ir, b as ar, c as or, cn as sr, ct as cr, d as lr, dn as ur, dt as dr, en as fr, et as pr, f as mr, fn as hr, ft as gr, g as _r, gt as vr, h as yr, hn as br, ht as xr, in as Sr, it as Cr, j as wr, jt as Tr, k as Er, kt as Dr, ln as Or, lt as kr, m as Ar, mn as jr, mt as Mr, nn as Nr, nt as Pr, ot as Fr, p as Ir, pn as Lr, pt as Rr, q as zr, qt as Br, r as Vr, rn as Hr, rt as Ur, sn as Wr, st as Gr, t as Kr, tn as qr, tt as Jr, u as Yr, un as Xr, ut as Zr, v as Qr, vt as $r, w as ei, wt as ti, x as ni, y as ri, yt as ii, z as ai, zt as oi } from "./common-CUexlJOX.js";
 import { c as si, i as ci, n as li, o as ui, t as di } from "./useLifecycle-B5BX921H.js";
 import { t as fi } from "./check-SpOMoCLP.js";
 import { A as pi, C as mi, D as hi, E as gi, M as _i, O as vi, S as yi, T as bi, a as xi, b as Si, c as Ci, i as wi, l as Ti, n as Ei, o as Di, r as Oi, s as ki, t as Ai, w as ji, x as Mi } from "./select-CkF_GBxO.js";
@@ -15,8 +15,8 @@ import { B as Ni, C as Pi, J as Fi, Ot as Ii, S as Li, W as Ri, X as zi, Y as Bi
 import { C as fa, _ as pa, a as ma, b as ha, c as ga, f as _a, h as va, m as ya, p as ba, s as xa, u as Sa, x as Ca, y as wa } from "./toDate-DGvRHwTk.js";
 import { a as Ta, c as Ea, d as Da, f as Oa, i as ka, l as Aa, n as ja, o as Ma, r as Na, s as Pa, t as Fa } from "./process-output-Bw-vzyoy.js";
 import { a as Ia, c as La, d as Ra, i as za, l as Ba, r as Va, u as Ha } from "./glide-utils-Dz_F4pAY.js";
-import { n as Ua, t as Wa } from "./ErrorBoundary-BRBKqg2U.js";
-import { n as Ga, t as Ka } from "./globals-BDzA_Re9.js";
+import { n as Ua, t as Wa } from "./ErrorBoundary-wSOY07qE.js";
+import { n as Ga, t as Ka } from "./globals-axkELZAO.js";
 import { t as qa } from "./react-dom-DUmH0GXv.js";
 import { t as Ja } from "./jsx-runtime-3BD1kT0s.js";
 import { B as Ya, C as H, Ct as Xa, D as Za, Dt as Qa, E as $a, Et as eo, F as U, G as to, H as no, I as ro, L as io, M as W, N as ao, O as oo, P as so, Q as co, R as lo, S as G, St as uo, Tt as fo, U as po, W as mo, Y as ho, Z as go, _ as _o, _t as vo, a as yo, b as bo, bt as xo, c as So, d as Co, f as wo, g as To, h as Eo, i as Do, j as K, k as Oo, l as ko, m as Ao, n as jo, o as Mo, p as No, r as Po, s as Fo, u as Io, ut as Lo, v as Ro, w as zo, wt as Bo, x as Vo, xt as Ho, y as Uo, yt as Wo } from "./use-restore-focus-CmGwRNId.js";
@@ -39,7 +39,7 @@ import { t as Ps } from "./useAsyncData-BmVgnMP5.js";
 import { i as Fs, n as Is, r as Ls } from "./formats-CCxaLPNs.js";
 import { D as Rs, O as zs } from "./vega-loader.browser-B9Pz0EGP.js";
 import { a as Bs, n as Vs } from "./loader-DOVB0Syl.js";
-import { c as Hs, d as Us, i as Ws, l as Gs, o as Ks, s as qs, t as Js, u as Ys } from "./code-visibility-CAgcNzoX.js";
+import { c as Hs, d as Us, i as Ws, l as Gs, o as Ks, s as qs, t as Js, u as Ys } from "./code-visibility-ClBVaJxO.js";
 import { t as Xs } from "./useDeepCompareMemoize-Ch_AeGu6.js";
 import { t as Zs } from "./esm-D2gTsXEV.js";
 //#region ../node_modules/.pnpm/iconify-icon@2.3.0/node_modules/iconify-icon/dist/iconify-icon.mjs
@@ -10635,7 +10635,7 @@ function WC(e, t) {
 }
 //#endregion
 //#region src/plugins/impl/DataEditorPlugin.tsx
-var GC = J.lazy(() => import("./glide-data-editor-i7BEAfhs.js").then((e) => e.t)), KC = DS("marimo-data-editor", { cssStyles: [XS] }).withData(W({
+var GC = J.lazy(() => import("./glide-data-editor-C5McBx2B.js").then((e) => e.t)), KC = DS("marimo-data-editor", { cssStyles: [XS] }).withData(W({
 	initialValue: W({ edits: G(W({
 		rowIdx: K(),
 		columnId: U(),
@@ -30407,7 +30407,7 @@ function WR(e) {
 }
 //#endregion
 //#region src/components/editor/renderers/slides-layout/slides-layout.tsx
-var GR = J.lazy(() => import("./reveal-component-BxP2jlPx.js")), KR = (e) => {
+var GR = J.lazy(() => import("./reveal-component-FoSlb0Gk.js")), KR = (e) => {
 	let t = (0, X.c)(33), { layout: n, setLayout: r, cells: i, mode: a } = e, o = is(pa), s = a === "read" || o, c = is(Ke) > 1, [l, u] = (0, J.useState)(null), d;
 	t[0] !== i || t[1] !== n ? (d = HP(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-D9WjQlOL.js → number-overlay-editor-bp_Nz8bW.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-i7BEAfhs.js";
+import { a as n } from "./glide-data-editor-C5McBx2B.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-BxP2jlPx.js → reveal-component-FoSlb0Gk.js}

@@ -4,14 +4,14 @@ import { t as o } from "./react-sHtZdjeP.js";
 import { t as s } from "./compiler-runtime-CldRdSsv.js";
 import { m as c, t as l } from "./tooltip-CJ4Rqasp.js";
 import { k as u } from "./error-entries-CmFDQ9CA.js";
-import { $ as d, Q as f, Z as p, an as m, i as h, l as g, ln as _, n as v, on as y, r as b, t as x, u as S } from "./common-BovIV1xq.js";
+import { $ as d, Q as f, Z as p, an as m, i as h, l as g, ln as _, n as v, on as y, r as b, t as x, u as S } from "./common-CUexlJOX.js";
 import { M as C } from "./select-CkF_GBxO.js";
 import { J as ee } from "./dropdown-menu-GWcGCcxE.js";
 import { _ as w } from "./toDate-DGvRHwTk.js";
 import { t as T } from "./jsx-runtime-3BD1kT0s.js";
 import { q as E } from "./use-restore-focus-CmGwRNId.js";
 import { A as D, C as O, b as k } from "./useTheme-Bq9pi_vz.js";
-import { a as A, n as te, t as ne } from "./code-visibility-CAgcNzoX.js";
+import { a as A, n as te, t as ne } from "./code-visibility-ClBVaJxO.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-dev143",
+  "version": "0.25.3-dev145",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/__tests__/module-entry.test.ts

@@ -17,16 +17,28 @@ function reports(file: string, source: string): boolean {
 }
 
 it.each([
-  ["core/websocket/state.ts", "@/core/host", false],
-  ["core/websocket/state.ts", "../host", false],
-  ["core/websocket/state.ts", "@/core/document", false],
-  ["core/host/replica.ts", "./resources/document", false],
-  ["core/host/replica.ts", "@/core/host/backend", false],
-  ["core/websocket/__tests__/a.test.ts", "../../host/replica", false],
-  ["core/websocket/fixtures.ts", "../host/__tests__/fixtures", false],
-  ["core/websocket/state.ts", "@/core/host/replica", true],
-  ["core/websocket/state.ts", "../host/resources/document", true],
-  ["core/websocket/state.ts", "../document/hooks", true],
+  ["components/editor.tsx", "@/core/notebook", false],
+  ["components/editor.tsx", "@/core/notebook/attachments", true],
+  ["core/notebook/index.ts", "./attachments", false],
+  ["core/notebook/index.ts", "./document/hooks", true],
+  ["core/session/active-notebook.ts", "@/core/notebook/replica", false],
+  ["core/session/active-notebook.ts", "../notebook/replica", false],
+  ["core/session/active-notebook.ts", "@/core/notebook/document", false],
+  ["core/notebook/replica/replica.ts", "./resources/document", false],
+  [
+    "core/notebook/replica/replica.ts",
+    "@/core/notebook/replica/backend",
+    false,
+  ],
+  ["core/session/__tests__/a.test.ts", "../../notebook/replica/replica", false],
+  ["core/session/fixtures.ts", "../notebook/replica/__tests__/fixtures", false],
+  ["core/session/active-notebook.ts", "@/core/notebook/replica/replica", true],
+  [
+    "core/session/active-notebook.ts",
+    "../notebook/replica/resources/document",
+    true,
+  ],
+  ["core/session/active-notebook.ts", "../notebook/document/hooks", true],
 ])("from %s, importing %s reports %s", (file, source, expected) => {
   expect(reports(file, source)).toBe(expected);
 });

package/src/__tests__/mount.test.ts

@@ -7,7 +7,7 @@ import { kioskModeAtom } from "@/core/mode";
 import { connectionAtom } from "@/core/network/connection";
 import { store } from "@/core/state/jotai";
 import { isStaticNotebook } from "@/core/static/static-state";
-import { ConnectionState } from "@/core/websocket/types";
+import { ConnectionState } from "@/core/session/types";
 import { pairConfigAtom } from "@/core/config/pair";
 import { PAIR_CONFIG } from "./fixtures/pair-config";
 import { mount, visibleForTesting } from "../mount";

package/src/__tests__/{host-imports.test.ts → replica-imports.test.ts}

@@ -8,31 +8,31 @@ import NodeUrl from "node:url";
 import { expect, it } from "vitest";
 import { z } from "zod";
 
-it("enforces host dependencies for runtime and type imports", () => {
+it("enforces replica dependencies for runtime and type imports", () => {
   const frontend = NodeUrl.fileURLToPath(
-    new NodeUrl.URL("../../", import.meta.url),
+    new NodeUrl.URL("../..", import.meta.url),
   );
   const directory = NodeFs.mkdtempSync(
-    NodePath.join(NodeOs.tmpdir(), "host-imports-"),
+    NodePath.join(NodeOs.tmpdir(), "replica-imports-"),
   );
   const files = {
-    "src/core/host/allowed.ts": `
+    "src/core/notebook/replica/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";
+      export * from "@/core/notebook/replica/events";
       type Event = import("./events").NotebookEvent;
       void import("./protocol");
     `,
-    "src/core/host/protocol.ts": `
+    "src/core/notebook/replica/protocol.ts": `
       import type { NotificationMessage as A } from "../kernel/messages";
       import { type NotificationMessage as B } from "@/core/kernel/messages";
       import { NotificationMessage as C } from "../kernel/messages";
       import type { NotificationPayload } from "../kernel/messages";
     `,
-    "src/core/host/forbidden.ts": `
+    "src/core/notebook/replica/forbidden.ts": `
       import { useEffect } from "react";
       import type { NotificationMessage } from "../kernel/messages";
       export * from "../kernel/messages";
@@ -44,10 +44,10 @@ it("enforces host dependencies for runtime and type imports", () => {
       import "./__tests__/allowed";
       import "./allowed.test";
     `,
-    "src/core/host/__tests__/allowed.ts": `import { useEffect } from "react";`,
-    "src/core/host/allowed.test.ts": `import { useEffect } from "react";`,
-    "src/core/host/allowed.spec.ts": `import { useEffect } from "react";`,
-    "src/core/websocket/allowed.ts": `import { useEffect } from "react";`,
+    "src/core/notebook/replica/__tests__/allowed.ts": `import { useEffect } from "react";`,
+    "src/core/notebook/replica/allowed.test.ts": `import { useEffect } from "react";`,
+    "src/core/notebook/replica/allowed.spec.ts": `import { useEffect } from "react";`,
+    "src/core/session/allowed.ts": `import { useEffect } from "react";`,
   };
   try {
     for (const [path, source] of Object.entries(files)) {

package/src/{core/attachments/__tests__/toast.test.tsx → components/editor/__tests__/agent-toast.test.tsx}

@@ -5,7 +5,7 @@ import { act, render, renderHook } from "@testing-library/react";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { Toaster } from "@/components/ui/toaster";
 import { clearToasts, toast, useToast } from "@/components/ui/use-toast";
-import { agentToast } from "../toast";
+import { agentToast } from "../agent-toast";
 
 describe("agent notifications", () => {
   beforeEach(() => {

package/src/components/editor/actions/useRestartKernel.tsx

@@ -5,7 +5,7 @@ import { useImperativeModal } from "@/components/modal/ImperativeModal";
 import { AlertDialogDestructiveAction } from "@/components/ui/alert-dialog";
 import { connectionAtom } from "@/core/network/connection";
 import { useRequestClient } from "@/core/network/requests";
-import { ConnectionState } from "@/core/websocket/types";
+import { ConnectionState } from "@/core/session/types";
 import { reloadSafe } from "@/utils/reload-safe";
 
 export function useRestartKernel() {

package/src/components/editor/alerts/__tests__/connection-notice.test.tsx

@@ -11,7 +11,7 @@ import { AppConfigSchema } from "@/core/config/config-schema";
 import { kernelStartupErrorAtom } from "@/core/errors/state";
 import { connectionAtom } from "@/core/network/connection";
 import { sandboxAtom, sandboxSyncAtom } from "@/core/packages/sandbox-state";
-import { WebSocketClosedReason, ConnectionState } from "@/core/websocket/types";
+import { WebSocketClosedReason, ConnectionState } from "@/core/session/types";
 import { chromeAtom } from "../../chrome/state";
 import { runtimeDetailsExpandedAtom } from "../../chrome/panels/runtime-details-state";
 import { ConnectionNotice } from "../connection-notice";

package/src/components/editor/alerts/connection-notice.tsx

@@ -8,7 +8,7 @@ import type { AppConfig } from "@/core/config/config-schema";
 import { connectionAtom } from "@/core/network/connection";
 import { useConnectionNotice } from "@/core/network/useConnectionNotice";
 import { sandboxAtom } from "@/core/packages/sandbox-state";
-import { ConnectionState } from "@/core/websocket/types";
+import { ConnectionState } from "@/core/session/types";
 import { useInterval } from "@/hooks/useInterval";
 import { cn } from "@/utils/cn";
 import { runtimeDetailsExpandedAtom } from "../chrome/panels/runtime-details-state";

package/src/components/editor/app-container.tsx

@@ -8,7 +8,7 @@ import {
   type ConnectionStatus,
   WebSocketClosedReason,
   ConnectionState,
-} from "@/core/websocket/types";
+} from "@/core/session/types";
 import { cn } from "@/utils/cn";
 import { DynamicFavicon } from "./dynamic-favicon";
 import { StatusOverlay } from "./header/status";

package/src/components/editor/boundary/__tests__/ErrorBoundary.test.tsx

@@ -14,7 +14,7 @@ import { requestClientAtom } from "@/core/network/requests";
 import type { EnvironmentInfo } from "@/core/network/types";
 import { filenameAtom } from "@/core/saving/file-state";
 import { store } from "@/core/state/jotai";
-import { ConnectionState } from "@/core/websocket/types";
+import { ConnectionState } from "@/core/session/types";
 import { ErrorBoundary } from "../ErrorBoundary";
 
 vi.mock("@/utils/copy", () => ({

package/src/components/editor/cell/CreateCellButton.tsx

@@ -16,8 +16,8 @@ import { MARKDOWN_INITIAL_HIDE_CODE } from "@/core/codemirror/language/languages
 import {
   getConnectionTooltip,
   isAppInteractionDisabled,
-} from "@/core/websocket/connection-utils";
-import type { ConnectionState } from "@/core/websocket/types";
+} from "@/core/session/connection-utils";
+import type { ConnectionState } from "@/core/session/types";
 import { cn } from "@/utils/cn";
 import { Tooltip } from "../../ui/tooltip";
 import { MarkdownIcon, PythonIcon } from "./code/icons";

package/src/components/editor/cell/DeleteButton.tsx

@@ -5,8 +5,8 @@ import type { RuntimeState } from "@/core/network/types";
 import {
   getConnectionTooltip,
   isAppInteractionDisabled,
-} from "@/core/websocket/connection-utils";
-import type { ConnectionState } from "@/core/websocket/types";
+} from "@/core/session/connection-utils";
+import type { ConnectionState } from "@/core/session/types";
 import { cn } from "@/utils/cn";
 import { Events } from "@/utils/events";
 import { Button } from "../../ui/button";

package/src/components/editor/cell/RunButton.tsx

@@ -5,8 +5,8 @@ import type { CellConfig, RuntimeState } from "@/core/network/types";
 import {
   getConnectionTooltip,
   isAppInteractionDisabled,
-} from "@/core/websocket/connection-utils";
-import type { ConnectionState } from "@/core/websocket/types";
+} from "@/core/session/connection-utils";
+import type { ConnectionState } from "@/core/session/types";
 import { renderShortcut } from "../../shortcuts/renderShortcut";
 import { ToolbarItem } from "./toolbar";
 

package/src/components/editor/cell/StopButton.tsx

@@ -3,8 +3,8 @@ import { SquareIcon } from "lucide-react";
 import type { JSX } from "react";
 import { useRequestClient } from "@/core/network/requests";
 import type { RuntimeState } from "@/core/network/types";
-import { isAppInteractionDisabled } from "@/core/websocket/connection-utils";
-import type { ConnectionState } from "@/core/websocket/types";
+import { isAppInteractionDisabled } from "@/core/session/connection-utils";
+import type { ConnectionState } from "@/core/session/types";
 import { Functions } from "@/utils/functions";
 import { renderShortcut } from "../../shortcuts/renderShortcut";
 import { ToolbarItem } from "./toolbar";

package/src/components/editor/cell/code/cell-editor.tsx

@@ -41,7 +41,7 @@ import { connectionAtom } from "@/core/network/connection";
 import { useRequestClient } from "@/core/network/requests";
 import { canUseRtc, isRtcEnabled } from "@/core/rtc/state";
 import { useSaveNotebook } from "@/core/saving/save-component";
-import { isAppConnecting } from "@/core/websocket/connection-utils";
+import { isAppConnecting } from "@/core/session/connection-utils";
 import type { Theme } from "@/theme/useTheme";
 import { cn } from "@/utils/cn";
 import { invariant } from "@/utils/invariant";

package/src/components/editor/chrome/components/__tests__/feedback-button.test.tsx

@@ -14,7 +14,7 @@ import { requestClientAtom } from "@/core/network/requests";
 import type { EnvironmentInfo } from "@/core/network/types";
 import { filenameAtom } from "@/core/saving/file-state";
 import { store } from "@/core/state/jotai";
-import { ConnectionState } from "@/core/websocket/types";
+import { ConnectionState } from "@/core/session/types";
 import * as copyModule from "@/utils/copy";
 import { FeedbackModal } from "../feedback-button";
 

package/src/components/editor/chrome/components/feedback-button.tsx

@@ -39,7 +39,7 @@ import { connectionAtom } from "@/core/network/connection";
 import { requestClientAtom } from "@/core/network/requests";
 import { filenameAtom } from "@/core/saving/file-state";
 import { store } from "@/core/state/jotai";
-import { ConnectionState } from "@/core/websocket/types";
+import { ConnectionState } from "@/core/session/types";
 import { useAsyncData } from "@/hooks/useAsyncData";
 import { useLocalStorage } from "@/hooks/useLocalStorage";
 import { cn } from "@/utils/cn";

package/src/components/editor/chrome/panels/__tests__/packages-panel.test.tsx

@@ -25,7 +25,7 @@ import {
 import { useInstallPackages } from "@/core/packages/useInstallPackage";
 import { sandboxAtom, sandboxSyncAtom } from "@/core/packages/sandbox-state";
 import { store } from "@/core/state/jotai";
-import { ConnectionState } from "@/core/websocket/types";
+import { ConnectionState } from "@/core/session/types";
 import PackagesPanel from "../packages-panel";
 import { PanelSectionProvider } from "../panel-context";
 import { RuntimeStatusToggle } from "../runtime-status-toggle";

package/src/components/editor/chrome/panels/__tests__/runtime-details.test.tsx

@@ -11,7 +11,7 @@ import { kernelStartupErrorAtom } from "@/core/errors/state";
 import { connectionAtom, startupProgressAtom } from "@/core/network/connection";
 import { requestClientAtom } from "@/core/network/requests";
 import { sandboxAtom } from "@/core/packages/sandbox-state";
-import { WebSocketClosedReason, ConnectionState } from "@/core/websocket/types";
+import { WebSocketClosedReason, ConnectionState } from "@/core/session/types";
 import PackagesPanel from "../packages-panel";
 import { PanelSectionProvider } from "../panel-context";
 import { RuntimeStatusToggle } from "../runtime-status-toggle";

package/src/components/editor/chrome/panels/__tests__/sandbox-recovery.test.tsx

@@ -24,7 +24,7 @@ import {
 } from "@/core/packages/sandbox-state";
 import { filenameAtom } from "@/core/saving/file-state";
 import { store } from "@/core/state/jotai";
-import { WebSocketClosedReason, ConnectionState } from "@/core/websocket/types";
+import { WebSocketClosedReason, ConnectionState } from "@/core/session/types";
 import { chromeAtom } from "../../state";
 import PackagesPanel from "../packages-panel";
 import { PanelSectionProvider } from "../panel-context";

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

@@ -14,17 +14,15 @@ 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 } from "@/core/attachments/state";
+import type { Attachment } from "@/core/notebook/attachments";
 import { pairConfigAtom } from "@/core/config/pair";
-import { createNotebookReplica } from "@/core/host/replica";
 import {
   type StableSessionId,
   stableSessionIdAtom,
 } from "@/core/kernel/session";
 import { API } from "@/core/network/api";
 import { connectionAtom } from "@/core/network/connection";
-import { notebookReplicaAtom } from "@/core/websocket/state";
-import { ConnectionState } from "@/core/websocket/types";
+import { ConnectionState } from "@/core/session/types";
 import { Deferred } from "@/utils/Deferred";
 import { AttachmentStatus } from "../footer-items/attachment-status";
 
@@ -32,6 +30,10 @@ vi.mock("@/components/ui/use-toast", () => ({ toast: vi.fn() }));
 vi.mock("@/core/network/api", () => ({ API: { post: vi.fn() } }));
 
 const attachmentsAtom = atom<Attachment[]>([]);
+vi.mock("@/core/session/active-notebook", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("@/core/session/active-notebook")>()),
+  activeNotebookReplicaAtom: atom(() => ({ attachmentsAtom })),
+}));
 
 const AGENT: Attachment = {
   id: "a1",
@@ -45,11 +47,6 @@ 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(notebookReplicaAtom, {
-    ...createNotebookReplica(store),
-    connectionAtom: atom({ state: ConnectionState.OPEN }),
-    attachmentsAtom,
-  });
   store.set(attachmentsAtom, attachments);
   store.set(stableSessionIdAtom, "stable/test" as StableSessionId);
   return {

package/src/components/editor/chrome/wrapper/footer-items/attachment-status.tsx

@@ -17,10 +17,10 @@ import {
 } from "@/components/ui/popover";
 import {
   type Attachment,
-  agentAttachmentsAtom,
   attachmentLabel,
-} from "@/core/attachments/state";
-import { agentToast } from "@/core/attachments/toast";
+  useNotebookAttachments,
+} from "@/core/notebook";
+import { agentToast } from "@/components/editor/agent-toast";
 import { pairConfigAtom } from "@/core/config/pair";
 import { stableSessionIdAtom } from "@/core/kernel/session";
 import { API } from "@/core/network/api";
@@ -29,7 +29,7 @@ import { FooterItem } from "../footer-item";
 
 export function AttachmentStatus() {
   const hostEnabled = useAtomValue(pairConfigAtom)?.hostEnabled;
-  const agents = useAtomValue(agentAttachmentsAtom);
+  const agents = useNotebookAttachments("agent");
   const [open, setOpen] = useState(false);
   const previous = useRef(new Set<string>());
   const automatic = useRef(false);

package/src/components/editor/chrome/wrapper/footer-items/backend-status.tsx

@@ -14,7 +14,7 @@ import {
   isAppConnected,
   isAppConnecting,
   isAppNotStarted,
-} from "@/core/websocket/connection-utils";
+} from "@/core/session/connection-utils";
 import { useAsyncData } from "@/hooks/useAsyncData";
 import { useInterval } from "@/hooks/useInterval";
 import { Strings } from "@/utils/strings";

package/src/components/editor/chrome/wrapper/footer-items/lsp-status.tsx

@@ -14,7 +14,7 @@ import type {
   LspRestartResponse,
 } from "@/core/network/types";
 import { isWasm } from "@/core/wasm/utils";
-import { isAppConnected } from "@/core/websocket/connection-utils";
+import { isAppConnected } from "@/core/session/connection-utils";
 import { useAsyncData } from "@/hooks/useAsyncData";
 import { useInterval } from "@/hooks/useInterval";
 

package/src/components/editor/chrome/wrapper/footer-items/machine-stats.tsx

@@ -10,7 +10,7 @@ import { connectionAtom } from "@/core/network/connection";
 import { useRequestClient } from "@/core/network/requests";
 import type { UsageResponse } from "@/core/network/types";
 import { isWasm } from "@/core/wasm/utils";
-import { ConnectionState } from "@/core/websocket/types";
+import { ConnectionState } from "@/core/session/types";
 import { useAsyncData } from "@/hooks/useAsyncData";
 import { useInterval } from "@/hooks/useInterval";
 import { cn } from "@/utils/cn";

package/src/components/editor/controls/Controls.tsx

@@ -20,8 +20,8 @@ import { SaveComponent } from "@/core/saving/save-component";
 import {
   getConnectionTooltip,
   isAppInteractionDisabled,
-} from "@/core/websocket/connection-utils";
-import { ConnectionState } from "@/core/websocket/types";
+} from "@/core/session/connection-utils";
+import { ConnectionState } from "@/core/session/types";
 import { cn } from "@/utils/cn";
 import { Functions } from "@/utils/functions";
 import {

package/src/components/editor/controls/__tests__/notebook-menu-dropdown.test.tsx

@@ -26,7 +26,7 @@ import { requestClientAtom } from "@/core/network/requests";
 import { filenameAtom } from "@/core/saving/file-state";
 import { store } from "@/core/state/jotai";
 import { isWasm } from "@/core/wasm/utils";
-import { ConnectionState } from "@/core/websocket/types";
+import { ConnectionState } from "@/core/session/types";
 import {
   DEFAULT_EXPORT_OPTIONS,
   exportOptionsAtom,

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

@@ -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 } from "@/core/attachments/state";
+import type { Attachment } from "@/core/notebook/attachments";
 import { exportedForTesting, notebookAtom } from "@/core/cells/cells";
 import {
   type CellOutputMessage,
@@ -25,7 +25,6 @@ import {
 } from "@/core/cells/error-report";
 import { pairConfigAtom } from "@/core/config/pair";
 import { notebookStateFromSession } from "@/core/cells/session";
-import { createNotebookReplica } from "@/core/host/replica";
 import type { MarimoError, OutputMessage } from "@/core/kernel/messages";
 import {
   type StableSessionId,
@@ -33,8 +32,7 @@ import {
 } from "@/core/kernel/session";
 import { API } from "@/core/network/api";
 import { connectionAtom } from "@/core/network/connection";
-import { notebookReplicaAtom } from "@/core/websocket/state";
-import { ConnectionState } from "@/core/websocket/types";
+import { ConnectionState } from "@/core/session/types";
 import { Deferred } from "@/utils/Deferred";
 import { HTTPError } from "@/utils/errors";
 import { MarimoErrorOutput } from "../../output/MarimoErrorOutput";
@@ -51,6 +49,10 @@ vi.mock("@/components/editor/chrome/wrapper/useOpenAiAssistant", () => ({
 const CELL_ID = cellId("test-cell");
 const STABLE_ID = "stable/test" as StableSessionId;
 const attachmentsAtom = atom<Attachment[]>([]);
+vi.mock("@/core/session/active-notebook", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("@/core/session/active-notebook")>()),
+  activeNotebookReplicaAtom: atom(() => ({ attachmentsAtom })),
+}));
 
 const AGENT: Attachment = {
   id: "a1",
@@ -97,11 +99,6 @@ function renderButton({
   const store = createStore();
   store.set(connectionAtom, { state: ConnectionState.OPEN });
   store.set(pairConfigAtom, { ...PAIR_CONFIG, hostEnabled: preview });
-  store.set(notebookReplicaAtom, {
-    ...createNotebookReplica(store),
-    connectionAtom: atom({ state: ConnectionState.OPEN }),
-    attachmentsAtom,
-  });
   store.set(attachmentsAtom, attachments);
   store.set(stableSessionIdAtom, stableId);
   const wrapper = ({ children }: { children: React.ReactNode }) => (