@marimo-team/islands 0.25.3-dev170 → 0.25.3-dev175

package/src/core/kernel/__tests__/handlers.test.ts

@@ -1,7 +1,8 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 import { describe, expect, it, vi } from "vitest";
 import { cellId } from "@/__tests__/branded";
-import { buildCellData, buildLayoutState } from "../handlers";
+import { createCell } from "@/core/cells/types";
+import { buildLayoutState } from "../handlers";
 import type { NotificationMessageData } from "../messages";
 import { queryParamHandlers } from "../queryParamHandlers";
 
@@ -63,152 +64,9 @@ describe("queryParamHandlers", () => {
   });
 });
 
-describe("buildCellData", () => {
-  it("should build cell data from kernel-ready data", () => {
-    const kernelReadyData: NotificationMessageData<"kernel-ready"> = {
-      cell_ids: [cellId("cell1"), cellId("cell2")],
-      codes: ["x = 1", "y = 2"],
-      names: ["__", "__"],
-      configs: [
-        { disabled: false, hide_code: false },
-        { disabled: false, hide_code: false },
-      ],
-      layout: null,
-      resumed: false,
-      ui_values: {},
-      last_executed_code: {},
-      last_execution_time: {},
-      app_config: {
-        width: "normal",
-        app_title: null,
-        layout_file: null,
-        css_file: null,
-        auto_download: [],
-      },
-      kiosk: false,
-      capabilities: {
-        terminal: false,
-      },
-      auto_instantiated: false,
-      consumer_capabilities: { edit: true, interact: true },
-    };
-
-    const cells = buildCellData(kernelReadyData);
-
-    expect(cells).toMatchInlineSnapshot(`
-      [
-        {
-          "code": "x = 1",
-          "config": {
-            "disabled": false,
-            "hide_code": false,
-          },
-          "edited": false,
-          "id": "cell1",
-          "lastCodeRun": null,
-          "lastExecutionTime": null,
-          "name": "__",
-          "serializedEditorState": null,
-        },
-        {
-          "code": "y = 2",
-          "config": {
-            "disabled": false,
-            "hide_code": false,
-          },
-          "edited": false,
-          "id": "cell2",
-          "lastCodeRun": null,
-          "lastExecutionTime": null,
-          "name": "__",
-          "serializedEditorState": null,
-        },
-      ]
-    `);
-  });
-
-  it("should mark cells as edited when code differs from last executed code", () => {
-    const kernelReadyData: NotificationMessageData<"kernel-ready"> = {
-      cell_ids: [cellId("cell1"), cellId("cell2")],
-      codes: ["x = 1", "y = 3"],
-      names: ["__", "__"],
-      configs: [
-        { disabled: false, hide_code: false },
-        { disabled: false, hide_code: false },
-      ],
-      layout: null,
-      resumed: false,
-      ui_values: {},
-      last_executed_code: {
-        cell1: "x = 1",
-        cell2: "y = 2",
-      },
-      last_execution_time: {
-        cell1: 1_234_567_890,
-        cell2: 1_234_567_891,
-      },
-      app_config: {
-        width: "normal",
-        app_title: null,
-        layout_file: null,
-        css_file: null,
-        auto_download: [],
-      },
-      kiosk: false,
-      capabilities: {
-        terminal: false,
-      },
-      auto_instantiated: false,
-      consumer_capabilities: { edit: true, interact: true },
-    };
-
-    const cells = buildCellData(kernelReadyData);
-
-    expect(cells[0].edited).toBe(false);
-    expect(cells[1].edited).toBe(true);
-    expect(cells[0].lastCodeRun).toBe("x = 1");
-    expect(cells[1].lastCodeRun).toBe("y = 2");
-  });
-
-  it("should handle empty cell data", () => {
-    const kernelReadyData: NotificationMessageData<"kernel-ready"> = {
-      cell_ids: [],
-      codes: [],
-      names: [],
-      configs: [],
-      layout: null,
-      resumed: false,
-      ui_values: {},
-      last_executed_code: {},
-      last_execution_time: {},
-      app_config: {
-        width: "normal",
-        app_title: null,
-        layout_file: null,
-        css_file: null,
-        auto_download: [],
-      },
-      kiosk: false,
-      capabilities: {
-        terminal: false,
-      },
-      auto_instantiated: false,
-      consumer_capabilities: { edit: true, interact: true },
-    };
-
-    const cells = buildCellData(kernelReadyData);
-
-    expect(cells).toMatchInlineSnapshot("[]");
-  });
-});
-
 describe("buildLayoutState", () => {
   it("should build default layout state when no layout is provided", () => {
     const kernelReadyData: NotificationMessageData<"kernel-ready"> = {
-      cell_ids: [cellId("cell1")],
-      codes: ["x = 1"],
-      names: ["__"],
-      configs: [{ disabled: false, hide_code: false }],
       layout: null,
       resumed: false,
       ui_values: {},
@@ -229,7 +87,7 @@ describe("buildLayoutState", () => {
       consumer_capabilities: { edit: true, interact: true },
     };
 
-    const cells = buildCellData(kernelReadyData);
+    const cells = [createCell({ id: cellId("cell1") })];
     const mockSetLayoutData = vi.fn();
     const layoutState = buildLayoutState(
       kernelReadyData,
@@ -248,13 +106,6 @@ describe("buildLayoutState", () => {
 
   it("should build layout state with vertical layout", () => {
     const kernelReadyData: NotificationMessageData<"kernel-ready"> = {
-      cell_ids: [cellId("cell1"), cellId("cell2")],
-      codes: ["x = 1", "y = 2"],
-      names: ["__", "__"],
-      configs: [
-        { disabled: false, hide_code: false },
-        { disabled: false, hide_code: false },
-      ],
       layout: {
         type: "vertical",
         data: [],
@@ -278,7 +129,10 @@ describe("buildLayoutState", () => {
       consumer_capabilities: { edit: true, interact: true },
     };
 
-    const cells = buildCellData(kernelReadyData);
+    const cells = [
+      createCell({ id: cellId("cell1") }),
+      createCell({ id: cellId("cell2") }),
+    ];
     const mockSetLayoutData = vi.fn();
     const layoutState = buildLayoutState(
       kernelReadyData,

package/src/core/kernel/handlers.ts

@@ -3,7 +3,8 @@ import type { LayoutType } from "@/components/editor/renderers/types";
 import { Logger } from "@/utils/Logger";
 import { Objects } from "@/utils/objects";
 import type { UIElementId } from "../cells/ids";
-import { type CellData, createCell } from "../cells/types";
+import type { ReducerCellActions } from "../cells/cells";
+import type { CellData } from "../cells/types";
 import { type AppConfig, AppConfigSchema } from "../config/config-schema";
 import { UI_ELEMENT_REGISTRY } from "../dom/uiregistry";
 import { deserializeLayoutState } from "../layout/layout";
@@ -19,41 +20,6 @@ import type { KernelState } from "./state";
 
 type KernelReadyData = NotificationMessageData<"kernel-ready">;
 
-/**
- * Build cells from kernel-ready data.
- */
-export function buildCellData(data: KernelReadyData): CellData[] {
-  const {
-    codes,
-    names,
-    configs,
-    cell_ids,
-    last_executed_code,
-    last_execution_time,
-  } = data;
-
-  const lastExecutedCode = last_executed_code || {};
-  const lastExecutionTime = last_execution_time || {};
-
-  return codes.map((code, i) => {
-    const cellId = cell_ids[i];
-    const lastCodeRun = lastExecutedCode[cellId];
-
-    // A cell is edited if the code has changed since the last time it was run
-    const edited = lastCodeRun ? lastCodeRun !== code : false;
-
-    return createCell({
-      id: cellId,
-      code,
-      edited,
-      name: names[i],
-      lastCodeRun: lastExecutedCode[cellId] ?? null,
-      lastExecutionTime: lastExecutionTime[cellId] ?? null,
-      config: configs[i],
-    });
-  });
-}
-
 /**
  * Build layout state from kernel-ready data.
  */
@@ -95,7 +61,10 @@ export function handleKernelReady(
   data: KernelReadyData,
   opts: {
     autoInstantiate: boolean;
-    setCells: (cells: CellData[], layout: LayoutState) => void;
+    /** The notebook's cells, as the host document provided them. */
+    cells: CellData[];
+    setLastRun: ReducerCellActions["setLastRun"];
+    resetCellRuntimes: ReducerCellActions["resetCellRuntimes"];
     setLayoutData: (payload: {
       layoutView: LayoutType;
       data: LayoutData;
@@ -104,17 +73,13 @@ export function handleKernelReady(
     setKernelState: (state: KernelState) => void;
     setAppConfig: (config: AppConfig) => void;
     onError: (error: Error) => void;
-    /**
-     * If provided, these cells will be used instead of the cells from
-     * kernel-ready. This allows preserving local edits made before connecting.
-     */
-    existingCells?: CellData[];
   },
-) {
+): LayoutState {
   const {
-    existingCells,
     autoInstantiate,
-    setCells,
+    cells,
+    setLastRun,
+    resetCellRuntimes,
     setLayoutData,
     setAppConfig,
     setCapabilities,
@@ -124,15 +89,12 @@ export function handleKernelReady(
   const { resumed, ui_values, app_config, capabilities, auto_instantiated } =
     data;
 
-  // Use existing cells if provided (local pre-connect edits), otherwise build from kernel-ready
-  // If the kernel was resumed, we don't want to use the existing cells because they may be stale.
-  const hasExistingCells = existingCells && existingCells.length > 0;
-  const cells =
-    hasExistingCells && !resumed ? existingCells : buildCellData(data);
-
-  // Set up layout and cells
+  resetCellRuntimes();
+  setLastRun({
+    lastCodeRun: data.last_executed_code ?? {},
+    lastExecutionTime: data.last_execution_time ?? {},
+  });
   const layoutState = buildLayoutState(data, cells, setLayoutData);
-  setCells(cells, layoutState);
 
   // Set app config and capabilities
   const parsedAppConfig = AppConfigSchema.safeParse(app_config);
@@ -145,7 +107,7 @@ export function handleKernelReady(
 
   // If the kernel was already instantiated server-side (e.g. run mode), we're done
   if (auto_instantiated) {
-    return;
+    return layoutState;
   }
 
   // If resumed, restore UI element values from kernel and we're done
@@ -156,16 +118,13 @@ export function handleKernelReady(
       const uiObjectId: UIElementId = objectId;
       UI_ELEMENT_REGISTRY.set(uiObjectId, value);
     }
-    return;
+    return layoutState;
   }
 
   // If we already have values for some objects, we should
   // send them to the kernel. This may happen after re-connecting
   // to the kernel after the computer wakes from sleep.
   const { objectIds, values } = collectUIElementValues();
-  const codesToSend = hasExistingCells
-    ? Object.fromEntries(existingCells.map((c) => [c.id, c.code]))
-    : undefined;
 
   // Send instantiate request to kernel
   void getRequestClient()
@@ -173,7 +132,6 @@ export function handleKernelReady(
       objectIds,
       values,
       autoRun: autoInstantiate,
-      codes: codesToSend,
     })
     .then(() => {
       setKernelState({ isInstantiated: true, error: null });
@@ -182,6 +140,7 @@ export function handleKernelReady(
       setKernelState({ isInstantiated: false, error: error });
       onError(new Error("Failed to instantiate", { cause: error }));
     });
+  return layoutState;
 }
 
 export function handleRemoveUIElements(

package/src/core/network/__tests__/requests-lazy.test.ts

@@ -53,7 +53,6 @@ describe("createLazyRequests", () => {
       sendInstantiate: vi.fn().mockResolvedValue({ instantiated: true }),
       sendFunctionRequest: vi.fn().mockResolvedValue({ result: "data" }),
       sendRestart: vi.fn().mockResolvedValue({ restarted: true }),
-      sendDeleteCell: vi.fn().mockResolvedValue({ deleted: true }),
       sendInterrupt: vi.fn().mockResolvedValue({ interrupted: true }),
       sendPdb: vi.fn().mockResolvedValue({ pdb: true }),
       sendRunScratchpad: vi.fn().mockResolvedValue({ run: true }),
@@ -320,7 +319,6 @@ describe("createLazyRequests", () => {
         cellIds: [cellId("cell1")],
         codes: ["code"],
       });
-      await lazyRequests.sendDeleteCell({ cellId: cellId("cell2") });
       await lazyRequests.sendInstantiate({
         objectIds: [uiElementId("obj1")],
         values: [],
@@ -328,7 +326,7 @@ describe("createLazyRequests", () => {
 
       // Init should only be called once
       expect(mockInit).toHaveBeenCalledTimes(1);
-      expect(mockGetRuntimeManager).toHaveBeenCalledTimes(3);
+      expect(mockGetRuntimeManager).toHaveBeenCalledTimes(2);
     });
   });
 });

package/src/core/network/requests-lazy.ts

@@ -52,10 +52,8 @@ const ACTIONS: Record<keyof AllRequests, Action> = {
   sendModelValue: "startConnection",
   sendInstantiate: "startConnectionWithoutKernel",
   sendRun: "startConnection",
-  sendDeleteCell: "startConnection",
   sendRunScratchpad: "startConnection",
   saveAppConfig: "startConnection",
-  saveCellConfig: "startConnection",
   discoverDataSources: "startConnection",
 
   // Export operations start a connection

package/src/core/network/requests-network.ts

@@ -142,14 +142,6 @@ export function createNetworkRequests(): EditRequests & RunRequests {
         })
         .then(handleResponseReturnNull);
     },
-    sendDeleteCell: (request) => {
-      return getClient()
-        .POST("/api/kernel/delete", {
-          body: request,
-          params: getParams(),
-        })
-        .then(handleResponseReturnNull);
-    },
     sendCodeCompletionRequest: async (request) => {
       await waitForConnectionOpen();
       return getClient()
@@ -175,14 +167,6 @@ export function createNetworkRequests(): EditRequests & RunRequests {
         })
         .then(handleResponseReturnNull);
     },
-    saveCellConfig: (request) => {
-      return getClient()
-        .POST("/api/kernel/set_cell_config", {
-          body: request,
-          params: getParams(),
-        })
-        .then(handleResponseReturnNull);
-    },
     sendFunctionRequest: (request) => {
       return getClient()
         .POST("/api/kernel/function_call", {

package/src/core/network/requests-static.ts

@@ -48,11 +48,9 @@ export function createStaticRequests(): EditRequests & RunRequests {
     sendInterrupt: throwNotInEditMode,
     sendShutdown: throwNotInEditMode,
     sendFormat: throwNotInEditMode,
-    sendDeleteCell: throwNotInEditMode,
     sendCodeCompletionRequest: throwNotInEditMode,
     saveUserConfig: throwNotInEditMode,
     saveAppConfig: throwNotInEditMode,
-    saveCellConfig: throwNotInEditMode,
     sendStdin: throwNotInEditMode,
     readCode: throwNotInEditMode,
     readSnippets: throwNotInEditMode,

package/src/core/network/requests-toasting.tsx

@@ -29,11 +29,9 @@ export function createErrorToastingRequests(
     sendInterrupt: "Failed to interrupt",
     sendShutdown: "Failed to shutdown",
     sendFormat: "Failed to format",
-    sendDeleteCell: "Failed to delete cell",
     sendCodeCompletionRequest: "Failed to complete code",
     saveUserConfig: "Failed to save user config",
     saveAppConfig: "Failed to save app config",
-    saveCellConfig: "Failed to save cell config",
     sendStdin: "Failed to send stdin",
     readCode: "Failed to read code",
     readSnippets: "Failed to fetch snippets",

package/src/core/network/types.ts

@@ -1,6 +1,5 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 import type { components, paths } from "@marimo-team/marimo-api";
-import type { CellId } from "../cells/ids";
 
 export type schemas = components["schemas"];
 export type AiCompletionRequest = schemas["AiCompletionRequest"];
@@ -16,7 +15,6 @@ export type CellConfig = schemas["CellConfig"];
  */
 export type RuntimeState = schemas["CellNotification"]["status"];
 export type CodeCompletionRequest = schemas["CodeCompletionRequest"];
-export type DeleteCellRequest = schemas["DeleteCellRequest"];
 export type AutoExportAsIPYNBRequest = schemas["AutoExportAsIPYNBRequest"];
 export type AutoExportAsMarkdownRequest =
   schemas["AutoExportAsMarkdownRequest"];
@@ -101,9 +99,6 @@ export type SaveNotebookRequest = schemas["SaveNotebookRequest"];
 export type CopyNotebookRequest = schemas["CopyNotebookRequest"];
 export type SaveUserConfigurationRequest =
   schemas["SaveUserConfigurationRequest"];
-export interface SetCellConfigRequest {
-  configs: Record<CellId, Partial<CellConfig>>;
-}
 /**
  * Client-side shape for creating a file/directory/notebook. The HTTP
  * transport sends this as multipart/form-data; the WASM bridge base64-encodes
@@ -171,11 +166,9 @@ export interface EditRequests {
   sendInterrupt: () => Promise<null>;
   sendShutdown: () => Promise<null>;
   sendFormat: (request: FormatCellsRequest) => Promise<FormatResponse>;
-  sendDeleteCell: (request: DeleteCellRequest) => Promise<null>;
   sendCodeCompletionRequest: (request: CodeCompletionRequest) => Promise<null>;
   saveUserConfig: (request: SaveUserConfigurationRequest) => Promise<null>;
   saveAppConfig: (request: SaveAppConfigurationRequest) => Promise<null>;
-  saveCellConfig: (request: SetCellConfigRequest) => Promise<null>;
   sendRestart: () => Promise<null>;
   sendInstallMissingPackages: (
     request: InstallPackagesRequest,

package/src/core/notebook/document/__tests__/codemirror.test.ts

@@ -60,6 +60,11 @@ function languages(id: CellId) {
       aiCellCompletion: () => false,
       createManyBelow: vi.fn(),
       addOrAppendSetupCell: vi.fn(),
+      createCell: vi.fn(),
+      moveToNextCell: vi.fn(),
+      addSetupCell: vi.fn(),
+      deleteCells: vi.fn(),
+      undoDeleteCell: vi.fn(),
       onRun: vi.fn(),
       deleteCell: vi.fn(),
       afterToggleMarkdown: vi.fn(),

package/src/core/notebook/document/__tests__/draft.test.ts

@@ -9,6 +9,7 @@ import {
   type EditableCell,
   editCell,
   EMPTY_DRAFT,
+  restoreCell,
   setOrder,
   toChanges,
   viewDocument,
@@ -99,6 +100,46 @@ describe("createCell and deleteCell", () => {
     expect(toChanges(confirmed, draft)).toEqual([]);
     expect(viewDocument(confirmed, draft).order).toEqual(["c1", "c2"]);
   });
+
+  it("restores a deleted cell as an edit at the requested place", () => {
+    const deleted = deleteCell(EMPTY_DRAFT, "c1");
+    const back = { id: "c1", code: "back" };
+    const put = {
+      kind: "put_cell",
+      base_etag: "c1-etag",
+      cell: { ...back, name: "_", config: CONFIG },
+    };
+    const inPlace = restoreCell(confirmed, deleted, back, { before: "c2" });
+    const moved = restoreCell(confirmed, deleted, back, { after: "c2" });
+    expect(viewDocument(confirmed, inPlace).cells.get("c1")?.code).toBe("back");
+    expect(viewDocument(confirmed, inPlace).order).toEqual(["c1", "c2"]);
+    expect(toChanges(confirmed, inPlace)).toEqual([put]);
+    expect(viewDocument(confirmed, moved).order).toEqual(["c2", "c1"]);
+    expect(toChanges(confirmed, moved)).toEqual([
+      put,
+      { kind: "set_order", base_etag: "order-1", order: ["c2", "c1"] },
+    ]);
+  });
+
+  it("recreates a cell whose deletion is in flight once the host removes it", () => {
+    const sent = deleteCell(EMPTY_DRAFT, "c1");
+    const back = { id: "c1", code: "back" };
+    const draft = restoreCell(confirmed, sent, back, { before: "c2" }, sent);
+    expect(viewDocument(confirmed, draft).cells.get("c1")?.code).toBe("back");
+    expect(viewDocument(confirmed, draft).order).toEqual(["c1", "c2"]);
+
+    const removed = withCells(confirmed, { c1: null });
+    const settled = acknowledge(draft, sent);
+    expect(viewDocument(removed, settled).order).toEqual(["c1", "c2"]);
+    expect(toChanges(removed, settled)).toEqual([
+      {
+        kind: "put_cell",
+        base_etag: null,
+        cell: { ...back, name: "_", config: CONFIG },
+        before: "c2",
+      },
+    ]);
+  });
 });
 
 describe("viewDocument", () => {

package/src/core/notebook/document/__tests__/state.test.ts

@@ -124,6 +124,27 @@ describe("document model", () => {
     },
   );
 
+  it("brings back a cell deleted earlier in the draft with new content", () => {
+    const { store, cellAtom, orderAtom, changesAtom, edit } = setup();
+    edit((tx) => tx.deleteCell("c1"));
+    edit((tx) => tx.createCell({ id: "c1", code: "back" }, { after: "c2" }));
+    expect(store.get(cellAtom("c1"))?.code).toBe("back");
+    expect(store.get(orderAtom)).toEqual(["c2", "c1"]);
+    expect(store.get(changesAtom)).toEqual([
+      {
+        kind: "put_cell",
+        base_etag: "c1-etag",
+        cell: {
+          id: "c1",
+          code: "back",
+          name: "_",
+          config: cell("c1", "").config,
+        },
+      },
+      { kind: "set_order", base_etag: "order-1", order: ["c2", "c1"] },
+    ]);
+  });
+
   it("publishes the visible order when an anchor is deleted later in the draft", () => {
     const { store, orderAtom, changesAtom, edit } = setup();
     edit((tx) => {

package/src/core/notebook/document/draft.ts

@@ -253,17 +253,47 @@ export function createCell(
   input: Protocol.CellInput,
   placement: Placement = {},
 ): Draft {
+  const cell = parseCell(input);
+  const next = withCell(draft, cell.id, { kind: "create", cell, placement });
+  return draft.order === null
+    ? next
+    : { ...next, order: insertAt(draft.order, cell.id, placement) };
+}
+
+/**
+ * Bring back a cell this draft deletes, with the given content.
+ *
+ * A deletion not yet sent is withdrawn and the cell edited in place. One in
+ * flight is superseded by a creation, so the cell returns once the host has
+ * removed it. Either way the cell takes the requested placement.
+ */
+export function restoreCell(
+  confirmed: Document,
+  draft: Draft,
+  input: Protocol.CellInput,
+  placement: Placement = {},
+  sent: Draft = EMPTY_DRAFT,
+): Draft {
+  const { id, code, name, config } = parseCell(input);
+  const withdrawn = withCell(draft, id, undefined);
+  const next =
+    sent.cells.get(id)?.kind === "delete"
+      ? createCell(withdrawn, input, placement)
+      : editCell(confirmed, withdrawn, id, { code, name, config });
+  const { order } = viewDocument(confirmed, next);
+  const placed = insertAt(order, id, placement);
+  return sameOrder(order, placed) ? next : setOrder(next, placed);
+}
+
+/** A cell input with the protocol's defaults filled in. */
+function parseCell(input: Protocol.CellInput): CellWithSource {
   const parsed = Protocol.CellInput.parse(input);
-  const cell: CellWithSource = {
+  return {
     id: parsed.id,
     code: parsed.code,
     name: parsed.name,
     config: parsed.config ?? Protocol.CellConfigInput.parse({}),
   };
-  const next = withCell(draft, cell.id, { kind: "create", cell, placement });
-  return draft.order === null
-    ? next
-    : { ...next, order: insertAt(draft.order, cell.id, placement) };
 }
 
 /** Forget an unsent creation; otherwise retain the deletion until confirmed. */

package/src/core/notebook/document/index.ts

@@ -21,3 +21,4 @@ export {
   type EditableCell,
   type EditableDocument,
 } from "./model";
+export type { Placement } from "./draft";

package/src/core/notebook/document/state.ts

@@ -13,6 +13,7 @@ import {
   type CellEdit,
   createCell,
   deleteCell,
+  restoreCell,
   type Draft,
   type EditableDocument,
   editCell,
@@ -30,6 +31,7 @@ export interface DocumentEditor {
   setCode(id: Protocol.CellId, code: string): void;
   setName(id: Protocol.CellId, name: string): void;
   updateConfig(id: Protocol.CellId, patch: Partial<Protocol.CellConfig>): void;
+  /** Create a cell, or bring back one this draft deletes with this content. */
   createCell(cell: Protocol.CellInput, placement?: Placement): void;
   deleteCell(id: Protocol.CellId): void;
   /** A permutation of the cells present at this point in the transaction. */
@@ -330,7 +332,7 @@ function editDocument(
       updateCell(id, { config: Protocol.CellConfig.partial().parse(patch) }),
     createCell: (cell, placement = {}) => {
       assertActive();
-      if (confirmed.cells.has(cell.id) || hasCell(cell.id)) {
+      if (hasCell(cell.id)) {
         throw new Error(`Cell ${cell.id} already exists`);
       }
       if (placement.after !== undefined && placement.before !== undefined) {
@@ -340,7 +342,9 @@ function editDocument(
       if (anchor !== undefined) {
         requireCell(anchor);
       }
-      next = createCell(next, cell, { ...placement });
+      next = confirmed.cells.has(cell.id)
+        ? restoreCell(confirmed, next, cell, { ...placement }, sent)
+        : createCell(next, cell, { ...placement });
     },
     deleteCell: (id) => {
       requireCell(id);