@mindexec/cli 0.2.208 → 0.2.209

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindexec/cli",
-  "version": "0.2.208",
+  "version": "0.2.209",
   "description": "MindExec local runtime and bridge CLI",
   "main": "server.js",
   "type": "module",

package/server.js

@@ -5632,6 +5632,39 @@ function readSupabaseSessionField(source, ...keys) {
     return '';
 }
 
+function unwrapSupabaseSessionCandidate(value, depth = 0) {
+    if (!value || typeof value !== 'object' || depth > 4) {
+        return value;
+    }
+
+    const directAccessToken = readSupabaseSessionField(value, 'access_token', 'accessToken', 'AccessToken');
+    const directUser = value.user || value.User;
+    if (directAccessToken && directUser) {
+        return value;
+    }
+
+    const candidates = [
+        value.session,
+        value.Session,
+        value.currentSession,
+        value.CurrentSession,
+        value.supabaseSession,
+        value.SupabaseSession,
+        value.authSession,
+        value.AuthSession
+    ];
+    for (const candidate of candidates) {
+        if (candidate && typeof candidate === 'object') {
+            const unwrapped = unwrapSupabaseSessionCandidate(candidate, depth + 1);
+            if (unwrapped && typeof unwrapped === 'object') {
+                return unwrapped;
+            }
+        }
+    }
+
+    return value;
+}
+
 function parseSupabaseSessionExpiresAtMs(value) {
     if (value === undefined || value === null || String(value).trim() === '') {
         return 0;
@@ -5662,10 +5695,14 @@ function setSupabaseSessionKnownField(session, value, fallbackKey, ...keys) {
 
 function buildRefreshedSupabaseSessionPayload(content, refreshedSession) {
     const existing = JSON.parse(String(content || '{}'));
+    const targetSession = unwrapSupabaseSessionCandidate(existing);
+    const sessionToUpdate = targetSession && typeof targetSession === 'object' ? targetSession : existing;
     const accessToken = String(readSupabaseSessionField(refreshedSession, 'access_token', 'accessToken', 'AccessToken')).trim();
     const refreshToken = String(readSupabaseSessionField(refreshedSession, 'refresh_token', 'refreshToken', 'RefreshToken')).trim()
+        || String(readSupabaseSessionField(sessionToUpdate, 'refresh_token', 'refreshToken', 'RefreshToken')).trim()
         || String(readSupabaseSessionField(existing, 'refresh_token', 'refreshToken', 'RefreshToken')).trim();
     const tokenType = String(readSupabaseSessionField(refreshedSession, 'token_type', 'tokenType', 'TokenType')).trim()
+        || String(readSupabaseSessionField(sessionToUpdate, 'token_type', 'tokenType', 'TokenType')).trim()
         || String(readSupabaseSessionField(existing, 'token_type', 'tokenType', 'TokenType')).trim()
         || 'bearer';
     const expiresInRaw = Number(readSupabaseSessionField(refreshedSession, 'expires_in', 'expiresIn', 'ExpiresIn') || 0);
@@ -5680,21 +5717,21 @@ function buildRefreshedSupabaseSessionPayload(content, refreshedSession) {
         throw error;
     }
 
-    setSupabaseSessionKnownField(existing, accessToken, 'access_token', 'access_token', 'accessToken', 'AccessToken');
-    setSupabaseSessionKnownField(existing, refreshToken, 'refresh_token', 'refresh_token', 'refreshToken', 'RefreshToken');
-    setSupabaseSessionKnownField(existing, tokenType, 'token_type', 'token_type', 'tokenType', 'TokenType');
-    setSupabaseSessionKnownField(existing, expiresAtSeconds, 'expires_at', 'expires_at', 'expiresAt', 'ExpiresAt');
+    setSupabaseSessionKnownField(sessionToUpdate, accessToken, 'access_token', 'access_token', 'accessToken', 'AccessToken');
+    setSupabaseSessionKnownField(sessionToUpdate, refreshToken, 'refresh_token', 'refresh_token', 'refreshToken', 'RefreshToken');
+    setSupabaseSessionKnownField(sessionToUpdate, tokenType, 'token_type', 'token_type', 'tokenType', 'TokenType');
+    setSupabaseSessionKnownField(sessionToUpdate, expiresAtSeconds, 'expires_at', 'expires_at', 'expiresAt', 'ExpiresAt');
 
     if (Number.isFinite(expiresInRaw) && expiresInRaw > 0) {
-        setSupabaseSessionKnownField(existing, Math.floor(expiresInRaw), 'expires_in', 'expires_in', 'expiresIn', 'ExpiresIn');
+        setSupabaseSessionKnownField(sessionToUpdate, Math.floor(expiresInRaw), 'expires_in', 'expires_in', 'expiresIn', 'ExpiresIn');
     }
 
     const user = refreshedSession?.user || refreshedSession?.User;
     if (user && typeof user === 'object') {
-        if (Object.prototype.hasOwnProperty.call(existing, 'User')) {
-            existing.User = user;
+        if (Object.prototype.hasOwnProperty.call(sessionToUpdate, 'User')) {
+            sessionToUpdate.User = user;
         } else {
-            existing.user = user;
+            sessionToUpdate.user = user;
         }
     }
 
@@ -5704,18 +5741,27 @@ function buildRefreshedSupabaseSessionPayload(content, refreshedSession) {
 function parseSupabaseSessionForRegistry(content) {
     let session = null;
     try {
-        session = JSON.parse(String(content || ''));
+        session = unwrapSupabaseSessionCandidate(JSON.parse(String(content || '')));
     } catch {
         return null;
     }
 
     const user = session?.user || session?.User || {};
-    const accessToken = String(readSupabaseSessionField(session, 'access_token', 'accessToken', 'AccessToken')).trim();
+    const accessToken = String(readSupabaseSessionField(session, 'access_token', 'accessToken', 'AccessToken', 'token', 'Token')).trim();
     const refreshToken = String(readSupabaseSessionField(session, 'refresh_token', 'refreshToken', 'RefreshToken')).trim();
     const userId = String(
         readSupabaseSessionField(user, 'id', 'Id')
         || readSupabaseSessionField(session, 'user_id', 'userId', 'UserId')).trim();
-    const expiresAtMs = parseSupabaseSessionExpiresAtMs(readSupabaseSessionField(session, 'expires_at', 'expiresAt', 'ExpiresAt'));
+    const expiresAtMs = parseSupabaseSessionExpiresAtMs(readSupabaseSessionField(
+        session,
+        'expires_at',
+        'expiresAt',
+        'ExpiresAt',
+        'expires_at_ms',
+        'expiresAtMs',
+        'ExpiresAtMs',
+        'expiresAtUnixTime',
+        'ExpiresAtUnixTime'));
 
     if (!accessToken || !userId) {
         return null;