@adeildo/pi-providers 5.5.0 → 5.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@adeildo/pi-providers",
-	"version": "5.5.0",
+	"version": "5.6.0",
 	"description": "Provider features for Pi. Bills Anthropic OAuth requests to the Claude Pro or Max plan instead of extra usage.",
 	"keywords": [
 		"anthropic",
@@ -37,7 +37,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@adeildo/pi-kit": "5.5.0"
+		"@adeildo/pi-kit": "5.6.0"
 	},
 	"peerDependencies": {
 		"@earendil-works/pi-ai": "*",

package/src/accounts/attach.ts

@@ -49,7 +49,7 @@ export function attachProvider(
 	);
 }
 
-function sessionFor(
+export function sessionFor(
 	scope: FeatureScope,
 	store: AccountStore,
 	pins: Pins,
@@ -57,6 +57,16 @@ function sessionFor(
 	ctx: ExtensionContext,
 	providerId: string,
 ): AccountSession {
+	// The turn and the tasks' call hit a limit together; they share one dialog and its answer.
+	const deciding = new Map<string, Promise<AccountCredential | undefined>>();
+	function once(
+		key: string,
+		decide: () => Promise<AccountCredential | undefined>,
+	): Promise<AccountCredential | undefined> {
+		const decision = deciding.get(key) ?? decide().finally(() => deciding.delete(key));
+		deciding.set(key, decision);
+		return decision;
+	}
 	return {
 		resolve: () => requestOf(activeAccount(store, pins, providerId)),
 		subscription: () =>
@@ -73,23 +83,26 @@ function sessionFor(
 		lockPath: accountsLockPath,
 		noteUsage: (id, headers) =>
 			noteUsage(watch.usage, providerId, id, watch.quota.fromHeaders(providerId, headers)),
-		afterLimit: async (currentId, detail) => {
-			const reading = await readingFor(watch, store, ctx, providerId, currentId);
-			const until = worstWindow(reading)?.window.resetsAt;
-			if (until !== undefined) store.markLimited(providerId, currentId, until);
-			return await afterLimit(
-				scope,
-				store,
-				pins,
-				ctx,
-				providerId,
-				currentId,
-				withReset(detail, reading),
-				watch.limited,
-			);
-		},
+		afterLimit: (currentId, detail) =>
+			once(`limit:${currentId}`, async () => {
+				const reading = await readingFor(watch, store, ctx, providerId, currentId);
+				const until = worstWindow(reading)?.window.resetsAt;
+				if (until !== undefined) store.markLimited(providerId, currentId, until);
+				return await afterLimit(
+					scope,
+					store,
+					pins,
+					ctx,
+					providerId,
+					currentId,
+					withReset(detail, reading),
+					watch.limited,
+				);
+			}),
 		afterAuthFailure: (currentId, detail) =>
-			afterAuthFailure(scope, store, pins, ctx, providerId, currentId, detail),
+			once(`auth:${currentId}`, () =>
+				afterAuthFailure(scope, store, pins, ctx, providerId, currentId, detail),
+			),
 	};
 }
 

package/src/accounts/lock.ts

@@ -14,7 +14,7 @@ export async function withLock<T>(
 ): Promise<T> {
 	const deadline = Date.now() + waitMs;
 	while (!take(path)) {
-		if (Date.now() >= deadline) return await work();
+		if (Date.now() >= deadline) return work();
 		// oxlint-disable-next-line no-await-in-loop -- the lock is retried until its deadline.
 		await new Promise((resolve) => setTimeout(resolve, RETRY_MS));
 	}

package/src/ui/picker.ts

@@ -1,5 +1,6 @@
 // Our dialogs wear the same frame as the rest of the harness. A host that cannot draw a component,
 // like RPC, falls back to pi's own select.
+import { oneAtATime } from "@adeildo/pi-kit";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import {
@@ -24,8 +25,24 @@ const MAX_VISIBLE = 10;
 const GAP = 2;
 const MIN_DESCRIPTION = 12;
 
-/** The options in our frame; undefined when the answer is cancelled. */
-export async function pick(
+/** Pi draws one dialog in the editor's place; a second one replaces the first without closing it. */
+const dialogs = oneAtATime();
+
+/** The options in our frame; undefined when the answer is cancelled. One opens at a time. */
+export function pick(
+	ctx: ExtensionContext,
+	title: string,
+	options: readonly (string | PickOption)[],
+	dialog: { signal?: AbortSignal } = {},
+): Promise<string | undefined> {
+	return dialogs(() => shown(ctx, title, options, dialog), dialog.signal).catch((error) => {
+		// Cancelled while it waited for another dialog to close.
+		if (dialog.signal?.aborted) return undefined;
+		throw error;
+	});
+}
+
+async function shown(
 	ctx: ExtensionContext,
 	title: string,
 	options: readonly (string | PickOption)[],