AI Agents & MCPs & AI Workflow Automation • (~400 MCP servers for AI agents) • AI Automation / AI Agent with MCPs • AI Workflows & AI Agents • MCPs for AI Agents
TypeScript ai-agentai-agent-toolsai-agentsai-agents-frameworkmcpmcp-servermcp-toolsmcpsn8n-alternativeno-code-automationworkflowworkflow-automationworkflows
fix(mcp): do not refuse ap_run_action when only AppSumo credits are used up (#16168)
Abduld79b0a573a3e
diff --git a/packages/server/api/src/app/mcp/mcp-usage-tracker.ts b/packages/server/api/src/app/mcp/mcp-usage-tracker.tsindex 664495e6aa1..aa79f2f7694 100644--- a/packages/server/api/src/app/mcp/mcp-usage-tracker.ts+++ b/packages/server/api/src/app/mcp/mcp-usage-tracker.ts@@ -4,7 +4,7 @@ import { FastifyBaseLogger } from 'fastify'import { platformPlanService } from '../ee/platform/platform-plan/platform-plan.service'import { rejectedPromiseHandler } from '../helper/promise-handler'import { trackBillingAndSendTelemetry } from '../platform/billing-and-telemetry'-import { assertCreditsAndAppSumoNotExceeded, CreditUsageSource, McpCallCreditConsumptionProperties } from '../platform/billing-provider'+import { assertCreditsNotExceeded, CreditUsageSource, McpCallCreditConsumptionProperties } from '../platform/billing-provider'import { projectService } from '../project/project-service'import { INTERNAL_CHAT_CLIENT_ID } from './oauth/token/mcp-oauth-token.service'@@ -63,7 +63,7 @@ async function resolvePlatformId({ mcp, log }: { mcp: PopulatedMcpServer, log: F// A credits lookup that fails for its own reasons must not take the tool down with it, so anything// that is not a definite "out of credits" lets the call through, as the chat personalization path does.async function refusalWhenOutOfCredits({ platformId, toolName, log }: RefusalParams): Promise<McpToolResult | null> {- const { error } = await tryCatch(() => assertCreditsAndAppSumoNotExceeded({ platformId, log }))+ const { error } = await tryCatch(() => assertCreditsNotExceeded({ platformId, log }))if (isNil(error)) {return null}diff --git a/packages/server/api/src/app/platform/billing-provider.ts b/packages/server/api/src/app/platform/billing-provider.tsindex b6a97b9b126..ef437653be8 100644--- a/packages/server/api/src/app/platform/billing-provider.ts+++ b/packages/server/api/src/app/platform/billing-provider.ts@@ -87,6 +87,16 @@ export async function assertCreditsAndAppSumoNotExceeded({ platformId, log }: {}}+export async function assertCreditsNotExceeded({ platformId, log }: { platformId: string, log: FastifyBaseLogger }): Promise<void> {+ const { credits } = await billingProvider.get(log).getCreditsAndAppSumoState(platformId)+ if (credits.blocked) {+ throw new ActivepiecesError({+ code: ErrorCode.QUOTA_EXCEEDED,+ params: { metric: PlatformUsageMetric.CREDITS, usage: credits.usage, limit: credits.limit },+ })+ }+}+export async function creditsLeftAfter({ platformId, pendingCredits, log }: { platformId: string, pendingCredits: number, log: FastifyBaseLogger }): Promise<number | null> {const { data: state, error } = await tryCatch(() => billingProvider.get(log).getCreditsAndAppSumoState(platformId))if (isNil(state)) {diff --git a/packages/server/api/test/integration/cloud/mcp/mcp-reach-before-billing.test.ts b/packages/server/api/test/integration/cloud/mcp/mcp-reach-before-billing.test.tsindex 7f4c5c70866..d5a3bfdae7e 100644--- a/packages/server/api/test/integration/cloud/mcp/mcp-reach-before-billing.test.ts+++ b/packages/server/api/test/integration/cloud/mcp/mcp-reach-before-billing.test.ts@@ -14,7 +14,7 @@ const { mockAssertCredits } = vi.hoisted(() => ({vi.mock('../../../../src/app/platform/billing-provider', async (importOriginal) => {const original = await importOriginal<typeof import('../../../../src/app/platform/billing-provider')>()- return { ...original, assertCreditsAndAppSumoNotExceeded: mockAssertCredits }+ return { ...original, assertCreditsNotExceeded: mockAssertCredits }})let app: FastifyInstancediff --git a/packages/server/api/test/unit/app/mcp/mcp-usage-tracker.test.ts b/packages/server/api/test/unit/app/mcp/mcp-usage-tracker.test.tsindex df1ed707bd4..171c19b5007 100644--- a/packages/server/api/test/unit/app/mcp/mcp-usage-tracker.test.ts+++ b/packages/server/api/test/unit/app/mcp/mcp-usage-tracker.test.ts@@ -13,7 +13,7 @@ const { mockTrackBillingAndSendTelemetry, mockGetOrCreateForPlatform, mockGetProvi.mock('../../../../src/app/platform/billing-provider', () => ({CreditUsageSource: { MCP: 'mcp' },- assertCreditsAndAppSumoNotExceeded: mockAssertCredits,+ assertCreditsNotExceeded: mockAssertCredits,}))vi.mock('../../../../src/app/platform/billing-and-telemetry', () => ({diff --git a/packages/server/api/test/unit/app/platform/credits-gate.test.ts b/packages/server/api/test/unit/app/platform/credits-gate.test.tsnew file mode 100644index 00000000000..a00c995c674--- /dev/null+++ b/packages/server/api/test/unit/app/platform/credits-gate.test.ts@@ -0,0 +1,41 @@+import { ErrorCode } from '@activepieces/core-utils'+import { FastifyBaseLogger } from 'fastify'+import { beforeEach, describe, expect, it, vi } from 'vitest'+import { assertCreditsNotExceeded, billingProvider, CreditsGateState } from '../../../../src/app/platform/billing-provider'++const log = { warn: vi.fn(), info: vi.fn(), error: vi.fn(), debug: vi.fn() } as unknown as FastifyBaseLogger+const noopProvider = billingProvider.get(log)++function gateState({ blocked }: { blocked: boolean }): CreditsGateState {+ return { blocked, metered: true, usage: 10, limit: 10, remaining: blocked ? 0 : 5, unlimited: false }+}++function withState({ creditsBlocked, appSumoBlocked }: { creditsBlocked: boolean, appSumoBlocked: boolean }): void {+ billingProvider.set(() => ({+ ...noopProvider,+ getCreditsAndAppSumoState: async () => ({+ credits: gateState({ blocked: creditsBlocked }),+ appSumo: gateState({ blocked: appSumoBlocked }),+ }),+ }))+}++describe('assertCreditsNotExceeded', () => {+ beforeEach(() => {+ vi.clearAllMocks()+ })++ it('lets the call through when only the AppSumo AI-credit meter is exhausted', async () => {+ withState({ creditsBlocked: false, appSumoBlocked: true })++ await expect(assertCreditsNotExceeded({ platformId: 'platform-1', log })).resolves.toBeUndefined()+ })++ it('refuses with QUOTA_EXCEEDED when the platform credits are exhausted', async () => {+ withState({ creditsBlocked: true, appSumoBlocked: false })++ await expect(assertCreditsNotExceeded({ platformId: 'platform-1', log })).rejects.toMatchObject({+ error: { code: ErrorCode.QUOTA_EXCEEDED },+ })+ })+})