@agoric/vow 0.2.0-upgrade-18a-dev-2899fb9.0 → 0.2.0-upgrade-19-dev-0754752.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vow",
-  "version": "0.2.0-upgrade-18a-dev-2899fb9.0+2899fb9",
+  "version": "0.2.0-upgrade-19-dev-0754752.0+0754752",
   "description": "Remote (shortening and disconnection-tolerant) Promise-likes",
   "type": "module",
   "main": "src/index.js",
@@ -13,27 +13,28 @@
     "postpack": "git clean -f '*.d.ts*' '*.tsbuildinfo'",
     "test": "ava",
     "test:xs": "exit 0",
+    "test:xs:ci": "npm run test:xs",
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "run-s --continue-on-error lint:*",
     "lint:eslint": "eslint .",
     "lint:types": "tsc"
   },
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-upgrade-18a-dev-2899fb9.0+2899fb9",
-    "@agoric/internal": "0.4.0-upgrade-18a-dev-2899fb9.0+2899fb9",
+    "@agoric/base-zone": "0.1.1-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/internal": "0.4.0-upgrade-19-dev-0754752.0+0754752",
     "@endo/env-options": "^1.1.8",
-    "@endo/errors": "^1.2.8",
-    "@endo/eventual-send": "^1.2.8",
-    "@endo/pass-style": "^1.4.7",
-    "@endo/patterns": "^1.4.7",
-    "@endo/promise-kit": "^1.1.8"
+    "@endo/errors": "^1.2.9",
+    "@endo/eventual-send": "^1.3.0",
+    "@endo/pass-style": "^1.4.8",
+    "@endo/patterns": "^1.4.8",
+    "@endo/promise-kit": "^1.1.9"
   },
   "devDependencies": {
-    "@agoric/internal": "^0.4.0-u18.0",
-    "@agoric/swingset-vat": "0.33.0-upgrade-18a-dev-2899fb9.0+2899fb9",
-    "@agoric/zone": "0.3.0-upgrade-18a-dev-2899fb9.0+2899fb9",
-    "@endo/far": "^1.1.9",
-    "@endo/init": "^1.1.7",
+    "@agoric/internal": "^0.3.2",
+    "@agoric/swingset-vat": "0.33.0-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/zone": "0.3.0-upgrade-19-dev-0754752.0+0754752",
+    "@endo/far": "^1.1.10",
+    "@endo/init": "^1.1.8",
     "ava": "^5.3.0",
     "tsd": "^0.31.1"
   },
@@ -57,5 +58,5 @@
   "typeCoverage": {
     "atLeast": 91.62
   },
-  "gitHead": "2899fb9f83681eeb3dde7e29bbc9238b20e2f49a"
+  "gitHead": "07547522e9d8a06692fa5ff12c35230ddb4b252b"
 }

package/src/rejection-tracker.d.ts

@@ -0,0 +1,15 @@
+export function prepareVowRejectionTracker(zone: Zone): import("@endo/exo").Guarded<{
+    /**
+     * @param {PassableCap} vowCap
+     */
+    handle(vowCap: PassableCap): void;
+    /**
+     * @param {PassableCap} vowCap
+     * @param {any} reason
+     */
+    reject(vowCap: PassableCap, reason: any): void;
+}>;
+export type VowRejectionTracker = ReturnType<typeof prepareVowRejectionTracker>;
+import type { Zone } from '@agoric/base-zone';
+import type { PassableCap } from '@endo/pass-style';
+//# sourceMappingURL=rejection-tracker.d.ts.map

package/src/rejection-tracker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rejection-tracker.d.ts","sourceRoot":"","sources":["rejection-tracker.js"],"names":[],"mappings":"AA4BO,iDADK,IAAI;IA4BV;;OAEG;mBADQ,WAAW;IAetB;;;OAGG;mBAFQ,WAAW,UACX,GAAG;GA8BnB;kCAEa,UAAU,CAAC,OAAO,0BAA0B,CAAC;0BA/FpC,mBAAmB;iCAFZ,kBAAkB"}

