@mindexec/cli 0.2.208 → 0.2.210

package/package.json

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

package/server.js

@@ -3610,13 +3610,14 @@ function createRemoteAgentIdleState(overrides = {}) {
         stderrTail: '',
         launcher: '',
         usingNpx: false,
+        pairToken: '',
         proc: null,
         ...overrides
     };
 }
 
 function serializeRemoteAgentState() {
-    const { proc, ...publicState } = remoteAgentState;
+    const { proc, pairToken, ...publicState } = remoteAgentState;
     return {
         ...publicState,
         registrySync: remoteAgentSyncReportState,
@@ -3757,6 +3758,32 @@ function markRemoteAgentReconnectNeededFromReport(report) {
     return markRemoteAgentReconnectNeeded(reason, 'agent-sync-report-disconnected');
 }
 
+function isRecentRemoteRegistryFollowerAuthenticated(maxAgeMs = 120000) {
+    if (remoteRegistryFollowerState?.authenticated !== true) {
+        return false;
+    }
+
+    const lastSuccessAt = Date.parse(remoteRegistryFollowerState.lastSuccessAt || remoteRegistryFollowerState.lastAttemptAt || '');
+    return Number.isFinite(lastSuccessAt) && Date.now() - lastSuccessAt <= maxAgeMs;
+}
+
+function shouldIgnoreBrowserUnauthRemoteAgentSyncReport(report) {
+    if (!report
+        || report.authenticated === true
+        || !/^(sync|browser-sync|web-sync)$/i.test(String(report.trigger || ''))) {
+        return false;
+    }
+
+    const reason = String(report.reason || report.error || '').trim();
+    if (!/^(registry-not-authenticated|registry-auth-pending|session-expired|registry-auth-pending-agent-kept|registry-not-authenticated-agent-kept|session-expired-agent-kept)$/i.test(reason)) {
+        return false;
+    }
+
+    return report.localHostTargetActive === true
+        || isLocalRemoteHostTargetActive()
+        || isRecentRemoteRegistryFollowerAuthenticated();
+}
+
 function isRemoteAgentOutputReconnectSignal(text) {
     const normalized = String(text || '').toLowerCase();
     if (!normalized) {
@@ -3771,6 +3798,22 @@ function isRemoteAgentOutputReconnectSignal(text) {
 }
 
 function rememberRemoteAgentSyncReport(report) {
+    if (shouldIgnoreBrowserUnauthRemoteAgentSyncReport(report)) {
+        const now = Date.now();
+        const key = `ignored-browser-unauth|${report.reason || report.error || ''}|${remoteRegistryFollowerState.reason || ''}|${isLocalRemoteHostTargetActive() ? 'local-host' : 'follower-auth'}`;
+        if (key !== remoteAgentSyncReportLogKey
+            || now - remoteAgentSyncReportLogAt >= REMOTE_AGENT_SYNC_REPORT_LOG_REPEAT_MS) {
+            remoteAgentSyncReportLogKey = key;
+            remoteAgentSyncReportLogAt = now;
+            logEvent(
+                'remote',
+                `registry sync ignored browser unauth report ${formatKeyValue('reason', report.reason || report.error || '-')} ${formatKeyValue('bridgeAuth', remoteRegistryFollowerState?.authenticated ? 'yes' : 'no')} ${formatKeyValue('localHost', isLocalRemoteHostTargetActive() ? 'yes' : 'no')}`,
+                'remote');
+        }
+        scheduleRemoteHostTargetRenewWake('ignored-browser-unauth-report', { throttleMs: REMOTE_HOST_TARGET_WAKE_RENEW_MS });
+        return false;
+    }
+
     if (report?.authenticated !== true
         && isRemoteAgentRegistryOwned()
         && isRemoteAgentProcessRunning()
@@ -4266,6 +4309,39 @@ function rememberRemoteRegistryInactiveTarget(reason = 'no-active-target') {
     };
 }
 
+async function maybeRestartKeptRemoteAgentForMissingRegistryTarget(reason = 'no-active-target') {
+    if (!isRemoteAgentRegistryOwned()
+        || !isRemoteAgentProcessRunning()
+        || isRemoteAgentReadyDataPlaneAlive()
+        || !isRemoteAgentRunningButNotReadyStale()) {
+        return null;
+    }
+
+    const managerCandidates = normalizeRemoteManagerEndpointList(remoteAgentState.managerCandidates, remoteAgentState.manager);
+    const manager = managerCandidates[0] || normalizeRemoteManagerEndpoint(remoteAgentState.manager);
+    const pairToken = safeRemoteAgentField(remoteAgentState.pairToken, 512);
+    if (!manager || !pairToken) {
+        markRemoteAgentReconnectNeeded(`${reason}-missing-target-agent-stale`, 'missing-target-agent-stale');
+        return {
+            ok: false,
+            error: pairToken ? 'missing-manager' : 'missing-pair-token'
+        };
+    }
+
+    logWarn(
+        'remote',
+        `registry target missing but managed RemoteAgent is stale; reconnecting previous manager ${formatKeyValue('reason', reason)} ${formatKeyValue('manager', manager)}`);
+    return await startRemoteAgentConnection({
+        manager,
+        managerCandidates,
+        pairToken,
+        leaseId: remoteAgentState.leaseId,
+        nodeId: remoteAgentState.nodeId,
+        engine: remoteAgentState.engine || 'auto',
+        source: remoteAgentState.source || 'local-bridge-registry-recovery'
+    });
+}
+
 function isLocalRemoteHostTargetActive() {
     const status = remoteHub.getStatus({ includeSecrets: false });
     return status?.hostTargetActive === true
@@ -4704,6 +4780,7 @@ function createRemoteAgentAttempt(options = {}) {
                 managerCandidates,
                 leaseId,
                 nodeId,
+                pairToken,
                 engine,
                 source,
                 connectionKey,
@@ -4718,6 +4795,7 @@ function createRemoteAgentAttempt(options = {}) {
         managerCandidates,
         leaseId,
         nodeId,
+        pairToken,
         engine,
         source,
         connectionKey,
@@ -4855,6 +4933,7 @@ async function startRemoteAgentConnectionRace(options = {}) {
         managerCandidates: managers,
         leaseId,
         nodeId,
+        pairToken,
         engine,
         source,
         startedAt: new Date().toISOString(),
@@ -4992,6 +5071,7 @@ async function startRemoteAgentConnectionAttempt(options = {}) {
         managerCandidates,
         leaseId,
         nodeId,
+        pairToken,
         engine,
         source,
         connectionKey,
@@ -5632,6 +5712,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 +5775,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 +5797,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 +5821,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;
@@ -6864,6 +6990,9 @@ async function runRemoteRegistryFollowerOnce(trigger = 'timer') {
                 ? 'registry-inactive'
                 : 'no-active-target';
             const inactive = rememberRemoteRegistryInactiveTarget(inactiveReason);
+            const recovery = inactive.agentKept
+                ? await maybeRestartKeptRemoteAgentForMissingRegistryTarget(inactiveReason)
+                : null;
             if (inactive.confirmedInactive && isRemoteAgentRegistryOwned()) {
                 await stopRemoteAgentConnection('registry-inactive');
             }
@@ -6883,12 +7012,15 @@ async function runRemoteRegistryFollowerOnce(trigger = 'timer') {
                 inactiveElapsedMs: inactive.elapsedMs,
                 agentKept: inactive.agentKept,
                 dataPlaneReady: inactive.dataPlaneReady,
-                lastError: ''
+                lastError: recovery?.ok === false ? (recovery.error || 'missing-target-agent-recovery-failed') : ''
             });
             await reportRemoteRegistryFollowerSync({
-                ok: true,
+                ok: recovery?.ok === false ? false : true,
                 skipped: true,
-                reason: inactive.agentKept ? `${inactiveReason}-agent-kept` : inactiveReason,
+                reason: recovery?.ok === true
+                    ? `${inactiveReason}-agent-recovered`
+                    : (inactive.agentKept ? `${inactiveReason}-agent-kept` : inactiveReason),
+                error: recovery?.ok === false ? recovery.error : '',
                 trigger,
                 authenticated: true,
                 targetEndpoint: keptManager,
@@ -6900,7 +7032,11 @@ async function runRemoteRegistryFollowerOnce(trigger = 'timer') {
                 agentKept: inactive.agentKept,
                 dataPlaneReady: inactive.dataPlaneReady
             });
-            scheduleRemoteRegistryFollower(REMOTE_REGISTRY_FOLLOWER_POLL_MS, 'no-target');
+            scheduleRemoteRegistryFollower(
+                inactive.agentKept && !inactive.dataPlaneReady
+                    ? REMOTE_REGISTRY_FOLLOWER_FAST_RETRY_MS
+                    : REMOTE_REGISTRY_FOLLOWER_POLL_MS,
+                recovery?.ok === true ? 'missing-target-agent-recovered' : 'no-target');
             return serializeRemoteRegistryFollowerState();
         }