diff --git a/.changeset/chat-delete-controls.md b/.changeset/chat-delete-controls.md new file mode 100644 index 0000000000..1f5357f922 --- /dev/null +++ b/.changeset/chat-delete-controls.md @@ -0,0 +1,5 @@ +--- +"@truefoundry/trueforge-ui": patch +--- + +Wire remote chat session deletion and improve the history delete action styling. diff --git a/packages/trueforge-ui/src/containers/ThreadListContainer.tsx b/packages/trueforge-ui/src/containers/ThreadListContainer.tsx index ab2773fd00..230b16fe1c 100644 --- a/packages/trueforge-ui/src/containers/ThreadListContainer.tsx +++ b/packages/trueforge-ui/src/containers/ThreadListContainer.tsx @@ -8,7 +8,7 @@ import { useAui, useAuiState, } from '@assistant-ui/react'; -import { useEffect, useMemo, useRef, useState, type ReactNode, type Ref } from 'react'; +import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode, type Ref } from 'react'; import { AgentHistoryFilterButton } from '../atoms/AgentHistoryFilterButton.js'; import { auiButtonClass } from '../atoms/lib/buttonClasses.js'; @@ -40,13 +40,18 @@ export type ThreadListContainerProps = { }; const deleteItemClass = - 'flex w-full cursor-pointer select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none text-failure-bg hover:bg-ghost-button-hover hover:text-failure-bg focus:bg-ghost-button-hover focus:text-failure-bg data-[highlighted]:bg-ghost-button-hover data-[highlighted]:text-failure-bg'; + 'flex w-full cursor-pointer select-none items-center gap-2 rounded-md px-2 py-1.5 text-sm font-medium text-failure-bg outline-none transition-colors hover:bg-failure-bg/12 hover:text-failure-bg focus:bg-failure-bg/12 focus:text-failure-bg data-[highlighted]:bg-failure-bg/12 data-[highlighted]:text-failure-bg'; function ThreadListItemDeleteMenu() { const compact = useCompactLayout(); const isMobile = useIsMobile(); const [sheetOpen, setSheetOpen] = useState(false); + const [portalContainer, setPortalContainer] = useState(); const useSheet = isMobile || compact; + const setTriggerElement = useCallback((element: HTMLButtonElement | null) => { + const themeRoot = element?.closest('.aui-theme-root'); + setPortalContainer(themeRoot instanceof HTMLElement ? themeRoot : undefined); + }, []); const moreButtonClass = auiButtonClass({ variant: 'ghost', @@ -85,6 +90,7 @@ function ThreadListItemDeleteMenu() { return ( 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.ts index cb6053f37d..f52d9f8964 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 @@ -189,6 +189,10 @@ export function createHarnessChatServer( return toUiSession(response.data); }, + async deleteSession({ sessionId }) { + await client.sessions.delete(sessionId); + }, + async updateSession({ sessionId, agentSpec }) { // Named (reference) sessions reject agent updates server-side. const response = await client.sessions.update(sessionId, { diff --git a/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/harnessServer.test.ts b/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/harnessServer.test.ts index 57c2b0485f..da3dce514e 100644 --- a/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/harnessServer.test.ts +++ b/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/harnessServer.test.ts @@ -21,6 +21,7 @@ const session = { const turnRequests: unknown[] = []; const sessionRequests: unknown[] = []; +const deletedSessions: string[] = []; const subscribeRequests: (string | null)[] = []; const fetchMock: typeof fetch = async (input, init) => { @@ -36,6 +37,10 @@ const fetchMock: typeof fetch = async (input, init) => { } return Response.json({ data: session }); } + if (url.endsWith('/api/v1/sessions/ses_1') && method === 'DELETE') { + deletedSessions.push('ses_1'); + return new Response(null, { status: 204 }); + } if (url.includes('/api/v1/sessions?') || url.endsWith('/api/v1/sessions')) { return Response.json({ data: [session], pagination: { limit: 20, next_page_token: 'tok_2' } }); } @@ -242,6 +247,18 @@ describe('createHarnessChatServer', () => { assert.equal(found.agentName, undefined); }); + it('deletes sessions through the Harness SDK client', async () => { + deletedSessions.length = 0; + const server = createHarnessChatServer({ fetch: fetchMock }); + if (server.deleteSession === undefined) { + throw new Error('Expected deleteSession to be implemented'); + } + + await server.deleteSession({ sessionId: 'ses_1' }); + + assert.deepEqual(deletedSessions, ['ses_1']); + }); + it('subscribes to a turn and forwards afterSequenceNumber', async () => { const server = createHarnessChatServer({ fetch: fetchMock }); assert.ok(server.subscribeToTurn);