@myagentroam/node 0.11.10 → 0.11.11

package/dist/runtime-state.js

@@ -42,6 +42,8 @@ export class NodeRuntimeState {
     queuedItems = new Map();
     receivingQueueItems = new Set();
     queueVersions = new Map();
+    /** Snapshot version of the last FIFO membership or ordering change. */
+    queueOrderVersions = new Map();
     pausedQueues = new Set();
     /** Bounded tombstones reject stale internal start envelopes after terminal cleanup. */
     terminalRunIds = new Map();
@@ -239,6 +241,7 @@ export class NodeRuntimeState {
         const turns = this.turns.get(id) ?? [];
         const queue = this.queuedItems.get(id);
         const queueVersion = this.queueVersions.get(id);
+        const queueOrderVersion = this.queueOrderVersions.get(id);
         const lease = this.leases.get(id);
         const paused = this.pausedQueues.has(id);
         this.sessions.delete(id);
@@ -273,6 +276,10 @@ export class NodeRuntimeState {
             this.queueVersions.delete(id);
             this.queueVersions.set(nativeSessionId, queueVersion);
         }
+        if (queueOrderVersion !== undefined) {
+            this.queueOrderVersions.delete(id);
+            this.queueOrderVersions.set(nativeSessionId, queueOrderVersion);
+        }
         if (lease !== undefined) {
             this.leases.delete(id);
             this.leases.set(nativeSessionId, lease);
@@ -580,18 +587,20 @@ export class NodeRuntimeState {
     }
     pauseSessionQueue(sessionId) {
         this.pausedQueues.add(sessionId);
-        this.bumpQueueVersion(sessionId);
+        this.bumpQueueVersion(sessionId, false);
     }
     resumeSessionQueue(sessionId) {
         if (!this.pausedQueues.delete(sessionId))
             return;
-        this.bumpQueueVersion(sessionId);
+        this.bumpQueueVersion(sessionId, false);
     }
     reorderSessionQueue(sessionId, expectedVersion, itemIds) {
         const current = this.queuedItems.get(sessionId) ?? [];
         for (const id of current)
             this.assertQueueItemMutable(id);
-        if (this.sessionQueue(sessionId).version !== expectedVersion ||
+        if (!Number.isInteger(expectedVersion) ||
+            expectedVersion < (this.queueOrderVersions.get(sessionId) ?? 0) ||
+            expectedVersion > this.sessionQueue(sessionId).version ||
             current.length !== itemIds.length ||
             new Set(current).size !== current.length ||
             current.some((itemId) => !itemIds.includes(itemId)))
@@ -599,7 +608,7 @@ export class NodeRuntimeState {
         if (itemIds.some((itemId) => this.queueItems.get(itemId)?.sessionId !== sessionId))
             throw new Error('QUEUE_ITEM_INVALID');
         this.queuedItems.set(sessionId, [...itemIds]);
-        this.bumpQueueVersion(sessionId);
+        this.bumpQueueVersion(sessionId, current.some((itemId, index) => itemIds[index] !== itemId));
     }
     prioritizeQueueItem(itemId) {
         this.assertQueueItemMutable(itemId);
@@ -611,7 +620,7 @@ export class NodeRuntimeState {
             itemId,
             ...queue.filter((candidate) => candidate !== itemId)
         ]);
-        this.bumpQueueVersion(item.sessionId);
+        this.bumpQueueVersion(item.sessionId, queue[0] !== itemId);
         return item;
     }
     updateQueueItem(itemId, content) {
@@ -621,7 +630,7 @@ export class NodeRuntimeState {
             throw new Error('QUEUE_ITEM_INVALID');
         const next = { ...item, content };
         this.queueItems.set(itemId, next);
-        this.bumpQueueVersion(item.sessionId);
+        this.bumpQueueVersion(item.sessionId, false);
         return next;
     }
     updateQueueItemAttachments(itemId, attachments, content) {
@@ -630,7 +639,7 @@ export class NodeRuntimeState {
         const next = { ...item, attachments, ...(content === undefined ? {} : { content }) };
         this.queueItems.set(itemId, next);
         if (content !== undefined && content !== item.content)
-            this.bumpQueueVersion(item.sessionId);
+            this.bumpQueueVersion(item.sessionId, false);
         return next;
     }
     deleteQueueItem(itemId) {
@@ -1106,6 +1115,7 @@ export class NodeRuntimeState {
         for (const itemId of queued)
             this.queueItems.delete(itemId);
         this.queueVersions.delete(sessionId);
+        this.queueOrderVersions.delete(sessionId);
         this.pausedQueues.delete(sessionId);
         this.leases.delete(sessionId);
         for (const runId of runIds) {
@@ -1205,6 +1215,7 @@ export class NodeRuntimeState {
             for (const itemId of queued)
                 this.queueItems.delete(itemId);
             this.queueVersions.delete(sessionId);
+            this.queueOrderVersions.delete(sessionId);
             this.pausedQueues.delete(sessionId);
             this.leases.delete(sessionId);
         }
@@ -1239,8 +1250,11 @@ export class NodeRuntimeState {
             : (this.recentUserMessages.get(run.id) ?? this.currentRunMessageText(run.id));
         this.onRunChanged?.(run, session, userMessage.length === 0 ? undefined : userMessage);
     }
-    bumpQueueVersion(sessionId) {
-        this.queueVersions.set(sessionId, (this.queueVersions.get(sessionId) ?? 0) + 1);
+    bumpQueueVersion(sessionId, orderChanged = true) {
+        const version = (this.queueVersions.get(sessionId) ?? 0) + 1;
+        this.queueVersions.set(sessionId, version);
+        if (orderChanged)
+            this.queueOrderVersions.set(sessionId, version);
     }
     pruneRetainedExecutionTurns(sessionId, retainedTurnIds) {
         for (const [executionId, reference] of this.retainedExecutionTurns)

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

@@ -11,6 +11,7 @@ export class ContinuousRunCoordinator {
     startedExecutions = new Set();
     scheduledSessions = new Map();
     immediateQueueItems = new Set();
+    queueExecutionAdmissions = new Map();
     steerInFlight = new Map();
     suspended = false;
     constructor(options) {
@@ -228,16 +229,23 @@ export class ContinuousRunCoordinator {
         return 'QUEUED';
     }
     executeQueueItem(itemId) {
+        const inFlight = this.queueExecutionAdmissions.get(itemId);
+        if (inFlight !== undefined)
+            return inFlight;
         const pending = this.preparedInputs.get(itemId);
         if (this.options.resolveExecutionDirectory && pending) {
-            const version = this.options.runtime.sessionQueue(pending.sessionId).version;
-            return this.directoryForInput(itemId, pending, true).then((cwd) => {
+            const task = this.directoryForInput(itemId, pending, true)
+                .then((cwd) => {
                 if (cwd === undefined || !this.inputCurrent(itemId, pending))
                     throw new Error('QUEUE_ITEM_INVALID');
-                if (this.options.runtime.sessionQueue(pending.sessionId).version !== version)
-                    throw new Error('QUEUE_VERSION_CONFLICT');
                 return this.executeQueueItemReady(itemId);
+            })
+                .finally(() => {
+                if (this.queueExecutionAdmissions.get(itemId) === task)
+                    this.queueExecutionAdmissions.delete(itemId);
             });
+            this.queueExecutionAdmissions.set(itemId, task);
+            return task;
         }
         return this.executeQueueItemReady(itemId);
     }
@@ -713,6 +721,7 @@ export class ContinuousRunCoordinator {
         this.dispatchedExecutions.clear();
         this.startedExecutions.clear();
         this.immediateQueueItems.clear();
+        this.queueExecutionAdmissions.clear();
         for (const timer of this.scheduledSessions.values())
             clearTimeout(timer);
         this.scheduledSessions.clear();

package/package.json

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