@codexhost/cli-darwin-x64 0.16.1 → 0.17.0

package/README.md

@@ -7,7 +7,7 @@ Run Pi and Claude Code as first-class external harnesses inside Codex Desktop.
 ## Install
 
 ```bash
-npm install -g @codexhost/cli@0.16.1
+npm install -g @codexhost/cli@0.17.0
 ```
 
 Do not install this package directly. npm selects it through the optional dependencies of `@codexhost/cli`.
@@ -36,7 +36,7 @@ The `codexhost` command launches the packaged Rust launcher with:
 
 ## Requirements
 
-- Node.js 22 or 24 (Node 20 and older are not supported)
+- Node.js 22.19.0 or later, except 23.x (other releases lack parts of the built-in `node:sqlite` module)
 - Official ChatGPT/Codex Desktop for macOS, Windows, or Linux
 - Pi on `PATH` when using the Pi agent
 - Claude Code installed when using the Claude Code adapter

package/THIRD_PARTY_NOTICES.txt

@@ -32,14 +32,18 @@ License text: licenses/OpenCode-v2-Client-LICENSE.txt
 License: MIT
 License text: licenses/OpenCode-SDK-LICENSE.txt
 
-@qoder-ai/qoder-agent-sdk 1.0.39
+@qoder-ai/qoder-agent-sdk 1.0.58
 License: SEE LICENSE IN LICENSE
 License text: licenses/Qoder-Agent-SDK-LICENSE.txt
 
-@qodercn-ai/qodercn-agent-sdk 1.0.39
+@qodercn-ai/qodercn-agent-sdk 1.0.58
 License: SEE LICENSE IN LICENSE
 License text: licenses/QoderCN-Agent-SDK-LICENSE.txt
 
+@qwen-code/sdk 0.1.26
+License: Apache-2.0
+License text: licenses/Qwen-Code-SDK-LICENSE.txt
+
 diff 8.0.2
 License: BSD-3-Clause
 License text: licenses/diff-LICENSE.txt

package/app/codexhost-distribution.json

@@ -1 +1 @@
-{"schemaVersion":1,"version":"0.16.1","distribution":"npm","target":"macos-x64"}
+{"schemaVersion":1,"version":"0.17.0","distribution":"npm","target":"macos-x64"}

package/app/console-server.mjs

