From c9580a823d4d54a441062711c5f2d9511aa40590 Mon Sep 17 00:00:00 2001 From: Robert0622 <53806540+Robert0622@users.noreply.github.com> Date: Sat, 21 Nov 2026 11:33:05 +0800 Subject: [PATCH] fix(sop): keep streamed node positions when applying edits --- web/orchestrate.js | 8 ++++- webtest/tests/orchestrate-build.test.mjs | 42 ++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/web/orchestrate.js b/web/orchestrate.js index ad30e85f..2b4c27e3 100644 --- a/web/orchestrate.js +++ b/web/orchestrate.js @@ -904,8 +904,11 @@ async function completeAIEdit(build, finalRaw) { } const merged = mergeAIEdit(build.base, finalRaw, build.goal, build.referenced); const oldIds = new Set((build.base.nodes || []).map(node => node.id)); - const onCanvas = new Set((state.workflow.nodes || []).map(node => node.id)); + const onCanvas = new Map((state.workflow.nodes || []).map(node => [node.id, node])); const kept = merged.nodes.filter(node => oldIds.has(node.id) || onCanvas.has(node.id)); + for (const node of kept) { + node.position ??= onCanvas.get(node.id)?.position; + } const keptIds = new Set(kept.map(node => node.id)); const newcomers = merged.nodes.filter(node => !keptIds.has(node.id)); const immediateEdges = merged.edges.filter(edge => keptIds.has(edge.source) && keptIds.has(edge.target)); @@ -913,6 +916,9 @@ async function completeAIEdit(build, finalRaw) { state.workflow = {...merged, nodes: kept.slice(), edges: immediateEdges.slice()}; build.placed = new Map(kept.map(node => [node.id, node])); build.wired = new Set(immediateEdges.map(edge => edge.source + '→' + edge.target)); + // Replace pending streamed edits with the final draft's nodes and edges. + build.queue.length = 0; + build.pendingEdges.length = 0; renderWorkflowMeta(); renderCanvas(); renderProperties(); diff --git a/webtest/tests/orchestrate-build.test.mjs b/webtest/tests/orchestrate-build.test.mjs index 132c75e0..d154058f 100644 --- a/webtest/tests/orchestrate-build.test.mjs +++ b/webtest/tests/orchestrate-build.test.mjs @@ -48,6 +48,48 @@ test('AI edit mode merges existing IDs, adds nodes, and restores failed builds', await settle(); }); +test('AI edit keeps streamed node positions and applies only the final graph', async (t) => { + const app = await loadApp(); + t.after(app.close); + const result = await app.evaluate(` + (async () => { + const build = await beginAIOrchestration('add two approvals'); + const streamedNode = {id: 'first-approval', name: 'First approval', type: 'approval'}; + ingestStreamingWorkflow({nodes: [streamedNode], edges: []}); + await drainAIBuild(); + const placed = state.workflow.nodes.find(node => node.id === streamedNode.id).position; + + const finalNode = {id: 'final-approval', name: 'Final approval', type: 'approval'}; + const finalEdge = {id: 'to-final', source: streamedNode.id, target: finalNode.id, when: 'success'}; + ingestStreamingWorkflow({ + nodes: [{...finalNode, name: 'Preview label'}, {id: 'extra', name: 'Extra', type: 'approval'}], + edges: [{id: 'to-extra', source: finalNode.id, target: 'extra'}], + }); + const completed = await completeAIEdit(build, { + nodes: [...build.base.nodes, streamedNode, finalNode], + edges: [...build.base.edges, finalEdge], + }); + const {nodes, edges} = state.workflow; + const final = nodes.find(node => node.id === finalNode.id); + const first = nodes.find(node => node.id === streamedNode.id); + return { + completed, + keptPosition: first.position.x === placed.x && first.position.y === placed.y, + finalName: final.name, + finalPositioned: Number.isFinite(final.position.x) && Number.isFinite(final.position.y), + hasFinalEdge: edges.some(edge => edge.id === finalEdge.id), + hasExtra: nodes.some(node => node.id === 'extra') || edges.some(edge => edge.id === 'to-extra'), + }; + })() + `); + assert.equal(result.completed, true); + assert.equal(result.keptPosition, true); + assert.equal(result.finalName, 'Final approval'); + assert.equal(result.finalPositioned, true); + assert.equal(result.hasFinalEdge, true); + assert.equal(result.hasExtra, false); +}); + test('preview carry-forward and streaming parser handle partial drafts', async (t) => { const app = await loadApp(); t.after(app.close);