@marimo-team/islands 0.24.3-dev22 → 0.24.3-dev24

package/dist/{common-DIyUaEO6.js → common-BzvhwpFa.js}

@@ -32442,7 +32442,7 @@ function Iq() {
 		return a.warn("Failed to get version from mount config"), null;
 	}
 }
-var Lq = Iq() || "0.24.3-dev22", Rq = V(Lq), zq = V(!0);
+var Lq = Iq() || "0.24.3-dev24", Rq = V(Lq), zq = V(!0);
 V(null);
 //#endregion
 //#region src/core/wasm/state.ts

package/dist/main.js

@@ -6,7 +6,7 @@ import { n as x, r as S, t as C } from "./copy-C0N4m1lm.js";
 import { $n as w, An as T, B as E, Bn as D, Bt as O, C as k, Ct as A, Dn as j, Dt as M, En as N, F as P, Fn as F, G as I, I as L, It as R, J as ee, Jt as z, K as te, Kn as B, L as ne, Lt as re, Mt as ie, Nn as ae, Nt as oe, On as se, Ot as ce, P as le, Pn as ue, Pt as de, Q as fe, Qn as pe, Qt as me, R as he, Rn as ge, Sn as _e, St as ve, U as ye, Un as be, Vn as xe, Vt as Se, W as Ce, Wn as we, Wt as Te, X as Ee, Xn as De, Y as Oe, Yn as ke, Yt as Ae, Z as je, Zn as Me, Zt as Ne, _ as Pe, _n as Fe, a as Ie, an as Le, ar as Re, at as ze, b as Be, bn as Ve, bt as He, cn as Ue, ct as We, dn as Ge, dt as Ke, et as qe, fn as Je, ft as Ye, g as Xe, i as Ze, ir as Qe, j as $e, jt as et, k as tt, kn as nt, kt as rt, ln as it, n as at, nr as ot, o as st, on as ct, ot as lt, q as ut, qt as dt, sn as ft, st as pt, tn as mt, tr as ht, un as gt, ut as _t, v as vt, wn as yt, wt as bt, xn as xt, xt as St, y as Ct, z as wt, zn as Tt } from "./html-to-image-CSU-_5BI.js";
 import { o as Et, s as Dt, u as Ot } from "./dist-6ChWbo8z.js";
 import { D as kt, E as At, O as jt, S as Mt, T as Nt, _ as Pt, a as Ft, c as It, d as Lt, f as Rt, g as zt, h as Bt, i as Vt, l as Ht, m as Ut, n as Wt, o as Gt, p as Kt, r as qt, s as Jt, t as Yt, u as Xt, v as Zt, w as Qt, x as $t, y as en } from "./spec-g740fOWu.js";
