@marimo-team/islands 0.25.2-dev0 → 0.25.2-dev100

package/src/core/websocket/useMarimoKernelConnection.tsx

@@ -60,7 +60,11 @@ import {
   handleRemoveUIElements,
 } from "../kernel/handlers";
 import { queryParamHandlers } from "../kernel/queryParamHandlers";
-import type { SessionId } from "../kernel/session";
+import {
+  type SessionId,
+  type StableSessionId,
+  stableSessionIdAtom,
+} from "../kernel/session";
 import { initialRunCompletedAtom, kernelStateAtom } from "../kernel/state";
 import { type LayoutState, useLayoutActions } from "../layout/state";
 import { kioskModeAtom } from "../mode";
@@ -80,7 +84,7 @@ import { isWasm } from "../wasm/utils";
 import {
   type ConnectionStatus,
   WebSocketClosedReason,
-  WebSocketState,
+  ConnectionState,
 } from "./types";
 
 const SUPPORTS_LAZY_KERNELS = true;
@@ -112,7 +116,7 @@ export function classifyCloseEvent(event: { reason?: string }): CloseDecision {
       return {
         kind: "gave-up",
         status: {
-          state: WebSocketState.CLOSED,
+          state: ConnectionState.CLOSED,
           code: WebSocketClosedReason.KERNEL_DISCONNECTED,
           reason: "kernel not found",
         },
@@ -124,7 +128,7 @@ export function classifyCloseEvent(event: { reason?: string }): CloseDecision {
       return {
         kind: "terminal",
         status: {
-          state: WebSocketState.CLOSED,
+          state: ConnectionState.CLOSED,
           code: WebSocketClosedReason.KERNEL_DISCONNECTED,
           reason: "kernel not found",
         },
@@ -134,7 +138,7 @@ export function classifyCloseEvent(event: { reason?: string }): CloseDecision {
       return {
         kind: "terminal",
         status: {
-          state: WebSocketState.CLOSED,
+          state: ConnectionState.CLOSED,
           code: WebSocketClosedReason.KERNEL_DISCONNECTED,
           reason: "not authorized",
         },
@@ -144,7 +148,7 @@ export function classifyCloseEvent(event: { reason?: string }): CloseDecision {
       return {
         kind: "terminal",
         status: {
-          state: WebSocketState.CLOSED,
+          state: ConnectionState.CLOSED,
           code: WebSocketClosedReason.KERNEL_DISCONNECTED,
           reason: "kiosk mode is not available for this session",
         },
@@ -154,7 +158,7 @@ export function classifyCloseEvent(event: { reason?: string }): CloseDecision {
       return {
         kind: "terminal",
         status: {
-          state: WebSocketState.CLOSED,
+          state: ConnectionState.CLOSED,
           code: WebSocketClosedReason.KERNEL_STARTUP_ERROR,
           reason: "Failed to start kernel sandbox",
         },
@@ -171,7 +175,7 @@ export function classifyCloseEvent(event: { reason?: string }): CloseDecision {
 
   return {
     kind: "retry",
-    status: { state: WebSocketState.CONNECTING },
+    status: { state: ConnectionState.CONNECTING },
   };
 }
 
@@ -231,6 +235,7 @@ export function useMarimoKernelConnection(opts: {
     addStartupLog,
   } = useAlertActions();
   const setKioskMode = useSetAtom(kioskModeAtom);
+  const setStableSessionId = useSetAtom(stableSessionIdAtom);
   const setCapabilities = useSetAtom(capabilitiesAtom);
   const runtimeManager = useRuntimeManager();
   const transportType = useAtomValue(connectionTransportTypeAtom);
@@ -251,17 +256,17 @@ export function useMarimoKernelConnection(opts: {
         const { phase } = msg.data;
         updateStartupProgress(msg.data);
         setConnection((previous) =>
-          previous.state === WebSocketState.OPEN ||
-          (previous.state === WebSocketState.CONNECTING &&
+          previous.state === ConnectionState.OPEN ||
+          (previous.state === ConnectionState.CONNECTING &&
             previous.phase === phase)
             ? previous
-            : { state: WebSocketState.CONNECTING, phase },
+            : { state: ConnectionState.CONNECTING, phase },
         );
         return;
       }
       case "kernel-ready": {
         setKernelStartupError(null);
-        setConnection({ state: WebSocketState.OPEN });
+        setConnection({ state: ConnectionState.OPEN });
         setInitialRunCompleted(
           Boolean(msg.data.resumed || msg.data.auto_instantiated),
         );
@@ -284,6 +289,10 @@ export function useMarimoKernelConnection(opts: {
           invalidateDataSourceDiscovery();
         }
         setKioskMode(msg.data.kiosk);
+        setStableSessionId(
+          (msg.data.stable_session_id as StableSessionId | null | undefined) ??
+            null,
+        );
         // A freshly started kernel has no breakpoints of its own; re-push
         // the client's set so they still apply, and clear the stale
         // highlighted line from the previous kernel instance.
@@ -295,6 +304,8 @@ export function useMarimoKernelConnection(opts: {
       case "completed-run":
         setInitialRunCompleted(true);
         return;
+      case "execution":
+        return;
       case "interrupted":
         return;
 
@@ -470,7 +481,7 @@ export function useMarimoKernelConnection(opts: {
 
       case "reconnected":
         setKernelStartupError(null);
-        setConnection({ state: WebSocketState.OPEN });
+        setConnection({ state: ConnectionState.OPEN });
         return;
 
       case "focus-cell":
@@ -515,12 +526,12 @@ export function useMarimoKernelConnection(opts: {
     }
     shouldTryReconnecting.current = true;
     setKernelStartupError(null);
-    setConnection({ state: WebSocketState.CONNECTING });
+    setConnection({ state: ConnectionState.CONNECTING });
     const healthy = await runtimeManager.reconcileFromHealth();
     if (!healthy) {
       shouldTryReconnecting.current = false;
       setConnection({
-        state: WebSocketState.CLOSED,
+        state: ConnectionState.CLOSED,
         code: WebSocketClosedReason.KERNEL_DISCONNECTED,
         reason: "kernel not found",
       });
@@ -596,17 +607,17 @@ export function useMarimoKernelConnection(opts: {
       setConnection((previous) => {
         const status = decision.status;
         if (
-          status.state === WebSocketState.CLOSED &&
+          status.state === ConnectionState.CLOSED &&
           status.code === WebSocketClosedReason.KERNEL_STARTUP_ERROR &&
-          (previous.state === WebSocketState.CONNECTING ||
-            previous.state === WebSocketState.CLOSED)
+          (previous.state === ConnectionState.CONNECTING ||
+            previous.state === ConnectionState.CLOSED)
         ) {
           return { ...status, phase: previous.phase };
         }
         if (
-          status.state === WebSocketState.CONNECTING &&
-          (previous.state === WebSocketState.OPEN ||
-            (previous.state === WebSocketState.CONNECTING &&
+          status.state === ConnectionState.CONNECTING &&
+          (previous.state === ConnectionState.OPEN ||
+            (previous.state === ConnectionState.CONNECTING &&
               previous.phase === "reconnecting"))
         ) {
           return { ...status, phase: "reconnecting" };
@@ -631,7 +642,7 @@ export function useMarimoKernelConnection(opts: {
     onError: (e) => {
       Logger.warn("WebSocket error", e);
       setConnection({
-        state: WebSocketState.CLOSED,
+        state: ConnectionState.CLOSED,
         code: WebSocketClosedReason.KERNEL_DISCONNECTED,
         reason: "kernel not found",
       });

package/src/css/katex-css.test.ts

@@ -0,0 +1,166 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { readFile } from "node:fs/promises";
+import postcss from "postcss";
+import { beforeAll, describe, expect, it } from "vitest";
+import {
+  checkKatexCss,
+  generateKatexCss,
+  readUpstreamCss,
+  stylesheetPath,
+} from "../../scripts/katex-css";
+
+let upstream: string;
+let generated: string;
+
+beforeAll(async () => {
+  upstream = await readUpstreamCss();
+  generated = await generateKatexCss(upstream);
+});
+
+describe("copied KaTeX stylesheet", () => {
+  it("matches the installed package with only documented marimo overrides", async () => {
+    await expect(
+      checkKatexCss(upstream, await readFile(stylesheetPath, "utf8")),
+    ).resolves.toBeUndefined();
+  });
+
+  it.each(["added", "removed", "changed"])(
+    "detects %s upstream rule without a version change",
+    async (change) => {
+      const root = postcss.parse(upstream);
+      if (change === "added") {
+        root.append(
+          postcss.parse(
+            ".katex .reflectbox { display: inline-block; transform: scaleX(-1); }",
+          ),
+        );
+      } else {
+        root.walkRules(".katex .mspace", (rule) => {
+          if (change === "removed") {
+            rule.remove();
+          } else {
+            rule.append(postcss.decl({ prop: "color", value: "red" }));
+          }
+        });
+      }
+      await expect(checkKatexCss(root.toString(), generated)).rejects.toThrow(
+        "pnpm sync-katex-css",
+      );
+      const regenerated = await generateKatexCss(root.toString());
+      await checkKatexCss(root.toString(), regenerated);
+    },
+  );
+
+  it.each(["added", "removed", "changed"])(
+    "detects %s local rule",
+    async (change) => {
+      const root = postcss.parse(generated);
+      if (change === "added") {
+        root.append(postcss.parse(".katex .unexpected { display: none; }"));
+      } else {
+        root.walkRules(".katex .mspace", (rule) => {
+          if (change === "removed") {
+            rule.remove();
+          } else {
+            rule.append(postcss.decl({ prop: "color", value: "red" }));
+          }
+        });
+      }
+      await expect(checkKatexCss(upstream, root.toString())).rejects.toThrow(
+        "pnpm sync-katex-css",
+      );
+    },
+  );
+
+  it("preserves math sizing, tag alignment, and equation counters without bundling font faces", () => {
+    const root = postcss.parse(generated);
+    const declarations = (selector: string) => {
+      const values: Record<string, string> = {};
+      root.walkRules(selector, (rule) => {
+        rule.walkDecls((decl) => {
+          values[decl.prop] = decl.value;
+        });
+      });
+      return values;
+    };
+    expect(declarations(".katex")).toEqual({
+      "font-family": '"KaTeX_Main", "Times New Roman", serif',
+      "font-size": "110%",
+      "font-style": "normal",
+      "line-height": "inherit",
+      position: "relative",
+      "text-indent": "0",
+      "text-rendering": "auto",
+    });
+    expect(
+      declarations(".katex-display > .katex > .katex-html > .katex-tag"),
+    ).toEqual({ position: "absolute", right: "0", "text-align": "right" });
+    expect(declarations("body,\n.katex-display")).toEqual({
+      "counter-reset": "katexEqnNo mmlEqnNo",
+    });
+    expect(declarations(".katex .angl")["border-right"]).toBe("0.049em solid");
+    const fontFaces: postcss.AtRule[] = [];
+    root.walkAtRules("font-face", (rule) => {
+      fontFaces.push(rule);
+    });
+    expect(fontFaces).toEqual([]);
+  });
+
+  it.each(["root", "media"])(
+    "preserves SVG rule order and %s scope when upstream adds a competing rule",
+    async (scope) => {
+      const root = postcss.parse(upstream);
+      const svgRules: postcss.Rule[] = [];
+      root.walkRules(".katex svg", (rule) => {
+        svgRules.push(rule);
+      });
+      const secondSvg = svgRules[1];
+      secondSvg.before(postcss.parse(".katex :is(svg) { stroke-width: 3; }"));
+      if (scope === "media") {
+        const media = postcss.atRule({ name: "media", params: "print" });
+        secondSvg.before(media);
+        media.append(secondSvg);
+      }
+
+      const svgCascade = (css: string) => {
+        const rules: {
+          selector: string;
+          scope: string;
+          strokeWidth: string | undefined;
+        }[] = [];
+        postcss.parse(css).walkRules((rule) => {
+          if (
+            rule.selector !== ".katex svg" &&
+            rule.selector !== ".katex :is(svg)"
+          ) {
+            return;
+          }
+          let strokeWidth: string | undefined;
+          rule.walkDecls("stroke-width", (decl) => {
+            strokeWidth = decl.value;
+          });
+          const parent = rule.parent;
+          rules.push({
+            selector: rule.selector,
+            scope:
+              parent?.type === "atrule"
+                ? `${parent.name} ${parent.params}`
+                : "root",
+            strokeWidth,
+          });
+        });
+        return rules;
+      };
+      const regenerated = await generateKatexCss(root.toString());
+      expect(svgCascade(regenerated)).toEqual(svgCascade(root.toString()));
+      await checkKatexCss(root.toString(), regenerated);
+    },
+  );
+
+  it("requires review when an overridden upstream declaration changes", async () => {
+    await expect(
+      generateKatexCss(upstream.replace("line-height:1.2", "line-height:1.3")),
+    ).rejects.toThrow("review overrides");
+  });
+});