@agoric/vow 0.2.0-upgrade-17-dev-a1453b2.0 → 0.2.0-upgrade-18-dev-bf39b10.0

package/src/types.d.ts

@@ -1,3 +1,6 @@
+import type { Remote } from '@agoric/internal';
+import type { Zone } from '@agoric/zone';
+import type { CopyTagged, RemotableObject } from '@endo/pass-style';
 /**
  * Return truthy if a rejection reason should result in a retry.
  */
@@ -16,7 +19,7 @@ export type EVow<T> = ERef<T | Vow<T>>;
  * Follow the chain of vow shortening to the end, returning the final value.
  * This is used within E, so we must narrow the type to its remote form.
  */
-export type EUnwrap<T> = (T extends Vow<infer U> ? EUnwrap<U> : T extends PromiseLike<infer U> ? EUnwrap<U> : T);
+export type EUnwrap<T> = T extends Vow<infer U> ? EUnwrap<U> : T extends PromiseLike<infer U> ? EUnwrap<U> : T;
 /**
  * The first version of the vow implementation
  * object.  CAVEAT: These methods must never be changed or added to, to provide
@@ -35,7 +38,10 @@ export type VowV0<T = any> = {
 export type VowPayload<T = any> = {
     vowV0: RemotableObject & Remote<VowV0<T>>;
 };
-export type Vow<T = any> = CopyTagged<"Vow", VowPayload<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>;
     resolver: VowResolver<T>;
@@ -52,7 +58,68 @@ export type Watcher<T = any, TResult1 = T, TResult2 = never, C extends any[] = a
  * Converts a vow or promise to a promise, ensuring proper handling of ephemeral promises.
  */
 export type AsPromiseFunction<T = any, TResult1 = T, TResult2 = never, C extends any[] = any[]> = (specimenP: ERef<T | Vow<T>>, watcher?: Watcher<T, TResult1, TResult2, C> | undefined, watcherArgs?: C | undefined) => Promise<TResult1 | TResult2>;
-import type { RemotableObject } from '@endo/pass-style';
-import type { Remote } from '@agoric/internal';
-import type { CopyTagged } from '@endo/pass-style';
+export interface RetryableTool {
+    /**
+     * Create a function that retries the given function if the underlying
+     * async function rejects due to an upgrade disconnection. The return value
+     * of the created function is a vow that settles to the final retry result.
+     *
+     * The retried function should be idempotent.
+     *
+     * @param fnZone the zone for the named function
+     * @param name base name to use in the zone
+     * @param fn the retried function
+     */
+    <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;
+}
+export type VowTools = {
+    /**
+     * 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.
+     */
+    all: (maybeVows: unknown[]) => Vow<any[]>;
+    /**
+     * 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.
+     */
+    allSettled: (maybeVows: unknown[]) => Vow<({
+        status: 'fulfilled';
+        value: any;
+    } | {
+        status: 'rejected';
+        reason: any;
+    })[]>;
+    allVows: (maybeVows: unknown[]) => Vow<any[]>;
+    /**
+     * Convert a vow or promise to a promise, ensuring proper handling of ephemeral promises.
+     */
+    asPromise: AsPromiseFunction;
+    /**
+     * Helper function that
+     * coerces the result of a function to a Vow. Helpful for scenarios like a
+     * synchronously thrown error.
+     */
+    asVow: <T extends unknown>(fn: (...args: any[]) => Vow<Awaited<T>> | Awaited<T> | PromiseVow<T>) => Vow<Awaited<T>>;
+    makeVowKit: <T>() => VowKit<T>;
+    retryable: RetryableTool;
+    /**
+     * @deprecated use `retryable`
+     */
+    retriable: RetryableTool;
+    watch: <T = any, TResult1 = T, TResult2 = never, C extends any[] = any[]>(specimenP: EVow<T>, watcher?: Watcher<T, TResult1, TResult2, C> | undefined, ...watcherArgs: C) => Vow<Exclude<TResult1, void> | Exclude<TResult2, void> extends never ? TResult1 : Exclude<TResult1, void> | Exclude<TResult2, void>>;
+    /**
+     * Shorten `specimenP` until we achieve a final result.
+     *
+     * Does not survive upgrade (even if specimenP is a durable Vow).
+     *
+     * Use only if the Vow will resolve _promptly_ {@see {@link  @agoric/swingset-vat/docs/async.md}}.
+     */
+    when: <T, TResult1 = EUnwrap<T>, TResult2 = never>(specimenP: T, onFulfilled?: ((value: EUnwrap<T>) => TResult1 | PromiseLike<TResult1>) | undefined, onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined) => Promise<TResult1 | TResult2>;
+};
 //# sourceMappingURL=types.d.ts.map

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,CACZ,CAAK,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GACvC,CAAK,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAC/C,CAAK,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;IACZ,GAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAChB,QAAY,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.ts"],"names":[],"mappings":"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"}