-import { $ as tn, $t as nn, A as rn, At as an, B as on, Bt as sn, C as cn, Cn as ln, Ct as un, D as dn, Dn as fn, Dt as pn, E as mn, En as hn, Et as gn, F as _n, Ft as vn, G as yn, Gt as bn, H as xn, Ht as Sn, I as Cn, It as wn, J as Tn, Jt as En, K as Dn, Kt as On, L as kn, Lt as An, M as jn, N as Mn, Nt as Nn, O as Pn, Ot as Fn, P as In, Pt as Ln, Q as Rn, Qt as zn, R as Bn, Rt as Vn, S as Hn, Sn as Un, St as Wn, T as Gn, Tn as Kn, Tt as qn, U as Jn, Ut as Yn, V as Xn, Vt as Zn, W as Qn, Wt as $n, X as er, Xt as tr, Y as nr, Yt as rr, Z as ir, Zt as ar, _ as or, _n as sr, _t as cr, a as lr, an as ur, at as dr, b as fr, bn as pr, bt as mr, cn as hr, dn as gr, dt as _r, en as vr, et as yr, fn as br, ft as xr, g as Sr, gn as Cr, gt as wr, hn as Tr, ht as Er, i as Dr, in as Or, it as kr, j as Ar, k as jr, kt as Mr, l as Nr, ln as Pr, m as Fr, mn as Ir, mt as Lr, n as Rr, nn as zr, nt as Br, on as Vr, ot as Hr, pn as Ur, pt as Wr, q as Gr, qt as Kr, rn as qr, rt as Jr, s as Yr, sn as Xr, st as Zr, t as Qr, tn as $r, tt as ei, un as ti, v as ni, vt as ri, w as ii, wn as ai, wt as oi, x as si, xn as ci, xt as li, y as ui, yn as di, yt as fi, z as pi, zt as mi } from "./common-DIyUaEO6.js";
+import { $ as tn, $t as nn, A as rn, At as an, B as on, Bt as sn, C as cn, Cn as ln, Ct as un, D as dn, Dn as fn, Dt as pn, E as mn, En as hn, Et as gn, F as _n, Ft as vn, G as yn, Gt as bn, H as xn, Ht as Sn, I as Cn, It as wn, J as Tn, Jt as En, K as Dn, Kt as On, L as kn, Lt as An, M as jn, N as Mn, Nt as Nn, O as Pn, Ot as Fn, P as In, Pt as Ln, Q as Rn, Qt as zn, R as Bn, Rt as Vn, S as Hn, Sn as Un, St as Wn, T as Gn, Tn as Kn, Tt as qn, U as Jn, Ut as Yn, V as Xn, Vt as Zn, W as Qn, Wt as $n, X as er, Xt as tr, Y as nr, Yt as rr, Z as ir, Zt as ar, _ as or, _n as sr, _t as cr, a as lr, an as ur, at as dr, b as fr, bn as pr, bt as mr, cn as hr, dn as gr, dt as _r, en as vr, et as yr, fn as br, ft as xr, g as Sr, gn as Cr, gt as wr, hn as Tr, ht as Er, i as Dr, in as Or, it as kr, j as Ar, k as jr, kt as Mr, l as Nr, ln as Pr, m as Fr, mn as Ir, mt as Lr, n as Rr, nn as zr, nt as Br, on as Vr, ot as Hr, pn as Ur, pt as Wr, q as Gr, qt as Kr, rn as qr, rt as Jr, s as Yr, sn as Xr, st as Zr, t as Qr, tn as $r, tt as ei, un as ti, v as ni, vt as ri, w as ii, wn as ai, wt as oi, x as si, xn as ci, xt as li, y as ui, yn as di, yt as fi, z as pi, zt as mi } from "./common-BzvhwpFa.js";
 import { c as hi, i as gi, n as _i, o as vi, t as yi } from "./useLifecycle-BGRBkTFT.js";
 import { t as bi } from "./check-mcQyZmFG.js";
 import { A as xi, C as Si, D as Ci, E as wi, F as Ti, I as Ei, M as Di, N as Oi, P as ki, R as Ai, S as ji, a as Mi, b as Ni, c as Pi, i as Fi, j as Ii, l as Li, n as Ri, o as zi, r as Bi, s as Vi, t as Hi, w as Ui, x as Wi } from "./select-UMOSCa3W.js";
@@ -29942,7 +29942,7 @@ function xR(e) {
 }
 //#endregion
 //#region src/components/editor/renderers/slides-layout/slides-layout.tsx
