Add the dsh-workspace-changes Host plugin that snapshots the working tree at turn start and end through a private git index, diffs the two trees, folds in file-tool hunks for ignored and out-of-tree files, and appends a log-only workspace/changes event. The Web deliverables plugin renders that event as the changed-files card in place of the mutation-call row, with default-app and common-folder opening through a new authenticated route.
147 lines
8.8 KiB
TypeScript
147 lines
8.8 KiB
TypeScript
/** Changed-file and common-folder native opens resolve the viewed Session's current workspace. */
|
|
import { mkdtemp, rm, writeFile, mkdir, realpath, unlink } from 'node:fs/promises'
|
|
import { tmpdir } from 'node:os'
|
|
import { join } from 'node:path'
|
|
import { LocalFileSystem } from '@deepseek-ai/dsh-fs-local'
|
|
import { WorkspaceFiles } from '@deepseek-ai/dsh-api-workspace-files'
|
|
import { Context } from '@deepseek-ai/cordis'
|
|
import { HostConnectionService } from '@deepseek-ai/dsh-client-connection'
|
|
import type { BrowserAuth } from '@deepseek-ai/dsh-client-connection/src/browser-auth.ts'
|
|
import { SessionId } from '@deepseek-ai/dsh-session'
|
|
import type { SessionEvent } from '@deepseek-ai/dsh-session'
|
|
import { SessionQueryError } from '@deepseek-ai/dsh-session-query'
|
|
import type { SessionEventReadRequest } from '@deepseek-ai/dsh-session-query'
|
|
import type { WorkspaceChangedFile } from '@deepseek-ai/dsh-workspace-changes/types'
|
|
import { afterEach, describe, expect, it, vi } from 'vitest'
|
|
import { commonChangedFolder, registerPresentOpen } from '../src/present-open.ts'
|
|
import { changedFileUrl, CHANGES_OPEN_PATH, isChangedFile, isChangesData } from '../src/changes.ts'
|
|
|
|
const cleanups: Array<() => Promise<unknown>> = []
|
|
afterEach(async () => {
|
|
for (const cleanup of cleanups.reverse()) await cleanup()
|
|
cleanups.length = 0
|
|
vi.restoreAllMocks()
|
|
})
|
|
|
|
const changed = (path: string, display = path): WorkspaceChangedFile => ({ path, display, added: 1, deleted: 0 })
|
|
|
|
async function fixture() {
|
|
const root = await mkdtemp(join(tmpdir(), 'dsh-changes-open-'))
|
|
cleanups.push(() => rm(root, { recursive: true, force: true }))
|
|
const cwd = join(root, 'workspace')
|
|
await mkdir(join(cwd, 'src', 'lib'), { recursive: true })
|
|
await writeFile(join(cwd, 'src', 'lib', 'a.ts'), 'a')
|
|
await writeFile(join(cwd, 'src', 'b.ts'), 'b')
|
|
const outside = join(root, 'outside.txt')
|
|
await writeFile(outside, 'outside')
|
|
const data = { turn: 1, total: 3, snapshot: { before: 'a'.repeat(40), after: 'b'.repeat(40) }, files: [changed('src/lib/a.ts'), changed('src/b.ts'), changed(outside, '~/outside.txt')] }
|
|
const ctx = new Context()
|
|
cleanups.push(() => ctx.fiber.dispose())
|
|
const session: { cwd?: string } = { cwd }
|
|
await ctx.plugin(LocalFileSystem, { cwd })
|
|
ctx.provide('sandboxPolicy', { workspaceRoot: cwd } as never)
|
|
await ctx.plugin({
|
|
inject: ['fs', 'sandboxPolicy'],
|
|
apply: (scope) => { new WorkspaceFiles(scope, { maxBytes: 1024, maxFileBytes: 1024, maxLines: 100, maxEntries: 100 }) },
|
|
})
|
|
const readEvent = vi.fn(async (request: SessionEventReadRequest) => {
|
|
if (request.sessionId !== 'owner') throw new SessionQueryError('missing', 'SESSION_QUERY_SESSION_NOT_FOUND')
|
|
if (request.seq !== 9) throw new SessionQueryError('missing', 'SESSION_QUERY_EVENT_NOT_FOUND')
|
|
return { session, target: { type: 'workspace/changes', data } as SessionEvent }
|
|
})
|
|
ctx.provide('sessionQuery', { readEvent } as never)
|
|
const opener = vi.fn(async (_request: { path: string; action?: 'reveal' }, _signal: AbortSignal) => ({ opened: true as const }))
|
|
ctx.provide('sessionController', { openWorkspacePath: opener, workspaceDesktop: () => ({ name: 'desktop', available: true, fileManager: 'finder' }) } as never)
|
|
const connection = new HostConnectionService(ctx, [], {} as BrowserAuth)
|
|
await ctx.plugin({ inject: ['connection', 'sessionQuery', 'sessionController', 'workspaceFiles', 'fs', 'sandboxPolicy'], apply: registerPresentOpen })
|
|
const handler = connection.createSharedFetchHandler('/api')
|
|
const open = (query = '?sessionId=owner&seq=9&index=0') => handler.fetch(new Request(`http://localhost${CHANGES_OPEN_PATH}${query}`, { method: 'POST' }))
|
|
return { root, cwd, ctx, data, session, readEvent, open, opener, outside }
|
|
}
|
|
|
|
describe('changed files native open route', () => {
|
|
it('opens a listed file inside or outside the workspace with its verified Host path', async () => {
|
|
const { cwd, open, opener, outside } = await fixture()
|
|
expect(changedFileUrl(SessionId('owner'), 9, 0)).toBe(`${CHANGES_OPEN_PATH}?sessionId=owner&seq=9&index=0`)
|
|
expect(changedFileUrl(SessionId('owner'), 9, null)).toBe(`${CHANGES_OPEN_PATH}?sessionId=owner&seq=9`)
|
|
const response = await open()
|
|
expect(response.status).toBe(204)
|
|
expect(response.headers.get('cache-control')).toBe('no-store')
|
|
expect(opener).toHaveBeenLastCalledWith({ path: await realpath(join(cwd, 'src', 'lib', 'a.ts')) }, expect.any(AbortSignal))
|
|
expect((await open('?sessionId=owner&seq=9&index=2')).status).toBe(204)
|
|
expect(opener.mock.lastCall?.[0].path).toBe(await realpath(outside))
|
|
})
|
|
|
|
it('opens the deepest folder containing the workspace files, falling back to the workspace', async () => {
|
|
const { cwd, open, opener, data } = await fixture()
|
|
expect((await open('?sessionId=owner&seq=9')).status).toBe(204)
|
|
expect(opener).toHaveBeenLastCalledWith({ path: await realpath(join(cwd, 'src')) }, expect.any(AbortSignal))
|
|
data.files = [changed('../escaped.ts', '../escaped.ts'), changed('/etc/hosts', '/etc/hosts')]
|
|
expect((await open('?sessionId=owner&seq=9')).status).toBe(204)
|
|
expect(opener.mock.lastCall?.[0].path).toBe(await realpath(cwd))
|
|
expect(commonChangedFolder('/w', [changed('a/b/c.ts'), changed('a/d.ts'), changed('/x/y.ts')])).toBe('/w/a')
|
|
expect(commonChangedFolder('/w', [changed('/x/y.ts')])).toBe('/w')
|
|
expect(commonChangedFolder('/w', [changed('../up.ts')])).toBe('/w')
|
|
})
|
|
|
|
it.each(['', '?seq=9', '?sessionId=owner', '?sessionId=owner&seq=9&index=-1', '?sessionId=owner&seq=9&index=1.5', '?sessionId=owner&seq=x'])(
|
|
'rejects invalid coordinates before reading: %s', async (query) => {
|
|
const { open, readEvent } = await fixture()
|
|
expect((await open(query)).status).toBe(400)
|
|
expect(readEvent).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('refuses unrelated Sessions, other events, malformed data, unknown indices, and missing files', async () => {
|
|
const { open, readEvent, session, opener, cwd, data } = await fixture()
|
|
expect((await open('?sessionId=other&seq=9&index=0')).status).toBe(404)
|
|
expect((await open('?sessionId=owner&seq=8&index=0')).status).toBe(404)
|
|
expect((await open('?sessionId=owner&seq=9&index=5')).status).toBe(404)
|
|
readEvent.mockResolvedValueOnce({ session, target: { type: 'deliverables/presented', data } as unknown as SessionEvent })
|
|
expect((await open()).status).toBe(404)
|
|
for (const bad of [null, { turn: 0, files: [], total: 0 }, { turn: 1, files: null, total: 0 }, { turn: 1, files: [{ path: 'a' }], total: 1 }, { turn: 1, files: [], total: 1.5 }]) {
|
|
readEvent.mockResolvedValueOnce({ session, target: { type: 'workspace/changes', data: bad } as unknown as SessionEvent })
|
|
expect((await open()).status).toBe(404)
|
|
}
|
|
await unlink(join(cwd, 'src', 'lib', 'a.ts'))
|
|
expect((await open()).status).toBe(404)
|
|
await rm(join(cwd, 'src'), { recursive: true })
|
|
expect((await open('?sessionId=owner&seq=9')).status).toBe(404)
|
|
expect(opener).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('refuses opening without a desktop or a verified Host mapping and reports launcher failures', async () => {
|
|
const { ctx, open, opener } = await fixture()
|
|
const desktop = vi.spyOn(ctx.sessionController, 'workspaceDesktop').mockReturnValue({ name: 'desktop', available: false, fileManager: null })
|
|
expect((await open()).status).toBe(409)
|
|
desktop.mockRestore()
|
|
const mapping = vi.spyOn(ctx.fs, 'processPathFromHostPath').mockReturnValue(undefined)
|
|
expect((await open()).status).toBe(422)
|
|
expect((await open('?sessionId=owner&seq=9')).status).toBe(422)
|
|
mapping.mockRestore()
|
|
opener.mockRejectedValueOnce(new Error('/private/host/path'))
|
|
const failed = await open()
|
|
expect(failed.status).toBe(500)
|
|
expect(await failed.text()).not.toContain('/private/host/path')
|
|
expect((await open()).status).toBe(204)
|
|
})
|
|
|
|
it('uses the deployment workspace root when the viewed Session has no cwd', async () => {
|
|
const { session, open, opener, cwd } = await fixture()
|
|
delete session.cwd
|
|
expect((await open('?sessionId=owner&seq=9')).status).toBe(204)
|
|
expect(opener.mock.lastCall?.[0].path).toBe(await realpath(join(cwd, 'src')))
|
|
})
|
|
|
|
it('validates recorded change records', () => {
|
|
expect(isChangedFile({ path: 'a', display: 'a', added: 1, deleted: 2, binary: true })).toBe(true)
|
|
expect(isChangedFile({ path: 'a', display: 'a', added: 1, deleted: 2, binary: false })).toBe(false)
|
|
expect(isChangedFile({ path: '', display: 'a', added: 1, deleted: 2 })).toBe(false)
|
|
expect(isChangedFile({ path: 'a', display: '', added: 1, deleted: 2 })).toBe(false)
|
|
expect(isChangedFile({ path: 'a', display: 'a', added: 1.5, deleted: 2 })).toBe(false)
|
|
expect(isChangedFile([])).toBe(false)
|
|
expect(isChangesData({ turn: 1, total: 0, files: [] })).toBe(true)
|
|
expect(isChangesData({ turn: '1', total: 0, files: [] })).toBe(false)
|
|
expect(isChangesData([])).toBe(false)
|
|
})
|
|
})
|