Merge remote-tracking branch 'origin/master' into worktree/web-session-titles

# Conflicts:
#	.agents/notes/implemented/process/2026-07-20-gui-testing-system.i18n.yaml
#	packages/client/ui-conversation/tests/apply-inject.spec.tsx
#	packages/client/ui-conversation/tests/chat-stats-bash-sample.spec.tsx
#	packages/client/ui-conversation/tests/gate-branch-tails.spec.tsx
#	packages/client/ui-conversation/tests/selection-survival.spec.ts
#	packages/client/ui-conversation/tests/skeleton-branches.spec.tsx
#	packages/client/ui-conversation/tests/skeleton.spec.tsx
#	packages/client/ui-layout/tests/service.spec.ts
#	packages/client/ui-sidebar/tests/apply.spec.tsx
#	packages/client/ui-sidebar/tests/store.spec.ts
#	packages/client/ui-trajectory/tests/views.spec.tsx
#	packages/client/web/src/app.tsx
#	packages/client/web/tests/boot.spec.tsx
#	packages/host/runtime/README.md
#	packages/host/runtime/tests/host-runtime.spec.ts

packages/client/ui-sidebar/tests/tree.spec.ts

@@ -3,7 +3,7 @@ import type { SessionId, SessionListState, SessionSummary } from '@deepseek-ai/d
 import {
   deriveRows, formatRelativeTime, projectLabel, UNGROUPED_KEY, UNGROUPED_LABEL,
   type SessionRow, type TreeView,
-} from '@deepseek-ai/dsh-client-ui-sidebar/client'
+} from '../src/client/tree.ts'
 
 const sid = (s: string) => s as SessionId
 
@@ -34,12 +34,12 @@ function summary(init: SummaryInit): SessionSummary {
 function listOf(...summaries: SessionSummary[]): SessionListState {
   const byId: Record<SessionId, SessionSummary> = {}
   for (const s of summaries) byId[s.id] = s
-  return { ids: summaries.map(s => s.id), byId }
+  return { ids: summaries.map(s => s.id), byId, current: undefined }
 }
 
 const view = (partial: Partial<TreeView> = {}): TreeView => ({
-  expandedProjects: partial.expandedProjects ?? new Set(),
-  expandedSessions: partial.expandedSessions ?? new Set(),
+  expandedProjects: partial.expandedProjects ?? [],
+  expandedSessions: partial.expandedSessions ?? [],
   query: partial.query ?? '',
 })
 
@@ -96,7 +96,7 @@ describe('deriveRows grouping', () => {
       summary({ id: 'b', cwd: '/p', updatedAt: 2 }),
     )
     expect(deriveRows(list, view()).filter(r => r.type === 'session')).toHaveLength(0)
-    const rows = deriveRows(list, view({ expandedProjects: new Set(['/p']) }))
+    const rows = deriveRows(list, view({ expandedProjects: ['/p'] }))
     expect(rows.slice(1)).toEqual([
       expect.objectContaining({ type: 'session', id: 'b', depth: 0 }),
       expect.objectContaining({ type: 'session', id: 'a', depth: 0 }),
@@ -114,8 +114,8 @@ describe('deriveRows session tree', () => {
 
   it('nests children under expanded parents with increasing depth', () => {
     const rows = deriveRows(treeList, view({
-      expandedProjects: new Set(['/p']),
-      expandedSessions: new Set(['root', 'kid']),
+      expandedProjects: ['/p'],
+      expandedSessions: ['root', 'kid'],
     }))
     expect(rows.slice(1)).toEqual([
       expect.objectContaining({ id: 'other', depth: 0, hasChildren: false }),
@@ -126,7 +126,7 @@ describe('deriveRows session tree', () => {
   })
 
   it('collapses subtrees at unexpanded sessions', () => {
-    const rows = deriveRows(treeList, view({ expandedProjects: new Set(['/p']) }))
+    const rows = deriveRows(treeList, view({ expandedProjects: ['/p'] }))
     const ids = rows.filter((r): r is SessionRow => r.type === 'session').map(r => r.id)
     expect(ids).toEqual(['other', 'root'])
   })
@@ -135,7 +135,7 @@ describe('deriveRows session tree', () => {
     const rows = deriveRows(listOf(
       summary({ id: 'p1', cwd: '/a', updatedAt: 2 }),
       summary({ id: 'stray', cwd: '/b', parentId: sid('p1'), updatedAt: 1 }),
-    ), view({ expandedProjects: new Set(['/a', '/b']) }))
+    ), view({ expandedProjects: ['/a', '/b'] }))
     expect(rows).toEqual([
       expect.objectContaining({ type: 'project', key: '/a' }),
       expect.objectContaining({ id: 'p1', depth: 0 }),
@@ -149,7 +149,7 @@ describe('deriveRows session tree', () => {
       summary({ id: 'x', cwd: '/p', parentId: sid('y'), updatedAt: 2 }),
       summary({ id: 'y', cwd: '/p', parentId: sid('x'), updatedAt: 1 }),
       summary({ id: 'self', cwd: '/p', parentId: sid('self'), updatedAt: 3 }),
-    ), view({ expandedProjects: new Set(['/p']), expandedSessions: new Set(['x', 'y', 'self']) }))
+    ), view({ expandedProjects: ['/p'], expandedSessions: ['x', 'y', 'self'] }))
     const ids = rows.filter((r): r is SessionRow => r.type === 'session').map(r => r.id)
     expect(ids).toContain('self')
     expect(ids).toContain('x')
@@ -162,7 +162,7 @@ describe('deriveRows session tree', () => {
       summary({ id: 'b', cwd: '/p', updatedAt: 7 }),
       summary({ id: 'a', cwd: '/p', updatedAt: 7 }),
       summary({ id: 'c', cwd: '/p', updatedAt: 7 }),
-    ), view({ expandedProjects: new Set(['/p']) }))
+    ), view({ expandedProjects: ['/p'] }))
     const ids = rows.filter((r): r is SessionRow => r.type === 'session').map(r => r.id)
     expect(ids).toEqual(['a', 'b', 'c'])
   })
@@ -172,7 +172,7 @@ describe('deriveRows session tree', () => {
       summary({ id: 'p', cwd: '/p', updatedAt: 9 }),
       summary({ id: 'old', cwd: '/p', parentId: sid('p'), updatedAt: 1 }),
       summary({ id: 'new', cwd: '/p', parentId: sid('p'), updatedAt: 5 }),
-    ), view({ expandedProjects: new Set(['/p']), expandedSessions: new Set(['p']) }))
+    ), view({ expandedProjects: ['/p'], expandedSessions: ['p'] }))
     const ids = rows.filter((r): r is SessionRow => r.type === 'session').map(r => r.id)
     expect(ids).toEqual(['p', 'new', 'old'])
   })
@@ -180,7 +180,7 @@ describe('deriveRows session tree', () => {
   it('carries the running flag onto rows', () => {
     const rows = deriveRows(
       listOf(summary({ id: 'a', cwd: '/p', running: true })),
-      view({ expandedProjects: new Set(['/p']) }))
+      view({ expandedProjects: ['/p'] }))
     expect(rows[1]).toEqual(expect.objectContaining({ id: 'a', running: true }))
   })
 })