Merge remote-tracking branch 'github/master' into xtr/trajectory-inspection-ui

# Conflicts:
#	packages/client/ui-primitives/src/Menu.tsx
#	packages/client/ui-trajectory/src/client/TrajectoryCell.tsx
#	packages/client/ui-trajectory/src/client/TrajectoryView.tsx
#	packages/client/ui-trajectory/tests/layout.spec.tsx
#	pnpm-lock.yaml
#	pnpm-workspace.yaml

packages/client/ui-trajectory/tests/table.spec.tsx

@@ -53,6 +53,13 @@ const TURNS: readonly TrajectoryTurnModel[] = [{
   }],
 }]
 
+const FOLD_PROPS = {
+  collapsedTurns: new Set<number>(),
+  onToggleTurn: () => {},
+  collapsedAssistants: new Set<number>(),
+  onToggleAssistant: () => {},
+}
+
 describe('TrajectoryTable', () => {
   it('shows assistant timing facts after keyboard selection', () => {
     render(<TrajectoryTable turns={TURNS} collapsed={false} />)
@@ -64,6 +71,18 @@ describe('TrajectoryTable', () => {
     expect(screen.getByText('20.0 tok/s')).toBeTruthy()
   })
 
+  it('breaks output tokens into labeled reasoning and content rows', () => {
+    render(<TrajectoryTable turns={TURNS} {...FOLD_PROPS} />)
+    fireEvent.click(screen.getByRole('row', { name: /ASSISTANT/ }))
+
+    expect(screen.getByText('Tokens')).toBeTruthy()
+    expect(screen.getByText('20 tok')).toBeTruthy()
+    expect(screen.getByText('Reasoning')).toBeTruthy()
+    expect(screen.getByText('5 tok')).toBeTruthy()
+    expect(screen.getByText('Content')).toBeTruthy()
+    expect(screen.getByText('15 tok')).toBeTruthy()
+  })
+
   it('keeps running and failure semantics distinct from record roles', () => {
     const view = render(<TrajectoryTable turns={TURNS} collapsed={false} />)
     expect(view.container.querySelector('tr[data-kind="tool"][data-running="true"]')).toBeTruthy()