@mindexec/cli 0.2.155 → 0.2.156

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindexec/cli",
-  "version": "0.2.155",
+  "version": "0.2.156",
   "description": "MindExec local runtime and bridge CLI",
   "main": "server.js",
   "type": "module",
@@ -21,15 +21,15 @@
   "scripts": {
     "start": "node launch-bridge.cjs",
     "dev": "node launch-bridge.cjs --watch",
-    "test:syntax": "node --check server.js && node --check remote-hub.js && node --check codex-runtime.js && node --check launch-bridge.cjs && node --check port-guard.cjs && node --check scripts/setup-tree-sitter-grammars.mjs && node --check scripts/auth-session-smoke.mjs && node --check scripts/remote-hub-smoke.mjs && node --check scripts/remote-hub-scale-smoke.mjs && node --check scripts/remote-fleet-render-smoke.mjs && node --check scripts/remote-http-smoke.mjs && node --check scripts/remote-frame-ws-smoke.mjs && node --check scripts/remote-input-ws-smoke.mjs && node --check scripts/remote-agent-ws-smoke.mjs && node --check scripts/remote-agent-managed-smoke.mjs && node --check scripts/remote-registry-follower-smoke.mjs && node --check scripts/remote-agent-package-smoke.mjs && node --check scripts/remote-fast-live-rate-smoke.mjs && node --check scripts/remote-fast-mdm-browser-smoke.mjs",
+    "test:syntax": "node --check server.js && node --check remote-hub.js && node --check codex-runtime.js && node --check launch-bridge.cjs && node --check port-guard.cjs && node --check scripts/setup-tree-sitter-grammars.mjs && node --check scripts/auth-session-smoke.mjs && node --check scripts/remote-hub-smoke.mjs && node --check scripts/remote-hub-scale-smoke.mjs && node --check scripts/remote-fleet-render-smoke.mjs && node --check scripts/remote-http-smoke.mjs && node --check scripts/remote-frame-ws-smoke.mjs && node --check scripts/remote-input-ws-smoke.mjs && node --check scripts/remote-agent-ws-smoke.mjs && node --check scripts/remote-agent-managed-smoke.mjs && node --check scripts/remote-registry-follower-smoke.mjs && node --check scripts/remote-agent-package-smoke.mjs && node --check scripts/remote-fast-live-rate-smoke.mjs && node --check scripts/remote-fast-mdm-browser-smoke.mjs",
     "test:auth": "node scripts/auth-session-smoke.mjs",
     "test:remote": "node scripts/remote-hub-smoke.mjs",
     "test:remote:scale": "node scripts/remote-hub-scale-smoke.mjs",
     "test:remote:render": "node scripts/remote-fleet-render-smoke.mjs",
-    "test:remote:http": "node scripts/remote-http-smoke.mjs",
-    "test:remote:frame-ws": "node scripts/remote-frame-ws-smoke.mjs",
-    "test:remote:input-ws": "node scripts/remote-input-ws-smoke.mjs",
-    "test:remote:agent-ws": "node scripts/remote-agent-ws-smoke.mjs",
+    "test:remote:http": "node scripts/remote-http-smoke.mjs",
+    "test:remote:frame-ws": "node scripts/remote-frame-ws-smoke.mjs",
+    "test:remote:input-ws": "node scripts/remote-input-ws-smoke.mjs",
+    "test:remote:agent-ws": "node scripts/remote-agent-ws-smoke.mjs",
     "test:remote:managed": "node scripts/remote-agent-managed-smoke.mjs",
     "test:remote:registry": "node scripts/remote-registry-follower-smoke.mjs",
     "test:remote:package": "node scripts/remote-agent-package-smoke.mjs",

package/scripts/auth-session-smoke.mjs

@@ -66,6 +66,7 @@ function spawnBridge({ bridgePort, workspacePath, authDataRoot }) {
             WORKSPACE_PATH: workspacePath,
             MINDEXEC_AUTH_DATA_ROOT: authDataRoot,
             MINDEXEC_REMOTE_HUB: '0',
+            MINDEXEC_REMOTE_REGISTRY_FOLLOWER: '0',
             NO_COLOR: '1'
         }
     });

package/scripts/remote-registry-follower-smoke.mjs

