merge origin/main into feature/cursor-goose-ops

2026-08-26 21:12:45 +08:00
parent 9ac9f96167 0d6a3b97df
commit 5bba9d3e40
4 changed files with 47 additions and 13 deletions
@@ -331,17 +331,24 @@ export async function checkAuth(): Promise<AuthStatus> {
    }
    if (status.authenticated) resetUnauthorizedGuard();
    applyAgentCodeRunClientPolicy(status.agentCodeRun ?? null);
-    if (status.authenticated && status.mode === 'user' && !status.capabilities) {
-      try {
-        const me = await getMe();
-        return {
-          ...status,
-          capabilities: me.capabilities,
-          grantedSkills: me.grantedSkills,
-          user: me.user,
-        };
-      } catch {
-        return status;
+    if (status.authenticated && status.mode === 'user') {
+      const needsMeHydration =
+        !status.capabilities
+        || !status.user
+        || !Object.prototype.hasOwnProperty.call(status.user, 'subscription');
+      if (needsMeHydration) {
+        try {
+          const me = await getMe();
+          return {
+            ...status,
+            capabilities: me.capabilities ?? status.capabilities,
+            grantedSkills: me.grantedSkills ?? status.grantedSkills,
+            unrestricted: me.unrestricted ?? status.unrestricted,
+            user: me.user,
+          };
+        } catch {
+          return status;
+        }
      }
    }
    return status;