@napi-rs/cli 3.10.4 → 3.10.6

package/src/api/templates/load-wasi-template.ts

@@ -7,6 +7,47 @@ import {
 const WASI_DISPOSE_SYMBOL = 'napi.rs.wasi.dispose'
 const WASI_ROLLBACK_REGISTRY_SYMBOL = 'napi.rs.wasi.rollback.registry.v1'
 
+/**
+ * Threaded loaders only: a view of the addon's crash flag for the pool workers.
+ *
+ * napi-async-runtime's shutdown waits run on the loader thread, inside the
+ * environment cleanup calls, and check one word of the shared wasm memory
+ * between 1 ms slices; once it is set they trap instead of waiting on a dead
+ * thread for good. napi's `napi_wasm_thread_crash_flag_address` export says
+ * where that word is. Each worker gets an `Int32Array` over it and raises it
+ * with `Atomics.store` when its wasm thread dies — right after the loader's own
+ * crash flag, where there is one. The store needs no instance, so a worker that
+ * fails while it loads, after the thread spawn that created it had already
+ * returned, raises it too.
+ *
+ * Read in `beforeInit`: before any registration code runs, and on Node before
+ * any pool worker exists (the pool is created on demand). An addon built with
+ * an older napi has no export, and a value that is not a 4-aligned address
+ * inside the memory is ignored: the view stays undefined and the waits stay
+ * unbounded, as before.
+ */
+const ADDON_CRASH_FLAG_CAPTURE = `// A view of the addon's crash flag, one word of the shared wasm memory, for the
+// pool workers: they raise it when their wasm thread dies, and the shutdown
+// waits inside the cleanup calls on this thread then trap instead of waiting on
+// the dead thread for good. Undefined for an addon built with an older napi.
+let __wasiAddonCrashFlag
+
+function __captureWasiAddonCrashFlag(instance) {
+  try {
+    const getAddress = instance.exports.napi_wasm_thread_crash_flag_address
+    if (typeof getAddress !== 'function') {
+      return
+    }
+    const address = getAddress() >>> 0
+    const buffer = __sharedMemory.buffer
+    if (address === 0 || address % 4 !== 0 || address + 4 > buffer.byteLength) {
+      return
+    }
+    __wasiAddonCrashFlag = new Int32Array(buffer, address, 1)
+  } catch {}
+}
+`
+
 /**
  * `Context.destroy()` disables JavaScript calls *before* it runs cleanup hooks
  * (`setStopping` -> `setCanCallIntoJs(false)` -> `runCleanup`), and the
@@ -88,7 +129,12 @@ function __wrapEmnapiContextDestroyForSettlement(
  * `__startWasiDisposal` / the rollback have already prepared and drained, so
  * one call there covers all three.
  */
-const createEmnapiContextLifecycle = (asyncRuntime: boolean) => {
+const createEmnapiContextLifecycle = (
+  asyncRuntime: boolean,
+  // Only the threaded Node loader defines the crash latch
+  // (`__hasWasiThreadCrashed`, `__disposeWasiBindingAfterThreadCrash`).
+  threadCrashLatch = false,
+) => {
   const currentThreadHosts = asyncRuntime
     ? `
 let __currentThreadHostsDisposer
@@ -122,9 +168,203 @@ function __disposeCurrentThreadHosts() {
 }
 `
     : ''
+  const currentThreadHostTimersAfterThreadCrash =
+    asyncRuntime && threadCrashLatch
+      ? `
+/**
+ * The CurrentThread timer host arms one referenced \`setTimeout\` per sleep in
+ * flight, so a long sleep holds the event loop open until it fires.
+ * \`__disposeCurrentThreadHosts\` releases them, but only
+ * \`__destroyEmnapiContext\` calls it, and the crash disposal never gets there:
+ * after a wasm thread died it must not enter wasm, and both the host
+ * unregister calls and a settled timer promise do. A dispose() that rejected
+ * after a crash then left the process alive until the longest sleep ended.
+ *
+ * So the loader keeps the package's own \`cancel\` for every timer in flight,
+ * and \`__releaseCurrentThreadHostTimers\` calls them after a crash. \`cancel\`
+ * is plain JavaScript: it clears the host timeout and resolves the package's
+ * promise. The promise the addon holds is the one below, and once released it
+ * never settles, so nothing is handed back to wasm. A sleep armed after that
+ * is never armed at all.
+ */
+const __currentThreadHostTimerCancels = new Set()
+let __currentThreadHostTimersReleased = false
+
+function __scheduleCurrentThreadHostTimer(schedule, cancel, id, ms) {
+  if (__currentThreadHostTimersReleased) {
+    return new Promise(() => {})
+  }
+  const scheduled = schedule(id, ms)
+  if (!__isThenable(scheduled)) {
+    return scheduled
+  }
+  const release = () => cancel(id)
+  __currentThreadHostTimerCancels.add(release)
+  const settle = (settleUnreleased) => (outcome) => {
+    __currentThreadHostTimerCancels.delete(release)
+    return __currentThreadHostTimersReleased
+      ? new Promise(() => {})
+      : settleUnreleased(outcome)
+  }
+  return Promise.resolve(scheduled).then(
+    settle((value) => value),
+    settle((error) => {
+      throw error
+    }),
+  )
+}
+
+/**
+ * The binding as \`installCurrentThreadHosts\` should see it: every export
+ * reads through, and \`registerTimerHost\` hands the addon a \`schedule\` that
+ * records its \`cancel\`. A binding without a callable \`registerTimerHost\` is
+ * passed through, so the package reports the mismatch as before.
+ */
+function __trackCurrentThreadHostTimers(binding) {
+  let registerTimerHost
+  try {
+    registerTimerHost = binding.registerTimerHost
+  } catch {
+    return binding
+  }
+  if (typeof registerTimerHost !== 'function') {
+    return binding
+  }
+  const view = Object.create(binding)
+  Object.defineProperty(view, 'registerTimerHost', {
+    configurable: true,
+    enumerable: true,
+    writable: true,
+    value: function (...args) {
+      const [, , schedule, cancel] = args
+      if (typeof schedule === 'function' && typeof cancel === 'function') {
+        args[2] = (id, ms) =>
+          __scheduleCurrentThreadHostTimer(schedule, cancel, id, ms)
+      }
+      return Reflect.apply(registerTimerHost, this, args)
+    },
+  })
+  return view
+}
+
+/**
+ * Clears every CurrentThread host timeout without entering wasm. Idempotent;
+ * a \`cancel\` that fails has already reported itself.
+ */
+function __releaseCurrentThreadHostTimers() {
+  __currentThreadHostTimersReleased = true
+  const releases = [...__currentThreadHostTimerCancels]
+  __currentThreadHostTimerCancels.clear()
+  for (const release of releases) {
+    try {
+      release()
+    } catch {}
+  }
+}
+`
+      : ''
   const disposeCurrentThreadHosts = asyncRuntime
     ? '  __disposeCurrentThreadHosts()\n'
     : ''
+  // After the in-flight check: a disposal that was already running when a
+  // thread died settles through the crash disposal itself, so every caller of
+  // it keeps getting the one promise it handed out.
+  const disposeAfterThreadCrash = threadCrashLatch
+    ? `  if (!__wasiDisposed && __hasWasiThreadCrashed()) {
+    return __disposeWasiBindingAfterThreadCrash()
+  }
+`
+    : ''
+  // A thread can die after the entry check above has passed. The disposal's
+  // polls and step boundaries check again, and a chain stopped that way — or
+  // failed any other way once a thread is dead — settles through the crash
+  // disposal. See `__abortWasiDisposalIfThreadCrashed`.
+  const abortDisposalAfterThreadCrash = (indent: string) =>
+    threadCrashLatch ? `${indent}__abortWasiDisposalIfThreadCrashed()\n` : ''
+  const settleDisposalAfterThreadCrash = (indent: string, exit: string) =>
+    threadCrashLatch
+      ? `${indent}if (__settleWasiDisposalAfterThreadCrash(resolveDispose, rejectDispose)) {
+${indent}  ${exit}
+${indent}}
+`
+      : ''
+  // The barrier's poll ends in `…_finish`, which joins the runtime's work. A
+  // dead thread's work never goes idle, so after a crash the join would block
+  // this thread for good: leave the barrier parked and stop the disposal.
+  const finishWasmEnvCleanupUnlessCrashed = threadCrashLatch
+    ? `  const finishCleanupUnlessCrashed = () => {
+    try {
+      __abortWasiDisposalIfThreadCrashed()
+    } catch (error) {
+      __finishParkedWasmEnvCleanup = undefined
+      throw error
+    }
+    finishCleanup()
+  }
+`
+    : ''
+  const finishWasmEnvCleanupAfterPoll = threadCrashLatch
+    ? 'finishCleanupUnlessCrashed'
+    : 'finishCleanup'
+  // The initialization rollback runs the same polls and steps. With the latch,
+  // its body keeps its own name and `__rollbackWasiInitialization` becomes the
+  // wrapper that stops it after a crash. See
+  // `__rollbackWasiInitializationAfterThreadCrash`.
+  const rollbackStepsName = threadCrashLatch
+    ? '__runWasiInitializationRollbackSteps'
+    : '__rollbackWasiInitialization'
+  const rollbackAfterThreadCrash = threadCrashLatch
+    ? `
+/**
+ * The rollback above, stopped when a wasm thread has died.
+ *
+ * Its polls wait for work the dead thread still counts, so they never end, and
+ * the barrier's \`…_finish\` and \`Context.destroy()\` would re-enter wasm
+ * and wait on that thread for good. While the rollback runs, the poll turns
+ * and step boundaries stop it (\`__abortWasiDisposalIfThreadCrashed\`), and a
+ * crash seen before, during or after it ends it through
+ * \`__rollbackWasiInitializationAfterThreadCrash\`. Without a crash the
+ * result — synchronous or not — is passed through unchanged.
+ */
+function __rollbackWasiInitialization() {
+  if (__hasWasiThreadCrashed()) {
+    return __rollbackWasiInitializationAfterThreadCrash()
+  }
+  __wasiInitializationRollbackActive = true
+  let result
+  try {
+    result = __runWasiInitializationRollbackSteps()
+  } catch (error) {
+    __wasiInitializationRollbackActive = false
+    if (__hasWasiThreadCrashed()) {
+      return __rollbackWasiInitializationAfterThreadCrash()
+    }
+    throw error
+  }
+  if (!__isThenable(result)) {
+    __wasiInitializationRollbackActive = false
+    return __hasWasiThreadCrashed()
+      ? __rollbackWasiInitializationAfterThreadCrash()
+      : result
+  }
+  return Promise.resolve(result).then(
+    (cleanupErrors) => {
+      __wasiInitializationRollbackActive = false
+      return __hasWasiThreadCrashed()
+        ? __rollbackWasiInitializationAfterThreadCrash()
+        : cleanupErrors
+    },
+    (error) => {
+      __wasiInitializationRollbackActive = false
+      if (__hasWasiThreadCrashed()) {
+        return __rollbackWasiInitializationAfterThreadCrash()
+      }
+      throw error
+    },
+  )
+}
+`
+    : ''
 
   return `
 const __wasiDisposeSymbol = Symbol.for('${WASI_DISPOSE_SYMBOL}')
@@ -163,6 +403,20 @@ let __emnapiContextDestroyed = false
 let __emnapiContextDestroyPromise
 let __emnapiWasmEnvCleanupPrepared = false
 let __emnapiWasmEnvCleanupPreparing = false
+// The closer for a barrier that is parked between \`…_begin\` and \`…_finish\`,
+// set only while that window is open. \`__emnapiWasmEnvCleanupPreparing\` cannot
+// tell those two apart on its own: it is raised both for a purely synchronous
+// frame — which must not be re-entered, and which nothing outside it can
+// finish — and across this window, which spans real event-loop turns, so a
+// caller that cannot yield can land in the middle of one. That caller can close
+// this window, because \`…_finish\` is idempotent and joins, which is exactly
+// what the single call does. See \`__prepareWasmEnvCleanup\`.
+let __finishParkedWasmEnvCleanup
+// Raised while a caller that can still yield is driving the barrier, so the
+// queue it leaves behind is expected rather than lost. See
+// \`__reportUnreachedWasmEnvSettlements\`.
+let __emnapiWasmEnvCleanupYielding = false
+let __emnapiWasmEnvSettlementLossReported = false
 let __emnapiWasmEnvCleanupRan = false
 let __emnapiWasmEnvCleanupDrained = false
 let __emnapiWasmEnvCleanupDrainPromise
@@ -174,7 +428,7 @@ let __completeWasiDisposal = function () {}
 // that stopped short of destroying the context. See
 // \`__rollbackWasiInitialization\`.
 let __retainWasiRollbackForRetry = function () {}
-${currentThreadHosts}
+${currentThreadHosts}${currentThreadHostTimersAfterThreadCrash}
 function __isThenable(value) {
   return (
     value !== null &&
@@ -242,7 +496,24 @@ function __isPreparingWasmEnvCleanup() {
 }
 
 function __prepareWasmEnvCleanup() {
-  if (__emnapiWasmEnvCleanupPrepared || __emnapiWasmEnvCleanupPreparing) {
+  if (__emnapiWasmEnvCleanupPrepared) {
+    return
+  }
+  // A handshake parked between its two halves is one this frame can close, and
+  // must: every caller of this function is about to destroy the context, and
+  // the turns the poll is waiting for will not come — an 'exit' teardown is
+  // the last thing the process runs, and \`Context.destroy()\` takes the
+  // environment away. Closing it here runs \`…_finish\`, which is the call that joins, so
+  // this degrades to exactly the single call below. Leaving it open instead
+  // destroys the context with the barrier still raised, the runtime never
+  // joined and the workers never drained.
+  const finishParked = __finishParkedWasmEnvCleanup
+  if (finishParked !== undefined) {
+    finishParked()
+    __reportUnreachedWasmEnvSettlements()
+    return
+  }
+  if (__emnapiWasmEnvCleanupPreparing) {
     return
   }
   const prepare = __napiInstance?.exports?.napi_prepare_wasm_env_cleanup
@@ -257,10 +528,57 @@ function __prepareWasmEnvCleanup() {
       __emnapiWasmEnvCleanupPreparing = false
     }
     __emnapiWasmEnvCleanupRan = true
+    __reportUnreachedWasmEnvSettlements()
   }
   __emnapiWasmEnvCleanupPrepared = true
 }
 
+/**
+ * Say so when the barrier leaves settlements queued and nothing is left that
+ * could deliver them.
+ *
+ * Only the disposal chain yields the event-loop turns @emnapi/core needs to
+ * dispatch its queue. Every other caller of the barrier destroys in the same
+ * turn — a raw \`Context.destroy()\`, the 'exit' teardown — and
+ * \`Context.destroy()\` runs the threadsafe function's cleanup hook, which drains
+ * that queue with a null env and discards it. The promises those settlements
+ * were for then hang forever, silently.
+ *
+ * Loud, once, and never throwing: this runs from inside \`Context.destroy()\`,
+ * emnapi's own beforeExit destroy included, where throwing would take the whole
+ * teardown down with it. Destroying anyway is still the right trade — the queue
+ * is already unreachable by then.
+ */
+function __reportUnreachedWasmEnvSettlements() {
+  if (__emnapiWasmEnvCleanupYielding || __emnapiWasmEnvSettlementLossReported) {
+    return
+  }
+  const pending = __napiInstance?.exports?.napi_wasm_env_cleanup_pending
+  if (typeof pending !== 'function') {
+    return
+  }
+  let queued
+  try {
+    queued = pending()
+  } catch {
+    return
+  }
+  if (!queued) {
+    return
+  }
+  __emnapiWasmEnvSettlementLossReported = true
+  try {
+    const consoleHost = globalThis.console
+    if (consoleHost && typeof consoleHost.error === 'function') {
+      consoleHost.error(
+        "napi-rs: the wasm environment is being destroyed with " +
+          queued +
+          " queued promise settlement(s). Context.destroy() discards them, so those promises never settle. Dispose with binding[Symbol.for('${WASI_DISPOSE_SYMBOL}')]() instead: only it yields the event-loop turns the settlements need.",
+      )
+    }
+  } catch {}
+}
+
 // Mirror the primitive @emnapi/core schedules its threadsafe-function dispatch
 // on, so the drain turns below interleave with that dispatch instead of racing
 // ahead of it on a faster queue.
@@ -310,6 +628,293 @@ function __scheduleTimer(callback, delay) {
   }
 }
 
+// A real, referenced timer rather than a zero-delay macrotask, for the same
+// reason the async-work drain uses one: this polls the addon instead of
+// interleaving with the @emnapi/core dispatch, so a zero-delay turn would spin
+// the loop instead of yielding it.
+const __WASM_RUNTIME_WORK_POLL_INTERVAL_MS = 1
+// Arrivals it takes before the poll paces on the host's timers alone. One
+// proves nothing: a timer armed before the host's timers stopped still fires.
+const __WASM_RUNTIME_WORK_POLL_TRUSTED_ARRIVALS = 2
+// How long a parked turn's own timer must already have been due before a
+// backup that runs calls it dropped. Slack, not a deadline: a timer is due
+// against the event loop's clock, which is read once per iteration, while
+// these are \`Date.now()\` readings taken part-way through one, so the two
+// drift apart by however long the loop has been inside the current iteration.
+const __WASM_RUNTIME_WORK_POLL_STALL_MS = 50
+// How long a backup itself waits. What is left of it after the slack and one
+// interval — 149 ms — has to cover the *two* poll turns that can separate a
+// parked turn from the last backup armed while the host's timers still
+// worked, so the ceiling on a single turn is half of it. See the invariant on
+// \`__armWasmRuntimePollStallBackup\`.
+const __WASM_RUNTIME_WORK_POLL_BACKUP_MS = 200
+
+/**
+ * Pacing state for one runtime-work poll.
+ *
+ * Per poll, never per module: whether the host's timers arrive is not a
+ * property of the module. A host can lose its timers between two disposals,
+ * and in the deferred shape every instance shares this module — one healthy
+ * instance must not disarm the fallback for the next one.
+ */
+function __createWasmRuntimePollPace() {
+  return {
+    // Timers armed by *this* poll that have actually arrived.
+    arrivals: 0,
+    // The turn waiting on a timer alone *right now* — undefined whenever no
+    // turn is parked — and when that turn's own timer came due.
+    settleTurn: undefined,
+    turnTimerDueAt: 0,
+  }
+}
+
+/**
+ * The backup that ends a turn whose timer is never going to arrive.
+ *
+ * Once the poll paces on the timer alone it has nothing left to fall back on
+ * if the host's timers stop mid-poll: the turn that armed the dead timer is
+ * the turn that parks, and a parked poll schedules nothing that could notice.
+ * So every turn arms one of these before it yields, and each one compares due
+ * times instead of measuring how long the parked turn has been waiting.
+ *
+ * Invariant: a parked turn is ended by the newest backup that was armed while
+ * the host's timers still worked, and a backup ends a turn only when that
+ * turn's own timer was already due a whole window before the backup itself.
+ * Neither half turns on how far apart the arms happen to fall — what bounds
+ * the rescue is how far back that newest live backup is:
+ *
+ * - *Ends it.* Hosts run timers in due order, so a backup that runs while a
+ *   turn due a whole window earlier is still parked proves that turn's timer
+ *   was dropped rather than merely late. That same comparison is what leaves a
+ *   healthy host alone: there the turn's timer has already run and cleared
+ *   \`settleTurn\` before any backup due after it can look.
+ * - *Two turns back, not one.* A turn that ended does not prove its own timer
+ *   arrived: until \`…_TRUSTED_ARRIVALS\` is reached every turn arms both
+ *   primitives and the macrotask wins, so such a turn can end with its own
+ *   timer — and the backup armed one line before it — already dead. The
+ *   arrival that then flips the poll onto the timer alone can itself be a
+ *   timer armed before the host's timers died. So the turn that parks can sit
+ *   two turns past the last live arm, and the newest live backup is due
+ *   \`…_BACKUP_MS\` less *two* turn lengths after that turn's own timer.
+ *   Arming on every turn is what holds it to two, rather than however far back
+ *   a throttle last let one through.
+ * - *Ceiling.* Coverage therefore holds while two consecutive poll turns fit
+ *   inside \`…_BACKUP_MS\` less the slack and one interval: 149 ms, so 74 ms
+ *   per turn (measured: a 74 ms turn is still rescued, a 75 ms one parks).
+ *   Past that the turn stays parked and the disposal promise never settles.
+ *   The bound is deliberate: reaching it takes a host that drops timers
+ *   mid-poll *and* keeps every poll turn busy for more than 74 ms, and neither
+ *   Node nor WebContainer — the hosts that run the threaded artifact — does
+ *   the second.
+ *
+ * The poll then goes back to arming both primitives until two fresh arrivals
+ * prove the timers again. A host that stops running the timers it has
+ * *already* accepted leaves nothing to fire, and the disposal promise stays
+ * pending rather than wedging the thread — the same outcome as a blocking
+ * closure that never returns. Unreferenced wherever the host allows it: the
+ * poll's own turn timers are what keep the loop alive, never these.
+ */
+function __armWasmRuntimePollStallBackup(pace) {
+  const setTimer = globalThis.setTimeout
+  if (typeof setTimer !== 'function') {
+    // Nothing to back up: \`__scheduleTimer\` is on the macrotask channel
+    // already, and that one cannot park.
+    return
+  }
+  // Read before arming, so this never claims to be due earlier than the timer
+  // actually is: a backup ends a turn only when it is provably due after it.
+  const dueAt = Date.now() + __WASM_RUNTIME_WORK_POLL_BACKUP_MS
+  let handle
+  try {
+    handle = setTimer(() => {
+      const settleTurn = pace.settleTurn
+      if (
+        !settleTurn ||
+        pace.turnTimerDueAt > dueAt - __WASM_RUNTIME_WORK_POLL_STALL_MS
+      ) {
+        // No turn is parked, or the parked one's timer came due too close to
+        // this backup to call it dropped — it may still arrive, and the turn
+        // that armed it armed a backup due a whole window after *that*.
+        return
+      }
+      pace.arrivals = 0
+      pace.settleTurn = undefined
+      settleTurn()
+    }, __WASM_RUNTIME_WORK_POLL_BACKUP_MS)
+  } catch {
+    return
+  }
+  if (handle && typeof handle.unref === 'function') {
+    try {
+      handle.unref()
+    } catch {}
+  }
+}
+
+/**
+ * One turn of the runtime-work poll.
+ *
+ * \`__scheduleTimer\` falls back to the macrotask scheduler when \`setTimeout\` is
+ * missing or throws, but not when it is present, returns a handle and never
+ * fires — fake timers in a test suite that disposes from an \`afterEach\`, or a
+ * host whose timers belong to an IO context that is already gone. That host
+ * would park this poll forever, and the poll is unbounded, so nothing would
+ * ever call \`…_finish\`.
+ *
+ * Arm both primitives until timers armed by this poll have arrived twice, and
+ * let whichever lands first end the turn; the loser resolves nothing. A host
+ * with working timers therefore pays the double arming for the first turn or
+ * two — the macrotask wins the race, but the timers behind it still arrive and
+ * are counted — and paces on the timer alone from then on, instead of spinning
+ * the loop on a zero-delay queue. A host whose timers never arrive keeps both,
+ * and the macrotask is what keeps the poll moving. A host whose timers stop
+ * after proving themselves is caught by \`__armWasmRuntimePollStallBackup\`,
+ * which ends the parked turn and puts this poll back on both.
+ */
+function __yieldWasmRuntimePollTurn(pace) {
+  // Armed before the turn yields, and by every turn: what rescues a parked
+  // turn has to have been armed while the host's timers still worked, and the
+  // turn that parks is the one whose own timer is already dead.
+  __armWasmRuntimePollStallBackup(pace)
+  return new Promise((resolve) => {
+    let settled = false
+    const settle = () => {
+      if (settled) {
+        return
+      }
+      settled = true
+      if (pace.settleTurn === settle) {
+        // Nothing is parked any more: a backup running later must not read a
+        // due time this turn has already answered.
+        pace.settleTurn = undefined
+      }
+      resolve()
+    }
+    __scheduleTimer(() => {
+      pace.arrivals++
+      settle()
+    }, __WASM_RUNTIME_WORK_POLL_INTERVAL_MS)
+    // Read next to the arming it describes; see
+    // \`__armWasmRuntimePollStallBackup\` for what the two due times mean.
+    const turnTimerDueAt = Date.now() + __WASM_RUNTIME_WORK_POLL_INTERVAL_MS
+    if (pace.arrivals < __WASM_RUNTIME_WORK_POLL_TRUSTED_ARRIVALS) {
+      __scheduleMacrotask(settle)
+      return
+    }
+    // Paced by the timer alone from here; the backup is what ends this turn if
+    // the timer never arrives.
+    pace.settleTurn = settle
+    pace.turnTimerDueAt = turnTimerDueAt
+  })
+}
+
+/**
+ * The barrier for callers that can yield: \`__prepareWasmEnvCleanup\` with real
+ * event-loop turns in the middle.
+ *
+ * \`napi_prepare_wasm_env_cleanup\` waits — it returns only once the addon's
+ * async runtime has quiesced, and on \`wasm32-wasip1-threads\` the thread it
+ * waits on is this one, the only thread that can give a running blocking
+ * closure the JavaScript turn *it* is waiting for. A single call there can wait
+ * for work that can never finish. The addon's two-phase form splits that:
+ * \`…_begin\` stops the runtime without joining and reports whether anything is
+ * still live, \`napi_wasm_runtime_work_pending\` answers that question again
+ * without blocking, and \`…_finish\` joins. The turns yielded in between are the
+ * entire point.
+ *
+ * The poll has no deadline, for the same reason the async-work drain below has
+ * none: giving up means calling \`…_finish\`, which joins on this thread, and the
+ * work it would join is the work that is waiting for a turn from this thread —
+ * so a bound does not end the wait, it only moves it somewhere the JavaScript
+ * thread can no longer be reached. A blocking closure that never returns keeps
+ * the disposal promise pending instead, exactly as a task whose \`execute\` never
+ * returns already keeps an *undisposed* process alive. The host contract is in
+ * \`crates/async-runtime/README.md\`: a blocking closure must never wait on a
+ * JavaScript turn. The process-exit path still blocks in \`…_finish\`, because it
+ * has no turns left to give (see \`__prepareWasmEnvCleanup\`).
+ *
+ * Feature-detected like every other export in this teardown, so an addon built
+ * against a napi crate that predates the split keeps the single blocking call.
+ * Returns nothing whenever the handshake finished without yielding, which keeps
+ * an idle disposal synchronous.
+ */
+function __prepareWasmEnvCleanupWithTurns() {
+  if (__emnapiWasmEnvCleanupPrepared || __emnapiWasmEnvCleanupPreparing) {
+    return
+  }
+  const exports = __napiInstance?.exports
+  const begin = exports?.napi_prepare_wasm_env_cleanup_begin
+  const finish = exports?.napi_prepare_wasm_env_cleanup_finish
+  if (typeof begin !== 'function' || typeof finish !== 'function') {
+    // No split to use. The settlement drain still follows this, so the queue
+    // the single call leaves behind is expected rather than lost.
+    __emnapiWasmEnvCleanupYielding = true
+    try {
+      __prepareWasmEnvCleanup()
+    } finally {
+      __emnapiWasmEnvCleanupYielding = false
+    }
+    return
+  }
+  const workPending = exports?.napi_wasm_runtime_work_pending
+  // The in-flight flag stays raised across the turns below, so a \`destroy()\`
+  // from one of the JavaScript handlers they run is the same no-op it is inside
+  // the single call: the barrier is up and the runtime is mid-teardown, and
+  // destroying between the halves would strand exactly what this delivers.
+  __emnapiWasmEnvCleanupPreparing = true
+  let live
+  try {
+    live = begin()
+  } catch (error) {
+    __emnapiWasmEnvCleanupPreparing = false
+    throw error
+  }
+  __emnapiWasmEnvCleanupRan = true
+  const finishCleanup = () => {
+    if (__emnapiWasmEnvCleanupPrepared) {
+      // Already closed by a caller that could not yield — the 'exit' teardown
+      // reached \`__prepareWasmEnvCleanup\` while this poll was parked. \`…_finish\`
+      // is idempotent, but the flags it lowers are not: running it again here
+      // would clear a \`preparing\` some later barrier had raised.
+      return
+    }
+    __finishParkedWasmEnvCleanup = undefined
+    try {
+      finish()
+    } finally {
+      __emnapiWasmEnvCleanupPreparing = false
+    }
+    __emnapiWasmEnvCleanupPrepared = true
+  }
+  if (!live || typeof workPending !== 'function') {
+    finishCleanup()
+    return
+  }
+  // Publish the closer before yielding: from here until \`finishCleanup\` runs,
+  // a caller that cannot yield is entitled to end this handshake itself.
+  __finishParkedWasmEnvCleanup = finishCleanup
+${finishWasmEnvCleanupUnlessCrashed}\
+  return (async () => {
+    // Unbounded, exactly like the async-work drain below. The wait ends when
+    // the addon reports its runtime work finished; the turns spent here are
+    // what let that happen at all.
+    const pace = __createWasmRuntimePollPace()
+    for (;;) {
+      await __yieldWasmRuntimePollTurn(pace)
+${abortDisposalAfterThreadCrash('      ')}\
+      try {
+        if (!workPending()) {
+          return
+        }
+      } catch {
+        // A trap is the only way this fails, and a trapped instance has no
+        // reachable work left. Stop polling and finish.
+        return
+      }
+    }
+  })().then(${finishWasmEnvCleanupAfterPoll}, ${finishWasmEnvCleanupAfterPoll})
+}
+
 // Turns to wait for while the addon still reports queued settlements. Reaching
 // zero is the only success. A counter still nonzero at this bound rejects the
 // disposal as retryable (\`ERR_NAPI_WASI_CLEANUP_PENDING\`) rather than
@@ -447,6 +1052,19 @@ function __destroyEmnapiContext() {
 
 ${disposeCurrentThreadHosts}\
   __prepareWasmEnvCleanup()
+  if (__isPreparingWasmEnvCleanup()) {
+    // Reached from inside the synchronous barrier — a promise hook one of the
+    // settlements above ran, which is the reentrancy the destroy wrapper
+    // exists for. \`Context.destroy()\` below would hit that wrapper's in-flight
+    // no-op and answer \`undefined\`, and recording that as a completed destroy
+    // is what makes the frame that *did* start the barrier skip the real one
+    // afterwards, leaving the context retained with its cleanup hooks unrun.
+    // Refuse instead: nothing is flagged, and that frame destroys for real the
+    // moment it returns. The deferred loader carries the same backstop. A
+    // parked handshake cannot get here — \`__prepareWasmEnvCleanup\` closes one
+    // rather than skipping it.
+    return
+  }
   const result = __emnapiContext.destroy()
   if (!__isThenable(result)) {
     __emnapiContextDestroyed = true
@@ -618,6 +1236,7 @@ function __drainWasiAsyncWork() {
         await new Promise((resolve) => {
           __scheduleTimer(resolve, __WASI_ASYNC_WORK_POLL_INTERVAL_MS)
         })
+${abortDisposalAfterThreadCrash('        ')}\
       }
     })(),
   ).then(
@@ -713,6 +1332,7 @@ function __finishWasiDisposal() {
 }
 
 function __continueWasiDisposal() {
+${abortDisposalAfterThreadCrash('  ')}\
   const destroyResult = __destroyEmnapiContext()
   if (__isThenable(destroyResult)) {
     return Promise.resolve(destroyResult).then(__finishWasiDisposal)
@@ -720,11 +1340,8 @@ function __continueWasiDisposal() {
   return __finishWasiDisposal()
 }
 
-function __cleanUpWasmEnvForWasiDisposal() {
-  // Run the pre-teardown barrier, then let the settlements it queued actually
-  // reach JavaScript, and only then destroy the environment. Doing these two
-  // back to back is what strands them.
-  __prepareWasmEnvCleanup()
+function __drainWasmEnvForWasiDisposal() {
+${abortDisposalAfterThreadCrash('  ')}\
   const drainResult = __drainWasmEnvCleanup()
   if (__isThenable(drainResult)) {
     return Promise.resolve(drainResult).then(__continueWasiDisposal)
@@ -732,6 +1349,19 @@ function __cleanUpWasmEnvForWasiDisposal() {
   return __continueWasiDisposal()
 }
 
+function __cleanUpWasmEnvForWasiDisposal() {
+${abortDisposalAfterThreadCrash('  ')}\
+  // Run the pre-teardown barrier — yielding the turns its two-phase form asks
+  // for, when the addon has one — then let the settlements it queued actually
+  // reach JavaScript, and only then destroy the environment. Doing any two of
+  // these back to back is what strands them.
+  const prepareResult = __prepareWasmEnvCleanupWithTurns()
+  if (__isThenable(prepareResult)) {
+    return Promise.resolve(prepareResult).then(__drainWasmEnvForWasiDisposal)
+  }
+  return __drainWasmEnvForWasiDisposal()
+}
+
 function __startWasiDisposal() {
   // Outstanding \`napi_async_work\` goes first, while the environment is still
   // completely live: the completion callbacks run addon code, and everything
@@ -757,6 +1387,7 @@ function __disposeWasiBinding() {
   if (__wasiDisposePromise) {
     return __wasiDisposePromise
   }
+${disposeAfterThreadCrash}\
   if (__wasiDisposed) {
     return Promise.resolve()
   }
@@ -773,6 +1404,7 @@ function __disposeWasiBinding() {
   try {
     result = __startWasiDisposal()
   } catch (error) {
+${settleDisposalAfterThreadCrash('    ', 'return disposePromise')}\
     __wasiDisposePromise = undefined
     rejectDispose(error)
     return disposePromise
@@ -784,6 +1416,7 @@ function __disposeWasiBinding() {
       resolveDispose(value)
     },
     (error) => {
+${settleDisposalAfterThreadCrash('      ', 'return')}\
       __wasiDisposePromise = undefined
       rejectDispose(error)
     },
@@ -819,6 +1452,7 @@ function __finishWasiInitializationRollback(cleanupErrors) {
 }
 
 function __destroyContextForWasiRollback(cleanupErrors) {
+${abortDisposalAfterThreadCrash('  ')}\
   let destroyResult
   try {
     destroyResult = __destroyEmnapiContext()
@@ -887,19 +1521,43 @@ function __retainFailedWasiRollback(cleanupErrors) {
  * goes away. That is the deliberate choice: a hung promise is a silent liveness
  * bug with no upper bound, while the retained bookkeeping is bounded by the page.
  */
-function __rollbackWasiInitialization() {
+function ${rollbackStepsName}() {
   // The environment teardown this rollback performs, kept nested so it cannot
   // be reached without the async-work drain below running first.
   function __rollbackWasmEnvForWasiInitialization() {
+${abortDisposalAfterThreadCrash('    ')}\
     const cleanupErrors = []
+    let prepareResult
+    try {
+      prepareResult = __prepareWasmEnvCleanupWithTurns()
+    } catch (cleanupError) {
+      cleanupErrors.push(cleanupError)
+      return __retainFailedWasiRollback(cleanupErrors)
+    }
+    if (__isThenable(prepareResult)) {
+      return Promise.resolve(prepareResult).then(
+        () => __drainWasmEnvForWasiRollback(cleanupErrors),
+        (cleanupError) => {
+          cleanupErrors.push(cleanupError)
+          return __retainFailedWasiRollback(cleanupErrors)
+        },
+      )
+    }
+    return __drainWasmEnvForWasiRollback(cleanupErrors)
+  }
+
+  // The settlement drain of the rollback above, reached either straight away or
+  // after the barrier's two-phase form has yielded its turns. A barrier that
+  // did not finish never gets here: it retains instead, exactly as a drain that
+  // did not finish does.
+  function __drainWasmEnvForWasiRollback(cleanupErrors) {
+${abortDisposalAfterThreadCrash('    ')}\
     let drainResult
-    let settlementsUnreached = false
     try {
-      __prepareWasmEnvCleanup()
       drainResult = __drainWasmEnvCleanup()
     } catch (cleanupError) {
       cleanupErrors.push(cleanupError)
-      settlementsUnreached = true
+      return __retainFailedWasiRollback(cleanupErrors)
     }
     if (__isThenable(drainResult)) {
       return Promise.resolve(drainResult).then(
@@ -910,9 +1568,6 @@ function __rollbackWasiInitialization() {
         },
       )
     }
-    if (settlementsUnreached) {
-      return __retainFailedWasiRollback(cleanupErrors)
-    }
     return __destroyContextForWasiRollback(cleanupErrors)
   }
 
@@ -943,6 +1598,7 @@ function __rollbackWasiInitialization() {
   }
   return __rollbackWasmEnvForWasiInitialization()
 }
+${rollbackAfterThreadCrash}\
 `
 }
 
@@ -1096,10 +1752,35 @@ const __workerPoolSize = Math.max(
         type: 'module',
       })
       __wasiWorkers.add(worker)
+      __shareWasiAddonCrashFlag(worker)
 ${workerFsHandler}
 ${workerErrorHandler}
       return worker
     },
