Skip to content

change ff name, chat_mode #6582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 29, 2025
Merged

change ff name, chat_mode #6582

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
554de35
change ff name, chat_mode
mscolnick Sep 29, 2025
ad04a17
chat_modes
mscolnick Sep 29, 2025
4d0a8d8
fix
mscolnick Sep 29, 2025
c05bf48
enable chat modes
mscolnick Sep 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/src/components/app-config/user-config-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1361,7 +1361,7 @@ export const UserConfigForm: React.FC = () => {
/>
<FormField
control={form.control}
name="experimental.mcp_docs"
name="experimental.chat_mode"
render={({ field }) => (
<div className="flex flex-col gap-y-1">
<FormItem className={formItemClasses}>
Expand All @@ -1376,7 +1376,7 @@ export const UserConfigForm: React.FC = () => {
</FormItem>
<IsOverridden
userConfig={config}
name="experimental.mcp_docs"
name="experimental.chat_mode"
/>
<FormDescription>
Switch between different modes in the Chat sidebar, to
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/chat/chat-panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ const ChatInputFooter: React.FC<ChatInputFooterProps> = memo(
<TooltipProvider>
<div className="px-3 py-2 border-t border-border/20 flex flex-row items-center justify-between">
<div className="flex items-center gap-2">
<FeatureFlagged feature="mcp_docs">
<FeatureFlagged feature="chat_mode">
<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 capitalize">
{currentMode}
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/core/config/feature-flag.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export interface ExperimentalFeatures {
rtc_v2: boolean;
performant_table_charts: boolean;
mcp_docs: boolean;
chat_mode: boolean;
sql_linter: boolean;
external_agents: boolean;
sql_mode: boolean;
Expand All @@ -25,6 +26,7 @@ const defaultValues: ExperimentalFeatures = {
rtc_v2: false,
performant_table_charts: false,
mcp_docs: false,
chat_mode: false,
sql_linter: true,
external_agents: import.meta.env.DEV,
sql_mode: false,
Expand Down
1 change: 1 addition & 0 deletions marimo/_config/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,7 @@ class ExperimentalConfig(TypedDict, total=False):
rtc_v2: bool
performant_table_charts: bool
mcp_docs: bool
chat_mode: bool
sql_linter: bool
sql_mode: bool

Expand Down
2 changes: 1 addition & 1 deletion marimo/_server/ai/tools/tool_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def _enable_mcp_tools(self) -> bool:
# This may be stale but it is ok, since we want to enable MCP on startup
app_state = AppState.from_app(self.app)
config = app_state.config_manager.get_config()
return bool(config.get("experimental", {}).get("mcp_docs", False))
return bool(config.get("experimental", {}).get("chat_mode", False))

@once
def _init_backend_tools(self) -> None:
Expand Down
Loading