@karlorz/codexhost-cli-win32-x64 0.14.0-4 → 0.15.0-0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -17778,29 +17778,43 @@ function awaitWithSignal(promise2, signal, timeoutMessage) {
17778
17778
  );
17779
17779
  });
17780
17780
  }
17781
+ function runWithCdpSignal(signal, timeoutMessage, operation) {
17782
+ signal.throwIfAborted();
17783
+ return awaitWithSignal(operation(), signal, timeoutMessage);
17784
+ }
17785
+ async function connectRendererTarget(target, operations, signal, timeoutMessage) {
17786
+ return runWithCdpSignal(signal, timeoutMessage, async () => {
17787
+ const connected = await operations.connect(target.webSocketDebuggerUrl);
17788
+ if (signal.aborted) {
17789
+ connected.close();
17790
+ signal.throwIfAborted();
17791
+ }
17792
+ return connected;
17793
+ });
17794
+ }
17781
17795
  function sameAgents(actual, expected) {
17782
17796
  if (!actual.includes("codex") || new Set(actual).size !== actual.length) return false;
17783
17797
  if (!expected) return true;
17784
17798
  const expectedSet = new Set(expected);
17785
17799
  return actual.length === expected.length && actual.every((agent) => expectedSet.has(agent));
17786
17800
  }