package/src/rejection-tracker.js

@@ -0,0 +1,106 @@
+// @ts-check
+import { X } from '@endo/errors';
+import { makePromiseKit } from '@endo/promise-kit';
+import { M } from '@endo/patterns';
+
+import { sink } from './vow-utils.js';
+
+/**
+ * @import {PassableCap} from '@endo/pass-style';
+ * @import {PromiseKit} from '@endo/promise-kit';
+ * @import {Zone} from '@agoric/base-zone';
+ */
+
+/**
+ * @param {Promise<void>} [rejected]
+ * @param {PromiseKit<void>} [upgradedPK]
+ */
+const makeUnhandledRejectionCanceller = (rejected, upgradedPK) => {
+  return () => {
+    // Handle the rejected promise to silence it.
+    rejected?.catch(sink);
+    // Resolve the upgraded promise to prevent it from being rejected by a
+    // future upgrade.
+    upgradedPK?.resolve();
+  };
+};
+
+/** @param {Zone} zone */
+export const prepareVowRejectionTracker = zone => {
+  /** @type {WeakMap<PassableCap, () => void>} */
+  const vowToCancelUnhandledRejection = new WeakMap();
+
+  const upgradeRejectionWatcher = zone.exo(
+    'UpgradeRejectionWatcher',
+    M.interface('UpgradeRejectionWatcher', {
+      onRejected: M.call(M.raw(), M.raw()).returns(),
+    }),
+    {
+      onRejected(upgradeReason, baseReason) {
+        const reason = assert.error(
+          X`VOW_REJECTION ${baseReason} not handled before upgrade ${upgradeReason}`,
+        );
+        // console.warn(reason);
+        throw reason;
+      },
+    },
+  );
+
+  const vowRejectionTracker = zone.exo(
+    'VowRejectionTracker',
+    M.interface('VowRejectionTracker', {
+      handle: M.call(M.remotable()).returns(),
+      reject: M.call(M.remotable(), M.raw()).returns(),
+    }),
+    {
+      /**
+       * @param {PassableCap} vowCap
+       */
+      handle(vowCap) {
+        const cancel = vowToCancelUnhandledRejection.get(vowCap);
+        if (!cancel) {
+          console.warn(
+            assert.error(
+              X`Now handling a VOW_REJECTION from a prior incarnation for ${vowCap}`,
+            ),
+          );
+          return;
+        }
+        vowToCancelUnhandledRejection.delete(vowCap);
+        cancel();
+      },
+      /**
+       * @param {PassableCap} vowCap
+       * @param {any} reason
+       */
+      reject(vowCap, reason) {
+        if (vowToCancelUnhandledRejection.has(vowCap)) {
+          return;
+        }
+
+        harden(reason);
+        const baseReason = zone.isStorable(reason)
+          ? reason
+          : assert.error(X`Vow rejection reason was not stored: ${reason}`);
+
+        // Register a never-resolved native promise with liveslots, so it
+        // can reject on upgrade.
+        const upgradedPK = makePromiseKit();
+        zone.watchPromise(
+          upgradedPK.promise,
+          upgradeRejectionWatcher,
+          baseReason,
+        );
+
+        // Save the cancel function.
+        const rejected = Promise.reject(reason);
+        const cancel = makeUnhandledRejectionCanceller(rejected, upgradedPK);
+        vowToCancelUnhandledRejection.set(vowCap, cancel);
+      },
+    },
+  );
+
+  return vowRejectionTracker;
+};
+
+/** @typedef {ReturnType<typeof prepareVowRejectionTracker>} VowRejectionTracker */