@@ -17031,33 +17031,58 @@ var HarnessLaunchSettingsStore = class {
     return path8.join(this.#directory, `${harnessPluginIdSchema.parse(id)}.json`);
   }
   async #read(id) {
+    const file2 = this.#file(id);
+    let text;
     try {
-      const value = harnessLaunchPathSchema.parse(JSON.parse(await readFile4(this.#file(id), "utf8")));
-      if (!path8.isAbsolute(value))
-        throw new Error("Expected an absolute entrypoint path");
-      return value;
+      text = await readFile4(file2, "utf8");
     } catch (error51) {
       if (error51 && typeof error51 === "object" && "code" in error51 && error51.code === "ENOENT")
         return null;
-      throw new Error("Could not read Harness launch settings");
+      throw new Error(`Could not read Harness launch settings at ${file2}`, { cause: error51 });
     }
+    let parsed;
+    try {
+      parsed = harnessLaunchPathSchema.parse(JSON.parse(text));
+    } catch {
+    }
+    if (parsed === void 0 || !path8.isAbsolute(parsed)) {
+      throw new Error(`Could not read Harness launch settings at ${file2}: expected an absolute installation path; save a new path or reset it`);
+    }
+    return parsed;
   }
-  /** Capture the value used to construct this Host's Adapter; changes require a restart. */
-  async initialCommand(id) {
+  #snapshot(id) {
     let initial = this.#initial.get(id);
     if (!initial) {
-      initial = this.#read(id);
+      initial = this.#read(id).then((value) => ({ path: value }), (error51) => ({ error: error51 instanceof Error ? error51 : new Error(String(error51)) }));
       this.#initial.set(id, initial);
     }
-    return await initial ?? void 0;
+    return initial;
+  }
+  /**
+   * Capture the value used to construct this Host's Adapter; changes require a restart. A failed
+   * read is remembered for restart reporting but not reused: the next call reads the file again.
+   */
+  async initialCommand(id) {
+    const cached2 = this.#initial.get(id);
+    if (cached2 && "error" in await cached2)
+      this.#initial.delete(id);
+    const snapshot = await this.#snapshot(id);
+    if ("error" in snapshot)
+      throw snapshot.error;
+    return snapshot.path ?? void 0;
+  }
+  /** The Adapter was built without a readable setting, so any saved value needs a restart. */
+  #restartRequired(snapshot, value) {
+    return "error" in snapshot || value !== snapshot.path;
   }
   async get(id) {
-    const initial = await this.initialCommand(id) ?? null;
+    const snapshot = await this.#snapshot(id);
     const value = await this.#read(id);
-    return { path: value, restartRequired: value !== initial };
+    return { path: value, restartRequired: this.#restartRequired(snapshot, value) };
   }
+  /** Replaces the file without reading it, so an unreadable file can always be repaired. */
   async set(id, value) {
-    const initial = await this.initialCommand(id) ?? null;
+    const snapshot = await this.#snapshot(id);
     const file2 = this.#file(id);
     if (value === null) {
       await rm3(file2, { force: true });
@@ -17078,7 +17103,7 @@ var HarnessLaunchSettingsStore = class {
         await rm3(temporary, { force: true });
       }
     }
-    return { path: value, restartRequired: value !== initial };
+    return { path: value, restartRequired: this.#restartRequired(snapshot, value) };
   }
 };
 
@@ -17139,10 +17164,15 @@ function createConsoleHarnesses(roots, environment = process.env) {
       if (seen.has(manifest.id)) continue;
       seen.add(manifest.id);
       const icon = manifest.icon ? await readPluginIcon(plugin.root, manifest.icon).catch(() => null) : null;
-      const launchPath = manifest.launchCommand ? await store.get(manifest.id).then(
-        (settings) => settings.path,
-        () => null
-      ) : null;
+      let launchPath = null;
+      let launchPathError = null;
+      if (manifest.launchCommand) {
+        try {
+          launchPath = (await store.get(manifest.id)).path;
+        } catch (error51) {
+          launchPathError = error51 instanceof Error ? error51.message : String(error51);
+        }
+      }
       harnesses.push({
         id: manifest.id,
         name: manifest.name,
@@ -17151,7 +17181,8 @@ function createConsoleHarnesses(roots, environment = process.env) {
         launchCommand: manifest.launchCommand === true,
         links: manifest.links ?? null,
         icon,
-        launchPath
+        launchPath,
+        launchPathError
       });
     }
     return harnesses.sort(
@@ -17168,7 +17199,7 @@ function createConsoleHarnesses(roots, environment = process.env) {
       }
       try {
         const settings = await store.set(id, value);
-        return { ...harness2, launchPath: settings.path };
+        return { ...harness2, launchPath: settings.path, launchPathError: null };
       } catch (error51) {
         throw new ConsoleHarnessError(400, error51 instanceof Error ? error51.message : String(error51));
       }
@@ -18107,7 +18138,11 @@ function startConsoleServer(options) {
       return;
     }
     scheduleIdleExit();
-    const url2 = new URL(request.url ?? "/", `http://127.0.0.1:${port}`);
+    const url2 = URL.parse(request.url ?? "/", `http://127.0.0.1:${port}`);
+    if (!url2) {
+      sendJson(response, 400, { error: "Bad Request" });
+      return;
+    }
     const method = request.method ?? "GET";
     const route = `${method} ${url2.pathname}`;
     if (route === "GET /api/health") {

package/app/console-web.js

@@ -18782,13 +18782,12 @@ th[aria-sort] .console-usage-sort__mark {
                     { className: "console-harness__path" },
                     input,
                     button(document2, messages.save, () => submit(input.value.trim() || null)),
-                    harness2.launchPath ? button(document2, messages.useAutomatic, () => submit(null)) : null
+                    harness2.launchPath || harness2.launchPathError ? button(document2, messages.useAutomatic, () => submit(null)) : null
                   )
                 );
-                if (status.has(harness2.id)) {
-                  row.append(
-                    h(document2, "div", { className: "console-muted" }, status.get(harness2.id) ?? "")
-                  );
+                const message2 = status.get(harness2.id) ?? harness2.launchPathError;
+                if (message2) {
+                  row.append(h(document2, "div", { className: "console-muted" }, message2));
                 }
               }
               if (guide) {
@@ -20965,7 +20964,7 @@ th[aria-sort] .console-usage-sort__mark {
     launchPathAutomatic: "No saved override. Uses environment configuration, then automatic discovery.",
     launchPathSaving: "Saving\u2026",
     launchPathLoading: "Loading launch settings\u2026",
-    launchPathLoadError: "Could not load launch settings. Reopen this detail panel to retry.",
+    launchPathLoadError: "Could not load launch settings. Save an installation directory or reset to automatic discovery to replace them.",
     launchPathSaveError: "Could not save. Enter an existing absolute installation folder on this Host and check configuration permissions.",
     connectionOfficialWebsite: "Visit official website",
     connectionOpenHarnessWeb: "Open DeepSeek Harness Web",
@@ -21244,7 +21243,7 @@ th[aria-sort] .console-usage-sort__mark {
     launchPathAutomatic: "\u672A\u8BBE\u7F6E\u81EA\u5B9A\u4E49\u8DEF\u5F84\uFF0C\u4F7F\u7528\u73AF\u5883\u53D8\u91CF\u914D\u7F6E\u6216\u81EA\u52A8\u53D1\u73B0\u3002",
     launchPathSaving: "\u6B63\u5728\u4FDD\u5B58\u2026",
     launchPathLoading: "\u6B63\u5728\u8BFB\u53D6\u542F\u52A8\u8BBE\u7F6E\u2026",
-    launchPathLoadError: "\u65E0\u6CD5\u8BFB\u53D6\u542F\u52A8\u8BBE\u7F6E\uFF0C\u8BF7\u91CD\u65B0\u6253\u5F00\u6B64\u8BE6\u60C5\u9762\u677F\u91CD\u8BD5\u3002",
+    launchPathLoadError: "\u65E0\u6CD5\u8BFB\u53D6\u542F\u52A8\u8BBE\u7F6E\u3002\u4FDD\u5B58\u5B89\u88C5\u76EE\u5F55\u6216\u6062\u590D\u81EA\u52A8\u53D1\u73B0\u5373\u53EF\u66FF\u6362\u3002",
     launchPathSaveError: "\u4FDD\u5B58\u5931\u8D25\u3002\u8BF7\u586B\u5199\u6B64 Host \u4E0A\u5B9E\u9645\u5B58\u5728\u7684\u5B89\u88C5\u76EE\u5F55\u7EDD\u5BF9\u8DEF\u5F84\uFF0C\u5E76\u786E\u8BA4\u914D\u7F6E\u76EE\u5F55\u53EF\u5199\u3002",
     connectionOfficialWebsite: "\u8BBF\u95EE\u5B98\u7F51",
     connectionOpenHarnessWeb: "\u6253\u5F00 DeepSeek Harness Web",
@@ -23887,7 +23886,7 @@ ${detail}` : ""}`
     "codexhost was not detected over SSH. Install it on the remote computer or add it to the login shell PATH, then retry": "\u901A\u8FC7 SSH \u672A\u68C0\u6D4B\u5230 codexhost\u3002\u8BF7\u5728\u8FDC\u7A0B\u7535\u8111\u4E0A\u5B89\u88C5\uFF0C\u6216\u5C06\u5DF2\u5B89\u88C5\u7684 codexhost \u52A0\u5165\u767B\u5F55 shell \u7684 PATH \u540E\u91CD\u8BD5",
     "The active codexhost does not match the global npm installation. Uninstall only the remote service, or remove the package manually on the remote computer": "\u5F53\u524D codexhost \u4E0E npm \u5168\u5C40\u5B89\u88C5\u4F4D\u7F6E\u4E0D\u5339\u914D\u3002\u8BF7\u9009\u62E9\u4EC5\u5378\u8F7D\u8FDC\u7A0B\u670D\u52A1\uFF0C\u6216\u5728\u8FDC\u7A0B\u7535\u8111\u4E0A\u624B\u52A8\u5378\u8F7D\u8F6F\u4EF6\u5305",
     "The remote service was uninstalled, but removing the codexhost package failed. Check npm permissions on the remote computer and retry": "\u8FDC\u7A0B\u670D\u52A1\u5DF2\u5378\u8F7D\uFF0C\u4F46 codexhost \u8F6F\u4EF6\u5305\u5378\u8F7D\u5931\u8D25\u3002\u8BF7\u68C0\u67E5\u8FDC\u7A0B\u7535\u8111\u4E0A\u7684 npm \u6743\u9650\u540E\u91CD\u8BD5",
-    "Remote Node.js is unsupported. Select Node.js 22.19 or later in the 22.x series, or Node.js 24.x": "\u8FDC\u7A0B Node.js \u7248\u672C\u4E0D\u53D7\u652F\u6301\uFF0C\u8BF7\u9009\u62E9 Node.js 22.19 \u53CA\u4EE5\u4E0A\u7684 22.x \u7248\u672C\uFF0C\u6216 Node.js 24.x",
+    "Remote Node.js is unsupported. Select Node.js 22.19 or later, except 23.x": "\u8FDC\u7A0B Node.js \u7248\u672C\u4E0D\u53D7\u652F\u6301\uFF0C\u8BF7\u9009\u62E9 Node.js 22.19 \u53CA\u4EE5\u4E0A\u7248\u672C\uFF0C\u4F46\u4E0D\u5305\u62EC 23.x",
     "npm installation failed. Check network access and global installation permissions": "npm \u5B89\u88C5\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u7F51\u7EDC\u548C\u5168\u5C40\u5B89\u88C5\u6743\u9650",
     "Remote service configuration failed. Check Codex CLI and the remote desktop login": "\u8FDC\u7A0B\u670D\u52A1\u914D\u7F6E\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5 Codex CLI \u4EE5\u53CA\u8FDC\u7A0B\u7535\u8111\u7684\u684C\u9762\u767B\u5F55\u72B6\u6001",
     "Remote service could not stop. Check the remote service before retrying": "\u8FDC\u7A0B\u670D\u52A1\u65E0\u6CD5\u505C\u6B62\uFF0C\u8BF7\u68C0\u67E5\u8FDC\u7A0B\u670D\u52A1\u540E\u91CD\u8BD5",
@@ -25160,6 +25159,7 @@ ${detail}` : ""}`
       loaded = true;
       show(value);
     }).catch(() => {
+      loaded = true;
       status.textContent = messages.launchPathLoadError;
     }).finally(() => {
       busy = false;
@@ -26647,6 +26647,30 @@ ${messages.harnessVersionLatest}: ${harnessVersionLabel(version2.state, messages
     };
   }
 
+  // src/settings/session-import-sources.ts
+  async function loadSessionImportSources(client, diagnostics, signal, refresh) {
+    const { harnesses } = await client.listSessionImportSources();
+    signal.throwIfAborted();
+    if (!diagnostics || harnesses.length === 0) return harnesses;
+    const hostId2 = client.hostId ?? "local";
+    const readHost = () => diagnostics.snapshot().hosts.find((host2) => host2.hostId === hostId2);
+    let host = readHost();
+    const incomplete = () => !host || Boolean(host.directoryError) || harnesses.some(({ harnessId }) => {
+      const status = host?.agents.find(({ agent }) => agent === harnessId)?.availability;
+      return status === void 0 || status === "checking";
+    });
+    if (refresh || incomplete()) {
+      await diagnostics.refresh(hostId2);
+      signal.throwIfAborted();
+      host = readHost();
+    }
+    if (incomplete()) throw new Error("Harness installation diagnostics are incomplete");
+    const missing = new Set(
+      host?.agents.filter(({ availability }) => availability === "notInstalled").map(({ agent }) => agent)
+    );
+    return harnesses.filter(({ harnessId }) => !missing.has(harnessId));
+  }
+
   // src/settings/session-import-page.ts
   function shortSessionId(value) {
     return value.length <= 18 ? value : `${value.slice(0, 10)}\u2026${value.slice(-6)}`;
@@ -26716,7 +26740,7 @@ ${messages.harnessVersionLatest}: ${harnessVersionLabel(version2.state, messages
               ...getDiagnostics()?.snapshot().hosts.map(({ hostId: hostId2 }) => hostId2) ?? [],
               ...current ? [current] : []
             ])
-          ];
+          ].filter((hostId2) => hostId2 !== "durable");
           displayedHostId = current;
           const scrollLeft = hostOptions.scrollLeft;
           hostOptions.replaceChildren();
@@ -27060,10 +27084,14 @@ ${messages.harnessVersionLatest}: ${harnessVersionLabel(version2.state, messages
           content.append(list);
           updateImportActions();
         };
-        const load = () => {
+        const load = (refreshDiagnostics = false) => {
           if (importingId !== null || context.signal.aborted) return;
           loadedClient = null;
-          const client = getClient(selectedHostId);
+          let client = getClient(selectedHostId);
+          if (client?.hostId === "durable") {
+            selectedHostId = "local";
+            client = getClient(selectedHostId);
+          }
           renderHosts(client);
           listControls.setBusy(client !== null);
           refresh.disabled = client !== null;
@@ -27076,11 +27104,11 @@ ${messages.harnessVersionLatest}: ${harnessVersionLabel(version2.state, messages
           void context.runLatest(
             async (signal) => {
               if (!client) throw new RendererSessionImportUnavailableError();
-              const missing = new Set(
-                getDiagnostics()?.snapshot().hosts.find(({ hostId: hostId2 }) => hostId2 === (client.hostId ?? "local"))?.agents.filter(({ availability }) => availability === "notInstalled").map(({ agent }) => agent)
-              );
-              const harnesses = (await client.listSessionImportSources()).harnesses.filter(
-                ({ harnessId }) => !missing.has(harnessId)
+              const harnesses = await loadSessionImportSources(
+                client,
+                getDiagnostics(),
+                signal,
+                refreshDiagnostics
               );
               const selected = harnesses.find(({ harnessId }) => harnessId === requestedHarness)?.harnessId ?? harnesses[0]?.harnessId ?? null;
               if (signal.aborted) throw new Error("Session import selection changed");
@@ -27131,7 +27159,7 @@ ${messages.harnessVersionLatest}: ${harnessVersionLabel(version2.state, messages
           load();
           hostButtons.find((button2) => button2.dataset.sessionImportHost === hostId2)?.focus();
         };
-        refresh.addEventListener("click", load);
+        refresh.addEventListener("click", () => load(true));
         load();
         return void 0;
       }

package/app/desktop-controller.mjs

@@ -227,13 +227,32 @@ var CdpClient = class _CdpClient {
       returnByValue: true
     });
     if (!isRecord(response)) throw new Error("Runtime.evaluate returned an invalid result");
-    if (isRecord(response.exceptionDetails)) {
-      throw new Error(cdpExceptionMessage(response.exceptionDetails, "Renderer evaluation failed"));
-    }
-    if (!isRecord(response.result) || !("value" in response.result)) {
-      throw new Error("Runtime.evaluate did not return a value");
+    try {
+      if (isRecord(response.exceptionDetails)) {
+        throw new Error(
+          cdpExceptionMessage(response.exceptionDetails, "Renderer evaluation failed")
+        );
+      }
+      if (!isRecord(response.result) || !("value" in response.result)) {
+        throw new Error("Runtime.evaluate did not return a value");
+      }
+      return response.result.value;
+    } finally {
+      const objects = [
+        response.result,
+        isRecord(response.exceptionDetails) ? response.exceptionDetails.exception : void 0
+      ];
+      const ids = new Set(
+        objects.flatMap(
+          (object2) => isRecord(object2) && typeof object2.objectId === "string" ? [object2.objectId] : []
+        )
+      );
+      await Promise.all(
+        [...ids].map(
+          (objectId) => this.command("Runtime.releaseObject", { objectId }).catch(() => void 0)
+        )
+      );
     }
-    return response.result.value;
   }
   close() {
     if (this.#closed) return;
@@ -17724,16 +17743,20 @@ function installRendererHostRpcRouting(root, target, dependencies) {
     if (!isRecord3(input) || !isRecord3(input.collaborationMode)) return message;
     const settings = input.collaborationMode.settings;
     if (!isRecord3(settings)) return message;
+    const nativeModel = typeof settings.model === "string" ? settings.model : null;
     let model2 = null;
     if (path3[0] === "startConversation") {
       const draftId = isRecord3(options) ? options.clientThreadId : null;
       model2 = typeof draftId === "string" ? externalDrafts.get(draftId)?.model ?? null : null;
     } else if (path3[0] === "prewarmConversation") {
       if (input.ephemeral !== true) publishDraftWorkspace("local", input.cwd);
-      const selected = selectedModels.get("local");
-      model2 = selected ? prewarmCarrier(selected) : null;
+      const selected = selectedModels.get("local") ?? null;
+      const carrier = nativeModel?.startsWith("codexhost/") ? nativeModel : selected;
+      model2 = carrier ? prewarmCarrier(carrier) : null;
     }
     if (!model2) return message;
+    if (path3[0] === "startConversation" && nativeModel?.startsWith("codexhost/") && nativeModel !== model2)
+      return message;
     return [
       "push",
       [
@@ -17945,23 +17968,29 @@ function directRendererInstaller() {
       },
       portPrototype: MessagePort.prototype,
     });
-    // Desktop 26.1027 moved AppServerManagers to the main process. Older builds
-    // expose native managers in Renderer hook state; the main-process mode only
-    // applies when none is visible and its per-Host RPC store is identified.
+    const connected = (routing) => routing.forComposer() !== null ||
+      ['local', ...(routing.knownHostIds?.() ?? [])].some((hostId) => routing.forHost(hostId) !== null);
+    let nativeReady = false;
+    // A legacy registry can remain mounted without a usable native manager.
+    // Prefer a ready native route, then try the identified main-process RPC store.
     const routing = (() => {
       if (window.__codexhostHostRoutingV1) return window.__codexhostHostRoutingV1;
       const native = discover(document);
-      if (native.managers.length || native.registries.length) return installNative();
+      if (native.managers.length || native.registries.length) {
+        const routing = installNative();
+        if (connected(routing)) {
+          nativeReady = true;
+          return routing;
+        }
+        routing.dispose();
+      }
       const rpc = installRpc();
       if (rpc) return rpc;
       throw new Error('Renderer Host request manager is unavailable');
     })();
     // Publish a default draft policy only when its Host is unambiguous. Host
     // connections can be ready even when multiple Composers coexist.
-    const composerRoute = routing.forComposer();
-    const connected = composerRoute !== null ||
-      ['local', ...(routing.knownHostIds?.() ?? [])].some((hostId) => routing.forHost(hostId) !== null);
-    if (!connected) throw new Error('Renderer Host request manager is unavailable');
+    if (!nativeReady && !connected(routing)) throw new Error('Renderer Host request manager is unavailable');
     return { state: 'ready', reason: 'owned-request-bridge' };
   })()`;
 }
@@ -17995,6 +18024,10 @@ function installRendererDraftPrewarmPolicyDirect(renderer) {
 // packages/desktop-control/src/renderer-loaded-modules.ts
 var record2 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 var MAX_MODULES = 4096;
+var STALE_CONTEXT_ERROR = /uniqueContextId not found|Cannot find context with specified id|Execution context was destroyed|Cannot find default execution context/i;
+function isStaleContextError(error51) {
+  return error51 instanceof Error && STALE_CONTEXT_ERROR.test(error51.message);
+}
 function nativeModuleCatalogExpression(urls, complete, owner) {
   return `Object.defineProperty(globalThis, '__codexhostLoadedModulesV1', {
     configurable: true,
@@ -18016,16 +18049,27 @@ async function installRendererLoadedModules(renderer) {
     const pending = [...dirty];
     dirty.clear();
     publishing = publishing.catch(() => void 0).then(async () => {
+      let failure;
       for (const uniqueId of pending) {
         const context = contexts.get(uniqueId);
         if (!context || disposed) continue;
-        const response = await renderer.command("Runtime.evaluate", {
-          expression: nativeModuleCatalogExpression([...context.urls], context.complete, owner),
-          uniqueContextId: uniqueId
-        });
-        if (record2(response) && record2(response.exceptionDetails))
-          throw new Error("Loaded Renderer module catalog publication failed");
+        try {
+          const response = await renderer.command("Runtime.evaluate", {
+            expression: nativeModuleCatalogExpression([...context.urls], context.complete, owner),
+            uniqueContextId: uniqueId
+          });
+          if (record2(response) && record2(response.exceptionDetails))
+            throw new Error("Loaded Renderer module catalog publication failed");
+        } catch (error51) {
+          if (contexts.get(uniqueId) !== context) continue;
+          if (isStaleContextError(error51)) {
+            forget(uniqueId);
+            continue;
+          }
+          failure ??= error51;
+        }
       }
+      if (failure !== void 0) throw failure;
     });
     return publishing;
   };
@@ -18038,13 +18082,15 @@ async function installRendererLoadedModules(renderer) {
         });
       }, 10);
   };
-  const remove = (id) => {
-    const uniqueId = contextIds.get(id);
-    contextIds.delete(id);
-    if (uniqueId) {
-      contexts.delete(uniqueId);
-      dirty.delete(uniqueId);
-    }
+  const forget = (uniqueId) => {
+    contexts.delete(uniqueId);
+    dirty.delete(uniqueId);
+    for (const [id, value] of contextIds) if (value === uniqueId) contextIds.delete(id);
+  };
+  const remove = (params) => {
+    const byId = typeof params.executionContextId === "number" ? contextIds.get(params.executionContextId) : void 0;
+    const uniqueId = typeof params.executionContextUniqueId === "string" ? params.executionContextUniqueId : byId;
+    if (uniqueId) forget(uniqueId);
   };
   const listeners = [
     renderer.on("Runtime.executionContextCreated", (params) => {
@@ -18056,8 +18102,7 @@ async function installRendererLoadedModules(renderer) {
       schedule(context.uniqueId);
     }),
     renderer.on("Runtime.executionContextDestroyed", (params) => {
-      if (record2(params) && typeof params.executionContextId === "number")
-        remove(params.executionContextId);
+      if (record2(params)) remove(params);
     }),
     renderer.on("Runtime.executionContextsCleared", () => {
       contextIds.clear();