+`
+    : ''
+  // The pool is created before the wasm is instantiated, so the workers that
+  // exist by `beforeInit` get the view there, after their 'load' message and
+  // before any 'start'; a worker created later gets it first thing. A message
+  // rather than worker options: a browser Worker has no `workerData`.
+  const addonCrashFlagSharing = threads
+    ? `${ADDON_CRASH_FLAG_CAPTURE}
+function __shareWasiAddonCrashFlag(worker) {
+  if (__wasiAddonCrashFlag === undefined) {
+    return
+  }
+  try {
+    worker.postMessage({ __napiRsAddonCrashFlag: __wasiAddonCrashFlag })
+  } catch {}
+}
+
+`
+    : ''
+  const captureAddonCrashFlag = threads
+    ? `      __captureWasiAddonCrashFlag(instance)
+      for (const worker of __wasiWorkers) {
+        __shareWasiAddonCrashFlag(worker)
+      }
 `
     : ''
 
@@ -1139,6 +1820,7 @@ ${threads ? '  shared: true,\n' : ''}\
 ${workerPoolSizeBinding}\
 let __emnapiContext
 ${createEmnapiContextLifecycle(asyncRuntime)}
+${addonCrashFlagSharing}\
 let __wasiModule
 let __napiModule
 
@@ -1172,6 +1854,7 @@ ${workerOption}\
     },
     beforeInit({ instance }) {
       __napiInstance = instance
+${captureAddonCrashFlag}\
       for (const name of Object.keys(instance.exports)) {
         if (name.startsWith('__napi_register__')) {
           instance.exports[name]()
@@ -1716,6 +2399,218 @@ function __scheduleTimer(__callback, __delay) {
   }
 }
 
+// A real, referenced timer rather than a zero-delay macrotask, for the same
+// reason the async-work wait uses one: this polls the addon instead of
+// interleaving with the @emnapi/core dispatch, so a zero-delay turn would spin
+// the loop instead of yielding it.
+const __WASM_RUNTIME_WORK_POLL_INTERVAL_MS = 1
+// Arrivals it takes before the poll paces on the host's timers alone. One
+// proves nothing: a timer armed before the host's timers stopped still fires.
+const __WASM_RUNTIME_WORK_POLL_TRUSTED_ARRIVALS = 2
+// How long a parked turn's own timer must already have been due before a
+// backup that runs calls it dropped. Slack, not a deadline: a timer is due
+// against the event loop's clock, which is read once per iteration, while
+// these are \`Date.now()\` readings taken part-way through one, so the two
+// drift apart by however long the loop has been inside the current iteration.
+const __WASM_RUNTIME_WORK_POLL_STALL_MS = 50
+// How long a backup itself waits. What is left of it after the slack and one
+// interval — 149 ms — has to cover the *two* poll turns that can separate a
+// parked turn from the last backup armed while the host's timers still
+// worked, so the ceiling on a single turn is half of it. See the invariant on
+// \`__armWasmRuntimePollStallBackup\`.
+const __WASM_RUNTIME_WORK_POLL_BACKUP_MS = 200
+
+/**
+ * Pacing state for one runtime-work poll.
+ *
+ * Per poll, never per module: whether the host's timers arrive is not a
+ * property of the module. A host can lose its timers between two disposals,
+ * and in the deferred shape every instance shares this module — one healthy
+ * instance must not disarm the fallback for the next one.
+ */
+function __createWasmRuntimePollPace() {
+  return {
+    // Timers armed by *this* poll that have actually arrived.
+    arrivals: 0,
+    // The turn waiting on a timer alone *right now* — undefined whenever no
+    // turn is parked — and when that turn's own timer came due.
+    settleTurn: undefined,
+    turnTimerDueAt: 0,
+  }
+}
+
+/**
+ * The backup that ends a turn whose timer is never going to arrive.
+ *
+ * Once the poll paces on the timer alone it has nothing left to fall back on
+ * if the host's timers stop mid-poll: the turn that armed the dead timer is
+ * the turn that parks, and a parked poll schedules nothing that could notice.
+ * So every turn arms one of these before it yields, and each one compares due
+ * times instead of measuring how long the parked turn has been waiting.
+ *
+ * Invariant: a parked turn is ended by the newest backup that was armed while
+ * the host's timers still worked, and a backup ends a turn only when that
+ * turn's own timer was already due a whole window before the backup itself.
+ * Neither half turns on how far apart the arms happen to fall — what bounds
+ * the rescue is how far back that newest live backup is:
+ *
+ * - *Ends it.* Hosts run timers in due order, so a backup that runs while a
+ *   turn due a whole window earlier is still parked proves that turn's timer
+ *   was dropped rather than merely late. That same comparison is what leaves a
+ *   healthy host alone: there the turn's timer has already run and cleared
+ *   \`settleTurn\` before any backup due after it can look.
+ * - *Two turns back, not one.* A turn that ended does not prove its own timer
+ *   arrived: until \`…_TRUSTED_ARRIVALS\` is reached every turn arms both
+ *   primitives and the macrotask wins, so such a turn can end with its own
+ *   timer — and the backup armed one line before it — already dead. The
+ *   arrival that then flips the poll onto the timer alone can itself be a
+ *   timer armed before the host's timers died. So the turn that parks can sit
+ *   two turns past the last live arm, and the newest live backup is due
+ *   \`…_BACKUP_MS\` less *two* turn lengths after that turn's own timer.
+ *   Arming on every turn is what holds it to two, rather than however far back
+ *   a throttle last let one through.
+ * - *Ceiling.* Coverage therefore holds while two consecutive poll turns fit
+ *   inside \`…_BACKUP_MS\` less the slack and one interval: 149 ms, so 74 ms
+ *   per turn (measured: a 74 ms turn is still rescued, a 75 ms one parks).
+ *   Past that the turn stays parked and the disposal promise never settles.
+ *   The bound is deliberate: reaching it takes a host that drops timers
+ *   mid-poll *and* keeps every poll turn busy for more than 74 ms, and neither
+ *   Node nor WebContainer — the hosts that run the threaded artifact — does
+ *   the second.
+ *
+ * The poll then goes back to arming both primitives until two fresh arrivals
+ * prove the timers again. A host that stops running the timers it has
+ * *already* accepted leaves nothing to fire, and the disposal promise stays
+ * pending rather than wedging the thread — the same outcome as a blocking
+ * closure that never returns. Unreferenced wherever the host allows it: the
+ * poll's own turn timers are what keep the loop alive, never these.
+ */
+function __armWasmRuntimePollStallBackup(__pace) {
+  const __setTimer = globalThis.setTimeout
+  if (typeof __setTimer !== 'function') {
+    // Nothing to back up: \`__scheduleTimer\` is on the macrotask channel
+    // already, and that one cannot park.
+    return
+  }
+  // Read before arming, so this never claims to be due earlier than the timer
+  // actually is: a backup ends a turn only when it is provably due after it.
+  const __dueAt = Date.now() + __WASM_RUNTIME_WORK_POLL_BACKUP_MS
+  let __handle
+  try {
+    __handle = __setTimer(() => {
+      const __settleTurn = __pace.settleTurn
+      if (
+        !__settleTurn ||
+        __pace.turnTimerDueAt > __dueAt - __WASM_RUNTIME_WORK_POLL_STALL_MS
+      ) {
+        // No turn is parked, or the parked one's timer came due too close to
+        // this backup to call it dropped — it may still arrive, and the turn
+        // that armed it armed a backup due a whole window after *that*.
+        return
+      }
+      __pace.arrivals = 0
+      __pace.settleTurn = undefined
+      __settleTurn()
+    }, __WASM_RUNTIME_WORK_POLL_BACKUP_MS)
+  } catch {
+    return
+  }
+  if (__handle && typeof __handle.unref === 'function') {
+    try {
+      __handle.unref()
+    } catch {}
+  }
+}
+
+/**
+ * One turn of the runtime-work poll.
+ *
+ * \`__scheduleTimer\` falls back to the macrotask scheduler when \`setTimeout\` is
+ * missing or throws, but not when it is present, returns a handle and never
+ * fires — fake timers in a test suite that disposes from an \`afterEach\`, or a
+ * host whose timers belong to an IO context that is already gone. That host
+ * would park this poll forever, and the poll is unbounded, so nothing would
+ * ever call \`…_finish\`.
+ *
+ * Arm both primitives until timers armed by this poll have arrived twice, and
+ * let whichever lands first end the turn; the loser resolves nothing. A host
+ * with working timers therefore pays the double arming for the first turn or
+ * two — the macrotask wins the race, but the timers behind it still arrive and
+ * are counted — and paces on the timer alone from then on, instead of spinning
+ * the loop on a zero-delay queue. A host whose timers never arrive keeps both,
+ * and the macrotask is what keeps the poll moving. A host whose timers stop
+ * after proving themselves is caught by \`__armWasmRuntimePollStallBackup\`,
+ * which ends the parked turn and puts this poll back on both.
+ */
+function __yieldWasmRuntimePollTurn(__pace) {
+  // Armed before the turn yields, and by every turn: what rescues a parked
+  // turn has to have been armed while the host's timers still worked, and the
+  // turn that parks is the one whose own timer is already dead.
+  __armWasmRuntimePollStallBackup(__pace)
+  return new Promise((resolve) => {
+    let __settled = false
+    const __settle = () => {
+      if (__settled) {
+        return
+      }
+      __settled = true
+      if (__pace.settleTurn === __settle) {
+        // Nothing is parked any more: a backup running later must not read a
+        // due time this turn has already answered.
+        __pace.settleTurn = undefined
+      }
+      resolve()
+    }
+    __scheduleTimer(() => {
+      __pace.arrivals++
+      __settle()
+    }, __WASM_RUNTIME_WORK_POLL_INTERVAL_MS)
+    // Read next to the arming it describes; see
+    // \`__armWasmRuntimePollStallBackup\` for what the two due times mean.
+    const __turnTimerDueAt = Date.now() + __WASM_RUNTIME_WORK_POLL_INTERVAL_MS
+    if (__pace.arrivals < __WASM_RUNTIME_WORK_POLL_TRUSTED_ARRIVALS) {
+      __scheduleMacrotask(__settle)
+      return
+    }
+    // Paced by the timer alone from here; the backup is what ends this turn if
+    // the timer never arrives.
+    __pace.settleTurn = __settle
+    __pace.turnTimerDueAt = __turnTimerDueAt
+  })
+}
+
+/**
+ * Yield event-loop turns until the addon reports its runtime work finished.
+ *
+ * The window between \`napi_prepare_wasm_env_cleanup_begin\` and
+ * \`…_finish\` — the turns are the entire point of splitting the barrier, because
+ * on a threaded artifact the work \`…_finish\` joins can itself be waiting for a
+ * JavaScript turn from this very thread.
+ *
+ * Unbounded, for the same reason the async-work wait above is: giving up means
+ * calling \`…_finish\`, which joins on this thread, and the work it would join is
+ * the work waiting for a turn from this thread — so a bound does not end the
+ * wait, it only moves it somewhere the JavaScript thread can no longer be
+ * reached. A blocking closure that never returns keeps the disposal promise
+ * pending instead. The host contract is in \`crates/async-runtime/README.md\`: a
+ * blocking closure must never wait on a JavaScript turn.
+ */
+async function __pollWasmRuntimeWork(__workPending) {
+  const __pace = __createWasmRuntimePollPace()
+  for (;;) {
+    await __yieldWasmRuntimePollTurn(__pace)
+    try {
+      if (!__workPending()) {
+        return
+      }
+    } catch {
+      // A trap is the only way this fails, and a trapped instance has no
+      // reachable work left. Stop polling and finish.
+      return
+    }
+  }
+}
+
 // How often to re-read \`napi_wasm_async_work_pending\` while waiting. The wait
 // ends when the addon reports zero, so this only decides how promptly disposal
 // notices — not how long it waits.
@@ -2087,7 +2982,9 @@ ${managedHostDisposeParam}) {
         // hooks unrun. Refuse instead: nothing is flagged, the context stays
         // registered for managed beforeExit cleanup, and a later destroy still
         // works. dispose() coalesces reentrancy before it can get here, so this
-        // is the backstop for any other caller that manages to.
+        // is the backstop for any other caller that manages to. A handshake
+        // parked between the two halves of the barrier does not reach here —
+        // \`__prepareEnvCleanup\` closes one rather than skipping it.
         throw __createLifecycleReentryError('dispose')
       }
 ${managedHostDisposeCall}\
@@ -2220,11 +3117,82 @@ ${instanceHostState}\
   let __wasmEnvCleanupRan = false
   let __wasmEnvCleanupPrepared = false
   let __wasmEnvCleanupPreparing = false
+  // The closer for a barrier parked between \`…_begin\` and \`…_finish\`, set only
+  // while that window is open. \`__wasmEnvCleanupPreparing\` cannot tell that
+  // apart from a purely synchronous frame, which must not be re-entered and
+  // which nothing outside it can finish; this window spans real event-loop
+  // turns, so a caller that cannot yield — the managed beforeExit teardown —
+  // can land inside it, and can close it. See \`__prepareEnvCleanup\`.
+  let __finishParkedEnvCleanup
+  // Raised while a caller that can still yield is driving the barrier, so the
+  // queue it leaves behind is expected rather than lost.
+  let __wasmEnvCleanupYielding = false
+  let __wasmEnvSettlementLossReported = false
   let __wasmEnvCleanupDrained = false
   let __wasmEnvCleanupDrainPromise
   const __isPreparingEnvCleanup = () => __wasmEnvCleanupPreparing
+  /**
+   * Say so when the barrier leaves settlements queued and nothing is left that
+   * could deliver them.
+   *
+   * Only \`dispose()\` and the initialization rollback yield the event-loop turns
+   * @emnapi/core needs to dispatch its queue. Every other caller of the barrier
+   * destroys in the same turn — a raw \`Context.destroy()\`, the managed
+   * beforeExit teardown — and \`Context.destroy()\` runs the threadsafe
+   * function's cleanup hook, which drains that queue with a null env and
+   * discards it. The promises those settlements were for then hang forever,
+   * silently.
+   *
+   * Loud, once, and never throwing: this runs from inside \`Context.destroy()\`,
+   * where throwing would take the whole teardown down with it. Destroying
+   * anyway is still the right trade — the queue is already unreachable by then.
+   */
+  const __reportUnreachedSettlements = () => {
+    if (__wasmEnvCleanupYielding || __wasmEnvSettlementLossReported) {
+      return
+    }
+    const __pending = __napiInstance?.exports.napi_wasm_env_cleanup_pending
+    if (typeof __pending !== 'function') {
+      return
+    }
+    let __queued
+    try {
+      __queued = __pending()
+    } catch {
+      return
+    }
+    if (!__queued) {
+      return
+    }
+    __wasmEnvSettlementLossReported = true
+    try {
+      const __consoleHost = globalThis.console
+      if (__consoleHost && typeof __consoleHost.error === 'function') {
+        __consoleHost.error(
+          'napi-rs: the wasm environment is being destroyed with ' +
+            __queued +
+            ' queued promise settlement(s). Context.destroy() discards them, so those promises never settle. Dispose the instance instead: only dispose() yields the event-loop turns the settlements need.',
+        )
+      }
+    } catch {}
+  }
   const __prepareEnvCleanup = () => {
-    if (__wasmEnvCleanupPrepared || __wasmEnvCleanupPreparing) {
+    if (__wasmEnvCleanupPrepared) {
+      return
+    }
+    // A handshake parked between its two halves is one this frame can close,
+    // and must: every caller of this is about to destroy the context, and the
+    // turns the poll is waiting for will not come. Closing it runs \`…_finish\`,
+    // which is the call that joins, so this degrades to exactly the single
+    // call below. Leaving it open destroys the context with the barrier still
+    // raised and the runtime never joined.
+    const __finishParked = __finishParkedEnvCleanup
+    if (__finishParked !== undefined) {
+      __finishParked()
+      __reportUnreachedSettlements()
+      return
+    }
+    if (__wasmEnvCleanupPreparing) {
       return
     }
     const __prepareWasmEnvCleanup =
@@ -2240,9 +3208,86 @@ ${instanceHostState}\
         __wasmEnvCleanupPreparing = false
       }
       __wasmEnvCleanupRan = true
+      __reportUnreachedSettlements()
     }
     __wasmEnvCleanupPrepared = true
   }
+  /**
+   * The barrier for the callers that can yield: \`__prepareEnvCleanup\` with real
+   * event-loop turns in the middle.
+   *
+   * \`napi_prepare_wasm_env_cleanup\` waits — it returns only once the addon's
+   * async runtime has quiesced, and the work it waits for can itself be waiting
+   * for a JavaScript turn from this thread. The addon's two-phase form splits
+   * that: \`…_begin\` stops the runtime without joining and reports whether
+   * anything is still live, \`napi_wasm_runtime_work_pending\` answers that again
+   * without blocking, and \`…_finish\` joins.
+   *
+   * The poll is unbounded — see \`__pollWasmRuntimeWork\` — but a caller that
+   * cannot yield closes the handshake itself rather than waiting for it, so
+   * \`…_finish\` still runs on every teardown path. Feature-detected like every
+   * other export here, and returns nothing whenever the handshake finished
+   * without yielding.
+   */
+  const __prepareEnvCleanupWithTurns = () => {
+    if (__wasmEnvCleanupPrepared || __wasmEnvCleanupPreparing) {
+      return
+    }
+    const __exports = __napiInstance?.exports
+    const __begin = __exports?.napi_prepare_wasm_env_cleanup_begin
+    const __finish = __exports?.napi_prepare_wasm_env_cleanup_finish
+    if (typeof __begin !== 'function' || typeof __finish !== 'function') {
+      // No split to use. The settlement drain still follows this, so the queue
+      // the single call leaves behind is expected rather than lost.
+      __wasmEnvCleanupYielding = true
+      try {
+        __prepareEnvCleanup()
+      } finally {
+        __wasmEnvCleanupYielding = false
+      }
+      return
+    }
+    const __workPending = __exports?.napi_wasm_runtime_work_pending
+    // The in-flight flag stays raised across the turns below, so a \`destroy()\`
+    // from one of the JavaScript handlers they run is the same no-op it is
+    // inside the single call: the barrier is up and the runtime is
+    // mid-teardown, and destroying between the halves would strand exactly what
+    // this delivers.
+    __wasmEnvCleanupPreparing = true
+    let __live
+    try {
+      __live = __begin()
+    } catch (__error) {
+      __wasmEnvCleanupPreparing = false
+      throw __error
+    }
+    __wasmEnvCleanupRan = true
+    const __finishEnvCleanup = () => {
+      if (__wasmEnvCleanupPrepared) {
+        // Already closed by a caller that could not yield. \`…_finish\` is
+        // idempotent, but the flags it lowers are not.
+        return
+      }
+      __finishParkedEnvCleanup = undefined
+      try {
+        __finish()
+      } finally {
+        __wasmEnvCleanupPreparing = false
+      }
+      __wasmEnvCleanupPrepared = true
+    }
+    if (!__live || typeof __workPending !== 'function') {
+      __finishEnvCleanup()
+      return
+    }
+    // Publish the closer before yielding: from here until \`__finishEnvCleanup\`
+    // runs, a caller that cannot yield is entitled to end this handshake.
+    __finishParkedEnvCleanup = __finishEnvCleanup
+    return __pollWasmRuntimeWork(__workPending).then(
+      __finishEnvCleanup,
+      __finishEnvCleanup,
+    )
+  }
   // The barrier + settlement drain, hoisted out of the context destroyer so the
   // drain can yield without widening the destroyer's reentry window. Both
   // yielding paths run it — dispose() and the initialization-failure rollback.
@@ -2255,6 +3300,20 @@ ${instanceHostState}\
   // is enough — and dispose() stays retryable after it rejects, so marking the
   // drain complete up front would make the retry skip it and destroy the context
   // with the barrier's settlements still queued.
+  const __drainAfterEnvCleanup = () => {
+    if (!__wasmEnvCleanupRan) {
+      return
+    }
+    const __drained = __drainWasmEnvCleanup(__napiInstance)
+    if (!__drained || typeof __drained.then !== 'function') {
+      __wasmEnvCleanupDrained = true
+      return
+    }
+    return __drained.then((__value) => {
+      __wasmEnvCleanupDrained = true
+      return __value
+    })
+  }
   const __prepareForDisposal = () => {
     if (__wasmEnvCleanupDrained) {
       return
@@ -2262,18 +3321,19 @@ ${instanceHostState}\
     if (__wasmEnvCleanupDrainPromise) {
       return __wasmEnvCleanupDrainPromise
     }
-    __prepareEnvCleanup()
-    if (!__wasmEnvCleanupRan) {
+    // The barrier itself can yield now, so the memo below has to cover it too:
+    // a reentrant caller must join this handshake rather than start a second
+    // one while the first is parked between the two halves.
+    const __prepared = __prepareEnvCleanupWithTurns()
+    const __settled =
+      __prepared && typeof __prepared.then === 'function'
+        ? __prepared.then(__drainAfterEnvCleanup)
+        : __drainAfterEnvCleanup()
+    if (!__settled || typeof __settled.then !== 'function') {
       return
     }
-    const __drained = __drainWasmEnvCleanup(__napiInstance)
-    if (!__drained || typeof __drained.then !== 'function') {
-      __wasmEnvCleanupDrained = true
-      return
-    }
-    const __tracked = __drained.then(
+    const __tracked = __settled.then(
       (__value) => {
-        __wasmEnvCleanupDrained = true
         __wasmEnvCleanupDrainPromise = undefined
         return __value
       },
@@ -2828,9 +3888,11 @@ export const createWasiBinding = (
 } = require('@napi-rs/async-runtime')
 `
     : ''
