@myagentroam/node 0.12.4 → 0.12.6

package/dist/workspace/workspace-session-service.js

@@ -1,8 +1,14 @@
 import { nodeLog } from '../operational.js';
 const WATCH_INTERVAL_MS = 30_000;
 const CACHE_TTL_MS = 15_000;
+/** Owns native discovery caches, periodic observation and internal page/discovery admission.
+ * Cancels owned discovery generations before joining reads; Runner execution remains with the Runner.
+ */
 export class WorkspaceSessionService {
     options;
+    accepting = true;
+    pageReads = new Set();
+    discoveryReads = new Map();
     cacheGenerations = new Map();
     initialReads = new Map();
     incompleteDiscoveries = new Set();
@@ -15,10 +21,37 @@ export class WorkspaceSessionService {
     constructor(options) {
         this.options = options;
     }
+    async listPage(workspaceId, sessionGroup) {
+        if (!this.accepting)
+            throw new Error('NODE_STOPPED');
+        const read = this.options.listPage(workspaceId, sessionGroup);
+        this.pageReads.add(read);
+        try {
+            return await read;
+        }
+        finally {
+            this.pageReads.delete(read);
+        }
+    }
+    resume() {
+        this.accepting = true;
+    }
+    async stop() {
+        this.accepting = false;
+        for (const controller of this.discoveryReads.values())
+            controller.abort(new Error('NODE_STOPPED'));
+        for (const id of this.sessionWatchTimers.keys())
+            this.stopWatch(id);
+        await Promise.allSettled([...this.pageReads, ...this.sessionWatchReads.values()]);
+        // Retired cache generations also remain owned until their cancellable projections settle.
+        await Promise.allSettled([...this.discoveryReads.keys()]);
+    }
     cachedSnapshot(workspaceId) {
         return this.sessionCache.get(workspaceId)?.sessions ?? [];
     }
     ensureWatch(workspaceId) {
+        if (!this.accepting)
+            return;
         if (this.sessionWatchTimers.has(workspaceId) || this.sessionWatchReads.has(workspaceId))
             return;
         void this.runWatchCycle(workspaceId);
@@ -35,11 +68,15 @@ export class WorkspaceSessionService {
         return this.incompleteDiscoveries.has(workspaceId);
     }
     async cached(workspaceId) {
+        if (!this.accepting)
+            throw new Error('NODE_STOPPED');
         const cached = this.sessionCache.get(workspaceId);
         if (cached !== undefined && cached.expiresAt > Date.now())
             return cached.sessions;
         let discovery = this.sessionCacheReads.get(workspaceId);
         if (discovery === undefined) {
+            const controller = new AbortController();
+            const signal = controller.signal;
             // A retired read must not regain ownership when its Workspace state is reclaimed.
             const generation = Symbol();
             this.cacheGenerations.set(workspaceId, generation);
@@ -59,6 +96,8 @@ export class WorkspaceSessionService {
             let batchPublished = false;
             let notifyCompletion = false;
             const publish = (sessions, notify = true) => {
+                if (signal.aborted)
+                    return;
                 if (this.cacheGenerations.get(workspaceId) !== generation)
                     return;
                 const previous = this.sessionCache.get(workspaceId)?.sessions;
@@ -66,13 +105,16 @@ export class WorkspaceSessionService {
                     sessions,
                     expiresAt: this.staleDiscoveries.has(workspaceId) ? 0 : Date.now() + CACHE_TTL_MS
                 });
-                if (notify &&
+                if (this.accepting &&
+                    notify &&
                     previous !== undefined &&
                     sessionSignature(previous) !== sessionSignature(sessions))
                     this.options.invalidate(workspaceId);
             };
             const read = this.options
                 .discover(workspaceId, (runner, sessions) => {
+                if (signal.aborted)
+                    return;
                 if (!acceptingBatches || this.cacheGenerations.get(workspaceId) !== generation)
                     return;
                 const previous = this.sessionCache.get(workspaceId)?.sessions;
@@ -86,8 +128,9 @@ export class WorkspaceSessionService {
                 publish(merged);
                 batchPublished = true;
                 resolveInitial(merged);
-            })
+            }, signal)
                 .then((sessions) => {
+                signal.throwIfAborted();
                 if (this.cacheGenerations.get(workspaceId) === generation)
                     this.incompleteDiscoveries.delete(workspaceId);
                 const previous = this.sessionCache.get(workspaceId)?.sessions;
@@ -100,7 +143,7 @@ export class WorkspaceSessionService {
             })
                 .catch((error) => {
                 rejectInitial(error);
-                if (this.cacheGenerations.get(workspaceId) === generation) {
+                if (!signal.aborted && this.cacheGenerations.get(workspaceId) === generation) {
                     nodeLog('native.session.discovery.failed', { workspaceId });
                     const partial = this.sessionCache.get(workspaceId);
                     if (partial !== undefined)
@@ -109,6 +152,7 @@ export class WorkspaceSessionService {
                 throw error;
             })
                 .finally(() => {
+                this.discoveryReads.delete(read);
                 acceptingBatches = false;
                 if (this.sessionCacheReads.get(workspaceId) === read) {
                     this.sessionCacheReads.delete(workspaceId);
@@ -118,7 +162,10 @@ export class WorkspaceSessionService {
                 }
                 if (this.initialReads.get(workspaceId) === initial)
                     this.initialReads.delete(workspaceId);
-                if (notifyCompletion && this.cacheGenerations.get(workspaceId) === generation)
+                if (this.accepting &&
+                    !signal.aborted &&
+                    notifyCompletion &&
+                    this.cacheGenerations.get(workspaceId) === generation)
                     this.options.invalidate(workspaceId);
                 if (!this.sessionCacheReads.has(workspaceId) &&
                     !this.sessionCache.has(workspaceId) &&
@@ -126,6 +173,7 @@ export class WorkspaceSessionService {
                     this.cacheGenerations.delete(workspaceId);
             });
             discovery = read;
+            this.discoveryReads.set(read, controller);
             this.sessionCacheReads.set(workspaceId, discovery);
             // Later Runner failures cannot become unhandled after the first batch was returned.
             void discovery.catch(() => undefined);
@@ -176,7 +224,9 @@ export class WorkspaceSessionService {
     }
     async runWatchCycle(workspaceId) {
         await this.refreshWatch(workspaceId);
-        if (!this.options.active(workspaceId) || this.sessionWatchTimers.has(workspaceId))
+        if (!this.accepting ||
+            !this.options.active(workspaceId) ||
+            this.sessionWatchTimers.has(workspaceId))
             return;
         const timer = setTimeout(() => {
             this.sessionWatchTimers.delete(workspaceId);
@@ -186,11 +236,11 @@ export class WorkspaceSessionService {
         this.sessionWatchTimers.set(workspaceId, timer);
     }
     async performRefresh(workspaceId) {
-        if (!this.options.active(workspaceId))
+        if (!this.accepting || !this.options.active(workspaceId))
             return this.stopWatch(workspaceId);
         try {
-            const signature = JSON.stringify(await this.options.listPage(workspaceId));
-            if (!this.options.active(workspaceId))
+            const signature = JSON.stringify(await this.listPage(workspaceId));
+            if (!this.accepting || !this.options.active(workspaceId))
                 return this.stopWatch(workspaceId);
             const previous = this.sessionWatchSignatures.get(workspaceId);
             this.sessionWatchSignatures.set(workspaceId, signature);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/node",
-  "version": "0.12.4",
+  "version": "0.12.6",
   "description": "MyAgentRoam Node runtime CLI.",
   "license": "Apache-2.0 AND GPL-2.0-or-later",
   "type": "module",
@@ -42,13 +42,13 @@
     "turndown-plugin-gfm": "^1.0.2",
     "ws": "^8.21.3",
     "zod": "4.4.3",
-    "@myagentroam/agent": "0.12.4",
-    "@myagentroam/protocol": "0.12.4"
+    "@myagentroam/agent": "0.12.6",
+    "@myagentroam/protocol": "0.12.6"
   },
   "devDependencies": {
     "@types/turndown": "^5.0.6",
     "@types/ws": "^8.18.1",
-    "@myagentroam/marctl": "0.12.4",
+    "@myagentroam/marctl": "0.12.6",
     "@myagentroam/code-navigation": "0.11.1"
   },
   "exports": {