@marimo-team/frontend 0.23.17-dev4 → 0.23.17-dev40

package/src/core/codemirror/theme/dark.ts

@@ -11,7 +11,7 @@ export const darkTheme = [
       background: "var(--cm-background)",
       foreground: "#abb2bf",
       caret: "#528bff",
-      selection: "#3E4451",
+      selection: "var(--cm-selection-background)",
       lineHighlight: "#2c313c",
       gutterBackground: "var(--color-background)",
       gutterForeground: "var(--gray-10)",
@@ -36,15 +36,16 @@ export const darkTheme = [
     ],
   }),
   EditorView.theme({
+    "&": {
+      "--cm-selection-background": "var(--cm-selection-background-dark)",
+    },
     ".mo-cm-reactive-reference": {
       fontWeight: "400",
-      color: "#2a7aa5",
-      borderBottom: "2px solid #bad3de",
+      color: "var(--cm-reactive-reference-color-dark)",
+      borderBottom: "2px solid var(--cm-reactive-reference-border-color)",
     },
     ".mo-cm-reactive-reference-hover": {
       cursor: "pointer",
-      borderBottomWidth: "3px",
-      borderBottomColor: "#4a90a5",
     },
   }),
 ];

package/src/core/codemirror/theme/light.ts

@@ -11,7 +11,7 @@ export const lightTheme = [
       background: "#ffffff",
       foreground: "#000000",
       caret: "#000000",
-      selection: "#d7d4f0",
+      selection: "var(--cm-selection-background)",
       lineHighlight: "#cceeff44",
       gutterBackground: "var(--color-background)",
       gutterForeground: "var(--gray-10)",
@@ -45,14 +45,16 @@ export const lightTheme = [
     ],
   }),
   EditorView.theme({
+    "&": {
+      "--cm-selection-background": "var(--cm-selection-background-light)",
+    },
     ".mo-cm-reactive-reference": {
       fontWeight: "400",
-      color: "#005f87",
-      borderBottom: "2px solid #bad3de",
+      color: "var(--cm-reactive-reference-color-light)",
+      borderBottom: "2px solid var(--cm-reactive-reference-border-color)",
     },
     ".mo-cm-reactive-reference-hover": {
       cursor: "pointer",
-      borderBottomWidth: "3px",
     },
   }),
 ];

package/src/core/config/__tests__/config-schema.test.ts

