Tighten workspace-disabled matching

Author: ndycode

index.ts

@@ -1995,6 +1995,7 @@ accountAttemptLoop: while (attempted.size < Math.max(1, accountCount)) {
 				if (hasRemainingAccounts) {
 					continue accountAttemptLoop;
 				}
+				return errorResponse;
 			} else {
 				const currentWorkspace = accountManager.getCurrentWorkspace(account);
 				const workspaceName = currentWorkspace?.name ?? currentWorkspace?.id ?? "unknown";

lib/accounts.ts

@@ -899,8 +899,8 @@ export class AccountManager {
 		const currentIdx = account.currentWorkspaceIndex ?? 0;
 		const totalWorkspaces = account.workspaces.length;
 
-		// Find next enabled workspace
-		for (let i = 1; i <= totalWorkspaces; i++) {
+		// Search successor workspaces only; the current slot was just evaluated.
+		for (let i = 1; i < totalWorkspaces; i++) {
 			const nextIdx = (currentIdx + i) % totalWorkspaces;
 			const workspace = account.workspaces[nextIdx];
 			if (workspace && workspace.enabled !== false) {

lib/request/fetch-helpers.ts

@@ -277,15 +277,14 @@ export function isWorkspaceDisabledError(
         const normalizedCode = typeof code === "string" ? code.trim().toLowerCase() : "";
         const haystack = `${normalizedCode} ${bodyText}`.toLowerCase();
 
-        const disabledPatterns = [
-                /workspace.*(?:disabled|expired|deactivated|terminated)/i,
-                /account.*(?:disabled|expired|deactivated|terminated)/i,
-                /(?:workspace|account).*no longer.*(?:active|available|valid)/i,
-                /(?:workspace|account).*has been.*(?:disabled|expired|closed)/i,
-                /workspace.*(?:access|subscription).*expired/i,
-                /organization.*(?:disabled|expired|inactive)/i,
-                /team.*(?:disabled|expired|inactive)/i,
-        ];
+		const disabledPatterns = [
+				/workspace.*(?:disabled|expired|deactivated|terminated)/i,
+				/account\s+(?:has\s+been|is)\s+(?:disabled|expired|deactivated|terminated|closed)/i,
+				/(?:workspace|org(?:anization)?).*no longer.*(?:active|available|valid)/i,
+				/(?:workspace|org(?:anization)?).*has been.*(?:disabled|expired|closed)/i,
+				/workspace.*(?:access|subscription).*expired/i,
+				/org(?:anization)?.*(?:disabled|expired|inactive)/i,
+		];
 
         for (const pattern of disabledPatterns) {
                 if (pattern.test(haystack)) {

test/fetch-helpers.test.ts

@@ -376,6 +376,9 @@ describe('isWorkspaceDisabledError', () => {
 		expect(isWorkspaceDisabledError(403, 'payment_required', '')).toBe(false);
 		expect(isWorkspaceDisabledError(403, '', 'Payment required to continue')).toBe(false);
 		expect(isWorkspaceDisabledError(403, '', 'Billing failed for your plan')).toBe(false);
+		expect(isWorkspaceDisabledError(403, '', 'Your billing account has expired')).toBe(false);
+		expect(isWorkspaceDisabledError(403, '', 'service account terminated')).toBe(false);
+		expect(isWorkspaceDisabledError(403, '', 'team plan inactive')).toBe(false);
 	});
 });
 

test/index-retry.test.ts

@@ -11,6 +11,11 @@ const accountManagerState = vi.hoisted(() => ({
 	setAccountEnabledCalls: [] as Array<{ index: number; enabled: boolean }>,
 }));
 
+const recoveryState = vi.hoisted(() => ({
+	forceRecoverable: false,
+	isRecoverableErrorCalls: 0,
+}));
+
 function createMockAccount(
 	overrides: Partial<Record<string, unknown>> = {},
 ): Record<string, unknown> {
@@ -272,6 +277,19 @@ vi.mock("../lib/storage.js", () => ({
 	importAccounts: async () => ({ imported: 0, total: 0 }),
 }));
 
+vi.mock("../lib/recovery.js", () => ({
+	createSessionRecoveryHook: () => null,
+	isRecoverableError: () => {
+		recoveryState.isRecoverableErrorCalls += 1;
+		return recoveryState.forceRecoverable;
+	},
+	detectErrorType: () => "tool_use_failed",
+	getRecoveryToastContent: () => ({
+		title: "Recoverable error",
+		message: "retry",
+	}),
+}));
+
 vi.mock("../lib/auto-update-checker.js", () => ({
 	checkAndNotify: async () => {},
 	checkForUpdates: async () => ({ hasUpdate: false, currentVersion: "4.5.0", latestVersion: null, updateCommand: "" }),
@@ -293,6 +311,8 @@ describe("OpenAIAuthPlugin rate-limit retry", () => {
 
 	beforeEach(() => {
 		resetAccountManagerState();
+		recoveryState.forceRecoverable = false;
+		recoveryState.isRecoverableErrorCalls = 0;
 		vi.resetModules();
 
 		for (const key of envKeys) originalEnv[key] = process.env[key];
@@ -532,6 +552,7 @@ describe("OpenAIAuthPlugin rate-limit retry", () => {
 		expect(accountManagerState.disableCurrentWorkspaceCalls).toBe(0);
 		expect(accountManagerState.rotateToNextWorkspaceCalls).toBe(0);
 		expect(accountManagerState.setAccountEnabledCalls).toEqual([]);
+		expect(recoveryState.isRecoverableErrorCalls).toBe(0);
 	});
 
 	it("retries with a fallback account after a workspace-less account gets a workspace-disabled response", async () => {