pi-provider-qoder-cn 0.2.6 → 0.2.8

package/README.md

@@ -74,6 +74,7 @@ Qoder CN Plan (personal_standard)
 Overall     [███░░░░░░░░░░░░░░░░░░]                      12.5%  used
 Plan quota  [███░░░░░░░░░░░░░░░░░░]  250 / 2000 credits  12.5%  1750 left
 Add-on      [░░░░░░░░░░░░░░░░░░░░░]    0 /  700 credits     0%   700 left
+User        someone · someone@example.com
 Expires     never
 Manage      https://qoder.com.cn/account/usage
 ```

package/dist/index.js

@@ -1100,6 +1100,16 @@ var init_catalog = __esm({
 });
 
 // src/auth/pat.ts
+var pat_exports = {};
+__export(pat_exports, {
+  PAT_REFRESH_PREFIX: () => PAT_REFRESH_PREFIX,
+  credentialsFromPat: () => credentialsFromPat,
+  decodePatRefresh: () => decodePatRefresh,
+  encodePatRefresh: () => encodePatRefresh,
+  exchangeJobToken: () => exchangeJobToken,
+  fetchUserInfo: () => fetchUserInfo,
+  isPatRefresh: () => isPatRefresh
+});
 function isPatRefresh(refresh) {
   return refresh.startsWith(`${PAT_REFRESH_PREFIX}|`);
 }
@@ -2014,12 +2024,16 @@ function formatQoderUsage(raw, mode, now = Date.now(), options = {}) {
   const notes = [];
   if (danger) {
     notes.push({ label: "Status", value: "quota exceeded", color: ANSI.red });
-    if (!showOrg || isPersonalStandard) {
-      notes.push({ label: "Daily reset", value: formatDailyResetCountdown(now) });
-    }
   }
   if (!showUserQuota && !showAddOnQuota && !showOrg) notes.push({ label: "Buckets", value: "none returned" });
   if (raw?.isPlanQuotaProrated) notes.push({ label: "Note", value: "plan quota is prorated" });
+  const user = options.user;
+  if (user && (user.name || user.email)) {
+    notes.push({ label: "User", value: [user.name, user.email].filter(Boolean).join(" \xB7 ") });
+  }
+  if (isPersonalStandard || !showOrg && formatResetTime(raw?.expiresAt, now) === "never") {
+    notes.push({ label: "Daily reset", value: formatDailyResetCountdown(now) });
+  }
   notes.push({ label: "Expires", value: formatResetTime(raw?.expiresAt, now) });
   const manageUrl = raw?.addOnQuota?.detailUrl || raw?.upgradeUrl || region.manageUrl;
   if (manageUrl) notes.push({ label: "Manage", value: manageUrl });
@@ -2054,14 +2068,30 @@ async function fetchQoderQuota(accessToken, mode) {
   if (!data) throw new Error("Qoder usage response was not JSON.");
   return data;
 }
-async function resolveAccessToken(providerID, ctx) {
+async function resolveUsageIdentity(providerID, mode, ctx, withIdentity = true) {
+  let access;
   try {
-    const fromRegistry = await ctx?.modelRegistry?.getApiKeyForProvider(providerID);
-    if (fromRegistry) return fromRegistry;
+    access = await ctx?.modelRegistry?.getApiKeyForProvider(providerID) || void 0;
   } catch {
   }
   const { getCachedCredentials: getCachedCredentials2 } = await Promise.resolve().then(() => (init_oauth(), oauth_exports));
-  return getCachedCredentials2("", providerID)?.access || void 0;
+  const stored = getCachedCredentials2("", providerID);
+  access = access || stored?.access || void 0;
+  if (!access) return void 0;
+  if (!withIdentity) return { access, name: "", email: "" };
+  const storedMatches = stored?.access === access;
+  let name = storedMatches && stored?.name || "";
+  let email = storedMatches && stored?.email || "";
+  if (!name && !email) {
+    try {
+      const { fetchUserInfo: fetchUserInfo2 } = await Promise.resolve().then(() => (init_pat(), pat_exports));
+      const info = await fetchUserInfo2(access, mode);
+      name = info.name || "";
+      email = info.email || "";
+    } catch {
+    }
+  }
+  return { access, name, email };
 }
 var FORMAT_ARGS = /* @__PURE__ */ new Set(["json", "raw", "debug"]);
 var PLAIN_ARGS = /* @__PURE__ */ new Set(["plain", "no-color", "nocolor"]);
@@ -2077,14 +2107,15 @@ async function runUsageCommand(mode, args, ctx) {
   const providerID = region.providerID;
   const wantsRaw = FORMAT_ARGS.has((args || "").trim().toLowerCase());
   try {
-    const accessToken = await resolveAccessToken(providerID, ctx);
+    const identity = await resolveUsageIdentity(providerID, mode, ctx, !wantsRaw);
+    const accessToken = identity?.access;
     if (!accessToken) {
       ctx?.ui?.notify(`No ${providerID} credentials. Run /login ${providerID} first.`, "warning");
       return;
     }
     const raw = await fetchQoderQuota(accessToken, mode);
     const color = !wantsRaw && shouldColorize(args, { hasUI: Boolean(ctx?.ui) });
-    const output = wantsRaw ? JSON.stringify(raw, null, 2) : formatQoderUsage(raw, mode, Date.now(), { color }).lines.join("\n");
+    const output = wantsRaw ? JSON.stringify(raw, null, 2) : formatQoderUsage(raw, mode, Date.now(), { color, user: identity }).lines.join("\n");
     ctx?.ui?.notify(output, "info");
     if (!ctx?.ui) console.log(output);
   } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-provider-qoder-cn",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "Pi extension for Qoder CN — PAT/OAuth auth, /qoder-cn.usage quota command, and enterprise VPC endpoint support",
   "type": "module",
   "license": "MIT",