Merge master 7e2b049d8e2523127a3b4fba38cab4748ef0c72f, observed on 2026-09-19 at 07:38:37 UTC, into release/session-log-v4 at c4663e8671e33bc2cfdbc868b0b18d979508d39b. Keep this base integration separate from the five persistence repair PRs so their review diffs remain focused and can be rebased without moving their fixes here. Combine master's pin ordering and archived-session filter with V4's parent-owned direct child catalog. Both grouped and flat sidebar rows must pass the Session list to the V4 activity calculation; restoring master's summary-lineage traversal would reintroduce the removed subagent ownership and count unrelated descendants. Keep master's removal of the archived-session settings page. Its only release-side test change renamed a Session list fixture field, so no runtime behavior is lost by deleting that obsolete test. Adapt the release-side direct-child-status regression to the new row/filter arguments and preserve its assertions. Retain master's workspace ordering and row-motion documentation while keeping the V4 child-catalog wording. Reconcile the generated bilingual records against the merged documents. Frozen V0-V3 codecs, recorded Session JSONL inputs, and the current V4 persistence schema are unchanged. Refs #2692, #3273
365 lines
18 KiB
TypeScript
365 lines
18 KiB
TypeScript
// @vitest-environment jsdom
|
|
/**
|
|
* Impact-matrix projection tests (row by row): what each
|
|
* phase projects onto the InputBar — enter routing, visuals (token color /
|
|
* hint / pending), edit freedom, and the published currency's claim seat.
|
|
* React over jsdom per the client testing discipline; the machine is real.
|
|
*/
|
|
import type { GlobalStandardProps } from '@deepseek-ai/dsh-client-ui-slots'
|
|
import { afterEach, describe, expect, it, vi } from 'vitest'
|
|
import { act, cleanup, fireEvent, render } from '@testing-library/react'
|
|
import type { Context } from '@deepseek-ai/cordis'
|
|
import type { SessionSnapshot } from '@deepseek-ai/dsh-api-session-controller/client'
|
|
import { createSnapshotStore } from '@deepseek-ai/dsh-client-store'
|
|
import {
|
|
bindSnapshotSelector, conversationSnapshot, sessionSnapshot,
|
|
} from '@deepseek-ai/dsh-client-test-runtime'
|
|
import type { SessionStatusSnapshot } from '@deepseek-ai/dsh-client-ui-session/client'
|
|
import type { SessionId } from '@deepseek-ai/dsh-session/types'
|
|
import type { SubmitAttachment, SubmitOutcome } from '../src/client/contract/input.ts'
|
|
import { makeTranslate } from '@deepseek-ai/dsh-client-test-runtime'
|
|
import { zh as commonZh } from '@deepseek-ai/dsh-client-locale/src/locales/zh.ts'
|
|
import type { DraftAttachmentId } from '../src/client/contract/input.ts'
|
|
import { SessionInputShell } from '../src/client/input/facade.ts'
|
|
import { InputBar } from '../src/client/skeleton/InputBar.tsx'
|
|
import type { InputBarProps } from '../src/client/skeleton/InputBar.tsx'
|
|
import { zh } from '../src/client/locales.ts'
|
|
|
|
// Every fixture carries the resource hook the resources plugin merges into GlobalStandardProps.
|
|
const useResource = (() => ({ status: 'none' as const, value: undefined, failure: undefined })) as GlobalStandardProps['useResource']
|
|
|
|
// jsdom implements no Range geometry (Lexical's scroll-into-view measures the
|
|
// caret with one once the surface is genuinely contenteditable).
|
|
Range.prototype.getBoundingClientRect = () => ({
|
|
top: 0, bottom: 0, left: 0, right: 0, width: 0, height: 0, x: 0, y: 0, toJSON: () => ({}),
|
|
})
|
|
|
|
|
|
afterEach(cleanup)
|
|
|
|
const SCTX = {} as Context
|
|
const SID = 's1' as SessionId
|
|
|
|
/** Standard-props InputBar mount over a real shell (the composer-bar entry shape). */
|
|
function mountBar(shell: SessionInputShell, over?: { running?: boolean; disabled?: boolean }) {
|
|
const session = createSnapshotStore<SessionSnapshot>({
|
|
...sessionSnapshot(SID),
|
|
running: over?.running ?? false,
|
|
removed: over?.disabled ?? false,
|
|
})
|
|
const props: InputBarProps = {
|
|
usePanelInfo: selector => selector({ activePanelId: null }),
|
|
sessionId: SID,
|
|
SessionProvider: ({ children }) => children,
|
|
useSession: bindSnapshotSelector(session),
|
|
useSessions: bindSnapshotSelector(createSnapshotStore({
|
|
ids: [], byId: {}, current: undefined, phase: 'ready',
|
|
projectionsBySession: {}, jobsBySession: {}, currentAddress: undefined,
|
|
})),
|
|
useSessionStatus: bindSnapshotSelector(
|
|
createSnapshotStore<SessionStatusSnapshot>(new Map()),
|
|
),
|
|
useSessionRetainInfo: () => undefined,
|
|
useResource,
|
|
useWorkspaces: bindSnapshotSelector(createSnapshotStore({
|
|
items: [], archivedSessionIds: [], pinnedSessionIds: [], state: 'idle', phase: 'ready', error: null,
|
|
baselinesReady: true, recentWorkspaceId: undefined,
|
|
})),
|
|
useProjection: (() => undefined),
|
|
useConversation: bindSnapshotSelector(createSnapshotStore(conversationSnapshot())),
|
|
useInput: bindSnapshotSelector(shell.state),
|
|
inputActions: shell.actions,
|
|
keyboard: shell,
|
|
addFiles: () => null,
|
|
useFileUploads: bindSnapshotSelector(createSnapshotStore({})),
|
|
retryFileUpload: undefined,
|
|
removeAttachment: () => {},
|
|
// Every id resolves so the bar's registry prune never drops a test image.
|
|
resolveDraftAttachments: ids => ids.map(id => ({
|
|
kind: 'image' as const, id,
|
|
file: new File([Uint8Array.of(1)], `${id}.png`, { type: 'image/png' }),
|
|
previewUrl: `blob:${id}`,
|
|
})),
|
|
toggleCommandMenu: vi.fn(),
|
|
useBusyEnter: bindSnapshotSelector(createSnapshotStore<'queue' | 'steer'>('queue')),
|
|
useNotices: bindSnapshotSelector(shell.notices),
|
|
useLexicon: bindSnapshotSelector(shell.lexicon),
|
|
useMenuLauncher: bindSnapshotSelector(createSnapshotStore<string | null>(null)),
|
|
renderSlot: (() => null) as InputBarProps['renderSlot'],
|
|
stop: vi.fn(),
|
|
t: makeTranslate(zh, commonZh),
|
|
variant: 'composer',
|
|
}
|
|
return render(<InputBar {...props} />)
|
|
}
|
|
|
|
function bench(over?: {
|
|
running?: boolean
|
|
disabled?: boolean
|
|
submit?: (args: string) => Promise<SubmitOutcome>
|
|
serialize?: (ids: readonly DraftAttachmentId[]) => Promise<readonly SubmitAttachment[]>
|
|
}) {
|
|
const sink = vi.fn(() => Promise.resolve<SubmitOutcome>({ kind: 'success' }))
|
|
const serialize = vi.fn(over?.serialize ?? (() => Promise.resolve<readonly SubmitAttachment[]>([])))
|
|
const release = vi.fn()
|
|
const shell = new SessionInputShell({ actx: SCTX, defaultSink: sink, commandAttachments: { serialize, release, unsupportedNotice: (token: string) => `${token.trim()} attachments-unsupported` } })
|
|
const wiring = shell
|
|
const view = mountBar(shell, over)
|
|
const textarea = view.container.querySelector<HTMLDivElement>('[data-composer-input]')!
|
|
const claim = (token = '/goal ', hint = '目标', attachments?: true) => {
|
|
act(() => {
|
|
shell.setDraft(token)
|
|
shell.beginCommand(
|
|
{
|
|
name: token.slice(1).trim(), token, hint,
|
|
...(attachments === true ? { attachments: true } : {}),
|
|
submit: over?.submit ?? (() => Promise.resolve({ kind: 'success' as const, source: 'command', name: 'goal' })),
|
|
},
|
|
{ start: 0, end: token.length, draftRev: shell.snapshot.draftRev },
|
|
)
|
|
})
|
|
}
|
|
return { view, textarea, shell, wiring, sink, claim, serialize, release }
|
|
}
|
|
|
|
describe('matrix row: plain', () => {
|
|
it('unsubscribes from the Inbox projection when disposed', () => {
|
|
const unsubscribe = vi.fn()
|
|
const subscribe = vi.fn(() => unsubscribe)
|
|
const shell = new SessionInputShell({
|
|
actx: SCTX,
|
|
defaultSink: () => Promise.resolve({ kind: 'success' }),
|
|
inbox: { getSnapshot: () => undefined, subscribe },
|
|
commandAttachments: {
|
|
serialize: () => Promise.resolve([]),
|
|
release: () => {},
|
|
unsupportedNotice: token => `${token.trim()} attachments-unsupported`,
|
|
},
|
|
})
|
|
|
|
expect(subscribe).toHaveBeenCalledOnce()
|
|
shell.dispose()
|
|
expect(unsubscribe).toHaveBeenCalledOnce()
|
|
})
|
|
|
|
it('enter falls to the default sink; no claim on the currency; edits free', async () => {
|
|
const { textarea, shell, sink } = bench()
|
|
act(() => { shell.setDraft('普通消息') })
|
|
expect(shell.snapshot.claim).toBeUndefined()
|
|
fireEvent.keyDown(textarea, { key: 'Enter' })
|
|
expect(sink).toHaveBeenCalledWith('普通消息', [], 'queue', expect.any(AbortSignal))
|
|
// The detached default send never freezes the composer.
|
|
expect(shell.snapshot.phase).toBe('plain')
|
|
expect(shell.snapshot.draft).toBe('')
|
|
expect(shell.snapshot.claim).toBeUndefined()
|
|
})
|
|
})
|
|
|
|
describe('matrix row: claimed', () => {
|
|
it('publishes the claim currency, colors the token, hints while args are blank, and edits stay free', () => {
|
|
const { view, textarea, shell, claim } = bench()
|
|
claim()
|
|
act(() => { shell.editor.update(() => {}, { discrete: true }) }) // flush the queued decoration refresh
|
|
expect(shell.snapshot.claim).toEqual({ name: 'goal', token: '/goal ', hint: '目标' })
|
|
expect(view.container.querySelector('[data-lexical-text][style*="business-primary"]')?.textContent).toBe('/goal ')
|
|
// The zh dictionary owns a hint.goal entry, which overrides the raw claim hint (production behavior).
|
|
expect(textarea.style.getPropertyValue('--dsh-composer-hint')).toBe(JSON.stringify('输入目标,智能体将持续执行'))
|
|
expect(textarea.getAttribute('contenteditable')).toBe('true')
|
|
// Free editing beyond the token: hint drops, claim holds.
|
|
act(() => { shell.setDraft('/goal 发布版本') })
|
|
expect(shell.snapshot.phase).toBe('claimed')
|
|
expect(textarea.style.getPropertyValue('--dsh-composer-hint')).toBe('')
|
|
})
|
|
|
|
it('enter routes to claim.submit (command lane, never the queue sink)', async () => {
|
|
const submit = vi.fn(() => Promise.resolve({ kind: 'success' as const, text: '完成', source: 'command', name: 'goal' }))
|
|
const { view, textarea, shell, sink, claim } = bench({ submit })
|
|
claim()
|
|
act(() => { shell.setDraft('/goal 发布') })
|
|
fireEvent.keyDown(textarea, { key: 'Enter' })
|
|
expect(sink).not.toHaveBeenCalled()
|
|
await vi.waitFor(() => { expect(submit).toHaveBeenCalledWith('发布', SCTX, []) })
|
|
// Commit: draft cleared, notice surfaced, back to plain.
|
|
await vi.waitFor(() => { expect(shell.snapshot.draft).toBe('') })
|
|
expect(view.getByText('完成')).toBeTruthy()
|
|
})
|
|
|
|
it('backspacing the token auto-releases to plain and the visuals vanish (scenario H)', () => {
|
|
const { view, shell, claim } = bench()
|
|
claim()
|
|
act(() => { shell.setDraft('/goa 发布') }) // token broken
|
|
expect(shell.snapshot.phase).toBe('plain')
|
|
expect(shell.snapshot.claim).toBeUndefined()
|
|
act(() => { shell.editor.update(() => {}, { discrete: true }) }) // flush the queued decoration refresh
|
|
expect(view.container.querySelector('[data-lexical-text][style*="business-primary"]')).toBeNull()
|
|
})
|
|
})
|
|
|
|
describe('matrix row: claimed with attachments', () => {
|
|
const img = 'img-1' as DraftAttachmentId
|
|
|
|
it('a claim without attachment acceptance blocks enter: one notice and the full draft retained', async () => {
|
|
const submit = vi.fn(() => Promise.resolve({ kind: 'success' as const }))
|
|
const { view, textarea, shell, sink, claim } = bench({ submit })
|
|
claim()
|
|
act(() => { shell.addAttachments([img]) })
|
|
fireEvent.keyDown(textarea, { key: 'Enter' })
|
|
await Promise.resolve()
|
|
expect(shell.snapshot.phase).toBe('claimed')
|
|
expect(submit).not.toHaveBeenCalled()
|
|
expect(sink).not.toHaveBeenCalled()
|
|
expect(view.getByText('/goal attachments-unsupported')).toBeTruthy()
|
|
expect(shell.snapshot.attachmentIds).toEqual([img])
|
|
expect(shell.snapshot.draft).toBe('/goal ')
|
|
})
|
|
|
|
it('an accepting claim serializes and forwards a mixed batch; success consumes and clears', async () => {
|
|
const submit = vi.fn(() => Promise.resolve({ kind: 'success' as const }))
|
|
const png: SubmitAttachment = { type: 'image', mediaType: 'image/png', data: 'AA==' }
|
|
const file: SubmitAttachment = { type: 'file', receiptId: 'receipt-x' }
|
|
const { textarea, shell, claim, serialize, release } = bench({ submit, serialize: () => Promise.resolve([png, file]) })
|
|
claim('/goal ', '目标', true)
|
|
// The claim currency carries the acceptance flag the pre-gate reads.
|
|
expect(shell.snapshot.claim).toEqual({ name: 'goal', token: '/goal ', hint: '目标', attachments: true })
|
|
act(() => { shell.addAttachments([img]) })
|
|
fireEvent.keyDown(textarea, { key: 'Enter' })
|
|
await vi.waitFor(() => { expect(submit).toHaveBeenCalledWith('', SCTX, [png, file]) })
|
|
expect(serialize).toHaveBeenCalledWith([img])
|
|
await vi.waitFor(() => { expect(shell.snapshot.draft).toBe('') })
|
|
expect(release).toHaveBeenCalledWith([img])
|
|
expect(shell.snapshot.attachmentIds).toEqual([])
|
|
expect(shell.snapshot.phase).toBe('plain')
|
|
})
|
|
|
|
it('a handler error keeps a serialized file unreleased beside the notice and draft', async () => {
|
|
const submit = vi.fn(() => Promise.resolve({ kind: 'error' as const, text: '处理失败' }))
|
|
const file: SubmitAttachment = { type: 'file', receiptId: 'receipt-x' }
|
|
const { view, textarea, shell, claim, release } = bench({ submit, serialize: () => Promise.resolve([file]) })
|
|
claim('/goal ', '目标', true)
|
|
act(() => { shell.addAttachments([img]) })
|
|
fireEvent.keyDown(textarea, { key: 'Enter' })
|
|
await vi.waitFor(() => { expect(view.getByText('处理失败')).toBeTruthy() })
|
|
expect(shell.snapshot.phase).toBe('claimed')
|
|
expect(shell.snapshot.attachmentIds).toEqual([img])
|
|
expect(release).not.toHaveBeenCalled()
|
|
expect(shell.snapshot.draft).toBe('/goal ')
|
|
})
|
|
|
|
it('a serialize rejection blocks the transaction: notice, no submit call, images kept', async () => {
|
|
const submit = vi.fn(() => Promise.resolve({ kind: 'success' as const }))
|
|
const { view, textarea, shell, claim, release } = bench({ submit, serialize: () => Promise.reject(new Error('附件已失效')) })
|
|
claim('/goal ', '目标', true)
|
|
act(() => { shell.addAttachments([img]) })
|
|
fireEvent.keyDown(textarea, { key: 'Enter' })
|
|
await vi.waitFor(() => { expect(view.getByText('附件已失效')).toBeTruthy() })
|
|
expect(submit).not.toHaveBeenCalled()
|
|
expect(shell.snapshot.attachmentIds).toEqual([img])
|
|
expect(release).not.toHaveBeenCalled()
|
|
expect(shell.snapshot.phase).toBe('claimed')
|
|
})
|
|
|
|
it('a disposed shell never lets a pending serialization reach claim.submit', async () => {
|
|
const submit = vi.fn(() => Promise.resolve({ kind: 'success' as const }))
|
|
let resolveSerialize!: (images: readonly SubmitAttachment[]) => void
|
|
const { shell, textarea, claim } = bench({
|
|
submit,
|
|
serialize: () => new Promise((resolve) => { resolveSerialize = resolve }),
|
|
})
|
|
claim('/goal ', '目标', true)
|
|
act(() => { shell.addAttachments([img]) })
|
|
fireEvent.keyDown(textarea, { key: 'Enter' })
|
|
await vi.waitFor(() => { expect(resolveSerialize).toBeDefined() })
|
|
shell.dispose()
|
|
resolveSerialize([{ type: 'image', mediaType: 'image/png', data: 'AA==' }])
|
|
await Promise.resolve()
|
|
await Promise.resolve()
|
|
expect(submit).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('image removal is refused while a command submit is in flight', async () => {
|
|
const submit = vi.fn(() => new Promise<SubmitOutcome>(() => {})) // never settles
|
|
const { shell, textarea, claim } = bench({ submit, serialize: () => Promise.resolve([]) })
|
|
claim('/goal ', '目标', true)
|
|
act(() => { shell.addAttachments([img]) })
|
|
fireEvent.keyDown(textarea, { key: 'Enter' })
|
|
expect(shell.snapshot.phase).toBe('submitting')
|
|
let removed = true
|
|
act(() => { removed = shell.removeAttachment(img) })
|
|
expect(removed).toBe(false)
|
|
expect(shell.snapshot.attachmentIds).toEqual([img])
|
|
})
|
|
})
|
|
|
|
describe('matrix row: submitting', () => {
|
|
it('locks enter, renders pending + read-only, keeps the claim snapshot on the currency', async () => {
|
|
const submit = vi.fn(() => new Promise<SubmitOutcome>(() => {})) // never settles
|
|
const { textarea, shell, sink, claim } = bench({ submit })
|
|
claim()
|
|
fireEvent.keyDown(textarea, { key: 'Enter' })
|
|
expect(shell.snapshot.phase).toBe('submitting')
|
|
expect(shell.snapshot.claim).toBeDefined()
|
|
expect(textarea.getAttribute('contenteditable')).toBe('false')
|
|
// Enter is dead inside the lock (submit dispatch is microtask-deferred).
|
|
await vi.waitFor(() => { expect(submit).toHaveBeenCalledTimes(1) })
|
|
fireEvent.keyDown(textarea, { key: 'Enter' })
|
|
await Promise.resolve()
|
|
expect(submit).toHaveBeenCalledTimes(1)
|
|
expect(sink).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('rollback with unchanged draft returns to claimed with the notice; drifted draft only notices', async () => {
|
|
let rejectSubmit!: (e: Error) => void
|
|
const submit = vi.fn(() => new Promise<SubmitOutcome>((_res, rej) => { rejectSubmit = rej }))
|
|
const first = bench({ submit })
|
|
first.claim()
|
|
fireEvent.keyDown(first.textarea, { key: 'Enter' })
|
|
await vi.waitFor(() => { expect(submit).toHaveBeenCalled() })
|
|
act(() => { rejectSubmit(new Error('执行失败')) })
|
|
await vi.waitFor(() => { expect(first.shell.snapshot.phase).toBe('claimed') })
|
|
expect(first.shell.snapshot.draft).toBe('/goal ')
|
|
expect(first.view.getByText('执行失败')).toBeTruthy()
|
|
cleanup()
|
|
// Drift: typing during flight wins; no restore, plain, notice only.
|
|
const submit2 = vi.fn(() => new Promise<SubmitOutcome>((_res, rej) => { rejectSubmit = rej }))
|
|
const second = bench({ submit: submit2 })
|
|
second.claim()
|
|
fireEvent.keyDown(second.textarea, { key: 'Enter' })
|
|
await vi.waitFor(() => { expect(submit2).toHaveBeenCalled() })
|
|
act(() => { second.shell.setDraft('用户飞行中打的新稿') })
|
|
act(() => { rejectSubmit(new Error('晚到失败')) })
|
|
await vi.waitFor(() => { expect(second.shell.snapshot.phase).toBe('plain') })
|
|
expect(second.shell.snapshot.draft).toBe('用户飞行中打的新稿')
|
|
expect(second.view.getByText('晚到失败')).toBeTruthy()
|
|
})
|
|
})
|
|
|
|
describe('matrix row: locked (session disabled)', () => {
|
|
it('disables the textarea and chrome; the machine currency is untouched', () => {
|
|
const { view, textarea, shell } = bench({ disabled: true })
|
|
expect(textarea.getAttribute('aria-disabled')).toBe('true')
|
|
expect((view.getByLabelText('添加文件或调用指令') as HTMLButtonElement).disabled).toBe(true)
|
|
expect(shell.snapshot.phase).toBe('plain')
|
|
})
|
|
|
|
it('running does NOT lock: typing and enter-queue stay live', () => {
|
|
const { textarea, shell, sink } = bench({ running: true })
|
|
expect(textarea.getAttribute('aria-disabled')).not.toBe('true')
|
|
act(() => { shell.setDraft('排队') })
|
|
fireEvent.keyDown(textarea, { key: 'Enter' })
|
|
expect(sink).toHaveBeenCalledWith('排队', [], 'queue', expect.any(AbortSignal))
|
|
})
|
|
})
|
|
|
|
describe('matrix row: takeover (orthogonal axis)', () => {
|
|
it('the machine state survives outside the render tree (claim lives on the shell, not the DOM)', () => {
|
|
const { view, shell, claim } = bench()
|
|
claim()
|
|
// Takeover hides the composer (overlay chain keeps it mounted-but-hidden);
|
|
// even a full unmount keeps the claim: state lives on the resident shell.
|
|
view.unmount()
|
|
expect(shell.snapshot.phase).toBe('claimed')
|
|
expect(shell.snapshot.claim?.token).toBe('/goal ')
|
|
expect(shell.snapshot.draft).toBe('/goal ')
|
|
})
|
|
})
|