@myagentroam/node 0.9.150 → 0.9.152

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

@@ -219,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) {
@@ -236,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,
@@ -253,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])];
@@ -273,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) ||
@@ -284,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' }));
@@ -294,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) ||
@@ -309,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__')))
@@ -378,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
@@ -385,10 +405,7 @@ export class MarAgentManagedRunController {
                 : input.mode === 'compact'
                     ? session.compact(runInput)
                     : session.run(runInput);
-            this.#executions.set(input.runId, {
-                cancel: () => handle.cancel(),
-                cancelTitle: () => titleController.abort()
-            });
+            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) {
@@ -430,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();
@@ -452,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/dist/service/conversation-segment-service.js

@@ -1,4 +1,4 @@
-const TURN_PAGE_SIZE = 30;
+const MAX_INITIAL_TURN_PAGE_SIZE = 30;
 function conversationSegmentPrefix(turn) {
     const user = turn.items.find((item) => item.kind === 'user_message');
     const payload = typeof user?.payload === 'object' && user.payload !== null && !Array.isArray(user.payload)
@@ -89,14 +89,16 @@ export class ConversationSegmentService {
         const boundary = input.cursor === undefined ? undefined : decodeCursor(input.cursor, session.id);
         const collected = [];
         const visited = new Set();
-        let turnCursor;
+        let turnCursor = boundary?.turnCursor ?? undefined;
+        let oldestTurnCursor = null;
         let locatingBoundary = boundary !== undefined;
         let hasOlder = false;
         let metadata;
         while (collected.length < limit) {
             const page = await this.readTurns(session, {
                 ...(turnCursor === undefined ? {} : { cursor: turnCursor }),
-                limit: TURN_PAGE_SIZE
+                // Preserve the bounded live window without crossing its deferred history boundary.
+                limit: boundary === undefined ? Math.min(limit, MAX_INITIAL_TURN_PAGE_SIZE) : 1
             });
             metadata ??= {
                 snapshotSequence: page.snapshotSequence,
@@ -123,6 +125,7 @@ export class ConversationSegmentService {
                 const take = eligible.slice(-remaining);
                 hasOlder = eligible.length > take.length || page.nextCursor !== null;
                 collected.unshift(...take);
+                oldestTurnCursor = turnCursor ?? null;
             }
             if (boundary === undefined && page.deferredOlderHistory === true)
                 break;
@@ -140,7 +143,8 @@ export class ConversationSegmentService {
             : encodeCursor({
                 version: 1,
                 sessionId: session.id,
-                beforeSegmentId: collected[0].id
+                beforeSegmentId: collected[0].id,
+                turnCursor: oldestTurnCursor
             });
         return {
             ...(metadata ?? {
@@ -164,7 +168,10 @@ function decodeCursor(value, sessionId) {
         if (decoded.version !== 1 ||
             decoded.sessionId !== sessionId ||
             typeof decoded.beforeSegmentId !== 'string' ||
-            decoded.beforeSegmentId.length === 0)
+            decoded.beforeSegmentId.length === 0 ||
+            (decoded.turnCursor !== undefined &&
+                decoded.turnCursor !== null &&
+                (typeof decoded.turnCursor !== 'string' || decoded.turnCursor.length === 0)))
             throw new Error('EVENT_CURSOR_INVALID');
         return decoded;
     }

package/package.json

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