@opengeni/runtime 6.5.2-canary.41607687019001 → 6.7.0

package/dist/{chunk-HYSMFK7K.js → chunk-3MNZZ2B4.js}

@@ -14,6 +14,7 @@ import {
   DockerSandboxSession,
   E2BSandboxClient,
   MAX_PROVIDER_COMMAND_HANDLE,
+  MODAL_ROUTER_READ_MAX_WAIT_MS,
   MODAL_ROUTER_READ_PAGE_BYTES,
   MOUNT_MANIFEST_METADATA_SUPPORT,
   ModalCommandRouterWire,
@@ -106,7 +107,7 @@ import {
   withNativeSynchronousCommandCollection,
   withProviderError,
   withSandboxProviderCapture
-} from "./chunk-PZPM6Z62.js";
+} from "./chunk-77NQGL66.js";
 import {
   applyLocalSourceManifestEntryToState,
   applyLocalSourceManifestToState,
@@ -8220,6 +8221,11 @@ function sameExecution(a, b) {
     "supervision" in b ? b.supervision : void 0
   ) && Boolean(a.pty) === Boolean(b.pty);
 }
+var SLICE_PAUSE_MS = 25;
+function unchangedCursor(page) {
+  const { command, expected } = page;
+  return command.kind === "modal-router-v1" && expected?.kind === "modal-router-v1" && command.streams.stdout.byteOffset === expected.streams.stdout.byteOffset && command.streams.stderr.byteOffset === expected.streams.stderr.byteOffset && command.streams.stdout.utf8Remainder === expected.streams.stdout.utf8Remainder && command.streams.stderr.utf8Remainder === expected.streams.stderr.utf8Remainder;
+}
 function installModalCommandSession(session, control) {
   markTypedExecHandleLoss(session);
   const originalExec = session.execCommand?.bind(session);
@@ -8324,17 +8330,33 @@ function installModalCommandSession(session, control) {
       entry.command = retained;
       await supervise(entry).catch(() => void 0);
     }
-    let page = await control.read(entry.command, yieldTimeMs, signal);
-    if (entry.persistence && page.command.kind === "modal-router-v1") {
-      let captured = false;
-      for (let attempt = 0; attempt < 3; attempt++) {
-        if (await captureRouterPage(entry, page)) {
-          captured = true;
-          break;
+    const deadline = performance.now() + yieldTimeMs;
+    const readSlice = () => control.read(
+      entry.command,
+      Math.min(
+        MODAL_ROUTER_READ_MAX_WAIT_MS,
+        Math.max(0, Math.ceil(deadline - performance.now()))
+      ),
+      signal
+    );
+    let page;
+    while (true) {
+      page = await readSlice();
+      if (entry.persistence && page.command.kind === "modal-router-v1") {
+        let captured = false;
+        for (let attempt = 0; attempt < 3; attempt++) {
+          if (await captureRouterPage(entry, page)) {
+            captured = true;
+            break;
+          }
+          if (attempt < 2) page = await readSlice();
         }
-        if (attempt < 2) page = await control.read(entry.command, yieldTimeMs, signal);
+        if (!captured)
+          throw new Error("Modal command output cursor changed during bounded capture");
       }
-      if (!captured) throw new Error("Modal command output cursor changed during bounded capture");
+      if (page.exitCode !== null || page.chunks.length > 0 || !unchangedCursor(page) || deadline - performance.now() <= SLICE_PAUSE_MS)
+        break;
+      await new Promise((resolve4) => setTimeout(resolve4, SLICE_PAUSE_MS));
     }
     if (page.command.kind === "modal-router-v1" && page.command.supervision) {
       const receipt = await entry.persistence?.loadSupervisionReceipt?.();
@@ -9192,7 +9214,7 @@ var ModalCommandControl = class _ModalCommandControl {
     const command = structuredClone(ModalRouterProviderCommand2.parse(input));
     if (command.sandboxId !== this.sandboxId)
       throw new Error("Modal command does not belong to this sandbox");
-    if (!Number.isFinite(waitMs) || waitMs < 0 || waitMs > 5e4)
+    if (!Number.isFinite(waitMs) || waitMs < 0 || waitMs > MODAL_ROUTER_READ_MAX_WAIT_MS)
       throw new Error("Invalid Modal output read bounds");
     signal?.throwIfAborted();
     const stdout = command.streams.stdout;
@@ -19183,4 +19205,4 @@ export {
   collectSandboxEnvironment2 as collectSandboxEnvironment,
   parseExposedPorts2 as parseExposedPorts
 };
-//# sourceMappingURL=chunk-HYSMFK7K.js.map
+//# sourceMappingURL=chunk-3MNZZ2B4.js.map