@myagentroam/node 0.11.12 → 0.11.13

package/dist/runtime-state.js

@@ -44,7 +44,8 @@ export class NodeRuntimeState {
     queueVersions = new Map();
     /** Snapshot version of the last FIFO membership or ordering change. */
     queueOrderVersions = new Map();
-    pausedQueues = new Set();
+    /** Each pause owns its snapshot version so late admissions cannot undo a newer pause. */
+    pausedQueues = new Map();
     /** Bounded tombstones reject stale internal start envelopes after terminal cleanup. */
     terminalRunIds = new Map();
     /**
@@ -243,7 +244,7 @@ export class NodeRuntimeState {
         const queueVersion = this.queueVersions.get(id);
         const queueOrderVersion = this.queueOrderVersions.get(id);
         const lease = this.leases.get(id);
-        const paused = this.pausedQueues.has(id);
+        const pauseVersion = this.pausedQueues.get(id);
         this.sessions.delete(id);
         this.sessions.set(nativeSessionId, next);
         if (this.completeHistorySessions.delete(id))
@@ -284,9 +285,9 @@ export class NodeRuntimeState {
             this.leases.delete(id);
             this.leases.set(nativeSessionId, lease);
         }
-        if (paused) {
+        if (pauseVersion !== undefined) {
             this.pausedQueues.delete(id);
-            this.pausedQueues.add(nativeSessionId);
+            this.pausedQueues.set(nativeSessionId, pauseVersion);
         }
         for (const [key, submission] of [...this.messageSubmissions]) {
             if (!key.startsWith(`${id}\u0000`))
@@ -514,17 +515,27 @@ export class NodeRuntimeState {
     }
     consumeSteeredQueueItem(itemId, runId) {
         const item = this.requireQueueItem(itemId);
-        const run = this.getRun(runId);
+        const activeRun = this.getRun(runId);
+        const run = activeRun ?? this.terminalRunIds.get(runId);
         if (!run || run.sessionId !== item.sessionId || !this.receivingQueueItems.has(itemId))
             throw new Error('QUEUE_ITEM_INVALID');
         this.queuedItems.set(item.sessionId, (this.queuedItems.get(item.sessionId) ?? []).filter((id) => id !== itemId));
         this.queueItems.delete(itemId);
         this.bumpQueueVersion(item.sessionId);
-        this.messageSubmissions.set(`${item.sessionId}\u0000${item.clientMessageId}`, {
-            kind: 'run',
-            id: run.id
-        });
-        this.recentUserMessages.set(run.id, item.content);
+        const key = `${item.sessionId}\u0000${item.clientMessageId}`;
+        if (activeRun !== undefined) {
+            this.messageSubmissions.set(key, { kind: 'run', id: run.id });
+            this.recentUserMessages.set(run.id, item.content);
+        }
+        else {
+            this.messageSubmissions.delete(key);
+            this.rememberTerminalMessageSubmission(key, run.id);
+        }
+    }
+    rememberTerminalMessageSubmission(key, runId) {
+        this.terminalMessageSubmissions.set(key, runId);
+        if (this.terminalMessageSubmissions.size > 1_024)
+            this.terminalMessageSubmissions.delete(this.terminalMessageSubmissions.keys().next().value);
     }
     claimNextQueueItem(sessionId, content) {
         if (this.pausedQueues.has(sessionId))
@@ -586,8 +597,11 @@ export class NodeRuntimeState {
         return { run: created.run, turn };
     }
     pauseSessionQueue(sessionId) {
-        this.pausedQueues.add(sessionId);
         this.bumpQueueVersion(sessionId, false);
+        this.pausedQueues.set(sessionId, this.queueVersions.get(sessionId));
+    }
+    sessionQueuePauseVersion(sessionId) {
+        return this.pausedQueues.get(sessionId);
     }
     resumeSessionQueue(sessionId) {
         if (!this.pausedQueues.delete(sessionId))
@@ -1076,9 +1090,7 @@ export class NodeRuntimeState {
         for (const [key, candidate] of this.messageSubmissions)
             if (candidate.kind === 'run' && candidate.id === runId) {
                 this.messageSubmissions.delete(key);
-                this.terminalMessageSubmissions.set(key, runId);
-                if (this.terminalMessageSubmissions.size > 1_024)
-                    this.terminalMessageSubmissions.delete(this.terminalMessageSubmissions.keys().next().value);
+                this.rememberTerminalMessageSubmission(key, runId);
             }
         for (const [approvalId, approval] of this.approvals)
             if (approval.runId === runId || executionIds.has(approval.runId))

package/dist/service/continuous-run-coordinator.js

@@ -140,9 +140,9 @@ export class ContinuousRunCoordinator {
             this.options.runtime.currentExecutionId(active.id) === input.steerTarget.executionId) {
             const attempt = this.tryNativeSteer(input.submissionId, active, input.onNativeAccepted);
             if (attempt)
-                return attempt.then((accepted) => accepted
+                return attempt.task.then((accepted) => accepted
                     ? 'ACCEPTED'
-                    : this.suspended || this.options.stopped()
+                    : !this.nativeSteerPauseCurrent(attempt) || this.suspended || this.options.stopped()
                         ? 'QUEUED'
                         : this.settleFallback(input));
         }
@@ -164,6 +164,8 @@ export class ContinuousRunCoordinator {
             (input.steerTarget.executionId === undefined ||
                 this.options.runtime.currentExecutionId(active.id) === input.steerTarget.executionId);
         const intent = input.steerTarget !== undefined && !steering ? 'SEND' : input.intent;
+        if (active?.status === 'CANCELLING' && intent !== 'REPLACE_CURRENT')
+            return 'QUEUED';
         if (steering)
             this.prepareSteering(input.submissionId);
         const executionEnded = active !== undefined &&
@@ -255,9 +257,9 @@ export class ContinuousRunCoordinator {
         if (active) {
             const attempt = this.tryNativeSteer(itemId, active);
             if (attempt)
-                return attempt.then((accepted) => accepted
+                return attempt.task.then((accepted) => accepted
                     ? { run: active, delivery: 'ACCEPTED' }
-                    : this.suspended || this.options.stopped()
+                    : !this.nativeSteerPauseCurrent(attempt) || this.suspended || this.options.stopped()
                         ? { run: active, delivery: 'QUEUED' }
                         : this.executeQueueItemFallback(itemId));
         }
@@ -266,7 +268,7 @@ export class ContinuousRunCoordinator {
     tryNativeSteer(itemId, active, onAccepted) {
         const previous = this.steerInFlight.get(itemId);
         if (previous)
-            return previous.task;
+            return previous;
         if (this.suspended || this.options.stopped() || !this.options.steer || !this.canSteer(active))
             return undefined;
         const executionId = this.options.runtime.currentExecutionId(active.id);
@@ -275,6 +277,7 @@ export class ContinuousRunCoordinator {
         this.prepareSteering(itemId);
         const prepared = this.preparedInputs.get(itemId);
         const item = this.options.runtime.getQueueItem(itemId);
+        const pauseVersion = this.options.runtime.sessionQueuePauseVersion(item.sessionId);
         const release = this.options.runtime.reserveQueueItem(itemId);
         let attempt;
         try {
@@ -292,23 +295,29 @@ export class ContinuousRunCoordinator {
             .then(async (result) => {
             if (result.status === 'notAccepted')
                 return false;
+            const currentPrepared = this.preparedInputs.get(itemId) ?? prepared;
             onAccepted?.();
             this.options.runtime.consumeSteeredQueueItem(itemId, active.id);
             this.immediateQueueItems.delete(itemId);
-            this.options.runtime.resumeSessionQueue(item.sessionId);
+            if (this.nativeSteerPauseCurrent(admission))
+                this.options.runtime.resumeSessionQueue(admission.sessionId);
             this.options.clearImages(itemId);
-            if (prepared.goal !== undefined && this.goalCurrent(prepared)) {
+            if (currentPrepared.goal !== undefined && this.goalCurrent(currentPrepared)) {
                 const current = this.preparedInputs.get(executionId);
                 if (current !== undefined)
-                    this.preparedInputs.set(executionId, { ...current, goal: prepared.goal });
+                    this.preparedInputs.set(executionId, { ...current, goal: currentPrepared.goal });
             }
             try {
-                await this.options.afterExecutionSteered?.({ ...prepared, runId: executionId });
+                await this.options.afterExecutionSteered?.({
+                    ...currentPrepared,
+                    sessionId: admission.sessionId,
+                    runId: executionId
+                });
             }
             catch (error) {
                 nodeLog('queue.native_steer.continuation_failed', {
                     level: 'warn',
-                    sessionId: item.sessionId,
+                    sessionId: admission.sessionId,
                     executionId,
                     code: safeErrorCode(error, 'NATIVE_STEER_CONTINUATION_FAILED')
                 });
@@ -320,7 +329,7 @@ export class ContinuousRunCoordinator {
                     if (result.status === 'accepted')
                         this.options.emitRun(executionId, 'conversation.item', result.item);
                 },
-                () => this.publish(item.sessionId)
+                () => this.publish(admission.sessionId)
             ]) {
                 try {
                     notify();
@@ -328,7 +337,7 @@ export class ContinuousRunCoordinator {
                 catch {
                     nodeLog('queue.native_steer.notification_failed', {
                         level: 'warn',
-                        sessionId: item.sessionId,
+                        sessionId: admission.sessionId,
                         executionId
                     });
                 }
@@ -338,10 +347,14 @@ export class ContinuousRunCoordinator {
             .finally(() => {
             release();
             this.steerInFlight.delete(itemId);
-            this.schedule(item.sessionId);
+            this.schedule(admission.sessionId);
         });
-        this.steerInFlight.set(itemId, { sessionId: item.sessionId, task });
-        return task;
+        const admission = { sessionId: item.sessionId, pauseVersion, task };
+        this.steerInFlight.set(itemId, admission);
+        return admission;
+    }
+    nativeSteerPauseCurrent(admission) {
+        return (this.options.runtime.sessionQueuePauseVersion(admission.sessionId) === admission.pauseVersion);
     }
     async executeQueueItemFallback(itemId) {
         const item = this.requirePreparedItem(itemId);
@@ -669,6 +682,9 @@ export class ContinuousRunCoordinator {
         for (const [id, pending] of this.preparedInputs)
             if (pending.sessionId === previousId)
                 this.preparedInputs.set(id, { ...pending, sessionId: nextId, externalSessionId: nextId });
+        for (const admission of this.steerInFlight.values())
+            if (admission.sessionId === previousId)
+                admission.sessionId = nextId;
         const timer = this.scheduledSessions.get(previousId);
         if (timer !== undefined) {
             clearTimeout(timer);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/node",
-  "version": "0.11.12",
+  "version": "0.11.13",
   "description": "MyAgentRoam Node runtime CLI.",
   "license": "Apache-2.0 AND GPL-2.0-or-later",
   "type": "module",
@@ -37,10 +37,10 @@
     "playwright": "1.62.1",
     "ws": "^8.21.3",
     "zod": "4.4.3",
-    "@myagentroam/agent": "0.11.12",
-    "@myagentroam/marctl": "0.11.0",
-    "@myagentroam/protocol": "0.11.12",
-    "@myagentroam/code-navigation": "0.11.0"
+    "@myagentroam/agent": "0.11.13",
+    "@myagentroam/code-navigation": "0.11.0",
+    "@myagentroam/protocol": "0.11.13",
+    "@myagentroam/marctl": "0.11.0"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"