From 4f600670f52324b91d3c0c6957d7acad2af4a45d Mon Sep 17 00:00:00 2001 From: DrJKL Date: Mon, 6 Jul 2026 01:08:06 -0700 Subject: [PATCH 01/22] feat: tag core badge rows with projection part, keep raw text Renderers own presentation: legacy joins id/lifecycle/source in its own order with brackets intact, Vue trims and reorders. Rows carry the raw projected text plus a part discriminator instead of pre-trimmed text. Co-Authored-By: Claude Fable 5 --- src/systems/badgeSystem.test.ts | 30 ++++++++++++++++++++++++------ src/systems/badgeSystem.ts | 24 +++++++++++------------- src/types/badgeData.ts | 7 ++++++- 3 files changed, 41 insertions(+), 20 deletions(-) diff --git a/src/systems/badgeSystem.test.ts b/src/systems/badgeSystem.test.ts index f72326ffc7f..8aaefd7759d 100644 --- a/src/systems/badgeSystem.test.ts +++ b/src/systems/badgeSystem.test.ts @@ -33,11 +33,29 @@ function sources(overrides: Partial = {}): BadgeSources { } describe('computeBadges', () => { - it('projects lifecycle, id, and source core rows in that order', () => { + it('projects part-tagged core rows carrying raw source text', () => { expect(computeBadges(sources())).toEqual([ - { kind: 'core', text: 'BETA', fgColor: '#fff', bgColor: '#0b8' }, - { kind: 'core', text: '#5', fgColor: '#fff', bgColor: '#0b8' }, - { kind: 'core', text: 'my-pack', fgColor: '#fff', bgColor: '#0b8' } + { + kind: 'core', + part: 'lifecycle', + text: '[BETA]', + fgColor: '#fff', + bgColor: '#0b8' + }, + { + kind: 'core', + part: 'id', + text: '#5', + fgColor: '#fff', + bgColor: '#0b8' + }, + { + kind: 'core', + part: 'source', + text: 'my-pack', + fgColor: '#fff', + bgColor: '#0b8' + } ]) }) @@ -65,7 +83,7 @@ describe('computeBadges', () => { }) ) - expect(rows.map((b) => b.text)).toEqual(['BETA']) + expect(rows.map((b) => b.text)).toEqual(['[BETA]']) }) it('projects only the id row without a node definition', () => { @@ -165,7 +183,7 @@ describe('startBadgeSystem', () => { seedTestNodeDef() await nextTick() - expect(texts()).toEqual(['BETA', '#7', 'my_pack']) + expect(texts()).toEqual(['[BETA]', '#7', 'my_pack']) stop() }) diff --git a/src/systems/badgeSystem.ts b/src/systems/badgeSystem.ts index 970880f470c..15c121ecf47 100644 --- a/src/systems/badgeSystem.ts +++ b/src/systems/badgeSystem.ts @@ -1,4 +1,3 @@ -import { trim } from 'es-toolkit' import { effectScope, watch, watchEffect } from 'vue' import type { EffectScope } from 'vue' @@ -11,7 +10,7 @@ import { useNodeDefStore } from '@/stores/nodeDefStore' import { useWidgetValueStore } from '@/stores/widgetValueStore' import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore' import { BADGE_KIND_ORDER } from '@/types/badgeData' -import type { BadgeData } from '@/types/badgeData' +import type { BadgeData, CoreBadgePart } from '@/types/badgeData' import type { NodeId } from '@/types/nodeId' import { NodeBadgeMode } from '@/types/nodeSource' import { widgetId } from '@/types/widgetId' @@ -55,19 +54,18 @@ function badgeTextVisible( /** Projects a node's core and credits badge rows from their sources. */ export function computeBadges(sources: BadgeSources): BadgeData[] { const { nodeId, nodeDef, badgeModes, colors, pricing } = sources - const coreTexts = [ - badgeTextVisible(nodeDef, badgeModes.lifecycle) - ? trim(nodeDef?.lifecycleText ?? '', ['[', ']']) - : '', - badgeTextVisible(nodeDef, badgeModes.id) ? `#${nodeId}` : '', - badgeTextVisible(nodeDef, badgeModes.source) - ? (nodeDef?.sourceText ?? '') - : '' + const coreParts: [CoreBadgePart, NodeBadgeMode, string][] = [ + ['lifecycle', badgeModes.lifecycle, nodeDef?.lifecycleText ?? ''], + ['id', badgeModes.id, `#${nodeId}`], + ['source', badgeModes.source, nodeDef?.sourceText ?? ''] ] - const rows: BadgeData[] = coreTexts - .filter((text) => text.length > 0) - .map((text) => ({ + const rows: BadgeData[] = coreParts + .filter( + ([, mode, text]) => badgeTextVisible(nodeDef, mode) && text.length > 0 + ) + .map(([part, , text]) => ({ kind: 'core', + part, text, fgColor: colors.fgColor, bgColor: colors.bgColor diff --git a/src/types/badgeData.ts b/src/types/badgeData.ts index e73cbe5f945..41299b524c1 100644 --- a/src/types/badgeData.ts +++ b/src/types/badgeData.ts @@ -3,14 +3,19 @@ export const BADGE_KIND_ORDER = ['core', 'credits', 'extension'] as const export type BadgeKind = (typeof BADGE_KIND_ORDER)[number] +export type CoreBadgePart = 'lifecycle' | 'id' | 'source' + /** * A badge row: plain presentation data projected from its sources * (settings, node definition, palette, pricing, connectivity). Icons are - * referenced by key, never held as live objects. Never serialized. + * referenced by key, never held as live objects. Core rows carry raw + * source text plus which projection part they are, so each renderer + * applies its own ordering, joining, and trimming. Never serialized. */ export interface BadgeData { kind: BadgeKind text: string + part?: CoreBadgePart fgColor?: string bgColor?: string iconKey?: string From b752a1102ed6879aaa8be8814c4c516f30b7637c Mon Sep 17 00:00:00 2001 From: DrJKL Date: Mon, 6 Jul 2026 01:15:26 -0700 Subject: [PATCH 02/22] feat: aggregate subgraph credits in the badge system SubgraphNode wrappers project their credits row from the inner nodes' store rows: several priced inner nodes collapse to 'Partner Nodes x N', a single one shows its price with the wrapper's promoted widget values overriding the inner node's own. The aggregation tracks inner rows, the registered-node set, and an exported structure revision for the events stores cannot observe. Co-Authored-By: Claude Fable 5 --- src/systems/badgeSystem.subgraph.test.ts | 141 +++++++++++++++++++++++ src/systems/badgeSystem.test.ts | 36 ++++++ src/systems/badgeSystem.ts | 120 +++++++++++++++++-- 3 files changed, 289 insertions(+), 8 deletions(-) create mode 100644 src/systems/badgeSystem.subgraph.test.ts diff --git a/src/systems/badgeSystem.subgraph.test.ts b/src/systems/badgeSystem.subgraph.test.ts new file mode 100644 index 00000000000..7dae0c326ca --- /dev/null +++ b/src/systems/badgeSystem.subgraph.test.ts @@ -0,0 +1,141 @@ +import { createTestingPinia } from '@pinia/testing' +import { setActivePinia } from 'pinia' +import { beforeEach, describe, expect, it, vi } from 'vitest' +import { nextTick } from 'vue' + +import { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph' +import type { SubgraphNode } from '@/lib/litegraph/src/litegraph' +import { + createTestSubgraph, + createTestSubgraphNode +} from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers' +import { useNodeBadgeStore } from '@/stores/nodeBadgeStore' +import { useWidgetValueStore } from '@/stores/widgetValueStore' +import { toNodeId } from '@/types/nodeId' + +import { startBadgeSystem } from './badgeSystem' + +const getNodeDisplayPrice = vi.fn( + (_node: LGraphNode, overrides?: ReadonlyMap) => + String(overrides?.get('prompt') ?? '$0.05/Run') +) + +vi.mock('@/composables/node/useNodePricing', () => ({ + useNodePricing: () => ({ + getNodeDisplayPrice, + getNodeRevisionRef: () => ({ value: 0 }), + hasDynamicPricing: () => false, + getRelevantWidgetNames: () => [], + getInputNames: () => [], + getInputGroupPrefixes: () => [] + }) +})) + +vi.mock('@/platform/settings/settingStore', () => ({ + useSettingStore: () => ({ + get: (key: string) => + key === 'Comfy.NodeBadge.ShowApiPricing' ? true : undefined + }) +})) + +class ApiNode extends LGraphNode { + static override nodeData = { name: 'ApiNode', api_node: true } +} + +describe('badge system subgraph credits aggregation', () => { + beforeEach(() => { + setActivePinia(createTestingPinia({ stubActions: false })) + }) + + function setup() { + const rootGraph = new LGraph() + const subgraph = createTestSubgraph({ + rootGraph, + inputs: [{ name: 'input', type: '*' }] + }) + const wrapper = createTestSubgraphNode(subgraph, { id: 100 }) + rootGraph.add(wrapper) + + const graphId = rootGraph.id + const knownNodes = new Map([[wrapper.id, wrapper]]) + function addInner(node: LGraphNode, id: number): LGraphNode { + node.id = toNodeId(id) + subgraph.add(node) + knownNodes.set(node.id, node) + return node + } + + const stop = startBadgeSystem({ + graphId, + resolveNode: (id) => knownNodes.get(id) + }) + + const wrapperCredits = () => + useNodeBadgeStore() + .getBadges(graphId, wrapper.id) + .filter((row) => row.kind === 'credits') + .map((row) => row.text) + + return { subgraph, wrapper, addInner, stop, wrapperCredits } + } + + it('shows no wrapper credits without priced inner nodes', async () => { + const { addInner, stop, wrapperCredits } = setup() + addInner(new LGraphNode('plain'), 11) + await nextTick() + + expect(wrapperCredits()).toEqual([]) + stop() + }) + + it('passes a single inner api price through the wrapper', async () => { + const { addInner, stop, wrapperCredits } = setup() + addInner(new ApiNode('api'), 11) + await nextTick() + + expect(wrapperCredits()).toEqual(['$0.05/Run']) + stop() + }) + + it('counts partner nodes when several inner api nodes are priced', async () => { + const { addInner, stop, wrapperCredits } = setup() + addInner(new ApiNode('api-1'), 11) + addInner(new ApiNode('api-2'), 12) + await nextTick() + + expect(wrapperCredits()).toEqual(['Partner Nodes x 2']) + stop() + }) + + it('reacts when an api node is added to the open subgraph', async () => { + const { addInner, stop, wrapperCredits } = setup() + addInner(new ApiNode('api-1'), 11) + await nextTick() + expect(wrapperCredits()).toEqual(['$0.05/Run']) + + addInner(new ApiNode('api-2'), 12) + await nextTick() + + expect(wrapperCredits()).toEqual(['Partner Nodes x 2']) + stop() + }) + + it('resolves promoted widget overrides for a single inner api node', async () => { + const { subgraph, wrapper, addInner, stop, wrapperCredits } = setup() + const apiNode = new ApiNode('api') + const apiInput = apiNode.addInput('prompt', 'STRING') + apiInput.widget = { name: 'prompt' } + apiNode.addWidget('string', 'prompt', 'inner value', () => undefined, {}) + addInner(apiNode, 11) + + subgraph.inputNode.slots[0].connect(apiInput, apiNode) + ;(wrapper as SubgraphNode)._internalConfigureAfterSlots() + const inputWidgetId = wrapper.inputs[0].widgetId + if (!inputWidgetId) throw new Error('Missing promoted input widgetId') + useWidgetValueStore().setValue(inputWidgetId, 'outer value') + await nextTick() + + expect(wrapperCredits()).toEqual(['outer value']) + stop() + }) +}) diff --git a/src/systems/badgeSystem.test.ts b/src/systems/badgeSystem.test.ts index 8aaefd7759d..9ef43feeed0 100644 --- a/src/systems/badgeSystem.test.ts +++ b/src/systems/badgeSystem.test.ts @@ -134,6 +134,42 @@ describe('computeBadges', () => { expect(rows.filter((b) => b.kind === 'credits')).toEqual([]) }) + + function subgraphPricing(rowCount: number, singleLabel = '') { + return { + isApiNode: false, + showApiPricing: true, + priceLabel: '', + subgraphCredits: { rowCount, singleLabel } + } + } + + it('aggregates multiple inner credits rows into a partner count', () => { + const rows = computeBadges(sources({ pricing: subgraphPricing(5) })) + + expect(rows.at(-1)).toMatchObject({ + kind: 'credits', + text: 'Partner Nodes x 5', + iconKey: 'credits' + }) + }) + + it('passes a single inner credits label through to the wrapper', () => { + const rows = computeBadges( + sources({ pricing: subgraphPricing(1, '$0.05/Run') }) + ) + + expect(rows.at(-1)).toMatchObject({ kind: 'credits', text: '$0.05/Run' }) + }) + + it.for([ + { name: 'no inner credits rows', pricing: subgraphPricing(0) }, + { name: 'a single empty label', pricing: subgraphPricing(1, '') } + ])('projects no wrapper credits row given $name', ({ pricing }) => { + const rows = computeBadges(sources({ pricing })) + + expect(rows.filter((b) => b.kind === 'credits')).toEqual([]) + }) }) describe('startBadgeSystem', () => { diff --git a/src/systems/badgeSystem.ts b/src/systems/badgeSystem.ts index 15c121ecf47..676fa2e94f7 100644 --- a/src/systems/badgeSystem.ts +++ b/src/systems/badgeSystem.ts @@ -1,8 +1,10 @@ -import { effectScope, watch, watchEffect } from 'vue' +import { effectScope, ref, watch, watchEffect } from 'vue' import type { EffectScope } from 'vue' import { useNodePricing } from '@/composables/node/useNodePricing' -import type { LGraphNode } from '@/lib/litegraph/src/litegraph' +import type { INodeInputSlot } from '@/lib/litegraph/src/interfaces' +import type { LGraphNode, SubgraphNode } from '@/lib/litegraph/src/litegraph' +import type { SubgraphInput } from '@/lib/litegraph/src/subgraph/SubgraphInput' import { useSettingStore } from '@/platform/settings/settingStore' import { useLinkStore } from '@/stores/linkStore' import { useNodeBadgeStore } from '@/stores/nodeBadgeStore' @@ -38,7 +40,17 @@ export interface BadgeSources { source: NodeBadgeMode } colors: { fgColor: string; bgColor: string; creditsBgColor: string } - pricing: { isApiNode: boolean; showApiPricing: boolean; priceLabel: string } + pricing: { + isApiNode: boolean + showApiPricing: boolean + priceLabel: string + /** + * Present on SubgraphNode wrappers: how many inner (recursively + * collected, non-wrapper) nodes carry credits rows, and — when + * exactly one does — the label the wrapper should display. + */ + subgraphCredits?: { rowCount: number; singleLabel: string } + } } function badgeTextVisible( @@ -71,12 +83,11 @@ export function computeBadges(sources: BadgeSources): BadgeData[] { bgColor: colors.bgColor })) - const showCredits = - pricing.isApiNode && pricing.showApiPricing && pricing.priceLabel.length > 0 - if (showCredits) { + const creditsText = computeCreditsText(pricing) + if (creditsText) { rows.push({ kind: 'credits', - text: pricing.priceLabel, + text: creditsText, iconKey: 'credits', fgColor: colors.fgColor, bgColor: colors.creditsBgColor @@ -85,6 +96,16 @@ export function computeBadges(sources: BadgeSources): BadgeData[] { return rows } +function computeCreditsText(pricing: BadgeSources['pricing']): string { + const { subgraphCredits } = pricing + if (subgraphCredits) { + if (subgraphCredits.rowCount > 1) + return `Partner Nodes x ${subgraphCredits.rowCount}` + return subgraphCredits.rowCount === 1 ? subgraphCredits.singleLabel : '' + } + return pricing.isApiNode && pricing.showApiPricing ? pricing.priceLabel : '' +} + export interface BadgeSystemOptions { graphId: UUID /** Must resolve ids anywhere in the subgraph hierarchy. */ @@ -122,6 +143,86 @@ function touchPricingSources(graphId: UUID, node: LGraphNode): void { }) } +const subgraphCreditsRevision = ref(0) + +/** + * Signals the system that subgraph structure changed in a way its tracked + * store sources cannot observe (graph switched, subgraph converted, + * workflow configured). Every wrapper's credits aggregation recomputes. + */ +export function bumpSubgraphCreditsRevision(): void { + subgraphCreditsRevision.value++ +} + +type LinkedWidgetInput = INodeInputSlot & { _subgraphSlot?: SubgraphInput } + +/** Promoted widget values on the wrapper override the inner node's own. */ +function collectPromotedOverrides( + wrapper: SubgraphNode, + innerNode: LGraphNode +): ReadonlyMap { + const overrides = new Map() + for (const input of wrapper.inputs as LinkedWidgetInput[]) { + if (!input.widgetId) continue + for (const linkId of input._subgraphSlot?.linkIds ?? []) { + const link = wrapper.subgraph.getLink(linkId) + if (link?.target_id !== innerNode.id) continue + const widgetName = innerNode.inputs[link.target_slot]?.widget?.name + if (!widgetName) continue + overrides.set( + widgetName, + useWidgetValueStore().getWidget(input.widgetId)?.value + ) + } + } + return overrides +} + +/** + * A wrapper's credits sources: the inner (recursively collected, + * non-wrapper) nodes whose store rows include a credits row. Tracks the + * inner rows, the registered-node set, and the structure revision, so the + * wrapper recomputes when inner prices, membership, or structure change. + */ +function gatherSubgraphCredits( + graphId: UUID, + wrapper: SubgraphNode +): { rowCount: number; singleLabel: string } { + void subgraphCreditsRevision.value + const badgeStore = useNodeBadgeStore() + void badgeStore.registeredNodeIds(graphId) + + const creditLeaves: LGraphNode[] = [] + const visited = new Set() + function walk(nodes: LGraphNode[]): void { + for (const inner of nodes) { + if (inner.isSubgraphNode()) { + const subgraphId = String(inner.subgraph.id) + if (visited.has(subgraphId)) continue + visited.add(subgraphId) + walk(inner.subgraph.nodes) + continue + } + const hasCredits = badgeStore + .getBadges(graphId, inner.id) + .some((row) => row.kind === 'credits') + if (hasCredits) creditLeaves.push(inner) + } + } + walk(wrapper.subgraph.nodes) + + if (creditLeaves.length !== 1) { + return { rowCount: creditLeaves.length, singleLabel: '' } + } + const leaf = creditLeaves[0] + const singleLabel = + useNodePricing().getNodeDisplayPrice( + leaf, + collectPromotedOverrides(wrapper, leaf) + ) ?? '' + return { rowCount: 1, singleLabel } +} + function gatherSources( options: BadgeSystemOptions, nodeId: NodeId @@ -139,6 +240,9 @@ function gatherSources( touchPricingSources(graphId, node) priceLabel = useNodePricing().getNodeDisplayPrice(node) ?? '' } + const subgraphCredits = node?.isSubgraphNode() + ? gatherSubgraphCredits(graphId, node) + : undefined return { nodeId, @@ -165,7 +269,7 @@ function gatherSources( ? adjustColor(CREDITS_BASE_BG_COLOR, { lightness: 0.5 }) : CREDITS_BASE_BG_COLOR }, - pricing: { isApiNode, showApiPricing, priceLabel } + pricing: { isApiNode, showApiPricing, priceLabel, subgraphCredits } } } From 73bdad917f7c906d57cc11e5b42d8a36f5c1873f Mon Sep 17 00:00:00 2001 From: DrJKL Date: Mon, 6 Jul 2026 01:35:56 -0700 Subject: [PATCH 03/22] feat: cut both renderers over to store badge rows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Legacy drawBadges renders the store rows through a per-node memoized LGraphBadge cache (core parts joined id/lifecycle/source and truncated, icons resolved via a badge icon registry) followed by the raw node.badges extension surface, whose thunks still evaluate per frame. The Vue partition reads the same rows — trimming lifecycle brackets and swapping a built-in node's source row for the Comfy logo chip — plus the raw extension surface. useNodeBadge now bootstraps the badge system per root graph and forwards the subgraph structure events; dynamic-pricing recalculation wiring is kept. The usePriceBadge closures, the VueNodeData.badges mirror, its property trigger, and node.badgePosition (no ecosystem uses; single writer/reader) are deleted. node.badges itself stays: three custom-node packs actively push to it. Co-Authored-By: Claude Fable 5 --- browser_tests/tests/nodeBadge.spec.ts | 19 -- .../node-badge-left-chromium-linux.png | Bin 97665 -> 0 bytes src/composables/graph/useGraphNodeManager.ts | 11 - src/composables/node/useNodeBadge.ts | 248 ++++++------------ src/composables/node/usePriceBadge.test.ts | 106 -------- src/composables/node/usePriceBadge.ts | 152 ----------- src/lib/litegraph/src/LGraphBadge.ts | 5 - src/lib/litegraph/src/LGraphNode.ts | 35 ++- src/lib/litegraph/src/badgeIconRegistry.ts | 15 ++ src/lib/litegraph/src/litegraph.ts | 2 +- src/lib/litegraph/src/nodeBadgeDraw.test.ts | 75 ++++++ src/lib/litegraph/src/nodeBadgeDraw.ts | 67 +++++ .../linearMode/PartnerNodesList.vue | 16 +- .../composables/usePartitionedBadges.test.ts | 197 -------------- .../composables/usePartitionedBadges.ts | 180 +++---------- src/systems/badgeSystem.pricing.test.ts | 114 ++++++++ src/systems/badgeSystem.ts | 6 + 17 files changed, 430 insertions(+), 818 deletions(-) delete mode 100644 browser_tests/tests/nodeBadge.spec.ts-snapshots/node-badge-left-chromium-linux.png delete mode 100644 src/composables/node/usePriceBadge.test.ts delete mode 100644 src/composables/node/usePriceBadge.ts create mode 100644 src/lib/litegraph/src/badgeIconRegistry.ts create mode 100644 src/lib/litegraph/src/nodeBadgeDraw.test.ts create mode 100644 src/lib/litegraph/src/nodeBadgeDraw.ts delete mode 100644 src/renderer/extensions/vueNodes/composables/usePartitionedBadges.test.ts create mode 100644 src/systems/badgeSystem.pricing.test.ts diff --git a/browser_tests/tests/nodeBadge.spec.ts b/browser_tests/tests/nodeBadge.spec.ts index 975225b389c..e2dc2fa99fd 100644 --- a/browser_tests/tests/nodeBadge.spec.ts +++ b/browser_tests/tests/nodeBadge.spec.ts @@ -48,25 +48,6 @@ test.describe('Node Badge', { tag: ['@screenshot', '@smoke', '@node'] }, () => { await expect(comfyPage.canvas).toHaveScreenshot('node-badge-multiple.png') }) - - test('Can add badge left-side', async ({ comfyPage }) => { - await comfyPage.page.evaluate(() => { - const LGraphBadge = window.LGraphBadge! - const app = window.app as ComfyApp - const graph = app.graph - const nodes = graph.nodes - - for (const node of nodes) { - node.badges = [new LGraphBadge({ text: 'Test Badge' })] - // @ts-expect-error - Enum value - node.badgePosition = 'top-left' - } - - graph.setDirtyCanvas(true, true) - }) - - await expect(comfyPage.canvas).toHaveScreenshot('node-badge-left.png') - }) }) test.describe( diff --git a/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-badge-left-chromium-linux.png b/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-badge-left-chromium-linux.png deleted file mode 100644 index 2bdffb1d2e0ad2dc8e61c779e64de667e2e158f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 97665 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 Q LGraphBadge))[] - const reactiveArrayNodes = new WeakSet() export interface VueNodeData { @@ -35,7 +32,6 @@ export interface VueNodeData { title: string type: string apiNode?: boolean - badges?: Badges bgcolor?: string color?: string flags?: { @@ -155,7 +151,6 @@ export function extractVueNodeData(node: LGraphNode): VueNodeData { executing: false, subgraphId, apiNode: node.constructor?.nodeData?.api_node ?? false, - badges: node.badges, hasErrors: !!node.has_errors, inputs, outputs, @@ -386,12 +381,6 @@ export function useGraphNodeManager(graph: LGraph): GraphNodeManager { showAdvanced: Boolean(propertyEvent.newValue) }) break - case 'badges': - vueNodeData.set(nodeId, { - ...currentData, - badges: propertyEvent.newValue as Badges - }) - break } } }, diff --git a/src/composables/node/useNodeBadge.ts b/src/composables/node/useNodeBadge.ts index cfe2ad66f24..06ab266f4fe 100644 --- a/src/composables/node/useNodeBadge.ts +++ b/src/composables/node/useNodeBadge.ts @@ -1,47 +1,28 @@ -import _ from 'es-toolkit/compat' import { computed, onMounted, watch } from 'vue' import { useNodePricing } from '@/composables/node/useNodePricing' -import { usePriceBadge } from '@/composables/node/usePriceBadge' import { useComputedWithWidgetWatch } from '@/composables/node/useWatchWidget' -import { BadgePosition, LGraphBadge } from '@/lib/litegraph/src/litegraph' import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import { useSettingStore } from '@/platform/settings/settingStore' import { app } from '@/scripts/app' import { useExtensionStore } from '@/stores/extensionStore' -import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore' -import { useNodeDefStore } from '@/stores/nodeDefStore' -import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore' -import { NodeBadgeMode } from '@/types/nodeSource' +import { + bumpSubgraphCreditsRevision, + startBadgeSystem +} from '@/systems/badgeSystem' +import { resolveNode } from '@/utils/litegraphUtil' /** - * Add LGraphBadge to LGraphNode based on settings. - * - * Following badges are added: - * - Node ID badge - * - Node source badge - * - Node life cycle badge - * - API node credits badge + * Bootstraps the badge system (see docs/architecture/node-badge-store.md): + * starts it against the active root graph, restarts it when the workflow + * is reconfigured, forwards the subgraph structure events the system's + * store sources cannot observe, and keeps the legacy canvas redrawing + * when badge sources change. Dynamic-pricing recalculation wiring stays + * here because it drives price evaluation, not badge storage. */ export const useNodeBadge = () => { const settingStore = useSettingStore() const extensionStore = useExtensionStore() - const colorPaletteStore = useColorPaletteStore() - const priceBadge = usePriceBadge() - - const nodeSourceBadgeMode = computed( - () => - settingStore.get('Comfy.NodeBadge.NodeSourceBadgeMode') as NodeBadgeMode - ) - const nodeIdBadgeMode = computed( - () => settingStore.get('Comfy.NodeBadge.NodeIdBadgeMode') as NodeBadgeMode - ) - const nodeLifeCycleBadgeMode = computed( - () => - settingStore.get( - 'Comfy.NodeBadge.NodeLifeCycleBadgeMode' - ) as NodeBadgeMode - ) const showApiPricingBadge = computed(() => settingStore.get('Comfy.NodeBadge.ShowApiPricing') @@ -49,9 +30,9 @@ export const useNodeBadge = () => { watch( [ - nodeSourceBadgeMode, - nodeIdBadgeMode, - nodeLifeCycleBadgeMode, + () => settingStore.get('Comfy.NodeBadge.NodeSourceBadgeMode'), + () => settingStore.get('Comfy.NodeBadge.NodeIdBadgeMode'), + () => settingStore.get('Comfy.NodeBadge.NodeLifeCycleBadgeMode'), showApiPricingBadge ], () => { @@ -59,21 +40,9 @@ export const useNodeBadge = () => { } ) - const nodeDefStore = useNodeDefStore() - function badgeTextVisible( - nodeDef: ComfyNodeDefImpl | null, - badgeMode: NodeBadgeMode - ): boolean { - return !( - badgeMode === NodeBadgeMode.None || - (nodeDef?.isCoreNode && badgeMode === NodeBadgeMode.HideBuiltIn) - ) - } - onMounted(() => { if (extensionStore.isExtensionInstalled('Comfy.NodeBadge')) return - // TODO: Fix the composables and watchers being setup in onMounted const nodePricing = useNodePricing() watch( @@ -84,140 +53,95 @@ export const useNodeBadge = () => { } ) + let stopSystem: (() => void) | undefined + function restartSystem(): void { + stopSystem?.() + const rootGraph = app.rootGraph + stopSystem = startBadgeSystem({ + graphId: rootGraph.id, + resolveNode: (nodeId) => resolveNode(nodeId, rootGraph) + }) + } + + function wirePricingRecalculation(node: LGraphNode): void { + // JSONata rules are dynamic if they depend on any widgets/inputs/input_groups + const pricingConfig = nodePricing.getNodePricingConfig(node) + const hasDynamicPricing = + !!pricingConfig && + ((pricingConfig.depends_on?.widgets?.length ?? 0) > 0 || + (pricingConfig.depends_on?.inputs?.length ?? 0) > 0 || + (pricingConfig.depends_on?.input_groups?.length ?? 0) > 0) + if (!hasDynamicPricing) return + + const relevantWidgetNames = nodePricing.getRelevantWidgetNames( + node.constructor.nodeData?.name ?? '' + ) + const computedWithWidgetWatch = useComputedWithWidgetWatch(node, { + widgetNames: relevantWidgetNames, + triggerCanvasRedraw: true + }) + // Installs the widget listeners; the returned value is unused. + computedWithWidgetWatch(() => 0) + + const relevantInputs = pricingConfig?.depends_on?.inputs ?? [] + const inputGroupPrefixes = pricingConfig?.depends_on?.input_groups ?? [] + if (relevantInputs.length === 0 && inputGroupPrefixes.length === 0) return + + const originalOnConnectionsChange = node.onConnectionsChange + node.onConnectionsChange = function ( + type, + slotIndex, + isConnected, + link, + ioSlot + ) { + originalOnConnectionsChange?.call( + this, + type, + slotIndex, + isConnected, + link, + ioSlot + ) + const inputName = ioSlot?.name + if (!inputName) return + const isRelevantInput = + relevantInputs.includes(inputName) || + inputGroupPrefixes.some((prefix) => + inputName.startsWith(prefix + '.') + ) + if (isRelevantInput) { + nodePricing.triggerPriceRecalculation(node) + } + } + } + extensionStore.registerExtension({ name: 'Comfy.NodeBadge', nodeCreated(node: LGraphNode) { - node.badgePosition = BadgePosition.TopRight - - const badge = computed(() => { - const nodeDef = nodeDefStore.fromLGraphNode(node) - return new LGraphBadge({ - text: _.truncate( - [ - badgeTextVisible(nodeDef, nodeIdBadgeMode.value) - ? `#${node.id}` - : '', - badgeTextVisible(nodeDef, nodeLifeCycleBadgeMode.value) - ? (nodeDef?.nodeLifeCycleBadgeText ?? '') - : '', - badgeTextVisible(nodeDef, nodeSourceBadgeMode.value) - ? (nodeDef?.nodeSource?.badgeText ?? '') - : '' - ] - .filter((s) => s.length > 0) - .join(' '), - { - length: 31 - } - ), - fgColor: - colorPaletteStore.completedActivePalette.colors.litegraph_base - .BADGE_FG_COLOR, - bgColor: - colorPaletteStore.completedActivePalette.colors.litegraph_base - .BADGE_BG_COLOR - }) - }) - - node.badges.push(() => badge.value) - if (node.constructor.nodeData?.api_node && showApiPricingBadge.value) { - // JSONata rules are dynamic if they depend on any widgets/inputs/input_groups - const pricingConfig = nodePricing.getNodePricingConfig(node) - const hasDynamicPricing = - !!pricingConfig && - ((pricingConfig.depends_on?.widgets?.length ?? 0) > 0 || - (pricingConfig.depends_on?.inputs?.length ?? 0) > 0 || - (pricingConfig.depends_on?.input_groups?.length ?? 0) > 0) - - // Keep the existing widget-watch wiring ONLY to trigger redraws on widget change. - // (We no longer rely on it to hold the current badge value.) - if (hasDynamicPricing) { - // For dynamic pricing nodes, use computed that watches widget changes - const relevantWidgetNames = nodePricing.getRelevantWidgetNames( - node.constructor.nodeData?.name - ) - - const computedWithWidgetWatch = useComputedWithWidgetWatch(node, { - widgetNames: relevantWidgetNames, - triggerCanvasRedraw: true - }) - - // Ensure watchers are installed; ignore the returned value. - // (This call is what registers the widget listeners in most implementations.) - computedWithWidgetWatch(() => 0) - - // Hook into connection changes to trigger price recalculation - // This handles both connect and disconnect in VueNodes mode - const relevantInputs = pricingConfig?.depends_on?.inputs ?? [] - const inputGroupPrefixes = - pricingConfig?.depends_on?.input_groups ?? [] - const hasRelevantInputs = - relevantInputs.length > 0 || inputGroupPrefixes.length > 0 - - if (hasRelevantInputs) { - const originalOnConnectionsChange = node.onConnectionsChange - node.onConnectionsChange = function ( - type, - slotIndex, - isConnected, - link, - ioSlot - ) { - originalOnConnectionsChange?.call( - this, - type, - slotIndex, - isConnected, - link, - ioSlot - ) - // Only trigger if this input affects pricing - const inputName = ioSlot?.name - if (!inputName) return - const isRelevantInput = - relevantInputs.includes(inputName) || - inputGroupPrefixes.some((prefix) => - inputName.startsWith(prefix + '.') - ) - if (isRelevantInput) { - nodePricing.triggerPriceRecalculation(node) - } - } - } - } - - let lastLabel = nodePricing.getNodeDisplayPrice(node) - let lastBadge = priceBadge.getCreditsBadge(lastLabel) - - const creditsBadgeGetter: () => LGraphBadge = () => { - const label = nodePricing.getNodeDisplayPrice(node) - if (label !== lastLabel) { - lastLabel = label - lastBadge = priceBadge.getCreditsBadge(label) - } - return lastBadge - } - - node.badges.push(creditsBadgeGetter) + wirePricingRecalculation(node) } }, init() { + restartSystem() app.canvas.canvas.addEventListener<'litegraph:set-graph'>( 'litegraph:set-graph', () => { - for (const node of app.canvas.graph?.nodes ?? []) - priceBadge.updateSubgraphCredits(node) + bumpSubgraphCreditsRevision() + app.canvas?.setDirty(true, true) } ) app.canvas.canvas.addEventListener<'subgraph-converted'>( 'subgraph-converted', - (e) => priceBadge.updateSubgraphCredits(e.detail.subgraphNode) + () => { + bumpSubgraphCreditsRevision() + } ) }, afterConfigureGraph() { - for (const node of app.canvas.graph?.nodes ?? []) - priceBadge.updateSubgraphCredits(node) + restartSystem() + bumpSubgraphCreditsRevision() } }) }) diff --git a/src/composables/node/usePriceBadge.test.ts b/src/composables/node/usePriceBadge.test.ts deleted file mode 100644 index 0ee2bd0045d..00000000000 --- a/src/composables/node/usePriceBadge.test.ts +++ /dev/null @@ -1,106 +0,0 @@ -import { describe, expect, vi } from 'vitest' - -import { LGraphNode } from '@/lib/litegraph/src/litegraph' -import { useWidgetValueStore } from '@/stores/widgetValueStore' - -import { subgraphTest } from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphFixtures' - -import { usePriceBadge } from '@/composables/node/usePriceBadge' - -const getNodeDisplayPrice = vi.fn( - (_node: LGraphNode, overrides?: ReadonlyMap) => - String(overrides?.get('prompt') ?? 'missing override') -) - -vi.mock('@/composables/node/useNodePricing', () => ({ - useNodePricing: () => ({ getNodeDisplayPrice }) -})) - -vi.mock('@/stores/workspace/colorPaletteStore', () => ({ - useColorPaletteStore: () => ({ - completedActivePalette: { - light_theme: false, - colors: { litegraph_base: {} } - } - }) -})) - -const { updateSubgraphCredits, getCreditsBadge } = usePriceBadge() - -const mockNode = new LGraphNode('mock node') -mockNode.badges = [getCreditsBadge('$0.05/Run')] - -function getBadgeText(node: LGraphNode): string { - const badge = node.badges[0] - return (typeof badge === 'function' ? badge() : badge).text -} - -describe('subgraph pricing', () => { - subgraphTest( - 'should not display badge for subgraphs without API nodes', - ({ subgraphWithNode }) => { - const { subgraphNode } = subgraphWithNode - updateSubgraphCredits(subgraphNode) - expect(subgraphNode.badges.length).toBe(0) - } - ) - subgraphTest( - 'should return the price of a single contained API node', - ({ subgraphWithNode }) => { - const { subgraphNode, subgraph } = subgraphWithNode - subgraph.add(mockNode) - updateSubgraphCredits(subgraphNode) - expect(subgraphNode.badges.length).toBe(1) - expect(getBadgeText(subgraphNode)).toBe('$0.05/Run') - } - ) - subgraphTest( - 'should return the number of api nodes if more than one exists', - ({ subgraphWithNode }) => { - const { subgraphNode, subgraph } = subgraphWithNode - for (let i = 0; i < 5; i++) subgraph.add(mockNode) - updateSubgraphCredits(subgraphNode) - expect(subgraphNode.badges.length).toBe(1) - expect(getBadgeText(subgraphNode)).toBe('Partner Nodes x 5') - } - ) - - subgraphTest( - 'uses promoted widget override from any matching internal link', - ({ subgraphWithNode }) => { - const { subgraphNode, subgraph } = subgraphWithNode - class ApiNode extends LGraphNode { - static override nodeData = { name: 'ApiNode', api_node: true } - } - const apiNode = new ApiNode('api node') - apiNode.badges = [getCreditsBadge('$0.05/Run')] - const apiInput = apiNode.addInput('prompt', 'STRING') - apiInput.widget = { name: 'prompt' } - apiNode.addWidget('string', 'prompt', 'inner value', () => undefined, {}) - - const decoyNode = new LGraphNode('decoy node') - const decoyInput = decoyNode.addInput('prompt', 'STRING') - decoyInput.widget = { name: 'prompt' } - decoyNode.addWidget( - 'string', - 'prompt', - 'decoy value', - () => undefined, - {} - ) - - subgraph.add(decoyNode) - subgraph.add(apiNode) - subgraph.inputNode.slots[0].connect(decoyInput, decoyNode) - subgraph.inputNode.slots[0].connect(apiInput, apiNode) - subgraphNode._internalConfigureAfterSlots() - const inputWidgetId = subgraphNode.inputs[0].widgetId - if (!inputWidgetId) throw new Error('Missing promoted input widgetId') - useWidgetValueStore().setValue(inputWidgetId, 'outer value') - - updateSubgraphCredits(subgraphNode) - - expect(getBadgeText(subgraphNode)).toBe('outer value') - } - ) -}) diff --git a/src/composables/node/usePriceBadge.ts b/src/composables/node/usePriceBadge.ts deleted file mode 100644 index def392b6e82..00000000000 --- a/src/composables/node/usePriceBadge.ts +++ /dev/null @@ -1,152 +0,0 @@ -import type { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph' -import { LGraphBadge } from '@/lib/litegraph/src/litegraph' - -import { useNodePricing } from '@/composables/node/useNodePricing' -import type { INodeInputSlot } from '@/lib/litegraph/src/interfaces' -import type { SubgraphInput } from '@/lib/litegraph/src/subgraph/SubgraphInput' -import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore' -import { adjustColor } from '@/utils/colorUtil' -import { useWidgetValueStore } from '@/stores/widgetValueStore' - -type LinkedWidgetInput = INodeInputSlot & { - _subgraphSlot?: SubgraphInput -} - -const componentIconSvg = new Image() -componentIconSvg.src = - "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath fill='none' stroke='oklch(83.01%25 0.163 83.16)' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M15.536 11.293a1 1 0 0 0 0 1.414l2.376 2.377a1 1 0 0 0 1.414 0l2.377-2.377a1 1 0 0 0 0-1.414l-2.377-2.377a1 1 0 0 0-1.414 0zm-13.239 0a1 1 0 0 0 0 1.414l2.377 2.377a1 1 0 0 0 1.414 0l2.377-2.377a1 1 0 0 0 0-1.414L6.088 8.916a1 1 0 0 0-1.414 0zm6.619 6.619a1 1 0 0 0 0 1.415l2.377 2.376a1 1 0 0 0 1.414 0l2.377-2.376a1 1 0 0 0 0-1.415l-2.377-2.376a1 1 0 0 0-1.414 0zm0-13.238a1 1 0 0 0 0 1.414l2.377 2.376a1 1 0 0 0 1.414 0l2.377-2.376a1 1 0 0 0 0-1.414l-2.377-2.377a1 1 0 0 0-1.414 0z'/%3E%3C/svg%3E" - -export const usePriceBadge = () => { - const nodePricing = useNodePricing() - - function updateSubgraphCredits(node: LGraphNode) { - if (!node.isSubgraphNode()) return - node.badges = node.badges.filter((b) => !isCreditsBadge(b)) - const innerCreditsBadges = collectCreditsBadges(node.subgraph) - if (innerCreditsBadges.length > 1) { - node.badges.push( - getCreditsBadge('Partner Nodes x ' + innerCreditsBadges.length) - ) - } else if (innerCreditsBadges.length === 1) { - const innerApiNodes = collectInnerApiNodes(node.subgraph) - // When a single inner api node is the price source, swap its static - // getter for a wrapper-aware one that resolves promoted widget values. - if (innerApiNodes.length === 1) { - node.badges.push(buildWrapperAwarePriceBadge(node, innerApiNodes[0])) - } else { - node.badges.push(...innerCreditsBadges) - } - } - const graph = node.graph - if (!graph) return - graph.trigger('node:property:changed', { - type: 'node:property:changed', - nodeId: node.id, - property: 'badges', - oldValue: node.badges, - newValue: node.badges - }) - } - - function collectCreditsBadges( - graph: LGraph, - visited: Set = new Set() - ): (LGraphBadge | (() => LGraphBadge))[] { - if (visited.has(graph.id)) return [] - visited.add(graph.id) - const badges: (LGraphBadge | (() => LGraphBadge))[] = [] - for (const node of graph.nodes) { - badges.push( - ...(node.isSubgraphNode() - ? collectCreditsBadges(node.subgraph, visited) - : node.badges.filter((b) => isCreditsBadge(b))) - ) - } - return badges - } - - function collectInnerApiNodes( - graph: LGraph, - visited: Set = new Set() - ): LGraphNode[] { - if (visited.has(graph.id)) return [] - visited.add(graph.id) - const apiNodes: LGraphNode[] = [] - for (const node of graph.nodes) { - if (node.isSubgraphNode()) { - apiNodes.push(...collectInnerApiNodes(node.subgraph, visited)) - } else if (node.constructor?.nodeData?.api_node) { - apiNodes.push(node) - } - } - return apiNodes - } - - function buildWrapperAwarePriceBadge( - wrapper: LGraphNode, - innerNode: LGraphNode - ): () => LGraphBadge { - return () => - getCreditsBadge( - nodePricing.getNodeDisplayPrice( - innerNode, - collectPromotedOverrides(wrapper, innerNode) - ) - ) - } - - function collectPromotedOverrides( - wrapper: LGraphNode, - innerNode: LGraphNode - ): ReadonlyMap { - const overrides = new Map() - if (!wrapper.isSubgraphNode()) return overrides - - for (const input of wrapper.inputs as LinkedWidgetInput[]) { - if (!input.widgetId) continue - for (const linkId of input._subgraphSlot?.linkIds ?? []) { - const link = wrapper.subgraph.getLink(linkId) - if (link?.target_id !== innerNode.id) continue - const targetInput = innerNode.inputs[link.target_slot] - const widgetName = targetInput?.widget?.name - if (!widgetName) continue - overrides.set( - widgetName, - useWidgetValueStore().getWidget(input.widgetId)?.value - ) - } - } - return overrides - } - - function isCreditsBadge( - badge: Partial | (() => Partial) - ): boolean { - const badgeInstance = typeof badge === 'function' ? badge() : badge - return badgeInstance.icon?.image === componentIconSvg - } - - const colorPaletteStore = useColorPaletteStore() - function getCreditsBadge(price: string): LGraphBadge { - const isLightTheme = colorPaletteStore.completedActivePalette.light_theme - - return new LGraphBadge({ - text: price, - iconOptions: { - image: componentIconSvg, - size: 8 - }, - fgColor: - colorPaletteStore.completedActivePalette.colors.litegraph_base - .BADGE_FG_COLOR, - bgColor: isLightTheme - ? adjustColor('#8D6932', { lightness: 0.5 }) - : '#8D6932' - }) - } - return { - getCreditsBadge, - isCreditsBadge, - updateSubgraphCredits - } -} diff --git a/src/lib/litegraph/src/LGraphBadge.ts b/src/lib/litegraph/src/LGraphBadge.ts index 25005ce94d5..a4993fd0de3 100644 --- a/src/lib/litegraph/src/LGraphBadge.ts +++ b/src/lib/litegraph/src/LGraphBadge.ts @@ -3,11 +3,6 @@ import { LGraphIcon } from './LGraphIcon' import type { LGraphIconOptions } from './LGraphIcon' import { cachedMeasureText } from './utils/textMeasureCache' -export enum BadgePosition { - TopLeft = 'top-left', - TopRight = 'top-right' -} - export interface LGraphBadgeOptions { text: string fgColor?: string diff --git a/src/lib/litegraph/src/LGraphNode.ts b/src/lib/litegraph/src/LGraphNode.ts index 7f9e6e4ffe2..381370faf6e 100644 --- a/src/lib/litegraph/src/LGraphNode.ts +++ b/src/lib/litegraph/src/LGraphNode.ts @@ -9,6 +9,7 @@ import type { SlotPositionContext } from '@/renderer/core/canvas/litegraph/slotC import { useLayoutMutations } from '@/renderer/core/layout/operations/layoutMutations' import { LayoutSource } from '@/renderer/core/layout/types' import { toLinkId } from '@/types/linkId' +import { useNodeBadgeStore } from '@/stores/nodeBadgeStore' import { useWidgetValueStore } from '@/stores/widgetValueStore' import { UNASSIGNED_NODE_ID, toNodeId, serializeNodeId } from '@/types/nodeId' import type { NodeId } from '@/types/nodeId' @@ -27,7 +28,8 @@ import { import { cachedMeasureText } from '@/lib/litegraph/src/utils/textMeasureCache' import type { DragAndScale } from './DragAndScale' import type { LGraph } from './LGraph' -import { BadgePosition, LGraphBadge } from './LGraphBadge' +import { LGraphBadge } from './LGraphBadge' +import { badgeDrawObjects } from './nodeBadgeDraw' import { LGraphButton } from './LGraphButton' import type { LGraphButtonOptions } from './LGraphButton' import { LGraphCanvas } from './LGraphCanvas' @@ -420,9 +422,12 @@ export class LGraphNode widgets_start_y?: number lostFocusAt?: number gotFocusAt?: number + /** + * Extension-provided badges, drawn after the system-written rows held in + * {@link useNodeBadgeStore}. Thunks are re-evaluated every frame. + */ badges: (LGraphBadge | (() => LGraphBadge))[] = [] title_buttons: LGraphButton[] = [] - badgePosition: BadgePosition = BadgePosition.TopLeft onOutputRemoved?(this: LGraphNode, slot: number): void onInputRemoved?(this: LGraphNode, slot: number, input: INodeInputSlot): void /** @@ -3594,18 +3599,20 @@ export class LGraphNode } drawBadges(ctx: CanvasRenderingContext2D, { gap = 2 } = {}): void { - const badgeInstances = this.badges.map((badge) => - badge instanceof LGraphBadge ? badge : badge() - ) - const isLeftAligned = this.badgePosition === BadgePosition.TopLeft - - let currentX = isLeftAligned - ? 0 - : this.width - - badgeInstances.reduce( - (acc, badge) => acc + badge.getWidth(ctx) + gap, - 0 - ) + const graphId = this.graph?.rootGraph.id + const rows = graphId + ? useNodeBadgeStore().getBadges(graphId, this.id) + : undefined + const badgeInstances = [ + ...(rows ? badgeDrawObjects(this, rows) : []), + ...this.badges.map((badge) => + badge instanceof LGraphBadge ? badge : badge() + ) + ] + + let currentX = + this.width - + badgeInstances.reduce((acc, badge) => acc + badge.getWidth(ctx) + gap, 0) const y = -(LiteGraph.NODE_TITLE_HEIGHT + gap) for (const badge of badgeInstances) { diff --git a/src/lib/litegraph/src/badgeIconRegistry.ts b/src/lib/litegraph/src/badgeIconRegistry.ts new file mode 100644 index 00000000000..721687c58c4 --- /dev/null +++ b/src/lib/litegraph/src/badgeIconRegistry.ts @@ -0,0 +1,15 @@ +import type { LGraphIconOptions } from './LGraphIcon' + +const icons = new Map() + +/** Maps a {@link BadgeData.iconKey} to canvas icon options. */ +export function registerBadgeIcon( + key: string, + options: LGraphIconOptions +): void { + icons.set(key, options) +} + +export function resolveBadgeIcon(key: string): LGraphIconOptions | undefined { + return icons.get(key) +} diff --git a/src/lib/litegraph/src/litegraph.ts b/src/lib/litegraph/src/litegraph.ts index 62e0a7763d9..70a5616af3e 100644 --- a/src/lib/litegraph/src/litegraph.ts +++ b/src/lib/litegraph/src/litegraph.ts @@ -114,7 +114,7 @@ export { type SubgraphId } from './LGraph' export type { LGraphTriggerEvent } from './types/graphTriggers' -export { BadgePosition, LGraphBadge } from './LGraphBadge' +export { LGraphBadge } from './LGraphBadge' export { LGraphCanvas } from './LGraphCanvas' export { LGraphGroup, type GroupId } from './LGraphGroup' export { LGraphNode } from './LGraphNode' diff --git a/src/lib/litegraph/src/nodeBadgeDraw.test.ts b/src/lib/litegraph/src/nodeBadgeDraw.test.ts new file mode 100644 index 00000000000..1f6af5d7c95 --- /dev/null +++ b/src/lib/litegraph/src/nodeBadgeDraw.test.ts @@ -0,0 +1,75 @@ +import { describe, expect, it } from 'vitest' + +import type { BadgeData } from '@/types/badgeData' + +import { registerBadgeIcon } from './badgeIconRegistry' +import { badgeDrawObjects } from './nodeBadgeDraw' + +function coreRow(part: BadgeData['part'], text: string): BadgeData { + return { kind: 'core', part, text, fgColor: '#fff', bgColor: '#000' } +} + +describe('badgeDrawObjects', () => { + it('joins core parts into one badge in id, lifecycle, source order', () => { + const badges = badgeDrawObjects({}, [ + coreRow('lifecycle', '[BETA]'), + coreRow('id', '#5'), + coreRow('source', 'my-pack') + ]) + + expect(badges).toHaveLength(1) + expect(badges[0].text).toBe('#5 [BETA] my-pack') + expect(badges[0].fgColor).toBe('#fff') + expect(badges[0].bgColor).toBe('#000') + }) + + it('truncates the joined core text', () => { + const badges = badgeDrawObjects({}, [ + coreRow('source', 'a'.repeat(40)), + coreRow('id', '#5') + ]) + + expect(badges[0].text).toHaveLength(31) + expect(badges[0].text.endsWith('...')).toBe(true) + }) + + it('draws credits rows separately with their registered icon', () => { + registerBadgeIcon('test-icon', { unicode: 'X', fontFamily: 'test' }) + const badges = badgeDrawObjects({}, [ + coreRow('id', '#5'), + { + kind: 'credits', + text: '$0.04', + iconKey: 'test-icon', + fgColor: '#fff', + bgColor: '#8D6932' + } + ]) + + expect(badges).toHaveLength(2) + expect(badges[1].text).toBe('$0.04') + expect(badges[1].bgColor).toBe('#8D6932') + expect(badges[1].icon?.unicode).toBe('X') + }) + + it('keeps an unknown icon key iconless', () => { + const badges = badgeDrawObjects({}, [ + { kind: 'credits', text: '$1', iconKey: 'nope' } + ]) + + expect(badges[0].icon).toBeUndefined() + }) + + it('reuses draw objects until the rows change content', () => { + const node = {} + const rows: BadgeData[] = [coreRow('id', '#5')] + + const first = badgeDrawObjects(node, rows) + const second = badgeDrawObjects(node, [coreRow('id', '#5')]) + expect(second[0]).toBe(first[0]) + + const third = badgeDrawObjects(node, [coreRow('id', '#6')]) + expect(third[0]).not.toBe(first[0]) + expect(third[0].text).toBe('#6') + }) +}) diff --git a/src/lib/litegraph/src/nodeBadgeDraw.ts b/src/lib/litegraph/src/nodeBadgeDraw.ts new file mode 100644 index 00000000000..9c508e7e861 --- /dev/null +++ b/src/lib/litegraph/src/nodeBadgeDraw.ts @@ -0,0 +1,67 @@ +import { truncate } from 'es-toolkit/compat' + +import type { BadgeData, CoreBadgePart } from '@/types/badgeData' + +import { LGraphBadge } from './LGraphBadge' +import { resolveBadgeIcon } from './badgeIconRegistry' + +/** Legacy canvas joins the core parts into a single badge in this order. */ +const CORE_JOIN_ORDER: CoreBadgePart[] = ['id', 'lifecycle', 'source'] +const CORE_TEXT_LIMIT = 31 + +function joinedCoreText(coreRows: BadgeData[]): string { + const byPart = new Map(coreRows.map((row) => [row.part, row.text])) + return truncate( + CORE_JOIN_ORDER.map((part) => byPart.get(part) ?? '') + .filter((text) => text.length > 0) + .join(' '), + { length: CORE_TEXT_LIMIT } + ) +} + +function buildDrawObjects(rows: readonly BadgeData[]): LGraphBadge[] { + const coreRows = rows.filter((row) => row.kind === 'core') + const otherRows = rows.filter((row) => row.kind !== 'core') + + const badges: LGraphBadge[] = [] + const coreText = joinedCoreText(coreRows) + if (coreText) { + badges.push( + new LGraphBadge({ + text: coreText, + fgColor: coreRows[0].fgColor, + bgColor: coreRows[0].bgColor + }) + ) + } + for (const row of otherRows) { + badges.push( + new LGraphBadge({ + text: row.text, + fgColor: row.fgColor, + bgColor: row.bgColor, + iconOptions: row.iconKey ? resolveBadgeIcon(row.iconKey) : undefined + }) + ) + } + return badges +} + +const drawCache = new WeakMap() + +/** + * The legacy canvas draw objects for a node's badge rows, rebuilt only + * when the row content changes. Renderer-side state (the Reroute id-badge + * pattern); the rows stay plain data. + */ +export function badgeDrawObjects( + node: object, + rows: readonly BadgeData[] +): LGraphBadge[] { + const key = JSON.stringify(rows) + const cached = drawCache.get(node) + if (cached?.key === key) return cached.badges + const badges = buildDrawObjects(rows) + drawCache.set(node, { key, badges }) + return badges +} diff --git a/src/renderer/extensions/linearMode/PartnerNodesList.vue b/src/renderer/extensions/linearMode/PartnerNodesList.vue index f94a4af6503..5e6d7f22b41 100644 --- a/src/renderer/extensions/linearMode/PartnerNodesList.vue +++ b/src/renderer/extensions/linearMode/PartnerNodesList.vue @@ -4,31 +4,31 @@ import { CollapsibleRoot, CollapsibleTrigger } from 'reka-ui' -import { computed, toValue } from 'vue' +import { computed } from 'vue' import { useI18n } from 'vue-i18n' import Button from '@/components/ui/button/Button.vue' import Popover from '@/components/ui/Popover.vue' -import { usePriceBadge } from '@/composables/node/usePriceBadge' import PartnerNodeItem from '@/renderer/extensions/linearMode/PartnerNodeItem.vue' -import { trackNodePrice } from '@/renderer/extensions/vueNodes/composables/usePartitionedBadges' import { app } from '@/scripts/app' +import { useNodeBadgeStore } from '@/stores/nodeBadgeStore' import { mapAllNodes } from '@/utils/graphTraversalUtil' defineProps<{ mobile?: boolean }>() -const { isCreditsBadge } = usePriceBadge() const { t } = useI18n() +const badgeStore = useNodeBadgeStore() const creditsBadges = computed(() => mapAllNodes(app.graph, (node) => { if (node.isSubgraphNode()) return - const priceBadge = node.badges.find(isCreditsBadge) - if (!priceBadge) return + const priceRow = badgeStore + .getBadges(app.graph.rootGraph.id, node.id) + .find((row) => row.kind === 'credits') + if (!priceRow) return - trackNodePrice(node) - return [node.title, toValue(priceBadge).text, node.id] as const + return [node.title, priceRow.text, node.id] as const }) ) diff --git a/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.test.ts b/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.test.ts deleted file mode 100644 index 662b3778dee..00000000000 --- a/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.test.ts +++ /dev/null @@ -1,197 +0,0 @@ -import { createTestingPinia } from '@pinia/testing' -import { setActivePinia } from 'pinia' -import { fromPartial } from '@total-typescript/shoehorn' -import { beforeEach, describe, expect, it, vi } from 'vitest' - -import { computed, ref } from 'vue' - -import type { VueNodeData } from '@/composables/graph/useGraphNodeManager' -import { usePriceBadge } from '@/composables/node/usePriceBadge' -import type { LGraph, LGraphBadge } from '@/lib/litegraph/src/litegraph' -import type { INodeInputSlot } from '@/lib/litegraph/src/interfaces' -import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' -import { - trackNodePrice, - usePartitionedBadges -} from '@/renderer/extensions/vueNodes/composables/usePartitionedBadges' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' -import { useLinkStore } from '@/stores/linkStore' -import { useNodeDefStore } from '@/stores/nodeDefStore' -import { useWidgetValueStore } from '@/stores/widgetValueStore' -import { toLinkId } from '@/types/linkId' -import { toNodeId } from '@/types/nodeId' -import { NodeBadgeMode } from '@/types/nodeSource' - -const GRAPH_ID = 'graph-test' - -vi.mock('@/scripts/app', () => ({ app: {} })) - -const settings = vi.hoisted(() => new Map()) -vi.mock('@/platform/settings/settingStore', () => ({ - useSettingStore: () => ({ get: (key: string) => settings.get(key) }) -})) - -vi.mock('@/composables/node/useNodePricing', () => { - const revision = ref(0) - return { - useNodePricing: () => ({ - hasDynamicPricing: () => true, - getRelevantWidgetNames: () => [], - getInputNames: () => ['image'], - getInputGroupPrefixes: () => ['ref_images'], - getNodeRevisionRef: () => revision - }) - } -}) - -function makeInputSlot(name: string): INodeInputSlot { - return { name, type: 'IMAGE', link: null, boundingRect: [0, 0, 0, 0] } -} - -describe('trackNodePrice', () => { - beforeEach(() => { - setActivePinia(createTestingPinia({ stubActions: false })) - useCanvasStore().currentGraph = fromPartial({ - rootGraph: { id: GRAPH_ID } - }) - // Instantiate up front so first-use state registration inside a test - // cannot masquerade as connectivity-driven invalidation. - useLinkStore() - useWidgetValueStore() - }) - - function trackedRuns(inputs: INodeInputSlot[]) { - let runs = 0 - const tracker = computed(() => { - trackNodePrice({ id: '5', type: 'ApiNode', inputs }) - runs += 1 - return runs - }) - return { read: () => tracker.value, runs: () => runs } - } - - function connect(slot: number, linkId: number) { - useLinkStore().registerLink(GRAPH_ID, { - id: toLinkId(linkId), - originNodeId: toNodeId(99), - originSlot: 0, - targetNodeId: toNodeId(5), - targetSlot: slot, - type: 'IMAGE' - }) - } - - it('re-runs when a pricing-relevant input connects or disconnects', () => { - const inputs = [makeInputSlot('image'), makeInputSlot('other')] - const { read, runs } = trackedRuns(inputs) - - read() - expect(runs()).toBe(1) - - connect(0, 1) - read() - expect(runs()).toBe(2) - - const linkStore = useLinkStore() - const topology = linkStore.getInputSlotLink(GRAPH_ID, toNodeId(5), 0)! - linkStore.deleteLink(GRAPH_ID, topology) - read() - expect(runs()).toBe(3) - }) - - it('re-runs when an input-group input connects', () => { - const inputs = [makeInputSlot('image'), makeInputSlot('ref_images.img0')] - const { read, runs } = trackedRuns(inputs) - - read() - expect(runs()).toBe(1) - - connect(1, 2) - read() - expect(runs()).toBe(2) - }) - - it('does not re-run when an irrelevant input connects', () => { - const inputs = [makeInputSlot('image'), makeInputSlot('other')] - // Seed the graph's link bucket so its creation is not what gets observed. - connect(7, 9) - const { read, runs } = trackedRuns(inputs) - - read() - expect(runs()).toBe(1) - - connect(1, 3) - read() - expect(runs()).toBe(1) - }) -}) - -describe('usePartitionedBadges', () => { - beforeEach(() => { - setActivePinia(createTestingPinia({ stubActions: false })) - settings.clear() - settings.set('Comfy.NodeBadge.NodeIdBadgeMode', NodeBadgeMode.ShowAll) - settings.set( - 'Comfy.NodeBadge.NodeLifeCycleBadgeMode', - NodeBadgeMode.ShowAll - ) - settings.set('Comfy.NodeBadge.NodeSourceBadgeMode', NodeBadgeMode.None) - }) - - function addNodeDef(name: string, python_module: string) { - useNodeDefStore().addNodeDef( - fromPartial({ - name, - display_name: name, - category: 'test', - python_module, - input: {}, - output: [] - }) - ) - } - - function makeNodeData( - type: string, - badges: Partial[] - ): VueNodeData { - return fromPartial({ id: '5', type, badges }) - } - - it('partitions badges into core, pricing, and extension rows', () => { - addNodeDef('CustomNode', 'custom_nodes.testpack') - const credits = usePriceBadge().getCreditsBadge('$0.05 x 3 Runs') - - const partitioned = usePartitionedBadges( - makeNodeData('CustomNode', [ - { text: 'legacy-core-slot' }, - credits, - { text: 'EXT' }, - { text: '' } - ]) - ) - - expect(partitioned.value).toEqual({ - hasComfyBadge: false, - core: [{ text: '#5' }], - extension: [expect.objectContaining({ text: 'EXT' })], - pricing: [{ required: '$0.05', rest: 'x 3 Runs' }] - }) - }) - - it('shows the Comfy badge only for core nodes without pricing', () => { - settings.set('Comfy.NodeBadge.NodeSourceBadgeMode', NodeBadgeMode.ShowAll) - addNodeDef('CoreNode', 'nodes') - - const withoutPricing = usePartitionedBadges( - makeNodeData('CoreNode', [{ text: 'legacy-core-slot' }]) - ) - expect(withoutPricing.value.hasComfyBadge).toBe(true) - - const credits = usePriceBadge().getCreditsBadge('$0.10') - const withPricing = usePartitionedBadges( - makeNodeData('CoreNode', [{ text: 'legacy-core-slot' }, credits]) - ) - expect(withPricing.value.hasComfyBadge).toBe(false) - }) -}) diff --git a/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.ts b/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.ts index d2c02adbf7d..900b4e80519 100644 --- a/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.ts +++ b/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.ts @@ -2,22 +2,13 @@ import { trim } from 'es-toolkit' import { computed, toValue } from 'vue' import type { VueNodeData } from '@/composables/graph/useGraphNodeManager' -import { useNodePricing } from '@/composables/node/useNodePricing' -import { usePriceBadge } from '@/composables/node/usePriceBadge' -import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode' -import type { INodeInputSlot } from '@/lib/litegraph/src/interfaces' import { useSettingStore } from '@/platform/settings/settingStore' import type { NodeBadgeProps } from '@/renderer/extensions/vueNodes/components/NodeBadge.vue' -import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import { app } from '@/scripts/app' -import { useLinkStore } from '@/stores/linkStore' -import { useWidgetValueStore } from '@/stores/widgetValueStore' +import { useNodeBadgeStore } from '@/stores/nodeBadgeStore' import { useNodeDefStore } from '@/stores/nodeDefStore' -import { toNodeId } from '@/types/nodeId' -import type { NodeId, SerializedNodeId } from '@/types/nodeId' import { NodeBadgeMode } from '@/types/nodeSource' -import { widgetId } from '@/types/widgetId' -import type { UUID } from '@/utils/uuid' +import { resolveNode } from '@/utils/litegraphUtil' function splitAroundFirstSpace(text: string): [string, string | undefined] { const index = text.indexOf(' ') @@ -25,156 +16,59 @@ function splitAroundFirstSpace(text: string): [string, string | undefined] { return [text.slice(0, index), text.slice(index + 1)] } -type TrackableNode = { - id: SerializedNodeId - type: string - inputs?: INodeInputSlot[] -} - -/** - * Reads pricing-relevant slot connectivity from the link store so the - * calling computed re-runs when one of those inputs connects or disconnects. - */ -function touchPricingInputConnectivity( - graphId: UUID | undefined, - nodeId: NodeId, - inputs: INodeInputSlot[] | undefined, - inputNames: string[], - groupPrefixes: string[] -): void { - if (graphId === undefined || !inputs) return - if (inputNames.length === 0 && groupPrefixes.length === 0) return - - const linkStore = useLinkStore() - inputs.forEach((inp, index) => { - const relevant = - (inp.name && inputNames.includes(inp.name)) || - groupPrefixes.some((prefix) => inp.name?.startsWith(prefix + '.')) - if (relevant) void linkStore.isInputSlotConnected(graphId, nodeId, index) - }) -} -export function trackNodePrice(node: TrackableNode) { - const { - getRelevantWidgetNames, - hasDynamicPricing, - getInputGroupPrefixes, - getInputNames, - getNodeRevisionRef - } = useNodePricing() - // Read the per-node revision ref even for static pricing: JSONata 2.x - // evaluation is async, so the badge must re-run when evaluation completes. - const nodeId = toNodeId(node.id) - void getNodeRevisionRef(nodeId).value - - if (!hasDynamicPricing(node.type)) return - - // Access only the widget values that affect pricing (from widgetValueStore) - const relevantNames = getRelevantWidgetNames(node.type) - const widgetStore = useWidgetValueStore() - const graphId = useCanvasStore().rootGraphId - if (relevantNames.length > 0 && node.id != null) { - for (const name of relevantNames) { - // Access value from store to create reactive dependency - if (!graphId) continue - void widgetStore.getWidget(widgetId(graphId, nodeId, name))?.value - } - } - touchPricingInputConnectivity( - graphId, - nodeId, - node.inputs, - getInputNames(node.type), - getInputGroupPrefixes(node.type) - ) -} - /** - * Register reactive deps on every contained api node's pricing inputs so the - * SubgraphNode wrapper's badge computed re-runs when an inner (e.g. promoted) - * widget value changes. Also tracks the wrapper's own promoted widget host - * values so user edits on the wrapper trigger re-evaluation. + * Partitions a node's badge rows from {@link useNodeBadgeStore} for the + * Vue renderer: core rows become chips (lifecycle text is bracket-trimmed + * and a built-in node's source row is replaced by the Comfy logo chip), + * credits rows become pricing entries, and badges pushed onto the raw + * `node.badges` extension surface are appended as extension chips. */ -function trackSubgraphInnerNodePrices(wrapper: LGraphNode) { - if (!wrapper.isSubgraphNode()) return - // Touch each promoted widget's host value to register reactive deps. - for (const w of wrapper.widgets ?? []) void w.value - - const visited = new Set() - function walk(nodes: LGraphNode[]) { - for (const inner of nodes) { - if (inner.isSubgraphNode()) { - const id = String(inner.subgraph.id) - if (visited.has(id)) continue - visited.add(id) - walk(inner.subgraph.nodes) - continue - } - if (!inner.constructor?.nodeData?.api_node) continue - trackNodePrice({ - id: inner.id, - type: inner.type ?? '', - inputs: inner.inputs - }) - } - } - walk(wrapper.subgraph.nodes) -} - export function usePartitionedBadges(nodeData: VueNodeData) { - const { isCreditsBadge } = usePriceBadge() const settingStore = useSettingStore() + const badgeStore = useNodeBadgeStore() + const nodeDef = useNodeDefStore().nodeDefsByName[nodeData.type] - const unpartitionedBadges = computed(() => { - if (nodeData?.id != null) { - const wrapper = app.canvas?.graph?.getNodeById(nodeData.id) - if (wrapper?.isSubgraphNode()) trackSubgraphInnerNodePrices(wrapper) - } - if (nodeData?.apiNode && nodeData?.id != null) trackNodePrice(nodeData) - return [...(nodeData?.badges ?? [])].map(toValue) + const rows = computed(() => { + const graphId = app.canvas?.graph?.rootGraph.id + if (graphId === undefined || nodeData.id == null) return [] + return badgeStore.getBadges(graphId, nodeData.id) }) - const nodeDef = useNodeDefStore().nodeDefsByName[nodeData.type] + return computed(() => { - const displaySource = settingStore.get( - 'Comfy.NodeBadge.NodeSourceBadgeMode' - ) - const isCoreNode = - nodeDef?.isCoreNode && displaySource === NodeBadgeMode.ShowAll + const showComfyLogo = + nodeDef?.isCoreNode && + settingStore.get('Comfy.NodeBadge.NodeSourceBadgeMode') === + NodeBadgeMode.ShowAll + const core: NodeBadgeProps[] = [] const extension: NodeBadgeProps[] = [] const pricing: { required: string; rest?: string }[] = [] - if ( - settingStore.get('Comfy.NodeBadge.NodeLifeCycleBadgeMode') !== - NodeBadgeMode.None - ) { - const lifecycleText = nodeDef?.nodeLifeCycleBadgeText ?? '' - const trimmed = trim(lifecycleText, ['[', ']']) - if (trimmed) core.push({ text: trimmed }) - } - if ( - settingStore.get('Comfy.NodeBadge.NodeIdBadgeMode') !== NodeBadgeMode.None - ) - core.push({ text: `#${nodeData.id}` }) - const sourceText = nodeDef?.nodeSource?.badgeText - if ( - !nodeDef?.isCoreNode && - displaySource !== NodeBadgeMode.None && - sourceText - ) - core.push({ text: sourceText }) - for (const badge of unpartitionedBadges.value.slice(1)) { - if (!badge.text) continue - - if (isCreditsBadge(badge)) { - const [required, rest] = splitAroundFirstSpace(badge.text) + for (const row of rows.value) { + if (row.kind === 'credits') { + const [required, rest] = splitAroundFirstSpace(row.text) pricing.push({ required, rest }) continue } + if (row.kind === 'core') { + if (nodeDef?.isCoreNode && row.part === 'source') continue + core.push({ + text: row.part === 'lifecycle' ? trim(row.text, ['[', ']']) : row.text + }) + continue + } + extension.push({ text: row.text }) + } + + const rootGraph = app.canvas?.graph?.rootGraph + const node = rootGraph ? resolveNode(nodeData.id, rootGraph) : undefined + for (const badge of (node?.badges ?? []).map(toValue)) { + if (!badge.text) continue extension.push(badge) } return { - hasComfyBadge: isCoreNode && pricing.length === 0, + hasComfyBadge: showComfyLogo && pricing.length === 0, core, extension, pricing diff --git a/src/systems/badgeSystem.pricing.test.ts b/src/systems/badgeSystem.pricing.test.ts new file mode 100644 index 00000000000..e5ac4a1d8a8 --- /dev/null +++ b/src/systems/badgeSystem.pricing.test.ts @@ -0,0 +1,114 @@ +import { createTestingPinia } from '@pinia/testing' +import { setActivePinia } from 'pinia' +import { beforeEach, describe, expect, it, vi } from 'vitest' +import { nextTick } from 'vue' + +import { LGraphNode } from '@/lib/litegraph/src/litegraph' +import { useLinkStore } from '@/stores/linkStore' +import { useNodeBadgeStore } from '@/stores/nodeBadgeStore' +import { toLinkId } from '@/types/linkId' +import { toNodeId } from '@/types/nodeId' +import type { UUID } from '@/utils/uuid' + +import { startBadgeSystem } from './badgeSystem' + +const getNodeDisplayPrice = vi.fn(() => '$1') + +vi.mock('@/composables/node/useNodePricing', () => { + return { + useNodePricing: () => ({ + getNodeDisplayPrice, + getNodeRevisionRef: () => ({ value: 0 }), + hasDynamicPricing: () => true, + getRelevantWidgetNames: () => [], + getInputNames: () => ['image'], + getInputGroupPrefixes: () => ['ref_images'] + }) + } +}) + +vi.mock('@/platform/settings/settingStore', () => ({ + useSettingStore: () => ({ + get: (key: string) => + key === 'Comfy.NodeBadge.ShowApiPricing' ? true : undefined + }) +})) + +class ApiNode extends LGraphNode { + static override nodeData = { name: 'ApiNode', api_node: true } +} + +const graphId: UUID = 'graph-pricing' + +describe('badge system pricing input connectivity', () => { + beforeEach(() => { + setActivePinia(createTestingPinia({ stubActions: false })) + getNodeDisplayPrice.mockClear() + }) + + function setup(inputNames: string[]) { + const node = new ApiNode('api') + node.id = toNodeId(5) + node.type = 'ApiNode' + for (const name of inputNames) node.addInput(name, 'IMAGE') + + useNodeBadgeStore().registerNode(graphId, node.id) + const stop = startBadgeSystem({ + graphId, + resolveNode: (id) => (id === node.id ? node : undefined) + }) + return { node, stop } + } + + function connect(slot: number, linkId: number) { + useLinkStore().registerLink(graphId, { + id: toLinkId(linkId), + originNodeId: toNodeId(99), + originSlot: 0, + targetNodeId: toNodeId(5), + targetSlot: slot, + type: 'IMAGE' + }) + } + + it('recomputes when a pricing-relevant input connects and disconnects', async () => { + const { stop } = setup(['image', 'other']) + const evaluations = () => getNodeDisplayPrice.mock.calls.length + const initial = evaluations() + + connect(0, 1) + await nextTick() + expect(evaluations()).toBe(initial + 1) + + const linkStore = useLinkStore() + const topology = linkStore.getInputSlotLink(graphId, toNodeId(5), 0)! + linkStore.deleteLink(graphId, topology) + await nextTick() + expect(evaluations()).toBe(initial + 2) + + stop() + }) + + it('recomputes when an input-group input connects', async () => { + const { stop } = setup(['image', 'ref_images.img0']) + const initial = getNodeDisplayPrice.mock.calls.length + + connect(1, 2) + await nextTick() + + expect(getNodeDisplayPrice.mock.calls.length).toBe(initial + 1) + stop() + }) + + it('ignores an irrelevant input connecting', async () => { + connect(7, 9) + const { stop } = setup(['image', 'other']) + const initial = getNodeDisplayPrice.mock.calls.length + + connect(1, 3) + await nextTick() + + expect(getNodeDisplayPrice.mock.calls.length).toBe(initial) + stop() + }) +}) diff --git a/src/systems/badgeSystem.ts b/src/systems/badgeSystem.ts index 676fa2e94f7..1da0484c326 100644 --- a/src/systems/badgeSystem.ts +++ b/src/systems/badgeSystem.ts @@ -2,6 +2,7 @@ import { effectScope, ref, watch, watchEffect } from 'vue' import type { EffectScope } from 'vue' import { useNodePricing } from '@/composables/node/useNodePricing' +import { registerBadgeIcon } from '@/lib/litegraph/src/badgeIconRegistry' import type { INodeInputSlot } from '@/lib/litegraph/src/interfaces' import type { LGraphNode, SubgraphNode } from '@/lib/litegraph/src/litegraph' import type { SubgraphInput } from '@/lib/litegraph/src/subgraph/SubgraphInput' @@ -118,6 +119,11 @@ const SYSTEM_BADGE_KINDS = BADGE_KIND_ORDER.filter( (kind) => kind !== 'extension' ) +const creditsIconSvg = new Image() +creditsIconSvg.src = + "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath fill='none' stroke='oklch(83.01%25 0.163 83.16)' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M15.536 11.293a1 1 0 0 0 0 1.414l2.376 2.377a1 1 0 0 0 1.414 0l2.377-2.377a1 1 0 0 0 0-1.414l-2.377-2.377a1 1 0 0 0-1.414 0zm-13.239 0a1 1 0 0 0 0 1.414l2.377 2.377a1 1 0 0 0 1.414 0l2.377-2.377a1 1 0 0 0 0-1.414L6.088 8.916a1 1 0 0 0-1.414 0zm6.619 6.619a1 1 0 0 0 0 1.415l2.377 2.376a1 1 0 0 0 1.414 0l2.377-2.376a1 1 0 0 0 0-1.415l-2.377-2.376a1 1 0 0 0-1.414 0zm0-13.238a1 1 0 0 0 0 1.414l2.377 2.376a1 1 0 0 0 1.414 0l2.377-2.376a1 1 0 0 0 0-1.414l-2.377-2.377a1 1 0 0 0-1.414 0z'/%3E%3C/svg%3E" +registerBadgeIcon('credits', { image: creditsIconSvg, size: 8 }) + /** * Reads the pricing-relevant store state so the calling effect re-runs when * a price revision, priced widget value, or priced input connection changes. From bb0ba79a18a4b34a5e06cfb717936a67e9365bcd Mon Sep 17 00:00:00 2001 From: DrJKL Date: Mon, 6 Jul 2026 01:38:10 -0700 Subject: [PATCH 04/22] docs: record slice B implementation and resolved badge decisions Co-Authored-By: Claude Fable 5 --- docs/architecture/node-badge-store.md | 90 ++++++++++++++++----------- 1 file changed, 52 insertions(+), 38 deletions(-) diff --git a/docs/architecture/node-badge-store.md b/docs/architecture/node-badge-store.md index ccf6fcbf016..f02b5320074 100644 --- a/docs/architecture/node-badge-store.md +++ b/docs/architecture/node-badge-store.md @@ -1,10 +1,10 @@ # Node Badge Store Date: 2026-07-05 (updated 2026-07-06) -Status: Partially implemented — decisions 1–4 shipped as -`src/stores/nodeBadgeStore.ts` + `src/systems/badgeSystem.ts` (slice A); -decision 5 and the open decisions below await the consumer-cutover PR -(slice B). Follow-up to the +Status: Implemented — slice A (store + system) and slice B (consumer +cutover, resolved decisions below) shipped as +`src/stores/nodeBadgeStore.ts`, `src/systems/badgeSystem.ts`, +`src/lib/litegraph/src/nodeBadgeDraw.ts`. Follow-up to the [link topology store](link-topology-store.md), [reroute chain store](reroute-chain-store.md), and the [node data store draft](node-data-store.md) @@ -110,11 +110,11 @@ Frame-budget parity per ADR 0008's render mitigations applies. `registeredNodeIds` to attach/detach per-node effect scopes. Litegraph never imports the system, so the pricing/nodeDef dependency graph (which runtime-imports the litegraph barrel) stays acyclic. The system - takes a `resolveNode` seam and will be bootstrapped at the app layer - in slice B, when the `Comfy.NodeBadge` extension stops pushing - closures; until then rows are written only under test. Row writes are - refused for unregistered nodes so a late effect flush cannot - resurrect a bucket key the chokepoints deleted. + takes a `resolveNode` seam and is bootstrapped at the app layer by the + `Comfy.NodeBadge` extension (`useNodeBadge`), restarting per root + graph on `afterConfigureGraph`. Row writes are refused for + unregistered nodes so a late effect flush cannot resurrect a bucket + key the chokepoints deleted. - Two write paths: `setBadgesOfKind` is the system's bulk replace-one-kind recompute path (`@internal`); extension rows go through `registerBadge`/`deleteBadge` per row, identity-checked, so @@ -123,38 +123,52 @@ Frame-budget parity per ADR 0008's render mitigations applies. (untracked instance state) to map pricing input names to slot indices — parity with the legacy closures. Those reads become store lookups when slot data is store-backed (node data store draft). -- Core rows are fine-grained — one row per part in lifecycle, id, source - order — with one visibility rule (`badgeTextVisible`, the legacy - semantics: `HideBuiltIn` respected for every part). Joining, - bracket decoration, and truncation are renderer presentation and move - to the slice-B legacy draw cache. Rows store lifecycle text with the - `[]` brackets trimmed. Known unification effects: the Vue renderer - gains `HideBuiltIn` handling for id badges, and core nodes' `🦊` - source row becomes data the Vue partition may substitute with its - Comfy-logo chip. +- Core rows are fine-grained — one row per part, tagged + `part: 'lifecycle' | 'id' | 'source'` and carrying the raw projected + text — with one visibility rule (`badgeTextVisible`, the legacy + semantics: `HideBuiltIn` respected for every part). Each renderer owns + presentation: the legacy draw cache joins parts in id, lifecycle, + source order and truncates; the Vue partition trims lifecycle + brackets, and replaces a built-in node's source row with its + Comfy-logo chip. Known unification effect: the Vue renderer gains + `HideBuiltIn` handling for id and lifecycle badges on built-in nodes. - A credits row is emitted only when the display price label is non-empty; async pricing fills it via the per-node revision ref. -- Subgraph credits aggregation is not yet in the system — it stays on - the `updateSubgraphCredits` closure path until open decision 3 below - is resolved. - -## Open decisions (interview pending) - -1. **Legacy `node.badges` surface** — recommended: a converting - accessor exposing the node's `BadgeData[]` proxy; bare - `LGraphBadge`/thunk pushes auto-convert (thunk evaluated once, - `Image` icons dropped) with a one-time deprecation warning pointing - at the store API. Alternatives: delete the property outright, or a - read-only view. Ecosystem scan found zero genuine third-party - writers; ADR 0008 extension-impact guidance applies regardless. -2. **`node.badgePosition`** — recommended: delete (single writer sets a - constant `TopRight` on every node; single reader; renderer policy, - not badge data). Deprecated accessor warns on write. -3. **Subgraph credits aggregation triggers** — recommended: the three - existing events (`litegraph:set-graph`, `subgraph-converted`, - `afterConfigureGraph`) bump a revision the system watches; swap to + +## Implementation notes (slice B) + +- Wrapper `SubgraphNode` credits rows are aggregated by the system from + the inner nodes' store rows: several priced inner (recursively + collected, non-wrapper) nodes collapse to `Partner Nodes x N`; exactly + one shows its price with the wrapper's promoted widget values + overriding the inner node's own. The aggregation tracks the inner + rows, the registered-node set, and a structure revision. +- Legacy `drawBadges` renders the store rows through a per-node + memoized `LGraphBadge` cache (decision 5); `iconKey` resolves through + a generic litegraph `badgeIconRegistry`, with the `credits` icon + registered by the system module. + +## Resolved decisions (2026-07-06 interview) + +1. **Legacy `node.badges` surface — kept as a raw extension-only push + surface.** Directive: delete unless actively used. A GitHub-wide scan + found three custom-node packs actively writing it + (ComfyUI-Wildcard-Pipeline pushes and splices `LGraphBadge` + instances; ComfyUI-Enhancement-Utils and ComfyUI-XENodes push + per-frame getter thunks for ticking execution-time badges), so the + array stays, is no longer written by core/credits code, and both + renderers append it after the store rows — thunks still evaluate per + frame in the legacy canvas. The earlier "zero third-party writers" + scan was wrong. +2. **`node.badgePosition` — deleted**, along with the `BadgePosition` + enum. Zero uses outside this repo; the legacy canvas now always + renders badges top-right (the only surviving behaviour). +3. **Subgraph credits aggregation triggers — event-bumped revision.** + `litegraph:set-graph`, `subgraph-converted`, and + `afterConfigureGraph` bump `bumpSubgraphCreditsRevision()`; swap to reactive `SubgraphStructure` dependencies when that state is - store-backed. + store-backed. Aggregation behaviour itself is preserved (explicit + user requirement). ## Scope and sequencing From 88902edad6f2344575f4f318d714734d2f61451c Mon Sep 17 00:00:00 2001 From: DrJKL Date: Mon, 6 Jul 2026 01:54:05 -0700 Subject: [PATCH 05/22] fix: preserve legacy subgraph credits semantics and settle pricing cache Wrapper aggregation counts inner api nodes (the old unconditional per-api-node badge basis) rather than resolved credits rows, so a pending async price still yields 'Partner Nodes x N'; the label is localized via nodeBadge.partnerNodesCount. useNodePricing now caches labels per signature: a leaf's own read and its wrapper's promoted-override read previously shared one cache slot and evicted each other, re-scheduling evaluations forever once both ran in eager system effects. Co-Authored-By: Claude Fable 5 --- docs/architecture/node-badge-store.md | 16 ++++--- src/composables/node/useNodePricing.test.ts | 20 ++++++++ src/composables/node/useNodePricing.ts | 53 +++++++++++++-------- src/locales/en/main.json | 3 ++ src/systems/badgeSystem.subgraph.test.ts | 26 ++++++++-- src/systems/badgeSystem.test.ts | 10 ++-- src/systems/badgeSystem.ts | 53 +++++++++++---------- 7 files changed, 120 insertions(+), 61 deletions(-) diff --git a/docs/architecture/node-badge-store.md b/docs/architecture/node-badge-store.md index f02b5320074..c0a924617db 100644 --- a/docs/architecture/node-badge-store.md +++ b/docs/architecture/node-badge-store.md @@ -137,12 +137,16 @@ Frame-budget parity per ADR 0008's render mitigations applies. ## Implementation notes (slice B) -- Wrapper `SubgraphNode` credits rows are aggregated by the system from - the inner nodes' store rows: several priced inner (recursively - collected, non-wrapper) nodes collapse to `Partner Nodes x N`; exactly - one shows its price with the wrapper's promoted widget values - overriding the inner node's own. The aggregation tracks the inner - rows, the registered-node set, and a structure revision. +- Wrapper `SubgraphNode` credits rows are aggregated by the system over + the inner (recursively collected, non-wrapper) api nodes — the same + count basis as the old unconditional per-api-node badges: several + collapse to `Partner Nodes x N` (localized), exactly one shows its + price with the wrapper's promoted widget values overriding the inner + node's own. The aggregation tracks the inner nodes' pricing + revisions, the registered-node set, and a structure revision. + `useNodePricing` caches labels per signature so a leaf's own read and + its wrapper's override read do not evict each other and re-schedule + forever. - Legacy `drawBadges` renders the store rows through a per-node memoized `LGraphBadge` cache (decision 5); `iconKey` resolves through a generic litegraph `badgeIconRegistry`, with the `credits` icon diff --git a/src/composables/node/useNodePricing.test.ts b/src/composables/node/useNodePricing.test.ts index dc10370620b..d036be3bb8d 100644 --- a/src/composables/node/useNodePricing.test.ts +++ b/src/composables/node/useNodePricing.test.ts @@ -173,6 +173,26 @@ describe('useNodePricing', () => { expect(price).toBe(creditsLabel(0.05)) }) + it('caches per signature so base and override reads both settle', async () => { + const { getNodeDisplayPrice } = useNodePricing() + const node = createMockNodeWithPriceBadge( + 'TestSignatureNode', + priceBadge('{"type":"text","text": widgets.prompt}', [ + { name: 'prompt', type: 'STRING' } + ]), + [{ name: 'prompt', value: 'inner' }] + ) + const overrides = new Map([['prompt', 'outer']]) + + getNodeDisplayPrice(node) + getNodeDisplayPrice(node, overrides) + await new Promise((r) => setTimeout(r, 50)) + + expect(getNodeDisplayPrice(node)).toBe('inner') + expect(getNodeDisplayPrice(node, overrides)).toBe('outer') + expect(getNodeDisplayPrice(node)).toBe('inner') + }) + it('should handle FLOAT widget as number', async () => { const { getNodeDisplayPrice } = useNodePricing() const node = createMockNodeWithPriceBadge( diff --git a/src/composables/node/useNodePricing.ts b/src/composables/node/useNodePricing.ts index 1409938ea5e..cf33bb4f954 100644 --- a/src/composables/node/useNodePricing.ts +++ b/src/composables/node/useNodePricing.ts @@ -469,21 +469,40 @@ const getNodeRevisionRef = (nodeId: NodeId): Ref => { } // WeakMaps avoid memory leaks when nodes are removed. -type CacheEntry = { sig: string; label: string } type InflightEntry = { sig: string; promise: Promise } -const cache = new WeakMap() -const desiredSig = new WeakMap() +// Labels are cached per signature: a node can be read concurrently under +// several signatures (its own widget values, and a SubgraphNode wrapper's +// promoted overrides), and a single-slot cache would make those readers +// evict each other's entry and re-schedule forever. +const MAX_CACHED_SIGNATURES = 8 +const cache = new WeakMap>() const inflight = new WeakMap() +function nodeSigCache(node: LGraphNode): Map { + const existing = cache.get(node) + if (existing) return existing + const next = new Map() + cache.set(node, next) + return next +} + +function cacheLabel(node: LGraphNode, sig: string, label: string): void { + const sigCache = nodeSigCache(node) + sigCache.delete(sig) + sigCache.set(sig, label) + for (const oldest of sigCache.keys()) { + if (sigCache.size <= MAX_CACHED_SIGNATURES) break + sigCache.delete(oldest) + } +} + const scheduleEvaluation = ( node: LGraphNode, rule: CompiledJsonataPricingRule, ctx: JsonataEvalContext, sig: string ) => { - desiredSig.set(node, sig) - const running = inflight.get(node) if (running && running.sig === sig) return @@ -491,19 +510,11 @@ const scheduleEvaluation = ( const promise = Promise.resolve(rule._compiled.evaluate(ctx)) .then((res) => { - const label = formatPricingResult(res) - - // Ignore stale results: if the node changed while we were evaluating, - // desiredSig will no longer match. - if (desiredSig.get(node) !== sig) return - - cache.set(node, { sig, label }) + cacheLabel(node, sig, formatPricingResult(res)) }) .catch(() => { // Cache empty to avoid retry-spam for same signature - if (desiredSig.get(node) === sig) { - cache.set(node, { sig, label: '' }) - } + cacheLabel(node, sig, '') }) .finally(() => { const cur = inflight.get(node) @@ -574,15 +585,15 @@ export const useNodePricing = () => { const ctx = buildJsonataContext(node, rule, widgetOverrides) const sig = buildSignature(ctx, rule) - const cached = cache.get(node) - if (cached && cached.sig === sig) { - return cached.label - } + const sigCache = cache.get(node) + const hit = sigCache?.get(sig) + if (hit !== undefined) return hit // Cache miss: start async evaluation. - // Return last-known label (if any) to avoid flicker; otherwise return empty. + // Return the last-known label (if any) to avoid flicker. scheduleEvaluation(node, rule, ctx, sig) - return cached?.label ?? '' + const labels = [...(sigCache?.values() ?? [])] + return labels.at(-1) ?? '' } /** diff --git a/src/locales/en/main.json b/src/locales/en/main.json index f16c5ad2e86..bd94a5fdffd 100644 --- a/src/locales/en/main.json +++ b/src/locales/en/main.json @@ -2246,6 +2246,9 @@ "failedToToggleGizmo": "Failed to toggle gizmo", "failedToSetGizmoMode": "Failed to set gizmo mode" }, + "nodeBadge": { + "partnerNodesCount": "Partner Nodes x {count}" + }, "nodeErrors": { "render": "Node Render Error", "content": "Node Content Error", diff --git a/src/systems/badgeSystem.subgraph.test.ts b/src/systems/badgeSystem.subgraph.test.ts index 7dae0c326ca..cb165e1e4af 100644 --- a/src/systems/badgeSystem.subgraph.test.ts +++ b/src/systems/badgeSystem.subgraph.test.ts @@ -15,10 +15,13 @@ import { toNodeId } from '@/types/nodeId' import { startBadgeSystem } from './badgeSystem' -const getNodeDisplayPrice = vi.fn( - (_node: LGraphNode, overrides?: ReadonlyMap) => - String(overrides?.get('prompt') ?? '$0.05/Run') -) +function defaultDisplayPrice( + _node: LGraphNode, + overrides?: ReadonlyMap +): string { + return String(overrides?.get('prompt') ?? '$0.05/Run') +} +const getNodeDisplayPrice = vi.fn(defaultDisplayPrice) vi.mock('@/composables/node/useNodePricing', () => ({ useNodePricing: () => ({ @@ -45,6 +48,8 @@ class ApiNode extends LGraphNode { describe('badge system subgraph credits aggregation', () => { beforeEach(() => { setActivePinia(createTestingPinia({ stubActions: false })) + getNodeDisplayPrice.mockReset() + getNodeDisplayPrice.mockImplementation(defaultDisplayPrice) }) function setup() { @@ -97,7 +102,18 @@ describe('badge system subgraph credits aggregation', () => { stop() }) - it('counts partner nodes when several inner api nodes are priced', async () => { + it('counts partner nodes when several inner api nodes exist', async () => { + const { addInner, stop, wrapperCredits } = setup() + addInner(new ApiNode('api-1'), 11) + addInner(new ApiNode('api-2'), 12) + await nextTick() + + expect(wrapperCredits()).toEqual(['Partner Nodes x 2']) + stop() + }) + + it('counts api nodes whose price has not resolved yet', async () => { + getNodeDisplayPrice.mockReturnValue('') const { addInner, stop, wrapperCredits } = setup() addInner(new ApiNode('api-1'), 11) addInner(new ApiNode('api-2'), 12) diff --git a/src/systems/badgeSystem.test.ts b/src/systems/badgeSystem.test.ts index 9ef43feeed0..f4ebf490691 100644 --- a/src/systems/badgeSystem.test.ts +++ b/src/systems/badgeSystem.test.ts @@ -135,16 +135,16 @@ describe('computeBadges', () => { expect(rows.filter((b) => b.kind === 'credits')).toEqual([]) }) - function subgraphPricing(rowCount: number, singleLabel = '') { + function subgraphPricing(apiNodeCount: number, singleLabel = '') { return { isApiNode: false, showApiPricing: true, priceLabel: '', - subgraphCredits: { rowCount, singleLabel } + subgraphCredits: { apiNodeCount, singleLabel } } } - it('aggregates multiple inner credits rows into a partner count', () => { + it('aggregates multiple inner api nodes into a partner count', () => { const rows = computeBadges(sources({ pricing: subgraphPricing(5) })) expect(rows.at(-1)).toMatchObject({ @@ -154,7 +154,7 @@ describe('computeBadges', () => { }) }) - it('passes a single inner credits label through to the wrapper', () => { + it('passes a single inner api node label through to the wrapper', () => { const rows = computeBadges( sources({ pricing: subgraphPricing(1, '$0.05/Run') }) ) @@ -163,7 +163,7 @@ describe('computeBadges', () => { }) it.for([ - { name: 'no inner credits rows', pricing: subgraphPricing(0) }, + { name: 'no inner api nodes', pricing: subgraphPricing(0) }, { name: 'a single empty label', pricing: subgraphPricing(1, '') } ])('projects no wrapper credits row given $name', ({ pricing }) => { const rows = computeBadges(sources({ pricing })) diff --git a/src/systems/badgeSystem.ts b/src/systems/badgeSystem.ts index 1da0484c326..0427c8092cd 100644 --- a/src/systems/badgeSystem.ts +++ b/src/systems/badgeSystem.ts @@ -2,6 +2,7 @@ import { effectScope, ref, watch, watchEffect } from 'vue' import type { EffectScope } from 'vue' import { useNodePricing } from '@/composables/node/useNodePricing' +import { t } from '@/i18n' import { registerBadgeIcon } from '@/lib/litegraph/src/badgeIconRegistry' import type { INodeInputSlot } from '@/lib/litegraph/src/interfaces' import type { LGraphNode, SubgraphNode } from '@/lib/litegraph/src/litegraph' @@ -47,10 +48,10 @@ export interface BadgeSources { priceLabel: string /** * Present on SubgraphNode wrappers: how many inner (recursively - * collected, non-wrapper) nodes carry credits rows, and — when - * exactly one does — the label the wrapper should display. + * collected, non-wrapper) api nodes exist, and — when exactly one + * does — the label the wrapper should display. */ - subgraphCredits?: { rowCount: number; singleLabel: string } + subgraphCredits?: { apiNodeCount: number; singleLabel: string } } } @@ -100,9 +101,12 @@ export function computeBadges(sources: BadgeSources): BadgeData[] { function computeCreditsText(pricing: BadgeSources['pricing']): string { const { subgraphCredits } = pricing if (subgraphCredits) { - if (subgraphCredits.rowCount > 1) - return `Partner Nodes x ${subgraphCredits.rowCount}` - return subgraphCredits.rowCount === 1 ? subgraphCredits.singleLabel : '' + if (subgraphCredits.apiNodeCount > 1) { + return t('nodeBadge.partnerNodesCount', { + count: subgraphCredits.apiNodeCount + }) + } + return subgraphCredits.apiNodeCount === 1 ? subgraphCredits.singleLabel : '' } return pricing.isApiNode && pricing.showApiPricing ? pricing.priceLabel : '' } @@ -186,19 +190,21 @@ function collectPromotedOverrides( /** * A wrapper's credits sources: the inner (recursively collected, - * non-wrapper) nodes whose store rows include a credits row. Tracks the - * inner rows, the registered-node set, and the structure revision, so the - * wrapper recomputes when inner prices, membership, or structure change. + * non-wrapper) api nodes. Tracks their pricing revisions, the + * registered-node set, and the structure revision, so the wrapper + * recomputes when inner prices, membership, or structure change. */ function gatherSubgraphCredits( graphId: UUID, - wrapper: SubgraphNode -): { rowCount: number; singleLabel: string } { + wrapper: SubgraphNode, + showApiPricing: boolean +): { apiNodeCount: number; singleLabel: string } { void subgraphCreditsRevision.value - const badgeStore = useNodeBadgeStore() - void badgeStore.registeredNodeIds(graphId) + void useNodeBadgeStore().registeredNodeIds(graphId) + if (!showApiPricing) return { apiNodeCount: 0, singleLabel: '' } - const creditLeaves: LGraphNode[] = [] + const pricing = useNodePricing() + const apiLeaves: LGraphNode[] = [] const visited = new Set() function walk(nodes: LGraphNode[]): void { for (const inner of nodes) { @@ -209,24 +215,23 @@ function gatherSubgraphCredits( walk(inner.subgraph.nodes) continue } - const hasCredits = badgeStore - .getBadges(graphId, inner.id) - .some((row) => row.kind === 'credits') - if (hasCredits) creditLeaves.push(inner) + if (!inner.constructor?.nodeData?.api_node) continue + void pricing.getNodeRevisionRef(inner.id).value + apiLeaves.push(inner) } } walk(wrapper.subgraph.nodes) - if (creditLeaves.length !== 1) { - return { rowCount: creditLeaves.length, singleLabel: '' } + if (apiLeaves.length !== 1) { + return { apiNodeCount: apiLeaves.length, singleLabel: '' } } - const leaf = creditLeaves[0] + const leaf = apiLeaves[0] const singleLabel = - useNodePricing().getNodeDisplayPrice( + pricing.getNodeDisplayPrice( leaf, collectPromotedOverrides(wrapper, leaf) ) ?? '' - return { rowCount: 1, singleLabel } + return { apiNodeCount: 1, singleLabel } } function gatherSources( @@ -247,7 +252,7 @@ function gatherSources( priceLabel = useNodePricing().getNodeDisplayPrice(node) ?? '' } const subgraphCredits = node?.isSubgraphNode() - ? gatherSubgraphCredits(graphId, node) + ? gatherSubgraphCredits(graphId, node, showApiPricing) : undefined return { From b89098844aa52f7e216a823bc2480e7773d9e25e Mon Sep 17 00:00:00 2001 From: DrJKL Date: Mon, 6 Jul 2026 12:44:24 -0700 Subject: [PATCH 06/22] fix: resolve badge graph id live and register nodes after onNodeAdded LGraph.clear() and configure() reassign the root graph id, so the badge system now resolves it on every recompute instead of capturing it at start; a captured id stranded the system on a dead bucket after Clear Workflow, dropping every badge on nodes added afterwards. LGraph.add registers the node in the badge store only after onNodeAdded: the store write wakes the system watcher and queues Vue's flush, which must not overtake the deferred paste scan that surfaces missing-model errors before selection-scoped tabs recalculate. Co-Authored-By: Claude Fable 5 --- docs/architecture/node-badge-store.md | 16 +++++++--- src/composables/node/useNodeBadge.ts | 26 ++++++---------- src/lib/litegraph/src/LGraph.badges.test.ts | 18 +++++++++++ src/lib/litegraph/src/LGraph.ts | 6 ++-- src/systems/badgeSystem.pricing.test.ts | 2 +- src/systems/badgeSystem.subgraph.test.ts | 2 +- src/systems/badgeSystem.test.ts | 34 ++++++++++++++++++--- src/systems/badgeSystem.ts | 16 +++++++--- 8 files changed, 85 insertions(+), 35 deletions(-) diff --git a/docs/architecture/node-badge-store.md b/docs/architecture/node-badge-store.md index c0a924617db..36fd3a368d4 100644 --- a/docs/architecture/node-badge-store.md +++ b/docs/architecture/node-badge-store.md @@ -110,11 +110,17 @@ Frame-budget parity per ADR 0008's render mitigations applies. `registeredNodeIds` to attach/detach per-node effect scopes. Litegraph never imports the system, so the pricing/nodeDef dependency graph (which runtime-imports the litegraph barrel) stays acyclic. The system - takes a `resolveNode` seam and is bootstrapped at the app layer by the - `Comfy.NodeBadge` extension (`useNodeBadge`), restarting per root - graph on `afterConfigureGraph`. Row writes are refused for - unregistered nodes so a late effect flush cannot resurrect a bucket - key the chokepoints deleted. + takes `resolveGraphId`/`resolveNode` seams and is bootstrapped once at + the app layer by the `Comfy.NodeBadge` extension (`useNodeBadge`). + The graph id is resolved live on every recompute because + `LGraph.clear()` and `configure()` reassign the root graph's id; a + captured id strands the system on a dead bucket. Row writes are + refused for unregistered nodes so a late effect flush cannot + resurrect a bucket key the chokepoints deleted. `LGraph.add` + registers the node only after `onNodeAdded`: the store write wakes + the system's watcher and queues Vue's flush microtask, which must not + overtake the paste-scan microtask `useErrorClearingHooks` enqueues + from `onNodeAdded`. - Two write paths: `setBadgesOfKind` is the system's bulk replace-one-kind recompute path (`@internal`); extension rows go through `registerBadge`/`deleteBadge` per row, identity-checked, so diff --git a/src/composables/node/useNodeBadge.ts b/src/composables/node/useNodeBadge.ts index 06ab266f4fe..dcb92b8cdbc 100644 --- a/src/composables/node/useNodeBadge.ts +++ b/src/composables/node/useNodeBadge.ts @@ -14,11 +14,11 @@ import { resolveNode } from '@/utils/litegraphUtil' /** * Bootstraps the badge system (see docs/architecture/node-badge-store.md): - * starts it against the active root graph, restarts it when the workflow - * is reconfigured, forwards the subgraph structure events the system's - * store sources cannot observe, and keeps the legacy canvas redrawing - * when badge sources change. Dynamic-pricing recalculation wiring stays - * here because it drives price evaluation, not badge storage. + * starts it against the live root graph, forwards the subgraph structure + * events the system's store sources cannot observe, and keeps the legacy + * canvas redrawing when badge sources change. Dynamic-pricing + * recalculation wiring stays here because it drives price evaluation, + * not badge storage. */ export const useNodeBadge = () => { const settingStore = useSettingStore() @@ -53,16 +53,6 @@ export const useNodeBadge = () => { } ) - let stopSystem: (() => void) | undefined - function restartSystem(): void { - stopSystem?.() - const rootGraph = app.rootGraph - stopSystem = startBadgeSystem({ - graphId: rootGraph.id, - resolveNode: (nodeId) => resolveNode(nodeId, rootGraph) - }) - } - function wirePricingRecalculation(node: LGraphNode): void { // JSONata rules are dynamic if they depend on any widgets/inputs/input_groups const pricingConfig = nodePricing.getNodePricingConfig(node) @@ -124,7 +114,10 @@ export const useNodeBadge = () => { } }, init() { - restartSystem() + startBadgeSystem({ + resolveGraphId: () => app.rootGraph.id, + resolveNode: (nodeId) => resolveNode(nodeId, app.rootGraph) + }) app.canvas.canvas.addEventListener<'litegraph:set-graph'>( 'litegraph:set-graph', () => { @@ -140,7 +133,6 @@ export const useNodeBadge = () => { ) }, afterConfigureGraph() { - restartSystem() bumpSubgraphCreditsRevision() } }) diff --git a/src/lib/litegraph/src/LGraph.badges.test.ts b/src/lib/litegraph/src/LGraph.badges.test.ts index ea22c5460a4..bac03bc8e69 100644 --- a/src/lib/litegraph/src/LGraph.badges.test.ts +++ b/src/lib/litegraph/src/LGraph.badges.test.ts @@ -29,6 +29,24 @@ describe('LGraph node badge registration', () => { ) }) + it('registers only after onNodeAdded has fired', () => { + const graph = new LGraph() + const node = new LGraphNode('n') + let registeredDuringCallback: boolean | undefined + graph.onNodeAdded = () => { + registeredDuringCallback = useNodeBadgeStore() + .registeredNodeIds(graph.rootGraph.id) + .includes(node.id) + } + + graph.add(node) + + expect(registeredDuringCallback).toBe(false) + expect(useNodeBadgeStore().registeredNodeIds(graph.rootGraph.id)).toEqual([ + node.id + ]) + }) + it('clears the root bucket when the root graph is cleared', () => { const graph = new LGraph() graph.id = createUuidv4() diff --git a/src/lib/litegraph/src/LGraph.ts b/src/lib/litegraph/src/LGraph.ts index b773e2d25e4..63faffe1469 100644 --- a/src/lib/litegraph/src/LGraph.ts +++ b/src/lib/litegraph/src/LGraph.ts @@ -1091,8 +1091,6 @@ export class LGraph node.graph = this this.incrementVersion() - useNodeBadgeStore().registerNode(this.rootGraph.id, node.id) - // Register all widgets with the WidgetValueStore now that node has a // valid ID and graph reference. if (node.widgets) { @@ -1118,6 +1116,10 @@ export class LGraph this.onNodeAdded?.(node) + // After onNodeAdded: this write wakes a watcher, queueing Vue's flush + // microtask, which must not overtake onNodeAdded's paste-scan microtask. + useNodeBadgeStore().registerNode(this.rootGraph.id, node.id) + this.setDirtyCanvas(true) this.change() diff --git a/src/systems/badgeSystem.pricing.test.ts b/src/systems/badgeSystem.pricing.test.ts index e5ac4a1d8a8..e7971986f82 100644 --- a/src/systems/badgeSystem.pricing.test.ts +++ b/src/systems/badgeSystem.pricing.test.ts @@ -54,7 +54,7 @@ describe('badge system pricing input connectivity', () => { useNodeBadgeStore().registerNode(graphId, node.id) const stop = startBadgeSystem({ - graphId, + resolveGraphId: () => graphId, resolveNode: (id) => (id === node.id ? node : undefined) }) return { node, stop } diff --git a/src/systems/badgeSystem.subgraph.test.ts b/src/systems/badgeSystem.subgraph.test.ts index cb165e1e4af..c23852ed87f 100644 --- a/src/systems/badgeSystem.subgraph.test.ts +++ b/src/systems/badgeSystem.subgraph.test.ts @@ -71,7 +71,7 @@ describe('badge system subgraph credits aggregation', () => { } const stop = startBadgeSystem({ - graphId, + resolveGraphId: () => graphId, resolveNode: (id) => knownNodes.get(id) }) diff --git a/src/systems/badgeSystem.test.ts b/src/systems/badgeSystem.test.ts index f4ebf490691..cc7af745058 100644 --- a/src/systems/badgeSystem.test.ts +++ b/src/systems/badgeSystem.test.ts @@ -208,7 +208,7 @@ describe('startBadgeSystem', () => { badgeStore.registerNode(graphId, node.id) const stop = startBadgeSystem({ - graphId, + resolveGraphId: () => graphId, resolveNode: (id) => (id === node.id ? node : undefined) }) @@ -229,7 +229,7 @@ describe('startBadgeSystem', () => { const node = makeNode(3) const stop = startBadgeSystem({ - graphId, + resolveGraphId: () => graphId, resolveNode: (id) => (id === node.id ? node : undefined) }) expect(badgeStore.getBadges(graphId, node.id)).toEqual([]) @@ -249,7 +249,7 @@ describe('startBadgeSystem', () => { const node = makeNode(7) badgeStore.registerNode(graphId, node.id) const stop = startBadgeSystem({ - graphId, + resolveGraphId: () => graphId, resolveNode: (id) => (id === node.id ? node : undefined) }) @@ -264,12 +264,38 @@ describe('startBadgeSystem', () => { stop() }) + it('follows the root graph id across a workflow clear', async () => { + const badgeStore = useNodeBadgeStore() + const node = makeNode(9) + let liveGraphId: UUID = graphId + badgeStore.registerNode(graphId, node.id) + + const stop = startBadgeSystem({ + resolveGraphId: () => liveGraphId, + resolveNode: (id) => (id === node.id ? node : undefined) + }) + expect(badgeStore.getBadges(graphId, node.id).map((b) => b.text)).toEqual([ + '#9' + ]) + + badgeStore.clearGraph(graphId) + liveGraphId = 'graph-after-clear' + badgeStore.registerNode(liveGraphId, node.id) + await nextTick() + + expect( + badgeStore.getBadges(liveGraphId, node.id).map((b) => b.text) + ).toEqual(['#9']) + + stop() + }) + it('stops writing after the system itself is stopped', async () => { const badgeStore = useNodeBadgeStore() const node = makeNode(7) badgeStore.registerNode(graphId, node.id) const stop = startBadgeSystem({ - graphId, + resolveGraphId: () => graphId, resolveNode: (id) => (id === node.id ? node : undefined) }) diff --git a/src/systems/badgeSystem.ts b/src/systems/badgeSystem.ts index 0427c8092cd..0ef7607b681 100644 --- a/src/systems/badgeSystem.ts +++ b/src/systems/badgeSystem.ts @@ -112,7 +112,11 @@ function computeCreditsText(pricing: BadgeSources['pricing']): string { } export interface BadgeSystemOptions { - graphId: UUID + /** + * Read live on every recompute: `LGraph.clear()` and `configure()` + * reassign the root graph's id, so a captured id goes stale. + */ + resolveGraphId: () => UUID /** Must resolve ids anywhere in the subgraph hierarchy. */ resolveNode: (nodeId: NodeId) => LGraphNode | undefined } @@ -236,9 +240,10 @@ function gatherSubgraphCredits( function gatherSources( options: BadgeSystemOptions, + graphId: UUID, nodeId: NodeId ): BadgeSources { - const { graphId, resolveNode } = options + const { resolveNode } = options const settingStore = useSettingStore() const palette = useColorPaletteStore().completedActivePalette const node = resolveNode(nodeId) @@ -306,10 +311,11 @@ export function startBadgeSystem(options: BadgeSystemOptions): () => void { const scope = effectScope(true) scope.run(() => { watchEffect(() => { - const rows = computeBadges(gatherSources(options, nodeId)) + const graphId = options.resolveGraphId() + const rows = computeBadges(gatherSources(options, graphId, nodeId)) for (const kind of SYSTEM_BADGE_KINDS) { badgeStore.setBadgesOfKind( - options.graphId, + graphId, nodeId, kind, rows.filter((row) => row.kind === kind) @@ -323,7 +329,7 @@ export function startBadgeSystem(options: BadgeSystemOptions): () => void { const systemScope = effectScope(true) systemScope.run(() => { watch( - () => badgeStore.registeredNodeIds(options.graphId), + () => badgeStore.registeredNodeIds(options.resolveGraphId()), (nodeIds) => { const live = new Set(nodeIds) for (const [nodeId, scope] of nodeScopes) { From 2f665ef1ae4c25e08451421e35aab6982eb6c587 Mon Sep 17 00:00:00 2001 From: DrJKL Date: Mon, 6 Jul 2026 12:55:10 -0700 Subject: [PATCH 07/22] refactor: trim badge comments to constraints the code cannot show Co-Authored-By: Claude Fable 5 --- src/composables/node/useNodeBadge.ts | 12 +++++------- src/lib/litegraph/src/nodeBadgeDraw.ts | 3 +-- .../composables/usePartitionedBadges.ts | 8 +++----- src/stores/nodeBadgeStore.ts | 2 +- src/systems/badgeSystem.ts | 18 ++++++++---------- src/types/badgeData.ts | 2 +- 6 files changed, 19 insertions(+), 26 deletions(-) diff --git a/src/composables/node/useNodeBadge.ts b/src/composables/node/useNodeBadge.ts index dcb92b8cdbc..1aad02027e6 100644 --- a/src/composables/node/useNodeBadge.ts +++ b/src/composables/node/useNodeBadge.ts @@ -13,12 +13,11 @@ import { import { resolveNode } from '@/utils/litegraphUtil' /** - * Bootstraps the badge system (see docs/architecture/node-badge-store.md): - * starts it against the live root graph, forwards the subgraph structure - * events the system's store sources cannot observe, and keeps the legacy - * canvas redrawing when badge sources change. Dynamic-pricing - * recalculation wiring stays here because it drives price evaluation, - * not badge storage. + * Bootstraps the badge system: starts it against the live root graph, + * forwards the subgraph structure events its store sources cannot + * observe, and keeps the legacy canvas redrawing when badge sources + * change. Dynamic-pricing recalculation wiring stays here because it + * drives price evaluation, not badge storage. */ export const useNodeBadge = () => { const settingStore = useSettingStore() @@ -54,7 +53,6 @@ export const useNodeBadge = () => { ) function wirePricingRecalculation(node: LGraphNode): void { - // JSONata rules are dynamic if they depend on any widgets/inputs/input_groups const pricingConfig = nodePricing.getNodePricingConfig(node) const hasDynamicPricing = !!pricingConfig && diff --git a/src/lib/litegraph/src/nodeBadgeDraw.ts b/src/lib/litegraph/src/nodeBadgeDraw.ts index 9c508e7e861..ce446c92ae2 100644 --- a/src/lib/litegraph/src/nodeBadgeDraw.ts +++ b/src/lib/litegraph/src/nodeBadgeDraw.ts @@ -51,8 +51,7 @@ const drawCache = new WeakMap() /** * The legacy canvas draw objects for a node's badge rows, rebuilt only - * when the row content changes. Renderer-side state (the Reroute id-badge - * pattern); the rows stay plain data. + * when the row content changes. */ export function badgeDrawObjects( node: object, diff --git a/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.ts b/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.ts index 900b4e80519..b92afca8525 100644 --- a/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.ts +++ b/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.ts @@ -17,11 +17,9 @@ function splitAroundFirstSpace(text: string): [string, string | undefined] { } /** - * Partitions a node's badge rows from {@link useNodeBadgeStore} for the - * Vue renderer: core rows become chips (lifecycle text is bracket-trimmed - * and a built-in node's source row is replaced by the Comfy logo chip), - * credits rows become pricing entries, and badges pushed onto the raw - * `node.badges` extension surface are appended as extension chips. + * Partitions a node's badge rows into the Vue renderer's chips: core + * rows, credits rows as pricing entries, and raw `node.badges` + * extension badges appended last. */ export function usePartitionedBadges(nodeData: VueNodeData) { const settingStore = useSettingStore() diff --git a/src/stores/nodeBadgeStore.ts b/src/stores/nodeBadgeStore.ts index 3ae1291aff4..8ff56abd4c8 100644 --- a/src/stores/nodeBadgeStore.ts +++ b/src/stores/nodeBadgeStore.ts @@ -17,7 +17,7 @@ function kindRank(kind: BadgeKind): number { * buckets keyed by `NodeId`. Rows are plain {@link BadgeData}; reads are * ordered by kind (core, credits, extension), not insertion. The badge * system rewrites its kinds wholesale; extension rows are appended and - * removed individually. See docs/architecture/node-badge-store.md. + * removed individually. */ export const useNodeBadgeStore = defineStore('nodeBadge', () => { const buckets = ref(new Map>()) diff --git a/src/systems/badgeSystem.ts b/src/systems/badgeSystem.ts index 0ef7607b681..0a0b9c91836 100644 --- a/src/systems/badgeSystem.ts +++ b/src/systems/badgeSystem.ts @@ -29,9 +29,9 @@ interface NodeDefBadgeSources { } /** - * The domain state a node's system-written badges are computed from; see - * domain-glossary.md § Badges. Plain data so {@link computeBadges} stays - * pure — the watch shell gathers these from the live stores. + * The domain state a node's system-written badges are computed from. + * Plain data so {@link computeBadges} stays pure — the watch shell + * gathers these from the live stores. */ export interface BadgeSources { nodeId: NodeId @@ -47,9 +47,8 @@ export interface BadgeSources { showApiPricing: boolean priceLabel: string /** - * Present on SubgraphNode wrappers: how many inner (recursively - * collected, non-wrapper) api nodes exist, and — when exactly one - * does — the label the wrapper should display. + * Present on SubgraphNode wrappers: the inner api-node count and, + * when exactly one exists, its display label. */ subgraphCredits?: { apiNodeCount: number; singleLabel: string } } @@ -193,10 +192,9 @@ function collectPromotedOverrides( } /** - * A wrapper's credits sources: the inner (recursively collected, - * non-wrapper) api nodes. Tracks their pricing revisions, the - * registered-node set, and the structure revision, so the wrapper - * recomputes when inner prices, membership, or structure change. + * Tracks the inner api nodes' pricing revisions, the registered-node + * set, and the structure revision so the wrapper recomputes when inner + * prices, membership, or structure change. */ function gatherSubgraphCredits( graphId: UUID, diff --git a/src/types/badgeData.ts b/src/types/badgeData.ts index 41299b524c1..748f84a21f2 100644 --- a/src/types/badgeData.ts +++ b/src/types/badgeData.ts @@ -1,4 +1,4 @@ -/** Display order of badge kinds; see domain-glossary.md § Badges. */ +/** Display order of badge kinds. */ export const BADGE_KIND_ORDER = ['core', 'credits', 'extension'] as const export type BadgeKind = (typeof BADGE_KIND_ORDER)[number] From 0c61bd385a3b0f41cdbf86c272371bbbb9b0a35d Mon Sep 17 00:00:00 2001 From: DrJKL Date: Mon, 6 Jul 2026 13:32:04 -0700 Subject: [PATCH 08/22] fix: track badge bucket membership so workflow loads wake the system The system's watch tracked only the current graph id's bucket key; a workflow load buckets nodes under a brand-new graph id the watcher had never observed, so it never fired again and no badges were written after any configure. registeredNodeIds now also reads the bucket map size, so bucket creation and deletion wake readers regardless of which id they last saw. Co-Authored-By: Claude Fable 5 --- src/stores/nodeBadgeStore.ts | 4 ++++ src/systems/badgeSystem.test.ts | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/stores/nodeBadgeStore.ts b/src/stores/nodeBadgeStore.ts index 8ff56abd4c8..9bcb79f4091 100644 --- a/src/stores/nodeBadgeStore.ts +++ b/src/stores/nodeBadgeStore.ts @@ -111,6 +111,10 @@ export const useNodeBadgeStore = defineStore('nodeBadge', () => { /** The registered nodes of a graph bucket; reads are tracked. */ function registeredNodeIds(graphId: UUID): NodeId[] { + // Track bucket membership too: a workflow load creates the bucket + // under a graph id no reader has observed yet, and a get() miss + // alone would leave those readers blind to it. + void buckets.value.size return [...(buckets.value.get(graphId)?.keys() ?? [])] } diff --git a/src/systems/badgeSystem.test.ts b/src/systems/badgeSystem.test.ts index cc7af745058..259e2ca1a14 100644 --- a/src/systems/badgeSystem.test.ts +++ b/src/systems/badgeSystem.test.ts @@ -290,6 +290,26 @@ describe('startBadgeSystem', () => { stop() }) + it('follows a workflow load that replaces an unconfigured graph id', async () => { + const badgeStore = useNodeBadgeStore() + const node = makeNode(4) + let liveGraphId: UUID = 'graph-unconfigured' + const stop = startBadgeSystem({ + resolveGraphId: () => liveGraphId, + resolveNode: (id) => (id === node.id ? node : undefined) + }) + + liveGraphId = 'graph-configured' + badgeStore.registerNode(liveGraphId, node.id) + await nextTick() + + expect( + badgeStore.getBadges(liveGraphId, node.id).map((b) => b.text) + ).toEqual(['#4']) + + stop() + }) + it('stops writing after the system itself is stopped', async () => { const badgeStore = useNodeBadgeStore() const node = makeNode(7) From c803336445a939e97a88b3196afdc70fa5348167 Mon Sep 17 00:00:00 2001 From: DrJKL Date: Tue, 14 Jul 2026 21:18:44 -0700 Subject: [PATCH 09/22] refactor: address badge review feedback - registeredNodeIds tracks bucket size only on get() miss, sparing hit-path readers spurious invalidations from unrelated buckets - replace mutable-accumulator walk with collectApiLeaves flatMap; keeps definition-dedupe and cycle guard from legacy usePriceBadge --- src/stores/nodeBadgeStore.ts | 13 ++++++++----- src/systems/badgeSystem.ts | 35 +++++++++++++++++++---------------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/stores/nodeBadgeStore.ts b/src/stores/nodeBadgeStore.ts index 9bcb79f4091..6f0dad0279c 100644 --- a/src/stores/nodeBadgeStore.ts +++ b/src/stores/nodeBadgeStore.ts @@ -111,11 +111,14 @@ export const useNodeBadgeStore = defineStore('nodeBadge', () => { /** The registered nodes of a graph bucket; reads are tracked. */ function registeredNodeIds(graphId: UUID): NodeId[] { - // Track bucket membership too: a workflow load creates the bucket - // under a graph id no reader has observed yet, and a get() miss - // alone would leave those readers blind to it. - void buckets.value.size - return [...(buckets.value.get(graphId)?.keys() ?? [])] + const bucket = buckets.value.get(graphId) + if (!bucket) { + // Track bucket membership so a miss wakes when a workflow load + // creates the bucket under a graph id no reader has observed yet. + void buckets.value.size + return [] + } + return [...bucket.keys()] } function clearGraph(graphId: UUID): void { diff --git a/src/systems/badgeSystem.ts b/src/systems/badgeSystem.ts index 0a0b9c91836..d96c64319ee 100644 --- a/src/systems/badgeSystem.ts +++ b/src/systems/badgeSystem.ts @@ -196,6 +196,22 @@ function collectPromotedOverrides( * set, and the structure revision so the wrapper recomputes when inner * prices, membership, or structure change. */ +/** Api-node leaves, visiting each subgraph definition once (legacy count semantics + cycle guard). */ +function collectApiLeaves( + nodes: LGraphNode[], + visited: Set +): LGraphNode[] { + return nodes.flatMap((inner) => { + if (inner.isSubgraphNode()) { + const subgraphId = String(inner.subgraph.id) + if (visited.has(subgraphId)) return [] + visited.add(subgraphId) + return collectApiLeaves(inner.subgraph.nodes, visited) + } + return inner.constructor?.nodeData?.api_node ? [inner] : [] + }) +} + function gatherSubgraphCredits( graphId: UUID, wrapper: SubgraphNode, @@ -206,23 +222,10 @@ function gatherSubgraphCredits( if (!showApiPricing) return { apiNodeCount: 0, singleLabel: '' } const pricing = useNodePricing() - const apiLeaves: LGraphNode[] = [] - const visited = new Set() - function walk(nodes: LGraphNode[]): void { - for (const inner of nodes) { - if (inner.isSubgraphNode()) { - const subgraphId = String(inner.subgraph.id) - if (visited.has(subgraphId)) continue - visited.add(subgraphId) - walk(inner.subgraph.nodes) - continue - } - if (!inner.constructor?.nodeData?.api_node) continue - void pricing.getNodeRevisionRef(inner.id).value - apiLeaves.push(inner) - } + const apiLeaves = collectApiLeaves(wrapper.subgraph.nodes, new Set()) + for (const leaf of apiLeaves) { + void pricing.getNodeRevisionRef(leaf.id).value } - walk(wrapper.subgraph.nodes) if (apiLeaves.length !== 1) { return { apiNodeCount: apiLeaves.length, singleLabel: '' } From 6e0429b9a3a22ce40f3b46a3f01f193bf03b6e03 Mon Sep 17 00:00:00 2001 From: DrJKL Date: Tue, 14 Jul 2026 21:23:01 -0700 Subject: [PATCH 10/22] refactor: unify unique-node traversal as mapUniqueNodes Subgraph instances share their definition's nodes, so mapAllNodes revisits shared internals per instance. mapUniqueNodes visits each definition once and terminates on cycles. Replaces the local walk in badgeSystem and fixes duplicate PartnerNodesList entries (and v-for keys) when a subgraph is instanced more than once. --- .../linearMode/PartnerNodesList.vue | 4 +- src/systems/badgeSystem.ts | 23 +++--------- src/utils/graphTraversalUtil.test.ts | 37 +++++++++++++++++++ src/utils/graphTraversalUtil.ts | 34 +++++++++++++++++ 4 files changed, 79 insertions(+), 19 deletions(-) diff --git a/src/renderer/extensions/linearMode/PartnerNodesList.vue b/src/renderer/extensions/linearMode/PartnerNodesList.vue index 5e6d7f22b41..5a9d2f093c4 100644 --- a/src/renderer/extensions/linearMode/PartnerNodesList.vue +++ b/src/renderer/extensions/linearMode/PartnerNodesList.vue @@ -12,7 +12,7 @@ import Popover from '@/components/ui/Popover.vue' import PartnerNodeItem from '@/renderer/extensions/linearMode/PartnerNodeItem.vue' import { app } from '@/scripts/app' import { useNodeBadgeStore } from '@/stores/nodeBadgeStore' -import { mapAllNodes } from '@/utils/graphTraversalUtil' +import { mapUniqueNodes } from '@/utils/graphTraversalUtil' defineProps<{ mobile?: boolean }>() @@ -20,7 +20,7 @@ const { t } = useI18n() const badgeStore = useNodeBadgeStore() const creditsBadges = computed(() => - mapAllNodes(app.graph, (node) => { + mapUniqueNodes(app.graph, (node) => { if (node.isSubgraphNode()) return const priceRow = badgeStore diff --git a/src/systems/badgeSystem.ts b/src/systems/badgeSystem.ts index d96c64319ee..0a7d9e91615 100644 --- a/src/systems/badgeSystem.ts +++ b/src/systems/badgeSystem.ts @@ -19,6 +19,7 @@ import type { NodeId } from '@/types/nodeId' import { NodeBadgeMode } from '@/types/nodeSource' import { widgetId } from '@/types/widgetId' import { adjustColor } from '@/utils/colorUtil' +import { mapUniqueNodes } from '@/utils/graphTraversalUtil' import type { UUID } from '@/utils/uuid' /** The badge-relevant projection of a node's definition. */ @@ -196,22 +197,6 @@ function collectPromotedOverrides( * set, and the structure revision so the wrapper recomputes when inner * prices, membership, or structure change. */ -/** Api-node leaves, visiting each subgraph definition once (legacy count semantics + cycle guard). */ -function collectApiLeaves( - nodes: LGraphNode[], - visited: Set -): LGraphNode[] { - return nodes.flatMap((inner) => { - if (inner.isSubgraphNode()) { - const subgraphId = String(inner.subgraph.id) - if (visited.has(subgraphId)) return [] - visited.add(subgraphId) - return collectApiLeaves(inner.subgraph.nodes, visited) - } - return inner.constructor?.nodeData?.api_node ? [inner] : [] - }) -} - function gatherSubgraphCredits( graphId: UUID, wrapper: SubgraphNode, @@ -222,7 +207,11 @@ function gatherSubgraphCredits( if (!showApiPricing) return { apiNodeCount: 0, singleLabel: '' } const pricing = useNodePricing() - const apiLeaves = collectApiLeaves(wrapper.subgraph.nodes, new Set()) + const apiLeaves = mapUniqueNodes(wrapper.subgraph, (node) => + !node.isSubgraphNode() && node.constructor?.nodeData?.api_node + ? node + : undefined + ) for (const leaf of apiLeaves) { void pricing.getNodeRevisionRef(leaf.id).value } diff --git a/src/utils/graphTraversalUtil.test.ts b/src/utils/graphTraversalUtil.test.ts index 7058e58ad4e..f0169232e9d 100644 --- a/src/utils/graphTraversalUtil.test.ts +++ b/src/utils/graphTraversalUtil.test.ts @@ -23,6 +23,7 @@ import { getExecutionIdFromNodeData, mapAllNodes, mapSubgraphNodes, + mapUniqueNodes, parseExecutionId, traverseNodesDepthFirst, traverseSubgraphPath, @@ -393,6 +394,42 @@ describe('graphTraversalUtil', () => { }) }) + describe('mapUniqueNodes', () => { + it('visits a shared subgraph definition once', () => { + const innerNode = createMockNode(100) + const subgraph = createMockSubgraph('shared-uuid', [innerNode]) + + const graph = createMockGraph([ + createMockNode(1, { isSubgraph: true, subgraph }), + createMockNode(2, { isSubgraph: true, subgraph }) + ]) + + expect(mapAllNodes(graph, (node) => Number(node.id))).toEqual([ + 100, 1, 100, 2 + ]) + expect(mapUniqueNodes(graph, (node) => Number(node.id))).toEqual([ + 100, 1, 2 + ]) + }) + + it('terminates on cyclic subgraphs', () => { + const innerNodes: LGraphNode[] = [] + const subgraph = createMockSubgraph('cycle-uuid', innerNodes) + innerNodes.push( + createMockNode(10, { isSubgraph: true, subgraph }), + createMockNode(11) + ) + + const graph = createMockGraph([ + createMockNode(1, { isSubgraph: true, subgraph }) + ]) + + expect(mapUniqueNodes(graph, (node) => Number(node.id))).toEqual([ + 10, 11, 1 + ]) + }) + }) + describe('forEachNode', () => { it('should execute function on all nodes in a flat graph', () => { const nodes = [createMockNode(1), createMockNode(2), createMockNode(3)] diff --git a/src/utils/graphTraversalUtil.ts b/src/utils/graphTraversalUtil.ts index 021ff600d6a..6a155aab55f 100644 --- a/src/utils/graphTraversalUtil.ts +++ b/src/utils/graphTraversalUtil.ts @@ -173,6 +173,40 @@ export function mapAllNodes( return results } +/** + * Maps a function over each unique node in a graph hierarchy. Subgraph + * instances share their definition's nodes, so unlike {@link mapAllNodes} + * each subgraph definition is visited once and cyclic subgraphs terminate. + * + * @param graph - The root graph to traverse + * @param mapFn - Function to apply to each node + * @returns Array of mapped results (excluding undefined values) + */ +export function mapUniqueNodes( + graph: LGraph | Subgraph, + mapFn: (node: LGraphNode) => T | undefined, + visited: Set = new Set([String(graph.id)]) +): T[] { + const results: T[] = [] + + visitGraphNodes(graph, (node) => { + if (node.isSubgraphNode?.() && node.subgraph) { + const subgraphId = String(node.subgraph.id) + if (!visited.has(subgraphId)) { + visited.add(subgraphId) + results.push(...mapUniqueNodes(node.subgraph, mapFn, visited)) + } + } + + const result = mapFn(node) + if (result !== undefined) { + results.push(result) + } + }) + + return results +} + /** * Executes a side-effect function on all nodes in a graph hierarchy. * This is for operations that modify nodes or perform side effects. From 0ec2f5570a72abd000078b477d67cc0668ad39e9 Mon Sep 17 00:00:00 2001 From: DrJKL Date: Wed, 15 Jul 2026 02:00:48 -0700 Subject: [PATCH 11/22] refactor: system-owned badge rows, wholesale writes, dead code removal Extension badge kind deleted: node.badges is the raw extension surface, sampled by the Vue partition on recompute. Store rows are replaced wholesale per write so the draw cache keys on array identity instead of JSON. wirePricingRecalculation and its onConnectionsChange patch were redundant with the system's tracked sources. badgePosition returns as a deprecated no-op accessor. BadgeData and pricing sources are discriminated unions. --- docs/architecture/node-badge-store.md | 45 +++--- src/composables/node/useNodeBadge.ts | 69 +-------- src/composables/node/useNodePricing.test.ts | 74 ---------- src/composables/node/useNodePricing.ts | 26 ---- src/lib/litegraph/src/LGraphNode.ts | 14 ++ src/lib/litegraph/src/nodeBadgeDraw.test.ts | 19 +-- src/lib/litegraph/src/nodeBadgeDraw.ts | 58 +++++--- .../linearMode/PartnerNodesList.vue | 18 ++- .../composables/usePartitionedBadges.test.ts | 139 ++++++++++++++++++ .../composables/usePartitionedBadges.ts | 29 ++-- src/stores/nodeBadgeStore.test.ts | 109 +++++--------- src/stores/nodeBadgeStore.ts | 108 ++++---------- src/systems/badgeSystem.test.ts | 23 +-- src/systems/badgeSystem.ts | 123 +++++++--------- src/types/badgeData.ts | 31 ++-- src/utils/graphTraversalUtil.ts | 11 +- 16 files changed, 406 insertions(+), 490 deletions(-) create mode 100644 src/renderer/extensions/vueNodes/composables/usePartitionedBadges.test.ts diff --git a/docs/architecture/node-badge-store.md b/docs/architecture/node-badge-store.md index 36fd3a368d4..a870897fd98 100644 --- a/docs/architecture/node-badge-store.md +++ b/docs/architecture/node-badge-store.md @@ -38,15 +38,15 @@ the store rows the single truth both renderers read. The store holds only plain data (ADR 0008 component rule): ``` -BadgeData { - kind: 'core' | 'credits' | 'extension' - text: string - fgColor?: string - bgColor?: string - iconKey?: string // resolved via a small icon registry ('credits' → SVG) -} +BadgeData = CoreBadgeData | CreditsBadgeData // discriminated on `kind` + // core rows require `part`; credits rows may carry an `iconKey` + // resolved via a small icon registry ('credits' → SVG) ``` +There is no `extension` kind: resolved decision 1 below keeps +`node.badges` as the raw extension surface, so the store holds only +system-computed rows and the system replaces them wholesale per write. + No `onClick` (no producer exists; `LGraphButton`/`title_buttons` are a separate surface and out of scope). No `Image` objects — icons are referenced by key. A `commandId` field can be added if a clickable badge @@ -65,8 +65,9 @@ unregister / unregister-all trio at the `LGraph.add` / `LGraph.remove` / conventions. Rows are partitioned by `kind` at read time; the positional `slice(1)` -convention and icon-identity credits detection are deleted. Display -order is kind order (core, credits, extension), not insertion order. +convention and icon-identity credits detection are deleted. The system +emits rows in display order (core, then credits) and replaces a node's +array wholesale, so reads are identity-stable between writes. ## Decision 3: A reactive BadgeSystem writes the rows @@ -121,10 +122,9 @@ Frame-budget parity per ADR 0008's render mitigations applies. the system's watcher and queues Vue's flush microtask, which must not overtake the paste-scan microtask `useErrorClearingHooks` enqueues from `onNodeAdded`. -- Two write paths: `setBadgesOfKind` is the system's bulk - replace-one-kind recompute path (`@internal`); extension rows go - through `registerBadge`/`deleteBadge` per row, identity-checked, so - independent writers cannot stomp each other. +- One write path: the system replaces a node's rows wholesale via + `setBadges` on every recompute, so no intermediate per-kind state is + ever observable. - The shell still reads `node.constructor.nodeData` and `node.inputs` (untracked instance state) to map pricing input names to slot indices — parity with the legacy closures. Those reads become store @@ -154,9 +154,19 @@ Frame-budget parity per ADR 0008's render mitigations applies. its wrapper's override read do not evict each other and re-schedule forever. - Legacy `drawBadges` renders the store rows through a per-node - memoized `LGraphBadge` cache (decision 5); `iconKey` resolves through - a generic litegraph `badgeIconRegistry`, with the `credits` icon - registered by the system module. + memoized `LGraphBadge` cache (decision 5) keyed on the rows array's + identity — wholesale replacement makes identity the change signal, so + the per-frame path allocates nothing on cache hits. `iconKey` resolves + through a generic litegraph `badgeIconRegistry`, with the `credits` + icon registered when the system starts. +- The Vue renderer samples `node.badges` whenever its partition computed + re-runs; live array mutation and ticking thunks are visible per frame + only in the legacy canvas. Array interception was considered and + rejected: it cannot see thunk output changes (the dominant ecosystem + pattern), so it buys property patching without covering the real case. + If a pack demonstrably needs live Vue updates, the escalation is a + reactive accessor declared on `LGraphNode` itself, not renderer-side + `defineProperty`. ## Resolved decisions (2026-07-06 interview) @@ -172,7 +182,8 @@ Frame-budget parity per ADR 0008's render mitigations applies. scan was wrong. 2. **`node.badgePosition` — deleted**, along with the `BadgePosition` enum. Zero uses outside this repo; the legacy canvas now always - renders badges top-right (the only surviving behaviour). + renders badges top-right (the only surviving behaviour). A no-op + deprecated accessor remains and warns on access. 3. **Subgraph credits aggregation triggers — event-bumped revision.** `litegraph:set-graph`, `subgraph-converted`, and `afterConfigureGraph` bump `bumpSubgraphCreditsRevision()`; swap to diff --git a/src/composables/node/useNodeBadge.ts b/src/composables/node/useNodeBadge.ts index 1aad02027e6..eefb54a6acb 100644 --- a/src/composables/node/useNodeBadge.ts +++ b/src/composables/node/useNodeBadge.ts @@ -1,8 +1,6 @@ -import { computed, onMounted, watch } from 'vue' +import { computed, onMounted, onUnmounted, watch } from 'vue' import { useNodePricing } from '@/composables/node/useNodePricing' -import { useComputedWithWidgetWatch } from '@/composables/node/useWatchWidget' -import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import { useSettingStore } from '@/platform/settings/settingStore' import { app } from '@/scripts/app' import { useExtensionStore } from '@/stores/extensionStore' @@ -16,8 +14,7 @@ import { resolveNode } from '@/utils/litegraphUtil' * Bootstraps the badge system: starts it against the live root graph, * forwards the subgraph structure events its store sources cannot * observe, and keeps the legacy canvas redrawing when badge sources - * change. Dynamic-pricing recalculation wiring stays here because it - * drives price evaluation, not badge storage. + * change. */ export const useNodeBadge = () => { const settingStore = useSettingStore() @@ -39,6 +36,9 @@ export const useNodeBadge = () => { } ) + let stopBadgeSystem: (() => void) | undefined + onUnmounted(() => stopBadgeSystem?.()) + onMounted(() => { if (extensionStore.isExtensionInstalled('Comfy.NodeBadge')) return @@ -52,67 +52,10 @@ export const useNodeBadge = () => { } ) - function wirePricingRecalculation(node: LGraphNode): void { - const pricingConfig = nodePricing.getNodePricingConfig(node) - const hasDynamicPricing = - !!pricingConfig && - ((pricingConfig.depends_on?.widgets?.length ?? 0) > 0 || - (pricingConfig.depends_on?.inputs?.length ?? 0) > 0 || - (pricingConfig.depends_on?.input_groups?.length ?? 0) > 0) - if (!hasDynamicPricing) return - - const relevantWidgetNames = nodePricing.getRelevantWidgetNames( - node.constructor.nodeData?.name ?? '' - ) - const computedWithWidgetWatch = useComputedWithWidgetWatch(node, { - widgetNames: relevantWidgetNames, - triggerCanvasRedraw: true - }) - // Installs the widget listeners; the returned value is unused. - computedWithWidgetWatch(() => 0) - - const relevantInputs = pricingConfig?.depends_on?.inputs ?? [] - const inputGroupPrefixes = pricingConfig?.depends_on?.input_groups ?? [] - if (relevantInputs.length === 0 && inputGroupPrefixes.length === 0) return - - const originalOnConnectionsChange = node.onConnectionsChange - node.onConnectionsChange = function ( - type, - slotIndex, - isConnected, - link, - ioSlot - ) { - originalOnConnectionsChange?.call( - this, - type, - slotIndex, - isConnected, - link, - ioSlot - ) - const inputName = ioSlot?.name - if (!inputName) return - const isRelevantInput = - relevantInputs.includes(inputName) || - inputGroupPrefixes.some((prefix) => - inputName.startsWith(prefix + '.') - ) - if (isRelevantInput) { - nodePricing.triggerPriceRecalculation(node) - } - } - } - extensionStore.registerExtension({ name: 'Comfy.NodeBadge', - nodeCreated(node: LGraphNode) { - if (node.constructor.nodeData?.api_node && showApiPricingBadge.value) { - wirePricingRecalculation(node) - } - }, init() { - startBadgeSystem({ + stopBadgeSystem = startBadgeSystem({ resolveGraphId: () => app.rootGraph.id, resolveNode: (nodeId) => resolveNode(nodeId, app.rootGraph) }) diff --git a/src/composables/node/useNodePricing.test.ts b/src/composables/node/useNodePricing.test.ts index d036be3bb8d..4288e64d32c 100644 --- a/src/composables/node/useNodePricing.test.ts +++ b/src/composables/node/useNodePricing.test.ts @@ -563,58 +563,6 @@ describe('useNodePricing', () => { }) }) - describe('getNodePricingConfig', () => { - it('should return pricing config for nodes with price_badge', () => { - const { getNodePricingConfig } = useNodePricing() - const node = createMockNodeWithPriceBadge( - 'TestConfigNode', - priceBadge('{"type":"usd","usd":0.05}') - ) - - const config = getNodePricingConfig(node) - expect(config).toBeDefined() - expect(config?.engine).toBe('jsonata') - expect(config?.expr).toBe('{"type":"usd","usd":0.05}') - expect(config?.depends_on).toBeDefined() - }) - - it('should return undefined for nodes without price_badge', () => { - const { getNodePricingConfig } = useNodePricing() - const node = createMockNode({ - name: 'NoPricingNode', - api_node: true - }) - - const config = getNodePricingConfig(node) - expect(config).toBeUndefined() - }) - - it('should return undefined for non-API nodes', () => { - const { getNodePricingConfig } = useNodePricing() - const node = createMockNode({ - name: 'RegularNode', - api_node: false - }) - - const config = getNodePricingConfig(node) - expect(config).toBeUndefined() - }) - - it('does not leak the compiled JSONata expression', () => { - const { getNodePricingConfig } = useNodePricing() - const node = createMockNodeWithPriceBadge( - 'TestStripCompiledNode', - priceBadge('{"type":"usd","usd":0.05}') - ) - - const config = getNodePricingConfig(node) - expect(config).toBeDefined() - // _compiled is the runtime JSONata instance and must not be exposed to - // tooling/debug consumers. - expect(config).not.toHaveProperty('_compiled') - }) - }) - describe('reactive revision', () => { it('bumps pricingRevision after an async evaluation resolves (Nodes 1.0 mode)', async () => { const { getNodeDisplayPrice, pricingRevision } = useNodePricing() @@ -711,28 +659,6 @@ describe('useNodePricing', () => { }) }) - describe('triggerPriceRecalculation', () => { - it('should not throw for API nodes with price_badge', () => { - const { triggerPriceRecalculation } = useNodePricing() - const node = createMockNodeWithPriceBadge( - 'TestTriggerNode', - priceBadge('{"type":"usd","usd":0.05}') - ) - - expect(() => triggerPriceRecalculation(node)).not.toThrow() - }) - - it('should not throw for non-API nodes', () => { - const { triggerPriceRecalculation } = useNodePricing() - const node = createMockNode({ - name: 'RegularNode', - api_node: false - }) - - expect(() => triggerPriceRecalculation(node)).not.toThrow() - }) - }) - describe('error handling', () => { it('should return empty string for invalid JSONata expression', async () => { const { getNodeDisplayPrice } = useNodePricing() diff --git a/src/composables/node/useNodePricing.ts b/src/composables/node/useNodePricing.ts index cf33bb4f954..4bfe691dade 100644 --- a/src/composables/node/useNodePricing.ts +++ b/src/composables/node/useNodePricing.ts @@ -596,17 +596,6 @@ export const useNodePricing = () => { return labels.at(-1) ?? '' } - /** - * Expose raw pricing config for tooling/debug UI. - * (Strips compiled expression from returned object.) - */ - const getNodePricingConfig = (node: LGraphNode) => { - const rule = getRuleForNode(node) - if (!rule) return undefined - const { _compiled, ...config } = rule - return config - } - /** * Caller compatibility helper: * returns union of widget dependencies + input dependencies for a node type. @@ -668,28 +657,13 @@ export const useNodePricing = () => { return priceBadge?.depends_on?.inputs ?? [] } - /** - * Trigger price recalculation for a node (call when inputs change). - * Forces re-evaluation by calling getNodeDisplayPrice which will detect - * the signature change and schedule a new evaluation. - */ - const triggerPriceRecalculation = (node: LGraphNode): void => { - const nodeData = getNodeConstructorData(node) - if (!nodeData?.api_node) return - - // Call getNodeDisplayPrice to trigger evaluation if signature changed - getNodeDisplayPrice(node) - } - return { getNodeDisplayPrice, - getNodePricingConfig, getRelevantWidgetNames, hasDynamicPricing, getInputGroupPrefixes, getInputNames, getNodeRevisionRef, // Each node has its own independent ref, so updates to one won't trigger others - triggerPriceRecalculation, pricingRevision: readonly(pricingTick) // reactive invalidation signal } } diff --git a/src/lib/litegraph/src/LGraphNode.ts b/src/lib/litegraph/src/LGraphNode.ts index 381370faf6e..3eaaaa5c069 100644 --- a/src/lib/litegraph/src/LGraphNode.ts +++ b/src/lib/litegraph/src/LGraphNode.ts @@ -427,6 +427,20 @@ export class LGraphNode * {@link useNodeBadgeStore}. Thunks are re-evaluated every frame. */ badges: (LGraphBadge | (() => LGraphBadge))[] = [] + /** @deprecated Badges always render top-right; assignment is ignored. */ + get badgePosition(): string { + warnDeprecated( + 'LGraphNode.badgePosition is deprecated: badges always render top-right.', + this + ) + return 'top-right' + } + set badgePosition(_value: string) { + warnDeprecated( + 'LGraphNode.badgePosition is deprecated: badges always render top-right.', + this + ) + } title_buttons: LGraphButton[] = [] onOutputRemoved?(this: LGraphNode, slot: number): void onInputRemoved?(this: LGraphNode, slot: number, input: INodeInputSlot): void diff --git a/src/lib/litegraph/src/nodeBadgeDraw.test.ts b/src/lib/litegraph/src/nodeBadgeDraw.test.ts index 1f6af5d7c95..f1704b91fcc 100644 --- a/src/lib/litegraph/src/nodeBadgeDraw.test.ts +++ b/src/lib/litegraph/src/nodeBadgeDraw.test.ts @@ -1,17 +1,18 @@ import { describe, expect, it } from 'vitest' -import type { BadgeData } from '@/types/badgeData' +import type { BadgeData, CoreBadgeData } from '@/types/badgeData' +import { LGraphNode } from '@/lib/litegraph/src/litegraph' import { registerBadgeIcon } from './badgeIconRegistry' import { badgeDrawObjects } from './nodeBadgeDraw' -function coreRow(part: BadgeData['part'], text: string): BadgeData { +function coreRow(part: CoreBadgeData['part'], text: string): BadgeData { return { kind: 'core', part, text, fgColor: '#fff', bgColor: '#000' } } describe('badgeDrawObjects', () => { it('joins core parts into one badge in id, lifecycle, source order', () => { - const badges = badgeDrawObjects({}, [ + const badges = badgeDrawObjects(new LGraphNode('n'), [ coreRow('lifecycle', '[BETA]'), coreRow('id', '#5'), coreRow('source', 'my-pack') @@ -24,7 +25,7 @@ describe('badgeDrawObjects', () => { }) it('truncates the joined core text', () => { - const badges = badgeDrawObjects({}, [ + const badges = badgeDrawObjects(new LGraphNode('n'), [ coreRow('source', 'a'.repeat(40)), coreRow('id', '#5') ]) @@ -35,7 +36,7 @@ describe('badgeDrawObjects', () => { it('draws credits rows separately with their registered icon', () => { registerBadgeIcon('test-icon', { unicode: 'X', fontFamily: 'test' }) - const badges = badgeDrawObjects({}, [ + const badges = badgeDrawObjects(new LGraphNode('n'), [ coreRow('id', '#5'), { kind: 'credits', @@ -53,19 +54,19 @@ describe('badgeDrawObjects', () => { }) it('keeps an unknown icon key iconless', () => { - const badges = badgeDrawObjects({}, [ + const badges = badgeDrawObjects(new LGraphNode('n'), [ { kind: 'credits', text: '$1', iconKey: 'nope' } ]) expect(badges[0].icon).toBeUndefined() }) - it('reuses draw objects until the rows change content', () => { - const node = {} + it('reuses draw objects until the rows array is replaced', () => { + const node = new LGraphNode('n') const rows: BadgeData[] = [coreRow('id', '#5')] const first = badgeDrawObjects(node, rows) - const second = badgeDrawObjects(node, [coreRow('id', '#5')]) + const second = badgeDrawObjects(node, rows) expect(second[0]).toBe(first[0]) const third = badgeDrawObjects(node, [coreRow('id', '#6')]) diff --git a/src/lib/litegraph/src/nodeBadgeDraw.ts b/src/lib/litegraph/src/nodeBadgeDraw.ts index ce446c92ae2..de32da2edb8 100644 --- a/src/lib/litegraph/src/nodeBadgeDraw.ts +++ b/src/lib/litegraph/src/nodeBadgeDraw.ts @@ -1,15 +1,20 @@ import { truncate } from 'es-toolkit/compat' -import type { BadgeData, CoreBadgePart } from '@/types/badgeData' +import type { BadgeData, CoreBadgeData, CoreBadgePart } from '@/types/badgeData' import { LGraphBadge } from './LGraphBadge' +import type { LGraphNode } from './LGraphNode' import { resolveBadgeIcon } from './badgeIconRegistry' /** Legacy canvas joins the core parts into a single badge in this order. */ -const CORE_JOIN_ORDER: CoreBadgePart[] = ['id', 'lifecycle', 'source'] +const CORE_JOIN_ORDER = [ + 'id', + 'lifecycle', + 'source' +] as const satisfies readonly CoreBadgePart[] const CORE_TEXT_LIMIT = 31 -function joinedCoreText(coreRows: BadgeData[]): string { +function joinedCoreText(coreRows: readonly CoreBadgeData[]): string { const byPart = new Map(coreRows.map((row) => [row.part, row.text])) return truncate( CORE_JOIN_ORDER.map((part) => byPart.get(part) ?? '') @@ -20,21 +25,25 @@ function joinedCoreText(coreRows: BadgeData[]): string { } function buildDrawObjects(rows: readonly BadgeData[]): LGraphBadge[] { - const coreRows = rows.filter((row) => row.kind === 'core') - const otherRows = rows.filter((row) => row.kind !== 'core') - const badges: LGraphBadge[] = [] - const coreText = joinedCoreText(coreRows) - if (coreText) { - badges.push( - new LGraphBadge({ - text: coreText, - fgColor: coreRows[0].fgColor, - bgColor: coreRows[0].bgColor - }) - ) + + const coreRows = rows.filter((row) => row.kind === 'core') + const [firstCore] = coreRows + if (firstCore) { + const coreText = joinedCoreText(coreRows) + if (coreText) { + badges.push( + new LGraphBadge({ + text: coreText, + fgColor: firstCore.fgColor, + bgColor: firstCore.bgColor + }) + ) + } } - for (const row of otherRows) { + + for (const row of rows) { + if (row.kind === 'core') continue badges.push( new LGraphBadge({ text: row.text, @@ -47,20 +56,23 @@ function buildDrawObjects(rows: readonly BadgeData[]): LGraphBadge[] { return badges } -const drawCache = new WeakMap() +const drawCache = new WeakMap< + LGraphNode, + { rows: readonly BadgeData[]; badges: LGraphBadge[] } +>() /** - * The legacy canvas draw objects for a node's badge rows, rebuilt only - * when the row content changes. + * The legacy canvas draw objects for a node's badge rows. The store + * replaces a node's rows array wholesale per write, so array identity + * doubles as the rebuild key. */ export function badgeDrawObjects( - node: object, + node: LGraphNode, rows: readonly BadgeData[] ): LGraphBadge[] { - const key = JSON.stringify(rows) const cached = drawCache.get(node) - if (cached?.key === key) return cached.badges + if (cached?.rows === rows) return cached.badges const badges = buildDrawObjects(rows) - drawCache.set(node, { key, badges }) + drawCache.set(node, { rows, badges }) return badges } diff --git a/src/renderer/extensions/linearMode/PartnerNodesList.vue b/src/renderer/extensions/linearMode/PartnerNodesList.vue index 5a9d2f093c4..b02aebedac1 100644 --- a/src/renderer/extensions/linearMode/PartnerNodesList.vue +++ b/src/renderer/extensions/linearMode/PartnerNodesList.vue @@ -9,8 +9,8 @@ import { useI18n } from 'vue-i18n' import Button from '@/components/ui/button/Button.vue' import Popover from '@/components/ui/Popover.vue' +import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import PartnerNodeItem from '@/renderer/extensions/linearMode/PartnerNodeItem.vue' -import { app } from '@/scripts/app' import { useNodeBadgeStore } from '@/stores/nodeBadgeStore' import { mapUniqueNodes } from '@/utils/graphTraversalUtil' @@ -18,19 +18,27 @@ defineProps<{ mobile?: boolean }>() const { t } = useI18n() const badgeStore = useNodeBadgeStore() +const canvasStore = useCanvasStore() -const creditsBadges = computed(() => - mapUniqueNodes(app.graph, (node) => { +const creditsBadges = computed(() => { + const rootGraph = canvasStore.currentGraph?.rootGraph + const graphId = canvasStore.rootGraphId + if (!rootGraph || graphId === undefined) return [] + + // Track bucket membership so nodes added or removed later re-run this. + void badgeStore.registeredNodeIds(graphId) + + return mapUniqueNodes(rootGraph, (node) => { if (node.isSubgraphNode()) return const priceRow = badgeStore - .getBadges(app.graph.rootGraph.id, node.id) + .getBadges(graphId, node.id) .find((row) => row.kind === 'credits') if (!priceRow) return return [node.title, priceRow.text, node.id] as const }) -) +})