@monotykamary/pi-better-grok 0.2.0 → 0.2.2

package/README.md

@@ -28,7 +28,7 @@ Data comes from the same revision-pinned Grok subscription surface used by the c
 1. `GET https://cli-chat-proxy.grok.com/v1/user` (identity)
 2. `GET https://cli-chat-proxy.grok.com/v1/billing?format=credits` (with the `x-userid` header)
 
-Status widget line: `Usage: 66% left · ↺ 5d5h - Mon 5:34 PM` (weekly period + reset clock). Defaults to the widget area below the editor, like pi-better-openai; set `"footer": {"mode": "replace"}` for the full custom footer.
+Status widget line: `Usage: 66% left · ↺ 5d5h - Mon 5:34 PM · 1 banked reset` (weekly period, reset clock, and available banked reset count). Defaults to the widget area below the editor, like pi-better-openai; set `"footer": {"mode": "replace"}` for the full custom footer.
 
 ## Banked resets
 
@@ -36,6 +36,8 @@ SuperGrok plans earn banked rate-limit reset tokens: redeeming one restores the
 
 The inventory and redeem calls use the grok.com consumer billing gRPC-Web service (`prod_mc_billing.ConsumerUiSvc/GetRemainingResets` and `RedeemReset`) that the web usage page itself calls, authenticated with the same xAI OAuth token as the usage meter. This surface is undocumented; request shapes are pinned in `src/resets.ts` and schema drift is expected.
 
