DSH 0.1.5 owns the right column (its native Sidebar hosts every tab type this plugin registers), so the plugin's own right panel, its width drag / new-session seed prefs, and the free-window feature are gone. The bottom workbench is the only plugin-owned surface left, and its expand/collapse control is registered into DSH's session-header utilities list slot (the header's corner seat belongs to the native sidebar's own control). - state: one `bottomSplits` tree; `makeDefaultState()` takes no arguments; `toggleBottomPanel` / `openTabInBottomPane` are the only landing reducers; `setBottomHeight` and `sanitizeState` share the `CONVERSATION_MIN` cap (a persisted tall height no longer snaps on the first drag). - service: every landing in the workbench (creation or focus) expands it; `SIDEBAR_FEATURES` drops `'floatWindows'`; the open/close/activate tab pools cover the single tree. - shell: `Sidebar.tsx` renders only the bottom workbench; the toggle lives in `sidebar/bottom-toggle.tsx`; layout-push pushes height only (no width, no `--dsh-sidebar-width`). - prefs: `openByDefault` / `defaultWidthPercent` / `changesDiffFloat` removed from the schema, defaults, client parser, settings page, and all 20 dictionaries; the retired keys in stored documents are ignored. - tests: free-window specs deleted, panel/float assertions dropped, remaining suites adapted (124 files / 1287 tests); the mount lane asserts the header toggle and sweeps the native sidebar's guide page. - docs: README / README_EN / guide §0,§11 / AGENTS test map.
209 lines
6.2 KiB
TypeScript
209 lines
6.2 KiB
TypeScript
/**
|
|
* Real-Sidebar regressions for issue #162: background activity (a new
|
|
* subagent, a new background job) activates the Tasks page in the bottom
|
|
* workbench. The right column belongs to DSH's native Sidebar, so there is no
|
|
* full-screen drawer to guard against any more — the activation lands in the
|
|
* docked workbench on every viewport width.
|
|
*/
|
|
// @vitest-environment jsdom
|
|
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import { createElement } from 'react'
|
|
import { createRoot, type Root } from 'react-dom/client'
|
|
import { act } from 'react-dom/test-utils'
|
|
|
|
import { setupReactAct } from './test-utils.ts'
|
|
setupReactAct()
|
|
|
|
import { Sidebar } from '../src/client/Sidebar.tsx'
|
|
import { allLeaves, createSidebarStore, firstLeaf, type SidebarStore } from '../src/client/state.ts'
|
|
import { createBetterSidebarService, type BetterSidebarService } from '../src/client/service.ts'
|
|
import type { Context, SidebarSessionList } from '../src/context-types.ts'
|
|
|
|
class FakeWebSocket {
|
|
onmessage: ((event: { data: unknown }) => void) | null = null
|
|
onclose: (() => void) | null = null
|
|
onerror: (() => void) | null = null
|
|
close = (): void => {}
|
|
constructor(_url: string) {}
|
|
}
|
|
|
|
function makeSessionFeed(initial: SidebarSessionList) {
|
|
let snapshot = initial
|
|
const listeners = new Set<() => void>()
|
|
return {
|
|
getSnapshot: () => snapshot,
|
|
subscribe: (listener: () => void) => {
|
|
listeners.add(listener)
|
|
return () => { listeners.delete(listener) }
|
|
},
|
|
set(next: SidebarSessionList): void {
|
|
snapshot = next
|
|
for (const listener of [...listeners]) listener()
|
|
},
|
|
}
|
|
}
|
|
|
|
type SessionFeed = ReturnType<typeof makeSessionFeed>
|
|
|
|
interface MountedSidebar {
|
|
store: SidebarStore
|
|
service: BetterSidebarService
|
|
feed: SessionFeed
|
|
unmount: () => void
|
|
}
|
|
|
|
let sessionSeq = 0
|
|
const mounted: MountedSidebar[] = []
|
|
|
|
function setViewport(width: number): void {
|
|
Object.defineProperty(window, 'innerWidth', { configurable: true, value: width })
|
|
}
|
|
|
|
function mountSidebar(width: number, bottomOpen = false): MountedSidebar {
|
|
setViewport(width)
|
|
vi.stubGlobal('WebSocket', FakeWebSocket)
|
|
const sessionId = `auto-activation-${++sessionSeq}`
|
|
const initial: SidebarSessionList = {
|
|
current: sessionId,
|
|
byId: {
|
|
[sessionId]: { id: sessionId, cwd: '/tmp', displayTitle: 'Root' },
|
|
},
|
|
jobsBySession: { [sessionId]: [] },
|
|
}
|
|
const feed = makeSessionFeed(initial)
|
|
const store = createSidebarStore()
|
|
store.setPrefs({ ...store.getPrefs(), autoOpenSubagent: true, autoOpenJobs: true })
|
|
store.setSession(sessionId)
|
|
store.reduce(state => ({ ...state, bottomOpen }))
|
|
const service = createBetterSidebarService(store)
|
|
service.registerTab({ id: 'subagent', title: 'Subagent', component: () => null })
|
|
const localeSnapshot = { active: 'en' }
|
|
const ctx = {
|
|
locale: { subscribe: () => () => {}, getSnapshot: () => localeSnapshot },
|
|
sessions: { list: feed },
|
|
betterSidebar: service,
|
|
get: (name: string) => name === 'betterSidebar' ? service : undefined,
|
|
} as unknown as Context
|
|
const container = document.createElement('div')
|
|
document.body.append(container)
|
|
const root: Root = createRoot(container)
|
|
act(() => { root.render(createElement(Sidebar, { ctx, store })) })
|
|
const result = {
|
|
store,
|
|
service,
|
|
feed,
|
|
unmount: () => {
|
|
act(() => { root.unmount() })
|
|
container.remove()
|
|
},
|
|
}
|
|
mounted.push(result)
|
|
return result
|
|
}
|
|
|
|
function publishSubagent(sidebar: MountedSidebar): void {
|
|
const before = sidebar.feed.getSnapshot()
|
|
const sessionId = before.current!
|
|
act(() => {
|
|
sidebar.feed.set({
|
|
...before,
|
|
byId: {
|
|
...before.byId,
|
|
child: {
|
|
id: 'child',
|
|
displayTitle: 'Worker',
|
|
origin: 'subagent',
|
|
parentId: sessionId,
|
|
running: true,
|
|
},
|
|
},
|
|
})
|
|
})
|
|
}
|
|
|
|
function flushSubagentDebounce(): void {
|
|
act(() => { vi.advanceTimersByTime(500) })
|
|
}
|
|
|
|
function publishJob(sidebar: MountedSidebar): void {
|
|
const before = sidebar.feed.getSnapshot()
|
|
const sessionId = before.current!
|
|
act(() => {
|
|
sidebar.feed.set({
|
|
...before,
|
|
jobsBySession: {
|
|
...before.jobsBySession,
|
|
[sessionId]: [{
|
|
id: 'bash-1',
|
|
kind: 'bash',
|
|
label: 'sleep 30',
|
|
status: 'running',
|
|
startedAt: 1_000,
|
|
}],
|
|
},
|
|
})
|
|
})
|
|
}
|
|
|
|
function expectSubagentFocused(sidebar: MountedSidebar): void {
|
|
const state = sidebar.store.getSnapshot().state!
|
|
const pane = firstLeaf(state.bottomSplits)
|
|
expect(state.bottomOpen).toBe(true)
|
|
expect(state.activePane).toBe(pane.id)
|
|
expect(allLeaves(state.bottomSplits).flatMap(leaf => leaf.tabs)
|
|
.filter(tab => tab.type === 'subagent')).toHaveLength(1)
|
|
expect(pane.tabs.find(tab => tab.id === pane.active)?.type).toBe('subagent')
|
|
}
|
|
|
|
beforeEach(() => {
|
|
vi.useFakeTimers()
|
|
localStorage.clear()
|
|
})
|
|
|
|
afterEach(() => {
|
|
while (mounted.length > 0) mounted.pop()!.unmount()
|
|
vi.clearAllTimers()
|
|
vi.useRealTimers()
|
|
vi.unstubAllGlobals()
|
|
localStorage.clear()
|
|
document.body.innerHTML = ''
|
|
setViewport(1024)
|
|
})
|
|
|
|
describe('Sidebar background-activity auto-activation (#162)', () => {
|
|
it.each([
|
|
{ source: 'subagent', width: 390 },
|
|
{ source: 'job', width: 390 },
|
|
{ source: 'subagent', width: 1024 },
|
|
{ source: 'job', width: 1024 },
|
|
] as const)('$source activation at $width px focuses the Tasks page in the workbench', ({ source, width }) => {
|
|
const sidebar = mountSidebar(width)
|
|
if (source === 'subagent') {
|
|
publishSubagent(sidebar)
|
|
flushSubagentDebounce()
|
|
} else {
|
|
publishJob(sidebar)
|
|
}
|
|
expectSubagentFocused(sidebar)
|
|
})
|
|
|
|
it.each(['subagent', 'job'] as const)('%s activation keeps an already-open workbench open', (source) => {
|
|
const sidebar = mountSidebar(390, true)
|
|
if (source === 'subagent') {
|
|
publishSubagent(sidebar)
|
|
flushSubagentDebounce()
|
|
} else {
|
|
publishJob(sidebar)
|
|
}
|
|
expectSubagentFocused(sidebar)
|
|
})
|
|
|
|
it('a resize between arming and firing the debounce does not change the landing', () => {
|
|
const sidebar = mountSidebar(1024)
|
|
publishSubagent(sidebar)
|
|
setViewport(390)
|
|
flushSubagentDebounce()
|
|
expectSubagentFocused(sidebar)
|
|
})
|
|
})
|