From 3d9ff0ca24a25e71bc9a8fc2405537b01fdd0b61 Mon Sep 17 00:00:00 2001 From: bymyself Date: Sat, 31 Oct 2026 19:24:10 +0000 Subject: [PATCH] [backport core/1.59] fix(agent): keep a first message unsent when its release lands in the update that closes the panel --- .../extensions/agent/AgentPanelRoot.test.ts | 39 +++++++++++++++++++ .../extensions/agent/AgentPanelRoot.vue | 9 +++-- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/src/workbench/extensions/agent/AgentPanelRoot.test.ts b/src/workbench/extensions/agent/AgentPanelRoot.test.ts index f9ab269d235..fad16692285 100644 --- a/src/workbench/extensions/agent/AgentPanelRoot.test.ts +++ b/src/workbench/extensions/agent/AgentPanelRoot.test.ts @@ -9033,6 +9033,45 @@ describe('AgentPanelRoot workflow binding', () => { } ) + it('puts the draft back when App Mode releases the hold in the update that closes the panel', async () => { + Object.assign(useAgentPanelStore(), { enabled: true, isOpen: true }) + makeTab('wf-42') + const bodies = mockMessagesEndpoint('wf-42') + const settleSubmission = vi.spyOn( + useAgentComposerStore(), + 'settleSubmission' + ) + const { unmount } = renderWithSelectedTarget() + await sendHeldByCoach('build me a workflow') + const stopCloseOnAppMode = watch( + () => canvasStore.linearMode, + () => { + useAgentPanelStore().close('close_button') + unmount() + }, + { flush: 'post' } + ) + + try { + canvasStore.linearMode = true + + await waitFor(() => + expect(settleSubmission).toHaveBeenCalledWith( + expect.any(Number), + false + ) + ) + } finally { + stopCloseOnAppMode() + } + expect(bodies).toHaveLength(0) + renderWithSelectedTarget() + expect(await screen.findByRole('textbox')).toHaveTextContent( + 'build me a workflow' + ) + expect(bodies).toHaveLength(0) + }) + it('puts the draft back when consent is cleared before App Mode releases the hold', async () => { makeTab('wf-42') const bodies = mockMessagesEndpoint('wf-42') diff --git a/src/workbench/extensions/agent/AgentPanelRoot.vue b/src/workbench/extensions/agent/AgentPanelRoot.vue index cf2c04e6f53..bbc6f6c78fc 100644 --- a/src/workbench/extensions/agent/AgentPanelRoot.vue +++ b/src/workbench/extensions/agent/AgentPanelRoot.vue @@ -665,6 +665,7 @@ const coachDeferredBy = computed(() => : null ) const coachCompletionWaiters = new Set<(proceed: boolean) => void>() +let coachReleaseRevoked = false function releaseCoachCompletionWaiters(proceed = true): void { for (const resolve of coachCompletionWaiters) resolve(proceed) coachCompletionWaiters.clear() @@ -694,9 +695,10 @@ async function waitForCoachCompletion(): Promise { return true sendHeldByCoach.value = true try { - return await new Promise((resolve) => + const proceed = await new Promise((resolve) => coachCompletionWaiters.add(resolve) ) + return proceed && !coachReleaseRevoked } finally { sendHeldByCoach.value = false } @@ -1589,9 +1591,10 @@ void refreshCloudWorkflowIds() onBeforeUnmount(() => { runPanelTeardown({ releaseCoachCompletionWaiters: () => { - releaseCoachCompletionWaiters( + const proceed = coachDeferredBy.value !== null && agentPanelStore.isVisible - ) + if (!proceed) coachReleaseRevoked = true + releaseCoachCompletionWaiters(proceed) }, invalidateConsentHeldSubmission: () => { if (