@marimo-team/frontend 0.24.1-dev80 → 0.24.1-dev82

package/src/core/saving/state.ts

@@ -4,7 +4,7 @@ import { dequal as isEqual } from "dequal";
 import { atom } from "jotai";
 import { arrayShallowEquals } from "@/utils/arrays";
 import { type NotebookState, notebookAtom } from "../cells/cells";
-import { type LayoutState, layoutStateAtom } from "../layout/layout";
+import { type LayoutState, layoutStateAtom } from "../layout/state";
 import type { CellConfig } from "../network/types";
 
 export interface LastSavedNotebook {

package/src/core/static/download-html.ts

@@ -1,6 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import { downloadExportedFile } from "@/utils/download";
+import { getExportLayout } from "../export/layout";
 import { getRequestClient } from "../network/requests";
 import { VirtualFileTracker } from "./virtual-file-tracker";
 
@@ -14,6 +15,7 @@ export async function downloadAsHTML(opts: { includeCode: boolean }) {
     download: true,
     includeCode: includeCode,
     files: VirtualFileTracker.INSTANCE.filenames(),
+    layout: await getExportLayout(),
   });
 
   downloadExportedFile(exportedFile);

package/src/core/websocket/__tests__/useMarimoKernelConnection.hook.test.tsx

@@ -27,6 +27,7 @@ vi.mock("@/core/runtime/config", async () => {
 });
 
 import { useRuntimeManager } from "@/core/runtime/config";
+import { initialRunCompletedAtom } from "../../kernel/state";
 import { connectionAtom } from "../../network/connection";
 import type { SessionId } from "../../kernel/session";
 import { WebSocketClosedReason, WebSocketState } from "../types";
@@ -68,6 +69,23 @@ function makeRuntimeManager(
   };
 }
 
+function renderConnectionHook(store: ReturnType<typeof createStore>) {
+  const wrapper: React.FC<React.PropsWithChildren> = ({ children }) => (
+    <JotaiProvider store={store}>
+      <ErrorBoundary fallback={null}>{children}</ErrorBoundary>
+    </JotaiProvider>
+  );
+  return renderHook(
+    () =>
+      useMarimoKernelConnection({
+        sessionId: "test-session" as SessionId,
+        autoInstantiate: false,
+        setCells: () => {},
+      }),
+    { wrapper },
+  );
+}
+
 describe("useMarimoKernelConnection.reconnect()", () => {
   let transport: MockTransport;
   let isHealthy: Mock<() => Promise<boolean>>;
@@ -91,20 +109,7 @@ describe("useMarimoKernelConnection.reconnect()", () => {
   });
 
   function renderUseHook() {
-    const wrapper: React.FC<React.PropsWithChildren> = ({ children }) => (
-      <JotaiProvider store={store}>
-        <ErrorBoundary fallback={null}>{children}</ErrorBoundary>
-      </JotaiProvider>
-    );
-    return renderHook(
-      () =>
-        useMarimoKernelConnection({
-          sessionId: "test-session" as SessionId,
-          autoInstantiate: false,
-          setCells: () => {},
-        }),
-      { wrapper },
-    );
+    return renderConnectionHook(store);
   }
 
   it("is a no-op when the transport is already OPEN", async () => {
@@ -155,3 +160,31 @@ describe("useMarimoKernelConnection.reconnect()", () => {
     });
   });
 });
+
+describe("useMarimoKernelConnection messages", () => {
+  it("records completion of the initial run", () => {
+    const store = createStore();
+    vi.mocked(useConnectionTransport).mockClear();
+    vi.mocked(useConnectionTransport).mockReturnValue(
+      makeTransport(WebSocket.OPEN),
+    );
+    vi.mocked(useRuntimeManager).mockReturnValue(
+      makeRuntimeManager() as unknown as ReturnType<typeof useRuntimeManager>,
+    );
+    renderConnectionHook(store);
+
+    const options = vi.mocked(useConnectionTransport).mock.calls.at(-1)?.[0];
+    expect(store.get(initialRunCompletedAtom)).toBe(false);
+    act(() => {
+      options?.onMessage(
+        new MessageEvent("message", {
+          data: JSON.stringify({
+            op: "completed-run",
+            data: { op: "completed-run", run_id: null },
+          }),
+        }),
+      );
+    });
+    expect(store.get(initialRunCompletedAtom)).toBe(true);
+  });
+});

