@myagentroam/node 0.9.149 → 0.9.151

package/dist/runner/mar-agent/hosted-conversation-runtime.js

@@ -152,8 +152,6 @@ export class MarAgentHostedConversationRuntime {
                         await input.onEvent?.(projected);
                 }
                 const result = await execution.result();
-                if (result.status === 'cancelled')
-                    titleController.abort();
                 const generatedTitle = await titleTask;
                 if (generatedTitle && !titleController.signal.aborted)
                     await agent
@@ -203,25 +201,31 @@ export class MarAgentHostedConversationRuntime {
             cancel: () => {
                 if (settled || this.#active.get(input.sessionId)?.handle !== handle)
                     return false;
-                titleController.abort();
                 execution.cancel();
                 return true;
             }
         };
-        this.#active.set(input.sessionId, { handle, completion });
+        this.#active.set(input.sessionId, {
+            handle,
+            completion,
+            cancelTitle: () => titleController.abort()
+        });
         return handle;
     }
     async releaseSession(input) {
         const active = this.#active.get(input.sessionId);
         if (active === undefined)
             return;
+        active.cancelTitle();
         active.handle.cancel();
         await active.completion.catch(() => undefined);
     }
     async dispose() {
         const active = [...this.#active.values()];
-        for (const execution of active)
+        for (const execution of active) {
+            execution.cancelTitle();
             execution.handle.cancel();
+        }
         await Promise.allSettled(active.map((execution) => execution.completion));
     }
     async #readGeneratedTitle(homeDirectory, sessionId) {

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

@@ -52,11 +52,15 @@ export class MarAgentManagedRunController {
             return this.#disposePromise;
         this.#disposed = true;
         this.#disposePromise = (async () => {
-            for (const execution of this.#executions.values())
+            for (const execution of this.#executions.values()) {
+                execution.cancelTitle();
                 execution.cancel();
+            }
             await Promise.allSettled([...new Set(this.#runtimeAcquisitions.values())]);
-            for (const execution of this.#executions.values())
+            for (const execution of this.#executions.values()) {
+                execution.cancelTitle();
                 execution.cancel();
+            }
             await Promise.all([...new Set(this.#sessionRuntimes.values())].map((runtime) => this.#releaseRuntime(runtime)));
             await this.#mcpClients.close();
             await this.#computerUse?.dispose();
@@ -74,8 +78,11 @@ export class MarAgentManagedRunController {
                 await this.#computerUse?.releaseSession(sessionId);
                 return;
             }
-            if (runtime.activeRunId !== undefined)
-                this.#executions.get(runtime.activeRunId)?.cancel();
+            if (runtime.activeRunId !== undefined) {
+                const execution = this.#executions.get(runtime.activeRunId);
+                execution?.cancelTitle();
+                execution?.cancel();
+            }
             await this.#releaseRuntime(runtime);
             await Promise.all([
                 this.#computerUse?.releaseSession(sessionId),
@@ -212,7 +219,7 @@ export class MarAgentManagedRunController {
         if (!execution)
             return false;
         execution.cancel();
-        this.host.emit(runId, 'run.cancelling', { intent }, 'RUNNING');
+        this.host.emit(runId, 'run.cancelling', { intent });
         return true;
     }
     respondUserInput(runId, requestId, answers) {
@@ -229,6 +236,20 @@ export class MarAgentManagedRunController {
         return true;
     }
     async run(input) {
+        const controller = new AbortController();
+        const titleController = new AbortController();
+        let cancelExecution;
+        // Own cancellation before any asynchronous preparation, not only after SDK admission.
+        this.#executions.set(input.runId, {
+            cancel: () => {
+                if (controller.signal.aborted)
+                    return;
+                controller.abort();
+                titleController.abort();
+                cancelExecution?.();
+            },
+            cancelTitle: () => titleController.abort()
+        });
         this.host.active.add(input.runId);
         this.host.adopt({
             runId: input.runId,
@@ -246,9 +267,10 @@ export class MarAgentManagedRunController {
         let executionMcpBinding;
         let computerUseBinding;
         let executionModels = [];
-        const titleController = new AbortController();
         let titleTask;
+        let cancelledDuringPreparation = false;
         try {
+            controller.signal.throwIfAborted();
             const sessionKey = input.externalSessionId ?? input.sessionId;
             // Reserve both identities while opening so a concurrent release can await the same runtime.
             const acquisitionKeys = [...new Set([sessionKey, input.sessionId])];
@@ -266,6 +288,7 @@ export class MarAgentManagedRunController {
                     if (this.#runtimeAcquisitions.get(key) === acquisition)
                         this.#runtimeAcquisitions.delete(key);
             }
+            controller.signal.throwIfAborted();
             if (this.#disposed ||
                 this.#sessionReleases.has(sessionKey) ||
                 this.#sessionReleases.has(input.sessionId) ||
@@ -277,6 +300,7 @@ export class MarAgentManagedRunController {
                 throw new Error('MAR_AGENT_SESSION_RUNTIME_ACTIVE');
             runtime.activeRunId = input.runId;
             await runtime.mcpLease.pool.refreshForExecution();
+            controller.signal.throwIfAborted();
             const executionMcpServers = input.mcpServers
                 .filter(isExecutionScopedMcp)
                 .map((server) => ({ ...server, lifecycle: 'EXECUTION' }));
@@ -287,6 +311,7 @@ export class MarAgentManagedRunController {
                 enabled: input.computerUseEnabled === true,
                 modelSupportsImages: input.model.inputCapabilities.includes('IMAGE')
             });
+            controller.signal.throwIfAborted();
             if (this.#disposed ||
                 this.#sessionReleases.has(sessionKey) ||
                 this.#sessionReleases.has(input.sessionId) ||
@@ -302,6 +327,7 @@ export class MarAgentManagedRunController {
                     authorizationScope: runtime.session.id
                 });
             }
+            controller.signal.throwIfAborted();
             const userTools = executionMcpLease?.pool.definitions() ?? [];
             const nodeTools = computerUseBinding?.tools ?? [];
             if (userTools.some((tool) => tool.name.startsWith('mcp__computer__')))
@@ -371,6 +397,7 @@ export class MarAgentManagedRunController {
             const metadata = input.mode === 'compact' || !runtime.automaticTitleEnabled
                 ? undefined
                 : await runtime.agent.getSession(session.id).catch(() => undefined);
+            controller.signal.throwIfAborted();
             const handle = input.mode === 'plan'
                 ? session.plan({
                     ...runInput
@@ -378,12 +405,7 @@ export class MarAgentManagedRunController {
                 : input.mode === 'compact'
                     ? session.compact(runInput)
                     : session.run(runInput);
-            this.#executions.set(input.runId, {
-                cancel: () => {
-                    titleController.abort();
-                    handle.cancel();
-                }
-            });
+            cancelExecution = () => handle.cancel();
             this.host.emit(input.runId, 'run.running', {}, 'RUNNING');
             for await (const event of handle) {
                 if (event.type === 'execution.started' && metadata?.automaticTitlePending && !titleTask) {
@@ -398,8 +420,6 @@ export class MarAgentManagedRunController {
                 this.project(input.runId, event);
             }
             const result = await handle.result();
-            if (result.status === 'cancelled')
-                titleController.abort();
             const title = await titleTask;
             if (title && !titleController.signal.aborted)
                 await runtime.agent
@@ -427,20 +447,26 @@ export class MarAgentManagedRunController {
             }, status);
         }
         catch (error) {
-            if (runtime !== undefined)
-                this.#prepareRuntimeForTerminal(input.runId, runtime);
-            const projected = runnerErrorProjection(error, 'MAR_AGENT_RUN_FAILED');
-            this.host.emitItem(input.runId, {
-                itemId: boundedConversationItemId('mar-agent-error', input.runId),
-                kind: 'error',
-                status: 'FAILED',
-                payload: {
-                    ...projected,
-                    recoverable: true,
-                    retryAfterMs: null
-                }
-            });
-            this.host.emit(input.runId, 'run.failed', projected, 'FAILED');
+            if (controller.signal.aborted && cancelExecution === undefined) {
+                // Keep the Run owned until preparation and its resources actually settle.
+                cancelledDuringPreparation = true;
+            }
+            else {
+                if (runtime !== undefined)
+                    this.#prepareRuntimeForTerminal(input.runId, runtime);
+                const projected = runnerErrorProjection(error, 'MAR_AGENT_RUN_FAILED');
+                this.host.emitItem(input.runId, {
+                    itemId: boundedConversationItemId('mar-agent-error', input.runId),
+                    kind: 'error',
+                    status: 'FAILED',
+                    payload: {
+                        ...projected,
+                        recoverable: true,
+                        retryAfterMs: null
+                    }
+                });
+                this.host.emit(input.runId, 'run.failed', projected, 'FAILED');
+            }
         }
         finally {
             titleController.abort();
@@ -449,14 +475,16 @@ export class MarAgentManagedRunController {
                 delete runtime.automaticTitleTask;
             this.clearInteractions(input.runId);
             this.#normalizers.delete(input.runId);
-            this.host.active.delete(input.runId);
-            this.#executions.delete(input.runId);
             await closeImageCredentialProviders(executionModels);
             await computerUseBinding?.close().catch(() => undefined);
             runtime?.host.unbindExecutionMcp(executionMcpBinding);
             await executionMcpLease?.release().catch(() => undefined);
             if (runtime !== undefined)
                 await this.#finishRuntimeExecution(input.runId, runtime).catch(() => undefined);
+            this.host.active.delete(input.runId);
+            this.#executions.delete(input.runId);
+            if (cancelledDuringPreparation)
+                this.host.emit(input.runId, 'run.cancelled', { status: 'CANCELLED' }, 'CANCELLED');
         }
     }
     #prepareRuntimeForTerminal(runId, runtime) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/node",
-  "version": "0.9.149",
+  "version": "0.9.151",
   "description": "MyAgentRoam Node runtime CLI.",
   "license": "Apache-2.0 AND GPL-2.0-or-later",
   "type": "module",
@@ -34,10 +34,10 @@
     "npm": "11.12.1",
     "ws": "^8.21.3",
     "zod": "4.4.3",
+    "@myagentroam/marctl": "0.9.120",
+    "@myagentroam/protocol": "0.9.151",
     "@myagentroam/code-navigation": "0.9.129",
-    "@myagentroam/agent": "0.9.149",
-    "@myagentroam/protocol": "0.9.149",
-    "@myagentroam/marctl": "0.9.120"
+    "@myagentroam/agent": "0.9.151"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"