-var SR = q.lazy(() => import("./reveal-component-GEGc56E6.js")), CR = (e) => {
+var SR = q.lazy(() => import("./reveal-component-D5xyD8xS.js")), CR = (e) => {
 	let t = (0, Y.c)(33), { layout: n, setLayout: r, cells: i, mode: a } = e, o = fs(rt), s = a === "read" || o, c = fs(Oe) > 1, [l, u] = (0, q.useState)(null), d;
 	t[0] !== i || t[1] !== n ? (d = yP(i, n), t[0] = i, t[1] = n, t[2] = d) : d = t[2];
 	let { slideCells: f, skippedIds: p, noOutputIds: m, slideTypes: h, startCellIndex: g } = d, _;

package/dist/{reveal-component-GEGc56E6.js → reveal-component-D5xyD8xS.js}

@@ -4,7 +4,7 @@ import { t as o } from "./react-ofJbxM4x.js";
 import { t as s } from "./compiler-runtime-Cj8ZWiNS.js";
 import { kt as c, st as l } from "./html-to-image-CSU-_5BI.js";
 import { u } from "./dist-6ChWbo8z.js";
-import { _n as d, c as f, ct as p, g as m, h, l as g, lt as _, n as v, o as y, r as b, t as x, u as S, ut as C, vn as w, xn as T } from "./common-DIyUaEO6.js";
+import { _n as d, c as f, ct as p, g as m, h, l as g, lt as _, n as v, o as y, r as b, t as x, u as S, ut as C, vn as w, xn as T } from "./common-BzvhwpFa.js";
 import { R as E } from "./select-UMOSCa3W.js";
 import { Y as D } from "./dropdown-menu-C73aTomr.js";
 import { t as O } from "./jsx-runtime-DgDPJV9S.js";

package/package.json

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

package/src/components/chat/acp/__tests__/agent-panel.test.tsx

@@ -0,0 +1,270 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import {
+  act,
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+} from "@testing-library/react";
+import { Provider } from "jotai";
+import type { ComponentProps } from "react";
+import { JsonRpcError } from "use-acp";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { MockRequestClient } from "@/__mocks__/requests";
+import type { PromptInput } from "@/components/editor/ai/add-cell-with-ai";
+import { TooltipProvider } from "@/components/ui/tooltip";
+import { toast } from "@/components/ui/use-toast";
+import { pendingAiPromptAtom } from "@/core/ai/state";
+import { requestClientAtom } from "@/core/network/requests";
+import { cwdAtom, filenameAtom } from "@/core/saving/file-state";
+import { store } from "@/core/state/jotai";
+import AgentPanel from "../agent-panel";
+import { parseContextFromPrompt } from "../context-utils";
+import {
+  addSession,
+  agentSessionStateAtom,
+  selectedTabAtom,
+  updateSessionExternalAgentSessionId,
+} from "../state";
+import type { ExternalAgentSessionId } from "../types";
+
+const { agent, client } = vi.hoisted(() => {
+  const agent = {
+    initialize: vi.fn().mockResolvedValue({}),
+    prompt: vi.fn().mockResolvedValue({ stopReason: "end_turn" }),
+    cancel: vi.fn().mockResolvedValue({}),
+  };
+  return {
+    agent,
+    client: {
+      agent,
+      activeSessionId: "session-1",
+      connectionState: { status: "connected" },
+      notifications: [],
+      connect: vi.fn().mockResolvedValue(undefined),
+      disconnect: vi.fn(),
+      setActiveSessionId: vi.fn(),
+    },
+  };
+});
+
+vi.mock("use-acp", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("use-acp")>()),
+  useAcpClient: () => client,
+}));
+
+vi.mock("@/components/editor/ai/add-cell-with-ai", () => ({
+  PromptInput: ({
+    value,
+    onChange,
+    onAddFiles,
+    onSubmit,
+  }: ComponentProps<typeof PromptInput>) => (
+    <>
+      <textarea
+        aria-label="Prompt"
+        value={value}
+        onChange={(event) => onChange(event.target.value)}
+        onKeyDown={(event) => {
+          if (event.key === "Enter") {
+            onSubmit(undefined, value);
+          }
+        }}
+      />
+      <input
+        type="file"
+        aria-label="Attachment"
+        onChange={(event) => onAddFiles?.([...(event.target.files ?? [])])}
+      />
+    </>
+  ),
+}));
+vi.mock("../session-tabs", () => ({ SessionTabs: () => null }));
+vi.mock("../blocks", () => ({ ReadyToChatBlock: () => null }));
+vi.mock("../context-utils", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("../context-utils")>()),
+  parseContextFromPrompt: vi
+    .fn()
+    .mockResolvedValue({ contextBlocks: [], attachmentBlocks: [] }),
+}));
+vi.mock("@/components/ui/use-toast", () => ({ toast: vi.fn() }));
+
+function renderPanel() {
+  return render(
+    <Provider store={store}>
+      <TooltipProvider>
+        <AgentPanel />
+      </TooltipProvider>
+    </Provider>,
+  );
+}
+
+function submitPrompt(prompt = "Explain this notebook") {
+  fireEvent.change(screen.getByRole("textbox", { name: "Prompt" }), {
+    target: { value: prompt },
+  });
+  fireEvent.keyDown(screen.getByRole("textbox", { name: "Prompt" }), {
+    key: "Enter",
+  });
+}
+
+describe("AgentPanel prompt submission", () => {
+  beforeEach(() => {
+    agent.prompt.mockReset().mockResolvedValue({ stopReason: "end_turn" });
+    vi.mocked(parseContextFromPrompt).mockReset().mockResolvedValue({
+      contextBlocks: [],
+      attachmentBlocks: [],
+    });
+    store.set(requestClientAtom, MockRequestClient.create());
+    store.set(filenameAtom, "notebook.py");
+    store.set(cwdAtom, "/notebooks");
+    store.set(pendingAiPromptAtom, null);
+    store.set(
+      agentSessionStateAtom,
+      updateSessionExternalAgentSessionId(
+        addSession({ sessions: [], activeTabId: null }, { agentId: "claude" }),
+        "session-1" as ExternalAgentSessionId,
+      ),
+    );
+  });
+
+  afterEach(() => {
+    store.set(pendingAiPromptAtom, null);
+    store.set(agentSessionStateAtom, { sessions: [], activeTabId: null });
+    store.set(filenameAtom, null);
+    store.set(cwdAtom, null);
+  });
+
+  it("preserves the draft, attachment and title when the notebook is unnamed", async () => {
+    store.set(filenameAtom, null);
+    renderPanel();
+    const title = store.get(selectedTabAtom)?.title;
+    fireEvent.change(screen.getByLabelText("Attachment"), {
+      target: {
+        files: [new File(["notes"], "notes.txt", { type: "text/plain" })],
+      },
+    });
+    submitPrompt();
+
+    expect(toast).toHaveBeenCalledWith({
+      title: "Notebook must be named",
+      description: "Please name the notebook to use the agent",
+      variant: "danger",
+    });
+    expect(agent.prompt).not.toHaveBeenCalled();
+    expect(screen.getByRole("textbox", { name: "Prompt" })).toHaveValue(
+      "Explain this notebook",
+    );
+    expect(screen.getByText("notes.txt")).toBeInTheDocument();
+    expect(store.get(selectedTabAtom)?.title).toBe(title);
+    expect(screen.queryByText("Agent is working...")).not.toBeInTheDocument();
+
+    act(() => store.set(filenameAtom, "notebook.py"));
+    fireEvent.keyDown(screen.getByRole("textbox", { name: "Prompt" }), {
+      key: "Enter",
+    });
+    await waitFor(() => expect(agent.prompt).toHaveBeenCalledOnce());
+    expect(agent.prompt).toHaveBeenCalledWith({
+      sessionId: "session-1",
+      prompt: expect.arrayContaining([
+        { type: "text", text: "Explain this notebook" },
+        expect.objectContaining({ type: "resource_link", name: "notes.txt" }),
+      ]),
+    });
+    await waitFor(() =>
+      expect(screen.queryByText("Agent is working...")).not.toBeInTheDocument(),
+    );
+  });
+
+  it.each([new Error("Agent unavailable"), "Agent unavailable"])(
+    "shows a rejected prompt and allows another submission after dismissal (%s)",
+    async (error) => {
+      agent.prompt.mockRejectedValueOnce(error);
+      renderPanel();
+      submitPrompt();
+
+      expect(await screen.findByText(/Agent unavailable/)).toBeInTheDocument();
+      fireEvent.click(screen.getByRole("button", { name: "Dismiss" }));
+      expect(screen.queryByText(/Agent unavailable/)).not.toBeInTheDocument();
+      submitPrompt("Try again");
+      await waitFor(() => expect(agent.prompt).toHaveBeenCalledTimes(2));
+      await waitFor(() =>
+        expect(
+          screen.queryByText("Agent is working..."),
+        ).not.toBeInTheDocument(),
+      );
+    },
+  );
+
+  it("preserves the existing authentication error action and detail", async () => {
+    agent.prompt.mockRejectedValueOnce(
+      new JsonRpcError({
+        code: -32_000,
+        message: "Authentication required",
+        data: { message: "Sign in to the agent" },
+      }),
+    );
+    renderPanel();
+    submitPrompt();
+
+    expect(await screen.findByText("Sign in to the agent")).toBeInTheDocument();
+    expect(
+      screen.getByRole("button", { name: "Restart session" }),
+    ).toBeInTheDocument();
+    expect(
+      screen.queryByRole("button", { name: "Dismiss" }),
+    ).not.toBeInTheDocument();
+  });
+
+  it("clears busy state and reports failures while preparing prompt context", async () => {
+    vi.mocked(parseContextFromPrompt).mockRejectedValueOnce(
+      new Error("Context unavailable"),
+    );
+    renderPanel();
+    submitPrompt();
+
+    expect(await screen.findByText("Context unavailable")).toBeInTheDocument();
+    expect(agent.prompt).not.toHaveBeenCalled();
+    fireEvent.click(screen.getByRole("button", { name: "Dismiss" }));
+    expect(screen.queryByText("Agent is working...")).not.toBeInTheDocument();
+    submitPrompt();
+    await waitFor(() => expect(agent.prompt).toHaveBeenCalledOnce());
+  });
+
+  it("reports failures from a queued prompt through the same handler", async () => {
+    agent.prompt.mockRejectedValueOnce(new Error("Queued prompt failed"));
+    renderPanel();
+    act(() =>
+      store.set(pendingAiPromptAtom, {
+        prompt: "Help with this cell",
+        submit: true,
+      }),
+    );
+
+    expect(await screen.findByText("Queued prompt failed")).toBeInTheDocument();
+    expect(store.get(pendingAiPromptAtom)).toBeNull();
+    expect(agent.prompt).toHaveBeenCalledWith({
+      sessionId: "session-1",
+      prompt: expect.arrayContaining([
+        { type: "text", text: "Help with this cell" },
+      ]),
+    });
+  });
+
+  it("clears busy state when a cancelled prompt settles", async () => {
+    const response = Promise.withResolvers<{ stopReason: string }>();
+    agent.prompt.mockReturnValueOnce(response.promise);
+    renderPanel();
+    submitPrompt();
+    await waitFor(() => expect(agent.prompt).toHaveBeenCalledOnce());
+    expect(screen.getByText("Agent is working...")).toBeInTheDocument();
+    fireEvent.click(screen.getByRole("button", { name: "Stop" }));
+    await act(async () => response.resolve({ stopReason: "cancelled" }));
+    expect(agent.cancel).toHaveBeenCalledWith({ sessionId: "session-1" });
+    expect(screen.queryByText("Agent is working...")).not.toBeInTheDocument();
+    expect(
+      screen.queryByRole("button", { name: "Dismiss" }),
+    ).not.toBeInTheDocument();
+  });
+});

