@marimo-team/islands 0.19.7-dev43 → 0.19.7-dev46

package/dist/main.js

@@ -17762,7 +17762,7 @@ ${JSON.stringify(e2, null, 4)}`);
       label: f,
       detail: (d == null ? void 0 : d.detail) || c,
       apply(e2, c2, d2, _2) {
-        if (v && isLSPTextEdit(v) ? e2.dispatch(insertCompletionText(e2.state, v.newText, posToOffsetOrZero(e2.state.doc, v.range.start), posToOffsetOrZero(e2.state.doc, v.range.end))) : y && E === InsertTextFormat.Snippet && r.useSnippetOnCompletion ? snippet(convertSnippet(y))(e2, null, d2, _2) : e2.dispatch(insertCompletionText(e2.state, f, d2, _2)), !w) return;
+        if (v && isLSPTextEdit(v) ? e2.dispatch(insertCompletionText(e2.state, v.newText, posToOffsetOrZero(e2.state.doc, v.range.start), posToOffsetOrZero(e2.state.doc, v.range.end))) : y && E === InsertTextFormat.Snippet && r.useSnippetOnCompletion ? snippet(convertSnippet(y))(e2, null, d2, _2) : e2.dispatch(insertCompletionText(e2.state, y || f, d2, _2)), !w) return;
         let S2 = w.sort(({ range: { end: r2 } }, { range: { end: c3 } }) => posToOffsetOrZero(e2.state.doc, r2) < posToOffsetOrZero(e2.state.doc, c3) ? 1 : posToOffsetOrZero(e2.state.doc, r2) > posToOffsetOrZero(e2.state.doc, c3) ? -1 : 0);
         for (let r2 of S2) e2.dispatch(e2.state.update({
           changes: {
@@ -18703,7 +18703,7 @@ ${JSON.stringify(e2, null, 4)}`);
   }
   function singleFacet() {
     return Facet$1.define({
-      combine: (e) => e[0]
+      combine: (e) => e.find((e2) => e2 !== void 0)
     });
   }
   singleFacet(), singleFacet(), singleFacet();
@@ -32350,7 +32350,6 @@ ${c.sqlString}
   var Snapshotter = class {
     constructor(e) {
       __publicField(this, "documentVersion", 0);
-      __publicField(this, "versionToCellNumberAndVersion", new LRUCache(20));
       __publicField(this, "lastSnapshot", null);
       this.getNotebookCode = e;
     }
@@ -32367,11 +32366,6 @@ ${c.sqlString}
         version: this.documentVersion
       };
     }
