@marimo-team/islands 0.23.17-dev32 → 0.23.17-dev34

package/src/components/editor/ai/ai-completion-editor.tsx

@@ -27,6 +27,7 @@ import { Label } from "@/components/ui/label";
 import { Switch } from "@/components/ui/switch";
 import { Tooltip } from "@/components/ui/tooltip";
 import { toast } from "@/components/ui/use-toast";
+import { AI_SDK_UI_THROTTLE_MS } from "@/core/ai/constants";
 import { stripWrappingBackticks } from "@/core/ai/strip-wrapping-backticks";
 import { type AiCompletionCell, includeOtherCellsAtom } from "@/core/ai/state";
 import type { CellId } from "@/core/cells/ids";
@@ -124,8 +125,7 @@ export const AiCompletionEditor: React.FC<Props> = ({
     api: runtimeManager.getAiURL("completion").toString(),
     headers: runtimeManager.headers(),
     initialInput: initialPrompt,
-    // Throttle the messages and data updates to 100ms
-    experimental_throttle: 100,
+    throttle: AI_SDK_UI_THROTTLE_MS,
     body: {
       ...(Object.keys(completionBody).length > 0
         ? completionBody

package/src/core/ai/constants.ts

@@ -0,0 +1,7 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+/**
+ * Throttle wait (ms) for AI SDK React hooks (`useChat` / `useCompletion`).
+ * Limits UI re-renders while streaming tokens.
+ */
+export const AI_SDK_UI_THROTTLE_MS = 100;

package/src/core/ai/staged-cells.ts

@@ -176,14 +176,17 @@ export function useStagedCells(store: JotaiStore) {
       case "message-metadata":
       case "tool-input-available":
       case "tool-output-available":
+      case "tool-approval-response":
       case "reasoning-start":
       case "reasoning-delta":
       case "reasoning-end":
       case "file":
+      case "reasoning-file":
       case "source-document":
       case "source-url":
       case "tool-input-start":
       case "tool-input-delta":
+      case "custom":
         Logger.debug(chunk.type, { chunk });
         break;
       default:

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/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/plugins/impl/chat/chat-ui.tsx

@@ -26,6 +26,11 @@ import {
 } from "lucide-react";
 import React, { useEffect, useRef, useState } from "react";
 import { z } from "zod";
+import {
+  describeChatAbortReason,
+  getAbortReasonFromChunk,
+  resolveChatAbortReason,
+} from "@/components/chat/chat-abort";
 import { renderUIMessage } from "@/components/chat/chat-display";
 import {
   convertToFileUIPart,
@@ -168,6 +173,12 @@ export const Chatbot: React.FC<Props> = (props) => {
   // different message_id are stale (from an aborted-but-not-yet-cancelled run
   // on the kernel) and must be dropped
   const activeRequestIdRef = useRef<string | null>(null);
+  const lastAbortReasonRef = useRef<string | null>(null);
+  const [abortNotice, setAbortNotice] = useState<string | null>(null);
+  const clearAbortState = () => {
+    lastAbortReasonRef.current = null;
+    setAbortNotice(null);
+  };
 
   const { data: backendMessages } = useAsyncData(async () => {
     const response = await props.get_chat_history({});
@@ -231,6 +242,7 @@ export const Chatbot: React.FC<Props> = (props) => {
           // Client-generated id used to (a) route chunks back to this stream
           // and (b) ask the kernel to cancel just this run on Stop.
           const requestId = generateUUID();
+          clearAbortState();
 
           const stream = new ReadableStream<UIMessageChunk>({
             start(controller) {
@@ -297,15 +309,30 @@ export const Chatbot: React.FC<Props> = (props) => {
       },
     }),
     messages: initialMessages,
-    onFinish: (message) => {
+    onFinish: ({ messages, isAbort, finishReason }) => {
       setFiles(undefined);
 
       if (fileInputRef.current) {
         fileInputRef.current.value = "";
       }
-      Logger.debug("Finished streaming message:", message);
+      Logger.debug("Finished streaming message:", { finishReason, isAbort });
+
+      if (isAbort) {
+        const reason = resolveChatAbortReason({
+          isAbort: true,
+          streamReason: lastAbortReasonRef.current,
+        });
+        clearAbortState();
+        if (reason != null) {
+          const description = describeChatAbortReason(reason);
+          Logger.debug("Chat stream aborted", { reason, finishReason });
+          setAbortNotice(description);
+        }
+      } else {
+        clearAbortState();
+      }
 
-      props.setValue(message.messages);
+      props.setValue(messages);
     },
     onError: (error) => {
       Logger.error("An error occurred:", error);
@@ -323,6 +350,17 @@ export const Chatbot: React.FC<Props> = (props) => {
       if (!parsedMessage.success) {
         return;
       }
+      // Only record abort reasons for the active request. Late chunks from a
+      // cancelled run must not overwrite the next turn's reason
+      if (
+        parsedMessage.data.content &&
+        parsedMessage.data.message_id === activeRequestIdRef.current
+      ) {
+        const abortReason = getAbortReasonFromChunk(parsedMessage.data.content);
+        if (abortReason !== undefined) {
+          lastAbortReasonRef.current = abortReason;
+        }
+      }
       routeIncomingChatChunk(parsedMessage.data, {
         controllerRef: frontendStreamControllerRef,
         activeRequestIdRef,
@@ -340,6 +378,9 @@ export const Chatbot: React.FC<Props> = (props) => {
       setMessages(newMessages);
 
       props.setValue(newMessages);
+      if (newMessages.length === 0) {
+        clearAbortState();
+      }
     }
   };
 
@@ -389,6 +430,7 @@ export const Chatbot: React.FC<Props> = (props) => {
     props.setValue([]);
     props.delete_chat_history({});
     clearError();
+    clearAbortState();
   };
 
   return (
@@ -483,6 +525,12 @@ export const Chatbot: React.FC<Props> = (props) => {
             </Button>
           </div>
         )}
+
+        {abortNotice && !isLoading && !error && (
+          <div className="flex justify-center py-2">
+            <span className="text-xs text-muted-foreground">{abortNotice}</span>
+          </div>
+        )}
       </div>
       <form
         onSubmit={async (evt) => {