A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
feat(ai): single cell error chips, and auto-sync resource map (#10038)
Shahmir Varqhaeaf7d5b866af
diff --git a/frontend/package.json b/frontend/package.jsonindex 9b8ba5aab6..c6f0a152e1 100644--- a/frontend/package.json+++ b/frontend/package.json@@ -56,7 +56,7 @@"@lezer/python": "^1.1.18","@marimo-team/codemirror-ai": "^0.3.7","@marimo-team/codemirror-languageserver": "^1.16.12",- "@marimo-team/codemirror-mcp": "^0.1.5",+ "@marimo-team/codemirror-mcp": "^0.1.7","@marimo-team/codemirror-sql": "^0.2.8","@marimo-team/llm-info": "workspace:*","@marimo-team/marimo-api": "workspace:*",diff --git a/frontend/src/components/editor/errors/__tests__/auto-fix.test.ts b/frontend/src/components/editor/errors/__tests__/auto-fix.test.tsindex f2010dc729..c32561f206 100644--- a/frontend/src/components/editor/errors/__tests__/auto-fix.test.ts+++ b/frontend/src/components/editor/errors/__tests__/auto-fix.test.ts@@ -1,119 +1,23 @@/* Copyright 2026 Marimo. All rights reserved. */-import { beforeEach, describe, expect, it, vi } from "vitest";+import { describe, expect, it } from "vitest";import { cellId } from "@/__tests__/branded";-import type { MarimoError } from "@/core/kernel/messages";+import { buildFixInChatPrompt } from "../auto-fix";-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",+describe("buildFixInChatPrompt", () => {+ it("references the per-cell error context URI", () => {+ expect(buildFixInChatPrompt(cellId("cell-1"))).toBe(+ "@error://cell-1\n\nPlease fix this error.",);});- 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("falls back to inline error text when no cell id", () => {+ expect(buildFixInChatPrompt(undefined, "ValueError: boom")).toBe(+ "My code gives the following error. Please fix it:\n\nValueError: boom",);});- 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();+ it("uses a generic prompt when no cell id and no error text", () => {+ expect(buildFixInChatPrompt(undefined)).toBe("Please fix this error.");});});diff --git a/frontend/src/components/editor/errors/auto-fix.tsx b/frontend/src/components/editor/errors/auto-fix.tsxindex 6f8cf30955..435a87ff6f 100644--- a/frontend/src/components/editor/errors/auto-fix.tsx+++ b/frontend/src/components/editor/errors/auto-fix.tsx@@ -21,44 +21,24 @@ 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 } = {},+export function buildFixInChatPrompt(+ cellId: CellId | undefined,+ fallbackErrorText?: string,): 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}`;- }+ if (cellId != null) {+ return `@error://${cellId}\n\nPlease fix this error.`;}- 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,- });+ const errorText = fallbackErrorText?.trim();+ if (errorText) {+ return `My code gives the following error. Please fix it:\n\n${errorText}`;+ }+ return "Please fix this error.";}export const AutoFixButton = ({@@ -112,7 +92,7 @@ export const AutoFixButton = ({const openAISidebar = () => {openAiAssistant({- prompt: buildFixPrompt(errors, cellId),+ prompt: buildFixInChatPrompt(cellId),});};diff --git a/frontend/src/components/editor/output/MarimoTracebackOutput.tsx b/frontend/src/components/editor/output/MarimoTracebackOutput.tsxindex 9b32a8175e..c1ab03ca3c 100644--- a/frontend/src/components/editor/output/MarimoTracebackOutput.tsx+++ b/frontend/src/components/editor/output/MarimoTracebackOutput.tsx@@ -42,7 +42,7 @@ import {getTracebackInfo,} from "@/utils/traceback";import { useOpenAiAssistant } from "../chrome/wrapper/useOpenAiAssistant";-import { AIFixButton, buildFixPromptFromText } from "../errors/auto-fix";+import { AIFixButton, buildFixInChatPrompt } from "../errors/auto-fix";import { MangledSegments } from "../errors/mangled-local-chip";import { CellLinkTraceback } from "../links/cell-link";import type { OnRefactorWithAI } from "../Output";@@ -101,7 +101,7 @@ export const MarimoTracebackOutput = ({const openAISidebar = () => {openAiAssistant({- prompt: buildFixPromptFromText(lastTracebackLine, cellId),+ prompt: buildFixInChatPrompt(cellId, lastTracebackLine),});};diff --git a/frontend/src/core/ai/context/__tests__/registry.test.ts b/frontend/src/core/ai/context/__tests__/registry.test.tsindex 7ade5a4a7c..0c125a4fe1 100644--- a/frontend/src/core/ai/context/__tests__/registry.test.ts+++ b/frontend/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);});diff --git a/frontend/src/core/ai/context/providers/__tests__/__snapshots__/error.test.ts.snap b/frontend/src/core/ai/context/providers/__tests__/__snapshots__/error.test.ts.snapdeleted file mode 100644index fe35122e99..0000000000--- a/frontend/src/core/ai/context/providers/__tests__/__snapshots__/error.test.ts.snap+++ /dev/null@@ -1,3 +0,0 @@-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html--exports[`ErrorContextProvider > formatContext > should format context for basic errors > basic-error-context 1`] = `"<error name="Cell 1" description="Invalid syntax"></error>"`;diff --git a/frontend/src/core/ai/context/providers/__tests__/datasource.test.ts b/frontend/src/core/ai/context/providers/__tests__/datasource.test.tsindex e9ab5d1b74..d439b958ed 100644--- a/frontend/src/core/ai/context/providers/__tests__/datasource.test.ts+++ b/frontend/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();});});diff --git a/frontend/src/core/ai/context/providers/__tests__/error.test.ts b/frontend/src/core/ai/context/providers/__tests__/error.test.tsindex 8a3e43e870..37ea53dc0e 100644--- a/frontend/src/core/ai/context/providers/__tests__/error.test.ts+++ b/frontend/src/core/ai/context/providers/__tests__/error.test.ts@@ -57,7 +57,7 @@ describe("ErrorContextProvider", () => {const items = provider.getItems();- expect(items).toHaveLength(1);+ expect(items).toHaveLength(3);expect(items[0]).toMatchObject({name: "Errors",type: "error",@@ -78,6 +78,18 @@ describe("ErrorContextProvider", () => {],},});+ expect(items[1]).toMatchObject({+ uri: `error://${cellId1}`,+ name: "Error: Cell 1",+ description: "Invalid syntax",+ data: { type: "cell-error", error: { cellId: cellId1 } },+ });+ expect(items[2]).toMatchObject({+ uri: `error://${cellId2}`,+ name: "Error: Cell 2",+ description: "Runtime error",+ data: { type: "cell-error", error: { cellId: cellId2 } },+ });});it("should handle cells without names", () => {@@ -92,7 +104,12 @@ describe("ErrorContextProvider", () => {]);const items = provider.getItems();- expect(items[0].data.errors[0].cellName).toBe("");+ expect(items[1].data.type).toBe("cell-error");+ if (items[1].data.type === "cell-error") {+ expect(items[1].data.error.cellName).toBe("cell-0");+ }+ expect(items[1].name).toBe("Error: cell-0");+ expect(items[1].description).toBe("Invalid syntax");});});@@ -119,7 +136,7 @@ describe("ErrorContextProvider", () => {expect(completion).toMatchInlineSnapshot(`{- "apply": "@Errors",+ "apply": "@error://all","detail": "2 errors","displayLabel": "Errors","info": [Function],@@ -170,6 +187,24 @@ describe("ErrorContextProvider", () => {expect(completion.detail).toBe("1 error");});+ it("formats completion for a single cell error", () => {+ const cellId = CellIdClass.create();++ createMockNotebookWithErrors([+ {+ cellId,+ cellName: "Cell 1",+ errorData: [MockNotebook.errors.syntax("Invalid syntax")],+ },+ ]);++ const items = provider.getItems();+ const completion = provider.formatCompletion(items[1]);+ expect(completion.apply).toBe(`@error://${cellId}`);+ expect(completion.displayLabel).toBe("Error: Cell 1");+ expect(items[1].name).toBe("Error: Cell 1");+ });+it("should handle fallback for unknown error types", () => {const item = {uri: "error://unknown",@@ -210,7 +245,8 @@ describe("ErrorContextProvider", () => {const items = provider.getItems();const context = provider.formatContext(items[0]);- expect(context).toMatchSnapshot("basic-error-context");+ expect(context).toContain("Invalid syntax");+ expect(context).toContain("Code:");});it("should format context for multiple error types", () => {@@ -239,14 +275,12 @@ describe("ErrorContextProvider", () => {const items = provider.getItems();const context = provider.formatContext(items[0]);- // Check for expected content instead of exact snapshot match due to random cell IDs- expect(context).toMatchInlineSnapshot(`- "<error name="Cell 1" description="Invalid syntax- Runtime error"></error>-- <error name="Cell cell-2" description="This cell is in a cycle- The variable 'variable_x' was defined by another cell"></error>"- `);+ expect(context).toContain("Invalid syntax");+ expect(context).toContain("Runtime error");+ expect(context).toContain("This cell is in a cycle");+ expect(context).toContain(+ "The variable 'variable_x' was defined by another cell",+ );});it("should handle cells without names", () => {@@ -261,8 +295,158 @@ describe("ErrorContextProvider", () => {]);const items = provider.getItems();- const context = provider.formatContext(items[0]);- expect(context).toContain(`Cell ${cellId}`);+ const context = provider.formatContext(items[1]);+ expect(context).toContain(`cellId="${cellId}"`);+ expect(context).toContain("Invalid syntax");+ });++ it("includes exception tracebacks in formatted context", () => {+ const cellId = CellIdClass.create();++ createMockNotebookWithErrors([+ {+ cellId,+ cellName: "Cell 1",+ errorData: [+ {+ type: "exception",+ msg: "boom",+ exception_type: "ValueError",+ raising_cell: null,+ traceback: "<pre>line 1\nline 2</pre>",+ },+ ],+ },+ ]);++ const items = provider.getItems();+ const context = provider.formatContext(items[1]);+ expect(context).toContain("boom");+ expect(context).toContain("line 1");+ expect(context).toContain("line 2");+ });++ it("includes traceback-only cell outputs", () => {+ const cellId = CellIdClass.create();+ const notebookState = MockNotebook.notebookState({+ cellData: {+ [cellId]: {+ name: "Cell 1",+ code: "raise ValueError('boom')",+ },+ },+ });+ notebookState.cellRuntime[cellId] = {+ ...notebookState.cellRuntime[cellId],+ output: {+ channel: "marimo-error",+ data: "<pre>ValueError: boom\n line 1</pre>",+ mimetype: "application/vnd.marimo+traceback",+ timestamp: Date.now(),+ },+ };+ store.set(notebookAtom, notebookState);++ const items = provider.getItems();+ expect(items).toHaveLength(2);+ expect(items[1].description).toBe("ValueError: boom");+ const context = provider.formatContext(items[1]);+ expect(context).toContain("raise ValueError('boom')");+ expect(context).toContain("ValueError: boom");+ expect(context).toContain("line 1");+ });++ it("includes console tracebacks for marimo error outputs", () => {+ const cellId = CellIdClass.create();+ const notebookState = MockNotebook.notebookState({+ cellData: {+ [cellId]: {+ name: "Cell 1",+ code: "raise ValueError('boom')",+ },+ },+ });+ notebookState.cellRuntime[cellId] = {+ ...notebookState.cellRuntime[cellId],+ output: {+ channel: "marimo-error",+ data: [+ {+ type: "exception",+ msg: "boom",+ exception_type: "ValueError",+ raising_cell: null,+ },+ ],+ mimetype: "application/vnd.marimo+error",+ timestamp: Date.now(),+ },+ consoleOutputs: [+ {+ channel: "stderr",+ data: '<pre>ValueError: boom\n File "notebook.py", line 1</pre>',+ mimetype: "application/vnd.marimo+traceback",+ timestamp: Date.now(),+ },+ ],+ };+ store.set(notebookAtom, notebookState);++ const items = provider.getItems();+ const context = provider.formatContext(items[1]);+ expect(context).toContain("boom");+ expect(context).toContain("ValueError: boom");+ expect(context).toContain('File "notebook.py", line 1');+ expect(items[1].description).toBe("boom");+ });++ it("does not duplicate console traceback when error already has one", () => {+ const cellId = CellIdClass.create();+ const notebookState = MockNotebook.notebookState({+ cellData: {+ [cellId]: {+ name: "Cell 1",+ code: "raise ValueError('boom')",+ },+ },+ });+ notebookState.cellRuntime[cellId] = {+ ...notebookState.cellRuntime[cellId],+ output: {+ channel: "marimo-error",+ data: [+ {+ type: "exception",+ msg: "boom",+ exception_type: "ValueError",+ raising_cell: null,+ traceback: "<pre>embedded line 1</pre>",+ },+ ],+ mimetype: "application/vnd.marimo+error",+ timestamp: Date.now(),+ },+ consoleOutputs: [+ {+ channel: "stderr",+ data: "<pre>console line 1</pre>",+ mimetype: "application/vnd.marimo+traceback",+ timestamp: Date.now(),+ },+ ],+ };+ store.set(notebookAtom, notebookState);++ const items = provider.getItems();+ if (items[1].data.type !== "cell-error") {+ throw new Error("Expected cell-error item");+ }+ expect(items[1].data.error.tracebackHtml).toBeUndefined();++ const context = provider.formatContext(items[1]);+ expect(context).toContain("embedded line 1");+ expect(context).not.toContain("console line 1");+ expect(items[1].description).toBe("boom");});});@@ -319,7 +503,8 @@ describe("ErrorContextProvider", () => {testStore.set(notebookAtom, notebookState);const items = testProvider.getItems();- expect(items).toHaveLength(1);+ // One "all-errors" item plus one per-cell error item.+ expect(items).toHaveLength(2);const context = testProvider.formatContext(items[0]);expect(context).toContain(expected);}diff --git a/frontend/src/core/ai/context/providers/datasource.ts b/frontend/src/core/ai/context/providers/datasource.tsindex a8d039cc72..8261125c3c 100644--- a/frontend/src/core/ai/context/providers/datasource.ts+++ b/frontend/src/core/ai/context/providers/datasource.ts@@ -8,6 +8,7 @@ import type { CellId } from "@/core/cells/ids";import { LanguageAdapters } from "@/core/codemirror/language/LanguageAdapters";import { renderDatasourceInfo } from "@/core/codemirror/language/languages/sql/renderers";import {+ allTablesAtom,type ConnectionsMap,type DatasetTablesMap,dataSourceConnectionsAtom,@@ -18,7 +19,7 @@ import {INTERNAL_SQL_ENGINES,} from "@/core/datasets/engines";import type { DataSourceConnection, DataTable } from "@/core/kernel/messages";-import { store } from "@/core/state/jotai";+import type { JotaiStore } from "@/core/state/jotai";import type { AIContextItem } from "../registry";import { AIContextProvider } from "../registry";import { contextToXml } from "../utils";@@ -148,7 +149,10 @@ export class DatasourceContextProvider extends AIContextProvider<DatasourceConte}}-export function getDatasourceContext(cellId: CellId): string | null {+export function getDatasourceContext(+ cellId: CellId,+ store: JotaiStore,+): string | null {const cellData = store.get(cellDataAtom(cellId));const code = cellData?.code;if (!code || code.trim() === "") {@@ -164,3 +168,24 @@ export function getDatasourceContext(cellId: CellId): string | null {}return null;}++export function formatDatasourceContextForCell(+ cellId: CellId,+ store: JotaiStore,+): string | null {+ const mention = getDatasourceContext(cellId, store);+ if (!mention) {+ return null;+ }++ const connectionsMap = store.get(dataSourceConnectionsAtom).connectionsMap;+ const tablesMap = store.get(allTablesAtom);+ const provider = new DatasourceContextProvider(connectionsMap, tablesMap);+ const uri = mention.slice(1);+ const item = provider.getItems().find((candidate) => candidate.uri === uri);+ if (!item) {+ return null;+ }++ return provider.formatContext(item);+}diff --git a/frontend/src/core/ai/context/providers/error.ts b/frontend/src/core/ai/context/providers/error.tsindex 4ef179f8b8..599139bef1 100644--- a/frontend/src/core/ai/context/providers/error.ts+++ b/frontend/src/core/ai/context/providers/error.ts@@ -1,26 +1,133 @@/* Copyright 2026 Marimo. All rights reserved. */import type { Completion } from "@codemirror/autocomplete";-import { cellErrorsAtom } from "@/core/cells/cells";+import { notebookAtom } from "@/core/cells/cells";import type { CellId } from "@/core/cells/ids";-import type { MarimoError } from "@/core/kernel/messages";+import { displayCellName } from "@/core/cells/names";+import type { MarimoError, OutputMessage } from "@/core/kernel/messages";+import { isErrorMime, isMarimoErrorsMime, isTracebackMime } from "@/core/mime";import type { JotaiStore } from "@/core/state/jotai";import { logNever } from "@/utils/assertNever";+import { parseHtmlContent } from "@/utils/dom";import { PluralWord } from "@/utils/pluralize";import { type AIContextItem, AIContextProvider } from "../registry";import { contextToXml } from "../utils";import { Sections } from "./common";+import { formatDatasourceContextForCell } from "./datasource";++export interface CellErrorEntry {+ cellId: CellId;+ cellName: string;+ cellCode: string;+ errorData: MarimoError[];+ tracebackHtml?: string;+}++export type ErrorContextItemData =+ | {+ type: "all-errors";+ errors: CellErrorEntry[];+ }+ | {+ type: "cell-error";+ error: CellErrorEntry;+ };export interface ErrorContextItem extends AIContextItem {type: "error";- data: {- type: "all-errors";- errors: {- cellId: CellId;- cellName: string;- errorData: MarimoError[];- }[];- };+ data: ErrorContextItemData;+}++function parseCellErrorOutput(+ output: OutputMessage,+): Pick<CellErrorEntry, "errorData" | "tracebackHtml"> | null {+ if (isMarimoErrorsMime(output.mimetype)) {+ if (!Array.isArray(output.data)) {+ return null;+ }+ const errorData = output.data.filter(+ (error) => !error.type.includes("ancestor"),+ );+ if (errorData.length === 0) {+ return null;+ }+ return { errorData };+ }++ if (isTracebackMime(output.mimetype)) {+ if (typeof output.data !== "string" || output.data.length === 0) {+ return null;+ }+ return { errorData: [], tracebackHtml: output.data };+ }++ return null;+}++function errorDataHasTraceback(errorData: MarimoError[]): boolean {+ return errorData.some((error) => "traceback" in error && error.traceback);+}++function getTracebackFromConsole(+ consoleOutputs: OutputMessage[] | undefined,+): string | undefined {+ const tracebackOutput = consoleOutputs?.find((output) =>+ isTracebackMime(output.mimetype),+ );+ if (+ !tracebackOutput ||+ typeof tracebackOutput.data !== "string" ||+ tracebackOutput.data.length === 0+ ) {+ return undefined;+ }+ return tracebackOutput.data;+}++function resolveTracebackHtml(+ parsed: Pick<CellErrorEntry, "errorData" | "tracebackHtml">,+ consoleOutputs: OutputMessage[] | undefined,+): string | undefined {+ if (parsed.tracebackHtml) {+ return parsed.tracebackHtml;+ }+ if (errorDataHasTraceback(parsed.errorData)) {+ return undefined;+ }+ return getTracebackFromConsole(consoleOutputs);+}++export function getCellErrorEntries(store: JotaiStore): CellErrorEntry[] {+ const { cellIds, cellRuntime, cellData } = store.get(notebookAtom);+ const entries: CellErrorEntry[] = [];++ for (const [cellIndex, cellId] of cellIds.inOrderIds.entries()) {+ const cell = cellRuntime[cellId];+ const output = cell.output;+ if (!output || !isErrorMime(output.mimetype)) {+ continue;+ }++ const parsed = parseCellErrorOutput(output);+ if (!parsed) {+ continue;+ }++ const cellName = displayCellName(cellData[cellId].name, cellIndex);+ // Prefer the code from the last execution: runtime errors correspond to+ // the previous run, while `code` may already contain unsaved edits.+ const cellCode = cellData[cellId].lastCodeRun ?? cellData[cellId].code;++ entries.push({+ cellId,+ cellName,+ cellCode,+ errorData: parsed.errorData,+ tracebackHtml: resolveTracebackHtml(parsed, cell.consoleOutputs),+ });+ }++ return entries;}function describeError(error: MarimoError): string {@@ -67,6 +174,77 @@ function describeError(error: MarimoError): string {return "Unknown error";}+function formatSingleError(error: MarimoError): string {+ let text = describeError(error);+ if ("traceback" in error && error.traceback) {+ text += `\n\nTraceback:\n${parseHtmlContent(error.traceback)}`;+ }+ return text;+}++function formatCellErrorDetails(+ entry: CellErrorEntry,+ store: JotaiStore,+): string {+ const parts: string[] = [`Code:\n${entry.cellCode}`];++ if (entry.tracebackHtml) {+ parts.push(`Traceback:\n${parseHtmlContent(entry.tracebackHtml)}`);+ }++ if (entry.errorData.length > 0) {+ parts.push(+ entry.errorData.map((error) => formatSingleError(error)).join("\n\n"),+ );+ }++ if (entry.errorData.some((error) => error.type === "sql-error")) {+ const datasourceContext = formatDatasourceContextForCell(+ entry.cellId,+ store,+ );+ if (datasourceContext) {+ parts.push(`Database schema:\n${datasourceContext}`);+ }+ }++ return parts.join("\n\n");+}++function formatCellErrorXml(entry: CellErrorEntry, store: JotaiStore): string {+ return contextToXml({+ type: "error",+ data: {+ name: entry.cellName || `Cell ${entry.cellId}`,+ cellId: entry.cellId,+ },+ details: formatCellErrorDetails(entry, store),+ });+}++function summarizeCellError(entry: CellErrorEntry): string {+ if (entry.errorData.length === 1) {+ return describeError(entry.errorData[0]);+ }+ if (entry.errorData.length > 1) {+ return `${entry.errorData.length} errors`;+ }+ if (entry.tracebackHtml) {+ const text = parseHtmlContent(entry.tracebackHtml).trim();+ const firstLine = text+ .split("\n")+ .find((line) => line.trim())+ ?.trim();+ return firstLine || "traceback";+ }+ return "error";+}++function errorContextName(entry: CellErrorEntry): string {+ const cellName = entry.cellName || `Cell ${entry.cellId}`;+ return `Error: ${cellName}`;+}+const errorsTxt = new PluralWord("error", "errors");export class ErrorContextProvider extends AIContextProvider<ErrorContextItem> {readonly title = "Errors";@@ -80,39 +258,50 @@ export class ErrorContextProvider extends AIContextProvider<ErrorContextItem> {}getItems(): ErrorContextItem[] {- const errors = this.store.get(cellErrorsAtom);+ const errors = getCellErrorEntries(this.store);+if (errors.length === 0) {return [];}- return [+ const items: ErrorContextItem[] = [{uri: this.asURI("all"),name: "Errors",type: this.contextType,data: {type: "all-errors",- errors: errors.map((error) => ({- cellId: error.cellId,- cellName: error.cellName,- errorData: error.output.data,- })),+ errors,},description: "All errors in the notebook",},];- // TODO: maybe handle single errors or grouped by types+ for (const error of errors) {+ items.push({+ uri: this.asURI(error.cellId),+ name: errorContextName(error),+ type: this.contextType,+ data: {+ type: "cell-error",+ error,+ },+ description: summarizeCellError(error),+ });+ }++ return items;}formatCompletion(item: ErrorContextItem): Completion {if (item.data.type === "all-errors") {+ const errorCount = item.data.errors.length;return {label: "@Errors",displayLabel: "Errors",- detail: `${item.data.errors.length} ${errorsTxt.pluralize(item.data.errors.length)}`,+ detail: `${errorCount} ${errorsTxt.pluralize(errorCount)}`,type: "error",- apply: "@Errors",+ apply: "@error://all",section: Sections.ERROR,info: () => {const infoContainer = document.createElement("div");@@ -136,7 +325,7 @@ export class ErrorContextProvider extends AIContextProvider<ErrorContextItem> {const descriptionDiv = document.createElement("div");descriptionDiv.classList.add("text-sm", "text-muted-foreground");- descriptionDiv.textContent = `${item.data.errors.length} ${errorsTxt.pluralize(item.data.errors.length)}`;+ descriptionDiv.textContent = `${errorCount} ${errorsTxt.pluralize(errorCount)}`;headerDiv.append(descriptionDiv);infoContainer.append(headerDiv);@@ -146,6 +335,17 @@ export class ErrorContextProvider extends AIContextProvider<ErrorContextItem> {};}+ if (item.data.type === "cell-error") {+ const { error } = item.data;+ return {+ ...this.createBasicCompletion(item, {+ detail: summarizeCellError(error),+ type: "error",+ }),+ section: Sections.ERROR,+ };+ }+return {label: "Error",displayLabel: "Error",@@ -154,21 +354,11 @@ export class ErrorContextProvider extends AIContextProvider<ErrorContextItem> {}formatContext(item: ErrorContextItem): string {- const { data } = item;-- const xmls = data.errors.map((err) => {- return contextToXml({- type: this.contextType,- data: {- name: err.cellName || `Cell ${err.cellId}`,- description: err.errorData- .map((err) => describeError(err))- .join("\n"),- },- });- });+ const entries =+ item.data.type === "all-errors" ? item.data.errors : [item.data.error];- const xml = xmls.join("\n\n");- return xml;+ return entries+ .map((entry) => formatCellErrorXml(entry, this.store))+ .join("\n\n");}}diff --git a/frontend/src/core/ai/context/registry.ts b/frontend/src/core/ai/context/registry.tsindex 67ce5f4d7d..b317f32614 100644--- a/frontend/src/core/ai/context/registry.ts+++ b/frontend/src/core/ai/context/registry.ts@@ -9,11 +9,19 @@ import { MultiMap } from "@/utils/multi-map";import type { TypedString } from "@/utils/typed";/**- * Unique identifier for a context item in the format "type:id"+ * Unique identifier for a context item in the format "type://id"* e.g., "variable://my_var", "data://users", "file://config.py"*/export type ContextLocatorId = TypedString<"ContextLocatorId">;+function parseContextType(uri: ContextLocatorId): string | undefined {+ const separator = uri.indexOf("://");+ if (separator === -1) {+ return undefined;+ }+ return uri.slice(0, separator);+}+/*** Base interface for context items that can be mentioned in AI prompts*/@@ -142,40 +150,80 @@ export class AIContextRegistry<T extends AIContextItem> {);}+ private findProviderForUri(+ uri: ContextLocatorId,+ ): AIContextProvider | undefined {+ const type = parseContextType(uri);+ if (!type) {+ return undefined;+ }+ return [...this.providers].find(+ (provider) =>+ provider.contextType === type &&+ provider.getItems().some((item) => item.uri === uri),+ );+ }+/**- * Get context information for mentioned items+ * Resolve only the requested context items, querying each matching provider*/- getContextInfo(contextIds: ContextLocatorId[]): T[] {- const contextInfo: T[] = [];- const allItems = new Map<ContextLocatorId, T>(- this.getAllItems().map((item) => [item.uri as ContextLocatorId, item]),- );+ resolveItems(contextIds: ContextLocatorId[]): T[] {+ if (contextIds.length === 0) {+ return [];+ }++ const idsByType = new MultiMap<string, ContextLocatorId>();+ for (const contextId of contextIds) {+ const type = parseContextType(contextId);+ if (type) {+ idsByType.add(type, contextId);+ }+ }++ const itemsById = new Map<ContextLocatorId, T>();+ for (const [type, ids] of idsByType.entries()) {+ const providers = [...this.providers].filter(+ (provider) => provider.contextType === type,+ );+ for (const provider of providers) {+ const itemsByUri = new Map<ContextLocatorId, T>(+ provider+ .getItems()+ .map((item) => [item.uri as ContextLocatorId, item as T]),+ );+ for (const id of ids) {+ const item = itemsByUri.get(id);+ if (item) {+ itemsById.set(id, item);+ }+ }+ }+ }+ // Preserve the order in which the ids were requested, so formatted context+ // matches the order the user mentioned them in the prompt.+ const results: T[] = [];for (const contextId of contextIds) {- const item = allItems.get(contextId);+ const item = itemsById.get(contextId);if (item) {- contextInfo.push(item);+ results.push(item);}}+ return results;+ }- return contextInfo;+ /**+ * Get context information for mentioned items+ */+ getContextInfo(contextIds: ContextLocatorId[]): T[] {+ return this.resolveItems(contextIds);}/*** Format context for AI prompt inclusion*/formatContextForAI(contextIds: ContextLocatorId[]): string {- const allItems = new Map<ContextLocatorId, T>(- this.getAllItems().map((item) => [item.uri as ContextLocatorId, item]),- );-- const contextInfo: T[] = [];- for (const contextId of contextIds) {- const item = allItems.get(contextId);- if (item) {- contextInfo.push(item);- }- }+ const contextInfo = this.resolveItems(contextIds);if (contextInfo.length === 0) {return "";@@ -183,7 +231,7 @@ export class AIContextRegistry<T extends AIContextItem> {return contextInfo.map((item) => {- const provider = this.getProvider(item.type);+ const provider = this.findProviderForUri(item.uri as ContextLocatorId);return provider?.formatContext(item) || "";}).join("\n\n");@@ -195,36 +243,22 @@ export class AIContextRegistry<T extends AIContextItem> {async getAttachmentsForContext(contextIds: ContextLocatorId[],): Promise<FileUIPart[]> {- const allItems = new Map<ContextLocatorId, T>(- this.getAllItems().map((item) => [item.uri as ContextLocatorId, item]),- );-- const contextInfo: T[] = [];- for (const contextId of contextIds) {- const item = allItems.get(contextId);- if (item) {- contextInfo.push(item);- }- }+ const contextInfo = this.resolveItems(contextIds);if (contextInfo.length === 0) {return [];}- // Group items by provider type to batch attachment requests- const itemsByProvider = new MultiMap<string, T>();+ const itemsByProvider = new MultiMap<AIContextProvider, T>();for (const item of contextInfo) {- const providerType = item.type;- itemsByProvider.add(providerType, item);+ const provider = this.findProviderForUri(item.uri as ContextLocatorId);+ if (provider) {+ itemsByProvider.add(provider, item);+ }}- // Collect attachments from all providersconst attachmentPromises = [...itemsByProvider.entries()].map(- async ([providerType, items]) => {- const provider = this.getProvider(providerType);- if (!provider) {- return [];- }+ async ([provider, items]) => {try {return await provider.getAttachments(items);} catch (error) {diff --git a/frontend/src/core/codemirror/ai/resources.ts b/frontend/src/core/codemirror/ai/resources.tsindex 58fb2e4a5e..f955c99cc6 100644--- a/frontend/src/core/codemirror/ai/resources.ts+++ b/frontend/src/core/codemirror/ai/resources.ts@@ -11,6 +11,7 @@ import {resourceDecorations,resourceInputFilter,resourcesField,+ resourceSync,resourceTheme,} from "@marimo-team/codemirror-mcp";import {@@ -38,25 +39,28 @@ const NONE_RESOURCE_FORMAT_COMPLETION = {},};+function getRegistryResources(store: JotaiStore): Resource[] {+ const registry = getAIContextRegistry(store);+ const resources = registry.getAllItems();+ if (resources.length === 0) {+ return NONE_RESOURCE;+ }+ return resources;+}+export function resourceExtension(opts: {language: Language;store: JotaiStore;onAddFiles?: (files: File[]) => void;}): Extension[] {const { language, store, onAddFiles } = opts;+ const getResources = () => getRegistryResources(store);return [language.data.of({// Resource completion for static resources (variables, tables, etc.)autocomplete: resourceCompletion(- async (): Promise<Resource[]> => {- const registry = getAIContextRegistry(store);- const resources = registry.getAllItems();- if (resources.length === 0) {- return NONE_RESOURCE;- }- return resources;- },+ async (): Promise<Resource[]> => getResources(),(resource) => {if (resource.type === NONE_RESOURCE_TYPE) {return NONE_RESOURCE_FORMAT_COMPLETION;@@ -92,9 +96,10 @@ export function resourceExtension(opts: {: []),resourceDecorations,resourceInputFilter,+ // Resolve @-mention chips for programmatic prefills.+ resourceSync(getResources, { logger: Logger }),resourcesField.init(() => {- const registry = getAIContextRegistry(store);- const resources = registry.getAllItems();+ const resources = getRegistryResources(store);return new Map(resources.map((resource) => [resource.uri, resource]));}),resourceTheme,diff --git a/frontend/src/core/errors/errors.ts b/frontend/src/core/errors/errors.tsindex 3c9ff1d6cd..bb4ca73ea6 100644--- a/frontend/src/core/errors/errors.ts+++ b/frontend/src/core/errors/errors.ts@@ -6,6 +6,7 @@ import type { AiCompletionCell } from "../ai/state";import type { CellId } from "../cells/ids";import type { MarimoError } from "../kernel/messages";import { wrapInFunction } from "./utils";+import { store } from "../state/jotai";interface AIFix {setAiCompletionCell: (opts: AiCompletionCell) => void;@@ -84,7 +85,7 @@ export function getAutoFixes(description: "Fix the SQL statement",fixType: "ai",onFix: async (ctx) => {- const datasourceContext = getDatasourceContext(ctx.cellId);+ const datasourceContext = getDatasourceContext(ctx.cellId, store);let initialPrompt = `Fix the SQL statement: ${error.msg}.`;if (datasourceContext) {initialPrompt += `\nDatabase schema: ${datasourceContext}`;diff --git a/frontend/src/core/mime.ts b/frontend/src/core/mime.tsindex 20f26e2ad3..59b0e8bcbd 100644--- a/frontend/src/core/mime.ts+++ b/frontend/src/core/mime.ts@@ -1,9 +1,16 @@/* Copyright 2026 Marimo. All rights reserved. */import type { OutputMessage } from "./kernel/messages";+export function isMarimoErrorsMime(+ mime: OutputMessage["mimetype"] | undefined,+) {+ return mime === "application/vnd.marimo+error";+}++export function isTracebackMime(mime: OutputMessage["mimetype"] | undefined) {+ return mime === "application/vnd.marimo+traceback";+}+export function isErrorMime(mime: OutputMessage["mimetype"] | undefined) {- return (- mime === "application/vnd.marimo+error" ||- mime === "application/vnd.marimo+traceback"- );+ return isMarimoErrorsMime(mime) || isTracebackMime(mime);}diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex e741044d5e..e74a312ebc 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -143,8 +143,8 @@ importers:specifier: ^1.16.12version: 1.16.12(@codemirror/[email protected])(@codemirror/[email protected])'@marimo-team/codemirror-mcp':- specifier: ^0.1.5- version: 0.1.5(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@modelcontextprotocol/[email protected])+ specifier: ^0.1.7+ version: 0.1.7(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@modelcontextprotocol/[email protected])'@marimo-team/codemirror-sql':specifier: ^0.2.8version: 0.2.8(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])@@ -1705,8 +1705,8 @@ packages:'@codemirror/state': ^6'@codemirror/view': ^6- '@marimo-team/[email protected]':- resolution: {integrity: sha512-Gt4DGeQO0YIE7mvgNmYfRS1UggnfuZTROHmze80huglUTnZVqIe+2MllZAm/e4jEkI3J9iFYtxzpNLcVlkM8Nw==}+ '@marimo-team/[email protected]':+ resolution: {integrity: sha512-1NhP6leKyIfG5KCAhzLXcMS6QSlS1Ls81M/SPAb9WwTjSNVDTTLu+4RByobB9Wps4NezNmYTKlvb2GbTjkRlZg==}peerDependencies:'@codemirror/autocomplete': ^6'@codemirror/state': ^6@@ -11225,7 +11225,7 @@ snapshots:- encoding- utf-8-validate- '@marimo-team/[email protected](@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@modelcontextprotocol/[email protected])':+ '@marimo-team/[email protected](@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@modelcontextprotocol/[email protected])':dependencies:'@codemirror/autocomplete': 6.20.1'@codemirror/state': 6.6.0