opencode-anthropic-multi-account 0.2.127 → 0.3.0

package/dist/index.js

@@ -929,6 +929,7 @@ var CredentialRefreshPatchSchema = v.object({
 });
 var StoredAccountSchema = v.object({
   uuid: v.optional(v.string()),
+  credentialOwnerId: v.optional(v.string()),
   accountId: v.optional(v.string()),
   accountUuid: v.optional(v.string()),
   deviceId: v.optional(v.string()),
@@ -1887,7 +1888,7 @@ async function checkAccountQuota(manager, account, client) {
     }
     const refreshResult = await manager.ensureValidToken(account.uuid, client);
     if (!refreshResult.ok) {
-      await manager.markAuthFailure(account.uuid, refreshResult);
+      await manager.markAuthFailure(account.uuid, refreshResult, account);
       await manager.refresh();
       const updatedAccount = manager.getAccounts().find((candidate) => candidate.uuid === account.uuid);
       if (!updatedAccount) {
@@ -3428,37 +3429,31 @@ var AccountRuntimeFactory = class {
     if (latestAccessToken && accountToRefresh.expiresAt && !isTokenExpired({ accessToken: latestAccessToken, expiresAt: accountToRefresh.expiresAt })) {
       return { accessToken: latestAccessToken, expiresAt: accountToRefresh.expiresAt };
     }
-    const refreshed = await refreshToken(accountToRefresh.refreshToken, uuid, this.client);
-    if (!refreshed.ok) {
+    const { result, account: refreshedAccount } = await this.store.refreshAccountCredentials(
+      uuid,
+      accountToRefresh,
+      (refreshTokenValue) => refreshToken(refreshTokenValue, uuid, this.client)
+    );
+    if (!result.ok) {
       throw new TokenRefreshError(
-        refreshed.permanent,
-        refreshed.permanent ? TOKEN_REFRESH_PERMANENT_FAILURE_STATUS : void 0
+        result.permanent,
+        result.permanent ? TOKEN_REFRESH_PERMANENT_FAILURE_STATUS : void 0
       );
     }
-    await this.store.mutateAccount(uuid, (account) => {
-      account.accessToken = refreshed.patch.accessToken;
-      account.expiresAt = refreshed.patch.expiresAt;
-      if (refreshed.patch.refreshToken) account.refreshToken = refreshed.patch.refreshToken;
-      if (refreshed.patch.uuid) account.uuid = refreshed.patch.uuid;
-      if (refreshed.patch.accountId) account.accountId = refreshed.patch.accountId;
-      if (refreshed.patch.accountUuid && !account.accountUuid) account.accountUuid = refreshed.patch.accountUuid;
-      if (refreshed.patch.deviceId && !account.deviceId) account.deviceId = refreshed.patch.deviceId;
-      if (refreshed.patch.email) account.email = refreshed.patch.email;
-      account.consecutiveAuthFailures = 0;
-      account.isAuthDisabled = false;
-      account.authDisabledReason = void 0;
-    });
+    if (!refreshedAccount?.accessToken || !refreshedAccount.expiresAt) {
+      throw new TokenRefreshError(false);
+    }
     this.client.auth.set({
       path: { id: ANTHROPIC_OAUTH_ADAPTER.authProviderId },
       body: {
         type: "oauth",
-        refresh: refreshed.patch.refreshToken ?? accountToRefresh.refreshToken,
-        access: refreshed.patch.accessToken,
-        expires: refreshed.patch.expiresAt
+        refresh: refreshedAccount.refreshToken,
+        access: refreshedAccount.accessToken,
+        expires: refreshedAccount.expiresAt
       }
     }).catch(() => {
     });
-    return { accessToken: refreshed.patch.accessToken, expiresAt: refreshed.patch.expiresAt };
+    return { accessToken: refreshedAccount.accessToken, expiresAt: refreshedAccount.expiresAt };
   }
   buildOutboundHeaders(incomingHeaders, sessionId2, accessToken, modelId, excludedBetas2) {
     const mergedBetas = deduplicateBetas(ensureOauthBeta([