package/src/types.ts

@@ -0,0 +1,196 @@
+/* eslint-disable no-use-before-define */
+import type { Remote } from '@agoric/internal';
+import type { Zone } from '@agoric/zone';
+import type { CopyTagged, RemotableObject } from '@endo/pass-style';
+
+/**
+ * Return truthy if a rejection reason should result in a retry.
+ */
+export type IsRetryableReason = (reason: any, priorRetryValue: any) => any;
+
+/**
+ * Return type of a function that may
+ * return a promise or a vow.
+ */
+export type PromiseVow<T> = Promise<T | Vow<T>>;
+
+export type ERef<T> = T | PromiseLike<T>;
+/**
+ * Eventually a value T or Vow for it.
+ */
+export type EVow<T> = ERef<T | Vow<T>>;
+
+/**
+ * Follow the chain of vow shortening to the end, returning the final value.
+ * This is used within E, so we must narrow the type to its remote form.
+ */
+export type EUnwrap<T> =
+  T extends Vow<infer U>
+    ? EUnwrap<U>
+    : T extends PromiseLike<infer U>
+      ? EUnwrap<U>
+      : T;
+
+/**
+ * The first version of the vow implementation
+ * object.  CAVEAT: These methods must never be changed or added to, to provide
+ * forward/backward compatibility.  Create a new object and bump its version
+ * number instead.
+ */
+export type VowV0<T = any> = {
+  /**
+   * Attempt to unwrap all vows in this
+   * promise chain, returning a promise for the final value.  A rejection may
+   * indicate a temporary routing failure requiring a retry, otherwise that the
+   * decider of the terminal promise rejected it.
+   */
+  shorten: () => Promise<T>;
+};
+
+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>;
+  resolver: VowResolver<T>;
+};
+
+export type VowResolver<T = any> = {
+  resolve(value?: T | PromiseVow<T>): void;
+  reject(reason?: any): void;
+};
+
+export type Watcher<
+  T = any,
+  TResult1 = T,
+  TResult2 = never,
+  C extends any[] = any[],
+> = {
+  onFulfilled?:
+    | ((
+        value: T,
+        ...args: C
+      ) => Vow<TResult1> | PromiseVow<TResult1> | TResult1)
+    | undefined;
+  onRejected?:
+    | ((
+        reason: any,
+        ...args: C
+      ) => Vow<TResult2> | PromiseVow<TResult2> | TResult2)
+    | undefined;
+};
+
+/**
+ * Converts a vow or promise to a promise, ensuring proper handling of ephemeral promises.
+ */
+export type AsPromiseFunction<
+  T = any,
+  TResult1 = T,
+  TResult2 = never,
+  C extends any[] = any[],
+> = (
+  specimenP: ERef<T | Vow<T>>,
+  watcher?: Watcher<T, TResult1, TResult2, C> | undefined,
+  watcherArgs?: C | undefined,
+) => Promise<TResult1 | TResult2>;
+
+export interface RetryableTool {
+  /**
+   * Create a function that retries the given function if the underlying
+   * async function rejects due to an upgrade disconnection. The return value
+   * of the created function is a vow that settles to the final retry result.
+   *
+   * The retried function should be idempotent.
+   *
+   * @param fnZone the zone for the named function
+   * @param name base name to use in the zone
+   * @param fn the retried function
+   */
+  <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;
+}
+
+export type VowTools = {
+  /**
+   * 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.
+   */
+  all: (maybeVows: unknown[]) => Vow<any[]>;
+  /**
+   * 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.
+   */
+  allSettled: (maybeVows: unknown[]) => Vow<
+    (
+      | {
+          status: 'fulfilled';
+          value: any;
+        }
+      | {
+          status: 'rejected';
+          reason: any;
+        }
+    )[]
+  >;
+  allVows: (maybeVows: unknown[]) => Vow<any[]>;
+  /**
+   * Convert a vow or promise to a promise, ensuring proper handling of ephemeral promises.
+   */
+  asPromise: AsPromiseFunction;
+  /**
+   * Helper function that
+   * coerces the result of a function to a Vow. Helpful for scenarios like a
+   * synchronously thrown error.
+   */
+  asVow: <T extends unknown>(
+    fn: (...args: any[]) => Vow<Awaited<T>> | Awaited<T> | PromiseVow<T>,
+  ) => Vow<Awaited<T>>;
+  makeVowKit: <T>() => VowKit<T>;
+  retryable: RetryableTool;
+  /**
+   * @deprecated use `retryable`
+   */
+  retriable: RetryableTool;
+  watch: <T = any, TResult1 = T, TResult2 = never, C extends any[] = any[]>(
+    specimenP: EVow<T>,
+    watcher?: Watcher<T, TResult1, TResult2, C> | undefined,
+    ...watcherArgs: C
+  ) => Vow<
+    Exclude<TResult1, void> | Exclude<TResult2, void> extends never
+      ? TResult1
+      : Exclude<TResult1, void> | Exclude<TResult2, void>
+  >;
+  /**
+   * Shorten `specimenP` until we achieve a final result.
+   *
+   * Does not survive upgrade (even if specimenP is a durable Vow).
+   *
+   * Use only if the Vow will resolve _promptly_ {@see {@link  @agoric/swingset-vat/docs/async.md}}.
+   */
+  when: <T, TResult1 = EUnwrap<T>, TResult2 = never>(
+    specimenP: T,
+    onFulfilled?:
+      | ((value: EUnwrap<T>) => TResult1 | PromiseLike<TResult1>)
+      | undefined,
+    onRejected?:
+      | ((reason: any) => TResult2 | PromiseLike<TResult2>)
+      | undefined,
+  ) => Promise<TResult1 | TResult2>;
+};

