Skip to content

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

Fixed multiple API calls and new chat name change (#158)

Govinda Vashishthae22db8733de7
diff --git a/packages/trueforge-ui-sdk/src/atoms/AgentsLibraryButton.tsx b/packages/trueforge-ui-sdk/src/atoms/AgentsLibraryButton.tsx
index 82992a353..7491bcf38 100644
--- a/packages/trueforge-ui-sdk/src/atoms/AgentsLibraryButton.tsx
+++ b/packages/trueforge-ui-sdk/src/atoms/AgentsLibraryButton.tsx
@@ -27,7 +27,9 @@ export function AgentsLibraryButton({ className, compact = false, onSelectAgent
const agentsListEpoch = shell?.agentsListEpoch ?? 0;
useEffect(() => {
- if (!enabled || !server) return;
+ // Compact trigger has no count badge; skip so SidebarLayout can keep both
+ // collapsed + expanded trees mounted without a duplicate catalog request.
+ if (!enabled || !server || compact) return;
let cancelled = false;
void server
.searchAgents({ limit: SEARCH_AGENTS_PAGE_SIZE })
@@ -40,7 +42,7 @@ export function AgentsLibraryButton({ className, compact = false, onSelectAgent
return () => {
cancelled = true;
};
- }, [enabled, server, agentsListEpoch]);
+ }, [enabled, server, agentsListEpoch, compact]);
if (!enabled) return null;
diff --git a/packages/trueforge-ui-sdk/src/atoms/primitives/CenteredModal.tsx b/packages/trueforge-ui-sdk/src/atoms/primitives/CenteredModal.tsx
index a55a2d24b..c3cad4b28 100644
--- a/packages/trueforge-ui-sdk/src/atoms/primitives/CenteredModal.tsx
+++ b/packages/trueforge-ui-sdk/src/atoms/primitives/CenteredModal.tsx
@@ -1,6 +1,6 @@
'use client';
-import { useEffect, useId, useRef, type MouseEvent, type ReactNode } from 'react';
+import { useEffect, useId, useRef, type ReactNode } from 'react';
import { Icon } from '../../icons/Icon.js';
import { auiButtonClass } from '../lib/buttonClasses.js';
@@ -59,17 +59,12 @@ export function CenteredModal({
return () => el.removeEventListener('close', handler);
}, [onOpenChange]);
- const handleBackdropClick = (e: MouseEvent<HTMLDialogElement>) => {
- if (e.target === ref.current) onOpenChange(false);
- };
-
return (
<dialog
ref={ref}
aria-label={ariaLabel ?? title}
aria-labelledby={titleId}
aria-describedby={description ? descriptionId : undefined}
- onClick={handleBackdropClick}
onCancel={event => {
event.preventDefault();
event.stopPropagation();
@@ -78,7 +73,6 @@ export function CenteredModal({
style={compactStyle ?? (contentSized ? { height: 'fit-content', maxHeight: '85dvh' } : undefined)}
className={cn(
'bg-background text-foreground border-border open:flex open:flex-col overflow-hidden p-0 shadow-xl',
- 'backdrop:bg-black/40 backdrop:backdrop-blur-[2px]',
compact
? 'm-0 mt-auto max-w-none rounded-t-xl rounded-b-none border-t pb-[env(safe-area-inset-bottom)]'
: contentSized
diff --git a/packages/trueforge-ui-sdk/src/containers/SettingsBuilder/index.tsx b/packages/trueforge-ui-sdk/src/containers/SettingsBuilder/index.tsx
index 73477c8b0..3541e3227 100644
--- a/packages/trueforge-ui-sdk/src/containers/SettingsBuilder/index.tsx
+++ b/packages/trueforge-ui-sdk/src/containers/SettingsBuilder/index.tsx
@@ -1,17 +1,29 @@
'use client';
-import { useEffect, useMemo, useState } from 'react';
+import { lazy, Suspense, useEffect, useMemo, useState } from 'react';
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 ConnectorSettings from './ConnectorSettings.js';
-import ModelSettings from './ModelSettings.js';
-import SandboxSettings from './SandboxSettings.js';
-import SkillSettings from './SkillSettings.js';
+
+// Section modules (and their list/catalog APIs) load only when that tab mounts.
+const ModelSettings = lazy(() => import('./ModelSettings.js'));
+const ConnectorSettings = lazy(() => import('./ConnectorSettings.js'));
+const SkillSettings = lazy(() => import('./SkillSettings.js'));
+const SandboxSettings = lazy(() => import('./SandboxSettings.js'));
+
+function SettingsSectionFallback() {
+ return (
+ <div className="flex flex-1 items-center justify-center py-8" role="status" aria-live="polite" aria-busy="true">
+ <Spinner size={20} className="text-muted-foreground" />
+ <span className="sr-only">Loading</span>
+ </div>
+ );
+}
type SettingsSection = 'models' | 'connectors' | 'skills' | 'sandbox';
@@ -121,10 +133,12 @@ const TruefoundrySettingsBuilder = () => {
</nav>
<section className="flex h-full flex-1 flex-col overflow-y-hidden px-6 py-4">
- {section === 'models' && <ModelSettings />}
- {section === 'connectors' && <ConnectorSettings />}
- {section === 'skills' && hasSkills ? <SkillSettings /> : null}
- {section === 'sandbox' && hasSandbox ? <SandboxSettings /> : null}
+ <Suspense fallback={<SettingsSectionFallback />}>
+ {section === 'models' ? <ModelSettings /> : null}
+ {section === 'connectors' ? <ConnectorSettings /> : null}
+ {section === 'skills' && hasSkills ? <SkillSettings /> : null}
+ {section === 'sandbox' && hasSandbox ? <SandboxSettings /> : null}
+ </Suspense>
</section>
</div>
</div>
diff --git a/packages/trueforge-ui-sdk/src/containers/ThreadContainer.tsx b/packages/trueforge-ui-sdk/src/containers/ThreadContainer.tsx
index f10e8c946..01b784aaf 100644
--- a/packages/trueforge-ui-sdk/src/containers/ThreadContainer.tsx
+++ b/packages/trueforge-ui-sdk/src/containers/ThreadContainer.tsx
@@ -4,6 +4,7 @@ import { ThreadPrimitive, useAuiState, type AssistantState } from '@assistant-ui
import { useEffect, type ReactNode } from 'react';
import { preloadMarkdownOpenUI } from '../atoms/Markdown.js';
import { ComposerBusyProvider } from '../hooks/useComposerBusyState.js';
+import { useSyncSessionTitle } from '../hooks/useSyncSessionTitle.js';
import { useOptionalShellMode } from '../server/ShellModeContext.js';
import { useSlot } from '../theme/SlotsProvider.js';
import { AssistantMessageContainer } from './AssistantMessageContainer.js';
@@ -51,6 +52,7 @@ export function ThreadContainer({ composer }: ThreadContainerProps) {
useEffect(() => {
void preloadMarkdownOpenUI();
}, []);
+ useSyncSessionTitle();
const shell = useOptionalShellMode();
const WelcomeScreen = useSlot('WelcomeScreen');
diff --git a/packages/trueforge-ui-sdk/src/hooks/useSyncSessionTitle.ts b/packages/trueforge-ui-sdk/src/hooks/useSyncSessionTitle.ts
new file mode 100644
index 000000000..9e906607b
--- /dev/null
+++ b/packages/trueforge-ui-sdk/src/hooks/useSyncSessionTitle.ts
@@ -0,0 +1,59 @@
+'use client';
+
+import { useThreadIsRunning } from '@assistant-ui/core/react';
+import { useEffect, useRef } from 'react';
+
+import { useAui, useAuiState } from '../assistant-ui.js';
+import { useOptionalServer } from '../server/ServerContext.js';
+
+/**
+ * After a turn ends, read `session.title` from GET /sessions/{id} and rename the
+ * thread-list row. Initialize only stores `remoteId`, so first chats stay
+ * "New Chat" until this runs.
+ */
+export function useSyncSessionTitle(): void {
+ const server = useOptionalServer();
+ const aui = useAui();
+ const remoteId = useAuiState(s => s.threadListItem.remoteId);
+ const title = useAuiState(s => s.threadListItem.title);
+ const isRunning = useThreadIsRunning();
+ const wasRunningRef = useRef(false);
+ const syncedRemoteIdRef = useRef<string | undefined>(undefined);
+
+ useEffect(() => {
+ syncedRemoteIdRef.current = undefined;
+ }, [remoteId]);
+
+ useEffect(() => {
+ const finishedTurn = wasRunningRef.current && !isRunning;
+ wasRunningRef.current = isRunning;
+
+ if (!finishedTurn || server == null || remoteId == null) {
+ return;
+ }
+ if (syncedRemoteIdRef.current === remoteId) {
+ return;
+ }
+ // History rows already carry a title; only fill blank / "new" local rows.
+ if (title != null && title.trim() !== '') {
+ syncedRemoteIdRef.current = remoteId;
+ return;
+ }
+
+ let cancelled = false;
+ void server
+ .getSession({ sessionId: remoteId })
+ .then(session => {
+ if (cancelled) return;
+ const nextTitle = typeof session.title === 'string' ? session.title.trim() : '';
+ if (nextTitle.length === 0) return;
+ syncedRemoteIdRef.current = remoteId;
+ return aui.threadListItem().rename(nextTitle);
+ })
+ .catch(() => undefined);
+
+ return () => {
+ cancelled = true;
+ };
+ }, [aui, isRunning, remoteId, server, title]);
+}
diff --git a/packages/trueforge-ui-sdk/src/layouts/DrawerLayout.tsx b/packages/trueforge-ui-sdk/src/layouts/DrawerLayout.tsx
index d3066cf2a..7466b251b 100644
--- a/packages/trueforge-ui-sdk/src/layouts/DrawerLayout.tsx
+++ b/packages/trueforge-ui-sdk/src/layouts/DrawerLayout.tsx
@@ -1,19 +1,21 @@
'use client';
-import { useEffect, useRef, useState } from 'react';
+import { lazy, Suspense, useEffect, useRef, useState } from 'react';
import { useAui } from '../assistant-ui.js';
import { NamedAgentHeaderLabel } from '../atoms/NamedAgentHeaderLabel.js';
import { ShellActions } from '../atoms/ShellActions.js';
import { auiButtonClass } from '../atoms/lib/buttonClasses.js';
import { cn } from '../atoms/lib/cn.js';
-import TruefoundrySettingsBuilder from '../containers/SettingsBuilder/index.js';
+import { Spinner } from '../atoms/primitives/Spinner.js';
import { Thread } from '../containers/Thread.js';
import { ThreadListContainer } from '../containers/ThreadListContainer.js';
import { Icon } from '../icons/Icon.js';
import { useOptionalShellMode } from '../server/ShellModeContext.js';
import { useSlot } from '../theme/SlotsProvider.js';
+const TruefoundrySettingsBuilder = lazy(() => import('../containers/SettingsBuilder/index.js'));
+
export function DrawerLayout({ className }: { className?: string }) {
const aui = useAui();
const shell = useOptionalShellMode();
@@ -104,7 +106,27 @@ export function DrawerLayout({ className }: { className?: string }) {
) : null}
</header>
<div ref={mainRef} className="min-h-0 min-w-0 flex-1">
- {settingsOpen ? <TruefoundrySettingsBuilder /> : isIdle ? <SelectAgentEmptyState /> : <Thread />}
+ {settingsOpen ? (
+ <Suspense
+ fallback={
+ <div
+ className="flex h-full items-center justify-center"
+ role="status"
+ aria-live="polite"
+ aria-busy="true"
+ >
+ <Spinner size={28} className="text-foreground" />
+ <span className="sr-only">Loading</span>
+ </div>
+ }
+ >
+ <TruefoundrySettingsBuilder />
+ </Suspense>
+ ) : isIdle ? (
+ <SelectAgentEmptyState />
+ ) : (
+ <Thread />
+ )}
</div>
{threadsOpen ? (
<>
diff --git a/packages/trueforge-ui-sdk/src/layouts/SidebarLayout.tsx b/packages/trueforge-ui-sdk/src/layouts/SidebarLayout.tsx
index 6fe6d6431..26eb31efb 100644
--- a/packages/trueforge-ui-sdk/src/layouts/SidebarLayout.tsx
+++ b/packages/trueforge-ui-sdk/src/layouts/SidebarLayout.tsx
@@ -1,13 +1,13 @@
'use client';
-import { useEffect, useRef, useState } from 'react';
+import { lazy, Suspense, useEffect, useRef, useState } from 'react';
import { useAui } from '../assistant-ui.js';
import { auiButtonClass } from '../atoms/lib/buttonClasses.js';
import { cn } from '../atoms/lib/cn.js';
import { NamedAgentHeaderLabel } from '../atoms/NamedAgentHeaderLabel.js';
+import { Spinner } from '../atoms/primitives/Spinner.js';
import { ShellActions } from '../atoms/ShellActions.js';
-import TruefoundrySettingsBuilder from '../containers/SettingsBuilder/index.js';
import { Thread } from '../containers/Thread.js';
import { ThreadListContainer } from '../containers/ThreadListContainer.js';
import { Icon } from '../icons/Icon.js';
@@ -16,6 +16,8 @@ import { BrandIcon } from '../theme/brand.js';
import { useSlot } from '../theme/SlotsProvider.js';
import { useBrand } from '../theme/ThemeProvider.js';
+const TruefoundrySettingsBuilder = lazy(() => import('../containers/SettingsBuilder/index.js'));
+
// Survives ChatProvider remounts when openDraft / selectAgent bumps runtimeKey.
let desktopCollapsed = false;
@@ -106,26 +108,24 @@ export function SidebarLayout({ className }: { className?: string }) {
</button>
</div>
- {collapsed ? (
- <nav className="flex min-h-0 flex-1 flex-col items-center gap-2 px-3" aria-label="Sidebar">
- {shell?.isNewChatEnabled !== false ? (
- <button
- type="button"
- aria-label="Start new chat"
- title="New chat"
- className={auiButtonClass({ variant: 'ghost', size: 'icon' })}
- onClick={handleNewChat}
- >
- <Icon name="square-pen" />
- </button>
- ) : null}
- <AgentsLibraryButton compact />
- </nav>
- ) : (
- <div className="flex min-h-0 flex-1 flex-col overflow-hidden">
- <ThreadListContainer />
- </div>
- )}
+ {/* Keep both trees mounted; toggle with `hidden` so AgentsLibraryButton does not remount. */}
+ <nav className="flex min-h-0 flex-1 flex-col items-center gap-2 px-3" hidden={!collapsed} aria-label="Sidebar">
+ {shell?.isNewChatEnabled !== false ? (
+ <button
+ type="button"
+ aria-label="Start new chat"
+ title="New chat"
+ className={auiButtonClass({ variant: 'ghost', size: 'icon' })}
+ onClick={handleNewChat}
+ >
+ <Icon name="square-pen" />
+ </button>
+ ) : null}
+ <AgentsLibraryButton compact />
+ </nav>
+ <div className="flex min-h-0 flex-1 flex-col overflow-hidden" hidden={collapsed}>
+ <ThreadListContainer />
+ </div>
<footer
className={cn(
@@ -173,7 +173,27 @@ export function SidebarLayout({ className }: { className?: string }) {
</header>
<div ref={mainRef} className="min-h-0 min-w-0 flex-1">
- {settingsOpen ? <TruefoundrySettingsBuilder /> : isIdle ? <SelectAgentEmptyState /> : <Thread />}
+ {settingsOpen ? (
+ <Suspense
+ fallback={
+ <div
+ className="flex h-full items-center justify-center"
+ role="status"
+ aria-live="polite"
+ aria-busy="true"
+ >
+ <Spinner size={28} className="text-foreground" />
+ <span className="sr-only">Loading</span>
+ </div>
+ }
+ >
+ <TruefoundrySettingsBuilder />
+ </Suspense>
+ ) : isIdle ? (
+ <SelectAgentEmptyState />
+ ) : (
+ <Thread />
+ )}
</div>
</div>
diff --git a/packages/trueforge-ui-sdk/src/layouts/StackChatPanel.tsx b/packages/trueforge-ui-sdk/src/layouts/StackChatPanel.tsx
index 06579a4fa..9166f596a 100644
--- a/packages/trueforge-ui-sdk/src/layouts/StackChatPanel.tsx
+++ b/packages/trueforge-ui-sdk/src/layouts/StackChatPanel.tsx
@@ -1,19 +1,21 @@
'use client';
-import { useEffect, useState, type ReactNode } from 'react';
+import { lazy, Suspense, useEffect, useState, type ReactNode } from 'react';
import { useAui } from '../assistant-ui.js';
import { NamedAgentHeaderLabel } from '../atoms/NamedAgentHeaderLabel.js';
import { ShellActions } from '../atoms/ShellActions.js';
import { auiButtonClass } from '../atoms/lib/buttonClasses.js';
import { cn } from '../atoms/lib/cn.js';
-import TruefoundrySettingsBuilder from '../containers/SettingsBuilder/index.js';
+import { Spinner } from '../atoms/primitives/Spinner.js';
import { Thread } from '../containers/Thread.js';
import { ThreadListContainer } from '../containers/ThreadListContainer.js';
import { Icon } from '../icons/Icon.js';
import { useOptionalShellMode } from '../server/ShellModeContext.js';
import { useSlot } from '../theme/SlotsProvider.js';
+const TruefoundrySettingsBuilder = lazy(() => import('../containers/SettingsBuilder/index.js'));
+
export type StackChatPanelProps = {
className?: string;
/** Extra actions in the thread header (e.g. close for widget). */
@@ -43,7 +45,21 @@ export function StackChatPanel({ className, threadHeaderEnd }: StackChatPanelPro
<div className={cn('flex h-full min-h-0 flex-col', className)}>
{settingsOpen ? (
<div className="min-h-0 flex-1">
- <TruefoundrySettingsBuilder />
+ <Suspense
+ fallback={
+ <div
+ className="flex h-full items-center justify-center"
+ role="status"
+ aria-live="polite"
+ aria-busy="true"
+ >
+ <Spinner size={28} className="text-foreground" />
+ <span className="sr-only">Loading</span>
+ </div>
+ }
+ >
+ <TruefoundrySettingsBuilder />
+ </Suspense>
</div>
) : view === 'list' ? (
<ThreadListContainer onThreadOpen={() => setView('thread')} />
diff --git a/packages/trueforge-ui-sdk/test/atoms/AgentsLibrary.test.tsx b/packages/trueforge-ui-sdk/test/atoms/AgentsLibrary.test.tsx
index 005f37e57..7b2fcf28f 100644
--- a/packages/trueforge-ui-sdk/test/atoms/AgentsLibrary.test.tsx
+++ b/packages/trueforge-ui-sdk/test/atoms/AgentsLibrary.test.tsx
@@ -270,4 +270,22 @@ describe('AgentsLibraryButton', () => {
expect(screen.getByRole('button', { name: /Agents Library \(50\+\)/ })).toBeInTheDocument();
});
});
+
+ it('does not fetch agent count when compact', () => {
+ const searchAgents = vi.fn(async () => [{ name: 'alpha', agentId: 'alpha' }]);
+ const server = createMockAgentUIServer({ searchAgents });
+
+ render(
+ <SlotsProvider>
+ <ServerProvider server={server}>
+ <ShellModeProvider>
+ <AgentsLibraryButton compact />
+ </ShellModeProvider>
+ </ServerProvider>
+ </SlotsProvider>,
+ );
+
+ expect(screen.getByRole('button', { name: 'Agents Library' })).toBeInTheDocument();
+ expect(searchAgents).not.toHaveBeenCalled();
+ });
});
diff --git a/packages/trueforge-ui-sdk/test/atoms/primitives/CenteredModal.test.tsx b/packages/trueforge-ui-sdk/test/atoms/primitives/CenteredModal.test.tsx
index 07c1cabb7..0a0a147a6 100644
--- a/packages/trueforge-ui-sdk/test/atoms/primitives/CenteredModal.test.tsx
+++ b/packages/trueforge-ui-sdk/test/atoms/primitives/CenteredModal.test.tsx
@@ -86,7 +86,7 @@ describe('CenteredModal', () => {
expect(onOpenChange).toHaveBeenCalledWith(false);
});
- it('reports native close, close-button, backdrop, and cancel requests', () => {
+ it('reports native close, close-button, and cancel requests', () => {
const onOpenChange = vi.fn();
const onParentCancel = vi.fn();
render(
@@ -102,9 +102,8 @@ describe('CenteredModal', () => {
expect(onOpenChange).not.toHaveBeenCalled();
fireEvent.click(dialog);
- expect(onOpenChange).toHaveBeenLastCalledWith(false);
+ expect(onOpenChange).not.toHaveBeenCalled();
- onOpenChange.mockClear();
fireEvent.click(screen.getByRole('button', { name: 'Close' }));
expect(onOpenChange).toHaveBeenCalledWith(false);
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 0825e7767..a353b68a1 100644
--- a/packages/trueforge-ui-sdk/test/containers/SettingsBuilder/index.test.tsx
+++ b/packages/trueforge-ui-sdk/test/containers/SettingsBuilder/index.test.tsx
@@ -74,14 +74,20 @@ function TestShell({ server, children }: { server?: AgentUIServer; children?: Re
return server === undefined ? content : <ServerProvider server={server}>{content}</ServerProvider>;
}
+async function openSettings() {
+ fireEvent.click(screen.getByRole('button', { name: 'Open settings' }));
+ await waitFor(() => {
+ expect(screen.getByRole('heading', { name: 'Settings' })).toBeInTheDocument();
+ });
+}
+
describe('TruefoundrySettingsBuilder', () => {
- it('stays hidden while closed and when no settings catalog is available', () => {
+ it('stays hidden while closed and when no settings catalog is available', async () => {
const { rerender } = render(<TestShell server={createServer()} />);
expect(screen.queryByRole('heading', { name: 'Settings' })).not.toBeInTheDocument();
- fireEvent.click(screen.getByRole('button', { name: 'Open settings' }));
- expect(screen.getByRole('heading', { name: 'Settings' })).toBeInTheDocument();
+ await openSettings();
rerender(<TestShell server={createServer({ catalog: false })} />);
expect(screen.queryByRole('heading', { name: 'Settings' })).not.toBeInTheDocument();
@@ -90,52 +96,64 @@ describe('TruefoundrySettingsBuilder', () => {
expect(screen.queryByRole('heading', { name: 'Settings' })).not.toBeInTheDocument();
});
- it('only exposes optional sections backed by catalogs', () => {
+ it('only exposes optional sections backed by catalogs', async () => {
const { rerender } = render(<TestShell server={createServer()} />);
- fireEvent.click(screen.getByRole('button', { name: 'Open settings' }));
+ await openSettings();
expect(screen.getByRole('button', { name: 'Models' })).toHaveAttribute('aria-current', 'page');
expect(screen.getByRole('button', { name: 'Connectors' })).toBeInTheDocument();
expect(screen.queryByRole('button', { name: 'Skills' })).not.toBeInTheDocument();
expect(screen.queryByRole('button', { name: 'Sandbox' })).not.toBeInTheDocument();
- expect(screen.getByText('Model settings content')).toBeInTheDocument();
+ await waitFor(() => {
+ expect(screen.getByText('Model settings content')).toBeInTheDocument();
+ });
rerender(<TestShell server={createServer({ skills: true, sandbox: true })} />);
fireEvent.click(screen.getByRole('button', { name: 'Skills' }));
- expect(screen.getByText('Skill settings content')).toBeInTheDocument();
+ await waitFor(() => {
+ expect(screen.getByText('Skill settings content')).toBeInTheDocument();
+ });
fireEvent.click(screen.getByRole('button', { name: 'Sandbox providers' }));
- expect(screen.getByText('Sandbox settings content')).toBeInTheDocument();
+ await waitFor(() => {
+ expect(screen.getByText('Sandbox settings content')).toBeInTheDocument();
+ });
fireEvent.click(screen.getByRole('button', { name: 'Connectors' }));
- expect(screen.getByText('Connector settings content')).toBeInTheDocument();
+ await waitFor(() => {
+ expect(screen.getByText('Connector settings content')).toBeInTheDocument();
+ });
});
it('resets a stale optional section when its catalog disappears', async () => {
const { rerender } = render(<TestShell server={createServer({ skills: true })} />);
- fireEvent.click(screen.getByRole('button', { name: 'Open settings' }));
+ await openSettings();
fireEvent.click(screen.getByRole('button', { name: 'Skills' }));
- expect(screen.getByText('Skill settings content')).toBeInTheDocument();
+ await waitFor(() => {
+ expect(screen.getByText('Skill settings content')).toBeInTheDocument();
+ });
rerender(<TestShell server={createServer()} />);
await waitFor(() => {
expect(screen.getByRole('button', { name: 'Models' })).toHaveAttribute('aria-current', 'page');
});
- expect(screen.getByText('Model settings content')).toBeInTheDocument();
+ await waitFor(() => {
+ expect(screen.getByText('Model settings content')).toBeInTheDocument();
+ });
expect(screen.queryByRole('button', { name: 'Skills' })).not.toBeInTheDocument();
});
- it('closes on Escape without leaking the event to a parent handler', () => {
+ it('closes on Escape without leaking the event to a parent handler', async () => {
const parentKeyDown = vi.fn();
render(
<div onKeyDown={parentKeyDown}>
<TestShell server={createServer()} />
</div>,
);
- fireEvent.click(screen.getByRole('button', { name: 'Open settings' }));
+ await openSettings();
fireEvent.keyDown(screen.getByRole('heading', { name: 'Settings' }), { key: 'Escape' });
diff --git a/packages/trueforge-ui-sdk/test/containers/TrueforgeUI.test.tsx b/packages/trueforge-ui-sdk/test/containers/TrueforgeUI.test.tsx
index 87d03456f..ef9d1feea 100644
--- a/packages/trueforge-ui-sdk/test/containers/TrueforgeUI.test.tsx
+++ b/packages/trueforge-ui-sdk/test/containers/TrueforgeUI.test.tsx
@@ -339,7 +339,8 @@ describe('SidebarLayout', () => {
throw new Error('Expected settings button');
}
fireEvent.click(settingsButton);
- expect(screen.getByRole('heading', { name: 'Settings' })).toBeInTheDocument();
+ // SettingsBuilder is lazy-loaded behind Suspense in the layout.
+ expect(await screen.findByRole('heading', { name: 'Settings' })).toBeInTheDocument();
rerender(
<SlotsProvider theme={{ brand: { name: 'Acme' } }}>
@@ -509,7 +510,7 @@ describe('layout slot overrides', () => {
it.each(hosts)(
'%s keeps ShellActionsActionSlot mounted when Settings opens (no remount handoff)',
- (_name, Layout) => {
+ async (_name, Layout) => {
render(
<SlotsProvider overrides={{ ShellActionsActionSlot: CustomActionSlot }}>
<ServerProvider server={mockServer(settingsCatalog)}>
@@ -529,7 +530,8 @@ describe('layout slot overrides', () => {
const beforeNode = before[0];
fireEvent.click(screen.getAllByRole('button', { name: 'Settings' })[0]!);
- expect(screen.getByRole('heading', { name: 'Settings' })).toBeInTheDocument();
+ // SettingsBuilder is lazy-loaded behind Suspense in the layout.
+ expect(await screen.findByRole('heading', { name: 'Settings' })).toBeInTheDocument();
const after = screen.getAllByRole('button', { name: 'custom action' });
expect(after.length).toBeGreaterThan(0);
diff --git a/packages/trueforge-ui-sdk/test/hooks/useSyncSessionTitle.test.ts b/packages/trueforge-ui-sdk/test/hooks/useSyncSessionTitle.test.ts
new file mode 100644
index 000000000..d8058c164
--- /dev/null
+++ b/packages/trueforge-ui-sdk/test/hooks/useSyncSessionTitle.test.ts
@@ -0,0 +1,93 @@
+// @vitest-environment jsdom
+import { act, renderHook, waitFor } from '@testing-library/react';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const useThreadIsRunning = vi.fn(() => false);
+const useAuiState = vi.fn();
+const rename = vi.fn(async () => undefined);
+const getSession = vi.fn();
+const useOptionalServer = vi.fn((): { getSession: typeof getSession } | null => null);
+
+vi.mock('@assistant-ui/core/react', () => ({
+ useThreadIsRunning: () => useThreadIsRunning(),
+}));
+
+vi.mock('@/assistant-ui.js', () => ({
+ useAui: () => ({
+ threadListItem: () => ({ rename }),
+ }),
+ useAuiState: (selector: (state: unknown) => unknown) => useAuiState(selector),
+}));
+
+vi.mock('@/server/ServerContext.js', () => ({
+ useOptionalServer: () => useOptionalServer(),
+}));
+
+import { useSyncSessionTitle } from '@/hooks/useSyncSessionTitle.js';
+
+describe('useSyncSessionTitle', () => {
+ beforeEach(() => {
+ useThreadIsRunning.mockReturnValue(false);
+ useOptionalServer.mockReturnValue({ getSession });
+ rename.mockClear();
+ getSession.mockReset();
+ useAuiState.mockImplementation((selector: (state: unknown) => unknown) =>
+ selector({
+ threadListItem: { remoteId: 'sess-1', title: undefined },
+ }),
+ );
+ });
+
+ it('renames the thread list row from getSession.title after a turn finishes', async () => {
+ getSession.mockResolvedValue({
+ id: 'sess-1',
+ isMutable: true,
+ createdAt: '2026-08-10T12:28:03.327Z',
+ updatedAt: '2026-08-10T12:28:03.366Z',
+ title: 'Hello chat, how are you?',
+ });
+
+ useThreadIsRunning.mockReturnValue(true);
+ const { rerender } = renderHook(() => useSyncSessionTitle());
+
+ useThreadIsRunning.mockReturnValue(false);
+ rerender();
+
+ await waitFor(() => {
+ expect(getSession).toHaveBeenCalledWith({ sessionId: 'sess-1' });
+ expect(rename).toHaveBeenCalledWith('Hello chat, how are you?');
+ });
+ });
+
+ it('does not fetch when the row already has a title', async () => {
+ useAuiState.mockImplementation((selector: (state: unknown) => unknown) =>
+ selector({
+ threadListItem: { remoteId: 'sess-1', title: 'Existing title' },
+ }),
+ );
+
+ useThreadIsRunning.mockReturnValue(true);
+ const { rerender } = renderHook(() => useSyncSessionTitle());
+
+ useThreadIsRunning.mockReturnValue(false);
+ rerender();
+
+ await act(async () => {
+ await Promise.resolve();
+ });
+
+ expect(getSession).not.toHaveBeenCalled();
+ expect(rename).not.toHaveBeenCalled();
+ });
+
+ it('does not fetch while the turn is still running', async () => {
+ useThreadIsRunning.mockReturnValue(true);
+ renderHook(() => useSyncSessionTitle());
+
+ await act(async () => {
+ await Promise.resolve();
+ });
+
+ expect(getSession).not.toHaveBeenCalled();
+ });
+});