From f01f908ccc9f829c261a027e2f0de984f6ef9cfd Mon Sep 17 00:00:00 2001 From: Pipeline Agent Date: Fri, 4 Sep 2026 01:23:42 +0000 Subject: [PATCH 1/5] fix(agent): surface dropped operation results --- .../agent/crdt/CrdtDevPanel.test.ts | 21 +++++++++++++++++++ .../extensions/agent/crdt/CrdtDevPanel.vue | 1 + .../extensions/agent/crdt/devPanelLog.ts | 1 + .../agent/crdt/useAgentCrdtFollower.test.ts | 11 ++++++++++ 4 files changed, 34 insertions(+) diff --git a/src/workbench/extensions/agent/crdt/CrdtDevPanel.test.ts b/src/workbench/extensions/agent/crdt/CrdtDevPanel.test.ts index 014978abef7..396e448b749 100644 --- a/src/workbench/extensions/agent/crdt/CrdtDevPanel.test.ts +++ b/src/workbench/extensions/agent/crdt/CrdtDevPanel.test.ts @@ -198,6 +198,27 @@ describe('CrdtDevPanel', () => { expect(log).not.toContain('ws_out') }) + it('exposes dropped operation results in the event-kind filter', async () => { + const user = userEvent.setup() + recordDevEvent('doc_ops_result', { workflowId: 'wf-1' }) + recordDevEvent('doc_ops_result_dropped', { + reason: 'workflow_mismatch', + frame: { workflowId: 'unknown', ok: false } + }) + renderPanel() + + await user.click(chip()!) + await user.click(screen.getByTestId('crdt-dev-panel-tab-log')) + await user.selectOptions( + screen.getByTestId('crdt-dev-panel-filter'), + 'doc_ops_result_dropped' + ) + + const log = screen.getByTestId('crdt-dev-panel-log').textContent + expect(log).toContain('doc_ops_result_dropped') + expect(log).not.toContain('wf-1') + }) + it('shows the sensitive-source opt-ins as off, and lets them be turned on', async () => { const user = userEvent.setup() renderPanel() diff --git a/src/workbench/extensions/agent/crdt/CrdtDevPanel.vue b/src/workbench/extensions/agent/crdt/CrdtDevPanel.vue index 54a90f3392e..3576372edd1 100644 --- a/src/workbench/extensions/agent/crdt/CrdtDevPanel.vue +++ b/src/workbench/extensions/agent/crdt/CrdtDevPanel.vue @@ -159,6 +159,7 @@ const EVENT_KINDS: readonly DevEventKind[] = [ 'doc_subscribed', 'doc_update', 'doc_ops_result', + 'doc_ops_result_dropped', 'human_ops_settled', 'doc_reset', 'doc_nodes_changed', diff --git a/src/workbench/extensions/agent/crdt/devPanelLog.ts b/src/workbench/extensions/agent/crdt/devPanelLog.ts index 5b919fcaef2..e6111e6dade 100644 --- a/src/workbench/extensions/agent/crdt/devPanelLog.ts +++ b/src/workbench/extensions/agent/crdt/devPanelLog.ts @@ -26,6 +26,7 @@ export type DevEventKind = | 'doc_subscribed' | 'doc_update' | 'doc_ops_result' + | 'doc_ops_result_dropped' | 'human_ops_settled' | 'doc_reset' | 'schema_error' diff --git a/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.test.ts b/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.test.ts index 4255a7e9208..416c2176e3b 100644 --- a/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.test.ts +++ b/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.test.ts @@ -132,6 +132,7 @@ vi.mock(import('@/scripts/app'), () => ({ app: { graph: null, canvas: null } })) +import { recordDevEvent } from './devPanelLog' import { STALE_AFTER_MS, useAgentCrdtFollower } from './useAgentCrdtFollower' import type { AgentCrdtStatus } from './useAgentCrdtFollower' @@ -422,10 +423,20 @@ describe('useAgentCrdtFollower', () => { vi.advanceTimersByTime(3 * 60 * 1000) dispatchFrame('doc_ops_result', { workflowId: 'wf-2', ok: true }) expect(persistedRecord()?.expiresAt).toBe(stampedAt) + expect(recordDevEvent).toHaveBeenCalledWith('doc_ops_result_dropped', { + reason: 'workflow_mismatch', + subscribedWorkflowId: 'wf-1', + frame: { workflowId: 'wf-2', ok: true } + }) isTargetActive.value = false dispatchFrame('doc_ops_result', { workflowId: 'wf-1', ok: true }) expect(persistedRecord()?.expiresAt).toBe(stampedAt) + expect(recordDevEvent).toHaveBeenCalledWith('doc_ops_result_dropped', { + reason: 'inactive_target', + subscribedWorkflowId: 'wf-1', + frame: { workflowId: 'wf-1', ok: true } + }) isTargetActive.value = true dispatchFrame('doc_ops_result', { workflowId: 'wf-1', ok: true }) From 1a679b9d1da15a747327a6d202b8c1d391ecaed2 Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Thu, 3 Sep 2026 19:14:37 -0700 Subject: [PATCH 2/5] test: use a realistic dropped-result fixture in the dev panel filter test --- .../extensions/agent/crdt/CrdtDevPanel.test.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/workbench/extensions/agent/crdt/CrdtDevPanel.test.ts b/src/workbench/extensions/agent/crdt/CrdtDevPanel.test.ts index 396e448b749..bb3fbaf843a 100644 --- a/src/workbench/extensions/agent/crdt/CrdtDevPanel.test.ts +++ b/src/workbench/extensions/agent/crdt/CrdtDevPanel.test.ts @@ -200,10 +200,15 @@ describe('CrdtDevPanel', () => { it('exposes dropped operation results in the event-kind filter', async () => { const user = userEvent.setup() - recordDevEvent('doc_ops_result', { workflowId: 'wf-1' }) + recordDevEvent('doc_ops_result', { + workflowId: 'wf-1', + ok: true, + applied: ['op-kept'] + }) recordDevEvent('doc_ops_result_dropped', { reason: 'workflow_mismatch', - frame: { workflowId: 'unknown', ok: false } + subscribedWorkflowId: 'wf-1', + frame: { workflowId: 'wf-2', ok: true, applied: ['op-stale'] } }) renderPanel() @@ -216,7 +221,8 @@ describe('CrdtDevPanel', () => { const log = screen.getByTestId('crdt-dev-panel-log').textContent expect(log).toContain('doc_ops_result_dropped') - expect(log).not.toContain('wf-1') + expect(log).toContain('op-stale') + expect(log).not.toContain('op-kept') }) it('shows the sensitive-source opt-ins as off, and lets them be turned on', async () => { From 5f1e81ef8e6bd95081c527d7f7e6729e7b8b3142 Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Sun, 13 Sep 2026 05:19:48 -0700 Subject: [PATCH 3/5] fix(agent): preserve dropped result subscription identity --- .../agent/crdt/useAgentCrdtFollower.test.ts | 20 +++++++++++++++---- .../agent/crdt/useAgentCrdtFollower.ts | 20 +++++++++++++++---- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.test.ts b/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.test.ts index 416c2176e3b..df4084d6fb4 100644 --- a/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.test.ts +++ b/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.test.ts @@ -413,9 +413,9 @@ describe('useAgentCrdtFollower', () => { unmount() }) - it('FEC-5: only active-workflow op results slide the persisted expiry', () => { + it('FEC-5: only active-workflow op results slide the persisted expiry', async () => { vi.useFakeTimers() - const { isTargetActive, unmount } = mountFollower('wf-1') + const { workflowId, isTargetActive, unmount } = mountFollower('wf-1') dispatchFrame('doc_subscribed', { ok: true }) const stampedAt = persistedRecord()?.expiresAt expect(stampedAt).toBeTypeOf('number') @@ -425,11 +425,21 @@ describe('useAgentCrdtFollower', () => { expect(persistedRecord()?.expiresAt).toBe(stampedAt) expect(recordDevEvent).toHaveBeenCalledWith('doc_ops_result_dropped', { reason: 'workflow_mismatch', - subscribedWorkflowId: 'wf-1', + subscribedWorkflowId: 'wf-2', frame: { workflowId: 'wf-2', ok: true } }) + workflowId.value = 'wf-2' + await nextTick() + dispatchFrame('doc_ops_result', { workflowId: 'wf-1', ok: true }) + expect(recordDevEvent).toHaveBeenCalledWith('doc_ops_result_dropped', { + reason: 'workflow_mismatch', + subscribedWorkflowId: 'wf-1', + frame: { workflowId: 'wf-1', ok: true } + }) + isTargetActive.value = false + await nextTick() dispatchFrame('doc_ops_result', { workflowId: 'wf-1', ok: true }) expect(persistedRecord()?.expiresAt).toBe(stampedAt) expect(recordDevEvent).toHaveBeenCalledWith('doc_ops_result_dropped', { @@ -439,7 +449,9 @@ describe('useAgentCrdtFollower', () => { }) isTargetActive.value = true - dispatchFrame('doc_ops_result', { workflowId: 'wf-1', ok: true }) + await nextTick() + dispatchFrame('doc_subscribed', { ok: true }) + dispatchFrame('doc_ops_result', { workflowId: 'wf-2', ok: true }) expect(persistedRecord()?.expiresAt).toBeGreaterThan(stampedAt ?? 0) unmount() }) diff --git a/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.ts b/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.ts index 675f2238318..d8acecf52d4 100644 --- a/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.ts +++ b/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.ts @@ -210,11 +210,23 @@ export function useAgentCrdtFollower( const onOpsResult: EventListener = (event) => { if (!(event instanceof CustomEvent)) return const detail = event.detail as { workflowId?: unknown } | null - if ( - !isTargetActive.value || - detail?.workflowId !== subscribedWorkflowId.value - ) + const resultSubscriptionId = + typeof detail?.workflowId === 'string' + ? detail.workflowId + : subscribedWorkflowId.value + const dropReason = !isTargetActive.value + ? 'inactive_target' + : detail?.workflowId !== subscribedWorkflowId.value + ? 'workflow_mismatch' + : null + if (dropReason !== null) { + recordDevEvent('doc_ops_result_dropped', { + reason: dropReason, + subscribedWorkflowId: resultSubscriptionId, + frame: event.detail ?? null + }) return + } lifecycle.onDocumentResult() lastFrameType.value = event.type recordDevEvent('doc_ops_result', event.detail ?? null) From 805291ebd48d4509b877f8ce112b07df2f93ee59 Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Mon, 14 Sep 2026 20:12:25 -0700 Subject: [PATCH 4/5] refactor(agent): simplify dropped result classification --- .../agent/crdt/useAgentCrdtFollower.test.ts | 6 ++--- .../agent/crdt/useAgentCrdtFollower.ts | 27 ++++++++++++------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.test.ts b/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.test.ts index df4084d6fb4..f2a65941221 100644 --- a/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.test.ts +++ b/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.test.ts @@ -425,7 +425,7 @@ describe('useAgentCrdtFollower', () => { expect(persistedRecord()?.expiresAt).toBe(stampedAt) expect(recordDevEvent).toHaveBeenCalledWith('doc_ops_result_dropped', { reason: 'workflow_mismatch', - subscribedWorkflowId: 'wf-2', + subscribedWorkflowId: 'wf-1', frame: { workflowId: 'wf-2', ok: true } }) @@ -434,7 +434,7 @@ describe('useAgentCrdtFollower', () => { dispatchFrame('doc_ops_result', { workflowId: 'wf-1', ok: true }) expect(recordDevEvent).toHaveBeenCalledWith('doc_ops_result_dropped', { reason: 'workflow_mismatch', - subscribedWorkflowId: 'wf-1', + subscribedWorkflowId: 'wf-2', frame: { workflowId: 'wf-1', ok: true } }) @@ -444,7 +444,7 @@ describe('useAgentCrdtFollower', () => { expect(persistedRecord()?.expiresAt).toBe(stampedAt) expect(recordDevEvent).toHaveBeenCalledWith('doc_ops_result_dropped', { reason: 'inactive_target', - subscribedWorkflowId: 'wf-1', + subscribedWorkflowId: null, frame: { workflowId: 'wf-1', ok: true } }) diff --git a/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.ts b/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.ts index d8acecf52d4..f957291babe 100644 --- a/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.ts +++ b/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.ts @@ -71,6 +71,17 @@ export interface AgentCrdtStatus { outcomes: AgentCrdtOutcomeCounters } +type OpsResultDropReason = 'inactive_target' | 'workflow_mismatch' + +function opsResultDropReason( + active: boolean, + workflowId: unknown, + subscribedWorkflowId: string | null +): OpsResultDropReason | null { + if (!active) return 'inactive_target' + return workflowId === subscribedWorkflowId ? null : 'workflow_mismatch' +} + export function useAgentCrdtFollower( workflowId: Ref, graphMutations: MutationsForTarget, @@ -210,19 +221,15 @@ export function useAgentCrdtFollower( const onOpsResult: EventListener = (event) => { if (!(event instanceof CustomEvent)) return const detail = event.detail as { workflowId?: unknown } | null - const resultSubscriptionId = - typeof detail?.workflowId === 'string' - ? detail.workflowId - : subscribedWorkflowId.value - const dropReason = !isTargetActive.value - ? 'inactive_target' - : detail?.workflowId !== subscribedWorkflowId.value - ? 'workflow_mismatch' - : null + const dropReason = opsResultDropReason( + isTargetActive.value, + detail?.workflowId, + subscribedWorkflowId.value + ) if (dropReason !== null) { recordDevEvent('doc_ops_result_dropped', { reason: dropReason, - subscribedWorkflowId: resultSubscriptionId, + subscribedWorkflowId: subscribedWorkflowId.value, frame: event.detail ?? null }) return From 5a529d37e59e85bd6b0e4ee149f29419d1e57c37 Mon Sep 17 00:00:00 2001 From: Amp Date: Mon, 12 Oct 2026 08:44:07 +0000 Subject: [PATCH 5/5] test: assert dropped op results in the real dev log Exercise the follower through the real devPanelLog so the dropped-result test proves the full frame, reason, and subscribed target survive sanitization. Allow the two structural diagnostic keys through the sanitizer and drop the panel test the shared kind-filter test covers. --- .../agent/crdt/CrdtDevPanel.test.ts | 27 ------- .../extensions/agent/crdt/devPanelLog.ts | 2 + .../agent/crdt/useAgentCrdtFollower.test.ts | 76 ++++++++++++------- 3 files changed, 49 insertions(+), 56 deletions(-) diff --git a/src/workbench/extensions/agent/crdt/CrdtDevPanel.test.ts b/src/workbench/extensions/agent/crdt/CrdtDevPanel.test.ts index 7e2cf0695e9..0076da2f51a 100644 --- a/src/workbench/extensions/agent/crdt/CrdtDevPanel.test.ts +++ b/src/workbench/extensions/agent/crdt/CrdtDevPanel.test.ts @@ -208,33 +208,6 @@ describe('CrdtDevPanel', () => { expect(log).not.toContain('ws_out') }) - it('exposes dropped operation results in the event-kind filter', async () => { - const user = userEvent.setup() - recordDevEvent('doc_ops_result', { - workflowId: 'wf-1', - ok: true, - applied: ['op-kept'] - }) - recordDevEvent('doc_ops_result_dropped', { - reason: 'workflow_mismatch', - subscribedWorkflowId: 'wf-1', - frame: { workflowId: 'wf-2', ok: true, applied: ['op-stale'] } - }) - renderPanel() - - await user.click(chip()!) - await user.click(screen.getByTestId('crdt-dev-panel-tab-log')) - await user.selectOptions( - screen.getByTestId('crdt-dev-panel-filter'), - 'doc_ops_result_dropped' - ) - - const log = screen.getByTestId('crdt-dev-panel-log').textContent - expect(log).toContain('doc_ops_result_dropped') - expect(log).toContain('wf-2') - expect(log).not.toContain('wf-1') - }) - it('lists the materialization event in the kind filter and filters by it', async () => { const user = userEvent.setup() recordDevEvent('doc_update', { seq: 1 }, { scope: 'doc' }) diff --git a/src/workbench/extensions/agent/crdt/devPanelLog.ts b/src/workbench/extensions/agent/crdt/devPanelLog.ts index 9f7a17723ee..d7019657575 100644 --- a/src/workbench/extensions/agent/crdt/devPanelLog.ts +++ b/src/workbench/extensions/agent/crdt/devPanelLog.ts @@ -103,6 +103,7 @@ const STRUCTURAL_STRING_KEYS = new Set([ 'outcome', 'phase', 'prompt_id', + 'reason', 'removed', 'scope', 'seq', @@ -111,6 +112,7 @@ const STRUCTURAL_STRING_KEYS = new Set([ 'source', 'state', 'status', + 'subscribed_workflow_id', 'tab', 'tab_id', 'target', diff --git a/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.test.ts b/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.test.ts index 517e42ebae5..1ce5c6e7048 100644 --- a/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.test.ts +++ b/src/workbench/extensions/agent/crdt/useAgentCrdtFollower.test.ts @@ -160,10 +160,7 @@ vi.mock(import('./agentSubgraphDefinitions'), () => ({ readSubgraphDefinitions: definitionsState.readSubgraphDefinitions })) -vi.mock(import('./devPanelLog'), () => ({ - recordDevEvent: vi.fn(), - sanitizeDevEventDetail: vi.fn((detail: unknown) => detail) -})) +vi.mock(import('./devPanelLog'), { spy: true }) vi.mock(import('@/platform/telemetry/reportError'), () => ({ reportError: telemetryState.reportError @@ -175,7 +172,7 @@ vi.mock(import('@/scripts/app'), () => ({ })) import { SUBSCRIBE_ACK_TIMEOUT_MS } from './agentCrdtDocLifecycle' -import { recordDevEvent } from './devPanelLog' +import { clearDevEvents, devEvents } from './devPanelLog' import { STALE_AFTER_MS, SUBSCRIBE_CATCHUP_GRACE_MS, @@ -645,9 +642,9 @@ describe('useAgentCrdtFollower', () => { unmount() }) - it('FEC-5: only active-workflow op results slide the persisted expiry', async () => { + it('FEC-5: only active-workflow op results slide the persisted expiry', () => { vi.useFakeTimers() - const { workflowId, isTargetActive, unmount } = mountFollower('wf-1') + const { isTargetActive, unmount } = mountFollower('wf-1') dispatchFrame('doc_subscribed', { ok: true }) const stampedAt = persistedRecord()?.expiresAt expect(stampedAt).toBeTypeOf('number') @@ -655,36 +652,57 @@ describe('useAgentCrdtFollower', () => { vi.advanceTimersByTime(3 * 60 * 1000) dispatchFrame('doc_ops_result', { workflowId: 'wf-2', ok: true }) expect(persistedRecord()?.expiresAt).toBe(stampedAt) - expect(recordDevEvent).toHaveBeenCalledWith('doc_ops_result_dropped', { - reason: 'workflow_mismatch', - subscribedWorkflowId: 'wf-1', - frame: { workflowId: 'wf-2', ok: true } - }) - - workflowId.value = 'wf-2' - await nextTick() - dispatchFrame('doc_ops_result', { workflowId: 'wf-1', ok: true }) - expect(recordDevEvent).toHaveBeenCalledWith('doc_ops_result_dropped', { - reason: 'workflow_mismatch', - subscribedWorkflowId: 'wf-2', - frame: { workflowId: 'wf-1', ok: true } - }) isTargetActive.value = false - await nextTick() dispatchFrame('doc_ops_result', { workflowId: 'wf-1', ok: true }) expect(persistedRecord()?.expiresAt).toBe(stampedAt) - expect(recordDevEvent).toHaveBeenCalledWith('doc_ops_result_dropped', { - reason: 'inactive_target', - subscribedWorkflowId: null, - frame: { workflowId: 'wf-1', ok: true } - }) isTargetActive.value = true - await nextTick() + dispatchFrame('doc_ops_result', { workflowId: 'wf-1', ok: true }) + expect(persistedRecord()?.expiresAt).toBeGreaterThan(stampedAt ?? 0) + unmount() + }) + + it('logs each dropped op result with its reason, subscribed target, and frame', async () => { + clearDevEvents() + const { workflowId, isTargetActive, unmount } = mountFollower('wf-1') dispatchFrame('doc_subscribed', { ok: true }) + const staleFailure = { + workflowId: 'wf-2', + ok: false, + skipped: ['op-2'], + failed: { op_id: 'op-2', code: 'unknown_node' } + } + + dispatchFrame('doc_ops_result', staleFailure) + workflowId.value = 'wf-2' + await nextTick() + dispatchFrame('doc_ops_result', { workflowId: 'wf-1', ok: true }) + isTargetActive.value = false + await nextTick() dispatchFrame('doc_ops_result', { workflowId: 'wf-2', ok: true }) - expect(persistedRecord()?.expiresAt).toBeGreaterThan(stampedAt ?? 0) + + expect( + devEvents.value + .filter((event) => event.kind === 'doc_ops_result_dropped') + .map((event) => event.detail) + ).toEqual([ + { + reason: 'workflow_mismatch', + subscribedWorkflowId: 'wf-1', + frame: staleFailure + }, + { + reason: 'workflow_mismatch', + subscribedWorkflowId: 'wf-2', + frame: { workflowId: 'wf-1', ok: true } + }, + { + reason: 'inactive_target', + subscribedWorkflowId: null, + frame: { workflowId: 'wf-2', ok: true } + } + ]) unmount() })