diff --git a/.playwright/scripts/__tests__/transcript-history.e2e.mjs b/.playwright/scripts/__tests__/transcript-history.e2e.mjs index 000ee96ff..13d76815b 100644 --- a/.playwright/scripts/__tests__/transcript-history.e2e.mjs +++ b/.playwright/scripts/__tests__/transcript-history.e2e.mjs @@ -1,7 +1,10 @@ import { once } from 'node:events' +import fs from 'node:fs/promises' import { createServer } from 'node:http' import path from 'node:path' +import process from 'node:process' import { test as base, expect, useSyntheticCredentialStorage } from '../fixtures/electron.mjs' +import { startKeyboardProbe, stopRendererTrace } from '../fixtures/renderer-responsiveness.mjs' const messageCount = 420 const contentTolerance = 3 @@ -562,6 +565,193 @@ async function waitForChunk(history, marker) { test.describe('long transcript reading', () => { test.use({ historyShape: 'long' }) + test('keeps file opening responsive during long transcript streaming', async ({ history }, testInfo) => { + const stream = await localStream() + const { page, instance } = history + const samples = [] + const diagnosticsEnabled = process.env.LEXORA_TEST_FILE_DIAGNOSTICS === '1' + let timer + let session + let stopInput + let cleanupFailure + try { + await configureProvider(history, stream.baseUrl) + const owner = await select(history) + const directory = path.join(instance.home, 'documents') + await fs.mkdir(directory, { recursive: true }) + const names = ['sample-a.ts', 'sample-b.ts', 'sample-c.ts'] + const text = Array.from({ length: 80 }, (_, index) => `export const entry${index} = { label: 'responsive editor ${index}', enabled: true }`).join('\n') + for (const name of names) + await fs.writeFile(path.join(directory, name), `// ${name}\n${text}`) + await history.app.evaluate(({ dialog }, directory) => { + dialog.showOpenDialog = async () => ({ canceled: false, filePaths: [directory] }) + }, directory) + await page.evaluate(async (id) => { + const api = window.lexoraDesktop.localChat + const root = await api.spaces.selectDirectory() + const space = await api.spaces.create({ name: 'Streaming files', memoryScope: 'space_only', primaryDirectory: { id: null, root } }) + await api.conversations.moveToSpace(id, space.id) + }, history.data.id) + await owner.locator('.desktop-chat-composer__prosemirror').fill('请继续合成长篇说明。') + await owner.getByRole('button', { name: '发送消息', exact: true }).click() + await expect(owner).toContainText('ANCHOR-STREAM-S023-END', { timeout: 45000 }) + await expect(owner.getByRole('button', { name: '停止运行', exact: true })).toBeVisible() + await owner.locator('.desktop-chat-composer__prosemirror').click() + await page.keyboard.press('Control+Shift+P') + await page.getByPlaceholder('输入命令名称').fill('文件') + await page.getByPlaceholder('输入命令名称').press('Enter') + const tree = page.getByTestId('context-file-tree') + await expect(tree.locator('[data-path="sample-a.ts"]')).toBeVisible() + await history.app.context().tracing.stop() + await history.app.context().tracing.start({ screenshots: false, snapshots: false }) + await page.evaluate(() => { + window.__filePerformance = { tasks: [], frames: [], inputs: [], animationFrames: [], active: false, editors: new WeakSet(), editorInstances: 0 } + document.addEventListener('keydown', (event) => { + const state = window.__filePerformance + if (event.key !== 'F24' || !state.active) + return + event.preventDefault() + const input = { at: performance.now(), timestamp: event.timeStamp, trusted: event.isTrusted } + input.delayMs = input.at - input.timestamp + state.inputs.push(input) + requestAnimationFrame(() => input.nextFrameMs = performance.now() - input.timestamp) + }, true) + if (PerformanceObserver.supportedEntryTypes.includes('long-animation-frame')) { + new PerformanceObserver((list) => { + if (window.__filePerformance.active) + window.__filePerformance.animationFrames.push(...list.getEntries().map(entry => entry.toJSON())) + }).observe({ type: 'long-animation-frame' }) + } + document.addEventListener('click', (event) => { + if (window.__filePerformance.active && event.target.closest('[data-path]')) + window.__filePerformance.clickedAt = performance.now() + }, true) + new MutationObserver(() => { + const state = window.__filePerformance + if (!state.active || !state.clickedAt || state.domReadyAt) + return + const created = [...document.querySelectorAll('.monaco-editor .view-lines')].find(element => !state.previous.has(element) && element.textContent.replace(/\s+/g, ' ').includes(state.name)) + if (created) { + state.domReadyAt = performance.now() + requestAnimationFrame(() => requestAnimationFrame(() => state.paintedAt = performance.now())) + } + }).observe(document.body, { subtree: true, childList: true, characterData: true }) + new PerformanceObserver((list) => { + if (window.__filePerformance.active) + window.__filePerformance.tasks.push(...list.getEntries().map(entry => ({ start: entry.startTime, duration: entry.duration }))) + }).observe({ type: 'longtask' }) + let previous = performance.now() + function frame(now) { + if (window.__filePerformance.active) + window.__filePerformance.frames.push(now - previous) + previous = now + requestAnimationFrame(frame) + } + requestAnimationFrame(frame) + }) + session = await page.context().newCDPSession(page) + await session.send('Performance.enable') + if (diagnosticsEnabled) { + await session.send('Profiler.enable') + await session.send('Profiler.start') + await session.send('Tracing.start', { categories: 'toplevel,devtools.timeline,blink.user_timing,disabled-by-default-devtools.timeline,disabled-by-default-devtools.timeline.invalidationTracking', transferMode: 'ReturnAsStream' }) + } + let chunks = 0 + timer = setInterval(() => stream.append(`\n\nLIVE-${++chunks} ${'持续生成时文件编辑器应保持可操作。'.repeat(4)}\n\n`), 50) + for (const name of [...names, ...names, ...names]) { + await page.evaluate(name => Object.assign(window.__filePerformance, { name, startedAt: performance.now(), tasks: [], frames: [], inputs: [], animationFrames: [], active: true, clickedAt: null, domReadyAt: null, paintedAt: null, previous: new Set(document.querySelectorAll('.monaco-editor .view-lines')) }), name) + const before = (await session.send('Performance.getMetrics')).metrics + const started = performance.now() + stopInput = startKeyboardProbe(session) + await tree.locator(`[data-path="${name}"]`).click() + const editor = page.getByTestId('workbench-text-editor').filter({ visible: true }) + await expect(editor.locator('.view-lines')).toContainText(name) + const readyMs = performance.now() - started + await page.waitForFunction(() => !!window.__filePerformance.paintedAt) + await stopInput() + stopInput = undefined + await page.evaluate(() => new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve)))) + const observation = await editor.evaluate((element) => { + const state = window.__filePerformance + state.active = false + state.endedAt = performance.now() + const editor = element.querySelector('.monaco-editor').parentElement + if (!state.editors.has(editor)) { + state.editors.add(editor) + state.editorInstances++ + } + return state + }) + const after = (await session.send('Performance.getMetrics')).metrics + const metrics = ['LayoutCount', 'LayoutDuration', 'RecalcStyleDuration', 'ScriptDuration', 'TaskDuration'] + samples.push({ name, window: { start: observation.startedAt, click: observation.clickedAt, domReady: observation.domReadyAt, doubleRaf: observation.paintedAt, end: observation.endedAt }, inputs: observation.inputs, animationFrames: observation.animationFrames, editorInstances: observation.editorInstances, readyMs, domReadyMs: observation.domReadyAt - observation.clickedAt, paintedMs: observation.paintedAt - observation.clickedAt, maxFrameMs: Math.max(0, ...observation.frames), longTasks: observation.tasks, ...Object.fromEntries(metrics.map(key => [key, after.find(item => item.name === key).value - before.find(item => item.name === key).value])) }) + if (diagnosticsEnabled && samples.length === 1) { + const { profile } = await session.send('Profiler.stop') + const profilePath = testInfo.outputPath('file-opening-cpu.json') + await fs.writeFile(profilePath, JSON.stringify(profile)) + await testInfo.attach('file-opening-cpu', { path: profilePath, contentType: 'application/json' }) + const tracePath = testInfo.outputPath('file-opening-trace.json') + await stopRendererTrace(session, tracePath) + await testInfo.attach('file-opening-trace', { path: tracePath, contentType: 'application/json' }) + } + } + clearInterval(timer) + timer = undefined + await expect(owner.getByRole('button', { name: '停止运行', exact: true })).toBeVisible() + stream.append('\n\nFILE-STREAM-COMPLETED', true) + await expect(owner.getByRole('button', { name: '停止运行', exact: true })).toHaveCount(0, { timeout: 45000 }) + await testInfo.attach('file-opening', { body: await page.screenshot(), contentType: 'image/png' }) + const editor = page.getByTestId('workbench-text-editor').filter({ visible: true }) + await page.getByTestId('document-mode-edit').filter({ visible: true }).click() + await editor.locator('.view-lines').click() + await page.keyboard.press('Control+End') + await page.keyboard.insertText('\n// Preserved edit\n') + await tree.locator('[data-path="sample-a.ts"]').click() + await expect(editor.locator('.view-lines')).toContainText('sample-a.ts') + await tree.locator('[data-path="sample-c.ts"]').click() + await expect(editor.locator('.view-lines')).toContainText('Preserved edit') + const readBackup = () => page.evaluate(async () => (await window.lexoraDesktop.workbench.read())?.backups.find(backup => backup.resource.data.path === 'sample-c.ts')?.text) + await expect.poll(readBackup).toContain('Preserved edit') + const edited = await readBackup() + await editor.locator('.view-lines').click() + await page.keyboard.press('Control+z') + await expect.poll(readBackup).not.toBe(edited) + await page.keyboard.press('Control+y') + await expect.poll(readBackup).toBe(edited) + await page.keyboard.press('Control+s') + await expect.poll(() => fs.readFile(path.join(directory, names.at(-1)), 'utf8')).toBe(edited) + for (const width of [1200, 1500]) { + await history.app.evaluate(({ BrowserWindow }, width) => BrowserWindow.getAllWindows()[0].setSize(width, 1000), width) + await expect.poll(() => editor.evaluate((element) => { + const surface = element.getBoundingClientRect() + const content = element.querySelector('.monaco-editor').getBoundingClientRect() + return Math.max(Math.abs(surface.width - content.width), Math.abs(surface.height - content.height)) + })).toBeLessThan(2) + } + expect(samples.at(-1).editorInstances).toBe(1) + expect(samples.every(sample => sample.inputs.length > 0 && sample.inputs.every(input => input.trusted && input.delayMs >= -2))).toBe(true) + expect(samples.every(sample => sample.domReadyMs > 0 && sample.paintedMs >= sample.domReadyMs)).toBe(true) + expect(Math.max(...samples.flatMap(sample => sample.longTasks.map(task => task.duration)), 0)).toBeLessThan(1000) + expect(history.diagnostics.console.filter(item => item.type === 'pageerror')).toEqual([]) + } + finally { + clearInterval(timer) + const probe = await Promise.allSettled([stopInput?.()]) + const cleanup = await Promise.allSettled([ + (async () => { + const summaryPath = testInfo.outputPath('file-opening-performance.json') + await fs.writeFile(summaryPath, JSON.stringify({ messageCount: history.data.messages.length, diagnosticsEnabled, snapshotsEnabled: false, samples }, null, 2)) + await testInfo.attach('file-opening-performance', { path: summaryPath, contentType: 'application/json' }) + })(), + session?.detach(), + stream.close(), + ]) + cleanupFailure = [...probe, ...cleanup].find(result => result.status === 'rejected') + } + if (cleanupFailure) + throw cleanupFailure.reason + }) + test('retains detached reading through streaming task switches, continuous upward wheels and completion', async ({ history }) => { const stream = await localStream() try { diff --git a/.playwright/scripts/fixtures/renderer-responsiveness.mjs b/.playwright/scripts/fixtures/renderer-responsiveness.mjs new file mode 100644 index 000000000..7c0659558 --- /dev/null +++ b/.playwright/scripts/fixtures/renderer-responsiveness.mjs @@ -0,0 +1,42 @@ +import { Buffer } from 'node:buffer' +import fs from 'node:fs/promises' + +export function startKeyboardProbe(session) { + let pending + let failure + const dispatch = () => { + if (pending || failure) + return + pending = (async () => { + await session.send('Input.dispatchKeyEvent', { type: 'rawKeyDown', key: 'F24', code: 'F24', windowsVirtualKeyCode: 135, timestamp: Date.now() / 1000 }) + await session.send('Input.dispatchKeyEvent', { type: 'keyUp', key: 'F24', code: 'F24', windowsVirtualKeyCode: 135 }) + })().catch(error => failure = error).finally(() => pending = undefined) + } + const timer = setInterval(dispatch, 16) + dispatch() + return async () => { + clearInterval(timer) + await pending + if (failure) + throw failure + } +} + +export async function stopRendererTrace(session, filename) { + const complete = new Promise(resolve => session.once('Tracing.tracingComplete', resolve)) + await session.send('Tracing.end') + const { stream } = await complete + const file = await fs.open(filename, 'w') + try { + let eof = false + while (!eof) { + const chunk = await session.send('IO.read', { handle: stream, size: 1024 * 1024 }) + await file.write(Buffer.from(chunk.data, chunk.base64Encoded ? 'base64' : 'utf8')) + eof = chunk.eof + } + } + finally { + await file.close() + await session.send('IO.close', { handle: stream }) + } +} diff --git a/apps/buddy/src/app/workbench/DesktopFileContribution.vue b/apps/buddy/src/app/workbench/DesktopFileContribution.vue index 9e6265fc1..fdb237856 100644 --- a/apps/buddy/src/app/workbench/DesktopFileContribution.vue +++ b/apps/buddy/src/app/workbench/DesktopFileContribution.vue @@ -17,6 +17,6 @@ const toolbarTarget = computed(() => typeof props.view.state.contextTabId === 's diff --git a/apps/buddy/src/app/workbench/useDesktopWorkbench.ts b/apps/buddy/src/app/workbench/useDesktopWorkbench.ts index 0e3324c11..f6520b42a 100644 --- a/apps/buddy/src/app/workbench/useDesktopWorkbench.ts +++ b/apps/buddy/src/app/workbench/useDesktopWorkbench.ts @@ -23,6 +23,7 @@ import { computed, onScopeDispose, shallowReactive, shallowRef, watch } from 'vu import { fileOpeningHandler } from '@/modules/files' import { useTaskCapability } from '@/modules/tasks' import { desktopRouteLocations } from '@/shared/navigation/desktopRoutes' +import { TextEditorPool } from '@/workbench/browser/TextEditorPool' import { TextModelPool } from '@/workbench/browser/TextModelPool' import { ViewRendererRegistry } from '@/workbench/browser/ViewRendererRegistry' import { panes, resourceKey } from '@/workbench/common/workbench' @@ -63,6 +64,7 @@ export function useDesktopWorkbench(options: { beforeExtensionClose?: (viewId: s const controller = new WorkbenchController(new ContributionRegistry(), beforeClose) const diagnostics = new WorkbenchDiagnostics({ controller, copies, events: options.events }) const models = new TextModelPool(copies) + const editors = new TextEditorPool() const renderers = new ViewRendererRegistry() registerDesktopContributions(controller, renderers, copies, () => language.value) const persistence = new WorkbenchPersistence(api.workbench, controller, copies, error => backupError.value = error !== null) @@ -452,6 +454,7 @@ export function useDesktopWorkbench(options: { beforeExtensionClose?: (viewId: s resourceLifetime.dispose() await release(() => pool.flush()) await release(() => pool.dispose()) + await release(() => editors.dispose()) await release(() => models.dispose()) await release(() => copies.stop()) if (persistence.ready) @@ -476,7 +479,7 @@ export function useDesktopWorkbench(options: { beforeExtensionClose?: (viewId: s return saved } const selectionReferences = createDesktopSelectionReferences({ controller, pool, language, openFile: (target, current) => createFile(target, undefined, current), browser: api.browser, resources: options.resources, ready: () => initialized.value, independent: () => stores.applicationSettings.config.value?.desktop.contextPanelMode === 'independent', locateFile: target => api.localChat.spaces.readFile(target), navigationVersion: () => navigation.version }) - return { selectionReferences, api, renderers, fileOperations, fileToolbarTargets, fileView, closeContextFiles, readingPositions, discardTask, prepareTaskDeletion, activeTask, activeTaskId, backupError, controller, copies, models, pool, persistence, initialize, flush, dispose, openTask, openDraft, newTask, prepareNewTaskInput, showTaskInput, showReferencePage, startTaskWithSkill, openFile, dropResource, language, get initialized() { + return { selectionReferences, api, renderers, fileOperations, fileToolbarTargets, fileView, closeContextFiles, readingPositions, discardTask, prepareTaskDeletion, activeTask, activeTaskId, backupError, controller, copies, models, editors, pool, persistence, initialize, flush, dispose, openTask, openDraft, newTask, prepareNewTaskInput, showTaskInput, showReferencePage, startTaskWithSkill, openFile, dropResource, language, get initialized() { return initialized.value }, get navigationVersion() { return navigation.version diff --git a/apps/buddy/src/modules/files/widgets/DesktopFileEditor.vue b/apps/buddy/src/modules/files/widgets/DesktopFileEditor.vue index 21e052d1d..ffda5f481 100644 --- a/apps/buddy/src/modules/files/widgets/DesktopFileEditor.vue +++ b/apps/buddy/src/modules/files/widgets/DesktopFileEditor.vue @@ -2,6 +2,7 @@ import type { BuddyFileQuote, BuddyTextQuote } from '@buddy-shared/conversation/buddyUserContent' import type { JsonValue } from '@buddy-shared/workbench/workbenchState' import type * as Monaco from 'monaco-editor/editor/editor.api.js' +import type { TextEditorPool } from '@/workbench/browser/TextEditorPool' import type { TextModelPool } from '@/workbench/browser/TextModelPool' import type { ResourceRef, WorkbenchView } from '@/workbench/common/workbench' import { resolveBuiltinFileOpening } from '@buddy-shared/files/fileOpening' @@ -13,12 +14,13 @@ import WorkbenchMenu from '@/shared/ui/contributions/WorkbenchMenu.vue' import DesktopDocumentContent from '@/shared/ui/files/DesktopDocumentContent.vue' import DesktopDocumentToolbar from '@/shared/ui/files/DesktopDocumentToolbar.vue' import { fileDocumentModes, resolveFileDocumentMode } from '@/shared/ui/files/fileDocumentPresentation' -import { observeDesktopMonacoTheme } from '@/shared/ui/monaco/desktopMonaco' +import { observeDesktopMonacoLayout } from '@/shared/ui/monaco/desktopMonacoLayout' import ResourceSelectionQuoteMenu from '@/shared/ui/selection/ResourceSelectionQuoteMenu.vue' import { revealMonacoQuote } from '@/shared/ui/selection/revealMonacoQuote' import { registerMonacoResourceQuote } from '@/shared/ui/selection/useMonacoResourceQuote' import { useResourceQuoteReveal } from '@/shared/ui/selection/useResourceQuoteReveal' import { useResourceSelectionQuote } from '@/shared/ui/selection/useResourceSelectionQuote' +import { desktopTypography } from '@/theme/desktopTypography' import { useWorkbench } from '@/workbench/browser/workbenchContext' import { spaceFileImageResolver } from '../model/documentImageResolver' @@ -26,7 +28,7 @@ import { fileOpeningHandler } from '../model/fileOpeningHandlers' import { useFileOpening } from '../state/fileOpeningContext' import { filePreviewRenderer } from './filePreviewRenderers' -const props = withDefaults(defineProps<{ view: WorkbenchView, models: TextModelPool, language: 'zh-CN' | 'en-US', writeClipboardText: (text: string) => Promise, toolbarTarget?: HTMLElement | null, visible?: boolean }>(), { visible: true }) +const props = withDefaults(defineProps<{ view: WorkbenchView, models: TextModelPool, editors: TextEditorPool, language: 'zh-CN' | 'en-US', writeClipboardText: (text: string) => Promise, toolbarTarget?: HTMLElement | null, visible?: boolean }>(), { visible: true }) const { copies, controller, labels } = useWorkbench() const container = useTemplateRef('container') const { t } = useBuddyI18n(() => props.language) @@ -80,13 +82,15 @@ watch(identity, (_, __, onCleanup) => { failed.value = true }) }, { immediate: true }) -watch([container, attempt, viewId, identity], async ([element, , viewId, key], _, onCleanup) => { +watch([container, attempt, viewId, identity, () => props.visible], async ([element, , viewId, key, visible], _, onCleanup) => { const resource = props.view.resource let disposed = false let ownedEditor: Monaco.editor.IStandaloneCodeEditor | undefined let capture: ReturnType | undefined let release: (() => void) | undefined - let stopTheme: (() => void) | undefined + let releaseEditor: (() => void) | undefined + let stopLayout: (() => void) | undefined + const subscriptions: Monaco.IDisposable[] = [] function state() { const view = controller.layout.views[viewId] ?? controller.navigation.find(viewId)?.view if (!view || resourceIdentity(view.resource) !== key) @@ -100,6 +104,7 @@ watch([container, attempt, viewId, identity], async ([element, , viewId, key], _ return disposed = true clearTimeout(capture) + stopLayout?.() try { if (save) state() @@ -109,15 +114,16 @@ watch([container, attempt, viewId, identity], async ([element, , viewId, key], _ editor = undefined editorReady.value = false } - stopTheme?.() + for (const subscription of subscriptions) + subscription.dispose() try { - ownedEditor?.dispose() + releaseEditor?.() } finally { release?.() } } } onCleanup(dispose) - if (!element) + if (!element || !visible) return try { const lease = await props.models.acquire(resource) @@ -126,11 +132,17 @@ watch([container, attempt, viewId, identity], async ([element, , viewId, key], _ return } release = lease.release - ownedEditor = lease.monaco.editor.create(element, { + await new Promise(resolve => setTimeout(resolve, 0)) + if (disposed) + return + const dimension = { width: element.clientWidth, height: element.clientHeight } + const editorLease = props.editors.acquire(lease.monaco, element, { model: lease.model, readOnly: mode.value !== 'edit' || copy.value?.blocked, domReadOnly: mode.value !== 'edit', - automaticLayout: true, + automaticLayout: false, + dimension, + fontFamily: desktopTypography.value.mono, fontSize: 13, lineHeight: 21, minimap: { enabled: false }, @@ -140,10 +152,12 @@ watch([container, attempt, viewId, identity], async ([element, , viewId, key], _ padding: { top: 12, bottom: 12 }, contextmenu: true, }) + releaseEditor = editorLease.release + ownedEditor = editorLease.editor editor = ownedEditor + stopLayout = observeDesktopMonacoLayout(element, size => ownedEditor?.layout(size)) if (selection.enabled) - registerMonacoResourceQuote(ownedEditor, { label: () => t('desktop.chat.quoteSelection'), source: () => quoteSource(), prepare: selection.prepare }) - stopTheme = observeDesktopMonacoTheme(lease.monaco, ownedEditor) + subscriptions.push(registerMonacoResourceQuote(ownedEditor, { label: () => t('desktop.chat.quoteSelection'), source: () => quoteSource(), prepare: selection.prepare })) if (props.view.state.editor) ownedEditor.restoreViewState(JSON.parse(JSON.stringify(props.view.state.editor)) as Monaco.editor.ICodeEditorViewState) editorReady.value = true @@ -153,8 +167,7 @@ watch([container, attempt, viewId, identity], async ([element, , viewId, key], _ clearTimeout(capture) capture = setTimeout(state, 250) } - ownedEditor.onDidChangeCursorPosition(schedule) - ownedEditor.onDidScrollChange(schedule) + subscriptions.push(ownedEditor.onDidChangeCursorPosition(schedule), ownedEditor.onDidScrollChange(schedule)) } catch { const active = !disposed @@ -226,7 +239,7 @@ onScopeDispose(controller.configuration.subscribe(() => editor?.updateOptions({