@marimo-team/islands 0.23.14-dev6 → 0.23.14-dev7

package/src/components/editor/errors/__tests__/auto-fix.test.ts

@@ -0,0 +1,119 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { cellId } from "@/__tests__/branded";
+import type { MarimoError } from "@/core/kernel/messages";
+
+const getDatasourceContext = vi.fn<(id: unknown) => string | null>(() => null);
+
+vi.mock("@/core/ai/context/providers/datasource", () => ({
+  getDatasourceContext: (id: unknown) => getDatasourceContext(id),
+}));
+
+const { buildFixPrompt, buildFixPromptFromText } = await import("../auto-fix");
+
+describe("buildFixPromptFromText", () => {
+  beforeEach(() => {
+    getDatasourceContext.mockReset();
+    getDatasourceContext.mockReturnValue(null);
+  });
+
+  it("includes the cell id in the header when provided", () => {
+    const prompt = buildFixPromptFromText("boom", cellId("cell-1"));
+    expect(prompt).toBe(
+      "My cell (id: cell-1) produced the following error. Please fix it:\n\nboom",
+    );
+  });
+
+  it("uses a generic header when no cell id is provided", () => {
+    const prompt = buildFixPromptFromText("boom");
+    expect(prompt).toBe(
+      "My code gives the following error. Please fix it:\n\nboom",
+    );
+  });
+
+  it("appends datasource context when explicitly requested for the cell", () => {
+    getDatasourceContext.mockReturnValue("@datasource://my_db");
+    const prompt = buildFixPromptFromText("boom", cellId("cell-1"), {
+      includeDatasourceContext: true,
+    });
+    expect(prompt).toBe(
+      "My cell (id: cell-1) produced the following error. Please fix it:\n\nboom\n\nDatabase schema: @datasource://my_db",
+    );
+  });
+
+  it("does not append datasource context by default", () => {
+    getDatasourceContext.mockReturnValue("@datasource://my_db");
+    const prompt = buildFixPromptFromText("boom", cellId("cell-1"));
+    expect(prompt).toBe(
+      "My cell (id: cell-1) produced the following error. Please fix it:\n\nboom",
+    );
+    expect(getDatasourceContext).not.toHaveBeenCalled();
+  });
+
+  it("does not look up datasource context without a cell id", () => {
+    buildFixPromptFromText("boom", undefined, {
+      includeDatasourceContext: true,
+    });
+    expect(getDatasourceContext).not.toHaveBeenCalled();
+  });
+});
+
+describe("buildFixPrompt", () => {
+  beforeEach(() => {
+    getDatasourceContext.mockReset();
+    getDatasourceContext.mockReturnValue(null);
+  });
+
+  it("uses the error message when present", () => {
+    const errors: MarimoError[] = [
+      { type: "sql-error", msg: "syntax error", sql_statement: "SELECT" },
+    ];
+    expect(buildFixPrompt(errors, cellId("cell-1"))).toBe(
+      "My cell (id: cell-1) produced the following error. Please fix it:\n\nsyntax error",
+    );
+  });
+
+  it("joins multiple errors with newlines", () => {
+    const errors: MarimoError[] = [
+      { type: "syntax", msg: "bad syntax" },
+      {
+        type: "exception",
+        exception_type: "ValueError",
+        msg: "bad value",
+        raising_cell: null,
+      },
+    ];
+    expect(buildFixPrompt(errors, cellId("cell-1"))).toBe(
+      "My cell (id: cell-1) produced the following error. Please fix it:\n\nbad syntax\nbad value",
+    );
+  });
+
+  it("falls back to the error type when there is no message", () => {
+    const errors: MarimoError[] = [
+      { type: "multiple-defs", name: "foo", cells: [cellId("foo")] },
+    ];
+    expect(buildFixPrompt(errors, cellId("cell-1"))).toBe(
+      "My cell (id: cell-1) produced the following error. Please fix it:\n\nmultiple-defs",
+    );
+  });
+
+  it("appends datasource context for SQL errors", () => {
+    getDatasourceContext.mockReturnValue("@datasource://my_db");
+    const errors: MarimoError[] = [
+      { type: "sql-error", msg: "syntax error", sql_statement: "SELECT" },
+    ];
+    expect(buildFixPrompt(errors, cellId("cell-1"))).toBe(
+      "My cell (id: cell-1) produced the following error. Please fix it:\n\nsyntax error\n\nDatabase schema: @datasource://my_db",
+    );
+  });
+
+  it("does not append datasource context for non-SQL errors", () => {
+    getDatasourceContext.mockReturnValue("@datasource://my_db");
+    const errors: MarimoError[] = [{ type: "syntax", msg: "bad syntax" }];
+    expect(buildFixPrompt(errors, cellId("cell-1"))).toBe(
+      "My cell (id: cell-1) produced the following error. Please fix it:\n\nbad syntax",
+    );
+    expect(getDatasourceContext).not.toHaveBeenCalled();
+  });
+});

