livepeer · eliteprox · Sep 8, 2026
@@ -21,10 +21,13 @@ import {
 } from "@/lib/console/useBillingPlans";
 import { redirectToCheckout } from "@/lib/console/checkout-redirect";
 import { useAuth } from "@/components/console/AuthContext";
-import { useWalletBillingState } from "@/lib/console/useOwnerWallet";
+import {
+  SESSION_USAGE_OPTIONS,
+  useAccountUsage,
+} from "@/lib/console/useAccountUsage";
 import {
   includedUsageRemainingLabel,
-  includedUsageSummary,
+  includedUsageSummaryFromBalance,
 } from "@/lib/console/wallet-settlement-display";
 
 function isUsagePlan(
@@ -82,10 +85,18 @@ function clearCheckoutQueryParam(): void {
 export default function PlansPanel() {
   const { isConnected } = useAuth();
   const { state, reload, subscribe, changePlan } = useBillingPlans(isConnected);
-  const wallet = useWalletBillingState(isConnected);
+  const usage = useAccountUsage(isConnected, SESSION_USAGE_OPTIONS);
   const included =
-    wallet.state.status === "ready"
-      ? includedUsageSummary(wallet.state.wallet.billingState)
+    usage.status === "ready"
+      ? includedUsageSummaryFromBalance(
+          usage.data.balance,
+          state.status === "ready" && state.subscription
+            ? {
+                id: state.subscription.planId,
+                name: state.subscription.planName,
+              }
+            : undefined
+        )
       : null;
   const [busyPlanId, setBusyPlanId] = useState<string | null>(null);
   const [error, setError] = useState<string | null>(null);

@@ -2,26 +2,28 @@
 
 import Link from "next/link";
 import { useAuth } from "@/components/console/AuthContext";
-import { useWalletBillingState } from "@/lib/console/useOwnerWallet";
+import {
+  SESSION_USAGE_OPTIONS,
+  useAccountUsage,
+} from "@/lib/console/useAccountUsage";
 import { microsToUsd } from "@/lib/console/usage-capability-display";
-import { includedUsageSummary } from "@/lib/console/wallet-settlement-display";
+import { includedUsageSummaryFromBalance } from "@/lib/console/wallet-settlement-display";
 
 /**
  * Sidebar balance meter. It shows the remaining balance against the amount
  * issued for the current plan period.
  */
 export default function SidebarUsageCard() {
   const { isConnected } = useAuth();
-  const wallet = useWalletBillingState(isConnected);
+  const usage = useAccountUsage(isConnected, SESSION_USAGE_OPTIONS);
   const included =
-    wallet.state.status === "ready"
-      ? includedUsageSummary(wallet.state.wallet.billingState)
+    usage.status === "ready"
+      ? includedUsageSummaryFromBalance(usage.data.balance)
       : null;
 
-  if (
-    isConnected &&
-    (wallet.state.status === "loading" || wallet.state.status === "idle")
-  ) {
+  if (!isConnected) return null;
+
+  if (usage.status === "loading" || usage.status === "idle") {
     return (
       <div
         className="mx-1 mt-2 block animate-pulse rounded-md border border-subtle bg-sidebar-card-bg px-2.5 py-2"
@@ -34,7 +36,7 @@ export default function SidebarUsageCard() {
     );
   }
 
-  if (wallet.state.status === "error") {
+  if (usage.status === "error") {
     return (
       <Link
         href="/home"
@@ -48,25 +50,21 @@ export default function SidebarUsageCard() {
     );
   }
 
-  if (wallet.state.status !== "ready") return null;
-
-  let remainingUsd: number;
-  let issuedUsd: number;
+  if (usage.status !== "ready") return null;
 
-  if (included) {
-    remainingUsd = microsToUsd(included.remainingUsdMicros);
-    issuedUsd = microsToUsd(included.totalUsdMicros);
-  } else {
-    remainingUsd = microsToUsd(wallet.state.wallet.balance?.usdMicros ?? "0");
-    issuedUsd = Math.max(
-      remainingUsd,
-      microsToUsd(wallet.state.wallet.balance?.lifetimeGrantedUsdMicros ?? "0")
-    );
-  }
+  const remainingUsd = included
+    ? microsToUsd(included.remainingUsdMicros)
+    : microsToUsd(usage.data.balance?.balanceUsdMicros ?? "0");
+  const issuedUsd = included
+    ? microsToUsd(included.totalUsdMicros)
+    : Math.max(
+        remainingUsd,
+        microsToUsd(usage.data.balance?.lifetimeGrantedUsdMicros ?? "0")
+      );
 
   const pct =
     issuedUsd > 0 ? Math.min(100, (remainingUsd / issuedUsd) * 100) : 0;
-  const canSpend = wallet.state.wallet.billingState.canSpend;
+  const canSpend = usage.data.balance?.hasAccess ?? remainingUsd > 0;
 
   return (
     <Link

@@ -9,9 +9,12 @@ import Button from "@/components/design-system/Button";
 import { useAuth, type ConsoleUser } from "@/components/console/AuthContext";
 import { MCP_SERVER_URL } from "@/lib/constants";
 import { microsToUsd } from "@/lib/console/usage-capability-display";
-import { useWalletBillingState } from "@/lib/console/useOwnerWallet";
 import {
-  includedUsageSummary,
+  SESSION_USAGE_OPTIONS,
+  useAccountUsage,
+} from "@/lib/console/useAccountUsage";
+import {
+  includedUsageSummaryFromBalance,
   type IncludedUsageSummary,
 } from "@/lib/console/wallet-settlement-display";
 
@@ -111,8 +114,7 @@ type Runway = {
 };
 
 /**
- * Balance figure for the account runway: included balance, prepaid credits,
- * then metered overage.
+ * Balance figure for the session user's included allowance.
  */
 function Instrument({
   loading,
@@ -178,31 +180,24 @@ export default function UsageView() {
   const { isConnected, user } = useAuth();
   const [callsQuery, setCallsQuery] = useState("");
 
-  const walletState = useWalletBillingState(isConnected);
+  const usage = useAccountUsage(isConnected, SESSION_USAGE_OPTIONS);
 
   const included: IncludedUsageSummary | null =
-    walletState.state.status === "ready"
-      ? includedUsageSummary(walletState.state.wallet.billingState)
+    usage.status === "ready"
+      ? includedUsageSummaryFromBalance(usage.data.balance)
       : null;
 
   const runway: Runway | null = useMemo(() => {
-    if (walletState.state.status !== "ready" || !included) return null;
-    const funding = walletState.state.wallet.billingState.funding;
-    const overage = funding.overage;
+    if (usage.status !== "ready") return null;
     return {
-      includedTotal: microsToUsd(included.totalUsdMicros),
-      consumed: microsToUsd(included.consumedUsdMicros),
-      credits: microsToUsd(walletState.state.wallet.balance?.usdMicros ?? "0"),
-      overage:
-        overage.eligible && overage.remaining
-          ? microsToUsd(overage.remaining.usdMicros)
-          : null,
+      includedTotal: included ? microsToUsd(included.totalUsdMicros) : 0,
+      consumed: included ? microsToUsd(included.consumedUsdMicros) : 0,
+      credits: 0,
+      overage: null,
     };
-  }, [walletState.state, included]);
+  }, [usage.status, included]);
 
-  const loading =
-    walletState.state.status === "loading" ||
-    walletState.state.status === "idle";
+  const loading = usage.status === "loading" || usage.status === "idle";
 
   return (
     <div className="w-full pb-20">
@@ -221,12 +216,9 @@ export default function UsageView() {
         />
       </div>
 
-      {walletState.state.status === "error" && (
+      {usage.status === "error" && (
         <div className="mt-4 px-3 md:px-7">
-          <UsageLoadError
-            message={walletState.state.message}
-            onRetry={walletState.reload}
-          />
+          <UsageLoadError message={usage.message} onRetry={usage.reload} />
         </div>
       )}
 

@@ -32,9 +32,13 @@ import {
   startWalletTopUp,
   useWalletBillingState,
 } from "@/lib/console/useOwnerWallet";
+import {
+  SESSION_USAGE_OPTIONS,
+  useAccountUsage,
+} from "@/lib/console/useAccountUsage";
 import {
   includedUsageRemainingLabel,
-  includedUsageSummary,
+  includedUsageSummaryFromBalance,
   formatWalletUsd,
   overageLimitNote,
 } from "@/lib/console/wallet-settlement-display";
@@ -195,10 +199,7 @@ export default function BillingSection() {
     removePaymentMethod,
   } = useBillingAccount(isConnected);
   const wallet = useWalletBillingState(isConnected);
-  const included =
-    wallet.state.status === "ready"
-      ? includedUsageSummary(wallet.state.wallet.billingState)
-      : null;
+  const usage = useAccountUsage(isConnected, SESSION_USAGE_OPTIONS);
 
   const [busyPlanId, setBusyPlanId] = useState<string | null>(null);
   const [pmBusy, setPmBusy] = useState(false);
@@ -658,6 +659,16 @@ export default function BillingSection() {
   const cancelingEndsAt = resolveCancelingEffectiveAt(subscription);
   const cancelingEndsLabel = formatPendingCancelDate(cancelingEndsAt);
 
+  const included =
+    usage.status === "ready"
+      ? includedUsageSummaryFromBalance(
+          usage.data.balance,
+          subscription
+            ? { id: subscription.planId, name: subscription.planName }
+            : undefined
+        )
+      : null;
+
   const planSub =
     subscriptionUiState.kind === "canceling"
       ? `${cancelingPlanName} ends ${cancelingEndsLabel}`

@@ -43,6 +43,11 @@ type UseAccountUsageOptions = {
   includePrior?: boolean;
 };
 
+/** Session meters only need the live allowance, not the prior usage window. */
+export const SESSION_USAGE_OPTIONS: UseAccountUsageOptions = {
+  includePrior: false,
+};
+
 function normalizeOptions(
   periodDaysOrOptions: number | UseAccountUsageOptions = 30
 ): Required<

@@ -8,6 +8,7 @@ import {
   collectionSchedule,
   includedUsageRemainingLabel,
   includedUsageSummary,
+  includedUsageSummaryFromBalance,
   overageLimitNote,
   spendPostureBadge,
 } from "./wallet-settlement-display";
@@ -257,6 +258,42 @@ describe("includedUsageSummary", () => {
   });
 });
 
+describe("includedUsageSummaryFromBalance", () => {
+  it("returns null when the user has no granted allowance", () => {
+    const summary = includedUsageSummaryFromBalance({
+      externalUserId: "eu_1",
+      balanceUsdMicros: "0",
+      consumedUsdMicros: "0",
+      lifetimeGrantedUsdMicros: "0",
+      hasAccess: false,
+    });
+    assert.equal(summary, null);
+  });
+
+  it("maps remaining and granted from the user usage balance", () => {
+    const summary = includedUsageSummaryFromBalance(
+      {
+        externalUserId: "eu_1",
+        balanceUsdMicros: "4982000",
+        consumedUsdMicros: "18000",
+        lifetimeGrantedUsdMicros: "5000000",
+        hasAccess: true,
+      },
+      { id: "plan_1", name: "Starter" },
+    );
+    assert.ok(summary);
+    assert.equal(summary.remainingUsd, "4.98");
+    assert.equal(summary.totalUsd, "5.00");
+    assert.equal(summary.consumedUsd, "0.02");
+    assert.equal(summary.planName, "Starter");
+    assert.equal(summary.planId, "plan_1");
+    assert.equal(
+      includedUsageRemainingLabel(summary),
+      "Starter · $4.98 of $5.00 included left",
+    );
+  });
+});
+
 describe("overageLimitNote", () => {
   it("shows ceiling and remaining headroom while spendable", () => {
     const note = overageLimitNote(makeState({}));

@@ -1,4 +1,5 @@
 import type { BillingState, BillingStatus } from "@pymthouse/builder-sdk";
+import type { AccountUsageBalance } from "./account-usage";
 import { microsToUsd } from "./usage-capability-display";
 
 type IncludedUsageFunding = {
@@ -191,6 +192,37 @@ export function includedUsageSummary(
   };
 }
 
+/**
+ * Session-user included allowance from `me/usage/balance`.
+ * Null when the user has no granted cycle (prepaid / invoice only).
+ */
+export function includedUsageSummaryFromBalance(
+  balance: AccountUsageBalance | null | undefined,
+  sourcePlan?: { id?: string | null; name?: string | null },
+): IncludedUsageSummary | null {
+  if (!balance) return null;
+  const remainingUsdMicros = balance.balanceUsdMicros;
+  const grantedUsdMicros = balance.lifetimeGrantedUsdMicros;
+  const consumedUsdMicros = balance.consumedUsdMicros;
+  const totalUsdMicros =
+    parseUsdMicros(grantedUsdMicros) > BigInt(0)
+      ? grantedUsdMicros
+      : remainingUsdMicros;
+  if (parseUsdMicros(totalUsdMicros) <= BigInt(0)) return null;
+
+  return {
+    remainingUsdMicros,
+    totalUsdMicros,
+    consumedUsdMicros,
+    remainingUsd: formatWalletUsd(remainingUsdMicros),
+    totalUsd: formatWalletUsd(totalUsdMicros),
+    consumedUsd: formatWalletUsd(consumedUsdMicros),
+    planId: sourcePlan?.id?.trim() || null,
+    planName: sourcePlan?.name?.trim() || null,
+    resetsAt: null,
+  };
+}
+
 export function includedUsageRemainingLabel(
   summary: IncludedUsageSummary,
 ): string {