@@ -464,6 +464,25 @@ async function main() {
                 && request.pathname === '/rest/v1/rpc/set_remote_host_target').length;
             return publishCount >= 2 ? publishCount : null;
         }, 8000, `host-target auto renew publish\n${renewHost.details()}`);
+        const beforeResumePublishCount = fakeSupabase.requests.filter(request =>
+            request.method === 'POST'
+            && request.pathname === '/rest/v1/rpc/set_remote_host_target').length;
+        const renewResume = await fetchJson(`${renewHost.baseUrl}/api/remote/system/resume`, {
+            method: 'POST',
+            token: BRIDGE_TOKEN,
+            body: JSON.stringify({
+                driftMs: 65000
+            })
+        });
+        assert.equal(renewResume.ok, true, JSON.stringify(renewResume.payload));
+        assert.equal(renewResume.payload?.ok, true, JSON.stringify(renewResume.payload));
+        assert.equal(renewResume.payload?.remoteSystemResume?.localHost, true, JSON.stringify(renewResume.payload?.remoteSystemResume));
+        await waitFor(() => {
+            const publishCount = fakeSupabase.requests.filter(request =>
+                request.method === 'POST'
+                && request.pathname === '/rest/v1/rpc/set_remote_host_target').length;
+            return publishCount > beforeResumePublishCount ? publishCount : null;
+        }, 8000, `host-target resume republish\n${renewHost.details()}`);
         const renewStatus = await fetchJson(`${renewHost.baseUrl}/api/status`);
         assert.equal(renewStatus.payload?.remoteHostTargetRenew?.status, 'active', JSON.stringify(renewStatus.payload?.remoteHostTargetRenew));
         assert.equal(renewStatus.payload?.remoteHostTargetRenew?.endpoint, renewPublicEndpoint, JSON.stringify(renewStatus.payload?.remoteHostTargetRenew));
