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
add capabilities UI for chat sidebar (#10502)
Shahmir Varqhaa0212f0b7285
diff --git a/frontend/src/components/ai/ai-model-dropdown.tsx b/frontend/src/components/ai/ai-model-dropdown.tsxindex e4c7dcc50e..2782ae99d8 100644--- a/frontend/src/components/ai/ai-model-dropdown.tsx+++ b/frontend/src/components/ai/ai-model-dropdown.tsx@@ -9,7 +9,7 @@ import {CircleHelpIcon,} from "lucide-react";import React from "react";-import { type SupportedRole, useModelChange } from "@/core/ai/config";+import { type SupportedRole, useAIConfigActions } from "@/core/ai/config";import {AiModelId,isKnownAIProvider,@@ -64,7 +64,7 @@ export const AIModelDropdown = ({const ai = useAtomValue(aiAtom);const completion = useAtomValue(completionAtom);- const { saveModelChange } = useModelChange();+ const { saveModelChange } = useAIConfigActions();const { handleClick } = useOpenSettingsToTab();// Only include autocompleteModel if copilot is set to "custom"diff --git a/frontend/src/components/chat/__tests__/capabilities-popover.test.tsx b/frontend/src/components/chat/__tests__/capabilities-popover.test.tsxnew file mode 100644index 0000000000..e0a76272d9--- /dev/null+++ b/frontend/src/components/chat/__tests__/capabilities-popover.test.tsx@@ -0,0 +1,38 @@+/* Copyright 2026 Marimo. All rights reserved. */++import { fireEvent, render, screen } from "@testing-library/react";+import { createStore, Provider } from "jotai";+import { describe, expect, it } from "vitest";+import { chatOptionsAtom } from "@/core/ai/state";+import { CapabilitiesPopover } from "../capabilities-popover";++describe("CapabilitiesPopover", () => {+ it("updates ephemeral chat options", () => {+ const store = createStore();++ render(+ <Provider store={store}>+ <CapabilitiesPopover />+ </Provider>,+ );++ const trigger = screen.getByRole("button", { name: "Capabilities" });+ expect(trigger).not.toHaveAttribute("data-active");++ fireEvent.click(trigger);+ const webSearch = screen.getByRole("switch", { name: "Web search" });+ expect(webSearch).not.toBeChecked();++ fireEvent.click(webSearch);++ expect(webSearch).toBeChecked();+ expect(trigger).toHaveAttribute("data-active", "true");+ expect(trigger).toHaveClass("bg-primary/15", "text-primary", "ring-1");+ expect(trigger).toHaveAttribute(+ "title",+ "Capabilities (web search enabled)",+ );+ expect(store.get(chatOptionsAtom)).toEqual({ webSearch: true });+ expect(createStore().get(chatOptionsAtom)).toEqual({ webSearch: false });+ });+});diff --git a/frontend/src/components/chat/capabilities-popover.tsx b/frontend/src/components/chat/capabilities-popover.tsxnew file mode 100644index 0000000000..a877967ed5--- /dev/null+++ b/frontend/src/components/chat/capabilities-popover.tsx@@ -0,0 +1,68 @@+/* Copyright 2026 Marimo. All rights reserved. */++import { useAtom } from "jotai";+import { SlidersHorizontalIcon } from "lucide-react";+import type React from "react";+import { Button } from "@/components/ui/button";+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from "@/components/ui/popover";+import { ExternalLink } from "@/components/ui/links";+import { Switch } from "@/components/ui/switch";+import { chatOptionsAtom } from "@/core/ai/state";+import { cn } from "@/utils/cn";++export const CapabilitiesPopover: React.FC = () => {+ const [chatOptions, setChatOptions] = useAtom(chatOptionsAtom);+ const webSearchOn = chatOptions.webSearch;++ return (+ <Popover>+ <PopoverTrigger asChild={true}>+ <Button+ aria-label="Capabilities"+ title={+ webSearchOn ? "Capabilities (web search enabled)" : "Capabilities"+ }+ data-active={webSearchOn || undefined}+ variant="text"+ size="icon"+ className={cn(+ "h-6 w-6 shrink-0 bg-muted hover:bg-muted/30",+ webSearchOn &&+ "bg-primary/15 text-primary ring-1 ring-primary/30 opacity-100 hover:bg-primary/20",+ )}+ >+ <SlidersHorizontalIcon className="h-3.5 w-3.5" />+ </Button>+ </PopoverTrigger>+ <PopoverContent className="w-76 p-3" align="start" side="top">+ <label+ htmlFor="web-search-toggle"+ className="flex items-start justify-between gap-3 cursor-pointer"+ >+ <div className="flex flex-col gap-0.5">+ <span className="text-sm font-semibold">Web search</span>+ <span className="text-xs text-muted-foreground">+ Search the web when the model supports it.{" "}+ <ExternalLink href="https://docs.marimo.io/guides/editor_features/tools#web-search-and-fetch">+ Learn more+ </ExternalLink>+ </span>+ </div>+ <Switch+ id="web-search-toggle"+ aria-label="Web search"+ size="sm"+ checked={webSearchOn}+ onCheckedChange={(webSearch) =>+ setChatOptions((options) => ({ ...options, webSearch }))+ }+ />+ </label>+ </PopoverContent>+ </Popover>+ );+};diff --git a/frontend/src/components/chat/chat-panel.tsx b/frontend/src/components/chat/chat-panel.tsxindex 9e5e9c552e..c9e815f422 100644--- a/frontend/src/components/chat/chat-panel.tsx+++ b/frontend/src/components/chat/chat-panel.tsx@@ -36,7 +36,7 @@ import {SelectTrigger,} from "@/components/ui/select";import { replaceMessagesInChat } from "@/core/ai/chat-utils";-import { useModelChange } from "@/core/ai/config";+import { useAIConfigActions } from "@/core/ai/config";import { AI_SDK_UI_THROTTLE_MS } from "@/core/ai/constants";import { AiModelId } from "@/core/ai/ids/ids";import { useStagedAICellsActions } from "@/core/ai/staged-cells";@@ -44,6 +44,7 @@ import {activeChatAtom,type Chat,type ChatId,+ chatOptionsAtom,chatStateAtom,pendingAiPromptAtom,} from "@/core/ai/state";@@ -91,6 +92,7 @@ import {} from "./chat-abort";import { renderUIMessage } from "./chat-display";import { ChatHistoryPopover } from "./chat-history-popover";+import { CapabilitiesPopover } from "./capabilities-popover";import {type ChatMessagePart,convertToFileUIPart,@@ -298,7 +300,7 @@ const ChatInputFooter: React.FC<ChatInputFooterProps> = memo(const currentModel = ai?.models?.chat_model || DEFAULT_AI_MODEL;const currentProvider = AiModelId.parse(currentModel).providerId;- const { saveModeChange } = useModelChange();+ const { saveModeChange } = useAIConfigActions();const modeOptions: {value: CopilotMode;@@ -326,8 +328,9 @@ const ChatInputFooter: React.FC<ChatInputFooterProps> = memo(},{value: "code_mode",- label: "Code Mode (experimental)",- subtitle: "AI with access to the notebook's kernel. Use with caution.",+ label: "Code Mode",+ subtitle:+ "AI with access to the notebook's kernel. Can overwrite changes.",Icon: CodeIcon,},];@@ -341,12 +344,12 @@ const ChatInputFooter: React.FC<ChatInputFooterProps> = memo(return (<TooltipProvider>- <div className="px-3 py-2 border-t border-border/20 flex flex-row flex-wrap items-center justify-between gap-1">- <div className="flex items-center gap-2">+ <div className="px-3 py-2 border-t border-border/20 flex flex-wrap items-center gap-1">+ <div className="flex flex-wrap items-center gap-1"><Select value={currentMode} onValueChange={saveModeChange}>- <SelectTrigger className="h-6 text-xs border-border shadow-none! ring-0! bg-muted hover:bg-muted/30 py-0 px-2 gap-1.5">+ <SelectTrigger className="h-6 text-xs border-border shadow-none! ring-0! bg-muted hover:bg-muted/30 py-0 px-2 gap-1.5 shrink-0">{CurrentModeIcon && <CurrentModeIcon className="h-3 w-3" />}- <span>{CurrentModeLabel}</span>+ <span className="text-nowrap">{CurrentModeLabel}</span></SelectTrigger><SelectContent><SelectGroup>@@ -377,13 +380,14 @@ const ChatInputFooter: React.FC<ChatInputFooterProps> = memo(</Select><AIModelDropdownplaceholder="Model"- triggerClassName="h-6 text-xs shadow-none! ring-0! bg-muted hover:bg-muted/30 rounded-sm"+ triggerClassName="h-6 text-xs shadow-none! ring-0! bg-muted hover:bg-muted/30 rounded-sm max-w-[200px]"iconSize="small"showAddCustomModelDocs={true}forRole="chat"/>+ <CapabilitiesPopover /></div>- <div className="flex flex-row">+ <div className="flex flex-row ml-auto"><AddContextButtonhandleAddContext={onAddContext}isLoading={isLoading}@@ -445,8 +449,8 @@ const ChatInput: React.FC<ChatInputProps> = memo(});return (- <div className="relative shrink-0 min-h-[80px] flex flex-col border-t">- <div className={cn("px-2 py-3 flex-1", inputClassName)}>+ <div className="relative shrink-0 flex flex-col border-t">+ <div className={cn("px-2 py-1.5", inputClassName)}><PromptInputclassName="max-h-[400px]"inputRef={inputRef}@@ -598,6 +602,7 @@ const ChatPanelBody = () => {const completionBody = {uiMessages: options.messages,includeOtherCode: getCodes(""),+ options: store.get(chatOptionsAtom),};// Call this here to ensure the value is not stalediff --git a/frontend/src/components/editor/chrome/wrapper/useOpenAiAssistant.ts b/frontend/src/components/editor/chrome/wrapper/useOpenAiAssistant.tsindex 2cd2332365..0ab5534689 100644--- a/frontend/src/components/editor/chrome/wrapper/useOpenAiAssistant.ts+++ b/frontend/src/components/editor/chrome/wrapper/useOpenAiAssistant.ts@@ -4,7 +4,7 @@ import { useSetAtom, useStore } from "jotai";import useEvent from "react-use-event-hook";import { agentSessionStateAtom } from "@/components/chat/acp/state";import { toast } from "@/components/ui/use-toast";-import { useModelChange } from "@/core/ai/config";+import { useAIConfigActions } from "@/core/ai/config";import { pendingAiPromptAtom } from "@/core/ai/state";import type { CopilotMode } from "@/core/ai/tools/registry";import { aiModelConfiguredAtom } from "@/core/config/config";@@ -43,7 +43,7 @@ export function resolveAiPanelTab(export function useOpenAiAssistant() {const { openApplication } = useChromeActions();const { setAiPanelTab } = useAiPanelTab();- const { saveModeChange } = useModelChange();+ const { saveModeChange } = useAIConfigActions();const setPendingPrompt = useSetAtom(pendingAiPromptAtom);const store = useStore();diff --git a/frontend/src/core/ai/__tests__/config.test.tsx b/frontend/src/core/ai/__tests__/config.test.tsxnew file mode 100644index 0000000000..29aa273160--- /dev/null+++ b/frontend/src/core/ai/__tests__/config.test.tsx@@ -0,0 +1,96 @@+/* Copyright 2026 Marimo. All rights reserved. */++import { act, renderHook } from "@testing-library/react";+import { createStore, Provider } from "jotai";+import type { ReactNode } from "react";+import { describe, expect, it, vi } from "vitest";+import { userConfigAtom } from "@/core/config/config";+import { defaultUserConfig } from "@/core/config/config-schema";+import { requestClientAtom } from "@/core/network/requests";+import type { EditRequests, RunRequests } from "@/core/network/types";+import { AiModelId } from "../ids/ids";+import { useAIConfigActions } from "../config";++describe("useAIConfigActions", () => {+ it("persists a model change without overwriting newer AI config", async () => {+ const store = createStore();+ const saveUserConfig = vi.fn().mockResolvedValue(null);+ store.set(userConfigAtom, defaultUserConfig());+ store.set(requestClientAtom, {+ saveUserConfig,+ } as unknown as EditRequests & RunRequests);++ const wrapper = ({ children }: { children: ReactNode }) => (+ <Provider store={store}>{children}</Provider>+ );+ const { result } = renderHook(() => useAIConfigActions(), { wrapper });++ store.set(userConfigAtom, (config) => ({+ ...config,+ ai: {+ ...config.ai,+ mode: "agent",+ },+ }));++ await act(async () => {+ await result.current.saveModelChange(+ AiModelId.parse("openai/gpt-4o").id,+ "chat",+ );+ });++ expect(saveUserConfig).toHaveBeenCalledWith({+ config: { ai: { models: { chat_model: "openai/gpt-4o" } } },+ });+ expect(store.get(userConfigAtom).ai).toMatchObject({+ mode: "agent",+ models: { chat_model: "openai/gpt-4o" },+ });+ });++ it("preserves concurrent AI changes when saves resolve out of order", async () => {+ const store = createStore();+ const resolvers: Array<() => void> = [];+ const saveUserConfig = vi.fn(+ () =>+ new Promise<null>((resolve) => {+ resolvers.push(() => resolve(null));+ }),+ );+ store.set(userConfigAtom, defaultUserConfig());+ store.set(requestClientAtom, {+ saveUserConfig,+ } as unknown as EditRequests & RunRequests);++ const wrapper = ({ children }: { children: ReactNode }) => (+ <Provider store={store}>{children}</Provider>+ );+ const { result } = renderHook(() => useAIConfigActions(), { wrapper });++ const modelChange = result.current.saveModelChange(+ AiModelId.parse("openai/gpt-4o").id,+ "chat",+ );+ const modeChange = result.current.saveModeChange("agent");++ expect(saveUserConfig).toHaveBeenNthCalledWith(1, {+ config: { ai: { models: { chat_model: "openai/gpt-4o" } } },+ });+ expect(saveUserConfig).toHaveBeenNthCalledWith(2, {+ config: { ai: { mode: "agent" } },+ });++ await act(async () => {+ resolvers[1]();+ await modeChange;+ resolvers[0]();+ await modelChange;+ });++ expect(store.get(userConfigAtom).ai).toMatchObject({+ mode: "agent",+ models: { chat_model: "openai/gpt-4o" },+ });+ });+});diff --git a/frontend/src/core/ai/config.ts b/frontend/src/core/ai/config.tsindex 3747e650be..89dc2997b5 100644--- a/frontend/src/core/ai/config.ts+++ b/frontend/src/core/ai/config.ts@@ -1,7 +1,8 @@/* Copyright 2026 Marimo. All rights reserved. */import type { Role } from "@marimo-team/llm-info";-import { useAtom } from "jotai";+import { useSetAtom } from "jotai";+import { merge } from "lodash-es";import type { QualifiedModelId } from "@/core/ai/ids/ids";import { userConfigAtom } from "@/core/config/config";import type {@@ -14,6 +15,11 @@ import { useRequestClient } from "@/core/network/requests";// Extract only the supported roles from the Role typeexport type SupportedRole = Extract<Role, "chat" | "autocomplete" | "edit">;+interface AiConfigPatch {+ mode?: CopilotMode;+ models?: Partial<NonNullable<NonNullable<UserConfig["ai"]>["models"]>>;+}+const getModelKeyForRole = (forRole: SupportedRole): AIModelKey | null => {switch (forRole) {case "chat":@@ -26,15 +32,16 @@ const getModelKeyForRole = (forRole: SupportedRole): AIModelKey | null => {};/**- * Hook for saving model and mode changes.+ * Hook for saving AI config changes*/-export const useModelChange = () => {- const [userConfig, setUserConfig] = useAtom(userConfigAtom);+export const useAIConfigActions = () => {+ const setUserConfig = useSetAtom(userConfigAtom);const { saveUserConfig } = useRequestClient();- const saveConfig = async (newConfig: Partial<UserConfig>) => {+ const saveConfig = async (aiConfig: AiConfigPatch) => {+ const newConfig = { ai: aiConfig };await saveUserConfig({ config: newConfig }).then(() => {- setUserConfig((prev) => ({ ...prev, ...newConfig }));+ setUserConfig((prev) => merge({}, prev, newConfig));});};@@ -48,28 +55,15 @@ export const useModelChange = () => {return;}- const newConfig: Partial<UserConfig> = {- ai: {- ...userConfig.ai,- models: {- custom_models: userConfig.ai?.models?.custom_models ?? [],- displayed_models: userConfig.ai?.models?.displayed_models ?? [],- ...userConfig.ai?.models,- [modelKey]: model,- },- },+ const newConfig: AiConfigPatch = {+ models: { [modelKey]: model },};await saveConfig(newConfig);};const saveModeChange = async (newMode: CopilotMode) => {- const newConfig: Partial<UserConfig> = {- ai: {- ...userConfig.ai,- mode: newMode,- },- };+ const newConfig: AiConfigPatch = { mode: newMode };await saveConfig(newConfig);};diff --git a/frontend/src/core/ai/state.ts b/frontend/src/core/ai/state.tsindex b4a46c77fd..bd29897fb2 100644--- a/frontend/src/core/ai/state.ts+++ b/frontend/src/core/ai/state.ts@@ -8,6 +8,7 @@ import { uniqueBy } from "@/utils/arrays";import { adaptForLocalStorage, jotaiJsonStorage } from "@/utils/storage/jotai";import type { TypedString } from "@/utils/typed";import type { CellId } from "../cells/ids";+import type { ChatOptions } from "../network/types";const KEY = "marimo:ai:chatState:v5";@@ -32,6 +33,15 @@ export interface PendingAiPrompt {export const pendingAiPromptAtom = atom<PendingAiPrompt | null>(null);+const CHAT_OPTIONS_KEY = "marimo:ai:chatOptions";+export const chatOptionsAtom = atomWithStorage<Required<ChatOptions>>(+ CHAT_OPTIONS_KEY,+ {+ webSearch: false,+ },+ jotaiJsonStorage,+);+const INCLUDE_OTHER_CELLS_KEY = "marimo:ai:includeOtherCells";export const includeOtherCellsAtom = atomWithStorage<boolean>(INCLUDE_OTHER_CELLS_KEY,diff --git a/frontend/src/core/network/types.ts b/frontend/src/core/network/types.tsindex b74c4ffcf0..fae25e87dc 100644--- a/frontend/src/core/network/types.ts+++ b/frontend/src/core/network/types.ts@@ -131,6 +131,7 @@ export type OpenTutorialRequest = schemas["OpenTutorialRequest"];export type TutorialId = OpenTutorialRequest["tutorialId"];export type InvokeAiToolRequest = schemas["InvokeAiToolRequest"];export type InvokeAiToolResponse = schemas["InvokeAiToolResponse"];+export type ChatOptions = schemas["ChatOptions"];export type ClearCacheRequest = schemas["ClearCacheRequest"];export type GetCacheInfoRequest = schemas["GetCacheInfoRequest"];export type LspHealthResponse = schemas["LspHealthResponse"];diff --git a/marimo/_config/config.py b/marimo/_config/config.pyindex 74f53e18c8..b4aa2884f5 100644--- a/marimo/_config/config.py+++ b/marimo/_config/config.py@@ -336,7 +336,6 @@ class AiConfig(TypedDict, total=False):mode: NotRequired[CopilotMode]inline_tooltip: NotRequired[bool]models: AiModelConfig-# providersopen_ai: OpenAiConfiganthropic: AnthropicConfigdiff --git a/marimo/_pyodide/pyodide_session.py b/marimo/_pyodide/pyodide_session.pyindex be707c35db..dec66984b9 100644--- a/marimo/_pyodide/pyodide_session.py+++ b/marimo/_pyodide/pyodide_session.py@@ -12,7 +12,7 @@ from marimo import _loggersfrom marimo._config.config import (MarimoConfig,PartialMarimoConfig,- merge_default_config,+ merge_config,)from marimo._export.exporter import Exporter, export_markdown, export_scriptfrom marimo._export.requests import (@@ -279,7 +279,11 @@ class PyodideBridge:def save_user_config(self, request: str) -> None:parsed = self._parse(request, SaveUserConfigurationRequest)- config = merge_default_config(cast(PartialMarimoConfig, parsed.config))+ config = merge_config(+ self.session._initial_user_config,+ cast(PartialMarimoConfig, parsed.config),+ )+ self.session._initial_user_config = configself.session.put_control_request(UpdateUserConfigCommand(config=config))diff --git a/marimo/_server/ai/providers.py b/marimo/_server/ai/providers.pyindex 0d2238cbb9..e73a66e17c 100644--- a/marimo/_server/ai/providers.py+++ b/marimo/_server/ai/providers.py@@ -145,13 +145,18 @@ class PydanticProvider(ABC, Generic[ProviderT]):tools: list[ToolDefinition] | None = None,toolsets: Sequence[AbstractToolset[None]] | None = None,extra_capabilities: Sequence[AbstractCapability[None]] | None = None,+ enable_capabilities: bool = True,system_prompt: str,) -> Agent[None, DeferredToolRequests | str]:"""Create a Pydantic AI agent."""from pydantic_ai import Agentmodel = self.create_model()- capabilities = self._build_agent_capabilities(model)+ capabilities = (+ self._build_agent_capabilities(model)+ if enable_capabilities+ else []+ )if extra_capabilities:capabilities.extend(extra_capabilities)agent_toolsets, output_type = self._resolve_agent_toolsets(@@ -213,6 +218,7 @@ class PydanticProvider(ABC, Generic[ProviderT]):max_tokens: int | None,additional_tools: list[ToolDefinition],stream_options: StreamOptions,+ enable_capabilities: bool = True,) -> StreamingResponse:"""Return a streaming response from the given messages. The response are AI SDK events."""tools = (self.config.tools or []) + additional_tools@@ -222,6 +228,7 @@ class PydanticProvider(ABC, Generic[ProviderT]):max_tokens=max_tokens,tools=tools,system_prompt=system_prompt,+ enable_capabilities=enable_capabilities,)stream_options.span_info.tool_count = len(tools) + len(agent.root_capability.capabilities@@ -261,6 +268,7 @@ class PydanticProvider(ABC, Generic[ProviderT]):max_tokens: int,additional_tools: list[ToolDefinition],span_info: SpanInfo,+ enable_capabilities: bool = True,) -> str:"""Return a string response from the given messages."""@@ -272,6 +280,7 @@ class PydanticProvider(ABC, Generic[ProviderT]):max_tokens=max_tokens,tools=tools,system_prompt=system_prompt,+ enable_capabilities=enable_capabilities,)span_info.tool_count = len(tools) + len(agent.root_capability.capabilities@@ -294,6 +303,7 @@ class PydanticProvider(ABC, Generic[ProviderT]):request: Request,max_tokens: int | None,stream_options: StreamOptions,+ enable_capabilities: bool = False,) -> StreamingResponse:"""Return code-mode streaming responses"""from marimo._server.ai.tools.code_mode import (@@ -307,6 +317,7 @@ class PydanticProvider(ABC, Generic[ProviderT]):tools=[],toolsets=[build_execute_code_toolset(session, request)],extra_capabilities=references_capability(),+ enable_capabilities=enable_capabilities,system_prompt=system_prompt,)diff --git a/marimo/_server/api/endpoints/ai.py b/marimo/_server/api/endpoints/ai.pyindex 6f7f41c1bf..6636df929e 100644--- a/marimo/_server/api/endpoints/ai.py+++ b/marimo/_server/api/endpoints/ai.py@@ -163,6 +163,7 @@ async def ai_completion(system_prompt=system_prompt,max_tokens=get_max_tokens(config),additional_tools=[],+ enable_capabilities=False,stream_options=StreamOptions(span_info=SpanInfo(endpoint="completion",@@ -234,6 +235,7 @@ async def ai_chat(session_id=session_id,),)+ enable_capabilities = body.options.web_searchif mode == "code_mode":return await provider.stream_completion_harness(@@ -242,6 +244,7 @@ async def ai_chat(session=session,request=request,max_tokens=max_tokens,+ enable_capabilities=enable_capabilities,stream_options=stream_options,)@@ -250,6 +253,7 @@ async def ai_chat(system_prompt=system_prompt,max_tokens=max_tokens,additional_tools=additional_tools,+ enable_capabilities=enable_capabilities,stream_options=stream_options,)@@ -312,6 +316,7 @@ async def ai_inline_completion(system_prompt=system_prompt,max_tokens=INLINE_COMPLETION_MAX_TOKENS,additional_tools=[],+ enable_capabilities=False,span_info=SpanInfo(endpoint="inline_completion",model=model,diff --git a/marimo/_server/models/completion.py b/marimo/_server/models/completion.pyindex ce4bc57ae3..801afc1d63 100644--- a/marimo/_server/models/completion.py+++ b/marimo/_server/models/completion.py@@ -60,6 +60,14 @@ class AiInlineCompletionRequest(msgspec.Struct, rename="camel"):language: Language = "python"+class ChatOptions(msgspec.Struct, rename="camel"):+ """+ Used to configure capabilities of the AI agent.+ """++ web_search: bool = False++class ChatRequest(msgspec.Struct, rename="camel"):"""UIMessages are expected to be AI SDK messages.@@ -71,3 +79,4 @@ class ChatRequest(msgspec.Struct, rename="camel"):tools: list[ToolDefinition] | None = Nonemodel: str | None = Nonevariables: list[VariableContext | str] | None = None+ options: ChatOptions = msgspec.field(default_factory=ChatOptions)diff --git a/packages/openapi/api.yaml b/packages/openapi/api.yamlindex f4089e1075..1120a246b4 100644--- a/packages/openapi/api.yaml+++ b/packages/openapi/api.yaml@@ -627,6 +627,15 @@ components:- contenttitle: ChatMessagetype: object+ ChatOptions:+ description: Used to configure capabilities of the AI agent.+ properties:+ webSearch:+ default: false+ type: boolean+ required: []+ title: ChatOptions+ type: objectChatRequest:description: 'UIMessages are expected to be AI SDK messages.@@ -639,6 +648,8 @@ components:- type: string- type: 'null'default: null+ options:+ $ref: '#/components/schemas/ChatOptions'tools:anyOf:- items:diff --git a/packages/openapi/src/api.ts b/packages/openapi/src/api.tsindex 0854521d6a..f96cac2905 100644--- a/packages/openapi/src/api.ts+++ b/packages/openapi/src/api.ts@@ -4033,6 +4033,14 @@ export interface components {/** @enum {unknown} */role: "assistant" | "system" | "user";};+ /**+ * ChatOptions+ * @description Used to configure capabilities of the AI agent.+ */+ ChatOptions: {+ /** @default false */+ webSearch?: boolean;+ };/*** ChatRequest* @description UIMessages are expected to be AI SDK messages.@@ -4042,6 +4050,7 @@ export interface components {includeOtherCode: string;/** @default null */model?: string | null;+ options?: components["schemas"]["ChatOptions"];/** @default null */tools?: components["schemas"]["ToolDefinition"][] | null;uiMessages: Record<string, any>[];diff --git a/tests/_pyodide/test_pyodide_session.py b/tests/_pyodide/test_pyodide_session.pyindex 55d5031e18..af370187fa 100644--- a/tests/_pyodide/test_pyodide_session.py+++ b/tests/_pyodide/test_pyodide_session.py@@ -13,7 +13,7 @@ import msgspecimport pytestfrom marimo._ast.app_config import _AppConfig-from marimo._config.config import DEFAULT_CONFIG+from marimo._config.config import DEFAULT_CONFIG, merge_configfrom marimo._dependencies.dependencies import DependencyManagerfrom marimo._messaging.types import KernelMessagefrom marimo._pyodide.pyodide_session import (@@ -47,6 +47,7 @@ from marimo._runtime.commands import (SyncGraphCommand,UpdateCellConfigCommand,UpdateUIElementCommand,+ UpdateUserConfigCommand,ValidateSQLCommand,)from marimo._runtime.context.types import teardown_context@@ -827,19 +828,40 @@ def test_pyodide_bridge_save_app_config(def test_pyodide_bridge_save_user_config(pyodide_bridge: PyodideBridge,) -> None:- """Test saving user config through the bridge."""+ pyodide_bridge.session._initial_user_config = merge_config(+ DEFAULT_CONFIG,+ {+ "ai": {+ "open_ai": {"api_key": "configured-key"},+ "mode": "manual",+ }+ },+ )request_json = json.dumps({"config": {- "completion": {"activate_on_typing": True},+ "ai": {"models": {"chat_model": "openai/gpt-4o"}},}})pyodide_bridge.save_user_config(request_json)- # Should have put a UpdateUserConfigRequest in the queue- assert not pyodide_bridge.session._queue_manager.control_queue.empty()+ command = pyodide_bridge.session._queue_manager.control_queue.get_nowait()+ assert isinstance(command, UpdateUserConfigCommand)+ assert command.config["ai"]["open_ai"]["api_key"] == "configured-key"+ assert command.config["ai"]["mode"] == "manual"+ assert command.config["ai"]["models"]["chat_model"] == "openai/gpt-4o"++ pyodide_bridge.save_user_config(+ json.dumps({"config": {"ai": {"mode": "agent"}}})+ )++ command = pyodide_bridge.session._queue_manager.control_queue.get_nowait()+ assert isinstance(command, UpdateUserConfigCommand)+ assert command.config["ai"]["open_ai"]["api_key"] == "configured-key"+ assert command.config["ai"]["mode"] == "agent"+ assert command.config["ai"]["models"]["chat_model"] == "openai/gpt-4o"def test_pyodide_bridge_rename_file(diff --git a/tests/_server/ai/test_providers.py b/tests/_server/ai/test_providers.pyindex ab41747ba9..788fe93ee1 100644--- a/tests/_server/ai/test_providers.py+++ b/tests/_server/ai/test_providers.py@@ -858,6 +858,7 @@ async def test_stream_completion_harness_wires_execute_code_toolset() -> None:request=request,max_tokens=1234,stream_options=stream_options,+ enable_capabilities=False,)assert result is streaming_response@@ -980,7 +981,8 @@ def test_custom_provider_non_openrouter_omits_cache_settings() -> None:@pytest.mark.requires("pydantic_ai")def test_build_agent_capabilities_from_native_tool_support() -> None:"""Provider-adaptive tools are enabled based on the model profile's- supported native tools when no local search/fetch deps are installed."""+ supported native tools when no local search/fetch deps are installed+ and web search is explicitly turned on."""from pydantic_ai.native_tools import (WebFetchTool,WebSearchTool,@@ -1012,6 +1014,36 @@ def test_build_agent_capabilities_from_native_tool_support() -> None:][email protected]("pydantic_ai")+def test_build_agent_capabilities_uses_local_fallbacks() -> None:+ """Enabled web capabilities use local fallbacks without native support."""+ config = AnyProviderConfig(api_key="test-key", base_url="http://test-url")+ provider = OpenAIProvider("gpt-4", config)++ model = MagicMock(name="model")+ model.profile.supported_native_tools = set()+ web_search = MagicMock(name="web_search")+ web_fetch = MagicMock(name="web_fetch")++ with (+ patch.object(+ DependencyManager.duckduckgo_search, "has", return_value=True+ ),+ patch.object(DependencyManager.markdownify, "has", return_value=True),+ patch(+ "pydantic_ai.capabilities.WebSearch", return_value=web_search+ ) as mock_web_search,+ patch(+ "pydantic_ai.capabilities.WebFetch", return_value=web_fetch+ ) as mock_web_fetch,+ ):+ capabilities = provider._build_agent_capabilities(model)++ assert capabilities == [web_search, web_fetch]+ mock_web_search.assert_called_once_with(local="duckduckgo")+ mock_web_fetch.assert_called_once_with(local=True)++@pytest.mark.requires("pydantic_ai")def test_build_agent_capabilities_empty_without_support_or_deps() -> None:"""No capabilities are added when the model supports no native tools anddiff --git a/tests/_server/api/endpoints/test_ai.py b/tests/_server/api/endpoints/test_ai.pyindex d6c787a153..e466dd5ad6 100644--- a/tests/_server/api/endpoints/test_ai.py+++ b/tests/_server/api/endpoints/test_ai.py@@ -394,6 +394,10 @@ class TestAnthropicAiEndpoints:_assert_completion_prompt_in_messages(stream_completion_mock, "Help me create a dataframe")+ assert (+ stream_completion_mock.call_args.kwargs["enable_capabilities"]+ is False+ )@staticmethod@with_session(SESSION_ID)@@ -546,6 +550,7 @@ class TestGoogleAiEndpoints:# Assert the prompt it was called withcompletion_mock.assert_called_once()call_kwargs = completion_mock.call_args.kwargs+ assert call_kwargs["enable_capabilities"] is Falsemessages = call_kwargs["messages"]assert len(messages) == 1assert messages[0].parts[0].text == (@@ -679,11 +684,16 @@ def test_chat_without_code("includeOtherCode": "","context": {},"id": "123",+ "options": {"webSearch": True},},)assert response.status_code == 200, response.text# Verify stream_completion was calledmock_stream_completion.assert_called_once()+ assert (+ mock_stream_completion.call_args.kwargs["enable_capabilities"]+ is True+ )@pytest.mark.requires("openai", "pydantic_ai")@@ -725,6 +735,10 @@ def test_chat_with_code(assert response.status_code == 200, response.text# Verify stream_completion was calledmock_stream_completion.assert_called_once()+ assert (+ mock_stream_completion.call_args.kwargs["enable_capabilities"]+ is False+ )def _openai_config_code_mode() -> dict[str, Any]:@@ -772,6 +786,7 @@ def test_chat_code_mode_routes_to_harness("includeOtherCode": "","context": {},"id": "123",+ "options": {"webSearch": True},},)@@ -784,6 +799,7 @@ def test_chat_code_mode_routes_to_harness(# skill-loading path).kwargs = mock_harness.call_args.kwargsassert kwargs["session"] is not None+ assert kwargs["enable_capabilities"] is Trueassert "how to work with marimo" in kwargs["system_prompt"]