pi-credits 0.3.0 → 0.3.2

package/README.md

@@ -6,7 +6,7 @@ A [pi](https://pi.dev/) extension that shows the active model provider's credit
 
 ![Screenshot](./assets/screenshot.png)
 
-> Example with an OpenAI Codex subscription, paired with my [pi-spark](https://github.com/zlliang/pi-spark) package.
+> Example with an OpenAI Codex subscription, paired with my [pi-spark](https://github.com/zlliang/pi-packages/tree/main/packages/pi-spark) package.
 
 ## Supported providers
 
@@ -27,12 +27,12 @@ Install from npm:
 pi install npm:pi-credits
 ```
 
-Install from git:
+For local development from this monorepo:
 
 ```bash
-pi install git:github.com/zlliang/pi-credits
+pi install /path/to/pi-packages/packages/pi-credits
 ```
 
 ## Other pi packages
 
-- [pi-spark](https://github.com/zlliang/pi-spark): a small, opinionated collection of pi extensions.
+- [pi-spark](https://github.com/zlliang/pi-packages/tree/main/packages/pi-spark): a small, opinionated collection of pi extensions.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-credits",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "A pi extension that shows the active provider's credit balance or rate-limit usage",
   "keywords": [
     "pi-coding-agent",
@@ -8,7 +8,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/zlliang/pi-credits.git"
+    "url": "git+https://github.com/zlliang/pi-packages.git",
+    "directory": "packages/pi-credits"
   },
   "license": "MIT",
   "type": "module",
@@ -17,17 +18,13 @@
     "src",
     "docs",
     "assets",
-    "README.md",
-    "LICENSE"
+    "README.md"
   ],
   "pi": {
     "extensions": [
       "./index.ts"
     ],
-    "image": "https://raw.githubusercontent.com/zlliang/pi-credits/main/assets/cover.png"
-  },
-  "scripts": {
-    "typecheck": "tsc --noEmit"
+    "image": "https://raw.githubusercontent.com/zlliang/pi-packages/main/packages/pi-credits/assets/cover.png"
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.14.4",
@@ -39,13 +36,7 @@
     "@earendil-works/pi-coding-agent": "*",
     "@earendil-works/pi-tui": "*"
   },
-  "devDependencies": {
-    "@earendil-works/pi-agent-core": "*",
-    "@earendil-works/pi-ai": "*",
-    "@earendil-works/pi-coding-agent": "*",
-    "@earendil-works/pi-tui": "*",
-    "@types/node": "*",
-    "typebox": "*",
-    "typescript": "^6.0.3"
+  "scripts": {
+    "typecheck": "pnpm --dir ../.. typecheck"
   }
-}
+}

package/src/manager.ts

@@ -9,6 +9,7 @@ const REQUEST_TIMEOUT_MS = 30_000;
 
 export class CreditsManager {
   private inflight: AbortController | undefined = undefined;
+  private currentProvider: string | undefined = undefined;
 
   async refresh(ctx: ExtensionContext): Promise<void> {
     this.inflight?.abort();
@@ -16,10 +17,17 @@ export class CreditsManager {
     const provider = findProvider(ctx.model?.provider);
     if (!provider) {
       this.inflight = undefined;
+      this.currentProvider = undefined;
       ctx.ui.setStatus(STATUS_KEY, undefined);
       return;
     }
 
+    // Clear stale credits from another provider while the new fetch is in flight.
+    if (this.currentProvider !== provider.id) {
+      this.currentProvider = provider.id;
+      ctx.ui.setStatus(STATUS_KEY, undefined);
+    }
+
     const controller = new AbortController();
     this.inflight = controller;
 
@@ -30,7 +38,7 @@ export class CreditsManager {
 
   private async fetch(ctx: ExtensionContext, provider: CreditsProvider, signal: AbortSignal): Promise<void> {
     try {
-      const apiKey = await ctx.modelRegistry.getApiKeyForProvider(provider.provider);
+      const apiKey = await ctx.modelRegistry.getApiKeyForProvider(provider.id);
       if (!apiKey) {
         ctx.ui.setStatus(STATUS_KEY, undefined);
         return;
@@ -42,12 +50,12 @@ export class CreditsManager {
       const credits = await provider.fetch(ctx, apiKey, AbortSignal.any(signals));
 
       // The active model may have changed while the request was in flight.
-      if (ctx.model?.provider !== provider.provider) return;
+      if (ctx.model?.provider !== provider.id) return;
 
       ctx.ui.setStatus(STATUS_KEY, renderCredits(ctx.ui.theme, provider.label, credits));
     } catch (error) {
       if (signal.aborted || ctx.signal?.aborted) return;
-      if (ctx.model?.provider !== provider.provider) return;
+      if (ctx.model?.provider !== provider.id) return;
 
       const message = error instanceof Error ? error.message : String(error);
       ctx.ui.setStatus(STATUS_KEY, renderError(ctx.ui.theme, provider.label, message));

package/src/providers/deepseek.ts

@@ -15,7 +15,7 @@ interface DeepSeekBalanceInfo {
 }
 
 export const deepseekProvider: CreditsProvider = {
-  provider: PROVIDER,
+  id: PROVIDER,
   label: "DeepSeek",
 
   async fetch(_ctx, apiKey, signal): Promise<Credits> {

package/src/providers/fireworks.ts

@@ -99,7 +99,7 @@ function moneyToNumber(money: Money | null | undefined): number | undefined {
 }
 
 export const fireworksProvider: CreditsProvider = {
-  provider: PROVIDER,
+  id: PROVIDER,
   label: "Fireworks",
 
   async fetch(_ctx, apiKey, signal): Promise<Credits> {

package/src/providers/index.ts

@@ -18,5 +18,5 @@ const PROVIDERS: CreditsProvider[] = [
 ];
 
 export function findProvider(provider?: string): CreditsProvider | undefined {
-  return PROVIDERS.find((entry) => entry.provider === provider);
+  return PROVIDERS.find((entry) => entry.id === provider);
 }

package/src/providers/moonshot.ts

@@ -13,9 +13,9 @@ interface MoonshotBalanceResponse {
  * different currencies (USD vs CNY), which the endpoint does not report, so each pi provider ID
  * fixes both host and currency.
  */
-function createMoonshotProvider(provider: string, host: string, currency: string): CreditsProvider {
+function createMoonshotProvider(id: string, host: string, currency: string): CreditsProvider {
   return {
-    provider,
+    id,
     label: "Moonshot",
 
     async fetch(_ctx, apiKey, signal): Promise<Credits> {

package/src/providers/openai-codex.ts

@@ -33,7 +33,7 @@ function parseUsedPercent(window?: CodexRateWindow | null): number | undefined {
 }
 
 export const openaiCodexProvider: CreditsProvider = {
-  provider: PROVIDER,
+  id: PROVIDER,
   label: "Codex",
 
   async fetch(ctx, apiKey, signal): Promise<Credits> {

package/src/providers/openrouter.ts

@@ -13,7 +13,7 @@ interface OpenRouterCreditsResponse {
 }
 
 export const openrouterProvider: CreditsProvider = {
-  provider: PROVIDER,
+  id: PROVIDER,
   label: "OpenRouter",
 
   async fetch(_ctx, apiKey, signal): Promise<Credits> {

package/src/providers/vercel-ai-gateway.ts

@@ -10,7 +10,7 @@ interface VercelCreditsResponse {
 }
 
 export const vercelAiGatewayProvider: CreditsProvider = {
-  provider: PROVIDER,
+  id: PROVIDER,
   label: "Vercel",
 
   async fetch(_ctx, apiKey, signal): Promise<Credits> {

package/src/types.ts

@@ -18,7 +18,7 @@ export interface CreditsLane {
 
 /** A credits source for a pi provider, shown in the status line while that provider is active. */
 export interface CreditsProvider {
-  readonly provider: Provider;
+  readonly id: Provider;
   readonly label: string;
   fetch(ctx: ExtensionContext, apiKey: string, signal: AbortSignal): Promise<Credits>;
 }