@marimo-team/islands 0.25.3-dev157 → 0.25.3-dev162

package/dist/{number-overlay-editor-BC7kWJji.js → number-overlay-editor-ELtg9k3M.js}

@@ -1,6 +1,6 @@
 import { a as e } from "./rolldown-runtime-Cb76FRpK.js";
 import { t } from "./react-sHtZdjeP.js";
-import { a as n } from "./glide-data-editor-DZHp-j3z.js";
+import { a as n } from "./glide-data-editor-Dn1Ekucb.js";
 //#region ../node_modules/.pnpm/@glideapps+glide-data-grid@6.0.4-alpha24_lodash@4.17.21_marked@15.0.12_react-dom@19.3.0_27cffe7f1bc30287d59ac27db3240c5b/node_modules/@glideapps/glide-data-grid/dist/esm/internal/data-grid-overlay-editor/private/number-overlay-editor-style.js
 var r = /* @__PURE__ */ e(t()), i = /*#__PURE__*/ n("div")({
 	name: "NumberOverlayEditorStyle",

package/dist/{reveal-component-WNqfK529.js → reveal-component-CduO3VgT.js}

@@ -4,14 +4,14 @@ import { t as o } from "./react-sHtZdjeP.js";
 import { t as s } from "./compiler-runtime-CldRdSsv.js";
 import { m as c, t as l } from "./tooltip-CJ4Rqasp.js";
 import { k as u } from "./error-entries-BpUJSLUZ.js";
-import { $ as d, Q as f, Z as p, an as m, i as h, l as g, ln as _, n as v, on as y, r as b, t as x, u as S } from "./common-DNumU4vH.js";
+import { $ as d, Q as f, Z as p, an as m, i as h, l as g, ln as _, n as v, on as y, r as b, t as x, u as S } from "./common-BmlT-bPP.js";
 import { M as C } from "./select-CkF_GBxO.js";
 import { J as ee } from "./dropdown-menu-BWnnAstC.js";
 import { _ as w } from "./toDate-rySyYxqk.js";
 import { t as T } from "./jsx-runtime-3BD1kT0s.js";
 import { q as E } from "./use-restore-focus-CmGwRNId.js";
 import { A as D, C as O, b as k } from "./useTheme-TLkqJsvo.js";
-import { a as A, n as te, t as ne } from "./code-visibility-sg6NMHZ9.js";
+import { a as A, n as te, t as ne } from "./code-visibility-DEIiTBMH.js";
 /* empty css                */
 var j = c("sticky-note", [["path", {
 	d: "M21 9a2.4 2.4 0 0 0-.706-1.706l-3.588-3.588A2.4 2.4 0 0 0 15 3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2z",

package/dist/{vega-component-Bd9nzauU.js → vega-component-DC6P127L.js}

@@ -12,11 +12,11 @@ import { c as m, t as h } from "./arrays-R6JsImiT.js";
 import { t as te } from "./objects-DCmMvZtn.js";
 import { t as ne } from "./useAsyncData-B7MiltyV.js";
 import { a as g, i as re, n as ie, t as ae } from "./formats-CwJHWasD.js";
-import { D as oe, n as _ } from "./vega-loader.browser-B9Pz0EGP.js";
-import { t as se } from "./react-vega-C4T9Rb_w.js";
-import { a as ce, n as le } from "./loader-DOVB0Syl.js";
+import { t as _ } from "./semaphore-89jsoHtS.js";
+import { D as oe, n as se } from "./vega-loader.browser-B9Pz0EGP.js";
+import { t as ce } from "./react-vega-C4T9Rb_w.js";
+import { a as le, n as v } from "./loader-DOVB0Syl.js";
 import { t as ue } from "./useDeepCompareMemoize-DZmHBD_1.js";
-import { t as v } from "./semaphore-89jsoHtS.js";
 import { t as de } from "./use-vega-container-remeasure-Bz4PZMtt.js";
 //#region src/plugins/impl/vega/fix-relative-url.ts
 var fe = /* @__PURE__ */ e(a(), 1), pe = o();
@@ -463,7 +463,7 @@ function H(e) {
 var U = 5;
 async function W(e) {
 	if (!e) return e;
-	let t = "datasets" in e ? { ...e.datasets } : {}, n = new v(U), r = async (e) => {
+	let t = "datasets" in e ? { ...e.datasets } : {}, n = new _(U), r = async (e) => {
 		if (!e) return e;
 		if ("layer" in e) {
 			let t = await Promise.all(e.layer.map(r));
@@ -496,7 +496,7 @@ async function W(e) {
 		} catch {
 			return e;
 		}
-		let a = e.data.format, o = await n.run(() => le(i.href, a));
+		let a = e.data.format, o = await n.run(() => v(i.href, a));
 		return t[i.pathname] = o, {
 			...e,
 			data: { name: i.pathname }
@@ -510,7 +510,7 @@ async function W(e) {
 //#endregion
 //#region src/plugins/impl/vega/vega-component.tsx
 var G = u();
-_("arrow", ae);
+se("arrow", ae);
 var K = (e) => {
 	let t = (0, pe.c)(12), { value: n, setValue: r, chartSelection: i, fieldSelection: a, spec: o, embedOptions: s } = e, c, l;
 	t[0] === o ? (c = t[1], l = t[2]) : (c = async () => W(o), l = [o], t[0] = o, t[1] = c, t[2] = l);
@@ -530,7 +530,7 @@ var K = (e) => {
 		embedOptions: s
 	}), t[5] = i, t[6] = s, t[7] = a, t[8] = u, t[9] = r, t[10] = n, t[11] = p) : p = t[11], p;
 }, q = (e) => {
-	let a = (0, pe.c)(50), { value: o, setValue: l, chartSelection: u, fieldSelection: d, spec: m, embedOptions: h } = e, { theme: ne } = ee(), g = (0, fe.useRef)(null), ae = (0, fe.useRef)(void 0), [_, le] = (0, fe.useState)(), v;
+	let a = (0, pe.c)(50), { value: o, setValue: l, chartSelection: u, fieldSelection: d, spec: m, embedOptions: h } = e, { theme: ne } = ee(), g = (0, fe.useRef)(null), ae = (0, fe.useRef)(void 0), [_, se] = (0, fe.useState)(), v;
 	bb0: {
 		if (h && "actions" in h) {
 			v = h.actions;
@@ -572,11 +572,11 @@ var K = (e) => {
 	} else M = a[14];
 	let N = M, P;
 	a[17] === C ? P = a[18] : (P = (e) => {
-		t.error(e), t.debug(C), le(e);
+		t.error(e), t.debug(C), se(e);
 	}, a[17] = C, a[18] = P);
 	let F = p(P), I;
 	a[19] === Symbol.for("react.memo_cache_sentinel") ? (I = (e) => {
-		t.debug("[Vega view] created", e), ae.current = e, le(void 0);
+		t.debug("[Vega view] created", e), ae.current = e, se(void 0);
 	}, a[19] = I) : I = a[19];
 	let L = p(I), R;
 	a[20] === T ? R = a[21] : (R = () => {
@@ -600,7 +600,7 @@ var K = (e) => {
 		theme: B,
 		actions: y,
 		mode: "vega-lite",
-		tooltip: ce.call,
+		tooltip: le.call,
 		renderer: "canvas"
 	}, a[22] = y, a[23] = B, a[24] = V) : V = a[24];
 	let H;
@@ -611,7 +611,7 @@ var K = (e) => {
 		onError: F,
 		onEmbed: L
 	}, a[25] = F, a[26] = L, a[27] = C, a[28] = V, a[29] = H) : H = a[29];
-	let U = se(H), W;
+	let U = ce(H), W;
 	a[30] === C ? W = a[31] : (W = oe(C), a[30] = C, a[31] = W);
 	let K = W;
 	de(g, K === "container");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/islands",
-  "version": "0.25.3-dev157",
+  "version": "0.25.3-dev162",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/core/codemirror/ai/__tests__/resources.test.ts

@@ -0,0 +1,117 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { markdownLanguage } from "@codemirror/lang-markdown";
+import { hoverResource, type Resource } from "@marimo-team/codemirror-mcp";
+import { createStore } from "jotai";
+import { assert, beforeEach, describe, expect, it, vi } from "vitest";
+import { MockNotebook } from "@/__mocks__/notebook";
+import { getAIContextRegistry } from "@/core/ai/context/context";
+import { ErrorContextProvider } from "@/core/ai/context/providers/error";
+import { AIContextRegistry } from "@/core/ai/context/registry";
+import { notebookAtom } from "@/core/cells/cells";
+import { CellId } from "@/core/cells/ids";
+import { resourceExtension } from "../resources";
+
+vi.mock("@marimo-team/codemirror-mcp", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("@marimo-team/codemirror-mcp")>()),
+  hoverResource: vi.fn(() => []),
+}));
+
+vi.mock("@/core/ai/context/context", () => ({
+  getAIContextRegistry: vi.fn(),
+}));
+
+describe("resource tooltips", () => {
+  const message = '<b>Unexpected response</b> &amp; "details"';
+  let provider: ErrorContextProvider;
+  let resource: Resource;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    const store = createStore();
+    store.set(
+      notebookAtom,
+      MockNotebook.notebookStateWithErrors([
+        {
+          cellId: CellId.create(),
+          cellName: "Cell 1",
+          errorData: [MockNotebook.errors.exception(message)],
+        },
+      ]),
+    );
+    provider = new ErrorContextProvider(store);
+    resource = provider.getItems()[1];
+    vi.mocked(getAIContextRegistry).mockReturnValue(
+      new AIContextRegistry().register(provider),
+    );
+    resourceExtension({ language: markdownLanguage, store });
+  });
+
+  function renderTooltip(item = resource) {
+    const options = vi.mocked(hoverResource).mock.calls[0][0];
+    assert(options.createTooltip);
+    return options.createTooltip(item).dom;
+  }
+
+  it("preserves literal text in cell error descriptions", () => {
+    const dom = renderTooltip();
+    expect(dom.textContent).toBe(message);
+    expect(dom.childElementCount).toBe(0);
+  });
+
+  it("preserves literal descriptions when a provider is unavailable", () => {
+    const dom = renderTooltip({ ...resource, type: "unknown" });
+    expect(dom.textContent).toBe(message);
+    expect(dom.childElementCount).toBe(0);
+  });
+
+  it("falls back to the literal resource name", () => {
+    const dom = renderTooltip({
+      ...resource,
+      description: undefined,
+      name: message,
+    });
+    expect(dom.textContent).toBe(message);
+    expect(dom.childElementCount).toBe(0);
+  });
+
+  it("preserves literal text in completion info strings", () => {
+    vi.spyOn(provider, "formatCompletion").mockReturnValue({
+      label: "Error",
+      info: message,
+    });
+    const dom = renderTooltip({ ...resource, description: "Fallback" });
+    expect(dom.textContent).toBe(message);
+    expect(dom.childElementCount).toBe(0);
+  });
+
+  it("preserves literal fallback text when an info renderer returns null", () => {
+    vi.spyOn(provider, "formatCompletion").mockReturnValue({
+      label: "Error",
+      info: () => null,
+    });
+    const dom = renderTooltip();
+    expect(dom.textContent).toBe(message);
+    expect(dom.childElementCount).toBe(0);
+  });
+
+  it("preserves literal fallback text for async info renderers", () => {
+    vi.spyOn(provider, "formatCompletion").mockReturnValue({
+      label: "Error",
+      info: async () => document.createElement("div"),
+    });
+    const dom = renderTooltip();
+    expect(dom.textContent).toBe(message);
+    expect(dom.childElementCount).toBe(0);
+  });
+
+  it.each(["element", "tooltip"])("preserves custom %s renderers", (kind) => {
+    const dom = document.createElement("strong");
+    dom.textContent = "Details";
+    vi.spyOn(provider, "formatCompletion").mockReturnValue({
+      label: "Error",
+      info: () => (kind === "element" ? dom : { dom }),
+    });
+    expect(renderTooltip()).toBe(dom);
+  });
+});

package/src/core/codemirror/ai/resources.ts

@@ -142,7 +142,7 @@ export function resourceExtension(opts: {
 
 function asDom(value: string): TooltipView {
   const tooltip = document.createElement("div");
-  tooltip.innerHTML = value;
+  tooltip.textContent = value;
   return {
     dom: tooltip,
   };

package/src/plugins/impl/anywidget/__tests__/registry.test.ts

@@ -8,6 +8,8 @@ import {
   type MockInstance,
   vi,
 } from "vitest";
+import { Deferred } from "@/utils/Deferred";
+import { Logger } from "@/utils/Logger";
 import { getMarimoInternal, Model } from "../model";
 import { handleWidgetMessage, WidgetRegistry } from "../registry";
 import type { EsmSpec, ModelState, WidgetModelId } from "../types";
@@ -155,6 +157,155 @@ describe("WidgetRegistry models", () => {
     );
   });
 
+  describe("outgoing messages", () => {
+    async function openModel(id = testId) {
+      await handleWidgetMessage(registry, {
+        model_id: id,
+        message: {
+          method: "open",
+          state: {},
+          buffer_paths: [],
+          buffers: [],
+        },
+      });
+      return registry.getModel(id);
+    }
+
+    afterEach(() => {
+      mockSendModelValue.mockReset().mockResolvedValue(null);
+      vi.restoreAllMocks();
+    });
+
+    it("waits for each acknowledgement before sending the next update", async () => {
+      const model = await openModel();
+      const responses = [new Deferred<null>(), new Deferred<null>()];
+      for (const response of responses) {
+        mockSendModelValue.mockReturnValueOnce(response.promise);
+      }
+      const states = [
+        { card: "A", seq: 5 },
+        { card: "", seq: 6 },
+        { card: "B", seq: 7 },
+      ];
+      for (const state of states) {
+        model.set("selection", state);
+        model.save_changes();
+      }
+
+      await vi.waitFor(() =>
+        expect(mockSendModelValue).toHaveBeenCalledTimes(1),
+      );
+      for (const [index, response] of responses.entries()) {
+        response.resolve(null);
+        await vi.waitFor(() =>
+          expect(mockSendModelValue).toHaveBeenCalledTimes(index + 2),
+        );
+      }
+      expect(mockSendModelValue.mock.calls).toEqual(
+        states.map((selection) => [
+          {
+            modelId: testId,
+            message: {
+              method: "update",
+              state: { selection },
+              bufferPaths: [],
+            },
+            buffers: [],
+          },
+        ]),
+      );
+    });
+
+    it("orders custom messages with updates and waits before calling callbacks", async () => {
+      const model = await openModel();
+      const response = new Deferred<null>();
+      mockSendModelValue.mockReturnValueOnce(response.promise);
+      const callback = vi.fn();
+      const sent = model.send({ action: "first" }, callback);
+      model.set("count", 1);
+      model.save_changes();
+      const last = model.send({ action: "last" });
+
+      await vi.waitFor(() =>
+        expect(mockSendModelValue).toHaveBeenCalledTimes(1),
+      );
+      expect(callback).not.toHaveBeenCalled();
+      response.resolve(null);
+      await Promise.all([sent, last]);
+      expect(callback).toHaveBeenCalledExactlyOnceWith();
+      expect(
+        mockSendModelValue.mock.calls.map(([request]) => request.message),
+      ).toEqual([
+        { method: "custom", content: { action: "first" } },
+        { method: "update", state: { count: 1 }, bufferPaths: [] },
+        { method: "custom", content: { action: "last" } },
+      ]);
+    });
+
+    it("continues sending after a failed update", async () => {
+      const model = await openModel();
+      const response = new Deferred<null>();
+      mockSendModelValue.mockReturnValueOnce(response.promise);
+      const logError = vi
+        .spyOn(Logger, "error")
+        .mockImplementation(() => undefined);
+      model.set("count", 1);
+      model.save_changes();
+      model.set("count", 2);
+      model.save_changes();
+      const last = model.send({ action: "done" });
+
+      await vi.waitFor(() =>
+        expect(mockSendModelValue).toHaveBeenCalledTimes(1),
+      );
+      const error = new Error("Network failure");
+      response.reject(error);
+      await last;
+      expect(mockSendModelValue).toHaveBeenCalledTimes(3);
+      expect(logError).toHaveBeenCalledWith(
+        "[anywidget] Failed to save model changes",
+        error,
+      );
+    });
+
+    it("allows different models to send independently", async () => {
+      const first = await openModel();
+      const secondId = asModelId("second-model");
+      const second = await openModel(secondId);
+      const response = new Deferred<null>();
+      mockSendModelValue.mockReturnValueOnce(response.promise);
+
+      const firstSend = first.send({ value: 1 });
+      await second.send({ value: 2 });
+      expect(
+        mockSendModelValue.mock.calls.map(([request]) => request.modelId),
+      ).toEqual([testId, secondId]);
+      response.resolve(null);
+      await firstSend;
+    });
+
+    it("drops queued messages when the model closes", async () => {
+      const model = await openModel();
+      const response = new Deferred<null>();
+      mockSendModelValue.mockReturnValueOnce(response.promise);
+      const first = model.send({ value: 1 });
+      model.set("count", 2);
+      model.save_changes();
+      const last = model.send({ value: 3 });
+
+      await vi.waitFor(() =>
+        expect(mockSendModelValue).toHaveBeenCalledTimes(1),
+      );
+      await handleWidgetMessage(registry, {
+        model_id: testId,
+        message: { method: "close" },
+      });
+      response.resolve(null);
+      await Promise.all([first, last]);
+      expect(mockSendModelValue).toHaveBeenCalledTimes(1);
+    });
+  });
+
   describe("static mode", () => {
     beforeEach(() => {
       mockIsStatic.mockReturnValue(true);

package/src/plugins/impl/anywidget/model.ts

@@ -157,7 +157,9 @@ export class Model<T extends ModelState> implements AnyModel<T> {
 
     // Clear the dirty fields to avoid sending again.
     this.#dirtyFields.clear();
-    this.#comm.sendUpdate(partialData);
+    this.#comm.sendUpdate(partialData).catch((error) => {
+      Logger.error("[anywidget] Failed to save model changes", error);
+    });
   }
 
   /**

package/src/plugins/impl/anywidget/registry.ts

@@ -1,6 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 import type { NotificationMessageData } from "@/core/kernel/messages";
 import { getRequestClient } from "@/core/network/requests";
+import type { ModelRequest } from "@/core/network/types";
 import { isStaticNotebook } from "@/core/static/static-state";
 import { assertNever } from "@/utils/assertNever";
 import {
@@ -10,6 +11,7 @@ import {
 } from "@/utils/json/base64";
 import { Logger } from "@/utils/Logger";
 import { repl } from "@/utils/repl";
+import { Semaphore } from "@/utils/semaphore";
 import { viewStateAtom } from "@/core/mode";
 import { store } from "@/core/state/jotai";
 import { createHost, type WidgetResolver } from "./host";
@@ -191,6 +193,20 @@ export async function handleWidgetMessage(
       }
 
       registry.createModel(modelId, (signal) => {
+        // Wait for the server to acknowledge queueing each message before
+        // sending the next one, preserving order within this model.
+        const sends = new Semaphore(1);
+        const sendMessage = (request: ModelRequest): Promise<void> =>
+          sends.run(async () => {
+            if (signal.aborted) {
+              Logger.debug(
+                `[Model] ${request.message.method} suppressed for model=${modelId} (signal aborted)`,
+              );
+              return;
+            }
+            await getRequestClient().sendModelValue(request);
+          });
+
         // In static exports there is no kernel, so comm calls are no-ops.
         const comm: MarimoComm<ModelState> = isStaticNotebook()
           ? {
@@ -199,28 +215,16 @@ export async function handleWidgetMessage(
             }
           : {
               async sendUpdate(changeData) {
-                if (signal.aborted) {
-                  Logger.debug(
-                    `[Model] sendUpdate suppressed for model=${modelId} (signal aborted)`,
-                  );
-                  return;
-                }
                 const { state, buffers, bufferPaths } =
                   serializeBuffersToBase64(changeData);
-                await getRequestClient().sendModelValue({
+                await sendMessage({
                   modelId,
                   message: { method: "update", state, bufferPaths },
                   buffers,
                 });
               },
               async sendCustomMessage(content, buffers) {
-                if (signal.aborted) {
-                  Logger.debug(
-                    `[Model] sendCustomMessage suppressed for model=${modelId} (signal aborted)`,
-                  );
-                  return;
-                }
-                await getRequestClient().sendModelValue({
+                await sendMessage({
                   modelId,
                   message: { method: "custom", content },
                   buffers: buffers.map(dataViewToBase64),

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

@@ -93,6 +93,7 @@ describe("createReducer", () => {
     const loggerSpy = vi.spyOn(Logger, "error");
 
     const state = { count: 0 };
+    // @ts-expect-error - exercise runtime handling of an invalid action
     const newState = reducer(state, { type: "nonexistent", payload: null });
 
     expect(newState).toBe(state);

package/src/utils/createReducer.ts

@@ -16,21 +16,27 @@ interface ReducerHandlers<State> {
   [k: string]: ReducerHandler<State, any>;
 }
 
-type ReducerActions<RH extends ReducerHandlers<any>> = {
-  [Type in keyof RH]: RH[Type] extends ReducerHandler<any, infer Payload>
+type ReducerActions<RH> = {
+  [Type in keyof RH]: RH[Type] extends (
+    state: never,
+    payload: infer Payload,
+  ) => unknown
     ? IfUnknown<Payload, () => void, (payload: Payload) => void>
     : never;
 };
 
 /** Helper for typing middleware that receives dispatched actions. */
 export type DispatchedActionOf<T> = {
-  [Key in keyof T]: T[Key] extends (payload: infer P) => any
+  [Key in keyof T]: T[Key] extends (payload: infer P) => unknown
     ? { type: Key; payload: P }
     : never;
 }[keyof T & string];
 
 type ReducerActionOf<RH> = {
-  [Type in keyof RH]: RH[Type] extends ReducerHandler<any, infer Payload>
+  [Type in keyof RH]: RH[Type] extends (
+    state: never,
+    payload: infer Payload,
+  ) => unknown
     ? { type: Type; payload: Payload }
     : never;
 }[keyof RH & string];
@@ -42,7 +48,7 @@ export interface ReducerCreatorResult<
   /**
    * The reducer function.
    */
-  reducer: Reducer<State, any>;
+  reducer: Reducer<State, ReducerActionOf<RH>>;
   /**
    * Given a dispatch function, returns an object containing all the actions.
    */