@marimo-team/islands 0.25.3-dev27 → 0.25.3-dev270

package/dist/{vennDiagram-4TSXK5OY-CeY6Z1xZ.js → vennDiagram-4TSXK5OY-Db8GtH1G.js}

@@ -3,7 +3,7 @@ import { t } from "./src-CA_m4ONl.js";
 import { n } from "./chunk-Y2CYZVJY-DKKS1VyV.js";
 import { $ as r, H as i, K as a, U as o, a as s, b as c, c as l, et as u, f as d, nt as f, tt as p, v as m, w as h, y as g } from "./chunk-DU6HZSFF-BwiyaNpg.js";
 import { t as _ } from "./rough.esm-CtV9AnV1.js";
-import { p as v } from "./mermaid-BA-Z6wGL.js";
+import { p as v } from "./mermaid-rd09e1JL.js";
 //#region ../node_modules/.pnpm/khroma@2.1.0/node_modules/khroma/dist/methods/transparentize.js
 var y = (e, t) => p(e, "a", -t), b = 1e-10;
 function x(e, t) {

package/dist/{wardleyDiagram-VM6X3IG4-Cxs9NtVi.js → wardleyDiagram-VM6X3IG4-DmIiC3FU.js}

@@ -2,7 +2,7 @@ import { i as e } from "./chunk-75Z2AOVW-D7gxIs2Q.js";
 import { n as t } from "./src-CA_m4ONl.js";
 import { n } from "./chunk-Y2CYZVJY-DKKS1VyV.js";
 import { D as r, H as i, K as a, U as o, a as s, b as c, c as l, v as u, w as d, x as f, y as p } from "./chunk-DU6HZSFF-BwiyaNpg.js";
-import { p as m } from "./mermaid-BA-Z6wGL.js";
+import { p as m } from "./mermaid-rd09e1JL.js";
 import { n as h } from "./mermaid-parser.core-DxuSfYwJ.js";
 import { t as g } from "./chunk-JWPE2WC7-DJvv1t8U.js";
 //#region ../node_modules/.pnpm/mermaid@11.17.2/node_modules/mermaid/dist/chunks/mermaid.core/wardleyDiagram-VM6X3IG4.mjs

package/dist/{xychartDiagram-S5SC5T6Z-DNWbvPK7.js → xychartDiagram-S5SC5T6Z-DS9OPrNq.js}

@@ -1,4 +1,4 @@
-import { t as e } from "./linear-Cnaq3Tfb.js";
+import { t as e } from "./linear-DWERh7eI.js";
 import { n as t } from "./ordinal-c7efuCSS.js";
 import { t as n } from "./range-BAIvbVHp.js";
 import { q as r } from "./cubic-OaEBhQPK.js";
@@ -9,7 +9,7 @@ import { n as s } from "./chunk-Y2CYZVJY-DKKS1VyV.js";
 import { D as c, H as l, K as u, U as d, a as f, b as p, c as m, f as h, v as g, w as _, y as v, z as y } from "./chunk-DU6HZSFF-BwiyaNpg.js";
 import "./chunk-PWAF6VOD-CQw5qATZ.js";
 import { t as b } from "./chunk-GMAD6QVW-BhaJx0X3.js";
-import { p as x } from "./mermaid-BA-Z6wGL.js";
+import { p as x } from "./mermaid-rd09e1JL.js";
 //#region ../node_modules/.pnpm/d3-scale@4.0.2/node_modules/d3-scale/src/band.js
 function S() {
 	var e = t().unknown(void 0), r = e.domain, i = e.range, o = 0, s = 1, c, l, u = !1, d = 0, f = 0, p = .5;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/islands",
-  "version": "0.25.3-dev27",
+  "version": "0.25.3-dev270",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -44,6 +44,7 @@
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
     "@glideapps/glide-data-grid": "6.0.4-alpha24",
+    "@glideapps/glide-data-grid-cells": "6.0.4-alpha24",
     "@hookform/resolvers": "^5.9.1",
     "@img-comparison-slider/react": "^8.0.2",
     "@internationalized/date": "^3.12.4",
@@ -52,6 +53,7 @@
     "@lezer/lr": "^1.4.10",
     "@lezer/markdown": "^1.7.2",
     "@lezer/python": "^1.1.19",
+    "@marimo-team/client": "workspace:*",
     "@marimo-team/codemirror-ai": "^0.3.10",
     "@marimo-team/codemirror-languageserver": "^2.0.1",
     "@marimo-team/codemirror-mcp": "^0.1.7",
@@ -63,7 +65,7 @@
     "@paralleldrive/cuid2": "^2.3.1",
     "@radix-ui/colors": "^3.0.0",
     "@radix-ui/react-icons": "~1.3.2",
-    "@radix-ui/react-use-controllable-state": "~1.2.6",
+    "@radix-ui/react-use-controllable-state": "~1.3.0",
     "@replit/codemirror-vim": "^6.4.0",
     "@revealjs/react": "^0.2.2",
     "@streamdown/math": "^1.0.2",
@@ -110,17 +112,14 @@
     "js-cookie": "^3.0.8",
     "katex": "^0.18.7",
     "lodash-es": "^4.18.1",
-    "loro-codemirror": "^0.3.3",
-    "loro-crdt": "^1.16.1",
     "lucide-react": "^0.577.0",
     "lz-string": "^1.5.0",
     "marked": "^15.0.12",
     "mermaid": "^11.17.2",
-    "partysocket": "1.3.0",
     "path-to-regexp": "^8.4.2",
     "plotly.js": "^3.7.0",
     "pyodide": "314.0.0",
-    "radix-ui": "1.6.7",
+    "radix-ui": "1.8.1",
     "react-arborist": "^3.16.0",
     "react-aria": "3.52.1",
     "react-aria-components": "1.21.1",
@@ -152,6 +151,7 @@
     "typescript-memoize": "^1.1.1",
     "use-acp": "0.2.6",
     "use-resize-observer": "^9.1.0",
+    "vega": "6.2.0",
     "vega-lite": "6.4.3",
     "vega-loader": "^5.1.3",
     "vega-parser": "^7.1.3",
@@ -184,8 +184,7 @@
     "storybook": "storybook dev -p 6006",
     "build-storybook": "storybook build",
     "sync-katex-css": "node --experimental-strip-types scripts/sync-katex-css.ts",
-    "codegen": "node --experimental-strip-types scripts/generate-host-protocol.ts",
-    "codegen:check": "node --experimental-strip-types scripts/generate-host-protocol.ts --check"
+    "doctor": "npx react-doctor@latest"
   },
   "peerDependencies": {
     "react": "^17 || ^18 || ^19",
@@ -194,10 +193,10 @@
   "devDependencies": {
     "@codecov/vite-plugin": "^1.9.1",
     "@csstools/postcss-light-dark-function": "^2.0.11",
-    "@playwright/test": "^1.63.0",
-    "@storybook/addon-docs": "^10.6.0",
-    "@storybook/addon-links": "^10.6.0",
-    "@storybook/react-vite": "^10.6.0",
+    "@playwright/test": "^1.64.0",
+    "@storybook/addon-docs": "^10.6.2",
+    "@storybook/addon-links": "^10.6.2",
+    "@storybook/react-vite": "^10.6.2",
     "@testing-library/jest-dom": "^7.0.1",
     "@testing-library/react": "^16.3.3",
     "@types/dompurify": "^3.2.0",
@@ -207,28 +206,26 @@
     "@types/react": "^19.3.0",
     "@types/react-dom": "^19.3.0",
     "@types/timestring": "^6.0.5",
-    "@vitejs/plugin-react": "^6.1.1",
+    "@vitejs/plugin-react": "^6.1.2",
     "@vitest/coverage-v8": "4.1.11",
     "blob-polyfill": "^7.0.20220408",
     "cross-env": "^7.0.3",
     "jsdom": "^24.1.3",
     "msw": "^2.15.0",
     "npm-run-all2": "^6.2.6",
-    "orval": "8.40.0",
     "oxc-transform-react": "0.145.0",
-    "oxfmt": "^0.68.0",
-    "oxlint": "^1.83.0",
-    "postcss": "^8.5.28",
+    "oxfmt": "^0.74.0",
+    "oxlint": "^1.88.0",
+    "postcss": "^8.5.29",
     "postcss-prefix-selector": "^2.2.1",
     "react": "^19.3.0",
     "react-dom": "^19.3.0",
-    "storybook": "^10.6.0",
+    "storybook": "^10.6.2",
     "stylelint": "^16.26.1",
     "stylelint-config-standard": "^36.0.1",
     "tailwindcss": "^4.3.3",
     "vega-typings": "^2.3.0",
-    "vite": "^8.3.0",
-    "vite-plugin-wasm": "^3.6.0",
+    "vite": "^8.3.4",
     "vitest": "^4.1.11",
     "yaml": "^2.9.1"
   }

package/src/__mocks__/document.tsx

@@ -0,0 +1,63 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { atom, type createStore, type PrimitiveAtom, Provider } from "jotai";
+import type { ReactNode } from "react";
+import {
+  createDocumentModel,
+  type DocumentModel,
+  DocumentProvider,
+} from "@/core/notebook/document";
+import { document as documentFixture } from "@/core/notebook/document/__tests__/fixtures";
+import type { Document } from "@/core/notebook/replica";
+import { fakeBackend } from "@/core/notebook/replica/__tests__/fixtures";
+import { activeDocumentModelAtom } from "@/core/session/active-notebook";
+
+/**
+ * A started document model over `document`, for components that edit cells.
+ * Setting `documentAtom` delivers a document as the host would.
+ */
+export function mockDocumentModel(
+  store: ReturnType<typeof createStore>,
+  document: Document | null = documentFixture(),
+): {
+  model: DocumentModel;
+  documentAtom: PrimitiveAtom<Document | null>;
+  stop: () => void;
+} {
+  const controller = new AbortController();
+  const documentAtom = atom(document);
+  const model = createDocumentModel({
+    store,
+    documentAtom,
+    backendAtom: atom(fakeBackend()),
+  });
+  model.start({ signal: controller.signal });
+  store.set(activeDocumentModelAtom, model);
+  return {
+    model,
+    documentAtom,
+    stop: () => {
+      controller.abort();
+      if (store.get(activeDocumentModelAtom) === model) {
+        store.set(activeDocumentModelAtom, null);
+      }
+    },
+  };
+}
+
+/** Provide `store` and `model` to a rendered hook or component. */
+export function DocumentWrapper({
+  store,
+  model,
+  children,
+}: {
+  store: ReturnType<typeof createStore>;
+  model: DocumentModel;
+  children?: ReactNode;
+}) {
+  return (
+    <Provider store={store}>
+      <DocumentProvider model={model}>{children}</DocumentProvider>
+    </Provider>
+  );
+}

package/src/__mocks__/executions.ts

@@ -0,0 +1,195 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+/** Executions as the host would report them, for tests that read cell status. */
+
+import type * as Protocol from "@marimo-team/client/protocol";
+import { atom, type createStore } from "jotai";
+import type { CellExecutionInputs } from "@/core/executions";
+import {
+  ConnectionState,
+  type ConnectionStatus,
+  type Execution,
+  type Executions,
+  type NotebookReplica,
+  type Results,
+} from "@/core/notebook/replica";
+import { activeNotebookReplicaAtom } from "@/core/session/active-notebook";
+
+type Store = ReturnType<typeof createStore>;
+
+const T0 = "2026-10-01T09:20:11Z";
+const T1 = "2026-10-01T09:20:12.500Z";
+
+let sequence = 0;
+
+function completed(
+  cellId: string,
+  overrides: Partial<Protocol.Execution> = {},
+): Protocol.Execution {
+  sequence += 1;
+  return {
+    id: `e${sequence}`,
+    run_id: "run-1",
+    runtime_id: "r1",
+    caused_by: null,
+    cell_id: cellId,
+    code: null,
+    code_fingerprint: "0f71456db2ea83f4",
+    depends_on: {},
+    status: "completed",
+    outcome: { kind: "value", display: null },
+    started_at: T0,
+    completed_at: T1,
+    ...overrides,
+  };
+}
+
+function mirror(records: Protocol.Execution[]): Executions {
+  const executions = new Map<Protocol.ExecutionId, Execution>();
+  const latest = new Map<Protocol.CellId, Protocol.ExecutionId>();
+  for (const record of records) {
+    if (record.cell_id !== null) {
+      // The host retains one execution per cell on the stream.
+      const previous = latest.get(record.cell_id);
+      if (previous !== undefined) {
+        executions.delete(previous);
+      }
+      latest.set(record.cell_id, record.id);
+    }
+    executions.set(record.id, {
+      record,
+      items: new Map(),
+      variables: new Map(),
+    });
+  }
+  return { runs: new Map(), executions, latest };
+}
+
+function results(records: Protocol.Execution[]): Results {
+  const results = new Map<Protocol.CellId, Protocol.Execution>();
+  for (const record of records) {
+    if (record.cell_id !== null && record.status === "completed") {
+      results.set(record.cell_id, record);
+    }
+  }
+  return results;
+}
+
+export const MockExecutions = {
+  T0,
+  T1,
+  completed,
+
+  /** A completed execution that took `elapsedMs`. */
+  took(cellId: string, elapsedMs: number): Protocol.Execution {
+    return completed(cellId, {
+      completed_at: new Date(Date.parse(T0) + elapsedMs).toISOString(),
+    });
+  },
+
+  errored(cellId: string): Protocol.Execution {
+    return completed(cellId, {
+      outcome: {
+        kind: "error",
+        error: {
+          kind: "exception",
+          message: "boom",
+          name: "ValueError",
+          traceback: null,
+          source: "marimo",
+          severity: "error",
+          range: null,
+          related: [],
+        },
+      },
+    });
+  },
+
+  interrupted(cellId: string): Protocol.Execution {
+    return completed(cellId, { outcome: { kind: "interrupted" } });
+  },
+
+  skipped(cellId: string): Protocol.Execution {
+    return completed(cellId, {
+      outcome: {
+        kind: "skipped",
+        reason: "ancestor-stopped",
+        message: "",
+        related: [],
+      },
+    });
+  },
+
+  running(cellId: string): Protocol.Execution {
+    return completed(cellId, {
+      status: "running",
+      outcome: null,
+      completed_at: null,
+    });
+  },
+
+  queued(cellId: string): Protocol.Execution {
+    return completed(cellId, {
+      status: "queued",
+      outcome: null,
+      started_at: null,
+      completed_at: null,
+    });
+  },
+
+  runtime(status: Protocol.RuntimeStatus): Protocol.Runtime {
+    return {
+      id: "r1",
+      notebook_id: "n1",
+      status,
+      message: null,
+      marimo_version: null,
+      started_at: T0,
+    };
+  },
+
+  /** What the selectors read, with `latest` and the results derived from `records`. */
+  inputs(
+    records: Protocol.Execution[],
+    extra: Partial<Pick<CellExecutionInputs, "submissions" | "blocked">> = {},
+  ): CellExecutionInputs {
+    return {
+      executions: mirror(records),
+      results: results(records),
+      submissions: new Map(),
+      blocked: new Set(),
+      ...extra,
+    };
+  },
+
+  /** Make the store's active replica report `records` and `runtime`. */
+  seed(
+    store: Store,
+    records: Protocol.Execution[],
+    runtime: Protocol.Runtime | null = null,
+  ) {
+    const current = store.get(activeNotebookReplicaAtom);
+    const replica = {
+      connectionAtom: atom<ConnectionStatus>({ state: ConnectionState.OPEN }),
+      documentAtom: atom(null),
+      backendAtom: atom(null),
+      attachmentsAtom: atom([]),
+      connect: () => () => undefined,
+      reconnect: () => Promise.resolve(),
+      ...current,
+      notebookAtom: atom<Protocol.Notebook>({
+        id: "n1",
+        project_id: "p1",
+        path: null,
+        name: "Notebook",
+        operations: [],
+        updated_at: null,
+      }),
+      runtimeAtom: atom(runtime),
+      executionsAtom: atom(mirror(records)),
+      resultsAtom: atom(results(records)),
+    } satisfies NotebookReplica;
+    store.set(activeNotebookReplicaAtom, replica);
+    return replica;
+  },
+};

package/src/__mocks__/notebook.ts

@@ -2,7 +2,8 @@
 
 import { createRef } from "react";
 import { vi } from "vitest";
-import type { CellActions, NotebookState } from "@/core/cells/cells";
+import type { CellActions } from "@/core/cells/actions";
+import type { NotebookState } from "@/core/cells/cells";
 import { CellId } from "@/core/cells/ids";
 import {
   type CellData,
@@ -10,7 +11,6 @@ import {
   createCellRuntimeState,
 } from "@/core/cells/types";
 import type { MarimoError } from "@/core/kernel/messages";
-import { MultiColumn } from "@/utils/id-tree";
 import { Objects } from "@/utils/objects";
 
 export const MockNotebook = {
@@ -41,11 +41,10 @@ export const MockNotebook = {
         },
         edited: false,
         lastCodeRun: null,
-        lastExecutionTime: null,
         serializedEditorState: null,
         ...data,
       })),
-      cellIds: MultiColumn.from([Object.keys(cellData) as CellId[]]),
+      cellIds: Object.keys(cellData) as CellId[],
       cellRuntime: Objects.mapValues(cellData, (_data, cid) =>
         createCellRuntimeState({ ...cellRuntime[cid] }),
       ),
@@ -53,7 +52,6 @@ export const MockNotebook = {
       cellLogs: [],
       history: [],
       scrollKey: null,
-      untouchedNewCells: new Set(),
     };
   },
 

