@bacnh85/pi-sub 0.1.13 → 0.1.14

package/extensions/index.ts

@@ -1,6 +1,5 @@
-import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { readStoredCredential, type ExtensionAPI, type ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { createHash } from "node:crypto";
-import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 
@@ -28,8 +27,6 @@ type UsageApiSnapshot = {
 	plan_type?: string;
 };
 
-type PiAuthFile = Record<string, PiAuthEntry | undefined>;
-
 type PiAuthEntry = {
 	type?: string;
 	access?: string;
@@ -109,10 +106,6 @@ function piAuthPath(): string {
 	return path.join(configDir, "auth.json");
 }
 
-async function readJsonFile<T>(file: string): Promise<T> {
-	return JSON.parse(await fs.readFile(file, "utf8")) as T;
-}
-
 function decodeJwtPayload(token: string | undefined): Record<string, any> | undefined {
 	if (!token) return undefined;
 	const parts = token.split(".");
@@ -274,23 +267,20 @@ function parseUsageResponse(body: unknown): UsageApiSnapshot | undefined {
 }
 
 async function readPiCodexAuth(): Promise<PiAuthEntry & { accountId: string }> {
-	const auth = await readJsonFile<PiAuthFile>(piAuthPath());
-	const entry = auth[CODEX_PROVIDER];
+	const entry = readStoredCredential(CODEX_PROVIDER, piAuthPath()) as PiAuthEntry | undefined;
 	const accountId = getCodexAccountId(entry);
 	if (!entry?.access || !accountId) throw new Error("Missing openai-codex OAuth entry in Pi auth");
 	return { ...entry, accountId };
 }
 
 async function readOpenCodeGoAuth(): Promise<SubscriptionAccountSnapshot> {
-	const auth = await readJsonFile<PiAuthFile>(piAuthPath());
-	const entry = auth[OPC_PROVIDER];
+	const entry = readStoredCredential(OPC_PROVIDER, piAuthPath()) as PiAuthEntry | undefined;
 	if (!entry?.key && !entry?.accountId) throw new Error("Missing opencode-go API key or accountId in Pi auth");
 	return authAccountSnapshot("OpenCode Go", entry, { plan: "Go" });
 }
 
 async function readZaiAuth(): Promise<{ key: string; account: SubscriptionAccountSnapshot }> {
-	const auth = await readJsonFile<PiAuthFile>(piAuthPath());
-	const entry = auth[ZAI_PROVIDER];
+	const entry = readStoredCredential(ZAI_PROVIDER, piAuthPath()) as PiAuthEntry | undefined;
 	if (!entry?.key) throw new Error("Missing zai API key in Pi auth");
 	return { key: entry.key, account: authAccountSnapshot("Z.ai", entry) };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bacnh85/pi-sub",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "Pi extension showing subscription usage for supported model providers.",
   "type": "module",
   "license": "MIT",
@@ -38,6 +38,6 @@
     "node": ">=20.3.0"
   },
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": "*"
+    "@earendil-works/pi-coding-agent": ">=0.80.8 <0.81.0"
   }
 }