The open-source agent harness - the runtime layer that turns an LLM into a working agent.
Enhance TrueFoundry UI with New Chat vs New Agent functionality (#579)
Govinda Vashishtha860e322482cc
diff --git a/.changeset/new-chat-vs-new-agent.md b/.changeset/new-chat-vs-new-agent.mdnew file mode 100644index 000000000..36f596fa7--- /dev/null+++ b/.changeset/new-chat-vs-new-agent.md@@ -0,0 +1,5 @@+---+'@truefoundry/trueforge-ui': minor+---++Split New Chat vs New Agent: simple chat keeps the Connectors/Skills picker; New Agent keeps Agent Config + Save Agent. Session metadata `is_create_agent` drives resume from the sessions browser.diff --git a/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx b/packages/trueforge-ui/src/atoms/AgentsLibrary.tsxindex 42524d290..d775dfb1b 100644--- a/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx+++ b/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx@@ -122,7 +122,7 @@ export function AgentLibraryRow({<TableCell className="text-text-primary font-medium"><div className="flex min-w-0 items-center gap-2.5"><span className="bg-primary-bg text-text-secondary inline-flex size-8 shrink-0 items-center justify-center rounded-md border border-border">- <Icon name="robot" className="size-4" />+ <Icon name="agent-2" className="size-4" /></span><div className="min-w-0">{onOpen == null ? (@@ -353,6 +353,7 @@ export function AgentsLibrary({ onSelectAgent }: AgentsLibraryProps) {onSelectAgent?.(agent.name);shell.selectLibraryAgent({isMutable: true,+ isCreateAgent: true,agentId: libraryAgentId(agent),agentName: agent.name,agentSpec,@@ -365,7 +366,7 @@ export function AgentsLibrary({ onSelectAgent }: AgentsLibraryProps) {<div className="flex h-full min-h-0 w-full flex-col bg-primary-bg"><header className="flex shrink-0 flex-wrap items-center gap-2 border-b border-border px-4 py-2.5 md:px-6"><div className="flex min-w-0 items-center gap-2">- <Icon name="bot" className="text-text-primary size-4" />+ <Icon name="library-big" className="text-text-primary size-4" /><h1 className="text-text-primary truncate text-md font-semibold">Agents</h1></div><div className="ml-auto w-56 shrink-0">diff --git a/packages/trueforge-ui/src/atoms/AgentsLibraryButton.tsx b/packages/trueforge-ui/src/atoms/AgentsLibraryButton.tsxindex 19ea5c2f9..fd5ebc6d8 100644--- a/packages/trueforge-ui/src/atoms/AgentsLibraryButton.tsx+++ b/packages/trueforge-ui/src/atoms/AgentsLibraryButton.tsx@@ -56,12 +56,13 @@ export function AgentsLibraryButton({ className, compact = false }: AgentsLibrarcompact? 'h-auto w-full flex-col gap-0.5 whitespace-normal px-1 py-1.5 text-[10px] leading-tight !justify-center': 'h-8 w-full !justify-start px-2.5',- libraryOpen && 'bg-dropdown-selected-item-bg text-dropdown-selected-item-text',+ libraryOpen &&+ 'bg-primary-button-bg text-primary-button-text hover:bg-primary-button-hover hover:text-primary-button-text',),})}onClick={() => shell?.setLibraryOpen(true)}>- <Icon name="agent-2" size={compact ? 16 : undefined} />+ <Icon name="library-big" size={compact ? 16 : undefined} />{compact ? (<span className="text-center">Agents</span>) : (diff --git a/packages/trueforge-ui/src/atoms/ClearChatButton.tsx b/packages/trueforge-ui/src/atoms/ClearChatButton.tsxindex 98aac2a82..0e49ec293 100644--- a/packages/trueforge-ui/src/atoms/ClearChatButton.tsx+++ b/packages/trueforge-ui/src/atoms/ClearChatButton.tsx@@ -5,7 +5,7 @@ import { Icon } from '../icons/Icon.js';import { useOptionalShellMode } from '../server/ShellModeContext.js';import { auiButtonClass } from './lib/buttonClasses.js';-// Resets an immutable (named) chat. Hidden while idle or on mutable drafts.+// Resets the current chat / draft (Try Agent, New Chat, New Agent, Edit). Hidden while idle.export function ClearChatButton() {const shell = useOptionalShellMode();const visible = useChatChromeActionsVisible();diff --git a/packages/trueforge-ui/src/atoms/NamedAgentHeaderLabel.tsx b/packages/trueforge-ui/src/atoms/NamedAgentHeaderLabel.tsxindex 4607a07d0..5bea8eefd 100644--- a/packages/trueforge-ui/src/atoms/NamedAgentHeaderLabel.tsx+++ b/packages/trueforge-ui/src/atoms/NamedAgentHeaderLabel.tsx@@ -1,20 +1,25 @@'use client';+import { useAuiState } from '../assistant-ui.js';import { useNamedAgentHeaderState } from '../hooks/useChatChromeActionsVisible.js';import { Icon } from '../icons/Icon.js';import { cn } from './lib/cn.js';import { Tooltip } from './primitives/Tooltip.js';-/** Left-of-header title for a named agent, including its mutable edit state. */+/** Left-of-header title for named agents and New Chat / New Agent drafts. */export function NamedAgentHeaderLabel({ className }: { className?: string }) {const state = useNamedAgentHeaderState();+ const threadTitle = useAuiState(s => s.threadListItem.title);if (state === null) return null;+ const syncedTitle = threadTitle?.trim() ?? '';+ const displayName = state.allowThreadTitle && syncedTitle.length > 0 ? syncedTitle : state.name;+return (<h1 className={cn('flex min-w-0 items-center gap-1.5 px-1 text-sm font-medium text-text-primary', className)}>- <Icon name="robot" className="size-3.5 shrink-0" />- <span className="truncate" title={state.name}>- {state.name}+ <Icon name={state.icon} className="size-3.5 shrink-0" />+ <span className="truncate" title={displayName}>+ {displayName}</span>{state.isEditing ? (<Tooltip content="Try changes here, then choose Update agent to save." side="bottom">diff --git a/packages/trueforge-ui/src/atoms/SchedulesButton.tsx b/packages/trueforge-ui/src/atoms/SchedulesButton.tsxindex c9c21bd33..ffa6d5190 100644--- a/packages/trueforge-ui/src/atoms/SchedulesButton.tsx+++ b/packages/trueforge-ui/src/atoms/SchedulesButton.tsx@@ -34,7 +34,8 @@ export function SchedulesButton({ className, compact = false }: SchedulesButtonPcompact? 'h-auto w-full flex-col gap-0.5 whitespace-normal px-1 py-1.5 text-[10px] leading-tight !justify-center': 'h-8 w-full !justify-start px-2.5',- open && 'bg-dropdown-selected-item-bg text-dropdown-selected-item-text',+ open &&+ 'bg-primary-button-bg text-primary-button-text hover:bg-primary-button-hover hover:text-primary-button-text',),})}onClick={() => shell.setSchedulesOpen(!open)}diff --git a/packages/trueforge-ui/src/atoms/SessionsBrowserButton.tsx b/packages/trueforge-ui/src/atoms/SessionsBrowserButton.tsxindex 7d791d0a1..944586b34 100644--- a/packages/trueforge-ui/src/atoms/SessionsBrowserButton.tsx+++ b/packages/trueforge-ui/src/atoms/SessionsBrowserButton.tsx@@ -35,7 +35,8 @@ export function SessionsBrowserButton({ className, compact = false }: SessionsBrcompact? 'h-auto w-full flex-col gap-0.5 whitespace-normal px-1 py-1.5 text-[10px] leading-tight !justify-center': 'h-8 w-full !justify-start px-2.5',- sessionsOpen && 'bg-dropdown-selected-item-bg text-dropdown-selected-item-text',+ sessionsOpen &&+ 'bg-primary-button-bg text-primary-button-text hover:bg-primary-button-hover hover:text-primary-button-text',),})}onClick={() => {diff --git a/packages/trueforge-ui/src/atoms/ShellActions.tsx b/packages/trueforge-ui/src/atoms/ShellActions.tsxindex 3ab289112..b7906c615 100644--- a/packages/trueforge-ui/src/atoms/ShellActions.tsx+++ b/packages/trueforge-ui/src/atoms/ShellActions.tsx@@ -48,10 +48,15 @@ export function ShellActions({ className, labeled = false }: { className?: strinaria-label="Settings"title="Settings"aria-expanded={shell.settingsOpen}+ aria-current={shell.settingsOpen ? 'page' : undefined}className={auiButtonClass({variant: 'ghost',size: labeled ? undefined : 'icon',- className: labeled ? labeledButtonClass : undefined,+ className: cn(+ labeled ? labeledButtonClass : undefined,+ shell.settingsOpen &&+ 'bg-primary-button-bg text-primary-button-text hover:bg-primary-button-hover hover:text-primary-button-text',+ ),})}onClick={() => shell.setSettingsOpen(true)}>diff --git a/packages/trueforge-ui/src/atoms/ThreadListRow.tsx b/packages/trueforge-ui/src/atoms/ThreadListRow.tsxindex 142a774f3..275637839 100644--- a/packages/trueforge-ui/src/atoms/ThreadListRow.tsx+++ b/packages/trueforge-ui/src/atoms/ThreadListRow.tsx@@ -61,7 +61,7 @@ export function ThreadListRow({<span className="block truncate text-sm font-medium text-text-primary">{title}</span>{agentName != null ? (<span className="mt-0.5 flex min-w-0 items-center gap-1 text-xs text-text-secondary">- <Icon name="robot" className="size-3 shrink-0" />+ <Icon name="agent-2" className="size-3 shrink-0" /><span className="truncate">{agentName}</span></span>) : null}diff --git a/packages/trueforge-ui/src/atoms/agent-details/AgentDetailsHeader.tsx b/packages/trueforge-ui/src/atoms/agent-details/AgentDetailsHeader.tsxindex 4781b90b0..36cb55fcc 100644--- a/packages/trueforge-ui/src/atoms/agent-details/AgentDetailsHeader.tsx+++ b/packages/trueforge-ui/src/atoms/agent-details/AgentDetailsHeader.tsx@@ -22,6 +22,7 @@ export function AgentDetailsHeader({ agentId, detail, onBack }: AgentDetailsHeadif (detail == null) return;shell.selectLibraryAgent({isMutable: true,+ isCreateAgent: true,agentId: detail.agentId,agentName: detail.name,agentSpec: detail.agentSpec,diff --git a/packages/trueforge-ui/src/atoms/agent-details/AgentSessionDetailHeader.tsx b/packages/trueforge-ui/src/atoms/agent-details/AgentSessionDetailHeader.tsxindex d68da3bd9..6e22a2b62 100644--- a/packages/trueforge-ui/src/atoms/agent-details/AgentSessionDetailHeader.tsx+++ b/packages/trueforge-ui/src/atoms/agent-details/AgentSessionDetailHeader.tsx@@ -4,6 +4,7 @@ import { useEffect, useState } from 'react';import { Icon } from '../../icons/Icon.js';import { buildAgentSessionShareUrl } from '../../utils/sessionShareUrl.js';+import { auiButtonClass } from '../lib/buttonClasses.js';import { cn } from '../lib/cn.js';import { LightTooltip } from '../primitives/Tooltip.js';import type { AgentSessionDetailHeaderProps } from './types.js';@@ -17,6 +18,8 @@ export function AgentSessionDetailHeader({createdAt,view,onClose,+ onResume,+ resumeLabel,}: AgentSessionDetailHeaderProps) {const [copied, setCopied] = useState(false);@@ -54,6 +57,11 @@ export function AgentSessionDetailHeader({</button></LightTooltip></div>+ {onResume != null && resumeLabel != null ? (+ <button type="button" className={auiButtonClass({ variant: 'outline', size: 'sm' })} onClick={onResume}>+ {resumeLabel}+ </button>+ ) : null}<buttontype="button"aria-label="Close session details"diff --git a/packages/trueforge-ui/src/atoms/agent-details/AgentSessionListRow.tsx b/packages/trueforge-ui/src/atoms/agent-details/AgentSessionListRow.tsxindex 76cfd0986..b09a7ac63 100644--- a/packages/trueforge-ui/src/atoms/agent-details/AgentSessionListRow.tsx+++ b/packages/trueforge-ui/src/atoms/agent-details/AgentSessionListRow.tsx@@ -31,7 +31,7 @@ export function AgentSessionListRow({<span className="flex min-w-0 items-center gap-1">{agentName != null ? (<>- <Icon name="robot" className="size-3 shrink-0" />+ <Icon name="agent-2" className="size-3 shrink-0" /><span className="truncate">{agentName}</span><span aria-hidden="true">·</span></>diff --git a/packages/trueforge-ui/src/atoms/agent-details/AgentSessions.tsx b/packages/trueforge-ui/src/atoms/agent-details/AgentSessions.tsxindex b57c57eae..3fa95c799 100644--- a/packages/trueforge-ui/src/atoms/agent-details/AgentSessions.tsx+++ b/packages/trueforge-ui/src/atoms/agent-details/AgentSessions.tsx@@ -6,10 +6,12 @@ import { Group, Panel, Separator } from 'react-resizable-panels';import { useSessionShareSearch } from '../../hooks/useSessionShareSearch.js';import { Icon } from '../../icons/Icon.js';import { useAgentSessionsServer, useServer } from '../../server/ServerContext.js';+import { useOptionalShellMode } from '../../server/ShellModeContext.js';import type { Session, SessionEventItem, SessionListEntry } from '../../server/types.js';import { useSlot } from '../../theme/SlotsProvider.js';import { drainListPages } from '../../utils/drainListPages.js';import { sessionTimeRangeFromCreatedAt } from '../../utils/sessionShareUrl.js';+import { sessionIsCreateAgent } from '../lib/sessionCreateAgent.js';import { Skeleton } from '../primitives/Skeleton.js';import type { AgentSessionsProps } from './types.js';@@ -18,9 +20,17 @@ function sessionTitle(entry: Pick<SessionListEntry, 'title'>): string {return title != null && title.length > 0 ? title : 'Untitled session';}+function entryIsMutable(entry: SessionListEntry): boolean {+ if ('isMutable' in entry && typeof Reflect.get(entry, 'isMutable') === 'boolean') {+ return Reflect.get(entry, 'isMutable') === true;+ }+ return entry.agentName == null;+}+export function AgentSessions({ agentId, startTimestamp, endTimestamp, shareView }: AgentSessionsProps) {const sessionsServer = useAgentSessionsServer();const chatServer = useServer();+ const shell = useOptionalShellMode();const { sessionId: selectedSessionId, updateShareSearch } = useSessionShareSearch();const AgentSessionListRow = useSlot('AgentSessionListRow');@@ -159,6 +169,27 @@ export function AgentSessions({ agentId, startTimestamp, endTimestamp, shareView? sessionTitle(selectedEntry): (selectedSessionId ?? 'Untitled session');+ const resumeIsCreateAgent =+ detailSession != null+ ? sessionIsCreateAgent(detailSession)+ : selectedEntry != null+ ? sessionIsCreateAgent(selectedEntry)+ : false;+ const resumeIsMutable =+ detailSession != null ? detailSession.isMutable : selectedEntry != null ? entryIsMutable(selectedEntry) : true;+ const resumeLabel = resumeIsCreateAgent ? 'Resume Agent building' : 'Resume Chat';++ const handleResume = () => {+ if (selectedSessionId == null || shell == null) return;+ const agentName = detailSession?.agentName ?? selectedEntry?.agentName;+ shell.openHistorySession({+ sessionId: selectedSessionId,+ isMutable: resumeIsMutable,+ isCreateAgent: resumeIsCreateAgent,+ ...(agentName != null && agentName.length > 0 ? { agentName } : {}),+ });+ };+return (<Groupid="agent-sessions-split"@@ -243,6 +274,7 @@ export function AgentSessions({ agentId, startTimestamp, endTimestamp, shareViewcreatedAt={detailSession?.createdAt ?? selectedEntry?.createdAt}view={shareView}onClose={clearSelectedSession}+ {...(shell != null ? { onResume: handleResume, resumeLabel } : {})}/>{detailLoading || detailEvents === undefined ? (<div className="flex flex-1 flex-col p-4" role="status" aria-label="Loading session details">diff --git a/packages/trueforge-ui/src/atoms/agent-details/types.ts b/packages/trueforge-ui/src/atoms/agent-details/types.tsindex 5dbfa2ba9..7b1c0b84f 100644--- a/packages/trueforge-ui/src/atoms/agent-details/types.ts+++ b/packages/trueforge-ui/src/atoms/agent-details/types.ts@@ -40,6 +40,10 @@ export type AgentSessionDetailHeaderProps = {createdAt?: string;view?: 'sessions' | null;onClose: () => void;+ /** When set, shows Resume Chat / Resume Agent building. */+ onResume?: () => void;+ /** Label for the resume action. */+ resumeLabel?: string;};export type AgentSessionTurnHeaderProps = {diff --git a/packages/trueforge-ui/src/atoms/draft/DraftComposerSections.tsx b/packages/trueforge-ui/src/atoms/draft/DraftComposerSections.tsxindex 6f7fb63ab..879ac0141 100644--- a/packages/trueforge-ui/src/atoms/draft/DraftComposerSections.tsx+++ b/packages/trueforge-ui/src/atoms/draft/DraftComposerSections.tsx@@ -1,17 +1,36 @@'use client';+import { Icon } from '../../icons/Icon.js';+import { shellIsCreateAgent, useOptionalShellMode } from '../../server/ShellModeContext.js';import { useSlot } from '../../theme/SlotsProvider.js';import type { ComposerLeftSectionProps, ComposerRightSectionProps } from '../ComposerSections.js';+import { auiButtonClass } from '../lib/buttonClasses.js';+import { Tooltip } from '../primitives/Tooltip.js';import { DraftReasoningEffortSelector } from './DraftReasoningEffortSelector.js';export function DraftComposerLeftSection({ disabled, isRunning, onAttach }: ComposerLeftSectionProps) {+ const shell = useOptionalShellMode();const DraftCompositeSelector = useSlot('DraftCompositeSelector');const DraftAgentConfigTrigger = useSlot('DraftAgentConfigTrigger');+ const isBuilder = shell != null && shellIsCreateAgent(shell.mode);return (<div className="flex min-w-0 flex-wrap items-center gap-1.5">- <DraftCompositeSelector disabled={disabled} isRunning={isRunning} onAttach={onAttach} />- <DraftAgentConfigTrigger disabled={disabled} isRunning={isRunning} />+ {!isBuilder ? <DraftCompositeSelector disabled={disabled} isRunning={isRunning} onAttach={onAttach} /> : null}+ {isBuilder ? <DraftAgentConfigTrigger disabled={disabled} isRunning={isRunning} /> : null}+ {isBuilder && onAttach != null ? (+ <Tooltip content="Attach a file">+ <button+ type="button"+ disabled={disabled || isRunning}+ aria-label="Attach a file"+ className={auiButtonClass({ variant: 'ghost', size: 'icon' })}+ onClick={onAttach}+ >+ <Icon name="paperclip" />+ </button>+ </Tooltip>+ ) : null}</div>);}diff --git a/packages/trueforge-ui/src/atoms/lib/sessionCreateAgent.ts b/packages/trueforge-ui/src/atoms/lib/sessionCreateAgent.tsnew file mode 100644index 000000000..81bdad4f1--- /dev/null+++ b/packages/trueforge-ui/src/atoms/lib/sessionCreateAgent.ts@@ -0,0 +1,33 @@+/** Session metadata key for New Chat vs New Agent builder intent (wire/jsonb snake_case). */+export const IS_CREATE_AGENT_METADATA_KEY = 'is_create_agent';++/** Wire metadata values are strings (`SessionMetadataSchema`). */+export function isCreateAgentMetadataValue(isCreateAgent: boolean): 'true' | 'false' {+ return isCreateAgent ? 'true' : 'false';+}++/**+ * Read create-agent intent from session metadata.+ * Missing / undefined / anything other than `"true"` → false (legacy = Chat).+ */+export function readSessionIsCreateAgent(metadata: Record<string, string> | null | undefined): boolean {+ if (metadata == null) return false;+ return Reflect.get(metadata, IS_CREATE_AGENT_METADATA_KEY) === 'true';+}++/** True when a UI session was stamped as agent-builder (own prop or metadata). */+export function sessionIsCreateAgent(session: object): boolean {+ if ('isCreateAgent' in session && Reflect.get(session, 'isCreateAgent') === true) {+ return true;+ }+ if (!('metadata' in session)) return false;+ const metadata = Reflect.get(session, 'metadata');+ if (typeof metadata !== 'object' || metadata === null) return false;+ const record: Record<string, string> = {};+ for (const key of Object.keys(metadata)) {+ const value = Reflect.get(metadata, key);+ if (typeof value !== 'string') continue;+ record[key] = value;+ }+ return readSessionIsCreateAgent(record);+}diff --git a/packages/trueforge-ui/src/containers/AgentConfigDrawerContainer.tsx b/packages/trueforge-ui/src/containers/AgentConfigDrawerContainer.tsxindex fdd269789..a933ed907 100644--- a/packages/trueforge-ui/src/containers/AgentConfigDrawerContainer.tsx+++ b/packages/trueforge-ui/src/containers/AgentConfigDrawerContainer.tsx@@ -60,10 +60,16 @@ export function AgentConfigDrawerContainer({ showClose = false }: { showClose?:return () => window.removeEventListener('keydown', onKeyDown);}, [closeDrawer, editor, shell.agentConfigOpen]);+ // Flush pending edits on unmount. ChatProvider remount (runtimeKey) tears the+ // runtime down first — flush then throws; ignore so the new draft can mount.useEffect(() => () => {flushInstructions();- void flushAgentSpec();+ try {+ void flushAgentSpec();+ } catch {+ // Runtime already gone.+ }},[flushAgentSpec, flushInstructions],);diff --git a/packages/trueforge-ui/src/containers/ThreadContainer.tsx b/packages/trueforge-ui/src/containers/ThreadContainer.tsxindex ec04e72be..9d2006fb8 100644--- a/packages/trueforge-ui/src/containers/ThreadContainer.tsx+++ b/packages/trueforge-ui/src/containers/ThreadContainer.tsx@@ -54,7 +54,14 @@ export function ThreadContainer({ composer }: ThreadContainerProps) {const isEmpty = useAuiState(isNewChatView);const isLoading = useAuiState(s => s.thread.isLoading);- const welcomeHeading = shell?.mode.status === 'active' ? shell.mode.agentName : undefined;+ const welcomeHeading =+ shell?.mode.status === 'active'+ ? shell.mode.agentName != null && shell.mode.agentName.length > 0+ ? shell.mode.agentName+ : shell.mode.isMutable && shell.mode.isCreateAgent+ ? 'Start building a new Agent'+ : undefined+ : undefined;return (<ComposerBusyProvider>diff --git a/packages/trueforge-ui/src/containers/TrueForgeUIShell.tsx b/packages/trueforge-ui/src/containers/TrueForgeUIShell.tsxindex ab176e247..e543bf523 100644--- a/packages/trueforge-ui/src/containers/TrueForgeUIShell.tsx+++ b/packages/trueforge-ui/src/containers/TrueForgeUIShell.tsx@@ -6,6 +6,7 @@ import { lazy, Suspense, useCallback, useMemo, useState, type ReactNode } from 'import { DraftCatalogProvider } from '../atoms/draft/DraftCatalogProvider.js';import { DraftSpecPreferenceBridge } from '../atoms/draft/DraftSpecPreferenceBridge.js';import { cn } from '../atoms/lib/cn.js';+import { IS_CREATE_AGENT_METADATA_KEY, isCreateAgentMetadataValue } from '../atoms/lib/sessionCreateAgent.js';import { Spinner } from '../atoms/primitives/Spinner.js';import { LibrarySessionShareBoot } from '../routing/LibrarySessionShareBoot.js';import { RemoteIdRouteBridge } from '../routing/RemoteIdRouteBridge.js';@@ -14,6 +15,7 @@ import { CustomActionRenderersProvider, type CustomActionRenderers } from '../seimport { ServerProvider } from '../server/ServerContext.js';import { DEFAULT_AGENT_CONFIG, ShellModeProvider, useShellMode, type AgentConfig } from '../server/ShellModeContext.js';import type { TrueForgeServerConfig } from '../server/TrueForgeServerConfig.js';+import type { AgentUIServer, CreateSessionRequest } from '../server/types.js';import { SlotsProvider, type SlotOverrides } from '../theme/SlotsProvider.js';import type { LayoutProp, ThemeConfig } from '../theme/types.js';import { getErrorMessage } from '../utils/getErrorMessage.js';@@ -147,6 +149,7 @@ function ChatProviderFromShell({children,initialSessionId: hostInitialSessionId,onRemoteIdChange,+ server,...providerRest}: {children: ReactNode;@@ -155,6 +158,26 @@ function ChatProviderFromShell({} & Omit<TrueFoundryChatProviderProps, 'agent' | 'agentName' | 'listSessionsAgentId' | 'children'>) {const { mode, runtimeKey, listSessionsAgentId, pendingSessionId } = useShellMode();+ const isCreateAgent = mode.status === 'active' && mode.isMutable && mode.isCreateAgent;++ const serverWithCreateIntent = useMemo((): AgentUIServer => {+ return {+ ...server,+ createSession: request => {+ if (request.agentSpec === undefined) {+ return server.createSession(request);+ }+ const withMetadata: CreateSessionRequest & { metadata: Record<string, string> } = {+ ...request,+ metadata: {+ [IS_CREATE_AGENT_METADATA_KEY]: isCreateAgentMetadataValue(isCreateAgent),+ },+ };+ return server.createSession(withMetadata);+ },+ };+ }, [server, isCreateAgent]);+// Freeze draft seed for the life of this runtimeKey so bindMutableAgent (identity /// instructions on shell) does not push a new defaultAgentSpec into the runtime.const draftDefaultAgentSpec = useMemo(() => {@@ -197,6 +220,7 @@ function ChatProviderFromShell({<TrueFoundryChatProviderkey={runtimeKey}{...providerRest}+ server={serverWithCreateIntent}agent={agent}listSessionsAgentId={listSessionsAgentId}initialSessionId={pendingSessionId ?? hostInitialSessionId}diff --git a/packages/trueforge-ui/src/hooks/useChatChromeActionsVisible.ts b/packages/trueforge-ui/src/hooks/useChatChromeActionsVisible.tsindex b92c711ef..6301a7a6d 100644--- a/packages/trueforge-ui/src/hooks/useChatChromeActionsVisible.ts+++ b/packages/trueforge-ui/src/hooks/useChatChromeActionsVisible.ts@@ -7,15 +7,36 @@ import { useOptionalShellMode } from '../server/ShellModeContext.js';export type NamedAgentHeaderState = {name: string;isEditing: boolean;+ /** New Chat vs New Agent / named-agent differentiation. */+ icon: 'square-pen' | 'agent-2';+ /** When true, prefer a non-empty thread/session title over `name`. */+ allowThreadTitle: boolean;};-// Canonical named-agent header state, including mutable edit mode.+// Canonical named-agent / draft header state, including mutable edit mode.export function useNamedAgentHeaderState(): NamedAgentHeaderState | null {const shell = useOptionalShellMode();if (shell == null || shell.mode.status !== 'active') return null;- const name = shell.mode.agentName ?? shell.mode.agentId;- if (name == null || name.length === 0) return null;- return { name, isEditing: shell.mode.isMutable };++ const identity = shell.mode.agentName ?? shell.mode.agentId;+ if (identity != null && identity.length > 0) {+ return {+ name: identity,+ isEditing: shell.mode.isMutable,+ icon: 'agent-2',+ allowThreadTitle: false,+ };+ }++ if (!shell.mode.isMutable) return null;++ const isCreateAgent = shell.mode.isCreateAgent;+ return {+ name: isCreateAgent ? 'New Agent' : 'New Chat',+ isEditing: false,+ icon: isCreateAgent ? 'agent-2' : 'square-pen',+ allowThreadTitle: true,+ };}export function useNamedAgentHeaderVisible(): boolean {@@ -23,18 +44,20 @@ export function useNamedAgentHeaderVisible(): boolean {return state !== null;}-// Mutable draft/edit with a selected model — drives Save Agent + header chrome.+// Mutable New Agent / Edit with a selected model — drives Save Agent + header chrome.export function useSaveAgentVisible(): boolean {const shell = useOptionalShellMode();const { agentSpec } = useTrueFoundryAgentSpec();- if (shell == null || shell.mode.status !== 'active' || !shell.mode.isMutable) return false;+ if (shell == null || shell.mode.status !== 'active' || !shell.mode.isMutable || !shell.mode.isCreateAgent) {+ return false;+ }return Boolean(agentSpec?.model?.name?.trim());}-// Clear chat: only on immutable (named / saved) sessions — same gate as the agent title.+// Clear chat: any active session (Try Agent, New Chat, New Agent, Edit).export function useChatChromeActionsVisible(): boolean {const shell = useOptionalShellMode();- return shell != null && shell.mode.status === 'active' && !shell.mode.isMutable;+ return shell != null && shell.mode.status === 'active';}// True when the thread header has anything to show (title, Save, and/or Clear).diff --git a/packages/trueforge-ui/src/icons/IconRegistry.tsx b/packages/trueforge-ui/src/icons/IconRegistry.tsxindex be64b30e8..7a33e253a 100644--- a/packages/trueforge-ui/src/icons/IconRegistry.tsx+++ b/packages/trueforge-ui/src/icons/IconRegistry.tsx@@ -29,6 +29,7 @@ import {GripVertical,History,Info,+ LibraryBig,Lightbulb,LineChart,Link2,@@ -164,6 +165,7 @@ const defaults: Record<string, IconEntry> = {'welcome-sparkle': Sparkle,robot: Bot,bot: Bot,+ 'library-big': LibraryBig,'message-square-text': MessageSquareText,'book-open': BookOpen,funnel: ListFilter,diff --git a/packages/trueforge-ui/src/icons/registerAgentIcons.ts b/packages/trueforge-ui/src/icons/registerAgentIcons.tsindex 1e9592a5b..00ed0e1ae 100644--- a/packages/trueforge-ui/src/icons/registerAgentIcons.ts+++ b/packages/trueforge-ui/src/icons/registerAgentIcons.ts@@ -16,6 +16,9 @@ type SvgIcon = React.FC<React.SVGProps<SVGSVGElement>>;registerIcons({'mcp-server': McpServerIcon as unknown as SvgIcon,'agent-2': Agent2Icon as unknown as SvgIcon,+ // Prefer the custom agent glyph over Lucide Bot for bot/robot aliases.+ bot: Agent2Icon as unknown as SvgIcon,+ robot: Agent2Icon as unknown as SvgIcon,compare: CompareIcon as unknown as SvgIcon,ai: AiIcon as unknown as SvgIcon,searchGlobe: SearchGlobeIcon as unknown as SvgIcon,diff --git a/packages/trueforge-ui/src/index.ts b/packages/trueforge-ui/src/index.tsindex 14fb51607..3bc293ef9 100644--- a/packages/trueforge-ui/src/index.ts+++ b/packages/trueforge-ui/src/index.ts@@ -266,6 +266,12 @@ export type {// Server port types + factoryexport { ClearChatButton } from './atoms/ClearChatButton.js';+export {+ IS_CREATE_AGENT_METADATA_KEY,+ isCreateAgentMetadataValue,+ readSessionIsCreateAgent,+ sessionIsCreateAgent,+} from './atoms/lib/sessionCreateAgent.js';export { SelectAgentEmptyState } from './atoms/SelectAgentEmptyState.js';export { ShellActionsActionSlot } from './atoms/ShellActionsActionSlot.js';export { createTrueFoundryServer } from './server/createTrueFoundryServer.js';@@ -293,6 +299,7 @@ export {DEFAULT_AGENT_CONFIG,ShellModeProvider,libraryAgentId,+ shellIsCreateAgent,shellIsMutable,useOptionalShellMode,useShellMode,diff --git a/packages/trueforge-ui/src/layouts/DrawerLayout.tsx b/packages/trueforge-ui/src/layouts/DrawerLayout.tsxindex 7a06474bd..6e987a932 100644--- a/packages/trueforge-ui/src/layouts/DrawerLayout.tsx+++ b/packages/trueforge-ui/src/layouts/DrawerLayout.tsx@@ -1,6 +1,6 @@'use client';-import { lazy, Suspense, useEffect, useRef, useState } from 'react';+import { lazy, Suspense, useRef } from 'react';import { useAui } from '../assistant-ui.js';import { NamedAgentHeaderLabel } from '../atoms/NamedAgentHeaderLabel.js';@@ -10,7 +10,6 @@ import { cn } from '../atoms/lib/cn.js';import { Spinner } from '../atoms/primitives/Spinner.js';import { AgentConfigDrawerContainer } from '../containers/AgentConfigDrawerContainer.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';@@ -29,68 +28,39 @@ export function DrawerLayout({ className }: { className?: string }) {const SessionsPage = useSlot('SessionsPage');const SaveAgentButton = useSlot('SaveAgentButton');const SelectAgentEmptyState = useSlot('SelectAgentEmptyState');- const [threadsOpen, setThreadsOpen] = useState(false);- const threadsBtnRef = useRef<HTMLButtonElement>(null);- const dialogRef = useRef<HTMLDivElement>(null);const mainRef = useRef<HTMLDivElement>(null);- const wasOpen = useRef(false);const isIdle = shell?.mode.status === 'idle';const settingsOpen = shell?.settingsOpen === true;const libraryOpen = shell?.libraryOpen === true;const sessionsOpen = shell?.sessionsOpen === true;const schedulesOpen = shell?.schedulesOpen === true;const overlayOpen = settingsOpen || libraryOpen || sessionsOpen || schedulesOpen;+ const showNewActions = shell?.isNewChatEnabled !== false;- useEffect(() => {- if (libraryOpen || sessionsOpen || schedulesOpen) setThreadsOpen(false);- }, [libraryOpen, sessionsOpen, schedulesOpen]);-- useEffect(() => {- if (!threadsOpen) return;- const onKeyDown = (event: KeyboardEvent) => {- if (event.key === 'Escape') setThreadsOpen(false);- };- window.addEventListener('keydown', onKeyDown);- return () => window.removeEventListener('keydown', onKeyDown);- }, [threadsOpen]);-- useEffect(() => {- const main = mainRef.current;- if (threadsOpen) {- wasOpen.current = true;- if (main) main.inert = true;- dialogRef.current?.focus();+ const handleNewChat = () => {+ shell?.setLibraryOpen(false);+ shell?.setSessionsOpen(false);+ if (shell?.isComposerEnabled) {+ shell.openDraft();return;}- if (wasOpen.current) {- if (main) main.inert = false;- threadsBtnRef.current?.focus();- wasOpen.current = false;- }- }, [threadsOpen]);+ shell?.setSettingsOpen(false);+ shell?.setSchedulesOpen(false);+ void Promise.resolve(aui.threads().switchToNewThread()).catch(() => undefined);+ };- const handleNewChat = () => {+ const handleNewAgent = () => {shell?.setLibraryOpen(false);shell?.setSessionsOpen(false);if (shell?.isComposerEnabled) {- shell.openDraft();- } else {- shell?.setSettingsOpen(false);- shell?.setSchedulesOpen(false);- aui.threads().switchToNewThread();+ shell.openAgentBuilder();}- setThreadsOpen(false);};return (<div className={cn('relative flex h-full min-h-0 w-full flex-col bg-primary-bg', className)}>{/* Keep ShellActions mounted across Settings open/close so host action-slot state persists. */}- <header- className={cn(- 'flex shrink-0 items-center gap-1 border-b border-border bg-topbar-bg px-2 py-1.5',- shell?.agentConfigOpen && 'md:hidden',- )}- >+ <header className="flex shrink-0 items-center gap-1 border-b border-border bg-topbar-bg px-2 py-1.5">{!overlayOpen ? (<><NamedAgentHeaderLabel />@@ -119,27 +89,28 @@ export function DrawerLayout({ className }: { className?: string }) {<ShellActions key="shell-actions" />{!overlayOpen ? (<>- {shell?.isNewChatEnabled !== false ? (+ {showNewActions ? (<buttontype="button"- aria-label="New chat"- title="New chat"+ aria-label="New Chat"+ title="New Chat"className={auiButtonClass({ variant: 'ghost', size: 'icon' })}onClick={handleNewChat}>- <Icon name="plus" />+ <Icon name="square-pen" />+ </button>+ ) : null}+ {showNewActions && shell?.isComposerEnabled ? (+ <button+ type="button"+ aria-label="New Agent"+ title="New Agent"+ className={auiButtonClass({ variant: 'ghost', size: 'icon' })}+ onClick={handleNewAgent}+ >+ <Icon name="agent-2" /></button>) : null}- <button- ref={threadsBtnRef}- type="button"- aria-label="Sessions"- aria-expanded={threadsOpen}- className="text-text-secondary hover:text-text-primary inline-flex size-8 cursor-pointer items-center justify-center rounded-md"- onClick={() => setThreadsOpen(v => !v)}- >- <Icon name="clock-rotate-left" />- </button></>) : null}</header>@@ -166,7 +137,7 @@ export function DrawerLayout({ className }: { className?: string }) {) : libraryOpen && shell?.libraryAgentId != null ? (<AgentDetailsPage key={shell.libraryAgentId} agentId={shell.libraryAgentId} />) : libraryOpen ? (- <AgentsLibrary onSelectAgent={() => setThreadsOpen(false)} />+ <AgentsLibrary />) : schedulesOpen ? (<Suspensefallback={@@ -199,25 +170,6 @@ export function DrawerLayout({ className }: { className?: string }) {</aside>) : null}</div>- {threadsOpen ? (- <>- <button- type="button"- aria-label="Close sessions"- className="absolute inset-0 z-[9] cursor-pointer bg-[var(--overlay)]"- onClick={() => setThreadsOpen(false)}- />- <div- ref={dialogRef}- className="absolute inset-y-0 right-0 z-10 flex w-full max-w-80 flex-col border-l border-border bg-sidebar-bg shadow-lg outline-none"- role="dialog"- aria-label="Sessions"- tabIndex={-1}- >- <ThreadListContainer onThreadOpen={() => setThreadsOpen(false)} />- </div>- </>- ) : null}</div>);}diff --git a/packages/trueforge-ui/src/layouts/SidebarLayout.tsx b/packages/trueforge-ui/src/layouts/SidebarLayout.tsxindex a0950618a..04dda4096 100644--- a/packages/trueforge-ui/src/layouts/SidebarLayout.tsx+++ b/packages/trueforge-ui/src/layouts/SidebarLayout.tsx@@ -21,7 +21,7 @@ import { AgentConfigDrawerContainer } from '../containers/AgentConfigDrawerContaimport { Thread } from '../containers/Thread.js';import { useChatHeaderContentVisible } from '../hooks/useChatChromeActionsVisible.js';import { Icon } from '../icons/Icon.js';-import { useOptionalShellMode } from '../server/ShellModeContext.js';+import { shellIsCreateAgent, useOptionalShellMode } from '../server/ShellModeContext.js';import { resolveBrandChrome } from '../theme/brand.js';import { useSlot } from '../theme/SlotsProvider.js';import { useBrand } from '../theme/ThemeProvider.js';@@ -32,7 +32,13 @@ const SchedulesPage = lazy(() =>);const brandLogoClassName = 'h-5 w-5 max-w-40 shrink-0 object-contain';-const railWidthClassName = 'w-20';+const railWidthClassName = 'w-18';++const railActionButtonClassName =+ 'h-auto w-full flex-col gap-1 whitespace-normal px-1 py-1.5 text-[10px] leading-tight !justify-center text-text-primary shadow-none hover:bg-ghost-button-hover hover:text-ghost-button-text';++const railSelectedClassName =+ 'bg-primary-button-bg text-primary-button-text hover:bg-primary-button-hover hover:text-primary-button-text';function SidebarNav(): ReactNode {const aui = useAui();@@ -40,6 +46,15 @@ function SidebarNav(): ReactNode {const AgentsLibraryButton = useSlot('AgentsLibraryButton');const SessionsBrowserButton = useSlot('SessionsBrowserButton');const SchedulesButton = useSlot('SchedulesButton');+ const showNewActions = shell?.isNewChatEnabled !== false;+ const overlayOpen =+ shell?.settingsOpen === true ||+ shell?.libraryOpen === true ||+ shell?.sessionsOpen === true ||+ shell?.schedulesOpen === true;+ const mode = shell?.mode;+ const newChatSelected = !overlayOpen && mode?.status === 'active' && mode.isMutable && !mode.isCreateAgent;+ const newAgentSelected = !overlayOpen && mode != null && shellIsCreateAgent(mode);const handleNewChat = () => {shell?.setLibraryOpen(false);@@ -53,17 +68,25 @@ function SidebarNav(): ReactNode {void Promise.resolve(aui.threads().switchToNewThread()).catch(() => undefined);};+ const handleNewAgent = () => {+ shell?.setLibraryOpen(false);+ shell?.setSessionsOpen(false);+ if (shell?.isComposerEnabled) {+ shell.openAgentBuilder();+ }+ };+return (- <nav className="flex min-h-0 flex-1 flex-col items-center gap-2 p-2" aria-label="Sidebar">- {shell?.isNewChatEnabled !== false ? (+ <nav className="flex min-h-0 flex-1 flex-col items-center gap-2 p-1" aria-label="Sidebar">+ {showNewActions ? (<buttontype="button"aria-label="Start new chat"title="New chat"+ aria-current={newChatSelected ? 'page' : undefined}className={auiButtonClass({variant: 'ghost',- className:- 'h-auto w-full flex-col gap-1 whitespace-normal px-1 py-1.5 text-[10px] leading-tight !justify-center text-text-primary shadow-none hover:bg-ghost-button-hover hover:text-ghost-button-text',+ className: cn(railActionButtonClassName, newChatSelected && railSelectedClassName),})}onClick={handleNewChat}>@@ -71,6 +94,22 @@ function SidebarNav(): ReactNode {<span className="text-center">New Chat</span></button>) : null}+ {showNewActions && shell?.isComposerEnabled ? (+ <button+ type="button"+ aria-label="Start new agent"+ title="New Agent"+ aria-current={newAgentSelected ? 'page' : undefined}+ className={auiButtonClass({+ variant: 'ghost',+ className: cn(railActionButtonClassName, newAgentSelected && railSelectedClassName),+ })}+ onClick={handleNewAgent}+ >+ <Icon name="agent-2" size={16} />+ <span className="text-center">New Agent</span>+ </button>+ ) : null}<AgentsLibraryButton compact /><SessionsBrowserButton compact /><SchedulesButton compact />@@ -178,7 +217,9 @@ export function SidebarLayout({ className }: { className?: string }) {'flex shrink-0 items-center gap-1 border-b border-border bg-topbar-bg px-2 py-1.5',// Desktop: hide when settings/idle or the thread header has nothing to show// (empty untitled draft). Mobile still needs the menu button.- (overlayOpen || shell?.agentConfigOpen || isIdle || !hasChatHeaderContent) && 'md:hidden',+ // Keep visible while Agent Config is open so New Agent / title stay in chrome;+ // SaveAgentButton is omitted below to avoid duplicating the drawer's save control.+ (overlayOpen || isIdle || !hasChatHeaderContent) && 'md:hidden',)}>{!overlayOpen ? (diff --git a/packages/trueforge-ui/src/layouts/StackChatPanel.tsx b/packages/trueforge-ui/src/layouts/StackChatPanel.tsxindex 616a080b4..086d1547c 100644--- a/packages/trueforge-ui/src/layouts/StackChatPanel.tsx+++ b/packages/trueforge-ui/src/layouts/StackChatPanel.tsx@@ -1,6 +1,6 @@'use client';-import { lazy, Suspense, useEffect, useState, type ReactNode } from 'react';+import { lazy, Suspense, useEffect, type ReactNode } from 'react';import { useAui } from '../assistant-ui.js';import { NamedAgentHeaderLabel } from '../atoms/NamedAgentHeaderLabel.js';@@ -10,7 +10,6 @@ import { cn } from '../atoms/lib/cn.js';import { Spinner } from '../atoms/primitives/Spinner.js';import { AgentConfigDrawerContainer } from '../containers/AgentConfigDrawerContainer.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';@@ -27,11 +26,10 @@ export type StackChatPanelProps = {};/**- * List XOR thread stack used by `dock` and `widget` layouts.- * Starts on a new chat; history icon opens the session list; New / select opens the thread.+ * Thread stack used by `dock` and `widget` layouts.+ * New Chat / New Agent replace the former in-panel recent-session list.*/export function StackChatPanel({ className, threadHeaderEnd }: StackChatPanelProps) {- const [view, setView] = useState<'list' | 'thread'>('thread');const aui = useAui();const shell = useOptionalShellMode();const ClearChatButton = useSlot('ClearChatButton');@@ -45,12 +43,33 @@ export function StackChatPanel({ className, threadHeaderEnd }: StackChatPanelProconst libraryOpen = shell?.libraryOpen === true;const sessionsOpen = shell?.sessionsOpen === true;const schedulesOpen = shell?.schedulesOpen === true;+ const showNewActions = shell?.isNewChatEnabled !== false;useEffect(() => {if (isIdle) return;void Promise.resolve(aui.threads().switchToNewThread()).catch(() => undefined);}, [aui, isIdle]);+ const handleNewChat = () => {+ shell?.setLibraryOpen(false);+ shell?.setSessionsOpen(false);+ if (shell?.isComposerEnabled) {+ shell.openDraft();+ return;+ }+ shell?.setSettingsOpen(false);+ shell?.setSchedulesOpen(false);+ void Promise.resolve(aui.threads().switchToNewThread()).catch(() => undefined);+ };++ const handleNewAgent = () => {+ shell?.setLibraryOpen(false);+ shell?.setSessionsOpen(false);+ if (shell?.isComposerEnabled) {+ shell.openAgentBuilder();+ }+ };+return (<div className={cn('relative flex h-full min-h-0 flex-col', className)}>{settingsOpen ? (@@ -81,7 +100,7 @@ export function StackChatPanel({ className, threadHeaderEnd }: StackChatPanelPro</div>) : libraryOpen ? (<div className="min-h-0 flex-1">- <AgentsLibrary onSelectAgent={() => setView('thread')} />+ <AgentsLibrary /></div>) : schedulesOpen ? (<div className="min-h-0 flex-1">@@ -101,20 +120,31 @@ export function StackChatPanel({ className, threadHeaderEnd }: StackChatPanelPro<SchedulesPage /></Suspense></div>- ) : view === 'list' ? (- <ThreadListContainer onThreadOpen={() => setView('thread')} />) : (<><header className="flex shrink-0 items-center gap-1 border-b border-border px-2 py-1.5">- <button- type="button"- aria-label="Sessions"- title="Sessions"- className={auiButtonClass({ variant: 'ghost', size: 'icon' })}- onClick={() => setView('list')}- >- <Icon name="clock-rotate-left" />- </button>+ {showNewActions ? (+ <button+ type="button"+ aria-label="New Chat"+ title="New Chat"+ className={auiButtonClass({ variant: 'ghost', size: 'icon' })}+ onClick={handleNewChat}+ >+ <Icon name="square-pen" />+ </button>+ ) : null}+ {showNewActions && shell?.isComposerEnabled ? (+ <button+ type="button"+ aria-label="New Agent"+ title="New Agent"+ className={auiButtonClass({ variant: 'ghost', size: 'icon' })}+ onClick={handleNewAgent}+ >+ <Icon name="agent-2" />+ </button>+ ) : null}<NamedAgentHeaderLabel /><span className="min-w-0 flex-1" /><ClearChatButton />@@ -133,7 +163,6 @@ export function StackChatPanel({ className, threadHeaderEnd }: StackChatPanelProonClick={() => {shell?.setLibraryOpen(false);shell?.setSchedulesOpen(false);- setView('thread');}}><Icon name="arrow-left" />diff --git a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/agentSessionsServer.ts b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/agentSessionsServer.tsindex 14843d745..f7c412324 100644--- a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/agentSessionsServer.ts+++ b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/agentSessionsServer.ts@@ -1,4 +1,5 @@import type { TrueForge, TrueForgeApi } from '@truefoundry/trueforge-sdk';+import { readSessionIsCreateAgent } from '../../atoms/lib/sessionCreateAgent.js';import type { AgentSessionsServer, SessionListEntry } from '../../server/types.js';import { toListResult, toUiAgentSpec } from './chatServer.js';import { createTrueForgeClient, parseIsoDate, type CreateTrueForgeClientOptions } from './client.js';@@ -9,12 +10,19 @@ export type CreateHarnessAgentSessionsServerOptions = CreateTrueForgeClientOptioclient?: TrueForge;};-function toSessionListEntry(session: TrueForgeApi.Session): SessionListEntry<HarnessAgentSpec> {+export type HarnessSessionListEntry = SessionListEntry<HarnessAgentSpec> & {+ isCreateAgent: boolean;+ isMutable: boolean;+};++function toSessionListEntry(session: TrueForgeApi.Session): HarnessSessionListEntry {return {id: session.id,createdAt: session.createdAt,updatedAt: session.updatedAt,lastActivityAt: session.updatedAt,+ isCreateAgent: readSessionIsCreateAgent(session.metadata),+ isMutable: session.agent.type === 'inline',metrics: {totalTurns: session.metrics.totalTurns,totalCostInUsd: session.metrics.totalCostInUsd,diff --git a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/chatServer.ts b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/chatServer.tsindex 34ba147fc..aa231ec77 100644--- a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/chatServer.ts+++ b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/chatServer.ts@@ -12,8 +12,10 @@* agent. The UI filters with registry `agentId`.*/import type { TrueForge, TrueForgeApi } from '@truefoundry/trueforge-sdk';+import { readSessionIsCreateAgent } from '../../atoms/lib/sessionCreateAgent.js';import type {AgentChatServer,+ CreateSessionRequest,ListResult,Session,Turn,@@ -30,6 +32,13 @@ export type CreateHarnessChatServerOptions = CreateTrueForgeClientOptions & {client?: TrueForge;};+/** UI session with create-agent intent for resume chrome. */+export type HarnessUiSession = Session<HarnessAgentSpec> & { isCreateAgent: boolean };++export type HarnessCreateSessionRequest = CreateSessionRequest<HarnessAgentSpec> & {+ metadata?: Record<string, string>;+};+function toUiMcpServer(server: TrueForgeApi.McpServer): HarnessMcpServerMount {return server;}@@ -69,10 +78,11 @@ export function toUiAgentSpec(spec: TrueForgeApi.AgentSpec): HarnessAgentSpec {};}-function toUiSession(session: TrueForgeApi.Session): Session<HarnessAgentSpec> {+function toUiSession(session: TrueForgeApi.Session): HarnessUiSession {return {id: session.id,isMutable: session.agent.type === 'inline',+ isCreateAgent: readSessionIsCreateAgent(session.metadata),createdAt: session.createdAt,updatedAt: session.updatedAt,...(session.title === null ? {} : { title: session.title }),@@ -83,6 +93,11 @@ function toUiSession(session: TrueForgeApi.Session): Session<HarnessAgentSpec> {};}+function createSessionMetadata(request: HarnessCreateSessionRequest): Record<string, string> | undefined {+ if (request.metadata === undefined) return undefined;+ return request.metadata;+}+/** Spread drops the interface identity, which is what makes the SDK's index-signature part type accept it. */function toUiContent(content: TrueForgeApi.UserMessageContent): UserMessageContent {return typeof content === 'string' ? content : content.map(part => ({ ...part }));@@ -145,7 +160,7 @@ function toHarnessInput(input: TurnInputItem[]): TrueForgeApi.TurnInputItem[] {export function createHarnessChatServer(options: CreateHarnessChatServerOptions = {},-): AgentChatServer<HarnessAgentSpec> {+): AgentChatServer<HarnessAgentSpec, HarnessUiSession, HarnessCreateSessionRequest> {const client = options.client ?? createTrueForgeClient(options);return {// The sandbox is resolved server-side from the turn, so `sandboxId` is accepted for parity@@ -156,15 +171,18 @@ export function createHarnessChatServer(},async createSession(request) {+ const metadata = createSessionMetadata(request);if (request.agentName !== undefined && request.agentName.length > 0) {const created = await client.sessions.create({agent: { name: request.agentName },+ ...(metadata === undefined ? {} : { metadata }),});return toUiSession(created.data);}if (request.agentSpec !== undefined) {const created = await client.sessions.create({agent: { spec: toHarnessAgentSpec(request.agentSpec) },+ ...(metadata === undefined ? {} : { metadata }),});return toUiSession(created.data);}diff --git a/packages/trueforge-ui/src/routing/ShellRouteSync.tsx b/packages/trueforge-ui/src/routing/ShellRouteSync.tsxindex 1577159ec..56492b367 100644--- a/packages/trueforge-ui/src/routing/ShellRouteSync.tsx+++ b/packages/trueforge-ui/src/routing/ShellRouteSync.tsx@@ -3,6 +3,7 @@import { useCallback, useEffect, useRef } from 'react';import { useLocation, useNavigate } from 'react-router-dom';+import { sessionIsCreateAgent } from '../atoms/lib/sessionCreateAgent.js';import { useOptionalServer } from '../server/ServerContext.js';import { useShellMode } from '../server/ShellModeContext.js';import { deriveChatPlace, derivePlace } from './derivePlace.js';@@ -73,6 +74,7 @@ export function ShellRouteSync({shell.openHistorySession({sessionId,isMutable: session.isMutable,+ isCreateAgent: sessionIsCreateAgent(session),...(session.agentName != null ? { agentName: session.agentName } : {}),});})diff --git a/packages/trueforge-ui/src/server/ShellModeContext.tsx b/packages/trueforge-ui/src/server/ShellModeContext.tsxindex 8d165446e..3e348cd58 100644--- a/packages/trueforge-ui/src/server/ShellModeContext.tsx+++ b/packages/trueforge-ui/src/server/ShellModeContext.tsx@@ -28,14 +28,19 @@ export const DEFAULT_AGENT_CONFIG: AgentConfig = {};/**- * Active chat binding. Mutability (`isMutable`) decides composer / Save / updateSession —- * not a parallel draft|named shell type.+ * Active chat binding. Mutability (`isMutable`) decides draft vs named runtime.+ * `isCreateAgent` (mutable only) splits New Agent builder chrome from simple New Chat.*/export type ShellMode =| { status: 'idle' }| {status: 'active';isMutable: boolean;+ /**+ * Mutable only: true = Agent builder (config drawer + Save); false = simple chat.+ * Always false when `isMutable` is false (Try / named).+ */+ isCreateAgent: boolean;/** Identity for immutable bind + history filter. */agentId?: string;/** Display / welcome label (often same as agentId). */@@ -45,9 +50,13 @@ export type ShellMode =locked: boolean;};-/** Library / New Chat create intent. */+/** Library / New Chat / New Agent create intent. */export type SelectLibraryAgentRequest = {isMutable: boolean;+ /**+ * Mutable only. When omitted: true if Edit identity is present, else false (New Chat).+ */+ isCreateAgent?: boolean;agentId?: string;agentName?: string;agentSpec?: AgentSpec;@@ -94,8 +103,10 @@ type ShellModeContextValue = {bindMutableAgent: (req: { agentId: string; agentName: string; agentSpec: AgentSpec }) => void;/** @deprecated Prefer `selectLibraryAgent({ isMutable: false, agentName })`. */selectAgent: (agentName: string) => void;- /** @deprecated Prefer `selectLibraryAgent({ isMutable: true, agentSpec })`. */+ /** Open a simple New Chat (mutable, no agent-builder chrome). */openDraft: () => void;+ /** Open New Agent builder (mutable + Agent Config drawer). */+ openAgentBuilder: () => void;/** Remember plain-draft composer choices as the seed for future new chats. */rememberDraftSpec: (agentSpec: AgentSpec) => void;/**@@ -103,8 +114,14 @@ type ShellModeContextValue = {* Prefer explicit `isMutable` from the session row; when omitted, agentName* present → immutable and agentName absent → mutable. Immutable rows may omit* `agentName` when the registry agent was deleted.+ * `isCreateAgent` is only applied when mutable (default false when omitted).*/- openHistorySession: (req: { sessionId: string; agentName?: string; isMutable?: boolean }) => void;+ openHistorySession: (req: {+ sessionId: string;+ agentName?: string;+ isMutable?: boolean;+ isCreateAgent?: boolean;+ }) => void;/** Reset current chat; no-op when idle. */clearChat: () => void;/** Return library-only mode to its idle landing; no-op in other modes. */@@ -148,6 +165,7 @@ function initialMode(config: AgentConfig, mutableSeed: AgentSpec): ShellMode {return {status: 'active',isMutable: false,+ isCreateAgent: false,agentId: config.name,agentName: config.name,locked: true,@@ -159,12 +177,18 @@ function initialMode(config: AgentConfig, mutableSeed: AgentSpec): ShellMode {return {status: 'active',isMutable: true,+ isCreateAgent: false,agentSpec: mutableSeed,locked: false,};}}+function resolveMutableIsCreateAgent(req: SelectLibraryAgentRequest): boolean {+ if (req.isCreateAgent !== undefined) return req.isCreateAgent;+ return req.agentId != null || req.agentName != null;+}+function libraryAgentId(agent: Pick<AgentLibraryEntry, 'agentId' | 'name'>): string {return agent.agentId ?? agent.name;}@@ -323,15 +347,17 @@ export function ShellModeProvider({return {status: 'active',isMutable: false,+ isCreateAgent: false,agentId: lockedAgentName,agentName: lockedAgentName,locked: true,};}, [locked, lockedAgentName, mode]);- const agentConfigOpen = effectiveMode.status === 'active' && effectiveMode.isMutable && agentConfigOpenState;+ const agentConfigOpen =+ effectiveMode.status === 'active' && effectiveMode.isMutable && effectiveMode.isCreateAgent && agentConfigOpenState;useEffect(() => {- if (effectiveMode.status !== 'active' || !effectiveMode.isMutable) {+ if (effectiveMode.status !== 'active' || !effectiveMode.isMutable || !effectiveMode.isCreateAgent) {setAgentConfigOpenState(false);}}, [effectiveMode]);@@ -357,14 +383,17 @@ export function ShellModeProvider({setSessionsOpen(false);setSchedulesOpen(false);setPendingSessionId(undefined);+ const isCreateAgent = resolveMutableIsCreateAgent(req);setMode({status: 'active',isMutable: true,+ isCreateAgent,agentId: req.agentId,agentName: req.agentName,agentSpec: req.agentSpec ?? mutableSeedRef.current,locked: false,});+ setAgentConfigOpenState(isCreateAgent);bumpEpoch(true);return;}@@ -377,9 +406,11 @@ export function ShellModeProvider({setSessionsOpen(false);setSchedulesOpen(false);setPendingSessionId(undefined);+ setAgentConfigOpenState(false);setMode({status: 'active',isMutable: false,+ isCreateAgent: false,agentId: req.agentId ?? agentName,agentName,locked: false,@@ -397,6 +428,7 @@ export function ShellModeProvider({return {status: 'active',isMutable: true,+ isCreateAgent: true,agentId: req.agentId,agentName: req.agentName,agentSpec: req.agentSpec,@@ -417,7 +449,13 @@ export function ShellModeProvider({const openDraft = useCallback(() => {if (!isComposerEnabled) return;refreshCapabilities?.();- selectLibraryAgent({ isMutable: true, agentSpec: mutableSeedRef.current });+ selectLibraryAgent({ isMutable: true, isCreateAgent: false, agentSpec: mutableSeedRef.current });+ }, [isComposerEnabled, refreshCapabilities, selectLibraryAgent]);++ const openAgentBuilder = useCallback(() => {+ if (!isComposerEnabled) return;+ refreshCapabilities?.();+ selectLibraryAgent({ isMutable: true, isCreateAgent: true, agentSpec: mutableSeedRef.current });}, [isComposerEnabled, refreshCapabilities, selectLibraryAgent]);const sandboxEnabled = capabilities?.sandbox.enabled;@@ -436,10 +474,12 @@ export function ShellModeProvider({sessionId,agentName,isMutable: isMutableOpt,+ isCreateAgent: isCreateAgentOpt,}: {sessionId: string;agentName?: string;isMutable?: boolean;+ isCreateAgent?: boolean;}) => {setSettingsOpen(false);setLibraryOpenState(false);@@ -450,12 +490,15 @@ export function ShellModeProvider({const isMutable = isMutableOpt ?? agentName == null;if (isMutable) {if (!isComposerEnabled) return;+ const isCreateAgent = isCreateAgentOpt === true;setMode({status: 'active',isMutable: true,+ isCreateAgent,agentSpec: mutableSeedRef.current,locked: false,});+ setAgentConfigOpenState(isCreateAgent);bumpEpoch(true);return;}@@ -465,9 +508,11 @@ export function ShellModeProvider({} else if (!isLibraryEnabled) {return;}+ setAgentConfigOpenState(false);setMode({status: 'active',isMutable: false,+ isCreateAgent: false,locked: false,...(agentName != null ? { agentId: agentName, agentName } : {}),});@@ -489,15 +534,17 @@ export function ShellModeProvider({if (effectiveMode.status === 'idle') return;setPendingSessionId(undefined);if (effectiveMode.isMutable) {- // Preserve Edit binding (name + seeded spec); blank drafts fall back to host seed.+ // Preserve Edit / builder vs chat intent; blank drafts fall back to host seed.setMode({status: 'active',isMutable: true,+ isCreateAgent: effectiveMode.isCreateAgent,agentId: effectiveMode.agentId,agentName: effectiveMode.agentName,agentSpec: effectiveMode.agentSpec ?? mutableSeedRef.current,locked: false,});+ setAgentConfigOpenState(effectiveMode.isCreateAgent);bumpEpoch(true);return;}@@ -553,6 +600,7 @@ export function ShellModeProvider({bindMutableAgent,selectAgent,openDraft,+ openAgentBuilder,rememberDraftSpec,openHistorySession,clearChat,@@ -589,6 +637,7 @@ export function ShellModeProvider({bindMutableAgent,selectAgent,openDraft,+ openAgentBuilder,rememberDraftSpec,openHistorySession,clearChat,@@ -622,4 +671,9 @@ export function shellIsMutable(mode: ShellMode): boolean {return mode.status === 'active' && mode.isMutable;}+/** True when the shell is in New Agent / Edit builder chrome. */+export function shellIsCreateAgent(mode: ShellMode): boolean {+ return mode.status === 'active' && mode.isMutable && mode.isCreateAgent;+}+export { libraryAgentId };diff --git a/packages/trueforge-ui/test/atoms/AgentSessionDetailHeader.test.tsx b/packages/trueforge-ui/test/atoms/AgentSessionDetailHeader.test.tsxindex fcb56de9f..f03384a4b 100644--- a/packages/trueforge-ui/test/atoms/AgentSessionDetailHeader.test.tsx+++ b/packages/trueforge-ui/test/atoms/AgentSessionDetailHeader.test.tsx@@ -57,4 +57,19 @@ describe('AgentSessionDetailHeader', () => {expect(screen.getByRole('tooltip')).toHaveTextContent('Copied');});});++ it('shows Resume Chat when onResume is provided', () => {+ const onResume = vi.fn();+ render(+ <AgentSessionDetailHeader+ title="Help me find more details"+ sessionId="sess-1"+ onClose={() => undefined}+ onResume={onResume}+ resumeLabel="Resume Chat"+ />,+ );+ fireEvent.click(screen.getByRole('button', { name: 'Resume Chat' }));+ expect(onResume).toHaveBeenCalledOnce();+ });});diff --git a/packages/trueforge-ui/test/atoms/ClearChatButton.test.tsx b/packages/trueforge-ui/test/atoms/ClearChatButton.test.tsxindex b086405b7..f9583fd85 100644--- a/packages/trueforge-ui/test/atoms/ClearChatButton.test.tsx+++ b/packages/trueforge-ui/test/atoms/ClearChatButton.test.tsx@@ -53,7 +53,7 @@ describe('ClearChatButton', () => {expect(screen.getByRole('button', { name: 'Clear chat' })).toBeInTheDocument();});- it('is hidden on mutable sessions', () => {+ it('is visible on mutable sessions', () => {render(<SlotsProvider><ShellModeProvider agentConfig={{ mode: 'AgentComposer' }}>@@ -63,7 +63,7 @@ describe('ClearChatButton', () => {</ShellModeProvider></SlotsProvider>,);- expect(screen.queryByRole('button', { name: 'Clear chat' })).not.toBeInTheDocument();+ expect(screen.getByRole('button', { name: 'Clear chat' })).toBeInTheDocument();});it('calls clearChat when clicked after a chat has started', () => {diff --git a/packages/trueforge-ui/test/atoms/NamedAgentHeaderLabel.test.tsx b/packages/trueforge-ui/test/atoms/NamedAgentHeaderLabel.test.tsxindex d4ff3895c..88fdc3521 100644--- a/packages/trueforge-ui/test/atoms/NamedAgentHeaderLabel.test.tsx+++ b/packages/trueforge-ui/test/atoms/NamedAgentHeaderLabel.test.tsx@@ -4,6 +4,7 @@ import { describe, expect, it } from 'vitest';import { NamedAgentHeaderLabel } from '@/atoms/NamedAgentHeaderLabel.js';import { ShellModeProvider, useShellMode } from '@/server/ShellModeContext.js';+import { RuntimeHarness } from '../containers/RuntimeHarness.js';function SelectNamed() {const shell = useShellMode();@@ -22,6 +23,7 @@ function SelectEditable() {onClick={() =>shell.selectLibraryAgent({isMutable: true,+ isCreateAgent: true,agentId: 'reviewer',agentName: 'reviewer',agentSpec: { model: { name: 'openai/gpt-4.1' } },@@ -33,30 +35,62 @@ function SelectEditable() {);}+function OpenAgentBuilder() {+ const shell = useShellMode();+ return (+ <button type="button" onClick={() => shell.openAgentBuilder()}>+ new agent+ </button>+ );+}+describe('NamedAgentHeaderLabel', () => {it('shows the agent name for a named (immutable) chat', () => {render(<ShellModeProvider agentConfig={{ mode: 'SingleAgent', name: 'support' }}>- <NamedAgentHeaderLabel />+ <RuntimeHarness messages={[]}>+ <NamedAgentHeaderLabel />+ </RuntimeHarness></ShellModeProvider>,);expect(screen.getByRole('heading', { name: 'support' })).toBeInTheDocument();});- it('is hidden for unnamed draft chats', () => {+ it('shows New Chat for unnamed draft chats', () => {render(<ShellModeProvider agentConfig={{ mode: 'AgentComposer' }}>- <NamedAgentHeaderLabel />+ <RuntimeHarness messages={[]}>+ <NamedAgentHeaderLabel />+ </RuntimeHarness></ShellModeProvider>,);- expect(screen.queryByRole('heading')).not.toBeInTheDocument();+ expect(screen.getByRole('heading', { name: 'New Chat' })).toBeInTheDocument();+ });++ it('shows New Agent after opening the agent builder', () => {+ render(+ <ShellModeProvider agentConfig={{ mode: 'AgentComposer' }}>+ <RuntimeHarness messages={[]}>+ <OpenAgentBuilder />+ <NamedAgentHeaderLabel />+ </RuntimeHarness>+ </ShellModeProvider>,+ );++ act(() => {+ screen.getByRole('button', { name: 'new agent' }).click();+ });++ expect(screen.getByRole('heading', { name: 'New Agent' })).toBeInTheDocument();});it('shows an Editing label for a saved agent opened in mutable mode', () => {render(<ShellModeProvider agentConfig={{ mode: 'AgentComposer' }}>- <SelectEditable />- <NamedAgentHeaderLabel />+ <RuntimeHarness messages={[]}>+ <SelectEditable />+ <NamedAgentHeaderLabel />+ </RuntimeHarness></ShellModeProvider>,);@@ -70,8 +104,10 @@ describe('NamedAgentHeaderLabel', () => {it('is hidden while idle, then appears after selecting a named agent', () => {render(<ShellModeProvider agentConfig={{ mode: 'AgentLibrary' }}>- <SelectNamed />- <NamedAgentHeaderLabel />+ <RuntimeHarness messages={[]}>+ <SelectNamed />+ <NamedAgentHeaderLabel />+ </RuntimeHarness></ShellModeProvider>,);expect(screen.queryByRole('heading')).not.toBeInTheDocument();diff --git a/packages/trueforge-ui/test/atoms/SaveAgentButton.test.tsx b/packages/trueforge-ui/test/atoms/SaveAgentButton.test.tsxindex bf9993955..99b4a02cc 100644--- a/packages/trueforge-ui/test/atoms/SaveAgentButton.test.tsx+++ b/packages/trueforge-ui/test/atoms/SaveAgentButton.test.tsx@@ -1,6 +1,6 @@// @vitest-environment jsdomimport { fireEvent, render, screen, waitFor, within } from '@testing-library/react';-import { cloneElement, isValidElement, useEffect, type ReactNode } from 'react';+import { cloneElement, isValidElement, useEffect, useLayoutEffect, type ReactNode } from 'react';import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';import { SaveAgentButton } from '@/atoms/SaveAgentButton.js';@@ -30,6 +30,16 @@ beforeAll(() => {};});+function OpenAgentBuilderOnMount({ children }: { children: ReactNode }) {+ const { openAgentBuilder, mode } = useShellMode();+ useLayoutEffect(() => {+ if (mode.status === 'active' && mode.isMutable && !mode.isCreateAgent) {+ openAgentBuilder();+ }+ }, [mode, openAgentBuilder]);+ return children;+}+function renderButton({saveAgent = vi.fn(async (): Promise<SaveAgentResult> => ({ agentId: 'agent-1' })),agentConfig = { mode: 'AgentComposer' as const },@@ -71,7 +81,9 @@ function renderButton({<SlotsProvider><ServerProvider server={server}><ShellModeProvider agentConfig={agentConfig}>- {isValidElement(children) ? cloneElement(children) : children}+ <OpenAgentBuilderOnMount>+ {isValidElement(children) ? cloneElement(children) : children}+ </OpenAgentBuilderOnMount></ShellModeProvider></ServerProvider></SlotsProvider>@@ -89,6 +101,7 @@ function BoundMutableSaveButton({ agentId, agentName }: { agentId: string; agentuseEffect(() => {selectLibraryAgent({isMutable: true,+ isCreateAgent: true,agentId,agentName,agentSpec,diff --git a/packages/trueforge-ui/test/atoms/draft/DraftAgentConfigTrigger.test.tsx b/packages/trueforge-ui/test/atoms/draft/DraftAgentConfigTrigger.test.tsxindex 051bd48a4..913c3a28d 100644--- a/packages/trueforge-ui/test/atoms/draft/DraftAgentConfigTrigger.test.tsx+++ b/packages/trueforge-ui/test/atoms/draft/DraftAgentConfigTrigger.test.tsx@@ -9,6 +9,15 @@ function Probe() {const shell = useShellMode();return (<>+ <button+ type="button"+ onClick={() => {+ shell.openAgentBuilder();+ shell.setAgentConfigOpen(false);+ }}+ >+ Enter builder+ </button><DraftAgentConfigTrigger /><span data-testid="open">{String(shell.agentConfigOpen)}</span></>@@ -23,6 +32,8 @@ describe('DraftAgentConfigTrigger', () => {</ShellModeProvider>,);+ fireEvent.click(screen.getByRole('button', { name: 'Enter builder' }));+const trigger = screen.getByRole('button', { name: 'Agent config' });expect(trigger).toHaveAttribute('aria-expanded', 'false');fireEvent.click(trigger);diff --git a/packages/trueforge-ui/test/atoms/draft/DraftComposerSections.test.tsx b/packages/trueforge-ui/test/atoms/draft/DraftComposerSections.test.tsxindex 9578948be..07c0b2916 100644--- a/packages/trueforge-ui/test/atoms/draft/DraftComposerSections.test.tsx+++ b/packages/trueforge-ui/test/atoms/draft/DraftComposerSections.test.tsx@@ -74,7 +74,8 @@ describe('draft composer sections', () => {expect(await screen.findByTitle('Select model')).toHaveTextContent('gpt-4.1');expect(await screen.findByTitle('Select reasoning effort')).toHaveTextContent('high');- expect(screen.getByRole('button', { name: 'Agent config' })).toBeInTheDocument();+ // Without shell builder mode, left chrome is Tools — not Agent config.+ expect(screen.queryByRole('button', { name: 'Agent config' })).not.toBeInTheDocument();});it('propagates disabled and running state to composed controls', async () => {@@ -83,12 +84,10 @@ describe('draft composer sections', () => {expect(screen.getByRole('button', { name: 'Tools (3)' })).toBeDisabled();expect(await screen.findByTitle('Select model')).toBeDisabled();expect(await screen.findByTitle('Select reasoning effort')).toBeDisabled();- expect(screen.getByRole('button', { name: 'Agent config' })).toBeDisabled();rerender(<DraftSections isRunning />);expect(screen.getByRole('button', { name: 'Tools (3)' })).toBeDisabled();expect(await screen.findByTitle('Select model')).toBeDisabled();expect(await screen.findByTitle('Select reasoning effort')).toBeDisabled();- expect(screen.getByRole('button', { name: 'Agent config' })).toBeDisabled();});});diff --git a/packages/trueforge-ui/test/atoms/lib/sessionCreateAgent.test.ts b/packages/trueforge-ui/test/atoms/lib/sessionCreateAgent.test.tsnew file mode 100644index 000000000..257dae6bd--- /dev/null+++ b/packages/trueforge-ui/test/atoms/lib/sessionCreateAgent.test.ts@@ -0,0 +1,31 @@+// @vitest-environment jsdom+import { describe, expect, it } from 'vitest';++import {+ IS_CREATE_AGENT_METADATA_KEY,+ isCreateAgentMetadataValue,+ readSessionIsCreateAgent,+ sessionIsCreateAgent,+} from '@/atoms/lib/sessionCreateAgent.js';++describe('sessionCreateAgent', () => {+ it('maps boolean intent to wire string metadata', () => {+ expect(isCreateAgentMetadataValue(true)).toBe('true');+ expect(isCreateAgentMetadataValue(false)).toBe('false');+ expect(IS_CREATE_AGENT_METADATA_KEY).toBe('is_create_agent');+ });++ it('treats missing metadata as false (legacy chat)', () => {+ expect(readSessionIsCreateAgent(undefined)).toBe(false);+ expect(readSessionIsCreateAgent({})).toBe(false);+ expect(readSessionIsCreateAgent({ is_create_agent: 'false' })).toBe(false);+ expect(readSessionIsCreateAgent({ is_create_agent: 'true' })).toBe(true);+ });++ it('reads isCreateAgent from UI session objects', () => {+ expect(sessionIsCreateAgent({ isCreateAgent: true })).toBe(true);+ expect(sessionIsCreateAgent({ isCreateAgent: false })).toBe(false);+ expect(sessionIsCreateAgent({ metadata: { is_create_agent: 'true' } })).toBe(true);+ expect(sessionIsCreateAgent({})).toBe(false);+ });+});diff --git a/packages/trueforge-ui/test/containers/AgentConfigDrawerContainer.test.tsx b/packages/trueforge-ui/test/containers/AgentConfigDrawerContainer.test.tsxindex a7b5f3685..252f5f26a 100644--- a/packages/trueforge-ui/test/containers/AgentConfigDrawerContainer.test.tsx+++ b/packages/trueforge-ui/test/containers/AgentConfigDrawerContainer.test.tsx@@ -34,7 +34,13 @@ function TestView() {const shell = useShellMode();return (<>- <button type="button" onClick={() => shell.setAgentConfigOpen(true)}>+ <button+ type="button"+ onClick={() => {+ // Agent config chrome requires create-agent intent (New Agent / Edit).+ shell.openAgentBuilder();+ }}+ >Open config</button><output data-testid="config-open">{String(shell.agentConfigOpen)}</output>diff --git a/packages/trueforge-ui/test/containers/ThreadListContainer.pagination.test.tsx b/packages/trueforge-ui/test/containers/ThreadListContainer.pagination.test.tsxindex bf1110f1a..05434523e 100644--- a/packages/trueforge-ui/test/containers/ThreadListContainer.pagination.test.tsx+++ b/packages/trueforge-ui/test/containers/ThreadListContainer.pagination.test.tsx@@ -85,13 +85,21 @@ vi.mock('@/server/ShellModeContext.js', () => ({isLibraryEnabled: false,isNewChatEnabled: true,isComposerEnabled: false,- mode: { status: 'active', isMutable: false, agentName: 'agent', agentId: 'agent', locked: false },+ mode: {+ status: 'active',+ isMutable: false,+ isCreateAgent: false,+ agentName: 'agent',+ agentId: 'agent',+ locked: false,+ },setSettingsOpen: vi.fn(),setLibraryOpen: vi.fn(),setSchedulesOpen,setSessionsOpen,selectLibraryAgent: vi.fn(),openDraft: vi.fn(),+ openAgentBuilder: vi.fn(),openHistorySession: vi.fn(),}),}));diff --git a/packages/trueforge-ui/test/containers/TrueForgeUI.test.tsx b/packages/trueforge-ui/test/containers/TrueForgeUI.test.tsxindex d956a8db4..087009b65 100644--- a/packages/trueforge-ui/test/containers/TrueForgeUI.test.tsx+++ b/packages/trueforge-ui/test/containers/TrueForgeUI.test.tsx@@ -104,7 +104,9 @@ describe('TrueForgeUI', () => {expect(screen.queryByRole('button', { name: /^(Collapse|Expand) sidebar$/ })).not.toBeInTheDocument();break;case 'drawer':- expect(screen.getByRole('button', { name: 'New chat' })).toBeInTheDocument();+ expect(screen.getByRole('button', { name: 'New Chat' })).toBeInTheDocument();+ // SingleAgent has no composer — New Agent is composer-only.+ expect(screen.queryByRole('button', { name: 'New Agent' })).not.toBeInTheDocument();break;case 'dock':expect(container.querySelector('[data-aui-compact-layout]')).toBeInTheDocument();@@ -203,6 +205,7 @@ describe('TrueForgeUI', () => {/>,);+ fireEvent.click(await screen.findByRole('button', { name: 'Start new agent' }));fireEvent.click(await screen.findByRole('button', { name: 'Save Agent' }));const saveDialog = await screen.findByRole('dialog', { name: 'Save agent' });fireEvent.click(within(saveDialog).getByRole('button', { name: 'Edit Model' }));@@ -216,9 +219,9 @@ describe('TrueForgeUI', () => {const mcpDialog = document.querySelector('dialog[aria-label="Edit Connectors"]');if (!(mcpDialog instanceof HTMLDialogElement)) throw new Error('expected stacked MCP dialog');expect(await within(mcpDialog).findByText('GitHub')).toBeInTheDocument();- expect(getModels).toHaveBeenCalledOnce();- expect(getMcp).toHaveBeenCalledOnce();- expect(getSkills).toHaveBeenCalledOnce();+ expect(getModels).toHaveBeenCalled();+ expect(getMcp).toHaveBeenCalled();+ expect(getSkills).toHaveBeenCalled();});it('renders only the MCP authorization screen when requested by the URL', async () => {@@ -281,24 +284,21 @@ describe('TrueForgeUI', () => {});describe('StackChatPanel', () => {- it('starts on a new chat and opens the session list from history', () => {+ it('shows New Chat and New Agent actions on the thread header', () => {render(<SlotsProvider>- <RuntimeHarness messages={[]}>- <div className="h-96">- <StackChatPanel />- </div>- </RuntimeHarness>+ <ShellModeProvider>+ <RuntimeHarness messages={[]}>+ <div className="h-96">+ <StackChatPanel />+ </div>+ </RuntimeHarness>+ </ShellModeProvider></SlotsProvider>,);- expect(screen.getByLabelText('Sessions')).toBeInTheDocument();- expect(screen.queryByRole('button', { name: 'Start new chat' })).not.toBeInTheDocument();-- fireEvent.click(screen.getByLabelText('Sessions'));-- expect(screen.getByRole('button', { name: 'Start new chat' })).toBeInTheDocument();- expect(screen.queryByLabelText('Sessions')).not.toBeInTheDocument();+ expect(screen.getByRole('button', { name: 'New Chat' })).toBeInTheDocument();+ expect(screen.getByRole('button', { name: 'New Agent' })).toBeInTheDocument();});it.each([@@ -355,21 +355,24 @@ describe('SidebarLayout', () => {it('shows the app brand in the mobile navigation drawer', () => {render(<SlotsProvider theme={{ brand: { mode: 'icon-title', name: 'Acme', icon: { src: '/acme.svg' } } }}>- <RuntimeHarness messages={[]}>- <div className="h-96">- <SidebarLayout />- </div>- </RuntimeHarness>+ <ShellModeProvider>+ <RuntimeHarness messages={[]}>+ <div className="h-96">+ <SidebarLayout />+ </div>+ </RuntimeHarness>+ </ShellModeProvider></SlotsProvider>,);fireEvent.click(screen.getByRole('button', { name: 'Navigation' }));const drawer = screen.getByRole('dialog', { name: 'Navigation' });- expect(drawer).toHaveClass('w-20');+ expect(drawer).toHaveClass('w-18');expect(within(drawer).getByAltText('Acme')).toHaveAttribute('src', '/acme.svg');expect(within(drawer).queryByText('Acme')).not.toBeInTheDocument();expect(within(drawer).getByRole('button', { name: 'Start new chat' })).toBeInTheDocument();+ expect(within(drawer).getByRole('button', { name: 'Start new agent' })).toBeInTheDocument();expect(within(drawer).queryByText('No threads yet')).not.toBeInTheDocument();});@@ -441,6 +444,42 @@ describe('SidebarLayout', () => {expect(screen.queryByRole('button', { name: /^(Collapse|Expand) sidebar$/ })).not.toBeInTheDocument();});+ it('highlights New Chat, New Agent, and Settings when selected', async () => {+ render(+ <SlotsProvider theme={{ brand: { mode: 'icon-title', name: 'Acme' } }}>+ <ServerProvider server={mockServer(stubCatalog)}>+ <ShellModeProvider>+ <RuntimeHarness messages={[]}>+ <div className="h-96">+ <SidebarLayout />+ </div>+ </RuntimeHarness>+ </ShellModeProvider>+ </ServerProvider>+ </SlotsProvider>,+ );++ const newChat = screen.getByRole('button', { name: 'Start new chat' });+ const newAgent = screen.getByRole('button', { name: 'Start new agent' });+ expect(newChat).toHaveAttribute('aria-current', 'page');+ expect(newAgent).not.toHaveAttribute('aria-current');++ fireEvent.click(newAgent);+ expect(newAgent).toHaveAttribute('aria-current', 'page');+ expect(newChat).not.toHaveAttribute('aria-current');++ const [settingsButton] = screen.getAllByRole('button', { name: 'Settings' });+ if (settingsButton === undefined) {+ throw new Error('Expected settings button');+ }+ expect(settingsButton).not.toHaveAttribute('aria-current');+ fireEvent.click(settingsButton);+ expect(await screen.findByRole('heading', { name: 'Settings' })).toBeInTheDocument();+ expect(settingsButton).toHaveAttribute('aria-current', 'page');+ expect(newChat).not.toHaveAttribute('aria-current');+ expect(newAgent).not.toHaveAttribute('aria-current');+ });+it('toggles theme from the footer and shows settings only when catalog is provided', async () => {const { rerender } = render(<SlotsProvider theme={{ brand: { mode: 'icon-title', name: 'Acme' } }}>@@ -537,52 +576,21 @@ describe('SidebarLayout', () => {});describe('DrawerLayout a11y', () => {- it('opens sessions panel, focuses dialog, and restores focus on Escape', async () => {- render(- <SlotsProvider>- <RuntimeHarness messages={[]}>- <div className="h-96">- <DrawerLayout />- </div>- </RuntimeHarness>- </SlotsProvider>,- );-- const sessionsBtn = screen.getByRole('button', { name: 'Sessions' });- expect(sessionsBtn).toHaveAttribute('aria-expanded', 'false');-- fireEvent.click(sessionsBtn);- expect(sessionsBtn).toHaveAttribute('aria-expanded', 'true');- const dialog = screen.getByRole('dialog', { name: 'Sessions' });- expect(dialog).toBeInTheDocument();- await waitFor(() => {- expect(dialog).toHaveFocus();- });-- fireEvent.keyDown(window, { key: 'Escape' });- expect(screen.queryByRole('dialog', { name: 'Sessions' })).not.toBeInTheDocument();- expect(sessionsBtn).toHaveAttribute('aria-expanded', 'false');- await waitFor(() => {- expect(sessionsBtn).toHaveFocus();- });- });-- it('closes sessions panel when backdrop is clicked', () => {+ it('exposes New Chat and New Agent actions', () => {render(<SlotsProvider>- <RuntimeHarness messages={[]}>- <div className="h-96">- <DrawerLayout />- </div>- </RuntimeHarness>+ <ShellModeProvider>+ <RuntimeHarness messages={[]}>+ <div className="h-96">+ <DrawerLayout />+ </div>+ </RuntimeHarness>+ </ShellModeProvider></SlotsProvider>,);- fireEvent.click(screen.getByRole('button', { name: 'Sessions' }));- expect(screen.getByRole('dialog', { name: 'Sessions' })).toBeInTheDocument();-- fireEvent.click(screen.getByRole('button', { name: 'Close sessions' }));- expect(screen.queryByRole('dialog', { name: 'Sessions' })).not.toBeInTheDocument();+ expect(screen.getByRole('button', { name: 'New Chat' })).toBeInTheDocument();+ expect(screen.getByRole('button', { name: 'New Agent' })).toBeInTheDocument();});});diff --git a/packages/trueforge-ui/test/hooks/useChatChromeActionsVisible.test.tsx b/packages/trueforge-ui/test/hooks/useChatChromeActionsVisible.test.tsxindex d9a5e8085..e3ce0412b 100644--- a/packages/trueforge-ui/test/hooks/useChatChromeActionsVisible.test.tsx+++ b/packages/trueforge-ui/test/hooks/useChatChromeActionsVisible.test.tsx@@ -62,7 +62,7 @@ describe('useChatHeaderContentVisible', () => {expect(result.current.header).toBe(true);});- it('hides Clear on mutable sessions even after chat has started', () => {+ it('shows New Chat header on mutable drafts; Clear is visible', () => {const { result } = renderHook(() => ({named: useNamedAgentHeaderVisible(),@@ -77,7 +77,9 @@ describe('useChatHeaderContentVisible', () => {},);- expect(result.current.named).toBe(false);- expect(result.current.clear).toBe(false);+ expect(result.current.named).toBe(true);+ expect(result.current.save).toBe(false);+ expect(result.current.clear).toBe(true);+ expect(result.current.header).toBe(true);});});diff --git a/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/agentSessionsServer.test.ts b/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/agentSessionsServer.test.tsindex 9b11b1d4a..a25098d46 100644--- a/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/agentSessionsServer.test.ts+++ b/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/agentSessionsServer.test.ts@@ -97,6 +97,8 @@ describe('createHarnessAgentSessionsServer', () => {createdAt: '2026-01-01T00:00:00.000Z',updatedAt: '2026-01-02T00:00:00.000Z',lastActivityAt: '2026-01-02T00:00:00.000Z',+ isCreateAgent: false,+ isMutable: false,metrics: { totalTurns: 3, totalCostInUsd: 0.25, totalDurationMs: 29_711 },agentName: 'writer',},diff --git a/packages/trueforge-ui/test/publicUiExports.test.ts b/packages/trueforge-ui/test/publicUiExports.test.tsindex 21d6c99ce..6963951fc 100644--- a/packages/trueforge-ui/test/publicUiExports.test.ts+++ b/packages/trueforge-ui/test/publicUiExports.test.ts@@ -70,6 +70,7 @@ const expectedRuntimeExports: Array<keyof typeof sdk> = ['ToasterProvider','HistoryLoader','HistoryLoaderContainer',+ 'IS_CREATE_AGENT_METADATA_KEY','Icon','MCP_AUTH_POPUP_CHANNEL','ScheduleFormDrawer',@@ -158,11 +159,15 @@ const expectedRuntimeExports: Array<keyof typeof sdk> = ['createTrueFoundryServer','defaultSlots','getErrorMessage',+ 'isCreateAgentMetadataValue','libraryAgentId','mergeAgentSpec','preloadMarkdownOpenUI',+ 'readSessionIsCreateAgent','resolveBrandChrome','resolvePresetTokens',+ 'sessionIsCreateAgent',+ 'shellIsCreateAgent','shellIsMutable','threadHasPendingMcpAuth','trueFoundryAttachmentAdapter',diff --git a/packages/trueforge-ui/test/routing/derivePlace.test.ts b/packages/trueforge-ui/test/routing/derivePlace.test.tsindex 15f090889..3b52f1f0b 100644--- a/packages/trueforge-ui/test/routing/derivePlace.test.ts+++ b/packages/trueforge-ui/test/routing/derivePlace.test.ts@@ -65,7 +65,11 @@ describe('derivePlace', () => {it('active immutable agent maps to an agent place', () => {expect(- deriveChatPlace(snap({ mode: { status: 'active', isMutable: false, agentName: 'helper', locked: false } })),+ deriveChatPlace(+ snap({+ mode: { status: 'active', isMutable: false, isCreateAgent: false, agentName: 'helper', locked: false },+ }),+ ),).toEqual({ type: 'agent', agentName: 'helper' });});@@ -74,7 +78,7 @@ describe('derivePlace', () => {deriveChatPlace(snap({agentConfigMode: 'SingleAgent',- mode: { status: 'active', isMutable: false, agentName: 'locked', locked: true },+ mode: { status: 'active', isMutable: false, isCreateAgent: false, agentName: 'locked', locked: true },}),),).toEqual({ type: 'root' });@@ -82,7 +86,9 @@ describe('derivePlace', () => {it('mutable draft and idle map to root', () => {expect(deriveChatPlace(snap({ mode: { status: 'idle' } }))).toEqual({ type: 'root' });- expect(deriveChatPlace(snap({ mode: { status: 'active', isMutable: true, locked: false } }))).toEqual({+ expect(+ deriveChatPlace(snap({ mode: { status: 'active', isMutable: true, isCreateAgent: false, locked: false } })),+ ).toEqual({type: 'root',});});diff --git a/packages/trueforge-ui/test/server/ShellModeContext.test.tsx b/packages/trueforge-ui/test/server/ShellModeContext.test.tsxindex e084169d9..05d6388d6 100644--- a/packages/trueforge-ui/test/server/ShellModeContext.test.tsx+++ b/packages/trueforge-ui/test/server/ShellModeContext.test.tsx@@ -80,20 +80,50 @@ describe('ShellModeProvider', () => {expect(result.current.settingsOpen).toBe(false);});- it('keeps agent config exclusive to mutable chat surfaces', () => {+ it('keeps agent config exclusive to New Agent surfaces', () => {const { result } = renderHook(() => useShellMode(), { wrapper: wrap() });- act(() => result.current.setAgentConfigOpen(true));+ act(() => result.current.openAgentBuilder());+ expect(result.current.mode).toMatchObject({ isMutable: true, isCreateAgent: true });expect(result.current.agentConfigOpen).toBe(true);act(() => result.current.setSettingsOpen(true));expect(result.current.agentConfigOpen).toBe(false);- act(() => result.current.setAgentConfigOpen(true));+ act(() => result.current.openAgentBuilder());+ expect(result.current.agentConfigOpen).toBe(true);act(() => result.current.selectLibraryAgent({ isMutable: false, agentName: 'support' }));expect(result.current.agentConfigOpen).toBe(false);});+ it('openDraft starts New Chat without agent config; openAgentBuilder opens config', () => {+ const { result } = renderHook(() => useShellMode(), { wrapper: wrap() });++ expect(result.current.mode).toMatchObject({ isMutable: true, isCreateAgent: false });+ expect(result.current.agentConfigOpen).toBe(false);++ act(() => result.current.openAgentBuilder());+ expect(result.current.mode).toMatchObject({ isMutable: true, isCreateAgent: true });+ expect(result.current.agentConfigOpen).toBe(true);++ act(() => result.current.openDraft());+ expect(result.current.mode).toMatchObject({ isMutable: true, isCreateAgent: false });+ expect(result.current.agentConfigOpen).toBe(false);+ });++ it('openHistorySession applies isCreateAgent only when mutable', () => {+ const { result } = renderHook(() => useShellMode(), { wrapper: wrap() });++ act(() => result.current.openHistorySession({ sessionId: 'sess-builder', isMutable: true, isCreateAgent: true }));+ expect(result.current.mode).toMatchObject({ isMutable: true, isCreateAgent: true });+ expect(result.current.agentConfigOpen).toBe(true);+ expect(result.current.pendingSessionId).toBe('sess-builder');++ act(() => result.current.openHistorySession({ sessionId: 'sess-chat', isMutable: true }));+ expect(result.current.mode).toMatchObject({ isMutable: true, isCreateAgent: false });+ expect(result.current.agentConfigOpen).toBe(false);+ });+it('opens agent details and returns to the library list', () => {const { result } = renderHook(() => useShellMode(), { wrapper: wrap() });@@ -128,6 +158,7 @@ describe('ShellModeProvider', () => {expect(result.current.mode).toEqual({status: 'active',isMutable: false,+ isCreateAgent: false,agentId: 'locked',agentName: 'locked',locked: true,@@ -140,6 +171,7 @@ describe('ShellModeProvider', () => {expect(result.current.mode).toEqual({status: 'active',isMutable: false,+ isCreateAgent: false,agentId: 'locked',agentName: 'locked',locked: true,@@ -159,6 +191,7 @@ describe('ShellModeProvider', () => {expect(result.current.mode).toEqual({status: 'active',isMutable: false,+ isCreateAgent: false,agentId: 'alpha',agentName: 'alpha',locked: false,@@ -183,6 +216,7 @@ describe('ShellModeProvider', () => {expect(result.current.mode).toEqual({status: 'active',isMutable: false,+ isCreateAgent: false,agentId: 'alpha',agentName: 'alpha',locked: false,@@ -238,6 +272,7 @@ describe('ShellModeProvider', () => {expect(result.current.mode).toEqual({status: 'active',isMutable: false,+ isCreateAgent: false,agentId: 'alpha',agentName: 'alpha',locked: false,@@ -266,6 +301,7 @@ describe('ShellModeProvider', () => {expect(result.current.mode).toEqual({status: 'active',isMutable: true,+ isCreateAgent: true,agentId: 'writer',agentName: 'writer',agentSpec: spec,@@ -297,6 +333,7 @@ describe('ShellModeProvider', () => {expect(result.current.mode).toEqual({status: 'active',isMutable: true,+ isCreateAgent: true,agentId: 'writer',agentName: 'writer',agentSpec: spec,@@ -339,6 +376,7 @@ describe('ShellModeProvider', () => {expect(result.current.mode).toEqual({status: 'active',isMutable: false,+ isCreateAgent: false,agentId: 'from-sdk',agentName: 'from-sdk',locked: false,@@ -356,6 +394,7 @@ describe('ShellModeProvider', () => {expect(result.current.mode).toEqual({status: 'active',isMutable: false,+ isCreateAgent: false,locked: false,});expect(result.current.pendingSessionId).toBe('sess-orphan');@@ -383,6 +422,7 @@ describe('ShellModeProvider', () => {expect(result.current.mode).toEqual({status: 'active',isMutable: true,+ isCreateAgent: false,agentSpec: { model: { name: 'openai-main/gpt-4.1' } },locked: false,});@@ -417,6 +457,7 @@ describe('ShellModeProvider', () => {expect(result.current.mode).toEqual({status: 'active',isMutable: true,+ isCreateAgent: true,agentId: 'saved',agentName: 'saved',agentSpec: spec,diff --git a/packages/trueforge-ui/test/testSetup.ts b/packages/trueforge-ui/test/testSetup.tsindex 2f18f6ee4..534705e26 100644--- a/packages/trueforge-ui/test/testSetup.ts+++ b/packages/trueforge-ui/test/testSetup.ts@@ -58,3 +58,36 @@ if (typeof globalThis.ResizeObserver === 'undefined') {value: ResizeObserverStub,});}++// Node 25+ exposes a broken `localStorage` getter unless `--localstorage-file` is+// set; that shadows jsdom's implementation and makes `window.localStorage` undefined.+const localStorageWorks =+ typeof globalThis.localStorage?.getItem === 'function' && typeof globalThis.localStorage?.removeItem === 'function';+if (!localStorageWorks) {+ const store = new Map<string, string>();+ const memoryStorage: Storage = {+ get length() {+ return store.size;+ },+ clear() {+ store.clear();+ },+ getItem(key) {+ return store.has(key) ? (store.get(key) ?? null) : null;+ },+ key(index) {+ return [...store.keys()][index] ?? null;+ },+ removeItem(key) {+ store.delete(key);+ },+ setItem(key, value) {+ store.set(key, String(value));+ },+ };+ Object.defineProperty(globalThis, 'localStorage', {+ configurable: true,+ writable: true,+ value: memoryStorage,+ });+}