@agoric/vow 0.1.1-dev-9cdb01d.0 → 0.1.1-dev-3e9ff43.0

package/README.md

@@ -27,7 +27,7 @@ Here they are: {
 ```
 
 You can use `heapVowE` exported from `@agoric/vow`, which converts a chain of
-promises and vows to a promise for its final fulfilment, by unwrapping any
+promises and vows to a promise for its final fulfillment, by unwrapping any
 intermediate vows:
 
 ```js
@@ -77,6 +77,67 @@ const { watch, makeVowKit } = prepareVowTools(vowZone);
 // Vows and resolvers you create can be saved in durable stores.
 ```
 
+## VowTools
+
+VowTools are a set of utility functions for working with Vows in Agoric smart contracts and vats. These tools help manage asynchronous operations in a way that's resilient to vat upgrades, ensuring your smart contract can handle long-running processes reliably.
+
+### Usage
+
+VowTools are typically prepared in the start function of a smart contract or vat and passed in as a power to exos.
+
+
+```javascript
+import { prepareVowTools } from '@agoric/vow/vat.js';
+import { makeDurableZone } from '@agoric/zone/durable.js';
+
+export const start = async (zcf, privateArgs, baggage) => {
+  const zone = makeDurableZone(baggage);
+  const vowTools = prepareVowTools(zone.subZone('vows'));  
+
+  // Use vowTools here...
+}
+```
+
+### Available Tools
+
+#### `when(vowOrPromise)`
+Returns a Promise for the fulfillment of the very end of the `vowOrPromise` chain.  It can retry disconnections due to upgrades of other vats, but cannot survive the upgrade of the calling vat.
+
+#### `watch(promiseOrVow, [watcher], [context])`
+Watch a Vow and optionally provide a `watcher` with `onFulfilled`/`onRejected` handlers and a `context` value for the handlers. When handlers are not provided the fulfillment or rejection will simply pass through.
+
+It also registers pending Promises, so if the current vat is upgraded, the watcher is rejected because the Promise was lost when the heap was reset.
+
+#### `all(arrayOfPassables, [watcher], [context])`
+Vow-tolerant implementation of Promise.all that takes an iterable of vows and other Passables and returns a single Vow.  It resolves with an array of values when all of the input's promises or vows are fulfilled and rejects with the first rejection reason when any of the input's promises or vows are rejected.
+
+#### `allSettled(arrayOfPassables, [watcher], [context])`
+Vow-tolerant implementation of Promise.allSettled that takes an iterable of vows and other Passables and returns a single Vow.  It resolves when all of the input's promises or vows are settled with an array of settled outcome objects.
+
+#### `asVow(fn)`
+Takes a function that might return synchronously, throw an Error, or return a Promise or Vow and returns a Vow.
+
+#### `asPromise(vow)`
+Converts a Vow back into a Promise.
+
+### Example
+
+```javascript
+const { when, watch, all, allSettled } = vowTools;
+
+// Using watch to create a Vow
+const myVow = watch(someAsyncOperation());
+
+// Using when to resolve a Vow
+const result = await when(myVow);
+
+// Using all
+const results = await when(all([vow, vowForVow, promise]));
+
+// Using allSettled
+const outcomes = await when(allSettled([vow, vowForVow, promise]));
+```
+
 ## Internals
 
 The current "version 0" vow internals expose a `shorten()` method, returning a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vow",
-  "version": "0.1.1-dev-9cdb01d.0+9cdb01d",
+  "version": "0.1.1-dev-3e9ff43.0+3e9ff43",
   "description": "Remote (shortening and disconnection-tolerant) Promise-likes",
   "type": "module",
   "main": "src/index.js",
@@ -19,8 +19,8 @@
     "lint:types": "tsc"
   },
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-dev-9cdb01d.0+9cdb01d",
-    "@agoric/internal": "0.3.3-dev-9cdb01d.0+9cdb01d",
+    "@agoric/base-zone": "0.1.1-dev-3e9ff43.0+3e9ff43",
+    "@agoric/internal": "0.3.3-dev-3e9ff43.0+3e9ff43",
     "@endo/env-options": "^1.1.6",
     "@endo/errors": "^1.2.5",
     "@endo/eventual-send": "^1.2.5",
@@ -55,5 +55,5 @@
   "typeCoverage": {
     "atLeast": 89.96
   },
-  "gitHead": "9cdb01dde5fdc3418fc9d615ab640d9f859555e6"
+  "gitHead": "3e9ff4365c55c19a4b40d2d2741ac791fa287851"
 }

package/src/tools.d.ts

@@ -4,7 +4,15 @@ export function prepareBasicVowTools(zone: Zone, powers?: {
     when: <T, TResult1 = import("./types.js").EUnwrap<T>, TResult2 = never>(specimenP: T, onFulfilled?: ((value: import("./types.js").EUnwrap<T>) => TResult1 | PromiseLike<TResult1>) | undefined, onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined) => Promise<TResult1 | TResult2>;
     watch: <T = any, TResult1 = T, TResult2 = never, C extends any[] = any[]>(specimenP: EVow<T>, watcher?: import("./types.js").Watcher<T, TResult1, TResult2, C> | undefined, ...watcherArgs: C) => Vow<Exclude<TResult1, void> | Exclude<TResult2, void> extends never ? TResult1 : Exclude<TResult1, void> | Exclude<TResult2, void>>;
     makeVowKit: <T>() => import("./types.js").VowKit<T>;
-    allVows: (maybeVows: EVow<unknown>[]) => Vow<any[]>;
+    all: (maybeVows: unknown[]) => Vow<any[]>;
+    allVows: (maybeVows: unknown[]) => Vow<any[]>;
+    allSettled: (maybeVows: unknown[]) => Vow<({
+        status: "fulfilled";
+        value: any;
+    } | {
+        status: "rejected";
+        reason: any;
+    })[]>;
     asVow: <T extends unknown>(fn: (...args: any[]) => Vow<Awaited<T>> | Awaited<T> | import("./types.js").PromiseVow<T>) => Vow<Awaited<T>>;
     asPromise: AsPromiseFunction;
     retriable: <F extends (...args: any[]) => Promise<any>>(fnZone: Zone, name: string, fn: F) => F extends (...args: infer Args) => Promise<infer R> ? (...args: Args) => Vow<R> : never;

package/src/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["tools.js"],"names":[],"mappings":"AAoBO,2CAJI,IAAI;;;;;;yBAwCF,KAAK,OAAO,CAAC,EAAE;oCAqB8U,GAAG;;gBArC3T,CAAC,SAApC,CAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAE,UACpC,IAAI,QACJ,MAAM,MACN,CAAC,KACC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,MAAM,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC,CAAC,GAAG,KAAK;EA6BrG;uBAGa,UAAU,CAAC,OAAO,oBAAoB,CAAC;0BApE9B,mBAAmB;uCAC8B,YAAY;0BAAZ,YAAY;yBAAZ,YAAY;uCAAZ,YAAY"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["tools.js"],"names":[],"mappings":"AAqBO,2CAJI,IAAI;;;;;;qBA4CF,OAAO,EAAE;yBAAT,OAAO,EAAE;4BAgBT,OAAO,EAAE;;;;;;;oCAFc,GACpC;;gBAnCkD,CAAC,SAApC,CAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAE,UACpC,IAAI,QACJ,MAAM,MACN,CAAC,KACC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,MAAM,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC,CAAC,GAAG,KAAK;EAmDrG;uBAGa,UAAU,CAAC,OAAO,oBAAoB,CAAC;0BA3F9B,mBAAmB;uCAE8B,YAAY;0BAAZ,YAAY;yBAAZ,YAAY;uCAAZ,YAAY"}

package/src/tools.js

@@ -7,6 +7,7 @@ import { makeWhen } from './when.js';
 
 /**
  * @import {Zone} from '@agoric/base-zone';
+ * @import {Passable} from '@endo/pass-style';
  * @import {IsRetryableReason, AsPromiseFunction, EVow, Vow, ERef} from './types.js';
  */
 
@@ -52,11 +53,31 @@ export const prepareBasicVowTools = (zone, powers = {}) => {
     };
 
   /**
-   * Vow-tolerant implementation of Promise.all.
+   * Vow-tolerant implementation of Promise.all that takes an iterable of vows
+   * and other {@link Passable}s and returns a single {@link Vow}. It resolves
+   * with an array of values when all of the input's promises or vows are
+   * fulfilled and rejects when any of the input's promises or vows are
+   * rejected with the first rejection reason.
    *
-   * @param {EVow<unknown>[]} maybeVows
+   * @param {unknown[]} maybeVows
    */
-  const allVows = maybeVows => watchUtils.all(maybeVows);
+  const all = maybeVows => watchUtils.all(maybeVows);
+
+  /**
+   * @param {unknown[]} maybeVows
+   * @deprecated use `vowTools.all`
+   */
+  const allVows = all;
+
+  /**
+   * Vow-tolerant implementation of Promise.allSettled that takes an iterable
+   * of vows and other {@link Passable}s and returns a single {@link Vow}. It
+   * resolves when all of the input's promises or vows are settled with an
+   * array of settled outcome objects.
+   *
+   * @param {unknown[]} maybeVows
+   */
+  const allSettled = maybeVows => watchUtils.allSettled(maybeVows);
 
   /** @type {AsPromiseFunction} */
   const asPromise = (specimenP, ...watcherArgs) =>
@@ -66,7 +87,9 @@ export const prepareBasicVowTools = (zone, powers = {}) => {
     when,
     watch,
     makeVowKit,
+    all,
     allVows,
+    allSettled,
     asVow,
     asPromise,
     retriable,

package/src/types.d.ts

@@ -35,6 +35,9 @@ export type VowV0<T = any> = {
 export type VowPayload<T = any> = {
     vowV0: RemotableObject & Remote<VowV0<T>>;
 };
+/**
+ * Vows are objects that represent promises that can be stored durably.
+ */
 export type Vow<T = any> = CopyTagged<"Vow", VowPayload<T>>;
 export type VowKit<T = any> = {
     vow: Vow<T>;

package/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":";;;yCAaW,GAAG,mBACH,GAAG,KAED,GAAG;;;;;uBAKH,CAAC,IACD,OAAO,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;iBAKnB,CAAC,IACD,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;;;;iBAKlB,CAAC,IACD,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;;;;;oBAMhB,CAAC,IACD,CACR,CAAC,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GACnC,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAC3C,CAAC,CACF;;;;;;;kBAIU,CAAC;;;;;;;aAMD,MAAM,OAAO,CAAC,CAAC,CAAC;;uBAOhB,CAAC;WAED,eAAe,GAAG,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;;gBAIlC,CAAC,UACF,WAAW,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;mBAI/B,CAAC,UACF;IACR,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IACZ,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;CAC1B;wBAIU,CAAC,UACF;IAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAAC,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,GAAG,IAAI,CAAA;CAAE;oBAIvE,CAAC,QACD,QAAQ,MACR,QAAQ,UACA,CAAC,SAAT,GAAG,EAAG;2BAEE,CAAC,WAAW,CAAC,KAAK,GAAG,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ;2BAChE,GAAG,WAAW,CAAC,KAAK,GAAG,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ;;;;;8BAM5E,CAAC,QACD,QAAQ,MACR,QAAQ,UACA,CAAC,SAAT,GAAG,EAAG,wBAET,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,2FAGd,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;qCArGP,kBAAkB;4BAC3B,kBAAkB;gCAFd,kBAAkB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":";;;yCAaW,GAAG,mBACH,GAAG,KAED,GAAG;;;;;uBAKH,CAAC,IACD,OAAO,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;iBAKnB,CAAC,IACD,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;;;;iBAKlB,CAAC,IACD,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;;;;;oBAMhB,CAAC,IACD,CACR,CAAC,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GACnC,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAC3C,CAAC,CACF;;;;;;;kBAIU,CAAC;;;;;;;aAMD,MAAM,OAAO,CAAC,CAAC,CAAC;;uBAOhB,CAAC;WAED,eAAe,GAAG,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;;;;;gBAKlC,CAAC,UACF,WAAW,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;mBAI/B,CAAC,UACF;IACR,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IACZ,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;CAC1B;wBAIU,CAAC,UACF;IAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAAC,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,GAAG,IAAI,CAAA;CAAE;oBAIvE,CAAC,QACD,QAAQ,MACR,QAAQ,UACA,CAAC,SAAT,GAAG,EAAG;2BAEE,CAAC,WAAW,CAAC,KAAK,GAAG,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ;2BAChE,GAAG,WAAW,CAAC,KAAK,GAAG,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ;;;;;8BAM5E,CAAC,QACD,QAAQ,MACR,QAAQ,UACA,CAAC,SAAT,GAAG,EAAG,wBAET,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,2FAGd,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;qCAtGP,kBAAkB;4BAC3B,kBAAkB;gCAFd,kBAAkB"}

package/src/types.js

@@ -66,6 +66,7 @@ export {};
  */
 
 /**
+ * Vows are objects that represent promises that can be stored durably.
  * @template [T=any]
  * @typedef {CopyTagged<'Vow', VowPayload<T>>} Vow
  */

package/src/watch-utils.d.ts

@@ -4,10 +4,16 @@ export function prepareWatchUtils(zone: Zone, { watch, when, makeVowKit, isRetry
     makeVowKit: () => VowKit<any>;
     isRetryableReason: IsRetryableReason;
 }): () => import("@endo/exo").Guarded<{
-    /**
-     * @param {EVow<unknown>[]} vows
-     */
-    all(vows: EVow<unknown>[]): import("./types.js").Vow<any[]>;
+    /** @param {unknown[]} specimens */
+    all(specimens: unknown[]): Vow<any[]>;
+    /** @param {unknown[]} specimens */
+    allSettled(specimens: unknown[]): Vow<({
+        status: "fulfilled";
+        value: any;
+    } | {
+        status: "rejected";
+        reason: any;
+    })[]>;
     /** @type {AsPromiseFunction} */
     asPromise(specimenP: any, watcher: import("./types.js").Watcher<any, any, never, any[]> | undefined, watcherArgs: any[] | undefined): Promise<any>;
 }>;
@@ -16,5 +22,5 @@ import type { Watch } from './watch.js';
 import type { When } from './when.js';
 import type { VowKit } from './types.js';
 import type { IsRetryableReason } from './types.js';
-import type { EVow } from './types.js';
+import type { Vow } from './types.js';
 //# sourceMappingURL=watch-utils.d.ts.map

package/src/watch-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watch-utils.d.ts","sourceRoot":"","sources":["watch-utils.js"],"names":[],"mappings":"AA4CO,wCAPI,IAAI,kDAEZ;IAAsB,KAAK,EAAnB,KAAK;IACQ,IAAI,EAAjB,IAAI;IACsB,UAAU,EAApC,MAAM,OAAO,GAAG,CAAC;IACS,iBAAiB,EAA3C,iBAAiB;CAC3B;IAsCO;;OAEG;cADQ,KAAK,OAAO,CAAC,EAAE;IAuC1B,gCAAgC;;GAgGvC;0BAhNsB,mBAAmB;2BAClB,YAAY;0BACb,WAAW;4BACmC,YAAY;uCAAZ,YAAY;0BAAZ,YAAY"}
+{"version":3,"file":"watch-utils.d.ts","sourceRoot":"","sources":["watch-utils.js"],"names":[],"mappings":"AA4CO,wCAPI,IAAI,kDAEZ;IAAsB,KAAK,EAAnB,KAAK;IACQ,IAAI,EAAjB,IAAI;IACsB,UAAU,EAApC,MAAM,OAAO,GAAG,CAAC;IACS,iBAAiB,EAA3C,iBAAiB;CAC3B;IA4CO,mCAAmC;mBAAvB,OAAO,EAAE;IAIrB,mCAAmC;0BAAvB,OAAO,EAAE,GAED,IAAI,CAAC;QAAC,MAAM,EAAE,WAAW,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAC,GAAG;QAAC,MAAM,EAAE,UAAU,CAAC;QAAC,MAAM,EAAE,GAAG,CAAA;KAAC,CAAC,EAAE,CAAC;IAIlG,gCAAgC;;GAoLvC;0BA5QsB,mBAAmB;2BAClB,YAAY;0BACb,WAAW;4BACkC,YAAY;uCAAZ,YAAY;yBAAZ,YAAY"}

package/src/watch-utils.js

@@ -10,7 +10,7 @@ const { Fail, bare, details: X } = assert;
  * @import {Zone} from '@agoric/base-zone';
  * @import {Watch} from './watch.js';
  * @import {When} from './when.js';
- * @import {VowKit, AsPromiseFunction, IsRetryableReason, EVow} from './types.js';
+ * @import {VowKit, AsPromiseFunction, IsRetryableReason, Vow} from './types.js';
  */
 
 const VowShape = M.tagged(
@@ -54,11 +54,16 @@ export const prepareWatchUtils = (
     {
       utils: M.interface('Utils', {
         all: M.call(M.arrayOf(M.any())).returns(VowShape),
+        allSettled: M.call(M.arrayOf(M.any())).returns(VowShape),
         asPromise: M.call(M.raw()).rest(M.raw()).returns(M.promise()),
       }),
       watcher: M.interface('Watcher', {
-        onFulfilled: M.call(M.any()).rest(M.any()).returns(M.any()),
-        onRejected: M.call(M.any()).rest(M.any()).returns(M.any()),
+        onFulfilled: M.call(M.raw()).rest(M.raw()).returns(M.raw()),
+        onRejected: M.call(M.raw()).rest(M.raw()).returns(M.raw()),
+      }),
+      helper: M.interface('Helper', {
+        createVow: M.call(M.arrayOf(M.any()), M.boolean()).returns(VowShape),
+        processResult: M.call(M.raw()).rest(M.raw()).returns(M.undefined()),
       }),
       retryRejectionPromiseWatcher: PromiseWatcherI,
     },
@@ -68,6 +73,7 @@ export const prepareWatchUtils = (
        * @property {number} remaining
        * @property {MapStore<number, any>} resultsMap
        * @property {VowKit['resolver']} resolver
+       * @property {boolean} [isAllSettled]
        */
       /** @type {MapStore<bigint, VowState>} */
       const idToVowState = detached.mapStore('idToVowState');
@@ -79,32 +85,83 @@ export const prepareWatchUtils = (
     },
     {
       utils: {
+        /** @param {unknown[]} specimens */
+        all(specimens) {
+          return this.facets.helper.createVow(specimens, false);
+        },
+        /** @param {unknown[]} specimens */
+        allSettled(specimens) {
+          return /** @type {Vow<({status: 'fulfilled', value: any} | {status: 'rejected', reason: any})[]>} */ (
+            this.facets.helper.createVow(specimens, true)
+          );
+        },
+        /** @type {AsPromiseFunction} */
+        asPromise(specimenP, ...watcherArgs) {
+          // Watch the specimen in case it is an ephemeral promise.
+          const vow = watch(specimenP, ...watcherArgs);
+          const promise = when(vow);
+          // Watch the ephemeral result promise to ensure that if its settlement is
+          // lost due to upgrade of this incarnation, we will at least cause an
+          // unhandled rejection in the new incarnation.
+          zone.watchPromise(promise, this.facets.retryRejectionPromiseWatcher);
+
+          return promise;
+        },
+      },
+      watcher: {
         /**
-         * @param {EVow<unknown>[]} vows
+         * @param {unknown} value
+         * @param {object} ctx
+         * @param {bigint} ctx.id
+         * @param {number} ctx.index
+         * @param {number} ctx.numResults
+         * @param {boolean} ctx.isAllSettled
          */
-        all(vows) {
+        onFulfilled(value, ctx) {
+          this.facets.helper.processResult(value, ctx, 'fulfilled');
+        },
+        /**
+         * @param {unknown} reason
+         * @param {object} ctx
+         * @param {bigint} ctx.id
+         * @param {number} ctx.index
+         * @param {number} ctx.numResults
+         * @param {boolean} ctx.isAllSettled
+         */
+        onRejected(reason, ctx) {
+          this.facets.helper.processResult(reason, ctx, 'rejected');
+        },
+      },
+      helper: {
+        /**
+         * @param {unknown[]} specimens
+         * @param {boolean} isAllSettled
+         */
+        createVow(specimens, isAllSettled) {
           const { nextId: id, idToVowState } = this.state;
           /** @type {VowKit<any[]>} */
           const kit = makeVowKit();
 
-          // Preserve the order of the vow results.
-          for (let index = 0; index < vows.length; index += 1) {
-            watch(vows[index], this.facets.watcher, {
+          // Preserve the order of the results.
+          for (let index = 0; index < specimens.length; index += 1) {
+            watch(specimens[index], this.facets.watcher, {
               id,
               index,
-              numResults: vows.length,
+              numResults: specimens.length,
+              isAllSettled,
             });
           }
 
-          if (vows.length > 0) {
+          if (specimens.length > 0) {
             // Save the state until rejection or all fulfilled.
             this.state.nextId += 1n;
             idToVowState.init(
               id,
               harden({
                 resolver: kit.resolver,
-                remaining: vows.length,
+                remaining: specimens.length,
                 resultsMap: detached.mapStore('resultsMap'),
+                isAllSettled,
               }),
             );
             const idToNonStorableResults = provideLazyMap(
@@ -119,27 +176,36 @@ export const prepareWatchUtils = (
           }
           return kit.vow;
         },
-        /** @type {AsPromiseFunction} */
-        asPromise(specimenP, ...watcherArgs) {
-          // Watch the specimen in case it is an ephemeral promise.
-          const vow = watch(specimenP, ...watcherArgs);
-          const promise = when(vow);
-          // Watch the ephemeral result promise to ensure that if its settlement is
-          // lost due to upgrade of this incarnation, we will at least cause an
-          // unhandled rejection in the new incarnation.
-          zone.watchPromise(promise, this.facets.retryRejectionPromiseWatcher);
-
-          return promise;
-        },
-      },
-      watcher: {
-        onFulfilled(value, { id, index, numResults }) {
+        /**
+         * @param {unknown} result
+         * @param {object} ctx
+         * @param {bigint} ctx.id
+         * @param {number} ctx.index
+         * @param {number} ctx.numResults
+         * @param {boolean} ctx.isAllSettled
+         * @param {'fulfilled' | 'rejected'} status
+         */
+        processResult(result, { id, index, numResults, isAllSettled }, status) {
           const { idToVowState } = this.state;
           if (!idToVowState.has(id)) {
             // Resolution of the returned vow happened already.
             return;
           }
           const { remaining, resultsMap, resolver } = idToVowState.get(id);
+          if (!isAllSettled && status === 'rejected') {
+            // For 'all', we reject immediately on the first rejection
+            idToVowState.delete(id);
+            resolver.reject(result);
+            return;
+          }
+
+          const possiblyWrappedResult = isAllSettled
+            ? harden({
+                status,
+                [status === 'fulfilled' ? 'value' : 'reason']: result,
+              })
+            : result;
+
           const idToNonStorableResults = provideLazyMap(
             utilsToNonStorableResults,
             this.facets.utils,
@@ -152,15 +218,16 @@ export const prepareWatchUtils = (
           );
 
           // Capture the fulfilled value.
-          if (zone.isStorable(value)) {
-            resultsMap.init(index, value);
+          if (zone.isStorable(possiblyWrappedResult)) {
+            resultsMap.init(index, possiblyWrappedResult);
           } else {
-            nonStorableResults.set(index, value);
+            nonStorableResults.set(index, possiblyWrappedResult);
           }
           const vowState = harden({
             remaining: remaining - 1,
             resultsMap,
             resolver,
+            isAllSettled,
           });
           if (vowState.remaining > 0) {
             idToVowState.set(id, vowState);
@@ -177,9 +244,12 @@ export const prepareWatchUtils = (
               results[i] = resultsMap.get(i);
             } else {
               numLost += 1;
+              results[i] = isAllSettled
+                ? { status: 'rejected', reason: 'Unstorable result was lost' }
+                : undefined;
             }
           }
-          if (numLost > 0) {
+          if (numLost > 0 && !isAllSettled) {
             resolver.reject(
               assert.error(X`${numLost} unstorable results were lost`),
             );
@@ -187,16 +257,6 @@ export const prepareWatchUtils = (
             resolver.resolve(harden(results));
           }
         },
-        onRejected(value, { id, index: _index, numResults: _numResults }) {
-          const { idToVowState } = this.state;
-          if (!idToVowState.has(id)) {
-            // First rejection wins.
-            return;
-          }
-          const { resolver } = idToVowState.get(id);
-          idToVowState.delete(id);
-          resolver.reject(value);
-        },
       },
       retryRejectionPromiseWatcher: {
         onFulfilled(_result) {},