From d95ed8c638d44089e7677cf828aad6ddf2c77820 Mon Sep 17 00:00:00 2001 From: christian-byrne Date: Tue, 22 Sep 2026 00:14:01 -0700 Subject: [PATCH 1/2] fix(agent): omit redundant approval workflow name --- src/locales/en/main.json | 1 + .../agent/components/agent/AgentPanel.vue | 1 + .../components/agent/ConversationView.vue | 5 ++++- .../agent/message/AgentMessage.test.ts | 16 +++++++++++++++ .../components/agent/message/AgentMessage.vue | 5 ++++- .../agent/message/AgentMessageGroup.vue | 4 ++++ .../agent/message/RunApprovalCard.vue | 20 ++++++++++++++++--- 7 files changed, 47 insertions(+), 5 deletions(-) diff --git a/src/locales/en/main.json b/src/locales/en/main.json index 8caf989d9c7..0bbcaf318d8 100644 --- a/src/locales/en/main.json +++ b/src/locales/en/main.json @@ -5221,6 +5221,7 @@ "workflowEditNotice": "The agent can now edit {workflow}. It works on 1 workflow at a time, and you can switch workflows during chat.", "runApproval": { "lead": "This tool wants to run the workflow:", + "leadBound": "This tool wants to run this workflow.", "question": "Do you approve?", "thisWorkflow": "this workflow", "cancel": "Cancel", diff --git a/src/workbench/extensions/agent/components/agent/AgentPanel.vue b/src/workbench/extensions/agent/components/agent/AgentPanel.vue index 87ce8b0aa4c..c40fe8e5ac4 100644 --- a/src/workbench/extensions/agent/components/agent/AgentPanel.vue +++ b/src/workbench/extensions/agent/components/agent/AgentPanel.vue @@ -351,6 +351,7 @@ defineExpose({ addAttachment, updateAttachment, removeAttachment }) :editable-turn-id :answering-ask-ids :paywall-presentation + :bound-workflow-id="editableWorkflowId" @edit-prompt="composerRef?.replaceDraft($event)" @feedback="(id, vote) => emit('feedback', id, vote)" @answer-ask=" diff --git a/src/workbench/extensions/agent/components/agent/ConversationView.vue b/src/workbench/extensions/agent/components/agent/ConversationView.vue index cb09357dd4e..0a9e32d56bd 100644 --- a/src/workbench/extensions/agent/components/agent/ConversationView.vue +++ b/src/workbench/extensions/agent/components/agent/ConversationView.vue @@ -24,12 +24,14 @@ const { entries, paywallPresentation = DEFAULT_AGENT_PAYWALL_PRESENTATION, editableTurnId = null, - answeringAskIds = new Set() + answeringAskIds = new Set(), + boundWorkflowId } = defineProps<{ entries: ConversationEntry[] paywallPresentation?: AgentPaywallPresentation editableTurnId?: TurnId | null answeringAskIds?: ReadonlySet + boundWorkflowId?: string }>() const emit = defineEmits<{ feedback: [turnId: string, vote: 'up' | 'down' | null] @@ -115,6 +117,7 @@ watch( :message="entry" :answering-ask-ids :paywall-presentation + :bound-workflow-id @feedback="emit('feedback', entry.id, $event)" @answer-ask=" (askId: string, selection: 'run' | 'cancel') => diff --git a/src/workbench/extensions/agent/components/agent/message/AgentMessage.test.ts b/src/workbench/extensions/agent/components/agent/message/AgentMessage.test.ts index 54fb4644b03..8946e147f81 100644 --- a/src/workbench/extensions/agent/components/agent/message/AgentMessage.test.ts +++ b/src/workbench/extensions/agent/components/agent/message/AgentMessage.test.ts @@ -649,6 +649,22 @@ describe('AgentMessage run approval', () => { } }) + it('omits the redundant workflow name for a 1:1 bound chat', () => { + render(AgentMessage, { + props: { + message: approvalMessage(), + boundWorkflowId: 'workflow-1' + }, + global: { plugins: [i18n] } + }) + + expect( + screen.getByText('This tool wants to run this workflow.') + ).toBeInTheDocument() + expect(screen.queryByText('Portrait workflow')).not.toBeInTheDocument() + expect(screen.getByText('Do you approve?')).toBeInTheDocument() + }) + it.for([ { approval: { workflowName: ' ' }, diff --git a/src/workbench/extensions/agent/components/agent/message/AgentMessage.vue b/src/workbench/extensions/agent/components/agent/message/AgentMessage.vue index 5f56b1a4e16..586d9fb5d6c 100644 --- a/src/workbench/extensions/agent/components/agent/message/AgentMessage.vue +++ b/src/workbench/extensions/agent/components/agent/message/AgentMessage.vue @@ -23,11 +23,13 @@ import type { const { message, answeringAskIds = new Set(), - paywallPresentation = DEFAULT_AGENT_PAYWALL_PRESENTATION + paywallPresentation = DEFAULT_AGENT_PAYWALL_PRESENTATION, + boundWorkflowId } = defineProps<{ message: AssistantMessage answeringAskIds?: ReadonlySet paywallPresentation?: AgentPaywallPresentation + boundWorkflowId?: string }>() const { t } = useI18n() @@ -130,6 +132,7 @@ const status = computed(() => { :activity-parts="activityParts" :answering-ask-ids="answeringAskIds" :paywall-presentation="paywallPresentation" + :bound-workflow-id @answer="(askId, selection) => emit('answerAsk', askId, selection)" @open-workflow=" (workflowId, workflowName) => diff --git a/src/workbench/extensions/agent/components/agent/message/AgentMessageGroup.vue b/src/workbench/extensions/agent/components/agent/message/AgentMessageGroup.vue index da315353b0c..f68d58d3866 100644 --- a/src/workbench/extensions/agent/components/agent/message/AgentMessageGroup.vue +++ b/src/workbench/extensions/agent/components/agent/message/AgentMessageGroup.vue @@ -20,6 +20,7 @@ const { group } = defineProps<{ activityParts: readonly ActivityPart[] answeringAskIds: ReadonlySet paywallPresentation: AgentPaywallPresentation + boundWorkflowId?: string }>() const emit = defineEmits<{ @@ -52,6 +53,9 @@ const emit = defineEmits<{ v-else-if="group.kind === 'runApproval'" :part="group.part" :answering="answeringAskIds.has(group.part.askId)" + :hide-workflow-name=" + !!boundWorkflowId && group.part.workflowId === boundWorkflowId + " @answer="(askId, selection) => emit('answer', askId, selection)" @open-workflow=" (workflowId, workflowName) => diff --git a/src/workbench/extensions/agent/components/agent/message/RunApprovalCard.vue b/src/workbench/extensions/agent/components/agent/message/RunApprovalCard.vue index ee441da6020..707dc548e77 100644 --- a/src/workbench/extensions/agent/components/agent/message/RunApprovalCard.vue +++ b/src/workbench/extensions/agent/components/agent/message/RunApprovalCard.vue @@ -6,9 +6,14 @@ import Button from '@/components/ui/button/Button.vue' import type { RunApprovalPart } from '../../../services/agent/agentMessageParts' -const { part, answering = false } = defineProps<{ +const { + part, + answering = false, + hideWorkflowName = false +} = defineProps<{ part: RunApprovalPart answering?: boolean + hideWorkflowName?: boolean }>() const emit = defineEmits<{ answer: [askId: string, selection: 'run' | 'cancel'] @@ -30,9 +35,18 @@ const workflowLabel = computed( >

- {{ t('agent.runApproval.lead') }} + {{ + t( + hideWorkflowName + ? 'agent.runApproval.leadBound' + : 'agent.runApproval.lead' + ) + }}

-
    +