mirror of
https://github.com/deepseek-ai/deepseek-harness
synced 2026-08-15 21:04:50 +00:00
The data layer no longer depends on the React glue package, and business plugins no longer depend on web-react at all: - The store engine (zustand vanilla + immer + persist + dev freeze), defineStore, and shallowEqual move to @deepseek-ai/dsh-client-runtime, exported from the ./client main entry — no ./store subpath survives on either package (the web-react one is deleted, none is opened on runtime). - Store products are bare snapshot sources: useSelector leaves SnapshotStore/StoreInstance and Session; every hook is composed at the binding site in web-react's renderer (per-source cached uSES binding). The SlotRendererHost sessions face carries bare observables only. - SessionProvider becomes a standard-kit seat: an entry whose children declare a session-scope slot receives the framework component as a prop, retiring the last value import of web-react from plugin packages. UseSession and the session-area types now live in ui-slots. - web-react shrinks to the shell-only React glue (renderer, providers, uSES bridge); zustand/immer belong to runtime alone; the module-table seed and tsdown externals drop the web-react/store seat. - NODE_ENV replacement is defined once in the shared tsdown client preset (browser bundles inline the engine and lost vite's define); the 3-line process.env typecheck shim moves to runtime with the engine. - Stray tsc artifacts (.js/.d.ts/.d.ts.map beside sources under src/) swept repo-wide; they shadow real sources under vitest resolution. Verified: both aggregate typecheck programs at zero; 604 client tests green; repo-wide grep for web-react/store at zero; real-host playwright run 7/7 including persist round-trip. ci: fix test/docs
287 lines
12 KiB
TypeScript
287 lines
12 KiB
TypeScript
/**
|
|
* SessionsService: list store projection (manager → {ids, byId, current}
|
|
* with derived titles), the migrated current-selection account (open
|
|
* validation, persisted mask semantics, cell resolution), scope-tree
|
|
* lifecycle (lazy mint / frozen survival / removed teardown with watch
|
|
* deferral), binding identity, ancestry walk, create.
|
|
*/
|
|
import { Context } from 'cordis'
|
|
import { afterEach, describe, expect, it, vi } from 'vitest'
|
|
import type { SessionId } from '@deepseek-ai/dsh-client-connection/client'
|
|
import { SessionsService, scopeOf } from '../src/client/sessions/service.ts'
|
|
import { FakeApiClient, ok } from './fake-api.ts'
|
|
|
|
const sid = (s: string): SessionId => s as SessionId
|
|
|
|
interface Bench {
|
|
ctx: Context
|
|
api: FakeApiClient
|
|
svc: SessionsService
|
|
}
|
|
|
|
function bench(): Bench {
|
|
const ctx = new Context()
|
|
const api = new FakeApiClient()
|
|
const svc = new SessionsService(ctx, api)
|
|
return { ctx, api, svc }
|
|
}
|
|
|
|
/** Refresh the manager list from programmable rows and flush the microtask batch. */
|
|
async function feedList(b: Bench, rows: { id: string; cwd?: string; parentId?: string; running?: boolean }[]): Promise<void> {
|
|
b.api.onList = () => Promise.resolve(ok({
|
|
items: rows.map(r => ({
|
|
sessionId: sid(r.id), updatedAt: 1, running: r.running ?? false,
|
|
...(r.cwd !== undefined ? { cwd: r.cwd } : {}),
|
|
...(r.parentId !== undefined ? { parentSessionId: sid(r.parentId) } : {}),
|
|
})),
|
|
}) as never)
|
|
await b.svc.manager.refreshList()
|
|
await Promise.resolve() // manager notifier flush
|
|
}
|
|
|
|
describe('list store projection', () => {
|
|
it('projects ids/byId with cwd-basename titles (id fallback) and parent links', async () => {
|
|
const b = bench()
|
|
await feedList(b, [
|
|
{ id: 's1', cwd: '/home/u/proj-a/' },
|
|
{ id: 's2', parentId: 's1', running: true },
|
|
])
|
|
const state = b.svc.list.getSnapshot()
|
|
expect(state.ids).toEqual(['s1', 's2'])
|
|
expect(state.byId[sid('s1')]).toMatchObject({ title: 'proj-a', cwd: '/home/u/proj-a/' })
|
|
expect(state.byId[sid('s2')]).toMatchObject({ title: 's2', parentId: 's1', running: true })
|
|
})
|
|
|
|
it('reflects live increments (host stream via manager) into the store', async () => {
|
|
const b = bench()
|
|
await feedList(b, [{ id: 's1' }])
|
|
b.svc.manager.handleHostEnvelope({ rpcId: 'r1' as never, payload: { type: 'host/session-added', sessionId: sid('s2') } as never })
|
|
await Promise.resolve()
|
|
expect(b.svc.list.getSnapshot().ids).toContain('s2')
|
|
})
|
|
})
|
|
|
|
describe('scope tree', () => {
|
|
it('mints lazily on first resolution, tags the ctx, and keeps binding identity stable', async () => {
|
|
const b = bench()
|
|
await feedList(b, [{ id: 's1' }])
|
|
expect(b.svc.scope(sid('unknown'))).toBeUndefined()
|
|
const scoped = b.svc.scope(sid('s1'))
|
|
expect(scoped).toBeDefined()
|
|
expect(scopeOf(scoped as Context)).toBe('s1')
|
|
expect(scopeOf(b.ctx)).toBeUndefined()
|
|
const binding = b.svc.binding(sid('s1'))
|
|
expect(binding?.session).toBe(b.svc.manager.get(sid('s1')))
|
|
expect(b.svc.binding(sid('s1'))).toBe(binding)
|
|
expect(binding?.ctx).toBe(scoped)
|
|
})
|
|
|
|
it('tears down an unwatched removed session but defers the watched one until the watch moves', async () => {
|
|
const b = bench()
|
|
await feedList(b, [{ id: 's1' }, { id: 's2' }])
|
|
const ctx1 = b.svc.scope(sid('s1'))
|
|
b.svc.binding(sid('s1')) // s1 is watched
|
|
b.svc.scope(sid('s2')) // s2 scoped but not watched
|
|
|
|
await feedList(b, [{ id: 's1' }]) // s2 removed, unwatched: torn down
|
|
expect(b.svc.scope(sid('s2'))).toBeUndefined()
|
|
|
|
await feedList(b, []) // s1 removed while watched: deferred, scope survives
|
|
expect(b.svc.scope(sid('s1'))).toBe(ctx1)
|
|
|
|
await feedList(b, [{ id: 's3' }])
|
|
b.svc.binding(sid('s3')) // watch moves: deferred teardown sweeps s1
|
|
expect(b.svc.scope(sid('s1'))).toBeUndefined()
|
|
})
|
|
|
|
it('keeps the scope when the session merely stops running (frozen ≠ removed)', async () => {
|
|
const b = bench()
|
|
await feedList(b, [{ id: 's1', running: true }])
|
|
const scoped = b.svc.scope(sid('s1'))
|
|
await feedList(b, [{ id: 's1', running: false }])
|
|
expect(b.svc.scope(sid('s1'))).toBe(scoped)
|
|
})
|
|
|
|
it('cancels a deferred teardown when the id reappears in the list', async () => {
|
|
const b = bench()
|
|
await feedList(b, [{ id: 's1' }])
|
|
const scoped = b.svc.scope(sid('s1'))
|
|
b.svc.binding(sid('s1'))
|
|
await feedList(b, []) // removed while watched → deferred
|
|
await feedList(b, [{ id: 's1' }, { id: 's2' }]) // reappears
|
|
b.svc.binding(sid('s2')) // watch moves; sweep must NOT tear down the re-listed s1
|
|
expect(b.svc.scope(sid('s1'))).toBe(scoped)
|
|
})
|
|
})
|
|
|
|
describe('current selection (migrated from ui-layout, arbitrated into the list snapshot)', () => {
|
|
afterEach(() => { vi.unstubAllGlobals() })
|
|
|
|
it('open() writes list.current; unknown ids fail loud', async () => {
|
|
const b = bench()
|
|
await feedList(b, [{ id: 's1' }])
|
|
expect(b.svc.list.getSnapshot().current).toBeUndefined()
|
|
b.svc.open(sid('s1'))
|
|
expect(b.svc.list.getSnapshot().current).toBe('s1')
|
|
expect(() => { b.svc.open(sid('ghost')) }).toThrow(/unknown session ghost/)
|
|
expect(b.svc.list.getSnapshot().current).toBe('s1') // failed open leaves the selection alone
|
|
})
|
|
|
|
it('masks (not destroys) the selection while its session is off the list', async () => {
|
|
const b = bench()
|
|
await feedList(b, [{ id: 's1' }, { id: 's2' }])
|
|
b.svc.open(sid('s1'))
|
|
await feedList(b, [{ id: 's2' }]) // s1 removed → current falls to the empty state
|
|
expect(b.svc.list.getSnapshot().current).toBeUndefined()
|
|
await feedList(b, [{ id: 's1' }, { id: 's2' }]) // s1 returns → selection resurfaces
|
|
expect(b.svc.list.getSnapshot().current).toBe('s1')
|
|
})
|
|
|
|
it('persists the selection under dsh.sessions.current and rehydrates it into a fresh service', async () => {
|
|
const storage = new Map<string, string>()
|
|
vi.stubGlobal('localStorage', {
|
|
getItem: (k: string) => storage.get(k) ?? null,
|
|
setItem: (k: string, v: string) => { storage.set(k, v) },
|
|
})
|
|
const first = bench()
|
|
await feedList(first, [{ id: 's1' }])
|
|
first.svc.open(sid('s1'))
|
|
expect(storage.get('dsh.sessions.current')).toContain('s1')
|
|
// A fresh boot (same storage) recovers the selection once the list holds the session.
|
|
const second = bench()
|
|
await feedList(second, [{ id: 's1' }])
|
|
expect(second.svc.list.getSnapshot().current).toBe('s1')
|
|
})
|
|
})
|
|
|
|
describe('cell (render-layer session kit)', () => {
|
|
it('resolves an identity-stable {sessionId, session} cell; unknown ids yield undefined', async () => {
|
|
const b = bench()
|
|
await feedList(b, [{ id: 's1' }])
|
|
const cell = b.svc.cell('s1')
|
|
expect(cell).toBeDefined()
|
|
expect(cell?.sessionId).toBe('s1')
|
|
// Bare-source form (store migration): the cell carries the Session
|
|
// observable itself; hook binding happens in the React machinery.
|
|
expect(cell?.session).toBe(b.svc.manager.get(sid('s1')))
|
|
expect(b.svc.cell('s1')).toBe(cell)
|
|
expect(b.svc.cell('ghost')).toBeUndefined()
|
|
})
|
|
|
|
it('moves the watch like binding(): switching cells sweeps a deferred removal', async () => {
|
|
const b = bench()
|
|
await feedList(b, [{ id: 's1' }])
|
|
b.svc.cell('s1') // watched
|
|
await feedList(b, []) // removed while watched → deferred, scope survives
|
|
expect(b.svc.scope(sid('s1'))).toBeDefined()
|
|
await feedList(b, [{ id: 's2' }])
|
|
b.svc.cell('s2') // watch moves → sweep tears s1 down
|
|
expect(b.svc.scope(sid('s1'))).toBeUndefined()
|
|
})
|
|
})
|
|
|
|
describe('slot-store scope prune hook', () => {
|
|
it('notifies ctx.slots.pruneStoreScope when a scope dies (both teardown paths)', async () => {
|
|
const b = bench()
|
|
const pruneStoreScope = vi.fn()
|
|
b.ctx.reflect.provide('slots', { pruneStoreScope })
|
|
await feedList(b, [{ id: 's1' }, { id: 's2' }])
|
|
b.svc.scope(sid('s1'))
|
|
b.svc.binding(sid('s2')) // s2 watched
|
|
await feedList(b, []) // s1 unwatched → immediate drop; s2 watched → deferred
|
|
expect(pruneStoreScope).toHaveBeenCalledWith('s1')
|
|
expect(pruneStoreScope).not.toHaveBeenCalledWith('s2')
|
|
await feedList(b, [{ id: 's3' }])
|
|
b.svc.binding(sid('s3')) // watch moves → deferred sweep drops s2
|
|
expect(pruneStoreScope).toHaveBeenCalledWith('s2')
|
|
})
|
|
|
|
it('tolerates a slots-less boot (object-layer benches carry no slot service)', async () => {
|
|
const b = bench()
|
|
await feedList(b, [{ id: 's1' }])
|
|
b.svc.scope(sid('s1'))
|
|
await feedList(b, []) // teardown without ctx.slots must not throw
|
|
expect(b.svc.scope(sid('s1'))).toBeUndefined()
|
|
})
|
|
})
|
|
|
|
describe('ancestry', () => {
|
|
it('walks parentId links root-first including self; broken links stop the walk', async () => {
|
|
const b = bench()
|
|
await feedList(b, [
|
|
{ id: 'root', cwd: '/w/app' },
|
|
{ id: 'mid', parentId: 'root' },
|
|
{ id: 'leaf', parentId: 'mid' },
|
|
{ id: 'orphan', parentId: 'ghost' },
|
|
])
|
|
expect(b.svc.ancestry(sid('leaf')).map(s => s.id)).toEqual(['root', 'mid', 'leaf'])
|
|
expect(b.svc.ancestry(sid('orphan')).map(s => s.id)).toEqual(['orphan'])
|
|
expect(b.svc.ancestry(sid('ghost'))).toEqual([])
|
|
})
|
|
})
|
|
|
|
describe('create', () => {
|
|
it('returns the new id on ok and throws a coded error on failure', async () => {
|
|
const b = bench()
|
|
b.api.onCreate = () => Promise.resolve(ok({ sessionId: sid('fresh') }))
|
|
await expect(b.svc.create({ cwd: '/w' })).resolves.toBe('fresh')
|
|
b.api.onCreate = () => Promise.resolve({
|
|
rpcId: 'e' as never,
|
|
result: { ok: false as const, error: { code: 'internal' as const, message: '爆了', details: {} } },
|
|
} as never)
|
|
await expect(b.svc.create()).rejects.toThrow(/internal: 爆了/)
|
|
})
|
|
})
|
|
|
|
describe('coverage tails (branch duals)', () => {
|
|
it('titleOf falls back to the id for empty and separator-only cwd', async () => {
|
|
const b = bench()
|
|
await feedList(b, [{ id: 'no-base', cwd: '///' }, { id: 'empty-cwd', cwd: '' }])
|
|
const { byId } = b.svc.list.getSnapshot()
|
|
expect(byId[sid('no-base')]?.title).toBe('no-base')
|
|
expect(byId[sid('empty-cwd')]?.title).toBe('empty-cwd')
|
|
})
|
|
|
|
it('binding for an unknown session returns undefined without moving the watch', async () => {
|
|
const b = bench()
|
|
await feedList(b, [{ id: 's1' }])
|
|
b.svc.binding(sid('s1'))
|
|
expect(b.svc.binding(sid('ghost'))).toBeUndefined()
|
|
// Watch unchanged: removing s1 defers (still watched), proving the ghost lookup did not steal the watch.
|
|
await feedList(b, [])
|
|
expect(b.svc.scope(sid('s1'))).toBeDefined()
|
|
})
|
|
|
|
it('sweep skips the id that is itself still watched and tolerates a scope record already gone', async () => {
|
|
const b = bench()
|
|
await feedList(b, [{ id: 's1' }])
|
|
b.svc.binding(sid('s1'))
|
|
await feedList(b, []) // deferred removal of the watched id
|
|
// Re-resolving the SAME watched id: sweep runs but must skip it (watched-continue branch).
|
|
expect(b.svc.binding(sid('s1'))).toBeDefined()
|
|
expect(b.svc.scope(sid('s1'))).toBeDefined()
|
|
})
|
|
|
|
it('sweep hits both deferral edges: watched-id skip and an already-vacated scope record', async () => {
|
|
const b = bench()
|
|
await feedList(b, [{ id: 'a' }, { id: 'b' }])
|
|
b.svc.binding(sid('a'))
|
|
b.svc.binding(sid('b')) // watch: b; both scoped
|
|
await feedList(b, []) // a removed unwatched → torn immediately; b removed watched → deferred
|
|
// Move the watch to a THIRD id while b stays deferred: sweep now walks a
|
|
// set containing b (torn) — and the watched-continue branch fires when the
|
|
// deferral set still holds the current watch target.
|
|
await feedList(b, [{ id: 'c' }])
|
|
b.svc.binding(sid('c'))
|
|
expect(b.svc.scope(sid('b'))).toBeUndefined()
|
|
// Deferral for an id whose record was never minted: force-add via removed
|
|
// list state (scope teardown raced) — sweep must tolerate the missing record.
|
|
await feedList(b, [])
|
|
b.svc.binding(sid('c')) // c now watched+removed → deferred
|
|
await feedList(b, [{ id: 'd' }])
|
|
b.svc.binding(sid('d')) // sweep tears c
|
|
expect(b.svc.scope(sid('c'))).toBeUndefined()
|
|
})
|
|
|
|
})
|