package/src/components/chat/acp/agent-panel.tsx

@@ -902,6 +902,18 @@ const AgentPanel: React.FC = () => {
         return;
       }
 
+      let absoluteFilename: string;
+      try {
+        absoluteFilename = getAbsoluteFilename();
+      } catch {
+        toast({
+          title: "Notebook must be named",
+          description: "Please name the notebook to use the agent",
+          variant: "danger",
+        });
+        return;
+      }
+
       logger.debug("Submitting prompt to agent", {
         sessionId: activeSessionId,
       });
@@ -914,62 +926,51 @@ const AgentPanel: React.FC = () => {
         setSessionState((prev) => updateSessionTitle(prev, prompt));
       }
 
-      let absoluteFilename: string;
       try {
-        absoluteFilename = getAbsoluteFilename();
-      } catch {
-        toast({
-          title: "Notebook must be named",
-          description: "Please name the notebook to use the agent",
-          variant: "danger",
-        });
-        return;
-      }
-
-      const promptBlocks: ContentBlock[] = [{ type: "text", text: prompt }];
+        const promptBlocks: ContentBlock[] = [{ type: "text", text: prompt }];
 
-      // Parse context from the prompt
-      const { contextBlocks, attachmentBlocks } =
-        await parseContextFromPrompt(prompt);
-      promptBlocks.push(...contextBlocks, ...attachmentBlocks);
+        // Parse context from the prompt
+        const { contextBlocks, attachmentBlocks } =
+          await parseContextFromPrompt(prompt);
+        promptBlocks.push(...contextBlocks, ...attachmentBlocks);
 