package/src/__mocks__/partial.ts

@@ -0,0 +1,26 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+/**
+ * A partial mock of `T` that throws when a member the test did not provide
+ * is read, so a test cannot silently depend on an undefined field.
+ */
+export function partial<T extends object>(
+  members: Partial<T>,
+  name = "mock",
+): T {
+  return new Proxy(members as T, {
+    get(target, key, receiver) {
+      // Only the members the test gave count as provided, not those every
+      // object inherits. Promise detection and well-known symbols may probe
+      // any object.
+      if (
+        Object.hasOwn(target, key) ||
+        typeof key === "symbol" ||
+        key === "then"
+      ) {
+        return Reflect.get(target, key, receiver);
+      }
+      throw new Error(`${name}.${String(key)} is not implemented in this test`);
+    },
+  });
+}

package/src/__mocks__/requests.ts

@@ -17,8 +17,7 @@ export const MockRequestClient = {
       sendModelValue: vi.fn().mockResolvedValue({}),
       sendRename: vi.fn().mockResolvedValue({}),
       sendRestart: vi.fn().mockResolvedValue({}),
-      sendDocumentTransaction: vi.fn().mockResolvedValue({}),
-      sendSave: vi.fn().mockResolvedValue({}),
+      saveLayout: vi.fn().mockResolvedValue({}),
       sendCopy: vi.fn().mockResolvedValue({}),
       sendStdin: vi.fn().mockResolvedValue({}),
       sendFormat: vi.fn().mockResolvedValue({ codes: {} }),
@@ -27,11 +26,9 @@ export const MockRequestClient = {
       sendRun: vi.fn().mockResolvedValue({}),
       sendRunScratchpad: vi.fn().mockResolvedValue({}),
       sendInstantiate: vi.fn().mockResolvedValue({}),
-      sendDeleteCell: vi.fn().mockResolvedValue({}),
       sendCodeCompletionRequest: vi.fn().mockResolvedValue({ items: [] }),
       saveUserConfig: vi.fn().mockResolvedValue({}),
       saveAppConfig: vi.fn().mockResolvedValue({}),
-      saveCellConfig: vi.fn().mockResolvedValue({}),
       sendFunctionRequest: vi.fn().mockResolvedValue({}),
       sendInstallMissingPackages: vi.fn().mockResolvedValue({}),
       readCode: vi.fn().mockResolvedValue({ contents: "" }),

package/src/__tests__/CellStatus.test.tsx

@@ -3,7 +3,7 @@
 import { render } from "@testing-library/react";
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 import { TooltipProvider } from "@/components/ui/tooltip";
-import { formatElapsedTime, type Seconds } from "@/utils/time";
+import { formatElapsedTime, type Milliseconds } from "@/utils/time";
 import {
   CellStatusComponent,
   ElapsedTime,
@@ -76,8 +76,8 @@ describe("CellStatusComponent", () => {
     status: "idle" as const,
     interrupted: false,
     elapsedTime: null,
-    runStartTimestamp: null,
-    lastRunStartTimestamp: null,
+    startedAt: null,
+    blocked: false,
     uninstantiated: false,
   };
 
@@ -95,7 +95,7 @@ describe("CellStatusComponent", () => {
       ...baseProps,
       disabled: true,
       staleInputs: true,
-      lastRunStartTimestamp: 1_704_096_000 as Seconds, // Jan 1, 2024 12:00:00
+      startedAt: 1_704_096_000_000 as Milliseconds, // Jan 1, 2024 12:00:00
     };
 
     const { container } = render(
@@ -110,7 +110,7 @@ describe("CellStatusComponent", () => {
     const props = {
       ...baseProps,
       disabled: true,
-      lastRunStartTimestamp: 1_704_096_000 as Seconds,
+      startedAt: 1_704_096_000_000 as Milliseconds,
     };
 
     const { container } = render(
@@ -124,8 +124,8 @@ describe("CellStatusComponent", () => {
   test("renders disabled transitively state", () => {
     const props = {
       ...baseProps,
-      status: "disabled-transitively" as const,
-      lastRunStartTimestamp: 1_704_096_000 as Seconds,
+      blocked: true,
+      startedAt: 1_704_096_000_000 as Milliseconds,
     };
 
     const { container } = render(
@@ -139,9 +139,9 @@ describe("CellStatusComponent", () => {
   test("renders stale and disabled transitively state", () => {
     const props = {
       ...baseProps,
-      status: "disabled-transitively" as const,
+      blocked: true,
       staleInputs: true,
-      lastRunStartTimestamp: 1_704_096_000 as Seconds,
+      startedAt: 1_704_096_000_000 as Milliseconds,
     };
 
     const { container } = render(
@@ -156,8 +156,7 @@ describe("CellStatusComponent", () => {
     const props = {
       ...baseProps,
       status: "running" as const,
-      runStartTimestamp: 1_704_096_000 as Seconds,
-      lastRunStartTimestamp: 1_704_096_000 as Seconds,
+      startedAt: 1_704_096_000_000 as Milliseconds,
     };
 
     const { container } = render(
@@ -172,7 +171,7 @@ describe("CellStatusComponent", () => {
     const props = {
       ...baseProps,
       status: "queued" as const,
-      lastRunStartTimestamp: 1_704_096_000 as Seconds,
+      startedAt: 1_704_096_000_000 as Milliseconds,
     };
 
     const { container } = render(
@@ -201,8 +200,8 @@ describe("CellStatusComponent", () => {
     const props = {
       ...baseProps,
       interrupted: true,
-      elapsedTime: 1500,
-      lastRunStartTimestamp: 1_704_096_000 as Seconds,
+      elapsedTime: 1500 as Milliseconds,
+      startedAt: 1_704_096_000_000 as Milliseconds,
     };
 
     const { container } = render(
@@ -217,8 +216,8 @@ describe("CellStatusComponent", () => {
     const props = {
       ...baseProps,
       edited: true,
-      elapsedTime: 1500,
-      lastRunStartTimestamp: 1_704_096_000 as Seconds,
+      elapsedTime: 1500 as Milliseconds,
+      startedAt: 1_704_096_000_000 as Milliseconds,
     };
 
     const { container } = render(
@@ -233,8 +232,8 @@ describe("CellStatusComponent", () => {
     const props = {
       ...baseProps,
       staleInputs: true,
-      elapsedTime: 1500,
-      lastRunStartTimestamp: 1_704_096_000 as Seconds,
+      elapsedTime: 1500 as Milliseconds,
+      startedAt: 1_704_096_000_000 as Milliseconds,
     };
 
     const { container } = render(
@@ -248,8 +247,8 @@ describe("CellStatusComponent", () => {
   test("renders completed run with elapsed time", () => {
     const props = {
       ...baseProps,
-      elapsedTime: 1500,
-      lastRunStartTimestamp: 1_704_096_000 as Seconds,
+      elapsedTime: 1500 as Milliseconds,
+      startedAt: 1_704_096_000_000 as Milliseconds,
     };
 
     const { container } = render(

package/src/__tests__/fixtures/pair-config.ts

@@ -6,7 +6,7 @@ import { pairConfigSchema } from "@/core/config/pair";
 
 // Read the Python-owned resource only in tests to check the shared contract.
 export const PAIR_CONFIG = pairConfigSchema.parse({
-  command: "uvx marimo@latest",
+  command: "marimo",
   hostEnabled: true,
   templates: JSON.parse(
     readFileSync(

package/src/__tests__/main.test.tsx

@@ -10,8 +10,11 @@ import {
 import {
   appConfigAtom,
   configOverridesAtom,
+  pageAppConfigAtom,
   userConfigAtom,
 } from "../core/config/config";
+import { exportedForTesting, notebookAtom } from "../core/cells/cells";
+import { SCRATCH_CELL_ID } from "../core/cells/ids";
 import { marimoVersionAtom, showCodeInRunModeAtom } from "../core/meta/state";
 import { type AppMode, viewStateAtom } from "../core/mode";
 import { codeAtom, filenameAtom } from "../core/saving/file-state";
@@ -40,7 +43,8 @@ describe("main", () => {
     store.set(filenameAtom, null);
     store.set(showCodeInRunModeAtom, false);
     store.set(marimoVersionAtom, "unknown");
-    store.set(appConfigAtom, parseAppConfig({}));
+    store.set(notebookAtom, exportedForTesting.initialNotebookState());
+    store.set(pageAppConfigAtom, {});
     store.set(userConfigAtom, defaultUserConfig());
     store.set(configOverridesAtom, {});
   });
@@ -99,6 +103,25 @@ describe("main", () => {
     expect(store.get(viewStateAtom).mode).toBe("edit");
   });
 
+  it("seeds runtime from a session snapshot without dropping the scratch cell", () => {
+    const el = document.createElement("div");
+    const error = mount(
+      {
+        mode: "edit",
+        session: {
+          version: "1",
+          metadata: { marimo_version: "1", script_metadata_hash: null },
+          cells: [{ id: "cell-1", code_hash: null, console: [], outputs: [] }],
+        },
+      },
+      el,
+    );
+    expect(error).toBeUndefined();
+    const { cellRuntime } = store.get(notebookAtom);
+    expect(cellRuntime["cell-1" as never]).toBeDefined();
+    expect(cellRuntime[SCRATCH_CELL_ID]).toBeDefined();
+  });
+
   it("should mount with empty config", () => {
     const el = document.createElement("div");
     const error = mount(