@remcp/runtime 0.2.185 → 0.2.187

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.2.186 — 2026-10-26
+
+- Return from same-document CDP navigation promptly when Page.navigate provides no new loaderId instead of awaiting a full load event that never fires.
+- Cancel and remove per-navigation CDP event waiters when aborted, completed or disconnected; retain the genuine-document navigation wait and existing browser safety policy.
+- Add deterministic cancellation coverage and real isolated Chromium navigation regression tests.
+
 ## 0.2.185 — 2026-10-26
 
 **Make read-only browser discovery more focused and patch application fail safely.**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remcp/runtime",
-  "version": "0.2.185",
+  "version": "0.2.187",
   "description": "First-party ReMCP local device runtime: filesystem, terminal, computer-use, browser, diagnostics and document tools over MCP.",
   "type": "module",
   "license": "MIT",

package/src/extended/browser-read.mjs

@@ -76,35 +76,43 @@ export async function browserNavigate(args = {}) {
   return withTarget(args, async (session, target) => {
     await session.send('Page.enable');
     const timeoutMs = clamp(args.timeout_ms, 15_000, 500, 120_000);
+    const loadWait = new AbortController();
     const loaded = args.wait === false || ['back','forward'].includes(action)
       ? null
-      : session.waitFor('Page.loadEventFired', timeoutMs).catch(() => null);
-    let frameId = null;
-    let errorText = null;
-    let historyUrl = null;
-    if (action === 'url') {
-      const result = await session.send('Page.navigate', { url });
-      requireSuccessfulBrowserNavigation(result);
-      frameId = result.frameId || null;
-      errorText = result.errorText || null;
-    } else if (action === 'reload') {
-      await session.send('Page.reload', { ignoreCache: Boolean(args.ignore_cache) });
-    } else {
-      const history = await session.send('Page.getNavigationHistory');
-      const current = Number(history.currentIndex || 0);
-      const nextIndex = action === 'back' ? current - 1 : current + 1;
-      const entry = Array.isArray(history.entries) ? history.entries[nextIndex] : null;
-      if (!entry) throw new Error(`Cannot navigate ${action}: no history entry is available`);
-      historyUrl = entry.url ? await assertResolvedPageUrl(entry.url, 'history URL') : null;
-      await session.send('Page.navigateToHistoryEntry', { entryId: entry.id });
-    }
-    if (loaded) await loaded;
-    if (args.wait !== false && ['back','forward'].includes(action)) {
-      await waitForHistoryReady(session, historyUrl, timeoutMs);
+      : session.waitFor('Page.loadEventFired', timeoutMs, loadWait.signal).catch(() => null);
+    try {
+      let frameId = null;
+      let errorText = null;
+      let historyUrl = null;
+      if (action === 'url') {
+        const result = await session.send('Page.navigate', { url });
+        requireSuccessfulBrowserNavigation(result);
+        // Same-document navigation (fragment or pushState) has no loaderId
+        // and does not emit Page.loadEventFired.
+        if (!result.loaderId) loadWait.abort();
+        frameId = result.frameId || null;
+        errorText = result.errorText || null;
+      } else if (action === 'reload') {
+        await session.send('Page.reload', { ignoreCache: Boolean(args.ignore_cache) });
+      } else {
+        const history = await session.send('Page.getNavigationHistory');
+        const current = Number(history.currentIndex || 0);
+        const nextIndex = action === 'back' ? current - 1 : current + 1;
+        const entry = Array.isArray(history.entries) ? history.entries[nextIndex] : null;
+        if (!entry) throw new Error(`Cannot navigate ${action}: no history entry is available`);
+        historyUrl = entry.url ? await assertResolvedPageUrl(entry.url, 'history URL') : null;
+        await session.send('Page.navigateToHistoryEntry', { entryId: entry.id });
+      }
+      if (loaded) await loaded;
+      if (args.wait !== false && ['back','forward'].includes(action)) {
+        await waitForHistoryReady(session, historyUrl, timeoutMs);
+      }
+      const currentUrl = await evaluate(session, 'location.href').catch(() => url || target.url || null);
+      if (currentUrl) await assertResolvedPageUrl(currentUrl);
+      return jsonResult({ target_id: target.id, action, url: currentUrl, frame_id: frameId, error_text: errorText });
+    } finally {
+      loadWait.abort();
     }
-    const currentUrl = await evaluate(session, 'location.href').catch(() => url || target.url || null);
-    if (currentUrl) await assertResolvedPageUrl(currentUrl);
-    return jsonResult({ target_id: target.id, action, url: currentUrl, frame_id: frameId, error_text: errorText });
   });
 }
 

package/src/extended/browser-session.mjs

@@ -119,18 +119,31 @@ export class CdpSession {
     });
   }
 
-  waitFor(method, timeoutMs = this.timeoutMs) {
+  waitFor(method, timeoutMs = this.timeoutMs, signal = null) {
     return new Promise((resolve, reject) => {
+      if (signal?.aborted) { reject(new Error(`${method} aborted`)); return; }
       const listeners = this.waiters.get(method) || [];
-      const listener = { resolve, reject, timer: null };
-      listener.timer = setTimeout(() => {
+      const remove = () => {
         const current = this.waiters.get(method) || [];
         const next = current.filter(item => item !== listener);
         if (next.length) this.waiters.set(method, next); else this.waiters.delete(method);
-        reject(new Error(`${method} timed out`));
+        clearTimeout(listener.timer);
+        signal?.removeEventListener('abort', abort);
+      };
+      const listener = {
+        resolve:value => { signal?.removeEventListener('abort', abort); resolve(value); },
+        reject:error => { signal?.removeEventListener('abort', abort); reject(error); },
+        timer:null,
+      };
+      const abort = () => { remove(); listener.reject(new Error(`${method} aborted`)); };
+      listener.timer = setTimeout(() => {
+        remove();
+        listener.reject(new Error(`${method} timed out`));
       }, timeoutMs);
       listeners.push(listener);
       this.waiters.set(method, listeners);
+      signal?.addEventListener('abort', abort, { once:true });
+      if (signal?.aborted) abort();
     });
   }