diff --git a/browser_tests/fixtures/agentWorkflowSelectionFixture.ts b/browser_tests/fixtures/agentWorkflowSelectionFixture.ts index 3f479aeb2d3..36afd8e815e 100644 --- a/browser_tests/fixtures/agentWorkflowSelectionFixture.ts +++ b/browser_tests/fixtures/agentWorkflowSelectionFixture.ts @@ -16,6 +16,28 @@ type WorkflowSelection = { workflowLookups: () => number } +function moveSavedWorkflow( + source: string, + destination: string, + savedContent: Map, + savedFiles: UserDataFullInfo[], + workflows: CloudWorkflowEntry[] +): UserDataFullInfo | undefined { + const content = savedContent.get(source) + const file = savedFiles.find((item) => item.path === source) + const workflow = workflows.find( + (item) => item.name === source.slice('workflows/'.length, -'.json'.length) + ) + if (content === undefined || !file || !workflow) return + + savedContent.delete(source) + savedContent.set(destination, content) + file.path = destination + file.modified = Date.now() + workflow.name = destination.slice('workflows/'.length, -'.json'.length) + return file +} + export const workflowSelectionTest = base.extend<{ nodeDefinitions: Record | undefined workflowSelection: WorkflowSelection @@ -116,6 +138,24 @@ export const workflowSelectionTest = base.extend<{ savedContent.set(path, route.request().postData() ?? '{}') return route.fulfill(jsonRoute(file)) }) + await page.route('**/api/userdata/*/move/*', (route) => { + if (route.request().method() !== 'POST') return route.fallback() + const path = decodeURIComponent( + new URL(route.request().url()).pathname.split('/userdata/')[1] + ) + const moveSeparator = '/move/' + const moveIndex = path.indexOf(moveSeparator) + const movedFile = moveSavedWorkflow( + path.slice(0, moveIndex), + path.slice(moveIndex + moveSeparator.length), + savedContent, + savedFiles, + workflows + ) + return movedFile + ? route.fulfill(jsonRoute(movedFile)) + : route.fulfill({ status: 404 }) + }) await page.route('**/api/userdata/*', (route) => { const path = decodeURIComponent( new URL(route.request().url()).pathname.split('/userdata/')[1] diff --git a/browser_tests/tests/agent/agentInlineReferences.spec.ts b/browser_tests/tests/agent/agentInlineReferences.spec.ts index 7deb81ebb51..b5d0181a6cf 100644 --- a/browser_tests/tests/agent/agentInlineReferences.spec.ts +++ b/browser_tests/tests/agent/agentInlineReferences.spec.ts @@ -2,12 +2,15 @@ import { expect } from '@playwright/test' import enMessages from '@/locales/en/main.json' with { type: 'json' } import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { WorkflowsSidebarTab } from '@e2e/fixtures/components/SidebarTab' +import { Topbar } from '@e2e/fixtures/components/Topbar' import { inlineReferencesTest as test, referenceNode, referenceWorkflow } from '@e2e/fixtures/agentInlineReferencesFixture' import { assetPath } from '@e2e/fixtures/utils/paths' +import { VueNodeHelpers } from '@e2e/fixtures/VueNodeHelpers' test.use({ connectWebSocketToServer: false, @@ -107,3 +110,80 @@ test( ).toHaveText('Unsaved Workflow (2)') } ) + +test( + 'keeps a node reference through workflow rename, reload, and panel remount without selecting the canvas node', + { tag: ['@cloud', '@canvas', '@node', '@ui', '@vue-nodes'] }, + async ({ page, workflowSelection }) => { + // Source: https://github.com/Comfy-Org/ComfyUI_frontend/pull/20172#discussion_r4204941442 + await page.locator('#comfy-file-input').setInputFiles({ + name: 'Portrait study.json', + mimeType: 'application/json', + buffer: Buffer.from(JSON.stringify(referenceWorkflow)) + }) + const panel = new AgentPanel(page) + const editor = (await panel.open()).getByRole('textbox') + await panel.workflowPicker.click() + await page.getByRole('menuitemradio', { name: /Portrait study/ }).click() + await expect.poll(() => workflowSelection.savedPaths.length).toBe(1) + workflowSelection.finishSave(true) + + await editor.fill('Inspect @') + await panel.root + .getByRole('menuitem', { name: enMessages.agent.nodes, exact: true }) + .click() + await panel.root.getByRole('menuitem', { name: /Color balance/ }).click() + await expect( + panel.root.getByRole('button', { + name: 'Remove Color balance #12 reference' + }) + ).toBeVisible() + + const workflowsTab = new WorkflowsSidebarTab(page) + await workflowsTab.open() + await workflowsTab.renameWorkflow( + workflowsTab.getPersistedItem('Portrait study'), + 'Portrait renamed' + ) + await expect(panel.workflowPicker).toHaveText('Portrait renamed') + await expect( + panel.root.getByRole('button', { + name: 'Remove Color balance #12 reference' + }) + ).toBeVisible() + await workflowsTab.close() + + await panel.close() + const vueNodes = new VueNodeHelpers(page) + await vueNodes.renameNode('12', 'Portrait color balance') + await expect( + vueNodes.getNodeLocator('12').getByTestId('node-title') + ).toHaveText('Portrait color balance') + await vueNodes + .getNodeLocator('12') + .getByTestId('node-title') + .click({ modifiers: ['Control'] }) + await expect(vueNodes.selectedNodes).toHaveCount(0) + + const topbar = new Topbar(page) + await topbar.getWorkflowTab('Unsaved Workflow').click() + await expect( + topbar.getWorkflowTab('Unsaved Workflow').and(topbar.getActiveTab()) + ).toBeVisible() + await topbar.getWorkflowTab('Portrait renamed').click() + await expect( + topbar.getWorkflowTab('Portrait renamed').and(topbar.getActiveTab()) + ).toBeVisible() + await expect( + vueNodes.getNodeLocator('12').getByTestId('node-title') + ).toHaveText('Portrait color balance') + + await expect(vueNodes.selectedNodes).toHaveCount(0) + await panel.open() + await expect( + panel.root.getByRole('button', { + name: 'Remove Portrait color balance #12 reference' + }) + ).toBeVisible() + } +) diff --git a/docs/adr/AGENT-SELECTION-0040-composer-owns-node-references.md b/docs/adr/AGENT-SELECTION-0040-composer-owns-node-references.md new file mode 100644 index 00000000000..827897647cb --- /dev/null +++ b/docs/adr/AGENT-SELECTION-0040-composer-owns-node-references.md @@ -0,0 +1,56 @@ +# ADR-AGENT-SELECTION-0040: Composer Owns Node References + +Date: 2026-10-05 + +## Status + +Proposed + +## Context + +Canvas selection and prompt references have different lifetimes. A reference +can outlive picking, panel closure, or a graph reload. Keeping another copy +in `agentNodeSelectionStore`, keyed by workflow path, required a restore +handshake with canvas selection and broke when a workflow was renamed. + +## Decision + +Use `agentComposerStore` as the only owner of draft node references. Scope +them by the workflow's session-stable `instanceId`, not its mutable path. +After a graph load, revalidate matching references against the root graph, +including subgraph locators, without restoring canvas selection. + +Keep transient picking state in `canvasStore`. The existing injected +interaction-mode reader continues to enforce select-only behavior. Stop +tracking before deselecting so exiting does not erase prompt references. +The banner owns Escape; presentation derives visibility without changing +minimap or sidebar preferences. + +This replaces the store ownership specified in +[ADR-CANVAS-INTERACTION-0035](CANVAS-INTERACTION-0035-agent-node-picking-policy.md), +not its input guards. Canvas selection remains owned as specified in +[ADR-CANVAS-SELECTION-0028](CANVAS-SELECTION-0028-single-selection-store.md). + +## Alternatives considered + +- Repair path-key migration in the old store. This fixes rename but keeps + two writable copies of draft references and the restore handshake. +- Use canvas selection as the draft. This loses references when selection + is cleared or the visible graph changes. +- Keep a separate picker store. After removing persistence and preference + restoration, its remaining state belongs to the existing canvas owner. + +## Consequences + +### Positive + +- Rename and graph reload no longer require a parallel reference cache. +- Closing the panel does not prevent reference revalidation. +- Picking does not write user preferences that later need restoration. + +### Negative + +- Graph-load integration still needs to know which workflow owns the draft. +- The minimap remains hidden throughout picking, even if its preference is + toggled; the current preference takes effect when picking ends. +- `instanceId` is a session identity, not a cross-reload persistence key. diff --git a/docs/adr/README.md b/docs/adr/README.md index a39c07929ea..64f74e27647 100644 --- a/docs/adr/README.md +++ b/docs/adr/README.md @@ -14,6 +14,7 @@ An Architecture Decision Record captures an important architectural decision mad | [AGENT-CONTEXT-0028](AGENT-CONTEXT-0028-separate-workflow-references-from-editor-tabs.md) | Separate Workflow References from Editor Tabs | Proposed | 2026-09-07 | | [AGENT-HISTORY-0038](AGENT-HISTORY-0038-wait-for-chat-and-workflow-readiness.md) | Wait for Chat and Workflow Readiness | Proposed | 2026-09-25 | | [AGENT-OBSERVABILITY-0034](AGENT-OBSERVABILITY-0034-frontend-journey-effect-contract.md) | Frontend Journey Effect Contract | Proposed | 2026-09-17 | +| [AGENT-SELECTION-0040](AGENT-SELECTION-0040-composer-owns-node-references.md) | Composer Owns Node References | Proposed | 2026-10-05 | | [AGENT-SESSION-0028](AGENT-SESSION-0028-compose-turn-origin-and-account-generation.md) | Compose Turn Origin and Account Generation | Proposed | 2026-09-05 | | [AGENT-TARGET-0037](AGENT-TARGET-0037-commit-workflow-target-on-send-or-node-reference.md) | Commit Workflow Target on Explicit User Intent | Proposed | 2026-09-24 | | [ASSETS-DRAG-DROP-0035](ASSETS-DRAG-DROP-0035-asset-card-drag-uses-file-url.md) | Asset Card Drag-and-Drop Uses the File URL, Never the Preview URL | Proposed | 2026-09-19 | diff --git a/src/components/LiteGraphCanvasSplitterOverlay.test.ts b/src/components/LiteGraphCanvasSplitterOverlay.test.ts index 5225cc00cec..f951e8fe5ff 100644 --- a/src/components/LiteGraphCanvasSplitterOverlay.test.ts +++ b/src/components/LiteGraphCanvasSplitterOverlay.test.ts @@ -7,7 +7,7 @@ import { createI18n } from 'vue-i18n' import LiteGraphCanvasSplitterOverlay from '@/components/LiteGraphCanvasSplitterOverlay.vue' import { useSettingStore } from '@/platform/settings/settingStore' -import { useAgentNodeSelectionStore } from '@/stores/agentNodeSelectionStore' +import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import { useAgentPanelStore } from '@/workbench/extensions/agent/stores/agent/agentPanelStore' import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore' import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore' @@ -76,9 +76,9 @@ describe('LiteGraphCanvasSplitterOverlay', () => { 'properties value' ) - useAgentNodeSelectionStore().enter() + useCanvasStore().isPickingNodes = true await nextTick() - useAgentNodeSelectionStore().exit() + useCanvasStore().stopNodePicking() await nextTick() expect(screen.getByRole('textbox', { name: 'Sidebar draft' })).toHaveValue( @@ -188,7 +188,7 @@ describe('LiteGraphCanvasSplitterOverlay', () => { expect(screen.getByTestId('right-panel')).toBeInTheDocument() expect(screen.getByTestId('bottom-panel')).toBeInTheDocument() - useAgentNodeSelectionStore().enter() + useCanvasStore().isPickingNodes = true await nextTick() expect(screen.getByTestId('workflow-tabs')).toBeInTheDocument() @@ -199,7 +199,7 @@ describe('LiteGraphCanvasSplitterOverlay', () => { expect(screen.getByTestId('graph')).toBeInTheDocument() expect(screen.getByTestId('agent-panel')).toBeInTheDocument() - useAgentNodeSelectionStore().exit() + useCanvasStore().stopNodePicking() await nextTick() expect(screen.getByTestId('topmenu')).toBeInTheDocument() diff --git a/src/components/LiteGraphCanvasSplitterOverlay.vue b/src/components/LiteGraphCanvasSplitterOverlay.vue index baca5cbe7f0..0d39e04c806 100644 --- a/src/components/LiteGraphCanvasSplitterOverlay.vue +++ b/src/components/LiteGraphCanvasSplitterOverlay.vue @@ -223,7 +223,7 @@ import { SIDE_TOOLBAR_WIDTH } from '@/constants/splitterConstants' import { useSettingStore } from '@/platform/settings/settingStore' -import { useAgentNodeSelectionStore } from '@/stores/agentNodeSelectionStore' +import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore' import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore' import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore' @@ -250,9 +250,8 @@ const unifiedWidth = computed(() => ) const { focusMode } = storeToRefs(workspaceStore) -const { isActive: agentNodeSelectionActive } = storeToRefs( - useAgentNodeSelectionStore() -) +const { isPickingNodes: agentNodeSelectionActive } = + storeToRefs(useCanvasStore()) const { isSelectMode, isBuilderMode } = useAppMode() const { activeSidebarTabId, activeSidebarTab } = storeToRefs(sidebarTabStore) diff --git a/src/components/TopMenuSection.test.ts b/src/components/TopMenuSection.test.ts index 8e41dc6d487..477d1bd80bf 100644 --- a/src/components/TopMenuSection.test.ts +++ b/src/components/TopMenuSection.test.ts @@ -29,7 +29,7 @@ import type { } from '@/platform/remote/comfyui/jobs/jobTypes' import { useSettingStore } from '@/platform/settings/settingStore' import { useReleaseStore } from '@/platform/updates/common/releaseStore' -import { useAgentNodeSelectionStore } from '@/stores/agentNodeSelectionStore' +import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import { useCommandStore } from '@/stores/commandStore' import { useExecutionStore } from '@/stores/executionStore' import { TaskItemImpl, useQueueStore } from '@/stores/queueStore' @@ -252,7 +252,7 @@ describe('TopMenuSection', () => { it('keeps action bars mounted while hiding the error overlay in node selection mode', () => { const pinia = getActivePinia()! - useAgentNodeSelectionStore(pinia).isActionBarsHidden = true + useCanvasStore(pinia).isPickingNodes = true createWrapper({ pinia, @@ -401,7 +401,7 @@ describe('TopMenuSection', () => { it('does not render inline progress summary while action bars are hidden', async () => { const pinia = getActivePinia()! configureSettings(pinia, true) - useAgentNodeSelectionStore(pinia).isActionBarsHidden = true + useCanvasStore(pinia).isPickingNodes = true const { container } = createWrapper({ pinia }) @@ -475,8 +475,7 @@ describe('TopMenuSection', () => { async ({ isActionBarsHidden, rendered }) => { const pinia = getActivePinia()! configureSettings(pinia, false) - useAgentNodeSelectionStore(pinia).isActionBarsHidden = - isActionBarsHidden + useCanvasStore(pinia).isPickingNodes = isActionBarsHidden const { container } = createWrapper({ pinia }) await nextTick() @@ -495,8 +494,7 @@ describe('TopMenuSection', () => { async ({ isActionBarsHidden, hidden }) => { const pinia = getActivePinia()! configureSettings(pinia, false) - useAgentNodeSelectionStore(pinia).isActionBarsHidden = - isActionBarsHidden + useCanvasStore(pinia).isPickingNodes = isActionBarsHidden const { container } = createWrapper({ pinia }) await nextTick() diff --git a/src/components/TopMenuSection.vue b/src/components/TopMenuSection.vue index 2fd5658b007..7a83aad0f96 100644 --- a/src/components/TopMenuSection.vue +++ b/src/components/TopMenuSection.vue @@ -188,7 +188,7 @@ import { useSettingStore } from '@/platform/settings/settingStore' import { useTelemetry } from '@/platform/telemetry' import { app } from '@/scripts/app' import { useExecutionErrorStore } from '@/stores/executionErrorStore' -import { useAgentNodeSelectionStore } from '@/stores/agentNodeSelectionStore' +import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import { useActionBarButtonStore } from '@/stores/actionBarButtonStore' import { useQueueUIStore } from '@/stores/queueStore' import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore' @@ -207,10 +207,8 @@ import { cn } from '@comfyorg/tailwind-utils' const settingStore = useSettingStore() const workspaceStore = useWorkspaceStore() const rightSidePanelStore = useRightSidePanelStore() -const agentNodeSelectionStore = useAgentNodeSelectionStore() -const isActionBarsHidden = computed( - () => agentNodeSelectionStore.isActionBarsHidden -) +const canvasStore = useCanvasStore() +const isActionBarsHidden = computed(() => canvasStore.isPickingNodes) const managerState = useManagerState() const managerSurveyDialog = useManagerSurveyDialog() const { isLoggedIn } = useCurrentUser() diff --git a/src/components/builder/VueNodeSwitchPopup.vue b/src/components/builder/VueNodeSwitchPopup.vue index 3c51d6521c0..6b4619fc2fc 100644 --- a/src/components/builder/VueNodeSwitchPopup.vue +++ b/src/components/builder/VueNodeSwitchPopup.vue @@ -1,8 +1,6 @@