@@ -66,6 +66,7 @@ test("default UserConfig - empty", () => {
       "display": {
         "cell_output": "below",
         "code_editor_font_size": 14,
+        "code_lens": true,
         "dataframes": "rich",
         "default_table_max_columns": 50,
         "default_table_page_size": 10,
@@ -139,6 +140,7 @@ test("default UserConfig - one level", () => {
       "display": {
         "cell_output": "below",
         "code_editor_font_size": 14,
+        "code_lens": true,
         "dataframes": "rich",
         "default_table_max_columns": 50,
         "default_table_page_size": 10,

package/src/core/config/config-schema.ts

@@ -154,6 +154,7 @@ export const UserConfigSchema = z
           }),
         locale: z.string().nullable().optional(),
         reference_highlighting: z.boolean().prefault(true),
+        code_lens: z.boolean().prefault(true),
       })
       .prefault({}),
     package_management: z

package/src/core/config/feature-flag.tsx

@@ -13,7 +13,6 @@ export interface ExperimentalFeatures {
   external_agents: boolean;
   debugger: boolean; // Live frame-watching debugger (gutter breakpoints + pdb)
   line_timing: boolean; // Green active-line highlight + per-line elapsed timer
-  editor_code_lens: boolean; // Inline icons in cell editors linking datasources/buckets/caches to their panels
   // Add new feature flags here
 }
 
@@ -25,7 +24,6 @@ const defaultValues: ExperimentalFeatures = {
   external_agents: import.meta.env.DEV,
   debugger: false,
   line_timing: false,
-  editor_code_lens: import.meta.env.DEV,
 };
 
 export function getFeatureFlag<T extends keyof ExperimentalFeatures>(

package/src/core/dom/outline.ts

@@ -63,13 +63,36 @@ function getOutline(html: string): Outline | null {
   return { items };
 }
 
+function toXPathStringLiteral(value: string): string {
+  if (!value.includes('"')) {
+    return `"${value}"`;
+  }
+  if (!value.includes("'")) {
+    return `'${value}'`;
+  }
+
+  const segments = value.split('"');
+  const literals: string[] = [];
+  for (const [index, segment] of segments.entries()) {
+    if (segment) {
+      literals.push(`"${segment}"`);
+    }
+    if (index < segments.length - 1) {
+      literals.push(`'"'`);
+    }
+  }
+  return `concat(${literals.join(", ")})`;
+}
+
 export function headingToIdentifier(heading: Element): OutlineItem["by"] {
   const id = heading.id;
   if (id) {
     return { id };
   }
-  const name = heading.textContent;
-  return { path: `//${heading.tagName}[contains(., "${name}")]` };
+  const name = heading.textContent ?? "";
+  return {
+    path: `//${heading.tagName}[contains(., ${toXPathStringLiteral(name)})]`,
+  };
 }
 
 export function mergeOutlines(outlines: (Outline | null)[]): Outline {

package/src/core/hotkeys/hotkeys.ts

@@ -393,11 +393,13 @@ const DEFAULT_HOT_KEY = {
     name: "Collapse all sections",
     group: "Editing",
     key: "Mod-Shift-\\",
+    additionalKeywords: ["fold", "headers"],
   },
   "global.expandAllSections": {
     name: "Expand all sections",
     group: "Editing",
     key: "Mod-Shift-/",
+    additionalKeywords: ["unfold", "headers"],
   },
   "global.toggleMinimap": {
     name: "Toggle Minimap",

package/src/core/mode.ts

@@ -55,20 +55,22 @@ export async function runDuringPresentMode(
   fn: () => void | Promise<void>,
 ): Promise<void> {
   const state = store.get(viewStateAtom);
-  if (state.mode === "present") {
+  if (state.mode !== "edit") {
     await fn();
     return;
   }
 
   store.set(viewStateAtom, { ...state, mode: "present" });
-  // Wait 100ms to allow the page to render
-  await new Promise((resolve) => setTimeout(resolve, 100));
-  // Wait 2 frames
-  await new Promise((resolve) => requestAnimationFrame(resolve));
-  await new Promise((resolve) => requestAnimationFrame(resolve));
-  await fn();
-  store.set(viewStateAtom, { ...state, mode: "edit" });
-  return undefined;
+  try {
+    // Wait 100ms to allow the page to render
+    await new Promise((resolve) => setTimeout(resolve, 100));
+    // Wait 2 frames
+    await new Promise((resolve) => requestAnimationFrame(resolve));
+    await new Promise((resolve) => requestAnimationFrame(resolve));
+    await fn();
+  } finally {
+    store.set(viewStateAtom, state);
+  }
 }
 
 export const viewStateAtom = atom<ViewState>({

package/src/core/network/__tests__/api.test.ts

@@ -105,7 +105,10 @@ describe("API", () => {
     });
 
     await expect(
-      API.handleExportResponse({ data: "markdown", response }),
+      API.handleExportResponse(
+        { data: "markdown", response },
+        { defaultFilename: "download.md" },
+      ),
     ).resolves.toEqual({
       contents: "markdown",
       filename: "résumé.qmd",
@@ -113,27 +116,139 @@ describe("API", () => {
     });
   });
 
-  it("rejects export responses without a filename", async () => {
+  it("parses quoted Content-Disposition filenames", async () => {
+    const response = new Response("html", {
+      headers: {
+        "Content-Disposition": 'inline; filename="notebook.html"',
+        "Content-Type": "text/html; charset=utf-8",
+      },
+    });
+
     await expect(
-      API.handleExportResponse({
-        data: "markdown",
-        response: new Response(null, {
-          headers: { "Content-Type": "text/plain" },
-        }),
-      }),
-    ).rejects.toThrow("Export response is missing a filename");
+      API.handleExportResponse(
+        { data: "html", response },
+        { defaultFilename: "download.html" },
+      ),
+    ).resolves.toEqual({
+      contents: "html",
+      filename: "notebook.html",
+      mediaType: "text/html; charset=utf-8",
+    });
+  });
+
+  it("parses unquoted Content-Disposition filenames", async () => {
+    const response = new Response("pdf", {
+      headers: {
+        "Content-Disposition": "attachment; filename=notebook.pdf",
+        "Content-Type": "application/pdf",
+      },
+    });
+
+    await expect(
+      API.handleExportResponse(
+        { data: "pdf", response },
+        { defaultFilename: "download.pdf" },
+      ),
+    ).resolves.toEqual({
+      contents: "pdf",
+      filename: "notebook.pdf",
+      mediaType: "application/pdf",
+    });
+  });
+
+  it("prefers RFC 5987 filenames over quoted fallbacks", async () => {
+    const response = new Response("markdown", {
+      headers: {
+        "Content-Disposition":
+          "attachment; filename=\"wrong.md\"; filename*=UTF-8''notebook.md",
+        "Content-Type": "text/plain; charset=utf-8",
+      },
+    });
+
+    await expect(
+      API.handleExportResponse(
+        { data: "markdown", response },
+        { defaultFilename: "download.md" },
+      ),
+    ).resolves.toEqual({
+      contents: "markdown",
+      filename: "notebook.md",
+      mediaType: "text/plain; charset=utf-8",
+    });
+  });
+
+  it("falls back to a default filename when headers are missing", async () => {
+    const response = new Response("markdown", {
+      headers: {
+        "Content-Type": "text/plain; charset=utf-8",
+      },
+    });
+
+    await expect(
+      API.handleExportResponse(
+        { data: "markdown", response },
+        { defaultFilename: "download.md" },
+      ),
+    ).resolves.toEqual({
+      contents: "markdown",
+      filename: "download.md",
+      mediaType: "text/plain; charset=utf-8",
+    });
+  });
+
+  it("falls back to a default filename when Content-Disposition is unparsable", async () => {
+    const response = new Response("markdown", {
+      headers: {
+        "Content-Disposition": "attachment",
+        "Content-Type": "text/plain; charset=utf-8",
+      },
+    });
+
+    await expect(
+      API.handleExportResponse(
+        { data: "markdown", response },
+        { defaultFilename: "download.md" },
+      ),
+    ).resolves.toEqual({
+      contents: "markdown",
+      filename: "download.md",
+      mediaType: "text/plain; charset=utf-8",
+    });
+  });
+
+  it("falls back to a default filename when RFC 5987 encoding is malformed", async () => {
+    const response = new Response("markdown", {
+      headers: {
+        "Content-Disposition": "attachment; filename*=UTF-8''%E0%A4%A",
+        "Content-Type": "text/plain; charset=utf-8",
+      },
+    });
+
+    await expect(
+      API.handleExportResponse(
+        { data: "markdown", response },
+        { defaultFilename: "download.md" },
+      ),
+    ).resolves.toEqual({
+      contents: "markdown",
+      filename: "download.md",
+      mediaType: "text/plain; charset=utf-8",
+    });
   });
 
   it("rejects export responses without a media type", async () => {
     await expect(
-      API.handleExportResponse({
-        data: "markdown",
-        response: new Response(null, {
-          headers: {
-            "Content-Disposition": "attachment; filename*=UTF-8''notebook.md",
-          },
-        }),
-      }),
+      API.handleExportResponse(
+        {
+          data: "markdown",
+          response: new Response(null, {
+            headers: {
+              "Content-Disposition": "attachment; filename*=UTF-8''notebook.md",
+            },
+          }),
+        },
+        { defaultFilename: "download.md" },
+      ),
     ).rejects.toThrow("Export response is missing a media type");
   });
 });

package/src/core/network/__tests__/export-filename.test.ts

@@ -0,0 +1,43 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { beforeEach, describe, expect, it } from "vitest";
+import { filenameAtom } from "@/core/saving/file-state";
+import { store } from "@/core/state/jotai";
+import {
+  getDefaultExportFilename,
+  getDefaultMarkdownExportFilename,
+} from "../export-filename";
+
+describe("default export filenames", () => {
+  beforeEach(() => {
+    store.set(filenameAtom, "folder/my_notebook.py");
+  });
+
+  it("derives filenames from the notebook name", () => {
+    expect(getDefaultExportFilename("html")).toBe("my_notebook.html");
+    expect(getDefaultExportFilename("pdf")).toBe("my_notebook.pdf");
+  });
+
+  it("handles Windows-style notebook paths", () => {
+    store.set(filenameAtom, "C:\\Users\\me\\my_notebook.py");
+    expect(getDefaultExportFilename("html")).toBe("my_notebook.html");
+  });
+
+  it("derives markdown filenames from the selected flavor", () => {
+    expect(getDefaultMarkdownExportFilename("qmd")).toBe("my_notebook.qmd");
+    expect(getDefaultMarkdownExportFilename("mystmd")).toBe(
+      "my_notebook.myst.md",
+    );
+  });
+
+  it("derives script export filenames from the notebook name", () => {
+    expect(getDefaultExportFilename("script.py")).toBe("my_notebook.script.py");
+  });
+
+  it("falls back to download.* when the notebook is unnamed", () => {
+    store.set(filenameAtom, null);
+    expect(getDefaultExportFilename("html")).toBe("download.html");
+    expect(getDefaultMarkdownExportFilename("qmd")).toBe("download.qmd");
+    expect(getDefaultExportFilename("script.py")).toBe("download.script.py");
+  });
+});

package/src/core/network/__tests__/requests-lazy.test.ts

@@ -84,6 +84,7 @@ describe("createLazyRequests", () => {
           format: "ipynb",
           dependenciesAvailable: false,
           missingPackages: ["nbformat"],
+          missingSetup: [],
         },
       ],
     };

package/src/core/network/api.ts

@@ -16,13 +16,45 @@ function getBaseUriWithoutQueryParams(): string {
   return url.toString();
 }
 
-function getExportFilename(response: Response): string {
-  const contentDisposition = response.headers.get("Content-Disposition");
-  const match = contentDisposition?.match(/filename\*=UTF-8''([^;]+)/i);
-  if (!match) {
-    throw new Error("Export response is missing a filename");
+function parseContentDispositionFilename(
+  contentDisposition: string | null,
+): string | undefined {
+  if (!contentDisposition) {
+    return undefined;
   }
-  return decodeURIComponent(match[1]);
+
+  const rfc5987Match = contentDisposition.match(/filename\*=UTF-8''([^;]+)/i);
+  if (rfc5987Match) {
+    try {
+      return decodeURIComponent(rfc5987Match[1]);
+    } catch {
+      return undefined;
+    }
+  }
+
+  const quotedMatch = contentDisposition.match(/filename="([^"]+)"/i);
+  if (quotedMatch) {
+    return quotedMatch[1];
+  }
+
+  const unquotedMatch = contentDisposition.match(/filename=([^;]+)/i);
+  if (unquotedMatch) {
+    return unquotedMatch[1].trim();
+  }
+
+  return undefined;
+}
+
+function getExportFilename(response: Response): string | undefined {
+  const filename = parseContentDispositionFilename(
+    response.headers.get("Content-Disposition"),
+  );
+  if (!filename) {
+    Logger.warn(
+      "Export response is missing a readable Content-Disposition filename",
+    );
+  }
+  return filename;
 }
 
 /**
@@ -129,11 +161,14 @@ export const API = {
     }
     return Promise.resolve(response.data as T);
   },
-  handleExportResponse: async <T extends BlobPart>(response: {
-    data?: T | undefined;
-    error?: Record<string, unknown>;
-    response: Response;
-  }): Promise<ExportedFile<T>> => {
+  handleExportResponse: async <T extends BlobPart>(
+    response: {
+      data?: T | undefined;
+      error?: Record<string, unknown>;
+      response: Response;
+    },
+    opts: { defaultFilename: string },
+  ): Promise<ExportedFile<T>> => {
     const contents = await API.handleResponse<T>(response);
     const mediaType = response.response.headers.get("Content-Type");
     if (!mediaType) {
@@ -142,7 +177,7 @@ export const API = {
 
     return {
       contents,
-      filename: getExportFilename(response.response),
+      filename: getExportFilename(response.response) ?? opts.defaultFilename,
       mediaType,
     };
   },

package/src/core/network/export-filename.ts

@@ -0,0 +1,37 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { filenameAtom } from "@/core/saving/file-state";
+import { store } from "@/core/state/jotai";
+import { Filenames } from "@/utils/filenames";
+import { Paths } from "@/utils/paths";
+import {
+  DEFAULT_MARKDOWN_FLAVOR,
+  MARKDOWN_EXTENSIONS,
+} from "./markdown-export";
+import type { ExportAsMarkdownRequest } from "./types";
+
+const DEFAULT_EXPORT_FILENAME = "download";
+
+function getNotebookStem(): string | undefined {
+  const filename = store.get(filenameAtom);
+  if (!filename) {
+    return undefined;
+  }
+  const basename = Paths.basename(filename);
+  return Filenames.withoutExtension(basename);
+}
+
+export function getDefaultExportFilename(extension: string): string {
+  const stem = getNotebookStem();
+  if (stem) {
+    return `${stem}.${extension}`;
+  }
+  return `${DEFAULT_EXPORT_FILENAME}.${extension}`;
+}
+
+export function getDefaultMarkdownExportFilename(
+  flavor: ExportAsMarkdownRequest["flavor"],
+): string {
+  const extension = MARKDOWN_EXTENSIONS[flavor ?? DEFAULT_MARKDOWN_FLAVOR];
+  return getDefaultExportFilename(extension);
+}

package/src/core/network/markdown-export.ts

@@ -0,0 +1,19 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import type { MarkdownExportFlavor } from "./types";
+
+export const MARKDOWN_EXTENSIONS = {
+  pymdown: "md",
+  qmd: "qmd",
+  mystmd: "myst.md",
+  mdx: "mdx",
+} satisfies Record<MarkdownExportFlavor, string>;
+export const MARKDOWN_SUFFIXES = [
+  ".myst.md",
+  ".markdown",
+  ".qmd",
+  ".mdx",
+  ".md",
+];
+
+export const DEFAULT_MARKDOWN_FLAVOR: MarkdownExportFlavor = "pymdown";

package/src/core/network/requests-network.ts

@@ -3,6 +3,10 @@
 import { once } from "@/utils/once";
 import { getRuntimeManager } from "../runtime/config";
 import { API, createClientWithRuntimeManager } from "./api";
+import {
+  getDefaultExportFilename,
+  getDefaultMarkdownExportFilename,
+} from "./export-filename";
 import {
   waitForConnectionOpen,
   waitForConnectionOpenIfNotebook,
@@ -426,7 +430,11 @@ export function createNetworkRequests(): EditRequests & RunRequests {
           parseAs: "text",
           params: getParams(),
         })
-        .then(handleExportResponse);
+        .then((response) =>
+          handleExportResponse(response, {
+            defaultFilename: getDefaultExportFilename("html"),
+          }),
+        );
     },
     exportAsMarkdown: async (request) => {
       return getClient()
@@ -435,7 +443,11 @@ export function createNetworkRequests(): EditRequests & RunRequests {
           parseAs: "text",
           params: getParams(),
         })
-        .then(handleExportResponse);
+        .then((response) =>
+          handleExportResponse(response, {
+            defaultFilename: getDefaultMarkdownExportFilename(request.flavor),
+          }),
+        );
     },
     exportAsScript: async (request) => {
       return getClient()
@@ -444,7 +456,11 @@ export function createNetworkRequests(): EditRequests & RunRequests {
           parseAs: "text",
           params: getParams(),
         })
-        .then(handleExportResponse);
+        .then((response) =>
+          handleExportResponse(response, {
+            defaultFilename: getDefaultExportFilename("script.py"),
+          }),
+        );
     },
     exportAsIPYNB: async (request) => {
       return getClient()
@@ -453,7 +469,11 @@ export function createNetworkRequests(): EditRequests & RunRequests {
           parseAs: "text",
           params: getParams(),
         })
-        .then(handleExportResponse);
+        .then((response) =>
+          handleExportResponse(response, {
+            defaultFilename: getDefaultExportFilename("ipynb"),
+          }),
+        );
     },
     exportAsPDF: async (request) => {
       return getClient()
@@ -462,7 +482,11 @@ export function createNetworkRequests(): EditRequests & RunRequests {
           parseAs: "blob",
           params: getParams(),
         })
-        .then(handleExportResponse);
+        .then((response) =>
+          handleExportResponse(response, {
+            defaultFilename: getDefaultExportFilename("pdf"),
+          }),
+        );
     },
     autoExportAsHTML: async (request) => {
       return getClient()

package/src/core/network/types.ts

@@ -22,6 +22,9 @@ export type AutoExportAsMarkdownRequest =
   schemas["AutoExportAsMarkdownRequest"];
 export type ExportAsHTMLRequest = schemas["ExportAsHTMLRequest"];
 export type ExportAsMarkdownRequest = schemas["ExportAsMarkdownRequest"];
+export type MarkdownExportFlavor = NonNullable<
+  ExportAsMarkdownRequest["flavor"]
+>;
 export type ExportAsIPYNBRequest = schemas["ExportAsIPYNBRequest"];
 export type ExportAsScriptRequest = schemas["ExportAsScriptRequest"];
 export type ExportAsPDFRequest = schemas["ExportAsPDFRequest"];

package/src/core/storage/types.ts

@@ -61,5 +61,6 @@ export type KnownStorageProtocol =
   | "http"
   | "file"
   | "gdrive"
+  | "hf"
   | "in-memory"
   | "github";