+  // The threaded loader has the thread crash latch, whose disposal releases
+  // the host timers it tracks. See \`__trackCurrentThreadHostTimers\`.
   const installAsyncRuntimeHosts = asyncRuntime
     ? `  __currentThreadHostsDisposer = __installCurrentThreadHosts(
-    __napiModule.exports,
+    ${threads ? '__trackCurrentThreadHostTimers(__napiModule.exports)' : '__napiModule.exports'},
   )
 `
     : ''
@@ -2914,7 +3976,13 @@ function __createWasiWorker(filename) {
       return new Worker(filename, {
         env: process.env,
         execArgv: __workerExecArgv,
-        workerData: { hostRoot: __hostRoot, rootDir: __rootDir },
+        workerData: {
+          hostRoot: __hostRoot,
+          rootDir: __rootDir,
+          crashFlag: __wasiThreadCrashFlag,
+          crashReport: __wasiThreadCrashReport,
+          addonCrashFlag: __wasiAddonCrashFlag,
+        },
       })
     } catch (error) {
       if (!error || error.code !== 'ERR_WORKER_INVALID_EXEC_ARGV') {
@@ -2929,6 +3997,306 @@ function __createWasiWorker(filename) {
     }
   }
 }
+`
+    : ''
+  // The host timeouts a CurrentThread sleep armed, released without entering
+  // wasm on every crash path. See `__trackCurrentThreadHostTimers`.
+  const releaseCurrentThreadHostTimers = (indent: string) =>
+    threads && asyncRuntime
+      ? `${indent}__releaseCurrentThreadHostTimers()\n`
+      : ''
+  // Only the threaded flavor has pool workers whose wasm thread can die under
+  // this one. See `__disposeWasiBindingAtExit`.
+  const threadCrashLatch = threads
+    ? `
+// Set to 1 by a pool worker (see wasi-worker.mjs) right before it reports that
+// its wasm thread died. Shared memory, so this thread reads it synchronously even
+// while the worker's 'error' event is still queued behind the code that is
+// exiting right now.
+const __wasiThreadCrashFlag = new Int32Array(new SharedArrayBuffer(4))
+// Written by the first pool worker whose wasm thread dies, before it raises the
+// flag: its error and \`threadId\` (layout in wasi-worker.mjs). Read without
+// waiting for any event, see \`__readWasiThreadCrashReport\`.
+const __wasiThreadCrashReport = new SharedArrayBuffer(4096)
+let __wasiThreadCrashReportRead
+// The first error a pool worker reported through its 'error' event, and that
+// worker's \`threadId\`. See \`__getWasiThreadCrashError\`.
+let __wasiThreadCrashWorkerError
+let __wasiThreadCrashWorkerId
+let __wasiThreadCrashError
+// Raised while \`__runWasiInitializationRollbackSteps\` runs, so its polls and
+// steps stop after a crash the way a public disposal's do.
+let __wasiInitializationRollbackActive = false
+let __wasiThreadCrashed = false
+
+${ADDON_CRASH_FLAG_CAPTURE}
+/**
+ * Whether any wasm thread of this binding has died: a trap or an uncaught error
+ * in a pool worker, including one that failed to load after its thread spawn
+ * had already been reported as started.
+ *
+ * After that the shared wasm state cannot be trusted: a lock the dead thread
+ * held stays held, and a join or park that waits on it — the async runtime's
+ * \`finish_shutdown\` waiting for the dead thread's work to go idle — blocks
+ * this thread forever in a raw \`memory.atomic.wait32\`, which neither
+ * emnapi's crash check nor a signal can interrupt.
+ */
+function __hasWasiThreadCrashed() {
+  if (__wasiThreadCrashed || Atomics.load(__wasiThreadCrashFlag, 0) !== 0) {
+    return true
+  }
+  const manager = __getWasiThreadManager()
+  return Boolean(manager && manager._fatalError)
+}
+
+let __wasiThreadCrashDisposePromise
+
+/**
+ * Stores the first error a pool worker reported, with the worker's id. Called
+ * from the loader's own 'error' listener, which runs before emnapi's.
+ */
+function __recordWasiThreadCrashError(error, workerId) {
+  if (__wasiThreadCrashWorkerError !== undefined || error === undefined) {
+    return
+  }
+  __wasiThreadCrashWorkerError = error
+  __wasiThreadCrashWorkerId = workerId
+  __fillWasiThreadCrashError()
+}
+
+/**
+ * The error in the shared crash report, rebuilt once it is complete: the
+ * worker writes it before it raises the flag, so it is there as soon as the
+ * crash is seen. Plain JavaScript over shared memory; never enters wasm.
+ */
+function __readWasiThreadCrashReport() {
+  if (__wasiThreadCrashReportRead !== undefined) {
+    return __wasiThreadCrashReportRead
+  }
+  try {
+    const header = new Int32Array(__wasiThreadCrashReport, 0, 3)
+    if (Atomics.load(header, 0) !== 2) {
+      return
+    }
+    const length = Atomics.load(header, 1)
+    const threadId = Atomics.load(header, 2)
+    let error
+    if (length > 0) {
+      // Copied out of shared memory: TextDecoder does not take a shared view.
+      const bytes = new Uint8Array(__wasiThreadCrashReport, 12, length).slice()
+      const report = JSON.parse(new TextDecoder().decode(bytes))
+      error = new Error(String(report.message))
+      if (typeof report.name === 'string') {
+        error.name = report.name
+      }
+      if (typeof report.stack === 'string') {
+        error.stack = report.stack
+      }
+    }
+    __wasiThreadCrashReportRead = { error, threadId }
+  } catch {
+    __wasiThreadCrashReportRead = { error: undefined, threadId: 0 }
+  }
+  return __wasiThreadCrashReportRead
+}
+
+/**
+ * The one error every crash path of this binding reports, created on first
+ * use.
+ *
+ * The shared flag is raised before this thread has processed the worker's
+ * 'error' event, and once the workers are terminated that event is often
+ * never delivered, so neither it nor emnapi's \`_fatalError\` can be counted
+ * on. The cause is filled in from the first source that has it: the error the
+ * 'error' listener kept, else the worker's shared crash report, else
+ * \`_fatalError\` — here, and again from the 'error' listener when it arrives
+ * later. Until then the error carries only its message.
+ */
+function __getWasiThreadCrashError() {
+  if (__wasiThreadCrashError === undefined) {
+    __wasiThreadCrashError = new Error(
+      'napi-rs: WASI binding cannot be disposed after a worker thread crashed',
+    )
+  }
+  __fillWasiThreadCrashError()
+  return __wasiThreadCrashError
+}
+
+function __fillWasiThreadCrashError() {
+  const crashError = __wasiThreadCrashError
+  if (crashError === undefined) {
+    return
+  }
+  try {
+    if (crashError.cause === undefined) {
+      let cause = __wasiThreadCrashWorkerError
+      if (cause === undefined) {
+        const report = __readWasiThreadCrashReport()
+        cause = report ? report.error : undefined
+      }
+      if (cause === undefined) {
+        const manager = __getWasiThreadManager()
+        cause = manager ? manager._fatalError : undefined
+      }
+      if (cause !== undefined && cause !== null) {
+        crashError.cause = cause
+      }
+    }
+    if (crashError.workerThreadId === undefined) {
+      let workerId = __wasiThreadCrashWorkerId
+      if (workerId === undefined) {
+        const report = __readWasiThreadCrashReport()
+        workerId = report && report.threadId > 0 ? report.threadId : undefined
+      }
+      if (workerId !== undefined) {
+        crashError.workerThreadId = workerId
+      }
+    }
+  } catch {}
+}
+
+/**
+ * Let the event loop drain after a wasm thread died, without entering wasm.
+ *
+ * emnapi's \`Context\` keeps a \`NodejsWaitingRequestCounter\` on Node: a
+ * \`MessagePort\` (\`refCounter.refHandle\`) that it refs when the count of
+ * in-flight async work and threadsafe-function requests leaves zero and unrefs
+ * when it comes back. The requests the dead thread held never complete, so the
+ * count never returns to zero and the port holds the process open for good.
+ * \`Context.destroy()\` would not release it either — and it runs cleanup
+ * hooks, which is exactly what must not happen now. So unref the port directly.
+ * The count is left as is: it stays above zero, so a later request never refs
+ * the port again.
+ *
+ * The field is private in emnapi's typings, so read it defensively; a context
+ * without it (a non-Node host, a future emnapi) is left alone.
+ */
+function __releaseEmnapiWaitingRequestHandle() {
+  try {
+    const refCounter = __emnapiContext && __emnapiContext.refCounter
+    const refHandle = refCounter && refCounter.refHandle
+    if (refHandle && typeof refHandle.unref === 'function') {
+      refHandle.unref()
+    }
+  } catch {}
+}
+
+/**
+ * The public disposer after a wasm thread died. The normal chain drains async
+ * work, runs the environment cleanup barrier and destroys the context — every
+ * one of those re-enters wasm, and the barrier's shutdown waits for the dead
+ * thread's work in the same raw atomic wait \`__disposeWasiBindingAtExit\`
+ * avoids. An app that handled the worker's error and then disposes would block
+ * there for good. Only stop the workers, then reject: the binding was not
+ * cleaned up and cannot be, so reporting success would be a lie. The context
+ * is not destroyed — only its waiting-request port is unrefed, so the process
+ * can exit on its own — and the 'exit' listener takes its short path too.
+ *
+ * Latched: every later call returns the same promise.
+ */
+function __disposeWasiBindingAfterThreadCrash() {
+  if (__wasiThreadCrashDisposePromise) {
+    return __wasiThreadCrashDisposePromise
+  }
+  __releaseEmnapiWaitingRequestHandle()
+${releaseCurrentThreadHostTimers('  ')}\
+  let workerResult
+  try {
+    workerResult = __terminateWasiWorkers()
+  } catch (terminateError) {
+    workerResult = Promise.reject(terminateError)
+  }
+  // Built at settlement, after the workers stopped: by then the 'error' event
+  // has usually delivered the worker's error.
+  __wasiThreadCrashDisposePromise = Promise.resolve(workerResult).then(
+    () => {
+      throw __getWasiThreadCrashError()
+    },
+    (terminateError) => {
+      throw __attachCleanupErrors(__getWasiThreadCrashError(), [
+        terminateError,
+      ])
+    },
+  )
+  return __wasiThreadCrashDisposePromise
+}
+
+/**
+ * Stops a public disposal that a thread crash overtook.
+ *
+ * The check at the top of \`__disposeWasiBinding\` only sees a crash that came
+ * first. A thread that dies once the chain is running leaves it polling for
+ * work the dead thread still counts — the async-work drain for
+ * \`napi_wasm_async_work_pending\`, the barrier's poll for
+ * \`napi_wasm_runtime_work_pending\` — and neither count ever reaches zero, so
+ * the poll's referenced timers keep the process alive forever with the
+ * disposal promise pending. Each poll turn and each step boundary calls this,
+ * and the throw ends the chain before anything re-enters wasm again; the
+ * disposer then settles it through \`__settleWasiDisposalAfterThreadCrash\`.
+ *
+ * The initialization rollback runs the same polls and steps, so they stop while
+ * it runs too; its wrapper, \`__rollbackWasiInitialization\`, then ends it
+ * through \`__rollbackWasiInitializationAfterThreadCrash\`. A bare poll with
+ * neither in flight is left alone.
+ */
+function __abortWasiDisposalIfThreadCrashed() {
+  if (
+    (__wasiDisposePromise !== undefined ||
+      __wasiInitializationRollbackActive) &&
+    __hasWasiThreadCrashed()
+  ) {
+    throw new Error(
+      'napi-rs: WASI disposal stopped because a worker thread crashed',
+    )
+  }
+}
+
+/**
+ * Settles an in-flight public disposal whose chain failed after a thread
+ * died — stopped by \`__abortWasiDisposalIfThreadCrashed\` or failing any other
+ * way — through the crash disposal: it releases the waiting-request port,
+ * terminates the workers and rejects with the same error an entry-time crash
+ * gets. \`__wasiDisposePromise\` stays set, so this caller, every caller that
+ * joined it and every later one hold the same promise. Returns false when no
+ * thread died, leaving the ordinary failure handling alone.
+ */
+function __settleWasiDisposalAfterThreadCrash(resolve, reject) {
+  if (!__hasWasiThreadCrashed()) {
+    return false
+  }
+  __disposeWasiBindingAfterThreadCrash().then(resolve, reject)
+  return true
+}
+
+/**
+ * Ends an initialization rollback after a wasm thread died, without entering
+ * wasm: the barrier, its finish and \`Context.destroy()\` are skipped, and the
+ * crash disposal releases the waiting-request port and terminates the workers,
+ * once. The initialization error itself is left to propagate: the crash error
+ * is returned as the rollback's cleanup error, so
+ * \`__completeWasiInitializationRollback\` attaches it — as the cause when the
+ * error has none — and keeps the record, since the context was not destroyed.
+ */
+function __rollbackWasiInitializationAfterThreadCrash() {
+  const crashError = __getWasiThreadCrashError()
+  // Its rejection is \`crashError\` itself, which the caller reports.
+  void __disposeWasiBindingAfterThreadCrash().catch(() => {})
+  return [crashError]
+}
+`
+    : ''
+  const skipTeardownAfterThreadCrash = threads
+    ? `  if (__hasWasiThreadCrashed()) {
+    // Never re-enter wasm after a thread died: the environment cleanup joins
+    // the dead thread's work and would hang the exit forever — SIGTERM
+    // included, since its JavaScript listener never gets a turn. Stop the
+    // workers and leave.
+${releaseCurrentThreadHostTimers('    ')}\
+    try {
+      void Promise.resolve(__terminateWasiWorkers()).catch(() => {})
+    } catch {}
+    return
+  }
 `
     : ''
   const workerRuntimeImport = threads
@@ -2975,10 +4343,18 @@ function __createWasiWorker(filename) {
   // with threads there is no JavaScript seam at all, so `__drainWasiAsyncWork`
   // asks the addon instead.
   const emnapiPluginRequire = `  emnapiAsyncWorkPlugin: __emnapiAsyncWorkPlugin,\n  emnapiTSFNPlugin: __emnapiTSFNPlugin,\n`
+  const captureAddonCrashFlag = threads
+    ? '      __captureWasiAddonCrashFlag(instance)\n'
+    : ''
   const workerOption = threads
     ? `    onCreateWorker() {
       const worker = __createWasiWorker(__nodePath.join(__dirname, 'wasi-worker.mjs'))
       __wasiWorkers.add(worker)
+      // Registered before emnapi's own listeners, which rethrow the error.
+      worker.on('error', (error) => {
+        __wasiThreadCrashed = true
+        __recordWasiThreadCrashError(error, worker.threadId)
+      })
       worker.onmessage = ({ data }) => {
         __wasmCreateOnMessageForFsProxy(__nodeFs)(data)
       }
@@ -3033,6 +4409,7 @@ ${workerRuntimeImport}\
 const { createContext: __emnapiCreateContext } = require('@emnapi/runtime')
 ${asyncRuntimeImport}\
 ${workerExecArgv}\
+${threadCrashLatch}\
 
 const __cwd = process.cwd()
 const __rootDir = __nodePath.parse(__cwd).root
@@ -3075,7 +4452,7 @@ if (__nodeFs.existsSync(__wasmDebugFilePath)) {
 
 const __wasmFile = __nodeFs.readFileSync(__wasmFilePath)
 let __emnapiContext
-${createEmnapiContextLifecycle(asyncRuntime)}
+${createEmnapiContextLifecycle(asyncRuntime, threads)}
 const __wasiRollbackRegistrySymbol = Symbol.for('${WASI_ROLLBACK_REGISTRY_SYMBOL}')
 const __wasiRollbackRegistryKey =
   typeof __filename === 'string' ? __filename : __wasmFilePath
@@ -3179,11 +4556,15 @@ function __removeWasiExitListener() {
 
 function __disposeWasiBindingAtExit() {
   __wasiExitListenerRegistered = false
+${skipTeardownAfterThreadCrash}\
   // An 'exit' handler cannot yield, so it cannot wait for queued promise
   // settlements the way __startWasiDisposal does — the process is leaving and
   // those promises have no observer left anyway. Run the synchronous teardown
   // directly. Every step is idempotent, which also makes this the synchronous
-  // finish for a disposal that is still waiting for its drain.
+  // finish for a disposal that is still waiting for its drain — and, through
+  // __prepareWasmEnvCleanup, for one still parked between the two halves of
+  // the environment cleanup barrier: there are no turns left to poll with, so
+  // this closes that handshake with \`…_finish\`, which joins.
   try {
     __destroyEmnapiContext()
   } catch {}
@@ -3285,6 +4666,7 @@ ${workerOption}\
     },
     beforeInit({ instance }) {
       __napiInstance = instance
+${captureAddonCrashFlag}\
       for (const name of Object.keys(instance.exports)) {
         if (name.startsWith('__napi_register__')) {
           instance.exports[name]()