@mindexec/cli 0.2.123 → 0.2.125

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindexec/cli",
-  "version": "0.2.123",
+  "version": "0.2.125",
   "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/wwwroot/_content/MindExecution.Shared/js/mind-map-css3d-manager.js

@@ -13461,6 +13461,7 @@
     const REMOTE_FLEET_FRAME_BLOB_CACHE_LIMIT = 96;
     const REMOTE_FLEET_LIVE_FRAME_DECODE_TIMEOUT_MS = 180;
     const REMOTE_FLEET_THUMBNAIL_FRAME_DECODE_TIMEOUT_MS = 1200;
+    const REMOTE_FLEET_BINARY_FRAME_MAX_DECODE_IN_FLIGHT = 2;
     const REMOTE_FLEET_BINARY_FRAME_WS_RECONNECT_MS = 1500;
     const REMOTE_FLEET_BINARY_FRAME_SUBSCRIBE_MS = 1000;
     const REMOTE_FLEET_BINARY_FRAME_STALE_FALLBACK_MS = 1400;
@@ -14506,13 +14507,14 @@
         }
 
         if (comparePending) {
-            const pendingUrl = String(preview.dataset.remoteFleetPendingImageUrl || preview.dataset.remoteFleetPendingFrameUrl || '');
-            const pendingKind = String(preview.dataset.remoteFleetPendingImageKind || preview.dataset.remoteFleetPendingFrameKind || '').toLowerCase();
-            const pendingSeq = Number(preview.dataset.remoteFleetPendingImageSeq || preview.dataset.remoteFleetPendingFrameSeq || '0');
-            if (pendingUrl) {
+            const pendingUrl = String(preview.dataset.remoteFleetPendingBinaryUrl || preview.dataset.remoteFleetPendingImageUrl || preview.dataset.remoteFleetPendingFrameUrl || '');
+            const pendingKind = String(preview.dataset.remoteFleetPendingBinaryKind || preview.dataset.remoteFleetPendingImageKind || preview.dataset.remoteFleetPendingFrameKind || '').toLowerCase();
+            const pendingSeq = Number(preview.dataset.remoteFleetPendingBinarySeq || preview.dataset.remoteFleetPendingImageSeq || preview.dataset.remoteFleetPendingFrameSeq || '0');
+            const hasPendingFrame = !!pendingUrl || !!pendingKind || (Number.isFinite(pendingSeq) && pendingSeq > 0);
+            if (hasPendingFrame) {
                 const samePending = pendingKind === frame.kind
                     && pendingSeq === nextSeq
-                    && pendingUrl === frame.frameUrl;
+                    && (pendingUrl === frame.frameUrl || (!pendingUrl && !frame.frameUrl));
                 if (samePending) {
                     return false;
                 }
@@ -14652,6 +14654,165 @@
         }
     }
 
+    function clearRemoteFleetPendingBinaryDataset(preview, frame) {
+        if (!preview || preview._remoteFleetPendingBinaryFrame) {
+            return;
+        }
+
+        const pendingKind = String(preview.dataset.remoteFleetPendingBinaryKind || '').toLowerCase();
+        const pendingSeq = Number(preview.dataset.remoteFleetPendingBinarySeq || '0');
+        const pendingUrl = String(preview.dataset.remoteFleetPendingBinaryUrl || '');
+        const frameKind = String(frame?.kind || '').toLowerCase();
+        const frameSeq = Number(frame?.frameSeq || 0);
+        const frameUrl = String(frame?.frameUrl || '');
+        const sameFrame = !frame
+            || (pendingKind === frameKind
+                && pendingSeq === frameSeq
+                && (pendingUrl === frameUrl || (!pendingUrl && !frameUrl)));
+
+        if (!sameFrame) {
+            return;
+        }
+
+        delete preview.dataset.remoteFleetPendingBinaryKind;
+        delete preview.dataset.remoteFleetPendingBinarySeq;
+        delete preview.dataset.remoteFleetPendingBinaryUrl;
+    }
+
+    function hasRemoteFleetSupersedingBinaryFrame(preview, frame) {
+        const pending = preview?._remoteFleetPendingBinaryFrame;
+        if (!pending || !frame) {
+            return false;
+        }
+
+        const pendingKind = String(pending.kind || '').toLowerCase();
+        const frameKind = String(frame.kind || '').toLowerCase();
+        if (pendingKind === 'live' && frameKind !== 'live') {
+            return true;
+        }
+
+        const pendingSeq = Number(pending.frameSeq || 0);
+        const frameSeq = Number(frame.frameSeq || 0);
+        if (Number.isFinite(pendingSeq)
+            && Number.isFinite(frameSeq)
+            && pendingSeq > 0
+            && frameSeq > 0) {
+            return pendingSeq > frameSeq;
+        }
+
+        return getRemoteFleetFrameIdentity(pending) !== getRemoteFleetFrameIdentity(frame);
+    }
+
+    function drainRemoteFleetBinaryCanvasPaint(preview) {
+        if (!preview
+            || !document.body.contains(preview)
+            || Number(preview._remoteFleetBinaryPaintInFlight || 0) >= REMOTE_FLEET_BINARY_FRAME_MAX_DECODE_IN_FLIGHT) {
+            return;
+        }
+
+        const frame = preview._remoteFleetPendingBinaryFrame;
+        if (!frame || !frame._remoteFleetPayloadBlob || typeof createImageBitmap !== 'function') {
+            preview._remoteFleetPendingBinaryFrame = null;
+            clearRemoteFleetPendingBinaryDataset(preview, frame);
+            return;
+        }
+
+        if (!isRemoteFleetFrameNewerForPreview(preview, frame, false)) {
+            preview._remoteFleetPendingBinaryFrame = null;
+            clearRemoteFleetPendingBinaryDataset(preview, frame);
+            return;
+        }
+
+        preview._remoteFleetPendingBinaryFrame = null;
+        preview._remoteFleetBinaryPaintInFlight = Number(preview._remoteFleetBinaryPaintInFlight || 0) + 1;
+        const token = Number(preview._remoteFleetBinaryPaintToken || 0) + 1;
+        preview._remoteFleetBinaryPaintToken = token;
+
+        loadRemoteFleetFrameBitmap(frame)
+            .then(bitmap => new Promise(resolve => {
+                if (!bitmap) {
+                    resolve(false);
+                    return;
+                }
+
+                requestRemoteFleetFrameLoopFrame(() => {
+                    let committed = false;
+                    try {
+                        const isLatestToken = Number(preview._remoteFleetBinaryPaintToken || 0) === token;
+                        const superseded = hasRemoteFleetSupersedingBinaryFrame(preview, frame);
+                        if (document.body.contains(preview) && isLatestToken && !superseded) {
+                            const canvas = ensureRemoteFleetFrameCanvas(preview);
+                            const image = preview.querySelector?.('img[data-remote-fleet-frame-image="true"]') || null;
+                            committed = commitRemoteFleetFrameToCanvas(preview, canvas, image, bitmap, frame);
+                        }
+                    } finally {
+                        if (typeof bitmap.close === 'function') {
+                            bitmap.close();
+                        }
+                    }
+
+                    if (committed) {
+                        window.RuntimeTrace?.emit?.('remote.frame.binaryPatched', {
+                            count: 1,
+                            kind: frame.kind,
+                            seq: frame.frameSeq,
+                            surface: 'binary-canvas',
+                            contentHash: frame.contentHash || '',
+                            sameContentStreak: Number(frame.sameContentStreak || 0) || 0,
+                            captureMs: Number(frame.captureMs || 0) || 0
+                        });
+                    } else {
+                        window.RuntimeTrace?.emit?.('remote.frame.binarySkipped', {
+                            kind: frame.kind,
+                            seq: frame.frameSeq,
+                            reason: hasRemoteFleetSupersedingBinaryFrame(preview, frame) ? 'superseded' : 'stale'
+                        });
+                    }
+
+                    resolve(committed);
+                });
+            }))
+            .catch(error => {
+                window.RuntimeTrace?.emit?.('remote.frame.binaryDecodeFailed', {
+                    kind: frame.kind,
+                    seq: frame.frameSeq,
+                    error: error?.message || String(error || '')
+                });
+            })
+            .finally(() => {
+                preview._remoteFleetBinaryPaintInFlight = Math.max(0, Number(preview._remoteFleetBinaryPaintInFlight || 0) - 1);
+                if (!preview._remoteFleetPendingBinaryFrame) {
+                    clearRemoteFleetPendingBinaryDataset(preview, frame);
+                }
+                if (preview._remoteFleetPendingBinaryFrame) {
+                    drainRemoteFleetBinaryCanvasPaint(preview);
+                }
+            });
+    }
+
+    function queueRemoteFleetBinaryCanvasPaint(preview, frame) {
+        if (!preview
+            || !frame
+            || frame._remoteFleetBinaryFrame !== true
+            || !frame._remoteFleetPayloadBlob
+            || typeof createImageBitmap !== 'function'
+            || !isRemoteFleetFrameNewerForPreview(preview, frame, true)) {
+            return false;
+        }
+
+        const nextFrame = cloneRemoteFleetFramePatch(frame);
+        preview._remoteFleetPendingBinaryFrame = nextFrame;
+        preview.dataset.remoteFleetPendingBinaryKind = nextFrame.kind;
+        preview.dataset.remoteFleetPendingBinarySeq = String(nextFrame.frameSeq || 0);
+        preview.dataset.remoteFleetPendingBinaryUrl = nextFrame.frameUrl || '';
+        window.RuntimeTrace?.emit?.('remote.frame.binaryQueued', {
+            kind: nextFrame.kind,
+            seq: nextFrame.frameSeq
+        });
+        drainRemoteFleetBinaryCanvasPaint(preview);
+        return true;
+    }
+
     function processRemoteFleetFramePaintQueue(preview, image) {
         if (!preview || !image || preview._remoteFleetFrameLoaderActive === true) {
             return;
@@ -14925,6 +15086,16 @@
     }
 
     function applyRemoteFleetFramePatchToPreview(preview, frame) {
+        if (frame?._remoteFleetBinaryFrame === true && frame?._remoteFleetPayloadBlob) {
+            preview._remoteFleetPendingImageFrame = null;
+            delete preview.dataset.remoteFleetPendingImageKind;
+            delete preview.dataset.remoteFleetPendingImageSeq;
+            delete preview.dataset.remoteFleetPendingImageUrl;
+            if (queueRemoteFleetBinaryCanvasPaint(preview, frame)) {
+                return true;
+            }
+        }
+
         if (String(frame?.kind || '').toLowerCase() === 'live') {
             preview._remoteFleetPendingImageFrame = null;
             delete preview.dataset.remoteFleetPendingImageKind;

package/wwwroot/service-worker-assets.js

@@ -1,5 +1,5 @@
 self.assetsManifest = {
-    "version":  "PVMqIJP0",
+    "version":  "MEKEGiqN",
     "assets":  [
                    {
                        "hash":  "sha256-+CSYMcqLNTsq3VnH11jgYyOCCdxvHzL74CBmo4sCmMU=",
@@ -86,7 +86,7 @@
                        "url":  "_content/MindExecution.Shared/js/mind-map-core.js.backup"
                    },
                    {
-                       "hash":  "sha256-04ZcgwZFW2ICQSVXCeuy61QLIexXoiGLVAIR1UDv3UQ=",
+                       "hash":  "sha256-g1BhxjO7bWZgkU1pMxOmGH/Z3n7XsZQYBIx31/Ptsu0=",
                        "url":  "_content/MindExecution.Shared/js/mind-map-css3d-manager.js"
                    },
                    {

package/wwwroot/service-worker.js

@@ -1,4 +1,4 @@
-/* Manifest version: PVMqIJP0 */
+/* Manifest version: MEKEGiqN */
 // Hosted deployments should prefer the network over stale offline caches.
 // This service worker immediately clears old Blazor offline caches and unregisters itself.