Skip to content

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

chore: composer feedback changes for connectors, attachment cards (#612)

sayan-truefoundry2a0ae4ce5855
diff --git a/.changeset/20260904170300-composer-connector-logos.md b/.changeset/20260904170300-composer-connector-logos.md
new file mode 100644
index 000000000..6824b1103
--- /dev/null
+++ b/.changeset/20260904170300-composer-connector-logos.md
@@ -0,0 +1,5 @@
+---
+"@truefoundry/trueforge-ui": patch
+---
+
+Show connector catalog logos in the composer Tools picker, matching the Connectors settings page.
diff --git a/.changeset/20260904173000-attachment-card-tile.md b/.changeset/20260904173000-attachment-card-tile.md
new file mode 100644
index 000000000..75876032a
--- /dev/null
+++ b/.changeset/20260904173000-attachment-card-tile.md
@@ -0,0 +1,5 @@
+---
+"@truefoundry/trueforge-ui": patch
+---
+
+Align AttachmentCard with assistant-ui's default square thumbnail, filename tooltip, and overlay remove control.
diff --git a/packages/trueforge-ui/src/atoms/AttachmentCard.tsx b/packages/trueforge-ui/src/atoms/AttachmentCard.tsx
index 0d4dabe73..d6a2617f3 100644
--- a/packages/trueforge-ui/src/atoms/AttachmentCard.tsx
+++ b/packages/trueforge-ui/src/atoms/AttachmentCard.tsx
@@ -5,6 +5,7 @@ import { Icon } from '../icons/Icon.js';
import { auiButtonClass } from './lib/buttonClasses.js';
import { cn } from './lib/cn.js';
import { Avatar, AvatarFallback, AvatarImage } from './primitives/Avatar.js';
+import { Tooltip } from './primitives/Tooltip.js';
export { USER_MESSAGE_ATTACHMENT_PREVIEW_REM };
@@ -39,7 +40,7 @@ export function AttachmentCard({
data-slot="aui_attachment-preview"
style={previewSize}
className={cn(
- 'aui-attachment-preview relative shrink-0 cursor-pointer overflow-hidden rounded-lg border',
+ 'aui-attachment-preview relative shrink-0 cursor-pointer overflow-hidden rounded-lg border border-primary-button-bg/20',
previewRem == null && 'size-24',
className,
)}
@@ -53,24 +54,19 @@ export function AttachmentCard({
<div
data-slot="aui_attachment-chip"
style={previewRem != null ? { maxWidth: `${previewRem}rem` } : undefined}
- className={cn(
- 'aui-attachment-chip bg-secondary-bg flex max-w-full shrink-0 items-center gap-2 rounded-lg border px-2 py-1.5',
- className,
- )}
+ className={cn('aui-attachment-chip relative size-14 shrink-0', className)}
>
- <div className="bg-primary-bg flex size-7 shrink-0 items-center justify-center overflow-hidden rounded-md border">
- {isImage && previewSrc ? (
- <Avatar className="size-7 rounded-none">
- <AvatarImage src={previewSrc} alt={name} className="object-cover" />
- <AvatarFallback>
- <Icon name="file" size="1rem" className="text-text-secondary" />
+ <Tooltip content={name} side="top" triggerClassName="size-full">
+ <div className="bg-secondary-bg relative size-full overflow-hidden rounded-[calc(var(--composer-radius,1.5rem)-var(--composer-padding,8px))] border border-primary-button-bg/20">
+ <Avatar className="size-full rounded-none">
+ <AvatarImage src={isImage ? previewSrc : undefined} alt={name} className="object-cover" />
+ <AvatarFallback className="rounded-none">
+ <Icon name="file" size="1.5rem" className="text-text-secondary" />
</AvatarFallback>
</Avatar>
- ) : (
- <Icon name="file" size="1rem" className="text-text-secondary" />
- )}
- </div>
- <span className="text-text-primary min-w-0 truncate text-sm">{name}</span>
+ </div>
+ </Tooltip>
+ <span className="sr-only">{name}</span>
{onRemove && (
<button
type="button"
@@ -79,11 +75,15 @@ export function AttachmentCard({
className={auiButtonClass({
variant: 'ghost',
size: 'icon',
- className: 'size-6 shrink-0 rounded-full',
+ className:
+ 'aui-attachment-tile-remove absolute inset-e-1 top-1 z-10 size-5 rounded-full bg-black/50 text-white hover:bg-black/70 hover:text-white',
})}
- onClick={onRemove}
+ onClick={e => {
+ e.stopPropagation();
+ onRemove();
+ }}
>
- <Icon name="xmark" />
+ <Icon name="xmark" size="0.75rem" />
</button>
)}
</div>
diff --git a/packages/trueforge-ui/src/atoms/draft/DraftCatalogProvider.tsx b/packages/trueforge-ui/src/atoms/draft/DraftCatalogProvider.tsx
index fe53404f8..894a8dfa7 100644
--- a/packages/trueforge-ui/src/atoms/draft/DraftCatalogProvider.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/DraftCatalogProvider.tsx
@@ -3,7 +3,14 @@
import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState, type ReactNode } from 'react';
import { useOptionalServer } from '../../server/ServerContext.js';
-import type { AgentSkill, AgentUIServer, ConnectorState, ListResult, ModelSelection } from '../../server/types.js';
+import type {
+ AgentSkill,
+ AgentUIServer,
+ ConnectorCatalogEntry,
+ ConnectorState,
+ ListResult,
+ ModelSelection,
+} from '../../server/types.js';
import { getErrorMessage } from '../../utils/getErrorMessage.js';
/** Picker page size for MCP infinite scroll. */
@@ -13,6 +20,8 @@ type DraftCatalogValue = {
models: ModelSelection[];
skills: AgentSkill[];
connectors: ConnectorState[];
+ /** Connector logo URL keyed by connector name, sourced from the discovery catalog. */
+ connectorLogos: Record<string, string>;
connectorsHasMore: boolean;
connectorsLoadMoreFailed: boolean;
connectorsLoadingMore: boolean;
@@ -37,6 +46,15 @@ const DraftCatalogContext = createContext<DraftCatalogContextValue | null>(null)
const IDLE_ENSURE = () => undefined;
const IDLE_REFRESH = async () => undefined;
+const EMPTY_LOGOS: Record<string, string> = {};
+
+function toConnectorLogos(entries: ConnectorCatalogEntry[]): Record<string, string> {
+ const logos: Record<string, string> = {};
+ for (const entry of entries) {
+ if (entry.logo) logos[entry.name] = entry.logo;
+ }
+ return logos;
+}
function appendConnectors({
previous,
@@ -82,6 +100,7 @@ function DraftCatalogStore({ server, children }: { server: AgentUIServer | null;
const [models, setModels] = useState<ModelSelection[]>([]);
const [skills, setSkills] = useState<AgentSkill[]>([]);
const [connectors, setConnectors] = useState<ConnectorState[]>([]);
+ const [connectorLogos, setConnectorLogos] = useState<Record<string, string>>(EMPTY_LOGOS);
const [connectorsNextPageToken, setConnectorsNextPageToken] = useState<string | undefined>(undefined);
const [connectorsLoadMoreFailed, setConnectorsLoadMoreFailed] = useState(false);
const [connectorsLoadingMore, setConnectorsLoadingMore] = useState(false);
@@ -157,31 +176,37 @@ function DraftCatalogStore({ server, children }: { server: AgentUIServer | null;
loadMoreFailedRef.current = false;
setConnectorsLoadMoreFailed(false);
// Settle each list alone so one failing picker does not blank the others.
- void Promise.allSettled([server.getModels(), server.getSkills(), fetchMcpPage({ server })]).then(
- ([modelsResult, skillsResult, mcpResult]) => {
- if (cancelled) return;
- const errors: string[] = [];
- if (modelsResult.status === 'fulfilled') {
- setModels(modelsResult.value);
- } else {
- errors.push(getErrorMessage(modelsResult.reason, 'Failed to load models.'));
- }
- if (skillsResult.status === 'fulfilled') {
- setSkills(skillsResult.value);
- } else {
- errors.push(getErrorMessage(skillsResult.reason, 'Failed to load skills.'));
- }
- if (mcpResult.status === 'fulfilled') {
- setConnectors(mcpResult.value.data);
- setConnectorsNextPageToken(mcpResult.value.nextPageToken);
- } else {
- errors.push(getErrorMessage(mcpResult.reason, 'Failed to load connectors.'));
- }
- setError(errors[0] ?? null);
- setCompletedEpoch(requestEpoch);
- setLoading(false);
- },
- );
+ // Logos are cosmetic: a missing catalog port or a failed fetch just falls back to icons.
+ const connectorCatalog = server.catalog?.connectorCatalog;
+ void Promise.allSettled([
+ server.getModels(),
+ server.getSkills(),
+ fetchMcpPage({ server }),
+ connectorCatalog ? connectorCatalog.getConnectorCatalog() : Promise.resolve([]),
+ ]).then(([modelsResult, skillsResult, mcpResult, catalogResult]) => {
+ if (cancelled) return;
+ setConnectorLogos(catalogResult.status === 'fulfilled' ? toConnectorLogos(catalogResult.value) : EMPTY_LOGOS);
+ const errors: string[] = [];
+ if (modelsResult.status === 'fulfilled') {
+ setModels(modelsResult.value);
+ } else {
+ errors.push(getErrorMessage(modelsResult.reason, 'Failed to load models.'));
+ }
+ if (skillsResult.status === 'fulfilled') {
+ setSkills(skillsResult.value);
+ } else {
+ errors.push(getErrorMessage(skillsResult.reason, 'Failed to load skills.'));
+ }
+ if (mcpResult.status === 'fulfilled') {
+ setConnectors(mcpResult.value.data);
+ setConnectorsNextPageToken(mcpResult.value.nextPageToken);
+ } else {
+ errors.push(getErrorMessage(mcpResult.reason, 'Failed to load connectors.'));
+ }
+ setError(errors[0] ?? null);
+ setCompletedEpoch(requestEpoch);
+ setLoading(false);
+ });
return () => {
cancelled = true;
};
@@ -195,6 +220,7 @@ function DraftCatalogStore({ server, children }: { server: AgentUIServer | null;
models,
skills,
connectors,
+ connectorLogos,
connectorsHasMore,
connectorsLoadMoreFailed,
connectorsLoadingMore,
@@ -211,6 +237,7 @@ function DraftCatalogStore({ server, children }: { server: AgentUIServer | null;
models,
skills,
connectors,
+ connectorLogos,
connectorsHasMore,
connectorsLoadMoreFailed,
connectorsLoadingMore,
@@ -234,6 +261,7 @@ export function useDraftCatalog(): DraftCatalogValue {
models: [],
skills: [],
connectors: [],
+ connectorLogos: EMPTY_LOGOS,
connectorsHasMore: false,
connectorsLoadMoreFailed: false,
connectorsLoadingMore: false,
diff --git a/packages/trueforge-ui/src/atoms/draft/DraftCompositeSelector.tsx b/packages/trueforge-ui/src/atoms/draft/DraftCompositeSelector.tsx
index ae7513c35..1eb976e29 100644
--- a/packages/trueforge-ui/src/atoms/draft/DraftCompositeSelector.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/DraftCompositeSelector.tsx
@@ -15,6 +15,7 @@ import { auiInputClass } from '../lib/inputClasses.js';
import { useInfiniteScrollSentinel } from '../lib/useInfiniteScrollSentinel.js';
import { useIsMobile } from '../lib/useIsMobile.js';
import { BottomSheet } from '../primitives/BottomSheet.js';
+import { CatalogLogo } from '../primitives/CatalogLogo.js';
import { Tooltip } from '../primitives/Tooltip.js';
import { DraftCatalogEmptyState } from './DraftCatalogEmptyState.js';
import { useDraftCatalog } from './DraftCatalogProvider.js';
@@ -68,6 +69,8 @@ function Checkbox({ checked }: { checked: boolean }) {
export function CatalogRow({
title,
description,
+ logo,
+ fallbackIcon,
checked,
disabled = false,
onToggle,
@@ -76,6 +79,9 @@ export function CatalogRow({
}: {
title: string;
description?: string;
+ /** Catalog logo URL; when absent, `fallbackIcon` (or the title initial) is shown. */
+ logo?: string | undefined;
+ fallbackIcon?: string;
checked: boolean;
disabled?: boolean;
onToggle: () => void;
@@ -84,8 +90,17 @@ export function CatalogRow({
}) {
const content = (
<>
- <span className="bg-secondary-bg text-text-secondary mt-0.5 flex size-7 shrink-0 items-center justify-center rounded text-xs font-semibold">
- {title.charAt(0).toUpperCase()}
+ <span
+ className="bg-secondary-bg text-text-secondary mt-0.5 flex size-7 shrink-0 items-center justify-center overflow-hidden rounded border border-border text-xs font-semibold"
+ aria-hidden
+ >
+ {logo ? (
+ <CatalogLogo src={logo} alt={title} className="size-4" />
+ ) : fallbackIcon ? (
+ <Icon name={fallbackIcon} className="text-text-primary size-4" />
+ ) : (
+ title.charAt(0).toUpperCase()
+ )}
</span>
<span className="min-w-0 flex-1">
<span className="text-text-primary block truncate text-sm font-medium">{title}</span>
@@ -227,6 +242,7 @@ export function DraftCompositeSelector({ disabled, isRunning, onAttach }: DraftC
const {
skills,
connectors,
+ connectorLogos,
connectorsHasMore,
connectorsLoadMoreFailed,
connectorsLoadingMore,
@@ -511,7 +527,8 @@ export function DraftCompositeSelector({ disabled, isRunning, onAttach }: DraftC
<CatalogRow
key={c.id}
title={c.name}
- description={c.description}
+ logo={connectorLogos[c.name]}
+ fallbackIcon="mcp-server"
checked={selectedMcpIds.has(c.id)}
action={
isUnauthenticatedDcrConnector(c) ? (
@@ -530,7 +547,8 @@ export function DraftCompositeSelector({ disabled, isRunning, onAttach }: DraftC
<CatalogRow
key={c.id}
title={c.name}
- description={c.description}
+ logo={connectorLogos[c.name]}
+ fallbackIcon="mcp-server"
checked={selectedMcpIds.has(c.id)}
action={
isUnauthenticatedDcrConnector(c) ? (
@@ -652,6 +670,13 @@ export function DraftCompositeSelector({ disabled, isRunning, onAttach }: DraftC
{/* Icon-only trigger; the count and name reach assistive tech via aria-label
and sighted users via the tooltip, which lists the selected tools. */}
<Icon name="wrench" className="size-3.5" />
+ Tools
+ {/* Show the count of selected connectors and skills as a badge */}
+ {selectedMcp.length + selectedSkills.length > 0 && (
+ <span className="bg-primary-button-bg/10 text-primary-button-bg rounded-md px-1.5 py-0.5 text-xs ml-1">
+ {selectedMcp.length + selectedSkills.length}
+ </span>
+ )}
</button>
</Tooltip>
) : null}