Skip to content

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

feat: add DraftCatalogEmptyState component and integrate into selectors (#242)

Vinit30935c87385a
diff --git a/packages/trueforge-ui-sdk/src/atoms/draft/DraftCatalogEmptyState.tsx b/packages/trueforge-ui-sdk/src/atoms/draft/DraftCatalogEmptyState.tsx
new file mode 100644
index 000000000..9d7e172a2
--- /dev/null
+++ b/packages/trueforge-ui-sdk/src/atoms/draft/DraftCatalogEmptyState.tsx
@@ -0,0 +1,34 @@
+'use client';
+
+import { Icon } from '../../icons/Icon.js';
+import { auiButtonClass } from '../lib/buttonClasses.js';
+
+export function DraftCatalogEmptyState({
+ loading,
+ emptyLabel,
+ settingsTarget,
+ onOpenSettings,
+}: {
+ loading: boolean;
+ emptyLabel: string;
+ settingsTarget: string;
+ onOpenSettings?: () => void;
+}) {
+ if (!loading && onOpenSettings) {
+ return (
+ <button
+ type="button"
+ className={auiButtonClass({
+ variant: 'ghost',
+ className: 'text-text-secondary w-full justify-center gap-1 py-4 text-xs',
+ })}
+ onClick={onOpenSettings}
+ >
+ Please configure {settingsTarget} in the <span className="underline">settings</span>
+ <Icon name="chevron-right" className="size-3" />
+ </button>
+ );
+ }
+
+ return <p className="text-text-secondary px-2 py-4 text-center text-sm">{loading ? 'Loading…' : emptyLabel}</p>;
+}
diff --git a/packages/trueforge-ui-sdk/src/atoms/draft/DraftCatalogProvider.tsx b/packages/trueforge-ui-sdk/src/atoms/draft/DraftCatalogProvider.tsx
index f0fcfe30f..14da9171a 100644
--- a/packages/trueforge-ui-sdk/src/atoms/draft/DraftCatalogProvider.tsx
+++ b/packages/trueforge-ui-sdk/src/atoms/draft/DraftCatalogProvider.tsx
@@ -14,6 +14,8 @@ type DraftCatalogValue = {
error: string | null;
/** Kick off catalog fetch (idempotent). Call when a picker opens. */
ensureLoaded: () => void;
+ /** Reload all collections after settings mutate catalog-backed configuration. */
+ refresh: () => void;
/** Refresh connector auth state without reloading unrelated catalogs. */
refreshConnectors: () => Promise<void>;
};
@@ -37,7 +39,7 @@ export function DraftCatalogProvider({ children }: { children: ReactNode }) {
}
function DraftCatalogStore({ server, children }: { server: AgentUIServer | null; children: ReactNode }) {
- const [requested, setRequested] = useState(false);
+ const [requestEpoch, setRequestEpoch] = useState<number | null>(null);
const [models, setModels] = useState<ModelSelection[]>([]);
const [skills, setSkills] = useState<AgentSkill[]>([]);
const [connectors, setConnectors] = useState<ConnectorState[]>([]);
@@ -45,7 +47,11 @@ function DraftCatalogStore({ server, children }: { server: AgentUIServer | null;
const [error, setError] = useState<string | null>(null);
const ensureLoaded = useCallback(() => {
- setRequested(true);
+ setRequestEpoch(current => current ?? 0);
+ }, []);
+
+ const refresh = useCallback(() => {
+ setRequestEpoch(current => (current ?? -1) + 1);
}, []);
const refreshConnectors = useCallback(async () => {
@@ -63,7 +69,7 @@ function DraftCatalogStore({ server, children }: { server: AgentUIServer | null;
}, [server]);
useEffect(() => {
- if (!requested || !server) return;
+ if (requestEpoch === null || !server) return;
let cancelled = false;
setLoading(true);
setError(null);
@@ -95,11 +101,11 @@ function DraftCatalogStore({ server, children }: { server: AgentUIServer | null;
return () => {
cancelled = true;
};
- }, [requested, server]);
+ }, [requestEpoch, server]);
const value = useMemo(
- () => ({ server, models, skills, connectors, loading, error, ensureLoaded, refreshConnectors }),
- [server, models, skills, connectors, loading, error, ensureLoaded, refreshConnectors],
+ () => ({ server, models, skills, connectors, loading, error, ensureLoaded, refresh, refreshConnectors }),
+ [server, models, skills, connectors, loading, error, ensureLoaded, refresh, refreshConnectors],
);
return <DraftCatalogContext.Provider value={value}>{children}</DraftCatalogContext.Provider>;
@@ -115,6 +121,7 @@ export function useDraftCatalog(): DraftCatalogValue {
loading: false,
error: null,
ensureLoaded: IDLE_ENSURE,
+ refresh: IDLE_ENSURE,
refreshConnectors: IDLE_REFRESH,
};
}
diff --git a/packages/trueforge-ui-sdk/src/atoms/draft/DraftCompositeSelector.tsx b/packages/trueforge-ui-sdk/src/atoms/draft/DraftCompositeSelector.tsx
index 6ce875c45..05ea45005 100644
--- a/packages/trueforge-ui-sdk/src/atoms/draft/DraftCompositeSelector.tsx
+++ b/packages/trueforge-ui-sdk/src/atoms/draft/DraftCompositeSelector.tsx
@@ -5,16 +5,19 @@ import { useCallback, useEffect, useId, useMemo, useRef, useState, type ReactNod
import { useMCPAuth } from '../../hooks/useMcpAuth.js';
import { Icon } from '../../icons/Icon.js';
-import { useServerCapabilities } from '../../server/ServerContext.js';
+import { useOptionalCatalogServer, useServerCapabilities } from '../../server/ServerContext.js';
+import { useOptionalShellMode, type SettingsSection } from '../../server/ShellModeContext.js';
import type { AgentSkill, ConnectorState } from '../../server/types.js';
import { auiButtonClass } from '../lib/buttonClasses.js';
import { cn } from '../lib/cn.js';
import { useCompactLayout } from '../lib/CompactLayoutContext.js';
+import { auiInputClass } from '../lib/inputClasses.js';
import { useIsMobile } from '../lib/useIsMobile.js';
import { BottomSheet } from '../primitives/BottomSheet.js';
import { Tooltip } from '../primitives/Tooltip.js';
import { readAgentCapabilities, withAgentCapabilities } from './agentCapabilities.js';
import { DraftCapabilitiesPanel } from './DraftCapabilitiesPanel.js';
+import { DraftCatalogEmptyState } from './DraftCatalogEmptyState.js';
import { useDraftCatalog } from './DraftCatalogProvider.js';
/** Catalog-backed mount shape used by the draft picker (runtime mounts stay opaque). */
@@ -186,7 +189,7 @@ function SearchField({
value={value}
onChange={e => onChange(e.target.value)}
placeholder={placeholder}
- className="border-input-border bg-secondary-bg/40 text-text-primary placeholder:text-text-secondary h-8 w-full rounded-md border-0 py-1 pr-2 pl-7 text-sm outline-none focus-visible:ring-2 focus-visible:ring-focus-ring/40"
+ className={auiInputClass('h-8 bg-secondary-bg py-1 pr-2 pl-7 dark:bg-primary-bg')}
/>
</label>
);
@@ -207,8 +210,10 @@ function SectionHeading({ label, count }: { label: string; count: number }) {
}
export function DraftCompositeSelector({ disabled, isRunning, onAttach }: DraftCompositeSelectorProps) {
- const { skills, connectors, ensureLoaded, refreshConnectors } = useDraftCatalog();
+ const { skills, connectors, loading, ensureLoaded, refreshConnectors } = useDraftCatalog();
const capabilities = useServerCapabilities();
+ const settingsCatalog = useOptionalCatalogServer();
+ const shell = useOptionalShellMode();
const { agentSpec } = useTrueFoundryAgentSpec();
const updateAgentSpec = useTrueFoundryUpdateAgentSpec();
const [open, setOpen] = useState(false);
@@ -233,6 +238,11 @@ export function DraftCompositeSelector({ disabled, isRunning, onAttach }: DraftC
const compactLayout = useCompactLayout();
const skillsDisabled = capabilities?.skill.enabled !== true;
const skillsDisabledReason = capabilities?.skill.reason;
+ const needsSandbox = capabilities?.sandbox.enabled === false;
+ const settingsEnabled = capabilities?.settings?.enabled !== false;
+ const canConfigureConnectors = settingsEnabled && settingsCatalog?.connectorCatalog != null;
+ const canConfigureSkills = settingsEnabled && settingsCatalog?.skillCatalog != null;
+ const canConfigureSandbox = settingsEnabled && settingsCatalog?.sandboxCatalog != null;
const specMcp = useMemo(() => draftMountsFromSpec(agentSpec?.mcpServers), [agentSpec?.mcpServers]);
const specSkills = useMemo(() => draftMountsFromSpec(agentSpec?.skills), [agentSpec?.skills]);
@@ -393,6 +403,12 @@ export function DraftCompositeSelector({ disabled, isRunning, onAttach }: DraftC
setOpen(true);
};
+ const openSettings = (section: SettingsSection) => {
+ setOpenAndFlush(false);
+ setQuery('');
+ shell?.setSettingsOpen(true, section);
+ };
+
const content = (
<>
<div className="flex shrink-0 border-b border-border">
@@ -500,6 +516,18 @@ export function DraftCompositeSelector({ disabled, isRunning, onAttach }: DraftC
))}
</>
) : null}
+ {filteredConnectors.length === 0 ? (
+ <DraftCatalogEmptyState
+ loading={loading}
+ emptyLabel="No connectors"
+ settingsTarget="Connectors"
+ onOpenSettings={
+ connectors.length === 0 && shell && canConfigureConnectors
+ ? () => openSettings('connectors')
+ : undefined
+ }
+ />
+ ) : null}
</>
) : (
<>
@@ -533,6 +561,18 @@ export function DraftCompositeSelector({ disabled, isRunning, onAttach }: DraftC
))}
</>
) : null}
+ {filteredSkills.length === 0 ? (
+ <DraftCatalogEmptyState
+ loading={loading}
+ emptyLabel="No skills"
+ settingsTarget={needsSandbox ? 'a Sandbox' : 'Skills'}
+ onOpenSettings={
+ skills.length === 0 && shell && (needsSandbox ? canConfigureSandbox : canConfigureSkills)
+ ? () => openSettings(needsSandbox ? 'sandbox' : 'skills')
+ : undefined
+ }
+ />
+ ) : null}
</>
)}
</div>
diff --git a/packages/trueforge-ui-sdk/src/atoms/draft/DraftModelCatalogPanel.tsx b/packages/trueforge-ui-sdk/src/atoms/draft/DraftModelCatalogPanel.tsx
index 4520e2f88..ed13ca195 100644
--- a/packages/trueforge-ui-sdk/src/atoms/draft/DraftModelCatalogPanel.tsx
+++ b/packages/trueforge-ui-sdk/src/atoms/draft/DraftModelCatalogPanel.tsx
@@ -2,10 +2,10 @@
import { Icon } from '../../icons/Icon.js';
import type { ModelSelection } from '../../server/types.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 { DraftCatalogEmptyState } from './DraftCatalogEmptyState.js';
function monogram(value: string): string {
const trimmed = value.trim();
@@ -112,21 +112,12 @@ export function DraftModelCatalogPanel({
className="flex min-h-0 flex-1 flex-col overflow-y-auto p-1"
>
{filtered.length === 0 ? (
- !loading && onOpenSettings ? (
- <button
- type="button"
- className={auiButtonClass({
- variant: 'ghost',
- className: 'text-text-secondary w-full justify-center py-4 text-sm',
- })}
- onClick={onOpenSettings}
- >
- Please configure Models in the <span className="underline">settings</span>
- <Icon name="chevron-right" className="size-3.5" />
- </button>
- ) : (
- <p className="text-text-secondary px-2 py-4 text-center text-sm">{loading ? 'Loading…' : 'No models'}</p>
- )
+ <DraftCatalogEmptyState
+ loading={loading}
+ emptyLabel="No models"
+ settingsTarget="Models"
+ onOpenSettings={onOpenSettings}
+ />
) : (
sections.map((section, sectionIndex) => {
const headingId = `${listboxId}-provider-${sectionIndex}`;
diff --git a/packages/trueforge-ui-sdk/src/atoms/draft/DraftModelSelector.tsx b/packages/trueforge-ui-sdk/src/atoms/draft/DraftModelSelector.tsx
index 4004ab006..468470592 100644
--- a/packages/trueforge-ui-sdk/src/atoms/draft/DraftModelSelector.tsx
+++ b/packages/trueforge-ui-sdk/src/atoms/draft/DraftModelSelector.tsx
@@ -97,7 +97,7 @@ export function DraftModelSelector({ disabled, isRunning }: DraftModelSelectorPr
? () => {
setOpen(false);
setQuery('');
- shell?.setSettingsOpen(true);
+ shell?.setSettingsOpen(true, 'models');
}
: undefined
}
diff --git a/packages/trueforge-ui-sdk/src/containers/SettingsBuilder/index.tsx b/packages/trueforge-ui-sdk/src/containers/SettingsBuilder/index.tsx
index 5641b09aa..3b0da57e8 100644
--- a/packages/trueforge-ui-sdk/src/containers/SettingsBuilder/index.tsx
+++ b/packages/trueforge-ui-sdk/src/containers/SettingsBuilder/index.tsx
@@ -1,14 +1,15 @@
'use client';
-import { lazy, Suspense, useEffect, useMemo, useState } from 'react';
+import { lazy, Suspense, useCallback, useEffect, useMemo } from 'react';
+import { useDraftCatalog } from '@/atoms/draft/DraftCatalogProvider.js';
import { auiButtonClass } from '@/atoms/lib/buttonClasses.js';
import { cn } from '@/atoms/lib/cn.js';
import { useCompactLayout } from '@/atoms/lib/CompactLayoutContext.js';
import { Spinner } from '@/atoms/primitives/Spinner.js';
import { Icon } from '@/icons/Icon.js';
-import { useOptionalCatalogServer } from '@/server/ServerContext.js';
-import { useShellMode } from '@/server/ShellModeContext.js';
+import { useOptionalCatalogServer, useOptionalRefreshServerCapabilities } from '@/server/ServerContext.js';
+import { useShellMode, type SettingsSection } from '@/server/ShellModeContext.js';
// Section modules (and their list/catalog APIs) load only when that tab mounts.
const ModelSettings = lazy(() => import('./ModelSettings.js'));
@@ -25,38 +26,42 @@ function SettingsSectionFallback() {
);
}
-type SettingsSection = 'models' | 'connectors' | 'skills' | 'sandbox';
-
const TruefoundrySettingsBuilder = () => {
- const { settingsOpen, setSettingsOpen } = useShellMode();
+ const { settingsOpen, settingsSection: section, setSettingsOpen } = useShellMode();
const catalog = useOptionalCatalogServer();
+ const refreshServerCapabilities = useOptionalRefreshServerCapabilities();
+ const { refresh: refreshDraftCatalog } = useDraftCatalog();
// dock/widget panels are ~mobile width even on a wide viewport — keep Settings stacked.
const compact = useCompactLayout();
- const [section, setSection] = useState<SettingsSection>('models');
-
const hasSkills = catalog?.skillCatalog != null;
const hasSandbox = catalog?.sandboxCatalog != null;
+ const closeSettings = useCallback(() => {
+ setSettingsOpen(false);
+ refreshDraftCatalog();
+ refreshServerCapabilities?.();
+ }, [refreshDraftCatalog, refreshServerCapabilities, setSettingsOpen]);
+
useEffect(() => {
if (!hasSkills && section === 'skills') {
- setSection('models');
+ setSettingsOpen(settingsOpen, 'models');
}
if (!hasSandbox && section === 'sandbox') {
- setSection('models');
+ setSettingsOpen(settingsOpen, 'models');
}
- }, [hasSkills, hasSandbox, section]);
+ }, [hasSkills, hasSandbox, section, settingsOpen, setSettingsOpen]);
useEffect(() => {
if (!settingsOpen) return;
const onKeyDown = (event: KeyboardEvent) => {
if (event.key !== 'Escape') return;
event.stopImmediatePropagation();
- setSettingsOpen(false);
+ closeSettings();
};
// Capture so layout Escape handlers (sessions drawer / widget) do not also fire.
window.addEventListener('keydown', onKeyDown, true);
return () => window.removeEventListener('keydown', onKeyDown, true);
- }, [settingsOpen, setSettingsOpen]);
+ }, [closeSettings, settingsOpen]);
const sections = useMemo<
Array<{
@@ -92,7 +97,7 @@ const TruefoundrySettingsBuilder = () => {
aria-label="Back"
title="Back"
className={auiButtonClass({ variant: 'ghost', size: 'icon' })}
- onClick={() => setSettingsOpen(false)}
+ onClick={closeSettings}
>
<Icon name="arrow-left" />
</button>
@@ -123,7 +128,7 @@ const TruefoundrySettingsBuilder = () => {
: 'text-text-secondary hover:bg-ghost-button-hover/60 hover:text-text-primary',
)}
onClick={() => {
- setSection(item.id);
+ setSettingsOpen(true, item.id);
}}
>
<Icon name={item.icon} className="h-4 w-4 shrink-0" />
diff --git a/packages/trueforge-ui-sdk/src/server/ShellModeContext.tsx b/packages/trueforge-ui-sdk/src/server/ShellModeContext.tsx
index c0c1317de..a6ede8d8b 100644
--- a/packages/trueforge-ui-sdk/src/server/ShellModeContext.tsx
+++ b/packages/trueforge-ui-sdk/src/server/ShellModeContext.tsx
@@ -42,6 +42,8 @@ export type SelectLibraryAgentRequest = {
agentSpec?: AgentSpec;
};
+export type SettingsSection = 'models' | 'connectors' | 'skills' | 'sandbox';
+
type ShellModeContextValue = {
mode: ShellMode;
/** Host agentConfig mode (capabilities source). */
@@ -53,7 +55,8 @@ type ShellModeContextValue = {
/** Sidebar / list New Chat control. */
isNewChatEnabled: boolean;
settingsOpen: boolean;
- setSettingsOpen: (open: boolean) => void;
+ settingsSection: SettingsSection;
+ setSettingsOpen: (open: boolean, section?: SettingsSection) => void;
/**
* Bind from the Agents Library (Try = immutable, Edit = mutable + agentSpec).
* Prefer this over `selectAgent` / `openDraft` when both fields are available.
@@ -168,12 +171,16 @@ export function ShellModeProvider({
const [clearEpoch, setClearEpoch] = useState(0);
const [agentsListEpoch, setAgentsListEpoch] = useState(0);
const [settingsOpenState, setSettingsOpenState] = useState(initialSettingsOpen);
+ const [settingsSection, setSettingsSection] = useState<SettingsSection>('models');
const [historyAgentFilter, setHistoryAgentFilter] = useState<string | null>(null);
const [pendingSessionId, setPendingSessionId] = useState<string | undefined>(undefined);
const settingsEnabled = capabilities?.settings?.enabled !== false;
const settingsOpen = settingsEnabled && settingsOpenState;
const setSettingsOpen = useCallback(
- (open: boolean) => {
+ (open: boolean, section?: SettingsSection) => {
+ if (section !== undefined) {
+ setSettingsSection(section);
+ }
setSettingsOpenState(settingsEnabled && open);
},
[settingsEnabled],
@@ -356,6 +363,7 @@ export function ShellModeProvider({
isComposerEnabled,
isNewChatEnabled,
settingsOpen,
+ settingsSection,
setSettingsOpen,
selectLibraryAgent,
bindMutableAgent,
@@ -378,6 +386,7 @@ export function ShellModeProvider({
isComposerEnabled,
isNewChatEnabled,
settingsOpen,
+ settingsSection,
setSettingsOpen,
selectLibraryAgent,
bindMutableAgent,
diff --git a/packages/trueforge-ui-sdk/test/atoms/draft/DraftCatalogProvider.test.tsx b/packages/trueforge-ui-sdk/test/atoms/draft/DraftCatalogProvider.test.tsx
index 553e9519c..239ce7414 100644
--- a/packages/trueforge-ui-sdk/test/atoms/draft/DraftCatalogProvider.test.tsx
+++ b/packages/trueforge-ui-sdk/test/atoms/draft/DraftCatalogProvider.test.tsx
@@ -15,6 +15,9 @@ function CatalogProbe() {
<button type="button" onClick={() => catalog.ensureLoaded()}>
Load catalog
</button>
+ <button type="button" onClick={() => catalog.refresh()}>
+ Refresh catalog
+ </button>
<button type="button" onClick={() => void catalog.refreshConnectors()}>
Refresh connectors
</button>
@@ -200,6 +203,30 @@ describe('DraftCatalogProvider', () => {
expect(getSkills).toHaveBeenCalledTimes(1);
});
+ it('reloads every collection when the catalog is refreshed', async () => {
+ const getModels = vi.fn(async (): Promise<ModelSelection[]> => []);
+ const getSkills = vi.fn(async (): Promise<AgentSkill[]> => []);
+ const getMcp = vi.fn(async (): Promise<ConnectorState[]> => []);
+ const server = createMockAgentUIServer({ getModels, getSkills, getMcp });
+
+ render(
+ <ServerProvider server={server}>
+ <DraftCatalogProvider>
+ <CatalogProbe />
+ </DraftCatalogProvider>
+ </ServerProvider>,
+ );
+
+ fireEvent.click(screen.getByRole('button', { name: 'Load catalog' }));
+ await waitFor(() => expect(getModels).toHaveBeenCalledOnce());
+
+ fireEvent.click(screen.getByRole('button', { name: 'Refresh catalog' }));
+
+ await waitFor(() => expect(getModels).toHaveBeenCalledTimes(2));
+ expect(getSkills).toHaveBeenCalledTimes(2);
+ expect(getMcp).toHaveBeenCalledTimes(2);
+ });
+
it('uses the nearest server when catalog providers are nested', async () => {
const outerGetModels = vi.fn(async () => []);
const innerGetModels = vi.fn(async () => [
diff --git a/packages/trueforge-ui-sdk/test/atoms/draft/DraftCompositeSelector.test.tsx b/packages/trueforge-ui-sdk/test/atoms/draft/DraftCompositeSelector.test.tsx
index 5c314a1ee..58f83992c 100644
--- a/packages/trueforge-ui-sdk/test/atoms/draft/DraftCompositeSelector.test.tsx
+++ b/packages/trueforge-ui-sdk/test/atoms/draft/DraftCompositeSelector.test.tsx
@@ -5,31 +5,78 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { DraftCatalogProvider } from '@/atoms/draft/DraftCatalogProvider.js';
import { DraftCompositeSelector } from '@/atoms/draft/DraftCompositeSelector.js';
import { ServerProvider } from '@/server/ServerContext.js';
-import type { AgentSpec } from '@/server/types.js';
-import { createMockAgentUIServer } from '../../server/mockServer.js';
+import type { AgentSpec, CatalogServer, SandboxCatalogServer, SkillCatalogServer } from '@/server/types.js';
+import { createMockAgentUIServer, createMockCatalog } from '../../server/mockServer.js';
let agentSpec: AgentSpec;
const updateAgentSpec = vi.fn();
+const setSettingsOpen = vi.fn();
+
+async function unavailable(): Promise<never> {
+ throw new Error('Unexpected settings catalog call');
+}
+
+const skillCatalog: SkillCatalogServer = {
+ getSkillCatalog: async () => [],
+ listSkills: async () => [],
+ createSkill: unavailable,
+};
+
+const sandboxCatalog: SandboxCatalogServer = {
+ getSandboxProviderCatalog: async () => [],
+ listSandboxProviders: async () => [],
+ createSandboxProvider: unavailable,
+ updateSandboxProvider: unavailable,
+};
+
+const settingsCatalog = createMockCatalog({ skillCatalog, sandboxCatalog });
vi.mock('@truefoundry/assistant-ui-runtime', () => ({
useTrueFoundryAgentSpec: () => ({ agentSpec }),
useTrueFoundryUpdateAgentSpec: () => updateAgentSpec,
}));
-function renderSelector({ onAttach }: { onAttach?: () => void } = {}) {
+vi.mock('@/server/ShellModeContext.js', () => ({
+ useOptionalShellMode: () => ({ setSettingsOpen }),
+}));
+
+function renderSelector({
+ onAttach,
+ getCapabilities,
+ getSkills,
+ getMcp,
+ catalog = settingsCatalog,
+}: {
+ onAttach?: () => void;
+ getCapabilities?: () => Promise<{
+ data: {
+ sandbox: { enabled: boolean };
+ skill: { enabled: boolean; reason?: string };
+ settings?: { enabled: boolean };
+ };
+ }>;
+ getSkills?: () => Promise<{ id: string; name: string }[]>;
+ getMcp?: () => Promise<{ id: string; name: string; authenticated: boolean }[]>;
+ catalog?: CatalogServer | null;
+} = {}) {
const server = createMockAgentUIServer({
- getCapabilities: async () => ({
- data: {
- sandbox: { enabled: true },
- skill: { enabled: true },
- },
- }),
+ ...(catalog === null ? {} : { catalog }),
+ getCapabilities:
+ getCapabilities ??
+ (async () => ({
+ data: {
+ sandbox: { enabled: true },
+ skill: { enabled: true },
+ },
+ })),
getModels: async () => [],
- getSkills: async () => [{ id: 'research', name: 'Research' }],
- getMcp: async () => [
- { id: 'github', name: 'GitHub', authenticated: true },
- { id: 'slack', name: 'Slack', authenticated: true },
- ],
+ getSkills: getSkills ?? (async () => [{ id: 'research', name: 'Research' }]),
+ getMcp:
+ getMcp ??
+ (async () => [
+ { id: 'github', name: 'GitHub', authenticated: true },
+ { id: 'slack', name: 'Slack', authenticated: true },
+ ]),
});
return render(
<ServerProvider server={server}>
@@ -49,6 +96,7 @@ describe('DraftCompositeSelector', () => {
skills: [{ id: 'research', name: 'Research' }],
};
updateAgentSpec.mockReset();
+ setSettingsOpen.mockReset();
});
afterEach(() => {
@@ -73,6 +121,16 @@ describe('DraftCompositeSelector', () => {
expect(screen.queryByRole('dialog', { name: 'Add to composer' })).not.toBeInTheDocument();
});
+ it('uses contrasting search surfaces in light and dark themes', () => {
+ renderSelector();
+ fireEvent.click(screen.getByRole('button', { name: 'Tools (2)' }));
+
+ expect(screen.getByPlaceholderText('Search connectors...')).toHaveClass(
+ 'border-input-border',
+ 'bg-secondary-bg',
+ 'dark:bg-primary-bg',
+ );
+ });
it('shows selected connectors and skills in the Tools tooltip', () => {
renderSelector();
fireEvent.mouseEnter(screen.getByRole('button', { name: 'Tools (2)' }));
@@ -168,4 +226,114 @@ describe('DraftCompositeSelector', () => {
},
});
});
+
+ it('opens settings from the empty connectors state', async () => {
+ renderSelector({ getMcp: async () => [] });
+ fireEvent.click(screen.getByRole('button', { name: 'Tools (2)' }));
+
+ fireEvent.click(await screen.findByRole('button', { name: /Please configure Connectors in the settings/ }));
+
+ expect(setSettingsOpen).toHaveBeenCalledWith(true, 'connectors');
+ expect(screen.queryByRole('dialog', { name: 'Add to composer' })).not.toBeInTheDocument();
+ });
+
+ it('opens settings from the empty skills state', async () => {
+ renderSelector({ getSkills: async () => [] });
+ fireEvent.click(screen.getByRole('button', { name: 'Tools (2)' }));
+ fireEvent.click(screen.getByRole('button', { name: /Skills/ }));
+
+ fireEvent.click(await screen.findByRole('button', { name: /Please configure Skills in the settings/ }));
+
+ expect(setSettingsOpen).toHaveBeenCalledWith(true, 'skills');
+ });
+
+ it('explains the sandbox requirement when skills are unavailable', async () => {
+ renderSelector({
+ getCapabilities: async () => ({
+ data: {
+ sandbox: { enabled: false },
+ skill: { enabled: false, reason: 'Skills run in a sandbox, which is not configured.' },
+ },
+ }),
+ getSkills: async () => [],
+ });
+ fireEvent.click(screen.getByRole('button', { name: 'Tools (2)' }));
+ fireEvent.click(screen.getByRole('button', { name: /Skills/ }));
+
+ expect(await screen.findByRole('status')).toHaveTextContent('Skills run in a sandbox, which is not configured.');
+ const emptyState = screen.getByRole('button', { name: /Please configure a Sandbox in the settings/ });
+ fireEvent.click(emptyState);
+
+ expect(setSettingsOpen).toHaveBeenCalledWith(true, 'sandbox');
+ });
+
+ it('opens skills settings when skills are empty and a sandbox is already configured', async () => {
+ renderSelector({
+ getCapabilities: async () => ({
+ data: {
+ sandbox: { enabled: true },
+ skill: { enabled: false, reason: 'Skills are not available.' },
+ },
+ }),
+ getSkills: async () => [],
+ });
+ fireEvent.click(screen.getByRole('button', { name: 'Tools (2)' }));
+ fireEvent.click(screen.getByRole('button', { name: /Skills/ }));
+
+ fireEvent.click(await screen.findByRole('button', { name: /Please configure Skills in the settings/ }));
+
+ expect(setSettingsOpen).toHaveBeenCalledWith(true, 'skills');
+ });
+
+ it('does not offer connector settings without a settings catalog', async () => {
+ renderSelector({ getMcp: async () => [], catalog: null });
+ fireEvent.click(screen.getByRole('button', { name: 'Tools (2)' }));
+
+ expect(await screen.findByText('No connectors')).toBeInTheDocument();
+ expect(screen.queryByRole('button', { name: /Please configure Connectors/ })).not.toBeInTheDocument();
+ });
+
+ it('does not offer connector settings when settings are disabled', async () => {
+ renderSelector({
+ getCapabilities: async () => ({
+ data: {
+ sandbox: { enabled: true },
+ skill: { enabled: true },
+ settings: { enabled: false },
+ },
+ }),
+ getMcp: async () => [],
+ });
+ fireEvent.click(screen.getByRole('button', { name: 'Tools (2)' }));
+
+ expect(await screen.findByText('No connectors')).toBeInTheDocument();
+ expect(screen.queryByRole('button', { name: /Please configure Connectors/ })).not.toBeInTheDocument();
+ });
+
+ it('does not offer skills settings when the skills settings section is unavailable', async () => {
+ renderSelector({ getSkills: async () => [], catalog: createMockCatalog() });
+ fireEvent.click(screen.getByRole('button', { name: 'Tools (2)' }));
+ fireEvent.click(screen.getByRole('button', { name: /Skills/ }));
+
+ expect(await screen.findByText('No skills')).toBeInTheDocument();
+ expect(screen.queryByRole('button', { name: /Please configure Skills/ })).not.toBeInTheDocument();
+ });
+
+ it('does not offer sandbox settings when the sandbox settings section is unavailable', async () => {
+ renderSelector({
+ getCapabilities: async () => ({
+ data: {
+ sandbox: { enabled: false },
+ skill: { enabled: false, reason: 'Skills run in a sandbox, which is not configured.' },
+ },
+ }),
+ getSkills: async () => [],
+ catalog: createMockCatalog({ skillCatalog }),
+ });
+ fireEvent.click(screen.getByRole('button', { name: 'Tools (2)' }));
+ fireEvent.click(screen.getByRole('button', { name: /Skills/ }));
+
+ expect(await screen.findByText('No skills')).toBeInTheDocument();
+ expect(screen.queryByRole('button', { name: /Please configure a Sandbox/ })).not.toBeInTheDocument();
+ });
});
diff --git a/packages/trueforge-ui-sdk/test/containers/SettingsBuilder/index.test.tsx b/packages/trueforge-ui-sdk/test/containers/SettingsBuilder/index.test.tsx
index a353b68a1..38b599c4b 100644
--- a/packages/trueforge-ui-sdk/test/containers/SettingsBuilder/index.test.tsx
+++ b/packages/trueforge-ui-sdk/test/containers/SettingsBuilder/index.test.tsx
@@ -3,6 +3,7 @@ import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import type { ReactNode } from 'react';
import { describe, expect, it, vi } from 'vitest';
+import { DraftCatalogProvider } from '@/atoms/draft/DraftCatalogProvider.js';
import TruefoundrySettingsBuilder from '@/containers/SettingsBuilder/index.js';
import { ServerProvider } from '@/server/ServerContext.js';
import { ShellModeProvider, useShellMode } from '@/server/ShellModeContext.js';
@@ -65,11 +66,13 @@ function SettingsControls() {
function TestShell({ server, children }: { server?: AgentUIServer; children?: ReactNode }) {
const content = (
- <ShellModeProvider>
- <SettingsControls />
- <TruefoundrySettingsBuilder />
- {children}
- </ShellModeProvider>
+ <DraftCatalogProvider>
+ <ShellModeProvider>
+ <SettingsControls />
+ <TruefoundrySettingsBuilder />
+ {children}
+ </ShellModeProvider>
+ </DraftCatalogProvider>
);
return server === undefined ? content : <ServerProvider server={server}>{content}</ServerProvider>;
}
@@ -160,4 +163,48 @@ describe('TruefoundrySettingsBuilder', () => {
expect(screen.queryByRole('heading', { name: 'Settings' })).not.toBeInTheDocument();
expect(parentKeyDown).not.toHaveBeenCalled();
});
+
+ it('refreshes composer catalogs when settings close', async () => {
+ const getModels = vi.fn(async () => []);
+ const getSkills = vi.fn(async () => []);
+ const getMcp = vi.fn(async () => []);
+ const getCapabilities = vi.fn(async () => ({
+ data: { sandbox: { enabled: true }, skill: { enabled: true } },
+ }));
+ const server = createMockAgentUIServer({
+ catalog: createMockCatalog(),
+ getModels,
+ getSkills,
+ getMcp,
+ getCapabilities,
+ });
+ render(<TestShell server={server} />);
+ await openSettings();
+ await waitFor(() => expect(getCapabilities).toHaveBeenCalled());
+ const capabilitiesCallsAfterOpen = getCapabilities.mock.calls.length;
+
+ fireEvent.click(screen.getByRole('button', { name: 'Back' }));
+
+ expect(screen.queryByRole('heading', { name: 'Settings' })).not.toBeInTheDocument();
+ await waitFor(() => expect(getModels).toHaveBeenCalledOnce());
+ expect(getSkills).toHaveBeenCalledOnce();
+ expect(getMcp).toHaveBeenCalledOnce();
+ await waitFor(() => expect(getCapabilities.mock.calls.length).toBeGreaterThan(capabilitiesCallsAfterOpen));
+ });
+
+ it('does not reopen settings when a stale optional section is reset while closed', async () => {
+ const { rerender } = render(<TestShell server={createServer({ skills: true })} />);
+ await openSettings();
+ fireEvent.click(screen.getByRole('button', { name: 'Skills' }));
+ await waitFor(() => {
+ expect(screen.getByText('Skill settings content')).toBeInTheDocument();
+ });
+
+ fireEvent.click(screen.getByRole('button', { name: 'Back' }));
+ expect(screen.queryByRole('heading', { name: 'Settings' })).not.toBeInTheDocument();
+
+ rerender(<TestShell server={createServer()} />);
+
+ expect(screen.queryByRole('heading', { name: 'Settings' })).not.toBeInTheDocument();
+ });
});
diff --git a/packages/trueforge-ui-sdk/test/server/ShellModeContext.test.tsx b/packages/trueforge-ui-sdk/test/server/ShellModeContext.test.tsx
index 22a7cde1c..19bfcb265 100644
--- a/packages/trueforge-ui-sdk/test/server/ShellModeContext.test.tsx
+++ b/packages/trueforge-ui-sdk/test/server/ShellModeContext.test.tsx
@@ -29,6 +29,7 @@ describe('ShellModeProvider', () => {
it('opens settings on first paint when initialSettingsOpen is true', () => {
const { result } = renderHook(() => useShellMode(), { wrapper: wrap(undefined, true) });
expect(result.current.settingsOpen).toBe(true);
+ expect(result.current.settingsSection).toBe('models');
act(() => result.current.setSettingsOpen(false));
expect(result.current.settingsOpen).toBe(false);
@@ -36,6 +37,15 @@ describe('ShellModeProvider', () => {
expect(result.current.settingsOpen).toBe(false);
});
+ it('opens settings to a requested section', () => {
+ const { result } = renderHook(() => useShellMode(), { wrapper: wrap() });
+
+ act(() => result.current.setSettingsOpen(true, 'connectors'));
+
+ expect(result.current.settingsOpen).toBe(true);
+ expect(result.current.settingsSection).toBe('connectors');
+ });
+
it('defaults to AgentLibraryWithComposer (mutable + library)', () => {
const { result } = renderHook(() => useShellMode(), { wrapper: wrap() });
expect(result.current.mode).toMatchObject({ status: 'active', isMutable: true, locked: false });