17787
- function isPrimaryRendererUrl(value) {
17801
+ function parseCodexAppUrl(value) {
17788
17802
  try {
17789
17803
  const url2 = new URL(value);
17790
- return url2.protocol === "app:" && url2.hostname === "-" && url2.pathname === "/index.html" && url2.search === "" && url2.hash === "";
17804
+ return url2.protocol === "app:" && url2.hostname === "-" ? url2 : null;
17791
17805
  } catch {
17792
- return false;
17806
+ return null;
17793
17807
  }
17794
17808
  }
17809
+ function isPrimaryRendererUrl(value) {
17810
+ const url2 = parseCodexAppUrl(value);
17811
+ return url2 !== null && url2.pathname === "/index.html" && url2.search === "" && url2.hash === "";
17812
+ }
17795
17813
  function isAvatarOverlayRendererUrl(value) {
17796
- try {
17797
- const url2 = new URL(value);
17798
- if (url2.protocol !== "app:" || url2.hostname !== "-") return false;
17799
- if (url2.pathname === "/avatar-overlay.html") return true;
17800
- return url2.pathname === "/index.html" && url2.searchParams.get("initialRoute") === "/avatar-overlay";
17801
- } catch {
17802
- return false;
17803
- }
17814
+ const url2 = parseCodexAppUrl(value);
17815
+ if (!url2) return false;
17816
+ if (url2.pathname === "/avatar-overlay.html") return true;
17817
+ return url2.pathname === "/index.html" && url2.searchParams.get("initialRoute") === "/avatar-overlay";
17804
17818
  }
17805
17819
  function selectPrimaryRendererTarget(targets, preferredTargetId) {
17806
17820
  const candidates = targets.filter(
@@ -17881,20 +17895,25 @@ async function evaluateSource(renderer, source) {
17881
17895
  async function readBinding(renderer) {
17882
17896
  return renderer.evaluate("window.__codexhostRendererBindingProbeV1?.status() ?? null");
17883
17897
  }
17884
- async function waitForBinding(renderer, enabledAgents, timeoutMs, pollIntervalMs) {
17898
+ async function waitForBinding(renderer, enabledAgents, timeoutMs, pollIntervalMs, signal) {
17885
17899
  const deadline = Date.now() + timeoutMs;
17886
17900
  let lastError;
17887
17901
  while (Date.now() < deadline) {
17902
+ signal?.throwIfAborted();
17888
17903
  try {
17889
- const value = await readBinding(renderer);
17904
+ const reading = readBinding(renderer);
17905
+ const value = await (signal ? awaitWithSignal(reading, signal, "Renderer binding readiness timed out") : reading);
17906
+ signal?.throwIfAborted();
17890
17907
  if (value !== null) return validateBindingStatus(value, enabledAgents);
17891
17908
  } catch (error51) {
17909
+ signal?.throwIfAborted();
17892
17910
  lastError = error51;
17893
17911
  if (error51 instanceof RendererAdapterReadinessError && error51.state !== "installing") {
17894
17912
  throw error51;
17895
17913
  }
17896
17914
  }
17897
- await sleep(pollIntervalMs);
17915
+ const pause = sleep(pollIntervalMs);
17916
+ await (signal ? awaitWithSignal(pause, signal, "Renderer binding readiness timed out") : pause);
17898
17917
  }
17899
17918
  const detail = lastError instanceof Error ? `: ${lastError.message}` : "";
17900
17919
  throw new Error(`Production Renderer binding did not become ready${detail}`);
@@ -17910,18 +17929,9 @@ async function overlayHookAlreadyEnabled(renderer) {
17910
17929
  }
17911
17930
  }
17912
17931
  async function installOverlayHook(target, overlayHookSource, operations, signal) {
17913
- const run = (operation) => {
17914
- signal.throwIfAborted();
17915
- return awaitWithSignal(operation(), signal, "Overlay hook installation timed out");
17916
- };
17917
- const renderer = await run(async () => {
17918
- const connected = await operations.connect(target.webSocketDebuggerUrl);
17919
- if (signal.aborted) {
17920
- connected.close();
17921
- signal.throwIfAborted();
17922
- }
17923
- return connected;
17924
- });
17932
+ const timeoutMessage = "Overlay hook installation timed out";
17933
+ const run = (operation) => runWithCdpSignal(signal, timeoutMessage, operation);
17934
+ const renderer = await connectRendererTarget(target, operations, signal, timeoutMessage);
17925
17935
  try {
17926
17936
  await run(() => renderer.command("Runtime.enable"));
17927
17937
  await run(() => renderer.command("Page.enable"));
@@ -17934,19 +17944,45 @@ async function installOverlayHook(target, overlayHookSource, operations, signal)
17934
17944
  renderer.close();
17935
17945
  }
17936
17946
  }
17937
- async function installOverlayHooks(endpoint, overlayHookSource, operations, signal) {
17938
- if (!overlayHookSource) return;
17947
+ function isLocalThreadRenderer(target) {
17948
+ if (target.type !== "page") return false;
17949
+ const url2 = parseCodexAppUrl(target.url);
17950
+ if (!url2 || url2.pathname !== "/index.html" || url2.hash !== "") return false;
17951
+ const route = url2.searchParams.get("initialRoute");
17952
+ return [...url2.searchParams.keys()].length === 1 && (route === "/local" || route?.startsWith("/local/") === true);
17953
+ }
17954
+ async function installLocalThreadRenderer(target, source, enabledAgents, operations, signal) {
17955
+ const timeoutMessage = "Local chat Renderer installation timed out";
17956
+ const run = (operation) => runWithCdpSignal(signal, timeoutMessage, operation);
17957
+ const renderer = await connectRendererTarget(target, operations, signal, timeoutMessage);
17939
17958
  try {
17940
- const overlays = selectAvatarOverlayRendererTargets(
17941
- await awaitWithSignal(
17942
- operations.listTargets(endpoint, signal),
17943
- signal,
17944
- "Overlay CDP target discovery timed out"
17945
- )
17946
- );
17947
- await Promise.allSettled(
17948
- overlays.map((overlay) => installOverlayHook(overlay, overlayHookSource, operations, signal))
17959
+ if (await run(() => readBinding(renderer)) === null) {
17960
+ await run(() => renderer.command("Runtime.enable"));
17961
+ await run(() => renderer.command("Page.enable"));
17962
+ await run(() => renderer.command("Page.addScriptToEvaluateOnNewDocument", { source }));
17963
+ await run(() => evaluateSource(renderer, source));
17964
+ }
17965
+ await run(() => operations.installDraftPrewarmPolicy(renderer));
17966
+ await waitForBinding(renderer, enabledAgents, 3e4, 25, signal);
17967
+ } finally {
17968
+ renderer.close();
17969
+ }
17970
+ }
17971
+ async function installAuxiliaryRenderers(endpoint, rendererSource, enabledAgents, overlayHookSource, operations, signal) {
17972
+ try {
17973
+ const targets = await awaitWithSignal(
17974
+ operations.listTargets(endpoint, signal),
17975
+ signal,
17976
+ "Auxiliary Renderer CDP target discovery timed out"
17949
17977
  );
17978
+ await Promise.allSettled([
17979
+ ...overlayHookSource ? selectAvatarOverlayRendererTargets(targets).map(
17980
+ (overlay) => installOverlayHook(overlay, overlayHookSource, operations, signal)
17981
+ ) : [],
17982
+ ...targets.filter(isLocalThreadRenderer).map(
17983
+ (target) => installLocalThreadRenderer(target, rendererSource, enabledAgents, operations, signal)
17984
+ )
17985
+ ]);
17950
17986
  } catch {
17951
17987
  }
17952
17988
  }
@@ -18037,8 +18073,10 @@ var InstalledRendererCdpControlSession = class {
18037
18073
  this.currentSnapshot = replacement.snapshot;
18038
18074
  }
18039
18075
  }
18040
- await installOverlayHooks(
18076
+ await installAuxiliaryRenderers(
18041
18077
  this.rendererCdpEndpoint,
18078
+ this.rendererSource,
18079
+ this.enabledAgents,
18042
18080
  this.overlayHookSource,
18043
18081
  this.operations,
18044
18082
  discoveryTimeoutSignal(this.timeoutMs)
@@ -18086,8 +18124,10 @@ async function createRendererCdpControlSession(options) {
18086
18124
  pollIntervalMs,
18087
18125
  operations
18088
18126
  );
18089
- await installOverlayHooks(
18127
+ await installAuxiliaryRenderers(
18090
18128
  options.rendererCdpEndpoint,
18129
+ options.rendererSource,
18130
+ enabledAgents,
18091
18131
  options.overlayHookSource,
18092
18132
  operations,
18093
18133
  discoveryTimeoutSignal(timeoutMs, options.signal)