@marimo-team/islands 0.23.14-dev2 → 0.23.14-dev23

package/src/components/editor/output/__tests__/traceback.test.tsx

@@ -1,11 +1,14 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import { render } from "@testing-library/react";
+import { Provider } from "jotai";
 import { beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
+import { MockRequestClient } from "@/__mocks__/requests";
 import { Tracebacks } from "@/__mocks__/tracebacks";
 import { cellId } from "@/__tests__/branded";
 import { TooltipProvider } from "@/components/ui/tooltip";
 import { initialModeAtom } from "@/core/mode";
+import { requestClientAtom } from "@/core/network/requests";
 import { store } from "@/core/state/jotai";
 import { renderHTML } from "@/plugins/core/RenderHTML";
 import {
@@ -20,13 +23,16 @@ describe("traceback component", () => {
   beforeEach(() => {
     vi.resetAllMocks();
     store.set(initialModeAtom, "edit");
+    store.set(requestClientAtom, MockRequestClient.create());
   });
 
   test("extracts cell-link", () => {
     const traceback = (
-      <TooltipProvider>
-        <MarimoTracebackOutput traceback={Tracebacks.raw} cellId={cid} />
-      </TooltipProvider>
+      <Provider store={store}>
+        <TooltipProvider>
+          <MarimoTracebackOutput traceback={Tracebacks.raw} cellId={cid} />
+        </TooltipProvider>
+      </Provider>
     );
     const { unmount, getAllByRole } = render(traceback);
 
@@ -44,9 +50,11 @@ describe("traceback component", () => {
 
   test("renames File to Cell for relevant lines", () => {
     const traceback = (
-      <TooltipProvider>
-        <MarimoTracebackOutput traceback={Tracebacks.raw} cellId={cid} />
-      </TooltipProvider>
+      <Provider store={store}>
+        <TooltipProvider>
+          <MarimoTracebackOutput traceback={Tracebacks.raw} cellId={cid} />
+        </TooltipProvider>
+      </Provider>
     );
     const { unmount, container } = render(traceback);
 

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

@@ -29,6 +29,7 @@ import { outputIsLoading, outputIsStale } from "@/core/cells/cell";
 import type { CellId } from "@/core/cells/ids";
 import { isOutputEmpty } from "@/core/cells/outputs";
 import type { CellData, CellRuntimeState } from "@/core/cells/types";
+import { getReadonlyCodeDisplay } from "@/core/cells/readonly-code-display";
 import { MarkdownLanguageAdapter } from "@/core/codemirror/language/languages/markdown";
 import { useResolvedMarimoConfig } from "@/core/config/config";
 import { CSSClasses, KnownQueryParams } from "@/core/constants";
@@ -384,6 +385,8 @@ const VerticalCell = memo(
 
       // Hide the code if it's pure markdown and there's an output, or if the code is empty
       const hideCode = shouldHideCode(code, output);
+      // Only unwrap SQL when the code will actually be rendered.
+      const display = hideCode ? null : getReadonlyCodeDisplay(code);
 
       return (
         <div
@@ -393,11 +396,12 @@ const VerticalCell = memo(
           {...cellDomProps(cellId, name)}
         >
           {cellOutputArea === "above" && outputArea}
-          {!hideCode && (
+          {display && (
             <div className="tray">
               <ReadonlyCode
                 initiallyHideCode={config.hide_code || kiosk}
-                code={code}
+                code={display.code}
+                language={display.language}
               />
             </div>
           )}

package/src/components/lifecycle/ProgressiveBoundary.tsx

@@ -0,0 +1,42 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { type Atom, useAtomValue } from "jotai";
+import type React from "react";
+import type { PropsWithChildren } from "react";
+import { useDelayElapsed } from "@/hooks/useDelayElapsed";
+
+interface Props {
+  /** Children render once this atom resolves true. */
+  requires: Atom<boolean>;
+  fallback?: React.ReactNode;
+  /** Suppress the fallback for this many ms; avoids spinner flashes. */
+  delay?: number;
+}
+
+/**
+ * ```tsx
+ * <ProgressiveBoundary requires={canPaintAtom} delay={2000} fallback={<Spinner />}>
+ *   <Editor />
+ * </ProgressiveBoundary>
+ * ```
+ */
+export const ProgressiveBoundary: React.FC<PropsWithChildren<Props>> = ({
+  requires,
+  fallback = null,
+  delay = 0,
+  children,
+}) => {
+  const ready = useAtomValue(requires);
+  // Key the delay off `ready` so the suppression window re-arms whenever the
+  // gate closes again — otherwise a `true → false` flip would show the
+  // fallback immediately and reintroduce the flash `delay` is meant to avoid.
+  const delayElapsed = useDelayElapsed(ready ? 0 : delay);
+
+  if (ready) {
+    return children;
+  }
+  if (!delayElapsed) {
+    return null;
+  }
+  return fallback;
+};

package/src/components/lifecycle/RuntimeStatusBadge.tsx

@@ -0,0 +1,59 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { useAtomValue } from "jotai";
+import { AlertCircleIcon } from "lucide-react";
+import type React from "react";
+import { Spinner } from "@/components/icons/spinner";
+import { Tooltip } from "@/components/ui/tooltip";
+import { type AdapterState, runtimeAdapterAtom } from "@/core/runtime/adapter";
+
+/**
+ * Footer pill that surfaces the active runtime's connection/initialization
+ * status via its adapter. Hides itself once the runtime is ready.
+ */
+export const RuntimeStatusBadge: React.FC = () => {
+  const adapter = useAtomValue(runtimeAdapterAtom);
+  const state = useAtomValue(adapter.state);
+
+  if (state.kind === "ready") {
+    return null;
+  }
+
+  const icon =
+    state.kind === "failed" ? (
+      <AlertCircleIcon className="w-4 h-4 text-destructive" />
+    ) : (
+      <Spinner size="small" />
+    );
+
+  return (
+    <Tooltip
+      content={
+        <div className="text-sm whitespace-pre-line">
+          {tooltipFor(state, adapter.label)}
+        </div>
+      }
+      data-testid="footer-runtime-status"
+    >
+      <button
+        type="button"
+        className="p-1 hover:bg-accent rounded flex items-center gap-1.5 text-xs text-muted-foreground"
+        data-testid="runtime-status-footer"
+      >
+        {icon}
+        <span>{adapter.label}</span>
+      </button>
+    </Tooltip>
+  );
+};
+
+function tooltipFor(state: AdapterState, label: string): string {
+  switch (state.kind) {
+    case "failed":
+      return state.error.message;
+    case "connecting":
+      return state.progress?.label ?? `${label} starting…`;
+    case "ready":
+      return `${label} ready`;
+  }
+}

package/src/components/lifecycle/__tests__/ProgressiveBoundary.test.tsx

@@ -0,0 +1,147 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { act, render, screen } from "@testing-library/react";
+import { atom, createStore, Provider } from "jotai";
+import type { ReactNode } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { ProgressiveBoundary } from "../ProgressiveBoundary";
+
+describe("ProgressiveBoundary", () => {
+  let store: ReturnType<typeof createStore>;
+
+  const wrapper = ({ children }: { children: ReactNode }) => (
+    <Provider store={store}>{children}</Provider>
+  );
+
+  beforeEach(() => {
+    vi.useFakeTimers();
+    store = createStore();
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  it("renders children once the capability resolves true", () => {
+    const capability = atom(true);
+    render(
+      <ProgressiveBoundary requires={capability}>
+        <span>content</span>
+      </ProgressiveBoundary>,
+      { wrapper },
+    );
+    expect(screen.getByText("content")).toBeInTheDocument();
+  });
+
+  it("blocks children with no fallback when capability is false", () => {
+    const capability = atom(false);
+    const { container } = render(
+      <ProgressiveBoundary requires={capability}>
+        <span>content</span>
+      </ProgressiveBoundary>,
+      { wrapper },
+    );
+    expect(container).toBeEmptyDOMElement();
+  });
+
+  it("renders the fallback when capability is false", () => {
+    const capability = atom(false);
+    render(
+      <ProgressiveBoundary requires={capability} fallback={<span>wait</span>}>
+        <span>content</span>
+      </ProgressiveBoundary>,
+      { wrapper },
+    );
+    expect(screen.getByText("wait")).toBeInTheDocument();
+    expect(screen.queryByText("content")).not.toBeInTheDocument();
+  });
+
+  it("renders children once a previously-false capability flips true", () => {
+    const capability = atom(false);
+    render(
+      <ProgressiveBoundary requires={capability} fallback={<span>wait</span>}>
+        <span>content</span>
+      </ProgressiveBoundary>,
+      { wrapper },
+    );
+    expect(screen.getByText("wait")).toBeInTheDocument();
+
+    act(() => store.set(capability, true));
+    expect(screen.getByText("content")).toBeInTheDocument();
+  });
+
+  it("reopens the gate when a capability flips back to false", () => {
+    const capability = atom(true);
+    render(
+      <ProgressiveBoundary requires={capability} fallback={<span>wait</span>}>
+        <span>content</span>
+      </ProgressiveBoundary>,
+      { wrapper },
+    );
+    expect(screen.getByText("content")).toBeInTheDocument();
+
+    act(() => store.set(capability, false));
+    expect(screen.queryByText("content")).not.toBeInTheDocument();
+    expect(screen.getByText("wait")).toBeInTheDocument();
+  });
+
+  it("delays the fallback by `delay` ms", () => {
+    const capability = atom(false);
+    render(
+      <ProgressiveBoundary
+        requires={capability}
+        delay={2000}
+        fallback={<span>wait</span>}
+      >
+        <span>content</span>
+      </ProgressiveBoundary>,
+      { wrapper },
+    );
+    // Before the delay elapses, no fallback.
+    expect(screen.queryByText("wait")).not.toBeInTheDocument();
+
+    act(() => vi.advanceTimersByTime(2000));
+    expect(screen.getByText("wait")).toBeInTheDocument();
+  });
+
+  it("re-arms the delay when the gate closes again", () => {
+    const capability = atom(true);
+    render(
+      <ProgressiveBoundary
+        requires={capability}
+        delay={2000}
+        fallback={<span>wait</span>}
+      >
+        <span>content</span>
+      </ProgressiveBoundary>,
+      { wrapper },
+    );
+    expect(screen.getByText("content")).toBeInTheDocument();
+
+    // Gate closes: fallback should stay suppressed until the delay re-elapses.
+    act(() => store.set(capability, false));
+    expect(screen.queryByText("wait")).not.toBeInTheDocument();
+    expect(screen.queryByText("content")).not.toBeInTheDocument();
+
+    act(() => vi.advanceTimersByTime(2000));
+    expect(screen.getByText("wait")).toBeInTheDocument();
+  });
+
+  it("skips the fallback entirely if the gate opens before the delay", () => {
+    const capability = atom(false);
+    render(
+      <ProgressiveBoundary
+        requires={capability}
+        delay={5000}
+        fallback={<span>wait</span>}
+      >
+        <span>content</span>
+      </ProgressiveBoundary>,
+      { wrapper },
+    );
+    expect(screen.queryByText("wait")).not.toBeInTheDocument();
+
+    act(() => store.set(capability, true));
+    expect(screen.getByText("content")).toBeInTheDocument();
+  });
+});

package/src/components/lifecycle/__tests__/RuntimeStatusBadge.test.tsx

@@ -0,0 +1,72 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { render, screen } from "@testing-library/react";
+import { atom, createStore, Provider } from "jotai";
+import type { ReactNode } from "react";
+import { beforeEach, describe, expect, it } from "vitest";
+import { TooltipProvider } from "@/components/ui/tooltip";
+import {
+  type AdapterState,
+  type RuntimeAdapter,
+  runtimeAdapterAtom,
+} from "@/core/runtime/adapter";
+import { RuntimeStatusBadge } from "../RuntimeStatusBadge";
+
+function makeAdapter(initial: AdapterState): RuntimeAdapter {
+  return {
+    kind: "remote",
+    label: "Kernel",
+    capabilities: {
+      canHealthCheck: true,
+      canShutdown: true,
+      canRestart: true,
+      supportsLsp: true,
+    },
+    state: atom<AdapterState>(initial),
+  };
+}
+
+let store: ReturnType<typeof createStore>;
+
+const wrapper = ({ children }: { children: ReactNode }) => (
+  <Provider store={store}>
+    <TooltipProvider>{children}</TooltipProvider>
+  </Provider>
+);
+
+beforeEach(() => {
+  store = createStore();
+});
+
+describe("RuntimeStatusBadge", () => {
+  it("hides itself when the runtime is ready", () => {
+    store.set(runtimeAdapterAtom, makeAdapter({ kind: "ready" }));
+    const { container } = render(<RuntimeStatusBadge />, { wrapper });
+    expect(container).toBeEmptyDOMElement();
+  });
+
+  it("shows a labeled spinner pill while connecting", () => {
+    store.set(
+      runtimeAdapterAtom,
+      makeAdapter({
+        kind: "connecting",
+        progress: { label: "Loading Pyodide…" },
+      }),
+    );
+    render(<RuntimeStatusBadge />, { wrapper });
+    expect(screen.getByTestId("runtime-status-footer")).toBeInTheDocument();
+    expect(screen.getByText("Kernel")).toBeInTheDocument();
+  });
+
+  it("shows the failure icon when the runtime fails", () => {
+    store.set(
+      runtimeAdapterAtom,
+      makeAdapter({
+        kind: "failed",
+        error: { message: "Boom", errorKind: "init" },
+      }),
+    );
+    render(<RuntimeStatusBadge />, { wrapper });
+    expect(screen.getByTestId("runtime-status-footer")).toBeInTheDocument();
+  });
+});

package/src/components/slides/slide-cell-view.tsx

@@ -26,7 +26,7 @@ import { connectionAtom } from "@/core/network/connection";
 import { useTheme } from "@/theme/useTheme";
 import { cn } from "@/utils/cn";
 import { ReadonlyCode } from "../editor/code/readonly-python-code";
-import { languageAdapterFromCode } from "@/core/codemirror/language/extension";
+import { getReadonlyCodeDisplay } from "@/core/cells/readonly-code-display";
 
 type RuntimeCell = CellRuntimeState & CellData;
 
@@ -188,10 +188,7 @@ export const SlideCellReadOnlyView = ({ cell }: { cell: RuntimeCell }) => {
   const [userConfig] = useUserConfig();
   const cellOutputPosition = userConfig.display.cell_output;
 
-  const language = useMemo(() => {
-    const adapter = languageAdapterFromCode(cell.code.trim());
-    return adapter.type === "sql" ? "sql" : "python";
-  }, [cell.code]);
+  const display = useMemo(() => getReadonlyCodeDisplay(cell.code), [cell.code]);
 
   const output = (
     <CellOutputSlide
@@ -203,7 +200,11 @@ export const SlideCellReadOnlyView = ({ cell }: { cell: RuntimeCell }) => {
 
   const editor = (
     <div className="marimo-cell">
-      <ReadonlyCode code={cell.code} language={language} showHideCode={false} />
+      <ReadonlyCode
+        code={display.code}
+        language={display.language}
+        showHideCode={false}
+      />
     </div>
   );
 

package/src/core/ai/config.ts

@@ -60,7 +60,7 @@ export const useModelChange = () => {
       },
     };
 
-    saveConfig(newConfig);
+    await saveConfig(newConfig);
   };
 
   const saveModeChange = async (newMode: CopilotMode) => {
@@ -71,7 +71,7 @@ export const useModelChange = () => {
       },
     };
 
-    saveConfig(newConfig);
+    await saveConfig(newConfig);
   };
 
   return { saveModelChange, saveModeChange };

package/src/core/ai/context/__tests__/registry.test.ts

@@ -176,6 +176,33 @@ class FileContextProvider extends AIContextProvider<FileContextItem> {
   }
 }
 
+// Second mock provider with the same context type as MockContextProvider
+class SecondaryMockProvider extends AIContextProvider<MockContextItem> {
+  readonly title = "Secondary Mock Items";
+  readonly mentionPrefix = "@";
+  readonly contextType = "mock";
+
+  getItems(): MockContextItem[] {
+    return [
+      {
+        type: "mock",
+        uri: this.asURI("secondary-item"),
+        name: "Secondary Item",
+        description: "From the second mock provider",
+        data: { value: "secondary" },
+      },
+    ];
+  }
+
+  formatContext(item: MockContextItem): string {
+    return `Secondary: ${item.name}`;
+  }
+
+  formatCompletion(item: MockContextItem): Completion {
+    return this.createBasicCompletion(item);
+  }
+}
+
 describe("AIContextProvider", () => {
   let provider: MockContextProvider;
 
@@ -411,6 +438,95 @@ describe("AIContextRegistry", () => {
     });
   });
 
+  describe("resolveItems", () => {
+    let mockGetItems: ReturnType<typeof vi.spyOn>;
+    let fileGetItems: ReturnType<typeof vi.spyOn>;
+
+    beforeEach(() => {
+      registry.register(mockProvider);
+      registry.register(fileProvider);
+      mockGetItems = vi.spyOn(mockProvider, "getItems");
+      fileGetItems = vi.spyOn(fileProvider, "getItems");
+    });
+
+    it("should resolve valid IDs from the matching providers only", () => {
+      const resolved = registry.resolveItems([
+        "mock://item1",
+        "file://config.py",
+      ] as ContextLocatorId[]);
+
+      expect(resolved).toHaveLength(2);
+      expect(resolved.map((item) => item.uri)).toEqual([
+        "mock://item1",
+        "file://config.py",
+      ]);
+      expect(mockGetItems).toHaveBeenCalledTimes(1);
+      expect(fileGetItems).toHaveBeenCalledTimes(1);
+    });
+
+    it("should not call unrelated providers", () => {
+      registry.resolveItems(["mock://item1"] as ContextLocatorId[]);
+
+      expect(mockGetItems).toHaveBeenCalledTimes(1);
+      expect(fileGetItems).not.toHaveBeenCalled();
+    });
+
+    it("should ignore unknown or invalid URIs", () => {
+      const resolved = registry.resolveItems([
+        "mock://nonexistent",
+        "unknown://item",
+        "malformed" as ContextLocatorId,
+      ] as ContextLocatorId[]);
+
+      expect(resolved).toEqual([]);
+      expect(mockGetItems).toHaveBeenCalledTimes(1);
+      expect(fileGetItems).not.toHaveBeenCalled();
+    });
+
+    it("should return empty array for empty input", () => {
+      expect(registry.resolveItems([])).toEqual([]);
+      expect(mockGetItems).not.toHaveBeenCalled();
+      expect(fileGetItems).not.toHaveBeenCalled();
+    });
+
+    it("should preserve requested order when providers are interleaved", () => {
+      const resolved = registry.resolveItems([
+        "mock://item1",
+        "file://config.py",
+        "mock://item2",
+        "file://utils/helpers.py",
+      ] as ContextLocatorId[]);
+
+      expect(resolved.map((item) => item.uri)).toEqual([
+        "mock://item1",
+        "file://config.py",
+        "mock://item2",
+        "file://utils/helpers.py",
+      ]);
+      // Each provider is still queried only once, regardless of interleaving.
+      expect(mockGetItems).toHaveBeenCalledTimes(1);
+      expect(fileGetItems).toHaveBeenCalledTimes(1);
+    });
+
+    it("should resolve items from all providers that share a context type", () => {
+      const secondaryProvider = new SecondaryMockProvider();
+      const secondaryGetItems = vi.spyOn(secondaryProvider, "getItems");
+      registry.register(secondaryProvider);
+
+      const resolved = registry.resolveItems([
+        "mock://item1",
+        "mock://secondary-item",
+      ] as ContextLocatorId[]);
+
+      expect(resolved.map((item) => item.uri)).toEqual([
+        "mock://item1",
+        "mock://secondary-item",
+      ]);
+      expect(mockGetItems).toHaveBeenCalledTimes(1);
+      expect(secondaryGetItems).toHaveBeenCalledTimes(1);
+    });
+  });
+
   describe("getContextInfo", () => {
     beforeEach(() => {
       registry.register(mockProvider);
@@ -531,6 +647,19 @@ describe("AIContextRegistry", () => {
       expect(formatted).toContain("Mock: Item 1 (value1)");
       expect(formatted.split("\n\n")).toHaveLength(1);
     });
+
+    it("should format items from the provider that owns them", () => {
+      registry.register(new SecondaryMockProvider());
+
+      const formatted = registry.formatContextForAI([
+        "mock://item1",
+        "mock://secondary-item",
+      ] as ContextLocatorId[]);
+
+      expect(formatted).toBe(
+        "Mock: Item 1 (value1)\n\nSecondary: Secondary Item",
+      );
+    });
   });
 
   describe("edge cases and error handling", () => {
@@ -621,7 +750,7 @@ describe("AIContextRegistry", () => {
       expect(provider).toBe(errorProvider);
 
       const items = registry.getAllItems();
-      expect(items).toHaveLength(1);
+      expect(items).toHaveLength(3);
       expect(items[0].type).toBe("error");
       expect(items[0].name).toBe("Errors");
     });
@@ -654,10 +783,11 @@ describe("AIContextRegistry", () => {
       expect(provider).toBeDefined();
 
       const items = provider!.getItems();
-      expect(items).toHaveLength(1);
+      expect(items).toHaveLength(3);
 
       const completion = provider!.formatCompletion(items[0]);
       expect(completion.label).toBe("@Errors");
+      expect(completion.apply).toBe("@error://all");
       expect(completion.type).toBe("error");
     });
 
@@ -690,7 +820,7 @@ describe("AIContextRegistry", () => {
       const errorItems = items.filter((item) => item.type === "error");
       const mockItems = items.filter((item) => item.type === "mock");
 
-      expect(errorItems).toHaveLength(1);
+      expect(errorItems).toHaveLength(3);
       expect(mockItems).toHaveLength(3);
     });
 

package/src/core/ai/context/providers/__tests__/datasource.test.ts

@@ -1,6 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 /* oxlint-disable typescript/no-explicit-any */
 
+import { createStore } from "jotai";
 import { beforeEach, describe, expect, it } from "vitest";
 import { cellId, variableName } from "@/__tests__/branded";
 import type {
@@ -634,7 +635,8 @@ describe("DatasourceContextProvider", () => {
 
 describe("getDatasourceContext", () => {
   it("should return null if no cell ID is found", () => {
-    const context = getDatasourceContext(cellId("1"));
+    const store = createStore();
+    const context = getDatasourceContext(cellId("1"), store);
     expect(context).toBeNull();
   });
 });