pi-umans-provider 1.0.35 → 1.0.36

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.36
+
+- `/login` while the session-start catalog revalidation is still in flight now fetches the new key's catalog right away: the forced refresh aborts the old-key revalidation and waits for it to release the sync lock instead of skipping as "locked" until the next session start.
+
 ## 1.0.35
 
 - Quiet startup sync: background `/v1/models/info` revalidation runs only with an API key, only when the disk cache is older than 1 hour (`PI_PROVIDER_SYNC_TTL_MS`, `0` = always), missing, or fetched with a different key, and only in one pi process at a time (lock file next to the cache). Failed refreshes back off for 5 minutes; sessions that skip adopt a cache refreshed by another process. `/login` forces a revalidation with the new key.

package/index.ts

@@ -428,6 +428,9 @@ async function revalidateModels(
 
 let cachedApiKey: string | undefined;
 let revalidateAbort: AbortController | null = null;
+// The in-flight catalog revalidation (session start or /login); it never rejects.
+let modelSync: Promise<void> = Promise.resolve();
+let modelSyncAbort: AbortController | null = null;
 // Aborted on session replacement/shutdown so in-flight usage fetches from
 // timers don't resolve against a stale ctx (the timer handle itself can't be
 // clearTimeout'd once the async callback has already fired).
@@ -675,6 +678,14 @@ export default function (pi: ExtensionAPI) {
     });
   }
 
+  // The catalog sync's own abort scope inside the session's: a /login cancels
+  // an in-flight (old-key) sync without cancelling the session's usage fetch.
+  function supersedeModelSync(session: AbortSignal): AbortSignal {
+    modelSyncAbort?.abort();
+    modelSyncAbort = new AbortController();
+    return AbortSignal.any([session, modelSyncAbort.signal]);
+  }
+
   // After /login: revalidate with the new key right away (forced past the TTL,
   // still single-flight). Deferred so pi stores the credential first; never
   // awaited, never throws into the login flow.
@@ -684,8 +695,11 @@ export default function (pi: ExtensionAPI) {
       const key = credentials.access;
       cachedApiKey = key;
       if (!revalidateAbort || revalidateAbort.signal.aborted) revalidateAbort = new AbortController();
-      const signal = revalidateAbort.signal;
-      void revalidateModels(key, embeddedModels, signal, true)
+      // The new key supersedes an in-flight revalidation, which must release its
+      // sync lock first, or this forced refresh would skip as "locked".
+      const signal = supersedeModelSync(revalidateAbort.signal);
+      modelSync = modelSync
+        .then(() => (signal.aborted ? null : revalidateModels(key, embeddedModels, signal, true)))
         .then((freshBase) => {
           if (freshBase && !signal.aborted) registerFresh(freshBase);
         })
@@ -777,10 +791,11 @@ export default function (pi: ExtensionAPI) {
     const signal = revalidateAbort.signal;
     const keyResolved = resolveApiKey(ctx.modelRegistry);
 
-    void keyResolved
-      .then(() => revalidateModels(cachedApiKey, embeddedModels, signal))
+    const syncSignal = supersedeModelSync(signal);
+    modelSync = keyResolved
+      .then(() => revalidateModels(cachedApiKey, embeddedModels, syncSignal))
       .then((freshBase) => {
-        if (freshBase && !signal.aborted) registerFresh(freshBase);
+        if (freshBase && !syncSignal.aborted) registerFresh(freshBase);
       })
       .catch(() => { /* keep serving the stale catalog */ });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-umans-provider",
-  "version": "1.0.35",
+  "version": "1.0.36",
   "description": "UMANS provider extension for pi - Access Kimi K2.6, GLM 5.1, Qwen 3.6, and coding-optimized models through the UMANS API",
   "type": "module",
   "main": "index.ts",

package/tests/quiet-startup-sync.test.ts

@@ -65,7 +65,7 @@ function writeCache(ageMs: number, models: unknown[] = embeddedModels, fingerpri
   }
 }
 
-function stubFetch(impl: (url?: unknown) => Promise<Response> = async (url) => (isUsageUrl(url) ? usageResponse() : liveModelsResponse())) {
+function stubFetch(impl: (url?: unknown, init?: RequestInit) => Promise<Response> = async (url) => (isUsageUrl(url) ? usageResponse() : liveModelsResponse())) {
   const fetch = vi.fn(impl);
   vi.stubGlobal("fetch", fetch);
   return fetch;
@@ -299,6 +299,32 @@ describe("umans: /login and usage polling", () => {
     expect(JSON.parse(fs.readFileSync(syncMetaPath(cachePath), "utf8")).keyFingerprint).toBe(keyFingerprint("sk-after-login"));
   });
 
+  it("fetches the new key's catalog when /login races the session revalidation holding the lock", async () => {
+    setupHome();
+    writeCache(2 * HOUR);
+    const pending: Array<() => void> = [];
+    const fetch = stubFetch((url, init?: RequestInit) => new Promise<Response>((resolve, reject) => {
+      const signal = init?.signal;
+      signal?.addEventListener("abort", () => reject(signal.reason));
+      pending.push(() => resolve(isUsageUrl(url) ? usageResponse() : liveModelsResponse()));
+    }));
+    const ext = await loadExtension();
+    await ext.startSession(interactive);
+    await vi.waitFor(() => expect(modelCalls(fetch)).toBe(1)); // session sync in flight, lock held
+    await vi.waitFor(() => expect(usageCalls(fetch)).toBe(1));
+    const login = (ext.registrations[0] as any).oauth.login;
+    await login({ onPrompt: async () => "sk-new-login-key" });
+    await vi.waitFor(() => expect(modelCalls(fetch)).toBe(2));
+    for (const release of pending) release();
+    await vi.waitFor(() => expect(hasLiveModel(ext.registrations.at(-1))).toBe(true));
+    // Superseding the catalog sync leaves the session's usage footer fetch alone.
+    await vi.waitFor(() => expect(ext.setStatus).toHaveBeenCalledWith("umans-usage", expect.stringContaining("Code Max")));
+    const modelRequests = fetch.mock.calls.filter(([url]) => !isUsageUrl(url)) as any[][];
+    expect(modelRequests[1][1].headers.Authorization).toBe("Bearer sk-new-login-key");
+    expect(JSON.parse(fs.readFileSync(syncMetaPath(cachePath), "utf8")).keyFingerprint).toBe(keyFingerprint("sk-new-login-key"));
+    expect(fs.existsSync(syncLockPath(cachePath))).toBe(false);
+  });
+
   it("does not poll usage without a UI (print mode, child agents)", async () => {
     setupHome();
     writeCache(10 * 60 * 1000);