@myagentroam/node 0.11.38 → 0.11.39

package/dist/runner/mar-agent/conversation-normalizer.js

@@ -286,12 +286,18 @@ export class MarAgentConversationNormalizer {
             !state.active ||
             state.toolName !== toolName ||
             state.executionId !== executionId ||
-            (state.turnId !== undefined && turnId !== undefined && state.turnId !== turnId) ||
-            state.commandOrigin === undefined)
+            (state.turnId !== undefined && turnId !== undefined && state.turnId !== turnId))
             return [];
         const input = record(state.input);
         if (typeof input?.processId === 'string' && input.processId !== output.processId)
             return [];
+        if (state.commandOrigin === undefined) {
+            if (toolName !== 'exec_wait')
+                return [];
+            return [
+                genericToolItem(state.itemId, toolName, 'IN_PROGRESS', state.input, snapshot.outputPreview, null, snapshot.truncated)
+            ];
+        }
         const command = this.#commands.get(state.commandOrigin);
         if (command === undefined || command.status !== 'IN_PROGRESS')
             return [];
@@ -864,7 +870,7 @@ function genericToolItem(id, toolName, status, input, outputSummary = null, erro
             truncated: truncated || source.length > 10_000 || output.length > 10_000
         }, status, 'Code execution');
     }
-    if (toolName === 'code_exec_wait') {
+    if (toolName === 'code_exec_wait' || toolName === 'exec_wait') {
         const inputRecord = record(input);
         const action = typeof inputRecord?.action === 'string' ? inputRecord.action : 'poll';
         const inputSummary = compactRunnerValue(input, 10_000);
@@ -890,7 +896,7 @@ function genericToolItem(id, toolName, status, input, outputSummary = null, erro
                 inputSummary.truncated ||
                 result?.truncated === true ||
                 resultSummary.length > 10_000
-        }, status, 'Code execution wait');
+        }, status, toolName === 'code_exec_wait' ? 'Code execution wait' : 'Command wait');
     }
     const subagent = marAgentSubagentProjection(toolName, input, output, subagentTitle, knownSubagentDetails);
     const toolCategory = isImageGenerationTool(toolName) ? 'IMAGE_GENERATION' : undefined;

package/dist/runner/mar-agent/managed-run-controller.js

@@ -1,6 +1,6 @@
 import { marAgentEnvelopeInput, resolveMarAgentExecutionInput } from './execution-input.js';
 export { resolveRunModels } from './execution-input.js';
-import { NODE_MCP } from '../../mcp/naming.js';
+import { NODE_MCP, NODE_COMPUTER_WAIT_TOOL_NAME } from '../../mcp/naming.js';
 import { computerUseHostSkill } from './computer-use-skill.js';
 import { marctlExecutionEnvironment, marctlHostSkill } from './marctl-skill.js';
 import { createHash, randomUUID } from 'node:crypto';
@@ -291,6 +291,7 @@ export class MarAgentManagedRunController {
                 sessionId: runtime.session.id,
                 mode: input.mode,
                 enabled: input.computerUseEnabled === true,
+                signal: controller.signal,
                 modelSupportsImages: input.model.inputCapabilities.includes('IMAGE')
             });
             use.assertUsable();
