— resets {formatResetTime(teamUsage.fiveHourResetsAt)}
@@ -1303,8 +1303,8 @@ const Conversations = () => {
Weekly limit
- ${teamUsage.remainingUsd.toFixed(2)} / $
- {teamUsage.cycleBudgetUsd.toFixed(2)} left
+ ${(teamUsage.remainingUsd ?? 0).toFixed(2)} / $
+ {(teamUsage.cycleBudgetUsd ?? 0).toFixed(2)} left
{teamUsage.cycleEndsAt && (
— resets {formatResetTime(teamUsage.cycleEndsAt)}
diff --git a/app/src/services/api/__tests__/creditsApi.test.ts b/app/src/services/api/__tests__/creditsApi.test.ts
index 9fbe7c8758..8a39add22c 100644
--- a/app/src/services/api/__tests__/creditsApi.test.ts
+++ b/app/src/services/api/__tests__/creditsApi.test.ts
@@ -6,7 +6,7 @@ vi.mock('../../coreCommandClient', () => ({
callCoreCommand: (...args: unknown[]) => mockCallCoreCommand(...args),
}));
-const { creditsApi, normalizeCouponRedeemResult, normalizeRedeemedCoupon } =
+const { creditsApi, normalizeCouponRedeemResult, normalizeRedeemedCoupon, normalizeTeamUsage } =
await import('../creditsApi');
describe('creditsApi coupon helpers', () => {
@@ -103,3 +103,77 @@ describe('creditsApi coupon helpers', () => {
expect(mockCallCoreCommand).toHaveBeenCalledWith('openhuman.billing_get_coupons');
});
});
+
+describe('normalizeTeamUsage', () => {
+ it('passes through well-formed camelCase fields', () => {
+ const input = {
+ remainingUsd: 12.5,
+ cycleBudgetUsd: 25,
+ cycleLimit5hr: 3.2,
+ cycleLimit7day: 18,
+ fiveHourCapUsd: 5,
+ fiveHourResetsAt: '2026-04-09T18:00:00Z',
+ cycleStartDate: '2026-04-07T00:00:00Z',
+ cycleEndsAt: '2026-04-14T00:00:00Z',
+ bypassCycleLimit: false,
+ };
+ expect(normalizeTeamUsage(input)).toEqual(input);
+ });
+
+ it('maps snake_case backend fields to camelCase', () => {
+ const result = normalizeTeamUsage({
+ remaining_usd: 10,
+ cycle_budget_usd: 20,
+ five_hour_spend_usd: 2.5,
+ cycle_limit_7day: 15,
+ five_hour_cap_usd: 5,
+ five_hour_resets_at: '2026-04-09T18:00:00Z',
+ cycle_start_date: '2026-04-07T00:00:00Z',
+ cycle_ends_at: '2026-04-14T00:00:00Z',
+ bypass_cycle_limit: true,
+ });
+ expect(result.remainingUsd).toBe(10);
+ expect(result.cycleBudgetUsd).toBe(20);
+ expect(result.cycleLimit5hr).toBe(2.5);
+ expect(result.cycleLimit7day).toBe(15);
+ expect(result.fiveHourCapUsd).toBe(5);
+ expect(result.fiveHourResetsAt).toBe('2026-04-09T18:00:00Z');
+ expect(result.bypassCycleLimit).toBe(true);
+ });
+
+ it('maps legacy fiveHourSpendUsd to cycleLimit5hr', () => {
+ const result = normalizeTeamUsage({ fiveHourSpendUsd: 4.0 });
+ expect(result.cycleLimit5hr).toBe(4.0);
+ });
+
+ it('returns safe defaults for empty object', () => {
+ const result = normalizeTeamUsage({});
+ expect(result.remainingUsd).toBe(0);
+ expect(result.cycleBudgetUsd).toBe(0);
+ expect(result.cycleLimit5hr).toBe(0);
+ expect(result.cycleLimit7day).toBe(0);
+ expect(result.fiveHourCapUsd).toBe(0);
+ expect(result.fiveHourResetsAt).toBeNull();
+ expect(result.bypassCycleLimit).toBe(false);
+ expect(typeof result.cycleStartDate).toBe('string');
+ expect(typeof result.cycleEndsAt).toBe('string');
+ });
+
+ it('does not crash on null or undefined input', () => {
+ expect(() => normalizeTeamUsage(null)).not.toThrow();
+ expect(() => normalizeTeamUsage(undefined)).not.toThrow();
+ const result = normalizeTeamUsage(null);
+ expect(result.remainingUsd).toBe(0);
+ expect(result.cycleLimit5hr).toBe(0);
+ });
+
+ it('getTeamUsage normalizes the RPC response', async () => {
+ mockCallCoreCommand.mockResolvedValueOnce({ remaining_usd: 8, cycle_budget_usd: 25 });
+
+ const result = await creditsApi.getTeamUsage();
+ expect(result.remainingUsd).toBe(8);
+ expect(result.cycleBudgetUsd).toBe(25);
+ expect(result.cycleLimit5hr).toBe(0);
+ expect(mockCallCoreCommand).toHaveBeenCalledWith('openhuman.team_get_usage');
+ });
+});
diff --git a/app/src/services/api/creditsApi.ts b/app/src/services/api/creditsApi.ts
index e0b1ac8c5e..8d7342f438 100644
--- a/app/src/services/api/creditsApi.ts
+++ b/app/src/services/api/creditsApi.ts
@@ -209,6 +209,35 @@ function normalizeCreditBalance(payload: unknown): CreditBalance {
};
}
+export function normalizeTeamUsage(payload: unknown): TeamUsage {
+ const raw = (payload && typeof payload === 'object' ? payload : {}) as Record;
+ return {
+ remainingUsd: normalizeUsd(raw.remainingUsd ?? raw.remaining_usd),
+ cycleBudgetUsd: normalizeUsd(raw.cycleBudgetUsd ?? raw.cycle_budget_usd),
+ cycleLimit5hr: normalizeUsd(
+ raw.cycleLimit5hr ?? raw.fiveHourSpendUsd ?? raw.five_hour_spend_usd
+ ),
+ cycleLimit7day: normalizeUsd(raw.cycleLimit7day ?? raw.cycle_limit_7day),
+ fiveHourCapUsd: normalizeUsd(raw.fiveHourCapUsd ?? raw.five_hour_cap_usd),
+ fiveHourResetsAt: asStringOrNull(raw.fiveHourResetsAt ?? raw.five_hour_resets_at),
+ cycleStartDate:
+ typeof raw.cycleStartDate === 'string'
+ ? raw.cycleStartDate
+ : typeof raw.cycle_start_date === 'string'
+ ? raw.cycle_start_date
+ : new Date().toISOString(),
+ cycleEndsAt:
+ typeof raw.cycleEndsAt === 'string'
+ ? raw.cycleEndsAt
+ : typeof raw.cycle_ends_at === 'string'
+ ? raw.cycle_ends_at
+ : new Date().toISOString(),
+ bypassCycleLimit: Boolean(
+ raw.bypassCycleLimit ?? raw.bypassRateLimit ?? raw.bypass_cycle_limit
+ ),
+ };
+}
+
/**
* Credits API endpoints
*/
@@ -227,7 +256,8 @@ export const creditsApi = {
* GET /teams/me/usage
*/
getTeamUsage: async (): Promise => {
- return await callCoreCommand('openhuman.team_get_usage');
+ const result = await callCoreCommand('openhuman.team_get_usage');
+ return normalizeTeamUsage(result);
},
/**