@mindexec/cli 0.2.122 → 0.2.124

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindexec/cli",
-  "version": "0.2.122",
+  "version": "0.2.124",
   "description": "MindExec local runtime and bridge CLI",
   "main": "server.js",
   "type": "module",
@@ -20,12 +20,13 @@
   "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-agent-ws-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-agent-ws-smoke.mjs && node --check scripts/remote-agent-managed-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:managed": "node scripts/remote-agent-managed-smoke.mjs",
     "pack:dry": "npm pack --dry-run",
     "setup:grammars": "node scripts/setup-tree-sitter-grammars.mjs",
     "postinstall": "npm run setup:grammars"

package/scripts/remote-agent-managed-smoke.mjs

@@ -0,0 +1,231 @@
+#!/usr/bin/env node
+
+import assert from 'node:assert/strict';
+import { spawn } from 'node:child_process';
+import { mkdtemp, readFile, rm } from 'node:fs/promises';
+import net from 'node:net';
+import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const BRIDGE_TOKEN = 'remote-agent-managed-smoke-token';
+const PAIR_TOKEN = 'remote-agent-managed-pair-token';
+const LEASE_ID = 'remote-agent-managed-smoke-lease';
+const LOCAL_BRIDGE_DIR = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
+
+function wait(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+async function findFreePort() {
+    return await new Promise((resolve, reject) => {
+        const server = net.createServer();
+        server.unref();
+        server.once('error', reject);
+        server.listen(0, '127.0.0.1', () => {
+            const address = server.address();
+            const port = typeof address === 'object' && address ? address.port : 0;
+            server.close(() => resolve(port));
+        });
+    });
+}
+
+async function fetchJson(url, options = {}) {
+    const response = await fetch(url, {
+        ...options,
+        headers: {
+            ...(options.body ? { 'Content-Type': 'application/json' } : {}),
+            'X-Bridge-Token': options.token || BRIDGE_TOKEN,
+            ...(options.headers || {})
+        }
+    });
+
+    let payload = null;
+    try {
+        payload = await response.json();
+    } catch {
+        // Some failure responses may be empty.
+    }
+
+    return {
+        status: response.status,
+        ok: response.ok,
+        payload
+    };
+}
+
+async function waitFor(predicate, timeoutMs = 30000, label = 'condition') {
+    const startedAt = Date.now();
+    let lastError = null;
+    while (Date.now() - startedAt < timeoutMs) {
+        try {
+            const value = await predicate();
+            if (value) {
+                return value;
+            }
+        } catch (err) {
+            lastError = err;
+        }
+
+        await wait(100);
+    }
+
+    throw new Error(`Timed out waiting for ${label}${lastError ? `: ${lastError.message}` : ''}.`);
+}
+
+function spawnBridge({ bridgePort, remoteHubPort, workspacePath, label }) {
+    const child = spawn(process.execPath, ['server.js'], {
+        cwd: LOCAL_BRIDGE_DIR,
+        stdio: ['ignore', 'pipe', 'pipe'],
+        windowsHide: true,
+        env: {
+            ...process.env,
+            BRIDGE_PORT: String(bridgePort),
+            BRIDGE_TOKEN,
+            BRIDGE_REQUIRE_TOKEN: '1',
+            MINDEXEC_REMOTE_HUB: '1',
+            REMOTE_HUB_HOST: '127.0.0.1',
+            REMOTE_HUB_PORT: String(remoteHubPort),
+            REMOTE_HUB_PAIR_TOKEN: PAIR_TOKEN,
+            WORKSPACE_PATH: workspacePath,
+            NO_COLOR: '1'
+        }
+    });
+
+    let stdout = '';
+    let stderr = '';
+    child.stdout.on('data', chunk => {
+        stdout += chunk.toString();
+    });
+    child.stderr.on('data', chunk => {
+        stderr += chunk.toString();
+    });
+
+    const exitPromise = new Promise(resolve => child.once('exit', resolve));
+    const details = () => `${label} stdout=${stdout}\n${label} stderr=${stderr}`;
+    const stop = async () => {
+        if (child.exitCode === null && !child.killed) {
+            child.kill('SIGTERM');
+            await Promise.race([
+                exitPromise,
+                wait(5000)
+            ]);
+            if (child.exitCode === null && !child.killed) {
+                child.kill('SIGKILL');
+            }
+        }
+    };
+
+    return {
+        baseUrl: `http://127.0.0.1:${bridgePort}`,
+        child,
+        details,
+        stop
+    };
+}
+
+async function waitForBridge(bridge) {
+    return await waitFor(async () => {
+        const result = await fetchJson(`${bridge.baseUrl}/api/status`);
+        return result.ok && result.payload?.status === 'ok' ? result.payload : null;
+    }, 30000, `bridge startup\n${bridge.details()}`);
+}
+
+async function connectManagedAgent(clientBridge, managerEndpoint, staleEndpoint) {
+    const result = await fetchJson(`${clientBridge.baseUrl}/api/remote/agent/connect`, {
+        method: 'POST',
+        body: JSON.stringify({
+            managerCandidates: [staleEndpoint, managerEndpoint],
+            pairToken: PAIR_TOKEN,
+            leaseId: LEASE_ID,
+            nodeId: 'remote-agent-managed-smoke-node',
+            engine: 'auto',
+            source: 'smoke'
+        })
+    });
+
+    assert.equal(result.ok, true, JSON.stringify(result.payload));
+    assert.equal(result.payload?.ok, true, JSON.stringify(result.payload));
+    return result.payload.agent;
+}
+
+async function main() {
+    const tempRoot = await mkdtemp(path.join(os.tmpdir(), 'mindexec-remote-managed-smoke-'));
+    const hostWorkspace = path.join(tempRoot, 'host');
+    const clientWorkspace = path.join(tempRoot, 'client');
+    const hostBridgePort = await findFreePort();
+    const hostRemotePort = await findFreePort();
+    const clientBridgePort = await findFreePort();
+    const clientRemotePort = await findFreePort();
+    const stalePort = await findFreePort();
+    const managerEndpoint = `127.0.0.1:${hostRemotePort}`;
+    const staleEndpoint = `127.0.0.1:${stalePort}`;
+
+    let hostBridge = null;
+    let clientBridge = null;
+    try {
+        hostBridge = spawnBridge({
+            bridgePort: hostBridgePort,
+            remoteHubPort: hostRemotePort,
+            workspacePath: hostWorkspace,
+            label: 'host'
+        });
+        await waitForBridge(hostBridge);
+
+        clientBridge = spawnBridge({
+            bridgePort: clientBridgePort,
+            remoteHubPort: clientRemotePort,
+            workspacePath: clientWorkspace,
+            label: 'client-1'
+        });
+        await waitForBridge(clientBridge);
+
+        const firstAgent = await connectManagedAgent(clientBridge, managerEndpoint, staleEndpoint);
+        assert.equal(firstAgent.running, true, JSON.stringify(firstAgent));
+        assert.equal(firstAgent.ready, true, JSON.stringify(firstAgent));
+        assert.equal(firstAgent.usingNpx, false, JSON.stringify(firstAgent));
+        assert.match(String(firstAgent.launcher || ''), /mindexec-remote-fast/i);
+
+        const connectedDevice = await waitFor(async () => {
+            const result = await fetchJson(`${hostBridge.baseUrl}/api/remote/devices`);
+            return result.payload?.devices?.find(device => device.connected === true) || null;
+        }, 10000, `host device registration\n${hostBridge.details()}\n${clientBridge.details()}`);
+        assert.equal(connectedDevice.capabilities?.binaryFrames, true);
+
+        await clientBridge.stop();
+        clientBridge = null;
+
+        const cachePath = path.join(clientWorkspace, '.mindexec', 'cache', 'remote-agent-recent-managers.json');
+        const cache = JSON.parse(await readFile(cachePath, 'utf8'));
+        assert.equal(cache.version, 1);
+        assert.equal(cache.entries?.[0]?.endpoint, managerEndpoint, JSON.stringify(cache));
+
+        clientBridge = spawnBridge({
+            bridgePort: clientBridgePort,
+            remoteHubPort: clientRemotePort,
+            workspacePath: clientWorkspace,
+            label: 'client-2'
+        });
+        await waitForBridge(clientBridge);
+
+        const secondAgent = await connectManagedAgent(clientBridge, managerEndpoint, staleEndpoint);
+        assert.equal(secondAgent.running, true, JSON.stringify(secondAgent));
+        assert.equal(secondAgent.ready, true, JSON.stringify(secondAgent));
+        assert.equal(secondAgent.usingNpx, false, JSON.stringify(secondAgent));
+        assert.match(String(secondAgent.launcher || ''), /mindexec-remote-fast/i);
+        assert.equal(secondAgent.managerCandidates?.[0], managerEndpoint, JSON.stringify(secondAgent.managerCandidates));
+        assert.equal(secondAgent.managerCandidates?.[1], staleEndpoint, JSON.stringify(secondAgent.managerCandidates));
+
+        console.log('RemoteAgent managed supervisor smoke OK');
+    } finally {
+        if (clientBridge) {
+            await clientBridge.stop();
+        }
+        if (hostBridge) {
+            await hostBridge.stop();
+        }
+        await rm(tempRoot, { recursive: true, force: true });
+    }
+}
+
+await main();

package/server.js

@@ -2909,12 +2909,17 @@ const REMOTE_AGENT_DEFAULT_ENGINE = 'auto';
 const REMOTE_AGENT_SYNC_REPORT_LOG_REPEAT_MS = 30000;
 const REMOTE_AGENT_RACE_START_STAGGER_MS = 120;
 const REMOTE_AGENT_MAX_PARALLEL_CANDIDATES = 6;
+const REMOTE_AGENT_RECENT_MANAGER_CACHE_TTL_MS = 30 * 24 * 60 * 60 * 1000;
+const REMOTE_AGENT_RECENT_MANAGER_CACHE_LIMIT = 64;
+const REMOTE_AGENT_RECENT_MANAGER_DEFAULT_KEY = 'default';
 let remoteAgentState = createRemoteAgentIdleState();
 let remoteAgentSyncReportState = null;
 let remoteAgentSyncReportLogKey = '';
 let remoteAgentSyncReportLogAt = 0;
 let remoteAgentConnectPromise = null;
 const remoteAgentRecentSuccessfulManagers = new Map();
+let remoteAgentRecentSuccessfulManagersLoaded = false;
+let remoteAgentRecentSuccessfulManagersSavePromise = null;
 
 function createRemoteAgentIdleState(overrides = {}) {
     return {
@@ -3216,7 +3221,104 @@ function createRemoteAgentConnectionKey(manager, leaseId) {
 }
 
 function getRemoteAgentRecentManagerKey(leaseId = '') {
-    return safeRemoteAgentField(leaseId || 'default', 128) || 'default';
+    return safeRemoteAgentField(leaseId || REMOTE_AGENT_RECENT_MANAGER_DEFAULT_KEY, 128)
+        || REMOTE_AGENT_RECENT_MANAGER_DEFAULT_KEY;
+}
+
+function getRemoteAgentRecentManagerCachePath() {
+    return path.join(getDataRoot(workspacePath), 'cache', 'remote-agent-recent-managers.json');
+}
+
+function normalizeRemoteAgentRecentManagerEntry(entry) {
+    const endpoint = normalizeRemoteManagerEndpoint(entry?.endpoint);
+    const updatedAt = Number(entry?.updatedAt || 0);
+    if (!endpoint || !Number.isFinite(updatedAt) || updatedAt <= 0) {
+        return null;
+    }
+
+    const now = Date.now();
+    if (now - updatedAt > REMOTE_AGENT_RECENT_MANAGER_CACHE_TTL_MS) {
+        return null;
+    }
+
+    return {
+        endpoint,
+        updatedAt
+    };
+}
+
+function loadRemoteAgentRecentSuccessfulManagers() {
+    if (remoteAgentRecentSuccessfulManagersLoaded) {
+        return;
+    }
+
+    remoteAgentRecentSuccessfulManagersLoaded = true;
+    const cachePath = getRemoteAgentRecentManagerCachePath();
+    let payload = null;
+    try {
+        payload = JSON.parse(readFileSync(cachePath, 'utf8'));
+    } catch (err) {
+        if (err?.code !== 'ENOENT') {
+            logWarn('remote', `managed RemoteAgent recent manager cache ignored: ${err?.message || err}`);
+        }
+        return;
+    }
+
+    const rawEntries = Array.isArray(payload?.entries)
+        ? payload.entries
+        : Object.entries(payload?.managers || {}).map(([key, value]) => ({ key, ...value }));
+    let loaded = 0;
+    for (const rawEntry of rawEntries) {
+        if (loaded >= REMOTE_AGENT_RECENT_MANAGER_CACHE_LIMIT) {
+            break;
+        }
+
+        const key = getRemoteAgentRecentManagerKey(rawEntry?.key || rawEntry?.leaseId || '');
+        const entry = normalizeRemoteAgentRecentManagerEntry(rawEntry);
+        if (!entry) {
+            continue;
+        }
+
+        remoteAgentRecentSuccessfulManagers.set(key, entry);
+        loaded += 1;
+    }
+}
+
+async function saveRemoteAgentRecentSuccessfulManagers() {
+    const entries = Array.from(remoteAgentRecentSuccessfulManagers.entries())
+        .map(([key, value]) => ({
+            key,
+            endpoint: normalizeRemoteManagerEndpoint(value?.endpoint),
+            updatedAt: Number(value?.updatedAt || 0)
+        }))
+        .map(entry => ({
+            ...entry,
+            normalized: normalizeRemoteAgentRecentManagerEntry(entry)
+        }))
+        .filter(entry => entry.normalized)
+        .sort((left, right) => Number(right.updatedAt || 0) - Number(left.updatedAt || 0))
+        .slice(0, REMOTE_AGENT_RECENT_MANAGER_CACHE_LIMIT)
+        .map(entry => ({
+            key: entry.key,
+            endpoint: entry.normalized.endpoint,
+            updatedAt: entry.normalized.updatedAt
+        }));
+
+    const payload = {
+        version: 1,
+        savedAt: new Date().toISOString(),
+        entries
+    };
+    await writeFileAtomically(getRemoteAgentRecentManagerCachePath(), JSON.stringify(payload, null, 2), 'utf8');
+}
+
+function scheduleRemoteAgentRecentSuccessfulManagersSave() {
+    remoteAgentRecentSuccessfulManagersSavePromise = Promise.resolve(remoteAgentRecentSuccessfulManagersSavePromise)
+        .catch(() => null)
+        .then(() => saveRemoteAgentRecentSuccessfulManagers())
+        .catch(err => {
+            logWarn('remote', `managed RemoteAgent recent manager cache save failed: ${err?.message || err}`);
+        });
 }
 
 function rememberRemoteAgentSuccessfulManager(manager, leaseId = '') {
@@ -3225,10 +3327,14 @@ function rememberRemoteAgentSuccessfulManager(manager, leaseId = '') {
         return;
     }
 
-    remoteAgentRecentSuccessfulManagers.set(getRemoteAgentRecentManagerKey(leaseId), {
+    loadRemoteAgentRecentSuccessfulManagers();
+    const entry = {
         endpoint,
         updatedAt: Date.now()
-    });
+    };
+    remoteAgentRecentSuccessfulManagers.set(getRemoteAgentRecentManagerKey(leaseId), entry);
+    remoteAgentRecentSuccessfulManagers.set(REMOTE_AGENT_RECENT_MANAGER_DEFAULT_KEY, entry);
+    scheduleRemoteAgentRecentSuccessfulManagersSave();
 }
 
 function prioritizeRemoteAgentManagers(managers, leaseId = '') {
@@ -3237,8 +3343,10 @@ function prioritizeRemoteAgentManagers(managers, leaseId = '') {
         return normalized;
     }
 
-    const recent = remoteAgentRecentSuccessfulManagers.get(getRemoteAgentRecentManagerKey(leaseId));
-    const recentEndpoint = normalizeRemoteManagerEndpoint(recent?.endpoint);
+    loadRemoteAgentRecentSuccessfulManagers();
+    const leaseRecent = remoteAgentRecentSuccessfulManagers.get(getRemoteAgentRecentManagerKey(leaseId));
+    const defaultRecent = remoteAgentRecentSuccessfulManagers.get(REMOTE_AGENT_RECENT_MANAGER_DEFAULT_KEY);
+    const recentEndpoint = normalizeRemoteManagerEndpoint(leaseRecent?.endpoint || defaultRecent?.endpoint);
     if (!recentEndpoint) {
         return normalized;
     }
@@ -10333,6 +10441,12 @@ async function shutdownBridge(signal) {
         // Ignore managed RemoteAgent close errors during shutdown
     }
 
+    try {
+        await remoteAgentRecentSuccessfulManagersSavePromise;
+    } catch {
+        // Ignore recent-manager cache save errors during shutdown
+    }
+
     try {
         await remoteHub.close();
     } catch {