@agoric/inter-protocol 0.16.2-dev-eb7e9eb.0 → 0.16.2-u11.0

package/src/proposals/core-proposal.js

@@ -1,6 +1,6 @@
 // @jessie-check
 
-import { Stable } from '@agoric/internal/src/tokens.js';
+import { Stable } from '@agoric/vats/src/tokens.js';
 import * as econBehaviors from './econ-behaviors.js';
 import { ECON_COMMITTEE_MANIFEST } from './startEconCommittee.js';
 
@@ -15,7 +15,9 @@ export * from './startEconCommittee.js'; // eslint-disable-line import/export
 // require updating a lot of tests. So for now, we just
 // grab the kits afterward and store them.
 
-/** @param {import('./econ-behaviors.js').EconomyBootstrapPowers} powers */
+/**
+ * @param {import('./econ-behaviors.js').EconomyBootstrapPowers} powers
+ */
 export const storeInterContractStartKits = async ({
   consume: {
     contractKits,
@@ -29,15 +31,13 @@ export const storeInterContractStartKits = async ({
   },
 }) => {
   /**
-   * @param {Promise<MapStore<string, { instance: Instance }>>} storeP
-   * @param {Promise<{ instance: Instance }>[]} kitPs
+   * @param {Promise<MapStore<string, {instance: Instance}>>} storeP
+   * @param {Promise<{instance: Instance}>[]} kitPs
    */
   const storeAll = async (storeP, kitPs) => {
     const store = await storeP;
     const kits = await Promise.all(kitPs);
-    for (const kit of kits) {
-      store.init(kit.instance, kit);
-    }
+    kits.forEach(kit => store.init(kit.instance, kit));
   };
 
   await storeAll(contractKits, [

package/src/proposals/econ-behaviors.js

@@ -6,9 +6,11 @@ import { AmountMath } from '@agoric/ertp';
 import '@agoric/governance/exported.js';
 import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
 import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
+import '@agoric/vats/exported.js';
+import '@agoric/vats/src/core/types.js';
+import { Stable } from '@agoric/vats/src/tokens.js';
 import { E } from '@endo/far';
 import { makeScalarBigMapStore } from '@agoric/vat-data';
-import { Stable } from '@agoric/internal/src/tokens.js';
 import { makeGovernedTerms as makeGovernedATerms } from '../auction/params.js';
 import { makeReserveTerms } from '../reserve/params.js';
 import { makeGovernedTerms as makeGovernedVFTerms } from '../vaultFactory/params.js';
@@ -22,9 +24,7 @@ export const SECONDS_PER_WEEK = 7n * SECONDS_PER_DAY;
 
 /**
  * @typedef {import('../vaultFactory/vaultFactory.js').VaultFactoryContract['publicFacet']} VaultFactoryPublicFacet
- *
  * @typedef {import('../auction/auctioneer.js').AuctioneerPublicFacet} AuctioneerPublicFacet
- *
  * @typedef {import('../auction/auctioneer.js').AuctioneerCreatorFacet} AuctioneerCreatorFacet
  */
 
@@ -33,65 +33,43 @@ export const SECONDS_PER_WEEK = 7n * SECONDS_PER_DAY;
  * @property {string} label
  * @property {Instance} psm
  * @property {Instance} psmGovernor
- * @property {Awaited<
- *   ReturnType<
- *     Awaited<
- *       ReturnType<import('../psm/psm.js')['start']>
- *     >['creatorFacet']['getLimitedCreatorFacet']
- *   >
- * >} psmCreatorFacet
- * @property {GovernorCreatorFacet<import('../../src/psm/psm.js')['start']>} psmGovernorCreatorFacet
+ * @property {Awaited<ReturnType<Awaited<ReturnType<import('../psm/psm.js')['prepare']>>['creatorFacet']['getLimitedCreatorFacet']>>} psmCreatorFacet
+ * @property {GovernorCreatorFacet<import('../../src/psm/psm.js')['prepare']>} psmGovernorCreatorFacet
  * @property {AdminFacet} psmAdminFacet
  */
 
-/** @typedef {GovernanceFacetKit<import('../auction/auctioneer.js').start>} AuctioneerKit */
+/**
+ * @typedef {GovernanceFacetKit<import('../auction/auctioneer.js').start>} AuctioneerKit
+ */
 
 /**
- * @typedef {WellKnownSpaces & ChainBootstrapSpace & EconomyBootstrapSpace} EconomyBootstrapPowers
- *
+ * @typedef { WellKnownSpaces & ChainBootstrapSpace & EconomyBootstrapSpace
+ * } EconomyBootstrapPowers
  * @typedef {PromiseSpaceOf<{
- *   economicCommitteeKit: CommitteeStartResult;
- *   economicCommitteeCreatorFacet: import('@agoric/governance/src/committee.js').CommitteeElectorateCreatorFacet;
- *   feeDistributorKit: StartedInstanceKit<
- *     typeof import('../feeDistributor.js').start
- *   >;
- *   periodicFeeCollectors: MapStore<
- *     number,
- *     import('../feeDistributor.js').PeriodicFeeCollector
- *   >;
- *   psmKit: MapStore<Brand, PSMKit>;
- *   anchorBalancePayments: MapStore<Brand, Payment<'nat'>>;
- *   econCharterKit: EconCharterStartResult;
- *   reserveKit: GovernanceFacetKit<
- *     import('../reserve/assetReserve.js')['start']
- *   >;
- *   vaultFactoryKit: GovernanceFacetKit<
- *     import('../vaultFactory/vaultFactory.js')['start']
- *   >;
- *   auctioneerKit: AuctioneerKit;
- *   minInitialDebt: NatValue;
+ *   economicCommitteeKit: CommitteeStartResult,
+ *   economicCommitteeCreatorFacet: import('@agoric/governance/src/committee.js').CommitteeElectorateCreatorFacet,
+ *   feeDistributorKit: StartedInstanceKit<typeof import('../feeDistributor.js').start>,
+ *   periodicFeeCollectors: MapStore<number, import('../feeDistributor.js').PeriodicFeeCollector>,
+ *   psmKit: MapStore<Brand, PSMKit>,
+ *   anchorBalancePayments: MapStore<Brand, Payment<'nat'>>,
+ *   econCharterKit: EconCharterStartResult,
+ *   reserveKit: GovernanceFacetKit<import('../reserve/assetReserve.js')['prepare']>,
+ *   vaultFactoryKit: GovernanceFacetKit<import('../vaultFactory/vaultFactory.js')['prepare']>,
+ *   auctioneerKit: AuctioneerKit,
+ *   minInitialDebt: NatValue,
  * }>} EconomyBootstrapSpace
  */
 
-/**
- * @typedef {import('@agoric/zoe/src/zoeService/utils.js').StartedInstanceKit<
- *   import('../econCommitteeCharter')['start']
- * >} EconCharterStartResult
- */
-/**
- * @typedef {import('@agoric/zoe/src/zoeService/utils.js').StartedInstanceKit<
- *   import('@agoric/governance/src/committee.js')['start']
- * >} CommitteeStartResult
- */
+/** @typedef {import('@agoric/zoe/src/zoeService/utils.js').StartedInstanceKit<import('../econCommitteeCharter')['prepare']>} EconCharterStartResult */
+/** @typedef {import('@agoric/zoe/src/zoeService/utils.js').StartedInstanceKit<import('@agoric/governance/src/committee.js')['prepare']>} CommitteeStartResult */
 
 /**
  * @file A collection of productions, each of which declares inputs and outputs.
- *   Each function is passed a set of powers for reading from and writing to the
- *   vat config.
+ * Each function is passed a set of powers for reading from and writing to the vat config.
  *
- *   Each of the things they produce they're responsible for resolving or setting.
+ * Each of the things they produce they're responsible for resolving or setting.
  *
- *   In production called by @agoric/vats to bootstrap.
+ * In production called by @agoric/vats to bootstrap.
  */
 
 /** @param {EconomyBootstrapPowers} powers */
@@ -323,11 +301,7 @@ export const startVaultFactory = async (
     }),
   );
 
-  /**
-   * @type {GovernorStartedInstallationKit<
-   *   typeof vaultFactoryInstallation
-   * >}
-   */
+  /** @type {GovernorStartedInstallationKit<typeof vaultFactoryInstallation>} */
   const g = await E(consume.zoe).startInstance(
     contractGovernorInstallation,
     undefined,
@@ -376,8 +350,8 @@ export const startVaultFactory = async (
 };
 
 /**
- * Grant access to the VaultFactory creatorFacet to up to one user based on
- * address.
+ * Grant access to the VaultFactory creatorFacet
+ * to up to one user based on address.
  *
  * @param {EconomyBootstrapPowers} powers
  * @param {object} [root0]
@@ -463,8 +437,9 @@ export const startRewardDistributor = async ({
 
   /**
    * @type {Awaited<
-   *   ReturnType<typeof import('../feeDistributor.js').makeFeeDistributor>
-   * > & { adminFacet: AdminFacet; instance: Instance }}
+   *   ReturnType<typeof import('../feeDistributor.js').makeFeeDistributor>>
+   *   & { adminFacet: AdminFacet, instance: Instance }
+   * }
    */
   const instanceKit = await E(zoe).startInstance(
     feeDistributor,

package/src/proposals/price-feed-proposal.js

@@ -1,10 +1,10 @@
 // @ts-nocheck -- lots of type errors. low prio b/c proposals are like scripts
-import { makeTracer } from '@agoric/internal';
+import { E } from '@endo/far';
 import {
-  assertPathSegment,
   makeStorageNodeChild,
+  assertPathSegment,
 } from '@agoric/internal/src/lib-chainStorage.js';
-import { E } from '@endo/far';
+import { makeTracer } from '@agoric/internal';
 
 import { unitAmount } from '@agoric/zoe/src/contractSupport/priceQuote.js';
 import { reserveThenDeposit, reserveThenGetNames } from './utils.js';
@@ -18,17 +18,14 @@ const sanitizePathSegment = name => {
   return candidate;
 };
 
-export const instanceNameFor = (inBrandName, outBrandName) =>
-  `${inBrandName}-${outBrandName} price feed`;
-
 /**
  * @typedef {{
- *   brandIn?: ERef<Brand<'nat'> | undefined>;
- *   brandOut?: ERef<Brand<'nat'> | undefined>;
- *   IN_BRAND_NAME: string;
- *   IN_BRAND_DECIMALS: string;
- *   OUT_BRAND_NAME: string;
- *   OUT_BRAND_DECIMALS: string;
+ * brandIn?: ERef<Brand<'nat'> | undefined>,
+ * brandOut?: ERef<Brand<'nat'> | undefined>,
+ * IN_BRAND_NAME: string,
+ * IN_BRAND_DECIMALS: string,
+ * OUT_BRAND_NAME: string,
+ * OUT_BRAND_DECIMALS: string,
  * }} PriceFeedOptions
  */
 
@@ -36,7 +33,7 @@ export const instanceNameFor = (inBrandName, outBrandName) =>
  * Create inert brands (no mint or issuer) referred to by price oracles.
  *
  * @param {ChainBootstrapSpace & NamedVatPowers} space
- * @param {{ options: { priceFeedOptions: PriceFeedOptions } }} opt
+ * @param {{options: {priceFeedOptions: PriceFeedOptions}}} opt
  * @returns {Promise<[Brand<'nat'>, Brand<'nat'>]>}
  */
 export const ensureOracleBrands = async (
@@ -65,6 +62,7 @@ export const ensureOracleBrands = async (
     let b = await brand;
     if (!b) {
       // not 1st await
+      // eslint-disable-next-line @jessie.js/no-nested-await
       b = await E(agoricNames).provideInertBrand(
         name,
         harden({ decimalPlaces: parseInt(decimals, 10) }),
@@ -81,17 +79,7 @@ export const ensureOracleBrands = async (
 
 /**
  * @param {ChainBootstrapSpace} powers
- * @param {{
- *   options: {
- *     priceFeedOptions: {
- *       AGORIC_INSTANCE_NAME: string;
- *       oracleAddresses: string[];
- *       contractTerms: import('@agoric/inter-protocol/src/price/fluxAggregatorKit.js').ChainlinkConfig;
- *       IN_BRAND_NAME: string;
- *       OUT_BRAND_NAME: string;
- *     };
- *   };
- * }} config
+ * @param {{options: {priceFeedOptions: {AGORIC_INSTANCE_NAME: string, oracleAddresses: string[], contractTerms: import('@agoric/inter-protocol/src/price/fluxAggregatorKit.js').ChainlinkConfig, IN_BRAND_NAME: string, OUT_BRAND_NAME: string}}}} config
  */
 export const createPriceFeed = async (
   {
@@ -108,7 +96,6 @@ export const createPriceFeed = async (
       priceAuthorityAdmin,
       startGovernedUpgradable,
     },
-    instance: { produce: produceInstance },
   },
   {
     options: {
@@ -130,17 +117,9 @@ export const createPriceFeed = async (
   const timer = await chainTimerService;
 
   /**
-   * Values come from economy-template.json, which at this writing had IN:ATOM,
-   * OUT:USD
+   * Values come from economy-template.json, which at this writing had IN:ATOM, OUT:USD
    *
-   * @type {[
-   *   [Brand<'nat'>, Brand<'nat'>],
-   *   [
-   *     Installation<
-   *       import('@agoric/inter-protocol/src/price/fluxAggregatorContract.js')['start]
-   *     >,
-   *   ],
-   * ]}
+   * @type {[[Brand<'nat'>, Brand<'nat'>], [Installation<import('@agoric/inter-protocol/src/price/fluxAggregatorContract.js').prepare>]]}
    */
   const [[brandIn, brandOut], [priceAggregator]] = await Promise.all([
     reserveThenGetNames(E(agoricNamesAdmin).lookupAdmin('oracleBrand'), [
@@ -182,27 +161,11 @@ export const createPriceFeed = async (
     installation: priceAggregator,
   });
 
-  // Publish price feed in home.priceAuthority.
-  const forceReplace = true;
-  // Make sure this PA is registered before sharing the instance in agoricNames,
-  // which allows contracts that depend on the registry value to wait for it and
-  // prevent a race.
-  await E(priceAuthorityAdmin).registerPriceAuthority(
-    E(faKit.publicFacet).getPriceAuthority(),
-    brandIn,
-    brandOut,
-    forceReplace,
-  );
-
-  await E(E(agoricNamesAdmin).lookupAdmin('instance'))
+  E(E(agoricNamesAdmin).lookupAdmin('instance'))
     .update(AGORIC_INSTANCE_NAME, faKit.instance)
     .catch(err =>
       console.error(`🚨 failed to update ${AGORIC_INSTANCE_NAME}`, err),
     );
-  // being after the above awaits means that when this resolves, the consumer
-  // gets notified that the authority is in the registry and its instance is in
-  // agoricNames.
-  produceInstance[AGORIC_INSTANCE_NAME].resolve(faKit.instance);
 
   E(E.get(econCharterKit).creatorFacet).addInstance(
     faKit.instance,
@@ -211,6 +174,15 @@ export const createPriceFeed = async (
   );
   trace('registered', AGORIC_INSTANCE_NAME, faKit.instance);
 
+  // Publish price feed in home.priceAuthority.
+  const forceReplace = true;
+  void E(priceAuthorityAdmin).registerPriceAuthority(
+    E(faKit.publicFacet).getPriceAuthority(),
+    brandIn,
+    brandOut,
+    forceReplace,
+  );
+
   /**
    * Initialize a new oracle and send an invitation to administer it.
    *
@@ -233,8 +205,7 @@ export const createPriceFeed = async (
 
 const t = 'priceFeed';
 /**
- * Add a price feed to a running chain, returning the manifest, installations,
- * and options.
+ * Add a price feed to a running chain, returning the manifest, installations, and options.
  *
  * @param {object} utils
  * @param {(ref: unknown) => Promise<unknown>} [utils.restoreRef]
@@ -261,9 +232,6 @@ export const getManifestForPriceFeed = async (
         priceAuthorityAdmin: t,
         startGovernedUpgradable: t,
       },
-      instance: {
-        produce: t,
-      },
     },
     [ensureOracleBrands.name]: {
       namedVat: {
@@ -275,7 +243,6 @@ export const getManifestForPriceFeed = async (
     },
   },
   installations: {
-    // ??? will every eval of price-feed-proposal install priceAggregator ?
     priceAggregator: restoreRef(priceFeedOptions.priceAggregatorRef),
   },
   options: {
@@ -336,7 +303,7 @@ export const startPriceFeeds = async (
     {
       options: {
         priceFeedOptions: {
-          AGORIC_INSTANCE_NAME: instanceNameFor(inBrandName, outBrandName),
+          AGORIC_INSTANCE_NAME: `${inBrandName}-${outBrandName} price feed`,
           contractTerms: {
             minSubmissionCount: 2,
             minSubmissionValue: 1,

package/src/proposals/startEconCommittee.js

@@ -22,7 +22,7 @@ const sanitizePathSegment = name => {
 
 /**
  * @param {import('./econ-behaviors').EconomyBootstrapPowers} powers
- * @param {object} config
+ * @param {object} [config]
  * @param {object} [config.options]
  * @param {EconCommitteeOptions} [config.options.econCommitteeOptions]
  */

package/src/proposals/startPSM.js

@@ -6,14 +6,14 @@ import { CONTRACT_ELECTORATE, ParamTypes } from '@agoric/governance';
 import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
 import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
 import { E } from '@endo/far';
+import { Stable } from '@agoric/vats/src/tokens.js';
 import {
   makeHistoryReviver,
   makeBoardRemote,
   slotToBoardRemote,
-} from '@agoric/internal/src/marshal.js';
+} from '@agoric/vats/tools/board-utils.js';
 import { deeplyFulfilledObject } from '@agoric/internal';
 import { makeScalarBigMapStore } from '@agoric/vat-data';
-import { Stable } from '@agoric/internal/src/tokens.js';
 
 import { reserveThenGetNamePaths } from './utils.js';
 
@@ -35,13 +35,10 @@ export { inviteCommitteeMembers, startEconCharter, inviteToEconCharter };
 const stablePsmKey = `published.psm.${Stable.symbol}`;
 
 /**
- * @param {[key: string, value: string][]} chainStorageEntries
+ * @param {Array<[key: string, value: string]>} chainStorageEntries
  * @param {string} keyword
- * @param {{ minted: Brand<'nat'>; anchor: Brand<'nat'> }} brands
- * @returns {{
- *   metrics?: MetricsNotification;
- *   governance?: GovernanceSubscriptionState;
- * }}
+ * @param {{ minted: Brand<'nat'>, anchor: Brand<'nat'> }} brands
+ * @returns {{ metrics?: MetricsNotification, governance?: GovernanceSubscriptionState }}
  */
 const findOldPSMState = (chainStorageEntries, keyword, brands) => {
   // In this reviver, object references are revived as boardIDs
@@ -83,7 +80,7 @@ const findOldPSMState = (chainStorageEntries, keyword, brands) => {
  * @param {bigint} [config.WantMintedFeeBP]
  * @param {bigint} [config.GiveMintedFeeBP]
  * @param {bigint} [config.MINT_LIMIT]
- * @param {{ anchorOptions?: AnchorOptions }} [config.options]
+ * @param {{ anchorOptions?: AnchorOptions } } [config.options]
  */
 export const startPSM = async (
   {
@@ -294,16 +291,16 @@ harden(startPSM);
  */
 
 /**
- * Make anchor issuer out of a Cosmos asset; presumably USDC over IBC. Add it to
- * BankManager.
+ * Make anchor issuer out of a Cosmos asset; presumably
+ * USDC over IBC. Add it to BankManager.
  *
- * Also, if vatParameters shows an anchorPoolBalance for this asset, mint a
- * payment for that balance.
+ * Also, if vatParameters shows an anchorPoolBalance for this asset,
+ * mint a payment for that balance.
  *
  * TODO: address redundancy with publishInterchainAssetFromBank
  *
  * @param {EconomyBootstrapPowers & WellKnownSpaces & ChainStorageVatParams} powers
- * @param {{ options: { anchorOptions?: AnchorOptions } }} config
+ * @param {{options?: { anchorOptions?: AnchorOptions } }} [config]
  */
 export const makeAnchorAsset = async (
   {
@@ -348,18 +345,13 @@ export const makeAnchorAsset = async (
     }),
   );
 
-  const { creatorFacet: mint, publicFacet: issuer } = /**
-   * @type {{
-   *   creatorFacet: ERef<Mint<'nat'>>;
-   *   publicFacet: ERef<Issuer<'nat'>>;
-   * }}
-   */ (
-    await E(startUpgradable)({
-      installation: mintHolder,
-      label: keyword,
-      terms,
-    })
-  );
+  /** @type {{ creatorFacet: ERef<Mint<'nat'>>, publicFacet: ERef<Issuer<'nat'>> }} */
+  // @ts-expect-error cast
+  const { creatorFacet: mint, publicFacet: issuer } = await E(startUpgradable)({
+    installation: mintHolder,
+    label: keyword,
+    terms,
+  });
 
   const brand = await E(issuer).getBrand();
   const kit = harden({ mint, issuer, brand });
@@ -371,25 +363,23 @@ export const makeAnchorAsset = async (
     slotToBoardRemote,
   );
   const metricsKey = `${stablePsmKey}.${keyword}.metrics`;
-  const maybeReviveMetrics = async () => {
-    if (!toSlotReviver.has(metricsKey)) {
-      return;
-    }
+  if (toSlotReviver.has(metricsKey)) {
     const metrics = toSlotReviver.getItem(metricsKey);
     produceAnchorBalancePayments.resolve(
       makeScalarBigMapStore('Anchor balance payments', { durable: true }),
     );
     // XXX this rule should only apply to the 1st await
+    // eslint-disable-next-line @jessie.js/no-nested-await
     const anchorPaymentMap = await anchorBalancePayments;
 
     // TODO: validate that `metrics.anchorPoolBalance.value` is
     // pass-by-copy PureData (e.g., contains no remotables).
+    // eslint-disable-next-line @jessie.js/no-nested-await
     const pmt = await E(mint).mintPayment(
       AmountMath.make(brand, metrics.anchorPoolBalance.value),
     );
     anchorPaymentMap.init(brand, pmt);
-  };
-  await maybeReviveMetrics();
+  }
 
   await Promise.all([
     E(E(agoricNamesAdmin).lookupAdmin('issuer')).update(keyword, kit.issuer),

package/src/proposals/utils.js

@@ -10,6 +10,7 @@ const { Fail } = assert;
  */
 export const reserveThenGetNamePaths = async (nameAdmin, paths) => {
   /**
+   *
    * @param {ERef<import('@agoric/vats').NameAdmin>} nextAdmin
    * @param {string[]} path
    */
@@ -53,7 +54,7 @@ export const reserveThenGetNames = async (nameAdmin, names) =>
  * @param {string} debugName
  * @param {ERef<import('@agoric/vats').NameAdmin>} namesByAddressAdmin
  * @param {string} addr
- * @param {ERef<Payment>[]} payments
+ * @param {Array<ERef<Payment>>} payments
  */
 export const reserveThenDeposit = async (
   debugName,
@@ -78,15 +79,7 @@ export const reserveThenDeposit = async (
   );
 };
 
-/**
- * @type {<T>(
- *   store: ERef<
- *     Map<string, T> | import('@agoric/internal/src/scratch.js').ScratchPad
- *   >,
- *   key: string,
- *   make: () => T,
- * ) => Promise<T>}
- */
+/** @type {<T>(store: ERef<Map<string, T> | import('@agoric/internal/src/scratch.js').ScratchPad>, key: string, make: () => T) => Promise<T>} */
 const provideWhen = async (store, key, make) => {
   const found = await E(store).get(key);
   if (found) {
@@ -98,33 +91,21 @@ const provideWhen = async (store, key, make) => {
 };
 
 /**
- * @param {{
- *   scratch: ERef<import('@agoric/internal/src/scratch.js').ScratchPad>;
- * }} homeP
+ * @param {{ scratch: ERef<import('@agoric/internal/src/scratch.js').ScratchPad> }} homeP
  * @param {object} opts
- * @param {(specifier: string) => Promise<{ default: Bundle }>} opts.loadBundle
+ * @param {(specifier: string) => Promise<{default: Bundle}>} opts.loadBundle
  * @param {string} [opts.installCacheKey]
  */
 export const makeInstallCache = async (
   homeP,
   { installCacheKey = 'installCache', loadBundle },
 ) => {
-  /**
-   * @type {CopyMap<
-   *   string,
-   *   { installation: Installation; boardId: string; path?: string }
-   * >}
-   */
+  /** @type {CopyMap<string, {installation: Installation, boardId: string, path?: string}>} */
   const initial = await provideWhen(E.get(homeP).scratch, installCacheKey, () =>
     makeCopyMap([]),
   );
   // ISSUE: getCopyMapEntries of CopyMap<K, V> loses K, V.
-  /**
-   * @type {Map<
-   *   string,
-   *   { installation: Installation; boardId: string; path?: string }
-   * >}
-   */
+  /** @type {Map<string, {installation: Installation, boardId: string, path?: string}>} */
   const working = new Map(getCopyMapEntries(initial));
 
   const saveCache = async () => {