pi-hypercharm-provider 1.3.40 → 1.3.41

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.3.41
+
+- `/login` while the session-start catalog revalidation is still in flight now fetches the new account's catalog right away: the forced refresh aborts the old-credential revalidation and waits for it to release the sync lock instead of skipping as "locked" until the next session start.
+
 ## 1.3.40
 
 - Quiet startup sync: background `/v1/provider` revalidation runs only with credentials, only when the disk cache is older than 1 hour (`PI_PROVIDER_SYNC_TTL_MS`, `0` = always), missing, or fetched with different credentials, 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. A completed `/login` forces a revalidation.

package/index.ts

@@ -526,6 +526,8 @@ let cachedApiKey: string | undefined;
 // Stable identity behind cachedApiKey for the quiet-sync fingerprints.
 let cachedSyncIdentity: 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();
 
 const AUTH_PATH = path.join(getAgentDir(), "auth.json");
 
@@ -1338,7 +1340,12 @@ export default function (pi: ExtensionAPI) {
 		lastCreditsFetchAt = 0;
 		const epoch = statusEpoch;
 		setTimeout(() => {
-			void syncModels(epoch, revalidateAbort?.signal, true).catch(() => {});
+			// The new credentials supersede an in-flight revalidation, which must
+			// release its sync lock first, or this forced refresh would skip as "locked".
+			revalidateAbort?.abort();
+			revalidateAbort = new AbortController();
+			const signal = revalidateAbort.signal;
+			modelSync = modelSync.then(() => (signal.aborted ? undefined : syncModels(epoch, signal, true))).catch(() => {});
 		}, 0);
 	};
 
@@ -1370,7 +1377,7 @@ export default function (pi: ExtensionAPI) {
 		// the provider API. Nothing is awaited and every rejection is swallowed.
 		// A key-resolution failure is surfaced (it used to vanish), then we keep
 		// serving the embedded/cached catalog.
-		void resolveApiKey(ctx.modelRegistry)
+		modelSync = resolveApiKey(ctx.modelRegistry)
 			.catch((err) => {
 				notifier.warn(`Unable to resolve HyperCharm credentials: ${describeError(err)} — serving cached/embedded models.`);
 			})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-hypercharm-provider",
-  "version": "1.3.40",
+  "version": "1.3.41",
   "description": "HyperCharm provider extension for pi - Access DeepSeek, GLM, Kimi, Qwen, MiniMax, Gemma, and GPT-OSS models through the Charm Hyper API",
   "type": "module",
   "main": "index.ts",

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

@@ -363,6 +363,33 @@ describe("HyperCharm quiet sync variants", () => {
     expect(new Headers(fetch.mock.calls[0][1]?.headers).get("Authorization")).toBe("Bearer fresh-access");
   });
 
+  it("fetches the new account's catalog when /login races the session revalidation holding the lock", async () => {
+    setupHome();
+    writeCache(2 * HOUR);
+    vi.doMock("../oauth", () => ({
+      USER_AGENT: "pi-hypercharm-provider/test",
+      loginHypercharm: async () => ({ type: "oauth", refresh: "fresh-refresh", access: "fresh-access", expires: Date.now() + HOUR }),
+      refreshHypercharmToken: async (c: unknown) => c,
+    }));
+    let release!: () => void;
+    const fetch = stubFetch((_url, init) => new Promise<Response>((resolve, reject) => {
+      const signal = init?.signal;
+      signal?.addEventListener("abort", () => reject(signal.reason));
+      release = () => resolve(liveModelsResponse());
+    }));
+    const ext = await loadExtension();
+    await ext.startSession();
+    await vi.waitFor(() => expect(catalogCalls(fetch)).toHaveLength(1)); // session sync in flight, lock held
+
+    await ext.registrations[0].oauth.login({});
+    await vi.waitFor(() => expect(catalogCalls(fetch)).toHaveLength(2));
+    release();
+    await vi.waitFor(() => expect(hasLiveModel(ext.registrations.at(-1))).toBe(true));
+    expect(new Headers(catalogCalls(fetch)[1][1]?.headers).get("Authorization")).toBe("Bearer fresh-access");
+    expect(JSON.parse(fs.readFileSync(syncMetaPath(cachePath), "utf8")).keyFingerprint).toBe(keyFingerprint("oauth:fresh-refresh"));
+    expect(fs.existsSync(syncLockPath(cachePath))).toBe(false);
+  });
+
   it("skips the startup account poll without a UI (print mode, child agents)", async () => {
     setupHome();
     writeCache(10 * 60 * 1000);