Skip to content

The open-source agent harness - the runtime layer that turns an LLM into a working agent.

Update button styles and enhance MCP server configuration in TrueForge UI (#594)

Govinda Vashishtha64ca089ee4f3
diff --git a/.changeset/hide-clear-chat-on-fresh-thread.md b/.changeset/hide-clear-chat-on-fresh-thread.md
new file mode 100644
index 000000000..e224d549c
--- /dev/null
+++ b/.changeset/hide-clear-chat-on-fresh-thread.md
@@ -0,0 +1,5 @@
+---
+'@truefoundry/trueforge-ui': patch
+---
+
+Hide Clear chat while the thread is fresh (New Chat, New Agent, and Try Agent) since there is nothing to clear.
diff --git a/.changeset/mcp-pill-preload-toggle.md b/.changeset/mcp-pill-preload-toggle.md
new file mode 100644
index 000000000..37bc2f6de
--- /dev/null
+++ b/.changeset/mcp-pill-preload-toggle.md
@@ -0,0 +1,5 @@
+---
+'@truefoundry/trueforge-ui': patch
+---
+
+Add a book-icon preload toggle and dashed add button to Agent Config MCP server pills.
diff --git a/.changeset/mcp-selector-modal-revamp.md b/.changeset/mcp-selector-modal-revamp.md
new file mode 100644
index 000000000..398b77afe
--- /dev/null
+++ b/.changeset/mcp-selector-modal-revamp.md
@@ -0,0 +1,5 @@
+---
+'@truefoundry/trueforge-ui': patch
+---
+
+Revamp the MCP tools selector modal with focus rows, connect empty state, and grouped selected-tools summary.
diff --git a/packages/frontend/src/App.tsx b/packages/frontend/src/App.tsx
index f9e475c7a..becd28fca 100644
--- a/packages/frontend/src/App.tsx
+++ b/packages/frontend/src/App.tsx
@@ -12,6 +12,7 @@ import { probeSession, type SessionState } from './authSession';
import { parseAuthErrorReason, shouldShowAuthErrorScreen, stripAuthErrorSearch } from './authStatusSearch';
import { GetStartedScreen } from './GetStartedScreen';
import { LogoutButton } from './LogoutButton';
+import { NewAgentWelcomeScreen } from './NewAgentWelcomeScreen';
import { API_BASE_URL, uiRouterBasename } from './publicPath';
/** Shared cookie/OIDC fetch for boot helpers and `<TrueForgeUI server />`. */
@@ -116,7 +117,10 @@ export function App() {
};
}, [session]);
- const overrides: SlotOverrides = useMemo(() => ({ ShellActionsActionSlot: LogoutButton }), []);
+ const overrides: SlotOverrides = useMemo(
+ () => ({ ShellActionsActionSlot: LogoutButton, WelcomeScreen: NewAgentWelcomeScreen }),
+ [],
+ );
const authErrorReason = shouldShowAuthErrorScreen({ authError, session });
if (authErrorReason != null) {
diff --git a/packages/frontend/src/NewAgentWelcomeScreen.tsx b/packages/frontend/src/NewAgentWelcomeScreen.tsx
new file mode 100644
index 000000000..a5abce71a
--- /dev/null
+++ b/packages/frontend/src/NewAgentWelcomeScreen.tsx
@@ -0,0 +1,19 @@
+import { useOptionalShellMode, WelcomeScreen, type WelcomeScreenProps } from '@truefoundry/trueforge-ui';
+
+/**
+ * WelcomeScreen override: New Agent empty state gets a polka-dot canvas
+ * (see `.new-agent-welcome` + viewport `:has()` rule in `index.css`).
+ * Named chats and plain New Chat keep the default welcome.
+ */
+export function NewAgentWelcomeScreen(props: WelcomeScreenProps) {
+ const shell = useOptionalShellMode();
+ const isNewAgent =
+ shell?.mode.status === 'active' &&
+ shell.mode.isMutable &&
+ shell.mode.isCreateAgent &&
+ !(shell.mode.agentName != null && shell.mode.agentName.length > 0);
+
+ const className = [isNewAgent ? 'new-agent-welcome' : undefined, props.className].filter(Boolean).join(' ');
+
+ return <WelcomeScreen {...props} {...(className ? { className } : {})} />;
+}
diff --git a/packages/frontend/src/index.css b/packages/frontend/src/index.css
index d3a80c1aa..80fed6568 100644
--- a/packages/frontend/src/index.css
+++ b/packages/frontend/src/index.css
@@ -22,6 +22,17 @@ body {
height: 100%;
}
+/* New Agent welcome only: polka-dot canvas on the empty thread viewport.
+ `.new-agent-welcome` is set by NewAgentWelcomeScreen; WelcomeScreen unmounts once the thread has messages. */
+[data-slot='aui_thread-viewport']:has(.new-agent-welcome) {
+ background-image: radial-gradient(
+ circle,
+ color-mix(in oklab, var(--border, #d4d4d8) 85%, transparent) 1px,
+ transparent 1px
+ );
+ background-size: 1.25rem 1.25rem;
+}
+
.boot-screen {
min-height: 100dvh;
display: grid;
diff --git a/packages/trueforge-ui/src/atoms/AgentsLibraryButton.tsx b/packages/trueforge-ui/src/atoms/AgentsLibraryButton.tsx
index fd5ebc6d8..6fb9a3967 100644
--- a/packages/trueforge-ui/src/atoms/AgentsLibraryButton.tsx
+++ b/packages/trueforge-ui/src/atoms/AgentsLibraryButton.tsx
@@ -52,9 +52,9 @@ export function AgentsLibraryButton({ className, compact = false }: AgentsLibrar
className={auiButtonClass({
variant: 'ghost',
className: cn(
- 'rounded-md text-sm font-medium text-text-primary shadow-none hover:bg-ghost-button-hover hover:text-ghost-button-text',
+ 'rounded-md text-sm font-medium text-text-primary shadow-none hover:bg-secondary-button-hover hover:text-ghost-button-text',
compact
- ? 'h-auto w-full flex-col gap-0.5 whitespace-normal px-1 py-1.5 text-[10px] leading-tight !justify-center'
+ ? 'h-auto w-full flex-col gap-0.5 whitespace-normal px-1 py-3 text-[0.625rem] leading-tight !justify-center'
: 'h-8 w-full !justify-start px-2.5',
libraryOpen &&
'bg-primary-button-bg text-primary-button-text hover:bg-primary-button-hover hover:text-primary-button-text',
diff --git a/packages/trueforge-ui/src/atoms/ClearChatButton.tsx b/packages/trueforge-ui/src/atoms/ClearChatButton.tsx
index 0e49ec293..1a8df3128 100644
--- a/packages/trueforge-ui/src/atoms/ClearChatButton.tsx
+++ b/packages/trueforge-ui/src/atoms/ClearChatButton.tsx
@@ -5,7 +5,8 @@ import { Icon } from '../icons/Icon.js';
import { useOptionalShellMode } from '../server/ShellModeContext.js';
import { auiButtonClass } from './lib/buttonClasses.js';
-// Resets the current chat / draft (Try Agent, New Chat, New Agent, Edit). Hidden while idle.
+// Resets the current chat / draft (Try Agent, New Chat, New Agent, Edit).
+// Hidden while idle and on a fresh chat.
export function ClearChatButton() {
const shell = useOptionalShellMode();
const visible = useChatChromeActionsVisible();
diff --git a/packages/trueforge-ui/src/atoms/ComposerShell.tsx b/packages/trueforge-ui/src/atoms/ComposerShell.tsx
index fc9708673..d711c7837 100644
--- a/packages/trueforge-ui/src/atoms/ComposerShell.tsx
+++ b/packages/trueforge-ui/src/atoms/ComposerShell.tsx
@@ -43,7 +43,7 @@ export function ComposerShell({
<div
data-slot="aui_composer-shell"
className={cn(
- 'focus-within:ring-focus-ring/20 flex w-full flex-col gap-2 rounded-[0.75rem] border border-transparent bg-card-bg p-[var(--composer-padding,0.5rem)] shadow-[0_1.25rem_1.875rem_-1.25rem_color-mix(in_oklab,var(--primary-button-bg)_8%,transparent)] transition-colors focus-within:ring-3',
+ 'focus-within:ring-focus-ring/20 flex w-full flex-col gap-2 rounded-[0.75rem] border border-transparent bg-card-bg p-[var(--composer-padding,0.5rem)] shadow-[0_1.25rem_1.875rem_-1.25rem_color-mix(in_oklab,var(--primary-button-bg)_8%,transparent),0_0.75rem_1.25rem_-0.25rem_color-mix(in_oklab,var(--primary-button-bg)_8%,transparent)] transition-colors focus-within:ring-3',
// Gradient hairline from theme primary (faded at top → solid at bottom).
// padding-box paints the surface; border-box bleeds the ramp into the transparent border.
'[background-clip:padding-box,border-box] [background-image:linear-gradient(var(--card-bg),var(--card-bg)),linear-gradient(to_bottom,color-mix(in_oklab,var(--primary-button-bg)_25%,transparent),var(--primary-button-bg))] [background-origin:border-box]',
diff --git a/packages/trueforge-ui/src/atoms/NamedAgentHeaderLabel.tsx b/packages/trueforge-ui/src/atoms/NamedAgentHeaderLabel.tsx
index 5bea8eefd..668051e87 100644
--- a/packages/trueforge-ui/src/atoms/NamedAgentHeaderLabel.tsx
+++ b/packages/trueforge-ui/src/atoms/NamedAgentHeaderLabel.tsx
@@ -16,7 +16,13 @@ export function NamedAgentHeaderLabel({ className }: { className?: string }) {
const displayName = state.allowThreadTitle && syncedTitle.length > 0 ? syncedTitle : state.name;
return (
- <h1 className={cn('flex min-w-0 items-center gap-1.5 px-1 text-sm font-medium text-text-primary', className)}>
+ <h1
+ className={cn(
+ // Match sm/icon chrome buttons so header height doesn't collapse when Clear/Save hide.
+ 'flex min-h-8 min-w-0 items-center gap-1.5 px-1 text-sm font-medium text-text-primary',
+ className,
+ )}
+ >
<Icon name={state.icon} className="size-3.5 shrink-0" />
<span className="truncate" title={displayName}>
{displayName}
diff --git a/packages/trueforge-ui/src/atoms/SchedulesButton.tsx b/packages/trueforge-ui/src/atoms/SchedulesButton.tsx
index ffa6d5190..97ba40107 100644
--- a/packages/trueforge-ui/src/atoms/SchedulesButton.tsx
+++ b/packages/trueforge-ui/src/atoms/SchedulesButton.tsx
@@ -30,9 +30,9 @@ export function SchedulesButton({ className, compact = false }: SchedulesButtonP
className={auiButtonClass({
variant: 'ghost',
className: cn(
- 'rounded-md text-sm font-medium text-text-primary shadow-none hover:bg-ghost-button-hover hover:text-ghost-button-text',
+ 'rounded-md text-sm font-medium text-text-primary shadow-none hover:bg-secondary-button-hover hover:text-ghost-button-text',
compact
- ? 'h-auto w-full flex-col gap-0.5 whitespace-normal px-1 py-1.5 text-[10px] leading-tight !justify-center'
+ ? 'h-auto w-full flex-col gap-0.5 whitespace-normal px-1 py-3 text-[0.625rem] leading-tight !justify-center'
: 'h-8 w-full !justify-start px-2.5',
open &&
'bg-primary-button-bg text-primary-button-text hover:bg-primary-button-hover hover:text-primary-button-text',
diff --git a/packages/trueforge-ui/src/atoms/SessionsBrowserButton.tsx b/packages/trueforge-ui/src/atoms/SessionsBrowserButton.tsx
index 944586b34..0669dbc16 100644
--- a/packages/trueforge-ui/src/atoms/SessionsBrowserButton.tsx
+++ b/packages/trueforge-ui/src/atoms/SessionsBrowserButton.tsx
@@ -31,9 +31,9 @@ export function SessionsBrowserButton({ className, compact = false }: SessionsBr
className={auiButtonClass({
variant: 'ghost',
className: cn(
- 'rounded-md text-sm font-medium text-text-primary shadow-none hover:bg-ghost-button-hover hover:text-ghost-button-text',
+ 'rounded-md text-sm font-medium text-text-primary shadow-none hover:bg-secondary-button-hover hover:text-ghost-button-text',
compact
- ? 'h-auto w-full flex-col gap-0.5 whitespace-normal px-1 py-1.5 text-[10px] leading-tight !justify-center'
+ ? 'h-auto w-full flex-col gap-0.5 whitespace-normal px-1 py-3 text-[0.625rem] leading-tight !justify-center'
: 'h-8 w-full !justify-start px-2.5',
sessionsOpen &&
'bg-primary-button-bg text-primary-button-text hover:bg-primary-button-hover hover:text-primary-button-text',
diff --git a/packages/trueforge-ui/src/atoms/ShellActions.tsx b/packages/trueforge-ui/src/atoms/ShellActions.tsx
index 3fb504b9e..dfee5b77a 100644
--- a/packages/trueforge-ui/src/atoms/ShellActions.tsx
+++ b/packages/trueforge-ui/src/atoms/ShellActions.tsx
@@ -20,13 +20,14 @@ export function ShellActions({ className, labeled = false }: { className?: strin
const settingsChromeEnabled = isSettingsChromeEnabled({ catalog, capabilities });
const labeledButtonClass =
- 'h-auto w-full flex-col gap-0.5 whitespace-normal px-1 py-1.5 text-[10px] leading-tight !justify-center';
+ 'h-auto w-full flex-col gap-0.5 whitespace-normal px-1 py-3 text-[0.625rem] leading-tight !justify-center';
+ const hoverClass = 'hover:bg-secondary-button-hover hover:text-ghost-button-text';
return (
<div
className={cn(
'flex shrink-0 items-center gap-1 text-text-primary',
- labeled && 'w-full flex-col gap-2',
+ labeled && 'w-full flex-col gap-1',
className,
)}
>
@@ -37,7 +38,7 @@ export function ShellActions({ className, labeled = false }: { className?: strin
className={auiButtonClass({
variant: 'ghost',
size: labeled ? undefined : 'icon',
- className: labeled ? labeledButtonClass : undefined,
+ className: cn(hoverClass, labeled && labeledButtonClass),
})}
onClick={() => setTheme(isDark ? 'light' : 'dark')}
>
@@ -55,7 +56,8 @@ export function ShellActions({ className, labeled = false }: { className?: strin
variant: 'ghost',
size: labeled ? undefined : 'icon',
className: cn(
- labeled ? labeledButtonClass : undefined,
+ hoverClass,
+ labeled && labeledButtonClass,
shell.settingsOpen &&
'bg-primary-button-bg text-primary-button-text hover:bg-primary-button-hover hover:text-primary-button-text',
),
diff --git a/packages/trueforge-ui/src/atoms/ThreadListMisc.tsx b/packages/trueforge-ui/src/atoms/ThreadListMisc.tsx
index 99a066f54..da4e5b0cb 100644
--- a/packages/trueforge-ui/src/atoms/ThreadListMisc.tsx
+++ b/packages/trueforge-ui/src/atoms/ThreadListMisc.tsx
@@ -16,7 +16,7 @@ export function ThreadListNewButton({ className, children, style, ...rest }: Thr
className={auiButtonClass({
variant: 'ghost',
className: cn(
- '!justify-start h-8 px-2.5 text-sm font-medium text-text-primary shadow-none hover:bg-ghost-button-hover hover:text-ghost-button-text',
+ '!justify-start h-8 px-2.5 text-sm font-medium text-text-primary shadow-none hover:bg-secondary-button-hover hover:text-ghost-button-text',
className,
),
})}
diff --git a/packages/trueforge-ui/src/atoms/draft/AgentConfigEditors.tsx b/packages/trueforge-ui/src/atoms/draft/AgentConfigEditors.tsx
index 3f564a848..ca8836fb7 100644
--- a/packages/trueforge-ui/src/atoms/draft/AgentConfigEditors.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/AgentConfigEditors.tsx
@@ -51,11 +51,11 @@ export function AgentConfigEditors({
const mounts = useMemo(() => editableMountsFromSpec(spec.mcpServers), [spec.mcpServers]);
const activeConnectorAvailable =
activeConnectorId !== null && connectors.some(connector => connector.id === activeConnectorId);
+ const firstMountedConnectorId = mounts
+ .map(mount => connectors.find(connector => connector.id === mount.id || connector.name === mount.name)?.id)
+ .find((id): id is string => id !== undefined);
const selectedConnectorId =
- (activeConnectorAvailable ? activeConnectorId : null) ??
- connectors.find(connector => mounts.some(mount => mount.id === connector.id || mount.name === connector.name))
- ?.id ??
- null;
+ (activeConnectorAvailable ? activeConnectorId : null) ?? firstMountedConnectorId ?? connectors[0]?.id ?? null;
useEffect(() => {
if (editor !== 'mcp' || selectedConnectorId === null || loadMcpTools === undefined) return;
diff --git a/packages/trueforge-ui/src/atoms/draft/AgentConfigPanel.tsx b/packages/trueforge-ui/src/atoms/draft/AgentConfigPanel.tsx
index 661965040..a07f3d8d3 100644
--- a/packages/trueforge-ui/src/atoms/draft/AgentConfigPanel.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/AgentConfigPanel.tsx
@@ -6,9 +6,17 @@ import { Icon } from '../../icons/Icon.js';
import type { AgentSpec, ModelSelection } from '../../server/types.js';
import { useSlot } from '../../theme/SlotsProvider.js';
import { auiButtonClass } from '../lib/buttonClasses.js';
+import { cn } from '../lib/cn.js';
import { auiInputClass } from '../lib/inputClasses.js';
+import { Tooltip } from '../primitives/Tooltip.js';
import type { AgentConfigEditor } from './AgentConfigEditors.js';
-import { editableMountsFromSpec, enabledToolsFromMount } from './agentConfigMounts.js';
+import {
+ editableMountsFromSpec,
+ enabledToolsFromMount,
+ preloadFromMount,
+ withPreload,
+ type EditableMount,
+} from './agentConfigMounts.js';
import { displayModelLabel, ProviderMark } from './DraftModelCatalogPanel.js';
import { modelParamSummary } from './modelParamsSummary.js';
import { runtimeConfigSummary } from './runtimeConfigSummary.js';
@@ -30,6 +38,80 @@ function formatTokens(value: number): string {
return Intl.NumberFormat('en', { notation: 'compact', maximumFractionDigits: 1 }).format(value);
}
+function McpServerChip({
+ item,
+ onRemove,
+ onTogglePreload,
+}: {
+ item: EditableMount;
+ onRemove?: () => void;
+ onTogglePreload?: () => void;
+}) {
+ const enabled = enabledToolsFromMount(item.value);
+ const preload = preloadFromMount(item.value);
+ const toolsLabel = enabled === 'all' ? 'All tools' : `${enabled.length} tools`;
+
+ return (
+ <span className="flex items-center overflow-hidden rounded-md border border-border text-xs">
+ {onTogglePreload ? (
+ <Tooltip
+ side="bottom"
+ dismissOnClick={false}
+ triggerClassName="self-stretch"
+ className="w-64 whitespace-normal p-3 text-left shadow-lg"
+ content={
+ <span className="flex flex-col gap-1.5">
+ <span className="flex items-center justify-between gap-3">
+ <span className="font-semibold">Preload tools</span>
+ <span className="text-primary-button-bg text-[10px] font-semibold tracking-wide uppercase">
+ {preload ? 'ON' : 'OFF'}
+ </span>
+ </span>
+ <span className="text-text-secondary text-xs leading-snug">
+ Load MCP tool definitions in the agent context upfront. When off, the agent discovers tools dynamically
+ (uses less context upfront).
+ </span>
+ </span>
+ }
+ >
+ <button
+ type="button"
+ aria-pressed={preload}
+ aria-label={`Preload tools for ${item.name}`}
+ className={cn(
+ 'flex h-full items-center justify-center border-r border-border px-1.5 transition-colors',
+ preload
+ ? 'bg-primary-button-bg text-primary-button-text'
+ : 'text-text-secondary hover:bg-ghost-button-hover',
+ )}
+ onClick={onTogglePreload}
+ >
+ <Icon name="book-open" className="size-3.5" />
+ </button>
+ </Tooltip>
+ ) : null}
+ <span className="py-1 pl-2">{item.name}</span>
+ <span className="text-text-secondary ml-1 py-1">{toolsLabel}</span>
+ {onRemove ? (
+ <button
+ type="button"
+ aria-label={`Remove ${item.name}`}
+ className={auiButtonClass({
+ variant: 'ghost',
+ size: 'icon',
+ className: 'mx-1 size-5',
+ })}
+ onClick={onRemove}
+ >
+ <Icon name="xmark" className="size-3" />
+ </button>
+ ) : (
+ <span className="pr-2" />
+ )}
+ </span>
+ );
+}
+
export function AgentConfigSection({
title,
description,
@@ -197,47 +279,58 @@ export function AgentConfigPanel({
</dl>
</Section>
- <Section title="MCP Servers" onEdit={() => onOpenEditor('mcp')}>
+ <section className="group border-b border-border px-4 py-4">
+ <div className={cn('flex items-center justify-between gap-3', mcp.length ? 'mb-3' : null)}>
+ <div className="flex min-w-0 items-center gap-2">
+ <Icon name="mcp-server" className="text-text-secondary size-4 shrink-0" />
+ <h3 className="text-text-primary text-sm font-semibold">MCP Servers</h3>
+ </div>
+ <button
+ type="button"
+ aria-label="Add MCP server"
+ className={auiButtonClass({
+ variant: 'ghost',
+ size: 'icon',
+ className: 'size-7 opacity-0 transition-opacity group-hover:opacity-100 focus-visible:opacity-100',
+ })}
+ onClick={() => onOpenEditor('mcp')}
+ >
+ <Icon name="plus" className="size-3.5" />
+ </button>
+ </div>
{mcp.length ? (
<div className="flex flex-wrap gap-1.5">
- {mcp.map(item => {
- const enabled = enabledToolsFromMount(item.value);
- return (
- <span
- key={item.id}
- className="flex items-center rounded-md border border-border py-1 pr-1 pl-2 text-xs"
- >
- <span>{item.name}</span>
- <span className="text-text-secondary ml-1">
- {enabled === 'all' ? 'All tools' : `${enabled.length} tools`}
- </span>
- {onChange ? (
- <button
- type="button"
- aria-label={`Remove ${item.name}`}
- className={auiButtonClass({
- variant: 'ghost',
- size: 'icon',
- className: 'ml-1 size-5',
- })}
- onClick={() =>
+ {mcp.map(item => (
+ <McpServerChip
+ key={item.id}
+ item={item}
+ onRemove={
+ onChange
+ ? () =>
onChange({
...spec,
mcpServers: mcp.filter(mount => mount.id !== item.id).map(mount => mount.value),
})
- }
- >
- <Icon name="xmark" className="size-3" />
- </button>
- ) : null}
- </span>
- );
- })}
+ : undefined
+ }
+ onTogglePreload={
+ onChange
+ ? () =>
+ onChange({
+ ...spec,
+ mcpServers: mcp.map(mount =>
+ mount.id === item.id
+ ? withPreload(mount.value, !preloadFromMount(mount.value))
+ : mount.value,
+ ),
+ })
+ : undefined
+ }
+ />
+ ))}
</div>
- ) : (
- <p className="text-text-secondary text-xs">No MCP servers selected.</p>
- )}
- </Section>
+ ) : null}
+ </section>
<Section title="Skills" onEdit={() => onOpenEditor('skills')}>
{!skillsAvailable ? (
diff --git a/packages/trueforge-ui/src/atoms/draft/AgentMcpEditorContent.tsx b/packages/trueforge-ui/src/atoms/draft/AgentMcpEditorContent.tsx
index ac96f4943..ab7367c48 100644
--- a/packages/trueforge-ui/src/atoms/draft/AgentMcpEditorContent.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/AgentMcpEditorContent.tsx
@@ -2,14 +2,23 @@
import { useState } from 'react';
+import { useMCPAuth } from '../../hooks/useMcpAuth.js';
import { Icon } from '../../icons/Icon.js';
import type { AgentSpec, ConnectorState, McpToolSelection } from '../../server/types.js';
-import { useSlot } from '../../theme/SlotsProvider.js';
import { auiButtonClass } from '../lib/buttonClasses.js';
+import { cn } from '../lib/cn.js';
import { auiInputClass } from '../lib/inputClasses.js';
+import { CatalogLogo } from '../primitives/CatalogLogo.js';
+import { Spinner } from '../primitives/Spinner.js';
import { Switch } from '../primitives/Switch.js';
-import { isUnauthenticatedDcrConnector } from './DraftCompositeSelector.js';
-import { editableMountsFromSpec, enabledToolsFromMount, withEnabledTools, withPreload } from './agentConfigMounts.js';
+import { Tooltip } from '../primitives/Tooltip.js';
+import {
+ editableMountsFromSpec,
+ enabledToolsFromMount,
+ preloadFromMount,
+ withEnabledTools,
+ withPreload,
+} from './agentConfigMounts.js';
export type AgentMcpEditorContentProps = {
spec: AgentSpec;
@@ -26,6 +35,59 @@ export type AgentMcpEditorContentProps = {
onChange: (spec: AgentSpec) => void;
};
+function ToolCheckbox({ checked }: { checked: boolean }) {
+ return (
+ <span
+ className={cn(
+ 'flex size-4 shrink-0 items-center justify-center rounded border',
+ checked
+ ? 'border-primary-button-bg bg-primary-button-bg text-primary-button-text'
+ : 'border-input-border bg-input-box-bg',
+ )}
+ aria-hidden
+ >
+ {checked ? <Icon name="check" className="size-3" /> : null}
+ </span>
+ );
+}
+
+function ConnectorIcon({ connector }: { connector: ConnectorState }) {
+ const logo = Reflect.get(connector, 'logo');
+ if (typeof logo === 'string' && logo.trim() !== '') {
+ return <CatalogLogo src={logo} alt="" className="size-4 shrink-0 object-contain" aria-hidden />;
+ }
+ return <Icon name="mcp-server" className="text-text-secondary size-4 shrink-0" />;
+}
+
+function selectedToolsHeaderLabel(mcpMounts: ReturnType<typeof editableMountsFromSpec>): string {
+ if (mcpMounts.length === 0) return 'Selected Tools (0)';
+ const everyAll = mcpMounts.every(mount => enabledToolsFromMount(mount.value) === 'all');
+ if (everyAll) return 'Selected Tools (All)';
+ const count = mcpMounts.reduce((total, mount) => {
+ const enabled = enabledToolsFromMount(mount.value);
+ return enabled === 'all' ? total : total + enabled.length;
+ }, 0);
+ return `Selected Tools (${count})`;
+}
+
+function ConnectNowButton({ connectorId, onConnected }: { connectorId: string; onConnected: () => Promise<void> }) {
+ const { handleAuthorize, isOAuthLoading } = useMCPAuth();
+ return (
+ <button
+ type="button"
+ className={auiButtonClass({ className: 'min-w-44' })}
+ disabled={isOAuthLoading}
+ onClick={() => {
+ void handleAuthorize(connectorId, isSuccess => {
+ if (isSuccess) void onConnected();
+ });
+ }}
+ >
+ {isOAuthLoading ? 'Connecting...' : 'Connect Now'}
+ </button>
+ );
+}
+
export function AgentMcpEditorContent({
spec,
connectors,
@@ -40,30 +102,23 @@ export function AgentMcpEditorContent({
onRefreshConnectors,
onChange,
}: AgentMcpEditorContentProps) {
- const CatalogRow = useSlot('CatalogRow');
- const ConnectorConnectButton = useSlot('ConnectorConnectButton');
const [toolQuery, setToolQuery] = useState('');
+ const [collapsedMountIds, setCollapsedMountIds] = useState<ReadonlySet<string>>(() => new Set());
const mcpMounts = editableMountsFromSpec(spec.mcpServers);
const selectedConnector = connectors.find(item => item.id === activeConnectorId);
const activeMount = selectedConnector
? mcpMounts.find(item => item.id === selectedConnector.id || item.name === selectedConnector.name)
: undefined;
- const canAddActiveConnector =
- selectedConnector !== undefined &&
- (selectedConnector.authenticated === true || isUnauthenticatedDcrConnector(selectedConnector));
+ const needsAuth = selectedConnector?.authenticated === false;
+ const canAddActiveConnector = selectedConnector !== undefined && selectedConnector.authenticated === true;
const enabledTools = activeMount ? enabledToolsFromMount(activeMount.value) : [];
const normalizedQuery = query.trim().toLowerCase();
- const filteredConnectors = connectors
- .filter(item => `${item.name} ${item.description ?? ''}`.toLowerCase().includes(normalizedQuery))
- .sort((left, right) => {
- const leftSelected = mcpMounts.some(item => item.id === left.id || item.name === left.name);
- const rightSelected = mcpMounts.some(item => item.id === right.id || item.name === right.name);
- return Number(rightSelected) - Number(leftSelected);
- });
- const filteredTools = tools.filter(tool =>
- `${tool.name} ${tool.description ?? ''}`.toLowerCase().includes(toolQuery.trim().toLowerCase()),
+ const filteredConnectors = connectors.filter(item =>
+ `${item.name} ${item.description ?? ''}`.toLowerCase().includes(normalizedQuery),
);
- const activeToolsByName = new Map(tools.map(tool => [tool.name, tool]));
+ const normalizedToolQuery = toolQuery.trim().toLowerCase();
+ const filteredTools =
+ normalizedToolQuery === '' ? tools : tools.filter(tool => tool.name.toLowerCase().includes(normalizedToolQuery));
const updateMount = (mountId: string, value: object) => {
onChange({
@@ -79,6 +134,11 @@ export function AgentMcpEditorContent({
});
};
+ const openMountConnector = (mount: (typeof mcpMounts)[number]) => {
+ const match = connectors.find(item => item.id === mount.id || item.name === mount.name);
+ onSelectConnector(match?.id ?? mount.id);
+ };
+
const toggleTool = (toolName: string) => {
if (!selectedConnector) return;
if (!activeMount) {
@@ -102,22 +162,20 @@ export function AgentMcpEditorContent({
}
};
- const toggleSelectedTool = (mountId: string, toolName: string) => {
- const mount = mcpMounts.find(item => item.id === mountId);
- if (!mount) return;
- const enabled = enabledToolsFromMount(mount.value);
- if (enabled === 'all') return;
- const next = enabled.filter(name => name !== toolName);
- if (next.length === 0) {
- removeMount(mount.id);
- } else {
- updateMount(mount.id, withEnabledTools(mount.value, next));
- }
+ const connectDuringChat = () => {
+ if (!selectedConnector || activeMount !== undefined) return;
+ onChange({
+ ...spec,
+ mcpServers: [
+ ...(spec.mcpServers ?? []),
+ withEnabledTools({ id: selectedConnector.id, name: selectedConnector.name }, 'all'),
+ ],
+ });
};
return (
- <div className="grid h-[min(36rem,calc(100dvh-8rem))] w-full min-w-0 grid-cols-1 overflow-hidden md:grid-cols-[14rem_minmax(0,1fr)_14rem]">
- <div className="flex min-h-0 min-w-0 flex-col border-r border-border">
+ <div className="flex h-[min(36rem,calc(100dvh-10rem))] w-full min-w-0 flex-col overflow-hidden md:grid md:grid-cols-[14rem_minmax(0,1fr)_14rem]">
+ <div className="flex max-h-44 min-h-0 min-w-0 flex-col border-b border-border md:max-h-none md:border-r md:border-b-0 bg-sidebar-bg">
<label className="relative m-3 block shrink-0">
<Icon name="search" className="text-text-secondary absolute top-1/2 left-2 size-3.5 -translate-y-1/2" />
<input
@@ -129,174 +187,250 @@ export function AgentMcpEditorContent({
</label>
<div className="min-h-0 flex-1 overflow-y-auto p-2">
{filteredConnectors.map(connector => {
- const mount = mcpMounts.find(item => item.id === connector.id || item.name === connector.name);
- const needsConnect = isUnauthenticatedDcrConnector(connector);
+ const mounted = mcpMounts.some(item => item.id === connector.id || item.name === connector.name);
+ const active = connector.id === activeConnectorId;
return (
- <CatalogRow
+ <button
key={connector.id}
- title={connector.name}
- description={connector.description}
- checked={mount !== undefined}
- disabled={!connector.authenticated && !needsConnect && mount === undefined}
- onActivate={() => onSelectConnector(connector.id)}
- onToggle={() => {
- if (mount === undefined) {
- onChange({
- ...spec,
- mcpServers: [...(spec.mcpServers ?? []), { id: connector.id, name: connector.name }],
- });
- onSelectConnector(connector.id);
- } else {
- onChange({
- ...spec,
- mcpServers: mcpMounts.filter(item => item !== mount).map(item => item.value),
- });
- }
- }}
- action={
- needsConnect && onRefreshConnectors ? (
- <ConnectorConnectButton connector={connector} onConnected={onRefreshConnectors} />
- ) : undefined
- }
- />
+ type="button"
+ aria-current={active ? 'true' : undefined}
+ aria-label={connector.name}
+ className={cn(
+ 'flex w-full cursor-pointer items-center gap-2 rounded-md px-2 py-2 text-left',
+ active ? 'bg-primary-button-bg/10' : 'hover:bg-ghost-button-hover',
+ )}
+ onClick={() => onSelectConnector(connector.id)}
+ >
+ <ConnectorIcon connector={connector} />
+ <span className="text-text-primary min-w-0 flex-1 truncate text-sm font-medium">{connector.name}</span>
+ {mounted ? (
+ <span
+ className="bg-success-bg text-success-text flex size-3 shrink-0 items-center justify-center rounded-full"
+ aria-label={`${connector.name} selected`}
+ >
+ <Icon name="check" className="size-2" />
+ </span>
+ ) : null}
+ </button>
);
})}
</div>
</div>
- <div className="flex min-h-0 min-w-0 flex-col border-r border-border">
+ <div className="flex min-h-0 min-w-0 flex-1 flex-col border-b border-border md:border-r md:border-b-0">
{selectedConnector ? (
- <>
- <div className="flex shrink-0 items-center justify-between gap-3 border-b border-border p-3">
- <p className="min-w-0 truncate text-sm font-semibold">
- {selectedConnector.name} Tools ({tools.length})
- </p>
- <label className="text-text-secondary flex shrink-0 items-center gap-2 text-xs">
- Enable all tools
- <Switch
- checked={activeMount !== undefined && enabledTools === 'all'}
- disabled={activeMount === undefined && !canAddActiveConnector}
- onCheckedChange={enabled => {
- if (activeMount) {
- if (enabled) {
- updateMount(activeMount.id, withEnabledTools(activeMount.value, 'all'));
- } else {
- removeMount(activeMount.id);
+ needsAuth ? (
+ <div className="flex min-h-0 flex-1 flex-col items-center justify-center gap-4 p-6 text-center">
+ <Icon name="lock" className="text-text-secondary size-10" />
+ <p className="text-text-primary text-sm font-semibold">You&apos;re not connected to this MCP Server</p>
+ {onRefreshConnectors ? (
+ <ConnectNowButton connectorId={selectedConnector.id} onConnected={onRefreshConnectors} />
+ ) : null}
+ <div className="text-text-secondary flex w-full max-w-xs items-center gap-3 text-xs">
+ <span className="bg-border h-px flex-1" />
+ OR
+ <span className="bg-border h-px flex-1" />
+ </div>
+ <button
+ type="button"
+ className={auiButtonClass({ variant: 'outline', className: 'min-w-44' })}
+ disabled={activeMount !== undefined}
+ onClick={connectDuringChat}
+ >
+ Connect During Chat
+ </button>
+ </div>
+ ) : (
+ <>
+ <div className="flex shrink-0 items-center justify-between gap-3 border-b border-border p-3">
+ <p className="min-w-0 truncate text-sm font-semibold">
+ {selectedConnector.name} Tools ({tools.length})
+ </p>
+ <label className="text-text-secondary flex shrink-0 cursor-pointer items-center gap-2 text-xs has-[:disabled]:cursor-not-allowed">
+ Enable All Tools
+ <Switch
+ checked={activeMount !== undefined && enabledTools === 'all'}
+ disabled={!canAddActiveConnector && activeMount === undefined}
+ onCheckedChange={enabled => {
+ if (activeMount) {
+ if (enabled) {
+ updateMount(activeMount.id, withEnabledTools(activeMount.value, 'all'));
+ } else {
+ removeMount(activeMount.id);
+ }
+ } else if (enabled && canAddActiveConnector) {
+ onChange({
+ ...spec,
+ mcpServers: [
+ ...(spec.mcpServers ?? []),
+ withEnabledTools({ id: selectedConnector.id, name: selectedConnector.name }, 'all'),
+ ],
+ });
}
- } else if (enabled && canAddActiveConnector) {
- onChange({
- ...spec,
- mcpServers: [
- ...(spec.mcpServers ?? []),
- withEnabledTools({ id: selectedConnector.id, name: selectedConnector.name }, 'all'),
- ],
- });
- }
- }}
- aria-label="Enable all tools"
+ }}
+ aria-label="Enable all tools"
+ />
+ </label>
+ </div>
+ <label className="relative m-3 block shrink-0">
+ <Icon name="search" className="text-text-secondary absolute top-1/2 left-2 size-3.5 -translate-y-1/2" />
+ <input
+ value={toolQuery}
+ onChange={event => setToolQuery(event.target.value)}
+ placeholder="Search Tools"
+ className={auiInputClass('h-9 w-full pl-7')}
/>
</label>
- </div>
- <label className="relative m-3 block shrink-0">
- <Icon name="search" className="text-text-secondary absolute top-1/2 left-2 size-3.5 -translate-y-1/2" />
- <input
- value={toolQuery}
- onChange={event => setToolQuery(event.target.value)}
- placeholder="Search tools"
- className={auiInputClass('h-9 w-full pl-7')}
- />
- </label>
- <div className="min-h-0 flex-1 overflow-y-auto px-2 pb-2">
- {toolsLoading ? <p className="text-text-secondary p-3 text-sm">Loading tools…</p> : null}
- {toolsError ? (
- <div className="p-3">
- <p className="text-failure-bg text-sm">{toolsError}</p>
- <button
- type="button"
- className={auiButtonClass({ variant: 'secondary', size: 'sm', className: 'mt-2' })}
- onClick={onRetryTools}
- >
- Retry
- </button>
- </div>
- ) : null}
- {filteredTools.map(tool => (
- <CatalogRow
- key={tool.id}
- title={tool.name}
- description={tool.description}
- checked={enabledTools === 'all' || enabledTools.includes(tool.name)}
- disabled={activeMount === undefined && !canAddActiveConnector}
- onToggle={() => toggleTool(tool.name)}
+ <div className="min-h-0 flex-1 overflow-y-auto px-2 pb-2">
+ {toolsLoading ? (
+ <div className="flex h-full min-h-24 items-center justify-center p-3" aria-label="Loading tools">
+ <Spinner size={20} className="text-text-secondary" />
+ </div>
+ ) : null}
+ {toolsError ? (
+ <div className="p-3">
+ <p className="text-failure-bg text-sm">{toolsError}</p>
+ <button
+ type="button"
+ className={auiButtonClass({ variant: 'secondary', size: 'sm', className: 'mt-2' })}
+ onClick={onRetryTools}
+ >
+ Retry
+ </button>
+ </div>
+ ) : null}
+ {!toolsLoading
+ ? filteredTools.map(tool => {
+ const checked = enabledTools === 'all' || enabledTools.includes(tool.name);
+ return (
+ <button
+ key={tool.id}
+ type="button"
+ role="menuitemcheckbox"
+ aria-checked={checked}
+ aria-label={tool.name}
+ disabled={!canAddActiveConnector && activeMount === undefined}
+ className="hover:bg-ghost-button-hover flex w-full cursor-pointer items-center gap-2 rounded-md px-2 py-2 text-left disabled:cursor-not-allowed disabled:opacity-50 disabled:hover:bg-transparent"
+ onClick={() => toggleTool(tool.name)}
+ >
+ <ToolCheckbox checked={checked} />
+ <span className="min-w-0 flex-1">
+ <span className="text-text-primary block truncate text-sm font-medium">{tool.name}</span>
+ {tool.description ? (
+ <span className="text-text-secondary line-clamp-1 text-xs">{tool.description}</span>
+ ) : null}
+ </span>
+ </button>
+ );
+ })
+ : null}
+ </div>
+ <label className="text-text-secondary flex shrink-0 cursor-pointer items-center justify-end gap-2 border-t border-border p-3 text-xs has-[:disabled]:cursor-not-allowed">
+ Preload tools
+ <Switch
+ checked={activeMount !== undefined && preloadFromMount(activeMount.value)}
+ disabled={activeMount === undefined}
+ onCheckedChange={preload => {
+ if (activeMount) updateMount(activeMount.id, withPreload(activeMount.value, preload));
+ }}
+ aria-label="Preload tools"
/>
- ))}
- </div>
- <label className="text-text-secondary flex shrink-0 items-center justify-end gap-2 border-t border-border p-3 text-xs">
- Preload tools
- <Switch
- checked={activeMount !== undefined && Reflect.get(activeMount.value, 'preload') === true}
- disabled={activeMount === undefined}
- onCheckedChange={preload => {
- if (activeMount) updateMount(activeMount.id, withPreload(activeMount.value, preload));
- }}
- aria-label="Preload tools"
- />
- </label>
- </>
+ </label>
+ </>
+ )
) : (
<p className="text-text-secondary p-4 text-sm">Select an MCP server to configure its tools.</p>
)}
</div>
- <div className="flex min-h-0 min-w-0 flex-col">
- <div className="shrink-0 border-b border-border p-3 text-sm font-semibold">Selected Tools</div>
+ <div className="flex max-h-44 min-h-0 min-w-0 flex-col md:max-h-none">
+ <div className="shrink-0 border-b border-border p-3 text-sm font-semibold">
+ {selectedToolsHeaderLabel(mcpMounts)}
+ </div>
<div className="min-h-0 flex-1 overflow-y-auto p-2">
{mcpMounts.length ? (
- <div className="space-y-3">
+ <div className="space-y-1">
{mcpMounts.map(mount => {
const selected = enabledToolsFromMount(mount.value);
return (
- <section key={mount.id}>
- <h3 className="text-text-primary px-2 py-1 text-xs font-semibold">{mount.name}</h3>
+ <details
+ key={mount.id}
+ className="group/mount"
+ open={!collapsedMountIds.has(mount.id)}
+ onToggle={event => {
+ const nextOpen = event.currentTarget.open;
+ setCollapsedMountIds(prev => {
+ const next = new Set(prev);
+ if (nextOpen) next.delete(mount.id);
+ else next.add(mount.id);
+ return next;
+ });
+ }}
+ >
+ <summary
+ className="hover:bg-ghost-button-hover flex cursor-pointer list-none items-center gap-1 rounded-md [&::-webkit-details-marker]:hidden"
+ onClick={() => openMountConnector(mount)}
+ >
+ <Icon
+ name="chevron-down"
+ className="text-text-secondary size-3.5 shrink-0 -rotate-90 transition-transform group-open/mount:rotate-0"
+ />
+ <span className="text-text-primary min-w-0 flex-1 truncate text-xs font-semibold">
+ {mount.name}
+ </span>
+ <span className="relative flex size-6 shrink-0 items-center justify-center">
+ <span className="text-text-secondary text-xs font-medium group-hover/mount:invisible group-focus-within/mount:invisible">
+ {selected === 'all' ? 'All' : selected.length}
+ </span>
+ <Tooltip
+ content="Remove All Tools"
+ triggerClassName="pointer-events-none absolute inset-0 flex items-center justify-center opacity-0 group-hover/mount:pointer-events-auto group-hover/mount:opacity-100 group-focus-within/mount:pointer-events-auto group-focus-within/mount:opacity-100"
+ >
+ <button
+ type="button"
+ aria-label={`Remove all tools for ${mount.name}`}
+ className={auiButtonClass({
+ variant: 'ghost',
+ size: 'icon',
+ className: 'text-text-secondary size-6',
+ })}
+ onClick={event => {
+ event.preventDefault();
+ event.stopPropagation();
+ removeMount(mount.id);
+ }}
+ >
+ <Icon name="xmark" className="size-3.5" />
+ </button>
+ </Tooltip>
+ </span>
+ </summary>
{selected === 'all' ? (
- <p className="text-text-secondary px-2 py-2 text-xs">All tools enabled</p>
+ <button
+ type="button"
+ className="text-text-secondary hover:bg-ghost-button-hover flex w-full cursor-pointer items-center gap-1.5 rounded-md px-2 py-1.5 pl-7 text-left text-[11px] font-medium tracking-wide uppercase"
+ onClick={() => openMountConnector(mount)}
+ >
+ <Icon name="wrench" className="size-3 shrink-0" />
+ ALL TOOLS ENABLED
+ </button>
) : selected.length ? (
- selected.map(toolName => {
- const description =
- mount.id === activeMount?.id ? activeToolsByName.get(toolName)?.description : undefined;
- return (
- <div
- key={`${mount.id}:${toolName}`}
- className="hover:bg-ghost-button-hover flex w-full items-center gap-2 rounded-md px-2 py-2"
- >
- <span className="bg-secondary-bg text-text-secondary mt-0.5 flex size-7 shrink-0 items-center justify-center rounded text-xs font-semibold">
- {toolName.charAt(0).toUpperCase()}
- </span>
- <span className="min-w-0 flex-1">
- <span className="text-text-primary block truncate text-sm font-medium">{toolName}</span>
- {description ? (
- <span className="text-text-secondary line-clamp-1 text-xs">{description}</span>
- ) : null}
- </span>
- <button
- type="button"
- aria-label={`Remove ${toolName} from ${mount.name}`}
- className={auiButtonClass({
- variant: 'ghost',
- size: 'icon',
- className: 'size-6 shrink-0',
- })}
- onClick={() => toggleSelectedTool(mount.id, toolName)}
- >
- <Icon name="xmark" className="size-3.5" />
- </button>
- </div>
- );
- })
+ selected.map(toolName => (
+ <button
+ key={`${mount.id}:${toolName}`}
+ type="button"
+ aria-label={`Open ${mount.name} for ${toolName}`}
+ className="text-text-primary hover:bg-ghost-button-hover flex w-full cursor-pointer items-center gap-1.5 rounded-md px-2 py-1 pl-7 text-left text-[11px]"
+ onClick={() => openMountConnector(mount)}
+ >
+ <Icon name="wrench" className="text-text-secondary size-3 shrink-0" />
+ <span className="min-w-0 truncate">{toolName}</span>
+ </button>
+ ))
) : (
- <p className="text-text-secondary px-2 py-2 text-xs">No tools selected.</p>
+ <p className="text-text-secondary px-2 py-1.5 pl-7 text-[11px]">No tools selected.</p>
)}
- </section>
+ </details>
);
})}
</div>
diff --git a/packages/trueforge-ui/src/atoms/draft/AgentResourceConfigModal.tsx b/packages/trueforge-ui/src/atoms/draft/AgentResourceConfigModal.tsx
index c75aebb85..68b5965d8 100644
--- a/packages/trueforge-ui/src/atoms/draft/AgentResourceConfigModal.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/AgentResourceConfigModal.tsx
@@ -2,6 +2,7 @@
import type { AgentSkill, AgentSpec, ConnectorState, McpToolSelection } from '../../server/types.js';
import { useSlot } from '../../theme/SlotsProvider.js';
+import { auiButtonClass } from '../lib/buttonClasses.js';
import { CenteredModal } from '../primitives/CenteredModal.js';
export type AgentResourceConfigModalProps = {
@@ -31,14 +32,23 @@ export function AgentResourceConfigModal({ editor, onClose, ...contentProps }: A
<CenteredModal
open={editor !== null}
onOpenChange={open => !open && onClose()}
- title={selectingMcp ? 'MCP Servers' : 'Skills'}
+ title={selectingMcp ? 'Select MCP Tools' : 'Skills'}
className={
selectingMcp
? 'md:w-[min(64rem,calc(100%-3rem))] md:max-w-5xl'
: 'md:w-[min(40rem,calc(100%-3rem))] md:max-w-2xl'
}
contentSized
- aria-label={selectingMcp ? 'Edit Connectors' : 'Edit skills'}
+ aria-label={selectingMcp ? 'Select MCP Tools' : 'Edit skills'}
+ footer={
+ selectingMcp ? (
+ <div className="flex justify-end">
+ <button type="button" className={auiButtonClass()} onClick={onClose}>
+ Save
+ </button>
+ </div>
+ ) : undefined
+ }
>
{editor ? <AgentResourceEditorContent editor={editor} {...contentProps} /> : null}
</CenteredModal>
diff --git a/packages/trueforge-ui/src/atoms/draft/DraftModelCatalogPanel.tsx b/packages/trueforge-ui/src/atoms/draft/DraftModelCatalogPanel.tsx
index ccddf85fc..81c8335b5 100644
--- a/packages/trueforge-ui/src/atoms/draft/DraftModelCatalogPanel.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/DraftModelCatalogPanel.tsx
@@ -94,7 +94,7 @@ export function DraftModelCatalogPanel({
return (
<>
<div className="border-b border-border px-3 py-2">
- {showHeading ? <p className="text-text-primary mb-2 text-sm font-semibold">Select model</p> : null}
+ {showHeading ? <p className="text-text-primary mb-2 text-sm font-normal">Select model</p> : null}
<label className="relative block">
<Icon
name="search"
@@ -169,7 +169,7 @@ export function DraftModelCatalogPanel({
onClick={() => onSelect(model)}
>
<span className="min-w-0">
- <span className="block truncate font-medium">{displayModelLabel(model.name)}</span>
+ <span className="block truncate font-normal">{displayModelLabel(model.name)}</span>
{showHeading &&
(model.properties.contextLength !== undefined ||
model.properties.maxOutputTokens !== undefined) ? (
diff --git a/packages/trueforge-ui/src/atoms/draft/DraftReasoningEffortSelector.tsx b/packages/trueforge-ui/src/atoms/draft/DraftReasoningEffortSelector.tsx
index 2e8237b4c..c28eb71cf 100644
--- a/packages/trueforge-ui/src/atoms/draft/DraftReasoningEffortSelector.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/DraftReasoningEffortSelector.tsx
@@ -71,7 +71,7 @@ export function DraftReasoningEffortSelector({ disabled, isRunning }: DraftReaso
const content = (
<>
<div className="border-b border-border px-3 py-2">
- <p className="text-text-primary text-sm font-semibold">Reasoning effort</p>
+ <p className="text-text-primary text-sm font-normal">Reasoning effort</p>
</div>
<div
id={menuId}
@@ -105,7 +105,7 @@ export function DraftReasoningEffortSelector({ disabled, isRunning }: DraftReaso
setOpen(false);
}}
>
- <span className="truncate font-medium">{effort}</span>
+ <span className="truncate font-normal">{effort}</span>
</button>
);
})}
diff --git a/packages/trueforge-ui/src/atoms/draft/agentConfigMounts.ts b/packages/trueforge-ui/src/atoms/draft/agentConfigMounts.ts
index 092a7e6f9..882045da7 100644
--- a/packages/trueforge-ui/src/atoms/draft/agentConfigMounts.ts
+++ b/packages/trueforge-ui/src/atoms/draft/agentConfigMounts.ts
@@ -32,6 +32,10 @@ export function withEnabledTools(value: object, enabledTools: string[] | 'all'):
};
}
+export function preloadFromMount(value: object): boolean {
+ return Reflect.get(value, 'preload') === true;
+}
+
export function withPreload(value: object, preload: boolean): object {
return { ...value, preload };
}
diff --git a/packages/trueforge-ui/src/atoms/primitives/CenteredModal.tsx b/packages/trueforge-ui/src/atoms/primitives/CenteredModal.tsx
index f2e33424a..a26550ccc 100644
--- a/packages/trueforge-ui/src/atoms/primitives/CenteredModal.tsx
+++ b/packages/trueforge-ui/src/atoms/primitives/CenteredModal.tsx
@@ -15,6 +15,7 @@ export type CenteredModalProps = {
description?: string;
headerIcon?: ReactNode;
children: ReactNode;
+ footer?: ReactNode;
className?: string;
contentSized?: boolean;
'aria-label'?: string;
@@ -31,6 +32,7 @@ export function CenteredModal({
description,
headerIcon,
children,
+ footer,
className,
contentSized = false,
'aria-label': ariaLabel,
@@ -110,6 +112,7 @@ export function CenteredModal({
</button>
</header>
<div className="flex min-h-0 flex-1 flex-col overflow-x-hidden overflow-y-auto">{children}</div>
+ {footer ? <div className="shrink-0 border-t border-border px-5 py-3">{footer}</div> : null}
</dialog>
);
}
diff --git a/packages/trueforge-ui/src/hooks/useChatChromeActionsVisible.ts b/packages/trueforge-ui/src/hooks/useChatChromeActionsVisible.ts
index 6301a7a6d..156fd2911 100644
--- a/packages/trueforge-ui/src/hooks/useChatChromeActionsVisible.ts
+++ b/packages/trueforge-ui/src/hooks/useChatChromeActionsVisible.ts
@@ -2,7 +2,9 @@
import { useTrueFoundryAgentSpec } from '@truefoundry/assistant-ui-runtime';
+import { useAuiState } from '../assistant-ui.js';
import { useOptionalShellMode } from '../server/ShellModeContext.js';
+import { isNewChatView } from '../utils/isNewChatView.js';
export type NamedAgentHeaderState = {
name: string;
@@ -54,10 +56,12 @@ export function useSaveAgentVisible(): boolean {
return Boolean(agentSpec?.model?.name?.trim());
}
-// Clear chat: any active session (Try Agent, New Chat, New Agent, Edit).
+// Clear chat: any active session (Try Agent, New Chat, New Agent, Edit) that has
+// something to clear. A fresh thread has nothing, so the control stays hidden.
export function useChatChromeActionsVisible(): boolean {
const shell = useOptionalShellMode();
- return shell != null && shell.mode.status === 'active';
+ const isFresh = useAuiState(isNewChatView);
+ return shell != null && shell.mode.status === 'active' && !isFresh;
}
// True when the thread header has anything to show (title, Save, and/or Clear).
diff --git a/packages/trueforge-ui/src/layouts/SidebarLayout.tsx b/packages/trueforge-ui/src/layouts/SidebarLayout.tsx
index 04dda4096..276b45c37 100644
--- a/packages/trueforge-ui/src/layouts/SidebarLayout.tsx
+++ b/packages/trueforge-ui/src/layouts/SidebarLayout.tsx
@@ -35,7 +35,7 @@ const brandLogoClassName = 'h-5 w-5 max-w-40 shrink-0 object-contain';
const railWidthClassName = 'w-18';
const railActionButtonClassName =
- 'h-auto w-full flex-col gap-1 whitespace-normal px-1 py-1.5 text-[10px] leading-tight !justify-center text-text-primary shadow-none hover:bg-ghost-button-hover hover:text-ghost-button-text';
+ 'h-auto w-full flex-col gap-1 whitespace-normal px-1 py-3 text-[0.625rem] leading-tight !justify-center text-text-primary shadow-none hover:bg-secondary-button-hover hover:text-ghost-button-text';
const railSelectedClassName =
'bg-primary-button-bg text-primary-button-text hover:bg-primary-button-hover hover:text-primary-button-text';
@@ -77,7 +77,7 @@ function SidebarNav(): ReactNode {
};
return (
- <nav className="flex min-h-0 flex-1 flex-col items-center gap-2 p-1" aria-label="Sidebar">
+ <nav className="flex min-h-0 flex-1 flex-col items-center gap-1 p-1" aria-label="Sidebar">
{showNewActions ? (
<button
type="button"
diff --git a/packages/trueforge-ui/test/atoms/ClearChatButton.test.tsx b/packages/trueforge-ui/test/atoms/ClearChatButton.test.tsx
index f9583fd85..4dc129444 100644
--- a/packages/trueforge-ui/test/atoms/ClearChatButton.test.tsx
+++ b/packages/trueforge-ui/test/atoms/ClearChatButton.test.tsx
@@ -40,7 +40,7 @@ describe('ClearChatButton', () => {
expect(screen.queryByRole('button', { name: 'Clear chat' })).not.toBeInTheDocument();
});
- it('is visible on an empty named agent chat', () => {
+ it('is hidden on a fresh chat with no messages', () => {
render(
<SlotsProvider>
<ShellModeProvider agentConfig={{ mode: 'SingleAgent', name: 'a' }}>
@@ -50,7 +50,20 @@ describe('ClearChatButton', () => {
</ShellModeProvider>
</SlotsProvider>,
);
- expect(screen.getByRole('button', { name: 'Clear chat' })).toBeInTheDocument();
+ expect(screen.queryByRole('button', { name: 'Clear chat' })).not.toBeInTheDocument();
+ });
+
+ it('is hidden on a fresh draft (New Chat / New Agent)', () => {
+ render(
+ <SlotsProvider>
+ <ShellModeProvider agentConfig={{ mode: 'AgentComposer' }}>
+ <RuntimeHarness messages={[]}>
+ <ClearChatButton />
+ </RuntimeHarness>
+ </ShellModeProvider>
+ </SlotsProvider>,
+ );
+ expect(screen.queryByRole('button', { name: 'Clear chat' })).not.toBeInTheDocument();
});
it('is visible on mutable sessions', () => {
diff --git a/packages/trueforge-ui/test/atoms/SaveAgentButton.test.tsx b/packages/trueforge-ui/test/atoms/SaveAgentButton.test.tsx
index 99b4a02cc..79cbc37f1 100644
--- a/packages/trueforge-ui/test/atoms/SaveAgentButton.test.tsx
+++ b/packages/trueforge-ui/test/atoms/SaveAgentButton.test.tsx
@@ -240,11 +240,8 @@ describe('SaveAgentButton', () => {
expect(within(dialog).getByText('generative UI:').parentElement).toHaveTextContent('off');
fireEvent.click(within(dialog).getByRole('button', { name: 'Edit Connectors' }));
- const mcpDialog = await findStackedDialog('Edit Connectors');
- expect(await within(mcpDialog).findByRole('menuitemcheckbox', { name: /Slack/ })).toHaveAttribute(
- 'aria-checked',
- 'true',
- );
+ const mcpDialog = await findStackedDialog('Select MCP Tools');
+ expect(await within(mcpDialog).findByLabelText('Slack selected')).toBeInTheDocument();
});
it('uses the drawer instruction draft when opening before debounce sync completes', async () => {
@@ -360,9 +357,10 @@ describe('SaveAgentButton', () => {
fireEvent.change(within(saveDialog).getByLabelText('Agent name'), { target: { value: 'preserved-agent' } });
fireEvent.click(within(saveDialog).getByRole('button', { name: 'Edit Connectors' }));
- const mcpDialog = await findStackedDialog('Edit Connectors');
- fireEvent.click(await within(mcpDialog).findByRole('checkbox', { name: 'Select Slack' }));
- fireEvent.click(within(mcpDialog).getByRole('button', { name: 'Close' }));
+ const mcpDialog = await findStackedDialog('Select MCP Tools');
+ fireEvent.click(within(mcpDialog).getByRole('button', { name: 'Slack' }));
+ fireEvent.click(within(mcpDialog).getByRole('switch', { name: 'Enable all tools' }));
+ fireEvent.click(within(mcpDialog).getByRole('button', { name: 'Save' }));
fireEvent.click(within(saveDialog).getByRole('button', { name: 'Edit Skills' }));
const skillsDialog = await findStackedDialog('Edit skills');
@@ -376,7 +374,7 @@ describe('SaveAgentButton', () => {
agentSpec: expect.objectContaining({
mcpServers: [
{ id: 'github', name: 'GitHub', enableTools: ['@read-only'], config: { project: 'sdk' } },
- { id: 'slack', name: 'Slack' },
+ { id: 'slack', name: 'Slack', enableTools: ['@all'] },
],
skills: [
{ id: 'research', name: 'Research', fqn: 'skills/research:1', config: { depth: 2 } },
@@ -405,10 +403,7 @@ describe('SaveAgentButton', () => {
const saveDialog = await screen.findByRole('dialog', { name: 'Save agent' });
fireEvent.change(within(saveDialog).getByLabelText('Agent name'), { target: { value: 'trimmed-agent' } });
- fireEvent.click(within(saveDialog).getByRole('button', { name: 'Edit Connectors' }));
- const mcpDialog = await findStackedDialog('Edit Connectors');
- fireEvent.click(await within(mcpDialog).findByRole('checkbox', { name: 'Deselect GitHub' }));
- fireEvent.click(within(mcpDialog).getByRole('button', { name: 'Close' }));
+ fireEvent.click(within(saveDialog).getByRole('button', { name: 'Remove GitHub' }));
fireEvent.click(within(saveDialog).getByRole('button', { name: 'Edit Skills' }));
const skillsDialog = await findStackedDialog('Edit skills');
diff --git a/packages/trueforge-ui/test/atoms/draft/AgentConfigEditors.test.tsx b/packages/trueforge-ui/test/atoms/draft/AgentConfigEditors.test.tsx
index c978751cd..5182c4fb2 100644
--- a/packages/trueforge-ui/test/atoms/draft/AgentConfigEditors.test.tsx
+++ b/packages/trueforge-ui/test/atoms/draft/AgentConfigEditors.test.tsx
@@ -197,6 +197,65 @@ describe('AgentConfigEditors', () => {
});
});
+ it('selects the first mounted MCP on open, otherwise the first connector', async () => {
+ const loadMcpTools = vi.fn(async (connectorId: string) => [
+ { id: `${connectorId}.tool`, name: `${connectorId}.tool` },
+ ]);
+
+ const { rerender } = render(
+ <SlotsProvider>
+ <AgentConfigEditors
+ editor="mcp"
+ spec={{
+ model: { name: 'openai/gpt' },
+ mcpServers: [
+ { id: 'slack', name: 'Slack', enableTools: ['@all'] },
+ { id: 'github', name: 'GitHub', enableTools: ['@all'] },
+ ],
+ }}
+ models={[]}
+ connectors={[
+ { id: 'github', name: 'GitHub', authenticated: true },
+ { id: 'slack', name: 'Slack', authenticated: true },
+ { id: 'linear', name: 'Linear', authenticated: true },
+ ]}
+ skills={[]}
+ loading={false}
+ error={null}
+ loadMcpTools={loadMcpTools}
+ onChange={vi.fn()}
+ onClose={vi.fn()}
+ />
+ </SlotsProvider>,
+ );
+
+ await waitFor(() => expect(loadMcpTools).toHaveBeenCalledWith('slack'));
+ expect(screen.getByRole('button', { name: 'Slack' })).toHaveAttribute('aria-current', 'true');
+
+ rerender(
+ <SlotsProvider>
+ <AgentConfigEditors
+ editor="mcp"
+ spec={{ model: { name: 'openai/gpt' } }}
+ models={[]}
+ connectors={[
+ { id: 'github', name: 'GitHub', authenticated: true },
+ { id: 'slack', name: 'Slack', authenticated: true },
+ ]}
+ skills={[]}
+ loading={false}
+ error={null}
+ loadMcpTools={loadMcpTools}
+ onChange={vi.fn()}
+ onClose={vi.fn()}
+ />
+ </SlotsProvider>,
+ );
+
+ await waitFor(() => expect(loadMcpTools).toHaveBeenLastCalledWith('github'));
+ expect(screen.getByRole('button', { name: 'GitHub' })).toHaveAttribute('aria-current', 'true');
+ });
+
it('loads MCP tools lazily and preserves unrelated mount selectors', async () => {
const spec: AgentSpec = {
model: { name: 'openai/gpt' },
@@ -232,7 +291,7 @@ describe('AgentConfigEditors', () => {
</SlotsProvider>,
);
- fireEvent.click(screen.getByRole('menuitemcheckbox', { name: /GitHub/ }));
+ fireEvent.click(screen.getByRole('button', { name: 'GitHub' }));
await waitFor(() => expect(loadMcpTools).toHaveBeenCalledWith('github'));
const issueRows = await screen.findAllByRole('menuitemcheckbox', { name: /issues.list/ });
const availableIssueRow = issueRows[0];
@@ -252,7 +311,7 @@ describe('AgentConfigEditors', () => {
});
});
- it('opens MCP rows without selecting them and selects through the checkbox or tools', async () => {
+ it('opens MCP rows without selecting them and selects through tools', async () => {
const spec: AgentSpec = { model: { name: 'openai/gpt' } };
const onChange = vi.fn();
const loadMcpTools = vi.fn(async () => [
@@ -276,24 +335,19 @@ describe('AgentConfigEditors', () => {
</SlotsProvider>,
);
- fireEvent.click(screen.getByRole('menuitemcheckbox', { name: /Slack/ }));
+ fireEvent.click(screen.getByRole('button', { name: 'Slack' }));
await waitFor(() => expect(loadMcpTools).toHaveBeenCalledWith('slack'));
expect(onChange).not.toHaveBeenCalled();
+ expect(screen.queryByLabelText('Slack selected')).not.toBeInTheDocument();
fireEvent.click(await screen.findByRole('menuitemcheckbox', { name: /messages.list/ }));
expect(onChange).toHaveBeenLastCalledWith({
...spec,
mcpServers: [{ id: 'slack', name: 'Slack', enableTools: ['messages.list'] }],
});
-
- fireEvent.click(screen.getByRole('checkbox', { name: 'Select Slack' }));
- expect(onChange).toHaveBeenLastCalledWith({
- ...spec,
- mcpServers: [{ id: 'slack', name: 'Slack' }],
- });
});
- it('allows browsing but not adding an unauthenticated non-DCR connector', async () => {
+ it('shows connect empty state for unauthenticated connectors', async () => {
const spec: AgentSpec = { model: { name: 'openai/gpt' } };
const onChange = vi.fn();
@@ -314,15 +368,44 @@ describe('AgentConfigEditors', () => {
</SlotsProvider>,
);
- fireEvent.click(screen.getByRole('menuitemcheckbox', { name: /Private/ }));
+ fireEvent.click(screen.getByRole('button', { name: 'Private' }));
- expect(await screen.findByRole('menuitemcheckbox', { name: /secret.read/ })).toBeDisabled();
- expect(screen.getByRole('switch', { name: 'Enable all tools' })).toBeDisabled();
- expect(screen.getByRole('checkbox', { name: 'Select Private' })).toBeDisabled();
+ expect(await screen.findByText("You're not connected to this MCP Server")).toBeInTheDocument();
+ expect(screen.getByRole('button', { name: 'Connect During Chat' })).toBeInTheDocument();
+ expect(screen.queryByRole('menuitemcheckbox', { name: /secret.read/ })).not.toBeInTheDocument();
expect(onChange).not.toHaveBeenCalled();
});
- it('groups selected tools across MCP servers and summarizes all-tools mounts', async () => {
+ it('mounts an unauthenticated connector with Connect During Chat', async () => {
+ const spec: AgentSpec = { model: { name: 'openai/gpt' } };
+ const onChange = vi.fn();
+
+ render(
+ <SlotsProvider>
+ <AgentConfigEditors
+ editor="mcp"
+ spec={spec}
+ models={[]}
+ connectors={[{ id: 'slack', name: 'Slack', authenticated: false }]}
+ skills={[]}
+ loading={false}
+ error={null}
+ onChange={onChange}
+ onClose={vi.fn()}
+ />
+ </SlotsProvider>,
+ );
+
+ fireEvent.click(screen.getByRole('button', { name: 'Slack' }));
+ fireEvent.click(await screen.findByRole('button', { name: 'Connect During Chat' }));
+
+ expect(onChange).toHaveBeenCalledWith({
+ ...spec,
+ mcpServers: [{ id: 'slack', name: 'Slack', enableTools: ['@all'] }],
+ });
+ });
+
+ it('groups selected tools across MCP servers and summarizes all-tools mounts', () => {
const spec: AgentSpec = {
model: { name: 'openai/gpt' },
mcpServers: [
@@ -330,7 +413,6 @@ describe('AgentConfigEditors', () => {
{ id: 'slack', name: 'Slack', enableTools: ['messages.list'] },
],
};
- const onChange = vi.fn();
render(
<SlotsProvider>
@@ -346,25 +428,149 @@ describe('AgentConfigEditors', () => {
loading={false}
error={null}
loadMcpTools={async () => []}
- onChange={onChange}
+ onChange={vi.fn()}
onClose={vi.fn()}
/>
</SlotsProvider>,
);
- expect(screen.getByRole('dialog', { name: 'MCP Servers' })).toBeInTheDocument();
- expect(screen.getByRole('heading', { name: 'GitHub' })).toBeInTheDocument();
- expect(screen.getByText('All tools enabled')).toBeInTheDocument();
- expect(screen.getByRole('heading', { name: 'Slack' })).toBeInTheDocument();
+ expect(screen.getByRole('dialog', { name: 'Select MCP Tools' })).toBeInTheDocument();
+ expect(screen.getByText('Selected Tools (1)')).toBeInTheDocument();
+ expect(screen.getByText('ALL TOOLS ENABLED')).toBeInTheDocument();
+ expect(screen.getByLabelText('GitHub selected')).toBeInTheDocument();
+ expect(screen.getByLabelText('Slack selected')).toBeInTheDocument();
expect(screen.getAllByText('messages.list').length).toBeGreaterThan(0);
+ expect(screen.queryByRole('button', { name: /Remove messages.list/ })).not.toBeInTheDocument();
+ });
+
+ it('removes all tools for an MCP from the selected-tools list', () => {
+ const spec: AgentSpec = {
+ model: { name: 'openai/gpt' },
+ mcpServers: [
+ { id: 'github', name: 'GitHub', enableTools: ['@all'] },
+ { id: 'slack', name: 'Slack', enableTools: ['messages.list'] },
+ ],
+ };
+ const onChange = vi.fn();
- fireEvent.click(screen.getByRole('button', { name: 'Remove messages.list from Slack' }));
+ render(
+ <SlotsProvider>
+ <AgentConfigEditors
+ editor="mcp"
+ spec={spec}
+ models={[]}
+ connectors={[
+ { id: 'github', name: 'GitHub', authenticated: true },
+ { id: 'slack', name: 'Slack', authenticated: true },
+ ]}
+ skills={[]}
+ loading={false}
+ error={null}
+ onChange={onChange}
+ onClose={vi.fn()}
+ />
+ </SlotsProvider>,
+ );
+
+ fireEvent.click(screen.getByRole('button', { name: 'Remove all tools for Slack' }));
expect(onChange).toHaveBeenCalledWith({
...spec,
mcpServers: [{ id: 'github', name: 'GitHub', enableTools: ['@all'] }],
});
});
+ it('opens the MCP for a selected-tools row click', async () => {
+ const loadMcpTools = vi.fn(async (connectorId: string) => [
+ { id: `${connectorId}.tool`, name: `${connectorId}.tool` },
+ ]);
+
+ render(
+ <SlotsProvider>
+ <AgentConfigEditors
+ editor="mcp"
+ spec={{
+ model: { name: 'openai/gpt' },
+ mcpServers: [
+ { id: 'github', name: 'GitHub', enableTools: ['@all'] },
+ { id: 'slack', name: 'Slack', enableTools: ['messages.list'] },
+ ],
+ }}
+ models={[]}
+ connectors={[
+ { id: 'github', name: 'GitHub', authenticated: true },
+ { id: 'slack', name: 'Slack', authenticated: true },
+ ]}
+ skills={[]}
+ loading={false}
+ error={null}
+ loadMcpTools={loadMcpTools}
+ onChange={vi.fn()}
+ onClose={vi.fn()}
+ />
+ </SlotsProvider>,
+ );
+
+ fireEvent.click(screen.getByRole('button', { name: 'Open Slack for messages.list' }));
+ await waitFor(() => expect(loadMcpTools).toHaveBeenCalledWith('slack'));
+ expect(screen.getByRole('button', { name: 'Slack' })).toHaveAttribute('aria-current', 'true');
+ });
+
+ it('shows Selected Tools (All) when every mount enables all tools', () => {
+ const spec: AgentSpec = {
+ model: { name: 'openai/gpt' },
+ mcpServers: [
+ { id: 'github', name: 'GitHub', enableTools: ['@all'] },
+ { id: 'slack', name: 'Slack', enableTools: ['@all'] },
+ ],
+ };
+
+ render(
+ <SlotsProvider>
+ <AgentConfigEditors
+ editor="mcp"
+ spec={spec}
+ models={[]}
+ connectors={[
+ { id: 'github', name: 'GitHub', authenticated: true },
+ { id: 'slack', name: 'Slack', authenticated: true },
+ ]}
+ skills={[]}
+ loading={false}
+ error={null}
+ onChange={vi.fn()}
+ onClose={vi.fn()}
+ />
+ </SlotsProvider>,
+ );
+
+ expect(screen.getByText('Selected Tools (All)')).toBeInTheDocument();
+ });
+
+ it('closes via Save without writing the spec again', () => {
+ const onChange = vi.fn();
+ const onClose = vi.fn();
+
+ render(
+ <SlotsProvider>
+ <AgentConfigEditors
+ editor="mcp"
+ spec={{ model: { name: 'openai/gpt' } }}
+ models={[]}
+ connectors={[{ id: 'github', name: 'GitHub', authenticated: true }]}
+ skills={[]}
+ loading={false}
+ error={null}
+ onChange={onChange}
+ onClose={onClose}
+ />
+ </SlotsProvider>,
+ );
+
+ fireEvent.click(screen.getByRole('button', { name: 'Save' }));
+ expect(onClose).toHaveBeenCalled();
+ expect(onChange).not.toHaveBeenCalled();
+ });
+
it('deselects an MCP server when all of its tools are disabled', () => {
const spec: AgentSpec = {
model: { name: 'openai/gpt' },
@@ -424,13 +630,13 @@ describe('AgentConfigEditors', () => {
const rendered = render(renderEditors(githubSpec));
expect((await screen.findAllByRole('menuitemcheckbox', { name: /issues.list/ })).length).toBeGreaterThan(0);
- fireEvent.click(screen.getByRole('menuitemcheckbox', { name: /GitHub/ }));
+ fireEvent.click(screen.getByRole('button', { name: 'GitHub' }));
await waitFor(() => expect(loadMcpTools).toHaveBeenLastCalledWith('github'));
rendered.rerender(renderEditors(slackSpec));
expect(loadMcpTools).toHaveBeenLastCalledWith('github');
expect(screen.getAllByRole('menuitemcheckbox', { name: /issues.list/ }).length).toBeGreaterThan(0);
- expect(screen.getByRole('heading', { name: 'Slack' })).toBeInTheDocument();
+ expect(screen.getByLabelText('Slack selected')).toBeInTheDocument();
});
it('enables sandbox when a skill is added', () => {
diff --git a/packages/trueforge-ui/test/atoms/draft/AgentConfigPanel.test.tsx b/packages/trueforge-ui/test/atoms/draft/AgentConfigPanel.test.tsx
index f0d84cb27..9a15061d0 100644
--- a/packages/trueforge-ui/test/atoms/draft/AgentConfigPanel.test.tsx
+++ b/packages/trueforge-ui/test/atoms/draft/AgentConfigPanel.test.tsx
@@ -121,6 +121,71 @@ describe('AgentConfigPanel', () => {
expect(onChange).toHaveBeenCalledWith({ ...spec, mcpServers: [] });
});
+ it('toggles MCP preload from the config chip', () => {
+ const onChange = vi.fn();
+ render(
+ <SlotsProvider>
+ <AgentConfigPanel
+ spec={spec}
+ model={model}
+ skillsAvailable
+ instructions={spec.instructions ?? ''}
+ onInstructionsChange={vi.fn()}
+ onInstructionsBlur={vi.fn()}
+ onOpenEditor={vi.fn()}
+ onChange={onChange}
+ />
+ </SlotsProvider>,
+ );
+
+ fireEvent.click(screen.getByRole('button', { name: 'Preload tools for GitHub' }));
+ expect(onChange).toHaveBeenCalledWith({
+ ...spec,
+ mcpServers: [{ id: 'github', name: 'GitHub', enableTools: ['issues.list'], preload: true }],
+ });
+ });
+
+ it('opens the MCP editor from the section add action', () => {
+ const onOpenEditor = vi.fn();
+ render(
+ <SlotsProvider>
+ <AgentConfigPanel
+ spec={spec}
+ model={model}
+ skillsAvailable
+ instructions={spec.instructions ?? ''}
+ onInstructionsChange={vi.fn()}
+ onInstructionsBlur={vi.fn()}
+ onOpenEditor={onOpenEditor}
+ onChange={vi.fn()}
+ />
+ </SlotsProvider>,
+ );
+
+ fireEvent.click(screen.getByRole('button', { name: 'Add MCP server' }));
+ expect(onOpenEditor).toHaveBeenCalledWith('mcp');
+ });
+
+ it('shows the MCP empty state without a selected-servers message', () => {
+ render(
+ <SlotsProvider>
+ <AgentConfigPanel
+ spec={{ ...spec, mcpServers: [] }}
+ model={model}
+ skillsAvailable
+ instructions={spec.instructions ?? ''}
+ onInstructionsChange={vi.fn()}
+ onInstructionsBlur={vi.fn()}
+ onOpenEditor={vi.fn()}
+ />
+ </SlotsProvider>,
+ );
+
+ expect(screen.getByText('MCP Servers')).toBeInTheDocument();
+ expect(screen.getByRole('button', { name: 'Add MCP server' })).toBeInTheDocument();
+ expect(screen.queryByText('No MCP servers selected.')).not.toBeInTheDocument();
+ });
+
it('renders an optional close action for overlay layouts', () => {
const onClose = vi.fn();
render(
diff --git a/packages/trueforge-ui/test/atoms/draft/AgentMcpEditorContent.search.test.tsx b/packages/trueforge-ui/test/atoms/draft/AgentMcpEditorContent.search.test.tsx
new file mode 100644
index 000000000..29110e3cd
--- /dev/null
+++ b/packages/trueforge-ui/test/atoms/draft/AgentMcpEditorContent.search.test.tsx
@@ -0,0 +1,74 @@
+// @vitest-environment jsdom
+import { fireEvent, render, screen } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
+
+import { AgentMcpEditorContent } from '@/atoms/draft/AgentMcpEditorContent.js';
+import { SlotsProvider } from '@/theme/SlotsProvider.js';
+
+describe('AgentMcpEditorContent tool search', () => {
+ it('filters the tool list as the user types in Search Tools', () => {
+ render(
+ <SlotsProvider>
+ <AgentMcpEditorContent
+ spec={{
+ model: { name: 'openai/gpt' },
+ mcpServers: [{ id: 'parallel', name: 'parallel-web', enableTools: ['@all'] }],
+ }}
+ connectors={[{ id: 'parallel', name: 'parallel-web', authenticated: true }]}
+ query=""
+ activeConnectorId="parallel"
+ tools={[
+ { id: 'web_search', name: 'web_search', description: 'Perform web searches' },
+ { id: 'web_fetch', name: 'web_fetch', description: 'Fetch web URLs' },
+ ]}
+ toolsLoading={false}
+ toolsError={null}
+ onQueryChange={vi.fn()}
+ onSelectConnector={vi.fn()}
+ onRetryTools={vi.fn()}
+ onChange={vi.fn()}
+ />
+ </SlotsProvider>,
+ );
+
+ expect(screen.getByRole('menuitemcheckbox', { name: 'web_search' })).toBeInTheDocument();
+ expect(screen.getByRole('menuitemcheckbox', { name: 'web_fetch' })).toBeInTheDocument();
+
+ fireEvent.change(screen.getByPlaceholderText('Search Tools'), { target: { value: 'fetch' } });
+
+ expect(screen.queryByRole('menuitemcheckbox', { name: 'web_search' })).not.toBeInTheDocument();
+ expect(screen.getByRole('menuitemcheckbox', { name: 'web_fetch' })).toBeInTheDocument();
+ });
+
+ it('does not match tools only via description text', () => {
+ render(
+ <SlotsProvider>
+ <AgentMcpEditorContent
+ spec={{ model: { name: 'openai/gpt' } }}
+ connectors={[{ id: 'parallel', name: 'parallel-web', authenticated: true }]}
+ query=""
+ activeConnectorId="parallel"
+ tools={[
+ {
+ id: 'web_search',
+ name: 'web_search',
+ description: 'Perform web searches without a follow-up fetch.',
+ },
+ { id: 'web_fetch', name: 'web_fetch', description: 'Fetch web URLs' },
+ ]}
+ toolsLoading={false}
+ toolsError={null}
+ onQueryChange={vi.fn()}
+ onSelectConnector={vi.fn()}
+ onRetryTools={vi.fn()}
+ onChange={vi.fn()}
+ />
+ </SlotsProvider>,
+ );
+
+ fireEvent.change(screen.getByPlaceholderText('Search Tools'), { target: { value: 'fetch' } });
+
+ expect(screen.queryByRole('menuitemcheckbox', { name: 'web_search' })).not.toBeInTheDocument();
+ expect(screen.getByRole('menuitemcheckbox', { name: 'web_fetch' })).toBeInTheDocument();
+ });
+});
diff --git a/packages/trueforge-ui/test/containers/TrueForgeUI.test.tsx b/packages/trueforge-ui/test/containers/TrueForgeUI.test.tsx
index 087009b65..7325353f0 100644
--- a/packages/trueforge-ui/test/containers/TrueForgeUI.test.tsx
+++ b/packages/trueforge-ui/test/containers/TrueForgeUI.test.tsx
@@ -216,7 +216,7 @@ describe('TrueForgeUI', () => {
fireEvent.click(within(modelDialog).getByRole('button', { name: 'Close' }));
fireEvent.click(within(saveDialog).getByRole('button', { name: 'Edit Connectors' }));
- const mcpDialog = document.querySelector('dialog[aria-label="Edit Connectors"]');
+ const mcpDialog = document.querySelector('dialog[aria-label="Select MCP Tools"]');
if (!(mcpDialog instanceof HTMLDialogElement)) throw new Error('expected stacked MCP dialog');
expect(await within(mcpDialog).findByText('GitHub')).toBeInTheDocument();
expect(getModels).toHaveBeenCalled();
diff --git a/packages/trueforge-ui/test/hooks/useChatChromeActionsVisible.test.tsx b/packages/trueforge-ui/test/hooks/useChatChromeActionsVisible.test.tsx
index e3ce0412b..ac4d24eb0 100644
--- a/packages/trueforge-ui/test/hooks/useChatChromeActionsVisible.test.tsx
+++ b/packages/trueforge-ui/test/hooks/useChatChromeActionsVisible.test.tsx
@@ -82,4 +82,17 @@ describe('useChatHeaderContentVisible', () => {
expect(result.current.clear).toBe(true);
expect(result.current.header).toBe(true);
});
+
+ it('hides Clear on a fresh draft; header still shows the title', () => {
+ const { result } = renderHook(
+ () => ({
+ clear: useChatChromeActionsVisible(),
+ header: useChatHeaderContentVisible(),
+ }),
+ { wrapper: wrap({ messages: [], agentConfig: { mode: 'AgentComposer' } }) },
+ );
+
+ expect(result.current.clear).toBe(false);
+ expect(result.current.header).toBe(true);
+ });
});