@marimo-team/islands 0.25.3-dev205 → 0.25.3-dev207

package/dist/{swimlanes-42K2YHIH-DBiYZZZc.js → swimlanes-42K2YHIH-DIuFHbVE.js}

@@ -9,7 +9,7 @@ import "./chunk-4HAMMTFA-D4eFPyFh.js";
 import "./chunk-GVQU2GXP-Cwbt-lF0.js";
 import "./chunk-L3NEJ4N5-n-zgIVSy.js";
 import { o as n } from "./chunk-OSK3NFVY-DXa-Cxbn.js";
-import { c as r } from "./mermaid-DBpOnw8c.js";
+import { c as r } from "./mermaid-BrdwbArF.js";
 //#region ../node_modules/.pnpm/mermaid@11.17.2/node_modules/mermaid/dist/chunks/mermaid.core/swimlanes-42K2YHIH.mjs
 var i = 5, a = 1e-5, o = 1e-6;
 function s(e) {

package/dist/{swimlanesDiagram-VR7AAH4N-CsgR851k.js → swimlanesDiagram-VR7AAH4N-CAqHAziW.js}

@@ -9,11 +9,11 @@ import "./chunk-4HAMMTFA-D4eFPyFh.js";
 import "./chunk-GVQU2GXP-Cwbt-lF0.js";
 import "./chunk-L3NEJ4N5-n-zgIVSy.js";
 import "./chunk-OSK3NFVY-DXa-Cxbn.js";
-import "./mermaid-DBpOnw8c.js";
+import "./mermaid-BrdwbArF.js";
 import "./chunk-F27PBJKO-ufseIn5y.js";
 import "./chunk-XXDRQBXY-Dnl5VBqG.js";
 import "./chunk-POPQ4Y6H-hYOXbYH_.js";
-import { r as t, t as n } from "./chunk-SHT3W25Y-Bige_rTb.js";
+import { r as t, t as n } from "./chunk-SHT3W25Y-L8KQLLBy.js";
 //#region ../node_modules/.pnpm/mermaid@11.17.2/node_modules/mermaid/dist/chunks/mermaid.core/swimlanesDiagram-VR7AAH4N.mjs
 var r = n({
 	defaultLayout: "swimlane",

package/dist/{timeline-definition-24CTP7MA-Dfj0CMXY.js → timeline-definition-24CTP7MA-xO4EQqBm.js}

@@ -3,7 +3,7 @@ import { p as t } from "./chunk-75Z2AOVW-D7gxIs2Q.js";
 import { n, t as r } from "./src-CA_m4ONl.js";
 import { n as i, t as a } from "./chunk-Y2CYZVJY-DKKS1VyV.js";
 import { $ as o, J as s, a as c, b as l, et as u, nt as d, o as f, x as p } from "./chunk-DU6HZSFF-BwiyaNpg.js";
-import { p as m } from "./mermaid-DBpOnw8c.js";
+import { p as m } from "./mermaid-BrdwbArF.js";
 //#region ../node_modules/.pnpm/mermaid@11.17.2/node_modules/mermaid/dist/chunks/mermaid.core/timeline-definition-24CTP7MA.mjs
 var h = (function() {
 	var e = /* @__PURE__ */ i(function(e, t, n, r) {

package/dist/{toDate-B0-Y0SEW.js → toDate-BZZ64K_m.js}

@@ -2,7 +2,7 @@ import { t as e } from "./rolldown-runtime-Cb76FRpK.js";
 import { g as t } from "./button-BQRdqQi1.js";
 import { t as n } from "./compiler-runtime-CldRdSsv.js";
 import { m as r } from "./tooltip-s4zZxwKe.js";
-import { F as i, M as a, a as o, b as s, o as c } from "./useTheme-DbBkeP6Z.js";
+import { F as i, M as a, a as o, b as s, o as c } from "./useTheme-TzPgWXwB.js";
 import { t as l } from "./invariant-DLmrl-hA.js";
 var u = r("circle-question-mark", [
 	["circle", {
@@ -580,10 +580,6 @@ var G = new Set(Object.values(o)), K = class {
 		let t = this.formatHttpURL({ path: `/api/marimo/v1/notebooks/${encodeURIComponent(e)}` });
 		return t.searchParams.delete(o.accessToken), t;
 	}
-	getWsSyncURL(e) {
-		let t = this.getSessionURL("/ws_sync", e);
-		return q(this.appendCrossOriginAuth(t).toString());
-	}
 	getTerminalWsURL(e) {
 		let t = this.formatWsURL("/terminal/ws");
 		return e && (t.searchParams.set("rows", String(e.rows)), t.searchParams.set("cols", String(e.cols))), t;

package/dist/{useAsyncData-Phxf6GCd.js → useAsyncData-Dqw22wZQ.js}

@@ -1,7 +1,7 @@
 import { a as e } from "./rolldown-runtime-Cb76FRpK.js";
 import { t } from "./react-sHtZdjeP.js";
 import { t as n } from "./compiler-runtime-CldRdSsv.js";
-import { R as r } from "./useTheme-DbBkeP6Z.js";
+import { R as r } from "./useTheme-TzPgWXwB.js";
 import { t as i } from "./invariant-DLmrl-hA.js";
 //#region src/hooks/useAsyncData.ts
 var a = n(), o = /* @__PURE__ */ e(t(), 1), s = {

package/dist/{useDeepCompareMemoize-BXv7DUcU.js → useDeepCompareMemoize-D3gozcjJ.js}

@@ -1,6 +1,6 @@
 import { a as e } from "./rolldown-runtime-Cb76FRpK.js";
 import { t } from "./react-sHtZdjeP.js";
-import { C as n } from "./useTheme-DbBkeP6Z.js";
+import { C as n } from "./useTheme-TzPgWXwB.js";
 //#region src/hooks/useDeepCompareMemoize.ts
 var r = /* @__PURE__ */ e(t(), 1);
 function i(e) {

package/dist/{useLifecycle-DDDsO4O2.js → useLifecycle-CaZi4wTw.js}

@@ -4,7 +4,7 @@ import { t as i } from "./react-sHtZdjeP.js";
 import { t as a } from "./compiler-runtime-CldRdSsv.js";
 import { m as o } from "./tooltip-s4zZxwKe.js";
 import { t as s } from "./jsx-runtime-3BD1kT0s.js";
-import { F as c, N as l } from "./useTheme-DbBkeP6Z.js";
+import { F as c, N as l } from "./useTheme-TzPgWXwB.js";
 var u = o("calendar", [
 	["path", {
 		d: "M8 2v4",

package/dist/{useTheme-DbBkeP6Z.js → useTheme-TzPgWXwB.js}

@@ -910,10 +910,7 @@ var rt = F((e) => {
 			custom_models: []
 		})
 	}).prefault({}),
-	experimental: s({
-		markdown: p().optional(),
-		rtc: p().optional()
-	}).prefault(() => ({})),
+	experimental: s({ markdown: p().optional() }).prefault(() => ({})),
 	server: s({
 		disable_file_downloads: p().optional(),
 		transport: m(["websocket", "sse"]).optional()

package/dist/{vega-component-C_dhEynE.js → vega-component-Blvspl7v.js}

@@ -3,20 +3,20 @@ import { g as t, h as n, m as r, o as i } from "./button-BQRdqQi1.js";
 import { t as a } from "./react-sHtZdjeP.js";
 import { t as o } from "./compiler-runtime-CldRdSsv.js";
 import { t as s } from "./tooltip-s4zZxwKe.js";
-import { C as c, a as l } from "./toDate-B0-Y0SEW.js";
+import { C as c, a as l } from "./toDate-BZZ64K_m.js";
 import { t as u } from "./jsx-runtime-3BD1kT0s.js";
 import { n as d } from "./error-banner-DxJ3s8YO.js";
 import { t as f } from "./debounce-C3jyATpc.js";
-import { R as p, n as ee } from "./useTheme-DbBkeP6Z.js";
+import { R as p, n as ee } from "./useTheme-TzPgWXwB.js";
 import { t as te } from "./objects-DCmMvZtn.js";
 import { a as m, t as h } from "./arrays-DoQ-AILx.js";
-import { t as ne } from "./useAsyncData-Phxf6GCd.js";
-import { a as g, i as re, n as ie, t as ae } from "./formats-DyYnckF5.js";
+import { t as ne } from "./useAsyncData-Dqw22wZQ.js";
+import { a as g, i as re, n as ie, t as ae } from "./formats-Ry7c-aIV.js";
 import { t as _ } from "./semaphore-89jsoHtS.js";
 import { D as oe, n as se } from "./vega-loader.browser-B9Pz0EGP.js";
 import { t as ce } from "./react-vega-C4T9Rb_w.js";
 import { a as le, n as v } from "./loader-DOVB0Syl.js";
-import { t as ue } from "./useDeepCompareMemoize-BXv7DUcU.js";
+import { t as ue } from "./useDeepCompareMemoize-D3gozcjJ.js";
 import { t as de } from "./use-vega-container-remeasure-Bz4PZMtt.js";
 //#region src/plugins/impl/vega/fix-relative-url.ts
 var fe = /* @__PURE__ */ e(a(), 1), pe = o();

package/dist/{vennDiagram-4TSXK5OY-fJ83Z7FE.js → vennDiagram-4TSXK5OY-DzCi-lRh.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-DBpOnw8c.js";
+import { p as v } from "./mermaid-BrdwbArF.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-DbO9cD15.js → wardleyDiagram-VM6X3IG4-CW48xa0n.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-DBpOnw8c.js";
+import { p as m } from "./mermaid-BrdwbArF.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-DmsdQJG7.js → xychartDiagram-S5SC5T6Z-UPxGGI2B.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-DBpOnw8c.js";
+import { p as x } from "./mermaid-BrdwbArF.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-dev205",
+  "version": "0.25.3-dev207",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -52,12 +52,12 @@
     "@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",
     "@marimo-team/codemirror-sql": "^0.3.0",
     "@marimo-team/llm-info": "workspace:*",
-    "@marimo-team/client": "workspace:*",
     "@marimo-team/marimo-api": "workspace:*",
     "@marimo-team/react-slotz": "^0.2.0",
     "@marimo-team/smart-cells": "workspace:*",
@@ -111,13 +111,10 @@
     "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",
@@ -228,7 +225,6 @@
     "tailwindcss": "^4.3.3",
     "vega-typings": "^2.3.0",
     "vite": "^8.3.4",
-    "vite-plugin-wasm": "^3.6.0",
     "vitest": "^4.1.11",
     "yaml": "^2.9.1"
   }

package/src/components/app-config/user-config-form.tsx

@@ -23,7 +23,6 @@ import {
   Form,
   FormControl,
   FormDescription,
-  FormField,
   FormItem,
   FormLabel,
   FormMessage,
@@ -1293,31 +1292,6 @@ export const UserConfigForm: React.FC = () => {
               notebook to take effect.
             </p>
 
-            <FormField
-              control={form.control}
-              name="experimental.rtc_v2"
-              render={({ field }) => (
-                <div className="flex flex-col gap-y-1">
-                  <FormItem className={formItemClasses}>
-                    <FormLabel className="font-normal">
-                      Real-Time Collaboration
-                    </FormLabel>
-                    <FormControl>
-                      <Checkbox
-                        data-testid="rtc-checkbox"
-                        checked={field.value === true}
-                        onCheckedChange={field.onChange}
-                      />
-                    </FormControl>
-                  </FormItem>
-
-                  <FormDescription>
-                    Enable experimental real-time collaboration. This change
-                    requires a page refresh to take effect.
-                  </FormDescription>
-                </div>
-              )}
-            />
             <OverriddenFormField
               control={form.control}
               name="experimental.external_agents"

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

@@ -1,13 +1,11 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 import { historyField } from "@codemirror/commands";
-import { EditorState, type Extension, StateEffect } from "@codemirror/state";
+import { EditorState, StateEffect } from "@codemirror/state";
 import { EditorView, ViewPlugin } from "@codemirror/view";
 import { useIntersectionObserver } from "@uidotdev/usehooks";
 import { useAtom, useAtomValue, useSetAtom } from "jotai";
 import React, { memo, useEffect, useMemo, useRef, useState } from "react";
 import useEvent from "react-use-event-hook";
-import { Button } from "@/components/ui/button";
-import { DelayMount } from "@/components/utils/delay-mount";
 import { aiCompletionCellAtom } from "@/core/ai/state";
 import { maybeAddMarimoImport } from "@/core/cells/add-missing-import";
 import { getNotebook } from "@/core/cells/cells";
@@ -35,17 +33,10 @@ import { prepareCellCodeUpdate } from "@/core/codemirror/language/cell-code";
 import { getEditorCodeAsPython } from "@/core/codemirror/language/utils";
 import { MARKDOWN_INITIAL_HIDE_CODE } from "@/core/codemirror/language/languages/markdown";
 import type { LanguageAdapterType } from "@/core/codemirror/language/types";
-import {
-  connectedDocAtom,
-  realTimeCollaboration,
-} from "@/core/codemirror/rtc/extension";
 import { autoInstantiateAtom, isAiFeatureEnabled } from "@/core/config/config";
 import type { UserConfig } from "@/core/config/config-schema";
 import { OverridingHotkeyProvider } from "@/core/hotkeys/hotkeys";
-import { connectionAtom } from "@/core/network/connection";
-import { canUseRtc, isRtcEnabled } from "@/core/rtc/state";
 import { useSaveNotebook } from "@/core/saving/save-component";
-import { isAppConnecting } from "@/core/session/connection-utils";
 import type { Theme } from "@/theme/useTheme";
 import { cn } from "@/utils/cn";
 import { invariant } from "@/utils/invariant";
@@ -99,21 +90,6 @@ export interface CellEditorProps
   tooltipParentSelector?: string;
 }
 
-export function composeRtcEditorConfig(
-  code: string,
-  extensions: Extension[],
-  rtc: ReturnType<typeof realTimeCollaboration> | undefined,
-): { code: string; extensions: Extension[] } {
-  if (!rtc) {
-    return { code, extensions };
-  }
-
-  return {
-    code: rtc.code,
-    extensions: [...extensions, rtc.extension],
-  };
-}
-
 const CellEditorInternal = ({
   theme,
   showPlaceholder,
@@ -358,42 +334,24 @@ const CellEditorInternal = ({
     saveOrNameNotebook,
   ]);
 
-  const rtcEnabled = isRtcEnabled() && canUseRtc(cellId);
-  const createEditorConfig = (initialCode?: string) => {
-    if (!rtcEnabled) {
-      return composeRtcEditorConfig(code, extensions, undefined);
-    }
-
-    const rtc = realTimeCollaboration(cellId, initialCode);
-    return composeRtcEditorConfig(code, extensions, rtc);
-  };
-
   const handleInitializeEditor = useEvent(() => {
-    const editorConfig = createEditorConfig(code);
-
     // Create a new editor
     const ev = new EditorView({
-      state: EditorState.create({
-        doc: editorConfig.code,
-        extensions: editorConfig.extensions,
-      }),
+      state: EditorState.create({ doc: code, extensions }),
     });
     setEditorView(ev);
     // Initialize the language adapter
-    if (!rtcEnabled) {
-      switchLanguage(ev, {
-        language: getInitialLanguageAdapter(ev.state).type,
-      });
-    }
+    switchLanguage(ev, {
+      language: getInitialLanguageAdapter(ev.state).type,
+    });
   });
 
   const handleReconfigureEditor = useEvent(() => {
     invariant(editorViewRef.current !== null, "Editor view is not initialized");
-    const editorConfig = createEditorConfig();
 
     editorViewRef.current.dispatch({
       effects: [
-        StateEffect.reconfigure.of([editorConfig.extensions]),
+        StateEffect.reconfigure.of([extensions]),
         reconfigureLanguageEffect(editorViewRef.current, {
           completionConfig: userConfig.completion,
           hotkeysProvider: new OverridingHotkeyProvider(
@@ -410,24 +368,18 @@ const CellEditorInternal = ({
 
   const handleDeserializeEditor = useEvent(() => {
     invariant(serializedEditorState, "Editor view is not initialized");
-    const editorConfig = createEditorConfig(code);
 
     const ev = new EditorView({
       state: EditorState.fromJSON(
         serializedEditorState,
-        {
-          doc: editorConfig.code,
-          extensions: editorConfig.extensions,
-        },
+        { doc: code, extensions },
         { history: historyField },
       ),
     });
     // Initialize the language adapter
-    if (!rtcEnabled) {
-      switchLanguage(ev, {
-        language: getInitialLanguageAdapter(ev.state).type,
-      });
-    }
+    switchLanguage(ev, {
+      language: getInitialLanguageAdapter(ev.state).type,
+    });
     setEditorView(ev);
     // The restored state is used once; the next mount builds a fresh editor.
     takeRestoredEditorState({ cellId });
@@ -626,45 +578,4 @@ const CellCodeMirrorEditor = React.forwardRef(
 );
 CellCodeMirrorEditor.displayName = "CellCodeMirrorEditor";
 
-// Wait until the websocket connection is open before rendering the editor
-// This is used for real-time collaboration since the backend needs the connection started
-// before connecting the rtc websockets
-function WithWaitUntilConnected<T extends Pick<CellEditorProps, "id">>(
-  Component: React.ComponentType<T>,
-) {
-  const WaitUntilConnectedComponent = (props: T) => {
-    const connection = useAtomValue(connectionAtom);
-    const [rtcDoc, setRtcDoc] = useAtom(connectedDocAtom);
-
-    if (
-      isRtcEnabled() &&
-      canUseRtc(props.id) &&
-      (isAppConnecting(connection.state) || rtcDoc === undefined)
-    ) {
-      return (
-        <div className="flex h-full w-full items-baseline p-4">
-          <DelayMount milliseconds={1000} fallback={null}>
-            <span>Waiting for real-time collaboration connection...</span>
-            <Button
-              variant="link"
-              onClick={() => {
-                setRtcDoc("disabled");
-              }}
-            >
-              Turn off real-time collaboration
-            </Button>
-          </DelayMount>
-        </div>
-      );
-    }
-
-    return <Component {...props} />;
-  };
-
-  WaitUntilConnectedComponent.displayName = `WithWaitUntilConnected(${Component.displayName})`;
-  return WaitUntilConnectedComponent;
-}
-
-export const CellEditor = isRtcEnabled()
-  ? WithWaitUntilConnected(memo(CellEditorInternal))
-  : memo(CellEditorInternal);
+export const CellEditor = memo(CellEditorInternal);

package/src/components/editor/chrome/wrapper/footer.tsx

@@ -21,7 +21,6 @@ import { CopilotStatusIcon } from "./footer-items/copilot-status";
 import { DocumentSyncStatus } from "./footer-items/document-sync-status";
 import { MachineStats } from "./footer-items/machine-stats";
 import { PyodideStatus } from "./footer-items/pyodide-status";
-import { RTCStatus } from "./footer-items/rtc-status";
 import { RuntimeSettings } from "./footer-items/runtime-settings";
 import { useSetDependencyPanelTab } from "./useDependencyPanelTab";
 
@@ -113,7 +112,6 @@ export const Footer: React.FC = () => {
         <AttachmentStatus />
         <AIStatusIcon />
         <CopilotStatusIcon />
-        <RTCStatus />
       </div>
     </footer>
   );

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

@@ -21,7 +21,6 @@ import {
 import { OverridingHotkeyProvider } from "@/core/hotkeys/hotkeys";
 import { store } from "@/core/state/jotai";
 import { activeDocumentModelAtom } from "@/core/session/active-notebook";
-import { isRtcEnabled } from "../../rtc/state";
 import {
   createNotebookActions,
   exportedForTesting,
@@ -31,11 +30,6 @@ import {
 import { applyDocument, flushDocument, followDocument } from "../document";
 import { type CellId, SCRATCH_CELL_ID } from "../ids";
 
-vi.mock("../../rtc/state", async (importOriginal) => ({
-  ...(await importOriginal<typeof import("../../rtc/state")>()),
-  isRtcEnabled: vi.fn(() => false),
-}));
-
 const { initialNotebookState } = exportedForTesting;
 
 const a = cellId("a");
@@ -148,18 +142,6 @@ describe("applyDocument", () => {
     expect(view.state.field(languageAdapterState).type).toBe("python");
   });
 
-  it("leaves an RTC editor to Loro", () => {
-    vi.mocked(isRtcEnabled).mockReturnValueOnce(true);
-    const state = notebookOf([cell(a)]);
-    const view = createEditor("a = 1");
-    state.cellHandles[a].current = { editorView: view, editorViewOrNull: view };
-
-    const next = applyDocument(state, documentOf([cell(a, { code: "a = 2" })]));
-
-    expect(next.cellData[a].code).toBe("a = 2");
-    expect(view.state.doc.toString()).toBe("a = 1");
-  });
-
   it("keeps the code this client has when the host withholds source", () => {
     const state = notebookOf([cell(a)]);
 

package/src/core/cells/document.ts

@@ -21,7 +21,6 @@ import type {
 } from "@/core/notebook/document";
 import type { DispatchedActionOf } from "@/utils/createReducer";
 import { prepareCellCodeUpdate } from "../codemirror/language/cell-code";
-import { canUseRtc, isRtcEnabled } from "../rtc/state";
 import { store } from "../state/jotai";
 import { activeDocumentModelAtom } from "../session/active-notebook";
 import type { NotebookState, ReducerCellActions } from "./cells";
@@ -60,14 +59,12 @@ function followCell(
   if (code === current.code) {
     return { ...current, name: cell.name, config };
   }
-  // RTC cells follow Loro. Other editors take the host's code; one that
-  // shows it already, as the editor this client types in does, is left alone.
-  if (!isRtcEnabled() || !canUseRtc(current.id)) {
-    const view = handle?.current?.editorViewOrNull;
-    const update = view && prepareCellCodeUpdate(view.state, code);
-    if (update) {
-      view.dispatch(update);
-    }
+  // The editor takes the host's code; one that shows it already, as the
+  // editor this client types in does, is left alone.
+  const view = handle?.current?.editorViewOrNull;
+  const update = view && prepareCellCodeUpdate(view.state, code);
+  if (update) {
+    view.dispatch(update);
   }
   return {
     ...current,

package/src/core/codemirror/cells/__tests__/extensions.test.ts

@@ -8,11 +8,9 @@ import {
 } from "@codemirror/state";
 import { describe, expect, it } from "vitest";
 import { formattingChangeEffect } from "../../format";
-import { loroSyncAnnotation } from "../../rtc/loro/sync";
 import { exportedForTesting } from "../extensions";
 
-const { isCollaboratorUpdate, shouldAutorunMarkdownUpdate } =
-  exportedForTesting;
+const { shouldAutorunMarkdownUpdate } = exportedForTesting;
 
 function createTransaction(spec: TransactionSpec) {
   return EditorState.create({ doc: "" }).update(spec);
@@ -51,24 +49,6 @@ describe("shouldAutorunMarkdownUpdate", () => {
     ).toBe(false);
   });
 
-  it("ignores RTC sync transactions", () => {
-    const transaction = createTransaction({
-      changes: { from: 0, insert: "#" },
-      annotations: [
-        Transaction.userEvent.of("input.type"),
-        loroSyncAnnotation.of(true),
-      ],
-    });
-
-    expect(
-      shouldAutorunMarkdownUpdate({
-        docChanged: transaction.docChanged,
-        transactions: [transaction],
-        hasFocus: true,
-      }),
-    ).toBe(false);
-  });
-
   it("ignores remote transactions while focused", () => {
     const transaction = createTransaction({
       changes: { from: 0, insert: "#" },
@@ -126,28 +106,3 @@ describe("shouldAutorunMarkdownUpdate", () => {
     ).toBe(false);
   });
 });
-
-describe("isCollaboratorUpdate", () => {
-  it("recognizes an update made only of Loro sync transactions", () => {
-    const transaction = createTransaction({
-      changes: { from: 0, insert: "#" },
-      annotations: [loroSyncAnnotation.of(true)],
-    });
-
-    expect(isCollaboratorUpdate([transaction])).toBe(true);
-  });
-
-  it("treats typing beside a Loro sync transaction as local", () => {
-    const remote = createTransaction({
-      changes: { from: 0, insert: "#" },
-      annotations: [loroSyncAnnotation.of(true)],
-    });
-    const local = createTransaction({
-      changes: { from: 0, insert: "x" },
-      annotations: [Transaction.userEvent.of("input.type")],
-    });
-
-    expect(isCollaboratorUpdate([remote, local])).toBe(false);
-    expect(isCollaboratorUpdate([])).toBe(false);
-  });
-});

package/src/core/codemirror/cells/extensions.ts

@@ -14,7 +14,6 @@ import {
   clearPendingCutAtom,
   pendingCutCellIdsAtom,
 } from "@/core/cells/pending-cut-service";
-import { loroSyncAnnotation } from "@/core/codemirror/rtc/loro/sync";
 import type { KeymapConfig } from "@/core/config/config-schema";
 import type { HotkeyProvider } from "@/core/hotkeys/hotkeys";
 import { getFeatureFlag } from "@/core/config/feature-flag";
@@ -325,11 +324,6 @@ function cellKeymaps({
 function cellCodeEditing(hotkeys: HotkeyProvider): Extension[] {
   const onChangePlugin = EditorView.updateListener.of((update) => {
     if (update.docChanged) {
-      // Loro already applied a collaborator's change here. The client that
-      // typed it syncs it to the document.
-      if (isCollaboratorUpdate(update.transactions)) {
-        return;
-      }
       // Check if the doc update was a formatting change
       // e.g. changing from python to markdown
       const isFormattingChange = update.transactions.some((tr) =>
@@ -355,14 +349,6 @@ function cellCodeEditing(hotkeys: HotkeyProvider): Extension[] {
   return [onChangePlugin, formatKeymapExtension(hotkeys)];
 }
 
-/** Whether every transaction in an update arrived from a collaborator through Loro. */
-function isCollaboratorUpdate(transactions: readonly Transaction[]): boolean {
-  return (
-    transactions.length > 0 &&
-    transactions.every((tr) => tr.annotation(loroSyncAnnotation) !== undefined)
-  );
-}
-
 const MARKDOWN_AUTORUN_USER_EVENTS = ["input", "delete", "undo", "redo"];
 
 function shouldAutorunMarkdownUpdate({
@@ -397,10 +383,7 @@ function shouldAutorunMarkdownUpdate({
   return transactions.some((tr) => {
     // Ignore remote changes to avoid duplicate runs. The client that made the
     // edit runs it.
-    if (
-      tr.annotation(Transaction.remote) ||
-      tr.annotation(loroSyncAnnotation) !== undefined
-    ) {
+    if (tr.annotation(Transaction.remote)) {
       return false;
     }
 
@@ -480,6 +463,5 @@ export function cellBundle({
 }
 
 export const exportedForTesting = {
-  isCollaboratorUpdate,
   shouldAutorunMarkdownUpdate,
 };

package/src/core/config/config-schema.ts

@@ -204,7 +204,6 @@ export const UserConfigSchema = z
     experimental: z
       .looseObject({
         markdown: z.boolean().optional(),
-        rtc: z.boolean().optional(),
         // Add new experimental features here
       })
       // Pass through so that we don't remove any extra keys that the user has added.

package/src/core/config/feature-flag.tsx

@@ -8,7 +8,6 @@ import { getResolvedMarimoConfig } from "./config";
 export interface ExperimentalFeatures {
   markdown: boolean; // Used in playground (community cloud)
   wasm_layouts: boolean; // Used in playground (community cloud)
-  rtc_v2: boolean;
   cache_panel: boolean;
   external_agents: boolean;
   debugger: boolean; // Live frame-watching debugger (gutter breakpoints + pdb)
@@ -19,7 +18,6 @@ export interface ExperimentalFeatures {
 const defaultValues: ExperimentalFeatures = {
   markdown: true,
   wasm_layouts: false,
-  rtc_v2: false,
   cache_panel: import.meta.env.DEV,
   external_agents: import.meta.env.DEV,
   debugger: false,