-      // Add manually uploaded files as resource links
-      if (files && files.length > 0) {
-        const fileResourceLinks = await convertFilesToResourceLinks(files);
-        promptBlocks.push(...fileResourceLinks);
-      }
+        // Add manually uploaded files as resource links
+        if (files && files.length > 0) {
+          const fileResourceLinks = await convertFilesToResourceLinks(files);
+          promptBlocks.push(...fileResourceLinks);
+        }
 
-      const hasGivenRules = notifications.some(
-        (notification) =>
-          notification.type === "session_notification" &&
-          notification.data.update.sessionUpdate === "user_message_chunk",
-      );
-      if (!hasGivenRules) {
-        promptBlocks.push(
-          {
-            type: "resource_link",
-            uri: absoluteFilename,
-            mimeType: "text/x-python",
-            name: absoluteFilename,
-          },
-          {
-            type: "resource",
-            resource: {
-              uri: "marimo_rules.md",
-              mimeType: "text/plain",
-              text: getAgentPrompt(absoluteFilename),
-            },
-          },
+        const hasGivenRules = notifications.some(
+          (notification) =>
+            notification.type === "session_notification" &&
+            notification.data.update.sessionUpdate === "user_message_chunk",
         );
-      }
+        if (!hasGivenRules) {
+          promptBlocks.push(
+            {
+              type: "resource_link",
+              uri: absoluteFilename,
+              mimeType: "text/x-python",
+              name: absoluteFilename,
+            },
+            {
+              type: "resource",
+              resource: {
+                uri: "marimo_rules.md",
+                mimeType: "text/plain",
+                text: getAgentPrompt(absoluteFilename),
+              },
+            },
+          );
+        }
 
-      try {
         await agent.prompt({
           sessionId: activeSessionId,
           prompt: promptBlocks,
         });
       } catch (error) {
         logger.error("Failed to send prompt", { error });
+        setError(error instanceof Error ? error : String(error));
       } finally {
         setIsLoading(false);
       }