@myagentroam/node 0.13.13 → 0.13.15

package/dist/connector.js

@@ -13,7 +13,7 @@ import { NodeModelUsageService } from './service/model-usage-service.js';
 import { dirname, resolve } from 'node:path';
 import { homedir } from 'node:os';
 import WebSocket from 'ws';
-import { createEnvelope, directNodeCommandSchema, remoteDesktopDescriptionSchema } from '@myagentroam/protocol';
+import { createEnvelope, directNodeCommandSchema, remoteDesktopDescriptionSchema, remoteDesktopDescribeInputSchema } from '@myagentroam/protocol';
 import { loadNodeConfig, computerUseRuntimeExecutable, directTransferUdpPortRange, nodeDataDirectory, nodeDatabasePath } from './config.js';
 import { NodeMetrics, nodeLog } from './operational.js';
 import { assertLocalSqlitePath } from './storage.js';
@@ -1550,16 +1550,30 @@ export class NodeConnector {
             service: this.agentNetworkService,
             observations: this.agentNetworkObservations
         }));
-        this.operationRouter.register('desktop.describe', async () => {
+        this.operationRouter.register('desktop.describe', async (data) => {
+            if (!isPlainRecord(data))
+                throw new RemoteDesktopError('DESKTOP_TOPOLOGY_UNAVAILABLE');
+            const { __workspaceWatchSessionHash: _sessionHash, __requestUserId: _userId, __usageGrant: _usageGrant, __marctlCaller: _caller, ...input } = data;
+            const parsed = remoteDesktopDescribeInputSchema.safeParse(input);
+            if (!parsed.success)
+                throw new RemoteDesktopError('DESKTOP_TOPOLOGY_UNAVAILABLE');
+            const selection = parsed.data;
             const runtime = this.desktopRuntime;
             if (!runtime)
                 throw new RemoteDesktopError('DESKTOP_UNAVAILABLE');
             if (runtime instanceof WindowsRemoteDesktopRuntime ||
                 runtime instanceof MacosRemoteDesktopRuntime)
                 await runtime.refresh(AbortSignal.timeout(10_000));
-            const description = remoteDesktopDescriptionSchema.safeParse(runtime.describe());
+            const description = remoteDesktopDescriptionSchema.safeParse(runtime instanceof MacosRemoteDesktopRuntime
+                ? runtime.describe(selection)
+                : runtime.describe());
             if (!description.success)
                 throw new RemoteDesktopError('DESKTOP_TOPOLOGY_UNAVAILABLE');
+            if ((selection.desktopGeneration !== undefined &&
+                selection.desktopGeneration !== description.data.desktopGeneration) ||
+                (selection.displayId !== undefined &&
+                    !description.data.displays.some((display) => display.displayId === selection.displayId)))
+                throw new RemoteDesktopError('DESKTOP_TOPOLOGY_UNAVAILABLE');
             return description.data;
         });
         this.operationRouter.registerAll(this.promptCompletion.operations());

package/dist/marctl/package.json

@@ -1 +1 @@
-{"type":"module","version":"0.13.13"}
+{"type":"module","version":"0.13.15"}

package/dist/marctl/src/config.mjs

@@ -27,13 +27,7 @@ export function validateServerUrl(value, translate = createTranslator()) {
     throw new MarctlError(translate('errors.serverUrlInvalid'));
   }
 
-  const isLoopbackHttp =
-    url.protocol === 'http:' &&
-    (url.hostname === 'localhost' ||
-      url.hostname === '127.0.0.1' ||
-      url.hostname === '::1' ||
-      url.hostname === '[::1]');
-  if (url.protocol !== 'https:' && !isLoopbackHttp)
+  if (url.protocol !== 'https:' && url.protocol !== 'http:')
     throw new MarctlError(translate('errors.serverUrlTransport'));
   if (url.username || url.password || url.search || url.hash || url.pathname !== '/')
     throw new MarctlError(translate('errors.serverUrlOrigin'));

package/dist/marctl/src/i18n/en-US.mjs

@@ -234,7 +234,7 @@ No configuration, authorization, or Server connection is required.`
     userContextUnavailable: 'This Node session has no valid marctl user authorization.',
     sessionContextRequired: 'No current Session is available; specify a Session ID explicitly.',
     serverUrlInvalid: 'MAR_CTL_SERVER_URL is invalid.',
-    serverUrlTransport: 'MAR_CTL_SERVER_URL must use HTTPS or loopback HTTP.',
+    serverUrlTransport: 'MAR_CTL_SERVER_URL must use HTTP or HTTPS.',
     serverUrlOrigin: 'MAR_CTL_SERVER_URL must be an origin without credentials or query data.',
     fetchUnavailable: 'Fetch is unavailable in this Node.js runtime.',
     serverInvalidNodes: 'The server returned an invalid node list.',

package/dist/marctl/src/i18n/zh-CN.mjs

@@ -220,7 +220,7 @@ ${configurationHelp}`,
     userContextUnavailable: '此 Node 会话没有有效的 marctl 用户授权。',
     sessionContextRequired: '当前上下文没有会话，请显式指定会话 ID。',
     serverUrlInvalid: 'MAR_CTL_SERVER_URL 无效。',
-    serverUrlTransport: 'MAR_CTL_SERVER_URL 必须使用 HTTPS 或回环 HTTP。',
+    serverUrlTransport: 'MAR_CTL_SERVER_URL 必须使用 HTTP 或 HTTPS。',
     serverUrlOrigin: 'MAR_CTL_SERVER_URL 必须是不含凭据或查询参数的 Origin。',
     fetchUnavailable: '当前 Node.js 运行时没有 Fetch。',
     serverInvalidNodes: 'Server 返回的节点列表无效。',

package/dist/remote-desktop/macos-remote-desktop-runtime.js

@@ -55,67 +55,161 @@ async function queryScreens(binary, signal) {
         throw new RemoteDesktopError('DESKTOP_TOPOLOGY_UNAVAILABLE');
     return parsed.displays;
 }
-/** Owns the current interactive macOS desktop layout and one shared macVNC backend. */
+/** Owns per-display capture identities and backend pools; selecting a display never changes another page. */
 export class MacosRemoteDesktopRuntime {
     options;
-    #pool;
-    #generation = randomUUID();
-    #layout;
+    #pools = new Set();
+    #entries = new Map();
+    #screens = [];
     #signature = '';
     #revision = 0;
     #disposed = false;
+    #topologyAvailable = false;
+    #refreshTail = Promise.resolve();
     constructor(options) {
         this.options = options;
-        this.#pool = new TigerVncBackendPool((signal, onUnexpectedExit) => MacVncManagedProcess.start({ binaryPath: options.binaryPath, onUnexpectedExit }, signal), () => options.fence('DESKTOP_BACKEND_CLOSED'));
+    }
+    #createPool(displayId) {
+        const pool = new TigerVncBackendPool(async (signal, onUnexpectedExit) => {
+            const signature = this.#signature;
+            const screens = await this.#probeTopology(signal);
+            if (JSON.stringify(screens) !== this.#signature)
+                this.#invalidateTopology();
+            const displayIndex = screens.findIndex((screen) => screen.id === displayId);
+            if (this.#disposed ||
+                !this.#topologyAvailable ||
+                displayIndex < 0 ||
+                this.#signature !== signature)
+                throw new RemoteDesktopError('DESKTOP_TOPOLOGY_UNAVAILABLE');
+            const backend = await MacVncManagedProcess.start({ binaryPath: this.options.binaryPath, displayIndex, onUnexpectedExit }, signal);
+            // The pool owns cleanup before the post-launch check can fail. A failed stop
+            // must retain the backend/reference so its attachment can retry cleanup.
+            return {
+                stop: () => backend.stop(),
+                connect: async (maxPixels, connectSignal) => {
+                    const current = await this.#probeTopology(connectSignal);
+                    if (JSON.stringify(current) !== this.#signature)
+                        this.#invalidateTopology();
+                    if (this.#disposed || !this.#topologyAvailable || this.#signature !== signature)
+                        throw new RemoteDesktopError('DESKTOP_TOPOLOGY_UNAVAILABLE');
+                    return backend.connect(maxPixels, connectSignal);
+                }
+            };
+        }, () => this.options.fence('DESKTOP_BACKEND_CLOSED'));
+        this.#pools.add(pool);
+        return pool;
     }
     static async start(options, signal) {
         const runtime = new MacosRemoteDesktopRuntime(options);
         await runtime.refresh(signal);
         return runtime;
     }
-    async refresh(signal) {
-        const screens = (await queryScreens(this.options.topologyBinary, signal)).sort((left, right) => left.id - right.id);
+    refresh(signal) {
+        const result = this.#refreshTail.then(() => this.#refresh(signal));
+        this.#refreshTail = result.catch(() => { });
+        return result;
+    }
+    #invalidateTopology() {
+        const wasAvailable = this.#topologyAvailable;
+        this.#topologyAvailable = false;
+        if (wasAvailable)
+            this.options.fence('DESKTOP_TOPOLOGY_UNAVAILABLE');
+    }
+    async #probeTopology(signal) {
+        if (this.#disposed)
+            throw new RemoteDesktopError('DESKTOP_BACKEND_CLOSED');
+        try {
+            return await queryScreens(this.options.topologyBinary, signal);
+        }
+        catch (error) {
+            // Closing one page aborts its probe; it is not evidence of desktop loss.
+            if (!signal.aborted)
+                this.#invalidateTopology();
+            throw error;
+        }
+    }
+    async #refresh(signal) {
+        // Keep native enumeration order: macVNC's -display takes an index, not a display ID.
+        const screens = await this.#probeTopology(signal);
         const signature = JSON.stringify(screens);
         if (this.#disposed)
             throw new RemoteDesktopError('DESKTOP_BACKEND_CLOSED');
-        if (signature === this.#signature)
+        if (signature === this.#signature && this.#topologyAvailable)
             return;
-        const layout = macosCombinedDesktopLayout(screens.filter((screen) => screen.primary), this.#generation, this.#revision + 1);
-        if (layout.framebuffer.width * layout.framebuffer.height > this.options.maxPixels)
+        // Revoke old captures before validating new geometry. A failed probe/layout
+        // must not leave the previous grants current or revive them after recovery.
+        this.#invalidateTopology();
+        const selectableDisplays = screens.map((screen) => ({
+            displayId: `display_${screen.id}`,
+            name: `Display ${screen.id}`,
+            primary: screen.primary
+        }));
+        const layouts = screens.map((screen) => {
+            const displayId = `display_${screen.id}`;
+            const layout = remoteDesktopDescriptionSchema.parse({
+                ...macosCombinedDesktopLayout([{ ...screen, primary: true }], this.#entries.get(displayId)?.layout.desktopGeneration ?? randomUUID(), this.#revision + 1),
+                selectableDisplays
+            });
+            if (layout.framebuffer.width * layout.framebuffer.height > this.options.maxPixels)
+                throw new RemoteDesktopError('DESKTOP_TOPOLOGY_UNAVAILABLE');
+            return { screen, displayId, layout };
+        });
+        if (!layouts.length)
             throw new RemoteDesktopError('DESKTOP_TOPOLOGY_UNAVAILABLE');
-        if (this.#layout)
-            this.options.fence('DESKTOP_TOPOLOGY_UNAVAILABLE');
+        this.#entries = new Map(layouts.map(({ screen, displayId, layout }) => [
+            displayId,
+            { layout, pool: this.#entries.get(displayId)?.pool ?? this.#createPool(screen.id) }
+        ]));
+        this.#screens = screens;
         this.#signature = signature;
         this.#revision++;
-        this.#layout = layout;
+        this.#topologyAvailable = true;
     }
-    describe() {
-        if (this.#disposed || !this.#layout || !this.#pool.isAvailable())
+    describe(selection = {}) {
+        const entry = selection.desktopGeneration !== undefined
+            ? [...this.#entries.values()].find((candidate) => candidate.layout.desktopGeneration === selection.desktopGeneration)
+            : this.#entries.get(selection.displayId ?? `display_${this.#screens.find((screen) => screen.primary)?.id}`);
+        if (this.#disposed)
             throw new RemoteDesktopError('DESKTOP_BACKEND_CLOSED');
-        return structuredClone(this.#layout);
+        if (!this.#topologyAvailable)
+            throw new RemoteDesktopError('DESKTOP_TOPOLOGY_UNAVAILABLE');
+        if (!entry)
+            throw new RemoteDesktopError('DESKTOP_TOPOLOGY_UNAVAILABLE');
+        if (!entry.pool.isAvailable())
+            throw new RemoteDesktopError('DESKTOP_BACKEND_CLOSED');
+        return structuredClone(entry.layout);
     }
     isCurrent = (command) => !this.#disposed &&
-        this.#pool.isAvailable() &&
-        !!this.#layout &&
-        this.#layout.desktopGeneration === command.desktopGeneration &&
-        this.#layout.topologyRevision === command.topologyRevision;
-    createAttachment = (command, frontend, callbacks) => new PooledDesktopAttachment(this.#pool, frontend, (backend) => new RemoteDesktopAttachment({
-        attachmentId: command.attachmentId,
-        frontend,
-        backend,
-        mode: command.mode,
-        maxPixels: this.options.maxPixels,
-        isCurrentTopology: (width, height) => this.isCurrent(command) &&
-            this.#layout?.framebuffer.width === width &&
-            this.#layout.framebuffer.height === height,
-        onAttached: callbacks.attached,
-        onFailure: callbacks.failed
-    }));
+        this.#topologyAvailable &&
+        [...this.#entries.values()].some((entry) => entry.pool.isAvailable() &&
+            entry.layout.desktopGeneration === command.desktopGeneration &&
+            entry.layout.topologyRevision === command.topologyRevision);
+    createAttachment = (command, frontend, callbacks) => {
+        const entry = [...this.#entries.values()].find((candidate) => candidate.layout.desktopGeneration === command.desktopGeneration);
+        if (!entry || !this.isCurrent(command))
+            throw new RemoteDesktopError('DESKTOP_TOPOLOGY_UNAVAILABLE');
+        return new PooledDesktopAttachment(entry.pool, frontend, (backend) => new RemoteDesktopAttachment({
+            attachmentId: command.attachmentId,
+            frontend,
+            backend,
+            mode: command.mode,
+            maxPixels: this.options.maxPixels,
+            isCurrentTopology: (width, height) => this.isCurrent(command) &&
+                entry.layout.framebuffer.width === width &&
+                entry.layout.framebuffer.height === height,
+            onAttached: callbacks.attached,
+            onFailure: callbacks.failed
+        }));
+    };
     async dispose() {
         if (!this.#disposed) {
             this.#disposed = true;
             this.options.fence('DESKTOP_SESSION_UNAVAILABLE');
         }
-        await this.#pool.dispose();
+        const results = await Promise.allSettled([...this.#pools].map((pool) => pool.dispose()));
+        for (const result of results)
+            if (result.status === 'rejected')
+                throw result.reason;
+        this.#pools.clear();
     }
 }

package/dist/remote-desktop/macvnc-managed-process.js

@@ -47,6 +47,11 @@ export class MacVncManagedProcess {
     static async start(options, signal) {
         if (process.platform !== 'darwin' || !isAbsolute(options.binaryPath))
             throw new RemoteDesktopError('DESKTOP_BACKEND_CONFIG_INVALID');
+        if (options.displayIndex !== undefined &&
+            (!Number.isInteger(options.displayIndex) ||
+                options.displayIndex < 0 ||
+                options.displayIndex >= 64))
+            throw new RemoteDesktopError('DESKTOP_BACKEND_CONFIG_INVALID');
         const deadline = AbortSignal.any([signal, AbortSignal.timeout(10_000)]);
         if (deadline.aborted)
             throw new RemoteDesktopError('DESKTOP_SETUP_CANCELLED');
@@ -79,7 +84,8 @@ export class MacVncManagedProcess {
                 '127.0.0.1',
                 '-rfbauth',
                 config,
-                '-alwaysshared'
+                '-alwaysshared',
+                ...(options.displayIndex === undefined ? [] : ['-display', String(options.displayIndex)])
             ], {
                 cwd: dirname(options.binaryPath),
                 windowsHide: true,

package/dist/service/node-request-service.js

@@ -47,7 +47,7 @@ export class NodeRequestService {
                 await this.options.authorizeMarctlOperation(marctlCaller, payload.operation, payload.data, authorization.userId);
             }
             const usageGrant = payload.userAuthorization.usageGrant;
-            const data = payload.data !== null && typeof payload.data === 'object'
+            const data = payload.data !== null && typeof payload.data === 'object' && !Array.isArray(payload.data)
                 ? (() => {
                     const { __marctlCaller: _untrustedCaller, __usageGrant: _untrustedGrant, __marctlExecutionResources: _untrustedExecutionResources, __requestAbortSignal: _untrustedSignal, ...input } = payload.data;
                     return {

package/dist/service/node-upgrade-reporter.js

@@ -18,11 +18,7 @@ export class NodeUpgradeReporter {
             endpoint.protocol = 'http:';
         if (endpoint.protocol === 'wss:')
             endpoint.protocol = 'https:';
-        if (endpoint.username ||
-            endpoint.password ||
-            (endpoint.protocol !== 'https:' &&
-                !(endpoint.protocol === 'http:' &&
-                    ['localhost', '127.0.0.1', '[::1]'].includes(endpoint.hostname))))
+        if (endpoint.username || endpoint.password || !['http:', 'https:'].includes(endpoint.protocol))
             throw new Error('NODE_UPGRADE_REPORT_ORIGIN_INVALID');
         endpoint.pathname = `/api/nodes/${encodeURIComponent(nodeId)}/upgrade/report`;
         endpoint.search = '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/node",
-  "version": "0.13.13",
+  "version": "0.13.15",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/myagentroam/mar.git",
@@ -37,7 +37,7 @@
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "0.3.233",
     "@modelcontextprotocol/sdk": "1.32.0",
-    "@myagentroam/binaries": "0.10.3",
+    "@myagentroam/binaries": "0.10.4",
     "@opencode-ai/sdk": "1.18.20",
     "minimatch": "^10.2.6",
     "node-datachannel": "0.33.4",
@@ -49,13 +49,13 @@
     "turndown-plugin-gfm": "^1.0.2",
     "ws": "^8.21.3",
     "zod": "4.4.3",
-    "@myagentroam/protocol": "0.13.13",
-    "@myagentroam/agent": "0.13.13"
+    "@myagentroam/agent": "0.13.15",
+    "@myagentroam/protocol": "0.13.15"
   },
   "devDependencies": {
     "@types/turndown": "^5.0.6",
     "@types/ws": "^8.18.1",
-    "@myagentroam/marctl": "0.13.13",
+    "@myagentroam/marctl": "0.13.15",
     "@myagentroam/code-navigation": "0.11.1"
   },
   "exports": {
@@ -76,6 +76,7 @@
     "test:unit": "vitest run --config vitest.config.mts && node --test test/unit/*.test.mjs",
     "test:e2e:real": "vitest run --config vitest.e2e.config.mts",
     "test:e2e:computer-use:windows": "node --test test/e2e/computer-use-windows.test.mjs",
-    "test:e2e:remote-desktop:windows": "node --test test/e2e/remote-desktop-windows.test.mjs"
+    "test:e2e:remote-desktop:windows": "node --test test/e2e/remote-desktop-windows.test.mjs",
+    "test:e2e:remote-desktop:macos": "node --test test/e2e/remote-desktop-macos.test.mjs"
   }
 }