+**Known limitation:** grok.com fronts this RPC with a Cloudflare managed challenge, which browser-fingerprinted clients (Electron apps) pass but plain CLI runtimes cannot — the edge answers with `403 · cf-mitigated: challenge` regardless of headers or credentials. When that happens the widget hides the count and `/grok-resets` explains the challenge instead of misreporting it as an auth failure. The wiring is live end to end, so the count appears in any environment where the fetch can succeed.
+
 ## pi-multiprovider
 
 When [pi-multiprovider](https://github.com/monotykamary/pi-multiprovider) pools several `xai` accounts, the session's active account (chosen with `/switch-account`) is resolved first for usage display and banked resets, and the usage widget refreshes on every switch. Without that extension, credential resolution is unchanged: pi's native `xai` OAuth, then `xai-oauth`/`xai-auth` auth-file entries, then the Grok CLI store.
@@ -53,7 +55,8 @@ JSON config at `~/.pi/agent/extensions/pi-better-grok.json` (global) or `<projec
     "enabled": true,
     "refreshIntervalMs": 60000,
     "showOnlyOnSubscriptionModels": true,
-    "showResetTimes": true
+    "showResetTimes": true,
+    "showBankedResets": true
   },
   "footer": { "mode": "status" }
 }

package/index.ts

@@ -152,7 +152,12 @@ export default function betterGrok(pi: ExtensionAPI): void {
   let sessionNameCached = false;
   let cachedSessionNameLeafId: string | null | undefined;
   let cachedSessionName: string | undefined;
-  const usageController = new UsageController(config, updateFooter, fetchUsageSnapshot);
+  const usageController = new UsageController(
+    config,
+    updateFooter,
+    fetchUsageSnapshot,
+    () => resetController.snapshot?.credits.availableCount ?? null,
+  );
   const resetController = new ResetController();
   let multiproviderService: MultiproviderService | undefined;
   let unsubscribeMultiprovider: (() => void) | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monotykamary/pi-better-grok",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Improve Grok/xAI in pi with fast mode, subscription usage stats, banked reset redemption, multiprovider pools, footer polish, and settings — mirroring pi-better-openai.",
   "keywords": [
     "footer",

package/src/config.ts

@@ -25,6 +25,7 @@ export type UsageConfig = {
   refreshIntervalMs?: number;
   showOnlyOnSubscriptionModels?: boolean;
   showResetTimes?: boolean;
+  showBankedResets?: boolean;
 };
 export type FooterConfig = { mode?: FooterMode };
 
@@ -64,6 +65,7 @@ export const DEFAULT_USAGE_CONFIG: Required<UsageConfig> = {
   refreshIntervalMs: 60_000,
   showOnlyOnSubscriptionModels: true,
   showResetTimes: true,
+  showBankedResets: true,
 };
 export const DEFAULT_FOOTER_CONFIG: Required<FooterConfig> = { mode: "status" };
 export const DEFAULT_CONFIG: ConfigFile = {
@@ -193,6 +195,16 @@ export const USAGE_SETTING_DESCRIPTORS: SettingsOptionDescriptor[] = [
     parse: (rawValue) => rawValue === "true",
     current: (config) => String(config.usage.showResetTimes),
   },
+  {
+    id: "usage.showBankedResets",
+    section: "usage",
+    key: "showBankedResets",
+    label: "Banked reset count",
+    description: "Show the available banked SuperGrok reset count in the usage status line.",
+    values: ["true", "false"],
+    parse: (rawValue) => rawValue === "true",
+    current: (config) => String(config.usage.showBankedResets),
+  },
 ];
 
 export const FAST_SETTING_DESCRIPTORS: SettingsOptionDescriptor[] = [

package/src/resets.ts

@@ -42,7 +42,14 @@ export type GrokRedeemCode = "reset" | "no_credit" | "already_redeemed";
 
 export type GrokRedeemResult = { code: GrokRedeemCode };
 
-export type ResetErrorCode = "auth" | "http" | "grpc" | "invalid" | "oversize" | "transport";
+export type ResetErrorCode =
+  | "auth"
+  | "challenge"
+  | "http"
+  | "grpc"
+  | "invalid"
+  | "oversize"
+  | "transport";
 
 export class ResetError extends Error {
   readonly code: ResetErrorCode;
@@ -383,6 +390,13 @@ async function postGrokRpc(
     throw new ResetError("transport", `Grok reset request failed: ${message}`);
   }
   if (!response.ok) {
+    if (response.headers.get("cf-mitigated") === "challenge") {
+      throw new ResetError(
+        "challenge",
+        `grok.com is serving a Cloudflare browser challenge (HTTP ${response.status}); banked reset data cannot be fetched from a non-browser client.`,
+        response.status,
+      );
+    }
     if (response.status === 401 || response.status === 403) {
       throw new ResetError(
         "auth",

package/src/usage-controller.ts

@@ -59,15 +59,18 @@ export class UsageController {
   private readonly getConfig: (ctx: ExtensionContext) => ResolvedConfig;
   private readonly updateFooter: (ctx: ExtensionContext) => void;
   private readonly fetchSnapshot: FetchUsageSnapshot;
+  private readonly getBankedResets: (() => number | null) | undefined;
 
   constructor(
     getConfig: (ctx: ExtensionContext) => ResolvedConfig,
     updateFooter: (ctx: ExtensionContext) => void,
     fetchSnapshot: FetchUsageSnapshot,
+    getBankedResets?: () => number | null,
   ) {
     this.getConfig = getConfig;
     this.updateFooter = updateFooter;
     this.fetchSnapshot = fetchSnapshot;
+    this.getBankedResets = getBankedResets;
   }
 
   get snapshot(): UsageSnapshot | undefined {
@@ -83,7 +86,10 @@ export class UsageController {
       !this.usageError &&
       cfg.usage.enabled &&
       isGrokSubscriptionModel(ctx, cfg, isUsingOAuth)
-      ? formatUsageSnapshot(this.usageSnapshot, cfg.usage)
+      ? formatUsageSnapshot(this.usageSnapshot, {
+          ...cfg.usage,
+          bankedResets: this.getBankedResets?.() ?? null,
+        })
       : undefined;
   }
 
@@ -99,7 +105,10 @@ export class UsageController {
       this.usageUpdatedAt && Date.now() - this.usageUpdatedAt > cfg.usage.refreshIntervalMs * 2
         ? ` · stale`
         : "";
-    return `${formatUsageSnapshot(this.usageSnapshot, cfg.usage)}${stale}`;
+    return `${formatUsageSnapshot(this.usageSnapshot, {
+      ...cfg.usage,
+      bankedResets: this.getBankedResets?.() ?? null,
+    })}${stale}`;
   }
 
   formatDetail(ctx: ExtensionContext): string {

package/src/usage.ts

@@ -230,9 +230,20 @@ export function formatCents(cents: number | null): string {
   return typeof cents === "number" ? `$${(cents / 100).toFixed(2)}` : "--";
 }
 
+export type UsageStatusOptions = {
+  showResetTimes: boolean;
+  showBankedResets?: boolean;
+  bankedResets?: number | null;
+};
+
+export function formatBankedResetsSuffix(count: number | null | undefined): string | null {
+  if (typeof count !== "number" || !Number.isInteger(count) || count <= 0) return null;
+  return `${count} banked reset${count === 1 ? "" : "s"}`;
+}
+
 export function formatUsageSnapshot(
   snapshot: UsageSnapshot,
-  options: { showResetTimes: boolean },
+  options: UsageStatusOptions,
   now = Date.now(),
 ): string {
   const used = snapshot.creditUsagePercent;
@@ -244,6 +255,9 @@ export function formatUsageSnapshot(
     const clock = formatResetClock(seconds, now);
     if (countdown && clock) parts.push(`↺ ${countdown} - ${clock}`);
   }
+  const banked =
+    options.showBankedResets === false ? null : formatBankedResetsSuffix(options.bankedResets);
+  if (banked) parts.push(banked);
   return parts.join(" · ");
 }