From 41ffe38699326228274cee991ff45c1bd651d691 Mon Sep 17 00:00:00 2001 From: matevip Date: Sat, 15 Aug 2026 00:54:19 -0400 Subject: [PATCH] fix(team): harden readonly run interactions (#596) --- .../src/components/chat/MessageBubble.vue | 11 ++++--- .../src/components/chat/MessageList.vue | 3 ++ .../teamRunTimelineRendering.test.ts | 13 +++++++-- .../src/components/live/AgentRunGroups.vue | 4 +-- .../live/__tests__/AgentRunGroups.test.ts | 11 +++++++ .../__tests__/useTeamRunHistory.test.ts | 29 +++++++++++++++++++ .../src/composables/useTeamRunHistory.ts | 15 ++++++---- mateclaw-ui/src/views/ChatConsole.vue | 9 ++++-- .../workerConversationWriteGuards.test.ts | 23 +++++++++++++++ 9 files changed, 102 insertions(+), 16 deletions(-) create mode 100644 mateclaw-ui/src/views/__tests__/workerConversationWriteGuards.test.ts diff --git a/mateclaw-ui/src/components/chat/MessageBubble.vue b/mateclaw-ui/src/components/chat/MessageBubble.vue index 6c7e423b..fc8f237b 100644 --- a/mateclaw-ui/src/components/chat/MessageBubble.vue +++ b/mateclaw-ui/src/components/chat/MessageBubble.vue @@ -219,7 +219,7 @@

{{ errorAction }}

{{ errorCode }} - @@ -242,7 +242,7 @@

{{ $t('chat.incompleteDescription') }}

- @@ -423,7 +423,7 @@
@@ -68,5 +68,5 @@ const { t } = useI18n() .agent-run-group__lead { display: grid; grid-template-columns: auto minmax(0,1fr) minmax(0,.6fr); align-items:center; gap: 8px; padding: 7px 10px; border-top: 1px solid var(--mc-border-light); background: rgba(71, 85, 105, 0.035); color: var(--mc-text-tertiary); font-size: 11px; } .agent-run-group__lead-name,.agent-run-group__phase{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.agent-run-group__lead-name{color:var(--mc-text-secondary)}.agent-run-group__phase{text-align:right} .agent-run-group__empty { margin: 0; padding: 12px; border-top: 1px solid var(--mc-border-light); color: var(--mc-text-tertiary); font-size: 11px; } -@media(max-width:520px){.agent-run-group__open{grid-template-columns:minmax(0,1fr) auto;gap:8px}.agent-run-group__open>el-icon{display:none}.agent-run-group__lead{grid-template-columns:auto minmax(0,1fr)}.agent-run-group__phase{grid-column:2;text-align:left}.agent-run-group__copy>span{white-space:normal;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}} +@media(max-width:520px){.agent-run-group__open{grid-template-columns:minmax(0,1fr) auto;gap:8px}.agent-run-group__arrow{display:none}.agent-run-group__lead{grid-template-columns:auto minmax(0,1fr)}.agent-run-group__phase{grid-column:2;text-align:left}.agent-run-group__copy>span{white-space:normal;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}} diff --git a/mateclaw-ui/src/components/live/__tests__/AgentRunGroups.test.ts b/mateclaw-ui/src/components/live/__tests__/AgentRunGroups.test.ts index dd599a28..5ab357b8 100644 --- a/mateclaw-ui/src/components/live/__tests__/AgentRunGroups.test.ts +++ b/mateclaw-ui/src/components/live/__tests__/AgentRunGroups.test.ts @@ -62,4 +62,15 @@ describe('AgentRunGroups', () => { await nextTick() expect(opened).toEqual(['20']) }) + + it('uses a stable class for the mobile-only run arrow', () => { + const host = document.createElement('div') + document.body.appendChild(host) + const app = createApp(AgentRunGroups, { groups: [group] }) + app.use(createI18n({ legacy: false, locale: 'en', messages: { en: messages } })) + app.mount(host) + apps.push(app) + + expect(host.querySelector('.agent-run-group__arrow')).not.toBeNull() + }) }) diff --git a/mateclaw-ui/src/composables/__tests__/useTeamRunHistory.test.ts b/mateclaw-ui/src/composables/__tests__/useTeamRunHistory.test.ts index c3ce2f90..be34e263 100644 --- a/mateclaw-ui/src/composables/__tests__/useTeamRunHistory.test.ts +++ b/mateclaw-ui/src/composables/__tests__/useTeamRunHistory.test.ts @@ -226,6 +226,35 @@ describe('useTeamRunHistory', () => { await pending expect(history.selectedRunId.value).toBe('2') expect(history.selectedTaskId.value).toBe('task-b') + expect(history.detailLoading.value).toBe(false) + expect(history.detailError.value).toBeNull() + }) + + it('keeps detail loading and errors scoped to the currently selected run', async () => { + const detailA = deferred() + const detailB = deferred() + const get = vi.fn((id: string) => id === '1' ? detailA.promise : detailB.promise) + const history = useTeamRunHistory({ + api: { listByTeam: vi.fn().mockResolvedValue({ data: [ + { ...run('1', '2026-01-01'), projectionCompleteness: 'summary' }, + { ...run('2', '2026-01-02'), projectionCompleteness: 'summary' }, + ] }), get }, subscribe: () => vi.fn(), + }) + await history.open('10') + + history.select('1') + const pendingA = history.ensureSelectedRunDetail('1', null, '10') + history.select('2') + const pendingB = history.ensureSelectedRunDetail('2', null, '10') + detailA.reject(new Error('run A failed')) + await pendingA + + expect(history.detailLoading.value).toBe(true) + expect(history.detailError.value).toBeNull() + + detailB.resolve({ data: { ...run('2', '2026-01-02'), projectionCompleteness: 'full' } }) + await pendingB + expect(history.detailLoading.value).toBe(false) }) it('loads the new paged team history response', async () => { const history = useTeamRunHistory({ diff --git a/mateclaw-ui/src/composables/useTeamRunHistory.ts b/mateclaw-ui/src/composables/useTeamRunHistory.ts index 53144693..2209d613 100644 --- a/mateclaw-ui/src/composables/useTeamRunHistory.ts +++ b/mateclaw-ui/src/composables/useTeamRunHistory.ts @@ -58,10 +58,10 @@ export function useTeamRunHistory(options: TeamRunHistoryOptions = {}) { const refreshTimers = new Map() const runRevisions = new Map() const runRequestSequences = new Map() - const detailRequestSequences = new Map() let generation = 0 let revision = 0 let selectionRevision = 0 + let detailRequestSequence = 0 let unsubscribe: (() => void) | null = null function merge(run: TeamRun) { @@ -95,13 +95,14 @@ export function useTeamRunHistory(options: TeamRunHistoryOptions = {}) { const requestSequence = (runRequestSequences.get(requestKey) ?? 0) + 1 const requestRevision = runRevisions.get(runId) ?? 0 runRequestSequences.set(requestKey, requestSequence) - const detailRequestSequence = silent ? null : (detailRequestSequences.get(runId) ?? 0) + 1 - if (detailRequestSequence !== null) detailRequestSequences.set(runId, detailRequestSequence) + const requestSelectionRevision = selectionRevision + const currentDetailRequest = silent ? null : ++detailRequestSequence const isLatestRequest = () => expectedGeneration === generation && runRequestSequences.get(requestKey) === requestSequence const isLatestDetailRequest = () => !silent && expectedGeneration === generation - && detailRequestSequences.get(runId) === detailRequestSequence + && detailRequestSequence === currentDetailRequest + && selectionRevision === requestSelectionRevision try { if (!silent) { detailLoading.value = true @@ -153,7 +154,7 @@ export function useTeamRunHistory(options: TeamRunHistoryOptions = {}) { runs.value = [] runRevisions.clear() runRequestSequences.clear() - detailRequestSequences.clear() + detailRequestSequence++ revision = 0 loading.value = true error.value = null @@ -202,6 +203,8 @@ export function useTeamRunHistory(options: TeamRunHistoryOptions = {}) { function select(runId: string | null, taskId: string | null = null) { selectionRevision++ + detailLoading.value = false + detailError.value = null selectedRunId.value = runId selectedTaskId.value = taskId } @@ -229,7 +232,7 @@ export function useTeamRunHistory(options: TeamRunHistoryOptions = {}) { runs.value = [] runRevisions.clear() runRequestSequences.clear() - detailRequestSequences.clear() + detailRequestSequence++ loading.value = false error.value = null detailLoading.value = false diff --git a/mateclaw-ui/src/views/ChatConsole.vue b/mateclaw-ui/src/views/ChatConsole.vue index 23f0a10e..5c0e4ce3 100644 --- a/mateclaw-ui/src/views/ChatConsole.vue +++ b/mateclaw-ui/src/views/ChatConsole.vue @@ -128,6 +128,7 @@ :selected-team-task-id="teamRunRouteQuery.taskId || null" :team-runs-has-more="Boolean(teamRunsNextCursor)" :team-runs-loading-more="teamRunsLoadingMore" + :readonly="workerConversationReadOnly" @regenerate="handleRegenerate" @rewind="handleRewind" @suggestion-click="sendSuggestion" @@ -656,6 +657,7 @@ function reconcileCurrentConversation() { const { isDragging, onDragEnter, onDragLeave, onDrop } = useFileDrop(processDroppedItems) async function processDroppedItems(e: DragEvent) { + if (workerConversationReadOnly.value) return const dtFiles = Array.from(e.dataTransfer?.files || []) const items = Array.from(e.dataTransfer?.items || []) @@ -697,6 +699,7 @@ async function processDroppedItems(e: DragEvent) { } function handleDirectoryAttach(dirFiles: File[]) { + if (workerConversationReadOnly.value) return if (!currentConversationId.value) { newConversation() } @@ -2096,7 +2099,8 @@ function handleStopStream() { } async function handleRegenerate(message: Message) { - if (isGenerating.value || !currentConversationId.value || !selectedAgentId.value) return + if (workerConversationReadOnly.value + || isGenerating.value || !currentConversationId.value || !selectedAgentId.value) return const idx = messages.value.indexOf(message) if (idx >= 0) { // The server drops the trailing assistant block and reuses the persisted @@ -2120,7 +2124,7 @@ async function handleRegenerate(message: Message) { } async function handleRewind(message: Message) { - if (isGenerating.value || !currentConversationId.value) return + if (workerConversationReadOnly.value || isGenerating.value || !currentConversationId.value) return const idx = messages.value.indexOf(message) if (idx < 0) return const count = messages.value.length - idx @@ -2248,6 +2252,7 @@ function resetStreamingState() { // ============ 附件处理 ============ async function handleFileSelect(files: File[]) { + if (workerConversationReadOnly.value) return if (!currentConversationId.value) { newConversation() } diff --git a/mateclaw-ui/src/views/__tests__/workerConversationWriteGuards.test.ts b/mateclaw-ui/src/views/__tests__/workerConversationWriteGuards.test.ts new file mode 100644 index 00000000..e6d1bca6 --- /dev/null +++ b/mateclaw-ui/src/views/__tests__/workerConversationWriteGuards.test.ts @@ -0,0 +1,23 @@ +import { describe, expect, it } from 'vitest' +import chatConsoleSource from '../ChatConsole.vue?raw' + +describe('worker conversation write guards', () => { + it('guards regenerate rewind and file upload handlers in readonly worker sessions', () => { + for (const handler of [ + 'handleRegenerate', + 'handleRewind', + 'handleFileSelect', + 'processDroppedItems', + 'handleDirectoryAttach', + ]) { + const start = chatConsoleSource.indexOf(`function ${handler}`) + expect(start).toBeGreaterThan(-1) + const body = chatConsoleSource.slice(start, start + 500) + expect(body).toContain('workerConversationReadOnly.value') + } + }) + + it('passes readonly state into the message list', () => { + expect(chatConsoleSource).toContain(':readonly="workerConversationReadOnly"') + }) +})