@@ -344,7 +345,9 @@ export class MarAgentManagedRunController {
                     const computer = nodeTools.map((definition) => ({
                         definition,
                         serverId: NODE_MCP.computer.name,
-                        rawName: NODE_MCP.computer.tools.exec,
+                        rawName: definition.name === NODE_COMPUTER_WAIT_TOOL_NAME
+                            ? NODE_MCP.computer.tools.wait
+                            : NODE_MCP.computer.tools.exec,
                         sourceIdentity: `node:${input.runId}:computer`,
                         definitionRevision: createHash('sha256')
                             .update(JSON.stringify(definition))
@@ -540,6 +543,9 @@ export class MarAgentManagedRunController {
         finally {
             titleController.abort();
             const cleanup = [
+                async () => {
+                    await computerUseBinding?.close();
+                },
                 async () => {
                     await titleTask;
                 },
@@ -549,9 +555,6 @@ export class MarAgentManagedRunController {
                 async () => {
                     await closeImageCredentialProviders(executionModels);
                 },
-                async () => {
-                    await computerUseBinding?.close();
-                },
                 async () => {
                     runtime?.host.unbindExecutionMcp(executionMcpBinding);
                 },

package/dist/service/computer-use-enablement-service.js

@@ -1,5 +1,7 @@
 import { computerUseDisableInputSchema, computerUseEnableInputSchema, computerUseEnableResultSchema } from '@myagentroam/protocol';
 import { computerUseRuntimeExecutable, saveNodeConfig } from '../config.js';
+import { ComputerUseRuntimeError } from '../computer-use-runtime.js';
+import { ComputerUseError } from '../computer-use/contracts.js';
 import { nodeOperationData } from '../connection/node-operation-data.js';
 /** Persists Computer Use authorization and owns its asynchronous capability probe. */
 export class ComputerUseEnablementService {
@@ -17,8 +19,8 @@ export class ComputerUseEnablementService {
     }
     operations() {
         return {
-            'computer.use.enable': (data) => this.enable(data),
-            'computer.use.disable': (data) => this.disable(data)
+            'computer.use.enable': (data) => this.options.mutations.run(() => this.enable(data)),
+            'computer.use.disable': (data) => this.options.mutations.run(() => this.disable(data))
         };
     }
     initialize() {
@@ -107,9 +109,13 @@ export class ComputerUseEnablementService {
         });
         void this.options.provider
             .reset()
-            .then(() => this.options.prepareRuntime())
-            .then(() => this.options.provider.support())
-            .then((support) => {
+            .then(async () => {
+            if (generation !== this.#probeGeneration)
+                return;
+            await this.options.prepareRuntime();
+            if (generation !== this.#probeGeneration)
+                return;
+            const support = await this.options.provider.support();
             if (generation !== this.#probeGeneration)
                 return;
             this.#set(this.#fromSupport(support));
@@ -117,8 +123,8 @@ export class ComputerUseEnablementService {
             .catch((error) => {
             if (generation !== this.#probeGeneration)
                 return;
-            this.#set(this.#unavailable(error instanceof Error && /^[A-Z][A-Z0-9_]{0,79}$/u.test(error.message)
-                ? error.message
+            this.#set(this.#unavailable(error instanceof ComputerUseError || error instanceof ComputerUseRuntimeError
+                ? error.code
                 : 'COMPUTER_PROBE_FAILED'));
         });
     }

package/dist/service/conversation-hosting-enablement-service.js

@@ -9,8 +9,8 @@ export class ConversationHostingEnablementService {
     }
     operations() {
         return {
-            'conversation.hosting.enable': (data) => this.enable(data),
-            'conversation.hosting.disable': (data) => this.disable(data)
+            'conversation.hosting.enable': (data) => this.options.mutations.run(() => this.enable(data)),
+            'conversation.hosting.disable': (data) => this.options.mutations.run(() => this.disable(data))
         };
     }
     async disable(data) {

package/dist/service/node-config-mutations.js

@@ -0,0 +1,27 @@
+/** Serializes runtime configuration writes, including transient state and rollback. */
+export class NodeConfigMutations {
+    #pending;
+    run(operation) {
+        const previous = this.#pending;
+        let release;
+        const pending = new Promise((resolve) => {
+            release = resolve;
+        });
+        this.#pending = pending;
+        const finish = () => {
+            if (this.#pending === pending)
+                this.#pending = undefined;
+            release();
+        };
+        let result;
+        try {
+            // Start an uncontended mutation synchronously so disable closes admission before yielding.
+            result = previous === undefined ? operation() : previous.then(operation);
+        }
+        catch (error) {
+            result = Promise.reject(error);
+        }
+        void result.then(finish, finish);
+        return result;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/node",
-  "version": "0.11.38",
+  "version": "0.11.39",
   "description": "MyAgentRoam Node runtime CLI.",
   "license": "Apache-2.0 AND GPL-2.0-or-later",
   "type": "module",
@@ -38,10 +38,10 @@
     "sharp": "0.35.5",
     "ws": "^8.21.3",
     "zod": "4.4.3",
-    "@myagentroam/agent": "0.11.38",
+    "@myagentroam/agent": "0.11.39",
     "@myagentroam/code-navigation": "0.11.1",
-    "@myagentroam/marctl": "0.11.3",
-    "@myagentroam/protocol": "0.11.38"
+    "@myagentroam/marctl": "0.11.4",
+    "@myagentroam/protocol": "0.11.39"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"
@@ -62,6 +62,7 @@
     "dev": "tsx watch src/main.ts",
     "start": "node dist/main.js",
     "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:real": "vitest run --config vitest.e2e.config.mts",
+    "test:e2e:computer-use:windows": "node --test test/e2e/computer-use-windows.test.mjs"
   }
 }