Skip to content

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

chore: update model selector to dropdown and update tooltip for message actions (#625)

sayan-truefoundryc69ee7b8ae0f
diff --git a/.changeset/agent-config-model-dropdown.md b/.changeset/agent-config-model-dropdown.md
new file mode 100644
index 000000000..418daf97c
--- /dev/null
+++ b/.changeset/agent-config-model-dropdown.md
@@ -0,0 +1,6 @@
+---
+"@truefoundry/trueforge-ui": minor
+---
+
+Open the Agent Config model picker as an inline dropdown instead of a separate modal.
+Search providers and models across the full catalog with normalized matching.
diff --git a/packages/trueforge-ui/src/atoms/MessageTimestamp.tsx b/packages/trueforge-ui/src/atoms/MessageTimestamp.tsx
index 617d8e646..348ae39ee 100644
--- a/packages/trueforge-ui/src/atoms/MessageTimestamp.tsx
+++ b/packages/trueforge-ui/src/atoms/MessageTimestamp.tsx
@@ -44,7 +44,7 @@ export function MessageTimestamp({ createdAt, className }: MessageTimestampProps
}
return (
- <LightTooltip title={formatFullDate(date)} size="fit">
+ <LightTooltip title={formatFullDate(date)} size="fit" side="bottom">
<span className={cn('text-xs font-medium cursor-pointer leading-normal shrink-0 text-text-secondary', className)}>
{formatTime(date)}
</span>
diff --git a/packages/trueforge-ui/src/atoms/draft/AgentConfigPanel.tsx b/packages/trueforge-ui/src/atoms/draft/AgentConfigPanel.tsx
index cecc2850c..97baa13dd 100644
--- a/packages/trueforge-ui/src/atoms/draft/AgentConfigPanel.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/AgentConfigPanel.tsx
@@ -1,12 +1,13 @@
'use client';
-import type { ReactNode } from 'react';
+import { useState, type ReactNode } from 'react';
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 { DropdownMenu } from '../primitives/DropdownMenu.js';
import { Tooltip } from '../primitives/Tooltip.js';
import type { AgentConfigEditor } from './AgentConfigEditors.js';
import { initialUserMessagesFromSpec } from './agentConfigMessages.js';
@@ -24,6 +25,9 @@ import { runtimeConfigSummary, runtimeConfigValueClassName } from './runtimeConf
export type AgentConfigPanelProps = {
spec: AgentSpec;
model?: ModelSelection;
+ models: ModelSelection[];
+ modelsLoading: boolean;
+ modelsError: string | null;
skillsAvailable: boolean;
instructions: string;
onOpenEditor: (editor: AgentConfigEditor) => void;
@@ -190,6 +194,9 @@ export function AgentConfigSection({
export function AgentConfigPanel({
spec,
model,
+ models,
+ modelsLoading,
+ modelsError,
skillsAvailable,
instructions,
onOpenEditor,
@@ -197,6 +204,9 @@ export function AgentConfigPanel({
onClose,
}: AgentConfigPanelProps) {
const Section = useSlot('AgentConfigSection');
+ const AgentModelEditorContent = useSlot('AgentModelEditorContent');
+ const [modelMenuOpen, setModelMenuOpen] = useState(false);
+ const [modelQuery, setModelQuery] = useState('');
const mcp = editableMountsFromSpec(spec.mcpServers);
const skills = editableMountsFromSpec(spec.skills);
const modelParams = modelParamSummary(spec.model.params);
@@ -236,28 +246,57 @@ export function AgentConfigPanel({
</header>
<div className="min-h-0 flex-1 overflow-y-auto">
<Section>
- <div className="flex items-center gap-2">
- <ProviderMark
- logo={model?.provider.logo}
- label={model?.provider.name ?? spec.model.name}
- className="size-4 text-[0.5rem]"
+ <DropdownMenu
+ open={modelMenuOpen}
+ onOpenChange={open => {
+ setModelMenuOpen(open);
+ if (!open) setModelQuery('');
+ }}
+ closeOnClick={false}
+ align="start"
+ containerClassName="flex w-full"
+ className="w-[min(44rem,calc(100vw-2rem))] overflow-hidden p-0"
+ trigger={
+ <button
+ type="button"
+ aria-label="Edit Model"
+ title="Edit Model"
+ className="py-1 cursor-pointer flex w-full items-center gap-2 rounded-md text-left transition-colors"
+ >
+ <ProviderMark
+ logo={model?.provider.logo}
+ label={model?.provider.name ?? spec.model.name}
+ className="size-4 text-[0.5rem]"
+ />
+ <span className="min-w-0 flex-1 truncate text-sm font-medium">
+ {displayModelLabel(spec.model.name)}
+ </span>
+ {modelInfo.length ? (
+ <span
+ title={modelInfoTitle}
+ className="text-text-secondary shrink-0 whitespace-nowrap text-[0.6875rem]"
+ >
+ {modelInfo.join(' · ')}
+ </span>
+ ) : null}
+ <Icon name="chevrons-up-down" className="text-text-secondary size-3.5 shrink-0" />
+ </button>
+ }
+ >
+ <AgentModelEditorContent
+ spec={spec}
+ models={models}
+ loading={modelsLoading}
+ error={modelsError}
+ query={modelQuery}
+ onQueryChange={setModelQuery}
+ onChange={next => {
+ onChange?.(next);
+ setModelMenuOpen(false);
+ setModelQuery('');
+ }}
/>
- <span className="min-w-0 flex-1 truncate text-sm font-medium">{displayModelLabel(spec.model.name)}</span>
- {modelInfo.length ? (
- <span title={modelInfoTitle} className="text-text-secondary shrink-0 whitespace-nowrap text-[0.6875rem]">
- {modelInfo.join(' · ')}
- </span>
- ) : null}
- <button
- type="button"
- aria-label="Edit Model"
- title="Edit Model"
- className={auiButtonClass({ variant: 'ghost', size: 'icon', className: 'size-7' })}
- onClick={() => onOpenEditor('model')}
- >
- <Icon name="pencil" className="size-3.5" />
- </button>
- </div>
+ </DropdownMenu>
<div className="mt-2 flex items-center gap-2">
<dl className="text-text-secondary flex min-w-0 flex-1 flex-wrap gap-x-3 gap-y-1 text-xs">
{modelParams.length ? (
diff --git a/packages/trueforge-ui/src/atoms/draft/AgentModelConfigModal.tsx b/packages/trueforge-ui/src/atoms/draft/AgentModelConfigModal.tsx
index b807ce457..7732db200 100644
--- a/packages/trueforge-ui/src/atoms/draft/AgentModelConfigModal.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/AgentModelConfigModal.tsx
@@ -1,5 +1,6 @@
'use client';
+import { useMemo } from 'react';
import type { AgentSpec, ModelSelection } from '../../server/types.js';
import { useSlot } from '../../theme/SlotsProvider.js';
import { CenteredModal } from '../primitives/CenteredModal.js';
@@ -28,6 +29,8 @@ export function AgentModelConfigModal({
onClose,
}: AgentModelConfigModalProps) {
const AgentModelEditorContent = useSlot('AgentModelEditorContent');
+ const AgentModelSettingsContent = useSlot('AgentModelSettingsContent');
+ const model = useMemo(() => models.find(item => item.name === spec.model.name), [models, spec.model.name]);
const selectingModel = editor === 'model';
return (
@@ -43,9 +46,8 @@ export function AgentModelConfigModal({
contentSized
aria-label={selectingModel ? 'Edit model' : 'Edit model settings'}
>
- {editor ? (
+ {selectingModel ? (
<AgentModelEditorContent
- editor={editor}
spec={spec}
models={models}
loading={loading}
@@ -54,7 +56,9 @@ export function AgentModelConfigModal({
onQueryChange={onQueryChange}
onChange={onChange}
/>
- ) : null}
+ ) : (
+ <AgentModelSettingsContent spec={spec} model={model} onChange={onChange} />
+ )}
</CenteredModal>
);
}
diff --git a/packages/trueforge-ui/src/atoms/draft/AgentModelEditorContent.tsx b/packages/trueforge-ui/src/atoms/draft/AgentModelEditorContent.tsx
index 899d5e171..d444d3761 100644
--- a/packages/trueforge-ui/src/atoms/draft/AgentModelEditorContent.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/AgentModelEditorContent.tsx
@@ -1,15 +1,16 @@
'use client';
-import { useId, useState } from 'react';
+import { useId, useMemo, useState } from 'react';
+import { Icon } from '@/icons/Icon.js';
import type { AgentSpec, ModelSelection } from '../../server/types.js';
-import { useSlot } from '../../theme/SlotsProvider.js';
import { cn } from '../lib/cn.js';
+import { auiInputClass } from '../lib/inputClasses.js';
import { DraftModelCatalogPanel } from './DraftModelCatalogPanel.js';
+import { modelMatchesQuery, normalizeModelSearchText, providerMatchesQuery } from './modelSearch.js';
import { modelPatchWithReasoningEffort } from './reasoningEffort.js';
export type AgentModelEditorContentProps = {
- editor: 'model' | 'model-settings';
spec: AgentSpec;
models: ModelSelection[];
loading: boolean;
@@ -33,7 +34,6 @@ function modelForSelection(spec: AgentSpec, model: ModelSelection): AgentSpec['m
}
export function AgentModelEditorContent({
- editor,
spec,
models,
loading,
@@ -43,26 +43,70 @@ export function AgentModelEditorContent({
onChange,
}: AgentModelEditorContentProps) {
const listboxId = useId();
- const AgentModelSettingsContent = useSlot('AgentModelSettingsContent');
- const selectedModel = models.find(model => model.name === spec.model.name);
- const providers = Array.from(new Set(models.map(model => model.provider.name)));
+ const selectedModel = useMemo(() => models.find(model => model.name === spec.model.name), [models, spec.model.name]);
+ const providers = useMemo(() => Array.from(new Set(models.map(model => model.provider.name))), [models]);
const [provider, setProvider] = useState(selectedModel?.provider.name ?? providers[0] ?? '');
- const effectiveProvider = providers.includes(provider)
- ? provider
- : (selectedModel?.provider.name ?? providers[0] ?? '');
+ const needle = normalizeModelSearchText(query);
+ const matchingProviders = useMemo(
+ () =>
+ providers
+ .map(name => {
+ const providerModels = models.filter(model => model.provider.name === name);
+ return {
+ name,
+ models: providerMatchesQuery({ providerName: name, needle })
+ ? providerModels
+ : providerModels.filter(model => modelMatchesQuery({ model, needle })),
+ };
+ })
+ .filter(item => item.models.length > 0),
+ [models, needle, providers],
+ );
+ const visibleProviders = useMemo(() => matchingProviders.map(item => item.name), [matchingProviders]);
+ const effectiveProvider = useMemo(
+ () =>
+ visibleProviders.includes(provider)
+ ? provider
+ : selectedModel && visibleProviders.includes(selectedModel.provider.name)
+ ? selectedModel.provider.name
+ : (visibleProviders[0] ?? ''),
+ [provider, selectedModel, visibleProviders],
+ );
+ const visibleModels = useMemo(
+ () => matchingProviders.find(item => item.name === effectiveProvider)?.models ?? [],
+ [effectiveProvider, matchingProviders],
+ );
- if (editor === 'model') {
- return (
- <div className="grid h-[min(32rem,calc(100dvh-8rem))] w-full min-w-0 grid-cols-[13rem_minmax(0,1fr)] overflow-hidden">
- {error ? <p className="text-failure-bg px-3 pt-3 text-sm">{error}</p> : null}
+ return (
+ <div>
+ <div className="border-b border-border px-3 py-2">
+ <p className="text-text-primary mb-2 text-base font-medium">Select model</p>
+ <label className="relative block">
+ <Icon
+ name="search"
+ className="text-text-secondary pointer-events-none absolute top-1/2 left-2 size-3.5 -translate-y-1/2"
+ />
+ <input
+ type="search"
+ value={query}
+ onChange={event => onQueryChange(event.target.value)}
+ placeholder="Search"
+ className={auiInputClass('h-8 py-1 pr-2 pl-7')}
+ autoFocus
+ />
+ </label>
+ </div>
+ {error ? <p className="text-failure-bg px-3 pt-3 text-sm">{error}</p> : null}
+ <div className="grid h-[min(22rem,calc(100dvh-8rem))] w-full min-w-0 grid-cols-[13rem_minmax(0,1fr)] overflow-hidden">
<div className="min-h-0 overflow-y-auto border-r border-border p-2">
- {providers.map(name => (
+ {visibleProviders.map(name => (
<button
key={name}
type="button"
className={cn(
'text-text-secondary mb-1 w-full truncate rounded-md px-2 py-2 text-left text-xs',
- effectiveProvider === name && 'bg-dropdown-selected-item-bg text-dropdown-selected-item-text',
+ effectiveProvider === name &&
+ 'bg-primary-button-bg/10 border border-primary-button-bg font-medium text-primary-button-bg',
)}
onClick={() => setProvider(name)}
>
@@ -72,21 +116,20 @@ export function AgentModelEditorContent({
</div>
<div className="flex min-h-0 min-w-0 flex-col overflow-hidden">
<DraftModelCatalogPanel
- models={models.filter(model => model.provider.name === effectiveProvider)}
+ models={visibleModels}
loading={loading}
selectedName={spec.model.name}
query={query}
onQueryChange={onQueryChange}
listboxId={listboxId}
showHeading={false}
+ showSearch={false}
onSelect={model => onChange({ ...spec, model: modelForSelection(spec, model) })}
/>
</div>
</div>
- );
- }
-
- return <AgentModelSettingsContent spec={spec} model={selectedModel} onChange={onChange} />;
+ </div>
+ );
}
declare module '../../theme/SlotsProvider.js' {
diff --git a/packages/trueforge-ui/src/atoms/draft/DraftModelCatalogPanel.tsx b/packages/trueforge-ui/src/atoms/draft/DraftModelCatalogPanel.tsx
index 81c8335b5..c5cb78d6c 100644
--- a/packages/trueforge-ui/src/atoms/draft/DraftModelCatalogPanel.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/DraftModelCatalogPanel.tsx
@@ -1,11 +1,13 @@
'use client';
+import { useMemo } from 'react';
import { Icon } from '../../icons/Icon.js';
import type { ModelSelection } from '../../server/types.js';
import { cn } from '../lib/cn.js';
import { auiInputClass } from '../lib/inputClasses.js';
import { CatalogLogo } from '../primitives/CatalogLogo.js';
import { DraftCatalogEmptyState } from './DraftCatalogEmptyState.js';
+import { modelMatchesQuery, normalizeModelSearchText } from './modelSearch.js';
function monogram(value: string): string {
const trimmed = value.trim();
@@ -68,6 +70,7 @@ export function DraftModelCatalogPanel({
onOpenSettings,
listboxId,
showHeading = true,
+ showSearch = true,
}: {
models: ModelSelection[];
loading: boolean;
@@ -78,38 +81,37 @@ export function DraftModelCatalogPanel({
onOpenSettings?: () => void;
listboxId: string;
showHeading?: boolean;
+ showSearch?: boolean;
}) {
- const needle = query.trim().toLowerCase();
- const filtered = needle
- ? models.filter(
- model =>
- model.name.toLowerCase().includes(needle) ||
- model.id.toLowerCase().includes(needle) ||
- model.provider.name.toLowerCase().includes(needle),
- )
- : models;
+ const needle = normalizeModelSearchText(query);
+ const filtered = useMemo(
+ () => (needle ? models.filter(model => modelMatchesQuery({ model, needle })) : models),
+ [models, needle],
+ );
const sections = groupModelsByProvider(filtered);
const detailedGridClass = 'grid-cols-[minmax(0,1fr)_5rem]';
return (
<>
- <div className="border-b border-border px-3 py-2">
- {showHeading ? <p className="text-text-primary mb-2 text-sm font-normal">Select model</p> : null}
- <label className="relative block">
- <Icon
- name="search"
- className="text-text-secondary pointer-events-none absolute top-1/2 left-2 size-3.5 -translate-y-1/2"
- />
- <input
- type="search"
- value={query}
- onChange={event => onQueryChange(event.target.value)}
- placeholder="Search"
- className={auiInputClass('h-8 py-1 pr-2 pl-7')}
- autoFocus
- />
- </label>
- </div>
+ {showSearch && (
+ <div className="border-b border-border px-3 py-2">
+ {showHeading ? <p className="text-text-primary mb-2 text-sm font-normal">Select model</p> : null}
+ <label className="relative block">
+ <Icon
+ name="search"
+ className="text-text-secondary pointer-events-none absolute top-1/2 left-2 size-3.5 -translate-y-1/2"
+ />
+ <input
+ type="search"
+ value={query}
+ onChange={event => onQueryChange(event.target.value)}
+ placeholder="Search"
+ className={auiInputClass('h-8 py-1 pr-2 pl-7')}
+ autoFocus
+ />
+ </label>
+ </div>
+ )}
{!showHeading ? (
<div
className={cn(
@@ -162,9 +164,7 @@ export function DraftModelCatalogPanel({
className={cn(
'w-full items-center rounded-md px-2 py-2 text-left text-sm',
showHeading ? 'flex' : cn('grid gap-2', detailedGridClass),
- active
- ? 'bg-dropdown-selected-item-bg text-dropdown-selected-item-text'
- : 'hover:bg-ghost-button-hover',
+ active ? 'bg-primary-button-bg/10 text-primary-button-bg' : 'hover:bg-ghost-button-hover',
)}
onClick={() => onSelect(model)}
>
@@ -189,7 +189,7 @@ export function DraftModelCatalogPanel({
</span>
{!showHeading ? (
<>
- <span className="text-text-secondary text-xs">
+ <span className={cn('text-text-secondary text-xs', active && 'text-primary-button-bg')}>
{model.properties.contextLength === undefined
? '—'
: formatTokens(model.properties.contextLength)}
diff --git a/packages/trueforge-ui/src/atoms/draft/modelSearch.ts b/packages/trueforge-ui/src/atoms/draft/modelSearch.ts
new file mode 100644
index 000000000..97d48a2b2
--- /dev/null
+++ b/packages/trueforge-ui/src/atoms/draft/modelSearch.ts
@@ -0,0 +1,17 @@
+import type { ModelSelection } from '../../server/types.js';
+
+export function normalizeModelSearchText(value: string): string {
+ return value.toLowerCase().replace(/[-_\s]/g, '');
+}
+
+export function providerMatchesQuery({ providerName, needle }: { providerName: string; needle: string }): boolean {
+ return normalizeModelSearchText(providerName).includes(needle);
+}
+
+export function modelMatchesQuery({ model, needle }: { model: ModelSelection; needle: string }): boolean {
+ return (
+ normalizeModelSearchText(model.name).includes(needle) ||
+ normalizeModelSearchText(model.id).includes(needle) ||
+ providerMatchesQuery({ providerName: model.provider.name, needle })
+ );
+}
diff --git a/packages/trueforge-ui/src/atoms/primitives/DropdownMenu.tsx b/packages/trueforge-ui/src/atoms/primitives/DropdownMenu.tsx
index 71ef54145..9d7b4411a 100644
--- a/packages/trueforge-ui/src/atoms/primitives/DropdownMenu.tsx
+++ b/packages/trueforge-ui/src/atoms/primitives/DropdownMenu.tsx
@@ -1,6 +1,6 @@
'use client';
-import React, { useEffect, useId, useLayoutEffect, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useId, useLayoutEffect, useRef, useState } from 'react';
import { createPortal } from 'react-dom';
import { cn } from '../lib/cn.js';
@@ -11,10 +11,31 @@ export type DropdownMenuProps = {
children: React.ReactNode;
align?: 'start' | 'end';
className?: string;
+ containerClassName?: string;
+ open?: boolean;
+ onOpenChange?: (open: boolean) => void;
+ closeOnClick?: boolean;
};
-export function DropdownMenu({ trigger, children, align = 'end', className }: DropdownMenuProps) {
- const [open, setOpen] = useState(false);
+export function DropdownMenu({
+ trigger,
+ children,
+ align = 'end',
+ className,
+ containerClassName,
+ open: controlledOpen,
+ onOpenChange,
+ closeOnClick = true,
+}: DropdownMenuProps) {
+ const [internalOpen, setInternalOpen] = useState(false);
+ const open = controlledOpen ?? internalOpen;
+ const setOpen = useCallback(
+ (nextOpen: boolean) => {
+ if (controlledOpen === undefined) setInternalOpen(nextOpen);
+ onOpenChange?.(nextOpen);
+ },
+ [controlledOpen, onOpenChange],
+ );
const [pos, setPos] = useState<{ top: number; left: number } | null>(null);
const containerRef = useRef<HTMLDivElement>(null);
const menuRef = useRef<HTMLDivElement>(null);
@@ -138,7 +159,7 @@ export function DropdownMenu({ trigger, children, align = 'end', className }: Dr
'text-text-primary shadow-md',
className,
)}
- onClick={() => setOpen(false)}
+ onClick={closeOnClick ? () => setOpen(false) : undefined}
>
{children}
</div>,
@@ -147,8 +168,10 @@ export function DropdownMenu({ trigger, children, align = 'end', className }: Dr
: null;
return (
- <div ref={containerRef} className="relative inline-flex">
- <div onClick={() => setOpen(v => !v)}>{triggerEl}</div>
+ <div ref={containerRef} className={cn('relative inline-flex', containerClassName)}>
+ <div className="contents" onClick={() => setOpen(!open)}>
+ {triggerEl}
+ </div>
{menu}
</div>
);
diff --git a/packages/trueforge-ui/src/atoms/primitives/IconButton.tsx b/packages/trueforge-ui/src/atoms/primitives/IconButton.tsx
index 3128113ef..3ff57abaa 100644
--- a/packages/trueforge-ui/src/atoms/primitives/IconButton.tsx
+++ b/packages/trueforge-ui/src/atoms/primitives/IconButton.tsx
@@ -1,6 +1,7 @@
import React from 'react';
import { Button, type ButtonProps } from './Button.js';
+import { Tooltip } from './Tooltip.js';
export type IconButtonProps = Omit<ButtonProps, 'size' | 'children'> & {
'aria-label': string;
@@ -11,9 +12,11 @@ export type IconButtonProps = Omit<ButtonProps, 'size' | 'children'> & {
export const IconButton = React.forwardRef<HTMLButtonElement, IconButtonProps>(
({ tooltip, children, ...props }, ref) => {
return (
- <Button ref={ref} size="icon" title={tooltip} {...props}>
- {children}
- </Button>
+ <Tooltip content={tooltip} side="bottom">
+ <Button ref={ref} size="icon" {...props}>
+ {children}
+ </Button>
+ </Tooltip>
);
},
);
diff --git a/packages/trueforge-ui/src/containers/AgentConfigDrawerContainer.tsx b/packages/trueforge-ui/src/containers/AgentConfigDrawerContainer.tsx
index b5ba2d77f..358209584 100644
--- a/packages/trueforge-ui/src/containers/AgentConfigDrawerContainer.tsx
+++ b/packages/trueforge-ui/src/containers/AgentConfigDrawerContainer.tsx
@@ -43,7 +43,12 @@ export function AgentConfigDrawerContainer({ showClose = false }: { showClose?:
useEffect(() => {
if (!showClose || !shell.agentConfigOpen) return;
const onKeyDown = (event: KeyboardEvent) => {
- if (event.key === 'Escape' && editor === null && document.querySelector('dialog[open]') === null) {
+ if (
+ !event.defaultPrevented &&
+ event.key === 'Escape' &&
+ editor === null &&
+ document.querySelector('dialog[open]') === null
+ ) {
closeDrawer();
}
};
@@ -120,6 +125,9 @@ export function AgentConfigDrawerContainer({ showClose = false }: { showClose?:
<AgentConfigPanel
spec={agentSpec}
model={model}
+ models={catalog.models}
+ modelsLoading={catalog.loading}
+ modelsError={catalog.error}
skillsAvailable={capabilities?.skill.enabled === true}
instructions={instructionDraft}
onOpenEditor={setEditor}
diff --git a/packages/trueforge-ui/src/icons/IconRegistry.tsx b/packages/trueforge-ui/src/icons/IconRegistry.tsx
index 43b6669da..ee3ce4972 100644
--- a/packages/trueforge-ui/src/icons/IconRegistry.tsx
+++ b/packages/trueforge-ui/src/icons/IconRegistry.tsx
@@ -14,6 +14,7 @@ import {
ChevronDown,
ChevronLeft,
ChevronRight,
+ ChevronsUpDown,
CircleAlert,
CircleCheck,
CircleX,
@@ -145,6 +146,7 @@ const defaults: Record<string, IconEntry> = {
'chevron-down': ChevronDown,
'chevron-left': ChevronLeft,
'chevron-right': ChevronRight,
+ 'chevrons-up-down': ChevronsUpDown,
loader: Loader2,
file: File,
clone: Copy,
diff --git a/packages/trueforge-ui/test/atoms/MessageActionBar.test.tsx b/packages/trueforge-ui/test/atoms/MessageActionBar.test.tsx
index 100163270..08b08acd3 100644
--- a/packages/trueforge-ui/test/atoms/MessageActionBar.test.tsx
+++ b/packages/trueforge-ui/test/atoms/MessageActionBar.test.tsx
@@ -11,9 +11,13 @@ describe('MessageActionBar', () => {
);
const copyButton = screen.getByRole('button', { name: 'Copy' });
- expect(copyButton).toHaveAttribute('title', 'Copy');
+ fireEvent.mouseEnter(copyButton);
+ expect(screen.getByRole('tooltip')).toHaveTextContent('Copy');
expect(copyButton.querySelector('svg')).toHaveClass('lucide-copy');
- expect(copyButton.parentElement).toHaveClass('aui-assistant-action-bar-root', 'host-bar');
+ expect(copyButton.closest('.aui-assistant-action-bar-root')).toHaveClass(
+ 'aui-assistant-action-bar-root',
+ 'host-bar',
+ );
fireEvent.click(copyButton);
expect(onCopy).toHaveBeenCalledOnce();
diff --git a/packages/trueforge-ui/test/atoms/UserMessageActionBar.test.tsx b/packages/trueforge-ui/test/atoms/UserMessageActionBar.test.tsx
index b99f24dbb..73747649c 100644
--- a/packages/trueforge-ui/test/atoms/UserMessageActionBar.test.tsx
+++ b/packages/trueforge-ui/test/atoms/UserMessageActionBar.test.tsx
@@ -16,10 +16,17 @@ describe('UserMessageActionBar', () => {
const editButton = screen.getByRole('button', { name: 'Edit' });
const copyButton = screen.getByRole('button', { name: 'Copy' });
- expect(retryButton).toHaveAttribute('title', 'Try again');
- expect(editButton).toHaveAttribute('title', 'Edit');
- expect(copyButton).toHaveAttribute('title', 'Copy');
- expect(retryButton.parentElement).toHaveClass('aui-user-action-bar-root', 'host-bar');
+ fireEvent.mouseEnter(retryButton);
+ expect(screen.getByRole('tooltip')).toHaveTextContent('Try again');
+ fireEvent.mouseLeave(retryButton);
+
+ fireEvent.mouseEnter(editButton);
+ expect(screen.getByRole('tooltip')).toHaveTextContent('Edit');
+ fireEvent.mouseLeave(editButton);
+
+ fireEvent.mouseEnter(copyButton);
+ expect(screen.getByRole('tooltip')).toHaveTextContent('Copy');
+ expect(retryButton.closest('.aui-user-action-bar-root')).toHaveClass('aui-user-action-bar-root', 'host-bar');
fireEvent.click(retryButton);
fireEvent.click(editButton);
diff --git a/packages/trueforge-ui/test/atoms/draft/AgentConfigPanel.test.tsx b/packages/trueforge-ui/test/atoms/draft/AgentConfigPanel.test.tsx
index e13e72e2a..420ca2ddb 100644
--- a/packages/trueforge-ui/test/atoms/draft/AgentConfigPanel.test.tsx
+++ b/packages/trueforge-ui/test/atoms/draft/AgentConfigPanel.test.tsx
@@ -17,6 +17,22 @@ const model: ModelSelection = {
},
};
+const secondModel: ModelSelection = {
+ id: 'claude-sonnet',
+ name: 'anthropic/claude-sonnet',
+ provider: { name: 'Anthropic' },
+ properties: {
+ contextLength: 200_000,
+ maxOutputTokens: 32_000,
+ },
+};
+
+const catalogProps = {
+ models: [model, secondModel],
+ modelsLoading: false,
+ modelsError: null,
+};
+
const spec: AgentSpec = {
model: {
name: model.name,
@@ -42,6 +58,7 @@ describe('AgentConfigPanel', () => {
<AgentConfigPanel
spec={spec}
model={model}
+ {...catalogProps}
skillsAvailable
instructions={spec.instructions ?? ''}
onOpenEditor={vi.fn()}
@@ -84,6 +101,7 @@ describe('AgentConfigPanel', () => {
<AgentConfigPanel
spec={spec}
model={model}
+ {...catalogProps}
skillsAvailable
instructions={spec.instructions ?? ''}
onOpenEditor={onOpenEditor}
@@ -101,6 +119,41 @@ describe('AgentConfigPanel', () => {
expect(onOpenEditor).toHaveBeenCalledWith('instructions');
});
+ it('opens the model catalog as a dropdown and selects a model', () => {
+ const onChange = vi.fn();
+ const onOpenEditor = vi.fn();
+ render(
+ <SlotsProvider>
+ <AgentConfigPanel
+ spec={spec}
+ model={model}
+ {...catalogProps}
+ skillsAvailable
+ instructions={spec.instructions ?? ''}
+ onOpenEditor={onOpenEditor}
+ onChange={onChange}
+ />
+ </SlotsProvider>,
+ );
+
+ fireEvent.click(screen.getByRole('button', { name: 'Edit Model' }));
+
+ expect(screen.getByRole('menu')).toBeInTheDocument();
+ expect(screen.getByText('Context')).toBeInTheDocument();
+
+ fireEvent.click(screen.getByRole('option', { name: /claude-sonnet/ }));
+
+ expect(onChange).toHaveBeenCalledWith({
+ ...spec,
+ model: {
+ name: secondModel.name,
+ params: { ...spec.model.params, reasoningEffort: undefined },
+ },
+ });
+ expect(onOpenEditor).not.toHaveBeenCalledWith('model');
+ expect(screen.queryByRole('menu')).not.toBeInTheDocument();
+ });
+
it('previews instructions and summarizes initial user messages', () => {
const specWithMessages = withInitialUserMessages({
spec,
@@ -115,6 +168,7 @@ describe('AgentConfigPanel', () => {
<AgentConfigPanel
spec={specWithMessages}
model={model}
+ {...catalogProps}
skillsAvailable
instructions="Use the configured tools carefully."
onOpenEditor={vi.fn()}
@@ -133,6 +187,7 @@ describe('AgentConfigPanel', () => {
<AgentConfigPanel
spec={spec}
model={model}
+ {...catalogProps}
skillsAvailable
instructions={spec.instructions ?? ''}
onOpenEditor={vi.fn()}
@@ -152,6 +207,7 @@ describe('AgentConfigPanel', () => {
<AgentConfigPanel
spec={spec}
model={model}
+ {...catalogProps}
skillsAvailable
instructions={spec.instructions ?? ''}
onOpenEditor={vi.fn()}
@@ -174,6 +230,7 @@ describe('AgentConfigPanel', () => {
<AgentConfigPanel
spec={spec}
model={model}
+ {...catalogProps}
skillsAvailable
instructions={spec.instructions ?? ''}
onOpenEditor={onOpenEditor}
@@ -195,6 +252,7 @@ describe('AgentConfigPanel', () => {
<AgentConfigPanel
spec={spec}
model={model}
+ {...catalogProps}
skillsAvailable
instructions={spec.instructions ?? ''}
onOpenEditor={onOpenEditor}
@@ -213,6 +271,7 @@ describe('AgentConfigPanel', () => {
<AgentConfigPanel
spec={{ ...spec, mcpServers: [] }}
model={model}
+ {...catalogProps}
skillsAvailable
instructions={spec.instructions ?? ''}
onOpenEditor={vi.fn()}
@@ -232,6 +291,7 @@ describe('AgentConfigPanel', () => {
<AgentConfigPanel
spec={spec}
model={model}
+ {...catalogProps}
skillsAvailable
instructions={spec.instructions ?? ''}
onOpenEditor={vi.fn()}
diff --git a/packages/trueforge-ui/test/atoms/draft/AgentModelEditorContent.test.tsx b/packages/trueforge-ui/test/atoms/draft/AgentModelEditorContent.test.tsx
new file mode 100644
index 000000000..443bfc919
--- /dev/null
+++ b/packages/trueforge-ui/test/atoms/draft/AgentModelEditorContent.test.tsx
@@ -0,0 +1,98 @@
+// @vitest-environment jsdom
+import { fireEvent, render, screen, within } from '@testing-library/react';
+import { useState } from 'react';
+import { describe, expect, it, vi } from 'vitest';
+
+import { AgentModelEditorContent } from '@/atoms/draft/AgentModelEditorContent.js';
+import type { AgentSpec, ModelSelection } from '@/server/types.js';
+
+const models: ModelSelection[] = [
+ {
+ id: 'gpt-4o',
+ name: 'openai/gpt-4o',
+ provider: { name: 'OpenAI' },
+ properties: {},
+ },
+ {
+ id: 'gpt-4.1',
+ name: 'openai/gpt-4.1',
+ provider: { name: 'OpenAI' },
+ properties: {},
+ },
+ {
+ id: 'claude-sonnet',
+ name: 'anthropic/claude-sonnet',
+ provider: { name: 'Anthropic' },
+ properties: {},
+ },
+ {
+ id: 'claude-haiku',
+ name: 'anthropic/claude-haiku',
+ provider: { name: 'Anthropic' },
+ properties: {},
+ },
+];
+
+const spec: AgentSpec = { model: { name: 'openai/gpt-4o' } };
+
+function ModelEditor() {
+ const [query, setQuery] = useState('');
+ return (
+ <AgentModelEditorContent
+ spec={spec}
+ models={models}
+ loading={false}
+ error={null}
+ query={query}
+ onQueryChange={setQuery}
+ onChange={vi.fn()}
+ />
+ );
+}
+
+describe('AgentModelEditorContent', () => {
+ it('shows every model when the normalized provider name matches', () => {
+ render(<ModelEditor />);
+
+ fireEvent.change(screen.getByRole('searchbox'), { target: { value: 'anth ro_pic' } });
+
+ expect(screen.queryByRole('button', { name: 'OpenAI' })).not.toBeInTheDocument();
+ expect(screen.getByRole('button', { name: 'Anthropic' })).toBeInTheDocument();
+ expect(within(screen.getByRole('listbox')).getAllByRole('option')).toHaveLength(2);
+ });
+
+ it('finds a model in another provider and selects that provider', () => {
+ render(<ModelEditor />);
+
+ fireEvent.change(screen.getByRole('searchbox'), { target: { value: 'claude sonnet' } });
+
+ expect(screen.queryByRole('button', { name: 'OpenAI' })).not.toBeInTheDocument();
+ expect(screen.getByRole('button', { name: 'Anthropic' })).toBeInTheDocument();
+ expect(within(screen.getByRole('listbox')).getByRole('option')).toHaveTextContent('claude-sonnet');
+ });
+
+ it('restores the chosen provider after clearing the query', () => {
+ render(<ModelEditor />);
+
+ fireEvent.click(screen.getByRole('button', { name: 'Anthropic' }));
+ fireEvent.change(screen.getByRole('searchbox'), { target: { value: 'gpt_4o' } });
+ expect(within(screen.getByRole('listbox')).getByRole('option')).toHaveTextContent('gpt-4o');
+
+ fireEvent.change(screen.getByRole('searchbox'), { target: { value: '' } });
+
+ expect(screen.getByRole('button', { name: 'OpenAI' })).toBeInTheDocument();
+ expect(screen.getByRole('button', { name: 'Anthropic' })).toBeInTheDocument();
+ expect(within(screen.getByRole('listbox')).getAllByRole('option')).toHaveLength(2);
+ expect(within(screen.getByRole('listbox')).getByText('claude-sonnet')).toBeInTheDocument();
+ });
+
+ it('shows the empty state when nothing matches', () => {
+ render(<ModelEditor />);
+
+ fireEvent.change(screen.getByRole('searchbox'), { target: { value: 'missing' } });
+
+ expect(screen.queryByRole('button', { name: 'OpenAI' })).not.toBeInTheDocument();
+ expect(screen.queryByRole('button', { name: 'Anthropic' })).not.toBeInTheDocument();
+ expect(screen.getByText('No models')).toBeInTheDocument();
+ });
+});
diff --git a/packages/trueforge-ui/test/atoms/draft/modelSearch.test.ts b/packages/trueforge-ui/test/atoms/draft/modelSearch.test.ts
new file mode 100644
index 000000000..714e51a3e
--- /dev/null
+++ b/packages/trueforge-ui/test/atoms/draft/modelSearch.test.ts
@@ -0,0 +1,27 @@
+import { describe, expect, it } from 'vitest';
+
+import { modelMatchesQuery, normalizeModelSearchText, providerMatchesQuery } from '@/atoms/draft/modelSearch.js';
+import type { ModelSelection } from '@/server/types.js';
+
+const model: ModelSelection = {
+ id: 'gpt-4o',
+ name: 'openai/gpt-4o',
+ provider: { name: 'Open_AI' },
+ properties: {},
+};
+
+describe('model search', () => {
+ it('normalizes casing, hyphens, underscores, and whitespace', () => {
+ expect(normalizeModelSearchText(' GPT-4_o ')).toBe('gpt4o');
+ });
+
+ it('matches normalized model names and ids', () => {
+ expect(modelMatchesQuery({ model, needle: normalizeModelSearchText('GPT 4o') })).toBe(true);
+ expect(modelMatchesQuery({ model, needle: normalizeModelSearchText('gpt_4o') })).toBe(true);
+ });
+
+ it('matches provider names and empty queries', () => {
+ expect(providerMatchesQuery({ providerName: model.provider.name, needle: 'openai' })).toBe(true);
+ expect(modelMatchesQuery({ model, needle: '' })).toBe(true);
+ });
+});
diff --git a/packages/trueforge-ui/test/atoms/primitives/DropdownMenu.test.tsx b/packages/trueforge-ui/test/atoms/primitives/DropdownMenu.test.tsx
index 48959c529..971f180b5 100644
--- a/packages/trueforge-ui/test/atoms/primitives/DropdownMenu.test.tsx
+++ b/packages/trueforge-ui/test/atoms/primitives/DropdownMenu.test.tsx
@@ -134,4 +134,41 @@ describe('DropdownMenu', () => {
expect(screen.getByTestId('clipped').contains(menu)).toBe(false);
expect(menu.className).toContain('fixed');
});
+
+ it('keeps the menu open for interactive content when closeOnClick is false', () => {
+ render(
+ <DropdownMenu closeOnClick={false} trigger={<button>Actions</button>}>
+ <button type="button">Interactive content</button>
+ </DropdownMenu>,
+ );
+
+ fireEvent.click(screen.getByRole('button', { name: 'Actions' }));
+ fireEvent.click(screen.getByRole('button', { name: 'Interactive content' }));
+
+ expect(screen.getByRole('menu')).toBeInTheDocument();
+ });
+
+ it('supports controlled open state', () => {
+ const onOpenChange = vi.fn();
+ const { rerender } = render(
+ <DropdownMenu open={false} onOpenChange={onOpenChange} trigger={<button>Actions</button>}>
+ <DropdownMenuItem>Rename</DropdownMenuItem>
+ </DropdownMenu>,
+ );
+
+ fireEvent.click(screen.getByRole('button', { name: 'Actions' }));
+ expect(onOpenChange).toHaveBeenLastCalledWith(true);
+ expect(screen.queryByRole('menu')).not.toBeInTheDocument();
+
+ rerender(
+ <DropdownMenu open onOpenChange={onOpenChange} trigger={<button>Actions</button>}>
+ <DropdownMenuItem>Rename</DropdownMenuItem>
+ </DropdownMenu>,
+ );
+ expect(screen.getByRole('menu')).toBeInTheDocument();
+
+ fireEvent.click(screen.getByRole('button', { name: 'Actions' }));
+ expect(onOpenChange).toHaveBeenLastCalledWith(false);
+ expect(screen.getByRole('menu')).toBeInTheDocument();
+ });
});
diff --git a/packages/trueforge-ui/test/atoms/primitives/IconButton.test.tsx b/packages/trueforge-ui/test/atoms/primitives/IconButton.test.tsx
index d29a84e0e..cd67da135 100644
--- a/packages/trueforge-ui/test/atoms/primitives/IconButton.test.tsx
+++ b/packages/trueforge-ui/test/atoms/primitives/IconButton.test.tsx
@@ -25,23 +25,26 @@ describe('IconButton', () => {
const button = screen.getByRole('button', { name: 'Open settings' });
expect(button).toBe(ref.current);
- expect(button).toHaveAttribute('title', 'Settings');
expect(button).toHaveAttribute('type', 'button');
expect(button).toHaveAttribute('data-track', 'settings');
expect(button).toHaveClass('h-8', 'w-8', 'host-icon-button');
expect(button.className).toMatch(/\[&_svg\]:size-3\.5/);
+ fireEvent.mouseEnter(button);
+ expect(screen.getByRole('tooltip')).toHaveTextContent('Settings');
+
fireEvent.click(button);
expect(onClick).toHaveBeenCalledOnce();
});
- it('does not add an empty title when no tooltip is provided', () => {
+ it('does not render a tooltip when none is provided', () => {
render(
<IconButton aria-label="Close">
<span aria-hidden="true">×</span>
</IconButton>,
);
- expect(screen.getByRole('button', { name: 'Close' })).not.toHaveAttribute('title');
+ fireEvent.mouseEnter(screen.getByRole('button', { name: 'Close' }));
+ expect(screen.queryByRole('tooltip')).not.toBeInTheDocument();
});
});