@marimo-team/islands 0.24.3-dev64 → 0.24.3-dev69

package/src/components/chat/acp/state.ts

@@ -257,7 +257,7 @@ interface AgentConfig {
 const AGENT_CONFIG: Record<ExternalAgentId, AgentConfig> = {
   claude: {
     port: 3017,
-    command: "npx @zed-industries/claude-code-acp",
+    command: "npx @agentclientprotocol/claude-agent-acp",
     sessionSupport: "single",
   },
   gemini: {

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

@@ -2037,6 +2037,150 @@ describe("cell reducer", () => {
     );
   });
 
+  it("can collapse all cells when nested heading ranges end at the same cell", () => {
+    actions.createNewCell({ cellId: firstCellId, before: false });
+    actions.createNewCell({
+      cellId: cellId("1"),
+      before: false,
+      code: "# Header",
+    });
+    actions.createNewCell({
+      cellId: cellId("2"),
+      before: false,
+      code: "## Subheader",
+    });
+    actions.createNewCell({
+      cellId: cellId("3"),
+      before: false,
+      code: "### Subsubheader",
+    });
+
+    const headerId = state.cellIds.atOrThrow(FIRST_COLUMN).atOrThrow(1);
+    state.cellRuntime[headerId] = {
+      ...state.cellRuntime[headerId],
+      outline: {
+        items: [{ name: "Header", level: 1, by: { id: "header" } }],
+      },
+    };
+
+    const subheaderId = state.cellIds.atOrThrow(FIRST_COLUMN).atOrThrow(2);
+    state.cellRuntime[subheaderId] = {
+      ...state.cellRuntime[subheaderId],
+      outline: {
+        items: [{ name: "Subheader", level: 2, by: { id: "subheader" } }],
+      },
+    };
+
+    const subsubheaderId = state.cellIds.atOrThrow(FIRST_COLUMN).atOrThrow(3);
+    state.cellRuntime[subsubheaderId] = {
+      ...state.cellRuntime[subsubheaderId],
+      outline: {
+        items: [{ name: "Subsubheader", level: 3, by: { id: "subsubheader" } }],
+      },
+    };
+
+    // The header, subheader and subsubheader ranges all end at the last
+    // cell. Collapsing all used to throw "Node ... not found in tree" and
+    // leave the whole notebook unchanged.
+    actions.collapseAllCells();
+    expect(state.cellIds.atOrThrow(FIRST_COLUMN).isCollapsed(headerId)).toBe(
+      true,
+    );
+    expect(state.cellIds.atOrThrow(FIRST_COLUMN).topLevelIds).toEqual([
+      firstCellId,
+      headerId,
+    ]);
+
+    // Each level is nested under its parent, collapsed
+    actions.expandCell({ cellId: headerId });
+    expect(state.cellIds.atOrThrow(FIRST_COLUMN).isCollapsed(subheaderId)).toBe(
+      true,
+    );
+    actions.expandCell({ cellId: subheaderId });
+    expect(
+      state.cellIds.atOrThrow(FIRST_COLUMN).isCollapsed(subsubheaderId),
+    ).toBe(true);
+  });
+
+  it("can collapse all cells when a deep chain is followed by a later section", () => {
+    actions.createNewCell({ cellId: firstCellId, before: false });
+    actions.createNewCell({
+      cellId: cellId("1"),
+      before: false,
+      code: "# Header",
+    });
+    actions.createNewCell({
+      cellId: cellId("2"),
+      before: false,
+      code: "## Section A",
+    });
+    actions.createNewCell({
+      cellId: cellId("3"),
+      before: false,
+      code: "### Sub of A",
+    });
+    actions.createNewCell({
+      cellId: cellId("4"),
+      before: false,
+      code: "## Section B",
+    });
+
+    const headerId = state.cellIds.atOrThrow(FIRST_COLUMN).atOrThrow(1);
+    state.cellRuntime[headerId] = {
+      ...state.cellRuntime[headerId],
+      outline: {
+        items: [{ name: "Header", level: 1, by: { id: "header" } }],
+      },
+    };
+
+    const sectionAId = state.cellIds.atOrThrow(FIRST_COLUMN).atOrThrow(2);
+    state.cellRuntime[sectionAId] = {
+      ...state.cellRuntime[sectionAId],
+      outline: {
+        items: [{ name: "Section A", level: 2, by: { id: "section-a" } }],
+      },
+    };
+
+    const subsectionId = state.cellIds.atOrThrow(FIRST_COLUMN).atOrThrow(3);
+    state.cellRuntime[subsectionId] = {
+      ...state.cellRuntime[subsectionId],
+      outline: {
+        items: [{ name: "Sub of A", level: 3, by: { id: "sub-of-a" } }],
+      },
+    };
+
+    const sectionBId = state.cellIds.atOrThrow(FIRST_COLUMN).atOrThrow(4);
+    state.cellRuntime[sectionBId] = {
+      ...state.cellRuntime[sectionBId],
+      outline: {
+        items: [{ name: "Section B", level: 2, by: { id: "section-b" } }],
+      },
+    };
+
+    actions.collapseAllCells();
+    expect(state.cellIds.atOrThrow(FIRST_COLUMN).isCollapsed(headerId)).toBe(
+      true,
+    );
+    expect(state.cellIds.atOrThrow(FIRST_COLUMN).topLevelIds).toEqual([
+      firstCellId,
+      headerId,
+    ]);
+
+    // Both sections sit under the header, collapsed, with the subsection
+    // nested under section A
+    actions.expandCell({ cellId: headerId });
+    expect(state.cellIds.atOrThrow(FIRST_COLUMN).isCollapsed(sectionAId)).toBe(
+      true,
+    );
+    expect(state.cellIds.atOrThrow(FIRST_COLUMN).isCollapsed(sectionBId)).toBe(
+      true,
+    );
+    actions.expandCell({ cellId: sectionAId });
+    expect(
+      state.cellIds.atOrThrow(FIRST_COLUMN).isCollapsed(subsectionId),
+    ).toBe(true);
+  });
+
   it("can show hidden cells", () => {
     actions.createNewCell({ cellId: firstCellId, before: false });
     actions.createNewCell({ cellId: cellId("1"), before: false });

package/src/core/cells/cells.ts

@@ -1365,10 +1365,7 @@ const {
 
         // Find the start/end of the collapsed ranges
         const nodes = [...column.nodes];
-        const rangeIndexes: {
-          start: CellIndex;
-          end: CellIndex;
-        }[] = [];
+        const visibleEndByOriginalEnd = new Map<CellIndex, CellIndex>();
         const reversedCollapseRanges = [];
 
         // Iterate in reverse order (bottom-up) to process children first
@@ -1377,20 +1374,13 @@ const {
           const range = findCollapseRange(i, outlines);
           if (range) {
             const startIndex = i;
-            let endIndex = range[1];
+            const originalEnd = range[1];
+            const endIndex =
+              visibleEndByOriginalEnd.get(originalEnd) ?? originalEnd;
 
-            // Check if the parent's end point is inside any already-collapsed child range
-            const parentEndInChild = rangeIndexes.find(
-              (child) => child.start <= endIndex && child.end === endIndex,
-            );
-
-            if (parentEndInChild) {
-              // Adjust the new endIndex to the child's start
-              endIndex = parentEndInChild.start;
-            }
-
-            // Store this range for future child checks
-            rangeIndexes.push({ start: startIndex, end: endIndex });
+            // After this section collapses, its heading represents this
+            // endpoint for any enclosing section that shares it.
+            visibleEndByOriginalEnd.set(originalEnd, startIndex);
 
             // Add the range to the list of ranges
             const cellId = column.atOrThrow(startIndex);

package/src/core/wasm/__tests__/bridge.test.ts

@@ -126,6 +126,7 @@ describe("PyodideBridge.readCode", () => {
     await PyodideBridge.INSTANCE.readCode();
 
     expect(mockBootstrap).toHaveBeenCalledWith({
+      version: "0.0.0-test",
       pyodideIndexUrl: undefined,
       pyodideLockfileUrl: undefined,
       pypiIndexUrl: undefined,
@@ -223,21 +224,21 @@ describe("getWasmWorkerName", () => {
       .__MARIMO_HAS_WASM_CONTROLLER__;
   });
 
-  it("returns the version without suffix by default", () => {
-    expect(getWasmWorkerName()).toBe("0.0.0-test");
+  it("returns the default worker name without suffix", () => {
+    expect(getWasmWorkerName()).toBe("marimo");
   });
 
   it("appends ::controller when the host opts in", () => {
     (
       window as unknown as { __MARIMO_HAS_WASM_CONTROLLER__?: boolean }
     ).__MARIMO_HAS_WASM_CONTROLLER__ = true;
-    expect(getWasmWorkerName()).toBe("0.0.0-test::controller");
+    expect(getWasmWorkerName()).toBe("marimo::controller");
   });
 
   it("does not append the suffix for non-true values", () => {
     (
       window as unknown as { __MARIMO_HAS_WASM_CONTROLLER__?: unknown }
     ).__MARIMO_HAS_WASM_CONTROLLER__ = "true";
-    expect(getWasmWorkerName()).toBe("0.0.0-test");
+    expect(getWasmWorkerName()).toBe("marimo");
   });
 });

package/src/core/wasm/__tests__/runtime-config.test.ts

@@ -1,8 +1,12 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import { afterEach, assert, describe, expect, it } from "vitest";
+import { afterEach, assert, describe, expect, it, vi } from "vitest";
 import { getWasmRuntimeConfig } from "../runtime-config";
 
+vi.mock("@/core/meta/globals", () => ({
+  getMarimoVersion: () => "0.0.0-test",
+}));
+
 afterEach(() => {
   document.head.innerHTML = "";
 });
@@ -10,6 +14,7 @@ afterEach(() => {
 describe("getWasmRuntimeConfig", () => {
   it("uses runtime defaults when no URLs are configured", () => {
     expect(getWasmRuntimeConfig()).toEqual({
+      version: "0.0.0-test",
       pyodideIndexUrl: undefined,
       pyodideLockfileUrl: undefined,
       pypiIndexUrl: undefined,
@@ -25,6 +30,7 @@ describe("getWasmRuntimeConfig", () => {
         data-pypi-index-url="https://packages.example.com/{package_name}/json"
       ></marimo-wasm>`;
     expect(getWasmRuntimeConfig()).toEqual({
+      version: "0.0.0-test",
       pyodideIndexUrl: "https://example.com/blog/runtime/",
       pyodideLockfileUrl: "https://example.com/locks/pyodide.json?v=1&x=2",
       pypiIndexUrl: "https://packages.example.com/{package_name}/json",
@@ -46,6 +52,7 @@ describe("getWasmRuntimeConfig", () => {
       element.dataset[key] = "https://invalid host/";
 
       expect(getWasmRuntimeConfig()).toEqual({
+        version: "0.0.0-test",
         pyodideIndexUrl: "https://example.com/notebook/pyodide/",
         pyodideLockfileUrl:
           "https://example.com/notebook/lockfile/pyodide.json",

package/src/core/wasm/bridge.ts

@@ -12,7 +12,6 @@ import { generateUUID } from "@/utils/uuid";
 import { createModuleWorker } from "@/utils/worker";
 import { notebookIsRunningAtom } from "../cells/cells";
 import type { CommandMessage } from "../kernel/messages";
-import { getMarimoVersion } from "../meta/globals";
 import { getInitialAppMode } from "../mode";
 import { API } from "../network/api";
 import type {
@@ -49,6 +48,7 @@ import { fallbackFileStore, notebookFileStore } from "./store";
 import { isWasm } from "./utils";
 import saveWorkerUrl from "./worker/save-worker.ts?worker&url";
 import workerUrl from "./worker/worker.ts?worker&url";
+import { CUSTOM_CONTROLLER_SUFFIX } from "./worker/constants";
 import type { SaveWorkerSchema } from "./worker/save-worker";
 import type { WorkerSchema } from "./worker/worker";
 
@@ -91,7 +91,7 @@ export class PyodideBridge implements RunRequests, EditRequests {
     const saveWorker = createModuleWorker(
       new URL(saveWorkerUrl, import.meta.url),
       {
-        // Pass the version (and optional capability suffix) to the worker
+        // Pass the optional custom-controller capability to the worker.
         name: getWasmWorkerName(),
       },
     );
@@ -110,7 +110,7 @@ export class PyodideBridge implements RunRequests, EditRequests {
 
     // Create a worker
     const worker = createModuleWorker(new URL(workerUrl, import.meta.url), {
-      // Pass the version (and optional capability suffix) to the worker
+      // Pass the optional custom-controller capability to the worker.
       name: getWasmWorkerName(),
     });
 
@@ -726,10 +726,9 @@ export function createPyodideConnection(): IConnectionTransport {
   });
 }
 
-// Compose the worker name. The version prefix is read by getMarimoVersion()
-// in the worker; the optional "::controller" suffix tells getController.ts
-// that the host page provides a custom /wasm/controller.js and that the
-// dynamic import should be attempted. Hosts opt in by setting
+// Compose the worker name. The optional "::controller" suffix tells
+// getController.ts that the host page provides a custom /wasm/controller.js
+// and that the dynamic import should be attempted. Hosts opt in by setting
 // `window.__MARIMO_HAS_WASM_CONTROLLER__ = true` before
 // PyodideBridge/worker initialization.
 export function getWasmWorkerName(): string {
@@ -737,5 +736,5 @@ export function getWasmWorkerName(): string {
     typeof window !== "undefined" &&
     (window as unknown as { __MARIMO_HAS_WASM_CONTROLLER__?: boolean })
       .__MARIMO_HAS_WASM_CONTROLLER__ === true;
-  return getMarimoVersion() + (hasCustomController ? "::controller" : "");
+  return `marimo${hasCustomController ? CUSTOM_CONTROLLER_SUFFIX : ""}`;
 }

package/src/core/wasm/runtime-config.ts

@@ -1,6 +1,9 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
+import { getMarimoVersion } from "@/core/meta/globals";
+
 export interface WasmRuntimeConfig {
+  version: string;
   pyodideIndexUrl?: string;
   pyodideLockfileUrl?: string;
   pypiIndexUrl?: string;
@@ -16,6 +19,7 @@ export function getWasmRuntimeConfig(): WasmRuntimeConfig {
     }
   };
   return {
+    version: getMarimoVersion(),
     pyodideIndexUrl: resolve(element?.dataset.pyodideIndexUrl),
     pyodideLockfileUrl: resolve(element?.dataset.pyodideLockfileUrl),
     // URL serialization escapes the placeholder understood by micropip.

package/src/core/wasm/worker/constants.ts

@@ -1,2 +1,3 @@
 /* Copyright 2026 Marimo. All rights reserved. */
+export const CUSTOM_CONTROLLER_SUFFIX = "::controller";
 export const TRANSPORT_ID = "marimo-transport";

package/src/core/wasm/worker/getController.ts

@@ -1,5 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 import { DefaultWasmController } from "./bootstrap";
+import { CUSTOM_CONTROLLER_SUFFIX } from "./constants";
 import type { WasmController } from "./types";
 
 // Load the controller
@@ -8,7 +9,8 @@ export async function getController(version: string): Promise<WasmController> {
   // Hosts that provide a custom /wasm/controller.js opt in via the worker
   // name (see bridge.ts). Default: skip the dynamic import to avoid a
   // guaranteed-404 round trip on the standard build.
-  const hasCustomController = self.name?.includes("::controller") ?? false;
+  const hasCustomController =
+    self.name?.includes(CUSTOM_CONTROLLER_SUFFIX) ?? false;
   if (!hasCustomController) {
     return new DefaultWasmController();
   }

package/src/core/wasm/worker/save-worker.ts

@@ -33,15 +33,14 @@ const runtimeConfig = new Deferred<WasmRuntimeConfig>();
 async function loadPyodideAndPackages() {
   try {
     // Import pyodide
-    const marimoVersion = getMarimoVersion();
-    const pyodideVersion = getPyodideVersion(marimoVersion);
+    const config = await runtimeConfig.promise;
+    const pyodideVersion = getPyodideVersion(config.version);
 
     // Bootstrap the controller
-    const controller = await getController(marimoVersion);
+    const controller = await getController(config.version);
     self.controller = controller;
     self.pyodide = await controller.bootstrap({
-      ...(await runtimeConfig.promise),
-      version: marimoVersion,
+      ...config,
       pyodideVersion: pyodideVersion,
     });
 
@@ -108,8 +107,3 @@ const rpc = createRPC<SaveWorkerSchema, ParentSchema>({
 rpc.addMessageListener("bootstrap", (config) => runtimeConfig.resolve(config));
 
 rpc.send("ready", {});
-
-function getMarimoVersion() {
-  // Worker name is "<version>" or "<version>::<capability>" — see bridge.ts.
-  return self.name.split("::")[0];
-}

package/src/core/wasm/worker/types.ts

@@ -46,7 +46,6 @@ export interface WasmController {
    */
   bootstrap(
     opts: WasmRuntimeConfig & {
-      version: string;
       pyodideVersion: string;
     },
   ): Promise<PyodideInterface>;

package/src/core/wasm/worker/worker.ts

@@ -53,16 +53,15 @@ const runtimeConfig = new Deferred<WasmRuntimeConfig>();
 // Initialize pyodide
 async function loadPyodideAndPackages() {
   try {
-    const marimoVersion = getMarimoVersion();
-    const pyodideVersion = getPyodideVersion(marimoVersion);
-    const controller = await t.wrapAsync(getController)(marimoVersion);
+    const config = await runtimeConfig.promise;
+    const pyodideVersion = getPyodideVersion(config.version);
+    const controller = await t.wrapAsync(getController)(config.version);
     self.controller = controller;
     rpc.send.initializingMessage({
       message: "Loading marimo...",
     });
     self.pyodide = await t.wrapAsync(controller.bootstrap.bind(controller))({
-      ...(await runtimeConfig.promise),
-      version: marimoVersion,
+      ...config,
       pyodideVersion: pyodideVersion,
     });
   } catch (error) {
@@ -380,9 +379,4 @@ const namesThatRequireSync = new Set<keyof RawBridge>([
   "update_file",
 ]);
 
-function getMarimoVersion() {
-  // Worker name is "<version>" or "<version>::<capability>" — see bridge.ts.
-  return self.name.split("::")[0];
-}
-
 const pyodideReadyPromise = t.wrapAsync(loadPyodideAndPackages)();