Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion .cursor/rules/cursor-api.mdc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,22 @@ Poll at most once per hour (data aggregated hourly).

### POST /teams/spend
Body: `{ page, pageSize }`
Returns `{ teamMemberSpend: [{ email, spendCents, fastPremiumRequests }], subscriptionCycleStart: number, totalPages }`
Returns (post-2026 shape):
```
{
teamMemberSpend: [{
userId, email, name, role, profilePictureUrl,
spendCents, // overage above plan (was cycle total in pre-2026 shape)
overallSpendCents, // cycle-to-date total (new field, post-2026)
fastPremiumRequests,
monthlyLimitDollars, hardLimitOverrideDollars,
effectivePerUserLimitDollars
}],
subscriptionCycleStart: number,
totalPages, totalMembers, limitedUsersCount, maxUserSpendCents
}
```
Note: the meaning of `spendCents` changed in 2026. Pre-2026 it was the cycle total; post-2026 it is the overage above the plan-included amount, and `overallSpendCents` holds the cycle total. `includedSpendCents` was removed from the response. `cursor-client.ts::normalizeMemberSpend` normalizes both shapes so downstream code can rely on `spendCents` = total and `includedSpendCents` = plan-covered. See GH issue #19.

### POST /teams/filtered-usage-events
Body: `{ email?, startDate?, endDate?, page, pageSize }`
Expand Down
30 changes: 29 additions & 1 deletion src/lib/cursor-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,30 @@ function bool(v: unknown): boolean {
return v === true || v === 1 || v === "1";
}

function normalizeMemberSpend(raw: Record<string, unknown>): MemberSpend {
const rawSpend = num(raw.spendCents);
const overall = typeof raw.overallSpendCents === "number" ? raw.overallSpendCents : undefined;
const rawIncluded =
typeof raw.includedSpendCents === "number" ? raw.includedSpendCents : undefined;

const total = overall ?? rawSpend;
const overage = overall !== undefined ? rawSpend : 0;
const included = rawIncluded ?? Math.max(0, total - overage);

return {
userId: str(raw, "userId"),
email: str(raw, "email"),
name: str(raw, "name"),
role: str(raw, "role"),
spendCents: total,
includedSpendCents: included,
fastPremiumRequests: num(raw.fastPremiumRequests),
monthlyLimitDollars:
typeof raw.monthlyLimitDollars === "number" ? raw.monthlyLimitDollars : null,
hardLimitOverrideDollars: num(raw.hardLimitOverrideDollars),
};
}