@@ -523,6 +542,24 @@ async function main() {
         const firstStatus = await fetchJson(`${client.baseUrl}/api/status`);
         assert.equal(firstStatus.payload?.remoteRegistryRealtime?.subscribed, true, JSON.stringify(firstStatus.payload?.remoteRegistryRealtime));
         assert.ok(fakeSupabase.realtimeClients.size >= 1, 'expected LocalBridge realtime watcher to connect');
+        const firstPid = Number(firstAgent.pid || 0);
+        assert.ok(firstPid > 0, JSON.stringify(firstAgent));
+
+        const clientResume = await fetchJson(`${client.baseUrl}/api/remote/system/resume`, {
+            method: 'POST',
+            token: BRIDGE_TOKEN,
+            body: JSON.stringify({
+                driftMs: 65000
+            })
+        });
+        assert.equal(clientResume.ok, true, JSON.stringify(clientResume.payload));
+        assert.equal(clientResume.payload?.ok, true, JSON.stringify(clientResume.payload));
+        assert.equal(clientResume.payload?.remoteSystemResume?.registryAgentRestarted, true, JSON.stringify(clientResume.payload?.remoteSystemResume));
+        const resumedAgent = await waitForManagedAgentRestart(client, hostAEndpoint, firstPid, 'host-a after resume', 12000);
+        assert.equal(resumedAgent.usingNpx, false, JSON.stringify(resumedAgent));
+        assert.match(String(resumedAgent.launcher || ''), /mindexec-remote-fast/i);
+        assert.equal(resumedAgent.leaseId, 'lease-a');
+        await waitForConnectedDevice(hostA, 'host-a after resume');
 
         currentTarget = createRegistryTarget({
             endpoint: hostBEndpoint,

package/server.js

@@ -3374,6 +3374,10 @@ const REMOTE_HOST_TARGET_RENEW_MS = Math.max(
         Math.floor(REMOTE_HOST_TARGET_LEASE_MS / 2),
         Number(process.env.MINDEXEC_REMOTE_HOST_TARGET_RENEW_MS || 25000) || 25000));
 const REMOTE_HOST_TARGET_RENEW_LOG_REPEAT_MS = 60000;
+const REMOTE_SYSTEM_RESUME_CHECK_MS = Math.max(1000, Number(process.env.MINDEXEC_REMOTE_RESUME_CHECK_MS || 5000) || 5000);
+const REMOTE_SYSTEM_RESUME_DRIFT_MS = Math.max(
+    REMOTE_SYSTEM_RESUME_CHECK_MS + 5000,
+    Number(process.env.MINDEXEC_REMOTE_RESUME_DRIFT_MS || 20000) || 20000);
 let remoteAgentState = createRemoteAgentIdleState();
 let remoteAgentSyncReportState = null;
 let remoteAgentSyncReportLogKey = '';
@@ -3396,10 +3400,27 @@ let remoteRegistryRealtimeHeartbeatTimer = null;
 let remoteRegistryRealtimeReconnectTimer = null;
 let remoteRegistryRealtimeReconnectContext = null;
 let remoteRegistryRealtimeLastWakeAt = 0;
+let remoteSupabaseRuntimeConfigCache = null;
 let remoteHostTargetRenewTimer = null;
 let remoteHostTargetRenewInFlight = false;
 let remoteHostTargetRenewLogKey = '';
 let remoteHostTargetRenewLogAt = 0;
+let remoteSystemResumeTimer = null;
+let remoteSystemResumeExpectedAt = 0;
+let remoteSystemResumeInFlight = false;
+let remoteSystemResumeState = {
+    enabled: true,
+    status: 'idle',
+    reason: '',
+    trigger: '',
+    lastDetectedAt: '',
+    lastCompletedAt: '',
+    lastError: '',
+    driftMs: 0,
+    localHost: false,
+    registryAgentRestarted: false,
+    disconnectedDevices: 0
+};
 let remoteRegistryFollowerState = {
     enabled: REMOTE_REGISTRY_FOLLOWER_ENABLED,
     status: REMOTE_REGISTRY_FOLLOWER_ENABLED ? 'idle' : 'disabled',
@@ -4762,6 +4783,23 @@ function updateRemoteHostTargetRenewState(patch = {}) {
     emitBridgeEvent('RemoteHostTargetRenewUpdated', serializeRemoteHostTargetRenewState());
 }
 
+function serializeRemoteSystemResumeState() {
+    return {
+        ...remoteSystemResumeState,
+        checkMs: REMOTE_SYSTEM_RESUME_CHECK_MS,
+        driftThresholdMs: REMOTE_SYSTEM_RESUME_DRIFT_MS
+    };
+}
+
+function updateRemoteSystemResumeState(patch = {}) {
+    remoteSystemResumeState = {
+        ...remoteSystemResumeState,
+        ...patch,
+        enabled: true
+    };
+    emitBridgeEvent('RemoteSystemResumeUpdated', serializeRemoteSystemResumeState());
+}
+
 function serializeRemoteRegistryRealtimeState() {
     return {
         ...remoteRegistryRealtimeState,
@@ -5189,12 +5227,19 @@ function readSupabaseRuntimeConfig() {
         || process.env.MINDEXEC_SUPABASE_KEY
         || '').trim();
     if (envUrl && envKey) {
-        return { url: envUrl.replace(/\/+$/, ''), key: envKey };
+        remoteSupabaseRuntimeConfigCache = {
+            url: envUrl.replace(/\/+$/, ''),
+            key: envKey,
+            source: 'env'
+        };
+        return { ...remoteSupabaseRuntimeConfigCache };
     }
 
     const candidates = [
         path.join(WEB_APP_ROOT || '', 'appsettings.json'),
         path.join(DEFAULT_WEB_APP_ROOT, 'appsettings.json'),
+        path.join(BRIDGE_ROOT, 'wwwroot', 'appsettings.json'),
+        path.join(process.cwd(), 'wwwroot', 'appsettings.json'),
         path.resolve(BRIDGE_ROOT, '..', 'MindExecution.Web', 'wwwroot', 'appsettings.json')
     ].filter(Boolean);
 
@@ -5204,13 +5249,25 @@ function readSupabaseRuntimeConfig() {
             const url = String(payload?.Supabase?.Url || '').trim().replace(/\/+$/, '');
             const key = String(payload?.Supabase?.Key || payload?.Supabase?.AnonKey || payload?.Supabase?.PublishableKey || '').trim();
             if (url && key) {
-                return { url, key };
+                remoteSupabaseRuntimeConfigCache = {
+                    url,
+                    key,
+                    source: candidate
+                };
+                return { ...remoteSupabaseRuntimeConfigCache };
             }
         } catch {
             // Try the next appsettings candidate.
         }
     }
 
+    if (remoteSupabaseRuntimeConfigCache?.url && remoteSupabaseRuntimeConfigCache?.key) {
+        return {
+            ...remoteSupabaseRuntimeConfigCache,
+            cached: true
+        };
+    }
+
     return { url: '', key: '' };
 }
 
@@ -5603,6 +5660,145 @@ function stopRemoteHostTargetRenew(reason = 'stopped') {
     });
 }
 
+function disconnectRemoteHubDevicesForResume(reason = 'system-resume') {
+    const devices = remoteHub.listDevices();
+    let disconnected = 0;
+    for (const device of devices) {
+        if (device?.connected !== true || !device?.deviceId) {
+            continue;
+        }
+
+        if (remoteHub.disconnectDevice(device.deviceId, reason)) {
+            disconnected += 1;
+        }
+    }
+
+    return disconnected;
+}
+
+async function reconcileRemoteAfterSystemResume(trigger = 'timer-drift', driftMs = 0) {
+    if (remoteSystemResumeInFlight || isShuttingDown) {
+        return;
+    }
+
+    remoteSystemResumeInFlight = true;
+    try {
+        const localHub = remoteHub.getStatus({ includeSecrets: true });
+        const isLocalHost = localHub?.hostTargetActive === true && !!localHub.hostTargetNodeId;
+        const wasRegistryAgentRunning = isRemoteAgentRegistryOwned();
+        const disconnectedDevices = isLocalHost
+            ? disconnectRemoteHubDevicesForResume('system-resume')
+            : 0;
+
+        updateRemoteSystemResumeState({
+            status: 'detected',
+            reason: 'system-resume',
+            trigger,
+            lastDetectedAt: new Date().toISOString(),
+            lastError: '',
+            driftMs: Math.round(Number(driftMs) || 0),
+            localHost: isLocalHost,
+            registryAgentRestarted: wasRegistryAgentRunning,
+            disconnectedDevices
+        });
+
+        logEvent(
+            'remote',
+            `system resume detected ${formatKeyValue('trigger', trigger)} ${formatKeyValue('driftMs', Math.round(Number(driftMs) || 0))} ${formatKeyValue('host', isLocalHost ? 'yes' : 'no')} ${formatKeyValue('agent', wasRegistryAgentRunning ? 'registry' : '-')}`,
+            'remote');
+
+        closeRemoteRegistryRealtime('system-resume');
+
+        if (wasRegistryAgentRunning) {
+            await stopRemoteAgentConnection('system-resume-reconnect');
+        }
+
+        if (isLocalHost) {
+            updateRemoteHostTargetRenewState({
+                status: 'waking',
+                reason: 'system-resume',
+                nodeId: localHub.hostTargetNodeId,
+                leaseId: localHub.hostTargetLeaseId,
+                hostInstanceId: localHub.hostTargetHostInstanceId || localHub.hostInstanceId,
+                endpoint: localHub.hostTargetEndpoint,
+                endpointCandidates: localHub.hostTargetEndpointCandidates || [],
+                expiresAt: localHub.hostTargetExpiresAt,
+                lastError: ''
+            });
+            await runRemoteHostTargetRenewOnce('system-resume', { takeover: false });
+        }
+
+        updateRemoteRegistryFollowerState({
+            status: 'waking',
+            reason: 'system-resume',
+            lastError: '',
+            lastAttemptAt: new Date().toISOString()
+        });
+        await wakeRemoteRegistryFollower('system-resume');
+
+        updateRemoteSystemResumeState({
+            status: 'reconciled',
+            reason: 'system-resume',
+            lastCompletedAt: new Date().toISOString(),
+            lastError: ''
+        });
+
+        emitBridgeEvent('RemoteSystemResumeReconciled', {
+            trigger,
+            driftMs: Math.round(Number(driftMs) || 0),
+            localHost: isLocalHost,
+            registryAgentRestarted: wasRegistryAgentRunning,
+            disconnectedDevices
+        });
+    } catch (error) {
+        logWarn('remote', `system resume reconcile failed: ${error?.message || error}`);
+        updateRemoteSystemResumeState({
+            status: 'error',
+            reason: 'system-resume-failed',
+            lastError: error?.message || String(error || ''),
+            lastCompletedAt: new Date().toISOString()
+        });
+        updateRemoteRegistryFollowerState({
+            status: 'error',
+            reason: 'system-resume-failed',
+            lastError: error?.message || String(error || ''),
+            lastAttemptAt: new Date().toISOString()
+        });
+        scheduleRemoteRegistryFollower(REMOTE_REGISTRY_FOLLOWER_FAST_RETRY_MS, 'system-resume-error');
+    } finally {
+        remoteSystemResumeInFlight = false;
+    }
+}
+
+function startRemoteSystemResumeMonitor() {
+    if (remoteSystemResumeTimer || isShuttingDown) {
+        return;
+    }
+
+    remoteSystemResumeExpectedAt = Date.now() + REMOTE_SYSTEM_RESUME_CHECK_MS;
+    remoteSystemResumeTimer = setInterval(() => {
+        const now = Date.now();
+        const driftMs = now - remoteSystemResumeExpectedAt;
+        remoteSystemResumeExpectedAt = now + REMOTE_SYSTEM_RESUME_CHECK_MS;
+        if (driftMs < REMOTE_SYSTEM_RESUME_DRIFT_MS) {
+            return;
+        }
+
+        reconcileRemoteAfterSystemResume('timer-drift', driftMs).catch(error => {
+            logWarn('remote', `system resume handler failed: ${error?.message || error}`);
+        });
+    }, REMOTE_SYSTEM_RESUME_CHECK_MS);
+    remoteSystemResumeTimer?.unref?.();
+}
+
+function stopRemoteSystemResumeMonitor() {
+    if (remoteSystemResumeTimer) {
+        clearInterval(remoteSystemResumeTimer);
+        remoteSystemResumeTimer = null;
+    }
+    remoteSystemResumeExpectedAt = 0;
+}
+
 async function runRemoteHostTargetRenewOnce(trigger = 'timer', options = {}) {
     if (!REMOTE_HOST_TARGET_AUTO_RENEW_ENABLED || remoteHostTargetRenewInFlight) {
         return serializeRemoteHostTargetRenewState();
@@ -10509,6 +10705,7 @@ app.get('/api/status', async (req, res) => {
         remoteRegistryFollower: serializeRemoteRegistryFollowerState(),
         remoteRegistryRealtime: serializeRemoteRegistryRealtimeState(),
         remoteHostTargetRenew: serializeRemoteHostTargetRenewState(),
+        remoteSystemResume: serializeRemoteSystemResumeState(),
         shellJobsPath: '/api/shell/jobs',
         companyCore: {
             baseUrl: companyCoreBaseUrl,
@@ -10551,6 +10748,26 @@ app.get('/api/remote/status', (req, res) => {
     res.json(remoteHub.getStatus({ includeSecrets: true }));
 });
 
+app.post('/api/remote/system/resume', async (req, res) => {
+    res.setHeader('Cache-Control', 'no-store');
+    try {
+        await reconcileRemoteAfterSystemResume('manual-api', Number(req.body?.driftMs || 0));
+        res.json({
+            ok: true,
+            remoteSystemResume: serializeRemoteSystemResumeState(),
+            remoteRegistryFollower: serializeRemoteRegistryFollowerState(),
+            remoteHostTargetRenew: serializeRemoteHostTargetRenewState(),
+            remoteAgent: serializeRemoteAgentState()
+        });
+    } catch (err) {
+        res.status(500).json({
+            ok: false,
+            error: err?.message || String(err),
+            remoteSystemResume: serializeRemoteSystemResumeState()
+        });
+    }
+});
+
 app.get('/api/remote/devices', (req, res) => {
     res.setHeader('Cache-Control', 'no-store');
     const includeDataUrl = /^(1|true|yes|on|data|base64)$/i.test(String(req.query?.includeDataUrl ?? req.query?.frameData ?? ''));
@@ -12313,8 +12530,9 @@ async function startBridgeServer() {
                 : `${tone('app', 'muted')}      ${tone('not packaged', 'warn')}`,
             `${tone('listen', 'muted')}   ${tone(`http://127.0.0.1:${PORT}`, 'path')}`,
             `${tone('stop', 'muted')}     Ctrl+C`
-        ]);
+        ]); 
         startRemoteRegistryFollower();
+        startRemoteSystemResumeMonitor();
     });
 }
 
@@ -12382,6 +12600,12 @@ async function shutdownBridge(signal) {
         // Ignore registry follower shutdown errors
     }
 
+    try {
+        stopRemoteSystemResumeMonitor();
+    } catch {
+        // Ignore system resume monitor shutdown errors
+    }
+
     try {
         stopRemoteHostTargetRenew('bridge-shutdown');
     } catch {