feat(accounts/billing): getSubscription reads a real subscription endpoint

Replace the listMine()-derived shim with a dedicated call to
GET /accounts/{id}/billing/subscription, returning richer detail:
billing_provider, current_period_end (renewal), cancel_at_period_end,
canceled_at, started_at — alongside plan_id/billing_status/plan. The id still
auto-resolves to the active account when omitted.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: felixkob

src/modules/accounts.ts

@@ -128,28 +128,8 @@ export function createAccountsModule(
       },
 
       async getSubscription(accountId?: string): Promise<AccountSubscription> {
-        // /me is needed for the account's plan_id/billing_status, and also
-        // resolves the active account id — fetch it once and reuse it.
-        const mine: MyAccountsResponse = await axios.get(`${base}/me`);
-        const id =
-          accountId ??
-          getStoredActiveAccountId(appId) ??
-          mine.active_account_id ??
-          undefined;
-        if (!id) {
-          throw new Error(
-            "No active account: pass an accountId, or have the user select or create an account first."
-          );
-        }
-        const plans: AccountPlan[] = await axios.get(`${base}/${id}/billing/plans`);
-        const account = mine.accounts.find((a) => a.id === id) ?? null;
-        const planId = account?.plan_id ?? null;
-        return {
-          account_id: id,
-          plan_id: planId,
-          billing_status: account?.billing_status ?? "none",
-          plan: planId ? plans.find((p) => p.id === planId) ?? null : null,
-        };
+        const id = await resolveAccountId(accountId);
+        return axios.get(`${base}/${id}/billing/subscription`);
       },
 
       async startCheckout(

src/modules/accounts.types.ts

@@ -78,8 +78,18 @@ export interface AccountSubscription {
   plan_id: string | null;
   /** Lifecycle status: "none" | "active" | "past_due" | "canceled". */
   billing_status: string;
-  /** The resolved plan (matched from the account's available plans), or `null`. */
+  /** The payment rail backing the subscription, or `null`. */
+  billing_provider: string | null;
+  /** The current plan, or `null` when the account has no subscription. */
   plan: AccountPlan | null;
+  /** When the current paid period ends / renews (ISO 8601), or `null`. */
+  current_period_end: string | null;
+  /** True when the subscription will not renew at period end. */
+  cancel_at_period_end: boolean;
+  /** When the subscription was canceled (ISO 8601), or `null`. */
+  canceled_at: string | null;
+  /** When the subscription started (ISO 8601), or `null`. */
+  started_at: string | null;
 }
 
 /**

tests/unit/accounts.test.ts

@@ -56,26 +56,33 @@ describe("Accounts module", () => {
     expect(scope.isDone()).toBe(true);
   });
 
-  test("billing.getSubscription derives plan + status from /me and plans", async () => {
-    const plan = { id: "p1", name: "Pro", price_amount: 1000, currency: "usd", interval: "month", is_active: true };
-    scope.get(`/api/apps/${appId}/accounts/me`).reply(200, {
-      accounts: [{ id: ACCT, name: "Acme", plan_id: "p1", billing_status: "active" }],
-      active_account_id: ACCT,
-    });
-    scope.get(`/api/apps/${appId}/accounts/${ACCT}/billing/plans`).reply(200, [plan]);
+  test("billing.getSubscription GETs the subscription endpoint (resolving active account)", async () => {
+    const payload = {
+      account_id: ACCT,
+      plan_id: "p1",
+      billing_status: "active",
+      billing_provider: "stripe_connect",
+      plan: { id: "p1", name: "Pro", price_amount: 1000, currency: "usd", interval: "month", is_active: true },
+      current_period_end: "2026-07-01T00:00:00+00:00",
+      cancel_at_period_end: false,
+      canceled_at: null,
+      started_at: "2026-06-01T00:00:00+00:00",
+    };
+    scope.get(`/api/apps/${appId}/accounts/me`).reply(200, { accounts: [], active_account_id: ACCT });
+    scope.get(`/api/apps/${appId}/accounts/${ACCT}/billing/subscription`).reply(200, payload);
     const sub = await base44.accounts.billing.getSubscription();
-    expect(sub).toEqual({ account_id: ACCT, plan_id: "p1", billing_status: "active", plan });
+    expect(sub).toEqual(payload);
     expect(scope.isDone()).toBe(true);
   });
 
-  test("billing.getSubscription returns null plan/none status when unsubscribed", async () => {
-    scope.get(`/api/apps/${appId}/accounts/me`).reply(200, {
-      accounts: [{ id: ACCT, name: "Acme", plan_id: null }],
-      active_account_id: ACCT,
-    });
-    scope.get(`/api/apps/${appId}/accounts/${ACCT}/billing/plans`).reply(200, []);
+  test("billing.getSubscription(accountId) uses the explicit id (no /me)", async () => {
+    const payload = {
+      account_id: ACCT, plan_id: null, billing_status: "none", billing_provider: null,
+      plan: null, current_period_end: null, cancel_at_period_end: false, canceled_at: null, started_at: null,
+    };
+    scope.get(`/api/apps/${appId}/accounts/${ACCT}/billing/subscription`).reply(200, payload);
     const sub = await base44.accounts.billing.getSubscription(ACCT);
-    expect(sub).toEqual({ account_id: ACCT, plan_id: null, billing_status: "none", plan: null });
+    expect(sub).toEqual(payload);
     expect(scope.isDone()).toBe(true);
   });