@opengeni/runtime 0.11.0 → 0.13.0

package/dist/{chunk-YUAFQEFY.js → chunk-65UDUFUO.js}

@@ -13274,8 +13274,8 @@ async function sweepModalOrphanSandboxes(settings, liveLeases, options = {}) {
         if (liveByInstance) {
           if (leaseId !== liveByInstance.leaseId || workspaceId !== liveByInstance.workspaceId || sandboxGroupId !== liveByInstance.sandboxGroupId) {
             try {
-              const sandbox = await modal.sandboxes.fromId(info.id);
-              await sandbox.setTags(
+              const sandbox2 = await modal.sandboxes.fromId(info.id);
+              await sandbox2.setTags(
                 modalSandboxAttributionTags({
                   leaseId: liveByInstance.leaseId,
                   workspaceId: liveByInstance.workspaceId,
@@ -13306,10 +13306,28 @@ async function sweepModalOrphanSandboxes(settings, liveLeases, options = {}) {
           skipped += 1;
           continue;
         }
+        const candidate = { sandboxId: info.id, reason, tags };
+        let sandbox;
+        try {
+          sandbox = await modal.sandboxes.fromId(info.id);
+        } catch {
+          skipped += 1;
+          continue;
+        }
+        if (options.revalidateTermination) {
+          try {
+            if (!await options.revalidateTermination(candidate)) {
+              skipped += 1;
+              continue;
+            }
+          } catch {
+            skipped += 1;
+            continue;
+          }
+        }
         try {
-          const sandbox = await modal.sandboxes.fromId(info.id);
           await sandbox.terminate();
-          terminated.push({ sandboxId: info.id, reason, tags });
+          terminated.push(candidate);
         } catch {
           skipped += 1;
         }
@@ -14823,11 +14841,11 @@ var NatsControlRpc = class {
     }
   }
 };
-function offlineControlResponse(requestId, neverSent = false) {
-  return { requestId, error: offlineAgentError(void 0, neverSent), result: void 0 };
+function offlineControlResponse(requestId2, neverSent = false) {
+  return { requestId: requestId2, error: offlineAgentError(void 0, neverSent), result: void 0 };
 }
-function timeoutControlResponse(requestId) {
-  return { requestId, error: timeoutAgentError(), result: void 0 };
+function timeoutControlResponse(requestId2) {
+  return { requestId: requestId2, error: timeoutAgentError(), result: void 0 };
 }
 
 // src/sandbox/selfhosted/session.ts
@@ -15407,10 +15425,10 @@ var OpConsumer = class {
    *  `SelfhostedControlError` on any AgentError. `requestId` is overridable
    *  because OpStart's REQUEST ID IS THE OP ID (its idempotency key) and must
    *  be STABLE across retries — every other op uses a fresh UUID per attempt. */
-  async controlOp(op, requestId = crypto.randomUUID()) {
+  async controlOp(op, requestId2 = crypto.randomUUID()) {
     const res = await this.deps.controlRpc.request(
       this.deps.rpcSubject,
-      { requestId, epoch: this.deps.epoch, op },
+      { requestId: requestId2, epoch: this.deps.epoch, op },
       { timeoutMs: this.deps.controlTimeoutMs }
     );
     if (res.error || !res.result) {
@@ -17732,8 +17750,61 @@ async function verifyStreamToken(secret, token, nowSeconds = Math.floor(Date.now
 
 // src/sandbox/display-stack.ts
 import { DESKTOP_STREAM_PORT as DESKTOP_STREAM_PORT4 } from "@opengeni/contracts";
+
+// src/sandbox/exec-banner.ts
+var EXEC_BANNER_HEADER_MAX_CHARS = 16 * 1024;
+var OUTPUT_DELIMITER = /\r?\nOutput:\r?\n/u;
+var SDK_METADATA_LINE = /^(?:Chunk ID:|Wall time:|Original token count:|Output:|Process (?:running with session ID|exited with code))/mu;
+var RUNNING_LINE = /^Process running with session ID (\d+)$/u;
+var EXITED_LINE = /^Process exited with code (-?\d+)$/u;
+var PROCESS_STATUS_PREFIX = /^Process (?:running with session ID|exited with code)/u;
+function parseExecResponseBanner(raw) {
+  const delimiter = OUTPUT_DELIMITER.exec(raw);
+  if (!delimiter) {
+    return SDK_METADATA_LINE.test(raw) ? { kind: "invalid" } : { kind: "absent" };
+  }
+  if (delimiter.index > EXEC_BANNER_HEADER_MAX_CHARS) return { kind: "invalid" };
+  const header = raw.slice(0, delimiter.index);
+  const status = [];
+  for (const line of header.split(/\r?\n/u)) {
+    const running = RUNNING_LINE.exec(line);
+    if (running) {
+      status.push({ kind: "running", value: running[1] });
+      continue;
+    }
+    const exited = EXITED_LINE.exec(line);
+    if (exited) {
+      status.push({ kind: "exited", value: exited[1] });
+      continue;
+    }
+    if (PROCESS_STATUS_PREFIX.test(line)) return { kind: "invalid" };
+  }
+  if (status.length !== 1) return { kind: "invalid" };
+  const terminal = status[0];
+  const value = Number(terminal.value);
+  if (!Number.isSafeInteger(value)) return { kind: "invalid" };
+  if (terminal.kind === "running") {
+    return value >= 0 ? { kind: "running", sessionId: value } : { kind: "invalid" };
+  }
+  return { kind: "exited", exitCode: value };
+}
+function parseExecBannerSessionId(raw) {
+  const banner = parseExecResponseBanner(raw);
+  return banner.kind === "running" ? banner.sessionId : null;
+}
+function parseExecBannerExitCode(raw) {
+  const banner = parseExecResponseBanner(raw);
+  return banner.kind === "exited" ? banner.exitCode : null;
+}
+
+// src/sandbox/display-stack.ts
 var STREAM_PORT = DESKTOP_STREAM_PORT4;
 var DISPLAY_STACK_TIMEOUT_MS = 9e4;
+var DISPLAY_STACK_PROVIDER_YIELD_MS = 15e3;
+var DISPLAY_STACK_PROVIDER_POLL_MS = 5e3;
+var DISPLAY_STACK_TERMINATION_GRACE_MS = 5e3;
+var DISPLAY_STACK_CLEANUP_CALL_MS = 250;
+var DISPLAY_STACK_DRAIN_GRACE_MS = 100;
 var PAINT_PROBE_ATTEMPTS = 150;
 var PAINT_PROBE_INTERVAL_S = 0.2;
 var PAINT_MIN_BYTES = 6e4;
@@ -17743,7 +17814,7 @@ var DisplayStackError = class extends Error {
   exitCode;
   stage;
   constructor(exitCode, output) {
-    const stage = exitCode === 11 ? "xvfb" : exitCode === 12 ? "x11vnc" : exitCode === 13 ? "websockify" : exitCode === 14 ? "paint" : "unknown";
+    const stage = exitCode === 11 ? "xvfb" : exitCode === 12 ? "x11vnc" : exitCode === 13 ? "websockify" : exitCode === 14 ? "paint" : exitCode === 15 ? "lock" : exitCode === 124 || /OPENGENI_DISPLAY_TIMEOUT/u.test(output) ? "timeout" : "unknown";
     super(
       `desktop display stack failed at stage "${stage}" (exit ${exitCode})${output ? `:
 ${output}` : ""}`
@@ -17763,9 +17834,11 @@ function buildDisplayStackScript(options = {}) {
   const geometry = options.geometry ?? DEFAULT_DESKTOP_GEOMETRY;
   const port = options.port ?? DESKTOP_STREAM_PORT4;
   const env = `DESKTOP_W=${geometry.width} DESKTOP_H=${geometry.height} DESKTOP_DPI=${geometry.dpi} STREAM_PORT=${port}`;
-  const bringUp = `if nc -z 127.0.0.1 ${port} >/dev/null 2>&1 && nc -z 127.0.0.1 5900 >/dev/null 2>&1; then echo "OPENGENI_DESKTOP_UP port=${port} geometry=${geometry.width}x${geometry.height} dpi=${geometry.dpi} (precheck)"; else mkdir -p /tmp/opengeni-desktop && flock -w 45 /tmp/opengeni-desktop/up.outer.lock env ${env} opengeni-desktop-up; fi`;
-  const paintProbe = `p=/tmp/opengeni-desktop/paint-probe.png; prev=0; for i in $(seq 1 ${PAINT_PROBE_ATTEMPTS}); do if DISPLAY=:0 scrot -o "$p" >/dev/null 2>&1; then sz=$(wc -c < "$p" 2>/dev/null || echo 0); else sz=0; fi; rm -f "$p"; if [ "$sz" -ge ${PAINT_MIN_BYTES} ] && [ "$prev" -ge ${PAINT_MIN_BYTES} ]; then d=$((sz-prev)); [ "$d" -lt 0 ] && d=$((0-d)); [ "$d" -le ${PAINT_SETTLE_DELTA_BYTES} ] && break; fi; prev=$sz; if [ "$i" = "${PAINT_PROBE_ATTEMPTS}" ]; then echo "OPENGENI_DESKTOP_NOT_PAINTING scrot below ${PAINT_MIN_BYTES}B or unsettled after warmup (last=$sz)"; exit 14; fi; sleep ${PAINT_PROBE_INTERVAL_S}; done`;
-  return `mkdir -p /tmp/opengeni-desktop; { ${bringUp} ; } && { ${paintProbe} ; }`;
+  const lockedLauncher = `ds_started=$1; fw=$2; ds_class=cold; ds_stage() { ds_now=$(date +%s%3N); echo "OPENGENI_DISPLAY_STAGE stage=$1 elapsed_ms=$((ds_now-ds_started)) classification=$ds_class"; }; fa=$(date +%s%3N); fd=$((fa-fw)); [ "$fd" -ge 50 ] && ds_class=contention; ds_stage outer_flock_acquired; ds_stage launcher_issued; env ${env} opengeni-desktop-up; urc=$?; ds_stage launcher_complete; exit "$urc"`;
+  const bringUp = `if nc -z 127.0.0.1 ${port} >/dev/null 2>&1 && nc -z 127.0.0.1 5900 >/dev/null 2>&1; then ds_class=already_ready; ds_stage precheck_ready; echo "OPENGENI_DESKTOP_UP port=${port} geometry=${geometry.width}x${geometry.height} dpi=${geometry.dpi} (precheck)"; else ds_class=cold; ds_stage precheck_miss; mkdir -p /tmp/opengeni-desktop; ds_stage outer_flock_wait; fw=$(date +%s%3N); flock --close --conflict-exit-code 75 --wait 45 /tmp/opengeni-desktop/up.outer.lock bash -c ${shellQuote3(lockedLauncher)} _ "$ds_started" "$fw"; frc=$?; if [ "$frc" -eq 75 ]; then ds_stage outer_flock_timeout; echo "OPENGENI_DESKTOP_LOCK_TIMEOUT"; exit 15; fi; if [ "$frc" -ne 0 ]; then exit "$frc"; fi; fi`;
+  const paintProbe = `ds_stage paint_probe_started; p=/tmp/opengeni-desktop/paint-probe.png; prev=0; for i in $(seq 1 ${PAINT_PROBE_ATTEMPTS}); do if DISPLAY=:0 scrot -o "$p" >/dev/null 2>&1; then sz=$(wc -c < "$p" 2>/dev/null || echo 0); else sz=0; fi; rm -f "$p"; if [ "$sz" -ge ${PAINT_MIN_BYTES} ] && [ "$prev" -ge ${PAINT_MIN_BYTES} ]; then d=$((sz-prev)); [ "$d" -lt 0 ] && d=$((0-d)); if [ "$d" -le ${PAINT_SETTLE_DELTA_BYTES} ]; then ds_stage paint_ready; break; fi; fi; prev=$sz; if [ "$i" = "${PAINT_PROBE_ATTEMPTS}" ]; then ds_stage paint_failed; echo "OPENGENI_DESKTOP_NOT_PAINTING scrot below ${PAINT_MIN_BYTES}B or unsettled after warmup (last=$sz)"; exit 14; fi; sleep ${PAINT_PROBE_INTERVAL_S}; done`;
+  const trace = `ds_started=$(date +%s%3N); ds_class=unknown; ds_stage() { ds_now=$(date +%s%3N); echo "OPENGENI_DISPLAY_STAGE stage=$1 elapsed_ms=$((ds_now-ds_started)) classification=$ds_class"; }; ds_stage script_entry`;
+  return `${trace}; mkdir -p /tmp/opengeni-desktop; { ${bringUp} ; } && { ${paintProbe} ; }`;
 }
 function execResultOutput(result) {
   if (typeof result === "string") {
@@ -17775,11 +17848,417 @@ function execResultOutput(result) {
 }
 function execResultExitCode(result) {
   if (typeof result === "string") {
-    return null;
+    const banner = parseExecResponseBanner(result);
+    if (banner.kind === "exited") return banner.exitCode;
+    return banner.kind === "invalid" ? -1 : null;
   }
   return typeof result.exitCode === "number" ? result.exitCode : null;
 }
+function execResultSessionId(result) {
+  if (typeof result === "string") {
+    const banner = parseExecResponseBanner(result);
+    return banner.kind === "running" ? banner.sessionId : null;
+  }
+  const value = result.sessionId ?? result.session_id;
+  return typeof value === "number" ? value : null;
+}
+function shellQuote3(value) {
+  return `'${value.replaceAll("'", `'"'"'`)}'`;
+}
+function boundedDisplayStackCommand(command, timeoutMs, markerPath, markerToken) {
+  const graceMs = Math.min(
+    DISPLAY_STACK_TERMINATION_GRACE_MS,
+    Math.max(20, Math.floor(timeoutMs / 4))
+  );
+  const commandTimeoutMs = Math.max(1, timeoutMs - graceMs);
+  const killAfterMs = Math.max(1, Math.floor(graceMs / 2));
+  const commandTimeoutSeconds = (commandTimeoutMs / 1e3).toFixed(3);
+  const killAfterSeconds = (killAfterMs / 1e3).toFixed(3);
+  const managedCommand = `marker=${shellQuote3(markerPath)}; token=${shellQuote3(markerToken)}; cancel="$marker.cancelled"; if [ -e "$cancel" ]; then echo "OPENGENI_DISPLAY_CANCELLED"; exit 124; fi; pid=$$; pgid=$(ps -o pgid= -p "$pid" 2>/dev/null | tr -d ' '); start=$(awk '{print $22}' "/proc/$pid/stat" 2>/dev/null || true); printf '%s %s %s %s\\n' "$pid" "$pgid" "$start" "$token" >"$marker"; if [ -e "$cancel" ]; then rm -f "$marker"; echo "OPENGENI_DISPLAY_CANCELLED"; exit 124; fi; bash -c ${shellQuote3(command)}; rc=$?; rm -f "$marker"; exit "$rc"`;
+  return (
+    // Do not use timeout --foreground here. The display command contains flock
+    // supervisors and launcher children; default process-group mode is required
+    // so a deadline cannot leave a waiter alive to acquire the lock and launch
+    // after the caller has already failed.
+    `timeout --signal=TERM --kill-after=${killAfterSeconds}s ${commandTimeoutSeconds}s bash -c ${shellQuote3(managedCommand)}; rc=$?; if [ "$rc" -eq 124 ]; then echo "OPENGENI_DISPLAY_TIMEOUT elapsed_ms=${commandTimeoutMs}"; fi; exit "$rc"`
+  );
+}
+var DisplayStackWallTimeoutError = class extends Error {
+};
+var DisplayStackOperationFencedError = class extends Error {
+};
+var stableDisplayStackOperationStates = /* @__PURE__ */ new Map();
+var stableSessionStateOperationStates = /* @__PURE__ */ new WeakMap();
+var displayStackOperationStates = /* @__PURE__ */ new WeakMap();
+function asRecord(value) {
+  return value !== null && typeof value === "object" ? value : null;
+}
+function nonEmptyString(value) {
+  return typeof value === "string" && value.length > 0 ? value : null;
+}
+function readSessionState(session) {
+  try {
+    return asRecord(session)?.state;
+  } catch {
+    return void 0;
+  }
+}
+function stableSandboxIdentity(session, options) {
+  const explicit = nonEmptyString(options.telemetryContext?.sandboxId);
+  if (explicit) return `sandbox:${explicit}`;
+  const sessionRecord = asRecord(session);
+  const state = asRecord(readSessionState(session));
+  const providerState = state ? asRecord(state.providerState) : null;
+  const candidates = [sessionRecord, state, providerState];
+  const fields = [
+    "sandboxId",
+    "instanceId",
+    "agentId",
+    "hostId",
+    "containerId",
+    "id",
+    "workspaceRootPath"
+  ];
+  for (const candidate of candidates) {
+    if (!candidate) continue;
+    for (const field of fields) {
+      const value = nonEmptyString(candidate[field]);
+      if (value) return `sandbox:${value}`;
+    }
+  }
+  return null;
+}
+function newOperationState() {
+  return {
+    epoch: 0,
+    owner: null,
+    waiters: [],
+    inFlight: /* @__PURE__ */ new Set(),
+    drain: null,
+    pendingCleanup: /* @__PURE__ */ new Map(),
+    physicallyQuiescent: true
+  };
+}
+function operationState(session, options) {
+  if ((typeof session !== "object" || session === null) && typeof session !== "function") {
+    return null;
+  }
+  const stableKey = stableSandboxIdentity(session, options);
+  if (stableKey) {
+    let state2 = stableDisplayStackOperationStates.get(stableKey);
+    if (!state2) {
+      state2 = newOperationState();
+      stableDisplayStackOperationStates.set(stableKey, state2);
+    }
+    return state2;
+  }
+  const providerState = readSessionState(session);
+  if (providerState && (typeof providerState === "object" || typeof providerState === "function")) {
+    const stateKey = providerState;
+    let state2 = stableSessionStateOperationStates.get(stateKey);
+    if (!state2) {
+      state2 = newOperationState();
+      stableSessionStateOperationStates.set(stateKey, state2);
+    }
+    return state2;
+  }
+  const key = session;
+  let state = displayStackOperationStates.get(key);
+  if (!state) {
+    state = newOperationState();
+    displayStackOperationStates.set(key, state);
+  }
+  return state;
+}
+function settleOperationWaiter(waiter, error) {
+  if (waiter.settled) return;
+  waiter.settled = true;
+  if (waiter.timer) clearTimeout(waiter.timer);
+  if (error === void 0) waiter.resolve();
+  else waiter.reject(error);
+}
+function pumpOperationWaiters(state) {
+  if (state.owner) return;
+  while (state.waiters.length > 0) {
+    const waiter = state.waiters.shift();
+    if (waiter.settled) continue;
+    if (waiter.epoch !== state.epoch) {
+      settleOperationWaiter(waiter, new DisplayStackOperationFencedError());
+      continue;
+    }
+    state.owner = waiter;
+    settleOperationWaiter(waiter);
+    return;
+  }
+}
+function acquireOperation(state, deadline) {
+  return new Promise((resolve5, reject) => {
+    const waiter = {
+      epoch: state.epoch,
+      settled: false,
+      resolve: () => {
+        resolve5(() => {
+          if (state.owner !== waiter) return;
+          state.owner = null;
+          pumpOperationWaiters(state);
+        });
+      },
+      reject
+    };
+    state.waiters.push(waiter);
+    const remainingMs = deadline - monotonicNow();
+    if (remainingMs <= 0) {
+      waiter.settled = true;
+      state.waiters = state.waiters.filter((candidate) => candidate !== waiter);
+      reject(new DisplayStackWallTimeoutError());
+      return;
+    }
+    waiter.timer = setTimeout(() => {
+      if (waiter.settled) return;
+      waiter.settled = true;
+      state.waiters = state.waiters.filter((candidate) => candidate !== waiter);
+      reject(new DisplayStackWallTimeoutError());
+    }, remainingMs);
+    waiter.timer.unref?.();
+    pumpOperationWaiters(state);
+  });
+}
+function invalidateQueuedOperations(state, epoch) {
+  const retained = [];
+  for (const waiter of state.waiters) {
+    if (waiter.epoch === epoch)
+      settleOperationWaiter(waiter, new DisplayStackOperationFencedError());
+    else retained.push(waiter);
+  }
+  state.waiters = retained;
+}
+function monotonicNow() {
+  return performance.now();
+}
+async function waitForFencedOperation(state, deadline) {
+  const drain = state.drain;
+  if (!drain) return true;
+  try {
+    await beforeDeadline(drain, deadline);
+  } catch {
+    return false;
+  }
+  if (state.drain === drain) state.drain = null;
+  return true;
+}
+function trackProviderCall(state, promise) {
+  if (!state) return promise;
+  state.inFlight.add(promise);
+  void promise.then(
+    () => state.inFlight.delete(promise),
+    () => state.inFlight.delete(promise)
+  );
+  return promise;
+}
+function boundedProviderDrain(pending) {
+  if (pending.length === 0) return Promise.resolve();
+  return new Promise((resolve5) => {
+    let remaining = pending.length;
+    let timer;
+    const finish = () => {
+      if (timer) clearTimeout(timer);
+      resolve5();
+    };
+    timer = setTimeout(finish, DISPLAY_STACK_DRAIN_GRACE_MS);
+    timer.unref?.();
+    for (const promise of pending) {
+      void promise.then(
+        () => {
+          remaining -= 1;
+          if (remaining === 0) finish();
+        },
+        () => {
+          remaining -= 1;
+          if (remaining === 0) finish();
+        }
+      );
+    }
+  });
+}
+function fenceOperation(state, epoch, abortController, cleanup) {
+  abortController.abort(new DisplayStackWallTimeoutError());
+  if (!state) return;
+  if (state.epoch !== epoch) return;
+  state.pendingCleanup.set(cleanup.markerToken, cleanup);
+  state.physicallyQuiescent = false;
+  invalidateQueuedOperations(state, epoch);
+  state.epoch += 1;
+  const pending = [...state.inFlight];
+  const drain = boundedProviderDrain(pending);
+  state.drain = state.drain ? Promise.all([state.drain, drain]).then(() => void 0) : drain;
+  void drain.then(() => {
+    for (const promise of pending) state.inFlight.delete(promise);
+  });
+}
+function assertCurrentOperation(state, epoch) {
+  if (state && state.epoch !== epoch) throw new DisplayStackOperationFencedError();
+}
+async function beforeDeadline(promise, deadline, now = monotonicNow) {
+  const remainingMs = deadline - now();
+  if (remainingMs <= 0) throw new DisplayStackWallTimeoutError();
+  let timer;
+  try {
+    return await Promise.race([
+      promise,
+      new Promise((_resolve, reject) => {
+        timer = setTimeout(() => reject(new DisplayStackWallTimeoutError()), remainingMs);
+        timer.unref?.();
+      })
+    ]);
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+}
+function displayStackCleanupCommand(markerPath, markerToken) {
+  const marker = shellQuote3(markerPath);
+  const token = shellQuote3(markerToken);
+  const script = `marker=${marker}; token=${token}; cancel="$marker.cancelled"; : >"$cancel" || { echo "OPENGENI_DISPLAY_CLEANUP status=invalid"; exit 75; }; if [ ! -r "$marker" ]; then echo "OPENGENI_DISPLAY_CLEANUP status=stopped"; exit 0; fi; read -r pid pgid start actual <"$marker" || { echo "OPENGENI_DISPLAY_CLEANUP status=invalid"; exit 75; }; [ "$actual" = "$token" ] || { echo "OPENGENI_DISPLAY_CLEANUP status=invalid"; exit 75; }; case "$pid" in ''|*[!0-9]*) echo "OPENGENI_DISPLAY_CLEANUP status=invalid"; exit 75;; esac; case "$pgid" in ''|*[!0-9]*) echo "OPENGENI_DISPLAY_CLEANUP status=invalid"; exit 75;; esac; case "$start" in ''|*[!0-9]*) echo "OPENGENI_DISPLAY_CLEANUP status=invalid"; exit 75;; esac; current=$(awk '{print $22}' "/proc/$pid/stat" 2>/dev/null || true); if [ -z "$current" ] || [ "$current" != "$start" ]; then rm -f "$marker"; echo "OPENGENI_DISPLAY_CLEANUP status=stopped"; exit 0; fi; kill -TERM -- "-$pgid" 2>/dev/null || true; for i in $(seq 1 10); do if ! kill -0 -- "-$pgid" 2>/dev/null; then rm -f "$marker"; echo "OPENGENI_DISPLAY_CLEANUP status=stopped"; exit 0; fi; sleep 0.05; done; kill -KILL -- "-$pgid" 2>/dev/null || true; for i in $(seq 1 20); do if ! kill -0 -- "-$pgid" 2>/dev/null; then rm -f "$marker"; echo "OPENGENI_DISPLAY_CLEANUP status=stopped"; exit 0; fi; sleep 0.05; done; echo "OPENGENI_DISPLAY_CLEANUP status=alive"; exit 75`;
+  return `timeout --signal=TERM --kill-after=0.2s 1.5s bash -c ${shellQuote3(script)}`;
+}
+async function runProviderCommandToDeadline(session, command, deadline) {
+  const controller = new AbortController();
+  let result = await beforeDeadline(
+    Promise.resolve(
+      typeof session.exec === "function" ? session.exec({
+        cmd: command,
+        yieldTimeMs: Math.min(500, DISPLAY_STACK_CLEANUP_CALL_MS),
+        maxOutputTokens: 4e3,
+        signal: controller.signal
+      }) : session.execCommand({
+        cmd: command,
+        yieldTimeMs: Math.min(500, DISPLAY_STACK_CLEANUP_CALL_MS),
+        maxOutputTokens: 4e3,
+        signal: controller.signal
+      })
+    ),
+    deadline
+  );
+  let providerSessionId = execResultSessionId(result);
+  while (providerSessionId !== null) {
+    if (typeof session.writeStdin !== "function") {
+      throw new Error("display cleanup provider yielded without writeStdin");
+    }
+    const remainingMs = deadline - monotonicNow();
+    if (remainingMs <= 1) throw new DisplayStackWallTimeoutError();
+    result = await beforeDeadline(
+      session.writeStdin({
+        sessionId: providerSessionId,
+        chars: "",
+        yieldTimeMs: Math.max(1, Math.min(250, remainingMs - 1)),
+        maxOutputTokens: 4e3,
+        signal: controller.signal
+      }),
+      deadline
+    );
+    providerSessionId = execResultSessionId(result);
+  }
+  return result;
+}
+async function interruptProviderProcess(session, providerSessionId, deadline) {
+  if (providerSessionId === null || typeof session.writeStdin !== "function") return;
+  try {
+    await beforeDeadline(
+      session.writeStdin({
+        sessionId: providerSessionId,
+        chars: "",
+        yieldTimeMs: 100,
+        maxOutputTokens: 256
+      }),
+      deadline
+    );
+  } catch {
+  }
+}
+async function cleanupDisplayStackProcess(session, pending, deadline) {
+  try {
+    const result = await runProviderCommandToDeadline(
+      session,
+      displayStackCleanupCommand(pending.markerPath, pending.markerToken),
+      deadline
+    );
+    const output = execResultOutput(result);
+    const status = /OPENGENI_DISPLAY_CLEANUP status=(stopped|absent|alive|invalid)/u.exec(
+      output
+    )?.[1];
+    return status === "stopped";
+  } catch {
+    return false;
+  }
+}
+async function reconcilePendingCleanup(session, state, deadline) {
+  const entries = [...state.pendingCleanup.values()];
+  if (entries.length === 0) {
+    state.physicallyQuiescent = true;
+    return true;
+  }
+  const results = await Promise.all(
+    entries.map(async (pending) => ({
+      pending,
+      stopped: await cleanupDisplayStackProcess(session, pending, deadline)
+    }))
+  );
+  for (const { pending, stopped } of results) {
+    if (stopped) state.pendingCleanup.delete(pending.markerToken);
+  }
+  state.physicallyQuiescent = state.pendingCleanup.size === 0;
+  return state.physicallyQuiescent;
+}
+function requestId() {
+  return `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
+}
+function telemetryReporter(options, started, now = monotonicNow) {
+  const id = requestId();
+  const context = options.telemetryContext;
+  const sink = options.onTelemetry ?? (context ? (event) => console.info(`[display-stack] ${JSON.stringify(event)}`) : void 0);
+  const emittedSandboxStages = /* @__PURE__ */ new Set();
+  const emit = (stage, status, fields = {}) => {
+    if (!sink) return;
+    const event = {
+      type: "display_stack.stage",
+      requestId: id,
+      stage,
+      status,
+      elapsedMs: fields.elapsedMs ?? now() - started,
+      source: fields.source ?? "host",
+      classification: fields.classification ?? "unknown",
+      callerKind: context?.callerKind ?? "unknown",
+      ...context?.sandboxId ? { sandboxId: context.sandboxId } : {},
+      ...context?.leaseEpoch !== void 0 ? { leaseEpoch: context.leaseEpoch } : {},
+      ...fields.providerSessionId !== void 0 ? { providerSessionId: fields.providerSessionId } : {}
+    };
+    try {
+      void Promise.resolve(sink(event)).catch(() => void 0);
+    } catch {
+    }
+  };
+  const emitSandboxStages = (output) => {
+    for (const match of output.matchAll(
+      /OPENGENI_(?:DISPLAY|DESKTOP)_STAGE stage=([a-z0-9_]+) elapsed_ms=(\d+)(?: classification=(cold|already_ready|contention|unknown))?/gu
+    )) {
+      const [line, stage, elapsed, classification] = match;
+      if (!stage || !elapsed || emittedSandboxStages.has(line)) continue;
+      emittedSandboxStages.add(line);
+      emit(stage, "completed", {
+        source: "sandbox",
+        elapsedMs: Number(elapsed),
+        classification: classification ?? "unknown"
+      });
+    }
+  };
+  return { emit, emitSandboxStages };
+}
 function inferExitFromOutput(output) {
+  if (/OPENGENI_DISPLAY_TIMEOUT/.test(output)) {
+    return 124;
+  }
+  if (/OPENGENI_DESKTOP_LOCK_TIMEOUT/.test(output)) {
+    return 15;
+  }
   if (/OPENGENI_DESKTOP_NOT_PAINTING/.test(output)) {
     return 14;
   }
@@ -17807,15 +18286,163 @@ async function ensureDisplayStack(session, options = {}) {
   const geometry = options.geometry ?? DEFAULT_DESKTOP_GEOMETRY;
   const port = options.port ?? DESKTOP_STREAM_PORT4;
   const timeoutMs = options.timeoutMs ?? DISPLAY_STACK_TIMEOUT_MS;
-  const cmd = buildDisplayStackScript({ geometry, port });
-  const result = typeof s.exec === "function" ? await s.exec({ cmd, yieldTimeMs: timeoutMs, maxOutputTokens: 2e4 }) : await s.execCommand({ cmd, yieldTimeMs: timeoutMs, maxOutputTokens: 2e4 });
-  const output = execResultOutput(result);
-  const exitCode = execResultExitCode(result) ?? inferExitFromOutput(output);
-  if (exitCode !== 0) {
-    throw new DisplayStackError(exitCode, output);
+  if (!Number.isFinite(timeoutMs) || timeoutMs <= 0) {
+    throw new RangeError("ensureDisplayStack timeoutMs must be a positive finite number");
+  }
+  const started = monotonicNow();
+  const deadline = started + timeoutMs;
+  const telemetry = telemetryReporter(options, started, monotonicNow);
+  const operationToken = requestId();
+  const markerPath = `/tmp/opengeni-desktop/display-stack-${operationToken}.pid`;
+  const cmd = boundedDisplayStackCommand(
+    buildDisplayStackScript({ geometry, port }),
+    timeoutMs,
+    markerPath,
+    operationToken
+  );
+  const outputParts = [];
+  const state = operationState(session, options);
+  let release;
+  if (state) {
+    try {
+      release = await acquireOperation(state, deadline);
+    } catch (error) {
+      if (error instanceof DisplayStackWallTimeoutError || error instanceof DisplayStackOperationFencedError) {
+        throw new DisplayStackError(
+          124,
+          "OPENGENI_DISPLAY_TIMEOUT display operation admission was fenced"
+        );
+      }
+      throw error;
+    }
+  }
+  try {
+    if (state && !state.physicallyQuiescent) {
+      const cleanupDeadline = monotonicNow() + DISPLAY_STACK_CLEANUP_CALL_MS;
+      const quiesced = await reconcilePendingCleanup(s, state, cleanupDeadline);
+      if (!quiesced) {
+        throw new DisplayStackError(
+          124,
+          "OPENGENI_DISPLAY_TIMEOUT physical cleanup is still pending; retry is fenced"
+        );
+      }
+    }
+    const epoch = state?.epoch ?? 0;
+    const abortController = new AbortController();
+    let activeProviderSessionId = null;
+    telemetry.emit("request_entry", "started");
+    telemetry.emit("exec_issued", "started");
+    try {
+      const initialYieldMs = Math.max(1, Math.min(DISPLAY_STACK_PROVIDER_YIELD_MS, timeoutMs - 1));
+      const initialExec = trackProviderCall(
+        state,
+        Promise.resolve(
+          typeof s.exec === "function" ? s.exec({
+            cmd,
+            yieldTimeMs: initialYieldMs,
+            maxOutputTokens: 2e4,
+            signal: abortController.signal
+          }) : s.execCommand({
+            cmd,
+            yieldTimeMs: initialYieldMs,
+            maxOutputTokens: 2e4,
+            signal: abortController.signal
+          })
+        )
+      );
+      let result = await beforeDeadline(
+        initialExec,
+        deadline,
+        monotonicNow
+      );
+      assertCurrentOperation(state, epoch);
+      let chunk = execResultOutput(result);
+      outputParts.push(chunk);
+      telemetry.emitSandboxStages(chunk);
+      telemetry.emit("provider_first_result", "completed");
+      let providerSessionId = execResultSessionId(result);
+      activeProviderSessionId = providerSessionId;
+      while (providerSessionId !== null) {
+        telemetry.emit("provider_yield", "waiting", { providerSessionId });
+        if (typeof s.writeStdin !== "function") {
+          throw new DisplayStackError(
+            -1,
+            `${outputParts.join("\n")}
+provider yielded process ${providerSessionId} but exposes no writeStdin poll surface`
+          );
+        }
+        assertCurrentOperation(state, epoch);
+        const remainingMs = deadline - monotonicNow();
+        if (remainingMs <= 1) throw new DisplayStackWallTimeoutError();
+        const pollYieldMs = Math.max(1, Math.min(DISPLAY_STACK_PROVIDER_POLL_MS, remainingMs - 1));
+        result = await beforeDeadline(
+          trackProviderCall(
+            state,
+            s.writeStdin({
+              sessionId: providerSessionId,
+              chars: "",
+              yieldTimeMs: pollYieldMs,
+              maxOutputTokens: 2e4,
+              signal: abortController.signal
+            })
+          ),
+          deadline,
+          monotonicNow
+        );
+        assertCurrentOperation(state, epoch);
+        chunk = execResultOutput(result);
+        outputParts.push(chunk);
+        telemetry.emitSandboxStages(chunk);
+        providerSessionId = execResultSessionId(result);
+        activeProviderSessionId = providerSessionId;
+      }
+      const output = outputParts.join("\n");
+      const exitCode = execResultExitCode(result) ?? inferExitFromOutput(output);
+      telemetry.emit("process_complete", exitCode === 0 ? "completed" : "failed");
+      if (exitCode !== 0) {
+        throw new DisplayStackError(exitCode, output);
+      }
+      const marker = (output.match(/OPENGENI_DESKTOP_UP[^\n]*/) ?? [""])[0];
+      telemetry.emit("readiness_complete", "completed");
+      return { port, geometry, marker };
+    } catch (error) {
+      if (error instanceof DisplayStackWallTimeoutError || error instanceof DisplayStackOperationFencedError) {
+        const pendingCleanup = {
+          markerPath,
+          markerToken: operationToken
+        };
+        fenceOperation(state, epoch, abortController, pendingCleanup);
+        const cleanupDeadline = monotonicNow() + DISPLAY_STACK_CLEANUP_CALL_MS;
+        telemetry.emit("process_cleanup", "started");
+        await interruptProviderProcess(
+          s,
+          activeProviderSessionId,
+          Math.min(cleanupDeadline, monotonicNow() + 50)
+        );
+        let quiesced = false;
+        if (state) {
+          quiesced = await reconcilePendingCleanup(s, state, cleanupDeadline);
+          if (!quiesced) {
+            await waitForFencedOperation(
+              state,
+              Math.min(cleanupDeadline, monotonicNow() + DISPLAY_STACK_DRAIN_GRACE_MS)
+            );
+          }
+        } else {
+          quiesced = await cleanupDisplayStackProcess(s, pendingCleanup, cleanupDeadline);
+        }
+        telemetry.emit("process_cleanup", quiesced ? "completed" : "failed");
+        const output = `${outputParts.join("\n")}
+OPENGENI_DISPLAY_TIMEOUT wall_ms=${timeoutMs}`;
+        telemetry.emit("wall_deadline", "failed");
+        throw new DisplayStackError(124, output);
+      }
+      telemetry.emit("request_failed", "failed");
+      throw error;
+    }
+  } finally {
+    release?.();
   }
-  const marker = (output.match(/OPENGENI_DESKTOP_UP[^\n]*/) ?? [""])[0];
-  return { port, geometry, marker };
 }
 async function tearDownDisplayStack(session) {
   const s = session;
@@ -18235,7 +18862,7 @@ function runCredentialRoot(sessionId) {
 function runCredentialPointerFile(sessionId) {
   return `${runCredentialRoot(sessionId)}/current`;
 }
-function shellQuote3(value) {
+function shellQuote4(value) {
   return `'${value.replace(/'/g, "'\\''")}'`;
 }
 function base64(value) {
@@ -18253,8 +18880,8 @@ function portableBase64DecodeCommand() {
   ].join("\n");
 }
 function pointerLockAcquireCommands(root) {
-  const lockFile = shellQuote3(`${root}/.pointer.lock`);
-  const lockDirectory = shellQuote3(`${root}/.pointer.lockdir`);
+  const lockFile = shellQuote4(`${root}/.pointer.lock`);
+  const lockDirectory = shellQuote4(`${root}/.pointer.lockdir`);
   return [
     `if command -v flock >/dev/null 2>&1; then`,
     `  exec 9>${lockFile}`,
@@ -18298,7 +18925,7 @@ async function runCredentialCommand(session, cmd, commandRunner) {
 ${cmd}
 printf '\\n${COMMAND_OK_MARKER}\\n'`;
   const args = {
-    cmd: `env -u BASH_ENV bash --noprofile --norc -c ${shellQuote3(marked)}`,
+    cmd: `env -u BASH_ENV bash --noprofile --norc -c ${shellQuote4(marked)}`,
     yieldTimeMs: 12e4,
     maxOutputTokens: 4e3
   };
@@ -18308,19 +18935,19 @@ printf '\\n${COMMAND_OK_MARKER}\\n'`;
   }
 }
 async function writeCredentialFile(session, path, content, commandRunner) {
-  await runCredentialCommand(session, `: > ${shellQuote3(path)}`, commandRunner);
+  await runCredentialCommand(session, `: > ${shellQuote4(path)}`, commandRunner);
   const encoded = base64(content);
   for (let offset = 0; offset < encoded.length; offset += WRITE_CHUNK_BYTES) {
     const chunk = encoded.slice(offset, offset + WRITE_CHUNK_BYTES);
     await runCredentialCommand(
       session,
-      `printf %s ${shellQuote3(chunk)} | ${portableBase64DecodeCommand()} >> ${shellQuote3(path)}`,
+      `printf %s ${shellQuote4(chunk)} | ${portableBase64DecodeCommand()} >> ${shellQuote4(path)}`,
       commandRunner
     );
   }
   await runCredentialCommand(
     session,
-    `[ "$(wc -c < ${shellQuote3(path)} | tr -d '[:space:]')" = ${shellQuote3(String(byteLength(content)))} ]`,
+    `[ "$(wc -c < ${shellQuote4(path)} | tr -d '[:space:]')" = ${shellQuote4(String(byteLength(content)))} ]`,
     commandRunner
   );
 }
@@ -18345,19 +18972,19 @@ async function materializeRunCredentials(session, material, options) {
     session,
     [
       "umask 077",
-      `mkdir -p -- ${shellQuote3(`${root}/versions`)}`,
-      `chmod 0700 -- ${shellQuote3(root)} ${shellQuote3(`${root}/versions`)}`,
-      `rm -rf -- ${shellQuote3(stage)}`,
-      `mkdir -p -- ${shellQuote3(`${stage}/files`)}`
+      `mkdir -p -- ${shellQuote4(`${root}/versions`)}`,
+      `chmod 0700 -- ${shellQuote4(root)} ${shellQuote4(`${root}/versions`)}`,
+      `rm -rf -- ${shellQuote4(stage)}`,
+      `mkdir -p -- ${shellQuote4(`${stage}/files`)}`
     ].join("\n"),
     options.commandRunner
   );
   const environmentLines = [
     ...Object.entries(material.environment).map(
-      ([name, value]) => `export ${name}=${shellQuote3(value)}`
+      ([name, value]) => `export ${name}=${shellQuote4(value)}`
     ),
     ...Object.entries(material.fileEnvironment).map(
-      ([name, path]) => `export ${name}=${shellQuote3(`${version}/files/${path}`)}`
+      ([name, path]) => `export ${name}=${shellQuote4(`${version}/files/${path}`)}`
     )
   ];
   await writeCredentialFile(
@@ -18369,17 +18996,17 @@ async function materializeRunCredentials(session, material, options) {
   );
   await runCredentialCommand(
     session,
-    `chmod 0600 -- ${shellQuote3(`${stage}/env`)}`,
+    `chmod 0600 -- ${shellQuote4(`${stage}/env`)}`,
     options.commandRunner
   );
   for (const file of material.files) {
     const target = `${stage}/files/${file.path}`;
     const parent = target.slice(0, target.lastIndexOf("/"));
-    await runCredentialCommand(session, `mkdir -p -- ${shellQuote3(parent)}`, options.commandRunner);
+    await runCredentialCommand(session, `mkdir -p -- ${shellQuote4(parent)}`, options.commandRunner);
     await writeCredentialFile(session, target, file.content, options.commandRunner);
     await runCredentialCommand(
       session,
-      `chmod ${shellQuote3(file.mode ?? "0600")} -- ${shellQuote3(target)}`,
+      `chmod ${shellQuote4(file.mode ?? "0600")} -- ${shellQuote4(target)}`,
       options.commandRunner
     );
   }
@@ -18387,19 +19014,19 @@ async function materializeRunCredentials(session, material, options) {
     session,
     [
       ...pointerLockAcquireCommands(root),
-      `previous=$(cat -- ${shellQuote3(`${root}/current`)} 2>/dev/null || :)`,
-      `mv -- ${shellQuote3(stage)} ${shellQuote3(version)}`,
-      `printf '%s\\n' ${shellQuote3(versionName)} > ${shellQuote3(`${root}/.next`)}`,
-      `mv -f -- ${shellQuote3(`${root}/.next`)} ${shellQuote3(`${root}/current`)}`,
+      `previous=$(cat -- ${shellQuote4(`${root}/current`)} 2>/dev/null || :)`,
+      `mv -- ${shellQuote4(stage)} ${shellQuote4(version)}`,
+      `printf '%s\\n' ${shellQuote4(versionName)} > ${shellQuote4(`${root}/.next`)}`,
+      `mv -f -- ${shellQuote4(`${root}/.next`)} ${shellQuote4(`${root}/current`)}`,
       ...options.prunePreviousGenerations ? [
-        `find ${shellQuote3(`${root}/versions`)} -mindepth 1 -maxdepth 1 ! -name ${shellQuote3(versionName)} -exec rm -rf -- {} +`
+        `find ${shellQuote4(`${root}/versions`)} -mindepth 1 -maxdepth 1 ! -name ${shellQuote4(versionName)} -exec rm -rf -- {} +`
       ] : options.pruneOtherAttempts ? [
-        `find ${shellQuote3(`${root}/versions`)} -mindepth 1 -maxdepth 1 ! -name ${shellQuote3(`${attemptId}-${options.executionGeneration}-*`)} -exec rm -rf -- {} +`
+        `find ${shellQuote4(`${root}/versions`)} -mindepth 1 -maxdepth 1 ! -name ${shellQuote4(`${attemptId}-${options.executionGeneration}-*`)} -exec rm -rf -- {} +`
       ] : options.pruneSupersededGenerations ? [
-        `for candidate in ${shellQuote3(`${root}/versions`)}/${prefix}*; do`,
+        `for candidate in ${shellQuote4(`${root}/versions`)}/${prefix}*; do`,
         `  [ -e "$candidate" ] || continue`,
         `  name=\${candidate##*/}`,
-        `  [ "$name" = ${shellQuote3(versionName)} ] || [ "$name" = "$previous" ] || rm -rf -- "$candidate"`,
+        `  [ "$name" = ${shellQuote4(versionName)} ] || [ "$name" = "$previous" ] || rm -rf -- "$candidate"`,
         "done"
       ] : [],
       ...pointerLockReleaseCommands()
@@ -18412,10 +19039,10 @@ async function clearRunCredentials(session, sessionId, commandRunner) {
   await runCredentialCommand(
     session,
     [
-      `if [ -d ${shellQuote3(root)} ]; then`,
+      `if [ -d ${shellQuote4(root)} ]; then`,
       ...pointerLockAcquireCommands(root).map((line) => `  ${line}`),
-      `  rm -f -- ${shellQuote3(`${root}/current`)} ${shellQuote3(`${root}/.next`)}`,
-      `  rm -rf -- ${shellQuote3(`${root}/versions`)}`,
+      `  rm -f -- ${shellQuote4(`${root}/current`)} ${shellQuote4(`${root}/.next`)}`,
+      `  rm -rf -- ${shellQuote4(`${root}/versions`)}`,
       ...pointerLockReleaseCommands().map((line) => `  ${line}`),
       "fi"
     ].join("\n"),
@@ -18432,15 +19059,15 @@ async function clearRunCredentialsForAttempt(session, options, commandRunner) {
   await runCredentialCommand(
     session,
     [
-      `if [ -d ${shellQuote3(root)} ]; then`,
+      `if [ -d ${shellQuote4(root)} ]; then`,
       ...pointerLockAcquireCommands(root).map((line) => `  ${line}`),
-      `  if [ -r ${shellQuote3(`${root}/current`)} ]; then`,
-      `    current=$(cat -- ${shellQuote3(`${root}/current`)} 2>/dev/null || :)`,
-      `    case "$current" in ${shellQuote3(prefix)}*) rm -f -- ${shellQuote3(`${root}/current`)} ;; esac`,
+      `  if [ -r ${shellQuote4(`${root}/current`)} ]; then`,
+      `    current=$(cat -- ${shellQuote4(`${root}/current`)} 2>/dev/null || :)`,
+      `    case "$current" in ${shellQuote4(prefix)}*) rm -f -- ${shellQuote4(`${root}/current`)} ;; esac`,
       "  fi",
-      `  if [ -d ${shellQuote3(`${root}/versions`)} ]; then`,
-      `    find ${shellQuote3(`${root}/versions`)} -mindepth 1 -maxdepth 1 -name ${shellQuote3(`${prefix}*`)} -exec rm -rf -- {} +`,
-      `    find ${shellQuote3(`${root}/versions`)} -mindepth 1 -maxdepth 1 -name ${shellQuote3(`.stage-${prefix}*`)} -exec rm -rf -- {} +`,
+      `  if [ -d ${shellQuote4(`${root}/versions`)} ]; then`,
+      `    find ${shellQuote4(`${root}/versions`)} -mindepth 1 -maxdepth 1 -name ${shellQuote4(`${prefix}*`)} -exec rm -rf -- {} +`,
+      `    find ${shellQuote4(`${root}/versions`)} -mindepth 1 -maxdepth 1 -name ${shellQuote4(`.stage-${prefix}*`)} -exec rm -rf -- {} +`,
       "  fi",
       ...pointerLockReleaseCommands().map((line) => `  ${line}`),
       "fi"
@@ -18452,12 +19079,12 @@ function withRunCredentialEnvironment(cmd, sessionId) {
   const root = runCredentialRoot(sessionId);
   const pointerFile = runCredentialPointerFile(sessionId);
   return [
-    `if [ -r ${shellQuote3(pointerFile)} ]; then`,
-    `  _opengeni_credential_version=$(cat -- ${shellQuote3(pointerFile)} 2>/dev/null || :)`,
+    `if [ -r ${shellQuote4(pointerFile)} ]; then`,
+    `  _opengeni_credential_version=$(cat -- ${shellQuote4(pointerFile)} 2>/dev/null || :)`,
     '  case "$_opengeni_credential_version" in',
     "    ''|*[!A-Za-z0-9_-]*) ;;",
     "    *)",
-    `      _opengeni_credential_env=${shellQuote3(`${root}/versions`)}/"$_opengeni_credential_version/env"`,
+    `      _opengeni_credential_env=${shellQuote4(`${root}/versions`)}/"$_opengeni_credential_version/env"`,
     '      if [ -r "$_opengeni_credential_env" ]; then',
     "        set -a",
     '        . "$_opengeni_credential_env"',
@@ -18534,7 +19161,7 @@ var ToolspaceTokenPathError = class extends Error {
     this.name = "ToolspaceTokenPathError";
   }
 };
-function shellQuote4(value) {
+function shellQuote5(value) {
   return `'${value.replace(/'/g, "'\\''")}'`;
 }
 function assertToolspaceSessionId(sessionId) {
@@ -18559,7 +19186,7 @@ function withToolspaceTokenEnvironment(cmd, tokenFile) {
   if (!tokenFile || tokenFile.includes("\0") || !posixPath.isAbsolute(tokenFile)) {
     throw new ToolspaceTokenPathError("Toolspace token file must be absolute");
   }
-  return [`export OPENGENI_TOOLSPACE_TOKEN_FILE=${shellQuote4(tokenFile)}`, cmd].join("\n");
+  return [`export OPENGENI_TOOLSPACE_TOKEN_FILE=${shellQuote5(tokenFile)}`, cmd].join("\n");
 }
 function withToolspaceTokenSession(session, tokenFile) {
   return new Proxy(session, {
@@ -18953,11 +19580,11 @@ var SandboxChannelAService = class {
     const depthArg = Math.max(1, req.depth);
     const maxCommandEntries = req.maxEntries + 1;
     const gnuPrint = `-printf '%y\\t%s\\t%T@\\t%m\\t%p\\0'`;
-    const gnuSelector = pruneNames.length ? `\\( -type d \\( ${pruneNames.map((name) => `-name ${shellQuote5(name)}`).join(" -o ")} \\) ${gnuPrint} -prune \\) -o ${gnuPrint}` : gnuPrint;
+    const gnuSelector = pruneNames.length ? `\\( -type d \\( ${pruneNames.map((name) => `-name ${shellQuote6(name)}`).join(" -o ")} \\) ${gnuPrint} -prune \\) -o ${gnuPrint}` : gnuPrint;
     const gnuVisibleSelector = req.includeHidden ? gnuSelector : `\\( -path '*/.*' -prune \\) -o \\( ${gnuSelector} \\)`;
     const gnuFind = `find ${findRoot} -mindepth 1 -maxdepth ${depthArg} \\( ${gnuVisibleSelector} \\) 2>/dev/null`;
     const portableHiddenGuard = req.includeHidden ? "" : `if [[ "$base" == .* ]]; then continue; fi;`;
-    const portablePruneCase = pruneNames.length ? `case "$base" in ${pruneNames.map(shellQuote5).join("|")}) pruned=1 ;; *) pruned=0 ;; esac;` : "pruned=0;";
+    const portablePruneCase = pruneNames.length ? `case "$base" in ${pruneNames.map(shellQuote6).join("|")}) pruned=1 ;; *) pruned=0 ;; esac;` : "pruned=0;";
     const portableWalk = [
       "shopt -s nullglob dotglob; count=0; stop=0;",
       'walk() { local dir="$1" level="$2" p base t size mtime mode pruned;',
@@ -18986,12 +19613,12 @@ var SandboxChannelAService = class {
       `if [ "$records" -ge ${req.maxEntries} ] || [ $((bytes + record_bytes + 1)) -gt ${FS_LIST_MAX_OUTPUT_BYTES} ]; then truncated=1; break; fi;`,
       `printf '%s\\0' "$record"; bytes=$((bytes + record_bytes + 1)); records=$((records + 1));`,
       "done;",
-      `if [ "$truncated" -eq 1 ]; then printf '%s\\0' ${shellQuote5(FS_LIST_TRUNCATED_MARKER)}; fi`
+      `if [ "$truncated" -eq 1 ]; then printf '%s\\0' ${shellQuote6(FS_LIST_TRUNCATED_MARKER)}; fi`
     ].join(" ");
     const findCommand = [
       `{ ${rawFindCommand}; } | { ${boundedOutput}; };`,
       "producer_status=${PIPESTATUS[0]};",
-      `if [ "$producer_status" -ne 0 ] && [ "$producer_status" -ne 141 ]; then printf '%s\\0' ${shellQuote5(FS_LIST_TRUNCATED_MARKER)}; fi`
+      `if [ "$producer_status" -ne 0 ] && [ "$producer_status" -ne 141 ]; then printf '%s\\0' ${shellQuote6(FS_LIST_TRUNCATED_MARKER)}; fi`
     ].join(" ");
     const { stdout, exitCode } = await this.runInConfinedDirectory(root, {
       cmd: internalBashCommand(findCommand),
@@ -19084,11 +19711,11 @@ var SandboxChannelAService = class {
   async assertConfinedExistingDirectory(path) {
     const root = this.workspaceRoot || ".";
     const abs = this.joinRoot(path);
-    const rejectLink = path ? `test ! -L ${shellQuote5(abs)} || { printf '__OPENGENI_FS_SYMLINK__'; exit 68; }` : ":";
+    const rejectLink = path ? `test ! -L ${shellQuote6(abs)} || { printf '__OPENGENI_FS_SYMLINK__'; exit 68; }` : ":";
     const script = [
-      `root=$(realpath -e -- ${shellQuote5(root)}) || { printf '__OPENGENI_FS_NOT_FOUND__'; exit 66; }`,
+      `root=$(realpath -e -- ${shellQuote6(root)}) || { printf '__OPENGENI_FS_NOT_FOUND__'; exit 66; }`,
       rejectLink,
-      `target=$(realpath -e -- ${shellQuote5(abs)}) || { printf '__OPENGENI_FS_NOT_FOUND__'; exit 66; }`,
+      `target=$(realpath -e -- ${shellQuote6(abs)}) || { printf '__OPENGENI_FS_NOT_FOUND__'; exit 66; }`,
       `case "$target" in "$root"|"$root"/*) ;; *) printf '__OPENGENI_FS_ESCAPE__'; exit 67 ;; esac`,
       `test -d "$target" || { printf '__OPENGENI_FS_NOT_FOUND__'; exit 66; }`,
       `printf '__OPENGENI_FS_CONFINED_OK__'`
@@ -19099,13 +19726,13 @@ var SandboxChannelAService = class {
   async assertConfinedMutationParent(path, options) {
     const root = this.workspaceRoot || ".";
     const abs = this.joinRoot(path);
-    const rejectLink = options.rejectFinalSymlink ? `test ! -L ${shellQuote5(abs)} || { printf '__OPENGENI_FS_SYMLINK__'; exit 68; }` : ":";
+    const rejectLink = options.rejectFinalSymlink ? `test ! -L ${shellQuote6(abs)} || { printf '__OPENGENI_FS_SYMLINK__'; exit 68; }` : ":";
     const locateParent = options.allowMissingParents ? 'probe="$parent"; while [ ! -e "$probe" ] && [ ! -L "$probe" ]; do next=$(dirname -- "$probe"); [ "$next" != "$probe" ] || break; probe="$next"; done' : 'probe="$parent"';
     const requireParent = options.allowMissingParents ? ":" : 'test -d "$parent" || { printf "__OPENGENI_FS_NOT_FOUND__"; exit 66; }';
     const script = [
-      `root=$(realpath -e -- ${shellQuote5(root)}) || { printf '__OPENGENI_FS_NOT_FOUND__'; exit 66; }`,
+      `root=$(realpath -e -- ${shellQuote6(root)}) || { printf '__OPENGENI_FS_NOT_FOUND__'; exit 66; }`,
       rejectLink,
-      `parent=$(dirname -- ${shellQuote5(abs)})`,
+      `parent=$(dirname -- ${shellQuote6(abs)})`,
       locateParent,
       `target=$(realpath -e -- "$probe") || { printf '__OPENGENI_FS_NOT_FOUND__'; exit 66; }`,
       `case "$target" in "$root"|"$root"/*) ;; *) printf '__OPENGENI_FS_ESCAPE__'; exit 67 ;; esac`,
@@ -19142,8 +19769,8 @@ var SandboxChannelAService = class {
     const root = this.workspaceRoot || ".";
     const abs = this.joinRoot(path);
     const script = [
-      `root=$(realpath -e -- ${shellQuote5(root)}) || { printf '__OPENGENI_FS_NOT_FOUND__'; exit 66; }`,
-      `exec 3<${shellQuote5(abs)} || { printf '__OPENGENI_FS_NOT_FOUND__'; exit 66; }`,
+      `root=$(realpath -e -- ${shellQuote6(root)}) || { printf '__OPENGENI_FS_NOT_FOUND__'; exit 66; }`,
+      `exec 3<${shellQuote6(abs)} || { printf '__OPENGENI_FS_NOT_FOUND__'; exit 66; }`,
       `target=$(readlink -f -- "/proc/$$/fd/3") || { printf '__OPENGENI_FS_NOT_FOUND__'; exit 66; }`,
       `case "$target" in "$root"|"$root"/*) ;; *) printf '__OPENGENI_FS_ESCAPE__'; exit 67 ;; esac`,
       `test -f "$target" || { printf '__OPENGENI_FS_NOT_FOUND__'; exit 66; }`,
@@ -19212,7 +19839,7 @@ var SandboxChannelAService = class {
     });
     if (!req.overwrite) {
       const { exitCode: exitCode2 } = await this.run({
-        cmd: `test -e ${shellQuote5(abs)} || test -L ${shellQuote5(abs)}`
+        cmd: `test -e ${shellQuote6(abs)} || test -L ${shellQuote6(abs)}`
       });
       if (exitCode2 === 0) {
         throw new ChannelAConflictError(`path exists and overwrite is false: ${path}`);
@@ -19220,7 +19847,7 @@ var SandboxChannelAService = class {
     }
     if (req.createParents) {
       const dir = dirnameAbs(abs);
-      if (dir) await this.run({ cmd: `mkdir -p ${shellQuote5(dir)}` });
+      if (dir) await this.run({ cmd: `mkdir -p ${shellQuote6(dir)}` });
       await this.assertConfinedMutationParent(path, {
         allowMissingParents: false,
         rejectFinalSymlink: true
@@ -19228,7 +19855,7 @@ var SandboxChannelAService = class {
     }
     const b64 = bytes.toString("base64");
     const { exitCode, stderr } = await this.run({
-      cmd: `printf %s ${shellQuote5(b64)} | base64 -d > ${shellQuote5(abs)}`
+      cmd: `printf %s ${shellQuote6(b64)} | base64 -d > ${shellQuote6(abs)}`
     });
     if (exitCode !== null && exitCode !== 0) {
       if (req.encoding !== "base64" && this.session.createEditor) {
@@ -19269,7 +19896,7 @@ var SandboxChannelAService = class {
       rejectFinalSymlink: false
     });
     const flag = req.recursive ? "-rf" : "-f";
-    const { exitCode, stderr } = await this.run({ cmd: `rm ${flag} ${shellQuote5(abs)}` });
+    const { exitCode, stderr } = await this.run({ cmd: `rm ${flag} ${shellQuote6(abs)}` });
     if (exitCode !== null && exitCode !== 0) {
       throw new ChannelAValidationError(
         `failed to delete ${path}: ${stderr || `exit ${exitCode}`}`
@@ -19294,7 +19921,7 @@ var SandboxChannelAService = class {
     });
     if (!req.overwrite) {
       const { exitCode: exitCode2 } = await this.run({
-        cmd: `test -e ${shellQuote5(newAbs)} || test -L ${shellQuote5(newAbs)}`
+        cmd: `test -e ${shellQuote6(newAbs)} || test -L ${shellQuote6(newAbs)}`
       });
       if (exitCode2 === 0) {
         throw new ChannelAConflictError(`destination exists and overwrite is false: ${newPath}`);
@@ -19302,7 +19929,7 @@ var SandboxChannelAService = class {
     }
     if (req.createParents) {
       const dir = dirnameAbs(newAbs);
-      if (dir) await this.run({ cmd: `mkdir -p ${shellQuote5(dir)}` });
+      if (dir) await this.run({ cmd: `mkdir -p ${shellQuote6(dir)}` });
       await this.assertConfinedMutationParent(newPath, {
         allowMissingParents: false,
         rejectFinalSymlink: true
@@ -19310,7 +19937,7 @@ var SandboxChannelAService = class {
     }
     const flag = req.overwrite ? "-f " : "";
     const { exitCode, stderr } = await this.run({
-      cmd: `mv ${flag}${shellQuote5(abs)} ${shellQuote5(newAbs)}`
+      cmd: `mv ${flag}${shellQuote6(abs)} ${shellQuote6(newAbs)}`
     });
     if (exitCode !== null && exitCode !== 0) {
       throw new ChannelAValidationError(
@@ -19335,7 +19962,7 @@ var SandboxChannelAService = class {
       rejectFinalSymlink: true
     });
     const flag = req.recursive ? "-p " : "";
-    const { exitCode, stderr } = await this.run({ cmd: `mkdir ${flag}${shellQuote5(abs)}` });
+    const { exitCode, stderr } = await this.run({ cmd: `mkdir ${flag}${shellQuote6(abs)}` });
     if (exitCode !== null && exitCode !== 0) {
       throw new ChannelAValidationError(`failed to mkdir ${path}: ${stderr || `exit ${exitCode}`}`);
     }
@@ -19371,10 +19998,10 @@ var SandboxChannelAService = class {
     const repo = assertSafeRelPathOrRoot(req.path);
     const ctx = req.contextLines;
     let range = "";
-    if (req.fromRef && req.toRef) range = `${shellQuote5(req.fromRef)} ${shellQuote5(req.toRef)}`;
-    else if (req.fromRef) range = `${shellQuote5(req.fromRef)}`;
+    if (req.fromRef && req.toRef) range = `${shellQuote6(req.fromRef)} ${shellQuote6(req.toRef)}`;
+    else if (req.fromRef) range = `${shellQuote6(req.fromRef)}`;
     else if (req.staged) range = "--cached";
-    const pathspec = req.pathspec.length ? ` -- ${req.pathspec.map(shellQuote5).join(" ")}` : "";
+    const pathspec = req.pathspec.length ? ` -- ${req.pathspec.map(shellQuote6).join(" ")}` : "";
     const numstat = await this.runInConfinedDirectory(repo, {
       cmd: `git -c core.quotePath=false diff --no-color -z --numstat ${range}${pathspec}`.trim()
     });
@@ -19398,7 +20025,7 @@ var SandboxChannelAService = class {
         continue;
       }
       const patch = await this.runInConfinedDirectory(repo, {
-        cmd: `git -c core.quotePath=false diff --no-color -U${ctx} ${range} -- ${shellQuote5(target)}`.trim()
+        cmd: `git -c core.quotePath=false diff --no-color -U${ctx} ${range} -- ${shellQuote6(target)}`.trim()
       });
       const oversized = Buffer.byteLength(patch.stdout, "utf8") > req.maxBytesPerFile;
       const parsed = oversized ? { hunks: [], status: "modified" } : parseUnifiedPatch(patch.stdout);
@@ -19422,7 +20049,7 @@ var SandboxChannelAService = class {
         const fileArg = target.startsWith("./") ? target : `./${target}`;
         const read = await this.runInConfinedDirectory(repo, {
           cmd: [
-            `file=${shellQuote5(fileArg)}`,
+            `file=${shellQuote6(fileArg)}`,
             'if [ -L "$file" ]; then printf "L\\n"; readlink -z -- "$file" | base64 | tr -d "\\n"; exit; fi',
             'size=$(wc -c < "$file") || exit 66',
             'line_count=$(wc -l < "$file") || exit 66',
@@ -19486,9 +20113,9 @@ var SandboxChannelAService = class {
   async gitLog(req) {
     const repo = assertSafeRelPathOrRoot(req.path);
     const fmt = `%H${US}%h${US}%P${US}%an${US}%ae${US}%at${US}%cn${US}%ce${US}%ct${US}%s${US}%b${RS}`;
-    const pathspec = req.pathspec.length ? ` -- ${req.pathspec.map(shellQuote5).join(" ")}` : "";
+    const pathspec = req.pathspec.length ? ` -- ${req.pathspec.map(shellQuote6).join(" ")}` : "";
     const { stdout, exitCode } = await this.runInConfinedDirectory(repo, {
-      cmd: `git log --format=${shellQuote5(fmt)} -n${req.maxCount + 1} --skip=${req.skip} ${shellQuote5(req.ref)}${pathspec}`
+      cmd: `git log --format=${shellQuote6(fmt)} -n${req.maxCount + 1} --skip=${req.skip} ${shellQuote6(req.ref)}${pathspec}`
     });
     if (exitCode !== null && exitCode !== 0) {
       return { commits: [], hasMore: false };
@@ -19515,7 +20142,7 @@ var SandboxChannelAService = class {
     const repo = assertSafeRelPathOrRoot(req.path);
     if (req.filePath) {
       const { stdout, exitCode } = await this.runInConfinedDirectory(repo, {
-        cmd: `git cat-file blob ${shellQuote5(`${req.ref}:${req.filePath}`)} 2>/dev/null | base64`
+        cmd: `git cat-file blob ${shellQuote6(`${req.ref}:${req.filePath}`)} 2>/dev/null | base64`
       });
       if (exitCode !== null && exitCode !== 0 && stdout.trim() === "") {
         throw new ChannelANotFoundError(`blob not found: ${req.ref}:${req.filePath}`);
@@ -19756,11 +20383,11 @@ var SandboxChannelAService = class {
     const safe = assertSafeRelPathOrRoot(rel);
     const root = this.workspaceRoot || ".";
     const abs = this.joinRoot(safe);
-    const rejectLink = safe ? `test ! -L ${shellQuote5(abs)} || { printf '__OPENGENI_FS_SYMLINK__'; exit 68; }` : ":";
+    const rejectLink = safe ? `test ! -L ${shellQuote6(abs)} || { printf '__OPENGENI_FS_SYMLINK__'; exit 68; }` : ":";
     const script = [
-      `root=$(realpath -e -- ${shellQuote5(root)}) || { printf '__OPENGENI_FS_NOT_FOUND__'; exit 66; }`,
+      `root=$(realpath -e -- ${shellQuote6(root)}) || { printf '__OPENGENI_FS_NOT_FOUND__'; exit 66; }`,
       rejectLink,
-      `target=$(realpath -e -- ${shellQuote5(abs)}) || { printf '__OPENGENI_FS_NOT_FOUND__'; exit 66; }`,
+      `target=$(realpath -e -- ${shellQuote6(abs)}) || { printf '__OPENGENI_FS_NOT_FOUND__'; exit 66; }`,
       `case "$target" in "$root"|"$root"/*) ;; *) printf '__OPENGENI_FS_ESCAPE__'; exit 67 ;; esac`,
       `test -d "$target" || { printf '__OPENGENI_FS_NOT_FOUND__'; exit 66; }`,
       `cd -P -- "$target"`,
@@ -19876,22 +20503,6 @@ function isExecSessionLostBanner(out, execSessionId) {
   if (!match || match[0] !== out) return false;
   return match[1] === String(execSessionId);
 }
-function parseExecBannerSessionId(raw) {
-  const outputIdx = raw.indexOf("\nOutput:\n");
-  const banner = outputIdx >= 0 ? raw.slice(0, outputIdx) : raw.startsWith("Output:\n") ? "" : raw;
-  const match = banner.match(/Process running with session ID (\d+)/);
-  if (!match) return null;
-  const n = Number.parseInt(match[1], 10);
-  return Number.isFinite(n) ? n : null;
-}
-function parseExecBannerExitCode(raw) {
-  const outputIdx = raw.indexOf("\nOutput:\n");
-  const banner = outputIdx >= 0 ? raw.slice(0, outputIdx) : raw.startsWith("Output:\n") ? "" : raw;
-  const match = banner.match(/Process exited with code (-?\d+)/);
-  if (!match) return null;
-  const exitCode = Number.parseInt(match[1], 10);
-  return Number.isSafeInteger(exitCode) ? exitCode : null;
-}
 function sniffBinary(bytes) {
   const n = Math.min(bytes.byteLength, 8192);
   for (let i = 0; i < n; i++) if (bytes[i] === 0) return true;
@@ -19925,11 +20536,11 @@ function assertSafeRelPath(p) {
   if (norm === "") throw new ChannelAValidationError("path is required");
   return norm;
 }
-function shellQuote5(s) {
+function shellQuote6(s) {
   return `'${s.replace(/'/g, `'\\''`)}'`;
 }
 function internalBashCommand(script) {
-  return `env -u BASH_ENV bash --noprofile --norc -c ${shellQuote5(script)}`;
+  return `env -u BASH_ENV bash --noprofile --norc -c ${shellQuote6(script)}`;
 }
 function assertSafePruneDirectoryName(name) {
   if (name.length > 255 || !/^[A-Za-z0-9._@+-]+$/.test(name) || name === "." || name === "..") {
@@ -20463,12 +21074,12 @@ function defaultEcho(req, hostname) {
     durationMs: "1"
   };
 }
-function ok(requestId, result) {
-  return { requestId, error: void 0, result };
+function ok(requestId2, result) {
+  return { requestId: requestId2, error: void 0, result };
 }
-function errorResponse(requestId, code, message, retryable) {
+function errorResponse(requestId2, code, message, retryable) {
   const error = { code, message, retryable, detail: {} };
-  return { requestId, error, result: void 0 };
+  return { requestId: requestId2, error, result: void 0 };
 }
 function normalize(path) {
   const trimmed = path.replace(/\/+$/, "");
@@ -21437,6 +22048,8 @@ export {
   mintStreamToken,
   verifyStreamToken,
   StreamTokenPayload2 as StreamTokenPayload,
+  parseExecBannerSessionId,
+  parseExecBannerExitCode,
   STREAM_PORT,
   DISPLAY_STACK_TIMEOUT_MS,
   DEFAULT_DESKTOP_GEOMETRY,
@@ -21490,8 +22103,6 @@ export {
   SandboxChannelAService,
   stripExecBanner2 as stripExecBanner,
   isExecSessionLostBanner,
-  parseExecBannerSessionId,
-  parseExecBannerExitCode,
   assertSafeRelPath,
   parsePorcelainV2,
   parseNumstatZ,
@@ -21519,4 +22130,4 @@ export {
   collectSandboxEnvironment2 as collectSandboxEnvironment,
   parseExposedPorts2 as parseExposedPorts
 };
-//# sourceMappingURL=chunk-YUAFQEFY.js.map
+//# sourceMappingURL=chunk-65UDUFUO.js.map