pi-provider-qoder-cn 0.2.3 → 0.2.5

package/README.md

@@ -74,7 +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
-Resets      never
+Expires     never
 Manage      https://qoder.com.cn/account/usage
 ```
 
@@ -100,8 +100,8 @@ Notes:
   not reserve space for one it does not have.
 - Colour is suppressed automatically for a `NO_COLOR` environment, a dumb
   terminal, and any non-TTY output that is not the interactive UI.
-- `Resets never` means the API reported the year-9999 sentinel, i.e. the
-  allowance does not reset on a schedule.
+- `Expires never` means the API reported the year-9999 sentinel, i.e. the
+  allowance has no expiry date.
 - `Note  plan quota is prorated` appears after a mid-cycle plan change.
 - The command uses the same stored token as chat requests, refreshing it first,
   so it reports the same quota the model is actually billed against.
@@ -157,21 +157,16 @@ the currently saved endpoint and defaults to the personal account:
 Choose the Qoder CN endpoint (default: personal account)
   → Personal account — public gateway (qoder.com.cn)
     Enterprise account — use a VPC endpoint
-    Enterprise account — <detected value> (detected: stored credential)
 ```
 
-- **Personal account** uses the public gateway and pins that choice, so a value
-  left behind by another client cannot resurface. If `QODER_VPC_ENDPOINT` /
-  `QODERCN_VPC_ENDPOINT` is set, it still wins — `/login` says so and warns
-  that a personal pick reverts on restart until the variable is removed.
+- **Personal account** uses the public gateway and pins that choice. If
+  `QODER_VPC_ENDPOINT` / `QODERCN_VPC_ENDPOINT` is set, it still wins —
+  `/login` says so and warns that a personal pick reverts on restart until the
+  variable is removed.
 - **Enterprise account** then prompts for the instance name or domain.
 - Switching back and forth is expected; re-running `/login` presents the saved
   endpoint so you can change it.
 
-A `vpc_endpoint` found in `~/.pi/agent/auth.json` is offered as the third option
-but never applied on its own. `/qoder-endpoint` with no argument also reports it
-under “Detected (not applied)”.
-
 ## Models
 
 | Model | id | Context | Thinking effort |

package/dist/index.js

@@ -256,22 +256,6 @@ function readVpcEndpointFromSettings() {
   }
   return void 0;
 }
