fix(billing): apply margin multiplier to subscription quota consumption
Memind CI / Test, build, and release guards (push) Successful in 5m1s

Subscription plans now deduct period_tokens_used as upstream tokens ×
marginMultiplier, aligning package quota burn with wallet cost-mode pricing.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
john
2026-08-28 20:31:38 +08:00
parent e85b9b986a
commit 6f48cad4c2
6 changed files with 146 additions and 9 deletions
+102
View File
@@ -878,6 +878,108 @@ test('billSessionUsage writes usage record when subscription fully covers tokens
assert.equal(walletBalance, 200);
});
test('billSessionUsage applies marginMultiplier to subscription quota consumption', async () => {
const userRow = {
id: 'user-sub-2',
username: 'pro_user_2',
slug: 'pro_user_2',
email: 'pro2@example.com',
display_name: 'Pro User 2',
role: 'user',
status: 'active',
plan_type: 'pro',
workspace_root: '/tmp/pro-user-2',
balance_cents: 200,
tokens_used: 0,
spent_cents: 0,
};
const stateBySession = new Map();
let consumeQuotaTokens = null;
const subscriptionService = {
async consumeQuota(userId, quotaTokens) {
assert.equal(userId, userRow.id);
consumeQuotaTokens = quotaTokens;
return { fullyCovers: true, overageRate: 0.8 };
},
};
const billingConfigService = {
async getEffectiveBillingConfig() {
return {
useBackendCost: true,
usdCnyRate: 7.2,
marginMultiplier: 6,
inputCentsPer1k: 10,
outputCentsPer1k: 9,
minBillCents: 1,
};
},
};
const pool = {
async query(sql) {
if (sql.includes('FROM h5_users u') && sql.includes('WHERE u.id = ?')) {
return [[{ ...userRow }]];
}
throw new Error(`unexpected pool query: ${sql}`);
},
async getConnection() {
return {
async beginTransaction() {},
async commit() {},
async rollback() {},
release() {},
async query(sql, params = []) {
if (sql.includes('SELECT cost_cents FROM h5_usage_records WHERE request_id = ? LIMIT 1')) return [[]];
if (sql.includes('INSERT INTO h5_session_billing_state') && sql.includes('agent_session_id = agent_session_id')) {
return [{ affectedRows: 1 }, []];
}
if (sql.includes('FROM h5_session_billing_state') && sql.includes('FOR UPDATE')) {
const row = stateBySession.get(params[0]);
return [row ? [row] : []];
}
if (sql.includes('INSERT INTO h5_session_billing_state') && sql.includes('ON DUPLICATE KEY UPDATE')) {
stateBySession.set(params[0], {
last_accumulated_cost: params[2],
last_input_tokens: params[3],
last_output_tokens: params[4],
});
return [{ affectedRows: 1 }, []];
}
if (sql.includes('SELECT balance_cents, tokens_used FROM h5_user_wallets WHERE user_id = ?')) {
return [[{ balance_cents: 200, tokens_used: 0 }]];
}
if (sql.includes('INSERT INTO h5_usage_records')) {
return [{ affectedRows: 1 }, []];
}
throw new Error(`unexpected connection query: ${sql}`);
},
};
},
};
const auth = createUserAuth(pool, {
persistSessions: false,
subscriptionService,
billingConfigService,
});
const result = await auth.billSessionUsage(
userRow.id,
'session-sub-2',
{
accumulatedInputTokens: 8000,
accumulatedOutputTokens: 2000,
accumulatedCost: 0.01,
},
'req-sub-2',
);
assert.equal(result.ok, true);
assert.equal(result.costCents, 0);
assert.equal(consumeQuotaTokens, 60_000);
});
test('updateUser rejects quota smaller than occupied bytes', async () => {
const userRow = {
id: 'user-3',