package/src/vow-utils.js

@@ -29,7 +29,7 @@ harden(isVow);
 /**
  * A vow is a passable tagged as 'Vow'.  Its payload is a record with
  * API-versioned remotables.  payload.vowV0 is the API for the `watch` and
- * `when` operators to use for retriable shortening of the vow chain.
+ * `when` operators to use for retryable shortening of the vow chain.
  *
  * If the specimen is a Vow, return its payload, otherwise undefined.
  *

package/src/vow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vow.d.ts","sourceRoot":"","sources":["vow.js"],"names":[],"mappings":"AA0BO,oCAFI,IAAI,IAkLA,CAAC,OACD,OAAO,CAAC,CAAC,CASvB;0BAjMY,OAAO,CAAC,WAAW,GAAG,CAAC,CAAC,GACpC,IAAQ,CAAC,WAAW,GAAG,CAAC,EAAE,SAAS,CAAC;yBAiMvB,UAAU,CAAC,OAAO,aAAa,CAAC;0BA3MvB,mBAAmB;4BAEJ,YAAY;gCAHrB,mBAAmB"}
+{"version":3,"file":"vow.d.ts","sourceRoot":"","sources":["vow.js"],"names":[],"mappings":"AA0BO,oCAFI,IAAI,IAkLA,CAAC,OACD,OAAO,CAAC,CAAC,CASvB;0BAjMY,OAAO,CAAC,WAAW,GAAG,CAAC,CAAC,GAChC,IAAI,CAAC,WAAW,GAAG,CAAC,EAAE,SAAS,CAAC;yBAiMvB,UAAU,CAAC,OAAO,aAAa,CAAC;0BA3MvB,mBAAmB;4BAEJ,YAAY;gCAHrB,mBAAmB"}

package/src/watch-utils.d.ts

@@ -4,17 +4,23 @@ 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 | never>;
+    asPromise(specimenP: any, watcher?: import("./types.js").Watcher<any, any, never, any[]> | undefined, watcherArgs?: any[] | undefined): Promise<any>;
 }>;
 import type { Zone } from '@agoric/base-zone';
 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) {},

package/vat.js

@@ -5,7 +5,10 @@
 
 /* global globalThis */
 // @ts-check
-import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
+import {
+  isUpgradeDisconnection,
+  isAbandonedError,
+} from '@agoric/internal/src/upgrade-api.js';
 import { makeHeapZone } from '@agoric/base-zone/heap.js';
 
 import { prepareBasicVowTools } from './src/tools.js';
@@ -15,11 +18,16 @@ import makeE from './src/E.js';
 const isRetryableReason = (reason, priorRetryValue) => {
   if (
     isUpgradeDisconnection(reason) &&
-    (!priorRetryValue ||
+    (!isUpgradeDisconnection(priorRetryValue) ||
       reason.incarnationNumber > priorRetryValue.incarnationNumber)
   ) {
     return reason;
   }
+  // For abandoned errors there is no way to differentiate errors from
+  // consecutive upgrades
+  if (isAbandonedError(reason) && !isAbandonedError(priorRetryValue)) {
+    return reason;
+  }
   return undefined;
 };