function normalizeFilteredUsageEvent(raw: Record<string, unknown>): FilteredUsageEvent {
const tuRaw = raw.tokenUsage ?? raw.token_usage;
let tokenUsage: FilteredUsageEvent["tokenUsage"];
Expand Down Expand Up @@ -193,7 +217,11 @@ export class CursorClient {
cycleStart = new Date(data.subscriptionCycleStart).toISOString().split("T")[0] ?? "";
limitedUsersCount = data.limitedUsersCount ?? 0;

allMembers.push(...data.teamMemberSpend);
allMembers.push(
...data.teamMemberSpend.map((m) =>
normalizeMemberSpend(m as unknown as Record<string, unknown>),
),
);

if (page >= data.totalPages) break;
page++;
Expand Down
6 changes: 3 additions & 3 deletions src/lib/data/sqlite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3328,9 +3328,9 @@ export function getUserCostDrivers(email: string, date?: string): CostDriverSumm

const topModel = db
.prepare(
`SELECT model, SUM(total_cents) as s FROM usage_events
WHERE user_email = ? AND ${dateFilter} AND total_cents > 0
GROUP BY model ORDER BY s DESC LIMIT 1`,
`SELECT ue.model, SUM(ue.total_cents) as s FROM usage_events ue
WHERE ue.user_email = ? AND ${dateFilter} AND ue.total_cents > 0
GROUP BY ue.model ORDER BY s DESC LIMIT 1`,
)
.get(...params) as { model: string } | undefined;

Expand Down
95 changes: 95 additions & 0 deletions tests/cursor-client.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,99 @@ describe("CursorClient", () => {

globalThis.fetch = originalFetch;
});

it("normalizes new /teams/spend shape (overallSpendCents + spendCents=overage)", async () => {
const originalFetch = globalThis.fetch;

globalThis.fetch = vi.fn(async () => {
return new Response(
JSON.stringify({
teamMemberSpend: [
{
userId: "user_1",
email: "a@test.com",
name: "Alice",
role: "member",
profilePictureUrl: null,
spendCents: 150,
overallSpendCents: 1000,
fastPremiumRequests: 5,
monthlyLimitDollars: 30,
hardLimitOverrideDollars: 200,
effectivePerUserLimitDollars: 30,
},
{
userId: "user_2",
email: "b@test.com",
name: "Bob",
role: "member",
spendCents: 0,
overallSpendCents: 500,
fastPremiumRequests: 0,
monthlyLimitDollars: null,
hardLimitOverrideDollars: 0,
},
],
subscriptionCycleStart: 1704067200000,
totalPages: 1,
limitedUsersCount: 0,
}),
{ status: 200, headers: { "Content-Type": "application/json" } },
);
});

const { members } = await client.getSpending();
expect(members).toHaveLength(2);

const [m0, m1] = members;
if (!m0 || !m1) throw new Error("expected two normalized members");

expect(m0.spendCents).toBe(1000);
expect(m0.includedSpendCents).toBe(850);

expect(m1.spendCents).toBe(500);
expect(m1.includedSpendCents).toBe(500);
expect(m1.monthlyLimitDollars).toBeNull();

globalThis.fetch = originalFetch;
});

it("preserves old /teams/spend shape (spendCents=total, no overallSpendCents)", async () => {
const originalFetch = globalThis.fetch;

globalThis.fetch = vi.fn(async () => {
return new Response(
JSON.stringify({
teamMemberSpend: [
{
userId: "user_1",
email: "a@test.com",
name: "Alice",
role: "member",
spendCents: 1000,
includedSpendCents: 800,
fastPremiumRequests: 5,
monthlyLimitDollars: 30,
hardLimitOverrideDollars: 0,
},
],
subscriptionCycleStart: 1704067200000,
totalPages: 1,
limitedUsersCount: 0,
}),
{ status: 200, headers: { "Content-Type": "application/json" } },
);
});

const { members } = await client.getSpending();
expect(members).toHaveLength(1);

const [m0] = members;
if (!m0) throw new Error("expected one normalized member");

expect(m0.spendCents).toBe(1000);
expect(m0.includedSpendCents).toBe(800);

globalThis.fetch = originalFetch;
});
});
39 changes: 39 additions & 0 deletions tests/db-cost-drivers.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest";
import fs from "node:fs";
import path from "node:path";

const TEST_DB_PATH = path.join(process.cwd(), "data", "test-cost-drivers.db");

type SqliteModule = typeof import("@/lib/data/sqlite");

describe("getUserCostDrivers", () => {
let sqlite: SqliteModule;

beforeAll(async () => {
if (fs.existsSync(TEST_DB_PATH)) fs.unlinkSync(TEST_DB_PATH);
process.env.DATABASE_PATH = TEST_DB_PATH;
sqlite = await import("@/lib/data/sqlite");
sqlite.getDb();
});

afterAll(() => {
sqlite.getDb().close();
if (fs.existsSync(TEST_DB_PATH)) fs.unlinkSync(TEST_DB_PATH);
delete process.env.DATABASE_PATH;
});

it("returns the top model for a given day", () => {
const insert = sqlite.getDb().prepare(
`INSERT INTO usage_events (user_email, timestamp, model, kind, total_cents)
VALUES (?, ?, ?, 'Included', ?)`,
);
const ts = String(Date.UTC(2026, 5, 1, 12));
insert.run("dev@example.com", ts, "cheap-model", 10);
insert.run("dev@example.com", ts, "expensive-model", 90);

const drivers = sqlite.getUserCostDrivers("dev@example.com", "2026-06-01");

expect(drivers?.top_model).toBe("expensive-model");
expect(drivers?.total_spend_cents).toBe(100);
});
});