Skip to content

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

feat: added 2 step bottom sheet for model selector (#659)

Vinit57f1fc2c51aa
diff --git a/.changeset/compact-agent-config-sheets.md b/.changeset/compact-agent-config-sheets.md
new file mode 100644
index 000000000..18fe224bb
--- /dev/null
+++ b/.changeset/compact-agent-config-sheets.md
@@ -0,0 +1,5 @@
+---
+"@truefoundry/trueforge-ui": patch
+---
+
+Improve compact agent building with model configuration bottom sheets, provider-first model selection, and a contextual composer actions menu.
diff --git a/packages/trueforge-ui/src/atoms/draft/AgentConfigPanel.tsx b/packages/trueforge-ui/src/atoms/draft/AgentConfigPanel.tsx
index 90c8b2f26..18851fb9a 100644
--- a/packages/trueforge-ui/src/atoms/draft/AgentConfigPanel.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/AgentConfigPanel.tsx
@@ -7,7 +7,7 @@ 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 { ResponsiveDropdownMenu } from '../primitives/ResponsiveDropdownMenu.js';
import { Tooltip } from '../primitives/Tooltip.js';
import type { AgentConfigEditor } from './AgentConfigEditors.js';
import { initialUserMessagesFromSpec } from './agentConfigMessages.js';
@@ -252,7 +252,7 @@ export function AgentConfigPanel({
<div className="min-h-0 flex-1 overflow-y-auto">
<Section>
<div className="flex w-full items-center gap-1">
- <DropdownMenu
+ <ResponsiveDropdownMenu
open={modelMenuOpen}
onOpenChange={open => {
setModelMenuOpen(open);
@@ -260,6 +260,7 @@ export function AgentConfigPanel({
}}
closeOnClick={false}
align="start"
+ sheetLabel="Select model"
containerClassName="flex min-w-0 flex-1"
className="w-[min(44rem,calc(100vw-2rem))] overflow-hidden p-0"
trigger={
@@ -302,12 +303,13 @@ export function AgentConfigPanel({
setModelQuery('');
}}
/>
- </DropdownMenu>
- <DropdownMenu
+ </ResponsiveDropdownMenu>
+ <ResponsiveDropdownMenu
open={modelSettingsMenuOpen}
onOpenChange={setModelSettingsMenuOpen}
closeOnClick={false}
align="start"
+ sheetLabel="Model settings"
className="w-[min(36rem,calc(100vw-2rem))] overflow-hidden p-0"
trigger={
<button
@@ -325,7 +327,7 @@ export function AgentConfigPanel({
}
>
<AgentModelSettingsContent spec={spec} model={model} onChange={next => onChange?.(next)} />
- </DropdownMenu>
+ </ResponsiveDropdownMenu>
</div>
<dl className="text-text-secondary mt-2 flex min-w-0 flex-wrap gap-x-3 gap-y-1 text-xs">
{modelParams.length ? (
diff --git a/packages/trueforge-ui/src/atoms/draft/AgentModelEditorContent.tsx b/packages/trueforge-ui/src/atoms/draft/AgentModelEditorContent.tsx
index d444d3761..1d96276db 100644
--- a/packages/trueforge-ui/src/atoms/draft/AgentModelEditorContent.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/AgentModelEditorContent.tsx
@@ -1,12 +1,14 @@
'use client';
-import { useId, useMemo, useState } from 'react';
+import { useCallback, useId, useMemo, useState } from 'react';
import { Icon } from '@/icons/Icon.js';
import type { AgentSpec, ModelSelection } 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 { DraftModelCatalogPanel } from './DraftModelCatalogPanel.js';
+import { DraftModelCatalogPanel, ProviderMark } from './DraftModelCatalogPanel.js';
import { modelMatchesQuery, normalizeModelSearchText, providerMatchesQuery } from './modelSearch.js';
import { modelPatchWithReasoningEffort } from './reasoningEffort.js';
@@ -43,9 +45,11 @@ export function AgentModelEditorContent({
onChange,
}: AgentModelEditorContentProps) {
const listboxId = useId();
+ const compact = useCompactLayout();
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 [compactProvider, setCompactProvider] = useState<string | null>(null);
const needle = normalizeModelSearchText(query);
const matchingProviders = useMemo(
() =>
@@ -76,25 +80,108 @@ export function AgentModelEditorContent({
() => matchingProviders.find(item => item.name === effectiveProvider)?.models ?? [],
[effectiveProvider, matchingProviders],
);
+ const compactModels = useMemo(() => {
+ if (compactProvider === null) return [];
+ const providerModels = models.filter(model => model.provider.name === compactProvider);
+ return needle ? providerModels.filter(model => modelMatchesQuery({ model, needle })) : providerModels;
+ }, [compactProvider, models, needle]);
+
+ const handleBackToProviders = useCallback(() => {
+ onQueryChange('');
+ setCompactProvider(null);
+ }, [onQueryChange]);
+
+ const search = (
+ <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>
+ );
+
+ if (compact) {
+ if (compactProvider === null) {
+ return (
+ <div className="flex min-h-0 flex-1 flex-col">
+ <div className="shrink-0 border-b border-border px-3 py-2">
+ <p className="text-text-primary mb-2 text-base font-medium">Select provider</p>
+ {search}
+ </div>
+ {error ? <p className="text-failure-bg px-3 pt-3 text-sm">{error}</p> : null}
+ <div className="min-h-0 flex-1 overflow-y-auto p-2">
+ {visibleProviders.length === 0 ? (
+ <p className="text-text-secondary px-2 py-6 text-center text-sm" role="status">
+ {loading ? 'Loading…' : 'No providers'}
+ </p>
+ ) : (
+ visibleProviders.map(name => {
+ const providerModel = models.find(model => model.provider.name === name);
+ return (
+ <button
+ key={name}
+ type="button"
+ className="hover:bg-ghost-button-hover flex w-full items-center gap-2 rounded-md px-2 py-2.5 text-left text-sm"
+ onClick={() => setCompactProvider(name)}
+ >
+ <ProviderMark logo={providerModel?.provider.logo} label={name} className="size-5 text-xs" />
+ <span className="min-w-0 flex-1 truncate">{name}</span>
+ <Icon name="chevron-right" className="text-text-secondary size-4 shrink-0" />
+ </button>
+ );
+ })
+ )}
+ </div>
+ </div>
+ );
+ }
+
+ return (
+ <div className="flex min-h-0 flex-1 flex-col">
+ <div className="shrink-0 border-b border-border px-3 py-2">
+ <div className="mb-2 flex items-center gap-1">
+ <button
+ type="button"
+ aria-label="Back to providers"
+ title="Back to providers"
+ className={auiButtonClass({ variant: 'ghost', size: 'icon', className: 'size-7 shrink-0' })}
+ onClick={handleBackToProviders}
+ >
+ <Icon name="arrow-left" className="size-4" />
+ </button>
+ <p className="text-text-primary min-w-0 flex-1 truncate text-base font-medium">Select Model</p>
+ </div>
+ {search}
+ </div>
+ {error ? <p className="text-failure-bg px-3 pt-3 text-sm">{error}</p> : null}
+ <DraftModelCatalogPanel
+ models={compactModels}
+ loading={loading}
+ selectedName={spec.model.name}
+ query=""
+ onQueryChange={onQueryChange}
+ listboxId={listboxId}
+ showHeading={false}
+ showSearch={false}
+ onSelect={model => onChange({ ...spec, model: modelForSelection(spec, model) })}
+ />
+ </div>
+ );
+ }
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>
+ {search}
</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">
diff --git a/packages/trueforge-ui/src/atoms/draft/DraftComposerActionsMenu.tsx b/packages/trueforge-ui/src/atoms/draft/DraftComposerActionsMenu.tsx
new file mode 100644
index 000000000..1511e2da7
--- /dev/null
+++ b/packages/trueforge-ui/src/atoms/draft/DraftComposerActionsMenu.tsx
@@ -0,0 +1,53 @@
+'use client';
+
+import { Icon } from '../../icons/Icon.js';
+import { auiButtonClass } from '../lib/buttonClasses.js';
+import { DropdownMenu, DropdownMenuItem } from '../primitives/DropdownMenu.js';
+
+export type DraftComposerAction = {
+ id: string;
+ label: string;
+ icon: string;
+ onSelect: () => void;
+};
+
+export type DraftComposerActionsMenuProps = {
+ actions: DraftComposerAction[];
+ disabled?: boolean;
+};
+
+export function DraftComposerActionsMenu({ actions, disabled }: DraftComposerActionsMenuProps) {
+ if (actions.length === 0) return null;
+
+ return (
+ <DropdownMenu
+ align="start"
+ side="top"
+ className="w-48"
+ trigger={
+ <button
+ type="button"
+ aria-label="Add"
+ title="Add"
+ disabled={disabled}
+ className={auiButtonClass({ variant: 'ghost', size: 'icon', className: 'size-8 rounded-full' })}
+ >
+ <Icon name="plus" className="size-4" />
+ </button>
+ }
+ >
+ {actions.map(action => (
+ <DropdownMenuItem key={action.id} onClick={action.onSelect}>
+ <Icon name={action.icon} className="text-text-secondary size-4 shrink-0" />
+ <span>{action.label}</span>
+ </DropdownMenuItem>
+ ))}
+ </DropdownMenu>
+ );
+}
+
+declare module '../../theme/SlotsProvider.js' {
+ interface AtomSlots {
+ DraftComposerActionsMenu: typeof DraftComposerActionsMenu;
+ }
+}
diff --git a/packages/trueforge-ui/src/atoms/draft/DraftComposerSections.tsx b/packages/trueforge-ui/src/atoms/draft/DraftComposerSections.tsx
index 25c051008..5832d8f35 100644
--- a/packages/trueforge-ui/src/atoms/draft/DraftComposerSections.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/DraftComposerSections.tsx
@@ -14,17 +14,37 @@ export function DraftComposerLeftSection({ disabled, isRunning, onAttach }: Comp
const shell = useOptionalShellMode();
const DraftCompositeSelector = useSlot('DraftCompositeSelector');
const DraftAgentConfigTrigger = useSlot('DraftAgentConfigTrigger');
+ const DraftComposerActionsMenu = useSlot('DraftComposerActionsMenu');
const compact = useCompactLayout();
const isMobile = useIsMobile();
const isBuilder = shell != null && shellIsCreateAgent(shell.mode);
+ const compactActions = [
+ {
+ id: 'agent-config',
+ label: 'Agent config',
+ icon: 'sliders',
+ onSelect: () => shell?.setAgentConfigOpen(true),
+ },
+ ...(onAttach === undefined
+ ? []
+ : [
+ {
+ id: 'attach',
+ label: 'Attach a file',
+ icon: 'paperclip',
+ onSelect: onAttach,
+ },
+ ]),
+ ];
return (
<div className="flex min-w-0 flex-wrap items-center gap-1.5">
{!isBuilder ? <DraftCompositeSelector disabled={disabled} isRunning={isRunning} onAttach={onAttach} /> : null}
- {isBuilder && (compact || isMobile) ? (
- <DraftAgentConfigTrigger disabled={disabled} isRunning={isRunning} />
+ {isBuilder && compact ? (
+ <DraftComposerActionsMenu actions={compactActions} disabled={disabled || isRunning} />
) : null}
- {isBuilder && onAttach != null ? (
+ {isBuilder && !compact && isMobile ? <DraftAgentConfigTrigger disabled={disabled} isRunning={isRunning} /> : null}
+ {isBuilder && !compact && onAttach != null ? (
<Tooltip content="Attach a file">
<button
type="button"
diff --git a/packages/trueforge-ui/src/atoms/draft/DraftCompositeSelector.tsx b/packages/trueforge-ui/src/atoms/draft/DraftCompositeSelector.tsx
index bf25bc1fd..15ba905df 100644
--- a/packages/trueforge-ui/src/atoms/draft/DraftCompositeSelector.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/DraftCompositeSelector.tsx
@@ -8,6 +8,7 @@ import { Icon } from '../../icons/Icon.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 { useSlot } from '../../theme/SlotsProvider.js';
import { auiButtonClass } from '../lib/buttonClasses.js';
import { cn } from '../lib/cn.js';
import { useCompactLayout } from '../lib/CompactLayoutContext.js';
@@ -239,6 +240,7 @@ function SectionHeading({ label, count }: { label: string; count: number }) {
}
export function DraftCompositeSelector({ disabled, isRunning, onAttach }: DraftCompositeSelectorProps) {
+ const DraftComposerActionsMenu = useSlot('DraftComposerActionsMenu');
const { skills, connectors, connectorLogos, loading, ensureLoaded, refreshConnectors } = useDraftCatalog();
const capabilities = useServerCapabilities();
const settingsCatalog = useOptionalCatalogServer();
@@ -601,12 +603,34 @@ export function DraftCompositeSelector({ disabled, isRunning, onAttach }: DraftC
</>
</>
);
+ const compactActions = [
+ ...(hasValidModel
+ ? [
+ {
+ id: 'tools',
+ label: `Tools (${toolsCount})`,
+ icon: 'wrench',
+ onSelect: () => openPicker(),
+ },
+ ]
+ : []),
+ ...(onAttach === undefined
+ ? []
+ : [
+ {
+ id: 'attach',
+ label: 'Attach a file',
+ icon: 'paperclip',
+ onSelect: onAttach,
+ },
+ ]),
+ ];
- // Gapless row: now that both triggers are icon-only, their ghost hover targets butt
- // together as one toolbar cluster rather than reading as separate chips.
return (
<div ref={containerRef} className="relative flex flex-wrap items-center">
- {hasValidModel ? (
+ {compactLayout ? (
+ <DraftComposerActionsMenu actions={compactActions} disabled={disabled || isRunning} />
+ ) : hasValidModel ? (
<Tooltip content={toolsTooltip} className="max-w-xs whitespace-pre-line text-left" side="top">
<button
type="button"
@@ -633,7 +657,7 @@ export function DraftCompositeSelector({ disabled, isRunning, onAttach }: DraftC
</Tooltip>
) : null}
- {onAttach ? (
+ {!compactLayout && onAttach ? (
<Tooltip content="Attach a file">
<button
type="button"
diff --git a/packages/trueforge-ui/src/atoms/primitives/DropdownMenu.tsx b/packages/trueforge-ui/src/atoms/primitives/DropdownMenu.tsx
index b8f49807b..69cf0292f 100644
--- a/packages/trueforge-ui/src/atoms/primitives/DropdownMenu.tsx
+++ b/packages/trueforge-ui/src/atoms/primitives/DropdownMenu.tsx
@@ -10,6 +10,7 @@ export type DropdownMenuProps = {
trigger: React.ReactNode;
children: React.ReactNode;
align?: 'start' | 'end';
+ side?: 'top' | 'bottom';
className?: string;
containerClassName?: string;
open?: boolean;
@@ -21,6 +22,7 @@ export function DropdownMenu({
trigger,
children,
align = 'end',
+ side = 'bottom',
className,
containerClassName,
open: controlledOpen,
@@ -53,7 +55,7 @@ export function DropdownMenu({
if (!el) return;
const rect = el.getBoundingClientRect();
setPos({
- top: rect.bottom + 4,
+ top: side === 'top' ? rect.top - 4 : rect.bottom + 4,
left: align === 'end' ? rect.right : rect.left,
});
};
@@ -65,7 +67,7 @@ export function DropdownMenu({
window.removeEventListener('scroll', update, true);
window.removeEventListener('resize', update);
};
- }, [open, align]);
+ }, [open, align, side]);
useEffect(() => {
if (!open) return;
@@ -97,6 +99,7 @@ export function DropdownMenu({
const handler = (e: KeyboardEvent) => {
if (e.key === 'Escape') {
e.preventDefault();
+ e.stopPropagation();
setOpen(false);
const triggerBtn = containerRef.current?.querySelector<HTMLElement>("[aria-haspopup='menu']");
triggerBtn?.focus();
@@ -152,7 +155,10 @@ export function DropdownMenu({
style={{
top: pos.top,
left: pos.left,
- transform: align === 'end' ? 'translateX(-100%)' : undefined,
+ transform:
+ [align === 'end' ? 'translateX(-100%)' : null, side === 'top' ? 'translateY(-100%)' : null]
+ .filter(value => value !== null)
+ .join(' ') || undefined,
}}
className={cn(
'fixed z-[200] min-w-[8rem] rounded-md border border-border bg-card-bg p-1',
diff --git a/packages/trueforge-ui/src/atoms/primitives/ResponsiveDropdownMenu.tsx b/packages/trueforge-ui/src/atoms/primitives/ResponsiveDropdownMenu.tsx
new file mode 100644
index 000000000..9eca3a0dc
--- /dev/null
+++ b/packages/trueforge-ui/src/atoms/primitives/ResponsiveDropdownMenu.tsx
@@ -0,0 +1,100 @@
+'use client';
+
+import {
+ cloneElement,
+ useCallback,
+ useId,
+ useState,
+ type MouseEventHandler,
+ type ReactElement,
+ type ReactNode,
+} from 'react';
+
+import { useCompactLayout } from '../lib/CompactLayoutContext.js';
+import { cn } from '../lib/cn.js';
+import { BottomSheet } from './BottomSheet.js';
+import { DropdownMenu, type DropdownMenuProps } from './DropdownMenu.js';
+
+type ResponsiveDropdownTriggerProps = {
+ 'aria-controls'?: string;
+ 'aria-expanded'?: boolean;
+ 'aria-haspopup'?: 'dialog' | 'menu';
+ onClick?: MouseEventHandler<HTMLElement>;
+};
+
+export type ResponsiveDropdownMenuProps = Omit<DropdownMenuProps, 'children' | 'open' | 'onOpenChange' | 'trigger'> & {
+ trigger: ReactElement<ResponsiveDropdownTriggerProps>;
+ children: ReactNode;
+ open?: boolean;
+ onOpenChange?: (open: boolean) => void;
+ sheetLabel: string;
+ sheetClassName?: string;
+};
+
+/**
+ * Uses dropdown chrome normally and a container-bound bottom sheet in compact layouts.
+ */
+export function ResponsiveDropdownMenu({
+ trigger,
+ children,
+ open: controlledOpen,
+ onOpenChange,
+ sheetLabel,
+ sheetClassName,
+ containerClassName,
+ closeOnClick = true,
+ ...dropdownProps
+}: ResponsiveDropdownMenuProps) {
+ const compact = useCompactLayout();
+ const sheetId = useId();
+ const [internalOpen, setInternalOpen] = useState(false);
+ const open = controlledOpen ?? internalOpen;
+ const setOpen = useCallback(
+ (nextOpen: boolean) => {
+ if (controlledOpen === undefined) setInternalOpen(nextOpen);
+ onOpenChange?.(nextOpen);
+ },
+ [controlledOpen, onOpenChange],
+ );
+
+ if (!compact) {
+ return (
+ <DropdownMenu
+ {...dropdownProps}
+ trigger={trigger}
+ open={controlledOpen}
+ onOpenChange={onOpenChange}
+ containerClassName={containerClassName}
+ closeOnClick={closeOnClick}
+ >
+ {children}
+ </DropdownMenu>
+ );
+ }
+
+ const triggerElement = cloneElement(trigger, {
+ 'aria-haspopup': 'dialog',
+ 'aria-expanded': open,
+ 'aria-controls': open ? sheetId : undefined,
+ onClick: event => {
+ trigger.props.onClick?.(event);
+ if (!event.defaultPrevented) setOpen(!open);
+ },
+ });
+
+ return (
+ <div className={cn('relative inline-flex', containerClassName)}>
+ {triggerElement}
+ {open ? (
+ <BottomSheet id={sheetId} open onOpenChange={setOpen} aria-label={sheetLabel} className={sheetClassName}>
+ <div
+ className="flex min-h-0 flex-1 flex-col overflow-x-hidden overflow-y-auto"
+ onClick={closeOnClick ? () => setOpen(false) : undefined}
+ >
+ {children}
+ </div>
+ </BottomSheet>
+ ) : null}
+ </div>
+ );
+}
diff --git a/packages/trueforge-ui/src/index.ts b/packages/trueforge-ui/src/index.ts
index 12433e3ac..62e8fa4d2 100644
--- a/packages/trueforge-ui/src/index.ts
+++ b/packages/trueforge-ui/src/index.ts
@@ -39,6 +39,8 @@ export type { CenteredModalProps } from './atoms/primitives/CenteredModal.js';
export type { IconButtonProps } from './atoms/primitives/IconButton.js';
export { PopoverSelect } from './atoms/primitives/PopoverSelect.js';
export type { PopoverSelectOption, PopoverSelectProps } from './atoms/primitives/PopoverSelect.js';
+export { ResponsiveDropdownMenu } from './atoms/primitives/ResponsiveDropdownMenu.js';
+export type { ResponsiveDropdownMenuProps } from './atoms/primitives/ResponsiveDropdownMenu.js';
export { SideDrawer } from './atoms/primitives/SideDrawer.js';
export type { SideDrawerAnchor, SideDrawerProps, SideDrawerSize } from './atoms/primitives/SideDrawer.js';
export { Switch } from './atoms/primitives/Switch.js';
@@ -501,6 +503,8 @@ export { DraftAgentConfigTrigger } from './atoms/draft/DraftAgentConfigTrigger.j
export type { DraftAgentConfigTriggerProps } from './atoms/draft/DraftAgentConfigTrigger.js';
export { DraftCapabilitiesPanel } from './atoms/draft/DraftCapabilitiesPanel.js';
export { DraftCatalogProvider, useDraftCatalog } from './atoms/draft/DraftCatalogProvider.js';
+export { DraftComposerActionsMenu } from './atoms/draft/DraftComposerActionsMenu.js';
+export type { DraftComposerAction, DraftComposerActionsMenuProps } from './atoms/draft/DraftComposerActionsMenu.js';
export { DraftComposerLeftSection, DraftComposerRightSection } from './atoms/draft/DraftComposerSections.js';
export { DraftCompositeSelector } from './atoms/draft/DraftCompositeSelector.js';
export type { DraftCompositeSelectorProps } from './atoms/draft/DraftCompositeSelector.js';
diff --git a/packages/trueforge-ui/src/theme/defaultSlots.ts b/packages/trueforge-ui/src/theme/defaultSlots.ts
index 9c756f2b3..4a0b28fd7 100644
--- a/packages/trueforge-ui/src/theme/defaultSlots.ts
+++ b/packages/trueforge-ui/src/theme/defaultSlots.ts
@@ -58,6 +58,7 @@ import { AgentRuntimeEditorContent } from '../atoms/draft/AgentRuntimeEditorCont
import { AgentSkillsEditorContent } from '../atoms/draft/AgentSkillsEditorContent.js';
import { DraftAgentConfigTrigger } from '../atoms/draft/DraftAgentConfigTrigger.js';
import { DraftCapabilitiesPanel } from '../atoms/draft/DraftCapabilitiesPanel.js';
+import { DraftComposerActionsMenu } from '../atoms/draft/DraftComposerActionsMenu.js';
import { DraftComposerLeftSection, DraftComposerRightSection } from '../atoms/draft/DraftComposerSections.js';
import { CatalogRow, ConnectorConnectButton, DraftCompositeSelector } from '../atoms/draft/DraftCompositeSelector.js';
import { DraftModelSelector } from '../atoms/draft/DraftModelSelector.js';
@@ -151,6 +152,7 @@ export const defaultSlots = {
DraftComposerRightSection,
DraftAgentConfigTrigger,
DraftCapabilitiesPanel,
+ DraftComposerActionsMenu,
AgentCustomParametersEditor,
AgentConfigEditors,
AgentInstructionsDrawer,
diff --git a/packages/trueforge-ui/test/atoms/draft/AgentConfigPanel.test.tsx b/packages/trueforge-ui/test/atoms/draft/AgentConfigPanel.test.tsx
index 67f3ad61b..a838211f8 100644
--- a/packages/trueforge-ui/test/atoms/draft/AgentConfigPanel.test.tsx
+++ b/packages/trueforge-ui/test/atoms/draft/AgentConfigPanel.test.tsx
@@ -1,12 +1,23 @@
// @vitest-environment jsdom
import { fireEvent, render, screen } from '@testing-library/react';
-import { describe, expect, it, vi } from 'vitest';
+import { beforeAll, describe, expect, it, vi } from 'vitest';
import { AgentConfigPanel } from '@/atoms/draft/AgentConfigPanel.js';
import { withInitialUserMessages } from '@/atoms/draft/agentConfigMessages.js';
+import { CompactLayoutProvider } from '@/atoms/lib/CompactLayoutContext.js';
import type { AgentSpec, ModelSelection } from '@/server/types.js';
import { SlotsProvider } from '@/theme/SlotsProvider.js';
+beforeAll(() => {
+ HTMLDialogElement.prototype.showModal = function showModal() {
+ this.setAttribute('open', '');
+ };
+ HTMLDialogElement.prototype.close = function close() {
+ this.removeAttribute('open');
+ this.dispatchEvent(new Event('close'));
+ };
+});
+
const model: ModelSelection = {
id: 'claude',
name: 'anthropic/claude',
@@ -185,6 +196,43 @@ describe('AgentConfigPanel', () => {
expect(onOpenEditor).not.toHaveBeenCalled();
});
+ it('uses bottom sheets for compact model selection and settings', () => {
+ const onChange = vi.fn();
+ render(
+ <CompactLayoutProvider>
+ <SlotsProvider>
+ <AgentConfigPanel
+ spec={spec}
+ model={model}
+ {...catalogProps}
+ skillsAvailable
+ instructions={spec.instructions ?? ''}
+ onOpenEditor={vi.fn()}
+ onChange={onChange}
+ />
+ </SlotsProvider>
+ </CompactLayoutProvider>,
+ );
+
+ fireEvent.click(screen.getByRole('button', { name: 'Edit Model' }));
+
+ expect(screen.getByRole('dialog', { name: 'Select model' })).toBeInTheDocument();
+ expect(screen.getByText('Select provider')).toBeInTheDocument();
+
+ fireEvent.click(screen.getByRole('button', { name: 'Anthropic' }));
+ expect(screen.getByRole('button', { name: 'Back to providers' })).toBeInTheDocument();
+ fireEvent.click(screen.getByRole('option', { name: /claude-sonnet/ }));
+
+ expect(onChange).toHaveBeenCalled();
+ expect(screen.queryByRole('dialog', { name: 'Select model' })).not.toBeInTheDocument();
+
+ fireEvent.click(screen.getByRole('button', { name: 'Model settings' }));
+
+ expect(screen.getByRole('dialog', { name: 'Model settings' })).toBeInTheDocument();
+ expect(screen.getByRole('heading', { name: 'Parameters' })).toBeInTheDocument();
+ expect(screen.queryByText('Select provider')).not.toBeInTheDocument();
+ });
+
it('previews instructions and summarizes initial user messages', () => {
const specWithMessages = withInitialUserMessages({
spec,
diff --git a/packages/trueforge-ui/test/atoms/draft/AgentModelEditorContent.test.tsx b/packages/trueforge-ui/test/atoms/draft/AgentModelEditorContent.test.tsx
index 443bfc919..3a1d8c27b 100644
--- a/packages/trueforge-ui/test/atoms/draft/AgentModelEditorContent.test.tsx
+++ b/packages/trueforge-ui/test/atoms/draft/AgentModelEditorContent.test.tsx
@@ -4,6 +4,7 @@ import { useState } from 'react';
import { describe, expect, it, vi } from 'vitest';
import { AgentModelEditorContent } from '@/atoms/draft/AgentModelEditorContent.js';
+import { CompactLayoutProvider } from '@/atoms/lib/CompactLayoutContext.js';
import type { AgentSpec, ModelSelection } from '@/server/types.js';
const models: ModelSelection[] = [
@@ -95,4 +96,26 @@ describe('AgentModelEditorContent', () => {
expect(screen.queryByRole('button', { name: 'Anthropic' })).not.toBeInTheDocument();
expect(screen.getByText('No models')).toBeInTheDocument();
});
+
+ it('uses provider-first navigation in compact layouts', () => {
+ render(
+ <CompactLayoutProvider>
+ <ModelEditor />
+ </CompactLayoutProvider>,
+ );
+
+ expect(screen.getByText('Select provider')).toBeInTheDocument();
+ expect(screen.queryByRole('listbox')).not.toBeInTheDocument();
+
+ fireEvent.click(screen.getByRole('button', { name: 'Anthropic' }));
+
+ expect(screen.getByRole('button', { name: 'Back to providers' })).toBeInTheDocument();
+ expect(within(screen.getByRole('listbox')).getAllByRole('option')).toHaveLength(2);
+
+ fireEvent.click(screen.getByRole('button', { name: 'Back to providers' }));
+
+ expect(screen.getByText('Select provider')).toBeInTheDocument();
+ expect(screen.getByRole('button', { name: 'OpenAI' })).toBeInTheDocument();
+ expect(screen.getByRole('button', { name: 'Anthropic' })).toBeInTheDocument();
+ });
});
diff --git a/packages/trueforge-ui/test/atoms/draft/DraftComposerSections.test.tsx b/packages/trueforge-ui/test/atoms/draft/DraftComposerSections.test.tsx
index 112304679..ae7ed2cf0 100644
--- a/packages/trueforge-ui/test/atoms/draft/DraftComposerSections.test.tsx
+++ b/packages/trueforge-ui/test/atoms/draft/DraftComposerSections.test.tsx
@@ -57,6 +57,11 @@ function BuilderMode({ children }: { children: ReactNode }) {
return children;
}
+function AgentConfigState() {
+ const { agentConfigOpen } = useShellMode();
+ return <span>{agentConfigOpen ? 'Config open' : 'Config closed'}</span>;
+}
+
describe('draft composer sections', () => {
beforeEach(() => {
agentSpec = {
@@ -103,6 +108,7 @@ describe('draft composer sections', () => {
});
it('shows the Agent config trigger only in compact builder layouts', () => {
+ const onAttach = vi.fn();
const { rerender } = render(
<ShellModeProvider agentConfig={{ mode: 'AgentComposer' }}>
<BuilderMode>
@@ -117,13 +123,24 @@ describe('draft composer sections', () => {
<ShellModeProvider agentConfig={{ mode: 'AgentComposer' }}>
<BuilderMode>
<CompactLayoutProvider>
- <DraftSections />
+ <DraftSections onAttach={onAttach} />
+ <AgentConfigState />
</CompactLayoutProvider>
</BuilderMode>
</ShellModeProvider>,
);
- expect(screen.getByRole('button', { name: 'Agent config' })).toBeInTheDocument();
+ expect(screen.queryByRole('button', { name: 'Agent config' })).not.toBeInTheDocument();
+ expect(screen.queryByRole('button', { name: 'Attach a file' })).not.toBeInTheDocument();
+
+ fireEvent.click(screen.getByRole('button', { name: 'Add' }));
+ expect(screen.getByRole('menuitem', { name: 'Agent config' })).toBeInTheDocument();
+ fireEvent.click(screen.getByRole('menuitem', { name: 'Attach a file' }));
+ expect(onAttach).toHaveBeenCalledOnce();
+
+ fireEvent.click(screen.getByRole('button', { name: 'Add' }));
+ fireEvent.click(screen.getByRole('menuitem', { name: 'Agent config' }));
+ expect(screen.getByText('Config open')).toBeInTheDocument();
});
it('propagates disabled and running state to composed controls', async () => {
diff --git a/packages/trueforge-ui/test/atoms/draft/DraftCompositeSelector.test.tsx b/packages/trueforge-ui/test/atoms/draft/DraftCompositeSelector.test.tsx
index 6d7705acb..687b1790b 100644
--- a/packages/trueforge-ui/test/atoms/draft/DraftCompositeSelector.test.tsx
+++ b/packages/trueforge-ui/test/atoms/draft/DraftCompositeSelector.test.tsx
@@ -1,9 +1,10 @@
// @vitest-environment jsdom
import { act, fireEvent, render, screen } from '@testing-library/react';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
import { DraftCatalogProvider } from '@/atoms/draft/DraftCatalogProvider.js';
import { DraftCompositeSelector } from '@/atoms/draft/DraftCompositeSelector.js';
+import { CompactLayoutProvider } from '@/atoms/lib/CompactLayoutContext.js';
import { ServerProvider } from '@/server/ServerContext.js';
import type { AgentSpec, CatalogServer, SandboxCatalogServer, SkillCatalogServer } from '@/server/types.js';
import { createMockAgentUIServer, createMockCatalog } from '../../server/mockServer.js';
@@ -40,12 +41,23 @@ vi.mock('@/server/ShellModeContext.js', () => ({
useOptionalShellMode: () => ({ setSettingsOpen }),
}));
+beforeAll(() => {
+ HTMLDialogElement.prototype.showModal = function showModal() {
+ this.setAttribute('open', '');
+ };
+ HTMLDialogElement.prototype.close = function close() {
+ this.removeAttribute('open');
+ this.dispatchEvent(new Event('close'));
+ };
+});
+
function renderSelector({
onAttach,
getCapabilities,
getSkills,
getMcp,
catalog = settingsCatalog,
+ compact = false,
}: {
onAttach?: () => void;
getCapabilities?: () => Promise<{
@@ -58,6 +70,7 @@ function renderSelector({
getSkills?: () => Promise<{ id: string; name: string }[]>;
getMcp?: () => Promise<{ id: string; name: string; authenticated: boolean }[]>;
catalog?: CatalogServer | null;
+ compact?: boolean;
} = {}) {
const server = createMockAgentUIServer({
...(catalog === null ? {} : { catalog }),
@@ -78,13 +91,14 @@ function renderSelector({
{ id: 'slack', name: 'Slack', authenticated: true },
]),
});
- return render(
+ const selector = (
<ServerProvider server={server}>
<DraftCatalogProvider>
<DraftCompositeSelector onAttach={onAttach} />
</DraftCatalogProvider>
- </ServerProvider>,
+ </ServerProvider>
);
+ return render(compact ? <CompactLayoutProvider>{selector}</CompactLayoutProvider> : selector);
}
describe('DraftCompositeSelector', () => {
@@ -187,6 +201,24 @@ describe('DraftCompositeSelector', () => {
expect(screen.queryByRole('dialog', { name: 'Add to composer' })).not.toBeInTheDocument();
});
+ it('groups compact tools and attachment actions under a plus menu', () => {
+ const onAttach = vi.fn();
+ renderSelector({ onAttach, compact: true });
+
+ expect(screen.queryByRole('button', { name: 'Tools (2)' })).not.toBeInTheDocument();
+ expect(screen.queryByRole('button', { name: 'Attach a file' })).not.toBeInTheDocument();
+
+ fireEvent.click(screen.getByRole('button', { name: 'Add' }));
+ expect(screen.getByRole('menuitem', { name: 'Tools (2)' })).toBeInTheDocument();
+ fireEvent.click(screen.getByRole('menuitem', { name: 'Attach a file' }));
+
+ expect(onAttach).toHaveBeenCalledOnce();
+
+ fireEvent.click(screen.getByRole('button', { name: 'Add' }));
+ fireEvent.click(screen.getByRole('menuitem', { name: 'Tools (2)' }));
+ expect(screen.getByRole('dialog', { name: 'Add to composer' })).toBeInTheDocument();
+ });
+
it('debounces connector changes into one draft update', async () => {
renderSelector();
fireEvent.click(screen.getByRole('button', { name: 'Tools (2)' }));
diff --git a/packages/trueforge-ui/test/publicUiExports.test.ts b/packages/trueforge-ui/test/publicUiExports.test.ts
index 4cea0c0f5..fd104955e 100644
--- a/packages/trueforge-ui/test/publicUiExports.test.ts
+++ b/packages/trueforge-ui/test/publicUiExports.test.ts
@@ -68,6 +68,7 @@ const expectedRuntimeExports: Array<keyof typeof sdk> = [
'DraftCapabilitiesPanel',
'DEFAULT_TABLE_PAGE_SIZE',
'DraftCatalogProvider',
+ 'DraftComposerActionsMenu',
'DraftComposerLeftSection',
'DraftComposerRightSection',
'DraftCompositeSelector',
@@ -101,6 +102,7 @@ const expectedRuntimeExports: Array<keyof typeof sdk> = [
'PopoverSelect',
'PostMcpOauthScreen',
'ReasoningContainer',
+ 'ResponsiveDropdownMenu',
'ResumeUnavailableContainer',
'ResumeUnavailable',
'SandboxArtifactDownload',