The fastest, cheapest, most efficient open-source agent harness. Run more than 500 agents on a $10 VPS.
Rust agent-orchestrationai-agentsai-assistantdesktopllmlocal-firstmcppersonal-aiprivacyrustsecond-braintauri
fix(chat): refuse stale proposal revisions and bind saves to their proposal
M3gA-Minda7fc271dc6b1
diff --git a/app/src/components/chat/WorkflowProposalCard.test.tsx b/app/src/components/chat/WorkflowProposalCard.test.tsxindex 9f3405910b..019035dfae 100644--- a/app/src/components/chat/WorkflowProposalCard.test.tsx+++ b/app/src/components/chat/WorkflowProposalCard.test.tsx@@ -37,6 +37,10 @@ const {vi.mock('../../services/api/flowsApi', () => ({createFlow: (...args: unknown[]) => mockCreateFlow(...args),updateFlow: (...args: unknown[]) => mockUpdateFlow(...args),+ parseFlowVersionConflict: (err: unknown) =>+ err instanceof Error && err.message.includes('version_conflict')+ ? { code: 'version_conflict' }+ : null,setFlowEnabled: (...args: unknown[]) => mockSetFlowEnabled(...args),getApprovalManifest: (...args: unknown[]) => mockGetApprovalManifest(...args),}));@@ -190,7 +194,7 @@ describe('WorkflowProposalCard', () => {// workflow"/"Dismiss".expect(mockDispatch).toHaveBeenCalledTimes(2);expect(mockDispatch).toHaveBeenCalledWith(- markWorkflowProposalSaved({ threadId: 't1', flowId: 'f1' })+ markWorkflowProposalSaved({ threadId: 't1', flowId: 'f1', name: 'Daily standup summary' }));expect(mockDispatch).toHaveBeenCalledWith(markWorkflowProposalCompleted({ threadId: 't1', flowId: 'f1' })@@ -323,7 +327,7 @@ describe('WorkflowProposalCard', () => {// resumes at the enable step instead of creating the flow again.expect(mockDispatch).toHaveBeenCalledTimes(1);expect(mockDispatch).toHaveBeenCalledWith(- markWorkflowProposalSaved({ threadId: 't1', flowId: 'f1' })+ markWorkflowProposalSaved({ threadId: 't1', flowId: 'f1', name: 'Daily standup summary' }));mockSetFlowEnabled.mockResolvedValueOnce({ id: 'f1', enabled: true });@@ -348,7 +352,7 @@ describe('WorkflowProposalCard', () => {name: 'Daily standup summary',enabled: true,});- const p = proposal({ flowId: 'flow-1' });+ const p = proposal({ flowId: 'flow-1', flowVersion: 'v-7' });render(<WorkflowProposalCard threadId="t1" proposal={p} />);fireEvent.click(screen.getByText('chat.flowProposal.save'));await waitFor(() =>@@ -356,12 +360,31 @@ describe('WorkflowProposalCard', () => {name: p.name,graph: p.graph,requireApproval: p.requireApproval,+ expectedVersion: 'v-7',}));expect(mockCreateFlow).not.toHaveBeenCalled();await waitFor(() => expect(screen.getByTestId('workflow-proposal-saved')).toBeInTheDocument());});+ it('refuses a stale revision and says the flow changed instead of overwriting it', async () => {+ mockUpdateFlow.mockRejectedValueOnce(+ new Error(JSON.stringify({ code: 'version_conflict', message: 'stale', current: {} }))+ );+ render(+ <WorkflowProposalCard+ threadId="t1"+ proposal={proposal({ flowId: 'flow-1', flowVersion: 'v-old' })}+ />+ );+ fireEvent.click(screen.getByText('chat.flowProposal.save'));+ await waitFor(() =>+ expect(screen.getByText(/chat\.flowProposal\.versionConflict/)).toBeInTheDocument()+ );+ expect(mockSetFlowEnabled).not.toHaveBeenCalled();+ expect(mockDispatch).not.toHaveBeenCalled();+ });+it('resumes at the enable step for a proposal whose flow was already saved', async () => {render(<WorkflowProposalCard threadId="t1" proposal={proposal({ savedFlowId: 'f1' })} />);fireEvent.click(screen.getByText('chat.flowProposal.save'));@@ -451,7 +474,7 @@ describe('WorkflowProposalCard pre-authorization', () => {markWorkflowProposalCompleted({ threadId: 't1', flowId: 'f1' }));expect(mockDispatch).toHaveBeenCalledWith(- markWorkflowProposalSaved({ threadId: 't1', flowId: 'f1' })+ markWorkflowProposalSaved({ threadId: 't1', flowId: 'f1', name: 'Daily standup summary' }));expect(screen.queryByTestId('workflow-proposal-saved')).not.toBeInTheDocument();});diff --git a/app/src/components/chat/WorkflowProposalCard.tsx b/app/src/components/chat/WorkflowProposalCard.tsxindex c08a5c7826..94f70361d4 100644--- a/app/src/components/chat/WorkflowProposalCard.tsx+++ b/app/src/components/chat/WorkflowProposalCard.tsx@@ -6,7 +6,7 @@ import { useFlowPreauthorization } from '../../hooks/useFlowPreauthorization';import { FLOW_CANVAS_DRAFT_ROUTE, type FlowCanvasDraftState } from '../../lib/flows/canvasDraft';import type { WorkflowGraph } from '../../lib/flows/types';import { useT } from '../../lib/i18n/I18nContext';-import { createFlow, updateFlow } from '../../services/api/flowsApi';+import { createFlow, parseFlowVersionConflict, updateFlow } from '../../services/api/flowsApi';import { threadApi } from '../../services/api/threadApi';import {clearWorkflowProposalForThread,@@ -123,9 +123,7 @@ const WorkflowProposalCard: React.FC<Props> = ({ threadId, proposal, onSaved })// Seeded from `proposal.savedFlowId` (Redux, or the source message's// `saved_flow_id` after a reload) so a remount resumes the enable step// instead of persisting the flow a second time.- const [savedFlowId, setSavedFlowId] = useState<string | null>(- () => proposal.savedFlowId ?? null- );+ const [savedFlowId, setSavedFlowId] = useState<string | null>(() => proposal.savedFlowId ?? null);// Set once the flow is fully persisted AND enabled — the terminal success// state. Non-null swaps the card's body from the editable proposal (name/// trigger/steps/buttons) to a compact saved confirmation with a link into@@ -217,7 +215,14 @@ const WorkflowProposalCard: React.FC<Props> = ({ threadId, proposal, onSaved })*/const markSaved = (flowId: string) => {setSavedFlowId(flowId);- dispatch(markWorkflowProposalSaved({ threadId, flowId }));+ dispatch(+ markWorkflowProposalSaved({+ threadId,+ flowId,+ name: proposal.name,+ sourceMessageId: proposal.sourceMessageId,+ })+ );if (!proposal.sourceMessageId) return;threadApi.updateMessage(threadId, proposal.sourceMessageId, {@@ -275,6 +280,8 @@ const WorkflowProposalCard: React.FC<Props> = ({ threadId, proposal, onSaved })name: proposal.name,graph: proposal.graph,requireApproval: proposal.requireApproval,+ // Refuse to overwrite an edit made after the builder read the flow.+ expectedVersion: proposal.flowVersion,}): await createFlow(proposal.name, proposal.graph, proposal.requireApproval);flowId = flow.id;@@ -314,9 +321,13 @@ const WorkflowProposalCard: React.FC<Props> = ({ threadId, proposal, onSaved })onSaved?.();}} catch (e) {- log('save failed (createFlow/enable): %o', e);+ log('save failed (createFlow/updateFlow/enable): %o', e);setErrorMsg(- flowPersisted ? t('chat.flowProposal.enableError') : t('chat.flowProposal.error')+ flowPersisted+ ? t('chat.flowProposal.enableError')+ : parseFlowVersionConflict(e)+ ? t('chat.flowProposal.versionConflict')+ : t('chat.flowProposal.error'));setSaving(false);}diff --git a/app/src/lib/i18n/ar.ts b/app/src/lib/i18n/ar.tsindex 9793ec1f67..efd7596ce2 100644--- a/app/src/lib/i18n/ar.ts+++ b/app/src/lib/i18n/ar.ts@@ -1616,6 +1616,8 @@ const messages: TranslationMap = {'chat.flowProposal.openInCanvas': 'فتح في اللوحة','chat.flowProposal.dismiss': 'إغلاق','chat.flowProposal.error': 'تعذّر حفظ سير العمل. حاول مرة أخرى.',+ 'chat.flowProposal.versionConflict':+ 'تغيّر سير العمل هذا بعد إعداد الاقتراح، لذا لم تتم الكتابة فوقه. اطلب مراجعة جديدة.','chat.flowProposal.enableError':'تم حفظ سير العمل، لكن تعذّر تفعيله. حاول مرة أخرى، أو فعّله من صفحة سير العمل.','chat.flowProposal.savedConfirmation': 'تم الحفظ',diff --git a/app/src/lib/i18n/bn.ts b/app/src/lib/i18n/bn.tsindex 299efbead1..6ceb21f6a0 100644--- a/app/src/lib/i18n/bn.ts+++ b/app/src/lib/i18n/bn.ts@@ -1642,6 +1642,8 @@ const messages: TranslationMap = {'chat.flowProposal.openInCanvas': 'ক্যানভাসে খুলুন','chat.flowProposal.dismiss': 'খারিজ করুন','chat.flowProposal.error': 'ওয়ার্কফ্লো সংরক্ষণ করা যায়নি। আবার চেষ্টা করুন।',+ 'chat.flowProposal.versionConflict':+ 'প্রস্তাবটি তৈরির পরে এই ওয়ার্কফ্লো পরিবর্তিত হয়েছে, তাই এটি ওভাররাইট করা হয়নি। একটি নতুন সংশোধন চান।','chat.flowProposal.enableError':'ওয়ার্কফ্লো সংরক্ষিত হয়েছে, কিন্তু সক্ষম করা যায়নি। আবার চেষ্টা করুন, বা Workflows পৃষ্ঠা থেকে সক্ষম করুন।','chat.flowProposal.savedConfirmation': 'সংরক্ষিত হয়েছে',diff --git a/app/src/lib/i18n/de.ts b/app/src/lib/i18n/de.tsindex ca731e936c..99d4e6a8fc 100644--- a/app/src/lib/i18n/de.ts+++ b/app/src/lib/i18n/de.ts@@ -1694,6 +1694,8 @@ const messages: TranslationMap = {'chat.flowProposal.dismiss': 'Verwerfen','chat.flowProposal.error':'Der Workflow konnte nicht gespeichert werden. Bitte versuchen Sie es erneut.',+ 'chat.flowProposal.versionConflict':+ 'Dieser Workflow wurde nach dem Vorschlag geändert und daher nicht überschrieben. Fordern Sie eine neue Überarbeitung an.','chat.flowProposal.enableError':'Workflow gespeichert, konnte aber nicht aktiviert werden. Versuchen Sie es erneut oder aktivieren Sie ihn auf der Workflows-Seite.','chat.flowProposal.savedConfirmation': 'Gespeichert',diff --git a/app/src/lib/i18n/en.ts b/app/src/lib/i18n/en.tsindex aa66ef824f..25fdde4ead 100644--- a/app/src/lib/i18n/en.ts+++ b/app/src/lib/i18n/en.ts@@ -1899,6 +1899,8 @@ const en: TranslationMap = {'chat.flowProposal.openInCanvas': 'Open in canvas','chat.flowProposal.dismiss': 'Dismiss','chat.flowProposal.error': 'Could not save the workflow. Please try again.',+ 'chat.flowProposal.versionConflict':+ 'This workflow changed after the proposal was made, so it was not overwritten. Ask for a new revision.','chat.flowProposal.enableError':'Workflow saved, but could not enable it. Try again, or enable it from the Workflows page.',// Terminal success state (issue B36): shown once the flow is saved anddiff --git a/app/src/lib/i18n/es.ts b/app/src/lib/i18n/es.tsindex d11c98b577..e59ffcbbdc 100644--- a/app/src/lib/i18n/es.ts+++ b/app/src/lib/i18n/es.ts@@ -1677,6 +1677,8 @@ const messages: TranslationMap = {'chat.flowProposal.openInCanvas': 'Abrir en el lienzo','chat.flowProposal.dismiss': 'Descartar','chat.flowProposal.error': 'No se pudo guardar el flujo de trabajo. Inténtalo de nuevo.',+ 'chat.flowProposal.versionConflict':+ 'Este flujo de trabajo cambió después de crear la propuesta, así que no se sobrescribió. Pide una nueva revisión.','chat.flowProposal.enableError':'Flujo de trabajo guardado, pero no se pudo activar. Inténtalo de nuevo o actívalo desde la página de Workflows.','chat.flowProposal.savedConfirmation': 'Guardado',diff --git a/app/src/lib/i18n/fr.ts b/app/src/lib/i18n/fr.tsindex 452d86fe69..4d3c93c1e3 100644--- a/app/src/lib/i18n/fr.ts+++ b/app/src/lib/i18n/fr.ts@@ -1685,6 +1685,8 @@ const messages: TranslationMap = {'chat.flowProposal.openInCanvas': 'Ouvrir dans le canevas','chat.flowProposal.dismiss': 'Ignorer','chat.flowProposal.error': "Impossible d'enregistrer le workflow. Veuillez réessayer.",+ 'chat.flowProposal.versionConflict':+ "Ce workflow a été modifié après la proposition, il n'a donc pas été écrasé. Demandez une nouvelle révision.",'chat.flowProposal.enableError':"Workflow enregistré, mais impossible de l'activer. Réessayez, ou activez-le depuis la page Workflows.",'chat.flowProposal.savedConfirmation': 'Enregistré',diff --git a/app/src/lib/i18n/hi.ts b/app/src/lib/i18n/hi.tsindex 3b986ffa1c..7b2c080693 100644--- a/app/src/lib/i18n/hi.ts+++ b/app/src/lib/i18n/hi.ts@@ -1649,6 +1649,8 @@ const messages: TranslationMap = {'chat.flowProposal.openInCanvas': 'कैनवास में खोलें','chat.flowProposal.dismiss': 'खारिज करें','chat.flowProposal.error': 'वर्कफ़्लो सहेजा नहीं जा सका। कृपया फिर से प्रयास करें।',+ 'chat.flowProposal.versionConflict':+ 'प्रस्ताव बनने के बाद यह वर्कफ़्लो बदल गया, इसलिए इसे ओवरराइट नहीं किया गया। नया संशोधन माँगें।','chat.flowProposal.enableError':'वर्कफ़्लो सहेजा गया, लेकिन सक्षम नहीं किया जा सका। फिर से प्रयास करें, या Workflows पेज से इसे सक्षम करें।','chat.flowProposal.savedConfirmation': 'सहेजा गया',diff --git a/app/src/lib/i18n/id.ts b/app/src/lib/i18n/id.tsindex 19a484d7ba..a83a9ac283 100644--- a/app/src/lib/i18n/id.ts+++ b/app/src/lib/i18n/id.ts@@ -1663,6 +1663,8 @@ const messages: TranslationMap = {'chat.flowProposal.openInCanvas': 'Buka di kanvas','chat.flowProposal.dismiss': 'Abaikan','chat.flowProposal.error': 'Alur kerja tidak dapat disimpan. Silakan coba lagi.',+ 'chat.flowProposal.versionConflict':+ 'Alur kerja ini berubah setelah usulan dibuat, jadi tidak ditimpa. Minta revisi baru.','chat.flowProposal.enableError':'Alur kerja disimpan, tetapi tidak dapat diaktifkan. Coba lagi, atau aktifkan dari halaman Workflows.','chat.flowProposal.savedConfirmation': 'Tersimpan',diff --git a/app/src/lib/i18n/it.ts b/app/src/lib/i18n/it.tsindex 69fb3f1861..48977198ea 100644--- a/app/src/lib/i18n/it.ts+++ b/app/src/lib/i18n/it.ts@@ -1673,6 +1673,8 @@ const messages: TranslationMap = {'chat.flowProposal.openInCanvas': 'Apri nel canvas','chat.flowProposal.dismiss': 'Ignora','chat.flowProposal.error': 'Impossibile salvare il workflow. Riprova.',+ 'chat.flowProposal.versionConflict':+ 'Questo workflow è cambiato dopo la proposta, quindi non è stato sovrascritto. Chiedi una nuova revisione.','chat.flowProposal.enableError':'Workflow salvato, ma non è stato possibile attivarlo. Riprova, oppure attivalo dalla pagina Workflows.','chat.flowProposal.savedConfirmation': 'Salvato',diff --git a/app/src/lib/i18n/ja.ts b/app/src/lib/i18n/ja.tsindex 6742885442..ee44b570a1 100644--- a/app/src/lib/i18n/ja.ts+++ b/app/src/lib/i18n/ja.ts@@ -1896,6 +1896,8 @@ const messages: TranslationMap = {'chat.flowProposal.openInCanvas': 'キャンバスで開く','chat.flowProposal.dismiss': '閉じる','chat.flowProposal.error': 'ワークフローを保存できませんでした。もう一度お試しください。',+ 'chat.flowProposal.versionConflict':+ 'この提案の作成後にワークフローが変更されたため、上書きしませんでした。新しい改訂を依頼してください。','chat.flowProposal.enableError':'ワークフローは保存されましたが、有効化できませんでした。もう一度お試しいただくか、ワークフローページから有効化してください。',// Terminal success state (issue B36): shown once the flow is saved anddiff --git a/app/src/lib/i18n/ko.ts b/app/src/lib/i18n/ko.tsindex 4bd3ac08db..914e1eb2d2 100644--- a/app/src/lib/i18n/ko.ts+++ b/app/src/lib/i18n/ko.ts@@ -1630,6 +1630,8 @@ const messages: TranslationMap = {'chat.flowProposal.openInCanvas': '캔버스에서 열기','chat.flowProposal.dismiss': '닫기','chat.flowProposal.error': '워크플로를 저장할 수 없습니다. 다시 시도하세요.',+ 'chat.flowProposal.versionConflict':+ '제안이 만들어진 후 이 워크플로가 변경되어 덮어쓰지 않았습니다. 새 수정안을 요청하세요.','chat.flowProposal.enableError':'워크플로는 저장되었지만 활성화할 수 없습니다. 다시 시도하거나 Workflows 페이지에서 활성화하세요.','chat.flowProposal.savedConfirmation': '저장됨',diff --git a/app/src/lib/i18n/pl.ts b/app/src/lib/i18n/pl.tsindex e06aa90d5f..f4f4bc863f 100644--- a/app/src/lib/i18n/pl.ts+++ b/app/src/lib/i18n/pl.ts@@ -1666,6 +1666,8 @@ const messages: TranslationMap = {'chat.flowProposal.openInCanvas': 'Otwórz na kanwie','chat.flowProposal.dismiss': 'Odrzuć','chat.flowProposal.error': 'Nie udało się zapisać przepływu pracy. Spróbuj ponownie.',+ 'chat.flowProposal.versionConflict':+ 'Ten przepływ pracy zmienił się po utworzeniu propozycji, więc nie został nadpisany. Poproś o nową wersję.','chat.flowProposal.enableError':'Przepływ pracy zapisany, ale nie udało się go włączyć. Spróbuj ponownie lub włącz go na stronie Workflows.','chat.flowProposal.savedConfirmation': 'Zapisano',diff --git a/app/src/lib/i18n/pt.ts b/app/src/lib/i18n/pt.tsindex 480a1f1b77..82c2984e2b 100644--- a/app/src/lib/i18n/pt.ts+++ b/app/src/lib/i18n/pt.ts@@ -1671,6 +1671,8 @@ const messages: TranslationMap = {'chat.flowProposal.openInCanvas': 'Abrir no canvas','chat.flowProposal.dismiss': 'Dispensar','chat.flowProposal.error': 'Não foi possível salvar o fluxo de trabalho. Tente novamente.',+ 'chat.flowProposal.versionConflict':+ 'Este fluxo de trabalho mudou depois que a proposta foi feita, então não foi substituído. Peça uma nova revisão.','chat.flowProposal.enableError':'Fluxo de trabalho salvo, mas não foi possível ativá-lo. Tente novamente ou ative-o na página Workflows.','chat.flowProposal.savedConfirmation': 'Salvo',diff --git a/app/src/lib/i18n/ru.ts b/app/src/lib/i18n/ru.tsindex 0508482908..2847356231 100644--- a/app/src/lib/i18n/ru.ts+++ b/app/src/lib/i18n/ru.ts@@ -1657,6 +1657,8 @@ const messages: TranslationMap = {'chat.flowProposal.openInCanvas': 'Открыть на холсте','chat.flowProposal.dismiss': 'Скрыть','chat.flowProposal.error': 'Не удалось сохранить рабочий процесс. Попробуйте еще раз.',+ 'chat.flowProposal.versionConflict':+ 'Этот рабочий процесс изменился после создания предложения, поэтому он не был перезаписан. Запросите новую редакцию.','chat.flowProposal.enableError':'Рабочий процесс сохранён, но не удалось его включить. Попробуйте ещё раз или включите его на странице Workflows.','chat.flowProposal.savedConfirmation': 'Сохранено',diff --git a/app/src/lib/i18n/tr.ts b/app/src/lib/i18n/tr.tsindex 41629009d8..30f9f0e460 100644--- a/app/src/lib/i18n/tr.ts+++ b/app/src/lib/i18n/tr.ts@@ -1673,6 +1673,8 @@ const messages: TranslationMap = {'chat.flowProposal.openInCanvas': 'Tuvalde aç','chat.flowProposal.dismiss': 'Kapat','chat.flowProposal.error': 'İş akışı kaydedilemedi. Lütfen yeniden deneyin.',+ 'chat.flowProposal.versionConflict':+ 'Bu iş akışı öneri oluşturulduktan sonra değişti, bu yüzden üzerine yazılmadı. Yeni bir revizyon isteyin.','chat.flowProposal.enableError':'İş akışı kaydedildi ancak etkinleştirilemedi. Yeniden deneyin veya İş akışları sayfasından etkinleştirin.','chat.flowProposal.savedConfirmation': 'Kaydedildi',diff --git a/app/src/lib/i18n/zh-CN.ts b/app/src/lib/i18n/zh-CN.tsindex 95b6e9421f..83e16e9034 100644--- a/app/src/lib/i18n/zh-CN.ts+++ b/app/src/lib/i18n/zh-CN.ts@@ -1546,6 +1546,8 @@ const messages: TranslationMap = {'chat.flowProposal.openInCanvas': '在画布中打开','chat.flowProposal.dismiss': '忽略','chat.flowProposal.error': '无法保存该工作流。请重试。',+ 'chat.flowProposal.versionConflict':+ '提案生成后该工作流已被修改,因此未覆盖。请重新请求一个修订版本。','chat.flowProposal.enableError': '工作流已保存,但无法启用。请重试,或在“工作流”页面手动启用。','chat.flowProposal.savedConfirmation': '已保存','chat.flowProposal.viewWorkflow': '查看工作流',diff --git a/app/src/lib/workflows/workflowProposal.ts b/app/src/lib/workflows/workflowProposal.tsindex 90366b66b8..3aa3429e8d 100644--- a/app/src/lib/workflows/workflowProposal.ts+++ b/app/src/lib/workflows/workflowProposal.ts@@ -46,6 +46,9 @@ export function coerceWorkflowProposal(parsed: unknown): WorkflowProposal | nullrequireApproval: obj.require_approval !== false,summary: { trigger: typeof summary.trigger === 'string' ? summary.trigger : '', steps },...(typeof obj.flow_id === 'string' && obj.flow_id ? { flowId: obj.flow_id } : {}),+ ...(typeof obj.flow_version === 'string' && obj.flow_version+ ? { flowVersion: obj.flow_version }+ : {}),};}diff --git a/app/src/providers/ChatRuntimeProvider.tsx b/app/src/providers/ChatRuntimeProvider.tsxindex 000bd8f613..c553f5e9e7 100644--- a/app/src/providers/ChatRuntimeProvider.tsx+++ b/app/src/providers/ChatRuntimeProvider.tsx@@ -1182,10 +1182,18 @@ const ChatRuntimeProvider = ({ children }: { children: React.ReactNode }) => {tool: event.tool_name,name: subagentProposal.name,});+ // The core persists this proposal as message+ // `workflow-proposal:<task_id>` when the worker finishes+ // (`spawn_subagent_surface.rs`). Pointing the card at it lets a+ // save record `saved_flow_id` (and Save/Dismiss mark it consumed)+ // durably, as for a rehydrated proposal.+ const proposalTaskId = event.subagent?.task_id;dispatch(setWorkflowProposalForThread({threadId: event.thread_id,- proposal: subagentProposal,+ proposal: proposalTaskId+ ? { ...subagentProposal, sourceMessageId: `workflow-proposal:${proposalTaskId}` }+ : subagentProposal,}));}diff --git a/app/src/store/__tests__/chatRuntimeSlice.workflowProposal.test.ts b/app/src/store/__tests__/chatRuntimeSlice.workflowProposal.test.tsnew file mode 100644index 0000000000..a5e9fb21c0--- /dev/null+++ b/app/src/store/__tests__/chatRuntimeSlice.workflowProposal.test.ts@@ -0,0 +1,46 @@+import { describe, expect, it } from 'vitest';++import reducer, {+ markWorkflowProposalSaved,+ setWorkflowProposalForThread,+ type WorkflowProposal,+} from '../chatRuntimeSlice';++const proposal = (name: string, sourceMessageId?: string): WorkflowProposal => ({+ name,+ graph: { nodes: [], edges: [] },+ requireApproval: true,+ summary: { trigger: 'manual', steps: [] },+ ...(sourceMessageId ? { sourceMessageId } : {}),+});++const withPending = (p: WorkflowProposal) =>+ reducer(undefined, setWorkflowProposalForThread({ threadId: 't1', proposal: p }));++describe('markWorkflowProposalSaved', () => {+ it('records the saved flow on the proposal that was saved', () => {+ const state = reducer(+ withPending(proposal('Digest', 'm1')),+ markWorkflowProposalSaved({+ threadId: 't1',+ flowId: 'f1',+ name: 'Digest',+ sourceMessageId: 'm1',+ })+ );+ expect(state.pendingWorkflowProposalsByThread.t1?.savedFlowId).toBe('f1');+ });++ it('leaves a newer proposal that replaced it untouched', () => {+ const state = reducer(+ withPending(proposal('Digest v2', 'm2')),+ markWorkflowProposalSaved({+ threadId: 't1',+ flowId: 'f1',+ name: 'Digest',+ sourceMessageId: 'm1',+ })+ );+ expect(state.pendingWorkflowProposalsByThread.t1?.savedFlowId).toBeUndefined();+ });+});diff --git a/app/src/store/chatRuntimeSlice.ts b/app/src/store/chatRuntimeSlice.tsindex 8fb4c8401a..c90ef84ed3 100644--- a/app/src/store/chatRuntimeSlice.ts+++ b/app/src/store/chatRuntimeSlice.ts@@ -818,6 +818,12 @@ export interface WorkflowProposal {* this flow with `flows_update` instead of creating another one.*/flowId?: string;+ /**+ * `flowId`'s `updated_at` when the builder produced this revision+ * (`flow_version` on the payload). Sent as `flows_update`'s+ * `expected_version`, so a save refuses to overwrite a newer edit.+ */+ flowVersion?: string;/*** Id of the flow once "Save & enable" persisted it, before the enable step* finished (pre-authorization pending, denied, or failed). Mirrored into@@ -2613,14 +2619,26 @@ const chatRuntimeSlice = createSlice({},/*** Record that a pending proposal's flow is persisted but not yet enabled- * (see `WorkflowProposal.savedFlowId`). No-op if the proposal was cleared.+ * (see `WorkflowProposal.savedFlowId`). Applied only to the proposal that+ * was saved (same name and source message): a newer proposal that replaced+ * it while the save was in flight must not inherit its flow id. No-op if+ * the proposal was cleared or replaced.*/markWorkflowProposalSaved: (state,- action: PayloadAction<{ threadId: string; flowId: string }>+ action: PayloadAction<{+ threadId: string;+ flowId: string;+ name: string;+ sourceMessageId?: string;+ }>) => {const proposal = state.pendingWorkflowProposalsByThread[action.payload.threadId];- if (proposal) {+ if (+ proposal &&+ proposal.name === action.payload.name &&+ proposal.sourceMessageId === action.payload.sourceMessageId+ ) {proposal.savedFlowId = action.payload.flowId;}},diff --git a/crates/openhuman-core/src/flows/ops/builder_gates.rs b/crates/openhuman-core/src/flows/ops/builder_gates.rsindex aee5ca27c6..7c361a59fa 100644--- a/crates/openhuman-core/src/flows/ops/builder_gates.rs+++ b/crates/openhuman-core/src/flows/ops/builder_gates.rs@@ -218,6 +218,19 @@ pub(crate) async fn build_builder_proposal(payload["draft_id"] = json!(draft_id);}if let Some(flow_id) = flow_id {+ // The version this revision was built against, so a save onto the+ // flow can refuse to overwrite a newer edit (`flows_update`'s+ // `expected_version`). Best-effort: without it the save is+ // last-write-wins, as before.+ match store::get_flow(config, &flow_id) {+ Ok(Some(flow)) => payload["flow_version"] = json!(flow.updated_at),+ Ok(None) => {+ tracing::debug!(target: "flows", %flow_id, "[flows] build_builder_proposal: target flow not found; no version")+ }+ Err(error) => {+ tracing::warn!(target: "flows", %flow_id, %error, "[flows] build_builder_proposal: could not read target flow version")+ }+ }payload["flow_id"] = json!(flow_id);}Ok(payload)diff --git a/crates/openhuman-core/src/flows/ops_agent_binding_tests.rs b/crates/openhuman-core/src/flows/ops_agent_binding_tests.rsindex 1c968436b0..3e0b0d1931 100644--- a/crates/openhuman-core/src/flows/ops_agent_binding_tests.rs+++ b/crates/openhuman-core/src/flows/ops_agent_binding_tests.rs@@ -429,3 +429,41 @@ async fn agent_ref_gate_reads_the_registry_of_the_explicit_context() {"tenant B must not see tenant A's agent: {for_b:?}");}++#[tokio::test]+async fn revision_proposal_carries_the_target_flow_version() {+ // A proposal that revises a saved flow carries that flow's version, so a+ // save onto it can refuse to overwrite a newer edit.+ let tmp = TempDir::new().unwrap();+ let config = test_config(&tmp);+ let g = graph(json!({+ "nodes": [+ { "id": "t", "kind": "trigger", "name": "Manual" },+ { "id": "post", "kind": "tool_call", "name": "Post",+ "config": { "slug": "oh:noop" } }+ ],+ "edges": [ { "from_node": "t", "to_node": "post" } ]+ }));+ let flow = flows_create(&config, "Base".to_string(), g.clone(), false)+ .await+ .unwrap()+ .value;++ let payload = build_builder_proposal(+ &crate::core::runtime::DispatchCtx::ambient(),+ &config,+ "edit_workflow",+ "Base",+ &g,+ false,+ true,+ None,+ None,+ Some(flow.id.clone()),+ )+ .await+ .expect("proposal must succeed for a tool_call-only graph");++ assert_eq!(payload["flow_id"], json!(flow.id));+ assert_eq!(payload["flow_version"], json!(flow.updated_at));+}