@marimo-team/islands 0.23.12-dev9 → 0.23.13-dev0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/islands",
-  "version": "0.23.12-dev9",
+  "version": "0.23.13-dev0",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/components/data-table/TableBottomBar.tsx

@@ -3,6 +3,7 @@
 
 import type { RowSelectionState, Table } from "@tanstack/react-table";
 import { useLocale } from "react-aria";
+import { isStaticNotebook } from "@/core/static/static-state";
 import type { GetRowIds } from "@/plugins/impl/DataTablePlugin";
 import { cn } from "@/utils/cn";
 import { Events } from "@/utils/events";
@@ -40,6 +41,8 @@ export const TableBottomBar = <TData,>({
   className,
 }: TableBottomBarProps<TData>) => {
   const { locale } = useLocale();
+  // Pagination fetches each page via a kernel RPC, absent in static exports.
+  const isStatic = isStaticNotebook();
   const handleSelectAllRows = (value: boolean) => {
     if (!onRowSelectionChange) {
       return;
@@ -171,7 +174,7 @@ export const TableBottomBar = <TData,>({
         <CellSelectionStats table={table} className="lg:hidden" />
       </div>
       <div className="ml-auto lg:ml-0 lg:justify-self-center flex items-center shrink-0">
-        {pagination && (
+        {pagination && !isStatic && (
           <DataTablePagination
             table={table}
             tableLoading={tableLoading}

package/src/components/data-table/data-table.tsx

@@ -25,6 +25,7 @@ import { useLocale } from "react-aria";
 
 import { Button } from "@/components/ui/button";
 import { Table } from "@/components/ui/table";
+import { isStaticNotebook } from "@/core/static/static-state";
 import { Banner } from "@/plugins/impl/common/error-banner";
 import type {
   CalculateTopKRows,
@@ -182,6 +183,11 @@ const DataTableInternal = <TData,>({
   onViewedRowChange,
   renderTableExplorerPanel,
 }: DataTableProps<TData>) => {
+  // The top bar's controls (search, filters, column explorer, chart builder)
+  // all require a live kernel, which static exports don't have.
+  const isStatic = isStaticNotebook();
+  const showTableTopBar = !isStatic;
+
   const [showLoadingBar, setShowLoadingBar] = React.useState<boolean>(false);
   const { locale } = useLocale();
 
@@ -267,11 +273,12 @@ const DataTableInternal = <TData,>({
         }
       : {}),
     manualSorting: manualSorting,
+    enableSorting: !isStatic,
     enableMultiSort: true,
     getSortedRowModel: getSortedRowModel(),
     // filtering
     manualFiltering: true,
-    enableColumnFilters: showFilters,
+    enableColumnFilters: showFilters && !isStatic,
     getFilteredRowModel: getFilteredRowModel(),
     onColumnFiltersChange: onFiltersChange,
     // selection
@@ -355,22 +362,24 @@ const DataTableInternal = <TData,>({
             part="table-wrapper"
             className={cn(className || "rounded-md border overflow-hidden")}
           >
-            <TableTopBar
-              table={table}
-              showSearch={showSearch}
-              searchQuery={searchQuery}
-              onSearchQueryChange={onSearchQueryChange}
-              reloading={reloading}
-              showChartBuilder={showChartBuilder}
-              isChartBuilderOpen={isChartBuilderOpen}
-              toggleDisplayHeader={toggleDisplayHeader}
-              showTableExplorer={showTableExplorer}
-              togglePanel={togglePanel}
-              isAnyPanelOpen={isAnyPanelOpen}
-              downloadAs={downloadAs}
-              sizeBytes={sizeBytes}
-              sizeBytesIsLoading={sizeBytesIsLoading}
-            />
+            {showTableTopBar && (
+              <TableTopBar
+                table={table}
+                showSearch={showSearch}
+                searchQuery={searchQuery}
+                onSearchQueryChange={onSearchQueryChange}
+                reloading={reloading}
+                showChartBuilder={showChartBuilder}
+                isChartBuilderOpen={isChartBuilderOpen}
+                toggleDisplayHeader={toggleDisplayHeader}
+                showTableExplorer={showTableExplorer}
+                togglePanel={togglePanel}
+                isAnyPanelOpen={isAnyPanelOpen}
+                downloadAs={downloadAs}
+                sizeBytes={sizeBytes}
+                sizeBytesIsLoading={sizeBytesIsLoading}
+              />
+            )}
             {allUserColumnsHidden && (
               <Banner className="mb-1 mx-2 rounded flex items-center justify-between">
                 <span>All columns are hidden.</span>

package/src/components/data-table/utils.ts

@@ -4,6 +4,7 @@ import type { Table } from "@tanstack/react-table";
 import type { TableData } from "@/plugins/impl/DataTablePlugin";
 import { vegaLoadData } from "@/plugins/impl/vega/loader";
 import { jsonParseWithSpecialChar } from "@/utils/json/json-parser";
+import { isRecord } from "@/utils/records";
 import { getMimeValues } from "./mime-cell";
 import type { DataType } from "@/core/kernel/messages";
 import {
@@ -232,10 +233,6 @@ function stripHtml(html: string): string {
 
 const HTML_MIMETYPES = new Set(["text/html", "text/markdown"]);
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
-}
-
 /**
  * Get clipboard-ready text and optional HTML for a cell.
  *

package/src/components/editor/ai/__tests__/completion-utils.test.ts

@@ -1,6 +1,15 @@
 /* Copyright 2026 Marimo. All rights reserved. */
-import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import {
+  afterEach,
+  beforeEach,
+  describe,
+  expect,
+  it,
+  type Mock,
+  vi,
+} from "vitest";
 import { variableName } from "@/__tests__/branded";
+import * as aiContext from "@/core/ai/context/context";
 import { getCodes } from "@/core/codemirror/copilot/getCodes";
 import { dataSourceConnectionsAtom } from "@/core/datasets/data-source-connections";
 import { DUCKDB_ENGINE } from "@/core/datasets/engines";
@@ -8,10 +17,11 @@ import { datasetsAtom } from "@/core/datasets/state";
 import type { DatasetsState } from "@/core/datasets/types";
 import { store } from "@/core/state/jotai";
 import { variablesAtom } from "@/core/variables/state";
-import type { UIMessage } from "ai";
+import type { FileUIPart, UIMessage } from "ai";
 import {
   codeToCells,
   getAICompletionBody,
+  getAICompletionBodyWithAttachments,
   isContextAttachment,
   MARIMO_CONTEXT_PART_TYPE,
   resolveChatContext,
@@ -440,6 +450,42 @@ describe("isContextAttachment", () => {
   });
 });
 
+describe("context attachment stamping", () => {
+  const rawAttachment: FileUIPart = {
+    type: "file",
+    mediaType: "image/png",
+    url: "data:image/png;base64,abc",
+  };
+
+  beforeEach(() => {
+    vi.spyOn(aiContext, "getAIContextRegistry").mockReturnValue({
+      parseAllContextIds: () => ["data://t1"],
+      formatContextForAI: () => '<data name="t1" />',
+      getAttachmentsForContext: async () => [rawAttachment],
+    } as unknown as ReturnType<typeof aiContext.getAIContextRegistry>);
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  it("stamps chat attachments as context-derived", async () => {
+    const { attachments } = await resolveChatContext("see @data://t1");
+    expect(attachments).toHaveLength(1);
+    expect(isContextAttachment(attachments[0])).toBe(true);
+    // The original attachment is left untouched (we return a stamped copy).
+    expect(rawAttachment.providerMetadata).toBeUndefined();
+  });
+
+  it("stamps completion attachments the same way as chat", async () => {
+    const { attachments } = await getAICompletionBodyWithAttachments({
+      input: "see @data://t1",
+    });
+    expect(attachments).toHaveLength(1);
+    expect(isContextAttachment(attachments[0])).toBe(true);
+  });
+});
+
 describe("codeToCells", () => {
   it("should return empty array for empty string", () => {
     const code = "";

package/src/components/editor/ai/completion-utils.ts

@@ -9,6 +9,7 @@ import {
 import type { ReactCodeMirrorRef } from "@uiw/react-codemirror";
 import type { DataUIPart, FileUIPart, UIMessage } from "ai";
 import { getAIContextRegistry } from "@/core/ai/context/context";
+import type { ContextLocatorId } from "@/core/ai/context/registry";
 import { getCodes } from "@/core/codemirror/copilot/getCodes";
 import type { LanguageAdapterType } from "@/core/codemirror/language/types";
 import type { AiCompletionRequest } from "@/core/network/types";
@@ -89,20 +90,51 @@ export function isContextAttachment(part: UIMessage["parts"][number]): boolean {
 }
 
 /**
- * Resolve @-context for messages. They represent referenced
- * datasets, variables, or other context from the user's prompt.
+ * Stamp a context-derived attachment with a provenance marker.
+ *
+ * Some @-mentions resolve to file attachments (e.g. a cell's image output),
+ * which get appended to the user message right alongside files the user
+ * uploaded by hand. Once they're in the message the two are indistinguishable,
+ * so we mark the context-derived ones. This matters on message edit: we
+ * re-resolve context from the edited text, and `isContextAttachment` lets us
+ * drop only the stale context attachments while preserving the user's own
+ * uploads
  */
-export async function resolveChatContext(
+function stampContextAttachment(attachment: FileUIPart): FileUIPart {
+  return {
+    ...attachment,
+    providerMetadata: {
+      ...attachment.providerMetadata,
+      // Merge within the `marimo` namespace so we don't clobber any other
+      // marimo metadata a provider may have already set.
+      marimo: {
+        ...attachment.providerMetadata?.marimo,
+        ...CONTEXT_ATTACHMENT_METADATA.marimo,
+      },
+    },
+  };
+}
+
+interface ResolvedContext {
+  plainText: string;
+  contextIds: ContextLocatorId[];
+  attachments: FileUIPart[];
+}
+
+/**
+ * Parse @-context for messages
+ */
+async function resolveContextAttachments(
   input: string,
-): Promise<ResolvedChatContext> {
+): Promise<ResolvedContext> {
   if (!input.includes(CONTEXT_TRIGGER)) {
-    return { contextPart: null, attachments: [] };
+    return { plainText: "", contextIds: [], attachments: [] };
   }
 
   const registry = getAIContextRegistry(store);
   const contextIds = registry.parseAllContextIds(input);
   if (contextIds.length === 0) {
-    return { contextPart: null, attachments: [] };
+    return { plainText: "", contextIds: [], attachments: [] };
   }
 
   const plainText = registry.formatContextForAI(contextIds);
@@ -110,20 +142,24 @@ export async function resolveChatContext(
   let attachments: FileUIPart[] = [];
   try {
     const resolved = await registry.getAttachmentsForContext(contextIds);
-    attachments = resolved.map((attachment) => ({
-      ...attachment,
-      providerMetadata: {
-        ...attachment.providerMetadata,
-        marimo: {
-          ...attachment.providerMetadata?.marimo,
-          ...CONTEXT_ATTACHMENT_METADATA.marimo,
-        },
-      },
-    }));
+    attachments = resolved.map(stampContextAttachment);
   } catch (error) {
     Logger.error("Error getting attachments:", error);
   }
 
+  return { plainText, contextIds, attachments };
+}
+
+/**
+ * Resolve @-context for messages. They represent referenced
+ * datasets, variables, or other context from the user's prompt.
+ */
+export async function resolveChatContext(
+  input: string,
+): Promise<ResolvedChatContext> {
+  const { plainText, contextIds, attachments } =
+    await resolveContextAttachments(input);
+
   let contextPart: MarimoContextUIPart | null = null;
   if (plainText.trim()) {
     contextPart = {
@@ -141,31 +177,13 @@ export async function resolveChatContext(
 export async function getAICompletionBodyWithAttachments({
   input,
 }: Opts): Promise<AICompletionBodyWithAttachments> {
-  let contextString = "";
-  let attachments: FileUIPart[] = [];
-
-  // Skip if no '@' in the input
-  if (input.includes("@")) {
-    const registry = getAIContextRegistry(store);
-    const contextIds = registry.parseAllContextIds(input);
-
-    // Get context string
-    contextString = registry.formatContextForAI(contextIds);
-
-    // Get attachments
-    try {
-      attachments = await registry.getAttachmentsForContext(contextIds);
-      Logger.debug("Included attachments", attachments.length);
-    } catch (error) {
-      Logger.error("Error getting attachments:", error);
-    }
-  }
+  const { plainText, attachments } = await resolveContextAttachments(input);
 
   return {
     body: {
       includeOtherCode: getCodes(""),
       context: {
-        plainText: contextString,
+        plainText,
         schema: [],
         variables: [],
       },

package/src/components/editor/app-container.tsx

@@ -48,7 +48,9 @@ export const AppContainer: React.FC<PropsWithChildren<Props>> = ({
               "bg-background w-full h-full text-textColor",
               "flex flex-col overflow-y-auto",
               width === "full" && "config-width-full",
-              width === "columns" ? "overflow-x-auto" : "overflow-x-hidden",
+              width === "columns"
+                ? "overflow-x-auto"
+                : "overflow-x-auto sm:overflow-x-hidden",
               "print:height-fit",
             )}
           >

package/src/components/editor/output/ImageOutput.tsx

@@ -5,8 +5,8 @@ import type { JSX } from "react";
 interface Props {
   src: string;
   alt?: string;
-  width?: number;
-  height?: number;
+  width?: number | string;
+  height?: number | string;
   className?: string;
 }
 
@@ -17,9 +17,18 @@ export const ImageOutput = ({
   height,
   className,
 }: Props): JSX.Element => {
+  // Convert numeric values to pixel strings, pass string values (like "100%") as-is
+  const style: React.CSSProperties = {};
+  if (width !== undefined) {
+    style.width = typeof width === "number" ? `${width}px` : width;
+  }
+  if (height !== undefined) {
+    style.height = typeof height === "number" ? `${height}px` : height;
+  }
+
   return (
     <span className={className}>
-      <img src={src} alt={alt} width={width} height={height} />
+      <img src={src} alt={alt} style={style} />
     </span>
   );
 };

package/src/components/editor/renderers/vertical-layout/vertical-layout-wrapper.tsx

@@ -32,9 +32,9 @@ export const VerticalLayoutWrapper: React.FC<PropsWithChildren<Props>> = ({
           // This padding needs to be the same from above to be correctly applied
           "pb-24 sm:pb-12",
           appConfig.width === "compact" &&
-            "max-w-(--content-width) min-w-[400px]",
+            "max-w-(--content-width) sm:min-w-[400px]",
           appConfig.width === "medium" &&
-            "max-w-(--content-width-medium) min-w-[400px]",
+            "max-w-(--content-width-medium) sm:min-w-[400px]",
           appConfig.width === "columns" && "w-fit",
           appConfig.width === "full" && "max-w-full",
           // Hide the cells for a fake loading effect, to avoid flickering

package/src/core/codemirror/go-to-definition/__tests__/commands.test.ts

@@ -253,6 +253,73 @@ a = 10`;
     `);
   });
 
+  test("from-import alias is the binding, not the imported name", async () => {
+    const code = `\
+from math import sin as my_sin
+print(my_sin)`;
+    view = createEditor(code);
+    const usagePosition = code.lastIndexOf("my_sin");
+    const result = goToVariableDefinition(view, "my_sin", usagePosition);
+
+    expect(result).toBe(true);
+    await tick();
+    // The alias `my_sin` (after `as`) is the real binding.
+    expect(renderEditorView(view)).toMatchInlineSnapshot(`
+      "
+      from math import sin as my_sin
+                              ^
+      print(my_sin)
+      "
+    `);
+  });
+
+  test("module path in from-import is not a local definition", async () => {
+    const code = `\
+from math import sin
+print(math)`;
+    view = createEditor(code);
+    const usagePosition = code.lastIndexOf("math");
+    // `math` is a module reference in the from-clause, not a binding in this
+    // cell, so the scoped resolver should return false and let the caller fall
+    // through to cross-cell resolution.
+    const result = goToVariableDefinition(view, "math", usagePosition);
+
+    expect(result).toBe(false);
+    expect(view.state.selection.main.head).toBe(0);
+  });
+
+  test("imported name without `as` is a local definition", async () => {
+    const code = `\
+from math import sin
+print(sin)`;
+    view = createEditor(code);
+    const usagePosition = code.lastIndexOf("sin");
+    const result = goToVariableDefinition(view, "sin", usagePosition);
+
+    expect(result).toBe(true);
+    await tick();
+    expect(renderEditorView(view)).toMatchInlineSnapshot(`
+      "
+      from math import sin
+                       ^
+      print(sin)
+      "
+    `);
+  });
+
+  test("imported name shadowed by `as` is not a binding", async () => {
+    const code = `\
+from math import sin as my_sin
+print(sin)`;
+    view = createEditor(code);
+    const usagePosition = code.lastIndexOf("sin");
+    // `sin` here refers to nothing in this cell (it was renamed to `my_sin`),
+    // so the scoped resolver should return false.
+    const result = goToVariableDefinition(view, "sin", usagePosition);
+
+    expect(result).toBe(false);
+  });
+
   test("selects outer-scope function declaration", async () => {
     view = createEditor(`\
 def x():

package/src/core/codemirror/go-to-definition/__tests__/utils.test.ts

@@ -133,4 +133,51 @@ output = _x + 10`;
     await tick();
     expect(view.state.selection.main.head).toBe(code.indexOf("_x = 10"));
   });
+
+  test("falls through to cross-cell when in-cell occurrence is only a module path in a from-import", async () => {
+    // Regression: ImportStatement used to register every VariableName child
+    // (the module path and pre-`as` names) as in-cell declarations, so the
+    // local-first short-circuit would steal F12 from cross-cell resolution.
+    const moduleCell = cellId("module-cell");
+    const usageCell = cellId("usage-cell");
+    const moduleCode = `mymodule = 100`;
+    const usageCode = `\
+from mymodule import something
+print(mymodule)`;
+
+    const moduleView = createEditor(moduleCode, moduleCode.length);
+    const usageView = createEditor(
+      usageCode,
+      usageCode.lastIndexOf("mymodule"),
+    );
+    views.push(moduleView, usageView);
+
+    const notebook = initialNotebookState();
+    notebook.cellHandles[moduleCell] = {
+      current: { editorView: moduleView, editorViewOrNull: moduleView },
+    } as never;
+    notebook.cellHandles[usageCell] = {
+      current: { editorView: usageView, editorViewOrNull: usageView },
+    } as never;
+
+    store.set(notebookAtom, notebook);
+    store.set(variablesAtom, {
+      [variableName("mymodule")]: {
+        dataType: "int",
+        declaredBy: [moduleCell],
+        name: variableName("mymodule"),
+        usedBy: [usageCell],
+        value: "100",
+      },
+    });
+
+    const result = goToDefinitionAtCursorPosition(usageView);
+
+    expect(result).toBe(true);
+    await tick();
+    // Cross-cell jump: moduleView's cursor should land on `mymodule = 100`.
+    expect(moduleView.state.selection.main.head).toBe(
+      moduleCode.indexOf("mymodule"),
+    );
+  });
 });

package/src/core/codemirror/go-to-definition/commands.ts

@@ -307,33 +307,52 @@ function collectMatchingDeclarations(
       break;
     }
     case "ImportStatement": {
+      // The grammar emits one ImportStatement for both `import x [as y]` and
+      // `from m import x [as y], ...`. Direct children include the keywords
+      // (`from`/`import`/`as`), commas, dots, and every VariableName from the
+      // module path AND the import list. We only want the names that actually
+      // bind in the current scope: the post-`as` alias if present, otherwise
+      // the imported name itself. Names before `import` (the from-path) and
+      // the original name when an alias follows it are NOT bindings.
       const subCursor = node.cursor();
       subCursor.firstChild();
-      do {
-        if (
-          subCursor.name === "VariableName" &&
-          state.doc.sliceString(subCursor.from, subCursor.to) === variableName
-        ) {
-          addDeclaration(declarations, currentScope, subCursor.from);
+      let pastImport = false;
+      // Buffer the most recent post-`import` VariableName so we can defer
+      // committing it until we know whether `as` follows.
+      let pending: { from: number; matches: boolean } | null = null;
+      const commit = () => {
+        if (pending?.matches) {
+          addDeclaration(declarations, currentScope, pending.from);
         }
-      } while (subCursor.nextSibling());
-      break;
-    }
-    case "ImportFromStatement": {
-      const subCursor = node.cursor();
-      subCursor.firstChild();
-      let foundImport = false;
+        pending = null;
+      };
       do {
         if (subCursor.name === "import") {
-          foundImport = true;
-        } else if (
-          foundImport &&
-          subCursor.name === "VariableName" &&
-          state.doc.sliceString(subCursor.from, subCursor.to) === variableName
-        ) {
-          addDeclaration(declarations, currentScope, subCursor.from);
+          pastImport = true;
+          continue;
+        }
+        if (!pastImport) {
+          continue;
+        }
+        if (subCursor.name === "as") {
+          // Next VariableName is the alias and replaces `pending`.
+          pending = null;
+          continue;
+        }
+        if (subCursor.name === "VariableName") {
+          // Flush any previous pending name (no `as` followed it).
+          commit();
+          pending = {
+            from: subCursor.from,
+            matches:
+              state.doc.sliceString(subCursor.from, subCursor.to) ===
+              variableName,
+          };
+        } else if (subCursor.name === ",") {
+          commit();
         }
       } while (subCursor.nextSibling());
+      commit();
       break;
     }
     case "TryStatement":
@@ -410,23 +429,21 @@ function findScopedDefinitionPosition(
  * @param view The editor view which contains the variable name.
  * @param variableName The name of the variable to select, if found in the editor.
  * @param usagePosition The position of the variable usage, if available.
- * @param fallbackToFirstMatch Whether to fall back to the first matching
- * variable name when no scoped definition is found. Defaults to true.
  */
 export function goToVariableDefinition(
   view: EditorView,
   variableName: string,
   usagePosition?: number,
-  fallbackToFirstMatch = true,
 ): boolean {
   const { state } = view;
-  let from: number | null = null;
-  if (usagePosition !== undefined) {
-    from = findScopedDefinitionPosition(state, variableName, usagePosition);
-  }
-  if (from === null && fallbackToFirstMatch) {
-    from = findFirstMatchingVariable(state, variableName);
-  }
+  // When the caller knows the usage position, trust the scoped lookup. Falling
+  // back to first-match would defeat the local-vs-cross-cell decision in
+  // goToDefinition: if the symbol only appears as a module path in an import,
+  // scoped resolution returns null and we want the caller to try other cells.
+  const from =
+    usagePosition !== undefined
+      ? findScopedDefinitionPosition(state, variableName, usagePosition)
+      : findFirstMatchingVariable(state, variableName);
 
   if (from === null) {
     return false;

package/src/core/codemirror/go-to-definition/utils.ts

@@ -82,7 +82,6 @@ export function goToDefinition(
       view,
       variableName,
       usagePosition,
-      false,
     );
     if (foundLocally) {
       return true;