package/src/components/editor/errors/auto-fix.tsx

@@ -1,7 +1,14 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import { useAtomValue, useSetAtom, useStore } from "jotai";
-import { ChevronDownIcon, SparklesIcon, WrenchIcon } from "lucide-react";
+import {
+  CheckIcon,
+  ChevronDownIcon,
+  HatGlasses,
+  type LucideIcon,
+  SparklesIcon,
+  WrenchIcon,
+} from "lucide-react";
 import { Button } from "@/components/ui/button";
 import {
   DropdownMenu,
@@ -14,11 +21,46 @@ import { aiCompletionCellAtom } from "@/core/ai/state";
 import { notebookAtom, useCellActions } from "@/core/cells/cells";
 import type { CellId } from "@/core/cells/ids";
 import { aiFeaturesEnabledAtom } from "@/core/config/config";
+import { getDatasourceContext } from "@/core/ai/context/providers/datasource";
 import { getAutoFixes } from "@/core/errors/errors";
 import type { MarimoError } from "@/core/kernel/messages";
 import { cn } from "@/utils/cn";
+import { useOpenAiAssistant } from "../chrome/wrapper/useOpenAiAssistant";
 import { type FixMode, useFixMode } from "./fix-mode";
 
+export function buildFixPromptFromText(
+  errorText: string,
+  cellId?: CellId,
+  {
+    includeDatasourceContext = false,
+  }: { includeDatasourceContext?: boolean } = {},
+): string {
+  const header =
+    cellId != null
+      ? `My cell (id: ${cellId}) produced the following error. Please fix it:`
+      : "My code gives the following error. Please fix it:";
+  let prompt = `${header}\n\n${errorText}`;
+  if (cellId != null && includeDatasourceContext) {
+    const datasourceContext = getDatasourceContext(cellId);
+    if (datasourceContext) {
+      prompt += `\n\nDatabase schema: ${datasourceContext}`;
+    }
+  }
+  return prompt;
+}
+
+export function buildFixPrompt(errors: MarimoError[], cellId: CellId): string {
+  const errorText = errors
+    .map((error) => ("msg" in error && error.msg ? error.msg : error.type))
+    .join("\n");
+  const includeDatasourceContext = errors.some(
+    (error) => error.type === "sql-error",
+  );
+  return buildFixPromptFromText(errorText, cellId, {
+    includeDatasourceContext,
+  });
+}
+
 export const AutoFixButton = ({
   errors,
   cellId,
@@ -35,6 +77,7 @@ export const AutoFixButton = ({
     getAutoFixes(error, { aiEnabled: aiFeaturesEnabled }),
   );
   const setAiCompletionCell = useSetAtom(aiCompletionCellAtom);
+  const openAiAssistant = useOpenAiAssistant();
 
   if (autoFixes.length === 0) {
     return null;
@@ -67,6 +110,12 @@ export const AutoFixButton = ({
     editorView?.focus();
   };
 
+  const openAISidebar = () => {
+    openAiAssistant({
+      prompt: buildFixPrompt(errors, cellId),
+    });
+  };
+
   return (
     <div className={cn("my-2", className)}>
       {firstFix.fixType === "ai" ? (
@@ -74,6 +123,7 @@ export const AutoFixButton = ({
           tooltip={firstFix.description}
           openPrompt={() => handleFix(false)}
           applyAutofix={() => handleFix(true)}
+          openChat={openAISidebar}
         />
       ) : (
         <Tooltip content={firstFix.description} align="start">
@@ -92,23 +142,53 @@ export const AutoFixButton = ({
   );
 };
 
-const PromptIcon = SparklesIcon;
-const AutofixIcon = WrenchIcon;
+interface FixModeConfig {
+  Icon: LucideIcon;
+  title: string;
+  description: string;
+}
 
-const PromptTitle = "Suggest a prompt";
-const AutofixTitle = "Fix with AI";
+const MODE_CONFIG: Record<FixMode, FixModeConfig> = {
+  autofix: {
+    Icon: WrenchIcon,
+    title: "Inline AI Fix",
+    description: "Apply AI fixes inline in the cell",
+  },
+  chat: {
+    Icon: HatGlasses,
+    title: "Fix with AI assistant",
+    description: "Open the AI sidebar to fix",
+  },
+  prompt: {
+    Icon: SparklesIcon,
+    title: "Suggest a prompt",
+    description: "Edit the prompt before applying",
+  },
+};
+
+const FIX_MODES: FixMode[] = ["autofix", "prompt", "chat"];
 
 export const AIFixButton = ({
   tooltip,
   openPrompt,
   applyAutofix,
+  openChat,
 }: {
   tooltip: string;
   openPrompt: () => void;
   applyAutofix: () => void;
+  openChat: () => void;
 }) => {
   const { fixMode, setFixMode } = useFixMode();
 
+  let onAction = openPrompt;
+  if (fixMode === "chat") {
+    onAction = openChat;
+  } else if (fixMode === "autofix") {
+    onAction = applyAutofix;
+  }
+  const { Icon, title } = MODE_CONFIG[fixMode];
+
   return (
     <div className="flex">
       <Tooltip content={tooltip} align="start">
@@ -116,14 +196,10 @@ export const AIFixButton = ({
           size="xs"
           variant="outline"
           className="font-normal rounded-r-none border-r-0"
-          onClick={fixMode === "prompt" ? openPrompt : applyAutofix}
+          onClick={onAction}
         >
-          {fixMode === "prompt" ? (
-            <PromptIcon className="h-3 w-3 mr-2 mb-0.5" />
-          ) : (
-            <AutofixIcon className="h-3 w-3 mr-2 mb-0.5" />
-          )}
-          {fixMode === "prompt" ? PromptTitle : AutofixTitle}
+          <Icon className="h-3 w-3 mr-2 mb-0.5" />
+          {title}
         </Button>
       </Tooltip>
       <DropdownMenu>
@@ -138,40 +214,38 @@ export const AIFixButton = ({
           </Button>
         </DropdownMenuTrigger>
         <DropdownMenuContent align="end" className="w-56">
-          <DropdownMenuItem
-            className="flex items-center gap-2"
-            onClick={() => {
-              setFixMode(fixMode === "prompt" ? "autofix" : "prompt");
-            }}
-          >
-            <AiModeItem mode={fixMode === "prompt" ? "autofix" : "prompt"} />
-          </DropdownMenuItem>
+          {FIX_MODES.map((mode) => (
+            <DropdownMenuItem
+              key={mode}
+              className="flex items-center gap-2"
+              onClick={() => setFixMode(mode)}
+            >
+              <AiModeItem mode={mode} selected={mode === fixMode} />
+            </DropdownMenuItem>
+          ))}
         </DropdownMenuContent>
       </DropdownMenu>
     </div>
   );
 };
 
-const AiModeItem = ({ mode }: { mode: FixMode }) => {
-  const icon =
-    mode === "prompt" ? (
-      <PromptIcon className="h-4 w-4" />
-    ) : (
-      <AutofixIcon className="h-4 w-4" />
-    );
-  const title = mode === "prompt" ? PromptTitle : AutofixTitle;
-  const description =
-    mode === "prompt"
-      ? "Edit the prompt before applying"
-      : "Apply AI fixes automatically";
+const AiModeItem = ({
+  mode,
+  selected,
+}: {
+  mode: FixMode;
+  selected: boolean;
+}) => {
+  const { Icon, title, description } = MODE_CONFIG[mode];
 
   return (
-    <div className="flex items-center gap-2">
-      {icon}
+    <div className="flex items-center gap-2 w-full">
+      <Icon className="h-4 w-4 shrink-0" />
       <div className="flex flex-col">
         <span className="font-medium">{title}</span>
         <span className="text-xs text-muted-foreground">{description}</span>
       </div>
+      {selected && <CheckIcon className="h-4 w-4 ml-auto shrink-0" />}
     </div>
   );
 };

package/src/components/editor/errors/fix-mode.ts

@@ -4,7 +4,7 @@ import { useAtom } from "jotai";
 import { atomWithStorage } from "jotai/utils";
 import { jotaiJsonStorage } from "@/utils/storage/jotai";
 
-export type FixMode = "prompt" | "autofix";
+export type FixMode = "prompt" | "autofix" | "chat";
 
 const BASE_KEY = "marimo:ai-autofix-mode";
 

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

@@ -41,7 +41,8 @@ import {
   extractAllTracebackInfo,
   getTracebackInfo,
 } from "@/utils/traceback";
-import { AIFixButton } from "../errors/auto-fix";
+import { useOpenAiAssistant } from "../chrome/wrapper/useOpenAiAssistant";
+import { AIFixButton, buildFixPromptFromText } from "../errors/auto-fix";
 import { MangledSegments } from "../errors/mangled-local-chip";
 import { CellLinkTraceback } from "../links/cell-link";
 import type { OnRefactorWithAI } from "../Output";
@@ -71,6 +72,7 @@ export const MarimoTracebackOutput = ({
 
   const lastTracebackLine = lastLine(traceback);
   const aiFeaturesEnabled = useAtomValue(aiFeaturesEnabledAtom);
+  const openAiAssistant = useOpenAiAssistant();
 
   // Get last traceback info
   const tracebackInfo = extractAllTracebackInfo(traceback)?.at(0);
@@ -97,6 +99,12 @@ export const MarimoTracebackOutput = ({
     });
   };
 
+  const openAISidebar = () => {
+    openAiAssistant({
+      prompt: buildFixPromptFromText(lastTracebackLine, cellId),
+    });
+  };
+
   return (
     <div className="flex flex-col gap-2 min-w-full w-fit">
       <button
@@ -126,6 +134,7 @@ export const MarimoTracebackOutput = ({
             tooltip="Fix with AI"
             openPrompt={() => handleRefactorWithAI(false)}
             applyAutofix={() => handleRefactorWithAI(true)}
+            openChat={openAISidebar}
           />
         )}
         {showDebugger && (

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/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/state.ts

@@ -21,6 +21,17 @@ export interface AiCompletionCell {
 
 export const aiCompletionCellAtom = atom<AiCompletionCell | null>(null);
 
+/**
+ * A prompt queued to be delivered to the AI assistant panel.
+ * The active panel consumes this on mount/when ready, then clears it.
+ */
+export interface PendingAiPrompt {
+  prompt: string;
+  submit: boolean;
+}
+
+export const pendingAiPromptAtom = atom<PendingAiPrompt | null>(null);
+
 const INCLUDE_OTHER_CELLS_KEY = "marimo:ai:includeOtherCells";
 export const includeOtherCellsAtom = atomWithStorage<boolean>(
   INCLUDE_OTHER_CELLS_KEY,

package/src/core/codemirror/utils.ts

@@ -2,6 +2,7 @@
 import type { EditorState, Transaction } from "@codemirror/state";
 import type { EditorView, ViewUpdate } from "@codemirror/view";
 import { getCM } from "@replit/codemirror-vim";
+import type { ReactCodeMirrorRef } from "@uiw/react-codemirror";
 
 export function isAtStartOfEditor(ev: { state: EditorState }) {
   const main = ev.state.selection.main;
@@ -37,6 +38,20 @@ export function moveToEndOfEditor(ev: EditorView | undefined) {
   });
 }
 
+/** We delay the focus and move to end of the editor until React has rendered the prefilled value. */
+export function focusInputAndMoveToEnd(
+  ref: React.RefObject<ReactCodeMirrorRef | null>,
+) {
+  requestAnimationFrame(() => {
+    const view = ref.current?.view;
+    if (!view) {
+      return;
+    }
+    view.focus();
+    moveToEndOfEditor(view);
+  });
+}
+
 export function isInVimMode(ev: EditorView): boolean {
   return getCM(ev)?.state.vim != null;
 }