@marimo-team/islands 0.24.3-dev83 → 0.24.3-dev88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/islands",
-  "version": "0.24.3-dev83",
+  "version": "0.24.3-dev88",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

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

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

package/src/components/editor/actions/__tests__/pair-with-agent-commands.test.ts

@@ -129,7 +129,7 @@ describe("getTerminalCommand", () => {
           PAIR_PREVIEW,
         ),
       ).toBe(
-        String.raw`codex "$(MARIMO_PAIR_NEXT=1 uv run marimo pair prompt \
+        String.raw`codex "$(MARIMO_PAIR_NEXT=1 uvx marimo@latest pair prompt \
   --url http://localhost:8000)"`,
       );
     } finally {
@@ -152,7 +152,7 @@ describe("getTerminalCommand", () => {
           PAIR_PREVIEW,
         ),
       ).toBe(
-        String.raw`${cli} "$(MARIMO_PAIR_NEXT=1 uv run marimo pair prompt \
+        String.raw`${cli} "$(MARIMO_PAIR_NEXT=1 uvx marimo@latest pair prompt \
   --url http://localhost:8000 \
   --file notebooks/example.py \
   --session s_ab12cd \
@@ -264,8 +264,8 @@ describe("getRawPrompt", () => {
     expect(getRawPrompt(connection, null, PAIR_PREVIEW)).toBe(
       "Pair with me on this running marimo notebook.\n\n" +
         `URL: http://localhost:8000\n${fields}\n` +
-        "Run `uv run marimo pair --help` first.\n" +
-        "Use `uv run marimo` for all marimo commands.\n\n" +
+        "Run `uvx marimo@latest pair --help` first.\n" +
+        "Use `uvx marimo@latest` for all marimo commands.\n\n" +
         "Once connected, send a fun toast using `mo.status.toast(...)` (`import marimo as mo`).",
     );
   });
@@ -278,8 +278,8 @@ describe("getRawPrompt", () => {
         "URL: http://localhost:8000\n" +
         "File: notebooks/example.py\n" +
         "Session: s_ab12cd\n\n" +
-        "Run `uv run marimo pair --help` first.\n" +
-        "Use `uv run marimo` for all marimo commands.\n\n" +
+        "Run `uvx marimo@latest pair --help` first.\n" +
+        "Use `uvx marimo@latest` for all marimo commands.\n\n" +
         "Once connected, send a fun toast using `mo.status.toast(...)` (`import marimo as mo`).",
     );
   });

package/src/components/editor/actions/__tests__/pair-with-agent-modal.test.tsx

@@ -203,7 +203,7 @@ describe("PairWithAgentModal", () => {
     );
     await waitFor(() =>
       expect(copyToClipboard).toHaveBeenCalledWith(
-        String.raw`claude "$(MARIMO_PAIR_NEXT=1 uv run marimo pair prompt \
+        String.raw`claude "$(MARIMO_PAIR_NEXT=1 uvx marimo@latest pair prompt \
   --url http://localhost:8000/ \
   --file notebook.py \
   --session ${getSessionId()} \

package/src/components/editor/output/Outputs.css

@@ -64,7 +64,6 @@
   padding-top: 2px;
   padding-bottom: 2px;
   overflow: auto;
-  overscroll-behavior: contain;
   @apply text-xs;
 
   .w-rjv-wrap > :not(:last-child) {

package/src/components/ui/table.tsx

@@ -7,7 +7,7 @@ const Table = React.forwardRef<
   HTMLTableElement,
   React.HTMLAttributes<HTMLTableElement>
 >(({ className, ...props }, ref) => (
-  <div className="w-full overflow-auto overscroll-contain scrollbar-thin flex-1 print:overflow-hidden">
+  <div className="w-full overflow-auto scrollbar-thin flex-1 print:overflow-hidden">
     <table
       ref={ref}
       className={cn("w-full caption-bottom text-sm", className)}

package/src/css/app/Cell.css

@@ -82,7 +82,6 @@
     .console-output-area {
       max-height: 610px;
       overflow: auto;
-      overscroll-behavior: contain;
     }
 
     /* Special case for particular components */
@@ -522,7 +521,6 @@
   display: flow-root;
 
   overflow: auto;
-  overscroll-behavior: contain;
 }
 
 .marimo-output-stale,

package/src/plugins/impl/FileBrowserPlugin.tsx

@@ -218,7 +218,7 @@ export const FileBrowser = ({
 
   const { data, error, isPending } = useAsyncData(() => {
     return list_directory({ path: path });
-  }, [path, randomId]);
+  }, [path, randomId, list_directory]);
 
   useEffect(() => {
     if (!isPending) {
@@ -238,9 +238,15 @@ export const FileBrowser = ({
   // Reset the roving tabindex whenever the listing reloads (a new path or a
   // same-path refresh) so activeIndex never points past the current rows.
   const listingKey = `${path}::${randomId}`;
-  const [prevListingKey, setPrevListingKey] = useState(listingKey);
-  if (prevListingKey !== listingKey) {
-    setPrevListingKey(listingKey);
+  const [prevListing, setPrevListing] = useState({
+    listingKey,
+    list_directory,
+  });
+  if (
+    prevListing.listingKey !== listingKey ||
+    prevListing.list_directory !== list_directory
+  ) {
+    setPrevListing({ listingKey, list_directory });
     setActiveIndex(0);
   }
 

package/src/plugins/impl/__tests__/FileBrowserPlugin.test.tsx

@@ -5,8 +5,9 @@ import { beforeAll, describe, expect, it, vi } from "vitest";
 import { SetupMocks } from "@/__mocks__/common";
 import { initialModeAtom } from "@/core/mode";
 import { store } from "@/core/state/jotai";
+import { CellNotInitializedError } from "@/utils/errors";
 import type { IPluginProps } from "../../types";
-import { FileBrowserPlugin } from "../FileBrowserPlugin";
+import { FileBrowser, FileBrowserPlugin } from "../FileBrowserPlugin";
 
 interface MockFile {
   id: string;
@@ -80,6 +81,54 @@ beforeAll(() => {
   store.set(initialModeAtom, "edit");
 });
 
+describe("FileBrowserPlugin session cache recovery", () => {
+  it("retries a failed cached listing when the plugin resets", async () => {
+    const host = document.createElement("marimo-file-browser");
+    const wrapper = document.createElement("marimo-ui-element");
+    wrapper.setAttribute("random-id", "cached-id");
+    wrapper.append(host);
+
+    const props = {
+      initialPath: "/home/user",
+      filetypes: [],
+      selectionMode: "directory",
+      multiple: false,
+      label: "Pick folder",
+      restrictNavigation: false,
+      value: [],
+      setValue: vi.fn(),
+      host,
+    };
+    const error = new CellNotInitializedError();
+    const cachedListDirectory = vi.fn().mockRejectedValue(error);
+    const { rerender } = render(
+      <FileBrowser {...props} list_directory={cachedListDirectory} />,
+    );
+    expect(await screen.findByText(error.message)).toBeInTheDocument();
+
+    // PluginSlot recreates the RPC functions on reset, even when the path
+    // and the host's attributes are unchanged.
+    const liveListDirectory = mockListDirectory(FILES);
+    rerender(<FileBrowser {...props} list_directory={liveListDirectory} />);
+
+    expect(await screen.findByText("docs")).toBeInTheDocument();
+    expect(screen.queryByText(error.message)).not.toBeInTheDocument();
+    expect(liveListDirectory.mock.calls).toEqual([[{ path: "/home/user" }]]);
+
+    fireEvent.click(screen.getByRole("checkbox", { name: "Select docs" }));
+    expect(props.setValue).toHaveBeenCalledWith([
+      { ...FILES[0], id: FILES[0].path },
+    ]);
+
+    fireEvent.keyDown(screen.getAllByRole("row")[0], { key: "End" });
+    rerender(
+      <FileBrowser {...props} list_directory={mockListDirectory([FILES[0]])} />,
+    );
+    await waitFor(() => expect(screen.getAllByRole("row")).toHaveLength(2));
+    expect(screen.getAllByRole("row")[0]).toHaveAttribute("tabindex", "0");
+  });
+});
+
 describe("FileBrowserPlugin keyboard accessibility", () => {
   it("renders a row per file plus the parent row", async () => {
     renderBrowser();