@marimo-team/islands 0.19.10-dev5 → 0.19.10-dev51

package/src/core/codemirror/misc/__tests__/paste.test.ts

@@ -140,6 +140,24 @@ def _(
     expect(extractCells(input)).toEqual(["x = a + b + c"]);
   });
 
+  it("preserves return statements inside nested functions", () => {
+    const input = `
+@app.cell
+def _(mo, px):
+    def make_fig():
+        data = {'category': ['foo', 'bar'], 'value': [10, 20]}
+        fig = px.bar(data, x='category', y='value')
+        return fig
+
+    fig = make_fig()
+    mo.ui.plotly(fig)
+    return
+`;
+    expect(extractCells(input)).toEqual([
+      "def make_fig():\n    data = {'category': ['foo', 'bar'], 'value': [10, 20]}\n    fig = px.bar(data, x='category', y='value')\n    return fig\n\nfig = make_fig()\nmo.ui.plotly(fig)",
+    ]);
+  });
+
   it("handles cells with config", () => {
     const input = `
 @app.cell(hide_code=True, column=2)

package/src/core/codemirror/misc/paste.ts

@@ -42,6 +42,7 @@ export function extractCells(text: string): string[] {
   let inMultilineArgs = false;
   let inMultilineReturn = false;
   let parenCount = 0;
+  let cellBaseIndent: number | null = null;
 
   // Pre-compile regex patterns
   const leadingParenRegex = /\(/g;
@@ -55,19 +56,16 @@ export function extractCells(text: string): string[] {
     );
   }
 
+  function getIndent(line: string): number {
+    const match = line.match(/^\s*/);
+    return match ? match[0].length : 0;
+  }
+
   function finalizeCellIfNeeded() {
     if (currentCell.length === 0) {
       return;
     }
 
-    // Remove trailing returns
-    while (
-      currentCell.length > 0 &&
-      currentCell[currentCell.length - 1].trim().startsWith("return")
-    ) {
-      currentCell.pop();
-    }
-
     // Only add non-empty cells
     if (currentCell.some((l) => l.trim() !== "")) {
       cells.push(dedent(currentCell.join("\n")));
@@ -88,6 +86,7 @@ export function extractCells(text: string): string[] {
       finalizeCellIfNeeded();
       inCell = true;
       skipLines = 1; // Skip the def line
+      cellBaseIndent = null;
       continue;
     }
 
@@ -125,8 +124,13 @@ export function extractCells(text: string): string[] {
       continue;
     }
 
-    // Handle return statements
-    if (trimmed.startsWith("return")) {
+    // Detect base indentation of cell body from first content line
+    if (cellBaseIndent === null && trimmed) {
+      cellBaseIndent = getIndent(line);
+    }
+
+    // Handle return statements — only strip cell-level returns
+    if (trimmed.startsWith("return") && getIndent(line) === cellBaseIndent) {
       if (trimmed.includes("(") && !trimmed.endsWith(")")) {
         inMultilineReturn = true;
         parenCount = countParens(trimmed);

package/src/core/kernel/messages.ts

@@ -13,6 +13,7 @@ export const DATA_TYPES = [
   "time",
   "unknown",
 ] as const;
+export type ModelLifecycle = NotificationMessageData<"model-lifecycle">;
 export type Banner = NotificationMessageData<"banner">;
 export type AiInlineCompletionRequest = schemas["AiInlineCompletionRequest"];
 export type DataTableColumn = schemas["DataTableColumn"];

package/src/core/static/static-state.ts

@@ -1,5 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 import { invariant } from "@/utils/invariant";
+import type { ModelLifecycle } from "../kernel/messages";
 import type { MarimoStaticState, StaticVirtualFiles } from "./types";
 
 declare global {
@@ -17,3 +18,7 @@ export function getStaticVirtualFiles(): StaticVirtualFiles {
 
   return window.__MARIMO_STATIC__.files;
 }
+
+export function getStaticModelNotifications(): ModelLifecycle[] | undefined {
+  return window?.__MARIMO_STATIC__?.modelNotifications;
+}

package/src/core/static/types.ts

@@ -1,8 +1,10 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 import type { DataURLString } from "@/utils/json/base64";
+import type { ModelLifecycle } from "../kernel/messages";
 
 export type StaticVirtualFiles = Record<string, DataURLString>;
 
 export interface MarimoStaticState {
   files: StaticVirtualFiles;
+  modelNotifications?: ModelLifecycle[];
 }

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

@@ -1,9 +1,13 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 import { describe, expect, it, vi } from "vitest";
+import { codeAtom } from "../../saving/file-state";
+import { store } from "../../state/jotai";
 import {
   CompositeFileStore,
   domElementFileStore,
   localStorageFileStore,
+  mountConfigFileStore,
+  notebookFileStore,
 } from "../store";
 
 describe("localStorageFileStore", () => {
@@ -53,3 +57,32 @@ describe("CompositeFileStore", () => {
     expect(saved).toHaveBeenCalledTimes(3);
   });
 });
+
+describe("mountConfigFileStore", () => {
+  it("returns null when no code is set", () => {
+    store.set(codeAtom, undefined);
+    expect(mountConfigFileStore.readFile()).toBeNull();
+  });
+
+  it("returns code when set", () => {
+    store.set(codeAtom, "print('hello')");
+    expect(mountConfigFileStore.readFile()).toBe("print('hello')");
+  });
+
+  it("does not save files", () => {
+    store.set(codeAtom, "original");
+    mountConfigFileStore.saveFile("new content");
+    expect(mountConfigFileStore.readFile()).toBe("original");
+  });
+});
+
+describe("notebookFileStore priority", () => {
+  it("prefers mount config over marimo-code and URL", () => {
+    store.set(codeAtom, "mount config code");
+    const element = document.createElement("marimo-code");
+    element.textContent = "marimo-code element";
+    document.body.replaceChildren(element);
+
+    expect(notebookFileStore.readFile()).toBe("mount config code");
+  });
+});

package/src/core/wasm/bridge.ts

@@ -29,6 +29,7 @@ import type {
   SaveUserConfigurationRequest,
   Snippets,
 } from "../network/types";
+import { filenameAtom } from "../saving/file-state";
 import { store } from "../state/jotai";
 import { BasicTransport } from "../websocket/transports/basic";
 import type { IConnectionTransport } from "../websocket/transports/transport";
@@ -146,7 +147,7 @@ export class PyodideBridge implements RunRequests, EditRequests {
 
     const code = await notebookFileStore.readFile();
     const fallbackCode = await fallbackFileStore.readFile();
-    const filename = PyodideRouter.getFilename();
+    const filename = store.get(filenameAtom) ?? PyodideRouter.getFilename();
     const userConfig = store.get(userConfigAtom);
 
     const queryParameters: Record<string, string | string[]> = {};

package/src/core/wasm/store.ts

@@ -4,6 +4,8 @@ import {
   compressToEncodedURIComponent,
   decompressFromEncodedURIComponent,
 } from "lz-string";
+import { codeAtom } from "@/core/saving/file-state";
+import { store } from "@/core/state/jotai";
 import { TypedLocalStorage } from "@/utils/storage/typed";
 import { PyodideRouter } from "./router";
 
@@ -67,6 +69,15 @@ const remoteDefaultFileStore: FileStore = {
   },
 };
 
+export const mountConfigFileStore: FileStore = {
+  saveFile(_contents: string) {
+    // Read-only: mount config code is set via codeAtom
+  },
+  readFile() {
+    return store.get(codeAtom) ?? null;
+  },
+};
+
 const emptyFileStore: FileStore = {
   saveFile(contents: string) {
     // Do nothing
@@ -112,7 +123,8 @@ export class CompositeFileStore implements FileStore {
 }
 
 export const notebookFileStore = new CompositeFileStore([
-  // Prefer <marimo-code>, then URL
+  // Prefer mount config, then <marimo-code>, then URL
+  mountConfigFileStore,
   domElementFileStore,
   urlFileStore,
 ]);

package/src/mount.tsx

@@ -39,11 +39,18 @@ import {
 import { codeAtom, filenameAtom } from "./core/saving/file-state";
 import { store } from "./core/state/jotai";
 import { patchFetch, patchVegaLoader } from "./core/static/files";
-import { isStaticNotebook } from "./core/static/static-state";
+import {
+  getStaticModelNotifications,
+  isStaticNotebook,
+} from "./core/static/static-state";
 import { maybeRegisterVSCodeBindings } from "./core/vscode/vscode-bindings";
 import type { FileStore } from "./core/wasm/store";
 import { notebookFileStore } from "./core/wasm/store";
 import { WebSocketState } from "./core/websocket/types";
+import {
+  handleWidgetMessage,
+  MODEL_MANAGER,
+} from "./plugins/impl/anywidget/model";
 import { vegaLoader } from "./plugins/impl/vega/loader";
 import { initializePlugins } from "./plugins/plugins";
 import { ThemeProvider } from "./theme/ThemeProvider";
@@ -77,6 +84,7 @@ export function mount(options: unknown, el: Element): Error | undefined {
       // If we're in static mode, we need to patch fetch to use the virtual file
       patchFetch();
       patchVegaLoader(vegaLoader);
+      hydrateStaticModels();
     }
 
     // Init store
@@ -330,6 +338,20 @@ function initStore(options: unknown) {
   }
 }
 
+/**
+ * Hydrate anywidget models from embedded static state so widgets
+ * render immediately without a kernel connection.
+ */
+function hydrateStaticModels(): void {
+  const notifications = getStaticModelNotifications();
+  if (!notifications) {
+    return;
+  }
+  for (const notification of notifications) {
+    handleWidgetMessage(MODEL_MANAGER, notification);
+  }
+}
+
 export const visibleForTesting = {
   reset: () => {
     hasMounted = false;

package/src/plugins/impl/DataTablePlugin.tsx

@@ -195,6 +195,7 @@ interface Data<T> {
   hasStableRowId: boolean;
   lazy: boolean;
   cellHoverTexts?: Record<string, Record<string, string | null>> | null;
+  downloadFileName?: string;
 }
 
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
@@ -278,6 +279,7 @@ export const DataTablePlugin = createPlugin<S>("marimo-table")
       // If lazy, this will preload the first page of data
       // without user confirmation.
       preload: z.boolean().default(false),
+      downloadFileName: z.string().optional(),
     }),
   )
   .withFunctions<DataTableFunctions>({
@@ -752,6 +754,7 @@ const DataTableComponent = ({
   cellStyles,
   hoverTemplate,
   cellHoverTexts,
+  downloadFileName,
   toggleDisplayHeader,
   calculate_top_k_rows,
   preview_column,
@@ -981,6 +984,7 @@ const DataTableComponent = ({
             hoverTemplate={hoverTemplate}
             cellHoverTexts={cellHoverTexts}
             downloadAs={showDownload ? downloadAs : undefined}
+            downloadFileName={downloadFileName}
             enableSearch={enableSearch}
             searchQuery={searchQuery}
             onSearchQueryChange={setSearchQuery}

package/src/plugins/impl/anywidget/AnyWidgetPlugin.tsx

@@ -21,7 +21,6 @@ import { BINDING_MANAGER, WIDGET_DEF_REGISTRY } from "./widget-binding";
 interface Data {
   jsUrl: string;
   jsHash: string;
-  css?: string | null;
 }
 
 type AnyWidgetState = ModelState;
@@ -118,21 +117,18 @@ export const AnyWidgetPlugin = createPlugin<ModelIdRef>("marimo-anywidget")
     z.object({
       jsUrl: z.string(),
       jsHash: z.string(),
-      css: z.string().nullish(),
     }),
   )
   .withFunctions({})
   .renderer((props) => <AnyWidgetSlot {...props} />);
 
 const AnyWidgetSlot = (props: IPluginProps<ModelIdRef, Data>) => {
-  const { css, jsUrl, jsHash } = props.data;
+  const { jsUrl, jsHash } = props.data;
   const { model_id: modelId } = props.value;
   const host = props.host as HTMLElementNotDerivedFromRef;
 
   const { jsModule, error } = useAnyWidgetModule({ jsUrl, jsHash });
 
-  useMountCss(css, host);
-
   if (error) {
     return <ErrorBanner error={error} />;
   }
@@ -160,6 +156,7 @@ const AnyWidgetSlot = (props: IPluginProps<ModelIdRef, Data>) => {
       key={key}
       widget={jsModule.default}
       modelId={modelId}
+      host={host}
     />
   );
 };
@@ -207,11 +204,13 @@ function isAnyWidgetModule(mod: any): mod is { default: AnyWidget } {
 interface Props<T extends AnyWidgetState> {
   widget: AnyWidget<T>;
   modelId: WidgetModelId;
+  host: HTMLElementNotDerivedFromRef;
 }
 
 const LoadedSlot = <T extends AnyWidgetState>({
   widget,
   modelId,
+  host,
 }: Props<T> & { widget: AnyWidget<T> }) => {
   const htmlRef = useRef<HTMLDivElement>(null);
 
@@ -222,6 +221,9 @@ const LoadedSlot = <T extends AnyWidgetState>({
     Logger.error("Model not found for modelId", modelId);
   }
 
+  const css = model?.get("_css");
+  useMountCss(css, host);
+
   useEffect(() => {
     if (!htmlRef.current || !model) {
       return;

package/src/plugins/impl/anywidget/__tests__/model.test.ts

@@ -31,6 +31,12 @@ vi.mock("@/core/network/requests", () => ({
   }),
 }));
 
+// Mock isStaticNotebook — default to false (normal mode)
+const mockIsStatic = vi.fn().mockReturnValue(false);
+vi.mock("@/core/static/static-state", () => ({
+  isStaticNotebook: () => mockIsStatic(),
+}));
+
 // Helper to create a mock MarimoComm
 function createMockComm<T>() {
   return {
@@ -393,4 +399,51 @@ describe("ModelManager", () => {
 
     expect(BINDING_MANAGER.has(testId)).toBe(false);
   });
+
+  describe("static mode", () => {
+    beforeEach(() => {
+      mockIsStatic.mockReturnValue(true);
+    });
+
+    afterAll(() => {
+      mockIsStatic.mockReturnValue(false);
+    });
+
+    it("should create model with no-op comm in static mode", async () => {
+      await handleWidgetMessage(modelManager, {
+        model_id: testId,
+        message: {
+          method: "open",
+          state: { count: 42 },
+          buffer_paths: [],
+          buffers: [],
+        },
+      });
+
+      const model = await modelManager.get(testId);
+      expect(model.get("count")).toBe(42);
+
+      // save_changes should not call the real request client
+      model.set("count", 100);
+      model.save_changes();
+      expect(mockSendModelValue).not.toHaveBeenCalled();
+    });
+
+    it("should not throw on send in static mode", async () => {
+      await handleWidgetMessage(modelManager, {
+        model_id: testId,
+        message: {
+          method: "open",
+          state: { count: 0 },
+          buffer_paths: [],
+          buffers: [],
+        },
+      });
+
+      const model = await modelManager.get(testId);
+      // send() should silently no-op
+      await expect(model.send({ test: true })).resolves.toBeUndefined();
+      expect(mockSendModelValue).not.toHaveBeenCalled();
+    });
+  });
 });

package/src/plugins/impl/anywidget/model.ts

@@ -5,6 +5,7 @@ import type { AnyModel } from "@anywidget/types";
 import { debounce } from "lodash-es";
 import type { NotificationMessageData } from "@/core/kernel/messages";
 import { getRequestClient } from "@/core/network/requests";
+import { isStaticNotebook } from "@/core/static/static-state";
 import {
   decodeFromWire,
   serializeBuffersToBase64,
@@ -343,12 +344,14 @@ export async function handleWidgetMessage(
         return;
       }
 
-      modelManager.create(
-        modelId,
-        (signal) =>
-          new Model(
-            stateWithBuffers,
-            {
+      modelManager.create(modelId, (signal) => {
+        // In static exports there is no kernel, so comm calls are no-ops.
+        const comm: MarimoComm<ModelState> = isStaticNotebook()
+          ? {
+              sendUpdate: async () => undefined,
+              sendCustomMessage: async () => undefined,
+            }
+          : {
               async sendUpdate(changeData) {
                 if (signal.aborted) {
                   Logger.debug(
@@ -377,10 +380,10 @@ export async function handleWidgetMessage(
                   buffers: buffers.map(dataViewToBase64),
                 });
               },
-            },
-            signal,
-          ),
-      );
+            };
+
+        return new Model(stateWithBuffers, comm, signal);
+      });
       return;
     }
 

package/src/plugins/impl/chat/ChatPlugin.tsx

@@ -47,6 +47,7 @@ export const ChatPlugin = createPlugin<{ messages: UIMessage[] }>(
       maxHeight: z.number().optional(),
       config: configSchema,
       allowAttachments: z.union([z.boolean(), z.string().array()]),
+      disabled: z.boolean().default(false),
     }),
   )
   .withFunctions<PluginFunctions>({
@@ -76,6 +77,7 @@ export const ChatPlugin = createPlugin<{ messages: UIMessage[] }>(
           showConfigurationControls={props.data.showConfigurationControls}
           maxHeight={props.data.maxHeight}
           allowAttachments={props.data.allowAttachments}
+          disabled={props.data.disabled}
           config={props.data.config}
           get_chat_history={props.functions.get_chat_history}
           delete_chat_history={props.functions.delete_chat_history}

package/src/plugins/impl/chat/chat-ui.tsx

@@ -67,6 +67,7 @@ interface Props extends PluginFunctions {
   showConfigurationControls: boolean;
   maxHeight: number | undefined;
   allowAttachments: boolean | string[];
+  disabled: boolean;
   value: UIMessage[];
   setValue: (messages: UIMessage[]) => void;
   host: HTMLElement;
@@ -450,6 +451,9 @@ export const Chatbot: React.FC<Props> = (props) => {
       <form
         onSubmit={async (evt) => {
           evt.preventDefault();
+          if (props.disabled) {
+            return;
+          }
 
           const fileParts = files
             ? await convertToFileUIPart(files)
@@ -462,7 +466,12 @@ export const Chatbot: React.FC<Props> = (props) => {
           resetInput();
         }}
         ref={formRef}
-        className="flex w-full border-t border-(--slate-6) px-2 py-1 items-center"
+        // biome-ignore lint/a11y/useSemanticElements: inert is used to disable the entire form
+        inert={props.disabled || undefined}
+        className={cn(
+          "flex w-full border-t border-(--slate-6) px-2 py-1 items-center",
+          props.disabled && "opacity-50 cursor-not-allowed",
+        )}
       >
         {props.showConfigurationControls && (
           <ConfigPopup config={config} onChange={setConfig} />

package/src/plugins/impl/data-frames/DataFramePlugin.tsx

@@ -48,6 +48,7 @@ type TableData<T> = T[] | CsvURL;
 interface Data {
   label?: string | null;
   columns: ColumnDataTypes;
+  dataframeName?: string;
   pageSize: number;
   showDownload: boolean;
   lazy: boolean;
@@ -93,6 +94,7 @@ export const DataFramePlugin = createPlugin<S>("marimo-dataframe")
       label: z.string().nullish(),
       pageSize: z.number().default(5),
       showDownload: z.boolean().default(true),
+      dataframeName: z.string().optional(),
       columns: z
         .array(z.tuple([z.string().or(z.number()), z.string(), z.string()]))
         .transform((value) => {
@@ -176,6 +178,7 @@ const EMPTY: Transformations = {
 export const DataFrameComponent = memo(
   ({
     columns,
+    dataframeName,
     pageSize,
     showDownload,
     lazy,
@@ -326,6 +329,7 @@ export const DataFrameComponent = memo(
           fieldTypes={field_types}
           rowHeaders={row_headers || Arrays.EMPTY}
           showDownload={showDownload}
+          downloadFileName={dataframeName}
           download_as={download_as}
           enableSearch={false}
           showFilters={false}