-function readVpcEndpointFromAuth() {
-  try {
-    const path = join2(piAgentDir(), "auth.json");
-    if (!existsSync2(path)) return void 0;
-    const auth = JSON.parse(readFileSync2(path, "utf8"));
-    const entry = auth?.["qoder-cn"];
-    const value = entry?.vpc_endpoint ?? entry?.vpcInstance;
-    if (value !== void 0 && value !== "") return String(value);
-  } catch {
-  }
-  return void 0;
-}
-function readInheritedVpcEndpoint() {
-  const value = readVpcEndpointFromAuth();
-  return value ? { value, source: "stored credential" } : void 0;
-}
 function readQoderVpcEndpoint() {
   const fromEnv = process.env.QODER_VPC_ENDPOINT || process.env.QODERCN_VPC_ENDPOINT;
   if (fromEnv) return fromEnv;
@@ -323,7 +307,20 @@ function saveQoderVpcEndpoint(raw) {
   try {
     const dir = piAgentDir();
     if (!existsSync2(dir)) mkdirSync2(dir, { recursive: true });
-    writeFileSync2(settingsFilePath(), JSON.stringify({ vpc_endpoint: raw || "" }, null, 2), "utf8");
+    const path = settingsFilePath();
+    let payload = {};
+    if (existsSync2(path)) {
+      try {
+        const parsed = JSON.parse(readFileSync2(path, "utf8"));
+        if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+          payload = parsed;
+        }
+      } catch {
+        payload = {};
+      }
+    }
+    payload.vpc_endpoint = raw || "";
+    writeFileSync2(path, JSON.stringify(payload, null, 2), "utf8");
   } catch (error) {
     console.error("[pi-provider-qoder-cn] Failed to save qoder-cn-settings.json:", error);
   }
@@ -364,9 +361,6 @@ function getQoderBaseUrl(mode) {
 function getQoderOpenApiUrl(mode) {
   return getRegionValue(mode, "openApiUrl");
 }
-function getQoderCenterUrl(mode) {
-  return getRegionValue(mode, "centerUrl");
-}
 function getQoderModelListURL(mode) {
   return `${getQoderBaseUrl(mode)}algo/api/v2/model/list?Encode=1`;
 }
@@ -383,7 +377,7 @@ function getQoderUsageURL(mode) {
   return `${getQoderOpenApiUrl(mode)}/api/v2/quota/usage`;
 }
 function getQoderRefreshURL(mode) {
-  return `${getQoderCenterUrl(mode)}/algo/api/v3/user/refresh_token`;
+  return `${getQoderOpenApiUrl(mode)}/api/v1/jobToken/refresh`;
 }
 function getQoderDeviceLoginURL(codeChallenge, machineID, nonce) {
   const baseUrl = getQoderRegionConfig("global").deviceLoginUrl;
@@ -1146,7 +1140,7 @@ async function exchangeJobToken(pat, mode) {
     const parsed = Date.parse(data.expires_at);
     if (!Number.isNaN(parsed)) expiresAt = parsed;
   } else if (data.expires_in) {
-    expiresAt = Date.now() + data.expires_in;
+    expiresAt = Date.now() + (data.expires_in > 86400 ? data.expires_in : data.expires_in * 1e3);
   }
   return {
     jobToken: data.token,
@@ -1200,7 +1194,7 @@ var init_pat = __esm({
     "use strict";
     init_cosy();
     init_region();
-    UA = "pi-provider-qoder";
+    UA = "pi-provider-qoder-cn";
     PAT_REFRESH_PREFIX = "pat";
   }
 });
@@ -1245,21 +1239,13 @@ function parseExpiresAt(s, expiresInSeconds) {
 async function confirmCnEndpoint(callbacks, mode) {
   if (mode !== "cn") return;
   const current = getQoderCNEndpoints();
-  const inherited = readInheritedVpcEndpoint();
   const envNames = ["QODER_VPC_ENDPOINT", "QODERCN_VPC_ENDPOINT"].filter((name) => process.env[name]);
   const personalId = "personal";
   const enterpriseId = "enterprise";
-  const inheritedId = "enterprise-inherited";
   const options = [
     { id: personalId, label: "Personal account \u2014 public gateway (qoder.com.cn)" },
     { id: enterpriseId, label: "Enterprise account \u2014 use a VPC endpoint" }
   ];
-  if (inherited) {
-    options.push({
-      id: inheritedId,
-      label: `Enterprise account \u2014 ${inherited.value} (detected: ${inherited.source})`
-    });
-  }
   let message = current.isDefault ? "Choose the Qoder CN endpoint to log in against (default: personal account)" : `Choose the Qoder CN endpoint to log in against (current: ${current.raw})`;
   if (envNames.length > 0) {
     message += `
@@ -1275,10 +1261,6 @@ async function confirmCnEndpoint(callbacks, mode) {
     }
     return;
   }
-  if (choice === inheritedId && inherited) {
-    setQoderCNEndpoint(inherited.value);
-    return;
-  }
   if (choice === enterpriseId) {
     const prompt = getPrompt(callbacks);
     const raw = await prompt({
@@ -1361,7 +1343,15 @@ async function patLogin(callbacks, providedPat, mode) {
     throw new Error("No Personal Access Token provided");
   }
   getProgress(callbacks)?.("Exchanging access token...");
-  const creds = await credentialsFromPat(pat, mode);
+  let creds;
+  try {
+    creds = await credentialsFromPat(pat, mode);
+  } catch (error) {
+    const detail = error instanceof Error ? error.message : String(error);
+    throw new Error(
+      `${detail}. Check that the PAT is copied in full (64 characters for pt-... tokens) and was issued for the selected endpoint.`
+    );
+  }
   getProgress(callbacks)?.("Login successful!");
   return creds;
 }
@@ -1400,7 +1390,7 @@ async function runDeviceFlow(callbacks) {
         method: "GET",
         headers: {
           Accept: "application/json",
-          "User-Agent": "pi-provider-qoder"
+          "User-Agent": "pi-provider-qoder-cn"
         },
         signal: getSignal(callbacks)
       });
@@ -1425,7 +1415,7 @@ async function runDeviceFlow(callbacks) {
           headers: {
             Authorization: `Bearer ${tokenData.token}`,
             Accept: "application/json",
-            "User-Agent": "pi-provider-qoder"
+            "User-Agent": "pi-provider-qoder-cn"
           }
         });
         if (userinfoRes.ok) {
@@ -1524,8 +1514,13 @@ function saveCredentialsToAuthFile(providerID, credentials) {
     if (!existsSync4(dir)) {
       mkdirSync4(dir, { recursive: true, mode: 448 });
     }
-    const existing = readAuthFileCached();
-    const auth = existing ? { ...existing } : {};
+    let auth;
+    try {
+      auth = JSON.parse(readFileSync4(authPath, "utf-8")) ?? {};
+    } catch {
+      const cached = readAuthFileCached();
+      auth = cached ? { ...cached } : {};
+    }
     auth[providerID] = { type: "oauth", ...credentials };
     writeFileSync4(authPath, JSON.stringify(auth, null, 2), { encoding: "utf-8", mode: 384 });
     authFileMem = { path: authPath, data: auth };
@@ -1572,20 +1567,21 @@ async function resolveQoderIdentity(accessToken, providerID, mode) {
   const mem = identityCache.get(cacheKey);
   if (mem?.userID) return mem;
   const cached = getCachedCredentials(accessToken, providerID);
-  if (cached?.userID) {
+  if (cached?.userID && cached.access === accessToken) {
     identityCache.set(cacheKey, cached);
     return cached;
   }
   const info = await fetchUserInfo(accessToken, mode);
   const machineID = getMachineId();
+  const stored = readAuthFileCached()?.[providerID];
   const creds = {
     access: accessToken,
     userID: info.userID || "qoder-user",
     email: info.email || region.userEmailFallback,
     name: info.name || region.userNameFallback,
     machineID,
-    refresh: "",
-    expires: 0
+    refresh: stored?.refresh || "",
+    expires: stored?.expires || 0
   };
   identityCache.set(cacheKey, creds);
   saveCredentialsToAuthFile(providerID, creds);
@@ -1649,9 +1645,9 @@ async function refreshQoderTokenForMode(credentials, mode) {
         "Content-Type": "application/json",
         Authorization: `Bearer ${credentials.access}`,
         Accept: "application/json",
-        "User-Agent": "pi-provider-qoder"
+        "User-Agent": "pi-provider-qoder-cn"
       },
-      body: JSON.stringify({ refreshToken })
+      body: JSON.stringify({ refresh_token: refreshToken })
     });
     if (response.ok) {
       const data = await response.json();
@@ -1662,7 +1658,7 @@ async function refreshQoderTokenForMode(credentials, mode) {
         const parsed = Date.parse(data.expires_at);
         if (!Number.isNaN(parsed)) expireMs = parsed;
       } else if (data.expires_in) {
-        expireMs = Date.now() + data.expires_in * 1e3;
+        expireMs = Date.now() + (data.expires_in > 86400 ? data.expires_in : data.expires_in * 1e3);
       }
       const refreshed = {
         ...credentials,
@@ -1713,7 +1709,7 @@ async function fetchQoderUsageForMode(credentials, mode) {
     headers: {
       Authorization: `Bearer ${credentials.access}`,
       Accept: "application/json",
-      "User-Agent": "pi-provider-qoder"
+      "User-Agent": "pi-provider-qoder-cn"
     }
   });
   if (!response.ok) {
@@ -1721,27 +1717,30 @@ async function fetchQoderUsageForMode(credentials, mode) {
   }
   const raw = await response.json();
   const usageBuckets = [];
-  if (raw.userQuota) {
+  const userQuota = raw.user_quota ?? raw.userQuota;
+  const org = raw.org_resource_package ?? raw.orgResourcePackage ?? raw.shared_quota ?? raw.sharedQuota;
+  if (userQuota) {
     usageBuckets.push({
       id: "user-quota",
       label: "User Quota",
-      usedDisplay: raw.userQuota.used.toFixed(2),
-      limitDisplay: raw.userQuota.total.toFixed(2),
-      unit: raw.userQuota.unit,
+      usedDisplay: userQuota.used.toFixed(2),
+      limitDisplay: (userQuota.total ?? userQuota.cap ?? 0).toFixed(2),
+      unit: userQuota.unit,
       resetAt: raw.expiresAt ? new Date(raw.expiresAt).toISOString() : void 0
     });
   }
-  if (raw.orgResourcePackage && raw.orgResourcePackage.total > 0) {
+  const orgLimit = org?.cap ?? org?.total ?? 0;
+  if (org && orgLimit > 0) {
     usageBuckets.push({
       id: "org-resource-package",
       label: "Org Resource Package",
-      usedDisplay: raw.orgResourcePackage.used.toFixed(2),
-      limitDisplay: raw.orgResourcePackage.total.toFixed(2),
-      unit: raw.orgResourcePackage.unit,
+      usedDisplay: org.used.toFixed(2),
+      limitDisplay: orgLimit.toFixed(2),
+      unit: org.unit,
       resetAt: raw.expiresAt ? new Date(raw.expiresAt).toISOString() : void 0
     });
   }
-  const remainingText = raw.userQuota ? `${raw.userQuota.remaining.toFixed(2)} ${raw.userQuota.unit} remaining` : "";
+  const remainingText = userQuota ? `${userQuota.remaining.toFixed(2)} ${userQuota.unit} remaining` : org ? `${org.remaining.toFixed(2)} ${org.unit} remaining` : "";
   return {
     summary: remainingText,
     subscriptionTitle: region.usageTitle,
@@ -1770,13 +1769,10 @@ function describeEndpoint() {
 async function runEndpointCommand(args, ctx) {
   const input = (args || "").trim();
   if (!input) {
-    const inherited = readInheritedVpcEndpoint();
-    const inheritedHint = inherited ? `
-Detected (not applied): ${inherited.value} from ${inherited.source} \u2014 run /qoder-endpoint ${inherited.value} to use it.` : "";
     ctx?.ui?.notify(
       `Current Qoder CN endpoint: ${describeEndpoint()}
 To set: /qoder-endpoint <domain>
-To reset: /qoder-endpoint default${inheritedHint}`,
+To reset: /qoder-endpoint default`,
       "info"
     );
     return;
@@ -1860,7 +1856,7 @@ function formatResetTime(expiresAt, now = Date.now()) {
   const hours = Math.floor(totalMinutes % 1440 / 60);
   const minutes = totalMinutes % 60;
   const relative = days > 0 ? `${days}d ${hours}h` : hours > 0 ? `${hours}h ${minutes}m` : `${minutes}m`;
-  return `${new Date(timestamp).toISOString().slice(0, 10)} (in ${relative})`;
+  return `${new Date(timestamp).toLocaleDateString("sv")} (in ${relative})`;
 }
 function isBucketRow(row) {
   return typeof row.used === "number" || typeof row.total === "number";
@@ -1915,22 +1911,32 @@ function hasBucket(bucket) {
   if (!bucket) return false;
   return (bucket.total ?? 0) > 0 || (bucket.used ?? 0) > 0;
 }
+function pickBucket(raw, camel) {
+  if (!raw) return void 0;
+  const snake = camel.replace(/[A-Z]/g, (c) => `_${c.toLowerCase()}`);
+  return raw[snake] ?? raw[camel];
+}
 function formatQoderUsage(raw, mode, now = Date.now(), options = {}) {
   const color = options.color ?? false;
   const region = getQoderRegionConfig(mode);
   const danger = Boolean(raw?.isQuotaExceeded);
   const userType = raw?.userType ? ` (${raw.userType})` : "";
-  const overallPercent = formatPercent(raw?.totalUsagePercentage);
+  const showUserQuota = hasBucket(pickBucket(raw, "userQuota"));
+  const showAddOnQuota = hasBucket(pickBucket(raw, "addOnQuota"));
+  const org = pickBucket(raw, "orgResourcePackage") ?? pickBucket(raw, "sharedQuota");
+  const showOrg = hasBucket(org);
+  const orgPercent = typeof org?.used === "number" && typeof org?.cap === "number" && org.cap > 0 ? formatPercent(org.used / org.cap * 100) : void 0;
+  const overallPercent = formatPercent(showOrg ? raw?.totalUsagePercentage || orgPercent : raw?.totalUsagePercentage);
   const rows = [{ label: "Overall", percent: overallPercent, tail: "used", danger }];
-  const showUserQuota = hasBucket(raw?.userQuota);
-  const showAddOnQuota = hasBucket(raw?.addOnQuota);
-  if (showUserQuota) rows.push(bucketRow("Plan quota", raw.userQuota, danger));
-  if (showAddOnQuota) rows.push(bucketRow("Add-on", raw.addOnQuota, danger));
+  if (showUserQuota) rows.push(bucketRow("Plan quota", pickBucket(raw, "userQuota"), danger));
+  if (showAddOnQuota) rows.push(bucketRow("Add-on", pickBucket(raw, "addOnQuota"), danger));
+  if (showOrg && org)
+    rows.push(bucketRow("Enterprise", { ...org, percentage: void 0, total: org.cap ?? org.total }, danger));
   const notes = [];
   if (danger) notes.push({ label: "Status", value: "quota exceeded", color: ANSI.red });
-  if (!showUserQuota && !showAddOnQuota) notes.push({ label: "Buckets", value: "none returned" });
+  if (!showUserQuota && !showAddOnQuota && !showOrg) notes.push({ label: "Buckets", value: "none returned" });
   if (raw?.isPlanQuotaProrated) notes.push({ label: "Note", value: "plan quota is prorated" });
-  notes.push({ label: "Resets", value: formatResetTime(raw?.expiresAt, 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 });
   const title = `${region.usageTitle}${userType}`;
@@ -2081,8 +2087,9 @@ function positiveNumber(value, fallback) {
 function parseQueueNotice(envelope) {
   const payload = digForQueue(envelope, 0);
   if (!payload) return null;
+  const retryMs = positiveNumber(payload.retry_after_ms, 0) || positiveNumber(payload.retryAfterSeconds, DEFAULT_RETRY_SECONDS) * 1e3;
   return {
-    retryAfterMs: Math.min(positiveNumber(payload.retryAfterSeconds, DEFAULT_RETRY_SECONDS) * 1e3, MAX_WAIT_MS),
+    retryAfterMs: Math.min(retryMs, MAX_WAIT_MS),
     waitTimeSeconds: positiveNumber(payload.waitTime, 0),
     queueCount: positiveNumber(payload.queueCount, 0)
   };

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "pi-provider-qoder-cn",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Pi extension for Qoder CN — PAT/OAuth auth, /qoder-cn.usage quota command, and enterprise VPC endpoint support",
   "type": "module",
   "license": "MIT",
+  "engines": {
+    "node": ">=18"
+  },
   "author": "divingyu",
   "repository": {
     "type": "git",