package/src/core/websocket/useMarimoKernelConnection.tsx

@@ -60,8 +60,8 @@ import {
 } from "../kernel/handlers";
 import { queryParamHandlers } from "../kernel/queryParamHandlers";
 import type { SessionId } from "../kernel/session";
-import { kernelStateAtom } from "../kernel/state";
-import { type LayoutState, useLayoutActions } from "../layout/layout";
+import { initialRunCompletedAtom, kernelStateAtom } from "../kernel/state";
+import { type LayoutState, useLayoutActions } from "../layout/state";
 import { kioskModeAtom } from "../mode";
 import { connectionAtom } from "../network/connection";
 import type { RequestId } from "../network/DeferredRequestRegistry";
@@ -212,6 +212,7 @@ export function useMarimoKernelConnection(opts: {
   };
   const { addCellNotification } = useRunsActions();
   const setKernelState = useSetAtom(kernelStateAtom);
+  const setInitialRunCompleted = useSetAtom(initialRunCompletedAtom);
   const setAppConfig = useSetAppConfig();
   const { setVariables, setMetadata } = useVariablesActions();
   const { addColumnPreview } = useDatasetsActions();
@@ -240,6 +241,9 @@ export function useMarimoKernelConnection(opts: {
         reloadSafe();
         return;
       case "kernel-ready": {
+        setInitialRunCompleted(
+          Boolean(msg.data.resumed || msg.data.auto_instantiated),
+        );
         const existingCells = getExistingCells();
 
         handleKernelReady(msg.data, {
@@ -268,6 +272,7 @@ export function useMarimoKernelConnection(opts: {
       }
 
       case "completed-run":
+        setInitialRunCompleted(true);
         return;
       case "interrupted":
         return;

package/src/mount.tsx

@@ -27,7 +27,17 @@ import {
   parseUserConfig,
 } from "./core/config/config-schema";
 import { MarimoApp, preloadPage } from "./core/MarimoApp";
-import { type AppMode, initialModeAtom, viewStateAtom } from "./core/mode";
+import {
+  initialLayoutState,
+  isSerializedLayout,
+  layoutStateAtom,
+} from "./core/layout/state";
+import {
+  type AppMode,
+  initialModeAtom,
+  kioskModeAtom,
+  viewStateAtom,
+} from "./core/mode";
 import { cleanupAuthQueryParams } from "./core/network/auth";
 import { connectionAtom } from "./core/network/connection";
 import { requestClientAtom } from "./core/network/requests";
@@ -202,6 +212,13 @@ const mountOptionsSchema = z.object({
    * marimo app config
    */
   appConfig: passthroughObject,
+  /**
+   * Serialized notebook layout
+   */
+  layout: z
+    .unknown()
+    .optional()
+    .transform((val) => (isSerializedLayout(val) ? val : undefined)),
   /**
    * show code in run mode
    */
@@ -310,15 +327,15 @@ function initStore(options: unknown) {
   store.set(marimoVersionAtom, parsedOptions.data.version);
   store.set(showCodeInRunModeAtom, parsedOptions.data.view.showAppCode);
 
-  // Check for view-as parameter to start in present mode
-  const shouldStartInPresentMode = (() => {
-    const url = new URL(window.location.href);
-    return url.searchParams.get(KnownQueryParams.viewAs) === "present";
-  })();
+  const url = new URL(window.location.href);
+  const shouldStartInPresentMode =
+    url.searchParams.get(KnownQueryParams.viewAs) === "present";
+  const isKioskMode = url.searchParams.get(KnownQueryParams.kiosk) === "true";
 
   const initialViewMode =
     mode === "edit" && shouldStartInPresentMode ? "present" : mode;
   store.set(viewStateAtom, { mode: initialViewMode, cellAnchor: null });
+  store.set(kioskModeAtom, isKioskMode);
   store.set(serverTokenAtom, parsedOptions.data.serverToken);
 
   // Config
@@ -354,6 +371,7 @@ function initStore(options: unknown) {
     parsedOptions.data.session,
     parsedOptions.data.notebook,
   );
+  store.set(layoutStateAtom, initialLayoutState(parsedOptions.data.layout));
   if (notebook) {
     store.set(notebookAtom, notebook);
   }