From a4d910838d54873a1205932eea88209779725b52 Mon Sep 17 00:00:00 2001 From: Connor Byrne Date: Thu, 6 Aug 2026 17:40:39 -0700 Subject: [PATCH 1/2] fix(billing): keep the free-tier run quota off non-cloud distributions The free-tier job allowance is a Cloud-only feature, but quotaEnabled read only the feature flag and the remote allowance, with no distribution term. Off cloud canAccessSubscriptionFeatures is forced true, so canRunWorkflows collapsed to the quota clause alone and LinearControls would render SubscribeToRunButton to a local user. It was inert only because the flag defaults false and a local /features response carries no free_tier_balance, neither of which is a distribution gate. Gating quotaEnabled covers canRunWorkflows, FreeTierQuota and the first-run tour in one place. Fixes #14861 --- .../composables/useFreeTierQuota.test.ts | 58 +++++++++++++++++++ .../composables/useFreeTierQuota.ts | 3 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 src/platform/cloud/subscription/composables/useFreeTierQuota.test.ts diff --git a/src/platform/cloud/subscription/composables/useFreeTierQuota.test.ts b/src/platform/cloud/subscription/composables/useFreeTierQuota.test.ts new file mode 100644 index 00000000000..a3da7420364 --- /dev/null +++ b/src/platform/cloud/subscription/composables/useFreeTierQuota.test.ts @@ -0,0 +1,58 @@ +import { beforeEach, describe, expect, it, vi } from 'vitest' +import { ref } from 'vue' + +const mockIsCloud = vi.hoisted(() => ({ value: true })) +vi.mock('@/platform/distribution/types', () => ({ + get isCloud() { + return mockIsCloud.value + } +})) + +const mockFlags = vi.hoisted(() => ({ freeTierJobAllowanceEnabled: true })) +vi.mock('@/composables/useFeatureFlags', () => ({ + useFeatureFlags: () => ({ flags: mockFlags }) +})) + +vi.mock('@/composables/node/usePriceBadge', () => ({ + useCreditsBadgesInGraph: () => ref([]) +})) + +const mockRemoteConfig = vi.hoisted(() => ({ + value: { free_tier_balance: { allowance: 5, remaining: 5 } } +})) +vi.mock('@/platform/remoteConfig/remoteConfig', () => ({ + get remoteConfig() { + return ref(mockRemoteConfig.value) + } +})) + +async function loadQuota() { + vi.resetModules() + const { useFreeTierQuota } = await import('./useFreeTierQuota') + return useFreeTierQuota() +} + +describe('useFreeTierQuota', () => { + beforeEach(() => { + mockIsCloud.value = true + mockFlags.freeTierJobAllowanceEnabled = true + mockRemoteConfig.value = { + free_tier_balance: { allowance: 5, remaining: 5 } + } + }) + + it('enables the quota on Cloud when the flag and an allowance are present', async () => { + const quota = await loadQuota() + + expect(quota.quotaEnabled.value).toBe(true) + }) + + it('keeps the quota disabled off Cloud even when the flag and an allowance are present', async () => { + mockIsCloud.value = false + + const quota = await loadQuota() + + expect(quota.quotaEnabled.value).toBe(false) + expect(quota.freeTierExecutionPermitted.value).toBe(false) + }) +}) diff --git a/src/platform/cloud/subscription/composables/useFreeTierQuota.ts b/src/platform/cloud/subscription/composables/useFreeTierQuota.ts index f03877e1d1b..e794d0e29bd 100644 --- a/src/platform/cloud/subscription/composables/useFreeTierQuota.ts +++ b/src/platform/cloud/subscription/composables/useFreeTierQuota.ts @@ -3,6 +3,7 @@ import { computed, ref, watch } from 'vue' import { useCreditsBadgesInGraph } from '@/composables/node/usePriceBadge' import { useFeatureFlags } from '@/composables/useFeatureFlags' +import { isCloud } from '@/platform/distribution/types' import { remoteConfig } from '@/platform/remoteConfig/remoteConfig' export const useFreeTierQuota = createSharedComposable(function () { @@ -23,7 +24,7 @@ export const useFreeTierQuota = createSharedComposable(function () { ) const quotaEnabled = computed( - () => flags.freeTierJobAllowanceEnabled && maxAvailable.value > 0 + () => isCloud && flags.freeTierJobAllowanceEnabled && maxAvailable.value > 0 ) const hasInvalidNodes = computed(() => creditsBadges.value.length > 0) const freeTierExecutionPermitted = computed( From b4b4ce533b232141096a54af6edcdb219b710ded Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Mon, 17 Aug 2026 11:31:18 -0700 Subject: [PATCH 2/2] test(billing): assert Cloud permits execution, not just that the quota is on The Cloud case only pinned quotaEnabled, so the pair did not actually contrast with the off-Cloud case, which pins both. Asserting freeTierExecutionPermitted on both sides makes the distribution difference the thing under test. Addresses review feedback: https://github.com/Comfy-Org/ComfyUI_frontend/pull/14865#discussion_r3791119286 --- .../cloud/subscription/composables/useFreeTierQuota.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/platform/cloud/subscription/composables/useFreeTierQuota.test.ts b/src/platform/cloud/subscription/composables/useFreeTierQuota.test.ts index a3da7420364..03d48600a3a 100644 --- a/src/platform/cloud/subscription/composables/useFreeTierQuota.test.ts +++ b/src/platform/cloud/subscription/composables/useFreeTierQuota.test.ts @@ -45,6 +45,7 @@ describe('useFreeTierQuota', () => { const quota = await loadQuota() expect(quota.quotaEnabled.value).toBe(true) + expect(quota.freeTierExecutionPermitted.value).toBe(true) }) it('keeps the quota disabled off Cloud even when the flag and an allowance are present', async () => {