package/src/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["tools.js"],"names":[],"mappings":"AAuBO,2CALI,IAAI,WAEZ;IAAmC,iBAAiB;CACpD,GAAU,QAAQ,CAiEpB;0BA7EsB,mBAAmB;uCAE4B,YAAY;8BAAZ,YAAY"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["tools.js"],"names":[],"mappings":"AAwBO,2CALI,IAAI,WAEZ;IAAmC,iBAAiB;CACpD,GAAU,QAAQ,CAkEpB;0BA9EsB,mBAAmB;uCAE4B,YAAY;8BAAZ,YAAY"}

package/src/tools.js

@@ -3,6 +3,7 @@ import { makeAsVow } from './vow-utils.js';
 import { prepareVowKit } from './vow.js';
 import { prepareWatchUtils } from './watch-utils.js';
 import { prepareWatch } from './watch.js';
+import { prepareVowRejectionTracker } from './rejection-tracker.js';
 import { prepareRetryableTools } from './retryable.js';
 import { makeWhen } from './when.js';
 
@@ -24,7 +25,8 @@ import { makeWhen } from './when.js';
 export const prepareBasicVowTools = (zone, powers = {}) => {
   const { isRetryableReason = /** @type {IsRetryableReason} */ (() => false) } =
     powers;
-  const makeVowKit = prepareVowKit(zone);
+  const vowRejectionTracker = prepareVowRejectionTracker(zone);
+  const makeVowKit = prepareVowKit(zone, vowRejectionTracker);
   const when = makeWhen(isRetryableReason);
   const watch = prepareWatch(zone, makeVowKit, isRetryableReason);
   const makeWatchUtils = prepareWatchUtils(zone, {

package/src/types.d.ts

@@ -26,7 +26,7 @@ export type EUnwrap<T> = T extends Vow<infer U> ? EUnwrap<U> : T extends Promise
  * forward/backward compatibility.  Create a new object and bump its version
  * number instead.
  */
-export type VowV0<T = any> = {
+export type VowPayloadV0<T = any> = {
     /**
      * Attempt to unwrap all vows in this
      * promise chain, returning a promise for the final value.  A rejection may
@@ -36,7 +36,7 @@ export type VowV0<T = any> = {
     shorten: () => Promise<T>;
 };
 export type VowPayload<T = any> = {
-    vowV0: RemotableObject & Remote<VowV0<T>>;
+    vowV0: RemotableObject & Remote<VowPayloadV0<T>>;
 };
 /**
  * Vows are objects that represent promises that can be stored durably.
@@ -105,7 +105,7 @@ export type VowTools = {
      * 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>>;
+    asVow: <T>(fn: (...args: any[]) => Vow<Awaited<T>> | Awaited<T> | PromiseVow<T>) => Vow<Awaited<T>>;
     makeVowKit: <T>() => VowKit<T>;
     retryable: RetryableTool;
     /**

package/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"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"}

package/src/types.ts

@@ -36,7 +36,7 @@ export type EUnwrap<T> =
  * forward/backward compatibility.  Create a new object and bump its version
  * number instead.
  */
-export type VowV0<T = any> = {
+export type VowPayloadV0<T = any> = {
   /**
    * Attempt to unwrap all vows in this
    * promise chain, returning a promise for the final value.  A rejection may
@@ -47,7 +47,7 @@ export type VowV0<T = any> = {
 };
 
 export type VowPayload<T = any> = {
-  vowV0: RemotableObject & Remote<VowV0<T>>;
+  vowV0: RemotableObject & Remote<VowPayloadV0<T>>;
 };
 
 /**
@@ -158,7 +158,7 @@ export type VowTools = {
    * coerces the result of a function to a Vow. Helpful for scenarios like a
    * synchronously thrown error.
    */
-  asVow: <T extends unknown>(
+  asVow: <T>(
     fn: (...args: any[]) => Vow<Awaited<T>> | Awaited<T> | PromiseVow<T>,
   ) => Vow<Awaited<T>>;
   makeVowKit: <T>() => VowKit<T>;

package/src/vow-utils.d.ts

@@ -1,3 +1,4 @@
+export function sink(): void;
 export { basicE };
 export const VowShape: import("@endo/patterns").Matcher;
 export function isVow(specimen: unknown): specimen is Vow;

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

@@ -1 +1 @@
-{"version":3,"file":"vow-utils.d.ts","sourceRoot":"","sources":["vow-utils.js"],"names":[],"mappings":";AAaA,wDAKE;AAMK,gCAHI,OAAO,GACL,QAAQ,IAAI,GAAG,CAGyB;AAc9C,8BAJM,CAAC,YACH,GAAG,GACD,WAAW,CAAC,CAAC,GAAG,SAAS,CASrC;AAoBM,iCAHI,WAAW,GAAG,GAAG,GACf,WAAW,CAUvB;AAIM,sCADK,UAAU,IAKD,CAAC,sBACT,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,KAC9D,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAiB7B;4BApG2B,qBAAqB;yBAMH,YAAY;gCAAZ,YAAY;iCAD5B,kBAAkB;gCAEnB,UAAU;gCADO,YAAY"}
+{"version":3,"file":"vow-utils.d.ts","sourceRoot":"","sources":["vow-utils.js"],"names":[],"mappings":"AAWO,6BAAqB;;AAK5B,wDAKE;AAMK,gCAHI,OAAO,GACL,QAAQ,IAAI,GAAG,CAGyB;AAc9C,8BAJM,CAAC,YACH,GAAG,GACD,WAAW,CAAC,CAAC,GAAG,SAAS,CASrC;AAoBM,iCAHI,WAAW,GAAG,GAAG,GACf,WAAW,CAUvB;AAIM,sCADK,UAAU,IAKD,CAAC,sBACT,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,KAC9D,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAiB7B;4BAvG2B,qBAAqB;yBAMH,YAAY;gCAAZ,YAAY;iCAD5B,kBAAkB;gCAEnB,UAAU;gCADO,YAAY"}

package/src/vow-utils.js

@@ -9,6 +9,9 @@ import { M, matches } from '@endo/patterns';
  * @import {MakeVowKit} from './vow.js';
  */
 
+export const sink = () => {};
+harden(sink);
+
 export { basicE };
 
 export const VowShape = M.tagged(

package/src/vow.d.ts

@@ -1,7 +1,10 @@
-export function prepareVowKit(zone: Zone): <T>() => VowKit<T>;
-export type VowEphemera = Partial<PromiseKit<any>> & Pick<PromiseKit<any>, "promise">;
+export function prepareVowKit(zone: Zone, vowRejectionTracker?: VowRejectionTracker): <T>() => VowKit<T>;
+export type VowEphemera = Partial<PromiseKit<any>> & Pick<PromiseKit<any>, "promise"> & {
+    potentiallyHandled?: boolean;
+};
 export type MakeVowKit = ReturnType<typeof prepareVowKit>;
 import type { Zone } from '@agoric/base-zone';
+import type { VowRejectionTracker } from './rejection-tracker.js';
 import type { VowKit } from './types.js';
 import type { PromiseKit } from '@endo/promise-kit';
 //# sourceMappingURL=vow.d.ts.map

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,GAChC,IAAI,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":"AA4BO,oCAHI,IAAI,wBACJ,mBAAmB,IAgNf,CAAC,OACD,OAAO,CAAC,CAAC,CASvB;0BAjOY,OAAO,CAAC,WAAW,GAAG,CAAC,CAAC,GAChC,IAAI,CAAC,WAAW,GAAG,CAAC,EAAE,SAAS,CAAC,GACpC;IAAM,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAAE;yBAgOvB,UAAU,CAAC,OAAO,aAAa,CAAC;0BAxOvB,mBAAmB;yCAEJ,wBAAwB;4BADxB,YAAY;gCAFrB,mBAAmB"}

package/src/vow.js

@@ -6,25 +6,27 @@ import { PromiseWatcherI } from '@agoric/base-zone';
 
 const { details: X } = assert;
 
+const noop = () => {};
+harden(noop);
+
 /**
  * @import {PromiseKit} from '@endo/promise-kit';
  * @import {Zone} from '@agoric/base-zone';
- * @import {MapStore} from '@agoric/store';
  * @import {VowResolver, VowKit} from './types.js';
+ * @import {VowRejectionTracker} from './rejection-tracker.js';
  */
 
-const sink = () => {};
-harden(sink);
-
 /**
  * @typedef {Partial<PromiseKit<any>> &
- *   Pick<PromiseKit<any>, 'promise'>} VowEphemera
+ *   Pick<PromiseKit<any>, 'promise'> &
+ *   { potentiallyHandled?: boolean }} VowEphemera
  */
 
 /**
  * @param {Zone} zone
+ * @param {VowRejectionTracker} [vowRejectionTracker]
  */
-export const prepareVowKit = zone => {
+export const prepareVowKit = (zone, vowRejectionTracker) => {
   /** @type {WeakMap<VowResolver, VowEphemera>} */
   const resolverToEphemera = new WeakMap();
 
@@ -32,32 +34,36 @@ export const prepareVowKit = zone => {
   const resolverToNonStoredValue = new WeakMap();
 
   /**
-   * Get the current incarnation's promise kit associated with a vowV0.
+   * Get the ephemera associated with a vowKit.resolver.
    *
    * @param {VowResolver} resolver
+   * @param {{ potentiallyHandled?: boolean }} [options]
    */
-  const provideCurrentKit = resolver => {
-    let pk = resolverToEphemera.get(resolver);
-    if (pk) {
-      return pk;
+  const provideEphemera = (resolver, options) => {
+    let ephemera = resolverToEphemera.get(resolver);
+    if (!ephemera) {
+      ephemera = makePromiseKit();
+      // Silence this internal promise's rejections, since we use the
+      // rejectionTracker instead.
+      ephemera.promise.catch(noop);
     }
 
-    pk = makePromiseKit();
-    pk.promise.catch(sink); // silence unhandled rejection
-    resolverToEphemera.set(resolver, pk);
-    return pk;
+    ephemera = harden({ ...ephemera, ...options });
+    resolverToEphemera.set(resolver, ephemera);
+    return ephemera;
   };
 
   /**
    * @param {VowResolver} resolver
    */
-  const getPromiseKitForResolution = resolver => {
-    const kit = provideCurrentKit(resolver);
-    if (kit.resolve) {
+  const provideEphemeraForResolution = resolver => {
+    const ephemera = provideEphemera(resolver);
+    if (ephemera.resolve) {
       // Resolution is a one-time event, so forget the resolve/reject functions.
-      resolverToEphemera.set(resolver, harden({ promise: kit.promise }));
+      const { resolve: _1, reject: _2, ...rest } = ephemera;
+      resolverToEphemera.set(resolver, harden(rest));
     }
-    return kit;
+    return ephemera;
   };
 
   const makeVowInternalsKit = zone.exoClassKit(
@@ -73,16 +79,24 @@ export const prepareVowKit = zone => {
       watchNextStep: PromiseWatcherI,
     },
     () => ({
-      value: /** @type {any} */ (undefined),
-      // The stepStatus is null if the promise step hasn't settled yet.
-      stepStatus: /** @type {null | 'pending' | 'fulfilled' | 'rejected'} */ (
-        null
-      ),
-      isStoredValue: /** @type {boolean} */ (false),
+      /** @type {any} */
+      value: undefined,
+      /**
+       * The stepStatus is null if the promise step hasn't settled yet.
+       * @type {null | 'pending' | 'fulfilled' | 'rejected'}
+       */
+      stepStatus: null,
+      isStoredValue: false,
       /**
-       * Map for future properties that aren't in the schema.
+       * Some versions of the VowInternalsKit will not have this property,
+       * (and it cannot be added dynamically).
+       * @type {boolean | undefined}
+       */
+      vowIsHandled: false,
+      /**
+       * Record for future properties that aren't in the schema.
        * UNTIL https://github.com/Agoric/agoric-sdk/issues/7407
-       * @type {MapStore<any, any> | undefined}
+       * @type {Record<string, any> | undefined}
        */
       extra: undefined,
     }),
@@ -92,11 +106,14 @@ export const prepareVowKit = zone => {
          * @returns {Promise<any>}
          */
         async shorten() {
-          const { stepStatus, isStoredValue, value } = this.state;
-          const { resolver } = this.facets;
+          const { stepStatus, isStoredValue, value, vowIsHandled } = this.state;
+          const { resolver, vowV0 } = this.facets;
 
           switch (stepStatus) {
             case 'fulfilled': {
+              if (vowIsHandled === false) {
+                this.state.vowIsHandled = true;
+              }
               if (isStoredValue) {
                 // Always return a stored fulfilled value.
                 return value;
@@ -109,16 +126,21 @@ export const prepareVowKit = zone => {
               throw value;
             }
             case 'rejected': {
-              if (!isStoredValue && resolverToNonStoredValue.has(resolver)) {
-                // Non-stored reason is available.
-                throw resolverToNonStoredValue.get(resolver);
+              if (vowIsHandled === false) {
+                this.state.vowIsHandled = true;
+                vowRejectionTracker?.handle(vowV0);
               }
-              // Always throw a stored rejection reason.
-              throw value;
+              const reason = resolverToNonStoredValue.has(resolver)
+                ? resolverToNonStoredValue.get(resolver)
+                : value;
+
+              throw reason;
             }
             case null:
             case 'pending':
-              return provideCurrentKit(this.facets.resolver).promise;
+              return provideEphemera(this.facets.resolver, {
+                potentiallyHandled: true,
+              }).promise;
             default:
               throw TypeError(`unexpected stepStatus ${stepStatus}`);
           }
@@ -129,44 +151,46 @@ export const prepareVowKit = zone => {
          * @param {any} [value]
          */
         resolve(value) {
-          const { resolver } = this.facets;
           const { stepStatus } = this.state;
-          const { resolve } = getPromiseKitForResolution(resolver);
-          if (resolve) {
-            resolve(value);
-          }
-          if (stepStatus === null) {
-            this.state.stepStatus = 'pending';
-            zone.watchPromise(
-              HandledPromise.resolve(value),
-              this.facets.watchNextStep,
-            );
+          if (stepStatus !== null) {
+            return;
           }
+          this.state.stepStatus = 'pending';
+
+          const { resolver } = this.facets;
+          const { resolve } = provideEphemeraForResolution(resolver);
+          resolve && resolve(value);
+
+          zone.watchPromise(
+            HandledPromise.resolve(value),
+            this.facets.watchNextStep,
+          );
         },
         /**
          * @param {any} [reason]
          */
         reject(reason) {
-          const { resolver, watchNextStep } = this.facets;
           const { stepStatus } = this.state;
-          const { reject } = getPromiseKitForResolution(resolver);
-          if (reject) {
-            reject(reason);
-          }
-          if (stepStatus === null) {
-            watchNextStep.onRejected(reason);
+          if (stepStatus !== null) {
+            return;
           }
+          this.state.stepStatus = 'rejected';
+
+          const { resolver, watchNextStep } = this.facets;
+          const { reject } = provideEphemeraForResolution(resolver);
+          reject && reject(reason);
+          watchNextStep.onRejected(reason);
         },
       },
       watchNextStep: {
         onFulfilled(value) {
+          this.state.stepStatus = 'fulfilled';
+
           const { resolver } = this.facets;
-          const { resolve } = getPromiseKitForResolution(resolver);
+          const { resolve } = provideEphemeraForResolution(resolver);
           harden(value);
-          if (resolve) {
-            resolve(value);
-          }
-          this.state.stepStatus = 'fulfilled';
+          resolve && resolve(value);
+
           this.state.isStoredValue = zone.isStorable(value);
           if (this.state.isStoredValue) {
             this.state.value = value;
@@ -178,13 +202,21 @@ export const prepareVowKit = zone => {
           }
         },
         onRejected(reason) {
-          const { resolver } = this.facets;
-          const { reject } = getPromiseKitForResolution(resolver);
+          this.state.stepStatus = 'rejected';
+
+          const { resolver, vowV0 } = this.facets;
+          const { reject, potentiallyHandled } =
+            provideEphemeraForResolution(resolver);
           harden(reason);
-          if (reject) {
-            reject(reason);
+          reject && reject(reason);
+
+          if (this.state.vowIsHandled === false) {
+            if (potentiallyHandled) {
+              this.state.vowIsHandled = true;
+            } else {
+              vowRejectionTracker?.reject(vowV0, reason);
+            }
           }
-          this.state.stepStatus = 'rejected';
           this.state.isStoredValue = zone.isStorable(reason);
           if (this.state.isStoredValue) {
             this.state.value = reason;

package/src/watch.d.ts

@@ -1,8 +1,7 @@
-export function prepareWatch(zone: Zone, makeVowKit: () => VowKit<any>, isRetryableReason?: (reason: any, lastValue: any) => any): <T = any, TResult1 = T, TResult2 = never, C extends any[] = any[]>(specimenP: EVow<T>, watcher?: Watcher<T, TResult1, TResult2, C>, ...watcherArgs: C) => Vow<Exclude<TResult1, void> | Exclude<TResult2, void> extends never ? TResult1 : Exclude<TResult1, void> | Exclude<TResult2, void>>;
+export function prepareWatch(zone: Zone, makeVowKit: () => VowKit<any>, isRetryableReason?: (reason: any, lastValue: any) => any): <T = any, TResult1 = T, TResult2 = never, C extends any[] = any[]>(specimenP: EVow<T>, watcher?: Watcher<T, TResult1, TResult2, C>, ...watcherArgs: C) => import("./types.js").Vow<Exclude<TResult1, void> | Exclude<TResult2, void> extends never ? TResult1 : Exclude<TResult1, void> | Exclude<TResult2, void>>;
 export type Watch = ReturnType<typeof prepareWatch>;
 import type { Zone } from '@agoric/base-zone';
 import type { VowKit } from './types.js';
 import type { EVow } from './types.js';
 import type { Watcher } from './types.js';
-import type { Vow } from './types.js';
 //# sourceMappingURL=watch.d.ts.map

package/src/watch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["watch.js"],"names":[],"mappings":"AA2JO,mCAJI,IAAI,cACJ,MAAM,OAAO,GAAG,CAAC,sBACjB,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,KAAK,GAAG,IAe/B,CAAC,QACD,QAAQ,MACR,QAAQ,UACA,CAAC,SAAT,GAAG,EAAG,qBACT,KAAK,CAAC,CAAC,YACP,QAAQ,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,kBACjC,CAAC,yIAoBb;oBAIa,UAAU,CAAC,OAAO,YAAY,CAAC;0BA/LJ,mBAAmB;4BACyB,YAAY;0BAAZ,YAAY;6BAAZ,YAAY;yBAAZ,YAAY"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["watch.js"],"names":[],"mappings":"AA4KO,mCAJI,IAAI,cACJ,MAAM,OAAO,GAAG,CAAC,sBACjB,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,KAAK,GAAG,IAe/B,CAAC,QACD,QAAQ,MACR,QAAQ,UACA,CAAC,SAAT,GAAG,EAAG,qBACT,KAAK,CAAC,CAAC,YACP,QAAQ,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,kBACjC,CAAC,8JAqBb;oBAIa,UAAU,CAAC,OAAO,YAAY,CAAC;0BAjNJ,mBAAmB;4BACc,YAAY;0BAAZ,YAAY;6BAAZ,YAAY"}

package/src/watch.js

@@ -6,7 +6,7 @@ const { apply } = Reflect;
 
 /**
  * @import { PromiseWatcher, Zone } from '@agoric/base-zone';
- * @import { ERef, EVow, IsRetryableReason, Vow, VowKit, VowResolver, Watcher } from './types.js';
+ * @import { EVow, IsRetryableReason, VowKit, VowResolver, Watcher } from './types.js';
  */
 
 /**
@@ -40,7 +40,8 @@ const makeWatchNextStep =
  * @param {unknown} value
  * @param {unknown[]} [watcherArgs]
  */
-const settle = (resolver, watcher, wcb, value, watcherArgs = []) => {
+const settle = async (resolver, watcher, wcb, value, watcherArgs = []) => {
+  await null;
   try {
     let chainedValue = value;
     const w = watcher && watcher[wcb];
@@ -49,14 +50,23 @@ const settle = (resolver, watcher, wcb, value, watcherArgs = []) => {
     } else if (wcb === 'onRejected') {
       throw value;
     }
-    resolver && resolver.resolve(chainedValue);
+
+    if (resolver) {
+      resolver.resolve(chainedValue);
+      return;
+    }
+
+    // We want to propagate rejections (but not fulfillment values) to our
+    // caller if no resolver was provided.
+    await chainedValue;
   } catch (e) {
     if (resolver) {
       resolver.reject(e);
-    } else {
-      // for host's unhandled rejection handler to catch
-      throw e;
+      return;
     }
+
+    // Create a native unhandled rejection.
+    throw e;
   }
 };
 
@@ -106,6 +116,9 @@ const preparePromiseWatcher = (zone, isRetryableReason, watchNextStep) => {
       /** @type {Required<PromiseWatcher>['onFulfilled']} */
       onFulfilled(value) {
         const { watcher, watcherArgs, resolver } = this.state;
+        if (!resolver) {
+          throw Error('Unexpected multiple calls to PromiseWatcher');
+        }
         const payload = getVowPayload(value);
         if (payload) {
           const seenPayloads = getSeenPayloads(this.self);
@@ -123,26 +136,30 @@ const preparePromiseWatcher = (zone, isRetryableReason, watchNextStep) => {
         this.state.priorRetryValue = undefined;
         this.state.watcher = undefined;
         this.state.resolver = undefined;
-        settle(resolver, watcher, 'onFulfilled', value, watcherArgs);
+        void settle(resolver, watcher, 'onFulfilled', value, watcherArgs);
       },
       /** @type {Required<PromiseWatcher>['onRejected']} */
       onRejected(reason) {
         const { vow, watcher, watcherArgs, resolver, priorRetryValue } =
           this.state;
-        if (vow) {
-          const retryValue = isRetryableReason(reason, priorRetryValue);
-          if (retryValue) {
+        if (!resolver) {
+          throw Error('Unexpected multiple calls to PromiseWatcher');
+        }
+        const retryValue = isRetryableReason(reason, priorRetryValue);
+        if (retryValue) {
+          this.state.priorRetryValue = retryValue;
+          if (vow) {
             // Retry the same specimen.
-            this.state.priorRetryValue = retryValue;
             watchNextStep(vow, this.self);
             return;
           }
         }
+        // Final rejection.
         watcherSeenPayloads.delete(this.self);
         this.state.priorRetryValue = undefined;
         this.state.resolver = undefined;
         this.state.watcher = undefined;
-        settle(resolver, watcher, 'onRejected', reason, watcherArgs);
+        void settle(resolver, watcher, 'onRejected', reason, watcherArgs);
       },
     },
   );
@@ -185,7 +202,8 @@ export const prepareWatch = (
     const promiseWatcher = makePromiseWatcher(resolver, watcher, watcherArgs);
 
     // Coerce the specimen to a promise, and start the watcher cycle.
-    zone.watchPromise(basicE.resolve(specimenP), promiseWatcher);
+    const promise = basicE.resolve(specimenP);
+    zone.watchPromise(promise, promiseWatcher);
 
     return vow;
   };