@adeildo/pi-providers 5.9.0 → 5.9.1

package/README.md

@@ -82,10 +82,6 @@ Several accounts per provider, with a switch to the next one when a limit hits,
 
 Part of [pi-harness](https://github.com/felipeadeildo/pi-harness), which brings every piece in one install.
 
-## License
-
-MIT
-
 <p align="center">
   <a href="https://adeildo.dev"><img src="https://adeildo.dev/assets/images/cat.svg" width="42" height="42" alt="adeildo.dev"></a><br>
   Brought to you by <a href="https://adeildo.dev">adeildo.dev</a>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@adeildo/pi-providers",
-	"version": "5.9.0",
+	"version": "5.9.1",
 	"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.9.0"
+		"@adeildo/pi-kit": "5.9.1"
 	},
 	"peerDependencies": {
 		"@earendil-works/pi-ai": "*",

package/src/accounts/lift.ts

@@ -143,7 +143,10 @@ function accountStream(
 	);
 }
 
-/** One account may serve a limit that another one does not have. A re-login costs an attempt too. */
+/**
+ * A re-login or a move after an auth failure costs an attempt. A move after a limit does not: the
+ * account that refused leaves the candidates, so those moves end when the accounts do.
+ */
 const MAX_ATTEMPTS = 3;
 
 async function* attempts(
@@ -158,7 +161,7 @@ async function* attempts(
 ): AsyncGenerator<AssistantMessageEvent> {
 	let account = first;
 
-	for (let attempt = 1; ; attempt++) {
+	for (let attempt = 1; ;) {
 		// Hold the events until something is visible: a retry on another account must not repeat a
 		// message the caller already saw.
 		const buffered: AssistantMessageEvent[] = [];
@@ -197,10 +200,12 @@ async function* attempts(
 		if (failure === undefined && thrown === undefined && account !== undefined)
 			session.served?.(account.id);
 
-		if (!output && attempt < MAX_ATTEMPTS) {
+		const why = output ? undefined : failureOf(failure, thrown, model.provider);
+		if (why !== undefined && (why.kind === "usage" || attempt < MAX_ATTEMPTS)) {
 			// oxlint-disable-next-line no-await-in-loop -- the answer comes from the user.
-			const next = await moveOn(session, account?.id, failureOf(failure, thrown, model.provider));
+			const next = await moveOn(session, account?.id, why);
 			if (next !== undefined) {
+				if (why.kind !== "usage") attempt++;
 				account = next;
 				continue;
 			}
@@ -226,12 +231,12 @@ function failureOf(
 async function moveOn(
 	session: AccountSession,
 	accountId: string | undefined,
-	failure: Failure | undefined,
+	failure: Failure,
 ): Promise<AccountCredential | undefined> {
 	// Without an account there is nothing to move from, and the error is the provider's to show.
 	if (accountId === undefined) return undefined;
-	if (failure?.kind === "usage") return await session.afterLimit(accountId, failure.message);
-	if (failure?.kind === "auth") return await session.afterAuthFailure?.(accountId, failure.message);
+	if (failure.kind === "usage") return await session.afterLimit(accountId, failure.message);
+	if (failure.kind === "auth") return await session.afterAuthFailure?.(accountId, failure.message);
 	return undefined;
 }
 

package/src/accounts/policy.ts

@@ -5,6 +5,7 @@ import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 
 import { classifyFailure } from "../errors.ts";
 import { pick } from "../ui/picker.ts";
+import { timeLeft } from "../usage/read.ts";
 import { refreshStatus } from "./actions.ts";
 import { reason } from "./describe.ts";
 import { loginFor } from "./interaction.ts";
@@ -43,23 +44,26 @@ export async function afterLimit(
 	const mode = onLimit.get(scope);
 	if (mode === "stop") return undefined;
 
-	const next = nextAccount(store.accounts(providerId), currentId, refused);
-	if (next === undefined) return undefined;
-
-	if (mode === "ask") {
-		const current = store.accounts(providerId).find((entry) => entry.id === currentId);
-		const switchNow = `Switch to ${next.label}`;
-		const always = "Always switch when an account hits its limit";
-		const picked = await pick(ctx, `"${current?.label ?? providerId}" hit its limit`, [
-			switchNow,
-			always,
-			"Stop here",
-		]);
-		if (picked === always) scope.settings.set(onLimit, "switch");
-		else if (picked !== switchNow) return undefined;
-	}
+	const candidates = limitCandidates(store.accounts(providerId), currentId, refused);
+	const [first] = candidates;
+	if (first === undefined) return undefined;
+	if (mode === "switch") return switchTo(scope, store, pins, ctx, providerId, first, detail);
 
-	return switchTo(scope, store, pins, ctx, providerId, next, detail);
+	const current = store.accounts(providerId).find((entry) => entry.id === currentId);
+	const choices = new Map(candidates.map((account) => [switchLabel(account), account]));
+	const always = `Always switch on its own (now to ${first.label})`;
+	const picked = await pick(ctx, `"${current?.label ?? providerId}" hit its limit`, [
+		...choices.keys(),
+		always,
+		"Stop here",
+	]);
+	if (picked === always) {
+		scope.settings.set(onLimit, "switch");
+		return switchTo(scope, store, pins, ctx, providerId, first, detail);
+	}
+	const chosen = picked === undefined ? undefined : choices.get(picked);
+	if (chosen === undefined) return undefined;
+	return switchTo(scope, store, pins, ctx, providerId, chosen, detail);
 }
 
 /** Follows the `accounts.onAuthFailure` policy: sign in again, switch, or stop. */
@@ -178,6 +182,34 @@ function markLimited(
 	return refused;
 }
 
+/**
+ * Every other account that has not refused in this session, in the ring order after the current one.
+ * The ones a reading says are still spent go last, so a switch on its own does not land on them.
+ */
+function limitCandidates(
+	list: readonly Account[],
+	currentId: string,
+	refused: ReadonlySet<string>,
+): Account[] {
+	const index = list.findIndex((account) => account.id === currentId);
+	const ring = index < 0 ? list : [...list.slice(index + 1), ...list.slice(0, index)];
+	const open = ring.filter((account) => !refused.has(account.id));
+	const ready = open.filter((account) => resetsIn(account) === undefined);
+	return [...ready, ...open.filter((account) => !ready.includes(account))];
+}
+
+/** How long until a spent account's plan resets, or undefined when it is not known to be spent. */
+function resetsIn(account: Account): string | undefined {
+	return timeLeft(account.health?.limitedUntil ?? 0);
+}
+
+function switchLabel(account: Account): string {
+	const left = resetsIn(account);
+	return left === undefined
+		? `Switch to ${account.label}`
+		: `Switch to ${account.label} (limited, resets in ${left})`;
+}
+
 /** The account after this one that has not refused yet. */
 function nextAccount(
 	list: readonly Account[],