-    getSnapshot(e) {
-      let r = this.versionToCellNumberAndVersion.get(e);
-      if (!r) throw Error(`No snapshot for version ${e}`);
-      return r;
-    }
     getLatestSnapshot() {
       if (!this.lastSnapshot) throw Error("No snapshots");
       return {
@@ -32611,13 +32605,26 @@ ${c.sqlString}
       }), d.contents === "" ? null : (d.range && (d.range = r.reverseRange(d.range, c)), d)) : (Logger.debug("[lsp] no hover result"), d);
     }
     async textDocumentCompletion(e) {
-      let { lens: r } = this.snapshotter.getLatestSnapshot(), c = CellDocumentUri.parse(e.textDocument.uri);
+      let { lens: r } = this.snapshotter.getLatestSnapshot();
+      if (!CellDocumentUri.is(e.textDocument.uri)) return Logger.error("[lsp] Invalid cell document URI in completion request", e.textDocument.uri), null;
+      let c = CellDocumentUri.parse(e.textDocument.uri);
+      if (!c || c === "undefined") return Logger.error("[lsp] Invalid cellId 'undefined' in completion request", {
+        cellId: c,
+        uri: e.textDocument.uri,
+        availableCellIds: r.cellIds
+      }), null;
+      r.cellIds.includes(c) || Logger.warn("[lsp] CellId in completion request not found in current lens", {
+        cellId: c,
+        uri: e.textDocument.uri,
+        availableCellIds: r.cellIds
+      });
+      let d = r.transformPosition(e.position, c);
       return this.client.textDocumentCompletion({
         ...e,
         textDocument: {
           uri: this.documentUri
         },
-        position: r.transformPosition(e.position, c)
+        position: d
       });
     }
     patchProcessNotification() {
@@ -32944,7 +32951,7 @@ ${c.sqlString}
                 client: r2,
                 languageId: "python",
                 allowHTMLContent: true,
-                useSnippetOnCompletion: false,
+                useSnippetOnCompletion: true,
                 hoverConfig: _,
                 completionConfig: d2,
                 diagnosticsEnabled: ((_d2 = f.diagnostics) == null ? void 0 : _d2.enabled) ?? false,
@@ -73168,7 +73175,7 @@ Image URL: ${r.imageUrl}`)), contextToXml({
       return Logger.warn("Failed to get version from mount config"), null;
     }
   }
-  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.19.7-dev43"), showCodeInRunModeAtom = atom(true);
+  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.19.7-dev46"), showCodeInRunModeAtom = atom(true);
   atom(null);
   var import_compiler_runtime$88 = require_compiler_runtime();
   function useKeydownOnElement(e, r) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/islands",
-  "version": "0.19.7-dev43",
+  "version": "0.19.7-dev46",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -55,7 +55,7 @@
     "@lezer/markdown": "^1.6.2",
     "@lezer/python": "^1.1.18",
     "@marimo-team/codemirror-ai": "^0.3.5",
-    "@marimo-team/codemirror-languageserver": "^1.16.10",
+    "@marimo-team/codemirror-languageserver": "^1.16.11",
     "@marimo-team/codemirror-mcp": "^0.1.5",
     "@marimo-team/codemirror-sql": "^0.2.4",
     "@marimo-team/llm-info": "workspace:*",

package/src/core/ai/tools/__tests__/edit-notebook-tool.test.ts

@@ -44,6 +44,7 @@ function createMockEditorView(code: string): EditorView {
           lspConfig: {},
         }),
         cellConfigExtension({
+          cellId: "cell1" as CellId,
           completionConfig: {
             copilot: false,
             activate_on_typing: true,

package/src/core/codemirror/cm.ts

@@ -115,6 +115,7 @@ export const setupCodeMirror = (opts: CodeMirrorSetupOpts): Extension[] => {
     jupyterHelpExtension(),
     // Cell editing
     cellConfigExtension({
+      cellId,
       completionConfig,
       hotkeys,
       placeholderType,

package/src/core/codemirror/config/extension.ts

@@ -41,12 +41,14 @@ export const lspConfigState = singleFacet<
  * Extension for cell config
  */
 export function cellConfigExtension({
+  cellId,
   completionConfig,
   hotkeys,
   placeholderType,
   lspConfig,
   diagnosticsConfig,
 }: {
+  cellId: CellId;
   completionConfig: CompletionConfig;
   hotkeys: HotkeyProvider;
   placeholderType: PlaceholderType;
@@ -55,6 +57,7 @@ export function cellConfigExtension({
 }) {
   return [
     // Store state
+    cellIdState.of(cellId),
     completionConfigState.of(completionConfig),
     hotkeysProviderState.of(hotkeys),
     placeholderState.of(placeholderType),

package/src/core/codemirror/copilot/__tests__/getCodes.test.ts

@@ -45,6 +45,7 @@ function createMockEditorView(code: string) {
           lspConfig: {},
         }),
         cellConfigExtension({
+          cellId: "cell1" as CellId,
           completionConfig: {
             copilot: false,
             activate_on_typing: true,

package/src/core/codemirror/facet.ts

@@ -14,6 +14,9 @@ import { Facet } from "@codemirror/state";
  */
 export function singleFacet<T>() {
   return Facet.define<T, T>({
-    combine: (values) => values[0],
+    combine: (values) => {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      return values.find((v) => v !== undefined)!;
+    },
   });
 }

package/src/core/codemirror/language/__tests__/extension.test.ts

@@ -49,6 +49,7 @@ function createState(content: string, selection?: { anchor: number }) {
         placeholderType: "marimo-import",
       }),
       cellConfigExtension({
+        cellId: "cell1" as CellId,
         completionConfig: {
           copilot: false,
           activate_on_typing: true,

package/src/core/codemirror/language/__tests__/utils.test.ts

@@ -31,6 +31,7 @@ function createEditor(doc: string) {
           lspConfig: {},
         }),
         cellConfigExtension({
+          cellId: "cell1" as CellId,
           completionConfig: {
             activate_on_typing: true,
             signature_hint_on_typing: false,

package/src/core/codemirror/language/extension.ts

@@ -15,6 +15,7 @@ import type {
   LSPConfig,
 } from "@/core/config/config-schema";
 import type { HotkeyProvider } from "@/core/hotkeys/hotkeys";
+import { Logger } from "@/utils/Logger";
 import { clamp } from "@/utils/math";
 import {
   cellIdState,
@@ -310,6 +311,17 @@ export function reconfigureLanguageEffect(
   const language = view.state.field(languageAdapterState);
   const placeholderType = view.state.facet(placeholderState);
   const cellId = view.state.facet(cellIdState);
+
+  if (cellId === undefined) {
+    Logger.error("Cell ID is undefined in reconfigureLanguageEffect");
+  }
+  if (placeholderType === undefined) {
+    Logger.error("Placeholder type is undefined in reconfigureLanguageEffect");
+  }
+  if (completionConfig === undefined) {
+    Logger.error("Completion config is undefined in reconfigureLanguageEffect");
+  }
+
   return languageCompartment.reconfigure(
     language.getExtension(
       cellId,

package/src/core/codemirror/language/languages/python.ts

@@ -293,7 +293,7 @@ export class PythonLanguageAdapter implements LanguageAdapter<{}> {
             client: client as unknown as LanguageServerClient,
             languageId: "python",
             allowHTMLContent: true,
-            useSnippetOnCompletion: false,
+            useSnippetOnCompletion: true,
             hoverConfig: hoverOptions,
             completionConfig: autocompleteOptions,
             // Default to false

package/src/core/codemirror/lsp/notebook-lsp.ts

@@ -47,13 +47,6 @@ class Snapshotter {
     this.getNotebookCode = getNotebookCode;
   }
 
-  /**
-   * Map from the global document version to the cell id and version.
-   */
-  private versionToCellNumberAndVersion = new LRUCache<number, NotebookLens>(
-    20,
-  );
-
   private lastSnapshot: NotebookLens | null = null;
 
   public snapshot() {
@@ -78,14 +71,6 @@ class Snapshotter {
     };
   }
 
-  public getSnapshot(version: number) {
-    const snapshot = this.versionToCellNumberAndVersion.get(version);
-    if (!snapshot) {
-      throw new Error(`No snapshot for version ${version}`);
-    }
-    return snapshot;
-  }
-
   public getLatestSnapshot() {
     if (!this.lastSnapshot) {
       throw new Error("No snapshots");
@@ -657,14 +642,49 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
 
   public async textDocumentCompletion(params: LSP.CompletionParams) {
     const { lens } = this.snapshotter.getLatestSnapshot();
+
+    // Check if URI is valid
+    if (!CellDocumentUri.is(params.textDocument.uri)) {
+      Logger.error(
+        "[lsp] Invalid cell document URI in completion request",
+        params.textDocument.uri,
+      );
+      return null;
+    }
+
     const cellId = CellDocumentUri.parse(params.textDocument.uri);
 
+    // Check if cellId is valid (not undefined string)
+    if (!cellId || cellId === "undefined") {
+      Logger.error("[lsp] Invalid cellId 'undefined' in completion request", {
+        cellId,
+        uri: params.textDocument.uri,
+        availableCellIds: lens.cellIds,
+      });
+      // Return null to fail gracefully instead of sending wrong position
+      return null;
+    }
+
+    // Warn if cellId not found in lens (might be okay if cell was just added)
+    if (!lens.cellIds.includes(cellId)) {
+      Logger.warn(
+        "[lsp] CellId in completion request not found in current lens",
+        {
+          cellId,
+          uri: params.textDocument.uri,
+          availableCellIds: lens.cellIds,
+        },
+      );
+    }
+
+    const transformedPosition = lens.transformPosition(params.position, cellId);
+
     return this.client.textDocumentCompletion({
       ...params,
       textDocument: {
         uri: this.documentUri,
       },
-      position: lens.transformPosition(params.position, cellId),
+      position: transformedPosition,
     });
   }
 

package/src/utils/__tests__/iframe.test.ts

@@ -1,13 +1,8 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { captureIframeAsImage } from "../iframe";
+import { captureExternalIframes } from "../iframe";
 
-// Mock html-to-image
-vi.mock("html-to-image", () => ({
-  toPng: vi.fn().mockResolvedValue("data:image/png;base64,mock"),
-}));
-
-describe("captureIframeAsImage", () => {
+describe("captureExternalIframes", () => {
   const originalCreateElement = document.createElement.bind(document);
 
   beforeEach(() => {
@@ -53,7 +48,7 @@ describe("captureIframeAsImage", () => {
     const element = document.createElement("div");
     element.innerHTML = "<p>No iframe here</p>";
 
-    const result = await captureIframeAsImage(element);
+    const result = await captureExternalIframes(element);
     expect(result).toBeNull();
   });
 
@@ -61,7 +56,7 @@ describe("captureIframeAsImage", () => {
     const element = document.createElement("div");
     element.innerHTML = '<iframe src="https://external.com/page"></iframe>';
 
-    const result = await captureIframeAsImage(element);
+    const result = await captureExternalIframes(element);
 
     expect(result).not.toBeNull();
     expect(result).toMatch(/^data:image\/png;base64,/);
@@ -72,7 +67,7 @@ describe("captureIframeAsImage", () => {
     element.innerHTML =
       '<iframe src="https://www.openstreetmap.org/export/embed.html"></iframe>';
 
-    const result = await captureIframeAsImage(element);
+    const result = await captureExternalIframes(element);
 
     expect(result).not.toBeNull();
     expect(result).toMatch(/^data:image\/png;base64,/);
@@ -85,7 +80,7 @@ describe("captureIframeAsImage", () => {
     element.append(iframe);
 
     // The iframe has no body accessible in jsdom
-    const result = await captureIframeAsImage(element);
+    const result = await captureExternalIframes(element);
 
     // In jsdom, contentDocument may not be accessible
     expect(result).toBeNull();
@@ -96,7 +91,7 @@ describe("captureIframeAsImage", () => {
     element.innerHTML = '<iframe src="./@file/123.html"></iframe>';
 
     // Same-origin relative URL, but contentDocument not accessible in jsdom
-    const result = await captureIframeAsImage(element);
+    const result = await captureExternalIframes(element);
 
     // Returns null because jsdom can't access contentDocument for file URLs
     expect(result).toBeNull();
@@ -113,7 +108,7 @@ describe("captureIframeAsImage", () => {
       const element = document.createElement("div");
       element.innerHTML = `<iframe src="${url}"></iframe>`;
 
-      const result = await captureIframeAsImage(element);
+      const result = await captureExternalIframes(element);
 
       expect(result).not.toBeNull();
       expect(result).toMatch(/^data:image\/png;base64,/);
@@ -128,7 +123,7 @@ describe("captureIframeAsImage", () => {
       const element = document.createElement("div");
       element.innerHTML = `<iframe src="${url}"></iframe>`;
 
-      const result = await captureIframeAsImage(element);
+      const result = await captureExternalIframes(element);
 
       // In jsdom, these return null because contentDocument isn't accessible
       // but they should NOT return a placeholder (which would indicate external detection)

package/src/utils/download.ts

@@ -8,7 +8,7 @@ import { Filenames } from "@/utils/filenames";
 import { Paths } from "@/utils/paths";
 import { prettyError } from "./errors";
 import { toPng } from "./html-to-image";
-import { captureIframeAsImage } from "./iframe";
+import { captureExternalIframes } from "./iframe";
 import { Logger } from "./Logger";
 import { ProgressState } from "./progress";
 import { ToastProgress } from "./toast-progress";
@@ -66,9 +66,11 @@ export async function getImageDataUrlForCell(
     return;
   }
 
-  const iframeDataUrl = await captureIframeAsImage(element);
-  if (iframeDataUrl) {
-    return iframeDataUrl;
+  // TODO: This doesn't handle external iframes + normal elements together (eg. in vstack).
+  // It will return the iframe only
+  const externalIframeDataUrl = await captureExternalIframes(element);
+  if (externalIframeDataUrl) {
+    return externalIframeDataUrl;
   }
 
   const startTime = Date.now();

package/src/utils/iframe.ts

@@ -1,7 +1,5 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import { toPng } from "./html-to-image";
-
 const PLACEHOLDER_WIDTH = 320;
 const PLACEHOLDER_HEIGHT = 180;
 
@@ -95,11 +93,11 @@ function createPlaceholderImage(url: string | null): string {
 }
 
 /**
- * Capture an iframe as a PNG image. We need to do this because external iframes are not supported by html-to-image.
+ * Capture external iframes as a PNG image. External iframes are not supported by html-to-image.
  * @param element - The element to capture the iframe from
  * @returns The image data URL of the iframe, or a placeholder image if the iframe is external
  */
-export async function captureIframeAsImage(
+export async function captureExternalIframes(
   element: HTMLElement,
 ): Promise<string | null> {
   const iframe = element.querySelector("iframe");
@@ -133,10 +131,5 @@ export async function captureIframeAsImage(
     }
   }
 
-  // Capture the iframe content
-  try {
-    return await toPng(doc.body);
-  } catch {
-    return createPlaceholderImage(null);
-  }
+  return null;
 }